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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2C5EBC43458 for ; Fri, 3 Jul 2026 11:43:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=SWBD+9qQtzjkzS2vxK4tZ/6Te1U+xHeFS85kjLJ6Phk=; b=yEMyFS+lXAOVDFTSvgQgMkUb9l vOeCoLGM3MOpBCFa4p73vJ4zy3p6YfBo6T7PpZEOsx52NfPdiLBJD08A+qtgufYb8g7X/RUbakfJk tX+ZmltGi1bBy6BaSuHdMuisPaII9CWmJwVC0fiefVj8Z9n7HUjq4jJrbMu/N5d/y5i6rDCYbWphG 85jfXsP2js2OCDVtuL08eYPmw/nosoXPyoOZ9ex1J3iNbDgvTcUAXly9lQLObokbmtNOeqbtXd2gN /74UaacmdUnfbiUfwwZlvL8KHpyjDVpapjhYr9c7X182ZLoLdBtpvuverqIEHoofKJZYRJKFyHl8Z bvmJhVXA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wfcIM-00000006pcG-0I9v; Fri, 03 Jul 2026 11:42:58 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wfcIJ-00000006pax-2e94 for linux-arm-kernel@lists.infradead.org; Fri, 03 Jul 2026 11:42:56 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B647C361C; Fri, 3 Jul 2026 04:42:49 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-01.blr.arm.com (cesw-amp-gbt-1s-m12830-01.blr.arm.com [10.164.195.31]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 934E83FAA1; Fri, 3 Jul 2026 04:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1783078974; bh=h1IY5vXGtS5qm0GLFc9NhQBQjfsdy191rN1Uth+Oiss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k2n+xkzcwCyd3J/xSa4zKVaUpOHOy35BxeWEYAFbGOCKUM0tXaNOstPt5Q76BSk3n yjtzVV2etNN40/5idIaXRjsy/phcdoOXCHriXGcjm3ZFmeV1EARux/ZHb42t7GgVAC OzlyxC0kw2XvxGBk6gm4fmcJpkt6Hip6x3aoeeAQ= From: Dev Jain To: muchun.song@linux.dev, osalvador@suse.de, akpm@linux-foundation.org, ljs@kernel.org, david@kernel.org, liam@infradead.org Cc: Dev Jain , riel@surriel.com, vbabka@kernel.org, harry@kernel.org, jannh@google.com, lance.yang@linux.dev, kas@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, apopple@nvidia.com, rcampbell@nvidia.com, ziy@nvidia.com, matthew.brost@intel.com, joshua.hahnjy@gmail.com, rakie.kim@sk.com, byungchul@sk.com, gourry@gourry.net, ying.huang@linux.alibaba.com, ak@linux.intel.com, nao.horiguchi@gmail.com, mel@csn.ul.ie, j-nomura@ce.jp.nec.com, pfalcato@suse.de, tglx@kernel.org, dave.hansen@intel.com, jpoimboe@kernel.org, catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, ryan.roberts@arm.com, anshuman.khandual@arm.com, stable@vger.kernel.org Subject: [PATCH v3 3/6] mm/rmap: use huge_ptep_get() in try_to_migrate_one() Date: Fri, 3 Jul 2026 11:41:56 +0000 Message-ID: <20260703114202.365553-4-dev.jain@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260703114202.365553-1-dev.jain@arm.com> References: <20260703114202.365553-1-dev.jain@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260703_044255_761957_A29B02C4 X-CRM114-Status: GOOD ( 11.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org try_to_migrate_one() is used by folio migration to replace a present mapping with a migration entry. For hugetlb folios, page_vma_mapped_walk() returns the pte pointer to the hugetlb folio in pvmw.pte, but the code reads the huge pte entry with ptep_get(). On arches which provide their own huge_ptep_get() to dereference a huge pte pointer, accessing via ptep_get() would cause pte_pfn(), pte_present() etc to misbehave. It is not clear whether this has a trivially visible effect to userspace. Use huge_ptep_get() to dereference a huge pte pointer. Commit a98a2f0c8ce1 copied the bug from try_to_unmap_one into try_to_migrate_one. Fixes: a98a2f0c8ce1 ("mm/rmap: split migration into its own function") Cc: stable@vger.kernel.org Acked-by: Muchun Song Signed-off-by: Dev Jain --- mm/rmap.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 03737daa348c0..ea4ad5e662f7d 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -2505,14 +2505,19 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, /* Unexpected PMD-mapped THP? */ VM_BUG_ON_FOLIO(!pvmw.pte, folio); - /* - * Handle PFN swap PTEs, such as device-exclusive ones, that - * actually map pages. - */ - pteval = ptep_get(pvmw.pte); + address = pvmw.address; + if (folio_test_hugetlb(folio)) { + pteval = huge_ptep_get(mm, address, pvmw.pte); + } else { + pteval = ptep_get(pvmw.pte); + } if (likely(pte_present(pteval))) { pfn = pte_pfn(pteval); } else { + /* + * Handle PFN swap PTEs, such as device-exclusive ones, + * that actually map pages. + */ const softleaf_t entry = softleaf_from_pte(pteval); pfn = softleaf_to_pfn(entry); @@ -2520,7 +2525,6 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, } subpage = folio_page(folio, pfn - folio_pfn(folio)); - address = pvmw.address; anon_exclusive = folio_test_anon(folio) && PageAnonExclusive(subpage); -- 2.43.0