commits November 2024

commits@lists.open-mesh.org

1 participants
40 discussions

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.12-5482-geba4cebdaff0e
by postmaster＠open-mesh.org 23 Nov '24

23 Nov '24

The following commit has been merged in the batadv/net-next branch: commit 276d3ec64e5b64101d01a4911b4bc0039bad0117 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Oct 16 09:16:07 2024 +0200 batman-adv: Start new development cycle This version will contain all the (major or even only minor) changes for Linux 6.14. The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0). Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 97ea71a052f8c..1fbe3a4dd9650 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2024.3" +#define BATADV_SOURCE_VERSION "2025.0" #endif /* B.A.T.M.A.N. parameters */ -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net, updated. v6.12-5483-gca315a86cd75a
by postmaster＠open-mesh.org 23 Nov '24

23 Nov '24

The following commit has been merged in the batadv/net branch: commit 408da71f71465bbd6c12583e0fdf125ab3c77d83 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Wed Nov 20 18:47:15 2024 +0100 batman-adv: Remove uninitialized data in full table TT response The number of entries filled by batadv_tt_tvlv_generate() can be less than initially expected in batadv_tt_prepare_tvlv_{global,local}_data() (changes can be removed by batadv_tt_local_event() in ADD+DEL sequence in the meantime as the lock held during the whole tvlv global/local data generation). Thus tvlv_len could be bigger than the actual TT entry size that need to be sent so full table TT_RESPONSE could hold invalid TT entries such as below. * 00:00:00:00:00:00 -1 [....] ( 0) 88:12:4e:ad:7e:ba (179) (0x45845380) * 00:00:00:00:78:79 4092 [.W..] ( 0) 88:12:4e:ad:7e:3c (145) (0x8ebadb8b) Remove the extra allocated space to avoid sending uninitialized entries for full table TT_RESPONSE in both batadv_send_other_tt_response() and batadv_send_my_tt_response(). Fixes: 7ea7b4a14275 ("batman-adv: make the TT CRC logic VLAN specific") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 996d1f01171ad..f5201738628ce 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2712,14 +2712,16 @@ static bool batadv_tt_global_valid(const void *entry_ptr, * * Fills the tvlv buff with the tt entries from the specified hash. If valid_cb * is not provided then this becomes a no-op. + * + * Return: Remaining unused length in tvlv_buff. */ -static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, - struct batadv_hashtable *hash, - void *tvlv_buff, u16 tt_len, - bool (*valid_cb)(const void *, - const void *, - u8 *flags), - void *cb_data) +static u16 batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, + struct batadv_hashtable *hash, + void *tvlv_buff, u16 tt_len, + bool (*valid_cb)(const void *, + const void *, + u8 *flags), + void *cb_data) { struct batadv_tt_common_entry *tt_common_entry; struct batadv_tvlv_tt_change *tt_change; @@ -2733,7 +2735,7 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, tt_change = tvlv_buff; if (!valid_cb) - return; + return tt_len; rcu_read_lock(); for (i = 0; i < hash->size; i++) { @@ -2759,6 +2761,8 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, } } rcu_read_unlock(); + + return batadv_tt_len(tt_tot - tt_num_entries); } /** @@ -3029,10 +3033,11 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv, goto out; /* fill the rest of the tvlv with the real TT entries */ - batadv_tt_tvlv_generate(bat_priv, bat_priv->tt.global_hash, - tt_change, tt_len, - batadv_tt_global_valid, - req_dst_orig_node); + tvlv_len -= batadv_tt_tvlv_generate(bat_priv, + bat_priv->tt.global_hash, + tt_change, tt_len, + batadv_tt_global_valid, + req_dst_orig_node); } /* Don't send the response, if larger than fragmented packet. */ @@ -3156,9 +3161,11 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, goto out; /* fill the rest of the tvlv with the real TT entries */ - batadv_tt_tvlv_generate(bat_priv, bat_priv->tt.local_hash, - tt_change, tt_len, - batadv_tt_local_valid, NULL); + tvlv_len -= batadv_tt_tvlv_generate(bat_priv, + bat_priv->tt.local_hash, + tt_change, tt_len, + batadv_tt_local_valid, + NULL); } tvlv_tt_data->flags = BATADV_TT_RESPONSE; -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net, updated. v6.12-5483-gca315a86cd75a
by postmaster＠open-mesh.org 23 Nov '24

23 Nov '24

The following commit has been merged in the batadv/net branch: commit ca315a86cd75a4c6c1fc35eec9d1d99c05b0a0fe Author: Remi Pommarel <repk(a)triplefau.lt> Date: Wed Nov 20 18:47:16 2024 +0100 batman-adv: Do not let TT changes list grows indefinitely When TT changes list is too big to fit in packet due to MTU size, an empty OGM is sent expected other node to send TT request to get the changes. The issue is that tt.last_changeset was not built thus the originator was responding with previous changes to those TT requests (see batadv_send_my_tt_response). Also the changes list was never cleaned up effectively never ending growing from this point onwards, repeatedly sending the same TT response changes over and over, and creating a new empty OGM every OGM interval expecting for the local changes to be purged. When there is more TT changes that can fit in packet, drop all changes, send empty OGM and wait for TT request so we can respond with a full table instead. Fixes: e1bf0c14096f ("batman-adv: tvlv - convert tt data sent within OGMs") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index f5201738628ce..4c11d708f3cc6 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -948,6 +948,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) int tt_diff_len, tt_change_len = 0; int tt_diff_entries_num = 0; int tt_diff_entries_count = 0; + bool drop_changes = false; size_t tt_extra_len = 0; u16 tvlv_len; @@ -955,21 +956,29 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) tt_diff_len = batadv_tt_len(tt_diff_entries_num); /* if we have too many changes for one packet don't send any - * and wait for the tt table request which will be fragmented + * and wait for the tt table request so we can reply with the full + * table. + * + * The local change history should still be cleaned up or it will only + * grow from this point onwards. Also tt.last_changeset should be set + * to NULL so tt response could send the full table instead of diff. */ - if (tt_diff_len > bat_priv->soft_iface->mtu) + if (tt_diff_len > bat_priv->soft_iface->mtu) { tt_diff_len = 0; + tt_diff_entries_num = 0; + drop_changes = true; + } tvlv_len = batadv_tt_prepare_tvlv_local_data(bat_priv, &tt_data, &tt_change, &tt_diff_len); if (!tvlv_len) return; - tt_data->flags = BATADV_TT_OGM_DIFF; - - if (tt_diff_len == 0) + if (!drop_changes && tt_diff_len == 0) goto container_register; + tt_data->flags = BATADV_TT_OGM_DIFF; + spin_lock_bh(&bat_priv->tt.changes_list_lock); atomic_set(&bat_priv->tt.local_changes, 0); -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net, updated. v6.12-5483-gca315a86cd75a
by postmaster＠open-mesh.org 23 Nov '24

23 Nov '24

The following commit has been merged in the batadv/net branch: commit 5c8799a08e08622b4054958fdeeb391a2026e331 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Wed Nov 20 18:47:14 2024 +0100 batman-adv: Do not send uninitialized TT changes The number of TT changes can be less than initially expected in batadv_tt_tvlv_container_update() (changes can be removed by batadv_tt_local_event() in ADD+DEL sequence between reading tt_diff_entries_num and actually iterating the change list under lock). Thus tt_diff_len could be bigger than the actual changes size that need to be sent. Because batadv_send_my_tt_response sends the whole packet, uninitialized data can be interpreted as TT changes on other nodes leading to weird TT global entries on those nodes such as: * 00:00:00:00:00:00 -1 [....] ( 0) 88:12:4e:ad:7e:ba (179) (0x45845380) * 00:00:00:00:78:79 4092 [.W..] ( 0) 88:12:4e:ad:7e:3c (145) (0x8ebadb8b) All of the above also applies to OGM tvlv container buffer's tvlv_len. Remove the extra allocated space to avoid sending uninitialized TT changes in batadv_send_my_tt_response() and batadv_v_ogm_send_softif(). Fixes: e1bf0c14096f ("batman-adv: tvlv - convert tt data sent within OGMs") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index b44c382226a11..996d1f01171ad 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -948,6 +948,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) int tt_diff_len, tt_change_len = 0; int tt_diff_entries_num = 0; int tt_diff_entries_count = 0; + size_t tt_extra_len = 0; u16 tvlv_len; tt_diff_entries_num = atomic_read(&bat_priv->tt.local_changes); @@ -985,6 +986,9 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) } spin_unlock_bh(&bat_priv->tt.changes_list_lock); + tt_extra_len = batadv_tt_len(tt_diff_entries_num - + tt_diff_entries_count); + /* Keep the buffer for possible tt_request */ spin_lock_bh(&bat_priv->tt.last_changeset_lock); kfree(bat_priv->tt.last_changeset); @@ -993,6 +997,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) tt_change_len = batadv_tt_len(tt_diff_entries_count); /* check whether this new OGM has no changes due to size problems */ if (tt_diff_entries_count > 0) { + tt_diff_len -= tt_extra_len; /* if kmalloc() fails we will reply with the full table * instead of providing the diff */ @@ -1005,6 +1010,8 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) } spin_unlock_bh(&bat_priv->tt.last_changeset_lock); + /* Remove extra packet space for OGM */ + tvlv_len -= tt_extra_len; container_register: batadv_tvlv_container_register(bat_priv, BATADV_TVLV_TT, 1, tt_data, tvlv_len); -- linux integration

1 0

[batctl] main,main: batctl: Remove redundant check_root_or_die() (8875385)
by postmaster＠open-mesh.org 22 Nov '24

22 Nov '24

Repository : ssh://git@diktynna/batctl On branches: main,main >--------------------------------------------------------------- commit 8875385485b12da0e1a6a0383d46b381c61b68ab Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Fri Nov 22 15:12:35 2024 -0600 batctl: Remove redundant check_root_or_die() Without running as root, batctl would abort. However, this check has zero value as it is redundant. The kernel will warn us if we don't have permission to manipulate networking via netlink: $ ./batctl if create ra BATMAN_V Error - failed to add create batman-adv interface: Operation not permitted Without this check, it is possible to change networking settings without root with the CAP_NET_ADMIN permission: $ sudo setcap cap_net_admin+eip ./batctl $ ./batctl if create ra BATMAN_V $ ./batctl if add enp6s0 $ ./batctl if enp6s0: active Thus, do not force batctl to run as root. Let the system admin and or user decide how to manage permissions. For those that run batctl as root, nothing changes. Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 8875385485b12da0e1a6a0383d46b381c61b68ab debug.c | 2 -- functions.c | 8 -------- functions.h | 1 - genl_json.c | 2 -- gw_mode.c | 2 -- interface.c | 2 -- loglevel.c | 2 -- ping.c | 2 -- routing_algo.c | 2 -- sys.c | 2 -- tcpdump.c | 2 -- throughputmeter.c | 2 -- traceroute.c | 2 -- translate.c | 2 -- 14 files changed, 33 deletions(-) diff --git a/debug.c b/debug.c index 2fa8975..5629e1f 100644 --- a/debug.c +++ b/debug.c @@ -144,8 +144,6 @@ int handle_debug_table(struct state *state, int argc, char **argv) } } - check_root_or_die("batctl"); - if (read_opt & UNICAST_ONLY && read_opt & MULTICAST_ONLY) { fprintf(stderr, "Error - '-u' and '-m' are exclusive options\n"); debug_table_usage(state); diff --git a/functions.c b/functions.c index 482bdf5..bf6057c 100644 --- a/functions.c +++ b/functions.c @@ -946,14 +946,6 @@ void get_random_bytes(void *buf, size_t buflen) get_random_bytes_fallback(buf, buflen); } -void check_root_or_die(const char *cmd) -{ - if (geteuid() != 0) { - fprintf(stderr, "Error - you must be root to run '%s' !\n", cmd); - exit(EXIT_FAILURE); - } -} - int parse_bool(const char *val, bool *res) { if (strcasecmp(val, "0") == 0 || diff --git a/functions.h b/functions.h index 860d9f4..b85bbf1 100644 --- a/functions.h +++ b/functions.h @@ -60,7 +60,6 @@ int check_mesh_iface(struct state *state); int check_mesh_iface_ownership(struct state *state, char *hard_iface); void get_random_bytes(void *buf, size_t buflen); -void check_root_or_die(const char *cmd); int parse_bool(const char *val, bool *res); bool parse_throughput(char *buff, const char *description, diff --git a/genl_json.c b/genl_json.c index b61acdb..855a218 100644 --- a/genl_json.c +++ b/genl_json.c @@ -598,8 +598,6 @@ int handle_json_query(struct state *state, int argc, char **argv) } } - check_root_or_die("batctl"); - err = netlink_print_query_json(state, json_query); return err; diff --git a/gw_mode.c b/gw_mode.c index 6261a9d..1b102a3 100644 --- a/gw_mode.c +++ b/gw_mode.c @@ -299,8 +299,6 @@ static int gw_mode(struct state *state, int argc, char **argv) if (argc == 1) return gw_read_setting(state); - check_root_or_die("batctl gw_mode"); - res = parse_gw(state, argc, argv); if (res < 0) return EXIT_FAILURE; diff --git a/interface.c b/interface.c index d115247..6f70468 100644 --- a/interface.c +++ b/interface.c @@ -436,8 +436,6 @@ static int interface(struct state *state, int argc, char **argv) if (rest_argc == 0) return print_interfaces(state); - check_root_or_die("batctl interface"); - if ((strcmp(rest_argv[0], "add") != 0) && (strcmp(rest_argv[0], "a") != 0) && (strcmp(rest_argv[0], "del") != 0) && (strcmp(rest_argv[0], "d") != 0) && (strcmp(rest_argv[0], "create") != 0) && (strcmp(rest_argv[0], "c") != 0) && diff --git a/loglevel.c b/loglevel.c index b7ca14f..ab6f033 100644 --- a/loglevel.c +++ b/loglevel.c @@ -128,8 +128,6 @@ static int loglevel(struct state *state, int argc, char **argv) } if (argc != 1) { - check_root_or_die("batctl loglevel"); - for (i = 1; i < argc; i++) { if (strcmp(argv[i], "none") == 0) { log_level_globals.log_level = 0; diff --git a/ping.c b/ping.c index 4cc8e00..f2f6c41 100644 --- a/ping.c +++ b/ping.c @@ -132,8 +132,6 @@ static int ping(struct state *state, int argc, char **argv) return EXIT_FAILURE; } - check_root_or_die("batctl ping"); - dst_string = argv[found_args]; bat_hosts_init(0); bat_host = bat_hosts_find_by_name(dst_string); diff --git a/routing_algo.c b/routing_algo.c index 5d29418..8d1b63e 100644 --- a/routing_algo.c +++ b/routing_algo.c @@ -279,8 +279,6 @@ static int routing_algo(struct state *state, int argc, char **argv) } } - check_root_or_die("batctl routing_algo"); - if (argc == 2) return write_default_ra(SYS_SELECTED_RA_PATH, argv[1]); diff --git a/sys.c b/sys.c index dbbdeb3..dcef51f 100644 --- a/sys.c +++ b/sys.c @@ -245,8 +245,6 @@ int handle_sys_setting(struct state *state, int argc, char **argv) if (argc == 1) return sys_read_setting(state); - check_root_or_die("batctl"); - if (settings->parse) { res = settings->parse(state, argc, argv); if (res < 0) diff --git a/tcpdump.c b/tcpdump.c index 3b9ded5..d4e805d 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1539,8 +1539,6 @@ static int tcpdump(struct state *state __maybe_unused, int argc, char **argv) return EXIT_FAILURE; } - check_root_or_die("batctl tcpdump"); - bat_hosts_init(read_opt); signal(SIGINT, sig_handler); diff --git a/throughputmeter.c b/throughputmeter.c index f3aa09a..4f3dc50 100644 --- a/throughputmeter.c +++ b/throughputmeter.c @@ -352,8 +352,6 @@ static int throughputmeter(struct state *state, int argc, char **argv) return EXIT_FAILURE; } - check_root_or_die("batctl throughputmeter"); - dst_string = argv[found_args]; bat_hosts_init(read_opt); bat_host = bat_hosts_find_by_name(dst_string); diff --git a/traceroute.c b/traceroute.c index 4a6f4cf..2409c30 100644 --- a/traceroute.c +++ b/traceroute.c @@ -83,8 +83,6 @@ static int traceroute(struct state *state, int argc, char **argv) return EXIT_FAILURE; } - check_root_or_die("batctl traceroute"); - dst_string = argv[found_args]; bat_hosts_init(read_opt); bat_host = bat_hosts_find_by_name(dst_string); diff --git a/translate.c b/translate.c index 9228863..0101724 100644 --- a/translate.c +++ b/translate.c @@ -32,8 +32,6 @@ static int translate(struct state *state, int argc, char **argv) return EXIT_FAILURE; } - check_root_or_die("batctl translate"); - dst_string = argv[1]; bat_hosts_init(0); bat_host = bat_hosts_find_by_name(dst_string);

1 0

[linux-merge]linux integration; branch, batadv/net, updated. v6.12-rc1-116-g3d654a51cd812
by postmaster＠open-mesh.org 20 Nov '24

20 Nov '24

The following commit has been merged in the batadv/net branch: commit 3d654a51cd812ae7bac72efcdf2384029e267d53 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Wed Nov 20 18:47:16 2024 +0100 batman-adv: Do not let TT changes list grows indefinitely When TT changes list is too big to fit in packet due to MTU size, an empty OGM is sent expected other node to send TT request to get the changes. The issue is that tt.last_changeset was not built thus the originator was responding with previous changes to those TT requests (see batadv_send_my_tt_response). Also the changes list was never cleaned up effectively never ending growing from this point onwards, repeatedly sending the same TT response changes over and over, and creating a new empty OGM every OGM interval expecting for the local changes to be purged. When there is more TT changes that can fit in packet, drop all changes, send empty OGM and wait for TT request so we can respond with a full table instead. Fixes: e1bf0c14096f ("batman-adv: tvlv - convert tt data sent within OGMs") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index bbab7491c83fb..d7b43868b6247 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -990,6 +990,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) int tt_diff_len, tt_change_len = 0; int tt_diff_entries_num = 0; int tt_diff_entries_count = 0; + bool drop_changes = false; size_t tt_extra_len = 0; u16 tvlv_len; @@ -997,21 +998,29 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) tt_diff_len = batadv_tt_len(tt_diff_entries_num); /* if we have too many changes for one packet don't send any - * and wait for the tt table request which will be fragmented + * and wait for the tt table request so we can reply with the full + * table. + * + * The local change history should still be cleaned up or it will only + * grow from this point onwards. Also tt.last_changeset should be set + * to NULL so tt response could send the full table instead of diff. */ - if (tt_diff_len > bat_priv->soft_iface->mtu) + if (tt_diff_len > bat_priv->soft_iface->mtu) { tt_diff_len = 0; + tt_diff_entries_num = 0; + drop_changes = true; + } tvlv_len = batadv_tt_prepare_tvlv_local_data(bat_priv, &tt_data, &tt_change, &tt_diff_len); if (!tvlv_len) return; - tt_data->flags = BATADV_TT_OGM_DIFF; - - if (tt_diff_len == 0) + if (!drop_changes && tt_diff_len == 0) goto container_register; + tt_data->flags = BATADV_TT_OGM_DIFF; + spin_lock_bh(&bat_priv->tt.changes_list_lock); atomic_set(&bat_priv->tt.local_changes, 0); -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.12-rc7-1777-g9aa2560d5cb45
by postmaster＠open-mesh.org 20 Nov '24

20 Nov '24

The following commit has been merged in the batadv/net-next branch: commit 9aa2560d5cb456378a08dccf5ad2555499f1b02c Author: Remi Pommarel <repk(a)triplefau.lt> Date: Wed Nov 20 18:47:18 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> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index aa5c44e114190..8533deb15ebd0 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -437,7 +437,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); list_for_each_entry_safe(entry, safe, &bat_priv->tt.changes_list, list) { @@ -457,17 +457,21 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, 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! + /* 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 */ - if (!del_op_requested && !del_op_entry) + if (del_op_requested == del_op_entry) { entry->change.flags = flags; + goto discard; + } continue; del: list_del(&entry->list); kmem_cache_free(batadv_tt_change_cache, entry); bat_priv->tt.local_changes--; +discard: kmem_cache_free(batadv_tt_change_cache, tt_change_node); goto unlock; } -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.12-rc7-1777-g9aa2560d5cb45
by postmaster＠open-mesh.org 20 Nov '24

20 Nov '24

The following commit has been merged in the batadv/net-next branch: commit 7308dc953fe0aac1e737288d347f659132ece46c Author: Remi Pommarel <repk(a)triplefau.lt> Date: Wed Nov 20 18:47:15 2024 +0100 TODO: REMOVE: batman-adv: Remove uninitialized data in full table TT response The number of entries filled by batadv_tt_tvlv_generate() can be less than initially expected in batadv_tt_prepare_tvlv_{global,local}_data() (changes can be removed by batadv_tt_local_event() in ADD+DEL sequence in the meantime as the lock held during the whole tvlv global/local data generation). Thus tvlv_len could be bigger than the actual TT entry size that need to be sent so full table TT_RESPONSE could hold invalid TT entries such as below. * 00:00:00:00:00:00 -1 [....] ( 0) 88:12:4e:ad:7e:ba (179) (0x45845380) * 00:00:00:00:78:79 4092 [.W..] ( 0) 88:12:4e:ad:7e:3c (145) (0x8ebadb8b) Remove the extra allocated space to avoid sending uninitialized entries for full table TT_RESPONSE in both batadv_send_other_tt_response() and batadv_send_my_tt_response(). Fixes: 7ea7b4a14275 ("batman-adv: make the TT CRC logic VLAN specific") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 996d1f01171ad..f5201738628ce 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2712,14 +2712,16 @@ static bool batadv_tt_global_valid(const void *entry_ptr, * * Fills the tvlv buff with the tt entries from the specified hash. If valid_cb * is not provided then this becomes a no-op. + * + * Return: Remaining unused length in tvlv_buff. */ -static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, - struct batadv_hashtable *hash, - void *tvlv_buff, u16 tt_len, - bool (*valid_cb)(const void *, - const void *, - u8 *flags), - void *cb_data) +static u16 batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, + struct batadv_hashtable *hash, + void *tvlv_buff, u16 tt_len, + bool (*valid_cb)(const void *, + const void *, + u8 *flags), + void *cb_data) { struct batadv_tt_common_entry *tt_common_entry; struct batadv_tvlv_tt_change *tt_change; @@ -2733,7 +2735,7 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, tt_change = tvlv_buff; if (!valid_cb) - return; + return tt_len; rcu_read_lock(); for (i = 0; i < hash->size; i++) { @@ -2759,6 +2761,8 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, } } rcu_read_unlock(); + + return batadv_tt_len(tt_tot - tt_num_entries); } /** @@ -3029,10 +3033,11 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv, goto out; /* fill the rest of the tvlv with the real TT entries */ - batadv_tt_tvlv_generate(bat_priv, bat_priv->tt.global_hash, - tt_change, tt_len, - batadv_tt_global_valid, - req_dst_orig_node); + tvlv_len -= batadv_tt_tvlv_generate(bat_priv, + bat_priv->tt.global_hash, + tt_change, tt_len, + batadv_tt_global_valid, + req_dst_orig_node); } /* Don't send the response, if larger than fragmented packet. */ @@ -3156,9 +3161,11 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, goto out; /* fill the rest of the tvlv with the real TT entries */ - batadv_tt_tvlv_generate(bat_priv, bat_priv->tt.local_hash, - tt_change, tt_len, - batadv_tt_local_valid, NULL); + tvlv_len -= batadv_tt_tvlv_generate(bat_priv, + bat_priv->tt.local_hash, + tt_change, tt_len, + batadv_tt_local_valid, + NULL); } tvlv_tt_data->flags = BATADV_TT_RESPONSE; -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.12-rc7-1777-g9aa2560d5cb45
by postmaster＠open-mesh.org 20 Nov '24

20 Nov '24

The following commit has been merged in the batadv/net-next branch: commit 75c498b4d473936c54a7f691f39dbc93fe0ba263 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Wed Nov 20 18:47:17 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> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 2758aba47a2f2..2575f13992d27 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); + 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 4c11d708f3cc6..aa5c44e114190 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -423,7 +423,6 @@ 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; tt_change_node = kmem_cache_alloc(batadv_tt_change_cache, GFP_ATOMIC); @@ -468,21 +467,17 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, del: list_del(&entry->list); kmem_cache_free(batadv_tt_change_cache, entry); + bat_priv->tt.local_changes--; kmem_cache_free(batadv_tt_change_cache, tt_change_node); - event_removed = true; goto unlock; } /* track the change in the OGMinterval list */ list_add_tail(&tt_change_node->list, &bat_priv->tt.changes_list); + bat_priv->tt.local_changes++; unlock: 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); } /** @@ -952,7 +947,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 @@ -980,7 +975,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) tt_data->flags = BATADV_TT_OGM_DIFF; spin_lock_bh(&bat_priv->tt.changes_list_lock); - atomic_set(&bat_priv->tt.local_changes, 0); + bat_priv->tt.local_changes = 0; list_for_each_entry_safe(entry, safe, &bat_priv->tt.changes_list, list) { @@ -1396,7 +1391,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); + bat_priv->tt.local_changes = 0; spin_unlock_bh(&bat_priv->tt.changes_list_lock); } @@ -3657,7 +3652,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) < 1) { 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 04f6398b3a40e..f491bff8c51b8 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 */ -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.12-rc7-1777-g9aa2560d5cb45
by postmaster＠open-mesh.org 20 Nov '24

20 Nov '24

The following commit has been merged in the batadv/net-next branch: commit 36d3820f745f61c8554404f820954c381aaaa8c5 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Wed Nov 20 18:47:16 2024 +0100 TODO: REMOVE: batman-adv: Do not let TT changes list grows indefinitely When TT changes list is too big to fit in packet due to MTU size, an empty OGM is sent expected other node to send TT request to get the changes. The issue is that tt.last_changeset was not built thus the originator was responding with previous changes to those TT requests (see batadv_send_my_tt_response). Also the changes list was never cleaned up effectively never ending growing from this point onwards, repeatedly sending the same TT response changes over and over, and a creating a new empty OGM every OGM interval expecting for the local changes to be purged. When there is more TT changes that can fit in packet, drop all changes, send empty OGM and wait for TT request so we can respond with a full table instead. Fixes: e1bf0c14096f ("batman-adv: tvlv - convert tt data sent within OGMs") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index f5201738628ce..4c11d708f3cc6 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -948,6 +948,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) int tt_diff_len, tt_change_len = 0; int tt_diff_entries_num = 0; int tt_diff_entries_count = 0; + bool drop_changes = false; size_t tt_extra_len = 0; u16 tvlv_len; @@ -955,21 +956,29 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) tt_diff_len = batadv_tt_len(tt_diff_entries_num); /* if we have too many changes for one packet don't send any - * and wait for the tt table request which will be fragmented + * and wait for the tt table request so we can reply with the full + * table. + * + * The local change history should still be cleaned up or it will only + * grow from this point onwards. Also tt.last_changeset should be set + * to NULL so tt response could send the full table instead of diff. */ - if (tt_diff_len > bat_priv->soft_iface->mtu) + if (tt_diff_len > bat_priv->soft_iface->mtu) { tt_diff_len = 0; + tt_diff_entries_num = 0; + drop_changes = true; + } tvlv_len = batadv_tt_prepare_tvlv_local_data(bat_priv, &tt_data, &tt_change, &tt_diff_len); if (!tvlv_len) return; - tt_data->flags = BATADV_TT_OGM_DIFF; - - if (tt_diff_len == 0) + if (!drop_changes && tt_diff_len == 0) goto container_register; + tt_data->flags = BATADV_TT_OGM_DIFF; + spin_lock_bh(&bat_priv->tt.changes_list_lock); atomic_set(&bat_priv->tt.local_changes, 0); -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2024