netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: netdev@vger.kernel.org, kuba@kernel.org, pabeni@redhat.com
Cc: "Asbjørn Sloth Tønnesen" <ast@fiberby.net>,
	"Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH net-next 04/11] wireguard: netlink: convert to split ops
Date: Mon,  1 Dec 2025 03:28:42 +0100	[thread overview]
Message-ID: <20251201022849.418666-5-Jason@zx2c4.com> (raw)
In-Reply-To: <20251201022849.418666-1-Jason@zx2c4.com>

From: Asbjørn Sloth Tønnesen <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>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 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 682678d24a9f..e7efe5f8465d 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.52.0


  parent reply	other threads:[~2025-12-01  2:29 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-01  2:28 [PATCH net-next 00/11] wireguard updates for 6.19 Jason A. Donenfeld
2025-12-01  2:28 ` [PATCH net-next 01/11] wireguard: netlink: enable strict genetlink validation Jason A. Donenfeld
2025-12-01  2:28 ` [PATCH net-next 02/11] wireguard: netlink: validate nested arrays in policy Jason A. Donenfeld
2025-12-01  2:28 ` [PATCH net-next 03/11] wireguard: netlink: use WG_KEY_LEN in policies Jason A. Donenfeld
2025-12-01  2:28 ` Jason A. Donenfeld [this message]
2025-12-01  2:28 ` [PATCH net-next 05/11] wireguard: netlink: lower .maxattr for WG_CMD_GET_DEVICE Jason A. Donenfeld
2025-12-01  2:28 ` [PATCH net-next 06/11] netlink: specs: add specification for wireguard Jason A. Donenfeld
2025-12-01  2:28 ` [PATCH net-next 07/11] wireguard: uapi: move enum wg_cmd Jason A. Donenfeld
2025-12-01  2:28 ` [PATCH net-next 08/11] wireguard: uapi: move flag enums Jason A. Donenfeld
2025-12-01  2:28 ` [PATCH net-next 09/11] wireguard: uapi: generate header with ynl-gen Jason A. Donenfeld
2025-12-01  2:28 ` [PATCH net-next 10/11] tools: ynl: add sample for wireguard Jason A. Donenfeld
2025-12-01 21:00   ` Asbjørn Sloth Tønnesen
2025-12-02  3:09     ` Jason A. Donenfeld
2025-12-01  2:28 ` [PATCH net-next 11/11] wireguard: netlink: generate netlink code Jason A. Donenfeld
2025-12-01 23:07 ` [PATCH net-next 00/11] wireguard updates for 6.19 Jakub Kicinski
2025-12-02  3:19   ` Jason A. Donenfeld
2025-12-02  4:37     ` Jakub Kicinski
2025-12-04 17:43       ` Jason A. Donenfeld
2025-12-02  4:40 ` patchwork-bot+netdevbpf

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=20251201022849.418666-5-Jason@zx2c4.com \
    --to=jason@zx2c4.com \
    --cc=ast@fiberby.net \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.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).