diff mbox series

[2/2] devlink: Support setting max_io_eqs

Message ID 20240410073903.7913-3-parav@nvidia.com (mailing list archive)
State Superseded
Headers show
Series devlink: Support setting max_io_eqs | expand

Checks

Context Check Description
netdev/tree_selection success Not a local patch

Commit Message

Parav Pandit April 10, 2024, 7:39 a.m. UTC 
Devices send event notifications for the IO queues,
such as tx and rx queues, through event queues.

Enable a privileged owner, such as a hypervisor PF, to set the number
of IO event queues for the VF and SF during the provisioning stage.

example:
Get maximum IO event queues of the VF device::

  $ devlink port show pci/0000:06:00.0/2
  pci/0000:06:00.0/2: type eth netdev enp6s0pf0vf1 flavour pcivf pfnum 0 vfnum 1
      function:
          hw_addr 00:00:00:00:00:00 ipsec_packet disabled max_io_eqs 10

Set maximum IO event queues of the VF device::

  $ devlink port function set pci/0000:06:00.0/2 max_io_eqs 32

  $ devlink port show pci/0000:06:00.0/2
  pci/0000:06:00.0/2: type eth netdev enp6s0pf0vf1 flavour pcivf pfnum 0 vfnum 1
      function:
          hw_addr 00:00:00:00:00:00 ipsec_packet disabled max_io_eqs 32

Signed-off-by: Parav Pandit <parav@nvidia.com>
---
 devlink/devlink.c | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

Comments

Jiri Pirko April 10, 2024, 9:27 a.m. UTC | #1 
Re subject, please specify the target project and tree:
[patch iproute2-next]....

Wed, Apr 10, 2024 at 09:39:03AM CEST, parav@nvidia.com wrote:
>Devices send event notifications for the IO queues,
>such as tx and rx queues, through event queues.
>
>Enable a privileged owner, such as a hypervisor PF, to set the number
>of IO event queues for the VF and SF during the provisioning stage.
>
>example:
>Get maximum IO event queues of the VF device::
>
>  $ devlink port show pci/0000:06:00.0/2
>  pci/0000:06:00.0/2: type eth netdev enp6s0pf0vf1 flavour pcivf pfnum 0 vfnum 1
>      function:
>          hw_addr 00:00:00:00:00:00 ipsec_packet disabled max_io_eqs 10
>
>Set maximum IO event queues of the VF device::
>
>  $ devlink port function set pci/0000:06:00.0/2 max_io_eqs 32
>
>  $ devlink port show pci/0000:06:00.0/2
>  pci/0000:06:00.0/2: type eth netdev enp6s0pf0vf1 flavour pcivf pfnum 0 vfnum 1
>      function:
>          hw_addr 00:00:00:00:00:00 ipsec_packet disabled max_io_eqs 32
>
>Signed-off-by: Parav Pandit <parav@nvidia.com>
>---
> devlink/devlink.c | 29 ++++++++++++++++++++++++++++-

Manpage update please.


> 1 file changed, 28 insertions(+), 1 deletion(-)
>
>diff --git a/devlink/devlink.c b/devlink/devlink.c
>index dbeb6e39..6b058c85 100644
>--- a/devlink/devlink.c
>+++ b/devlink/devlink.c
>@@ -309,6 +309,7 @@ static int ifname_map_update(struct ifname_map *ifname_map, const char *ifname)
> #define DL_OPT_PORT_FN_RATE_TX_PRIORITY	BIT(55)
> #define DL_OPT_PORT_FN_RATE_TX_WEIGHT	BIT(56)
> #define DL_OPT_PORT_FN_CAPS	BIT(57)
>+#define DL_OPT_PORT_FN_MAX_IO_EQS	BIT(58)
> 
> struct dl_opts {
> 	uint64_t present; /* flags of present items */
>@@ -375,6 +376,7 @@ struct dl_opts {
> 	const char *linecard_type;
> 	bool selftests_opt[DEVLINK_ATTR_SELFTEST_ID_MAX + 1];
> 	struct nla_bitfield32 port_fn_caps;
>+	uint32_t port_fn_max_io_eqs;
> };
> 
> struct dl {
>@@ -773,6 +775,7 @@ devlink_function_policy[DEVLINK_PORT_FUNCTION_ATTR_MAX + 1] = {
> 	[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR ] = MNL_TYPE_BINARY,
> 	[DEVLINK_PORT_FN_ATTR_STATE] = MNL_TYPE_U8,
> 	[DEVLINK_PORT_FN_ATTR_DEVLINK] = MNL_TYPE_NESTED,
>+	[DEVLINK_PORT_FN_ATTR_MAX_IO_EQS] = MNL_TYPE_U32,
> };
> 
> static int function_attr_cb(const struct nlattr *attr, void *data)
>@@ -2298,6 +2301,17 @@ static int dl_argv_parse(struct dl *dl, uint64_t o_required,
> 			if (ipsec_packet)
> 				opts->port_fn_caps.value |= DEVLINK_PORT_FN_CAP_IPSEC_PACKET;
> 			o_found |= DL_OPT_PORT_FN_CAPS;
>+		} else if (dl_argv_match(dl, "max_io_eqs") &&
>+			   (o_all & DL_OPT_PORT_FN_MAX_IO_EQS)) {
>+			uint32_t max_io_eqs;
>+
>+			dl_arg_inc(dl);
>+			err = dl_argv_uint32_t(dl, &max_io_eqs);
>+			if (err)
>+				return err;
>+			opts->port_fn_max_io_eqs = max_io_eqs;
>+			o_found |= DL_OPT_PORT_FN_MAX_IO_EQS;
>+
> 		} else {
> 			pr_err("Unknown option \"%s\"\n", dl_argv(dl));
> 			return -EINVAL;
>@@ -2428,6 +2442,9 @@ dl_function_attr_put(struct nlmsghdr *nlh, const struct dl_opts *opts)
> 	if (opts->present & DL_OPT_PORT_FN_CAPS)
> 		mnl_attr_put(nlh, DEVLINK_PORT_FN_ATTR_CAPS,
> 			     sizeof(opts->port_fn_caps), &opts->port_fn_caps);
>+	if (opts->present & DL_OPT_PORT_FN_MAX_IO_EQS)
>+		mnl_attr_put_u32(nlh, DEVLINK_PORT_FN_ATTR_MAX_IO_EQS,
>+				opts->port_fn_max_io_eqs);
> 
> 	mnl_attr_nest_end(nlh, nest);
> }
>@@ -4744,6 +4761,7 @@ static void cmd_port_help(void)
> 	pr_err("       devlink port function set DEV/PORT_INDEX [ hw_addr ADDR ] [ state { active | inactive } ]\n");
> 	pr_err("                      [ roce { enable | disable } ] [ migratable { enable | disable } ]\n");
> 	pr_err("                      [ ipsec_crypto { enable | disable } ] [ ipsec_packet { enable | disable } ]\n");
>+	pr_err("                      [ max_io_eqs [ value ]\n");

"value" is not optional as the help entry suggests, also don't use
"value", also, it should capital letter as it is not a fixed string.
Be in sync with the rest:

	pr_err("                      [ max_io_eqs EQS\n");

Something like that.

Rest of the patch looks ok.


> 	pr_err("       devlink port function rate { help | show | add | del | set }\n");
> 	pr_err("       devlink port param set DEV/PORT_INDEX name PARAMETER value VALUE cmode { permanent | driverinit | runtime }\n");
> 	pr_err("       devlink port param show [DEV/PORT_INDEX name PARAMETER]\n");
>@@ -4878,6 +4896,15 @@ static void pr_out_port_function(struct dl *dl, struct nlattr **tb_port)
> 				     port_fn_caps->value & DEVLINK_PORT_FN_CAP_IPSEC_PACKET ?
> 				     "enable" : "disable");
> 	}
>+	if (tb[DEVLINK_PORT_FN_ATTR_MAX_IO_EQS]) {
>+		uint32_t max_io_eqs;
>+
>+		max_io_eqs = mnl_attr_get_u32(tb[DEVLINK_PORT_FN_ATTR_MAX_IO_EQS]);
>+
>+		print_uint(PRINT_ANY, "max_io_eqs", " max_io_eqs %u",
>+			   max_io_eqs);
>+	}
>+
> 	if (tb[DEVLINK_PORT_FN_ATTR_DEVLINK])
> 		pr_out_nested_handle_obj(dl, tb[DEVLINK_PORT_FN_ATTR_DEVLINK],
> 					 true, true);
>@@ -5086,7 +5113,7 @@ static int cmd_port_function_set(struct dl *dl)
> 	}
> 	err = dl_argv_parse(dl, DL_OPT_HANDLEP,
> 			    DL_OPT_PORT_FUNCTION_HW_ADDR | DL_OPT_PORT_FUNCTION_STATE |
>-			    DL_OPT_PORT_FN_CAPS);
>+			    DL_OPT_PORT_FN_CAPS | DL_OPT_PORT_FN_MAX_IO_EQS);
> 	if (err)
> 		return err;
> 
>-- 
>2.26.2
>
>
Parav Pandit April 10, 2024, 11:59 a.m. UTC | #2 
> From: Jiri Pirko <jiri@resnulli.us>
> Sent: Wednesday, April 10, 2024 2:58 PM
> 
> Re subject, please specify the target project and tree:
> [patch iproute2-next]....
> 
> Wed, Apr 10, 2024 at 09:39:03AM CEST, parav@nvidia.com wrote:
> >Devices send event notifications for the IO queues, such as tx and rx
> >queues, through event queues.
> >
> >Enable a privileged owner, such as a hypervisor PF, to set the number
> >of IO event queues for the VF and SF during the provisioning stage.
> >
> >example:
> >Get maximum IO event queues of the VF device::
> >
> >  $ devlink port show pci/0000:06:00.0/2
> >  pci/0000:06:00.0/2: type eth netdev enp6s0pf0vf1 flavour pcivf pfnum 0
> vfnum 1
> >      function:
> >          hw_addr 00:00:00:00:00:00 ipsec_packet disabled max_io_eqs 10
> >
> >Set maximum IO event queues of the VF device::
> >
> >  $ devlink port function set pci/0000:06:00.0/2 max_io_eqs 32
> >
> >  $ devlink port show pci/0000:06:00.0/2
> >  pci/0000:06:00.0/2: type eth netdev enp6s0pf0vf1 flavour pcivf pfnum 0
> vfnum 1
> >      function:
> >          hw_addr 00:00:00:00:00:00 ipsec_packet disabled max_io_eqs 32
> >
> >Signed-off-by: Parav Pandit <parav@nvidia.com>
> >---
> > devlink/devlink.c | 29 ++++++++++++++++++++++++++++-
> 
> Manpage update please.
>
Oh yes, I missed it. Adding it.
 
> 
> > 1 file changed, 28 insertions(+), 1 deletion(-)
> >
> >diff --git a/devlink/devlink.c b/devlink/devlink.c index
> >dbeb6e39..6b058c85 100644
> >--- a/devlink/devlink.c
> >+++ b/devlink/devlink.c
> >@@ -309,6 +309,7 @@ static int ifname_map_update(struct ifname_map
> *ifname_map, const char *ifname)
> > #define DL_OPT_PORT_FN_RATE_TX_PRIORITY	BIT(55)
> > #define DL_OPT_PORT_FN_RATE_TX_WEIGHT	BIT(56)
> > #define DL_OPT_PORT_FN_CAPS	BIT(57)
> >+#define DL_OPT_PORT_FN_MAX_IO_EQS	BIT(58)
> >
> > struct dl_opts {
> > 	uint64_t present; /* flags of present items */ @@ -375,6 +376,7 @@
> >struct dl_opts {
> > 	const char *linecard_type;
> > 	bool selftests_opt[DEVLINK_ATTR_SELFTEST_ID_MAX + 1];
> > 	struct nla_bitfield32 port_fn_caps;
> >+	uint32_t port_fn_max_io_eqs;
> > };
> >
> > struct dl {
> >@@ -773,6 +775,7 @@
> devlink_function_policy[DEVLINK_PORT_FUNCTION_ATTR_MAX + 1] = {
> > 	[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR ] = MNL_TYPE_BINARY,
> > 	[DEVLINK_PORT_FN_ATTR_STATE] = MNL_TYPE_U8,
> > 	[DEVLINK_PORT_FN_ATTR_DEVLINK] = MNL_TYPE_NESTED,
> >+	[DEVLINK_PORT_FN_ATTR_MAX_IO_EQS] = MNL_TYPE_U32,
> > };
> >
> > static int function_attr_cb(const struct nlattr *attr, void *data) @@
> >-2298,6 +2301,17 @@ static int dl_argv_parse(struct dl *dl, uint64_t
> o_required,
> > 			if (ipsec_packet)
> > 				opts->port_fn_caps.value |=
> DEVLINK_PORT_FN_CAP_IPSEC_PACKET;
> > 			o_found |= DL_OPT_PORT_FN_CAPS;
> >+		} else if (dl_argv_match(dl, "max_io_eqs") &&
> >+			   (o_all & DL_OPT_PORT_FN_MAX_IO_EQS)) {
> >+			uint32_t max_io_eqs;
> >+
> >+			dl_arg_inc(dl);
> >+			err = dl_argv_uint32_t(dl, &max_io_eqs);
> >+			if (err)
> >+				return err;
> >+			opts->port_fn_max_io_eqs = max_io_eqs;
> >+			o_found |= DL_OPT_PORT_FN_MAX_IO_EQS;
> >+
> > 		} else {
> > 			pr_err("Unknown option \"%s\"\n", dl_argv(dl));
> > 			return -EINVAL;
> >@@ -2428,6 +2442,9 @@ dl_function_attr_put(struct nlmsghdr *nlh, const
> struct dl_opts *opts)
> > 	if (opts->present & DL_OPT_PORT_FN_CAPS)
> > 		mnl_attr_put(nlh, DEVLINK_PORT_FN_ATTR_CAPS,
> > 			     sizeof(opts->port_fn_caps), &opts->port_fn_caps);
> >+	if (opts->present & DL_OPT_PORT_FN_MAX_IO_EQS)
> >+		mnl_attr_put_u32(nlh,
> DEVLINK_PORT_FN_ATTR_MAX_IO_EQS,
> >+				opts->port_fn_max_io_eqs);
> >
> > 	mnl_attr_nest_end(nlh, nest);
> > }
> >@@ -4744,6 +4761,7 @@ static void cmd_port_help(void)
> > 	pr_err("       devlink port function set DEV/PORT_INDEX [ hw_addr
> ADDR ] [ state { active | inactive } ]\n");
> > 	pr_err("                      [ roce { enable | disable } ] [ migratable { enable |
> disable } ]\n");
> > 	pr_err("                      [ ipsec_crypto { enable | disable } ] [ ipsec_packet {
> enable | disable } ]\n");
> >+	pr_err("                      [ max_io_eqs [ value ]\n");
> 
> "value" is not optional as the help entry suggests, also don't use "value", also,
> it should capital letter as it is not a fixed string.
> Be in sync with the rest:
> 
> 	pr_err("                      [ max_io_eqs EQS\n");
> 
> Something like that.
> 
> Rest of the patch looks ok.
> 
Ok. sending v2 fixing all above comments.
Thanks.

> 
> > 	pr_err("       devlink port function rate { help | show | add | del | set
> }\n");
> > 	pr_err("       devlink port param set DEV/PORT_INDEX name
> PARAMETER value VALUE cmode { permanent | driverinit | runtime }\n");
> > 	pr_err("       devlink port param show [DEV/PORT_INDEX name
> PARAMETER]\n");
> >@@ -4878,6 +4896,15 @@ static void pr_out_port_function(struct dl *dl,
> struct nlattr **tb_port)
> > 				     port_fn_caps->value &
> DEVLINK_PORT_FN_CAP_IPSEC_PACKET ?
> > 				     "enable" : "disable");
> > 	}
> >+	if (tb[DEVLINK_PORT_FN_ATTR_MAX_IO_EQS]) {
> >+		uint32_t max_io_eqs;
> >+
> >+		max_io_eqs =
> mnl_attr_get_u32(tb[DEVLINK_PORT_FN_ATTR_MAX_IO_EQS]);
> >+
> >+		print_uint(PRINT_ANY, "max_io_eqs", " max_io_eqs %u",
> >+			   max_io_eqs);
> >+	}
> >+
> > 	if (tb[DEVLINK_PORT_FN_ATTR_DEVLINK])
> > 		pr_out_nested_handle_obj(dl,
> tb[DEVLINK_PORT_FN_ATTR_DEVLINK],
> > 					 true, true);
> >@@ -5086,7 +5113,7 @@ static int cmd_port_function_set(struct dl *dl)
> > 	}
> > 	err = dl_argv_parse(dl, DL_OPT_HANDLEP,
> > 			    DL_OPT_PORT_FUNCTION_HW_ADDR |
> DL_OPT_PORT_FUNCTION_STATE |
> >-			    DL_OPT_PORT_FN_CAPS);
> >+			    DL_OPT_PORT_FN_CAPS |
> DL_OPT_PORT_FN_MAX_IO_EQS);
> > 	if (err)
> > 		return err;
> >
> >--
> >2.26.2
> >
> >
diff mbox series

Patch

diff --git a/devlink/devlink.c b/devlink/devlink.c
index dbeb6e39..6b058c85 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -309,6 +309,7 @@  static int ifname_map_update(struct ifname_map *ifname_map, const char *ifname)
 #define DL_OPT_PORT_FN_RATE_TX_PRIORITY	BIT(55)
 #define DL_OPT_PORT_FN_RATE_TX_WEIGHT	BIT(56)
 #define DL_OPT_PORT_FN_CAPS	BIT(57)
+#define DL_OPT_PORT_FN_MAX_IO_EQS	BIT(58)
 
 struct dl_opts {
 	uint64_t present; /* flags of present items */
@@ -375,6 +376,7 @@  struct dl_opts {
 	const char *linecard_type;
 	bool selftests_opt[DEVLINK_ATTR_SELFTEST_ID_MAX + 1];
 	struct nla_bitfield32 port_fn_caps;
+	uint32_t port_fn_max_io_eqs;
 };
 
 struct dl {
@@ -773,6 +775,7 @@  devlink_function_policy[DEVLINK_PORT_FUNCTION_ATTR_MAX + 1] = {
 	[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR ] = MNL_TYPE_BINARY,
 	[DEVLINK_PORT_FN_ATTR_STATE] = MNL_TYPE_U8,
 	[DEVLINK_PORT_FN_ATTR_DEVLINK] = MNL_TYPE_NESTED,
+	[DEVLINK_PORT_FN_ATTR_MAX_IO_EQS] = MNL_TYPE_U32,
 };
 
 static int function_attr_cb(const struct nlattr *attr, void *data)
@@ -2298,6 +2301,17 @@  static int dl_argv_parse(struct dl *dl, uint64_t o_required,
 			if (ipsec_packet)
 				opts->port_fn_caps.value |= DEVLINK_PORT_FN_CAP_IPSEC_PACKET;
 			o_found |= DL_OPT_PORT_FN_CAPS;
+		} else if (dl_argv_match(dl, "max_io_eqs") &&
+			   (o_all & DL_OPT_PORT_FN_MAX_IO_EQS)) {
+			uint32_t max_io_eqs;
+
+			dl_arg_inc(dl);
+			err = dl_argv_uint32_t(dl, &max_io_eqs);
+			if (err)
+				return err;
+			opts->port_fn_max_io_eqs = max_io_eqs;
+			o_found |= DL_OPT_PORT_FN_MAX_IO_EQS;
+
 		} else {
 			pr_err("Unknown option \"%s\"\n", dl_argv(dl));
 			return -EINVAL;
@@ -2428,6 +2442,9 @@  dl_function_attr_put(struct nlmsghdr *nlh, const struct dl_opts *opts)
 	if (opts->present & DL_OPT_PORT_FN_CAPS)
 		mnl_attr_put(nlh, DEVLINK_PORT_FN_ATTR_CAPS,
 			     sizeof(opts->port_fn_caps), &opts->port_fn_caps);
+	if (opts->present & DL_OPT_PORT_FN_MAX_IO_EQS)
+		mnl_attr_put_u32(nlh, DEVLINK_PORT_FN_ATTR_MAX_IO_EQS,
+				opts->port_fn_max_io_eqs);
 
 	mnl_attr_nest_end(nlh, nest);
 }
@@ -4744,6 +4761,7 @@  static void cmd_port_help(void)
 	pr_err("       devlink port function set DEV/PORT_INDEX [ hw_addr ADDR ] [ state { active | inactive } ]\n");
 	pr_err("                      [ roce { enable | disable } ] [ migratable { enable | disable } ]\n");
 	pr_err("                      [ ipsec_crypto { enable | disable } ] [ ipsec_packet { enable | disable } ]\n");
+	pr_err("                      [ max_io_eqs [ value ]\n");
 	pr_err("       devlink port function rate { help | show | add | del | set }\n");
 	pr_err("       devlink port param set DEV/PORT_INDEX name PARAMETER value VALUE cmode { permanent | driverinit | runtime }\n");
 	pr_err("       devlink port param show [DEV/PORT_INDEX name PARAMETER]\n");
@@ -4878,6 +4896,15 @@  static void pr_out_port_function(struct dl *dl, struct nlattr **tb_port)
 				     port_fn_caps->value & DEVLINK_PORT_FN_CAP_IPSEC_PACKET ?
 				     "enable" : "disable");
 	}
+	if (tb[DEVLINK_PORT_FN_ATTR_MAX_IO_EQS]) {
+		uint32_t max_io_eqs;
+
+		max_io_eqs = mnl_attr_get_u32(tb[DEVLINK_PORT_FN_ATTR_MAX_IO_EQS]);
+
+		print_uint(PRINT_ANY, "max_io_eqs", " max_io_eqs %u",
+			   max_io_eqs);
+	}
+
 	if (tb[DEVLINK_PORT_FN_ATTR_DEVLINK])
 		pr_out_nested_handle_obj(dl, tb[DEVLINK_PORT_FN_ATTR_DEVLINK],
 					 true, true);
@@ -5086,7 +5113,7 @@  static int cmd_port_function_set(struct dl *dl)
 	}
 	err = dl_argv_parse(dl, DL_OPT_HANDLEP,
 			    DL_OPT_PORT_FUNCTION_HW_ADDR | DL_OPT_PORT_FUNCTION_STATE |
-			    DL_OPT_PORT_FN_CAPS);
+			    DL_OPT_PORT_FN_CAPS | DL_OPT_PORT_FN_MAX_IO_EQS);
 	if (err)
 		return err;