From patchwork Mon Jan 30 20:49:29 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: 50480 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2395169wrn; Mon, 30 Jan 2023 13:03:16 -0800 (PST) X-Google-Smtp-Source: AK7set9yxhyjMQSXCwWEbgkcV5KpElY6Pl3Aue3evjQeiySIN2kyX37Aj812JdyAvZJNZuSQUKu/ X-Received: by 2002:a17:902:cece:b0:195:e480:acec with SMTP id d14-20020a170902cece00b00195e480acecmr11788540plg.5.1675112596638; Mon, 30 Jan 2023 13:03:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675112596; cv=none; d=google.com; s=arc-20160816; b=ah0IW8izzNaU5vtO5rbLUlEqMcffbcSgmS2bDf9d1gwKjheLxapGZojA6WUjSXzxM9 fY1491TMAg+2bOWjUd+apCdjgRWWcS11nMFDC3xI6rDFVGAbgoBkTOvZW17iAzT014go Q7G1PoVX/plGJOj9XzaYSfQF/c2jaIwCGXvLgoJ39M/MsTGwkGmQm8z+q7e/jwQH31Vs DyndjTaZPkVF9gNxAKlwpGCHJxpxxIm58IaDGJQ5iuTuv9fIdLslh+3ORVg0A7h6NA0B uNjAMWLV9rZznyVxQaz+dJI/mZWE9gAilj4/lywGQ/R7+XdKyZ2We89V+P2lz6gvfokk DPfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=c95lndz29O0di2fe/164kz+dHAmKL4r6SFIURNRPYhs=; b=afBsuJgay2O1VTPfMl1YIqEzxKMvQaWOXrZvkOGzFgygCK0S2YjKNYDFZjSZ9qngMA Ve7o0uAVuuSStwH05OQN4S9lrdFfCd5BAsCWOCXvtOGgVraP7HWvZFRqudNnPRYuOyz0 oGSTWBraj5TvtpONFxDvZKfwAFuaqCXShagYg7pokv3pk5U9ui1xmKI/YjjGaNHUbiUm tKeHrXYmr+akZKw6Rhf4MoE11MthQQgaeEdWh+3GP7Opg9MuSrAl2YE5PxK/nPjDMO8t RXl8axSrimecoMKxQLH8aDaF1PpoQZoUraGRvJavl5m/XrsA7ixq6jVYCJL8AjW30wm2 tNTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=iZ2SF3e9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020a170902e88400b001968bed5355si3086392plg.476.2023.01.30.13.03.03; Mon, 30 Jan 2023 13:03:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=iZ2SF3e9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229675AbjA3U4P (ORCPT + 99 others); Mon, 30 Jan 2023 15:56:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230150AbjA3U4M (ORCPT ); Mon, 30 Jan 2023 15:56:12 -0500 Received: from out-85.mta1.migadu.com (out-85.mta1.migadu.com [95.215.58.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AC4241B47 for ; Mon, 30 Jan 2023 12:56:11 -0800 (PST) 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=1675111789; 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=c95lndz29O0di2fe/164kz+dHAmKL4r6SFIURNRPYhs=; b=iZ2SF3e9VXqpvKUr8HduRr1XOXKe7dSysCB1n/ECP4tg1ImAdKKoy2eqgkG+rRAub4slvK j7oGY2uIyxOmpcwpIzP6Xcn2HJ6z/TAb1IUyQWvHGGTzHFEIzfekx1C2191yTDtOsoVOMk 9aSD8JTfQNTK/XnjW9Emdd1TFDrL4xQ= 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 05/18] lib/stackdepot: rename stack_depot_disable Date: Mon, 30 Jan 2023 21:49:29 +0100 Message-Id: <293567627b0d59f1ae5a27ac9537c027a5ff729d.1675111415.git.andreyknvl@google.com> In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756482865972245487?= X-GMAIL-MSGID: =?utf-8?q?1756482865972245487?= From: Andrey Konovalov Rename stack_depot_disable to stack_depot_disabled to make its name look similar to the names of other stack depot flags. Also put stack_depot_disabled's definition together with the other flags. Also rename is_stack_depot_disabled to disable_stack_depot: this name looks more conventional for a function that processes a boot parameter. No functional changes. Signed-off-by: Andrey Konovalov Reviewed-by: Alexander Potapenko --- lib/stackdepot.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/stackdepot.c b/lib/stackdepot.c index 8743fad1485f..6e8aef12cf89 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -71,6 +71,7 @@ struct stack_record { unsigned long entries[]; /* Variable-sized array of entries. */ }; +static bool stack_depot_disabled; static bool __stack_depot_early_init_requested __initdata = IS_ENABLED(CONFIG_STACKDEPOT_ALWAYS_INIT); static bool __stack_depot_early_init_passed __initdata; @@ -91,21 +92,20 @@ static DEFINE_RAW_SPINLOCK(depot_lock); static unsigned int stack_hash_order; static unsigned int stack_hash_mask; -static bool stack_depot_disable; static struct stack_record **stack_table; -static int __init is_stack_depot_disabled(char *str) +static int __init disable_stack_depot(char *str) { int ret; - ret = kstrtobool(str, &stack_depot_disable); - if (!ret && stack_depot_disable) { + ret = kstrtobool(str, &stack_depot_disabled); + if (!ret && stack_depot_disabled) { pr_info("disabled\n"); stack_table = NULL; } return 0; } -early_param("stack_depot_disable", is_stack_depot_disabled); +early_param("stack_depot_disable", disable_stack_depot); void __init stack_depot_request_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_early_init_requested || stack_depot_disable) + if (!__stack_depot_early_init_requested || stack_depot_disabled) return 0; if (stack_hash_order) @@ -145,7 +145,7 @@ int __init stack_depot_early_init(void) if (!stack_table) { pr_err("hash table allocation failed, disabling\n"); - stack_depot_disable = true; + stack_depot_disabled = true; return -ENOMEM; } @@ -158,7 +158,7 @@ int stack_depot_init(void) int ret = 0; mutex_lock(&stack_depot_init_mutex); - if (!stack_depot_disable && !stack_table) { + if (!stack_depot_disabled && !stack_table) { unsigned long entries; int scale = STACK_HASH_SCALE; @@ -184,7 +184,7 @@ int stack_depot_init(void) stack_table = kvcalloc(entries, sizeof(struct stack_record *), GFP_KERNEL); if (!stack_table) { pr_err("hash table allocation failed, disabling\n"); - stack_depot_disable = true; + stack_depot_disabled = true; ret = -ENOMEM; } stack_hash_mask = entries - 1; @@ -354,7 +354,7 @@ depot_stack_handle_t __stack_depot_save(unsigned long *entries, */ nr_entries = filter_irq_stacks(entries, nr_entries); - if (unlikely(nr_entries == 0) || stack_depot_disable) + if (unlikely(nr_entries == 0) || stack_depot_disabled) goto fast_exit; hash = hash_stack(entries, nr_entries);