From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C3327C19F29 for ; Mon, 1 Aug 2022 08:11:17 +0000 (UTC) Received: from localhost ([::1]:47854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIQWC-0007Xz-PE for qemu-devel@archiver.kernel.org; Mon, 01 Aug 2022 04:11:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIQSu-0005i5-UU for qemu-devel@nongnu.org; Mon, 01 Aug 2022 04:07:56 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:3819) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIQSr-00062F-Hf for qemu-devel@nongnu.org; Mon, 01 Aug 2022 04:07:52 -0400 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Lx9dj5TR3zlWCs; Mon, 1 Aug 2022 16:04:57 +0800 (CST) Received: from kwepemm600015.china.huawei.com (7.193.23.52) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 1 Aug 2022 16:07:37 +0800 Received: from localhost (10.174.149.172) by kwepemm600015.china.huawei.com (7.193.23.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 1 Aug 2022 16:07:37 +0800 To: , , , , CC: , Subject: [PATCH v4 3/3] dump: use jobs framework for dump guest memory Date: Mon, 1 Aug 2022 16:07:22 +0800 Message-ID: <20220801080722.3318-3-hogan.wang@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220801080722.3318-1-hogan.wang@huawei.com> References: <20220801080722.3318-1-hogan.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.174.149.172] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600015.china.huawei.com (7.193.23.52) X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.188; envelope-from=hogan.wang@huawei.com; helo=szxga02-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: Hogan Wang From: Hogan Wang via There's no way to cancel the current executing dump process, lead to the virtual machine manager daemon((e.g. libvirtd) cannot restore the dump job after daemon restart. When caller pass the 'job-id' argument, create a job for dump process. And then caller can use job-cancel QMP command to cancel the detached dump process, use job-dismiss QMP command to release job object. Examples: Start dump job: {"execute": "dump-guest-memory", "arguments": { "job-id": "dump-guest-memory", "protocol": "file:/tmp/vm.dump", "paging": false, "format": "elf", "detach": true }} Cancel dump job: {"execute": "job-cancel", "arguments": { "id": "dump-guest-memory" }} Dismiss dump job: {"execute": "job-dismiss", "arguments": { "id": "dump-guest-memory" }} Signed-off-by: Hogan Wang --- dump/dump.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dump/dump.c b/dump/dump.c index cec9be30b4..3f4ed8e7a7 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -98,6 +98,7 @@ static int dump_cleanup(DumpState *s) { guest_phys_blocks_free(&s->guest_phys_blocks); memory_mapping_list_free(&s->list); + s->job = NULL; close(s->fd); g_free(s->guest_note); s->guest_note = NULL; @@ -1542,6 +1543,14 @@ static void get_max_mapnr(DumpState *s) static DumpState dump_state_global = { .status = DUMP_STATUS_NONE }; +typedef struct DumpJob { + Job common; + DumpState *state; + Coroutine *co; + Error **errp; +} DumpJob; + + static void dump_state_prepare(DumpState *s) { /* zero the struct, setting status to active */ @@ -1894,6 +1903,64 @@ DumpQueryResult *qmp_query_dump(Error **errp) return result; } +static void *dump_job_thread(void *opaque) +{ + DumpJob *job = (DumpJob *)opaque; + job_progress_set_remaining(&job->common, 1); + dump_process(job->state, job->errp); + job_progress_update(&job->common, 1); + aio_co_wake(job->co); + return NULL; +} + +static void dump_sync_job_bh(void *opaque) +{ + dump_job_thread(opaque); +} + +static int coroutine_fn dump_guest_memory_job_run(Job *job, Error **errp) +{ + DumpJob *s = container_of(job, DumpJob, common); + DumpState *state = &dump_state_global; + + s->errp = errp; + s->co = qemu_coroutine_self(); + + if (state->detached) { + /* detached dump */ + qemu_thread_create(&s->state->dump_thread, "dump_thread", + dump_job_thread, job, QEMU_THREAD_DETACHED); + } else { + aio_bh_schedule_oneshot(qemu_get_aio_context(), + dump_sync_job_bh, job); + } + qemu_coroutine_yield(); + return qatomic_read(&state->status) == DUMP_STATUS_COMPLETED ? 0 : -1; +} + +static const JobDriver dump_guest_memory_job_driver = { + .instance_size = sizeof(DumpJob), + .job_type = JOB_TYPE_DUMP_GUEST_MEMORY, + .run = dump_guest_memory_job_run, +}; + +static void dump_job_start(DumpState *state, const char *job_id, + bool detach, Error **errp) +{ + DumpJob *job; + + job = job_create(job_id, &dump_guest_memory_job_driver, NULL, + qemu_get_aio_context(), JOB_MANUAL_DISMISS, + NULL, NULL, errp); + if (!job) { + return; + } + state->detached = detach; + state->job = &job->common; + job->state = state; + job_start(&job->common); +} + void qmp_dump_guest_memory(bool paging, const char *file, bool has_job_id, const char *job_id, bool has_detach, bool detach, @@ -2010,6 +2077,15 @@ void qmp_dump_guest_memory(bool paging, const char *file, return; } + if (has_job_id) { + dump_job_start(s, job_id, detach_p, errp); + if (*errp) { + qatomic_set(&s->status, DUMP_STATUS_FAILED); + dump_cleanup(s); + } + return; + } + if (detach_p) { /* detached dump */ s->detached = true; -- 2.33.0