Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp962489rwd; Wed, 7 Jun 2023 09:06:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4e8uyeTDHWms4zMMyir6tInjL5FB4+ArRwyUP5vQagJalVG7JEgGVgs5Wcwv2Wyviw0STo X-Received: by 2002:a17:902:f681:b0:1b0:577c:2cb with SMTP id l1-20020a170902f68100b001b0577c02cbmr6375692plg.25.1686153978607; Wed, 07 Jun 2023 09:06:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686153978; cv=none; d=google.com; s=arc-20160816; b=ih0gQieHRsPN+2lApZAPcJnoeNOVaK6ApiOpZrLqq+APulNrmBK1Teqhkg8vKchz2K JrzbGf0enMo2fT1wWH2u9SXlX1MUYxHo2RxEUug7JXjUAHq2CXramedrH+btqGsJqMe0 cTW3JD9L1jpI4dn1Q9niuJSiEVae8cG3CdSzIJEV86RQYFvbg6hpM7cQ5dtKBj5WV/nb m+17sfD6Cyme+tSUFk3+P86sRHJmd3ZIowZ23v4oDrz1HnL7n0Jgg0xfk47kGQvb2Tik bhKdYy96xtGVZZxmNA94IkG4+lpEWVyM2fvcq7CietYLWoz432v0SMwP9uNRbXulcbEp c/iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fL8f8bGODHCk7pTKMzJNUhB9S2RodL1nYsU41cch9H8=; b=xPB2prXO20yOkwcGtmHQT43yRDLYTWeu43mvby2Tq2YvALvqWOBT5tlLaR8pPnVf03 7w9OxKl18X66E2Z3KKeSHoQYl90RPGw9qiVYKpD4/UQxomfQB6XTw00S8q0jkKGMtwNj iqYOxEHEcL6CWS5yPwXgW8XjYlhg6QdZWKpruuHpcs7YNgXgEACfAiassh0uYd1gpRJ6 /ZXu9v/CLau43eZEOg1coCG6pbTgUT9w3/0AJrHLuzE8/YxL8aU2v/wt2tD8oWASwTme BuHp4KbsFgUQqsaHr7P8+IVDbqwvl4lIBbbNDD62ESAdaDBGZcSN0tyYycyzJahK7enO S9yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=OTnLzO30; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d9-20020a170902cec900b001ae3214162dsi9388117plg.548.2023.06.07.09.06.03; Wed, 07 Jun 2023 09:06:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=OTnLzO30; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240396AbjFGPy5 (ORCPT + 99 others); Wed, 7 Jun 2023 11:54:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241530AbjFGPys (ORCPT ); Wed, 7 Jun 2023 11:54:48 -0400 Received: from smtp-fw-33001.amazon.com (smtp-fw-33001.amazon.com [207.171.190.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4FFD1988; Wed, 7 Jun 2023 08:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1686153287; x=1717689287; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fL8f8bGODHCk7pTKMzJNUhB9S2RodL1nYsU41cch9H8=; b=OTnLzO308DzEtm4E9o5Ig7+YW7ktdhOexocZQ+aFJRwQbmjA/7yeCo0t UWhfit5R9dD/gO99caXg1U6KaHOJhXNMdh84UdKy9LTJTqt+Skirkgs9W ZOhR6zwuH5CPv09rN7I+olmzeuCkTRilfxUeXDvawYKJMUoviRkuVK3uF c=; X-IronPort-AV: E=Sophos;i="6.00,224,1681171200"; d="scan'208";a="290156457" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-pdx-2c-m6i4x-fa5fe5fb.us-west-2.amazon.com) ([10.43.8.6]) by smtp-border-fw-33001.sea14.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jun 2023 15:54:38 +0000 Received: from EX19MTAUWA002.ant.amazon.com (pdx1-ws-svc-p6-lb9-vlan2.pdx.amazon.com [10.236.137.194]) by email-inbound-relay-pdx-2c-m6i4x-fa5fe5fb.us-west-2.amazon.com (Postfix) with ESMTPS id 71C3E40D3E; Wed, 7 Jun 2023 15:54:33 +0000 (UTC) Received: from EX19D004ANA001.ant.amazon.com (10.37.240.138) by EX19MTAUWA002.ant.amazon.com (10.250.64.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 7 Jun 2023 15:54:32 +0000 Received: from 88665a182662.ant.amazon.com (10.119.185.127) by EX19D004ANA001.ant.amazon.com (10.37.240.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 7 Jun 2023 15:54:28 +0000 From: Kuniyuki Iwashima To: CC: , , , , , , , , , , , , , , , Subject: Re: [PATCH net-next v5 07/14] ipv4, ipv6: Use splice_eof() to flush Date: Wed, 7 Jun 2023 08:54:20 -0700 Message-ID: <20230607155420.11462-1-kuniyu@amazon.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <2269950.1686152632@warthog.procyon.org.uk> References: <2269950.1686152632@warthog.procyon.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.119.185.127] X-ClientProxiedBy: EX19D032UWA001.ant.amazon.com (10.13.139.62) To EX19D004ANA001.ant.amazon.com (10.37.240.138) X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE,T_SPF_PERMERROR autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Howells Date: Wed, 07 Jun 2023 16:43:52 +0100 > Kuniyuki Iwashima wrote: > > > > + /* IPV6_ADDRFORM can change sk->sk_prot under us. */ > > > + prot = READ_ONCE(sk->sk_prot); > > > + if (prot->splice_eof) > > > + sk->sk_prot->splice_eof(sock); > > > > We need to use prot here. > > Yeah. > > > > + if (up->pending == AF_INET) > > > + udp_splice_eof(sock); > > > > Do we need this ? > > Actually, no. udp_v6_push_pending_frames() will do this. > > > > + lock_sock(sk); > > > + if (up->pending && !READ_ONCE(up->corkflag)) > > > + udp_push_pending_frames(sk); > > > > We should use udp_v6_push_pending_frames(sk) as up->pending > > could be AF_INET even after the test above. > > Yeah. > > Updated version attached for your perusal (I will post a v6 too). > > David > --- > commit 8b95b9cd654835eb2ff1ad24cd6de802836c4062 > Author: David Howells > Date: Wed Jun 7 14:44:34 2023 +0100 > > ipv4, ipv6: Use splice_eof() to flush > > Allow splice to undo the effects of MSG_MORE after prematurely ending a > splice/sendfile due to getting an EOF condition (->splice_read() returned > 0) after splice had called sendmsg() with MSG_MORE set when the user didn't > set MSG_MORE. > > For UDP, a pending packet will not be emitted if the socket is closed > before it is flushed; with this change, it be flushed by ->splice_eof(). > > For TCP, it's not clear that MSG_MORE is actually effective. > > Suggested-by: Linus Torvalds > Link: https://lore.kernel.org/r/CAHk-=wh=V579PDYvkpnTobCLGczbgxpMgGmmhqiTyE34Cpi5Gg@mail.gmail.com/ > Signed-off-by: David Howells > cc: Kuniyuki Iwashima > cc: Eric Dumazet > cc: Willem de Bruijn > cc: David Ahern > cc: "David S. Miller" > cc: Jakub Kicinski > cc: Paolo Abeni > cc: Jens Axboe > cc: Matthew Wilcox > cc: netdev@vger.kernel.org > > Notes: > ver #6) > - In inet_splice_eof(), use prot after deref of sk->sk_prot. > - In udpv6_splice_eof(), use udp_v6_push_pending_frames(). You missed this change ;) > - In udpv6_splice_eof(), don't check for AF_INET. > > diff --git a/include/net/inet_common.h b/include/net/inet_common.h > index 77f4b0ef5b92..a75333342c4e 100644 > --- a/include/net/inet_common.h > +++ b/include/net/inet_common.h > @@ -35,6 +35,7 @@ void __inet_accept(struct socket *sock, struct socket *newsock, > struct sock *newsk); > int inet_send_prepare(struct sock *sk); > int inet_sendmsg(struct socket *sock, struct msghdr *msg, size_t size); > +void inet_splice_eof(struct socket *sock); > ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset, > size_t size, int flags); > int inet_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, > diff --git a/include/net/tcp.h b/include/net/tcp.h > index 68990a8f556a..49611af31bb7 100644 > --- a/include/net/tcp.h > +++ b/include/net/tcp.h > @@ -327,6 +327,7 @@ int tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size); > int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size); > int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, int *copied, > size_t size, struct ubuf_info *uarg); > +void tcp_splice_eof(struct socket *sock); > int tcp_sendpage(struct sock *sk, struct page *page, int offset, size_t size, > int flags); > int tcp_sendpage_locked(struct sock *sk, struct page *page, int offset, > diff --git a/include/net/udp.h b/include/net/udp.h > index 5cad44318d71..4ed0b47c5582 100644 > --- a/include/net/udp.h > +++ b/include/net/udp.h > @@ -278,6 +278,7 @@ int udp_get_port(struct sock *sk, unsigned short snum, > int udp_err(struct sk_buff *, u32); > int udp_abort(struct sock *sk, int err); > int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len); > +void udp_splice_eof(struct socket *sock); > int udp_push_pending_frames(struct sock *sk); > void udp_flush_pending_frames(struct sock *sk); > int udp_cmsg_send(struct sock *sk, struct msghdr *msg, u16 *gso_size); > diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c > index b5735b3551cf..fd233c4195ac 100644 > --- a/net/ipv4/af_inet.c > +++ b/net/ipv4/af_inet.c > @@ -831,6 +831,21 @@ int inet_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) > } > EXPORT_SYMBOL(inet_sendmsg); > > +void inet_splice_eof(struct socket *sock) > +{ > + const struct proto *prot; > + struct sock *sk = sock->sk; > + > + if (unlikely(inet_send_prepare(sk))) > + return; > + > + /* IPV6_ADDRFORM can change sk->sk_prot under us. */ > + prot = READ_ONCE(sk->sk_prot); > + if (prot->splice_eof) > + prot->splice_eof(sock); > +} > +EXPORT_SYMBOL_GPL(inet_splice_eof); > + > ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset, > size_t size, int flags) > { > @@ -1050,6 +1065,7 @@ const struct proto_ops inet_stream_ops = { > #ifdef CONFIG_MMU > .mmap = tcp_mmap, > #endif > + .splice_eof = inet_splice_eof, > .sendpage = inet_sendpage, > .splice_read = tcp_splice_read, > .read_sock = tcp_read_sock, > @@ -1084,6 +1100,7 @@ const struct proto_ops inet_dgram_ops = { > .read_skb = udp_read_skb, > .recvmsg = inet_recvmsg, > .mmap = sock_no_mmap, > + .splice_eof = inet_splice_eof, > .sendpage = inet_sendpage, > .set_peek_off = sk_set_peek_off, > #ifdef CONFIG_COMPAT > @@ -1115,6 +1132,7 @@ static const struct proto_ops inet_sockraw_ops = { > .sendmsg = inet_sendmsg, > .recvmsg = inet_recvmsg, > .mmap = sock_no_mmap, > + .splice_eof = inet_splice_eof, > .sendpage = inet_sendpage, > #ifdef CONFIG_COMPAT > .compat_ioctl = inet_compat_ioctl, > diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c > index 53b7751b68e1..09f03221a6f1 100644 > --- a/net/ipv4/tcp.c > +++ b/net/ipv4/tcp.c > @@ -1371,6 +1371,22 @@ int tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) > } > EXPORT_SYMBOL(tcp_sendmsg); > > +void tcp_splice_eof(struct socket *sock) > +{ > + struct sock *sk = sock->sk; > + struct tcp_sock *tp = tcp_sk(sk); > + int mss_now, size_goal; > + > + if (!tcp_write_queue_tail(sk)) > + return; > + > + lock_sock(sk); > + mss_now = tcp_send_mss(sk, &size_goal, 0); > + tcp_push(sk, 0, mss_now, tp->nonagle, size_goal); > + release_sock(sk); > +} > +EXPORT_SYMBOL_GPL(tcp_splice_eof); > + > /* > * Handle reading urgent data. BSD has very simple semantics for > * this, no blocking and very strange errors 8) > diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c > index 53e9ce2f05bb..84a5d557dc1a 100644 > --- a/net/ipv4/tcp_ipv4.c > +++ b/net/ipv4/tcp_ipv4.c > @@ -3116,6 +3116,7 @@ struct proto tcp_prot = { > .keepalive = tcp_set_keepalive, > .recvmsg = tcp_recvmsg, > .sendmsg = tcp_sendmsg, > + .splice_eof = tcp_splice_eof, > .sendpage = tcp_sendpage, > .backlog_rcv = tcp_v4_do_rcv, > .release_cb = tcp_release_cb, > diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c > index fd3dae081f3a..df5e407286d7 100644 > --- a/net/ipv4/udp.c > +++ b/net/ipv4/udp.c > @@ -1324,6 +1324,21 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) > } > EXPORT_SYMBOL(udp_sendmsg); > > +void udp_splice_eof(struct socket *sock) > +{ > + struct sock *sk = sock->sk; > + struct udp_sock *up = udp_sk(sk); > + > + if (!up->pending || READ_ONCE(up->corkflag)) > + return; > + > + lock_sock(sk); > + if (up->pending && !READ_ONCE(up->corkflag)) > + udp_push_pending_frames(sk); > + release_sock(sk); > +} > +EXPORT_SYMBOL_GPL(udp_splice_eof); > + > int udp_sendpage(struct sock *sk, struct page *page, int offset, > size_t size, int flags) > { > @@ -2918,6 +2933,7 @@ struct proto udp_prot = { > .getsockopt = udp_getsockopt, > .sendmsg = udp_sendmsg, > .recvmsg = udp_recvmsg, > + .splice_eof = udp_splice_eof, > .sendpage = udp_sendpage, > .release_cb = ip4_datagram_release_cb, > .hash = udp_lib_hash, > diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c > index 2bbf13216a3d..564942bee067 100644 > --- a/net/ipv6/af_inet6.c > +++ b/net/ipv6/af_inet6.c > @@ -695,6 +695,7 @@ const struct proto_ops inet6_stream_ops = { > #ifdef CONFIG_MMU > .mmap = tcp_mmap, > #endif > + .splice_eof = inet_splice_eof, > .sendpage = inet_sendpage, > .sendmsg_locked = tcp_sendmsg_locked, > .sendpage_locked = tcp_sendpage_locked, > diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c > index d657713d1c71..c17c8ff94b79 100644 > --- a/net/ipv6/tcp_ipv6.c > +++ b/net/ipv6/tcp_ipv6.c > @@ -2150,6 +2150,7 @@ struct proto tcpv6_prot = { > .keepalive = tcp_set_keepalive, > .recvmsg = tcp_recvmsg, > .sendmsg = tcp_sendmsg, > + .splice_eof = tcp_splice_eof, > .sendpage = tcp_sendpage, > .backlog_rcv = tcp_v6_do_rcv, > .release_cb = tcp_release_cb, > diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c > index e5a337e6b970..3a592dc129e9 100644 > --- a/net/ipv6/udp.c > +++ b/net/ipv6/udp.c > @@ -1653,6 +1653,20 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) > } > EXPORT_SYMBOL(udpv6_sendmsg); > > +static void udpv6_splice_eof(struct socket *sock) > +{ > + struct sock *sk = sock->sk; > + struct udp_sock *up = udp_sk(sk); > + > + if (!up->pending || READ_ONCE(up->corkflag)) > + return; > + > + lock_sock(sk); > + if (up->pending && !READ_ONCE(up->corkflag)) > + udp_push_pending_frames(sk); > + release_sock(sk); > +} > + > void udpv6_destroy_sock(struct sock *sk) > { > struct udp_sock *up = udp_sk(sk); > @@ -1764,6 +1778,7 @@ struct proto udpv6_prot = { > .getsockopt = udpv6_getsockopt, > .sendmsg = udpv6_sendmsg, > .recvmsg = udpv6_recvmsg, > + .splice_eof = udpv6_splice_eof, > .release_cb = ip6_datagram_release_cb, > .hash = udp_lib_hash, > .unhash = udp_lib_unhash,