From patchwork Mon Feb 13 13:46:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 56305 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2375586wrn; Mon, 13 Feb 2023 06:29:10 -0800 (PST) X-Google-Smtp-Source: AK7set8TR/MqWv8sg/zr7zO/EEDjhiJN1Oav6VL/zHZnNlZ0y5tUDhpi2+58Jlt10VxsFsrv3xav X-Received: by 2002:a50:d7da:0:b0:4ac:bd73:3b0e with SMTP id m26-20020a50d7da000000b004acbd733b0emr6594370edj.32.1676298549996; Mon, 13 Feb 2023 06:29:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676298549; cv=none; d=google.com; s=arc-20160816; b=HsuiO8phm5xN74rdNxt2dn1ERDIfz0PV/HhrzM4fBvl/29WQPebpgOKECY+Sc+2wmG iOhfl/TfD8tf3lyUjhIj8D00F+DgLLjPYlbu04sVzojlV3TTfkzcPiMdNt6F9g+s61ed tczJCPdI+mFxAc3WSgpyj6qTgugViXazCcHm5NSbaqzDl8YvmSHZSe1UN2GsE1Ml2JRf ugOz0xJfmZchQsP4OkLVaojCsxo101eqeJzFn9PDQgxck5qxEDmfR9soPi1pmchPoPxT DScD1/6yRqmyhCyRn40Oq/wiSvG4pjqccYAJ2Sl1TH5t2z4ynvI/+xCluIuSpJaSo6Ds 2E9Q== 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=4Gd+AM0ivl8H3lv5f0bcfNcViU9oHee8wwcgLJRIkXo=; b=bujaGRW7xTLEEan9xX7pVzZ05ffL2nw8CS5p92sioVw1tFU4khD/EEk8tIzGeUfu4t VfrrUyCDbZL4lEuAMvA0iqydBaTDyXcvVvblQ5y0ZvSvlSE3CwPxIHyZkrneCJk56bks dY9pPD+cJzweLPwYW36/TSJ8Ytj5sM1X+L9rR+eOq70YFWPOPydtQA+s033qKe0lLBhw SQc57xplcioPifAjHx0wgreb5DXMKTpMsNyec+VrUT/TlnAWX11M/KrO/mK50mB/KY2n gMv4U3vnXYRBO29cspIM0MU64wUcNmqNtXrU4d+KnnOs4Ic+hcCACL5joqeOtt1aCgZy rUlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BlOUek+N; 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 n19-20020a05640206d300b004acb305fe3bsi8268469edy.605.2023.02.13.06.28.47; Mon, 13 Feb 2023 06:29:09 -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=BlOUek+N; 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 S230424AbjBMNs0 (ORCPT + 99 others); Mon, 13 Feb 2023 08:48:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230416AbjBMNsN (ORCPT ); Mon, 13 Feb 2023 08:48:13 -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 76C711B578 for ; Mon, 13 Feb 2023 05:46:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676296013; 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=4Gd+AM0ivl8H3lv5f0bcfNcViU9oHee8wwcgLJRIkXo=; b=BlOUek+Nk/cL7kv43+7d4YUm1Wbn+bJpaEX4XvJSU/OUvivwGm3fOmVu2xtPbxSMbZ7QaW K6ic+/ONXwpXwgFh2MUaoJ6rhxzdJ1apyg3tWI7X6ppda6OylbEvpO7BPn0o6PHBhui0ru SomSdxvBJ67QfMllgDQFmBsPbClYtuY= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-58-5GjRqJH1Nv2E9X1dNEvJAQ-1; Mon, 13 Feb 2023 08:46:47 -0500 X-MC-Unique: 5GjRqJH1Nv2E9X1dNEvJAQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 367EF3C16E82; Mon, 13 Feb 2023 13:46:31 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41D452166B26; Mon, 13 Feb 2023 13:46:29 +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 3/4] splice: Use init_sync_kiocb() in filemap_splice_read() Date: Mon, 13 Feb 2023 13:46:18 +0000 Message-Id: <20230213134619.2198965-4-dhowells@redhat.com> In-Reply-To: <20230213134619.2198965-1-dhowells@redhat.com> References: <20230213134619.2198965-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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?1757726428481762088?= X-GMAIL-MSGID: =?utf-8?q?1757726428481762088?= Use init_sync_kiocb() in filemap_splice_read() rather than open coding it and filter out IOCB_NOWAIT since the splice is synchronous. Requested-by: Christoph Hellwig Signed-off-by: David Howells cc: Christoph Hellwig cc: Jens Axboe cc: Al Viro cc: John Hubbard cc: David Hildenbrand cc: Matthew Wilcox cc: linux-block@vger.kernel.org cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org --- fs/splice.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index 7c0ff187f87a..8b2a9d963bc4 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -419,15 +419,15 @@ static ssize_t filemap_splice_read(struct file *in, loff_t *ppos, size_t len, unsigned int flags) { struct folio_batch fbatch; + struct kiocb iocb; size_t total_spliced = 0, used, npages; loff_t isize, end_offset; bool writably_mapped; int i, error = 0; - struct kiocb iocb = { - .ki_filp = in, - .ki_pos = *ppos, - }; + init_sync_kiocb(&iocb, in); + iocb.ki_pos = *ppos; + iocb.ki_flags &= IOCB_NOWAIT; /* Work out how much data we can actually add into the pipe */ used = pipe_occupancy(pipe->head, pipe->tail);