[PATCH v10 03/25] net/ethtool: add ULP_DDP_{GET,SET} operations for caps and stats
Aurelien Aptel
aaptel at nvidia.com
Thu Jan 26 08:21:14 PST 2023
This commit adds:
- 2 new netlink messages:
* ULP_DDP_GET: returns a bitset of supported and active capabilities
* ULP_DDP_SET: tries to activate requested bitset and returns results
ULP DDP capabilities handling is similar to netdev features
handling.
If a ULP_DDP_GET message has requested statistics via the
ETHTOOL_FLAG_STATS header flag, then statistics are returned to
userspace.
ULP_DDP_GET request: (header only)
ULP_DDP_GET reply:
HW (bitset)
ACTIVE (bitset)
STATS (nest, optional)
STATS_xxxx (u64)
....
ULP_DDP_SET request:
WANTED (bitset)
ULP_DDP_SET reply:
WANTED (bitset)
ACTIVE (bitset)
Signed-off-by: Shai Malin <smalin at nvidia.com>
Signed-off-by: Aurelien Aptel <aaptel at nvidia.com>
---
include/uapi/linux/ethtool_netlink.h | 17 ++
net/ethtool/Makefile | 2 +-
net/ethtool/netlink.c | 17 ++
net/ethtool/netlink.h | 4 +
net/ethtool/ulp_ddp.c | 334 +++++++++++++++++++++++++++
5 files changed, 373 insertions(+), 1 deletion(-)
create mode 100644 net/ethtool/ulp_ddp.c
diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h
index 14a1858fd106..35805d8d12a3 100644
--- a/include/uapi/linux/ethtool_netlink.h
+++ b/include/uapi/linux/ethtool_netlink.h
@@ -57,6 +57,8 @@ enum {
ETHTOOL_MSG_PLCA_GET_STATUS,
ETHTOOL_MSG_MM_GET,
ETHTOOL_MSG_MM_SET,
+ ETHTOOL_MSG_ULP_DDP_GET,
+ ETHTOOL_MSG_ULP_DDP_SET,
/* add new constants above here */
__ETHTOOL_MSG_USER_CNT,
@@ -109,6 +111,8 @@ enum {
ETHTOOL_MSG_PLCA_NTF,
ETHTOOL_MSG_MM_GET_REPLY,
ETHTOOL_MSG_MM_NTF,
+ ETHTOOL_MSG_ULP_DDP_GET_REPLY,
+ ETHTOOL_MSG_ULP_DDP_SET_REPLY,
/* add new constants above here */
__ETHTOOL_MSG_KERNEL_CNT,
@@ -974,6 +978,19 @@ enum {
/* ULP DDP */
+enum {
+ ETHTOOL_A_ULP_DDP_UNSPEC,
+ ETHTOOL_A_ULP_DDP_HEADER, /* nest - _A_HEADER_* */
+ ETHTOOL_A_ULP_DDP_HW, /* bitset */
+ ETHTOOL_A_ULP_DDP_ACTIVE, /* bitset */
+ ETHTOOL_A_ULP_DDP_WANTED, /* bitset */
+ ETHTOOL_A_ULP_DDP_STATS, /* nest - _A_ULP_DDP_STATS_* */
+
+ /* add new constants above here */
+ __ETHTOOL_A_ULP_DDP_CNT,
+ ETHTOOL_A_ULP_DDP_MAX = __ETHTOOL_A_ULP_DDP_CNT - 1
+};
+
enum {
ETHTOOL_A_ULP_DDP_STATS_UNSPEC,
ETHTOOL_A_ULP_DDP_STATS_RX_NVMEOTCP_SK_ADD,
diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile
index 504f954a1b28..a2fdc5ed7655 100644
--- a/net/ethtool/Makefile
+++ b/net/ethtool/Makefile
@@ -8,4 +8,4 @@ ethtool_nl-y := netlink.o bitset.o strset.o linkinfo.o linkmodes.o rss.o \
linkstate.o debug.o wol.o features.o privflags.o rings.o \
channels.o coalesce.o pause.o eee.o tsinfo.o cabletest.o \
tunnels.o fec.o eeprom.o stats.o phc_vclocks.o mm.o \
- module.o pse-pd.o plca.o mm.o
+ module.o pse-pd.o plca.o ulp_ddp.o
diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c
index 6412c4dc663d..7fe126abb72e 100644
--- a/net/ethtool/netlink.c
+++ b/net/ethtool/netlink.c
@@ -291,6 +291,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = {
[ETHTOOL_MSG_PLCA_GET_CFG] = ðnl_plca_cfg_request_ops,
[ETHTOOL_MSG_PLCA_GET_STATUS] = ðnl_plca_status_request_ops,
[ETHTOOL_MSG_MM_GET] = ðnl_mm_request_ops,
+ [ETHTOOL_MSG_ULP_DDP_GET] = ðnl_ulp_ddp_request_ops,
};
static struct ethnl_dump_ctx *ethnl_dump_context(struct netlink_callback *cb)
@@ -1095,6 +1096,22 @@ static const struct genl_ops ethtool_genl_ops[] = {
.policy = ethnl_mm_set_policy,
.maxattr = ARRAY_SIZE(ethnl_mm_set_policy) - 1,
},
+ {
+ .cmd = ETHTOOL_MSG_ULP_DDP_GET,
+ .doit = ethnl_default_doit,
+ .start = ethnl_default_start,
+ .dumpit = ethnl_default_dumpit,
+ .done = ethnl_default_done,
+ .policy = ethnl_ulp_ddp_get_policy,
+ .maxattr = ARRAY_SIZE(ethnl_ulp_ddp_get_policy) - 1,
+ },
+ {
+ .cmd = ETHTOOL_MSG_ULP_DDP_SET,
+ .flags = GENL_UNS_ADMIN_PERM,
+ .doit = ethnl_set_ulp_ddp,
+ .policy = ethnl_ulp_ddp_set_policy,
+ .maxattr = ARRAY_SIZE(ethnl_ulp_ddp_set_policy) - 1,
+ },
};
static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
diff --git a/net/ethtool/netlink.h b/net/ethtool/netlink.h
index b01f7cd542c4..68db2e073c4b 100644
--- a/net/ethtool/netlink.h
+++ b/net/ethtool/netlink.h
@@ -376,6 +376,7 @@ extern const struct ethnl_request_ops ethnl_rss_request_ops;
extern const struct ethnl_request_ops ethnl_plca_cfg_request_ops;
extern const struct ethnl_request_ops ethnl_plca_status_request_ops;
extern const struct ethnl_request_ops ethnl_mm_request_ops;
+extern const struct ethnl_request_ops ethnl_ulp_ddp_request_ops;
extern const struct nla_policy ethnl_header_policy[ETHTOOL_A_HEADER_FLAGS + 1];
extern const struct nla_policy ethnl_header_policy_stats[ETHTOOL_A_HEADER_FLAGS + 1];
@@ -422,6 +423,8 @@ extern const struct nla_policy ethnl_plca_set_cfg_policy[ETHTOOL_A_PLCA_MAX + 1]
extern const struct nla_policy ethnl_plca_get_status_policy[ETHTOOL_A_PLCA_HEADER + 1];
extern const struct nla_policy ethnl_mm_get_policy[ETHTOOL_A_MM_HEADER + 1];
extern const struct nla_policy ethnl_mm_set_policy[ETHTOOL_A_MM_MAX + 1];
+extern const struct nla_policy ethnl_ulp_ddp_get_policy[ETHTOOL_A_ULP_DDP_HEADER + 1];
+extern const struct nla_policy ethnl_ulp_ddp_set_policy[ETHTOOL_A_ULP_DDP_WANTED + 1];
int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_linkmodes(struct sk_buff *skb, struct genl_info *info);
@@ -444,6 +447,7 @@ int ethnl_set_module(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_pse(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_plca_cfg(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_mm(struct sk_buff *skb, struct genl_info *info);
+int ethnl_set_ulp_ddp(struct sk_buff *skb, struct genl_info *info);
extern const char stats_std_names[__ETHTOOL_STATS_CNT][ETH_GSTRING_LEN];
extern const char stats_eth_phy_names[__ETHTOOL_A_STATS_ETH_PHY_CNT][ETH_GSTRING_LEN];
diff --git a/net/ethtool/ulp_ddp.c b/net/ethtool/ulp_ddp.c
new file mode 100644
index 000000000000..de20e9cfb24f
--- /dev/null
+++ b/net/ethtool/ulp_ddp.c
@@ -0,0 +1,334 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ *
+ * ulp_ddp.c
+ * Author: Aurelien Aptel <aaptel at nvidia.com>
+ * Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ */
+
+#include "netlink.h"
+#include "common.h"
+#include "bitset.h"
+#include <net/ulp_ddp.h>
+
+static struct ulp_ddp_netdev_caps *netdev_ulp_ddp_caps(struct net_device *dev)
+{
+#ifdef CONFIG_ULP_DDP
+ return &dev->ulp_ddp_caps;
+#else
+ return NULL;
+#endif
+}
+
+static const struct ulp_ddp_dev_ops *netdev_ulp_ddp_ops(struct net_device *dev)
+{
+#ifdef CONFIG_ULP_DDP
+ return dev->netdev_ops->ulp_ddp_ops;
+#else
+ return NULL;
+#endif
+}
+
+/* ULP_DDP_GET */
+
+struct ulp_ddp_req_info {
+ struct ethnl_req_info base;
+};
+
+struct ulp_ddp_reply_data {
+ struct ethnl_reply_data base;
+ DECLARE_BITMAP(hw, ULP_DDP_C_COUNT);
+ DECLARE_BITMAP(active, ULP_DDP_C_COUNT);
+ struct ethtool_ulp_ddp_stats stats;
+};
+
+#define ULP_DDP_REPDATA(__reply_base) \
+ container_of(__reply_base, struct ulp_ddp_reply_data, base)
+
+const struct nla_policy ethnl_ulp_ddp_get_policy[] = {
+ [ETHTOOL_A_ULP_DDP_HEADER] =
+ NLA_POLICY_NESTED(ethnl_header_policy_stats),
+};
+
+static int ulp_ddp_stats64_size(unsigned int count)
+{
+ unsigned int len = 0;
+ unsigned int i;
+
+ for (i = 0; i < count; i++)
+ len += nla_total_size(sizeof(u64));
+
+ /* outermost nest */
+ return nla_total_size(len);
+}
+
+static int ulp_ddp_put_stats64(struct sk_buff *skb, int attrtype, const u64 *val,
+ unsigned int count)
+{
+ struct nlattr *nest;
+ unsigned int i;
+
+ nest = nla_nest_start(skb, attrtype);
+ if (!nest)
+ return -EMSGSIZE;
+
+ /* skip attribute 0 (unspec) */
+ for (i = 0 ; i < count; i++)
+ if (nla_put_64bit(skb, i+1, sizeof(u64), &val[i], 0))
+ goto nla_put_failure;
+
+ nla_nest_end(skb, nest);
+ return 0;
+
+nla_put_failure:
+ nla_nest_cancel(skb, nest);
+ return -EMSGSIZE;
+}
+
+static int ulp_ddp_prepare_data(const struct ethnl_req_info *req_base,
+ struct ethnl_reply_data *reply_base,
+ struct genl_info *info)
+{
+ const struct ulp_ddp_dev_ops *ops = netdev_ulp_ddp_ops(reply_base->dev);
+ struct ulp_ddp_netdev_caps *caps = netdev_ulp_ddp_caps(reply_base->dev);
+ struct ulp_ddp_reply_data *data = ULP_DDP_REPDATA(reply_base);
+
+ if (!caps || !ops)
+ return -EOPNOTSUPP;
+
+ bitmap_copy(data->hw, caps->hw, ULP_DDP_C_COUNT);
+ bitmap_copy(data->active, caps->active, ULP_DDP_C_COUNT);
+
+ if (req_base->flags & ETHTOOL_FLAG_STATS) {
+ if (!ops->get_stats)
+ return -EOPNOTSUPP;
+ ops->get_stats(reply_base->dev, &data->stats);
+ }
+ return 0;
+}
+
+static int ulp_ddp_reply_size(const struct ethnl_req_info *req_base,
+ const struct ethnl_reply_data *reply_base)
+{
+ const struct ulp_ddp_reply_data *data = ULP_DDP_REPDATA(reply_base);
+ bool compact = req_base->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
+ unsigned int len = 0;
+ int ret;
+
+ ret = ethnl_bitset_size(data->hw, NULL, ULP_DDP_C_COUNT,
+ ulp_ddp_caps_names, compact);
+ if (ret < 0)
+ return ret;
+ len += ret;
+ ret = ethnl_bitset_size(data->active, NULL, ULP_DDP_C_COUNT,
+ ulp_ddp_caps_names, compact);
+ if (ret < 0)
+ return ret;
+ len += ret;
+
+ if (req_base->flags & ETHTOOL_FLAG_STATS) {
+ /* When requested (ETHTOOL_FLAG_STATS) ULP DDP stats
+ * are appended to the response.
+ */
+ ret = ulp_ddp_stats64_size(__ETHTOOL_A_ULP_DDP_STATS_CNT-1);
+ if (ret < 0)
+ return ret;
+ len += ret;
+ }
+ return len;
+}
+
+static int ulp_ddp_fill_reply(struct sk_buff *skb,
+ const struct ethnl_req_info *req_base,
+ const struct ethnl_reply_data *reply_base)
+{
+ const struct ulp_ddp_reply_data *data = ULP_DDP_REPDATA(reply_base);
+ bool compact = req_base->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
+ int ret;
+
+ ret = ethnl_put_bitset(skb, ETHTOOL_A_ULP_DDP_HW, data->hw,
+ NULL, ULP_DDP_C_COUNT,
+ ulp_ddp_caps_names, compact);
+ if (ret < 0)
+ return ret;
+
+ ret = ethnl_put_bitset(skb, ETHTOOL_A_ULP_DDP_ACTIVE, data->active,
+ NULL, ULP_DDP_C_COUNT,
+ ulp_ddp_caps_names, compact);
+ if (ret < 0)
+ return ret;
+
+ if (req_base->flags & ETHTOOL_FLAG_STATS) {
+ ret = ulp_ddp_put_stats64(skb, ETHTOOL_A_ULP_DDP_STATS,
+ (u64 *)&data->stats,
+ __ETHTOOL_A_ULP_DDP_STATS_CNT-1);
+ if (ret < 0)
+ return ret;
+ }
+ return ret;
+}
+
+const struct ethnl_request_ops ethnl_ulp_ddp_request_ops = {
+ .request_cmd = ETHTOOL_MSG_ULP_DDP_GET,
+ .reply_cmd = ETHTOOL_MSG_ULP_DDP_GET_REPLY,
+ .hdr_attr = ETHTOOL_A_ULP_DDP_HEADER,
+ .req_info_size = sizeof(struct ulp_ddp_req_info),
+ .reply_data_size = sizeof(struct ulp_ddp_reply_data),
+
+ .prepare_data = ulp_ddp_prepare_data,
+ .reply_size = ulp_ddp_reply_size,
+ .fill_reply = ulp_ddp_fill_reply,
+};
+
+/* ULP_DDP_SET */
+
+const struct nla_policy ethnl_ulp_ddp_set_policy[] = {
+ [ETHTOOL_A_ULP_DDP_HEADER] =
+ NLA_POLICY_NESTED(ethnl_header_policy),
+ [ETHTOOL_A_ULP_DDP_WANTED] = { .type = NLA_NESTED },
+};
+
+static int ulp_ddp_send_reply(struct net_device *dev, struct genl_info *info,
+ const unsigned long *wanted,
+ const unsigned long *wanted_mask,
+ const unsigned long *active,
+ const unsigned long *active_mask, bool compact)
+{
+ struct sk_buff *rskb;
+ void *reply_payload;
+ int reply_len = 0;
+ int ret;
+
+ reply_len = ethnl_reply_header_size();
+ ret = ethnl_bitset_size(wanted, wanted_mask, ULP_DDP_C_COUNT,
+ ulp_ddp_caps_names, compact);
+ if (ret < 0)
+ goto err;
+ reply_len += ret;
+ ret = ethnl_bitset_size(active, active_mask, ULP_DDP_C_COUNT,
+ ulp_ddp_caps_names, compact);
+ if (ret < 0)
+ goto err;
+ reply_len += ret;
+
+ ret = -ENOMEM;
+ rskb = ethnl_reply_init(reply_len, dev, ETHTOOL_MSG_ULP_DDP_SET_REPLY,
+ ETHTOOL_A_ULP_DDP_HEADER, info,
+ &reply_payload);
+ if (!rskb)
+ goto err;
+
+ ret = ethnl_put_bitset(rskb, ETHTOOL_A_ULP_DDP_WANTED, wanted,
+ wanted_mask, ULP_DDP_C_COUNT,
+ ulp_ddp_caps_names, compact);
+ if (ret < 0)
+ goto nla_put_failure;
+ ret = ethnl_put_bitset(rskb, ETHTOOL_A_ULP_DDP_ACTIVE, active,
+ active_mask, ULP_DDP_C_COUNT,
+ ulp_ddp_caps_names, compact);
+ if (ret < 0)
+ goto nla_put_failure;
+
+ genlmsg_end(rskb, reply_payload);
+ ret = genlmsg_reply(rskb, info);
+ return ret;
+
+nla_put_failure:
+ nlmsg_free(rskb);
+ WARN_ONCE(1, "calculated message payload length (%d) not sufficient\n",
+ reply_len);
+err:
+ GENL_SET_ERR_MSG(info, "failed to send reply message");
+ return ret;
+}
+
+int ethnl_set_ulp_ddp(struct sk_buff *skb, struct genl_info *info)
+{
+ DECLARE_BITMAP(old_active, ULP_DDP_C_COUNT);
+ DECLARE_BITMAP(new_active, ULP_DDP_C_COUNT);
+ DECLARE_BITMAP(req_wanted, ULP_DDP_C_COUNT);
+ DECLARE_BITMAP(req_mask, ULP_DDP_C_COUNT);
+ DECLARE_BITMAP(all_bits, ULP_DDP_C_COUNT);
+ DECLARE_BITMAP(tmp, ULP_DDP_C_COUNT);
+ struct ethnl_req_info req_info = {};
+ const struct ulp_ddp_dev_ops *ops;
+ struct nlattr **tb = info->attrs;
+ struct ulp_ddp_netdev_caps *caps;
+ struct net_device *dev;
+ int ret;
+
+ if (!tb[ETHTOOL_A_ULP_DDP_WANTED])
+ return -EINVAL;
+ ret = ethnl_parse_header_dev_get(&req_info,
+ tb[ETHTOOL_A_ULP_DDP_HEADER],
+ genl_info_net(info), info->extack,
+ true);
+ if (ret < 0)
+ return ret;
+
+ dev = req_info.dev;
+ rtnl_lock();
+ caps = netdev_ulp_ddp_caps(dev);
+ ops = netdev_ulp_ddp_ops(dev);
+ if (!caps || !ops || !ops->set_caps) {
+ ret = -EOPNOTSUPP;
+ goto out_rtnl;
+ }
+
+ ret = ethnl_parse_bitset(req_wanted, req_mask, ULP_DDP_C_COUNT,
+ tb[ETHTOOL_A_ULP_DDP_WANTED],
+ ulp_ddp_caps_names, info->extack);
+ if (ret < 0)
+ goto out_rtnl;
+
+ /* if (req_mask & ~all_bits) */
+ bitmap_fill(all_bits, ULP_DDP_C_COUNT);
+ bitmap_andnot(tmp, req_mask, all_bits, ULP_DDP_C_COUNT);
+ if (!bitmap_empty(tmp, ULP_DDP_C_COUNT)) {
+ ret = -EINVAL;
+ goto out_rtnl;
+ }
+
+ /* new_active = (old_active & ~req_mask) | (wanted & req_mask)
+ * new_active &= caps_hw
+ */
+ bitmap_copy(old_active, caps->active, ULP_DDP_C_COUNT);
+ bitmap_and(req_wanted, req_wanted, req_mask, ULP_DDP_C_COUNT);
+ bitmap_andnot(new_active, old_active, req_mask, ULP_DDP_C_COUNT);
+ bitmap_or(new_active, new_active, req_wanted, ULP_DDP_C_COUNT);
+ bitmap_and(new_active, new_active, caps->hw, ULP_DDP_C_COUNT);
+ if (!bitmap_equal(old_active, new_active, ULP_DDP_C_COUNT)) {
+ ret = ops->set_caps(dev, new_active);
+ if (ret)
+ netdev_err(dev, "set_ulp_ddp_capabilities() returned error %d\n", ret);
+ bitmap_copy(new_active, caps->active, ULP_DDP_C_COUNT);
+ }
+
+ ret = 0;
+ if (!(req_info.flags & ETHTOOL_FLAG_OMIT_REPLY)) {
+ DECLARE_BITMAP(wanted_diff_mask, ULP_DDP_C_COUNT);
+ DECLARE_BITMAP(active_diff_mask, ULP_DDP_C_COUNT);
+ bool compact = req_info.flags & ETHTOOL_FLAG_COMPACT_BITSETS;
+
+ /* wanted_diff_mask = req_wanted ^ new_active
+ * active_diff_mask = old_active ^ new_active -> mask of bits that have changed
+ * wanted_diff_mask &= req_mask -> mask of bits that have diff value than wanted
+ * req_wanted &= wanted_diff_mask -> bits that have diff value than wanted
+ * new_active &= active_diff_mask -> bits that have changed
+ */
+ bitmap_xor(wanted_diff_mask, req_wanted, new_active, ULP_DDP_C_COUNT);
+ bitmap_xor(active_diff_mask, old_active, new_active, ULP_DDP_C_COUNT);
+ bitmap_and(wanted_diff_mask, wanted_diff_mask, req_mask, ULP_DDP_C_COUNT);
+ bitmap_and(req_wanted, req_wanted, wanted_diff_mask, ULP_DDP_C_COUNT);
+ bitmap_and(new_active, new_active, active_diff_mask, ULP_DDP_C_COUNT);
+ ret = ulp_ddp_send_reply(dev, info,
+ req_wanted, wanted_diff_mask,
+ new_active, active_diff_mask,
+ compact);
+ }
+
+out_rtnl:
+ rtnl_unlock();
+ ethnl_parse_header_dev_put(&req_info);
+ return ret;
+}
--
2.31.1
More information about the Linux-nvme
mailing list