From mboxrd@z Thu Jan 1 00:00:00 1970 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=-11.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,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 3CC9DC47255 for ; Mon, 11 May 2020 12:31:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D809D20746 for ; Mon, 11 May 2020 12:31:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="YtQ6H/Ia" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D809D20746 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 83985900039; Mon, 11 May 2020 08:31:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7EAFE900036; Mon, 11 May 2020 08:31:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6D891900039; Mon, 11 May 2020 08:31:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0069.hostedemail.com [216.40.44.69]) by kanga.kvack.org (Postfix) with ESMTP id 54E3F900036 for ; Mon, 11 May 2020 08:31:51 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id F3DAE181AC9C6 for ; Mon, 11 May 2020 12:31:50 +0000 (UTC) X-FDA: 76804374822.07.form28_2d2dc4695ec3d X-HE-Tag: form28_2d2dc4695ec3d X-Filterd-Recvd-Size: 13963 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Mon, 11 May 2020 12:31:50 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id g185so9457650qke.7 for ; Mon, 11 May 2020 05:31:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=x+HxYeL1lqwTBd9S2yxU8pNrVDCqS5KUpPIwISNSAbg=; b=YtQ6H/IaE5KdyttKS43zVCV4Y4M/LrwJtsCCAz02YG3qoJF/ZYhLC2WsNgYohDp014 aGRfZ0QArBHNeVG7I8Qpbl3YFcM0f/yP+zbRJS91stVtFt+8cLPV3HZfq8k4uw1Iki1J KrQVhYr5tgLviVxOVI1QCaDxMhZesLX44YYnS6HtAByrGSJuN09h+nME/SMRY9+PtGNc htLVtO15tn7n0sO11lAWDSXjkgNeGmEpuZ+VAr8WIpJphJioQRJZGDkDW63YVZpn2Jsj wqpO2xpUxr2B0jSlJMMMFIuEQCfnDiSR0VKoySHDk4B2e1ENegc9dQVPc0W3SDYQsApZ WmLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=x+HxYeL1lqwTBd9S2yxU8pNrVDCqS5KUpPIwISNSAbg=; b=rYKyyHTV89uEsX1MDSI7Ai46gsfMD7UTvgpxuNnCd6/5cW6Et9I1o5uRgW7vzT18hg I5rtctb3tp382zeX+jCNnWKVfrqeP8zXFW19eUwfRSA3PxDif3n5ro+L+iVUmYwpzzHc 5c9UJpA7B2rwpqXopC/c9wGO+NSksJjPhU03IfpAp0f2hZZAmleHuK5+OAa2tp/ixVoA eTV2sr9gGeDnBaRS8k+BGdQTRzFJhUfB9SFWu1f4WeA+FnO7Uz6Sau4HLJR0Xql/6MUZ y77L7nUyKZMR8kKYReU/5cRb/olTPkjL01lW+RCInhGh8vKQVMUo4vu2QeTyFaMZLKbq mmsA== X-Gm-Message-State: AGi0PuacAQKiqcb3Sx5KugFq8qOPf8TxtvabqxTGEGbAE+/uIRVbAscI LgrIhGbX7Qtqiw1CegyAARs6KixQQuAQLUXB2NwDMQ== X-Google-Smtp-Source: APiQypIZ+OwlhuPOwedNPnLfxSA34Q3ABa0B0iwGw9A32WTzRLh5OyDJW2WkMoD2JQds3Qt5/EXmm2FDcxTW54PRaQ4= X-Received: by 2002:a05:620a:990:: with SMTP id x16mr7641458qkx.256.1589200309364; Mon, 11 May 2020 05:31:49 -0700 (PDT) MIME-Version: 1.0 References: <20200511023111.15310-1-walter-zh.wu@mediatek.com> In-Reply-To: <20200511023111.15310-1-walter-zh.wu@mediatek.com> From: Dmitry Vyukov Date: Mon, 11 May 2020 14:31:38 +0200 Message-ID: Subject: Re: [PATCH v2 1/3] rcu/kasan: record and print call_rcu() call stack To: Walter Wu Cc: Andrey Ryabinin , Alexander Potapenko , Matthias Brugger , "Paul E . McKenney" , Josh Triplett , Mathieu Desnoyers , Lai Jiangshan , Joel Fernandes , Andrew Morton , kasan-dev , Linux-MM , LKML , Linux ARM , wsd_upstream , linux-mediatek@lists.infradead.org Content-Type: text/plain; charset="UTF-8" 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: On Mon, May 11, 2020 at 4:31 AM Walter Wu wrote: > > This feature will record first and last call_rcu() call stack and > print two call_rcu() call stack in KASAN report. > > When call_rcu() is called, we store the call_rcu() call stack into > slub alloc meta-data, so that KASAN report can print rcu stack. > > It doesn't increase the cost of memory consumption. Because we don't > enlarge struct kasan_alloc_meta size. > - add two call_rcu() call stack into kasan_alloc_meta, size is 8 bytes. > - remove free track from kasan_alloc_meta, size is 8 bytes. > > [1]https://bugzilla.kernel.org/show_bug.cgi?id=198437 > [2]https://groups.google.com/forum/#!searchin/kasan-dev/better$20stack$20traces$20for$20rcu%7Csort:date/kasan-dev/KQsjT_88hDE/7rNUZprRBgAJ > > Signed-off-by: Walter Wu > Suggested-by: Dmitry Vyukov > Cc: Andrey Ryabinin > Cc: Dmitry Vyukov > Cc: Alexander Potapenko > Cc: Andrew Morton > Cc: Paul E. McKenney > Cc: Josh Triplett > Cc: Mathieu Desnoyers > Cc: Lai Jiangshan > Cc: Joel Fernandes > --- > include/linux/kasan.h | 2 ++ > kernel/rcu/tree.c | 3 +++ > lib/Kconfig.kasan | 2 ++ > mm/kasan/common.c | 4 ++-- > mm/kasan/generic.c | 29 +++++++++++++++++++++++++++++ > mm/kasan/kasan.h | 19 +++++++++++++++++++ > mm/kasan/report.c | 21 +++++++++++++++++---- > 7 files changed, 74 insertions(+), 6 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 31314ca7c635..23b7ee00572d 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -174,11 +174,13 @@ static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } > > void kasan_cache_shrink(struct kmem_cache *cache); > void kasan_cache_shutdown(struct kmem_cache *cache); > +void kasan_record_aux_stack(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) {} > > #endif /* CONFIG_KASAN_GENERIC */ > > diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c > index 06548e2ebb72..de872b6cc261 100644 > --- a/kernel/rcu/tree.c > +++ b/kernel/rcu/tree.c > @@ -57,6 +57,7 @@ > #include > #include > #include > +#include > #include "../time/tick-internal.h" > > #include "tree.h" > @@ -2694,6 +2695,8 @@ __call_rcu(struct rcu_head *head, rcu_callback_t func) > trace_rcu_callback(rcu_state.name, head, > rcu_segcblist_n_cbs(&rdp->cblist)); > > + kasan_record_aux_stack(head); > + > /* Go handle any RCU core processing required. */ > if (IS_ENABLED(CONFIG_RCU_NOCB_CPU) && > unlikely(rcu_segcblist_is_offloaded(&rdp->cblist))) { > diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan > index 81f5464ea9e1..56a89291f1cc 100644 > --- a/lib/Kconfig.kasan > +++ b/lib/Kconfig.kasan > @@ -58,6 +58,8 @@ config KASAN_GENERIC > For better error detection enable CONFIG_STACKTRACE. > Currently CONFIG_KASAN_GENERIC doesn't work with CONFIG_DEBUG_SLAB > (the resulting kernel does not boot). > + Currently CONFIG_KASAN_GENERIC will print first and last call_rcu() > + call stack. It doesn't increase the cost of memory consumption. > > config KASAN_SW_TAGS > bool "Software tag-based mode" > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index 2906358e42f0..8bc618289bb1 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -41,7 +41,7 @@ > #include "kasan.h" > #include "../slab.h" > > -static inline depot_stack_handle_t save_stack(gfp_t flags) > +depot_stack_handle_t kasan_save_stack(gfp_t flags) > { > unsigned long entries[KASAN_STACK_DEPTH]; > unsigned int nr_entries; > @@ -54,7 +54,7 @@ static inline depot_stack_handle_t save_stack(gfp_t flags) > static inline void set_track(struct kasan_track *track, gfp_t flags) > { > track->pid = current->pid; > - track->stack = save_stack(flags); > + track->stack = kasan_save_stack(flags); > } > > void kasan_enable_current(void) > diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c > index 56ff8885fe2e..b86880c338e2 100644 > --- a/mm/kasan/generic.c > +++ b/mm/kasan/generic.c > @@ -325,3 +325,32 @@ DEFINE_ASAN_SET_SHADOW(f2); > DEFINE_ASAN_SET_SHADOW(f3); > DEFINE_ASAN_SET_SHADOW(f5); > DEFINE_ASAN_SET_SHADOW(f8); > + > +void kasan_record_aux_stack(void *addr) > +{ > + struct page *page = kasan_addr_to_page(addr); > + struct kmem_cache *cache; > + struct kasan_alloc_meta *alloc_info; > + void *object; > + > + if (!(page && PageSlab(page))) > + return; > + > + cache = page->slab_cache; > + object = nearest_obj(cache, page, addr); > + alloc_info = get_alloc_info(cache, object); > + > + if (!alloc_info->rcu_stack[0]) > + /* record first call_rcu() call stack */ > + alloc_info->rcu_stack[0] = kasan_save_stack(GFP_NOWAIT); > + else > + /* record last call_rcu() call stack */ > + alloc_info->rcu_stack[1] = kasan_save_stack(GFP_NOWAIT); > +} > + > +struct kasan_track *kasan_get_aux_stack(struct kasan_alloc_meta *alloc_info, > + u8 idx) > +{ > + return container_of(&alloc_info->rcu_stack[idx], > + struct kasan_track, stack); > +} > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index e8f37199d885..1cc1fb7b0de3 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -96,15 +96,28 @@ struct kasan_track { > depot_stack_handle_t stack; > }; > > +#ifdef CONFIG_KASAN_GENERIC > +#define SIZEOF_PTR sizeof(void *) Please move this to generic.c closer to kasan_set_free_info. Unnecessary in the header. > +#define KASAN_NR_RCU_CALL_STACKS 2 Since KASAN_NR_RCU_CALL_STACKS is only used once below, you could as well use 2 instead of it. Reduces level of indirection and cognitive load. > +#else /* CONFIG_KASAN_GENERIC */ > #ifdef CONFIG_KASAN_SW_TAGS_IDENTIFY > #define KASAN_NR_FREE_STACKS 5 > #else > #define KASAN_NR_FREE_STACKS 1 > #endif > +#endif /* CONFIG_KASAN_GENERIC */ > > struct kasan_alloc_meta { > struct kasan_track alloc_track; > +#ifdef CONFIG_KASAN_GENERIC > + /* > + * call_rcu() call stack is stored into struct kasan_alloc_meta. > + * The free stack is stored into freed object. > + */ > + depot_stack_handle_t rcu_stack[KASAN_NR_RCU_CALL_STACKS]; > +#else > struct kasan_track free_track[KASAN_NR_FREE_STACKS]; > +#endif > #ifdef CONFIG_KASAN_SW_TAGS_IDENTIFY > u8 free_pointer_tag[KASAN_NR_FREE_STACKS]; > u8 free_track_idx; > @@ -159,16 +172,22 @@ void kasan_report_invalid_free(void *object, unsigned long ip); > > struct page *kasan_addr_to_page(const void *addr); > > +depot_stack_handle_t kasan_save_stack(gfp_t flags); > + > #if defined(CONFIG_KASAN_GENERIC) && \ > (defined(CONFIG_SLAB) || defined(CONFIG_SLUB)) > void quarantine_put(struct kasan_free_meta *info, struct kmem_cache *cache); > void quarantine_reduce(void); > void quarantine_remove_cache(struct kmem_cache *cache); > +struct kasan_track *kasan_get_aux_stack(struct kasan_alloc_meta *alloc_info, > + u8 idx); > #else > static inline void quarantine_put(struct kasan_free_meta *info, > struct kmem_cache *cache) { } > static inline void quarantine_reduce(void) { } > static inline void quarantine_remove_cache(struct kmem_cache *cache) { } > +static inline struct kasan_track *kasan_get_aux_stack( > + struct kasan_alloc_meta *alloc_info, u8 idx) { return NULL; } > #endif > > #ifdef CONFIG_KASAN_SW_TAGS > diff --git a/mm/kasan/report.c b/mm/kasan/report.c > index 80f23c9da6b0..f16a1a210815 100644 > --- a/mm/kasan/report.c > +++ b/mm/kasan/report.c > @@ -105,9 +105,13 @@ static void end_report(unsigned long *flags) > kasan_enable_current(); > } > > -static void print_track(struct kasan_track *track, const char *prefix) > +static void print_track(struct kasan_track *track, const char *prefix, > + bool is_callrcu) > { > - pr_err("%s by task %u:\n", prefix, track->pid); > + if (is_callrcu) > + pr_err("%s:\n", prefix); > + else > + pr_err("%s by task %u:\n", prefix, track->pid); > if (track->stack) { > unsigned long *entries; > unsigned int nr_entries; > @@ -187,11 +191,20 @@ static void describe_object(struct kmem_cache *cache, void *object, > if (cache->flags & SLAB_KASAN) { > struct kasan_track *free_track; > > - print_track(&alloc_info->alloc_track, "Allocated"); > + print_track(&alloc_info->alloc_track, "Allocated", false); > pr_err("\n"); > free_track = kasan_get_free_track(cache, object, tag); > - print_track(free_track, "Freed"); > + print_track(free_track, "Freed", false); > pr_err("\n"); > + > + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) { > + free_track = kasan_get_aux_stack(alloc_info, 0); > + print_track(free_track, "First call_rcu() call stack", true); > + pr_err("\n"); > + free_track = kasan_get_aux_stack(alloc_info, 1); > + print_track(free_track, "Last call_rcu() call stack", true); > + pr_err("\n"); > + } > } > > describe_object_addr(cache, object, addr); > -- > 2.18.0 > > -- > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/20200511023111.15310-1-walter-zh.wu%40mediatek.com.