Skip to content

Commit 17ed14e

Browse files
sean-jcPeter Zijlstra
authored andcommitted
KVM: arm64: Drop perf.c and fold its tiny bits of code into arm.c
Call KVM's (un)register perf callbacks helpers directly from arm.c and delete perf.c No functional change intended. Signed-off-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/r/20211111020738.2512932-17-seanjc@google.com
1 parent be399d8 commit 17ed14e

File tree

4 files changed

+4
-28
lines changed

4 files changed

+4
-28
lines changed

arch/arm64/include/asm/kvm_host.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -675,9 +675,6 @@ unsigned long kvm_mmio_read_buf(const void *buf, unsigned int len);
675675
int kvm_handle_mmio_return(struct kvm_vcpu *vcpu);
676676
int io_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa);
677677

678-
void kvm_perf_init(void);
679-
void kvm_perf_teardown(void);
680-
681678
/*
682679
* Returns true if a Performance Monitoring Interrupt (PMI), a.k.a. perf event,
683680
* arrived in guest context. For arm64, any event that arrives while a vCPU is

arch/arm64/kvm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ obj-$(CONFIG_KVM) += hyp/
1212

1313
kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \
1414
$(KVM)/vfio.o $(KVM)/irqchip.o $(KVM)/binary_stats.o \
15-
arm.o mmu.o mmio.o psci.o perf.o hypercalls.o pvtime.o \
15+
arm.o mmu.o mmio.o psci.o hypercalls.o pvtime.o \
1616
inject_fault.o va_layout.o handle_exit.o \
1717
guest.o debug.o reset.o sys_regs.o \
1818
vgic-sys-reg-v3.o fpsimd.o pmu.o \

arch/arm64/kvm/arm.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1773,7 +1773,8 @@ static int init_subsystems(void)
17731773
if (err)
17741774
goto out;
17751775

1776-
kvm_perf_init();
1776+
kvm_register_perf_callbacks(NULL);
1777+
17771778
kvm_sys_reg_table_init();
17781779

17791780
out:
@@ -2161,7 +2162,7 @@ int kvm_arch_init(void *opaque)
21612162
/* NOP: Compiling as a module not supported */
21622163
void kvm_arch_exit(void)
21632164
{
2164-
kvm_perf_teardown();
2165+
kvm_unregister_perf_callbacks();
21652166
}
21662167

21672168
static int __init early_kvm_mode_cfg(char *arg)

arch/arm64/kvm/perf.c

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)