From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9812EC433DF for ; Thu, 27 Aug 2020 20:12:02 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5CDE820737 for ; Thu, 27 Aug 2020 20:12:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nl+Wc7ZT"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="NtH6YSHZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CDE820737 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=5QYmY+RYPB+Bw44g3qC0wcmC6yXfTQsquWbJs6iR6PY=; b=nl+Wc7ZTooapIBlX5Ob+hsYMH YDwZKO5iLp5bu/Q2mdTCxH7iFDOGvJLM5KhJVJiSyfmopxjuKX6sdC7qYM2FGtuEmCMspia0ZFtL7 8/hk8HuO8zwuvWrCUIN+gBv+Zuw0a40jf/EEu1Ne0Opq8W4cuihQy7RoCYQumK7ezHGPo3GXwh76D 5IrN6FBeOVlIulaFVR4HaLEHvaU2q8DQOMjeyuDwcM9XAF3iUomeVwyZ9sjUIYh8ZQE7ZhnBcHhUD hcStFOtM68o8CpAj277JfYBry2Jwl2t+u6kRVSuyVetdfKuUBZiddjbaXv8e6C4hTrXqd6fPLPC6s /aR2BrFhQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kBOE8-0005Aw-BK; Thu, 27 Aug 2020 20:10:28 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kBODv-00053V-UA for linux-arm-kernel@lists.infradead.org; Thu, 27 Aug 2020 20:10:17 +0000 Received: by mail-pg1-x544.google.com with SMTP id 67so4122444pgd.12 for ; Thu, 27 Aug 2020 13:10:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=dSJORfYlwdW9ebGULcGhNPyXS9X/kJkWM2NTDkBVC/4=; b=NtH6YSHZJmPiPlR0xhHCbw1Rwsjpe7ZUccMFEEcVtAkkXjAwwBm/9xeuiGWHGbVAWN rX82pRd45JzlHYZSD4gKpxL+c/Gx4bT2sM0xPhAr1OQSSL/1fYYxrkCyCPdaUclxopRd bbpdf8A+i32BBnYurjqrWCnC9CumZwnBfVdKvh+GG1hFKm34aj53SoJsfsHycN0iqfYs qwheLfdMmT0JnJgODDmGWX6hY0x6OGet3vNClB0/5+3guRaElEqXBkJMxfvlTuEGnc+r fzfDJSQqI0MYSQHGQWtJOi6vdJm6arG124CqDLeogV74xxhh9O0i3mCz1+224xJHh/hH lB5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=dSJORfYlwdW9ebGULcGhNPyXS9X/kJkWM2NTDkBVC/4=; b=EQjxgF15YoR+WnNCPyuaxmxsuyMNqbigXmZ8zEBdLDbyPcJb/YrTcUHQhcnT4yje1O Gv/KKfSGTjZ0473tHr+TK0hMPa0Sxc6rb6028FE3AUMB1RzytJjEub4kWaMKK9nWhkN5 p2lxVKQthXN8IZMdPCdBrKIXR04XT9tQ6BDhwduZkFFNfvAfCBGQqfpkfZhNhx+4dO75 3OSVCsL/P8Coomcd6+iNDCxXBuGlMTCj23sNn8htTAqKpOLjtFblCCrOCLZbHMdxM8PA Tcv8KP/ZE+Du2g0LRkWihxCRtRvfnZRyVEIPET15WTdN3K0V4UneWEdTGZBpTMaCyw96 l6uA== X-Gm-Message-State: AOAM5307ziwh55KjkBxGotaq5jaUd0+qKO1ihKLQbWCbOqtd+p/Pdetw pHGLTaRVdsASOV0OyAjN6cFtMA== X-Google-Smtp-Source: ABdhPJx5XsLep1q32eaWQaTov0MftdwfIQ29zNOH5W0pGRVcRigBhFrE5buwRCxqTxqrevPlyKoc0g== X-Received: by 2002:aa7:9af1:: with SMTP id y17mr166856pfp.178.1598559013296; Thu, 27 Aug 2020 13:10:13 -0700 (PDT) Received: from xps15 (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id f17sm3748936pfq.67.2020.08.27.13.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2020 13:10:12 -0700 (PDT) Date: Thu, 27 Aug 2020 14:10:10 -0600 From: Mathieu Poirier To: Mike Leach Subject: Re: [PATCH v2 1/1] coresight: etm4x: Ensure default perf settings filter user/kernel Message-ID: <20200827201010.GC22307@xps15> References: <20200819211015.28448-1-mike.leach@linaro.org> <20200819211015.28448-2-mike.leach@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200819211015.28448-2-mike.leach@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200827_161016_320408_26127A9B X-CRM114-Status: GOOD ( 25.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: coresight@lists.linaro.org, suzuki.poulose@arm.com, linux-arm-kernel@lists.infradead.org, leo.yan@linaro.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 > Signed-off-by: Mike Leach > Reviewed-by: Leo Yan > Tested-by: Leo Yan > --- 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