perf/x86/intel/uncore: Move uncore_box_init out of driver initialization
Subsystems (2)
PATCH 1/1 perf/x86/intel/uncore: Move uncore_box_init out of driver initialization
From: Kan Liang <[email protected]>
There were some issues about the uncore driver tried to access non-existing boxes, which caused boot crashes. These issues have been all fixed. But we should avoid boot failures if that ever happens again.
This patch intends to prevent this kind of potential issues. It moves uncore_box_init out of driver initialization. The box will be initialized when it's first enabled.
--- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 9 ++------- arch/x86/kernel/cpu/perf_event_intel_uncore.h | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 15 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_uncore.c +2 -7
@@ -840,7 +840,6 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id box->phys_id = phys_id; box->pci_dev = pdev; box->pmu = pmu; -uncore_box_init (box);pci_set_drvdata (pdev, box);raw_spin_lock (&uncore_box_lock);
@@ -1004,10 +1003,8 @@ static int uncore_cpu_starting(int cpu) pmu = &type->pmus[j]; box = *per_cpu_ptr (pmu->box, cpu);/* called by uncore_cpu_init? */ -if (box && box->phys_id >=0 ) { -uncore_box_init (box); +if (box && box->phys_id >=0 )continue ; - }for_each_online_cpu (k) { exist = *per_cpu_ptr (pmu->box, k);
@@ -1023,10 +1020,8 @@ static int uncore_cpu_starting(int cpu) } } -if (box) { +if (box) box->phys_id = phys_id; -uncore_box_init (box); - } } }return 0 ;
arch/x86/kernel/cpu/perf_event_intel_uncore.h +10 -8
@@ -257,6 +257,14 @@ static inline int uncore_num_counters(struct intel_uncore_box *box)return box->pmu->type->num_counters; } +static inline void uncore_box_init (struct intel_uncore_box *box) +{ +if (!test_and_set_bit (UNCORE_BOX_FLAG_INITIATED , &box->flags)) { +if (box->pmu->type->ops->init_box) + box->pmu->type->ops->init_box (box); + } +} +static inline void uncore_disable_box (struct intel_uncore_box *box) {if (box->pmu->type->ops->disable_box)
@@ -265,6 +273,8 @@ static inline void uncore_disable_box(struct intel_uncore_box *box)static inline void uncore_enable_box (struct intel_uncore_box *box) { +uncore_box_init (box); +if (box->pmu->type->ops->enable_box) box->pmu->type->ops->enable_box (box); }
@@ -287,14 +297,6 @@ static inline u64 uncore_read_counter(struct intel_uncore_box *box,return box->pmu->type->ops->read_counter (box, event); } -static inline void uncore_box_init (struct intel_uncore_box *box) -{ -if (!test_and_set_bit (UNCORE_BOX_FLAG_INITIATED , &box->flags)) { -if (box->pmu->type->ops->init_box) - box->pmu->type->ops->init_box (box); - } -} -static inline bool uncore_box_is_fake (struct intel_uncore_box *box) {return (box->phys_id <0 );
Signature · 1 line
1.7.11.7
tip-bot for Kan Liang
merge bot[tip:perf/urgent] perf/x86/intel/uncore: Move uncore_box_init() out of driver initialization
perf/x86/intel/uncore: Move uncore_box_init() out of driver initialization
Commit-ID: c05199e5a57a579fea1e8fa65e2b511ceb524ffc Gitweb: http://git.kernel.org/tip/c05199e5a57a579fea1e8fa65e2b511ceb524ffc Author: Kan Liang <[email protected]> AuthorDate: Tue, 20 Jan 2015 04:54:25 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 28 Jan 2015 13:04:34 +0100
perf/x86/intel/uncore: Move uncore_box_init() out of driver initialization
There were some issues about the uncore driver tried to access non-existing boxes, which caused boot crashes. These issues have been all fixed. But we should avoid boot failures if that ever happens again.
This patch intends to prevent this kind of potential issues. It moves uncore_box_init out of driver initialization. The box will be initialized when it's first enabled.
--- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 9 ++------- arch/x86/kernel/cpu/perf_event_intel_uncore.h | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 15 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_uncore.c +2 -7
@@ -840,7 +840,6 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id box->phys_id = phys_id; box->pci_dev = pdev; box->pmu = pmu; -uncore_box_init (box);pci_set_drvdata (pdev, box);raw_spin_lock (&uncore_box_lock);
@@ -1004,10 +1003,8 @@ static int uncore_cpu_starting(int cpu) pmu = &type->pmus[j]; box = *per_cpu_ptr (pmu->box, cpu);/* called by uncore_cpu_init? */ -if (box && box->phys_id >=0 ) { -uncore_box_init (box); +if (box && box->phys_id >=0 )continue ; - }for_each_online_cpu (k) { exist = *per_cpu_ptr (pmu->box, k);
@@ -1023,10 +1020,8 @@ static int uncore_cpu_starting(int cpu) } } -if (box) { +if (box) box->phys_id = phys_id; -uncore_box_init (box); - } } }return 0 ;
arch/x86/kernel/cpu/perf_event_intel_uncore.h +10 -8
@@ -257,6 +257,14 @@ static inline int uncore_num_counters(struct intel_uncore_box *box)return box->pmu->type->num_counters; } +static inline void uncore_box_init (struct intel_uncore_box *box) +{ +if (!test_and_set_bit (UNCORE_BOX_FLAG_INITIATED , &box->flags)) { +if (box->pmu->type->ops->init_box) + box->pmu->type->ops->init_box (box); + } +} +static inline void uncore_disable_box (struct intel_uncore_box *box) {if (box->pmu->type->ops->disable_box)
@@ -265,6 +273,8 @@ static inline void uncore_disable_box(struct intel_uncore_box *box)static inline void uncore_enable_box (struct intel_uncore_box *box) { +uncore_box_init (box); +if (box->pmu->type->ops->enable_box) box->pmu->type->ops->enable_box (box); }
@@ -287,14 +297,6 @@ static inline u64 uncore_read_counter(struct intel_uncore_box *box,return box->pmu->type->ops->read_counter (box, event); } -static inline void uncore_box_init (struct intel_uncore_box *box) -{ -if (!test_and_set_bit (UNCORE_BOX_FLAG_INITIATED , &box->flags)) { -if (box->pmu->type->ops->init_box) - box->pmu->type->ops->init_box (box); - } -} -static inline bool uncore_box_is_fake (struct intel_uncore_box *box) {return (box->phys_id <0 );