From: Jiri Pirko <jiri@resnulli.us>
To: netdev@vger.kernel.org
Cc: kuba@kernel.org, pabeni@redhat.com, davem@davemloft.net,
edumazet@google.com, moshe@nvidia.com, saeedm@nvidia.com,
idosch@nvidia.com, petrm@nvidia.com
Subject: [patch net-next v2 08/11] devlink: introduce set of macros and use it for split ops definitions
Date: Thu, 20 Jul 2023 14:18:26 +0200 [thread overview]
Message-ID: <20230720121829.566974-9-jiri@resnulli.us> (raw)
In-Reply-To: <20230720121829.566974-1-jiri@resnulli.us>
From: Jiri Pirko <jiri@nvidia.com>
The split ops structures for all commands look pretty much the same.
The are all using the same/similar callbacks.
Introduce a set of macros to make the code shorter and also avoid
possible future copy&paste mistakes and inconsistencies.
Use this macros for already converted commands.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
net/devlink/netlink.c | 136 ++++++++++++++++++++----------------------
1 file changed, 66 insertions(+), 70 deletions(-)
diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c
index cabebff6e7a7..3dae9303cfa7 100644
--- a/net/devlink/netlink.c
+++ b/net/devlink/netlink.c
@@ -232,77 +232,73 @@ int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
return msg->len;
}
+#define __DEVL_NL_OP_DO(cmd_subname, doit_subname, pre_doit_suffix, _validate, \
+ _maxattr, _policy) \
+ { \
+ .cmd = DEVLINK_CMD_##cmd_subname, \
+ .pre_doit = devlink_nl_pre_doit_##pre_doit_suffix, \
+ .doit = devlink_nl_cmd_##doit_subname##_doit, \
+ .post_doit = devlink_nl_post_doit, \
+ .flags = GENL_CMD_CAP_DO, \
+ .validate = _validate, \
+ .maxattr = _maxattr, \
+ .policy = _policy, \
+ }
+
+#define __DEVL_NL_OP_DUMP(cmd_subname, _validate, _maxattr, _policy) \
+ { \
+ .cmd = DEVLINK_CMD_##cmd_subname, \
+ .dumpit = devlink_nl_instance_iter_dumpit, \
+ .flags = GENL_CMD_CAP_DUMP, \
+ .validate = _validate, \
+ .maxattr = _maxattr, \
+ .policy = _policy, \
+ }
+
+#define __DEVL_NL_OP_LEGACY_DO(cmd_subname, doit_subname, pre_doit_suffix, \
+ validate) \
+ __DEVL_NL_OP_DO(cmd_subname, doit_subname, pre_doit_suffix, validate, \
+ DEVLINK_ATTR_MAX, devlink_nl_policy)
+
+#define __DEVL_NL_OP_LEGACY_DUMP(cmd_subname, validate) \
+ __DEVL_NL_OP_DUMP(cmd_subname, validate, \
+ DEVLINK_ATTR_MAX, devlink_nl_policy)
+
+#define DEVL_NL_OP_LEGACY_DO(cmd_subname, doit_subname, pre_doit_suffix) \
+ __DEVL_NL_OP_LEGACY_DO(cmd_subname, doit_subname, pre_doit_suffix, \
+ GENL_DONT_VALIDATE_STRICT)
+
+#define DEVL_NL_OP_LEGACY_DUMP(cmd_subname) \
+ __DEVL_NL_OP_LEGACY_DUMP(cmd_subname, GENL_DONT_VALIDATE_DUMP_STRICT)
+
+#define DEVL_NL_OP_LEGACY_STRICT_DO(cmd_subname, doit_subname, pre_doit_suffix) \
+ __DEVL_NL_OP_LEGACY_DO(cmd_subname, doit_subname, pre_doit_suffix, 0)
+
+#define DEVL_NL_OP_LEGACY_STRICT_DUMP(cmd_subname) \
+ __DEVL_NL_OP_LEGACY_DUMP(cmd_subname, 0)
+
+#define DEVL_NL_OP_DO(cmd_subname, doit_subname, pre_doit_suffix, \
+ maxattr, policy) \
+ __DEVL_NL_OP_DO(cmd_subname, doit_subname, pre_doit_suffix, 0, \
+ maxattr, policy)
+
+#define DEVL_NL_OP_DUMP(cmd_subname, maxattr, policy) \
+ __DEVL_NL_OP_DUMP(cmd_subname, 0, maxattr, policy)
+
static const struct genl_split_ops devlink_nl_split_ops[] = {
- {
- .cmd = DEVLINK_CMD_PORT_GET,
- .pre_doit = devlink_nl_pre_doit_port,
- .doit = devlink_nl_cmd_port_get_doit,
- .post_doit = devlink_nl_post_doit,
- .flags = GENL_CMD_CAP_DO,
- .validate = GENL_DONT_VALIDATE_STRICT,
- .maxattr = DEVLINK_ATTR_MAX,
- .policy = devlink_nl_policy,
- },
- {
- .cmd = DEVLINK_CMD_PORT_GET,
- .dumpit = devlink_nl_instance_iter_dumpit,
- .flags = GENL_CMD_CAP_DUMP,
- .validate = GENL_DONT_VALIDATE_DUMP,
- .maxattr = DEVLINK_ATTR_MAX,
- .policy = devlink_nl_policy,
- },
- {
- .cmd = DEVLINK_CMD_PARAM_GET,
- .pre_doit = devlink_nl_pre_doit_simple,
- .doit = devlink_nl_cmd_param_get_doit,
- .post_doit = devlink_nl_post_doit,
- .flags = GENL_CMD_CAP_DO,
- .validate = GENL_DONT_VALIDATE_STRICT,
- .maxattr = DEVLINK_ATTR_MAX,
- .policy = devlink_nl_policy,
- },
- {
- .cmd = DEVLINK_CMD_PARAM_GET,
- .dumpit = devlink_nl_instance_iter_dumpit,
- .flags = GENL_CMD_CAP_DUMP,
- .validate = GENL_DONT_VALIDATE_DUMP,
- .maxattr = DEVLINK_ATTR_MAX,
- .policy = devlink_nl_policy,
- },
- {
- .cmd = DEVLINK_CMD_HEALTH_REPORTER_GET,
- .pre_doit = devlink_nl_pre_doit_port_optional,
- .doit = devlink_nl_cmd_health_reporter_get_doit,
- .post_doit = devlink_nl_post_doit,
- .flags = GENL_CMD_CAP_DO,
- .validate = GENL_DONT_VALIDATE_STRICT,
- .maxattr = DEVLINK_ATTR_MAX,
- .policy = devlink_nl_policy,
- },
- {
- .cmd = DEVLINK_CMD_HEALTH_REPORTER_GET,
- .dumpit = devlink_nl_instance_iter_dumpit,
- .flags = GENL_CMD_CAP_DUMP,
- .validate = GENL_DONT_VALIDATE_DUMP,
- .maxattr = DEVLINK_ATTR_MAX,
- .policy = devlink_nl_policy,
- },
- {
- .cmd = DEVLINK_CMD_TRAP_GET,
- .pre_doit = devlink_nl_pre_doit_simple,
- .doit = devlink_nl_cmd_trap_get_doit,
- .post_doit = devlink_nl_post_doit,
- .flags = GENL_CMD_CAP_DO,
- .maxattr = DEVLINK_ATTR_MAX,
- .policy = devlink_nl_policy,
- },
- {
- .cmd = DEVLINK_CMD_TRAP_GET,
- .dumpit = devlink_nl_instance_iter_dumpit,
- .flags = GENL_CMD_CAP_DUMP,
- .maxattr = DEVLINK_ATTR_MAX,
- .policy = devlink_nl_policy,
- },
+ DEVL_NL_OP_LEGACY_DO(PORT_GET, port_get, port),
+ DEVL_NL_OP_LEGACY_DUMP(PORT_GET),
+ DEVL_NL_OP_LEGACY_DO(PARAM_GET, param_get, simple),
+ DEVL_NL_OP_LEGACY_DUMP(PARAM_GET),
+ DEVL_NL_OP_LEGACY_DO(HEALTH_REPORTER_GET, health_reporter_get,
+ port_optional),
+ DEVL_NL_OP_LEGACY_DUMP(HEALTH_REPORTER_GET),
+ DEVL_NL_OP_LEGACY_STRICT_DO(TRAP_GET, trap_get, simple),
+ DEVL_NL_OP_LEGACY_STRICT_DUMP(TRAP_GET),
+ /* For every newly added command put above this line the set of macros
+ * DEVL_NL_OP_DO and DEVL_NL_OP_DUMP should be used. Note that
+ * there is an exception with non-iterator dump implementation.
+ */
};
struct genl_family devlink_nl_family __ro_after_init = {
--
2.41.0
next prev parent reply other threads:[~2023-07-20 12:18 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-20 12:18 [patch net-next v2 00/11] devlink: introduce dump selector attr and use it for per-instance dumps Jiri Pirko
2023-07-20 12:18 ` [patch net-next v2 01/11] devlink: parse linecard attr in doit() callbacks Jiri Pirko
2023-07-20 12:18 ` [patch net-next v2 02/11] devlink: parse rate attrs " Jiri Pirko
2023-07-20 12:18 ` [patch net-next v2 03/11] devlink: introduce __devlink_nl_pre_doit() with internal flags as function arg Jiri Pirko
2023-07-20 12:18 ` [patch net-next v2 04/11] devlink: convert port get command to split ops Jiri Pirko
2023-07-20 12:18 ` [patch net-next v2 05/11] devlink: convert health reporter " Jiri Pirko
2023-07-20 12:18 ` [patch net-next v2 06/11] devlink: convert param " Jiri Pirko
2023-07-20 12:18 ` [patch net-next v2 07/11] devlink: convert trap " Jiri Pirko
2023-07-20 12:18 ` Jiri Pirko [this message]
2023-07-25 17:38 ` [patch net-next v2 08/11] devlink: introduce set of macros and use it for split ops definitions Jakub Kicinski
2023-07-31 12:21 ` Jiri Pirko
2023-07-31 16:57 ` Jakub Kicinski
2023-08-01 6:41 ` Jiri Pirko
2023-07-20 12:18 ` [patch net-next v2 09/11] devlink: convert rest of the iterator dumpit commands to split ops Jiri Pirko
2023-07-20 12:18 ` [patch net-next v2 10/11] devlink: introduce dump selector attr and use it for per-instance dumps Jiri Pirko
2023-07-25 18:40 ` Jakub Kicinski
2023-07-31 12:47 ` Jiri Pirko
2023-07-31 17:03 ` Jakub Kicinski
2023-08-01 6:42 ` Jiri Pirko
2023-08-01 15:53 ` Jakub Kicinski
2023-08-02 7:02 ` Jiri Pirko
2023-07-20 12:18 ` [patch net-next v2 11/11] devlink: extend health reporter dump selector by port index Jiri Pirko
2023-07-25 18:48 ` Jakub Kicinski
2023-07-31 12:52 ` Jiri Pirko
2023-07-31 17:06 ` Jakub Kicinski
2023-08-01 6:49 ` Jiri Pirko
2023-08-01 15:56 ` Jakub Kicinski
2023-08-02 7:04 ` Jiri Pirko
2023-07-20 13:55 ` [patch net-next v2 00/11] devlink: introduce dump selector attr and use it for per-instance dumps Petr Machata
2023-07-20 14:27 ` Jiri Pirko
2023-07-20 14:51 ` Petr Machata
2023-07-25 8:07 ` Jiri Pirko
2023-07-25 8:36 ` Paolo Abeni
2023-07-25 15:29 ` Jiri Pirko
2023-07-25 16:39 ` Paolo Abeni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230720121829.566974-9-jiri@resnulli.us \
--to=jiri@resnulli.us \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=idosch@nvidia.com \
--cc=kuba@kernel.org \
--cc=moshe@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.com \
--cc=saeedm@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).