From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (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 9AF70290DB5 for ; Tue, 6 May 2025 04:21:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746505262; cv=none; b=Hwt4DCCK8v/8C/dWg5qS3lp65M+nFKZssuQr70o7n8krpX8GAyXGB4TIgopLKdtV5Adc0dbQ6EfyXxt+1NtsfPtqBRkzlbcdFMO377pPhiD4cNpsGNEbKHtgBus6kxhVu4m2gSgQaOq6jCccJKo4IvYlAz5j4sm2ym3etGPBo2U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746505262; c=relaxed/simple; bh=DNwVyTCcOjrl4kbNqvDRwjBggTFRm5nqgPRq9w9xVEA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Dsf71Otr2nVGdGOnKBeKs9RMi7A6ccBgTJMdIYHuxrpakixeF4OXoUvG6oagYxB1VcHTU9UocvBpScSP/ABxGqkM+5xqHRd5+pJVTd9H4WR1dOX8PkrYTVwfIWH986uqv2jy1lUJkfB6pa1UpyhqA6/Px0QW545JsnfGXoba0lI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mb+QAeYG; arc=none smtp.client-ip=209.85.219.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mb+QAeYG" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-6f53d271b7cso39136d6.2 for ; Mon, 05 May 2025 21:21:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746505259; x=1747110059; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:feedback-id:from:to:cc:subject :date:message-id:reply-to; bh=3OUeV+ysAiL6au/JA8NItOuHiGPdhnma0mnX2ERy5dE=; b=mb+QAeYGYxnH5sqT5U6ODUgJGZy5MgOevzP9TEJgZqyOwD+Pki26J/70kopH83ww74 C/h07Fm1gw5QSlr/dYk2r+ssRgt18DqG0a1/Cu55/Pb57hGcT6HWr3bDmfrVZcIlYmZ+ WgUBuIkjrCNlD5LZBDebD6hoJYbKjR2d5c9o5mX+/RKmimosF0WVwAtlstzKQcFHdth6 PTicIspu851DY9ZCf9DbNFNCXtZwem7COCsyrtOcXzT6/Xvo9ETiVtEYiSSfYBkdxCUa ZUvr34bn0s2a5ENCCeE/vJ8OI/FGQAMOB9jPp6yJeN2bMoexnPyPizGj43qdVexdPHru LWvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746505259; x=1747110059; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:feedback-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3OUeV+ysAiL6au/JA8NItOuHiGPdhnma0mnX2ERy5dE=; b=jvhmWSw9o5uEcn46t92f7Vy3JIDcU7Q1Do8ZNUW9BCbTOg6wU5thLXWnGbjbZ7yYq5 IjifSilRYy9WFF9a1vXguHAECINljjBizOeBFey9nRUQb3BtNQBJNGe1+cbDdzp1lAQq cIafK3by50Xm5T59GZvD+wSyLWV0CwBO+O2rovCs0BLw0ufOBIeU5O5neWA9LFPyvtCC ZYWLhTjfsRDp7XqhtRV273LAXRkRD9A1lRTMMsKg/wzeN7sngdC+tJejBDASC3RbLuM6 MIDydHm2BaFy8s4tOnuApp25xS2Wpe8ozZ6MydMEvJNveN0xOFaKNb0is2EzMAoxHVHE nzsA== X-Forwarded-Encrypted: i=1; AJvYcCWmljix8bixsVU4NYjWABkDJA/lukx5NXjeSeAx/5oHOsfr7UM47n04Uca6v14QKyMeXiU5@lists.linux.dev X-Gm-Message-State: AOJu0YxzFr0G7kvforkoEBcnbk8kUP0LNDi0zOoDOBIhypjQjgZzz/MN KzfnOAdt8oy2NeyQh5GRxxZX1giTOAIRCtnW9pjQ1Ceq33N9NcSU7/aCkA== X-Gm-Gg: ASbGncuymQeDHp8xIlp63lu5Cq8KnfopwJF6vXxKmxxRB42D7mEkYGvd50E+F33tmgP /AkCXD96u92w9zcEaHB3x70HS/FVJTPQPw7ucFXeiB1ZwzrPtaqPcaJalaY9rGIGOP0UwkWMeo9 HJgLKnyiTj/ebOAV70yv66VGeVG6Pj3jNJVE2AeSNiq/LUXO0yc7iIdkTg3FpYW710n4UMZtpDM Uv1UVa5FlAUyX3+9hcfQMJiEt6egny10pF0qU8T13+n4WAz64XSKlSS2lAc2OiaM0S+U898ZaoM nPIlcqYbCI8XPNLOFx/5ATOCS0GlgktY68sPSlG+fworT7Y/M0kGh7xsOwUUz58DX3AVe4DBgey 84zGw9FOCwZsK8/lVX9febSDOKCn8e9o= X-Google-Smtp-Source: AGHT+IH+kp9foAY4t6M00GAm1xmuSa34/5hEqfuNRr7JNPk7Jcnx40ELv8vv/dVN+mrv6oEHsbe73w== X-Received: by 2002:a05:6214:b6e:b0:6f4:d60d:dd29 with SMTP id 6a1803df08f44-6f5157301d3mr260126456d6.5.1746505259319; Mon, 05 May 2025 21:20:59 -0700 (PDT) Received: from fauth-a2-smtp.messagingengine.com (fauth-a2-smtp.messagingengine.com. [103.168.172.201]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6f50f44f5a2sm64779936d6.78.2025.05.05.21.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 21:20:58 -0700 (PDT) Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfauth.phl.internal (Postfix) with ESMTP id 7F2881200068; Tue, 6 May 2025 00:20:58 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-08.internal (MEProxy); Tue, 06 May 2025 00:20:58 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeeftdduucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredt tdenucfhrhhomhepuehoqhhunhcuhfgvnhhguceosghoqhhunhdrfhgvnhhgsehgmhgrih hlrdgtohhmqeenucggtffrrghtthgvrhhnpefghfffvefhhfdvgfejgfekvdelgfekgeev ueehlefhiedvgeffjefgteeugfehieenucffohhmrghinhepkhgvrhhnvghlrdhorhhgne cuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepsghoqhhu nhdomhgvshhmthhprghuthhhphgvrhhsohhnrghlihhthidqieelvdeghedtieegqdduje ejkeehheehvddqsghoqhhunhdrfhgvnhhgpeepghhmrghilhdrtghomhesfhhigihmvgdr nhgrmhgvpdhnsggprhgtphhtthhopeduvddpmhhouggvpehsmhhtphhouhhtpdhrtghpth htohepmhhinhhgoheskhgvrhhnvghlrdhorhhgpdhrtghpthhtohepphgvthgvrhiisehi nhhfrhgruggvrggurdhorhhgpdhrtghpthhtohepmhhinhhgohesrhgvughhrghtrdgtoh hmpdhrtghpthhtohepfihilhhlsehkvghrnhgvlhdrohhrghdprhgtphhtthhopegsohhq uhhnrdhfvghnghesghhmrghilhdrtghomhdprhgtphhtthhopehlohhnghhmrghnsehrvg guhhgrthdrtghomhdprhgtphhtthhopehnrghthhgrnheskhgvrhhnvghlrdhorhhgpdhr tghpthhtohepnhhitghkrdguvghsrghulhhnihgvrhhsodhlkhhmlhesghhmrghilhdrtg homhdprhgtphhtthhopehmohhrsghosehgohhoghhlvgdrtghomh X-ME-Proxy: Feedback-ID: iad51458e:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 6 May 2025 00:20:57 -0400 (EDT) From: Boqun Feng To: Ingo Molnar , Peter Zijlstra Cc: Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH 3/3] locking/lockdep: Add # of dynamic keys stat to /proc/lockdep_stats Date: Mon, 5 May 2025 21:20:49 -0700 Message-Id: <20250506042049.50060-4-boqun.feng@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250506042049.50060-1-boqun.feng@gmail.com> References: <20250506042049.50060-1-boqun.feng@gmail.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Waiman Long There have been recent reports about running out of lockdep keys (MAX_LOCKDEP_KEYS too low!). One possible reason is that too many dynamic keys have been registered. A possible culprit is the lockdep_register_key() call in qdisc_alloc() of net/sched/sch_generic.c. Currently, there is no way to find out how many dynamic keys have been registered. Add such a stat to the /proc/lockdep_stats to get better clarity. Signed-off-by: Waiman Long Signed-off-by: Boqun Feng Link: https://lore.kernel.org/r/20250425001155.775458-1-longman@redhat.com --- kernel/locking/lockdep.c | 3 +++ kernel/locking/lockdep_internals.h | 1 + kernel/locking/lockdep_proc.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 58883c8375d1..e7166ff64681 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -219,6 +219,7 @@ static DECLARE_BITMAP(list_entries_in_use, MAX_LOCKDEP_ENTRIES); static struct hlist_head lock_keys_hash[KEYHASH_SIZE]; unsigned long nr_lock_classes; unsigned long nr_zapped_classes; +unsigned long nr_dynamic_keys; unsigned long max_lock_class_idx; struct lock_class lock_classes[MAX_LOCKDEP_KEYS]; DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS); @@ -1238,6 +1239,7 @@ void lockdep_register_key(struct lock_class_key *key) goto out_unlock; } hlist_add_head_rcu(&key->hash_entry, hash_head); + nr_dynamic_keys++; out_unlock: graph_unlock(); restore_irqs: @@ -6606,6 +6608,7 @@ void lockdep_unregister_key(struct lock_class_key *key) pf = get_pending_free(); __lockdep_free_key_range(pf, key, 1); need_callback = prepare_call_rcu_zapped(pf); + nr_dynamic_keys--; } lockdep_unlock(); raw_local_irq_restore(flags); diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h index 20f9ef58d3d0..82156caf77d1 100644 --- a/kernel/locking/lockdep_internals.h +++ b/kernel/locking/lockdep_internals.h @@ -138,6 +138,7 @@ extern unsigned long nr_lock_classes; extern unsigned long nr_zapped_classes; extern unsigned long nr_zapped_lock_chains; extern unsigned long nr_list_entries; +extern unsigned long nr_dynamic_keys; long lockdep_next_lockchain(long i); unsigned long lock_chain_count(void); extern unsigned long nr_stack_trace_entries; diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c index 6db0f43fc4df..b52c07c4707c 100644 --- a/kernel/locking/lockdep_proc.c +++ b/kernel/locking/lockdep_proc.c @@ -286,6 +286,8 @@ static int lockdep_stats_show(struct seq_file *m, void *v) #endif seq_printf(m, " lock-classes: %11lu [max: %lu]\n", nr_lock_classes, MAX_LOCKDEP_KEYS); + seq_printf(m, " dynamic-keys: %11lu\n", + nr_dynamic_keys); seq_printf(m, " direct dependencies: %11lu [max: %lu]\n", nr_list_entries, MAX_LOCKDEP_ENTRIES); seq_printf(m, " indirect dependencies: %11lu\n", -- 2.39.5 (Apple Git-154)