Skip to content

batman-adv: 7.2 merge window fixes backports

Sven Eckelmann stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest25 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/25batman-adv: tp_meter: keep unacked list in ascending orderednet/batman-adv/tp_meter.c+1 -10 replies
2/25batman-adv: tp_meter: initialize dup_acks explicitlynet/batman-adv/tp_meter.c+1 -00 replies
3/25batman-adv: tp_meter: initialize dec_cwnd explicitlynet/batman-adv/tp_meter.c+2 -00 replies
4/25batman-adv: tp_meter: avoid window underflownet/batman-adv/tp_meter.c+6 -10 replies
5/25batman-adv: tp_meter: avoid divide-by-zero for dec_cwndnet/batman-adv/tp_meter.c+4 -10 replies
6/25batman-adv: tp_meter: fix fast recovery preconditionnet/batman-adv/tp_meter.c+1 -10 replies
7/25batman-adv: tp_meter: handle seqno wrap-around for fast recovery detectionnet/batman-adv/tp_meter.c+1 -10 replies
8/25batman-adv: tp_meter: add only finished tp_vars to listsnet/batman-adv/tp_meter.c+9 -90 replies
9/25batman-adv: bla: annotate lasttime access with READ/WRITE_ONCEnet/batman-adv/bridge_loop_avoidance.c+14 -140 replies
10/25batman-adv: prevent ELP transmission interval underflownet/batman-adv/netlink.c+6 -00 replies
11/25batman-adv: tp_meter: initialize last_recv_time during initnet/batman-adv/tp_meter.c+7 -30 replies
12/25batman-adv: ensure bcast is writable before modifying TTLnet/batman-adv/routing.c+6 -00 replies
13/25batman-adv: fix (m|b)cast csum after decrementing TTLnet/batman-adv/routing.c+54 -10 replies
14/25batman-adv: frag: ensure fragment is writable before modifying TTLnet/batman-adv/fragmentation.c net/batman-adv/fragmentation.h net/batman-adv/routing.c+17 -40 replies
15/25batman-adv: frag: avoid underflow of TTLnet/batman-adv/fragmentation.c+7 -00 replies
16/25batman-adv: v: prevent OGM aggregation on disabled hardifnet/batman-adv/bat_v.c net/batman-adv/bat_v_ogm.c net/batman-adv/types.h+19 -00 replies
17/25batman-adv: tp_meter: restrict number of unacked list entriesnet/batman-adv/tp_meter.c net/batman-adv/types.h+25 -10 replies
18/25batman-adv: tp_meter: annotate last_recv_time access with READ/WRITE_ONCEnet/batman-adv/tp_meter.c+4 -40 replies
19/25batman-adv: tp_meter: prevent parallel modifications of last_recvnet/batman-adv/tp_meter.c net/batman-adv/types.h+14 -100 replies
20/25batman-adv: tp_meter: handle overlapping packetsnet/batman-adv/tp_meter.c+11 -140 replies
21/25batman-adv: tt: don't merge change entries with different VIDsnet/batman-adv/translation-table.c+3 -00 replies
22/25batman-adv: tt: track roam count per VIDnet/batman-adv/translation-table.c net/batman-adv/types.h+10 -20 replies
23/25batman-adv: dat: prevent false sharing between VLANsnet/batman-adv/distributed-arp-table.c+9 -30 replies
24/25batman-adv: tvlv: enforce 2-byte alignmentnet/batman-adv/bat_iv_ogm.c net/batman-adv/bat_v_ogm.c net/batman-adv/tvlv.c+26 -20 replies
25/25batman-adv: tvlv: avoid race of cifsnotfound handler statenet/batman-adv/tvlv.c net/batman-adv/types.h+57 -130 replies

Reviews trailers per patch

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

Read the v1 thread

Cover letter [PATCH 5.15 00/25] batman-adv: 7.2 merge window fixes backports

Hi Greg & Sasha,

there were quite some stable targetting fixes in the Linux 7.2 merge window. Unfortunately, there will be quiet some conflicts for older versions and some order dependencies (often to patches which have conflicts with older kernels).

I would therefore just submit my backporting branch
https://git.open-mesh.org/batadv.git/log/?h=batadv/lts/5.15 to directly provide the backported version of each patch. If it is completely incompatible with your workflow then please ignore it.

There is no urgency for these patches. I just want to reduce the number of conflicts and patches which are accidentally missed.

Sorry for the noise. I hope to have less stable fixes future (at least the ones which have extra dependencies).

These backports expect that the following patches from 5.15.211-rc1 are present:

* batman-adv: tt: reject oversized local TVLV buffers
* batman-adv: tt: prevent TVLV entry number overflow

Regards,
Sven

Sven Eckelmann (25):
batman-adv: tp_meter: keep unacked list in ascending ordered
batman-adv: tp_meter: initialize dup_acks explicitly
batman-adv: tp_meter: initialize dec_cwnd explicitly
batman-adv: tp_meter: avoid window underflow
batman-adv: tp_meter: avoid divide-by-zero for dec_cwnd
batman-adv: tp_meter: fix fast recovery precondition
batman-adv: tp_meter: handle seqno wrap-around for fast recovery
detection
batman-adv: tp_meter: add only finished tp_vars to lists
batman-adv: bla: annotate lasttime access with READ/WRITE_ONCE
batman-adv: prevent ELP transmission interval underflow
batman-adv: tp_meter: initialize last_recv_time during init
batman-adv: ensure bcast is writable before modifying TTL
batman-adv: fix (m|b)cast csum after decrementing TTL
batman-adv: frag: ensure fragment is writable before modifying TTL
batman-adv: frag: avoid underflow of TTL
batman-adv: v: prevent OGM aggregation on disabled hardif
batman-adv: tp_meter: restrict number of unacked list entries
batman-adv: tp_meter: annotate last_recv_time access with
READ/WRITE_ONCE
batman-adv: tp_meter: prevent parallel modifications of last_recv
batman-adv: tp_meter: handle overlapping packets
batman-adv: tt: don't merge change entries with different VIDs
batman-adv: tt: track roam count per VID
batman-adv: dat: prevent false sharing between VLANs
batman-adv: tvlv: enforce 2-byte alignment
batman-adv: tvlv: avoid race of cifsnotfound handler state

 net/batman-adv/bat_iv_ogm.c            |  11 ++-
 net/batman-adv/bat_v.c                 |   1 +
 net/batman-adv/bat_v_ogm.c             |  23 ++++-
 net/batman-adv/bridge_loop_avoidance.c |  28 +++---
 net/batman-adv/distributed-arp-table.c |  12 ++-
 net/batman-adv/fragmentation.c         |  22 ++++-
 net/batman-adv/fragmentation.h         |   3 +-
 net/batman-adv/netlink.c               |   6 ++
 net/batman-adv/routing.c               |  64 +++++++++++++-
 net/batman-adv/tp_meter.c              | 115 ++++++++++++++++---------
 net/batman-adv/translation-table.c     |  12 ++-
 net/batman-adv/tvlv.c                  |  69 +++++++++++++--
 net/batman-adv/types.h                 |  21 +++--
 13 files changed, 308 insertions(+), 79 deletions(-)
Signature · 1 line
2.47.3