Skip to contentSkip to conversation

um: set DONTDUMP and DONTFORK flags on KASAN shadow memory

PATCH New Benjamin Berg 1 participant 5 messages Nov 3, 2024 User-mode Linux (UML)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/5 um: set DONTDUMP and DONTFORK flags on KASAN shadow memory

From: Benjamin Berg <[email protected]>

There is no point in either dumping the KASAN shadow memory or doing copy-on-write after a fork on these memory regions.

This considerably speeds up coredump generation.

---
 arch/um/os-Linux/mem.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/um/os-Linux/mem.c +12 -0
index 857e3deab293..72f302f4d197 100644
@@ -39,6 +39,18 @@ void kasan_map_memory(void *start, size_t len)
 			strerror(errno));
 		exit(1);
 	}
+
+	if (madvise(start, len, MADV_DONTDUMP)) {
+		os_info("Couldn't set MAD_DONTDUMP on shadow memory: %s\n.",
+			strerror(errno));
+		exit(1);
+	}
+
+	if (madvise(start, len, MADV_DONTFORK)) {
+		os_info("Couldn't set MADV_DONTFORK on shadow memory: %s\n.",
+			strerror(errno));
+		exit(1);
+	}
 }
 
 /* Set by make_tempfile() during early boot. */
Signature · 1 line
2.47.0
#1 lore raw

PATCH v2 2/5 um: always include kconfig.h and compiler-version.h

From: Benjamin Berg <[email protected]>

Since commit a95b37e20db9 ("kbuild: get <linux/compiler_types.h> out of <linux/kconfig.h>") we can safely include these files in userspace code. Doing so simplifies matters as options do not need to be exported via asm-offsets.h anymore.

---
 arch/um/Makefile                        |  4 +++-
 arch/um/include/shared/common-offsets.h | 18 ------------------
 arch/um/include/shared/timetravel.h     |  5 ++---
 arch/um/include/shared/user.h           |  2 +-
 arch/um/os-Linux/signal.c               |  8 ++++----
 arch/um/os-Linux/skas/process.c         |  6 ++++--
 arch/um/os-Linux/util.c                 |  4 ++--
 7 files changed, 16 insertions(+), 31 deletions(-)
arch/um/Makefile +3 -1
index 31e367e8ab4d..1d36a613aad8 100644
@@ -71,7 +71,9 @@ KBUILD_AFLAGS += $(ARCH_INCLUDE)
 USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \
 		$(ARCH_INCLUDE) $(MODE_INCLUDE) $(filter -I%,$(CFLAGS)) \
 		-D_FILE_OFFSET_BITS=64 -idirafter $(srctree)/include \
-		-idirafter $(objtree)/include -D__KERNEL__ -D__UM_HOST__
+		-idirafter $(objtree)/include -D__KERNEL__ -D__UM_HOST__ \
+		-include $(srctree)/include/linux/compiler-version.h \
+		-include $(srctree)/include/linux/kconfig.h
 
 #This will adjust *FLAGS accordingly to the platform.
 include $(srctree)/$(ARCH_DIR)/Makefile-os-Linux
arch/um/include/shared/common-offsets.h +0 -18
index 86537e20942a..1d00fc6b6e92 100644
@@ -15,21 +15,3 @@ DEFINE(UM_THREAD_SIZE, THREAD_SIZE);
 
 DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);
 DEFINE(UM_NSEC_PER_USEC, NSEC_PER_USEC);
-
-#ifdef CONFIG_PRINTK
-DEFINE(UML_CONFIG_PRINTK, CONFIG_PRINTK);
-#endif
-#ifdef CONFIG_UML_X86
-DEFINE(UML_CONFIG_UML_X86, CONFIG_UML_X86);
-#endif
-#ifdef CONFIG_64BIT
-DEFINE(UML_CONFIG_64BIT, CONFIG_64BIT);
-#endif
-#ifdef CONFIG_UML_TIME_TRAVEL_SUPPORT
-DEFINE(UML_CONFIG_UML_TIME_TRAVEL_SUPPORT, CONFIG_UML_TIME_TRAVEL_SUPPORT);
-#endif
-#ifdef CONFIG_UML_MAX_USERSPACE_ITERATIONS
-DEFINE(UML_CONFIG_UML_MAX_USERSPACE_ITERATIONS, CONFIG_UML_MAX_USERSPACE_ITERATIONS);
-#else
-DEFINE(UML_CONFIG_UML_MAX_USERSPACE_ITERATIONS, 0);
-#endif
arch/um/include/shared/timetravel.h +2 -3
index c8db2f213dba..7c2b277b7eb0 100644
@@ -12,14 +12,13 @@ enum time_travel_mode {
 	TT_MODE_EXTERNAL,
 };
 
-#if defined(UML_CONFIG_UML_TIME_TRAVEL_SUPPORT) || \
-    defined(CONFIG_UML_TIME_TRAVEL_SUPPORT)
+#if IS_ENABLED(CONFIG_UML_TIME_TRAVEL_SUPPORT)
 extern enum time_travel_mode time_travel_mode;
 extern int time_travel_should_print_bc_msg;
 #else
 #define time_travel_mode TT_MODE_OFF
 #define time_travel_should_print_bc_msg 0
-#endif /* (UML_)CONFIG_UML_TIME_TRAVEL_SUPPORT */
+#endif /* CONFIG_UML_TIME_TRAVEL_SUPPORT */
 
 void _time_travel_print_bc_msg(void);
 static inline void time_travel_print_bc_msg(void)
arch/um/include/shared/user.h +1 -1
index bbab79c0c074..139eb78a4767 100644
@@ -38,7 +38,7 @@ extern void panic(const char *fmt, ...)
 #define UM_KERN_DEBUG	KERN_DEBUG
 #define UM_KERN_CONT	KERN_CONT
 
-#ifdef UML_CONFIG_PRINTK
+#if IS_ENABLED(CONFIG_PRINTK)
 #define printk(...) _printk(__VA_ARGS__)
 extern int _printk(const char *fmt, ...)
 	__attribute__ ((format (printf, 1, 2)));
arch/um/os-Linux/signal.c +4 -4
index 1978eaa557e9..1c6caa9dbd6c 100644
@@ -65,7 +65,7 @@ static void sig_handler_common(int sig, struct siginfo *si, mcontext_t *mc)
 #define SIGALRM_MASK (1 << SIGALRM_BIT)
 
 int signals_enabled;
-#ifdef UML_CONFIG_UML_TIME_TRAVEL_SUPPORT
+#if IS_ENABLED(CONFIG_UML_TIME_TRAVEL_SUPPORT)
 static int signals_blocked, signals_blocked_pending;
 #endif
 static unsigned int signals_pending;
@@ -75,7 +75,7 @@ static void sig_handler(int sig, struct siginfo *si, mcontext_t *mc)
 {
 	int enabled = signals_enabled;
 
-#ifdef UML_CONFIG_UML_TIME_TRAVEL_SUPPORT
+#if IS_ENABLED(CONFIG_UML_TIME_TRAVEL_SUPPORT)
 	if ((signals_blocked ||
 	     __atomic_load_n(&signals_blocked_pending, __ATOMIC_SEQ_CST)) &&
 	    (sig == SIGIO)) {
@@ -297,7 +297,7 @@ void unblock_signals(void)
 		return;
 
 	signals_enabled = 1;
-#ifdef UML_CONFIG_UML_TIME_TRAVEL_SUPPORT
+#if IS_ENABLED(CONFIG_UML_TIME_TRAVEL_SUPPORT)
 	deliver_time_travel_irqs();
 #endif
 
@@ -389,7 +389,7 @@ int um_set_signals_trace(int enable)
 	return ret;
 }
 
-#ifdef UML_CONFIG_UML_TIME_TRAVEL_SUPPORT
+#if IS_ENABLED(CONFIG_UML_TIME_TRAVEL_SUPPORT)
 void mark_sigio_pending(void)
 {
 	/*
arch/um/os-Linux/skas/process.c +4 -2
index 97856955e892..f683cfc9e51a 100644
@@ -413,12 +413,14 @@ void userspace(struct uml_pt_regs *regs)
 		 */
 		if (time_travel_mode == TT_MODE_INFCPU ||
 		    time_travel_mode == TT_MODE_EXTERNAL) {
-			if (UML_CONFIG_UML_MAX_USERSPACE_ITERATIONS &&
+#ifdef CONFIG_UML_MAX_USERSPACE_ITERATIONS
+			if (CONFIG_UML_MAX_USERSPACE_ITERATIONS &&
 			    unscheduled_userspace_iterations++ >
-			    UML_CONFIG_UML_MAX_USERSPACE_ITERATIONS) {
+			    CONFIG_UML_MAX_USERSPACE_ITERATIONS) {
 				tt_extra_sched_jiffies += 1;
 				unscheduled_userspace_iterations = 0;
 			}
+#endif
 		}
 
 		time_travel_print_bc_msg();
arch/um/os-Linux/util.c +2 -2
index 1dca4ffbd572..4193e04d7e4a 100644
@@ -52,8 +52,8 @@ void setup_machinename(char *machine_out)
 	struct utsname host;
 
 	uname(&host);
-#ifdef UML_CONFIG_UML_X86
-# ifndef UML_CONFIG_64BIT
+#if IS_ENABLED(CONFIG_UML_X86)
+# if !IS_ENABLED(CONFIG_64BIT)
 	if (!strcmp(host.machine, "x86_64")) {
 		strcpy(machine_out, "i686");
 		return;
Signature · 1 line
2.47.0
#2 lore raw

PATCH v2 3/5 um: remove file sync for stub data

In reply to Benjamin Berg

From: Benjamin Berg <[email protected]>

There is no need to sync the stub code to "disk" for the other process to see the correct memory. Drop the fsync there and remove the helper function.

---
 arch/um/include/shared/os.h | 1 -
 arch/um/kernel/physmem.c    | 1 -
 arch/um/os-Linux/file.c     | 6 ------
 3 files changed, 8 deletions(-)
arch/um/include/shared/os.h +0 -1
index d709a24dc6fc..6c656ef096c9 100644
@@ -145,7 +145,6 @@ extern int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg);
 extern int os_get_ifname(int fd, char *namebuf);
 extern int os_set_slip(int fd);
 extern int os_mode_fd(int fd, int mode);
-extern int os_fsync_file(int fd);
 
 extern int os_seek_file(int fd, unsigned long long offset);
 extern int os_open_file(const char *file, struct openflags flags, int mode);
arch/um/kernel/physmem.c +0 -1
index d60df3626727..a74f17b033c4 100644
@@ -101,7 +101,6 @@ void __init setup_physmem(unsigned long start, unsigned long reserve_end,
 	 */
 	os_seek_file(physmem_fd, __pa(__syscall_stub_start));
 	os_write_file(physmem_fd, __syscall_stub_start, PAGE_SIZE);
-	os_fsync_file(physmem_fd);
 
 	memblock_add(__pa(start), len);
 	memblock_reserve(__pa(start), reserve);
arch/um/os-Linux/file.c +0 -6
index f1d03cf3957f..a0d01c68ce3e 100644
@@ -255,12 +255,6 @@ void os_close_file(int fd)
 {
 	close(fd);
 }
-int os_fsync_file(int fd)
-{
-	if (fsync(fd) < 0)
-	    return -errno;
-	return 0;
-}
 
 int os_seek_file(int fd, unsigned long long offset)
 {
Signature · 1 line
2.47.0
#3 lore raw

PATCH v2 4/5 um: remove duplicate UM_NSEC_PER_SEC definition

In reply to Benjamin Berg

From: Benjamin Berg <[email protected]>

Just remove the first entry as there is a second later on.

---
 arch/um/include/shared/common-offsets.h | 1 -
 1 file changed, 1 deletion(-)
arch/um/include/shared/common-offsets.h +0 -1
index 1d00fc6b6e92..73f3a4792ed8 100644
@@ -6,7 +6,6 @@ DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);
 DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE);
 DEFINE(UM_KERN_PAGE_MASK, PAGE_MASK);
 DEFINE(UM_KERN_PAGE_SHIFT, PAGE_SHIFT);
-DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);
 
 DEFINE(UM_GFP_KERNEL, GFP_KERNEL);
 DEFINE(UM_GFP_ATOMIC, GFP_ATOMIC);
Signature · 1 line
2.47.0
#4 lore raw

PATCH v2 5/5 um: remove broken double fault detection

In reply to Benjamin Berg

From: Benjamin Berg <[email protected]>

The show_stack function had some code to detect double faults. However, the logic is wrong and it would e.g. trigger if a WARNING happened inside an IRQ.

Remove it without trying to add a new logic. The current behaviour, which will just fault repeatedly until the IRQ stack is used up and the host kills UML, seems to be good enough.

---
 arch/um/include/shared/os.h | 1 -
 arch/um/kernel/sysrq.c      | 6 ------
 arch/um/os-Linux/signal.c   | 8 --------
 3 files changed, 15 deletions(-)
arch/um/include/shared/os.h +0 -1
index 6c656ef096c9..5babad8c5f75 100644
@@ -241,7 +241,6 @@ extern void block_signals(void);
 extern void unblock_signals(void);
 extern int um_set_signals(int enable);
 extern int um_set_signals_trace(int enable);
-extern int os_is_signal_stack(void);
 extern void deliver_alarm(void);
 extern void register_pm_wake_signal(void);
 extern void block_signals_hard(void);
arch/um/kernel/sysrq.c +0 -6
index 4bb8622dc512..a3bdab048617 100644
@@ -32,12 +32,6 @@ void show_stack(struct task_struct *task, unsigned long *stack,
 	struct pt_regs *segv_regs = current->thread.segv_regs;
 	int i;
 
-	if (!segv_regs && os_is_signal_stack()) {
-		pr_err("Received SIGSEGV in SIGSEGV handler,"
-				" aborting stack trace!\n");
-		return;
-	}
-
 	if (!stack)
 		stack = get_stack_pointer(task, segv_regs);
 
arch/um/os-Linux/signal.c +0 -8
index 1c6caa9dbd6c..52852018a3ad 100644
@@ -487,11 +487,3 @@ void unblock_signals_hard(void)
 	unblocking = false;
 }
 #endif
-
-int os_is_signal_stack(void)
-{
-	stack_t ss;
-	sigaltstack(NULL, &ss);
-
-	return ss.ss_flags & SS_ONSTACK;
-}
Signature · 1 line
2.47.0