From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Sven Eckelmann <sven@narfation.org>,
Marek Lindner <mareklindner@neomailbox.ch>
Subject: [B.A.T.M.A.N.] [PATCH v5 13/19] batman-adv: Add log_level mesh genl configuration
Date: Sat, 9 Feb 2019 14:41:03 +0100 [thread overview]
Message-ID: <20190209134109.14908-14-sven@narfation.org> (raw)
In-Reply-To: <20190209134109.14908-1-sven@narfation.org>
In contrast to other modules, batman-adv allows to set the debug message
verbosity per mesh/soft-interface and not per module (via modparam).
The BATADV_CMD_SET_MESH/BATADV_CMD_GET_MESH commands allow to set/get the
configuration of this feature using the u32 (bitmask) BATADV_ATTR_LOG_LEVEL
attribute.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Cc: Marek Lindner <mareklindner@neomailbox.ch>
---
include/uapi/linux/batman_adv.h | 6 ++++++
net/batman-adv/netlink.c | 17 +++++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h
index b37cb923..6d36e4b4 100644
--- a/include/uapi/linux/batman_adv.h
+++ b/include/uapi/linux/batman_adv.h
@@ -449,6 +449,12 @@ enum batadv_nl_attrs {
*/
BATADV_ATTR_HOP_PENALTY,
+ /**
+ * @BATADV_ATTR_LOG_LEVEL: bitmask with to define which debug messages
+ * should be send to the debug log/trace ring buffer
+ */
+ BATADV_ATTR_LOG_LEVEL,
+
/* 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 ce6e6f07..8c019d46 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -53,6 +53,7 @@
#include "gateway_client.h"
#include "gateway_common.h"
#include "hard-interface.h"
+#include "log.h"
#include "multicast.h"
#include "originator.h"
#include "soft-interface.h"
@@ -153,6 +154,7 @@ static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = {
[BATADV_ATTR_GW_MODE] = { .type = NLA_U8 },
[BATADV_ATTR_GW_SEL_CLASS] = { .type = NLA_U32 },
[BATADV_ATTR_HOP_PENALTY] = { .type = NLA_U8 },
+ [BATADV_ATTR_LOG_LEVEL] = { .type = NLA_U32 },
};
/**
@@ -335,6 +337,12 @@ static int batadv_netlink_mesh_fill(struct sk_buff *msg,
atomic_read(&bat_priv->hop_penalty)))
goto nla_put_failure;
+#ifdef CONFIG_BATMAN_ADV_DEBUG
+ if (nla_put_u32(msg, BATADV_ATTR_LOG_LEVEL,
+ atomic_read(&bat_priv->log_level)))
+ goto nla_put_failure;
+#endif /* CONFIG_BATMAN_ADV_DEBUG */
+
if (primary_if)
batadv_hardif_put(primary_if);
@@ -547,6 +555,15 @@ static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info)
atomic_set(&bat_priv->hop_penalty, nla_get_u8(attr));
}
+#ifdef CONFIG_BATMAN_ADV_DEBUG
+ if (info->attrs[BATADV_ATTR_LOG_LEVEL]) {
+ attr = info->attrs[BATADV_ATTR_LOG_LEVEL];
+
+ atomic_set(&bat_priv->log_level,
+ nla_get_u32(attr) & BATADV_DBG_ALL);
+ }
+#endif /* CONFIG_BATMAN_ADV_DEBUG */
+
batadv_netlink_notify_mesh(bat_priv);
return 0;
--
2.20.1
next prev parent reply other threads:[~2019-02-09 13:41 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-09 13:40 [B.A.T.M.A.N.] [PATCH v5 00/19] batman-adv: netlink restructuring, part 2 Sven Eckelmann
2019-02-09 13:40 ` [B.A.T.M.A.N.] [PATCH v5 01/19] batman-adv: Move common genl doit code pre/post hooks Sven Eckelmann
2019-02-09 13:40 ` [B.A.T.M.A.N.] [PATCH v5 02/19] batman-adv: Prepare framework for mesh genl config Sven Eckelmann
2019-02-09 13:40 ` [B.A.T.M.A.N.] [PATCH v5 03/19] batman-adv: Prepare framework for hardif " Sven Eckelmann
2019-02-09 13:40 ` [B.A.T.M.A.N.] [PATCH v5 04/19] batman-adv: Prepare framework for vlan " Sven Eckelmann
2019-02-09 13:40 ` [B.A.T.M.A.N.] [PATCH v5 05/19] batman-adv: Add aggregated_ogms mesh genl configuration Sven Eckelmann
2019-02-09 13:40 ` [B.A.T.M.A.N.] [PATCH v5 06/19] batman-adv: Add ap_isolation mesh/vlan " Sven Eckelmann
2019-02-09 13:40 ` [B.A.T.M.A.N.] [PATCH v5 07/19] batman-adv: Add bonding mesh " Sven Eckelmann
2019-02-09 13:40 ` [B.A.T.M.A.N.] [PATCH v5 08/19] batman-adv: Add bridge_loop_avoidance " Sven Eckelmann
2019-02-09 13:40 ` [B.A.T.M.A.N.] [PATCH v5 09/19] batman-adv: Add distributed_arp_table " Sven Eckelmann
2019-02-09 13:41 ` [B.A.T.M.A.N.] [PATCH v5 10/19] batman-adv: Add fragmentation " Sven Eckelmann
2019-02-09 13:41 ` [B.A.T.M.A.N.] [PATCH v5 11/19] batman-adv: Add gateway " Sven Eckelmann
2019-02-09 13:41 ` [B.A.T.M.A.N.] [PATCH v5 12/19] batman-adv: Add hop_penalty " Sven Eckelmann
2019-02-09 13:41 ` Sven Eckelmann [this message]
2019-02-09 13:41 ` [B.A.T.M.A.N.] [PATCH v5 14/19] batman-adv: Add multicast forceflood " Sven Eckelmann
2019-02-09 13:41 ` [B.A.T.M.A.N.] [PATCH v5 15/19] batman-adv: Add network_coding " Sven Eckelmann
2019-02-09 13:41 ` [B.A.T.M.A.N.] [PATCH v5 16/19] batman-adv: Add orig_interval " Sven Eckelmann
2019-02-09 13:41 ` [B.A.T.M.A.N.] [PATCH v5 17/19] batman-adv: Add elp_interval hardif " Sven Eckelmann
2019-02-09 13:41 ` [B.A.T.M.A.N.] [PATCH v5 18/19] batman-adv: Add throughput_override " Sven Eckelmann
2019-02-09 13:41 ` [B.A.T.M.A.N.] [PATCH v5 19/19] batman-adv: Trigger genl notification on sysfs config change 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=20190209134109.14908-14-sven@narfation.org \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=mareklindner@neomailbox.ch \
/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).