B.A.T.M.A.N February 2019

b.a.t.m.a.n@lists.open-mesh.org

13 participants
30 discussions

[B.A.T.M.A.N.] batman-adv: Reduce claim hash refcnt only for removed entry

by Sven Eckelmann

The batadv_hash_remove is a function which searches the hashtable for an entry using a needle, a hashtable bucket selection function and a compare function. It will lock the bucket list and delete an entry when the compare function matches it with the needle. It returns the pointer to the hlist_node which matches or NULL when no entry matches the needle. The batadv_bla_del_claim is not itself protected in anyway to avoid that any other function is modifying the hashtable between the search for the entry and the call to batadv_hash_remove. It can therefore happen that the entry either doesn't exist anymore or an entry was deleted which is not the same object as the needle. In such an situation, the reference counter (for the reference stored in the hashtable) must not be reduced for the needle. Instead the reference counter of the actually removed entry has to be reduced. Otherwise the reference counter will underflow and the object might be freed before all its references were dropped. The kref helpers reported this problem as: refcount_t: underflow; use-after-free. Fixes: a9ce0dc43e2c ("batman-adv: add basic bridge loop avoidance code") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Cc: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index ef39aabdb69435f384ae2ebef26d4d31367f427c..4fb01108e5f534b8a055edface0717f950ccdacc 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -803,6 +803,8 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, const u8 *mac, const unsigned short vid) { struct batadv_bla_claim search_claim, *claim; + struct batadv_bla_claim *claim_removed_entry; + struct hlist_node *claim_removed_node; ether_addr_copy(search_claim.addr, mac); search_claim.vid = vid; @@ -813,10 +815,18 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_BLA, bat_priv, "%s(): %pM, vid %d\n", __func__, mac, batadv_print_vid(vid)); - batadv_hash_remove(bat_priv->bla.claim_hash, batadv_compare_claim, - batadv_choose_claim, claim); - batadv_claim_put(claim); /* reference from the hash is gone */ + claim_removed_node = batadv_hash_remove(bat_priv->bla.claim_hash, + batadv_compare_claim, + batadv_choose_claim, claim); + if (!claim_removed_node) + goto free_claim; + /* reference from the hash is gone */ + claim_removed_entry = hlist_entry(claim_removed_node, + struct batadv_bla_claim, hash_entry); + batadv_claim_put(claim_removed_entry); + +free_claim: /* don't need the reference from hash_find() anymore */ batadv_claim_put(claim); }

4 years, 1 month

[B.A.T.M.A.N.] [PATCH] batctl: Add hop_penalty setting command

by Sven Eckelmann

OpenWrt was switched to use batctl as abstraction of the sysfs and netlink configuration interface. The only additional configuration option to finish this process is hop_penalty. It is required to defines the penalty which will be applied to an not available via batctl was hop_penalty originator message's tq-field on every hop. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 1 + README.rst | 15 +++++++ hop_penalty.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++ man/batctl.8 | 4 ++ 4 files changed, 135 insertions(+) create mode 100644 hop_penalty.c diff --git a/Makefile b/Makefile index 4d8b709..55105cc 100755 --- a/Makefile +++ b/Makefile @@ -63,6 +63,7 @@ $(eval $(call add_command,event,y)) $(eval $(call add_command,fragmentation,y)) $(eval $(call add_command,gateways,y)) $(eval $(call add_command,gw_mode,y)) +$(eval $(call add_command,hop_penalty,y)) $(eval $(call add_command,interface,y)) $(eval $(call add_command,isolation_mark,y)) $(eval $(call add_command,log,y)) diff --git a/README.rst b/README.rst index 4c0f544..e30b5b9 100644 --- a/README.rst +++ b/README.rst @@ -530,6 +530,21 @@ Usage:: batctl aggregation|ag [0|1] +batctl hop_penalty +================== + +display or modify the hop_penalty (0-255) + +Usage:: + + batctl hop_penalty|hp [penalty] + +Example:: + + $ batctl penalty + 30 + + batctl isolation_mark ===================== diff --git a/hop_penalty.c b/hop_penalty.c new file mode 100644 index 0000000..58067bf --- /dev/null +++ b/hop_penalty.c @@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: + * + * Marek Lindner <mareklindner(a)neomailbox.ch> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include <errno.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> + +#include "main.h" +#include "sys.h" + +static struct hop_penalty_data { + uint8_t hop_penalty; +} hop_penalty; + +static int parse_hop_penalty(struct state *state, int argc, char *argv[]) +{ + struct settings_data *settings = state->cmd->arg; + struct hop_penalty_data *data = settings->data; + char *endptr; + + if (argc != 2) { + fprintf(stderr, "Error - incorrect number of arguments (expected 1)\n"); + return -EINVAL; + } + + data->hop_penalty = strtoul(argv[1], &endptr, 0); + if (!endptr || *endptr != '\0') { + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + return -EINVAL; + } + + return 0; +} + +static int print_hop_penalty(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX + 1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct genlmsghdr *ghdr; + int *result = arg; + + if (!genlmsg_valid_hdr(nlh, 0)) + return NL_OK; + + ghdr = nlmsg_data(nlh); + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + return NL_OK; + } + + if (!attrs[BATADV_ATTR_HOP_PENALTY]) + return NL_OK; + + printf("%u\n", nla_get_u8(attrs[BATADV_ATTR_HOP_PENALTY])); + + *result = 0; + return NL_STOP; +} + +static int get_hop_penalty(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_GET_MESH, + NULL, print_hop_penalty); +} + +static int set_attrs_hop_penalty(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + struct settings_data *settings = state->cmd->arg; + struct hop_penalty_data *data = settings->data; + + nla_put_u8(msg, BATADV_ATTR_HOP_PENALTY, data->hop_penalty); + + return 0; +} + +static int set_hop_penalty(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_SET_MESH, + set_attrs_hop_penalty, NULL); +} + +static struct settings_data batctl_settings_hop_penalty = { + .sysfs_name = "hop_penalty", + .data = &hop_penalty, + .parse = parse_hop_penalty, + .netlink_get = get_hop_penalty, + .netlink_set = set_hop_penalty, +}; + +COMMAND_NAMED(SUBCOMMAND, hop_penalty, "hp", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_settings_hop_penalty, + "[penalty] \tdisplay or modify hop_penalty setting"); diff --git a/man/batctl.8 b/man/batctl.8 index ed8e71f..0fbf1dd 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -97,6 +97,10 @@ when parameter \fB\-t\fP is specified. Parameter \fB\-r\fP will do the same but If no parameter is given the current fragmentation mode setting is displayed. Otherwise the parameter is used to enable or disable fragmentation. .br +.IP "\fBhop_penalty\fP|\fBhp\fP [\fBpenalty\fP]" +If no parameter is given the current hop penalty setting is displayed. Otherwise the parameter is used to set the +hop penalty. The penalty is can be 0-255 (255 sets originator message's TQ to zero when forwarded by this hop). +.br .IP "\fBnetwork_coding\fP|\fBnc\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current network coding mode setting is displayed. Otherwise the parameter is used to enable or disable network coding. -- 2.20.1

4 years, 1 month

[B.A.T.M.A.N.] [PATCH] batman-adv: fix warning in function batadv_v_elp_get_throughput

by Anders Roxell

When CONFIG_CFG80211 isn't enabled the compiler correcly warns about 'sinfo.pertid' may be unused. It can also happen for other error conditions that it not warn about. net/batman-adv/bat_v_elp.c: In function ‘batadv_v_elp_get_throughput.isra.0’: include/net/cfg80211.h:6370:13: warning: ‘sinfo.pertid’ may be used uninitialized in this function [-Wmaybe-uninitialized] kfree(sinfo->pertid); ~~~~~^~~~~~~~ Rework so that we only release '&sinfo' if cfg80211_get_station returns zero. Signed-off-by: Anders Roxell <anders.roxell(a)linaro.org> --- net/batman-adv/bat_v_elp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index a9b7919c9de5..d5df0114f08a 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -104,8 +104,10 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) ret = cfg80211_get_station(real_netdev, neigh->addr, &sinfo); - /* free the TID stats immediately */ - cfg80211_sinfo_release_content(&sinfo); + if (!ret) { + /* free the TID stats immediately */ + cfg80211_sinfo_release_content(&sinfo); + } dev_put(real_netdev); if (ret == -ENOENT) { -- 2.19.2

4 years, 1 month

[B.A.T.M.A.N.] [PATCH] batctl: replace multicast_mode with multicast_forceflood command

by Linus Lüssing

This patch hides the multicast_mode setting in the UI and adds a new multicast_forceflood command. multicast_forceflood is basically the inverse of the current multicast_mode setting. For the netlink config additions to batman-adv "multicast_mode" was not added. Instead a "multicast_forceflood" attribute was introduced. The multicast_mode batctl command is kept for compatibility for now but should be removed eventually. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Makefile | 1 + README.rst | 8 ++--- functions.c | 16 ++++++++- functions.h | 1 + main.c | 3 ++ main.h | 1 + man/batctl.8 | 8 +++-- multicast_forceflood.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++ multicast_mode.c | 3 +- sys.c | 30 +++++++++++++--- 10 files changed, 151 insertions(+), 15 deletions(-) create mode 100644 multicast_forceflood.c diff --git a/Makefile b/Makefile index 4d8b709..7c050c0 100755 --- a/Makefile +++ b/Makefile @@ -68,6 +68,7 @@ $(eval $(call add_command,isolation_mark,y)) $(eval $(call add_command,log,y)) $(eval $(call add_command,loglevel,y)) $(eval $(call add_command,mcast_flags,y)) +$(eval $(call add_command,multicast_forceflood,y)) $(eval $(call add_command,multicast_mode,y)) $(eval $(call add_command,nc_nodes,y)) $(eval $(call add_command,neighbors,y)) diff --git a/README.rst b/README.rst index 4c0f544..6db68d7 100644 --- a/README.rst +++ b/README.rst @@ -468,14 +468,14 @@ Usage:: Note that network coding requires a working promiscuous mode on all interfaces. -batctl multicast_mode -===================== +batctl multicast_forceflood +=========================== -display or modify the multicast mode setting +display or modify the multicast forceflood setting Usage:: - batctl multicast_mode|mm [0|1] + batctl multicast_forceflood|mff [0|1] batctl mcast_flags diff --git a/functions.c b/functions.c index 76deab7..a202969 100644 --- a/functions.c +++ b/functions.c @@ -175,6 +175,16 @@ static bool ether_addr_valid(const uint8_t *addr) return true; } +static void print_inv_bool(char *line) +{ + if (!strncmp("enabled", line, strlen("enabled"))) + printf("disabled\n"); + else if (!strncmp("disabled", line, strlen("disabled"))) + printf("enabled\n"); + else + printf("%s", line); +} + int read_file(const char *dir, const char *fname, int read_opt, float orig_timeout, float watch_interval, size_t header_lines) { @@ -237,7 +247,11 @@ int read_file(const char *dir, const char *fname, int read_opt, continue; if (!(read_opt & USE_BAT_HOSTS)) { - printf("%s", line_ptr); + if (read_opt & INVERSE_BOOL) + print_inv_bool(line_ptr); + else + printf("%s", line_ptr); + continue; } diff --git a/functions.h b/functions.h index e2bbb4e..b3f2159 100644 --- a/functions.h +++ b/functions.h @@ -91,6 +91,7 @@ enum { SKIP_HEADER = 0x100, UNICAST_ONLY = 0x200, MULTICAST_ONLY = 0x400, + INVERSE_BOOL = 0x800, }; #endif diff --git a/main.c b/main.c index 2a28642..199c7a4 100644 --- a/main.c +++ b/main.c @@ -74,6 +74,9 @@ static void print_usage(void) if (cmd->type != type[i]) continue; + if (!cmd->usage) + continue; + if (strcmp(cmd->name, cmd->abbr) == 0) snprintf(buf, sizeof(buf), "%s", cmd->name); else diff --git a/main.h b/main.h index fca2a32..92d0e61 100644 --- a/main.h +++ b/main.h @@ -67,6 +67,7 @@ extern char module_ver_path[]; enum command_flags { COMMAND_FLAG_MESH_IFACE = BIT(0), COMMAND_FLAG_NETLINK = BIT(1), + COMMAND_FLAG_INVERSE = BIT(2), }; enum command_type { diff --git a/man/batctl.8 b/man/batctl.8 index ed8e71f..695067f 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -101,9 +101,11 @@ disable fragmentation. If no parameter is given the current network coding mode setting is displayed. Otherwise the parameter is used to enable or disable network coding. .br -.IP "\fBmulticast_mode\fP|\fBmm\fP [\fB0\fP|\fB1\fP]" -If no parameter is given the current multicast mode setting is displayed. Otherwise the parameter is used to enable or -disable multicast optimizations (i.e. disabling means always sending own multicast frames via classic flooding). +.IP "\fBmulticast_forceflood\fP|\fBmff\fP [\fB0\fP|\fB1\fP]" +If no parameter is given the current multicast forceflood setting is displayed. Otherwise the parameter is used to enable or +disable multicast forceflood. This setting defines whether multicast optimizations should be replaced by simple broadcast-like +flooding of multicast packets. If set to non-zero then all nodes in the mesh are going to use classic flooding for any +multicast packet with no optimizations. .br .IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log diff --git a/multicast_forceflood.c b/multicast_forceflood.c new file mode 100644 index 0000000..daaa6d0 --- /dev/null +++ b/multicast_forceflood.c @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: + * + * Linus Lüssing <linus.luessing(a)c0d3.blue> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include "main.h" + +#include <errno.h> +#include <linux/genetlink.h> +#include <netlink/genl/genl.h> + +#include "batman_adv.h" +#include "netlink.h" +#include "sys.h" + +static struct simple_boolean_data multicast_forceflood; + +static int print_multicast_forceflood(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX + 1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct genlmsghdr *ghdr; + int *result = arg; + + if (!genlmsg_valid_hdr(nlh, 0)) + return NL_OK; + + ghdr = nlmsg_data(nlh); + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + return NL_OK; + } + + if (!attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]) + return NL_OK; + + printf("%s\n", nla_get_u8(attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]) ? "enabled" : "disabled"); + + *result = 0; + return NL_STOP; +} + +static int get_multicast_forceflood(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_GET_MESH, + NULL, print_multicast_forceflood); +} + +static int set_attrs_multicast_forceflood(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + struct settings_data *settings = state->cmd->arg; + struct simple_boolean_data *data = settings->data; + + nla_put_u8(msg, BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED, data->val); + + return 0; +} + +static int set_multicast_forceflood(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_SET_MESH, + set_attrs_multicast_forceflood, NULL); +} + +static struct settings_data batctl_settings_multicast_forceflood = { + .sysfs_name = "multicast_mode", + .data = &multicast_forceflood, + .parse = parse_simple_boolean, + .netlink_get = get_multicast_forceflood, + .netlink_set = set_multicast_forceflood, +}; + +COMMAND_NAMED(SUBCOMMAND, multicast_forceflood, "mff", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK | COMMAND_FLAG_INVERSE, + &batctl_settings_multicast_forceflood, + "[0|1] \tdisplay or modify multicast_forceflood setting"); diff --git a/multicast_mode.c b/multicast_mode.c index 836a744..fb17586 100644 --- a/multicast_mode.c +++ b/multicast_mode.c @@ -91,5 +91,4 @@ static struct settings_data batctl_settings_multicast_mode = { COMMAND_NAMED(SUBCOMMAND, multicast_mode, "mm", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_settings_multicast_mode, - "[0|1] \tdisplay or modify multicast_mode setting"); + &batctl_settings_multicast_mode, NULL); diff --git a/sys.c b/sys.c index 9a7966f..b0864cd 100644 --- a/sys.c +++ b/sys.c @@ -156,7 +156,8 @@ int sys_simple_print_boolean(struct nl_msg *msg, void *arg, static void settings_usage(struct state *state) { fprintf(stderr, "Usage: batctl [options] %s|%s [parameters] %s\n", - state->cmd->name, state->cmd->abbr, state->cmd->usage); + state->cmd->name, state->cmd->abbr, + state->cmd->usage ? state->cmd->usage : ""); fprintf(stderr, "parameters:\n"); fprintf(stderr, " \t -h print this help\n"); @@ -167,6 +168,7 @@ static int sys_read_setting(struct state *state, const char *path_buff, { struct settings_data *settings = state->cmd->arg; int res = EXIT_FAILURE; + int read_opt = NO_FLAGS; if (settings->netlink_get) { res = settings->netlink_get(state); @@ -176,8 +178,12 @@ static int sys_read_setting(struct state *state, const char *path_buff, return EXIT_SUCCESS; } - if (sysfs_name) - res = read_file(path_buff, sysfs_name, NO_FLAGS, 0, 0, 0); + if (sysfs_name) { + if (state->cmd->flags & COMMAND_FLAG_INVERSE) + read_opt |= INVERSE_BOOL; + + res = read_file(path_buff, sysfs_name, read_opt, 0, 0, 0); + } return res; } @@ -187,6 +193,7 @@ static int sys_write_setting(struct state *state, const char *path_buff, { struct settings_data *settings = state->cmd->arg; int res = EXIT_FAILURE; + char *argv1 = argv[1]; if (settings->netlink_set) { res = settings->netlink_set(state); @@ -196,9 +203,22 @@ static int sys_write_setting(struct state *state, const char *path_buff, return EXIT_SUCCESS; } - if (sysfs_name) + if (sysfs_name) { + if (state->cmd->flags & COMMAND_FLAG_INVERSE) { + if (!strncmp("0", argv[1], strlen("0")) || + !strncmp("disable", argv[1], strlen("disable")) || + !strncmp("disabled", argv[1], strlen("disabled"))) { + argv1 = "enabled"; + } else if (!strncmp("1", argv[1], strlen("1")) || + !strncmp("enable", argv[1], strlen("enable")) || + !strncmp("enabled", argv[1], strlen("enabled"))) { + argv1 = "disabled"; + } + } + res = write_file(path_buff, sysfs_name, - argv[1], argc > 2 ? argv[2] : NULL); + argv1, argc > 2 ? argv[2] : NULL); + } return res; } -- 2.11.0

4 years, 1 month

[B.A.T.M.A.N.] [PATCH v2] batctl: add switch for setting multicast_fanout

by Linus Lüssing

This patch adds an option for the new multicast_fanout setting in batman-adv. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Changelog v2: * fixed README.rst title * disabled sysfs_name * added BATADV_ATTR_MULTICAST_FANOUT to event monitor * added BATADV_ATTR_MULTICAST_FANOUT to batadv_netlink_policy * changed multicast_fanout order in Makefile --- Makefile | 1 + README.rst | 10 +++++ batman_adv.h | 7 ++++ event.c | 4 ++ man/batctl.8 | 5 +++ multicast_fanout.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++ netlink.c | 1 + 7 files changed, 143 insertions(+) create mode 100644 multicast_fanout.c diff --git a/Makefile b/Makefile index 4d8b709..7c0cbf1 100755 --- a/Makefile +++ b/Makefile @@ -68,6 +68,7 @@ $(eval $(call add_command,isolation_mark,y)) $(eval $(call add_command,log,y)) $(eval $(call add_command,loglevel,y)) $(eval $(call add_command,mcast_flags,y)) +$(eval $(call add_command,multicast_fanout,y)) $(eval $(call add_command,multicast_mode,y)) $(eval $(call add_command,nc_nodes,y)) $(eval $(call add_command,neighbors,y)) diff --git a/README.rst b/README.rst index 4c0f544..19dcc02 100644 --- a/README.rst +++ b/README.rst @@ -478,6 +478,16 @@ Usage:: batctl multicast_mode|mm [0|1] +batctl multicast_fanout +======================= + +display or modify the multicast fanout setting + +Usage:: + + batctl multicast_fanout|mo [fanout] + + batctl mcast_flags ================== diff --git a/batman_adv.h b/batman_adv.h index 9b12d2a..2f956e6 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -491,6 +491,13 @@ enum batadv_nl_attrs { */ BATADV_ATTR_THROUGHPUT_OVERRIDE, + /** + * @BATADV_ATTR_MULTICAST_FANOUT: defines the maximum number of packet + * copies that may be generated for a multicast-to-unicast conversion. + * Once this limit is exceeded distribution will fall back to broadcast. + */ + BATADV_ATTR_MULTICAST_FANOUT, + /* add attributes above here, update the policy in netlink.c */ /** diff --git a/event.c b/event.c index 62ccf56..8fab5ae 100644 --- a/event.c +++ b/event.c @@ -284,6 +284,10 @@ static void event_parse_set_mesh(struct nlattr **attrs) printf("* log_level 0x%08x\n", nla_get_u32(attrs[BATADV_ATTR_LOG_LEVEL])); + if (attrs[BATADV_ATTR_MULTICAST_FANOUT]) + printf("* multicast_fanout %u\n", + nla_get_u32(attrs[BATADV_ATTR_MULTICAST_FANOUT])); + if (attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]) printf("* multicast_forceflood %s\n", u8_to_boolstr(attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED])); diff --git a/man/batctl.8 b/man/batctl.8 index ed8e71f..92c0e32 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -105,6 +105,11 @@ disable network coding. If no parameter is given the current multicast mode setting is displayed. Otherwise the parameter is used to enable or disable multicast optimizations (i.e. disabling means always sending own multicast frames via classic flooding). .br +.IP "\fBmulticast_fanout\fP|\fBmo\fP [\fBfanout\fP]" +If no parameter is given the current multicast fanout setting is displayed. Otherwise the parameter is used to set +the multicast fanout. The multicast fanout defines the maximum number of packet copies that may be generated for a +multicast-to-unicast conversion. Once this limit is exceeded distribution will fall back to broadcast. +.br .IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. diff --git a/multicast_fanout.c b/multicast_fanout.c new file mode 100644 index 0000000..0de2622 --- /dev/null +++ b/multicast_fanout.c @@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: + * + * Marek Lindner <mareklindner(a)neomailbox.ch> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include <errno.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> + +#include "main.h" +#include "sys.h" + +static struct multicast_fanout_data { + uint32_t multicast_fanout; +} multicast_fanout; + +static int parse_multicast_fanout(struct state *state, int argc, char *argv[]) +{ + struct settings_data *settings = state->cmd->arg; + struct multicast_fanout_data *data = settings->data; + char *endptr; + + if (argc != 2) { + fprintf(stderr, "Error - incorrect number of arguments (expected 1)\n"); + return -EINVAL; + } + + data->multicast_fanout = strtoul(argv[1], &endptr, 0); + if (!endptr || *endptr != '\0') { + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + return -EINVAL; + } + + return 0; +} + +static int print_multicast_fanout(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX + 1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct genlmsghdr *ghdr; + int *result = arg; + + if (!genlmsg_valid_hdr(nlh, 0)) + return NL_OK; + + ghdr = nlmsg_data(nlh); + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + return NL_OK; + } + + if (!attrs[BATADV_ATTR_MULTICAST_FANOUT]) + return NL_OK; + + printf("%u\n", nla_get_u32(attrs[BATADV_ATTR_MULTICAST_FANOUT])); + + *result = 0; + return NL_STOP; +} + +static int get_multicast_fanout(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_GET_MESH, + NULL, print_multicast_fanout); +} + +static int set_attrs_multicast_fanout(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + struct settings_data *settings = state->cmd->arg; + struct multicast_fanout_data *data = settings->data; + + nla_put_u32(msg, BATADV_ATTR_MULTICAST_FANOUT, data->multicast_fanout); + + return 0; +} + +static int set_multicast_fanout(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_SET_MESH, + set_attrs_multicast_fanout, NULL); +} + +static struct settings_data batctl_settings_multicast_fanout = { + .sysfs_name = NULL, + .data = &multicast_fanout, + .parse = parse_multicast_fanout, + .netlink_get = get_multicast_fanout, + .netlink_set = set_multicast_fanout, +}; + +COMMAND_NAMED(SUBCOMMAND, multicast_fanout, "mo", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_settings_multicast_fanout, + "[fanout] \tdisplay or modify multicast_fanout setting"); diff --git a/netlink.c b/netlink.c index 5b9966c..49673a8 100644 --- a/netlink.c +++ b/netlink.c @@ -123,6 +123,7 @@ struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_HOP_PENALTY] = { .type = NLA_U8 }, [BATADV_ATTR_LOG_LEVEL] = { .type = NLA_U32 }, [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_MULTICAST_FANOUT] = { .type = NLA_U32 }, [BATADV_ATTR_NETWORK_CODING_ENABLED] = { .type = NLA_U8 }, [BATADV_ATTR_ORIG_INTERVAL] = { .type = NLA_U32 }, [BATADV_ATTR_ELP_INTERVAL] = { .type = NLA_U32 }, -- 2.11.0

4 years, 1 month

[B.A.T.M.A.N.] [PATCH v3] batman-adv: Add multicast-to-unicast support for multiple targets

by Linus Lüssing

With this patch multicast packets with a limited number of destinations (current default: 16) will be split and transmitted by the originator as individual unicast transmissions. Wifi broadcasts with their low bitrate are still a costly undertaking. In a mesh network this cost multiplies with the overall size of the mesh network. Therefore using multiple unicast transmissions instead of broadcast flooding is almost always less burdensome for the mesh network. The maximum amount of unicast packets can be configured via the newly introduced multicast_fanout parameter. If this limit is exceeded distribution will fall back to classic broadcast flooding. The multicast-to-unicast conversion is performed on the initial multicast sender node and counts on a final destination node, mesh-wide basis (and not next hop, neighbor node basis). Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Changelog v3: * removed sysfs support for multicast_fanout Changelog v2: * rebased to master (no conflicts/changes) * fixed a double free bug in the batman-adv multicast-to-multi-unicast patch: led to crashes, especially on netifd restart/shutdown -> https://github.com/freifunk-gluon/gluon/issues/1468 * fixed skb memory leaks in error cases * added netlink support for multicast_fanout * updated multicast_fanout sysfs ABI doc date to Feb 2019 --- include/uapi/linux/batman_adv.h | 7 ++ net/batman-adv/multicast.c | 241 ++++++++++++++++++++++++++++++++++++- net/batman-adv/multicast.h | 18 +++ net/batman-adv/netlink.c | 11 ++ net/batman-adv/soft-interface.c | 8 +- net/batman-adv/translation-table.c | 6 +- net/batman-adv/translation-table.h | 4 + net/batman-adv/types.h | 6 + 8 files changed, 295 insertions(+), 6 deletions(-) diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index 305bf316..e875e0c5 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -491,6 +491,13 @@ enum batadv_nl_attrs { */ BATADV_ATTR_THROUGHPUT_OVERRIDE, + /** + * @BATADV_ATTR_MULTICAST_FANOUT: defines the maximum number of packet + * copies that may be generated for a multicast-to-unicast conversion. + * Once this limit is exceeded distribution will fall back to broadcast. + */ + BATADV_ATTR_MULTICAST_FANOUT, + /* add attributes above here, update the policy in netlink.c */ /** diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index f91b1b62..aa38736f 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -66,6 +66,7 @@ #include "hash.h" #include "log.h" #include "netlink.h" +#include "send.h" #include "soft-interface.h" #include "translation-table.h" #include "tvlv.h" @@ -992,6 +993,7 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, int ret, tt_count, ip_count, unsnoop_count, total_count; bool is_unsnoopable = false; struct ethhdr *ethhdr; + unsigned int mcast_fanout; ret = batadv_mcast_forw_mode_check(bat_priv, skb, &is_unsnoopable); if (ret == -ENOMEM) @@ -1025,8 +1027,245 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, case 0: return BATADV_FORW_NONE; default: - return BATADV_FORW_ALL; + mcast_fanout = atomic_read(&bat_priv->multicast_fanout); + + if (!unsnoop_count && total_count <= mcast_fanout) + return BATADV_FORW_SOME; } + + return BATADV_FORW_ALL; +} + +/** + * batadv_mcast_forw_tt_send() - send a packet to multicast listeners + * @bat_priv: the bat priv with all the soft interface information + * @skb: the multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any multicast + * listener registered in the translation table. A transmission is performed + * via a batman-adv unicast packet for each such destination node. + * + * Return: NET_XMIT_DROP if limit was reached or on memory allocation failure, + * NET_XMIT_SUCCESS otherwise. + */ +static int +batadv_mcast_forw_tt_send(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid, unsigned int *limit) +{ + unsigned int limit_tmp = *limit; + int ret = NET_XMIT_SUCCESS; + struct sk_buff *newskb; + + struct batadv_tt_orig_list_entry *orig_entry; + + struct batadv_tt_global_entry *tt_global; + const u8 *addr = eth_hdr(skb)->h_dest; + + tt_global = batadv_tt_global_hash_find(bat_priv, addr, vid); + if (!tt_global) + return NET_XMIT_DROP; + + rcu_read_lock(); + hlist_for_each_entry_rcu(orig_entry, &tt_global->orig_list, list) { + if (!limit_tmp) { + ret = NET_XMIT_DROP; + break; + } + + newskb = skb_copy(skb, GFP_ATOMIC); + if (!newskb) { + ret = NET_XMIT_DROP; + break; + } + + batadv_send_skb_unicast(bat_priv, newskb, BATADV_UNICAST, 0, + orig_entry->orig_node, vid); + limit_tmp--; + } + rcu_read_unlock(); + + batadv_tt_global_entry_put(tt_global); + *limit = limit_tmp; + + return ret; +} + +/** + * batadv_mcast_forw_want_all_ipv4_send() - send to nodes with want-all-ipv4 + * @bat_priv: the bat priv with all the soft interface information + * @skb: the multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any node with a + * BATADV_MCAST_WANT_ALL_IPV4 flag set. A transmission is performed via a + * batman-adv unicast packet for each such destination node. + * + * Return: NET_XMIT_DROP if limit was reached or on memory allocation failure, + * NET_XMIT_SUCCESS otherwise. + */ +static int +batadv_mcast_forw_want_all_ipv4_send(struct batadv_priv *bat_priv, + struct sk_buff *skb, unsigned short vid, + unsigned int *limit) +{ + struct batadv_orig_node *orig_node; + unsigned int limit_tmp = *limit; + int ret = NET_XMIT_SUCCESS; + struct sk_buff *newskb; + + rcu_read_lock(); + hlist_for_each_entry_rcu(orig_node, + &bat_priv->mcast.want_all_ipv4_list, + mcast_want_all_ipv4_node) { + if (!limit_tmp) { + ret = NET_XMIT_DROP; + break; + } + + newskb = skb_copy(skb, GFP_ATOMIC); + if (!newskb) { + ret = NET_XMIT_DROP; + break; + } + + batadv_send_skb_unicast(bat_priv, newskb, BATADV_UNICAST, 0, + orig_node, vid); + limit_tmp--; + } + rcu_read_unlock(); + + *limit = limit_tmp; + return ret; +} + +/** + * batadv_mcast_forw_want_all_ipv6_send() - send to nodes with want-all-ipv6 + * @bat_priv: the bat priv with all the soft interface information + * @skb: The multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any node with a + * BATADV_MCAST_WANT_ALL_IPV6 flag set. A transmission is performed via a + * batman-adv unicast packet for each such destination node. + * + * Return: NET_XMIT_DROP if limit was reached or on memory allocation failure, + * NET_XMIT_SUCCESS otherwise. + */ +static int +batadv_mcast_forw_want_all_ipv6_send(struct batadv_priv *bat_priv, + struct sk_buff *skb, unsigned short vid, + unsigned int *limit) +{ + struct batadv_orig_node *orig_node; + unsigned int limit_tmp = *limit; + int ret = NET_XMIT_SUCCESS; + struct sk_buff *newskb; + + rcu_read_lock(); + hlist_for_each_entry_rcu(orig_node, + &bat_priv->mcast.want_all_ipv6_list, + mcast_want_all_ipv6_node) { + if (!limit_tmp) { + ret = NET_XMIT_DROP; + break; + } + + newskb = skb_copy(skb, GFP_ATOMIC); + if (!newskb) { + ret = NET_XMIT_DROP; + break; + } + + batadv_send_skb_unicast(bat_priv, newskb, BATADV_UNICAST, 0, + orig_node, vid); + limit_tmp--; + } + rcu_read_unlock(); + + *limit = limit_tmp; + return ret; +} + +/** + * batadv_mcast_forw_want_all_send() - send packet to nodes in a want-all list + * @bat_priv: the bat priv with all the soft interface information + * @skb: the multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any node with a + * BATADV_MCAST_WANT_ALL_IPV4 or BATADV_MCAST_WANT_ALL_IPV6 flag set. A + * transmission is performed via a batman-adv unicast packet for each such + * destination node. + * + * Return: NET_XMIT_DROP if limit was reached, on memory allocation failure + * or if the protocol family is neither IPv4 nor IPv6. NET_XMIT_SUCCESS + * otherwise. + */ +static int +batadv_mcast_forw_want_all_send(struct batadv_priv *bat_priv, + struct sk_buff *skb, unsigned short vid, + unsigned int *limit) +{ + switch (ntohs(eth_hdr(skb)->h_proto)) { + case ETH_P_IP: + return batadv_mcast_forw_want_all_ipv4_send(bat_priv, skb, vid, + limit); + case ETH_P_IPV6: + return batadv_mcast_forw_want_all_ipv6_send(bat_priv, skb, vid, + limit); + default: + /* we shouldn't be here... */ + return NET_XMIT_DROP; + } +} + +/** + * batadv_mcast_forw_send() - send packet to any detected multicast recpient + * @bat_priv: the bat priv with all the soft interface information + * @skb: the multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any node that signaled + * interest in it, that is either via the translation table or the according + * want-all flags. A transmission is performed via a batman-adv unicast packet + * for each such destination node. + * + * The given skb is consumed/freed. + * + * Return: NET_XMIT_DROP if limit was reached, on memory allocation failure + * or if the protocol family is neither IPv4 nor IPv6. NET_XMIT_SUCCESS + * otherwise. + */ +int batadv_mcast_forw_send(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid) +{ + /* The previous forw mode check will try to limit to the configured + * fanout. Here, we allow a little bit of flexibility in case some + * new listeners might have joined between these function calls. + */ + unsigned int limit = 2 * atomic_read(&bat_priv->multicast_fanout); + int ret; + + ret = batadv_mcast_forw_tt_send(bat_priv, skb, vid, &limit); + if (ret != NET_XMIT_SUCCESS) { + kfree_skb(skb); + return ret; + } + + ret = batadv_mcast_forw_want_all_send(bat_priv, skb, vid, &limit); + if (ret != NET_XMIT_SUCCESS) { + kfree_skb(skb); + return ret; + } + + consume_skb(skb); + return ret; } /** diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h index 466013fe..83c5ff51 100644 --- a/net/batman-adv/multicast.h +++ b/net/batman-adv/multicast.h @@ -36,6 +36,13 @@ enum batadv_forw_mode { BATADV_FORW_ALL, /** + * @BATADV_FORW_SOME: forward the packet to some nodes (currently via + * a multicast-to-unicast conversion and the BATMAN unicast routing + * protocol) + */ + BATADV_FORW_SOME, + + /** * @BATADV_FORW_SINGLE: forward the packet to a single node (currently * via the BATMAN unicast routing protocol) */ @@ -51,6 +58,9 @@ enum batadv_forw_mode batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, struct batadv_orig_node **mcast_single_orig); +int batadv_mcast_forw_send(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid); + void batadv_mcast_init(struct batadv_priv *bat_priv); int batadv_mcast_flags_seq_print_text(struct seq_file *seq, void *offset); @@ -73,6 +83,14 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, return BATADV_FORW_ALL; } +static inline int +batadv_mcast_forw_send(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid) +{ + kfree_skb(skb); + return NET_XMIT_DROP; +} + static inline int batadv_mcast_init(struct batadv_priv *bat_priv) { return 0; diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 67a58da2..f0458727 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -157,6 +157,7 @@ static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_HOP_PENALTY] = { .type = NLA_U8 }, [BATADV_ATTR_LOG_LEVEL] = { .type = NLA_U32 }, [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_MULTICAST_FANOUT] = { .type = NLA_U32 }, [BATADV_ATTR_NETWORK_CODING_ENABLED] = { .type = NLA_U8 }, [BATADV_ATTR_ORIG_INTERVAL] = { .type = NLA_U32 }, [BATADV_ATTR_ELP_INTERVAL] = { .type = NLA_U32 }, @@ -353,6 +354,10 @@ static int batadv_netlink_mesh_fill(struct sk_buff *msg, if (nla_put_u8(msg, BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED, !atomic_read(&bat_priv->multicast_mode))) goto nla_put_failure; + + if (nla_put_u32(msg, BATADV_ATTR_MULTICAST_FANOUT, + atomic_read(&bat_priv->multicast_fanout))) + goto nla_put_failure; #endif /* CONFIG_BATMAN_ADV_MCAST */ #ifdef CONFIG_BATMAN_ADV_NC @@ -592,6 +597,12 @@ static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info) atomic_set(&bat_priv->multicast_mode, !nla_get_u8(attr)); } + + if (info->attrs[BATADV_ATTR_MULTICAST_FANOUT]) { + attr = info->attrs[BATADV_ATTR_MULTICAST_FANOUT]; + + atomic_set(&bat_priv->multicast_fanout, nla_get_u32(attr)); + } #endif /* CONFIG_BATMAN_ADV_MCAST */ #ifdef CONFIG_BATMAN_ADV_NC diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 2e367230..db8ac4df 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -209,7 +209,7 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, unsigned short vid; u32 seqno; int gw_mode; - enum batadv_forw_mode forw_mode; + enum batadv_forw_mode forw_mode = BATADV_FORW_SINGLE; struct batadv_orig_node *mcast_single_orig = NULL; int network_offset = ETH_HLEN; __be16 proto; @@ -317,7 +317,8 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, if (forw_mode == BATADV_FORW_NONE) goto dropped; - if (forw_mode == BATADV_FORW_SINGLE) + if (forw_mode == BATADV_FORW_SINGLE || + forw_mode == BATADV_FORW_SOME) do_bcast = false; } } @@ -377,6 +378,8 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, ret = batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST, 0, mcast_single_orig, vid); + } else if (forw_mode == BATADV_FORW_SOME) { + ret = batadv_mcast_forw_send(bat_priv, skb, vid); } else { if (batadv_dat_snoop_outgoing_arp_request(bat_priv, skb)) @@ -818,6 +821,7 @@ static int batadv_softif_init_late(struct net_device *dev) bat_priv->mcast.querier_ipv6.shadowing = false; bat_priv->mcast.flags = BATADV_NO_FLAGS; atomic_set(&bat_priv->multicast_mode, 1); + atomic_set(&bat_priv->multicast_fanout, 16); atomic_set(&bat_priv->mcast.num_want_all_unsnoopables, 0); atomic_set(&bat_priv->mcast.num_want_all_ipv4, 0); atomic_set(&bat_priv->mcast.num_want_all_ipv6, 0); diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index f73d7913..8f83554b 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -61,6 +61,7 @@ #include "log.h" #include "netlink.h" #include "originator.h" +#include "send.h" #include "soft-interface.h" #include "tvlv.h" @@ -205,7 +206,7 @@ batadv_tt_local_hash_find(struct batadv_priv *bat_priv, const u8 *addr, * Return: a pointer to the corresponding tt_global_entry struct if the client * is found, NULL otherwise. */ -static struct batadv_tt_global_entry * +struct batadv_tt_global_entry * batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const u8 *addr, unsigned short vid) { @@ -300,8 +301,7 @@ static void batadv_tt_global_entry_release(struct kref *ref) * possibly release it * @tt_global_entry: tt_global_entry to be free'd */ -static void -batadv_tt_global_entry_put(struct batadv_tt_global_entry *tt_global_entry) +void batadv_tt_global_entry_put(struct batadv_tt_global_entry *tt_global_entry) { kref_put(&tt_global_entry->common.refcount, batadv_tt_global_entry_release); diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index 61bca75e..5b41f217 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -41,6 +41,10 @@ int batadv_tt_global_dump(struct sk_buff *msg, struct netlink_callback *cb); void batadv_tt_global_del_orig(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, s32 match_vid, const char *message); +struct batadv_tt_global_entry * +batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const u8 *addr, + unsigned short vid); +void batadv_tt_global_entry_put(struct batadv_tt_global_entry *tt_global_entry); int batadv_tt_global_hash_count(struct batadv_priv *bat_priv, const u8 *addr, unsigned short vid); struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv, diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index a21b34ed..d22cf01e 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1565,6 +1565,12 @@ struct batadv_priv { * node's sender/originating side */ atomic_t multicast_mode; + + /** + * @multicast_fanout: Maximum number of packet copies to generate for a + * multicast-to-unicast conversion + */ + atomic_t multicast_fanout; #endif /** @orig_interval: OGM broadcast interval in milliseconds */ -- 2.11.0

4 years, 1 month

[B.A.T.M.A.N.] [PATCH] batman-adv: allow snooping gratuitous ARP Replies

by Linus Lüssing

A gratuitous ARP Reply has the following format (example): Sender MAC: 00:12:34:56:78:9A Sender IP: 192.168.2.3 Target MAC: FF:FF:FF:FF:FF:FF Target IP: 192.168.2.3 A gratuitous ARP Reply is commonly used to update an ARP table in the network in an unsolicited way. Here, the host with the MAC address 00:12:34:56:78:9A announces that it is now the owner of 192.168.2.3. Gratuitous ARP Replies are usually used for redundancy or for IP address handovers between hosts. So far, gratuitous ARP Replies were ignored for DAT processing as it contains a broadcast MAC address. This patch changes this and allows snooping such ARP messages, too. Special care needs to be taken with the target MAC, to not accidentally add this broadcast MAC to the DAT cache. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Gratuitous ARP Replies were ignored since this commit: ab361a9ccc5 ("batman-adv: filter ARP packets with invalid MAC addresses in DAT") Daniel Ehlers is currently working on a distributed DHCP server for mesh networks. For cases like these it would be helpful if userspace programs were able to add entries to the DAT, too. Sending gratuitous ARP Replies would be one easy way for userspace tools to do so. This patch was verified in VMs with gratuitous ARP Replies generated via "mausezahn". Sending such packets with a 00:00:00:00:00:00 ethernet frame destination address even allows updating the DAT without actually broadcasting the original frame into the mesh. [0]: https://github.com/sargon/ddhcpd, [1]: https://media.freifunk.net/search/?q=ddhcp --- net/batman-adv/distributed-arp-table.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 310a4f35..c8923c7d 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -373,9 +373,12 @@ batadv_dat_entry_hash_find(struct batadv_priv *bat_priv, __be32 ip, static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, u8 *mac_addr, unsigned short vid) { - struct batadv_dat_entry *dat_entry; + struct batadv_dat_entry *dat_entry = NULL; int hash_added; + if (is_multicast_ether_addr(mac_addr)) + goto out; + dat_entry = batadv_dat_entry_hash_find(bat_priv, ip, vid); /* if this entry is already known, just update it */ if (dat_entry) { @@ -1117,8 +1120,7 @@ static u16 batadv_arp_get_type(struct batadv_priv *bat_priv, /* don't care about the destination MAC address in ARP requests */ if (arphdr->ar_op != htons(ARPOP_REQUEST)) { hw_dst = batadv_arp_hw_dst(skb, hdr_size); - if (is_zero_ether_addr(hw_dst) || - is_multicast_ether_addr(hw_dst)) + if (is_zero_ether_addr(hw_dst)) goto out; } -- 2.11.0

4 years, 1 month

[B.A.T.M.A.N.] [PATCH v2] batman-adv: Add multicast-to-unicast support for multiple targets

by Linus Lüssing

With this patch multicast packets with a limited number of destinations (current default: 16) will be split and transmitted by the originator as individual unicast transmissions. Wifi broadcasts with their low bitrate are still a costly undertaking. In a mesh network this cost multiplies with the overall size of the mesh network. Therefore using multiple unicast transmissions instead of broadcast flooding is almost always less burdensome for the mesh network. The maximum amount of unicast packets can be configured via the newly introduced multicast_fanout parameter. If this limit is exceeded distribution will fall back to classic broadcast flooding. The multicast-to-unicast conversion is performed on the initial multicast sender node and counts on a final destination node, mesh-wide basis (and not next hop, neighbor node basis). Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Changelog v2: * rebased to master (no conflicts/changes) * fixed a double free bug in the batman-adv multicast-to-multi-unicast patch: led to crashes, especially on netifd restart/shutdown -> https://github.com/freifunk-gluon/gluon/issues/1468 * fixed skb memory leaks in error cases * added netlink support for multicast_fanout * updated multicast_fanout sysfs ABI doc date to Feb 2019 --- Documentation/ABI/testing/sysfs-class-net-mesh | 9 + include/uapi/linux/batman_adv.h | 7 + net/batman-adv/multicast.c | 241 ++++++++++++++++++++++++- net/batman-adv/multicast.h | 18 ++ net/batman-adv/netlink.c | 11 ++ net/batman-adv/soft-interface.c | 8 +- net/batman-adv/sysfs.c | 3 + net/batman-adv/translation-table.c | 6 +- net/batman-adv/translation-table.h | 4 + net/batman-adv/types.h | 6 + 10 files changed, 307 insertions(+), 6 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/Documentation/ABI/testing/sysfs-class-net-mesh index c2b956d4..9e72185b 100644 --- a/Documentation/ABI/testing/sysfs-class-net-mesh +++ b/Documentation/ABI/testing/sysfs-class-net-mesh @@ -76,6 +76,15 @@ Description: is used to classify clients as "isolated" by the Extended Isolation feature. +What: /sys/class/net/<mesh_iface>/mesh/multicast_fanout +Date: Feb 2019 +Contact: Linus Lüssing <linus.luessing(a)c0d3.blue> +Description: + Defines the maximum number of packet copies that may + be generated for a multicast-to-unicast conversion. + Once this limit is exceeded distribution will fall + back to broadcast. + What: /sys/class/net/<mesh_iface>/mesh/multicast_mode Date: Feb 2014 Contact: Linus Lüssing <linus.luessing(a)web.de> diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index 305bf316..e875e0c5 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -491,6 +491,13 @@ enum batadv_nl_attrs { */ BATADV_ATTR_THROUGHPUT_OVERRIDE, + /** + * @BATADV_ATTR_MULTICAST_FANOUT: defines the maximum number of packet + * copies that may be generated for a multicast-to-unicast conversion. + * Once this limit is exceeded distribution will fall back to broadcast. + */ + BATADV_ATTR_MULTICAST_FANOUT, + /* add attributes above here, update the policy in netlink.c */ /** diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index f91b1b62..aa38736f 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -66,6 +66,7 @@ #include "hash.h" #include "log.h" #include "netlink.h" +#include "send.h" #include "soft-interface.h" #include "translation-table.h" #include "tvlv.h" @@ -992,6 +993,7 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, int ret, tt_count, ip_count, unsnoop_count, total_count; bool is_unsnoopable = false; struct ethhdr *ethhdr; + unsigned int mcast_fanout; ret = batadv_mcast_forw_mode_check(bat_priv, skb, &is_unsnoopable); if (ret == -ENOMEM) @@ -1025,8 +1027,245 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, case 0: return BATADV_FORW_NONE; default: - return BATADV_FORW_ALL; + mcast_fanout = atomic_read(&bat_priv->multicast_fanout); + + if (!unsnoop_count && total_count <= mcast_fanout) + return BATADV_FORW_SOME; } + + return BATADV_FORW_ALL; +} + +/** + * batadv_mcast_forw_tt_send() - send a packet to multicast listeners + * @bat_priv: the bat priv with all the soft interface information + * @skb: the multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any multicast + * listener registered in the translation table. A transmission is performed + * via a batman-adv unicast packet for each such destination node. + * + * Return: NET_XMIT_DROP if limit was reached or on memory allocation failure, + * NET_XMIT_SUCCESS otherwise. + */ +static int +batadv_mcast_forw_tt_send(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid, unsigned int *limit) +{ + unsigned int limit_tmp = *limit; + int ret = NET_XMIT_SUCCESS; + struct sk_buff *newskb; + + struct batadv_tt_orig_list_entry *orig_entry; + + struct batadv_tt_global_entry *tt_global; + const u8 *addr = eth_hdr(skb)->h_dest; + + tt_global = batadv_tt_global_hash_find(bat_priv, addr, vid); + if (!tt_global) + return NET_XMIT_DROP; + + rcu_read_lock(); + hlist_for_each_entry_rcu(orig_entry, &tt_global->orig_list, list) { + if (!limit_tmp) { + ret = NET_XMIT_DROP; + break; + } + + newskb = skb_copy(skb, GFP_ATOMIC); + if (!newskb) { + ret = NET_XMIT_DROP; + break; + } + + batadv_send_skb_unicast(bat_priv, newskb, BATADV_UNICAST, 0, + orig_entry->orig_node, vid); + limit_tmp--; + } + rcu_read_unlock(); + + batadv_tt_global_entry_put(tt_global); + *limit = limit_tmp; + + return ret; +} + +/** + * batadv_mcast_forw_want_all_ipv4_send() - send to nodes with want-all-ipv4 + * @bat_priv: the bat priv with all the soft interface information + * @skb: the multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any node with a + * BATADV_MCAST_WANT_ALL_IPV4 flag set. A transmission is performed via a + * batman-adv unicast packet for each such destination node. + * + * Return: NET_XMIT_DROP if limit was reached or on memory allocation failure, + * NET_XMIT_SUCCESS otherwise. + */ +static int +batadv_mcast_forw_want_all_ipv4_send(struct batadv_priv *bat_priv, + struct sk_buff *skb, unsigned short vid, + unsigned int *limit) +{ + struct batadv_orig_node *orig_node; + unsigned int limit_tmp = *limit; + int ret = NET_XMIT_SUCCESS; + struct sk_buff *newskb; + + rcu_read_lock(); + hlist_for_each_entry_rcu(orig_node, + &bat_priv->mcast.want_all_ipv4_list, + mcast_want_all_ipv4_node) { + if (!limit_tmp) { + ret = NET_XMIT_DROP; + break; + } + + newskb = skb_copy(skb, GFP_ATOMIC); + if (!newskb) { + ret = NET_XMIT_DROP; + break; + } + + batadv_send_skb_unicast(bat_priv, newskb, BATADV_UNICAST, 0, + orig_node, vid); + limit_tmp--; + } + rcu_read_unlock(); + + *limit = limit_tmp; + return ret; +} + +/** + * batadv_mcast_forw_want_all_ipv6_send() - send to nodes with want-all-ipv6 + * @bat_priv: the bat priv with all the soft interface information + * @skb: The multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any node with a + * BATADV_MCAST_WANT_ALL_IPV6 flag set. A transmission is performed via a + * batman-adv unicast packet for each such destination node. + * + * Return: NET_XMIT_DROP if limit was reached or on memory allocation failure, + * NET_XMIT_SUCCESS otherwise. + */ +static int +batadv_mcast_forw_want_all_ipv6_send(struct batadv_priv *bat_priv, + struct sk_buff *skb, unsigned short vid, + unsigned int *limit) +{ + struct batadv_orig_node *orig_node; + unsigned int limit_tmp = *limit; + int ret = NET_XMIT_SUCCESS; + struct sk_buff *newskb; + + rcu_read_lock(); + hlist_for_each_entry_rcu(orig_node, + &bat_priv->mcast.want_all_ipv6_list, + mcast_want_all_ipv6_node) { + if (!limit_tmp) { + ret = NET_XMIT_DROP; + break; + } + + newskb = skb_copy(skb, GFP_ATOMIC); + if (!newskb) { + ret = NET_XMIT_DROP; + break; + } + + batadv_send_skb_unicast(bat_priv, newskb, BATADV_UNICAST, 0, + orig_node, vid); + limit_tmp--; + } + rcu_read_unlock(); + + *limit = limit_tmp; + return ret; +} + +/** + * batadv_mcast_forw_want_all_send() - send packet to nodes in a want-all list + * @bat_priv: the bat priv with all the soft interface information + * @skb: the multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any node with a + * BATADV_MCAST_WANT_ALL_IPV4 or BATADV_MCAST_WANT_ALL_IPV6 flag set. A + * transmission is performed via a batman-adv unicast packet for each such + * destination node. + * + * Return: NET_XMIT_DROP if limit was reached, on memory allocation failure + * or if the protocol family is neither IPv4 nor IPv6. NET_XMIT_SUCCESS + * otherwise. + */ +static int +batadv_mcast_forw_want_all_send(struct batadv_priv *bat_priv, + struct sk_buff *skb, unsigned short vid, + unsigned int *limit) +{ + switch (ntohs(eth_hdr(skb)->h_proto)) { + case ETH_P_IP: + return batadv_mcast_forw_want_all_ipv4_send(bat_priv, skb, vid, + limit); + case ETH_P_IPV6: + return batadv_mcast_forw_want_all_ipv6_send(bat_priv, skb, vid, + limit); + default: + /* we shouldn't be here... */ + return NET_XMIT_DROP; + } +} + +/** + * batadv_mcast_forw_send() - send packet to any detected multicast recpient + * @bat_priv: the bat priv with all the soft interface information + * @skb: the multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any node that signaled + * interest in it, that is either via the translation table or the according + * want-all flags. A transmission is performed via a batman-adv unicast packet + * for each such destination node. + * + * The given skb is consumed/freed. + * + * Return: NET_XMIT_DROP if limit was reached, on memory allocation failure + * or if the protocol family is neither IPv4 nor IPv6. NET_XMIT_SUCCESS + * otherwise. + */ +int batadv_mcast_forw_send(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid) +{ + /* The previous forw mode check will try to limit to the configured + * fanout. Here, we allow a little bit of flexibility in case some + * new listeners might have joined between these function calls. + */ + unsigned int limit = 2 * atomic_read(&bat_priv->multicast_fanout); + int ret; + + ret = batadv_mcast_forw_tt_send(bat_priv, skb, vid, &limit); + if (ret != NET_XMIT_SUCCESS) { + kfree_skb(skb); + return ret; + } + + ret = batadv_mcast_forw_want_all_send(bat_priv, skb, vid, &limit); + if (ret != NET_XMIT_SUCCESS) { + kfree_skb(skb); + return ret; + } + + consume_skb(skb); + return ret; } /** diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h index 466013fe..83c5ff51 100644 --- a/net/batman-adv/multicast.h +++ b/net/batman-adv/multicast.h @@ -36,6 +36,13 @@ enum batadv_forw_mode { BATADV_FORW_ALL, /** + * @BATADV_FORW_SOME: forward the packet to some nodes (currently via + * a multicast-to-unicast conversion and the BATMAN unicast routing + * protocol) + */ + BATADV_FORW_SOME, + + /** * @BATADV_FORW_SINGLE: forward the packet to a single node (currently * via the BATMAN unicast routing protocol) */ @@ -51,6 +58,9 @@ enum batadv_forw_mode batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, struct batadv_orig_node **mcast_single_orig); +int batadv_mcast_forw_send(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid); + void batadv_mcast_init(struct batadv_priv *bat_priv); int batadv_mcast_flags_seq_print_text(struct seq_file *seq, void *offset); @@ -73,6 +83,14 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, return BATADV_FORW_ALL; } +static inline int +batadv_mcast_forw_send(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid) +{ + kfree_skb(skb); + return NET_XMIT_DROP; +} + static inline int batadv_mcast_init(struct batadv_priv *bat_priv) { return 0; diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 67a58da2..f0458727 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -157,6 +157,7 @@ static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_HOP_PENALTY] = { .type = NLA_U8 }, [BATADV_ATTR_LOG_LEVEL] = { .type = NLA_U32 }, [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_MULTICAST_FANOUT] = { .type = NLA_U32 }, [BATADV_ATTR_NETWORK_CODING_ENABLED] = { .type = NLA_U8 }, [BATADV_ATTR_ORIG_INTERVAL] = { .type = NLA_U32 }, [BATADV_ATTR_ELP_INTERVAL] = { .type = NLA_U32 }, @@ -353,6 +354,10 @@ static int batadv_netlink_mesh_fill(struct sk_buff *msg, if (nla_put_u8(msg, BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED, !atomic_read(&bat_priv->multicast_mode))) goto nla_put_failure; + + if (nla_put_u32(msg, BATADV_ATTR_MULTICAST_FANOUT, + atomic_read(&bat_priv->multicast_fanout))) + goto nla_put_failure; #endif /* CONFIG_BATMAN_ADV_MCAST */ #ifdef CONFIG_BATMAN_ADV_NC @@ -592,6 +597,12 @@ static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info) atomic_set(&bat_priv->multicast_mode, !nla_get_u8(attr)); } + + if (info->attrs[BATADV_ATTR_MULTICAST_FANOUT]) { + attr = info->attrs[BATADV_ATTR_MULTICAST_FANOUT]; + + atomic_set(&bat_priv->multicast_fanout, nla_get_u32(attr)); + } #endif /* CONFIG_BATMAN_ADV_MCAST */ #ifdef CONFIG_BATMAN_ADV_NC diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 2e367230..db8ac4df 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -209,7 +209,7 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, unsigned short vid; u32 seqno; int gw_mode; - enum batadv_forw_mode forw_mode; + enum batadv_forw_mode forw_mode = BATADV_FORW_SINGLE; struct batadv_orig_node *mcast_single_orig = NULL; int network_offset = ETH_HLEN; __be16 proto; @@ -317,7 +317,8 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, if (forw_mode == BATADV_FORW_NONE) goto dropped; - if (forw_mode == BATADV_FORW_SINGLE) + if (forw_mode == BATADV_FORW_SINGLE || + forw_mode == BATADV_FORW_SOME) do_bcast = false; } } @@ -377,6 +378,8 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, ret = batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST, 0, mcast_single_orig, vid); + } else if (forw_mode == BATADV_FORW_SOME) { + ret = batadv_mcast_forw_send(bat_priv, skb, vid); } else { if (batadv_dat_snoop_outgoing_arp_request(bat_priv, skb)) @@ -818,6 +821,7 @@ static int batadv_softif_init_late(struct net_device *dev) bat_priv->mcast.querier_ipv6.shadowing = false; bat_priv->mcast.flags = BATADV_NO_FLAGS; atomic_set(&bat_priv->multicast_mode, 1); + atomic_set(&bat_priv->multicast_fanout, 16); atomic_set(&bat_priv->mcast.num_want_all_unsnoopables, 0); atomic_set(&bat_priv->mcast.num_want_all_ipv4, 0); atomic_set(&bat_priv->mcast.num_want_all_ipv6, 0); diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 0b4b3fb7..1cddf909 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -736,6 +736,8 @@ static BATADV_ATTR(gw_bandwidth, 0644, batadv_show_gw_bwidth, batadv_store_gw_bwidth); #ifdef CONFIG_BATMAN_ADV_MCAST BATADV_ATTR_SIF_BOOL(multicast_mode, 0644, NULL); +BATADV_ATTR_SIF_UINT(multicast_fanout, multicast_fanout, 0644, 1, INT_MAX, + NULL); #endif #ifdef CONFIG_BATMAN_ADV_DEBUG BATADV_ATTR_SIF_UINT(log_level, log_level, 0644, 0, BATADV_DBG_ALL, NULL); @@ -757,6 +759,7 @@ static struct batadv_attribute *batadv_mesh_attrs[] = { #endif #ifdef CONFIG_BATMAN_ADV_MCAST &batadv_attr_multicast_mode, + &batadv_attr_multicast_fanout, #endif &batadv_attr_fragmentation, &batadv_attr_routing_algo, diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index f73d7913..8f83554b 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -61,6 +61,7 @@ #include "log.h" #include "netlink.h" #include "originator.h" +#include "send.h" #include "soft-interface.h" #include "tvlv.h" @@ -205,7 +206,7 @@ batadv_tt_local_hash_find(struct batadv_priv *bat_priv, const u8 *addr, * Return: a pointer to the corresponding tt_global_entry struct if the client * is found, NULL otherwise. */ -static struct batadv_tt_global_entry * +struct batadv_tt_global_entry * batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const u8 *addr, unsigned short vid) { @@ -300,8 +301,7 @@ static void batadv_tt_global_entry_release(struct kref *ref) * possibly release it * @tt_global_entry: tt_global_entry to be free'd */ -static void -batadv_tt_global_entry_put(struct batadv_tt_global_entry *tt_global_entry) +void batadv_tt_global_entry_put(struct batadv_tt_global_entry *tt_global_entry) { kref_put(&tt_global_entry->common.refcount, batadv_tt_global_entry_release); diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index 61bca75e..5b41f217 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -41,6 +41,10 @@ int batadv_tt_global_dump(struct sk_buff *msg, struct netlink_callback *cb); void batadv_tt_global_del_orig(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, s32 match_vid, const char *message); +struct batadv_tt_global_entry * +batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const u8 *addr, + unsigned short vid); +void batadv_tt_global_entry_put(struct batadv_tt_global_entry *tt_global_entry); int batadv_tt_global_hash_count(struct batadv_priv *bat_priv, const u8 *addr, unsigned short vid); struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv, diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index a21b34ed..d22cf01e 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1565,6 +1565,12 @@ struct batadv_priv { * node's sender/originating side */ atomic_t multicast_mode; + + /** + * @multicast_fanout: Maximum number of packet copies to generate for a + * multicast-to-unicast conversion + */ + atomic_t multicast_fanout; #endif /** @orig_interval: OGM broadcast interval in milliseconds */ -- 2.11.0

4 years, 1 month

[B.A.T.M.A.N.] [PATCH] batctl: add switch for setting multicast_fanout

by Linus Lüssing

This patch adds an option for the new multicast_fanout setting in batman-adv. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Makefile | 1 + README.rst | 10 +++++ batman_adv.h | 7 ++++ man/batctl.8 | 5 +++ multicast_fanout.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 138 insertions(+) create mode 100644 multicast_fanout.c diff --git a/Makefile b/Makefile index 4d8b709..15bc3ec 100755 --- a/Makefile +++ b/Makefile @@ -69,6 +69,7 @@ $(eval $(call add_command,log,y)) $(eval $(call add_command,loglevel,y)) $(eval $(call add_command,mcast_flags,y)) $(eval $(call add_command,multicast_mode,y)) +$(eval $(call add_command,multicast_fanout,y)) $(eval $(call add_command,nc_nodes,y)) $(eval $(call add_command,neighbors,y)) $(eval $(call add_command,network_coding,y)) diff --git a/README.rst b/README.rst index 4c0f544..a3a61ac 100644 --- a/README.rst +++ b/README.rst @@ -478,6 +478,16 @@ Usage:: batctl multicast_mode|mm [0|1] +batctl multicast_fanout +===================== + +display or modify the multicast fanout setting + +Usage:: + + batctl multicast_fanout|mo [fanout] + + batctl mcast_flags ================== diff --git a/batman_adv.h b/batman_adv.h index 9b12d2a..2f956e6 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -491,6 +491,13 @@ enum batadv_nl_attrs { */ BATADV_ATTR_THROUGHPUT_OVERRIDE, + /** + * @BATADV_ATTR_MULTICAST_FANOUT: defines the maximum number of packet + * copies that may be generated for a multicast-to-unicast conversion. + * Once this limit is exceeded distribution will fall back to broadcast. + */ + BATADV_ATTR_MULTICAST_FANOUT, + /* add attributes above here, update the policy in netlink.c */ /** diff --git a/man/batctl.8 b/man/batctl.8 index ed8e71f..92c0e32 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -105,6 +105,11 @@ disable network coding. If no parameter is given the current multicast mode setting is displayed. Otherwise the parameter is used to enable or disable multicast optimizations (i.e. disabling means always sending own multicast frames via classic flooding). .br +.IP "\fBmulticast_fanout\fP|\fBmo\fP [\fBfanout\fP]" +If no parameter is given the current multicast fanout setting is displayed. Otherwise the parameter is used to set +the multicast fanout. The multicast fanout defines the maximum number of packet copies that may be generated for a +multicast-to-unicast conversion. Once this limit is exceeded distribution will fall back to broadcast. +.br .IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. diff --git a/multicast_fanout.c b/multicast_fanout.c new file mode 100644 index 0000000..b48912b --- /dev/null +++ b/multicast_fanout.c @@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: + * + * Marek Lindner <mareklindner(a)neomailbox.ch> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include <errno.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> + +#include "main.h" +#include "sys.h" + +static struct multicast_fanout_data { + uint32_t multicast_fanout; +} multicast_fanout; + +static int parse_multicast_fanout(struct state *state, int argc, char *argv[]) +{ + struct settings_data *settings = state->cmd->arg; + struct multicast_fanout_data *data = settings->data; + char *endptr; + + if (argc != 2) { + fprintf(stderr, "Error - incorrect number of arguments (expected 1)\n"); + return -EINVAL; + } + + data->multicast_fanout = strtoul(argv[1], &endptr, 0); + if (!endptr || *endptr != '\0') { + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + return -EINVAL; + } + + return 0; +} + +static int print_multicast_fanout(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX + 1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct genlmsghdr *ghdr; + int *result = arg; + + if (!genlmsg_valid_hdr(nlh, 0)) + return NL_OK; + + ghdr = nlmsg_data(nlh); + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + return NL_OK; + } + + if (!attrs[BATADV_ATTR_MULTICAST_FANOUT]) + return NL_OK; + + printf("%u\n", nla_get_u32(attrs[BATADV_ATTR_MULTICAST_FANOUT])); + + *result = 0; + return NL_STOP; +} + +static int get_multicast_fanout(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_GET_MESH, + NULL, print_multicast_fanout); +} + +static int set_attrs_multicast_fanout(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + struct settings_data *settings = state->cmd->arg; + struct multicast_fanout_data *data = settings->data; + + nla_put_u32(msg, BATADV_ATTR_MULTICAST_FANOUT, data->multicast_fanout); + + return 0; +} + +static int set_multicast_fanout(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_SET_MESH, + set_attrs_multicast_fanout, NULL); +} + +static struct settings_data batctl_settings_multicast_fanout = { + .sysfs_name = "multicast_fanout", + .data = &multicast_fanout, + .parse = parse_multicast_fanout, + .netlink_get = get_multicast_fanout, + .netlink_set = set_multicast_fanout, +}; + +COMMAND_NAMED(SUBCOMMAND, multicast_fanout, "mo", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_settings_multicast_fanout, + "[fanout] \tdisplay or modify multicast_fanout setting"); -- 2.11.0

4 years, 1 month

[B.A.T.M.A.N.] [PATCH 00/21] pull request for net-next: batman-adv 2019-02-13

by Simon Wunderlich

Hi David, here is another pull request for batman-adv to go into net-next. The main patchset is Svens netlink restructure series, which was also discussed on netdev for quite some time now and should be ready to be integrated. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 7a79d717e0817610932ce3b7b6033ea06ee1d577: batman-adv: Update copyright years for 2019 (2019-01-04 11:04:24 +0100) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20190213 for you to fetch changes up to 7e6f461efe2554e35b740f3faea2994fc9551947: batman-adv: Trigger genl notification on sysfs config change (2019-02-09 14:28:15 +0100) ---------------------------------------------------------------- This feature/cleanup patchset includes the following patches: - fix memory leak in in batadv_dat_put_dhcp, by Martin Weinelt - fix typo, by Sven Eckelmann - netlink restructuring patch series (part 2), by Sven Eckelmann (19 patches) ---------------------------------------------------------------- Martin Weinelt (1): batman-adv: fix memory leak in in batadv_dat_put_dhcp Sven Eckelmann (20): batman-adv: Fix typo "reseved" -> "reserved" batman-adv: Move common genl doit code pre/post hooks batman-adv: Prepare framework for mesh genl config batman-adv: Prepare framework for hardif genl config batman-adv: Prepare framework for vlan genl config batman-adv: Add aggregated_ogms mesh genl configuration batman-adv: Add ap_isolation mesh/vlan genl configuration batman-adv: Add bonding mesh genl configuration batman-adv: Add bridge_loop_avoidance mesh genl configuration batman-adv: Add distributed_arp_table mesh genl configuration batman-adv: Add fragmentation mesh genl configuration batman-adv: Add gateway mesh genl configuration batman-adv: Add hop_penalty mesh genl configuration batman-adv: Add log_level mesh genl configuration batman-adv: Add multicast forceflood mesh genl configuration batman-adv: Add network_coding mesh genl configuration batman-adv: Add orig_interval mesh genl configuration batman-adv: Add elp_interval hardif genl configuration batman-adv: Add throughput_override hardif genl configuration batman-adv: Trigger genl notification on sysfs config change include/uapi/linux/batadv_packet.h | 2 +- include/uapi/linux/batman_adv.h | 190 +++++- net/batman-adv/distributed-arp-table.c | 2 + net/batman-adv/gateway_client.c | 1 - net/batman-adv/gateway_common.c | 1 + net/batman-adv/gateway_common.h | 6 - net/batman-adv/netlink.c | 1080 ++++++++++++++++++++++++++++---- net/batman-adv/netlink.h | 6 + net/batman-adv/soft-interface.c | 2 +- net/batman-adv/sysfs.c | 64 +- 10 files changed, 1206 insertions(+), 148 deletions(-)

4 years, 1 month

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N February 2019