From nobody Tue Feb 10 15:45:15 2026 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DBFF1632F2 for ; Thu, 27 Feb 2025 01:22:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740619366; cv=none; b=M9VKcYHkzimlBxHA8kBQ1yTKiFz0xzw0mye4RSWkyut7M8Hnlh4pj3WRnTLQWzg9o7EK+qbAACMJPHNryOYX8Ot0xQO6YbUjDnxm4DGi9oTh9IpB4+Tui3RZc5SFtUW0qjHWU9Lh5L8tKkcxorSQXV5DW1TTXHLA8OrZ0ElpFTs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740619366; c=relaxed/simple; bh=PjwBq8H+Lj6ev0TaqdLAXzBvAvLzrvuC8Admw+XnhqA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gC3kz8xRiFok0kwxSrdusn1MRFmH0Jo6ILyieGZoKJGV2NPVSSwC+mvVsm7OIcoZF6pC9BeHD6grL+0T4cLXNPqzNkQ433qIw7ky7BPvOKBkz4OApvxR+cInsvJ5hVXIBZpN2ymEaaOdVSA6Q1+py041jGjfHnFVi03BHHlx+r8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=openvpn.net; spf=pass smtp.mailfrom=openvpn.com; dkim=pass (2048-bit key) header.d=openvpn.net header.i=@openvpn.net header.b=UKop/did; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=openvpn.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=openvpn.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=openvpn.net header.i=@openvpn.net header.b="UKop/did" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43690d4605dso2662425e9.0 for ; Wed, 26 Feb 2025 17:22:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1740619361; x=1741224161; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=5AN2ek2SfMdGOsWV26D1gpXJey7MzJbJTjQZvYCK8Q8=; b=UKop/didIesre56/Dixk/EFRr1farR2WbRcY1lhH+eNiqmT8sBZa88v6kGqjzI4IsE 8KDt4cCSaMWIDAnyAMtO5Nn48N7I599og9+wyHNj1LVQIMVnvY6EEMX05/zMqz2EiSbz XuXdh1MnXSnZaeiOUCsMNNRXk7zrawFfody9RthG4CZ+ivBSfB4yQa4WsqpSn9uMLA4Y NKfIJI77Na/yhBmaZFs8TRqr1mJujWF3m1ZB2UDyZWvgPRkGAnpQYuuUaednVrFcUqX6 eqgvEjXZf3JYcipNVhbzXF1GnT6zH7z14cdSB1x6vTJvibn//ks33RnA3e024pwLgkCF mzkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740619361; x=1741224161; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5AN2ek2SfMdGOsWV26D1gpXJey7MzJbJTjQZvYCK8Q8=; b=J5eKWYgpES1OHvDrLeFf3bwYH+8MZ1yJPPf3YYhXHn8NM3XlM/VNjFEhNq87X5vAGq 9nUihYmHGS46ciJO7+qcZ/Xey2DSXFBMG4YV2njNcZmoCJ8Gvgha2azrxjAYImPyG3Kl nbXKj0AdZ/kv2aQsOz6YK5V/fVbdYkxkU+zVp4NV2B5bKqYYknGtSOwv/qu+Xfi0ga7w oXvcw70zK7mkjwUYVHJZE2HJ8ggarqFzZnUPzK9XnrP+8Jof+KDDGE71lA9Dbal8kNCu gFiHo/AJjGTKDJM5ulUSdRT4oL1PwcQQbvRiF3lUln68VkomWGfyiy+qXtluOdrVQdvp vOZA== X-Forwarded-Encrypted: i=1; AJvYcCWNWh3UppVA2fyi6dJRTU12dkJeqKCubdcDC/Nv/Kr9bonhq+MgeuhgoStMyHe/fa8aAfs2qgi8YsTzf2M=@vger.kernel.org X-Gm-Message-State: AOJu0YwiWC2cI5tFq1mUmNCKAhbYQRX16YDxFtYF7RjoQ/xAifENP/U3 Cj7wb3rxvMtlDp8xztgQ8bSQV56DVxdd/dtKmWIz9cceQqJUB1RdaTVSvpRothCu2kt7Vv54lXO d X-Gm-Gg: ASbGnct85oI2sH8XEQOVJJdL+TWrMSk9vPPjTz23xtUtu+QdUHUaUOTZpaySk4iYDKl t6KMMtFFSd8/Dv2JThyRNhyfA+02O1dHKuBLZWx/Kv1EEaGzFFB1HjLKwhiH5UtkuQCyWHxkBLi HJAAM+P2t61/jrwQMQlFUB/+QNLOglo8H8mD3xHZCvc4L2a2UeR+icjYu2pF+he9n2x7xqn55pX c7Hz98tqJiK5uYSIEt0UtzTqJHt3D9Ne1T5Sg7oO7ouslMRyW/sLonm7/GpeQfu+QANga2+WvZ9 qZ5e2T5gRKBiqfs2T+6z0wGGw71GBWGKAcg3qQ== X-Google-Smtp-Source: AGHT+IHYa1Skw/baU8A6XDK/ZyfLXPaKcJFLQvB9Ky0YQsHISAqoX6odpnyINbfSyz/0ZUG6u0MvGg== X-Received: by 2002:a05:600c:1da8:b0:43b:8198:f6e5 with SMTP id 5b1f17b1804b1-43b8198f93fmr4575165e9.12.1740619361536; Wed, 26 Feb 2025 17:22:41 -0800 (PST) Received: from serenity.mandelbit.com ([2001:67c:2fbc:1:7418:f717:1e0a:e55a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba5327f0sm38375395e9.9.2025.02.26.17.22.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 17:22:40 -0800 (PST) From: Antonio Quartulli Date: Thu, 27 Feb 2025 02:21:29 +0100 Subject: [PATCH net-next v20 04/25] ovpn: add basic interface creation/destruction/management routines Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250227-b4-ovpn-v20-4-93f363310834@openvpn.net> References: <20250227-b4-ovpn-v20-0-93f363310834@openvpn.net> In-Reply-To: <20250227-b4-ovpn-v20-0-93f363310834@openvpn.net> To: netdev@vger.kernel.org, Eric Dumazet , Jakub Kicinski , Paolo Abeni , Donald Hunter , Antonio Quartulli , Shuah Khan , sd@queasysnail.net, ryazanov.s.a@gmail.com, Andrew Lunn Cc: Simon Horman , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Xiao Liang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=11062; i=antonio@openvpn.net; h=from:subject:message-id; bh=PjwBq8H+Lj6ev0TaqdLAXzBvAvLzrvuC8Admw+XnhqA=; b=owEBbQGS/pANAwAIAQtw5TqgONWHAcsmYgBnv75fNu2Gxj9T0nTiAmYsVQXVxxWNN23OJMnn0 13rFEYP3COJATMEAAEIAB0WIQSZq9xs+NQS5N5fwPwLcOU6oDjVhwUCZ7++XwAKCRALcOU6oDjV h3c4CAC3VIJ5cKnvyICM0t7lrvqq2E2ZH7ioeZ8QCyHR80AF5AKoO0ULxcwB97GnQB/4YLzKnxr 06wuC/1teOnXM+LAPfjwyf2M6PCIe3VtwnxvLWmfApZoNxC3e3fMTRiN9WINzu2FhjMkQVVKgUJ 4lTAlIIU9gkwetrSQMcJfHPLOFCND6Swkvtl1a5gK6kdzd57AI7G9gdP8bn38yYbb6edeaONWoR HSDOlONvhhPcmH51yxd46jjpMEUjnJ4q0YzpgguYyx5da0hjRQVUifoT3hNnRkLbFdQWyxySqdp /R464ghsFg5qH7EZ+j9Ms8G5MZ0mdAKhZhLi5YC+A49jtwe6 X-Developer-Key: i=antonio@openvpn.net; a=openpgp; fpr=CABDA1282017C267219885C748F0CCB68F59D14C Add basic infrastructure for handling ovpn interfaces. Tested-by: Donald Hunter Signed-off-by: Antonio Quartulli --- Documentation/netlink/specs/rt_link.yaml | 16 +++++ drivers/net/ovpn/Makefile | 1 + drivers/net/ovpn/io.c | 22 ++++++ drivers/net/ovpn/io.h | 24 +++++++ drivers/net/ovpn/main.c | 114 +++++++++++++++++++++++++++= ++-- drivers/net/ovpn/ovpnpriv.h | 7 ++ drivers/net/ovpn/proto.h | 38 +++++++++++ include/uapi/linux/if_link.h | 15 ++++ 8 files changed, 232 insertions(+), 5 deletions(-) diff --git a/Documentation/netlink/specs/rt_link.yaml b/Documentation/netli= nk/specs/rt_link.yaml index 0d492500c7e57dcafcd4b81823abf1c3040c3e78..2cb4743c6cf6f095895dff5b7b2= 3adac572d9386 100644 --- a/Documentation/netlink/specs/rt_link.yaml +++ b/Documentation/netlink/specs/rt_link.yaml @@ -926,6 +926,12 @@ definitions: entries: - name: none - name: default + - + name: ovpn-mode + type: enum + entries: + - p2p + - mp =20 attribute-sets: - @@ -2253,6 +2259,13 @@ attribute-sets: - name: tailroom type: u16 + - + name: linkinfo-ovpn-attrs + attributes: + - + name: mode + type: u8 + enum: ovpn-mode =20 sub-messages: - @@ -2303,6 +2316,9 @@ sub-messages: - value: netkit attribute-set: linkinfo-netkit-attrs + - + value: ovpn + attribute-set: linkinfo-ovpn-attrs - name: linkinfo-member-data-msg formats: diff --git a/drivers/net/ovpn/Makefile b/drivers/net/ovpn/Makefile index 75ac62bba02937bc49cb2a0dec5ca3cc31a8ee00..0e5f686672fb5052cee5a2c2879= 7b70859514a7f 100644 --- a/drivers/net/ovpn/Makefile +++ b/drivers/net/ovpn/Makefile @@ -8,5 +8,6 @@ =20 obj-$(CONFIG_OVPN) :=3D ovpn.o ovpn-y +=3D main.o +ovpn-y +=3D io.o ovpn-y +=3D netlink.o ovpn-y +=3D netlink-gen.o diff --git a/drivers/net/ovpn/io.c b/drivers/net/ovpn/io.c new file mode 100644 index 0000000000000000000000000000000000000000..4b71c38165d7adbb1a2d1a64d27= a13b7f76cfbfe --- /dev/null +++ b/drivers/net/ovpn/io.c @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0 +/* OpenVPN data channel offload + * + * Copyright (C) 2019-2025 OpenVPN, Inc. + * + * Author: James Yonan + * Antonio Quartulli + */ + +#include +#include + +#include "io.h" + +/* Send user data to the network + */ +netdev_tx_t ovpn_net_xmit(struct sk_buff *skb, struct net_device *dev) +{ + skb_tx_error(skb); + kfree_skb(skb); + return NET_XMIT_DROP; +} diff --git a/drivers/net/ovpn/io.h b/drivers/net/ovpn/io.h new file mode 100644 index 0000000000000000000000000000000000000000..afea5f81f5628dcb9afda9a7897= 4bbf6f2101c13 --- /dev/null +++ b/drivers/net/ovpn/io.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* OpenVPN data channel offload + * + * Copyright (C) 2019-2025 OpenVPN, Inc. + * + * Author: James Yonan + * Antonio Quartulli + */ + +#ifndef _NET_OVPN_OVPN_H_ +#define _NET_OVPN_OVPN_H_ + +/* DATA_V2 header size with AEAD encryption */ +#define OVPN_HEAD_ROOM (OVPN_OPCODE_SIZE + OVPN_NONCE_WIRE_SIZE + \ + 16 /* AEAD TAG length */ + \ + max(sizeof(struct udphdr), sizeof(struct tcphdr)) +\ + max(sizeof(struct ipv6hdr), sizeof(struct iphdr))) + +/* max padding required by encryption */ +#define OVPN_MAX_PADDING 16 + +netdev_tx_t ovpn_net_xmit(struct sk_buff *skb, struct net_device *dev); + +#endif /* _NET_OVPN_OVPN_H_ */ diff --git a/drivers/net/ovpn/main.c b/drivers/net/ovpn/main.c index 28133e7e15e74b8a4a937ed03f70d9f83d7a14c8..e71183e6f42cd801861caaec9eb= 0f6828b64cda9 100644 --- a/drivers/net/ovpn/main.c +++ b/drivers/net/ovpn/main.c @@ -10,14 +10,42 @@ #include #include #include +#include +#include #include -#include +#include =20 #include "ovpnpriv.h" #include "main.h" #include "netlink.h" +#include "io.h" +#include "proto.h" + +static int ovpn_net_open(struct net_device *dev) +{ + netif_tx_start_all_queues(dev); + return 0; +} + +static int ovpn_net_stop(struct net_device *dev) +{ + netif_tx_stop_all_queues(dev); + return 0; +} =20 static const struct net_device_ops ovpn_netdev_ops =3D { + .ndo_open =3D ovpn_net_open, + .ndo_stop =3D ovpn_net_stop, + .ndo_start_xmit =3D ovpn_net_xmit, +}; + +static const struct device_type ovpn_type =3D { + .name =3D OVPN_FAMILY_NAME, +}; + +static const struct nla_policy ovpn_policy[IFLA_OVPN_MAX + 1] =3D { + [IFLA_OVPN_MODE] =3D NLA_POLICY_RANGE(NLA_U8, OVPN_MODE_P2P, + OVPN_MODE_MP), }; =20 /** @@ -31,44 +59,120 @@ bool ovpn_dev_is_valid(const struct net_device *dev) return dev->netdev_ops =3D=3D &ovpn_netdev_ops; } =20 +static void ovpn_setup(struct net_device *dev) +{ + netdev_features_t feat =3D NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM | + NETIF_F_GSO | NETIF_F_GSO_SOFTWARE | + NETIF_F_HIGHDMA; + + dev->needs_free_netdev =3D true; + + dev->pcpu_stat_type =3D NETDEV_PCPU_STAT_TSTATS; + + dev->netdev_ops =3D &ovpn_netdev_ops; + + dev->hard_header_len =3D 0; + dev->addr_len =3D 0; + dev->mtu =3D ETH_DATA_LEN - OVPN_HEAD_ROOM; + dev->min_mtu =3D IPV4_MIN_MTU; + dev->max_mtu =3D IP_MAX_MTU - OVPN_HEAD_ROOM; + + dev->type =3D ARPHRD_NONE; + dev->flags =3D IFF_POINTOPOINT | IFF_NOARP; + dev->priv_flags |=3D IFF_NO_QUEUE; + + dev->lltx =3D true; + dev->features |=3D feat; + dev->hw_features |=3D feat; + dev->hw_enc_features |=3D feat; + + dev->needed_headroom =3D ALIGN(OVPN_HEAD_ROOM, 4); + dev->needed_tailroom =3D OVPN_MAX_PADDING; + + SET_NETDEV_DEVTYPE(dev, &ovpn_type); +} + static int ovpn_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { - return -EOPNOTSUPP; + struct ovpn_priv *ovpn =3D netdev_priv(dev); + struct nlattr **data =3D params->data; + enum ovpn_mode mode =3D OVPN_MODE_P2P; + + if (data && data[IFLA_OVPN_MODE]) { + mode =3D nla_get_u8(data[IFLA_OVPN_MODE]); + netdev_dbg(dev, "setting device mode: %u\n", mode); + } + + ovpn->dev =3D dev; + ovpn->mode =3D mode; + + /* turn carrier explicitly off after registration, this way state is + * clearly defined + */ + netif_carrier_off(dev); + + return register_netdevice(dev); +} + +static int ovpn_fill_info(struct sk_buff *skb, const struct net_device *de= v) +{ + struct ovpn_priv *ovpn =3D netdev_priv(dev); + + if (nla_put_u8(skb, IFLA_OVPN_MODE, ovpn->mode)) + return -EMSGSIZE; + + return 0; } =20 static struct rtnl_link_ops ovpn_link_ops =3D { .kind =3D "ovpn", .netns_refund =3D false, + .priv_size =3D sizeof(struct ovpn_priv), + .setup =3D ovpn_setup, + .policy =3D ovpn_policy, + .maxtype =3D IFLA_OVPN_MAX, .newlink =3D ovpn_newlink, .dellink =3D unregister_netdevice_queue, + .fill_info =3D ovpn_fill_info, }; =20 static int ovpn_netdev_notifier_call(struct notifier_block *nb, unsigned long state, void *ptr) { struct net_device *dev =3D netdev_notifier_info_to_dev(ptr); + struct ovpn_priv *ovpn; =20 if (!ovpn_dev_is_valid(dev)) return NOTIFY_DONE; =20 + ovpn =3D netdev_priv(dev); + switch (state) { case NETDEV_REGISTER: - /* add device to internal list for later destruction upon - * unregistration - */ + ovpn->registered =3D true; break; case NETDEV_UNREGISTER: + /* twiddle thumbs on netns device moves */ + if (dev->reg_state !=3D NETREG_UNREGISTERING) + break; + /* can be delivered multiple times, so check registered flag, * then destroy the interface */ + if (!ovpn->registered) + return NOTIFY_DONE; + + netif_carrier_off(dev); + ovpn->registered =3D false; break; case NETDEV_POST_INIT: case NETDEV_GOING_DOWN: case NETDEV_DOWN: case NETDEV_UP: case NETDEV_PRE_UP: + break; default: return NOTIFY_DONE; } diff --git a/drivers/net/ovpn/ovpnpriv.h b/drivers/net/ovpn/ovpnpriv.h index f9322536b06d6baa5524de57cd7d69f5ecbbd194..33c2a41edf9b3204e8aebd26796= 49cb7158f05f2 100644 --- a/drivers/net/ovpn/ovpnpriv.h +++ b/drivers/net/ovpn/ovpnpriv.h @@ -10,12 +10,19 @@ #ifndef _NET_OVPN_OVPNSTRUCT_H_ #define _NET_OVPN_OVPNSTRUCT_H_ =20 +#include +#include + /** * struct ovpn_priv - per ovpn interface state * @dev: the actual netdev representing the tunnel + * @registered: whether dev is still registered with netdev or not + * @mode: device operation mode (i.e. p2p, mp, ..) */ struct ovpn_priv { struct net_device *dev; + bool registered; + enum ovpn_mode mode; }; =20 #endif /* _NET_OVPN_OVPNSTRUCT_H_ */ diff --git a/drivers/net/ovpn/proto.h b/drivers/net/ovpn/proto.h new file mode 100644 index 0000000000000000000000000000000000000000..5f95a78bebd3702868ffeeab3ea= 4938e957d568c --- /dev/null +++ b/drivers/net/ovpn/proto.h @@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* OpenVPN data channel offload + * + * Copyright (C) 2020-2025 OpenVPN, Inc. + * + * Author: Antonio Quartulli + * James Yonan + */ + +#ifndef _NET_OVPN_PROTO_H_ +#define _NET_OVPN_PROTO_H_ + +/* When the OpenVPN protocol is ran in AEAD mode, use + * the OpenVPN packet ID as the AEAD nonce: + * + * 00000005 521c3b01 4308c041 + * [seq # ] [ nonce_tail ] + * [ 12-byte full IV ] -> OVPN_NONCE_SIZE + * [4-bytes -> OVPN_NONCE_WIRE_SIZE + * on wire] + */ + +/* nonce size (96bits) as required by AEAD ciphers */ +#define OVPN_NONCE_SIZE 12 +/* last 8 bytes of AEAD nonce: provided by userspace and usually derived + * from key material generated during TLS handshake + */ +#define OVPN_NONCE_TAIL_SIZE 8 + +/* OpenVPN nonce size reduced by 8-byte nonce tail -- this is the + * size of the AEAD Associated Data (AD) sent over the wire + * and is normally the head of the IV + */ +#define OVPN_NONCE_WIRE_SIZE (OVPN_NONCE_SIZE - OVPN_NONCE_TAIL_SIZE) + +#define OVPN_OPCODE_SIZE 4 /* DATA_V2 opcode size */ + +#endif /* _NET_OVPN_PROTO_H_ */ diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index bfe880fbbb24bc765bee73212f2c83d53db168e2..27a28de0743cd81c57ccc8af475= 222da4c4ae38b 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -1979,4 +1979,19 @@ enum { =20 #define IFLA_DSA_MAX (__IFLA_DSA_MAX - 1) =20 +/* OVPN section */ + +enum ovpn_mode { + OVPN_MODE_P2P, + OVPN_MODE_MP, +}; + +enum { + IFLA_OVPN_UNSPEC, + IFLA_OVPN_MODE, + __IFLA_OVPN_MAX, +}; + +#define IFLA_OVPN_MAX (__IFLA_OVPN_MAX - 1) + #endif /* _UAPI_LINUX_IF_LINK_H */ --=20 2.45.3