Commit a2f0e7ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-core-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf updates from Ingo Molnar:

 - Optimize perf_sample_data layout

 - Prepare sample data handling for BPF integration

 - Update the x86 PMU driver for Intel Meteor Lake

 - Restructure the x86 uncore code to fix a SPR (Sapphire Rapids)
   discovery breakage

 - Fix the x86 Zhaoxin PMU driver

 - Cleanups

* tag 'perf-core-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
  perf/x86/intel/uncore: Add Meteor Lake support
  x86/perf/zhaoxin: Add stepping check for ZXC
  perf/x86/intel/ds: Fix the conversion from TSC to perf time
  perf/x86/uncore: Don't WARN_ON_ONCE() for a broken discovery table
  perf/x86/uncore: Add a quirk for UPI on SPR
  perf/x86/uncore: Ignore broken units in discovery table
  perf/x86/uncore: Fix potential NULL pointer in uncore_get_alias_name
  perf/x86/uncore: Factor out uncore_device_to_die()
  perf/core: Call perf_prepare_sample() before running BPF
  perf/core: Introduce perf_prepare_header()
  perf/core: Do not pass header for sample ID init
  perf/core: Set data->sample_flags in perf_prepare_sample()
  perf/core: Add perf_sample_save_brstack() helper
  perf/core: Add perf_sample_save_raw_data() helper
  perf/core: Add perf_sample_save_callchain() helper
  perf/core: Save the dynamic parts of sample data size
  x86/kprobes: Use switch-case for 0xFF opcodes in prepare_emulation
  perf/core: Change the layout of perf_sample_data
  perf/x86/msr: Add Meteor Lake support
  perf/x86/cstate: Add Meteor Lake support
  ...
parents 6e649d08 c828441f

arch/powerpc/perf/core-book3s.c

+1 −2
Original line number Diff line number Diff line
@@ -2313,8 +2313,7 @@ static void record_and_restart(struct perf_event *event, unsigned long val, 
			struct cpu_hw_events *cpuhw;

			cpuhw = this_cpu_ptr(&cpu_hw_events);

			power_pmu_bhrb_read(event, cpuhw);

			data.br_stack = &cpuhw->bhrb_stack;

			data.sample_flags |= PERF_SAMPLE_BRANCH_STACK;

			perf_sample_save_brstack(&data, event, &cpuhw->bhrb_stack);

		}



		if (event->attr.sample_type & PERF_SAMPLE_DATA_SRC &&

arch/s390/kernel/perf_cpum_cf.c

+1 −3
Original line number Diff line number Diff line
@@ -662,9 +662,7 @@ static int cfdiag_push_sample(struct perf_event *event, 
	if (event->attr.sample_type & PERF_SAMPLE_RAW) {

		raw.frag.size = cpuhw->usedss;

		raw.frag.data = cpuhw->stop;

		raw.size = raw.frag.size;

		data.raw = &raw;

		data.sample_flags |= PERF_SAMPLE_RAW;

		perf_sample_save_raw_data(&data, &raw);

	}



	overflow = perf_event_overflow(event, &data, &regs);

arch/s390/kernel/perf_cpum_sf.c

+2 −1
Original line number Diff line number Diff line
@@ -672,7 +672,8 @@ static void cpumsf_output_event_pid(struct perf_event *event, 
	/* Protect callchain buffers, tasks */

	rcu_read_lock();



	perf_prepare_sample(&header, data, event, regs);

	perf_prepare_sample(data, event, regs);

	perf_prepare_header(&header, data, event, regs);

	if (perf_output_begin(&handle, data, event, header.size))

		goto out;

arch/s390/kernel/perf_pai_crypto.c

+1 −3
Original line number Diff line number Diff line
@@ -362,9 +362,7 @@ static int paicrypt_push_sample(void) 
	if (event->attr.sample_type & PERF_SAMPLE_RAW) {

		raw.frag.size = rawsize;

		raw.frag.data = cpump->save;

		raw.size = raw.frag.size;

		data.raw = &raw;

		data.sample_flags |= PERF_SAMPLE_RAW;

		perf_sample_save_raw_data(&data, &raw);

	}



	overflow = perf_event_overflow(event, &data, &regs);

arch/s390/kernel/perf_pai_ext.c

+1 −3
Original line number Diff line number Diff line
@@ -451,9 +451,7 @@ static int paiext_push_sample(void) 
	if (event->attr.sample_type & PERF_SAMPLE_RAW) {

		raw.frag.size = rawsize;

		raw.frag.data = cpump->save;

		raw.size = raw.frag.size;

		data.raw = &raw;

		data.sample_flags |= PERF_SAMPLE_RAW;

		perf_sample_save_raw_data(&data, &raw);

	}



	overflow = perf_event_overflow(event, &data, &regs);