From patchwork Fri Feb 10 21:16:02 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: 13136463 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 8D047C636D7 for ; Fri, 10 Feb 2023 21:18:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 575DD6B019A; Fri, 10 Feb 2023 16:18:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D5D76B019C; Fri, 10 Feb 2023 16:18:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D9AC6B019D; Fri, 10 Feb 2023 16:18:22 -0500 (EST) 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 1E7C36B019A for ; Fri, 10 Feb 2023 16:18:22 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D7BA8C03E0 for ; Fri, 10 Feb 2023 21:18:21 +0000 (UTC) X-FDA: 80452645602.14.F54A234 Received: from out-13.mta1.migadu.com (out-13.mta1.migadu.com [95.215.58.13]) by imf06.hostedemail.com (Postfix) with ESMTP id 0C8FC18001B for ; Fri, 10 Feb 2023 21:18:19 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=B+1V8biN; spf=pass (imf06.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.13 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=1676063900; 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=AbtsRD1ly4MmHuz3K8pgOTgQ9ciqaNAhgw745M5z3qM=; b=k6e2dNdAC1DoRYfVo9VuIFY5wJ4xUuLwmn+g8yInoulVFlocCzLtx3/J95HMS/Gn/cZ/NX UFyseC0hafHhzpaqzibI1v6zIPMlBIdXxgcWBklC6AopMtG2xHVImnY4RkPr3JyWLO4OlP cK2x3fjZbw+lnLt+iIFtXOzEP7w8xXQ= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=B+1V8biN; spf=pass (imf06.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.13 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=1676063900; a=rsa-sha256; cv=none; b=mM03SdvAjMNKi4dAG7XeVX+q10KcsYrgsb9UxdTJqAXLliaz/5Q/vKZnumuR+VtiiugcBQ wth39++8oJcYw1GQwlOWVtRC81Tl1caAqQp80yi9rvQMDQdEFsMS7OcdcTCxYCnSbklcNH o3jVlJCoxRbOLQ6Ihc3PbKYE/1VEi4c= 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=1676063898; 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=AbtsRD1ly4MmHuz3K8pgOTgQ9ciqaNAhgw745M5z3qM=; b=B+1V8biNfQMjX3nsdY1+m73D5TjVw+j0Vl7kRfCdc1w7xSYfbVEyBvrta2xNYa6Fed0hwK 4gpQsZv/7kDWYCx2cQrmYjS6QJKG+FhPekhF/wXcEw25xcCoYQRoQenFhU+NvRpIKzhCdw RIpjR+KRI2zLVti6o9s0FEnI3s7YTh0= 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 v2 14/18] lib/stackdepot: rename next_pool_inited to next_pool_required Date: Fri, 10 Feb 2023 22:16:02 +0100 Message-Id: <484fd2695dff7a9bdc437a32f8a6ee228535aa02.1676063693.git.andreyknvl@google.com> In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Stat-Signature: mbhzew9zpih8s9frp5gc15df15whaakc X-Rspam-User: X-Rspamd-Queue-Id: 0C8FC18001B X-Rspamd-Server: rspam06 X-HE-Tag: 1676063899-416896 X-HE-Meta: U2FsdGVkX19KcCNACjZcCT0yEHES1yZrIl5h0cLZSNOm+Re7aruEm0LWwJ+ZH5eYAA7g2yaEtpUgyfAXmr3R96EEsmHcrY8axE5+uHn7ru5QXt0SyqsBhHTharg/snYQLT0A5t1rwrl4Wj7Vq8fipTkwDF3bhgSotiuXZP02nl/ccxNY3pQ2CR07JoBz0y11ZwrlVp2n+M82VvSdeYkBOvJZNuZlGnJvrqy+vwz8phitUG6HRJujbh+OK5vYvxQLdnu1pr3K1YJ57YRxX7NRQfo0xtre8emi3+hYKqTFpoa97GmKP4d4kevBd5b9V6uXZ/9e5uWYBRA/n1mvWIr0fBc6jtSmxA24GU9W/V44OR0rjcjvpj8vaqm7ZNw0WqM8A9quqJJtigSvYbsrIGzKhxs1i3rWfC/2K1D2TX5BYq/RRXfK6zWHmW+wAWuTM6+lgaa2X6qSRy9aacX2hLmP7MF0MK4bDlH04YOHuXzIVOIEQ42TRqouqbAU3atpRkIPQJnLmpxlSMg3cBWuuYwbexB18/bj4j3XpB2apaFIQllMirJJ227om68y4c2dkiYriPN+EyYlnC0b+8n08qkskncIliSem6Gdptbp90q+gs5ZzLgMq4jTtoB4MbSj+6uLzeA0EhkMrKmhoDWLptTBRLfDnTuB59fVkf1HJMyEs47QyjRIPF1gZYVvXniKEzvEbvQS75nrL76mobc/jZZgrZcDCjKQzBsZNVwfLemBVcXK9CcXiAcHolePsCXh8bubMpx3s3V6Tlhe8nLE9KK6JfTWkxTQ+mWtS2ZxqTcmB7E5WaiHxq+xU+/Rtfe4td4h0wHU2rwQNJOqQktyNY8v9/J/QXA5EZt06NWbt5iCd7VHEajYUjnv0KWQFK/kI4oLe7cAwa7r06kQZ7XP+bJjdErxg0WNeYM0hoC62LQu5SaonG21mdCOwOx3KRzfSNdsc83LNFf8EQPzBTegCQV 5mxP+FNI CQf8lUyyZeyH00RhbnhjnMQbpX6T83oWbDjJKjSmZzlPrke/d5+SDIyn+NL4ll2iZ8cpZqg5zFRfGuZfPD45LTAQMtiqckAwruFIyotecn4c7w9i0JDL4MJ0PMjHko4wZNBMQXpETyvc3KzVkQS73jMJi1A== 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 Stack depot uses next_pool_inited to mark that either the next pool is initialized or the limit on the number of pools is reached. However, the flag name only reflects the former part of its purpose, which is confusing. Rename next_pool_inited to next_pool_required and invert its value. Also annotate usages of next_pool_required with comments. Signed-off-by: Andrey Konovalov Reviewed-by: Alexander Potapenko --- lib/stackdepot.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/lib/stackdepot.c b/lib/stackdepot.c index c4bc198c3d93..4df162a84bfe 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -96,8 +96,14 @@ static int pool_index; static size_t pool_offset; /* Lock that protects the variables above. */ static DEFINE_RAW_SPINLOCK(pool_lock); -/* Whether the next pool is initialized. */ -static int next_pool_inited; +/* + * 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. + */ +static int next_pool_required = 1; static int __init disable_stack_depot(char *str) { @@ -222,10 +228,12 @@ EXPORT_SYMBOL_GPL(stack_depot_init); static void depot_init_pool(void **prealloc) { /* + * If the next pool is already initialized or the maximum number of + * pools is reached, do not use the preallocated memory. * smp_load_acquire() here pairs with smp_store_release() below and * in depot_alloc_stack(). */ - if (smp_load_acquire(&next_pool_inited)) + if (!smp_load_acquire(&next_pool_required)) return; /* Check if the current pool is not yet allocated. */ @@ -243,10 +251,13 @@ static void depot_init_pool(void **prealloc) *prealloc = NULL; } /* + * At this point, either the next pool is initialized or the + * maximum number of pools is reached. In either case, take + * note that initializing another pool is not required. * This smp_store_release pairs with smp_load_acquire() above * and in stack_depot_save(). */ - smp_store_release(&next_pool_inited, 1); + smp_store_release(&next_pool_required, 0); } } @@ -271,11 +282,13 @@ depot_alloc_stack(unsigned long *entries, int size, u32 hash, void **prealloc) pool_index++; pool_offset = 0; /* + * If the maximum number of pools is not reached, take note + * that the next pool needs to initialized. * smp_store_release() here pairs with smp_load_acquire() in * stack_depot_save() and depot_init_pool(). */ if (pool_index + 1 < DEPOT_MAX_POOLS) - smp_store_release(&next_pool_inited, 0); + smp_store_release(&next_pool_required, 1); } /* Assign the preallocated memory to a pool if required. */ @@ -406,14 +419,13 @@ depot_stack_handle_t __stack_depot_save(unsigned long *entries, goto exit; /* - * Check if the current or the next stack pool need to be initialized. - * If so, allocate the memory - we won't be able to do that under the - * lock. + * 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. * * The smp_load_acquire() here pairs with smp_store_release() to * |next_pool_inited| in depot_alloc_stack() and depot_init_pool(). */ - if (unlikely(can_alloc && !smp_load_acquire(&next_pool_inited))) { + if (unlikely(can_alloc && smp_load_acquire(&next_pool_required))) { /* * Zero out zone modifiers, as we don't have specific zone * requirements. Keep the flags related to allocation in atomic