From patchwork Tue Aug 29 17:11:17 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: 13369236 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 69DBCC83F14 for ; Tue, 29 Aug 2023 17:12:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A94018E0034; Tue, 29 Aug 2023 13:12:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A1BB68E002F; Tue, 29 Aug 2023 13:12:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 86E978E0034; Tue, 29 Aug 2023 13:12:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 71AA08E002F for ; Tue, 29 Aug 2023 13:12:43 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 53501C0228 for ; Tue, 29 Aug 2023 17:12:43 +0000 (UTC) X-FDA: 81177786606.14.EA855DB Received: from out-252.mta1.migadu.com (out-252.mta1.migadu.com [95.215.58.252]) by imf22.hostedemail.com (Postfix) with ESMTP id 7D5CBC0019 for ; Tue, 29 Aug 2023 17:12:41 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=rTza+MTD; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf22.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.252 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=1693329161; 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=TBLA9eVhfpPnUCaW6dvoHE+HvIWz4FYhXI+BxxI+EVo=; b=iIn0fCBjLpYDYyb7eFPukpnRjeyktlq694fs2ysdAUdnHSetFLCha+GKpqQ3GZ322JpIf2 hCFo5J8fy804Po84Aj+KH1GYmgt5VuFeU1HMiapdvPXoFQwaRcsnu2sVtaunO3S6GmFQft /KcTywos67CQegshIxgK7kD3qzO0mMw= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=rTza+MTD; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf22.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.252 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693329161; a=rsa-sha256; cv=none; b=6CE7LdzLs4M7TylcDAewQEkFcBhLqQk1bx3umkCPqV2h+9yrySh+eSV63HUqzbZtuBeIT0 /iQYRhuwBUKj4wEISBhWAuhmRJwUR5tOK5gPrZW/SiGc7Jk+2qYC0PUXCJrLt6yl1ORJ0f 1cQJULZNHhG6zPEtnZr0PSWDWNu1jJ8= 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=TBLA9eVhfpPnUCaW6dvoHE+HvIWz4FYhXI+BxxI+EVo=; b=rTza+MTDtXsApdY3UtmvCOQ7kVEgxoogWmU+0/N+/sEo8Jl8pyma+tVj6hbC217kRw1J6E W2W+iu1c4gZpxYAIOpkN1sNFMFS3da9ylVLiov/nqPc0JE4H1dH8MM7fvRWFW9ucQ0eS+L WhjGfi5dKdpIeZyWgv2oUZtl5JJ4KEI= 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 07/15] stackdepot: rework helpers for depot_alloc_stack Date: Tue, 29 Aug 2023 19:11:17 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 7D5CBC0019 X-Stat-Signature: kidkkyotbcyf139jpwsostzfck7nxuzy X-Rspam-User: X-HE-Tag: 1693329161-559602 X-HE-Meta: U2FsdGVkX1+M0dp7YKnE8TQLyyoCWBGrg8LTlGnNHMmLrMedFQIME7AzeRWGUG17ZAOLaIawXj4viyGrow2q7AXbQSqk4h9+Bcm2sEfYzM6EfYqbDCtCfGXV0vBEVR9Lb27bjdiOy6KP7ttSPtfi1hJYwjKdSRXSVnOIMAw1yuOzFRL4ZaxTO+l4ogTC2ajt7UcQ3GJdCE23Knd0Xa4QRQ1nwPlErLEn7ts6hlqfQf5Im9WAgCsAfXtEMy7s7y40R/yJK5HMb+KnLauB4LB5JD5dIT+1eQpbMM4dQrwVX6r2RQ+O0jzg7MlDhq8PqqaT7yVIy/mxXwAUBbDjU1LB7XrFV6waCqbAGg0TW48TenF47c/mgDS6QcEddROE3aX/U1S2+bdXPDTUAAZ4R0LSqro8f1UgrxLdrb3QIucogEyXYlHxgn40d4GB9lkuy5fyJrB1jnOahd3KfvKzawhe2Rt9o6jyAy0K15itvLwoNdTH1T44VX8N0C9cf4u4iCiFTzm1bseEz1QacOBirikgldpVd/7sCZDrGw1Eeo3Bey/YBiF8dYaUahWTREOrnUGlQr6ahI0R+bq9JWGA1iXiXdtNIbBOCveFTj7mjdD2dubbyTjfa3V8EcbvKjW0HVieGskzErQEnppCcaBJJPYzP/0LDcSnvUhzqwk3qbH5NZv2rvuvRYPcNl+1LQO/wcssQeUfdEDKEVLZtlM2p1Jrd5kAOmqm2ys2FsNPC/+Uf4OPq5/ckPDM/kUbhU8T9HBG+Sx2e1w4UT+YR8rAQp8bM4yEuopPImsHFCq3I2LlghGb8LNgKmEHAZIR52UB8tdIP5Gsrvsfabji28tApdzEmMy5bGl1KphYSIZQS8ILtgCjJkl2uESJwKA8Op+V6yXODrO7yTyDjy+igFoXuMogcwsw3pdvg8PuZj3Oy9PNGyDZxIM4S0Ur6ew9LwYS21hqdJ/dRiH952UVT812Hq0 tPuhGpXL CsBhgH15gxHtdlLtlNjcYiYdzOMcjKo89I/j/N1FGB99TCqTtrJooa3BOjOFu2noKZRwGst4DA+Wt6lHqZRpbT+UTj3UjUUPE6hu9VssvWX4GN18aHcKnvgGXKYPctDfX1puSI33QyecYoI5NM9kSR65Qog== 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 Split code in depot_alloc_stack and depot_init_pool into 3 functions: 1. depot_keep_next_pool that keeps preallocated memory for the next pool if required. 2. depot_update_pools that moves on to the next pool if there's no space left in the current pool, uses preallocated memory for the new current pool if required, and calls depot_keep_next_pool otherwise. 3. depot_alloc_stack that calls depot_update_pools and then allocates a stack record as before. This makes it somewhat easier to follow the logic of depot_alloc_stack and also serves as a preparation for implementing the eviction of stack records from the stack depot. Signed-off-by: Andrey Konovalov --- lib/stackdepot.c | 85 +++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 37 deletions(-) diff --git a/lib/stackdepot.c b/lib/stackdepot.c index 9ae71e1ef1a7..869d520bc690 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -220,11 +220,11 @@ int stack_depot_init(void) } EXPORT_SYMBOL_GPL(stack_depot_init); -/* Uses preallocated memory to initialize a new stack depot pool. */ -static void depot_init_pool(void **prealloc) +/* Keeps the preallocated memory to be used for the next stack depot pool. */ +static void depot_keep_next_pool(void **prealloc) { /* - * If the next pool is already initialized or the maximum number of + * If the next 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. @@ -232,44 +232,33 @@ static void depot_init_pool(void **prealloc) if (!READ_ONCE(next_pool_required)) return; - /* Check if the current pool is not yet allocated. */ - if (stack_pools[pool_index] == NULL) { - /* Use the preallocated memory for the current pool. */ - stack_pools[pool_index] = *prealloc; + /* + * Use the preallocated memory for the next pool + * as long as we do not exceed the maximum number of pools. + */ + if (pool_index + 1 < DEPOT_MAX_POOLS) { + stack_pools[pool_index + 1] = *prealloc; *prealloc = NULL; - } else { - /* - * Otherwise, use the preallocated memory for the next pool - * as long as we do not exceed the maximum number of pools. - */ - if (pool_index + 1 < DEPOT_MAX_POOLS) { - stack_pools[pool_index + 1] = *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. - * smp_store_release pairs with smp_load_acquire in - * stack_depot_save. - */ - smp_store_release(&next_pool_required, 0); } + + /* + * At this point, either the next 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); } -/* Allocates a new stack in a stack depot pool. */ -static struct stack_record * -depot_alloc_stack(unsigned long *entries, int size, u32 hash, void **prealloc) +/* Updates refences to the current and the next stack depot pools. */ +static bool depot_update_pools(size_t required_size, void **prealloc) { - struct stack_record *stack; - size_t required_size = DEPOT_STACK_RECORD_SIZE; - /* Check if there is not enough space in the current pool. */ if (unlikely(pool_offset + required_size > DEPOT_POOL_SIZE)) { /* Bail out if we reached the pool limit. */ if (unlikely(pool_index + 1 >= DEPOT_MAX_POOLS)) { WARN_ONCE(1, "Stack depot reached limit capacity"); - return NULL; + return false; } /* @@ -279,9 +268,10 @@ depot_alloc_stack(unsigned long *entries, int size, u32 hash, void **prealloc) */ WRITE_ONCE(pool_index, pool_index + 1); pool_offset = 0; + /* * If the maximum number of pools is not reached, take note - * that the next pool needs to initialized. + * that the next pool needs to be initialized. * smp_store_release pairs with smp_load_acquire in * stack_depot_save. */ @@ -289,9 +279,30 @@ depot_alloc_stack(unsigned long *entries, int size, u32 hash, void **prealloc) smp_store_release(&next_pool_required, 1); } - /* Assign the preallocated memory to a pool if required. */ + /* Check if the current pool is not yet allocated. */ + if (*prealloc && stack_pools[pool_index] == NULL) { + /* Use the preallocated memory for the current pool. */ + stack_pools[pool_index] = *prealloc; + *prealloc = NULL; + return true; + } + + /* Otherwise, try using the preallocated memory for the next pool. */ if (*prealloc) - depot_init_pool(prealloc); + depot_keep_next_pool(prealloc); + return true; +} + +/* Allocates a new stack in a stack depot pool. */ +static struct stack_record * +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. */ + if (!depot_update_pools(required_size, prealloc)) + return NULL; /* Check if we have a pool to save the stack trace. */ if (stack_pools[pool_index] == NULL) @@ -325,7 +336,7 @@ static struct stack_record *depot_fetch_stack(depot_stack_handle_t handle) union handle_parts parts = { .handle = handle }; /* * READ_ONCE pairs with potential concurrent write in - * depot_alloc_stack. + * depot_update_pools. */ int pool_index_cached = READ_ONCE(pool_index); void *pool; @@ -425,7 +436,7 @@ depot_stack_handle_t __stack_depot_save(unsigned long *entries, * the memory now - we won't be able to do that under the lock. * * smp_load_acquire pairs with smp_store_release - * in depot_alloc_stack and depot_init_pool. + * in depot_update_pools and depot_keep_next_pool. */ if (unlikely(can_alloc && smp_load_acquire(&next_pool_required))) { /* @@ -462,7 +473,7 @@ depot_stack_handle_t __stack_depot_save(unsigned long *entries, * Stack depot already contains this stack trace, but let's * keep the preallocated memory for the future. */ - depot_init_pool(&prealloc); + depot_keep_next_pool(&prealloc); } raw_spin_unlock_irqrestore(&pool_lock, flags);