From: "tip-bot2 for Kirill A. Shutemov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Ingo Molnar <mingo@kernel.org>, Juergen Gross <jgross@suse.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/merge] x86/paravirt: Restrict PARAVIRT_XXL to 64-bit only
Date: Sat, 17 May 2025 13:00:36 -0000 [thread overview]
Message-ID: <174748683623.406.17252580515305855537.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250516123306.3812286-5-kirill.shutemov@linux.intel.com>
The following commit has been merged into the x86/merge branch of tip:
Commit-ID: 09230b7554824c9db1712324efcf3595c67fd326
Gitweb: https://git.kernel.org/tip/09230b7554824c9db1712324efcf3595c67fd326
Author: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
AuthorDate: Fri, 16 May 2025 15:33:06 +03:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Sat, 17 May 2025 10:38:29 +02:00
x86/paravirt: Restrict PARAVIRT_XXL to 64-bit only
PARAVIRT_XXL is exclusively utilized by XEN_PV, which is only compatible
with 64-bit machines.
Clearly designate PARAVIRT_XXL as 64-bit only and remove ifdefs to
support CONFIG_PGTABLE_LEVELS < 5.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Juergen Gross <jgross@suse.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250516123306.3812286-5-kirill.shutemov@linux.intel.com
---
arch/x86/Kconfig | 1 +
arch/x86/include/asm/paravirt.h | 4 ----
arch/x86/include/asm/paravirt_types.h | 2 --
arch/x86/kernel/paravirt.c | 2 --
4 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index bae3e97..121f9f0 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -799,6 +799,7 @@ config PARAVIRT
config PARAVIRT_XXL
bool
+ depends on X86_64
config PARAVIRT_DEBUG
bool "paravirt-ops debugging"
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 03f680d..b5e59a7 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -463,8 +463,6 @@ static inline void set_p4d(p4d_t *p4dp, p4d_t p4d)
PVOP_VCALL2(mmu.set_p4d, p4dp, val);
}
-#if CONFIG_PGTABLE_LEVELS >= 5
-
static inline p4d_t __p4d(p4dval_t val)
{
p4dval_t ret = PVOP_ALT_CALLEE1(p4dval_t, mmu.make_p4d, val,
@@ -496,8 +494,6 @@ static inline void __set_pgd(pgd_t *pgdp, pgd_t pgd)
set_pgd(pgdp, native_make_pgd(0)); \
} while (0)
-#endif /* CONFIG_PGTABLE_LEVELS == 5 */
-
static inline void p4d_clear(p4d_t *p4dp)
{
set_p4d(p4dp, native_make_p4d(0));
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
index b08b9d3..37a8627 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -189,12 +189,10 @@ struct pv_mmu_ops {
void (*set_p4d)(p4d_t *p4dp, p4d_t p4dval);
-#if CONFIG_PGTABLE_LEVELS >= 5
struct paravirt_callee_save p4d_val;
struct paravirt_callee_save make_p4d;
void (*set_pgd)(pgd_t *pgdp, pgd_t pgdval);
-#endif /* CONFIG_PGTABLE_LEVELS >= 5 */
struct pv_lazy_ops lazy_mode;
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index 015bf29..ab3e172 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -211,12 +211,10 @@ struct paravirt_patch_template pv_ops = {
.mmu.set_p4d = native_set_p4d,
-#if CONFIG_PGTABLE_LEVELS >= 5
.mmu.p4d_val = PTE_IDENT,
.mmu.make_p4d = PTE_IDENT,
.mmu.set_pgd = native_set_pgd,
-#endif /* CONFIG_PGTABLE_LEVELS >= 5 */
.mmu.pte_val = PTE_IDENT,
.mmu.pgd_val = PTE_IDENT,
next prev parent reply other threads:[~2025-05-17 13:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-16 12:33 [PATCHv3 0/4] x86: Make 5-level paging support unconditional for x86-64 Kirill A. Shutemov
2025-05-16 12:33 ` [PATCHv3 1/4] x86/64/mm: Always use dynamic memory layout Kirill A. Shutemov
2025-05-16 13:44 ` [tip: x86/core] x86/mm/64: " tip-bot2 for Kirill A. Shutemov
2025-05-17 13:00 ` [tip: x86/merge] " tip-bot2 for Kirill A. Shutemov
2025-05-16 12:33 ` [PATCHv3 2/4] x86/64/mm: Make SPARSEMEM_VMEMMAP the only memory model Kirill A. Shutemov
2025-05-16 13:42 ` Dave Hansen
2025-05-16 13:45 ` Ingo Molnar
2025-05-16 14:59 ` Dave Hansen
2025-05-16 15:08 ` Dave Hansen
2025-05-16 14:01 ` Kirill A. Shutemov
2025-05-16 14:08 ` Ingo Molnar
2025-05-16 15:03 ` Dave Hansen
2025-05-16 15:35 ` Ingo Molnar
2025-05-16 15:46 ` Dave Hansen
2025-05-16 18:28 ` H. Peter Anvin
2025-05-16 15:01 ` Dave Hansen
2025-05-16 13:44 ` [tip: x86/core] x86/mm/64: " tip-bot2 for Kirill A. Shutemov
2025-05-17 13:00 ` [tip: x86/merge] " tip-bot2 for Kirill A. Shutemov
2025-05-16 12:33 ` [PATCHv3 3/4] x86/64/mm: Make 5-level paging support unconditional Kirill A. Shutemov
2025-05-17 13:00 ` [tip: x86/merge] x86/mm/64: " tip-bot2 for Kirill A. Shutemov
2025-05-16 12:33 ` [PATCHv3 4/4] x86/paravirt: Restrict PARAVIRT_XXL to 64-bit only Kirill A. Shutemov
2025-05-16 12:43 ` Jürgen Groß
2025-05-17 13:00 ` tip-bot2 for Kirill A. Shutemov [this message]
2025-05-16 13:11 ` [PATCHv3 0/4] x86: Make 5-level paging support unconditional for x86-64 Ingo Molnar
2025-05-16 13:17 ` Kirill A. Shutemov
2025-05-17 9:59 ` Borislav Petkov
2025-06-24 8:23 ` [PATCHv2 0/3] " Khalid Ali
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=174748683623.406.17252580515305855537.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®