Commit eedd6341 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'for-mingo-kcsan' of... 

Merge branch 'for-mingo-kcsan' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu

 into locking/core

Pull KCSAN changes from Paul E. McKenney: misc updates.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 9432bbd9 bd0ccc4a

Documentation/dev-tools/kcsan.rst

+3 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0

.. Copyright (C) 2019, Google LLC.



The Kernel Concurrency Sanitizer (KCSAN)

========================================

include/linux/kcsan-checks.h

+6 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * KCSAN access checks and modifiers. These can be used to explicitly check

 * uninstrumented accesses, or change KCSAN checking behaviour of accesses.

 *

 * Copyright (C) 2019, Google LLC.

 */



#ifndef _LINUX_KCSAN_CHECKS_H

#define _LINUX_KCSAN_CHECKS_H

include/linux/kcsan.h

+7 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * The Kernel Concurrency Sanitizer (KCSAN) infrastructure. Public interface and

 * data structures to set up runtime. See kcsan-checks.h for explicit checks and

 * modifiers. For more info please see Documentation/dev-tools/kcsan.rst.

 *

 * Copyright (C) 2019, Google LLC.

 */



#ifndef _LINUX_KCSAN_H

#define _LINUX_KCSAN_H

kernel/kcsan/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -13,5 +13,5 @@ CFLAGS_core.o := $(call cc-option,-fno-conserve-stack) \ 
obj-y := core.o debugfs.o report.o

obj-$(CONFIG_KCSAN_SELFTEST) += selftest.o



CFLAGS_kcsan-test.o := $(CFLAGS_KCSAN) -g -fno-omit-frame-pointer

obj-$(CONFIG_KCSAN_TEST) += kcsan-test.o
 
CFLAGS_kcsan_test.o := $(CFLAGS_KCSAN) -g -fno-omit-frame-pointer

obj-$(CONFIG_KCSAN_KUNIT_TEST) += kcsan_test.o

kernel/kcsan/atomic.h

+5 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Rules for implicitly atomic memory accesses.

 *

 * Copyright (C) 2019, Google LLC.

 */



#ifndef _KERNEL_KCSAN_ATOMIC_H

#define _KERNEL_KCSAN_ATOMIC_H