From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: mingo@elte.hu, laijs@cn.fujitsu.com, dipankar@in.ibm.com,
akpm@linux-foundation.org, mathieu.desnoyers@polymtl.ca,
josh@joshtriplett.org, dvhltc@us.ibm.com, niv@us.ibm.com,
tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org,
Valdis.Kletnieks@vt.edu, dhowells@redhat.com,
eric.dumazet@gmail.com, Arnd Bergmann <arnd@arndb.de>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH RFC tip/core/rcu 08/30] net: __rcu annotations for drivers
Date: Wed, 14 Jul 2010 13:09:42 -0700 [thread overview]
Message-ID: <1279138204-12849-8-git-send-email-paulmck@linux.vnet.ibm.com> (raw)
In-Reply-To: <20100714200945.GA10535@linux.vnet.ibm.com>
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 ddaa3fc..ec0db55 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6749,7 +6749,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 8bd2368..b83ebd4 100644
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
@@ -1036,7 +1036,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 08b1235..038da24 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];
unsigned long cnic_local_flags;
#define CNIC_LCL_FL_KWQ_INIT 0x0
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index a8a94e2..aa0e0c8 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -39,7 +39,7 @@ struct macvtap_queue {
struct socket sock;
struct socket_wq wq;
int vnet_hdr_sz;
- 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 9ea047a..7d768bc 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.6
next prev parent reply other threads:[~2010-07-14 20:10 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-14 20:09 [PATCH RFC tip/core/rcu 0/30] RCU commits queued for 2.6.36/7 Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 01/30] net: convert to rcu_dereference_index_check() Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 02/30] rcu: define __rcu address space modifier for sparse Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 03/30] rculist: avoid __rcu annotations Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 04/30] cgroups: " Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 05/30] credentials: rcu annotation Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 06/30] keys: __rcu annotations Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 07/30] nfs: " Paul E. McKenney
2010-07-14 22:07 ` Trond Myklebust
2010-07-14 20:09 ` Paul E. McKenney [this message]
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 09/30] perf_event: " Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 10/30] notifiers: " Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 11/30] radix-tree: " Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 12/30] idr: " Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 13/30] input: " Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 14/30] net/netfilter: " Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 15/30] kvm: add " Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 16/30] kernel: " Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 17/30] net: " Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 18/30] kvm: more " Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 19/30] vhost: add " Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 20/30] Update documentation to note the passage of INIT_RCU_HEAD() Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 21/30] Update call_rcu() usage, add synchronize_rcu() Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 22/30] rcu: make CPU stall warning timeout configurable Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 23/30] rcu head remove init Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 24/30] rcu: add shiny new debug assists to Documentation/RCU/checklist.txt Paul E. McKenney
2010-07-14 20:09 ` [PATCH RFC tip/core/rcu 25/30] rcutorture: add random preemption Paul E. McKenney
2010-07-14 20:10 ` [PATCH RFC tip/core/rcu 26/30] rcu: simplify the usage of percpu data Paul E. McKenney
2010-07-14 20:10 ` [PATCH RFC tip/core/rcu 27/30] rcu: apply ->rda changes to rcutree_trace.c Paul E. McKenney
2010-07-14 21:12 ` Josh Triplett
2010-07-14 21:16 ` Paul E. McKenney
2010-07-14 20:10 ` [PATCH RFC tip/core/rcu 28/30] rcu: rename __do_rcu_dereference_check() to rcu_lockdep_assert() Paul E. McKenney
2010-07-14 20:10 ` [PATCH RFC tip/core/rcu 29/30] rcu: add boot parameter to suppress RCU CPU stall warning messages Paul E. McKenney
2010-07-14 21:16 ` Josh Triplett
2010-07-14 23:30 ` Paul E. McKenney
2010-07-14 20:10 ` [PATCH RFC tip/core/rcu 30/30] rcu: improve kerneldoc for rcu_read_lock(), call_rcu(), and synchronize_rcu() Paul E. McKenney
2010-07-14 21:19 ` [PATCH RFC tip/core/rcu 0/30] RCU commits queued for 2.6.36/7 Josh Triplett
2010-07-14 23:27 ` Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1279138204-12849-8-git-send-email-paulmck@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=Valdis.Kletnieks@vt.edu \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=dipankar@in.ibm.com \
--cc=dvhltc@us.ibm.com \
--cc=eric.dumazet@gmail.com \
--cc=josh@joshtriplett.org \
--cc=laijs@cn.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@polymtl.ca \
--cc=mingo@elte.hu \
--cc=niv@us.ibm.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).