From patchwork Tue Mar 14 22:07:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 69854 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2008728wrd; Tue, 14 Mar 2023 15:11:29 -0700 (PDT) X-Google-Smtp-Source: AK7set+pfTYZ8I3R6Hy96D2mSi+L1K6S6IN5TL9lX3PFLWtw+vIQOj7VeMRV7zrq69OUw8BbopP+ X-Received: by 2002:a05:6a20:6690:b0:d4:47e0:368e with SMTP id o16-20020a056a20669000b000d447e0368emr6928740pzh.53.1678831889217; Tue, 14 Mar 2023 15:11:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678831889; cv=none; d=google.com; s=arc-20160816; b=wQw/aPlh4xpT66oeE1VYt9DSW0NRK/MT0JLoQ66BAcxoDc/hsDPO4lPCj57ofV2Vay iRYGlm8hdhH/XXDyF7mPscdRqai+MEyoBePJP+Od2j2X+U626TQIN2qjzgqOASU7ho/9 OPJhS3OwrUSc2Ptr/y8iymQlE18TP2Aj/SyEb/pNdJfXKxJB+rbQ3TOxJTB1pCuF3+fR MXHFSFSBIuGUwW1A9eN7NQg5clqbK+EcXQNam0oBXbUh5IRmcTkyFDEOucrAC6fbRi3v 0DmJupmLul0vR+L/VABM2gueSYLFhxofQxjCUJhFM3RIsT97/gF0LF3MCuXuVWHoQzqF XIbw== 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=tPHDzTeiqkehQq1hzvPvPGknkMXTxgyXWdFbtANbawg=; b=dtcbpv97jMVUFWUt6YIh+0K2y+4qPgV+ZKOQ81RDyq0dbNR1ArjP4l7dIZ/ETHKUJq wwzsjqEUXzl0TWDb8fFJ/aHjsRe67z5tCY5Dxb9xgzxKCZ4QtcxQFOWuT4w9RtKFSqKo h/eGaC3SB+Oqd1r1Y2JX9gF3pi6kP7SYAiNHWkcPdC0n0GiKbuyCAmDtEzfHCHRl6x0q K8rOcKnS65Sl5C2ZBfML/5rxs2T+7mTj2yGLc1P5cHUpn0SvmE/gA9nnx+RSbJyQkRCk BXvjS2m56V2TNllrG5PB3CsAlNOUhMhrd6O8hQpcA+/I4kXgOhwSPyapTXZF/gygvyAU TgGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=IplD54JX; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w10-20020a63490a000000b004cb94362cb8si3106649pga.195.2023.03.14.15.11.13; Tue, 14 Mar 2023 15:11:29 -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=@redhat.com header.s=mimecast20190719 header.b=IplD54JX; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230111AbjCNWKJ (ORCPT + 99 others); Tue, 14 Mar 2023 18:10:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229977AbjCNWJd (ORCPT ); Tue, 14 Mar 2023 18:09:33 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C66A20556 for ; Tue, 14 Mar 2023 15:08:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678831715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tPHDzTeiqkehQq1hzvPvPGknkMXTxgyXWdFbtANbawg=; b=IplD54JX0fSwRR9ceHO+iIudepFxxMBxazKVNEijM5BXflvFLtoQdvjs4lVZGRqmWCYfVt /99bKn7kr68e2JUC7B2ORXmUAJnAsm30evx+cuhpXLZ4OaAbAfMtDztHh0N6cYMdeSjtdf lzpajRS891MKs1GMsCeCJBUWfm93ZrE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-607-yinWqeU4PtWbq9L6irR4zQ-1; Tue, 14 Mar 2023 18:08:29 -0400 X-MC-Unique: yinWqeU4PtWbq9L6irR4zQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6700D85A5A3; Tue, 14 Mar 2023 22:08:28 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B9EAC164E7; Tue, 14 Mar 2023 22:08:26 +0000 (UTC) From: David Howells To: Jens Axboe , Al Viro , Christoph Hellwig Cc: David Howells , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , Christian Brauner , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , Steve French , John Hubbard , linux-cifs@vger.kernel.org Subject: [PATCH v18 07/15] splice: Do splice read from a file without using ITER_PIPE Date: Tue, 14 Mar 2023 22:07:49 +0000 Message-Id: <20230314220757.3827941-8-dhowells@redhat.com> In-Reply-To: <20230314220757.3827941-1-dhowells@redhat.com> References: <20230314220757.3827941-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760382826814820501?= X-GMAIL-MSGID: =?utf-8?q?1760382826814820501?= Make generic_file_splice_read() use filemap_splice_read() and direct_splice_read() rather than using an ITER_PIPE and call_read_iter(). With this, ITER_PIPE is no longer used. Signed-off-by: David Howells Reviewed-by: Christoph Hellwig cc: Jens Axboe cc: Steve French cc: Al Viro cc: David Hildenbrand cc: John Hubbard cc: linux-mm@kvack.org cc: linux-block@vger.kernel.org cc: linux-cifs@vger.kernel.org cc: linux-fsdevel@vger.kernel.org --- Notes: ver #18) - Split out the change to cifs to make it use generic_file_splice_read(). - Split out the unexport of filemap_splice_read() (still needed by cifs). fs/splice.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index 90ccd3666dca..f46dd1fb367b 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -387,29 +387,13 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags) { - struct iov_iter to; - struct kiocb kiocb; - int ret; - - iov_iter_pipe(&to, ITER_DEST, pipe, len); - init_sync_kiocb(&kiocb, in); - kiocb.ki_pos = *ppos; - ret = call_read_iter(in, &kiocb, &to); - if (ret > 0) { - *ppos = kiocb.ki_pos; - file_accessed(in); - } else if (ret < 0) { - /* free what was emitted */ - pipe_discard_from(pipe, to.start_head); - /* - * callers of ->splice_read() expect -EAGAIN on - * "can't put anything in there", rather than -EFAULT. - */ - if (ret == -EFAULT) - ret = -EAGAIN; - } - - return ret; + if (unlikely(*ppos >= file_inode(in)->i_sb->s_maxbytes)) + return 0; + if (unlikely(!len)) + return 0; + if (in->f_flags & O_DIRECT) + return direct_splice_read(in, ppos, pipe, len, flags); + return filemap_splice_read(in, ppos, pipe, len, flags); } EXPORT_SYMBOL(generic_file_splice_read);