From patchwork Thu Feb 27 01:21:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 13993462 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 994A61DD88E for ; Thu, 27 Feb 2025 01:23:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740619385; cv=none; b=gf0ogVnRonwz/IKi8Ku3FIETL1G3InOzJK5pkIsppwIfTsCGkeunzMflMkRuVSpVkn4wsE8dQ9RYTJr+V8gyuI6bZLiUmPxh6qJxgXowwWdMEtFwIJ997IHSyCWptY3pIe/lU42swELjD6AMdcSXDjPIh+1TN+LV0HaR3lj6/I8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740619385; c=relaxed/simple; bh=TtyqMEWWXVuF5D1AonBdS9TIDufBNGXd/kgliq1Dnl4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mJWwXZrof9v1+2NVvxvTog4weBCvtJbo2a+6egh+gBPO/ihk6MtfxNUArnd5hXQq7SgxWX4G8MoCNHj594+OYc00GWDy0NXtSHZTrwAMjrALNfcs0a+uXGpGccfyRr+EFntynD1f7gpjBGiLvMIuo3VgjKKd1srhmlE8YTpWCe0= 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=TzPe2+qh; arc=none smtp.client-ip=209.85.128.52 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="TzPe2+qh" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4397dff185fso3767355e9.2 for ; Wed, 26 Feb 2025 17:23:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1740619382; x=1741224182; 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=2uMr00AMeKOQq6/G8Cq5+hM8t9kqBTSy3qx3wjRFbm8=; b=TzPe2+qh0i2N991gBSnTJXifuqnHpd7Sqi+G5b8AXh08+UlCXOp2CdOFZg80oMg7DF P3+V8GTKLFUzf9MNcXNkCTLBLhzRCMFu8xCcz1xyVodlk1Y1pZNYq7AC4K/x/u7oPDm6 3JmbvaZJhZsmcusXaEaCfmWnF3XagDkRCvM/fMWou1/dxnx624xpzMCoQlUqYBsAkaB1 OAFY+NhQw0X3ymsPZGVcAUhQe/2mPYmz5zgo4KJ25d2+r6IyFuxKq+6SiPb2H4T2OvH5 sOng6HttJV4c4k2Atd5n0joIvSBlsZNpm8/sizhjQt8MCok0zb48u0rFlXAqQYNAOSft pKJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740619382; x=1741224182; 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=2uMr00AMeKOQq6/G8Cq5+hM8t9kqBTSy3qx3wjRFbm8=; b=ZIMIueObiMAsFZ1cVpBsjqhuASKjo/0TXA56M2KecCFTyr/SFYlfsH0RQNFWl/SuQz 4SfKBPjWfaMVPozpH10wB6ykpVtS6GOUX5hSXFX05HSUsw7YoZF4oD3gInt0B9D+bjYD 9GVPrER1oMSkwdXQ6mA0jx2EsXfwgawoTRFCXNj0K15FMq1Au8x9lzgQEIzBVerZt0pl kjdHJodCviAOYu0N5tlZK/vnism9faTpnRxv17CY0++vESruOjqqkAHgLqYHP4uuxawD w1lc3YuZYTBpTqFmynb7B/5lq3hV6p87+J1R19sD0rqt1vmL4vHgxXtQV6oO2mlRxWI5 eyAA== X-Gm-Message-State: AOJu0YxHkaaEinEe4+0XfGeIYySJGbMVVTl+3ehR7F53duqjqglObuIF 78zviO9QKgGGqm1jhgpCFts3WtTxtnCiwg8l9VfPtPrwKU6HNDuO+NIW+oHAIsY= X-Gm-Gg: ASbGncuyMYsK1ieZel68cUp6jsLhQU7YigJXnYrxSmOGWwGR07W6euB3zT+r1SlX7cK PAhf0WcprgVisBCwTlU30uwppAOnwQHkqzJS2fl9UJfz5hk6OVUsG3LKvoQ6GDbqhtZV4ba/TTJ 722ZP94dIY54ErhjvcBD3Nsw9rS1U+V6A1VmNctmzj+DcvEYLVoIPRP02+gpkwgFYrVl3fKtRYQ k2Em/Y1zxBmBxAcpjb25fxTJzbG1RcHazKlNMllUjctQcLqI6chs6zS6IR7SLZq/FmBpZrO8KjH fLUh0V0B1egrEoSX9q2MkUZ1Qo5L5MnlIEBy1A== X-Google-Smtp-Source: AGHT+IGZThjyw8csEc9jaKBEB01FBs7BagGwCj/RTwFGtAQi5NzxPS4XLTcnCxkbaJJKJ5YG1bTYuA== X-Received: by 2002:a05:600c:3148:b0:43a:b0ac:b10c with SMTP id 5b1f17b1804b1-43ab9027824mr39036915e9.26.1740619381916; Wed, 26 Feb 2025 17:23:01 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 17:23:00 -0800 (PST) From: Antonio Quartulli Date: Thu, 27 Feb 2025 02:21:39 +0100 Subject: [PATCH net-next v20 14/25] ovpn: add support for MSG_NOSIGNAL in tcp_sendmsg Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250227-b4-ovpn-v20-14-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=2479; i=antonio@openvpn.net; h=from:subject:message-id; bh=TtyqMEWWXVuF5D1AonBdS9TIDufBNGXd/kgliq1Dnl4=; b=owEBbQGS/pANAwAIAQtw5TqgONWHAcsmYgBnv75gt9fLJiTmhxT0bUy5Bi6FTRSIqFhwvBG/A 2zr4Z49m6qJATMEAAEIAB0WIQSZq9xs+NQS5N5fwPwLcOU6oDjVhwUCZ7++YAAKCRALcOU6oDjV h9NQB/48oDDwO6rfMTo/wD4vJDTUBdcmTjVgmpfNVuMKMBdBbkaaKaziuenj8/OcDoCwbRuXOIm 4k3SLbk1dc1Vd+AAZL4XfRJjhwAfsyOCqbeit/q2CjTi5vUReTA15QVMm6yZEhIXlau4IHeH7dq c3IpDoT/c2OYGGAcNlN3JzUhuVq3u2W3PLuO0yFzb7ZJ49XzZQedJpqiSTIWm+KJTG1mbjizx1p fcy+MoK++2YUania4VCIgo6H216+LY6gceB1TXsqtKNIZUSuYWbJBAfTj7KN+uLzFasxwPQpXRt hbet8lVu2vx4RfMSU2oOw/4EIfmVTb9fRIkgIqvofOH1iops X-Developer-Key: i=antonio@openvpn.net; a=openpgp; fpr=CABDA1282017C267219885C748F0CCB68F59D14C X-Patchwork-Delegate: kuba@kernel.org 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 bd3cbcfc770d2c28d234fcdd081b4d02e6496ea0..64430880f1dae33a41f698d713cf151be5b38577 100644 --- a/drivers/net/ovpn/skb.h +++ b/drivers/net/ovpn/skb.h @@ -25,6 +25,7 @@ struct ovpn_cb { struct scatterlist *sg; u8 *iv; unsigned int payload_offset; + bool nosignal; }; 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 2d343bce477156a9f60ce92d18c815b7c832d2af..10cb0493290c9c4b90fb2734bcc208853d77dfd3 100644 --- a/drivers/net/ovpn/tcp.c +++ b/drivers/net/ovpn/tcp.c @@ -215,6 +215,7 @@ void ovpn_tcp_socket_wait_finish(struct ovpn_socket *sock) static void ovpn_tcp_send_sock(struct ovpn_peer *peer, struct sock *sk) { struct sk_buff *skb = peer->tcp.out_msg.skb; + int ret, flags; if (!skb) return; @@ -225,9 +226,11 @@ static void ovpn_tcp_send_sock(struct ovpn_peer *peer, struct sock *sk) peer->tcp.tx_in_progress = true; do { - int ret = skb_send_sock_locked(sk, skb, - peer->tcp.out_msg.offset, - peer->tcp.out_msg.len); + flags = ovpn_skb_cb(skb)->nosignal ? MSG_NOSIGNAL : 0; + ret = skb_send_sock_locked_with_flags(sk, skb, + peer->tcp.out_msg.offset, + peer->tcp.out_msg.len, + flags); if (unlikely(ret < 0)) { if (ret == -EAGAIN) goto out; @@ -370,7 +373,7 @@ static int ovpn_tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) rcu_read_unlock(); peer = sock->peer; - if (msg->msg_flags & ~MSG_DONTWAIT) { + if (msg->msg_flags & ~(MSG_DONTWAIT | MSG_NOSIGNAL)) { ret = -EOPNOTSUPP; goto peer_free; } @@ -403,6 +406,7 @@ static int ovpn_tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) goto peer_free; } + ovpn_skb_cb(skb)->nosignal = msg->msg_flags & MSG_NOSIGNAL; ovpn_tcp_send_sock_skb(peer, sk, skb); ret = size; peer_free: