Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp56964ybb; Fri, 27 Mar 2020 16:02:42 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt7p1mw65juxHkqpTR4B4uHmKQm/nyKKwBLfluZlndHtyK3BEkaVxYFJJXMxn+nmM9d2XDT X-Received: by 2002:a4a:aa44:: with SMTP id y4mr1453303oom.74.1585350162179; Fri, 27 Mar 2020 16:02:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585350162; cv=none; d=google.com; s=arc-20160816; b=jgzLbsV5pCwJnduL3dMjixAWywwTKTbH4wQj1SHjf6RhNnsKrulXX2OI9HhWEgnvH2 tQV7UWjOKSRNbIfGsRxkN2GR/SbLd1Km6Yd3WUv3umKYpI3RFM/6XpS1gOapt06BPok9 U7ywBR2U9dG4lJqx2aJ30+osfMGXEOVX1Tmmdmh84frOVf5Za/B5nZG/ofLiObkkvp4i JDdiyESkTw7zmH9OT3+iB8Q5Rgr7hrjcApOdaNuugxwtBP+EfFWrygaen8bqURLFt+pA 4wN/OApOCPDP9pVokHsSt4ux07/FxvfNBqGm/FiPWr3FuNFA14KqT7mbH/vjjqy+J9rm xggQ== 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=8WSf5HLiLLVYPsUVhlgPVJREAj5u7QPfcOqOZvv7m80=; b=faQw1v0Bi/N77tYwF6edfKpckZdEjIpejr4/QLH4PPm8Qs22aaIDOBV9QPbcKjytW4 FkPf6D9rNtL1LI6s4ej551dmwaM70i3sFsQDLX+0UKM+Y4JGWeZ2g+OJD5tyXn7n/gYM irAtDgd0xMa1yY+SlybN78Xkyf6mYgdJSiFDG7I4BUz9TGBjCyGqSayiyCVT+dvOxtkh fDUQhG1XvGLYutiy96rBpsLLMlvvlYr7ZWHxdNDUlRI+Ec4oO7H1KHk9DBJe3Gg1r/MI gXZ3ama3Uc+2BhB2zHd88DGwKzqWkJDtR+8DRjqd9kK3lLcv7APvk00yYohHRS+pUq5U m+5g== 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 f12si3029273oig.263.2020.03.27.16.02.26; Fri, 27 Mar 2020 16:02:42 -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 S1727896AbgC0XBc (ORCPT + 99 others); Fri, 27 Mar 2020 19:01:32 -0400 Received: from mx2.suse.de ([195.135.220.15]:44674 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727585AbgC0XBb (ORCPT ); Fri, 27 Mar 2020 19:01:31 -0400 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 E1D70AD26; Fri, 27 Mar 2020 23:01:28 +0000 (UTC) Received: by unicorn.suse.cz (Postfix, from userid 1000) id 88EA5E0FC6; Sat, 28 Mar 2020 00:01:28 +0100 (CET) Message-Id: In-Reply-To: References: From: Michal Kubecek Subject: [PATCH net-next v3 06/12] ethtool: set pause parameters with PAUSE_SET request To: David Miller , Jakub Kicinski , netdev@vger.kernel.org Cc: Jiri Pirko , Andrew Lunn , Florian Fainelli , John Linville , Johannes Berg , Richard Cochran , linux-kernel@vger.kernel.org Date: Sat, 28 Mar 2020 00:01:28 +0100 (CET) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement PAUSE_SET netlink request to set pause parameters of a network device. Thease are traditionally set with ETHTOOL_SPAUSEPARAM ioctl request. Signed-off-by: Michal Kubecek --- Documentation/networking/ethtool-netlink.rst | 3 +- include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/netlink.c | 5 ++ net/ethtool/netlink.h | 1 + net/ethtool/pause.c | 61 ++++++++++++++++++++ 5 files changed, 70 insertions(+), 1 deletion(-) diff --git a/Documentation/networking/ethtool-netlink.rst b/Documentation/networking/ethtool-netlink.rst index 43c7baf36b32..dc7b3fe47f37 100644 --- a/Documentation/networking/ethtool-netlink.rst +++ b/Documentation/networking/ethtool-netlink.rst @@ -200,6 +200,7 @@ Userspace to kernel: ``ETHTOOL_MSG_COALESCE_GET`` get coalescing parameters ``ETHTOOL_MSG_COALESCE_SET`` set coalescing parameters ``ETHTOOL_MSG_PAUSE_GET`` get pause parameters + ``ETHTOOL_MSG_PAUSE_SET`` set pause parameters ===================================== ================================ Kernel to userspace: @@ -899,7 +900,7 @@ have their netlink replacement yet. ``ETHTOOL_GRINGPARAM`` ``ETHTOOL_MSG_RINGS_GET`` ``ETHTOOL_SRINGPARAM`` ``ETHTOOL_MSG_RINGS_SET`` ``ETHTOOL_GPAUSEPARAM`` ``ETHTOOL_MSG_PAUSE_GET`` - ``ETHTOOL_SPAUSEPARAM`` n/a + ``ETHTOOL_SPAUSEPARAM`` ``ETHTOOL_MSG_PAUSE_SET`` ``ETHTOOL_GRXCSUM`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SRXCSUM`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_GTXCSUM`` ``ETHTOOL_MSG_FEATURES_GET`` diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h index 1c8d1228f63f..a9a35c7b81d4 100644 --- a/include/uapi/linux/ethtool_netlink.h +++ b/include/uapi/linux/ethtool_netlink.h @@ -35,6 +35,7 @@ enum { ETHTOOL_MSG_COALESCE_GET, ETHTOOL_MSG_COALESCE_SET, ETHTOOL_MSG_PAUSE_GET, + ETHTOOL_MSG_PAUSE_SET, /* add new constants above here */ __ETHTOOL_MSG_USER_CNT, diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c index ca1695de8c9d..1ca30578e642 100644 --- a/net/ethtool/netlink.c +++ b/net/ethtool/netlink.c @@ -809,6 +809,11 @@ static const struct genl_ops ethtool_genl_ops[] = { .dumpit = ethnl_default_dumpit, .done = ethnl_default_done, }, + { + .cmd = ETHTOOL_MSG_PAUSE_SET, + .flags = GENL_UNS_ADMIN_PERM, + .doit = ethnl_set_pause, + }, }; static const struct genl_multicast_group ethtool_nl_mcgrps[] = { diff --git a/net/ethtool/netlink.h b/net/ethtool/netlink.h index e14ac089bfb1..49fee19bc6aa 100644 --- a/net/ethtool/netlink.h +++ b/net/ethtool/netlink.h @@ -353,5 +353,6 @@ int ethnl_set_privflags(struct sk_buff *skb, struct genl_info *info); int ethnl_set_rings(struct sk_buff *skb, struct genl_info *info); int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info); int ethnl_set_coalesce(struct sk_buff *skb, struct genl_info *info); +int ethnl_set_pause(struct sk_buff *skb, struct genl_info *info); #endif /* _NET_ETHTOOL_NETLINK_H */ diff --git a/net/ethtool/pause.c b/net/ethtool/pause.c index 9feafeb7bb1c..c307b91fdfba 100644 --- a/net/ethtool/pause.c +++ b/net/ethtool/pause.c @@ -79,3 +79,64 @@ const struct ethnl_request_ops ethnl_pause_request_ops = { .reply_size = pause_reply_size, .fill_reply = pause_fill_reply, }; + +/* PAUSE_SET */ + +static const struct nla_policy +pause_set_policy[ETHTOOL_A_PAUSE_MAX + 1] = { + [ETHTOOL_A_PAUSE_UNSPEC] = { .type = NLA_REJECT }, + [ETHTOOL_A_PAUSE_HEADER] = { .type = NLA_NESTED }, + [ETHTOOL_A_PAUSE_AUTONEG] = { .type = NLA_U8 }, + [ETHTOOL_A_PAUSE_RX] = { .type = NLA_U8 }, + [ETHTOOL_A_PAUSE_TX] = { .type = NLA_U8 }, +}; + +int ethnl_set_pause(struct sk_buff *skb, struct genl_info *info) +{ + struct nlattr *tb[ETHTOOL_A_PAUSE_MAX + 1]; + struct ethtool_pauseparam params = {}; + struct ethnl_req_info req_info = {}; + const struct ethtool_ops *ops; + struct net_device *dev; + bool mod = false; + int ret; + + ret = nlmsg_parse(info->nlhdr, GENL_HDRLEN, tb, ETHTOOL_A_PAUSE_MAX, + pause_set_policy, info->extack); + if (ret < 0) + return ret; + ret = ethnl_parse_header_dev_get(&req_info, + tb[ETHTOOL_A_PAUSE_HEADER], + genl_info_net(info), info->extack, + true); + if (ret < 0) + return ret; + dev = req_info.dev; + ops = dev->ethtool_ops; + ret = -EOPNOTSUPP; + if (!ops->get_pauseparam || !ops->set_pauseparam) + goto out_dev; + + rtnl_lock(); + ret = ethnl_ops_begin(dev); + if (ret < 0) + goto out_rtnl; + ops->get_pauseparam(dev, ¶ms); + + ethnl_update_bool32(¶ms.autoneg, tb[ETHTOOL_A_PAUSE_AUTONEG], &mod); + ethnl_update_bool32(¶ms.rx_pause, tb[ETHTOOL_A_PAUSE_RX], &mod); + ethnl_update_bool32(¶ms.tx_pause, tb[ETHTOOL_A_PAUSE_TX], &mod); + ret = 0; + if (!mod) + goto out_ops; + + ret = dev->ethtool_ops->set_pauseparam(dev, ¶ms); + +out_ops: + ethnl_ops_complete(dev); +out_rtnl: + rtnl_unlock(); +out_dev: + dev_put(dev); + return ret; +} -- 2.25.1