| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20090331152640.A13141@sedona.ch.intel.com>
Date: Tue, 31 Mar 2009 15:26:40 +0200
From: Markus Metzger <markus.t.metzger@...el.com>
To: linux-kernel@...r.kernel.org, mingo@...e.hu, tglx@...utronix.de,
hpa@...or.com
Cc: markus.t.metzger@...el.com, markus.t.metzger@...il.com,
roland@...hat.com, eranian@...glemail.com, oleg@...hat.com,
juan.villacis@...el.com, ak@...ux.jf.intel.com
Subject: [patch 11/21] x86, ds: make ds selftests use new debug store interface
Make the debug store selftests use both variants of the new debug
store interface introduced in patch 7.
Perform the selftests on each cpu.
Signed-off-by: Markus Metzger <markus.t.metzger@...el.com>
---
Index: git-tip/arch/x86/kernel/ds_selftest.c
===================================================================
--- git-tip.orig/arch/x86/kernel/ds_selftest.c 2009-03-30 13:31:09.000000000 +0200
+++ git-tip/arch/x86/kernel/ds_selftest.c 2009-03-30 19:09:44.000000000 +0200
@@ -10,13 +10,22 @@
#include <linux/kernel.h>
#include <linux/string.h>
+#include <linux/smp.h>
+#include <linux/cpu.h>
#include <asm/ds.h>
-#define DS_SELFTEST_BUFFER_SIZE 1021 /* Intentionally chose an odd size. */
+#define BUFFER_SIZE 521 /* Intentionally chose an odd size. */
+struct ds_selftest_bts_conf {
+ struct bts_tracer *tracer;
+ int error;
+ int (*suspend)(struct bts_tracer *);
+ int (*resume)(struct bts_tracer *);
+};
+
static int ds_selftest_bts_consistency(const struct bts_trace *trace)
{
int error = 0;
@@ -119,36 +128,32 @@ static int ds_selftest_bts_read(struct b
return 0;
}
-int ds_selftest_bts(void)
+static void ds_selftest_bts_cpu(void *arg)
{
+ struct ds_selftest_bts_conf *conf = arg;
const struct bts_trace *trace;
- struct bts_tracer *tracer;
- int error = 0;
void *top;
- unsigned char buffer[DS_SELFTEST_BUFFER_SIZE];
- printk(KERN_INFO "[ds] bts selftest...");
-
- tracer = ds_request_bts(NULL, buffer, DS_SELFTEST_BUFFER_SIZE,
- NULL, (size_t)-1, BTS_KERNEL);
- if (IS_ERR(tracer)) {
- error = PTR_ERR(tracer);
- tracer = NULL;
+ if (IS_ERR(conf->tracer)) {
+ conf->error = PTR_ERR(conf->tracer);
+ conf->tracer = NULL;
printk(KERN_CONT
- "initialization failed (err: %d)...", error);
- goto out;
+ "initialization failed (err: %d)...", conf->error);
+ return;
}
- /* The return should already give us enough trace. */
- ds_suspend_bts(tracer);
+ /* We should meanwhile have enough trace. */
+ conf->error = conf->suspend(conf->tracer);
+ if (conf->error < 0)
+ return;
/* Let's see if we can access the trace. */
- trace = ds_read_bts(tracer);
+ trace = ds_read_bts(conf->tracer);
- error = ds_selftest_bts_consistency(trace);
- if (error < 0)
- goto out;
+ conf->error = ds_selftest_bts_consistency(trace);
+ if (conf->error < 0)
+ return;
/* If everything went well, we should have a few trace entries. */
if (trace->ds.top == trace->ds.begin) {
@@ -162,10 +167,11 @@ int ds_selftest_bts(void)
}
/* Let's try to read the trace we collected. */
- error = ds_selftest_bts_read(tracer, trace,
+ conf->error =
+ ds_selftest_bts_read(conf->tracer, trace,
trace->ds.begin, trace->ds.top);
- if (error < 0)
- goto out;
+ if (conf->error < 0)
+ return;
/*
* Let's read the trace again.
@@ -173,26 +179,31 @@ int ds_selftest_bts(void)
*/
top = trace->ds.top;
- trace = ds_read_bts(tracer);
- error = ds_selftest_bts_consistency(trace);
- if (error < 0)
- goto out;
+ trace = ds_read_bts(conf->tracer);
+ conf->error = ds_selftest_bts_consistency(trace);
+ if (conf->error < 0)
+ return;
if (top != trace->ds.top) {
printk(KERN_CONT "suspend not working...");
- error = -1;
- goto out;
+ conf->error = -1;
+ return;
}
/* Let's collect some more trace - see if resume is working. */
- ds_resume_bts(tracer);
- ds_suspend_bts(tracer);
-
- trace = ds_read_bts(tracer);
-
- error = ds_selftest_bts_consistency(trace);
- if (error < 0)
- goto out;
+ conf->error = conf->resume(conf->tracer);
+ if (conf->error < 0)
+ return;
+
+ conf->error = conf->suspend(conf->tracer);
+ if (conf->error < 0)
+ return;
+
+ trace = ds_read_bts(conf->tracer);
+
+ conf->error = ds_selftest_bts_consistency(trace);
+ if (conf->error < 0)
+ return;
if (trace->ds.top == top) {
/*
@@ -204,35 +215,113 @@ int ds_selftest_bts(void)
printk(KERN_CONT
"no resume progress/overflow...");
- error = ds_selftest_bts_read(tracer, trace,
+ conf->error =
+ ds_selftest_bts_read(conf->tracer, trace,
trace->ds.begin, trace->ds.end);
} else if (trace->ds.top < top) {
/*
* We had a buffer overflow - the entire buffer should
* contain trace records.
*/
- error = ds_selftest_bts_read(tracer, trace,
+ conf->error =
+ ds_selftest_bts_read(conf->tracer, trace,
trace->ds.begin, trace->ds.end);
} else {
/*
* It is quite likely that the buffer did not overflow.
* Let's just check the delta trace.
*/
- error = ds_selftest_bts_read(tracer, trace,
- top, trace->ds.top);
+ conf->error =
+ ds_selftest_bts_read(conf->tracer, trace, top,
+ trace->ds.top);
}
- if (error < 0)
- goto out;
+ if (conf->error < 0)
+ return;
- error = 0;
+ conf->error = 0;
+}
- /* The final test: release the tracer while tracing is suspended. */
- out:
- ds_release_bts(tracer);
+static int ds_suspend_bts_wrap(struct bts_tracer *tracer)
+{
+ ds_suspend_bts(tracer);
+ return 0;
+}
- printk(KERN_CONT "%s.\n", (error ? "failed" : "passed"));
+static int ds_resume_bts_wrap(struct bts_tracer *tracer)
+{
+ ds_resume_bts(tracer);
+ return 0;
+}
- return error;
+static void ds_release_bts_noirq_wrap(void *tracer)
+{
+ (void)ds_release_bts_noirq(tracer);
+}
+
+static int ds_selftest_bts_bad_release_noirq(int cpu,
+ struct bts_tracer *tracer)
+{
+ int error = -EPERM;
+
+ /* Try to release the tracer on the wrong cpu. */
+ get_cpu();
+ if (cpu != smp_processor_id()) {
+ error = ds_release_bts_noirq(tracer);
+ if (error != -EPERM)
+ printk(KERN_CONT "release on wrong cpu...");
+ }
+ put_cpu();
+
+ return error ? 0 : -1;
+}
+
+int ds_selftest_bts(void)
+{
+ struct ds_selftest_bts_conf conf;
+ unsigned char buffer[BUFFER_SIZE];
+ int cpu;
+
+ printk(KERN_INFO "[ds] bts selftest...");
+ conf.error = 0;
+
+ get_online_cpus();
+ for_each_online_cpu(cpu) {
+ conf.suspend = ds_suspend_bts_wrap;
+ conf.resume = ds_resume_bts_wrap;
+ conf.tracer =
+ ds_request_bts_cpu(cpu, buffer, BUFFER_SIZE,
+ NULL, (size_t)-1, BTS_KERNEL);
+ ds_selftest_bts_cpu(&conf);
+ ds_release_bts(conf.tracer);
+ if (conf.error < 0)
+ goto out;
+
+ conf.suspend = ds_suspend_bts_noirq;
+ conf.resume = ds_resume_bts_noirq;
+ conf.tracer =
+ ds_request_bts_cpu(cpu, buffer, BUFFER_SIZE,
+ NULL, (size_t)-1, BTS_KERNEL);
+ smp_call_function_single(cpu, ds_selftest_bts_cpu, &conf, 1);
+ if (conf.error >= 0) {
+ conf.error =
+ ds_selftest_bts_bad_release_noirq(cpu,
+ conf.tracer);
+ /* We must not release the tracer twice. */
+ if (conf.error < 0)
+ conf.tracer = NULL;
+ }
+ smp_call_function_single(cpu, ds_release_bts_noirq_wrap,
+ conf.tracer, 1);
+ if (conf.error < 0)
+ goto out;
+ }
+
+ conf.error = 0;
+ out:
+ put_online_cpus();
+ printk(KERN_CONT "%s.\n", (conf.error ? "failed" : "passed"));
+
+ return conf.error;
}
int ds_selftest_pebs(void)
---------------------------------------------------------------------
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists