From: Simon Wunderlich <sw@simonwunderlich.de>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Sven Eckelmann <sven@narfation.org>,
Simon Wunderlich <sw@simonwunderlich.de>
Subject: [PATCH 10/21] batman-adv: Add bridge_loop_avoidance mesh genl configuration
Date: Wed, 13 Feb 2019 10:55:13 +0100 [thread overview]
Message-ID: <20190213095524.10147-11-sw@simonwunderlich.de> (raw)
In-Reply-To: <20190213095524.10147-1-sw@simonwunderlich.de>
From: Sven Eckelmann <sven@narfation.org>
The mesh interface can try to detect loops in the same mesh caused by
(indirectly) bridged mesh/soft-interfaces of different nodes. Some of the
loops can also be resolved without breaking the mesh.
The BATADV_CMD_SET_MESH/BATADV_CMD_GET_MESH commands allow to set/get the
configuration of this feature using the
BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED attribute. Setting the u8 to zero
will disable this feature and setting it to something else is enabling this
feature.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
include/uapi/linux/batman_adv.h | 7 +++++++
net/batman-adv/netlink.c | 17 +++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h
index f74ff261ec8f..3cb35c661056 100644
--- a/include/uapi/linux/batman_adv.h
+++ b/include/uapi/linux/batman_adv.h
@@ -381,6 +381,13 @@ enum batadv_nl_attrs {
*/
BATADV_ATTR_BONDING_ENABLED,
+ /**
+ * @BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED: whether the bridge loop
+ * avoidance feature is enabled. This feature detects and avoids loops
+ * between the mesh and devices bridged with the soft interface
+ */
+ BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED,
+
/* add attributes above here, update the policy in netlink.c */
/**
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index 310a2c339fd1..40c940da9498 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -144,6 +144,7 @@ static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = {
[BATADV_ATTR_ISOLATION_MARK] = { .type = NLA_U32 },
[BATADV_ATTR_ISOLATION_MASK] = { .type = NLA_U32 },
[BATADV_ATTR_BONDING_ENABLED] = { .type = NLA_U8 },
+ [BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED] = { .type = NLA_U8 },
};
/**
@@ -284,6 +285,12 @@ static int batadv_netlink_mesh_fill(struct sk_buff *msg,
!!atomic_read(&bat_priv->bonding)))
goto nla_put_failure;
+#ifdef CONFIG_BATMAN_ADV_BLA
+ if (nla_put_u8(msg, BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED,
+ !!atomic_read(&bat_priv->bridge_loop_avoidance)))
+ goto nla_put_failure;
+#endif /* CONFIG_BATMAN_ADV_BLA */
+
if (primary_if)
batadv_hardif_put(primary_if);
@@ -398,6 +405,16 @@ static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info)
atomic_set(&bat_priv->bonding, !!nla_get_u8(attr));
}
+#ifdef CONFIG_BATMAN_ADV_BLA
+ if (info->attrs[BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED]) {
+ attr = info->attrs[BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED];
+
+ atomic_set(&bat_priv->bridge_loop_avoidance,
+ !!nla_get_u8(attr));
+ batadv_bla_status_update(bat_priv->soft_iface);
+ }
+#endif /* CONFIG_BATMAN_ADV_BLA */
+
batadv_netlink_notify_mesh(bat_priv);
return 0;
--
2.11.0
next prev parent reply other threads:[~2019-02-13 9:56 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-13 9:55 [PATCH 00/21] pull request for net-next: batman-adv 2019-02-13 Simon Wunderlich
2019-02-13 9:55 ` [PATCH 01/21] batman-adv: fix memory leak in in batadv_dat_put_dhcp Simon Wunderlich
2019-02-13 9:55 ` [PATCH 02/21] batman-adv: Fix typo "reseved" -> "reserved" Simon Wunderlich
2019-02-13 9:55 ` [PATCH 03/21] batman-adv: Move common genl doit code pre/post hooks Simon Wunderlich
2019-02-13 9:55 ` [PATCH 04/21] batman-adv: Prepare framework for mesh genl config Simon Wunderlich
2019-02-13 9:55 ` [PATCH 05/21] batman-adv: Prepare framework for hardif " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 06/21] batman-adv: Prepare framework for vlan " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 07/21] batman-adv: Add aggregated_ogms mesh genl configuration Simon Wunderlich
2019-02-13 9:55 ` [PATCH 08/21] batman-adv: Add ap_isolation mesh/vlan " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 09/21] batman-adv: Add bonding mesh " Simon Wunderlich
2019-02-13 9:55 ` Simon Wunderlich [this message]
2019-02-13 9:55 ` [PATCH 11/21] batman-adv: Add distributed_arp_table " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 12/21] batman-adv: Add fragmentation " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 13/21] batman-adv: Add gateway " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 14/21] batman-adv: Add hop_penalty " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 15/21] batman-adv: Add log_level " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 16/21] batman-adv: Add multicast forceflood " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 17/21] batman-adv: Add network_coding " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 18/21] batman-adv: Add orig_interval " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 19/21] batman-adv: Add elp_interval hardif " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 20/21] batman-adv: Add throughput_override " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 21/21] batman-adv: Trigger genl notification on sysfs config change Simon Wunderlich
2019-02-14 6:28 ` [PATCH 00/21] pull request for net-next: batman-adv 2019-02-13 David Miller
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=20190213095524.10147-11-sw@simonwunderlich.de \
--to=sw@simonwunderlich.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sven@narfation.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