From patchwork Tue Aug 29 17:11:18 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: 13369237 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 5EB4FC83F18 for ; Tue, 29 Aug 2023 17:12:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47B948E0035; Tue, 29 Aug 2023 13:12:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 401E18E002F; Tue, 29 Aug 2023 13:12:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 27C338E0035; Tue, 29 Aug 2023 13:12:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 107758E002F for ; Tue, 29 Aug 2023 13:12:44 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id DA1901C941E for ; Tue, 29 Aug 2023 17:12:43 +0000 (UTC) X-FDA: 81177786606.05.8A8EA68 Received: from out-248.mta1.migadu.com (out-248.mta1.migadu.com [95.215.58.248]) by imf19.hostedemail.com (Postfix) with ESMTP id 05D441A0014 for ; Tue, 29 Aug 2023 17:12:41 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=dEoDb6yz; spf=pass (imf19.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.248 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=1693329162; 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=Z7PnYrb1S+8x+6HixwHlp8BbvsuCogeXMw7DcmkZ+jU=; b=qmx9mO41F97l8dMU8xZmdWuqLOKXED12yaOOmhrk6l1yGlpwbpa4liGyzMQw0EKCU1g67e WBe3fjOU3jtMq4cuUJvXH5FHQC3bi7qqjkOC0htTyb0JTLpV1+M2Gh06efitLvYWe4Ak66 ly0bo0NpNMWD5e5YmjOe2z3VbDH7VB8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693329162; a=rsa-sha256; cv=none; b=OdTGgMgnytjC4GalCE/k/yVv1m/jh4SnRVm5qlYra/BrhfGvrReX4/3Ypb2pVq7cuu64vX 6m7ysOnCZanBo5PT47GnzI3DDydkNnzOkMLinV7XdGVDsn4Akfz88eBRozmxXSDA2YVDXW 15bXvmaXPVuU09aECoYgL/xrZh+WchY= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=dEoDb6yz; spf=pass (imf19.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.248 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=1693329160; 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=Z7PnYrb1S+8x+6HixwHlp8BbvsuCogeXMw7DcmkZ+jU=; b=dEoDb6yzJM9iX6McraduAfQqnJZCVuZ61muNam0W1Q8u/Mj2MWXslfimq4jnFNa8v8+Yj+ /Lw1sjBeAZ25rXrIel+1C6rNGA5rk9DVJDQRgkWLe5Nd7RsIlPk+jzgO9LM5Ew++A1tMf5 NgbpsmDhYFFdEXDI5r4VFPiqImx4blM= From: andrey.konovalov@linux.dev To: Marco Elver , Alexander Potapenko Cc: Andrey Konovalov , Dmitry Vyukov , Vlastimil Babka , kasan-dev@googlegroups.com, Evgenii Stepanov , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Subject: [PATCH 08/15] stackdepot: rename next_pool_required to new_pool_required Date: Tue, 29 Aug 2023 19:11:18 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Stat-Signature: pwrqqhbpdajioqgqhu3p87qw1zag4wsp X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 05D441A0014 X-Rspam-User: X-HE-Tag: 1693329161-946980 X-HE-Meta: U2FsdGVkX1+PRemfxtn4j7PVX9WNEQp/0bZDpSEYcPcaKAIosPDjjh0VxD/Uw21PvKWC0v8oTW/08R/tCq3TAszA+ODdLlkOBJBbYgIUeqCzvy3o1IJYYgJYS5Qo6PJDoRm3pXo0pdguWKo5PiHPXHQMZgA0SpYzNmC5u01TzYoNyp257RMBnFlzW46IKbSHhd78OctwaU04KJWUUWnTw4jYdwy0LZaDF6HecniR3uS+Zs//8KvciKNycHj7kyAXbwwoD46xTF1JajlajgwPCPLziwZ7iXKVACbCP614i1ImprOzwARtFzJ6TBeXZgML/SDHmAetSRy2j53RKUmiBzkBL/F1siO7GBTq5lLvQF1wyg40/SSbrAGLmjtyim0rsywQHKE/enOQsD4iDlxU4+mS3hIszBrX35uoiONPT9sTVk8zzNG3yaekANE8Fnxqr5Ol6O0+cBnfELJ1/gHLBvfovY/s3VeqZLA6am+Iqzo9RPge25O90FScXaQQD5sZIKhcy8f9WQIZFs0eBE2LYcdPDg24wW6rwM50Tr53IM5+hu2THk5jZfGc4+zckHKOcnXO87s5Ow0jw3aUcWInWFMwwaSS03ooQzKb10Q9GZCXCyk7xHLbZmtXexO3Nk32C7bw5xvLOcG7xhX0vDCxgPebJwvK1fFludDFXjMqtbErNqsE/68AgeyPvSSCbA4BVUWhC0IFWOZQtenbGYYkdc5NQFmY3y+N7DitDWNMvWx6X0ozQxV4NEXXEIA/AGTndoRMMXbyKxODGw+oejB21wap02/bCZNgWx7h4yHITHkzsBJ1BlC8uFuqYG5zynGgkqVDOvoMjbpo6ANwPpf1JxKXK7qrlDsC8u/8ScBCMvdHXMarWQVmmjFKwxYKT2jjA6rl91xFs6QN+F1k2GlnnAF6BzbGBi8PhmZcaX1B4Dn2ujHzs5WVmVNkICx7j/PitebHEY2kO6D/0il7klF NFj+V7tS 1BjX39IKCYp/9tiDFkayXLCF4tcX5d10/nFPp9n3RCpFRmYEGQoFPvMDBuHHxlt97jaqEo+vhLk/2Ewc8/kO8+CLuBEdWoQhjOBmUavV5UJwaFpPVt6fMzAhU6ecIGIsO7vzeD+G6gozq/Mk6eY1A0oEnmA== 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. Signed-off-by: Andrey Konovalov Reviewed-by: Alexander Potapenko --- lib/stackdepot.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/lib/stackdepot.c b/lib/stackdepot.c index 869d520bc690..11934ea3b1c2 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -94,12 +94,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) { @@ -220,20 +219,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. * READ_ONCE is only used to mark the variable as atomic, * there are no concurrent writes. */ - if (!READ_ONCE(next_pool_required)) + if (!READ_ONCE(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) { @@ -242,12 +241,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. */ @@ -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. + * in 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);