Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1424776ybp; Wed, 9 Oct 2019 14:00:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqz30KZuNLA/S774h0WoxTJxDdkL2553DVAM1DsnqWdoolGYyfx+4XWvyhvByqMJ6naMB7tw X-Received: by 2002:aa7:dd0f:: with SMTP id i15mr5091089edv.0.1570654859600; Wed, 09 Oct 2019 14:00:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570654859; cv=none; d=google.com; s=arc-20160816; b=xTB3PTxvRsNtxutTd+rILYY3y7Wgh5W/tOcC2cSjbEpflRwuAhGY1nIY6PHJL2w1+6 klqcThttTJHkARlv9ByWU46HGSFO0SK94VUlkuNV66RrMi5OHXM1m4IkJqR57NJL7NMX UHiK4dhPXeKF92mgER15C1cIZH/1HS3bjnrzAqrwszd4wZbQU3seWXIG/uBmOwGR0Q7T SImK0cbWaS0PdVCuO9Hzp44Jb6TRvL1EaOEmvI02QAOXZdAMF0cfQmo2j3Fzl/8A8BJw mPb0ExX8kCYCY9awKMW6kffEyc43ggnzfSBf37da5xgVUXOCsmDYX6C9VF4+o/+DA5GB HlsQ== 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=6TjMT1wuJ+tojmZlf/ts/mcQCm+h+sJPmdfNSKnYxIY=; b=Lwf70MhKAoouXVxM3DYR/OKqMrVttJ5HfZKhhrTXJIiTSPPBX8LurlnpsuBolIhr9z kvmF5Q7UbB3v59pavl4c7ngPzpUVvmbjij+rx8POo8Q4ky7qrP0nwnErfRjBRYbrMn58 lvx0e/SBajDHmDfdW4P94jJPqRxxI96KC5Y2aPj05z3ss1QMO1Kexij9qiL5/sTfYm1o QmytAqFbzc0wVhwTL1TSjsEjh0DPWB/+IKC7wuWX0XRtbFU4qhgteHsW9GWEgpcUDGk+ DHH9a5Sz95U2nxJ01mlKkzXPs8/aLDxWxcI+Qzl5PkOGHxjT1m4ThELHvuYNCpthQZ/G u0vQ== 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 f21si1907817ejc.159.2019.10.09.14.00.36; Wed, 09 Oct 2019 14:00:59 -0700 (PDT) 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 S1732412AbfJIU7o (ORCPT + 99 others); Wed, 9 Oct 2019 16:59:44 -0400 Received: from mx2.suse.de ([195.135.220.15]:51888 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731158AbfJIU7m (ORCPT ); Wed, 9 Oct 2019 16:59:42 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 5CF21B274; Wed, 9 Oct 2019 20:59:40 +0000 (UTC) Received: by unicorn.suse.cz (Postfix, from userid 1000) id 0E623E3785; Wed, 9 Oct 2019 22:59:40 +0200 (CEST) Message-Id: In-Reply-To: References: From: Michal Kubecek Subject: [PATCH net-next v7 13/17] ethtool: add standard 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: Wed, 9 Oct 2019 22:59:40 +0200 (CEST) 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 --- net/ethtool/netlink.c | 89 +++++++++++++++++++++++++++++++++++++++++++ net/ethtool/netlink.h | 3 +- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c index 47b6aefa0bf9..dc52d912e0dd 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; #define __LINK_MODE_NAME(speed, type, duplex) \ #speed "base" #type "/" #duplex @@ -257,6 +258,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 */ /** @@ -588,6 +601,82 @@ static int ethnl_get_done(struct netlink_callback *cb) return 0; } +static const struct get_request_ops *ethnl_std_notify_to_ops(unsigned int cmd) +{ + WARN_ONCE(1, "unexpected notification type %u\n", cmd); + return NULL; +} + +/* generic notification handler */ +static void ethnl_std_notify(struct net_device *dev, unsigned int cmd, + const void *data) +{ + struct ethnl_reply_data *reply_data; + const struct get_request_ops *ops; + struct ethnl_req_info *req_info; + struct sk_buff *skb; + void *reply_payload; + int reply_len; + int ret; + + ops = ethnl_std_notify_to_ops(cmd); + if (!ops) + return; + 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->global_flags |= ETHTOOL_GFLAG_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 a0ae47bebe51..23e82a4dd265 100644 --- a/net/ethtool/netlink.h +++ b/net/ethtool/netlink.h @@ -316,7 +316,8 @@ static inline void ethnl_after_ops(struct net_device *dev) * infrastructure. When used, a pointer to an instance of this structure is to * be added to &get_requests array and generic handlers ethnl_get_doit(), * ethnl_get_dumpit(), ethnl_get_start() and ethnl_get_done() used in - * @ethnl_genl_ops + * @ethnl_genl_ops; ethnl_std_notify() can be used in @ethnl_notify_handlers + * to send notifications of the corresponding type. */ struct get_request_ops { u8 request_cmd; -- 2.23.0