From patchwork Mon Nov 20 17:47:07 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: 13461823 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 2B62EC197A0 for ; Mon, 20 Nov 2023 17:48:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 16A216B034F; Mon, 20 Nov 2023 12:48:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 07E026B0351; Mon, 20 Nov 2023 12:48:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8A106B0355; Mon, 20 Nov 2023 12:48:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9EA476B034F for ; Mon, 20 Nov 2023 12:48:37 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8430D40978 for ; Mon, 20 Nov 2023 17:48:37 +0000 (UTC) X-FDA: 81479067474.13.78C2654 Received: from out-180.mta0.migadu.com (out-180.mta0.migadu.com [91.218.175.180]) by imf19.hostedemail.com (Postfix) with ESMTP id C25F81A000C for ; Mon, 20 Nov 2023 17:48:35 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=tZ0IiLou; spf=pass (imf19.hostedemail.com: domain of andrey.konovalov@linux.dev designates 91.218.175.180 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=1700502515; 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=hhwH9Rj+7SlwckI0c6mMcIkIslfacxpde7X6neQ7UWA=; b=XZPGX2mtsvQl61/YHpV/SNAEGEEIx5tws5AI6Y3lVYEOdkSrpAURUSX8GpShqhV1aV/fg2 pyi255Q3/pEsqPTNE0FfJFm7kLbt9KyRo+JmVv9fXM55QmacQA6bhx9vIlSVp/h+4C21L7 BzM1oo85WEf8jU+9zu9Yhk4HcTRdfTs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700502515; a=rsa-sha256; cv=none; b=8iOFgGbA8rciNziQVFGRdoCv5igt2bNmpA2v/+JUR0fgp6mGme9ncyS0cjduOZLl/lqK72 TLdXU6AZaZi1yywY+AZZD6dQsc/pl93TDlx3mxdQXvls0R+TJ9lD0oW+9eaoMCqP0wBuq9 y7wCecIYIYWe5v57AnbL3v1l/LbDS0g= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=tZ0IiLou; spf=pass (imf19.hostedemail.com: domain of andrey.konovalov@linux.dev designates 91.218.175.180 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev; dmarc=pass (policy=none) header.from=linux.dev 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=1700502514; 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=hhwH9Rj+7SlwckI0c6mMcIkIslfacxpde7X6neQ7UWA=; b=tZ0IiLouwcQL+2MAJN48oud52EurhrFZ0EVdLm9w8bTgwIXFM6wmInvK6PvSCrc9NfsCH+ mZJSfVlEyctgDWkqrhpIIt5iHEnorbr/fJGIrTZlLY3MGFvfhwPt5aeKYygAHMY4xY+vIV lxaS4PU+oIsToSR3HDnVIiG5H7/UWHw= From: andrey.konovalov@linux.dev To: Andrew Morton Cc: Andrey Konovalov , Marco Elver , Alexander Potapenko , Dmitry Vyukov , Vlastimil Babka , kasan-dev@googlegroups.com, Evgenii Stepanov , Oscar Salvador , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Subject: [PATCH v4 09/22] lib/stackdepot: rename next_pool_required to new_pool_required Date: Mon, 20 Nov 2023 18:47:07 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Stat-Signature: yjka4itz7twdz494gpe54uwfspzrifnk X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: C25F81A000C X-Rspam-User: X-HE-Tag: 1700502515-737656 X-HE-Meta: U2FsdGVkX1/MA1G8N+oksGT0/wBBFIAoueIzsj0w4UYujBDSPHGf9suxVwTrDaBPIyP9vEYicdydp5VLbfWmvD62W6a2YinYG0AZAAWPS3q2ln9I+Qwdg92SSjh8k8sV3sQRG10YcU0aLbrnoG8JcyZIbCKP/6pyDUa2gH/OEqgkrNvkA5MFafxKHxXI4TxeG2WitxZhynSnZ9dYGXEAz0rJxLBK3GaArvqg9ZTGMwYOXGyvmB0/m9qR60QUx52h6clyQGTmMhxtV/kHgaPmSKKL7JjnYsdox25XlIlaxt9Srdt/iERJsb7nE4n+cCLXgtvq9UL8iOl6jz1NHBhx5CT34bebqpHnP8PZosWTjYj3ufdjGlISXhkH8aHWFlBYXWzBem5cKhbLBLk/EalNaZ+psjZtDsTM46MPSYnxRnbrGFEW9g7CX89VCRAOFZqx4LGQRDxNZqcxXF6/OyiH8WY4Du1gP1eGT+uR35CJ1MNAvkhGk0Tx5usYI0NVNVPDMNVPDs6xODRxxByc6spNUj/4k8AK7KFDGq4KRd9Fq+KvOKqkoiu5xyZE05L8K50oYAulVMKGw7LAwIZb3z6cf9Im5bREFq9o3z/VbJMHzwC1sEJDb/7o0h2Sfw2mzf8PKKC4BVmWUhb3+wwPiXk5UWYZaaB5kuCtWYWgs+LNHqfq9bc3gQ4lqNaceGB1GrtTprEI9Ch1FvUyZP5OSmp09877V5ipEt8UA+mxUytAYQAD4PH4/6vJCUPIc5l3GXO84zQhCOYzq5bYmelqW1/9LwXioG0mncIG3c6S+gw5k5mgUitoYJ0PTfckEstRFD8rHTmg6oWCtsSTJ59fQ9kLPUM7r0qu6alCn38kwCxGSOmK63cBo1wORRsW8VLw2lDDxoV6zTZupKWM9y++zj+z51hmTzGCZcoZselgo7AVjZEnX72BZduNpj2/AqJVPUcKv+TcsX4qWfgPm8hVgga 9qqdS5fs Xg/fvrwngXVWnzJ642o6gLF+k1+Ji9IXODNwXsH4kVZTgIuy9tZVqxaZn4jGS3KQLPp80iedA13Y32VxyCQS8dIl5HMrt7hxTn+8dLqAabP+m8bk= 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: List-Subscribe: List-Unsubscribe: From: Andrey Konovalov Rename next_pool_required to new_pool_required. This a purely code readability change: the following patch will change stack depot to store the pointer to the new pool in a separate variable, and "new" seems like a more logical name. Reviewed-by: Alexander Potapenko Signed-off-by: Andrey Konovalov Reviewed-by: Oscar Salvador --- lib/stackdepot.c | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/lib/stackdepot.c b/lib/stackdepot.c index b3af868627f4..a38661beab97 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -93,12 +93,11 @@ static size_t pool_offset; static DEFINE_RAW_SPINLOCK(pool_lock); /* * Stack depot tries to keep an extra pool allocated even before it runs out - * of space in the currently used pool. - * This flag marks that this next extra pool needs to be allocated and - * initialized. It has the value 0 when either the next pool is not yet - * initialized or the limit on the number of pools is reached. + * of space in the currently used pool. This flag marks whether this extra pool + * needs to be allocated. It has the value 0 when either an extra pool is not + * yet allocated or if the limit on the number of pools is reached. */ -static int next_pool_required = 1; +static int new_pool_required = 1; static int __init disable_stack_depot(char *str) { @@ -225,20 +224,20 @@ int stack_depot_init(void) } EXPORT_SYMBOL_GPL(stack_depot_init); -/* Keeps the preallocated memory to be used for the next stack depot pool. */ -static void depot_keep_next_pool(void **prealloc) +/* Keeps the preallocated memory to be used for a new stack depot pool. */ +static void depot_keep_new_pool(void **prealloc) { /* - * If the next pool is already saved or the maximum number of + * If a new pool is already saved or the maximum number of * pools is reached, do not use the preallocated memory. - * Access next_pool_required non-atomically, as there are no concurrent + * Access new_pool_required non-atomically, as there are no concurrent * write accesses to this variable. */ - if (!next_pool_required) + if (!new_pool_required) return; /* - * Use the preallocated memory for the next pool + * Use the preallocated memory for the new pool * as long as we do not exceed the maximum number of pools. */ if (pool_index + 1 < DEPOT_MAX_POOLS) { @@ -247,13 +246,13 @@ static void depot_keep_next_pool(void **prealloc) } /* - * At this point, either the next pool is kept or the maximum + * At this point, either a new pool is kept or the maximum * number of pools is reached. In either case, take note that * keeping another pool is not required. * smp_store_release() pairs with smp_load_acquire() in * stack_depot_save(). */ - smp_store_release(&next_pool_required, 0); + smp_store_release(&new_pool_required, 0); } /* Updates references to the current and the next stack depot pools. */ @@ -268,7 +267,7 @@ static bool depot_update_pools(size_t required_size, void **prealloc) } /* - * Move on to the next pool. + * Move on to the new pool. * WRITE_ONCE() pairs with potential concurrent read in * stack_depot_fetch(). */ @@ -277,12 +276,12 @@ static bool depot_update_pools(size_t required_size, void **prealloc) /* * If the maximum number of pools is not reached, take note - * that the next pool needs to be initialized. + * that yet another new pool needs to be allocated. * smp_store_release() pairs with smp_load_acquire() in * stack_depot_save(). */ if (pool_index + 1 < DEPOT_MAX_POOLS) - smp_store_release(&next_pool_required, 1); + smp_store_release(&new_pool_required, 1); } /* Check if the current pool is not yet allocated. */ @@ -293,9 +292,9 @@ static bool depot_update_pools(size_t required_size, void **prealloc) return true; } - /* Otherwise, try using the preallocated memory for the next pool. */ + /* Otherwise, try using the preallocated memory for a new pool. */ if (*prealloc) - depot_keep_next_pool(prealloc); + depot_keep_new_pool(prealloc); return true; } @@ -306,7 +305,7 @@ depot_alloc_stack(unsigned long *entries, int size, u32 hash, void **prealloc) struct stack_record *stack; size_t required_size = DEPOT_STACK_RECORD_SIZE; - /* Update current and next pools if required and possible. */ + /* Update current and new pools if required and possible. */ if (!depot_update_pools(required_size, prealloc)) return NULL; @@ -438,13 +437,13 @@ depot_stack_handle_t __stack_depot_save(unsigned long *entries, goto exit; /* - * Check if another stack pool needs to be initialized. If so, allocate - * the memory now - we won't be able to do that under the lock. + * Check if another stack pool needs to be allocated. If so, allocate + * the memory now: we won't be able to do that under the lock. * * smp_load_acquire() pairs with smp_store_release() in - * depot_update_pools() and depot_keep_next_pool(). + * depot_update_pools() and depot_keep_new_pool(). */ - if (unlikely(can_alloc && smp_load_acquire(&next_pool_required))) { + if (unlikely(can_alloc && smp_load_acquire(&new_pool_required))) { /* * Zero out zone modifiers, as we don't have specific zone * requirements. Keep the flags related to allocation in atomic @@ -477,9 +476,9 @@ depot_stack_handle_t __stack_depot_save(unsigned long *entries, } else if (prealloc) { /* * Stack depot already contains this stack trace, but let's - * keep the preallocated memory for the future. + * keep the preallocated memory for future. */ - depot_keep_next_pool(&prealloc); + depot_keep_new_pool(&prealloc); } raw_spin_unlock_irqrestore(&pool_lock, flags);