Commit 37cbe4da authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Block layer patches:

- Generic background jobs
- qemu-iotests fixes for NFS and the 'migration' group
- sheepdog: Minor code simplification

# gpg: Signature made Wed 23 May 2018 13:33:49 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (46 commits)
  qemu-iotests: Test job-* with block jobs
  iotests: Move qmp_to_opts() to VM
  blockjob: Remove BlockJob.driver
  job: Add query-jobs QMP command
  job: Add lifecycle QMP commands
  job: Add JOB_STATUS_CHANGE QMP event
  job: Introduce qapi/job.json
  job: Move progress fields to Job
  job: Add job_transition_to_ready()
  job: Add job_is_ready()
  job: Add job_dismiss()
  job: Add job_yield()
  block: Cancel job in bdrv_close_all() callers
  job: Move completion and cancellation to Job
  job: Move transactions to Job
  job: Switch transactions to JobTxn
  job: Move job_finish_sync() to Job
  job: Move .complete callback to Job
  job: Add job_drain()
  job: Convert block_job_cancel_async() to Job
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5ff2a4b9 bdebdc71

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -1369,10 +1369,14 @@ L: qemu-block@nongnu.org 
S: Supported

F: blockjob.c

F: include/block/blockjob.h

F: job.c

F: job-qmp.c

F: include/block/job.h

F: block/backup.c

F: block/commit.c

F: block/stream.c

F: block/mirror.c

F: qapi/job.json

T: git git://github.com/codyprime/qemu-kvm-jtc.git block



Block QAPI, monitor, command line

Makefile

+9 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ GENERATED_FILES += qapi/qapi-types-char.h qapi/qapi-types-char.c 
GENERATED_FILES += qapi/qapi-types-common.h qapi/qapi-types-common.c

GENERATED_FILES += qapi/qapi-types-crypto.h qapi/qapi-types-crypto.c

GENERATED_FILES += qapi/qapi-types-introspect.h qapi/qapi-types-introspect.c

GENERATED_FILES += qapi/qapi-types-job.h qapi/qapi-types-job.c

GENERATED_FILES += qapi/qapi-types-migration.h qapi/qapi-types-migration.c

GENERATED_FILES += qapi/qapi-types-misc.h qapi/qapi-types-misc.c

GENERATED_FILES += qapi/qapi-types-net.h qapi/qapi-types-net.c
@@ -116,6 +117,7 @@ GENERATED_FILES += qapi/qapi-visit-char.h qapi/qapi-visit-char.c 
GENERATED_FILES += qapi/qapi-visit-common.h qapi/qapi-visit-common.c

GENERATED_FILES += qapi/qapi-visit-crypto.h qapi/qapi-visit-crypto.c

GENERATED_FILES += qapi/qapi-visit-introspect.h qapi/qapi-visit-introspect.c

GENERATED_FILES += qapi/qapi-visit-job.h qapi/qapi-visit-job.c

GENERATED_FILES += qapi/qapi-visit-migration.h qapi/qapi-visit-migration.c

GENERATED_FILES += qapi/qapi-visit-misc.h qapi/qapi-visit-misc.c

GENERATED_FILES += qapi/qapi-visit-net.h qapi/qapi-visit-net.c
@@ -133,6 +135,7 @@ GENERATED_FILES += qapi/qapi-commands-char.h qapi/qapi-commands-char.c 
GENERATED_FILES += qapi/qapi-commands-common.h qapi/qapi-commands-common.c

GENERATED_FILES += qapi/qapi-commands-crypto.h qapi/qapi-commands-crypto.c

GENERATED_FILES += qapi/qapi-commands-introspect.h qapi/qapi-commands-introspect.c

GENERATED_FILES += qapi/qapi-commands-job.h qapi/qapi-commands-job.c

GENERATED_FILES += qapi/qapi-commands-migration.h qapi/qapi-commands-migration.c

GENERATED_FILES += qapi/qapi-commands-misc.h qapi/qapi-commands-misc.c

GENERATED_FILES += qapi/qapi-commands-net.h qapi/qapi-commands-net.c
@@ -150,6 +153,7 @@ GENERATED_FILES += qapi/qapi-events-char.h qapi/qapi-events-char.c 
GENERATED_FILES += qapi/qapi-events-common.h qapi/qapi-events-common.c

GENERATED_FILES += qapi/qapi-events-crypto.h qapi/qapi-events-crypto.c

GENERATED_FILES += qapi/qapi-events-introspect.h qapi/qapi-events-introspect.c

GENERATED_FILES += qapi/qapi-events-job.h qapi/qapi-events-job.c

GENERATED_FILES += qapi/qapi-events-migration.h qapi/qapi-events-migration.c

GENERATED_FILES += qapi/qapi-events-misc.h qapi/qapi-events-misc.c

GENERATED_FILES += qapi/qapi-events-net.h qapi/qapi-events-net.c
@@ -582,6 +586,7 @@ qapi-modules = $(SRC_PATH)/qapi/qapi-schema.json $(SRC_PATH)/qapi/common.json \ 
               $(SRC_PATH)/qapi/char.json \

               $(SRC_PATH)/qapi/crypto.json \

               $(SRC_PATH)/qapi/introspect.json \

               $(SRC_PATH)/qapi/job.json \

               $(SRC_PATH)/qapi/migration.json \

               $(SRC_PATH)/qapi/misc.json \

               $(SRC_PATH)/qapi/net.json \
@@ -601,6 +606,7 @@ qapi/qapi-types-char.c qapi/qapi-types-char.h \ 
qapi/qapi-types-common.c qapi/qapi-types-common.h \

qapi/qapi-types-crypto.c qapi/qapi-types-crypto.h \

qapi/qapi-types-introspect.c qapi/qapi-types-introspect.h \

qapi/qapi-types-job.c qapi/qapi-types-job.h \

qapi/qapi-types-migration.c qapi/qapi-types-migration.h \

qapi/qapi-types-misc.c qapi/qapi-types-misc.h \

qapi/qapi-types-net.c qapi/qapi-types-net.h \
@@ -619,6 +625,7 @@ qapi/qapi-visit-char.c qapi/qapi-visit-char.h \ 
qapi/qapi-visit-common.c qapi/qapi-visit-common.h \

qapi/qapi-visit-crypto.c qapi/qapi-visit-crypto.h \

qapi/qapi-visit-introspect.c qapi/qapi-visit-introspect.h \

qapi/qapi-visit-job.c qapi/qapi-visit-job.h \

qapi/qapi-visit-migration.c qapi/qapi-visit-migration.h \

qapi/qapi-visit-misc.c qapi/qapi-visit-misc.h \

qapi/qapi-visit-net.c qapi/qapi-visit-net.h \
@@ -636,6 +643,7 @@ qapi/qapi-commands-char.c qapi/qapi-commands-char.h \ 
qapi/qapi-commands-common.c qapi/qapi-commands-common.h \

qapi/qapi-commands-crypto.c qapi/qapi-commands-crypto.h \

qapi/qapi-commands-introspect.c qapi/qapi-commands-introspect.h \

qapi/qapi-commands-job.c qapi/qapi-commands-job.h \

qapi/qapi-commands-migration.c qapi/qapi-commands-migration.h \

qapi/qapi-commands-misc.c qapi/qapi-commands-misc.h \

qapi/qapi-commands-net.c qapi/qapi-commands-net.h \
@@ -653,6 +661,7 @@ qapi/qapi-events-char.c qapi/qapi-events-char.h \ 
qapi/qapi-events-common.c qapi/qapi-events-common.h \

qapi/qapi-events-crypto.c qapi/qapi-events-crypto.h \

qapi/qapi-events-introspect.c qapi/qapi-events-introspect.h \

qapi/qapi-events-job.c qapi/qapi-events-job.h \

qapi/qapi-events-migration.c qapi/qapi-events-migration.h \

qapi/qapi-events-misc.c qapi/qapi-events-misc.h \

qapi/qapi-events-net.c qapi/qapi-events-net.h \

Makefile.objs

+6 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ util-obj-y += qapi/qapi-types-char.o 
util-obj-y += qapi/qapi-types-common.o

util-obj-y += qapi/qapi-types-crypto.o

util-obj-y += qapi/qapi-types-introspect.o

util-obj-y += qapi/qapi-types-job.o

util-obj-y += qapi/qapi-types-migration.o

util-obj-y += qapi/qapi-types-misc.o

util-obj-y += qapi/qapi-types-net.o
@@ -28,6 +29,7 @@ util-obj-y += qapi/qapi-visit-char.o 
util-obj-y += qapi/qapi-visit-common.o

util-obj-y += qapi/qapi-visit-crypto.o

util-obj-y += qapi/qapi-visit-introspect.o

util-obj-y += qapi/qapi-visit-job.o

util-obj-y += qapi/qapi-visit-migration.o

util-obj-y += qapi/qapi-visit-misc.o

util-obj-y += qapi/qapi-visit-net.o
@@ -45,6 +47,7 @@ util-obj-y += qapi/qapi-events-char.o 
util-obj-y += qapi/qapi-events-common.o

util-obj-y += qapi/qapi-events-crypto.o

util-obj-y += qapi/qapi-events-introspect.o

util-obj-y += qapi/qapi-events-job.o

util-obj-y += qapi/qapi-events-migration.o

util-obj-y += qapi/qapi-events-misc.o

util-obj-y += qapi/qapi-events-net.o
@@ -63,7 +66,7 @@ chardev-obj-y = chardev/ 
# block-obj-y is code used by both qemu system emulation and qemu-img



block-obj-y += nbd/

block-obj-y += block.o blockjob.o

block-obj-y += block.o blockjob.o job.o

block-obj-y += block/ scsi/

block-obj-y += qemu-io-cmds.o

block-obj-$(CONFIG_REPLICATION) += replication.o
@@ -94,6 +97,7 @@ io-obj-y = io/ 
ifeq ($(CONFIG_SOFTMMU),y)

common-obj-y = blockdev.o blockdev-nbd.o block/

common-obj-y += bootdevice.o iothread.o

common-obj-y += job-qmp.o

common-obj-y += net/

common-obj-y += qdev-monitor.o device-hotplug.o

common-obj-$(CONFIG_WIN32) += os-win32.o
@@ -140,6 +144,7 @@ common-obj-y += qapi/qapi-commands-char.o 
common-obj-y += qapi/qapi-commands-common.o

common-obj-y += qapi/qapi-commands-crypto.o

common-obj-y += qapi/qapi-commands-introspect.o

common-obj-y += qapi/qapi-commands-job.o

common-obj-y += qapi/qapi-commands-migration.o

common-obj-y += qapi/qapi-commands-misc.o

common-obj-y += qapi/qapi-commands-net.o

block.c

+1 −1
Original line number Diff line number Diff line
@@ -3362,7 +3362,7 @@ static void bdrv_close(BlockDriverState *bs) 


void bdrv_close_all(void)

{

    block_job_cancel_sync_all();

    assert(job_next(NULL) == NULL);

    nbd_export_close_all();



    /* Drop references from requests still in flight, such as canceled block

block/backup.c

+32 −27
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int coroutine_fn backup_do_cow(BackupBlockJob *job, 
         * offset field is an opaque progress value, it is not a disk offset.

         */

        job->bytes_read += n;

        block_job_progress_update(&job->common, n);

        job_progress_update(&job->common.job, n);

    }



out:
@@ -207,25 +207,25 @@ static void backup_cleanup_sync_bitmap(BackupBlockJob *job, int ret) 
    }

}



static void backup_commit(BlockJob *job)

static void backup_commit(Job *job)

{

    BackupBlockJob *s = container_of(job, BackupBlockJob, common);

    BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);

    if (s->sync_bitmap) {

        backup_cleanup_sync_bitmap(s, 0);

    }

}



static void backup_abort(BlockJob *job)

static void backup_abort(Job *job)

{

    BackupBlockJob *s = container_of(job, BackupBlockJob, common);

    BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);

    if (s->sync_bitmap) {

        backup_cleanup_sync_bitmap(s, -1);

    }

}



static void backup_clean(BlockJob *job)

static void backup_clean(Job *job)

{

    BackupBlockJob *s = container_of(job, BackupBlockJob, common);

    BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);

    assert(s->target);

    blk_unref(s->target);

    s->target = NULL;
@@ -317,11 +317,11 @@ typedef struct { 
    int ret;

} BackupCompleteData;



static void backup_complete(BlockJob *job, void *opaque)

static void backup_complete(Job *job, void *opaque)

{

    BackupCompleteData *data = opaque;



    block_job_completed(job, data->ret);

    job_completed(job, data->ret);

    g_free(data);

}
@@ -329,7 +329,7 @@ static bool coroutine_fn yield_and_check(BackupBlockJob *job) 
{

    uint64_t delay_ns;



    if (block_job_is_cancelled(&job->common)) {

    if (job_is_cancelled(&job->common.job)) {

        return true;

    }
@@ -337,9 +337,9 @@ static bool coroutine_fn yield_and_check(BackupBlockJob *job) 
     * return. Without a yield, the VM would not reboot. */

    delay_ns = block_job_ratelimit_get_delay(&job->common, job->bytes_read);

    job->bytes_read = 0;

    block_job_sleep_ns(&job->common, delay_ns);

    job_sleep_ns(&job->common.job, delay_ns);



    if (block_job_is_cancelled(&job->common)) {

    if (job_is_cancelled(&job->common.job)) {

        return true;

    }
@@ -406,8 +406,8 @@ static void backup_incremental_init_copy_bitmap(BackupBlockJob *job) 
        bdrv_set_dirty_iter(dbi, next_cluster * job->cluster_size);

    }



    /* TODO block_job_progress_set_remaining() would make more sense */

    block_job_progress_update(&job->common,

    /* TODO job_progress_set_remaining() would make more sense */

    job_progress_update(&job->common.job,

        job->len - hbitmap_count(job->copy_bitmap) * job->cluster_size);



    bdrv_dirty_iter_free(dbi);
@@ -425,7 +425,7 @@ static void coroutine_fn backup_run(void *opaque) 
    qemu_co_rwlock_init(&job->flush_rwlock);



    nb_clusters = DIV_ROUND_UP(job->len, job->cluster_size);

    block_job_progress_set_remaining(&job->common, job->len);

    job_progress_set_remaining(&job->common.job, job->len);



    job->copy_bitmap = hbitmap_alloc(nb_clusters, 0);

    if (job->sync_mode == MIRROR_SYNC_MODE_INCREMENTAL) {
@@ -441,10 +441,10 @@ static void coroutine_fn backup_run(void *opaque) 
    if (job->sync_mode == MIRROR_SYNC_MODE_NONE) {

        /* All bits are set in copy_bitmap to allow any cluster to be copied.

         * This does not actually require them to be copied. */

        while (!block_job_is_cancelled(&job->common)) {

        while (!job_is_cancelled(&job->common.job)) {

            /* Yield until the job is cancelled.  We just let our before_write

             * notify callback service CoW requests. */

            block_job_yield(&job->common);

            job_yield(&job->common.job);

        }

    } else if (job->sync_mode == MIRROR_SYNC_MODE_INCREMENTAL) {

        ret = backup_run_incremental(job);
@@ -519,16 +519,21 @@ static void coroutine_fn backup_run(void *opaque) 


    data = g_malloc(sizeof(*data));

    data->ret = ret;

    block_job_defer_to_main_loop(&job->common, backup_complete, data);

    job_defer_to_main_loop(&job->common.job, backup_complete, data);

}



static const BlockJobDriver backup_job_driver = {

    .job_driver = {

        .instance_size          = sizeof(BackupBlockJob),

    .job_type               = BLOCK_JOB_TYPE_BACKUP,

        .job_type               = JOB_TYPE_BACKUP,

        .free                   = block_job_free,

        .user_resume            = block_job_user_resume,

        .drain                  = block_job_drain,

        .start                  = backup_run,

        .commit                 = backup_commit,

        .abort                  = backup_abort,

        .clean                  = backup_clean,

    },

    .attached_aio_context   = backup_attached_aio_context,

    .drain                  = backup_drain,

};
@@ -541,7 +546,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, 
                  BlockdevOnError on_target_error,

                  int creation_flags,

                  BlockCompletionFunc *cb, void *opaque,

                  BlockJobTxn *txn, Error **errp)

                  JobTxn *txn, Error **errp)

{

    int64_t len;

    BlockDriverInfo bdi;
@@ -673,8 +678,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, 
        bdrv_reclaim_dirty_bitmap(bs, sync_bitmap, NULL);

    }

    if (job) {

        backup_clean(&job->common);

        block_job_early_fail(&job->common);

        backup_clean(&job->common.job);

        job_early_fail(&job->common.job);

    }



    return NULL;