Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754725AbZKELWC (ORCPT ); Thu, 5 Nov 2009 06:22:02 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753936AbZKELWB (ORCPT ); Thu, 5 Nov 2009 06:22:01 -0500 Received: from gw1.cosmosbay.com ([212.99.114.194]:57146 "EHLO gw1.cosmosbay.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753456AbZKELWA (ORCPT ); Thu, 5 Nov 2009 06:22:00 -0500 Message-ID: <4AF2B551.6010302@gmail.com> Date: Thu, 05 Nov 2009 12:21:53 +0100 From: Eric Dumazet User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) MIME-Version: 1.0 To: Max Kellermann CC: linux-kernel@vger.kernel.org, jens.axboe@oracle.com, Linux Netdev List Subject: Re: [PATCH] tcp: set SPLICE_F_NONBLOCK after first buffer has been spliced References: <20091105095947.32131.99768.stgit@rabbit.intern.cm-ag> <4AF2A929.3000201@gmail.com> <20091105105749.GA4901@rabbit.intern.cm-ag> In-Reply-To: <20091105105749.GA4901@rabbit.intern.cm-ag> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-1.6 (gw1.cosmosbay.com [0.0.0.0]); Thu, 05 Nov 2009 12:21:54 +0100 (CET) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3393 Lines: 83 Max Kellermann a ?crit : > On 2009/11/05 11:30, Eric Dumazet wrote: >> I dont think this patch is correct. Could you describe your use case ? > > See my second email, there's a demo source. > >> If you dont want to block on output pipe, you should set this NONBLOCK >> flag before calling splice(SPLICE_F_NONBLOCK) syscall. >> >> ie : Use the socket in blocking mode, but output pipe in non-blocking mode. > > Do you think that a splice() should block if the socket is readable > and the pipe is writable according to select()? > Yes, this is perfectly legal select() can return "OK to write on fd", and still, write(fd, buffer, 10000000) is supposer/allowed to block if fd is not O_NDELAY If you want to not block on fd, use O_NDELAY (if using write() syscall), or SPLICE_F_NONBLOCK splice() flag ? Please read recent commit on this area and why I think your patch conflicts with this commit. commit 42324c62704365d6a3e89138dea55909d2f26afe Author: Eric Dumazet Date: Thu Oct 1 15:26:00 2009 -0700 net: splice() from tcp to pipe should take into account O_NONBLOCK tcp_splice_read() doesnt take into account socket's O_NONBLOCK flag Before this patch : splice(socket,0,pipe,0,128*1024,SPLICE_F_MOVE); causes a random endless block (if pipe is full) and splice(socket,0,pipe,0,128*1024,SPLICE_F_MOVE | SPLICE_F_NONBLOCK); will return 0 immediately if the TCP buffer is empty. User application has no way to instruct splice() that socket should be in blocking mode but pipe in nonblock more. Many projects cannot use splice(tcp -> pipe) because of this flaw. http://git.samba.org/?p=samba.git;a=history;f=source3/lib/recvfile.c;h=ea0159642137390a0f7e57a123684e6e63e47581;hb=HEAD http://lkml.indiana.edu/hypermail/linux/kernel/0807.2/0687.html Linus introduced SPLICE_F_NONBLOCK in commit 29e350944fdc2dfca102500790d8ad6d6ff4f69d (splice: add SPLICE_F_NONBLOCK flag ) It doesn't make the splice itself necessarily nonblocking (because the actual file descriptors that are spliced from/to may block unless they have the O_NONBLOCK flag set), but it makes the splice pipe operations nonblocking. Linus intention was clear : let SPLICE_F_NONBLOCK control the splice pipe mode only This patch instruct tcp_splice_read() to use the underlying file O_NONBLOCK flag, as other socket operations do. Users will then call : splice(socket,0,pipe,0,128*1024,SPLICE_F_MOVE | SPLICE_F_NONBLOCK ); to block on data coming from socket (if file is in blocking mode), and not block on pipe output (to avoid deadlock) First version of this patch was submitted by Octavian Purdila Reported-by: Volker Lendecke Reported-by: Jason Gunthorpe Signed-off-by: Eric Dumazet Signed-off-by: Octavian Purdila Acked-by: Linus Torvalds Acked-by: Jens Axboe Signed-off-by: David S. Miller -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/