Commit 2d5438f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-urgent-2023-05-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Thomas Gleixner:
 "A small set of perf fixes:

   - Make the MSR-readout based CHA discovery work around broken
     discovery tables in some SPR firmwares.

   - Prevent saving PEBS configuration which has software bits set that
     cause a crash when restored into the relevant MSR"

* tag 'perf-urgent-2023-05-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/uncore: Correct the number of CHAs on SPR
  perf/x86/intel: Save/restore cpuc->active_pebs_data_cfg when using guest PEBS
parents abbf7fa1 38776cc4

arch/x86/events/intel/core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4074,7 +4074,7 @@ static struct perf_guest_switch_msr *intel_guest_get_msrs(int *nr, void *data) 
	if (x86_pmu.intel_cap.pebs_baseline) {

	if (x86_pmu.intel_cap.pebs_baseline) {

		arr[(*nr)++] = (struct perf_guest_switch_msr){

		arr[(*nr)++] = (struct perf_guest_switch_msr){

			.msr = MSR_PEBS_DATA_CFG,

			.msr = MSR_PEBS_DATA_CFG,

			.host = cpuc->pebs_data_cfg,

			.host = cpuc->active_pebs_data_cfg,

			.guest = kvm_pmu->pebs_data_cfg,

			.guest = kvm_pmu->pebs_data_cfg,

		};

		};

	}

	}

arch/x86/events/intel/uncore_snbep.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -6150,6 +6150,7 @@ static struct intel_uncore_type spr_uncore_mdf = { 
};

};





#define UNCORE_SPR_NUM_UNCORE_TYPES		12

#define UNCORE_SPR_NUM_UNCORE_TYPES		12

#define UNCORE_SPR_CHA				0

#define UNCORE_SPR_IIO				1

#define UNCORE_SPR_IIO				1

#define UNCORE_SPR_IMC				6

#define UNCORE_SPR_IMC				6

#define UNCORE_SPR_UPI				8

#define UNCORE_SPR_UPI				8
@@ -6460,12 +6461,22 @@ static int uncore_type_max_boxes(struct intel_uncore_type **types, 
	return max + 1;

	return max + 1;

}

}





#define SPR_MSR_UNC_CBO_CONFIG		0x2FFE



void spr_uncore_cpu_init(void)

void spr_uncore_cpu_init(void)

{

{

	struct intel_uncore_type *type;

	u64 num_cbo;



	uncore_msr_uncores = uncore_get_uncores(UNCORE_ACCESS_MSR,

	uncore_msr_uncores = uncore_get_uncores(UNCORE_ACCESS_MSR,

						UNCORE_SPR_MSR_EXTRA_UNCORES,

						UNCORE_SPR_MSR_EXTRA_UNCORES,

						spr_msr_uncores);

						spr_msr_uncores);





	type = uncore_find_type_by_id(uncore_msr_uncores, UNCORE_SPR_CHA);

	if (type) {

		rdmsrl(SPR_MSR_UNC_CBO_CONFIG, num_cbo);

		type->num_boxes = num_cbo;

	}

	spr_uncore_iio_free_running.num_boxes = uncore_type_max_boxes(uncore_msr_uncores, UNCORE_SPR_IIO);

	spr_uncore_iio_free_running.num_boxes = uncore_type_max_boxes(uncore_msr_uncores, UNCORE_SPR_IIO);

}

}