From patchwork Tue Feb 14 17:13:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 57143 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3100981wrn; Tue, 14 Feb 2023 09:18:19 -0800 (PST) X-Google-Smtp-Source: AK7set8cJXggvAoEZTSgHGAFq67nLEt5RYzEEsa4+K2ul/PZo7Zo8M3+yHjDQbTOeUH6mQUaJnlj X-Received: by 2002:a62:1647:0:b0:5a8:b4a5:bf98 with SMTP id 68-20020a621647000000b005a8b4a5bf98mr2751948pfw.3.1676395099622; Tue, 14 Feb 2023 09:18:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676395099; cv=none; d=google.com; s=arc-20160816; b=yDZSeRhU9n5/zLs84u9IWg1a8EWFAc5UDb2y8Bc/HDk5vRpu29mrGsagcVnvfeNq/P trAVfoqNbOOAFa+xBSbYDoUogCyR3BVgLlYx1yO4C5mB/f6VVx4zfFfTQTBqz14LGqIN HGMmIJPN9q+Cksx2VoXDh4fMn/w6Ss/nITUXDLh0DSOelS2+16Nhup4JT7vhFVt8iUn6 M75KWlMVOZokva6hkWsEsH4+EIY42Jv0jaDSDe+d62jiLDUfmwzUtdd5tAS9wO/MKUdg 5y1SyV5r6n6eMzh6+VD9wY8KFges8SEXmGscGpYAXng1HSYm3/pTwNlmUIutcFydEz45 g8NA== 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=J4i4bwQTS34x6oFo2ZgYGZTE2NYetAQq5iydlM1fsxY=; b=XJWWWHPM6ddxahYQd6cZ0R3r2Hzo2pXk7lrvM4/ibBXm82Yg/JCagne6CFa4lopo2f Kqo3xOroRHIYFmAsNVMhBHFD9czTUSyIykbtFycBY3/oM4bCHpYDJE6aCC0aq35LozHV t8clg9MbWO+ZveOV21YIngoI9p5JgIvsGM0rW5gKcknu/F5yCR0GkiMa24CuNhPXU82v H/Jh1IItRgC47XiMNlbink/eTiKoybdbHGbgTHK0+yQiJAO/WVawiOl2q51s7RgqMbIn 4DE9SO6w7rV01dpIL/uMxWiLtmj7QtvuzCBt0lLcffdc2WzF7f+lHiY8FI4/Bvz1gm9O AuPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Zvz8HpPR; 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 77-20020a621950000000b005a8b2a0385bsi7487055pfz.241.2023.02.14.09.18.07; Tue, 14 Feb 2023 09:18:19 -0800 (PST) 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=Zvz8HpPR; 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 S232838AbjBNRP3 (ORCPT + 99 others); Tue, 14 Feb 2023 12:15:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233010AbjBNRPF (ORCPT ); Tue, 14 Feb 2023 12:15:05 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74A102194E for ; Tue, 14 Feb 2023 09:14:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676394853; 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=J4i4bwQTS34x6oFo2ZgYGZTE2NYetAQq5iydlM1fsxY=; b=Zvz8HpPRRRLMRsGpzm1QXdbqqPBrWifV8wfrwlRSUrrbKcVqOU2ZxpESf/dGN9nBTPysLz jUpFUVpvVKUnvuTxuhvZrubv08v9sIzOzkqKtEKN7ZUAC8R/g3qOT3VIo5RWnw3FJEk0dR nMUnRLNv1oyVcbSZadc0IPFFnxVVCT8= 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-52-ZogOeZ8jO0-C97KX6CrYIA-1; Tue, 14 Feb 2023 12:14:10 -0500 X-MC-Unique: ZogOeZ8jO0-C97KX6CrYIA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4219F100F907; Tue, 14 Feb 2023 17:14:08 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4767E1415108; Tue, 14 Feb 2023 17:14:06 +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 , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , John Hubbard Subject: [PATCH v14 08/17] splice: Do splice read from a file without using ITER_PIPE Date: Tue, 14 Feb 2023 17:13:21 +0000 Message-Id: <20230214171330.2722188-9-dhowells@redhat.com> In-Reply-To: <20230214171330.2722188-1-dhowells@redhat.com> References: <20230214171330.2722188-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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=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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757827667577579068?= X-GMAIL-MSGID: =?utf-8?q?1757827667577579068?= 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 cc: Jens Axboe cc: Christoph Hellwig cc: Al Viro cc: David Hildenbrand cc: John Hubbard cc: linux-mm@kvack.org cc: linux-block@vger.kernel.org cc: linux-fsdevel@vger.kernel.org --- Notes: ver #14) - Split out filemap_splice_read() into a separate patch. fs/splice.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index 4c6332854b63..a93478338cec 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -391,29 +391,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);