| Message ID | 1371097294-5626-1-git-send-email-jasowang@redhat.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, 2013-06-13 at 12:21 +0800, Jason Wang wrote: > This patch silents the following sparse warnings: > > dr > Signed-off-by: Jason Wang <jasowang@redhat.com> > --- > drivers/net/macvtap.c | 2 +- > include/linux/if_macvlan.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c > index 992151c..acf55ba 100644 > --- a/drivers/net/macvtap.c > +++ b/drivers/net/macvtap.c > @@ -429,7 +429,7 @@ static int macvtap_open(struct inode *inode, struct file *file) > if (!q) > goto out; > > - q->sock.wq = &q->wq; > + rcu_assign_pointer(q->sock.wq, &q->wq); Since nobody but you [1] can access this object at that time, you could rather use RCU_INIT_POINTER(q->sock.wq, &q->wq); rcu_assign_pointer() is also a documentation point (memory barrier) By using RCU_INIT_POINTER() you clearly show that you know you need no memory barrier. > init_waitqueue_head(&q->wq.wait); [1] : or else, this init_waitqueue_head() should be done _before_ the rcu_asign_pointer() > q->sock.type = SOCK_RAW; > q->sock.state = SS_CONNECTED; -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/13/2013 01:48 PM, Eric Dumazet wrote: > On Thu, 2013-06-13 at 12:21 +0800, Jason Wang wrote: >> This patch silents the following sparse warnings: >> >> dr >> Signed-off-by: Jason Wang <jasowang@redhat.com> >> --- >> drivers/net/macvtap.c | 2 +- >> include/linux/if_macvlan.h | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c >> index 992151c..acf55ba 100644 >> --- a/drivers/net/macvtap.c >> +++ b/drivers/net/macvtap.c >> @@ -429,7 +429,7 @@ static int macvtap_open(struct inode *inode, struct file *file) >> if (!q) >> goto out; >> >> - q->sock.wq = &q->wq; >> + rcu_assign_pointer(q->sock.wq, &q->wq); > Since nobody but you [1] can access this object at that time, you could > rather use > RCU_INIT_POINTER(q->sock.wq, &q->wq); > > rcu_assign_pointer() is also a documentation point (memory barrier) > > By using RCU_INIT_POINTER() you clearly show that you know you need no > memory barrier. > True. >> init_waitqueue_head(&q->wq.wait); > [1] : > or else, this init_waitqueue_head() should be done _before_ the > rcu_asign_pointer() Thanks, I will send v2 by using RCU_INIT_POINTER(). > >> q->sock.type = SOCK_RAW; >> q->sock.state = SS_CONNECTED; > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 992151c..acf55ba 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -429,7 +429,7 @@ static int macvtap_open(struct inode *inode, struct file *file) if (!q) goto out; - q->sock.wq = &q->wq; + rcu_assign_pointer(q->sock.wq, &q->wq); init_waitqueue_head(&q->wq.wait); q->sock.type = SOCK_RAW; q->sock.state = SS_CONNECTED; diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h index 1912133..f49a9f6 100644 --- a/include/linux/if_macvlan.h +++ b/include/linux/if_macvlan.h @@ -70,7 +70,7 @@ struct macvlan_dev { int (*receive)(struct sk_buff *skb); int (*forward)(struct net_device *dev, struct sk_buff *skb); /* This array tracks active taps. */ - struct macvtap_queue *taps[MAX_MACVTAP_QUEUES]; + struct macvtap_queue __rcu *taps[MAX_MACVTAP_QUEUES]; /* This list tracks all taps (both enabled and disabled) */ struct list_head queue_list; int numvtaps;
This patch silents the following sparse warnings: drivers/net/macvtap.c:98:9: warning: incorrect type in assignment (different address spaces) drivers/net/macvtap.c:98:9: expected struct macvtap_queue *<noident> drivers/net/macvtap.c:98:9: got struct macvtap_queue [noderef] <asn:4>*<noident> drivers/net/macvtap.c:120:9: warning: incorrect type in assignment (different address spaces) drivers/net/macvtap.c:120:9: expected struct macvtap_queue *<noident> drivers/net/macvtap.c:120:9: got struct macvtap_queue [noderef] <asn:4>*<noident> drivers/net/macvtap.c:151:22: error: incompatible types in comparison expression (different address spaces) drivers/net/macvtap.c:233:23: error: incompatible types in comparison expression (different address spaces) drivers/net/macvtap.c:243:23: error: incompatible types in comparison expression (different address spaces) drivers/net/macvtap.c:247:15: error: incompatible types in comparison expression (different address spaces) CC [M] drivers/net/macvtap.o drivers/net/macvlan.c:232:24: error: incompatible types in comparison expression (different address spaces) Signed-off-by: Jason Wang <jasowang@redhat.com> --- drivers/net/macvtap.c | 2 +- include/linux/if_macvlan.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)