target/arm: Rewrite vector gather loads

[qemu.git] / iothread.c

diff --git a/iothread.c b/iothread.c
index 27a42885781aa7e5bcc251be34fbc9440545d989..aff128125769c384a019dfef8d6c354752600012 100644 (file)
--- a/iothread.c
+++ b/iothread.c
@@ -18,7 +18,8 @@
 #include "block/aio.h"
 #include "block/block.h"
 #include "sysemu/iothread.h"
 #include "block/aio.h"
 #include "block/block.h"
 #include "sysemu/iothread.h"

-#include "qmp-commands.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-misc.h"

 #include "qemu/error-report.h"
 #include "qemu/rcu.h"
 #include "qemu/main-loop.h"
 #include "qemu/error-report.h"
 #include "qemu/rcu.h"
 #include "qemu/main-loop.h"


@@ -30,11 +31,15 @@ typedef ObjectClass IOThreadClass;
 #define IOTHREAD_CLASS(klass) \
    OBJECT_CLASS_CHECK(IOThreadClass, klass, TYPE_IOTHREAD)
 
 #define IOTHREAD_CLASS(klass) \
    OBJECT_CLASS_CHECK(IOThreadClass, klass, TYPE_IOTHREAD)
 

+#ifdef CONFIG_POSIX

 /* Benchmark results from 2016 on NVMe SSD drives show max polling times around
  * 16-32 microseconds yield IOPS improvements for both iodepth=1 and iodepth=32
  * workloads.
  */
 #define IOTHREAD_POLL_MAX_NS_DEFAULT 32768ULL
 /* Benchmark results from 2016 on NVMe SSD drives show max polling times around
  * 16-32 microseconds yield IOPS improvements for both iodepth=1 and iodepth=32
  * workloads.
  */
 #define IOTHREAD_POLL_MAX_NS_DEFAULT 32768ULL

+#else
+#define IOTHREAD_POLL_MAX_NS_DEFAULT 0ULL
+#endif

 
 static __thread IOThread *my_iothread;
 
 
 static __thread IOThread *my_iothread;
 


@@ -55,7 +60,7 @@ static void *iothread_run(void *opaque)
     qemu_cond_signal(&iothread->init_done_cond);
     qemu_mutex_unlock(&iothread->init_done_lock);
 
     qemu_cond_signal(&iothread->init_done_cond);
     qemu_mutex_unlock(&iothread->init_done_lock);
 

-    while (!atomic_read(&iothread->stopping)) {
+    while (iothread->running) {

         aio_poll(iothread->ctx, true);
 
         if (atomic_read(&iothread->worker_context)) {
         aio_poll(iothread->ctx, true);
 
         if (atomic_read(&iothread->worker_context)) {


@@ -78,29 +83,26 @@ static void *iothread_run(void *opaque)
     return NULL;
 }
 
     return NULL;
 }
 

-void iothread_stop(IOThread *iothread)
+/* Runs in iothread_run() thread */
+static void iothread_stop_bh(void *opaque)

 {
 {

-    if (!iothread->ctx || iothread->stopping) {
-        return;
-    }
-    iothread->stopping = true;
-    aio_notify(iothread->ctx);
-    if (atomic_read(&iothread->main_loop)) {
+    IOThread *iothread = opaque;
+
+    iothread->running = false; /* stop iothread_run() */
+
+    if (iothread->main_loop) {

         g_main_loop_quit(iothread->main_loop);
     }
         g_main_loop_quit(iothread->main_loop);
     }

-    qemu_thread_join(&iothread->thread);

 }
 
 }
 

-static int iothread_stop_iter(Object *object, void *opaque)
+void iothread_stop(IOThread *iothread)

 {
 {

-    IOThread *iothread;
-
-    iothread = (IOThread *)object_dynamic_cast(object, TYPE_IOTHREAD);
-    if (!iothread) {
-        return 0;
+    if (!iothread->ctx || iothread->stopping) {
+        return;

     }
     }

-    iothread_stop(iothread);
-    return 0;
+    iothread->stopping = true;
+    aio_bh_schedule_oneshot(iothread->ctx, iothread_stop_bh, iothread);
+    qemu_thread_join(&iothread->thread);

 }
 
 static void iothread_instance_init(Object *obj)
 }
 
 static void iothread_instance_init(Object *obj)


@@ -115,16 +117,26 @@ static void iothread_instance_finalize(Object *obj)
     IOThread *iothread = IOTHREAD(obj);
 
     iothread_stop(iothread);
     IOThread *iothread = IOTHREAD(obj);
 
     iothread_stop(iothread);

+    /*
+     * Before glib2 2.33.10, there is a glib2 bug that GSource context
+     * pointer may not be cleared even if the context has already been
+     * destroyed (while it should).  Here let's free the AIO context
+     * earlier to bypass that glib bug.
+     *
+     * We can remove this comment after the minimum supported glib2
+     * version boosts to 2.33.10.  Before that, let's free the
+     * GSources first before destroying any GMainContext.
+     */
+    if (iothread->ctx) {
+        aio_context_unref(iothread->ctx);
+        iothread->ctx = NULL;
+    }

     if (iothread->worker_context) {
         g_main_context_unref(iothread->worker_context);
         iothread->worker_context = NULL;
     }
     qemu_cond_destroy(&iothread->init_done_cond);
     qemu_mutex_destroy(&iothread->init_done_lock);
     if (iothread->worker_context) {
         g_main_context_unref(iothread->worker_context);
         iothread->worker_context = NULL;
     }
     qemu_cond_destroy(&iothread->init_done_cond);
     qemu_mutex_destroy(&iothread->init_done_lock);

-    if (!iothread->ctx) {
-        return;
-    }
-    aio_context_unref(iothread->ctx);

 }
 
 static void iothread_complete(UserCreatable *obj, Error **errp)
 }
 
 static void iothread_complete(UserCreatable *obj, Error **errp)


@@ -134,6 +146,7 @@ static void iothread_complete(UserCreatable *obj, Error **errp)
     char *name, *thread_name;
 
     iothread->stopping = false;
     char *name, *thread_name;
 
     iothread->stopping = false;

+    iothread->running = true;

     iothread->thread_id = -1;
     iothread->ctx = aio_context_new(&local_error);
     if (!iothread->ctx) {
     iothread->thread_id = -1;
     iothread->ctx = aio_context_new(&local_error);
     if (!iothread->ctx) {


@@ -322,25 +335,6 @@ IOThreadInfoList *qmp_query_iothreads(Error **errp)
     return head;
 }
 
     return head;
 }
 

-void iothread_stop_all(void)
-{
-    Object *container = object_get_objects_root();
-    BlockDriverState *bs;
-    BdrvNextIterator it;
-
-    for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
-        AioContext *ctx = bdrv_get_aio_context(bs);
-        if (ctx == qemu_get_aio_context()) {
-            continue;
-        }
-        aio_context_acquire(ctx);
-        bdrv_set_aio_context(bs, qemu_get_aio_context());
-        aio_context_release(ctx);
-    }
-
-    object_child_foreach(container, iothread_stop_iter, NULL);
-}
-

 static gpointer iothread_g_main_context_init(gpointer opaque)
 {
     AioContext *ctx;
 static gpointer iothread_g_main_context_init(gpointer opaque)
 {
     AioContext *ctx;


@@ -380,3 +374,10 @@ void iothread_destroy(IOThread *iothread)
 {
     object_unparent(OBJECT(iothread));
 }
 {
     object_unparent(OBJECT(iothread));
 }

+
+/* Lookup IOThread by its id.  Only finds user-created objects, not internal
+ * iothread_create() objects. */
+IOThread *iothread_by_id(const char *id)
+{
+    return IOTHREAD(object_resolve_path_type(id, TYPE_IOTHREAD, NULL));
+}