From patchwork Fri Nov 23 16:13:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17652 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 4D67A832D8; Fri, 23 Nov 2018 17:14:53 +0100 (CET) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="PAiKi08V"; dkim-atps=neutral Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=79.140.41.39; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver= Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 9CEAB80CF9 for ; Fri, 23 Nov 2018 17:14:18 +0100 (CET) Received: from sven-desktop.home.narfation.org (unknown [IPv6:2003:c5:9700:89fd::8096]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 3E926110161; Fri, 23 Nov 2018 17:14:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1542989658; bh=53wI4ZDdYq/JUwULKxSr+EhXy2apLKSn42ADvkCWKVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PAiKi08VlfG+m22obnsmBh+l5Y7at4KV8PCXeo6aE00DTDeL3ZqHY8JVpRN6p5X2A aatXfjotiPUxbMznLP1mGef8T/7MoVYzOP2alUpQuA8FHLoc8PUjhU+/fxhaDupqA6 HX4X2rMuu1To6kCyGh68g/kIapNUuijI4FpuXMPc= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 23 Nov 2018 17:13:54 +0100 Message-Id: <20181123161359.13342-15-sven@narfation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181123161359.13342-1-sven@narfation.org> References: <20181123161359.13342-1-sven@narfation.org> MIME-Version: 1.0 Subject: [B.A.T.M.A.N.] [RFC v2 14/19] batman-adv: Add multicast_mode mesh genl configuration X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Cc: netdev@vger.kernel.org, Jiri Pirko Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" The mesh interface can optimize the flooding of multicast packets based on the content of the global translation tables. The BATADV_CMD_SET_MESH/BATADV_CMD_GET_MESH commands allow to set/get the configuration of this feature using the BATADV_ATTR_MULTICAST_MODE attribute. Setting the u8 to zero will disable this feature and setting it to something else is enabling this feature. Cc: Jiri Pirko Signed-off-by: Sven Eckelmann --- include/uapi/linux/batman_adv.h | 8 ++++++++ net/batman-adv/netlink.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index 1c7d325f..c2ee1818 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -454,6 +454,14 @@ enum batadv_nl_attrs { */ BATADV_ATTR_LOG_LEVEL, + /** + * @BATADV_ATTR_MULTICAST_MODE: whether multicast optimizations are + * enabled or disabled. If set to zero then all nodes in the mesh are + * going to use classic flooding for any multicast packet with no + * optimizations. + */ + BATADV_ATTR_MULTICAST_MODE, + /* 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 a38e28e3..1b2ea342 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -155,6 +155,7 @@ static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_GW_SEL_CLASS] = { .type = NLA_U32 }, [BATADV_ATTR_HOP_PENALTY] = { .type = NLA_U8 }, [BATADV_ATTR_LOG_LEVEL] = { .type = NLA_U32 }, + [BATADV_ATTR_MULTICAST_MODE] = { .type = NLA_U8 }, }; /** @@ -342,6 +343,12 @@ static int batadv_netlink_mesh_put(struct sk_buff *msg, goto nla_put_failure; #endif /* CONFIG_BATMAN_ADV_DEBUG */ +#ifdef CONFIG_BATMAN_ADV_MCAST + if (nla_put_u8(msg, BATADV_ATTR_MULTICAST_MODE, + !!atomic_read(&bat_priv->multicast_mode))) + goto nla_put_failure; +#endif /* CONFIG_BATMAN_ADV_MCAST */ + batadv_hardif_put(primary_if); genlmsg_end(msg, hdr); @@ -562,6 +569,14 @@ static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info) } #endif /* CONFIG_BATMAN_ADV_DEBUG */ +#ifdef CONFIG_BATMAN_ADV_MCAST + if (info->attrs[BATADV_ATTR_MULTICAST_MODE]) { + attr = info->attrs[BATADV_ATTR_MULTICAST_MODE]; + + atomic_set(&bat_priv->multicast_mode, !!nla_get_u8(attr)); + } +#endif /* CONFIG_BATMAN_ADV_MCAST */ + batadv_netlink_notify_mesh(bat_priv); return 0;