Commit 9a8aae60 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch 'kvm-arm64/kill_oprofile_dependency' into kvmarm-master/next 



Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 4085ae80 7f318847

arch/arm64/kvm/perf.c

+1 −7
Original line number Diff line number Diff line
@@ -50,13 +50,7 @@ static struct perf_guest_info_callbacks kvm_guest_cbs = { 


int kvm_perf_init(void)

{

	/*

	 * Check if HW_PERF_EVENTS are supported by checking the number of

	 * hardware performance counters. This could ensure the presence of

	 * a physical PMU and CONFIG_PERF_EVENT is selected.

	 */

	if (IS_ENABLED(CONFIG_ARM_PMU) && perf_num_counters() > 0

				       && !is_protected_kvm_enabled())

	if (kvm_pmu_probe_pmuver() != 0xf && !is_protected_kvm_enabled())

		static_branch_enable(&kvm_arm_pmu_available);



	return perf_register_guest_info_callbacks(&kvm_guest_cbs);

arch/arm64/kvm/pmu-emul.c

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ void kvm_pmu_set_counter_event_type(struct kvm_vcpu *vcpu, u64 data, 
	kvm_pmu_create_perf_event(vcpu, select_idx);

}



static int kvm_pmu_probe_pmuver(void)

int kvm_pmu_probe_pmuver(void)

{

	struct perf_event_attr attr = { };

	struct perf_event *event;

arch/s390/kernel/perf_event.c

+0 −21
Original line number Diff line number Diff line
@@ -23,27 +23,6 @@ 
#include <asm/sysinfo.h>

#include <asm/unwind.h>



const char *perf_pmu_name(void)

{

	if (cpum_cf_avail() || cpum_sf_avail())

		return "CPU-Measurement Facilities (CPU-MF)";

	return "pmu";

}

EXPORT_SYMBOL(perf_pmu_name);



int perf_num_counters(void)

{

	int num = 0;



	if (cpum_cf_avail())

		num += PERF_CPUM_CF_MAX_CTR;

	if (cpum_sf_avail())

		num += PERF_CPUM_SF_MAX_CTR;



	return num;

}

EXPORT_SYMBOL(perf_num_counters);



static struct kvm_s390_sie_block *sie_block(struct pt_regs *regs)

{

	struct stack_frame *stack = (struct stack_frame *) regs->gprs[15];

arch/sh/kernel/perf_event.c

+0 −18
Original line number Diff line number Diff line
@@ -57,24 +57,6 @@ static inline int sh_pmu_initialized(void) 
	return !!sh_pmu;

}



const char *perf_pmu_name(void)

{

	if (!sh_pmu)

		return NULL;



	return sh_pmu->name;

}

EXPORT_SYMBOL_GPL(perf_pmu_name);



int perf_num_counters(void)

{

	if (!sh_pmu)

		return 0;



	return sh_pmu->num_events;

}

EXPORT_SYMBOL_GPL(perf_num_counters);



/*

 * Release the PMU if this is the last perf_event.

 */

drivers/perf/arm_pmu.c

+0 −30
Original line number Diff line number Diff line
@@ -581,33 +581,6 @@ static const struct attribute_group armpmu_common_attr_group = { 
	.attrs = armpmu_common_attrs,

};



/* Set at runtime when we know what CPU type we are. */

static struct arm_pmu *__oprofile_cpu_pmu;



/*

 * Despite the names, these two functions are CPU-specific and are used

 * by the OProfile/perf code.

 */

const char *perf_pmu_name(void)

{

	if (!__oprofile_cpu_pmu)

		return NULL;



	return __oprofile_cpu_pmu->name;

}

EXPORT_SYMBOL_GPL(perf_pmu_name);



int perf_num_counters(void)

{

	int max_events = 0;



	if (__oprofile_cpu_pmu != NULL)

		max_events = __oprofile_cpu_pmu->num_events;



	return max_events;

}

EXPORT_SYMBOL_GPL(perf_num_counters);



static int armpmu_count_irq_users(const int irq)

{

	int cpu, count = 0;
@@ -979,9 +952,6 @@ int armpmu_register(struct arm_pmu *pmu) 
	if (ret)

		goto out_destroy;



	if (!__oprofile_cpu_pmu)

		__oprofile_cpu_pmu = pmu;



	pr_info("enabled with %s PMU driver, %d counters available%s\n",

		pmu->name, pmu->num_events,

		has_nmi ? ", using NMIs" : "");