Commit 5ca5461c authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller

vxlan: fix rcu related warning

Vxlan remote list is protected by RCU and guaranteed to be non-empty.
Split out the rcu and non-rcu access to the list to fix warning
Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 762a3d89
...@@ -177,9 +177,14 @@ static inline struct hlist_head *vs_head(struct net *net, __be16 port) ...@@ -177,9 +177,14 @@ static inline struct hlist_head *vs_head(struct net *net, __be16 port)
/* First remote destination for a forwarding entry. /* First remote destination for a forwarding entry.
* Guaranteed to be non-NULL because remotes are never deleted. * Guaranteed to be non-NULL because remotes are never deleted.
*/ */
static inline struct vxlan_rdst *first_remote(struct vxlan_fdb *fdb) static inline struct vxlan_rdst *first_remote_rcu(struct vxlan_fdb *fdb)
{ {
return list_first_or_null_rcu(&fdb->remotes, struct vxlan_rdst, list); return list_entry_rcu(fdb->remotes.next, struct vxlan_rdst, list);
}
static inline struct vxlan_rdst *first_remote_rtnl(struct vxlan_fdb *fdb)
{
return list_first_entry(&fdb->remotes, struct vxlan_rdst, list);
} }
/* Find VXLAN socket based on network namespace and UDP port */ /* Find VXLAN socket based on network namespace and UDP port */
...@@ -297,7 +302,8 @@ static void vxlan_fdb_notify(struct vxlan_dev *vxlan, ...@@ -297,7 +302,8 @@ static void vxlan_fdb_notify(struct vxlan_dev *vxlan,
if (skb == NULL) if (skb == NULL)
goto errout; goto errout;
err = vxlan_fdb_info(skb, vxlan, fdb, 0, 0, type, 0, first_remote(fdb)); err = vxlan_fdb_info(skb, vxlan, fdb, 0, 0, type, 0,
first_remote_rtnl(fdb));
if (err < 0) { if (err < 0) {
/* -EMSGSIZE implies BUG in vxlan_nlmsg_size() */ /* -EMSGSIZE implies BUG in vxlan_nlmsg_size() */
WARN_ON(err == -EMSGSIZE); WARN_ON(err == -EMSGSIZE);
...@@ -740,7 +746,7 @@ static bool vxlan_snoop(struct net_device *dev, ...@@ -740,7 +746,7 @@ static bool vxlan_snoop(struct net_device *dev,
f = vxlan_find_mac(vxlan, src_mac); f = vxlan_find_mac(vxlan, src_mac);
if (likely(f)) { if (likely(f)) {
struct vxlan_rdst *rdst = first_remote(f); struct vxlan_rdst *rdst = first_remote_rcu(f);
if (likely(rdst->remote_ip == src_ip)) if (likely(rdst->remote_ip == src_ip))
return false; return false;
...@@ -1005,7 +1011,7 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb) ...@@ -1005,7 +1011,7 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb)
} }
f = vxlan_find_mac(vxlan, n->ha); f = vxlan_find_mac(vxlan, n->ha);
if (f && first_remote(f)->remote_ip == htonl(INADDR_ANY)) { if (f && first_remote_rcu(f)->remote_ip == htonl(INADDR_ANY)) {
/* bridge-local neighbor */ /* bridge-local neighbor */
neigh_release(n); neigh_release(n);
goto out; goto out;
......
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