bridge: add some missing __rcu marks
Subsystems (5)
PATCH 1/1 bridge: add some missing __rcu marks
From: Cong Wang <[email protected]>
---
net/bridge/br_private.h +3 -3
@@ -328,7 +328,7 @@ extern void br_dev_delete(struct net_device *dev, struct list_head *list);extern netdev_tx_t br_dev_xmit (struct sk_buff *skb,struct net_device *dev);#ifdef CONFIG_NET_POLL_CONTROLLER -static inline struct netpoll_info *br_netpoll_info (struct net_bridge *br) +static inline struct netpoll_info __rcu *br_netpoll_info (struct net_bridge *br) {return br->dev->npinfo; }
@@ -345,7 +345,7 @@ static inline void br_netpoll_send_skb(const struct net_bridge_port *p,extern int br_netpoll_enable (struct net_bridge_port *p,gfp_t gfp);extern void br_netpoll_disable (struct net_bridge_port *p);#else -static inline struct netpoll_info *br_netpoll_info (struct net_bridge *br) +static inline struct netpoll_info __rcu *br_netpoll_info (struct net_bridge *br) {return NULL ; }
@@ -469,7 +469,7 @@ extern void br_multicast_free_pg(struct rcu_head *head);extern struct net_bridge_port_group *br_multicast_new_port_group (struct net_bridge_port *port,struct br_ip *group, -struct net_bridge_port_group *next, +struct net_bridge_port_group __rcu *next,unsigned char state);extern void br_mdb_init (void );extern void br_mdb_uninit (void );
Quoted 14 lines · On Thu, 14 Feb 2013 14:12:30 +0800 Cong Wang <[email protected]> wrote:
From: Cong Wang <[email protected]>
Cc Vlad Yasevich <[email protected]>Cc Stephen Hemminger <[email protected]>Cc David S. Miller <[email protected]>Signed-off-by Cong Wang <[email protected]>---
net/bridge/br_private.h +0
-0
net/bridge/br_private.h extern void br_dev_delete(struct net_device *dev, struct list_head *list); · line 334
Quoted 8 lines
net/bridge/br_private.h +1
-1@@ -328,7 +328,7 @@ extern void br_dev_delete(struct net_device *dev, struct list_head *list);extern netdev_tx_t br_dev_xmit (struct sk_buff *skb,struct net_device *dev);#ifdef CONFIG_NET_POLL_CONTROLLER -static inline struct netpoll_info *br_netpoll_info (struct net_bridge *br) +static inline struct netpoll_info __rcu *br_netpoll_info (struct net_bridge *br) {return br->dev->npinfo; }
This doesn't seem right since there is no rcu_dereference() here.
Quoted 11 lines · Stephen Hemminger
net/bridge/br_private.h extern void br_dev_delete(struct net_device *dev, struct list_head *list); · line 334
Quoted 6 lines · On Thu, 14 Feb 2013 14:12:30 +0800 Cong Wang <[email protected]> wrote:
#ifdef
CONFIG_NET_POLL_CONTROLLERnet/bridge/br_private.h +1
-1-static inline struct netpoll_info *br_netpoll_info (struct net_bridge *br) +static inline struct netpoll_info __rcu *br_netpoll_info (struct net_bridge *br) {return br->dev->npinfo; }This doesn't seem right since there is no
rcu_dereference()here.
But we don't dereference ->npinfo here, we only check if it is NULL.
PATCH v2 1/1 netpoll: add some missing __rcu marks in several places
In reply to Stephen HemmingerFrom: Cong Wang <[email protected]>
This fixes sparse warnings like the one below:
drivers/net/team/team.c:953:25: warning: incorrect type in return expression (different address spaces)drivers/net/team/team.c:953:25: expected struct netpoll_info *drivers/net/team/team.c:953:25: got struct netpoll_info [noderef] <asn:4>*npinfo
---
drivers/net/bonding/bond_main.c +1 -1
@@ -1300,7 +1300,7 @@ static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni, greturn err; } -static struct netpoll_info *bond_netpoll_info (struct bonding *bond) +static struct netpoll_info __rcu *bond_netpoll_info (struct bonding *bond) {return bond->dev->npinfo; }
drivers/net/team/team.c +2 -2
@@ -948,7 +948,7 @@ static void team_port_disable_netpoll(struct team_port *port)kfree (np); } -static struct netpoll_info *team_netpoll_info (struct team *team) +static struct netpoll_info __rcu *team_netpoll_info (struct team *team) {return team->dev->npinfo; }
@@ -962,7 +962,7 @@ static int team_port_enable_netpoll(struct team *team, struct team_port *port,static void team_port_disable_netpoll (struct team_port *port) { } -static struct netpoll_info *team_netpoll_info (struct team *team) +static struct netpoll_info __rcu *team_netpoll_info (struct team *team) {return NULL ; }
net/bridge/br_private.h +3 -3
@@ -328,7 +328,7 @@ extern void br_dev_delete(struct net_device *dev, struct list_head *list);extern netdev_tx_t br_dev_xmit (struct sk_buff *skb,struct net_device *dev);#ifdef CONFIG_NET_POLL_CONTROLLER -static inline struct netpoll_info *br_netpoll_info (struct net_bridge *br) +static inline struct netpoll_info __rcu *br_netpoll_info (struct net_bridge *br) {return br->dev->npinfo; }
@@ -345,7 +345,7 @@ static inline void br_netpoll_send_skb(const struct net_bridge_port *p,extern int br_netpoll_enable (struct net_bridge_port *p,gfp_t gfp);extern void br_netpoll_disable (struct net_bridge_port *p);#else -static inline struct netpoll_info *br_netpoll_info (struct net_bridge *br) +static inline struct netpoll_info __rcu *br_netpoll_info (struct net_bridge *br) {return NULL ; }
@@ -469,7 +469,7 @@ extern void br_multicast_free_pg(struct rcu_head *head);extern struct net_bridge_port_group *br_multicast_new_port_group (struct net_bridge_port *port,struct br_ip *group, -struct net_bridge_port_group *next, +struct net_bridge_port_group __rcu *next,unsigned char state);extern void br_mdb_init (void );extern void br_mdb_uninit (void );
David Miller
maintainerRe: [Patch net-next v2] netpoll: add some missing __rcu marks in several places
From: Cong Wang <[email protected]>
Date: Thu, 14 Feb 2013 16:37:19 +0800
Quoted 8 lines
From: Cong Wang <[email protected]>
This fixes sparse warnings like the one below:
drivers/net/team/team.c:953:25: warning: incorrect type in return expression (different address spaces)drivers/net/team/team.c:953:25: expected structnetpoll_info*drivers/net/team/team.c:953:25: got structnetpoll_info[noderef] <asn:4>*npinfo
Quoted 5 lines
Cc Jiri Pirko <[email protected]>Cc Vlad Yasevich <[email protected]>Cc Stephen Hemminger <[email protected]>Cc David S. Miller <[email protected]>Signed-off-by Cong Wang <[email protected]>
This is a very confusing patch submission.
You're posting a "v2" of a patch but with a completely different Subject line so that it's hard, without looking into the details of the patch, to determine what this patch is a "v2" of.
You've also not addressed Stephen's feedback about the lack of an rcu_dereference() in these routines you've added __rcu annotations to.
I'm tossing all versions of this patch, therefore.
Re: [Patch net-next v2] netpoll: add some missing __rcu marks in several places
Quoted 23 lines · David Miller
From: Cong Wang <[email protected]>
Date: Thu, 14 Feb 2013 16:37:19 +0800Quoted 8 lines
From: Cong Wang <[email protected]>
This fixes sparse warnings like the one below:
drivers/net/team/team.c:953:25: warning: incorrect type in return expression (different address spaces)drivers/net/team/team.c:953:25: expected structnetpoll_info*drivers/net/team/team.c:953:25: got structnetpoll_info[noderef] <asn:4>*npinfoQuoted 5 lines
Cc Jiri Pirko <[email protected]>Cc Vlad Yasevich <[email protected]>Cc Stephen Hemminger <[email protected]>Cc David S. Miller <[email protected]>Signed-off-by Cong Wang <[email protected]>This is a very confusing patch submission.
You're posting a "v2" of a patch but with a completely different Subject line so that it's hard, without looking into the details of the patch, to determine what this patch is a "v2" of.
Quoted 5 lines
You've also not addressed Stephen's feedback about the lack of an
rcu_dereference()in these routines you've added__rcuannotations to.I'm tossing all versions of this patch, therefore.
The reason is we don't dereference ->npinfo pointer, we just check if it is NULL, so doesn't need to call rcu_dereference(). Or am I missing anything?
Thanks.
Re: [Patch net-next v2] netpoll: add some missing __rcu marks in several places
Quoted 3 lines · Cong Wang
The reason is we don't dereference ->npinfo pointer, we just check if it is NULL, so doesn't need to call
rcu_dereference(). Or am I missing anything?
Yes you are missing that the right thing to do is to use rcu_access_pointer()
Sparse errors should not be fixed using random RCU verbs, please be more careful.
drivers/net/team/team.c +1 -1
@@ -950,7 +950,7 @@ static void team_port_disable_netpoll(struct team_port *port)static struct netpoll_info *team_netpoll_info (struct team *team) { -return team->dev->npinfo; +return rcu_access_pointer (team->dev->npinfo); }#else
Re: [Patch net-next v2] netpoll: add some missing __rcu marks in several places
Quoted 11 lines · Eric Dumazet
Quoted 3 lines · Cong Wang
The reason is we don't dereference ->npinfo pointer, we just check if it is NULL, so doesn't need to call
rcu_dereference(). Or am I missing anything?Yes you are missing that the right thing to do is to use
rcu_access_pointer()Sparse errors should not be fixed using random RCU verbs, please be more careful.
Ah, I wasn't aware of that API. Will send v3.
Thanks!