Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1565184 > unrolled thread

[PATCH 0/3] coresight: next v4.10-rc5

Started byMathieu Poirier <mathieu.poirier@linaro.org>
First post2017-01-23 18:50 +0100
Last post2017-01-23 18:50 +0100
Articles 5 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/3] coresight: next v4.10-rc5 Mathieu Poirier <mathieu.poirier@linaro.org> - 2017-01-23 18:50 +0100
    [PATCH 1/3] coresight: fix kernel panic caused by invalid CPU Mathieu Poirier <mathieu.poirier@linaro.org> - 2017-01-23 18:50 +0100
      Re: [PATCH 1/3] coresight: fix kernel panic caused by invalid CPU Greg KH <gregkh@linuxfoundation.org> - 2017-01-25 11:50 +0100
    [PATCH 3/3] coresight: etm4x: Fix timestamp configuration when working from perf Mathieu Poirier <mathieu.poirier@linaro.org> - 2017-01-23 18:50 +0100
    [PATCH 2/3] coresight: etm4x: Fix enabling of cycle accurate tracing in perf. Mathieu Poirier <mathieu.poirier@linaro.org> - 2017-01-23 18:50 +0100

#1565184 — [PATCH 0/3] coresight: next v4.10-rc5

FromMathieu Poirier <mathieu.poirier@linaro.org>
Date2017-01-23 18:50 +0100
Subject[PATCH 0/3] coresight: next v4.10-rc5
Message-ID<t2QUF-XY-3@gated-at.bofh.it>
Hello,

These are the patches to be queued for the 4.11 cycle.  Please have
a look when you have the opportunity.  The set applies on your
'char-misc-next' branch (8e27a236312c).

Regards,
Mathieu

Mathieu Poirier (1):
  coresight: etm4x: Fix timestamp configuration when working from perf

Mike Leach (1):
  coresight: etm4x: Fix enabling of cycle accurate tracing in perf.

Wang Nan (1):
  coresight: fix kernel panic caused by invalid CPU

 drivers/hwtracing/coresight/coresight-etm-perf.c |  1 +
 drivers/hwtracing/coresight/coresight-etm4x.c    | 10 +++++++---
 drivers/hwtracing/coresight/coresight-etm4x.h    |  1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

-- 
2.7.4

[toc] | [next] | [standalone]

#1565185 — [PATCH 1/3] coresight: fix kernel panic caused by invalid CPU

FromMathieu Poirier <mathieu.poirier@linaro.org>
Date2017-01-23 18:50 +0100
Subject[PATCH 1/3] coresight: fix kernel panic caused by invalid CPU
Message-ID<t2QUF-XY-1@gated-at.bofh.it>
In reply to#1565184
From: Wang Nan <wangnan0@huawei.com>

Commit d52c9750f150 ("coresight: reset "enable_sink" flag when need be")
caused a kernel panic because of the using of an invalid value: after
'for_each_cpu(cpu, mask)', value of local variable 'cpu' become invalid,
causes following 'cpu_to_node' access invalid memory area.

This patch brings the deleted 'cpu = cpumask_first(mask)' back.

Panic log:

 $ perf record -e cs_etm// ls

 Unable to handle kernel paging request at virtual address fffe801804af4f10
 pgd = ffff8017ce031600
 [fffe801804af4f10] *pgd=0000000000000000, *pud=0000000000000000
 Internal error: Oops: 96000004 [#1] SMP
 Modules linked in:
 CPU: 33 PID: 1619 Comm: perf Not tainted 4.7.1+ #16
 Hardware name: Huawei Taishan 2280 /CH05TEVBA, BIOS 1.10 11/24/2016
 task: ffff8017cb0c8400 ti: ffff8017cb154000 task.ti: ffff8017cb154000
 PC is at tmc_alloc_etf_buffer+0x60/0xd4
 LR is at tmc_alloc_etf_buffer+0x44/0xd4
 pc : [<ffff000008633df8>] lr : [<ffff000008633ddc>] pstate: 60000145
 sp : ffff8017cb157b40
 x29: ffff8017cb157b40 x28: 0000000000000000
 ...skip...
 7a60: ffff000008c64dc8 0000000000000006 0000000000000253 ffffffffffffffff
 7a80: 0000000000000000 0000000000000000 ffff0000080872cc 0000000000000001
 [<ffff000008633df8>] tmc_alloc_etf_buffer+0x60/0xd4
 [<ffff000008632b9c>] etm_setup_aux+0x1dc/0x1e8
 [<ffff00000816eed4>] rb_alloc_aux+0x2b0/0x338
 [<ffff00000816a5e4>] perf_mmap+0x414/0x568
 [<ffff0000081ab694>] mmap_region+0x324/0x544
 [<ffff0000081abbe8>] do_mmap+0x334/0x3e0
 [<ffff000008191150>] vm_mmap_pgoff+0xa4/0xc8
 [<ffff0000081a9a30>] SyS_mmap_pgoff+0xb0/0x22c
 [<ffff0000080872e4>] sys_mmap+0x18/0x28
 [<ffff0000080843f0>] el0_svc_naked+0x24/0x28
 Code: 912040a5 d0001c00 f873d821 911c6000 (b8656822)
 ---[ end trace 98933da8f92b0c9a ]---

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Xia Kaixu <xiakaixu@huawei.com>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
 drivers/hwtracing/coresight/coresight-etm-perf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c
index 17741969026e..26cfac3e6de7 100644
--- a/drivers/hwtracing/coresight/coresight-etm-perf.c
+++ b/drivers/hwtracing/coresight/coresight-etm-perf.c
@@ -242,6 +242,7 @@ static void *etm_setup_aux(int event_cpu, void **pages,
 	if (!sink_ops(sink)->alloc_buffer)
 		goto err;
 
+	cpu = cpumask_first(mask);
 	/* Get the AUX specific data from the sink buffer */
 	event_data->snk_config =
 			sink_ops(sink)->alloc_buffer(sink, cpu, pages,
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1566470 — Re: [PATCH 1/3] coresight: fix kernel panic caused by invalid CPU

FromGreg KH <gregkh@linuxfoundation.org>
Date2017-01-25 11:50 +0100
SubjectRe: [PATCH 1/3] coresight: fix kernel panic caused by invalid CPU
Message-ID<t3tjk-Dr-7@gated-at.bofh.it>
In reply to#1565185
On Mon, Jan 23, 2017 at 10:41:22AM -0700, Mathieu Poirier wrote:
> From: Wang Nan <wangnan0@huawei.com>
> 
> Commit d52c9750f150 ("coresight: reset "enable_sink" flag when need be")
> caused a kernel panic because of the using of an invalid value: after
> 'for_each_cpu(cpu, mask)', value of local variable 'cpu' become invalid,
> causes following 'cpu_to_node' access invalid memory area.

You should add a "Fixes:" tag when you write something like this, as you
have all of the information here. I'll add it, and the stable tag as
well...

thanks,

greg k-h

[toc] | [prev] | [next] | [standalone]

#1565186 — [PATCH 3/3] coresight: etm4x: Fix timestamp configuration when working from perf

FromMathieu Poirier <mathieu.poirier@linaro.org>
Date2017-01-23 18:50 +0100
Subject[PATCH 3/3] coresight: etm4x: Fix timestamp configuration when working from perf
Message-ID<t2QUG-XY-9@gated-at.bofh.it>
In reply to#1565184
When using the ETM4x tracers from the perf interface two trace options are
available: cycle accurate and timestamp.

Enabling the timestamp feature is done by setting TRCCONFIGR.TS (bit 11).
The position of the timestamp bit in that register coincidentally happens
to be the same as what was chosen to enable timestamping from the 'mode'
sysFS entry.  The code does the right thing but the semantic is wrong.

This patch sets TRCCONFIGR.TS explicitly, as it is done from the sysFS
interface.  That way timestamps are set the same way from both perf and
sysFS and there is no misunderstanding as to what is intended.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
 drivers/hwtracing/coresight/coresight-etm4x.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
index f432febdda49..d1340fb4e457 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x.c
@@ -222,7 +222,8 @@ static int etm4_parse_event_config(struct etmv4_drvdata *drvdata,
 		config->ccctlr = ETM_CYC_THRESHOLD_DEFAULT;
 	}
 	if (attr->config & BIT(ETM_OPT_TS))
-		config->cfg |= ETMv4_MODE_TIMESTAMP;
+		/* bit[11], Global timestamp tracing bit */
+		config->cfg |= BIT(11);
 
 out:
 	return ret;
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1565188 — [PATCH 2/3] coresight: etm4x: Fix enabling of cycle accurate tracing in perf.

FromMathieu Poirier <mathieu.poirier@linaro.org>
Date2017-01-23 18:50 +0100
Subject[PATCH 2/3] coresight: etm4x: Fix enabling of cycle accurate tracing in perf.
Message-ID<t2QUG-XY-5@gated-at.bofh.it>
In reply to#1565184
From: Mike Leach <mike.leach@linaro.org>

Using perf record 'cyclacc' option in cs_etm event was not setting up cycle
accurate trace correctly.

Corrects bit set in TRCCONFIGR to enable cycle accurate trace.
Programs TRCCCCTLR with a valid threshold value as required by ETMv4 spec.

Signed-off-by: Mike Leach <mike.leach@linaro.org>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
 drivers/hwtracing/coresight/coresight-etm4x.c | 7 +++++--
 drivers/hwtracing/coresight/coresight-etm4x.h | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
index 031480f2c34d..f432febdda49 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x.c
@@ -216,8 +216,11 @@ static int etm4_parse_event_config(struct etmv4_drvdata *drvdata,
 		goto out;
 
 	/* Go from generic option to ETMv4 specifics */
-	if (attr->config & BIT(ETM_OPT_CYCACC))
-		config->cfg |= ETMv4_MODE_CYCACC;
+	if (attr->config & BIT(ETM_OPT_CYCACC)) {
+		config->cfg |= BIT(4);
+		/* TRM: Must program this for cycacc to work */
+		config->ccctlr = ETM_CYC_THRESHOLD_DEFAULT;
+	}
 	if (attr->config & BIT(ETM_OPT_TS))
 		config->cfg |= ETMv4_MODE_TIMESTAMP;
 
diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h
index ba8d3f86de21..b3b5ea7b7fb3 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x.h
+++ b/drivers/hwtracing/coresight/coresight-etm4x.h
@@ -146,6 +146,7 @@
 #define ETM_ARCH_V4			0x40
 #define ETMv4_SYNC_MASK			0x1F
 #define ETM_CYC_THRESHOLD_MASK		0xFFF
+#define ETM_CYC_THRESHOLD_DEFAULT       0x100
 #define ETMv4_EVENT_MASK		0xFF
 #define ETM_CNTR_MAX_VAL		0xFFFF
 #define ETM_TRACEID_MASK		0x3f
-- 
2.7.4

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web