Commit b381e63b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/core' into perf/timer, before applying new changes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 4e6d7c2a ccd41c86

arch/arm/kernel/hw_breakpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) 
		 * Per-cpu breakpoints are not supported by our stepping

		 * mechanism.

		 */

		if (!bp->hw.bp_target)

		if (!bp->hw.target)

			return -EINVAL;



		/*

arch/arm64/kernel/hw_breakpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) 
	 * Disallow per-task kernel breakpoints since these would

	 * complicate the stepping code.

	 */

	if (info->ctrl.privilege == AARCH64_BREAKPOINT_EL1 && bp->hw.bp_target)

	if (info->ctrl.privilege == AARCH64_BREAKPOINT_EL1 && bp->hw.target)

		return -EINVAL;



	return 0;

arch/powerpc/perf/core-book3s.c

+9 −4
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static unsigned long ebb_switch_in(bool ebb, struct cpu_hw_events *cpuhw) 


static inline void power_pmu_bhrb_enable(struct perf_event *event) {}

static inline void power_pmu_bhrb_disable(struct perf_event *event) {}

static void power_pmu_flush_branch_stack(void) {}

static void power_pmu_sched_task(struct perf_event_context *ctx, bool sched_in) {}

static inline void power_pmu_bhrb_read(struct cpu_hw_events *cpuhw) {}

static void pmao_restore_workaround(bool ebb) { }

#endif /* CONFIG_PPC32 */
@@ -350,6 +350,7 @@ static void power_pmu_bhrb_enable(struct perf_event *event) 
		cpuhw->bhrb_context = event->ctx;

	}

	cpuhw->bhrb_users++;

	perf_sched_cb_inc(event->ctx->pmu);

}



static void power_pmu_bhrb_disable(struct perf_event *event)
@@ -361,6 +362,7 @@ static void power_pmu_bhrb_disable(struct perf_event *event) 


	cpuhw->bhrb_users--;

	WARN_ON_ONCE(cpuhw->bhrb_users < 0);

	perf_sched_cb_dec(event->ctx->pmu);



	if (!cpuhw->disabled && !cpuhw->bhrb_users) {

		/* BHRB cannot be turned off when other
@@ -375,9 +377,12 @@ static void power_pmu_bhrb_disable(struct perf_event *event) 
/* Called from ctxsw to prevent one process's branch entries to

 * mingle with the other process's entries during context switch.

 */

static void power_pmu_flush_branch_stack(void)

static void power_pmu_sched_task(struct perf_event_context *ctx, bool sched_in)

{

	if (ppmu->bhrb_nr)

	if (!ppmu->bhrb_nr)

		return;



	if (sched_in)

		power_pmu_bhrb_reset();

}

/* Calculate the to address for a branch */
@@ -1901,7 +1906,7 @@ static struct pmu power_pmu = { 
	.cancel_txn	= power_pmu_cancel_txn,

	.commit_txn	= power_pmu_commit_txn,

	.event_idx	= power_pmu_event_idx,

	.flush_branch_stack = power_pmu_flush_branch_stack,

	.sched_task	= power_pmu_sched_task,

};



/*

arch/x86/include/asm/cpufeature.h

+8 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <asm/disabled-features.h>

#endif



#define NCAPINTS	11	/* N 32-bit words worth of info */

#define NCAPINTS	13	/* N 32-bit words worth of info */

#define NBUGINTS	1	/* N 32-bit bug flags */



/*
@@ -226,6 +226,7 @@ 
#define X86_FEATURE_ERMS	( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */

#define X86_FEATURE_INVPCID	( 9*32+10) /* Invalidate Processor Context ID */

#define X86_FEATURE_RTM		( 9*32+11) /* Restricted Transactional Memory */

#define X86_FEATURE_CQM		( 9*32+12) /* Cache QoS Monitoring */

#define X86_FEATURE_MPX		( 9*32+14) /* Memory Protection Extension */

#define X86_FEATURE_AVX512F	( 9*32+16) /* AVX-512 Foundation */

#define X86_FEATURE_RDSEED	( 9*32+18) /* The RDSEED instruction */
@@ -242,6 +243,12 @@ 
#define X86_FEATURE_XGETBV1	(10*32+ 2) /* XGETBV with ECX = 1 */

#define X86_FEATURE_XSAVES	(10*32+ 3) /* XSAVES/XRSTORS */



/* Intel-defined CPU QoS Sub-leaf, CPUID level 0x0000000F:0 (edx), word 11 */

#define X86_FEATURE_CQM_LLC	(11*32+ 1) /* LLC QoS if 1 */



/* Intel-defined CPU QoS Sub-leaf, CPUID level 0x0000000F:1 (edx), word 12 */

#define X86_FEATURE_CQM_OCCUP_LLC (12*32+ 0) /* LLC occupancy monitoring if 1 */



/*

 * BUG word(s)

 */

arch/x86/include/asm/processor.h

+3 −0
Original line number Diff line number Diff line
@@ -109,6 +109,9 @@ struct cpuinfo_x86 { 
	/* in KB - valid for CPUS which support this call: */

	int			x86_cache_size;

	int			x86_cache_alignment;	/* In bytes */

	/* Cache QoS architectural values: */

	int			x86_cache_max_rmid;	/* max index */

	int			x86_cache_occ_scale;	/* scale to bytes */

	int			x86_power;

	unsigned long		loops_per_jiffy;

	/* cpuid returned max cores value: */