From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D914C83F09 for ; Wed, 9 Jul 2025 01:53:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EE05E6B0092; Tue, 8 Jul 2025 21:53:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E90416B0096; Tue, 8 Jul 2025 21:53:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D7FC86B00A4; Tue, 8 Jul 2025 21:53:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C081B6B0092 for ; Tue, 8 Jul 2025 21:53:11 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8DF8E1601D6 for ; Wed, 9 Jul 2025 01:53:11 +0000 (UTC) X-FDA: 83643053382.27.BE1DF9B Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf16.hostedemail.com (Postfix) with ESMTP id B304B18000E for ; Wed, 9 Jul 2025 01:53:09 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="kyK/p7yF"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf16.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.210.174 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752025989; a=rsa-sha256; cv=none; b=z3T4mLpjocrgtLeR4eJALidc4S1e9eYPCqmfgIJmVpbu8bTdcm6VQgcQRgGE2Dn3kWoAx0 Iru4j3C/qnBNmc6nUWiS82j9UqOQNnb9yAMujO90tZMNlfZMgFByQ7JXYHzY6ZTP79nW5A kZ4S3ht94JD99uuwd/AKQfoUoslpha0= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="kyK/p7yF"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf16.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.210.174 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752025989; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=W/+X0DXw9OUm5wzNulgieDQHWxYahBqcZn2zhcA2wDA=; b=rMUl2w3AVAiP6pPctmPAcQuzVCK5n5wh9Yrl7KwftSvWXu9tU6BarZrqcpa2UznX8SE4hz Ju5+NkDBMNAHgIs1M3CpMOwSu0OBRXQGGaGYFzFfbhVn9nNRUOR/uQMSClKm09XiGjH69v qPuIsmmfJ9t554bcPnuxHV/l+AVXbE8= Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-73972a54919so4522451b3a.3 for ; Tue, 08 Jul 2025 18:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752025988; x=1752630788; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W/+X0DXw9OUm5wzNulgieDQHWxYahBqcZn2zhcA2wDA=; b=kyK/p7yFdFkbb43R1BOptOu2ZzlQi8Rscfq45joi0rd9pgwMVhCg5vhOKoro1BKbsE hazBPdWUeE92T4OyKtoiqkFonzygJP5HjmVyNOrImktxLox7WCroLS0JVY0Hv34Jgbpn Enam2miCPOTWHDFSNEswkxnGk0+Kopy0joBTYAUli04pkovXcDcH1nmiEQdOSQe34PR9 EbSHMMcZaGZDBt/4VV7HdOZSfm0O6UlRVeC8oj1lZHvhL6wqMfsrnv12d00WXOXGmADC +TL5k3XcxrL8vkW9H143H5cVqeuw9hzJd/+YVjlayNXNXGPnAkScQ3cSKOd6MRGbiVRs eydw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752025988; x=1752630788; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W/+X0DXw9OUm5wzNulgieDQHWxYahBqcZn2zhcA2wDA=; b=MKR5eV2jSbvJWkv+cBNgARzGYRiUsGJRoMiYSFNP/pDP6Hvo4QE+pdyaTFq1qSGblQ aT04SBiqdP3kd8qrnQDOzQ/t+vIuKQhR8D2Jdtsj2cVqxVB1rYx1P7o+dH13+Mp4qX0y afEMk7sfWVKLjU/HmiFMkyUAmiOgqxq8D/M026TS5Q2QSZKkq/f0m5HFRTcq6XOSqh/w KT6iUKtuvrp9MEIMgtvI0PP/DtanOavsb+5dGqhSxY2wMg/bAiEjuEzfKQW9j8xigzWc CNT05Wim1BFfeNuZaxDmk2sJU95Suj7d6I+6MS42PSg1b15qjF2BsIk261YyaPUsXjqR GyBA== X-Forwarded-Encrypted: i=1; AJvYcCVP+BMtEsVRwzlHjWUj1voFBoHDnyZ8wzkMUWKwx8AuTlKY9l3pJH2/kOZc+m8SQR4Pgfk1rsAEeA==@kvack.org X-Gm-Message-State: AOJu0Yw/f1v9T9o8EwXxhtbavUwP0V5z+HDznION9kxtK5m4G2OwfCsz 7tYSfRb0hk+XxGrAtORIpktn7ATxYlc2RzMXyADcwv27cHKk7bw7Bm0Q X-Gm-Gg: ASbGncsEBED+i6Gj8S4eEK4qmGVDJMYo2aVr0CR29WC4vxg7cbYXnrfBBGl/54SalYc DuQsyP8XPsROF6BhLi0TWtKfvj2iSJ/uWACsTcKl7UTruuPy1fBh6sb4QhS93Z0O16Zl9rTT6oP 7U67uQh/PqC/+9WQ81IMBD2aqfUnKWIoGUPoApaXl+KijtmtQjYBuACgQ3dq4p+4qCDrqOp0RAA cDVcVODcibxTuX8NN4PnwiVu2vG8ZPyn4OGsbubaFaT1NUCIX5AU0QpQm4p+KMmW8Z7lPwa/ZkI k1MzZ7bJ3vabEBcV4gVMJo0Zg8HqIs4Q1TA77+7ZmiKPBUIlSVZZrwWRmVnpnmvY+IGFcW4W/L/ HWqzmDM7XrLQOb/l9ue68zbZgTZU= X-Google-Smtp-Source: AGHT+IGEp6q46XZSMJuTp/cGNB3vfUy3QkwFgTTL+IYrvCA/HXzf91RG3Roch9rLK1q/X7AwuKsMEA== X-Received: by 2002:a05:6a21:62cc:b0:217:4f95:6a51 with SMTP id adf61e73a8af0-22cd7770afemr1029281637.29.1752025988514; Tue, 08 Jul 2025 18:53:08 -0700 (PDT) Received: from localhost.localdomain ([2001:558:600a:7:a83d:600f:32cc:235a]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74ce417ddebsm12860927b3a.84.2025.07.08.18.53.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 08 Jul 2025 18:53:08 -0700 (PDT) From: Alexei Starovoitov To: bpf@vger.kernel.org, linux-mm@kvack.org Cc: vbabka@suse.cz, harry.yoo@oracle.com, shakeel.butt@linux.dev, mhocko@suse.com, bigeasy@linutronix.de, andrii@kernel.org, memxor@gmail.com, akpm@linux-foundation.org, peterz@infradead.org, rostedt@goodmis.org, hannes@cmpxchg.org Subject: [PATCH v2 1/6] locking/local_lock: Expose dep_map in local_trylock_t. Date: Tue, 8 Jul 2025 18:52:58 -0700 Message-Id: <20250709015303.8107-2-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250709015303.8107-1-alexei.starovoitov@gmail.com> References: <20250709015303.8107-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: B304B18000E X-Stat-Signature: cgpbxpizg7i8x45cyommu1rczf498o17 X-HE-Tag: 1752025989-995565 X-HE-Meta: U2FsdGVkX18b+ov/NUzPiCHEJXpbxjVTTaoWL4wZQ6kW3g7ed0JeQN4+jv03Ts3LxLZ8krmtt4AvXHny/VaKnjFSJzpncP34w8BAkqGxZ3dl8Rx0k0WDNT4N2KyLEthR+OSvzdpq+Ov8XkJB8OQhHhotXb5ihhWT4wuiDldBxNThbN/hipPYdZTGBhAcyabWWZNcR4z2QSoOmQGEewSh4w7H7LFiGPmPDOBGcgPx8j/brJX02LcmNWVpLuoicqNOdKR74Pao5unlwHLljaTwwfaAQRfcuxPasV+FDTMf0om+smgs48dgWQCZWzg8bLTfnHdZ3CqZPE7JPPap+k22mFWp/tjslgLUj/XO36JKfJmhBEeTC8xo27OFPsx7PXk/Ld4D2AdHWqQkvwK7Gl7BVPV48T4ajNFZ3JIo40be7ZB2LGt6MrMWYf39UJrpsP2G8lL1AdenXOo4sv7Fos0uMcsLmC884pYrHPNPjI3CXsk3C07rKEiff4Mqx0RbPa2tgiQzvg5GczoS/oul4lI+mh/jAzzrkRbli4zwWGdMxeA5Ufz8wM9jJFMsNYif01UaJjqt5cLMLhMt2huz4jeRwTTnkNoYgeXnS3V4FFHvBqt1iipEzKENSAIAFUU6WJ0doMIyRLRLijl9srwtKHlds4CbSViyJJam2b1piwKTnkPZ9RwreOO8YkJhaulPZYRbE/5spi0DYIAA3ttr/EUkUN0oJRDmgXKtHuzBZvK3H8mddI9LyxfKk+Xddg2CGOsnzcuiCs9YBLgLMCFmt0ddkp7SWNhsV05bpr+/mB0mCUqvJF4sBmcxU78MgkkROgeXoaBhHnZ2PvxjggNBzdFSc+G7YSWkV1fY7NpnMVx6+1ZVB+jxEyVplsTDOrQ4vjJHBFPjpFu9cuOOLyXnR/UJmFlv9Kl0cbxh0Y6bG8r7ttlH4RBN4FOHs2LCkmLK3nuy+u5MzqGySqIuSmsf0oK z45lBk79 JM7EXbgYpBijRvPm2zV4XLt/CLBHlltUA95xXhtiB+bQRoeo+wJpldD0+02fuYIag6ZvKnR2xDE+jVBtJ7CpM2T1UEUVW+6Ggmf+QuMKZYEWTVna3rgpZsSHduMOOnZEkfIwSRG36BOiwub3LozMNfBaC6V9Jl440AUbfV2NZwq+/Jjdb0gQY1S9q4ZzKvLyY/u7gzEoNlcBBEHH2cxB2Dj3OrkU1cV8TASWJ/9uX0htfVl6rTi3P1wlIRy7D04AcxEanRZLDN2bQI7vzTquX9+YJtai1jzGVEZA6c9WvZTYhtJRKISCFV2GhmBQCPAlNtEMmRSxmAFY6/YZwzowHxaIHjKxZqa8+WbD4VJPIQf/sDxoyrd8028tCrBlhuxyk8cV4grgp23K5k6aBfUwrvHVd9/DD5gdqnX8wpoDx/4nA9Jyw5ISfuU09NYTYcpCtJ/xJqdlKtICqHkwWgyFcHqrFn/HetbTNkxXYQbx7mXtfZ0hjSY/qAUQv7Yw5AEUlGYEhushean/tEfUodKj1ZAUeqoGx0PjO2npXBcuajV/D87yIgiC7YYh3XsA9p7P6fkxB X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Alexei Starovoitov lockdep_is_held() macro assumes that "struct lockdep_map dep_map;" is a top level field of any lock that participates in LOCKDEP. Make it so for local_trylock_t. Signed-off-by: Alexei Starovoitov --- include/linux/local_lock_internal.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/linux/local_lock_internal.h b/include/linux/local_lock_internal.h index 8d5ac16a9b17..85c2e1b1af6b 100644 --- a/include/linux/local_lock_internal.h +++ b/include/linux/local_lock_internal.h @@ -17,7 +17,10 @@ typedef struct { /* local_trylock() and local_trylock_irqsave() only work with local_trylock_t */ typedef struct { - local_lock_t llock; +#ifdef CONFIG_DEBUG_LOCK_ALLOC + struct lockdep_map dep_map; + struct task_struct *owner; +#endif u8 acquired; } local_trylock_t; @@ -31,7 +34,7 @@ typedef struct { .owner = NULL, # define LOCAL_TRYLOCK_DEBUG_INIT(lockname) \ - .llock = { LOCAL_LOCK_DEBUG_INIT((lockname).llock) }, + LOCAL_LOCK_DEBUG_INIT(lockname) static inline void local_lock_acquire(local_lock_t *l) { @@ -81,7 +84,7 @@ do { \ local_lock_debug_init(lock); \ } while (0) -#define __local_trylock_init(lock) __local_lock_init(lock.llock) +#define __local_trylock_init(lock) __local_lock_init((local_lock_t *)lock) #define __spinlock_nested_bh_init(lock) \ do { \ -- 2.47.1