Commit 7f0e44ac authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

ipv6 flowlabel: add __rcu annotations

Commit 18367681 (ipv6 flowlabel: Convert np->ipv6_fl_list to RCU.)
omitted proper __rcu annotations.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf5e4dd6
...@@ -217,7 +217,7 @@ struct ipv6_txoptions { ...@@ -217,7 +217,7 @@ struct ipv6_txoptions {
}; };
struct ip6_flowlabel { struct ip6_flowlabel {
struct ip6_flowlabel *next; struct ip6_flowlabel __rcu *next;
__be32 label; __be32 label;
atomic_t users; atomic_t users;
struct in6_addr dst; struct in6_addr dst;
...@@ -238,9 +238,9 @@ struct ip6_flowlabel { ...@@ -238,9 +238,9 @@ struct ip6_flowlabel {
#define IPV6_FLOWLABEL_MASK cpu_to_be32(0x000FFFFF) #define IPV6_FLOWLABEL_MASK cpu_to_be32(0x000FFFFF)
struct ipv6_fl_socklist { struct ipv6_fl_socklist {
struct ipv6_fl_socklist *next; struct ipv6_fl_socklist __rcu *next;
struct ip6_flowlabel *fl; struct ip6_flowlabel *fl;
struct rcu_head rcu; struct rcu_head rcu;
}; };
extern struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label); extern struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label);
......
...@@ -144,7 +144,9 @@ static void ip6_fl_gc(unsigned long dummy) ...@@ -144,7 +144,9 @@ static void ip6_fl_gc(unsigned long dummy)
spin_lock(&ip6_fl_lock); spin_lock(&ip6_fl_lock);
for (i=0; i<=FL_HASH_MASK; i++) { for (i=0; i<=FL_HASH_MASK; i++) {
struct ip6_flowlabel *fl, **flp; struct ip6_flowlabel *fl;
struct ip6_flowlabel __rcu **flp;
flp = &fl_ht[i]; flp = &fl_ht[i];
while ((fl = rcu_dereference_protected(*flp, while ((fl = rcu_dereference_protected(*flp,
lockdep_is_held(&ip6_fl_lock))) != NULL) { lockdep_is_held(&ip6_fl_lock))) != NULL) {
...@@ -179,7 +181,9 @@ static void __net_exit ip6_fl_purge(struct net *net) ...@@ -179,7 +181,9 @@ static void __net_exit ip6_fl_purge(struct net *net)
spin_lock(&ip6_fl_lock); spin_lock(&ip6_fl_lock);
for (i = 0; i <= FL_HASH_MASK; i++) { for (i = 0; i <= FL_HASH_MASK; i++) {
struct ip6_flowlabel *fl, **flp; struct ip6_flowlabel *fl;
struct ip6_flowlabel __rcu **flp;
flp = &fl_ht[i]; flp = &fl_ht[i];
while ((fl = rcu_dereference_protected(*flp, while ((fl = rcu_dereference_protected(*flp,
lockdep_is_held(&ip6_fl_lock))) != NULL) { lockdep_is_held(&ip6_fl_lock))) != NULL) {
...@@ -506,7 +510,8 @@ int ipv6_flowlabel_opt(struct sock *sk, char __user *optval, int optlen) ...@@ -506,7 +510,8 @@ int ipv6_flowlabel_opt(struct sock *sk, char __user *optval, int optlen)
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
struct in6_flowlabel_req freq; struct in6_flowlabel_req freq;
struct ipv6_fl_socklist *sfl1=NULL; struct ipv6_fl_socklist *sfl1=NULL;
struct ipv6_fl_socklist *sfl, **sflp; struct ipv6_fl_socklist *sfl;
struct ipv6_fl_socklist __rcu **sflp;
struct ip6_flowlabel *fl, *fl1 = NULL; struct ip6_flowlabel *fl, *fl1 = NULL;
......
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