wireguard: uapi: generate header with ynl-gen

Use ynl-gen to generate the UAPI header for WireGuard.

The cosmetic changes in this patch confirms that the spec is aligned
with the implementation. By using the generated version, it ensures
that they stay in sync.

Changes in the generated header:
* Trivial header guard rename.
* Trivial white space changes.
* Trivial comment changes.
* Precompute bitflags in ynl-gen (see [1]).
* Drop __*_F_ALL constants (see [1]).

[1] https://lore.kernel.org/r/20251014123201.6ecfd146@kernel.org/

No behavioural changes intended.

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/drivers/net/wireguard/netlink.c b/drivers/net/wireguard/netlink.c
index c2d0576e96f5f92fa62df10b9ddd60b7d395b675..0ce0bda8c1ce877820e40f29e1e1b67704917b85 100644 (file)
--- a/drivers/net/wireguard/netlink.c
+++ b/drivers/net/wireguard/netlink.c
@@ -26,7 +26,7 @@ static const struct nla_policy device_policy[WGDEVICE_A_MAX + 1] = {
        [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, __WGDEVICE_F_ALL),
+       [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),
@@ -35,7 +35,7 @@ static const struct nla_policy device_policy[WGDEVICE_A_MAX + 1] = {
 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, __WGPEER_F_ALL),
+       [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)),
@@ -49,7 +49,7 @@ 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, __WGALLOWEDIP_F_ALL),
+       [WGALLOWEDIP_A_FLAGS]           = NLA_POLICY_MASK(NLA_U32, 0x1),
 };
 
 static struct wg_device *lookup_interface(struct nlattr **attrs,

diff --git a/include/uapi/linux/wireguard.h b/include/uapi/linux/wireguard.h
index a2815f4f291047b885e6f231905354117c91c5dd..a100b9715b083d332ecaab51c801a03f5c06feb8 100644 (file)
--- a/include/uapi/linux/wireguard.h
+++ b/include/uapi/linux/wireguard.h
@@ -1,32 +1,29 @@
-/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT */
-/*
- * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- */
+/* 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 uapi header */
+/* To regenerate run: tools/net/ynl/ynl-regen.sh */
 
-#ifndef _WG_UAPI_WIREGUARD_H
-#define _WG_UAPI_WIREGUARD_H
+#ifndef _UAPI_LINUX_WIREGUARD_H
+#define _UAPI_LINUX_WIREGUARD_H
 
-#define WG_GENL_NAME "wireguard"
-#define WG_GENL_VERSION 1
+#define WG_GENL_NAME   "wireguard"
+#define WG_GENL_VERSION        1
 
-#define WG_KEY_LEN 32
+#define WG_KEY_LEN     32
 
 enum wgdevice_flag {
-       WGDEVICE_F_REPLACE_PEERS = 1U << 0,
-       __WGDEVICE_F_ALL = WGDEVICE_F_REPLACE_PEERS
+       WGDEVICE_F_REPLACE_PEERS = 1,
 };
 
 enum wgpeer_flag {
-       WGPEER_F_REMOVE_ME = 1U << 0,
-       WGPEER_F_REPLACE_ALLOWEDIPS = 1U << 1,
-       WGPEER_F_UPDATE_ONLY = 1U << 2,
-       __WGPEER_F_ALL = WGPEER_F_REMOVE_ME | WGPEER_F_REPLACE_ALLOWEDIPS |
-                        WGPEER_F_UPDATE_ONLY
+       WGPEER_F_REMOVE_ME = 1,
+       WGPEER_F_REPLACE_ALLOWEDIPS = 2,
+       WGPEER_F_UPDATE_ONLY = 4,
 };
 
 enum wgallowedip_flag {
-       WGALLOWEDIP_F_REMOVE_ME = 1U << 0,
-       __WGALLOWEDIP_F_ALL = WGALLOWEDIP_F_REMOVE_ME
+       WGALLOWEDIP_F_REMOVE_ME = 1,
 };
 
 enum wgdevice_attribute {
@@ -39,6 +36,7 @@ enum wgdevice_attribute {
        WGDEVICE_A_LISTEN_PORT,
        WGDEVICE_A_FWMARK,
        WGDEVICE_A_PEERS,
+
        __WGDEVICE_A_LAST
 };
 #define WGDEVICE_A_MAX (__WGDEVICE_A_LAST - 1)
@@ -55,6 +53,7 @@ enum wgpeer_attribute {
        WGPEER_A_TX_BYTES,
        WGPEER_A_ALLOWEDIPS,
        WGPEER_A_PROTOCOL_VERSION,
+
        __WGPEER_A_LAST
 };
 #define WGPEER_A_MAX (__WGPEER_A_LAST - 1)
@@ -65,6 +64,7 @@ enum wgallowedip_attribute {
        WGALLOWEDIP_A_IPADDR,
        WGALLOWEDIP_A_CIDR_MASK,
        WGALLOWEDIP_A_FLAGS,
+
        __WGALLOWEDIP_A_LAST
 };
 #define WGALLOWEDIP_A_MAX (__WGALLOWEDIP_A_LAST - 1)
@@ -77,4 +77,4 @@ enum wg_cmd {
 };
 #define WG_CMD_MAX (__WG_CMD_MAX - 1)
 
-#endif /* _WG_UAPI_WIREGUARD_H */
+#endif /* _UAPI_LINUX_WIREGUARD_H */