From patchwork Wed Feb 12 17:47:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13972261 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 39369C021A0 for ; Wed, 12 Feb 2025 17:47:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B9EF06B0099; Wed, 12 Feb 2025 12:47:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B4F4D6B009A; Wed, 12 Feb 2025 12:47:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9C8C46B009B; Wed, 12 Feb 2025 12:47:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7E8C36B0099 for ; Wed, 12 Feb 2025 12:47:25 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2D57680298 for ; Wed, 12 Feb 2025 17:47:25 +0000 (UTC) X-FDA: 83112024450.14.1E16F17 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by imf20.hostedemail.com (Postfix) with ESMTP id 442891C000F for ; Wed, 12 Feb 2025 17:47:23 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=LyaErl8f; spf=pass (imf20.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.216.54 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=1739382443; 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=D/5GHJ5ZlWxbBWSOntj3Q4tbIXaSzxWNYrjaOxT4m4uIW1flVuRKNAWlqFZPVhn6Snb9Bq T0A7/owlykk0bfeITApp8K4516QiHxfrXeCdaoYOIkT2lTV024B+13sn9DRtYpNzhQyd6G Otrl/1IXpQXO4xSwvd3KKr97ESZHy4Q= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=LyaErl8f; spf=pass (imf20.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.216.54 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=1739382443; a=rsa-sha256; cv=none; b=0p/SNDPFGv3PECIsKr04BJ6wLfaEejez8FIBq8F/EVp6e/D3lIDJfR2ECUUn597Zt6kTXu I0sD00tZ8l3VfJtQ68/rruRyISdhaOsx03O+bFVRePURvPM216SJ8t3Lx2FkeQhMZ8Ff/z s/1BJWOvtQJ5Q15h71XG9Cg94iI/EPY= Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2fa1c093d6eso94861a91.0 for ; Wed, 12 Feb 2025 09:47:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739382442; x=1739987242; 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=LyaErl8fA54tj9Zq4xjb4dZ6zReLJrjRZyQdkL2a/tpD/uyjU9UIIs1+oel0yPKdKI JAhQzCGOQrk8wsZteb5FWl+I/jrAEq7naVzi63I7WZ0qFqy5YKjTWygRmIiL9ahPD0Xo /8qjd5Anzw8lYny1/Xw8CDJbVBNh+Qr8MSAF9O2n5tsReZlIA9xKs/3Ip17UcuL+dm8N Bp7ajVk7Du8kCw6K2yysJdqMTAzJtXQmEhQfVxX6wEzJJhI5xIsPhk1dLiYjBvKVWpky /VaZ865uEfprIYPcM57LGEWXYquu8yfmxuyMF2nu9iFveGUZ0EZSbcA2Yfp+iEKDy8Tl ZQqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739382442; x=1739987242; 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=qFbNsfqgb6atoCLV6YH+4AMyronK/YtQWj7IFIYucb7mbK1m7jefsze/1NJ3mYQg8e R3XI1AWQvoCf4Q4/E1l6dLy4cFnPQApBI6AzXAaKyoStfqQHo4rAAg4k3eyUQ3UsMI7A Qtc8/Eufbpw9YGqck7+vw4DaNW4jA63ED7gixkrO3/MXsiERjL+fJ6mUah86ab/fwmgg XtSqV8WdYMluN0lJVo4AiNc25SdwjHZZoM7W/kc8JvjTI6QklY4yBNEKFmVaYtyKiPYx afktNqcXlQaqxWOZRdD/p0xBJloUXcJhccoigKG4xNQPZhp0ia05MDPQyDRhENtZOETg uSnw== X-Forwarded-Encrypted: i=1; AJvYcCXyDH0WZSJLaKgptUdVeY+2q8cpn8VAXK2TxwYiKc+6anBLdDC8uJvs6OLerRaE1MllzI/c7cZ+Ew==@kvack.org X-Gm-Message-State: AOJu0Ywv2dlFN8rwdsKZr7EmntktWI67RaVdtiHrWeWu5FRFB5mhDdvT dgyk/9Lio6+a/eWaXTXBBVl8cTBBwvFIsdrU4c6hbq6i6RPALoyV X-Gm-Gg: ASbGncv2bmuvUGjrB1GFpccAhFiWiDDM6GijIDZ/tPo/ggfrVKvlp2qpPbaRgGwpMxc vRmiyDXMFUELECygwUtk5gO459YDnJzPL/+ZBDsOUcVyRfjxoX/hwHQUzqushA8RwB6e2d4HW5J k7ycQszWCjWDOHKdnVMXElg5kn4GJe9+u4n8DT5H2yjtJOnLvSjcwSjTxWzgynhGvLI49p+Ga1v Yg8otsTiRwrlFlB3eG+2OawXLbdDGJ1YPp23ebkqPXHZqAMPNUpwJS7Imt74VO+JjbaTwSHvD/w zO/Au9WVU713P1Hi/ar9jLAas1N+KZ/GS9qRTqH8Cn9wBg== X-Google-Smtp-Source: AGHT+IFdzeREzMu6Nvpg1XZZgAM871rh2ju2mt7o2mzuvJjED9/Nt9+adPMlY6ggnat49bQIcDjxPQ== X-Received: by 2002:a17:90a:d00e:b0:2ee:d433:7c50 with SMTP id 98e67ed59e1d1-2fbf5c5a06dmr4937863a91.23.1739382441983; Wed, 12 Feb 2025 09:47:21 -0800 (PST) Received: from ast-mac.thefacebook.com ([2620:10d:c090:500::4:c330]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fbf9908835sm1805194a91.42.2025.02.12.09.47.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Feb 2025 09:47:21 -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, 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 v7 3/6] locking/local_lock: Introduce localtry_lock_t Date: Wed, 12 Feb 2025 09:47:02 -0800 Message-Id: <20250212174705.44492-4-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250212174705.44492-1-alexei.starovoitov@gmail.com> References: <20250212174705.44492-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 442891C000F X-Stat-Signature: 6mqfxezj35eyzayq3n7c8x5ioybyaitk X-HE-Tag: 1739382443-716558 X-HE-Meta: U2FsdGVkX1+H7mnFl5t412pJ6vhcTMCqy3WSaSPtPHTJHMkJn+8VACD2eiTe33oEZ20T+i8TCbBu6AFeTiuK5pDbgGnqOAtV2hQtuHZqmM46hrTDDpWFKS3fXCsQYz/5gm2IuKFQWOjswX8j0fWh7JSxift7At/S7Ie1etbRvm/wNhgxMF81AomnpbWVEt/rRKdHq8OascPQGgkbGxL+G0LZcgMH6wvI7qW2uhvaFbQR0iUsxrkK5QMNsBC424DDhEJ7/zDWqVvdJ9Af2PJ2B0HV8Tnu09LO4XuYwPcVLZclBk/+9JpXiMWYN3xVEaRXuPRzBn42cLgcTbcE2BqPaILxKRZCjG6q1cy31dMMebdTNLZdFC90Y+wUXOB3zp2qAfZOMjzh4HFGdS1g2Q/ZZgQwUNDryDf1qYORFzpTK6PtWZvQjzbfYV+XNARQSoLMNScjH10Al3v/e/wrzdWIYHC8OquLl7b5Bw9rQbeyQuB1gspqzo0eVBj8LuHkWZ8hZQNja4DQPEPS0I22JRkL+7acdcum3wjTA4uk2Uih3efkC/j6SlHWGMnxKdokyXNpfcWBZBszJZ/nkz2GipWXuJhr68dQLUBwilN+j5EmchUIS43UdjqOg1bJMYCMQlXJmHUCcvxEJZmgSl/fnxvR4zego6mEdt2a9QMLfcqFjVQZ1gINhVg96vd85qQ+vFzdFL81UO1OMmOA8auCC15aIVX02W/A9RkSpkRtOWuMWlq17rNuCP1ATSsIGLREEA53N9+FE1+TjpHYpfEirbQ0yWvkxmNL3efLECcuH+cFlU+XpUOuhDDvMaHriR+uDUZ6cqKoFfpvloa9S/uTNyRDrm6gajI6dF8NFcm5JFAqAhwINJRkAiK1R2N+ucvuhtgZpVabzNJkWcczKPJ+DO5vclR91OhEOTqQgz+C+ln58c7orAQb8iH0qfs1k4uZl7idGdlb0zN7cnJahjuFsSB aSyxBXL/ Gn4QiIq6vbPuq4a5nSV6r79JR1LFidmiTzEiYkmRVvGGRSbHOWWB3hI+PItEAJD8sGL2xDPyBRVESQwFUOYzhCuM/aAjr7q652Jq89XSivHBWuxAcw3P168pbrVjHqeTT8+gmvitnNpkKgsMnLFiMeW5sdhZy2VfuqWmjYMvS/Ojbw8pcUFsE4BvFtq8fSZ0/UmLR8jsVhBsOc4FVzIDrV0uWJWtsFQojzyMq8S9an65RNIVINNH0AT1vgaZldoeyJa0n/GjnRalyOxnVchPM6j1rqp187SGbJ/IJCWuw+j8Pd8rK0fXAQ2noPrpNwu1/FPAgSPnJp3+vyJfFSR7y00ACQ55O+y38VIgo3dEzuqfyWeAHb2Q4zxKp6dLM3nBa7fCWUxVLSTea2AV3s0x7QPxctu0SJgvF97lFCSq4sxkyRT++dzuvLn1IK+rOahpMVSIvuDNC84T/E5IaIYP5GwKVHntSFno+jlwU2EA4NXS+1MW1dGOkodoUsw== 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 */