paravirt: cleanup and reorg
Subsystems (24)
Juergen Gross
maintainerv5 cover paravirt: cleanup and reorg
Some cleanups and reorg of paravirt code and headers:
- The first 2 patches should be not controversial at all, as they remove just some no longer needed #include and struct forward declarations.
- The 3rd patch is removing CONFIG_PARAVIRT_DEBUG, which IMO has no real value, as it just changes a crash to a BUG() (the stack trace will basically be the same). As the maintainer of the main paravirt user (Xen) I have never seen this crash/BUG() to happen.
- The 4th patch is just a movement of code.
- I don't know for what reason asm/paravirt_api_clock.h was added, as all archs supporting it do it exactly in the same way. Patch 5 is removing it.
- Patches 6-14 are streamlining the paravirt clock interfaces by using a common implementation across architectures where possible and by moving the related code into common sched code, as this is where it should live.
- Patches 15-20 are more like RFC material preparing the paravirt infrastructure to support multiple pv_ops function arrays. As a prerequisite for that it makes life in objtool much easier with dropping the Xen static initializers of the pv_ops sub- structures, which is done in patches 15-17.
Patches 18-20 are doing the real preparations for multiple pv_ops arrays and using those arrays in multiple headers.
- Patch 21 is an example how the new scheme can look like using the PV-spinlocks.
Changes in V2:
- new patches 13-18 and 20
- complete rework of patch 21
Changes in V3:
- fixed 2 issues detected by kernel test robot
Changes in V4:
- fixed one build issue
Changes in V5:
- fixed another build issue
- rebase
Juergen Gross (21):
x86/paravirt: Remove not needed includes of paravirt.h x86/paravirt: Remove some unneeded struct declarations x86/paravirt: Remove PARAVIRT_DEBUG config option x86/paravirt: Move thunk macros to paravirt_types.h
paravirt: Remove asm/paravirt_api_clock.h
sched: Move clock related paravirt code to kernel/sched arm/paravirt: Use common code for paravirt_steal_clock() arm64/paravirt: Use common code for paravirt_steal_clock() loongarch/paravirt: Use common code for paravirt_steal_clock() riscv/paravirt: Use common code for paravirt_steal_clock() x86/paravirt: Use common code for paravirt_steal_clock() x86/paravirt: Move paravirt_sched_clock() related code into tsc.c x86/paravirt: Introduce new paravirt-base.h header x86/paravirt: Move pv_native_*() prototypes to paravirt.c x86/xen: Drop xen_irq_ops
x86/xen: Drop xen_cpu_ops
x86/xen: Drop xen_mmu_ops
objtool: Allow multiple pv_ops arrays
x86/paravirt: Allow pv-calls outside paravirt.h x86/paravirt: Specify pv_ops array in paravirt macros x86/pvlocks: Move paravirt spinlock functions into own header
arch/Kconfig | 3 + arch/arm/Kconfig | 1 + arch/arm/include/asm/paravirt.h | 22 -- arch/arm/include/asm/paravirt_api_clock.h | 1 - arch/arm/kernel/Makefile | 1 - arch/arm/kernel/paravirt.c | 23 -- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/paravirt.h | 14 - arch/arm64/include/asm/paravirt_api_clock.h | 1 - arch/arm64/kernel/paravirt.c | 11 +- arch/loongarch/Kconfig | 1 + arch/loongarch/include/asm/paravirt.h | 13 - .../include/asm/paravirt_api_clock.h | 1 - arch/loongarch/kernel/paravirt.c | 10 +- arch/powerpc/include/asm/paravirt.h | 3 - arch/powerpc/include/asm/paravirt_api_clock.h | 2 - arch/powerpc/platforms/pseries/setup.c | 4 +- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/paravirt.h | 14 - arch/riscv/include/asm/paravirt_api_clock.h | 1 - arch/riscv/kernel/paravirt.c | 11 +- arch/x86/Kconfig | 8 +- arch/x86/entry/entry_64.S | 1 - arch/x86/entry/vsyscall/vsyscall_64.c | 1 - arch/x86/hyperv/hv_spinlock.c | 11 +- arch/x86/include/asm/apic.h | 4 - arch/x86/include/asm/highmem.h | 1 - arch/x86/include/asm/mshyperv.h | 1 - arch/x86/include/asm/paravirt-base.h | 35 ++ arch/x86/include/asm/paravirt-spinlock.h | 145 ++++++++ arch/x86/include/asm/paravirt.h | 331 +++++------------- arch/x86/include/asm/paravirt_api_clock.h | 1 - arch/x86/include/asm/paravirt_types.h | 269 +++++++------- arch/x86/include/asm/pgtable_32.h | 1 - arch/x86/include/asm/ptrace.h | 2 +- arch/x86/include/asm/qspinlock.h | 87 +---- arch/x86/include/asm/spinlock.h | 1 - arch/x86/include/asm/timer.h | 1 + arch/x86/include/asm/tlbflush.h | 4 - arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/apm_32.c | 1 - arch/x86/kernel/callthunks.c | 1 - arch/x86/kernel/cpu/bugs.c | 1 - arch/x86/kernel/cpu/vmware.c | 1 + arch/x86/kernel/kvm.c | 13 +- arch/x86/kernel/kvmclock.c | 1 + arch/x86/kernel/paravirt-spinlocks.c | 26 +- arch/x86/kernel/paravirt.c | 42 +-- arch/x86/kernel/tsc.c | 10 +- arch/x86/kernel/vsmp_64.c | 1 - arch/x86/lib/cache-smp.c | 1 - arch/x86/mm/init.c | 1 - arch/x86/xen/enlighten_pv.c | 82 ++--- arch/x86/xen/irq.c | 20 +- arch/x86/xen/mmu_pv.c | 100 ++---- arch/x86/xen/spinlock.c | 11 +- arch/x86/xen/time.c | 2 + drivers/clocksource/hyperv_timer.c | 2 + drivers/xen/time.c | 2 +- include/linux/sched/cputime.h | 18 + kernel/sched/core.c | 5 + kernel/sched/cputime.c | 13 + kernel/sched/sched.h | 3 +- tools/objtool/arch/x86/decode.c | 8 +- tools/objtool/check.c | 78 ++++- tools/objtool/include/objtool/check.h | 1 + 66 files changed, 662 insertions(+), 827 deletions(-) delete mode 100644 arch/arm/include/asm/paravirt.h delete mode 100644 arch/arm/include/asm/paravirt_api_clock.h delete mode 100644 arch/arm/kernel/paravirt.c delete mode 100644 arch/arm64/include/asm/paravirt_api_clock.h delete mode 100644 arch/loongarch/include/asm/paravirt_api_clock.h delete mode 100644 arch/powerpc/include/asm/paravirt_api_clock.h delete mode 100644 arch/riscv/include/asm/paravirt_api_clock.h create mode 100644 arch/x86/include/asm/paravirt-base.h create mode 100644 arch/x86/include/asm/paravirt-spinlock.h delete mode 100644 arch/x86/include/asm/paravirt_api_clock.h
Signature · 1 line
2.51.0
Juergen Gross
maintainerPATCH v5 1/21 x86/paravirt: Remove not needed includes of paravirt.h
In some places asm/paravirt.h is included without really being needed.
Remove the related #include statements.
---
V3:
- reinstate the include in mmu_context.h (kernel test robot) V4:
- reinstate the include in arch/x86/kernel/x86_init.c (Boris Petkov)
--- arch/x86/entry/entry_64.S | 1 - arch/x86/entry/vsyscall/vsyscall_64.c | 1 - arch/x86/hyperv/hv_spinlock.c | 1 - arch/x86/include/asm/apic.h | 4 ---- arch/x86/include/asm/highmem.h | 1 - arch/x86/include/asm/mshyperv.h | 1 - arch/x86/include/asm/pgtable_32.h | 1 - arch/x86/include/asm/spinlock.h | 1 - arch/x86/include/asm/tlbflush.h | 4 ---- arch/x86/kernel/apm_32.c | 1 - arch/x86/kernel/callthunks.c | 1 - arch/x86/kernel/cpu/bugs.c | 1 - arch/x86/kernel/vsmp_64.c | 1 - arch/x86/lib/cache-smp.c | 1 - arch/x86/mm/init.c | 1 - arch/x86/xen/spinlock.c | 1 - 16 files changed, 22 deletions(-)
arch/x86/entry/entry_64.S +0 -1
@@ -31,7 +31,6 @@ #include <asm/hw_irq.h> #include <asm/page_types.h> #include <asm/irqflags.h> -#include <asm/paravirt.h> #include <asm/percpu.h> #include <asm/asm.h> #include <asm/smap.h>
arch/x86/entry/vsyscall/vsyscall_64.c +0 -1
@@ -37,7 +37,6 @@#include <asm/unistd.h> #include <asm/fixmap.h> #include <asm/traps.h> -#include <asm/paravirt.h> #define CREATE_TRACE_POINTS #include "vsyscall_trace.h"
arch/x86/hyperv/hv_spinlock.c +0 -1
@@ -13,7 +13,6 @@#include <linux/spinlock.h> #include <asm/mshyperv.h> -#include <asm/paravirt.h> #include <asm/apic.h> #include <asm/msr.h>
arch/x86/include/asm/apic.h +0 -4
@@ -90,10 +90,6 @@ static inline bool apic_from_smp_config(void)/* * Basic functions accessing APICs. */ -#ifdef CONFIG_PARAVIRT -#include <asm/paravirt.h> -#endif -static inline void native_apic_mem_write (u32 reg,u32 v) {volatile u32 *addr = (volatile u32 *)(APIC_BASE + reg);
arch/x86/include/asm/highmem.h +0 -1
@@ -24,7 +24,6 @@#include <linux/interrupt.h> #include <linux/threads.h> #include <asm/tlbflush.h> -#include <asm/paravirt.h> #include <asm/fixmap.h> #include <asm/pgtable_areas.h>
arch/x86/include/asm/mshyperv.h +0 -1
@@ -8,7 +8,6 @@#include <linux/io.h> #include <linux/static_call.h> #include <asm/nospec-branch.h> -#include <asm/paravirt.h> #include <asm/msr.h> #include <hyperv/hvhdk.h> #include <asm/fpu/types.h>
arch/x86/include/asm/pgtable_32.h +0 -1
@@ -16,7 +16,6 @@#ifndef __ASSEMBLER__#include <asm/processor.h> #include <linux/threads.h> -#include <asm/paravirt.h> #include <linux/bitops.h> #include <linux/list.h>
arch/x86/include/asm/spinlock.h +0 -1
@@ -7,7 +7,6 @@#include <asm/page.h> #include <asm/processor.h> #include <linux/compiler.h> -#include <asm/paravirt.h> #include <asm/bitops.h> /*
arch/x86/include/asm/tlbflush.h +0 -4
@@ -300,10 +300,6 @@ static inline void mm_clear_asid_transition(struct mm_struct *mm) { }static inline bool mm_in_asid_transition (struct mm_struct *mm) {return false; }#endif /* CONFIG_BROADCAST_TLB_FLUSH */ -#ifdef CONFIG_PARAVIRT -#include <asm/paravirt.h> -#endif -#define flush_tlb_mm (mm) \ flush_tlb_mm_range(mm, 0UL, TLB_FLUSH_ALL, 0UL, true)
arch/x86/kernel/apm_32.c +0 -1
@@ -229,7 +229,6 @@#include <linux/uaccess.h> #include <asm/desc.h> #include <asm/olpc.h> -#include <asm/paravirt.h> #include <asm/reboot.h> #include <asm/nospec-branch.h> #include <asm/ibt.h>
arch/x86/kernel/callthunks.c +0 -1
@@ -15,7 +15,6 @@#include <asm/insn.h> #include <asm/kexec.h> #include <asm/nospec-branch.h> -#include <asm/paravirt.h> #include <asm/sections.h> #include <asm/switch_to.h> #include <asm/sync_core.h>
arch/x86/kernel/cpu/bugs.c +0 -1
@@ -26,7 +26,6 @@#include <asm/fpu/api.h> #include <asm/msr.h> #include <asm/vmx.h> -#include <asm/paravirt.h> #include <asm/cpu_device_id.h> #include <asm/e820/api.h> #include <asm/hypervisor.h>
arch/x86/kernel/vsmp_64.c +0 -1
@@ -18,7 +18,6 @@#include <asm/apic.h> #include <asm/pci-direct.h> #include <asm/io.h> -#include <asm/paravirt.h> #include <asm/setup.h> #define TOPOLOGY_REGISTER_OFFSET 0x10
arch/x86/lib/cache-smp.c +0 -1
@@ -1,5 +1,4 @@// SPDX-License-Identifier: GPL-2.0 -#include <asm/paravirt.h> #include <linux/smp.h> #include <linux/export.h> #include <linux/kvm_types.h>
arch/x86/mm/init.c +0 -1
@@ -27,7 +27,6 @@#include <asm/pti.h> #include <asm/text-patching.h> #include <asm/memtype.h> -#include <asm/paravirt.h> #include <asm/mmu_context.h> /*
arch/x86/xen/spinlock.c +0 -1
@@ -8,7 +8,6 @@#include <linux/slab.h> #include <linux/atomic.h> -#include <asm/paravirt.h> #include <asm/qspinlock.h> #include <xen/events.h>
Signature · 1 line
2.51.0
Re: [PATCH v5 01/21] x86/paravirt: Remove not needed includes of paravirt.h
Quoted 11 lines · Juergen Gross
In some places
asm/paravirt.his included without really being needed.Remove the related #include statements.
Signed-off-by Juergen Gross <[email protected]>---
V3:
- reinstate the include inmmu_context.h(kernel test robot) V4:
- reinstate the include inarch/x86/kernel/x86_init.c(Boris Petkov)
Quoted 4 lines
--- arch/x86/entry/entry_64.S | 1 - arch/x86/entry/vsyscall/vsyscall_64.c | 1 - arch/x86/hyperv/hv_spinlock.c | 1 -
[tip: x86/paravirt] x86/paravirt: Remove not needed includes of paravirt.h
In reply to Juergen GrossThe following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: 07f2961235ac26da12479535cf19a82cde529865 Gitweb: https://git.kernel.org/tip/07f2961235ac26da12479535cf19a82cde529865 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:00 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 11:26:52 +01:00
x86/paravirt: Remove not needed includes of paravirt.h
In some places asm/paravirt.h is included without really being needed.
Remove the related #include statements.
--- arch/x86/entry/entry_64.S | 1 - arch/x86/entry/vsyscall/vsyscall_64.c | 1 - arch/x86/hyperv/hv_spinlock.c | 1 - arch/x86/include/asm/apic.h | 4 ---- arch/x86/include/asm/highmem.h | 1 - arch/x86/include/asm/mshyperv.h | 1 - arch/x86/include/asm/pgtable_32.h | 1 - arch/x86/include/asm/spinlock.h | 1 - arch/x86/include/asm/tlbflush.h | 4 ---- arch/x86/kernel/apm_32.c | 1 - arch/x86/kernel/callthunks.c | 1 - arch/x86/kernel/cpu/bugs.c | 1 - arch/x86/kernel/vsmp_64.c | 1 - arch/x86/lib/cache-smp.c | 1 - arch/x86/mm/init.c | 1 - arch/x86/xen/spinlock.c | 1 - 16 files changed, 22 deletions(-)
arch/x86/entry/entry_64.S +0 -1
@@ -31,7 +31,6 @@ #include <asm/hw_irq.h> #include <asm/page_types.h> #include <asm/irqflags.h> -#include <asm/paravirt.h> #include <asm/percpu.h> #include <asm/asm.h> #include <asm/smap.h>
arch/x86/entry/vsyscall/vsyscall_64.c +0 -1
@@ -37,7 +37,6 @@#include <asm/unistd.h> #include <asm/fixmap.h> #include <asm/traps.h> -#include <asm/paravirt.h> #define CREATE_TRACE_POINTS #include "vsyscall_trace.h"
arch/x86/hyperv/hv_spinlock.c +0 -1
@@ -13,7 +13,6 @@#include <linux/spinlock.h> #include <asm/mshyperv.h> -#include <asm/paravirt.h> #include <asm/apic.h> #include <asm/msr.h>
arch/x86/include/asm/apic.h +0 -4
@@ -90,10 +90,6 @@ static inline bool apic_from_smp_config(void)/* * Basic functions accessing APICs. */ -#ifdef CONFIG_PARAVIRT -#include <asm/paravirt.h> -#endif -static inline void native_apic_mem_write (u32 reg,u32 v) {volatile u32 *addr = (volatile u32 *)(APIC_BASE + reg);
arch/x86/include/asm/highmem.h +0 -1
@@ -24,7 +24,6 @@#include <linux/interrupt.h> #include <linux/threads.h> #include <asm/tlbflush.h> -#include <asm/paravirt.h> #include <asm/fixmap.h> #include <asm/pgtable_areas.h>
arch/x86/include/asm/mshyperv.h +0 -1
@@ -8,7 +8,6 @@#include <linux/io.h> #include <linux/static_call.h> #include <asm/nospec-branch.h> -#include <asm/paravirt.h> #include <asm/msr.h> #include <hyperv/hvhdk.h> #include <asm/fpu/types.h>
arch/x86/include/asm/pgtable_32.h +0 -1
@@ -16,7 +16,6 @@#ifndef __ASSEMBLER__#include <asm/processor.h> #include <linux/threads.h> -#include <asm/paravirt.h> #include <linux/bitops.h> #include <linux/list.h>
arch/x86/include/asm/spinlock.h +0 -1
@@ -7,7 +7,6 @@#include <asm/page.h> #include <asm/processor.h> #include <linux/compiler.h> -#include <asm/paravirt.h> #include <asm/bitops.h> /*
arch/x86/include/asm/tlbflush.h +0 -4
@@ -300,10 +300,6 @@ static inline void mm_clear_asid_transition(struct mm_struct *mm) { }static inline bool mm_in_asid_transition (struct mm_struct *mm) {return false; }#endif /* CONFIG_BROADCAST_TLB_FLUSH */ -#ifdef CONFIG_PARAVIRT -#include <asm/paravirt.h> -#endif -#define flush_tlb_mm (mm) \ flush_tlb_mm_range(mm, 0UL, TLB_FLUSH_ALL, 0UL, true)
arch/x86/kernel/apm_32.c +0 -1
@@ -229,7 +229,6 @@#include <linux/uaccess.h> #include <asm/desc.h> #include <asm/olpc.h> -#include <asm/paravirt.h> #include <asm/reboot.h> #include <asm/nospec-branch.h> #include <asm/ibt.h>
arch/x86/kernel/callthunks.c +0 -1
@@ -15,7 +15,6 @@#include <asm/insn.h> #include <asm/kexec.h> #include <asm/nospec-branch.h> -#include <asm/paravirt.h> #include <asm/sections.h> #include <asm/switch_to.h> #include <asm/sync_core.h>
arch/x86/kernel/cpu/bugs.c +0 -1
@@ -26,7 +26,6 @@#include <asm/fpu/api.h> #include <asm/msr.h> #include <asm/vmx.h> -#include <asm/paravirt.h> #include <asm/cpu_device_id.h> #include <asm/e820/api.h> #include <asm/hypervisor.h>
arch/x86/kernel/vsmp_64.c +0 -1
@@ -18,7 +18,6 @@#include <asm/apic.h> #include <asm/pci-direct.h> #include <asm/io.h> -#include <asm/paravirt.h> #include <asm/setup.h> #define TOPOLOGY_REGISTER_OFFSET 0x10
arch/x86/lib/cache-smp.c +0 -1
@@ -1,5 +1,4 @@// SPDX-License-Identifier: GPL-2.0 -#include <asm/paravirt.h> #include <linux/smp.h> #include <linux/export.h> #include <linux/kvm_types.h>
arch/x86/mm/init.c +0 -1
@@ -27,7 +27,6 @@#include <asm/pti.h> #include <asm/text-patching.h> #include <asm/memtype.h> -#include <asm/paravirt.h> #include <asm/mmu_context.h> /*
arch/x86/xen/spinlock.c +0 -1
@@ -8,7 +8,6 @@#include <linux/slab.h> #include <linux/atomic.h> -#include <asm/paravirt.h> #include <asm/qspinlock.h> #include <xen/events.h>
Juergen Gross
maintainerPATCH v5 2/21 x86/paravirt: Remove some unneeded struct declarations
In reply to Juergen GrossIn paravirt_types.h and paravirt.h there are some struct declarations which are not needed. Remove them.
---
V2:
- remove mm_struct from paravirt.h, too
--- arch/x86/include/asm/paravirt.h | 4 ---- arch/x86/include/asm/paravirt_types.h | 6 ------ 2 files changed, 10 deletions(-)
arch/x86/include/asm/paravirt.h +0 -4
@@ -6,10 +6,6 @@#include <asm/paravirt_types.h> -#ifndef __ASSEMBLER__ -struct mm_struct ; -#endif -#ifdef CONFIG_PARAVIRT #include <asm/pgtable_types.h> #include <asm/asm.h>
arch/x86/include/asm/paravirt_types.h +0 -6
@@ -11,16 +11,11 @@#include <asm/pgtable_types.h> #include <asm/nospec-branch.h> -struct page ;struct thread_struct ; -struct desc_ptr ; -struct tss_struct ;struct mm_struct ; -struct desc_struct ;struct task_struct ;struct cpumask ;struct flush_tlb_info ; -struct mmu_gather ;struct vm_area_struct ;/*
@@ -205,7 +200,6 @@ struct pv_mmu_ops {#endif } __no_randomize_layout; -struct arch_spinlock ;#ifdef CONFIG_SMP #include <asm/spinlock_types.h> #endif
Signature · 1 line
2.51.0
[tip: x86/paravirt] x86/paravirt: Remove some unneeded struct declarations
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: e0b4904a401fad8593b85c698677dda95bec51a6 Gitweb: https://git.kernel.org/tip/e0b4904a401fad8593b85c698677dda95bec51a6 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:01 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 15:17:00 +01:00
x86/paravirt: Remove some unneeded struct declarations
In paravirt_types.h and paravirt.h there are some struct declarations which are not needed. Remove them.
--- arch/x86/include/asm/paravirt.h | 4 ---- arch/x86/include/asm/paravirt_types.h | 6 ------ 2 files changed, 10 deletions(-)
arch/x86/include/asm/paravirt.h +0 -4
@@ -6,10 +6,6 @@#include <asm/paravirt_types.h> -#ifndef __ASSEMBLER__ -struct mm_struct ; -#endif -#ifdef CONFIG_PARAVIRT #include <asm/pgtable_types.h> #include <asm/asm.h>
arch/x86/include/asm/paravirt_types.h +0 -6
@@ -11,16 +11,11 @@#include <asm/pgtable_types.h> #include <asm/nospec-branch.h> -struct page ;struct thread_struct ; -struct desc_ptr ; -struct tss_struct ;struct mm_struct ; -struct desc_struct ;struct task_struct ;struct cpumask ;struct flush_tlb_info ; -struct mmu_gather ;struct vm_area_struct ;/*
@@ -205,7 +200,6 @@ struct pv_mmu_ops {#endif } __no_randomize_layout; -struct arch_spinlock ;#ifdef CONFIG_SMP #include <asm/spinlock_types.h> #endif
Juergen Gross
maintainerPATCH v5 3/21 x86/paravirt: Remove PARAVIRT_DEBUG config option
In reply to Juergen GrossThe only effect of CONFIG_PARAVIRT_DEBUG set is that instead of doing a call using a NULL pointer a BUG() is being raised.
While the BUG() will be a little bit easier to analyse, the call of NULL isn't really that difficult to find the reason for.
Remove the config option to make paravirt coding a little bit less annoying.
--- arch/x86/Kconfig | 7 ------- arch/x86/include/asm/paravirt.h | 1 - arch/x86/include/asm/paravirt_types.h | 8 -------- 3 files changed, 16 deletions(-)
arch/x86/Kconfig +0 -7
@@ -809,13 +809,6 @@ config PARAVIRT_XXL bool depends on X86_64 -config PARAVIRT_DEBUG - bool "paravirt-ops debugging" - depends on PARAVIRT && DEBUG_KERNEL - help - Enable to debug paravirt_ops internals. Specifically, BUG if - a paravirt_op is missing when it is called. - config PARAVIRT_SPINLOCKS bool "Paravirtualization layer for spinlocks" depends on PARAVIRT && SMP
arch/x86/include/asm/paravirt.h +0 -1
@@ -12,7 +12,6 @@#include <asm/nospec-branch.h> #ifndef __ASSEMBLER__ -#include <linux/bug.h> #include <linux/types.h> #include <linux/cpumask.h> #include <linux/static_call_types.h>
arch/x86/include/asm/paravirt_types.h +0 -8
@@ -354,12 +354,6 @@ extern struct paravirt_patch_template pv_ops;#define VEXTRA_CLOBBERS , "rax", "r8", "r9", "r10", "r11"#endif /* CONFIG_X86_32 */ -#ifdef CONFIG_PARAVIRT_DEBUG -#define PVOP_TEST_NULL (op) BUG_ON(pv_ops.op == NULL) -#else -#define PVOP_TEST_NULL (op) ((void)pv_ops.op) -#endif -#define PVOP_RETVAL (rettype) \ ({ unsigned long __mask = ~0UL; \ BUILD_BUG_ON(sizeof(rettype) > sizeof(unsigned long)); \
@@ -388,7 +382,6 @@ extern struct paravirt_patch_template pv_ops;#define ____PVOP_CALL (ret, op, call_clbr, extra_clbr, ...) \ ({ \ PVOP_CALL_ARGS; \ - PVOP_TEST_NULL(op); \ asm volatile(ALTERNATIVE(PARAVIRT_CALL, ALT_CALL_INSTR, \ ALT_CALL_ALWAYS) \ : call_clbr, ASM_CALL_CONSTRAINT \
@@ -402,7 +395,6 @@ extern struct paravirt_patch_template pv_ops; extra_clbr, ...) \ ({ \ PVOP_CALL_ARGS; \ - PVOP_TEST_NULL(op); \ asm volatile(ALTERNATIVE_2(PARAVIRT_CALL, \ ALT_CALL_INSTR, ALT_CALL_ALWAYS, \ alt, cond) \
Signature · 1 line
2.51.0
[tip: x86/paravirt] x86/paravirt: Remove PARAVIRT_DEBUG config option
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: d73298f015341530da84b96d8310854af90dc425 Gitweb: https://git.kernel.org/tip/d73298f015341530da84b96d8310854af90dc425 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:02 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 15:20:06 +01:00
x86/paravirt: Remove PARAVIRT_DEBUG config option
The only effect of CONFIG_PARAVIRT_DEBUG set is that instead of doing a call using a NULL pointer a BUG() is being raised.
While the BUG() will be a little bit easier to analyse, the call of NULL isn't really that difficult to find the reason for.
Remove the config option to make paravirt coding a little bit less annoying.
--- arch/x86/Kconfig | 7 ------- arch/x86/include/asm/paravirt.h | 1 - arch/x86/include/asm/paravirt_types.h | 8 -------- 3 files changed, 16 deletions(-)
arch/x86/Kconfig +0 -7
@@ -809,13 +809,6 @@ config PARAVIRT_XXL bool depends on X86_64 -config PARAVIRT_DEBUG - bool "paravirt-ops debugging" - depends on PARAVIRT && DEBUG_KERNEL - help - Enable to debug paravirt_ops internals. Specifically, BUG if - a paravirt_op is missing when it is called. - config PARAVIRT_SPINLOCKS bool "Paravirtualization layer for spinlocks" depends on PARAVIRT && SMP
arch/x86/include/asm/paravirt.h +0 -1
@@ -12,7 +12,6 @@#include <asm/nospec-branch.h> #ifndef __ASSEMBLER__ -#include <linux/bug.h> #include <linux/types.h> #include <linux/cpumask.h> #include <linux/static_call_types.h>
arch/x86/include/asm/paravirt_types.h +0 -8
@@ -354,12 +354,6 @@ extern struct paravirt_patch_template pv_ops;#define VEXTRA_CLOBBERS , "rax", "r8", "r9", "r10", "r11"#endif /* CONFIG_X86_32 */ -#ifdef CONFIG_PARAVIRT_DEBUG -#define PVOP_TEST_NULL (op) BUG_ON(pv_ops.op == NULL) -#else -#define PVOP_TEST_NULL (op) ((void)pv_ops.op) -#endif -#define PVOP_RETVAL (rettype) \ ({ unsigned long __mask = ~0UL; \ BUILD_BUG_ON(sizeof(rettype) > sizeof(unsigned long)); \
@@ -388,7 +382,6 @@ extern struct paravirt_patch_template pv_ops;#define ____PVOP_CALL (ret, op, call_clbr, extra_clbr, ...) \ ({ \ PVOP_CALL_ARGS; \ - PVOP_TEST_NULL(op); \ asm volatile(ALTERNATIVE(PARAVIRT_CALL, ALT_CALL_INSTR, \ ALT_CALL_ALWAYS) \ : call_clbr, ASM_CALL_CONSTRAINT \
@@ -402,7 +395,6 @@ extern struct paravirt_patch_template pv_ops; extra_clbr, ...) \ ({ \ PVOP_CALL_ARGS; \ - PVOP_TEST_NULL(op); \ asm volatile(ALTERNATIVE_2(PARAVIRT_CALL, \ ALT_CALL_INSTR, ALT_CALL_ALWAYS, \ alt, cond) \
Juergen Gross
maintainerPATCH v5 4/21 x86/paravirt: Move thunk macros to paravirt_types.h
In reply to Juergen GrossThe macros for generating PV-thunks are part of the generic paravirt infrastructure, so they should be in paravirt_types.h.
--- arch/x86/include/asm/paravirt.h | 68 --------------------------- arch/x86/include/asm/paravirt_types.h | 68 +++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 68 deletions(-)
arch/x86/include/asm/paravirt.h +0 -68
@@ -581,74 +581,6 @@ bool __raw_callee_save___native_vcpu_is_preempted(long cpu);#endif /* SMP && PARAVIRT_SPINLOCKS */ -#ifdef CONFIG_X86_32 -/* save and restore all caller-save registers, except return value */ -#define PV_SAVE_ALL_CALLER_REGS "pushl %ecx;" -#define PV_RESTORE_ALL_CALLER_REGS "popl %ecx;" -#else -/* save and restore all caller-save registers, except return value */ -#define PV_SAVE_ALL_CALLER_REGS \ - "push %rcx;" \ - "push %rdx;" \ - "push %rsi;" \ - "push %rdi;" \ - "push %r8;" \ - "push %r9;" \ - "push %r10;" \ - "push %r11;" -#define PV_RESTORE_ALL_CALLER_REGS \ - "pop %r11;" \ - "pop %r10;" \ - "pop %r9;" \ - "pop %r8;" \ - "pop %rdi;" \ - "pop %rsi;" \ - "pop %rdx;" \ - "pop %rcx;" -#endif - -/* -* Generate a thunk around a function which saves all caller-save -* registers except for the return value. This allows C functions to -* be called from assembler code where fewer than normal registers are -* available. It may also help code generation around calls from C -* code if the common case doesn't use many registers. -* -* When a callee is wrapped in a thunk, the caller can assume that all -* arg regs and all scratch registers are preserved across the -* call. The return value in rax/eax will not be saved, even for void -* functions. -*/ -#define PV_THUNK_NAME (func) "__raw_callee_save_" #func -#define __PV_CALLEE_SAVE_REGS_THUNK (func, section) \ - extern typeof(func) __raw_callee_save_##func; \ - \ - asm(".pushsection " section ", \"ax\";" \ - ".globl " PV_THUNK_NAME(func) ";" \ - ".type " PV_THUNK_NAME(func) ", @function;" \ - ASM_FUNC_ALIGN \ - PV_THUNK_NAME(func) ":" \ - ASM_ENDBR \ - FRAME_BEGIN \ - PV_SAVE_ALL_CALLER_REGS \ - "call " #func ";" \ - PV_RESTORE_ALL_CALLER_REGS \ - FRAME_END \ - ASM_RET \ - ".size " PV_THUNK_NAME(func) ", .-" PV_THUNK_NAME(func) ";" \ - ".popsection") - -#define PV_CALLEE_SAVE_REGS_THUNK (func) \ - __PV_CALLEE_SAVE_REGS_THUNK(func, ".text") - -/* Get a reference to a callee-save function */ -#define PV_CALLEE_SAVE (func) \ - ((struct paravirt_callee_save) { __raw_callee_save_##func }) - -/* Promise that "func" already uses the right calling convention */ -#define __PV_IS_CALLEE_SAVE (func) \ - ((struct paravirt_callee_save) { func }) -#ifdef CONFIG_PARAVIRT_XXL static __always_inline unsigned long arch_local_save_flags (void ) {
arch/x86/include/asm/paravirt_types.h +68 -0
73 lines not on this page · raw message
Signature · 1 line
2.51.0
[tip: x86/paravirt] x86/paravirt: Move thunk macros to paravirt_types.h
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: b49c63eea526ecfd0321ecfd0dbf6e31c85b5592 Gitweb: https://git.kernel.org/tip/b49c63eea526ecfd0321ecfd0dbf6e31c85b5592 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:03 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 15:24:05 +01:00
x86/paravirt: Move thunk macros to paravirt_types.h
The macros for generating PV-thunks are part of the generic paravirt infrastructure, so they should be in paravirt_types.h.
--- arch/x86/include/asm/paravirt.h | 68 +-------------------------- arch/x86/include/asm/paravirt_types.h | 68 ++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 68 deletions(-)
arch/x86/include/asm/paravirt.h +0 -68
@@ -581,74 +581,6 @@ bool __raw_callee_save___native_vcpu_is_preempted(long cpu);#endif /* SMP && PARAVIRT_SPINLOCKS */ -#ifdef CONFIG_X86_32 -/* save and restore all caller-save registers, except return value */ -#define PV_SAVE_ALL_CALLER_REGS "pushl %ecx;" -#define PV_RESTORE_ALL_CALLER_REGS "popl %ecx;" -#else -/* save and restore all caller-save registers, except return value */ -#define PV_SAVE_ALL_CALLER_REGS \ - "push %rcx;" \ - "push %rdx;" \ - "push %rsi;" \ - "push %rdi;" \ - "push %r8;" \ - "push %r9;" \ - "push %r10;" \ - "push %r11;" -#define PV_RESTORE_ALL_CALLER_REGS \ - "pop %r11;" \ - "pop %r10;" \ - "pop %r9;" \ - "pop %r8;" \ - "pop %rdi;" \ - "pop %rsi;" \ - "pop %rdx;" \ - "pop %rcx;" -#endif - -/* -* Generate a thunk around a function which saves all caller-save -* registers except for the return value. This allows C functions to -* be called from assembler code where fewer than normal registers are -* available. It may also help code generation around calls from C -* code if the common case doesn't use many registers. -* -* When a callee is wrapped in a thunk, the caller can assume that all -* arg regs and all scratch registers are preserved across the -* call. The return value in rax/eax will not be saved, even for void -* functions. -*/ -#define PV_THUNK_NAME (func) "__raw_callee_save_" #func -#define __PV_CALLEE_SAVE_REGS_THUNK (func, section) \ - extern typeof(func) __raw_callee_save_##func; \ - \ - asm(".pushsection " section ", \"ax\";" \ - ".globl " PV_THUNK_NAME(func) ";" \ - ".type " PV_THUNK_NAME(func) ", @function;" \ - ASM_FUNC_ALIGN \ - PV_THUNK_NAME(func) ":" \ - ASM_ENDBR \ - FRAME_BEGIN \ - PV_SAVE_ALL_CALLER_REGS \ - "call " #func ";" \ - PV_RESTORE_ALL_CALLER_REGS \ - FRAME_END \ - ASM_RET \ - ".size " PV_THUNK_NAME(func) ", .-" PV_THUNK_NAME(func) ";" \ - ".popsection") - -#define PV_CALLEE_SAVE_REGS_THUNK (func) \ - __PV_CALLEE_SAVE_REGS_THUNK(func, ".text") - -/* Get a reference to a callee-save function */ -#define PV_CALLEE_SAVE (func) \ - ((struct paravirt_callee_save) { __raw_callee_save_##func }) - -/* Promise that "func" already uses the right calling convention */ -#define __PV_IS_CALLEE_SAVE (func) \ - ((struct paravirt_callee_save) { func }) -#ifdef CONFIG_PARAVIRT_XXL static __always_inline unsigned long arch_local_save_flags (void ) {
arch/x86/include/asm/paravirt_types.h +68 -0
73 lines not on this page · raw message
Juergen Gross
maintainerPATCH v5 5/21 paravirt: Remove asm/paravirt_api_clock.h
In reply to Juergen GrossAll architectures supporting CONFIG_PARAVIRT share the same contents of asm/paravirt_api_clock.h:
#include <asm/paravirt.h>
So remove all incarnations of asm/paravirt_api_clock.h and remove the only place where it is included, as there asm/paravirt.h is included anyway.
--- arch/arm/include/asm/paravirt_api_clock.h | 1 - arch/arm64/include/asm/paravirt_api_clock.h | 1 - arch/loongarch/include/asm/paravirt_api_clock.h | 1 - arch/powerpc/include/asm/paravirt_api_clock.h | 2 -- arch/riscv/include/asm/paravirt_api_clock.h | 1 - arch/x86/include/asm/paravirt_api_clock.h | 1 - kernel/sched/sched.h | 1 - 7 files changed, 8 deletions(-) delete mode 100644 arch/arm/include/asm/paravirt_api_clock.h delete mode 100644 arch/arm64/include/asm/paravirt_api_clock.h delete mode 100644 arch/loongarch/include/asm/paravirt_api_clock.h delete mode 100644 arch/powerpc/include/asm/paravirt_api_clock.h delete mode 100644 arch/riscv/include/asm/paravirt_api_clock.h delete mode 100644 arch/x86/include/asm/paravirt_api_clock.h
arch/arm/include/asm/paravirt_api_clock.h deleted +0 -1
@@ -1 +0,0 @@ -#include <asm/paravirt.h>
arch/arm64/include/asm/paravirt_api_clock.h deleted +0 -1
@@ -1 +0,0 @@ -#include <asm/paravirt.h>
arch/loongarch/include/asm/paravirt_api_clock.h deleted +0 -1
@@ -1 +0,0 @@ -#include <asm/paravirt.h>
arch/powerpc/include/asm/paravirt_api_clock.h deleted +0 -2
@@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#include <asm/paravirt.h>
arch/riscv/include/asm/paravirt_api_clock.h deleted +0 -1
@@ -1 +0,0 @@ -#include <asm/paravirt.h>
arch/x86/include/asm/paravirt_api_clock.h deleted +0 -1
@@ -1 +0,0 @@ -#include <asm/paravirt.h>
kernel/sched/sched.h +0 -1
@@ -84,7 +84,6 @@ struct cpuidle_state;#ifdef CONFIG_PARAVIRT # include <asm/paravirt.h> -# include <asm/paravirt_api_clock.h> #endif #include <asm/barrier.h>
Signature · 1 line
2.51.0
[tip: x86/paravirt] paravirt: Remove asm/paravirt_api_clock.h
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: 68b10fd40d492ebfaebe716dbe21fc559a128065 Gitweb: https://git.kernel.org/tip/68b10fd40d492ebfaebe716dbe21fc559a128065 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:04 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 15:34:33 +01:00
paravirt: Remove asm/paravirt_api_clock.h
All architectures supporting CONFIG_PARAVIRT share the same contents of asm/paravirt_api_clock.h:
#include <asm/paravirt.h>
So remove all incarnations of asm/paravirt_api_clock.h and remove the only place where it is included, as there asm/paravirt.h is included anyway.
--- arch/arm/include/asm/paravirt_api_clock.h | 1 - arch/arm64/include/asm/paravirt_api_clock.h | 1 - arch/loongarch/include/asm/paravirt_api_clock.h | 1 - arch/powerpc/include/asm/paravirt_api_clock.h | 2 -- arch/riscv/include/asm/paravirt_api_clock.h | 1 - arch/x86/include/asm/paravirt_api_clock.h | 1 - kernel/sched/sched.h | 1 - 7 files changed, 8 deletions(-) delete mode 100644 arch/arm/include/asm/paravirt_api_clock.h delete mode 100644 arch/arm64/include/asm/paravirt_api_clock.h delete mode 100644 arch/loongarch/include/asm/paravirt_api_clock.h delete mode 100644 arch/powerpc/include/asm/paravirt_api_clock.h delete mode 100644 arch/riscv/include/asm/paravirt_api_clock.h delete mode 100644 arch/x86/include/asm/paravirt_api_clock.h
arch/arm/include/asm/paravirt_api_clock.h deleted +0 -1
@@ -1 +0,0 @@ -#include <asm/paravirt.h>
arch/arm64/include/asm/paravirt_api_clock.h deleted +0 -1
@@ -1 +0,0 @@ -#include <asm/paravirt.h>
arch/loongarch/include/asm/paravirt_api_clock.h deleted +0 -1
@@ -1 +0,0 @@ -#include <asm/paravirt.h>
arch/powerpc/include/asm/paravirt_api_clock.h deleted +0 -2
@@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#include <asm/paravirt.h>
arch/riscv/include/asm/paravirt_api_clock.h deleted +0 -1
@@ -1 +0,0 @@ -#include <asm/paravirt.h>
arch/x86/include/asm/paravirt_api_clock.h deleted +0 -1
@@ -1 +0,0 @@ -#include <asm/paravirt.h>
kernel/sched/sched.h +0 -1
@@ -84,7 +84,6 @@ struct cpuidle_state;#ifdef CONFIG_PARAVIRT # include <asm/paravirt.h> -# include <asm/paravirt_api_clock.h> #endif #include <asm/barrier.h>
Juergen Gross
maintainerPATCH v5 6/21 sched: Move clock related paravirt code to kernel/sched
In reply to Juergen GrossParavirt clock related functions are available in multiple archs.
In order to share the common parts, move the common static keys to kernel/sched/ and remove them from the arch specific files.
Make a common paravirt_steal_clock() implementation available in kernel/sched/cputime.c, guarding it with a new config option CONFIG_HAVE_PV_STEAL_CLOCK_GEN, which can be selected by an arch in case it wants to use that common variant.
--- arch/Kconfig | 3 +++ arch/arm/include/asm/paravirt.h | 4 ---- arch/arm/kernel/paravirt.c | 3 --- arch/arm64/include/asm/paravirt.h | 4 ---- arch/arm64/kernel/paravirt.c | 4 +--- arch/loongarch/include/asm/paravirt.h | 3 --- arch/loongarch/kernel/paravirt.c | 3 +-- arch/powerpc/include/asm/paravirt.h | 3 --- arch/powerpc/platforms/pseries/setup.c | 4 +--- arch/riscv/include/asm/paravirt.h | 4 ---- arch/riscv/kernel/paravirt.c | 4 +--- arch/x86/include/asm/paravirt.h | 4 ---- arch/x86/kernel/cpu/vmware.c | 1 + arch/x86/kernel/kvm.c | 1 + arch/x86/kernel/paravirt.c | 3 --- drivers/xen/time.c | 1 + include/linux/sched/cputime.h | 18 ++++++++++++++++++ kernel/sched/core.c | 5 +++++ kernel/sched/cputime.c | 13 +++++++++++++ kernel/sched/sched.h | 2 +- 20 files changed, 47 insertions(+), 40 deletions(-)
arch/Kconfig +3 -0
@@ -1056,6 +1056,9 @@ config HAVE_IRQ_TIME_ACCOUNTING Archs need to ensure they use a high enough resolution clock to support irq time accounting and then call enable_sched_clock_irqtime(). +config HAVE_PV_STEAL_CLOCK_GEN + bool + config HAVE_MOVE_PUD bool help
arch/arm/include/asm/paravirt.h +0 -4
@@ -5,10 +5,6 @@#ifdef CONFIG_PARAVIRT #include <linux/static_call_types.h> -struct static_key ; -extern struct static_key paravirt_steal_enabled; -extern struct static_key paravirt_steal_rq_enabled; -u64 dummy_steal_clock (int cpu);DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock);
arch/arm/kernel/paravirt.c +0 -3
@@ -12,9 +12,6 @@#include <linux/static_call.h> #include <asm/paravirt.h> -struct static_key paravirt_steal_enabled; -struct static_key paravirt_steal_rq_enabled; -static u64 native_steal_clock (int cpu) {return 0 ;
arch/arm64/include/asm/paravirt.h +0 -4
@@ -5,10 +5,6 @@#ifdef CONFIG_PARAVIRT #include <linux/static_call_types.h> -struct static_key ; -extern struct static_key paravirt_steal_enabled; -extern struct static_key paravirt_steal_rq_enabled; -u64 dummy_steal_clock (int cpu);DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock);
arch/arm64/kernel/paravirt.c +1 -3
@@ -19,14 +19,12 @@#include <linux/slab.h> #include <linux/types.h> #include <linux/static_call.h> +#include <linux/sched/cputime.h> #include <asm/paravirt.h> #include <asm/pvclock-abi.h> #include <asm/smp_plat.h> -struct static_key paravirt_steal_enabled; -struct static_key paravirt_steal_rq_enabled; -static u64 native_steal_clock (int cpu) {return 0 ;
arch/loongarch/include/asm/paravirt.h +0 -3
@@ -5,9 +5,6 @@#ifdef CONFIG_PARAVIRT #include <linux/static_call_types.h> -struct static_key ; -extern struct static_key paravirt_steal_enabled; -extern struct static_key paravirt_steal_rq_enabled;u64 dummy_steal_clock (int cpu);DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock);
arch/loongarch/kernel/paravirt.c +1 -2
@@ -6,11 +6,10 @@#include <linux/kvm_para.h> #include <linux/reboot.h> #include <linux/static_call.h> +#include <linux/sched/cputime.h> #include <asm/paravirt.h> static int has_steal_clock; -struct static_key paravirt_steal_enabled; -struct static_key paravirt_steal_rq_enabled; static DEFINE_PER_CPU(struct kvm_steal_time, steal_time) __aligned(64);DEFINE_STATIC_KEY_FALSE (virt_spin_lock_key);
arch/powerpc/include/asm/paravirt.h +0 -3
@@ -23,9 +23,6 @@ static inline bool is_shared_processor(void) }#ifdef CONFIG_PARAVIRT_TIME_ACCOUNTING -extern struct static_key paravirt_steal_enabled; -extern struct static_key paravirt_steal_rq_enabled; -u64 pseries_paravirt_steal_clock (int cpu);static inline u64 paravirt_steal_clock (int cpu)
arch/powerpc/platforms/pseries/setup.c +1 -3
@@ -42,6 +42,7 @@#include <linux/memblock.h> #include <linux/swiotlb.h> #include <linux/seq_buf.h> +#include <linux/sched/cputime.h> #include <asm/mmu.h> #include <asm/processor.h>
@@ -83,9 +84,6 @@ DEFINE_STATIC_KEY_FALSE(shared_processor);EXPORT_SYMBOL (shared_processor);#ifdef CONFIG_PARAVIRT_TIME_ACCOUNTING -struct static_key paravirt_steal_enabled; -struct static_key paravirt_steal_rq_enabled; -static bool steal_acc = true;static int __init parse_no_stealacc (char *arg) {
arch/riscv/include/asm/paravirt.h +0 -4
@@ -5,10 +5,6 @@#ifdef CONFIG_PARAVIRT #include <linux/static_call_types.h> -struct static_key ; -extern struct static_key paravirt_steal_enabled; -extern struct static_key paravirt_steal_rq_enabled; -u64 dummy_steal_clock (int cpu);DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock);
arch/riscv/kernel/paravirt.c +1 -3
@@ -16,15 +16,13 @@#include <linux/printk.h> #include <linux/static_call.h> #include <linux/types.h> +#include <linux/sched/cputime.h> #include <asm/barrier.h> #include <asm/page.h> #include <asm/paravirt.h> #include <asm/sbi.h> -struct static_key paravirt_steal_enabled; -struct static_key paravirt_steal_rq_enabled; -static u64 native_steal_clock (int cpu) {return 0 ;
arch/x86/include/asm/paravirt.h +0 -4
@@ -30,10 +30,6 @@ static __always_inline u64 paravirt_sched_clock(void)return static_call (pv_sched_clock)(); } -struct static_key ; -extern struct static_key paravirt_steal_enabled; -extern struct static_key paravirt_steal_rq_enabled; - __visible void __native_queued_spin_unlock(struct qspinlock *lock);bool pv_is_native_spin_unlock (void ); __visible bool __native_vcpu_is_preempted(long cpu);
arch/x86/kernel/cpu/vmware.c +1 -0
@@ -29,6 +29,7 @@#include <linux/efi.h> #include <linux/reboot.h> #include <linux/static_call.h> +#include <linux/sched/cputime.h> #include <asm/div64.h> #include <asm/x86_init.h> #include <asm/hypervisor.h>
arch/x86/kernel/kvm.c +1 -0
@@ -30,6 +30,7 @@#include <linux/cc_platform.h> #include <linux/efi.h> #include <linux/kvm_types.h> +#include <linux/sched/cputime.h> #include <asm/timer.h> #include <asm/cpu.h> #include <asm/traps.h>
arch/x86/kernel/paravirt.c +0 -3
@@ -60,9 +60,6 @@ void __init native_pv_lock_init(void)static_branch_enable (&virt_spin_lock_key); } -struct static_key paravirt_steal_enabled; -struct static_key paravirt_steal_rq_enabled; -static u64 native_steal_clock (int cpu) {return 0 ;
drivers/xen/time.c +1 -0
@@ -8,6 +8,7 @@#include <linux/gfp.h> #include <linux/slab.h> #include <linux/static_call.h> +#include <linux/sched/cputime.h> #include <asm/paravirt.h> #include <asm/xen/hypervisor.h>
include/linux/sched/cputime.h +18 -0
@@ -2,6 +2,7 @@#ifndef _LINUX_SCHED_CPUTIME_H#define _LINUX_SCHED_CPUTIME_H +#include <linux/static_call_types.h> #include <linux/sched/signal.h> /*
@@ -180,4 +181,21 @@ static inline void prev_cputime_init(struct prev_cputime *prev)extern unsigned long long task_sched_runtime (struct task_struct *task); +#ifdef CONFIG_PARAVIRT +struct static_key ; +extern struct static_key paravirt_steal_enabled; +extern struct static_key paravirt_steal_rq_enabled; + +#ifdef CONFIG_HAVE_PV_STEAL_CLOCK_GEN +u64 dummy_steal_clock (int cpu); + +DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock); + +static inline u64 paravirt_steal_clock (int cpu) +{ +return static_call (pv_steal_clock)(cpu); +} +#endif +#endif +#endif /* _LINUX_SCHED_CPUTIME_H */
kernel/sched/core.c +5 -0
@@ -770,6 +770,11 @@ struct rq *task_rq_lock(struct task_struct *p, struct rq_flags *rf)* RQ-clock updating methods: */ +/* Use CONFIG_PARAVIRT as this will avoid more #ifdef in arch code. */ +#ifdef CONFIG_PARAVIRT +struct static_key paravirt_steal_rq_enabled; +#endif +static void update_rq_clock_task (struct rq *rq,s64 delta) {/*
kernel/sched/cputime.c +13 -0
@@ -251,6 +251,19 @@ void __account_forceidle_time(struct task_struct *p, u64 delta)* ticks are not redelivered later. Due to that, this function may on * occasion account more time than the calling functions think elapsed. */ +#ifdef CONFIG_PARAVIRT +struct static_key paravirt_steal_enabled; + +#ifdef CONFIG_HAVE_PV_STEAL_CLOCK_GEN +static u64 native_steal_clock (int cpu) +{ +return 0 ; +} + +DEFINE_STATIC_CALL (pv_steal_clock, native_steal_clock); +#endif +#endif + static __always_inline u64 steal_account_process_time(u64 maxtime) {#ifdef CONFIG_PARAVIRT
kernel/sched/sched.h +1 -1
@@ -82,7 +82,7 @@ struct rt_rq;struct sched_group ;struct cpuidle_state ; -#ifdef CONFIG_PARAVIRT +#if defined(CONFIG_PARAVIRT ) && !defined(CONFIG_HAVE_PV_STEAL_CLOCK_GEN )# include <asm/paravirt.h> #endif
Signature · 1 line
2.51.0
[tip: x86/paravirt] sched: Move clock related paravirt code to kernel/sched
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: e6b2aa6d40045a3149071ca3af950ea8e6ff79c4 Gitweb: https://git.kernel.org/tip/e6b2aa6d40045a3149071ca3af950ea8e6ff79c4 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:05 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 15:39:14 +01:00
sched: Move clock related paravirt code to kernel/sched
Paravirt clock related functions are available in multiple archs.
In order to share the common parts, move the common static keys to kernel/sched/ and remove them from the arch specific files.
Make a common paravirt_steal_clock() implementation available in kernel/sched/cputime.c, guarding it with a new config option CONFIG_HAVE_PV_STEAL_CLOCK_GEN, which can be selected by an arch in case it wants to use that common variant.
--- arch/Kconfig | 3 +++ arch/arm/include/asm/paravirt.h | 4 ---- arch/arm/kernel/paravirt.c | 3 --- arch/arm64/include/asm/paravirt.h | 4 ---- arch/arm64/kernel/paravirt.c | 4 +--- arch/loongarch/include/asm/paravirt.h | 3 --- arch/loongarch/kernel/paravirt.c | 3 +-- arch/powerpc/include/asm/paravirt.h | 3 --- arch/powerpc/platforms/pseries/setup.c | 4 +--- arch/riscv/include/asm/paravirt.h | 4 ---- arch/riscv/kernel/paravirt.c | 4 +--- arch/x86/include/asm/paravirt.h | 4 ---- arch/x86/kernel/cpu/vmware.c | 1 + arch/x86/kernel/kvm.c | 1 + arch/x86/kernel/paravirt.c | 3 --- drivers/xen/time.c | 1 + include/linux/sched/cputime.h | 18 ++++++++++++++++++ kernel/sched/core.c | 5 +++++ kernel/sched/cputime.c | 13 +++++++++++++ kernel/sched/sched.h | 2 +- 20 files changed, 47 insertions(+), 40 deletions(-)
arch/Kconfig +3 -0
@@ -1056,6 +1056,9 @@ config HAVE_IRQ_TIME_ACCOUNTING Archs need to ensure they use a high enough resolution clock to support irq time accounting and then call enable_sched_clock_irqtime(). +config HAVE_PV_STEAL_CLOCK_GEN + bool + config HAVE_MOVE_PUD bool help
arch/arm/include/asm/paravirt.h +0 -4
@@ -5,10 +5,6 @@#ifdef CONFIG_PARAVIRT #include <linux/static_call_types.h> -struct static_key ; -extern struct static_key paravirt_steal_enabled; -extern struct static_key paravirt_steal_rq_enabled; -u64 dummy_steal_clock (int cpu);DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock);
arch/arm/kernel/paravirt.c +0 -3
@@ -12,9 +12,6 @@#include <linux/static_call.h> #include <asm/paravirt.h> -struct static_key paravirt_steal_enabled; -struct static_key paravirt_steal_rq_enabled; -static u64 native_steal_clock (int cpu) {return 0 ;
arch/arm64/include/asm/paravirt.h +0 -4
@@ -5,10 +5,6 @@#ifdef CONFIG_PARAVIRT #include <linux/static_call_types.h> -struct static_key ; -extern struct static_key paravirt_steal_enabled; -extern struct static_key paravirt_steal_rq_enabled; -u64 dummy_steal_clock (int cpu);DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock);
arch/arm64/kernel/paravirt.c +1 -3
@@ -19,14 +19,12 @@#include <linux/slab.h> #include <linux/types.h> #include <linux/static_call.h> +#include <linux/sched/cputime.h> #include <asm/paravirt.h> #include <asm/pvclock-abi.h> #include <asm/smp_plat.h> -struct static_key paravirt_steal_enabled; -struct static_key paravirt_steal_rq_enabled; -static u64 native_steal_clock (int cpu) {return 0 ;
arch/loongarch/include/asm/paravirt.h +0 -3
@@ -5,9 +5,6 @@#ifdef CONFIG_PARAVIRT #include <linux/static_call_types.h> -struct static_key ; -extern struct static_key paravirt_steal_enabled; -extern struct static_key paravirt_steal_rq_enabled;u64 dummy_steal_clock (int cpu);DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock);
arch/loongarch/kernel/paravirt.c +1 -2
@@ -6,11 +6,10 @@#include <linux/kvm_para.h> #include <linux/reboot.h> #include <linux/static_call.h> +#include <linux/sched/cputime.h> #include <asm/paravirt.h> static int has_steal_clock; -struct static_key paravirt_steal_enabled; -struct static_key paravirt_steal_rq_enabled; static DEFINE_PER_CPU(struct kvm_steal_time, steal_time) __aligned(64);DEFINE_STATIC_KEY_FALSE (virt_spin_lock_key);
arch/powerpc/include/asm/paravirt.h +0 -3
@@ -23,9 +23,6 @@ static inline bool is_shared_processor(void) }#ifdef CONFIG_PARAVIRT_TIME_ACCOUNTING -extern struct static_key paravirt_steal_enabled; -extern struct static_key paravirt_steal_rq_enabled; -u64 pseries_paravirt_steal_clock (int cpu);static inline u64 paravirt_steal_clock (int cpu)
arch/powerpc/platforms/pseries/setup.c +1 -3
@@ -42,6 +42,7 @@#include <linux/memblock.h> #include <linux/swiotlb.h> #include <linux/seq_buf.h> +#include <linux/sched/cputime.h> #include <asm/mmu.h> #include <asm/processor.h>
@@ -83,9 +84,6 @@ DEFINE_STATIC_KEY_FALSE(shared_processor);EXPORT_SYMBOL (shared_processor);#ifdef CONFIG_PARAVIRT_TIME_ACCOUNTING -struct static_key paravirt_steal_enabled; -struct static_key paravirt_steal_rq_enabled; -static bool steal_acc = true;static int __init parse_no_stealacc (char *arg) {
arch/riscv/include/asm/paravirt.h +0 -4
@@ -5,10 +5,6 @@#ifdef CONFIG_PARAVIRT #include <linux/static_call_types.h> -struct static_key ; -extern struct static_key paravirt_steal_enabled; -extern struct static_key paravirt_steal_rq_enabled; -u64 dummy_steal_clock (int cpu);DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock);
arch/riscv/kernel/paravirt.c +1 -3
@@ -16,15 +16,13 @@#include <linux/printk.h> #include <linux/static_call.h> #include <linux/types.h> +#include <linux/sched/cputime.h> #include <asm/barrier.h> #include <asm/page.h> #include <asm/paravirt.h> #include <asm/sbi.h> -struct static_key paravirt_steal_enabled; -struct static_key paravirt_steal_rq_enabled; -static u64 native_steal_clock (int cpu) {return 0 ;
arch/x86/include/asm/paravirt.h +0 -4
@@ -30,10 +30,6 @@ static __always_inline u64 paravirt_sched_clock(void)return static_call (pv_sched_clock)(); } -struct static_key ; -extern struct static_key paravirt_steal_enabled; -extern struct static_key paravirt_steal_rq_enabled; - __visible void __native_queued_spin_unlock(struct qspinlock *lock);bool pv_is_native_spin_unlock (void ); __visible bool __native_vcpu_is_preempted(long cpu);
arch/x86/kernel/cpu/vmware.c +1 -0
@@ -29,6 +29,7 @@#include <linux/efi.h> #include <linux/reboot.h> #include <linux/static_call.h> +#include <linux/sched/cputime.h> #include <asm/div64.h> #include <asm/x86_init.h> #include <asm/hypervisor.h>
arch/x86/kernel/kvm.c +1 -0
@@ -30,6 +30,7 @@#include <linux/cc_platform.h> #include <linux/efi.h> #include <linux/kvm_types.h> +#include <linux/sched/cputime.h> #include <asm/timer.h> #include <asm/cpu.h> #include <asm/traps.h>
arch/x86/kernel/paravirt.c +0 -3
@@ -60,9 +60,6 @@ void __init native_pv_lock_init(void)static_branch_enable (&virt_spin_lock_key); } -struct static_key paravirt_steal_enabled; -struct static_key paravirt_steal_rq_enabled; -static u64 native_steal_clock (int cpu) {return 0 ;
drivers/xen/time.c +1 -0
@@ -8,6 +8,7 @@#include <linux/gfp.h> #include <linux/slab.h> #include <linux/static_call.h> +#include <linux/sched/cputime.h> #include <asm/paravirt.h> #include <asm/xen/hypervisor.h>
include/linux/sched/cputime.h +18 -0
@@ -2,6 +2,7 @@#ifndef _LINUX_SCHED_CPUTIME_H#define _LINUX_SCHED_CPUTIME_H +#include <linux/static_call_types.h> #include <linux/sched/signal.h> /*
@@ -180,4 +181,21 @@ static inline void prev_cputime_init(struct prev_cputime *prev)extern unsigned long long task_sched_runtime (struct task_struct *task); +#ifdef CONFIG_PARAVIRT +struct static_key ; +extern struct static_key paravirt_steal_enabled; +extern struct static_key paravirt_steal_rq_enabled; + +#ifdef CONFIG_HAVE_PV_STEAL_CLOCK_GEN +u64 dummy_steal_clock (int cpu); + +DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock); + +static inline u64 paravirt_steal_clock (int cpu) +{ +return static_call (pv_steal_clock)(cpu); +} +#endif +#endif +#endif /* _LINUX_SCHED_CPUTIME_H */
kernel/sched/core.c +5 -0
@@ -770,6 +770,11 @@ struct rq *task_rq_lock(struct task_struct *p, struct rq_flags *rf)* RQ-clock updating methods: */ +/* Use CONFIG_PARAVIRT as this will avoid more #ifdef in arch code. */ +#ifdef CONFIG_PARAVIRT +struct static_key paravirt_steal_rq_enabled; +#endif +static void update_rq_clock_task (struct rq *rq,s64 delta) {/*
kernel/sched/cputime.c +13 -0
@@ -251,6 +251,19 @@ void __account_forceidle_time(struct task_struct *p, u64 delta)* ticks are not redelivered later. Due to that, this function may on * occasion account more time than the calling functions think elapsed. */ +#ifdef CONFIG_PARAVIRT +struct static_key paravirt_steal_enabled; + +#ifdef CONFIG_HAVE_PV_STEAL_CLOCK_GEN +static u64 native_steal_clock (int cpu) +{ +return 0 ; +} + +DEFINE_STATIC_CALL (pv_steal_clock, native_steal_clock); +#endif +#endif + static __always_inline u64 steal_account_process_time(u64 maxtime) {#ifdef CONFIG_PARAVIRT
kernel/sched/sched.h +1 -1
@@ -82,7 +82,7 @@ struct rt_rq;struct sched_group ;struct cpuidle_state ; -#ifdef CONFIG_PARAVIRT +#if defined(CONFIG_PARAVIRT ) && !defined(CONFIG_HAVE_PV_STEAL_CLOCK_GEN )# include <asm/paravirt.h> #endif
Juergen Gross
maintainerPATCH v5 7/21 arm/paravirt: Use common code for paravirt_steal_clock()
In reply to Juergen GrossRemove the arch specific variant of paravirt_steal_clock() and use the common one instead.
This allows to remove paravirt.c and paravirt.h from arch/arm.
Until all archs supporting Xen have been switched to the common code of paravirt_steal_clock(), drivers/xen/time.c needs to include asm/paravirt.h for those archs, while this is not necessary for arm any longer.
--- arch/arm/Kconfig | 1 + arch/arm/include/asm/paravirt.h | 18 ------------------ arch/arm/kernel/Makefile | 1 - arch/arm/kernel/paravirt.c | 20 -------------------- drivers/xen/time.c | 2 ++ 5 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 arch/arm/include/asm/paravirt.h delete mode 100644 arch/arm/kernel/paravirt.c
arch/arm/Kconfig +1 -0
@@ -1320,6 +1320,7 @@ config UACCESS_WITH_MEMCPY config PARAVIRT bool "Enable paravirtualization code" + select HAVE_PV_STEAL_CLOCK_GEN help This changes the kernel so it can modify itself when it is run under a hypervisor, potentially improving performance significantly
arch/arm/include/asm/paravirt.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_ARM_PARAVIRT_H -#define _ASM_ARM_PARAVIRT_H - -#ifdef CONFIG_PARAVIRT -#include <linux/static_call_types.h> - -u64 dummy_steal_clock (int cpu); - -DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock); - -static inline u64 paravirt_steal_clock (int cpu) -{ -return static_call (pv_steal_clock)(cpu); -} -#endif - -#endif
arch/arm/kernel/Makefile +0 -1
@@ -83,7 +83,6 @@ AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o obj-$(CONFIG_VDSO) += vdso.o obj-$(CONFIG_EFI) += efi.o -obj-$(CONFIG_PARAVIRT) += paravirt.o obj-y += head$(MMUEXT).o obj-$(CONFIG_DEBUG_LL) += debug.o
arch/arm/kernel/paravirt.c deleted +0 -20
@@ -1,20 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* -* -* Copyright (C) 2013 Citrix Systems -* -* Author: Stefano Stabellini <[email protected]> -*/ - -#include <linux/export.h> -#include <linux/jump_label.h> -#include <linux/types.h> -#include <linux/static_call.h> -#include <asm/paravirt.h> - -static u64 native_steal_clock (int cpu) -{ -return 0 ; -} - -DEFINE_STATIC_CALL (pv_steal_clock, native_steal_clock);
drivers/xen/time.c +2 -0
@@ -10,7 +10,9 @@#include <linux/static_call.h> #include <linux/sched/cputime.h> +#ifndef CONFIG_HAVE_PV_STEAL_CLOCK_GEN #include <asm/paravirt.h> +#endif #include <asm/xen/hypervisor.h> #include <asm/xen/hypercall.h>
Signature · 1 line
2.51.0
[tip: x86/paravirt] arm/paravirt: Use common code for paravirt_steal_clock()
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: 15518e633b7c1780d866365a9ee660af5c2ce9a1 Gitweb: https://git.kernel.org/tip/15518e633b7c1780d866365a9ee660af5c2ce9a1 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:06 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 15:57:23 +01:00
arm/paravirt: Use common code for paravirt_steal_clock()
Remove the arch-specific variant of paravirt_steal_clock() and use the common one instead.
This allows to remove paravirt.c and paravirt.h from arch/arm.
Until all archs supporting Xen have been switched to the common code of paravirt_steal_clock(), drivers/xen/time.c needs to include asm/paravirt.h for those archs, while this is not necessary for arm any longer.
--- arch/arm/Kconfig | 1 + arch/arm/include/asm/paravirt.h | 18 ------------------ arch/arm/kernel/Makefile | 1 - arch/arm/kernel/paravirt.c | 20 -------------------- drivers/xen/time.c | 2 ++ 5 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 arch/arm/include/asm/paravirt.h delete mode 100644 arch/arm/kernel/paravirt.c
arch/arm/Kconfig +1 -0
@@ -1320,6 +1320,7 @@ config UACCESS_WITH_MEMCPY config PARAVIRT bool "Enable paravirtualization code" + select HAVE_PV_STEAL_CLOCK_GEN help This changes the kernel so it can modify itself when it is run under a hypervisor, potentially improving performance significantly
arch/arm/include/asm/paravirt.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_ARM_PARAVIRT_H -#define _ASM_ARM_PARAVIRT_H - -#ifdef CONFIG_PARAVIRT -#include <linux/static_call_types.h> - -u64 dummy_steal_clock (int cpu); - -DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock); - -static inline u64 paravirt_steal_clock (int cpu) -{ -return static_call (pv_steal_clock)(cpu); -} -#endif - -#endif
arch/arm/kernel/Makefile +0 -1
@@ -83,7 +83,6 @@ AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o obj-$(CONFIG_VDSO) += vdso.o obj-$(CONFIG_EFI) += efi.o -obj-$(CONFIG_PARAVIRT) += paravirt.o obj-y += head$(MMUEXT).o obj-$(CONFIG_DEBUG_LL) += debug.o
arch/arm/kernel/paravirt.c deleted +0 -20
@@ -1,20 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* -* -* Copyright (C) 2013 Citrix Systems -* -* Author: Stefano Stabellini <[email protected]> -*/ - -#include <linux/export.h> -#include <linux/jump_label.h> -#include <linux/types.h> -#include <linux/static_call.h> -#include <asm/paravirt.h> - -static u64 native_steal_clock (int cpu) -{ -return 0 ; -} - -DEFINE_STATIC_CALL (pv_steal_clock, native_steal_clock);
drivers/xen/time.c +2 -0
@@ -10,7 +10,9 @@#include <linux/static_call.h> #include <linux/sched/cputime.h> +#ifndef CONFIG_HAVE_PV_STEAL_CLOCK_GEN #include <asm/paravirt.h> +#endif #include <asm/xen/hypervisor.h> #include <asm/xen/hypercall.h>
Juergen Gross
maintainerPATCH v5 8/21 arm64/paravirt: Use common code for paravirt_steal_clock()
In reply to Juergen GrossRemove the arch specific variant of paravirt_steal_clock() and use the common one instead.
--- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/paravirt.h | 10 ---------- arch/arm64/kernel/paravirt.c | 7 ------- 3 files changed, 1 insertion(+), 17 deletions(-)
arch/arm64/Kconfig +1 -0
@@ -1561,6 +1561,7 @@ config CC_HAVE_SHADOW_CALL_STACK config PARAVIRT bool "Enable paravirtualization code" + select HAVE_PV_STEAL_CLOCK_GEN help This changes the kernel so it can modify itself when it is run under a hypervisor, potentially improving performance significantly
arch/arm64/include/asm/paravirt.h +0 -10
@@ -3,16 +3,6 @@#define _ASM_ARM64_PARAVIRT_H#ifdef CONFIG_PARAVIRT -#include <linux/static_call_types.h> - -u64 dummy_steal_clock (int cpu); - -DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock); - -static inline u64 paravirt_steal_clock (int cpu) -{ -return static_call (pv_steal_clock)(cpu); -}int __init pv_time_init (void );
arch/arm64/kernel/paravirt.c +0 -7
@@ -25,13 +25,6 @@#include <asm/pvclock-abi.h> #include <asm/smp_plat.h> -static u64 native_steal_clock (int cpu) -{ -return 0 ; -} - -DEFINE_STATIC_CALL (pv_steal_clock, native_steal_clock); -struct pv_time_stolen_time_region {struct pvclock_vcpu_stolen_time __rcu *kaddr; };
Signature · 1 line
2.51.0
[tip: x86/paravirt] arm64/paravirt: Use common code for paravirt_steal_clock()
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: ad892c4851577ab03c9a297f5addb8450cf844fd Gitweb: https://git.kernel.org/tip/ad892c4851577ab03c9a297f5addb8450cf844fd Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:07 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 16:30:00 +01:00
arm64/paravirt: Use common code for paravirt_steal_clock()
Remove the arch-specific variant of paravirt_steal_clock() and use the common one instead.
--- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/paravirt.h | 10 ---------- arch/arm64/kernel/paravirt.c | 7 ------- 3 files changed, 1 insertion(+), 17 deletions(-)
arch/arm64/Kconfig +1 -0
@@ -1561,6 +1561,7 @@ config CC_HAVE_SHADOW_CALL_STACK config PARAVIRT bool "Enable paravirtualization code" + select HAVE_PV_STEAL_CLOCK_GEN help This changes the kernel so it can modify itself when it is run under a hypervisor, potentially improving performance significantly
arch/arm64/include/asm/paravirt.h +0 -10
@@ -3,16 +3,6 @@#define _ASM_ARM64_PARAVIRT_H#ifdef CONFIG_PARAVIRT -#include <linux/static_call_types.h> - -u64 dummy_steal_clock (int cpu); - -DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock); - -static inline u64 paravirt_steal_clock (int cpu) -{ -return static_call (pv_steal_clock)(cpu); -}int __init pv_time_init (void );
arch/arm64/kernel/paravirt.c +0 -7
@@ -25,13 +25,6 @@#include <asm/pvclock-abi.h> #include <asm/smp_plat.h> -static u64 native_steal_clock (int cpu) -{ -return 0 ; -} - -DEFINE_STATIC_CALL (pv_steal_clock, native_steal_clock); -struct pv_time_stolen_time_region {struct pvclock_vcpu_stolen_time __rcu *kaddr; };
Juergen Gross
maintainerPATCH v5 9/21 loongarch/paravirt: Use common code for paravirt_steal_clock()
In reply to Juergen GrossRemove the arch specific variant of paravirt_steal_clock() and use the common one instead.
--- arch/loongarch/Kconfig | 1 + arch/loongarch/include/asm/paravirt.h | 10 ---------- arch/loongarch/kernel/paravirt.c | 7 ------- 3 files changed, 1 insertion(+), 17 deletions(-)
arch/loongarch/Kconfig +1 -0
@@ -687,6 +687,7 @@ source "kernel/livepatch/Kconfig" config PARAVIRT bool "Enable paravirtualization code" depends on AS_HAS_LVZ_EXTENSION + select HAVE_PV_STEAL_CLOCK_GEN help This changes the kernel so it can modify itself when it is run under a hypervisor, potentially improving performance significantly
arch/loongarch/include/asm/paravirt.h +0 -10
@@ -4,16 +4,6 @@#ifdef CONFIG_PARAVIRT -#include <linux/static_call_types.h> - -u64 dummy_steal_clock (int cpu); -DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock); - -static inline u64 paravirt_steal_clock (int cpu) -{ -return static_call (pv_steal_clock)(cpu); -} -int __init pv_ipi_init (void );int __init pv_time_init (void );int __init pv_spinlock_init (void );
arch/loongarch/kernel/paravirt.c +0 -7
@@ -13,13 +13,6 @@ static int has_steal_clock; static DEFINE_PER_CPU(struct kvm_steal_time, steal_time) __aligned(64);DEFINE_STATIC_KEY_FALSE (virt_spin_lock_key); -static u64 native_steal_clock (int cpu) -{ -return 0 ; -} - -DEFINE_STATIC_CALL (pv_steal_clock, native_steal_clock); -static bool steal_acc = true;static int __init parse_no_stealacc (char *arg)
Signature · 1 line
2.51.0
[tip: x86/paravirt] loongarch/paravirt: Use common code for paravirt_steal_clock()
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: b8431b901e825222281bbd156ea8ee8dd60b58de Gitweb: https://git.kernel.org/tip/b8431b901e825222281bbd156ea8ee8dd60b58de Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:08 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 16:47:20 +01:00
loongarch/paravirt: Use common code for paravirt_steal_clock()
Remove the arch specific variant of paravirt_steal_clock() and use the common one instead.
--- arch/loongarch/Kconfig | 1 + arch/loongarch/include/asm/paravirt.h | 10 ---------- arch/loongarch/kernel/paravirt.c | 7 ------- 3 files changed, 1 insertion(+), 17 deletions(-)
arch/loongarch/Kconfig +1 -0
@@ -687,6 +687,7 @@ source "kernel/livepatch/Kconfig" config PARAVIRT bool "Enable paravirtualization code" depends on AS_HAS_LVZ_EXTENSION + select HAVE_PV_STEAL_CLOCK_GEN help This changes the kernel so it can modify itself when it is run under a hypervisor, potentially improving performance significantly
arch/loongarch/include/asm/paravirt.h +0 -10
@@ -4,16 +4,6 @@#ifdef CONFIG_PARAVIRT -#include <linux/static_call_types.h> - -u64 dummy_steal_clock (int cpu); -DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock); - -static inline u64 paravirt_steal_clock (int cpu) -{ -return static_call (pv_steal_clock)(cpu); -} -int __init pv_ipi_init (void );int __init pv_time_init (void );int __init pv_spinlock_init (void );
arch/loongarch/kernel/paravirt.c +0 -7
@@ -13,13 +13,6 @@ static int has_steal_clock; static DEFINE_PER_CPU(struct kvm_steal_time, steal_time) __aligned(64);DEFINE_STATIC_KEY_FALSE (virt_spin_lock_key); -static u64 native_steal_clock (int cpu) -{ -return 0 ; -} - -DEFINE_STATIC_CALL (pv_steal_clock, native_steal_clock); -static bool steal_acc = true;static int __init parse_no_stealacc (char *arg)
Juergen Gross
maintainerPATCH v5 10/21 riscv/paravirt: Use common code for paravirt_steal_clock()
In reply to Juergen GrossRemove the arch specific variant of paravirt_steal_clock() and use the common one instead.
--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/paravirt.h | 10 ---------- arch/riscv/kernel/paravirt.c | 7 ------- 3 files changed, 1 insertion(+), 17 deletions(-)
arch/riscv/Kconfig +1 -0
@@ -1111,6 +1111,7 @@ config COMPAT config PARAVIRT bool "Enable paravirtualization code" depends on RISCV_SBI + select HAVE_PV_STEAL_CLOCK_GEN help This changes the kernel so it can modify itself when it is run under a hypervisor, potentially improving performance significantly
arch/riscv/include/asm/paravirt.h +0 -10
@@ -3,16 +3,6 @@#define _ASM_RISCV_PARAVIRT_H#ifdef CONFIG_PARAVIRT -#include <linux/static_call_types.h> - -u64 dummy_steal_clock (int cpu); - -DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock); - -static inline u64 paravirt_steal_clock (int cpu) -{ -return static_call (pv_steal_clock)(cpu); -}int __init pv_time_init (void );
arch/riscv/kernel/paravirt.c +0 -7
@@ -23,13 +23,6 @@#include <asm/paravirt.h> #include <asm/sbi.h> -static u64 native_steal_clock (int cpu) -{ -return 0 ; -} - -DEFINE_STATIC_CALL (pv_steal_clock, native_steal_clock); -static bool steal_acc = true;static int __init parse_no_stealacc (char *arg) {
Signature · 1 line
2.51.0
[tip: x86/paravirt] riscv/paravirt: Use common code for paravirt_steal_clock()
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: ee9ffcf99f0758b612d48ee3ff03340da4d173f3 Gitweb: https://git.kernel.org/tip/ee9ffcf99f0758b612d48ee3ff03340da4d173f3 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:09 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 16:47:33 +01:00
riscv/paravirt: Use common code for paravirt_steal_clock()
Remove the arch specific variant of paravirt_steal_clock() and use the common one instead.
--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/paravirt.h | 10 ---------- arch/riscv/kernel/paravirt.c | 7 ------- 3 files changed, 1 insertion(+), 17 deletions(-)
arch/riscv/Kconfig +1 -0
@@ -1111,6 +1111,7 @@ config COMPAT config PARAVIRT bool "Enable paravirtualization code" depends on RISCV_SBI + select HAVE_PV_STEAL_CLOCK_GEN help This changes the kernel so it can modify itself when it is run under a hypervisor, potentially improving performance significantly
arch/riscv/include/asm/paravirt.h +0 -10
@@ -3,16 +3,6 @@#define _ASM_RISCV_PARAVIRT_H#ifdef CONFIG_PARAVIRT -#include <linux/static_call_types.h> - -u64 dummy_steal_clock (int cpu); - -DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock); - -static inline u64 paravirt_steal_clock (int cpu) -{ -return static_call (pv_steal_clock)(cpu); -}int __init pv_time_init (void );
arch/riscv/kernel/paravirt.c +0 -7
@@ -23,13 +23,6 @@#include <asm/paravirt.h> #include <asm/sbi.h> -static u64 native_steal_clock (int cpu) -{ -return 0 ; -} - -DEFINE_STATIC_CALL (pv_steal_clock, native_steal_clock); -static bool steal_acc = true;static int __init parse_no_stealacc (char *arg) {
Juergen Gross
maintainerPATCH v5 11/21 x86/paravirt: Use common code for paravirt_steal_clock()
In reply to Juergen GrossRemove the arch specific variant of paravirt_steal_clock() and use the common one instead.
With all archs supporting Xen now having been switched to the common variant, including paravirt.h can be dropped from drivers/xen/time.c.
--- arch/x86/Kconfig | 1 + arch/x86/include/asm/paravirt.h | 7 ------- arch/x86/kernel/paravirt.c | 6 ------ arch/x86/xen/time.c | 1 + drivers/xen/time.c | 3 --- 5 files changed, 2 insertions(+), 16 deletions(-)
arch/x86/Kconfig +1 -0
@@ -799,6 +799,7 @@ if HYPERVISOR_GUEST config PARAVIRT bool "Enable paravirtualization code" depends on HAVE_STATIC_CALL + select HAVE_PV_STEAL_CLOCK_GEN help This changes the kernel so it can modify itself when it is run under a hypervisor, potentially improving performance significantly
arch/x86/include/asm/paravirt.h +0 -7
@@ -17,10 +17,8 @@#include <linux/static_call_types.h> #include <asm/frame.h> -u64 dummy_steal_clock (int cpu);u64 dummy_sched_clock (void ); -DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock);DECLARE_STATIC_CALL (pv_sched_clock, dummy_sched_clock);void paravirt_set_sched_clock (u64 (*func)(void ));
@@ -35,11 +33,6 @@ bool pv_is_native_spin_unlock(void); __visible bool __native_vcpu_is_preempted(long cpu);bool pv_is_native_vcpu_is_preempted (void ); -static inline u64 paravirt_steal_clock (int cpu) -{ -return static_call (pv_steal_clock)(cpu); -} -#ifdef CONFIG_PARAVIRT_SPINLOCKS void __init paravirt_set_cap (void );#endif
arch/x86/kernel/paravirt.c +0 -6
@@ -60,12 +60,6 @@ void __init native_pv_lock_init(void)static_branch_enable (&virt_spin_lock_key); } -static u64 native_steal_clock (int cpu) -{ -return 0 ; -} - -DEFINE_STATIC_CALL (pv_steal_clock, native_steal_clock);DEFINE_STATIC_CALL (pv_sched_clock, native_sched_clock);void paravirt_set_sched_clock (u64 (*func)(void ))
arch/x86/xen/time.c +1 -0
@@ -16,6 +16,7 @@#include <linux/slab.h> #include <linux/pvclock_gtod.h> #include <linux/timekeeper_internal.h> +#include <linux/sched/cputime.h> #include <asm/pvclock.h> #include <asm/xen/hypervisor.h>
drivers/xen/time.c +0 -3
@@ -10,9 +10,6 @@#include <linux/static_call.h> #include <linux/sched/cputime.h> -#ifndef CONFIG_HAVE_PV_STEAL_CLOCK_GEN -#include <asm/paravirt.h> -#endif #include <asm/xen/hypervisor.h> #include <asm/xen/hypercall.h>
Signature · 1 line
2.51.0
[tip: x86/paravirt] x86/paravirt: Use common code for paravirt_steal_clock()
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: 589f41f2f08bb48e041b513e49f9f61eec232d64 Gitweb: https://git.kernel.org/tip/589f41f2f08bb48e041b513e49f9f61eec232d64 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:10 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 16:48:26 +01:00
x86/paravirt: Use common code for paravirt_steal_clock()
Remove the arch-specific variant of paravirt_steal_clock() and use the common one instead.
With all archs supporting Xen now having been switched to the common variant, including paravirt.h can be dropped from drivers/xen/time.c.
--- arch/x86/Kconfig | 1 + arch/x86/include/asm/paravirt.h | 7 ------- arch/x86/kernel/paravirt.c | 6 ------ arch/x86/xen/time.c | 1 + drivers/xen/time.c | 3 --- 5 files changed, 2 insertions(+), 16 deletions(-)
arch/x86/Kconfig +1 -0
@@ -799,6 +799,7 @@ if HYPERVISOR_GUEST config PARAVIRT bool "Enable paravirtualization code" depends on HAVE_STATIC_CALL + select HAVE_PV_STEAL_CLOCK_GEN help This changes the kernel so it can modify itself when it is run under a hypervisor, potentially improving performance significantly
arch/x86/include/asm/paravirt.h +0 -7
@@ -17,10 +17,8 @@#include <linux/static_call_types.h> #include <asm/frame.h> -u64 dummy_steal_clock (int cpu);u64 dummy_sched_clock (void ); -DECLARE_STATIC_CALL (pv_steal_clock, dummy_steal_clock);DECLARE_STATIC_CALL (pv_sched_clock, dummy_sched_clock);void paravirt_set_sched_clock (u64 (*func)(void ));
@@ -35,11 +33,6 @@ bool pv_is_native_spin_unlock(void); __visible bool __native_vcpu_is_preempted(long cpu);bool pv_is_native_vcpu_is_preempted (void ); -static inline u64 paravirt_steal_clock (int cpu) -{ -return static_call (pv_steal_clock)(cpu); -} -#ifdef CONFIG_PARAVIRT_SPINLOCKS void __init paravirt_set_cap (void );#endif
arch/x86/kernel/paravirt.c +0 -6
@@ -60,12 +60,6 @@ void __init native_pv_lock_init(void)static_branch_enable (&virt_spin_lock_key); } -static u64 native_steal_clock (int cpu) -{ -return 0 ; -} - -DEFINE_STATIC_CALL (pv_steal_clock, native_steal_clock);DEFINE_STATIC_CALL (pv_sched_clock, native_sched_clock);void paravirt_set_sched_clock (u64 (*func)(void ))
arch/x86/xen/time.c +1 -0
@@ -16,6 +16,7 @@#include <linux/slab.h> #include <linux/pvclock_gtod.h> #include <linux/timekeeper_internal.h> +#include <linux/sched/cputime.h> #include <asm/pvclock.h> #include <asm/xen/hypervisor.h>
drivers/xen/time.c +0 -3
@@ -10,9 +10,6 @@#include <linux/static_call.h> #include <linux/sched/cputime.h> -#ifndef CONFIG_HAVE_PV_STEAL_CLOCK_GEN -#include <asm/paravirt.h> -#endif #include <asm/xen/hypervisor.h> #include <asm/xen/hypercall.h>
Juergen Gross
maintainerPATCH v5 12/21 x86/paravirt: Move paravirt_sched_clock() related code into tsc.c
In reply to Juergen GrossThe only user of paravirt_sched_clock() is in tsc.c, so move the code from paravirt.c and paravirt.h to tsc.c.
--- arch/x86/include/asm/paravirt.h | 12 ------------ arch/x86/include/asm/timer.h | 1 + arch/x86/kernel/kvmclock.c | 1 + arch/x86/kernel/paravirt.c | 7 ------- arch/x86/kernel/tsc.c | 10 +++++++++- arch/x86/xen/time.c | 1 + drivers/clocksource/hyperv_timer.c | 2 ++ 7 files changed, 14 insertions(+), 20 deletions(-)
arch/x86/include/asm/paravirt.h +0 -12
@@ -14,20 +14,8 @@#ifndef __ASSEMBLER__#include <linux/types.h> #include <linux/cpumask.h> -#include <linux/static_call_types.h> #include <asm/frame.h> -u64 dummy_sched_clock (void ); - -DECLARE_STATIC_CALL (pv_sched_clock, dummy_sched_clock); - -void paravirt_set_sched_clock (u64 (*func)(void )); - -static __always_inline u64 paravirt_sched_clock(void) -{ -return static_call (pv_sched_clock)(); -} - __visible void __native_queued_spin_unlock(struct qspinlock *lock);bool pv_is_native_spin_unlock (void ); __visible bool __native_vcpu_is_preempted(long cpu);
arch/x86/include/asm/timer.h +1 -0
@@ -12,6 +12,7 @@ extern void recalibrate_cpu_khz(void);extern int no_timer_check;extern bool using_native_sched_clock (void ); +void paravirt_set_sched_clock (u64 (*func)(void ));/* * We use the full linear equation: f(x) = a + b*x, in order to allow
arch/x86/kernel/kvmclock.c +1 -0
@@ -19,6 +19,7 @@#include <linux/cc_platform.h> #include <asm/hypervisor.h> +#include <asm/timer.h> #include <asm/x86_init.h> #include <asm/kvmclock.h>
arch/x86/kernel/paravirt.c +0 -7
@@ -60,13 +60,6 @@ void __init native_pv_lock_init(void)static_branch_enable (&virt_spin_lock_key); } -DEFINE_STATIC_CALL (pv_sched_clock, native_sched_clock); - -void paravirt_set_sched_clock (u64 (*func)(void )) -{ -static_call_update (pv_sched_clock, func); -} - static noinstr void pv_native_safe_halt(void) {native_safe_halt ();
arch/x86/kernel/tsc.c +9 -1
@@ -267,19 +267,27 @@ u64 native_sched_clock_from_tsc(u64 tsc)/* We need to define a real function for sched_clock, to override the weak default version */ #ifdef CONFIG_PARAVIRT +DEFINE_STATIC_CALL (pv_sched_clock, native_sched_clock); + noinstr u64 sched_clock_noinstr(void) { -return paravirt_sched_clock (); +return static_call (pv_sched_clock)(); }bool using_native_sched_clock (void ) {return static_call_query (pv_sched_clock) == native_sched_clock; } + +void paravirt_set_sched_clock (u64 (*func)(void )) +{ +static_call_update (pv_sched_clock, func); +}#else u64 sched_clock_noinstr (void ) __attribute__((alias ("native_sched_clock" )));bool using_native_sched_clock (void ) {return true; } +void paravirt_set_sched_clock (u64 (*func)(void )) { }#endif notrace u64 sched_clock(void)
arch/x86/xen/time.c +1 -0
@@ -19,6 +19,7 @@#include <linux/sched/cputime.h> #include <asm/pvclock.h> +#include <asm/timer.h> #include <asm/xen/hypervisor.h> #include <asm/xen/hypercall.h> #include <asm/xen/cpuid.h>
drivers/clocksource/hyperv_timer.c +2 -0
@@ -535,6 +535,8 @@ static __always_inline void hv_setup_sched_clock(void *sched_clock)sched_clock_register (sched_clock,64 ,NSEC_PER_SEC ); }#elif definedCONFIG_PARAVIRT +#include <asm/timer.h> + static __always_inline void hv_setup_sched_clock(void *sched_clock) {/* We're on x86/x64 *and* using PV ops */
Signature · 1 line
2.51.0
Re: [PATCH v5 12/21] x86/paravirt: Move paravirt_sched_clock() related code into tsc.c
Quoted 5 lines · Juergen Gross
The only user of
paravirt_sched_clock()is intsc.c, so move the code fromparavirt.candparavirt.htotsc.c.Signed-off-by Juergen Gross <[email protected]>
Quoted 8 lines
--- arch/x86/include/asm/paravirt.h | 12 ------------ arch/x86/include/asm/timer.h | 1 + arch/x86/kernel/kvmclock.c | 1 + arch/x86/kernel/paravirt.c | 7 ------- arch/x86/kernel/tsc.c | 10 +++++++++- arch/x86/xen/time.c | 1 + drivers/clocksource/hyperv_timer.c | 2 ++
[tip: x86/paravirt] x86/paravirt: Move paravirt_sched_clock() related code into tsc.c
In reply to Juergen GrossThe following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: 39965afb11511003cf7d8f34579bd592b8b70b80 Gitweb: https://git.kernel.org/tip/39965afb11511003cf7d8f34579bd592b8b70b80 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:11 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 18:47:39 +01:00
x86/paravirt: Move paravirt_sched_clock() related code into tsc.c
The only user of paravirt_sched_clock() is in tsc.c, so move the code from paravirt.c and paravirt.h to tsc.c.
--- arch/x86/include/asm/paravirt.h | 12 ------------ arch/x86/include/asm/timer.h | 1 + arch/x86/kernel/kvmclock.c | 1 + arch/x86/kernel/paravirt.c | 7 ------- arch/x86/kernel/tsc.c | 10 +++++++++- arch/x86/xen/time.c | 1 + drivers/clocksource/hyperv_timer.c | 2 ++ 7 files changed, 14 insertions(+), 20 deletions(-)
arch/x86/include/asm/paravirt.h +0 -12
@@ -14,20 +14,8 @@#ifndef __ASSEMBLER__#include <linux/types.h> #include <linux/cpumask.h> -#include <linux/static_call_types.h> #include <asm/frame.h> -u64 dummy_sched_clock (void ); - -DECLARE_STATIC_CALL (pv_sched_clock, dummy_sched_clock); - -void paravirt_set_sched_clock (u64 (*func)(void )); - -static __always_inline u64 paravirt_sched_clock(void) -{ -return static_call (pv_sched_clock)(); -} - __visible void __native_queued_spin_unlock(struct qspinlock *lock);bool pv_is_native_spin_unlock (void ); __visible bool __native_vcpu_is_preempted(long cpu);
arch/x86/include/asm/timer.h +1 -0
@@ -12,6 +12,7 @@ extern void recalibrate_cpu_khz(void);extern int no_timer_check;extern bool using_native_sched_clock (void ); +void paravirt_set_sched_clock (u64 (*func)(void ));/* * We use the full linear equation: f(x) = a + b*x, in order to allow
arch/x86/kernel/kvmclock.c +1 -0
@@ -19,6 +19,7 @@#include <linux/cc_platform.h> #include <asm/hypervisor.h> +#include <asm/timer.h> #include <asm/x86_init.h> #include <asm/kvmclock.h>
arch/x86/kernel/paravirt.c +0 -7
@@ -60,13 +60,6 @@ void __init native_pv_lock_init(void)static_branch_enable (&virt_spin_lock_key); } -DEFINE_STATIC_CALL (pv_sched_clock, native_sched_clock); - -void paravirt_set_sched_clock (u64 (*func)(void )) -{ -static_call_update (pv_sched_clock, func); -} - static noinstr void pv_native_safe_halt(void) {native_safe_halt ();
arch/x86/kernel/tsc.c +9 -1
@@ -267,19 +267,27 @@ u64 native_sched_clock_from_tsc(u64 tsc)/* We need to define a real function for sched_clock, to override the weak default version */ #ifdef CONFIG_PARAVIRT +DEFINE_STATIC_CALL (pv_sched_clock, native_sched_clock); + noinstr u64 sched_clock_noinstr(void) { -return paravirt_sched_clock (); +return static_call (pv_sched_clock)(); }bool using_native_sched_clock (void ) {return static_call_query (pv_sched_clock) == native_sched_clock; } + +void paravirt_set_sched_clock (u64 (*func)(void )) +{ +static_call_update (pv_sched_clock, func); +}#else u64 sched_clock_noinstr (void ) __attribute__((alias ("native_sched_clock" )));bool using_native_sched_clock (void ) {return true; } +void paravirt_set_sched_clock (u64 (*func)(void )) { }#endif notrace u64 sched_clock(void)
arch/x86/xen/time.c +1 -0
@@ -19,6 +19,7 @@#include <linux/sched/cputime.h> #include <asm/pvclock.h> +#include <asm/timer.h> #include <asm/xen/hypervisor.h> #include <asm/xen/hypercall.h> #include <asm/xen/cpuid.h>
drivers/clocksource/hyperv_timer.c +2 -0
@@ -535,6 +535,8 @@ static __always_inline void hv_setup_sched_clock(void *sched_clock)sched_clock_register (sched_clock,64 ,NSEC_PER_SEC ); }#elif definedCONFIG_PARAVIRT +#include <asm/timer.h> + static __always_inline void hv_setup_sched_clock(void *sched_clock) {/* We're on x86/x64 *and* using PV ops */
Juergen Gross
maintainerPATCH v5 13/21 x86/paravirt: Introduce new paravirt-base.h header
In reply to Juergen GrossMove the pv_info related definitions and the declarations of the global paravirt function primitives into a new header file paravirt-base.h.
This enables to use that header instead of paravirt_types.h in ptrace.h.
Additionally it is in preparation of reducing include hell with paravirt enabled.
---
V2:
- new patch
--- arch/x86/include/asm/paravirt-base.h | 29 +++++++++++++++++++++++++++ arch/x86/include/asm/paravirt.h | 4 +++- arch/x86/include/asm/paravirt_types.h | 23 +-------------------- arch/x86/include/asm/ptrace.h | 2 +- 4 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 arch/x86/include/asm/paravirt-base.h
arch/x86/include/asm/paravirt-base.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _ASM_X86_PARAVIRT_BASE_H +#define _ASM_X86_PARAVIRT_BASE_H + +/* +* Wrapper type for pointers to code which uses the non-standard +* calling convention. See PV_CALL_SAVE_REGS_THUNK below. +*/ +struct paravirt_callee_save { +void *func; +}; + +struct pv_info { +#ifdef CONFIG_PARAVIRT_XXL +u16 extra_user_64bit_cs;/* __USER_CS if none */ +#endif +const char *name; +}; + +void default_banner (void ); +extern struct pv_info pv_info; +unsigned long paravirt_ret0 (void ); +#ifdef CONFIG_PARAVIRT_XXL +u64 _paravirt_ident_64 (u64 ); +#endif +#define paravirt_nop ((void *)nop_func) + +#endif /* _ASM_X86_PARAVIRT_BASE_H */
arch/x86/include/asm/paravirt.h +3 -1
@@ -4,6 +4,9 @@/* Various instructions on x86 need to be replaced for * para-virtualization: those hooks are defined here. */ +#ifndef __ASSEMBLER__ +#include <asm/paravirt-base.h> +#endif #include <asm/paravirt_types.h> #ifdef CONFIG_PARAVIRT
@@ -601,7 +604,6 @@ static __always_inline unsigned long arch_local_irq_save(void)#undef PVOP_VCALL4#undef PVOP_CALL4 -extern void default_banner (void );void native_pv_lock_init (void )__init ;#else /* __ASSEMBLER__ */
arch/x86/include/asm/paravirt_types.h +1 -22
@@ -7,6 +7,7 @@#ifndef __ASSEMBLER__#include <linux/types.h> +#include <asm/paravirt-base.h> #include <asm/desc_defs.h> #include <asm/pgtable_types.h> #include <asm/nospec-branch.h>
@@ -18,23 +19,6 @@ struct cpumask;struct flush_tlb_info ;struct vm_area_struct ; -/* -* Wrapper type for pointers to code which uses the non-standard -* calling convention. See PV_CALL_SAVE_REGS_THUNK below. -*/ -struct paravirt_callee_save { -void *func; -}; - -/* general info */ -struct pv_info { -#ifdef CONFIG_PARAVIRT_XXL -u16 extra_user_64bit_cs;/* __USER_CS if none */ -#endif - -const char *name; -}; -#ifdef CONFIG_PARAVIRT_XXL struct pv_lazy_ops {/* Set deferred update mode, used for batching operations. */
@@ -226,7 +210,6 @@ struct paravirt_patch_template {struct pv_lock_ops lock; } __no_randomize_layout; -extern struct pv_info pv_info;extern struct paravirt_patch_template pv_ops;#define paravirt_ptr (op) [paravirt_opptr] "m" (pv_ops.op)
@@ -497,17 +480,13 @@ extern struct paravirt_patch_template pv_ops;__PVOP_VCALL (op,PVOP_CALL_ARG1 (arg1),PVOP_CALL_ARG2 (arg2), \ PVOP_CALL_ARG3(arg3), PVOP_CALL_ARG4(arg4)) -unsigned long paravirt_ret0 (void );#ifdef CONFIG_PARAVIRT_XXL -u64 _paravirt_ident_64 (u64 );unsigned long pv_native_save_fl (void );void pv_native_irq_disable (void );void pv_native_irq_enable (void );unsigned long pv_native_read_cr2 (void );#endif -#define paravirt_nop ((void *)nop_func) -#endif /* __ASSEMBLER__ */ #define ALT_NOT_XEN ALT_NOT(X86_FEATURE_XENPV)
arch/x86/include/asm/ptrace.h +1 -1
@@ -172,7 +172,7 @@ struct pt_regs {#endif /* !__i386__ */ #ifdef CONFIG_PARAVIRT -#include <asm/paravirt_types.h> +#include <asm/paravirt-base.h> #endif #include <asm/proto.h>
Signature · 1 line
2.51.0
[tip: x86/paravirt] x86/paravirt: Introduce new paravirt-base.h header
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: f01b4f4a60191fa2a78931e2a3986983ec4f5334 Gitweb: https://git.kernel.org/tip/f01b4f4a60191fa2a78931e2a3986983ec4f5334 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:12 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 18:58:28 +01:00
x86/paravirt: Introduce new paravirt-base.h header
Move the pv_info related definitions and the declarations of the global paravirt function primitives into a new header file paravirt-base.h.
Use that header instead of paravirt_types.h in ptrace.h.
Additionally, this is a preparation to reduce the include hell with paravirt enabled.
[ bp: Massage commit message. ]
--- arch/x86/include/asm/paravirt-base.h | 29 ++++++++++++++++++++++++++- arch/x86/include/asm/paravirt.h | 4 +++- arch/x86/include/asm/paravirt_types.h | 23 +--------------------- arch/x86/include/asm/ptrace.h | 2 +- 4 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 arch/x86/include/asm/paravirt-base.h
arch/x86/include/asm/paravirt-base.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _ASM_X86_PARAVIRT_BASE_H +#define _ASM_X86_PARAVIRT_BASE_H + +/* +* Wrapper type for pointers to code which uses the non-standard +* calling convention. See PV_CALL_SAVE_REGS_THUNK below. +*/ +struct paravirt_callee_save { +void *func; +}; + +struct pv_info { +#ifdef CONFIG_PARAVIRT_XXL +u16 extra_user_64bit_cs;/* __USER_CS if none */ +#endif +const char *name; +}; + +void default_banner (void ); +extern struct pv_info pv_info; +unsigned long paravirt_ret0 (void ); +#ifdef CONFIG_PARAVIRT_XXL +u64 _paravirt_ident_64 (u64 ); +#endif +#define paravirt_nop ((void *)nop_func) + +#endif /* _ASM_X86_PARAVIRT_BASE_H */
arch/x86/include/asm/paravirt.h +3 -1
@@ -4,6 +4,9 @@/* Various instructions on x86 need to be replaced for * para-virtualization: those hooks are defined here. */ +#ifndef __ASSEMBLER__ +#include <asm/paravirt-base.h> +#endif #include <asm/paravirt_types.h> #ifdef CONFIG_PARAVIRT
@@ -601,7 +604,6 @@ static __always_inline unsigned long arch_local_irq_save(void)#undef PVOP_VCALL4#undef PVOP_CALL4 -extern void default_banner (void );void native_pv_lock_init (void )__init ;#else /* __ASSEMBLER__ */
arch/x86/include/asm/paravirt_types.h +1 -22
@@ -7,6 +7,7 @@#ifndef __ASSEMBLER__#include <linux/types.h> +#include <asm/paravirt-base.h> #include <asm/desc_defs.h> #include <asm/pgtable_types.h> #include <asm/nospec-branch.h>
@@ -18,23 +19,6 @@ struct cpumask;struct flush_tlb_info ;struct vm_area_struct ; -/* -* Wrapper type for pointers to code which uses the non-standard -* calling convention. See PV_CALL_SAVE_REGS_THUNK below. -*/ -struct paravirt_callee_save { -void *func; -}; - -/* general info */ -struct pv_info { -#ifdef CONFIG_PARAVIRT_XXL -u16 extra_user_64bit_cs;/* __USER_CS if none */ -#endif - -const char *name; -}; -#ifdef CONFIG_PARAVIRT_XXL struct pv_lazy_ops {/* Set deferred update mode, used for batching operations. */
@@ -226,7 +210,6 @@ struct paravirt_patch_template {struct pv_lock_ops lock; } __no_randomize_layout; -extern struct pv_info pv_info;extern struct paravirt_patch_template pv_ops;#define paravirt_ptr (op) [paravirt_opptr] "m" (pv_ops.op)
@@ -497,17 +480,13 @@ extern struct paravirt_patch_template pv_ops;__PVOP_VCALL (op,PVOP_CALL_ARG1 (arg1),PVOP_CALL_ARG2 (arg2), \ PVOP_CALL_ARG3(arg3), PVOP_CALL_ARG4(arg4)) -unsigned long paravirt_ret0 (void );#ifdef CONFIG_PARAVIRT_XXL -u64 _paravirt_ident_64 (u64 );unsigned long pv_native_save_fl (void );void pv_native_irq_disable (void );void pv_native_irq_enable (void );unsigned long pv_native_read_cr2 (void );#endif -#define paravirt_nop ((void *)nop_func) -#endif /* __ASSEMBLER__ */ #define ALT_NOT_XEN ALT_NOT(X86_FEATURE_XENPV)
arch/x86/include/asm/ptrace.h +1 -1
@@ -172,7 +172,7 @@ struct pt_regs {#endif /* !__i386__ */ #ifdef CONFIG_PARAVIRT -#include <asm/paravirt_types.h> +#include <asm/paravirt-base.h> #endif #include <asm/proto.h>
Juergen Gross
maintainerPATCH v5 14/21 x86/paravirt: Move pv_native_*() prototypes to paravirt.c
In reply to Juergen GrossThe only reason the pv_native_*() prototypes are needed is the complete definition of those functions via an asm() statement, which makes it impossible to have those functions as static ones.
Move the prototypes from paravirt_types.h into paravirt.c, which is the only source referencing the functions.
---
V2:
- new patch
--- arch/x86/include/asm/paravirt_types.h | 7 ------- arch/x86/kernel/paravirt.c | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-)
arch/x86/include/asm/paravirt_types.h +0 -7
@@ -480,13 +480,6 @@ extern struct paravirt_patch_template pv_ops;__PVOP_VCALL (op,PVOP_CALL_ARG1 (arg1),PVOP_CALL_ARG2 (arg2), \ PVOP_CALL_ARG3(arg3), PVOP_CALL_ARG4(arg4)) -#ifdef CONFIG_PARAVIRT_XXL -unsigned long pv_native_save_fl (void ); -void pv_native_irq_disable (void ); -void pv_native_irq_enable (void ); -unsigned long pv_native_read_cr2 (void ); -#endif -#endif /* __ASSEMBLER__ */ #define ALT_NOT_XEN ALT_NOT(X86_FEATURE_XENPV)
arch/x86/kernel/paravirt.c +5 -0
@@ -45,6 +45,11 @@ void __init default_banner(void) }#ifdef CONFIG_PARAVIRT_XXL +unsigned long pv_native_save_fl (void ); +void pv_native_irq_disable (void ); +void pv_native_irq_enable (void ); +unsigned long pv_native_read_cr2 (void ); + DEFINE_ASM_FUNC(_paravirt_ident_64, "mov %rdi, %rax", .text); DEFINE_ASM_FUNC(pv_native_save_fl, "pushf; pop %rax", .noinstr.text); DEFINE_ASM_FUNC(pv_native_irq_disable, "cli", .noinstr.text);
Signature · 1 line
2.51.0
[tip: x86/paravirt] x86/paravirt: Move pv_native_*() prototypes to paravirt.c
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: 574b3eb843dea1ad99162e115abdb610b6780cbd Gitweb: https://git.kernel.org/tip/574b3eb843dea1ad99162e115abdb610b6780cbd Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:13 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 19:14:06 +01:00
x86/paravirt: Move pv_native_*() prototypes to paravirt.c
The only reason the pv_native_*() prototypes are needed is the complete definition of those functions via an asm() statement, which makes it impossible to have those functions as static ones.
Move the prototypes from paravirt_types.h into paravirt.c, which is the only source referencing the functions.
--- arch/x86/include/asm/paravirt_types.h | 7 ------- arch/x86/kernel/paravirt.c | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-)
arch/x86/include/asm/paravirt_types.h +0 -7
@@ -480,13 +480,6 @@ extern struct paravirt_patch_template pv_ops;__PVOP_VCALL (op,PVOP_CALL_ARG1 (arg1),PVOP_CALL_ARG2 (arg2), \ PVOP_CALL_ARG3(arg3), PVOP_CALL_ARG4(arg4)) -#ifdef CONFIG_PARAVIRT_XXL -unsigned long pv_native_save_fl (void ); -void pv_native_irq_disable (void ); -void pv_native_irq_enable (void ); -unsigned long pv_native_read_cr2 (void ); -#endif -#endif /* __ASSEMBLER__ */ #define ALT_NOT_XEN ALT_NOT(X86_FEATURE_XENPV)
arch/x86/kernel/paravirt.c +5 -0
@@ -45,6 +45,11 @@ void __init default_banner(void) }#ifdef CONFIG_PARAVIRT_XXL +unsigned long pv_native_save_fl (void ); +void pv_native_irq_disable (void ); +void pv_native_irq_enable (void ); +unsigned long pv_native_read_cr2 (void ); + DEFINE_ASM_FUNC(_paravirt_ident_64, "mov %rdi, %rax", .text); DEFINE_ASM_FUNC(pv_native_save_fl, "pushf; pop %rax", .noinstr.text); DEFINE_ASM_FUNC(pv_native_irq_disable, "cli", .noinstr.text);
Juergen Gross
maintainerPATCH v5 15/21 x86/xen: Drop xen_irq_ops
In reply to Juergen GrossInstead of having a pre-filled array xen_irq_ops for Xen PV paravirt functions, drop the array and assign each element individually.
This is in preparation of reducing the paravirt include hell by splitting paravirt.h into multiple more fine grained header files, which will in turn require to split up the pv_ops vector as well. Dropping the pre-filled array makes life easier for objtool to detect missing initializers in multiple pv_ops_ arrays.
---
V2:
- new patch
--- arch/x86/xen/irq.c | 20 +++++++------------- tools/objtool/check.c | 1 - 2 files changed, 7 insertions(+), 14 deletions(-)
arch/x86/xen/irq.c +7 -13
@@ -40,20 +40,14 @@ static void xen_halt(void)xen_safe_halt (); } -static const typeof (pv_ops) xen_irq_ops__initconst = { - .irq = { -/* Initial interrupt flag handling only called while interrupts off. */ - .save_fl =__PV_IS_CALLEE_SAVE (paravirt_ret0), - .irq_disable =__PV_IS_CALLEE_SAVE (paravirt_nop), - .irq_enable =__PV_IS_CALLEE_SAVE (BUG_func), - - .safe_halt = xen_safe_halt, - .halt = xen_halt, - }, -}; -void __init xen_init_irq_ops (void ) { - pv_ops.irq = xen_irq_ops.irq; +/* Initial interrupt flag handling only called while interrupts off. */ + pv_ops.irq.save_fl =__PV_IS_CALLEE_SAVE (paravirt_ret0); + pv_ops.irq.irq_disable =__PV_IS_CALLEE_SAVE (paravirt_nop); + pv_ops.irq.irq_enable =__PV_IS_CALLEE_SAVE (BUG_func); + pv_ops.irq.safe_halt = xen_safe_halt; + pv_ops.irq.halt = xen_halt; + x86_init.irqs.intr_init = xen_init_IRQ; }
tools/objtool/check.c +0 -1
@@ -571,7 +571,6 @@ static int init_pv_ops(struct objtool_file *file)static const char *pv_ops_tables[] = {"pv_ops" ,"xen_cpu_ops" , -"xen_irq_ops" ,"xen_mmu_ops" ,NULL , };
Signature · 1 line
2.51.0
[tip: x86/paravirt] x86/xen: Drop xen_irq_ops
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: bc5e8e2fa2e28ef6c2a55ae294d04100d4b1bffe Gitweb: https://git.kernel.org/tip/bc5e8e2fa2e28ef6c2a55ae294d04100d4b1bffe Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:14 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 19:37:38 +01:00
x86/xen: Drop xen_irq_ops
Instead of having a pre-filled array xen_irq_ops for Xen PV paravirt functions, drop the array and assign each element individually.
This is in preparation of reducing the paravirt include hell by splitting paravirt.h into multiple more fine grained header files, which will in turn require to split up the pv_ops vector as well. Dropping the pre-filled array makes life easier for objtool to detect missing initializers in multiple pv_ops_ arrays.
--- arch/x86/xen/irq.c | 20 +++++++------------- tools/objtool/check.c | 1 - 2 files changed, 7 insertions(+), 14 deletions(-)
arch/x86/xen/irq.c +7 -13
@@ -40,20 +40,14 @@ static void xen_halt(void)xen_safe_halt (); } -static const typeof (pv_ops) xen_irq_ops__initconst = { - .irq = { -/* Initial interrupt flag handling only called while interrupts off. */ - .save_fl =__PV_IS_CALLEE_SAVE (paravirt_ret0), - .irq_disable =__PV_IS_CALLEE_SAVE (paravirt_nop), - .irq_enable =__PV_IS_CALLEE_SAVE (BUG_func), - - .safe_halt = xen_safe_halt, - .halt = xen_halt, - }, -}; -void __init xen_init_irq_ops (void ) { - pv_ops.irq = xen_irq_ops.irq; +/* Initial interrupt flag handling only called while interrupts off. */ + pv_ops.irq.save_fl =__PV_IS_CALLEE_SAVE (paravirt_ret0); + pv_ops.irq.irq_disable =__PV_IS_CALLEE_SAVE (paravirt_nop); + pv_ops.irq.irq_enable =__PV_IS_CALLEE_SAVE (BUG_func); + pv_ops.irq.safe_halt = xen_safe_halt; + pv_ops.irq.halt = xen_halt; + x86_init.irqs.intr_init = xen_init_IRQ; }
tools/objtool/check.c +0 -1
@@ -571,7 +571,6 @@ static int init_pv_ops(struct objtool_file *file)static const char *pv_ops_tables[] = {"pv_ops" ,"xen_cpu_ops" , -"xen_irq_ops" ,"xen_mmu_ops" ,NULL , };
Juergen Gross
maintainerPATCH v5 16/21 x86/xen: Drop xen_cpu_ops
In reply to Juergen GrossInstead of having a pre-filled array xen_cpu_ops for Xen PV paravirt functions, drop the array and assign each element individually.
This is in preparation of reducing the paravirt include hell by splitting paravirt.h into multiple more fine grained header files, which will in turn require to split up the pv_ops vector as well. Dropping the pre-filled array makes life easier for objtool to detect missing initializers in multiple pv_ops_ arrays.
---
V2:
- new patch
--- arch/x86/xen/enlighten_pv.c | 82 +++++++++++++++---------------------- tools/objtool/check.c | 1 - 2 files changed, 33 insertions(+), 50 deletions(-)
arch/x86/xen/enlighten_pv.c +33 -49
@@ -1212,54 +1212,6 @@ static const struct pv_info xen_info __initconst = { .name = "Xen", }; -static const typeof (pv_ops) xen_cpu_ops__initconst = { - .cpu = { - .cpuid = xen_cpuid, - - .set_debugreg = xen_set_debugreg, - .get_debugreg = xen_get_debugreg, - - .read_cr0 = xen_read_cr0, - .write_cr0 = xen_write_cr0, - - .write_cr4 = xen_write_cr4, - - .read_msr = xen_read_msr, - .write_msr = xen_write_msr, - - .read_msr_safe = xen_read_msr_safe, - .write_msr_safe = xen_write_msr_safe, - - .read_pmc = xen_read_pmc, - - .load_tr_desc = paravirt_nop, - .set_ldt = xen_set_ldt, - .load_gdt = xen_load_gdt, - .load_idt = xen_load_idt, - .load_tls = xen_load_tls, - .load_gs_index = xen_load_gs_index, - - .alloc_ldt = xen_alloc_ldt, - .free_ldt = xen_free_ldt, - - .store_tr = xen_store_tr, - - .write_ldt_entry = xen_write_ldt_entry, - .write_gdt_entry = xen_write_gdt_entry, - .write_idt_entry = xen_write_idt_entry, - .load_sp0 = xen_load_sp0, - -#ifdef CONFIG_X86_IOPL_IOPERM - .invalidate_io_bitmap = xen_invalidate_io_bitmap, - .update_io_bitmap = xen_update_io_bitmap, -#endif - .io_delay = xen_io_delay, - - .start_context_switch = xen_start_context_switch, - .end_context_switch = xen_end_context_switch, - }, -}; -static void xen_restart (char *msg) {xen_reboot (SHUTDOWN_reboot);
@@ -1411,7 +1363,39 @@ asmlinkage __visible void __init xen_start_kernel(struct start_info *si)/* Install Xen paravirt ops */ pv_info = xen_info; - pv_ops.cpu = xen_cpu_ops.cpu; + + pv_ops.cpu.cpuid = xen_cpuid; + pv_ops.cpu.set_debugreg = xen_set_debugreg; + pv_ops.cpu.get_debugreg = xen_get_debugreg; + pv_ops.cpu.read_cr0 = xen_read_cr0; + pv_ops.cpu.write_cr0 = xen_write_cr0; + pv_ops.cpu.write_cr4 = xen_write_cr4; + pv_ops.cpu.read_msr = xen_read_msr; + pv_ops.cpu.write_msr = xen_write_msr; + pv_ops.cpu.read_msr_safe = xen_read_msr_safe; + pv_ops.cpu.write_msr_safe = xen_write_msr_safe; + pv_ops.cpu.read_pmc = xen_read_pmc; + pv_ops.cpu.load_tr_desc = paravirt_nop; + pv_ops.cpu.set_ldt = xen_set_ldt; + pv_ops.cpu.load_gdt = xen_load_gdt; + pv_ops.cpu.load_idt = xen_load_idt; + pv_ops.cpu.load_tls = xen_load_tls; + pv_ops.cpu.load_gs_index = xen_load_gs_index; + pv_ops.cpu.alloc_ldt = xen_alloc_ldt; + pv_ops.cpu.free_ldt = xen_free_ldt; + pv_ops.cpu.store_tr = xen_store_tr; + pv_ops.cpu.write_ldt_entry = xen_write_ldt_entry; + pv_ops.cpu.write_gdt_entry = xen_write_gdt_entry; + pv_ops.cpu.write_idt_entry = xen_write_idt_entry; + pv_ops.cpu.load_sp0 = xen_load_sp0; +#ifdef CONFIG_X86_IOPL_IOPERM + pv_ops.cpu.invalidate_io_bitmap = xen_invalidate_io_bitmap; + pv_ops.cpu.update_io_bitmap = xen_update_io_bitmap; +#endif + pv_ops.cpu.io_delay = xen_io_delay; + pv_ops.cpu.start_context_switch = xen_start_context_switch; + pv_ops.cpu.end_context_switch = xen_end_context_switch; +xen_init_irq_ops ();/*
tools/objtool/check.c +0 -1
@@ -570,7 +570,6 @@ static int init_pv_ops(struct objtool_file *file) {static const char *pv_ops_tables[] = {"pv_ops" , -"xen_cpu_ops" ,"xen_mmu_ops" ,NULL , };
Signature · 1 line
2.51.0
[tip: x86/paravirt] x86/xen: Drop xen_cpu_ops
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: 817f66e39e39b914aac25065a34f4462ab45ed26 Gitweb: https://git.kernel.org/tip/817f66e39e39b914aac25065a34f4462ab45ed26 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:15 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 19:53:20 +01:00
x86/xen: Drop xen_cpu_ops
Instead of having a pre-filled array xen_cpu_ops for Xen PV paravirt functions, drop the array and assign each element individually.
This is in preparation of reducing the paravirt include hell by splitting paravirt.h into multiple more fine grained header files, which will in turn require to split up the pv_ops vector as well. Dropping the pre-filled array makes life easier for objtool to detect missing initializers in multiple pv_ops_ arrays.
--- arch/x86/xen/enlighten_pv.c | 82 ++++++++++++++---------------------- tools/objtool/check.c | 1 +- 2 files changed, 33 insertions(+), 50 deletions(-)
arch/x86/xen/enlighten_pv.c +33 -49
@@ -1212,54 +1212,6 @@ static const struct pv_info xen_info __initconst = { .name = "Xen", }; -static const typeof (pv_ops) xen_cpu_ops__initconst = { - .cpu = { - .cpuid = xen_cpuid, - - .set_debugreg = xen_set_debugreg, - .get_debugreg = xen_get_debugreg, - - .read_cr0 = xen_read_cr0, - .write_cr0 = xen_write_cr0, - - .write_cr4 = xen_write_cr4, - - .read_msr = xen_read_msr, - .write_msr = xen_write_msr, - - .read_msr_safe = xen_read_msr_safe, - .write_msr_safe = xen_write_msr_safe, - - .read_pmc = xen_read_pmc, - - .load_tr_desc = paravirt_nop, - .set_ldt = xen_set_ldt, - .load_gdt = xen_load_gdt, - .load_idt = xen_load_idt, - .load_tls = xen_load_tls, - .load_gs_index = xen_load_gs_index, - - .alloc_ldt = xen_alloc_ldt, - .free_ldt = xen_free_ldt, - - .store_tr = xen_store_tr, - - .write_ldt_entry = xen_write_ldt_entry, - .write_gdt_entry = xen_write_gdt_entry, - .write_idt_entry = xen_write_idt_entry, - .load_sp0 = xen_load_sp0, - -#ifdef CONFIG_X86_IOPL_IOPERM - .invalidate_io_bitmap = xen_invalidate_io_bitmap, - .update_io_bitmap = xen_update_io_bitmap, -#endif - .io_delay = xen_io_delay, - - .start_context_switch = xen_start_context_switch, - .end_context_switch = xen_end_context_switch, - }, -}; -static void xen_restart (char *msg) {xen_reboot (SHUTDOWN_reboot);
@@ -1411,7 +1363,39 @@ asmlinkage __visible void __init xen_start_kernel(struct start_info *si)/* Install Xen paravirt ops */ pv_info = xen_info; - pv_ops.cpu = xen_cpu_ops.cpu; + + pv_ops.cpu.cpuid = xen_cpuid; + pv_ops.cpu.set_debugreg = xen_set_debugreg; + pv_ops.cpu.get_debugreg = xen_get_debugreg; + pv_ops.cpu.read_cr0 = xen_read_cr0; + pv_ops.cpu.write_cr0 = xen_write_cr0; + pv_ops.cpu.write_cr4 = xen_write_cr4; + pv_ops.cpu.read_msr = xen_read_msr; + pv_ops.cpu.write_msr = xen_write_msr; + pv_ops.cpu.read_msr_safe = xen_read_msr_safe; + pv_ops.cpu.write_msr_safe = xen_write_msr_safe; + pv_ops.cpu.read_pmc = xen_read_pmc; + pv_ops.cpu.load_tr_desc = paravirt_nop; + pv_ops.cpu.set_ldt = xen_set_ldt; + pv_ops.cpu.load_gdt = xen_load_gdt; + pv_ops.cpu.load_idt = xen_load_idt; + pv_ops.cpu.load_tls = xen_load_tls; + pv_ops.cpu.load_gs_index = xen_load_gs_index; + pv_ops.cpu.alloc_ldt = xen_alloc_ldt; + pv_ops.cpu.free_ldt = xen_free_ldt; + pv_ops.cpu.store_tr = xen_store_tr; + pv_ops.cpu.write_ldt_entry = xen_write_ldt_entry; + pv_ops.cpu.write_gdt_entry = xen_write_gdt_entry; + pv_ops.cpu.write_idt_entry = xen_write_idt_entry; + pv_ops.cpu.load_sp0 = xen_load_sp0; +#ifdef CONFIG_X86_IOPL_IOPERM + pv_ops.cpu.invalidate_io_bitmap = xen_invalidate_io_bitmap; + pv_ops.cpu.update_io_bitmap = xen_update_io_bitmap; +#endif + pv_ops.cpu.io_delay = xen_io_delay; + pv_ops.cpu.start_context_switch = xen_start_context_switch; + pv_ops.cpu.end_context_switch = xen_end_context_switch; +xen_init_irq_ops ();/*
tools/objtool/check.c +0 -1
@@ -570,7 +570,6 @@ static int init_pv_ops(struct objtool_file *file) {static const char *pv_ops_tables[] = {"pv_ops" , -"xen_cpu_ops" ,"xen_mmu_ops" ,NULL , };
Juergen Gross
maintainerPATCH v5 17/21 x86/xen: Drop xen_mmu_ops
In reply to Juergen GrossInstead of having a pre-filled array xen_mmu_ops for Xen PV paravirt functions, drop the array and assign each element individually.
This is in preparation of reducing the paravirt include hell by splitting paravirt.h into multiple more fine grained header files, which will in turn require to split up the pv_ops vector as well. Dropping the pre-filled array makes life easier for objtool to detect missing initializers in multiple pv_ops_ arrays.
---
V2:
- new patch
--- arch/x86/xen/mmu_pv.c | 100 ++++++++++++++++-------------------------- tools/objtool/check.c | 1 - 2 files changed, 38 insertions(+), 63 deletions(-)
arch/x86/xen/mmu_pv.c +38 -62
@@ -2175,73 +2175,49 @@ static void xen_leave_lazy_mmu(void)preempt_enable (); } -static const typeof (pv_ops) xen_mmu_ops__initconst = { - .mmu = { - .read_cr2 =__PV_IS_CALLEE_SAVE (xen_read_cr2), - .write_cr2 = xen_write_cr2, - - .read_cr3 = xen_read_cr3, - .write_cr3 = xen_write_cr3_init, - - .flush_tlb_user = xen_flush_tlb, - .flush_tlb_kernel = xen_flush_tlb, - .flush_tlb_one_user = xen_flush_tlb_one_user, - .flush_tlb_multi = xen_flush_tlb_multi, - - .pgd_alloc = xen_pgd_alloc, - .pgd_free = xen_pgd_free, - - .alloc_pte = xen_alloc_pte_init, - .release_pte = xen_release_pte_init, - .alloc_pmd = xen_alloc_pmd_init, - .release_pmd = xen_release_pmd_init, - - .set_pte = xen_set_pte_init, - .set_pmd = xen_set_pmd_hyper, - - .ptep_modify_prot_start = xen_ptep_modify_prot_start, - .ptep_modify_prot_commit = xen_ptep_modify_prot_commit, - - .pte_val =PV_CALLEE_SAVE (xen_pte_val), - .pgd_val =PV_CALLEE_SAVE (xen_pgd_val), - - .make_pte =PV_CALLEE_SAVE (xen_make_pte_init), - .make_pgd =PV_CALLEE_SAVE (xen_make_pgd), - - .set_pud = xen_set_pud_hyper, - - .make_pmd =PV_CALLEE_SAVE (xen_make_pmd), - .pmd_val =PV_CALLEE_SAVE (xen_pmd_val), - - .pud_val =PV_CALLEE_SAVE (xen_pud_val), - .make_pud =PV_CALLEE_SAVE (xen_make_pud), - .set_p4d = xen_set_p4d_hyper, - - .alloc_pud = xen_alloc_pmd_init, - .release_pud = xen_release_pmd_init, - - .p4d_val =PV_CALLEE_SAVE (xen_p4d_val), - .make_p4d =PV_CALLEE_SAVE (xen_make_p4d), - - .enter_mmap = xen_enter_mmap, - .exit_mmap = xen_exit_mmap, - - .lazy_mode = { - .enter = xen_enter_lazy_mmu, - .leave = xen_leave_lazy_mmu, - .flush = xen_flush_lazy_mmu, - }, - - .set_fixmap = xen_set_fixmap, - }, -}; -void __init xen_init_mmu_ops (void ) { x86_init.paging.pagetable_init = xen_pagetable_init; x86_init.hyper.init_after_bootmem = xen_after_bootmem; - pv_ops.mmu = xen_mmu_ops.mmu; + pv_ops.mmu.read_cr2 =__PV_IS_CALLEE_SAVE (xen_read_cr2); + pv_ops.mmu.write_cr2 = xen_write_cr2; + pv_ops.mmu.read_cr3 = xen_read_cr3; + pv_ops.mmu.write_cr3 = xen_write_cr3_init; + pv_ops.mmu.flush_tlb_user = xen_flush_tlb; + pv_ops.mmu.flush_tlb_kernel = xen_flush_tlb; + pv_ops.mmu.flush_tlb_one_user = xen_flush_tlb_one_user; + pv_ops.mmu.flush_tlb_multi = xen_flush_tlb_multi; + pv_ops.mmu.pgd_alloc = xen_pgd_alloc; + pv_ops.mmu.pgd_free = xen_pgd_free; + pv_ops.mmu.alloc_pte = xen_alloc_pte_init; + pv_ops.mmu.release_pte = xen_release_pte_init; + pv_ops.mmu.alloc_pmd = xen_alloc_pmd_init; + pv_ops.mmu.release_pmd = xen_release_pmd_init; + pv_ops.mmu.set_pte = xen_set_pte_init; + pv_ops.mmu.set_pmd = xen_set_pmd_hyper; + pv_ops.mmu.ptep_modify_prot_start = xen_ptep_modify_prot_start; + pv_ops.mmu.ptep_modify_prot_commit = xen_ptep_modify_prot_commit; + pv_ops.mmu.pte_val =PV_CALLEE_SAVE (xen_pte_val); + pv_ops.mmu.pgd_val =PV_CALLEE_SAVE (xen_pgd_val); + pv_ops.mmu.make_pte =PV_CALLEE_SAVE (xen_make_pte_init); + pv_ops.mmu.make_pgd =PV_CALLEE_SAVE (xen_make_pgd); + pv_ops.mmu.set_pud = xen_set_pud_hyper; + pv_ops.mmu.make_pmd =PV_CALLEE_SAVE (xen_make_pmd); + pv_ops.mmu.pmd_val =PV_CALLEE_SAVE (xen_pmd_val); + pv_ops.mmu.pud_val =PV_CALLEE_SAVE (xen_pud_val); + pv_ops.mmu.make_pud =PV_CALLEE_SAVE (xen_make_pud); + pv_ops.mmu.set_p4d = xen_set_p4d_hyper; + pv_ops.mmu.alloc_pud = xen_alloc_pmd_init; + pv_ops.mmu.release_pud = xen_release_pmd_init; + pv_ops.mmu.p4d_val =PV_CALLEE_SAVE (xen_p4d_val); + pv_ops.mmu.make_p4d =PV_CALLEE_SAVE (xen_make_p4d); + pv_ops.mmu.enter_mmap = xen_enter_mmap; + pv_ops.mmu.exit_mmap = xen_exit_mmap; + pv_ops.mmu.lazy_mode.enter = xen_enter_lazy_mmu; + pv_ops.mmu.lazy_mode.leave = xen_leave_lazy_mmu; + pv_ops.mmu.lazy_mode.flush = xen_flush_lazy_mmu; + pv_ops.mmu.set_fixmap = xen_set_fixmap;memset (dummy_mapping,0xff ,PAGE_SIZE ); }
tools/objtool/check.c +0 -1
@@ -570,7 +570,6 @@ static int init_pv_ops(struct objtool_file *file) {static const char *pv_ops_tables[] = {"pv_ops" , -"xen_mmu_ops" ,NULL , };const char *pv_ops;
Signature · 1 line
2.51.0
[tip: x86/paravirt] x86/xen: Drop xen_mmu_ops
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: 7aef17f367c94d6cef00f45b193e37d30ff4a3b5 Gitweb: https://git.kernel.org/tip/7aef17f367c94d6cef00f45b193e37d30ff4a3b5 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:16 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 12 Jan 2026 21:44:34 +01:00
x86/xen: Drop xen_mmu_ops
Instead of having a pre-filled array xen_mmu_ops for Xen PV paravirt functions, drop the array and assign each element individually.
This is in preparation of reducing the paravirt include hell by splitting paravirt.h into multiple more fine grained header files, which will in turn require to split up the pv_ops vector as well. Dropping the pre-filled array makes life easier for objtool to detect missing initializers in multiple pv_ops_ arrays.
--- arch/x86/xen/mmu_pv.c | 100 +++++++++++++++-------------------------- tools/objtool/check.c | 1 +- 2 files changed, 38 insertions(+), 63 deletions(-)
arch/x86/xen/mmu_pv.c +38 -62
@@ -2175,73 +2175,49 @@ static void xen_leave_lazy_mmu(void)preempt_enable (); } -static const typeof (pv_ops) xen_mmu_ops__initconst = { - .mmu = { - .read_cr2 =__PV_IS_CALLEE_SAVE (xen_read_cr2), - .write_cr2 = xen_write_cr2, - - .read_cr3 = xen_read_cr3, - .write_cr3 = xen_write_cr3_init, - - .flush_tlb_user = xen_flush_tlb, - .flush_tlb_kernel = xen_flush_tlb, - .flush_tlb_one_user = xen_flush_tlb_one_user, - .flush_tlb_multi = xen_flush_tlb_multi, - - .pgd_alloc = xen_pgd_alloc, - .pgd_free = xen_pgd_free, - - .alloc_pte = xen_alloc_pte_init, - .release_pte = xen_release_pte_init, - .alloc_pmd = xen_alloc_pmd_init, - .release_pmd = xen_release_pmd_init, - - .set_pte = xen_set_pte_init, - .set_pmd = xen_set_pmd_hyper, - - .ptep_modify_prot_start = xen_ptep_modify_prot_start, - .ptep_modify_prot_commit = xen_ptep_modify_prot_commit, - - .pte_val =PV_CALLEE_SAVE (xen_pte_val), - .pgd_val =PV_CALLEE_SAVE (xen_pgd_val), - - .make_pte =PV_CALLEE_SAVE (xen_make_pte_init), - .make_pgd =PV_CALLEE_SAVE (xen_make_pgd), - - .set_pud = xen_set_pud_hyper, - - .make_pmd =PV_CALLEE_SAVE (xen_make_pmd), - .pmd_val =PV_CALLEE_SAVE (xen_pmd_val), - - .pud_val =PV_CALLEE_SAVE (xen_pud_val), - .make_pud =PV_CALLEE_SAVE (xen_make_pud), - .set_p4d = xen_set_p4d_hyper, - - .alloc_pud = xen_alloc_pmd_init, - .release_pud = xen_release_pmd_init, - - .p4d_val =PV_CALLEE_SAVE (xen_p4d_val), - .make_p4d =PV_CALLEE_SAVE (xen_make_p4d), - - .enter_mmap = xen_enter_mmap, - .exit_mmap = xen_exit_mmap, - - .lazy_mode = { - .enter = xen_enter_lazy_mmu, - .leave = xen_leave_lazy_mmu, - .flush = xen_flush_lazy_mmu, - }, - - .set_fixmap = xen_set_fixmap, - }, -}; -void __init xen_init_mmu_ops (void ) { x86_init.paging.pagetable_init = xen_pagetable_init; x86_init.hyper.init_after_bootmem = xen_after_bootmem; - pv_ops.mmu = xen_mmu_ops.mmu; + pv_ops.mmu.read_cr2 =__PV_IS_CALLEE_SAVE (xen_read_cr2); + pv_ops.mmu.write_cr2 = xen_write_cr2; + pv_ops.mmu.read_cr3 = xen_read_cr3; + pv_ops.mmu.write_cr3 = xen_write_cr3_init; + pv_ops.mmu.flush_tlb_user = xen_flush_tlb; + pv_ops.mmu.flush_tlb_kernel = xen_flush_tlb; + pv_ops.mmu.flush_tlb_one_user = xen_flush_tlb_one_user; + pv_ops.mmu.flush_tlb_multi = xen_flush_tlb_multi; + pv_ops.mmu.pgd_alloc = xen_pgd_alloc; + pv_ops.mmu.pgd_free = xen_pgd_free; + pv_ops.mmu.alloc_pte = xen_alloc_pte_init; + pv_ops.mmu.release_pte = xen_release_pte_init; + pv_ops.mmu.alloc_pmd = xen_alloc_pmd_init; + pv_ops.mmu.release_pmd = xen_release_pmd_init; + pv_ops.mmu.set_pte = xen_set_pte_init; + pv_ops.mmu.set_pmd = xen_set_pmd_hyper; + pv_ops.mmu.ptep_modify_prot_start = xen_ptep_modify_prot_start; + pv_ops.mmu.ptep_modify_prot_commit = xen_ptep_modify_prot_commit; + pv_ops.mmu.pte_val =PV_CALLEE_SAVE (xen_pte_val); + pv_ops.mmu.pgd_val =PV_CALLEE_SAVE (xen_pgd_val); + pv_ops.mmu.make_pte =PV_CALLEE_SAVE (xen_make_pte_init); + pv_ops.mmu.make_pgd =PV_CALLEE_SAVE (xen_make_pgd); + pv_ops.mmu.set_pud = xen_set_pud_hyper; + pv_ops.mmu.make_pmd =PV_CALLEE_SAVE (xen_make_pmd); + pv_ops.mmu.pmd_val =PV_CALLEE_SAVE (xen_pmd_val); + pv_ops.mmu.pud_val =PV_CALLEE_SAVE (xen_pud_val); + pv_ops.mmu.make_pud =PV_CALLEE_SAVE (xen_make_pud); + pv_ops.mmu.set_p4d = xen_set_p4d_hyper; + pv_ops.mmu.alloc_pud = xen_alloc_pmd_init; + pv_ops.mmu.release_pud = xen_release_pmd_init; + pv_ops.mmu.p4d_val =PV_CALLEE_SAVE (xen_p4d_val); + pv_ops.mmu.make_p4d =PV_CALLEE_SAVE (xen_make_p4d); + pv_ops.mmu.enter_mmap = xen_enter_mmap; + pv_ops.mmu.exit_mmap = xen_exit_mmap; + pv_ops.mmu.lazy_mode.enter = xen_enter_lazy_mmu; + pv_ops.mmu.lazy_mode.leave = xen_leave_lazy_mmu; + pv_ops.mmu.lazy_mode.flush = xen_flush_lazy_mmu; + pv_ops.mmu.set_fixmap = xen_set_fixmap;memset (dummy_mapping,0xff ,PAGE_SIZE ); }
tools/objtool/check.c +0 -1
@@ -570,7 +570,6 @@ static int init_pv_ops(struct objtool_file *file) {static const char *pv_ops_tables[] = {"pv_ops" , -"xen_mmu_ops" ,NULL , };const char *pv_ops;
Juergen Gross
maintainerPATCH v5 18/21 objtool: Allow multiple pv_ops arrays
In reply to Juergen GrossHaving a single large pv_ops array has the main disadvantage of needing all prototypes of the single array members in one header file. This is adding up to the need to include lots of otherwise unrelated headers.
In order to allow multiple smaller pv_ops arrays dedicated to one area of the kernel each, allow multiple arrays in objtool.
For better performance limit the possible names of the arrays to start with "pv_ops".
---
V2:
- new patch
--- tools/objtool/arch/x86/decode.c | 8 ++- tools/objtool/check.c | 74 +++++++++++++++++++++------ tools/objtool/include/objtool/check.h | 1 + 3 files changed, 65 insertions(+), 18 deletions(-)
tools/objtool/arch/x86/decode.c +6 -2
@@ -711,10 +711,14 @@ int arch_decode_instruction(struct objtool_file *file, const struct section *sec immr =find_reloc_by_dest (elf, (void *)sec, offset+3 ); disp =find_reloc_by_dest (elf, (void *)sec, offset+7 ); -if (!immr ||strcmp (immr->sym->name,"pv_ops" )) +if (!immr ||strncmp (immr->sym->name,"pv_ops" ,6 ))break ; - idx = (reloc_addend (immr) +8 ) /sizeof (void *); + idx =pv_ops_idx_off (immr->sym->name); +if (idx <0 ) +break ; + + idx += (reloc_addend (immr) +8 ) /sizeof (void *); func = disp->sym;if (disp->sym->type ==STT_SECTION )
tools/objtool/check.c +58 -16
116 lines not on this page · raw message
tools/objtool/include/objtool/check.h +1 -0
@@ -159,5 +159,6 @@ const char *objtool_disas_insn(struct instruction *insn);extern size_t sym_name_max_len;extern struct disas_context *objtool_disas_ctx; +int pv_ops_idx_off (const char *symname);#endif /* _CHECK_H */
Signature · 1 line
2.51.0
[tip: x86/paravirt] objtool: Allow multiple pv_ops arrays
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: f88dc319fcb6d6a155e94469a355ce456dd85441 Gitweb: https://git.kernel.org/tip/f88dc319fcb6d6a155e94469a355ce456dd85441 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:17 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Tue, 13 Jan 2026 13:39:49 +01:00
objtool: Allow multiple pv_ops arrays
Having a single large pv_ops array has the main disadvantage of needing all prototypes of the single array members in one header file. This is adding up to the need to include lots of otherwise unrelated headers.
In order to allow multiple smaller pv_ops arrays dedicated to one area of the kernel each, allow multiple arrays in objtool.
For better performance limit the possible names of the arrays to start with "pv_ops".
--- tools/objtool/arch/x86/decode.c | 8 ++- tools/objtool/check.c | 74 ++++++++++++++++++++------ tools/objtool/include/objtool/check.h | 1 +- 3 files changed, 65 insertions(+), 18 deletions(-)
tools/objtool/arch/x86/decode.c +6 -2
@@ -711,10 +711,14 @@ int arch_decode_instruction(struct objtool_file *file, const struct section *sec immr =find_reloc_by_dest (elf, (void *)sec, offset+3 ); disp =find_reloc_by_dest (elf, (void *)sec, offset+7 ); -if (!immr ||strcmp (immr->sym->name,"pv_ops" )) +if (!immr ||strncmp (immr->sym->name,"pv_ops" ,6 ))break ; - idx = (reloc_addend (immr) +8 ) /sizeof (void *); + idx =pv_ops_idx_off (immr->sym->name); +if (idx <0 ) +break ; + + idx += (reloc_addend (immr) +8 ) /sizeof (void *); func = disp->sym;if (disp->sym->type ==STT_SECTION )
tools/objtool/check.c +58 -16
116 lines not on this page · raw message
tools/objtool/include/objtool/check.h +1 -0
@@ -159,5 +159,6 @@ const char *objtool_disas_insn(struct instruction *insn);extern size_t sym_name_max_len;extern struct disas_context *objtool_disas_ctx; +int pv_ops_idx_off (const char *symname);#endif /* _CHECK_H */
Juergen Gross
maintainerPATCH v5 19/21 x86/paravirt: Allow pv-calls outside paravirt.h
In reply to Juergen GrossIn order to prepare for defining paravirt functions outside of paravirt.h, don't #undef the paravirt call macros.
--- arch/x86/include/asm/paravirt.h | 16 ---------------- 1 file changed, 16 deletions(-)
arch/x86/include/asm/paravirt.h +0 -16
@@ -588,22 +588,6 @@ static __always_inline unsigned long arch_local_irq_save(void) }#endif - -/* Make sure as little as possible of this mess escapes. */ -#undef PARAVIRT_CALL -#undef __PVOP_CALL -#undef __PVOP_VCALL -#undef PVOP_VCALL0 -#undef PVOP_CALL0 -#undef PVOP_VCALL1 -#undef PVOP_CALL1 -#undef PVOP_VCALL2 -#undef PVOP_CALL2 -#undef PVOP_VCALL3 -#undef PVOP_CALL3 -#undef PVOP_VCALL4 -#undef PVOP_CALL4 -void native_pv_lock_init (void )__init ;#else /* __ASSEMBLER__ */
Signature · 1 line
2.51.0
[tip: x86/paravirt] x86/paravirt: Allow pv-calls outside paravirt.h
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: 560db12560d4d0fb24ee0c32dc32975e18a88ed4 Gitweb: https://git.kernel.org/tip/560db12560d4d0fb24ee0c32dc32975e18a88ed4 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:18 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Tue, 13 Jan 2026 13:50:26 +01:00
x86/paravirt: Allow pv-calls outside paravirt.h
In order to prepare for defining paravirt functions outside of paravirt.h, don't #undef the paravirt call macros.
--- arch/x86/include/asm/paravirt.h | 16 ---------------- 1 file changed, 16 deletions(-)
arch/x86/include/asm/paravirt.h +0 -16
@@ -588,22 +588,6 @@ static __always_inline unsigned long arch_local_irq_save(void) }#endif - -/* Make sure as little as possible of this mess escapes. */ -#undef PARAVIRT_CALL -#undef __PVOP_CALL -#undef __PVOP_VCALL -#undef PVOP_VCALL0 -#undef PVOP_CALL0 -#undef PVOP_VCALL1 -#undef PVOP_CALL1 -#undef PVOP_VCALL2 -#undef PVOP_CALL2 -#undef PVOP_VCALL3 -#undef PVOP_CALL3 -#undef PVOP_VCALL4 -#undef PVOP_CALL4 -void native_pv_lock_init (void )__init ;#else /* __ASSEMBLER__ */
Juergen Gross
maintainerPATCH v5 20/21 x86/paravirt: Specify pv_ops array in paravirt macros
In reply to Juergen GrossIn order to prepare having multiple pv_ops arrays, specify the array in the paravirt macros.
---
V2:
- new patch
--- arch/x86/include/asm/paravirt.h | 166 +++++++++++++------------- arch/x86/include/asm/paravirt_types.h | 140 +++++++++++----------- 2 files changed, 153 insertions(+), 153 deletions(-)
arch/x86/include/asm/paravirt.h +83 -83
@@ -31,11 +31,11 @@ void __init paravirt_set_cap(void);/* The paravirtualized I/O functions */ static inline void slow_down_io (void ) { -PVOP_VCALL0 (cpu.io_delay); +PVOP_VCALL0 (pv_ops, cpu.io_delay);#ifdef REALLY_SLOW_IO -PVOP_VCALL0 (cpu.io_delay); -PVOP_VCALL0 (cpu.io_delay); -PVOP_VCALL0 (cpu.io_delay); +PVOP_VCALL0 (pv_ops, cpu.io_delay); +PVOP_VCALL0 (pv_ops, cpu.io_delay); +PVOP_VCALL0 (pv_ops, cpu.io_delay);#endif }
@@ -47,57 +47,57 @@ void native_flush_tlb_multi(const struct cpumask *cpumask,static inline void __flush_tlb_local (void ) { -PVOP_VCALL0 (mmu.flush_tlb_user); +PVOP_VCALL0 (pv_ops, mmu.flush_tlb_user); }static inline void __flush_tlb_global (void ) { -PVOP_VCALL0 (mmu.flush_tlb_kernel); +PVOP_VCALL0 (pv_ops, mmu.flush_tlb_kernel); }static inline void __flush_tlb_one_user (unsigned long addr) { -PVOP_VCALL1 (mmu.flush_tlb_one_user, addr); +PVOP_VCALL1 (pv_ops, mmu.flush_tlb_one_user, addr); }static inline void __flush_tlb_multi (const struct cpumask *cpumask,const struct flush_tlb_info *info) { -PVOP_VCALL2 (mmu.flush_tlb_multi, cpumask, info); +PVOP_VCALL2 (pv_ops, mmu.flush_tlb_multi, cpumask, info); }static inline void paravirt_arch_exit_mmap (struct mm_struct *mm) { -PVOP_VCALL1 (mmu.exit_mmap, mm); +PVOP_VCALL1 (pv_ops, mmu.exit_mmap, mm); }static inline void notify_page_enc_status_changed (unsigned long pfn,int npages,bool enc) { -PVOP_VCALL3 (mmu.notify_page_enc_status_changed, pfn, npages, enc); +PVOP_VCALL3 (pv_ops, mmu.notify_page_enc_status_changed, pfn, npages, enc); } static __always_inline void arch_safe_halt(void) { -PVOP_VCALL0 (irq.safe_halt); +PVOP_VCALL0 (pv_ops, irq.safe_halt); }static inline void halt (void ) { -PVOP_VCALL0 (irq.halt); +PVOP_VCALL0 (pv_ops, irq.halt); }#ifdef CONFIG_PARAVIRT_XXL static inline void load_sp0 (unsigned long sp0) { -PVOP_VCALL1 (cpu.load_sp0, sp0); +PVOP_VCALL1 (pv_ops, cpu.load_sp0, sp0); }/* The paravirtualized CPUID instruction. */ static inline void __cpuid (unsigned int *eax,unsigned int *ebx,unsigned int *ecx,unsigned int *edx) { -PVOP_VCALL4 (cpu.cpuid, eax, ebx, ecx, edx); +PVOP_VCALL4 (pv_ops, cpu.cpuid, eax, ebx, ecx, edx); }/*
@@ -105,69 +105,69 @@ static inline void __cpuid(unsigned int *eax, unsigned int *ebx,*/ static __always_inline unsigned long paravirt_get_debugreg (int reg) { - return PVOP_CALL1(unsigned long, cpu.get_debugreg, reg); + return PVOP_CALL1(unsigned long, pv_ops, cpu.get_debugreg, reg); }#define get_debugreg (var, reg) var = paravirt_get_debugreg(reg) static __always_inline void set_debugreg(unsigned long val, int reg) { -PVOP_VCALL2 (cpu.set_debugreg, reg, val); +PVOP_VCALL2 (pv_ops, cpu.set_debugreg, reg, val); }static inline unsigned long read_cr0 (void ) { - return PVOP_CALL0(unsigned long, cpu.read_cr0); + return PVOP_CALL0(unsigned long, pv_ops, cpu.read_cr0); }static inline void write_cr0 (unsigned long x) { -PVOP_VCALL1 (cpu.write_cr0, x); +PVOP_VCALL1 (pv_ops, cpu.write_cr0, x); }static __always_inline unsigned long read_cr2 (void ) { - return PVOP_ALT_CALLEE0(unsigned long, mmu.read_cr2, + return PVOP_ALT_CALLEE0(unsigned long, pv_ops, mmu.read_cr2,"mov %%cr2, %%rax;" ,ALT_NOT_XEN ); } static __always_inline void write_cr2(unsigned long x) { -PVOP_VCALL1 (mmu.write_cr2, x); +PVOP_VCALL1 (pv_ops, mmu.write_cr2, x); }static inline unsigned long __read_cr3 (void ) { - return PVOP_ALT_CALL0(unsigned long, mmu.read_cr3, + return PVOP_ALT_CALL0(unsigned long, pv_ops, mmu.read_cr3,"mov %%cr3, %%rax;" ,ALT_NOT_XEN ); }static inline void write_cr3 (unsigned long x) { -PVOP_ALT_VCALL1 (mmu.write_cr3, x,"mov %%rdi, %%cr3" ,ALT_NOT_XEN ); +PVOP_ALT_VCALL1 (pv_ops, mmu.write_cr3, x,"mov %%rdi, %%cr3" ,ALT_NOT_XEN ); }static inline void __write_cr4 (unsigned long x) { -PVOP_VCALL1 (cpu.write_cr4, x); +PVOP_VCALL1 (pv_ops, cpu.write_cr4, x); }static inline u64 paravirt_read_msr (u32 msr) { -return PVOP_CALL1 (u64, cpu.read_msr, msr); +return PVOP_CALL1 (u64, pv_ops, cpu.read_msr, msr); }static inline void paravirt_write_msr (u32 msr,u64 val) { -PVOP_VCALL2 (cpu.write_msr, msr, val); +PVOP_VCALL2 (pv_ops, cpu.write_msr, msr, val); }static inline int paravirt_read_msr_safe (u32 msr,u64 *val) { -return PVOP_CALL2 (int, cpu.read_msr_safe, msr, val); +return PVOP_CALL2 (int, pv_ops, cpu.read_msr_safe, msr, val); }static inline int paravirt_write_msr_safe (u32 msr,u64 val) { -return PVOP_CALL2 (int, cpu.write_msr_safe, msr, val); +return PVOP_CALL2 (int, pv_ops, cpu.write_msr_safe, msr, val); }#define rdmsr (msr, val1, val2) \
@@ -214,154 +214,154 @@ static __always_inline int rdmsrq_safe(u32 msr, u64 *p) static __always_inline u64 rdpmc(int counter) { -return PVOP_CALL1 (u64, cpu.read_pmc, counter); +return PVOP_CALL1 (u64, pv_ops, cpu.read_pmc, counter); }static inline void paravirt_alloc_ldt (struct desc_struct *ldt,unsigned entries) { -PVOP_VCALL2 (cpu.alloc_ldt, ldt, entries); +PVOP_VCALL2 (pv_ops, cpu.alloc_ldt, ldt, entries); }static inline void paravirt_free_ldt (struct desc_struct *ldt,unsigned entries) { -PVOP_VCALL2 (cpu.free_ldt, ldt, entries); +PVOP_VCALL2 (pv_ops, cpu.free_ldt, ldt, entries); }static inline void load_TR_desc (void ) { -PVOP_VCALL0 (cpu.load_tr_desc); +PVOP_VCALL0 (pv_ops, cpu.load_tr_desc); }static inline void load_gdt (const struct desc_ptr *dtr) { -PVOP_VCALL1 (cpu.load_gdt, dtr); +PVOP_VCALL1 (pv_ops, cpu.load_gdt, dtr); }static inline void load_idt (const struct desc_ptr *dtr) { -PVOP_VCALL1 (cpu.load_idt, dtr); +PVOP_VCALL1 (pv_ops, cpu.load_idt, dtr); }static inline void set_ldt (const void *addr,unsigned entries) { -PVOP_VCALL2 (cpu.set_ldt, addr, entries); +PVOP_VCALL2 (pv_ops, cpu.set_ldt, addr, entries); }static inline unsigned long paravirt_store_tr (void ) { - return PVOP_CALL0(unsigned long, cpu.store_tr); + return PVOP_CALL0(unsigned long, pv_ops, cpu.store_tr); }#define store_tr (tr) ((tr) = paravirt_store_tr())static inline void load_TLS (struct thread_struct *t,unsigned cpu) { -PVOP_VCALL2 (cpu.load_tls, t, cpu); +PVOP_VCALL2 (pv_ops, cpu.load_tls, t, cpu); }static inline void load_gs_index (unsigned int gs) { -PVOP_VCALL1 (cpu.load_gs_index, gs); +PVOP_VCALL1 (pv_ops, cpu.load_gs_index, gs); }static inline void write_ldt_entry (struct desc_struct *dt,int entry,const void *desc) { -PVOP_VCALL3 (cpu.write_ldt_entry, dt, entry, desc); +PVOP_VCALL3 (pv_ops, cpu.write_ldt_entry, dt, entry, desc); }static inline void write_gdt_entry (struct desc_struct *dt,int entry,void *desc,int type) { -PVOP_VCALL4 (cpu.write_gdt_entry, dt, entry, desc, type); +PVOP_VCALL4 (pv_ops, cpu.write_gdt_entry, dt, entry, desc, type); }static inline void write_idt_entry (gate_desc *dt,int entry,const gate_desc *g) { -PVOP_VCALL3 (cpu.write_idt_entry, dt, entry, g); +PVOP_VCALL3 (pv_ops, cpu.write_idt_entry, dt, entry, g); }#ifdef CONFIG_X86_IOPL_IOPERM static inline void tss_invalidate_io_bitmap (void ) { -PVOP_VCALL0 (cpu.invalidate_io_bitmap); +PVOP_VCALL0 (pv_ops, cpu.invalidate_io_bitmap); }static inline void tss_update_io_bitmap (void ) { -PVOP_VCALL0 (cpu.update_io_bitmap); +PVOP_VCALL0 (pv_ops, cpu.update_io_bitmap); }#endif static inline void paravirt_enter_mmap (struct mm_struct *next) { -PVOP_VCALL1 (mmu.enter_mmap, next); +PVOP_VCALL1 (pv_ops, mmu.enter_mmap, next); }static inline int paravirt_pgd_alloc (struct mm_struct *mm) { -return PVOP_CALL1 (int, mmu.pgd_alloc, mm); +return PVOP_CALL1 (int, pv_ops, mmu.pgd_alloc, mm); }static inline void paravirt_pgd_free (struct mm_struct *mm,pgd_t *pgd) { -PVOP_VCALL2 (mmu.pgd_free, mm, pgd); +PVOP_VCALL2 (pv_ops, mmu.pgd_free, mm, pgd); }static inline void paravirt_alloc_pte (struct mm_struct *mm,unsigned long pfn) { -PVOP_VCALL2 (mmu.alloc_pte, mm, pfn); +PVOP_VCALL2 (pv_ops, mmu.alloc_pte, mm, pfn); }static inline void paravirt_release_pte (unsigned long pfn) { -PVOP_VCALL1 (mmu.release_pte, pfn); +PVOP_VCALL1 (pv_ops, mmu.release_pte, pfn); }static inline void paravirt_alloc_pmd (struct mm_struct *mm,unsigned long pfn) { -PVOP_VCALL2 (mmu.alloc_pmd, mm, pfn); +PVOP_VCALL2 (pv_ops, mmu.alloc_pmd, mm, pfn); }static inline void paravirt_release_pmd (unsigned long pfn) { -PVOP_VCALL1 (mmu.release_pmd, pfn); +PVOP_VCALL1 (pv_ops, mmu.release_pmd, pfn); }static inline void paravirt_alloc_pud (struct mm_struct *mm,unsigned long pfn) { -PVOP_VCALL2 (mmu.alloc_pud, mm, pfn); +PVOP_VCALL2 (pv_ops, mmu.alloc_pud, mm, pfn); }static inline void paravirt_release_pud (unsigned long pfn) { -PVOP_VCALL1 (mmu.release_pud, pfn); +PVOP_VCALL1 (pv_ops, mmu.release_pud, pfn); }static inline void paravirt_alloc_p4d (struct mm_struct *mm,unsigned long pfn) { -PVOP_VCALL2 (mmu.alloc_p4d, mm, pfn); +PVOP_VCALL2 (pv_ops, mmu.alloc_p4d, mm, pfn); }static inline void paravirt_release_p4d (unsigned long pfn) { -PVOP_VCALL1 (mmu.release_p4d, pfn); +PVOP_VCALL1 (pv_ops, mmu.release_p4d, pfn); }static inline pte_t __pte (pteval_t val) { -return (pte_t ) {PVOP_ALT_CALLEE1 (pteval_t, mmu.make_pte, val, +return (pte_t ) {PVOP_ALT_CALLEE1 (pteval_t, pv_ops, mmu.make_pte, val,"mov %%rdi, %%rax" ,ALT_NOT_XEN ) }; }static inline pteval_t pte_val (pte_t pte) { -return PVOP_ALT_CALLEE1 (pteval_t, mmu.pte_val, pte.pte, +return PVOP_ALT_CALLEE1 (pteval_t, pv_ops, mmu.pte_val, pte.pte,"mov %%rdi, %%rax" ,ALT_NOT_XEN ); }static inline pgd_t __pgd (pgdval_t val) { -return (pgd_t ) {PVOP_ALT_CALLEE1 (pgdval_t, mmu.make_pgd, val, +return (pgd_t ) {PVOP_ALT_CALLEE1 (pgdval_t, pv_ops, mmu.make_pgd, val,"mov %%rdi, %%rax" ,ALT_NOT_XEN ) }; }static inline pgdval_t pgd_val (pgd_t pgd) { -return PVOP_ALT_CALLEE1 (pgdval_t, mmu.pgd_val, pgd.pgd, +return PVOP_ALT_CALLEE1 (pgdval_t, pv_ops, mmu.pgd_val, pgd.pgd,"mov %%rdi, %%rax" ,ALT_NOT_XEN ); }
@@ -371,7 +371,7 @@ static inline pte_t ptep_modify_prot_start(struct vm_area_struct *vma, unsigned {pteval_t ret; - ret =PVOP_CALL3 (pteval_t, mmu.ptep_modify_prot_start, vma, addr, ptep); + ret =PVOP_CALL3 (pteval_t, pv_ops, mmu.ptep_modify_prot_start, vma, addr, ptep);return (pte_t ) { .pte = ret }; }
@@ -380,41 +380,41 @@ static inline void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned pte_t *ptep, pte_t old_pte, pte_t pte) { - PVOP_VCALL4(mmu.ptep_modify_prot_commit, vma, addr, ptep, pte.pte); + PVOP_VCALL4(pv_ops, mmu.ptep_modify_prot_commit, vma, addr, ptep, pte.pte); }static inline void set_pte (pte_t *ptep,pte_t pte) { -PVOP_VCALL2 (mmu.set_pte, ptep, pte.pte); +PVOP_VCALL2 (pv_ops, mmu.set_pte, ptep, pte.pte); }static inline void set_pmd (pmd_t *pmdp,pmd_t pmd) { -PVOP_VCALL2 (mmu.set_pmd, pmdp,native_pmd_val (pmd)); +PVOP_VCALL2 (pv_ops, mmu.set_pmd, pmdp,native_pmd_val (pmd)); }static inline pmd_t __pmd (pmdval_t val) { -return (pmd_t ) {PVOP_ALT_CALLEE1 (pmdval_t, mmu.make_pmd, val, +return (pmd_t ) {PVOP_ALT_CALLEE1 (pmdval_t, pv_ops, mmu.make_pmd, val,"mov %%rdi, %%rax" ,ALT_NOT_XEN ) }; }static inline pmdval_t pmd_val (pmd_t pmd) { -return PVOP_ALT_CALLEE1 (pmdval_t, mmu.pmd_val, pmd.pmd, +return PVOP_ALT_CALLEE1 (pmdval_t, pv_ops, mmu.pmd_val, pmd.pmd,"mov %%rdi, %%rax" ,ALT_NOT_XEN ); }static inline void set_pud (pud_t *pudp,pud_t pud) { -PVOP_VCALL2 (mmu.set_pud, pudp,native_pud_val (pud)); +PVOP_VCALL2 (pv_ops, mmu.set_pud, pudp,native_pud_val (pud)); }static inline pud_t __pud (pudval_t val) {pudval_t ret; - ret =PVOP_ALT_CALLEE1 (pudval_t, mmu.make_pud, val, + ret =PVOP_ALT_CALLEE1 (pudval_t, pv_ops, mmu.make_pud, val,"mov %%rdi, %%rax" ,ALT_NOT_XEN );return (pud_t ) { ret };
@@ -422,7 +422,7 @@ static inline pud_t __pud(pudval_t val)static inline pudval_t pud_val (pud_t pud) { -return PVOP_ALT_CALLEE1 (pudval_t, mmu.pud_val, pud.pud, +return PVOP_ALT_CALLEE1 (pudval_t, pv_ops, mmu.pud_val, pud.pud,"mov %%rdi, %%rax" ,ALT_NOT_XEN ); }
@@ -435,12 +435,12 @@ static inline void set_p4d(p4d_t *p4dp, p4d_t p4d) {p4dval_t val =native_p4d_val (p4d); -PVOP_VCALL2 (mmu.set_p4d, p4dp, val); +PVOP_VCALL2 (pv_ops, mmu.set_p4d, p4dp, val); }static inline p4d_t __p4d (p4dval_t val) { -p4dval_t ret =PVOP_ALT_CALLEE1 (p4dval_t, mmu.make_p4d, val, +p4dval_t ret =PVOP_ALT_CALLEE1 (p4dval_t, pv_ops, mmu.make_p4d, val,"mov %%rdi, %%rax" ,ALT_NOT_XEN );return (p4d_t ) { ret };
@@ -448,13 +448,13 @@ static inline p4d_t __p4d(p4dval_t val)static inline p4dval_t p4d_val (p4d_t p4d) { -return PVOP_ALT_CALLEE1 (p4dval_t, mmu.p4d_val, p4d.p4d, +return PVOP_ALT_CALLEE1 (p4dval_t, pv_ops, mmu.p4d_val, p4d.p4d,"mov %%rdi, %%rax" ,ALT_NOT_XEN ); }static inline void __set_pgd (pgd_t *pgdp,pgd_t pgd) { -PVOP_VCALL2 (mmu.set_pgd, pgdp,native_pgd_val (pgd)); +PVOP_VCALL2 (pv_ops, mmu.set_pgd, pgdp,native_pgd_val (pgd)); }#define set_pgd (pgdp, pgdval) do { \
@@ -493,28 +493,28 @@ static inline void pmd_clear(pmd_t *pmdp)#define __HAVE_ARCH_START_CONTEXT_SWITCHstatic inline void arch_start_context_switch (struct task_struct *prev) { -PVOP_VCALL1 (cpu.start_context_switch, prev); +PVOP_VCALL1 (pv_ops, cpu.start_context_switch, prev); }static inline void arch_end_context_switch (struct task_struct *next) { -PVOP_VCALL1 (cpu.end_context_switch, next); +PVOP_VCALL1 (pv_ops, cpu.end_context_switch, next); }#define __HAVE_ARCH_ENTER_LAZY_MMU_MODEstatic inline void arch_enter_lazy_mmu_mode (void ) { -PVOP_VCALL0 (mmu.lazy_mode.enter); +PVOP_VCALL0 (pv_ops, mmu.lazy_mode.enter); }static inline void arch_leave_lazy_mmu_mode (void ) { -PVOP_VCALL0 (mmu.lazy_mode.leave); +PVOP_VCALL0 (pv_ops, mmu.lazy_mode.leave); }static inline void arch_flush_lazy_mmu_mode (void ) { -PVOP_VCALL0 (mmu.lazy_mode.flush); +PVOP_VCALL0 (pv_ops, mmu.lazy_mode.flush); } static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
@@ -529,29 +529,29 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, static __always_inline void pv_queued_spin_lock_slowpath(struct qspinlock *lock,u32 val) { -PVOP_VCALL2 (lock.queued_spin_lock_slowpath, lock, val); +PVOP_VCALL2 (pv_ops, lock.queued_spin_lock_slowpath, lock, val); } static __always_inline void pv_queued_spin_unlock(struct qspinlock *lock) { -PVOP_ALT_VCALLEE1 (lock.queued_spin_unlock, lock, +PVOP_ALT_VCALLEE1 (pv_ops, lock.queued_spin_unlock, lock,"movb $0, (%%" _ASM_ARG1");" ,ALT_NOT (X86_FEATURE_PVUNLOCK )); } static __always_inline void pv_wait(u8 *ptr, u8 val) { -PVOP_VCALL2 (lock.wait, ptr, val); +PVOP_VCALL2 (pv_ops, lock.wait, ptr, val); } static __always_inline void pv_kick(int cpu) { -PVOP_VCALL1 (lock.kick, cpu); +PVOP_VCALL1 (pv_ops, lock.kick, cpu); } static __always_inline bool pv_vcpu_is_preempted(long cpu) { -return PVOP_ALT_CALLEE1 (bool, lock.vcpu_is_preempted, cpu, +return PVOP_ALT_CALLEE1 (bool, pv_ops, lock.vcpu_is_preempted, cpu,"xor %%" _ASM_AX", %%" _ASM_AX";" ,ALT_NOT (X86_FEATURE_VCPUPREEMPT )); }
@@ -564,18 +564,18 @@ bool __raw_callee_save___native_vcpu_is_preempted(long cpu);#ifdef CONFIG_PARAVIRT_XXL static __always_inline unsigned long arch_local_save_flags (void ) { - return PVOP_ALT_CALLEE0(unsigned long, irq.save_fl, "pushf; pop %%rax;", + return PVOP_ALT_CALLEE0(unsigned long, pv_ops, irq.save_fl, "pushf; pop %%rax;",ALT_NOT_XEN ); } static __always_inline void arch_local_irq_disable(void) { -PVOP_ALT_VCALLEE0 (irq.irq_disable,"cli;" ,ALT_NOT_XEN ); +PVOP_ALT_VCALLEE0 (pv_ops, irq.irq_disable,"cli;" ,ALT_NOT_XEN ); } static __always_inline void arch_local_irq_enable(void) { -PVOP_ALT_VCALLEE0 (irq.irq_enable,"sti;" ,ALT_NOT_XEN ); +PVOP_ALT_VCALLEE0 (pv_ops, irq.irq_enable,"sti;" ,ALT_NOT_XEN ); }static __always_inline unsigned long arch_local_irq_save (void )
arch/x86/include/asm/paravirt_types.h +70 -70
198 lines not on this page · raw message
Signature · 1 line
2.51.0
[tip: x86/paravirt] x86/paravirt: Specify pv_ops array in paravirt macros
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: 392afe83165a54080ec48e50d45049bd5aaad332 Gitweb: https://git.kernel.org/tip/392afe83165a54080ec48e50d45049bd5aaad332 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:19 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Tue, 13 Jan 2026 14:47:29 +01:00
x86/paravirt: Specify pv_ops array in paravirt macros
In order to prepare having multiple pv_ops arrays, specify the array in the paravirt macros.
--- arch/x86/include/asm/paravirt.h | 166 ++++++++++++------------- arch/x86/include/asm/paravirt_types.h | 140 ++++++++++----------- 2 files changed, 153 insertions(+), 153 deletions(-)
arch/x86/include/asm/paravirt.h +83 -83
@@ -31,11 +31,11 @@ void __init paravirt_set_cap(void);/* The paravirtualized I/O functions */ static inline void slow_down_io (void ) { -PVOP_VCALL0 (cpu.io_delay); +PVOP_VCALL0 (pv_ops, cpu.io_delay);#ifdef REALLY_SLOW_IO -PVOP_VCALL0 (cpu.io_delay); -PVOP_VCALL0 (cpu.io_delay); -PVOP_VCALL0 (cpu.io_delay); +PVOP_VCALL0 (pv_ops, cpu.io_delay); +PVOP_VCALL0 (pv_ops, cpu.io_delay); +PVOP_VCALL0 (pv_ops, cpu.io_delay);#endif }
@@ -47,57 +47,57 @@ void native_flush_tlb_multi(const struct cpumask *cpumask,static inline void __flush_tlb_local (void ) { -PVOP_VCALL0 (mmu.flush_tlb_user); +PVOP_VCALL0 (pv_ops, mmu.flush_tlb_user); }static inline void __flush_tlb_global (void ) { -PVOP_VCALL0 (mmu.flush_tlb_kernel); +PVOP_VCALL0 (pv_ops, mmu.flush_tlb_kernel); }static inline void __flush_tlb_one_user (unsigned long addr) { -PVOP_VCALL1 (mmu.flush_tlb_one_user, addr); +PVOP_VCALL1 (pv_ops, mmu.flush_tlb_one_user, addr); }static inline void __flush_tlb_multi (const struct cpumask *cpumask,const struct flush_tlb_info *info) { -PVOP_VCALL2 (mmu.flush_tlb_multi, cpumask, info); +PVOP_VCALL2 (pv_ops, mmu.flush_tlb_multi, cpumask, info); }static inline void paravirt_arch_exit_mmap (struct mm_struct *mm) { -PVOP_VCALL1 (mmu.exit_mmap, mm); +PVOP_VCALL1 (pv_ops, mmu.exit_mmap, mm); }static inline void notify_page_enc_status_changed (unsigned long pfn,int npages,bool enc) { -PVOP_VCALL3 (mmu.notify_page_enc_status_changed, pfn, npages, enc); +PVOP_VCALL3 (pv_ops, mmu.notify_page_enc_status_changed, pfn, npages, enc); } static __always_inline void arch_safe_halt(void) { -PVOP_VCALL0 (irq.safe_halt); +PVOP_VCALL0 (pv_ops, irq.safe_halt); }static inline void halt (void ) { -PVOP_VCALL0 (irq.halt); +PVOP_VCALL0 (pv_ops, irq.halt); }#ifdef CONFIG_PARAVIRT_XXL static inline void load_sp0 (unsigned long sp0) { -PVOP_VCALL1 (cpu.load_sp0, sp0); +PVOP_VCALL1 (pv_ops, cpu.load_sp0, sp0); }/* The paravirtualized CPUID instruction. */ static inline void __cpuid (unsigned int *eax,unsigned int *ebx,unsigned int *ecx,unsigned int *edx) { -PVOP_VCALL4 (cpu.cpuid, eax, ebx, ecx, edx); +PVOP_VCALL4 (pv_ops, cpu.cpuid, eax, ebx, ecx, edx); }/*
@@ -105,69 +105,69 @@ static inline void __cpuid(unsigned int *eax, unsigned int *ebx,*/ static __always_inline unsigned long paravirt_get_debugreg (int reg) { - return PVOP_CALL1(unsigned long, cpu.get_debugreg, reg); + return PVOP_CALL1(unsigned long, pv_ops, cpu.get_debugreg, reg); }#define get_debugreg (var, reg) var = paravirt_get_debugreg(reg) static __always_inline void set_debugreg(unsigned long val, int reg) { -PVOP_VCALL2 (cpu.set_debugreg, reg, val); +PVOP_VCALL2 (pv_ops, cpu.set_debugreg, reg, val); }static inline unsigned long read_cr0 (void ) { - return PVOP_CALL0(unsigned long, cpu.read_cr0); + return PVOP_CALL0(unsigned long, pv_ops, cpu.read_cr0); }static inline void write_cr0 (unsigned long x) { -PVOP_VCALL1 (cpu.write_cr0, x); +PVOP_VCALL1 (pv_ops, cpu.write_cr0, x); }static __always_inline unsigned long read_cr2 (void ) { - return PVOP_ALT_CALLEE0(unsigned long, mmu.read_cr2, + return PVOP_ALT_CALLEE0(unsigned long, pv_ops, mmu.read_cr2,"mov %%cr2, %%rax;" ,ALT_NOT_XEN ); } static __always_inline void write_cr2(unsigned long x) { -PVOP_VCALL1 (mmu.write_cr2, x); +PVOP_VCALL1 (pv_ops, mmu.write_cr2, x); }static inline unsigned long __read_cr3 (void ) { - return PVOP_ALT_CALL0(unsigned long, mmu.read_cr3, + return PVOP_ALT_CALL0(unsigned long, pv_ops, mmu.read_cr3,"mov %%cr3, %%rax;" ,ALT_NOT_XEN ); }static inline void write_cr3 (unsigned long x) { -PVOP_ALT_VCALL1 (mmu.write_cr3, x,"mov %%rdi, %%cr3" ,ALT_NOT_XEN ); +PVOP_ALT_VCALL1 (pv_ops, mmu.write_cr3, x,"mov %%rdi, %%cr3" ,ALT_NOT_XEN ); }static inline void __write_cr4 (unsigned long x) { -PVOP_VCALL1 (cpu.write_cr4, x); +PVOP_VCALL1 (pv_ops, cpu.write_cr4, x); }static inline u64 paravirt_read_msr (u32 msr) { -return PVOP_CALL1 (u64, cpu.read_msr, msr); +return PVOP_CALL1 (u64, pv_ops, cpu.read_msr, msr); }static inline void paravirt_write_msr (u32 msr,u64 val) { -PVOP_VCALL2 (cpu.write_msr, msr, val); +PVOP_VCALL2 (pv_ops, cpu.write_msr, msr, val); }static inline int paravirt_read_msr_safe (u32 msr,u64 *val) { -return PVOP_CALL2 (int, cpu.read_msr_safe, msr, val); +return PVOP_CALL2 (int, pv_ops, cpu.read_msr_safe, msr, val); }static inline int paravirt_write_msr_safe (u32 msr,u64 val) { -return PVOP_CALL2 (int, cpu.write_msr_safe, msr, val); +return PVOP_CALL2 (int, pv_ops, cpu.write_msr_safe, msr, val); }#define rdmsr (msr, val1, val2) \
@@ -214,154 +214,154 @@ static __always_inline int rdmsrq_safe(u32 msr, u64 *p) static __always_inline u64 rdpmc(int counter) { -return PVOP_CALL1 (u64, cpu.read_pmc, counter); +return PVOP_CALL1 (u64, pv_ops, cpu.read_pmc, counter); }static inline void paravirt_alloc_ldt (struct desc_struct *ldt,unsigned entries) { -PVOP_VCALL2 (cpu.alloc_ldt, ldt, entries); +PVOP_VCALL2 (pv_ops, cpu.alloc_ldt, ldt, entries); }static inline void paravirt_free_ldt (struct desc_struct *ldt,unsigned entries) { -PVOP_VCALL2 (cpu.free_ldt, ldt, entries); +PVOP_VCALL2 (pv_ops, cpu.free_ldt, ldt, entries); }static inline void load_TR_desc (void ) { -PVOP_VCALL0 (cpu.load_tr_desc); +PVOP_VCALL0 (pv_ops, cpu.load_tr_desc); }static inline void load_gdt (const struct desc_ptr *dtr) { -PVOP_VCALL1 (cpu.load_gdt, dtr); +PVOP_VCALL1 (pv_ops, cpu.load_gdt, dtr); }static inline void load_idt (const struct desc_ptr *dtr) { -PVOP_VCALL1 (cpu.load_idt, dtr); +PVOP_VCALL1 (pv_ops, cpu.load_idt, dtr); }static inline void set_ldt (const void *addr,unsigned entries) { -PVOP_VCALL2 (cpu.set_ldt, addr, entries); +PVOP_VCALL2 (pv_ops, cpu.set_ldt, addr, entries); }static inline unsigned long paravirt_store_tr (void ) { - return PVOP_CALL0(unsigned long, cpu.store_tr); + return PVOP_CALL0(unsigned long, pv_ops, cpu.store_tr); }#define store_tr (tr) ((tr) = paravirt_store_tr())static inline void load_TLS (struct thread_struct *t,unsigned cpu) { -PVOP_VCALL2 (cpu.load_tls, t, cpu); +PVOP_VCALL2 (pv_ops, cpu.load_tls, t, cpu); }static inline void load_gs_index (unsigned int gs) { -PVOP_VCALL1 (cpu.load_gs_index, gs); +PVOP_VCALL1 (pv_ops, cpu.load_gs_index, gs); }static inline void write_ldt_entry (struct desc_struct *dt,int entry,const void *desc) { -PVOP_VCALL3 (cpu.write_ldt_entry, dt, entry, desc); +PVOP_VCALL3 (pv_ops, cpu.write_ldt_entry, dt, entry, desc); }static inline void write_gdt_entry (struct desc_struct *dt,int entry,void *desc,int type) { -PVOP_VCALL4 (cpu.write_gdt_entry, dt, entry, desc, type); +PVOP_VCALL4 (pv_ops, cpu.write_gdt_entry, dt, entry, desc, type); }static inline void write_idt_entry (gate_desc *dt,int entry,const gate_desc *g) { -PVOP_VCALL3 (cpu.write_idt_entry, dt, entry, g); +PVOP_VCALL3 (pv_ops, cpu.write_idt_entry, dt, entry, g); }#ifdef CONFIG_X86_IOPL_IOPERM static inline void tss_invalidate_io_bitmap (void ) { -PVOP_VCALL0 (cpu.invalidate_io_bitmap); +PVOP_VCALL0 (pv_ops, cpu.invalidate_io_bitmap); }static inline void tss_update_io_bitmap (void ) { -PVOP_VCALL0 (cpu.update_io_bitmap); +PVOP_VCALL0 (pv_ops, cpu.update_io_bitmap); }#endif static inline void paravirt_enter_mmap (struct mm_struct *next) { -PVOP_VCALL1 (mmu.enter_mmap, next); +PVOP_VCALL1 (pv_ops, mmu.enter_mmap, next); }static inline int paravirt_pgd_alloc (struct mm_struct *mm) { -return PVOP_CALL1 (int, mmu.pgd_alloc, mm); +return PVOP_CALL1 (int, pv_ops, mmu.pgd_alloc, mm); }static inline void paravirt_pgd_free (struct mm_struct *mm,pgd_t *pgd) { -PVOP_VCALL2 (mmu.pgd_free, mm, pgd); +PVOP_VCALL2 (pv_ops, mmu.pgd_free, mm, pgd); }static inline void paravirt_alloc_pte (struct mm_struct *mm,unsigned long pfn) { -PVOP_VCALL2 (mmu.alloc_pte, mm, pfn); +PVOP_VCALL2 (pv_ops, mmu.alloc_pte, mm, pfn); }static inline void paravirt_release_pte (unsigned long pfn) { -PVOP_VCALL1 (mmu.release_pte, pfn); +PVOP_VCALL1 (pv_ops, mmu.release_pte, pfn); }static inline void paravirt_alloc_pmd (struct mm_struct *mm,unsigned long pfn) { -PVOP_VCALL2 (mmu.alloc_pmd, mm, pfn); +PVOP_VCALL2 (pv_ops, mmu.alloc_pmd, mm, pfn); }static inline void paravirt_release_pmd (unsigned long pfn) { -PVOP_VCALL1 (mmu.release_pmd, pfn); +PVOP_VCALL1 (pv_ops, mmu.release_pmd, pfn); }static inline void paravirt_alloc_pud (struct mm_struct *mm,unsigned long pfn) { -PVOP_VCALL2 (mmu.alloc_pud, mm, pfn); +PVOP_VCALL2 (pv_ops, mmu.alloc_pud, mm, pfn); }static inline void paravirt_release_pud (unsigned long pfn) { -PVOP_VCALL1 (mmu.release_pud, pfn); +PVOP_VCALL1 (pv_ops, mmu.release_pud, pfn); }static inline void paravirt_alloc_p4d (struct mm_struct *mm,unsigned long pfn) { -PVOP_VCALL2 (mmu.alloc_p4d, mm, pfn); +PVOP_VCALL2 (pv_ops, mmu.alloc_p4d, mm, pfn); }static inline void paravirt_release_p4d (unsigned long pfn) { -PVOP_VCALL1 (mmu.release_p4d, pfn); +PVOP_VCALL1 (pv_ops, mmu.release_p4d, pfn); }static inline pte_t __pte (pteval_t val) { -return (pte_t ) {PVOP_ALT_CALLEE1 (pteval_t, mmu.make_pte, val, +return (pte_t ) {PVOP_ALT_CALLEE1 (pteval_t, pv_ops, mmu.make_pte, val,"mov %%rdi, %%rax" ,ALT_NOT_XEN ) }; }static inline pteval_t pte_val (pte_t pte) { -return PVOP_ALT_CALLEE1 (pteval_t, mmu.pte_val, pte.pte, +return PVOP_ALT_CALLEE1 (pteval_t, pv_ops, mmu.pte_val, pte.pte,"mov %%rdi, %%rax" ,ALT_NOT_XEN ); }static inline pgd_t __pgd (pgdval_t val) { -return (pgd_t ) {PVOP_ALT_CALLEE1 (pgdval_t, mmu.make_pgd, val, +return (pgd_t ) {PVOP_ALT_CALLEE1 (pgdval_t, pv_ops, mmu.make_pgd, val,"mov %%rdi, %%rax" ,ALT_NOT_XEN ) }; }static inline pgdval_t pgd_val (pgd_t pgd) { -return PVOP_ALT_CALLEE1 (pgdval_t, mmu.pgd_val, pgd.pgd, +return PVOP_ALT_CALLEE1 (pgdval_t, pv_ops, mmu.pgd_val, pgd.pgd,"mov %%rdi, %%rax" ,ALT_NOT_XEN ); }
@@ -371,7 +371,7 @@ static inline pte_t ptep_modify_prot_start(struct vm_area_struct *vma, unsigned {pteval_t ret; - ret =PVOP_CALL3 (pteval_t, mmu.ptep_modify_prot_start, vma, addr, ptep); + ret =PVOP_CALL3 (pteval_t, pv_ops, mmu.ptep_modify_prot_start, vma, addr, ptep);return (pte_t ) { .pte = ret }; }
@@ -380,41 +380,41 @@ static inline void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned pte_t *ptep, pte_t old_pte, pte_t pte) { - PVOP_VCALL4(mmu.ptep_modify_prot_commit, vma, addr, ptep, pte.pte); + PVOP_VCALL4(pv_ops, mmu.ptep_modify_prot_commit, vma, addr, ptep, pte.pte); }static inline void set_pte (pte_t *ptep,pte_t pte) { -PVOP_VCALL2 (mmu.set_pte, ptep, pte.pte); +PVOP_VCALL2 (pv_ops, mmu.set_pte, ptep, pte.pte); }static inline void set_pmd (pmd_t *pmdp,pmd_t pmd) { -PVOP_VCALL2 (mmu.set_pmd, pmdp,native_pmd_val (pmd)); +PVOP_VCALL2 (pv_ops, mmu.set_pmd, pmdp,native_pmd_val (pmd)); }static inline pmd_t __pmd (pmdval_t val) { -return (pmd_t ) {PVOP_ALT_CALLEE1 (pmdval_t, mmu.make_pmd, val, +return (pmd_t ) {PVOP_ALT_CALLEE1 (pmdval_t, pv_ops, mmu.make_pmd, val,"mov %%rdi, %%rax" ,ALT_NOT_XEN ) }; }static inline pmdval_t pmd_val (pmd_t pmd) { -return PVOP_ALT_CALLEE1 (pmdval_t, mmu.pmd_val, pmd.pmd, +return PVOP_ALT_CALLEE1 (pmdval_t, pv_ops, mmu.pmd_val, pmd.pmd,"mov %%rdi, %%rax" ,ALT_NOT_XEN ); }static inline void set_pud (pud_t *pudp,pud_t pud) { -PVOP_VCALL2 (mmu.set_pud, pudp,native_pud_val (pud)); +PVOP_VCALL2 (pv_ops, mmu.set_pud, pudp,native_pud_val (pud)); }static inline pud_t __pud (pudval_t val) {pudval_t ret; - ret =PVOP_ALT_CALLEE1 (pudval_t, mmu.make_pud, val, + ret =PVOP_ALT_CALLEE1 (pudval_t, pv_ops, mmu.make_pud, val,"mov %%rdi, %%rax" ,ALT_NOT_XEN );return (pud_t ) { ret };
@@ -422,7 +422,7 @@ static inline pud_t __pud(pudval_t val)static inline pudval_t pud_val (pud_t pud) { -return PVOP_ALT_CALLEE1 (pudval_t, mmu.pud_val, pud.pud, +return PVOP_ALT_CALLEE1 (pudval_t, pv_ops, mmu.pud_val, pud.pud,"mov %%rdi, %%rax" ,ALT_NOT_XEN ); }
@@ -435,12 +435,12 @@ static inline void set_p4d(p4d_t *p4dp, p4d_t p4d) {p4dval_t val =native_p4d_val (p4d); -PVOP_VCALL2 (mmu.set_p4d, p4dp, val); +PVOP_VCALL2 (pv_ops, mmu.set_p4d, p4dp, val); }static inline p4d_t __p4d (p4dval_t val) { -p4dval_t ret =PVOP_ALT_CALLEE1 (p4dval_t, mmu.make_p4d, val, +p4dval_t ret =PVOP_ALT_CALLEE1 (p4dval_t, pv_ops, mmu.make_p4d, val,"mov %%rdi, %%rax" ,ALT_NOT_XEN );return (p4d_t ) { ret };
@@ -448,13 +448,13 @@ static inline p4d_t __p4d(p4dval_t val)static inline p4dval_t p4d_val (p4d_t p4d) { -return PVOP_ALT_CALLEE1 (p4dval_t, mmu.p4d_val, p4d.p4d, +return PVOP_ALT_CALLEE1 (p4dval_t, pv_ops, mmu.p4d_val, p4d.p4d,"mov %%rdi, %%rax" ,ALT_NOT_XEN ); }static inline void __set_pgd (pgd_t *pgdp,pgd_t pgd) { -PVOP_VCALL2 (mmu.set_pgd, pgdp,native_pgd_val (pgd)); +PVOP_VCALL2 (pv_ops, mmu.set_pgd, pgdp,native_pgd_val (pgd)); }#define set_pgd (pgdp, pgdval) do { \
@@ -493,28 +493,28 @@ static inline void pmd_clear(pmd_t *pmdp)#define __HAVE_ARCH_START_CONTEXT_SWITCHstatic inline void arch_start_context_switch (struct task_struct *prev) { -PVOP_VCALL1 (cpu.start_context_switch, prev); +PVOP_VCALL1 (pv_ops, cpu.start_context_switch, prev); }static inline void arch_end_context_switch (struct task_struct *next) { -PVOP_VCALL1 (cpu.end_context_switch, next); +PVOP_VCALL1 (pv_ops, cpu.end_context_switch, next); }#define __HAVE_ARCH_ENTER_LAZY_MMU_MODEstatic inline void arch_enter_lazy_mmu_mode (void ) { -PVOP_VCALL0 (mmu.lazy_mode.enter); +PVOP_VCALL0 (pv_ops, mmu.lazy_mode.enter); }static inline void arch_leave_lazy_mmu_mode (void ) { -PVOP_VCALL0 (mmu.lazy_mode.leave); +PVOP_VCALL0 (pv_ops, mmu.lazy_mode.leave); }static inline void arch_flush_lazy_mmu_mode (void ) { -PVOP_VCALL0 (mmu.lazy_mode.flush); +PVOP_VCALL0 (pv_ops, mmu.lazy_mode.flush); } static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
@@ -529,29 +529,29 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, static __always_inline void pv_queued_spin_lock_slowpath(struct qspinlock *lock,u32 val) { -PVOP_VCALL2 (lock.queued_spin_lock_slowpath, lock, val); +PVOP_VCALL2 (pv_ops, lock.queued_spin_lock_slowpath, lock, val); } static __always_inline void pv_queued_spin_unlock(struct qspinlock *lock) { -PVOP_ALT_VCALLEE1 (lock.queued_spin_unlock, lock, +PVOP_ALT_VCALLEE1 (pv_ops, lock.queued_spin_unlock, lock,"movb $0, (%%" _ASM_ARG1");" ,ALT_NOT (X86_FEATURE_PVUNLOCK )); } static __always_inline void pv_wait(u8 *ptr, u8 val) { -PVOP_VCALL2 (lock.wait, ptr, val); +PVOP_VCALL2 (pv_ops, lock.wait, ptr, val); } static __always_inline void pv_kick(int cpu) { -PVOP_VCALL1 (lock.kick, cpu); +PVOP_VCALL1 (pv_ops, lock.kick, cpu); } static __always_inline bool pv_vcpu_is_preempted(long cpu) { -return PVOP_ALT_CALLEE1 (bool, lock.vcpu_is_preempted, cpu, +return PVOP_ALT_CALLEE1 (bool, pv_ops, lock.vcpu_is_preempted, cpu,"xor %%" _ASM_AX", %%" _ASM_AX";" ,ALT_NOT (X86_FEATURE_VCPUPREEMPT )); }
@@ -564,18 +564,18 @@ bool __raw_callee_save___native_vcpu_is_preempted(long cpu);#ifdef CONFIG_PARAVIRT_XXL static __always_inline unsigned long arch_local_save_flags (void ) { - return PVOP_ALT_CALLEE0(unsigned long, irq.save_fl, "pushf; pop %%rax;", + return PVOP_ALT_CALLEE0(unsigned long, pv_ops, irq.save_fl, "pushf; pop %%rax;",ALT_NOT_XEN ); } static __always_inline void arch_local_irq_disable(void) { -PVOP_ALT_VCALLEE0 (irq.irq_disable,"cli;" ,ALT_NOT_XEN ); +PVOP_ALT_VCALLEE0 (pv_ops, irq.irq_disable,"cli;" ,ALT_NOT_XEN ); } static __always_inline void arch_local_irq_enable(void) { -PVOP_ALT_VCALLEE0 (irq.irq_enable,"sti;" ,ALT_NOT_XEN ); +PVOP_ALT_VCALLEE0 (pv_ops, irq.irq_enable,"sti;" ,ALT_NOT_XEN ); }static __always_inline unsigned long arch_local_irq_save (void )
arch/x86/include/asm/paravirt_types.h +70 -70
198 lines not on this page · raw message
Juergen Gross
maintainerPATCH v5 21/21 x86/pvlocks: Move paravirt spinlock functions into own header
In reply to Juergen GrossInstead of having the pv spinlock function definitions in paravirt.h, move them into the new header paravirt-spinlock.h.
---
V2:
- use new header instead of qspinlock.h
- use dedicated pv_ops_lock array
- move more paravirt related lock code
V3:
- hide native_pv_lock_init() with CONFIG_SMP (kernel test robot) V4:
- don't reference pv_ops_lock without CONFIG_PARAVIRT_SPINLOCKS (kernel test robot)
V5:
- move paravirt_set_cap() declaration into paravirt-base.h (kernel test robot)
--- arch/x86/hyperv/hv_spinlock.c | 10 +- arch/x86/include/asm/paravirt-base.h | 6 + arch/x86/include/asm/paravirt-spinlock.h | 145 +++++++++++++++++++++++ arch/x86/include/asm/paravirt.h | 61 ---------- arch/x86/include/asm/paravirt_types.h | 17 --- arch/x86/include/asm/qspinlock.h | 87 +------------- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/kvm.c | 12 +- arch/x86/kernel/paravirt-spinlocks.c | 26 +++- arch/x86/kernel/paravirt.c | 21 ---- arch/x86/xen/spinlock.c | 10 +- tools/objtool/check.c | 1 + 12 files changed, 198 insertions(+), 200 deletions(-) create mode 100644 arch/x86/include/asm/paravirt-spinlock.h
arch/x86/hyperv/hv_spinlock.c +5 -5
@@ -78,11 +78,11 @@ void __init hv_init_spinlocks(void)pr_info ("PV spinlocks enabled\n" );__pv_init_lock_hash (); - pv_ops.lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; - pv_ops.lock.queued_spin_unlock =PV_CALLEE_SAVE (__pv_queued_spin_unlock); - pv_ops.lock.wait = hv_qlock_wait; - pv_ops.lock.kick = hv_qlock_kick; - pv_ops.lock.vcpu_is_preempted =PV_CALLEE_SAVE (hv_vcpu_is_preempted); + pv_ops_lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; + pv_ops_lock.queued_spin_unlock =PV_CALLEE_SAVE (__pv_queued_spin_unlock); + pv_ops_lock.wait = hv_qlock_wait; + pv_ops_lock.kick = hv_qlock_kick; + pv_ops_lock.vcpu_is_preempted =PV_CALLEE_SAVE (hv_vcpu_is_preempted); }static __init int hv_parse_nopvspin (char *arg)
arch/x86/include/asm/paravirt-base.h +6 -0
@@ -26,4 +26,10 @@ u64 _paravirt_ident_64(u64);#endif #define paravirt_nop ((void *)nop_func) +#ifdef CONFIG_PARAVIRT_SPINLOCKS +void paravirt_set_cap (void ); +#else +static inline void paravirt_set_cap (void ) { } +#endif +#endif /* _ASM_X86_PARAVIRT_BASE_H */
arch/x86/include/asm/paravirt-spinlock.h new file +145 -0
145 lines not on this page · raw message
arch/x86/include/asm/paravirt.h +0 -61
91 lines not on this page · raw message
arch/x86/include/asm/paravirt_types.h +0 -17
@@ -184,22 +184,6 @@ struct pv_mmu_ops {#endif } __no_randomize_layout; -#ifdef CONFIG_SMP -#include <asm/spinlock_types.h> -#endif - -struct qspinlock ; - -struct pv_lock_ops { -void (*queued_spin_lock_slowpath)(struct qspinlock *lock,u32 val); -struct paravirt_callee_save queued_spin_unlock; - -void (*wait)(u8 *ptr,u8 val); -void (*kick)(int cpu); - -struct paravirt_callee_save vcpu_is_preempted; -} __no_randomize_layout; -/* This contains all the paravirt structures: we get a convenient * number for each function using the offset which we use to indicate * what to patch. */
@@ -207,7 +191,6 @@ struct paravirt_patch_template {struct pv_cpu_ops cpu;struct pv_irq_ops irq;struct pv_mmu_ops mmu; -struct pv_lock_ops lock; } __no_randomize_layout;extern struct paravirt_patch_template pv_ops;
arch/x86/include/asm/qspinlock.h +5 -82
101 lines not on this page · raw message
arch/x86/kernel/Makefile +1 -1
@@ -126,7 +126,7 @@ obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o obj-$(CONFIG_KVM_GUEST) += kvm.o kvmclock.o obj-$(CONFIG_PARAVIRT) += paravirt.o -obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= paravirt-spinlocks.o +obj-$(CONFIG_PARAVIRT) += paravirt-spinlocks.o obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o obj-$(CONFIG_X86_PMEM_LEGACY_DEVICE) += pmem.o
arch/x86/kernel/kvm.c +7 -5
@@ -829,8 +829,10 @@ static void __init kvm_guest_init(void) has_steal_clock =1 ;static_call_update (pv_steal_clock, kvm_steal_clock); - pv_ops.lock.vcpu_is_preempted = +#ifdef CONFIG_PARAVIRT_SPINLOCKS + pv_ops_lock.vcpu_is_preempted =PV_CALLEE_SAVE (__kvm_vcpu_is_preempted); +#endif }if (kvm_para_has_feature (KVM_FEATURE_PV_EOI ))
@@ -1126,11 +1128,11 @@ void __init kvm_spinlock_init(void)pr_info ("PV spinlocks enabled\n" );__pv_init_lock_hash (); - pv_ops.lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; - pv_ops.lock.queued_spin_unlock = + pv_ops_lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; + pv_ops_lock.queued_spin_unlock =PV_CALLEE_SAVE (__pv_queued_spin_unlock); - pv_ops.lock.wait = kvm_wait; - pv_ops.lock.kick = kvm_kick_cpu; + pv_ops_lock.wait = kvm_wait; + pv_ops_lock.kick = kvm_kick_cpu;/* * When PV spinlock is enabled which is preferred over
arch/x86/kernel/paravirt-spinlocks.c +23 -3
@@ -3,12 +3,22 @@* Split spinlock implementation out into its own file, so it can be * compiled in a FTRACE-compatible way. */ +#include <linux/static_call.h> #include <linux/spinlock.h> #include <linux/export.h> #include <linux/jump_label.h> -#include <asm/paravirt.h> +DEFINE_STATIC_KEY_FALSE (virt_spin_lock_key); +#ifdef CONFIG_SMP +void __init native_pv_lock_init (void ) +{ +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) +static_branch_enable (&virt_spin_lock_key); +} +#endif + +#ifdef CONFIG_PARAVIRT_SPINLOCKS __visible void __native_queued_spin_unlock(struct qspinlock *lock) {native_queued_spin_unlock (lock);
@@ -17,7 +27,7 @@ PV_CALLEE_SAVE_REGS_THUNK(__native_queued_spin_unlock);bool pv_is_native_spin_unlock (void ) { -return pv_ops.lock.queued_spin_unlock.func == +return pv_ops_lock.queued_spin_unlock.func == __raw_callee_save___native_queued_spin_unlock; }
@@ -29,7 +39,7 @@ PV_CALLEE_SAVE_REGS_THUNK(__native_vcpu_is_preempted);bool pv_is_native_vcpu_is_preempted (void ) { -return pv_ops.lock.vcpu_is_preempted.func == +return pv_ops_lock.vcpu_is_preempted.func == __raw_callee_save___native_vcpu_is_preempted; }
@@ -41,3 +51,13 @@ void __init paravirt_set_cap(void)if (!pv_is_native_vcpu_is_preempted ()) setup_force_cpu_cap(X86_FEATURE_VCPUPREEMPT); } + +struct pv_lock_ops pv_ops_lock = { + .queued_spin_lock_slowpath = native_queued_spin_lock_slowpath, + .queued_spin_unlock =PV_CALLEE_SAVE (__native_queued_spin_unlock), + .wait = paravirt_nop, + .kick = paravirt_nop, + .vcpu_is_preempted =PV_CALLEE_SAVE (__native_vcpu_is_preempted), +}; +EXPORT_SYMBOL (pv_ops_lock); +#endif
arch/x86/kernel/paravirt.c +0 -21
@@ -57,14 +57,6 @@ DEFINE_ASM_FUNC(pv_native_irq_enable, "sti", .noinstr.text); DEFINE_ASM_FUNC(pv_native_read_cr2, "mov %cr2, %rax", .noinstr.text);#endif -DEFINE_STATIC_KEY_FALSE (virt_spin_lock_key); - -void __init native_pv_lock_init (void ) -{ -if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) -static_branch_enable (&virt_spin_lock_key); -} - static noinstr void pv_native_safe_halt(void) {native_safe_halt ();
@@ -221,19 +213,6 @@ struct paravirt_patch_template pv_ops = { .mmu.set_fixmap = native_set_fixmap,#endif /* CONFIG_PARAVIRT_XXL */ - -#if defined(CONFIG_PARAVIRT_SPINLOCKS ) -/* Lock ops. */ -#ifdef CONFIG_SMP - .lock.queued_spin_lock_slowpath = native_queued_spin_lock_slowpath, - .lock.queued_spin_unlock = - PV_CALLEE_SAVE(__native_queued_spin_unlock), - .lock.wait = paravirt_nop, - .lock.kick = paravirt_nop, - .lock.vcpu_is_preempted = - PV_CALLEE_SAVE(__native_vcpu_is_preempted), -#endif /* SMP */ -#endif };#ifdef CONFIG_PARAVIRT_XXL
arch/x86/xen/spinlock.c +5 -5
@@ -134,10 +134,10 @@ void __init xen_init_spinlocks(void)printk (KERN_DEBUG "xen: PV spinlocks enabled\n" );__pv_init_lock_hash (); - pv_ops.lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; - pv_ops.lock.queued_spin_unlock = + pv_ops_lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; + pv_ops_lock.queued_spin_unlock =PV_CALLEE_SAVE (__pv_queued_spin_unlock); - pv_ops.lock.wait = xen_qlock_wait; - pv_ops.lock.kick = xen_qlock_kick; - pv_ops.lock.vcpu_is_preempted =PV_CALLEE_SAVE (xen_vcpu_stolen); + pv_ops_lock.wait = xen_qlock_wait; + pv_ops_lock.kick = xen_qlock_kick; + pv_ops_lock.vcpu_is_preempted =PV_CALLEE_SAVE (xen_vcpu_stolen); }
tools/objtool/check.c +1 -0
@@ -527,6 +527,7 @@ static struct {int idx_off; } pv_ops_tables[] = { { .name = "pv_ops", }, + { .name = "pv_ops_lock", }, { .name = NULL, .idx_off = -1 } };
Signature · 1 line
2.51.0
Re: [PATCH v5 21/21] x86/pvlocks: Move paravirt spinlock functions into own header
Quoted 17 lines · Juergen Gross
Instead of having the pv spinlock function definitions in
paravirt.h, move them into the new headerparavirt-spinlock.h.Signed-off-by Juergen Gross <[email protected]>---
V2:
- use new header instead ofqspinlock.h
- use dedicatedpv_ops_lockarray
- move more paravirt related lock code
V3:
- hidenative_pv_lock_init()withCONFIG_SMP(kernel test robot) V4:
- don't referencepv_ops_lockwithoutCONFIG_PARAVIRT_SPINLOCKS(kernel test robot)
V5:
- moveparavirt_set_cap()declaration intoparavirt-base.h(kernel test robot)
Quoted 2 lines
--- arch/x86/hyperv/hv_spinlock.c | 10 +-
[tip: x86/paravirt] x86/pvlocks: Move paravirt spinlock functions into own header
In reply to Juergen GrossThe following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: b0b449e6fec4cd182bd4384f7eb9002596079f68 Gitweb: https://git.kernel.org/tip/b0b449e6fec4cd182bd4384f7eb9002596079f68 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 05 Jan 2026 12:05:20 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Tue, 13 Jan 2026 14:57:45 +01:00
x86/pvlocks: Move paravirt spinlock functions into own header
Instead of having the pv spinlock function definitions in paravirt.h, move them into the new header paravirt-spinlock.h.
--- arch/x86/hyperv/hv_spinlock.c | 10 +- arch/x86/include/asm/paravirt-base.h | 6 +- arch/x86/include/asm/paravirt-spinlock.h | 145 ++++++++++++++++++++++- arch/x86/include/asm/paravirt.h | 61 +--------- arch/x86/include/asm/paravirt_types.h | 17 +--- arch/x86/include/asm/qspinlock.h | 87 +------------- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/kvm.c | 12 +- arch/x86/kernel/paravirt-spinlocks.c | 26 +++- arch/x86/kernel/paravirt.c | 21 +--- arch/x86/xen/spinlock.c | 10 +- tools/objtool/check.c | 1 +- 12 files changed, 198 insertions(+), 200 deletions(-) create mode 100644 arch/x86/include/asm/paravirt-spinlock.h
arch/x86/hyperv/hv_spinlock.c +5 -5
@@ -78,11 +78,11 @@ void __init hv_init_spinlocks(void)pr_info ("PV spinlocks enabled\n" );__pv_init_lock_hash (); - pv_ops.lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; - pv_ops.lock.queued_spin_unlock =PV_CALLEE_SAVE (__pv_queued_spin_unlock); - pv_ops.lock.wait = hv_qlock_wait; - pv_ops.lock.kick = hv_qlock_kick; - pv_ops.lock.vcpu_is_preempted =PV_CALLEE_SAVE (hv_vcpu_is_preempted); + pv_ops_lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; + pv_ops_lock.queued_spin_unlock =PV_CALLEE_SAVE (__pv_queued_spin_unlock); + pv_ops_lock.wait = hv_qlock_wait; + pv_ops_lock.kick = hv_qlock_kick; + pv_ops_lock.vcpu_is_preempted =PV_CALLEE_SAVE (hv_vcpu_is_preempted); }static __init int hv_parse_nopvspin (char *arg)
arch/x86/include/asm/paravirt-base.h +6 -0
@@ -26,4 +26,10 @@ u64 _paravirt_ident_64(u64);#endif #define paravirt_nop ((void *)nop_func) +#ifdef CONFIG_PARAVIRT_SPINLOCKS +void paravirt_set_cap (void ); +#else +static inline void paravirt_set_cap (void ) { } +#endif +#endif /* _ASM_X86_PARAVIRT_BASE_H */
arch/x86/include/asm/paravirt-spinlock.h new file +145 -0
145 lines not on this page · raw message
arch/x86/include/asm/paravirt.h +0 -61
91 lines not on this page · raw message
arch/x86/include/asm/paravirt_types.h +0 -17
@@ -184,22 +184,6 @@ struct pv_mmu_ops {#endif } __no_randomize_layout; -#ifdef CONFIG_SMP -#include <asm/spinlock_types.h> -#endif - -struct qspinlock ; - -struct pv_lock_ops { -void (*queued_spin_lock_slowpath)(struct qspinlock *lock,u32 val); -struct paravirt_callee_save queued_spin_unlock; - -void (*wait)(u8 *ptr,u8 val); -void (*kick)(int cpu); - -struct paravirt_callee_save vcpu_is_preempted; -} __no_randomize_layout; -/* This contains all the paravirt structures: we get a convenient * number for each function using the offset which we use to indicate * what to patch. */
@@ -207,7 +191,6 @@ struct paravirt_patch_template {struct pv_cpu_ops cpu;struct pv_irq_ops irq;struct pv_mmu_ops mmu; -struct pv_lock_ops lock; } __no_randomize_layout;extern struct paravirt_patch_template pv_ops;
arch/x86/include/asm/qspinlock.h +5 -82
101 lines not on this page · raw message
arch/x86/kernel/Makefile +1 -1
@@ -126,7 +126,7 @@ obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o obj-$(CONFIG_KVM_GUEST) += kvm.o kvmclock.o obj-$(CONFIG_PARAVIRT) += paravirt.o -obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= paravirt-spinlocks.o +obj-$(CONFIG_PARAVIRT) += paravirt-spinlocks.o obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o obj-$(CONFIG_X86_PMEM_LEGACY_DEVICE) += pmem.o
arch/x86/kernel/kvm.c +7 -5
@@ -829,8 +829,10 @@ static void __init kvm_guest_init(void) has_steal_clock =1 ;static_call_update (pv_steal_clock, kvm_steal_clock); - pv_ops.lock.vcpu_is_preempted = +#ifdef CONFIG_PARAVIRT_SPINLOCKS + pv_ops_lock.vcpu_is_preempted =PV_CALLEE_SAVE (__kvm_vcpu_is_preempted); +#endif }if (kvm_para_has_feature (KVM_FEATURE_PV_EOI ))
@@ -1126,11 +1128,11 @@ void __init kvm_spinlock_init(void)pr_info ("PV spinlocks enabled\n" );__pv_init_lock_hash (); - pv_ops.lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; - pv_ops.lock.queued_spin_unlock = + pv_ops_lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; + pv_ops_lock.queued_spin_unlock =PV_CALLEE_SAVE (__pv_queued_spin_unlock); - pv_ops.lock.wait = kvm_wait; - pv_ops.lock.kick = kvm_kick_cpu; + pv_ops_lock.wait = kvm_wait; + pv_ops_lock.kick = kvm_kick_cpu;/* * When PV spinlock is enabled which is preferred over
arch/x86/kernel/paravirt-spinlocks.c +23 -3
@@ -3,12 +3,22 @@* Split spinlock implementation out into its own file, so it can be * compiled in a FTRACE-compatible way. */ +#include <linux/static_call.h> #include <linux/spinlock.h> #include <linux/export.h> #include <linux/jump_label.h> -#include <asm/paravirt.h> +DEFINE_STATIC_KEY_FALSE (virt_spin_lock_key); +#ifdef CONFIG_SMP +void __init native_pv_lock_init (void ) +{ +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) +static_branch_enable (&virt_spin_lock_key); +} +#endif + +#ifdef CONFIG_PARAVIRT_SPINLOCKS __visible void __native_queued_spin_unlock(struct qspinlock *lock) {native_queued_spin_unlock (lock);
@@ -17,7 +27,7 @@ PV_CALLEE_SAVE_REGS_THUNK(__native_queued_spin_unlock);bool pv_is_native_spin_unlock (void ) { -return pv_ops.lock.queued_spin_unlock.func == +return pv_ops_lock.queued_spin_unlock.func == __raw_callee_save___native_queued_spin_unlock; }
@@ -29,7 +39,7 @@ PV_CALLEE_SAVE_REGS_THUNK(__native_vcpu_is_preempted);bool pv_is_native_vcpu_is_preempted (void ) { -return pv_ops.lock.vcpu_is_preempted.func == +return pv_ops_lock.vcpu_is_preempted.func == __raw_callee_save___native_vcpu_is_preempted; }
@@ -41,3 +51,13 @@ void __init paravirt_set_cap(void)if (!pv_is_native_vcpu_is_preempted ()) setup_force_cpu_cap(X86_FEATURE_VCPUPREEMPT); } + +struct pv_lock_ops pv_ops_lock = { + .queued_spin_lock_slowpath = native_queued_spin_lock_slowpath, + .queued_spin_unlock =PV_CALLEE_SAVE (__native_queued_spin_unlock), + .wait = paravirt_nop, + .kick = paravirt_nop, + .vcpu_is_preempted =PV_CALLEE_SAVE (__native_vcpu_is_preempted), +}; +EXPORT_SYMBOL (pv_ops_lock); +#endif
arch/x86/kernel/paravirt.c +0 -21
@@ -57,14 +57,6 @@ DEFINE_ASM_FUNC(pv_native_irq_enable, "sti", .noinstr.text); DEFINE_ASM_FUNC(pv_native_read_cr2, "mov %cr2, %rax", .noinstr.text);#endif -DEFINE_STATIC_KEY_FALSE (virt_spin_lock_key); - -void __init native_pv_lock_init (void ) -{ -if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) -static_branch_enable (&virt_spin_lock_key); -} - static noinstr void pv_native_safe_halt(void) {native_safe_halt ();
@@ -221,19 +213,6 @@ struct paravirt_patch_template pv_ops = { .mmu.set_fixmap = native_set_fixmap,#endif /* CONFIG_PARAVIRT_XXL */ - -#if defined(CONFIG_PARAVIRT_SPINLOCKS ) -/* Lock ops. */ -#ifdef CONFIG_SMP - .lock.queued_spin_lock_slowpath = native_queued_spin_lock_slowpath, - .lock.queued_spin_unlock = - PV_CALLEE_SAVE(__native_queued_spin_unlock), - .lock.wait = paravirt_nop, - .lock.kick = paravirt_nop, - .lock.vcpu_is_preempted = - PV_CALLEE_SAVE(__native_vcpu_is_preempted), -#endif /* SMP */ -#endif };#ifdef CONFIG_PARAVIRT_XXL
arch/x86/xen/spinlock.c +5 -5
@@ -134,10 +134,10 @@ void __init xen_init_spinlocks(void)printk (KERN_DEBUG "xen: PV spinlocks enabled\n" );__pv_init_lock_hash (); - pv_ops.lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; - pv_ops.lock.queued_spin_unlock = + pv_ops_lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; + pv_ops_lock.queued_spin_unlock =PV_CALLEE_SAVE (__pv_queued_spin_unlock); - pv_ops.lock.wait = xen_qlock_wait; - pv_ops.lock.kick = xen_qlock_kick; - pv_ops.lock.vcpu_is_preempted =PV_CALLEE_SAVE (xen_vcpu_stolen); + pv_ops_lock.wait = xen_qlock_wait; + pv_ops_lock.kick = xen_qlock_kick; + pv_ops_lock.vcpu_is_preempted =PV_CALLEE_SAVE (xen_vcpu_stolen); }
tools/objtool/check.c +1 -0
@@ -527,6 +527,7 @@ static struct {int idx_off; } pv_ops_tables[] = { { .name = "pv_ops", }, + { .name = "pv_ops_lock", }, { .name = NULL, .idx_off = -1 } };
This series was applied to riscv/linux.git (fixes) by Borislav Petkov (AMD) <[email protected]>:
Hello:
This series was applied to riscv/linux.git (fixes) by Borislav Petkov (AMD) <[email protected]>:
Quoted 6 lines · On Mon, 5 Jan 2026 12:04:59 +0100 you wrote:
Some cleanups and reorg of paravirt code and headers:
- The first 2 patches should be not controversial at all, as they remove just some no longer needed #include and struct forward declarations.
Quoted 6 lines
- The 3rd patch is removing
CONFIG_PARAVIRT_DEBUG, which IMO has no real value, as it just changes a crash to aBUG()(the stack trace will basically be the same). As the maintainer of the main paravirt user (Xen) I have never seen this crash/BUG() to happen.[...]
Here is the summary with links:
- [v5,05/21] paravirt: Remove asm/paravirt_api_clock.h
https://git.kernel.org/riscv/c/68b10fd40d49 - [v5,06/21] sched: Move clock related paravirt code to kernel/sched https://git.kernel.org/riscv/c/e6b2aa6d4004 - [v5,10/21] riscv/paravirt: Use common code for paravirt_steal_clock() https://git.kernel.org/riscv/c/ee9ffcf99f07
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html