net/mlx5e: Fixed sleeping inside atomic context

We can't allocate with GFP_KERNEL inside spinlock.
Actually ida_simple doesn't require spinlock so remove it.

Fixes: 547eede070eb ("net/mlx5e: IPSec, Innova IPSec offload infrastructure")
Signed-off-by: Aviad Yehezkel <aviadye@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
index bac5103efad3d4e25bc9b0c8d615de387ab87916..710521181143442ceccaf114ce405f896a2e4f1c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
@@ -74,18 +74,16 @@ static int mlx5e_ipsec_sadb_rx_add(struct mlx5e_ipsec_sa_entry *sa_entry)
        unsigned long flags;
        int ret;
 
-       spin_lock_irqsave(&ipsec->sadb_rx_lock, flags);
        ret = ida_simple_get(&ipsec->halloc, 1, 0, GFP_KERNEL);
        if (ret < 0)
-               goto out;
+               return ret;
 
+       spin_lock_irqsave(&ipsec->sadb_rx_lock, flags);
        sa_entry->handle = ret;
        hash_add_rcu(ipsec->sadb_rx, &sa_entry->hlist, sa_entry->handle);
-       ret = 0;
-
-out:
        spin_unlock_irqrestore(&ipsec->sadb_rx_lock, flags);
-       return ret;
+
+       return 0;
 }
 
 static void mlx5e_ipsec_sadb_rx_del(struct mlx5e_ipsec_sa_entry *sa_entry)
@@ -101,13 +99,10 @@ static void mlx5e_ipsec_sadb_rx_del(struct mlx5e_ipsec_sa_entry *sa_entry)
 static void mlx5e_ipsec_sadb_rx_free(struct mlx5e_ipsec_sa_entry *sa_entry)
 {
        struct mlx5e_ipsec *ipsec = sa_entry->ipsec;
-       unsigned long flags;
 
        /* Wait for the hash_del_rcu call in sadb_rx_del to affect data path */
        synchronize_rcu();
-       spin_lock_irqsave(&ipsec->sadb_rx_lock, flags);
        ida_simple_remove(&ipsec->halloc, sa_entry->handle);
-       spin_unlock_irqrestore(&ipsec->sadb_rx_lock, flags);
 }
 
 static enum mlx5_accel_ipsec_enc_mode mlx5e_ipsec_enc_mode(struct xfrm_state *x)