| Message ID | 20240305160252.68708-1-przemyslaw.kitszel@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Anthony Nguyen |
| Headers | show |
| Series | [iwl-net] ixgbe: avoid sleeping allocation in ixgbe_ipsec_vf_add_sa() | expand |
On 3/5/2024 8:02 AM, Przemek Kitszel wrote: > Change kzalloc() flags used in ixgbe_ipsec_vf_add_sa() to GFP_ATOMIC, to > avoid sleeping in IRQ context. > > Dan Carpenter, with the help of Smatch, has found following issue: > The patch eda0333ac293: "ixgbe: add VF IPsec management" from Aug 13, > 2018 (linux-next), leads to the following Smatch static checker > warning: drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c:917 ixgbe_ipsec_vf_add_sa() > warn: sleeping in IRQ context > > The call tree that Smatch is worried about is: > ixgbe_msix_other() <- IRQ handler > -> ixgbe_msg_task() > -> ixgbe_rcv_msg_from_vf() > -> ixgbe_ipsec_vf_add_sa() > > Reported-by: Dan Carpenter <dan.carpenter@linaro.org> > Link: https://lore.kernel.org/intel-wired-lan/db31a0b0-4d9f-4e6b-aed8-88266eb5665c@moroto.mountain > Reviewed-by: Michal Kubiak <michal.kubiak@intel.com> > Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Thanks, that should work. Reviewed-by: Shannon Nelson <shannon.nelson@amd.com> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c > index 13a6fca31004..866024f2b9ee 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c > @@ -914,7 +914,13 @@ int ixgbe_ipsec_vf_add_sa(struct ixgbe_adapter *adapter, u32 *msgbuf, u32 vf) > goto err_out; > } > > - xs = kzalloc(sizeof(*xs), GFP_KERNEL); > + algo = xfrm_aead_get_byname(aes_gcm_name, IXGBE_IPSEC_AUTH_BITS, 1); > + if (unlikely(!algo)) { > + err = -ENOENT; > + goto err_out; > + } > + > + xs = kzalloc(sizeof(*xs), GFP_ATOMIC); > if (unlikely(!xs)) { > err = -ENOMEM; > goto err_out; > @@ -930,14 +936,8 @@ int ixgbe_ipsec_vf_add_sa(struct ixgbe_adapter *adapter, u32 *msgbuf, u32 vf) > memcpy(&xs->id.daddr.a4, sam->addr, sizeof(xs->id.daddr.a4)); > xs->xso.dev = adapter->netdev; > > - algo = xfrm_aead_get_byname(aes_gcm_name, IXGBE_IPSEC_AUTH_BITS, 1); > - if (unlikely(!algo)) { > - err = -ENOENT; > - goto err_xs; > - } > - > aead_len = sizeof(*xs->aead) + IXGBE_IPSEC_KEY_BITS / 8; > - xs->aead = kzalloc(aead_len, GFP_KERNEL); > + xs->aead = kzalloc(aead_len, GFP_ATOMIC); > if (unlikely(!xs->aead)) { > err = -ENOMEM; > goto err_xs; > > base-commit: 9b23fceb4158a3636ce4a2bda28ab03dcfa6a26f > -- > 2.43.0 >
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Przemek Kitszel > Sent: Tuesday, March 5, 2024 9:32 PM > To: intel-wired-lan@lists.osuosl.org > Cc: netdev@vger.kernel.org; Czapnik, Lukasz <lukasz.czapnik@intel.com>; Kubiak, Michal <michal.kubiak@intel.com>; Nguyen, Anthony L <anthony.l.nguyen@intel.com>; Kitszel, Przemyslaw <przemyslaw.kitszel@intel.com>; Dan Carpenter <dan.carpenter@linaro.org>; Shannon Nelson <shannon.nelson@amd.com> > Subject: [Intel-wired-lan] [PATCH iwl-net] ixgbe: avoid sleeping allocation in ixgbe_ipsec_vf_add_sa() > > Change kzalloc() flags used in ixgbe_ipsec_vf_add_sa() to GFP_ATOMIC, to avoid sleeping in IRQ context. > > Dan Carpenter, with the help of Smatch, has found following issue: > The patch eda0333ac293: "ixgbe: add VF IPsec management" from Aug 13, > 2018 (linux-next), leads to the following Smatch static checker > warning: drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c:917 ixgbe_ipsec_vf_add_sa() > warn: sleeping in IRQ context > > The call tree that Smatch is worried about is: > ixgbe_msix_other() <- IRQ handler > -> ixgbe_msg_task() > -> ixgbe_rcv_msg_from_vf() > -> ixgbe_ipsec_vf_add_sa() > > Reported-by: Dan Carpenter <dan.carpenter@linaro.org> > Link: https://lore.kernel.org/intel-wired-lan/db31a0b0-4d9f-4e6b-aed8-88266eb5665c@moroto.mountain > Reviewed-by: Michal Kubiak <michal.kubiak@intel.com> > Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c index 13a6fca31004..866024f2b9ee 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c @@ -914,7 +914,13 @@ int ixgbe_ipsec_vf_add_sa(struct ixgbe_adapter *adapter, u32 *msgbuf, u32 vf) goto err_out; } - xs = kzalloc(sizeof(*xs), GFP_KERNEL); + algo = xfrm_aead_get_byname(aes_gcm_name, IXGBE_IPSEC_AUTH_BITS, 1); + if (unlikely(!algo)) { + err = -ENOENT; + goto err_out; + } + + xs = kzalloc(sizeof(*xs), GFP_ATOMIC); if (unlikely(!xs)) { err = -ENOMEM; goto err_out; @@ -930,14 +936,8 @@ int ixgbe_ipsec_vf_add_sa(struct ixgbe_adapter *adapter, u32 *msgbuf, u32 vf) memcpy(&xs->id.daddr.a4, sam->addr, sizeof(xs->id.daddr.a4)); xs->xso.dev = adapter->netdev; - algo = xfrm_aead_get_byname(aes_gcm_name, IXGBE_IPSEC_AUTH_BITS, 1); - if (unlikely(!algo)) { - err = -ENOENT; - goto err_xs; - } - aead_len = sizeof(*xs->aead) + IXGBE_IPSEC_KEY_BITS / 8; - xs->aead = kzalloc(aead_len, GFP_KERNEL); + xs->aead = kzalloc(aead_len, GFP_ATOMIC); if (unlikely(!xs->aead)) { err = -ENOMEM; goto err_xs;
Change kzalloc() flags used in ixgbe_ipsec_vf_add_sa() to GFP_ATOMIC, to avoid sleeping in IRQ context. Dan Carpenter, with the help of Smatch, has found following issue: The patch eda0333ac293: "ixgbe: add VF IPsec management" from Aug 13, 2018 (linux-next), leads to the following Smatch static checker warning: drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c:917 ixgbe_ipsec_vf_add_sa() warn: sleeping in IRQ context The call tree that Smatch is worried about is: ixgbe_msix_other() <- IRQ handler -> ixgbe_msg_task() -> ixgbe_rcv_msg_from_vf() -> ixgbe_ipsec_vf_add_sa() Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://lore.kernel.org/intel-wired-lan/db31a0b0-4d9f-4e6b-aed8-88266eb5665c@moroto.mountain Reviewed-by: Michal Kubiak <michal.kubiak@intel.com> Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> --- drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) base-commit: 9b23fceb4158a3636ce4a2bda28ab03dcfa6a26f