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 D71EBC2D0CD for ; Mon, 19 May 2025 09:19:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AF4CB6B00AC; Mon, 19 May 2025 05:19:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B2F56B00AE; Mon, 19 May 2025 05:19:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 432B96B00AC; Mon, 19 May 2025 05:19:10 -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 0E6636B00AA for ; Mon, 19 May 2025 05:19:10 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4255E1D3C88 for ; Mon, 19 May 2025 09:19:10 +0000 (UTC) X-FDA: 83459108460.16.299ADA2 Received: from invmail4.hynix.com (exvmail4.hynix.com [166.125.252.92]) by imf04.hostedemail.com (Postfix) with ESMTP id 6DB7540005 for ; Mon, 19 May 2025 09:19:08 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf04.hostedemail.com: domain of byungchul@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=byungchul@sk.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747646348; a=rsa-sha256; cv=none; b=0Wt3W8Qr2u/bEy6kGrnlu1DRuIMgoQW6Eq55uBCfqhRrSsngmXRJzSsqqPVFi0nmmVaax+ OwEEqRRD+XulQ1iK4CQyHWOf7xsFpHc/YOTb6USXMdDVBRLjZYorTxu57ZvMQvUVhWj4Lp tNeIgFXClp3lmKMkxFA2YyWqMsxrekg= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf04.hostedemail.com: domain of byungchul@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=byungchul@sk.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747646348; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=mbXZuX7eEFadrScnxBR7aJpP7JEcRe/a8mTmVBQuKfk=; b=mtDSCv1Rgoo3w5+/WB9j0aicHU4MYh9ChC2YQ605OJVa2RnN3JlBKxGRWy0lgBcrPlrg/G d5QkmziRo9Y/cfh+lO1z7hhF2wC8chOFQ3V9rdfFgqsXB9ZZQmOcq0RxQMSP/eZ8OPGu8f C+q/+EPn5YFlrVpwNf7q8yAPT3auHoE= X-AuditID: a67dfc5b-681ff7000002311f-7c-682af76f65b6 From: Byungchul Park To: linux-kernel@vger.kernel.org Cc: kernel_team@skhynix.com, torvalds@linux-foundation.org, damien.lemoal@opensource.wdc.com, linux-ide@vger.kernel.org, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, will@kernel.org, tglx@linutronix.de, rostedt@goodmis.org, joel@joelfernandes.org, sashal@kernel.org, daniel.vetter@ffwll.ch, duyuyang@gmail.com, johannes.berg@intel.com, tj@kernel.org, tytso@mit.edu, willy@infradead.org, david@fromorbit.com, amir73il@gmail.com, gregkh@linuxfoundation.org, kernel-team@lge.com, linux-mm@kvack.org, akpm@linux-foundation.org, mhocko@kernel.org, minchan@kernel.org, hannes@cmpxchg.org, vdavydov.dev@gmail.com, sj@kernel.org, jglisse@redhat.com, dennis@kernel.org, cl@linux.com, penberg@kernel.org, rientjes@google.com, vbabka@suse.cz, ngupta@vflare.org, linux-block@vger.kernel.org, josef@toxicpanda.com, linux-fsdevel@vger.kernel.org, jack@suse.cz, jlayton@kernel.org, dan.j.williams@intel.com, hch@infradead.org, djwong@kernel.org, dri-devel@lists.freedesktop.org, rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, hamohammed.sa@gmail.com, harry.yoo@oracle.com, chris.p.wilson@intel.com, gwan-gyeong.mun@intel.com, max.byungchul.park@gmail.com, boqun.feng@gmail.com, longman@redhat.com, yskelg@gmail.com, yunseong.kim@ericsson.com, yeoreum.yun@arm.com, netdev@vger.kernel.org, matthew.brost@intel.com, her0gyugyu@gmail.com Subject: [PATCH v16 27/42] locking/lockdep: prevent various lockdep assertions when lockdep_off()'ed Date: Mon, 19 May 2025 18:18:11 +0900 Message-Id: <20250519091826.19752-28-byungchul@sk.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250519091826.19752-1-byungchul@sk.com> References: <20250519091826.19752-1-byungchul@sk.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWSa0yTdxTG/b93Oqqv79x8FRJNIyiYsbGoOZnTqDHhnxijG9nM5get8GZt xi2tFtEsoVqMA4uKqSi3Fhzl0jJL6wdAS5BLBzM4mB0CARTizJBiM6RVpNO1GL+cPHme8/zO l8ORQje9llNnHZc0WcoMBSOjZLPR1Z/kvExUfdathcD8eQoqbtoZGPjVhsB+S0/AdE8KPAz6 ECz2/0FCqWkAQfXkOAm3PBMI3PVnGHjwZDl4A34G+kxFDJy9cZOBwZkQAWNXSwiwOffDI+tT Cu5dqiGgdJqB8tKzRHj8Q8CCtZEFa34cTNWXsRCaTIa+iSEa3KOb4XrVGAN33H0UeFqmCHjQ VsHAhP0tDfc8vRQEi2Ng4LKRhqbnNQzMBK0kWAN+Fv7ssBDgsXwMDkMYeO7FGxp+M3YQcO6X ZgK8I7cRtJ9/TIDTPsRAV8BHgMtpIuF1XQ+CqeJZFgouLLBQri9GUFRwlQLD2FZYfBW+XDmf DHqzg4Km/4bQrh3YXmVHuMvnJ7HBlYtfB/5isDtoofDvNSJuLRtnsaF9lMUW5wnsqk/EN+5M E7h6LkBjZ+PPDHbOlbC4cNZL4Of377MHY7+XfZkuZah1kubTnUdlqh5/fM7IypNWv5HJR9YV hSiKE/kt4mybni5E3JJuajgVsRl+ozg8vEBG9Cp+vegyPg2vyDiSH/pAfFg5giLBh3y62DdT QEQ0xceJdd6/lzhyfpv4yhvzDr9OtDk6ljhRYXu0qGupKvBbRa+tioowRd4cJRa31tHvCmvE u/XD1CUkt6BljUhQZ+kyleqMLUmqvCz1yaS07EwnCv+W9afQ4RY0N5DaiXgOKaLlDneCSqCV Om1eZicSOVKxSt7o2qQS5OnKvFOSJvuI5kSGpO1EMRylWC3/PJibLvA/KI9LP0pSjqR5nxJc 1Np8tDthU3NZdkD7RKiJX1nx9faL374wdwfxZfOxDqPnC1fvkdjYtJLFfwftV3oM+1MPjGe3 6Jr3JTwKBR2mwdprTb41B476os3jG/otzx7n7uj9qq3yo28Ce8x7OFsKCjV8d4Y8ZC+f36sT TnvzTMKhNL7Wo1s9XNt/WtGqn5xOyVmuoLQqZXIiqdEq/wdVo8PjVwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAAzWSf0jTeRzG+3x/b3erb0vsWxLFoEwjS8p4R4cW3NWHoAgKgvojR35pI52y qZdRoTftUtOzyEaZNn80TWeuzcrKDXGprbid5fLXmaX0y9NarG2XP65rC/rn4eF5eL+ef94c Ka+nl3JqTaao1ShTFYyUku7eol+b/m+san1XeQwE/GcouNJiZqD3RhMCc2seARNdO2AgOIVg 9s+/SDCU9yKoHntOQmv3KAJ7w28M9L2aD56AlwFXeTED+toWBp5MzhEwcvE8AU3WXfDC9IaC x2U1BBgmGKgw6ImQvCNg2tTIgil3JYw3XGZhbiweXKP9NDgrXTTYh9fApaoRBtrtLgq628YJ 6Lt3hYFR8/80PO5+SEGwNAp6z5XQ0PyhhoHJoIkEU8DLwtMOIwHdxkiw5Ieopz99oaGnpIOA 03U3CfAM3UfgOPOSAKu5nwFnYIoAm7WchJn6LgTjpe9ZKDg7zUJFXimC4oKLFOSPJMDs59By pT8e8q5aKGj+rx9tTcTmKjPCzikvifNtv+KZwDMG24NGCj+qEfDdy89ZnO8YZrHRmoVtDbG4 tn2CwNW+AI2tjYUMtvrOs7jovYfAH9xuds+yA9KfUsRUdbaoXZeYLFV1eVdlDC08ZvKWMLnI tKAIcZzAbxSarx8vQhKO4aOFwcFpMuwj+BWCreQNXYSkHMn3/yAMVA6hcLGITxFckwVE2FP8 SqHe85oOc2T8JuGzJyocC/xyocnS8Y0jCcXDxc5vp3I+QfA0VVFlSGpE8xpRhFqTnaZUpybE 6Y6qcjTqY3GH09OsKPQ+ppNz59qQv29HJ+I5pPhRZrHHqOS0MluXk9aJBI5URMgabatVclmK Mue4qE0/pM1KFXWdKIqjFItlO/eLyXL+iDJTPCqKGaL2e0twkqW5CCI/bQje8vmXrB2ovp0+ 6FYeLGv4pT1Wc2P3/X+cQ75HSXfMPbprM9QfFmdFouOLbJ17hVvVI3PsM2j00TbptgeFT/QZ hbrsJRsLObzmmu/FljZHpn/MsP1A3KmUvdExSZH+C5Tz5onew3/XXdgsefv7vaTW/cm1WZbp lp9nJeijgtKplPGxpFan/Ar3k/K5OgMAAA== X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 6DB7540005 X-Stat-Signature: kiqad6wy8fr4zem1j1sjhyes37jykn8j X-HE-Tag: 1747646348-750129 X-HE-Meta: U2FsdGVkX1/a3Huc74e6QVE76B0sK3AmTqoD6Q60hXn9P4ky86rDbdroKjpD3zt7lfrEVSUb9mLoMx9ABzBfqnvIDKpCYr0I/O5OVf1w2w7yv0ylS9IA7GXq9MobTXoG/x3qW3i4BZrUVqKL2PRpzHXpKTuDupxYKc8c/C6Y8QwjYBjeV+jcT525vWESCIoCwjoEbupl2fHoP0CjKJpq2NB5xRwrdJTY9cZK/8ehWVRbFOhzaJ/dCTFzIP50NSQEh3xQ1g1XJ9MAQdWIWAyxrG9tHLkb8pWUGNYmbT6lblhB3P1ZrRJv8qAWYXXmbFGviXVnkXCnNszAJciDSFl1+YQUgoDwKGhUxitx1C2k7+J6SpzJtUYoc1BcUYzpWD5ii1cD1BO4rr6RHxtl2CcHRtVOaFftXyvE8qmV2ACYyz1EKyw847Ae2AeHh022BioolK2pyzcyBE8tXZmi4qJn8WXKTHhP3p7ll5+JNQSKk6CkCa/mv4YFsaj6b/0uu3EFfOsLyCzUncbMJYaW2yRVWiwBHhIEaETS+G6GDddRPKZ37cOPHp5JaOM/OkD+wG4SCxX4KV42xLAvjSSIEWm0a2yQPBGu33nfpgu4JJScdhgErYHCX+9yH9s9vQZ37slq5A9uOgo3EmOsaTM0CnKjWr6mrxFbQC8mQ0ZdvlicaJLR6Kw7CJC/3qw142KIqmtfROuoLd62bnCx4FiZcPkWxo5bhOlpUE3VZnTLbPrS62VihZamY5D1qmNZeybL+1QUM80xQEf7ShFENJgmnyHffI6WcSviQHToUiTsyq/qETaZhjJm++XY7CQHvZlCh86yzTcCTwscsAJEVlKvAbae6GRWEumRsygLMsog/StG43dibigZboCAyFcZkhOLlmYpkJqVf3nsZHoG2kjji5Jv+el1Vl22p5uUidvNM2py3HeFL6o0Zu3D0O4cLDSG//v19dz4dmBGFdoI8py8ON4 uArJxcGi NTjRPesUEiUIxwMBaiEl/n2ouEgUFPM9QKk9/ZO2zKdrWWrqJCHxMiEx9pske03Yc0mLn5p+RQ3z3/Dswv9KmPULhJGkEr8wSXQVpE8QU3laeiluh1leNF9R3dASVuG3enKG74Ud4pFHPvMzOqy8JW6w2T9M/nAME78IAAo/7OglLgA2m3ZcaFvdWJiWNFbrQIzBnMPPA90FE4M3XmbvRRSMYCgTqCPndSHCh7VoqnUfIQmU3xZsCt/HA+8eM+CvY0pug 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: lockdep provides APIs for assertion only if lockdep is enabled at the moment asserting to avoid unnecessary confusion, using the following condition, debug_locks && !this_cpu_read(lockdep_recursion). However, lockdep_{off,on}() are also used for disabling and enabling lockdep for a simular purpose. Add !lockdep_recursing(current) that is updated by lockdep_{off,on}() to the condition so that the assertions are aware of !__lockdep_enabled if lockdep_off()'ed. Signed-off-by: Byungchul Park --- include/linux/lockdep.h | 3 ++- kernel/locking/lockdep.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index ef03d8808c10..c83fe95199db 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -303,6 +303,7 @@ extern void lock_unpin_lock(struct lockdep_map *lock, struct pin_cookie); lockdep_assert_once(!current->lockdep_depth) #define lockdep_recursing(tsk) ((tsk)->lockdep_recursion) +extern bool lockdep_recursing_current(void); #define lockdep_pin_lock(l) lock_pin_lock(&(l)->dep_map) #define lockdep_repin_lock(l,c) lock_repin_lock(&(l)->dep_map, (c)) @@ -630,7 +631,7 @@ DECLARE_PER_CPU(int, hardirqs_enabled); DECLARE_PER_CPU(int, hardirq_context); DECLARE_PER_CPU(unsigned int, lockdep_recursion); -#define __lockdep_enabled (debug_locks && !this_cpu_read(lockdep_recursion)) +#define __lockdep_enabled (debug_locks && !this_cpu_read(lockdep_recursion) && !lockdep_recursing_current()) #define lockdep_assert_irqs_enabled() \ do { \ diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 6c984a55d5ed..d2805ce250cb 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -6889,3 +6889,13 @@ void lockdep_rcu_suspicious(const char *file, const int line, const char *s) warn_rcu_exit(rcu); } EXPORT_SYMBOL_GPL(lockdep_rcu_suspicious); + +/* + * For avoiding header dependency when using (struct task_struct *)current + * and lockdep_recursing() at the same time. + */ +noinstr bool lockdep_recursing_current(void) +{ + return lockdep_recursing(current); +} +EXPORT_SYMBOL_GPL(lockdep_recursing_current); -- 2.17.1