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 E2CCFC3ABC0 for ; Wed, 7 May 2025 09:26:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E04D6B0089; Wed, 7 May 2025 05:26:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 092006B008A; Wed, 7 May 2025 05:26:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9A7E6B0092; Wed, 7 May 2025 05:26:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C85CB6B0089 for ; Wed, 7 May 2025 05:26:24 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C1970CBFE7 for ; Wed, 7 May 2025 09:26:25 +0000 (UTC) X-FDA: 83415581130.01.C2870C2 Received: from out30-97.freemail.mail.aliyun.com (out30-97.freemail.mail.aliyun.com [115.124.30.97]) by imf22.hostedemail.com (Postfix) with ESMTP id E213EC0008 for ; Wed, 7 May 2025 09:26:22 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=REv6clKG; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf22.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746609983; a=rsa-sha256; cv=none; b=UjIuoeniLsywFVuNtxk24lF1t0B5c8ORZMXVbrmt9nzn9cC1YHU0THOfM0gfChHAuX7rEl LtKh1iCK/bPdbseSb/e6twSe6Z2108LEmtCNIIZLY0nbow6YSI/aB6k9ME3HhM55PLx/OC lM9u6HYufKn7aIFAjFYEe6i0KOqwUfw= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=REv6clKG; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf22.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746609983; 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=SPbYJw55rv/PzjxTaZakdI9TN7HDp9a+IFeGVFn/9gY=; b=uVB1sGsSMPVh/WOVgfMQid5dxEIUTmvCFLCmb3amr4Om70etRadVOz9kZ6Evf+Ntc+3rDd nJzRo6s4FZPSuc8VUNtWmcMKw54NUEAk8Gwkwbxx7Sr5WJprr+pleQlV1/5cC1UCBg/LqV 3/qooGwSNjarPujIh+d6nV3ZMrV83lI= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1746609980; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=SPbYJw55rv/PzjxTaZakdI9TN7HDp9a+IFeGVFn/9gY=; b=REv6clKGG2YqtPXg4mb86pSPH30WD1W+Apn/P9f6Okhmq1zSEllag8g2eyModyaCTO41/0d2pq4fP5ykFo1pDOvtZjozPV/MMKAyHrkcWE0RM6cdqbL/OY3zCECcnSjG9y9bvsj35UOi8XrgFvvNH3AkaAM0+MNec6vF/koQvsY= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WZopYX-_1746609978 cluster:ay36) by smtp.aliyun-inc.com; Wed, 07 May 2025 17:26:19 +0800 From: Baolin Wang To: akpm@linux-foundation.org, willy@infradead.org, david@redhat.com Cc: hannes@cmpxchg.org, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, npache@redhat.com, ryan.roberts@arm.com, dev.jain@arm.com, ziy@nvidia.com, vbabka@suse.cz, rppt@kernel.org, surenb@google.com, mhocko@suse.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] mm: convert do_set_pmd() to take a folio Date: Wed, 7 May 2025 17:26:13 +0800 Message-ID: X-Mailer: git-send-email 2.43.5 In-Reply-To: <8e33c8a65b46170dfd8ba6715d2115856a55b8f6.1746609191.git.baolin.wang@linux.alibaba.com> References: <8e33c8a65b46170dfd8ba6715d2115856a55b8f6.1746609191.git.baolin.wang@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: E213EC0008 X-Stat-Signature: 67bymjs8bitxgmnfhwwxqa514yxocfdu X-Rspam-User: X-HE-Tag: 1746609982-417958 X-HE-Meta: U2FsdGVkX1/s5pXYMA3pwaRslPH1IAmL7ZDTbIyWVvf1cg+h9mudW2Uxcln1VyFNI0J8EEnFlnT+Y7ivpeUMJ1OZ7JstqMvrGxsshnByS0D0G81Lo8Woo7/UGQGO4pqHf1cvLhEivPZ8rOxLlxlv3Fik0AE8TeiiHEDKd0ju/YZ7L9Uo3FZ6OPhBKPiJ4qo/yIwF+8jGBpm3EouMtkGlicRaaZhUDaHqJPYCBCepfl299Czukxnl7BQIkcNoVfROudJm+4cXA5Mq253DsYwxllG717S42e0LDi9zjsAcSCUcwyN3on5HGYLytQrc7r+BxeplDxlkp2YZAdbbAUfpk4dmGwRq4G11SLlVtF9vY4KtfDs4ZSWZkv7dn2PkRDn5yMjjL2RnvM+1rL7kpCvvm4UQXfN+cbW8G/Gcg4jaPSNASHIP59ydcnySb9mkNevEL2YQZndh4RG9U4trStJ8ioue/WEKHK9hcv6xQLTrvCrIetxhTbLDpuAyp2kiwIKlFoxfnI1AFEnHFdia8vgvwRH2TB1eChTL3FrJLfncdW3pcipVxqeYmFJHToAAPCQe9dzAwoMIW5//ml82whhrhpSGVOIGUovIpOBxvhRuSAx29kpPRjhfYviD67wWXY+ujDHG+dUk+fNbT/qIEUAxbsaSNp5QugQkTuxPNwM/AOgkZoYN1T6X/PO3NkQOIigwsGzZ97UzddPCa03abFxyQ+JUMroV5V2bRbp/PWG2uuy1QYPA37JcNvSsKT4frAWwhLpgjvq52E1UQ6Is76JxUTirc3NP4OxfnLugW7CcabwGQrhxapuovfVMiwDhsIsfX67+UNdPsU2Jrzod5sGQvSOgu+S1kWWTnQ68NffczHt9/WrGOhhdTta1n9z3oUtz+8relnRgt1Lb7Z3t4JHMtvegTZO//t1/TdnDhUXMF6TqLdD9Ni7g+Bbq/AwXhVZUHo3vPDzLUReAk4aPYkL OzLAA6YQ ghjtQ7yCy/qoRle0Isvr7x6FoUzZDLtTxpAo3J3pmMxa/40Qv300jC5R77KUWwfhfcU4jAkKrBTn23cmLWfPRFacjkQ4dYQgLWdauNJUFE5j77gQzjQgdORUapRrZOyvPSKylV9C7S++Jm8PAojU5nW35849I6KaxgD2byZSdblHiKCuKoLSAV2MACetb6ihlWDei8AZBSynwmCOYf3i/RyvNaDf/64j3ooIxQHOqVUSWWoPx8V2lehO3QsLgmPTRi43yVWPLwHTQtUgrOdLBeY6JuQ== 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: In do_set_pmd(), we always use the folio->page to build PMD mappings for the entire folio. Since all callers of do_set_pmd() already hold a stable folio, converting do_set_pmd() to take a folio is safe and more straightforward. Signed-off-by: Baolin Wang --- include/linux/mm.h | 2 +- mm/filemap.c | 3 +-- mm/khugepaged.c | 2 +- mm/memory.c | 12 ++++++------ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 43748c8f3454..e00d81b9eb2a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1237,7 +1237,7 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma) return pte; } -vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page); +vm_fault_t do_set_pmd(struct vm_fault *vmf, struct folio *folio); void set_pte_range(struct vm_fault *vmf, struct folio *folio, struct page *page, unsigned int nr, unsigned long addr); diff --git a/mm/filemap.c b/mm/filemap.c index 7b90cbeb4a1a..fbf8d7b76ab7 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3532,8 +3532,7 @@ static bool filemap_map_pmd(struct vm_fault *vmf, struct folio *folio, } if (pmd_none(*vmf->pmd) && folio_test_pmd_mappable(folio)) { - struct page *page = folio_file_page(folio, start); - vm_fault_t ret = do_set_pmd(vmf, page); + vm_fault_t ret = do_set_pmd(vmf, folio); if (!ret) { /* The page is mapped successfully, reference consumed. */ folio_unlock(folio); diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 0215ef6095d9..575a3384d046 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1479,7 +1479,7 @@ static int set_huge_pmd(struct vm_area_struct *vma, unsigned long addr, VM_BUG_ON(!folio_test_large(folio)); mmap_assert_locked(vma->vm_mm); - if (do_set_pmd(&vmf, &folio->page)) + if (do_set_pmd(&vmf, folio)) return SCAN_FAIL; folio_get(folio); diff --git a/mm/memory.c b/mm/memory.c index 68c1d962d0ad..0f5c8d8d59b0 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5176,14 +5176,14 @@ static void deposit_prealloc_pte(struct vm_fault *vmf) vmf->prealloc_pte = NULL; } -vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) +vm_fault_t do_set_pmd(struct vm_fault *vmf, struct folio *folio) { - struct folio *folio = page_folio(page); struct vm_area_struct *vma = vmf->vma; bool write = vmf->flags & FAULT_FLAG_WRITE; unsigned long haddr = vmf->address & HPAGE_PMD_MASK; pmd_t entry; vm_fault_t ret = VM_FAULT_FALLBACK; + struct page *page; /* * It is too late to allocate a small folio, we already have a large @@ -5251,7 +5251,7 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) return ret; } #else -vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) +vm_fault_t do_set_pmd(struct vm_fault *vmf, struct folio *folio) { return VM_FAULT_FALLBACK; } @@ -5345,6 +5345,7 @@ vm_fault_t finish_fault(struct vm_fault *vmf) else page = vmf->page; + folio = page_folio(page); /* * check even for read faults because we might have lost our CoWed * page @@ -5356,8 +5357,8 @@ vm_fault_t finish_fault(struct vm_fault *vmf) } if (pmd_none(*vmf->pmd)) { - if (PageTransCompound(page)) { - ret = do_set_pmd(vmf, page); + if (folio_test_pmd_mappable(folio)) { + ret = do_set_pmd(vmf, folio); if (ret != VM_FAULT_FALLBACK) return ret; } @@ -5368,7 +5369,6 @@ vm_fault_t finish_fault(struct vm_fault *vmf) return VM_FAULT_OOM; } - folio = page_folio(page); nr_pages = folio_nr_pages(folio); /* -- 2.43.5