From patchwork Mon Jan 30 20:49:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrey.konovalov@linux.dev X-Patchwork-Id: 13121815 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 E1C89C54EAA for ; Mon, 30 Jan 2023 20:49:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 401016B0075; Mon, 30 Jan 2023 15:49:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 392AC6B0081; Mon, 30 Jan 2023 15:49:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2507B6B0082; Mon, 30 Jan 2023 15:49:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0A08F6B0081 for ; Mon, 30 Jan 2023 15:49:52 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D7AF2C0B97 for ; Mon, 30 Jan 2023 20:49:51 +0000 (UTC) X-FDA: 80412656982.15.92B1C29 Received: from out-149.mta1.migadu.com (out-149.mta1.migadu.com [95.215.58.149]) by imf13.hostedemail.com (Postfix) with ESMTP id 18AE020015 for ; Mon, 30 Jan 2023 20:49:49 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="cW/knli1"; spf=pass (imf13.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.149 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675111790; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ePKn7wp1b3FbqZznSS/x2B/da1B4by5dKxtQzEtZAxA=; b=0A/c5OztnicyV5gEzas+oYD9I1jm4mV4YF1ychSZKZC/CGypA1jGpV/1i/lwt03BfHznmR 1ruBjnzYhQ8EvYrLKeugQDDHoZt2rJr5xDxo+jS6J7oYr/QdfDP5/GYL5eMkRWr0ygiiMx 5KcVO+2C/NmoaLpjHxV384GPfJtmvYs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="cW/knli1"; spf=pass (imf13.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.149 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675111790; a=rsa-sha256; cv=none; b=XWBPUehj9mPcun6zd9Bu88YMGpRMDC8cp7XZwVF69khI3rwOYzGfr9roTvrLUUHuZ3yGHV Qom15LDcPv0O+I5189gk6zQveXvnQcCbXa+Rb3VzbaQVHTyAcb26rcl2IyGWcWCc37QyAq hFDmBA0Ufc3wRIiETGx8/O/aLAKHUlo= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1675111788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ePKn7wp1b3FbqZznSS/x2B/da1B4by5dKxtQzEtZAxA=; b=cW/knli1mct1hN8VKhy84oK1lCkEnRxbrn0Bzq8wHyRAEtZylNL8NaxR82FYgXhxPOV45q TiG9opJh/CR4Dl6WT16EtZJq6GOEh34hNr0pi0fJZgIAo5qxMs/0msRB3R0d/2Og6PYwqq qlelPQSU7Sr1vmkhLpJj+wl66a2Q8a4= From: andrey.konovalov@linux.dev To: Marco Elver , Alexander Potapenko Cc: Andrey Konovalov , Vlastimil Babka , kasan-dev@googlegroups.com, Evgenii Stepanov , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Subject: [PATCH 04/18] lib/stackdepot, mm: rename stack_depot_want_early_init Date: Mon, 30 Jan 2023 21:49:28 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: e87f98bkywch3d1f9czssr34qciywh43 X-Rspamd-Queue-Id: 18AE020015 X-HE-Tag: 1675111789-512888 X-HE-Meta: U2FsdGVkX18G7QfL81mQT+LFjfkiFmMZn25OzCHdO3Oi/vS25huRKFLje07hR0hkFe/9+ajDQ8otGFkD9ISV6b/o3ib8mODhkcMbNdipMLYtYgt8EWCouDlE5Lxb1kysc4NE4aK4Pj9dUtW/P8ZgFcf/pyyBrdqzeCrEKNIPLrzKOEnNrViw9D3873LEys/4ZVONvV+i5L1/nMFfAdw+WJST7+f3vH4QU8Ndo5JLNrshaw0ZDW+KGPBFgCLRzLq+mKkmgb8TJn3Yud19T8PEGrSsUgeZVSeZLhTru2WRGxnTkW9TaJEaSy+QT7md2KFlgHnsCkrreGQY1vlhunFaqcVy7znTxKOyZ5PwTh7W9DPDzMrMaVkDQOya0nvz7kXJui2Sm2DDuegzx7hf6t2fVALctUwqInaYOnQtIFplIXSbqgWKiZOIrE1Oykq5GoaSl5VZ0YLiVb5Rrssmd/XvqUx/3s/aZSh6UHquK5pq2TJFd9OP2QZd4XkPlYBxuYXjJBKrS5Kj9aCBmme4SOtOswKplk+MaFypi4tQhnQDZ6dme+kpngmFtyCQhKffTpPwn6uYa2to0SxowgfD3Sq7fgqkcrd2aXAcqT6WeHbm0MufraYAnB21Eo8reQFy3/9j/ak3PXDd1qAnZ2Ao2RH1VaD4WlC3863rj7n5uynhmNGgrM8z/na4SkmRvNUr0Iy8X21nfbMOrsJLk40LEqqIg/iurVphXhRx3vFPYiWy6DXeJ0tj3/MGBTLaUzHa/oA+UKVdswZw+PNVw3SUpx8DjM87lVZ881H4J/rUZs8YE4JycO0s/CRuFTlPmmMWBW097u7LYGysMkXQfYtzmGHbW8fyw6tIaWd/RIw6PoQmykCnEE/ojPmTAvIiZq16dyBCIQg0AzlmEGFiJqmhGZ4wDPiwU5c3T5BHLcYkRo9g3cea0z0CjLBJFKIQpIo/BXOS0T9QueSpT4StkM8RODd 9l2PYskA q9SmL7pNXVwynQNYaGApFciaVgH0A2HJOpvbDJk2D6FhUxo7ZZIjn2ZOy0MSXw27Ldkor6S8eRJoG0Rt8JKrnrOU0RUNgkSm3sLWAPClhNCCsM9RwZ9L1e9f47pO1QKy6QC9v7U/Djy/tIpxCtLTgTUA3lQ== 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: From: Andrey Konovalov Rename stack_depot_want_early_init to stack_depot_request_early_init. The old name is confusing, as it hints at returning some kind of intention of stack depot. The new name reflects that this function requests an action from stack depot instead. No functional changes. Signed-off-by: Andrey Konovalov Reviewed-by: Alexander Potapenko Acked-by: Vlastimil Babka --- include/linux/stackdepot.h | 14 +++++++------- lib/stackdepot.c | 10 +++++----- mm/page_owner.c | 2 +- mm/slub.c | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/linux/stackdepot.h b/include/linux/stackdepot.h index 1296a6eeaec0..c4e3abc16b16 100644 --- a/include/linux/stackdepot.h +++ b/include/linux/stackdepot.h @@ -31,26 +31,26 @@ typedef u32 depot_stack_handle_t; * enabled as part of mm_init(), for subsystems where it's known at compile time * that stack depot will be used. * - * Another alternative is to call stack_depot_want_early_init(), when the + * Another alternative is to call stack_depot_request_early_init(), when the * decision to use stack depot is taken e.g. when evaluating kernel boot * parameters, which precedes the enablement point in mm_init(). * - * stack_depot_init() and stack_depot_want_early_init() can be called regardless - * of CONFIG_STACKDEPOT and are no-op when disabled. The actual save/fetch/print - * functions should only be called from code that makes sure CONFIG_STACKDEPOT - * is enabled. + * stack_depot_init() and stack_depot_request_early_init() can be called + * regardless of CONFIG_STACKDEPOT and are no-op when disabled. The actual + * save/fetch/print functions should only be called from code that makes sure + * CONFIG_STACKDEPOT is enabled. */ #ifdef CONFIG_STACKDEPOT int stack_depot_init(void); -void __init stack_depot_want_early_init(void); +void __init stack_depot_request_early_init(void); /* This is supposed to be called only from mm_init() */ int __init stack_depot_early_init(void); #else static inline int stack_depot_init(void) { return 0; } -static inline void stack_depot_want_early_init(void) { } +static inline void stack_depot_request_early_init(void) { } static inline int stack_depot_early_init(void) { return 0; } #endif diff --git a/lib/stackdepot.c b/lib/stackdepot.c index 90c4dd48d75e..8743fad1485f 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -71,7 +71,7 @@ struct stack_record { unsigned long entries[]; /* Variable-sized array of entries. */ }; -static bool __stack_depot_want_early_init __initdata = IS_ENABLED(CONFIG_STACKDEPOT_ALWAYS_INIT); +static bool __stack_depot_early_init_requested __initdata = IS_ENABLED(CONFIG_STACKDEPOT_ALWAYS_INIT); static bool __stack_depot_early_init_passed __initdata; static void *stack_slabs[STACK_ALLOC_MAX_SLABS]; @@ -107,12 +107,12 @@ static int __init is_stack_depot_disabled(char *str) } early_param("stack_depot_disable", is_stack_depot_disabled); -void __init stack_depot_want_early_init(void) +void __init stack_depot_request_early_init(void) { - /* Too late to request early init now */ + /* Too late to request early init now. */ WARN_ON(__stack_depot_early_init_passed); - __stack_depot_want_early_init = true; + __stack_depot_early_init_requested = true; } int __init stack_depot_early_init(void) @@ -128,7 +128,7 @@ int __init stack_depot_early_init(void) if (kasan_enabled() && !stack_hash_order) stack_hash_order = STACK_HASH_ORDER_MAX; - if (!__stack_depot_want_early_init || stack_depot_disable) + if (!__stack_depot_early_init_requested || stack_depot_disable) return 0; if (stack_hash_order) diff --git a/mm/page_owner.c b/mm/page_owner.c index 2d27f532df4c..90a4a087e6c7 100644 --- a/mm/page_owner.c +++ b/mm/page_owner.c @@ -48,7 +48,7 @@ static int __init early_page_owner_param(char *buf) int ret = kstrtobool(buf, &page_owner_enabled); if (page_owner_enabled) - stack_depot_want_early_init(); + stack_depot_request_early_init(); return ret; } diff --git a/mm/slub.c b/mm/slub.c index 13459c69095a..f2c6c356bc36 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1592,7 +1592,7 @@ static int __init setup_slub_debug(char *str) } else { slab_list_specified = true; if (flags & SLAB_STORE_USER) - stack_depot_want_early_init(); + stack_depot_request_early_init(); } } @@ -1611,7 +1611,7 @@ static int __init setup_slub_debug(char *str) out: slub_debug = global_flags; if (slub_debug & SLAB_STORE_USER) - stack_depot_want_early_init(); + stack_depot_request_early_init(); if (slub_debug != 0 || slub_debug_string) static_branch_enable(&slub_debug_enabled); else