From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 316BBA0540 for ; Wed, 6 Jul 2022 22:36:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C2EC40A7F; Wed, 6 Jul 2022 22:36:35 +0200 (CEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id E8A6240691 for ; Wed, 6 Jul 2022 22:36:33 +0200 (CEST) Received: by mail-wm1-f46.google.com with SMTP id h127-20020a1c2185000000b003a2cc290135so22918wmh.2 for ; Wed, 06 Jul 2022 13:36:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z08D7IIVfNavpI8ttCOjTy1PzXmAfqC4466k6jhDuSY=; b=U9FDXqSAsxzITpTK2G8rfLP5XL29auVbg9EabwZhlV6QH/N+MBTrl/dG0/SVG5Kzof L5tAkPrlw/+47m17RYNbK3SRyI2GaZ2mDuXKBjU5Ra40dgbhFnYoBu1xLRCOwpQafhnR fGxPkx6lq7VlIdo5M/1hfw2Wh9PSoS9xqDacDxmm9BYs+zlSapQQ7ajsMqt5c51Uox4z nxAhA5desKtmyJMNbZ63owiv3GJtcA0OCkHnHgLZiploeJXAogFKjSQf0n/aA1lflPRL 3vz9gWcf0+7rboADPzFC6RVEX/rZHuSAAS7/nBCXDngGJxCtZdtIeMeul00kcWingv7g BFCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z08D7IIVfNavpI8ttCOjTy1PzXmAfqC4466k6jhDuSY=; b=SratjVXPdsO7LGgCDgHNSYq62srMFnv300m7+MZxolO6VDK23enC5LRmvAWyzM5E0v Uz4729e7TYyHzNp48j6nSIQ8TzxISHMgi3iY11QGLQxbjF31SCJpe0bNcsio/x99SzUl E+LjgDIz/HbnQEDgk7RGttit8NOGiEefHcTwoX9LjsqzCjZJ7gu2yRyDslXX+iXfPykw XiK0rDhBlOWX4urALjz56i47hiS9NR16G4b4qb+ZLeOAzA0O4Ppvt5ECV57xTEeUBtWT pAjjTTSh9r/1fqNx0ubLinh2o76J58VxuVlSpytRd5Z+HeXSZVf4fE+20edaO8e/TKpJ Q7ww== X-Gm-Message-State: AJIora+yV9jzFiMxo1Vp1uyHBy2dCZ91/jU8gG/q9eZkbEoE4H/OOjvw j5GwPsYsBg1YdZ5qfm205PqHRZanIH03TQ== X-Google-Smtp-Source: AGRyM1vRvCnqFdGyUhqmvodSmJJeDK99p9ca9tQhqK7jgkryLkJZtmNrbLr/oh1TWiN+7VDzlUmVag== X-Received: by 2002:a05:600c:509:b0:3a0:45d9:43e7 with SMTP id i9-20020a05600c050900b003a045d943e7mr437981wmc.176.1657139792706; Wed, 06 Jul 2022 13:36:32 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id m1-20020a7bcb81000000b003a05621dc53sm26638935wmi.29.2022.07.06.13.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 13:36:32 -0700 (PDT) From: luca.boccassi@gmail.com To: Kevin Laatz Cc: Xingguang He , Bruce Richardson , dpdk stable Subject: patch 'dma/idxd: fix memory leak in PCI close' has been queued to stable release 21.11.2 Date: Wed, 6 Jul 2022 21:35:01 +0100 Message-Id: <20220706203506.3422496-26-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220706203506.3422496-1-luca.boccassi@gmail.com> References: <20220628151938.2278711-26-ktraynor@redhat.com> <20220706203506.3422496-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/08/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/1fd4a985e4f5869fa5c04f06d6b22c7d33f046a4 Thanks. Luca Boccassi --- >From 1fd4a985e4f5869fa5c04f06d6b22c7d33f046a4 Mon Sep 17 00:00:00 2001 From: Kevin Laatz Date: Mon, 4 Jul 2022 16:27:49 +0100 Subject: [PATCH] dma/idxd: fix memory leak in PCI close [ upstream commit 8a6eb404c4a1e312a13d3a374b0cf3dcdc429ba7 ] 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") Reported-by: Xingguang He Signed-off-by: Kevin Laatz Acked-by: Bruce Richardson --- 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; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-06 21:07:54.462911627 +0100 +++ 0026-dma-idxd-fix-memory-leak-in-PCI-close.patch 2022-07-06 21:07:53.579519398 +0100 @@ -1 +1 @@ -From 8a6eb404c4a1e312a13d3a374b0cf3dcdc429ba7 Mon Sep 17 00:00:00 2001 +From 1fd4a985e4f5869fa5c04f06d6b22c7d33f046a4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8a6eb404c4a1e312a13d3a374b0cf3dcdc429ba7 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org