From nobody Thu Dec 18 06:17:21 2025 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 7F84B297A63 for ; Tue, 15 Apr 2025 11:17:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744715870; cv=none; b=otv7txxHQggrt50eo+1U094/0KtxhzkA8kML0wc+hleuL9/BHs1ph5r4M689xP6QEFxxMuHa9VPRfipceqjh0nEA8YAwMZjbedyczowqcb/NwRy2wLb+DuPqf+4E1xbi5uoGUQzbzVUEHtEQcCbG0rPgDcieFLh0YqoeRB7DckQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744715870; c=relaxed/simple; bh=+Unom1yykFNqbE9773wCLW/thNu13gqRTUvNb4z4izU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CaesKp/zRX4+NCgGUdWVAX4AhML5QEQzImbdXsPR3VW8UlT8uT/cq/11XcjlN/YrzrnNJ+pmCaQ2oPXNTJ64srHXX4ThbErbkFtw1ZTl8Aj0JoPHHScg62UBLdwZKAlhvT9D0wk/pZ5XU+W+uzN681ryu3++SDkViR6/ef4VdcY= 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=Km3SQY+g; arc=none smtp.client-ip=209.85.128.50 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="Km3SQY+g" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43edecbfb94so57076815e9.1 for ; Tue, 15 Apr 2025 04:17:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1744715864; x=1745320664; 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=LTV89+C/IAgzFB5m5xPEkC+pORUgcF9jMRUpcGRiTts=; b=Km3SQY+g68dlL5WDJfC9Wox3eGYLBFS2chRqnlwomuKB2kuzSEES130Oy+FHQQ5bu+ myJtOB+U//Tcy0CjVyTfP5kBUA52GLq7PwPu+DfrHXPeNheDDXb93LSwXUAnR8uL2DPr Dmd0KmtfdB3xhE9AEwDThk2DQeD230CzX0uy+HICxT3OnDcLiV6ylXK2XZabjUNm+sjA Drk+ReGt3IE8q3cQ+sCc2wRdoCj2rEtWpoyQAUL3XkBmNNb01RfxD78YEZi7h0aV7yDm zer7EsnuVPYnAy6P+nSmtcWLfbT/7UISDrIpFatKYKMPprMnmrqKfsMVXqVVK13Q0pdu fX5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744715864; x=1745320664; 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=LTV89+C/IAgzFB5m5xPEkC+pORUgcF9jMRUpcGRiTts=; b=u+C+Qahymspq2hr22BIhbK9N9rt4MKY1lGbX4dAPVd4tMNJS5IYayHpRkrxZYL3iEr u7sgCBjikbWSdUskGF2S1gTApNm3d7M3wlviYjrK2mRaM167eVNuCzvZYMjpALdG2EUV Ztxdjl+G07Rmn94+i0XXyLxhTdbwI5XPwN7g5+xrBEqBI+xr7ls7iCZBhQj7EUSMFBsx lh4KnJa/WYRQpPtUYXd77YTEoQr8NrCPcv9xTiISYq2p48Xnfh+xu8WXmkAhJ16Y/nhE Pl/JTuwx5Fzm1qw/qCKlAGqaYpx//UJMac4oiYF4eoTstMk8kuj8J225ZF92bPGs646G I1HQ== X-Forwarded-Encrypted: i=1; AJvYcCUuqm6k2O+VEwifMkni5823VwEZEc9hcplWh4Jl12lPglryMe0faP0/r/osSp5LH7AUt/zSeTu+Y+pIRW8=@vger.kernel.org X-Gm-Message-State: AOJu0YxztRHvR6zqFNKZnSS8BMEIkaX8bud+cU5nfnxVvG2uZ5AHheDg rby4cYA02jPIgk1Vu8hqyWxe7NQxmLN1IIJfzXUGLRMLOQ1GR9xghVptRfhDtkpYT965MsqCQ2x B+YkSk+hcYCkN1mKNLjlVwWD70zhgmB6MNzmkOhd4IfqlhAq04SaB6zU= X-Gm-Gg: ASbGncsJYenBIxdRTUZnCgHZC4OhTi3iRBrD9RweFMbN9jTE+esYBZ7YeEiKoMIELP0 4HAz7+E0JkcFL82G5HWuy11BUmADF9zLvJdCXhOhrgAyqmfeD82tUUZ9y6MA/B3wAPbwJjzMAN/ IN5xE6sPiaUtZOao32OQjZFQLsEJne8O8WoIuAH8mpfb0eAlZgVzWpWskA+PjYHcmAv6OfFXgM0 lSWdq092LJFDv8cNozMC/17ljg0ba6bXYPrryRenbUXkaV0pidkvvJkPG7j0eTLjqzWO/8+BAku Hb7yAaRD+leXrt1SBEsmxUjwemQNcfX6QJmGwQ== X-Google-Smtp-Source: AGHT+IFMQlof59fOSg2M7Eq+m/RtbhU+97yysT9+PCWJfN8QfdC4S+dr1wKcgeULLpXXtIHsL2RW3A== X-Received: by 2002:a05:600c:4fc1:b0:43d:47b7:b32d with SMTP id 5b1f17b1804b1-43f3a9afc1emr114850195e9.25.1744715864556; Tue, 15 Apr 2025 04:17:44 -0700 (PDT) Received: from [127.0.0.1] ([2001:67c:2fbc:1:83ac:73b4:720f:dc99]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2066d26bsm210836255e9.22.2025.04.15.04.17.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 04:17:44 -0700 (PDT) From: Antonio Quartulli Date: Tue, 15 Apr 2025 13:17:30 +0200 Subject: [PATCH net-next v26 13/23] 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: <20250415-b4-ovpn-v26-13-577f6097b964@openvpn.net> References: <20250415-b4-ovpn-v26-0-577f6097b964@openvpn.net> In-Reply-To: <20250415-b4-ovpn-v26-0-577f6097b964@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=+Unom1yykFNqbE9773wCLW/thNu13gqRTUvNb4z4izU=; b=owEBbQGS/pANAwAIAQtw5TqgONWHAcsmYgBn/kBC5GCVEXr1yIn8QuqochbJhgC073YBScniF aNqKp9N6/qJATMEAAEIAB0WIQSZq9xs+NQS5N5fwPwLcOU6oDjVhwUCZ/5AQgAKCRALcOU6oDjV h0skCACVDtxscS+U1pTczUQRXmdOPUnVYdiNZu9j/IbBs6wPQNrsNWG68KmhumIbaHSuJ3KhE2j o0r8LcyNbe/eAQcsnJcmiWxD6lXq0Nj3Ksh8fvo3jtAlN78gdkCCJkacixK0AbAAZL8j7/FySOk snWdSK2+2gc746sqw1LA+7x+BWFTaxf3GV31em7bTGo+WIFQ4Dy2YDolNlN9kLghzUXj84iXJOY K30JWMryR49joNOZLiOQQ5GjqfkF1MxiqTAdtixCs5qi9LL8njRQx54g0tJCT/UzezZccB5WxcU zUaehnb687l5liknaruBdGyY3ooLvo4a5e9VmfDKkm+wkrgx 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 bd3cbcfc770d2c28d234fcdd081b4d02e6496ea0..64430880f1dae33a41f698d713c= f151be5b38577 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; }; =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 588ff6b0440103f6620837a75ea2f1029d91b8a3..7c42d84987ad362289dbf5e7992= 403c76e910ed9 100644 --- a/drivers/net/ovpn/tcp.c +++ b/drivers/net/ovpn/tcp.c @@ -220,6 +220,7 @@ void ovpn_tcp_socket_wait_finish(struct ovpn_socket *so= ck) static void ovpn_tcp_send_sock(struct ovpn_peer *peer, struct sock *sk) { struct sk_buff *skb =3D peer->tcp.out_msg.skb; + int ret, flags; =20 if (!skb) return; @@ -230,9 +231,11 @@ static void ovpn_tcp_send_sock(struct ovpn_peer *peer,= struct sock *sk) peer->tcp.tx_in_progress =3D true; =20 do { - int ret =3D skb_send_sock_locked(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(sk, skb, + peer->tcp.out_msg.offset, + peer->tcp.out_msg.len, + flags); if (unlikely(ret < 0)) { if (ret =3D=3D -EAGAIN) goto out; @@ -380,7 +383,7 @@ static int ovpn_tcp_sendmsg(struct sock *sk, struct msg= hdr *msg, size_t size) rcu_read_unlock(); peer =3D sock->peer; =20 - if (msg->msg_flags & ~MSG_DONTWAIT) { + if (msg->msg_flags & ~(MSG_DONTWAIT | MSG_NOSIGNAL)) { ret =3D -EOPNOTSUPP; goto peer_free; } @@ -413,6 +416,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(peer, sk, skb); ret =3D size; peer_free: --=20 2.49.0