perf/x86/intel: Fix RAPL and UNCORE hotplug issues
Subsystems (3)
cover perf/x86/intel: Fix RAPL and UNCORE hotplug issues
Yasuaki reported a RAPL failure vs. CPU hotplug. This is caused by the recent rework of the package mapping code. The same issue along with other fallouts from the hotplug conversion is present in the UNCORE code.
The following series addresses those problems.
Thanks,
tglx
--- arch/x86/events/intel/rapl.c | 60 ++++------ arch/x86/events/intel/uncore.c | 232 ++++++++++++++++------------------------- include/linux/cpuhotplug.h | 3 3 files changed, 117 insertions(+), 178 deletions(-)
PATCH 1/3 perf/x86/intel/rapl: Make package handling more robust
The package management code in RAPL relies on package mapping being available before a CPU is started. This changed with commit 9d85eb9119f4 because the ACPI/BIOS information turned out to be unreliable, but that left RAPL in broken state. This was not noticed because on a regular boot all CPUs are online before RAPL is initialized.
A possible fix would be to reintroduce the mess which allocates a package data structure in CPU prepare and when it turns out to already exist in starting throw it away later in the CPU online callback. But that's a horrible hack and not required at all because RAPL becomes functional for perf only in the CPU online callback. That's correct because user space is not yet informed about the CPU being onlined, so nothing caan rely on RAPL being available on that particular CPU.
Move the allocation to the CPU online callback and simplify the hotplug handling. At this point the package mapping is established and correct.
This also adds a missing check for available package data in the event_init() function.
--- arch/x86/events/intel/rapl.c | 60 ++++++++++++++++++------------------------- include/linux/cpuhotplug.h | 1 2 files changed, 26 insertions(+), 35 deletions(-)
arch/x86/events/intel/rapl.c +26 -34
@@ -161,7 +161,13 @@ static u64 rapl_timer_ms;static inline struct rapl_pmu *cpu_to_rapl_pmu (unsigned int cpu) { -return rapl_pmus->pmus[topology_logical_package_id (cpu)]; +unsigned int pkgid =topology_logical_package_id (cpu); + +/* +* The unsigned check also catches the '-1' return value for non +* existent mappings in the topology map. +*/ +return pkgid < rapl_pmus->maxpkg ? rapl_pmus->pmus[pkgid] :NULL ; }static inline u64 rapl_read_counter (struct perf_event *event)
@@ -402,6 +408,8 @@ static int rapl_pmu_event_init(struct pe/* must be done before validate_group */ pmu =cpu_to_rapl_pmu (event->cpu); +if (!pmu) +return -EINVAL ; event->cpu = pmu->cpu; event->pmu_private = pmu; event->hw.event_base = msr;
@@ -585,6 +593,20 @@ static int rapl_cpu_online(unsigned intstruct rapl_pmu *pmu =cpu_to_rapl_pmu (cpu);int target; +if (!pmu) { + pmu =kzalloc_node (sizeof (*pmu),GFP_KERNEL ,cpu_to_node (cpu)); +if (!pmu) +return -ENOMEM ; + +raw_spin_lock_init (&pmu->lock); +INIT_LIST_HEAD (&pmu->active_list); + pmu->pmu = &rapl_pmus->pmu; + pmu->timer_interval =ms_to_ktime (rapl_timer_ms); +rapl_hrtimer_init (pmu); + + rapl_pmus->pmus[topology_logical_package_id (cpu)] = pmu; + } +/* * Check if there is an online cpu in the package which collects rapl * events already.
@@ -598,27 +620,6 @@ static int rapl_cpu_online(unsigned intreturn 0 ; } -static int rapl_cpu_prepare (unsigned int cpu) -{ -struct rapl_pmu *pmu =cpu_to_rapl_pmu (cpu); - -if (pmu) -return 0 ; - - pmu =kzalloc_node (sizeof (*pmu),GFP_KERNEL ,cpu_to_node (cpu)); -if (!pmu) -return -ENOMEM ; - -raw_spin_lock_init (&pmu->lock); -INIT_LIST_HEAD (&pmu->active_list); - pmu->pmu = &rapl_pmus->pmu; - pmu->timer_interval =ms_to_ktime (rapl_timer_ms); - pmu->cpu =-1 ; -rapl_hrtimer_init (pmu); - rapl_pmus->pmus[topology_logical_package_id (cpu)] = pmu; -return 0 ; -} -static int rapl_check_hw_unit (bool apply_quirk) {u64 msr_rapl_power_unit_bits;
@@ -803,29 +804,21 @@ static int __init rapl_pmu_init(void)/* * Install callbacks. Core will call them for each online cpu. */ - - ret =cpuhp_setup_state (CPUHP_PERF_X86_RAPL_PREP ,"perf/x86/rapl:prepare" , - rapl_cpu_prepare,NULL ); -if (ret) - goto out; - ret =cpuhp_setup_state (CPUHP_AP_PERF_X86_RAPL_ONLINE ,"perf/x86/rapl:online" , rapl_cpu_online, rapl_cpu_offline);if (ret) - goto out1; + goto out; ret =perf_pmu_register (&rapl_pmus->pmu,"power" ,-1 );if (ret) - goto out2; + goto out1;rapl_advertise ();return 0 ; -out2: -cpuhp_remove_state (CPUHP_AP_PERF_X86_RAPL_ONLINE ); out1: -cpuhp_remove_state (CPUHP_PERF_X86_RAPL_PREP ); +cpuhp_remove_state (CPUHP_AP_PERF_X86_RAPL_ONLINE ); out:pr_warn ("Initialization failed (%d), disabled\n" , ret);cleanup_rapl_pmus ();
@@ -836,7 +829,6 @@ module_init(rapl_pmu_init); static void __exit intel_rapl_exit(void) {cpuhp_remove_state_nocalls (CPUHP_AP_PERF_X86_RAPL_ONLINE ); -cpuhp_remove_state_nocalls (CPUHP_PERF_X86_RAPL_PREP );perf_pmu_unregister (&rapl_pmus->pmu);cleanup_rapl_pmus (); }
include/linux/cpuhotplug.h +0 -1
@@ -10,7 +10,6 @@ enum cpuhp_state {CPUHP_PERF_X86_PREPARE ,CPUHP_PERF_X86_UNCORE_PREP ,CPUHP_PERF_X86_AMD_UNCORE_PREP , -CPUHP_PERF_X86_RAPL_PREP ,CPUHP_PERF_BFIN ,CPUHP_PERF_POWER , CPUHP_PERF_SUPERH,
tip-bot for Thomas Gleixner
merge bot[tip:perf/urgent] perf/x86/intel/rapl: Make package handling more robust
perf/x86/intel/rapl: Make package handling more robust
Commit-ID: dd86e373e09fb16b83e8adf5c48c421a4ca76468 Gitweb: http://git.kernel.org/tip/dd86e373e09fb16b83e8adf5c48c421a4ca76468 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 31 Jan 2017 23:58:38 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 1 Feb 2017 08:37:27 +0100
perf/x86/intel/rapl: Make package handling more robust
The package management code in RAPL relies on package mapping being available before a CPU is started. This changed with:
9d85eb9119f4 ("x86/smpboot: Make logical package management more robust")
because the ACPI/BIOS information turned out to be unreliable, but that left RAPL in broken state. This was not noticed because on a regular boot all CPUs are online before RAPL is initialized.
A possible fix would be to reintroduce the mess which allocates a package data structure in CPU prepare and when it turns out to already exist in starting throw it away later in the CPU online callback. But that's a horrible hack and not required at all because RAPL becomes functional for perf only in the CPU online callback. That's correct because user space is not yet informed about the CPU being onlined, so nothing caan rely on RAPL being available on that particular CPU.
Move the allocation to the CPU online callback and simplify the hotplug handling. At this point the package mapping is established and correct.
This also adds a missing check for available package data in the event_init() function.
--- arch/x86/events/intel/rapl.c | 60 +++++++++++++++++++------------------------- include/linux/cpuhotplug.h | 1 - 2 files changed, 26 insertions(+), 35 deletions(-)
arch/x86/events/intel/rapl.c +26 -34
@@ -161,7 +161,13 @@ static u64 rapl_timer_ms;static inline struct rapl_pmu *cpu_to_rapl_pmu (unsigned int cpu) { -return rapl_pmus->pmus[topology_logical_package_id (cpu)]; +unsigned int pkgid =topology_logical_package_id (cpu); + +/* +* The unsigned check also catches the '-1' return value for non +* existent mappings in the topology map. +*/ +return pkgid < rapl_pmus->maxpkg ? rapl_pmus->pmus[pkgid] :NULL ; }static inline u64 rapl_read_counter (struct perf_event *event)
@@ -402,6 +408,8 @@ static int rapl_pmu_event_init(struct perf_event *event)/* must be done before validate_group */ pmu =cpu_to_rapl_pmu (event->cpu); +if (!pmu) +return -EINVAL ; event->cpu = pmu->cpu; event->pmu_private = pmu; event->hw.event_base = msr;
@@ -585,6 +593,20 @@ static int rapl_cpu_online(unsigned int cpu)struct rapl_pmu *pmu =cpu_to_rapl_pmu (cpu);int target; +if (!pmu) { + pmu =kzalloc_node (sizeof (*pmu),GFP_KERNEL ,cpu_to_node (cpu)); +if (!pmu) +return -ENOMEM ; + +raw_spin_lock_init (&pmu->lock); +INIT_LIST_HEAD (&pmu->active_list); + pmu->pmu = &rapl_pmus->pmu; + pmu->timer_interval =ms_to_ktime (rapl_timer_ms); +rapl_hrtimer_init (pmu); + + rapl_pmus->pmus[topology_logical_package_id (cpu)] = pmu; + } +/* * Check if there is an online cpu in the package which collects rapl * events already.
@@ -598,27 +620,6 @@ static int rapl_cpu_online(unsigned int cpu)return 0 ; } -static int rapl_cpu_prepare (unsigned int cpu) -{ -struct rapl_pmu *pmu =cpu_to_rapl_pmu (cpu); - -if (pmu) -return 0 ; - - pmu =kzalloc_node (sizeof (*pmu),GFP_KERNEL ,cpu_to_node (cpu)); -if (!pmu) -return -ENOMEM ; - -raw_spin_lock_init (&pmu->lock); -INIT_LIST_HEAD (&pmu->active_list); - pmu->pmu = &rapl_pmus->pmu; - pmu->timer_interval =ms_to_ktime (rapl_timer_ms); - pmu->cpu =-1 ; -rapl_hrtimer_init (pmu); - rapl_pmus->pmus[topology_logical_package_id (cpu)] = pmu; -return 0 ; -} -static int rapl_check_hw_unit (bool apply_quirk) {u64 msr_rapl_power_unit_bits;
@@ -803,29 +804,21 @@ static int __init rapl_pmu_init(void)/* * Install callbacks. Core will call them for each online cpu. */ - - ret =cpuhp_setup_state (CPUHP_PERF_X86_RAPL_PREP ,"perf/x86/rapl:prepare" , - rapl_cpu_prepare,NULL ); -if (ret) - goto out; - ret =cpuhp_setup_state (CPUHP_AP_PERF_X86_RAPL_ONLINE ,"perf/x86/rapl:online" , rapl_cpu_online, rapl_cpu_offline);if (ret) - goto out1; + goto out; ret =perf_pmu_register (&rapl_pmus->pmu,"power" ,-1 );if (ret) - goto out2; + goto out1;rapl_advertise ();return 0 ; -out2: -cpuhp_remove_state (CPUHP_AP_PERF_X86_RAPL_ONLINE ); out1: -cpuhp_remove_state (CPUHP_PERF_X86_RAPL_PREP ); +cpuhp_remove_state (CPUHP_AP_PERF_X86_RAPL_ONLINE ); out:pr_warn ("Initialization failed (%d), disabled\n" , ret);cleanup_rapl_pmus ();
@@ -836,7 +829,6 @@ module_init(rapl_pmu_init); static void __exit intel_rapl_exit(void) {cpuhp_remove_state_nocalls (CPUHP_AP_PERF_X86_RAPL_ONLINE ); -cpuhp_remove_state_nocalls (CPUHP_PERF_X86_RAPL_PREP );perf_pmu_unregister (&rapl_pmus->pmu);cleanup_rapl_pmus (); }
include/linux/cpuhotplug.h +0 -1
@@ -10,7 +10,6 @@ enum cpuhp_state {CPUHP_PERF_X86_PREPARE ,CPUHP_PERF_X86_UNCORE_PREP ,CPUHP_PERF_X86_AMD_UNCORE_PREP , -CPUHP_PERF_X86_RAPL_PREP ,CPUHP_PERF_BFIN ,CPUHP_PERF_POWER , CPUHP_PERF_SUPERH,
PATCH 2/3 perf/x86/intel/uncore: Cleanup hotplug conversion fallout
In reply to Thomas GleixnerThe recent conversion to the hotplug state machine kept two mechanisms from the original code:
1) The first_init logic which adds the number of online CPUs in a package to the refcount. That's wrong because the callbacks are executed for all online CPUs.
Remove it so the refcounting is correct.
2) The on_each_cpu() call to undo box->init() in the error handling path. That's bogus because when the prepare callback fails no box has been initialized yet.
Remove it.
--- arch/x86/events/intel/uncore.c | 44 +++-------------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-)
arch/x86/events/intel/uncore.c +4 -40
@@ -764,30 +764,6 @@ static void uncore_pmu_unregister(struct pmu->registered = false; } -static void __uncore_exit_boxes (struct intel_uncore_type *type,int cpu) -{ -struct intel_uncore_pmu *pmu = type->pmus; -struct intel_uncore_box *box; -int i, pkg; - -if (pmu) { - pkg =topology_physical_package_id (cpu); -for (i =0 ; i < type->num_boxes; i++, pmu++) { - box = pmu->boxes[pkg]; -if (box) -uncore_box_exit (box); - } - } -} - -static void uncore_exit_boxes (void *dummy) -{ -struct intel_uncore_type **types; - -for (types = uncore_msr_uncores; *types; types++) -__uncore_exit_boxes (*types++,smp_processor_id ()); -} -static void uncore_free_boxes (struct intel_uncore_pmu *pmu) {int pkg;
@@ -1078,22 +1054,12 @@ static int uncore_cpu_dying(unsigned intreturn 0 ; } -static int first_init; -static int uncore_cpu_starting (unsigned int cpu) {struct intel_uncore_type *type, **types = uncore_msr_uncores;struct intel_uncore_pmu *pmu;struct intel_uncore_box *box; -int i, pkg, ncpus =1 ; - -if (first_init) { -/* -* On init we get the number of online cpus in the package -* and set refcount for all of them. -*/ - ncpus =cpumask_weight (topology_core_cpumask (cpu)); - } +int i, pkg; pkg =topology_logical_package_id (cpu);for (; *types; types++) {
@@ -1104,7 +1070,7 @@ static int uncore_cpu_starting(unsignedif (!box)continue ;/* The first cpu on a package activates the box */ -if (atomic_add_return (ncpus, &box->refcnt) == ncpus) +if (atomic_inc_return (&box->refcnt) ==1 )uncore_box_init (box); } }
@@ -1408,19 +1374,17 @@ static int __init intel_uncore_init(void"perf/x86/intel/uncore:prepare" , uncore_cpu_prepare, NULL); } - first_init =1 ; +cpuhp_setup_state (CPUHP_AP_PERF_X86_UNCORE_STARTING ,"perf/x86/uncore:starting" , uncore_cpu_starting, uncore_cpu_dying); - first_init =0 ; +cpuhp_setup_state (CPUHP_AP_PERF_X86_UNCORE_ONLINE ,"perf/x86/uncore:online" , uncore_event_cpu_online, uncore_event_cpu_offline);return 0 ; err: -/* Undo box->init_box() */ -on_each_cpu_mask (&uncore_cpu_mask, uncore_exit_boxes,NULL ,1 );uncore_types_exit (uncore_msr_uncores);uncore_pci_exit ();return ret;
tip-bot for Thomas Gleixner
merge bot[tip:perf/urgent] perf/x86/intel/uncore: Clean up hotplug conversion fallout
perf/x86/intel/uncore: Clean up hotplug conversion fallout
Commit-ID: 1aa6cfd33df492939b0be15ebdbcff1f8ae5ddb6 Gitweb: http://git.kernel.org/tip/1aa6cfd33df492939b0be15ebdbcff1f8ae5ddb6 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 31 Jan 2017 23:58:39 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 1 Feb 2017 08:37:27 +0100
perf/x86/intel/uncore: Clean up hotplug conversion fallout
The recent conversion to the hotplug state machine kept two mechanisms from the original code:
1) The first_init logic which adds the number of online CPUs in a package to the refcount. That's wrong because the callbacks are executed for all online CPUs.
Remove it so the refcounting is correct.
2) The on_each_cpu() call to undo box->init() in the error handling path. That's bogus because when the prepare callback fails no box has been initialized yet.
Remove it.
--- arch/x86/events/intel/uncore.c | 44 ++++-------------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-)
arch/x86/events/intel/uncore.c +4 -40
@@ -764,30 +764,6 @@ static void uncore_pmu_unregister(struct intel_uncore_pmu *pmu) pmu->registered = false; } -static void __uncore_exit_boxes (struct intel_uncore_type *type,int cpu) -{ -struct intel_uncore_pmu *pmu = type->pmus; -struct intel_uncore_box *box; -int i, pkg; - -if (pmu) { - pkg =topology_physical_package_id (cpu); -for (i =0 ; i < type->num_boxes; i++, pmu++) { - box = pmu->boxes[pkg]; -if (box) -uncore_box_exit (box); - } - } -} - -static void uncore_exit_boxes (void *dummy) -{ -struct intel_uncore_type **types; - -for (types = uncore_msr_uncores; *types; types++) -__uncore_exit_boxes (*types++,smp_processor_id ()); -} -static void uncore_free_boxes (struct intel_uncore_pmu *pmu) {int pkg;
@@ -1078,22 +1054,12 @@ static int uncore_cpu_dying(unsigned int cpu)return 0 ; } -static int first_init; -static int uncore_cpu_starting (unsigned int cpu) {struct intel_uncore_type *type, **types = uncore_msr_uncores;struct intel_uncore_pmu *pmu;struct intel_uncore_box *box; -int i, pkg, ncpus =1 ; - -if (first_init) { -/* -* On init we get the number of online cpus in the package -* and set refcount for all of them. -*/ - ncpus =cpumask_weight (topology_core_cpumask (cpu)); - } +int i, pkg; pkg =topology_logical_package_id (cpu);for (; *types; types++) {
@@ -1104,7 +1070,7 @@ static int uncore_cpu_starting(unsigned int cpu)if (!box)continue ;/* The first cpu on a package activates the box */ -if (atomic_add_return (ncpus, &box->refcnt) == ncpus) +if (atomic_inc_return (&box->refcnt) ==1 )uncore_box_init (box); } }
@@ -1408,19 +1374,17 @@ static int __init intel_uncore_init(void)"perf/x86/intel/uncore:prepare" , uncore_cpu_prepare, NULL); } - first_init =1 ; +cpuhp_setup_state (CPUHP_AP_PERF_X86_UNCORE_STARTING ,"perf/x86/uncore:starting" , uncore_cpu_starting, uncore_cpu_dying); - first_init =0 ; +cpuhp_setup_state (CPUHP_AP_PERF_X86_UNCORE_ONLINE ,"perf/x86/uncore:online" , uncore_event_cpu_online, uncore_event_cpu_offline);return 0 ; err: -/* Undo box->init_box() */ -on_each_cpu_mask (&uncore_cpu_mask, uncore_exit_boxes,NULL ,1 );uncore_types_exit (uncore_msr_uncores);uncore_pci_exit ();return ret;
PATCH 3/3 perf/x86/intel/uncore: Make package handling more robust
In reply to Thomas GleixnerThe package management code in uncore relies on package mapping being available before a CPU is started. This changed with commit 9d85eb9119f4 because the ACPI/BIOS information turned out to be unreliable, but that left uncore in broken state. This was not noticed because on a regular boot all CPUs are online before uncore is initialized.
Move the allocation to the CPU online callback and simplify the hotplug handling. At this point the package mapping is established and correct.
--- arch/x86/events/intel/uncore.c | 196 +++++++++++++++++++---------------------- include/linux/cpuhotplug.h | 2 2 files changed, 91 insertions(+), 107 deletions(-)
arch/x86/events/intel/uncore.c +91 -105
@@ -100,7 +100,13 @@ ssize_t uncore_event_show(struct kobjectstruct intel_uncore_box *uncore_pmu_to_box (struct intel_uncore_pmu *pmu,int cpu) { -return pmu->boxes[topology_logical_package_id (cpu)]; +unsigned int pkgid =topology_logical_package_id (cpu); + +/* +* The unsigned check also catches the '-1' return value for non +* existent mappings in the topology map. +*/ +return pkgid < max_packages ? pmu->boxes[pkgid] :NULL ; }u64 uncore_msr_read_counter (struct intel_uncore_box *box,struct perf_event *event)
@@ -1034,76 +1040,6 @@ static void uncore_pci_exit(void) } } -static int uncore_cpu_dying (unsigned int cpu) -{ -struct intel_uncore_type *type, **types = uncore_msr_uncores; -struct intel_uncore_pmu *pmu; -struct intel_uncore_box *box; -int i, pkg; - - pkg =topology_logical_package_id (cpu); -for (; *types; types++) { - type = *types; - pmu = type->pmus; -for (i =0 ; i < type->num_boxes; i++, pmu++) { - box = pmu->boxes[pkg]; -if (box &&atomic_dec_return (&box->refcnt) ==0 ) -uncore_box_exit (box); - } - } -return 0 ; -} - -static int uncore_cpu_starting (unsigned int cpu) -{ -struct intel_uncore_type *type, **types = uncore_msr_uncores; -struct intel_uncore_pmu *pmu; -struct intel_uncore_box *box; -int i, pkg; - - pkg =topology_logical_package_id (cpu); -for (; *types; types++) { - type = *types; - pmu = type->pmus; -for (i =0 ; i < type->num_boxes; i++, pmu++) { - box = pmu->boxes[pkg]; -if (!box) -continue ; -/* The first cpu on a package activates the box */ -if (atomic_inc_return (&box->refcnt) ==1 ) -uncore_box_init (box); - } - } - -return 0 ; -} - -static int uncore_cpu_prepare (unsigned int cpu) -{ -struct intel_uncore_type *type, **types = uncore_msr_uncores; -struct intel_uncore_pmu *pmu; -struct intel_uncore_box *box; -int i, pkg; - - pkg =topology_logical_package_id (cpu); -for (; *types; types++) { - type = *types; - pmu = type->pmus; -for (i =0 ; i < type->num_boxes; i++, pmu++) { -if (pmu->boxes[pkg]) -continue ; -/* First cpu of a package allocates the box */ - box =uncore_alloc_box (type,cpu_to_node (cpu)); -if (!box) -return -ENOMEM ; - box->pmu = pmu; - box->pkgid = pkg; - pmu->boxes[pkg] = box; - } - } -return 0 ; -} -static void uncore_change_type_ctx (struct intel_uncore_type *type,int old_cpu,int new_cpu) {
@@ -1143,12 +1079,14 @@ static void uncore_change_context(structstatic int uncore_event_cpu_offline (unsigned int cpu) { -int target; +struct intel_uncore_type *type, **types = uncore_msr_uncores; +struct intel_uncore_pmu *pmu; +struct intel_uncore_box *box; +int i, pkg, target;/* Check if exiting cpu is used for collecting uncore events */ if (!cpumask_test_and_clear_cpu (cpu, &uncore_cpu_mask)) -return 0 ; - + goto unref;/* Find a new cpu to collect uncore events */ target =cpumask_any_but (topology_core_cpumask (cpu), cpu);
@@ -1160,12 +1098,82 @@ static int uncore_event_cpu_offline(unsiuncore_change_context (uncore_msr_uncores, cpu, target);uncore_change_context (uncore_pci_uncores, cpu, target); + +unref: +/* Clear the references */ + pkg =topology_logical_package_id (cpu); +for (; *types; types++) { + type = *types; + pmu = type->pmus; +for (i =0 ; i < type->num_boxes; i++, pmu++) { + box = pmu->boxes[pkg]; +if (box &&atomic_dec_return (&box->refcnt) ==0 ) +uncore_box_exit (box); + } + }return 0 ; } +static int allocate_boxes (struct intel_uncore_type **types, +unsigned int pkg,unsigned int cpu) +{ +struct intel_uncore_box *box, *tmp; +struct intel_uncore_type *type; +struct intel_uncore_pmu *pmu; +LIST_HEAD (allocated); +int i; + +/* Try to allocate all required boxes */ +for (; *types; types++) { + type = *types; + pmu = type->pmus; +for (i =0 ; i < type->num_boxes; i++, pmu++) { +if (pmu->boxes[pkg]) +continue ; + box =uncore_alloc_box (type,cpu_to_node (cpu)); +if (!box) + goto cleanup; + box->pmu = pmu; + box->pkgid = pkg; +list_add (&box->active_list, &allocated); + } + } +/* Install them in the pmus */ +list_for_each_entry_safe (box, tmp, &allocated, active_list) { +list_del_init (&box->active_list); + box->pmu->boxes[pkg] = box; + } +return 0 ; + +cleanup: +list_for_each_entry_safe (box, tmp, &allocated, active_list) { +list_del_init (&box->active_list); +kfree (box); + } +return -ENOMEM ; +} +static int uncore_event_cpu_online (unsigned int cpu) { -int target; +struct intel_uncore_type *type, **types = uncore_msr_uncores; +struct intel_uncore_pmu *pmu; +struct intel_uncore_box *box; +int i, ret, pkg, target; + + pkg =topology_logical_package_id (cpu); + ret =allocate_boxes (types, pkg, cpu); +if (ret) +return ret; + +for (; *types; types++) { + type = *types; + pmu = type->pmus; +for (i =0 ; i < type->num_boxes; i++, pmu++) { + box = pmu->boxes[pkg]; +if (!box &&atomic_inc_return (&box->refcnt) ==1 ) +uncore_box_init (box); + } + }/* * Check if there is an online cpu in the package
@@ -1355,33 +1363,13 @@ static int __init intel_uncore_init(voidif (cret && pret)return -ENODEV ; -/* -* Install callbacks. Core will call them for each online cpu. -* -* The first online cpu of each package allocates and takes -* the refcounts for all other online cpus in that package. -* If msrs are not enabled no allocation is required and -* uncore_cpu_prepare() is not called for each online cpu. -*/ -if (!cret) { - ret =cpuhp_setup_state (CPUHP_PERF_X86_UNCORE_PREP , -"perf/x86/intel/uncore:prepare" , - uncore_cpu_prepare,NULL ); -if (ret) - goto err; - }else { -cpuhp_setup_state_nocalls (CPUHP_PERF_X86_UNCORE_PREP , -"perf/x86/intel/uncore:prepare" , - uncore_cpu_prepare,NULL ); - } - -cpuhp_setup_state (CPUHP_AP_PERF_X86_UNCORE_STARTING , -"perf/x86/uncore:starting" , - uncore_cpu_starting, uncore_cpu_dying); - -cpuhp_setup_state (CPUHP_AP_PERF_X86_UNCORE_ONLINE , -"perf/x86/uncore:online" , - uncore_event_cpu_online, uncore_event_cpu_offline); +/* Install hotplug callbacks to setup the targets for each package */ + ret =cpuhp_setup_state (CPUHP_AP_PERF_X86_UNCORE_ONLINE , +"perf/x86/intel/uncore:online" , + uncore_event_cpu_online, + uncore_event_cpu_offline); +if (ret) + goto err;return 0 ; err:
@@ -1393,9 +1381,7 @@ module_init(intel_uncore_init); static void __exit intel_uncore_exit(void) { -cpuhp_remove_state_nocalls (CPUHP_AP_PERF_X86_UNCORE_ONLINE ); -cpuhp_remove_state_nocalls (CPUHP_AP_PERF_X86_UNCORE_STARTING ); -cpuhp_remove_state_nocalls (CPUHP_PERF_X86_UNCORE_PREP ); +cpuhp_remove_state (CPUHP_AP_PERF_X86_UNCORE_ONLINE );uncore_types_exit (uncore_msr_uncores);uncore_pci_exit (); }
include/linux/cpuhotplug.h +0 -2
@@ -8,7 +8,6 @@ enum cpuhp_state {CPUHP_CREATE_THREADS ,CPUHP_PERF_PREPARE ,CPUHP_PERF_X86_PREPARE , -CPUHP_PERF_X86_UNCORE_PREP ,CPUHP_PERF_X86_AMD_UNCORE_PREP ,CPUHP_PERF_BFIN , CPUHP_PERF_POWER,
@@ -85,7 +84,6 @@ enum cpuhp_state {CPUHP_AP_IRQ_ARMADA_XP_STARTING ,CPUHP_AP_IRQ_BCM2836_STARTING ,CPUHP_AP_ARM_MVEBU_COHERENCY , -CPUHP_AP_PERF_X86_UNCORE_STARTING ,CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING ,CPUHP_AP_PERF_X86_STARTING , CPUHP_AP_PERF_X86_AMD_IBS_STARTING,
tip-bot for Thomas Gleixner
merge bot[tip:perf/urgent] perf/x86/intel/uncore: Make package handling more robust
perf/x86/intel/uncore: Make package handling more robust
Commit-ID: fff4b87e594ad3d2e4f51e8d3d86a6f9d3d8b654 Gitweb: http://git.kernel.org/tip/fff4b87e594ad3d2e4f51e8d3d86a6f9d3d8b654 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 31 Jan 2017 23:58:40 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 1 Feb 2017 08:37:27 +0100
perf/x86/intel/uncore: Make package handling more robust
The package management code in uncore relies on package mapping being available before a CPU is started. This changed with:
9d85eb9119f4 ("x86/smpboot: Make logical package management more robust")
because the ACPI/BIOS information turned out to be unreliable, but that left uncore in broken state. This was not noticed because on a regular boot all CPUs are online before uncore is initialized.
Move the allocation to the CPU online callback and simplify the hotplug handling. At this point the package mapping is established and correct.
--- arch/x86/events/intel/uncore.c | 196 +++++++++++++++++++---------------------- include/linux/cpuhotplug.h | 2 - 2 files changed, 91 insertions(+), 107 deletions(-)
arch/x86/events/intel/uncore.c +91 -105
@@ -100,7 +100,13 @@ ssize_t uncore_event_show(struct kobject *kobj,struct intel_uncore_box *uncore_pmu_to_box (struct intel_uncore_pmu *pmu,int cpu) { -return pmu->boxes[topology_logical_package_id (cpu)]; +unsigned int pkgid =topology_logical_package_id (cpu); + +/* +* The unsigned check also catches the '-1' return value for non +* existent mappings in the topology map. +*/ +return pkgid < max_packages ? pmu->boxes[pkgid] :NULL ; }u64 uncore_msr_read_counter (struct intel_uncore_box *box,struct perf_event *event)
@@ -1034,76 +1040,6 @@ static void uncore_pci_exit(void) } } -static int uncore_cpu_dying (unsigned int cpu) -{ -struct intel_uncore_type *type, **types = uncore_msr_uncores; -struct intel_uncore_pmu *pmu; -struct intel_uncore_box *box; -int i, pkg; - - pkg =topology_logical_package_id (cpu); -for (; *types; types++) { - type = *types; - pmu = type->pmus; -for (i =0 ; i < type->num_boxes; i++, pmu++) { - box = pmu->boxes[pkg]; -if (box &&atomic_dec_return (&box->refcnt) ==0 ) -uncore_box_exit (box); - } - } -return 0 ; -} - -static int uncore_cpu_starting (unsigned int cpu) -{ -struct intel_uncore_type *type, **types = uncore_msr_uncores; -struct intel_uncore_pmu *pmu; -struct intel_uncore_box *box; -int i, pkg; - - pkg =topology_logical_package_id (cpu); -for (; *types; types++) { - type = *types; - pmu = type->pmus; -for (i =0 ; i < type->num_boxes; i++, pmu++) { - box = pmu->boxes[pkg]; -if (!box) -continue ; -/* The first cpu on a package activates the box */ -if (atomic_inc_return (&box->refcnt) ==1 ) -uncore_box_init (box); - } - } - -return 0 ; -} - -static int uncore_cpu_prepare (unsigned int cpu) -{ -struct intel_uncore_type *type, **types = uncore_msr_uncores; -struct intel_uncore_pmu *pmu; -struct intel_uncore_box *box; -int i, pkg; - - pkg =topology_logical_package_id (cpu); -for (; *types; types++) { - type = *types; - pmu = type->pmus; -for (i =0 ; i < type->num_boxes; i++, pmu++) { -if (pmu->boxes[pkg]) -continue ; -/* First cpu of a package allocates the box */ - box =uncore_alloc_box (type,cpu_to_node (cpu)); -if (!box) -return -ENOMEM ; - box->pmu = pmu; - box->pkgid = pkg; - pmu->boxes[pkg] = box; - } - } -return 0 ; -} -static void uncore_change_type_ctx (struct intel_uncore_type *type,int old_cpu,int new_cpu) {
@@ -1143,12 +1079,14 @@ static void uncore_change_context(struct intel_uncore_type **uncores,static int uncore_event_cpu_offline (unsigned int cpu) { -int target; +struct intel_uncore_type *type, **types = uncore_msr_uncores; +struct intel_uncore_pmu *pmu; +struct intel_uncore_box *box; +int i, pkg, target;/* Check if exiting cpu is used for collecting uncore events */ if (!cpumask_test_and_clear_cpu (cpu, &uncore_cpu_mask)) -return 0 ; - + goto unref;/* Find a new cpu to collect uncore events */ target =cpumask_any_but (topology_core_cpumask (cpu), cpu);
@@ -1160,12 +1098,82 @@ static int uncore_event_cpu_offline(unsigned int cpu)uncore_change_context (uncore_msr_uncores, cpu, target);uncore_change_context (uncore_pci_uncores, cpu, target); + +unref: +/* Clear the references */ + pkg =topology_logical_package_id (cpu); +for (; *types; types++) { + type = *types; + pmu = type->pmus; +for (i =0 ; i < type->num_boxes; i++, pmu++) { + box = pmu->boxes[pkg]; +if (box &&atomic_dec_return (&box->refcnt) ==0 ) +uncore_box_exit (box); + } + }return 0 ; } +static int allocate_boxes (struct intel_uncore_type **types, +unsigned int pkg,unsigned int cpu) +{ +struct intel_uncore_box *box, *tmp; +struct intel_uncore_type *type; +struct intel_uncore_pmu *pmu; +LIST_HEAD (allocated); +int i; + +/* Try to allocate all required boxes */ +for (; *types; types++) { + type = *types; + pmu = type->pmus; +for (i =0 ; i < type->num_boxes; i++, pmu++) { +if (pmu->boxes[pkg]) +continue ; + box =uncore_alloc_box (type,cpu_to_node (cpu)); +if (!box) + goto cleanup; + box->pmu = pmu; + box->pkgid = pkg; +list_add (&box->active_list, &allocated); + } + } +/* Install them in the pmus */ +list_for_each_entry_safe (box, tmp, &allocated, active_list) { +list_del_init (&box->active_list); + box->pmu->boxes[pkg] = box; + } +return 0 ; + +cleanup: +list_for_each_entry_safe (box, tmp, &allocated, active_list) { +list_del_init (&box->active_list); +kfree (box); + } +return -ENOMEM ; +} +static int uncore_event_cpu_online (unsigned int cpu) { -int target; +struct intel_uncore_type *type, **types = uncore_msr_uncores; +struct intel_uncore_pmu *pmu; +struct intel_uncore_box *box; +int i, ret, pkg, target; + + pkg =topology_logical_package_id (cpu); + ret =allocate_boxes (types, pkg, cpu); +if (ret) +return ret; + +for (; *types; types++) { + type = *types; + pmu = type->pmus; +for (i =0 ; i < type->num_boxes; i++, pmu++) { + box = pmu->boxes[pkg]; +if (!box &&atomic_inc_return (&box->refcnt) ==1 ) +uncore_box_init (box); + } + }/* * Check if there is an online cpu in the package
@@ -1355,33 +1363,13 @@ static int __init intel_uncore_init(void)if (cret && pret)return -ENODEV ; -/* -* Install callbacks. Core will call them for each online cpu. -* -* The first online cpu of each package allocates and takes -* the refcounts for all other online cpus in that package. -* If msrs are not enabled no allocation is required and -* uncore_cpu_prepare() is not called for each online cpu. -*/ -if (!cret) { - ret =cpuhp_setup_state (CPUHP_PERF_X86_UNCORE_PREP , -"perf/x86/intel/uncore:prepare" , - uncore_cpu_prepare,NULL ); -if (ret) - goto err; - }else { -cpuhp_setup_state_nocalls (CPUHP_PERF_X86_UNCORE_PREP , -"perf/x86/intel/uncore:prepare" , - uncore_cpu_prepare,NULL ); - } - -cpuhp_setup_state (CPUHP_AP_PERF_X86_UNCORE_STARTING , -"perf/x86/uncore:starting" , - uncore_cpu_starting, uncore_cpu_dying); - -cpuhp_setup_state (CPUHP_AP_PERF_X86_UNCORE_ONLINE , -"perf/x86/uncore:online" , - uncore_event_cpu_online, uncore_event_cpu_offline); +/* Install hotplug callbacks to setup the targets for each package */ + ret =cpuhp_setup_state (CPUHP_AP_PERF_X86_UNCORE_ONLINE , +"perf/x86/intel/uncore:online" , + uncore_event_cpu_online, + uncore_event_cpu_offline); +if (ret) + goto err;return 0 ; err:
@@ -1393,9 +1381,7 @@ module_init(intel_uncore_init); static void __exit intel_uncore_exit(void) { -cpuhp_remove_state_nocalls (CPUHP_AP_PERF_X86_UNCORE_ONLINE ); -cpuhp_remove_state_nocalls (CPUHP_AP_PERF_X86_UNCORE_STARTING ); -cpuhp_remove_state_nocalls (CPUHP_PERF_X86_UNCORE_PREP ); +cpuhp_remove_state (CPUHP_AP_PERF_X86_UNCORE_ONLINE );uncore_types_exit (uncore_msr_uncores);uncore_pci_exit (); }
include/linux/cpuhotplug.h +0 -2
@@ -8,7 +8,6 @@ enum cpuhp_state {CPUHP_CREATE_THREADS ,CPUHP_PERF_PREPARE ,CPUHP_PERF_X86_PREPARE , -CPUHP_PERF_X86_UNCORE_PREP ,CPUHP_PERF_X86_AMD_UNCORE_PREP ,CPUHP_PERF_BFIN , CPUHP_PERF_POWER,
@@ -85,7 +84,6 @@ enum cpuhp_state {CPUHP_AP_IRQ_ARMADA_XP_STARTING ,CPUHP_AP_IRQ_BCM2836_STARTING ,CPUHP_AP_ARM_MVEBU_COHERENCY , -CPUHP_AP_PERF_X86_UNCORE_STARTING ,CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING ,CPUHP_AP_PERF_X86_STARTING , CPUHP_AP_PERF_X86_AMD_IBS_STARTING,
Hi Thomas,
Thank you for posting the patch-set.
Quoted 8 lines · Thomas Gleixner
Yasuaki reported a RAPL failure vs. CPU hotplug. This is caused by the recent rework of the package mapping code. The same issue along with other fallouts from the hotplug conversion is present in the UNCORE code.
The following series addresses those problems.
Thanks,
Quoted 7 lines
tglx
--- arch/x86/events/intel/rapl.c | 60 ++++------ arch/x86/events/intel/uncore.c | 232 ++++++++++++++++------------------------- include/linux/cpuhotplug.h | 3 3 files changed, 117 insertions(+), 178 deletions(-)
I tested physical CPU hot-add and remove with your patch-set. And I confirmed that the patch-set works good to me.
Thanks,
Yasuaki Ishimatsu