From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 408BF1F5E6; Tue, 3 Jun 2025 11:14:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748949296; cv=none; b=PMwTjCaMoHUr4/yWFTlXxES+4X4x/BO6IhIAMDEBQUyPfdD6h9dxLV3WnF1Cr8HBmJ3LLzfSNMcVX0gkuo67z2iYvxOzWjfvrw4Er/uE7fEKjus2UCZCRDRA5VOHG6P6zfayeEoPh75GYjkxKtS32708J9uIGY/lpVftYPMZJGI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748949296; c=relaxed/simple; bh=gHKElpoPrd324hZcX9bxb2VBNfY2GsZI2oRiWvUVO/Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RBEvH8Qcd1piL6t6WL9Bto8iNky77JfzevPcYgS8E+qljZHFHHAmswPIxyLJJqVfKQ+cZSXnorN6UzGxRvJWXD8RNMhcBYixMFt2dPQqSibP4hvx4zRcKnHvu7T50bF/VQsoShGyhLE42qidB0zoqS4gfDvhaBSVDqfCpjU1ajU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OXPp91vy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OXPp91vy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08C12C4CEEF; Tue, 3 Jun 2025 11:14:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1748949295; bh=gHKElpoPrd324hZcX9bxb2VBNfY2GsZI2oRiWvUVO/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OXPp91vyQ+gAIZoYMlwHZHEyTpt0yE1jYgax77HwjOmFYf8K26LX3sS6WBoykeaez nrz/J9ZN1ovjh8pe1t54fRn0yrHYl0UhOAWF7iTbtSgyr5+exYjkiIq6ZtT+9gPkxx el4UZJ7icBLEF5p75+bbKnkRgLEuANfg+/5jsQGGSwHhB2cJSAH9hFGouf8FEImWJM 4X9tqFviV+cP/giDXDfaE7oOgGL1CtZhtpSl6RSjqx+fBymKMP33RaKwHv1TPcdhQa rmrkdZMAaT22dO6147aoR7sr9jhyAjiN70E7u/RABsMbla5JHiZY0FpjHHRvPminCt FSyPEziW72b/w== From: Mike Rapoport To: Peter Zijlstra Cc: Borislav Petkov , Dave Hansen , Ingo Molnar , =?UTF-8?q?J=FCrgen=20Gro=DF?= , Mike Rapoport , "H. Peter Anvin" , Thomas Gleixner , Xin Li , linux-kernel@vger.kernel.org, stable@vger.kernel.org, x86@kernel.org Subject: [PATCH 1/5] x86/mm/pat: don't collapse pages without PSE set Date: Tue, 3 Jun 2025 14:14:41 +0300 Message-ID: <20250603111446.2609381-2-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250603111446.2609381-1-rppt@kernel.org> References: <20250603111446.2609381-1-rppt@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Juergen Gross Collapsing pages to a leaf PMD or PUD should be done only if X86_FEATURE_PSE is available, which is not the case when running e.g. as a Xen PV guest. Cc: stable@vger.kernel.org Fixes: 41d88484c71c ("x86/mm/pat: restore large ROX pages after fragmentation") Signed-off-by: Juergen Gross Link: https://lore.kernel.org/r/20250528123557.12847-3-jgross@suse.com Signed-off-by: Mike Rapoport (Microsoft) --- arch/x86/mm/pat/set_memory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index def3d9284254..9292f835cf5a 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -1257,6 +1257,9 @@ static int collapse_pmd_page(pmd_t *pmd, unsigned long addr, pgprot_t pgprot; int i = 0; + if (!cpu_feature_enabled(X86_FEATURE_PSE)) + return 0; + addr &= PMD_MASK; pte = pte_offset_kernel(pmd, addr); first = *pte; -- 2.47.2