Page MenuHomeFreeBSD
Files F111648841

D31467.id93429.diff
No OneTemporary
Actions

D31467.id93429.diff
View Options

Index: sys/amd64/amd64/apic_vector.S
===================================================================
--- sys/amd64/amd64/apic_vector.S
+++ sys/amd64/amd64/apic_vector.S
@@ -81,6 +81,7 @@
*/
.macro ISR_VEC index, vec_name
INTR_HANDLER \vec_name
+ KMSAN_ENTER
cmpl $0,x2apic_mode
je 1f
movl $(MSR_APIC_ISR0 + \index),%ecx
@@ -97,6 +98,7 @@
movl %eax, %edi /* pass the IRQ */
call lapic_handle_intr
3:
+ KMSAN_LEAVE
jmp doreti
.endm
@@ -125,22 +127,28 @@
* Local APIC periodic timer handler.
*/
INTR_HANDLER timerint
+ KMSAN_ENTER
movq %rsp, %rdi
call lapic_handle_timer
+ KMSAN_LEAVE
jmp doreti
/*
* Local APIC CMCI handler.
*/
INTR_HANDLER cmcint
+ KMSAN_ENTER
call lapic_handle_cmc
+ KMSAN_LEAVE
jmp doreti
/*
* Local APIC error interrupt handler.
*/
INTR_HANDLER errorint
+ KMSAN_ENTER
call lapic_handle_error
+ KMSAN_LEAVE
jmp doreti
#ifdef XENHVM
@@ -149,8 +157,10 @@
* Only used when the hypervisor supports direct vector callbacks.
*/
INTR_HANDLER xen_intr_upcall
+ KMSAN_ENTER
movq %rsp, %rdi
call xen_intr_handle_upcall
+ KMSAN_LEAVE
jmp doreti
#endif
@@ -165,8 +175,10 @@
* IPI handler for cache and TLB shootdown
*/
INTR_HANDLER invlop
+ KMSAN_ENTER
call invlop_handler
call as_lapic_eoi
+ KMSAN_LEAVE
jmp ld_regs
/*
@@ -174,7 +186,9 @@
*/
INTR_HANDLER ipi_intr_bitmap_handler
call as_lapic_eoi
+ KMSAN_ENTER
call ipi_bitmap_handler
+ KMSAN_LEAVE
jmp doreti
/*
@@ -182,15 +196,19 @@
*/
INTR_HANDLER cpustop
call as_lapic_eoi
+ KMSAN_ENTER
call cpustop_handler
+ KMSAN_LEAVE
jmp doreti
/*
* Executed by a CPU when it receives an IPI_SUSPEND from another CPU.
*/
INTR_HANDLER cpususpend
+ KMSAN_ENTER
call cpususpend_handler
call as_lapic_eoi
+ KMSAN_LEAVE
jmp doreti
/*
@@ -198,7 +216,9 @@
*/
INTR_HANDLER ipi_swi
call as_lapic_eoi
+ KMSAN_ENTER
call ipi_swi_handler
+ KMSAN_LEAVE
jmp doreti
/*
@@ -212,8 +232,10 @@
movq ipi_rendezvous_counts(,%rax,8), %rax
incq (%rax)
#endif
+ KMSAN_ENTER
call smp_rendezvous_action
call as_lapic_eoi
+ KMSAN_LEAVE
jmp doreti
/*
Index: sys/amd64/amd64/atpic_vector.S
===================================================================
--- sys/amd64/amd64/atpic_vector.S
+++ sys/amd64/amd64/atpic_vector.S
@@ -44,9 +44,11 @@
*/
.macro INTR irq_num, vec_name
INTR_HANDLER \vec_name
+ KMSAN_ENTER
movq %rsp, %rsi
movl $\irq_num, %edi /* pass the IRQ */
call atpic_handle_intr
+ KMSAN_LEAVE
jmp doreti
.endm
Index: sys/amd64/amd64/exception.S
===================================================================
--- sys/amd64/amd64/exception.S
+++ sys/amd64/amd64/exception.S
@@ -282,8 +282,10 @@
.globl calltrap
.type calltrap,@function
calltrap:
- movq %rsp,%rdi
+ KMSAN_ENTER
+ movq %rsp, %rdi
call trap_check
+ KMSAN_LEAVE
jmp doreti /* Handle any pending ASTs */
/*
@@ -352,8 +354,10 @@
cmpq $~0,%rax
je 2f
movq %rax,%cr3
-2: movq %rsp,%rdi
+2: KMSAN_ENTER
+ movq %rsp,%rdi
call dblfault_handler
+ KMSAN_LEAVE
3: hlt
jmp 3b
@@ -856,8 +860,10 @@
3:
/* Note: this label is also used by ddb and gdb: */
nmi_calltrap:
+ KMSAN_ENTER
movq %rsp,%rdi
call trap
+ KMSAN_LEAVE
#ifdef HWPMC_HOOKS
/*
* Capture a userspace callchain if needed.
@@ -1043,8 +1049,10 @@
1: call handle_ibrs_entry
/* Note: this label is also used by ddb and gdb: */
mchk_calltrap:
+ KMSAN_ENTER
movq %rsp,%rdi
call mca_intr
+ KMSAN_LEAVE
testl %ebx,%ebx /* %ebx != 0 => return to userland */
jnz doreti_exit
/*
Index: sys/amd64/amd64/trap.c
===================================================================
--- sys/amd64/amd64/trap.c
+++ sys/amd64/amd64/trap.c
@@ -63,6 +63,7 @@
#include <sys/kernel.h>
#include <sys/ktr.h>
#include <sys/lock.h>
+#include <sys/msan.h>
#include <sys/mutex.h>
#include <sys/resourcevar.h>
#include <sys/signalvar.h>
@@ -229,6 +230,7 @@
dr6 = 0;
kasan_mark(frame, sizeof(*frame), sizeof(*frame), 0);
+ kmsan_mark(frame, sizeof(*frame), KMSAN_STATE_INITED);
VM_CNT_INC(v_trap);
type = frame->tf_trapno;
@@ -973,6 +975,7 @@
void
dblfault_handler(struct trapframe *frame)
{
+ kmsan_mark(frame, sizeof(*frame), KMSAN_STATE_INITED);
#ifdef KDTRACE_HOOKS
if (dtrace_doubletrap_func != NULL)
(*dtrace_doubletrap_func)();
@@ -1177,6 +1180,8 @@
{
ksiginfo_t ksi;
+ kmsan_mark(td->td_frame, sizeof(*td->td_frame), KMSAN_STATE_INITED);
+
#ifdef DIAGNOSTIC
if (!TRAPF_USERMODE(td->td_frame)) {
panic("syscall");
Index: sys/amd64/ia32/ia32_syscall.c
===================================================================
--- sys/amd64/ia32/ia32_syscall.c
+++ sys/amd64/ia32/ia32_syscall.c
@@ -55,6 +55,7 @@
#include <sys/kernel.h>
#include <sys/ktr.h>
#include <sys/lock.h>
+#include <sys/msan.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/ptrace.h>
@@ -208,6 +209,8 @@
register_t orig_tf_rflags;
ksiginfo_t ksi;
+ kmsan_mark(frame, sizeof(*frame), KMSAN_STATE_INITED);
+
orig_tf_rflags = frame->tf_rflags;
td = curthread;
td->td_frame = frame;
Index: sys/amd64/include/asmacros.h
===================================================================
--- sys/amd64/include/asmacros.h
+++ sys/amd64/include/asmacros.h
@@ -213,6 +213,28 @@
movq TF_R15(%rsp),%r15
.endm
+#ifdef KMSAN
+/*
+ * The KMSAN runtime relies on a TLS block to track initialization and origin
+ * state for function parameters and return values. To keep this state
+ * consistent in the face of asynchronous kernel-mode traps, the runtime
+ * maintains a stack of blocks: when handling an exception or interrupt,
+ * kmsan_intr_enter() pushes the new block to be used until the handler is
+ * complete, at which point kmsan_intr_leave() restores the previous block.
+ *
+ * Thus, KMSAN_ENTER/LEAVE hooks are required only in handlers for events that
+ * may have happened while in kernel-mode. In particular, they are not required
+ * around amd64_syscall() or ast() calls. Otherwise, kmsan_intr_enter() can be
+ * called unconditionally, without distinguishing between entry from user-mode
+ * or kernel-mode.
+ */
+#define KMSAN_ENTER callq kmsan_intr_enter
+#define KMSAN_LEAVE callq kmsan_intr_leave
+#else
+#define KMSAN_ENTER
+#define KMSAN_LEAVE
+#endif
+
#endif /* LOCORE */
#ifdef __STDC__
Index: sys/kern/kern_fork.c
===================================================================
--- sys/kern/kern_fork.c
+++ sys/kern/kern_fork.c
@@ -55,6 +55,7 @@
#include <sys/sysctl.h>
#include <sys/lock.h>
#include <sys/malloc.h>
+#include <sys/msan.h>
#include <sys/mutex.h>
#include <sys/priv.h>
#include <sys/proc.h>
@@ -1056,6 +1057,8 @@
struct thread *td;
struct thread *dtd;
+ kmsan_mark(frame, sizeof(*frame), KMSAN_STATE_INITED);
+
td = curthread;
p = td->td_proc;
KASSERT(p->p_state == PRS_NORMAL, ("executing process is still new"));
Index: sys/kern/subr_trap.c
===================================================================
--- sys/kern/subr_trap.c
+++ sys/kern/subr_trap.c
@@ -55,6 +55,7 @@
#include <sys/capsicum.h>
#include <sys/kernel.h>
#include <sys/lock.h>
+#include <sys/msan.h>
#include <sys/mutex.h>
#include <sys/pmckern.h>
#include <sys/proc.h>
@@ -216,6 +217,8 @@
int flags, sig;
bool resched_sigs;
+ kmsan_mark(framep, sizeof(*framep), KMSAN_STATE_INITED);
+
td = curthread;
p = td->td_proc;
Index: sys/x86/isa/atpic.c
===================================================================
--- sys/x86/isa/atpic.c
+++ sys/x86/isa/atpic.c
@@ -523,8 +523,8 @@
{
struct intsrc *isrc;
- /* The frame may have been written into a poisoned region. */
kasan_mark(frame, sizeof(*frame), sizeof(*frame), 0);
+ kmsan_mark(frame, sizeof(*frame), KMSAN_STATE_INITED);
KASSERT(vector < NUM_ISA_IRQS, ("unknown int %u\n", vector));
isrc = &atintrs[vector].at_intsrc;
Index: sys/x86/x86/local_apic.c
===================================================================
--- sys/x86/x86/local_apic.c
+++ sys/x86/x86/local_apic.c
@@ -48,6 +48,7 @@
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
+#include <sys/msan.h>
#include <sys/mutex.h>
#include <sys/pcpu.h>
#include <sys/proc.h>
@@ -1306,8 +1307,9 @@
{
struct intsrc *isrc;
- /* The frame may have been written into a poisoned region. */
kasan_mark(frame, sizeof(*frame), sizeof(*frame), 0);
+ kmsan_mark(&vector, sizeof(vector), KMSAN_STATE_INITED);
+ kmsan_mark(frame, sizeof(*frame), KMSAN_STATE_INITED);
isrc = intr_lookup_source(apic_idt_to_irq(PCPU_GET(apic_id),
vector));
@@ -1324,8 +1326,8 @@
/* Send EOI first thing. */
lapic_eoi();
- /* The frame may have been written into a poisoned region. */
kasan_mark(frame, sizeof(*frame), sizeof(*frame), 0);
+ kmsan_mark(frame, sizeof(*frame), KMSAN_STATE_INITED);
#if defined(SMP) && !defined(SCHED_ULE)
/*

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 7, 12:15 PM (20 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17031816
Default Alt Text
D31467.id93429.diff (8 KB)

Event Timeline