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 AEB2DCD1296 for ; Wed, 3 Apr 2024 17:18:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E6FC6B0099; Wed, 3 Apr 2024 13:18:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9487B6B009D; Wed, 3 Apr 2024 13:18:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6B5C56B0099; Wed, 3 Apr 2024 13:18:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3402F6B0099 for ; Wed, 3 Apr 2024 13:18:43 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 02C0CA0151 for ; Wed, 3 Apr 2024 17:18:42 +0000 (UTC) X-FDA: 81968880126.06.8F6EB81 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf17.hostedemail.com (Postfix) with ESMTP id 5433340009 for ; Wed, 3 Apr 2024 17:18:41 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=sZY+VDSA; spf=none (imf17.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712164721; 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=VuP5gd2sA9vxTWVYtUESUcgC7oJmv673ALpV7qT1AUs=; b=WFVTeeYmPecK3M//x4uehTIE5NYhP1aywS9zZuza6j//al1qhamJy3CUrTR3XkfcuKinf3 JHWb2ee64xUQEJ1cXm+kOUcJ2r/f2EyCRR9YgEL33fSzbMbaKSHkB0xoj4borexGrD/SPY Bc66dYrUhwPo3nRKbkznaVgR961xf1w= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712164721; a=rsa-sha256; cv=none; b=h40z56AFqfMK1rPeI2sAyR1Y8sRD4YbK7NqSI23MMu0s3NSzw2mWT5iDDVFAh+sP3VBOcb Vvg+9+Dpr2T4aXJlDglnDkUaM8c8KVHMvzxfvMJjmJ1vveZVVtzl74ke54kelj2tj7K3+n Uun8DLZ2bq43wnlVAAxKYXf4x52qFIs= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=sZY+VDSA; spf=none (imf17.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=VuP5gd2sA9vxTWVYtUESUcgC7oJmv673ALpV7qT1AUs=; b=sZY+VDSA1XSnys54nuVVvWH30u qmDkWSWKFn35d2FG7fya97BqSb1kLhPtcVJFXeL9gcB+G2xEgUu1lKc9OJe9QVItvgXqDxfg97kGW l57E1rO9TGblZMpG7zbUvStWdR66Rueq68MuPNYgF/p1Tu7oFQVEkh9GP9/8+biXMRg30o0iAv/3U BAfYvsJfHY5TOt5SWrb09QfLfg9Z/0xxXjGt452Wg1IGKZuLWseLEMmGcYOvRJhw06/GkHR3D28mP sJ31qg/PytDsoHaiOtDwTeZThmoTzwBRl4kpQdt4DQnNmKJyGvLFgCK7UgH79gc6y6rvJFFAAh5GZ SPyOb0NQ==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rs4G0-0000000649E-0In2; Wed, 03 Apr 2024 17:18:40 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 7/7] khugepaged: Use a folio throughout hpage_collapse_scan_file() Date: Wed, 3 Apr 2024 18:18:36 +0100 Message-ID: <20240403171838.1445826-8-willy@infradead.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403171838.1445826-1-willy@infradead.org> References: <20240403171838.1445826-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5433340009 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: fgt5akjraxuq7x8fe5op7gyr8kgqgq6e X-HE-Tag: 1712164721-373400 X-HE-Meta: U2FsdGVkX1+c72mZ8LF34AQHMhWVoWTRMstelQ73I/rxON9QwVNsrhyUTfH+RkqeNGAfRUouNWQR4D4PlNuWWvYFcwZbjknD4nkx4a7m9xclUhjacS1sWYXmJKka8rudn5atk37/Yr2lJj59SDFw9zXa/8c9IjoWMhUNW0JTwVA14n8qPxyUArYA5c4vel528pVof1szv+BTfBWpZnF5jcKiS2ht86hm1rHcYqpfUz0Efs/Ovp/KZSf3u9QlkGe00Fh1GnbVhBV+kZgzlQl/GLFHXtpW+rZLdk1epn/kJfAVV8MRH79dyHv32Yo6c/PaIT8gncFOHU7nkpvc3wZWaSTYS3tOHInZHcDIhoNv94hYcWzTGY5E3nwFpbYvgfKTicUG+IWyBuSed0CYW9rTERbXGrb/JkHqEHdLd0Sw7JQ/sc602cAiycUkD34LInFRLKEtmzp5M7W0RR/FETdSNbjeHVZm4jkXfO7+4CjZnEimM4lzeLJQGspgLoRVGL89JGB1Morov5/dpxPYKC7Txoa95aqXfrmEzJuiAtJNFZ6lwKZTJziSTxbGoANXp7XP8Fq9AdCM8CrjYB+Y/wR13Al5Q39LEoGb8LpSWYuGJ7SFfybZDSxB9m9sktNGdTwVJe+feCaAXDmfBCda8X9L5Rb+ja1ITKPr5qwKKy3b0J81NeGTIcjG47h3Zkfx+kMORxaM1N2PANv9Dm+nfc9Bj03qZqBnWxP4n63cg5ap9vpV8ACgFMFJn4L1DW3bFenE0CSLfoHLMELOyo1ksQS9sMNu28xA1clg0x6X7PPWBzQcYL0jlYjFMU54gZJCMNcOZUiS0KL41zFryFcxmIoKRhQxdQIG0wg9xNO69sJ+8sU+jKWflRY6TB9Bg2kRZOMINGXSaIjOFZMaWBIRVFO7e15DCMycHSCwXjWHF01nbbaw6bK935as8GzXkS/y576NyMpRgm7Wkw1klWVM67Q zMn6pMv3 oF1kp+HIWzwDaaedUJ4q7cWpYm+flrlL2aRuBKLntdKFzcS/O6LdXCeb+QOFETm0xugeSHfoYjKTbFblOLD6ByK2mGz83AmqdmBlusjx7CMeeJ7Srqdue75LSidj5N/7jm87ULwcOrEIQT/QZ40LBLlLmpAHl+GYu6sKtXyiaE13feMqQ4yOsYTscE6jT+uLYVfvv28JQoJ76HMRhSS7KqgDpKkDCww/lebcJ58FMUos0h7fJRg3BkYZL/ZhSdL4Y+tqgp3ZbtmKpR3/GpG4YxmwdHQ== 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: List-Subscribe: List-Unsubscribe: Replace the use of pages with folios. Saves a few calls to compound_head() and removes some uses of obsolete functions. Signed-off-by: Matthew Wilcox (Oracle) --- include/trace/events/huge_memory.h | 6 +++--- mm/khugepaged.c | 33 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h index dc6eeef2d3da..ab576898a126 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -174,10 +174,10 @@ TRACE_EVENT(mm_collapse_huge_page_swapin, TRACE_EVENT(mm_khugepaged_scan_file, - TP_PROTO(struct mm_struct *mm, struct page *page, struct file *file, + TP_PROTO(struct mm_struct *mm, struct folio *folio, struct file *file, int present, int swap, int result), - TP_ARGS(mm, page, file, present, swap, result), + TP_ARGS(mm, folio, file, present, swap, result), TP_STRUCT__entry( __field(struct mm_struct *, mm) @@ -190,7 +190,7 @@ TRACE_EVENT(mm_khugepaged_scan_file, TP_fast_assign( __entry->mm = mm; - __entry->pfn = page ? page_to_pfn(page) : -1; + __entry->pfn = folio ? folio_pfn(folio) : -1; __assign_str(filename, file->f_path.dentry->d_iname); __entry->present = present; __entry->swap = swap; diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 0b0053fb30c0..ef2871aaeb43 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2203,7 +2203,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, struct file *file, pgoff_t start, struct collapse_control *cc) { - struct page *page = NULL; + struct folio *folio = NULL; struct address_space *mapping = file->f_mapping; XA_STATE(xas, &mapping->i_pages, start); int present, swap; @@ -2215,11 +2215,11 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, memset(cc->node_load, 0, sizeof(cc->node_load)); nodes_clear(cc->alloc_nmask); rcu_read_lock(); - xas_for_each(&xas, page, start + HPAGE_PMD_NR - 1) { - if (xas_retry(&xas, page)) + xas_for_each(&xas, folio, start + HPAGE_PMD_NR - 1) { + if (xas_retry(&xas, folio)) continue; - if (xa_is_value(page)) { + if (xa_is_value(folio)) { ++swap; if (cc->is_khugepaged && swap > khugepaged_max_ptes_swap) { @@ -2234,11 +2234,9 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, * TODO: khugepaged should compact smaller compound pages * into a PMD sized page */ - if (PageTransCompound(page)) { - struct page *head = compound_head(page); - - result = compound_order(head) == HPAGE_PMD_ORDER && - head->index == start + if (folio_test_large(folio)) { + result = folio_order(folio) == HPAGE_PMD_ORDER && + folio->index == start /* Maybe PMD-mapped */ ? SCAN_PTE_MAPPED_HUGEPAGE : SCAN_PAGE_COMPOUND; @@ -2251,28 +2249,29 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, break; } - node = page_to_nid(page); + node = folio_nid(folio); if (hpage_collapse_scan_abort(node, cc)) { result = SCAN_SCAN_ABORT; break; } cc->node_load[node]++; - if (!PageLRU(page)) { + if (!folio_test_lru(folio)) { result = SCAN_PAGE_LRU; break; } - if (page_count(page) != - 1 + page_mapcount(page) + page_has_private(page)) { + if (folio_ref_count(folio) != + 1 + folio_mapcount(folio) + folio_test_private(folio)) { result = SCAN_PAGE_COUNT; break; } /* - * We probably should check if the page is referenced here, but - * nobody would transfer pte_young() to PageReferenced() for us. - * And rmap walk here is just too costly... + * We probably should check if the folio is referenced + * here, but nobody would transfer pte_young() to + * folio_test_referenced() for us. And rmap walk here + * is just too costly... */ present++; @@ -2294,7 +2293,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, } } - trace_mm_khugepaged_scan_file(mm, page, file, present, swap, result); + trace_mm_khugepaged_scan_file(mm, folio, file, present, swap, result); return result; } #else -- 2.43.0