From patchwork Tue Mar 1 03:36:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hyeonggon Yoo <42.hyeyoo@gmail.com> X-Patchwork-Id: 12764027 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 564A9C433FE for ; Tue, 1 Mar 2022 03:36:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CBBF48D0002; Mon, 28 Feb 2022 22:36:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C6C168D0001; Mon, 28 Feb 2022 22:36:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B33318D0002; Mon, 28 Feb 2022 22:36:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.25]) by kanga.kvack.org (Postfix) with ESMTP id A12198D0001 for ; Mon, 28 Feb 2022 22:36:47 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 699E1AAF for ; Tue, 1 Mar 2022 03:36:47 +0000 (UTC) X-FDA: 79194405654.15.7D24535 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by imf21.hostedemail.com (Postfix) with ESMTP id DD5C71C000B for ; Tue, 1 Mar 2022 03:36:46 +0000 (UTC) Received: by mail-pg1-f178.google.com with SMTP id w37so13311016pga.7 for ; Mon, 28 Feb 2022 19:36:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=wvHyMWb4Vup6fp70fcnYjPwaQlO4R7c0Csa1i6hXi9M=; b=EBvBprQQ//9P3T/BVK9MgCeHo1ctnzByGpuO39blALooJrEPY4SOSpFa8BBXfnBEBI ENckznChvtoDSYrxUSfH6FmKbXAdEZ+TCLtss/48tk32k5Z/IpBHE7XCXiRkm6cti8yD /cADisIYld/bdrsJhdHi0AbX0lkGTj5kHUVxOkg/wITDIhgLd1g31B4ohCpIdk+vcKta sbSbptc4OYc6JkXsyvQG8oqHi7I/kJlco8oZctdPPjZlWo+yJelu8QIFYfZ554YUFnd4 CbSSmU+YEdUVujYBt1Xg+HsW+nveNueZB/9ofo8BLovB1o0rMGZhCfdmXSlz499TYUuq /O9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=wvHyMWb4Vup6fp70fcnYjPwaQlO4R7c0Csa1i6hXi9M=; b=n3OQvhzHd301QqeSJ0bIpdSzEMOJncy4go2YoSByxkZ9KadHBS5Ba5KoNU/JXbnFis HJ9lK2Hjg+I2bg7YCxQObRdOJQiva1Bzg17c09mmcHUf1Y90wpxghMMYVoJE/xZjtCPn U7lZcZ9XJVdQf5SgywQYVqz0CxhMxlQeo/Hx57mHmfeXkn/JUZsO/lKmtFi9quPqtlGh 7VUd+FsdCIz1cVxZ5YUdZdfOovJxsaszXZ4qeNnsk0ZDqtgAD6ULh+/GZ9Kx//5jmA4P uxyzFu2hVpyoozQ8LAo9uRj2iwm5zfciTjTaxgOXHNgIggqxLe85gGU2besqtvIJcAKj Udfg== X-Gm-Message-State: AOAM5339ux+z7eZ/jfA+JN39Wdg9xrGHSig0hGUkApmHk2bXlfXzYBS2 pacAMRtP08SvAJe3iXLLzU8= X-Google-Smtp-Source: ABdhPJwSQICuomfFXU9pBsEdQPGrrNXV+o0mg9L9MaM7NwoauJKYFZE45/IEzWZzDBBkHG3RvGqw6g== X-Received: by 2002:a63:1b5e:0:b0:36f:e756:c118 with SMTP id b30-20020a631b5e000000b0036fe756c118mr19840678pgm.562.1646105805849; Mon, 28 Feb 2022 19:36:45 -0800 (PST) Received: from ip-172-31-19-208.ap-northeast-1.compute.internal (ec2-18-181-137-102.ap-northeast-1.compute.amazonaws.com. [18.181.137.102]) by smtp.gmail.com with ESMTPSA id 17-20020a056a00071100b004f0f941d1e8sm14258564pfl.24.2022.02.28.19.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 19:36:45 -0800 (PST) Date: Tue, 1 Mar 2022 03:36:38 +0000 From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Vlastimil Babka Cc: David Rientjes , Christoph Lameter , Joonsoo Kim , Pekka Enberg , Roman Gushchin , Andrew Morton , linux-mm@kvack.org, patches@lists.linux.dev, linux-kernel@vger.kernel.org, Oliver Glitta , Faiyaz Mohammed , Dmitry Vyukov , Eric Dumazet , Jarkko Sakkinen , Johannes Berg , Yury Norov , Arnd Bergmann , James Bottomley , Matteo Croce , Marco Elver , Andrey Konovalov , Imran Khan , Zqiang Subject: [PATCH v2] mm/slub: initialize stack depot in boot process Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Rspamd-Queue-Id: DD5C71C000B X-Stat-Signature: w3bqis1y6wpgkny43yz5wpgw3j4oaeeu X-Rspam-User: Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=EBvBprQQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf21.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.215.178 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com X-Rspamd-Server: rspam03 X-HE-Tag: 1646105806-742458 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: commit ba10d4b46655 ("mm/slub: use stackdepot to save stack trace in objects") initializes stack depot in cache creation if SLAB_STORE_USER flag is set. This can make kernel crash because a cache can be crashed in various contexts. For example if user sets slub_debug=U, kernel crashes because create_boot_cache() calls stack_depot_init(), which tries to allocate hash table using memblock_alloc() if slab is not available. But memblock is also not available at that time. This patch solves the problem by initializing stack depot early in boot process if SLAB_STORE_USER debug flag is set globally or the flag is set for at least one cache. [ elver@google.com: initialize stack depot depending on slub_debug parameter instead of allowing stack_depot_init() to be called during kmem_cache_init() for simplicity. ] [ vbabka@suse.cz: parse slub_debug parameter in setup_slub_debug() and initialize stack depot in stack_depot_early_init(). ] Link: https://lore.kernel.org/all/YhyeaP8lrzKgKm5A@ip-172-31-19-208.ap-northeast-1.compute.internal/ Fixes: ba10d4b46655 ("mm/slub: use stackdepot to save stack trace in objects") Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Reported-by: kernel test robot Reported-by: kernel test robot --- include/linux/slab.h | 6 ++++++ include/linux/stackdepot.h | 3 ++- mm/slub.c | 18 +++++++++++++++--- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index 37bde99b74af..062128e0db10 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -763,6 +763,12 @@ extern void kvfree_sensitive(const void *addr, size_t len); unsigned int kmem_cache_size(struct kmem_cache *s); void __init kmem_cache_init_late(void); +#if defined(CONFIG_SLUB_DEBUG) && defined(CONFIG_STACKDEPOT) +int slab_stack_depot_init(void); +#else +int slab_stack_depot_init(void) { return 0; } +#endif + #if defined(CONFIG_SMP) && defined(CONFIG_SLAB) int slab_prepare_cpu(unsigned int cpu); int slab_dead_cpu(unsigned int cpu); diff --git a/include/linux/stackdepot.h b/include/linux/stackdepot.h index 17f992fe6355..a813a2673c48 100644 --- a/include/linux/stackdepot.h +++ b/include/linux/stackdepot.h @@ -12,6 +12,7 @@ #define _LINUX_STACKDEPOT_H #include +#include typedef u32 depot_stack_handle_t; @@ -32,7 +33,7 @@ int stack_depot_init(void); #ifdef CONFIG_STACKDEPOT_ALWAYS_INIT static inline int stack_depot_early_init(void) { return stack_depot_init(); } #else -static inline int stack_depot_early_init(void) { return 0; } +static inline int stack_depot_early_init(void) { return slab_stack_depot_init(); } #endif depot_stack_handle_t stack_depot_save(unsigned long *entries, diff --git a/mm/slub.c b/mm/slub.c index a74afe59a403..2419fc3cc9f3 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -646,6 +646,14 @@ static slab_flags_t slub_debug; static char *slub_debug_string; static int disable_higher_order_debug; +static bool init_stack_depot; + +int slab_stack_depot_init(void) +{ + if (init_stack_depot) + stack_depot_init(); + return 0; +} /* * slub is about to manipulate internal object metadata. This memory lies @@ -1531,6 +1539,8 @@ static int __init setup_slub_debug(char *str) global_slub_debug_changed = true; } else { slab_list_specified = true; + if (flags & SLAB_STORE_USER) + init_stack_depot = true; } } @@ -1546,6 +1556,10 @@ static int __init setup_slub_debug(char *str) global_flags = slub_debug; slub_debug_string = saved_str; } + + if (global_flags & SLAB_STORE_USER) + init_stack_depot = true; + out: slub_debug = global_flags; if (slub_debug != 0 || slub_debug_string) @@ -1556,6 +1570,7 @@ static int __init setup_slub_debug(char *str) static_branch_unlikely(&init_on_free)) && (slub_debug & SLAB_POISON)) pr_info("mem auto-init: SLAB_POISON will take precedence over init_on_alloc/init_on_free\n"); + return 1; } @@ -4221,9 +4236,6 @@ static int kmem_cache_open(struct kmem_cache *s, slab_flags_t flags) s->remote_node_defrag_ratio = 1000; #endif - if (s->flags & SLAB_STORE_USER && IS_ENABLED(CONFIG_STACKDEPOT)) - stack_depot_init(); - /* Initialize the pre-computed randomized freelist if slab is up */ if (slab_state >= UP) { if (init_cache_random_seq(s))