From patchwork Wed Sep 13 17:14:33 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: 13383621 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 CBDFDEE01F1 for ; Wed, 13 Sep 2023 17:16:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3DE596B0260; Wed, 13 Sep 2023 13:15:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 318516B0266; Wed, 13 Sep 2023 13:15:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0322D6B0261; Wed, 13 Sep 2023 13:15:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D3F166B0266 for ; Wed, 13 Sep 2023 13:15:58 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id B1950140DCD for ; Wed, 13 Sep 2023 17:15:58 +0000 (UTC) X-FDA: 81232226796.18.BD116E7 Received: from out-229.mta1.migadu.com (out-229.mta1.migadu.com [95.215.58.229]) by imf25.hostedemail.com (Postfix) with ESMTP id ECEAEA0026 for ; Wed, 13 Sep 2023 17:15:56 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=n8pGZUmY; spf=pass (imf25.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.229 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=1694625357; 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=0/KQC+g9eK7MZLi0iRkQvuX1rPqJBRg75npInF3Ouo8=; b=svZiVMfU0lwE7Mgc7evrrIAuFmsZ3Ovv7rXwGVR3uhaoaoDelAW5SYADgmFImzCokNbJS3 y+V1kDVyOoVcK+h3EdS07aaQiJdwuCUcaRZaHl5ER+s6oGMgLsjEF3YfGLM5BLDGbs+SQ+ z/IC395fHSfn3BheaxeSl9KFtiHpAfU= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=n8pGZUmY; spf=pass (imf25.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.229 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=1694625357; a=rsa-sha256; cv=none; b=HB3V1/5pbEVC6jBkP5gviUTwMwwgVxrj0TZFAs26dUI/WABhPld76DdPEg+twrBS8a56Bj Zu6JBrT/7BKSNIy4QE0BuS12MEsq60BR3Pcy34Fzc7YXhA1PB6hWsGv3b6lvVnh1hVcsdY 0kcMuF36Nc22hGvk8eVt0WpBcpJVKf4= 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=1694625355; 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=0/KQC+g9eK7MZLi0iRkQvuX1rPqJBRg75npInF3Ouo8=; b=n8pGZUmYCVqQ7/ite2vF9JMhwV+glcABYHAJ/a/1kWV1LzwnX+pz3GngJd9Jqqc1/Pv61I Tc5+8k/YmnNs3tTelE4rd84gD248pTV9VF628E9nZrnCTuq8FjxCXOUUKGof/AhL0LIypC 1oXVFUG4VWiBhHDjNZdJF0SfAvv8pl4= 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 v2 08/19] lib/stackdepot: rename next_pool_required to new_pool_required Date: Wed, 13 Sep 2023 19:14:33 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: ECEAEA0026 X-Rspam-User: X-Stat-Signature: u7xqzz7p3aoo1fmibk5whhcbudapy1yd X-Rspamd-Server: rspam01 X-HE-Tag: 1694625356-701294 X-HE-Meta: U2FsdGVkX1/wTQhavG0Q6sQdvLrIJu7a1Um2i3hungvwl1+UoJnKoCyYTfeM8zJxK5/V7F/B1LsFlO6rjH0Qya4blBc9dV0mT28qGyzItu3y223ZGzGNRefiAlhgr7HfaH0HX7pAMz/+e8iCcqexE+vnLBBpfa7qygaLzNu38Tu4onbu8ecrNvJcPCfkzEqu/CMZIbKNyEaRkE27j1d7GMLqziGSYPacFD/et91A89HK54YmJn7doobkLkJvFA/zEDHrbWHfu0bWJOChXcoa4tj1r5f5sdeWtqcC3YNBIoO9IwybHiWE8vNjNr2/9VS/oo4LijQ9xPB+llIvi+SsgbUSuTmoDfjfrZw/VJ4pzEzdXncvKPFlWrY6hQTfuP+AdYJ22Qc69B4adaALeP3CulI+4rJfSaIpqfpaI6Nixpz+cLtKuot9z59oOZj42KqPd8enyCKGZJr+Am5IEjuOMKG7Igj68HdOJrblIJs+lROcqnJ4ijCahuystnj5haZIAOzm1e8gVYyoNnURL7Uoghne2c8OnmIutZuOBUfuHYSlWz/0Wi/Xkgo2ukWvSMViM4DS6t0pJJFOJfe2e7pZiBq9fv5YcAe5OX1JrUNES2WMwZiEGoxVLs2hjfalhFDbq8JJlmGlDJiHR23gBqQY/GhjAH/2IqiVJvuwX0q7tDfQsvuIaol0pP2Jt3hD4CoV3Hfo1ojeP5iHJJwoaCHLM4273Tbt7uakxTvFvr3wp7ahtLTYIggUzjslL8OO/GL+Z/9ekN3pMnT2zLjFFa3b5xre7TgUSty2YaeQyIHH7CuvwSx967Pu9FTuKU7j7xWFG+SFO9L2uSCvSH7CKTHCRKRUERLvEACGYcE5SO/dfupvRzNUV1mWY/P5nnKb6UafZZzHvxJDVDuOPg5PZjDZjAKu274vXyoOqoVXcaqpTsdQk2v2NWG5TgQZO149DAaTlMqcHPI1r0GVYIKfWDi OcrFB3/M 2QV4mE2RmQilFIveVqGbhJntZ3bVsySwmvnDdYtu/uRRttnfLNxdwozVam3ir79vEFU0zMl38IhzjYbsK6uKpLvpaV5W8xa2zq3BfYkf4uEKZ1MAee7/9Ve++UVdNpXSy3zvGukBJUbpVzhk11bH483m32w== 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 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 | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/lib/stackdepot.c b/lib/stackdepot.c index e85b658be050..e428f470faf6 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,18 +218,18 @@ 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. */ if (!next_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) { @@ -239,12 +238,12 @@ 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. */ @@ -259,7 +258,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. */ @@ -268,12 +267,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. */ @@ -284,9 +283,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; } @@ -297,7 +296,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; @@ -429,13 +428,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. + * 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 @@ -468,9 +467,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);