batman-adv: increase DAT DHT timeout
v10 cover batman-adv: increase DAT DHT timeout
This patchset increases 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 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
In tests at Freifunk Lübeck with ~180 mesh nodes and Gluon this reduced the ARP broadcast overhead, measured over 7 days, as follows:
- Total: 6677.66 bits/s -> 677.26 bits/s => -89.86%
11.92 pkts/s -> 1.21 pkts/s => -89.85%
- from gateways: 5618.02 bits/s -> 212.28 => -96.22%
10.03 pkts/s -> 0.38 pkts/s => -96.21%Also see graphics and a few more test details here:
- https://www.open-mesh.org/projects/batman-adv/wiki/DAT_DHCP_Snooping#Result-2
Regards,
Linus
---
Changelog v10:
- PATCH 1/3: removed, already applied
- PATCH 0/2: cover letter: removed test time period and "v5" reference
- PATCH 1/2:
- fixed kerneldoc in batadv_dat_hash_free(),
replaced "bat_priv" with "hash"
- added missing kerneldoc in batadv_dat_snoop_incoming_arp_reply() for is_dht_put
- rebase to current main branch:
- adopted new bat_priv kernel doc description,
"soft interface" -> "mesh interface"
- adopted variable rename from soft_iface to mesh_iface
Changelog v9:
- PATCH 1/3:
- fixed typo in a comment: ENOENT -> ENONET
Changelog v8:
- PATCH 1/3:
- fixing / cleaning up includes
- fixing function kernel doc titles
- fixing bugs introduced in v7 in the error handling of batadv_orig_dump() and batadv_neigh_dump(), using a goto pattern with more explicit labels
Changelog v7:
- adding PATCH 1/3 to add the batadv_netlink_get_softif() wrapper to reduce the amount of duplicate code, both in the current code base but also for the next PATCH 2/3
Changelog v6:
- removed renaming+deprecation of BATADV_P_DAT_CACHE_REPLY in PATCH 1/2
- small commit message rewording in PATCH 1/2
Changelog v5:
- rebased to current main branch
-> removed now obsolete debugfs code
Changelog v4:
- rebased to: acfc9a214d01695
("batman-adv: genetlink: make policy common to family")
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 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
Linus Lüssing (2):
batman-adv: split DAT cache into DAT cache and DAT DHT
batman-adv: increase DAT DHT timeout
include/uapi/linux/batman_adv.h | 5 + net/batman-adv/distributed-arp-table.c | 337 +++++++++++++++++++------ net/batman-adv/distributed-arp-table.h | 13 +- net/batman-adv/main.h | 3 +- net/batman-adv/netlink.c | 5 + net/batman-adv/routing.c | 7 +- net/batman-adv/types.h | 7 +- 7 files changed, 288 insertions(+), 89 deletions(-)
Signature · 1 line
2.55.0
PATCH v10 1/2 batman-adv: split DAT cache into DAT cache and DAT DHT
Similar to the translation table split the (mostly) locally maintained DAT cache and the DAT DHT concepts into two separate tables.
This eases the monitoring and debugging regarding the origin of DAT entries. And allows to apply differing properties to entries in the DAT cache and DAT DHT in the future, like distinct timeouts.
--- include/uapi/linux/batman_adv.h | 5 + net/batman-adv/distributed-arp-table.c | 319 +++++++++++++++++++------ net/batman-adv/distributed-arp-table.h | 13 +- net/batman-adv/netlink.c | 5 + net/batman-adv/routing.c | 7 +- net/batman-adv/types.h | 7 +- 6 files changed, 271 insertions(+), 85 deletions(-)
include/uapi/linux/batman_adv.h +5 -0
@@ -613,6 +613,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 */ /**
net/batman-adv/distributed-arp-table.c +240 -79
565 lines not on this page · raw message
net/batman-adv/distributed-arp-table.h +11 -2
@@ -31,7 +31,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,
@@ -74,6 +75,7 @@ batadv_dat_init_own_addr(struct batadv_priv *bat_priv,int batadv_dat_init (struct batadv_priv *bat_priv);void batadv_dat_free (struct batadv_priv *bat_priv);int batadv_dat_cache_dump (struct sk_buff *msg,struct netlink_callback *cb); +int batadv_dat_dht_dump (struct sk_buff *msg,struct netlink_callback *cb);/** * batadv_dat_inc_counter() - increment the correct DAT packet counter
@@ -126,7 +128,8 @@ batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv,static inline 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) {return false; }
@@ -176,6 +179,12 @@ batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb)return -EOPNOTSUPP ; } +static inline int +batadv_dat_dht_dump (struct sk_buff *msg,struct netlink_callback *cb) +{ +return -EOPNOTSUPP ; +} +static inline void batadv_dat_inc_counter (struct batadv_priv *bat_priv,u8 subtype) {
net/batman-adv/netlink.c +5 -0
@@ -1498,6 +1498,11 @@ static const struct genl_small_ops batadv_netlink_ops[] = { .flags = GENL_UNS_ADMIN_PERM, .dumpit = batadv_dat_cache_dump, }, + { + .cmd = BATADV_CMD_GET_DAT_DHT, + .flags = GENL_ADMIN_PERM, + .dumpit = batadv_dat_dht_dump, + }, { .cmd = BATADV_CMD_GET_MCAST_FLAGS, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
net/batman-adv/routing.c +5 -2
@@ -1046,6 +1046,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,struct batadv_orig_node *orig_node =NULL ;int hdr_size =sizeof (*unicast_packet);enum batadv_subtype subtype; +bool is_dht_put = false;int ret =NET_RX_DROP ;u8 *orig_addr_gw;u8 *orig_addr;
@@ -1105,6 +1106,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; } }
@@ -1112,7 +1115,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);
@@ -1353,7 +1356,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);
net/batman-adv/types.h +5 -2
@@ -1211,8 +1211,11 @@ struct batadv_priv_dat {/** @addr: node DAT address */ batadv_dat_addr_t addr; -/** @hash: hashtable representing the local ARP cache */ -struct batadv_hashtable *hash; +/** @cache_hash: hashtable representing the local ARP cache */ +struct batadv_hashtable *cache_hash; + +/** @dht_hash: hashtable representing the local DAT DHT */ +struct batadv_hashtable *dht_hash;/** @work: work queue callback item for cache purging */ struct delayed_work work;
Signature · 1 line
2.55.0
Re: [batadv,v10 1/2] batman-adv: split DAT cache into DAT cache and DAT DHT
tl;dr: One of the four suggestions makes sense to me. For 1(.5) other points don't make sense to me / are overlooking an aspect, imo. For the remaining points I don't think they are a big issue, or at least for now not worth the extra complexity / refactoring work needed?
Quoted 36 lines · On Fri, Sep 18, 2026 at 11:11:00PM +0000, [email protected] wrote:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] batadv: incomplete DAT hash split breaks DHCP snooping and broadcasts --commit
40cf52e0667d2a02a686b866fe2dc385205cdc83
Author: Linus Lüssing <[email protected]>batman-adv: split DAT cache into DAT cache and DAT DHT
This commit separates the locally maintained DAT cache and the DAT DHT into two distinct hash tables. This split is intended to ease monitoring and allow differing properties for cache vs DHT entries.
Quoted 4 lines
net/batman-adv/distributed-arp-table.c +0
-0[ ... ]
net/batman-adv/distributed-arp-table.c bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, · line 1428
Quoted 11 lines
net/batman-adv/distributed-arp-table.c +2
-2@@ -1421,9 +1421,9 @@ 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_cache_entry_add (bat_priv, ip_src, hw_src, vid); - dat_entry =batadv_dat_entry_hash_find (bat_priv, ip_dst, vid); + dat_entry =batadv_dat_cache_entry_find (bat_priv, ip_dst, vid);if (dat_entry) { u64_mac =atomic64_read (&dat_entry->mac_addr);[Severity: High]
Does this fail to reply locally if the node has the requested entry in the DAT DHT but not the DAT cache?
Quoted 2 lines
If the node is the DHT candidate, checking only the cache hash could bypass local DHT knowledge and trigger unnecessary remote
DHT_GETrequests.
I don't think these DHT_GET requests are unnecessary. The local DAT DHT information might (sometimes) be outdated if due to new or vanishing nodes we are not one of the three DAT DHT candidates anymore. We should check on the current DHT candidates instead then in my opinion.
Also a DHT_GET is not that costly (at least compared to a broadcast flooded ARP request, for instance).
(And thirdly, I'm also wondering if in the future in larger and/or more dynamic or lossy networks it might make sense to check all BATADV_P_DAT_CACHE_REPLY answers and choose the MAC address with the most votes. In case one of the candidates might have an outdated DHT entry somehow. Or if a candidate were generating corrupted/bogus replies. We've seen broken, bit-flipping devices in our networks before.)
Quoted 19 lines
[ ... ]
net/batman-adv/distributed-arp-table.c bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, · line 1532
Quoted 11 lines
net/batman-adv/distributed-arp-table.c +2
-2@@ -1525,9 +1525,9 @@ 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_cache_entry_add (bat_priv, ip_src, hw_src, vid); - dat_entry =batadv_dat_entry_hash_find (bat_priv, ip_dst, vid); + dat_entry =batadv_dat_dht_entry_find (bat_priv, ip_dst, vid);if (!dat_entry) goto out;[Severity: High]
Will this miss DHT entries that were improperly stored in the cache hash instead of the DHT hash?
Quoted 3 lines
If a node's local client sends an ARP reply or if a DHCP
DHT_PUTis saved in the cache hash, a remoteDHT_GETwill fail here becausebatadv_dat_snoop_incoming_arp_requestonly searches the DHT hash.
The short answer would be: In theory valid but not sure if it's an issue in practice.
If our own, local node is one of the candidates then other nodes might loose one of the three potential candidates. But for one thing there are two other candidates and for another depending on the network size could be rare. In small networks would happen more often, but in smaller networks with therefore shorter paths just two candidates should generally be fine, too.
If one were trying to not loose a candidate (but I'm not sure if that is worth it for now? Or if that should be extra patches later?):
Option A)
Quoted 1 line
From
batadv_dat_snoop_outgoing_arp_reply()/
batadv_dat_snoop_outgoing_dhcp_ack() always add to local DHT, regardless if we are an actual DHT candidate.
Downside: From "batctl dd" we wouldn't know anymore if the entry came from a local addition or via a DHT PUT. (one could maybe add a flag to a DHT entry though for the batctl visualization...)
Option B)
Make batadv_choose_next_candidate() consider our own, local orig address, too. Add a BATADV_DAT_CANDIDATE_SELF type. Make batadv_dat_forward_data() add to the local DHT (without sending a DHT PUT message to ourself?) if this local orig is a candidate.
Downside: More rework and extra checks.
Upside: Currently, also before these patches, if the local node is a candidate then we might do a superfluous DHT_PUSH to a node which is not actually a candidate from the perspective of other nodes. Consdering the own node for the DHT ring, too, would solve that as well.
Quoted 12 lines
[ ... ]
Quoted 9 lines
net/batman-adv/distributed-arp-table.c +2
-2@@ -2077,8 +2077,8 @@ void batadv_dat_snoop_incoming_dhcp_ack(struct batadv_priv *bat_priv, ethhdr = (struct ethhdr *)(skb->data + hdr_size); hw_src = ethhdr->h_source; -batadv_dat_entry_add (bat_priv, yiaddr, chaddr, vid); -batadv_dat_entry_add (bat_priv, ip_src, hw_src, vid); +batadv_dat_cache_entry_add (bat_priv, yiaddr, chaddr, vid); +batadv_dat_cache_entry_add (bat_priv, ip_src, hw_src, vid);
Quoted 8 lines
net/batman-adv/distributed-arp-table.c void batadv_dat_snoop_incoming_dhcp_ack(struct batadv_priv *bat_priv, · line 2083
Quoted 1 line
net/batman-adv/distributed-arp-table.c +0
-0batadv_dbg(BATADV_DBG_DAT, bat_priv,[Severity: High]
When a DHT candidate receives aDHT_PUTcontaining a DHCP packet, should these entries be saved in the DHT hash instead of the cache hash?Saving them to the cache hash unconditionally makes them invisible to subsequent
DHT_GETqueries that only check the DHT hash.
Makes sense, indeed a batadv_dat_snoop_incoming_dhcp_ack() should behave similar to a batadv_dat_snoop_incoming_arp_reply() which it currently does not. So if the incoming DHCP ACK came via a DHT_PUT then I'd change this patch to add to the local DHT, too, in a v11.
Quoted 16 lines
[ ... ]
net/batman-adv/distributed-arp-table.c bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv, · line 2137
Quoted 8 lines
net/batman-adv/distributed-arp-table.c +1
-1@@ -2132,7 +2132,7 @@ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv, goto out; ip_dst =batadv_arp_ip_dst (forw_packet->skb, hdr_size); - dat_entry =batadv_dat_entry_hash_find (bat_priv, ip_dst, vid); + dat_entry =batadv_dat_cache_entry_find (bat_priv, ip_dst, vid);/* check if the node already got this entry */ if (!dat_entry) {[Severity: High]
Does this fail to drop the broadcast packet if the node knows the answer via the DHT hash rather than the cache hash?
Quoted 2 lines
By only checking the cache, known DHT entries fail to suppress ARP broadcasts, which can lead to unnecessary broadcast storms.
Similar to the first reply: The local DHT entry might be outdated. A broadcast in that case would seem safer to me.
(Alternatively, with the "Option B)" mentioned above one could potentially also avoid the broadcast. But still a bit tricky, as we don't have an orig-node for ourself and therefore can't simply send a DHT_GET to ourself / can't treat ourself as any other DAT candidate?)
Quoted 3 lines
Signature · 2 lines
-- Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
PATCH v10 2/2 batman-adv: increase DAT DHT timeout
In reply to Linus LüssingCurrently, 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 DHT 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 DAT DHT entries is increased to 30min to reduce the number of DAT ARP broadcast fallbacks.
--- net/batman-adv/distributed-arp-table.c | 22 +++++++++++++++++----- net/batman-adv/main.h | 3 ++- 2 files changed, 19 insertions(+), 6 deletions(-)
net/batman-adv/distributed-arp-table.c +17 -5
@@ -199,15 +199,27 @@ static void batadv_dat_entry_put(struct batadv_dat_entry *dat_entry) }/** -* batadv_dat_to_purge() - check whether a dat_entry has to be purged or not +* batadv_dat_cache_to_purge() - check if a cache entry has to be purged or not * @dat_entry: the entry to check * * Return: true if the entry has to be purged now, false otherwise. */ -static bool batadv_dat_to_purge (struct batadv_dat_entry *dat_entry) +static bool batadv_dat_cache_to_purge (struct batadv_dat_entry *dat_entry) {return batadv_has_timed_out (dat_entry->last_update, -BATADV_DAT_ENTRY_TIMEOUT ); +BATADV_DAT_CACHE_ENTRY_TIMEOUT ); +} + +/** +* batadv_dat_dht_to_purge() - check if a DHT entry has to be purged or not +* @dat_entry: the entry to check +* +* Return: true if the entry has to be purged now, false otherwise. +*/ +static bool batadv_dat_dht_to_purge (struct batadv_dat_entry *dat_entry) +{ +return batadv_has_timed_out (dat_entry->last_update, +BATADV_DAT_DHT_ENTRY_TIMEOUT ); }/**
@@ -268,8 +280,8 @@ static void batadv_dat_purge(struct work_struct *work) priv_dat = container_of(delayed_work, struct batadv_priv_dat, work); bat_priv = container_of(priv_dat, struct batadv_priv, dat); -__batadv_dat_purge (bat_priv->dat.cache_hash, batadv_dat_to_purge); -__batadv_dat_purge (bat_priv->dat.dht_hash, batadv_dat_to_purge); +__batadv_dat_purge (bat_priv->dat.cache_hash, batadv_dat_cache_to_purge); +__batadv_dat_purge (bat_priv->dat.dht_hash, batadv_dat_dht_to_purge);batadv_dat_start_timer (bat_priv); }
net/batman-adv/main.h +2 -1
@@ -36,7 +36,8 @@#define BATADV_TT_WORK_PERIOD 5000/* 5 seconds */ #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_CACHE_ENTRY_TIMEOUT (5 * 60000)/* 5 mins in milliseconds */ +#define BATADV_DAT_DHT_ENTRY_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) */
Signature · 1 line
2.55.0