From patchwork Mon Sep 5 12:24:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 12966047 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC79FC6FA83 for ; Mon, 5 Sep 2022 12:25:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4CFD38D0077; Mon, 5 Sep 2022 08:25:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4A63D8D0076; Mon, 5 Sep 2022 08:25:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 36E7C8D0077; Mon, 5 Sep 2022 08:25:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 282318D0076 for ; Mon, 5 Sep 2022 08:25:43 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id EAACB14035D for ; Mon, 5 Sep 2022 12:25:42 +0000 (UTC) X-FDA: 79877952924.21.B2F2C2F Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) by imf23.hostedemail.com (Postfix) with ESMTP id A4A89140079 for ; Mon, 5 Sep 2022 12:25:42 +0000 (UTC) Received: by mail-ed1-f74.google.com with SMTP id y12-20020a056402358c00b00448898f1c33so5691096edc.7 for ; Mon, 05 Sep 2022 05:25:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=hpHoy1zlF7EBf883UoQvMWO5+jjHkQm5Cfi8gPN98eQ=; b=JUFMkLirTS3MRYzbf3DA0Qf78yUbrU3Tmust9whDJBKCcRLOxp9b9XdCvqSBcwkn2Q Por8NNQUTGVnkzerAS/nRWsHGKaKfV5WwSeftTIENCRFWy0wXLiw7lbi5KzgiDciZ8CH MUI7Zz5353o/Qx6J49KbnsWeS7D4wcBdmA0hOCxj7NxRBdtsNEM0aCQEqVvA48EBKZG7 Mz78sHKvnGlp/aG0Wose98tGNuVwnZr5QL7pgaKlmDXbc6WQMzVcmsqCrTN0nDflh5AU 0NIChTRqEPLeAxwwaYnpQl24suF9Rw3FxGPFyZy5KfVYIr9phKVmPe+CcsSON0iQEjrS Bjeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=hpHoy1zlF7EBf883UoQvMWO5+jjHkQm5Cfi8gPN98eQ=; b=kKw0R1uCL/1dRF+D2pA9u9X96hRJfbK5du1m5lIdhHLxKfw0C6ERwtV/JdvfkhKjom nCZnZ8ynQ2b9ZhCG7jW9XvBDb03gNeQoXTlg5uV9ZnP9wzG7CWEb35EKa/ylfw2tLgMX OGlgaa7+MklfHHYPWtrEhkbv1ejgBhm8rqZYNe5ExenF3Okp05h2tSq5Cx/OTpnSbQ4w u2M6qzT3+ewOFFnsdk7uFq2lHsaB9CfwZF1+EIGButMfazEa50lo/zFh3Z7YTE5d9kuG OVd168R4KP5JJECsCGohqDpckGyrWT205eo4spXTBJkoiQBNDXAlpj9QnuiGkjCNpe7U jOOQ== X-Gm-Message-State: ACgBeo1Uk4SDa7mr/eAqHYQeXkneSZRW4hA4VvO8t1O02ue/3W3DglWO YXSBF+OPm6Eqx9dut4ewLvnwRkjMCYs= X-Google-Smtp-Source: AA6agR6tYFa7unOFIILxsZbuti9cA6v/ZqdVDdtiCSluOhA60ILv/E0Dc7MvwB1p0Qd0D4a/LzRHRwo57S8= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:b808:8d07:ab4a:554c]) (user=glider job=sendgmr) by 2002:aa7:cb13:0:b0:448:3759:8c57 with SMTP id s19-20020aa7cb13000000b0044837598c57mr33923922edt.8.1662380741433; Mon, 05 Sep 2022 05:25:41 -0700 (PDT) Date: Mon, 5 Sep 2022 14:24:24 +0200 In-Reply-To: <20220905122452.2258262-1-glider@google.com> Mime-Version: 1.0 References: <20220905122452.2258262-1-glider@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220905122452.2258262-17-glider@google.com> Subject: [PATCH v6 16/44] kmsan: handle task creation and exiting From: Alexander Potapenko To: glider@google.com Cc: Alexander Viro , Alexei Starovoitov , Andrew Morton , Andrey Konovalov , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Christoph Hellwig , Christoph Lameter , David Rientjes , Dmitry Vyukov , Eric Dumazet , Greg Kroah-Hartman , Herbert Xu , Ilya Leoshkevich , Ingo Molnar , Jens Axboe , Joonsoo Kim , Kees Cook , Marco Elver , Mark Rutland , Matthew Wilcox , "Michael S. Tsirkin" , Pekka Enberg , Peter Zijlstra , Petr Mladek , Steven Rostedt , Thomas Gleixner , Vasily Gorbik , Vegard Nossum , Vlastimil Babka , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662380742; a=rsa-sha256; cv=none; b=ev03wiqMPh92ju9Y72q0WSXQURTPBNuOkWY/VsUp6JsmqFnaJLg9SV62dR/lUwiUOfNbNn ppXn2BLmyCvTiR/oym2BqJM5yiL++Rfsvk5xGuQjA4rAGsG1pAI9Z9dIHNkwtkaxYt+Fml pJQkd2+tOEpVFce+kVzh3d7BqW9NtDE= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=JUFMkLir; spf=pass (imf23.hostedemail.com: domain of 3xeoVYwYKCBIy30vw9y66y3w.u64305CF-442Dsu2.69y@flex--glider.bounces.google.com designates 209.85.208.74 as permitted sender) smtp.mailfrom=3xeoVYwYKCBIy30vw9y66y3w.u64305CF-442Dsu2.69y@flex--glider.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662380742; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=hpHoy1zlF7EBf883UoQvMWO5+jjHkQm5Cfi8gPN98eQ=; b=JKjIbIs6Op9lMTOpeHD3kswBA34456xA0bgtS4W0Kz5I3qy6F0SWKmVctD7HhCDIP1DzV8 HmVHWz8zXS0tZ8F4OVdOniOJKsjOMYocgxPfBg6PQvJABiEDTjH48VkaPVKo/nszCfpeEH BEhvLsCBeAGV2kv1uKMyfRM7CsHzP2w= Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=JUFMkLir; spf=pass (imf23.hostedemail.com: domain of 3xeoVYwYKCBIy30vw9y66y3w.u64305CF-442Dsu2.69y@flex--glider.bounces.google.com designates 209.85.208.74 as permitted sender) smtp.mailfrom=3xeoVYwYKCBIy30vw9y66y3w.u64305CF-442Dsu2.69y@flex--glider.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam01 X-Rspam-User: X-Stat-Signature: j56nxofxjh65fygx4iq11aztqnmfcwdn X-Rspamd-Queue-Id: A4A89140079 X-HE-Tag: 1662380742-781623 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Tell KMSAN that a new task is created, so the tool creates a backing metadata structure for that task. Signed-off-by: Alexander Potapenko --- 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 5c4e0079054e6..354aee6f7b1a2 100644 --- a/include/linux/kmsan.h +++ b/include/linux/kmsan.h @@ -15,9 +15,22 @@ struct page; struct kmem_cache; +struct task_struct; #ifdef CONFIG_KMSAN +/** + * 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(). @@ -139,6 +152,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 #include #include +#include #include #include #include @@ -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 #include #include +#include #include #include #include @@ -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 009ac577bf3fc..fd007d53e9f53 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 000703c563a4d..6f3e64b0b61f8 100644 --- a/mm/kmsan/hooks.c +++ b/mm/kmsan/hooks.c @@ -27,6 +27,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);