* [RESEND PATCH v2 0/3] Several fixes for event constraints on SKX and SNR platforms
@ 2021-11-15 9:03 alexander.antonov
2021-11-15 9:03 ` [RESEND PATCH v2 1/3] Fix filter_tid mask for CHA events on Skylake Server alexander.antonov
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: alexander.antonov @ 2021-11-15 9:03 UTC (permalink / raw)
To: peterz, linux-kernel; +Cc: kan.liang, ak, alexey.v.bayduraev, alexander.antonov
From: Alexander Antonov <alexander.antonov@linux.intel.com>
Changes in this revision are:
v1 -> v2:
- Addressed comment from Peter Zijlstra:
- Fix coding style issue in skx_cha_hw_config()
This series contains the following fixes:
- Fix filter_tid mask for CHA events on Skylake Server
- Fix IIO event constraints for Skylake Server
- Fix IIO event constraints for Snowridge
Alexander Antonov (3):
Fix filter_tid mask for CHA events on Skylake Server
Fix IIO event constraints for Skylake Server
Fix IIO event constraints for Snowridge
arch/x86/events/intel/uncore_snbep.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
base-commit: 8ab774587903771821b59471cc723bba6d893942
--
2.21.3
^ permalink raw reply [flat|nested] 7+ messages in thread* [RESEND PATCH v2 1/3] Fix filter_tid mask for CHA events on Skylake Server 2021-11-15 9:03 [RESEND PATCH v2 0/3] Several fixes for event constraints on SKX and SNR platforms alexander.antonov @ 2021-11-15 9:03 ` alexander.antonov 2021-11-17 13:59 ` [tip: perf/urgent] perf/x86/intel/uncore: " tip-bot2 for Alexander Antonov 2021-11-15 9:03 ` [RESEND PATCH v2 2/3] Fix IIO event constraints for " alexander.antonov 2021-11-15 9:03 ` [RESEND PATCH v2 3/3] Fix IIO event constraints for Snowridge alexander.antonov 2 siblings, 1 reply; 7+ messages in thread From: alexander.antonov @ 2021-11-15 9:03 UTC (permalink / raw) To: peterz, linux-kernel; +Cc: kan.liang, ak, alexey.v.bayduraev, alexander.antonov From: Alexander Antonov <alexander.antonov@linux.intel.com> According Uncore Reference Manual: any of the CHA events may be filtered by Thread/Core-ID by using tid modifier in CHA Filter 0 Register. Update skx_cha_hw_config() to follow Uncore Guide. Fixes: cd34cd97b7b4 ("perf/x86/intel/uncore: Add Skylake server uncore support") Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Alexander Antonov <alexander.antonov@linux.intel.com> --- arch/x86/events/intel/uncore_snbep.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index eb2c6cea9d0d..e5ee6bb62ef5 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -3608,6 +3608,9 @@ static int skx_cha_hw_config(struct intel_uncore_box *box, struct perf_event *ev struct hw_perf_event_extra *reg1 = &event->hw.extra_reg; struct extra_reg *er; int idx = 0; + /* Any of the CHA events may be filtered by Thread/Core-ID.*/ + if (event->hw.config & SNBEP_CBO_PMON_CTL_TID_EN) + idx = SKX_CHA_MSR_PMON_BOX_FILTER_TID; for (er = skx_uncore_cha_extra_regs; er->msr; er++) { if (er->event != (event->hw.config & er->config_mask)) -- 2.21.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [tip: perf/urgent] perf/x86/intel/uncore: Fix filter_tid mask for CHA events on Skylake Server 2021-11-15 9:03 ` [RESEND PATCH v2 1/3] Fix filter_tid mask for CHA events on Skylake Server alexander.antonov @ 2021-11-17 13:59 ` tip-bot2 for Alexander Antonov 0 siblings, 0 replies; 7+ messages in thread From: tip-bot2 for Alexander Antonov @ 2021-11-17 13:59 UTC (permalink / raw) To: linux-tip-commits Cc: Alexander Antonov, Peter Zijlstra (Intel), Kan Liang, x86, linux-kernel The following commit has been merged into the perf/urgent branch of tip: Commit-ID: e324234e0aa881b7841c7c713306403e12b069ff Gitweb: https://git.kernel.org/tip/e324234e0aa881b7841c7c713306403e12b069ff Author: Alexander Antonov <alexander.antonov@linux.intel.com> AuthorDate: Mon, 15 Nov 2021 12:03:32 +03:00 Committer: Peter Zijlstra <peterz@infradead.org> CommitterDate: Wed, 17 Nov 2021 14:48:43 +01:00 perf/x86/intel/uncore: Fix filter_tid mask for CHA events on Skylake Server According Uncore Reference Manual: any of the CHA events may be filtered by Thread/Core-ID by using tid modifier in CHA Filter 0 Register. Update skx_cha_hw_config() to follow Uncore Guide. Fixes: cd34cd97b7b4 ("perf/x86/intel/uncore: Add Skylake server uncore support") Signed-off-by: Alexander Antonov <alexander.antonov@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Link: https://lore.kernel.org/r/20211115090334.3789-2-alexander.antonov@linux.intel.com --- arch/x86/events/intel/uncore_snbep.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index eb2c6ce..e5ee6bb 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -3608,6 +3608,9 @@ static int skx_cha_hw_config(struct intel_uncore_box *box, struct perf_event *ev struct hw_perf_event_extra *reg1 = &event->hw.extra_reg; struct extra_reg *er; int idx = 0; + /* Any of the CHA events may be filtered by Thread/Core-ID.*/ + if (event->hw.config & SNBEP_CBO_PMON_CTL_TID_EN) + idx = SKX_CHA_MSR_PMON_BOX_FILTER_TID; for (er = skx_uncore_cha_extra_regs; er->msr; er++) { if (er->event != (event->hw.config & er->config_mask)) ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [RESEND PATCH v2 2/3] Fix IIO event constraints for Skylake Server 2021-11-15 9:03 [RESEND PATCH v2 0/3] Several fixes for event constraints on SKX and SNR platforms alexander.antonov 2021-11-15 9:03 ` [RESEND PATCH v2 1/3] Fix filter_tid mask for CHA events on Skylake Server alexander.antonov @ 2021-11-15 9:03 ` alexander.antonov 2021-11-17 13:59 ` [tip: perf/urgent] perf/x86/intel/uncore: " tip-bot2 for Alexander Antonov 2021-11-15 9:03 ` [RESEND PATCH v2 3/3] Fix IIO event constraints for Snowridge alexander.antonov 2 siblings, 1 reply; 7+ messages in thread From: alexander.antonov @ 2021-11-15 9:03 UTC (permalink / raw) To: peterz, linux-kernel; +Cc: kan.liang, ak, alexey.v.bayduraev, alexander.antonov From: Alexander Antonov <alexander.antonov@linux.intel.com> According to the latest uncore document, COMP_BUF_OCCUPANCY (0xd5) event can be collected on 2-3 counters. Update uncore IIO event constraints for Skylake Server. Fixes: cd34cd97b7b4 ("perf/x86/intel/uncore: Add Skylake server uncore support") Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Alexander Antonov <alexander.antonov@linux.intel.com> --- arch/x86/events/intel/uncore_snbep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index e5ee6bb62ef5..9aba4ef77b13 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -3678,6 +3678,7 @@ static struct event_constraint skx_uncore_iio_constraints[] = { UNCORE_EVENT_CONSTRAINT(0xc0, 0xc), UNCORE_EVENT_CONSTRAINT(0xc5, 0xc), UNCORE_EVENT_CONSTRAINT(0xd4, 0xc), + UNCORE_EVENT_CONSTRAINT(0xd5, 0xc), EVENT_CONSTRAINT_END }; -- 2.21.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [tip: perf/urgent] perf/x86/intel/uncore: Fix IIO event constraints for Skylake Server 2021-11-15 9:03 ` [RESEND PATCH v2 2/3] Fix IIO event constraints for " alexander.antonov @ 2021-11-17 13:59 ` tip-bot2 for Alexander Antonov 0 siblings, 0 replies; 7+ messages in thread From: tip-bot2 for Alexander Antonov @ 2021-11-17 13:59 UTC (permalink / raw) To: linux-tip-commits Cc: Alexander Antonov, Peter Zijlstra (Intel), Kan Liang, x86, linux-kernel The following commit has been merged into the perf/urgent branch of tip: Commit-ID: 3866ae319c846a612109c008f43cba80b8c15e86 Gitweb: https://git.kernel.org/tip/3866ae319c846a612109c008f43cba80b8c15e86 Author: Alexander Antonov <alexander.antonov@linux.intel.com> AuthorDate: Mon, 15 Nov 2021 12:03:33 +03:00 Committer: Peter Zijlstra <peterz@infradead.org> CommitterDate: Wed, 17 Nov 2021 14:48:43 +01:00 perf/x86/intel/uncore: Fix IIO event constraints for Skylake Server According to the latest uncore document, COMP_BUF_OCCUPANCY (0xd5) event can be collected on 2-3 counters. Update uncore IIO event constraints for Skylake Server. Fixes: cd34cd97b7b4 ("perf/x86/intel/uncore: Add Skylake server uncore support") Signed-off-by: Alexander Antonov <alexander.antonov@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Link: https://lore.kernel.org/r/20211115090334.3789-3-alexander.antonov@linux.intel.com --- arch/x86/events/intel/uncore_snbep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index e5ee6bb..9aba4ef 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -3678,6 +3678,7 @@ static struct event_constraint skx_uncore_iio_constraints[] = { UNCORE_EVENT_CONSTRAINT(0xc0, 0xc), UNCORE_EVENT_CONSTRAINT(0xc5, 0xc), UNCORE_EVENT_CONSTRAINT(0xd4, 0xc), + UNCORE_EVENT_CONSTRAINT(0xd5, 0xc), EVENT_CONSTRAINT_END }; ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [RESEND PATCH v2 3/3] Fix IIO event constraints for Snowridge 2021-11-15 9:03 [RESEND PATCH v2 0/3] Several fixes for event constraints on SKX and SNR platforms alexander.antonov 2021-11-15 9:03 ` [RESEND PATCH v2 1/3] Fix filter_tid mask for CHA events on Skylake Server alexander.antonov 2021-11-15 9:03 ` [RESEND PATCH v2 2/3] Fix IIO event constraints for " alexander.antonov @ 2021-11-15 9:03 ` alexander.antonov 2021-11-17 13:59 ` [tip: perf/urgent] perf/x86/intel/uncore: " tip-bot2 for Alexander Antonov 2 siblings, 1 reply; 7+ messages in thread From: alexander.antonov @ 2021-11-15 9:03 UTC (permalink / raw) To: peterz, linux-kernel; +Cc: kan.liang, ak, alexey.v.bayduraev, alexander.antonov From: Alexander Antonov <alexander.antonov@linux.intel.com> According to the latest uncore document, DATA_REQ_OF_CPU (0x83), DATA_REQ_BY_CPU (0xc0) and COMP_BUF_OCCUPANCY (0xd5) events have constraints. Add uncore IIO constraints for Snowridge. Fixes: 210cc5f9db7a ("perf/x86/intel/uncore: Add uncore support for Snow Ridge server") Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Alexander Antonov <alexander.antonov@linux.intel.com> --- arch/x86/events/intel/uncore_snbep.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index 9aba4ef77b13..3660f698fb2a 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -4529,6 +4529,13 @@ static void snr_iio_cleanup_mapping(struct intel_uncore_type *type) pmu_iio_cleanup_mapping(type, &snr_iio_mapping_group); } +static struct event_constraint snr_uncore_iio_constraints[] = { + UNCORE_EVENT_CONSTRAINT(0x83, 0x3), + UNCORE_EVENT_CONSTRAINT(0xc0, 0xc), + UNCORE_EVENT_CONSTRAINT(0xd5, 0xc), + EVENT_CONSTRAINT_END +}; + static struct intel_uncore_type snr_uncore_iio = { .name = "iio", .num_counters = 4, @@ -4540,6 +4547,7 @@ static struct intel_uncore_type snr_uncore_iio = { .event_mask_ext = SNR_IIO_PMON_RAW_EVENT_MASK_EXT, .box_ctl = SNR_IIO_MSR_PMON_BOX_CTL, .msr_offset = SNR_IIO_MSR_OFFSET, + .constraints = snr_uncore_iio_constraints, .ops = &ivbep_uncore_msr_ops, .format_group = &snr_uncore_iio_format_group, .attr_update = snr_iio_attr_update, -- 2.21.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [tip: perf/urgent] perf/x86/intel/uncore: Fix IIO event constraints for Snowridge 2021-11-15 9:03 ` [RESEND PATCH v2 3/3] Fix IIO event constraints for Snowridge alexander.antonov @ 2021-11-17 13:59 ` tip-bot2 for Alexander Antonov 0 siblings, 0 replies; 7+ messages in thread From: tip-bot2 for Alexander Antonov @ 2021-11-17 13:59 UTC (permalink / raw) To: linux-tip-commits Cc: Alexander Antonov, Peter Zijlstra (Intel), Kan Liang, x86, linux-kernel The following commit has been merged into the perf/urgent branch of tip: Commit-ID: bdc0feee05174418dec1fa68de2af19e1750b99f Gitweb: https://git.kernel.org/tip/bdc0feee05174418dec1fa68de2af19e1750b99f Author: Alexander Antonov <alexander.antonov@linux.intel.com> AuthorDate: Mon, 15 Nov 2021 12:03:34 +03:00 Committer: Peter Zijlstra <peterz@infradead.org> CommitterDate: Wed, 17 Nov 2021 14:48:43 +01:00 perf/x86/intel/uncore: Fix IIO event constraints for Snowridge According to the latest uncore document, DATA_REQ_OF_CPU (0x83), DATA_REQ_BY_CPU (0xc0) and COMP_BUF_OCCUPANCY (0xd5) events have constraints. Add uncore IIO constraints for Snowridge. Fixes: 210cc5f9db7a ("perf/x86/intel/uncore: Add uncore support for Snow Ridge server") Signed-off-by: Alexander Antonov <alexander.antonov@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Link: https://lore.kernel.org/r/20211115090334.3789-4-alexander.antonov@linux.intel.com --- arch/x86/events/intel/uncore_snbep.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index 9aba4ef..3660f69 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -4529,6 +4529,13 @@ static void snr_iio_cleanup_mapping(struct intel_uncore_type *type) pmu_iio_cleanup_mapping(type, &snr_iio_mapping_group); } +static struct event_constraint snr_uncore_iio_constraints[] = { + UNCORE_EVENT_CONSTRAINT(0x83, 0x3), + UNCORE_EVENT_CONSTRAINT(0xc0, 0xc), + UNCORE_EVENT_CONSTRAINT(0xd5, 0xc), + EVENT_CONSTRAINT_END +}; + static struct intel_uncore_type snr_uncore_iio = { .name = "iio", .num_counters = 4, @@ -4540,6 +4547,7 @@ static struct intel_uncore_type snr_uncore_iio = { .event_mask_ext = SNR_IIO_PMON_RAW_EVENT_MASK_EXT, .box_ctl = SNR_IIO_MSR_PMON_BOX_CTL, .msr_offset = SNR_IIO_MSR_OFFSET, + .constraints = snr_uncore_iio_constraints, .ops = &ivbep_uncore_msr_ops, .format_group = &snr_uncore_iio_format_group, .attr_update = snr_iio_attr_update, ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-11-17 14:00 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-11-15 9:03 [RESEND PATCH v2 0/3] Several fixes for event constraints on SKX and SNR platforms alexander.antonov 2021-11-15 9:03 ` [RESEND PATCH v2 1/3] Fix filter_tid mask for CHA events on Skylake Server alexander.antonov 2021-11-17 13:59 ` [tip: perf/urgent] perf/x86/intel/uncore: " tip-bot2 for Alexander Antonov 2021-11-15 9:03 ` [RESEND PATCH v2 2/3] Fix IIO event constraints for " alexander.antonov 2021-11-17 13:59 ` [tip: perf/urgent] perf/x86/intel/uncore: " tip-bot2 for Alexander Antonov 2021-11-15 9:03 ` [RESEND PATCH v2 3/3] Fix IIO event constraints for Snowridge alexander.antonov 2021-11-17 13:59 ` [tip: perf/urgent] perf/x86/intel/uncore: " tip-bot2 for Alexander Antonov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).