From patchwork Tue Sep 7 14:13:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Elver X-Patchwork-Id: 12478825 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC731C433EF for ; Tue, 7 Sep 2021 14:14:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8E7CF610E9 for ; Tue, 7 Sep 2021 14:14:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8E7CF610E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 2FBE094000B; Tue, 7 Sep 2021 10:14:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1E730940007; Tue, 7 Sep 2021 10:14:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D84E94000B; Tue, 7 Sep 2021 10:14:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0196.hostedemail.com [216.40.44.196]) by kanga.kvack.org (Postfix) with ESMTP id F3955940007 for ; Tue, 7 Sep 2021 10:14:14 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id AFC5D2D019 for ; Tue, 7 Sep 2021 14:14:14 +0000 (UTC) X-FDA: 78560972028.08.38E558D Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf02.hostedemail.com (Postfix) with ESMTP id 6DF817001700 for ; Tue, 7 Sep 2021 14:14:14 +0000 (UTC) Received: by mail-wm1-f73.google.com with SMTP id s197-20020a1ca9ce000000b002e72ba822dcso1251572wme.6 for ; Tue, 07 Sep 2021 07:14:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=xcObahmn+nrr83zfh05tWVTdAkOdXoaYlFTrwb+vDxw=; b=PwTMtZh9hU0VqLk69hEXqYfnxKsjVqFY7wOSFa1J0JB6DQhg2CtMHi//BlIXmlAJcR yl9HreJGMh+fm26LpJy0ArZAj++4Fu4KvyaIdfJ82LB3ATSviQI6qC2cUv53tm+SqOqo ZgPg/NhW5nrFtj6UtT6b7nwehz/BqtUvvuNGJ7Xqvz7NDleWgKV/yIGmUsypiwLCBrLH w/wrxaP8qWrm/esdH1O/wqUUWOxZN/0ETQ/gcpzJMgGZnv0+XxeRCAyCu+4EaPQOHmwf 3rgpocuiCwu5u0uohAPSkFEYqzBswRdhUe+J3Ce5DVzKXUaqfnRxeVl7hFxA8IARySQj rdOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=xcObahmn+nrr83zfh05tWVTdAkOdXoaYlFTrwb+vDxw=; b=cdUI+4ZE+1v4veIdf9XHICzcVh4rQV4Pn7QecXgeOLCtfXppzI9k9oV91uCqYccuVT /cfD1Ou75ryEHbPTKMm7m1Au1rKb2JB3wBq82ayEn7QgQA0bgAdrdzK2DxT3mMQW99sJ /Qq18j0HTpLyXOt3raoRMVH2Ol9SSzRmYkbmIrqonTZx8KLM85BIBP4+IzYdSdqF1eWF ALzSNfoT1w2ZI25qWHe+Xmswq3s1/c2BJNlppmKmGOjUg4HrqA0KLflsC0AIkXZduIzp OgBFIfAdO/h6TX1hSz790v12HnlyDeZeZ5Wntmdn4lEwT8ol9IzvNMd57ob0Ua80dAgu sN8w== X-Gm-Message-State: AOAM532TQfLao3ZFWnf8xm3E/j8Xa3RStzhJnkI04vpyFxBTX37kt7c4 RovC7Lv6X1xWpP5+8mnh0dz2rcaADA== X-Google-Smtp-Source: ABdhPJz1b1Axug1WWI+1xRe0YSX8kMPS6z8VQ8CJ0thqYCiLI9VeUYCGXaKQD6xIAXx4V6nEcFtte+5HyQ== X-Received: from elver.muc.corp.google.com ([2a00:79e0:15:13:6800:c1ea:4271:5898]) (user=elver job=sendgmr) by 2002:a05:600c:2193:: with SMTP id e19mr4229864wme.40.1631024053139; Tue, 07 Sep 2021 07:14:13 -0700 (PDT) Date: Tue, 7 Sep 2021 16:13:06 +0200 In-Reply-To: <20210907141307.1437816-1-elver@google.com> Message-Id: <20210907141307.1437816-6-elver@google.com> Mime-Version: 1.0 References: <20210907141307.1437816-1-elver@google.com> X-Mailer: git-send-email 2.33.0.153.gba50c8fa24-goog Subject: [PATCH 5/6] kasan: generic: introduce kasan_record_aux_stack_noalloc() From: Marco Elver To: elver@google.com Cc: Andrew Morton , Shuah Khan , Tejun Heo , Lai Jiangshan , Andrey Konovalov , Walter Wu , Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Vijayanand Jitta , Vinayak Menon , "Gustavo A. R. Silva" , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Aleksandr Nogikh , Taras Madan Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=PwTMtZh9; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf02.hostedemail.com: domain of 3tXM3YQUKCIosz9s5u22uzs.q20zw18B-00y9oqy.25u@flex--elver.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3tXM3YQUKCIosz9s5u22uzs.q20zw18B-00y9oqy.25u@flex--elver.bounces.google.com X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 6DF817001700 X-Stat-Signature: wiom7hwpi9yat37ka536fccy79oefd8z X-HE-Tag: 1631024054-457349 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: Introduce a variant of kasan_record_aux_stack() that does not do any memory allocation through stackdepot. This will permit using it in contexts that cannot allocate any memory. Signed-off-by: Marco Elver --- include/linux/kasan.h | 2 ++ mm/kasan/generic.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index dd874a1ee862..736d7b458996 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -370,12 +370,14 @@ static inline void kasan_unpoison_task_stack(struct task_struct *task) {} void kasan_cache_shrink(struct kmem_cache *cache); void kasan_cache_shutdown(struct kmem_cache *cache); void kasan_record_aux_stack(void *ptr); +void kasan_record_aux_stack_noalloc(void *ptr); #else /* CONFIG_KASAN_GENERIC */ static inline void kasan_cache_shrink(struct kmem_cache *cache) {} static inline void kasan_cache_shutdown(struct kmem_cache *cache) {} static inline void kasan_record_aux_stack(void *ptr) {} +static inline void kasan_record_aux_stack_noalloc(void *ptr) {} #endif /* CONFIG_KASAN_GENERIC */ diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index 2a8e59e6326d..84a038b07c6f 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -328,7 +328,7 @@ DEFINE_ASAN_SET_SHADOW(f3); DEFINE_ASAN_SET_SHADOW(f5); DEFINE_ASAN_SET_SHADOW(f8); -void kasan_record_aux_stack(void *addr) +static void __kasan_record_aux_stack(void *addr, bool can_alloc) { struct page *page = kasan_addr_to_page(addr); struct kmem_cache *cache; @@ -345,7 +345,17 @@ void kasan_record_aux_stack(void *addr) return; alloc_meta->aux_stack[1] = alloc_meta->aux_stack[0]; - alloc_meta->aux_stack[0] = kasan_save_stack(GFP_NOWAIT, true); + alloc_meta->aux_stack[0] = kasan_save_stack(GFP_NOWAIT, can_alloc); +} + +void kasan_record_aux_stack(void *addr) +{ + return __kasan_record_aux_stack(addr, true); +} + +void kasan_record_aux_stack_noalloc(void *addr) +{ + return __kasan_record_aux_stack(addr, false); } void kasan_set_free_info(struct kmem_cache *cache,