From f5af49ce12667a6331d1a866d52e67fc27308f5d Mon Sep 17 00:00:00 2001

Message-Id: <f5af49ce12667a6331d1a866d52e67fc27308f5d.1647984433.git.aclaudi@redhat.com>

In-Reply-To: <cef782ca658d695c5ca2d174ba1f89cba6bd84e5.1647984433.git.aclaudi@redhat.com>

References: <cef782ca658d695c5ca2d174ba1f89cba6bd84e5.1647984433.git.aclaudi@redhat.com>

From: Andrea Claudi <aclaudi@redhat.com>

Date: Mon, 21 Mar 2022 16:35:15 +0100

Subject: [PATCH] vdpa: Enable user to set mac address of vdpa device

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

Upstream Status: iproute2-next.git commit 384938f9

commit 384938f9b00f2d203603e0919f23ae6857a14d96

Author: Parav Pandit <parav@nvidia.com>

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

    vdpa: Enable user to set mac address of vdpa device

    vdpa: Enable user to set mtu of the vdpa device

    Implement mtu setting for vdpa device.

    $ vdpa mgmtdev show

    vdpasim_net:

      supported_classes net

    Add the device with specified mac address:

    $ vdpa dev add name bar mgmtdev vdpasim_net mac 00:11:22:33:44:55

    View the config after setting:

    $ vdpa dev config show

    bar: mac 00:11:22:33:44:55 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 | 11 ++++++++++

 vdpa/vdpa.c         | 52 ++++++++++++++++++++++++++++++++++++---------

 2 files changed, 53 insertions(+), 10 deletions(-)

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

index 5d3a3f26..5c5ac469 100644

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

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

@@ -31,6 +31,7 @@ vdpa-dev \- vdpa device configuration

 .I NAME

 .B mgmtdev

 .I MGMTDEV

+.RI "[ mac " MACADDR " ]"

 .ti -8

 .B vdpa dev del

@@ -63,6 +64,11 @@ Name of the new vdpa device to add.

 .BI mgmtdev " MGMTDEV"

 Name of the management device to use for device addition.

+.PP

+.BI mac " MACADDR"

+- specifies the mac address for the new vdpa device.

+This is applicable only for the network type of vdpa device. This is optional.

+

 .SS vdpa dev del - Delete the vdpa device.

 .PP

@@ -98,6 +104,11 @@ vdpa dev add name foo mgmtdev vdpa_sim_net

 Add the vdpa device named foo on the management device vdpa_sim_net.

 .RE

 .PP

+vdpa dev add name foo mgmtdev vdpa_sim_net mac 00:11:22:33:44:55

+.RS 4

+Add the vdpa device named foo on the management device vdpa_sim_net with mac address of 00:11:22:33:44:55.

+.RE

+.PP

 vdpa dev del foo

 .RS 4

 Delete the vdpa device named foo which was previously created.

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

index ba704254..63d464d1 100644

--- a/vdpa/vdpa.c

+++ b/vdpa/vdpa.c

@@ -4,6 +4,7 @@

 #include <getopt.h>

 #include <errno.h>

 #include <linux/genetlink.h>

+#include <linux/if_ether.h>

 #include <linux/vdpa.h>

 #include <linux/virtio_ids.h>

 #include <linux/virtio_net.h>

@@ -20,6 +21,7 @@

 #define VDPA_OPT_VDEV_MGMTDEV_HANDLE	BIT(1)

 #define VDPA_OPT_VDEV_NAME		BIT(2)

 #define VDPA_OPT_VDEV_HANDLE		BIT(3)

+#define VDPA_OPT_VDEV_MAC		BIT(4)

 struct vdpa_opts {

 	uint64_t present; /* flags of present items */

@@ -27,6 +29,7 @@ struct vdpa_opts {

 	char *mdev_name;

 	const char *vdev_name;

 	unsigned int device_id;

+	char mac[ETH_ALEN];

 };

 struct vdpa {

@@ -136,6 +139,21 @@ static int vdpa_argv_str(struct vdpa *vdpa, int argc, char **argv,

 	return 0;

 }

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

+{

+	int alen;

+

+	if (argc <= 0 || *argv == NULL) {

+		fprintf(stderr, "String parameter expected\n");

+		return -EINVAL;

+	}

+

+	alen = ll_addr_a2n(mac, ETH_ALEN, *argv);

+	if (alen < 0)

+		return -EINVAL;

+	return 0;

+}

+

 struct vdpa_args_metadata {

 	uint64_t o_flag;

 	const char *err_msg;

@@ -183,13 +201,16 @@ static void vdpa_opts_put(struct nlmsghdr *nlh, struct vdpa *vdpa)

 	if ((opts->present & VDPA_OPT_VDEV_NAME) ||

 	    (opts->present & VDPA_OPT_VDEV_HANDLE))

 		mnl_attr_put_strz(nlh, VDPA_ATTR_DEV_NAME, opts->vdev_name);

+	if (opts->present & VDPA_OPT_VDEV_MAC)

+		mnl_attr_put(nlh, VDPA_ATTR_DEV_NET_CFG_MACADDR,

+			     sizeof(opts->mac), opts->mac);

 }

 static int vdpa_argv_parse(struct vdpa *vdpa, int argc, char **argv,

-			   uint64_t o_required)

+			   uint64_t o_required, uint64_t o_optional)

 {

+	uint64_t o_all = o_required | o_optional;

 	struct vdpa_opts *opts = &vdpa->opts;

-	uint64_t o_all = o_required;

 	uint64_t o_found = 0;

 	int err;

@@ -233,6 +254,15 @@ static int vdpa_argv_parse(struct vdpa *vdpa, int argc, char **argv,

 			NEXT_ARG_FWD();

 			o_found |= VDPA_OPT_VDEV_MGMTDEV_HANDLE;

+		} else if ((strcmp(*argv, "mac") == 0) &&

+			   (o_all & VDPA_OPT_VDEV_MAC)) {

+			NEXT_ARG_FWD();

+			err = vdpa_argv_mac(vdpa, argc, argv, opts->mac);

+			if (err)

+				return err;

+

+			NEXT_ARG_FWD();

+			o_found |= VDPA_OPT_VDEV_MAC;

 		} else {

 			fprintf(stderr, "Unknown option \"%s\"\n", *argv);

 			return -EINVAL;

@@ -246,11 +276,11 @@ static int vdpa_argv_parse(struct vdpa *vdpa, int argc, char **argv,

 static int vdpa_argv_parse_put(struct nlmsghdr *nlh, struct vdpa *vdpa,

 			       int argc, char **argv,

-			       uint64_t o_required)

+			       uint64_t o_required, uint64_t o_optional)

 {

 	int err;

-	err = vdpa_argv_parse(vdpa, argc, argv, o_required);

+	err = vdpa_argv_parse(vdpa, argc, argv, o_required, o_optional);

 	if (err)

 		return err;

 	vdpa_opts_put(nlh, vdpa);

@@ -386,7 +416,7 @@ static int cmd_mgmtdev_show(struct vdpa *vdpa, int argc, char **argv)

 					  flags);

 	if (argc > 0) {

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

-					  VDPA_OPT_MGMTDEV_HANDLE);

+					  VDPA_OPT_MGMTDEV_HANDLE, 0);

 		if (err)

 			return err;

 	}

@@ -413,7 +443,7 @@ static int cmd_mgmtdev(struct vdpa *vdpa, int argc, char **argv)

 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 add name NAME mgmtdev MANAGEMENTDEV [ mac MACADDR ]\n");

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

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

 }

@@ -483,7 +513,7 @@ static int cmd_dev_show(struct vdpa *vdpa, int argc, char **argv)

 	nlh = mnlu_gen_socket_cmd_prepare(&vdpa->nlg, VDPA_CMD_DEV_GET, flags);

 	if (argc > 0) {

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

-					  VDPA_OPT_VDEV_HANDLE);

+					  VDPA_OPT_VDEV_HANDLE, 0);

 		if (err)

 			return err;

 	}

@@ -502,7 +532,8 @@ static int cmd_dev_add(struct vdpa *vdpa, int argc, char **argv)

 	nlh = mnlu_gen_socket_cmd_prepare(&vdpa->nlg, VDPA_CMD_DEV_NEW,

 					  NLM_F_REQUEST | NLM_F_ACK);

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

-				  VDPA_OPT_VDEV_MGMTDEV_HANDLE | VDPA_OPT_VDEV_NAME);

+				  VDPA_OPT_VDEV_MGMTDEV_HANDLE | VDPA_OPT_VDEV_NAME,

+				  VDPA_OPT_VDEV_MAC);

 	if (err)

 		return err;

@@ -516,7 +547,8 @@ static int cmd_dev_del(struct vdpa *vdpa,  int argc, char **argv)

 	nlh = mnlu_gen_socket_cmd_prepare(&vdpa->nlg, VDPA_CMD_DEV_DEL,

 					  NLM_F_REQUEST | NLM_F_ACK);

-	err = vdpa_argv_parse_put(nlh, vdpa, argc, argv, VDPA_OPT_VDEV_HANDLE);

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

+				  0);

 	if (err)

 		return err;

@@ -597,7 +629,7 @@ static int cmd_dev_config_show(struct vdpa *vdpa, int argc, char **argv)

 					  flags);

 	if (argc > 0) {

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

-					  VDPA_OPT_VDEV_HANDLE);

+					  VDPA_OPT_VDEV_HANDLE, 0);

 		if (err)

 			return err;

 	}

-- 

2.35.1