From patchwork Fri Jan 24 16:40:55 2014 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: 314023 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 16DC22C009E for ; Sat, 25 Jan 2014 06:01:13 +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 1W6jqs-0004Gm-F1; Fri, 24 Jan 2014 16:43:33 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6jqE-0006Ak-Vl; Fri, 24 Jan 2014 16:42:51 +0000 Received: from mail-ie0-x22c.google.com ([2607:f8b0:4001:c03::22c]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6jpH-0005zY-Bz for linux-arm-kernel@lists.infradead.org; Fri, 24 Jan 2014 16:42:00 +0000 Received: by mail-ie0-f172.google.com with SMTP id e14so3109500iej.17 for ; Fri, 24 Jan 2014 08:41:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=Kkcqykji4KqN8WMC+jrWti9bmOG3eMNZQWSth86waA8=; b=AosagO225q8WtTW6U5hTXFaxX594lKdAeROTiyMT6DpH3ZK2JvNQ1c2791cRxA73UB 9uJDyoeAMtQ/vuYFISBSliztlpCnPpCvc06c3H9Yc1Gs20BYgtOB4WE0l1XyRXe4FzHU 6WaeQNJEHjvqwMQuOw4edc+MPzQ99t1Nbu964Df6hVVUwBHURK50gM5AKUYzTgZ7qb+x Om4f29QRJgxstkZB5esB4br2RJ3WUzzF2i6ZyVsb/BH5KcdndoB9pTCjnpVXsh3tV0KS i9xAvXT35gcu14LglErCmImiZgLu19qZ9+rXmeM7iWrPh+/Uhiej5Ja8X81mm1sEJPtL Talw== X-Received: by 10.42.177.198 with SMTP id bj6mr1321185icb.69.1390581690140; Fri, 24 Jan 2014 08:41:30 -0800 (PST) Received: from station14.dorsal.polymtl.ca ([132.207.72.19]) by mx.google.com with ESMTPSA id f5sm10264221igc.4.2014.01.24.08.41.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Jan 2014 08:41:29 -0800 (PST) From: =?UTF-8?q?Adrien=20Verg=C3=A9?= To: Russell King Subject: [PATCH V2 5/6] ARM CoreSight: ETM: Add PID control support Date: Fri, 24 Jan 2014 11:40:55 -0500 Message-Id: <1390581656-16372-6-git-send-email-adrienverge@gmail.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1390581656-16372-1-git-send-email-adrienverge@gmail.com> References: <1390581656-16372-1-git-send-email-adrienverge@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140124_114151_635317_3FD5938F X-CRM114-Status: GOOD ( 18.15 ) 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: Dirk Behme , Mathieu Poirier , Catalin Marinas , Randy Dunlap , Will Deacon , linux-kernel@vger.kernel.org, Michel Dagenais , Ben Dooks , Christopher Covington , =?UTF-8?q?Adrien=20Verg=C3=A9?= , Andrew Morton , linux-arm-kernel@lists.infradead.org, "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 is effective only if CONFIG_PID_IN_CONTEXTIDR is set, and thus is not compatible with PID namespaces. Signed-off-by: Adrien Vergé --- arch/arm/include/asm/hardware/coresight.h | 5 ++ arch/arm/kernel/etm.c | 82 ++++++++++++++++++++++++++++--- 2 files changed, 80 insertions(+), 7 deletions(-) diff --git a/arch/arm/include/asm/hardware/coresight.h b/arch/arm/include/asm/hardware/coresight.h index 8c50cf6..2051af0 100644 --- a/arch/arm/include/asm/hardware/coresight.h +++ b/arch/arm/include/asm/hardware/coresight.h @@ -98,6 +98,11 @@ #define ETMR_ADDRCOMP_VAL(x) (0x40 + (x) * 4) #define ETMR_ADDRCOMP_ACC_TYPE(x) (0x80 + (x) * 4) +#ifdef CONFIG_PID_IN_CONTEXTIDR +#define ETMR_CTXIDCOMP_VAL(x) (0x1b0 + (x) * 4) +#define ETMR_CTXIDCOMP_MASK (0x1bc) +#endif + /* 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 4442e5c..54b5128 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; + int 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, + int 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,23 @@ static int etm_setup_address_range(struct tracectx *t, int n, * to bits in a word */ n--; +#ifdef CONFIG_PID_IN_CONTEXTIDR + 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); + } +#else + flags |= ETMAAT_IGNCONTEXTID; +#endif + if (data) flags |= ETMAAT_DLOADSTORE; else @@ -124,8 +147,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); @@ -486,6 +511,7 @@ static ssize_t trace_info_show(struct device *dev, 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" @@ -494,6 +520,7 @@ static ssize_t trace_info_show(struct device *dev, "ETMR_STATUS:\t%08x\n", datalen, tracer.naddrcmppairs, + tracer.nctxidcmp, etb_wa, etb_ra, etb_st, @@ -566,6 +593,36 @@ static ssize_t trace_addrrange_store(struct device *dev, DEVICE_ATTR(trace_addrrange, S_IRUGO|S_IWUSR, trace_addrrange_show, trace_addrrange_store); +#ifdef CONFIG_PID_IN_CONTEXTIDR +static ssize_t trace_pid_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + return sprintf(buf, "%d\n", tracer.pid); +} + +static ssize_t trace_pid_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t n) +{ + int pid; + + if (tracer.flags & TRACER_RUNNING) + return -EBUSY; + + if (sscanf(buf, "%i", &pid) != 1) + return -EINVAL; + + mutex_lock(&tracer.mutex); + tracer.pid = pid; + mutex_unlock(&tracer.mutex); + + return n; +} + +DEVICE_ATTR(trace_pid, S_IRUGO|S_IWUSR, trace_pid_show, trace_pid_store); +#endif + static int etm_probe(struct amba_device *dev, const struct amba_id *id) { struct tracectx *t = &tracer; @@ -595,6 +652,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); (void)etm_readl(t, ETMMR_PDSR); @@ -602,6 +660,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); @@ -609,7 +668,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 = device_create_file(&dev->dev, &dev_attr_trace_info); if (ret) dev_dbg(&dev->dev, "Failed to create trace_info in sysfs\n"); @@ -622,6 +681,12 @@ 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"); +#ifdef CONFIG_PID_IN_CONTEXTIDR + ret = device_create_file(&dev->dev, &dev_attr_trace_pid); + if (ret) + dev_dbg(&dev->dev, "Failed to create trace_pid in sysfs\n"); +#endif + dev_dbg(t->dev, "ETM AMBA driver initialized.\n"); out: @@ -652,6 +717,9 @@ static int etm_remove(struct amba_device *dev) device_remove_file(&dev->dev, &dev_attr_trace_info); device_remove_file(&dev->dev, &dev_attr_trace_mode); device_remove_file(&dev->dev, &dev_attr_trace_addrrange); +#ifdef CONFIG_PID_IN_CONTEXTIDR + device_remove_file(&dev->dev, &dev_attr_trace_pid); +#endif return 0; }