Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp11052620ybl; Fri, 27 Dec 2019 06:57:07 -0800 (PST) X-Google-Smtp-Source: APXvYqxOD1pqhn59WhOJKoonxk5pVqkHWhuR/a7pEmtEKVM3BOBTp27wR10aYNvnJe12/o7NlaOK X-Received: by 2002:a05:6830:138b:: with SMTP id d11mr45281656otq.38.1577458627793; Fri, 27 Dec 2019 06:57:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577458627; cv=none; d=google.com; s=arc-20160816; b=bmg2SDCA81T1yu2bqtzhvkpe5lwl2KtsqJmdFYT5JNxsrY+5cADCE2FZ2QfVn/i04J FATN525OPpUrfVNExU1L46/c1XKxiQMGWdHzkrNYko8TmhDkGBX7PHn6irAajmgKHH4Q ppMJxvwJKP77GmQ7U/RW4ItRt5YcKFi+vIOturJcbdnPbyioWO86omWlBiKqP7J64bKI bWavKrdVvpcxq76OHw0Nt7jRKTelRjhQj6ztKzSQJSZ009A0ZjaFHzJPDZOMTHTnTmi+ t82i4Acrdb65+QfpDL2EzazxDJt8mriylg6ZzNDbUOabZdtPxBhPksgVhgJaNyWruixV 5FwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id; bh=gH6UbjuzAFlaNE3shlEeE2aTYElVUsOjKDOeHX7wQJM=; b=lyR0mxaFXsmk72T8EWI5ykETT/H4HU7pzJJAq1vwrQsktAizrLxiJm9tdZ+3k3DO6d 1MnqSFJsjP3d5B0B6IMW2/dREviyVBFtxouxXSfROr6aw8UyjB9fMELWW7uLTxFqgA6f +GC5AtqKxcgBuLfBvUUjuMoY9SnQJ22/D7YZ9qWaVFNdRWLafPhVny0goXY9BxiDl3zb 61eThSnf8FRB/af+f4AJQ7RUx9ijmYXguPHggdZPb8FKq5GUeCeNtZarfZe+G1W99Amz ZxwHxq65RBk/gV9YOMeV7vNreobz/ZqXgFk85ap1XPE0tjJsI9frKUA3tptS+msb5sL4 HpaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 20si20470638otk.283.2019.12.27.06.56.56; Fri, 27 Dec 2019 06:57:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727398AbfL0O4C (ORCPT + 99 others); Fri, 27 Dec 2019 09:56:02 -0500 Received: from mx2.suse.de ([195.135.220.15]:42850 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727274AbfL0O4B (ORCPT ); Fri, 27 Dec 2019 09:56:01 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 9DE50AFAE; Fri, 27 Dec 2019 14:55:58 +0000 (UTC) Received: by unicorn.suse.cz (Postfix, from userid 1000) id 4EEEBE008A; Fri, 27 Dec 2019 15:55:58 +0100 (CET) Message-Id: <67c3883bd045024b0fee585e2b879e09e8768b42.1577457846.git.mkubecek@suse.cz> In-Reply-To: References: From: Michal Kubecek Subject: [PATCH net-next v9 09/14] ethtool: add default notification handler To: David Miller , netdev@vger.kernel.org Cc: Jakub Kicinski , Jiri Pirko , Andrew Lunn , Florian Fainelli , John Linville , Stephen Hemminger , Johannes Berg , linux-kernel@vger.kernel.org Date: Fri, 27 Dec 2019 15:55:58 +0100 (CET) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ethtool netlink notifications have the same format as related GET replies so that if generic GET handling framework is used to process GET requests, its callbacks and instance of struct get_request_ops can be also used to compose corresponding notification message. Provide function ethnl_std_notify() to be used as notification handler in ethnl_notify_handlers table. Signed-off-by: Michal Kubecek Reviewed-by: Florian Fainelli --- net/ethtool/netlink.c | 89 +++++++++++++++++++++++++++++++++++++++++++ net/ethtool/netlink.h | 4 +- 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c index 7867425956f6..057b67f8ba8c 100644 --- a/net/ethtool/netlink.c +++ b/net/ethtool/netlink.c @@ -7,6 +7,7 @@ static struct genl_family ethtool_genl_family; static bool ethnl_ok __read_mostly; +static u32 ethnl_bcast_seq; static const struct nla_policy ethnl_header_policy[ETHTOOL_A_HEADER_MAX + 1] = { [ETHTOOL_A_HEADER_UNSPEC] = { .type = NLA_REJECT }, @@ -171,6 +172,18 @@ struct sk_buff *ethnl_reply_init(size_t payload, struct net_device *dev, u8 cmd, return NULL; } +static void *ethnl_bcastmsg_put(struct sk_buff *skb, u8 cmd) +{ + return genlmsg_put(skb, 0, ++ethnl_bcast_seq, ðtool_genl_family, 0, + cmd); +} + +static int ethnl_multicast(struct sk_buff *skb, struct net_device *dev) +{ + return genlmsg_multicast_netns(ðtool_genl_family, dev_net(dev), skb, + 0, ETHNL_MCGRP_MONITOR, GFP_KERNEL); +} + /* GET request helpers */ /** @@ -494,6 +507,82 @@ static int ethnl_default_done(struct netlink_callback *cb) return 0; } +static const struct ethnl_request_ops * +ethnl_default_notify_ops[ETHTOOL_MSG_KERNEL_MAX + 1] = { +}; + +/* default notification handler */ +static void ethnl_default_notify(struct net_device *dev, unsigned int cmd, + const void *data) +{ + struct ethnl_reply_data *reply_data; + const struct ethnl_request_ops *ops; + struct ethnl_req_info *req_info; + struct sk_buff *skb; + void *reply_payload; + int reply_len; + int ret; + + if (WARN_ONCE(cmd > ETHTOOL_MSG_KERNEL_MAX || + !ethnl_default_notify_ops[cmd], + "unexpected notification type %u\n", cmd)) + return; + ops = ethnl_default_notify_ops[cmd]; + req_info = kzalloc(ops->req_info_size, GFP_KERNEL); + if (!req_info) + return; + reply_data = kmalloc(ops->reply_data_size, GFP_KERNEL); + if (!reply_data) { + kfree(req_info); + return; + } + + req_info->dev = dev; + req_info->flags |= ETHTOOL_FLAG_COMPACT_BITSETS; + + ethnl_init_reply_data(reply_data, ops, dev); + ret = ops->prepare_data(req_info, reply_data, NULL); + if (ret < 0) + goto err_cleanup; + reply_len = ops->reply_size(req_info, reply_data); + if (ret < 0) + goto err_cleanup; + ret = -ENOMEM; + skb = genlmsg_new(reply_len, GFP_KERNEL); + if (!skb) + goto err_cleanup; + reply_payload = ethnl_bcastmsg_put(skb, cmd); + if (!reply_payload) + goto err_skb; + ret = ethnl_fill_reply_header(skb, dev, ops->hdr_attr); + if (ret < 0) + goto err_msg; + ret = ops->fill_reply(skb, req_info, reply_data); + if (ret < 0) + goto err_msg; + if (ops->cleanup_data) + ops->cleanup_data(reply_data); + + genlmsg_end(skb, reply_payload); + kfree(reply_data); + kfree(req_info); + ethnl_multicast(skb, dev); + return; + +err_msg: + WARN_ONCE(ret == -EMSGSIZE, + "calculated message payload length (%d) not sufficient\n", + reply_len); +err_skb: + nlmsg_free(skb); +err_cleanup: + if (ops->cleanup_data) + ops->cleanup_data(reply_data); + kfree(reply_data); + kfree(req_info); + return; +} + /* notifications */ typedef void (*ethnl_notify_handler_t)(struct net_device *dev, unsigned int cmd, diff --git a/net/ethtool/netlink.h b/net/ethtool/netlink.h index bbe5fe60a023..5d56d7779a06 100644 --- a/net/ethtool/netlink.h +++ b/net/ethtool/netlink.h @@ -300,7 +300,9 @@ static inline void ethnl_ops_complete(struct net_device *dev) * unified infrastructure. When used, a pointer to an instance of this * structure is to be added to ðnl_default_requests array and generic * handlers ethnl_default_doit(), ethnl_default_dumpit(), - * ethnl_default_start() and ethnl_default_done() used in @ethtool_genl_ops. + * ethnl_default_start() and ethnl_default_done() used in @ethtool_genl_ops; + * ethnl_default_notify() can be used in @ethnl_notify_handlers to send + * notifications of the corresponding type. */ struct ethnl_request_ops { u8 request_cmd; -- 2.24.1