From: Ahmed Amamou <ahmed@gandi.net>
To: netdev@vger.kernel.org
Cc: William Dauchy <william@gandi.net>,
Ahmed Amamou <ahmed@gandi.net>, Kamel Haddadou <kamel@gandi.net>
Subject: [PATCH RFC v2 10/21] net: rbridge: add rbr_node management function
Date: Tue, 1 Sep 2015 17:43:05 +0200 [thread overview]
Message-ID: <1441122196-11662-11-git-send-email-ahmed@gandi.net> (raw)
In-Reply-To: <1441122196-11662-1-git-send-email-ahmed@gandi.net>
rbr_node are used to save distant Rbridges information
they are use by local Rbridge to take routing decision
this patch add get/put/free/find/del function to rbr_node to
avoid freeing a rbr_node that is still in use for routing
Signed-off-by: Ahmed Amamou <ahmed@gandi.net>
Signed-off-by: Kamel Haddadou <kamel@gandi.net>
Signed-off-by: William Dauchy <william@gandi.net>
---
net/bridge/rbr.c | 35 +++++++++++++++++++++++++++++++++++
net/bridge/rbr_private.h | 23 +++++++++++++++++++++++
2 files changed, 58 insertions(+)
diff --git a/net/bridge/rbr.c b/net/bridge/rbr.c
index 31e72ef..718deb3 100644
--- a/net/bridge/rbr.c
+++ b/net/bridge/rbr.c
@@ -83,3 +83,38 @@ int set_treeroot(struct rbr *rbr, uint16_t treeroot)
set_tree_root_fail:
return -ENOENT;
}
+
+struct rbr_node *rbr_find_node(struct rbr *rbr, __u16 nickname)
+{
+ struct rbr_node *rbr_node;
+
+ if (unlikely(!VALID_NICK(nickname)))
+ return NULL;
+ rbr_node = rcu_dereference(rbr->rbr_nodes[nickname]);
+ rbr_node_get(rbr_node);
+
+ return rbr_node;
+}
+
+static void rbr_del_node(struct rbr *rbr, uint16_t nickname)
+{
+ struct rbr_node *rbr_node;
+
+ if (likely(VALID_NICK(nickname))) {
+ rbr_node = rbr->rbr_nodes[nickname];
+ if (likely(rbr_node)) {
+ rcu_assign_pointer(rbr->rbr_nodes[nickname], NULL);
+ rbr_node_put(rbr_node);
+ }
+ }
+}
+
+static void rbr_del_all(struct rbr *rbr)
+{
+ unsigned int i;
+
+ for (i = RBRIDGE_NICKNAME_MIN; i < RBRIDGE_NICKNAME_MAX; i++) {
+ if (likely(rbr->rbr_nodes[i]))
+ rbr_del_node(rbr, i);
+ }
+}
diff --git a/net/bridge/rbr_private.h b/net/bridge/rbr_private.h
index 9166a8b..186e454 100644
--- a/net/bridge/rbr_private.h
+++ b/net/bridge/rbr_private.h
@@ -44,7 +44,30 @@ struct rbr {
struct net_bridge *br; /* back pointer */
};
+static inline void rbr_node_free(struct rbr_node *rbr_node)
+{
+ if (likely(rbr_node)) {
+ kfree(rbr_node->rbr_ni);
+ kfree(rbr_node);
+ }
+}
+
+static inline void rbr_node_get(struct rbr_node *rbr_node)
+{
+ if (likely(rbr_node))
+ atomic_inc(&rbr_node->refs);
+}
+
+static inline void rbr_node_put(struct rbr_node *rbr_node)
+{
+ if (rbr_node) {
+ if (unlikely(atomic_dec_and_test(&rbr_node->refs)))
+ rbr_node_free(rbr_node);
+ }
+}
+
int set_treeroot(struct rbr *rbr, uint16_t treeroot);
+struct rbr_node *rbr_find_node(struct rbr *rbr, __u16 nickname);
/* Access the adjacency nick list at the end of rbr_nickinfo */
#define RBR_NI_ADJNICKSPTR(v) ((u16 *)((struct rbr_nickinfo *)(v) + 1))
--
2.1.4
next prev parent reply other threads:[~2015-09-01 15:53 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-01 15:42 [PATCH RFC v2 00/21] TRILL implementation Ahmed Amamou
2015-09-01 15:42 ` [PATCH RFC v2 01/21] net: rbridge: add trill frame description Ahmed Amamou
2015-09-01 15:42 ` [PATCH RFC v2 02/21] net: rbridge: add layer 2 IS-IS Ethertype Ahmed Amamou
2015-09-01 15:42 ` [PATCH RFC v2 03/21] net: rbridge: add RBridge structure Ahmed Amamou
2015-09-01 15:42 ` [PATCH RFC v2 04/21] net: rbridge: add CONFIG_TRILL Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 05/21] net: rbridge: adapt Bridge structure Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 06/21] net: rbridge: enable/disable TRILL capability Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 07/21] net: rbridge: add sysfs for trill_state Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 08/21] net: rbridge: get Rbridge nickname from daemon Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 09/21] net: rbridge: add elected dtroot Ahmed Amamou
2015-09-01 18:18 ` Sergei Shtylyov
2015-09-01 18:26 ` ahmed amamou
2015-09-01 15:43 ` Ahmed Amamou [this message]
2015-09-01 18:30 ` [PATCH RFC v2 10/21] net: rbridge: add rbr_node management function Sergei Shtylyov
2015-09-01 15:43 ` [PATCH RFC v2 11/21] net: rbridge: clean up rbr_node on rbridge stop Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 12/21] net: rbridge: update node table Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 13/21] net: rbridge: add basic trill frame handling function Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 14/21] net: rbridge: update forwarding database Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 15/21] net: rbridge: add test on trill flag before flood Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 16/21] net: rbridge: add encapsulation process Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 17/21] net: rbridge: add receive function Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 18/21] net: rbridge: add rbr_fwd Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 19/21] net: rbridge: add rbr_multidest_fwd Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 20/21] net: rbridge: replace net_port rx_handler Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 21/21] net: handle packet split for trill Ahmed Amamou
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=1441122196-11662-11-git-send-email-ahmed@gandi.net \
--to=ahmed@gandi.net \
--cc=kamel@gandi.net \
--cc=netdev@vger.kernel.org \
--cc=william@gandi.net \
/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).