This patchset is related to the proposed "add PLCA RS support and onsemi
NCN26000" patchset on the kernel. It adds userland support for
getting/setting the configuration of the Physical Layer Collision
Avoidance (PLCA) Reconciliation Sublayer (RS) defined in the IEEE 802.3
specifications, amended by IEEE802.3cg-2019.
Piergiorgio Beruto (2):
Update UAPI files
Add support for IEEE 802.3cg-2019 Clause 148 - PLCA RS
Makefile.am | 1 +
ethtool.c | 21 +++
netlink/extapi.h | 6 +
netlink/plca.c | 311 +++++++++++++++++++++++++++++++++++
netlink/settings.c | 86 +++++++++-
uapi/linux/ethtool.h | 104 ++++++++++--
uapi/linux/ethtool_netlink.h | 49 +++++-
uapi/linux/genetlink.h | 6 +-
uapi/linux/if_link.h | 23 ++-
uapi/linux/netlink.h | 41 +++--
uapi/linux/rtnetlink.h | 8 +-
11 files changed, 616 insertions(+), 40 deletions(-)
create mode 100644 netlink/plca.c
--
2.35.1
This patch adds support for the Physical Layer Collision Avoidance
Reconciliation Sublayer which was introduced in the IEEE 802.3 standard
by the 802.3cg working group in 2019.
The ethtool interface has been extended as follows:
- show if the device supports PLCA when ethtool is invoked without FLAGS
- additionally show what PLCA version is supported
- show the current PLCA status
- add FLAGS for getting and setting the PLCA configuration
Signed-off-by: Piergiorgio Beruto <[email protected]>
---
Makefile.am | 1 +
ethtool.c | 21 +++
netlink/extapi.h | 6 +
netlink/plca.c | 311 +++++++++++++++++++++++++++++++++++++++++++++
netlink/settings.c | 86 ++++++++++++-
5 files changed, 424 insertions(+), 1 deletion(-)
create mode 100644 netlink/plca.c
diff --git a/Makefile.am b/Makefile.am
index fcc912edd7e4..b184b8ceb28a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,7 @@ ethtool_SOURCES += \
netlink/desc-ethtool.c netlink/desc-genlctrl.c \
netlink/module-eeprom.c netlink/module.c \
netlink/desc-rtnl.c netlink/cable_test.c netlink/tunnels.c \
+ netlink/plca.c \
uapi/linux/ethtool_netlink.h \
uapi/linux/netlink.h uapi/linux/genetlink.h \
uapi/linux/rtnetlink.h uapi/linux/if_link.h
diff --git a/ethtool.c b/ethtool.c
index 3207e49137c4..d23406f54a37 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -6075,6 +6075,27 @@ static const struct option args[] = {
.help = "Set transceiver module settings",
.xhelp = " [ power-mode-policy high|auto ]\n"
},
+ {
+ .opts = "--get-plca-cfg",
+ .nlfunc = nl_plca_get_cfg,
+ .help = "Get PLCA configuration",
+ },
+ {
+ .opts = "--set-plca-cfg",
+ .nlfunc = nl_plca_set_cfg,
+ .help = "Set PLCA configuration",
+ .xhelp = " [ enable on|off ]\n"
+ " [ node-id N ]\n"
+ " [ node-cnt N ]\n"
+ " [ to-tmr N ]\n"
+ " [ burst-cnt N ]\n"
+ " [ burst-tmr N ]\n"
+ },
+ {
+ .opts = "--get-plca-status",
+ .nlfunc = nl_plca_get_status,
+ .help = "Get PLCA status information",
+ },
{
.opts = "-h|--help",
.no_dev = true,
diff --git a/netlink/extapi.h b/netlink/extapi.h
index 1bb580a889a8..0add156e644a 100644
--- a/netlink/extapi.h
+++ b/netlink/extapi.h
@@ -47,6 +47,9 @@ int nl_gmodule(struct cmd_context *ctx);
int nl_smodule(struct cmd_context *ctx);
int nl_monitor(struct cmd_context *ctx);
int nl_getmodule(struct cmd_context *ctx);
+int nl_plca_get_cfg(struct cmd_context *ctx);
+int nl_plca_set_cfg(struct cmd_context *ctx);
+int nl_plca_get_status(struct cmd_context *ctx);
void nl_monitor_usage(void);
@@ -114,6 +117,9 @@ nl_get_eeprom_page(struct cmd_context *ctx __maybe_unused,
#define nl_getmodule NULL
#define nl_gmodule NULL
#define nl_smodule NULL
+#define nl_get_plca_cfg NULL
+#define nl_set_plca_cfg NULL
+#define nl_get_plca_status NULL
#endif /* ETHTOOL_ENABLE_NETLINK */
diff --git a/netlink/plca.c b/netlink/plca.c
new file mode 100644
index 000000000000..19818598ec55
--- /dev/null
+++ b/netlink/plca.c
@@ -0,0 +1,311 @@
+/*
+ * plca.c - netlink implementation of plca command
+ *
+ * Implementation of "ethtool --show-plca <dev>" and
+ * "ethtool --set-plca <dev> ..."
+ */
+
+#include <errno.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "../internal.h"
+#include "../common.h"
+#include "netlink.h"
+#include "bitset.h"
+#include "parser.h"
+
+/* PLCA_GET_CFG */
+
+int plca_get_cfg_reply_cb(const struct nlmsghdr *nlhdr, void *data)
+{
+ const struct nlattr *tb[ETHTOOL_A_PLCA_MAX + 1] = {};
+ DECLARE_ATTR_TB_INFO(tb);
+ struct nl_context *nlctx = data;
+ bool silent;
+ int err_ret;
+ u8 id = 255;
+ int ret;
+ u8 val;
+
+ silent = nlctx->is_dump || nlctx->is_monitor;
+ err_ret = silent ? MNL_CB_OK : MNL_CB_ERROR;
+ ret = mnl_attr_parse(nlhdr, GENL_HDRLEN, attr_cb, &tb_info);
+ if (ret < 0)
+ return err_ret;
+
+ nlctx->devname = get_dev_name(tb[ETHTOOL_A_PLCA_HEADER]);
+ if (!dev_ok(nlctx))
+ return err_ret;
+
+ if (silent)
+ putchar('\n');
+
+ printf("PLCA settings for %s:\n", nlctx->devname);
+
+ // check if PLCA is enabled
+ printf("\tEnabled: ");
+
+ if (!tb[ETHTOOL_A_PLCA_ENABLED]) {
+ printf("not supported");
+ }
+ else {
+ val = mnl_attr_get_u8(tb[ETHTOOL_A_PLCA_ENABLED]);
+ printf(val ? "Yes" : "No");
+ }
+ putchar('\n');
+
+ // get node ID
+ printf("\tlocal node ID: ");
+
+ if (!tb[ETHTOOL_A_PLCA_NODE_ID]) {
+ printf("not supported");
+ }
+ else {
+ id = mnl_attr_get_u8(tb[ETHTOOL_A_PLCA_NODE_ID]);
+ printf("%u (%s)", (unsigned int)id,
+ id == 0 ? "coordinator" :
+ id == 255 ? "unconfigured" : "follower");
+ }
+ putchar('\n');
+
+ // get node count
+ printf("\tNode count: ");
+ if (!tb[ETHTOOL_A_PLCA_NODE_CNT]) {
+ printf("not supported");
+ }
+ else {
+ val = mnl_attr_get_u8(tb[ETHTOOL_A_PLCA_NODE_CNT]);
+ printf("%u", (unsigned int)val);
+
+ // The node count is ignored by follower nodes. However, it can
+ // be pre-set to enable fast coordinator role switchover.
+ // Therefore, on a follower node we still wanto to show it,
+ // indicating it is not currently used.
+ if (tb[ETHTOOL_A_PLCA_NODE_ID] && id != 0)
+ printf(" (ignored)");
+ }
+ putchar('\n');
+
+ // get TO timer (transmit opportunity timer)
+ printf("\tTO timer: ");
+ if (!tb[ETHTOOL_A_PLCA_TO_TMR]) {
+ printf("not supported");
+ }
+ else {
+ val = mnl_attr_get_u8(tb[ETHTOOL_A_PLCA_TO_TMR]);
+ printf("%u BT", (unsigned int) val);
+ }
+ putchar('\n');
+
+ // get burst count
+ printf("\tBurst count: ");
+ if (!tb[ETHTOOL_A_PLCA_BURST_CNT]) {
+ printf("not supported");
+ }
+ else {
+ val = mnl_attr_get_u8(tb[ETHTOOL_A_PLCA_BURST_CNT]);
+ printf("%u (%s)", (unsigned int) val,
+ val > 0 ? "enabled" : "disabled");
+ }
+ putchar('\n');
+
+ // get burst timer
+ printf("\tBurst timer: ");
+ if (!tb[ETHTOOL_A_PLCA_BURST_TMR]) {
+ printf("not supported");
+ }
+ else {
+ val = mnl_attr_get_u8(tb[ETHTOOL_A_PLCA_BURST_TMR]);
+ printf("%u BT", (unsigned int) val);
+ }
+ putchar('\n');
+
+ return MNL_CB_OK;
+}
+
+
+int nl_plca_get_cfg(struct cmd_context *ctx)
+{
+ struct nl_context *nlctx = ctx->nlctx;
+ struct nl_socket *nlsk = nlctx->ethnl_socket;
+ int ret;
+
+ if (netlink_cmd_check(ctx, ETHTOOL_MSG_PLCA_GET_CFG, true))
+ return -EOPNOTSUPP;
+
+ if (ctx->argc > 0) {
+ fprintf(stderr, "ethtool: unexpected parameter '%s'\n",
+ *ctx->argp);
+ return 1;
+ }
+
+ ret = nlsock_prep_get_request(
+ nlsk,
+ ETHTOOL_MSG_PLCA_GET_CFG,
+ ETHTOOL_A_PLCA_HEADER,
+ 0
+ );
+
+ if (ret < 0)
+ return ret;
+
+ return nlsock_send_get_request(nlsk, plca_get_cfg_reply_cb);
+}
+
+/* PLCA_SET_CFG */
+
+static const struct param_parser set_plca_params[] = {
+ {
+ .arg = "enable",
+ .type = ETHTOOL_A_PLCA_ENABLED,
+ .handler = nl_parse_u8bool,
+ .min_argc = 1,
+ },
+ {
+ .arg = "node-id",
+ .type = ETHTOOL_A_PLCA_NODE_ID,
+ .handler = nl_parse_direct_u8,
+ .min_argc = 1,
+ },
+ {
+ .arg = "node-cnt",
+ .type = ETHTOOL_A_PLCA_NODE_CNT,
+ .handler = nl_parse_direct_u8,
+ .min_argc = 1,
+ },
+ {
+ .arg = "to-tmr",
+ .type = ETHTOOL_A_PLCA_TO_TMR,
+ .handler = nl_parse_direct_u8,
+ .min_argc = 1,
+ },
+ {
+ .arg = "burst-cnt",
+ .type = ETHTOOL_A_PLCA_BURST_CNT,
+ .handler = nl_parse_direct_u8,
+ .min_argc = 1,
+ },
+ {
+ .arg = "burst-tmr",
+ .type = ETHTOOL_A_PLCA_BURST_TMR,
+ .handler = nl_parse_direct_u8,
+ .min_argc = 1,
+ },
+ {}
+};
+
+int nl_plca_set_cfg(struct cmd_context *ctx)
+{
+ struct nl_context *nlctx = ctx->nlctx;
+ struct nl_msg_buff *msgbuff;
+ struct nl_socket *nlsk;
+ int ret;
+
+ if (netlink_cmd_check(ctx, ETHTOOL_MSG_PLCA_SET_CFG, false))
+ return -EOPNOTSUPP;
+ if (!ctx->argc) {
+ fprintf(stderr,
+ "ethtool (--set-plca-cfg): parameters missing\n");
+ return 1;
+ }
+
+ nlctx->cmd = "--set-plca-cfg";
+ nlctx->argp = ctx->argp;
+ nlctx->argc = ctx->argc;
+ nlctx->devname = ctx->devname;
+ nlsk = nlctx->ethnl_socket;
+ msgbuff = &nlsk->msgbuff;
+
+ ret = msg_init(nlctx, msgbuff, ETHTOOL_MSG_PLCA_SET_CFG,
+ NLM_F_REQUEST | NLM_F_ACK);
+ if (ret < 0)
+ return 2;
+ if (ethnla_fill_header(msgbuff, ETHTOOL_A_PLCA_HEADER,
+ ctx->devname, 0))
+ return -EMSGSIZE;
+
+ ret = nl_parser(nlctx, set_plca_params, NULL, PARSER_GROUP_NONE, NULL);
+ if (ret < 0)
+ return 1;
+
+ ret = nlsock_sendmsg(nlsk, NULL);
+ if (ret < 0)
+ return 76;
+ ret = nlsock_process_reply(nlsk, nomsg_reply_cb, nlctx);
+ if (ret == 0)
+ return 0;
+ else
+ return nlctx->exit_code ?: 76;
+}
+
+/* PLCA_GET_STATUS */
+
+int plca_get_status_reply_cb(const struct nlmsghdr *nlhdr, void *data)
+{
+ const struct nlattr *tb[ETHTOOL_A_PLCA_MAX + 1] = {};
+ DECLARE_ATTR_TB_INFO(tb);
+ struct nl_context *nlctx = data;
+ bool silent;
+ int err_ret;
+ int ret;
+ u8 val;
+
+ silent = nlctx->is_dump || nlctx->is_monitor;
+ err_ret = silent ? MNL_CB_OK : MNL_CB_ERROR;
+ ret = mnl_attr_parse(nlhdr, GENL_HDRLEN, attr_cb, &tb_info);
+ if (ret < 0)
+ return err_ret;
+
+ nlctx->devname = get_dev_name(tb[ETHTOOL_A_PLCA_HEADER]);
+ if (!dev_ok(nlctx))
+ return err_ret;
+
+ if (silent)
+ putchar('\n');
+
+ printf("PLCA status of %s:\n", nlctx->devname);
+
+ // check whether the Open Alliance TC14 standard memory map is supported
+ printf("\tStatus: ");
+
+ if (!tb[ETHTOOL_A_PLCA_STATUS]) {
+ printf("not supported");
+ }
+ else {
+ val = mnl_attr_get_u8(tb[ETHTOOL_A_PLCA_STATUS]);
+ printf(val ? "on" : "off");
+ }
+ putchar('\n');
+
+ return MNL_CB_OK;
+}
+
+
+int nl_plca_get_status(struct cmd_context *ctx)
+{
+ struct nl_context *nlctx = ctx->nlctx;
+ struct nl_socket *nlsk = nlctx->ethnl_socket;
+ int ret;
+
+ if (netlink_cmd_check(ctx, ETHTOOL_MSG_PLCA_GET_STATUS, true))
+ return -EOPNOTSUPP;
+
+ if (ctx->argc > 0) {
+ fprintf(stderr, "ethtool: unexpected parameter '%s'\n",
+ *ctx->argp);
+ return 1;
+ }
+
+ ret = nlsock_prep_get_request(
+ nlsk,
+ ETHTOOL_MSG_PLCA_GET_STATUS,
+ ETHTOOL_A_PLCA_HEADER,
+ 0
+ );
+
+ if (ret < 0)
+ return ret;
+
+ return nlsock_send_get_request(nlsk, plca_get_status_reply_cb);
+}
diff --git a/netlink/settings.c b/netlink/settings.c
index ea86e365383b..25c5e7848fb7 100644
--- a/netlink/settings.c
+++ b/netlink/settings.c
@@ -165,6 +165,9 @@ static const struct link_mode_info link_modes[] = {
[ETHTOOL_LINK_MODE_100baseFX_Half_BIT] = __HALF_DUPLEX(100),
[ETHTOOL_LINK_MODE_100baseFX_Full_BIT] = __REAL(100),
[ETHTOOL_LINK_MODE_10baseT1L_Full_BIT] = __REAL(10),
+ [ETHTOOL_LINK_MODE_10baseT1S_Full_BIT] = __REAL(10),
+ [ETHTOOL_LINK_MODE_10baseT1S_Half_BIT] = __REAL(10),
+ [ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT] = __REAL(10),
};
const unsigned int link_modes_count = ARRAY_SIZE(link_modes);
@@ -882,6 +885,75 @@ int debug_reply_cb(const struct nlmsghdr *nlhdr, void *data)
return MNL_CB_OK;
}
+int plca_cfg_reply_cb(const struct nlmsghdr *nlhdr, void *data)
+{
+ const struct nlattr *tb[ETHTOOL_A_PLCA_MAX + 1] = {};
+ DECLARE_ATTR_TB_INFO(tb);
+ struct nl_context *nlctx = data;
+ int ret;
+
+ if (nlctx->is_dump || nlctx->is_monitor)
+ nlctx->no_banner = false;
+ ret = mnl_attr_parse(nlhdr, GENL_HDRLEN, attr_cb, &tb_info);
+ if (ret < 0)
+ return ret;
+ nlctx->devname = get_dev_name(tb[ETHTOOL_A_PLCA_HEADER]);
+ if (!dev_ok(nlctx))
+ return MNL_CB_OK;
+
+ print_banner(nlctx);
+ printf("\tPLCA support: ");
+
+ if (tb[ETHTOOL_A_PLCA_VERSION]) {
+ uint16_t val = mnl_attr_get_u16(tb[ETHTOOL_A_PLCA_VERSION]);
+ if ((val >> 8) == 0x0A) {
+ printf("OPEN Alliance v%u.%u",
+ (unsigned int)((val >> 4) & 0xF),
+ (unsigned int)(val & 0xF)
+ );
+ }
+ else
+ printf("unknown standard");
+ }
+ else
+ printf("non-standard");
+
+ printf("\n");
+
+ return MNL_CB_OK;
+}
+
+int plca_status_reply_cb(const struct nlmsghdr *nlhdr, void *data)
+{
+ const struct nlattr *tb[ETHTOOL_A_PLCA_MAX + 1] = {};
+ DECLARE_ATTR_TB_INFO(tb);
+ struct nl_context *nlctx = data;
+ int ret;
+
+ if (nlctx->is_dump || nlctx->is_monitor)
+ nlctx->no_banner = false;
+ ret = mnl_attr_parse(nlhdr, GENL_HDRLEN, attr_cb, &tb_info);
+ if (ret < 0)
+ return ret;
+ nlctx->devname = get_dev_name(tb[ETHTOOL_A_PLCA_HEADER]);
+ if (!dev_ok(nlctx))
+ return MNL_CB_OK;
+
+ print_banner(nlctx);
+ printf("\tPLCA status: ");
+
+ if (tb[ETHTOOL_A_PLCA_STATUS]) {
+ uint8_t val = mnl_attr_get_u8(tb[ETHTOOL_A_PLCA_STATUS]);
+ printf(val ? "up" : "down");
+ }
+ else
+ printf("unknown");
+
+ printf("\n");
+
+ return MNL_CB_OK;
+}
+
static int gset_request(struct nl_socket *nlsk, uint8_t msg_type,
uint16_t hdr_attr, mnl_cb_t cb)
{
@@ -903,7 +975,9 @@ int nl_gset(struct cmd_context *ctx)
netlink_cmd_check(ctx, ETHTOOL_MSG_LINKINFO_GET, true) ||
netlink_cmd_check(ctx, ETHTOOL_MSG_WOL_GET, true) ||
netlink_cmd_check(ctx, ETHTOOL_MSG_DEBUG_GET, true) ||
- netlink_cmd_check(ctx, ETHTOOL_MSG_LINKSTATE_GET, true))
+ netlink_cmd_check(ctx, ETHTOOL_MSG_LINKSTATE_GET, true) ||
+ netlink_cmd_check(ctx, ETHTOOL_MSG_PLCA_GET_CFG, true) ||
+ netlink_cmd_check(ctx, ETHTOOL_MSG_PLCA_GET_STATUS, true))
return -EOPNOTSUPP;
nlctx->suppress_nlerr = 1;
@@ -923,6 +997,11 @@ int nl_gset(struct cmd_context *ctx)
if (ret == -ENODEV)
return ret;
+ ret = gset_request(nlsk, ETHTOOL_MSG_PLCA_GET_CFG,
+ ETHTOOL_A_PLCA_HEADER, plca_cfg_reply_cb);
+ if (ret == -ENODEV)
+ return ret;
+
ret = gset_request(nlsk, ETHTOOL_MSG_DEBUG_GET, ETHTOOL_A_DEBUG_HEADER,
debug_reply_cb);
if (ret == -ENODEV)
@@ -933,6 +1012,11 @@ int nl_gset(struct cmd_context *ctx)
if (ret == -ENODEV)
return ret;
+ ret = gset_request(nlsk, ETHTOOL_MSG_PLCA_GET_STATUS,
+ ETHTOOL_A_PLCA_HEADER, plca_status_reply_cb);
+ if (ret == -ENODEV)
+ return ret;
+
if (!nlctx->no_banner) {
printf("No data available\n");
return 75;
--
2.35.1
On Sun, 4 Dec 2022 03:37:57 +0100 Piergiorgio Beruto wrote:
> This patchset is related to the proposed "add PLCA RS support and onsemi
> NCN26000" patchset on the kernel. It adds userland support for
> getting/setting the configuration of the Physical Layer Collision
> Avoidance (PLCA) Reconciliation Sublayer (RS) defined in the IEEE 802.3
> specifications, amended by IEEE802.3cg-2019.
nit: for the user space patches use the tool name in the subject tag
[PATCH ethtool-next], I bet quite a few people looked at your set
expecting kernel changes ;)
On Mon, 5 Dec 2022 18:05:27 -0800 Jakub Kicinski wrote:
> On Sun, 4 Dec 2022 03:37:57 +0100 Piergiorgio Beruto wrote:
> > This patchset is related to the proposed "add PLCA RS support and onsemi
> > NCN26000" patchset on the kernel. It adds userland support for
> > getting/setting the configuration of the Physical Layer Collision
> > Avoidance (PLCA) Reconciliation Sublayer (RS) defined in the IEEE 802.3
> > specifications, amended by IEEE802.3cg-2019.
>
> nit: for the user space patches use the tool name in the subject tag
> [PATCH ethtool-next], I bet quite a few people looked at your set
> expecting kernel changes ;)
... which you already figured out / was told. Is a very bad day
for my ability to spot next postings of the same set it seems :S
On Mon, Dec 05, 2022 at 08:11:52PM -0800, Jakub Kicinski wrote:
> On Mon, 5 Dec 2022 18:05:27 -0800 Jakub Kicinski wrote:
> > On Sun, 4 Dec 2022 03:37:57 +0100 Piergiorgio Beruto wrote:
> > > This patchset is related to the proposed "add PLCA RS support and onsemi
> > > NCN26000" patchset on the kernel. It adds userland support for
> > > getting/setting the configuration of the Physical Layer Collision
> > > Avoidance (PLCA) Reconciliation Sublayer (RS) defined in the IEEE 802.3
> > > specifications, amended by IEEE802.3cg-2019.
> >
> > nit: for the user space patches use the tool name in the subject tag
> > [PATCH ethtool-next], I bet quite a few people looked at your set
> > expecting kernel changes ;)
>
> ... which you already figured out / was told. Is a very bad day
> for my ability to spot next postings of the same set it seems :S
Thanks Jakub, don't worry, I am still learning the process, so better
one more feedback than none!
BTW, I've just updated the patchset to include all the feedback I did
receiver so far. Hopefully this one is good :-)
Kind Regards,
Piergiorgio