From nobody Tue Feb 10 15:46:17 2026 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 2A086225411 for ; Fri, 10 Jan 2025 22:26:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736547994; cv=none; b=r4twRJrQbrsGRVv0HLLHmxNhoSmv5NmPBwu5KqFZsOkMd7HM/gqMGfQ20AY3O67kIODo68DFSdyGH0S6HRCzyNbpMj4BA0EI6hGX+hdSQxdAXqFAZxISWmqIJBa85o36tXpjI487AWYRAOkUa0ygVVlNN7oKWSMtyo2tyvOpgbE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736547994; c=relaxed/simple; bh=5nB6P1uqMYCKCgFkweOVzibQBqTXu4/Iu+/EqgwmLPc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ha4tIOYvhoQgUveywPa112eDAKE/TZDXvWQ4TA6cPotC8f0PAG9MpYZI3Exqy/z/mn3Y3Nwl5JzGp8ITWyrM8OGo90ldv+c0bjtGOfiBrs0T6nlWdMY4nnHhznuxw3yWZM3DgaIADHV+XqmUh9pdxBWniaZkasm2sQ7wBxK6mc4= 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=YOjS5Zm0; arc=none smtp.client-ip=209.85.128.47 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="YOjS5Zm0" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4361f65ca01so24824825e9.1 for ; Fri, 10 Jan 2025 14:26:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1736547989; x=1737152789; 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=dPCdnsDybTbSek31CaEhyHUdFmbRNtk8egB04xoYnP8=; b=YOjS5Zm0v+c7ylzMx6xjWVUJeeEIMQJuw8VDRDzOukvQ/2sB94QaKWZGMkbP3CNq+S 06ta09lxkCdbpTF4lxqkWY2xSECmQC6Vl2LZQ30fx3nd61kTfoirYoN5yukKZNz1h4nI Y8m6J3CrN3l53jHEMpcV+u8AtI7tH70bgx1nNEppRyX9UqoVNeYL8xnDhhFROaYxyD0D Sq3gfSsOens0xBMm+KAgTHGP1NLFOVOqwzEW9406wNV5+CQ+70ADY2NQYvF40I/ocVJQ Eh/n4ztDkXDtRpewtvHHFMZNWItxQj4HOwQuaDmFqc+zyiWJ5i3GnRVNpbm/MfTs5/lz oEtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736547989; x=1737152789; 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=dPCdnsDybTbSek31CaEhyHUdFmbRNtk8egB04xoYnP8=; b=OwnvNNZ8aezAVjyIHsJDmXuwGWq5vhwe21YuwWnDRAJrxynb/Vn0gExKaq3d3l/Vm4 wa4U6FOcK1Gmkana37AbYcye6L5eLMHt1YAMBdqPxhHyA1au32gTB/MOG2E/8vIVBot/ hz1BgSL34xadc2tkuzFZ9rYUkIVKzvhjM+5J6cAkgles9nYYwgURHpsvAHsERSOs0paA PfAsH35MeCEoSgHfCGRWziT43R4mA0lR2kf29GYrMh2elQiLmBD0UmKnwgAlXdtH5+BV QNyN+i73MUYeQNccx/lL9YZsR7WG0nf2npkleya5GyHUjhOGZwgaUBn+NAK3I1flbw81 /5Pw== X-Forwarded-Encrypted: i=1; AJvYcCUyvsFO2bdUxl6PRYjuwxkPtoaIX4Ouf29a2r0tMAwuAs/241gxrzSm4gNU8hCN6oFyGnQ2Ap3ISDfGo+g=@vger.kernel.org X-Gm-Message-State: AOJu0YyAG14LZnip1Bkgk+dd/pdgRuw3f/qeM14PsM0Ix9nSJTCZcDqK cg8fX6GvosBVDW/Z2m5n54URzJmgaCJ3ajgUkfj6Utnrp39m3HV+ImjO3kgvNUk= X-Gm-Gg: ASbGncvRzPEqYbPVs60PJdKBadHivXCsc61xBDUF2ESnbiyk4b9MKLXKwruxpiysjY9 6CkM2tlJC1vNmjcqrF+tDSOY+/3MfNf5Z8mSzEnjEhPmgzqg89dyrezJ9etlbLZZkhv37S2pAHE V+rhAcNSiew+gjpIteYBYxticOGft3Wkv/5gXJJbu6e1Lw3F4HtDGYY7i3kalO4Z9xATAD6nF/t XvxrZNmE4LBUDHnA34vyM5UhTRGn+BPlRmQ/eEtYe0zdgGTPBvxMWi21SHebFLXGGpe X-Google-Smtp-Source: AGHT+IEcA3vMSJU0aCQeYCUPqUPpn6l2NuJ+8KV+Ek4g4Zn6R8fv8uPOQpiL+8tEhw8VHJoMoz2jgA== X-Received: by 2002:adf:c08d:0:b0:38a:87cc:fb42 with SMTP id ffacd0b85a97d-38a87ccfc9cmr9793310f8f.21.1736547989313; Fri, 10 Jan 2025 14:26:29 -0800 (PST) Received: from serenity.mandelbit.com ([2001:67c:2fbc:1:ef5f:9500:40ad:49a7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a8e37d0fasm5704340f8f.19.2025.01.10.14.26.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 14:26:28 -0800 (PST) From: Antonio Quartulli Date: Fri, 10 Jan 2025 23:26:30 +0100 Subject: [PATCH net-next v17 14/25] ovpn: add support for MSG_NOSIGNAL in tcp_sendmsg 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: <20250110-b4-ovpn-v17-14-47b2377e5613@openvpn.net> References: <20250110-b4-ovpn-v17-0-47b2377e5613@openvpn.net> In-Reply-To: <20250110-b4-ovpn-v17-0-47b2377e5613@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=2496; i=antonio@openvpn.net; h=from:subject:message-id; bh=5nB6P1uqMYCKCgFkweOVzibQBqTXu4/Iu+/EqgwmLPc=; b=owEBbQGS/pANAwAIAQtw5TqgONWHAcsmYgBngZ6xGB4iodHaYPo5Ul5iupajqwKgiIA1wutrf UUPxPM7yd2JATMEAAEIAB0WIQSZq9xs+NQS5N5fwPwLcOU6oDjVhwUCZ4GesQAKCRALcOU6oDjV h5LRB/0UVvMyArvwyBRZ3cQxUSa1TqmKOceQH5WExtkF8VGuEQnY25u2kKj1Uo+N95gothw/7X6 WTlTPJMlPXIvn4vJb7P5YA+HFSwwwGXu+k9wWCYQWu481+/F2UmS6scI8wrIFlBno0kMhI7nnhV rbfSzPGwBds1aEHrPNgxD6dNSnfWW/tEDIyTO2cALqXGpVf4XI96SadiA8J5Y2mTjbkXxaHfa7h yPgvupJZC49mQPQL5vW1V48f9gygjdnV8R/XUP7cVn7lALAK2o+objtMLvmWUrXTfABq+0XQcLv LXo+5188FneEoIlOlZtu1WCZRP/sYYl1wtzyGqSkVKAeShN6 X-Developer-Key: i=antonio@openvpn.net; a=openpgp; fpr=CABDA1282017C267219885C748F0CCB68F59D14C Userspace may want to pass the MSG_NOSIGNAL flag to tcp_sendmsg() in order to avoid generating a SIGPIPE. To pass this flag down the TCP stack a new skb sending API accepting a flags argument is introduced. Cc: Eric Dumazet Cc: Paolo Abeni Signed-off-by: Antonio Quartulli --- drivers/net/ovpn/skb.h | 1 + drivers/net/ovpn/tcp.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ovpn/skb.h b/drivers/net/ovpn/skb.h index fd19cc3081227e01c4c1ef25155de614b2dc2795..67c6e1e4a79041198f554d7c534= bc2373ca96033 100644 --- a/drivers/net/ovpn/skb.h +++ b/drivers/net/ovpn/skb.h @@ -24,6 +24,7 @@ struct ovpn_cb { struct aead_request *req; struct scatterlist *sg; unsigned int payload_offset; + bool nosignal; }; =20 static inline struct ovpn_cb *ovpn_skb_cb(struct sk_buff *skb) diff --git a/drivers/net/ovpn/tcp.c b/drivers/net/ovpn/tcp.c index f42b449b24d04ac247576d9de2c0513683e0072c..9776d87acc4742661423cd1824a= c12b385889a97 100644 --- a/drivers/net/ovpn/tcp.c +++ b/drivers/net/ovpn/tcp.c @@ -217,6 +217,7 @@ void ovpn_tcp_socket_detach(struct ovpn_socket *ovpn_so= ck) static void ovpn_tcp_send_sock(struct ovpn_peer *peer) { struct sk_buff *skb =3D peer->tcp.out_msg.skb; + int ret, flags; =20 if (!skb) return; @@ -227,9 +228,11 @@ static void ovpn_tcp_send_sock(struct ovpn_peer *peer) peer->tcp.tx_in_progress =3D true; =20 do { - int ret =3D skb_send_sock_locked(peer->sock->sock->sk, skb, - peer->tcp.out_msg.offset, - peer->tcp.out_msg.len); + flags =3D ovpn_skb_cb(skb)->nosignal ? MSG_NOSIGNAL : 0; + ret =3D skb_send_sock_locked_with_flags(peer->sock->sock->sk, skb, + peer->tcp.out_msg.offset, + peer->tcp.out_msg.len, + flags); if (unlikely(ret < 0)) { if (ret =3D=3D -EAGAIN) goto out; @@ -369,7 +372,7 @@ static int ovpn_tcp_sendmsg(struct sock *sk, struct msg= hdr *msg, size_t size) =20 lock_sock(peer->sock->sock->sk); =20 - if (msg->msg_flags & ~MSG_DONTWAIT) { + if (msg->msg_flags & ~(MSG_DONTWAIT | MSG_NOSIGNAL)) { ret =3D -EOPNOTSUPP; goto peer_free; } @@ -402,6 +405,7 @@ static int ovpn_tcp_sendmsg(struct sock *sk, struct msg= hdr *msg, size_t size) goto peer_free; } =20 + ovpn_skb_cb(skb)->nosignal =3D msg->msg_flags & MSG_NOSIGNAL; ovpn_tcp_send_sock_skb(sock->peer, skb); ret =3D size; peer_free: --=20 2.45.2