perf/x86/intel/uncore: Wrap the max dies calculation into an accessor (36b533bc) · Commits · 戴 / test

arch/x86/events/intel/uncore.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ struct pci_driver *uncore_pci_driver;
		DEFINE_RAW_SPINLOCK(pci2phy_map_lock);
		struct list_head pci2phy_map_head = LIST_HEAD_INIT(pci2phy_map_head);
		struct pci_extra_dev *uncore_extra_pci_dev;
		static int max_dies;
		int __uncore_max_dies;

		/* mask of cpus that collect uncore events */
		static cpumask_t uncore_cpu_mask;
		@@ -108,7 +108,7 @@ struct intel_uncore_box uncore_pmu_to_box(struct intel_uncore_pmu pmu, int cpu
		* The unsigned check also catches the '-1' return value for non
		* existent mappings in the topology map.
		*/
		return dieid < max_dies ? pmu->boxes[dieid] : NULL;
		return dieid < uncore_max_dies() ? pmu->boxes[dieid] : NULL;
		}

		u64 uncore_msr_read_counter(struct intel_uncore_box box, struct perf_event event)
		@@ -882,7 +882,7 @@ static void uncore_free_boxes(struct intel_uncore_pmu *pmu)
		{
		int die;

		for (die = 0; die < max_dies; die++)
		for (die = 0; die < uncore_max_dies(); die++)
		kfree(pmu->boxes[die]);
		kfree(pmu->boxes);
		}
		@@ -923,7 +923,7 @@ static int __init uncore_type_init(struct intel_uncore_type *type, bool setid)
		if (!pmus)
		return -ENOMEM;

		size = max_dies * sizeof(struct intel_uncore_box *);
		size = uncore_max_dies() * sizeof(struct intel_uncore_box *);

		for (i = 0; i < type->num_boxes; i++) {
		pmus[i].func_id = setid ? i : -1;
		@@ -1123,7 +1123,7 @@ static int __init uncore_pci_init(void)
		size_t size;
		int ret;

		size = max_dies * sizeof(struct pci_extra_dev);
		size = uncore_max_dies() * sizeof(struct pci_extra_dev);
		uncore_extra_pci_dev = kzalloc(size, GFP_KERNEL);
		if (!uncore_extra_pci_dev) {
		ret = -ENOMEM;
		@@ -1552,7 +1552,8 @@ static int __init intel_uncore_init(void)
		if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
		return -ENODEV;

		max_dies = topology_max_packages() * topology_max_die_per_package();
		__uncore_max_dies =
		topology_max_packages() * topology_max_die_per_package();

		uncore_init = (struct intel_uncore_init_fun *)id->driver_data;
		if (uncore_init->pci_init) {

arch/x86/events/intel/uncore.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -182,6 +182,9 @@ int uncore_pcibus_to_physid(struct pci_bus *bus);
		ssize_t uncore_event_show(struct kobject *kobj,
		struct kobj_attribute attr, char buf);

		extern int __uncore_max_dies;
		#define uncore_max_dies() (__uncore_max_dies)

		#define INTEL_UNCORE_EVENT_DESC(_name, _config) \
		{ \
		.attr = __ATTR(_name, 0444, uncore_event_show, NULL), \

Admin message