From: "Paul E. McKenney" <paulmck@kernel.org>
To: rcu@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com,
rostedt@goodmis.org, "Paul E. McKenney" <paulmck@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Kent Overstreet <kent.overstreet@linux.dev>,
bpf@vger.kernel.org
Subject: [PATCH rcu v2] 12/20] srcu: Move SRCU Tree/Tiny definitions from srcu.h
Date: Thu, 30 Jan 2025 11:03:09 -0800 [thread overview]
Message-ID: <20250130190317.1652481-12-paulmck@kernel.org> (raw)
In-Reply-To: <1034ef54-b6b3-42bb-9bd8-4c37c164950d@paulmck-laptop>
There are a couple of definitions under "#ifdef CONFIG_TINY_SRCU"
in include/linux/srcu.h. There is no point in them being there,
so this commit moves them to include/linux/srcutiny.h and
include/linux/srcutree.c, thus eliminating that #ifdef.
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Kent Overstreet <kent.overstreet@linux.dev>
Cc: <bpf@vger.kernel.org>
---
include/linux/srcu.h | 10 +---------
include/linux/srcutiny.h | 3 +++
include/linux/srcutree.h | 1 +
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/include/linux/srcu.h b/include/linux/srcu.h
index 505f5bdce444..2bd0e24e9b55 100644
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
@@ -52,6 +52,7 @@ int init_srcu_struct(struct srcu_struct *ssp);
#define SRCU_READ_FLAVOR_SLOWGP SRCU_READ_FLAVOR_LITE
// Flavors requiring synchronize_rcu()
// instead of smp_mb().
+void __srcu_read_unlock(struct srcu_struct *ssp, int idx) __releases(ssp);
#ifdef CONFIG_TINY_SRCU
#include <linux/srcutiny.h>
@@ -64,15 +65,6 @@ int init_srcu_struct(struct srcu_struct *ssp);
void call_srcu(struct srcu_struct *ssp, struct rcu_head *head,
void (*func)(struct rcu_head *head));
void cleanup_srcu_struct(struct srcu_struct *ssp);
-int __srcu_read_lock(struct srcu_struct *ssp) __acquires(ssp);
-void __srcu_read_unlock(struct srcu_struct *ssp, int idx) __releases(ssp);
-#ifdef CONFIG_TINY_SRCU
-#define __srcu_read_lock_lite __srcu_read_lock
-#define __srcu_read_unlock_lite __srcu_read_unlock
-#else // #ifdef CONFIG_TINY_SRCU
-int __srcu_read_lock_lite(struct srcu_struct *ssp) __acquires(ssp);
-void __srcu_read_unlock_lite(struct srcu_struct *ssp, int idx) __releases(ssp);
-#endif // #else // #ifdef CONFIG_TINY_SRCU
void synchronize_srcu(struct srcu_struct *ssp);
#define SRCU_GET_STATE_COMPLETED 0x1
diff --git a/include/linux/srcutiny.h b/include/linux/srcutiny.h
index 6b1a7276aa4c..07a0c4489ea2 100644
--- a/include/linux/srcutiny.h
+++ b/include/linux/srcutiny.h
@@ -71,6 +71,9 @@ static inline int __srcu_read_lock(struct srcu_struct *ssp)
return idx;
}
+#define __srcu_read_lock_lite __srcu_read_lock
+#define __srcu_read_unlock_lite __srcu_read_unlock
+
static inline void synchronize_srcu_expedited(struct srcu_struct *ssp)
{
synchronize_srcu(ssp);
diff --git a/include/linux/srcutree.h b/include/linux/srcutree.h
index 55fa400624bb..ef3065c0cadc 100644
--- a/include/linux/srcutree.h
+++ b/include/linux/srcutree.h
@@ -207,6 +207,7 @@ struct srcu_struct {
#define DEFINE_SRCU(name) __DEFINE_SRCU(name, /* not static */)
#define DEFINE_STATIC_SRCU(name) __DEFINE_SRCU(name, static)
+int __srcu_read_lock(struct srcu_struct *ssp) __acquires(ssp);
void synchronize_srcu_expedited(struct srcu_struct *ssp);
void srcu_barrier(struct srcu_struct *ssp);
void srcu_torture_stats_print(struct srcu_struct *ssp, char *tt, char *tf);
--
2.40.1
next prev parent reply other threads:[~2025-01-30 19:03 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-16 20:21 [PATCH rcu 0/17] SRCU updates, including SRCU-fast Paul E. McKenney
2025-01-16 20:20 ` [PATCH rcu 01/17] srcu: Make Tiny SRCU able to operate in preemptible kernels Paul E. McKenney
2025-01-16 20:20 ` [PATCH rcu 02/17] srcu: Define SRCU_READ_FLAVOR_ALL in terms of symbols Paul E. McKenney
2025-01-16 20:20 ` [PATCH rcu 03/17] srcu: Use ->srcu_gp_seq for rcutorture reader batch Paul E. McKenney
2025-01-16 20:20 ` [PATCH rcu 04/17] srcu: Pull ->srcu_{un,}lock_count into a new srcu_ctr structure Paul E. McKenney
2025-01-16 20:21 ` [PATCH rcu 05/17] srcu: Make SRCU readers use ->srcu_ctrs for counter selection Paul E. McKenney
2025-01-16 20:21 ` [PATCH rcu 06/17] srcu: Make Tree SRCU updates independent of ->srcu_idx Paul E. McKenney
2025-01-16 20:21 ` [PATCH rcu 07/17] srcu: Force synchronization for srcu_get_delay() Paul E. McKenney
2025-01-16 20:21 ` [PATCH rcu 08/17] srcu: Rename srcu_check_read_flavor_lite() to srcu_check_read_flavor_force() Paul E. McKenney
2025-01-16 20:21 ` [PATCH rcu 09/17] srcu: Add SRCU_READ_FLAVOR_SLOWGP to flag need for synchronize_rcu() Paul E. McKenney
2025-01-16 20:21 ` [PATCH rcu 10/17] srcu: Pull pointer-to-integer conversion into __srcu_ptr_to_ctr() Paul E. McKenney
2025-01-16 20:21 ` [PATCH rcu 11/17] srcu: Pull integer-to-pointer conversion into __srcu_ctr_to_ptr() Paul E. McKenney
2025-01-16 20:21 ` [PATCH rcu 12/17] srcu: Move SRCU Tree/Tiny definitions from srcu.h Paul E. McKenney
2025-01-16 20:21 ` [PATCH rcu 13/17] srcu: Add SRCU-fast readers Paul E. McKenney
2025-01-16 21:00 ` Alexei Starovoitov
2025-01-16 21:38 ` Peter Zijlstra
2025-01-16 21:55 ` Paul E. McKenney
2025-01-16 22:58 ` Alexei Starovoitov
2025-01-16 21:52 ` Andrii Nakryiko
2025-01-16 22:54 ` Paul E. McKenney
2025-01-16 22:57 ` Andrii Nakryiko
2025-01-17 0:07 ` Paul E. McKenney
2025-01-16 20:21 ` [PATCH rcu 14/17] rcutorture: Add ability to test srcu_read_{,un}lock_fast() Paul E. McKenney
2025-01-16 20:21 ` [PATCH rcu 15/17] refscale: Add srcu_read_lock_fast() support using "srcu-fast" Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu 0/17] SRCU updates, including SRCU-fast Paul E. McKenney
2025-01-30 19:02 ` [PATCH rcu v2] 01/20] srcu: Make Tiny SRCU able to operate in preemptible kernels Paul E. McKenney
2025-01-30 19:02 ` [PATCH rcu v2] 02/20] srcu: Define SRCU_READ_FLAVOR_ALL in terms of symbols Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu v2] 03/20] srcu: Use ->srcu_gp_seq for rcutorture reader batch Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu v2] 04/20] srcu: Pull ->srcu_{un,}lock_count into a new srcu_ctr structure Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu v2] 05/20] srcu: Make SRCU readers use ->srcu_ctrs for counter selection Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu v2] 06/20] srcu: Make Tree SRCU updates independent of ->srcu_idx Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu v2] 07/20] srcu: Force synchronization for srcu_get_delay() Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu v2] 08/20] srcu: Rename srcu_check_read_flavor_lite() to srcu_check_read_flavor_force() Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu v2] 09/20] srcu: Add SRCU_READ_FLAVOR_SLOWGP to flag need for synchronize_rcu() Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu v2] 10/20] srcu: Pull pointer-to-integer conversion into __srcu_ptr_to_ctr() Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu v2] 11/20] srcu: Pull integer-to-pointer conversion into __srcu_ctr_to_ptr() Paul E. McKenney
2025-01-30 19:03 ` Paul E. McKenney [this message]
2025-01-30 19:03 ` [PATCH rcu v2] 13/20] srcu: Add SRCU-fast readers Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu v2] 14/20] rcutorture: Add ability to test srcu_read_{,un}lock_fast() Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu v2] 15/20] refscale: Add srcu_read_lock_fast() support using "srcu-fast" Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu v2] 18/20] srcu: Document that srcu_{read_lock,down_read}() can share srcu_struct Paul E. McKenney
2025-01-30 19:03 ` [PATCH rcu v2] 19/20] srcu: Add srcu_down_read_fast() and srcu_up_read_fast() Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250130190317.1652481-12-paulmck@kernel.org \
--to=paulmck@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=kent.overstreet@linux.dev \
--cc=kernel-team@meta.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rcu@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox