| Message ID | d39bbffb8817499cc2ae636cdef3b9c1eba59618.1705771534.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ixgbe: Fix an error handling path in ixgbe_read_iosf_sb_reg_x550() | expand |
On Sat, Jan 20, 2024 at 06:25:36PM +0100, Christophe JAILLET wrote: > All error handling paths, except this one, go to 'out' where > release_swfw_sync() is called. > This call balances the acquire_swfw_sync() call done at the beginning of > the function. > > Branch to the error handling path in order to correctly release some > resources in case of error. > > Fixes: ae14a1d8e104 ("ixgbe: Fix IOSF SB access issues") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Simon Horman <horms@kernel.org>
Le 24/01/2024 à 05:00, Pucha, HimasekharX Reddy a écrit : > Hi, > > Can you share testing hints for this patch. Hi, No I can't. It was spotted by one of my cocci script that tries to find issues related to direct return when a function also has an error handling path + manual review so see if it looks like a real issue. As said in the patch, "This patch is speculative, review with care.". That means that it was not tested from my side. I don't have the hardware, and don't know how to trigger the issue. All I know is that the code looks wrong *to me*. Maybe someone at intel.com could give this hint? :) CJ > Regards, > Himasekhar Reddy. > > -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Christophe JAILLET > Sent: Saturday, January 20, 2024 10:56 PM > To: Brandeburg, Jesse <jesse.brandeburg@intel.com>; Nguyen, Anthony L <anthony.l.nguyen@intel.com>; David S. Miller <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; Jeff Kirsher <jeffrey.t.kirsher@intel.com>; Rustad, Mark D <mark.d.rustad@intel.com> > Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>; intel-wired-lan@lists.osuosl.org; kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org; netdev@vger.kernel.org > Subject: [Intel-wired-lan] [PATCH] ixgbe: Fix an error handling path in ixgbe_read_iosf_sb_reg_x550() > > All error handling paths, except this one, go to 'out' where > release_swfw_sync() is called. > This call balances the acquire_swfw_sync() call done at the beginning of > the function. > > Branch to the error handling path in order to correctly release some > resources in case of error. > > Fixes: ae14a1d8e104 ("ixgbe: Fix IOSF SB access issues") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > This patch is speculative, review with care. > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c > index 6208923e29a2..c1adc94a5a65 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c > @@ -716,7 +716,8 @@ static s32 ixgbe_read_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr, > if ((command & IXGBE_SB_IOSF_CTRL_RESP_STAT_MASK) != 0) { > error = FIELD_GET(IXGBE_SB_IOSF_CTRL_CMPL_ERR_MASK, command); > hw_dbg(hw, "Failed to read, error %x\n", error); > - return -EIO; > + ret = -EIO; > + goto out; > } > > if (!ret)
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Christophe JAILLET > Sent: Saturday, January 20, 2024 10:56 PM > To: Brandeburg, Jesse <jesse.brandeburg@intel.com>; Nguyen, Anthony L <anthony.l.nguyen@intel.com>; David S. Miller <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; Jeff Kirsher <jeffrey.t.kirsher@intel.com>; Rustad, Mark D <mark.d.rustad@intel.com> > Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>; intel-wired-lan@lists.osuosl.org; kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org; netdev@vger.kernel.org > Subject: [Intel-wired-lan] [PATCH] ixgbe: Fix an error handling path in ixgbe_read_iosf_sb_reg_x550() > > All error handling paths, except this one, go to 'out' where > release_swfw_sync() is called. > This call balances the acquire_swfw_sync() call done at the beginning of > the function. > > Branch to the error handling path in order to correctly release some > resources in case of error. > > Fixes: ae14a1d8e104 ("ixgbe: Fix IOSF SB access issues") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > This patch is speculative, review with care. > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c index 6208923e29a2..c1adc94a5a65 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c @@ -716,7 +716,8 @@ static s32 ixgbe_read_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr, if ((command & IXGBE_SB_IOSF_CTRL_RESP_STAT_MASK) != 0) { error = FIELD_GET(IXGBE_SB_IOSF_CTRL_CMPL_ERR_MASK, command); hw_dbg(hw, "Failed to read, error %x\n", error); - return -EIO; + ret = -EIO; + goto out; } if (!ret)
All error handling paths, except this one, go to 'out' where release_swfw_sync() is called. This call balances the acquire_swfw_sync() call done at the beginning of the function. Branch to the error handling path in order to correctly release some resources in case of error. Fixes: ae14a1d8e104 ("ixgbe: Fix IOSF SB access issues") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- This patch is speculative, review with care. --- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)