RE: [PATCH v4 3/4] vdpa: Support for configuring max VQ pairs for a device

-----Original Message-----
From: Parav Pandit <redacted>
Sent: Wednesday, March 9, 2022 10:59 AM
To: Eli Cohen <redacted>; stephen@networkplumber.org;
netdev@vger.kernel.org; virtualization@lists.linux-foundation.org
Cc: jasowang@redhat.com; mst@redhat.com; lulu@redhat.com; si-
wei.liu@oracle.com
Subject: RE: [PATCH v4 3/4] vdpa: Support for configuring max VQ pairs for a
device

quoted

From: Eli Cohen <redacted>
Sent: Wednesday, March 2, 2022 12:25 PM

--- a/vdpa/include/uapi/linux/vdpa.h
+++ b/vdpa/include/uapi/linux/vdpa.h

@@ -41,6 +41,7 @@ enum vdpa_attr {
 	VDPA_ATTR_DEV_NET_CFG_MTU,		/* u16 */

 	VDPA_ATTR_DEV_NEGOTIATED_FEATURES,	/* u64 */
+	VDPA_ATTR_DEV_MGMTDEV_MAX_VQS,          /* u32 */

Its u32 here, but in the code below at places, it is mix of u16 and u32.
Please make it consistent to be u32 or u16 to match to kernel at all places.

quoted

 	/* new attributes must be added above here */
 	VDPA_ATTR_MAX,

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

5f1aa91a4b96..22064c755baa 100644

--- a/vdpa/vdpa.c
+++ b/vdpa/vdpa.c

@@ -25,6 +25,7 @@
 #define VDPA_OPT_VDEV_HANDLE		BIT(3)
 #define VDPA_OPT_VDEV_MAC		BIT(4)
 #define VDPA_OPT_VDEV_MTU		BIT(5)
+#define VDPA_OPT_MAX_VQP		BIT(6)

 struct vdpa_opts {
 	uint64_t present; /* flags of present items */ @@ -34,6 +35,7 @@

struct vdpa_opts {
 	unsigned int device_id;
 	char mac[ETH_ALEN];
 	uint16_t mtu;
+	uint16_t max_vqp;
 };

u16 here.

It should be u32. I will fix and resend.

quoted

 struct vdpa {

@@ -81,6 +83,7 @@ static const enum mnl_attr_data_type

vdpa_policy[VDPA_ATTR_MAX + 1] = {
 	[VDPA_ATTR_DEV_MAX_VQS] = MNL_TYPE_U32,
 	[VDPA_ATTR_DEV_MAX_VQ_SIZE] = MNL_TYPE_U16,
 	[VDPA_ATTR_DEV_NEGOTIATED_FEATURES] = MNL_TYPE_U64,
+	[VDPA_ATTR_DEV_MGMTDEV_MAX_VQS] = MNL_TYPE_U32,
 };

u32 here, but code is doing u16.

quoted

 static int attr_cb(const struct nlattr *attr, void *data) @@ -222,6
+225,8 @@ static void vdpa_opts_put(struct nlmsghdr *nlh, struct vdpa

*vdpa)

quoted

 			     sizeof(opts->mac), opts->mac);
 	if (opts->present & VDPA_OPT_VDEV_MTU)
 		mnl_attr_put_u16(nlh, VDPA_ATTR_DEV_NET_CFG_MTU,

opts-

quoted

quoted

mtu);

+	if (opts->present & VDPA_OPT_MAX_VQP)
+		mnl_attr_put_u16(nlh,

VDPA_ATTR_DEV_NET_CFG_MAX_VQP,

quoted

opts->max_vqp);
 }

u16 here.

quoted

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

@@ -

290,6 +295,14 @@ static int vdpa_argv_parse(struct vdpa *vdpa, int
argc, char **argv,

 			NEXT_ARG_FWD();
 			o_found |= VDPA_OPT_VDEV_MTU;
+		} else if ((matches(*argv, "max_vqp")  == 0) && (o_optional &
VDPA_OPT_MAX_VQP)) {
+			NEXT_ARG_FWD();
+			err = vdpa_argv_u16(vdpa, argc, argv, &opts-

quoted

max_vqp);

+			if (err)
+				return err;
+
+			NEXT_ARG_FWD();
+			o_found |= VDPA_OPT_MAX_VQP;
 		} else {
 			fprintf(stderr, "Unknown option \"%s\"\n", *argv);
 			return -EINVAL;

@@ -501,6 +514,15 @@ static void pr_out_mgmtdev_show(struct vdpa

*vdpa, const struct nlmsghdr *nlh,
 		pr_out_array_end(vdpa);
 	}

+	if (tb[VDPA_ATTR_DEV_MGMTDEV_MAX_VQS]) {
+		uint16_t num_vqs;
+
+		if (!vdpa->json_output)
+			printf("\n");
+		num_vqs =
mnl_attr_get_u16(tb[VDPA_ATTR_DEV_MGMTDEV_MAX_VQS]);
+		print_uint(PRINT_ANY, "max_supported_vqs", "
max_supported_vqs %d", num_vqs);
+	}
+
 	pr_out_handle_end(vdpa);
 }

@@ -560,7 +582,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 [ mac MACADDR ] [ mtu MTU ]\n");
+	fprintf(stderr, "       vdpa dev add name NAME mgmtdev
MANAGEMENTDEV [ mac MACADDR ] [ mtu MTU ] [max_vqp

MAX_VQ_PAIRS]\n");

quoted

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

@@ -650,7 +672,8 @@ static int cmd_dev_add(struct vdpa *vdpa, int

argc, char **argv)
 					  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_MAC |
VDPA_OPT_VDEV_MTU);
+				  VDPA_OPT_VDEV_MAC |
VDPA_OPT_VDEV_MTU |
+				  VDPA_OPT_MAX_VQP);
 	if (err)
 		return err;

--
2.35.1