From patchwork Mon Jul 4 15:27:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 113661 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 A4945A0540; Mon, 4 Jul 2022 17:27:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D34624282B; Mon, 4 Jul 2022 17:27:39 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id A07EE40E09; Mon, 4 Jul 2022 17:27:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656948458; x=1688484458; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5x/yXjCUmEI0Inx5aCRWkFH+ZvFYLUquGQejNR4xaMA=; b=IWUKUOLdfQDYpEM/waQuYi2dz/Limclk1hnpSftrRuK2FpS5shd5ZYzV fMqmJ4cW22NAg1+/gDcDkrVaUy4EoubNFQt/cVVesG87pZQWdG2ayPTn7 nAml2tcZZ1Ya3clEVU5CafIH5yrjxcwraoQLQQc9VubvqaFcVyxYxfH4k /c1k4IWmh/B21Lwd2f5RxbOiy6H2QiP1AqqKhJJ/Hm5xZlMeUTAo62aM0 P35JlbrJIsoNm/36uIXoZnGf5ZTXvvlz5jqgmMuGNfwScIv+VTtIzOrbZ RW+1Wes9SKLYPZlOWOcZuSRo7wYsoBJYbHy7Koz8WIeHc/lV7TFl82IRc w==; X-IronPort-AV: E=McAfee;i="6400,9594,10398"; a="262946835" X-IronPort-AV: E=Sophos;i="5.92,243,1650956400"; d="scan'208";a="262946835" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2022 08:27:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,243,1650956400"; d="scan'208";a="682231004" Received: from silpixa00401122.ir.intel.com ([10.237.213.29]) by FMSMGA003.fm.intel.com with ESMTP; 04 Jul 2022 08:27:09 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, Kevin Laatz , stable@dpdk.org, Xingguang He Subject: [PATCH v3 1/3] dma/idxd: fix memory leak in pci close Date: Mon, 4 Jul 2022 16:27:49 +0100 Message-Id: <20220704152751.943965-2-kevin.laatz@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220704152751.943965-1-kevin.laatz@intel.com> References: <20220408141504.1319913-1-kevin.laatz@intel.com> <20220704152751.943965-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 Acked-by: Bruce Richardson --- v3: move ref_count increment to pci probe --- drivers/dma/idxd/idxd_internal.h | 2 ++ drivers/dma/idxd/idxd_pci.c | 35 +++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 7 deletions(-) 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..fb618d34b6 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 */ @@ -330,6 +350,7 @@ idxd_dmadev_probe_pci(struct rte_pci_driver *drv, struct rte_pci_device *dev) free(idxd.u.pci); return ret; } + rte_atomic16_inc(&idxd.u.pci->ref_count); } return 0; From patchwork Mon Jul 4 15:27:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 113662 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 38873A0540; Mon, 4 Jul 2022 17:27:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1E6A142B6F; Mon, 4 Jul 2022 17:27:41 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id F422A410E5; Mon, 4 Jul 2022 17:27:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656948458; x=1688484458; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vzNee63WJBwbDCVa81Njrjgevg5hmTVjSaZRO4wjgV8=; b=KiaOfasebiHDLNWz+TsN3hP9qzsuzZntfHcjzYmzOWtgXC77CkXoIlJv bujXo1p6cBg/hYsGCq6xUqGkBUct/OpSv4LcuB98l0cAu/hCl9iN4qp2h 0ZAumiXu3Wy8uuHM/cPOV52zyShAYxt80nEjC9YxG4fDBWk5w8m4XCThM lV080H+FW1nX/JsBvsZ9jwPtnO1YoTeVzL1eRn+DMMDo8+yQwOLD96zXh hYElaG1Neq5tfm4we+TFfo65lybohTMd7uPPEk1K9L2gbHu4r8es78B4S kbcngdrXLqPSK/68ia+lDaY0CrhwusVwpp0TSNCwzD9/yxtZ0eZSXr27D Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10398"; a="262946839" X-IronPort-AV: E=Sophos;i="5.92,243,1650956400"; d="scan'208";a="262946839" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2022 08:27:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,243,1650956400"; d="scan'208";a="682231011" Received: from silpixa00401122.ir.intel.com ([10.237.213.29]) by FMSMGA003.fm.intel.com with ESMTP; 04 Jul 2022 08:27:10 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, Kevin Laatz , stable@dpdk.org Subject: [PATCH v3 2/3] dma/idxd: fix memory leak due to free on incorrect pointer Date: Mon, 4 Jul 2022 16:27:50 +0100 Message-Id: <20220704152751.943965-3-kevin.laatz@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220704152751.943965-1-kevin.laatz@intel.com> References: <20220408141504.1319913-1-kevin.laatz@intel.com> <20220704152751.943965-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'. At device creation, memory is allocated for both 'batch_comp_ring' and 'batch_idx_ring' simultaeneously. Calling free only on 'batch_idx_ring' meant the first half of this memory was not being free'd, leading to the memleak. This patch fixes this memleak by calling free on 'batch_comp_ring' which will free the memory for both rings. Fixes: 9449330a8458 ("dma/idxd: create dmadev instances on PCI probe") Cc: stable@dpdk.org Cc: bruce.richardson@intel.com Signed-off-by: Kevin Laatz 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 fb618d34b6..2c3b01cd2b 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 Mon Jul 4 15:27:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 113663 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 0139AA0540; Mon, 4 Jul 2022 17:27:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2220742B73; Mon, 4 Jul 2022 17:27:42 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 6D3EC40E09; Mon, 4 Jul 2022 17:27:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656948458; x=1688484458; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tTzgjTPtKJyGFi85E66ohWVWqgfAUW5ECkd/53bJxlk=; b=ItGpVdIOeVXTvdLunXWPgHZ0erho4CQI4wBacWs5zVRP6I6NEaUCKs1Q vRhSfHnfqe0cQgywVuEFtQn3+MPDvq+1ErvMQ+p6E6ylrQPcSe+gzq3uu nJUubRTJjxIBszPn1SvHJ7Oo9Emd9VgEF5RkaVIW8s1Qq666Qb3FBZdnI jFqrtkESZlFux0BoeaqFSJ26N+S/6RQy0aeVk/Y/VnmUMTcW02k8kM/d7 SPP8w6GSPE9CVPO4o1nR5h8vUiHwD6lpWZJaFjcz+WTKdEmhyOFISvs70 IeANeHLMSmvBuOfGOfITSWy+YMCPO6FCC8gf1U2Z5H6utIbS1JdO2ruwB Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10398"; a="262946841" X-IronPort-AV: E=Sophos;i="5.92,243,1650956400"; d="scan'208";a="262946841" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2022 08:27:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,243,1650956400"; d="scan'208";a="682231016" Received: from silpixa00401122.ir.intel.com ([10.237.213.29]) by FMSMGA003.fm.intel.com with ESMTP; 04 Jul 2022 08:27:11 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, Kevin Laatz , stable@dpdk.org Subject: [PATCH v3 3/3] dma/idxd: fix null pointer dereference during pci remove Date: Mon, 4 Jul 2022 16:27:51 +0100 Message-Id: <20220704152751.943965-4-kevin.laatz@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220704152751.943965-1-kevin.laatz@intel.com> References: <20220408141504.1319913-1-kevin.laatz@intel.com> <20220704152751.943965-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' on the stack 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 2c3b01cd2b..2f8ec06d9e 100644 --- a/drivers/dma/idxd/idxd_pci.c +++ b/drivers/dma/idxd/idxd_pci.c @@ -380,10 +380,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;