These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / lib / atomic64_test.c

diff --git a/kernel/lib/atomic64_test.c b/kernel/lib/atomic64_test.c
index 0211d30..83c33a5 100644 (file)
--- a/kernel/lib/atomic64_test.c
+++ b/kernel/lib/atomic64_test.c
@@ -16,8 +16,39 @@
 #include <linux/kernel.h>
 #include <linux/atomic.h>
 
+#define TEST(bit, op, c_op, val)                               \
+do {                                                           \
+       atomic##bit##_set(&v, v0);                              \
+       r = v0;                                                 \
+       atomic##bit##_##op(val, &v);                            \
+       r c_op val;                                             \
+       WARN(atomic##bit##_read(&v) != r, "%Lx != %Lx\n",       \
+               (unsigned long long)atomic##bit##_read(&v),     \
+               (unsigned long long)r);                         \
+} while (0)
+
+static __init void test_atomic(void)
+{
+       int v0 = 0xaaa31337;
+       int v1 = 0xdeadbeef;
+       int onestwos = 0x11112222;
+       int one = 1;
+
+       atomic_t v;
+       int r;
+
+       TEST(, add, +=, onestwos);
+       TEST(, add, +=, -one);
+       TEST(, sub, -=, onestwos);
+       TEST(, sub, -=, -one);
+       TEST(, or, |=, v1);
+       TEST(, and, &=, v1);
+       TEST(, xor, ^=, v1);
+       TEST(, andnot, &= ~, v1);
+}
+
 #define INIT(c) do { atomic64_set(&v, c); r = c; } while (0)
-static __init int test_atomic64(void)
+static __init void test_atomic64(void)
 {
        long long v0 = 0xaaa31337c001d00dLL;
        long long v1 = 0xdeadbeefdeafcafeLL;
@@ -34,15 +65,14 @@ static __init int test_atomic64(void)
        BUG_ON(v.counter != r);
        BUG_ON(atomic64_read(&v) != r);
 
-       INIT(v0);
-       atomic64_add(onestwos, &v);
-       r += onestwos;
-       BUG_ON(v.counter != r);
-
-       INIT(v0);
-       atomic64_add(-one, &v);
-       r += -one;
-       BUG_ON(v.counter != r);
+       TEST(64, add, +=, onestwos);
+       TEST(64, add, +=, -one);
+       TEST(64, sub, -=, onestwos);
+       TEST(64, sub, -=, -one);
+       TEST(64, or, |=, v1);
+       TEST(64, and, &=, v1);
+       TEST(64, xor, ^=, v1);
+       TEST(64, andnot, &= ~, v1);
 
        INIT(v0);
        r += onestwos;
@@ -54,16 +84,6 @@ static __init int test_atomic64(void)
        BUG_ON(atomic64_add_return(-one, &v) != r);
        BUG_ON(v.counter != r);
 
-       INIT(v0);
-       atomic64_sub(onestwos, &v);
-       r -= onestwos;
-       BUG_ON(v.counter != r);
-
-       INIT(v0);
-       atomic64_sub(-one, &v);
-       r -= -one;
-       BUG_ON(v.counter != r);
-
        INIT(v0);
        r -= onestwos;
        BUG_ON(atomic64_sub_return(onestwos, &v) != r);
@@ -147,6 +167,12 @@ static __init int test_atomic64(void)
        BUG_ON(!atomic64_inc_not_zero(&v));
        r += one;
        BUG_ON(v.counter != r);
+}
+
+static __init int test_atomics(void)
+{
+       test_atomic();
+       test_atomic64();
 
 #ifdef CONFIG_X86
        pr_info("passed for %s platform %s CX8 and %s SSE\n",
@@ -166,4 +192,4 @@ static __init int test_atomic64(void)
        return 0;
 }
 
-core_initcall(test_atomic64);
+core_initcall(test_atomics);