From patchwork Mon Oct 23 16:22:39 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: 13433187 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 7255AC004C0 for ; Mon, 23 Oct 2023 16:24:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1D60F6B0100; Mon, 23 Oct 2023 12:24:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 185B26B0101; Mon, 23 Oct 2023 12:24:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 025D26B0102; Mon, 23 Oct 2023 12:24:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E39FB6B0101 for ; Mon, 23 Oct 2023 12:24:07 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A43911A02F3 for ; Mon, 23 Oct 2023 16:24:07 +0000 (UTC) X-FDA: 81377248134.07.95C6385 Received: from out-194.mta1.migadu.com (out-194.mta1.migadu.com [95.215.58.194]) by imf30.hostedemail.com (Postfix) with ESMTP id C55178001F for ; Mon, 23 Oct 2023 16:24:05 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="Ln8jn/bt"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf30.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.194 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698078245; 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=QFz7c41J1QbS9PQ1h2ItmRgQJE/l+/U2CDCp2U3Lga0=; b=zgHvmcbqZ4+Br8Rp6FKDwO9mF5yp6aMdCKbGTixvoDsA0JuwxrmK70T4qgLcW/C1Ham7Qz Zf7WHsyKlFuF1b88RTnGvF2dYxPJePdZtiBTGnRMf+8eXgKeorzs9tiOkkNGu/nn7iPf/+ vfY3nXW4CQNw0a6lX5T1LNZVUxcgNQs= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="Ln8jn/bt"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf30.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.194 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698078245; a=rsa-sha256; cv=none; b=0fL2CDsq8kINY73EinePsJIrZFl1oEKLSJkbKe8ZoLnEtKPKa+bDPd8qDTGLFnJDnHkOu5 4/nQjo0FxE7BtbRMtC/90UB/Rh7isw0UOIxqvJEBo2gInVKTQIZBqlADpWBxX0wJgdmCO4 n3Tzn1MPbkjAXnZ3+7CfarvWEOYdu8o= 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=1698078244; 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=QFz7c41J1QbS9PQ1h2ItmRgQJE/l+/U2CDCp2U3Lga0=; b=Ln8jn/btUwxdS3NYz+kfGYLWvsWTvJ5u3YyVev72quQFxpQ6rAJIQeN6sfP0fJG2IQ2K/7 Ru/NFMADjWGJJEoVmdgwuQzr+Cafy+Kpdr9JMH8ZcWTuixF85WuxaVOR1wWdIJI6caGvld MaqFZ97JESE7qZ5aZRIgTe9xXo/s0x4= From: andrey.konovalov@linux.dev To: Marco Elver , Alexander Potapenko Cc: Andrey Konovalov , Dmitry Vyukov , Vlastimil Babka , kasan-dev@googlegroups.com, Evgenii Stepanov , Oscar Salvador , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Subject: [PATCH v3 08/19] lib/stackdepot: rename next_pool_required to new_pool_required Date: Mon, 23 Oct 2023 18:22:39 +0200 Message-Id: <5d8faf61763307b4d71a9b5272b88fb5c5ae7521.1698077459.git.andreyknvl@google.com> In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: C55178001F X-Stat-Signature: 7qgasbopm7bi3w7j1cxphxg3cd84gw47 X-HE-Tag: 1698078245-668209 X-HE-Meta: U2FsdGVkX194O48vnd/LQ6kTbbdpfeQ++veBMesitY2mdkakH02BiPD5VY0Xc9QYYZNiMlM7t+WRXz3kk9sxGVWJbVroLnnVtEuZM0qJ3JYbd3E7Zfr7KB5ETldaKWBEwQWADLXj5TOngd9INwyduNAGV+nFn+7WVmXT368OuLwCXhoR0T7fVkoe3SsPQmN00nmBEH0+k2SX1msyTt9SF+QItibV95CsBxx7JuRNs5vZgHgm9LCf5oJsTwBKV+a+d2YoiD7UAm20symWdkcMrKdZb/1FfFoHFLURh6xuM+zb2dd06chKRta8yRoolzkySqJVerhqOKhu2G41QNlB6EMiT/0rgobvmtnjJ/IpEnmwQyLb7ioKAnYU7ZbNvKgzk6viq/vkmX8Y1mHxNT73teNaX4c+1rsZjGGXBIRB5la05q0l+puqqvyjqEBSPFoWvqUsQgrlG45uW4dPxPXrXN+FfYAi9tY4/i0dNKkxtHJjRV216LjBI4M04749wJm7pqzgQ81KpPPfr+zIHxXWeji+WDUv9CVeZZti+6ZtrCvXbo8daiSTLFlmkL8Lfji/A8yU+LBWAJvbHueYWv0V6lBSZ7sgMO8KKmcRuzAa6Gq2FFrj3UHbQx9Ue8tVzqhUXpvGX6QgJHSfnFPCpo0xnpBzIreh7nBenVkNAaNQGqGjBUl92RYc3vV/85k4iccbwci3XL90+8hlSzsF1TZTObIVjEysVQpOr+d24EjhYE+ly7bhktDo0B3XE0PVxtfOWr0Csb9zNfhk/rZjipqn3tqGixGBKxZqwRm2FzTtLAMygaxLg/r3W+JJlxdaGxEqhVuy+/CWxc3Wwgtae2Z3/R09EgOH8A0EwC/H1qehOQQQOr5e5JG3PSscNk32NuzoTPQ+SFIZkjBEJraNDYolAMQdNYEqygQpmDLk9CsJNqQx+VF6fvmhrhLDzN/r+9xqNJvCOvbEtmcLWX1Icnj 1oSjkP4W 14imBvq5mI2razycagowmV+TByh1Aa9ihyV9fFuaLeoEWKjVXwNzx/j5soWoazw77m/5+tGkg8QHOF8Tu+g4LZroY+5WXlR081LxFRRhX+gqyqBSpNsYBcuUtcjFB2y7I9bqPPj+k4PHwe7w= 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 --- lib/stackdepot.c | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/lib/stackdepot.c b/lib/stackdepot.c index 3f921aaae44a..7579e20114b1 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) { @@ -219,20 +218,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) { @@ -241,13 +240,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 refences to the current and the next stack depot pools. */ @@ -262,7 +261,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(). */ @@ -271,12 +270,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. */ @@ -287,9 +286,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; } @@ -300,7 +299,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; @@ -432,13 +431,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 @@ -471,9 +470,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);