From patchwork Sun Jul 3 12:22:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 113653 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 B9EB1A04FD; Sun, 3 Jul 2022 14:22:15 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1597342685; Sun, 3 Jul 2022 14:22:12 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 4F88640685; Sun, 3 Jul 2022 14:22:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656850930; x=1688386930; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tsQ6MjChz7gSpRadOXC4guq0Y5hlnKUyzfNJ45mx5Ac=; b=jGQukLJGp8EboMipnsAuhPtR1e1eBohwqbF+cjFG16+LpFWGXjk5GMG3 CPM+e0bnNU1qII04U9JkLQcTBMfPtLY9gfF9qL9gZdpA0RruguGifEXEF wifz3Uhj/unMFbV47C5Lc5p4E+9fmxvxuC1QTzyWomM1lAwUDQHX71t01 Vsm9ZuCFYYN7sVELLi19ceCi35uwsZ65HyHdsTIL9zwCEYNkA89KrNrQv RyEH0pksKl040IWkEU4qJL0qV6+GAj98eX7qtSJJ296kpwBqhP9n/4qJ0 CX/ujYt1Jkrm9HiONO3NGf0fhwTGcA7G93wyKd7yRGrb/Yq9WP/2l2TMk g==; X-IronPort-AV: E=McAfee;i="6400,9594,10396"; a="262737108" X-IronPort-AV: E=Sophos;i="5.92,241,1650956400"; d="scan'208";a="262737108" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2022 05:22:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,241,1650956400"; d="scan'208";a="618931235" Received: from silpixa00401122.ir.intel.com ([10.237.213.29]) by orsmga008.jf.intel.com with ESMTP; 03 Jul 2022 05:22:08 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, Kevin Laatz , stable@dpdk.org, Xingguang He Subject: [PATCH v2 1/3] dma/idxd: fix memory leak in pci close Date: Sun, 3 Jul 2022 13:22:41 +0100 Message-Id: <20220703122243.929642-2-kevin.laatz@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220703122243.929642-1-kevin.laatz@intel.com> References: <20220408141504.1319913-1-kevin.laatz@intel.com> <20220703122243.929642-1-kevin.laatz@intel.com> 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 ASAN reports a memory leak for the 'pci' pointer in the 'idxd_dmadev' struct. This is fixed by free'ing the struct when the last queue on the PCI device is being closed. Fixes: 9449330a8458 ("dma/idxd: create dmadev instances on PCI probe") Cc: stable@dpdk.org Cc: bruce.richardson@intel.com Reported-by: Xingguang He Signed-off-by: Kevin Laatz --- drivers/dma/idxd/idxd_common.c | 2 ++ drivers/dma/idxd/idxd_internal.h | 2 ++ drivers/dma/idxd/idxd_pci.c | 34 +++++++++++++++++++++++++------- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/drivers/dma/idxd/idxd_common.c b/drivers/dma/idxd/idxd_common.c index c77200a457..d347bbed21 100644 --- a/drivers/dma/idxd/idxd_common.c +++ b/drivers/dma/idxd/idxd_common.c @@ -620,6 +620,8 @@ idxd_dmadev_create(const char *name, struct rte_device *dev, dmadev->fp_obj->dev_private = idxd; idxd->dmadev->state = RTE_DMA_DEV_READY; + if (idxd->u.pci != NULL) + rte_atomic16_inc(&idxd->u.pci->ref_count); return 0; diff --git a/drivers/dma/idxd/idxd_internal.h b/drivers/dma/idxd/idxd_internal.h index 3375600217..180a8587c6 100644 --- a/drivers/dma/idxd/idxd_internal.h +++ b/drivers/dma/idxd/idxd_internal.h @@ -7,6 +7,7 @@ #include #include +#include #include "idxd_hw_defs.h" @@ -33,6 +34,7 @@ struct idxd_pci_common { rte_spinlock_t lk; uint8_t wq_cfg_sz; + rte_atomic16_t ref_count; volatile struct rte_idxd_bar0 *regs; volatile uint32_t *wq_regs_base; volatile struct rte_idxd_grpcfg *grp_regs; diff --git a/drivers/dma/idxd/idxd_pci.c b/drivers/dma/idxd/idxd_pci.c index 65c6bbf4c1..918981f2ea 100644 --- a/drivers/dma/idxd/idxd_pci.c +++ b/drivers/dma/idxd/idxd_pci.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "idxd_internal.h" @@ -115,20 +116,38 @@ idxd_pci_dev_close(struct rte_dma_dev *dev) { struct idxd_dmadev *idxd = dev->fp_obj->dev_private; uint8_t err_code; + int is_last_wq; - /* disable the device */ - err_code = idxd_pci_dev_command(idxd, idxd_disable_dev); - if (err_code) { - IDXD_PMD_ERR("Error disabling device: code %#x", err_code); - return err_code; + if (idxd_is_wq_enabled(idxd)) { + /* disable the wq */ + err_code = idxd_pci_dev_command(idxd, idxd_disable_wq); + if (err_code) { + IDXD_PMD_ERR("Error disabling wq: code %#x", err_code); + return err_code; + } + IDXD_PMD_DEBUG("IDXD WQ disabled OK"); } - IDXD_PMD_DEBUG("IDXD Device disabled OK"); /* free device memory */ IDXD_PMD_DEBUG("Freeing device driver memory"); rte_free(idxd->batch_idx_ring); rte_free(idxd->desc_ring); + /* if this is the last WQ on the device, disable the device and free + * the PCI struct + */ + is_last_wq = rte_atomic16_dec_and_test(&idxd->u.pci->ref_count); + if (is_last_wq) { + /* disable the device */ + err_code = idxd_pci_dev_command(idxd, idxd_disable_dev); + if (err_code) { + IDXD_PMD_ERR("Error disabling device: code %#x", err_code); + return err_code; + } + IDXD_PMD_DEBUG("IDXD device disabled OK"); + rte_free(idxd->u.pci); + } + return 0; } @@ -159,12 +178,13 @@ init_pci_device(struct rte_pci_device *dev, struct idxd_dmadev *idxd, uint8_t lg2_max_batch, lg2_max_copy_size; unsigned int i, err_code; - pci = malloc(sizeof(*pci)); + pci = rte_malloc(NULL, sizeof(*pci), 0); if (pci == NULL) { IDXD_PMD_ERR("%s: Can't allocate memory", __func__); err_code = -1; goto err; } + memset(pci, 0, sizeof(*pci)); rte_spinlock_init(&pci->lk); /* assign the bar registers, and then configure device */ From patchwork Sun Jul 3 12:22:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 113654 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 AF748A04FD; Sun, 3 Jul 2022 14:22:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8086A4284D; Sun, 3 Jul 2022 14:22:15 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id A8A6741132; Sun, 3 Jul 2022 14:22:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656850932; x=1688386932; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oeaWO04MyJegroPDunsWKxL51hVWJ3PaVSOmiWqCj7A=; b=aaLiTzKugFEMShI5VIZHtu8+o2Omf2w6wD9jpBb7v+TJ4U7nWr6Y9iHR uEo90woXEzRRK/0CNZnKgbRPbFl0M+kza2v++FcP1yHfhaNI9a+h8g6uw b2je55QdAaC3nz18Eys1HKvFkIugidz7VvYjyNnNVClhVuEoFxdY4/uFV mH45O0T3l1v61NICSap2dKAUp9Zki5lKWFIfCAQVN/zq8rd9J6NxVDwhx kur16ajWR4nuL/QE4JM9plZqWmnfOHclq8pUIpdA+waMTVXO5WA4ngmfT is2oO/HO952OLTkv1Xxz0XsRjxHDxuM3GU4cR8ztxuYc+bq8OBV75X71B A==; X-IronPort-AV: E=McAfee;i="6400,9594,10396"; a="262737109" X-IronPort-AV: E=Sophos;i="5.92,241,1650956400"; d="scan'208";a="262737109" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2022 05:22:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,241,1650956400"; d="scan'208";a="618931240" Received: from silpixa00401122.ir.intel.com ([10.237.213.29]) by orsmga008.jf.intel.com with ESMTP; 03 Jul 2022 05:22:10 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, Kevin Laatz , stable@dpdk.org Subject: [PATCH v2 2/3] dma/idxd: fix memory leak due to free on incorrect pointer Date: Sun, 3 Jul 2022 13:22:42 +0100 Message-Id: <20220703122243.929642-3-kevin.laatz@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220703122243.929642-1-kevin.laatz@intel.com> References: <20220408141504.1319913-1-kevin.laatz@intel.com> <20220703122243.929642-1-kevin.laatz@intel.com> 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 During PCI device close, any allocated memory needs to be free'd. Currently, one of the free's is being called on an incorrect idxd_dmadev struct member, namely 'batch_idx_ring', causing a memleak from the pointer that should have been free'd. This patch fixes this memleak by calling free on the correct pointer. Fixes: 9449330a8458 ("dma/idxd: create dmadev instances on PCI probe") Cc: stable@dpdk.org Cc: bruce.richardson@intel.com Signed-off-by: Kevin Laatz Signed-off-by: Bruce Richardson Acked-by: Bruce Richardson --- drivers/dma/idxd/idxd_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/idxd/idxd_pci.c b/drivers/dma/idxd/idxd_pci.c index 918981f2ea..9349c56b3f 100644 --- a/drivers/dma/idxd/idxd_pci.c +++ b/drivers/dma/idxd/idxd_pci.c @@ -130,7 +130,7 @@ idxd_pci_dev_close(struct rte_dma_dev *dev) /* free device memory */ IDXD_PMD_DEBUG("Freeing device driver memory"); - rte_free(idxd->batch_idx_ring); + rte_free(idxd->batch_comp_ring); rte_free(idxd->desc_ring); /* if this is the last WQ on the device, disable the device and free From patchwork Sun Jul 3 12:22:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 113655 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 CE3A4A04FD; Sun, 3 Jul 2022 14:22:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8AB7642B6E; Sun, 3 Jul 2022 14:22:16 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 4686342847; Sun, 3 Jul 2022 14:22:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656850933; x=1688386933; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mtyXLv03QV+SmSKkkuYgmc+3WFVIz5FwjG1dkLXuVnk=; b=d7Cxf/K/8jhijDKqgen16LEqKbv0QkiE3kgIifhODiYRbw0m43Gf/MEP g1ViqQ4MLreHY7YMpRO/Ie0J8oGprvdphHs802L14mivUjRnFLbO07Hdw kS/1/zPapCucXQaF8EQnGY4R7h8A4tggecYknuSSKzLiB62sRd9CVmY13 HE3YymP33r68HWuQCM5D/6lSOXRuT8cUuVy+l2NLUWMwpFMboqpR41pvq maak+GSoia4cFloyioGZDcmM2PKdLV7mPc0Go8BSjGYSIY0VtLYFpH6c2 Y8elc1DsKrMyu5trDDstv+v5yWgzemGZgRB2tzGl2zRZblQyUVm89v4tq w==; X-IronPort-AV: E=McAfee;i="6400,9594,10396"; a="262737114" X-IronPort-AV: E=Sophos;i="5.92,241,1650956400"; d="scan'208";a="262737114" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2022 05:22:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,241,1650956400"; d="scan'208";a="618931248" Received: from silpixa00401122.ir.intel.com ([10.237.213.29]) by orsmga008.jf.intel.com with ESMTP; 03 Jul 2022 05:22:11 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, Kevin Laatz , stable@dpdk.org Subject: [PATCH v2 3/3] dma/idxd: fix null pointer dereference during pci remove Date: Sun, 3 Jul 2022 13:22:43 +0100 Message-Id: <20220703122243.929642-4-kevin.laatz@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220703122243.929642-1-kevin.laatz@intel.com> References: <20220408141504.1319913-1-kevin.laatz@intel.com> <20220703122243.929642-1-kevin.laatz@intel.com> 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 The 'info' struct was being declared as a NULL pointer. If a NULL pointer is passed to 'rte_dma_info_get', EINVAL is returned and the struct is not populated. This subsequently causes a segfault when dereferencing 'info'. This patch fixes the issue by simply declaring 'info' as a variable and passing its address to 'rte_dma_info_get'. Fixes: 9449330a8458 ("dma/idxd: create dmadev instances on PCI probe") Cc: stable@dpdk.org Signed-off-by: Kevin Laatz Acked-by: Bruce Richardson --- drivers/dma/idxd/idxd_pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/dma/idxd/idxd_pci.c b/drivers/dma/idxd/idxd_pci.c index 9349c56b3f..3c1effeb84 100644 --- a/drivers/dma/idxd/idxd_pci.c +++ b/drivers/dma/idxd/idxd_pci.c @@ -379,10 +379,10 @@ idxd_dmadev_remove_pci(struct rte_pci_device *dev) IDXD_PMD_INFO("Closing %s on NUMA node %d", name, dev->device.numa_node); RTE_DMA_FOREACH_DEV(i) { - struct rte_dma_info *info = {0}; - rte_dma_info_get(i, info); - if (strncmp(name, info->dev_name, strlen(name)) == 0) - idxd_dmadev_destroy(info->dev_name); + struct rte_dma_info info; + rte_dma_info_get(i, &info); + if (strncmp(name, info.dev_name, strlen(name)) == 0) + idxd_dmadev_destroy(info.dev_name); } return 0;