kcsan: Add missing CONFIG_KCSAN_IGNORE_ATOMICS checks (9d1335cc) · Commits · 戴 / test

kernel/kcsan/core.c

+22 −8

Original line number	Diff line number	Diff line
		@@ -914,14 +914,19 @@ EXPORT_SYMBOL(__tsan_init);
		u##bits __tsan_atomic##bits##_load(const u##bits *ptr, int memorder); \
		u##bits __tsan_atomic##bits##_load(const u##bits *ptr, int memorder) \
		{ \
		if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) { \
		check_access(ptr, bits / BITS_PER_BYTE, KCSAN_ACCESS_ATOMIC); \
		} \
		return __atomic_load_n(ptr, memorder); \
		} \
		EXPORT_SYMBOL(__tsan_atomic##bits##_load); \
		void __tsan_atomic##bits##_store(u##bits *ptr, u##bits v, int memorder); \
		void __tsan_atomic##bits##_store(u##bits *ptr, u##bits v, int memorder) \
		{ \
		check_access(ptr, bits / BITS_PER_BYTE, KCSAN_ACCESS_WRITE \| KCSAN_ACCESS_ATOMIC); \
		if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) { \
		check_access(ptr, bits / BITS_PER_BYTE, \
		KCSAN_ACCESS_WRITE \| KCSAN_ACCESS_ATOMIC); \
		} \
		__atomic_store_n(ptr, v, memorder); \
		} \
		EXPORT_SYMBOL(__tsan_atomic##bits##_store)
		@@ -930,8 +935,11 @@ EXPORT_SYMBOL(__tsan_init);
		u##bits __tsan_atomic##bits##_##op(u##bits *ptr, u##bits v, int memorder); \
		u##bits __tsan_atomic##bits##_##op(u##bits *ptr, u##bits v, int memorder) \
		{ \
		if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) { \
		check_access(ptr, bits / BITS_PER_BYTE, \
		KCSAN_ACCESS_COMPOUND \| KCSAN_ACCESS_WRITE \| KCSAN_ACCESS_ATOMIC); \
		KCSAN_ACCESS_COMPOUND \| KCSAN_ACCESS_WRITE \| \
		KCSAN_ACCESS_ATOMIC); \
		} \
		return __atomic_##op##suffix(ptr, v, memorder); \
		} \
		EXPORT_SYMBOL(__tsan_atomic##bits##_##op)
		@@ -959,8 +967,11 @@ EXPORT_SYMBOL(__tsan_init);
		int __tsan_atomic##bits##_compare_exchange_##strength(u##bits ptr, u##bits exp, \
		u##bits val, int mo, int fail_mo) \
		{ \
		if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) { \
		check_access(ptr, bits / BITS_PER_BYTE, \
		KCSAN_ACCESS_COMPOUND \| KCSAN_ACCESS_WRITE \| KCSAN_ACCESS_ATOMIC); \
		KCSAN_ACCESS_COMPOUND \| KCSAN_ACCESS_WRITE \| \
		KCSAN_ACCESS_ATOMIC); \
		} \
		return __atomic_compare_exchange_n(ptr, exp, val, weak, mo, fail_mo); \
		} \
		EXPORT_SYMBOL(__tsan_atomic##bits##_compare_exchange_##strength)
		@@ -971,8 +982,11 @@ EXPORT_SYMBOL(__tsan_init);
		u##bits __tsan_atomic##bits##_compare_exchange_val(u##bits *ptr, u##bits exp, u##bits val, \
		int mo, int fail_mo) \
		{ \
		if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) { \
		check_access(ptr, bits / BITS_PER_BYTE, \
		KCSAN_ACCESS_COMPOUND \| KCSAN_ACCESS_WRITE \| KCSAN_ACCESS_ATOMIC); \
		KCSAN_ACCESS_COMPOUND \| KCSAN_ACCESS_WRITE \| \
		KCSAN_ACCESS_ATOMIC); \
		} \
		__atomic_compare_exchange_n(ptr, &exp, val, 0, mo, fail_mo); \
		return exp; \
		} \

Admin message