From: Aurelien Aptel <aaptel@nvidia.com>
To: linux-nvme@lists.infradead.org, netdev@vger.kernel.org,
sagi@grimberg.me, hch@lst.de, kbusch@kernel.org, axboe@fb.com,
chaitanyak@nvidia.com, davem@davemloft.net, kuba@kernel.org
Cc: Aurelien Aptel <aaptel@nvidia.com>,
aurelien.aptel@gmail.com, smalin@nvidia.com, malin1024@gmail.com,
ogerlitz@nvidia.com, yorayz@nvidia.com, borisp@nvidia.com
Subject: [PATCH v11 03/25] net/ethtool: add ULP_DDP_{GET,SET} operations for caps and stats
Date: Fri, 3 Feb 2023 15:26:43 +0200 [thread overview]
Message-ID: <20230203132705.627232-4-aaptel@nvidia.com> (raw)
In-Reply-To: <20230203132705.627232-1-aaptel@nvidia.com>
This commit adds:
- 3 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_NTF: notification for capabilities change
Rename and export bitset_policy for use in ulp_ddp.c.
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@nvidia.com>
Signed-off-by: Aurelien Aptel <aaptel@nvidia.com>
---
include/uapi/linux/ethtool_netlink.h | 18 ++
net/ethtool/Makefile | 2 +-
net/ethtool/bitset.c | 20 +-
net/ethtool/netlink.c | 20 ++
net/ethtool/netlink.h | 4 +
net/ethtool/ulp_ddp.c | 316 +++++++++++++++++++++++++++
6 files changed, 369 insertions(+), 11 deletions(-)
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 1722581b2db6..f6bac0ae15f6 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,9 @@ 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,
+ ETHTOOL_MSG_ULP_DDP_NTF,
/* add new constants above here */
__ETHTOOL_MSG_KERNEL_CNT,
@@ -974,6 +979,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_PAD,
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/bitset.c b/net/ethtool/bitset.c
index 0515d6604b3b..1bef91fcce4b 100644
--- a/net/ethtool/bitset.c
+++ b/net/ethtool/bitset.c
@@ -302,7 +302,7 @@ int ethnl_put_bitset32(struct sk_buff *skb, int attrtype, const u32 *val,
return -EMSGSIZE;
}
-static const struct nla_policy bitset_policy[] = {
+const struct nla_policy ethnl_bitset_policy[] = {
[ETHTOOL_A_BITSET_NOMASK] = { .type = NLA_FLAG },
[ETHTOOL_A_BITSET_SIZE] = NLA_POLICY_MAX(NLA_U32,
ETHNL_MAX_BITSET_SIZE),
@@ -327,11 +327,11 @@ static const struct nla_policy bit_policy[] = {
*/
int ethnl_bitset_is_compact(const struct nlattr *bitset, bool *compact)
{
- struct nlattr *tb[ARRAY_SIZE(bitset_policy)];
+ struct nlattr *tb[ARRAY_SIZE(ethnl_bitset_policy)];
int ret;
- ret = nla_parse_nested(tb, ARRAY_SIZE(bitset_policy) - 1, bitset,
- bitset_policy, NULL);
+ ret = nla_parse_nested(tb, ARRAY_SIZE(ethnl_bitset_policy) - 1, bitset,
+ ethnl_bitset_policy, NULL);
if (ret < 0)
return ret;
@@ -553,15 +553,15 @@ int ethnl_update_bitset32(u32 *bitmap, unsigned int nbits,
const struct nlattr *attr, ethnl_string_array_t names,
struct netlink_ext_ack *extack, bool *mod)
{
- struct nlattr *tb[ARRAY_SIZE(bitset_policy)];
+ struct nlattr *tb[ARRAY_SIZE(ethnl_bitset_policy)];
unsigned int change_bits;
bool no_mask;
int ret;
if (!attr)
return 0;
- ret = nla_parse_nested(tb, ARRAY_SIZE(bitset_policy) - 1, attr,
- bitset_policy, extack);
+ ret = nla_parse_nested(tb, ARRAY_SIZE(ethnl_bitset_policy) - 1, attr,
+ ethnl_bitset_policy, extack);
if (ret < 0)
return ret;
@@ -606,7 +606,7 @@ int ethnl_parse_bitset(unsigned long *val, unsigned long *mask,
ethnl_string_array_t names,
struct netlink_ext_ack *extack)
{
- struct nlattr *tb[ARRAY_SIZE(bitset_policy)];
+ struct nlattr *tb[ARRAY_SIZE(ethnl_bitset_policy)];
const struct nlattr *bit_attr;
bool no_mask;
int rem;
@@ -614,8 +614,8 @@ int ethnl_parse_bitset(unsigned long *val, unsigned long *mask,
if (!attr)
return 0;
- ret = nla_parse_nested(tb, ARRAY_SIZE(bitset_policy) - 1, attr,
- bitset_policy, extack);
+ ret = nla_parse_nested(tb, ARRAY_SIZE(ethnl_bitset_policy) - 1, attr,
+ ethnl_bitset_policy, extack);
if (ret < 0)
return ret;
no_mask = tb[ETHTOOL_A_BITSET_NOMASK];
diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c
index 08120095cc68..33f1b0992383 100644
--- a/net/ethtool/netlink.c
+++ b/net/ethtool/netlink.c
@@ -306,6 +306,8 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = {
[ETHTOOL_MSG_PLCA_GET_STATUS] = ðnl_plca_status_request_ops,
[ETHTOOL_MSG_MM_GET] = ðnl_mm_request_ops,
[ETHTOOL_MSG_MM_SET] = ðnl_mm_request_ops,
+ [ETHTOOL_MSG_ULP_DDP_GET] = ðnl_ulp_ddp_request_ops,
+ [ETHTOOL_MSG_ULP_DDP_SET] = ðnl_ulp_ddp_request_ops,
};
static struct ethnl_dump_ctx *ethnl_dump_context(struct netlink_callback *cb)
@@ -669,6 +671,7 @@ ethnl_default_notify_ops[ETHTOOL_MSG_KERNEL_MAX + 1] = {
[ETHTOOL_MSG_MODULE_NTF] = ðnl_module_request_ops,
[ETHTOOL_MSG_PLCA_NTF] = ðnl_plca_cfg_request_ops,
[ETHTOOL_MSG_MM_NTF] = ðnl_mm_request_ops,
+ [ETHTOOL_MSG_ULP_DDP_NTF] = ðnl_ulp_ddp_request_ops,
};
/* default notification handler */
@@ -764,6 +767,7 @@ static const ethnl_notify_handler_t ethnl_notify_handlers[] = {
[ETHTOOL_MSG_MODULE_NTF] = ethnl_default_notify,
[ETHTOOL_MSG_PLCA_NTF] = ethnl_default_notify,
[ETHTOOL_MSG_MM_NTF] = ethnl_default_notify,
+ [ETHTOOL_MSG_ULP_DDP_NTF] = ethnl_default_notify,
};
void ethtool_notify(struct net_device *dev, unsigned int cmd, const void *data)
@@ -1156,6 +1160,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_default_set_doit,
+ .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 ae0732460e88..4852f567c0be 100644
--- a/net/ethtool/netlink.h
+++ b/net/ethtool/netlink.h
@@ -395,10 +395,12 @@ 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];
extern const struct nla_policy ethnl_strset_get_policy[ETHTOOL_A_STRSET_COUNTS_ONLY + 1];
+extern const struct nla_policy ethnl_bitset_policy[ETHTOOL_A_BITSET_MASK + 1];
extern const struct nla_policy ethnl_linkinfo_get_policy[ETHTOOL_A_LINKINFO_HEADER + 1];
extern const struct nla_policy ethnl_linkinfo_set_policy[ETHTOOL_A_LINKINFO_TP_MDIX_CTRL + 1];
extern const struct nla_policy ethnl_linkmodes_get_policy[ETHTOOL_A_LINKMODES_HEADER + 1];
@@ -441,6 +443,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_features(struct sk_buff *skb, struct genl_info *info);
int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info);
diff --git a/net/ethtool/ulp_ddp.c b/net/ethtool/ulp_ddp.c
new file mode 100644
index 000000000000..e5451689fef9
--- /dev/null
+++ b/net/ethtool/ulp_ddp.c
@@ -0,0 +1,316 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ *
+ * ulp_ddp.c
+ * Author: Aurelien Aptel <aaptel@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>
+
+#define ETHTOOL_ULP_DDP_STATS_CNT \
+ (__ETHTOOL_A_ULP_DDP_STATS_CNT - (ETHTOOL_A_ULP_DDP_STATS_PAD + 1))
+
+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_put_stats64(struct sk_buff *skb, int attrtype, const u64 *val,
+ unsigned int count)
+{
+ struct nlattr *nest;
+ unsigned int i, attr;
+
+ nest = nla_nest_start(skb, attrtype);
+ if (!nest)
+ return -EMSGSIZE;
+
+ /* skip attributes unspec & pad */
+ attr = ETHTOOL_A_ULP_DDP_STATS_PAD + 1;
+ for (i = 0 ; i < count; i++, attr++)
+ if (nla_put_u64_64bit(skb, attr, val[i], ETHTOOL_A_ULP_DDP_STATS_PAD))
+ 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) {
+ len += nla_total_size_64bit(sizeof(u64)) * ETHTOOL_ULP_DDP_STATS_CNT;
+ len += nla_total_size(0); /* nest */
+ }
+ 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_ULP_DDP_STATS_CNT);
+ if (ret < 0)
+ return ret;
+ }
+ return ret;
+}
+
+/* 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] = NLA_POLICY_NESTED(ethnl_bitset_policy),
+};
+
+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;
+
+ rskb = ethnl_reply_init(reply_len, dev, ETHTOOL_MSG_ULP_DDP_SET_REPLY,
+ ETHTOOL_A_ULP_DDP_HEADER, info,
+ &reply_payload);
+ if (!rskb) {
+ ret = -ENOMEM;
+ 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;
+}
+
+static int ulp_ddp_set_validate(struct ethnl_req_info *req_info, struct genl_info *info)
+{
+ const struct ulp_ddp_dev_ops *ops;
+
+ if (GENL_REQ_ATTR_CHECK(info, ETHTOOL_A_ULP_DDP_WANTED))
+ return -EINVAL;
+
+ ops = netdev_ulp_ddp_ops(req_info->dev);
+ if (!ops || !ops->set_caps || !netdev_ulp_ddp_caps(req_info->dev))
+ return -EOPNOTSUPP;
+
+ return 1;
+}
+
+static int ulp_ddp_set(struct ethnl_req_info *req_info, 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);
+ const struct ulp_ddp_dev_ops *ops;
+ struct ulp_ddp_netdev_caps *caps;
+ int ret;
+
+ caps = netdev_ulp_ddp_caps(req_info->dev);
+ ops = netdev_ulp_ddp_ops(req_info->dev);
+ ret = ethnl_parse_bitset(req_wanted, req_mask, ULP_DDP_C_COUNT,
+ info->attrs[ETHTOOL_A_ULP_DDP_WANTED],
+ ulp_ddp_caps_names, info->extack);
+ if (ret < 0)
+ return ret;
+
+ /* 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))
+ return -EINVAL;
+
+ /* 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(req_info->dev, new_active, info->extack);
+ if (ret < 0)
+ return ret;
+ bitmap_copy(new_active, caps->active, ULP_DDP_C_COUNT);
+ }
+
+ if (!(req_info->flags & ETHTOOL_FLAG_OMIT_REPLY)) {
+ bool compact = req_info->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
+ DECLARE_BITMAP(wanted_diff_mask, ULP_DDP_C_COUNT);
+ DECLARE_BITMAP(active_diff_mask, ULP_DDP_C_COUNT);
+
+ /* 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(req_info->dev, info,
+ req_wanted, wanted_diff_mask,
+ new_active, active_diff_mask,
+ compact);
+ if (ret < 0)
+ return ret;
+ }
+
+ /* return 1 to notify */
+ return bitmap_equal(old_active, new_active, ULP_DDP_C_COUNT);
+}
+
+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,
+
+ .set_validate = ulp_ddp_set_validate,
+ .set = ulp_ddp_set,
+ .set_ntf_cmd = ETHTOOL_MSG_ULP_DDP_NTF,
+};
--
2.31.1
next prev parent reply other threads:[~2023-02-03 13:27 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-03 13:26 [PATCH v11 00/25] nvme-tcp receive offloads Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 01/25] net: Introduce direct data placement tcp offload Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 02/25] net/ethtool: add new stringset ETH_SS_ULP_DDP_{CAPS,STATS} Aurelien Aptel
2023-02-04 3:42 ` Jakub Kicinski
2023-02-03 13:26 ` Aurelien Aptel [this message]
2023-02-04 3:46 ` [PATCH v11 03/25] net/ethtool: add ULP_DDP_{GET,SET} operations for caps and stats Jakub Kicinski
2023-02-03 13:26 ` [PATCH v11 04/25] Documentation: document netlink ULP_DDP_GET/SET messages Aurelien Aptel
2023-02-04 3:41 ` Jakub Kicinski
2023-02-06 9:48 ` Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 05/25] iov_iter: skip copy if src == dst for direct data placement Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 06/25] net/tls,core: export get_netdev_for_sock Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 07/25] nvme-tcp: Add DDP offload control path Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 08/25] nvme-tcp: Add DDP data-path Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 09/25] nvme-tcp: RX DDGST offload Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 10/25] nvme-tcp: Deal with netdevice DOWN events Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 11/25] nvme-tcp: Add modparam to control the ULP offload enablement Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 12/25] Documentation: add ULP DDP offload documentation Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 13/25] net/mlx5e: Rename from tls to transport static params Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 14/25] net/mlx5e: Refactor ico sq polling to get budget Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 15/25] net/mlx5e: Have mdev pointer directly on the icosq structure Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 16/25] net/mlx5e: Refactor doorbell function to allow avoiding a completion Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 17/25] net/mlx5: Add NVMEoTCP caps, HW bits, 128B CQE and enumerations Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 18/25] net/mlx5e: NVMEoTCP, offload initialization Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 19/25] net/mlx5e: TCP flow steering for nvme-tcp acceleration Aurelien Aptel
2023-02-03 13:27 ` [PATCH v11 20/25] net/mlx5e: NVMEoTCP, use KLM UMRs for buffer registration Aurelien Aptel
2023-02-03 13:27 ` [PATCH v11 21/25] net/mlx5e: NVMEoTCP, queue init/teardown Aurelien Aptel
2023-02-03 13:27 ` [PATCH v11 22/25] net/mlx5e: NVMEoTCP, ddp setup and resync Aurelien Aptel
2023-02-03 13:27 ` [PATCH v11 23/25] net/mlx5e: NVMEoTCP, async ddp invalidation Aurelien Aptel
2023-02-03 13:27 ` [PATCH v11 24/25] net/mlx5e: NVMEoTCP, data-path for DDP+DDGST offload Aurelien Aptel
2023-02-03 13:27 ` [PATCH v11 25/25] net/mlx5e: NVMEoTCP, statistics Aurelien Aptel
2023-02-23 15:33 ` [PATCH v11 00/25] nvme-tcp receive offloads Sagi Grimberg
2023-03-01 19:13 ` Shai Malin
2023-03-07 10:11 ` Sagi Grimberg
2023-03-22 10:19 ` Shai Malin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230203132705.627232-4-aaptel@nvidia.com \
--to=aaptel@nvidia.com \
--cc=aurelien.aptel@gmail.com \
--cc=axboe@fb.com \
--cc=borisp@nvidia.com \
--cc=chaitanyak@nvidia.com \
--cc=davem@davemloft.net \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=malin1024@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@nvidia.com \
--cc=sagi@grimberg.me \
--cc=smalin@nvidia.com \
--cc=yorayz@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).