Fixed PR 11372 by removing (most) embedded-C from proc_mem.stp.

* tapset/proc_mem.stp: Tried to remove as much embedded-C as possible.
* tapset/atomic.stp: New file.
* testsuite/buildok/atomic.stp: New file.
* testsuite/systemtap.base/atomic.exp: Ditto.
* testsuite/systemtap.base/atomic_module.c: Ditto.
* testsuite/systemtap.base/atomic_module.makefile: Ditto.

4 files changed, 184 insertions, 0 deletions

diff --git a/testsuite/buildok/atomic.stp b/testsuite/buildok/atomic.stp
new file mode 100755
index 00000000..00690453
--- /dev/null
+++ b/testsuite/buildok/atomic.stp
@@ -0,0 +1,6 @@
+#! stap -p4
+
+probe begin {
+  printf("%d\n", atomic_long_read(0))
+  exit()
+}
diff --git a/testsuite/systemtap.base/atomic.exp b/testsuite/systemtap.base/atomic.exp
new file mode 100644
index 00000000..4b4fa58d
--- /dev/null
+++ b/testsuite/systemtap.base/atomic.exp
@@ -0,0 +1,115 @@
+set test "atomic"
+
+if {![installtest_p]} {untested $test; return}
+
+set script_template {
+    probe begin {
+	print("systemtap starting probe\n")
+	exit()
+    }
+
+    probe end {
+	print("systemtap ending probe\n")
+	printf("%%d\n", atomic_long_read(%s))
+    }
+}
+
+# First try reading from address 0, which should fail.
+set test "atomic1"
+set error {kernel read fault at 0x[^\r]+}
+set script [format $script_template "0"]
+stap_run_error $test 1 $error "" -e $script
+
+# Try reading from address -1 (top of memory), which should fail.
+set test "atomic2"
+set script [format $script_template "-1"]
+stap_run_error $test 1 $error "" -e $script
+
+# Try reading from address 3, which should fail (if nothing else
+# because it isn't aligned properly).
+set test "atomic3"
+set script [format $script_template "3"]
+stap_run_error $test 1 $error "" -e $script
+
+
+set build_dir ""
+
+proc cleanup_module {} {
+    global build_dir
+    as_root [list /sbin/rmmod atomic_module]
+    catch { exec rm -rf $build_dir }
+}
+
+proc build_and_install_module {} {
+    global build_dir
+    global srcdir subdir
+
+    # Create the build directory and populate it
+    if {[catch {exec mktemp -d staptestXXXXXX} build_dir]} {
+	verbose -log "Failed to create temporary directory: $build_dir"
+	return 0
+    }
+    exec cp $srcdir/$subdir/atomic_module.c $build_dir/
+    exec cp -p $srcdir/$subdir/atomic_module.makefile $build_dir/Makefile
+
+    # Build the module
+    if {[catch {exec make -C $build_dir clean} res]} {
+	verbose -log "$res"
+	return 0
+    }
+    catch {exec make -C $build_dir} res
+    if {![file exists $build_dir/atomic_module.ko]} {
+	verbose -log "$res"
+	return 0
+    }
+
+    # Install the module
+    set res [as_root [list /sbin/insmod $build_dir/atomic_module.ko]]
+    if {$res != 0} {
+	return 0
+    }
+
+    return 1
+}
+
+set test "atomic_module_build"
+if {[build_and_install_module] == 0} {
+    verbose -log "BUILD FAILED"
+    fail "$test - could not build/install module"
+    cleanup_module
+    return
+} else {
+    pass $test
+}
+
+set script_module_template {
+    function get_atomic_addr:long()
+    %%{
+	extern atomic_long_t *stp_get_atomic_long_addr(void);
+	atomic_long_t *a = stp_get_atomic_long_addr();
+	THIS->__retvalue = (long)a;
+    %%}
+
+    probe begin {
+	print("systemtap starting probe\n")
+	exit()
+    }
+
+    probe end {
+	print("systemtap ending probe\n")
+	printf("%%d\n", atomic_long_read(get_atomic_addr() + %s))
+    }
+}
+
+set test "atomic4"
+set script [format $script_module_template "0"]
+stap_run_error $test 0 $error "5\r\n" -ge $script
+
+# We should be able to check for trying to read the atomic_long_t with
+# bad alignment here, but it succeeds on {x86, x86_64} and fails on
+# ia64.  Since it doesn't fail consistently, we'll comment this out.
+#set test "atomic5"
+#set script [format $script_module_template "3"]
+#stap_run_error $test 1 $error "" -ge $script
+
+cleanup_module
diff --git a/testsuite/systemtap.base/atomic_module.c b/testsuite/systemtap.base/atomic_module.c
new file mode 100644
index 00000000..5b4e395e
--- /dev/null
+++ b/testsuite/systemtap.base/atomic_module.c
@@ -0,0 +1,50 @@
+/* -*- linux-c -*- 
+ * Systemtap Atomic Test Module
+ * Copyright (C) 2010 Red Hat Inc.
+ *
+ * This file is part of systemtap, and is free software.  You can
+ * redistribute it and/or modify it under the terms of the GNU General
+ * Public License (GPL); either version 2, or (at your option) any
+ * later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <asm/atomic.h>
+
+/* The purpose of this module is to provide a bunch of functions that */
+/* do nothing important, and then call them in different contexts. */
+/* We use a /proc file to trigger function calls from user context. */
+/* Then systemtap scripts set probes on the functions and run tests */
+/* to see if the expected output is received. This is better than using */
+/* the kernel because kernel internals frequently change. */
+
+
+/************ Below are the functions to create this module ************/
+
+struct {
+	ulong barrier1;
+	atomic_long_t a;
+	ulong barrier2;
+} stp_atomic_struct;
+
+atomic_long_t *stp_get_atomic_long_addr(void)
+{
+	return(&stp_atomic_struct.a);
+}
+EXPORT_SYMBOL(stp_get_atomic_long_addr);
+
+int init_module(void)
+{
+	stp_atomic_struct.barrier1 = ULONG_MAX;
+	atomic_long_set(&stp_atomic_struct.a, 5);
+        stp_atomic_struct.barrier2 = ULONG_MAX;
+	return 0;
+}
+
+void cleanup_module(void)
+{
+}
+
+MODULE_DESCRIPTION("systemtap atomic test module");
+MODULE_LICENSE("GPL");
diff --git a/testsuite/systemtap.base/atomic_module.makefile b/testsuite/systemtap.base/atomic_module.makefile
new file mode 100644
index 00000000..14d2b8e2
--- /dev/null
+++ b/testsuite/systemtap.base/atomic_module.makefile
@@ -0,0 +1,13 @@
+obj-m := atomic_module.o
+KDIR := /lib/modules/$(shell uname -r)/build
+PWD := $(shell pwd)
+
+CLEAN_FILES := $(shell echo *.mod.c *.ko *.o .*.cmd *~ *.sgn)
+CLEAN_FILES += Module.markers modules.order Module.symvers
+CLEAN_DIRS  := .tmp_versions
+
+default:
+	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+clean:
+	rm -f $(CLEAN_FILES)
+	rm -rf $(CLEAN_DIRS)