From patchwork Wed Dec 4 04:40:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Adrien_Verg=C3=A9?= X-Patchwork-Id: 296391 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 109652C007E for ; Wed, 4 Dec 2013 15:42:14 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vo4HH-00088I-Oc; Wed, 04 Dec 2013 04:41:36 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vo4H5-00026R-LE; Wed, 04 Dec 2013 04:41:23 +0000 Received: from mail-ve0-x231.google.com ([2607:f8b0:400c:c01::231]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vo4H2-000254-Ip for linux-arm-kernel@lists.infradead.org; Wed, 04 Dec 2013 04:41:21 +0000 Received: by mail-ve0-f177.google.com with SMTP id db12so11202037veb.22 for ; Tue, 03 Dec 2013 20:40:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=dMeb+WqW7jUM9pEIcHASIB7Dw1Pww4SaHGqd1oo0nX4=; b=alQ2gGcOUhVgPvzavBnKsuk9Rv09n1bcZ6o47Od8tCRKe+V6e7nzyaNHtfKKzBqKW3 ZEEqHz9+UTL/VgHZyb2+/pdu/eS0YglIeXgYA/bJk8hv9Qp05w305d8UoNYGI+kFccK8 5dFz0HokyHO29NTi5Kotm0RDjiErCVgtrEeQOaDQrzCOw6EOxmtMZ4WYhGgqYmdh43Cw NHcszjyF0Mhxjpk2koWmU9k9hw+UQtfU52GGnK6F4kwPvfBdvnNzGDJtj/0YXX3IUhtU zdS/x2R4iAAuXJHMNR/rLcU9+6SUBBSG6CnwWYaCGR4uEXCOFrZXu8/bkAVLwX3ez+uW CMqA== MIME-Version: 1.0 X-Received: by 10.52.165.131 with SMTP id yy3mr6769084vdb.25.1386132059472; Tue, 03 Dec 2013 20:40:59 -0800 (PST) Received: by 10.220.158.201 with HTTP; Tue, 3 Dec 2013 20:40:59 -0800 (PST) Date: Tue, 3 Dec 2013 23:40:59 -0500 Message-ID: Subject: [PATCH 3/3] ARM Coresight: Add PID control support for ETM tracing From: =?UTF-8?Q?Adrien_Verg=C3=A9?= To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131203_234120_734506_29EA2C15 X-CRM114-Status: GOOD ( 19.88 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (adrienverge[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Russell King , Greg Kroah-Hartman , Randy Dunlap , Will Deacon , Ben Dooks , Andrew Morton , Dietmar Eggemann , "zhangwei\(Jovi\)" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org In the same manner as for enabling tracing, an entry is created in sysfs to set the PID that triggers tracing. This change requires CONFIG_PID_IN_CONTEXTIDR to be set when using on-chip ETM. Signed-off-by: Adrien Vergé Cc: Russell King Cc: Ben Dooks Cc: Will Deacon Cc: Dietmar Eggemann Cc: Andrew Morton Cc: "zhangwei(Jovi)" Cc: Greg Kroah-Hartman Cc: Randy Dunlap --- arch/arm/Kconfig.debug | 1 + arch/arm/include/asm/hardware/coresight.h | 3 ++ arch/arm/kernel/etm.c | 73 ++++++++++++++++++++++++++++--- 3 files changed, 70 insertions(+), 7 deletions(-) (void)etm_readl(t, ETMMR_PDSR); @@ -608,6 +661,7 @@ static int etm_probe(struct amba_device *dev, const struct amba_id *id) (void)etm_readl(&tracer, ETMMR_OSSRR); t->naddrcmppairs = etm_readl(t, ETMR_CONFCODE) & 0xf; + t->nctxidcmp = (etm_readl(t, ETMR_CONFCODE) >> 24) & 0x3; etm_writel(t, 0x440, ETMR_CTRL); etm_lock(t); @@ -616,7 +670,7 @@ static int etm_probe(struct amba_device *dev, const struct amba_id *id) if (ret) goto out_unmap; - /* failing to create any of these three is not fatal */ + /* failing to create any of these four is not fatal */ ret = sysfs_create_file(&dev->dev.kobj, &trace_info_attr.attr); if (ret) dev_dbg(&dev->dev, "Failed to create trace_info in sysfs\n"); @@ -629,6 +683,10 @@ static int etm_probe(struct amba_device *dev, const struct amba_id *id) if (ret) dev_dbg(&dev->dev, "Failed to create trace_addrrange in sysfs\n"); + ret = sysfs_create_file(&dev->dev.kobj, &trace_pid_attr.attr); + if (ret) + dev_dbg(&dev->dev, "Failed to create trace_pid in sysfs\n"); + dev_dbg(t->dev, "ETM AMBA driver initialized.\n"); out: @@ -659,6 +717,7 @@ static int etm_remove(struct amba_device *dev) sysfs_remove_file(&dev->dev.kobj, &trace_info_attr.attr); sysfs_remove_file(&dev->dev.kobj, &trace_mode_attr.attr); sysfs_remove_file(&dev->dev.kobj, &trace_addrrange_attr.attr); + sysfs_remove_file(&dev->dev.kobj, &trace_pid_attr.attr); return 0; } diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 5765abf..fef32e15 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1130,6 +1130,7 @@ config EARLY_PRINTK config OC_ETM bool "On-chip ETM and ETB" depends on ARM_AMBA + select PID_IN_CONTEXTIDR help Enables the on-chip embedded trace macrocell and embedded trace buffer driver that will allow you to collect traces of the diff --git a/arch/arm/include/asm/hardware/coresight.h b/arch/arm/include/asm/hardware/coresight.h index 8c50cf6..009cdf9 100644 --- a/arch/arm/include/asm/hardware/coresight.h +++ b/arch/arm/include/asm/hardware/coresight.h @@ -98,6 +98,9 @@ #define ETMR_ADDRCOMP_VAL(x) (0x40 + (x) * 4) #define ETMR_ADDRCOMP_ACC_TYPE(x) (0x80 + (x) * 4) +#define ETMR_CTXIDCOMP_VAL(x) (0x1b0 + (x) * 4) +#define ETMR_CTXIDCOMP_MASK (0x1bc) + /* ETM status register, "ETM Architecture", 3.3.2 */ #define ETMR_STATUS (0x10) #define ETMST_OVERFLOW BIT(0) diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c index a72382b..18afed1 100644 --- a/arch/arm/kernel/etm.c +++ b/arch/arm/kernel/etm.c @@ -40,12 +40,14 @@ struct tracectx { void __iomem *etm_regs; unsigned long flags; int naddrcmppairs; + int nctxidcmp; int etm_portsz; struct device *dev; struct clk *emu_clk; struct mutex mutex; unsigned long addrrange_start; unsigned long addrrange_end; + long pid; }; static struct tracectx tracer; @@ -59,14 +61,18 @@ static inline bool trace_isrunning(struct tracectx *t) * Setups ETM to trace only when: * - address between start and end * or address not between start and end (if exclude) + * - in user-space when process id equals pid, + * in kernel-space (if pid == 0), + * always (if pid == -1) * - trace executed instructions * or trace loads and stores (if data) */ -static int etm_setup_address_range(struct tracectx *t, int n, - unsigned long start, unsigned long end, int exclude, int data) +static int etm_setup(struct tracectx *t, int n, + unsigned long start, unsigned long end, int exclude, + long pid, + int data) { - u32 flags = ETMAAT_ARM | ETMAAT_IGNCONTEXTID | ETMAAT_NSONLY | \ - ETMAAT_NOVALCMP; + u32 flags = ETMAAT_ARM | ETMAAT_NSONLY | ETMAAT_NOVALCMP; if (n < 1 || n > t->naddrcmppairs) return -EINVAL; @@ -75,6 +81,19 @@ static int etm_setup_address_range(struct tracectx *t, int n, * to bits in a word */ n--; + if (pid < 0) { + /* ignore Context ID */ + flags |= ETMAAT_IGNCONTEXTID; + } else { + flags |= ETMAAT_VALUE1; + + /* Set up the first Context ID comparator. + Process ID is found in the 24 first bits of Context ID + (provided by CONFIG_PID_IN_CONTEXTIDR) */ + etm_writel(t, pid << 8, ETMR_CTXIDCOMP_VAL(0)); + etm_writel(t, 0xff, ETMR_CTXIDCOMP_MASK); + } + if (data) flags |= ETMAAT_DLOADSTORE; else @@ -124,8 +143,10 @@ static int trace_start(struct tracectx *t) return -EFAULT; } - etm_setup_address_range(t, 1, t->addrrange_start, t->addrrange_end, - 0, 0); + etm_setup(t, 1, + t->addrrange_start, t->addrrange_end, 0, + t->pid, + 0); etm_writel(t, 0, ETMR_TRACEENCTRL2); etm_writel(t, 0, ETMR_TRACESSCTRL); etm_writel(t, 0x6f, ETMR_TRACEENEVT); @@ -488,6 +509,7 @@ static ssize_t trace_info_show(struct kobject *kobj, return sprintf(buf, "Trace buffer len: %d\n" "Addr comparator pairs: %d\n" + "Ctx ID comparators: %d\n" "ETBR_WRITEADDR:\t%08x\n" "ETBR_READADDR:\t%08x\n" "ETBR_STATUS:\t%08x\n" @@ -496,6 +518,7 @@ static ssize_t trace_info_show(struct kobject *kobj, "ETMR_STATUS:\t%08x\n", datalen, tracer.naddrcmppairs, + tracer.nctxidcmp, etb_wa, etb_ra, etb_st, @@ -572,6 +595,35 @@ static ssize_t trace_addrrange_store(struct kobject *kobj, static struct kobj_attribute trace_addrrange_attr = __ATTR(trace_addrrange, 0644, trace_addrrange_show, trace_addrrange_store); +static ssize_t trace_pid_show(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + return sprintf(buf, "%ld\n", tracer.pid); +} + +static ssize_t trace_pid_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t n) +{ + long pid; + + if (tracer.flags & TRACER_RUNNING) + return -EBUSY; + + if (sscanf(buf, "%li", &pid) != 1) + return -EINVAL; + + mutex_lock(&tracer.mutex); + tracer.pid = pid; + mutex_unlock(&tracer.mutex); + + return n; +} + +static struct kobj_attribute trace_pid_attr = + __ATTR(trace_pid, 0644, trace_pid_show, trace_pid_store); + static int etm_probe(struct amba_device *dev, const struct amba_id *id) { struct tracectx *t = &tracer; @@ -601,6 +653,7 @@ static int etm_probe(struct amba_device *dev, const struct amba_id *id) t->etm_portsz = 1; t->addrrange_start = (unsigned long) _stext; t->addrrange_end = (unsigned long) _etext; + t->pid = -1; /* trace everything */ etm_unlock(t);