From patchwork Thu Oct 13 22:57:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13006554 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 813B0C433FE for ; Thu, 13 Oct 2022 22:57:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A44BC6B0075; Thu, 13 Oct 2022 18:57:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F55F6B0078; Thu, 13 Oct 2022 18:57:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8481B6B007B; Thu, 13 Oct 2022 18:57:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 707DB6B0075 for ; Thu, 13 Oct 2022 18:57:31 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 40F911A041E for ; Thu, 13 Oct 2022 22:57:31 +0000 (UTC) X-FDA: 80017439502.25.1E9E95E Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf14.hostedemail.com (Postfix) with ESMTP id DDE6E100014 for ; Thu, 13 Oct 2022 22:57:30 +0000 (UTC) Received: by mail-pl1-f180.google.com with SMTP id b2so3137073plc.7 for ; Thu, 13 Oct 2022 15:57:30 -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=+bEHZ50zknAWwSVuOVaZwKs7lBVx2eJBqBhuGaU+czo=; b=ndxCRoPIBtnV9yEqkqucLK7MfB1wgTbMmFclk3YlLb9LdvyU8Uqv32QJ6f5wTNu8/R TlJN84PpYGoMrB/GPwe1yxye1V3FeVIAEag5FiMbDYDX1Fxxru79roOszf2wPUCra0aP UfcPQhCkoShcf9j4koPyS5XqxAa6yWaEpZ+NMDzT1ayTaebUPMI2/RrzXI0GlFF5SaC3 le1iLIbqoUihFxV7P984n+1YNPoAaFQuhLTsXhFl31MggzZJ41qQel0zrKaNSGNEt63T SIqzmKClO7Ne1AK9+vdhoLPLFOI1+KlmzoixfTR8yBRhoMVAub6D7B5wZWTbMYb2Jq1B mPrQ== 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=+bEHZ50zknAWwSVuOVaZwKs7lBVx2eJBqBhuGaU+czo=; b=G36i+m37g6Dw+r+/edGJQxjqyz4yb2RaRmnb5n9++lr0wSV3hXX3X/ylhoh1HWvkGC nL6XRdkc6V6ZyI8KbBxVCjJFPjO5Ylsy/9cSJHpM99GXtOv9hT0GN160Kn468p656JLt eo6sV8T/4noS1Ld8MFJmvk+xvLsm0RQyuvODR8UNjgc3JAKjquhsJFFuOg02Ew+5w2hd XfcvSLGPfdCNb1mhZj8qssQX+nE2v/zxSKzH7bmpMQiqYb4RPNMAQVvLq/ZvE2IE9az3 p9tWLILUqRzl2Ccv6ZV4HOl4MdEQBKqBEoxf0DWUc7lyGqnTX4ovPY633mV8dRlaGAqQ b4Dg== X-Gm-Message-State: ACrzQf2FM6/GnXApiMR1oDSF8zEgbsbYI5Mnr9Gruy+xzec1oqTlWmcI OtRppWhVDIJ/I9AVeKEad8s= X-Google-Smtp-Source: AMsMyM4c1cHRSG98hG5/OvxLX0FDFpQEhZl0xEjE8zZokv+3BiL6i+jp5GFbLHdoyKu7cO8oxCo9Uw== X-Received: by 2002:a17:903:30d4:b0:184:fadd:ec27 with SMTP id s20-20020a17090330d400b00184faddec27mr2063368plc.44.1665701849770; Thu, 13 Oct 2022 15:57:29 -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 lx4-20020a17090b4b0400b001fde655225fsm7480269pjb.2.2022.10.13.15.57.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 15:57:28 -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 v2 1/2] filemap: find_lock_entries() now updates start offset Date: Thu, 13 Oct 2022 15:57:07 -0700 Message-Id: <20221013225708.1879-2-vishal.moola@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221013225708.1879-1-vishal.moola@gmail.com> References: <20221013225708.1879-1-vishal.moola@gmail.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1665701850; 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=+bEHZ50zknAWwSVuOVaZwKs7lBVx2eJBqBhuGaU+czo=; b=L9P3jL08k5xM2xXROq8VE8A6xJbRGGmz4FqobvH2/KD9HEau43r7l1I2FKjABYjnBMJzji ufJ1EDHq76iyEn1yYfEdkRiOmoV1V5BkycJ9IAGOEnNOVwH5Of0IoAxKcbEmstAqa0hukP 1SmkRDbBgRxCPoPAboqkdK/udAXNeuI= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=ndxCRoPI; spf=pass (imf14.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1665701850; a=rsa-sha256; cv=none; b=skoSBk9H9AC3wofXE/10L0n5zJs6USwf5SeDNcy54Tt/qgtssv79UArVHPv8sIS6KcPJp9 G60TOpccjf3Sb/iTbsdOjb9YnNp9zD6IFn7J5Uln70+5a6lGUeBT/hrrOkCl5DCimCl0Da rx8K9185ExO4uKjEvHBkvyeSQL5Pwlw= X-Rspam-User: X-Rspamd-Server: rspam11 Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=ndxCRoPI; spf=pass (imf14.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Stat-Signature: yuucb3f1zjb3mqs6gmygnt61k5tu965n X-Rspamd-Queue-Id: DDE6E100014 X-HE-Tag: 1665701850-298685 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: 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_entires() 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) Reviewed-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 17 +++++++++++++---- mm/internal.h | 2 +- mm/shmem.c | 8 ++------ mm/truncate.c | 11 +++-------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index c943d1b90cc2..b6aaded95132 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; @@ -2120,8 +2120,17 @@ unsigned find_lock_entries(struct address_space *mapping, pgoff_t start, put: folio_put(folio); } - 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; + } + rcu_read_unlock(); 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 Thu Oct 13 22:57:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13006555 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 D0193C4332F for ; Thu, 13 Oct 2022 22:57:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D8AF6B0078; Thu, 13 Oct 2022 18:57:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5885A6B007B; Thu, 13 Oct 2022 18:57:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D9EB6B007D; Thu, 13 Oct 2022 18:57:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 2E2106B0078 for ; Thu, 13 Oct 2022 18:57:33 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0E2EDC03E7 for ; Thu, 13 Oct 2022 22:57:33 +0000 (UTC) X-FDA: 80017439586.14.47A27A4 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by imf11.hostedemail.com (Postfix) with ESMTP id AF90940020 for ; Thu, 13 Oct 2022 22:57:32 +0000 (UTC) Received: by mail-pj1-f46.google.com with SMTP id g8-20020a17090a128800b0020c79f987ceso6228274pja.5 for ; Thu, 13 Oct 2022 15:57:32 -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=N9bFubddI7+LphibKGGsyeFrDKSrtJVqH6WoZiz/0OA=; b=izj+aFrM2A2YLCP8N2Z1OeEPjJ3QDtEAYp3/EAZxWX84usO2nGiTCNwPOiEljhuObH GT8PZO9wo+C0EyBnKLTSwja7tYV0oUy39jQjvPjZcZrlpZdvh1AUvw47wgTod2EV1O4A Q6l91qtcBv3ko1ZYGIBptB3q4weFCVJAh9/Ft/SPwRBv/CrXPsVeAgBy1AzvRGxBYRnm f4lF2st1UCtoh7vPNM512wR2oK64S1kRtc7ZbkHaJWWhlkw9uo2CPiklkzNZ4waG5O9b gYoLljt/LHA1LuLDXW1tyRh637U72Kb9ZTpV2yXjrNfw4t+Y/rRgYOWFSTxkBYm9vM5S LI0Q== 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=N9bFubddI7+LphibKGGsyeFrDKSrtJVqH6WoZiz/0OA=; b=LniycIWYQPg9k+qe12vxJK4Ikx/T7983UvHcEZdw/uGbkyJdenYdQG2+ejCeowsETu ClxVwAm6/Np7u/o/cn3RjX5DRPlPQRy8VZksM/q3ZnpFDbC+/Hh+fZMBv9sA6ohLQweA 3IsacA6Cb4mJykOVuVrZh55EjHSolZf2PDlHTWQ8rPIfLc9PPFbUN/9cjyTUFhv61aec WI0FEu2qbGOkCU+2PV8zUTOuKY1fzNmjHkC1Yya3j6WthDHkn64abPqPWt/TuEKWf76X ITHY/6vstx1nB425aFYPyO0RdmJeqkLJzqm56ZOhzNZKkb9WtDuXcPeuLabX0vwgZ3hp JCww== X-Gm-Message-State: ACrzQf2EbuUxFwaPpt3DgXhhovHFW6E91J/fyJmpE8ZhPKytUqlWpkfw d4AaMOjYvxmk0NatrPqJyLA= X-Google-Smtp-Source: AMsMyM4+mX8wZ+lqkAPXL//k45qm7r2YiR8F+rJTouER/FcREWcnYsnlEXuxCOR0dVytZN+0gT0GjQ== X-Received: by 2002:a17:90b:384:b0:20d:aa78:92da with SMTP id ga4-20020a17090b038400b0020daa7892damr5173642pjb.159.1665701851641; Thu, 13 Oct 2022 15:57:31 -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 lx4-20020a17090b4b0400b001fde655225fsm7480269pjb.2.2022.10.13.15.57.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 15:57:30 -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 v2 2/2] filemap: find_get_entries() now updates start offset Date: Thu, 13 Oct 2022 15:57:08 -0700 Message-Id: <20221013225708.1879-3-vishal.moola@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221013225708.1879-1-vishal.moola@gmail.com> References: <20221013225708.1879-1-vishal.moola@gmail.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1665701852; 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=N9bFubddI7+LphibKGGsyeFrDKSrtJVqH6WoZiz/0OA=; b=zYVk+Nk85vEbUuoAxIu9kM/ko2KrEoZRfC5QBRL0Mt6h/6VOasHj8YhHDyf/ju9SVxACuN NE4rJy4QCpn+11oWgxMfe75qoFmcliF5nJg1OBt/0yEMh87MaqfuP2Hgar3aOC+9K/jMe0 x3ynsvbvWmOZKjrw9/HCBwjam3DV99o= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=izj+aFrM; spf=pass (imf11.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.46 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1665701852; a=rsa-sha256; cv=none; b=P8ppadkimuxIfWreyU19SbYG4mIz2v4JMRdE+dSfLkc7/7i2cLKt4dh4+ezFdgPtwS1bNO Govg/BKz7EvLaNfzt4UVd3Gs1BcejencyulI8wG/ABKplyjuRy1cMVA0lPrixXLZVJzYic huDheUZbl3ADiWX9mp1NutfpEc93GXM= X-Rspam-User: X-Rspamd-Queue-Id: AF90940020 X-Stat-Signature: i817zyqtncud6uihdz3rba8sgas4wqjg Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=izj+aFrM; spf=pass (imf11.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.46 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam10 X-HE-Tag: 1665701852-23658 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: 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_entires() 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 | 11 ++++------- mm/truncate.c | 19 +++++++------------ 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index b6aaded95132..ed66fecf06d9 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(); @@ -2065,8 +2065,17 @@ unsigned find_get_entries(struct address_space *mapping, pgoff_t start, if (!folio_batch_add(fbatch, folio)) break; } - 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; + } + rcu_read_unlock(); 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