From patchwork Wed Sep 13 17:14:32 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: 139060 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp46734vqb; Wed, 13 Sep 2023 12:44:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGkcNbuGsWAztbYecq+VOEGRGixIjg5FBsxPsvg1jTQDQcsUZ4wFAmT0jvPRdYAhtUHBA/7 X-Received: by 2002:a17:90b:110a:b0:268:2658:3b01 with SMTP id gi10-20020a17090b110a00b0026826583b01mr3165683pjb.39.1694634293192; Wed, 13 Sep 2023 12:44:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694634293; cv=none; d=google.com; s=arc-20160816; b=EFuebpsixPt4gjhSIWKn0/Q3qx/ySIUwNKR2T30Fxj0VbH5cZ2YGCs5J5icyt1Mh/p M3x+GFt8noE6tpxibEyBaqUPRvzWA3TSPDmQM/eiRw6pYIkaUb2BCgsyaFBaCOq2ojrg w4ZmEqPEvOJgYiKKR8PJh93i9PV6i3Q9amuBxJTyr4GckPqTkHBRHwzchFxdSGsfSTMN +vh0IfAE8A1DbTqElvx3wO3EE5iKi+1qf8krE6y1aQozdYHV/NWXoi2TLU4M2JzRWbbK Iv6ew+Fh1cwSE9tWrwEyKOP8ZeUXTSMp/7F+R9Yboi1JLyW+zmoksobfidrsTqjddgD3 /rVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gAOd+0bdipGa5TwT77P0cix2trL96KYDpIy1afA6aX4=; fh=nfQSbTp1dWHt2Ier1Up8UhVNdXOqoJJLNvTrpT3jJEk=; b=gtb+4fB3v+JA5nBpJXqLrQWJomVB505Oa1k+faD4Xb3F8PweQH/S2aCH97pwX01+au OYl5/eHG8tMCxtKyhwWw4QG1kNm44sM5JN6AgYRcXu8FEWYKEn3cjBnXHDEW0FWcYV3r yO9U+TXvlt1cOGgE84//4JBCrDknII75h8FPCFENy5ucPD6ugSrFPbpAPtbvKUp9+BvD 5BgEDIAKlalfC4u5Og2UldYF960vmnWXeYS5M820vdXJxOX9hYLUZQsrfXa/U30EXh8h gP2urkvo7Oau3Ax3B5HApNaQqq34TYduPztmT4ZXbnsLu5ZmT/vg2vg9EwlciFvbOLnv CKWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=puVK18ov; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id nv2-20020a17090b1b4200b0025359a570fesi14081pjb.19.2023.09.13.12.44.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 12:44:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=puVK18ov; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id BE85982516EF; Wed, 13 Sep 2023 10:16:11 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229654AbjIMRQC (ORCPT + 34 others); Wed, 13 Sep 2023 13:16:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229468AbjIMRQA (ORCPT ); Wed, 13 Sep 2023 13:16:00 -0400 Received: from out-222.mta1.migadu.com (out-222.mta1.migadu.com [IPv6:2001:41d0:203:375::de]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FA499B for ; Wed, 13 Sep 2023 10:15:56 -0700 (PDT) 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=gAOd+0bdipGa5TwT77P0cix2trL96KYDpIy1afA6aX4=; b=puVK18ovwq5iY1p+xtahLNnbqGMtfLRPDwUGhyhUQSv+gXInLzJ556ocSpipYuAJUi0IMk O/5IT0uIadYTAipofo7r3zp1kwfW+8ahs4/NkRwA7zFRFCmipzk5gZ6+1AqN6CDXnhRBxH zjagfztze/wMDtvIwTVJol/qj+Z7myE= 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 07/19] lib/stackdepot: rework helpers for depot_alloc_stack Date: Wed, 13 Sep 2023 19:14:32 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 13 Sep 2023 10:16:11 -0700 (PDT) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776952848217372378 X-GMAIL-MSGID: 1776952848217372378 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 Reviewed-by: Alexander Potapenko --- lib/stackdepot.c | 87 +++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 38 deletions(-) diff --git a/lib/stackdepot.c b/lib/stackdepot.c index babd453261f0..e85b658be050 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -219,54 +219,43 @@ 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. */ if (!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; } /* @@ -276,9 +265,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. */ @@ -286,9 +276,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) @@ -322,7 +333,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; @@ -421,8 +432,8 @@ depot_stack_handle_t __stack_depot_save(unsigned long *entries, * 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. * - * smp_load_acquire pairs with smp_store_release in depot_alloc_stack - * and depot_init_pool. + * smp_load_acquire pairs with smp_store_release in depot_update_pools + * and depot_keep_next_pool. */ if (unlikely(can_alloc && smp_load_acquire(&next_pool_required))) { /* @@ -459,7 +470,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);