2009-03-05 07:57:38

by Metzger, Markus T

Subject: [patch] x86, pebs: correct qualifier passed to ds_write_config() from ds_request_pebs()

ds_write_config() can write the BTS as well as the PEBS part of the DS config.
ds_request_pebs() passes the wrong qualifier, which results in the
wrong configuration to be written.

Reported-by: Stephane Eranian <[email protected]>
Signed-off-by: Markus Metzger <[email protected]>
---

Index: gits/arch/x86/kernel/ds.c
===================================================================
--- gits.orig/arch/x86/kernel/ds.c 2009-03-04 14:41:15.000000000 +0100
+++ gits/arch/x86/kernel/ds.c 2009-03-04 14:49:01.000000000 +0100
@@ -729,7 +729,7 @@ struct pebs_tracer *ds_request_pebs(stru

spin_unlock_irqrestore(&ds_lock, irq);

- ds_write_config(tracer->ds.context, &tracer->trace.ds, ds_bts);
+ ds_write_config(tracer->ds.context, &tracer->trace.ds, ds_pebs);
ds_resume_pebs(tracer);

return tracer;
---------------------------------------------------------------------
Intel GmbH
Dornacher Strasse 1
85622 Feldkirchen/Muenchen Germany
Sitz der Gesellschaft: Feldkirchen bei Muenchen
Geschaeftsfuehrer: Douglas Lusk, Peter Gleissner, Hannes Schwaderer
Registergericht: Muenchen HRB 47456 Ust.-IdNr.
VAT Registration No.: DE129385895
Citibank Frankfurt (BLZ 502 109 00) 600119052

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

2009-03-06 15:16:35

by Metzger, Markus T

Subject: [tip:x86/urgent] x86, pebs: correct qualifier passed to ds_write_config() from ds_request_pebs()

Commit-ID: 73bf1b62f561fc8ecb00e2810efe4fe769f4933e
Gitweb: http://git.kernel.org/tip/73bf1b62f561fc8ecb00e2810efe4fe769f4933e
Author: "Markus Metzger" <[email protected]>
AuthorDate: Thu, 5 Mar 2009 08:57:21 +0100
Commit: Ingo Molnar <[email protected]>
CommitDate: Fri, 6 Mar 2009 16:13:15 +0100

x86, pebs: correct qualifier passed to ds_write_config() from ds_request_pebs()

ds_write_config() can write the BTS as well as the PEBS part of
the DS config. ds_request_pebs() passes the wrong qualifier, which
results in the wrong configuration to be written.

Reported-by: Stephane Eranian <[email protected]>
Signed-off-by: Markus Metzger <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>


---
arch/x86/kernel/ds.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/ds.c b/arch/x86/kernel/ds.c
index de7cdbd..87b67e3 100644
--- a/arch/x86/kernel/ds.c
+++ b/arch/x86/kernel/ds.c
@@ -729,7 +729,7 @@ struct pebs_tracer *ds_request_pebs(struct task_struct *task,

spin_unlock_irqrestore(&ds_lock, irq);

- ds_write_config(tracer->ds.context, &tracer->trace.ds, ds_bts);
+ ds_write_config(tracer->ds.context, &tracer->trace.ds, ds_pebs);
ds_resume_pebs(tracer);

return tracer;