]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ixgbe: avoid sleeping allocation in ixgbe_ipsec_vf_add_sa()
authorPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Tue, 5 Mar 2024 16:02:02 +0000 (17:02 +0100)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Mon, 25 Mar 2024 16:57:21 +0000 (09:57 -0700)
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()

Fixes: eda0333ac293 ("ixgbe: add VF IPsec management")
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>
Reviewed-by: Shannon Nelson <shannon.nelson@amd.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c

index 13a6fca31004a8e1c69d7b8a994b5da93ca08b3c..866024f2b9eeb380d31557b53f2c7e00fe41a15a 100644 (file)
@@ -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;