Commit 4a8937b8 authored by Chuhong Yuan's avatar Chuhong Yuan Committed by David S. Miller

cxgb4: smt: Add lock for atomic_dec_and_test

The atomic_dec_and_test() is not safe because it is
outside of locks.
Move the locks of t4_smte_free() to its caller,
cxgb4_smt_release() to protect the atomic decrement.

Fixes: 3bdb376e ("cxgb4: introduce SMT ops to prepare for SMAC rewrite support")
Signed-off-by: default avatarChuhong Yuan <hslester96@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e858ef1c
...@@ -97,11 +97,9 @@ static struct smt_entry *find_or_alloc_smte(struct smt_data *s, u8 *smac) ...@@ -97,11 +97,9 @@ static struct smt_entry *find_or_alloc_smte(struct smt_data *s, u8 *smac)
static void t4_smte_free(struct smt_entry *e) static void t4_smte_free(struct smt_entry *e)
{ {
spin_lock_bh(&e->lock);
if (atomic_read(&e->refcnt) == 0) { /* hasn't been recycled */ if (atomic_read(&e->refcnt) == 0) { /* hasn't been recycled */
e->state = SMT_STATE_UNUSED; e->state = SMT_STATE_UNUSED;
} }
spin_unlock_bh(&e->lock);
} }
/** /**
...@@ -111,8 +109,10 @@ static void t4_smte_free(struct smt_entry *e) ...@@ -111,8 +109,10 @@ static void t4_smte_free(struct smt_entry *e)
*/ */
void cxgb4_smt_release(struct smt_entry *e) void cxgb4_smt_release(struct smt_entry *e)
{ {
spin_lock_bh(&e->lock);
if (atomic_dec_and_test(&e->refcnt)) if (atomic_dec_and_test(&e->refcnt))
t4_smte_free(e); t4_smte_free(e);
spin_unlock_bh(&e->lock);
} }
EXPORT_SYMBOL(cxgb4_smt_release); EXPORT_SYMBOL(cxgb4_smt_release);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment