From: Kevin Laatz <kevin.laatz@intel.com>
To: Bruce Richardson <bruce.richardson@intel.com>
Cc: <dev@dpdk.org>, <stable@dpdk.org>, Xingguang He <xingguang.he@intel.com>
Subject: Re: [PATCH v2 1/3] dma/idxd: fix memory leak in pci close
Date: Mon, 4 Jul 2022 14:34:31 +0100 [thread overview]
Message-ID: <f466476e-2380-b4e9-11b9-2d829f5a5568@intel.com> (raw)
In-Reply-To: <YsLo40l/Zr7sPq0T@bricha3-MOBL.ger.corp.intel.com>
On 04/07/2022 14:19, Bruce Richardson wrote:
> On Sun, Jul 03, 2022 at 01:22:41PM +0100, Kevin Laatz wrote:
>> 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 <xingguang.he@intel.com>
>> Signed-off-by: Kevin Laatz <kevin.laatz@intel.com>
>> ---
>> 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(-)
>>
> Some comments inline below.
>
> /Bruce
>
>> 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;
>>
> I don't think this belongs in the common code. Can it be put somewhere in
> the pci-specific driver code to avoid issues, e.g. after idxd_dmadev_create
> returns in probe_pci() function.
Sure, I'll look to move it in v3.
[snip]
>
> @@ -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);
> Any particular reason for the change from regular malloc to rte_malloc?
Mainly consistency, its the only place in the driver where malloc is
used instead of rte_malloc.
I have no strong preference here - I can remove the change for v3.
/Kevin
next prev parent reply other threads:[~2022-07-04 13:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220408141504.1319913-1-kevin.laatz@intel.com>
2022-04-08 14:15 ` [PATCH 1/5] " Kevin Laatz
2022-04-08 14:49 ` Bruce Richardson
2022-04-08 14:15 ` [PATCH 2/5] dma/idxd: fix memory leak due to free on incorrect pointer Kevin Laatz
2022-04-08 14:52 ` Bruce Richardson
2022-04-19 16:20 ` Kevin Laatz
2022-04-08 14:15 ` [PATCH 5/5] examples/dma: fix missing dma close Kevin Laatz
[not found] ` <20220703122243.929642-1-kevin.laatz@intel.com>
2022-07-03 12:22 ` [PATCH v2 1/3] dma/idxd: fix memory leak in pci close Kevin Laatz
2022-07-04 13:19 ` Bruce Richardson
2022-07-04 13:34 ` Kevin Laatz [this message]
2022-07-04 13:44 ` Bruce Richardson
2022-07-03 12:22 ` [PATCH v2 2/3] dma/idxd: fix memory leak due to free on incorrect pointer Kevin Laatz
2022-07-04 13:23 ` Bruce Richardson
2022-07-04 13:25 ` Bruce Richardson
2022-07-03 12:22 ` [PATCH v2 3/3] dma/idxd: fix null pointer dereference during pci remove Kevin Laatz
2022-07-04 13:25 ` Bruce Richardson
[not found] ` <20220704152751.943965-1-kevin.laatz@intel.com>
2022-07-04 15:27 ` [PATCH v3 1/3] dma/idxd: fix memory leak in pci close Kevin Laatz
2022-07-04 15:39 ` Bruce Richardson
2022-07-04 15:27 ` [PATCH v3 2/3] dma/idxd: fix memory leak due to free on incorrect pointer Kevin Laatz
2022-07-04 15:27 ` [PATCH v3 3/3] dma/idxd: fix null pointer dereference during pci remove Kevin Laatz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f466476e-2380-b4e9-11b9-2d829f5a5568@intel.com \
--to=kevin.laatz@intel.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
--cc=xingguang.he@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).