From e3610d3ea2c8d88c3dd61d845a682f74a1af1d1f Mon Sep 17 00:00:00 2001

Message-Id: <e3610d3ea2c8d88c3dd61d845a682f74a1af1d1f.1643220552.git.aclaudi@redhat.com>

In-Reply-To: <b30268eda844bdebbb8e5e4f5735e3b1bb666368.1643220552.git.aclaudi@redhat.com>

References: <b30268eda844bdebbb8e5e4f5735e3b1bb666368.1643220552.git.aclaudi@redhat.com>

From: Andrea Claudi <aclaudi@redhat.com>

Date: Wed, 26 Jan 2022 10:39:38 +0100

Subject: [PATCH] vdpa: Enable user to query vdpa device config layout

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2036880

Upstream Status: iproute2.git commit a311f0c4

commit a311f0c43a67be939dfafda563453a3f9bf30e42

Author: Parav Pandit <parav@nvidia.com>

Date:   Fri Dec 17 10:08:25 2021 +0200

    vdpa: Enable user to query vdpa device config layout

    Query the device configuration layout whenever kernel supports it.

    An example of configuration layout of vdpa device of type network:

    $ vdpa dev add name bar mgmtdev vdpasim_net

    $ vdpa dev config show

    bar: mac 00:35:09:19:48:05 link up link_announce false mtu 1500

    $ vdpa dev config show -jp

    {

        "config": {

            "bar": {

                "mac": "00:35:09:19:48:05",

                "link ": "up",

                "link_announce ": false,

                "mtu": 1500,

            }

        }

    }

    Signed-off-by: Parav Pandit <parav@nvidia.com>

    Signed-off-by: David Ahern <dsahern@kernel.org>

---

 man/man8/vdpa-dev.8 |  21 +++++++++

 vdpa/vdpa.c         | 110 ++++++++++++++++++++++++++++++++++++++++++++

 2 files changed, 131 insertions(+)

diff --git a/man/man8/vdpa-dev.8 b/man/man8/vdpa-dev.8

index 36433519..5d3a3f26 100644

--- a/man/man8/vdpa-dev.8

+++ b/man/man8/vdpa-dev.8

@@ -36,6 +36,10 @@ vdpa-dev \- vdpa device configuration

 .B vdpa dev del

 .I DEV

+.ti -8

+.B vdpa dev config show

+.RI "[ " DEV " ]"

+

 .SH "DESCRIPTION"

 .SS vdpa dev show - display vdpa device attributes

@@ -65,6 +69,18 @@ Name of the management device to use for device addition.

 .I "DEV"

 - specifies the vdpa device to delete.

+.SS vdpa dev config show - Show configuration of specific device or all devices.

+

+.PP

+.I "DEV"

+- specifies the vdpa device to show its configuration.

+If this argument is omitted all devices configuration is listed.

+

+.in +4

+Format is:

+.in +2

+VDPA_DEVICE_NAME

+

 .SH "EXAMPLES"

 .PP

 vdpa dev show

@@ -86,6 +102,11 @@ vdpa dev del foo

 .RS 4

 Delete the vdpa device named foo which was previously created.

 .RE

+.PP

+vdpa dev config show foo

+.RS 4

+Shows the vdpa device configuration of device named foo.

+.RE

 .SH SEE ALSO

 .BR vdpa (8),

diff --git a/vdpa/vdpa.c b/vdpa/vdpa.c

index 7fdb36b9..ba704254 100644

--- a/vdpa/vdpa.c

+++ b/vdpa/vdpa.c

@@ -6,9 +6,11 @@

 #include <linux/genetlink.h>

 #include <linux/vdpa.h>

 #include <linux/virtio_ids.h>

+#include <linux/virtio_net.h>

 #include <linux/netlink.h>

 #include <libmnl/libmnl.h>

 #include "mnl_utils.h"

+#include <rt_names.h>

 #include "version.h"

 #include "json_print.h"

@@ -413,6 +415,7 @@ static void cmd_dev_help(void)

 	fprintf(stderr, "Usage: vdpa dev show [ DEV ]\n");

 	fprintf(stderr, "       vdpa dev add name NAME mgmtdev MANAGEMENTDEV\n");

 	fprintf(stderr, "       vdpa dev del DEV\n");

+	fprintf(stderr, "Usage: vdpa dev config COMMAND [ OPTIONS ]\n");

 }

 static const char *device_type_name(uint32_t type)

@@ -520,6 +523,111 @@ static int cmd_dev_del(struct vdpa *vdpa,  int argc, char **argv)

 	return mnlu_gen_socket_sndrcv(&vdpa->nlg, nlh, NULL, NULL);

 }

+static void pr_out_dev_net_config(struct nlattr **tb)

+{

+	SPRINT_BUF(macaddr);

+	uint16_t val_u16;

+

+	if (tb[VDPA_ATTR_DEV_NET_CFG_MACADDR]) {

+		const unsigned char *data;

+		uint16_t len;

+

+		len = mnl_attr_get_payload_len(tb[VDPA_ATTR_DEV_NET_CFG_MACADDR]);

+		data = mnl_attr_get_payload(tb[VDPA_ATTR_DEV_NET_CFG_MACADDR]);

+

+		print_string(PRINT_ANY, "mac", "mac %s ",

+			     ll_addr_n2a(data, len, 0, macaddr, sizeof(macaddr)));

+	}

+	if (tb[VDPA_ATTR_DEV_NET_STATUS]) {

+		val_u16 = mnl_attr_get_u16(tb[VDPA_ATTR_DEV_NET_STATUS]);

+		print_string(PRINT_ANY, "link ", "link %s ",

+			     (val_u16 & VIRTIO_NET_S_LINK_UP) ? "up" : "down");

+		print_bool(PRINT_ANY, "link_announce ", "link_announce %s ",

+			     (val_u16 & VIRTIO_NET_S_ANNOUNCE) ? true : false);

+	}

+	if (tb[VDPA_ATTR_DEV_NET_CFG_MAX_VQP]) {

+		val_u16 = mnl_attr_get_u16(tb[VDPA_ATTR_DEV_NET_CFG_MAX_VQP]);

+		print_uint(PRINT_ANY, "max_vq_pairs", "max_vq_pairs %d ",

+			     val_u16);

+	}

+	if (tb[VDPA_ATTR_DEV_NET_CFG_MTU]) {

+		val_u16 = mnl_attr_get_u16(tb[VDPA_ATTR_DEV_NET_CFG_MTU]);

+		print_uint(PRINT_ANY, "mtu", "mtu %d ", val_u16);

+	}

+}

+

+static void pr_out_dev_config(struct vdpa *vdpa, struct nlattr **tb)

+{

+	uint32_t device_id = mnl_attr_get_u32(tb[VDPA_ATTR_DEV_ID]);

+

+	pr_out_vdev_handle_start(vdpa, tb);

+	switch (device_id) {

+	case VIRTIO_ID_NET:

+		pr_out_dev_net_config(tb);

+		break;

+	default:

+		break;

+	}

+	pr_out_vdev_handle_end(vdpa);

+}

+

+static int cmd_dev_config_show_cb(const struct nlmsghdr *nlh, void *data)

+{

+	struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);

+	struct nlattr *tb[VDPA_ATTR_MAX + 1] = {};

+	struct vdpa *vdpa = data;

+

+	mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);

+	if (!tb[VDPA_ATTR_DEV_NAME] || !tb[VDPA_ATTR_DEV_ID])

+		return MNL_CB_ERROR;

+	pr_out_dev_config(vdpa, tb);

+	return MNL_CB_OK;

+}

+

+static int cmd_dev_config_show(struct vdpa *vdpa, int argc, char **argv)

+{

+	uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;

+	struct nlmsghdr *nlh;

+	int err;

+

+	if (argc <= 0)

+		flags |= NLM_F_DUMP;

+

+	nlh = mnlu_gen_socket_cmd_prepare(&vdpa->nlg, VDPA_CMD_DEV_CONFIG_GET,

+					  flags);

+	if (argc > 0) {

+		err = vdpa_argv_parse_put(nlh, vdpa, argc, argv,

+					  VDPA_OPT_VDEV_HANDLE);

+		if (err)

+			return err;

+	}

+

+	pr_out_section_start(vdpa, "config");

+	err = mnlu_gen_socket_sndrcv(&vdpa->nlg, nlh, cmd_dev_config_show_cb, vdpa);

+	pr_out_section_end(vdpa);

+	return err;

+}

+

+static void cmd_dev_config_help(void)

+{

+	fprintf(stderr, "Usage: vdpa dev config show [ DEV ]\n");

+}

+

+static int cmd_dev_config(struct vdpa *vdpa, int argc, char **argv)

+{

+	if (!argc)

+		return cmd_dev_config_show(vdpa, argc - 1, argv + 1);

+

+	if (matches(*argv, "help") == 0) {

+		cmd_dev_config_help();

+		return 0;

+	} else if (matches(*argv, "show") == 0) {

+		return cmd_dev_config_show(vdpa, argc - 1, argv + 1);

+	}

+	fprintf(stderr, "Command \"%s\" not found\n", *argv);

+	return -ENOENT;

+}

+

 static int cmd_dev(struct vdpa *vdpa, int argc, char **argv)

 {

 	if (!argc)

@@ -535,6 +643,8 @@ static int cmd_dev(struct vdpa *vdpa, int argc, char **argv)

 		return cmd_dev_add(vdpa, argc - 1, argv + 1);

 	} else if (matches(*argv, "del") == 0) {

 		return cmd_dev_del(vdpa, argc - 1, argv + 1);

+	} else if (matches(*argv, "config") == 0) {

+		return cmd_dev_config(vdpa, argc - 1, argv + 1);

 	}

 	fprintf(stderr, "Command \"%s\" not found\n", *argv);

 	return -ENOENT;

-- 

2.34.1