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 897D0C0219D for ; Thu, 13 Feb 2025 03:36:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 19DA2280006; Wed, 12 Feb 2025 22:36:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B0F9280003; Wed, 12 Feb 2025 22:36:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E46DD280006; Wed, 12 Feb 2025 22:36:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id BE0F4280003 for ; Wed, 12 Feb 2025 22:36:12 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7CFBBC015E for ; Thu, 13 Feb 2025 03:36:12 +0000 (UTC) X-FDA: 83113508184.01.691AFE3 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf13.hostedemail.com (Postfix) with ESMTP id 99C6520004 for ; Thu, 13 Feb 2025 03:36:10 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=no5oIz7u; spf=pass (imf13.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.214.176 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=1739417770; 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=Dxu1Rc7/sI72JB4NYxxk9elaSjOiJ9Td89bVV/zMYyc=; b=aJCh5kOOrsRSJfOqNbT/NyioxCANBeodgftfO+rOWu/fgUfhixY/GCHdCMIvrlwEWUlMsP r6XyR7fKM6Qumbi3eYJ3KXWWdYpPoK91SVBXPPtK6Yme9EXitm+Fle/Qn4G4SLd9BZbXkl C0joQC/FbRI0tlLBIee0S9pW0nM3YpM= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=no5oIz7u; spf=pass (imf13.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.214.176 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=1739417770; a=rsa-sha256; cv=none; b=UlQpoqU91vblcnoqIZruXao+IViocF5lxoR8S1N02J/Qs9Xibnx7asaioOJz5Q9nbfjiH4 UdiGK/TVJ8Ax6nVwxPH7FS8WXeu4wfaV8L0vA7PZxueYKUALlGk0nnFlKzexWPz8Vu8zAf VeF5n1ils5JiIE8PgDRvso+1C9zHP/8= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-220c8f38febso6285935ad.2 for ; Wed, 12 Feb 2025 19:36:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739417769; x=1740022569; 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=Dxu1Rc7/sI72JB4NYxxk9elaSjOiJ9Td89bVV/zMYyc=; b=no5oIz7uqdUdKUm+u0W7q7hNi8QatTi61gxB5UWDeD9bvxVPtE+cx3zv5WUsg3yhHX 92uop8h32JIGusfziQgOHhqAETWOlKXQKw6Fl1Bkosu+9JJyhgcx5KUagP6XUSoUSY91 EcJELH7jMUexXKaBPrpB0lAU1Qi1is/hW/p0+eMF3coJNGzkivF8jPqy5KFHpEs98wY0 fuxUf2fFCIGmp/3CQq4gsJMM2xJ/GITplgPIfPd6gUYL1GVlQ4muSXaITjgfkzlTqsJJ jU4Bqaq0d0lgE4SCiQ68cOqql295+YJ5FAd3wYBefobouRqb6YjD7fekp8tF5Mm02WlB NY3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739417769; x=1740022569; 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=Dxu1Rc7/sI72JB4NYxxk9elaSjOiJ9Td89bVV/zMYyc=; b=leZ6lQ67jINxgvKHqS/fF1OrAdajp7Fywk2psy8UscEK12N75wSyFWUIoVNWH8xcvl vZ+k0YdzWvTXrhjG9tTwVR9Fk+VGuWxM28OQBfhZrjZtICt+ogus764uCF1sWMs57aUE O8eQHTz1V5sqzDFzClNSOhKS6rJg5HbzKpwYp+gTxVPDyImzmk2SIPT3H69jk5rLV/vF sqnWV1HdZaUlfWnZJszi0nQp/HcR5l2R5HSBzjf7a2rEcKmChgTw1bfg6/I/WSLfxDXy PZuK8krqGJMV0zYlikKM8VoNmb1z/wnYiChp0nGSN5w126dLeiujI0K2WKxHpSHDUPvn gq7Q== X-Forwarded-Encrypted: i=1; AJvYcCVAUPwf0xM0cLNUdC/MwODd0wYULAFt+M7MZUpsQx4L2EjYoAl+LptNYpwOBbW2J/bIOoyxwm7HWA==@kvack.org X-Gm-Message-State: AOJu0Yzc20zUrdw8lL+Go8AP1+TF0cnsVPT/hgIrpqJQFTWyPUBEn8tM 6w0usKkfNxzMkXKCW9BQ5qTV8UGnIHAqYeCVPbd/Gp/qa/VCP+/j X-Gm-Gg: ASbGncvD0GmtY0OM05LwpUhQuixubQe0TAiQDKqxi5FgtgqTIpXhPjF49VkkdpbtvFL NNic/Oxec53jm73bboYCsUWrlHa0kvWeODjQpoRUiJkensUbib0jRUYI/iDrs2+R7UJANGm20MR llxEbIg+2AGK4pW5c9+Vlu+R3O9MZGCpTD2pAGocHPxhgQxFWlKapxabzwBYVTanSHE14bNNY85 EMvtF/om63BfueMQdu1raaNjp8cYowJSMHHfsgARetGNTMU7aJuaZeOgtzfBo7YJWnI+4r1W70T VDX9/AKdv2XXSWaS8brthDn0TtbiZ4ook2gzkY507l+7Tgp9zw== X-Google-Smtp-Source: AGHT+IF0oyIrki3EN7feLFgHfxItX3wzuThKb7cJwiTjjSoOQ/uGuke17pktF4EceH+U1SvptjTlvw== X-Received: by 2002:a17:902:c94b:b0:220:d1c3:2511 with SMTP id d9443c01a7336-220d1c327f5mr24489425ad.26.1739417769475; Wed, 12 Feb 2025 19:36:09 -0800 (PST) Received: from macbookpro.lan ([2603:3023:16e:5000:8af:ecd2:44cd:8027]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d556d6d2sm2693595ad.177.2025.02.12.19.36.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Feb 2025 19:36:09 -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 v8 3/6] locking/local_lock: Introduce localtry_lock_t Date: Wed, 12 Feb 2025 19:35:53 -0800 Message-Id: <20250213033556.9534-4-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250213033556.9534-1-alexei.starovoitov@gmail.com> References: <20250213033556.9534-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: kxho6xhta3e47ugmp5sfa8udgqc7o8cc X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 99C6520004 X-HE-Tag: 1739417770-849854 X-HE-Meta: U2FsdGVkX19IPa0mLYsAwW/gphEblCZiDV1l+lHw3Pzq5XR6WI3tCc3K1LioDgSFK97hA9Tmq4Bd5GefzeDgSVD6VmKB1nCotqq5YFE/ywbmxF7eHz8FJc+FztzRjI5uewkxabCNmMurhE2/diZkay72zWzmhVuY3cxEb6uCrz8S0Kkfn6Q3G9BonWyCcOlC0u4vb8/iQpmoyvqjeufB00glEHw0l+Hhjvv/FZYtDnnBd6899RXGsfoaK5tLuu1YkoTcVCy+pxvFGe8EOiLrjmsFLV1beGbwX9UHbZWIa5xAlzEzPJ1kBE3SrtFKXq1niQcRb2gmp4Rr1C4Ulhzagal9D/nE3FiByYiUMN7euYXXEVlay85QkTHYzdKfzFhcTWkWnL/J4cVIkDs+KJpmEBe1Z7YyacjGSoNPr+yOSXsFrdhtQh/xHQAONbrIJdbQdIjjWqp3FQb0TtVAbeOrbd23iO+3Xa2baphZpZf3AM+Mcwl1n/VAMyciIBcplBzDoCloNJLm3/bWe876RzjcTf+tx0Pyhmh9xpqWR/RYQX2tyfxJQ9fcppRTnpXUK8acCMYPTr423Dz8QTkzs4ir11Bbyqvj8vyJnV/k9TNeZ3LnexPJ3wGUwkhnW+5rh5U3nVTBnltwUSe9luTbLbvW1v6hdJkCss/tCqjO53f2CsFpbpqqEsQ/m+43mcn4LeurzG6nhmuBzLAdjP9/fT5utN+pYJY6s+ke1p6c+FmnhnLr4x6iK/W95A5sqeYVsHf60OIFy7HYQVjqxZkn7noIn7LKPsKZoUSmEP6adTYFcK1h5pCskiBF1cTrcZm2X+XRkEU7LdHZgY19+BeVi4RzS/iv2K0afOJ2DFO8ZCMt9OgXdoMmaT9JyWDxsmjuKU9ZPjgKXPPSnGVOnz8RlEI1qit1P1+u1GA+Cl2trvWRgNwgifFDAD2g+UFxKDgkAZjWvFq8CZQhpO/G9G8Wvek jrIGFHD5 TE9VTG6fC4UoiGzUPyYJnL2XALPjtkBbYYBLWdwBjkUAKGCCkwe8tlGHOO/K27fblW3QkXmxZ6T/XpEOc+wi6U7SaidRXd9nHxb5uG16QZsqCV3pGjRhLNq6cAmHdfu6gQ0e1LFZY+ds7+NEXonk7SOrhQronw5jZI6YcQ3Hlw6Pp822/NtOyk2sYRzDUzXq9GE9jn70K5iqZIcVrANFxIIrSY+pawJxAwEzLz60hDrmgQjAyYlRPXB3M2XBxI7NwmDq7FEPK1mJs+wHzdrcdMJF9t1mP3qSjzKrojcMiJIRHSFLMLDze4DnKuHVxw82sFeK2j+1+On+K8Ctd4jMmff4TKQocawpg25MrE/xoUxwg0Va/Pq8jRcNNMhbPDCgRtawqHWfdEcSHhKHSm9oh2VPMo2LcUjdm6Mc2d4MzYgwUFYQrghFMv3PiBJS54PuBSw1qfG2Zlzc3emwDRlHmzl1ICOhldgnpWSCc4TaBwyWNSViv9V/ylUXNUQ== 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 PI issues. 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: Alexei Starovoitov --- include/linux/local_lock.h | 59 +++++++++++++ include/linux/local_lock_internal.h | 123 ++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+) diff --git a/include/linux/local_lock.h b/include/linux/local_lock.h index 091dc0b6bdfb..05c254a5d7d3 100644 --- a/include/linux/local_lock.h +++ b/include/linux/local_lock.h @@ -51,6 +51,65 @@ #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_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 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..c1369b300777 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,86 @@ 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_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 +219,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 +265,31 @@ 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_irqsave(lock, flags) \ + ({ \ + int __locked; \ + \ + typecheck(unsigned long, flags); \ + flags = 0; \ + if (in_nmi() | in_hardirq()) { \ + __locked = 0; \ + } else { \ + migrate_disable(); \ + __locked = spin_trylock(this_cpu_ptr((lock))); \ + if (!__locked) \ + migrate_enable(); \ + } \ + __locked; \ + }) + #endif /* CONFIG_PREEMPT_RT */ -- 2.43.5