From 980da033a8686bbe40ffb01435c0803af15b4a65 Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 8 Mar 2021 12:39:06 -0500
Subject: [PATCH] Rename _cscan_atomic.h and _cscan_bus.h to atomic_san.h and
 bus_san.h

Other kernel sanitizers (KMSAN, KASAN) require interceptors as well, so
put these in a more generic place as a step towards importing the other
sanitizers.

No functional change intended.

Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D29103

(cherry picked from commit 435c7cfb2418fdac48fa53e29e38ef03646b817d)
---
 sys/amd64/include/atomic.h                | 2 +-
 sys/arm64/include/atomic.h                | 2 +-
 sys/arm64/include/bus.h                   | 2 +-
 sys/kern/subr_csan.c                      | 4 ++--
 sys/sys/{_cscan_atomic.h => atomic_san.h} | 6 +++---
 sys/sys/{_cscan_bus.h => bus_san.h}       | 6 +++---
 sys/x86/include/bus.h                     | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename sys/sys/{_cscan_atomic.h => atomic_san.h} (99%)
 rename sys/sys/{_cscan_bus.h => bus_san.h} (99%)

diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h
index 87f7b8e8293..61cb79645c1 100644
--- a/sys/amd64/include/atomic.h
+++ b/sys/amd64/include/atomic.h
@@ -69,7 +69,7 @@
 #endif
 
 #if defined(KCSAN) && !defined(KCSAN_RUNTIME)
-#include <sys/_cscan_atomic.h>
+#include <sys/atomic_san.h>
 #else
 #include <sys/atomic_common.h>
 
diff --git a/sys/arm64/include/atomic.h b/sys/arm64/include/atomic.h
index 9c5d6224f3e..6c63357f85b 100644
--- a/sys/arm64/include/atomic.h
+++ b/sys/arm64/include/atomic.h
@@ -54,7 +54,7 @@
 #define	rmb()	dmb(ld)	/* Full system memory barrier load */
 
 #if defined(KCSAN) && !defined(KCSAN_RUNTIME)
-#include <sys/_cscan_atomic.h>
+#include <sys/atomic_san.h>
 #else
 
 #include <sys/atomic_common.h>
diff --git a/sys/arm64/include/bus.h b/sys/arm64/include/bus.h
index 917b2618b27..417b918f595 100644
--- a/sys/arm64/include/bus.h
+++ b/sys/arm64/include/bus.h
@@ -92,7 +92,7 @@
 #define	BUS_SPACE_BARRIER_WRITE	0x02
 
 #if defined(KCSAN) && !defined(KCSAN_RUNTIME)
-#include <sys/_cscan_bus.h>
+#include <sys/bus_san.h>
 #else
 
 struct bus_space {
diff --git a/sys/kern/subr_csan.c b/sys/kern/subr_csan.c
index 3fa59ef2ea6..ec2fd23729b 100644
--- a/sys/kern/subr_csan.c
+++ b/sys/kern/subr_csan.c
@@ -380,7 +380,7 @@ kcsan_copyout(const void *kaddr, void *uaddr, size_t len)
 /* -------------------------------------------------------------------------- */
 
 #include <machine/atomic.h>
-#include <sys/_cscan_atomic.h>
+#include <sys/atomic_san.h>
 
 #define	_CSAN_ATOMIC_FUNC_ADD(name, type)				\
 	void kcsan_atomic_add_##name(volatile type *ptr, type val)	\
@@ -688,7 +688,7 @@ CSAN_ATOMIC_FUNC_THREAD_FENCE(seq_cst)
 
 #include <sys/bus.h>
 #include <machine/bus.h>
-#include <sys/_cscan_bus.h>
+#include <sys/bus_san.h>
 
 int
 kcsan_bus_space_map(bus_space_tag_t tag, bus_addr_t hnd, bus_size_t size,
diff --git a/sys/sys/_cscan_atomic.h b/sys/sys/atomic_san.h
similarity index 99%
rename from sys/sys/_cscan_atomic.h
rename to sys/sys/atomic_san.h
index b458c24841b..c2b963ae8b9 100644
--- a/sys/sys/_cscan_atomic.h
+++ b/sys/sys/atomic_san.h
@@ -32,8 +32,8 @@
  * $FreeBSD$
  */
 
-#ifndef _SYS__CSAN_ATOMIC_H_
-#define	_SYS__CSAN_ATOMIC_H_
+#ifndef _SYS_ATOMIC_SAN_H_
+#define	_SYS_ATOMIC_SAN_H_
 
 #ifndef _MACHINE_ATOMIC_H_
 #error do not include this header, use machine/atomic.h
@@ -377,4 +377,4 @@ void	kcsan_atomic_thread_fence_seq_cst(void);
 
 #endif /* !KCSAN_RUNTIME */
 
-#endif /* !_SYS__CSAN_ATOMIC_H_ */
+#endif /* !_SYS_ATOMIC_SAN_H_ */
diff --git a/sys/sys/_cscan_bus.h b/sys/sys/bus_san.h
similarity index 99%
rename from sys/sys/_cscan_bus.h
rename to sys/sys/bus_san.h
index b1fd4135261..96b2441fbdb 100644
--- a/sys/sys/_cscan_bus.h
+++ b/sys/sys/bus_san.h
@@ -32,8 +32,8 @@
  * $FreeBSD$
  */
 
-#ifndef _SYS__CSAN_BUS_H_
-#define	_SYS__CSAN_BUS_H_
+#ifndef _SYS_BUS_SAN_H_
+#define	_SYS_BUS_SAN_H_
 
 #define	KCSAN_BS_MULTI(rw, width, type)					\
 	void kcsan_bus_space_##rw##_multi_##width(bus_space_tag_t, 	\
@@ -206,4 +206,4 @@ void kcsan_bus_space_barrier(bus_space_tag_t, bus_space_handle_t, bus_size_t,
 
 #endif /* !KCSAN_RUNTIME */
 
-#endif /* !_SYS__CSAN_BUS_H_ */
+#endif /* !_SYS_BUS_SAN_H_ */
diff --git a/sys/x86/include/bus.h b/sys/x86/include/bus.h
index 562445b8120..da2fe237ae9 100644
--- a/sys/x86/include/bus.h
+++ b/sys/x86/include/bus.h
@@ -136,7 +136,7 @@
 #define	BUS_SPACE_BARRIER_WRITE	0x02		/* force write barrier */
 
 #if defined(KCSAN) && !defined(KCSAN_RUNTIME)
-#include <sys/_cscan_bus.h>
+#include <sys/bus_san.h>
 #else
 
 /*