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 5E9ACC3ABA9 for ; Thu, 1 May 2025 03:27:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 063496B0096; Wed, 30 Apr 2025 23:27:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F2CC16B0098; Wed, 30 Apr 2025 23:27:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA82C6B0099; Wed, 30 Apr 2025 23:27:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BB5846B0096 for ; Wed, 30 Apr 2025 23:27:34 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4AF601218F0 for ; Thu, 1 May 2025 03:27:35 +0000 (UTC) X-FDA: 83392904070.15.FED3B5E Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by imf10.hostedemail.com (Postfix) with ESMTP id 79CB3C0005 for ; Thu, 1 May 2025 03:27:33 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=HTw4J8fQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746070053; a=rsa-sha256; cv=none; b=YR86ktWDP2XcXZlezPQ/6VP2Z0UsJrXyBsXowlZM85+n6Mf6tp5ZWvFpcr93zg4CviZANo AAg19K9GrTOFUPbJNF5jvEuhrgi9DW2+m1vqlqBpIiJKsuQkKWw4wj+rEWpcSRH7NVmdFO 3BecycyhaHg2rHp698hDDbs3sfA4CiI= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=HTw4J8fQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.210.179 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=1746070053; 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=9CpmOYXMv5x8HYoOMD/LQvY8JwuNTkgfKlwKcaFFw3o=; b=iCitF/+SeobmIjSQNHK82Y2Rmgnq+OXCSahfAmTMirhJoz+pBz0PXc0+AnlqgSgrpPb88d b4WrG6F3GkeR2FpGvTRe1u9v5E2gHS33sYGBB2I8WpGUepwjhzZ4cW9Ug9QU+A+JQqwUcI rf0+VcYiA9EJe6fyg5ZZ/vwGxQIv9gY= Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-739525d4e12so568735b3a.3 for ; Wed, 30 Apr 2025 20:27:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746070052; x=1746674852; 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=9CpmOYXMv5x8HYoOMD/LQvY8JwuNTkgfKlwKcaFFw3o=; b=HTw4J8fQM4iJGkmw8zIurxkVI5D9/U5R1ue1hxWMoEGYr35P2vlSkdH/v5/hNw7vEh f/RtBSB+hnl7GK7GOwH18XFOtmGB6nNFir07x6InektwYnZrHsxx8UkW8bdfauO9EDay 7IMhTLQ0MEtwE5PA3NnqMAU5PEa3cxkNWn3JhrqTcjw5Aw/oLnxZ7gm6PUckmFFyaLKq YCxf0zyehWOOw5okXv538JyiB4+Y0slW6VGP/VWV8ti9RR5NUSjX2bOBggKhfYH7swsh hqp6d2g8l7mnFqrXINhKpZ8CAShuggHVM+pUSHTx4ixun4YSWZ2yx7uPvvQSOfI/H0Zt Om/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746070052; x=1746674852; 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=9CpmOYXMv5x8HYoOMD/LQvY8JwuNTkgfKlwKcaFFw3o=; b=gUpqlbz3w7jkLnVVG5fXzVAAE71rywRqKcp5Gw+udcWkeUPb8skVnQ4QYIWwXFkoPG Y7dwwl13poJ1SaV6h+Xd1cTkuq/cez88ggvX+TMu4VSv9siiT/z5iJL2tPHNP2Z+kNL0 qbMTQfR/1QJrpVHqp2cdChbPWfpja2uboT2KekxNPewuIfNeugmMek0sOu0mgUxBY4vo OOxMOefYwwvA8ZqBYexaVH9XO+9iywM13fd+t6UUcMYkcpHOaMq2eC5R1WD3xPKFHes0 Px8j1DwP0qUMVzCtZtYyYU2jSUqR99LOnGbTUyBQAYEBjgrewct/er5E2dE92NZbZIF1 audA== X-Forwarded-Encrypted: i=1; AJvYcCUi1nyB1ptJ8o9LJUN1LBxAwoOgcoNLRB/RAkAQZ/0fiy4qAnos5rPEnObZmfdz21eqQyRo386rBQ==@kvack.org X-Gm-Message-State: AOJu0Yzcaou2e7+3d35fEJbf006jxj5WHTj1HocZcL9FqPQWPojzCEbq AILjP0YlzHRDDnlk8PYgfmGn0+Ja37pBCZRnv8VZYy4rngRPDmQ8 X-Gm-Gg: ASbGnctbD1nFC4Z0HyDD7Duv8cegrc2NrQD6Nuu0LerlQzJl4pnwyCbMjcH557Eexnr 7itDpSe9D083lXa9jAO0D+2YwQO3dvpKsAi8ftIp/t4nDlt5q1n3ugxqNvLHAL8EA5k8VYTAeVb VF7OgG43+y053aRPOdTE2ZeJnc3ZBsZXHzJx6Yu8xFKEIjmAAkNCDf4LwewQJJfaz9iDdeOZQB2 7YE0spBLc7r+xleZZlU6LPUBQVvdMbgzJ9F4WqbHyPuxevrQZjkwLZIMfMH6rTZloLw2Iy68J1Z YGtgdGc0d1YTu6C7hBGef6q+5L1V0WmzTYpYWN9LNe2UVIVWT0zvJlOqTthEXEvT5QHk X-Google-Smtp-Source: AGHT+IFBsLSR9UjK82PP1SOfVwgSoWZe2g80w5yd+JPZHymgn2jNwMPlxeBbDw1xeyqzVenZQOLNNQ== X-Received: by 2002:a05:6a20:3d81:b0:1f3:4427:74ae with SMTP id adf61e73a8af0-20bd714ca4cmr1667057637.25.1746070052456; Wed, 30 Apr 2025 20:27:32 -0700 (PDT) Received: from localhost.localdomain ([2620:10d:c090:400::5:13f8]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74039a5c064sm2494215b3a.123.2025.04.30.20.27.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Apr 2025 20:27:32 -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, willy@infradead.org Subject: [PATCH 2/6] locking/local_lock: Expose dep_map in local_trylock_t. Date: Wed, 30 Apr 2025 20:27:14 -0700 Message-Id: <20250501032718.65476-3-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250501032718.65476-1-alexei.starovoitov@gmail.com> References: <20250501032718.65476-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 79CB3C0005 X-Stat-Signature: cw31oa4d1ajpdzujdxm36q6c3jjqh1aa X-Rspam-User: X-HE-Tag: 1746070053-423108 X-HE-Meta: U2FsdGVkX19p3mRdrpuVuEuvZ/nQ6QmhmZaCTmF0of7AryTNx7GMII71quUk2uWt8GeOBayWIEyP0BE3fL9v0R4Ws5ZL6UVPkJv9e/b13kk5NuHbAurQEq6F8QSX6ciyqDumguqSuEmL4I+XnDnbhsGMW4un3rHfK7XNa8QSB8GBqWPaqWjT2+suijE7/tjHjNr/CINLUvbl9FtBwOFMR31VhwKQDvXOpVLV22JQ/b2Y2zlFcQF3KYI1Gq6EQ7kxHIrFzCcuC2XnhFCT8q/r9ibR+dunqSCjuo0NX/QDOs7Q/yalmq6C/jbf+6h4n/L2iWZeWagOo88m1c0UJQvXS4SrA8YAQRzchmvttbLr728FWxkLCROqJ5BltbxuyU1WG5ShIFTC8PiDqhmz0X/HC6B8B65pzMTRC4BHc6UMRnI+DuKVCO4P8NWbIPyeGZvSLQQ7hKYoWerUkXgKMa6ps26aYSJGRhqCCtG7TzPs4bsXawoLUOCygqfNTKHSggusxIrVGZDPKLkkd03hpUAGlYBWRpyzRjb/kw2I4o1ObYnXGSCTM1TRPON+CHgCYJVmSsUw9IdK3Mr+YgR75VVGWnMh4xpF40+HC15aG+nDTExLlSKaXYu/zTfLkvngpVC8t5ckm6Az4XjYd4MenqCPpixcmPuqDzBK00kDVFBSCpBqm+NJpP2BzZTW9G6rCRtU8Gnk2tLnWinSZD50jX7fs1VvMT/TSw8VboVlTvc4kEFHI1LBijxX0cl7F/Z7WjR1UpPO43TK3LejQNtCP0zPsfF1x8KKXLRoC57fq3poO5CtGVdqFF/AtWgWC4AK/M3UJ03WGCuefectSeKJzR6kINwv+xkOGeRV6W2Tf+csdZYS2YDU1jOPZOH5aF6r6tynKQNrBZXFN7zAir0CWwpmuCpkRX0vezEwis1UrL4ry/7RPfRZM55s3BTQPb6xtA9jlyB08dPhkKzdsOyqTvM 3PMD48+d IFvvrz3kLBf7mbkffzKqmc3e59ssEYwFaUrYid1NEMOnBmEuVBXjCvZsDv4dTmky5LNtcDWYQjXrdcl499NEnHL2rWYOVqVqi9uwJMBIuGq1T+6d6oorpmi/U2Vil+UOGSgMPn9n08fkldOkVSW6Zaa6AtHLYwF3hroH8NxP/4mAKFZvn/9m/lnk5NWcajUpWK5RC/qEe+9vzQgEMl9fW3XFg+EkotuP9w7cb9YwOpJifFGi/9bsymZN0xapIRpUgE7oXZQpTjLHqb7XUg2mzQAS3fTu16Fb/krGu0OMBy/04d2+v+kyHppUzNGtKy9StdIgV2gY67YZTGetNIWbJXOzf57oLF6AvmX5q8Sv3Ghq+mfcKg9NXRB4Oz+FeIZYwUYZLGS3s3TfAEZvq8LD6nt0NvLlb9a7aOf1Lg46QWMX9TrbCtGB7ruzA7rElvFSYN7bX8Ix7HaNlaMnMhCQFG21PUkqeV3xM4RwED2IQamms6J2+Q1yGUuzgcg== 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 bf2bf40d7b18..29df45f95843 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