[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Mon, 11 Nov 2013 13:59:17 +0100
From: Veaceslav Falico <vfalico@...hat.com>
To: Ding Tianhong <dingtianhong@...wei.com>
Cc: Jay Vosburgh <fubar@...ibm.com>,
Andy Gospodarek <andy@...yhouse.net>,
"David S. Miller" <davem@...emloft.net>,
Nikolay Aleksandrov <nikolay@...hat.com>,
Netdev <netdev@...r.kernel.org>
Subject: Re: [PATCH net-next v3 5/10] bonding: create bond_first_slave_rcu()
On Mon, Nov 11, 2013 at 08:36:41PM +0800, Ding Tianhong wrote:
>The bond_first_slave_rcu() will be used to instead of bond_first_slave()
>in rcu_read_lock().
>
>So move the struct netdev_adjacent to the netdevice.h and make the
>bond_first_slave_rcu() could use the struct.
The whole point in netdev_adjacent functions was to hide it from the users
who wanted to use it directly. See
http://www.spinics.net/lists/netdev/msg248026.html
for reference. Please try to avoid that.
>
>Suggested-by: Jay Vosburgh <fubar@...ibm.com>
>Suggested-by: Veaceslav Falico <vfalico@...hat.com>
>Signed-off-by: Ding Tianhong <dingtianhong@...wei.com>
>---
> drivers/net/bonding/bonding.h | 9 +++++++++
> include/linux/netdevice.h | 16 ++++++++++++++++
> net/core/dev.c | 16 ----------------
> 3 files changed, 25 insertions(+), 16 deletions(-)
>
>diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
>index 77a07a1..5d37606 100644
>--- a/drivers/net/bonding/bonding.h
>+++ b/drivers/net/bonding/bonding.h
>@@ -91,6 +91,15 @@
> netdev_adjacent_get_private(bond_slave_list(bond)->prev) : \
> NULL)
>
>+/* Caller must have rcu_read_lock */
>+#define bond_first_slave_rcu(bond) \
>+ ({struct list_head *__ptr = (bond_slave_list(bond)); \
>+ struct list_head *__next = ACCESS_ONCE(__ptr->next); \
>+ likely(__ptr != __next) ? \
>+ list_entry_rcu(__next, struct netdev_adjacent, list)->private : \
>+ NULL; \
>+ })
>+
> #define bond_is_first_slave(bond, pos) (pos == bond_first_slave(bond))
> #define bond_is_last_slave(bond, pos) (pos == bond_last_slave(bond))
>
>diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
>index 15fa01c..7ca0fc8 100644
>--- a/include/linux/netdevice.h
>+++ b/include/linux/netdevice.h
>@@ -2839,6 +2839,22 @@ extern int netdev_tstamp_prequeue;
> extern int weight_p;
> extern int bpf_jit_enable;
>
>+struct netdev_adjacent {
>+ struct net_device *dev;
>+
>+ /* upper master flag, there can only be one master device per list */
>+ bool master;
>+
>+ /* counter for the number of times this device was added to us */
>+ u16 ref_nr;
>+
>+ /* private field for the users */
>+ void *private;
>+
>+ struct list_head list;
>+ struct rcu_head rcu;
>+};
>+
> bool netdev_has_upper_dev(struct net_device *dev, struct net_device *upper_dev);
> bool netdev_has_any_upper_dev(struct net_device *dev);
> struct net_device *netdev_all_upper_get_next_dev_rcu(struct net_device *dev,
>diff --git a/net/core/dev.c b/net/core/dev.c
>index 8ffc52e..bcc5001 100644
>--- a/net/core/dev.c
>+++ b/net/core/dev.c
>@@ -4377,22 +4377,6 @@ softnet_break:
> goto out;
> }
>
>-struct netdev_adjacent {
>- struct net_device *dev;
>-
>- /* upper master flag, there can only be one master device per list */
>- bool master;
>-
>- /* counter for the number of times this device was added to us */
>- u16 ref_nr;
>-
>- /* private field for the users */
>- void *private;
>-
>- struct list_head list;
>- struct rcu_head rcu;
>-};
>-
> static struct netdev_adjacent *__netdev_find_adj_rcu(struct net_device *dev,
> struct net_device *adj_dev,
> struct list_head *adj_list)
>--
>1.8.2.1
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists