@@ -777,6 +777,8 @@ struct ethtool_ops {
int (*set_module_power_mode)(struct net_device *dev,
const struct ethtool_module_power_mode_params *params,
struct netlink_ext_ack *extack);
+ int (*get_ulp_ddp_stats)(struct net_device *dev, u64 *ulp_ddp_stats);
+ int (*set_ulp_ddp_capabilities)(struct net_device *dev, unsigned long *bits);
};
int ethtool_check_ops(const struct ethtool_ops *ops);
@@ -52,6 +52,8 @@ enum {
ETHTOOL_MSG_PSE_GET,
ETHTOOL_MSG_PSE_SET,
ETHTOOL_MSG_RSS_GET,
+ ETHTOOL_MSG_ULP_DDP_GET,
+ ETHTOOL_MSG_ULP_DDP_SET,
/* add new constants above here */
__ETHTOOL_MSG_USER_CNT,
@@ -99,6 +101,8 @@ enum {
ETHTOOL_MSG_MODULE_NTF,
ETHTOOL_MSG_PSE_GET_REPLY,
ETHTOOL_MSG_RSS_GET_REPLY,
+ ETHTOOL_MSG_ULP_DDP_GET_REPLY,
+ ETHTOOL_MSG_ULP_DDP_SET_REPLY,
/* add new constants above here */
__ETHTOOL_MSG_KERNEL_CNT,
@@ -894,6 +898,51 @@ enum {
ETHTOOL_A_RSS_MAX = (__ETHTOOL_A_RSS_CNT - 1),
};
+/* 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_COUNT, /* u32 */
+ ETHTOOL_A_ULP_DDP_STATS_COMPACT_VALUES, /* array, u64 */
+ ETHTOOL_A_ULP_DDP_STATS_MAP, /* nest - _A_ULP_DDP_STATS_MAP_* */
+
+ /* add new constants above here */
+ __ETHTOOL_A_ULP_DDP_STATS_CNT,
+ ETHTOOL_A_ULP_DDP_STATS_MAX = __ETHTOOL_A_ULP_DDP_STATS_CNT - 1
+};
+
+enum {
+ ETHTOOL_A_ULP_DDP_STATS_MAP_UNSPEC,
+ ETHTOOL_A_ULP_DDP_STATS_MAP_ITEM, /* next - _A_ULP_DDP_STATS_MAP_ITEM_* */
+
+ /* add new constants above here */
+ __ETHTOOL_A_ULP_DDP_STATS_MAP_CNT,
+ ETHTOOL_A_ULP_DDP_STATS_MAP_MAX = __ETHTOOL_A_ULP_DDP_STATS_MAP_CNT - 1
+};
+
+enum {
+ ETHTOOL_A_ULP_DDP_STATS_MAP_ITEM_UNSPEC,
+ ETHTOOL_A_ULP_DDP_STATS_MAP_ITEM_NAME, /* string */
+ ETHTOOL_A_ULP_DDP_STATS_MAP_ITEM_VAL, /* u64 */
+
+ /* add new constants above here */
+ __ETHTOOL_A_ULP_DDP_STATS_MAP_ITEM_CNT,
+ ETHTOOL_A_ULP_DDP_STATS_MAP_ITEM_MAX = __ETHTOOL_A_ULP_DDP_STATS_MAP_ITEM_CNT - 1
+};
+
/* generic netlink info */
#define ETHTOOL_GENL_NAME "ethtool"
#define ETHTOOL_GENL_VERSION 1
@@ -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 module.o \
- pse-pd.o
+ pse-pd.o ulp_ddp.o
@@ -288,6 +288,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = {
[ETHTOOL_MSG_MODULE_GET] = ðnl_module_request_ops,
[ETHTOOL_MSG_PSE_GET] = ðnl_pse_request_ops,
[ETHTOOL_MSG_RSS_GET] = ðnl_rss_request_ops,
+ [ETHTOOL_MSG_ULP_DDP_GET] = ðnl_ulp_ddp_request_ops,
};
static struct ethnl_dump_ctx *ethnl_dump_context(struct netlink_callback *cb)
@@ -1047,6 +1048,22 @@ static const struct genl_ops ethtool_genl_ops[] = {
.policy = ethnl_rss_get_policy,
.maxattr = ARRAY_SIZE(ethnl_rss_get_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[] = {
@@ -347,6 +347,7 @@ extern const struct ethnl_request_ops ethnl_phc_vclocks_request_ops;
extern const struct ethnl_request_ops ethnl_module_request_ops;
extern const struct ethnl_request_ops ethnl_pse_request_ops;
extern const struct ethnl_request_ops ethnl_rss_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];
@@ -388,6 +389,8 @@ extern const struct nla_policy ethnl_module_set_policy[ETHTOOL_A_MODULE_POWER_MO
extern const struct nla_policy ethnl_pse_get_policy[ETHTOOL_A_PSE_HEADER + 1];
extern const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1];
extern const struct nla_policy ethnl_rss_get_policy[ETHTOOL_A_RSS_CONTEXT + 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);
@@ -408,6 +411,7 @@ int ethnl_tunnel_info_dumpit(struct sk_buff *skb, struct netlink_callback *cb);
int ethnl_set_fec(struct sk_buff *skb, struct genl_info *info);
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_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];
new file mode 100644
@@ -0,0 +1,430 @@
+// 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_caps.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
+}
+
+/* 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);
+ const char (*stat_names)[ETH_GSTRING_LEN];
+ int stat_count;
+ u64 *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),
+};
+
+/* When requested (ETHTOOL_FLAG_STATS) ULP DDP stats are appended to
+ * the response.
+ *
+ * Similar to bitsets, stats can be in a compact or verbose form.
+ *
+ * The verbose form is as follow:
+ *
+ * STATS (nest)
+ * COUNT (u32)
+ * MAP (nest)
+ * ITEM (nest)
+ * NAME (strz)
+ * VAL (u64)
+ * ...
+ *
+ * The compact form is as follow:
+ *
+ * STATS (nest)
+ * COUNT (u32)
+ * COMPACT_VALUES (array of u64)
+ *
+ */
+static int ulp_ddp_stats64_size(const struct ethnl_req_info *req_base,
+ const struct ethnl_reply_data *reply_base,
+ ethnl_string_array_t names,
+ unsigned int count,
+ bool compact)
+{
+ unsigned int len = 0;
+ unsigned int i;
+
+ /* count */
+ len += nla_total_size(sizeof(u32));
+
+ if (compact) {
+ /* values */
+ len += nla_total_size(count * sizeof(u64));
+ } else {
+ unsigned int maplen = 0;
+
+ for (i = 0; i < count; i++) {
+ unsigned int itemlen = 0;
+
+ /* name */
+ itemlen += ethnl_strz_size(names[i]);
+ /* value */
+ itemlen += nla_total_size(sizeof(u64));
+
+ /* item nest */
+ maplen += nla_total_size(itemlen);
+ }
+
+ /* map nest */
+ len += nla_total_size(maplen);
+ }
+ /* 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, ethnl_string_array_t names, bool compact)
+{
+ struct nlattr *nest;
+ struct nlattr *attr;
+
+ nest = nla_nest_start(skb, attrtype);
+ if (!nest)
+ return -EMSGSIZE;
+
+ if (nla_put_u32(skb, ETHTOOL_A_ULP_DDP_STATS_COUNT, count))
+ goto nla_put_failure;
+ if (compact) {
+ unsigned int nbytes = count * sizeof(*val);
+ u64 *dst;
+
+ attr = nla_reserve(skb, ETHTOOL_A_ULP_DDP_STATS_COMPACT_VALUES, nbytes);
+ if (!attr)
+ goto nla_put_failure;
+ dst = nla_data(attr);
+ memcpy(dst, val, nbytes);
+ } else {
+ struct nlattr *map;
+ unsigned int i;
+
+ map = nla_nest_start(skb, ETHTOOL_A_ULP_DDP_STATS_MAP);
+ if (!map)
+ goto nla_put_failure;
+ for (i = 0; i < count; i++) {
+ attr = nla_nest_start(skb, ETHTOOL_A_ULP_DDP_STATS_MAP_ITEM);
+ if (!attr)
+ goto nla_put_failure;
+ if (ethnl_put_strz(skb, ETHTOOL_A_ULP_DDP_STATS_MAP_ITEM_NAME, names[i]))
+ goto nla_put_failure;
+ if (nla_put_u64_64bit(skb, ETHTOOL_A_ULP_DDP_STATS_MAP_ITEM_VAL,
+ val[i], -1))
+ goto nla_put_failure;
+ nla_nest_end(skb, attr);
+ }
+ nla_nest_end(skb, map);
+ }
+ 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)
+{
+ struct ulp_ddp_reply_data *data = ULP_DDP_REPDATA(reply_base);
+ bool compact = req_base->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
+ const struct ethtool_ops *ops = reply_base->dev->ethtool_ops;
+ struct net_device *dev = reply_base->dev;
+ struct ulp_ddp_netdev_caps *caps;
+ int nstats;
+
+ caps = netdev_ulp_ddp_caps(dev);
+ if (!caps)
+ 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_sset_count || !ops->get_strings || !ops->get_ulp_ddp_stats)
+ return -EOPNOTSUPP;
+
+ nstats = ops->get_sset_count(dev, ETH_SS_ULP_DDP_STATS);
+ if (nstats < 0)
+ return nstats;
+
+ data->stats = kcalloc(nstats, sizeof(u64), GFP_KERNEL);
+ if (!data->stats)
+ return -ENOMEM;
+
+ if (!compact) {
+ data->stat_names = kcalloc(nstats, ETH_GSTRING_LEN, GFP_KERNEL);
+ if (!data->stat_names) {
+ kfree(data->stats);
+ return -ENOMEM;
+ }
+ ops->get_strings(dev, ETH_SS_ULP_DDP_STATS,
+ (u8 *)data->stat_names);
+ }
+ data->stat_count = nstats;
+ ops->get_ulp_ddp_stats(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_names, compact);
+ if (ret < 0)
+ return ret;
+ len += ret;
+ ret = ethnl_bitset_size(data->active, NULL, ULP_DDP_C_COUNT,
+ ulp_ddp_names, compact);
+ if (ret < 0)
+ return ret;
+ len += ret;
+
+ if ((req_base->flags & ETHTOOL_FLAG_STATS) && data->stats) {
+ ret = ulp_ddp_stats64_size(req_base, reply_base,
+ data->stat_names, data->stat_count, compact);
+ 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_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_names, compact);
+ if (ret < 0)
+ return ret;
+
+ if ((req_base->flags & ETHTOOL_FLAG_STATS) && data->stats) {
+ ret = ulp_ddp_put_stats64(skb, ETHTOOL_A_ULP_DDP_STATS,
+ data->stats,
+ data->stat_count,
+ data->stat_names,
+ compact);
+ if (ret < 0)
+ return ret;
+ }
+ return ret;
+}
+
+static void ulp_ddp_cleanup_data(struct ethnl_reply_data *reply_data)
+{
+ struct ulp_ddp_reply_data *data = ULP_DDP_REPDATA(reply_data);
+
+ kfree(data->stat_names);
+ kfree(data->stats);
+}
+
+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,
+ .cleanup_data = ulp_ddp_cleanup_data,
+};
+
+/* 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_names, compact);
+ if (ret < 0)
+ goto err;
+ reply_len += ret;
+ ret = ethnl_bitset_size(active, active_mask, ULP_DDP_C_COUNT,
+ ulp_ddp_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_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_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 = {};
+ 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);
+ if (!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_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 = dev->ethtool_ops->set_ulp_ddp_capabilities(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;
+}
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 - 2 new netdev ethtool_ops operations: * ethtool_ops->get_ulp_ddp_stats(): retrieve device statistics * ethtool_ops->set_ulp_ddp_capabilities(): try to apply capability changes 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 per-device statistics are returned to userspace. Similar to netdev features, ULP_DDP_GET capabilities and statistics can be returned in a verbose (default) or compact form (if ETHTOOL_FLAG_COMPACT_BITSET is set in header flags). Verbose statistics are nested as follows: STATS (nest) COUNT (u32) MAP (nest) ITEM (nest) NAME (strz) VAL (u64) ... Compact statistics are nested as follows: STATS (nest) COUNT (u32) COMPACT_VALUES (array of u64) Signed-off-by: Shai Malin <smalin@nvidia.com> Signed-off-by: Aurelien Aptel <aaptel@nvidia.com> --- include/linux/ethtool.h | 2 + include/uapi/linux/ethtool_netlink.h | 49 +++ net/ethtool/Makefile | 2 +- net/ethtool/netlink.c | 17 ++ net/ethtool/netlink.h | 4 + net/ethtool/ulp_ddp.c | 430 +++++++++++++++++++++++++++ 6 files changed, 503 insertions(+), 1 deletion(-) create mode 100644 net/ethtool/ulp_ddp.c