github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 02:24:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wireguard: netlink: generate netlink code

Browse Source 
This patch adopts netlink policies and command definitions
generated by ynl-gen, thus completing the conversion to YNL.

Given that the old and new policies are functionally identical
and have just been moved to a new file, it serves to verify
that the policies generated from the spec are identical to the
previous policy code.

The following functions are renamed:
  wg_get_device_dump() -> wg_get_device_dumpit()
  wg_set_device()      -> wg_set_device_doit()

The new files are covered by the existing drivers/net/wireguard/
pattern in MAINTAINERS.

No behavioural changes intended.

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Asbjørn Sloth Tønnesen 2025-11-26 17:35:42 +00:00 committed by Jason A. Donenfeld
parent 88cedad45b
commit 3fd2f3d2f4
4 changed files with 109 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireguard/Makefile
View File

@ -13,5 +13,5 @@ wireguard-y += peerlookup.o
wireguard-y += allowedips.o
wireguard-y += ratelimiter.o
wireguard-y += cookie.o
wireguard-y += netlink.o
wireguard-y += netlink.o generated/netlink.o
obj-$(CONFIG_WIREGUARD) := wireguard.o

73
drivers/net/wireguard/generated/netlink.c Normal file
View File

@ -0,0 +1,73 @@
// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
/* Do not edit directly, auto-generated from: */
/* Documentation/netlink/specs/wireguard.yaml */
/* YNL-GEN kernel source */
/* YNL-ARG --function-prefix wg */
/* To regenerate run: tools/net/ynl/ynl-regen.sh */
#include <net/netlink.h>
#include <net/genetlink.h>
#include "netlink.h"
#include <uapi/linux/wireguard.h>
#include <linux/time_types.h>
/* Common nested types */
const struct nla_policy wireguard_wgallowedip_nl_policy[WGALLOWEDIP_A_FLAGS + 1] = {
[WGALLOWEDIP_A_FAMILY] = { .type = NLA_U16, },
[WGALLOWEDIP_A_IPADDR] = NLA_POLICY_MIN_LEN(4),
[WGALLOWEDIP_A_CIDR_MASK] = { .type = NLA_U8, },
[WGALLOWEDIP_A_FLAGS] = NLA_POLICY_MASK(NLA_U32, 0x1),
};
const struct nla_policy wireguard_wgpeer_nl_policy[WGPEER_A_PROTOCOL_VERSION + 1] = {
[WGPEER_A_PUBLIC_KEY] = NLA_POLICY_EXACT_LEN(WG_KEY_LEN),
[WGPEER_A_PRESHARED_KEY] = NLA_POLICY_EXACT_LEN(WG_KEY_LEN),
[WGPEER_A_FLAGS] = NLA_POLICY_MASK(NLA_U32, 0x7),
[WGPEER_A_ENDPOINT] = NLA_POLICY_MIN_LEN(16),
[WGPEER_A_PERSISTENT_KEEPALIVE_INTERVAL] = { .type = NLA_U16, },
[WGPEER_A_LAST_HANDSHAKE_TIME] = NLA_POLICY_EXACT_LEN(16),
[WGPEER_A_RX_BYTES] = { .type = NLA_U64, },
[WGPEER_A_TX_BYTES] = { .type = NLA_U64, },
[WGPEER_A_ALLOWEDIPS] = NLA_POLICY_NESTED_ARRAY(wireguard_wgallowedip_nl_policy),
[WGPEER_A_PROTOCOL_VERSION] = { .type = NLA_U32, },
};
/* WG_CMD_GET_DEVICE - dump */
static const struct nla_policy wireguard_get_device_nl_policy[WGDEVICE_A_IFNAME + 1] = {
[WGDEVICE_A_IFINDEX] = { .type = NLA_U32, },
[WGDEVICE_A_IFNAME] = { .type = NLA_NUL_STRING, .len = 15, },
};
/* WG_CMD_SET_DEVICE - do */
static const struct nla_policy wireguard_set_device_nl_policy[WGDEVICE_A_PEERS + 1] = {
[WGDEVICE_A_IFINDEX] = { .type = NLA_U32, },
[WGDEVICE_A_IFNAME] = { .type = NLA_NUL_STRING, .len = 15, },
[WGDEVICE_A_PRIVATE_KEY] = NLA_POLICY_EXACT_LEN(WG_KEY_LEN),
[WGDEVICE_A_PUBLIC_KEY] = NLA_POLICY_EXACT_LEN(WG_KEY_LEN),
[WGDEVICE_A_FLAGS] = NLA_POLICY_MASK(NLA_U32, 0x1),
[WGDEVICE_A_LISTEN_PORT] = { .type = NLA_U16, },
[WGDEVICE_A_FWMARK] = { .type = NLA_U32, },
[WGDEVICE_A_PEERS] = NLA_POLICY_NESTED_ARRAY(wireguard_wgpeer_nl_policy),
};
/* Ops table for wireguard */
const struct genl_split_ops wireguard_nl_ops[2] = {
{
.cmd = WG_CMD_GET_DEVICE,
.start = wg_get_device_start,
.dumpit = wg_get_device_dumpit,
.done = wg_get_device_done,
.policy = wireguard_get_device_nl_policy,
.maxattr = WGDEVICE_A_IFNAME,
.flags = GENL_UNS_ADMIN_PERM | GENL_CMD_CAP_DUMP,
},
{
.cmd = WG_CMD_SET_DEVICE,
.doit = wg_set_device_doit,
.policy = wireguard_set_device_nl_policy,
.maxattr = WGDEVICE_A_PEERS,
.flags = GENL_UNS_ADMIN_PERM | GENL_CMD_CAP_DO,
},
};

30
drivers/net/wireguard/generated/netlink.h Normal file
View File

@ -0,0 +1,30 @@
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
/* Do not edit directly, auto-generated from: */
/* Documentation/netlink/specs/wireguard.yaml */
/* YNL-GEN kernel header */
/* YNL-ARG --function-prefix wg */
/* To regenerate run: tools/net/ynl/ynl-regen.sh */
#ifndef _LINUX_WIREGUARD_GEN_H
#define _LINUX_WIREGUARD_GEN_H
#include <net/netlink.h>
#include <net/genetlink.h>
#include <uapi/linux/wireguard.h>
#include <linux/time_types.h>
/* Common nested types */
extern const struct nla_policy wireguard_wgallowedip_nl_policy[WGALLOWEDIP_A_FLAGS + 1];
extern const struct nla_policy wireguard_wgpeer_nl_policy[WGPEER_A_PROTOCOL_VERSION + 1];
/* Ops table for wireguard */
extern const struct genl_split_ops wireguard_nl_ops[2];
int wg_get_device_start(struct netlink_callback *cb);
int wg_get_device_done(struct netlink_callback *cb);
int wg_get_device_dumpit(struct sk_buff *skb, struct netlink_callback *cb);
int wg_set_device_doit(struct sk_buff *skb, struct genl_info *info);
#endif /* _LINUX_WIREGUARD_GEN_H */

60
drivers/net/wireguard/netlink.c
View File

@ -9,6 +9,7 @@
#include "socket.h"
#include "queueing.h"
#include "messages.h"
#include "generated/netlink.h"
#include <uapi/linux/wireguard.h>
@ -18,39 +19,6 @@
#include <crypto/utils.h>
static struct genl_family genl_family;
static const struct nla_policy peer_policy[WGPEER_A_MAX + 1];
static const struct nla_policy allowedip_policy[WGALLOWEDIP_A_MAX + 1];
static const struct nla_policy device_policy[WGDEVICE_A_MAX + 1] = {
[WGDEVICE_A_IFINDEX] = { .type = NLA_U32 },
[WGDEVICE_A_IFNAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
[WGDEVICE_A_PRIVATE_KEY] = NLA_POLICY_EXACT_LEN(WG_KEY_LEN),
[WGDEVICE_A_PUBLIC_KEY] = NLA_POLICY_EXACT_LEN(WG_KEY_LEN),
[WGDEVICE_A_FLAGS] = NLA_POLICY_MASK(NLA_U32, 0x1),
[WGDEVICE_A_LISTEN_PORT] = { .type = NLA_U16 },
[WGDEVICE_A_FWMARK] = { .type = NLA_U32 },
[WGDEVICE_A_PEERS] = NLA_POLICY_NESTED_ARRAY(peer_policy),
};
static const struct nla_policy peer_policy[WGPEER_A_MAX + 1] = {
[WGPEER_A_PUBLIC_KEY] = NLA_POLICY_EXACT_LEN(WG_KEY_LEN),
[WGPEER_A_PRESHARED_KEY] = NLA_POLICY_EXACT_LEN(WG_KEY_LEN),
[WGPEER_A_FLAGS] = NLA_POLICY_MASK(NLA_U32, 0x7),
[WGPEER_A_ENDPOINT] = NLA_POLICY_MIN_LEN(sizeof(struct sockaddr)),
[WGPEER_A_PERSISTENT_KEEPALIVE_INTERVAL] = { .type = NLA_U16 },
[WGPEER_A_LAST_HANDSHAKE_TIME] = NLA_POLICY_EXACT_LEN(sizeof(struct __kernel_timespec)),
[WGPEER_A_RX_BYTES] = { .type = NLA_U64 },
[WGPEER_A_TX_BYTES] = { .type = NLA_U64 },
[WGPEER_A_ALLOWEDIPS] = NLA_POLICY_NESTED_ARRAY(allowedip_policy),
[WGPEER_A_PROTOCOL_VERSION] = { .type = NLA_U32 }
};
static const struct nla_policy allowedip_policy[WGALLOWEDIP_A_MAX + 1] = {
[WGALLOWEDIP_A_FAMILY] = { .type = NLA_U16 },
[WGALLOWEDIP_A_IPADDR] = NLA_POLICY_MIN_LEN(sizeof(struct in_addr)),
[WGALLOWEDIP_A_CIDR_MASK] = { .type = NLA_U8 },
[WGALLOWEDIP_A_FLAGS] = NLA_POLICY_MASK(NLA_U32, 0x1),
};
static struct wg_device *lookup_interface(struct nlattr **attrs,
struct sk_buff *skb)
@ -199,7 +167,7 @@ get_peer(struct wg_peer *peer, struct sk_buff *skb, struct dump_ctx *ctx)
return -EMSGSIZE;
}
static int wg_get_device_start(struct netlink_callback *cb)
int wg_get_device_start(struct netlink_callback *cb)
{
struct wg_device *wg;
@ -210,7 +178,7 @@ static int wg_get_device_start(struct netlink_callback *cb)
return 0;
}
static int wg_get_device_dump(struct sk_buff *skb, struct netlink_callback *cb)
int wg_get_device_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
{
struct wg_peer *peer, *next_peer_cursor;
struct dump_ctx *ctx = DUMP_CTX(cb);
@ -304,7 +272,7 @@ static int wg_get_device_dump(struct sk_buff *skb, struct netlink_callback *cb)
*/
}
static int wg_get_device_done(struct netlink_callback *cb)
int wg_get_device_done(struct netlink_callback *cb)
{
struct dump_ctx *ctx = DUMP_CTX(cb);
@ -502,7 +470,7 @@ static int set_peer(struct wg_device *wg, struct nlattr **attrs)
return ret;
}
static int wg_set_device(struct sk_buff *skb, struct genl_info *info)
int wg_set_device_doit(struct sk_buff *skb, struct genl_info *info)
{
struct wg_device *wg = lookup_interface(info->attrs, skb);
u32 flags = 0;
@ -616,24 +584,6 @@ static int wg_set_device(struct sk_buff *skb, struct genl_info *info)
return ret;
}
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,
.policy = device_policy,
.maxattr = WGDEVICE_A_IFNAME,
.flags = GENL_UNS_ADMIN_PERM | GENL_CMD_CAP_DUMP,
}, {
.cmd = WG_CMD_SET_DEVICE,
.doit = wg_set_device,
.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 = {
.split_ops = wireguard_nl_ops,
.n_split_ops = ARRAY_SIZE(wireguard_nl_ops),