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 406C0C3ABC3 for ; Tue, 6 May 2025 12:56:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 52F5E6B000A; Tue, 6 May 2025 08:56:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4DD456B0082; Tue, 6 May 2025 08:56:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 37E196B0085; Tue, 6 May 2025 08:56:50 -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 1A0086B000A for ; Tue, 6 May 2025 08:56:50 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id BC1B41C9400 for ; Tue, 6 May 2025 12:56:50 +0000 (UTC) X-FDA: 83412482580.17.5EE234E Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf23.hostedemail.com (Postfix) with ESMTP id 6C344140011 for ; Tue, 6 May 2025 12:56:48 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=rUKTixUh; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=CpXdeFV7; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=rUKTixUh; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=CpXdeFV7; dmarc=none; spf=pass (imf23.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746536208; a=rsa-sha256; cv=none; b=5/KL1VrJ3XWcfV0ACmcVXnotYeD0iLqBRubmTz/Is3OS4xKXsM2opRyv0ru9kLFWpa8FnE xS35TknpFOkKUAlbICE4Fpd3Af7cbFDq+7XXblX+LEpalHKySOEOVvok7wGHm1EptXfg1j t8M+YhjahPJHjRP79vsvmLl09SilRpw= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=rUKTixUh; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=CpXdeFV7; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=rUKTixUh; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=CpXdeFV7; dmarc=none; spf=pass (imf23.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746536208; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=hunScdSIxp8Vg1m4zyx7MIsCc9J0eZolhrA9JPok3M0=; b=0RkAvMACG3S1ajGQBLxekzCopVMga5h9/jRnWENvKtziyYg3QPIWTznEuSeqXH8BtVRzkO kyto6Xlj8GkUGdg7Zav9V5XHMZU3n0Ni3E9tUMsSv+G/HcY+E0eCyOOVatPoRUiCBB0uUD lbA9GqKxFHtXoWVoIdGCJPuwRY7/ZxY= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B831321226; Tue, 6 May 2025 12:56:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1746536206; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hunScdSIxp8Vg1m4zyx7MIsCc9J0eZolhrA9JPok3M0=; b=rUKTixUhd7ToKR+ybMdrnQsfLIlKJabORXiML9F3t+ZOEKAhmB3XgdtBlkkmG9WesZ7qLX CN31JDL4U+aY6176EFk2+y4lHIhUSHul1+nf+lHvlNKtq4y3j5WribYtWu2FrhaqOIOXKn 7mAp5eQ1xdj3+eItKZDyIE/cTJ18H7M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1746536206; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hunScdSIxp8Vg1m4zyx7MIsCc9J0eZolhrA9JPok3M0=; b=CpXdeFV7aoRZQ/2m4cofwvJkHaGy1QDhSGWUZYpAvd+x2yZdFjLALXpv0zw7hjpIL9I4dP qiep5aA4K5ObyMDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1746536206; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hunScdSIxp8Vg1m4zyx7MIsCc9J0eZolhrA9JPok3M0=; b=rUKTixUhd7ToKR+ybMdrnQsfLIlKJabORXiML9F3t+ZOEKAhmB3XgdtBlkkmG9WesZ7qLX CN31JDL4U+aY6176EFk2+y4lHIhUSHul1+nf+lHvlNKtq4y3j5WribYtWu2FrhaqOIOXKn 7mAp5eQ1xdj3+eItKZDyIE/cTJ18H7M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1746536206; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hunScdSIxp8Vg1m4zyx7MIsCc9J0eZolhrA9JPok3M0=; b=CpXdeFV7aoRZQ/2m4cofwvJkHaGy1QDhSGWUZYpAvd+x2yZdFjLALXpv0zw7hjpIL9I4dP qiep5aA4K5ObyMDQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 9788713687; Tue, 6 May 2025 12:56:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id E1KrJA4HGmh6MgAAD6G6ig (envelope-from ); Tue, 06 May 2025 12:56:46 +0000 Message-ID: <9e19b706-4c3c-4d62-b7f2-5936ca842060@suse.cz> Date: Tue, 6 May 2025 14:56:46 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/6] locking/local_lock: Expose dep_map in local_trylock_t. Content-Language: en-US To: Alexei Starovoitov , bpf@vger.kernel.org, linux-mm@kvack.org Cc: 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 References: <20250501032718.65476-1-alexei.starovoitov@gmail.com> <20250501032718.65476-3-alexei.starovoitov@gmail.com> From: Vlastimil Babka In-Reply-To: <20250501032718.65476-3-alexei.starovoitov@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Action: no action X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 6C344140011 X-Stat-Signature: d5tbxnc3kjrpxca6tixde7xoggh4ro7d X-Rspam-User: X-HE-Tag: 1746536208-505102 X-HE-Meta: U2FsdGVkX19SvSfBHfWoVuuMZunRO2ChKBmlMjeC9GRsGs+RxLXYQaB0ajT204i61wrtCvMnUmUA5miHLHp5SS1Gi/AHAL0X4FvJvA4b4AKPy6QWCx8zvdMheCON14C9khfZEapZReqxCNjWEIFtNwdKgp5/VG0qMjyOCHxeiwKrRXxrOPIscbBQdqOh3u5wohbuoTLAb//E7lBk211HYxb7uEXAPCQT/BTo3ecY05A35HRdFr1Prz14VRlBNZjVIk4L4jSgPg4u8y0cecKoLaM7vD8yfWOlfo6IxuNy2fyKgtz18agld9+fHnE8sppAEG9rOUljQHLNH4cV8hbmrVq4wEzdMrsFCr6F6gvInu74vngRApyiknGCycsKhH4ZC9BEO6ZcCAf4cXhsRzy+1M26+1EJBGJ4tiMeUrjm4KyYSXp0nHgwTU/I+Aj1L8YHSehPpacRon1Efo6ntFvaz+JrF6F3Hnj2yx/tC/3AtrF+upMt0frorpQKmRg8Sd6Nw99RfShWYCgmNrPrIoO/XJRk/tBi9UUxW8XFyAHDh8ADJcQs2dbgCfOy4tqkIA8/I3LazMeB5k+9sItNuyDxkePcCzFjd4dgcz2ku8OdoGkJDmSgTNVIrmF+rgeuAha4yzQbr9lskuQAgaOTxmzr2pLdlo0hK3eRrLLaVCd8Z5wXQ8ryUC4b7Jckbcp69Frq6wuhfz275d4f4foMsF6gF8qARbZy3A+GHcVhQL6+F3A7AITuyFx7YczMASFNZq33sEO45pG83Nw80qTQrTciVBFbUqTpfdbrlq1HQK9xxZpA9WXKAIoDGL1QDR1nNz5nx7TfvMffsMgm3gLGaoprUDNe+TR5JaE3NppaLTdWxGwFKhdIFILiQyi+SdfmQluCItej6RQQx/G9UB+WarJY1wi15wZfp5s6AIyBzuFNU2xcjd5IotHuNf8itbl7qxlzT8YjMZ8R/0Wej7+l3i2 ptbTiZp7 Gagjs3EiCm0JCq496zwVx1st5KkAO0mrYB5hZZ//xpsEUrFCu/zGjgz0DBXt3l6QXb0wJtaEUO4szuVheTTFP8qHAaj5EWS0xIR5heNugralqKoVmbGgQYr7u96L1KDo10RP2krb8Yg+jPTU7BBVBQSrX/gc6c/a94sduolAiTNk74ZPt/6SmeKsD2cbHcCn37DqPTzo1GHGspkFa60ISP2z81M04yjyTJChwwKY7208PNwzk/sVw1dAwlm2CqBEzbJdMEicrQvtplCoP0bLtHrVli0/T2VELkEQKXm/sUooTXNH+sgkgNW0garBXZyKF1ra2qgrLOBVfZy6oIr2GrE+Va+qZMExrIZf+SI9COfZ4ZztGpXwJlHtj8JRCrAQmEwWj90ktwfXI5ty2FKovWMXKfvj1qqfeKXXmXhzG2JsWy38= 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: On 5/1/25 05:27, Alexei Starovoitov wrote: > 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) This cast seems unnecessary. Better not hide mistakes when using the local_trylock_init() macro. > > #define __spinlock_nested_bh_init(lock) \ > do { \