From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) (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 25447290D86 for ; Tue, 6 May 2025 04:20:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746505260; cv=none; b=fJEl8uxiTV2wTxPN983YbE4bycjDLz0J5PlR6Tc1LX7+GW6hKqC//GwBXYxYhfqvTgSFbL6BKJbxiDm5uz+ZGtm4lIOdOzUVwJLZji/wEikjkDS/ojea54LjOHNMq9G2uSkAJbjSrsgh4+uvEfROu7/h3abMjBA3BLjwg4ONnmY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746505260; c=relaxed/simple; bh=OjFV6Qsb59I3KbtspfCnavQfUzQh5zYuzRLDx6Z+jRs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OBxX1MGRFrbpNHKrKxbpPm8YdMUFWJJr1gskm5afUCdA0CvLKFaSKCOYxm5zOy6hT/4LzRxkbE7j74qFKjmPUrbC4Gn6E93q7zkP9nPt2BlPYfUlMUgYv3UKIYQuWPu7dp2g/3KKBfKt9IAj1PcGiykIHftSmJwNFiYbq3Ihnpw= 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=ZYPd40qu; arc=none smtp.client-ip=209.85.222.170 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="ZYPd40qu" Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-7cadd46eb07so341375385a.3 for ; Mon, 05 May 2025 21:20:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746505258; x=1747110058; 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=68A1DvCKfbj5qGdcrZsmfpxCEw5jDiTy2OdnPzX3KpQ=; b=ZYPd40quQxW/MKn4use79snosGgFIurFCUFFB8AcEwdcdyn+FwsJbk39aAOhaKJwCb BJYzbvtog5qUgcCQnhCFb6HQ3pvS6k0a0Y5rh/c+TNrENcKujSKUctO5MFR+RTnEeOK2 Dvc4UgR08XwerKcyPKB9d9HUgj9+8+S3V+vmkDObkMQ7+KuGLTYi/4AStXFpZMXrsfTM J0+ft1U3BiFlVregHNvJtkAUkbtJFx5bZAKn/LfFaE0N5azgHxI9dLyw0GsMH2CQ7s7h I1KFFc750I5fpqWhMxvhLGCJ0ubvWuga4d2BGkZUx8XDnqxTJEYlojrkDQtARfbhGQHR c7SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746505258; x=1747110058; 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=68A1DvCKfbj5qGdcrZsmfpxCEw5jDiTy2OdnPzX3KpQ=; b=H9CPcpAdIAZ/2y4UbcfHD/ucrGjYwgakmZYjkIShPrzscneWTURtiuQjwnfwhojbfX 7w3MlySYDFe8wzXBjuGpTrZLPOW1qcoh9wmykdUE/99OBk+w2LkL8/A2Y0e94I176fxH k3OqlXwUvnOfqmRQVmn7fa3gJVZUpnbjlNUl33aDrz1zYzTDypWqlC7raYj4Zh8RhGms oAR2L2dtVWBygozMTmJWFr40UldiR4+3u8YiSIcTYhaKVwvtOjtMkjAS1zOyFwAZt6BY Bt5kklcENBBLF0wzSEoGn1pxVwpzeW87zX1+n/fLkkFJpqhS1RxYSpddWeqTbEhS/fem /h6Q== X-Forwarded-Encrypted: i=1; AJvYcCUPGSX4xswHuxq9NrZzs73Vx2fN5U9gyrF3bIctDf5A6sycSnKBKEit0K34877XQ7bs0dno@lists.linux.dev X-Gm-Message-State: AOJu0Yw7DU5YobC3DUHIop4b/D9c+OSBWpWqd8yLGJ51OO5rXqyIdWOa al3STQGV2XIcpiLuE/+HMZbpGrzdbdEey63duv5izgEheJlkpyCp X-Gm-Gg: ASbGncsUQBe+jcd3ZyPbXUEXVJBPZIHiULZP6Lgyw0LbxX5JePvcQIUwYNm/angwU4V Yq/LC8fZhhjLxBeWoi+p7jVsw+q3WcuGpg1RPWUV4tVnzNGSP+zIkYUIpMxbMDs5CAFtMv4bzr9 QFlHdosv25X71TaHc5VWInMG0bERMY+CaxwNvVzn4XRdS77TVq7DaNvR70WsLTvY+2qOWEZKifS 93NMKH5G+BSzTlBgpDxWeKJgbYKB6aTgMrED89l8CrEWVMSzNVAVxWospxaNW+x/x+nFNzxLzKU MAEtXeTP+HKyZDmmgXKbY69Bu1UC4By0zITxv5OcZPasC0cGq9XHiyPWh2+erUnQJ576Z1Y7ZSu 7uAl3KvQF4ggaeeIwHeydfnvyFQKOaGU= X-Google-Smtp-Source: AGHT+IEZcY+uh9qsx9zwF/xV8hNs4hK/n9u73F/y243wNP/KJiyZnv89z4caFf0yK2KpPF7yv+rKJw== X-Received: by 2002:a05:620a:4726:b0:7c9:5ec2:a82c with SMTP id af79cd13be357-7cad5ba3f6cmr2449586385a.53.1746505257872; Mon, 05 May 2025 21:20:57 -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 af79cd13be357-7cad2441633sm655256585a.107.2025.05.05.21.20.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 21:20:57 -0700 (PDT) Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfauth.phl.internal (Postfix) with ESMTP id 053211200068; Tue, 6 May 2025 00:20:57 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Tue, 06 May 2025 00:20:57 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeeftddtucetufdoteggodetrf 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:56 -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 2/3] locking/lockdep: Prevent abuse of lockdep subclass Date: Mon, 5 May 2025 21:20:48 -0700 Message-Id: <20250506042049.50060-3-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 To catch the code trying to use a subclass value >= MAX_LOCKDEP_SUBCLASSES (8), add a DEBUG_LOCKS_WARN_ON() statement to notify the users that such a large value is not allowed. [boqun: Reword the commit log with a more objective tone] Signed-off-by: Waiman Long Signed-off-by: Boqun Feng Link: https://lore.kernel.org/r/20250409143751.2010391-1-longman@redhat.com --- kernel/locking/lockdep.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index ff2ce90a87bc..58883c8375d1 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -5101,6 +5101,9 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass, lockevent_inc(lockdep_nocheck); } + if (DEBUG_LOCKS_WARN_ON(subclass >= MAX_LOCKDEP_SUBCLASSES)) + return 0; + if (subclass < NR_LOCKDEP_CACHING_CLASSES) class = lock->class_cache[subclass]; /* -- 2.39.5 (Apple Git-154)