From: Alexander Potapenko <glider@google.com>
To: glider@google.com
Cc: Alexander Viro <viro@zeniv.linux.org.uk>,
Alexei Starovoitov <ast@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Andrey Konovalov <andreyknvl@google.com>,
Andy Lutomirski <luto@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Borislav Petkov <bp@alien8.de>, Christoph Hellwig <hch@lst.de>,
Christoph Lameter <cl@linux.com>,
David Rientjes <rientjes@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
Eric Dumazet <edumazet@google.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Herbert Xu <herbert@gondor.apana.org.au>,
Ilya Leoshkevich <iii@linux.ibm.com>,
Ingo Molnar <mingo@redhat.com>, Jens Axboe <axboe@kernel.dk>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
Kees Cook <keescook@chromium.org>, Marco Elver <elver@google.com>,
Mark Rutland <mark.rutland@arm.com>,
Matthew Wilcox <willy@infradead.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
Pekka Enberg <penberg@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Petr Mladek <pmladek@suse.com>,
Steven Rostedt <rostedt@goodmis.org>,
Thomas Gleixner <tglx@linutronix.de>,
Vasily Gorbik <gor@linux.ibm.com>,
Vegard Nossum <vegard.nossum@oracle.com>,
Vlastimil Babka <vbabka@suse.cz>,
kasan-dev@googlegroups.com, linux-mm@kvack.org,
linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v5 16/44] kmsan: handle task creation and exiting
Date: Fri, 26 Aug 2022 17:07:39 +0200 [thread overview]
Message-ID: <20220826150807.723137-17-glider@google.com> (raw)
In-Reply-To: <20220826150807.723137-1-glider@google.com>
Tell KMSAN that a new task is created, so the tool creates a backing
metadata structure for that task.
Signed-off-by: Alexander Potapenko <glider@google.com>
---
v2:
-- move implementation of kmsan_task_create() and kmsan_task_exit() here
v4:
-- change sizeof(type) to sizeof(*ptr)
v5:
-- do not export KMSAN hooks that are not called from modules
-- minor comment fix
Link: https://linux-review.googlesource.com/id/I0f41c3a1c7d66f7e14aabcfdfc7c69addb945805
---
include/linux/kmsan.h | 21 +++++++++++++++++++++
kernel/exit.c | 2 ++
kernel/fork.c | 2 ++
mm/kmsan/core.c | 10 ++++++++++
mm/kmsan/hooks.c | 17 +++++++++++++++++
mm/kmsan/kmsan.h | 2 ++
6 files changed, 54 insertions(+)
diff --git a/include/linux/kmsan.h b/include/linux/kmsan.h
index fd76cea338878..5ec056380a43b 100644
--- a/include/linux/kmsan.h
+++ b/include/linux/kmsan.h
@@ -16,6 +16,7 @@
struct page;
struct kmem_cache;
+struct task_struct;
#ifdef CONFIG_KMSAN
@@ -42,6 +43,18 @@ struct kmsan_ctx {
bool allow_reporting;
};
+/**
+ * kmsan_task_create() - Initialize KMSAN state for the task.
+ * @task: task to initialize.
+ */
+void kmsan_task_create(struct task_struct *task);
+
+/**
+ * kmsan_task_exit() - Notify KMSAN that a task has exited.
+ * @task: task about to finish.
+ */
+void kmsan_task_exit(struct task_struct *task);
+
/**
* kmsan_alloc_page() - Notify KMSAN about an alloc_pages() call.
* @page: struct page pointer returned by alloc_pages().
@@ -163,6 +176,14 @@ void kmsan_iounmap_page_range(unsigned long start, unsigned long end);
#else
+static inline void kmsan_task_create(struct task_struct *task)
+{
+}
+
+static inline void kmsan_task_exit(struct task_struct *task)
+{
+}
+
static inline int kmsan_alloc_page(struct page *page, unsigned int order,
gfp_t flags)
{
diff --git a/kernel/exit.c b/kernel/exit.c
index 84021b24f79e3..f5d620c315662 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -60,6 +60,7 @@
#include <linux/writeback.h>
#include <linux/shm.h>
#include <linux/kcov.h>
+#include <linux/kmsan.h>
#include <linux/random.h>
#include <linux/rcuwait.h>
#include <linux/compat.h>
@@ -741,6 +742,7 @@ void __noreturn do_exit(long code)
WARN_ON(tsk->plug);
kcov_task_exit(tsk);
+ kmsan_task_exit(tsk);
coredump_task_exit(tsk);
ptrace_event(PTRACE_EVENT_EXIT, code);
diff --git a/kernel/fork.c b/kernel/fork.c
index 90c85b17bf698..7cf3eea01ceef 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -37,6 +37,7 @@
#include <linux/fdtable.h>
#include <linux/iocontext.h>
#include <linux/key.h>
+#include <linux/kmsan.h>
#include <linux/binfmts.h>
#include <linux/mman.h>
#include <linux/mmu_notifier.h>
@@ -1026,6 +1027,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node)
tsk->worker_private = NULL;
kcov_task_init(tsk);
+ kmsan_task_create(tsk);
kmap_local_fork(tsk);
#ifdef CONFIG_FAULT_INJECTION
diff --git a/mm/kmsan/core.c b/mm/kmsan/core.c
index a5dec6e62b4ef..a640e0cccbb64 100644
--- a/mm/kmsan/core.c
+++ b/mm/kmsan/core.c
@@ -44,6 +44,16 @@ bool kmsan_enabled __read_mostly;
*/
DEFINE_PER_CPU(struct kmsan_ctx, kmsan_percpu_ctx);
+void kmsan_internal_task_create(struct task_struct *task)
+{
+ struct kmsan_ctx *ctx = &task->kmsan_ctx;
+ struct thread_info *info = current_thread_info();
+
+ __memset(ctx, 0, sizeof(*ctx));
+ ctx->allow_reporting = true;
+ kmsan_internal_unpoison_memory(info, sizeof(*info), false);
+}
+
void kmsan_internal_poison_memory(void *address, size_t size, gfp_t flags,
unsigned int poison_flags)
{
diff --git a/mm/kmsan/hooks.c b/mm/kmsan/hooks.c
index 519a7a1dcb4aa..4ab8c629acd0c 100644
--- a/mm/kmsan/hooks.c
+++ b/mm/kmsan/hooks.c
@@ -26,6 +26,23 @@
* skipping effects of functions like memset() inside instrumented code.
*/
+void kmsan_task_create(struct task_struct *task)
+{
+ kmsan_enter_runtime();
+ kmsan_internal_task_create(task);
+ kmsan_leave_runtime();
+}
+
+void kmsan_task_exit(struct task_struct *task)
+{
+ struct kmsan_ctx *ctx = &task->kmsan_ctx;
+
+ if (!kmsan_enabled || kmsan_in_runtime())
+ return;
+
+ ctx->allow_reporting = false;
+}
+
void kmsan_slab_alloc(struct kmem_cache *s, void *object, gfp_t flags)
{
if (unlikely(object == NULL))
diff --git a/mm/kmsan/kmsan.h b/mm/kmsan/kmsan.h
index 6b9deee3b7f32..04954b83c5d65 100644
--- a/mm/kmsan/kmsan.h
+++ b/mm/kmsan/kmsan.h
@@ -179,6 +179,8 @@ void kmsan_internal_set_shadow_origin(void *address, size_t size, int b,
u32 origin, bool checked);
depot_stack_handle_t kmsan_internal_chain_origin(depot_stack_handle_t id);
+void kmsan_internal_task_create(struct task_struct *task);
+
bool kmsan_metadata_is_contiguous(void *addr, size_t size);
void kmsan_internal_check_memory(void *addr, size_t size, const void *user_addr,
int reason);
--
2.37.2.672.g94769d06f0-goog
next prev parent reply other threads:[~2022-08-26 15:11 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 15:07 [PATCH v5 00/44] Add KernelMemorySanitizer infrastructure Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 01/44] x86: add missing include to sparsemem.h Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 02/44] stackdepot: reserve 5 extra bits in depot_stack_handle_t Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 03/44] instrumented.h: allow instrumenting both sides of copy_from_user() Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 04/44] x86: asm: instrument usercopy in get_user() and put_user() Alexander Potapenko
2022-08-27 4:17 ` Andrew Morton
2022-08-29 14:57 ` Alexander Potapenko
2022-08-29 19:24 ` Andrew Morton
2022-08-30 14:23 ` Alexander Potapenko
2022-08-30 22:05 ` Andrew Morton
2022-08-30 22:25 ` Yu Zhao
2022-08-30 23:00 ` Andrew Morton
2022-08-30 23:07 ` Yu Zhao
2022-08-31 7:13 ` Alexander Potapenko
2022-09-01 23:44 ` Yu Zhao
2022-08-30 15:06 ` Christophe Leroy
2022-08-30 15:21 ` Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 05/44] asm-generic: instrument usercopy in cacheflush.h Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 06/44] kmsan: add ReST documentation Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 07/44] kmsan: introduce __no_sanitize_memory and __no_kmsan_checks Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 08/44] kmsan: mark noinstr as __no_sanitize_memory Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 09/44] x86: kmsan: pgtable: reduce vmalloc space Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 10/44] libnvdimm/pfn_dev: increase MAX_STRUCT_PAGE_SIZE Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 11/44] kmsan: add KMSAN runtime core Alexander Potapenko
2022-08-27 4:00 ` Andrew Morton
2022-08-26 15:07 ` [PATCH v5 12/44] kmsan: disable instrumentation of unsupported common kernel code Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 13/44] MAINTAINERS: add entry for KMSAN Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 14/44] mm: kmsan: maintain KMSAN metadata for page operations Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 15/44] mm: kmsan: call KMSAN hooks from SLUB code Alexander Potapenko
2022-08-26 15:07 ` Alexander Potapenko [this message]
2022-08-26 15:07 ` [PATCH v5 17/44] init: kmsan: call KMSAN initialization routines Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 18/44] instrumented.h: add KMSAN support Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 19/44] kmsan: unpoison @tlb in arch_tlb_gather_mmu() Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 20/44] kmsan: add iomap support Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 21/44] Input: libps2: mark data received in __ps2_command() as initialized Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 22/44] dma: kmsan: unpoison DMA mappings Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 23/44] virtio: kmsan: check/unpoison scatterlist in vring_map_one_sg() Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 24/44] kmsan: handle memory sent to/from USB Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 25/44] kmsan: add tests for KMSAN Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 26/44] kmsan: disable strscpy() optimization under KMSAN Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 27/44] crypto: kmsan: disable accelerated configs " Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 28/44] kmsan: disable physical page merging in biovec Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 29/44] block: kmsan: skip bio block merging logic for KMSAN Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 30/44] kcov: kmsan: unpoison area->list in kcov_remote_area_put() Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 31/44] security: kmsan: fix interoperability with auto-initialization Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 32/44] objtool: kmsan: list KMSAN API functions as uaccess-safe Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 33/44] x86: kmsan: disable instrumentation of unsupported code Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 34/44] x86: kmsan: skip shadow checks in __switch_to() Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 35/44] x86: kmsan: handle open-coded assembly in lib/iomem.c Alexander Potapenko
2022-08-26 15:07 ` [PATCH v5 36/44] x86: kmsan: use __msan_ string functions where possible Alexander Potapenko
2022-08-26 15:08 ` [PATCH v5 37/44] x86: kmsan: sync metadata pages on page fault Alexander Potapenko
2022-08-26 15:08 ` [PATCH v5 38/44] x86: kasan: kmsan: support CONFIG_GENERIC_CSUM on x86, enable it for KASAN/KMSAN Alexander Potapenko
2022-08-26 15:08 ` [PATCH v5 39/44] x86: fs: kmsan: disable CONFIG_DCACHE_WORD_ACCESS Alexander Potapenko
2022-08-26 15:08 ` [PATCH v5 40/44] x86: kmsan: don't instrument stack walking functions Alexander Potapenko
2022-08-26 15:08 ` [PATCH v5 41/44] entry: kmsan: introduce kmsan_unpoison_entry_regs() Alexander Potapenko
2022-08-26 15:08 ` [PATCH v5 42/44] bpf: kmsan: initialize BPF registers with zeroes Alexander Potapenko
2022-08-26 15:08 ` [PATCH v5 43/44] mm: fs: initialize fsdata passed to write_begin/write_end interface Alexander Potapenko
2022-08-26 15:08 ` [PATCH v5 44/44] x86: kmsan: enable KMSAN builds for x86 Alexander Potapenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220826150807.723137-17-glider@google.com \
--to=glider@google.com \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@google.com \
--cc=arnd@arndb.de \
--cc=ast@kernel.org \
--cc=axboe@kernel.dk \
--cc=bp@alien8.de \
--cc=cl@linux.com \
--cc=dvyukov@google.com \
--cc=edumazet@google.com \
--cc=elver@google.com \
--cc=gor@linux.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=herbert@gondor.apana.org.au \
--cc=iamjoonsoo.kim@lge.com \
--cc=iii@linux.ibm.com \
--cc=kasan-dev@googlegroups.com \
--cc=keescook@chromium.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=mst@redhat.com \
--cc=penberg@kernel.org \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=rientjes@google.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=vbabka@suse.cz \
--cc=vegard.nossum@oracle.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.