Skip to content

batman-adv: increase DAT DHT timeout

Linus Lüssing batman sashiko-reviews 5 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v14 Latest5 patches 5 repliesIn review
  2. v135 patches 1 replySuperseded
  3. v125 patches 1 replySuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v114 patches0 repliesSuperseded
v102 patches1 replySuperseded

Changes in v14 from the cover letter

- PATCH 2/5:
- remove wrong @hw_dst kerneldoc for batadv_dat_dht_get_self_reply() and batadv_dat_forward_dht_get()
- PATCH 5/5:
- remove an extra newline in batadv_packet.h
- fix compilation with DAT=n by adding the new flags argument to the batadv_dat_inc_counter() stub, too

Patches in v14 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5batman-adv: move local ARP reply code to subfunctionsnet/batman-adv/distributed-arp-table.c+105 -760 replies
2/5batman-adv: split DAT cache into DAT cache and DAT DHTinclude/uapi/linux/batman_adv.h net/batman-adv/distributed-arp-table.c net/batman-adv/distributed-arp-table.h +3 more+507 -1090 replies
3/5batman-adv: increase DAT DHT timeoutnet/batman-adv/distributed-arp-table.c net/batman-adv/main.h+19 -60 replies
4/5batman-adv: avoid superfluous DAT DHT_PUT if self-candidatenet/batman-adv/distributed-arp-table.c+11 -00 replies
5/5batman-adv: avoid superfluous DAT DHT_PUT additions to local DATinclude/uapi/linux/batadv_packet.h net/batman-adv/distributed-arp-table.c net/batman-adv/distributed-arp-table.h +5 more+186 -294 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v14 yet.

Read the v14 thread

Cover letter [batadv,v14 0/5] 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 2/5).

PATCH 3/5 then increases the timeout for DAT DHT entries from 5 to 30 minutes, the main performance enhancement and goal of this patchset.

PATCH 4/5 and 5/5 are some small tweaks for a few unnecessary DHT additions which we can now detect and avoid.

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 v14:
- PATCH 2/5:
- remove wrong @hw_dst kerneldoc for batadv_dat_dht_get_self_reply() and batadv_dat_forward_dht_get()
- PATCH 5/5:
- remove an extra newline in batadv_packet.h
- fix compilation with DAT=n by adding the new flags argument to the batadv_dat_inc_counter() stub, too

Changelog v13:
- PATCH 2/5:
- remove .validate for BATADV_CMD_GET_DAT_DHT again
- moved BATADV_CMD_GET_DAT_DHT to end of batadv_netlink_ops

Changelog v12:
- PATCH 0/5:
- added mentioning of PATCH 4/5 and 5/5 in the summary
- PATCH 1/5 (was: 1/4):
- fix triggering of the "ARP request replied locally" debug message by changing the batadv_dat_arp_self_reply() return type from bool to int, ensuring to (keep) only trigger(ing) it when netif_rx()'ing
- PATCH 2/5 (was: 2/4):
- consistently use a "cands" variable name for the candidate array instead of sometimes calling it "cand", sometimes "cands"
- add missing kerneldoc for batadv_dat_forward_data()'s "cands" function argument
- renaming batadv_dat_check_self_candidate() to batadv_dat_cmp_self_candidate()
- fix unprivileged DAT_DHT netlink usage
- add netlink .validate (and .resv_start_op for compat) for uniform netlink ops
- adjust batadv_dat_dht_get_self_reply() to new batadv_dat_arp_self_reply() int return type
(also avoiding an automatic type conversion from int
to bool by that)
- fix memory leak / missing orig_node put in batadv_dat_forward_dht_get() if one self is a
candidate, move orig-node put from batadv_dat_forward_data() to separate batadv_dat_candidates_free() function, called later
- revert "update local DHT on DHCP ACKs received via DHT_PUTs, too" from v11 as we never send DHT_PUT messages with a DHCP payload, sashiko.dev seems to have missed that these are always ARP Replies
- PATCH 3/5 (was: 3/4): unchanged
- PATCH 4/5 (was: 4/4): unchanged
- PATCH 5/5: NEW, avoid superfluous DAT DHT_PUT additions to local DAT

Changelog v11:
- PATCH 1/4: NEW, simple restructuring in preparation for 2/4 (no functional change)
- PATCH 2/4 (was: 1/2):
- update local DHT on DHCP ACKs received via DHT_PUTs, too
- added self-candidate checks (batadv_dat_check_self_candidate()):
- update local DHT from/on own DHT_PUT if we are a DAT candidate
- (try to) reply to own DHT_GET from own DHT first if we are a selected DAT candidate
- PATCH 3/4 (was 2/2): unchanged
- PATCH 4/4: NEW, avoid superfluous DAT DHT_PUT if self-candidate

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 (5):
batman-adv: move local ARP reply code to subfunctions
batman-adv: split DAT cache into DAT cache and DAT DHT
batman-adv: increase DAT DHT timeout
batman-adv: avoid superfluous DAT DHT_PUT if self-candidate
batman-adv: avoid superfluous DAT DHT_PUT additions to local DAT

 include/uapi/linux/batadv_packet.h     |  16 +-
 include/uapi/linux/batman_adv.h        |   5 +
 net/batman-adv/distributed-arp-table.c | 887 ++++++++++++++++++++-----
 net/batman-adv/distributed-arp-table.h |  26 +-
 net/batman-adv/main.h                  |   3 +-
 net/batman-adv/mesh-interface.c        |   4 +
 net/batman-adv/netlink.c               |   5 +
 net/batman-adv/routing.c               |  18 +-
 net/batman-adv/send.c                  |   8 +-
 net/batman-adv/send.h                  |   3 +-
 net/batman-adv/types.h                 |  31 +-
 11 files changed, 807 insertions(+), 199 deletions(-)
Signature · 1 line
2.55.0