mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v4 3/8] common: move workqueue handling from poller_call() to sched()
Date: Tue, 22 Jun 2021 10:26:12 +0200	[thread overview]
Message-ID: <20210622082617.18011-4-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20210622082617.18011-1-a.fatoum@pengutronix.de>

Workqueues are run out of poller_call, not because of a dependency, but
because when they were added, poller_call was directly called from
is_timeout.

With the addition of bthreads, there is now a general resched() function
that runs pollers and switches between bthreads. It makes sense to move
workqueue handling there as well to keep scheduling matter contained in
a single function. Do so.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 common/Kconfig   |  5 +++++
 common/Makefile  |  1 +
 common/poller.c  | 23 ++++++++---------------
 common/sched.c   | 26 ++++++++++++++++++++++++++
 include/poller.h |  8 ++++++--
 include/sched.h  | 10 ++++------
 include/slice.h  |  6 ++----
 7 files changed, 52 insertions(+), 27 deletions(-)
 create mode 100644 common/sched.c

diff --git a/common/Kconfig b/common/Kconfig
index c7826f591a79..54f1eb633a32 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -997,11 +997,16 @@ config BAREBOXCRC32_TARGET
 	  'bareboxcrc32' is a userspacetool to generate the crc32 checksums the same way
 	  barebox does. Say yes here to build it for the target.
 
+config HAS_SCHED
+	bool
+
 config POLLER
 	bool "generic polling infrastructure"
+	select HAS_SCHED
 
 config BTHREAD
 	bool "barebox co-operative (green) thread infrastructure"
+	select HAS_SCHED
 	depends on HAS_ARCH_SJLJ
 	help
 	 barebox threads are lightweight cooperative (green) threads that are
diff --git a/common/Makefile b/common/Makefile
index 382a4f661f67..16582534ec47 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -50,6 +50,7 @@ extra-$(CONFIG_MODULES)		+= module.lds
 obj-$(CONFIG_OFTREE)		+= oftree.o
 obj-$(CONFIG_PARTITION_DISK)	+= partitions.o partitions/
 obj-$(CONFIG_PASSWORD)		+= password.o
+obj-$(CONFIG_HAS_SCHED)		+= sched.o
 obj-$(CONFIG_POLLER)		+= poller.o
 obj-$(CONFIG_BTHREAD)		+= bthread.o
 obj-$(CONFIG_RESET_SOURCE)	+= reset_source.o
diff --git a/common/poller.c b/common/poller.c
index 61da5698d225..0409d3cf8111 100644
--- a/common/poller.c
+++ b/common/poller.c
@@ -10,11 +10,14 @@
 #include <param.h>
 #include <poller.h>
 #include <clock.h>
-#include <work.h>
-#include <slice.h>
 
 static LIST_HEAD(poller_list);
-int poller_active;
+static int __poller_active;
+
+bool poller_active(void)
+{
+	return __poller_active;
+}
 
 int poller_register(struct poller_struct *poller, const char *name)
 {
@@ -110,23 +113,13 @@ int poller_async_unregister(struct poller_async *pa)
 void poller_call(void)
 {
 	struct poller_struct *poller, *tmp;
-	bool run_workqueues = !slice_acquired(&command_slice);
-
-	if (poller_active)
-		return;
-
-	command_slice_acquire();
-
-	if (run_workqueues)
-		wq_do_all_works();
 
-	poller_active = 1;
+	__poller_active = 1;
 
 	list_for_each_entry_safe(poller, tmp, &poller_list, list)
 		poller->func(poller);
 
-	command_slice_release();
-	poller_active = 0;
+	__poller_active = 0;
 }
 
 #if defined CONFIG_CMD_POLLER
diff --git a/common/sched.c b/common/sched.c
new file mode 100644
index 000000000000..dcf6522ac058
--- /dev/null
+++ b/common/sched.c
@@ -0,0 +1,26 @@
+/* SPDX License Identifier: GPL-2.0 */
+
+#include <bthread.h>
+#include <poller.h>
+#include <work.h>
+#include <slice.h>
+#include <sched.h>
+
+void resched(void)
+{
+	bool run_workqueues = !slice_acquired(&command_slice);
+
+	if (poller_active())
+		return;
+
+	command_slice_acquire();
+
+	if (run_workqueues)
+		wq_do_all_works();
+
+	poller_call();
+
+	command_slice_release();
+
+	bthread_reschedule();
+}
diff --git a/include/poller.h b/include/poller.h
index 371dafc6f8b8..6e51a0613356 100644
--- a/include/poller.h
+++ b/include/poller.h
@@ -7,6 +7,7 @@
 #define POLLER_H
 
 #include <linux/list.h>
+#include <linux/types.h>
 
 struct poller_struct {
 	void (*func)(struct poller_struct *poller);
@@ -39,11 +40,14 @@ static inline bool poller_async_active(struct poller_async *pa)
 	return pa->active;
 }
 
-extern int poller_active;
-
 #ifdef CONFIG_POLLER
+bool poller_active(void);
 void poller_call(void);
 #else
+static inline bool poller_active(void)
+{
+	return false;
+}
 static inline void poller_call(void)
 {
 }
diff --git a/include/sched.h b/include/sched.h
index 57be1678fdaa..4dadff20696e 100644
--- a/include/sched.h
+++ b/include/sched.h
@@ -2,14 +2,12 @@
 #ifndef __BAREBOX_SCHED_H_
 #define __BAREBOX_SCHED_H_
 
-#include <bthread.h>
-#include <poller.h>
-
+#ifdef CONFIG_HAS_SCHED
+void resched(void);
+#else
 static inline void resched(void)
 {
-	poller_call();
-	if (!IS_ENABLED(CONFIG_POLLER) || !poller_active)
-		bthread_reschedule();
 }
+#endif
 
 #endif
diff --git a/include/slice.h b/include/slice.h
index cf684300a809..67d47b9082e6 100644
--- a/include/slice.h
+++ b/include/slice.h
@@ -2,6 +2,7 @@
 #define __SLICE_H
 
 #include <bthread.h>
+#include <poller.h>
 
 enum slice_action {
 	SLICE_ACQUIRE = 1,
@@ -35,11 +36,8 @@ extern struct slice command_slice;
 void command_slice_acquire(void);
 void command_slice_release(void);
 
-extern int poller_active;
-
 #define assert_command_context() do { \
-	WARN_ONCE(IS_ENABLED(CONFIG_POLLER) && poller_active, \
-		  "%s called in poller\n", __func__); \
+	WARN_ONCE(poller_active(), "%s called in poller\n", __func__); \
 	WARN_ONCE(IS_ENABLED(CONFIG_BTHREAD) && !bthread_is_main(current), \
 		  "%s called in secondary bthread\n", __func__); \
 } while (0)
-- 
2.29.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


  parent reply	other threads:[~2021-06-22  8:27 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-22  8:26 [PATCH v4 0/8] usbgadget: add support for USB mass storage gadget Ahmad Fatoum
2021-06-22  8:26 ` [PATCH v4 1/8] input: virtio: poll from poller, not bthread Ahmad Fatoum
2021-06-22  8:26 ` [PATCH v4 2/8] bthread: add debug print for scheduler context switches Ahmad Fatoum
2021-06-22  8:26 ` Ahmad Fatoum [this message]
2021-06-22  8:26 ` [PATCH v4 4/8] common: bthread: schedule only in command context Ahmad Fatoum
2021-06-22  9:08   ` Ahmad Fatoum
2021-06-22  8:26 ` [PATCH v4 5/8] bthread: implement basic Linux-like completion API Ahmad Fatoum
2021-06-22  8:26 ` [PATCH v4 6/8] Documentation: devel: background-execution: update bthread docs Ahmad Fatoum
2021-06-22  8:26 ` [PATCH v4 7/8] usbgadget: refactor usbgadget_register to accept array Ahmad Fatoum
2021-06-22  8:26 ` [PATCH v4 8/8] usbgadget: add support for USB mass storage gadget Ahmad Fatoum
2021-06-25  7:34 ` [PATCH v4 0/8] " Sascha Hauer

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=20210622082617.18011-4-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --subject='Re: [PATCH v4 3/8] common: move workqueue handling from poller_call() to sched()' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox