B.A.T.M.A.N

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

15 participants
4308 discussions

Removing a node causing mesh to stop
by Lucas Pickstone 12 Apr '19

12 Apr '19

Hi, We have problem where our mesh is failing after a node is removed from it. We have a test set up of 3 computers (A, B and C) that can all directly see each other in an ad hoc wireless network. When we remove a node, the mesh between the remaining two nodes continues to work for a time (batman pings get through), but "batctl o" shows nothing recently last-seen. Once it times out after 200 seconds, the mesh dies (no further pings via batman get through). If we bring the disconnected node back up, everything goes back to normal. Has anyone else seen this problem or had any experience with something similar? We're a little bit stuck on how to diagnose/debug what is happening. We thought that maybe the underlying ad hoc network was causing issues, but it seems okay - we can assign IP addresses on the wlan interfaces and ping without interruption through the entire test. Here is a link to a video showing the behaviour from node C, some time after node A was removed. Both node B and C should still be connected. https://www.youtube.com/watch?v=Hj_0OFvgTt0 - The terminal at the top shows the batman ping to node B (from node C). - The middle terminal shows the standard ping via the adhoc network wlan interface to node B (from node C). - The lower window shows the B.A.T.M.A.N. originators table (as seen by node C). Environment (identical on all computers): - WiFi Card : SparkLAN WPEQ-160ACN(BT) - WiFi driver: nl80211 - batman-adv: 2019.1 - batctl: 2019.1 - Linux Kernel: 4.4.0-130 Ubuntu 16.04 LTS Any thoughts would be greatly appreciated. Thanks, Lucas Pickstone

2 1

[B.A.T.M.A.N.] [PATCH v4 0/2] batman-adv: increase DAT DHT timeout
by Linus Lüssing 08 Apr '19

08 Apr '19

Hi, This is the fourth attempt to increase the DAT DHT timeout to reduce the amount of broadcasted ARP Replies. To increase the timeout only for DAT DHT entries added via DHT-PUT but not for any other entry in the DAT cache the DAT cache and DAT DHT concepts are first split into two separate hash tables (PATCH 1/2). PATCH 2/2 then increases the timeout for DAT DHT entries from 5 to 30 minutes. The motivation for this patchset is based on the observations made here: https://www.open-mesh.org/projects/batman-adv/wiki/DAT_DHCP_Snooping Regards, Linus --- Changelog v2: formerly: "batman-adv: Increase DHCP snooped DAT entry purge timeout in DHT" (https://patchwork.open-mesh.org/patch/17364/) - removed the extended timeouts flag in the DHT-PUT messages introduced in v1 again - removed DHCP dependency Changelog v3: formerly: "batman-adv: Increase purge timeout on DAT DHT candidates" https://patchwork.open-mesh.org/patch/17728/ - fixed the potential jiffies overflow and jiffies initialization issues by replacing the last_dht_update timeout variable with a split of DAT cache and DAT DHT into two separate hash tables -> instead of maintaining two timeouts in one DAT entry two DAT entries are created and maintained in their respective DAT cache and DAT DHT hash tables Changelog v4: - rebased to: acfc9a214d01695 ("batman-adv: genetlink: make policy common to family")

2 3

[B.A.T.M.A.N.] About making batman-adv mesh network invisible (by encrypting Beacon frame)
by Xuebing Wang 08 Apr '19

08 Apr '19

Hi community, We have batman-adv + OpenWRT + ath9k chip + ath9k driver reliably running for about 2 years. The biggest batman-adv mesh network is with 100+ nodes. As this is a closed network, we have a new requirement which is to make our batman-adv mesh network invisible, although the current SSID is just some meaningless characters. One thought is hidden_ssid. But, it seems hidden_ssid is only supported for AP mode (not IBSS mode). 802.11w does not protect Beacon frame (because it is before four-ways handshake). As this is a closed network, what about encrypting Beacon (maybe all management frames later) using a hard-coded key in wpa_supplicant? Thanks for your help. Xuebing Wang

2 3

[B.A.T.M.A.N.] [PATCH] batman-adv: Increase purge timeout on DAT DHT candidates
by Linus Lüssing 07 Apr '19

07 Apr '19

Currently, the DHT_GET messages of the DAT will likely be left unanswered due to the following issues: When a node has a matching DAT Cache entry for a local ARP Request then this node will answer it directly with the information provided by the cache. This however, will likely lead to missing ARP Replies from the original host. Which in turn leads to the DAT cache not being updated. Then the local DAT cache entry will time out, triggering a unicasted DHT_GET. However, as the 5min. timeout has passed, the DAT DHT candidates will likely have purged their entry, too. So basically this results in an ARP Request broadcast fallback every five minutes. A second issue is that it is quite common that a host which has long gone offline will be tried to be contacted by another one at some remote period larger than the current 5min. timeout. This too leads to flooded ARP Requests. With this patch the purge timeout for local DAT cache entries and entries submitted via a DHT_PUT message is differentiated: While the former stays at 5min. the latter is increased to 30min. Which decreases the rate of broadcasted ARP Requests. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Some old investigations and analysis seemed to indicate a potential reduction of 91.71% of unanswered ARP Requests (45min: 97.95%, 60min: 98.95%): https://www.open-mesh.org/projects/batman-adv/wiki/DAT_DHCP_Snooping This patch is rebased on top of: "batman-adv: DHCP snooping for DAT" And it is a follow-up of: "batman-adv: Increase DHCP snooped DAT entry purge timeout in DHT" - https://patchwork.open-mesh.org/patch/17364/ --- net/batman-adv/distributed-arp-table.c | 39 ++++++++++++++++++++++------------ net/batman-adv/distributed-arp-table.h | 3 ++- net/batman-adv/main.h | 2 ++ net/batman-adv/routing.c | 8 ++++--- net/batman-adv/types.h | 5 +++++ 5 files changed, 39 insertions(+), 18 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 899ab051..34898abf 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -152,7 +152,9 @@ static void batadv_dat_entry_put(struct batadv_dat_entry *dat_entry) static bool batadv_dat_to_purge(struct batadv_dat_entry *dat_entry) { return batadv_has_timed_out(dat_entry->last_update, - BATADV_DAT_ENTRY_TIMEOUT); + BATADV_DAT_ENTRY_TIMEOUT) && + batadv_has_timed_out(dat_entry->last_dht_update, + BATADV_DAT_DHT_TIMEOUT); } /** @@ -369,9 +371,11 @@ batadv_dat_entry_hash_find(struct batadv_priv *bat_priv, __be32 ip, * @ip: ipv4 to add/edit * @mac_addr: mac address to assign to the given ipv4 * @vid: VLAN identifier + * @extended_timeout: whether this should be cached with an extended timeout */ -static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, - u8 *mac_addr, unsigned short vid) +static void +batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, u8 *mac_addr, + unsigned short vid, bool extended_timeout) { struct batadv_dat_entry *dat_entry; int hash_added; @@ -382,6 +386,10 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, if (!batadv_compare_eth(dat_entry->mac_addr, mac_addr)) ether_addr_copy(dat_entry->mac_addr, mac_addr); dat_entry->last_update = jiffies; + + if (extended_timeout) + dat_entry->last_dht_update = jiffies; + batadv_dbg(BATADV_DBG_DAT, bat_priv, "Entry updated: %pI4 %pM (vid: %d)\n", &dat_entry->ip, dat_entry->mac_addr, @@ -397,6 +405,7 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, dat_entry->vid = vid; ether_addr_copy(dat_entry->mac_addr, mac_addr); dat_entry->last_update = jiffies; + dat_entry->last_dht_update = extended_timeout ? jiffies : 0; kref_init(&dat_entry->refcount); kref_get(&dat_entry->refcount); @@ -1229,7 +1238,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, hw_src = batadv_arp_hw_src(skb, hdr_size); ip_dst = batadv_arp_ip_dst(skb, hdr_size); - batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid); + batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid, false); dat_entry = batadv_dat_entry_hash_find(bat_priv, ip_dst, vid); if (dat_entry) { @@ -1322,7 +1331,7 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, batadv_dbg_arp(bat_priv, skb, hdr_size, "Parsing incoming ARP REQUEST"); - batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid); + batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid, false); dat_entry = batadv_dat_entry_hash_find(bat_priv, ip_dst, vid); if (!dat_entry) @@ -1386,8 +1395,8 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv, hw_dst = batadv_arp_hw_dst(skb, hdr_size); ip_dst = batadv_arp_ip_dst(skb, hdr_size); - batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid); - batadv_dat_entry_add(bat_priv, ip_dst, hw_dst, vid); + batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid, false); + batadv_dat_entry_add(bat_priv, ip_dst, hw_dst, vid, false); /* Send the ARP reply to the candidates for both the IP addresses that * the node obtained from the ARP reply @@ -1402,12 +1411,14 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv, * @bat_priv: the bat priv with all the soft interface information * @skb: packet to check * @hdr_size: size of the encapsulation header + * @is_dht_put: whether this is a BATADV_P_DAT_DHT_PUT message * * Return: true if the packet was snooped and consumed by DAT. False if the * packet has to be delivered to the interface */ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, - struct sk_buff *skb, int hdr_size) + struct sk_buff *skb, int hdr_size, + bool is_dht_put) { struct batadv_dat_entry *dat_entry = NULL; u16 type; @@ -1450,8 +1461,8 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, /* Update our internal cache with both the IP addresses the node got * within the ARP reply */ - batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid); - batadv_dat_entry_add(bat_priv, ip_dst, hw_dst, vid); + batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid, is_dht_put); + batadv_dat_entry_add(bat_priv, ip_dst, hw_dst, vid, is_dht_put); /* If BLA is enabled, only forward ARP replies if we have claimed the * source of the ARP reply or if no one else of the same backbone has @@ -1705,8 +1716,8 @@ static void batadv_dat_put_dhcp(struct batadv_priv *bat_priv, u8 *chaddr, skb_set_network_header(skb, ETH_HLEN); - batadv_dat_entry_add(bat_priv, yiaddr, chaddr, vid); - batadv_dat_entry_add(bat_priv, ip_dst, hw_dst, vid); + batadv_dat_entry_add(bat_priv, yiaddr, chaddr, vid, false); + batadv_dat_entry_add(bat_priv, ip_dst, hw_dst, vid, false); batadv_dat_send_data(bat_priv, skb, yiaddr, vid, BATADV_P_DAT_DHT_PUT); batadv_dat_send_data(bat_priv, skb, ip_dst, vid, BATADV_P_DAT_DHT_PUT); @@ -1827,8 +1838,8 @@ void batadv_dat_snoop_incoming_dhcp_ack(struct batadv_priv *bat_priv, hw_src = ethhdr->h_source; vid = batadv_dat_get_vid(skb, &hdr_size); - batadv_dat_entry_add(bat_priv, yiaddr, chaddr, vid); - batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid); + batadv_dat_entry_add(bat_priv, yiaddr, chaddr, vid, false); + batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid, false); batadv_dbg(BATADV_DBG_DAT, bat_priv, "Snooped from incoming DHCPACK (server address): %pI4, %pM (vid: %i)\n", diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h index 68c0ff32..21dbf285 100644 --- a/net/batman-adv/distributed-arp-table.h +++ b/net/batman-adv/distributed-arp-table.h @@ -45,7 +45,8 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv, struct sk_buff *skb); bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, - struct sk_buff *skb, int hdr_size); + struct sk_buff *skb, int hdr_size, + bool is_dht_put); void batadv_dat_snoop_outgoing_dhcp_ack(struct batadv_priv *bat_priv, struct sk_buff *skb, __be16 proto, diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 05cb9080..6c1488f8 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -51,6 +51,8 @@ #define BATADV_ORIG_WORK_PERIOD 1000 /* 1 second */ #define BATADV_MCAST_WORK_PERIOD 500 /* 0.5 seconds */ #define BATADV_DAT_ENTRY_TIMEOUT (5 * 60000) /* 5 mins in milliseconds */ +#define BATADV_DAT_DHT_TIMEOUT (30 * 60000) /* 30 mins in milliseconds */ + /* sliding packet range of received originator messages in sequence numbers * (should be a multiple of our word size) */ diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index cae0e5dd..2b5d50ab 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -974,7 +974,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, int check, hdr_size = sizeof(*unicast_packet); enum batadv_subtype subtype; int ret = NET_RX_DROP; - bool is4addr, is_gw; + bool is4addr, is_gw, is_dht_put = false; unicast_packet = (struct batadv_unicast_packet *)skb->data; is4addr = unicast_packet->packet_type == BATADV_UNICAST_4ADDR; @@ -1033,6 +1033,8 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, orig_addr = unicast_4addr_packet->src; orig_node = batadv_orig_hash_find(bat_priv, orig_addr); + } else if (subtype == BATADV_P_DAT_DHT_PUT) { + is_dht_put = true; } } @@ -1040,7 +1042,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, hdr_size)) goto rx_success; if (batadv_dat_snoop_incoming_arp_reply(bat_priv, skb, - hdr_size)) + hdr_size, is_dht_put)) goto rx_success; batadv_dat_snoop_incoming_dhcp_ack(bat_priv, skb, hdr_size); @@ -1277,7 +1279,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, if (batadv_dat_snoop_incoming_arp_request(bat_priv, skb, hdr_size)) goto rx_success; - if (batadv_dat_snoop_incoming_arp_reply(bat_priv, skb, hdr_size)) + if (batadv_dat_snoop_incoming_arp_reply(bat_priv, skb, hdr_size, false)) goto rx_success; batadv_dat_snoop_incoming_dhcp_ack(bat_priv, skb, hdr_size); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index a21b34ed..74801d79 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -2280,6 +2280,11 @@ struct batadv_dat_entry { */ unsigned long last_update; + /** + * @last_dht_update: time in jiffies when a DHT_PUT was last received + */ + unsigned long last_dht_update; + /** @hash_entry: hlist node for &batadv_priv_dat.hash */ struct hlist_node hash_entry; -- 2.11.0

4 7

[B.A.T.M.A.N.] [PATCH] batctl: add dat_dht command
by Linus Lüssing 07 Apr '19

07 Apr '19

This adds a dat_dht command to query the DHT part of DAT in batman-adv. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Makefile | 1 + README.rst | 27 +++++++++- batadv_packet.h | 4 +- batman_adv.h | 5 ++ dat_cache.c | 2 +- dat_dht.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++ debug.h | 1 + man/batctl.8 | 3 ++ 8 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 dat_dht.c diff --git a/Makefile b/Makefile index df8b7b9..94f3321 100755 --- a/Makefile +++ b/Makefile @@ -44,6 +44,7 @@ $(eval $(call add_command,bonding,y)) $(eval $(call add_command,bridge_loop_avoidance,y)) $(eval $(call add_command,claimtable,y)) $(eval $(call add_command,dat_cache,y)) +$(eval $(call add_command,dat_dht,y)) $(eval $(call add_command,distributed_arp_table,y)) $(eval $(call add_command,event,y)) $(eval $(call add_command,fragmentation,y)) diff --git a/README.rst b/README.rst index 03ea5e5..97ca394 100644 --- a/README.rst +++ b/README.rst @@ -652,7 +652,32 @@ Usage:: Example:: - Distributed ARP Table (bat0): + Distributed ARP Table Cache (bat0): + IPv4 MAC last-seen + * 172.100.0.1 b6:9b:d0:ea:b1:13 0:00 + +where + +IPv4: + is the IP address of a client in the mesh network +MAC: + is the MAC address associated to that IP +last-seen: + is the amount of time since last refresh of this entry + + +batctl dat_dht +================= + +display the local D.A.T. DHT + +Usage:: + + batctl dat_dht|dd + +Example:: + + Distributed ARP Table DHT (bat0): IPv4 MAC last-seen * 172.100.0.1 b6:9b:d0:ea:b1:13 0:00 diff --git a/batadv_packet.h b/batadv_packet.h index 4ebc213..fb42e3d 100644 --- a/batadv_packet.h +++ b/batadv_packet.h @@ -58,13 +58,15 @@ enum batadv_packettype { * @BATADV_P_DATA: user payload * @BATADV_P_DAT_DHT_GET: DHT request message * @BATADV_P_DAT_DHT_PUT: DHT store message - * @BATADV_P_DAT_CACHE_REPLY: ARP reply generated by DAT + * @BATADV_P_DAT_CACHE_REPLY: deprecated: use BATADV_P_DAT_DHT_REPLY instead + * @BATADV_P_DAT_DHT_REPLY: ARP reply generated by DAT */ enum batadv_subtype { BATADV_P_DATA = 0x01, BATADV_P_DAT_DHT_GET = 0x02, BATADV_P_DAT_DHT_PUT = 0x03, BATADV_P_DAT_CACHE_REPLY = 0x04, + BATADV_P_DAT_DHT_REPLY = 0x04, }; /* this file is included by batctl which needs these defines */ diff --git a/batman_adv.h b/batman_adv.h index 67f4636..e4bcc23 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -612,6 +612,11 @@ enum batadv_nl_commands { */ BATADV_CMD_SET_VLAN, + /** + * @BATADV_CMD_GET_DAT_DHT: Query list of DAT DHT entries + */ + BATADV_CMD_GET_DAT_DHT, + /* add new commands above here */ /** diff --git a/dat_cache.c b/dat_cache.c index 4a8a082..5c947c0 100644 --- a/dat_cache.c +++ b/dat_cache.c @@ -106,7 +106,7 @@ static int netlink_print_dat_cache(struct state *state, char *orig_iface, char *header; int ret; - ret = asprintf(&header, "Distributed ARP Table (%s):\n%s\n", + ret = asprintf(&header, "Distributed ARP Table Cache (%s):\n%s\n", state->mesh_iface, " IPv4 MAC VID last-seen"); diff --git a/dat_dht.c b/dat_dht.c new file mode 100644 index 0000000..8c7897c --- /dev/null +++ b/dat_dht.c @@ -0,0 +1,133 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: + * + * Marek Lindner <mareklindner(a)neomailbox.ch> + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include <arpa/inet.h> +#include <netinet/if_ether.h> +#include <netinet/in.h> +#include <netlink/netlink.h> +#include <netlink/genl/genl.h> +#include <netlink/genl/ctrl.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <sys/socket.h> + +#include "batadv_packet.h" +#include "batman_adv.h" +#include "bat-hosts.h" +#include "debug.h" +#include "functions.h" +#include "main.h" +#include "netlink.h" + +static const int dat_dht_mandatory[] = { + BATADV_ATTR_DAT_CACHE_IP4ADDRESS, + BATADV_ATTR_DAT_CACHE_HWADDRESS, + BATADV_ATTR_DAT_CACHE_VID, + BATADV_ATTR_LAST_SEEN_MSECS, +}; + +static int dat_dht_callback(struct nl_msg *msg, void *arg) +{ + int last_seen_msecs, last_seen_secs, last_seen_mins; + struct nlattr *attrs[BATADV_ATTR_MAX+1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct print_opts *opts = arg; + struct bat_host *bat_host; + struct genlmsghdr *ghdr; + struct in_addr in_addr; + uint8_t *hwaddr; + int16_t vid; + char *addr; + + if (!genlmsg_valid_hdr(nlh, 0)) { + fputs("Received invalid data from kernel.\n", stderr); + exit(1); + } + + ghdr = nlmsg_data(nlh); + + if (ghdr->cmd != BATADV_CMD_GET_DAT_DHT) + return NL_OK; + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + fputs("Received invalid data from kernel.\n", stderr); + exit(1); + } + + if (missing_mandatory_attrs(attrs, dat_dht_mandatory, + ARRAY_SIZE(dat_dht_mandatory))) { + fputs("Missing attributes from kernel\n", stderr); + exit(1); + } + + in_addr.s_addr = nla_get_u32(attrs[BATADV_ATTR_DAT_CACHE_IP4ADDRESS]); + addr = inet_ntoa(in_addr); + hwaddr = nla_data(attrs[BATADV_ATTR_DAT_CACHE_HWADDRESS]); + vid = nla_get_u16(attrs[BATADV_ATTR_DAT_CACHE_VID]); + + last_seen_msecs = nla_get_u32(attrs[BATADV_ATTR_LAST_SEEN_MSECS]); + last_seen_mins = last_seen_msecs / 60000; + last_seen_msecs = last_seen_msecs % 60000; + last_seen_secs = last_seen_msecs / 1000; + + if (opts->read_opt & MULTICAST_ONLY && !(addr[0] & 0x01)) + return NL_OK; + + if (opts->read_opt & UNICAST_ONLY && (addr[0] & 0x01)) + return NL_OK; + + printf(" * %15s ", addr); + + bat_host = bat_hosts_find_by_mac((char *)hwaddr); + if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) + printf("%02x:%02x:%02x:%02x:%02x:%02x ", + hwaddr[0], hwaddr[1], hwaddr[2], + hwaddr[3], hwaddr[4], hwaddr[5]); + else + printf("%17s ", bat_host->name); + + printf("%4i %6i:%02i\n", + BATADV_PRINT_VID(vid), last_seen_mins, last_seen_secs); + + return NL_OK; +} + +static int netlink_print_dat_dht(struct state *state, char *orig_iface, + int read_opts, float orig_timeout, + float watch_interval) +{ + char *header; + int ret; + + ret = asprintf(&header, "Distributed ARP Table DHT (%s):\n%s\n", + state->mesh_iface, + " IPv4 MAC VID last-seen"); + + if (ret < 0) + return ret; + + ret = netlink_print_common(state, orig_iface, read_opts, + orig_timeout, watch_interval, header, + BATADV_CMD_GET_DAT_DHT, + dat_dht_callback); + + free(header); + return ret; +} + +static struct debug_table_data batctl_debug_table_dat_dht = { + .debugfs_name = DEBUG_DAT_DHT, + .header_lines = 2, + .netlink_fn = netlink_print_dat_dht, +}; + +COMMAND_NAMED(DEBUGTABLE, dat_dht, "dd", handle_debug_table, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_debug_table_dat_dht, ""); diff --git a/debug.h b/debug.h index 3294361..e6353ab 100644 --- a/debug.h +++ b/debug.h @@ -17,6 +17,7 @@ #define DEBUG_BACKBONETABLE "bla_backbone_table" #define DEBUG_CLAIMTABLE "bla_claim_table" #define DEBUG_DAT_CACHE "dat_cache" +#define DEBUG_DAT_DHT "dat_dht" #define DEBUG_NC_NODES "nc_nodes" #define DEBUG_MCAST_FLAGS "mcast_flags" #define DEBUG_LOG "log" diff --git a/man/batctl.8 b/man/batctl.8 index 8d7332a..fb1dd02 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -276,6 +276,9 @@ List of debug tables: \- dat_cache|dc (compile time option) .RE .RS 10 +\- dat_dht|dd (compile time option) +.RE +.RS 10 \- nc_nodes|nn (compile time option) .RE .RS 10 -- 2.20.1

1 0

[B.A.T.M.A.N.] [PATCH v3 0/2] batman-adv: increase DAT DHT timeout
by Linus Lüssing 07 Apr '19

07 Apr '19

Hi, This is the third attempt to increase the DAT DHT timeout to reduce the amount of broadcasted ARP Replies. To increase the timeout only for DAT DHT entries added via DHT-PUT but not for any other entry in the DAT cache the DAT cache and DAT DHT concepts are first split into two separate hash tables (PATCH 1/2). PATCH 2/2 then increases the timeout for DAT DHT entries from 5 to 30 minutes. The motivation for this patchset is based on the observations made here: https://www.open-mesh.org/projects/batman-adv/wiki/DAT_DHCP_Snooping Regards, Linus --- Changelog v2: formerly: "batman-adv: Increase DHCP snooped DAT entry purge timeout in DHT" (https://patchwork.open-mesh.org/patch/17364/) - removed the extended timeouts flag in the DHT-PUT messages introduced in v1 again - removed DHCP dependency Changelog v3: formerly: "batman-adv: Increase purge timeout on DAT DHT candidates" https://patchwork.open-mesh.org/patch/17728/ - fixed the potential jiffies overflow and jiffies initialization issues by replacing the last_dht_update timeout variable with a split of DAT cache and DAT DHT into two separate hash tables -> instead of maintaining two timeouts in one DAT entry two DAT entries are created and maintained in their respective DAT cache and DAT DHT hash tables

2 3

[B.A.T.M.A.N.] [PATCH 0/3] batctl: Add netlink support for sysfs-only functionality
by Sven Eckelmann 03 Apr '19

03 Apr '19

Hi, some functionality in batctl was previously using sysfs to implement some of its features. Since the sysfs support can now be disabled in the kernel, these features were broken in such setups. This was especially problematic for functionality which depends on the main mesh interface. The check to make sure that this is interface is a valid batadv interface were exclusively using sysfs. Switching them to (or actually extending them to support) netlink should fix this. The old sysfs functionality is still here but can be removed in the future. Kind regards, Sven Sven Eckelmann (3): batctl: Support checking of meshif without sysfs batctl: Reimplement VLAN translation using helper batctl: Add netlink fallback for sysfs' iface_status debug.c | 2 +- functions.c | 407 ++++++++++++++++++++++++++++++---------------------- functions.h | 2 +- interface.c | 92 +++++++++++- 4 files changed, 331 insertions(+), 172 deletions(-) -- 2.20.1

1 3

[B.A.T.M.A.N.] [PATCH] batman-adv: genetlink: make policy common to family
by Sven Eckelmann 30 Mar '19

30 Mar '19

From: Johannes Berg <johannes.berg(a)intel.com> Since maxattr is common, the policy can't really differ sanely, so make it common as well. The only user that did in fact manage to make a non-common policy is taskstats, which has to be really careful about it (since it's still using a common maxattr!). This is no longer supported, but we can fake it using pre_doit. This reduces the size of e.g. nl80211.o (which has lots of commands): text data bss dec hex filename 398745 14323 2240 415308 6564c net/wireless/nl80211.o (before) 397913 14331 2240 414484 65314 net/wireless/nl80211.o (after) -------------------------------- -832 +8 0 -824 Which is obviously just 8 bytes for each command, and an added 8 bytes for the new policy pointer. I'm not sure why the ops list is counted as .text though. Most of the code transformations were done using the following spatch: @ops@ identifier OPS; expression POLICY; @@ struct genl_ops OPS[] = { ..., { - .policy = POLICY, }, ... }; @@ identifier ops.OPS; expression ops.POLICY; identifier fam; expression M; @@ struct genl_family fam = { .ops = OPS, .maxattr = M, + .policy = POLICY, ... }; This also gets rid of devlink_nl_cmd_region_read_dumpit() accessing the cb->data as ops, which we want to change in a later genl patch. Signed-off-by: Johannes Berg <johannes.berg(a)intel.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> [sven(a)narfation.org: Added compat code] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Patch (without compat code) is already in net-next: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git/commit/?… compat-include/linux/cache.h | 6 +-- compat-include/net/genetlink.h | 88 ++++++++++++++++++++++++++++++++++ net/batman-adv/netlink.c | 19 +------- 3 files changed, 90 insertions(+), 23 deletions(-) diff --git a/compat-include/linux/cache.h b/compat-include/linux/cache.h index efe440d1..9ddda312 100644 --- a/compat-include/linux/cache.h +++ b/compat-include/linux/cache.h @@ -13,12 +13,8 @@ #include <linux/version.h> #include_next <linux/cache.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -/* hack for netlink.c which marked the family ops as ro */ -#ifdef __ro_after_init -#undef __ro_after_init -#endif #define __ro_after_init #endif /* < KERNEL_VERSION(4, 6, 0) */ diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h index 58fc24d7..7d17a705 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h @@ -30,4 +30,92 @@ void batadv_genl_dump_check_consistent(struct netlink_callback *cb, #endif /* < KERNEL_VERSION(4, 15, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) + +struct batadv_genl_family { + /* data handled by the actual kernel */ + struct genl_family family; + + /* data which has to be copied to family by + * batadv_genl_register_family + */ + unsigned int hdrsize; + char name[GENL_NAMSIZ]; + unsigned int version; + unsigned int maxattr; + const struct nla_policy *policy; + bool netnsok; + int (*pre_doit)(const struct genl_ops *ops, struct sk_buff *skb, + struct genl_info *info); + void (*post_doit)(const struct genl_ops *ops, struct sk_buff *skb, + struct genl_info *info); + const struct genl_ops *ops; + const struct genl_multicast_group *mcgrps; + unsigned int n_ops; + unsigned int n_mcgrps; + struct module *module; + + /* allocated by batadv_genl_register_family and free'd by + * batadv_genl_unregister_family. Used to modify the usually read-only + * ops + */ + struct genl_ops *copy_ops; +}; + +#define genl_family batadv_genl_family + +static inline int batadv_genl_register_family(struct batadv_genl_family *family) +{ + struct genl_ops *ops; + unsigned int i; + + family->family.hdrsize = family->hdrsize; + strncpy(family->family.name, family->name, sizeof(family->family.name)); + family->family.version = family->version; + family->family.maxattr = family->maxattr; + family->family.netnsok = family->netnsok; + family->family.pre_doit = family->pre_doit; + family->family.post_doit = family->post_doit; + family->family.mcgrps = family->mcgrps; + family->family.n_ops = family->n_ops; + family->family.n_mcgrps = family->n_mcgrps; + family->family.module = family->module; + + ops = kmemdup(family->ops, sizeof(*ops) * family->n_ops, GFP_KERNEL); + if (!ops) + return -ENOMEM; + + for (i = 0; i < family->family.n_ops; i++) + ops[i].policy = family->policy; + + family->family.ops = ops; + family->copy_ops = ops; + + return genl_register_family(&family->family); +} + +#define genl_register_family(family) \ + batadv_genl_register_family((family)) + +static inline void +batadv_genl_unregister_family(struct batadv_genl_family *family) +{ + + genl_unregister_family(&family->family); + kfree(family->copy_ops); +} + +#define genl_unregister_family(family) \ + batadv_genl_unregister_family((family)) + +#define genlmsg_put(_skb, _pid, _seq, _family, _flags, _cmd) \ + genlmsg_put(_skb, _pid, _seq, &(_family)->family, _flags, _cmd) + +#define genlmsg_multicast_netns(_family, _net, _skb, _portid, _group, _flags) \ + genlmsg_multicast_netns(&(_family)->family, _net, _skb, _portid, \ + _group, _flags) + +#endif /* < KERNEL_VERSION(5, 2, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_NET_GENETLINK_H_ */ diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index daf56933..e7907308 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -1344,34 +1344,29 @@ static const struct genl_ops batadv_netlink_ops[] = { { .cmd = BATADV_CMD_GET_MESH, /* can be retrieved by unprivileged users */ - .policy = batadv_netlink_policy, .doit = batadv_netlink_get_mesh, .internal_flags = BATADV_FLAG_NEED_MESH, }, { .cmd = BATADV_CMD_TP_METER, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .doit = batadv_netlink_tp_meter_start, .internal_flags = BATADV_FLAG_NEED_MESH, }, { .cmd = BATADV_CMD_TP_METER_CANCEL, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .doit = batadv_netlink_tp_meter_cancel, .internal_flags = BATADV_FLAG_NEED_MESH, }, { .cmd = BATADV_CMD_GET_ROUTING_ALGOS, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_algo_dump, }, { .cmd = BATADV_CMD_GET_HARDIF, /* can be retrieved by unprivileged users */ - .policy = batadv_netlink_policy, .dumpit = batadv_netlink_dump_hardif, .doit = batadv_netlink_get_hardif, .internal_flags = BATADV_FLAG_NEED_MESH | @@ -1380,68 +1375,57 @@ static const struct genl_ops batadv_netlink_ops[] = { { .cmd = BATADV_CMD_GET_TRANSTABLE_LOCAL, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_tt_local_dump, }, { .cmd = BATADV_CMD_GET_TRANSTABLE_GLOBAL, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_tt_global_dump, }, { .cmd = BATADV_CMD_GET_ORIGINATORS, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_orig_dump, }, { .cmd = BATADV_CMD_GET_NEIGHBORS, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_hardif_neigh_dump, }, { .cmd = BATADV_CMD_GET_GATEWAYS, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_gw_dump, }, { .cmd = BATADV_CMD_GET_BLA_CLAIM, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_bla_claim_dump, }, { .cmd = BATADV_CMD_GET_BLA_BACKBONE, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_bla_backbone_dump, }, { .cmd = BATADV_CMD_GET_DAT_CACHE, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_dat_cache_dump, }, { .cmd = BATADV_CMD_GET_MCAST_FLAGS, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_mcast_flags_dump, }, { .cmd = BATADV_CMD_SET_MESH, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .doit = batadv_netlink_set_mesh, .internal_flags = BATADV_FLAG_NEED_MESH, }, { .cmd = BATADV_CMD_SET_HARDIF, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .doit = batadv_netlink_set_hardif, .internal_flags = BATADV_FLAG_NEED_MESH | BATADV_FLAG_NEED_HARDIF, @@ -1449,7 +1433,6 @@ static const struct genl_ops batadv_netlink_ops[] = { { .cmd = BATADV_CMD_GET_VLAN, /* can be retrieved by unprivileged users */ - .policy = batadv_netlink_policy, .doit = batadv_netlink_get_vlan, .internal_flags = BATADV_FLAG_NEED_MESH | BATADV_FLAG_NEED_VLAN, @@ -1457,7 +1440,6 @@ static const struct genl_ops batadv_netlink_ops[] = { { .cmd = BATADV_CMD_SET_VLAN, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .doit = batadv_netlink_set_vlan, .internal_flags = BATADV_FLAG_NEED_MESH | BATADV_FLAG_NEED_VLAN, @@ -1469,6 +1451,7 @@ struct genl_family batadv_netlink_family __ro_after_init = { .name = BATADV_NL_NAME, .version = 1, .maxattr = BATADV_ATTR_MAX, + .policy = batadv_netlink_policy, .netnsok = true, .pre_doit = batadv_pre_doit, .post_doit = batadv_post_doit, -- 2.20.1

1 0

Re: [B.A.T.M.A.N.] kernel BUG at drivers/android/binder_alloc.c:LINE! (3)
by syzbot 28 Mar '19

28 Mar '19

syzbot has bisected this bug to: commit 1a7c3d9bb7a926e88d5f57643e75ad1abfc55013 Author: Todd Kjos <tkjos(a)android.com> Date: Fri Feb 8 18:35:14 2019 +0000 binder: create userspace-to-binder-buffer copy function bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=15b9383f200000 start commit: 1a9df9e2 Merge git://git.kernel.org/pub/scm/linux/kernel/g.. git tree: upstream final crash: https://syzkaller.appspot.com/x/report.txt?x=17b9383f200000 console output: https://syzkaller.appspot.com/x/log.txt?x=13b9383f200000 kernel config: https://syzkaller.appspot.com/x/.config?x=8dcdce25ea72bedf dashboard link: https://syzkaller.appspot.com/bug?extid=f9f3f388440283da2965 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=17d05637200000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1677e62f200000 Reported-by: syzbot+f9f3f388440283da2965(a)syzkaller.appspotmail.com Fixes: 1a7c3d9bb7a9 ("binder: create userspace-to-binder-buffer copy function") For information about bisection process see: https://goo.gl/tpsmEJ#bisection

1 0

[B.A.T.M.A.N.] [PATCH 00/12] pull request for net-next: batman-adv 2019-03-28
by Simon Wunderlich 28 Mar '19

28 Mar '19

Hi David, here is our latest cleanup/feature pull request of batman-adv to go into net-next. Please pull or let me know of any problem! Thank you, Simon The following changes since commit ffa91253739ca89fc997195d8bbd1f7ba3e29fbe: Documentation: networking: Update netdev-FAQ regarding patches (2019-03-18 20:09:58 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20190328 for you to fetch changes up to 32e727449c792b689c2a06a8b4cc9fef6270c5a7: batman-adv: Add multicast-to-unicast support for multiple targets (2019-03-25 10:01:13 +0100) ---------------------------------------------------------------- This feature/cleanup patchset includes the following patches: - Drop license boilerplate (obsoleted by SPDX license IDs), by Sven Eckelmann - Drop documentation for sysfs and debugfs Documentation, by Sven Eckelmann (2 patches) - Mark sysfs as optional and deprecated, by Sven Eckelmann (3 patches) - Update MAINTAINERS Tree, Chat and Bugtracker, by Sven Eckelmann (3 patches) - Rename batadv_dat_send_data, by Sven Eckelmann - update DAT entries with incoming ARP replies, by Linus Luessing - add multicast-to-unicast support for limited destinations, by Linus Luessing ---------------------------------------------------------------- Linus Lüssing (2): batman-adv: allow updating DAT entry timeouts on incoming ARP Replies batman-adv: Add multicast-to-unicast support for multiple targets Sven Eckelmann (10): batman-adv: Drop license boilerplate batman-adv: Drop documentation about debugfs files batman-adv: Drop documentation about sysfs files batman-adv: Make sysfs support optional batman-adv: ABI: Mark sysfs files as deprecated batman-adv: Warn about sysfs file access MAINTAINERS: Add B(ugtracker) field for batman-adv MAINTAINERS: Add C(hat) field for batman-adv MAINTAINERS: Add T(ree) field for batman-adv batman-adv: Adjust name for batadv_dat_send_data .../sysfs-class-net-batman-adv | 2 + .../ABI/{testing => obsolete}/sysfs-class-net-mesh | 2 + Documentation/networking/batman-adv.rst | 110 +++-------- MAINTAINERS | 7 +- include/uapi/linux/batadv_packet.h | 12 -- include/uapi/linux/batman_adv.h | 25 +-- net/batman-adv/Kconfig | 24 +-- net/batman-adv/Makefile | 15 +- net/batman-adv/bat_algo.c | 12 -- net/batman-adv/bat_algo.h | 12 -- net/batman-adv/bat_iv_ogm.c | 12 -- net/batman-adv/bat_iv_ogm.h | 12 -- net/batman-adv/bat_v.c | 12 -- net/batman-adv/bat_v.h | 12 -- net/batman-adv/bat_v_elp.c | 12 -- net/batman-adv/bat_v_elp.h | 12 -- net/batman-adv/bat_v_ogm.c | 12 -- net/batman-adv/bat_v_ogm.h | 12 -- net/batman-adv/bitarray.c | 12 -- net/batman-adv/bitarray.h | 12 -- net/batman-adv/bridge_loop_avoidance.c | 13 -- net/batman-adv/bridge_loop_avoidance.h | 12 -- net/batman-adv/debugfs.c | 12 -- net/batman-adv/debugfs.h | 12 -- net/batman-adv/distributed-arp-table.c | 40 ++-- net/batman-adv/distributed-arp-table.h | 12 -- net/batman-adv/fragmentation.c | 12 -- net/batman-adv/fragmentation.h | 12 -- net/batman-adv/gateway_client.c | 13 -- net/batman-adv/gateway_client.h | 12 -- net/batman-adv/gateway_common.c | 12 -- net/batman-adv/gateway_common.h | 12 -- net/batman-adv/hard-interface.c | 12 -- net/batman-adv/hard-interface.h | 12 -- net/batman-adv/hash.c | 12 -- net/batman-adv/hash.h | 12 -- net/batman-adv/icmp_socket.c | 12 -- net/batman-adv/icmp_socket.h | 12 -- net/batman-adv/log.c | 12 -- net/batman-adv/log.h | 12 -- net/batman-adv/main.c | 85 +++++++-- net/batman-adv/main.h | 14 +- net/batman-adv/multicast.c | 211 +++++++++++++++++++-- net/batman-adv/multicast.h | 30 +-- net/batman-adv/netlink.c | 23 ++- net/batman-adv/netlink.h | 12 -- net/batman-adv/network-coding.c | 12 -- net/batman-adv/network-coding.h | 12 -- net/batman-adv/originator.c | 12 -- net/batman-adv/originator.h | 12 -- net/batman-adv/routing.c | 12 -- net/batman-adv/routing.h | 12 -- net/batman-adv/send.c | 12 -- net/batman-adv/send.h | 12 -- net/batman-adv/soft-interface.c | 20 +- net/batman-adv/soft-interface.h | 12 -- net/batman-adv/sysfs.c | 128 +++++-------- net/batman-adv/sysfs.h | 50 +++-- net/batman-adv/tp_meter.c | 12 -- net/batman-adv/tp_meter.h | 12 -- net/batman-adv/trace.c | 12 -- net/batman-adv/trace.h | 12 -- net/batman-adv/translation-table.c | 17 +- net/batman-adv/translation-table.h | 16 +- net/batman-adv/tvlv.c | 12 -- net/batman-adv/tvlv.h | 12 -- net/batman-adv/types.h | 18 +- 67 files changed, 476 insertions(+), 939 deletions(-) rename Documentation/ABI/{testing => obsolete}/sysfs-class-net-batman-adv (92%) rename Documentation/ABI/{testing => obsolete}/sysfs-class-net-mesh (97%)

2 13

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N