From patchwork Sat Jan 19 15:56:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 1027967 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=narfation.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="kKOO+qpa"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43hj9g2HYfz9sBQ for ; Sun, 20 Jan 2019 02:56:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728596AbfASP4r (ORCPT ); Sat, 19 Jan 2019 10:56:47 -0500 Received: from narfation.org ([79.140.41.39]:34058 "EHLO v3-1039.vlinux.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728462AbfASP4l (ORCPT ); Sat, 19 Jan 2019 10:56:41 -0500 Received: from sven-desktop.home.narfation.org (p200300C5973798FD0000000000004065.dip0.t-ipconnect.de [IPv6:2003:c5:9737:98fd::4065]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id AE252110134; Sat, 19 Jan 2019 16:56:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1547913398; bh=pi7vtaX6KAJz9j6DMUF+4eqczvsJWEmO6V0x0RfXdsw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kKOO+qpavZuzqd/dMqY1ffGQdGw9I19ubjg9EEoAP+ShAFAoZfQMuyRyHn+YaKIgn WqJD3jwAxuR/uwNp6wCyJohASp1bbpTruAbniOYyy4N6gKTvkbtI5gLptdgdCBmT3a lXmY7wsce2syp+aV36clol3Q4mzrrWFbMfIlgCg8= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Cc: Jiri Pirko , netdev@vger.kernel.org, Sven Eckelmann , Marek Lindner Subject: [RFC v4 13/19] batman-adv: Add log_level mesh genl configuration Date: Sat, 19 Jan 2019 16:56:20 +0100 Message-Id: <20190119155626.6414-14-sven@narfation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190119155626.6414-1-sven@narfation.org> References: <20190119155626.6414-1-sven@narfation.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.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 --- Cc: Marek Lindner --- 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 8602129f..d39f8f83 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_put(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;