* [PATCH v2 0/1] coresight: etm4x: Fix kernel / user space filtering in perf @ 2020-08-19 21:10 Mike Leach 2020-08-19 21:10 ` [PATCH v2 1/1] coresight: etm4x: Ensure default perf settings filter user/kernel Mike Leach 0 siblings, 1 reply; 3+ messages in thread From: Mike Leach @ 2020-08-19 21:10 UTC (permalink / raw) To: linux-arm-kernel, coresight, mathieu.poirier, leo.yan Cc: Mike Leach, suzuki.poulose Kernel / User mode filtering was relying on side effect of access control of default full address range filtering. This now uses the main control register to remove dependency on address filter being present as default setting. Changes since v1: 1. created helper fn to set filter values & improved comment. 2. added fix to sysfs mode settings Mike Leach (1): coresight: etm4x: Ensure default perf settings filter user/kernel drivers/hwtracing/coresight/coresight-etm4x.c | 32 +++++++++++++------ drivers/hwtracing/coresight/coresight-etm4x.h | 3 ++ 2 files changed, 25 insertions(+), 10 deletions(-) -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 1/1] coresight: etm4x: Ensure default perf settings filter user/kernel 2020-08-19 21:10 [PATCH v2 0/1] coresight: etm4x: Fix kernel / user space filtering in perf Mike Leach @ 2020-08-19 21:10 ` Mike Leach 2020-08-27 20:10 ` Mathieu Poirier 0 siblings, 1 reply; 3+ messages in thread From: Mike Leach @ 2020-08-19 21:10 UTC (permalink / raw) To: linux-arm-kernel, coresight, mathieu.poirier, leo.yan Cc: Mike Leach, suzuki.poulose Moving from using an address filter to trace the default "all addresses" range to no filtering to acheive the same result, has caused the perf filtering of kernel/user address spaces from not working unless an explicit address filter was used. This is due to the original code using a side-effect of the address filtering rather than setting the global TRCVICTLR exception level filtering. The use of the mode sysfs file is also similarly affected. A helper function is added to fix both instances. Fixes: ae2041510d5d5 ("coresight: etmv4: Update default filter and initialisation") Reported-by: Leo Yan <leo.yan@linaro.org> Signed-off-by: Mike Leach <mike.leach@linaro.org> Reviewed-by: Leo Yan <leo.yan@linaro.org> Tested-by: Leo Yan <leo.yan@linaro.org> --- drivers/hwtracing/coresight/coresight-etm4x.c | 32 +++++++++++++------ drivers/hwtracing/coresight/coresight-etm4x.h | 3 ++ 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index 8b0634ebef77..522ff5418a35 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -52,6 +52,7 @@ static struct etmv4_drvdata *etmdrvdata[NR_CPUS]; static void etm4_set_default_config(struct etmv4_config *config); static int etm4_set_event_filters(struct etmv4_drvdata *drvdata, struct perf_event *event); +static u64 etm4_get_access_type(struct etmv4_config *config); static enum cpuhp_state hp_online; @@ -783,6 +784,22 @@ static void etm4_init_arch_data(void *info) CS_LOCK(drvdata->base); } +/* Set ELx trace filter access in the TRCVICTLR register */ +static void etm4_set_victlr_access(struct etmv4_config *config) +{ + u64 access_type; + + config->vinst_ctrl &= ~(ETM_EXLEVEL_S_VICTLR_MASK | ETM_EXLEVEL_NS_VICTLR_MASK); + + /* + * TRCVICTLR::EXLEVEL_NS:EXLEVELS: Set kernel / user filtering + * bits in vinst_ctrl, same bit pattern as TRCACATRn values returned by + * etm4_get_access_type() but with a relative shift in this register. + */ + access_type = etm4_get_access_type(config) << ETM_EXLEVEL_LSHIFT_TRCVICTLR; + config->vinst_ctrl |= (u32)access_type; +} + static void etm4_set_default_config(struct etmv4_config *config) { /* disable all events tracing */ @@ -800,6 +817,9 @@ static void etm4_set_default_config(struct etmv4_config *config) /* TRCVICTLR::EVENT = 0x01, select the always on logic */ config->vinst_ctrl = BIT(0); + + /* TRCVICTLR::EXLEVEL_NS:EXLEVELS: Set kernel / user filtering */ + etm4_set_victlr_access(config); } static u64 etm4_get_ns_access_type(struct etmv4_config *config) @@ -1064,7 +1084,7 @@ static int etm4_set_event_filters(struct etmv4_drvdata *drvdata, void etm4_config_trace_mode(struct etmv4_config *config) { - u32 addr_acc, mode; + u32 mode; mode = config->mode; mode &= (ETM_MODE_EXCL_KERN | ETM_MODE_EXCL_USER); @@ -1076,15 +1096,7 @@ void etm4_config_trace_mode(struct etmv4_config *config) if (!(mode & ETM_MODE_EXCL_KERN) && !(mode & ETM_MODE_EXCL_USER)) return; - addr_acc = config->addr_acc[ETM_DEFAULT_ADDR_COMP]; - /* clear default config */ - addr_acc &= ~(ETM_EXLEVEL_NS_APP | ETM_EXLEVEL_NS_OS | - ETM_EXLEVEL_NS_HYP); - - addr_acc |= etm4_get_ns_access_type(config); - - config->addr_acc[ETM_DEFAULT_ADDR_COMP] = addr_acc; - config->addr_acc[ETM_DEFAULT_ADDR_COMP + 1] = addr_acc; + etm4_set_victlr_access(config); } static int etm4_online_cpu(unsigned int cpu) diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h index b8283e1d6d88..5259f96fd28a 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.h +++ b/drivers/hwtracing/coresight/coresight-etm4x.h @@ -192,6 +192,9 @@ #define ETM_EXLEVEL_NS_HYP BIT(14) #define ETM_EXLEVEL_NS_NA BIT(15) +/* access level control in TRCVICTLR - same bits as TRCACATRn but shifted */ +#define ETM_EXLEVEL_LSHIFT_TRCVICTLR 8 + /* secure / non secure masks - TRCVICTLR, IDR3 */ #define ETM_EXLEVEL_S_VICTLR_MASK GENMASK(19, 16) /* NS MON (EL3) mode never implemented */ -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/1] coresight: etm4x: Ensure default perf settings filter user/kernel 2020-08-19 21:10 ` [PATCH v2 1/1] coresight: etm4x: Ensure default perf settings filter user/kernel Mike Leach @ 2020-08-27 20:10 ` Mathieu Poirier 0 siblings, 0 replies; 3+ messages in thread From: Mathieu Poirier @ 2020-08-27 20:10 UTC (permalink / raw) To: Mike Leach; +Cc: coresight, suzuki.poulose, linux-arm-kernel, leo.yan On Wed, Aug 19, 2020 at 10:10:15PM +0100, Mike Leach wrote: > Moving from using an address filter to trace the default "all addresses" > range to no filtering to acheive the same result, has caused the perf > filtering of kernel/user address spaces from not working unless an > explicit address filter was used. > > This is due to the original code using a side-effect of the address > filtering rather than setting the global TRCVICTLR exception level > filtering. > > The use of the mode sysfs file is also similarly affected. > > A helper function is added to fix both instances. > > Fixes: ae2041510d5d5 ("coresight: etmv4: Update default filter and initialisation") > Reported-by: Leo Yan <leo.yan@linaro.org> > Signed-off-by: Mike Leach <mike.leach@linaro.org> > Reviewed-by: Leo Yan <leo.yan@linaro.org> > Tested-by: Leo Yan <leo.yan@linaro.org> > --- Applied Thanks, Mathieu > drivers/hwtracing/coresight/coresight-etm4x.c | 32 +++++++++++++------ > drivers/hwtracing/coresight/coresight-etm4x.h | 3 ++ > 2 files changed, 25 insertions(+), 10 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c > index 8b0634ebef77..522ff5418a35 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x.c > @@ -52,6 +52,7 @@ static struct etmv4_drvdata *etmdrvdata[NR_CPUS]; > static void etm4_set_default_config(struct etmv4_config *config); > static int etm4_set_event_filters(struct etmv4_drvdata *drvdata, > struct perf_event *event); > +static u64 etm4_get_access_type(struct etmv4_config *config); > > static enum cpuhp_state hp_online; > > @@ -783,6 +784,22 @@ static void etm4_init_arch_data(void *info) > CS_LOCK(drvdata->base); > } > > +/* Set ELx trace filter access in the TRCVICTLR register */ > +static void etm4_set_victlr_access(struct etmv4_config *config) > +{ > + u64 access_type; > + > + config->vinst_ctrl &= ~(ETM_EXLEVEL_S_VICTLR_MASK | ETM_EXLEVEL_NS_VICTLR_MASK); > + > + /* > + * TRCVICTLR::EXLEVEL_NS:EXLEVELS: Set kernel / user filtering > + * bits in vinst_ctrl, same bit pattern as TRCACATRn values returned by > + * etm4_get_access_type() but with a relative shift in this register. > + */ > + access_type = etm4_get_access_type(config) << ETM_EXLEVEL_LSHIFT_TRCVICTLR; > + config->vinst_ctrl |= (u32)access_type; > +} > + > static void etm4_set_default_config(struct etmv4_config *config) > { > /* disable all events tracing */ > @@ -800,6 +817,9 @@ static void etm4_set_default_config(struct etmv4_config *config) > > /* TRCVICTLR::EVENT = 0x01, select the always on logic */ > config->vinst_ctrl = BIT(0); > + > + /* TRCVICTLR::EXLEVEL_NS:EXLEVELS: Set kernel / user filtering */ > + etm4_set_victlr_access(config); > } > > static u64 etm4_get_ns_access_type(struct etmv4_config *config) > @@ -1064,7 +1084,7 @@ static int etm4_set_event_filters(struct etmv4_drvdata *drvdata, > > void etm4_config_trace_mode(struct etmv4_config *config) > { > - u32 addr_acc, mode; > + u32 mode; > > mode = config->mode; > mode &= (ETM_MODE_EXCL_KERN | ETM_MODE_EXCL_USER); > @@ -1076,15 +1096,7 @@ void etm4_config_trace_mode(struct etmv4_config *config) > if (!(mode & ETM_MODE_EXCL_KERN) && !(mode & ETM_MODE_EXCL_USER)) > return; > > - addr_acc = config->addr_acc[ETM_DEFAULT_ADDR_COMP]; > - /* clear default config */ > - addr_acc &= ~(ETM_EXLEVEL_NS_APP | ETM_EXLEVEL_NS_OS | > - ETM_EXLEVEL_NS_HYP); > - > - addr_acc |= etm4_get_ns_access_type(config); > - > - config->addr_acc[ETM_DEFAULT_ADDR_COMP] = addr_acc; > - config->addr_acc[ETM_DEFAULT_ADDR_COMP + 1] = addr_acc; > + etm4_set_victlr_access(config); > } > > static int etm4_online_cpu(unsigned int cpu) > diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h > index b8283e1d6d88..5259f96fd28a 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.h > +++ b/drivers/hwtracing/coresight/coresight-etm4x.h > @@ -192,6 +192,9 @@ > #define ETM_EXLEVEL_NS_HYP BIT(14) > #define ETM_EXLEVEL_NS_NA BIT(15) > > +/* access level control in TRCVICTLR - same bits as TRCACATRn but shifted */ > +#define ETM_EXLEVEL_LSHIFT_TRCVICTLR 8 > + > /* secure / non secure masks - TRCVICTLR, IDR3 */ > #define ETM_EXLEVEL_S_VICTLR_MASK GENMASK(19, 16) > /* NS MON (EL3) mode never implemented */ > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-27 20:12 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-08-19 21:10 [PATCH v2 0/1] coresight: etm4x: Fix kernel / user space filtering in perf Mike Leach 2020-08-19 21:10 ` [PATCH v2 1/1] coresight: etm4x: Ensure default perf settings filter user/kernel Mike Leach 2020-08-27 20:10 ` Mathieu Poirier
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).