From mboxrd@z Thu Jan 1 00:00:00 1970 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 94F7AC54E76 for ; Wed, 4 Jan 2023 21:15:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA0278E0008; Wed, 4 Jan 2023 16:15:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D8D688E0001; Wed, 4 Jan 2023 16:15:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB7578E0008; Wed, 4 Jan 2023 16:15:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id AE5868E0001 for ; Wed, 4 Jan 2023 16:15:04 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6D7224058C for ; Wed, 4 Jan 2023 21:15:04 +0000 (UTC) X-FDA: 80318371728.20.15D9683 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf29.hostedemail.com (Postfix) with ESMTP id C1FDE12000A for ; Wed, 4 Jan 2023 21:15:02 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=PJJR7HrE; spf=pass (imf29.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672866902; 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=uFWiZotH2hHO/dqZz3ekRRXvMmeZ6crkehTB/0Ti1xA=; b=z1o0IaG1BE5Rjs/OHzorKMDbTZJ81UpB2kKEbVPfAlPP9tJtzEQJ7vm3Ouugs+uFz/RYye Nq4m/cZ2WPg701OznlGdgJTZqyBDtaUSNJvVwol3jpc1dH5Rf5q9i0V9h1kfK4eZpJk0DW ny9E/mZddq5cbmib7Vfu746knzbGueY= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=PJJR7HrE; spf=pass (imf29.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.170 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=1672866902; a=rsa-sha256; cv=none; b=2N6rY+9syIZ1HEVVh143GMnwv9sfvVUExfBtgFebJx26O+ODfPCCd5YPR9IijeKzBXToBJ gL0LxjjjeKWhs4wCh6MKcNuXBBg3IYIpH23VpXOmhF5vyYXcLI25HcQJ0bqhYq8kF1JUFj 6+XqC+mObKwDK22GSIW8vBf5NRQO4co= Received: by mail-pl1-f170.google.com with SMTP id d9so20452141pll.9 for ; Wed, 04 Jan 2023 13:15:02 -0800 (PST) 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=uFWiZotH2hHO/dqZz3ekRRXvMmeZ6crkehTB/0Ti1xA=; b=PJJR7HrEap3tSH1Krm3xKRqYuv2+ZnILQzCAZ4FvA6g7y0di41mF1AmB7b4LucnLPW 9SnkknLaQi9JPN7HiqQursF5IJIh8x4Go7xxIzVvYbBtPjzAmZtsns33bPkPsrt+hy50 mCiKeevBosZyzcK2IMA4wvhDdxllKMI0cCC9SxOGeZRrOeURvnO4TDKbleugnCd9p6Lb 743pneGz2xpnNZHO7fCMj35WHO1f/RGQIweETnZKQ8XOTIemf3fMpTvzMTMPSOgKVRuz JEcncOEIDLTioi5zOdKBwUNvJ1hrNSt/h0sKN3+bcLYhECKpZRcloIieHM2fofEPAV8A w3mg== 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=uFWiZotH2hHO/dqZz3ekRRXvMmeZ6crkehTB/0Ti1xA=; b=ykgOjVhm0DILefyFseIC5TgiLrlgLTKPfbAc0PZMHKZuhfAYdpAVMVL1OqeFNBjHBB llhUHVmW+MBVD1GwNu9KTRI3NIpkaxOfGxtR7ukHm0W2xsG5/D7EGiAY4xXZU/tvRKK4 ok9HCPF9/kLn33Shm8lcn2Egrty4jh/T+1/cXE/ZVsIWuFvll1WHb1+IVff042Bndz4d JHVYwIoHvGFMJ4s519mCxO/v1tv33AC63CLRfV7Xhkg4Ji6HH/utpWnKMCjhspKYT79/ M3tVwJ9d4w+W4SRCMqdXEFCMWf9qOvW0twJirbCY224e/9zwEHrfEoAtcMds/mir4x2w ohLA== X-Gm-Message-State: AFqh2kqEFjnIBoVIgAiPMiaUpE+EHOEAhlDl/ulH/7gbkYLRBaP2/NA1 hOYTQujyR+RuPbptgJqFhBg= X-Google-Smtp-Source: AMrXdXs3J6LoGMu8noxjtrKyXAiquvbz4xl3hf/x2raO3jwqWxe++Tv6pvIGcV6rBxNIAYQX5K7/nQ== X-Received: by 2002:a17:90b:4d8c:b0:21d:ef10:d6ca with SMTP id oj12-20020a17090b4d8c00b0021def10d6camr50592886pjb.45.1672866901534; Wed, 04 Jan 2023 13:15:01 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::a55d]) by smtp.googlemail.com with ESMTPSA id i8-20020a17090a138800b00226369149cesm6408pja.21.2023.01.04.13.14.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 13:15:01 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org, linux-cifs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-nilfs@vger.kernel.org, linux-mm@kvack.org, "Vishal Moola (Oracle)" , Matthew Wilcow Subject: [PATCH v5 04/23] page-writeback: Convert write_cache_pages() to use filemap_get_folios_tag() Date: Wed, 4 Jan 2023 13:14:29 -0800 Message-Id: <20230104211448.4804-5-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230104211448.4804-1-vishal.moola@gmail.com> References: <20230104211448.4804-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: xkaktzqqgmuw1ig734un465ciexxu467 X-Rspam-User: X-Rspamd-Queue-Id: C1FDE12000A X-Rspamd-Server: rspam06 X-HE-Tag: 1672866902-674178 X-HE-Meta: U2FsdGVkX198qmLPjQQoXovqV0YRJkyIadDJy67Zkgu34+ycnnF28IVgd7of4V3xetiYqvtmjWi2xbRuq98bNlanvEqUSWBLN4uPA+raY9Jnd8Y3DZDJr3f61ZRHHMEfLpoP5KqlPicYlOzKtfp71NzqMZoNB+ybxMp1AGI/lL8bawENYf6PeNnbKFNaYUUbKQERuw9fC5BNi23DuNqXsPpmYvg4tqSFrjPcEAasa77KXE7/sPvGdCtg5mPsxAO9Z/uDJDS/TQGR5p0io5n9+NUf2C9ih4z+XHqZgoI0XXzwozHXVfxV+OYzfN2tfONTjgF8/dOzES9mCXlh475H3C2bGwl8DDWYgz8w363+Qtjfxm1hiiTeACdY57XVScJ6pHUp5/s2cdPdITKU6XPTnyI26jEMYt2SpLxIdXmZ7S0IjjnfseHUTIYf9fCn7p54KioqP0kP11NI+lkd5mUkFdI/4Hx8u80gAvae00mShs5Pj0RJ/V/0+XeEkRUoAW30TeO+glstgefcp3zdZt7Cv/cQj6D4Q+eLCtx2LNbtNGZ69tWpUctdSPhLtartBIXx9ymio8ctJqA12C/dxkHReV9TdU7uspe13nVoToMorZGg0xx6+Q/HH7k+gZMTpUC3kxcYYljiFHg6LSuCYpvAZyQjxBE1lS71kaa8GsTu3uRg+xo62WHytX9TZTdTLTmU13vdUK02Svw2gwf8if9LmQQTkPADpk0VnoerkMnsQBMU8gyKyYOdJRH17FL2EglMaqIlmHescyODyYgfQqJNxK8uKaLMekm1qcPxNzW+sk4DmIvOOX31T9E2V5IhXBOrPeX/QE2xg6nw/Hfm4ZDU3zoDOZuIWqdGJHQoQX48bEjlNjTJkSPWC1B1Da4V4O/hqfZZ6SqP8g6MkvtBqMpoDG9Il3jeccaJYobylishNmACxiIgdezbQX8qwwjS3NxqdLv1e70pjkzYMpIwimk /n+j7Tt2 MHn5HJ9gvSARKbmzzMVg597Wragl6pJpTkVzSqkiGoVQ16rsANY1ZuFEpZx8FYtzuyjN3aX7OQCFbKx6QiWtgB322mgMJy7jWDKkqrMbZCF5YROPvlktMkztnfpllXuJQ+TlX0UaELuAPhjyKGLFSX+JT/v4Ts8F1af9AI12YFFZnP3Vn5+ClCEQGTKQPtAyKRBZ61hQ1V/1zJVnV3XjwDyGqFAItQZvsbNf/H4Py9R2FlANHC62fx67L1yWkP6ikWt2eJS3zLzeIUxLvVxVhJ/bLiuKHXBPDrZLl 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: Converted function to use folios throughout. This is in preparation for the removal of find_get_pages_range_tag(). This change removes 8 calls to compound_head(), and the function now supports large folios. Signed-off-by: Vishal Moola (Oracle) Reviewed-by: Matthew Wilcow (Oracle) --- mm/page-writeback.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index ad608ef2a243..5d61fa9eecc0 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2398,15 +2398,15 @@ int write_cache_pages(struct address_space *mapping, int ret = 0; int done = 0; int error; - struct pagevec pvec; - int nr_pages; + struct folio_batch fbatch; + int nr_folios; pgoff_t index; pgoff_t end; /* Inclusive */ pgoff_t done_index; int range_whole = 0; xa_mark_t tag; - pagevec_init(&pvec); + folio_batch_init(&fbatch); if (wbc->range_cyclic) { index = mapping->writeback_index; /* prev offset */ end = -1; @@ -2426,17 +2426,18 @@ int write_cache_pages(struct address_space *mapping, while (!done && (index <= end)) { int i; - nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end, - tag); - if (nr_pages == 0) + nr_folios = filemap_get_folios_tag(mapping, &index, end, + tag, &fbatch); + + if (nr_folios == 0) break; - for (i = 0; i < nr_pages; i++) { - struct page *page = pvec.pages[i]; + for (i = 0; i < nr_folios; i++) { + struct folio *folio = fbatch.folios[i]; - done_index = page->index; + done_index = folio->index; - lock_page(page); + folio_lock(folio); /* * Page truncated or invalidated. We can freely skip it @@ -2446,30 +2447,30 @@ int write_cache_pages(struct address_space *mapping, * even if there is now a new, dirty page at the same * pagecache address. */ - if (unlikely(page->mapping != mapping)) { + if (unlikely(folio->mapping != mapping)) { continue_unlock: - unlock_page(page); + folio_unlock(folio); continue; } - if (!PageDirty(page)) { + if (!folio_test_dirty(folio)) { /* someone wrote it for us */ goto continue_unlock; } - if (PageWriteback(page)) { + if (folio_test_writeback(folio)) { if (wbc->sync_mode != WB_SYNC_NONE) - wait_on_page_writeback(page); + folio_wait_writeback(folio); else goto continue_unlock; } - BUG_ON(PageWriteback(page)); - if (!clear_page_dirty_for_io(page)) + BUG_ON(folio_test_writeback(folio)); + if (!folio_clear_dirty_for_io(folio)) goto continue_unlock; trace_wbc_writepage(wbc, inode_to_bdi(mapping->host)); - error = (*writepage)(page, wbc, data); + error = writepage(&folio->page, wbc, data); if (unlikely(error)) { /* * Handle errors according to the type of @@ -2484,11 +2485,12 @@ int write_cache_pages(struct address_space *mapping, * the first error. */ if (error == AOP_WRITEPAGE_ACTIVATE) { - unlock_page(page); + folio_unlock(folio); error = 0; } else if (wbc->sync_mode != WB_SYNC_ALL) { ret = error; - done_index = page->index + 1; + done_index = folio->index + + folio_nr_pages(folio); done = 1; break; } @@ -2508,7 +2510,7 @@ int write_cache_pages(struct address_space *mapping, break; } } - pagevec_release(&pvec); + folio_batch_release(&fbatch); cond_resched(); } -- 2.38.1