B.A.T.M.A.N

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

12 participants
4338 discussions

[PATCH] batman-adv: fix panic during interface removal
by Andy Strohman 19 Jan '25

19 Jan '25

Reference counting is used to ensure that batadv_hardif_neigh_node and batadv_hard_iface are not freed before/during batadv_v_elp_throughput_metric_update work is finished. But there isn't a guarantee that the hard if will remain associated with a soft interface up until the work is finished. This fixes a crash triggered by reboot that looks like this: Call trace: batadv_v_mesh_free+0xd0/0x4dc [batman_adv] batadv_v_elp_throughput_metric_update+0x1c/0xa4 process_one_work+0x178/0x398 worker_thread+0x2e8/0x4d0 kthread+0xd8/0xdc ret_from_fork+0x10/0x20 (the batadv_v_mesh_free call is misleading, and does not actually happen) I was able to make the issue happen more reliably by changing hardif_neigh->bat_v.metric_work work to be delayed work. This allowed me to track down and confirm the fix. Signed-off-by: Andy Strohman <andrew(a)andrewstrohman.com> --- net/batman-adv/bat_v_elp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 1d704574..7daaad9c 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -140,7 +140,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) } default_throughput: - if (!(hard_iface->bat_v.flags & BATADV_WARNING_DEFAULT)) { + if (!(hard_iface->bat_v.flags & BATADV_WARNING_DEFAULT) && hard_iface->soft_iface) { batadv_info(hard_iface->soft_iface, "WiFi driver or ethtool info does not provide information about link speeds on interface %s, therefore defaulting to hardcoded throughput values of %u.%1u Mbps. Consider overriding the throughput manually or checking your driver.\n", hard_iface->net_dev->name, -- 2.34.1

4 8

[PATCH RFC] batman-adv: BATMAN V: use/prefer 11s airtime link metric
by Linus Lüssing 19 Jan '25

19 Jan '25

With an 11s interface and HWMP then this keeps track of a throughput estimation internally already, as specified by 802.11-2020, section 14.9.2. The HWMP code even makes use of the Minstrel provided expected throughput if available and is therefore very close to this expected throughput value, except the specification adds some constant penalty for: "Channel access overhead (in μs), which includes frame headers, training sequences, access protocol frames, etc." When no expected throughput is available then HWMP keeps track of the average packet delivery error rate and average phy rate to calculate its own expected throughput value. So the 11s airtime link metric should be a slightly better estimate than the expected throughput provided by Minstrel. And should be significantly better than our raw PHY rate divided by 3 guestimate fallback. Therefore this should significantly improve the accuracy for BATMAN V when using drivers like ath10k/ath11k/ath12k/mt76 which all do not implement/export an expected throughput information. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- RFC because: * only tested in a VM with mac80211_hwsim, checked that the value from sinfo.airtime_link_metric is used and that "batctl o"/"batctl n" still (nearly) matches the "expected throughput" in "iw dev wlan0 station dump" * still needs testing / verification on real devices * I'm a bit confused about the extra "* 100" I had to apply to make the values match, not quite sure where that comes from? net/batman-adv/bat_v_elp.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 1d704574e6bf..014489f7f947 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -18,6 +18,7 @@ #include <linux/if_ether.h> #include <linux/jiffies.h> #include <linux/kref.h> +#include <linux/limits.h> #include <linux/minmax.h> #include <linux/netdevice.h> #include <linux/nl80211.h> @@ -56,6 +57,25 @@ static void batadv_v_elp_start_timer(struct batadv_hard_iface *hard_iface) msecs_to_jiffies(msecs)); } +/** + * batadv_v_elp_get_throughput_from_11s() - get the throughput from 11s link + * @airtime: airtime link metric to a neighbor from an 11s link + * + * Return: The throughput towards the given neighbour in multiples of 100kpbs + * (a value of '1' equals 0.1Mbps, '10' equals 1Mbps, etc). + */ +static u32 batadv_v_elp_get_throughput_from_11s(u32 airtime) +{ + const int tu_to_airtime_unit = 100; + const int test_frame_len = 8192; + const int tu_to_us = 1024; + + if (!airtime) + return U32_MAX; + + return test_frame_len * 100 * tu_to_airtime_unit / (airtime * tu_to_us); +} + /** * batadv_v_elp_get_throughput() - get the throughput towards a neighbour * @neigh: the neighbour for which the throughput has to be obtained @@ -69,7 +89,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) struct ethtool_link_ksettings link_settings; struct net_device *real_netdev; struct station_info sinfo; - u32 throughput; + u32 throughput, airtime; int ret; /* if the user specified a customised value for this interface, then @@ -109,6 +129,11 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) if (ret) goto default_throughput; + if (sinfo.filled & BIT(NL80211_STA_INFO_AIRTIME_LINK_METRIC)) { + airtime = sinfo.airtime_link_metric; + return batadv_v_elp_get_throughput_from_11s(airtime); + } + if (sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT)) return sinfo.expected_throughput / 100; -- 2.47.1

3 8

[PATCH 00/10] pull request for net-next: batman-adv 2025-01-17
by Simon Wunderlich 19 Jan '25

19 Jan '25

Hi Jakub, hi David, here is a cleanup 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 40384c840ea1944d7c5a392e8975ed088ecf0b37: Linux 6.13-rc1 (2024-12-01 14:28:56 -0800) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20250117 for you to fetch changes up to 6ecc4fd6c2f43862c5e3b280cf419f0131e45c97: batman-adv: netlink: reduce duplicate code by returning interfaces (2025-01-17 13:36:01 +0100) ---------------------------------------------------------------- This cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Reorder includes for distributed-arp-table.c, by Sven Eckelmann - Fix translation table change handling, by Remi Pommarel (2 patches) - Map VID 0 to untagged TT VLAN, by Sven Eckelmann - Update MAINTAINERS/mailmap e-mail addresses, by the respective authors (4 patches) - netlink: reduce duplicate code by returning interfaces, by Linus Lüssing ---------------------------------------------------------------- Antonio Quartulli (1): MAINTAINERS: mailmap: add entries for Antonio Quartulli Linus Lüssing (1): batman-adv: netlink: reduce duplicate code by returning interfaces Marek Lindner (1): MAINTAINERS: update email address of Marek Linder Remi Pommarel (2): batman-adv: Remove atomic usage for tt.local_changes batman-adv: Don't keep redundant TT change events Simon Wunderlich (2): batman-adv: Start new development cycle mailmap: add entries for Simon Wunderlich Sven Eckelmann (3): batman-adv: Reorder includes for distributed-arp-table.c batman-adv: Map VID 0 to untagged TT VLAN mailmap: add entries for Sven Eckelmann .mailmap | 19 +++++ Documentation/networking/batman-adv.rst | 2 +- MAINTAINERS | 4 +- net/batman-adv/bridge_loop_avoidance.c | 33 ++------ net/batman-adv/distributed-arp-table.c | 20 ++--- net/batman-adv/gateway_client.c | 18 +--- net/batman-adv/main.c | 7 ++ net/batman-adv/main.h | 4 +- net/batman-adv/multicast.c | 17 +--- net/batman-adv/netlink.c | 146 ++++++++++++++++++++++---------- net/batman-adv/netlink.h | 5 +- net/batman-adv/originator.c | 116 +++++++++---------------- net/batman-adv/soft-interface.c | 16 +++- net/batman-adv/translation-table.c | 92 ++++++++------------ net/batman-adv/types.h | 4 +- 15 files changed, 251 insertions(+), 252 deletions(-)

2 11

[PATCH v4 0/3] add dynamic, bridged-in TT VID detection support
by Linus Lüssing 17 Jan '25

17 Jan '25

For one thing the following patchest is supposed to mitigate the regression of extra OGM overhead that we accidentally introduced with the introduction of the compatibility version 15, the TVLV support it provided, together with TT VLAN support. The addition of these TVLVs roughly doubled the OGM overhead back then, also/mainly because the 8021q and Linux bridge modules would add TT VLAN IDs 0 and 1, even if no one is actually using them. While the 8021q VLAN 0 ID addition was addressed in upstream already, PATCH 3/3 tries to avoid unnecessary VLAN additions from the bridge and only adds such VLANs if they were detected on actual traffic. In preparation of this the internal VLAN creation was overhauled in PATCH 1/3. This also in theory allows detecting new VLAN IDs dynamically from traffic from bridged-in traffic. So far, VLAN IDs could only be used which were anticipated and configured on top of bat0 by the administrator. However the detection of VLANs from bridged-in clients is by default disabled for now through PATCH 2/3. This patch adds a configurable limit for such snooped VLAN IDs, defaulting to zero for now. The issue is that each added VLAN still increases the OGM size considerably in the current protocol, so it is not advised to add many VLANs at the moment, without a bigger upgrade of the protocol. Also there is still an outstanding issue with temporarily broken broadcast traffic upon adding a new VLAN if BLA is enabled at the same time. Therefore defaulting to zero snooped VLANs from bridged-in clients for now. Regards, Linus --- v4: * reworking PATCH 3/3: * removing the added exception for VID 0 again, addressed upstream now * replacing the specific VID 1 exception for the bridge default PVID with a more generic solution: a user might change the PVID or add other, untagged VLANs on an access port which we should also ignore; instead always avoid such kernel event additions if a bridge is on top of bat0 v3: * fixing refcounting, removing an unnecessary kref_get() in PATCH 1/3 * adding PATCH 2/3 + PATCH 3/3 * resubmitting without the RFC tag v2: fix a typo, a missing "to" in the commit message

1 3

[PATCH v8 0/3] batman-adv: increase DAT DHT timeout
by Linus Lüssing 17 Jan '25

17 Jan '25

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/3). PATCH 3/3 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 this year 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… These patches (v5) have been applied in this mesh network without issues for 3 months now. Regards, Linus --- 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

2 5

[PATCH v9 0/3] batman-adv: increase DAT DHT timeout
by Linus Lüssing 17 Jan '25

17 Jan '25

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/3). PATCH 3/3 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 this year 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… These patches (v5) have been applied in this mesh network without issues for 3 months now. Regards, Linus --- 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

1 3

[PATCH net-next v8 00/11] net: Improve netns handling in rtnetlink
by Xiao Liang 14 Jan '25

14 Jan '25

This patch series includes some netns-related improvements and fixes for rtnetlink, to make link creation more intuitive: 1) Creating link in another net namespace doesn't conflict with link names in current one. 2) Refector rtnetlink link creation. Create link in target namespace directly. So that # ip link add netns ns1 link-netns ns2 tun0 type gre ... will create tun0 in ns1, rather than create it in ns2 and move to ns1. And don't conflict with another interface named "tun0" in current netns. Patch 01 serves for 1) to avoids link name conflict in different netns. To achieve 2), there're mainly 3 steps: - Patch 02 packs newlink() parameters into a struct, including the original "src_net" along with more netns context. No semantic changes are introduced. - Patch 03 ~ 07 converts device drivers to use the explicit netns extracted from params. - Patch 08 ~ 09 removes the old netns parameter, and converts rtnetlink to create device in target netns directly. Patch 10 ~ 11 adds some tests for link name and link netns. BTW please note there're some issues found in current code: - In amt_newlink() drivers/net/amt.c: amt->net = net; ... amt->stream_dev = dev_get_by_index(net, ... Uses net, but amt_lookup_upper_dev() only searches in dev_net. So the AMT device may not be properly deleted if it's in a different netns from lower dev. - In gtp_newlink() in drivers/net/gtp.c: gtp->net = src_net; ... gn = net_generic(dev_net(dev), gtp_net_id); list_add_rcu(&gtp->list, &gn->gtp_dev_list); Uses src_net, but priv is linked to list in dev_net. So it may not be properly deleted on removal of link netns. - In pfcp_newlink() in drivers/net/pfcp.c: pfcp->net = net; ... pn = net_generic(dev_net(dev), pfcp_net_id); list_add_rcu(&pfcp->list, &pn->pfcp_dev_list); Same as above. - In lowpan_newlink() in net/ieee802154/6lowpan/core.c: wdev = dev_get_by_index(dev_net(ldev), nla_get_u32(tb[IFLA_LINK])); Looks for IFLA_LINK in dev_net, but in theory the ifindex is defined in link netns. Kuniyuki has a patchset to address the issues of gtp and pfcp: https://lore.kernel.org/netdev/20250110014754.33847-1-kuniyu@amazon.com/ --- v8: - Move dev and ext_ack out from param struct. - Validate link_net and dev_net are identical for 6lowpan. v7: link: https://lore.kernel.org/all/20250104125732.17335-1-shaw.leon@gmail.com/ - Add selftest kconfig. - Remove a duplicated test of ip6gre. v6: link: https://lore.kernel.org/all/20241218130909.2173-1-shaw.leon@gmail.com/ - Split prototype, driver and rtnetlink changes. - Add more tests for link netns. - Fix IPv6 tunnel net overwriten in ndo_init(). - Reorder variable declarations. - Exclude a ip_tunnel-specific patch. v5: link: https://lore.kernel.org/all/20241209140151.231257-1-shaw.leon@gmail.com/ - Fix function doc in batman-adv. - Include peer_net in rtnl newlink parameters. v4: link: https://lore.kernel.org/all/20241118143244.1773-1-shaw.leon@gmail.com/ - Pack newlink() parameters to a single struct. - Use ynl async_msg_queue.empty() in selftest. v3: link: https://lore.kernel.org/all/20241113125715.150201-1-shaw.leon@gmail.com/ - Drop "netns_atomic" flag and module parameter. Add netns parameter to newlink() instead, and convert drivers accordingly. - Move python NetNSEnter helper to net selftest lib. v2: link: https://lore.kernel.org/all/20241107133004.7469-1-shaw.leon@gmail.com/ - Check NLM_F_EXCL to ensure only link creation is affected. - Add self tests for link name/ifindex conflict and notifications in different netns. - Changes in dummy driver and ynl in order to add the test case. v1: link: https://lore.kernel.org/all/20241023023146.372653-1-shaw.leon@gmail.com/ Xiao Liang (11): rtnetlink: Lookup device in target netns when creating link rtnetlink: Pack newlink() params into struct net: Use link netns in newlink() of rtnl_link_ops ieee802154: 6lowpan: Validate link netns in newlink() of rtnl_link_ops net: ip_tunnel: Use link netns in newlink() of rtnl_link_ops net: ipv6: Use link netns in newlink() of rtnl_link_ops net: xfrm: Use link netns in newlink() of rtnl_link_ops rtnetlink: Remove "net" from newlink params rtnetlink: Create link directly in target net namespace selftests: net: Add python context manager for netns entering selftests: net: Add test cases for link and peer netns drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 9 +- drivers/net/amt.c | 11 +- drivers/net/bareudp.c | 9 +- drivers/net/bonding/bond_netlink.c | 6 +- drivers/net/can/dev/netlink.c | 4 +- drivers/net/can/vxcan.c | 7 +- .../ethernet/qualcomm/rmnet/rmnet_config.c | 9 +- drivers/net/geneve.c | 9 +- drivers/net/gtp.c | 8 +- drivers/net/ipvlan/ipvlan.h | 3 +- drivers/net/ipvlan/ipvlan_main.c | 8 +- drivers/net/ipvlan/ipvtap.c | 6 +- drivers/net/macsec.c | 9 +- drivers/net/macvlan.c | 7 +- drivers/net/macvtap.c | 7 +- drivers/net/netkit.c | 7 +- drivers/net/pfcp.c | 7 +- drivers/net/ppp/ppp_generic.c | 9 +- drivers/net/team/team_core.c | 6 +- drivers/net/veth.c | 7 +- drivers/net/vrf.c | 5 +- drivers/net/vxlan/vxlan_core.c | 9 +- drivers/net/wireguard/device.c | 7 +- drivers/net/wireless/virtual/virt_wifi.c | 8 +- drivers/net/wwan/wwan_core.c | 16 +- include/net/ip_tunnels.h | 5 +- include/net/rtnetlink.h | 40 ++++- net/8021q/vlan_netlink.c | 9 +- net/batman-adv/soft-interface.c | 9 +- net/bridge/br_netlink.c | 6 +- net/caif/chnl_net.c | 5 +- net/core/rtnetlink.c | 33 ++-- net/hsr/hsr_netlink.c | 12 +- net/ieee802154/6lowpan/core.c | 7 +- net/ipv4/ip_gre.c | 24 ++- net/ipv4/ip_tunnel.c | 10 +- net/ipv4/ip_vti.c | 9 +- net/ipv4/ipip.c | 9 +- net/ipv6/ip6_gre.c | 30 ++-- net/ipv6/ip6_tunnel.c | 19 ++- net/ipv6/ip6_vti.c | 15 +- net/ipv6/sit.c | 17 ++- net/xfrm/xfrm_interface_core.c | 15 +- tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/config | 5 + .../testing/selftests/net/lib/py/__init__.py | 2 +- tools/testing/selftests/net/lib/py/netns.py | 18 +++ tools/testing/selftests/net/link_netns.py | 141 ++++++++++++++++++ tools/testing/selftests/net/netns-name.sh | 10 ++ 49 files changed, 479 insertions(+), 165 deletions(-) create mode 100755 tools/testing/selftests/net/link_netns.py -- 2.47.1

2 14

Multiple ARP replies for same address on openwrt module 6.6.69.2024.3-r3
by Matteo Fortini 09 Jan '25

09 Jan '25

I am noticing random unreachability of hosts in my network, in particular if I just nmap -sP the whole range. I traced it down to ARP poisoning, and the source seems to be two hosts running batman-adv which are claiming the same address. This is a sample output from arping ARPING 192.168.99.1 42 bytes from 02:00:01:bb:00:07 (192.168.99.1): index=0 time=4.204 msec 56 bytes from 02:00:06:bb:00:07 (192.168.99.1): index=1 time=363.556 msec 42 bytes from 02:00:01:bb:00:07 (192.168.99.1): index=2 time=3.743 msec 56 bytes from 02:00:06:bb:00:07 (192.168.99.1): index=3 time=385.352 msec issue is, 02:00:06:bb:00:07 is not the right node and the host is unreachable. The other MAC is the right one. If I clear the ARP cache in my source host, then the remote host is reachable again as it gets the right answer. The problem started after updating to the 24.10RC series of openwrt.

2 3

[PATCH net-next v7 00/11] net: Improve netns handling in rtnetlink
by Xiao Liang 08 Jan '25

08 Jan '25

This patch series includes some netns-related improvements and fixes for rtnetlink, to make link creation more intuitive: 1) Creating link in another net namespace doesn't conflict with link names in current one. 2) Refector rtnetlink link creation. Create link in target namespace directly. So that # ip link add netns ns1 link-netns ns2 tun0 type gre ... will create tun0 in ns1, rather than create it in ns2 and move to ns1. And don't conflict with another interface named "tun0" in current netns. Patch 01 serves for 1) to avoids link name conflict in different netns. To achieve 2), there're mainly 3 steps: - Patch 02 packs newlink() parameters into a struct, including the original "src_net" along with more netns context. No semantic changes are introduced. - Patch 03 ~ 07 converts device drivers to use the explicit netns extracted from params. - Patch 08 ~ 09 removes the old netns parameter, and converts rtnetlink to create device in target netns directly. Patch 10 ~ 11 adds some tests for link name and link netns. BTW please note there're some issues found in current code: - In amt_newlink() drivers/net/amt.c: amt->net = net; ... amt->stream_dev = dev_get_by_index(net, ... Uses net, but amt_lookup_upper_dev() only searches in dev_net. So the AMT device may not be properly deleted if it's in a different netns from lower dev. - In gtp_newlink() in drivers/net/gtp.c: gtp->net = src_net; ... gn = net_generic(dev_net(dev), gtp_net_id); list_add_rcu(&gtp->list, &gn->gtp_dev_list); Uses src_net, but priv is linked to list in dev_net. So it may not be properly deleted on removal of link netns. - In pfcp_newlink() in drivers/net/pfcp.c: pfcp->net = net; ... pn = net_generic(dev_net(dev), pfcp_net_id); list_add_rcu(&pfcp->list, &pn->pfcp_dev_list); Same as above. - In lowpan_newlink() in net/ieee802154/6lowpan/core.c: wdev = dev_get_by_index(dev_net(ldev), nla_get_u32(tb[IFLA_LINK])); Looks for IFLA_LINK in dev_net, but in theory the ifindex is defined in link netns. --- v7: - Add selftest kconfig. - Remove a duplicated test of ip6gre. v6: link: https://lore.kernel.org/all/20241218130909.2173-1-shaw.leon@gmail.com/ - Split prototype, driver and rtnetlink changes. - Add more tests for link netns. - Fix IPv6 tunnel net overwriten in ndo_init(). - Reorder variable declarations. - Exclude a ip_tunnel-specific patch. v5: link: https://lore.kernel.org/all/20241209140151.231257-1-shaw.leon@gmail.com/ - Fix function doc in batman-adv. - Include peer_net in rtnl newlink parameters. v4: link: https://lore.kernel.org/all/20241118143244.1773-1-shaw.leon@gmail.com/ - Pack newlink() parameters to a single struct. - Use ynl async_msg_queue.empty() in selftest. v3: link: https://lore.kernel.org/all/20241113125715.150201-1-shaw.leon@gmail.com/ - Drop "netns_atomic" flag and module parameter. Add netns parameter to newlink() instead, and convert drivers accordingly. - Move python NetNSEnter helper to net selftest lib. v2: link: https://lore.kernel.org/all/20241107133004.7469-1-shaw.leon@gmail.com/ - Check NLM_F_EXCL to ensure only link creation is affected. - Add self tests for link name/ifindex conflict and notifications in different netns. - Changes in dummy driver and ynl in order to add the test case. v1: link: https://lore.kernel.org/all/20241023023146.372653-1-shaw.leon@gmail.com/ Xiao Liang (11): rtnetlink: Lookup device in target netns when creating link rtnetlink: Pack newlink() params into struct net: Use link netns in newlink() of rtnl_link_ops ieee802154: 6lowpan: Use link netns in newlink() of rtnl_link_ops net: ip_tunnel: Use link netns in newlink() of rtnl_link_ops net: ipv6: Use link netns in newlink() of rtnl_link_ops net: xfrm: Use link netns in newlink() of rtnl_link_ops rtnetlink: Remove "net" from newlink params rtnetlink: Create link directly in target net namespace selftests: net: Add python context manager for netns entering selftests: net: Add test cases for link and peer netns drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 11 +- drivers/net/amt.c | 16 +- drivers/net/bareudp.c | 11 +- drivers/net/bonding/bond_netlink.c | 8 +- drivers/net/can/dev/netlink.c | 4 +- drivers/net/can/vxcan.c | 9 +- .../ethernet/qualcomm/rmnet/rmnet_config.c | 11 +- drivers/net/geneve.c | 11 +- drivers/net/gtp.c | 9 +- drivers/net/ipvlan/ipvlan.h | 4 +- drivers/net/ipvlan/ipvlan_main.c | 15 +- drivers/net/ipvlan/ipvtap.c | 10 +- drivers/net/macsec.c | 15 +- drivers/net/macvlan.c | 8 +- drivers/net/macvtap.c | 11 +- drivers/net/netkit.c | 9 +- drivers/net/pfcp.c | 11 +- drivers/net/ppp/ppp_generic.c | 10 +- drivers/net/team/team_core.c | 7 +- drivers/net/veth.c | 9 +- drivers/net/vrf.c | 11 +- drivers/net/vxlan/vxlan_core.c | 11 +- drivers/net/wireguard/device.c | 11 +- drivers/net/wireless/virtual/virt_wifi.c | 14 +- drivers/net/wwan/wwan_core.c | 25 +++- include/net/ip_tunnels.h | 5 +- include/net/rtnetlink.h | 44 +++++- net/8021q/vlan_netlink.c | 15 +- net/batman-adv/soft-interface.c | 16 +- net/bridge/br_netlink.c | 12 +- net/caif/chnl_net.c | 6 +- net/core/rtnetlink.c | 35 +++-- net/hsr/hsr_netlink.c | 14 +- net/ieee802154/6lowpan/core.c | 9 +- net/ipv4/ip_gre.c | 27 ++-- net/ipv4/ip_tunnel.c | 10 +- net/ipv4/ip_vti.c | 10 +- net/ipv4/ipip.c | 14 +- net/ipv6/ip6_gre.c | 42 ++++-- net/ipv6/ip6_tunnel.c | 20 ++- net/ipv6/ip6_vti.c | 16 +- net/ipv6/sit.c | 18 ++- net/xfrm/xfrm_interface_core.c | 15 +- tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/config | 5 + .../testing/selftests/net/lib/py/__init__.py | 2 +- tools/testing/selftests/net/lib/py/netns.py | 18 +++ tools/testing/selftests/net/link_netns.py | 141 ++++++++++++++++++ tools/testing/selftests/net/netns-name.sh | 10 ++ 49 files changed, 550 insertions(+), 226 deletions(-) create mode 100755 tools/testing/selftests/net/link_netns.py -- 2.47.1

3 18

[PATCH v3] batman-adv: Use mailmap to fix old e-mail addresses
by Sven Eckelmann 08 Jan '25

08 Jan '25

The .mailmap is used by git-(short)log to fix some botchered names and to map contributions from old e-mail addresses to new ones. It is also used by some tools to get the correct e-mail address for reviewers based on old contributions. The list was generated using old e-mail address changes in the source code. Also relevant entries for other contributors from the v6.13-rc5 release were added. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Changes in v3: - Drop duplicated mail mapping for linus.luessing(a)web.de - Link to v2: https://lore.kernel.org/r/20250107-mailmap-v2-1-12d85da0b8e7@narfation.org Changes in v2: - Switched to Antonio's preferred e-mail address - Link to v1: https://lore.kernel.org/r/20241231-mailmap-v1-1-1494110b69e7@narfation.org --- .mailmap | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000000000000000000000000000000000000..97888b9b34d21bf0b641051c8e256a88394348f4 --- /dev/null +++ b/.mailmap @@ -0,0 +1,74 @@ +# +# This list is used by git-shortlog to fix a few botched name translations +# in the git archive, either because the author's full name was messed up +# and/or not always written the same way, making contributions from the +# same person appearing not to be so or badly displayed. Also allows for +# old email addresses to map to new email addresses. +# +# For format details, see "man gitmailmap" or "MAPPING AUTHORS" in +# "man git-shortlog" on older systems. +# +# Please keep this list dictionary sorted. +# +Andreas Langer <an.langer(a)gmx.de> <a.langer(a)q-dsl.de> +Andreas Langer <an.langer(a)gmx.de> <an.langer at gmx.de> +Andrew Lunn <andrew(a)lunn.ch> <andrew.lunn(a)ascom.ch> +Antonio Quartulli <antonio(a)mandelbit.com> <antonio(a)meshcoding.com> +Antonio Quartulli <antonio(a)mandelbit.com> <antonio(a)open-mesh.com> +Antonio Quartulli <antonio(a)mandelbit.com> <antonio.quartulli(a)open-mesh.com> +Antonio Quartulli <antonio(a)mandelbit.com> <ordex(a)autistici.org> +Antonio Quartulli <antonio(a)mandelbit.com> <ordex(a)ritirata.org> +Antonio Quartulli <antonio(a)mandelbit.com> <antonio(a)openvpn.net> +Antonio Quartulli <antonio(a)mandelbit.com> <a(a)unstable.cc> +Colin Ian King <colin.i.king(a)gmail.com> <colin.king(a)canonical.com> +Dan Carpenter <error27(a)gmail.com> <dan.carpenter(a)oracle.com> +Geliang Tang <geliang(a)kernel.org> <geliang.tang(a)linux.dev> +Geliang Tang <geliang(a)kernel.org> <geliang.tang(a)suse.com> +Geliang Tang <geliang(a)kernel.org> <geliangtang(a)xiaomi.com> +Geliang Tang <geliang(a)kernel.org> <geliangtang(a)gmail.com> +Geliang Tang <geliang(a)kernel.org> <geliangtang(a)163.com> +Geliang Tang <geliang(a)kernel.org> <tanggeliang(a)kylinos.cn> +Jiri Pirko <jiri(a)resnulli.us> <jiri(a)nvidia.com> +Jiri Pirko <jiri(a)resnulli.us> <jiri(a)mellanox.com> +Jiri Pirko <jiri(a)resnulli.us> <jpirko(a)redhat.com> +Kees Cook <kees(a)kernel.org> <kees.cook(a)canonical.com> +Kees Cook <kees(a)kernel.org> <keescook(a)chromium.org> +Kees Cook <kees(a)kernel.org> <keescook(a)google.com> +Kees Cook <kees(a)kernel.org> <kees(a)outflux.net> +Kees Cook <kees(a)kernel.org> <kees(a)ubuntu.com> +Leon Romanovsky <leon(a)kernel.org> <leon(a)leon.nu> +Leon Romanovsky <leon(a)kernel.org> <leonro(a)mellanox.com> +Leon Romanovsky <leon(a)kernel.org> <leonro(a)nvidia.com> +Linus Lüssing <linus.luessing(a)c0d3.blue> <linus.luessing(a)acsom.ch> +Linus Lüssing <linus.luessing(a)c0d3.blue> <linus.luessing(a)ascom.ch> +Linus Lüssing <linus.luessing(a)c0d3.blue> <linus.luessing(a)web.de> +Linus Lüssing <linus.luessing(a)c0d3.blue> <ll(a)simonwunderlich.de> +Marek Lindner <marek.lindner(a)mailbox.org> <lindner_marek(a)yahoo.de> +Marek Lindner <marek.lindner(a)mailbox.org> <mareklindner(a)neomailbox.ch> +Markus Schneider-Pargmann <msp(a)baylibre.com> <mpa(a)pengutronix.de> +Nikolay Aleksandrov <razor(a)blackwall.org> <naleksan(a)redhat.com> +Nikolay Aleksandrov <razor(a)blackwall.org> <nikolay(a)redhat.com> +Nikolay Aleksandrov <razor(a)blackwall.org> <nikolay(a)cumulusnetworks.com> +Nikolay Aleksandrov <razor(a)blackwall.org> <nikolay(a)nvidia.com> +Nikolay Aleksandrov <razor(a)blackwall.org> <nikolay(a)isovalent.com> +Oleksij Rempel <linux(a)rempel-privat.de> <bug-track(a)fisher-privat.net> +Oleksij Rempel <linux(a)rempel-privat.de> <external.Oleksij.Rempel(a)de.bosch.com> +Oleksij Rempel <linux(a)rempel-privat.de> <fixed-term.Oleksij.Rempel(a)de.bosch.com> +Oleksij Rempel <o.rempel(a)pengutronix.de> +Oleksij Rempel <o.rempel(a)pengutronix.de> <ore(a)pengutronix.de> +Paul E. McKenney <paulmck(a)kernel.org> <paul.mckenney(a)linaro.org> +Paul E. McKenney <paulmck(a)kernel.org> <paulmck(a)linux.ibm.com> +Paul E. McKenney <paulmck(a)kernel.org> <paulmck(a)linux.vnet.ibm.com> +Paul E. McKenney <paulmck(a)kernel.org> <paulmck(a)us.ibm.com> +Randy Dunlap <rdunlap(a)infradead.org> <rdunlap(a)xenotime.net> +Randy Dunlap <rdunlap(a)infradead.org> <randy.dunlap(a)oracle.com> +Randy Dunlap <rdunlap(a)infradead.org> <rddunlap(a)osdl.org> +Randy Dunlap <rdunlap(a)infradead.org> <randy.dunlap(a)intel.com> +Simon Wunderlich <sw(a)simonwunderlich.de> <simon(a)open-mesh.com> +Simon Wunderlich <sw(a)simonwunderlich.de> <simon.wunderlich(a)open-mesh.com> +Simon Wunderlich <sw(a)simonwunderlich.de> <simon.wunderlich(a)s2003.tu-chemnitz.de> +Simon Wunderlich <sw(a)simonwunderlich.de> <siwu(a)hrz.tu-chemnitz.de> +Sven Eckelmann <sven(a)narfation.org> <sven.eckelmann(a)gmx.de> +Sven Eckelmann <sven(a)narfation.org> <sven.eckelmann(a)open-mesh.com> +Sven Eckelmann <sven(a)narfation.org> <sven.eckelmann(a)openmesh.com> +Sven Eckelmann <sven(a)narfation.org> <sven(a)open-mesh.com> --- base-commit: c37dff40d07fbceb9d8b5d872f971ecc54da7fcc change-id: 20250107-mailmap-d61a1fc2db80 Best regards, -- Sven Eckelmann <sven(a)narfation.org>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N