netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Veaceslav Falico <vfalico@redhat.com>
To: netdev@vger.kernel.org
Cc: Veaceslav Falico <vfalico@redhat.com>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>, Jiri Pirko <jiri@resnulli.us>,
	Alexander Duyck <alexander.h.duyck@intel.com>
Subject: [PATCH RFC net-next 14/21] net: add netdev_for_each_lower_neigh_private_continue()
Date: Mon,  2 Sep 2013 23:39:18 +0200	[thread overview]
Message-ID: <1378157965-17537-15-git-send-email-vfalico@redhat.com> (raw)
In-Reply-To: <1378157965-17537-1-git-send-email-vfalico@redhat.com>

This macro allows going through the neighbour lower list private's from a
specific position and till it doesn't hit the same position again.

For that, two functions are needed:

netdev_lower_neigh_set_iter_per_private(dev, iter, from_priv) - which
searches for from_priv and, if found, sets the iter to the correct
position, returning from_priv.

netdev_lower_neigh_get_next_private_to(dev, iter, from_priv) - gets the
next ->private (and skips the list head), or if the next private equals
from_priv - returns NULL. Also returns NULL if the ->private is NULL, to
catch the case if the list doesn't have any elements.

CC: "David S. Miller" <davem@davemloft.net>
CC: Eric Dumazet <edumazet@google.com>
CC: Jiri Pirko <jiri@resnulli.us>
CC: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
---
 include/linux/netdevice.h | 14 +++++++++++
 net/core/dev.c            | 62 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 1a149ef..20afdf98 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2788,6 +2788,20 @@ extern struct net_device *netdev_upper_get_next_dev_rcu(struct net_device *dev,
 	     updev; \
 	     updev = netdev_upper_get_next_dev_rcu(dev, &(iter)))
 
+extern void *netdev_lower_neigh_set_iter_per_private(struct net_device *dev,
+						     struct list_head **iter,
+						     void *private);
+extern void *netdev_lower_neigh_get_next_private_to(struct net_device *dev,
+						    struct list_head **iter,
+						    void *to);
+
+#define netdev_for_each_lower_neigh_private_continue(dev, priv, from_priv, iter) \
+	for (priv = netdev_lower_neigh_set_iter_per_private(dev, &(iter), \
+							    from_priv);   \
+	     priv; \
+	     priv = netdev_lower_neigh_get_next_private_to(dev, &(iter),  \
+							   from_priv))
+
 extern void *netdev_lower_neigh_get_next_private(struct net_device *dev,
 						 struct list_head **iter);
 extern void *netdev_lower_neigh_get_next_private_rcu(struct net_device *dev,
diff --git a/net/core/dev.c b/net/core/dev.c
index 55f8ac4..1b9862b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4555,6 +4555,68 @@ struct net_device *netdev_upper_get_next_dev_rcu(struct net_device *dev,
 }
 EXPORT_SYMBOL(netdev_upper_get_next_dev_rcu);
 
+/* netdev_lower_neigh_set_iter_per_private - Set the iter to reflect the
+ *					     position of the ->private
+ * @dev: device
+ * @iter: iter to be set
+ * @private: private to be found
+ *
+ * Iterates through lower neighbours, searching for private. When found,
+ * sets the iter to the ->list. Returns private or NULL if not found. User
+ * must hold RTNL lock or make sure that the list isn't modified.
+ */
+void *netdev_lower_neigh_set_iter_per_private(struct net_device *dev,
+					      struct list_head **iter,
+					      void *private)
+{
+	struct netdev_adjacent *lower;
+
+	list_for_each_entry(lower, &dev->neighbour_dev_list.lower, list)
+		if (lower->private == private)
+			break;
+
+	if (&lower->list == &dev->neighbour_dev_list.lower)
+		return NULL;
+
+	*iter = &lower->list;
+
+	return private;
+}
+EXPORT_SYMBOL(netdev_lower_neigh_set_iter_per_private);
+
+/* netdev_lower_neigh_get_next_private_to - Get the next ->private from the
+ *					    lower neighbour list, stop at to
+ * @dev: device
+ * @iter: list_head ** of the current position
+ * @to: if private == to then stop
+ *
+ * Gets the next netdev_adjacent->private from the dev's lower neighbour
+ * list, starting from iter position. The caller must hold either hold the
+ * RTNL lock or its own locking that guarantees that the neighbour lower
+ * list will remain unchainged. Stops when private == to or when it hits a
+ * NULL private.
+ */
+void *netdev_lower_neigh_get_next_private_to(struct net_device *dev,
+					     struct list_head **iter,
+					     void *to)
+{
+	struct netdev_adjacent *lower;
+
+	lower = list_entry((*iter)->next, struct netdev_adjacent, list);
+
+	if (&lower->list == &dev->neighbour_dev_list.lower)
+		lower = list_entry(lower->list.next, struct netdev_adjacent,
+				   list);
+
+	if (lower->private == to || !lower->private)
+		return NULL;
+
+	*iter = &lower->list;
+
+	return lower->private;
+}
+EXPORT_SYMBOL(netdev_lower_neigh_get_next_private_to);
+
 /* netdev_lower_neigh_get_next_private - Get the next ->private from the
  *					 lower neighbour list
  * @dev: device
-- 
1.8.4

  parent reply	other threads:[~2013-09-02 21:39 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-02 21:39 [PATCH RFC net-next 0/21] bonding: use neighbours instead of own lists Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 01/21] net: add neighbour_dev_list to save only neighbours Veaceslav Falico
2013-09-03  8:29   ` Jiri Pirko
2013-09-03  8:34     ` Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 02/21] net: add RCU variant to search for netdev_adjacent link Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 03/21] net: add netdev_adjacent->private and allow to use it Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 04/21] net: expose the master link to sysfs, and remove it from bond Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 05/21] vlan: link the upper neighbour only after registering Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 06/21] net: create sysfs symlinks for neighbour devices Veaceslav Falico
2013-09-03  7:48   ` Jiri Pirko
2013-09-03  8:05     ` Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 07/21] bonding: add bond_has_slaves() and use it Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 08/21] bonding: convert bond_has_slaves() to use the neighbour list Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 09/21] bonding: populate neighbour's private on enslave Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 10/21] bonding: modify bond_get_slave_by_dev() to use neighbours Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 11/21] bonding: remove bond_for_each_slave_reverse() Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 12/21] net: add for_each iterators through neighbour lower link's private Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 13/21] bonding: make bond_for_each_slave() use lower neighbour's private Veaceslav Falico
2013-09-02 21:39 ` Veaceslav Falico [this message]
2013-09-02 21:39 ` [PATCH RFC net-next 15/21] bonding: use neighbour list for bond_for_each_slave_continue() Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 16/21] net: add a possibility to get private from netdev_adjacent->list Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 17/21] bonding: convert first/last slave logic to use neighbours Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 18/21] net: add a function to get the next/prev private Veaceslav Falico
2013-09-03  8:10   ` Jiri Pirko
2013-09-02 21:39 ` [PATCH RFC net-next 19/21] bonding: use neighbours for bond_next/prev_slave() Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 20/21] bonding: use bond_for_each_slave() in bond_uninit() Veaceslav Falico
2013-09-02 21:39 ` [PATCH RFC net-next 21/21] bonding: remove slave lists Veaceslav Falico

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=1378157965-17537-15-git-send-email-vfalico@redhat.com \
    --to=vfalico@redhat.com \
    --cc=alexander.h.duyck@intel.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=jiri@resnulli.us \
    --cc=netdev@vger.kernel.org \
    /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).