kcsan: Support reporting scoped read-write access type

Support generating the string representation of scoped read-write
accesses for completeness. They will become required in planned changes.

Signed-off-by: Marco Elver <elver@google.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

diff --git a/kernel/kcsan/kcsan_test.c b/kernel/kcsan/kcsan_test.c
index a3b12429e1d32aa5c7ca7ca6026ea0d0dead3ca6..660729238588061effef91be5a5b391cb09dc3fd 100644 (file)
--- a/kernel/kcsan/kcsan_test.c
+++ b/kernel/kcsan/kcsan_test.c
@@ -210,10 +210,12 @@ static bool report_matches(const struct expect_report *r)
                                                        "read-write" :
                                                        "write") :
                                               "read");
+               const bool is_atomic = (ty & KCSAN_ACCESS_ATOMIC);
+               const bool is_scoped = (ty & KCSAN_ACCESS_SCOPED);
                const char *const access_type_aux =
-                       (ty & KCSAN_ACCESS_ATOMIC) ?
-                                     " (marked)" :
-                                     ((ty & KCSAN_ACCESS_SCOPED) ? " (scoped)" : "");
+                               (is_atomic && is_scoped)        ? " (marked, scoped)"
+                               : (is_atomic                    ? " (marked)"
+                                  : (is_scoped                 ? " (scoped)" : ""));
 
                if (i == 1) {
                        /* Access 2 */

diff --git a/kernel/kcsan/report.c b/kernel/kcsan/report.c
index 4849cde9db9bddeaedce5e77a534d0021bc5f6d4..fc15077991c47992b8b50367e80792f8a77589be 100644 (file)
--- a/kernel/kcsan/report.c
+++ b/kernel/kcsan/report.c
@@ -247,6 +247,10 @@ static const char *get_access_type(int type)
                return "write (scoped)";
        case KCSAN_ACCESS_SCOPED | KCSAN_ACCESS_WRITE | KCSAN_ACCESS_ATOMIC:
                return "write (marked, scoped)";
+       case KCSAN_ACCESS_SCOPED | KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE:
+               return "read-write (scoped)";
+       case KCSAN_ACCESS_SCOPED | KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE | KCSAN_ACCESS_ATOMIC:
+               return "read-write (marked, scoped)";
        default:
                BUG();
        }