b.a.t.m.a.n.lists.open-mesh.org archive mirror
 help / color / mirror / Atom feed
From: Simon Wunderlich <sw@simonwunderlich.de>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
	Sven Eckelmann <sven@narfation.org>,
	Simon Wunderlich <sw@simonwunderlich.de>
Subject: [B.A.T.M.A.N.] [PATCH 20/21] batman-adv: Add throughput_override hardif genl configuration
Date: Wed, 13 Feb 2019 10:55:23 +0100	[thread overview]
Message-ID: <20190213095524.10147-21-sw@simonwunderlich.de> (raw)
In-Reply-To: <20190213095524.10147-1-sw@simonwunderlich.de>

From: Sven Eckelmann <sven@narfation.org>

The B.A.T.M.A.N. V implementation tries to estimate the link throughput of
an interface to an originator using different automatic methods. It is
still possible to overwrite it the link throughput for all reachable
originators via this interface.

The BATADV_CMD_SET_HARDIF/BATADV_CMD_GET_HARDIF commands allow to set/get
the configuration of this feature using the u32
BATADV_ATTR_THROUGHPUT_OVERRIDE attribute. The used unit is in 100 Kbit/s.
If the value is set to 0 then batman-adv will try to estimate the
throughput by itself.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 include/uapi/linux/batman_adv.h |  8 ++++++++
 net/batman-adv/netlink.c        | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h
index f966e497361b..305bf316dd03 100644
--- a/include/uapi/linux/batman_adv.h
+++ b/include/uapi/linux/batman_adv.h
@@ -483,6 +483,14 @@ enum batadv_nl_attrs {
 	 */
 	BATADV_ATTR_ELP_INTERVAL,
 
+	/**
+	 * @BATADV_ATTR_THROUGHPUT_OVERRIDE: defines the throughput value to be
+	 *  used by B.A.T.M.A.N. V when estimating the link throughput using
+	 *  this interface. If the value is set to 0 then batman-adv will try to
+	 *  estimate the throughput by itself.
+	 */
+	BATADV_ATTR_THROUGHPUT_OVERRIDE,
+
 	/* add attributes above here, update the policy in netlink.c */
 
 	/**
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index 09187e6e92a3..476b4c6017c9 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -160,6 +160,7 @@ static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = {
 	[BATADV_ATTR_NETWORK_CODING_ENABLED]	= { .type = NLA_U8 },
 	[BATADV_ATTR_ORIG_INTERVAL]		= { .type = NLA_U32 },
 	[BATADV_ATTR_ELP_INTERVAL]		= { .type = NLA_U32 },
+	[BATADV_ATTR_THROUGHPUT_OVERRIDE]	= { .type = NLA_U32 },
 };
 
 /**
@@ -830,6 +831,10 @@ static int batadv_netlink_hardif_fill(struct sk_buff *msg,
 	if (nla_put_u32(msg, BATADV_ATTR_ELP_INTERVAL,
 			atomic_read(&hard_iface->bat_v.elp_interval)))
 		goto nla_put_failure;
+
+	if (nla_put_u32(msg, BATADV_ATTR_THROUGHPUT_OVERRIDE,
+			atomic_read(&hard_iface->bat_v.throughput_override)))
+		goto nla_put_failure;
 #endif /* CONFIG_BATMAN_ADV_BATMAN_V */
 
 	genlmsg_end(msg, hdr);
@@ -925,6 +930,13 @@ static int batadv_netlink_set_hardif(struct sk_buff *skb,
 
 		atomic_set(&hard_iface->bat_v.elp_interval, nla_get_u32(attr));
 	}
+
+	if (info->attrs[BATADV_ATTR_THROUGHPUT_OVERRIDE]) {
+		attr = info->attrs[BATADV_ATTR_THROUGHPUT_OVERRIDE];
+
+		atomic_set(&hard_iface->bat_v.throughput_override,
+			   nla_get_u32(attr));
+	}
 #endif /* CONFIG_BATMAN_ADV_BATMAN_V */
 
 	batadv_netlink_notify_hardif(bat_priv, hard_iface);
-- 
2.11.0


  parent reply	other threads:[~2019-02-13  9:55 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-13  9:55 [B.A.T.M.A.N.] [PATCH 00/21] pull request for net-next: batman-adv 2019-02-13 Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 01/21] batman-adv: fix memory leak in in batadv_dat_put_dhcp Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 02/21] batman-adv: Fix typo "reseved" -> "reserved" Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 03/21] batman-adv: Move common genl doit code pre/post hooks Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 04/21] batman-adv: Prepare framework for mesh genl config Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 05/21] batman-adv: Prepare framework for hardif " Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 06/21] batman-adv: Prepare framework for vlan " Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 07/21] batman-adv: Add aggregated_ogms mesh genl configuration Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 08/21] batman-adv: Add ap_isolation mesh/vlan " Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 09/21] batman-adv: Add bonding mesh " Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 10/21] batman-adv: Add bridge_loop_avoidance " Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 11/21] batman-adv: Add distributed_arp_table " Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 12/21] batman-adv: Add fragmentation " Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 13/21] batman-adv: Add gateway " Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 14/21] batman-adv: Add hop_penalty " Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 15/21] batman-adv: Add log_level " Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 16/21] batman-adv: Add multicast forceflood " Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 17/21] batman-adv: Add network_coding " Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 18/21] batman-adv: Add orig_interval " Simon Wunderlich
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 19/21] batman-adv: Add elp_interval hardif " Simon Wunderlich
2019-02-13  9:55 ` Simon Wunderlich [this message]
2019-02-13  9:55 ` [B.A.T.M.A.N.] [PATCH 21/21] batman-adv: Trigger genl notification on sysfs config change Simon Wunderlich
2019-02-14  6:28 ` [B.A.T.M.A.N.] [PATCH 00/21] pull request for net-next: batman-adv 2019-02-13 David Miller

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=20190213095524.10147-21-sw@simonwunderlich.de \
    --to=sw@simonwunderlich.de \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=sven@narfation.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).