From patchwork Thu Mar 23 01:04:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 125437 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 504EC42818; Thu, 23 Mar 2023 02:04:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 16B4542686; Thu, 23 Mar 2023 02:04:35 +0100 (CET) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mails.dpdk.org (Postfix) with ESMTP id A010840156 for ; Thu, 23 Mar 2023 02:04:32 +0100 (CET) Received: by mail-pl1-f174.google.com with SMTP id w4so12806634plg.9 for ; Wed, 22 Mar 2023 18:04:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; t=1679533471; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bPr8BL2VBsxWx5DY3IF2xqXEdHHjSQDqk+BFBC4P0wE=; b=mwNGTNy7YE8hyktEmwdjBdJ767MOH/X9poPMtVa1FdVtEXm/GFkXA0nVCNrnmh6Fs/ R5UDnP49pBmRptUCqdUDDDa46RussjrH1d3Z05XWZz0QHVv41ZQY7Qj/VFL32BOJrhth ZD4n5ZSuLW8GEETAFYzZEbGvvkjn/ek1ZiwxukNUx+/j4XGKbH4WaB2C1V4v/nooGlxc tkejeo1MSns9WBJBNjd1xsA6LiRdsFnP2fA+cPbY/xvFbvkTyHT0/4uXv4gs1KJGG0Qi fXqF+tLmPYrb1i0A3W5soyeHhvGU4bCOkJ54lCM+IG3bA7BzATMDCur0m2Ji+1bazEai BR8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679533471; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bPr8BL2VBsxWx5DY3IF2xqXEdHHjSQDqk+BFBC4P0wE=; b=4JTacN/ihN/pE2rWahADgV6osKu4/IMoFDtN4jJ/Vn1fzNqhnSqqv2JNp/RnoDwUDe UxNueJ0cJKuDOq89FNNb/QCXz14nFnYKMU4Zm0Eetdx6J8Q5ch5peaC2AT5y9W4M9eb1 JJvONMlbxtO4tA75wLkuVRRWNvN5NaJS1stxcK/1ayMBo63vp+DtNohzLNjycIQSwQPB YdZFXxzBA53mqPT/NoQKoRVYta93yeo61KY6I6wa3tAxkfBh612fY5VejoQfhBlFVPMW aLiLI/IkWpiwweH8oraYm9qPtWmKInJdB1fudMdK8HjuD5I0T3HxKn1NCkSXDfQWj6Oe xCFg== X-Gm-Message-State: AO0yUKWMp48a9fi5sCGR6RYcDrLGAAZQUlb13RW1YpzcMB1/vUhO6fPq Lx/Zzq2We/zgkqsUFQ/kQjzgtT2iQymTZ5D/wUDsQg== X-Google-Smtp-Source: AK7set+HXH0oocVfr2rpIKHxqHbrw0gC+/HM9y+A/n7qQ2Y3KbVTO5Z4fgxt/dDI6qblBaAKwFMsBg== X-Received: by 2002:a17:90b:4a11:b0:23d:3c7b:8684 with SMTP id kk17-20020a17090b4a1100b0023d3c7b8684mr5380495pjb.41.1679533471534; Wed, 22 Mar 2023 18:04:31 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id l9-20020a17090b078900b0023b4c0ef8f2sm135206pjz.20.2023.03.22.18.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 18:04:31 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Srikanth Yalavarthi Subject: [PATCH 1/4] mldev: remove unnecessary null free checks Date: Wed, 22 Mar 2023 18:04:25 -0700 Message-Id: <20230323010428.64020-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230323010428.64020-1-stephen@networkplumber.org> References: <20230323010428.64020-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org These are places where mldev is doing unnecessary checks for calling free() style functions. Signed-off-by: Stephen Hemminger Acked-by: Srikanth Yalavarthi --- app/test-mldev/test_device_ops.c | 6 ++---- app/test-mldev/test_inference_common.c | 24 ++++++++---------------- app/test-mldev/test_model_ops.c | 6 ++---- lib/mldev/rte_mldev.c | 3 +-- 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/app/test-mldev/test_device_ops.c b/app/test-mldev/test_device_ops.c index be0c5f0780d9..81b3ca18f36b 100644 --- a/app/test-mldev/test_device_ops.c +++ b/app/test-mldev/test_device_ops.c @@ -70,8 +70,7 @@ test_device_setup(struct ml_test *test, struct ml_options *opt) return 0; error: - if (test_device != NULL) - rte_free(test_device); + rte_free(test_device); return ret; } @@ -84,8 +83,7 @@ test_device_destroy(struct ml_test *test, struct ml_options *opt) RTE_SET_USED(opt); t = ml_test_priv(test); - if (t != NULL) - rte_free(t); + rte_free(t); } static int diff --git a/app/test-mldev/test_inference_common.c b/app/test-mldev/test_inference_common.c index eba37c50e96c..af831fc1bf4c 100644 --- a/app/test-mldev/test_inference_common.c +++ b/app/test-mldev/test_inference_common.c @@ -492,8 +492,7 @@ test_inference_setup(struct ml_test *test, struct ml_options *opt) return 0; error: - if (test_inference != NULL) - rte_free(test_inference); + rte_free(test_inference); return ret; } @@ -506,8 +505,7 @@ test_inference_destroy(struct ml_test *test, struct ml_options *opt) RTE_SET_USED(opt); t = ml_test_priv(test); - if (t != NULL) - rte_free(t); + rte_free(t); } int @@ -748,8 +746,7 @@ ml_inference_iomem_destroy(struct ml_test *test, struct ml_options *opt, uint16_ /* destroy io pool */ sprintf(mp_name, "ml_io_pool_%d", fid); mp = rte_mempool_lookup(mp_name); - if (mp != NULL) - rte_mempool_free(mp); + rte_mempool_free(mp); } int @@ -776,8 +773,7 @@ ml_inference_mem_destroy(struct ml_test *test, struct ml_options *opt) RTE_SET_USED(opt); /* release op pool */ - if (t->op_pool != NULL) - rte_mempool_free(t->op_pool); + rte_mempool_free(t->op_pool); } static bool @@ -1088,11 +1084,9 @@ ml_inference_stats_get(struct ml_test *test, struct ml_options *opt) print_line(80); /* release buffers */ - if (t->xstats_map) - rte_free(t->xstats_map); + rte_free(t->xstats_map); - if (t->xstats_values) - rte_free(t->xstats_values); + rte_free(t->xstats_values); /* print end-to-end stats */ freq = rte_get_tsc_hz(); @@ -1129,11 +1123,9 @@ ml_inference_stats_get(struct ml_test *test, struct ml_options *opt) return 0; error: - if (t->xstats_map) - rte_free(t->xstats_map); + rte_free(t->xstats_map); - if (t->xstats_values) - rte_free(t->xstats_values); + rte_free(t->xstats_values); return ret; } diff --git a/app/test-mldev/test_model_ops.c b/app/test-mldev/test_model_ops.c index 0202b31190f8..5bbbcb1a6c0b 100644 --- a/app/test-mldev/test_model_ops.c +++ b/app/test-mldev/test_model_ops.c @@ -93,8 +93,7 @@ test_model_ops_setup(struct ml_test *test, struct ml_options *opt) return 0; error: - if (test_model_ops != NULL) - rte_free(test_model_ops); + rte_free(test_model_ops); return ret; } @@ -107,8 +106,7 @@ test_model_ops_destroy(struct ml_test *test, struct ml_options *opt) RTE_SET_USED(opt); t = ml_test_priv(test); - if (t != NULL) - rte_free(t); + rte_free(t); } static int diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c index 50ebeb1bfe8d..f5904a0d4a90 100644 --- a/lib/mldev/rte_mldev.c +++ b/lib/mldev/rte_mldev.c @@ -836,8 +836,7 @@ rte_ml_op_pool_create(const char *name, unsigned int nb_elts, unsigned int cache void rte_ml_op_pool_free(struct rte_mempool *mempool) { - if (mempool != NULL) - rte_mempool_free(mempool); + rte_mempool_free(mempool); } uint16_t From patchwork Thu Mar 23 01:04:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 125438 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 006F042818; Thu, 23 Mar 2023 02:04:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 577B742B7E; Thu, 23 Mar 2023 02:04:36 +0100 (CET) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mails.dpdk.org (Postfix) with ESMTP id 7825D40156 for ; Thu, 23 Mar 2023 02:04:33 +0100 (CET) Received: by mail-pj1-f41.google.com with SMTP id gp15-20020a17090adf0f00b0023d1bbd9f9eso440233pjb.0 for ; Wed, 22 Mar 2023 18:04:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; t=1679533472; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U3IiaJ6iorHjs4QPlytaj/B4WMfxH5xIZPxFdJ7qFBg=; b=ag6ECaqxV9QuJ8c9pM2tZBcNhMaXCnihWLqgVNTLjdtmwbbEPfkEUbvjKrpd4P838r N1AQJmgbx5EnYoTRD8FvrZMZuKuc89W/ZDBPadGM6Ajkpk2jaFCD6Hq2FcBgn91/YAIo QJGm41j9OMrOd5dggKS/ewwKfRPPEw82wNchpuHIbKRt7x31PHDTdLv/sk5cZmY7Sbg6 a3LBjbvs+2z5jiRcs2SILUAm5OvihICa1B0woBrM7rn+nrC+PnVbMevnQSBhwq6Kwc4y 6ALKFgHXaWm2DCCkDOaQNkPM27gdqIgDGTSUkYXt0jcfvbULGwzw01NL/5CQ6AkVpU04 An1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679533472; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U3IiaJ6iorHjs4QPlytaj/B4WMfxH5xIZPxFdJ7qFBg=; b=XTPtSD/SDBdQJyibt+TtIdTWY9X1V7S0FttvEcTsnBJOa9ah8g1EPaKzR6RvXUGtrf jOWo8/Z5kPqgpMHJ9megZNW5OE+GdznqilVHMS4HE8Yw0xdKp3AF4DcRBLhAZWv5pnj4 yQC9rphHUsdSNUVEV1dthBynP6bj62dCQaFggSEEMJuI5WnbsrVqn47IhTgJW4vZ262/ KX/q6hvRwwlM/5qlUN0M8R8myAq9ccSnG/U5hB4FXi6YA2Iom5yXA6Rpk+EBNXhU7i4a dyjGK+kgp9x5Fv1o9QWAu1o++Xal8rLZM2Px73nWWM2HdbslNirgHsOFVwZ59oO8WXB8 3uhQ== X-Gm-Message-State: AO0yUKWu/r8aL42nXWcd8bN5JRaHOU1qwfKrQpbGISMlsUhuRg9TYcTs sp1fB/LF3nKX7ItIaBaq3NaqGVqdw9ftJw4wO0OazQ== X-Google-Smtp-Source: AK7set8olVALXAhXshv/Of8oOc793ww1bN31VOKOaZMYeKzlEsC5lu0E1RVyvdpklVDo1DBeGqyUkA== X-Received: by 2002:a17:90b:3805:b0:23d:3f32:1cd5 with SMTP id mq5-20020a17090b380500b0023d3f321cd5mr5445359pjb.26.1679533472391; Wed, 22 Mar 2023 18:04:32 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id l9-20020a17090b078900b0023b4c0ef8f2sm135206pjz.20.2023.03.22.18.04.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 18:04:32 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Srikanth Yalavarthi Subject: [PATCH 2/4] ml/cnkx: remove unnecessary null checks Date: Wed, 22 Mar 2023 18:04:26 -0700 Message-Id: <20230323010428.64020-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230323010428.64020-1-stephen@networkplumber.org> References: <20230323010428.64020-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org These are places where null check is not necessary before calling free. Signed-off-by: Stephen Hemminger Acked-by: Srikanth Yalavarthi --- drivers/ml/cnxk/cn10k_ml_dev.c | 9 +++------ drivers/ml/cnxk/cn10k_ml_ops.c | 12 ++++-------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/ml/cnxk/cn10k_ml_dev.c b/drivers/ml/cnxk/cn10k_ml_dev.c index bba3c9022e6b..983138a7f237 100644 --- a/drivers/ml/cnxk/cn10k_ml_dev.c +++ b/drivers/ml/cnxk/cn10k_ml_dev.c @@ -319,8 +319,7 @@ cn10k_mldev_parse_devargs(struct rte_devargs *devargs, struct cn10k_ml_dev *mlde plt_info("ML: %s = %d", CN10K_ML_OCM_PAGE_SIZE, mldev->ocm_page_size); exit: - if (kvlist) - rte_kvargs_free(kvlist); + rte_kvargs_free(kvlist); return ret; } @@ -795,8 +794,7 @@ cn10k_ml_fw_load(struct cn10k_ml_dev *mldev) mz = plt_memzone_reserve_aligned(FW_MEMZONE_NAME, mz_size, 0, ML_CN10K_ALIGN_SIZE); if (mz == NULL) { plt_err("plt_memzone_reserve failed : %s", FW_MEMZONE_NAME); - if (fw_buffer != NULL) - free(fw_buffer); + free(fw_buffer); return -ENOMEM; } fw->req = mz->addr; @@ -813,8 +811,7 @@ cn10k_ml_fw_load(struct cn10k_ml_dev *mldev) if (roc_env_is_emulator() || roc_env_is_hw()) { fw->data = PLT_PTR_ADD(mz->addr, sizeof(struct cn10k_ml_req)); ret = cn10k_ml_fw_load_cn10ka(fw, fw_buffer, fw_size); - if (fw_buffer != NULL) - free(fw_buffer); + free(fw_buffer); } else if (roc_env_is_asim()) { fw->data = NULL; ret = cn10k_ml_fw_load_asim(fw); diff --git a/drivers/ml/cnxk/cn10k_ml_ops.c b/drivers/ml/cnxk/cn10k_ml_ops.c index 4df2ca0e8c26..b5eaa24e831c 100644 --- a/drivers/ml/cnxk/cn10k_ml_ops.c +++ b/drivers/ml/cnxk/cn10k_ml_ops.c @@ -845,11 +845,9 @@ cn10k_ml_dev_configure(struct rte_ml_dev *dev, const struct rte_ml_dev_config *c return 0; error: - if (dev->data->queue_pairs != NULL) - rte_free(dev->data->queue_pairs); + rte_free(dev->data->queue_pairs); - if (dev->data->models != NULL) - rte_free(dev->data->models); + rte_free(dev->data->models); return ret; } @@ -887,8 +885,7 @@ cn10k_ml_dev_close(struct rte_ml_dev *dev) } } - if (dev->data->models) - rte_free(dev->data->models); + rte_free(dev->data->models); /* Destroy all queue pairs */ for (qp_id = 0; qp_id < dev->data->nb_queue_pairs; qp_id++) { @@ -900,8 +897,7 @@ cn10k_ml_dev_close(struct rte_ml_dev *dev) } } - if (dev->data->queue_pairs) - rte_free(dev->data->queue_pairs); + rte_free(dev->data->queue_pairs); /* Unload firmware */ cn10k_ml_fw_unload(mldev); From patchwork Thu Mar 23 01:04:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 125439 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 38A7142818; Thu, 23 Mar 2023 02:04:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7B3E642BC9; Thu, 23 Mar 2023 02:04:37 +0100 (CET) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mails.dpdk.org (Postfix) with ESMTP id 5C2D641101 for ; Thu, 23 Mar 2023 02:04:34 +0100 (CET) Received: by mail-pj1-f50.google.com with SMTP id p3-20020a17090a74c300b0023f69bc7a68so404911pjl.4 for ; Wed, 22 Mar 2023 18:04:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; t=1679533473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/NwdXVMctiQYTuvimYuEpKEUz0ffafp8hsvaZLBHtxw=; b=ehUKx/1wMvkwkgPR05d8KqYcyKfRawQY9lGnrs/7UEtD7Kipqn1i/MQ0CM54aPS9NR nqpy4QsqPlq0BRkx7I8JIbfatn/q8DtEcXAMHRFn+WLHqGDExd88ZJ+JBVwGw8Exy6N6 wZ7HHz+OE0Lykd5Z/4mYJerkOBaE4j6AxYztHFmHb/WtA8UI4bpW5I4aZ9LTfonFgVJr TWV1g5ZMzh7OMI7wk/duPwwlMARHLtKa7hAm7mp+b0xA47nlL+ALOuU5FTW/gvhvs7tB orwcJDK0n5+e4u/z9CtvLLrk/hkPTPJei86Z4beYZSG7/JC5i3JGrGn1PAjXTtmJk7V+ Zntw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679533473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/NwdXVMctiQYTuvimYuEpKEUz0ffafp8hsvaZLBHtxw=; b=Wg1t3Jw5pltqRWbWLzkwZneu0BvAa53tMuaJ/CbykBfstPzrDSaeHJOWbLB8BZO5hA ljYQX+RU4VTBQrKH0gHA7vcF5ZVVrNfVCj2qVMLTk8eLNvTi2xCewvvU8VS72WFB9Jul QSMfg2JMgNSM8/iXYyxCyE9gv0PPsNTpApCfmDFOQPrjPqvx5htW/aIsxiFVuqvBv0iq iK+1JYImSC2KklM83RsFuKZFpy/0IUb6xtU/Eb/+ylCjxdo64BGNqGjjH0vCGXv5g7FS IO1z1n8Putkl0tjLt91uxU+SVY2O/M7LA/5S2CPaXDIMAog6s2F5/J+79nzmICq//Od/ aU8w== X-Gm-Message-State: AO0yUKWPCb2qBIqPZwF/qLhJIEC/4RINfEbA57DJ+yk8M+ag5FGJxj/9 mkoZAjQB+ZpB/uwBnXmOLuos0YFHGedwHsV8ybp+YQ== X-Google-Smtp-Source: AK7set+LUafOpSLkh5rORM3PM7ZIzDCxA1GPV0/xZQEqtySRqBjfDzXlokTN20nVQR8xKbShn2p4xA== X-Received: by 2002:a17:90b:388e:b0:237:bf05:40b with SMTP id mu14-20020a17090b388e00b00237bf05040bmr6419374pjb.20.1679533473329; Wed, 22 Mar 2023 18:04:33 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id l9-20020a17090b078900b0023b4c0ef8f2sm135206pjz.20.2023.03.22.18.04.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 18:04:33 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jerin Jacob , Kiran Kumar K , Nithin Dabilpuram Subject: [PATCH 3/4] graph: remove unnicessary null checks Date: Wed, 22 Mar 2023 18:04:27 -0700 Message-Id: <20230323010428.64020-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230323010428.64020-1-stephen@networkplumber.org> References: <20230323010428.64020-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Checking for null before calling rte_mempool_free is unnecessary. Signed-off-by: Stephen Hemminger --- lib/graph/graph_pcap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/graph/graph_pcap.c b/lib/graph/graph_pcap.c index 9cbd1b8fdb6c..6c433300290b 100644 --- a/lib/graph/graph_pcap.c +++ b/lib/graph/graph_pcap.c @@ -40,8 +40,7 @@ void graph_pcap_exit(struct rte_graph *graph) { if (rte_eal_process_type() == RTE_PROC_PRIMARY) - if (pkt_mp) - rte_mempool_free(pkt_mp); + rte_mempool_free(pkt_mp); if (pcapng_fd) { rte_pcapng_close(pcapng_fd); From patchwork Thu Mar 23 01:04:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 125440 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C1D0342818; Thu, 23 Mar 2023 02:04:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 173DA42C54; Thu, 23 Mar 2023 02:04:39 +0100 (CET) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mails.dpdk.org (Postfix) with ESMTP id 50AFE427F2 for ; Thu, 23 Mar 2023 02:04:35 +0100 (CET) Received: by mail-pj1-f45.google.com with SMTP id d13so20115762pjh.0 for ; Wed, 22 Mar 2023 18:04:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; t=1679533474; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Qa3YxLuYR78KyinRdaIUvB22vWFQbSnuKYq4UvsuruE=; b=P2aqz1tH6bzhSwwrXIjw4R2Jg9j832Myw3HYydMYSCa0AYDPK76qPrcaaIsYAN++mD 1Pd5at9ppC86nKRawcHVSN6Fs6AFbWNzhMVKQPR4vWnob0n1YtQJnT1a+Rh6jV7JuBaP Nedg67czjk2XOkRBm6gHwbWOtfrnIt0VQfmQYVY5RZJu2w8O2LlHb8g607r8WMNpK/bt fSZ+vRC1oAJUAH1oS/syZVDWikRGVef7LNiEwPcwh5EXAdmhVQPHzVw1LnBTmpR/eo2U UgyVeZwY+VTezE2SOG0ZR6ZFldlo/pA0S4vhCMubQHf95I/UOBnw1sNUGC8bxEH7321W H+OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679533474; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Qa3YxLuYR78KyinRdaIUvB22vWFQbSnuKYq4UvsuruE=; b=4onEgsqfB44j8tU+DZi9B2d3wGjtVkq9wWEXjqMravYDiTF9Z+4+Xa03iSxa0QeQnP CP5c1E19IWwyNl7iCx/PM9GXLdTrkqde7ei2JzkcCQ2Ii4x37+YjTxfBzLfHUwym5vXQ 434SOc+aKRcOAIvWHPFjFayCn7TMrgNURZ1H2r0cFEeWH9e6E3OM4oboej7iduofxabe yZeuOgCtYejjAmwcXcYEu3heMC3pKPRjsmmnemFYOVte9dZdNDtoZY8xqqINOME9ZGxy a5yGr57wLNrKhpazyOm5gjtLHcQOL1PW4XHfO/PPxgW2jRJfL2i/jyJSfwq/wx230OF5 9BDw== X-Gm-Message-State: AO0yUKXuDqlgozG49X9rIYlHYcKxBk3Sg8WEni2FxqJvpmHxSfwjeWSp GrOQdjSeQmHhgwlyc8fcxQGQXsXK+GlhpboKaT00fQ== X-Google-Smtp-Source: AK7set+XbG84FRfmxCidayJCte2LlYnj0ivmaTxkwQC1UL8Ll+8j6CMUnEPE2wrrqxAa38WF8IjBig== X-Received: by 2002:a17:90b:1e4c:b0:23d:31c3:c9a4 with SMTP id pi12-20020a17090b1e4c00b0023d31c3c9a4mr5769237pjb.26.1679533474206; Wed, 22 Mar 2023 18:04:34 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id l9-20020a17090b078900b0023b4c0ef8f2sm135206pjz.20.2023.03.22.18.04.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 18:04:33 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Brian Dooley Subject: [PATCH 4/4] examples/fips_validation: remove unneeded null checks Date: Wed, 22 Mar 2023 18:04:28 -0700 Message-Id: <20230323010428.64020-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230323010428.64020-1-stephen@networkplumber.org> References: <20230323010428.64020-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org No check for null pointer is necessary before calling free(). Signed-off-by: Stephen Hemminger --- examples/fips_validation/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index 2c4353185edd..4c231fdb29cd 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -2288,8 +2288,7 @@ fips_mct_sha_test(void) max_outlen = md_blocks * vec.cipher_auth.digest.len; - if (vec.cipher_auth.digest.val) - free(vec.cipher_auth.digest.val); + free(vec.cipher_auth.digest.val); vec.cipher_auth.digest.val = calloc(1, max_outlen); @@ -2382,8 +2381,7 @@ fips_mct_shake_test(void) max_outlen = vec.cipher_auth.digest.len; - if (vec.cipher_auth.digest.val) - free(vec.cipher_auth.digest.val); + free(vec.cipher_auth.digest.val); vec.cipher_auth.digest.val = calloc(1, max_outlen);