commits

commits@lists.open-mesh.org

1 participants
12372 discussions

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.13-rc1-5-gbf2a5a622a50b
by postmaster＠open-mesh.org 17 Dec '24

17 Dec '24

The following commit has been merged in the batadv/net-next branch: commit bf2a5a622a50b47560e4b29387b2fd4cfb33881a Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Dec 16 19:37:12 2024 +0100 batman-adv: Map VID 0 to untagged TT VLAN VID 0 is not a valid VLAN according to "802.1Q-2011" "Table 9-2—Reserved VID values". It is only used to indicate "priority tag" frames which only contain priority information and no VID. The 8021q is also redirecting the priority tagged frames to the underlying interface since commit ad1afb003939 ("vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)"). But at the same time, it automatically adds the VID 0 to all devices to ensure that VID 0 is in the allowed list of the HW filter. This resulted in a VLAN 0 which was always announced in OGM messages. batman-adv should therefore not create a new batadv_softif_vlan for VID 0 and handle all VID 0 related frames using the "untagged" global/local translation tables. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Antonio Quartulli <antonio(a)mandelbit.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 8e0f44c71696f..333e947afcce7 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -637,6 +637,13 @@ unsigned short batadv_get_vid(struct sk_buff *skb, size_t header_len) vhdr = (struct vlan_ethhdr *)(skb->data + header_len); vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK; + + /* VID 0 is only used to indicate "priority tag" frames which only + * contain priority information and no VID. + */ + if (vid == 0) + return BATADV_NO_FLAGS; + vid |= BATADV_VLAN_HAS_TAG; return vid; diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 5666c268cead2..822d788a5f86b 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -637,6 +637,14 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto, if (proto != htons(ETH_P_8021Q)) return -EINVAL; + /* VID 0 is only used to indicate "priority tag" frames which only + * contain priority information and no VID. No management structures + * should be created for this VID and it should be handled like an + * untagged frame. + */ + if (vid == 0) + return 0; + vid |= BATADV_VLAN_HAS_TAG; /* if a new vlan is getting created and it already exists, it means that @@ -684,6 +692,12 @@ static int batadv_interface_kill_vid(struct net_device *dev, __be16 proto, if (proto != htons(ETH_P_8021Q)) return -EINVAL; + /* "priority tag" frames are handled like "untagged" frames + * and no softif_vlan needs to be destroyed + */ + if (vid == 0) + return 0; + vlan = batadv_softif_vlan_get(bat_priv, vid | BATADV_VLAN_HAS_TAG); if (!vlan) return -ENOENT; -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v6.13-rc3, created. v6.13-rc3
by postmaster＠open-mesh.org 16 Dec '24

16 Dec '24

The annotated tag, v6.13-rc3 has been created at 7705f2f1cf8d49dd02236dce6edad6c013b43293 (tag) tagging 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 (commit) replaces v6.13-rc2 tagged by Linus Torvalds on Sun Dec 15 15:58:23 2024 -0800 - Shortlog ------------------------------------------------------------ Linux 6.13-rc3 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmdfbR8eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGOOIH/j788VAvWIM+0RdL PcKlFdfTucdHHS4P19WT9FvK3CQw025xyliY0YFyXreCXwIu/lGGC6OW+tV7aC8c EWJPqP+kJuLStfm3vpXbEnPql1K1IOW8CfeKhLgbPW2K+BFSX1BFbm9lJ6DQo3JS GMvgn9NE7ssJ6o4Do6mICHkcOxGq39fFYxhdlB/QVro3dPWfYffDivlGhycePBle ZXWWebLlEA9pMd7xw4LJImb1huhxt1rdBzQtmInpIGP2J6CDJ4nXJdiLib/TprWO Wg1HRDrIIegMEm/xC6M0D9RmH3NGJ5AB54qnzG6nXDEPMurcBkTR6EcnQitYmp9c 7O1z9JI= =Go2H -----END PGP SIGNATURE----- Remi Pommarel (3): batman-adv: Do not send uninitialized TT changes batman-adv: Remove uninitialized data in full table TT response batman-adv: Do not let TT changes list grows indefinitely ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.13-rc1-5-g62accacc8d5e8
by postmaster＠open-mesh.org 16 Dec '24

16 Dec '24

The following commit has been merged in the batadv/net-next branch: commit 62accacc8d5e8d2d5730a47b9e1b738d224e1b85 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Dec 16 19:37:12 2024 +0100 batman-adv: Map VID 0 to untagged TT VLAN VID 0 is not a valid VLAN according to "802.1Q-2011" "Table 9-2—Reserved VID values". It is only used to indicate "priority tag" frames which only contain priority information and no VID. The 8021q is also redirecting the priority tagged frames to the underlying interface since commit ad1afb003939 ("vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)"). But at the same time, it automatically adds the VID 0 to all devices to ensure that VID 0 is in the allowed list of the HW filter. This resulted in a VLAN 0 which was always announced in OGM messages. batman-adv should therefore not create a new batadv_softif_vlan for VID 0 and handle all VID 0 related frames using the "untagged" global/local translation tables. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 8e0f44c71696f..333e947afcce7 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -637,6 +637,13 @@ unsigned short batadv_get_vid(struct sk_buff *skb, size_t header_len) vhdr = (struct vlan_ethhdr *)(skb->data + header_len); vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK; + + /* VID 0 is only used to indicate "priority tag" frames which only + * contain priority information and no VID. + */ + if (vid == 0) + return BATADV_NO_FLAGS; + vid |= BATADV_VLAN_HAS_TAG; return vid; diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 5666c268cead2..822d788a5f86b 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -637,6 +637,14 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto, if (proto != htons(ETH_P_8021Q)) return -EINVAL; + /* VID 0 is only used to indicate "priority tag" frames which only + * contain priority information and no VID. No management structures + * should be created for this VID and it should be handled like an + * untagged frame. + */ + if (vid == 0) + return 0; + vid |= BATADV_VLAN_HAS_TAG; /* if a new vlan is getting created and it already exists, it means that @@ -684,6 +692,12 @@ static int batadv_interface_kill_vid(struct net_device *dev, __be16 proto, if (proto != htons(ETH_P_8021Q)) return -EINVAL; + /* "priority tag" frames are handled like "untagged" frames + * and no softif_vlan needs to be destroyed + */ + if (vid == 0) + return 0; + vlan = batadv_softif_vlan_get(bat_priv, vid | BATADV_VLAN_HAS_TAG); if (!vlan) return -ENOENT; -- linux integration

1 0

[batman-adv] main,main: batman-adv: Don't keep redundant TT change events (4e395d4d)
by postmaster＠open-mesh.org 10 Dec '24

10 Dec '24

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit 4e395d4d6908da373f00752c363c82ccf99a427e Author: Remi Pommarel <repk(a)triplefau.lt> Date: Fri Nov 22 16:52:52 2024 +0100 batman-adv: Don't keep redundant TT change events When adding a local TT twice within the same OGM interval (e.g. happens when flag get updated), the flags of the first TT change entry is updated with the second one and both change events is added to the change list. This leads to having the same ADD change entry twice. Similarly, a DEL+DEL scenario is also creating twice the same event. Deduplicate ADD+ADD or DEL+DEL scenarios to reduce the TT change events that need to be sent in both OGM and TT response. Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Co-developed-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 4e395d4d6908da373f00752c363c82ccf99a427e net/batman-adv/translation-table.c | 40 +++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index ef18e0d8..9b73268d 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -478,7 +478,7 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, del_op_requested = flags & BATADV_TT_CLIENT_DEL; - /* check for ADD+DEL or DEL+ADD events */ + /* check for ADD+DEL, DEL+ADD, ADD+ADD or DEL+DEL events */ spin_lock_bh(&bat_priv->tt.changes_list_lock); changes = READ_ONCE(bat_priv->tt.local_changes); list_for_each_entry_safe(entry, safe, &bat_priv->tt.changes_list, @@ -486,30 +486,26 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, if (!batadv_compare_eth(entry->change.addr, common->addr)) continue; - /* DEL+ADD in the same orig interval have no effect and can be - * removed to avoid silly behaviour on the receiver side. The - * other way around (ADD+DEL) can happen in case of roaming of - * a client still in the NEW state. Roaming of NEW clients is - * now possible due to automatically recognition of "temporary" - * clients - */ del_op_entry = entry->change.flags & BATADV_TT_CLIENT_DEL; - if (!del_op_requested && del_op_entry) - goto del; - if (del_op_requested && !del_op_entry) - goto del; - - /* this is a second add in the same originator interval. It - * means that flags have been changed: update them! - */ - if (!del_op_requested && !del_op_entry) + if (del_op_requested != del_op_entry) { + /* DEL+ADD in the same orig interval have no effect and + * can be removed to avoid silly behaviour on the + * receiver side. The other way around (ADD+DEL) can + * happen in case of roaming of a client still in the + * NEW state. Roaming of NEW clients is now possible due + * to automatically recognition of "temporary" clients + */ + list_del(&entry->list); + kmem_cache_free(batadv_tt_change_cache, entry); + changes--; + } else { + /* this is a second add or del in the same originator + * interval. It could mean that flags have been changed + * (e.g. double add): update them + */ entry->change.flags = flags; + } - continue; -del: - list_del(&entry->list); - kmem_cache_free(batadv_tt_change_cache, entry); - changes--; kmem_cache_free(batadv_tt_change_cache, tt_change_node); goto update_changes; }

1 0

[batman-adv] main,main: batman-adv: Remove atomic usage for tt.local_changes (117fe2fe)
by postmaster＠open-mesh.org 10 Dec '24

10 Dec '24

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit 117fe2fe61076029144a390cdbe189136510cc26 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Fri Nov 22 16:52:51 2024 +0100 batman-adv: Remove atomic usage for tt.local_changes The tt.local_changes atomic is either written with tt.changes_list_lock or close to it (see batadv_tt_local_event()). Thus the performance gain using an atomic was limited (or because of atomic_read() impact even negative). Using atomic also comes with the need to be wary of potential negative tt.local_changes value. Simplify the tt.local_changes usage by removing the atomic property and modifying it only with tt.changes_list_lock held. Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 117fe2fe61076029144a390cdbe189136510cc26 net/batman-adv/soft-interface.c | 2 +- net/batman-adv/translation-table.c | 24 +++++++++++------------- net/batman-adv/types.h | 4 ++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 610bbaaa..1f06861b 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -783,13 +783,13 @@ static int batadv_softif_init_late(struct net_device *dev) atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE); atomic_set(&bat_priv->bcast_seqno, 1); atomic_set(&bat_priv->tt.vn, 0); - atomic_set(&bat_priv->tt.local_changes, 0); atomic_set(&bat_priv->tt.ogm_append_cnt, 0); #ifdef CONFIG_BATMAN_ADV_BLA atomic_set(&bat_priv->bla.num_requests, 0); #endif atomic_set(&bat_priv->tp_num, 0); + WRITE_ONCE(bat_priv->tt.local_changes, 0); bat_priv->tt.last_changeset = NULL; bat_priv->tt.last_changeset_len = 0; bat_priv->isolation_mark = 0; diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index e5cb650c..ef18e0d8 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -463,8 +463,8 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, struct batadv_tt_change_node *tt_change_node, *entry, *safe; struct batadv_tt_common_entry *common = &tt_local_entry->common; u8 flags = common->flags | event_flags; - bool event_removed = false; bool del_op_requested, del_op_entry; + size_t changes; tt_change_node = kmem_cache_alloc(batadv_tt_change_cache, GFP_ATOMIC); if (!tt_change_node) @@ -480,6 +480,7 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, /* check for ADD+DEL or DEL+ADD events */ spin_lock_bh(&bat_priv->tt.changes_list_lock); + changes = READ_ONCE(bat_priv->tt.local_changes); list_for_each_entry_safe(entry, safe, &bat_priv->tt.changes_list, list) { if (!batadv_compare_eth(entry->change.addr, common->addr)) @@ -508,21 +509,18 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, del: list_del(&entry->list); kmem_cache_free(batadv_tt_change_cache, entry); + changes--; kmem_cache_free(batadv_tt_change_cache, tt_change_node); - event_removed = true; - goto unlock; + goto update_changes; } /* track the change in the OGMinterval list */ list_add_tail(&tt_change_node->list, &bat_priv->tt.changes_list); + changes++; -unlock: +update_changes: + WRITE_ONCE(bat_priv->tt.local_changes, changes); spin_unlock_bh(&bat_priv->tt.changes_list_lock); - - if (event_removed) - atomic_dec(&bat_priv->tt.local_changes); - else - atomic_inc(&bat_priv->tt.local_changes); } /** @@ -992,7 +990,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) size_t tt_extra_len = 0; u16 tvlv_len; - tt_diff_entries_num = atomic_read(&bat_priv->tt.local_changes); + tt_diff_entries_num = READ_ONCE(bat_priv->tt.local_changes); tt_diff_len = batadv_tt_len(tt_diff_entries_num); /* if we have too many changes for one packet don't send any @@ -1019,7 +1017,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) goto container_register; spin_lock_bh(&bat_priv->tt.changes_list_lock); - atomic_set(&bat_priv->tt.local_changes, 0); + WRITE_ONCE(bat_priv->tt.local_changes, 0); list_for_each_entry_safe(entry, safe, &bat_priv->tt.changes_list, list) { @@ -1435,7 +1433,7 @@ static void batadv_tt_changes_list_free(struct batadv_priv *bat_priv) kmem_cache_free(batadv_tt_change_cache, entry); } - atomic_set(&bat_priv->tt.local_changes, 0); + WRITE_ONCE(bat_priv->tt.local_changes, 0); spin_unlock_bh(&bat_priv->tt.changes_list_lock); } @@ -3696,7 +3694,7 @@ static void batadv_tt_local_commit_changes_nolock(struct batadv_priv *bat_priv) { lockdep_assert_held(&bat_priv->tt.commit_lock); - if (atomic_read(&bat_priv->tt.local_changes) < 1) { + if (READ_ONCE(bat_priv->tt.local_changes) == 0) { if (!batadv_atomic_dec_not_zero(&bat_priv->tt.ogm_append_cnt)) batadv_tt_tvlv_container_update(bat_priv); return; diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 04f6398b..f491bff8 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1022,7 +1022,7 @@ struct batadv_priv_tt { atomic_t ogm_append_cnt; /** @local_changes: changes registered in an originator interval */ - atomic_t local_changes; + size_t local_changes; /** * @changes_list: tracks tt local changes within an originator interval @@ -1044,7 +1044,7 @@ struct batadv_priv_tt { */ struct list_head roam_list; - /** @changes_list_lock: lock protecting changes_list */ + /** @changes_list_lock: lock protecting changes_list & local_changes */ spinlock_t changes_list_lock; /** @req_list_lock: lock protecting req_list */

1 0

[batman-adv] main,main: batman-adv: Reorder includes for distributed-arp-table.c (fd3a0eff)
by postmaster＠open-mesh.org 10 Dec '24

10 Dec '24

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit fd3a0eff09429719e61e60b7dc3d2a373183a5ad Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Oct 16 09:23:06 2024 +0200 batman-adv: Reorder includes for distributed-arp-table.c The commit ee60832ebec4 ("batman-adv: move asm/unaligned.h to linux/unaligned.h") changed the include without adjusting the order (to match the rest of the file). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- fd3a0eff09429719e61e60b7dc3d2a373183a5ad net/batman-adv/distributed-arp-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 801eff8a..48b72c2b 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -7,7 +7,6 @@ #include "distributed-arp-table.h" #include "main.h" -#include <linux/unaligned.h> #include <linux/atomic.h> #include <linux/bitops.h> #include <linux/byteorder/generic.h> @@ -32,6 +31,7 @@ #include <linux/stddef.h> #include <linux/string.h> #include <linux/udp.h> +#include <linux/unaligned.h> #include <linux/workqueue.h> #include <net/arp.h> #include <net/genetlink.h>

1 0

[batctl] stable's head updated: batctl: Update CHANGELOG for upcoming release (1de39cf)
by postmaster＠open-mesh.org 10 Dec '24

10 Dec '24

Repository : ssh://git@diktynna/batctl Branch 'stable' now includes: 5d2574d batctl: Start new development cycle 18dea5a batctl: Add flex array to struct batadv_tvlv_tt_data 0c1d775 batctl: Apply checkpatch suggestions 1979f34 batctl: Switch to kernel-style variable declarations ec1b6e4 batctl: Fix checkpatch errors 8875385 batctl: Remove redundant check_root_or_die() 1de39cf batctl: Update CHANGELOG for upcoming release

1 0

[batman-adv] stable's head updated: batman-adv: Update compatible kernel version number (cbfe9bb6)
by postmaster＠open-mesh.org 10 Dec '24

10 Dec '24

Repository : ssh://git@diktynna/batman-adv Branch 'stable' now includes: a4f83e23 batman-adv: Start new development cycle 22417ae0 batman-adv: replace call_rcu by kfree_rcu for simple kmem_cache_free callback ee4dcf70 batman-adv: Use string choice helper to print booleans 1f56f328 batman-adv: Add flex array to struct batadv_tvlv_tt_data d6b622d1 Merge branch 'stable' c1a6b008 Merge branch 'stable' 4c4a6026 batman-adv: Drop support for Linux < 5.4 79c6429a batman-adv: Update CHANGELOG for upcoming release cbfe9bb6 batman-adv: Update compatible kernel version number

1 0

[alfred] main,main: alfred: Start new development cycle (5b0179d)
by postmaster＠open-mesh.org 10 Dec '24

10 Dec '24

Repository : ssh://git@diktynna/alfred On branches: main,main >--------------------------------------------------------------- commit 5b0179dcd0d4d252262213cf1806235ea6127d08 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Dec 10 14:58:16 2024 +0100 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 5b0179dcd0d4d252262213cf1806235ea6127d08 alfred.h | 2 +- gpsd/alfred-gpsd.h | 2 +- vis/vis.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index ced861e..7f29f10 100644 --- a/alfred.h +++ b/alfred.h @@ -7,7 +7,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2024.4" +#define SOURCE_VERSION "2025.0" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 45a51e9..0ae8efe 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -25,7 +25,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2024.4" +#define SOURCE_VERSION "2025.0" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index 34ce200..ae695e5 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -14,7 +14,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2024.4" +#define SOURCE_VERSION "2025.0" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

1 0

[alfred] tag 'v2024.4' created
by postmaster＠open-mesh.org 10 Dec '24

10 Dec '24

Repository : ssh://git@diktynna/alfred New tag : v2024.4 Referencing: afffa8962efea55d5c511404e0eaefe51fbfd19c

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits