Commit 5afa4cf5 authored by Xin Li (Intel)'s avatar Xin Li (Intel) Committed by Ingo Molnar
Browse files

x86/xen/msr: Return u64 consistently in Xen PMC xen_*_read functions 



The pv_ops PMC read API is defined as:

        u64 (*read_pmc)(int counter);

But Xen PMC read functions return 'unsigned long long', make them
return u64 consistently.

Signed-off-by: default avatarXin Li (Intel) <xin@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Uros Bizjak <ubizjak@gmail.com>
Link: https://lore.kernel.org/r/20250427092027.1598740-7-xin@zytor.com
parent 795ada52

arch/x86/xen/pmu.c

+3 −3
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ bool pmu_msr_write(unsigned int msr, uint32_t low, uint32_t high, int *err) 
	return true;

}



static unsigned long long xen_amd_read_pmc(int counter)

static u64 xen_amd_read_pmc(int counter)

{

	struct xen_pmu_amd_ctxt *ctxt;

	uint64_t *counter_regs;
@@ -367,7 +367,7 @@ static unsigned long long xen_amd_read_pmc(int counter) 
	return counter_regs[counter];

}



static unsigned long long xen_intel_read_pmc(int counter)

static u64 xen_intel_read_pmc(int counter)

{

	struct xen_pmu_intel_ctxt *ctxt;

	uint64_t *fixed_counters;
@@ -397,7 +397,7 @@ static unsigned long long xen_intel_read_pmc(int counter) 
	return arch_cntr_pair[counter].counter;

}



unsigned long long xen_read_pmc(int counter)

u64 xen_read_pmc(int counter)

{

	if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)

		return xen_amd_read_pmc(counter);

arch/x86/xen/xen-ops.h

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static inline void xen_pmu_finish(int cpu) {} 
bool pmu_msr_read(unsigned int msr, uint64_t *val, int *err);

bool pmu_msr_write(unsigned int msr, uint32_t low, uint32_t high, int *err);

int pmu_apic_update(uint32_t reg);

unsigned long long xen_read_pmc(int counter);

u64 xen_read_pmc(int counter);



#ifdef CONFIG_SMP