From nobody Mon Oct 6 20:59:27 2025 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (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 AE17E26E143; Wed, 16 Jul 2025 14:48:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677311; cv=none; b=PR2EcoQQfnu2aos7k4NnpT35dirWxE4bHTBfDVUFAY8bWpNzzbFV/y5Z1DtC7FdyXYRp5M5lJWDuNVyZEM5iElaVQmdYFn2QWWimfxv/I2hLbr2PS+5zG/iltIkd4JalR5yR1oYDnFxmRQKSMurmzMEgevD+K+99Y8RW0mNGOf0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677311; c=relaxed/simple; bh=j4qjjacieeCW6I50WKuo/X4UFoA5tzd+ofZHrwlbbcI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=JKsjiMKHwvi5B7U4e+p+vEHVUbWM8u7bbO3wkvu+VSABXGxxpX0z5QaWfjd11waadr9oUD68seS719kLECuB7/qE5MddXMELWwLrmOvGG2r7GKwcrdI/oFv72fFBNJJapMTonwszESSq17ZyABYOJiBAVxb811oDS4knSL898o8= 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=ZZ7WByEr; arc=none smtp.client-ip=209.85.222.171 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="ZZ7WByEr" Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-7e3142e58cfso213768985a.0; Wed, 16 Jul 2025 07:48:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752677309; x=1753282109; darn=vger.kernel.org; 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=TBAttnVo2ur1a3bZID5ohjlkHeRyrtxoDHRT6itoh6E=; b=ZZ7WByErK5KvGP5CF5GObHxZNuyrQZDtjz2qDk4KUte0EFLtgUkuNV9jPS9UPRa3GN 7drM9icVX0ztNK2p3qvHO8Wi2GXsnNTidC7Oed1cS49f0Tu8RK81ip70A7323Pu86ncD CcrvlFl6abGktoeGdpBFa5aYvV7Nfa0CHy+UJ4jqT+86e0zmJ7OHDMyzne6BcENnexEE 6oWBqndbM2wTqZfQkEJ5mC9KSPyt1rV8zBEGZTVzrppbBFguv1UgzxJXLT6IrNlilyij e3Wbb3yV1JLvNavkAQ+DcoYxEbUtaxD26YcCMGWKXH/fY1nOCYqXHhTEB83AQ+kt14A8 QQgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752677309; x=1753282109; 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=TBAttnVo2ur1a3bZID5ohjlkHeRyrtxoDHRT6itoh6E=; b=bn+krsckXGNk6U6mNJpnlJ+/lurElOkrwcwyRWrwBExDwKumyMvaPIdIBhTnYWNM8I Wrxguoknjh2BeC2fBoAGXIBsOtN36SeRNhKO1sHnL/R65uBhhNTUXWc4jAQJmtQDBbrE piVc9LifJHB7AcFIydDT4qEn4EZWYpkULyL33fJIQQfUpodiRi3hVgcwfVfPEkOxhClh yDix0Y+2/V3zCn8ReqgW2Ndz0xa6U6z1tICbMZOu+k4uA32E1Non1+A8AuK3phlXje92 9r5sriuJ10a0iYUT2R3ssti2OMhGZU2MYmUHemKL+nwjurysWOJOaIJS2/zr7kcK6AV0 H9QQ== X-Forwarded-Encrypted: i=1; AJvYcCX08K4aE7CWFlh9+b9PL1CAgDXk5KlPfRyHAm5Ri3vQnVB7G3HEie1wPiLziwnsOMyBRhMvu71nqQcF86lm4uM=@vger.kernel.org, AJvYcCXbpAbOGXyss1uAQevW2SEQXsA/ve+kzZ56/cFnvcqS0fWvwJeXFre+wB+NYGFSe/jlpeipIXtaP1l2I6A=@vger.kernel.org X-Gm-Message-State: AOJu0Yw528t4ndXQrHze/OBal9sD6p33VHiYxxg0RhT3iThjF02ES7EV zCM8+Ulb2cvIj4LFiOHRFQmdJicM6C0Cdq7YJBxd/6QGcT2z4PIq9qyU X-Gm-Gg: ASbGnctMHxNcAqjQjYVbRWWYc3x/40ft6m4moT5kchuLkEzoH8xG5SOH0/kcRdnnIwn +GlwMu4XifFskNLRdm13mqCeElGSZQI20yHQhjXeVES8BPl1F515UV1ao2UFo26Mex/G5JtYaG/ jMNhrNej4NGmuDUyzzfz/YsCtV6GzG9LtUh6ezX4Fj/VrL1LDAgzY5o/KrQ2WSnKj5y2BdwJVKb Ot3bv1HLjb5zPxMZBbEz6lyPxMU/qIvBzdWkc2VDivekR9V5DzGEPUgQC2y1maPFzJw09+sw7mf fLj6aZDQU291VWzuJiwLxtcRENQSWzXIw3n8Fr7gApp3OfUpbA2xyZpslcS6NxpL+RwPrZdb3eh mzjVIMasfKB2ujZTyNxq0cF/Lh2S4eW/UfA/iVpfqjU/PLIVrbknbuvyPT53WYvys7S+LKXoO/Z /8GG24f8iFmU5m X-Google-Smtp-Source: AGHT+IGJQyKLHVOSzZuFpqpbCe1JnPnRq5yPKi4SVU/U1a06lvigrCLfhNoQpjDdTGQb3FPDQlfxnw== X-Received: by 2002:a05:620a:40d2:b0:7e1:3ef4:8f3f with SMTP id af79cd13be357-7e34356d80cmr466220485a.13.1752677308414; Wed, 16 Jul 2025 07:48:28 -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-7dcdc0f8689sm760783385a.43.2025.07.16.07.48.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 07:48:28 -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 A0B04F40069; Wed, 16 Jul 2025 10:48:27 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Wed, 16 Jul 2025 10:48:27 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdehjeelkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepuehoqhhunhcu hfgvnhhguceosghoqhhunhdrfhgvnhhgsehgmhgrihhlrdgtohhmqeenucggtffrrghtth gvrhhnpeegffejudegueejjeeivdeuteejvdduvdduvdefledugeejhfelieduhffggffg ffenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepsghoqhhunhdomhgvshhmthhprghuthhhphgv rhhsohhnrghlihhthidqieelvdeghedtieegqddujeejkeehheehvddqsghoqhhunhdrfh gvnhhgpeepghhmrghilhdrtghomhesfhhigihmvgdrnhgrmhgvpdhnsggprhgtphhtthho pedufedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepmhhinhhgoheskhgvrhhnvg hlrdhorhhgpdhrtghpthhtohepphgvthgvrhiisehinhhfrhgruggvrggurdhorhhgpdhr tghpthhtohepfihilhhlsehkvghrnhgvlhdrohhrghdprhgtphhtthhopehlohhnghhmrg hnsehrvgguhhgrthdrtghomhdprhgtphhtthhopehojhgvuggrsehkvghrnhgvlhdrohhr ghdprhgtphhtthhopegrlhhitggvrhihhhhlsehgohhoghhlvgdrtghomhdprhgtphhtth hopehlihhnuhigqdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphht thhopehruhhsthdqfhhorhdqlhhinhhugiesvhhgvghrrdhkvghrnhgvlhdrohhrghdprh gtphhtthhopehlvghithgrohesuggvsghirghnrdhorhhg X-ME-Proxy: Feedback-ID: iad51458e:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 16 Jul 2025 10:48:27 -0400 (EDT) From: Boqun Feng To: Ingo Molnar , Peter Zijlstra Cc: "Will Deacon" , "Waiman Long" , Miguel Ojeda , Alice Ryhl , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Breno Leitao , "Paul E. McKenney" , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Mark Brown , Boqun Feng Subject: [PATCH 1/9] spi: spi-nxp-fspi: Check return value of devm_mutex_init() Date: Wed, 16 Jul 2025 07:48:10 -0700 Message-Id: <20250716144818.47650-2-boqun.feng@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250716144818.47650-1-boqun.feng@gmail.com> References: <20250716144818.47650-1-boqun.feng@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Thomas Wei=C3=9Fschuh devm_mutex_init() can fail. With CONFIG_DEBUG_MUTEXES=3Dy the mutex will be marked as unusable and trigger errors on usage. Add the missed check. Fixes: 48900813abd2 ("spi: spi-nxp-fspi: remove the goto in probe") Signed-off-by: Thomas Wei=C3=9Fschuh Reviewed-by: Mark Brown Signed-off-by: Boqun Feng Link: https://lore.kernel.org/r/20250617-must_check-devm_mutex_init-v7-1-d9= e449f4d224@weissschuh.net --- drivers/spi/spi-nxp-fspi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c index e63c77e41823..f3d576505413 100644 --- a/drivers/spi/spi-nxp-fspi.c +++ b/drivers/spi/spi-nxp-fspi.c @@ -1273,7 +1273,9 @@ static int nxp_fspi_probe(struct platform_device *pde= v) if (ret) return dev_err_probe(dev, ret, "Failed to request irq\n"); =20 - devm_mutex_init(dev, &f->lock); + ret =3D devm_mutex_init(dev, &f->lock); + if (ret) + return dev_err_probe(dev, ret, "Failed to initialize lock\n"); =20 ctlr->bus_num =3D -1; ctlr->num_chipselect =3D NXP_FSPI_MAX_CHIPSELECT; --=20 2.39.5 (Apple Git-154) From nobody Mon Oct 6 20:59:27 2025 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (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 B917C2F237B; Wed, 16 Jul 2025 14:48:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677314; cv=none; b=VTDtJIqneAgIhTGlXOqsCCt2KHxAhBpx8w+XwHn0a9EwUdmhMqAY0NvdmsnwcLrxqMkNJf/2W4s7gKQqcLYQ2TZBCkX978SqVoO6mOM1iX9QTuLR6n3pfQgx/Zrrl5Tge2zXGlyXYYlZkYKtsoSmZk2TLv7JYs/WvdnnNiSdUQc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677314; c=relaxed/simple; bh=BCcCRBqqAGtRsiNyKrCYuOoOMpnZPWRJIhvbklexh+s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=vEp86IMPMC10VM4IPhZ6Kh9eePUgCKIzWmjICHBImyKRH2YwYe80vo7Z5m/+SjLkS3OYAKIzRW6+H0oLiYdyI75a68K1d96lh79I8nMdK6+DwBe1UHjZpkzCdLUtTl5TPDrutkQUJdNVcB00V/KlIgDFB3VlT8F+NNVgepkV6pM= 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=ihhWaeoV; arc=none smtp.client-ip=209.85.222.180 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="ihhWaeoV" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-7e2c920058fso106281885a.0; Wed, 16 Jul 2025 07:48:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752677311; x=1753282111; darn=vger.kernel.org; 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=yqn7zR6ezyFbi7KLXJvKlC3aTK2K6+zAz9R7hgTDM3w=; b=ihhWaeoVm2vAPYvVkQcspQ6oh0bIdl6dnp/vkhfi+1jxGk6/t3KTZbRSOdna5fygO3 Rzl6A8eYIdeI9o75j/EZomTsweQ0AG8YGcI8eDM1fN3S4qcYeqQ4qZfi56T1RLujFsEk EsStZVFzf6xN9o9C4gW6kVxgvWSTOviLtzzsKJtG0bIZoDs/gFzTgKFE0JK0CXhulnos UJ9tPz6REGrwGJhRujbbJTX7d11Yub666X1V0Iim6G0cddoYTPJG+sOjCaSkbE3NQpAB kJT8LI8L17dCGv+kaf/57ZI2W/usLVWuYB5fQ1zgunxsxL0SAYzetog8Mvs8qAPu9pCJ RU6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752677311; x=1753282111; 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=yqn7zR6ezyFbi7KLXJvKlC3aTK2K6+zAz9R7hgTDM3w=; b=VE9KBuERbdiLg3HTwlpNP8jDzkdXSebf7vna+G7mKyncx/YykumIXx5vr3zJHW3PIv /lx9eEMMFeMZxND41UJ+A13FQMPGkP5J9Sh47YWNmvEdBKlu2YoPMn9JGlQ04R1oFfCQ 7e+0wojM/YsVbaSdweJcUHorJNgDl7gECJ/v1EcELu0LF9SsyLbwxZwU3ap+xRggDuip GWER9jMDx60Mq/PyKvaCO2oq7wxhmDOOl3d+BmFoS8FjBb8bvSP2mg/Yo70n6mJGAlGt gYq61ujkwRy5TLSzLLKSAKzGQ10fkiVbD9NLvnQGzrWVflnpzppVQ0Ufu93+edzEQwc2 SGOA== X-Forwarded-Encrypted: i=1; AJvYcCU7GMtnkNCx8p09P5l6EA3NjBZoJQA7DGRhmfN1B6kKLBIjdiQ0Wfte9OtmxfsU5s7ZUW2kQVjyOYkRtHM=@vger.kernel.org, AJvYcCVkgKrSqd3difZVv+6qe+xCp9RSlv6p8p1XZ6n7i8aFYxLo4BaKfxkSgAO08Mg3vSD4o0P9ogYZfXrVNGyEGmo=@vger.kernel.org X-Gm-Message-State: AOJu0YzFxH8CN1lRN75DrAxfOevyVUBL2Jo5FXEgFr4vEXFAH8E/aE/6 9NmE47eb6PaZORnfXx06SNklSWmI4oj/vy64Q80KJvlHHn6RGk7J3IXd X-Gm-Gg: ASbGncvm227Q3+DpTOxHSY8AslASYkAi0cVRVj2zWL41R1gE3hDPWiCJIIBe1T3XqoW S7rI/KjFW/5dGoW867D0jIbD1RPkpGmpR/x7/qAWuakgLPGVaf2+GBhF81Rv6KLd4DtX9xQWwRS /oBku0JKNbmigu8WM+HWAdyQ0Z+NiDye9M6PN5gUsZSla+ITia1CxGGRx72GEAFDeek17CN3n1R pWjOIwh/lMpRq+otBIkC+wr/R4aaH+Gn4242b1GQ0h5O2bIcbUL2hFLfxwkPgpXpW5B+vYg9oqR eLSCbDq1nXP1UQczFy6YJA/RsI4vImfDMzNq+hcK1Gw2+4OBiERc90BIPx+Vsqlg7Pz/C4I+fZF 15NLH+rP1yMXH4pwZ9QsWcoAMVMc+0N31DKHdrbyZAZegeqS2oH1vufZR45E3FxhghhuHRwJX5q 6Z2BrKLze4dLZD X-Google-Smtp-Source: AGHT+IFx68WAoZvTOVQcwBxkgEo+JP2sqdDTjNAFbzGDuX1SiMFFAwlgGdNH8yE31YtfYsqGI6zFhg== X-Received: by 2002:a05:620a:4e9a:b0:7d3:a4fa:ee06 with SMTP id af79cd13be357-7e337b853a9mr928321785a.29.1752677311175; Wed, 16 Jul 2025 07:48:31 -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-7dcdece0f6asm760137985a.104.2025.07.16.07.48.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 07:48:30 -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 31812F40068; Wed, 16 Jul 2025 10:48:30 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Wed, 16 Jul 2025 10:48:30 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdehjeelkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepuehoqhhunhcu hfgvnhhguceosghoqhhunhdrfhgvnhhgsehgmhgrihhlrdgtohhmqeenucggtffrrghtth gvrhhnpeegffejudegueejjeeivdeuteejvdduvdduvdefledugeejhfelieduhffggffg ffenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecuvehluhhsthgvrhfuihiivgepud enucfrrghrrghmpehmrghilhhfrhhomhepsghoqhhunhdomhgvshhmthhprghuthhhphgv rhhsohhnrghlihhthidqieelvdeghedtieegqddujeejkeehheehvddqsghoqhhunhdrfh gvnhhgpeepghhmrghilhdrtghomhesfhhigihmvgdrnhgrmhgvpdhnsggprhgtphhtthho pedugedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepmhhinhhgoheskhgvrhhnvg hlrdhorhhgpdhrtghpthhtohepphgvthgvrhiisehinhhfrhgruggvrggurdhorhhgpdhr tghpthhtohepfihilhhlsehkvghrnhgvlhdrohhrghdprhgtphhtthhopehlohhnghhmrg hnsehrvgguhhgrthdrtghomhdprhgtphhtthhopehojhgvuggrsehkvghrnhgvlhdrohhr ghdprhgtphhtthhopegrlhhitggvrhihhhhlsehgohhoghhlvgdrtghomhdprhgtphhtth hopehlihhnuhigqdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphht thhopehruhhsthdqfhhorhdqlhhinhhugiesvhhgvghrrdhkvghrnhgvlhdrohhrghdprh gtphhtthhopehlvghithgrohesuggvsghirghnrdhorhhg X-ME-Proxy: Feedback-ID: iad51458e:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 16 Jul 2025 10:48:28 -0400 (EDT) From: Boqun Feng To: Ingo Molnar , Peter Zijlstra Cc: "Will Deacon" , "Waiman Long" , Miguel Ojeda , Alice Ryhl , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Breno Leitao , "Paul E. McKenney" , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Andrew Davis , Lee Jones , Boqun Feng Subject: [PATCH 2/9] leds: lp8860: Check return value of devm_mutex_init() Date: Wed, 16 Jul 2025 07:48:11 -0700 Message-Id: <20250716144818.47650-3-boqun.feng@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250716144818.47650-1-boqun.feng@gmail.com> References: <20250716144818.47650-1-boqun.feng@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Thomas Wei=C3=9Fschuh devm_mutex_init() can fail. With CONFIG_DEBUG_MUTEXES=3Dy the mutex will be marked as unusable and trigger errors on usage. Add the missed check. Fixes: 87a59548af95 ("leds: lp8860: Use new mutex guards to cleanup functio= n exits") Signed-off-by: Thomas Wei=C3=9Fschuh Acked-by: Andrew Davis Acked-by: Lee Jones Signed-off-by: Boqun Feng Link: https://lore.kernel.org/r/20250617-must_check-devm_mutex_init-v7-2-d9= e449f4d224@weissschuh.net --- drivers/leds/leds-lp8860.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/leds/leds-lp8860.c b/drivers/leds/leds-lp8860.c index 52b97c9f2a03..0962c00c215a 100644 --- a/drivers/leds/leds-lp8860.c +++ b/drivers/leds/leds-lp8860.c @@ -307,7 +307,9 @@ static int lp8860_probe(struct i2c_client *client) led->client =3D client; led->led_dev.brightness_set_blocking =3D lp8860_brightness_set; =20 - devm_mutex_init(&client->dev, &led->lock); + ret =3D devm_mutex_init(&client->dev, &led->lock); + if (ret) + return dev_err_probe(&client->dev, ret, "Failed to initialize lock\n"); =20 led->regmap =3D devm_regmap_init_i2c(client, &lp8860_regmap_config); if (IS_ERR(led->regmap)) { --=20 2.39.5 (Apple Git-154) From nobody Mon Oct 6 20:59:27 2025 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (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 4B9F72F49F9; Wed, 16 Jul 2025 14:48:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677316; cv=none; b=eHlOsB1nKw8aI8R1+hxi6pfVdX1MG4+qt+BqUVnf/lRKyoVvVRnrwEteY3PeMcpKrsSjMPItKE/HydffDRIf1r+DY5Svxy0Z+r6A9iH3nT4Zc+xabM5j9jvTE1CN+AuDHD3dH3A1a7sIuRN6nQ4ohAnclbNu0TdodYUlmUet9tU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677316; c=relaxed/simple; bh=c93WGgKYxxfp29gg7nVWXDMCrBR0xTxkMXa0yPKlAWs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=OdgYAhdYj/kji7j5/iqtrrC/hR3RY3yXpjdAzEHGc1+GR8jXS3rPseYpQq12JC3IirRxfJ+TCMD+b8Nbgxv6q/OSc/WbJjU9RLfZdPyz2P9R3V/zOt6f1eyMpVbmUqJ9QQDFfzKj3YGD137QY01metBnB6DO5AY3HcEXmrF+6Pk= 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=V5PJ1oiH; arc=none smtp.client-ip=209.85.222.169 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="V5PJ1oiH" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-7e182e4171bso411978885a.3; Wed, 16 Jul 2025 07:48:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752677314; x=1753282114; darn=vger.kernel.org; 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=jBuMiP9J3S+amcQToXLO1ox+SOurYbRlNCMZZESBjh4=; b=V5PJ1oiHX8aeUW/q28JNJFVTj5VHAXkM6w7/a++B4BCxUkwjQsLlmxx7mBvj6LPGPB YDwFB0GM4lB5VnbRFAuRMEHA86dMrMBNic6YXgGx7TBObhsAGr4eGVGPVSUL4OEboMky 0ASE2mZRuqQ7rFEYgeBFaP43cs0yp8qMwpcTZ1pYmvpAy5BjAnaEzb+rx6HRRYauAQ+6 SVILojjJr6WME7iLt/NUhkkD+p6fMJh+yKgrn1IbyvEgC+wtwt+xn3EFcBF6k2lMfirJ UfFRir8xLZWLBXrq3tgVlYuuQJ6oLjoQEsB0bmTB9pnoWWruKdx0FIuLD+/8DVy0gX1W 9MVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752677314; x=1753282114; 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=jBuMiP9J3S+amcQToXLO1ox+SOurYbRlNCMZZESBjh4=; b=L0UGqWtEPvCuOElyecd/gp2b5LRlq6QEDiJGne0OCDxXDJ/Z0cA74Wsea1EeT2YqGF 1v5y2OgxRek/8G1fPqKqcqYcaqNwkq/pGccpXelGXEJxY/VM7VbvHCNGVQEDjTEzI4RV VHVwile5gtEfdz1a2zwyfoGmeVGR7GYZV8Laa6P5FWwRiJ5K7Zxak1pf70UP88GlKuGC pCPbpJROt1OzUsKqV+mQVXBMjGNBEVZfmc+MJIgWVISzgcOntTM0Hhs/cO1dgVEDLGOI GIur3+E6N0efJXHppFiJjKswpv202h5leLE4THpBQZzOuk48bul0/Ff2HTvlyMYHT99m cpow== X-Forwarded-Encrypted: i=1; AJvYcCW7MW8X2Wv+F6ODlhFGa4aaJ8w2IrGVtigX5oQfaGCXU3EmcJKwDatbANhaS6NagnLlnr3rKngIHDzLnfSm+Fs=@vger.kernel.org, AJvYcCWnVQ2vgfbdlZd39OrKg6lG1/9aY/pZLegdxwzT9nBuzIcpBprVgRMWqoRfOqt/wOpn7XysjjfzMY2zKl4=@vger.kernel.org X-Gm-Message-State: AOJu0YwM+s69TriVaHb5fQtyaeFoRMI+n4ktg2rlZyaj4R0+op+p2LHg 7fzOi0Ng/2L+f5juEVpydIE9V7/EK/iNuKqIVGF8nr/UoJ9XK8wbit3f X-Gm-Gg: ASbGncvLDvZPL6w6vBZLWw8Lzv19ZLklVam+7YINNulr0kP2jM5ZlPVaOZsJhyadAPM iPmBuw9O8qe4hg0R0elfcvve5oAMsCKwWg4+caTfA3GKiaBDc+zMlXFFo9L+S5ONfw2+J1LuxFB EnEAyYh5FW8R58JN6byWMxBJ4Jja40Ye6MSESF7Qxsr2sYH+PnL/ZcJTMZ1ENYdsZvSCb5H891E lYZzRSq2NO1DxVzKuzxmqO3rwwcS/ILVm2DMkq7vJR94aGT17Pc+aVUHJpfTKqmz2eSHNXkWBKo OAyJ3JjC/Y6tGmNtfn8o9AGP8W0C+NSuzEh00rCTIKnnzi4hfv2NR3v/4l+BdOZhC9w8FOi2biY AweNDtOLTkR5a+cl2HgCelkbi1sd5SwrYbRI8mEjdaFc666s96eabtv4asveaaNZWVSXAN0DoQU Jm0SrJan689atoh6rTfQhP1W0= X-Google-Smtp-Source: AGHT+IEen7sPVbHbDqBtNGbQuhJK4XW27jvvypw9rDsAuEfM7VbAAdq+pEloPKU7fDtN8JUoXwY6gQ== X-Received: by 2002:a05:620a:468e:b0:7e3:3065:a6b9 with SMTP id af79cd13be357-7e3433486d1mr433575985a.7.1752677314073; Wed, 16 Jul 2025 07:48:34 -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-7e337c96341sm238036085a.5.2025.07.16.07.48.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 07:48:33 -0700 (PDT) Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfauth.phl.internal (Postfix) with ESMTP id 3096AF40068; Wed, 16 Jul 2025 10:48:33 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-09.internal (MEProxy); Wed, 16 Jul 2025 10:48:33 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdehjeellecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepuehoqhhunhcu hfgvnhhguceosghoqhhunhdrfhgvnhhgsehgmhgrihhlrdgtohhmqeenucggtffrrghtth gvrhhnpeegffejudegueejjeeivdeuteejvdduvdduvdefledugeejhfelieduhffggffg ffenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepsghoqhhunhdomhgvshhmthhprghuthhhphgv rhhsohhnrghlihhthidqieelvdeghedtieegqddujeejkeehheehvddqsghoqhhunhdrfh gvnhhgpeepghhmrghilhdrtghomhesfhhigihmvgdrnhgrmhgvpdhnsggprhgtphhtthho pedugedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepmhhinhhgoheskhgvrhhnvg hlrdhorhhgpdhrtghpthhtohepphgvthgvrhiisehinhhfrhgruggvrggurdhorhhgpdhr tghpthhtohepfihilhhlsehkvghrnhgvlhdrohhrghdprhgtphhtthhopehlohhnghhmrg hnsehrvgguhhgrthdrtghomhdprhgtphhtthhopehojhgvuggrsehkvghrnhgvlhdrohhr ghdprhgtphhtthhopegrlhhitggvrhihhhhlsehgohhoghhlvgdrtghomhdprhgtphhtth hopehlihhnuhigqdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphht thhopehruhhsthdqfhhorhdqlhhinhhugiesvhhgvghrrdhkvghrnhgvlhdrohhrghdprh gtphhtthhopehlvghithgrohesuggvsghirghnrdhorhhg X-ME-Proxy: Feedback-ID: iad51458e:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 16 Jul 2025 10:48:31 -0400 (EDT) From: Boqun Feng To: Ingo Molnar , Peter Zijlstra Cc: "Will Deacon" , "Waiman Long" , Miguel Ojeda , Alice Ryhl , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Breno Leitao , "Paul E. McKenney" , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Andy Shevchenko , Bartosz Golaszewski , Boqun Feng Subject: [PATCH 3/9] locking/mutex: Mark devm_mutex_init() as __must_check Date: Wed, 16 Jul 2025 07:48:12 -0700 Message-Id: <20250716144818.47650-4-boqun.feng@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250716144818.47650-1-boqun.feng@gmail.com> References: <20250716144818.47650-1-boqun.feng@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Thomas Wei=C3=9Fschuh devm_mutex_init() can fail. With CONFIG_DEBUG_MUTEXES=3Dy the mutex will be marked as unusable and trigger errors on usage. Enforce all callers check the return value through the compiler. As devm_mutex_init() itself is a macro, it can not be annotated directly. Annotate __devm_mutex_init() instead. Unfortunately __must_check/warn_unused_result don't propagate through statement expression. So move the statement expression into the argument list of the call to __devm_mutex_init() through a helper macro. Suggested-by: Peter Zijlstra Signed-off-by: Thomas Wei=C3=9Fschuh Reviewed-by: Andy Shevchenko Reviewed-by: Bartosz Golaszewski Signed-off-by: Boqun Feng Link: https://lore.kernel.org/r/20250617-must_check-devm_mutex_init-v7-3-d9= e449f4d224@weissschuh.net --- include/linux/mutex.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/linux/mutex.h b/include/linux/mutex.h index a039fa8c1780..00afd341d293 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -126,11 +126,11 @@ do { \ =20 #ifdef CONFIG_DEBUG_MUTEXES =20 -int __devm_mutex_init(struct device *dev, struct mutex *lock); +int __must_check __devm_mutex_init(struct device *dev, struct mutex *lock); =20 #else =20 -static inline int __devm_mutex_init(struct device *dev, struct mutex *lock) +static inline int __must_check __devm_mutex_init(struct device *dev, struc= t mutex *lock) { /* * When CONFIG_DEBUG_MUTEXES is off mutex_destroy() is just a nop so @@ -141,14 +141,17 @@ static inline int __devm_mutex_init(struct device *de= v, struct mutex *lock) =20 #endif =20 -#define devm_mutex_init(dev, mutex) \ +#define __mutex_init_ret(mutex) \ ({ \ typeof(mutex) mutex_ =3D (mutex); \ \ mutex_init(mutex_); \ - __devm_mutex_init(dev, mutex_); \ + mutex_; \ }) =20 +#define devm_mutex_init(dev, mutex) \ + __devm_mutex_init(dev, __mutex_init_ret(mutex)) + /* * See kernel/locking/mutex.c for detailed documentation of these APIs. * Also see Documentation/locking/mutex-design.rst. --=20 2.39.5 (Apple Git-154) From nobody Mon Oct 6 20:59:27 2025 Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (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 157912F50B9; Wed, 16 Jul 2025 14:48:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677319; cv=none; b=QXgS3Xyd5+iVqXwFc+IPP4NS84cbzf+TM0KaoLxk4Yt+5hgYusTO6ofE9C8wh0WU+9NJ2CIZFWBW/7sRF/ryzQjDOkIs7C1yJOFMl2FeqD07bjTN+yoF5jh90lb5I0aMJ9zBoqYcFU/FRPhMwcdTq6CV0Wwc8hr8YOmCnSE/t9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677319; c=relaxed/simple; bh=pxyK4IpdvEaEPjWoT9x1mfZguglA3t2FbpKgw8SoBMs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WFvAWDyyLJ5okgqxW/Bx1qExy68ZtuUYInHIeufRRoaWlVAlTAE6iKVyNPGz3wn5c3xBJ+IZ2X1OJQPYxqMDZVGteNzgZZW99+wmCJB4tNBMyyKIwWSXUrXI107vEyoKv+OI5u+9Z8iYN9pU8Qd/V0WAoSa8at1JVNmY/61xdHw= 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=BZBhBEoX; arc=none smtp.client-ip=209.85.160.169 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="BZBhBEoX" Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-4a9bff7fc6dso9251571cf.1; Wed, 16 Jul 2025 07:48:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752677317; x=1753282117; darn=vger.kernel.org; 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=EWuK6FBVFxtsuJtQ1WZQ4cQFsX6B+KpTxg+/m9X09UM=; b=BZBhBEoXMkSRbQVx9wrqHusQje5GpWKfES1pYj6cFniP6PNAgqYsUA/3hwqKU4tfUJ pCafLDVGJrKubWpLzk7+BrBCtKSzNy9xaxXcT0EIK0+f//BIXponDHL0udWwz2X8L98O g+NTRhbT/WGnYSnCg5OrlcheVqqm0EcxLHBc9lpIzQEnzbJ0hETxggdhsNNGypaRmIla XEugeI90v8PJX6YCewKO0mCHwHBblsYvsi2YdcuMjkQQUa0+cu0c1+Dlmb7oVVDRKxRz Kagc3ghDlc0Px8SJqNCujVqyLH0Y9Mjvnb6KtRkOpT4JRdhqKoU8H7eK89fmlEXJZlf/ HF2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752677317; x=1753282117; 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=EWuK6FBVFxtsuJtQ1WZQ4cQFsX6B+KpTxg+/m9X09UM=; b=tqwdWLps0sD4FoLXNgqEqBxOG9aXBXJmuMMb3Tc/zEGChtNDwM9wM/+U2UXP4SZuTQ LvEP9WGIwZdrumnoULosGPiVR1BjAh6ba9LwLgNhFeTH/HvUX5Pi3YujBFWf0WqDYnhu ulDaw0JSJtMMHj9s4usdWhirlMAg5OgO/peBhhleWy1GQEoFRwG4bP+3bYOyDkxGp1Zg Yq0KpLsQCX2JvLp4ml1gaLHagsBtFFk0Q8KKBhKe78XxuIgkb3UCn90vTETxsYV/QBxq Mlf5g1uO5o5xqsYYVAS2bRtu+Q80/3WDYPaKaR23KvF4Hqr6bDw6oAww8Zmn4h6OSStd jbzA== X-Forwarded-Encrypted: i=1; AJvYcCV2C8xNlPn+jJoYbHHXb2UmSBXbT1EGF96bCpg2+xOPQj3dqNxPh/tGrTy2DYejpHXKvfZqbziEXNzCVRQ=@vger.kernel.org, AJvYcCWjrCSlsz0czboaAbRUkuGvTST1eIb29I7gywiRsh0U9F4CJKA6Ona162IdGo9UIYmmPm6S+8JqVuqpk2nlr9c=@vger.kernel.org X-Gm-Message-State: AOJu0Yza+etJpmkS73n87Yjm/1zSD7cvnnPtJv5nz4kh/G5oscaB1A/s eGJiglhYskOkuJhhGCmb5kWUOP8Yl9UiRJXjSMKQBJK1O7H02beu94V5 X-Gm-Gg: ASbGncsPy6hh1FfpvrtTcUTlB54QU+j4mlqcW/XdeHn4tyixdzTHs9gZIgqHclzkgLv +W4NxCvJoIpPL/l8K3nIyKinXo9wJskJGESColj4y+c6+aQC085nvaE+YqhQ6zozjbmBS1147/O r0e4h9FXBoKlpGR/6ff2yED0cR3Ns9zutkoLawzeIP93K8NGm67uA+2mc7Yfaxx/v5zolKXgey0 adghJICJNGL98s5VGtStkAU2M9zpgStoPkeYfeR7RTnocnRL9eWpzKPD6vOFChBRrp+/q3MUd2t 8YLzNItqxCELTmVRqH6d4jpUk0b2d6YKsGD/+Fli8M52X7GzK/WDIQSbm8+cIOK4JWGOYEqjstL X+DJJzTFH6EJidlwlafhrZjyb1Otfu8ynALDvwx1YUwr4HGEd29YHjV4JsuE+Eulmc7f73nfmYU PI0pJ3ZmFUPXqDAVhK0lVrlAA= X-Google-Smtp-Source: AGHT+IEGElqA+vZ903nEvCUg2SlvUTiLvXQ59tX8l7tJ7HhfxJMyUuFXWKpgRdMMDvOukqTU7aB5Lw== X-Received: by 2002:ac8:6f0b:0:b0:4ab:63b8:3320 with SMTP id d75a77b69052e-4ab7f9d73bdmr111166751cf.23.1752677316720; Wed, 16 Jul 2025 07:48:36 -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 d75a77b69052e-4ab75211016sm28194701cf.45.2025.07.16.07.48.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 07:48:36 -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 08898F40068; Wed, 16 Jul 2025 10:48:36 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Wed, 16 Jul 2025 10:48:36 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdehjeelkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeeuohhquhhnucfh vghnghcuoegsohhquhhnrdhfvghnghesghhmrghilhdrtghomheqnecuggftrfgrthhtvg hrnhepkeetteejgeduieekudejfedvvddtiefgieffffeljeefieehiefffedvfeffgfet necuffhomhgrihhnpehgihhthhhusgdrtghomhdpkhgvrhhnvghlrdhorhhgnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepsghoqhhunhdomhgv shhmthhprghuthhhphgvrhhsohhnrghlihhthidqieelvdeghedtieegqddujeejkeehhe ehvddqsghoqhhunhdrfhgvnhhgpeepghhmrghilhdrtghomhesfhhigihmvgdrnhgrmhgv pdhnsggprhgtphhtthhopeduvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepmh hinhhgoheskhgvrhhnvghlrdhorhhgpdhrtghpthhtohepphgvthgvrhiisehinhhfrhgr uggvrggurdhorhhgpdhrtghpthhtohepfihilhhlsehkvghrnhgvlhdrohhrghdprhgtph htthhopehlohhnghhmrghnsehrvgguhhgrthdrtghomhdprhgtphhtthhopehojhgvuggr sehkvghrnhgvlhdrohhrghdprhgtphhtthhopegrlhhitggvrhihhhhlsehgohhoghhlvg drtghomhdprhgtphhtthhopehlihhnuhigqdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgv lhdrohhrghdprhgtphhtthhopehruhhsthdqfhhorhdqlhhinhhugiesvhhgvghrrdhkvg hrnhgvlhdrohhrghdprhgtphhtthhopehlvghithgrohesuggvsghirghnrdhorhhg X-ME-Proxy: Feedback-ID: iad51458e:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 16 Jul 2025 10:48:34 -0400 (EDT) From: Boqun Feng To: Ingo Molnar , Peter Zijlstra Cc: "Will Deacon" , "Waiman Long" , Miguel Ojeda , Alice Ryhl , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Breno Leitao , "Paul E. McKenney" , Jason Devers , Boqun Feng Subject: [PATCH 4/9] rust: sync: Add #[must_use] to Lock::try_lock() Date: Wed, 16 Jul 2025 07:48:13 -0700 Message-Id: <20250716144818.47650-5-boqun.feng@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250716144818.47650-1-boqun.feng@gmail.com> References: <20250716144818.47650-1-boqun.feng@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jason Devers The `Lock::try_lock()` function returns an `Option>`, but it currently does not issue a warning if the return value is unused. To avoid potential bugs, the `#[must_use]` annotation is added to ensure proper usage. Note that `T` is `#[must_use]` but `Option` is not. For more context, see: https://github.com/rust-lang/rust/issues/71368. Suggested-by: Alice Ryhl Link: https://github.com/Rust-for-Linux/linux/issues/1133 Signed-off-by: Jason Devers Reviewed-by: Alice Ryhl Signed-off-by: Boqun Feng Link: https://lore.kernel.org/r/20241212154753.139563-1-dev.json2@gmail.com --- rust/kernel/sync/lock.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rust/kernel/sync/lock.rs b/rust/kernel/sync/lock.rs index e82fa5be289c..27202beef90c 100644 --- a/rust/kernel/sync/lock.rs +++ b/rust/kernel/sync/lock.rs @@ -175,6 +175,8 @@ pub fn lock(&self) -> Guard<'_, T, B> { /// Tries to acquire the lock. /// /// Returns a guard that can be used to access the data protected by t= he lock if successful. + // `Option` is not `#[must_use]` even if `T` is, thus the attribute= is needed here. + #[must_use =3D "if unused, the lock will be immediately unlocked"] pub fn try_lock(&self) -> Option> { // SAFETY: The constructor of the type calls `init`, so the existe= nce of the object proves // that `init` was called. --=20 2.39.5 (Apple Git-154) From nobody Mon Oct 6 20:59:27 2025 Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) (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 039A52F5337; Wed, 16 Jul 2025 14:48:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677323; cv=none; b=tjpvHUiwCMJ8F/K7eYrK+KCtl6Jr20YnqzrWX4kDrjd/vQQ4aIn5Zsiio56P7lIgw0xSJVBIyWq9cDmcbDhPMKsXLW/NC9D+HGgeczmUDiwjqyKaqYBgM56J33qwZ/sWa+GtcL5U8qKi6XHPjYRW+Uje64PUyS83kxNjUBMl/ag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677323; c=relaxed/simple; bh=qi+QVChNF8r4ZRImMMEYigXjb6VC+AHzdyzKRRP1h7w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tbXDRdQaEPA7U5ifRLmwryjtUmAtwFGj5COLG/F/sNAMMoxIYkgs/aMf1F+jAp+dec8v8Nzw2TujWV5GFGqtvg/Gh7HtGWI0H1Vb/X18rnudWBUHqa+359kCSKQhvghpJvNPxFZwGLgs7mJJo2m1c52nEUzRGvhylBYjebpKlIc= 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=iT3Lq+bW; arc=none smtp.client-ip=209.85.219.49 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="iT3Lq+bW" Received: by mail-qv1-f49.google.com with SMTP id 6a1803df08f44-700fee04941so83746d6.1; Wed, 16 Jul 2025 07:48:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752677320; x=1753282120; darn=vger.kernel.org; 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=2jJtlf9oYQnJT+FKbRuWUa6nbrsl5qwGbSwAIcd7eA8=; b=iT3Lq+bWnya/xQujgx7YsuQsOAE/31Q2vHHDdLmOMtJoKK3cZQDYq4mWovCOOyi0c3 5MLSz5tJjgbK3EiDkr3tp8H5RpJKH7rL47p+WujO/IuEWVNAi/th0YH5VeCuEUHZoJi1 9xVLW5PHL+2pck5XndLfbOuFs4yfi5fYArymTNwQXRVjlyYRM283eVbLEflrmlXn9fON XD0SEfvgU/y9bDUn9V07RJOEkxrK4yPAayyadlqSWS4dnCRH1IAo8CWxn7Jd3moH74fH OfjBPBKIB8RrprcR/jp1Znh0HUThqJRq8MvwGDo5h4bWS5FfxNGCfCtg9/r40BhY6Ik2 RPeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752677320; x=1753282120; 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=2jJtlf9oYQnJT+FKbRuWUa6nbrsl5qwGbSwAIcd7eA8=; b=wbYcdltwQsPQY9MVaZkkZVCAkyDZdSIVMYuXEFJHkoQhr1eEpOicHKQsvMC2wFBTHM nZaJAeNHd+AyLMRjgQuF2I/XNY0frxeoVBAYkYJxQqi7mfLGub5Zv9UdPSMN5tj+xYIC /B2Ei1K3ltMZY0Vb9jcBRdmnuCIYL7mRNJ14PGnkAaeIpiAuYj4tODzSXsV1B+nZvPUG f9H1Q135uD8q2pI3IgLN0jZpjiBrEvgPk6LEQ1z9iXcu4T0dbWUxFwY6Ez4+v7Lyvj/T QiqQlT8a/4e10fyQa6pFn+mly+kzBL0j8BJoNgkSIPPF9B0YR2zZLQWMulBD+wJWOFYR dlfw== X-Forwarded-Encrypted: i=1; AJvYcCUaRH8ud8nGdrlxvzXvRxca92TMzqj0+ZaA0LVY1UTlknV0anAZ7fymPjD+XTZ+7nwHAUvUuJ2bYJWCIIAiHh0=@vger.kernel.org, AJvYcCVzcgflL9XcJ35m9Ozl9Hy2jZXrQPf0XdWdzuZb1CRd84CSpd16vS1e4w3r/ke4/0EoK+djt4s6A7qkYzo=@vger.kernel.org X-Gm-Message-State: AOJu0YxbRM39jh4cEOaHQ3wnUPqhxYgvFoytzvP1xUC2MMPntS0IgmpL riGmHquxhysn4KAExnXTHYVAS+c3eZqQt9aL2dmano4lgY6eC+cNN4ID X-Gm-Gg: ASbGncuVkzmdCa+bx9KkLrj61PzSAfIe4m/A+W0Z0YgfsOqy0a7Bz5HMjWtIYamqIKl UMFV306cStj0Zo0sXUGs0TYEFglY4IbYaafOiQw9yk97fAhYC79QbjxVngeTm6fu6pK48oYokER MiIdupNJ+1Rbq8LHlYUYVnHvRyvSFC2nyEEevn8XSiULtHHMrcbnDAorqNn+QFTyebxrA0A9FXf Dudmr/fslU54fjE80R4AcAaRCB3/aXVZS8w4M2VJlNUkoRfXdJpFEvwexsiF2I+3h16goZfB0wG PGeo6OZH8xR4W9Cc85Wsy92JjLW5nBzxox2MaekSn3kH6qBSph0vhiReeLPNK1TlMxnWQhOKb6X dGXr62SBkhUovUp0sVaLD7QGZQ4HLnZgd7lGBlgHCsL8j6hnZHCYzrVp5GJfTzz6CCq+zHWs2Yy 1GNgSxyzbsWx64 X-Google-Smtp-Source: AGHT+IGjHp1Ke1LEs2zbb4+T5KyROgCWMtI+o6wcUP7tagagMNPKp5SmYUeYbfbyVctwuicdjiFBoQ== X-Received: by 2002:ad4:5c6c:0:b0:704:7fe1:b26a with SMTP id 6a1803df08f44-704f480b480mr56588116d6.16.1752677319397; Wed, 16 Jul 2025 07:48:39 -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-704979e459csm71272446d6.49.2025.07.16.07.48.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 07:48:39 -0700 (PDT) Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfauth.phl.internal (Postfix) with ESMTP id 9C955F40068; Wed, 16 Jul 2025 10:48:38 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-10.internal (MEProxy); Wed, 16 Jul 2025 10:48:38 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdehjeellecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeeuohhquhhnucfh vghnghcuoegsohhquhhnrdhfvghnghesghhmrghilhdrtghomheqnecuggftrfgrthhtvg hrnhepgffhffevhffhvdfgjefgkedvlefgkeegveeuheelhfeivdegffejgfetuefgheei necuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpegsohhquhhnodhmvghsmhhtphgruhhthhhpvghr shhonhgrlhhithihqdeiledvgeehtdeigedqudejjeekheehhedvqdgsohhquhhnrdhfvg hngheppehgmhgrihhlrdgtohhmsehfihigmhgvrdhnrghmvgdpnhgspghrtghpthhtohep uddvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehmihhnghhosehkvghrnhgvlh drohhrghdprhgtphhtthhopehpvghtvghriiesihhnfhhrrgguvggrugdrohhrghdprhgt phhtthhopeifihhllheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoheplhhonhhgmhgrnh esrhgvughhrghtrdgtohhmpdhrtghpthhtohepohhjvggurgeskhgvrhhnvghlrdhorhhg pdhrtghpthhtoheprghlihgtvghrhihhlhesghhoohhglhgvrdgtohhmpdhrtghpthhtoh eplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthht oheprhhushhtqdhfohhrqdhlihhnuhigsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtg hpthhtoheplhgvihhtrghoseguvggsihgrnhdrohhrgh X-ME-Proxy: Feedback-ID: iad51458e:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 16 Jul 2025 10:48:36 -0400 (EDT) From: Boqun Feng To: Ingo Molnar , Peter Zijlstra Cc: "Will Deacon" , "Waiman Long" , Miguel Ojeda , Alice Ryhl , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Breno Leitao , "Paul E. McKenney" , Jinliang Zheng , Boqun Feng Subject: [PATCH 5/9] locking/rwsem: Use OWNER_NONSPINNABLE directly instead of OWNER_SPINNABLE Date: Wed, 16 Jul 2025 07:48:14 -0700 Message-Id: <20250716144818.47650-6-boqun.feng@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250716144818.47650-1-boqun.feng@gmail.com> References: <20250716144818.47650-1-boqun.feng@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jinliang Zheng After commit 7d43f1ce9dd0 ("locking/rwsem: Enable time-based spinning on reader-owned rwsem"), OWNER_SPINNABLE contains all possible values except OWNER_NONSPINNABLE, namely OWNER_NULL | OWNER_WRITER | OWNER_READER. Therefore, it is better to use OWNER_NONSPINNABLE directly to determine whether to exit optimistic spin. And, remove useless OWNER_SPINNABLE to simplify the code. Signed-off-by: Jinliang Zheng Acked-by: Waiman Long Signed-off-by: Boqun Feng Link: https://lore.kernel.org/r/20250610130158.4876-1-alexjlzheng@tencent.c= om --- kernel/locking/rwsem.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c index 2ddb827e3bea..8572dba95af4 100644 --- a/kernel/locking/rwsem.c +++ b/kernel/locking/rwsem.c @@ -727,8 +727,6 @@ static inline bool rwsem_can_spin_on_owner(struct rw_se= maphore *sem) return ret; } =20 -#define OWNER_SPINNABLE (OWNER_NULL | OWNER_WRITER | OWNER_READER) - static inline enum owner_state rwsem_owner_state(struct task_struct *owner, unsigned long flags) { @@ -835,7 +833,7 @@ static bool rwsem_optimistic_spin(struct rw_semaphore *= sem) enum owner_state owner_state; =20 owner_state =3D rwsem_spin_on_owner(sem); - if (!(owner_state & OWNER_SPINNABLE)) + if (owner_state =3D=3D OWNER_NONSPINNABLE) break; =20 /* --=20 2.39.5 (Apple Git-154) From nobody Mon Oct 6 20:59:27 2025 Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (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 4ABB22F5332; Wed, 16 Jul 2025 14:48:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677325; cv=none; b=AGh3ZLFhzJxhZxpz8fJE2f/ndTtJcSFWaUHqa1tH8uHDESVo5Ann1I0ChWWWGkpCdQhjfLxbScdrBrjCMR0NsoK9gmKV9QXsLop0gG8age4xwS0s9ZGzzhSYdhJb1FBVnndimEgANNuGSmDa4ROXEeDeXquU83SNftkK6RfgB+s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677325; c=relaxed/simple; bh=BFaee+PMTlX5hdKVFHcg5Yrv+GniSx9t8vdFXR90kUs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eaT5PPitAd8WUegQR4ZxQF7asQvnFneVCYMNUcZAf/f5x898OVs8k+8Fl91cQ3Q0dQxKO7PuVvPI5ShCTSFVRlGvgNuyOmRiiUI3xXa0eNIRDy80S59LLs/phxvQ+M0Gq1TAyyZ0/qW5r8RUziGvqZmIWXo8HvJCTwhDyfy251M= 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=epxZYKNd; arc=none smtp.client-ip=209.85.219.54 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="epxZYKNd" Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-6fd0a3cd326so66466d6.1; Wed, 16 Jul 2025 07:48:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752677322; x=1753282122; darn=vger.kernel.org; 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=ddinZAnEwYMRMDRQ6y+KZDh22DDG22BXx2nEWjhYOm4=; b=epxZYKNd2UnvR9nsqhUIyAErwmuoghVPgPDvwTWh18YeWqgvrUsKoydz3LxxBr+FfT wyQSyozeCvnKYKu9S9e+sg+GNf6A3Z8d1z9cm6SeCmb0AVg1juZwjI0L/jibmolbnRld tsO+HUO5dfYzyl32j3OdVQY5KhrpRvFxD6D4nFev2CfWA2KGZ53keyrBw5UO/8OV2nnf KlQE0YWhNqJ2E0PKj7pzc2UJbguhAFMix3S9VMy8E3cTM3mz2cn3nOEy4vkN4CZwTMVt qxqdyWu2/jT4/iSOjLqrbJMvim7RVDPsZPt3+JDwSiCLRPhbvap4FWGAZiOTknxqBJZ6 Wgzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752677322; x=1753282122; 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=ddinZAnEwYMRMDRQ6y+KZDh22DDG22BXx2nEWjhYOm4=; b=JWLYBbWgIT9n54B8WsnUqCmiPStZtZW2dp9M5FP7D9w+wQCw9Mo8xKArzbAINDrUDi ua+XevLjy8xTmFtF3wJVA0nSHXZB3MoP1/NMqzxD7oqEGbHKOFy4OgdLyckrY7RnGT8H CG288un+gIYVQp8/XdehsdMwIaqmbCVeoMBvLFqHZljjUm1BRhzKC/1b3QtO/QDR1lql GkSHwrsF5HMoX4zJ6bzf6EBkoXntSVfAvGpzbwnE2DjqliUNRxqpqAZSIS9aXorvZr/u TD+CoK3pKxklFzrNnefP70QMWo3cMawGy1Rv2CAEAaCdlVH6NnM8ZhzIxi4HLrJSIRKJ Ya+Q== X-Forwarded-Encrypted: i=1; AJvYcCVBBaJfBB9ptpxVHWTPl8mYIYYFj3EJS61bjKpGC7d+eIY1LQMzs4Cs5X71G5XkUbQhJIG8rvMd/HjvYfk=@vger.kernel.org, AJvYcCWq0f6QVffnfAwUsAqpXYqYbjA3g/mTQtAWDkqAwUzzZdX0zrsfLovRPYouxUoEu/VDOX0DFeWiUOhjVxEGPQo=@vger.kernel.org X-Gm-Message-State: AOJu0YwwV+IfTXQT4nHvN76Ih0WhCQWQ96dgQggNTuViB5G5SJtziAMi z1LTYTlR4P09fAzqAmLJazvTRXTdp4eljma6kUkPxJ7TeAaRl7KfvRqu X-Gm-Gg: ASbGncs6cvBOuQKgYVz/gmpcDfMEV996xrUJDBVu0tPq0xZd2gIStNICrNx45e2ccRE ehFjihUH8ZoojXLF7Zr+cl+NoCH0s87k43yO+Es97BLrloGHHhlDKVEjvhdMCv0RKjSWn6P57Ta wV7NOeN79/PrcKaMnt+jHYStOTV8FPHQZ4Nicam+JSHZ/l4S9hK8sWooQSKzi0HnRvb0ehjQfZN lGfCyaxNNQRzeEL9CQvpu4l+eJg8MWyoerp1Cjnw+Jy9hhzMTIJjZtwFc5/t2B9RK77DYGCnofC 0Ee4P6ABZAbKXsBSjgZSI9fTplwZgQ15ps0hylC/joIjxviLOtMJuzQKz/hHzrisCZaAOq8hNDw +sUIJBI6sfuixn5akH8v9/tSlPteLU702abeTV3vUzjZFvSDmLG7UZ7whQ9JewawfPmrN2erlOb Jmy4BONXriXonk X-Google-Smtp-Source: AGHT+IHEAs/dk2LzTmTPg4aUMbCu/Ymg9bI7m/olOGbK5WgQLk446WxRuWFiIMR97mla7YTsGjuVQA== X-Received: by 2002:a05:6214:4a83:b0:704:85bd:d239 with SMTP id 6a1803df08f44-704f6afbca4mr49374686d6.16.1752677321966; Wed, 16 Jul 2025 07:48:41 -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-70497d71b51sm71360686d6.89.2025.07.16.07.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 07:48:41 -0700 (PDT) Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfauth.phl.internal (Postfix) with ESMTP id 49A0DF40068; Wed, 16 Jul 2025 10:48:41 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-10.internal (MEProxy); Wed, 16 Jul 2025 10:48:41 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdehjeellecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeeuohhquhhnucfh vghnghcuoegsohhquhhnrdhfvghnghesghhmrghilhdrtghomheqnecuggftrfgrthhtvg hrnhepgffhffevhffhvdfgjefgkedvlefgkeegveeuheelhfeivdegffejgfetuefgheei necuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlhhushhtvghrufhiiigvpedune curfgrrhgrmhepmhgrihhlfhhrohhmpegsohhquhhnodhmvghsmhhtphgruhhthhhpvghr shhonhgrlhhithihqdeiledvgeehtdeigedqudejjeekheehhedvqdgsohhquhhnrdhfvg hngheppehgmhgrihhlrdgtohhmsehfihigmhgvrdhnrghmvgdpnhgspghrtghpthhtohep uddvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehmihhnghhosehkvghrnhgvlh drohhrghdprhgtphhtthhopehpvghtvghriiesihhnfhhrrgguvggrugdrohhrghdprhgt phhtthhopeifihhllheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoheplhhonhhgmhgrnh esrhgvughhrghtrdgtohhmpdhrtghpthhtohepohhjvggurgeskhgvrhhnvghlrdhorhhg pdhrtghpthhtoheprghlihgtvghrhihhlhesghhoohhglhgvrdgtohhmpdhrtghpthhtoh eplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthht oheprhhushhtqdhfohhrqdhlihhnuhigsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtg hpthhtoheplhgvihhtrghoseguvggsihgrnhdrohhrgh X-ME-Proxy: Feedback-ID: iad51458e:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 16 Jul 2025 10:48:39 -0400 (EDT) From: Boqun Feng To: Ingo Molnar , Peter Zijlstra Cc: "Will Deacon" , "Waiman Long" , Miguel Ojeda , Alice Ryhl , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Breno Leitao , "Paul E. McKenney" , Arnd Bergmann , Boqun Feng Subject: [PATCH 6/9] locking/lockdep: Avoid struct return in lock_stats() Date: Wed, 16 Jul 2025 07:48:15 -0700 Message-Id: <20250716144818.47650-7-boqun.feng@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250716144818.47650-1-boqun.feng@gmail.com> References: <20250716144818.47650-1-boqun.feng@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnd Bergmann Returning a large structure from the lock_stats() function causes clang to have multiple copies of it on the stack and copy between them, which can end up exceeding the frame size warning limit: kernel/locking/lockdep.c:300:25: error: stack frame size (1464) exceeds lim= it (1280) in 'lock_stats' [-Werror,-Wframe-larger-than] 300 | struct lock_class_stats lock_stats(struct lock_class *class) Change the calling conventions to directly operate on the caller's copy, which apparently is what gcc does already. Signed-off-by: Arnd Bergmann Signed-off-by: Boqun Feng Link: https://lore.kernel.org/r/20250610092941.2642847-1-arnd@kernel.org --- include/linux/lockdep_types.h | 2 +- kernel/locking/lockdep.c | 27 ++++++++++++--------------- kernel/locking/lockdep_proc.c | 2 +- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/include/linux/lockdep_types.h b/include/linux/lockdep_types.h index 9f361d3ab9d9..eae115a26488 100644 --- a/include/linux/lockdep_types.h +++ b/include/linux/lockdep_types.h @@ -175,7 +175,7 @@ struct lock_class_stats { unsigned long bounces[nr_bounce_types]; }; =20 -struct lock_class_stats lock_stats(struct lock_class *class); +void lock_stats(struct lock_class *class, struct lock_class_stats *stats); void clear_lock_stats(struct lock_class *class); #endif =20 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index dd2bbf73718b..0c941418a215 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -297,33 +297,30 @@ static inline void lock_time_add(struct lock_time *sr= c, struct lock_time *dst) dst->nr +=3D src->nr; } =20 -struct lock_class_stats lock_stats(struct lock_class *class) +void lock_stats(struct lock_class *class, struct lock_class_stats *stats) { - struct lock_class_stats stats; int cpu, i; =20 - memset(&stats, 0, sizeof(struct lock_class_stats)); + memset(stats, 0, sizeof(struct lock_class_stats)); for_each_possible_cpu(cpu) { struct lock_class_stats *pcs =3D &per_cpu(cpu_lock_stats, cpu)[class - lock_classes]; =20 - for (i =3D 0; i < ARRAY_SIZE(stats.contention_point); i++) - stats.contention_point[i] +=3D pcs->contention_point[i]; + for (i =3D 0; i < ARRAY_SIZE(stats->contention_point); i++) + stats->contention_point[i] +=3D pcs->contention_point[i]; =20 - for (i =3D 0; i < ARRAY_SIZE(stats.contending_point); i++) - stats.contending_point[i] +=3D pcs->contending_point[i]; + for (i =3D 0; i < ARRAY_SIZE(stats->contending_point); i++) + stats->contending_point[i] +=3D pcs->contending_point[i]; =20 - lock_time_add(&pcs->read_waittime, &stats.read_waittime); - lock_time_add(&pcs->write_waittime, &stats.write_waittime); + lock_time_add(&pcs->read_waittime, &stats->read_waittime); + lock_time_add(&pcs->write_waittime, &stats->write_waittime); =20 - lock_time_add(&pcs->read_holdtime, &stats.read_holdtime); - lock_time_add(&pcs->write_holdtime, &stats.write_holdtime); + lock_time_add(&pcs->read_holdtime, &stats->read_holdtime); + lock_time_add(&pcs->write_holdtime, &stats->write_holdtime); =20 - for (i =3D 0; i < ARRAY_SIZE(stats.bounces); i++) - stats.bounces[i] +=3D pcs->bounces[i]; + for (i =3D 0; i < ARRAY_SIZE(stats->bounces); i++) + stats->bounces[i] +=3D pcs->bounces[i]; } - - return stats; } =20 void clear_lock_stats(struct lock_class *class) diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c index b52c07c4707c..1916db9aa46b 100644 --- a/kernel/locking/lockdep_proc.c +++ b/kernel/locking/lockdep_proc.c @@ -657,7 +657,7 @@ static int lock_stat_open(struct inode *inode, struct f= ile *file) if (!test_bit(idx, lock_classes_in_use)) continue; iter->class =3D class; - iter->stats =3D lock_stats(class); + lock_stats(class, &iter->stats); iter++; } =20 --=20 2.39.5 (Apple Git-154) From nobody Mon Oct 6 20:59:27 2025 Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (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 1ED0E2F5C3C; Wed, 16 Jul 2025 14:48:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677327; cv=none; b=cewxpDmOXtns/xR31tMjnecn9kmpX2cubdr5wLhKWg5ebMB+4IVXO3kNPcbpfjMocBYz/iI8JDmJndlzyx6ZcxXSDex6vtpr2qIsk/exbAVdDyj7+Np33ZDXT6q2F0sHL4s8Ofk3W/AIRuI1i4dhG/L4SPLo+vN/9StS24MLRo0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677327; c=relaxed/simple; bh=7wFuk//I4jCqJCb57E0XDPyIYe9lxjI7SqzxAVdKpH4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Y/HaeerVohElbubc3dFpieiYolylOopLYs8bFT2mLuadlevkeNSCkXX0rnpQ5mwdy7dWyrNTcOLrA0TPX+S8q4lmU/UXGYwUUrx9RtALM5sOVPyTXxWaAIS3+Bg43s4CPCLbFVQb68EjNL1wzsya/d8ywxvZ7kAb4FSOAqan/V4= 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=Pj7XYEdL; arc=none smtp.client-ip=209.85.160.169 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="Pj7XYEdL" Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-4ab5e2ae630so43050831cf.3; Wed, 16 Jul 2025 07:48:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752677325; x=1753282125; darn=vger.kernel.org; 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=bXPVr/G9SRnd6R3I/P1k9JsMvcyWlWkDxRUnOYYx1cM=; b=Pj7XYEdL/rJVqi+pY0BVifPFcDRCJ+5nndZgMiJiAwLy4QmIsurLO36bXLKg9J9M0+ YuSXirpPSQcd0g2kMy8Bm1j1vKGDAaQtDM+o1NypbCyvZadFC/PSSX4/f66PgZKtfT20 S/bxadOHgdD6kAckSEZqeokoiSECdoaGknwjfhC2nQqbjyUANrhJwFcPYjkUnk4f/r7r 7utP4IIaK4oMrKZpGHm7T6aX8LeTCK5IHBCKsfh4WGZiGkFShJgwU2RDG+FDea/xRuPh YVUoBPtLVsWO0t9EKx92jd78j7kIY9sL7XcEuAgp8PiFKYjJ2Bm0iAQvXJOA6y4bHZX+ 2M/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752677325; x=1753282125; 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=bXPVr/G9SRnd6R3I/P1k9JsMvcyWlWkDxRUnOYYx1cM=; b=bS/z0ddn+KY7ocWdvBVYcjAGmat/KA3N3MOniTA2ma1hwVstq7XwWEcsmDIhnkyuLS srczg5OpOyWQcDfWHny8ED+AY9zP3g4AN1ko+KyFpn5VubD+A6dYj9cyokmXMqGfn2Ii XHsBIWBnnZoKcbk3J57FeAW/XHiPPtp2xhCCPvKv/duCRe6d1lWohW0KifVzLF5PYtaf RjaIefj7UDNFMKQiji1c9E4eSAF2byf++ZOEIlDuWTKA0DJOFFgjkKhDdiGWIqnjkrIc ANrYSMh7zzXruenTwggO9R7vOT9c53UPyn96tJTnRcokoLdMKg5C7kHCB+IgKbKO7kB1 2Vpg== X-Forwarded-Encrypted: i=1; AJvYcCVS47y0udHcvJMa7MQQxpyZB6ozj2wCVWpLPjqcaXDNz3+xq68iXPBuUzR0QipS6+nNhmu0+jBfDOVeaf0=@vger.kernel.org, AJvYcCXQpUGnms3Iu/giXr3DCFHyBZpldnDX8Ro6OHVq7dKrxB2sR4PD5xCOvgo3GkhxZv2kb8TSImWew+TftE8T1h4=@vger.kernel.org X-Gm-Message-State: AOJu0YxUcmjqJb8mvc+NtBVlHr7CN9aXehCV2mmBQuYmlu0JqBsOW3Bp avcjLsNslp7N1C2SA7yXHaaXxMvHugR3OcsEim9MThB12WDS1Ye5EXAQ X-Gm-Gg: ASbGncsgz9Psxr0uSRzK2Mo7f8gjLHrzsG66pkBBeE7qy2ykIg5ZyhK7SAocsQEKfIr s2YVuOAz8tzgYfO3uN6YANLeIV3wJu4/RkUMyN0bgg1AQiL1U8dKngL7XVwF9cZtxW3Z9EiNNKp 5dSZqwb+JlXdfyw5cMFntRncICymONJrKpK5SqGo1XCsATmcR1rBjbK9hgIKDWySeC/utxJHG2u zllS2vInoYqtxVPtkhEYK6N+J+/KzMqY2eqIzRR5GjvaX1KTrz1PF0wfmrgWXXPMrn4mNIgd/n8 F7m/b4htGRwuMAH7jVqa4wpl08nl3oHrUQCTYs0FgcvT+UD9+009vDYikYjs33pIcfjJqhyiC+I mNq/2uvCXKprLBo/jYYz2oqHu/rqSh+xDhWwje/aAgl6VbcgyMFxK8sYi1yG1PKlPa/wGA45PFV cRX2+o+nwWhcmZHuDr5gQ2hP8= X-Google-Smtp-Source: AGHT+IF/dtXIRpCX2+QbvBlOKNCiVq/mN7KKeieR88SAXg8wV1F4ja7jwBHfC7ebwGqZjDwh0iCc/A== X-Received: by 2002:a05:622a:2509:b0:4a4:3449:2b82 with SMTP id d75a77b69052e-4ab93c9949emr53972251cf.13.1752677324869; Wed, 16 Jul 2025 07:48:44 -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-70497d393f9sm71216146d6.63.2025.07.16.07.48.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 07:48:44 -0700 (PDT) Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfauth.phl.internal (Postfix) with ESMTP id DD682F40068; Wed, 16 Jul 2025 10:48:43 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-10.internal (MEProxy); Wed, 16 Jul 2025 10:48:43 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdehjeellecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeeuohhquhhnucfh vghnghcuoegsohhquhhnrdhfvghnghesghhmrghilhdrtghomheqnecuggftrfgrthhtvg hrnhepgffhffevhffhvdfgjefgkedvlefgkeegveeuheelhfeivdegffejgfetuefgheei necuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlhhushhtvghrufhiiigvpedune curfgrrhgrmhepmhgrihhlfhhrohhmpegsohhquhhnodhmvghsmhhtphgruhhthhhpvghr shhonhgrlhhithihqdeiledvgeehtdeigedqudejjeekheehhedvqdgsohhquhhnrdhfvg hngheppehgmhgrihhlrdgtohhmsehfihigmhgvrdhnrghmvgdpnhgspghrtghpthhtohep udefpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehmihhnghhosehkvghrnhgvlh drohhrghdprhgtphhtthhopehpvghtvghriiesihhnfhhrrgguvggrugdrohhrghdprhgt phhtthhopeifihhllheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoheplhhonhhgmhgrnh esrhgvughhrghtrdgtohhmpdhrtghpthhtohepohhjvggurgeskhgvrhhnvghlrdhorhhg pdhrtghpthhtoheprghlihgtvghrhihhlhesghhoohhglhgvrdgtohhmpdhrtghpthhtoh eplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthht oheprhhushhtqdhfohhrqdhlihhnuhigsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtg hpthhtoheplhgvihhtrghoseguvggsihgrnhdrohhrgh X-ME-Proxy: Feedback-ID: iad51458e:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 16 Jul 2025 10:48:42 -0400 (EDT) From: Boqun Feng To: Ingo Molnar , Peter Zijlstra Cc: "Will Deacon" , "Waiman Long" , Miguel Ojeda , Alice Ryhl , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Breno Leitao , "Paul E. McKenney" , Arnd Bergmann , Andy Shevchenko , Boqun Feng Subject: [PATCH 7/9] locking/lockdep: Change 'static const' variables to enum values Date: Wed, 16 Jul 2025 07:48:16 -0700 Message-Id: <20250716144818.47650-8-boqun.feng@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250716144818.47650-1-boqun.feng@gmail.com> References: <20250716144818.47650-1-boqun.feng@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnd Bergmann gcc warns about 'static const' variables even in headers when building with -Wunused-const-variables enabled: In file included from kernel/locking/lockdep_proc.c:25: kernel/locking/lockdep_internals.h:69:28: error: 'LOCKF_USED_IN_IRQ_READ' d= efined but not used [-Werror=3Dunused-const-variable=3D] 69 | static const unsigned long LOCKF_USED_IN_IRQ_READ =3D | ^~~~~~~~~~~~~~~~~~~~~~ kernel/locking/lockdep_internals.h:63:28: error: 'LOCKF_ENABLED_IRQ_READ' d= efined but not used [-Werror=3Dunused-const-variable=3D] 63 | static const unsigned long LOCKF_ENABLED_IRQ_READ =3D | ^~~~~~~~~~~~~~~~~~~~~~ kernel/locking/lockdep_internals.h:57:28: error: 'LOCKF_USED_IN_IRQ' define= d but not used [-Werror=3Dunused-const-variable=3D] 57 | static const unsigned long LOCKF_USED_IN_IRQ =3D | ^~~~~~~~~~~~~~~~~ kernel/locking/lockdep_internals.h:51:28: error: 'LOCKF_ENABLED_IRQ' define= d but not used [-Werror=3Dunused-const-variable=3D] 51 | static const unsigned long LOCKF_ENABLED_IRQ =3D | ^~~~~~~~~~~~~~~~~ This one is easy to avoid by changing the generated constant definition into an equivalent enum. Tested-by: Andy Shevchenko Signed-off-by: Arnd Bergmann Signed-off-by: Boqun Feng Link: https://lore.kernel.org/r/20250409122314.2848028-6-arnd@kernel.org --- kernel/locking/lockdep_internals.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_in= ternals.h index 82156caf77d1..0e5e6ffe91a3 100644 --- a/kernel/locking/lockdep_internals.h +++ b/kernel/locking/lockdep_internals.h @@ -47,29 +47,31 @@ enum { __LOCKF(USED_READ) }; =20 +enum { #define LOCKDEP_STATE(__STATE) LOCKF_ENABLED_##__STATE | -static const unsigned long LOCKF_ENABLED_IRQ =3D + LOCKF_ENABLED_IRQ =3D #include "lockdep_states.h" - 0; + 0, #undef LOCKDEP_STATE =20 #define LOCKDEP_STATE(__STATE) LOCKF_USED_IN_##__STATE | -static const unsigned long LOCKF_USED_IN_IRQ =3D + LOCKF_USED_IN_IRQ =3D #include "lockdep_states.h" - 0; + 0, #undef LOCKDEP_STATE =20 #define LOCKDEP_STATE(__STATE) LOCKF_ENABLED_##__STATE##_READ | -static const unsigned long LOCKF_ENABLED_IRQ_READ =3D + LOCKF_ENABLED_IRQ_READ =3D #include "lockdep_states.h" - 0; + 0, #undef LOCKDEP_STATE =20 #define LOCKDEP_STATE(__STATE) LOCKF_USED_IN_##__STATE##_READ | -static const unsigned long LOCKF_USED_IN_IRQ_READ =3D + LOCKF_USED_IN_IRQ_READ =3D #include "lockdep_states.h" - 0; + 0, #undef LOCKDEP_STATE +}; =20 #define LOCKF_ENABLED_IRQ_ALL (LOCKF_ENABLED_IRQ | LOCKF_ENABLED_IRQ_READ) #define LOCKF_USED_IN_IRQ_ALL (LOCKF_USED_IN_IRQ | LOCKF_USED_IN_IRQ_READ) --=20 2.39.5 (Apple Git-154) From nobody Mon Oct 6 20:59:27 2025 Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (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 AB1292F6F80; Wed, 16 Jul 2025 14:48:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677330; cv=none; b=dflcNN0+ospZFPQbEw/fMTRenya2tnYO6VMn/fkrPf9S4Ev52UswNEjFAIwGuM48gQ3+sQr+ZuiQ6ipljJhIl1HkXTmobT3ycGGlzycTPvmUAHAOgr1aY+oteZMOIwPv/UMMJrZ/dxP6PBFb+bKz+0LxlNCHLYOFXF+AexghCRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677330; c=relaxed/simple; bh=8Tj+JHkTNEx+hl3qlKVGHGmM2l+ZAe08j4LiXZhrd0k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LpdMJeZ/4qsE5rbIcA8AnMo/88+mb+hDML+d6KIip2fVWYenc9rnb7brQfxNDWPzWIpk0Qpm+MboSBevJ2ERARL1fUugkTV5q/tI4nhIRMT9h4xMKISFlQL0dLapvct+Q1Td4neEQ7e/siUrj2gDm9dNmH0883bkiBFYrGW9BDM= 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=ha40lCp2; arc=none smtp.client-ip=209.85.160.180 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="ha40lCp2" Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-4ab58720d04so31654761cf.0; Wed, 16 Jul 2025 07:48:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752677327; x=1753282127; darn=vger.kernel.org; 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=NfhJQfY9tw2Iu7jEp+BpHBNpDnlJcB4F41a7W8IB/gw=; b=ha40lCp2awDr+dcTMT26nit5WR1+eeLbWlHB7xV+9/QA2K4zE5N5uyLNbbQu+i/l1s qC+o4n6dccBJcoNxtjOkJn0GyvRhpCqpFgwmdsH8u7vow8Lt+j2/a69+PyZcNvu0u7+q Zi8p2sZ0GPoPQJUCicAXmixP5MekylsPY20SxFCgrMFHNcKsWnTpPZSVVq/9OX9x3XDG i2q01XIyYvfK7lMijmu0CT2AI+CeIw2cGCjX8KyEsXKVusaIKx90UhcaYyGvKO1wDOH7 ZjPBeUcb3WVzx5SdWejBKhoo2Sg5Xt7GvF9+g0gdAXKLGvC4Wak5IklhpzPwxTkgqXoM K+kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752677327; x=1753282127; 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=NfhJQfY9tw2Iu7jEp+BpHBNpDnlJcB4F41a7W8IB/gw=; b=uOx0MEbTvwW0IKxyAzw5+mIUjfmAjLgtn4aWaPVG5SEb4XOXvs59zUhYk83V9l6gRo AkbBp/ZRB5jTcyT8oVpuafIXhiQ6mmbUcRRWcaCBkfj5Kyk8FKDHpe/ALVKPtHDwufw9 UdN+BjH8xtcgqqvaArUcMdQLy68mNoc+qWcmzjAMonutmWFeCe1fbD2l1mz/E7kmy722 oxGyRaNf6SR4kjwV1UF6LpG0FIS0fqK5UDavU1A2X6a9DXnvToES1jarlgrdlf3m4iNU QCmz/uVvK1mCUioyKBoSPt4X1xe+QO5Rmuh0Ra+7LjnMub0fzITYKarndizqAjbMoMiV Wqpw== X-Forwarded-Encrypted: i=1; AJvYcCV/Aaf8d5HcFR2iL7XoTom7kGGOihbis/OD204laUj7BQ61Z7IDVHhovTWUtzkPbqSmZPaOWntXXIInODM=@vger.kernel.org, AJvYcCXJy/eQpOa81D1g2SUsXHOg0tp4vVsv92aRvWGUne4tkcg6HYzwHYLNd0sZxRfUvOt5jVLM3i+Hpe3BtprUPo8=@vger.kernel.org X-Gm-Message-State: AOJu0YxXn2HrFY94+NrdA1sJDk/iwGzZCWCWqx2gnrIcXFL3wFqsm1sM kdE78KOW1WdklU6t016LQvJzWn4tKi6sQN54iC3cV4azqhbFt+OUPNuv X-Gm-Gg: ASbGncsWbLapZHbuIcSkC2MzJz2m+WQUntbjIqWWSyE5nz5wKNNGDrUWhf1f0B7lvCv pSZt7ZtUONpZnDA79u2FiwCe/L+hQzrjZIRlIcb5tzRB2wc2j1oBejUG/tjlg92F6le//wVHvo3 kHW2KstzZDJqDw3W61wxwSeX7UoNle66lE2tyveQn4JUtZyL2AxbY1eIKVPcKT1DgXCvPQDb+ap w9wQ08+qrbLHGku/e3upAY9JKuBzrvcafHtxSWstW5fU2FhHIBmS3FGx/1V57DPiw5xa48/5Xr5 P55gtAuLryj5j8eglMLq90MA3Soo048iK8ih9yO8hiKCcLIqwZn2vOm0CbbnXz00jr7INaadRZr gbTWbGCgaAWrp+gAQD2qWhHRHQl+WcVn7pHKs6Xt36VwmLPlGgobxl/q9es5NkheKInmyFz5pHr cj4+vh4wn4RZbB X-Google-Smtp-Source: AGHT+IGfkNiO+nudRtiBFeJqMkyuXBbTQ4zQecyTmX4HX7T86mgVvwL8zqM6boelNc2dviOijWaapw== X-Received: by 2002:ac8:5d16:0:b0:4a7:6586:8e4 with SMTP id d75a77b69052e-4ab93dbd972mr46510201cf.36.1752677327343; Wed, 16 Jul 2025 07:48:47 -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 d75a77b69052e-4ab602cd0c9sm40149921cf.65.2025.07.16.07.48.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 07:48:47 -0700 (PDT) Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfauth.phl.internal (Postfix) with ESMTP id 9002EF40068; Wed, 16 Jul 2025 10:48:46 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Wed, 16 Jul 2025 10:48:46 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdehjeellecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeeuohhquhhnucfh vghnghcuoegsohhquhhnrdhfvghnghesghhmrghilhdrtghomheqnecuggftrfgrthhtvg hrnhepgffhffevhffhvdfgjefgkedvlefgkeegveeuheelhfeivdegffejgfetuefgheei necuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpegsohhquhhnodhmvghsmhhtphgruhhthhhpvghr shhonhgrlhhithihqdeiledvgeehtdeigedqudejjeekheehhedvqdgsohhquhhnrdhfvg hngheppehgmhgrihhlrdgtohhmsehfihigmhgvrdhnrghmvgdpnhgspghrtghpthhtohep uddvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehmihhnghhosehkvghrnhgvlh drohhrghdprhgtphhtthhopehpvghtvghriiesihhnfhhrrgguvggrugdrohhrghdprhgt phhtthhopeifihhllheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoheplhhonhhgmhgrnh esrhgvughhrghtrdgtohhmpdhrtghpthhtohepohhjvggurgeskhgvrhhnvghlrdhorhhg pdhrtghpthhtoheprghlihgtvghrhihhlhesghhoohhglhgvrdgtohhmpdhrtghpthhtoh eplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthht oheprhhushhtqdhfohhrqdhlihhnuhigsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtg hpthhtoheplhgvihhtrghoseguvggsihgrnhdrohhrgh X-ME-Proxy: Feedback-ID: iad51458e:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 16 Jul 2025 10:48:44 -0400 (EDT) From: Boqun Feng To: Ingo Molnar , Peter Zijlstra Cc: "Will Deacon" , "Waiman Long" , Miguel Ojeda , Alice Ryhl , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Breno Leitao , "Paul E. McKenney" , Ran Xiaokai , Boqun Feng Subject: [PATCH 8/9] locking/mutex: Remove redundant #ifdefs Date: Wed, 16 Jul 2025 07:48:17 -0700 Message-Id: <20250716144818.47650-9-boqun.feng@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250716144818.47650-1-boqun.feng@gmail.com> References: <20250716144818.47650-1-boqun.feng@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ran Xiaokai hung_task_{set,clear}_blocker() is already guarded by CONFIG_DETECT_HUNG_TASK_BLOCKER in hung_task.h, So remove the redudant check of #ifdef. Signed-off-by: Ran Xiaokai Acked-by: Waiman Long Signed-off-by: Boqun Feng Link: https://lore.kernel.org/r/20250704015218.359754-1-ranxiaokai627@163.c= om --- kernel/locking/mutex.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index a39ecccbd106..d4210dc97b6a 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c @@ -191,9 +191,7 @@ static void __mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter, struct list_head *list) { -#ifdef CONFIG_DETECT_HUNG_TASK_BLOCKER hung_task_set_blocker(lock, BLOCKER_TYPE_MUTEX); -#endif debug_mutex_add_waiter(lock, waiter, current); =20 list_add_tail(&waiter->list, list); @@ -209,9 +207,7 @@ __mutex_remove_waiter(struct mutex *lock, struct mutex_= waiter *waiter) __mutex_clear_flag(lock, MUTEX_FLAGS); =20 debug_mutex_remove_waiter(lock, waiter, current); -#ifdef CONFIG_DETECT_HUNG_TASK_BLOCKER hung_task_clear_blocker(); -#endif } =20 /* --=20 2.39.5 (Apple Git-154) From nobody Mon Oct 6 20:59:27 2025 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (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 4EAE92F6F90; Wed, 16 Jul 2025 14:48:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677331; cv=none; b=AGECsfzCkEp6We4ZpD+eeVbY9ZtrRg2VlT/aEfJPEHC8/He4Immyq3bj3He4JTqPlNr3I6EVwBsxPgrbTb00Z8xoQhgfeCIB+/GauDFfct8QI9PGMHWU7jI5LzPAX1PvJXl15We72IyafeP8oFgbiDO9QTC3fwB/eZePEZIK6No= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752677331; c=relaxed/simple; bh=B/G/h3DzTZ5l3gzwjOz1Y2kYUBFTft8COk37YBqvG8s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QAFqld6NcyURXOYMEMPD8XqQ3Y8utyPbV46k+C9p0euAr+uErySKuCBtLqw1NvfKDXQuNLoEnz9vw6YaIn4g/LAYFr1U83MhsJ+khbJxWsFZzN2UNPgaOJLiNsrSzEMn1mQiOhzThQ3ImjjSnIczzNNJDs8yeoI5nDbKCWJdbdU= 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=bKHa4NUk; arc=none smtp.client-ip=209.85.219.44 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="bKHa4NUk" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-6fafb6899c2so223276d6.0; Wed, 16 Jul 2025 07:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752677329; x=1753282129; darn=vger.kernel.org; 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=fFUKul8TI0PZYiKj5Q3Utj0w+gDkfjmndLdV5N94D94=; b=bKHa4NUkwqQcKHmLxQc5fMzjzY+s7W6xO7Hgvf0vGTYmphWnmpwa/ZBAf9jS2OGJ/X NCmqt8QfF2TSHKyDWu/HHhT6UtP52ZAM8dEQqR7CSooeLj1IZSe8NIsBrmEH4vPxtVA1 lDFxcL0KFcXV+kqrly3iXf4/RDBVBogQErNaoTHwl83L9QBdCb0yAq2EVC/wuRUVFd5+ SlWVnxoHVkk3sGLGdFCWJc/I/z3hbY2S2QgAKKNXYSOfGaVsnWXA7/ALIORdMJ50iElt SqJ3ni3E3gftYKsCZPtMqVoF+I+xPCIlXhLSJyrFg/S1Y0iLIns/ZI/32dd7+IHxD5Fx ZKZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752677329; x=1753282129; 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=fFUKul8TI0PZYiKj5Q3Utj0w+gDkfjmndLdV5N94D94=; b=NfebBtfmLh8KvNpLKwtHw/3IooxWZ1ltTPlauW43eX1mM9fvqbWJ3zQrQDsQhZez0j 81D4w+qFK+90ayj0yS+oup6nACyoUgF/Gx7PNMFfIhMJw3xHUDWMEd+h+fvViljHFBDu JX8+1ibpLzP47HWqGBovp/za1H+1/hZEK5agnGMemxF45TgcSTLFtD4CcCP6VDsmQk/F /d7/yPVIZdwWLmHZWmRMaNPxnjjlOCDQJEfSH+xLV1q2mWJq9AFI0sTjznmAsWIeBmnA ieEyUQJgGSUGPhBi6J17IVmSm8QidhxuZV8/stSutDL7mMVIZmGs1Z69MZhSIPJwKCl+ dhIw== X-Forwarded-Encrypted: i=1; AJvYcCUhiBeY4WaY8fjsqijrVvJ9pE3HZ1NLtoGYctbAZ5K9+cS0qLOiuYfPzUaqUJJtSisLwJsk5l/5KJVeSQc=@vger.kernel.org, AJvYcCVu0BXTz/rzUESps23cgCIcrQNTptiwF21uyOgCH6W+n/hrTrM8YXckzm3+OqgPaoj+edGJ5SzfzEyV9HwFKf8=@vger.kernel.org X-Gm-Message-State: AOJu0YxvMvYEPIvhPo+11vfg8qYP+54MkKvAuVsjk4vTGPK2/2iEgf/C glZspxe52M5dBSviGGGyqx52lE7KSr5N0IFCnUIHJUUA8yNOvKq7B0nE X-Gm-Gg: ASbGncttRaVANLftK0WylyiC4Old/Lx83jPOY11qv6YlZlznfgDnBWyT+MwBaEugl4/ fq9PoDEdVJ8hzrAvRC3ti1/GulY7GYPswemmTEt25aUxfH1F3fwDD1nQKxg82JlZTZ15/9qygEY /VePvX7vEGVd19/Wyt4WXE5Y32drye/5Dgl3z+LpmdmCa4EEQK9U+w/Agm1+qVugzbsEt8SZs1A viXy6etfT8bJUaRMKzbIulydS+Ke91Ba+t/8jNxZPh2HT+P7dUu7umzAbJH7vdjL1JV4+bfH/Vf fgj6I1H0a5ikruWgt0G7HlcmEVu7nZNuQupS/NEw6NtVJtZ80cdpVU0X0Gb1dxtdiC2i09IVb4x c42o0Fv8y6AkGkEVjJ+x/zDp3uujKJTkgFYha0wPiK/e9zMSsvA09jLGwRXo8CRFSQJEFbaA/z9 3EXGdb7/+gGq+a X-Google-Smtp-Source: AGHT+IHeGtrBpWGhlH8jTxC3f6x5GH1RdbWlaCb4ayWLo/Ftp78eUXfDL3UH40PwYdL2VRUAWYkPWA== X-Received: by 2002:a05:6214:4787:b0:704:7cf0:5916 with SMTP id 6a1803df08f44-704e1c96802mr98849596d6.4.1752677329050; Wed, 16 Jul 2025 07:48:49 -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-70497d39749sm70825116d6.58.2025.07.16.07.48.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 07:48:48 -0700 (PDT) Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfauth.phl.internal (Postfix) with ESMTP id 4AD0FF40068; Wed, 16 Jul 2025 10:48:48 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-12.internal (MEProxy); Wed, 16 Jul 2025 10:48:48 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdehjeellecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeeuohhquhhnucfh vghnghcuoegsohhquhhnrdhfvghnghesghhmrghilhdrtghomheqnecuggftrfgrthhtvg hrnhepgffhffevhffhvdfgjefgkedvlefgkeegveeuheelhfeivdegffejgfetuefgheei necuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpegsohhquhhnodhmvghsmhhtphgruhhthhhpvghr shhonhgrlhhithihqdeiledvgeehtdeigedqudejjeekheehhedvqdgsohhquhhnrdhfvg hngheppehgmhgrihhlrdgtohhmsehfihigmhgvrdhnrghmvgdpnhgspghrtghpthhtohep udefpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehmihhnghhosehkvghrnhgvlh drohhrghdprhgtphhtthhopehpvghtvghriiesihhnfhhrrgguvggrugdrohhrghdprhgt phhtthhopeifihhllheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoheplhhonhhgmhgrnh esrhgvughhrghtrdgtohhmpdhrtghpthhtohepohhjvggurgeskhgvrhhnvghlrdhorhhg pdhrtghpthhtoheprghlihgtvghrhihhlhesghhoohhglhgvrdgtohhmpdhrtghpthhtoh eplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthht oheprhhushhtqdhfohhrqdhlihhnuhigsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtg hpthhtoheplhgvihhtrghoseguvggsihgrnhdrohhrgh X-ME-Proxy: Feedback-ID: iad51458e:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 16 Jul 2025 10:48:47 -0400 (EDT) From: Boqun Feng To: Ingo Molnar , Peter Zijlstra Cc: "Will Deacon" , "Waiman Long" , Miguel Ojeda , Alice Ryhl , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Breno Leitao , "Paul E. McKenney" , Erik Lundgren , Eric Dumazet , Boqun Feng Subject: [PATCH 9/9] lockdep: Speed up lockdep_unregister_key() with expedited RCU synchronization Date: Wed, 16 Jul 2025 07:48:18 -0700 Message-Id: <20250716144818.47650-10-boqun.feng@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250716144818.47650-1-boqun.feng@gmail.com> References: <20250716144818.47650-1-boqun.feng@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Breno Leitao lockdep_unregister_key() is called from critical code paths, including sections where rtnl_lock() is held. For example, when replacing a qdisc in a network device, network egress traffic is disabled while __qdisc_destroy() is called for every network queue. If lockdep is enabled, __qdisc_destroy() calls lockdep_unregister_key(), which gets blocked waiting for synchronize_rcu() to complete. For example, a simple tc command to replace a qdisc could take 13 seconds: # time /usr/sbin/tc qdisc replace dev eth0 root handle 0x1: mq real 0m13.195s user 0m0.001s sys 0m2.746s During this time, network egress is completely frozen while waiting for RCU synchronization. Use synchronize_rcu_expedited() instead to minimize the impact on critical operations like network connectivity changes. This improves 10x the function call to tc, when replacing the qdisc for a network card. # time /usr/sbin/tc qdisc replace dev eth0 root handle 0x1: mq real 0m1.789s user 0m0.000s sys 0m1.613s [boqun: Fixed the comment and add more information for the temporary workaround, and add TODO information for hazptr] Reported-by: Erik Lundgren Signed-off-by: Breno Leitao Reviewed-by: Paul E. McKenney Reviewed-by: Eric Dumazet Signed-off-by: Boqun Feng Link: https://lore.kernel.org/r/20250321-lockdep-v1-1-78b732d195fb@debian.o= rg --- kernel/locking/lockdep.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 0c941418a215..2d4c5bab5af8 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -6616,8 +6616,16 @@ void lockdep_unregister_key(struct lock_class_key *k= ey) if (need_callback) call_rcu(&delayed_free.rcu_head, free_zapped_rcu); =20 - /* Wait until is_dynamic_key() has finished accessing k->hash_entry. */ - synchronize_rcu(); + /* + * Wait until is_dynamic_key() has finished accessing k->hash_entry. + * + * Some operations like __qdisc_destroy() will call this in a debug + * kernel, and the network traffic is disabled while waiting, hence + * the delay of the wait matters in debugging cases. Currently use a + * synchronize_rcu_expedited() to speed up the wait at the cost of + * system IPIs. TODO: Replace RCU with hazptr for this. + */ + synchronize_rcu_expedited(); } EXPORT_SYMBOL_GPL(lockdep_unregister_key); =20 --=20 2.39.5 (Apple Git-154)