Commit 4c00dafc authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller

mlxsw: spectrum_span: Use 'refcount_t' for reference counting

'refcount_t' is very useful for catching over/under flows. Convert the
SPAN agent objects to use it instead of 'int' for their reference count.
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c0c2899c
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/refcount.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <net/arp.h> #include <net/arp.h>
...@@ -664,7 +665,7 @@ mlxsw_sp_span_entry_create(struct mlxsw_sp *mlxsw_sp, ...@@ -664,7 +665,7 @@ mlxsw_sp_span_entry_create(struct mlxsw_sp *mlxsw_sp,
/* find a free entry to use */ /* find a free entry to use */
for (i = 0; i < mlxsw_sp->span->entries_count; i++) { for (i = 0; i < mlxsw_sp->span->entries_count; i++) {
if (!mlxsw_sp->span->entries[i].ref_count) { if (!refcount_read(&mlxsw_sp->span->entries[i].ref_count)) {
span_entry = &mlxsw_sp->span->entries[i]; span_entry = &mlxsw_sp->span->entries[i];
break; break;
} }
...@@ -674,7 +675,7 @@ mlxsw_sp_span_entry_create(struct mlxsw_sp *mlxsw_sp, ...@@ -674,7 +675,7 @@ mlxsw_sp_span_entry_create(struct mlxsw_sp *mlxsw_sp,
atomic_inc(&mlxsw_sp->span->active_entries_count); atomic_inc(&mlxsw_sp->span->active_entries_count);
span_entry->ops = ops; span_entry->ops = ops;
span_entry->ref_count = 1; refcount_set(&span_entry->ref_count, 1);
span_entry->to_dev = to_dev; span_entry->to_dev = to_dev;
mlxsw_sp_span_entry_configure(mlxsw_sp, span_entry, sparms); mlxsw_sp_span_entry_configure(mlxsw_sp, span_entry, sparms);
...@@ -697,7 +698,7 @@ mlxsw_sp_span_entry_find_by_port(struct mlxsw_sp *mlxsw_sp, ...@@ -697,7 +698,7 @@ mlxsw_sp_span_entry_find_by_port(struct mlxsw_sp *mlxsw_sp,
for (i = 0; i < mlxsw_sp->span->entries_count; i++) { for (i = 0; i < mlxsw_sp->span->entries_count; i++) {
struct mlxsw_sp_span_entry *curr = &mlxsw_sp->span->entries[i]; struct mlxsw_sp_span_entry *curr = &mlxsw_sp->span->entries[i];
if (curr->ref_count && curr->to_dev == to_dev) if (refcount_read(&curr->ref_count) && curr->to_dev == to_dev)
return curr; return curr;
} }
return NULL; return NULL;
...@@ -718,7 +719,7 @@ mlxsw_sp_span_entry_find_by_id(struct mlxsw_sp *mlxsw_sp, int span_id) ...@@ -718,7 +719,7 @@ mlxsw_sp_span_entry_find_by_id(struct mlxsw_sp *mlxsw_sp, int span_id)
for (i = 0; i < mlxsw_sp->span->entries_count; i++) { for (i = 0; i < mlxsw_sp->span->entries_count; i++) {
struct mlxsw_sp_span_entry *curr = &mlxsw_sp->span->entries[i]; struct mlxsw_sp_span_entry *curr = &mlxsw_sp->span->entries[i];
if (curr->ref_count && curr->id == span_id) if (refcount_read(&curr->ref_count) && curr->id == span_id)
return curr; return curr;
} }
return NULL; return NULL;
...@@ -735,7 +736,7 @@ mlxsw_sp_span_entry_get(struct mlxsw_sp *mlxsw_sp, ...@@ -735,7 +736,7 @@ mlxsw_sp_span_entry_get(struct mlxsw_sp *mlxsw_sp,
span_entry = mlxsw_sp_span_entry_find_by_port(mlxsw_sp, to_dev); span_entry = mlxsw_sp_span_entry_find_by_port(mlxsw_sp, to_dev);
if (span_entry) { if (span_entry) {
/* Already exists, just take a reference */ /* Already exists, just take a reference */
span_entry->ref_count++; refcount_inc(&span_entry->ref_count);
return span_entry; return span_entry;
} }
...@@ -745,8 +746,7 @@ mlxsw_sp_span_entry_get(struct mlxsw_sp *mlxsw_sp, ...@@ -745,8 +746,7 @@ mlxsw_sp_span_entry_get(struct mlxsw_sp *mlxsw_sp,
static int mlxsw_sp_span_entry_put(struct mlxsw_sp *mlxsw_sp, static int mlxsw_sp_span_entry_put(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_span_entry *span_entry) struct mlxsw_sp_span_entry *span_entry)
{ {
WARN_ON(!span_entry->ref_count); if (refcount_dec_and_test(&span_entry->ref_count))
if (--span_entry->ref_count == 0)
mlxsw_sp_span_entry_destroy(mlxsw_sp, span_entry); mlxsw_sp_span_entry_destroy(mlxsw_sp, span_entry);
return 0; return 0;
} }
...@@ -1018,7 +1018,7 @@ static void mlxsw_sp_span_respin_work(struct work_struct *work) ...@@ -1018,7 +1018,7 @@ static void mlxsw_sp_span_respin_work(struct work_struct *work)
struct mlxsw_sp_span_entry *curr = &mlxsw_sp->span->entries[i]; struct mlxsw_sp_span_entry *curr = &mlxsw_sp->span->entries[i];
struct mlxsw_sp_span_parms sparms = {NULL}; struct mlxsw_sp_span_parms sparms = {NULL};
if (!curr->ref_count) if (!refcount_read(&curr->ref_count))
continue; continue;
err = curr->ops->parms_set(curr->to_dev, &sparms); err = curr->ops->parms_set(curr->to_dev, &sparms);
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/refcount.h>
#include "spectrum_router.h" #include "spectrum_router.h"
...@@ -43,7 +44,7 @@ struct mlxsw_sp_span_entry { ...@@ -43,7 +44,7 @@ struct mlxsw_sp_span_entry {
const struct mlxsw_sp_span_entry_ops *ops; const struct mlxsw_sp_span_entry_ops *ops;
struct mlxsw_sp_span_parms parms; struct mlxsw_sp_span_parms parms;
struct list_head bound_ports_list; struct list_head bound_ports_list;
int ref_count; refcount_t ref_count;
int id; int id;
}; };
......
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