@@ -3833,6 +3833,30 @@ static void pr_out_port_pfvfsf_num(struct dl *dl, struct nlattr **tb)
}
}
+static const char *port_function_state(uint8_t state)
+{
+ switch (state) {
+ case DEVLINK_PORT_FN_STATE_INACTIVE:
+ return "inactive";
+ case DEVLINK_PORT_FN_STATE_ACTIVE:
+ return "active";
+ default:
+ return "unknown";
+ }
+}
+
+static const char *port_function_opstate(uint8_t state)
+{
+ switch (state) {
+ case DEVLINK_PORT_FN_OPSTATE_DETACHED:
+ return "detached";
+ case DEVLINK_PORT_FN_OPSTATE_ATTACHED:
+ return "attached";
+ default:
+ return "unknown";
+ }
+}
+
static void pr_out_port_function(struct dl *dl, struct nlattr **tb_port)
{
struct nlattr *tb[DEVLINK_PORT_FUNCTION_ATTR_MAX + 1] = {};
@@ -3849,16 +3873,31 @@ static void pr_out_port_function(struct dl *dl, struct nlattr **tb_port)
if (err != MNL_CB_OK)
return;
- if (!tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR])
- return;
-
- len = mnl_attr_get_payload_len(tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR]);
- data = mnl_attr_get_payload(tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR]);
-
pr_out_object_start(dl, "function");
check_indent_newline(dl);
- print_string(PRINT_ANY, "hw_addr", "hw_addr %s",
- ll_addr_n2a(data, len, 0, hw_addr, sizeof(hw_addr)));
+
+ if (tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR]) {
+ len = mnl_attr_get_payload_len(tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR]);
+ data = mnl_attr_get_payload(tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR]);
+
+ print_string(PRINT_ANY, "hw_addr", "hw_addr %s",
+ ll_addr_n2a(data, len, 0, hw_addr, sizeof(hw_addr)));
+ }
+ if (tb[DEVLINK_PORT_FN_ATTR_STATE]) {
+ uint8_t state;
+
+ state = mnl_attr_get_u8(tb[DEVLINK_PORT_FN_ATTR_STATE]);
+
+ print_string(PRINT_ANY, "state", " state %s", port_function_state(state));
+ }
+ if (tb[DEVLINK_PORT_FN_ATTR_OPSTATE]) {
+ uint8_t state;
+
+ state = mnl_attr_get_u8(tb[DEVLINK_PORT_FN_ATTR_OPSTATE]);
+
+ print_string(PRINT_ANY, "opstate", " opstate %s", port_function_opstate(state));
+ }
+
if (!dl->json_output)
__pr_out_indent_dec();
pr_out_object_end(dl);
Print port function state and operational state whenever reported by kernel. Example of a PCI SF port function which supports the state: $ devlink dev eswitch set pci/0000:06:00.0 mode switchdev $ devlink port show pci/0000:06:00.0/65535: type eth netdev ens2f0np0 flavour physical port 0 splittable false $ devlink port add pci/0000:06:00.0 flavour pcisf pfnum 0 sfnum 88 pci/0000:08:00.0/32768: type eth netdev eth6 flavour pcisf controller 0 pfnum 0 sfnum 88 splittable false function: hw_addr 00:00:00:00:00:00 state inactive opstate detached $ devlink port show pci/0000:06:00.0/32768 pci/0000:06:00.0/32768: type eth netdev ens2f0npf0sf88 flavour pcisf controller 0 pfnum 0 sfnum 88 splittable false function: hw_addr 00:00:00:00:00:00 state inactive opstate detached $ devlink port function set pci/0000:06:00.0/32768 hw_addr 00:00:00:00:88:88 $ devlink port show pci/0000:06:00.0/32768 -jp { "port": { "pci/0000:06:00.0/32768": { "type": "eth", "netdev": "ens2f0npf0sf88", "flavour": "pcisf", "controller": 0, "pfnum": 0, "sfnum": 88, "splittable": false, "function": { "hw_addr": "00:00:00:00:88:88", "state": "inactive", "opstate": "detached" } } } } Signed-off-by: Parav Pandit <parav@nvidia.com> Reviewed-by: Jiri Pirko <jiri@nvidia.com> --- devlink/devlink.c | 55 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 8 deletions(-)