Home » Mailing list archives » linux-kernel » 2010 » May » 4

[PATCH tip/core/rcu 37/48] net: __rcu annotations for drivers

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Paul E. McKenney
Subject: [PATCH tip/core/rcu 37/48] net: __rcu annotations for drivers
Date: Tuesday, May 4, 2010 - 1:19 pm

From: Arnd Bergmann <arnd@arndb.de>

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
---
 drivers/net/bnx2.h         |    2 +-
 drivers/net/bnx2x.h        |    2 +-
 drivers/net/cnic.h         |    2 +-
 drivers/net/macvtap.c      |    2 +-
 include/linux/if_macvlan.h |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index cd4b0e4..7bdb1cb 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6746,7 +6746,7 @@ struct bnx2 {
 	u32		tx_wake_thresh;
 
 #ifdef BCM_CNIC
-	struct cnic_ops		*cnic_ops;
+	struct cnic_ops	__rcu	*cnic_ops;
 	void			*cnic_data;
 #endif
 
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
index 3c48a7a..9dfb57b 100644
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
@@ -1007,7 +1007,7 @@ struct bnx2x {
 	dma_addr_t		timers_mapping;
 	void			*qm;
 	dma_addr_t		qm_mapping;
-	struct cnic_ops		*cnic_ops;
+	struct cnic_ops __rcu	*cnic_ops;
 	void			*cnic_data;
 	u32			cnic_tag;
 	struct cnic_eth_dev	cnic_eth_dev;
diff --git a/drivers/net/cnic.h b/drivers/net/cnic.h
index a0d853d..9852375 100644
--- a/drivers/net/cnic.h
+++ b/drivers/net/cnic.h
@@ -177,7 +177,7 @@ struct cnic_local {
 #define ULP_F_INIT	0
 #define ULP_F_START	1
 #define ULP_F_CALL_PENDING	2
-	struct cnic_ulp_ops *ulp_ops[MAX_CNIC_ULP_TYPE];
+	struct cnic_ulp_ops __rcu *ulp_ops[MAX_CNIC_ULP_TYPE];
 
 	/* protected by ulp_lock */
 	u32 cnic_local_flags;
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index abba3cc..adf0145 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -37,7 +37,7 @@
 struct macvtap_queue {
 	struct sock sk;
 	struct socket sock;
-	struct macvlan_dev *vlan;
+	struct macvlan_dev __rcu *vlan;
 	struct file *file;
 	unsigned int flags;
 };
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index b78a712..c15ed77 100644
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -47,7 +47,7 @@ struct macvlan_dev {
 	enum macvlan_mode	mode;
 	int (*receive)(struct sk_buff *skb);
 	int (*forward)(struct net_device *dev, struct sk_buff *skb);
-	struct macvtap_queue	*tap;
+	struct macvtap_queue __rcu *tap;
 };
 
 static inline void macvlan_count_rx(const struct macvlan_dev *vlan,
-- 
1.7.0

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH tip/core/rcu 01/48] rcu: optionally leave lockdep e ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 02/48] rcu: substitute set_need_resche ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 03/48] rcu: make dead code really dead, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 04/48] rcu: move some code from macro ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 05/48] rcu: ignore offline CPUs in las ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 06/48] rcu: Fix bogus CONFIG_PROVE_LOC ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 07/48] rcu: fix now-bogus rcu_schedule ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 08/48] rcu: shrink rcutiny by making s ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 09/48] rcu: rename rcutiny rcu_ctrlblk ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 10/48] rcu: refactor RCU's context-swi ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 11/48] rcu: slim down rcutiny by remov ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 12/48] rcu: enable CPU_STALL_VERBOSE b ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 13/48] rcu: disable CPU stall warnings ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 14/48] rcu: print boot-time console me ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 15/48] rcu: improve RCU CPU stall-warn ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 16/48] rcu: permit discontiguous cpu_p ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 17/48] rcu: v2: reduce the number of s ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 18/48] rcu: improve the RCU CPU-stall ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 19/48] Debugobjects transition check, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 20/48] rcu head introduce rcu head ini ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 21/48] remove all rcu head initializat ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 22/48] rcu head remove init, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 23/48] tree/tiny rcu: Add debug RCU he ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 24/48] rcu: make SRCU usable in modules, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 0/48] v4 patches queued for 2.6.35, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 25/48] rcu: fix debugobjects rcu head ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 26/48] rcu: RCU_FAST_NO_HZ must check ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 27/48] vfs: add fs.h to define struct file, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 28/48] net: Make accesses to -&gt;br_port ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 29/48] rcu: add an rcu_dereference_ind ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 30/48] mce: convert to rcu_dereference ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 31/48] rcu: define __rcu address space ..., Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 32/48] rculist: avoid __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 33/48] cgroups: __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 34/48] credentials: rcu annotation, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 35/48] keys: __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 36/48] nfs: __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 37/48] net: __rcu annotations for drivers, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 38/48] perf_event: __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 39/48] notifiers: __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 40/48] radix-tree: __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 41/48] idr: __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 42/48] input: __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 43/48] vhost: add __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 44/48] net/netfilter: __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 45/48] kvm: add __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 46/48] kernel: __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 47/48] net: __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
[PATCH tip/core/rcu 48/48] kvm: more __rcu annotations, Paul E. McKenney, (Tue May 4, 1:19 pm)
Re: [PATCH tip/core/rcu 21/48] remove all rcu head initial ..., Matt Mackall, (Tue May 4, 1:27 pm)
Re: [PATCH tip/core/rcu 21/48] remove all rcu head initial ..., Paul E. McKenney, (Tue May 4, 1:36 pm)
Re: [PATCH tip/core/rcu 33/48] cgroups: __rcu annotations, Paul Menage, (Tue May 4, 1:48 pm)
Re: [PATCH tip/core/rcu 31/48] rcu: define __rcu address s ..., Arnd Bergmann, (Tue May 4, 1:58 pm)
Re: [PATCH tip/core/rcu 28/48] net: Make accesses to -&gt;br_ ..., Stephen Hemminger, (Tue May 4, 2:26 pm)
Re: [PATCH tip/core/rcu 43/48] vhost: add __rcu annotations, Michael S. Tsirkin, (Tue May 4, 2:39 pm)
Re: [PATCH tip/core/rcu 28/48] net: Make accesses to -&gt;br_ ..., Arnd Bergmann, (Tue May 4, 2:41 pm)
Re: [PATCH tip/core/rcu 31/48] rcu: define __rcu address s ..., Paul E. McKenney, (Tue May 4, 4:07 pm)
Re: [PATCH tip/core/rcu 21/48] remove all rcu head initial ..., James Morris, (Tue May 4, 4:44 pm)
Re: [PATCH tip/core/rcu 43/48] vhost: add __rcu annotations, Paul E. McKenney, (Tue May 4, 4:57 pm)
Re: [PATCH tip/core/rcu 43/48] vhost: add __rcu annotations, Michael S. Tsirkin, (Tue May 4, 4:59 pm)
Re: [PATCH tip/core/rcu 21/48] remove all rcu head initial ..., Paul E. McKenney, (Tue May 4, 5:03 pm)
Re: [PATCH tip/core/rcu 33/48] cgroups: __rcu annotations, Paul E. McKenney, (Tue May 4, 5:04 pm)
Re: [PATCH tip/core/rcu 43/48] vhost: add __rcu annotations, Paul E. McKenney, (Tue May 4, 5:39 pm)
Re: [PATCH tip/core/rcu 36/48] nfs: __rcu annotations, David Howells, (Wed May 5, 3:14 am)
Re: [PATCH tip/core/rcu 36/48] nfs: __rcu annotations, Trond Myklebust, (Wed May 5, 5:44 am)
Re: [PATCH tip/core/rcu 36/48] nfs: __rcu annotations, Paul E. McKenney, (Wed May 5, 2:01 pm)
Re: [PATCH tip/core/rcu 28/48] net: Make accesses to -&gt;br_ ..., Paul E. McKenney, (Wed May 5, 3:03 pm)
Re: [PATCH tip/core/rcu 01/48] rcu: optionally leave lockd ..., Mathieu Desnoyers, (Wed May 5, 3:46 pm)
Re: [PATCH tip/core/rcu 01/48] rcu: optionally leave lockd ..., Paul E. McKenney, (Wed May 5, 4:05 pm)
Re: [PATCH tip/core/rcu 01/48] rcu: optionally leave lockd ..., Mathieu Desnoyers, (Wed May 5, 4:24 pm)
Re: [PATCH tip/core/rcu 01/48] rcu: optionally leave lockd ..., Paul E. McKenney, (Wed May 5, 4:36 pm)
Re: [PATCH tip/core/rcu 01/48] rcu: optionally leave lockd ..., Mathieu Desnoyers, (Wed May 5, 7:05 pm)
Re: [PATCH tip/core/rcu 28/48] net: Make accesses to -&gt;br_ ..., Arnd Bergmann, (Thu May 6, 7:09 am)
Re: [PATCH tip/core/rcu 01/48] rcu: optionally leave lockd ..., Paul E. McKenney, (Thu May 6, 4:09 pm)
Re: [PATCH tip/core/rcu 28/48] net: Make accesses to -&gt;br_ ..., Paul E. McKenney, (Thu May 6, 4:12 pm)