From: "Asbjørn Sloth Tønnesen" <ast@fiberby.net>
To: "Jason A. Donenfeld" <Jason@zx2c4.com>
Cc: "Asbjørn Sloth Tønnesen" <ast@fiberby.net>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Donald Hunter" <donald.hunter@gmail.com>,
"Simon Horman" <horms@kernel.org>,
"Jacob Keller" <jacob.e.keller@intel.com>,
"Andrew Lunn" <andrew+netdev@lunn.ch>,
wireguard@lists.zx2c4.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, "Jordan Rife" <jordan@jrife.io>
Subject: [PATCH wireguard v4 03/10] wireguard: netlink: convert to split ops
Date: Wed, 26 Nov 2025 17:35:35 +0000 [thread overview]
Message-ID: <20251126173546.57681-4-ast@fiberby.net> (raw)
In-Reply-To: <20251126173546.57681-1-ast@fiberby.net>
This patch converts WireGuard from using the legacy struct genl_ops
to struct genl_split_ops, by applying the same transformation as
genl_cmd_full_to_split() would otherwise do at runtime.
WGDEVICE_A_MAX is swapped for WGDEVICE_A_PEERS, while they are
currently equivalent, then .maxattr should be the maximum attribute
that a given command supports, and not change along with WGDEVICE_A_MAX.
This is an incremental step towards adopting netlink policy code
generated by ynl-gen, ensuring that the code and spec is aligned.
This is a trivial patch with no behavioural changes intended.
Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
---
drivers/net/wireguard/netlink.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireguard/netlink.c b/drivers/net/wireguard/netlink.c
index 682678d24a9f6..e7efe5f8465dc 100644
--- a/drivers/net/wireguard/netlink.c
+++ b/drivers/net/wireguard/netlink.c
@@ -616,28 +616,30 @@ static int wg_set_device(struct sk_buff *skb, struct genl_info *info)
return ret;
}
-static const struct genl_ops genl_ops[] = {
+static const struct genl_split_ops wireguard_nl_ops[] = {
{
.cmd = WG_CMD_GET_DEVICE,
.start = wg_get_device_start,
.dumpit = wg_get_device_dump,
.done = wg_get_device_done,
- .flags = GENL_UNS_ADMIN_PERM
+ .policy = device_policy,
+ .maxattr = WGDEVICE_A_PEERS,
+ .flags = GENL_UNS_ADMIN_PERM | GENL_CMD_CAP_DUMP,
}, {
.cmd = WG_CMD_SET_DEVICE,
.doit = wg_set_device,
- .flags = GENL_UNS_ADMIN_PERM
+ .policy = device_policy,
+ .maxattr = WGDEVICE_A_PEERS,
+ .flags = GENL_UNS_ADMIN_PERM | GENL_CMD_CAP_DO,
}
};
static struct genl_family genl_family __ro_after_init = {
- .ops = genl_ops,
- .n_ops = ARRAY_SIZE(genl_ops),
+ .split_ops = wireguard_nl_ops,
+ .n_split_ops = ARRAY_SIZE(wireguard_nl_ops),
.name = WG_GENL_NAME,
.version = WG_GENL_VERSION,
- .maxattr = WGDEVICE_A_MAX,
.module = THIS_MODULE,
- .policy = device_policy,
.netnsok = true
};
--
2.51.0
next prev parent reply other threads:[~2025-11-26 17:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-26 17:35 [PATCH wireguard v4 00/10] wireguard: netlink: ynl conversion Asbjørn Sloth Tønnesen
2025-11-26 17:35 ` [PATCH wireguard v4 01/10] wireguard: netlink: validate nested arrays in policy Asbjørn Sloth Tønnesen
2025-11-26 17:35 ` [PATCH wireguard v4 02/10] wireguard: netlink: use WG_KEY_LEN in policies Asbjørn Sloth Tønnesen
2025-11-26 17:35 ` Asbjørn Sloth Tønnesen [this message]
2025-11-26 17:35 ` [PATCH wireguard v4 04/10] wireguard: netlink: lower .maxattr for WG_CMD_GET_DEVICE Asbjørn Sloth Tønnesen
2025-11-26 17:35 ` [PATCH wireguard v4 05/10] netlink: specs: add specification for wireguard Asbjørn Sloth Tønnesen
2025-11-26 17:35 ` [PATCH wireguard v4 06/10] wireguard: uapi: move enum wg_cmd Asbjørn Sloth Tønnesen
2025-11-26 17:35 ` [PATCH wireguard v4 07/10] wireguard: uapi: move flag enums Asbjørn Sloth Tønnesen
2025-11-26 17:35 ` [PATCH wireguard v4 08/10] wireguard: uapi: generate header with ynl-gen Asbjørn Sloth Tønnesen
2025-11-26 17:35 ` [PATCH wireguard v4 09/10] tools: ynl: add sample for wireguard Asbjørn Sloth Tønnesen
2025-11-26 17:35 ` [PATCH wireguard v4 10/10] wireguard: netlink: generate netlink code Asbjørn Sloth Tønnesen
2025-11-26 17:58 ` [PATCH wireguard v4 00/10] wireguard: netlink: ynl conversion Jason A. Donenfeld
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=20251126173546.57681-4-ast@fiberby.net \
--to=ast@fiberby.net \
--cc=Jason@zx2c4.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=donald.hunter@gmail.com \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=jordan@jrife.io \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=wireguard@lists.zx2c4.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