From: "Pavel Begunkov (Silence)" <asml.silence@gmail.com>
To: Jens Axboe <axboe@kernel.dk>, Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Pavel Begunkov <asml.silence@gmail.com>
Subject: [RFC PATCH 1/2] sched/wait: Add wait_threshold
Date: Sat, 14 Sep 2019 01:28:01 +0300 [thread overview]
Message-ID: <a177257673556d7bc41cf9cbd25f24aceb7804d5.1568413210.git.asml.silence@gmail.com> (raw)
In-Reply-To: <cover.1568413210.git.asml.silence@gmail.com>
From: Pavel Begunkov <asml.silence@gmail.com>
Add wait_threshold -- a custom wait_event derivative, that waits until
a value is equal to or greater than the specified threshold.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
include/linux/wait_threshold.h | 64 ++++++++++++++++++++++++++++++++++
kernel/sched/Makefile | 2 +-
kernel/sched/wait_threshold.c | 26 ++++++++++++++
3 files changed, 91 insertions(+), 1 deletion(-)
create mode 100644 include/linux/wait_threshold.h
create mode 100644 kernel/sched/wait_threshold.c
diff --git a/include/linux/wait_threshold.h b/include/linux/wait_threshold.h
new file mode 100644
index 000000000000..01798c3aae1f
--- /dev/null
+++ b/include/linux/wait_threshold.h
@@ -0,0 +1,64 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_WAIT_THRESHOLD_H
+#define _LINUX_WAIT_THRESHOLD_H
+
+#include <linux/wait.h>
+
+struct wait_threshold_queue_entry {
+ struct wait_queue_entry wq_entry;
+ unsigned int threshold;
+};
+
+void init_wait_threshold_entry(struct wait_threshold_queue_entry *wtq_entry,
+ unsigned int threshold);
+
+static inline void wake_up_threshold(struct wait_queue_head *wq_head,
+ unsigned int val)
+{
+ void *arg = (void *)(unsigned long)val;
+
+ __wake_up(wq_head, TASK_NORMAL, 1, arg);
+}
+
+#define ___wait_threshold_event(q, thresh, condition, state, \
+ exclusive, ret, cmd) \
+({ \
+ __label__ __out; \
+ struct wait_queue_head *__wq_head = &q; \
+ struct wait_threshold_queue_entry __wtq_entry; \
+ struct wait_queue_entry *__wq_entry = &__wtq_entry.wq_entry; \
+ long __ret = ret; /* explicit shadow */ \
+ \
+ init_wait_threshold_entry(&__wtq_entry, thresh); \
+ for (;;) { \
+ long __int = prepare_to_wait_event(__wq_head, \
+ __wq_entry, \
+ state); \
+ if (condition) \
+ break; \
+ \
+ if (___wait_is_interruptible(state) && __int) { \
+ __ret = __int; \
+ goto __out; \
+ } \
+ \
+ cmd; \
+ } \
+ finish_wait(__wq_head, __wq_entry); \
+__out: __ret; \
+})
+
+#define __wait_threshold_interruptible(q, thresh, condition) \
+ ___wait_threshold_event(q, thresh, condition, TASK_INTERRUPTIBLE, 0, 0,\
+ schedule())
+
+#define wait_threshold_interruptible(q, threshold, val) \
+({ \
+ int __ret = 0; \
+ might_sleep(); \
+ if ((val) < (threshold)) \
+ __ret = __wait_threshold_interruptible(q, \
+ threshold, ((val) >= (threshold))); \
+ __ret; \
+})
+#endif /* _LINUX_WAIT_THRESHOLD_H */
diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile
index 21fb5a5662b5..bb895a3184f9 100644
--- a/kernel/sched/Makefile
+++ b/kernel/sched/Makefile
@@ -18,7 +18,7 @@ endif
obj-y += core.o loadavg.o clock.o cputime.o
obj-y += idle.o fair.o rt.o deadline.o
-obj-y += wait.o wait_bit.o swait.o completion.o
+obj-y += wait.o wait_bit.o wait_threshold.o swait.o completion.o
obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o topology.o stop_task.o pelt.o
obj-$(CONFIG_SCHED_AUTOGROUP) += autogroup.o
diff --git a/kernel/sched/wait_threshold.c b/kernel/sched/wait_threshold.c
new file mode 100644
index 000000000000..80a027c02ff3
--- /dev/null
+++ b/kernel/sched/wait_threshold.c
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include "sched.h"
+#include <linux/wait_threshold.h>
+
+static int wake_threshold_function(struct wait_queue_entry *wq_entry,
+ unsigned int mode, int sync, void *arg)
+{
+ unsigned int val = (unsigned int)(unsigned long)arg;
+ struct wait_threshold_queue_entry *wtq_entry =
+ container_of(wq_entry, struct wait_threshold_queue_entry,
+ wq_entry);
+
+ if (val < wtq_entry->threshold)
+ return 0;
+
+ return default_wake_function(wq_entry, mode, sync, arg);
+}
+
+void init_wait_threshold_entry(struct wait_threshold_queue_entry *wtq_entry,
+ unsigned int threshold)
+{
+ init_wait_entry(&wtq_entry->wq_entry, 0);
+ wtq_entry->wq_entry.func = wake_threshold_function;
+ wtq_entry->threshold = threshold;
+}
+EXPORT_SYMBOL(init_wait_threshold_entry);
--
2.22.0
next prev parent reply other threads:[~2019-09-13 22:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-13 22:28 [RFC PATCH 0/2] Optimise io_uring completion waiting Pavel Begunkov (Silence)
2019-09-13 22:28 ` Pavel Begunkov (Silence) [this message]
2019-09-13 22:28 ` [RFC PATCH 2/2] io_uring: Optimise cq waiting with wait_threshold Pavel Begunkov (Silence)
2019-09-14 0:31 ` [RFC PATCH 0/2] Optimise io_uring completion waiting Jens Axboe
2019-09-14 10:11 ` Pavel Begunkov
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=a177257673556d7bc41cf9cbd25f24aceb7804d5.1568413210.git.asml.silence@gmail.com \
--to=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.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;
as well as URLs for NNTP newsgroup(s).