user-exec: Push resume-from-signal code out to handle_cpu_signal()

[qemu.git] / blockjob.c

diff --git a/blockjob.c b/blockjob.c
index 62bb9066349345f05b764a1fd004f03dbaa84589..c095cc57cbf842a7c0da1809abd7554e4c813539 100644 (file)
--- a/blockjob.c
+++ b/blockjob.c
@@ -23,30 +23,58 @@
  * THE SOFTWARE.
  */
 
  * THE SOFTWARE.
  */
 

-#include "config-host.h"
+#include "qemu/osdep.h"

 #include "qemu-common.h"
 #include "trace.h"
 #include "block/block.h"
 #include "block/blockjob.h"
 #include "block/block_int.h"
 #include "qemu-common.h"
 #include "trace.h"
 #include "block/block.h"
 #include "block/blockjob.h"
 #include "block/block_int.h"

+#include "sysemu/block-backend.h"

 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qjson.h"

-#include "block/coroutine.h"
+#include "qemu/coroutine.h"

 #include "qmp-commands.h"
 #include "qemu/timer.h"
 #include "qapi-event.h"
 
 #include "qmp-commands.h"
 #include "qemu/timer.h"
 #include "qapi-event.h"
 

+/* Transactional group of block jobs */
+struct BlockJobTxn {
+
+    /* Is this txn being cancelled? */
+    bool aborting;
+
+    /* List of jobs */
+    QLIST_HEAD(, BlockJob) jobs;
+
+    /* Reference count */
+    int refcnt;
+};
+
+static QLIST_HEAD(, BlockJob) block_jobs = QLIST_HEAD_INITIALIZER(block_jobs);
+
+BlockJob *block_job_next(BlockJob *job)
+{
+    if (!job) {
+        return QLIST_FIRST(&block_jobs);
+    }
+    return QLIST_NEXT(job, job_list);
+}
+

 void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs,
                        int64_t speed, BlockCompletionFunc *cb,
                        void *opaque, Error **errp)
 {
 void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs,
                        int64_t speed, BlockCompletionFunc *cb,
                        void *opaque, Error **errp)
 {

+    BlockBackend *blk;

     BlockJob *job;
 
     if (bs->job) {
         error_setg(errp, QERR_DEVICE_IN_USE, bdrv_get_device_name(bs));
         return NULL;
     }
     BlockJob *job;
 
     if (bs->job) {
         error_setg(errp, QERR_DEVICE_IN_USE, bdrv_get_device_name(bs));
         return NULL;
     }

-    bdrv_ref(bs);
+
+    blk = blk_new();
+    blk_insert_bs(blk, bs);
+

     job = g_malloc0(driver->instance_size);
     error_setg(&job->blocker, "block device is in use by block job: %s",
                BlockJobType_lookup[driver->job_type]);
     job = g_malloc0(driver->instance_size);
     error_setg(&job->blocker, "block device is in use by block job: %s",
                BlockJobType_lookup[driver->job_type]);


@@ -54,19 +82,23 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs,
     bdrv_op_unblock(bs, BLOCK_OP_TYPE_DATAPLANE, job->blocker);
 
     job->driver        = driver;
     bdrv_op_unblock(bs, BLOCK_OP_TYPE_DATAPLANE, job->blocker);
 
     job->driver        = driver;

-    job->bs            = bs;
+    job->id            = g_strdup(bdrv_get_device_name(bs));
+    job->blk           = blk;

     job->cb            = cb;
     job->opaque        = opaque;
     job->busy          = true;
     job->cb            = cb;
     job->opaque        = opaque;
     job->busy          = true;

+    job->refcnt        = 1;

     bs->job = job;
 
     bs->job = job;
 

+    QLIST_INSERT_HEAD(&block_jobs, job, job_list);
+

     /* Only set speed when necessary to avoid NotSupported error */
     if (speed != 0) {
         Error *local_err = NULL;
 
         block_job_set_speed(job, speed, &local_err);
         if (local_err) {
     /* Only set speed when necessary to avoid NotSupported error */
     if (speed != 0) {
         Error *local_err = NULL;
 
         block_job_set_speed(job, speed, &local_err);
         if (local_err) {

-            block_job_release(bs);
+            block_job_unref(job);

             error_propagate(errp, local_err);
             return NULL;
         }
             error_propagate(errp, local_err);
             return NULL;
         }


@@ -74,23 +106,118 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs,
     return job;
 }
 
     return job;
 }
 

-void block_job_release(BlockDriverState *bs)
+void block_job_ref(BlockJob *job)

 {
 {

-    BlockJob *job = bs->job;
+    ++job->refcnt;
+}

 
 

-    bs->job = NULL;
-    bdrv_op_unblock_all(bs, job->blocker);
-    error_free(job->blocker);
-    g_free(job);
+void block_job_unref(BlockJob *job)
+{
+    if (--job->refcnt == 0) {
+        BlockDriverState *bs = blk_bs(job->blk);
+        bs->job = NULL;
+        bdrv_op_unblock_all(bs, job->blocker);
+        blk_unref(job->blk);
+        error_free(job->blocker);
+        g_free(job->id);
+        QLIST_REMOVE(job, job_list);
+        g_free(job);
+    }

 }
 
 }
 

-void block_job_completed(BlockJob *job, int ret)
+static void block_job_completed_single(BlockJob *job)
+{
+    if (!job->ret) {
+        if (job->driver->commit) {
+            job->driver->commit(job);
+        }
+    } else {
+        if (job->driver->abort) {
+            job->driver->abort(job);
+        }
+    }
+    job->cb(job->opaque, job->ret);
+    if (job->txn) {
+        block_job_txn_unref(job->txn);
+    }
+    block_job_unref(job);
+}
+
+static void block_job_completed_txn_abort(BlockJob *job)

 {
 {

-    BlockDriverState *bs = job->bs;
+    AioContext *ctx;
+    BlockJobTxn *txn = job->txn;
+    BlockJob *other_job, *next;
+
+    if (txn->aborting) {
+        /*
+         * We are cancelled by another job, which will handle everything.
+         */
+        return;
+    }
+    txn->aborting = true;
+    /* We are the first failed job. Cancel other jobs. */
+    QLIST_FOREACH(other_job, &txn->jobs, txn_list) {
+        ctx = blk_get_aio_context(other_job->blk);
+        aio_context_acquire(ctx);
+    }
+    QLIST_FOREACH(other_job, &txn->jobs, txn_list) {
+        if (other_job == job || other_job->completed) {
+            /* Other jobs are "effectively" cancelled by us, set the status for
+             * them; this job, however, may or may not be cancelled, depending
+             * on the caller, so leave it. */
+            if (other_job != job) {
+                other_job->cancelled = true;
+            }
+            continue;
+        }
+        block_job_cancel_sync(other_job);
+        assert(other_job->completed);
+    }
+    QLIST_FOREACH_SAFE(other_job, &txn->jobs, txn_list, next) {
+        ctx = blk_get_aio_context(other_job->blk);
+        block_job_completed_single(other_job);
+        aio_context_release(ctx);
+    }
+}

 
 

-    assert(bs->job == job);
-    job->cb(job->opaque, ret);
-    block_job_release(bs);
+static void block_job_completed_txn_success(BlockJob *job)
+{
+    AioContext *ctx;
+    BlockJobTxn *txn = job->txn;
+    BlockJob *other_job, *next;
+    /*
+     * Successful completion, see if there are other running jobs in this
+     * txn.
+     */
+    QLIST_FOREACH(other_job, &txn->jobs, txn_list) {
+        if (!other_job->completed) {
+            return;
+        }
+    }
+    /* We are the last completed job, commit the transaction. */
+    QLIST_FOREACH_SAFE(other_job, &txn->jobs, txn_list, next) {
+        ctx = blk_get_aio_context(other_job->blk);
+        aio_context_acquire(ctx);
+        assert(other_job->ret == 0);
+        block_job_completed_single(other_job);
+        aio_context_release(ctx);
+    }
+}
+
+void block_job_completed(BlockJob *job, int ret)
+{
+    assert(blk_bs(job->blk)->job == job);
+    assert(!job->completed);
+    job->completed = true;
+    job->ret = ret;
+    if (!job->txn) {
+        block_job_completed_single(job);
+    } else if (ret < 0 || block_job_is_cancelled(job)) {
+        block_job_completed_txn_abort(job);
+    } else {
+        block_job_completed_txn_success(job);
+    }

 }
 
 void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)
 }
 
 void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)


@@ -113,8 +240,7 @@ void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)
 void block_job_complete(BlockJob *job, Error **errp)
 {
     if (job->pause_count || job->cancelled || !job->driver->complete) {
 void block_job_complete(BlockJob *job, Error **errp)
 {
     if (job->pause_count || job->cancelled || !job->driver->complete) {

-        error_setg(errp, QERR_BLOCK_JOB_NOT_READY,
-                   bdrv_get_device_name(job->bs));
+        error_setg(errp, QERR_BLOCK_JOB_NOT_READY, job->id);

         return;
     }
 
         return;
     }
 


@@ -168,51 +294,30 @@ void block_job_iostatus_reset(BlockJob *job)
     }
 }
 
     }
 }
 

-struct BlockFinishData {
-    BlockJob *job;
-    BlockCompletionFunc *cb;
-    void *opaque;
-    bool cancelled;
-    int ret;
-};
-
-static void block_job_finish_cb(void *opaque, int ret)
-{
-    struct BlockFinishData *data = opaque;
-
-    data->cancelled = block_job_is_cancelled(data->job);
-    data->ret = ret;
-    data->cb(data->opaque, ret);
-}
-

 static int block_job_finish_sync(BlockJob *job,
                                  void (*finish)(BlockJob *, Error **errp),
                                  Error **errp)
 {
 static int block_job_finish_sync(BlockJob *job,
                                  void (*finish)(BlockJob *, Error **errp),
                                  Error **errp)
 {

-    struct BlockFinishData data;
-    BlockDriverState *bs = job->bs;

     Error *local_err = NULL;
     Error *local_err = NULL;

+    int ret;

 
 

-    assert(bs->job == job);
+    assert(blk_bs(job->blk)->job == job);

 
 

-    /* Set up our own callback to store the result and chain to
-     * the original callback.
-     */
-    data.job = job;
-    data.cb = job->cb;
-    data.opaque = job->opaque;
-    data.ret = -EINPROGRESS;
-    job->cb = block_job_finish_cb;
-    job->opaque = &data;
+    block_job_ref(job);

     finish(job, &local_err);
     if (local_err) {
         error_propagate(errp, local_err);
     finish(job, &local_err);
     if (local_err) {
         error_propagate(errp, local_err);

+        block_job_unref(job);

         return -EBUSY;
     }
         return -EBUSY;
     }

-    while (data.ret == -EINPROGRESS) {
-        aio_poll(bdrv_get_aio_context(bs), true);
+    while (!job->completed) {
+        aio_poll(job->deferred_to_main_loop ? qemu_get_aio_context() :
+                                              blk_get_aio_context(job->blk),
+                 true);

     }
     }

-    return (data.cancelled && data.ret == 0) ? -ECANCELED : data.ret;
+    ret = (job->cancelled && job->ret == 0) ? -ECANCELED : job->ret;
+    block_job_unref(job);
+    return ret;

 }
 
 /* A wrapper around block_job_cancel() taking an Error ** parameter so it may be
 }
 
 /* A wrapper around block_job_cancel() taking an Error ** parameter so it may be


@@ -228,6 +333,19 @@ int block_job_cancel_sync(BlockJob *job)
     return block_job_finish_sync(job, &block_job_cancel_err, NULL);
 }
 
     return block_job_finish_sync(job, &block_job_cancel_err, NULL);
 }
 

+void block_job_cancel_sync_all(void)
+{
+    BlockJob *job;
+    AioContext *aio_context;
+
+    while ((job = QLIST_FIRST(&block_jobs))) {
+        aio_context = blk_get_aio_context(job->blk);
+        aio_context_acquire(aio_context);
+        block_job_cancel_sync(job);
+        aio_context_release(aio_context);
+    }
+}
+

 int block_job_complete_sync(BlockJob *job, Error **errp)
 {
     return block_job_finish_sync(job, &block_job_complete, errp);
 int block_job_complete_sync(BlockJob *job, Error **errp)
 {
     return block_job_finish_sync(job, &block_job_complete, errp);


@@ -246,7 +364,7 @@ void block_job_sleep_ns(BlockJob *job, QEMUClockType type, int64_t ns)
     if (block_job_is_paused(job)) {
         qemu_coroutine_yield();
     } else {
     if (block_job_is_paused(job)) {
         qemu_coroutine_yield();
     } else {

-        co_aio_sleep_ns(bdrv_get_aio_context(job->bs), type, ns);
+        co_aio_sleep_ns(blk_get_aio_context(job->blk), type, ns);

     }
     job->busy = true;
 }
     }
     job->busy = true;
 }


@@ -269,7 +387,7 @@ BlockJobInfo *block_job_query(BlockJob *job)
 {
     BlockJobInfo *info = g_new0(BlockJobInfo, 1);
     info->type      = g_strdup(BlockJobType_lookup[job->driver->job_type]);
 {
     BlockJobInfo *info = g_new0(BlockJobInfo, 1);
     info->type      = g_strdup(BlockJobType_lookup[job->driver->job_type]);

-    info->device    = g_strdup(bdrv_get_device_name(job->bs));
+    info->device    = g_strdup(job->id);

     info->len       = job->len;
     info->busy      = job->busy;
     info->paused    = job->pause_count > 0;
     info->len       = job->len;
     info->busy      = job->busy;
     info->paused    = job->pause_count > 0;


@@ -291,7 +409,7 @@ static void block_job_iostatus_set_err(BlockJob *job, int error)
 void block_job_event_cancelled(BlockJob *job)
 {
     qapi_event_send_block_job_cancelled(job->driver->job_type,
 void block_job_event_cancelled(BlockJob *job)
 {
     qapi_event_send_block_job_cancelled(job->driver->job_type,

-                                        bdrv_get_device_name(job->bs),
+                                        job->id,

                                         job->len,
                                         job->offset,
                                         job->speed,
                                         job->len,
                                         job->offset,
                                         job->speed,


@@ -301,7 +419,7 @@ void block_job_event_cancelled(BlockJob *job)
 void block_job_event_completed(BlockJob *job, const char *msg)
 {
     qapi_event_send_block_job_completed(job->driver->job_type,
 void block_job_event_completed(BlockJob *job, const char *msg)
 {
     qapi_event_send_block_job_completed(job->driver->job_type,

-                                        bdrv_get_device_name(job->bs),
+                                        job->id,

                                         job->len,
                                         job->offset,
                                         job->speed,
                                         job->len,
                                         job->offset,
                                         job->speed,


@@ -315,14 +433,13 @@ void block_job_event_ready(BlockJob *job)
     job->ready = true;
 
     qapi_event_send_block_job_ready(job->driver->job_type,
     job->ready = true;
 
     qapi_event_send_block_job_ready(job->driver->job_type,

-                                    bdrv_get_device_name(job->bs),
+                                    job->id,

                                     job->len,
                                     job->offset,
                                     job->speed, &error_abort);
 }
 
                                     job->len,
                                     job->offset,
                                     job->speed, &error_abort);
 }
 

-BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
-                                        BlockdevOnError on_err,
+BlockErrorAction block_job_error_action(BlockJob *job, BlockdevOnError on_err,

                                         int is_read, int error)
 {
     BlockErrorAction action;
                                         int is_read, int error)
 {
     BlockErrorAction action;


@@ -344,7 +461,7 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
     default:
         abort();
     }
     default:
         abort();
     }

-    qapi_event_send_block_job_error(bdrv_get_device_name(job->bs),
+    qapi_event_send_block_job_error(job->id,

                                     is_read ? IO_OPERATION_TYPE_READ :
                                     IO_OPERATION_TYPE_WRITE,
                                     action, &error_abort);
                                     is_read ? IO_OPERATION_TYPE_READ :
                                     IO_OPERATION_TYPE_WRITE,
                                     action, &error_abort);


@@ -353,9 +470,6 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
         job->user_paused = true;
         block_job_pause(job);
         block_job_iostatus_set_err(job, error);
         job->user_paused = true;
         block_job_pause(job);
         block_job_iostatus_set_err(job, error);

-        if (bs != job->bs) {
-            bdrv_iostatus_set_err(bs, error);
-        }

     }
     return action;
 }
     }
     return action;
 }


@@ -379,9 +493,10 @@ static void block_job_defer_to_main_loop_bh(void *opaque)
     aio_context_acquire(data->aio_context);
 
     /* Fetch BDS AioContext again, in case it has changed */
     aio_context_acquire(data->aio_context);
 
     /* Fetch BDS AioContext again, in case it has changed */

-    aio_context = bdrv_get_aio_context(data->job->bs);
+    aio_context = blk_get_aio_context(data->job->blk);

     aio_context_acquire(aio_context);
 
     aio_context_acquire(aio_context);
 

+    data->job->deferred_to_main_loop = false;

     data->fn(data->job, data->opaque);
 
     aio_context_release(aio_context);
     data->fn(data->job, data->opaque);
 
     aio_context_release(aio_context);


@@ -398,9 +513,43 @@ void block_job_defer_to_main_loop(BlockJob *job,
     BlockJobDeferToMainLoopData *data = g_malloc(sizeof(*data));
     data->job = job;
     data->bh = qemu_bh_new(block_job_defer_to_main_loop_bh, data);
     BlockJobDeferToMainLoopData *data = g_malloc(sizeof(*data));
     data->job = job;
     data->bh = qemu_bh_new(block_job_defer_to_main_loop_bh, data);

-    data->aio_context = bdrv_get_aio_context(job->bs);
+    data->aio_context = blk_get_aio_context(job->blk);

     data->fn = fn;
     data->opaque = opaque;
     data->fn = fn;
     data->opaque = opaque;

+    job->deferred_to_main_loop = true;

 
     qemu_bh_schedule(data->bh);
 }
 
     qemu_bh_schedule(data->bh);
 }

+
+BlockJobTxn *block_job_txn_new(void)
+{
+    BlockJobTxn *txn = g_new0(BlockJobTxn, 1);
+    QLIST_INIT(&txn->jobs);
+    txn->refcnt = 1;
+    return txn;
+}
+
+static void block_job_txn_ref(BlockJobTxn *txn)
+{
+    txn->refcnt++;
+}
+
+void block_job_txn_unref(BlockJobTxn *txn)
+{
+    if (txn && --txn->refcnt == 0) {
+        g_free(txn);
+    }
+}
+
+void block_job_txn_add_job(BlockJobTxn *txn, BlockJob *job)
+{
+    if (!txn) {
+        return;
+    }
+
+    assert(!job->txn);
+    job->txn = txn;
+
+    QLIST_INSERT_HEAD(&txn->jobs, job, txn_list);
+    block_job_txn_ref(txn);
+}