From patchwork Wed Dec 7 00:21:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13066425 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 8B3FBC4708D for ; Wed, 7 Dec 2022 00:22:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2718F8E0005; Tue, 6 Dec 2022 19:22:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1FA398E0001; Tue, 6 Dec 2022 19:22:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 04B818E0005; Tue, 6 Dec 2022 19:22:12 -0500 (EST) 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 E9D0F8E0001 for ; Tue, 6 Dec 2022 19:22:12 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C92A4405A5 for ; Wed, 7 Dec 2022 00:22:12 +0000 (UTC) X-FDA: 80213608104.28.C05E1DD Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf17.hostedemail.com (Postfix) with ESMTP id 6E1AB40008 for ; Wed, 7 Dec 2022 00:22:12 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=gBamaz4O; spf=pass (imf17.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.182 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=1670372532; a=rsa-sha256; cv=none; b=TnIlx+D53rkEr/9skXz4A8fx3Deq29KpRpblXQDAqmmlW1MpTzv91zcfX4CI32/13w5eO2 5XScsP415ur0gKA4yQBJvQ1mM04hntQ9NrYoFYJcpxZ8ZnHtw4pWWbOmkIAwSp7CHNhtFn O01b7E5XwazlEpRds9YBAlLlBRGd2lA= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=gBamaz4O; spf=pass (imf17.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.182 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=1670372532; 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=MoYl04wmxXLxezPOZ+70Ro47XrPK1TtSWHCWNCKBtck=; b=03JgCpINfe2QhIzhpa6wD6oXspRoDUFKFO0hWy55ErNjrmWfLaP63aezohw93vP+g5oc3j A4kca4wSpCHNMyCMXxjlMn87Erx1glCKYSOM6NnkBLdGNXkjSLmIP+AjGXpX6lHGjpFAT6 RoyPQIUgvlc7jm2xZRxpXHDbvSAL9+I= Received: by mail-pf1-f182.google.com with SMTP id 140so16076668pfz.6 for ; Tue, 06 Dec 2022 16:22:12 -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=MoYl04wmxXLxezPOZ+70Ro47XrPK1TtSWHCWNCKBtck=; b=gBamaz4OVaEVv9YnAytPCavKroW8kAh0EpjPfndUHawsWX+Te45e0LTcygfzxt8QE1 2SqiGRJcTWSCe+7cD3rFTWy6y+tYqHCvXgbJn+r4VQFX9HnuyvW8NZJ9lLFTWfnmkcmE MMe2xsoL8lhOPC+CRDfEqdjzr18ZgvwViZoUlSeR/Zo9B1Hp6uxR7DCzEGnBB8tYFU/Q 2AzyPIkz77tzkdOVaKf+MI5ugr+rsOEWFabgMLVJaRBaDHs2x7YAnjXbYL/4n9bexpZK YzC2T83N0X1QGW2u7NSK3lLFlSrooexvnhal3jwHDd5x9guBM1nkqYqdiQceIRsbYvYm D4Tw== 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=MoYl04wmxXLxezPOZ+70Ro47XrPK1TtSWHCWNCKBtck=; b=jjvRJH4eHByrqQ8cB1XA4NfgH5v+aTXK8bp2GApSGkf9nB7EKf27CH52tW/9MIKavo y4ZF4NTV91mdIWy9RvG+XMy9NO7wI49n/BWb4t8oo8bZrcGiGjq8+6+HeDGrmXJjlJQj izF2+DuRZAhVwX9ReIu9ERkpToi+ieux1kPeKQaZYv5/Rvq3Atl/f9DDQG81ev5X4TS/ r2vLWWv2wcueC0G9en1v5fIXQBxi2rF0Cbb+52ZQPO/16iDiVfRsb/kM7FGUp2AtUhO9 f7HMgDDN96/6BYoPe0mxqjiYlxvK8jrLH5ruqwyM7aMvY1Dm2mT+I/HPTT/JjfhsuEKf I74g== X-Gm-Message-State: ANoB5pmLpA1+UaGF6tjFJwLnBm945RA4/UigO1gSSdV1LAsbthbhWQRz Jt6r+XY7kkSVwGpEl2Gqn/bOZgRkBE0= X-Google-Smtp-Source: AA0mqf6EdiHewDQc4qwEXQ+ag0vm95jDVzDY/1oaMRvcZpUYxt8oTIUgeuu68qGZp6quL3u90D6TUA== X-Received: by 2002:a63:1464:0:b0:46a:f665:ed96 with SMTP id 36-20020a631464000000b0046af665ed96mr63031285pgu.486.1670372530940; Tue, 06 Dec 2022 16:22:10 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::2c6b]) by smtp.googlemail.com with ESMTPSA id i92-20020a17090a3de500b00218ec4ff0d4sm13369459pjc.6.2022.12.06.16.22.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Dec 2022 16:22:10 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: damon@lists.linux.dev, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, sj@kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH 1/3] madvise: Convert madvise_cold_or_pageout_pte_range() to use folios Date: Tue, 6 Dec 2022 16:21:56 -0800 Message-Id: <20221207002158.418789-2-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221207002158.418789-1-vishal.moola@gmail.com> References: <20221207002158.418789-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Spamd-Result: default: False [7.24 / 9.00]; SORBS_IRL_BL(3.00)[209.85.210.182:from]; R_MISSING_CHARSET(2.50)[]; SUSPICIOUS_RECIPS(1.50)[]; SUBJECT_HAS_UNDERSCORES(1.00)[]; BAYES_HAM(-0.86)[78.47%]; MIME_GOOD(-0.10)[text/plain]; BAD_REP_POLICIES(0.10)[]; RCVD_NO_TLS_LAST(0.10)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_RCPT(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; R_DKIM_ALLOW(0.00)[gmail.com:s=20210112]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; TO_DN_SOME(0.00)[]; TAGGED_FROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; RCVD_COUNT_THREE(0.00)[3]; ARC_NA(0.00)[]; DMARC_POLICY_ALLOW(0.00)[gmail.com,none]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; R_SPF_ALLOW(0.00)[+ip4:209.85.128.0/17:c]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 6E1AB40008 X-Rspamd-Server: rspam01 X-Stat-Signature: b9ckt6gxxe7ok3gb1jgbnaaekrxqb8bu X-HE-Tag: 1670372532-600833 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: This change removes a number of calls to compound_head(), and saves 1319 bytes of kernel text. Signed-off-by: Vishal Moola (Oracle) --- mm/madvise.c | 88 +++++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 2baa93ca2310..59bfc6c9c548 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -332,8 +332,9 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, struct vm_area_struct *vma = walk->vma; pte_t *orig_pte, *pte, ptent; spinlock_t *ptl; + struct folio *folio = NULL; struct page *page = NULL; - LIST_HEAD(page_list); + LIST_HEAD(folio_list); if (fatal_signal_pending(current)) return -EINTR; @@ -358,23 +359,23 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, goto huge_unlock; } - page = pmd_page(orig_pmd); + folio = pfn_folio(pmd_pfn(orig_pmd)); - /* Do not interfere with other mappings of this page */ - if (page_mapcount(page) != 1) + /* Do not interfere with other mappings of this folio */ + if (folio_mapcount(folio) != 1) goto huge_unlock; if (next - addr != HPAGE_PMD_SIZE) { int err; - get_page(page); + folio_get(folio); spin_unlock(ptl); - lock_page(page); - err = split_huge_page(page); - unlock_page(page); - put_page(page); + folio_lock(folio); + err = split_folio(folio); + folio_unlock(folio); + folio_put(folio); if (!err) - goto regular_page; + goto regular_folio; return 0; } @@ -386,25 +387,25 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, tlb_remove_pmd_tlb_entry(tlb, pmd, addr); } - ClearPageReferenced(page); - test_and_clear_page_young(page); + folio_clear_referenced(folio); + folio_test_clear_young(folio); if (pageout) { - if (!isolate_lru_page(page)) { - if (PageUnevictable(page)) - putback_lru_page(page); + if (!folio_isolate_lru(folio)) { + if (folio_test_unevictable(folio)) + folio_putback_lru(folio); else - list_add(&page->lru, &page_list); + list_add(&folio->lru, &folio_list); } } else - deactivate_page(page); + deactivate_page(&folio->page); huge_unlock: spin_unlock(ptl); if (pageout) - reclaim_pages(&page_list); + reclaim_pages(&folio_list); return 0; } -regular_page: +regular_folio: if (pmd_trans_unstable(pmd)) return 0; #endif @@ -424,28 +425,29 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, page = vm_normal_page(vma, addr, ptent); if (!page || is_zone_device_page(page)) continue; + folio = page_folio(page); /* * Creating a THP page is expensive so split it only if we * are sure it's worth. Split it if we are only owner. */ - if (PageTransCompound(page)) { - if (page_mapcount(page) != 1) + if (folio_test_large(folio)) { + if (folio_mapcount(folio) != 1) break; - get_page(page); - if (!trylock_page(page)) { - put_page(page); + folio_get(folio); + if (!folio_trylock(folio)) { + folio_put(folio); break; } pte_unmap_unlock(orig_pte, ptl); - if (split_huge_page(page)) { - unlock_page(page); - put_page(page); + if (split_folio(folio)) { + folio_unlock(folio); + folio_put(folio); orig_pte = pte_offset_map_lock(mm, pmd, addr, &ptl); break; } - unlock_page(page); - put_page(page); + folio_unlock(folio); + folio_put(folio); orig_pte = pte = pte_offset_map_lock(mm, pmd, addr, &ptl); pte--; addr -= PAGE_SIZE; @@ -453,13 +455,13 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, } /* - * Do not interfere with other mappings of this page and - * non-LRU page. + * Do not interfere with other mappings of this folio and + * non-LRU folio. */ - if (!PageLRU(page) || page_mapcount(page) != 1) + if (!folio_test_lru(folio)) continue; - VM_BUG_ON_PAGE(PageTransCompound(page), page); + VM_BUG_ON_PAGE(folio_test_large(folio), folio); if (pte_young(ptent)) { ptent = ptep_get_and_clear_full(mm, addr, pte, @@ -470,28 +472,28 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, } /* - * We are deactivating a page for accelerating reclaiming. - * VM couldn't reclaim the page unless we clear PG_young. + * We are deactivating a folio for accelerating reclaiming. + * VM couldn't reclaim the folio unless we clear PG_young. * As a side effect, it makes confuse idle-page tracking * because they will miss recent referenced history. */ - ClearPageReferenced(page); - test_and_clear_page_young(page); + folio_clear_referenced(folio); + folio_test_clear_young(folio); if (pageout) { - if (!isolate_lru_page(page)) { - if (PageUnevictable(page)) - putback_lru_page(page); + if (!folio_isolate_lru(folio)) { + if (folio_test_unevictable(folio)) + folio_putback_lru(folio); else - list_add(&page->lru, &page_list); + list_add(&folio->lru, &folio_list); } } else - deactivate_page(page); + deactivate_page(&folio->page); } arch_leave_lazy_mmu_mode(); pte_unmap_unlock(orig_pte, ptl); if (pageout) - reclaim_pages(&page_list); + reclaim_pages(&folio_list); cond_resched(); return 0;