korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-23 20:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: sched: flower: protect masks list with spinlock

Browse Source 
Protect modifications of flower masks list with spinlock to remove
dependency on rtnl lock and allow concurrent access.

Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vlad Buslov 2019-03-21 15:17:39 +02:00 committed by David S. Miller
parent 195c234d15
commit 259e60f967
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/sched/cls_flower.c
View File

@ -88,6 +88,7 @@ struct fl_flow_tmplt {
struct cls_fl_head { struct cls_fl_head {
struct rhashtable ht; struct rhashtable ht;
spinlock_t masks_lock; /* Protect masks list */
struct list_head masks; struct list_head masks;
struct rcu_work rwork; struct rcu_work rwork;
struct idr handle_idr; struct idr handle_idr;
@ -312,6 +313,7 @@ static int fl_init(struct tcf_proto *tp)
if (!head) if (!head)
return -ENOBUFS; return -ENOBUFS;
spin_lock_init(&head->masks_lock);
INIT_LIST_HEAD_RCU(&head->masks); INIT_LIST_HEAD_RCU(&head->masks);
rcu_assign_pointer(tp->root, head); rcu_assign_pointer(tp->root, head);
idr_init(&head->handle_idr); idr_init(&head->handle_idr);
@ -341,7 +343,11 @@ static bool fl_mask_put(struct cls_fl_head *head, struct fl_flow_mask *mask,
return false; return false;
rhashtable_remove_fast(&head->ht, &mask->ht_node, mask_ht_params); rhashtable_remove_fast(&head->ht, &mask->ht_node, mask_ht_params);
spin_lock(&head->masks_lock);
list_del_rcu(&mask->list); list_del_rcu(&mask->list);
spin_unlock(&head->masks_lock);
if (async) if (async)
tcf_queue_work(&mask->rwork, fl_mask_free_work); tcf_queue_work(&mask->rwork, fl_mask_free_work);
else else
@ -1312,7 +1318,9 @@ static struct fl_flow_mask *fl_create_new_mask(struct cls_fl_head *head,
/* Wait until any potential concurrent users of mask are finished */ /* Wait until any potential concurrent users of mask are finished */
synchronize_rcu(); synchronize_rcu();
spin_lock(&head->masks_lock);
list_add_tail_rcu(&newmask->list, &head->masks); list_add_tail_rcu(&newmask->list, &head->masks);
spin_unlock(&head->masks_lock);
return newmask; return newmask;