From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A19F53DB63F; Thu, 25 Jun 2026 11:30:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782387041; cv=none; b=JU0HNPR7QFZXi4DBuNARWy1X88llFPTmbXn6MS8T78+bTpee+wdXycEGlYKy8evRvV8YAZcUMwpuG6k9O9wJORfC/oJZ1JtpYW/FAUShsmSLnL7II315zk7sWepu5CSvcFiHi/U6tZgCIKPmYebfY5RdtiDSHPRq7N4lj7fOKMo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782387041; c=relaxed/simple; bh=JOkyYoKGZVws+y2+vmN9YpBtKEwEn/j5yavI9jEFAmE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cb+eieWtRGCK6CmtGQWj2pWxQHnD1yLC1jAu/Y5dFyycrDiuUjGez6U6B0xhj5DSx0xHsubeE/oNekDwkmjmLoGJUCJxF07OnYDvvho+9aJ2gLO/VvJkTaKqIHKCd5RjMAjzqDs0VrIfDFN2WwUNEUA1TC/LoW0HL6z0//Y+dPc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=HRZxSSoC; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="HRZxSSoC" 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 4547232AD; Thu, 25 Jun 2026 04:30:34 -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 E0F3A3F62B; Thu, 25 Jun 2026 04:30:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1782387038; bh=JOkyYoKGZVws+y2+vmN9YpBtKEwEn/j5yavI9jEFAmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HRZxSSoCdsFKyHQSKFqPXzo5e1bfb1d0NEPHf3RMNJajp0QYStiKg/Vgbi2YEH6yW ZlKHPkn3b0tpmJUQ2jnPfVaAexLjTsDpyaSxTnzsHtlNzCSyzg7/zrcXoAXYy+aJy0 IYrPDR1Ax3981AssSUlNsanBGRqoHg66FQ/kJPuI= 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, rcampbell@nvidia.com, apopple@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, mel@csn.ul.ie, nao.horiguchi@gmail.com, ak@linux.intel.com, j-nomura@ce.jp.nec.com, pfalcato@suse.de, dave.hansen@intel.com, tglx@kernel.org, jpoimboe@kernel.org, ryan.roberts@arm.com, anshuman.khandual@arm.com, stable@vger.kernel.org Subject: [PATCH 3/5] mm/migrate: use huge_ptep_get() in remove_migration_pte() Date: Thu, 25 Jun 2026 11:29:52 +0000 Message-ID: <20260625112955.3254283-4-dev.jain@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260625112955.3254283-1-dev.jain@arm.com> References: <20260625112955.3254283-1-dev.jain@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit remove_migration_pte() converts migration entries back to present PTEs after folio migration completes. For hugetlb folios, page_vma_mapped_walk() returns the pte pointer to the hugetlb folio in pvmw.pte, but the code reads it 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. Fixes: 290408d4a250 ("hugetlb: hugepage migration core") Cc: stable@vger.kernel.org Signed-off-by: Dev Jain --- mm/migrate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mm/migrate.c b/mm/migrate.c index d9b23909d716c..c65f0f43df7eb 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -371,7 +371,11 @@ static bool remove_migration_pte(struct folio *folio, continue; } #endif - old_pte = ptep_get(pvmw.pte); + if (folio_test_hugetlb(folio)) + old_pte = huge_ptep_get(vma->vm_mm, pvmw.address, + pvmw.pte); + else + old_pte = ptep_get(pvmw.pte); if (rmap_walk_arg->map_unused_to_zeropage && try_to_map_unused_to_zeropage(&pvmw, folio, old_pte, idx)) continue; -- 2.43.0