From: Simon Horman <simon.horman@corigine•com>
To: Przemek Kitszel <przemyslaw.kitszel@intel•com>
Cc: intel-wired-lan-bounces@osuosl•org,
Jesse Brandeburg <jesse.brandeburg@intel•com>,
Tony Nguyen <anthony.l.nguyen@intel•com>,
Anirudh Venkataramanan <anirudh.venkataramanan@intel•com>,
Victor Raj <victor.raj@intel•com>,
Michal Swiatkowski <michal.swiatkowski@linux•intel.com>,
Jacob Keller <jacob.e.keller@intel•com>,
Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux•intel.com>,
Michal Wilczynski <michal.wilczynski@intel•com>,
netdev@vger•kernel.org
Subject: Re: [PATCH iwl-next] ice: remove null checks before devm_kfree() calls
Date: Wed, 31 May 2023 09:36:32 +0200 [thread overview]
Message-ID: <ZHb5AIgL5SzBa5FA@corigine.com> (raw)
In-Reply-To: <08806483-959b-925d-2099-561d0f0278f8@intel.com>
On Wed, May 31, 2023 at 12:06:15AM +0200, Przemek Kitszel wrote:
> On 5/30/23 20:10, Simon Horman wrote:
> > On Tue, May 30, 2023 at 01:25:49PM +0200, Przemek Kitszel wrote:
> > > We all know they are redundant.
> > >
> > > Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux•intel.com>
> > > Reviewed-by: Michal Wilczynski <michal.wilczynski@intel•com>
> > > Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel•com>
> >
> > ...
> >
> > > diff --git a/drivers/net/ethernet/intel/ice/ice_flow.c b/drivers/net/ethernet/intel/ice/ice_flow.c
> > > index ef103e47a8dc..85cca572c22a 100644
> > > --- a/drivers/net/ethernet/intel/ice/ice_flow.c
> > > +++ b/drivers/net/ethernet/intel/ice/ice_flow.c
> > > @@ -1303,23 +1303,6 @@ ice_flow_find_prof_id(struct ice_hw *hw, enum ice_block blk, u64 prof_id)
> > > return NULL;
> > > }
> > > -/**
> > > - * ice_dealloc_flow_entry - Deallocate flow entry memory
> > > - * @hw: pointer to the HW struct
> > > - * @entry: flow entry to be removed
> > > - */
> > > -static void
> > > -ice_dealloc_flow_entry(struct ice_hw *hw, struct ice_flow_entry *entry)
> > > -{
> > > - if (!entry)
> > > - return;
> > > -
> > > - if (entry->entry)
> > > - devm_kfree(ice_hw_to_dev(hw), entry->entry);
> > > -
> > > - devm_kfree(ice_hw_to_dev(hw), entry);
> > > -}
> > > -
> > > /**
> > > * ice_flow_rem_entry_sync - Remove a flow entry
> > > * @hw: pointer to the HW struct
> > > @@ -1335,7 +1318,8 @@ ice_flow_rem_entry_sync(struct ice_hw *hw, enum ice_block __always_unused blk,
>
> More context would include following:
>
> if (!entry)
> return -EINVAL;
>
>
> > > list_del(&entry->l_entry);
> > > - ice_dealloc_flow_entry(hw, entry);
> > > + devm_kfree(ice_hw_to_dev(hw), entry->entry);
> >
> > Hi Przemek,
> >
> > Previously entry was not dereferenced if it was NULL.
> > Now it is. Can that occur?
>
> The check is right above the default 3-line context provided by git, see
> above.
Yes, right. Sorry for not checking that.
This does of course look good.
Reviewed-by: Simon Horman <simon.horman@corigine•com>
next prev parent reply other threads:[~2023-05-31 7:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-30 11:25 [PATCH iwl-next] ice: remove null checks before devm_kfree() calls Przemek Kitszel
2023-05-30 18:10 ` Simon Horman
2023-05-30 22:06 ` Przemek Kitszel
2023-05-31 7:36 ` Simon Horman [this message]
2023-05-30 20:24 ` Tony Nguyen
2023-05-30 21:54 ` Przemek Kitszel
2023-05-30 22:10 ` Tony Nguyen
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=ZHb5AIgL5SzBa5FA@corigine.com \
--to=simon.horman@corigine$(echo .)com \
--cc=anirudh.venkataramanan@intel$(echo .)com \
--cc=anthony.l.nguyen@intel$(echo .)com \
--cc=intel-wired-lan-bounces@osuosl$(echo .)org \
--cc=jacob.e.keller@intel$(echo .)com \
--cc=jesse.brandeburg@intel$(echo .)com \
--cc=martyna.szapar-mudlaw@linux$(echo .)intel.com \
--cc=michal.swiatkowski@linux$(echo .)intel.com \
--cc=michal.wilczynski@intel$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=przemyslaw.kitszel@intel$(echo .)com \
--cc=victor.raj@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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