From patchwork Tue Mar 4 00:33:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 13999686 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.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 2452D1F4620 for ; Tue, 4 Mar 2025 00:34:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741048493; cv=none; b=bx/qM06mLPdkawfvQocoh8eakv/2wAC4edgvCu69IE2ARzQuq/12ikmqaI8mUGeppw4FzNVlcVb9DbePmwO5B7J1DjR/GHOGb+Uh9X1hEIQ+RQg7jjSCLZh6Rwu1PNVSOuxeay012fe1Iwz22tsy7SejwkKCIKNCj9SSVfpAbqE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741048493; c=relaxed/simple; bh=KE4nFZi9+ewgg8UnAQzYdDnB7CPQVdLbyMYR68tSCVE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=V6sFyZhDoB7H66RbSIKnNmXBjeUdmCG+Y+4YQaa3oyUKC/1u8Le1DF7JvR6f5+cKIKtm6GSClxvh6gIveDfjatznv1XpvrARA8bKfFDq3T/8ONr4t+eWhRpDRuHzbRwEiMZseiRPZ6iVP+5/4TtUfOXrriqA7apNaw4dmOo08eY= 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=EGL94IzQ; arc=none smtp.client-ip=209.85.221.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="EGL94IzQ" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-38f406e9f80so3805184f8f.2 for ; Mon, 03 Mar 2025 16:34:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1741048489; x=1741653289; 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=2dy6NXYodZRtf8WbzXv2Q+yMhslp3MYvd9LoEGdpq5Q=; b=EGL94IzQCPI0/n3HTzSMmEAaN8oTqXIhAq5XVDbNjPE7wHzrUR3KD4maANSRB7kZQv gXs1GpdR3K4Ulo9kmImm8/aL583LjgWE3NM54dJi2tRdiDeMkijPe+BM2B4dU+zqUMuK Ho0Ziba0++2g/ei+bOQ9ArGoGqbEQZb7fBU7FJLro2a1O6Ml5nMyJGunrtmiKjsCqokO y+asiAj1Vh0AuCNMGuW6hibVJe1yOaqbvfV7kKFpdztsmgL0XsXNGMt2Zptzqr0ErQai xbePgO/P95VtPUfUk8M42uxlPAu8rfvpjXO6jhmXCOK0OKh0fCHKBxGI3rrOEwEvshx5 yRdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741048489; x=1741653289; 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=2dy6NXYodZRtf8WbzXv2Q+yMhslp3MYvd9LoEGdpq5Q=; b=TaExcJz/t3kMVKOeK+CXvK0noGMDkadyK6UfhiFj+ipXH4LH3yd1GQngKu2wJdTR2r CUrU5ijVDiUlooIdEShxpq5EXZj8tX0nCrpfCt3ljvUwDbdlX6VytmzgwHiosOHwGGbX tWlbkOAvW1p8cORzfTYP9Hv22h6wDjw18dxMBM3q7jmasRl7GxMA69ZqvZde+lUK1wbe BrSj8fJC82QX+pUjbsPra47dnBoxodcEbOpZdbzz6Ok2OJKq10jfXlc2iyCAdIr/cWD3 NJuvn7L9WVpcNwCXsj1P1viHzmOh0CtKuUCy5pJbzujeAkvfZg+37WKKSUoGH8DcFaE6 g0uA== X-Gm-Message-State: AOJu0YyaF4DUTDbAc6FVNWj2FIfRHUEmiNdTjQl/A/1TMLTNZ0ULL9Vy +IaHWaHLSn2brKtbpTam71DD2tmLFuHCJB5L2hG2rPWYZQ/N2xs6pQHr5yNWp5DxEd0FDKsgYeo M X-Gm-Gg: ASbGncvIdtDmonJ+ae1ca0NA4arJvG24BUfhFF01paTrhH0Q6MjiB+zXEkGBtRkhUVc BQoDbU4013g+wwjjQkDzsR0yrOBCi1lLK1sulwaY2nvYw6933IOgqFOeEQxPa3nHAHjQ9+a5brn YjbK4MdIUFp80RMYF4wgLo742RXNl2PQ6XjkoMszG/+ADpSAjBLh9QZRgXh+7EIUjh0wDMT+/Az +sfQ8DKGr2xIaE1qeKXZephMC/CScj6Lwt7WxQOzPVX25RbTjV0Ko/IAr5CjMaROQkReFgG0KBM u2PPMFiTyJ/6sdAKmDRAHiuWQEMHZFCBk7f74yQKXw== X-Google-Smtp-Source: AGHT+IH4zQbpBYRUb2nti1hs1geBAHe6f+SGB1UtGfITZrhN4G0avmDqMY+AWJgsO7PAQgKOJ8NBnA== X-Received: by 2002:a5d:47a5:0:b0:390:fe05:da92 with SMTP id ffacd0b85a97d-390fe05dc73mr5715615f8f.1.1741048489553; Mon, 03 Mar 2025 16:34:49 -0800 (PST) Received: from [127.0.0.1] ([2001:67c:2fbc:1:49fa:e07e:e2df:d3ba]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47a6d0asm15709265f8f.27.2025.03.03.16.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Mar 2025 16:34:49 -0800 (PST) From: Antonio Quartulli Date: Tue, 04 Mar 2025 01:33:47 +0100 Subject: [PATCH v21 17/24] ovpn: add support for updating local UDP endpoint Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250304-b4-ovpn-tmp-v21-17-d3cbb74bb581@openvpn.net> References: <20250304-b4-ovpn-tmp-v21-0-d3cbb74bb581@openvpn.net> In-Reply-To: <20250304-b4-ovpn-tmp-v21-0-d3cbb74bb581@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=2830; i=antonio@openvpn.net; h=from:subject:message-id; bh=KE4nFZi9+ewgg8UnAQzYdDnB7CPQVdLbyMYR68tSCVE=; b=owEBbQGS/pANAwAIAQtw5TqgONWHAcsmYgBnxkqPbdl4UhO21UKtL8lTdQSdS7u6cV5ic+Fsg CBsq3uA4fWJATMEAAEIAB0WIQSZq9xs+NQS5N5fwPwLcOU6oDjVhwUCZ8ZKjwAKCRALcOU6oDjV h5seCAC3Nv+5EXx9LitOJ3Pqc/07dgBei4lmhflzMQ9voAi2BfozPE1JMbGb13h6T8w+Sq3kAzy z2oMBRdAp3LsnsPqObRbTQHKFX3f/ZBw5ZavwdiTW2lqhBgZYrzNovBohVQglnAo5oWrE9F9lEy wYof/9XW9dVgYcTXWqHxog7B5v1Kxn8JgQapKK6nRa6HZU5HLsBbNREAtJ/8w6Lnacrsift+F12 J3zcZU33+89lPyXyvIFrRqrkkAi2BKjZz9udw72mnK/ttkv8fgKKxbKsL9Xn6QvYUfqKbevyhcj qTFHum9+ie5dJJtPyeeAkdGF+14rAwsoDFMZmPsdJ115Lze1 X-Developer-Key: i=antonio@openvpn.net; a=openpgp; fpr=CABDA1282017C267219885C748F0CCB68F59D14C X-Patchwork-Delegate: kuba@kernel.org In case of UDP links, the local endpoint used to communicate with a given peer may change without a connection restart. Add support for learning the new address in case of change. Signed-off-by: Antonio Quartulli --- drivers/net/ovpn/peer.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ drivers/net/ovpn/peer.h | 3 +++ 2 files changed, 48 insertions(+) diff --git a/drivers/net/ovpn/peer.c b/drivers/net/ovpn/peer.c index 45e87ac155b554044388490a403f64c777d283a6..1803359b833d5797728566fb976e253e2a85ea75 100644 --- a/drivers/net/ovpn/peer.c +++ b/drivers/net/ovpn/peer.c @@ -522,6 +522,51 @@ static void ovpn_peer_remove(struct ovpn_peer *peer, llist_add(&peer->release_entry, release_list); } +/** + * ovpn_peer_update_local_endpoint - update local endpoint for peer + * @peer: peer to update the endpoint for + * @skb: incoming packet to retrieve the destination address (local) from + */ +void ovpn_peer_update_local_endpoint(struct ovpn_peer *peer, + struct sk_buff *skb) +{ + struct ovpn_bind *bind; + + rcu_read_lock(); + bind = rcu_dereference(peer->bind); + if (unlikely(!bind)) + goto unlock; + + spin_lock_bh(&peer->lock); + switch (skb->protocol) { + case htons(ETH_P_IP): + if (unlikely(bind->local.ipv4.s_addr != ip_hdr(skb)->daddr)) { + net_dbg_ratelimited("%s: learning local IPv4 for peer %d (%pI4 -> %pI4)\n", + netdev_name(peer->ovpn->dev), + peer->id, &bind->local.ipv4.s_addr, + &ip_hdr(skb)->daddr); + bind->local.ipv4.s_addr = ip_hdr(skb)->daddr; + } + break; + case htons(ETH_P_IPV6): + if (unlikely(!ipv6_addr_equal(&bind->local.ipv6, + &ipv6_hdr(skb)->daddr))) { + net_dbg_ratelimited("%s: learning local IPv6 for peer %d (%pI6c -> %pI6c\n", + netdev_name(peer->ovpn->dev), + peer->id, &bind->local.ipv6, + &ipv6_hdr(skb)->daddr); + bind->local.ipv6 = ipv6_hdr(skb)->daddr; + } + break; + default: + break; + } + spin_unlock_bh(&peer->lock); + +unlock: + rcu_read_unlock(); +} + /** * ovpn_peer_get_by_dst - Lookup peer to send skb to * @ovpn: the private data representing the current VPN session diff --git a/drivers/net/ovpn/peer.h b/drivers/net/ovpn/peer.h index e747c4b210642db990222986a80bb37c9a0413fe..d90ccc313cc3af24ffa6df8bb41bca15fbb022ad 100644 --- a/drivers/net/ovpn/peer.h +++ b/drivers/net/ovpn/peer.h @@ -153,4 +153,7 @@ bool ovpn_peer_check_by_src(struct ovpn_priv *ovpn, struct sk_buff *skb, void ovpn_peer_keepalive_set(struct ovpn_peer *peer, u32 interval, u32 timeout); void ovpn_peer_keepalive_work(struct work_struct *work); +void ovpn_peer_update_local_endpoint(struct ovpn_peer *peer, + struct sk_buff *skb); + #endif /* _NET_OVPN_OVPNPEER_H_ */