From nobody Fri Feb 7 14:47:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YqGyh0fDJz5mHH4; Fri, 07 Feb 2025 14:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YqGyg42sNz3CF7; Fri, 07 Feb 2025 14:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738939627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2KtgYe2t/QjAMuxzlDugtDd2Ty7fvUWuj6gRm1v8X+8=; b=FoCG73wyfmisQl8Z3w2NcyQLN3xovGfh73hmq+b8/etxXqTer9MwfcD3RUjJEVfSPR+MmV 0roqlto05YXALIRc4qx7I/Q7hggUGPSb0c2p+C7qnvjPgJ0lvg9PXqjl04TpbOAyrJ1Ko/ XDp4/ei8ZB3dpSudc3OW7UcbH5mk35VJqgkv0q3pNiyUpqmijIxRCJ0Bsns0wAM/MTqV0R 6ZQeZrr1bFbQOyurpx72oNPAIFQ5LaU8uA2C+XjpadabuoNLBFLOZ0p7xpT+DVRnw9jwby pn6G4oB6yRlvKL8GX2l1rbRea9a+MrAlD6TnhWY8aCJijMb223LpyuseCcQNkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738939627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2KtgYe2t/QjAMuxzlDugtDd2Ty7fvUWuj6gRm1v8X+8=; b=r4DpzVBrHok7i6yelzLeKofIyMg9x/7EBCqk1xmjTn/DiuVIfcujJp7rhGI6IHrw3/xp0I V+n/5f37e7mJMQSk+5Ypgbg2PyPUzTo9iiqnixTip9SEDxU+nveQfueEV8CYRzd4SdFbsK 1JsKXzYAuY6rCtthK8pv9tY7nSwglYz6uJAAIxfuvBWGIWiLNAbWu35X9BdBc12sg/sUlp ouFD7Qx/eMG9+CozCuenEz3ZoK5OU+BOv1blsF//Qqt1sVuY22vSCTg1XuyIJRqtjhBIzc +WdlOfdHs3arMoyleQpjAjffuQ+zh/TzVNNTGIyZlyZClgGHklMoPwhQlOefTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738939627; a=rsa-sha256; cv=none; b=odGJ4mnuYthnqmpEHxP6NuB7YKpnZh0GlRM3qqW7ZLS/JxkLac3S2Yj56o8o95pFZboMdS GzeD5BGcoOF8kHFoCmcSpExgJBsUboSEaTjQBn+PyoCsQ7Oq2iz69H6tMspEUo98QiEr8r 5htMXzzY6w1NORSZtdWiWzFxDRzSFmaRZwCA5GNfDwa52p0h/aAP3gFtE1AEZqux3UdY6Q 901wZ/ouv4pd9F6WcSmJCQmsRwQZn/jT8QGnDxF8lgfMhVT4mUcL6PlTYgw/WTd5vg45uE ADEJ7kltNV+zAApGztTTXXS+/RrW2flS36r+xeKcjTXRu87LrR9XpDQ/iCMI7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YqGyg3YyMzCk3; Fri, 07 Feb 2025 14:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 517El7wh003007; Fri, 7 Feb 2025 14:47:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 517El7ag003004; Fri, 7 Feb 2025 14:47:07 GMT (envelope-from git) Date: Fri, 7 Feb 2025 14:47:07 GMT Message-Id: <202502071447.517El7ag003004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0db4588bbe6e - stable/14 - thread: Simplify sanitizer integration with thread creation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0db4588bbe6e9eb83a5a824cc35d35e6fb878e26 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0db4588bbe6e9eb83a5a824cc35d35e6fb878e26 commit 0db4588bbe6e9eb83a5a824cc35d35e6fb878e26 Author: Mark Johnston AuthorDate: 2024-04-22 15:43:17 +0000 Commit: Mark Johnston CommitDate: 2025-02-07 14:46:53 +0000 thread: Simplify sanitizer integration with thread creation fork() may allocate a new thread in one of two ways: from UMA, or cached in a freed proc that was just allocated from UMA. In either case, KASAN and KMSAN need to initialize some state; in particular they need to initialize the shadow mapping of the new thread's stack. This is done differently between KASAN and KMSAN, which is confusing. This patch improves things a bit: - Add a new thread_recycle() function, which moves all kernel stack handling out of kern_fork.c, since it doesn't really belong there. - Then, thread_alloc_stack() has only one local caller, so just inline it. - Avoid redundant shadow stack initialization: thread_alloc() initializes the KMSAN shadow stack (via kmsan_thread_alloc()) even through vm_thread_new() already did that. - Add kasan_thread_alloc(), for consistency with kmsan_thread_alloc(). No functional change intended. Reviewed by: khng MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44891 (cherry picked from commit 800da341bc4a35f4b4d82d104b130825d9a42ffa) --- sys/kern/kern_fork.c | 17 +++-------------- sys/kern/kern_thread.c | 20 ++++++++++++-------- sys/kern/subr_asan.c | 10 ++++++++++ sys/sys/asan.h | 4 ++++ sys/sys/proc.h | 2 +- sys/vm/vm_glue.c | 7 ++++--- 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 8f11bc246593..ee58ad42bce6 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -42,7 +42,6 @@ #include #include -#include #include #include #include @@ -1021,19 +1020,9 @@ fork1(struct thread *td, struct fork_req *fr) } proc_linkup(newproc, td2); } else { - kmsan_thread_alloc(td2); - if (td2->td_kstack == 0 || td2->td_kstack_pages != pages) { - if (td2->td_kstack != 0) - vm_thread_dispose(td2); - if (!thread_alloc_stack(td2, pages)) { - error = ENOMEM; - goto fail2; - } - } else { - kasan_mark((void *)td2->td_kstack, - ptoa(td2->td_kstack_pages), - ptoa(td2->td_kstack_pages), 0); - } + error = thread_recycle(td2, pages); + if (error != 0) + goto fail2; } if ((flags & RFMEM) == 0) { diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 102ba609cae7..af125ff28dc0 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -797,6 +797,7 @@ thread_alloc(int pages) } td->td_tid = tid; bzero(&td->td_sa.args, sizeof(td->td_sa.args)); + kasan_thread_alloc(td); kmsan_thread_alloc(td); cpu_thread_alloc(td); EVENTHANDLER_DIRECT_INVOKE(thread_ctor, td); @@ -804,15 +805,18 @@ thread_alloc(int pages) } int -thread_alloc_stack(struct thread *td, int pages) +thread_recycle(struct thread *td, int pages) { - - KASSERT(td->td_kstack == 0, - ("thread_alloc_stack called on a thread with kstack")); - if (!vm_thread_new(td, pages)) - return (0); - cpu_thread_alloc(td); - return (1); + if (td->td_kstack == 0 || td->td_kstack_pages != pages) { + if (td->td_kstack != 0) + vm_thread_dispose(td); + if (!vm_thread_new(td, pages)) + return (ENOMEM); + cpu_thread_alloc(td); + } + kasan_thread_alloc(td); + kmsan_thread_alloc(td); + return (0); } /* diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index 51bf1f684c79..0edb631d1475 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -39,6 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.26 2020/09/10 14:10:46 maxv Exp $"); #include #include #include +#include #include #include @@ -294,6 +295,15 @@ kasan_mark(const void *addr, size_t size, size_t redzsize, uint8_t code) } } +void +kasan_thread_alloc(struct thread *td) +{ + if (td->td_kstack != 0) { + kasan_mark((void *)td->td_kstack, ptoa(td->td_kstack_pages), + ptoa(td->td_kstack_pages), 0); + } +} + /* -------------------------------------------------------------------------- */ #define ADDR_CROSSES_SCALE_BOUNDARY(addr, size) \ diff --git a/sys/sys/asan.h b/sys/sys/asan.h index a3becdef5f57..6a01d0531725 100644 --- a/sys/sys/asan.h +++ b/sys/sys/asan.h @@ -53,14 +53,18 @@ #define KASAN_KSTACK_FREED 0xFE #define KASAN_EXEC_ARGS_FREED 0xFF +struct thread; + void kasan_init(void); void kasan_init_early(vm_offset_t, size_t); void kasan_shadow_map(vm_offset_t, size_t); void kasan_mark(const void *, size_t, size_t, uint8_t); +void kasan_thread_alloc(struct thread *); #else /* KASAN */ #define kasan_init() #define kasan_shadow_map(a, s) #define kasan_mark(p, s, l, c) +#define kasan_thread_alloc(t) #endif /* !KASAN */ #endif /* !_SYS_ASAN_H_ */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index c43d00a223f7..e37f0521861a 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1260,7 +1260,6 @@ void cpu_thread_free(struct thread *); void cpu_thread_swapin(struct thread *); void cpu_thread_swapout(struct thread *); struct thread *thread_alloc(int pages); -int thread_alloc_stack(struct thread *, int pages); int thread_check_susp(struct thread *td, bool sleep); void thread_cow_get_proc(struct thread *newtd, struct proc *p); void thread_cow_get(struct thread *newtd, struct thread *td); @@ -1273,6 +1272,7 @@ void thread_exit(void) __dead2; void thread_free(struct thread *td); void thread_link(struct thread *td, struct proc *p); void thread_reap_barrier(void); +int thread_recycle(struct thread *, int pages); int thread_single(struct proc *p, int how); void thread_single_end(struct proc *p, int how); void thread_stash(struct thread *td); diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 031959c2aff9..f0ec4ac83517 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -391,11 +391,12 @@ vm_thread_dispose(struct thread *td) ks = td->td_kstack; td->td_kstack = 0; td->td_kstack_pages = 0; - kasan_mark((void *)ks, 0, ptoa(pages), KASAN_KSTACK_FREED); - if (pages == kstack_pages) + if (pages == kstack_pages) { + kasan_mark((void *)ks, 0, ptoa(pages), KASAN_KSTACK_FREED); uma_zfree(kstack_cache, (void *)ks); - else + } else { vm_thread_stack_dispose(ks, pages); + } } /*