From patchwork Wed Mar 8 14:37:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 66271 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp376517wrd; Wed, 8 Mar 2023 06:47:49 -0800 (PST) X-Google-Smtp-Source: AK7set8bLngOhfkt28FFL1Vn1uDIPCw+wonP4i3mWLuK6MESeoWjig8cIjwyvJiVRzMKPS3k3JdJ X-Received: by 2002:a05:6a21:99a3:b0:b6:99a4:66bd with SMTP id ve35-20020a056a2199a300b000b699a466bdmr21264440pzb.38.1678286869340; Wed, 08 Mar 2023 06:47:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678286869; cv=none; d=google.com; s=arc-20160816; b=sljQJpNkbVEgU9O1+CfABeYWx09jPxzQblrzDwtchXr+/BL58ysqZkUwaRb69frPbc oXTdFWHFEMchZFKtCEfMj914hQft3VJbOo6ElYtWaqAvcBiQgNWmyF46zMyfcdhYbTOb NQVF1ht/H0mqx9f26PmUGnb66gTMoaMSxouWMIQZ1dtoigmZtF0emVmJCoYS4Jvo4VkA ZDrEDISpQcpwS3kcU+ezIHklURjlPPZnbJL5TfdvxMCYXHYQYzGxqHenUrDPw/UlTF7e Ta2W1bxQurwqvCEXPkShFEYJ3t72UmXAO14qjvgAdgirX4zc9q0CGjvp5pGxFdBNIUhf g2/g== 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=dL8s47Tp1nK8GIg8PijNkCrDLEgPha2fkCIMRUXm1zk=; b=KRPE+9EcvaLcg7t89mpM8sf2JqHUXnBiaHd1B5caVTXgX6sxu4VinttrO3rYS/ub3a Kq+/78xFO2x2eU+lQRvI5B/SFaA7SkXFLYzkV2xGI/3azagnOaWml1yzFJyoOa15jAGv inEhs/jHqO4ZcNJwYZ7gpRL1cuMHO1nr6tpPK2XHboCOUlMw43ejKMkH0QSW5xUHXDgI tqPxM7VVgzAUGdsfFksnoKFpgBEcVl325op1dez42WohfxHAq3olNITJ9W6kX/ACJaEd zZjcQ1dIPTzh4D349/Qp1urFTt9wEorahmFWfQVB7OrmBOkZlKytnG3zE/2I2II8QP5h EYTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PJFYhGr+; 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 q15-20020a63f94f000000b00503a2a23fbdsi14182724pgk.841.2023.03.08.06.47.36; Wed, 08 Mar 2023 06:47:49 -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=PJFYhGr+; 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 S232114AbjCHOjI (ORCPT + 99 others); Wed, 8 Mar 2023 09:39:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232031AbjCHOi6 (ORCPT ); Wed, 8 Mar 2023 09:38:58 -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 C34CB3B221 for ; Wed, 8 Mar 2023 06:38:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678286287; 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=dL8s47Tp1nK8GIg8PijNkCrDLEgPha2fkCIMRUXm1zk=; b=PJFYhGr+q+O6KvYx1lMTId4oiZ6UGm4AktEMGHUylWsef89mhvEq2w5jHXEgkroJDmspKF JPTvUN8JmHmVH0uYocAJcY6uq7vhDAD569LHSYSzlxFYwRFup7et4pe5hjzcqqLxSBJxmQ 5fhCYzqnBtPxumdFQFg9nwCmtwxBPEs= 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-20-WwOWsJk3MvajoYgGpEO4_w-1; Wed, 08 Mar 2023 09:38:02 -0500 X-MC-Unique: WwOWsJk3MvajoYgGpEO4_w-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 B1438857A84; Wed, 8 Mar 2023 14:38:01 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACA4114171B6; Wed, 8 Mar 2023 14:37:59 +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 , Linus Torvalds , 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 v16 01/13] splice: Clean up direct_splice_read() a bit Date: Wed, 8 Mar 2023 14:37:42 +0000 Message-Id: <20230308143754.1976726-2-dhowells@redhat.com> In-Reply-To: <20230308143754.1976726-1-dhowells@redhat.com> References: <20230308143754.1976726-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=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?1759811332247493531?= X-GMAIL-MSGID: =?utf-8?q?1759811332247493531?= Do a couple of cleanups to direct_splice_read(): (1) Cast to struct page **, not void *. (2) Simplify the calculation of the number of pages to keep/reclaim in direct_splice_read(). Suggested-by: Christoph Hellwig 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 --- fs/splice.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index 2e76dbb81a8f..abd21a455a2b 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -295,7 +295,7 @@ ssize_t direct_splice_read(struct file *in, loff_t *ppos, struct kiocb kiocb; struct page **pages; ssize_t ret; - size_t used, npages, chunk, remain, reclaim; + size_t used, npages, chunk, remain, keep = 0; int i; /* Work out how much data we can actually add into the pipe */ @@ -309,7 +309,7 @@ ssize_t direct_splice_read(struct file *in, loff_t *ppos, if (!bv) return -ENOMEM; - pages = (void *)(bv + npages); + pages = (struct page **)(bv + npages); npages = alloc_pages_bulk_array(GFP_USER, npages, pages); if (!npages) { kfree(bv); @@ -332,11 +332,8 @@ ssize_t direct_splice_read(struct file *in, loff_t *ppos, kiocb.ki_pos = *ppos; ret = call_read_iter(in, &kiocb, &to); - reclaim = npages * PAGE_SIZE; - remain = 0; if (ret > 0) { - reclaim -= ret; - remain = ret; + keep = DIV_ROUND_UP(ret, PAGE_SIZE); *ppos = kiocb.ki_pos; file_accessed(in); } else if (ret < 0) { @@ -349,14 +346,12 @@ ssize_t direct_splice_read(struct file *in, loff_t *ppos, } /* Free any pages that didn't get touched at all. */ - reclaim /= PAGE_SIZE; - if (reclaim) { - npages -= reclaim; - release_pages(pages + npages, reclaim); - } + if (keep < npages) + release_pages(pages + keep, npages - keep); /* Push the remaining pages into the pipe. */ - for (i = 0; i < npages; i++) { + remain = ret; + for (i = 0; i < keep; i++) { struct pipe_buffer *buf = pipe_head_buf(pipe); chunk = min_t(size_t, remain, PAGE_SIZE);