B.A.T.M.A.N. V - fallback to tp meter estimation if throughput otherwise not available
v4 cover B.A.T.M.A.N. V - fallback to tp meter estimation if throughput otherwise not available
Under normal circumstances B.A.T.M.A.N. V retrieves the neighbor throughput values to populate its metric tables from the various drivers such as WiFi throughput tables and Ethernet throughput.. Whenever the interface drivers do not export link throughput information manual overrides become necessary. To further automate and thus better support these setups, ELP may call the batman-adv throughput meter to schedule a throughput estimation to be used to populate the metric table.
v4:
* read tp measurement result only once
v3:
* fix ELP tp meter result computation
* use batadv_has_timed_out() instead of custom implementation
* set ELP tp meter test duration to 1000ms in patch #6
* add comment explaining periodic scheduling
v2:
* added sysfs attribute to configure tp meter test duration
* fixed null pointer dereference in TP meter packet sending routine
* fixed storing the measured throughput in the correct variable
* checkpatch/kerneldoc/sparse/smatch cleanup
Antonio Quartulli (3):
batman-adv: tp_meter - prevent concurrent tp_meter sessions by using
workqueue
batman-adv: tp_meter - don't check for existing session
batman-adv: tp_meter - add option to perform one-hop test
Marek Lindner (4):
batman-adv: tp_meter - allow up to 10 queued sessions
batman-adv: tp_meter - add caller distinction
batman-adv: ELP - use tp meter to estimate the throughput if otherwise
not available
batman-adv: ELP - add throughput meter test duration attribute
.../ABI/testing/sysfs-class-net-batman-adv | 7 + include/uapi/linux/batadv_packet.h | 2 + net/batman-adv/bat_v.c | 1 + net/batman-adv/bat_v_elp.c | 69 ++- net/batman-adv/bat_v_elp.h | 21 + net/batman-adv/main.c | 10 +- net/batman-adv/main.h | 7 +- net/batman-adv/netlink.c | 3 +- net/batman-adv/routing.c | 6 +- net/batman-adv/sysfs.c | 3 + net/batman-adv/tp_meter.c | 465 +++++++++++------- net/batman-adv/tp_meter.h | 11 +- net/batman-adv/types.h | 36 ++ 13 files changed, 443 insertions(+), 198 deletions(-)
Signature · 1 line
2.18.0
PATCH v4 1/7 batman-adv: tp_meter - prevent concurrent tp_meter sessions by using workqueue
From: Antonio Quartulli <[email protected]>
To ensure that no more than one tp_meter session runs at the same time, use an ordered workqueue instead of spawning one kthread per session.
--- net/batman-adv/main.c | 10 ++++- net/batman-adv/tp_meter.c | 77 +++++++++++++++++++-------------------- net/batman-adv/tp_meter.h | 3 +- net/batman-adv/types.h | 3 ++ 4 files changed, 50 insertions(+), 43 deletions(-)
net/batman-adv/main.c +8 -2
@@ -91,6 +91,10 @@ static int __init batadv_init(void)if (ret <0 )return ret; + ret =batadv_tp_meter_init (); +if (ret <0 ) + goto err_tp_meter; +INIT_LIST_HEAD (&batadv_hardif_list);batadv_algo_init ();
@@ -99,7 +103,6 @@ static int __init batadv_init(void)batadv_v_init ();batadv_iv_init ();batadv_nc_init (); -batadv_tp_meter_init (); batadv_event_workqueue =create_singlethread_workqueue ("bat_events" );if (!batadv_event_workqueue)
@@ -118,9 +121,11 @@ static int __init batadv_init(void)return 0 ; err_create_wq: +batadv_tp_meter_destroy (); +err_tp_meter:batadv_tt_cache_destroy (); -return -ENOMEM ; +return ret; } static void __exit batadv_exit(void)
@@ -138,6 +143,7 @@ static void __exit batadv_exit(void)rcu_barrier ();batadv_tt_cache_destroy (); +batadv_tp_meter_destroy (); }/**
net/batman-adv/tp_meter.c +37 -40
130 lines not on this page · raw message
net/batman-adv/tp_meter.h +2 -1
@@ -25,7 +25,8 @@struct sk_buff ; -void batadv_tp_meter_init (void ); +int batadv_tp_meter_init (void ); +void batadv_tp_meter_destroy (void );void batadv_tp_start (struct batadv_priv *bat_priv,const u8 *dst,u32 test_length,u32 *cookie); void batadv_tp_stop(struct batadv_priv *bat_priv, const u8 *dst,
net/batman-adv/types.h +3 -0
@@ -1355,6 +1355,9 @@ struct batadv_tp_vars {/** @finish_work: work item for the finishing procedure */ struct delayed_work finish_work; +/** @test_work: work item for the test process */ +struct work_struct test_work; +/** @test_length: test length in milliseconds */ u32 test_length;
Signature · 1 line
2.18.0
PATCH v4 2/7 batman-adv: tp_meter - don't check for existing session
In reply to Marek LindnerFrom: Antonio Quartulli <[email protected]>
Since the conversion from kthread to queue worker it is not possible to run more than one "sender" session at a time.
For this reason, checking if another session to the same destination is already scheduled is not useful anymore.
Remove such check and allow the user to enqueue a new session to a previously targeted node.
--- net/batman-adv/tp_meter.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
net/batman-adv/tp_meter.c +1 -18
@@ -939,21 +939,7 @@ void batadv_tp_start(struct batadv_priv *bat_priv, const u8 *dst, session_cookie =batadv_tp_session_cookie (session_id, icmp_uid); *cookie = session_cookie; -/* look for an already existing test towards this node */ -spin_lock_bh (&bat_priv->tp_list_lock); - tp_vars =batadv_tp_list_find (bat_priv, dst); -if (tp_vars) { -spin_unlock_bh (&bat_priv->tp_list_lock); -batadv_tp_vars_put (tp_vars); -batadv_dbg (BATADV_DBG_TP_METER , bat_priv, -"Meter: test to or from the same node already ongoing, aborting\n" ); -batadv_tp_batctl_error_notify (BATADV_TP_REASON_ALREADY_ONGOING , - dst, bat_priv, session_cookie); -return ; - } -if (!atomic_add_unless (&bat_priv->tp_num,1 ,BATADV_TP_MAX_NUM )) { -spin_unlock_bh (&bat_priv->tp_list_lock);batadv_dbg (BATADV_DBG_TP_METER , bat_priv,"Meter: too many ongoing sessions, aborting (SEND)\n" ); batadv_tp_batctl_error_notify(BATADV_TP_REASON_TOO_MANY, dst,
@@ -963,10 +949,6 @@ void batadv_tp_start(struct batadv_priv *bat_priv, const u8 *dst, tp_vars =kmalloc (sizeof (*tp_vars),GFP_ATOMIC );if (!tp_vars) { -spin_unlock_bh (&bat_priv->tp_list_lock); -batadv_dbg (BATADV_DBG_TP_METER , bat_priv, -"Meter: %s cannot allocate list elements\n" , - __func__);batadv_tp_batctl_error_notify (BATADV_TP_REASON_MEMORY_ERROR , dst, bat_priv, session_cookie);return ;
@@ -1021,6 +1003,7 @@ void batadv_tp_start(struct batadv_priv *bat_priv, const u8 *dst,spin_lock_init (&tp_vars->prerandom_lock);kref_get (&tp_vars->refcount); +spin_lock_bh (&bat_priv->tp_list_lock);hlist_add_head_rcu (&tp_vars->list, &bat_priv->tp_list);spin_unlock_bh (&bat_priv->tp_list_lock);
Signature · 1 line
2.18.0
PATCH v4 3/7 batman-adv: tp_meter - allow up to 10 queued sessions
In reply to Marek Lindner--- net/batman-adv/main.h | 6 ++++-- net/batman-adv/tp_meter.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-)
net/batman-adv/main.h +4 -2
@@ -137,9 +137,11 @@#define BATADV_NC_NODE_TIMEOUT 10000/* Milliseconds */ /** -* BATADV_TP_MAX_NUM - maximum number of simultaneously active tp sessions +* BATADV_TP_MAX_NUM_QUEUE - maximum number of queued (outgoing) tp sessions +* BATADV_TP_MAX_NUM_RECV - maximum number of simultaneous receiving streams */ -#define BATADV_TP_MAX_NUM 5 +#define BATADV_TP_MAX_NUM_QUEUE 10 +#define BATADV_TP_MAX_NUM_RECV 1/** * enum batadv_mesh_state - State of a soft interface
net/batman-adv/tp_meter.c +2 -2
@@ -939,7 +939,7 @@ void batadv_tp_start(struct batadv_priv *bat_priv, const u8 *dst, session_cookie =batadv_tp_session_cookie (session_id, icmp_uid); *cookie = session_cookie; -if (!atomic_add_unless (&bat_priv->tp_num,1 ,BATADV_TP_MAX_NUM )) { +if (!atomic_add_unless (&bat_priv->tp_num,1 ,BATADV_TP_MAX_NUM_QUEUE )) {batadv_dbg (BATADV_DBG_TP_METER , bat_priv,"Meter: too many ongoing sessions, aborting (SEND)\n" ); batadv_tp_batctl_error_notify(BATADV_TP_REASON_TOO_MANY, dst,
@@ -1313,7 +1313,7 @@ batadv_tp_init_recv(struct batadv_priv *bat_priv,if (tp_vars) goto out_unlock; -if (!atomic_add_unless (&bat_priv->tp_num,1 ,BATADV_TP_MAX_NUM )) { +if (!atomic_add_unless (&bat_priv->tp_num,1 ,BATADV_TP_MAX_NUM_RECV )) {batadv_dbg (BATADV_DBG_TP_METER , bat_priv,"Meter: too many ongoing sessions, aborting (RECV)\n" ); goto out_unlock;
Signature · 1 line
2.18.0
PATCH v4 4/7 batman-adv: tp_meter - add caller distinction
In reply to Marek LindnerThe throughput meter can be called from user space as well as from the batman-adv kernel module itself. Add infrastructure to handle the different callers.
--- net/batman-adv/netlink.c | 3 +- net/batman-adv/tp_meter.c | 108 ++++++++++++++++++++++---------------- net/batman-adv/tp_meter.h | 3 +- net/batman-adv/types.h | 13 +++++ 4 files changed, 79 insertions(+), 48 deletions(-)
net/batman-adv/netlink.c +2 -1
@@ -378,7 +378,8 @@ batadv_netlink_tp_meter_start(struct sk_buff *skb, struct genl_info *info) } bat_priv =netdev_priv (soft_iface); -batadv_tp_start (bat_priv, dst, test_length, &cookie); +batadv_tp_start (bat_priv, dst, test_length, &cookie, +BATADV_TP_USERSPACE ); ret =batadv_netlink_tp_meter_put (msg, cookie);
net/batman-adv/tp_meter.c +62 -46
165 lines not on this page · raw message
net/batman-adv/tp_meter.h +2 -1
@@ -28,7 +28,8 @@ struct sk_buff;int batadv_tp_meter_init (void );void batadv_tp_meter_destroy (void );void batadv_tp_start (struct batadv_priv *bat_priv,const u8 *dst, -u32 test_length,u32 *cookie); +u32 test_length,u32 *cookie, +enum batadv_tp_meter_caller caller);void batadv_tp_stop (struct batadv_priv *bat_priv,const u8 *dst,u8 return_value);void batadv_tp_meter_recv (struct batadv_priv *bat_priv,struct sk_buff *skb);
net/batman-adv/types.h +13 -0
@@ -1324,6 +1324,16 @@ enum batadv_tp_meter_role { BATADV_TP_SENDER }; +/** +* enum batadv_tp_meter_caller - initiator of the tp meter session +* @BATADV_TP_USERSPACE: initiated by user space +* @BATADV_TP_ELP: initiated by ELP +*/ +enum batadv_tp_meter_caller { +BATADV_TP_USERSPACE , +BATADV_TP_ELP +}; +/** * struct batadv_tp_vars - tp meter private variables per session */
@@ -1346,6 +1356,9 @@ struct batadv_tp_vars {/** @role: receiver/sender modi */ enum batadv_tp_meter_role role; +/** @caller: caller of tp meter session (user space or ELP) */ +enum batadv_tp_meter_caller caller; +/** @sending: sending binary semaphore: 1 if sending, 0 is not */ atomic_t sending;
Signature · 1 line
2.18.0
PATCH v4 5/7 batman-adv: tp_meter - add option to perform one-hop test
In reply to Marek LindnerFrom: Antonio Quartulli <[email protected]>
A link test is a TP session ran over a specific one-hop link, rather than towards an originator in the mesh.
--- include/uapi/linux/batadv_packet.h | 2 + net/batman-adv/netlink.c | 2 +- net/batman-adv/routing.c | 6 +- net/batman-adv/tp_meter.c | 232 +++++++++++++++++++---------- net/batman-adv/tp_meter.h | 5 +- net/batman-adv/types.h | 3 + 6 files changed, 167 insertions(+), 83 deletions(-)
include/uapi/linux/batadv_packet.h +2 -0
@@ -351,10 +351,12 @@ struct batadv_icmp_tp_packet {* enum batadv_icmp_tp_subtype - ICMP TP Meter packet subtypes * @BATADV_TP_MSG: Msg from sender to receiver * @BATADV_TP_ACK: acknowledgment from receiver to sender +* @BATADV_TP_MSG_LINK: Msg from sender to receiver used for link test (one-hop) */ enum batadv_icmp_tp_subtype {BATADV_TP_MSG =0 ,BATADV_TP_ACK , +BATADV_TP_MSG_LINK , };#define BATADV_RR_LEN 16
net/batman-adv/netlink.c +1 -1
@@ -378,7 +378,7 @@ batadv_netlink_tp_meter_start(struct sk_buff *skb, struct genl_info *info) } bat_priv =netdev_priv (soft_iface); -batadv_tp_start (bat_priv, dst, test_length, &cookie, +batadv_tp_start (bat_priv, dst,NULL , test_length, &cookie,BATADV_TP_USERSPACE ); ret =batadv_netlink_tp_meter_put (msg, cookie);
net/batman-adv/routing.c +4 -2
@@ -223,12 +223,14 @@ bool batadv_check_management_packet(struct sk_buff *skb,/** * batadv_recv_my_icmp_packet() - receive an icmp packet locally * @bat_priv: the bat priv with all the soft interface information +* @recv_if: interface that the skb is received on * @skb: icmp packet to process * * Return: NET_RX_SUCCESS if the packet has been consumed or NET_RX_DROP * otherwise. */ static int batadv_recv_my_icmp_packet (struct batadv_priv *bat_priv, +struct batadv_hard_iface *recv_if,struct sk_buff *skb) {struct batadv_hard_iface *primary_if =NULL ;
@@ -281,7 +283,7 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv,if (!pskb_may_pull (skb,sizeof (struct batadv_icmp_tp_packet ))) goto out; -batadv_tp_meter_recv (bat_priv, skb); +batadv_tp_meter_recv (bat_priv, recv_if, skb); ret =NET_RX_SUCCESS ;/* skb was consumed */ skb =NULL ;
@@ -418,7 +420,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,/* packet for me */ if (batadv_is_my_mac (bat_priv, icmph->dst)) -return batadv_recv_my_icmp_packet (bat_priv, skb); +return batadv_recv_my_icmp_packet (bat_priv, recv_if, skb);/* TTL exceeded */ if (icmph->ttl <2 )
net/batman-adv/tp_meter.c +153 -79
455 lines not on this page · raw message
net/batman-adv/tp_meter.h +4 -1
@@ -28,10 +28,13 @@ struct sk_buff;int batadv_tp_meter_init (void );void batadv_tp_meter_destroy (void );void batadv_tp_start (struct batadv_priv *bat_priv,const u8 *dst, +struct batadv_hardif_neigh_node *neigh,u32 test_length,u32 *cookie,enum batadv_tp_meter_caller caller);void batadv_tp_stop (struct batadv_priv *bat_priv,const u8 *dst,u8 return_value); -void batadv_tp_meter_recv (struct batadv_priv *bat_priv,struct sk_buff *skb); +void batadv_tp_meter_recv (struct batadv_priv *bat_priv, +struct batadv_hard_iface *recv_if, +struct sk_buff *skb);#endif /* _NET_BATMAN_ADV_TP_METER_H_ */
net/batman-adv/types.h +3 -0
@@ -1455,6 +1455,9 @@ struct batadv_tp_vars {/** @rcu: struct used for freeing in an RCU-safe manner */ struct rcu_head rcu; + +/** @hardif_neigh: in case of LINK test, represents the other-end */ +struct batadv_hardif_neigh_node *hardif_neigh; };/**
Signature · 1 line
2.18.0
PATCH v4 6/7 batman-adv: ELP - use tp meter to estimate the throughput if otherwise not available
In reply to Marek Lindner--- net/batman-adv/bat_v_elp.c | 67 ++++++++++++++++++++++++++++++++++++-- net/batman-adv/bat_v_elp.h | 21 ++++++++++++ net/batman-adv/main.h | 1 + net/batman-adv/tp_meter.c | 41 ++++++++++++++++++----- net/batman-adv/types.h | 14 ++++++++ 5 files changed, 133 insertions(+), 11 deletions(-)
net/batman-adv/bat_v_elp.c +65 -2
@@ -51,6 +51,7 @@#include "originator.h" #include "routing.h" #include "send.h" +#include "tp_meter.h" /** * batadv_v_elp_start_timer() - restart timer for ELP periodic work
@@ -67,6 +68,42 @@ static void batadv_v_elp_start_timer(struct batadv_hard_iface *hard_iface) msecs_to_jiffies(msecs)); } +/** +* batadv_v_elp_tp_start() - start a tp meter session for a neighbor +* @neigh: neighbor to run tp meter on +*/ +static void batadv_v_elp_tp_start (struct batadv_hardif_neigh_node *neigh) +{ +struct batadv_hard_iface *hard_iface = neigh->if_incoming; +struct batadv_priv *bat_priv =netdev_priv (hard_iface->soft_iface); + + neigh->bat_v.tp_meter_running = true; +batadv_tp_start (bat_priv, neigh->addr, neigh, +1000 ,NULL ,BATADV_TP_ELP ); +} + +/** +* batadv_v_elp_tp_fail() - handle tp meter session failure +* @neigh: neighbor to run tp meter on +*/ +void batadv_v_elp_tp_fail (struct batadv_hardif_neigh_node *neigh) +{ + neigh->bat_v.tp_meter_running = false; +} + +/** +* batadv_v_elp_tp_finish() - post-process tp meter results +* @neigh: neighbor tp meter on +* @throughput: tp meter throughput result +*/ +void batadv_v_elp_tp_finish (struct batadv_hardif_neigh_node *neigh, +u32 throughput) +{ + neigh->bat_v.tp_meter_throughput = throughput; + neigh->bat_v.last_tp_meter_run = jiffies; + neigh->bat_v.tp_meter_running = false; +} +/** * batadv_v_elp_get_throughput() - get the throughput towards a neighbour * @neigh: the neighbour for which the throughput has to be obtained
@@ -112,10 +149,13 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)*/ return 0 ; } + +/* unsupported WiFi driver */ if (ret) - goto default_throughput; + goto fallback_throughput; +if (!(sinfo.filled &BIT (NL80211_STA_INFO_EXPECTED_THROUGHPUT ))) - goto default_throughput; + goto fallback_throughput;return sinfo.expected_throughput /100 ; }
@@ -152,6 +192,29 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)return throughput *10 ; } +fallback_throughput: +/* check the tp_meter_running flag before checking the timestamp to +* avoid a race condition where a new tp meter session is scheduled +* right after the previous tp meter session has completed. +* +* No lock is required because this is the only point where +* batadv_v_elp_tp_start() is invoked and we get here only through a +* periodic timer. This means we will never run this function +* concurrently with itself. +*/ +if (!neigh->bat_v.tp_meter_running && +batadv_has_timed_out (neigh->bat_v.last_tp_meter_run, +BATADV_ELP_TP_RUN_INTERVAL )) +batadv_v_elp_tp_start (neigh); + +/* discard too old tp test results */ +if (batadv_has_timed_out (neigh->bat_v.last_tp_meter_run, +2 *BATADV_ELP_TP_RUN_INTERVAL )) + neigh->bat_v.tp_meter_throughput =0 ; + +if (neigh->bat_v.tp_meter_throughput) +return neigh->bat_v.tp_meter_throughput; + default_throughput:if (!(hard_iface->bat_v.flags &BATADV_WARNING_DEFAULT )) { batadv_info(hard_iface->soft_iface,
net/batman-adv/bat_v_elp.h +21 -0
@@ -21,6 +21,8 @@#include "main.h" +#include <linux/types.h> +struct sk_buff ;struct work_struct ;
@@ -33,4 +35,23 @@ int batadv_v_elp_packet_recv(struct sk_buff *skb, struct batadv_hard_iface *if_incoming);void batadv_v_elp_throughput_metric_update (struct work_struct *work); +#ifdef CONFIG_BATMAN_ADV_BATMAN_V + +void batadv_v_elp_tp_fail (struct batadv_hardif_neigh_node *neigh); +void batadv_v_elp_tp_finish (struct batadv_hardif_neigh_node *neigh, +u32 throughput); + +#else + +static inline void batadv_v_elp_tp_fail (struct batadv_hardif_neigh_node *neigh) +{ +} + +static inline void +batadv_v_elp_tp_finish (struct batadv_hardif_neigh_node *neigh,u32 throughput) +{ +} + +#endif /* CONFIG_BATMAN_ADV_BATMAN_V */ +#endif /* _NET_BATMAN_ADV_BAT_V_ELP_H_ */
net/batman-adv/main.h +1 -0
@@ -69,6 +69,7 @@#define BATADV_ELP_MIN_PROBE_SIZE 200/* bytes */ #define BATADV_ELP_PROBE_MAX_TX_DIFF 100/* milliseconds */ #define BATADV_ELP_MAX_AGE 64 +#define BATADV_ELP_TP_RUN_INTERVAL 60000/* milliseconds */ #define BATADV_OGM_MAX_ORIGDIFF 5#define BATADV_OGM_MAX_AGE 64
net/batman-adv/tp_meter.c +32 -9
98 lines not on this page · raw message
net/batman-adv/types.h +14 -0
@@ -584,6 +584,20 @@ struct batadv_hardif_neigh_node_bat_v {/** @metric_work: work queue callback item for metric update */ struct work_struct metric_work; + +/** +* @tp_meter_running: tp meter measurements towards this neighbor in +* progress +*/ + unsigned char tp_meter_running:1; + +/** +* @last_tp_meter_run: timestamp of last tp meter measurement completion +*/ +unsigned long last_tp_meter_run; + +/** @tp_meter_throughput: throughput information measured by tp meter */ +unsigned long tp_meter_throughput; };/**
Signature · 1 line
2.18.0
PATCH v4 7/7 batman-adv: ELP - add throughput meter test duration attribute
In reply to Marek LindnerWhen the ELP throughput meter fallback kicks in to trigger a throughput meter measurement the test duration can be configured via this attribute.
Default tp test duration: 1000ms
--- Documentation/ABI/testing/sysfs-class-net-batman-adv | 7 +++++++ net/batman-adv/bat_v.c | 1 + net/batman-adv/bat_v_elp.c | 6 ++++-- net/batman-adv/sysfs.c | 3 +++ net/batman-adv/types.h | 3 +++ 5 files changed, 18 insertions(+), 2 deletions(-)
Documentation/ABI/testing/sysfs-class-net-batman-adv +7 -0
@@ -6,6 +6,13 @@ Description: Defines the interval in milliseconds in which batman emits probing packets for neighbor sensing (ELP). +What: /sys/class/net/<iface>/batman-adv/elp_tp_duration +Date: May 2018 +Contact: Marek Lindner <[email protected]> +Description: + Defines measurement duration in milliseconds upon + ELP fallback throughput meter measurements. + What: /sys/class/net/<iface>/batman-adv/iface_status Date: May 2010 Contact: Marek Lindner <[email protected]>
net/batman-adv/bat_v.c +1 -0
@@ -1086,6 +1086,7 @@ void batadv_v_hardif_init(struct batadv_hard_iface *hard_iface)*/ atomic_set (&hard_iface->bat_v.throughput_override,0 );atomic_set (&hard_iface->bat_v.elp_interval,500 ); +atomic_set (&hard_iface->bat_v.elp_tp_duration,1000 ); }/**
net/batman-adv/bat_v_elp.c +4 -2
@@ -76,10 +76,12 @@ static void batadv_v_elp_tp_start(struct batadv_hardif_neigh_node *neigh) {struct batadv_hard_iface *hard_iface = neigh->if_incoming;struct batadv_priv *bat_priv =netdev_priv (hard_iface->soft_iface); +u32 elp_tp_duration; neigh->bat_v.tp_meter_running = true; -batadv_tp_start (bat_priv, neigh->addr, neigh, -1000 ,NULL ,BATADV_TP_ELP ); + elp_tp_duration =atomic_read (&hard_iface->bat_v.elp_tp_duration); +batadv_tp_start (bat_priv, neigh->addr, neigh, elp_tp_duration, +NULL ,BATADV_TP_ELP ); }/**
net/batman-adv/sysfs.c +3 -0
@@ -1128,6 +1128,8 @@ static BATADV_ATTR(iface_status, 0444, batadv_show_iface_status, NULL);#ifdef CONFIG_BATMAN_ADV_BATMAN_V BATADV_ATTR_HIF_UINT (elp_interval, bat_v.elp_interval,0644 ,2 *BATADV_JITTER ,INT_MAX ,NULL ); +BATADV_ATTR_HIF_UINT (elp_tp_duration, bat_v.elp_tp_duration,0644 , +1 ,INT_MAX ,NULL ); static BATADV_ATTR(throughput_override, 0644, batadv_show_throughput_override, batadv_store_throughput_override);#endif
@@ -1137,6 +1139,7 @@ static struct batadv_attribute *batadv_batman_attrs[] = { &batadv_attr_iface_status, #ifdef CONFIG_BATMAN_ADV_BATMAN_V &batadv_attr_elp_interval, + &batadv_attr_elp_tp_duration, &batadv_attr_throughput_override, #endif NULL,
net/batman-adv/types.h +3 -0
@@ -118,6 +118,9 @@ struct batadv_hard_iface_bat_v {/** @elp_interval: time interval between two ELP transmissions */ atomic_t elp_interval; +/** @elp_tp_duration: throughput meter fallback test duration */ +atomic_t elp_tp_duration; +/** @elp_seqno: current ELP sequence number */ atomic_t elp_seqno;
Signature · 1 line
2.18.0