From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
To: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Cc: kuba@kernel.org, sgoutham@marvell.com, gakula@marvell.com,
sbhatta@marvell.com, hkelam@marvell.com, davem@davemloft.net,
edumazet@google.com, pabeni@redhat.com, richardcochran@gmail.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] octeontx2-vf: Add missing free for alloc_percpu
Date: Fri, 17 Mar 2023 10:00:28 +0100 [thread overview]
Message-ID: <ZBQsIrtlGNuJEZCM@localhost.localdomain> (raw)
In-Reply-To: <ZBQiPmhuH7aNJo5p@localhost.localdomain>
On Fri, Mar 17, 2023 at 09:18:06AM +0100, Michal Swiatkowski wrote:
> On Fri, Mar 17, 2023 at 02:43:37PM +0800, Jiasheng Jiang wrote:
> > Add the free_percpu for the allocated "vf->hw.lmt_info" in order to avoid
> > memory leak, same as the "pf->hw.lmt_info" in
> > `drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c`.
> >
> > Fixes: 5c0512072f65 ("octeontx2-pf: cn10k: Use runtime allocated LMTLINE region")
> > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> > Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
> > Acked-by: Geethasowjanya Akula <gakula@marvell.com>
> > ---
> > Changelog:
> >
> > v1 -> v2:
> >
> > 1. Remove the if () checks.
> Hi,
>
> Did You change that because of my comments? I am not sure it is correct.
> I meant moving these two ifs to new function, because they are called
> two times. It will be easier to do changes in the future.
>
> void cn10k_lmtst_deinit(struct otx2_nic *pfvf)
> {
> if (vf->hw.lmt_info)
> free_percpu(vf->hw.lmt_info);
> if (test_bit(CN10K_LMTST, &vf->hw.cap_flag))
> qmem_free(vf->dev, vf->dync_lmt);
> }
>
> Thanks,
> Michal
>
Sorry, ignore, I just saw a message that free_percpu handle NULL
correctly.
> > ---
> > drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
> > index 7f8ffbf79cf7..ab126f8706c7 100644
> > --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
> > +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
> > @@ -709,6 +709,7 @@ static int otx2vf_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> > err_ptp_destroy:
> > otx2_ptp_destroy(vf);
> > err_detach_rsrc:
> > + free_percpu(vf->hw.lmt_info);
> > if (test_bit(CN10K_LMTST, &vf->hw.cap_flag))
> > qmem_free(vf->dev, vf->dync_lmt);
> > otx2_detach_resources(&vf->mbox);
> > @@ -762,6 +763,7 @@ static void otx2vf_remove(struct pci_dev *pdev)
> > otx2_shutdown_tc(vf);
> > otx2vf_disable_mbox_intr(vf);
> > otx2_detach_resources(&vf->mbox);
> > + free_percpu(vf->hw.lmt_info);
> > if (test_bit(CN10K_LMTST, &vf->hw.cap_flag))
> > qmem_free(vf->dev, vf->dync_lmt);
> > otx2vf_vfaf_mbox_destroy(vf);
> > --
> > 2.25.1
> >
next prev parent reply other threads:[~2023-03-17 9:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-17 6:43 [PATCH v2] octeontx2-vf: Add missing free for alloc_percpu Jiasheng Jiang
2023-03-17 8:18 ` Michal Swiatkowski
2023-03-17 9:00 ` Michal Swiatkowski [this message]
2023-03-21 5:10 ` patchwork-bot+netdevbpf
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=ZBQsIrtlGNuJEZCM@localhost.localdomain \
--to=michal.swiatkowski@linux.intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gakula@marvell.com \
--cc=hkelam@marvell.com \
--cc=jiasheng@iscas.ac.cn \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
--cc=sbhatta@marvell.com \
--cc=sgoutham@marvell.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.