perf/x86/intel/uncore: Fix oops when counting IMC uncore events on some TGL
Subsystems (2)
PATCH v3 1/3 perf/x86/intel/uncore: Fix oops when counting IMC uncore events on some TGL
From: Kan Liang <[email protected]>
When counting IMC uncore events on some TGL machines, an oops will be triggered.
[ 393.101262] BUG: unable to handle page fault for address: ffffb45200e15858 [ 393.101269] #PF: supervisor read access in kernel mode [ 393.101271] #PF: error_code(0x0000) - not-present page
Current perf uncore driver still use the IMC MAP SIZE inherited from SNB, which is 0x6000.
However, the offset of IMC uncore counters is larger than 0x6000, e.g. 0xd8a0.
Enlarge the IMC MAP SIZE for TGL to 0xe000.
---
No changes since V1
arch/x86/events/intel/uncore_snb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snb.c +2 -1
@@ -1085,6 +1085,7 @@ static struct pci_dev *tgl_uncore_get_mc_dev(void) }#define TGL_UNCORE_MMIO_IMC_MEM_OFFSET 0x10000 +#define TGL_UNCORE_PCI_IMC_MAP_SIZE 0xe000static void tgl_uncore_imc_freerunning_init_box (struct intel_uncore_box *box) {
@@ -1112,7 +1113,7 @@ static void tgl_uncore_imc_freerunning_init_box(struct intel_uncore_box *box) addr |= ((resource_size_t )mch_bar <<32 );#endif - box->io_addr =ioremap (addr,SNB_UNCORE_PCI_IMC_MAP_SIZE ); + box->io_addr =ioremap (addr,TGL_UNCORE_PCI_IMC_MAP_SIZE ); }static struct intel_uncore_ops tgl_uncore_imc_freerunning_ops = {
Signature · 1 line
2.7.4
PATCH v3 2/3 perf/x86/intel/uncore: Record the size of mapped area
From: Kan Liang <[email protected]>
Perf cannot validate an address before the actual access to MMIO space of some uncore units, e.g. IMC on TGL. Accessing an invalid address, which exceeds mapped area, can trigger oops.
Perf never records the size of mapped area. Generic functions, e.g. uncore_mmio_read_counter(), cannot get the correct size for address validation.
Add mmio_map_size in intel_uncore_type to record the size of mapped area. Print warning message if ioremap fails.
---
Changes since V2:
- Check box->io_addr instead of mmio_map_size
- Print warning message if ioremap fails
arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snb.c | 13 +++++++++++-- arch/x86/events/intel/uncore_snbep.c | 11 +++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-)
arch/x86/events/intel/uncore.h +1 -0
@@ -61,6 +61,7 @@ struct intel_uncore_type {unsigned msr_offset;unsigned mmio_offset; }; +unsigned mmio_map_size; unsigned num_shared_regs:8; unsigned single_fixed:1; unsigned pair_ctr_ctl:1;
arch/x86/events/intel/uncore_snb.c +11 -2
@@ -415,6 +415,7 @@ static const struct attribute_group snb_uncore_imc_format_group = {static void snb_uncore_imc_init_box (struct intel_uncore_box *box) { +struct intel_uncore_type *type = box->pmu->type;struct pci_dev *pdev = box->pci_dev;int where =SNB_UNCORE_PCI_IMC_BAR_OFFSET ;resource_size_t addr;
@@ -430,7 +431,10 @@ static void snb_uncore_imc_init_box(struct intel_uncore_box *box) addr &= ~(PAGE_SIZE -1 ); - box->io_addr =ioremap (addr,SNB_UNCORE_PCI_IMC_MAP_SIZE ); + box->io_addr =ioremap (addr, type->mmio_map_size); +if (!box->io_addr) +pr_warn ("perf uncore: Failed to ioremap for %s.\n" , type->name); + box->hrtimer_duration =UNCORE_SNB_IMC_HRTIMER_INTERVAL ; }
@@ -586,6 +590,7 @@ static struct intel_uncore_type snb_uncore_imc = { .num_counters = 2, .num_boxes = 1, .num_freerunning_types = SNB_PCI_UNCORE_IMC_FREERUNNING_TYPE_MAX, + .mmio_map_size = SNB_UNCORE_PCI_IMC_MAP_SIZE, .freerunning = snb_uncore_imc_freerunning, .event_descs = snb_uncore_imc_events, .format_group = &snb_uncore_imc_format_group,
@@ -1091,6 +1096,7 @@ static void tgl_uncore_imc_freerunning_init_box(struct intel_uncore_box *box) {struct pci_dev *pdev =tgl_uncore_get_mc_dev ();struct intel_uncore_pmu *pmu = box->pmu; +struct intel_uncore_type *type = pmu->type;resource_size_t addr;u32 mch_bar;
@@ -1113,7 +1119,9 @@ static void tgl_uncore_imc_freerunning_init_box(struct intel_uncore_box *box) addr |= ((resource_size_t )mch_bar <<32 );#endif - box->io_addr =ioremap (addr,TGL_UNCORE_PCI_IMC_MAP_SIZE ); + box->io_addr =ioremap (addr, type->mmio_map_size); +if (!box->io_addr) +pr_warn ("perf uncore: Failed to ioremap for %s.\n" , type->name); }static struct intel_uncore_ops tgl_uncore_imc_freerunning_ops = {
@@ -1139,6 +1147,7 @@ static struct intel_uncore_type tgl_uncore_imc_free_running = { .num_counters = 3, .num_boxes = 2, .num_freerunning_types = TGL_MMIO_UNCORE_IMC_FREERUNNING_TYPE_MAX, + .mmio_map_size = TGL_UNCORE_PCI_IMC_MAP_SIZE, .freerunning = tgl_uncore_imc_freerunning, .ops = &tgl_uncore_imc_freerunning_ops, .event_descs = tgl_uncore_imc_events,
arch/x86/events/intel/uncore_snbep.c +9 -2
@@ -4421,6 +4421,7 @@ static void __snr_uncore_mmio_init_box(struct intel_uncore_box *box, unsigned int box_ctl, int mem_offset) {struct pci_dev *pdev =snr_uncore_get_mc_dev (box->dieid); +struct intel_uncore_type *type = box->pmu->type;resource_size_t addr;u32 pci_dword;
@@ -4435,9 +4436,11 @@ static void __snr_uncore_mmio_init_box(struct intel_uncore_box *box, addr += box_ctl; - box->io_addr =ioremap (addr,SNR_IMC_MMIO_SIZE ); -if (!box->io_addr) + box->io_addr =ioremap (addr, type->mmio_map_size); +if (!box->io_addr) { +pr_warn ("perf uncore: Failed to ioremap for %s.\n" , type->name);return ; + }writel (IVBEP_PMON_BOX_CTL_INT , box->io_addr); }
@@ -4530,6 +4533,7 @@ static struct intel_uncore_type snr_uncore_imc = { .event_mask = SNBEP_PMON_RAW_EVENT_MASK, .box_ctl = SNR_IMC_MMIO_PMON_BOX_CTL, .mmio_offset = SNR_IMC_MMIO_OFFSET, + .mmio_map_size = SNR_IMC_MMIO_SIZE, .ops = &snr_uncore_mmio_ops, .format_group = &skx_uncore_format_group, };
@@ -4570,6 +4574,7 @@ static struct intel_uncore_type snr_uncore_imc_free_running = { .num_counters = 3, .num_boxes = 1, .num_freerunning_types = SNR_IMC_FREERUNNING_TYPE_MAX, + .mmio_map_size = SNR_IMC_MMIO_SIZE, .freerunning = snr_imc_freerunning, .ops = &snr_uncore_imc_freerunning_ops, .event_descs = snr_uncore_imc_freerunning_events,
@@ -4987,6 +4992,7 @@ static struct intel_uncore_type icx_uncore_imc = { .event_mask = SNBEP_PMON_RAW_EVENT_MASK, .box_ctl = SNR_IMC_MMIO_PMON_BOX_CTL, .mmio_offset = SNR_IMC_MMIO_OFFSET, + .mmio_map_size = SNR_IMC_MMIO_SIZE, .ops = &icx_uncore_mmio_ops, .format_group = &skx_uncore_format_group, };
@@ -5044,6 +5050,7 @@ static struct intel_uncore_type icx_uncore_imc_free_running = { .num_counters = 5, .num_boxes = 4, .num_freerunning_types = ICX_IMC_FREERUNNING_TYPE_MAX, + .mmio_map_size = SNR_IMC_MMIO_SIZE, .freerunning = icx_imc_freerunning, .ops = &icx_uncore_imc_freerunning_ops, .event_descs = icx_uncore_imc_freerunning_events,
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Record the size of mapped area
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 1b94d31de422399421422af0e63c9685e7485901 Gitweb: https://git.kernel.org/tip/1b94d31de422399421422af0e63c9685e7485901 Author: Kan Liang <[email protected]> AuthorDate: Thu, 28 May 2020 08:19:28 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 15 Jun 2020 14:09:50 +02:00
perf/x86/intel/uncore: Record the size of mapped area
Perf cannot validate an address before the actual access to MMIO space of some uncore units, e.g. IMC on TGL. Accessing an invalid address, which exceeds mapped area, can trigger oops.
Perf never records the size of mapped area. Generic functions, e.g. uncore_mmio_read_counter(), cannot get the correct size for address validation.
Add mmio_map_size in intel_uncore_type to record the size of mapped area. Print warning message if ioremap fails.
--- arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snb.c | 13 +++++++++++-- arch/x86/events/intel/uncore_snbep.c | 11 +++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-)
arch/x86/events/intel/uncore.h +1 -0
@@ -61,6 +61,7 @@ struct intel_uncore_type {unsigned msr_offset;unsigned mmio_offset; }; +unsigned mmio_map_size; unsigned num_shared_regs:8; unsigned single_fixed:1; unsigned pair_ctr_ctl:1;
arch/x86/events/intel/uncore_snb.c +11 -2
@@ -426,6 +426,7 @@ static const struct attribute_group snb_uncore_imc_format_group = {static void snb_uncore_imc_init_box (struct intel_uncore_box *box) { +struct intel_uncore_type *type = box->pmu->type;struct pci_dev *pdev = box->pci_dev;int where =SNB_UNCORE_PCI_IMC_BAR_OFFSET ;resource_size_t addr;
@@ -441,7 +442,10 @@ static void snb_uncore_imc_init_box(struct intel_uncore_box *box) addr &= ~(PAGE_SIZE -1 ); - box->io_addr =ioremap (addr,SNB_UNCORE_PCI_IMC_MAP_SIZE ); + box->io_addr =ioremap (addr, type->mmio_map_size); +if (!box->io_addr) +pr_warn ("perf uncore: Failed to ioremap for %s.\n" , type->name); + box->hrtimer_duration =UNCORE_SNB_IMC_HRTIMER_INTERVAL ; }
@@ -597,6 +601,7 @@ static struct intel_uncore_type snb_uncore_imc = { .num_counters = 2, .num_boxes = 1, .num_freerunning_types = SNB_PCI_UNCORE_IMC_FREERUNNING_TYPE_MAX, + .mmio_map_size = SNB_UNCORE_PCI_IMC_MAP_SIZE, .freerunning = snb_uncore_imc_freerunning, .event_descs = snb_uncore_imc_events, .format_group = &snb_uncore_imc_format_group,
@@ -1157,6 +1162,7 @@ static void tgl_uncore_imc_freerunning_init_box(struct intel_uncore_box *box) {struct pci_dev *pdev =tgl_uncore_get_mc_dev ();struct intel_uncore_pmu *pmu = box->pmu; +struct intel_uncore_type *type = pmu->type;resource_size_t addr;u32 mch_bar;
@@ -1179,7 +1185,9 @@ static void tgl_uncore_imc_freerunning_init_box(struct intel_uncore_box *box) addr |= ((resource_size_t )mch_bar <<32 );#endif - box->io_addr =ioremap (addr,TGL_UNCORE_PCI_IMC_MAP_SIZE ); + box->io_addr =ioremap (addr, type->mmio_map_size); +if (!box->io_addr) +pr_warn ("perf uncore: Failed to ioremap for %s.\n" , type->name); }static struct intel_uncore_ops tgl_uncore_imc_freerunning_ops = {
@@ -1205,6 +1213,7 @@ static struct intel_uncore_type tgl_uncore_imc_free_running = { .num_counters = 3, .num_boxes = 2, .num_freerunning_types = TGL_MMIO_UNCORE_IMC_FREERUNNING_TYPE_MAX, + .mmio_map_size = TGL_UNCORE_PCI_IMC_MAP_SIZE, .freerunning = tgl_uncore_imc_freerunning, .ops = &tgl_uncore_imc_freerunning_ops, .event_descs = tgl_uncore_imc_events,
arch/x86/events/intel/uncore_snbep.c +9 -2
@@ -4421,6 +4421,7 @@ static void __snr_uncore_mmio_init_box(struct intel_uncore_box *box, unsigned int box_ctl, int mem_offset) {struct pci_dev *pdev =snr_uncore_get_mc_dev (box->dieid); +struct intel_uncore_type *type = box->pmu->type;resource_size_t addr;u32 pci_dword;
@@ -4435,9 +4436,11 @@ static void __snr_uncore_mmio_init_box(struct intel_uncore_box *box, addr += box_ctl; - box->io_addr =ioremap (addr,SNR_IMC_MMIO_SIZE ); -if (!box->io_addr) + box->io_addr =ioremap (addr, type->mmio_map_size); +if (!box->io_addr) { +pr_warn ("perf uncore: Failed to ioremap for %s.\n" , type->name);return ; + }writel (IVBEP_PMON_BOX_CTL_INT , box->io_addr); }
@@ -4530,6 +4533,7 @@ static struct intel_uncore_type snr_uncore_imc = { .event_mask = SNBEP_PMON_RAW_EVENT_MASK, .box_ctl = SNR_IMC_MMIO_PMON_BOX_CTL, .mmio_offset = SNR_IMC_MMIO_OFFSET, + .mmio_map_size = SNR_IMC_MMIO_SIZE, .ops = &snr_uncore_mmio_ops, .format_group = &skx_uncore_format_group, };
@@ -4570,6 +4574,7 @@ static struct intel_uncore_type snr_uncore_imc_free_running = { .num_counters = 3, .num_boxes = 1, .num_freerunning_types = SNR_IMC_FREERUNNING_TYPE_MAX, + .mmio_map_size = SNR_IMC_MMIO_SIZE, .freerunning = snr_imc_freerunning, .ops = &snr_uncore_imc_freerunning_ops, .event_descs = snr_uncore_imc_freerunning_events,
@@ -4987,6 +4992,7 @@ static struct intel_uncore_type icx_uncore_imc = { .event_mask = SNBEP_PMON_RAW_EVENT_MASK, .box_ctl = SNR_IMC_MMIO_PMON_BOX_CTL, .mmio_offset = SNR_IMC_MMIO_OFFSET, + .mmio_map_size = SNR_IMC_MMIO_SIZE, .ops = &icx_uncore_mmio_ops, .format_group = &skx_uncore_format_group, };
@@ -5044,6 +5050,7 @@ static struct intel_uncore_type icx_uncore_imc_free_running = { .num_counters = 5, .num_boxes = 4, .num_freerunning_types = ICX_IMC_FREERUNNING_TYPE_MAX, + .mmio_map_size = SNR_IMC_MMIO_SIZE, .freerunning = icx_imc_freerunning, .ops = &icx_uncore_imc_freerunning_ops, .event_descs = icx_uncore_imc_freerunning_events,
PATCH v3 3/3 perf/x86/intel/uncore: Validate MMIO address before accessing
In reply to [email protected]From: Kan Liang <[email protected]>
An oops will be triggered, if perf tries to access an invalid address which exceeds the mapped area.
Check the address before the actual access to MMIO sapce of an uncore unit.
---
Changes since V2:
- Rename is_valid_mmio_offset() to uncore_mmio_is_valid_offset()
- Swap over the sequence of conditional check
- Dump invalid offset
arch/x86/events/intel/uncore.c | 3 +++ arch/x86/events/intel/uncore.h | 12 ++++++++++++ arch/x86/events/intel/uncore_snbep.c | 6 ++++++ 3 files changed, 21 insertions(+)
arch/x86/events/intel/uncore.c +3 -0
@@ -132,6 +132,9 @@ u64 uncore_mmio_read_counter(struct intel_uncore_box *box,if (!box->io_addr)return 0 ; +if (!uncore_mmio_is_valid_offset (box, event->hw.event_base)) +return 0 ; +return readq (box->io_addr + event->hw.event_base); }
arch/x86/events/intel/uncore.h +12 -0
@@ -197,6 +197,18 @@ static inline bool uncore_pmc_freerunning(int idx)return idx ==UNCORE_PMC_IDX_FREERUNNING ; } +static inline bool uncore_mmio_is_valid_offset (struct intel_uncore_box *box, +unsigned long offset) +{ +if (offset < box->pmu->type->mmio_map_size) +return true; + +pr_warn_once ("perf uncore: Invalid offset 0x%lx exceeds mapped area of %s.\n" , + offset, box->pmu->type->name); + +return false; +} +static inline unsigned int uncore_mmio_box_ctl (struct intel_uncore_box *box) {
arch/x86/events/intel/uncore_snbep.c +6 -0
@@ -4483,6 +4483,9 @@ static void snr_uncore_mmio_enable_event(struct intel_uncore_box *box,if (!box->io_addr)return ; +if (!uncore_mmio_is_valid_offset (box, hwc->config_base)) +return ; +writel (hwc->config |SNBEP_PMON_CTL_EN , box->io_addr + hwc->config_base); }
@@ -4495,6 +4498,9 @@ static void snr_uncore_mmio_disable_event(struct intel_uncore_box *box,if (!box->io_addr)return ; +if (!uncore_mmio_is_valid_offset (box, hwc->config_base)) +return ; +writel (hwc->config, box->io_addr + hwc->config_base); }
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Validate MMIO address before accessing
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: f01719730bbe04b90ae60c7e9d2b6d3533308502 Gitweb: https://git.kernel.org/tip/f01719730bbe04b90ae60c7e9d2b6d3533308502 Author: Kan Liang <[email protected]> AuthorDate: Thu, 28 May 2020 08:19:29 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 15 Jun 2020 14:09:50 +02:00
perf/x86/intel/uncore: Validate MMIO address before accessing
An oops will be triggered, if perf tries to access an invalid address which exceeds the mapped area.
Check the address before the actual access to MMIO sapce of an uncore unit.
--- arch/x86/events/intel/uncore.c | 3 +++ arch/x86/events/intel/uncore.h | 12 ++++++++++++ arch/x86/events/intel/uncore_snbep.c | 6 ++++++ 3 files changed, 21 insertions(+)
arch/x86/events/intel/uncore.c +3 -0
@@ -132,6 +132,9 @@ u64 uncore_mmio_read_counter(struct intel_uncore_box *box,if (!box->io_addr)return 0 ; +if (!uncore_mmio_is_valid_offset (box, event->hw.event_base)) +return 0 ; +return readq (box->io_addr + event->hw.event_base); }
arch/x86/events/intel/uncore.h +12 -0
@@ -197,6 +197,18 @@ static inline bool uncore_pmc_freerunning(int idx)return idx ==UNCORE_PMC_IDX_FREERUNNING ; } +static inline bool uncore_mmio_is_valid_offset (struct intel_uncore_box *box, +unsigned long offset) +{ +if (offset < box->pmu->type->mmio_map_size) +return true; + +pr_warn_once ("perf uncore: Invalid offset 0x%lx exceeds mapped area of %s.\n" , + offset, box->pmu->type->name); + +return false; +} +static inline unsigned int uncore_mmio_box_ctl (struct intel_uncore_box *box) {
arch/x86/events/intel/uncore_snbep.c +6 -0
@@ -4483,6 +4483,9 @@ static void snr_uncore_mmio_enable_event(struct intel_uncore_box *box,if (!box->io_addr)return ; +if (!uncore_mmio_is_valid_offset (box, hwc->config_base)) +return ; +writel (hwc->config |SNBEP_PMON_CTL_EN , box->io_addr + hwc->config_base); }
@@ -4495,6 +4498,9 @@ static void snr_uncore_mmio_disable_event(struct intel_uncore_box *box,if (!box->io_addr)return ; +if (!uncore_mmio_is_valid_offset (box, hwc->config_base)) +return ; +writel (hwc->config, box->io_addr + hwc->config_base); }
Peter Zijlstra
maintainerThanks!
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 2af834f1faab3f1e218fcbcab70a399121620d62 Gitweb: https://git.kernel.org/tip/2af834f1faab3f1e218fcbcab70a399121620d62 Author: Kan Liang <[email protected]> AuthorDate: Thu, 28 May 2020 08:19:27 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 15 Jun 2020 14:09:50 +02:00
perf/x86/intel/uncore: Fix oops when counting IMC uncore events on some TGL
When counting IMC uncore events on some TGL machines, an oops will be triggered.
[ 393.101262] BUG: unable to handle page fault for address: ffffb45200e15858 [ 393.101269] #PF: supervisor read access in kernel mode [ 393.101271] #PF: error_code(0x0000) - not-present page
Current perf uncore driver still use the IMC MAP SIZE inherited from SNB, which is 0x6000.
However, the offset of IMC uncore counters is larger than 0x6000, e.g. 0xd8a0.
Enlarge the IMC MAP SIZE for TGL to 0xe000.
--- arch/x86/events/intel/uncore_snb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snb.c +2 -1
@@ -1151,6 +1151,7 @@ static struct pci_dev *tgl_uncore_get_mc_dev(void) }#define TGL_UNCORE_MMIO_IMC_MEM_OFFSET 0x10000 +#define TGL_UNCORE_PCI_IMC_MAP_SIZE 0xe000static void tgl_uncore_imc_freerunning_init_box (struct intel_uncore_box *box) {
@@ -1178,7 +1179,7 @@ static void tgl_uncore_imc_freerunning_init_box(struct intel_uncore_box *box) addr |= ((resource_size_t )mch_bar <<32 );#endif - box->io_addr =ioremap (addr,SNB_UNCORE_PCI_IMC_MAP_SIZE ); + box->io_addr =ioremap (addr,TGL_UNCORE_PCI_IMC_MAP_SIZE ); }static struct intel_uncore_ops tgl_uncore_imc_freerunning_ops = {