From patchwork Sat Feb 22 02:44:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13986513 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 A9946C021B3 for ; Sat, 22 Feb 2025 02:44:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1AAAE6B0085; Fri, 21 Feb 2025 21:44:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 133966B0088; Fri, 21 Feb 2025 21:44:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA21D6B0089; Fri, 21 Feb 2025 21:44:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C60AD6B0085 for ; Fri, 21 Feb 2025 21:44:39 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 6C97FA2D50 for ; Sat, 22 Feb 2025 02:44:39 +0000 (UTC) X-FDA: 83146037478.15.7AE02D3 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by imf24.hostedemail.com (Postfix) with ESMTP id 869D3180006 for ; Sat, 22 Feb 2025 02:44:37 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ffzQzPQq; spf=pass (imf24.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.216.52 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740192277; a=rsa-sha256; cv=none; b=oNmVlFdBCkNwER5YUo34t8huKL1fv8RzzL0eYp43THbwk13zaeZvN4BFQ044nnMk4dWnZf F3irmnJMp2TSzdizKd1/kf9gyxBb5nHiOyElvTal5Jfd9whCVhD6n9A2t9V+6RrZK1h4NA 9WZpxNrX8RMquO98l+DhmU8C/+xw78w= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ffzQzPQq; spf=pass (imf24.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.216.52 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740192277; 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=Sk02Orm/sDWbmfQ5EAte0I5oPgAuhzQ+C9dMQxWikoo=; b=LVDRBQCXRoxNrugJ9aKEEMdSBh3BTrKhfSIkaxr42abvJ1Hncxl2DHpgupdMbXjgbNcfxY omMdXRMqT8qS1z2UCwPuaUDK3s57mjxOFFJlCtnNVVWRTEGKCmYo/rVg4CYa5/0ZisbvVA WfZQOpOl0WttDZVQH71NS9qUBwgsBlA= Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2fbffe0254fso5567446a91.3 for ; Fri, 21 Feb 2025 18:44:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740192276; x=1740797076; 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=Sk02Orm/sDWbmfQ5EAte0I5oPgAuhzQ+C9dMQxWikoo=; b=ffzQzPQqZryA9VtCclfBCKO5XWMRF0gOb4840S1gLTvECulaMLrwePUjuFdaGIhBRa XMRMZA++aJpGZlWIV/Ymd59qJkd2vPtZAjHSM566U1lumpGXhjUSfPi4C3ZQfC919B2h NUbl2duVwGQ2ilOqhzrnhNtEoe8PuiKLMhODmFLu4vnG+kL7AChNPIiu50iNy9H4puAn 3ewVcr//9IExk4rqRHvKwPtVUiQgBgHtOx76eB/Vg1tkydNtKjCtBIQd9pkOtWbO/G/d 4O4o26KTunDyT9T/W+unStkg0cYwOVeGf+vUWaenHprRjsj6MgWKJubVj5BQp5YzwST+ v3tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740192276; x=1740797076; 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=Sk02Orm/sDWbmfQ5EAte0I5oPgAuhzQ+C9dMQxWikoo=; b=IdgaiT45abHlekh8h/U4DezrMYEfSZr1KWr9FLY2ltDbtQc3Nxx4fQzFk1r0bWZ+FY 8NM/+Aza/LcdQfJoE0pzOxxA6iuusWXGObkqLjfunywtWxPtoRcQ6AoUDIvekq/5WH4s 18zxXQFuswf3wv0cr9BhJgTgPqoUdIZIrnPtFqln7cOFOUowd031Pl/KhsA0+jqGOm7u hfLb6O29RXJES+y7pS/tAOBceLFTAebAVMoxMXP/losUgiPDFZMRn4DUMCa+gTplmzE1 kn8PS9hlQMAKbgS7vYGy2s9f6l8G74GqnBV2Gaz3fpCDBHGAO48cGsrwoDF0zur8f1DM 7nZQ== X-Forwarded-Encrypted: i=1; AJvYcCXe6cjcKJBoJnxyNUX8J3iwZGiHaLiULipyG2z00o1gXkTtYC6QKX0st/jJyv7FqvHg/oaPLBZHrw==@kvack.org X-Gm-Message-State: AOJu0Yxw1C5eaeP75skzLJ4O1mkMoaTU/3hHmDmnt/0q3zNQMTztodV/ yi9+HZB9c60Bg8H7etbiBLO1C9ZCf5KWBrAp4MCvWQQFbBdlcf8X X-Gm-Gg: ASbGncs0WKAhWRJQ0H20YxZeYFn92s2L5po8aeVs5laHqo3QXLDNSgz9gznYmtJSLIJ gGt3kFZOq48wFryf3mTJsgc379maAO5VDOGOqZC5HbWwFIoVP9022Y9BW+aVC3TxO2JgKjkeJgM cTtPVRLJJw5d2zDybQqlU+6CVHjk2qDskjsrfBDTa+r8zaBAJiNjgM6m9oa7+BnIOsJaBv0ybXI 3JHI8znumgo/ZwOBSxT2FDfexSKf6VpU0m0gUIF2VQGmD8UtOOxwTxTShus7m12Ck36RScyHf4v 0DMJgcP9qSn8YlTL3gb3i/vL9hRPf4ZQ6Y9TU9PkzVWQcDm+LC9WdA== X-Google-Smtp-Source: AGHT+IGlSaTzpWPllvJGdoZ8RptnpXSPkTv04MwCkc6eCe1wznNZ2YqQBDcM5ibR5tXrH+w8nZ0TTA== X-Received: by 2002:a05:6a00:4fc4:b0:730:7771:39c6 with SMTP id d2e1a72fcca58-73426cab09emr10492884b3a.8.1740192276435; Fri, 21 Feb 2025 18:44:36 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::5:fd1b]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73242546158sm17069167b3a.16.2025.02.21.18.44.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 21 Feb 2025 18:44:36 -0800 (PST) From: Alexei Starovoitov To: bpf@vger.kernel.org Cc: andrii@kernel.org, memxor@gmail.com, akpm@linux-foundation.org, peterz@infradead.org, vbabka@suse.cz, bigeasy@linutronix.de, rostedt@goodmis.org, houtao1@huawei.com, hannes@cmpxchg.org, shakeel.butt@linux.dev, mhocko@suse.com, willy@infradead.org, tglx@linutronix.de, jannh@google.com, tj@kernel.org, linux-mm@kvack.org, kernel-team@fb.com Subject: [PATCH bpf-next v9 1/6] locking/local_lock: Introduce localtry_lock_t Date: Fri, 21 Feb 2025 18:44:22 -0800 Message-Id: <20250222024427.30294-2-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250222024427.30294-1-alexei.starovoitov@gmail.com> References: <20250222024427.30294-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 869D3180006 X-Stat-Signature: hn863xm187wgpa6wkpis5p79q8bc5bsw X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1740192277-500115 X-HE-Meta: U2FsdGVkX19p4ZnP723L6nVJ1ujsdu3USToJ+5p9QcKaF23yc2eRrA9hp00uXZBEcvKhrQe+mpIyLar+GZrYfJoVQmVafryWa7H/DRTr+GTY2H+bXvipvEzLqtGnyNymf7BMx7Vd3qYYu9tapAD+Pi5kyAuMS9itiPaxXoDCv8AGT9lbSkjTVGoCSbk2nHkEI5CoCR+BpqcUSUyLsF0iJxioKnXT2rRuUjVFD4OtrI7zgbU0a8oU++rQTKesz+uhi+l2W3QX7wkkHk+Mm3wn0bfdNrUwZU23ZzmCFGXPQfkG4aoYJCbZN+5fyAmYZjXZ8/7qZBFcFTc/QoKbA/Akd1RwUkaJhSC9bxjPr37CMXCja7b/yS6HVvJVhmJemXHXkUDGbcXUc0shW92lRMixev2U0GI4RGj4eaSlpGNtNVlPs9h/JLUMexOsgZjQsDh6uOgUH63tBLQvQXoX0RdpIUqc2vtag/GiUZ/QxUUuYP88UbckD+E7TM1Txn+ukmRDM4O5b23tsLUFbjNEajdceiLzpGsWmr1TjvuZl+skxikt2uKGTX+PTpIX1W+pkgi+mN+WW9OoJv2WIVE1NuGn1yFQLkme2bkyIXAVWW853+nFwm9NXwWfOwKws7wkx6FM0TUcdE+D3BJqUZO1URtoOkrzAZQb1QQjtsegd2m/NzyDirYUBmqts3uWqjgk2OvX8vK3v2HeFCMFWlLZ5QyOas3SZi2vTDBGn8OZDOMWDOmO3bt5vVpYlsgKugza6SJYStw7h+5JvKo2Bj3uSydJy/X29NqYMEXH02RV5lW1InXhxX/UeiEcTjMtvPM7FbzdVQl9H5KDq7YTs+NNFhH3MXM7+fkwIA+BluaHiRiTZLe61A5UppbiXi/nogOPjSWXtDxXZwJtk2mZYO1NUlpyci2n98v5rCGHfveeD1r/jmSIyJ6jthPueGQdXwIX9ZvaXh5XR9mAZtXOGySO2AP N5g5MmnH fV3dZtKqMoSEGAjwO25O2P28GjFb9t+LSJMG4NWSKMHOEQ/kpltd2y++/4gSnRsSrCsLXcqyZh+Rq2EJSKv8yrm8E82VO2Kc4O+mD6Wko+fjuZXg4pJvhOLAmd/rUIPo39falfssQtEBzBira7ahfQ6xYImIvIqfNGSqODznmOkZUcTgcBYIFCQCzuCRCWINhARVToPuT/9Z7lj4cEJSB8q5vvS5aUy7bYZAlvjziYXicK7p3WhirKHnal4G/HRt0EpkcZBvfqTQ2Bl82a4U0fV2g0wXuGT4Js02ehrVJYcmOrNJmadcZ9QPe9cZDTrSMOm0bFSelyVjBVNJCvvouYTOJnNj1PeITS1VyF9AFEBmYcomQZlDGA+q3/7muqsDV0crdwNc2dlf9KgojjGi0YpTZFFfZ54DsTgeBTYYgT9VVE3A4wcU8wEu/ISSCh5vPjP6VUbvjPgHZg3APKDpWOVyt/OwZx5EMvJ4rvHqVtiO7J7IeSt5AylsozQ== 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: Sebastian Andrzej Siewior In !PREEMPT_RT local_lock_irqsave() disables interrupts to protect critical section, but it doesn't prevent NMI, so the fully reentrant code cannot use local_lock_irqsave() for exclusive access. Introduce localtry_lock_t and localtry_lock_irqsave() that disables interrupts and sets acquired=1, so localtry_lock_irqsave() from NMI attempting to acquire the same lock will return false. In PREEMPT_RT local_lock_irqsave() maps to preemptible spin_lock(). Map localtry_lock_irqsave() to preemptible spin_trylock(). When in hard IRQ or NMI return false right away, since spin_trylock() is not safe due to explicit locking in the underneath rt_spin_trylock() implementation. Removing this explicit locking and attempting only "trylock" is undesired due to PI implications. Note there is no need to use local_inc for acquired variable, since it's a percpu variable with strict nesting scopes. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Vlastimil Babka Signed-off-by: Alexei Starovoitov --- include/linux/local_lock.h | 70 +++++++++++++ include/linux/local_lock_internal.h | 146 ++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+) diff --git a/include/linux/local_lock.h b/include/linux/local_lock.h index 091dc0b6bdfb..1a0bc35839e3 100644 --- a/include/linux/local_lock.h +++ b/include/linux/local_lock.h @@ -51,6 +51,76 @@ #define local_unlock_irqrestore(lock, flags) \ __local_unlock_irqrestore(lock, flags) +/** + * localtry_lock_init - Runtime initialize a lock instance + */ +#define localtry_lock_init(lock) __localtry_lock_init(lock) + +/** + * localtry_lock - Acquire a per CPU local lock + * @lock: The lock variable + */ +#define localtry_lock(lock) __localtry_lock(lock) + +/** + * localtry_lock_irq - Acquire a per CPU local lock and disable interrupts + * @lock: The lock variable + */ +#define localtry_lock_irq(lock) __localtry_lock_irq(lock) + +/** + * localtry_lock_irqsave - Acquire a per CPU local lock, save and disable + * interrupts + * @lock: The lock variable + * @flags: Storage for interrupt flags + */ +#define localtry_lock_irqsave(lock, flags) \ + __localtry_lock_irqsave(lock, flags) + +/** + * localtry_trylock - Try to acquire a per CPU local lock. + * @lock: The lock variable + * + * The function can be used in any context such as NMI or HARDIRQ. Due to + * locking constrains it will _always_ fail to acquire the lock in NMI or + * HARDIRQ context on PREEMPT_RT. + */ +#define localtry_trylock(lock) __localtry_trylock(lock) + +/** + * localtry_trylock_irqsave - Try to acquire a per CPU local lock, save and disable + * interrupts if acquired + * @lock: The lock variable + * @flags: Storage for interrupt flags + * + * The function can be used in any context such as NMI or HARDIRQ. Due to + * locking constrains it will _always_ fail to acquire the lock in NMI or + * HARDIRQ context on PREEMPT_RT. + */ +#define localtry_trylock_irqsave(lock, flags) \ + __localtry_trylock_irqsave(lock, flags) + +/** + * local_unlock - Release a per CPU local lock + * @lock: The lock variable + */ +#define localtry_unlock(lock) __localtry_unlock(lock) + +/** + * local_unlock_irq - Release a per CPU local lock and enable interrupts + * @lock: The lock variable + */ +#define localtry_unlock_irq(lock) __localtry_unlock_irq(lock) + +/** + * localtry_unlock_irqrestore - Release a per CPU local lock and restore + * interrupt flags + * @lock: The lock variable + * @flags: Interrupt flags to restore + */ +#define localtry_unlock_irqrestore(lock, flags) \ + __localtry_unlock_irqrestore(lock, flags) + DEFINE_GUARD(local_lock, local_lock_t __percpu*, local_lock(_T), local_unlock(_T)) diff --git a/include/linux/local_lock_internal.h b/include/linux/local_lock_internal.h index 8dd71fbbb6d2..67bd13d142fa 100644 --- a/include/linux/local_lock_internal.h +++ b/include/linux/local_lock_internal.h @@ -15,6 +15,11 @@ typedef struct { #endif } local_lock_t; +typedef struct { + local_lock_t llock; + unsigned int acquired; +} localtry_lock_t; + #ifdef CONFIG_DEBUG_LOCK_ALLOC # define LOCAL_LOCK_DEBUG_INIT(lockname) \ .dep_map = { \ @@ -31,6 +36,13 @@ static inline void local_lock_acquire(local_lock_t *l) l->owner = current; } +static inline void local_trylock_acquire(local_lock_t *l) +{ + lock_map_acquire_try(&l->dep_map); + DEBUG_LOCKS_WARN_ON(l->owner); + l->owner = current; +} + static inline void local_lock_release(local_lock_t *l) { DEBUG_LOCKS_WARN_ON(l->owner != current); @@ -45,11 +57,13 @@ static inline void local_lock_debug_init(local_lock_t *l) #else /* CONFIG_DEBUG_LOCK_ALLOC */ # define LOCAL_LOCK_DEBUG_INIT(lockname) static inline void local_lock_acquire(local_lock_t *l) { } +static inline void local_trylock_acquire(local_lock_t *l) { } static inline void local_lock_release(local_lock_t *l) { } static inline void local_lock_debug_init(local_lock_t *l) { } #endif /* !CONFIG_DEBUG_LOCK_ALLOC */ #define INIT_LOCAL_LOCK(lockname) { LOCAL_LOCK_DEBUG_INIT(lockname) } +#define INIT_LOCALTRY_LOCK(lockname) { .llock = { LOCAL_LOCK_DEBUG_INIT(lockname.llock) }} #define __local_lock_init(lock) \ do { \ @@ -118,6 +132,104 @@ do { \ #define __local_unlock_nested_bh(lock) \ local_lock_release(this_cpu_ptr(lock)) +/* localtry_lock_t variants */ + +#define __localtry_lock_init(lock) \ +do { \ + __local_lock_init(&(lock)->llock); \ + WRITE_ONCE((lock)->acquired, 0); \ +} while (0) + +#define __localtry_lock(lock) \ + do { \ + localtry_lock_t *lt; \ + preempt_disable(); \ + lt = this_cpu_ptr(lock); \ + local_lock_acquire(<->llock); \ + WRITE_ONCE(lt->acquired, 1); \ + } while (0) + +#define __localtry_lock_irq(lock) \ + do { \ + localtry_lock_t *lt; \ + local_irq_disable(); \ + lt = this_cpu_ptr(lock); \ + local_lock_acquire(<->llock); \ + WRITE_ONCE(lt->acquired, 1); \ + } while (0) + +#define __localtry_lock_irqsave(lock, flags) \ + do { \ + localtry_lock_t *lt; \ + local_irq_save(flags); \ + lt = this_cpu_ptr(lock); \ + local_lock_acquire(<->llock); \ + WRITE_ONCE(lt->acquired, 1); \ + } while (0) + +#define __localtry_trylock(lock) \ + ({ \ + localtry_lock_t *lt; \ + bool _ret; \ + \ + preempt_disable(); \ + lt = this_cpu_ptr(lock); \ + if (!READ_ONCE(lt->acquired)) { \ + WRITE_ONCE(lt->acquired, 1); \ + local_trylock_acquire(<->llock); \ + _ret = true; \ + } else { \ + _ret = false; \ + preempt_enable(); \ + } \ + _ret; \ + }) + +#define __localtry_trylock_irqsave(lock, flags) \ + ({ \ + localtry_lock_t *lt; \ + bool _ret; \ + \ + local_irq_save(flags); \ + lt = this_cpu_ptr(lock); \ + if (!READ_ONCE(lt->acquired)) { \ + WRITE_ONCE(lt->acquired, 1); \ + local_trylock_acquire(<->llock); \ + _ret = true; \ + } else { \ + _ret = false; \ + local_irq_restore(flags); \ + } \ + _ret; \ + }) + +#define __localtry_unlock(lock) \ + do { \ + localtry_lock_t *lt; \ + lt = this_cpu_ptr(lock); \ + WRITE_ONCE(lt->acquired, 0); \ + local_lock_release(<->llock); \ + preempt_enable(); \ + } while (0) + +#define __localtry_unlock_irq(lock) \ + do { \ + localtry_lock_t *lt; \ + lt = this_cpu_ptr(lock); \ + WRITE_ONCE(lt->acquired, 0); \ + local_lock_release(<->llock); \ + local_irq_enable(); \ + } while (0) + +#define __localtry_unlock_irqrestore(lock, flags) \ + do { \ + localtry_lock_t *lt; \ + lt = this_cpu_ptr(lock); \ + WRITE_ONCE(lt->acquired, 0); \ + local_lock_release(<->llock); \ + local_irq_restore(flags); \ + } while (0) + #else /* !CONFIG_PREEMPT_RT */ /* @@ -125,8 +237,10 @@ do { \ * critical section while staying preemptible. */ typedef spinlock_t local_lock_t; +typedef spinlock_t localtry_lock_t; #define INIT_LOCAL_LOCK(lockname) __LOCAL_SPIN_LOCK_UNLOCKED((lockname)) +#define INIT_LOCALTRY_LOCK(lockname) INIT_LOCAL_LOCK(lockname) #define __local_lock_init(l) \ do { \ @@ -169,4 +283,36 @@ do { \ spin_unlock(this_cpu_ptr((lock))); \ } while (0) +/* localtry_lock_t variants */ + +#define __localtry_lock_init(lock) __local_lock_init(lock) +#define __localtry_lock(lock) __local_lock(lock) +#define __localtry_lock_irq(lock) __local_lock(lock) +#define __localtry_lock_irqsave(lock, flags) __local_lock_irqsave(lock, flags) +#define __localtry_unlock(lock) __local_unlock(lock) +#define __localtry_unlock_irq(lock) __local_unlock(lock) +#define __localtry_unlock_irqrestore(lock, flags) __local_unlock_irqrestore(lock, flags) + +#define __localtry_trylock(lock) \ + ({ \ + int __locked; \ + \ + if (in_nmi() | in_hardirq()) { \ + __locked = 0; \ + } else { \ + migrate_disable(); \ + __locked = spin_trylock(this_cpu_ptr((lock))); \ + if (!__locked) \ + migrate_enable(); \ + } \ + __locked; \ + }) + +#define __localtry_trylock_irqsave(lock, flags) \ + ({ \ + typecheck(unsigned long, flags); \ + flags = 0; \ + __localtry_trylock(lock); \ + }) + #endif /* CONFIG_PREEMPT_RT */