From: Marek Lindner <mareklindner@neomailbox.ch>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Antonio Quartulli <a@unstable.cc>
Subject: [B.A.T.M.A.N.] [PATCH v5 2/7] batman-adv: tp_meter - don't check for existing session
Date: Fri, 7 Sep 2018 17:59:53 +0800 [thread overview]
Message-ID: <20180907095958.30946-3-mareklindner@neomailbox.ch> (raw)
In-Reply-To: <20180907095958.30946-1-mareklindner@neomailbox.ch>
From: Antonio Quartulli <a@unstable.cc>
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.
Signed-off-by: Antonio Quartulli <a@unstable.cc>
---
net/batman-adv/tp_meter.c | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index 9a29ab62..e54aa1b8 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -929,21 +929,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,
@@ -953,10 +939,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;
@@ -1011,6 +993,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);
--
2.18.0
next prev parent reply other threads:[~2018-09-07 9:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-07 9:59 [B.A.T.M.A.N.] [PATCH v5 0/7] B.A.T.M.A.N. V - fallback to tp meter estimation if throughput otherwise not available Marek Lindner
2018-09-07 9:59 ` [B.A.T.M.A.N.] [PATCH v5 1/7] batman-adv: tp_meter - prevent concurrent tp_meter sessions by using workqueue Marek Lindner
2018-09-07 9:59 ` Marek Lindner [this message]
2018-09-07 9:59 ` [B.A.T.M.A.N.] [PATCH v5 3/7] batman-adv: tp_meter - allow up to 10 queued sessions Marek Lindner
2018-09-07 9:59 ` [B.A.T.M.A.N.] [PATCH v5 4/7] batman-adv: tp_meter - add caller distinction Marek Lindner
2018-09-07 9:59 ` [B.A.T.M.A.N.] [PATCH v5 5/7] batman-adv: tp_meter - add option to perform one-hop test Marek Lindner
2018-09-07 9:59 ` [B.A.T.M.A.N.] [PATCH v5 6/7] batman-adv: ELP - use tp meter to estimate the throughput if otherwise not available Marek Lindner
2018-09-08 17:11 ` Sven Eckelmann
2018-09-07 9:59 ` [B.A.T.M.A.N.] [PATCH v5 7/7] batman-adv: ELP - add throughput meter test duration attribute Marek Lindner
2018-09-08 17:38 ` [B.A.T.M.A.N.] [PATCH v5 0/7] B.A.T.M.A.N. V - fallback to tp meter estimation if throughput otherwise not available Sven Eckelmann
2019-11-25 8:41 ` Sven Eckelmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180907095958.30946-3-mareklindner@neomailbox.ch \
--to=mareklindner@neomailbox.ch \
--cc=a@unstable.cc \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).