From patchwork Thu Jan 25 09:47:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Elver X-Patchwork-Id: 191949 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1539630dyi; Thu, 25 Jan 2024 02:19:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IE7ActVzeUSuxXL39fAshH0k5Teljzl55NU86aUuJOwQ9+QywS9FJaZT8OUdD+10d4AxV1y X-Received: by 2002:a05:6a00:d44:b0:6dd:d1fa:ff17 with SMTP id n4-20020a056a000d4400b006ddd1faff17mr289613pfv.32.1706177957505; Thu, 25 Jan 2024 02:19:17 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706177957; cv=pass; d=google.com; s=arc-20160816; b=vs+UC9d4hcv54vovsSkGsXAjhDWoXr4GxPOvf2FDhlbco6hE5W4EgcU52Z+W2+3App sMzDviHZvEENbW/+73MVjGWFl/6u/dBmPrDqExE7LOBkXMbQgSztkPW0SGDzHe0O/Snk tG4tObA6Yj1qofyZdRsMOsEXkIn+Y82Khy8K1iiau63jU9DbzTF8IFkxziHHScrBPGL+ MERns3e9pRbBMfzLcOuON//NBG5lllWdPDhUw3bVKfP5NWICCV6ZcBdr/Zx2v3uJnQPH ha51UmaU10nR5utXDDDCp0i1KB+OEzCQhYsQI26uHYUJzMJWiUgln9Iy+kO6vNKfbEdk RU4Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:message-id:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:dkim-signature; bh=LcyZJBErh32WdhxOYCRWNuYkcavusvnIBLghtfalcmI=; fh=Q6WTJ5ZnjiuB6HF3Kna6PPHtjylj1os0kvM6d8ajbeE=; b=sOCPielAsrnSZL4mdNzd0RJY9UVjwbSGD/3A2lHh6eoDILtYSe9ONIPoBOWHmYUEl8 ozwsh9BJaEM09q6GQAVy9cYE0KJvbDvS+Hm3oFtYkRyKmE0WOc/C54FpOnovQqsEAtqD EzkjAX261HRlnvan2oJOndeeSSswgn4nZWpAC87MYQ/2mlrpM1DtvgwRC+s5ZtYOKM8S 4LR+KIEDdJBpKHKcCGQ26neRh+Sp+/hj2hXdmZN+cLPZVyjtwJn0V0X0uHXBv2VFmFsc DcEieTrnmu9aS9KLZcRDDxYS5Okqi8tfwm7fmy0BBf16nbeFCXQd+G1iFY4T/73XVEC4 z+Qg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=CxTpxpRo; arc=pass (i=1 spf=pass spfdomain=flex--elver.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-38324-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-38324-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id w19-20020a056a0014d300b006dbdbd9b001si7520059pfu.20.2024.01.25.02.19.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 02:19:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-38324-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=CxTpxpRo; arc=pass (i=1 spf=pass spfdomain=flex--elver.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-38324-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-38324-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 2B489B32ABD for ; Thu, 25 Jan 2024 09:49:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 01F971CAB3; Thu, 25 Jan 2024 09:48:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="CxTpxpRo" Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5272F1BDC2 for ; Thu, 25 Jan 2024 09:48:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706176103; cv=none; b=RiOhIjHz+E1o9Mf1f4u403tdhP++5f5GaCUwFlU4El/A/Np/a5jl/gQmkha7keo7j6nChu/qt0sEEzxEPgFNBbHxLIA/rLaF54nRcmXdkHXS5iSn3wkVigX7Z4C4kVGmNrz3YDlX1g1xOOo+k/lbhqS7+FknK6hx3cieYaETTH4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706176103; c=relaxed/simple; bh=zRBmBsBezUOUsnnS3tv7w4z1t6Jv/D+baLVV5BkOQE0=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=Cj1IBxlInxjq8ygdw3qrJobkl67HDPQ1rY4Z7KE3WAbmzDLlhN+pgE2SOiGV7uhbJYjyDE/DezI46oDlyyiUucqHI2k69vlRgPBY/DpsSN/aBMo+tVCBfHQdm4UjGzvnrmrv52Eosl1rMTvhK7gRBVJuQv7e3/X8DPv/ftCCJjY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--elver.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=CxTpxpRo; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--elver.bounces.google.com Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-5ff817c96a5so99821587b3.3 for ; Thu, 25 Jan 2024 01:48:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706176100; x=1706780900; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=LcyZJBErh32WdhxOYCRWNuYkcavusvnIBLghtfalcmI=; b=CxTpxpRoZly2lz+dyWWcPmwovpOydoVKye3V1aNWm550jC47QeK6BVC+TxNe1lnxNO BeOtX558irCqVUU4rioU0UcRJWQAi7nPjjcLgxnDYvpaxWbJ3R+b2TSxAOTmaCwQhQex efUMggWgyv2jLQxyJQDBBFJ7209NCvDOGqSBzlgWfP4AIWMSGwBM6lLjtfegU6QDx5Uz gAUeM+5ZbzACDkAhdmJ1h7ppj3r6QKeOZBAXOaWFKSboLsFWVXDT97WKOj2EQVlsoslz 6s+UWfeq1/hxu9jpWxNOrJjE5RpFYX3uVqhHdihdZSQwKzaGzNzUMCyOiFQ7DCfCLaOc F8JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706176100; x=1706780900; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=LcyZJBErh32WdhxOYCRWNuYkcavusvnIBLghtfalcmI=; b=O4cxP6gU5sh6y1P6RNb3aDVfms/qNC5kn2nB1dIpqas0vLSOgjnfR2g1rP6R7vs1Dx fGEY+7zC9hD0K8SDs0IfZPosBabb0XpDNPFzhHtdbMhBFMyMPwslBNjjf3L5xIPwlv9R VuByIQvYzrWXI18WrkhqZMsVIdz6GBNjoAUe0DcW7rV9YKJEW9nyUzK1u/DVZgyNvQSi lp8Q3Rh4ft1Eqv7JsB/mXUooCyvVNDepa+qvxHTqili+O7qm5JJIJuZbPQ9KDB3PNd9q VwLfMM0P7r6bSUS7zMR+zulpu4/izv6Ny9SBoD4jTsRDdVZDTF3Q5ADlDirxKIvNVjG5 +zqA== X-Gm-Message-State: AOJu0YyPgHB8elpxZy4YUbv5GesURnfj65TVgp7qIGxejpKmC66Yfged 4sQRbkZ7v06OJlDHIRMbrmvKTUhQhHkFtaa+VhIDyIwjodv0u5hSUDCYbUzyQTTwpAddOiOE3g= = X-Received: from elver.muc.corp.google.com ([2a00:79e0:9c:201:57d7:c308:70aa:3dee]) (user=elver job=sendgmr) by 2002:a81:7905:0:b0:5ff:a62d:e2a with SMTP id u5-20020a817905000000b005ffa62d0e2amr229769ywc.4.1706176100355; Thu, 25 Jan 2024 01:48:20 -0800 (PST) Date: Thu, 25 Jan 2024 10:47:42 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240125094815.2041933-1-elver@google.com> Subject: [PATCH 1/2] stackdepot: use variable size records for non-evictable entries From: Marco Elver To: elver@google.com, Andrew Morton Cc: Andrey Konovalov , Alexander Potapenko , Dmitry Vyukov , Vlastimil Babka , Andrey Ryabinin , Vincenzo Frascino , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789057258063861713 X-GMAIL-MSGID: 1789057258063861713 With the introduction of stack depot evictions, each stack record is now fixed size, so that future reuse after an eviction can safely store differently sized stack traces. In all cases that do not make use of evictions, this wastes lots of space. Fix it by re-introducing variable size stack records (up to the max allowed size) for entries that will never be evicted. We know if an entry will never be evicted if the flag STACK_DEPOT_FLAG_GET is not provided, since a later stack_depot_put() attempt is undefined behavior. With my current kernel config that enables KASAN and also SLUB owner tracking, I observe (after a kernel boot) a whopping reduction of 296 stack depot pools, which translates into 4736 KiB saved. The savings here are from SLUB owner tracking only, because KASAN generic mode still uses refcounting. Before: pools: 893 allocations: 29841 frees: 6524 in_use: 23317 freelist_size: 3454 After: pools: 597 allocations: 29657 frees: 6425 in_use: 23232 freelist_size: 3493 Fixes: 108be8def46e ("lib/stackdepot: allow users to evict stack traces") Signed-off-by: Marco Elver Cc: Alexander Potapenko Cc: Andrey Konovalov Cc: Dmitry Vyukov Reviewed-by: Andrey Konovalov --- v1 (since RFC): * Get rid of new_pool_required to simplify the code. * Warn on attempts to switch a non-refcounted entry to refcounting. * Typos. --- include/linux/poison.h | 3 + lib/stackdepot.c | 212 +++++++++++++++++++++-------------------- 2 files changed, 113 insertions(+), 102 deletions(-) diff --git a/include/linux/poison.h b/include/linux/poison.h index 27a7dad17eef..1f0ee2459f2a 100644 --- a/include/linux/poison.h +++ b/include/linux/poison.h @@ -92,4 +92,7 @@ /********** VFS **********/ #define VFS_PTR_POISON ((void *)(0xF5 + POISON_POINTER_DELTA)) +/********** lib/stackdepot.c **********/ +#define STACK_DEPOT_POISON ((void *)(0xD390 + POISON_POINTER_DELTA)) + #endif diff --git a/lib/stackdepot.c b/lib/stackdepot.c index 5caa1f566553..1b0d948a053c 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -93,9 +94,6 @@ struct stack_record { }; }; -#define DEPOT_STACK_RECORD_SIZE \ - ALIGN(sizeof(struct stack_record), 1 << DEPOT_STACK_ALIGN) - static bool stack_depot_disabled; static bool __stack_depot_early_init_requested __initdata = IS_ENABLED(CONFIG_STACKDEPOT_ALWAYS_INIT); static bool __stack_depot_early_init_passed __initdata; @@ -121,15 +119,10 @@ static void *stack_pools[DEPOT_MAX_POOLS]; static void *new_pool; /* Number of pools in stack_pools. */ static int pools_num; +/* Offset to the unused space in the currently used pool. */ +static size_t pool_offset = DEPOT_POOL_SIZE; /* Freelist of stack records within stack_pools. */ static LIST_HEAD(free_stacks); -/* - * Stack depot tries to keep an extra pool allocated even before it runs out - * 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 bool new_pool_required = true; /* The lock must be held when performing pool or freelist modifications. */ static DEFINE_RAW_SPINLOCK(pool_lock); @@ -294,48 +287,52 @@ int stack_depot_init(void) EXPORT_SYMBOL_GPL(stack_depot_init); /* - * Initializes new stack depot @pool, release all its entries to the freelist, - * and update the list of pools. + * Initializes new stack pool, and updates the list of pools. */ -static void depot_init_pool(void *pool) +static bool depot_init_pool(void **prealloc) { - int offset; - lockdep_assert_held(&pool_lock); - /* Initialize handles and link stack records into the freelist. */ - for (offset = 0; offset <= DEPOT_POOL_SIZE - DEPOT_STACK_RECORD_SIZE; - offset += DEPOT_STACK_RECORD_SIZE) { - struct stack_record *stack = pool + offset; - - stack->handle.pool_index = pools_num; - stack->handle.offset = offset >> DEPOT_STACK_ALIGN; - stack->handle.extra = 0; - - /* - * Stack traces of size 0 are never saved, and we can simply use - * the size field as an indicator if this is a new unused stack - * record in the freelist. - */ - stack->size = 0; + if (unlikely(pools_num >= DEPOT_MAX_POOLS)) { + /* Bail out if we reached the pool limit. */ + WARN_ON_ONCE(pools_num > DEPOT_MAX_POOLS); /* should never happen */ + WARN_ON_ONCE(!new_pool); /* to avoid unnecessary pre-allocation */ + WARN_ONCE(1, "Stack depot reached limit capacity"); + return false; + } - INIT_LIST_HEAD(&stack->hash_list); - /* - * Add to the freelist front to prioritize never-used entries: - * required in case there are entries in the freelist, but their - * RCU cookie still belongs to the current RCU grace period - * (there can still be concurrent readers). - */ - list_add(&stack->free_list, &free_stacks); - counters[DEPOT_COUNTER_FREELIST_SIZE]++; + if (!new_pool && *prealloc) { + /* We have preallocated memory, use it. */ + WRITE_ONCE(new_pool, *prealloc); + *prealloc = NULL; } + if (!new_pool) + return false; /* new_pool and *prealloc are NULL */ + /* Save reference to the pool to be used by depot_fetch_stack(). */ - stack_pools[pools_num] = pool; + stack_pools[pools_num] = new_pool; + + /* + * Stack depot tries to keep an extra pool allocated even before it runs + * out of space in the currently used pool. + * + * To indicate that a new preallocation is needed new_pool is reset to + * NULL; do not reset to NULL if we have reached the maximum number of + * pools. + */ + if (pools_num < DEPOT_MAX_POOLS) + WRITE_ONCE(new_pool, NULL); + else + WRITE_ONCE(new_pool, STACK_DEPOT_POISON); /* Pairs with concurrent READ_ONCE() in depot_fetch_stack(). */ WRITE_ONCE(pools_num, pools_num + 1); ASSERT_EXCLUSIVE_WRITER(pools_num); + + pool_offset = 0; + + return true; } /* Keeps the preallocated memory to be used for a new stack depot pool. */ @@ -347,60 +344,48 @@ static void depot_keep_new_pool(void **prealloc) * If a new pool is already saved or the maximum number of * pools is reached, do not use the preallocated memory. */ - if (!new_pool_required) + if (new_pool) return; - /* - * Use the preallocated memory for the new pool - * as long as we do not exceed the maximum number of pools. - */ - if (pools_num < DEPOT_MAX_POOLS) { - new_pool = *prealloc; - *prealloc = NULL; - } - - /* - * 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. - */ - WRITE_ONCE(new_pool_required, false); + WRITE_ONCE(new_pool, *prealloc); + *prealloc = NULL; } /* - * Try to initialize a new stack depot pool from either a previous or the - * current pre-allocation, and release all its entries to the freelist. + * Try to initialize a new stack record from the current pool, a cached pool, or + * the current pre-allocation. */ -static bool depot_try_init_pool(void **prealloc) +static struct stack_record *depot_pop_free_pool(void **prealloc, size_t size) { + struct stack_record *stack; + void *current_pool; + u32 pool_index; + lockdep_assert_held(&pool_lock); - /* Check if we have a new pool saved and use it. */ - if (new_pool) { - depot_init_pool(new_pool); - new_pool = NULL; + if (pool_offset + size > DEPOT_POOL_SIZE) { + if (!depot_init_pool(prealloc)) + return NULL; + } - /* Take note that we might need a new new_pool. */ - if (pools_num < DEPOT_MAX_POOLS) - WRITE_ONCE(new_pool_required, true); + if (WARN_ON_ONCE(pools_num < 1)) + return NULL; + pool_index = pools_num - 1; + current_pool = stack_pools[pool_index]; + if (WARN_ON_ONCE(!current_pool)) + return NULL; - return true; - } + stack = current_pool + pool_offset; - /* Bail out if we reached the pool limit. */ - if (unlikely(pools_num >= DEPOT_MAX_POOLS)) { - WARN_ONCE(1, "Stack depot reached limit capacity"); - return false; - } + /* Pre-initialize handle once. */ + stack->handle.pool_index = pool_index; + stack->handle.offset = pool_offset >> DEPOT_STACK_ALIGN; + stack->handle.extra = 0; + INIT_LIST_HEAD(&stack->hash_list); - /* Check if we have preallocated memory and use it. */ - if (*prealloc) { - depot_init_pool(*prealloc); - *prealloc = NULL; - return true; - } + pool_offset += size; - return false; + return stack; } /* Try to find next free usable entry. */ @@ -420,7 +405,7 @@ static struct stack_record *depot_pop_free(void) * check the first entry. */ stack = list_first_entry(&free_stacks, struct stack_record, free_list); - if (stack->size && !poll_state_synchronize_rcu(stack->rcu_state)) + if (!poll_state_synchronize_rcu(stack->rcu_state)) return NULL; list_del(&stack->free_list); @@ -429,45 +414,68 @@ static struct stack_record *depot_pop_free(void) return stack; } +static inline size_t depot_stack_record_size(struct stack_record *s, unsigned int nr_entries) +{ + const size_t used = flex_array_size(s, entries, nr_entries); + const size_t unused = sizeof(s->entries) - used; + + WARN_ON_ONCE(sizeof(s->entries) < used); + + return ALIGN(sizeof(struct stack_record) - unused, 1 << DEPOT_STACK_ALIGN); +} + /* 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) +depot_alloc_stack(unsigned long *entries, int nr_entries, u32 hash, depot_flags_t flags, void **prealloc) { - struct stack_record *stack; + struct stack_record *stack = NULL; + size_t record_size; lockdep_assert_held(&pool_lock); /* This should already be checked by public API entry points. */ - if (WARN_ON_ONCE(!size)) + if (WARN_ON_ONCE(!nr_entries)) return NULL; - /* Check if we have a stack record to save the stack trace. */ - stack = depot_pop_free(); - if (!stack) { - /* No usable entries on the freelist - try to refill the freelist. */ - if (!depot_try_init_pool(prealloc)) - return NULL; + /* Limit number of saved frames to CONFIG_STACKDEPOT_MAX_FRAMES. */ + if (nr_entries > CONFIG_STACKDEPOT_MAX_FRAMES) + nr_entries = CONFIG_STACKDEPOT_MAX_FRAMES; + + if (flags & STACK_DEPOT_FLAG_GET) { + /* + * Evictable entries have to allocate the max. size so they may + * safely be re-used by differently sized allocations. + */ + record_size = depot_stack_record_size(stack, CONFIG_STACKDEPOT_MAX_FRAMES); stack = depot_pop_free(); - if (WARN_ON(!stack)) - return NULL; + } else { + record_size = depot_stack_record_size(stack, nr_entries); } - /* Limit number of saved frames to CONFIG_STACKDEPOT_MAX_FRAMES. */ - if (size > CONFIG_STACKDEPOT_MAX_FRAMES) - size = CONFIG_STACKDEPOT_MAX_FRAMES; + if (!stack) { + stack = depot_pop_free_pool(prealloc, record_size); + if (!stack) + return NULL; + } /* Save the stack trace. */ stack->hash = hash; - stack->size = size; - /* stack->handle is already filled in by depot_init_pool(). */ - refcount_set(&stack->count, 1); - memcpy(stack->entries, entries, flex_array_size(stack, entries, size)); + stack->size = nr_entries; + /* stack->handle is already filled in by depot_pop_free_pool(). */ + memcpy(stack->entries, entries, flex_array_size(stack, entries, nr_entries)); + + if (flags & STACK_DEPOT_FLAG_GET) { + refcount_set(&stack->count, 1); + } else { + /* Warn on attempts to switch to refcounting this entry. */ + refcount_set(&stack->count, REFCOUNT_SATURATED); + } /* * Let KMSAN know the stored stack record is initialized. This shall * prevent false positive reports if instrumented code accesses it. */ - kmsan_unpoison_memory(stack, DEPOT_STACK_RECORD_SIZE); + kmsan_unpoison_memory(stack, record_size); counters[DEPOT_COUNTER_ALLOCS]++; counters[DEPOT_COUNTER_INUSE]++; @@ -660,7 +668,7 @@ depot_stack_handle_t stack_depot_save_flags(unsigned long *entries, * Allocate memory for a new pool if required now: * we won't be able to do that under the lock. */ - if (unlikely(can_alloc && READ_ONCE(new_pool_required))) { + if (unlikely(can_alloc && !READ_ONCE(new_pool))) { /* * Zero out zone modifiers, as we don't have specific zone * requirements. Keep the flags related to allocation in atomic @@ -681,7 +689,7 @@ depot_stack_handle_t stack_depot_save_flags(unsigned long *entries, found = find_stack(bucket, entries, nr_entries, hash, depot_flags); if (!found) { struct stack_record *new = - depot_alloc_stack(entries, nr_entries, hash, &prealloc); + depot_alloc_stack(entries, nr_entries, hash, depot_flags, &prealloc); if (new) { /* From patchwork Thu Jan 25 09:47:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Elver X-Patchwork-Id: 191931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1529568dyi; Thu, 25 Jan 2024 01:57:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IFR6ZxME1TqmKoaZxNbrtkeSn2bXfBbBa5dz6D6BstZLa0ziT+9oQKLaWbdb6PHbLQ5KTuj X-Received: by 2002:a92:da4c:0:b0:361:ac88:764e with SMTP id p12-20020a92da4c000000b00361ac88764emr805611ilq.112.1706176676287; Thu, 25 Jan 2024 01:57:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706176676; cv=pass; d=google.com; s=arc-20160816; b=i9pCACsW+nSpkoD6KxHyPWk5JJpgsclbfIyhI9wKH27c1fUckX0sU3Nt2FNq05aYff cmY7p2Hpz4am38iOtaGUC6k4cycEP5SzSAS0e6tlNNtPyQMUb/ssnwG2sLyq7w3BabI+ WRjylU7fN7wYSt5fYycjQfQX1hT8Msm5cRQa3oJKtwSSvvfrIGbnJTgBqI++xfK2kG2m vyO58GAYo4H6iC6RCBsbFQtAHglOKzZ/rhx2hlo6ADK4wbtTVQr1HXIIjFX4WIzyoDRJ 28GcJBQgpA8NGoRD5c4WWOdcn1SSpqbPzy5LP5cHOzugSABubsa/eRSY5Z0izDJRSKOu 5amw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:message-id:references:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:in-reply-to:date :dkim-signature; bh=R76x7/0RnR583W2gtQWaNlBYwLgRcgwa4b5YYEtfgyM=; fh=Q6WTJ5ZnjiuB6HF3Kna6PPHtjylj1os0kvM6d8ajbeE=; b=doq4gz6uQkELm0NAK7zoSyKT0XxKU67O5oHTk0kf9M3k5OGQRUZF31eM1cb56Zs6G7 uvEbva9PYZHW5wZSLfJV0od35LsS1PC0yPUZEk6yvclnpYdPWgQAyvwe2h8lX26M15vs stnX9BeA0d/ZviHWRNUlBv90ZlPidSgieesPvDxOH+u/EnjBg0i6fF9NV8pYfvhghi8s ZK9I8lmtPEwmX03ukj6LmkWjjAPGYciJkZc/2HP3HEs8W0rXd9W2pTKCQI5p58ftzYO2 vPLrO1ZNkEBQA3noevFGbClElDj+3vP6PPGArT1lU0gy575pLBiVkVUFZMuhD2YrVby+ oXtg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=I8aNbjJL; arc=pass (i=1 spf=pass spfdomain=flex--elver.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-38325-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-38325-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id r64-20020a632b43000000b005c65d0dd9a0si13202872pgr.503.2024.01.25.01.57.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:57:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-38325-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=I8aNbjJL; arc=pass (i=1 spf=pass spfdomain=flex--elver.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-38325-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-38325-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 9D6A0293829 for ; Thu, 25 Jan 2024 09:49:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CAE691CD15; Thu, 25 Jan 2024 09:48:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="I8aNbjJL" Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1B3D1CA8B for ; Thu, 25 Jan 2024 09:48:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706176106; cv=none; b=E2L7FcLjDSeOIz9KUgFhVg+NgFE1j35lOmlbEiiVCiOm26zkOCH3kxRb2G4th6bh2ZLa+4SO3AeNUwBFC08Jj9sRHV9rK+75ejt6KamIV1NXTv5oe/5DM0HL0WzQxZjvlakQs5OBEVctSid15lgSlolQUdVrwvrt6sp2y4wuR9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706176106; c=relaxed/simple; bh=5yob15Yg48eoJzIrZJcONeHNPG3bPsXIKlnx48cjXbQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=SO3lEs4AGXssBk8ZkjPoAGnPuO20wMb3VrSXWcelnDfQKYAtu00k8/pO00S0Pqcqw6hyBFbJA3+ddVa+IiUEsEmUefpHmpJPB8wnKv+zWGEcnySpHJaYEufhQKX7k4sh31zsbsFm8neNTPesFd5uYI4A40A3G61dQnHu+9oAlF4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--elver.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=I8aNbjJL; arc=none smtp.client-ip=209.85.218.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--elver.bounces.google.com Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-a2c653c7b35so356894866b.0 for ; Thu, 25 Jan 2024 01:48:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706176103; x=1706780903; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=R76x7/0RnR583W2gtQWaNlBYwLgRcgwa4b5YYEtfgyM=; b=I8aNbjJLgADgYA4fQZ31q096OgYfhXuRMogULf6WyLUT9ylb7J8DgtREtZbVOS1tBM oENwnJ2wUSN5o6As+1thq6WdCS5bYs8i/ZQhxVZmyksaoa3ppfw8n0oEfqJOfVIHhrOf ky5NGiasE3e2uf7KN9Pijp723VkzWWWu9U7oXctN7POdnrrv4lwb/jIOZikjElnyOgqs z9ANranqIhDnvm47k5HEZc2t4zr0IwPhBKl9HMJxXnT82djZ3yBfXVE20GTbDBzIT7sG TFH5GISYrpXicbns71qk64aUppSxkuqRLmR5jYJ6KVXcYfzK/7q6WNNQdKm0koTEiaBA Rl9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706176103; x=1706780903; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=R76x7/0RnR583W2gtQWaNlBYwLgRcgwa4b5YYEtfgyM=; b=qb87Q8j9h5/Vxt72SKNaTe4J9wAJ/q13stVQ2AZoIKe5rBplcEpxecBU8t0Okvbz10 qID/DeSTdmCm5XY2zvyu9bgxi+QHsmXiP7zqIJDoSktl16bRDZhD1OZwhZCyd6DFN85Y a8DyDflJk9xjgAhlibaYoLczqgNqz1FuII+weZ0qldHiz0+W0V/P11X9z/4KPZ7pVN2D jSJdPNmx9+8OpDvonuElUqNAySd60ZHaAfYBsQC3bpDRk0Bv6GMfglj1F58S8s7dZ7cN YAxg03rm9PIIegMrvmJn4RBLl2kSd9faslCmTPeYTdTcXVIi5EgCdOX3Mqw7OoHRZSjH YIGw== X-Gm-Message-State: AOJu0Ywr1gvl785ieStvbcT0wRIjzCVwbOPmTzff8ob4cyHJ2Z9ELN64 OzJIAHyI7zYY4YIc6gJ62YATsEi766pUNG9v5WZcuzcWc3YaQaobDhMz+TgUdmAnZAR7398q/w= = X-Received: from elver.muc.corp.google.com ([2a00:79e0:9c:201:57d7:c308:70aa:3dee]) (user=elver job=sendgmr) by 2002:a17:907:c24d:b0:a31:747c:b3c7 with SMTP id tj13-20020a170907c24d00b00a31747cb3c7mr4623ejc.3.1706176103117; Thu, 25 Jan 2024 01:48:23 -0800 (PST) Date: Thu, 25 Jan 2024 10:47:43 +0100 In-Reply-To: <20240125094815.2041933-1-elver@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240125094815.2041933-1-elver@google.com> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240125094815.2041933-2-elver@google.com> Subject: [PATCH 2/2] kasan: revert eviction of stack traces in generic mode From: Marco Elver To: elver@google.com, Andrew Morton Cc: Andrey Konovalov , Alexander Potapenko , Dmitry Vyukov , Vlastimil Babka , Andrey Ryabinin , Vincenzo Frascino , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789055914506532291 X-GMAIL-MSGID: 1789055914506532291 This partially reverts commits cc478e0b6bdf, 63b85ac56a64, 08d7c94d9635, a414d4286f34, and 773688a6cb24 to make use of variable-sized stack depot records, since eviction of stack entries from stack depot forces fixed- sized stack records. Care was taken to retain the code cleanups by the above commits. Eviction was added to generic KASAN as a response to alleviating the additional memory usage from fixed-sized stack records, but this still uses more memory than previously. With the re-introduction of variable-sized records for stack depot, we can just switch back to non-evictable stack records again, and return back to the previous performance and memory usage baseline. Before (observed after a KASAN kernel boot): pools: 597 allocations: 29657 frees: 6425 in_use: 23232 freelist_size: 3493 After: pools: 315 allocations: 28964 frees: 0 in_use: 28964 freelist_size: 0 As can be seen from the number of "frees", with a generic KASAN config, evictions are no longer used but due to using variable-sized records, I observe a reduction of 282 stack depot pools (saving 4512 KiB) with my test setup. Fixes: cc478e0b6bdf ("kasan: avoid resetting aux_lock") Fixes: 63b85ac56a64 ("kasan: stop leaking stack trace handles") Fixes: 08d7c94d9635 ("kasan: memset free track in qlink_free") Fixes: a414d4286f34 ("kasan: handle concurrent kasan_record_aux_stack calls") Fixes: 773688a6cb24 ("kasan: use stack_depot_put for Generic mode") Signed-off-by: Marco Elver Cc: Alexander Potapenko Cc: Andrey Konovalov Cc: Dmitry Vyukov Reviewed-by: Andrey Konovalov --- mm/kasan/common.c | 3 +-- mm/kasan/generic.c | 54 ++++++---------------------------------------- mm/kasan/kasan.h | 8 ------- 3 files changed, 8 insertions(+), 57 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 610efae91220..ad32803e34e9 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -65,8 +65,7 @@ void kasan_save_track(struct kasan_track *track, gfp_t flags) { depot_stack_handle_t stack; - stack = kasan_save_stack(flags, - STACK_DEPOT_FLAG_CAN_ALLOC | STACK_DEPOT_FLAG_GET); + stack = kasan_save_stack(flags, STACK_DEPOT_FLAG_CAN_ALLOC); kasan_set_track(track, stack); } diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index df6627f62402..8bfb52b28c22 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -485,16 +485,6 @@ void kasan_init_object_meta(struct kmem_cache *cache, const void *object) if (alloc_meta) { /* Zero out alloc meta to mark it as invalid. */ __memset(alloc_meta, 0, sizeof(*alloc_meta)); - - /* - * Prepare the lock for saving auxiliary stack traces. - * Temporarily disable KASAN bug reporting to allow instrumented - * raw_spin_lock_init to access aux_lock, which resides inside - * of a redzone. - */ - kasan_disable_current(); - raw_spin_lock_init(&alloc_meta->aux_lock); - kasan_enable_current(); } /* @@ -506,18 +496,8 @@ void kasan_init_object_meta(struct kmem_cache *cache, const void *object) static void release_alloc_meta(struct kasan_alloc_meta *meta) { - /* Evict the stack traces from stack depot. */ - stack_depot_put(meta->alloc_track.stack); - stack_depot_put(meta->aux_stack[0]); - stack_depot_put(meta->aux_stack[1]); - - /* - * Zero out alloc meta to mark it as invalid but keep aux_lock - * initialized to avoid having to reinitialize it when another object - * is allocated in the same slot. - */ - __memset(&meta->alloc_track, 0, sizeof(meta->alloc_track)); - __memset(meta->aux_stack, 0, sizeof(meta->aux_stack)); + /* Zero out alloc meta to mark it as invalid. */ + __memset(meta, 0, sizeof(*meta)); } static void release_free_meta(const void *object, struct kasan_free_meta *meta) @@ -526,9 +506,6 @@ static void release_free_meta(const void *object, struct kasan_free_meta *meta) if (*(u8 *)kasan_mem_to_shadow(object) != KASAN_SLAB_FREE_META) return; - /* Evict the stack trace from the stack depot. */ - stack_depot_put(meta->free_track.stack); - /* Mark free meta as invalid. */ *(u8 *)kasan_mem_to_shadow(object) = KASAN_SLAB_FREE; } @@ -571,8 +548,6 @@ static void __kasan_record_aux_stack(void *addr, depot_flags_t depot_flags) struct kmem_cache *cache; struct kasan_alloc_meta *alloc_meta; void *object; - depot_stack_handle_t new_handle, old_handle; - unsigned long flags; if (is_kfence_address(addr) || !slab) return; @@ -583,33 +558,18 @@ static void __kasan_record_aux_stack(void *addr, depot_flags_t depot_flags) if (!alloc_meta) return; - new_handle = kasan_save_stack(0, depot_flags); - - /* - * Temporarily disable KASAN bug reporting to allow instrumented - * spinlock functions to access aux_lock, which resides inside of a - * redzone. - */ - kasan_disable_current(); - raw_spin_lock_irqsave(&alloc_meta->aux_lock, flags); - old_handle = alloc_meta->aux_stack[1]; alloc_meta->aux_stack[1] = alloc_meta->aux_stack[0]; - alloc_meta->aux_stack[0] = new_handle; - raw_spin_unlock_irqrestore(&alloc_meta->aux_lock, flags); - kasan_enable_current(); - - stack_depot_put(old_handle); + alloc_meta->aux_stack[0] = kasan_save_stack(0, depot_flags); } void kasan_record_aux_stack(void *addr) { - return __kasan_record_aux_stack(addr, - STACK_DEPOT_FLAG_CAN_ALLOC | STACK_DEPOT_FLAG_GET); + return __kasan_record_aux_stack(addr, STACK_DEPOT_FLAG_CAN_ALLOC); } void kasan_record_aux_stack_noalloc(void *addr) { - return __kasan_record_aux_stack(addr, STACK_DEPOT_FLAG_GET); + return __kasan_record_aux_stack(addr, 0); } void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) @@ -620,7 +580,7 @@ void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) if (!alloc_meta) return; - /* Evict previous stack traces (might exist for krealloc or mempool). */ + /* Invalidate previous stack traces (might exist for krealloc or mempool). */ release_alloc_meta(alloc_meta); kasan_save_track(&alloc_meta->alloc_track, flags); @@ -634,7 +594,7 @@ void kasan_save_free_info(struct kmem_cache *cache, void *object) if (!free_meta) return; - /* Evict previous stack trace (might exist for mempool). */ + /* Invalidate previous stack trace (might exist for mempool). */ release_free_meta(object, free_meta); kasan_save_track(&free_meta->free_track, 0); diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index d0f172f2b978..216ae0ef1e4b 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -6,7 +6,6 @@ #include #include #include -#include #include #if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) @@ -265,13 +264,6 @@ struct kasan_global { struct kasan_alloc_meta { struct kasan_track alloc_track; /* Free track is stored in kasan_free_meta. */ - /* - * aux_lock protects aux_stack from accesses from concurrent - * kasan_record_aux_stack calls. It is a raw spinlock to avoid sleeping - * on RT kernels, as kasan_record_aux_stack_noalloc can be called from - * non-sleepable contexts. - */ - raw_spinlock_t aux_lock; depot_stack_handle_t aux_stack[2]; };