From patchwork Mon Jan 30 20:49:30 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: 50464 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2390393wrn; Mon, 30 Jan 2023 12:52:39 -0800 (PST) X-Google-Smtp-Source: AK7set/ccuGhz/yg8KQrmDOjuxrgm3xlCciv1q/pl+1d/a+1hB2FirqFyYkXdzOZTQaJAUmo2OzY X-Received: by 2002:a05:6402:4403:b0:49e:cd82:cc73 with SMTP id y3-20020a056402440300b0049ecd82cc73mr987581eda.29.1675111958806; Mon, 30 Jan 2023 12:52:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675111958; cv=none; d=google.com; s=arc-20160816; b=Tnp+hCkGC7rT8YGAOUD0EIjRs/4DVXnaRpSNVuewZuG1spEfdrmDybAyIqwqhG/ja3 i22fHC0Z6bRRnVyXs/GhxOPCxQqdY7LZ847afhSpl1iXjzZIW+uFK56gRwlOSnQO/pO0 NGO5Rg/gUDRfcIZEtdQ7GoiIcDWKJNDa7ZAM59Bx7u/DTVpIpGJ4LzrYNCSJmL96+38D OOxuoB4I88MNKSrB3pr1lFAeVGR+dlZ6SPlPTFYeQJpDNCexd2TurMyCnnaMTGntWqdZ QTJXUgCYcVywevY+DuQBV1RkcwLb/FsxEYaEW8ogjQVb4wnozCzlYQ7Jl8zdBqcDu5aL xzvg== 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=TXUvy5WDZhr7BlKZ84VBiDQ9FKi0bXR5FVmrmN5uemo=; b=xRRLXJ3ih5vFCOpFiMKPoxKhI+J5cuv8FqpMj+qzot+ZNIwqDeNzGtOug/FQk4MDOj a+n7+uuCDGUqop1C+iQK26PhfYYv+TI6Ux44FAwavmibWBhfM0OqqL5Nxu+ESAwee680 Hi9+H0GCEzc5xJBkUuiFMEWHTWyyCv2fq3AkPPpua/F9xF8TUJAuZT0j0L14FpEwSN25 DGGSvquwH5HBh2cPiPvuZAh71gJ8c+DnnN2Zuz/MBzLWX2gwb7y4pWuFTWG8KcfgvU8+ a1odp3TdQ9ZfljFHsxK6Q8Xa1X6vP/YaPz/WG1uFkbgH560K5naZc6RMfiWAkRX2laVx l3ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b="qTAqH/h3"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w25-20020aa7d299000000b00499c63cd389si13928027edq.442.2023.01.30.12.52.14; Mon, 30 Jan 2023 12:52:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b="qTAqH/h3"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229583AbjA3Uu4 (ORCPT + 99 others); Mon, 30 Jan 2023 15:50:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229475AbjA3Uuy (ORCPT ); Mon, 30 Jan 2023 15:50:54 -0500 Received: from out-223.mta0.migadu.com (out-223.mta0.migadu.com [IPv6:2001:41d0:1004:224b::df]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22A507ABF for ; Mon, 30 Jan 2023 12:50:53 -0800 (PST) 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=1675111851; 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=TXUvy5WDZhr7BlKZ84VBiDQ9FKi0bXR5FVmrmN5uemo=; b=qTAqH/h3lvp3LBinh9ZgKXdhYP02imBJEuB8uqH1iUms1FkvE7RqMS6kgwiVfxPo6dPFiZ INjsSD6+m11nC0jZlXtAXeRY8JnQiDDTw74kkvq8iy8WIY5f1IjA3puf+2wSsDQv7yH1KS kCzz9lKkR7o1ZLchiqq6nGUmdZMJN3g= 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 06/18] lib/stackdepot: annotate init and early init functions Date: Mon, 30 Jan 2023 21:49:30 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756482197260768498?= X-GMAIL-MSGID: =?utf-8?q?1756482197260768498?= From: Andrey Konovalov Add comments to stack_depot_early_init and stack_depot_init to explain certain parts of their implementation. Also add a pr_info message to stack_depot_early_init similar to the one in stack_depot_init. Also move the scale variable in stack_depot_init to the scope where it is being used. Signed-off-by: Andrey Konovalov Reviewed-by: Alexander Potapenko --- lib/stackdepot.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/lib/stackdepot.c b/lib/stackdepot.c index 6e8aef12cf89..b06f6a5caa83 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -115,24 +115,34 @@ void __init stack_depot_request_early_init(void) __stack_depot_early_init_requested = true; } +/* Allocates a hash table via memblock. Can only be used during early boot. */ int __init stack_depot_early_init(void) { unsigned long entries = 0; - /* This is supposed to be called only once, from mm_init() */ + /* This function must be called only once, from mm_init(). */ if (WARN_ON(__stack_depot_early_init_passed)) return 0; - __stack_depot_early_init_passed = true; + /* + * If KASAN is enabled, use the maximum order: KASAN is frequently used + * in fuzzing scenarios, which leads to a large number of different + * stack traces being stored in stack depot. + */ if (kasan_enabled() && !stack_hash_order) stack_hash_order = STACK_HASH_ORDER_MAX; if (!__stack_depot_early_init_requested || stack_depot_disabled) return 0; + /* + * If stack_hash_order is not set, leave entries as 0 to rely on the + * automatic calculations performed by alloc_large_system_hash. + */ if (stack_hash_order) - entries = 1UL << stack_hash_order; + entries = 1UL << stack_hash_order; + pr_info("allocating hash table via alloc_large_system_hash\n"); stack_table = alloc_large_system_hash("stackdepot", sizeof(struct stack_record *), entries, @@ -142,7 +152,6 @@ int __init stack_depot_early_init(void) &stack_hash_mask, 1UL << STACK_HASH_ORDER_MIN, 1UL << STACK_HASH_ORDER_MAX); - if (!stack_table) { pr_err("hash table allocation failed, disabling\n"); stack_depot_disabled = true; @@ -152,6 +161,7 @@ int __init stack_depot_early_init(void) return 0; } +/* Allocates a hash table via kvmalloc. Can be used after boot. */ int stack_depot_init(void) { static DEFINE_MUTEX(stack_depot_init_mutex); @@ -160,11 +170,16 @@ int stack_depot_init(void) mutex_lock(&stack_depot_init_mutex); if (!stack_depot_disabled && !stack_table) { unsigned long entries; - int scale = STACK_HASH_SCALE; + /* + * Similarly to stack_depot_early_init, use stack_hash_order + * if assigned, and rely on automatic scaling otherwise. + */ if (stack_hash_order) { entries = 1UL << stack_hash_order; } else { + int scale = STACK_HASH_SCALE; + entries = nr_free_buffer_pages(); entries = roundup_pow_of_two(entries); @@ -179,7 +194,7 @@ int stack_depot_init(void) if (entries > 1UL << STACK_HASH_ORDER_MAX) entries = 1UL << STACK_HASH_ORDER_MAX; - pr_info("allocating hash table of %lu entries with kvcalloc\n", + pr_info("allocating hash table of %lu entries via kvcalloc\n", entries); stack_table = kvcalloc(entries, sizeof(struct stack_record *), GFP_KERNEL); if (!stack_table) {