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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 5D073C433E0 for ; Tue, 12 Jan 2021 07:23:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EBD9922CA2 for ; Tue, 12 Jan 2021 07:23:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388697AbhALHXq (ORCPT ); Tue, 12 Jan 2021 02:23:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388500AbhALHXq (ORCPT ); Tue, 12 Jan 2021 02:23:46 -0500 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FBDCC061575 for ; Mon, 11 Jan 2021 23:23:06 -0800 (PST) Received: by mail-pj1-x1036.google.com with SMTP id my11so424294pjb.1 for ; Mon, 11 Jan 2021 23:23:06 -0800 (PST) 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=WmlY6cB1KziWR4qZ1ENND6Ny3UeS1N+iTUZ1zXSZW5g=; b=bIyPU7ixJOkuVRan0CZeEbbek0ZZ22v8ccu2WZCuSxlDkn6wqgXZ+LXbYH7wtNpzWf k31NmGUPRicjifDZVg+8jveHZq5YGKConluAG0tuhOAkU/KuhOh4Tc5Y4LKSAUmv4Y4+ TQju0b+TyjTxc3YsK2tDtGWdUtKHWYgTiAkKJot6sWz8ANcu2yOxh5PAIoSc/Ne+gURi UuUDOjoIxFC4fVUqKNbF2V/YGMNWRUCbPshK1nUnxJcNI2NVYp6jbfE1FmbJpK9fL/Rm JzieM76v0G+5OSgOTzl89DWGrU/nFUwuyBasWcS2FwvY5rU6EJO4kFnz55q6aomTKWH0 uTTA== 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=WmlY6cB1KziWR4qZ1ENND6Ny3UeS1N+iTUZ1zXSZW5g=; b=mPsGTj+6TDs7WKaA+qQjwR1N7MRsskl/MhkTzb5FawQFBxEN12VwQE9yEFFy4CqH7+ WUveyGDHOjPnR1PiMcp7G6Vh/RQ0b5VLLjRU85vh4u2+TlzJLjSUYlIKdQ6B17720SnK TPK3cIDvfrPvgBaDGHOnEfspx9BE1Y+UQGgw9WLCkbnK9z1dqOgSctgW/ixshD5YSBx1 r4zQVCNsXa0Kv0pYtbqk6aYFzI9ql1g4Q7ZPHGjv+x+T96tAm3Q1BOqU9DxuPdg+AZd6 z/a+5KZJ6dtxhG4DhiPdQz3q7c+ARuhvgCX6lVzfHD2ZHWgHvebt0o5bBBFAJIHVKa8h xoXw== X-Gm-Message-State: AOAM5303CtQXRBUIXUtdygca9ZAIqbyeB3erbF+oqlXiqOmbzcG9OX59 8HPrDyxZjI5BMthG+IlHySxBUw== X-Google-Smtp-Source: ABdhPJwNnuAwInB8+SbAtG3x0KGldKuAwjsHAf8rAYwQyZm5xpl89DE+HU6zzOy6wiKQoto9RDML/A== X-Received: by 2002:a17:90b:3596:: with SMTP id mm22mr3112906pjb.235.1610436185536; Mon, 11 Jan 2021 23:23:05 -0800 (PST) Received: from leoy-ThinkPad-X240s ([202.155.204.36]) by smtp.gmail.com with ESMTPSA id mv17sm1420438pjb.17.2021.01.11.23.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jan 2021 23:23:04 -0800 (PST) Date: Tue, 12 Jan 2021 15:22:57 +0800 From: Leo Yan To: Mike Leach Cc: Arnaldo Carvalho de Melo , Mathieu Poirier , Suzuki K Poulose , Alexander Shishkin , John Garry , Will Deacon , Peter Zijlstra , Ingo Molnar , Mark Rutland , Jiri Olsa , Namhyung Kim , Daniel Kiss , Denis Nikitin , Coresight ML , linux-arm-kernel , Linux Kernel Mailing List , Al Grant Subject: Re: [PATCH v1 1/7] coresight: etm-perf: Add support for PID tracing for kernel at EL2 Message-ID: <20210112072257.GA18965@leoy-ThinkPad-X240s> References: <20210109074435.626855-1-leo.yan@linaro.org> <20210109074435.626855-2-leo.yan@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 11, 2021 at 04:22:39PM +0000, Mike Leach wrote: > Hi Leo, > > On Sat, 9 Jan 2021 at 07:44, Leo Yan wrote: > > > > From: Suzuki K Poulose > > > > When the kernel is running at EL2, the PID is stored in CONTEXTIDR_EL2. > > So, tracing CONTEXTIDR_EL1 doesn't give us the pid of the process. > > Thus we should trace the VMID with VMIDOPT set to trace > > CONTEXTIDR_EL2 instead of CONTEXTIDR_EL1. Given that we have an existing > > config option "contextid" and this will be useful for tracing > > virtual machines (when we get to support virtualization). So instead, > > this patch adds a new option, contextid_in_vmid as a separate config. > > Thus on an EL2 kernel, we will have two options available for > > the perf tool. However, to make it easier for the user to > > do pid tracing, we add a new format which will default to > > "contextid" (on EL1 kernel) or "contextid_in_vmid" (on EL2 > > kernel). So that the user doesn't have to bother which EL the > > kernel is running. > > > > i.e, perf record -e cs_etm/pid/u -- > > > > will always do the "pid" tracing, independent of the kernel EL. > > > > Also, the perf tool will be updated to automatically select > > "pid" config instead of the "contextid" for system wide/CPU wide > > mode. > > > > Cc: Mathieu Poirier > > Cc: Al Grant > > Cc: Mike Leach > > Signed-off-by: Suzuki K Poulose > > Signed-off-by: Leo Yan > > --- > > drivers/hwtracing/coresight/coresight-etm-perf.c | 14 ++++++++++++++ > > drivers/hwtracing/coresight/coresight-etm4x-core.c | 9 +++++++++ > > include/linux/coresight-pmu.h | 11 +++++++---- > > 3 files changed, 30 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c > > index bdc34ca449f7..f763def145e4 100644 > > --- a/drivers/hwtracing/coresight/coresight-etm-perf.c > > +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c > > @@ -30,14 +30,28 @@ static DEFINE_PER_CPU(struct coresight_device *, csdev_src); > > /* ETMv3.5/PTM's ETMCR is 'config' */ > > PMU_FORMAT_ATTR(cycacc, "config:" __stringify(ETM_OPT_CYCACC)); > > PMU_FORMAT_ATTR(contextid, "config:" __stringify(ETM_OPT_CTXTID)); > > +PMU_FORMAT_ATTR(contextid_in_vmid, "config:" __stringify(ETM_OPT_CTXTID_IN_VMID)); > > PMU_FORMAT_ATTR(timestamp, "config:" __stringify(ETM_OPT_TS)); > > PMU_FORMAT_ATTR(retstack, "config:" __stringify(ETM_OPT_RETSTK)); > > /* Sink ID - same for all ETMs */ > > PMU_FORMAT_ATTR(sinkid, "config2:0-31"); > > > > +static ssize_t format_attr_pid_show(struct device *dev, > > + struct device_attribute *attr, > > + char *page) > > +{ > > + int pid_fmt = is_kernel_in_hyp_mode() ? ETM_OPT_CTXTID_IN_VMID : ETM_OPT_CTXTID; > > + > > + return sprintf(page, "config:%d\n", pid_fmt); > > +} > > + > > +struct device_attribute format_attr_pid = __ATTR(pid, 0444, format_attr_pid_show, NULL); > > + > > static struct attribute *etm_config_formats_attr[] = { > > &format_attr_cycacc.attr, > > &format_attr_contextid.attr, > > + &format_attr_contextid_in_vmid.attr, > > + &format_attr_pid.attr, > > &format_attr_timestamp.attr, > > &format_attr_retstack.attr, > > &format_attr_sinkid.attr, > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > > index b20b6ff17cf6..8b7c7a8b2874 100644 > > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > > @@ -477,6 +477,15 @@ static int etm4_parse_event_config(struct etmv4_drvdata *drvdata, > > /* bit[6], Context ID tracing bit */ > > config->cfg |= BIT(ETM4_CFG_BIT_CTXTID); > > > > + /* Do not enable VMID tracing if we are not running in EL2 */ > > + if (attr->config & BIT(ETM_OPT_CTXTID_IN_VMID)) { > > + if (!is_kernel_in_hyp_mode()) { > > + ret = -EINVAL; > > + goto out; > > + } > > + config->cfg |= BIT(ETM4_CFG_BIT_VMID) | BIT(ETM4_CFG_BIT_VMID_OPT); > > + } > > + > > /* return stack - enable if selected and supported */ > > if ((attr->config & BIT(ETM_OPT_RETSTK)) && drvdata->retstack) > > /* bit[12], Return stack enable bit */ > > diff --git a/include/linux/coresight-pmu.h b/include/linux/coresight-pmu.h > > index b0e35eec6499..927c6285ce5d 100644 > > --- a/include/linux/coresight-pmu.h > > +++ b/include/linux/coresight-pmu.h > > @@ -11,16 +11,19 @@ > > #define CORESIGHT_ETM_PMU_SEED 0x10 > > > > /* ETMv3.5/PTM's ETMCR config bit */ > > -#define ETM_OPT_CYCACC 12 > > -#define ETM_OPT_CTXTID 14 > > -#define ETM_OPT_TS 28 > > -#define ETM_OPT_RETSTK 29 > > +#define ETM_OPT_CYCACC 12 > > +#define ETM_OPT_CTXTID 14 > > +#define ETM_OPT_CTXTID_IN_VMID 15 > > Minor issue here - ETMv3.x / PTM cannot trace CXTID in VMID so this > may better be named ETM4_OPT_CTXTID_IN_VMID, rather than be grouped > with the ETM3.5 options? Will fix it. Thanks for pointing out. > Regards > > Mike > > > +#define ETM_OPT_TS 28 > > +#define ETM_OPT_RETSTK 29 > > > > /* ETMv4 CONFIGR programming bits for the ETM OPTs */ > > #define ETM4_CFG_BIT_CYCACC 4 > > #define ETM4_CFG_BIT_CTXTID 6 > > +#define ETM4_CFG_BIT_VMID 7 > > #define ETM4_CFG_BIT_TS 11 > > #define ETM4_CFG_BIT_RETSTK 12 > > +#define ETM4_CFG_BIT_VMID_OPT 15 > > > > static inline int coresight_get_trace_id(int cpu) > > { > > -- > > 2.25.1 > > > > > -- > Mike Leach > Principal Engineer, ARM Ltd. > Manchester Design Centre. UK 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=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 DDD2EC433DB for ; Tue, 12 Jan 2021 07:24:52 +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 71C2822B30 for ; Tue, 12 Jan 2021 07:24:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 71C2822B30 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=b4vsS/uZBkYlefxlEOcVMPanFg5PUPi0nRY7YN4cSIE=; b=rWaU+k8TDBwDj6aD7Su8EU5n1 JnfNOOaVYAOXyTT8pETw1mjXEjTgq8K33f1467Pwkn0VTwvNQI2ivG7fU6RUkDKIs0csIngsnnfE8 Z3kOPA9PTy3/2mCwtp1oE88IxT38lIzwKZUJkm1zhmmmbgOC4xEQcUoKdnPqkDhPLw/uRGPcAmO9f BGL+W0/NRqb9chTytRePZx0HCRWRPwSAOGEjWjKUPuCMO1TeRAYl9tHNkwupg1mPs2YfRl2y2XoOw XAO4/rR7NXhQLFxvlsmTOpkNYeou2Oj1L5Kg1b6io7S19vRFt5o9bjJwF1gI0uht7CzuTJjKo4/2R ojuOKR0HQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzE1K-0007CM-Eh; Tue, 12 Jan 2021 07:23:14 +0000 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzE1F-0007AL-Rk for linux-arm-kernel@lists.infradead.org; Tue, 12 Jan 2021 07:23:11 +0000 Received: by mail-pj1-x1030.google.com with SMTP id w1so1144005pjc.0 for ; Mon, 11 Jan 2021 23:23:07 -0800 (PST) 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=WmlY6cB1KziWR4qZ1ENND6Ny3UeS1N+iTUZ1zXSZW5g=; b=bIyPU7ixJOkuVRan0CZeEbbek0ZZ22v8ccu2WZCuSxlDkn6wqgXZ+LXbYH7wtNpzWf k31NmGUPRicjifDZVg+8jveHZq5YGKConluAG0tuhOAkU/KuhOh4Tc5Y4LKSAUmv4Y4+ TQju0b+TyjTxc3YsK2tDtGWdUtKHWYgTiAkKJot6sWz8ANcu2yOxh5PAIoSc/Ne+gURi UuUDOjoIxFC4fVUqKNbF2V/YGMNWRUCbPshK1nUnxJcNI2NVYp6jbfE1FmbJpK9fL/Rm JzieM76v0G+5OSgOTzl89DWGrU/nFUwuyBasWcS2FwvY5rU6EJO4kFnz55q6aomTKWH0 uTTA== 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=WmlY6cB1KziWR4qZ1ENND6Ny3UeS1N+iTUZ1zXSZW5g=; b=F0YUAKIpN/Bc3T1LLpTO+MhpNyz0VtGbb0iJn7U/R+8DbsTR5oCEasrpNL40/hTFSj z4jMdxpy7HIEX/3RaGIDDb+LeTIwQlJk+C3tByjpwny162EyiY+RdioXedu25PuhkICv WEuX5frcxBX2ZNddrFom98lYEkXqTYeVei7oGlgX9wLg3QQOLtfVyS4Pq4aif0p9Fljl Wj3hfCoeGUfQUhn+g5BSrMFAhhKtawXLKCEibI8JPMuIQj7wFCkd5AUKJ8JFbknxgs31 DguF4nf6jvh3Dv1K+Jzikr/kz2AFxL1Z5ACgcDNDYjb7qO2d8AWA1sjzaGkIuscGfcnM dJrg== X-Gm-Message-State: AOAM532XF18cN4NYLCcPTnij1ehwVLiAkjI9DgPh/tychQKVzqpMo2w3 PLCyRq5sJgeTNSqIGV++qfaMPQ== X-Google-Smtp-Source: ABdhPJwNnuAwInB8+SbAtG3x0KGldKuAwjsHAf8rAYwQyZm5xpl89DE+HU6zzOy6wiKQoto9RDML/A== X-Received: by 2002:a17:90b:3596:: with SMTP id mm22mr3112906pjb.235.1610436185536; Mon, 11 Jan 2021 23:23:05 -0800 (PST) Received: from leoy-ThinkPad-X240s ([202.155.204.36]) by smtp.gmail.com with ESMTPSA id mv17sm1420438pjb.17.2021.01.11.23.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jan 2021 23:23:04 -0800 (PST) Date: Tue, 12 Jan 2021 15:22:57 +0800 From: Leo Yan To: Mike Leach Subject: Re: [PATCH v1 1/7] coresight: etm-perf: Add support for PID tracing for kernel at EL2 Message-ID: <20210112072257.GA18965@leoy-ThinkPad-X240s> References: <20210109074435.626855-1-leo.yan@linaro.org> <20210109074435.626855-2-leo.yan@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210112_022310_245296_00A9D350 X-CRM114-Status: GOOD ( 34.94 ) 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: Mark Rutland , Al Grant , Denis Nikitin , Mathieu Poirier , Suzuki K Poulose , Alexander Shishkin , Jiri Olsa , Coresight ML , John Garry , Linux Kernel Mailing List , Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar , Namhyung Kim , Will Deacon , linux-arm-kernel , Daniel Kiss 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 Mon, Jan 11, 2021 at 04:22:39PM +0000, Mike Leach wrote: > Hi Leo, > > On Sat, 9 Jan 2021 at 07:44, Leo Yan wrote: > > > > From: Suzuki K Poulose > > > > When the kernel is running at EL2, the PID is stored in CONTEXTIDR_EL2. > > So, tracing CONTEXTIDR_EL1 doesn't give us the pid of the process. > > Thus we should trace the VMID with VMIDOPT set to trace > > CONTEXTIDR_EL2 instead of CONTEXTIDR_EL1. Given that we have an existing > > config option "contextid" and this will be useful for tracing > > virtual machines (when we get to support virtualization). So instead, > > this patch adds a new option, contextid_in_vmid as a separate config. > > Thus on an EL2 kernel, we will have two options available for > > the perf tool. However, to make it easier for the user to > > do pid tracing, we add a new format which will default to > > "contextid" (on EL1 kernel) or "contextid_in_vmid" (on EL2 > > kernel). So that the user doesn't have to bother which EL the > > kernel is running. > > > > i.e, perf record -e cs_etm/pid/u -- > > > > will always do the "pid" tracing, independent of the kernel EL. > > > > Also, the perf tool will be updated to automatically select > > "pid" config instead of the "contextid" for system wide/CPU wide > > mode. > > > > Cc: Mathieu Poirier > > Cc: Al Grant > > Cc: Mike Leach > > Signed-off-by: Suzuki K Poulose > > Signed-off-by: Leo Yan > > --- > > drivers/hwtracing/coresight/coresight-etm-perf.c | 14 ++++++++++++++ > > drivers/hwtracing/coresight/coresight-etm4x-core.c | 9 +++++++++ > > include/linux/coresight-pmu.h | 11 +++++++---- > > 3 files changed, 30 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c > > index bdc34ca449f7..f763def145e4 100644 > > --- a/drivers/hwtracing/coresight/coresight-etm-perf.c > > +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c > > @@ -30,14 +30,28 @@ static DEFINE_PER_CPU(struct coresight_device *, csdev_src); > > /* ETMv3.5/PTM's ETMCR is 'config' */ > > PMU_FORMAT_ATTR(cycacc, "config:" __stringify(ETM_OPT_CYCACC)); > > PMU_FORMAT_ATTR(contextid, "config:" __stringify(ETM_OPT_CTXTID)); > > +PMU_FORMAT_ATTR(contextid_in_vmid, "config:" __stringify(ETM_OPT_CTXTID_IN_VMID)); > > PMU_FORMAT_ATTR(timestamp, "config:" __stringify(ETM_OPT_TS)); > > PMU_FORMAT_ATTR(retstack, "config:" __stringify(ETM_OPT_RETSTK)); > > /* Sink ID - same for all ETMs */ > > PMU_FORMAT_ATTR(sinkid, "config2:0-31"); > > > > +static ssize_t format_attr_pid_show(struct device *dev, > > + struct device_attribute *attr, > > + char *page) > > +{ > > + int pid_fmt = is_kernel_in_hyp_mode() ? ETM_OPT_CTXTID_IN_VMID : ETM_OPT_CTXTID; > > + > > + return sprintf(page, "config:%d\n", pid_fmt); > > +} > > + > > +struct device_attribute format_attr_pid = __ATTR(pid, 0444, format_attr_pid_show, NULL); > > + > > static struct attribute *etm_config_formats_attr[] = { > > &format_attr_cycacc.attr, > > &format_attr_contextid.attr, > > + &format_attr_contextid_in_vmid.attr, > > + &format_attr_pid.attr, > > &format_attr_timestamp.attr, > > &format_attr_retstack.attr, > > &format_attr_sinkid.attr, > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > > index b20b6ff17cf6..8b7c7a8b2874 100644 > > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > > @@ -477,6 +477,15 @@ static int etm4_parse_event_config(struct etmv4_drvdata *drvdata, > > /* bit[6], Context ID tracing bit */ > > config->cfg |= BIT(ETM4_CFG_BIT_CTXTID); > > > > + /* Do not enable VMID tracing if we are not running in EL2 */ > > + if (attr->config & BIT(ETM_OPT_CTXTID_IN_VMID)) { > > + if (!is_kernel_in_hyp_mode()) { > > + ret = -EINVAL; > > + goto out; > > + } > > + config->cfg |= BIT(ETM4_CFG_BIT_VMID) | BIT(ETM4_CFG_BIT_VMID_OPT); > > + } > > + > > /* return stack - enable if selected and supported */ > > if ((attr->config & BIT(ETM_OPT_RETSTK)) && drvdata->retstack) > > /* bit[12], Return stack enable bit */ > > diff --git a/include/linux/coresight-pmu.h b/include/linux/coresight-pmu.h > > index b0e35eec6499..927c6285ce5d 100644 > > --- a/include/linux/coresight-pmu.h > > +++ b/include/linux/coresight-pmu.h > > @@ -11,16 +11,19 @@ > > #define CORESIGHT_ETM_PMU_SEED 0x10 > > > > /* ETMv3.5/PTM's ETMCR config bit */ > > -#define ETM_OPT_CYCACC 12 > > -#define ETM_OPT_CTXTID 14 > > -#define ETM_OPT_TS 28 > > -#define ETM_OPT_RETSTK 29 > > +#define ETM_OPT_CYCACC 12 > > +#define ETM_OPT_CTXTID 14 > > +#define ETM_OPT_CTXTID_IN_VMID 15 > > Minor issue here - ETMv3.x / PTM cannot trace CXTID in VMID so this > may better be named ETM4_OPT_CTXTID_IN_VMID, rather than be grouped > with the ETM3.5 options? Will fix it. Thanks for pointing out. > Regards > > Mike > > > +#define ETM_OPT_TS 28 > > +#define ETM_OPT_RETSTK 29 > > > > /* ETMv4 CONFIGR programming bits for the ETM OPTs */ > > #define ETM4_CFG_BIT_CYCACC 4 > > #define ETM4_CFG_BIT_CTXTID 6 > > +#define ETM4_CFG_BIT_VMID 7 > > #define ETM4_CFG_BIT_TS 11 > > #define ETM4_CFG_BIT_RETSTK 12 > > +#define ETM4_CFG_BIT_VMID_OPT 15 > > > > static inline int coresight_get_trace_id(int cpu) > > { > > -- > > 2.25.1 > > > > > -- > Mike Leach > Principal Engineer, ARM Ltd. > Manchester Design Centre. UK _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel