From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 BF1C437F8DD for ; Fri, 13 Mar 2026 20:51:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773435116; cv=none; b=nVd13ZYRGJ/onuCbfRGPPHTEDErIoKTUV9g7VdmEBSLBMtk/p5MmUJRqyWk68NCUHyHP9a6vLSCipmV3STqzvrTiPDqxrbdtjeWvkjcGY9vqJcpYgvPq+FGi3LlsBByGOI9+3yEVDBgHqrAUeoeLngL0HdWHld1m6Q3/rjInjpw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773435116; c=relaxed/simple; bh=JSJGJMK6KyufJ/PXMyD+v1i6aM7TmhBZWN5SubcrK5g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rSwZyehgGOvQCQnkSK9HIx+9aFKXjjnWT1WnW2xoALO2CzFWHD2dPYIzWxQMFcShypg4KqCBiIg4z7ksdzABa9eu7q1L4Y9JqzgS0WbGmZYzewoRi+nhAy8rcEuxWq3LS/LGWotncyEQ0usDjgwfHuK44mSkiMvMI+wtbpFAKXI= 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=O7krN0Xf; arc=none smtp.client-ip=209.85.221.49 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="O7krN0Xf" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-439f59dfda2so2099412f8f.2 for ; Fri, 13 Mar 2026 13:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1773435113; x=1774039913; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qqDo5H8oLMcH1+Hu7RTzP1KSiSjs6M89cDFS4JLvEmU=; b=O7krN0XfO9I9oI9RIKVFHpCgE/lhX5Wyr4Jl0kR5cPwJIt5zSTOQERZQc4bV4eaKpW T78du3acAL0Mw1fM53lRtHmkIOjjbtW+ts/coaq8rrmY8K/Akb3Q+PI/s9AhsA/p7d+z AbAqwKtouqxEECYDD2f06EcjZ8REjpzpE0ZwaoRx1y9++to5wxD+PprIYpyB43FdoyG1 GH0PNYzAXNDLL5SBHYhEwB4hl1Ix0CyzQGB8om9EhquIK67oGvB3GmJbSM/hfNUkMcS1 cjvjlZBhkM974WvwywjmSUhKaRWhbwbGCfIxjq4wOo1eVoTjCUD0rQ5yn4bhQEM4x7wV 1qZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773435113; x=1774039913; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=qqDo5H8oLMcH1+Hu7RTzP1KSiSjs6M89cDFS4JLvEmU=; b=AGmu8ciLpdhBX4yc2wDTEV8JFJ7IIJoGaMb+8yT7I8nKspRTcOQ8zClwqCxLgmVIWk GS25tgbqY0Uz+wVJL3TY/GRWXT4eKzgr7f/gOjvtHSJaWX4HR9CUfIAqCpco8DeowX48 qCr8dNunm01TjSFZtTsy7GFceA5Y37qIhnscmBEaqo1Eb2yqStE9B1ZHi4c/787CyJtc xd6n9QcG23SZiF6M8yZxwg73+QiXyfL6xf+/PiZL9FAJIpMFUiDMw6YZF0VPnOtAx8+J x8WeTH9h3QTECOtCZq0/2vDbkgzeD44NUah4ARelCN9duZGi6GLGOjPaiCGObqKB5c2p R1cQ== X-Forwarded-Encrypted: i=1; AJvYcCUYA5+RnIAD+Jsh+DJKtTWGERMTpXXeWkMr74sPWIYsc0cgxNw2xuNjvv1TDqgpBdAv/JnqD0hod0UFVDPFNEM=@vger.kernel.org X-Gm-Message-State: AOJu0YzuYQgdl7srzkFPVs1SUJ1W5arSrqjERAwdIQZQJEwK1iGtWYDi veaG11Grjn0MKVHV/JPTasiyZuL4w3gbvYv4qgcd09Tv04hy7j70IZ0bzQim4IfYEG03jsm1bnE FmY377kaQ7lgEBsmthnQLc4KYrGb6nQCmsYpJdqXDAi77+IvSY+JmdtdbIjpJ7mA= X-Gm-Gg: ATEYQzzp+21OnCO9WQ9U691Ailk3xbdLvQXw5x5k+qqYrFaMkJszlJPq+aapfto27mX uI7t8bxHM3Zp3zo+72gLCXSugzWgH0yXXhcz0ig3xu6GaEx6DZaS36Zee9zpKoJycAQpD19jafs RRX/btpeK/i93/xcyG8YJ/yIqKXsXsir8wvtS7g8cSRlsFEqVW5q+I6JGnLOqDkE3XaLUgXr2S+ RHKPbQqXyPJGacrZD8E563UTVL0D9wG2MpPRiSfgHp/hgxIbKsJLKsQssHqqinZHZ55PbA9XXIz phgriIMfJfxYNzSVaHQVm38+5xVpH4JHCF++EP+LdCvmhLszn0C9x9H3kCCkZp8OaMktssa49gy cC61lpHHHL8AfVB9GBVLcmn0iRw82dNvD0KAXnkvzmV7zJ04pT9kbOMOQqoh7MyHo00x3SHGkm4 KC4wjCEaHysFC3w5ut6xWHD643Zu9Xhn9ktMDV X-Received: by 2002:a05:600c:4f8b:b0:485:3e6c:aa84 with SMTP id 5b1f17b1804b1-4855670f7d3mr72917395e9.33.1773435112935; Fri, 13 Mar 2026 13:51:52 -0700 (PDT) Received: from inifinity.mandelbit.com ([2001:67c:2fbc:1:9684:4355:e76d:6ae9]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe2273d9sm23120468f8f.34.2026.03.13.13.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 13:51:52 -0700 (PDT) From: Antonio Quartulli To: netdev@vger.kernel.org Cc: ralf@mandelbit.com, Sabrina Dubroca , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" , Eric Dumazet , linux-kselftest@vger.kernel.org, horms@kernel.org, shuah@kernel.org, donald.hunter@gmail.com, Antonio Quartulli Subject: [PATCH net-next 4/9] ovpn: notify userspace on client float event Date: Fri, 13 Mar 2026 21:51:34 +0100 Message-ID: <20260313205139.2950-5-antonio@openvpn.net> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260313205139.2950-1-antonio@openvpn.net> References: <20260313205139.2950-1-antonio@openvpn.net> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ralf Lici Send a netlink notification when a client updates its remote UDP endpoint. The notification includes the new IP address, port, and scope ID (for IPv6). Cc: linux-kselftest@vger.kernel.org Cc: horms@kernel.org Cc: shuah@kernel.org Cc: donald.hunter@gmail.com Signed-off-by: Ralf Lici Signed-off-by: Antonio Quartulli Reviewed-by: Sabrina Dubroca --- Documentation/netlink/specs/ovpn.yaml | 6 ++ drivers/net/ovpn/netlink.c | 82 +++++++++++++++++++++ drivers/net/ovpn/netlink.h | 2 + drivers/net/ovpn/peer.c | 2 + include/uapi/linux/ovpn.h | 1 + tools/testing/selftests/net/ovpn/ovpn-cli.c | 3 + 6 files changed, 96 insertions(+) diff --git a/Documentation/netlink/specs/ovpn.yaml b/Documentation/netlink/specs/ovpn.yaml index 1b91045cee2e..0d0c028bf96f 100644 --- a/Documentation/netlink/specs/ovpn.yaml +++ b/Documentation/netlink/specs/ovpn.yaml @@ -502,6 +502,12 @@ operations: - ifindex - keyconf + - + name: peer-float-ntf + doc: Notification about a peer floating (changing its remote UDP endpoint) + notify: peer-get + mcgrp: peers + mcast-groups: list: - diff --git a/drivers/net/ovpn/netlink.c b/drivers/net/ovpn/netlink.c index fed0e46b32a3..e10d7f9a28f5 100644 --- a/drivers/net/ovpn/netlink.c +++ b/drivers/net/ovpn/netlink.c @@ -1203,6 +1203,88 @@ int ovpn_nl_peer_del_notify(struct ovpn_peer *peer) return ret; } +/** + * ovpn_nl_peer_float_notify - notify userspace about peer floating + * @peer: the floated peer + * @ss: sockaddr representing the new remote endpoint + * + * Return: 0 on success or a negative error code otherwise + */ +int ovpn_nl_peer_float_notify(struct ovpn_peer *peer, + const struct sockaddr_storage *ss) +{ + struct ovpn_socket *sock; + struct sockaddr_in6 *sa6; + struct sockaddr_in *sa; + struct sk_buff *msg; + struct nlattr *attr; + int ret = -EMSGSIZE; + void *hdr; + + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC); + if (!msg) + return -ENOMEM; + + hdr = genlmsg_put(msg, 0, 0, &ovpn_nl_family, 0, + OVPN_CMD_PEER_FLOAT_NTF); + if (!hdr) { + ret = -ENOBUFS; + goto err_free_msg; + } + + if (nla_put_u32(msg, OVPN_A_IFINDEX, peer->ovpn->dev->ifindex)) + goto err_cancel_msg; + + attr = nla_nest_start(msg, OVPN_A_PEER); + if (!attr) + goto err_cancel_msg; + + if (nla_put_u32(msg, OVPN_A_PEER_ID, peer->id)) + goto err_cancel_msg; + + if (ss->ss_family == AF_INET) { + sa = (struct sockaddr_in *)ss; + if (nla_put_in_addr(msg, OVPN_A_PEER_REMOTE_IPV4, + sa->sin_addr.s_addr) || + nla_put_net16(msg, OVPN_A_PEER_REMOTE_PORT, sa->sin_port)) + goto err_cancel_msg; + } else if (ss->ss_family == AF_INET6) { + sa6 = (struct sockaddr_in6 *)ss; + if (nla_put_in6_addr(msg, OVPN_A_PEER_REMOTE_IPV6, + &sa6->sin6_addr) || + nla_put_u32(msg, OVPN_A_PEER_REMOTE_IPV6_SCOPE_ID, + sa6->sin6_scope_id) || + nla_put_net16(msg, OVPN_A_PEER_REMOTE_PORT, sa6->sin6_port)) + goto err_cancel_msg; + } else { + ret = -EAFNOSUPPORT; + goto err_cancel_msg; + } + + nla_nest_end(msg, attr); + genlmsg_end(msg, hdr); + + rcu_read_lock(); + sock = rcu_dereference(peer->sock); + if (!sock) { + ret = -EINVAL; + goto err_unlock; + } + genlmsg_multicast_netns(&ovpn_nl_family, sock_net(sock->sk), msg, + 0, OVPN_NLGRP_PEERS, GFP_ATOMIC); + rcu_read_unlock(); + + return 0; + +err_unlock: + rcu_read_unlock(); +err_cancel_msg: + genlmsg_cancel(msg, hdr); +err_free_msg: + nlmsg_free(msg); + return ret; +} + /** * ovpn_nl_key_swap_notify - notify userspace peer's key must be renewed * @peer: the peer whose key needs to be renewed diff --git a/drivers/net/ovpn/netlink.h b/drivers/net/ovpn/netlink.h index 8615dfc3c472..11ee7c681885 100644 --- a/drivers/net/ovpn/netlink.h +++ b/drivers/net/ovpn/netlink.h @@ -13,6 +13,8 @@ int ovpn_nl_register(void); void ovpn_nl_unregister(void); int ovpn_nl_peer_del_notify(struct ovpn_peer *peer); +int ovpn_nl_peer_float_notify(struct ovpn_peer *peer, + const struct sockaddr_storage *ss); int ovpn_nl_key_swap_notify(struct ovpn_peer *peer, u8 key_id); #endif /* _NET_OVPN_NETLINK_H_ */ diff --git a/drivers/net/ovpn/peer.c b/drivers/net/ovpn/peer.c index 3716a1d82801..4e145b4497e6 100644 --- a/drivers/net/ovpn/peer.c +++ b/drivers/net/ovpn/peer.c @@ -287,6 +287,8 @@ void ovpn_peer_endpoints_update(struct ovpn_peer *peer, struct sk_buff *skb) spin_unlock_bh(&peer->lock); + ovpn_nl_peer_float_notify(peer, &ss); + /* rehashing is required only in MP mode as P2P has one peer * only and thus there is no hashtable */ diff --git a/include/uapi/linux/ovpn.h b/include/uapi/linux/ovpn.h index 959b41def61f..0cce0d58b830 100644 --- a/include/uapi/linux/ovpn.h +++ b/include/uapi/linux/ovpn.h @@ -100,6 +100,7 @@ enum { OVPN_CMD_KEY_SWAP, OVPN_CMD_KEY_SWAP_NTF, OVPN_CMD_KEY_DEL, + OVPN_CMD_PEER_FLOAT_NTF, __OVPN_CMD_MAX, OVPN_CMD_MAX = (__OVPN_CMD_MAX - 1) diff --git a/tools/testing/selftests/net/ovpn/ovpn-cli.c b/tools/testing/selftests/net/ovpn/ovpn-cli.c index 0f3babf19fd0..7178abae1b2f 100644 --- a/tools/testing/selftests/net/ovpn/ovpn-cli.c +++ b/tools/testing/selftests/net/ovpn/ovpn-cli.c @@ -1516,6 +1516,9 @@ static int ovpn_handle_msg(struct nl_msg *msg, void *arg) case OVPN_CMD_PEER_DEL_NTF: fprintf(stdout, "received CMD_PEER_DEL_NTF\n"); break; + case OVPN_CMD_PEER_FLOAT_NTF: + fprintf(stdout, "received CMD_PEER_FLOAT_NTF\n"); + break; case OVPN_CMD_KEY_SWAP_NTF: fprintf(stdout, "received CMD_KEY_SWAP_NTF\n"); break; -- 2.52.0