cxgb4: smt: Use normal int for refcount
Subsystems (3)
PATCH 2/2 cxgb4: smt: Use normal int for refcount
All refcount operations are protected by spinlocks now. Then the atomic counter can be replaced by a normal int.
This patch depends on PATCH 1/2.
Signed-off-by Chuhong Yuan <[email protected]>
--- drivers/net/ethernet/chelsio/cxgb4/smt.c | 14 +++++++------- drivers/net/ethernet/chelsio/cxgb4/smt.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/smt.c +7 -7
@@ -57,7 +57,7 @@ struct smt_data *t4_init_smt(void) s->smtab[i].state =SMT_STATE_UNUSED ;memset (&s->smtab[i].src_mac,0 ,ETH_ALEN );spin_lock_init (&s->smtab[i].lock); -atomic_set (&s->smtab[i].refcnt,0 ); + s->smtab[i].refcnt =0 ; }return s; }
@@ -68,7 +68,7 @@ static struct smt_entry *find_or_alloc_smte(struct smt_data *s, u8 *smac)struct smt_entry *e, *end;for (e = &s->smtab[0 ], end = &s->smtab[s->smt_size]; e != end; ++e) { -if (atomic_read (&e->refcnt) ==0 ) { +if (e->refcnt ==0 ) {if (!first_free) first_free = e; }else {
@@ -97,7 +97,7 @@ static struct smt_entry *find_or_alloc_smte(struct smt_data *s, u8 *smac)static void t4_smte_free (struct smt_entry *e) { -if (atomic_read (&e->refcnt) ==0 ) {/* hasn't been recycled */ +if (e->refcnt ==0 ) {/* hasn't been recycled */ e->state =SMT_STATE_UNUSED ; } }
@@ -110,7 +110,7 @@ static void t4_smte_free(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 ((--e->refcnt) ==0 )t4_smte_free (e);spin_unlock_bh (&e->lock); }
@@ -215,14 +215,14 @@ static struct smt_entry *t4_smt_alloc_switching(struct adapter *adap, u16 pfvf, e =find_or_alloc_smte (s, smac);if (e) {spin_lock (&e->lock); -if (!atomic_read (&e->refcnt)) { -atomic_set (&e->refcnt,1 ); +if (!e->refcnt) { + e->refcnt =1 ; e->state =SMT_STATE_SWITCHING ; e->pfvf = pfvf;memcpy (e->src_mac, smac,ETH_ALEN );write_smt_entry (adap, e); }else { -atomic_inc (&e->refcnt); + ++e->refcnt; }spin_unlock (&e->lock); }
drivers/net/ethernet/chelsio/cxgb4/smt.h +1 -1
@@ -59,7 +59,7 @@ struct smt_entry {u16 idx;u16 pfvf;u8 src_mac[ETH_ALEN ]; -atomic_t refcnt; +int refcnt;spinlock_t lock;/* protect smt entry add,removal */ };
Signature · 1 line
2.20.1
From: Chuhong Yuan <[email protected]>
Date: Tue, 6 Aug 2019 10:58:54 +0800
Quoted 6 lines
All refcount operations are protected by spinlocks now. Then the atomic counter can be replaced by a normal int.
This patch depends on PATCH 1/2.
Signed-off-by Chuhong Yuan <[email protected]>
Applied.