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 4D7DFC4332F for ; Wed, 21 Dec 2022 18:10:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C2F998E0003; Wed, 21 Dec 2022 13:10:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BDEF88E0001; Wed, 21 Dec 2022 13:10:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9E8598E0006; Wed, 21 Dec 2022 13:10:03 -0500 (EST) 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 79CD18E0003 for ; Wed, 21 Dec 2022 13:10:03 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 2726FA07CB for ; Wed, 21 Dec 2022 18:10:03 +0000 (UTC) X-FDA: 80267102286.08.9CCA562 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf05.hostedemail.com (Postfix) with ESMTP id 4E65F10002A for ; Wed, 21 Dec 2022 18:10:01 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=idgtJWZU; spf=pass (imf05.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.47 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=1671646201; 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=V90+BfZtK1slvLn1n1Jx1RIzI90mSXqsrWzPZLU3PF8=; b=CXXXHp91QYDbVItisGUHUQDNoQNyUNHKcIu5VyOA1Yi2ENAwNaLHaRdHWVJX1ryGKNCA7t UCT6/4PIGkLdPBxtimEu/meqdVrDaNBRU2VI8K/hnDWXR35jqKhA8Ld8YQ/L5PtzGScH2E 4Xpad/YfHPMUVLgV9NPA1PTE2zP10ws= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=idgtJWZU; spf=pass (imf05.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.47 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=1671646201; a=rsa-sha256; cv=none; b=kP/l8K9j0rqQNEruZ+JcZHc3+fWCIYT4SA4Hb1uoheDZdvWf4+ogJPYJYGUOnY8TfcG+MW hGePibis+zmMzJFcBG5ZZv7sW7xdIYVJBsmMTIasdekczk1tOC0O56lu1NvTAFTfjfSOpc vKLCDTvc466JsvzMfhwneWQAs2190kI= Received: by mail-pj1-f47.google.com with SMTP id w4-20020a17090ac98400b002186f5d7a4cso3193072pjt.0 for ; Wed, 21 Dec 2022 10:10:00 -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=V90+BfZtK1slvLn1n1Jx1RIzI90mSXqsrWzPZLU3PF8=; b=idgtJWZU6cXL8auQ5suH1EAlK2iOZX3Y/jKu/mNOZua5+aWbsw51hqTcyRM4Nh2OOB lIKT1uam8nzXBWXebN9JokPLVjBrVByu9Zw/5eU+Wi3xiXKqxd07Q3LuIYo45eVOKasK mGNbB9QfNxPeTkWrUnEQBMDIarluZ7WItM3qk6RsVRp2ivxASFV4CgCjERRAFEW0++rt KRFaw31a5udcVll9o4BxJ1YkyovfEAOfGF3WzX3q/fZTyZDsiFwEocQbbwahXxpNA6Wz xFl1ImHFXxYf7psocCMqL7In5Jh/aghKIznStF2vEp7T0TREjVepbMTM0KjSrnzORygY +ZBQ== 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=V90+BfZtK1slvLn1n1Jx1RIzI90mSXqsrWzPZLU3PF8=; b=t/azLBtihbfDODLrj1frb2uhbrdLs89LVpSrvF+IvVuUMhvDqU3DvTPKhZoW3frKaU RgPE6cj1ZYwaqPd+MgjnSCG7C3yBfaZmWywfioVeFjcvKzLXORVyxZNA3Mdi/cweLK3y JDgpg5UnAV507cyngqxs31XB2tmNy1id9TuLca34vTHqLpU1XkAPgnMkZ4cy6wopJbFj 6d+PIbcqxSG2CvYFMdqIcn7C9ppX7e5wQm6TLePOcI8U4mnSl240NxUmhNyKVZqjBdAQ NjUpIczDqEDofwrtWa0obeCIdoIYirKytZeT7D0zsRHPX/yf3aYfaj6700MoeumjM3SU +mqA== X-Gm-Message-State: AFqh2krTcVDFk91rk0r+x/IM72DdgysMfOuAIZdfR9u4fCU/sFQkAZ9d 5HSPPQxdDjOOfzP687/AGXeEe8CneXcYKQ== X-Google-Smtp-Source: AMrXdXubRnPot5zpMhDyHPp0OTNzVi5od2gLZPVrt/vb+U6VUKCE5XuBc6Z5YFmHx3I3sJn0Vkn8+Q== X-Received: by 2002:a05:6a20:1a84:b0:a7:89fd:884c with SMTP id ci4-20020a056a201a8400b000a789fd884cmr3628709pzb.11.1671646199957; Wed, 21 Dec 2022 10:09:59 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::a55d]) by smtp.googlemail.com with ESMTPSA id e26-20020a63745a000000b00477bfac06b7sm10110732pgn.34.2022.12.21.10.09.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:09:59 -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, willy@infradead.org, "Vishal Moola (Oracle)" Subject: [PATCH v4 2/4] madvise: Convert madvise_cold_or_pageout_pte_range() to use folios Date: Wed, 21 Dec 2022 10:08:46 -0800 Message-Id: <20221221180848.20774-3-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180848.20774-1-vishal.moola@gmail.com> References: <20221221180848.20774-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4E65F10002A X-Rspam-User: X-Stat-Signature: bkhugiwi817xoz5j1a7tds4fi77cpopd X-HE-Tag: 1671646201-216709 X-HE-Meta: U2FsdGVkX19CP/KJ09FLCobh1QqbwBTZuH4+AXhNeFnGx9uKQ6BHRpMiWjoSWRmus788OPp0whNGQ/tEZ4kgNLQBmPzWIGRZKi3BK7Eo0ZuooRWR3EC/HadZY5Ix8QEjd/IObZSq8Xe1PsWRgYCIB3slb4A4HpWVZLj2wU8sCH3Uyj54R4flqOOnz8rhS8IDMWgrK9hvXMi3acIn5kJAl2VTO1MWDApH0O6yg9mjF2BwTm05RbcO+fhRPSUzvJ9UxCJ5i/0enaVCDiTJtV/W+3IUmmqZ6zGvVexBNCga73eHilwCN2yRaiRc6R2W+JDVAYu5D6g+GUHf7EHzVW3GueArQX88+kZrt2zjlk6fQiiAUIM4091tU9RpqZ4MZpyz/9un8r2jfuk+FPhW7CfuG9xF1Q5cjEr2/rlkyLUVTqyB9trnEFvLiScM/wlhtbwtRMOSBGTL2bItimBNq8AMLhJqLHwruYSQrQ8X1HDOjl/MgwVFlySJrbmlEls3sR2YdkkjxRyRWEA3I0/CPdYei715iokgJBZC3XSAPsBi0Gx+jDKP8Orpn/nPLrXStNZXeHlM3Tb6OG+AmTSxYeF1PwNbIl2H9JMT0Nfd2T9/Bn6YNST8niuL1rsyJFRPPviWlFeSFUOLvFRMpUhALgED6GLHugAf1zwYRCS+AZb2MkCSAqA13xLi+OX1m0j+v/UNEnvAXm3VgNVSMVKMP/JNZ7jaXSGM+Pz6d33kBGq5hDzyjLpul/Iz268EF/1Qa7hzAmlk7Mveq3Pd7B12IjtutOXzqUNVUpnpj3A/3QvCQIYGDpkXwXH1MurFmXl2xt+mLh64wX5QIXtQtGYF/Td8ydHMbC5j5f6HzVWSEMO/s1isf7CQ+IsTkHhv54gtQLDY3zfdS/j4v/pwLWIF7GPYrb8glObDS9OfihG6D1gOhpGrWOVDV+biYhvqymd3E2QlwJbOqtJ98s9DWtJhj7r XikhtRQT X+KkTQnXQx/HL3uxHbU84++MOswv20a6I0gvbn1csgvySuIIVlsU291KKWTimCI66dq9ur6bccR34S3xM3mGqZpOZXBvSdshX0q0DnxOnhTmlszNEZkos3/D6QIuMSXcxXRtOhzTPlUhuMQhh0Eh2e5j0A0RHqtTiyXPknLVzCZzQVaO5Kglpe9HtSFYbpW8F7SrUiPza/SZUNfT3YFOV/vBYkkNNabpLBCwMPj6ghemkoGCJtcksLOQabTI2tTYwcleI6QVp3/2D1/dmpTmSvIC21A== 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 1729 bytes of kernel text. Signed-off-by: Vishal Moola (Oracle) Reviewed-by: Matthew Wilcox (Oracle) --- mm/madvise.c | 98 ++++++++++++++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 7b7549a54a6d..851d977b9b03 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -345,8 +345,8 @@ 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 page *page = NULL; - LIST_HEAD(page_list); + struct folio *folio = NULL; + LIST_HEAD(folio_list); bool pageout_anon_only_filter; if (fatal_signal_pending(current)) @@ -375,26 +375,26 @@ 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 (pageout_anon_only_filter && !PageAnon(page)) + if (pageout_anon_only_filter && !folio_test_anon(folio)) 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; } @@ -406,25 +406,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 @@ -441,33 +441,33 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, if (!pte_present(ptent)) continue; - page = vm_normal_page(vma, addr, ptent); - if (!page || is_zone_device_page(page)) + folio = vm_normal_folio(vma, addr, ptent); + if (!folio || folio_is_zone_device(folio)) continue; /* * 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; - if (pageout_anon_only_filter && !PageAnon(page)) + if (pageout_anon_only_filter && !folio_test_anon(folio)) 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; @@ -475,16 +475,16 @@ 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) || folio_mapcount(folio) != 1) continue; - if (pageout_anon_only_filter && !PageAnon(page)) + if (pageout_anon_only_filter && !folio_test_anon(folio)) continue; - VM_BUG_ON_PAGE(PageTransCompound(page), page); + VM_BUG_ON_FOLIO(folio_test_large(folio), folio); if (pte_young(ptent)) { ptent = ptep_get_and_clear_full(mm, addr, pte, @@ -495,28 +495,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; -- 2.38.1