vxlan fdb nexthop misc fixes
Subsystems (2)
v2 cover vxlan fdb nexthop misc fixes
From: Roopa Prabhu <[email protected]>
Roopa Prabhu (3):
vxlan: add check to prevent use of remote ip attributes with NDA_NH_ID
vxlan: few locking fixes in nexthop event handler
vxlan: fix dereference of nexthop group in nexthop update path
drivers/net/vxlan.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-)
Signature · 1 line
2.1.4
PATCH v2 1/3 vxlan: add check to prevent use of remote ip attributes with NDA_NH_ID
From: Roopa Prabhu <[email protected]>
NDA_NH_ID represents a remote ip or a group of remote ips. It allows use of nexthop groups in lieu of a remote ip or a list of remote ips supported by the fdb api.
Current code ignores the other remote ip attrs when NDA_NH_ID is specified. In the spirit of strict checking, This commit adds a check to explicitly return an error on incorrect usage.
--- drivers/net/vxlan.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/vxlan.c +4 -0
@@ -1196,6 +1196,10 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,struct net *net =dev_net (vxlan->dev);int err; +if (tb[NDA_NH_ID ] && (tb[NDA_DST ] || tb[NDA_VNI ] || tb[NDA_IFINDEX ] || + tb[NDA_PORT ])) +return -EINVAL ; +if (tb[NDA_DST ]) { err =vxlan_nla_get_addr (ip, tb[NDA_DST ]);if (err)
Signature · 1 line
2.1.4
PATCH v2 2/3 vxlan: few locking fixes in nexthop event handler
In reply to Roopa PrabhuFrom: Roopa Prabhu <[email protected]>
- remove fdb from nh_list before the rcu grace period
- protect fdb->vdev with rcu
- hold spin lock before destroying fdb
--- drivers/net/vxlan.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)
drivers/net/vxlan.c +25 -7
@@ -81,7 +81,7 @@ struct vxlan_fdb {u16 flags;/* see ndm_flags and below */ struct list_head nh_list;struct nexthop __rcu *nh; -struct vxlan_dev *vdev; +struct vxlan_dev __rcu *vdev; };#define NTF_VXLAN_ADDED_BY_USER 0x100
@@ -837,7 +837,7 @@ static struct vxlan_fdb *vxlan_fdb_alloc(struct vxlan_dev *vxlan, const u8 *mac, f->updated = f->used = jiffies; f->vni = src_vni; f->nh =NULL ; - f->vdev = vxlan; +RCU_INIT_POINTER (f->vdev, vxlan);INIT_LIST_HEAD (&f->nh_list);INIT_LIST_HEAD (&f->remotes);memcpy (f->eth_addr, mac,ETH_ALEN );
@@ -963,7 +963,7 @@ static void __vxlan_fdb_free(struct vxlan_fdb *f) nh =rcu_dereference_raw (f->nh);if (nh) {rcu_assign_pointer (f->nh,NULL ); -list_del_rcu (&f->nh_list); +rcu_assign_pointer (f->vdev,NULL );nexthop_put (nh); }
@@ -1000,7 +1000,7 @@ static void vxlan_fdb_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f, }hlist_del_rcu (&f->hlist); - f->vdev =NULL ; +list_del_rcu (&f->nh_list);call_rcu (&f->rcu, vxlan_fdb_free); }
@@ -4615,17 +4615,35 @@ static struct notifier_block vxlan_switchdev_notifier_block __read_mostly = { .notifier_call = vxlan_switchdev_event, }; +static void vxlan_fdb_nh_flush (struct nexthop *nh) +{ +struct vxlan_fdb *fdb; +struct vxlan_dev *vxlan; +u32 hash_index; + +rcu_read_lock (); +list_for_each_entry_rcu (fdb, &nh->fdb_list, nh_list) { + vxlan =rcu_dereference (fdb->vdev); +WARN_ON (!vxlan); + hash_index =fdb_head_index (vxlan, fdb->eth_addr, + vxlan->default_dst.remote_vni); +spin_lock_bh (&vxlan->hash_lock[hash_index]); +if (!hlist_unhashed (&fdb->hlist)) +vxlan_fdb_destroy (vxlan, fdb, false, false); +spin_unlock_bh (&vxlan->hash_lock[hash_index]); + } +rcu_read_unlock (); +} +static int vxlan_nexthop_event (struct notifier_block *nb,unsigned long event,void *ptr) {struct nexthop *nh = ptr; -struct vxlan_fdb *fdb, *tmp;if (!nh || event !=NEXTHOP_EVENT_DEL )return NOTIFY_DONE ; -list_for_each_entry_safe (fdb, tmp, &nh->fdb_list, nh_list) -vxlan_fdb_destroy (fdb->vdev, fdb, false, false); +vxlan_fdb_nh_flush (nh);return NOTIFY_DONE ; }
Signature · 1 line
2.1.4
PATCH v2 3/3 vxlan: fix dereference of nexthop group in nexthop update path
In reply to Roopa PrabhuFrom: Roopa Prabhu <[email protected]>
fix dereference of nexthop group in fdb nexthop group update validation path.
--- drivers/net/vxlan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/vxlan.c +2 -2
@@ -881,13 +881,13 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb, goto err_inval; } -if (!nh->is_group || !nh->nh_grp->mpath) { + nhg =rtnl_dereference (nh->nh_grp); +if (!nh->is_group || !nhg->mpath) {NL_SET_ERR_MSG (extack,"Nexthop is not a multipath group" ); goto err_inval; }/* check nexthop group family */ - nhg =rtnl_dereference (nh->nh_grp);switch (vxlan->default_dst.remote_ip.sa.sa_family) {case AF_INET :if (!nhg->has_v4) {
Signature · 1 line
2.1.4
David Miller
maintainerFrom: Roopa Prabhu <[email protected]>
Date: Sat, 30 May 2020 21:48:38 -0700
Quoted 4 lines
Roopa Prabhu (3):
vxlan: add check to prevent use of remote ip attributes withNDA_NH_ID
vxlan: few locking fixes in nexthop event handler
vxlan: fix dereference of nexthop group in nexthop update path
Mid-air collision :-) I applied v1, could you please send something relative to that?
Thank you.
Quoted 11 lines · David Miller
From: Roopa Prabhu <[email protected]>
Date: Sat, 30 May 2020 21:48:38 -0700Quoted 4 lines
Roopa Prabhu (3):
vxlan: add check to prevent use of remote ip attributes withNDA_NH_ID
vxlan: few locking fixes in nexthop event handler
vxlan: fix dereference of nexthop group in nexthop update pathMid-air collision :-) I applied v1, could you please send something relative to that?
:) sure, will do. I will just send the third patch in this series separately. thanks.