From patchwork Mon Oct 17 16:17:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 3591 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1537909wrs; Mon, 17 Oct 2022 09:29:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6dkgJdjAolGqIH1prQ381ZLqJieF5xMN560nikH0hye96cE9ot8IE7G45YsEc5u5HaWSli X-Received: by 2002:a17:907:25cd:b0:77b:9672:38e7 with SMTP id ae13-20020a17090725cd00b0077b967238e7mr9827847ejc.10.1666024158849; Mon, 17 Oct 2022 09:29:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666024158; cv=none; d=google.com; s=arc-20160816; b=PiquAzvkg2Qq+49/faLSWN+CSVpWaKJXr1BC1lfBYyVgOlUAK6OOLkFLb4ua3EHW94 uCN0fIlJ+ynsZDySnJ/VPjS0XxtcygEFnCCgOjhprzH9BDxcYUMyVsxkB4ZTjiTwGXbG kwxmbNSeTndb4db8cXjxvh2U/xqS17cqNeNBzgQVa9itrIhTiAIb0E0UXlv2kf2jbBhB IWIZFWwmlkZEYEA1aNHlMdBN5pxo8WLV03Fss6n9geY4jIl2aQKGcVf8XWwXxv3ST3Kr WHg2hSdk91Senhfer1MkYW+uIL5hdHFXcVWkg+nNc5Atq59tNsatH7uJhtx6SG3oGOuX 2AEQ== 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=5j539BVjq27URS/HNG9DrLeM7Wv07f4M+R4mIEbK3S8=; b=rOh4vKts+5XNaTqkh/EfeyyqJIUmeOTP9LEuTNyEr5UJa1UMvD+jTCOeJo6v5FwLsX KuZWmK0QxvOX/+VG9ZeoPciV2NbQl+JiU8v9WtzYCqcif7840f4EyAUyAZPV4f1/hNHJ kqH+4GrZs8bFE40gDe2CHvEe9dwacG1+bCdqAaxEFs5cSOkK0mqrtUSvnCAYq50ywImX eW24Q0RSvZr6VdsYs0D7XOHr88iOYieg7l3iKiB0yfeukok7kFouZ4r7bxMNocGY2DeI NKlWNTjo+vjok5UzR7ZtlPE/puSdjX3SaV6SfXGo+WAU2mqqLB7S7puUhu0Yy6nT5Bxq pJEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=IZf7M4v9; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n25-20020a509359000000b00458a22ec887si9054849eda.276.2022.10.17.09.28.53; Mon, 17 Oct 2022 09:29:18 -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=@gmail.com header.s=20210112 header.b=IZf7M4v9; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230156AbiJQQSL (ORCPT + 99 others); Mon, 17 Oct 2022 12:18:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230238AbiJQQSH (ORCPT ); Mon, 17 Oct 2022 12:18:07 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BC406CF44; Mon, 17 Oct 2022 09:18:07 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id l1so11193093pld.13; Mon, 17 Oct 2022 09:18:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5j539BVjq27URS/HNG9DrLeM7Wv07f4M+R4mIEbK3S8=; b=IZf7M4v9cnmFrzMJwOe8cLn5+Qylo/CbrK6HuvbD4tXqp1aNaO+PxREpTWmtbiQfoZ rkFFM5OGIXhOG5RBxFssGCCjha4z7MMaWFEdyDb8btzv4cryoz6nmkPaAZScnIBMLlZl yxW/lgSJK+ViQKNVz/hGoIxhgwdZrPf6n1CrYP59o9rKamMFFpKamkmYRw7bGUaYmBJx BZ1GZGEW1O/ez8uQK+m5hpt3CmvuUcxTcKVG3dJvbUU48n1JKRfjs3U0EnZFxNHv/H80 EqTGht9vIXXrK5u+HWNrVo7MYwxH+QgbSPttQjmN1VdaVQZvqqDqNZSBhDOoZuS/unrJ bPSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5j539BVjq27URS/HNG9DrLeM7Wv07f4M+R4mIEbK3S8=; b=dKH+ifd12RufR1FbiXeGEVQXERY3nhpRQT7lXQxj2h4WukkXVWKd/B7Dk75Xqev+iu /An0vUgiP87o889m7VwOyq/i57g/oTJLM7qAMcDiukevfEhQaRi5YFL7XAiu7f+2e5Bz S1qI8RKdWT/FNcOaX0piFEzE2NOw+FoTGVbC4ioCvfMkBLVBmA3TOpVnvcNAmLwHPxC3 Tfhr93zkTU3Aa6HYIgClsG+dRz1338MCNlr4pn5YBsFZTRYcJbNdt18iFtTT5+hVAxkA jQtSkNUm08qb6DkQFA1K93c1cCJaNZfYRn1LtPc/nMgs8ruPDHqm6PNyvhRlx0Zq77hv 6R8g== X-Gm-Message-State: ACrzQf226fESbozwgzfqXoX41S/p4I9b84i8wucNpHtsbU2S/jn9YMZk 61183OSiznnbYObztBhfxt4= X-Received: by 2002:a17:90a:1785:b0:20a:6162:2b6a with SMTP id q5-20020a17090a178500b0020a61622b6amr14373016pja.180.1666023486520; Mon, 17 Oct 2022 09:18:06 -0700 (PDT) Received: from vmfolio.. (c-76-102-73-225.hsd1.ca.comcast.net. [76.102.73.225]) by smtp.googlemail.com with ESMTPSA id z22-20020a62d116000000b0055f209690c0sm7272326pfg.50.2022.10.17.09.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Oct 2022 09:18:06 -0700 (PDT) From: "Vishal Moola (Oracle)" To: akpm@linux-foundation.org Cc: willy@infradead.org, hughd@google.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH v3 1/2] filemap: find_lock_entries() now updates start offset Date: Mon, 17 Oct 2022 09:17:59 -0700 Message-Id: <20221017161800.2003-2-vishal.moola@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221017161800.2003-1-vishal.moola@gmail.com> References: <20221017161800.2003-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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?1746952948362629739?= X-GMAIL-MSGID: =?utf-8?q?1746952948362629739?= Initially, find_lock_entries() was being passed in the start offset as a value. That left the calculation of the offset to the callers. This led to complexity in the callers trying to keep track of the index. Now find_lock_entries() takes in a pointer to the start offset and updates the value to be directly after the last entry found. If no entry is found, the offset is not changed. This gets rid of multiple hacky calculations that kept track of the start offset. Signed-off-by: Vishal Moola (Oracle) --- mm/filemap.c | 15 ++++++++++++--- mm/internal.h | 2 +- mm/shmem.c | 8 ++------ mm/truncate.c | 11 +++-------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index c943d1b90cc2..f1fec7bf5b15 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2090,16 +2090,16 @@ unsigned find_get_entries(struct address_space *mapping, pgoff_t start, * * Return: The number of entries which were found. */ -unsigned find_lock_entries(struct address_space *mapping, pgoff_t start, +unsigned find_lock_entries(struct address_space *mapping, pgoff_t *start, pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices) { - XA_STATE(xas, &mapping->i_pages, start); + XA_STATE(xas, &mapping->i_pages, *start); struct folio *folio; rcu_read_lock(); while ((folio = find_get_entry(&xas, end, XA_PRESENT))) { if (!xa_is_value(folio)) { - if (folio->index < start) + if (folio->index < *start) goto put; if (folio->index + folio_nr_pages(folio) - 1 > end) goto put; @@ -2122,6 +2122,15 @@ unsigned find_lock_entries(struct address_space *mapping, pgoff_t start, } rcu_read_unlock(); + if (folio_batch_count(fbatch)) { + unsigned long nr = 1; + int idx = folio_batch_count(fbatch) - 1; + + folio = fbatch->folios[idx]; + if (!xa_is_value(folio) && !folio_test_hugetlb(folio)) + nr = folio_nr_pages(folio); + *start = indices[idx] + nr; + } return folio_batch_count(fbatch); } diff --git a/mm/internal.h b/mm/internal.h index 785409805ed7..14625de6714b 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -104,7 +104,7 @@ static inline void force_page_cache_readahead(struct address_space *mapping, force_page_cache_ra(&ractl, nr_to_read); } -unsigned find_lock_entries(struct address_space *mapping, pgoff_t start, +unsigned find_lock_entries(struct address_space *mapping, pgoff_t *start, pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices); unsigned find_get_entries(struct address_space *mapping, pgoff_t start, pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices); diff --git a/mm/shmem.c b/mm/shmem.c index 42e5888bf84d..9e17a2b0dc43 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -932,21 +932,18 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, folio_batch_init(&fbatch); index = start; - while (index < end && find_lock_entries(mapping, index, end - 1, + while (index < end && find_lock_entries(mapping, &index, end - 1, &fbatch, indices)) { for (i = 0; i < folio_batch_count(&fbatch); i++) { folio = fbatch.folios[i]; - index = indices[i]; - if (xa_is_value(folio)) { if (unfalloc) continue; nr_swaps_freed += !shmem_free_swap(mapping, - index, folio); + indices[i], folio); continue; } - index += folio_nr_pages(folio) - 1; if (!unfalloc || !folio_test_uptodate(folio)) truncate_inode_folio(mapping, folio); @@ -955,7 +952,6 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, folio_batch_remove_exceptionals(&fbatch); folio_batch_release(&fbatch); cond_resched(); - index++; } same_folio = (lstart >> PAGE_SHIFT) == (lend >> PAGE_SHIFT); diff --git a/mm/truncate.c b/mm/truncate.c index 0b0708bf935f..9fbe282e70ba 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -361,9 +361,8 @@ void truncate_inode_pages_range(struct address_space *mapping, folio_batch_init(&fbatch); index = start; - while (index < end && find_lock_entries(mapping, index, end - 1, + while (index < end && find_lock_entries(mapping, &index, end - 1, &fbatch, indices)) { - index = indices[folio_batch_count(&fbatch) - 1] + 1; truncate_folio_batch_exceptionals(mapping, &fbatch, indices); for (i = 0; i < folio_batch_count(&fbatch); i++) truncate_cleanup_folio(fbatch.folios[i]); @@ -510,20 +509,17 @@ unsigned long invalidate_mapping_pagevec(struct address_space *mapping, int i; folio_batch_init(&fbatch); - while (find_lock_entries(mapping, index, end, &fbatch, indices)) { + while (find_lock_entries(mapping, &index, end, &fbatch, indices)) { for (i = 0; i < folio_batch_count(&fbatch); i++) { struct folio *folio = fbatch.folios[i]; /* We rely upon deletion not changing folio->index */ - index = indices[i]; if (xa_is_value(folio)) { count += invalidate_exceptional_entry(mapping, - index, - folio); + indices[i], folio); continue; } - index += folio_nr_pages(folio) - 1; ret = mapping_evict_folio(mapping, folio); folio_unlock(folio); @@ -542,7 +538,6 @@ unsigned long invalidate_mapping_pagevec(struct address_space *mapping, folio_batch_remove_exceptionals(&fbatch); folio_batch_release(&fbatch); cond_resched(); - index++; } return count; } From patchwork Mon Oct 17 16:18:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 3593 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1538455wrs; Mon, 17 Oct 2022 09:30:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5g8KSiiQK5oY+jxrK+UDNyGqLBEaVRy3AHDKUBzheBHu8wr3XlJ9OCAZZIHKl61LGX/ej0 X-Received: by 2002:a05:6402:3709:b0:459:279e:fdc6 with SMTP id ek9-20020a056402370900b00459279efdc6mr11150292edb.338.1666024236455; Mon, 17 Oct 2022 09:30:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666024236; cv=none; d=google.com; s=arc-20160816; b=NhR4BmKHU2gEW8O/BKpzJztoj+p1NDMwmHpUeK3pSUkpdmSguFWRzJkIP/v9XxcMjh aQdZDRT6gm3YZc36gM58J2iqqUABH8pS2KAfLcgKPbi90IiZRYZfX3Lyi/MJ5AX+9xbw Dm68KDySv3maWec+1q90cxTaJKUlZDAgg3KmX6hAkhLuJ982XKvYZQuVcShTyCoD+Vct FLsG2cZQ36VmTkoJJFpFjdBvcVp2Mj1sBx+GmFnfFLjwO4pqnsEP+1/1A1uiIskFJqrv 0NHPHh1A9MWt2i6EODOPGdfzm8/xig0D3bUJZSFl7wYjbgroF+ClC5Ps79VN1KuDnh7N 5t1A== 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=SKguiJYDkzC95u9M4wpAvwaM2MiZsshmjZtegeg9N/Q=; b=wzq6Sb+S0bDO0bXQ2JWknZIqGUfvOYc2M7egUIHP95iNPEwDC3rEaUuFxwm3c07zzU s+K18UkHuF/hCuSOx7kZ89V8O0U/PeZxtGSmZvY09yYxBxHj25pOCQ7fuVj3U9xjeP0q UcfB+5tYsenUeCITlB+FLp7yXJLrPl+5C19Xn+ctHiXiGfZi3OKuWznNRxLmxOgwnLyg 9UHRr1R0n97eoZO+LRtgg48cA1yH4AhULMVs/WFZIi5FdYBPL1cUPAXGZdvKeH7iXyj/ fDnIF9/dSgzcsYHdXBalhgQu1MQZjQouRCbZGSSpgP9R+dX0Ac+Jd04Tn1XO6hwEy0qJ aC/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="TIQdmVF/"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k5-20020a508ac5000000b0045c129ed626si8615946edk.317.2022.10.17.09.30.08; Mon, 17 Oct 2022 09:30:36 -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=@gmail.com header.s=20210112 header.b="TIQdmVF/"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230044AbiJQQSZ (ORCPT + 99 others); Mon, 17 Oct 2022 12:18:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230301AbiJQQSK (ORCPT ); Mon, 17 Oct 2022 12:18:10 -0400 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E8396D578; Mon, 17 Oct 2022 09:18:09 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id e129so10866259pgc.9; Mon, 17 Oct 2022 09:18:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SKguiJYDkzC95u9M4wpAvwaM2MiZsshmjZtegeg9N/Q=; b=TIQdmVF/NUwB/SC10cgEjN0v81RQV4XfsM2gsj49cKH1uKhnxv8or3N2n+8di1/cy5 ksaoz6ZWmpfqgJw8oe4LP1eHuU5iYjvbWUdEcIU42mhLa9/DR1wk8eF7w5mkpvuDxH5k Frc5J7/dz8+dcZosr/RJ3iVX5qCKTfHNnWy1HOm5YQQsR0JzKvH1BPAQGIjt5eEq7nOy urZE6CmYghSeCdoTM33tuH7cESEIQoAjwunqDBnehyZ534twCYrHGJabtZvKdDoSFBGs ZNAY7x48BwWy1V5HyLU6HHoSbsJWMrpr0v9p18sup05YIbPm1FGcgcg9E9QW4PD02jDF Z3Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SKguiJYDkzC95u9M4wpAvwaM2MiZsshmjZtegeg9N/Q=; b=uFcw9tOtVCl1B8Eb8Z5Nagl6EvfIkBrb6vvijvNQGRg4S8qujJI8hcnWEeG0MddwtJ NQVZ9HG+6BUC6d5r1x1p5hjEK1KMn27GIFSM8JgV9OCM3e2+WVLWIEr3+cZ99Xloon75 PDahgBaFaZ7a9SolT4owcox8cXPAjm60Fx1n6JJ32HV4Z0X+zbaEj66MhyKZ8xPYOW9z E9JW0baNC7QCJEShA3nCfIYXC09pZdSmTtQdkH/TKZtZhnyrdOHfNgtpV3hyxM4MIRhi A0b2gbqES9FI7KRpDqY0uI3Sh/4mFONyR8T9UGBtdhwTzxD8yTkMh1+G91JY31xsa5aM b0Dw== X-Gm-Message-State: ACrzQf096un1ASDMupN4NpFkrmeSvf1brDv9Ir8AXryAkkxI4Y9ALRB6 YlWBLOTcrwoFXAhN3LBIfOw= X-Received: by 2002:aa7:888b:0:b0:563:aa1:adae with SMTP id z11-20020aa7888b000000b005630aa1adaemr13235253pfe.15.1666023488527; Mon, 17 Oct 2022 09:18:08 -0700 (PDT) Received: from vmfolio.. (c-76-102-73-225.hsd1.ca.comcast.net. [76.102.73.225]) by smtp.googlemail.com with ESMTPSA id z22-20020a62d116000000b0055f209690c0sm7272326pfg.50.2022.10.17.09.18.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Oct 2022 09:18:08 -0700 (PDT) From: "Vishal Moola (Oracle)" To: akpm@linux-foundation.org Cc: willy@infradead.org, hughd@google.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH v3 2/2] filemap: find_get_entries() now updates start offset Date: Mon, 17 Oct 2022 09:18:00 -0700 Message-Id: <20221017161800.2003-3-vishal.moola@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221017161800.2003-1-vishal.moola@gmail.com> References: <20221017161800.2003-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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?1746953029467247968?= X-GMAIL-MSGID: =?utf-8?q?1746953029467247968?= Initially, find_get_entries() was being passed in the start offset as a value. That left the calculation of the offset to the callers. This led to complexity in the callers trying to keep track of the index. Now find_get_entries() takes in a pointer to the start offset and updates the value to be directly after the last entry found. If no entry is found, the offset is not changed. This gets rid of multiple hacky calculations that kept track of the start offset. Signed-off-by: Vishal Moola (Oracle) --- mm/filemap.c | 13 +++++++++++-- mm/internal.h | 2 +- mm/shmem.c | 11 ++++------- mm/truncate.c | 19 +++++++------------ 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index f1fec7bf5b15..804d335504f0 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2053,10 +2053,10 @@ static inline struct folio *find_get_entry(struct xa_state *xas, pgoff_t max, * * Return: The number of entries which were found. */ -unsigned find_get_entries(struct address_space *mapping, pgoff_t start, +unsigned find_get_entries(struct address_space *mapping, pgoff_t *start, pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices) { - XA_STATE(xas, &mapping->i_pages, start); + XA_STATE(xas, &mapping->i_pages, *start); struct folio *folio; rcu_read_lock(); @@ -2067,6 +2067,15 @@ unsigned find_get_entries(struct address_space *mapping, pgoff_t start, } rcu_read_unlock(); + if (folio_batch_count(fbatch)) { + unsigned long nr = 1; + int idx = folio_batch_count(fbatch) - 1; + + folio = fbatch->folios[idx]; + if (!xa_is_value(folio) && !folio_test_hugetlb(folio)) + nr = folio_nr_pages(folio); + *start = indices[idx] + nr; + } return folio_batch_count(fbatch); } diff --git a/mm/internal.h b/mm/internal.h index 14625de6714b..e87982cf1d48 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -106,7 +106,7 @@ static inline void force_page_cache_readahead(struct address_space *mapping, unsigned find_lock_entries(struct address_space *mapping, pgoff_t *start, pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices); -unsigned find_get_entries(struct address_space *mapping, pgoff_t start, +unsigned find_get_entries(struct address_space *mapping, pgoff_t *start, pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices); void filemap_free_folio(struct address_space *mapping, struct folio *folio); int truncate_inode_folio(struct address_space *mapping, struct folio *folio); diff --git a/mm/shmem.c b/mm/shmem.c index 9e17a2b0dc43..8c3c2ac15759 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -983,7 +983,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, while (index < end) { cond_resched(); - if (!find_get_entries(mapping, index, end - 1, &fbatch, + if (!find_get_entries(mapping, &index, end - 1, &fbatch, indices)) { /* If all gone or hole-punch or unfalloc, we're done */ if (index == start || end != -1) @@ -995,13 +995,12 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, for (i = 0; i < folio_batch_count(&fbatch); i++) { folio = fbatch.folios[i]; - index = indices[i]; if (xa_is_value(folio)) { if (unfalloc) continue; - if (shmem_free_swap(mapping, index, folio)) { + if (shmem_free_swap(mapping, indices[i], folio)) { /* Swap was replaced by page: retry */ - index--; + index = indices[i]; break; } nr_swaps_freed++; @@ -1014,19 +1013,17 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, if (folio_mapping(folio) != mapping) { /* Page was replaced by swap: retry */ folio_unlock(folio); - index--; + index = indices[i]; break; } VM_BUG_ON_FOLIO(folio_test_writeback(folio), folio); truncate_inode_folio(mapping, folio); } - index = folio->index + folio_nr_pages(folio) - 1; folio_unlock(folio); } folio_batch_remove_exceptionals(&fbatch); folio_batch_release(&fbatch); - index++; } spin_lock_irq(&info->lock); diff --git a/mm/truncate.c b/mm/truncate.c index 9fbe282e70ba..faeeca45d4ed 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -400,7 +400,7 @@ void truncate_inode_pages_range(struct address_space *mapping, index = start; while (index < end) { cond_resched(); - if (!find_get_entries(mapping, index, end - 1, &fbatch, + if (!find_get_entries(mapping, &index, end - 1, &fbatch, indices)) { /* If all gone from start onwards, we're done */ if (index == start) @@ -414,21 +414,18 @@ void truncate_inode_pages_range(struct address_space *mapping, struct folio *folio = fbatch.folios[i]; /* We rely upon deletion not changing page->index */ - index = indices[i]; if (xa_is_value(folio)) continue; folio_lock(folio); - VM_BUG_ON_FOLIO(!folio_contains(folio, index), folio); + VM_BUG_ON_FOLIO(!folio_contains(folio, indices[i]), folio); folio_wait_writeback(folio); truncate_inode_folio(mapping, folio); folio_unlock(folio); - index = folio_index(folio) + folio_nr_pages(folio) - 1; } truncate_folio_batch_exceptionals(mapping, &fbatch, indices); folio_batch_release(&fbatch); - index++; } } EXPORT_SYMBOL(truncate_inode_pages_range); @@ -636,16 +633,15 @@ int invalidate_inode_pages2_range(struct address_space *mapping, folio_batch_init(&fbatch); index = start; - while (find_get_entries(mapping, index, end, &fbatch, indices)) { + while (find_get_entries(mapping, &index, end, &fbatch, indices)) { for (i = 0; i < folio_batch_count(&fbatch); i++) { struct folio *folio = fbatch.folios[i]; /* We rely upon deletion not changing folio->index */ - index = indices[i]; if (xa_is_value(folio)) { if (!invalidate_exceptional_entry2(mapping, - index, folio)) + indices[i], folio)) ret = -EBUSY; continue; } @@ -655,13 +651,13 @@ int invalidate_inode_pages2_range(struct address_space *mapping, * If folio is mapped, before taking its lock, * zap the rest of the file in one hit. */ - unmap_mapping_pages(mapping, index, - (1 + end - index), false); + unmap_mapping_pages(mapping, indices[i], + (1 + end - indices[i]), false); did_range_unmap = 1; } folio_lock(folio); - VM_BUG_ON_FOLIO(!folio_contains(folio, index), folio); + VM_BUG_ON_FOLIO(!folio_contains(folio, indices[i]), folio); if (folio->mapping != mapping) { folio_unlock(folio); continue; @@ -684,7 +680,6 @@ int invalidate_inode_pages2_range(struct address_space *mapping, folio_batch_remove_exceptionals(&fbatch); folio_batch_release(&fbatch); cond_resched(); - index++; } /* * For DAX we invalidate page tables after invalidating page cache. We