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 29260C83F22 for ; Fri, 18 Jul 2025 02:16:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F99E6B00A7; Thu, 17 Jul 2025 22:16:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8AA116B00A8; Thu, 17 Jul 2025 22:16:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 798B96B00A9; Thu, 17 Jul 2025 22:16:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 680376B00A7 for ; Thu, 17 Jul 2025 22:16:55 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 1786B802C1 for ; Fri, 18 Jul 2025 02:16:55 +0000 (UTC) X-FDA: 83675772390.14.C6CD7B1 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by imf27.hostedemail.com (Postfix) with ESMTP id 329ED4000A for ; Fri, 18 Jul 2025 02:16:52 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=EELd0QbK; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf27.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.215.173 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=1752805013; 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=nbDjaSz10bOFPJzNEHYyk09bxiTQEfqWtzwQ897MFuye1EYpjc8i0j9/1OH3hbQUjrJxZS t0re7Ew/TRemVLRUI6hXCwni2xtkKynTo6Ox3QRGodxiEye1PB6ROetHmd2Jt5hyBetYjV p6iXFRp/uiAke0G/JFJoKF0qnJ2OKmI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752805013; a=rsa-sha256; cv=none; b=mRmhrnp/kaqh1pvyVWwtvSbws2yjPLqb11OjdVVfAlgk9TPAedgnh107C+Men5ZX4G/A+f fGDW2EOhxDJMxOF4fHr3prZPltaOe8avpsd41xgZaTUs+CNtynW7CEb49bUAIdevv/hVor qQm6Pydk/lodEINNeVuzMNaVo6r8ADE= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=EELd0QbK; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf27.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.215.173 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-b34a6d0c9a3so1500850a12.3 for ; Thu, 17 Jul 2025 19:16:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752805012; x=1753409812; 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=EELd0QbKpyLqZgM9/8vZDNheMNbkOCfuLwS1HrFvvKWco55RfcsOngstXnPw2p9RC/ 4HPm14IO/Uj3RNr0TxzFb4WEuPuGBu6q2Jv+vph501SfhLdpVTC4JvIvNosT3m1jGR1b HUECAhF2bq5VocVaXznjSwfycbvgL6muZxEl/y+bruP+0K92fqaAbqG3D0tvbREgpe5/ vVW42I2RQ4gg//4uj2TBUGD5g24YyM2LZgDyhtgDeKQZ8WT8sDj+F2edbkEylMhYwB6f +qT0kxe9r7kMG8U0L/tR3bz1yE8mKNTcz7T1hORr8Aq2gU6EhjFPCU8lnKjFHRKcHVPe ji+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752805012; x=1753409812; 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=tKo2NXluvLLdnwVSOUTTI4xrhqDO8WSYgo1IPZx/aPE5BQiCABzeKx2sAVR8ffn8IY Wo7EAzoUlwJtHqdBNjGvH3OnHiwngo/4/c8t4EwLUP1CLlkylh4XUPV/Z+kUCSTsjDCE hNrwZKss1MigG+0F0zHsMh6LaPobY36aDNI1dyVlsd9FtkdEAXH9Ls8NHsN/SjgWoG/f WXY8W3OgOQQJM4BprJEAoy7YlY6rOGMI7tvC791ymu3iHhuGJiHJ/xOWQku2qAu0sKDh qg0QlQM/wVx1kGmvWn4TU7opgZ2fTuCQLeg65saWYlvo9JLE/qutUUz0Xs9FtQm65/3s Qn0w== X-Forwarded-Encrypted: i=1; AJvYcCX5wyr6u1UvRBdjsUb+WJAY8e7KV6Q6kxdX82ytlg6yFHjBake+8E6+iKSKTFFVvLM3/1mu2DPlSA==@kvack.org X-Gm-Message-State: AOJu0YzrUBCrV36ob68PYldn/pIv8dIRHAQXkIJEfKnClXX24p7iJ1H+ M6rn5apIP0bfLrGDz4rNq4arFvVagDjKhpYZzhRuVb2jx9Jwk4FPv0hs X-Gm-Gg: ASbGncs7ppj4fzrk0L5RsVgjb3GhM25cA3NjWKmbbUO/NqbaPnf7paXl8ppTL4C7HQh UbgYI4E4sw7dUZjcjln2N4weQokQ/PjO0c0pGIOn+9ZkUp0vuBv8OhbM7SueYNlHKOBlsjxbYcK TiscZiVXznLEOIecfCqzMLKsvMMLK2DFHwZaRICjjK/WtLLezI4I6jyr8fwlJI1VsABuEVpPWHg MDSJxVb6QgarY1WTq5SfGuakfcel/uoCDG5P3Sjv+KJt/TTb8QlYg+TuBMUWT4bYJJGISBU2yrA TmX+uK4lkTOrST3qEwIlibkoUo4PN/szrvRD/F1jzcCYhGQp3bFFj1Ly4H4/KTTtbVOTsBFMsEM x6DQos1G10NhGIZkUdpEBPpaZ9ekt9jRtkTorGmCfg2I4047ousG+Y87JTj4urf4= X-Google-Smtp-Source: AGHT+IGUTr2ssiwc+Q/DxQkSyymIb/HkWdb6h+t44qN6znpvcLwh2+OCFlaQX/CKqvK+LvFsBWCg3A== X-Received: by 2002:a17:90b:4fca:b0:30e:3718:e9d with SMTP id 98e67ed59e1d1-31c9f48a301mr13192447a91.35.1752805011963; Thu, 17 Jul 2025 19:16:51 -0700 (PDT) Received: from localhost.localdomain ([2001:558:600a:7:a83d:600f:32cc:235a]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31cc3f162d5sm214591a91.22.2025.07.17.19.16.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Jul 2025 19:16:51 -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 v4 1/6] locking/local_lock: Expose dep_map in local_trylock_t. Date: Thu, 17 Jul 2025 19:16:41 -0700 Message-Id: <20250718021646.73353-2-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250718021646.73353-1-alexei.starovoitov@gmail.com> References: <20250718021646.73353-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: a7e74gpfyk1rt1t9hcmosdg4dnm19gkx X-Rspamd-Queue-Id: 329ED4000A X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1752805012-613766 X-HE-Meta: U2FsdGVkX1+HnhdnOY19+hM2FwFrC6NHkzWsti3Nf2+E3yfq4wLy3hC9c4aBn9zvR9YkSYU8TwmcKnBmS4z2m0V+C0rLLoDDYc5CQMBBnyvmXjOnFv0EGrXeFYTJTNmMdRntG+0LJrzKSH4+sbTtus3+6hDC/DBQ5jjjBWIIRQmBcxSJenV9qHNxkJiVeBhiftHmMROULDl1AxXsSYsSgu0Bh8SW4SRQq/hRQjDJau0jhzHyi2KZpEhzRGDh4QXkRSSWPrnVyTRDCqZVaYZ+NBx5ZFEfeJ0psm8wEgEYx7fF5eAecOzosEFXC8al7i0XkzRuThT6BhnXwdNmWshePaoVC1nnM/GvR2pUkvvxkLZu2CzNlCt/DeJhEQCuQJt650OnsrpORhp44zpMYOcY4bu19k38ibDiJTdAptsuMRsyOAv/XVpb/u0QFXKD4hCMADldhtARqg9+YHzkxYNBBgB6MyLyfPZTDzfrnnXy52Z4JRrr1eyHIrAzJRWz5fr1OE2guVNIVIRju4ole4Gzr7A52luiv3Bvb8EEB82HPznS169glg15ulDvILA1alCHmtkTzuPt1c2Rx2ekjMNrotzFCNPvHiNmZGMQTR7yX5egYbaqNVOU91xHqYsYqwANwAdgaGo4blkH7zxBJyrJBgNobHvVdv84QpBGgW11IcxdPsgQy8wL30NmQjLvZQm4oFXT/KEPLq4VAAukRUm9k4art3wfsJhqQiBFGkGdgbA9o9gwQSrpJEfHowp7BCr04mTBJw6rsfsb5PzvJvYyWoaxCzSfCoKqJYfU6Abq+6HPgXs9YS+DU6BSeYDzQFIV8bAHWXmc1Ym8c2QmqVCbrhhzpNTGSYGYxGnDpZ+lNfFLeIFt0wAOEMKenDUXipt4wfjcFsOVv1ziKPJGiwv/rgmrFnpC9b/ZVeOU6eGCcVVkCsnBlAXo5pARbeDvTg4YPuL692oSMUtVwGqNjtn cjNoM7mv tP8l1R+ZEi5iSYh4TXwLWpUglYT+B/upeLysV7OATSscc5vGCAoSJtJ5YGVB3btm4kpdTaEaj+lqMvLs01qAqwm/HgBKM5pvfT4orHcDLBDvjhw8ECAxBernKKJ5ePudTuPbwZhvt+NEVu1RDwUlAzcU1PPVoShx5+I6/XUQW40oTl2Rnwh0+o10xtpK2qScqd6Ls8Oxfrudb7SGtCHqWw65dtytpkJttgvBwpsJCJv3VXWifSa4BNwsxUToG3rksjapzlQ+kavI4Tu8Pgiygxlz3N1mnBS2UGnaJSKG20TmBJLXBsqLDfE/WeTUip8i79BQ4/a2cQ6lpcjtPfOfyGDRFeZywwp9L8iWhjEUjemQswrhc16k3G7XQPfD1HRA+BhaxdEJxv1grFbgdSZHVLuqCFWcRBh1JXDzoHUrfy8Xfui8+mKr+3+eG/bNCkfOzRZR7dBxZa6AR2RkSK7QfY0LaKcs6ga6zSovh3/9Zmkby/JwVGqY7d9E9dsf3JPDns/bia5O14ZLf88oBJcStu7bDwA10qZ1XgHQGexulNEqRZMbJRtxp5eaY8yqCEOFyBGfF 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