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 A7DFBC83F2D for ; Wed, 16 Jul 2025 02:30:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 200216B00BE; Tue, 15 Jul 2025 22:30:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B1AD6B00C0; Tue, 15 Jul 2025 22:30:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0531C6B00C1; Tue, 15 Jul 2025 22:30:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E9EAC6B00BE for ; Tue, 15 Jul 2025 22:29:59 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 7315057AA6 for ; Wed, 16 Jul 2025 02:29:59 +0000 (UTC) X-FDA: 83668547718.06.D8A3FD3 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf20.hostedemail.com (Postfix) with ESMTP id 98EE51C000E for ; Wed, 16 Jul 2025 02:29:57 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=nTwDeXnS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf20.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.214.181 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=1752632997; 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=xIhGNjzYvU0LF9WvNv9O3HmVQLiCNpvjb+HJX/OSNPE=; b=cFXMPA4nnxPEJBGut8fXoPTd5BZn2WFcy4aVSInEYhxgOQYgn7fPoF0sX01pshhow5sYpS KYbzzaOVR3jmUM0+pvJhKcaHi6Ovsafcq9x1GHw8lrnKw8TqZL0BGDM/JVg+FHjd/xWMqe F9uD5FW9olKT6NN0swnHzumXAn+jKp4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752632997; a=rsa-sha256; cv=none; b=eKJXILxCB3U8Bve0GzJzMb6NXVp02TQgDWE7uFIH8iTJurzTNV5sh4O8BD/93sCEi9Kf7J FRvpkCeIVOqt4JMHQD0sXM+VyWp8rNlWMG8L9NdRWVaqGcSUvwXleLpuR/DI3efbQW8wWF 27Kr5oxcsALwNsHCwDIyNtc9dwY7Fvo= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=nTwDeXnS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf20.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-23c8a5053c2so59250455ad.1 for ; Tue, 15 Jul 2025 19:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752632996; x=1753237796; 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=xIhGNjzYvU0LF9WvNv9O3HmVQLiCNpvjb+HJX/OSNPE=; b=nTwDeXnSaRqdWmGx0h5XCTiOLNsI8pVPArdYUzF/Tc/7b3FbNW/LZcSG2r4j5Y0lwB GMT/NTSD4ekN4115hM30Y0U2fRsYwsCkFIGqhdbkFp9YZGHLnP09P4sm5iL6qkMujuor fDrZxRb9biYY/uwb1zzaYzGPnPo9/dCR5Yb7O6LQUAu8R0guS4ovOvuC7eZvjjmAyfa2 qN6m9Rutb+pJFQdotDeLplw8I3vjde2krHSjRi4P8Hsaytqfcx/EZWciKBO95nfhZknK NIYb0j3gdxHAc8sRZG7Mz7V+kVNUEeCa6OaFj6G1H6G5xvT0tplL1sCf62AG46UQk55i 3F5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752632996; x=1753237796; 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=xIhGNjzYvU0LF9WvNv9O3HmVQLiCNpvjb+HJX/OSNPE=; b=fjqp+hqLRILU+QURLEVYtFHfZbtg7jUKLSMoeC8K/yX6mj7qmwB47sxlvciV5kRCdf E7T6eziNF+5P1lwDjOurKeG0c7sAjpEclin6Wpjw3vMjuHqKttBuxyq9eRHRnms8K96N 9A3RuI3+fvjRvu82mAOH5cS2qqZskmGHXRBCWEZPhykfFyQbICu4y0AcJSdjBKi5/too WcQEiXyjoatOBAWn39wOtB2uisHuRQnJSrlDl6KA7Huwae2isGhQakeAeS1CHIQ9Q8yJ 0RdsIkvxt4Cfn+hQg8RHu5dOBKbualHa2UmTDTuSKuk2ZA7jYRS8gzSUOKY1XXvo25yL L+jg== X-Forwarded-Encrypted: i=1; AJvYcCW3oyhx2fKRA35bZhvMV3gMMc6BlVzjDISFH12Hxb89EvkSeNWCmdNpuyTYQdgtWxQ0qSGfx25MHQ==@kvack.org X-Gm-Message-State: AOJu0YygobKvgefvYqFcWI5p6nbCw+1ereX/ieT+BHmIGoJmLzw8LcK5 0KOWM381tXtj1Rnl3FlXQyRGPS+eolQoJrnxzrQJ8ZI/qkW30Wy1GoSq X-Gm-Gg: ASbGncuidhn+Q2vAEKhd7VF96AhQCES02jgfn9ch2kChiY6PYJIQAp0A3jXcWtLXN3F W1+Zz0Ypk88BCJ5pmGj1571oUcKlYTAvKMYchiFMY3d2UircVplVouizsMo3wXiuquiZuONkX4O SiXWR8cQSQXRTpAK9fPfeqvWevNb8OiV20xdHpvUicyc02D8vNSa+ZIbIpw8hBNt7IL0CO/0+if r4rshhIwdKZoPN2zTwVTN9rTdUwIOMQpfjL0AtEOIARLmwwxQpZnvCkFgIdVVtIemc62QGrKRUg NdAqcaEA3pNQC9182Q8TqRD6TRUcccVyeYC4AtF4DtT8mU0Ay/Yl+5UgCXZA0O9CpJKspYw23l3 Y5W2VTRt/jPAge6Cz8LCXl/hlf6aredJg2lazhJt9Jq7YOjMDsQQMuz6TcjFpMWY4mOnH91ijqw == X-Google-Smtp-Source: AGHT+IHCbDCnBNsYFUrlELiNVRR+WQGwclzTbTvrNbJRvXa814XxhR4RgGxtQ8AbYbbnq0npyYXQAg== X-Received: by 2002:a17:902:e743:b0:235:e76c:4353 with SMTP id d9443c01a7336-23e25000edfmr16416005ad.51.1752632996321; Tue, 15 Jul 2025 19:29:56 -0700 (PDT) Received: from localhost.localdomain ([2001:558:600a:7:a83d:600f:32cc:235a]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31c9f1fb8dbsm307910a91.22.2025.07.15.19.29.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Jul 2025 19:29:55 -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 v3 1/6] locking/local_lock: Expose dep_map in local_trylock_t. Date: Tue, 15 Jul 2025 19:29:45 -0700 Message-Id: <20250716022950.69330-2-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250716022950.69330-1-alexei.starovoitov@gmail.com> References: <20250716022950.69330-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 98EE51C000E X-Stat-Signature: ud7hnioabmaw3g19k6zcnx5mqjpmsfr3 X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1752632997-349281 X-HE-Meta: U2FsdGVkX18YYIz08PcjvZFzt/QpFENsKRNpSZzNgynh84QFnpxGdW7xSBj4kY/8Ji+zbQQ56QJs1buMg3ugh7dXhZL3uYCKz25nuXWva2R9tHfjux+A+TkXDF74I9422WBza6lHTwsCseMhA5pvpnnrnh7a0EAa+zu/i5QaBBnLPe2SQeDVCPCWRYltxtiCZhmFNyV0XRgCwTCN/waoCBp6/DFwKLwuo2QUEaptXrhTC7N/tnviV3dkOOA/OmsTYSplBJtpn873jMHM3A0WJ3yw0WhiqVFcd0aYxvWqiK8RhijmFS7tFoSCQFY5e08nQuLDLH0ODbiArTgJ9+rc+Wvj6E/q7lzLiUyeLfF1qk9xxfj0uOn1cvpf+WwE8AizPhOejKc82i2jtsxVtK2vllyVdyrHknjUR88um2+UdO29n7R/nE+cuCj26UzG0yCYgZoXARW9c7G2F7UJrNiLaR/YSk4V64vlge5Abj6VXEMHM8kLySv235txW6zTTahNhhn3WvXWfNnCosb4wclprRPjadGvJUx0BkIuch7HEgOdArh41FsCVRS5DQtpcMC0Myw+KlUy1Hhk/LqMkbeOmLe1zYFsAVDdj8fPPpPffYI+9cDocgZ2NlguM88JQtrv06LbSVNB79HTnLTLgQJnnv+/XJOROZn60QW5x7rVx3T1Z47oe1cqrYFaNUNYiDCbc6H05IM+eYmN4yP3n7TzY8299B7vT2g/CcHOq58PHADrjJcAFUohOXPy5wJyrvyw/5N+cxPIbPpnqyF8iB/mgSa2c+0/rewY2WCXxkMJzT9blWZ7/Y013tMEcr4DcrhFojlG2KGeGYs+wYannGzYpfEn+Z7JJgnzeok8H9UrZw+tFU37/SeviFNKsAG8EIQSskRchgNFy5x6l4tWeVIguXEf99WZbsatstFn7jy5SDaVXZsFMTx0x8x5yj31jVRq1trj8eqQ9OZZjomMy3U ukXb/vLX PQYuh24oDYE/34Nib+FOGGuG8H9wlZZpDWLQpKfSWtf8YkOgtkEjEMZM8Z6DbqOXYKlQrdz54l87Ri0MXOiZsMPyCfPBQrQNAL1Fjs6REndiDlROvKxbQxTG8ZDM03sXlzogFxchy2yuQ+VMOAYCSpjvouYZblKD+MNQvK/uB0X8wX5xXZskqQWi73U0qz4cvkCYMIOMWU4Mj3by3n2WChc+wvUo8WTKP/lbnQDj+9IYRcOa2K2Wp1m1HrsWhr/GdhBnJYmAA79Iu93IaC7f1p1RLx02t0wraUlzws0Ccmqq6d3zc6eNzlIptYkRM/vngPYPIPiLTgnmsLHGOhRFGL214hKHOf8kIhkdiZd13QScAMJOkMlWil9ecgpEmQmQTLAciRmUBbUIwt5gT/JBzdntJX4L+hFAUYc9suVHbJgWd4Qfgn/HpOnpnZpL1tscs86UHkCp2BrNJ+BYQ0FfMvhJo8MYmbLRQvBrw9Dk0JhmwJWQmEVLctifJqnGq94ARqMQ8a1w7MkbmmhjcyVqSSWCrPuer5pkzTDtB84QZeFbf6pywL834ag0DNESPryZBH0yC 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. Reviewed-by: Sebastian Andrzej Siewior 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