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: 13138464 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16A5FC6379F for ; Mon, 13 Feb 2023 13:46:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A70F76B007E; Mon, 13 Feb 2023 08:46:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A20F36B0080; Mon, 13 Feb 2023 08:46:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E90E6B0082; Mon, 13 Feb 2023 08:46:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7E4486B007E for ; Mon, 13 Feb 2023 08:46:54 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 537B6AAE1B for ; Mon, 13 Feb 2023 13:46:54 +0000 (UTC) X-FDA: 80462394348.05.845CB81 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 79FCE40028 for ; Mon, 13 Feb 2023 13:46:52 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OoWrCXcH; spf=pass (imf17.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676296012; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4Gd+AM0ivl8H3lv5f0bcfNcViU9oHee8wwcgLJRIkXo=; b=R0s9P9MNGihsnTB2El16lqlWiPnkQEPy9Qe9P1hZ+oYejHP6pWuNyROtDfsdvbEpsps5X4 NbpCAijUH6kwufkPBJbry9GnI3IHpUum812rawy2xb4v4vk0eJ8VadVyBuvfTs7si3laO8 FjOvpw0u5uAIz6WoyEQwb+zRgN0bNqo= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OoWrCXcH; spf=pass (imf17.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676296012; a=rsa-sha256; cv=none; b=30ibOXDpEa8Y/Gq7cGWfDRxnutdYcoLRXp9DMIBZ0glQNx7CQngASKhpkAqflKGJ5G62Jo VvTdpFEYghTkSq+rtzNeHg6WozXMHujKHhVLznCgO5zvFboNJnGoLdStCqJE7sIaFPoTXH 9QdKWi2p0S2PjECZoZzLpeu3nbuX8Ac= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676296011; 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=OoWrCXcHX+UhmKyFSFcbUoI8crsYy3jZX0FaoN1fYS7CBlTHcX0LGC4Y+ZkhsLqdxL85A9 dzv7XLieiZZmHxX7CcASsAofy85dtXxb7aAvNjIwRpeTCgXIJU4Z6kLXN+NqW9KPRII5eT fjNuH9fj4OnXVwXNG1n8vZRyWfVPLMs= 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-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 79FCE40028 X-Stat-Signature: 35tczwngzygwisinpy7cmk4t86wgiei3 X-HE-Tag: 1676296012-832906 X-HE-Meta: U2FsdGVkX1/z8htX6T2FlFn5ZquCxJUL/n1n1Ti5rpppO8g3PEtZr7RVzyH0J6zCdmvsXd6cOs21wKjzAv9VVDfgpSlvTWMxk7OOqKASxY+9uDsxu2DXQQFSluiwkh290uIoVPT4F4QSZiWdemFbdv+VEAuGNoMNHrpucHQd4GHALvJ4BT/zj7LkZqWum9cAiw2p4wpyfkzd55YGTvAzZEKTyciKaLBvM1NZhzlX5YDDZRNYeARW9rpU9ECsnHIU3/xeCsk+Z28MHyDqaiXTUh3cP5cSZKUijeMikjqe4jGrWngKwcayyR4F+IM7yQCkMSBrs/DUFCpMK4tGmYko4w975StrbTUgRz2nSdHjZ17ITvm5sO/R08XQWW+2krvmjAfGITgruXMOfeLtQic9SrbcYDGA8tgFqyumnQr1IBTRhiFX3onjs1cULwjs7Gf6Hf5IlrP/esFrkaN9JkB/5aV8NYGkOy/0nYTNeDlqJTcTu073zcVvqwwIoCho7y1s6psVPlzuKKUkVWoroC5qp0IrVxzU9hPx9mzC/nzNAqBgGL/ijIUrODEUF/tTl9uxRuyC3h35uKw4aUTBlrkLXoso3nlGNXgmp4YCJfpvbqiJ9F+7swHQKZjof3OFx1pGwV9mUfjjKM3x73zPbA5flOKn9HcQq4XmH0zX/juRv+AbYk7XIWqgm2WFqwJnGwrolEP+BTJhApkuITfHChfo3jStGgTla8mgF9uFDn5WftT1ceIM0nMu9rAySJnrOdx9vwn3suIv3U4kCaLSL4ebYHTHZF5kx1318+OgaaLj6lW5aRxhivmem5LHUJzpwUkvhh5lu6NwJ+huyjM6mrIUZPZMdPdNdfu3e/3tz2Bn3BgIE576/K+aHRdaQE6W6LzzkvJj9pern4dnHcdMKIaoRYuAJukrlevNyZvNiW668wgU0ShlQavllGq/rEq9HOPpgqLDqPRzc7HQ/8Pa1Mk 7UdUOGnP Znl2ZxavdoNMkEO0I4VPFEzGIUGcGx3wtKZ3mD4pfri4GTQaTb/61xfXH1vwfLogOA/9nMu92JYbaF8ej4YZeBrfIZUnGsNRSPACvzSZCX6aTAiW+Y4w3/kExCLbUMBStfVUiYG9d63y9K0X8jvGsBCbjG2XOgzv3VXLHUvvw4QKZUsDp4xRhzQc9kDtxuQlAratN+J7m56vdE4SsGLsD0ntJ/xFfsXuw03RBiLMiQlSjXIncR66PlwR1Q+GjPDsICndH0AK/8oJ1/1Ie5BrYHXBkorlqBOFrP+BglPCJU/K4pZ/nSHD2PslOqnSsRIXnLtyqQOxmIlJ9/Q91WO7DQr4/K2xHqq7KjTcfQPhlgkMItS1VuJk498qk/k61LjjrqH5Eu1bUABCNxMf5lKqdAkn+65/X/x3VtQXmRH8NHFb6mijCUq/cNcDXj8H9tpcKpRVY/7OM9y6YhHys6bboNWWXZtVgUVs3SMmr2ApmsLwm7T6RJuhtmcTp0A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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);