From patchwork Wed Dec 5 19:46:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 10714777 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4F892157A for ; Wed, 5 Dec 2018 19:49:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A518E2D687 for ; Wed, 5 Dec 2018 19:49:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 987BF2D721; Wed, 5 Dec 2018 19:49:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E8AF22D687 for ; Wed, 5 Dec 2018 19:48:56 +0000 (UTC) Received: from localhost ([::1]:36453 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUdAG-0004tQ-5e for patchwork-qemu-devel@patchwork.kernel.org; Wed, 05 Dec 2018 14:48:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUd8q-00024Y-SO for qemu-devel@nongnu.org; Wed, 05 Dec 2018 14:47:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUd8m-0008En-OE for qemu-devel@nongnu.org; Wed, 05 Dec 2018 14:47:28 -0500 Received: from mail-qt1-x841.google.com ([2607:f8b0:4864:20::841]:43722) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gUd8h-0008Bt-3d for qemu-devel@nongnu.org; Wed, 05 Dec 2018 14:47:19 -0500 Received: by mail-qt1-x841.google.com with SMTP id i7so23689972qtj.10 for ; Wed, 05 Dec 2018 11:47:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S5nm/HnRYDWu83U/A39/x3nQbTiJYvldGEMh84Ram18=; b=ccnM57uBY2J0xVXqKgE3WQmyCZh94FOLGtjtqPRkN41Q2K95XeC+bfW3B4O2mIrky1 2ZoooDv9LO3R+NfYFp5ic5RtTg9ReFfV6VB9PXAn9z0i9HZU40xjVURcnu5pIvDc//Cw 4u5iyrSoDuzGK/Vao7r6mx7WB+ULKbvkVnrD3Xqn3E83N/Aa4Y51dEMR8BBKPhwNFfnq sCtSwaLvXy3kw114dkEyJaqshYP0yPJD1oBowCd4O31VSo/N0OQe+89/yQBjbC/Tp4me xnUdCYFP1CmMmhllzawAXAp7kEkFolwnVeQAfgNfKIFvTfkPgd62UUreCamzHbLJ6JMB Ub0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S5nm/HnRYDWu83U/A39/x3nQbTiJYvldGEMh84Ram18=; b=tlImiSH1YLhYgxmSWvuOM94Mp/rNX/S5daIQrqJACCto3rJUAh8jMbCsHYbD0Oe1gN 4jGX8pgcBDIcVEZkZl3SA3bblvjy1wQ1UHVeUbGk1qkQdn7tzBp+TLx+Cpr754N4Gk+q qGFNFHHqv1oaRN+BTbHVYtLNv/Z+OWJgN4WIRU6zAoGVJSfL3H73j6x4auqpWDT9sHK4 M65pDc5i3jItwskt1n0t8Wzpc8aPVUsPVQCgjirxaE2eb20CCwFRf+2RJXOUuELzy6dj eIVNvcsY96l6Zc1rv1JopL5MEAwrCwfEiAmopQ+MsO6OIfOWzyCQY/vw7KtfgEN0GIbu 3ZNg== X-Gm-Message-State: AA+aEWYdmsZdRNbcDR8MYq+NasqpmSY8/mwhHSTTNSMYFXi4rpAD82lU SeUdv0ikGdgnl2HuujCIMHv3Rc3qQww= X-Google-Smtp-Source: AFSGD/Vnp2BwIxKWWqHMyYRoXjpn9rvJRJQ9RIXsNhMEiR2A7dIps4FsPIuFcTtJfkhGQM8/pl2dvA== X-Received: by 2002:ac8:28d2:: with SMTP id j18mr24490249qtj.191.1544039237968; Wed, 05 Dec 2018 11:47:17 -0800 (PST) Received: from localhost.localdomain ([2804:431:f700:5b3d:a6d3:486e:8166:3fca]) by smtp.gmail.com with ESMTPSA id q72sm12446248qki.24.2018.12.05.11.47.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Dec 2018 11:47:17 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Wed, 5 Dec 2018 17:46:59 -0200 Message-Id: <20181205194701.17836-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181205194701.17836-1-danielhb413@gmail.com> References: <20181205194701.17836-1-danielhb413@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::841 Subject: [Qemu-devel] [PATCH v11 1/3] qmp: query-current-machine with wakeup-suspend-support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, mst@redhat.com, Daniel Henrique Barboza , armbru@redhat.com, mdroth@linux.vnet.ibm.com, imammedo@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP When issuing the qmp/hmp 'system_wakeup' command, what happens in a nutshell is: - qmp_system_wakeup_request set runstate to RUNNING, sets a wakeup_reason and notify the event - in the main_loop, all vcpus are paused, a system reset is issued, all subscribers of wakeup_notifiers receives a notification, vcpus are then resumed and the wake up QAPI event is fired Note that this procedure alone doesn't ensure that the guest will awake from SUSPENDED state - the subscribers of the wake up event must take action to resume the guest, otherwise the guest will simply reboot. At this moment, only the ACPI machines via acpi_pm1_cnt_init and xen_hvm_init have wake-up from suspend support. However, only the presence of 'system_wakeup' is required for QGA to support 'guest-suspend-ram' and 'guest-suspend-hybrid' at this moment. This means that the user/management will expect to suspend the guest using one of those suspend commands and then resume execution using system_wakeup, regardless of the support offered in system_wakeup in the first place. This patch creates a new API called query-current-machine [1], that holds a new flag called 'wakeup-suspend-support' that indicates if the guest supports wake up from suspend via system_wakeup. The machine is considered to implement wake-up support if a call to a new 'qemu_register_wakeup_support' is made during its init, as it is now being done inside acpi_pm1_cnt_init and xen_hvm_init. This allows for any other machine type to declare wake-up support regardless of ACPI state or wakeup_notifiers subscription, making easier for newer implementations that might have their own mechanisms in the future. This is the expected output of query-current-machine when running a x86 guest: {"execute" : "query-current-machine"} {"return": {"wakeup-suspend-support": true}} Running the same x86 guest, but with the --no-acpi option: {"execute" : "query-current-machine"} {"return": {"wakeup-suspend-support": false}} This is the output when running a pseries guest: {"execute" : "query-current-machine"} {"return": {"wakeup-suspend-support": false}} With this extra tool, management can avoid situations where a guest that does not have proper suspend/wake capabilities ends up in inconsistent state (e.g. https://github.com/open-power-host-os/qemu/issues/31). [1] the decision of creating the query-current-machine API is based on discussions in the QEMU mailing list where it was decided that query-target wasn't a proper place to store the wake-up flag, neither was query-machines because this isn't a static property of the machine object. This new API can then be used to store other dynamic machine properties that are scattered around the code ATM. More info at: https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg04235.html Reported-by: Balamuruhan S Signed-off-by: Daniel Henrique Barboza Reviewed-by: Markus Armbruster --- hw/acpi/core.c | 6 ++++++ hw/i386/xen/xen-hvm.c | 5 +++++ include/sysemu/sysemu.h | 1 + qapi/misc.json | 24 ++++++++++++++++++++++++ vl.c | 19 +++++++++++++++++++ 5 files changed, 55 insertions(+) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index aafdc61648..52e18d7810 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -617,6 +617,12 @@ void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent, ar->pm1.cnt.s4_val = s4_val; ar->wakeup.notify = acpi_notify_wakeup; qemu_register_wakeup_notifier(&ar->wakeup); + + /* + * Register wake-up support in QMP query-current-machine API + */ + qemu_register_wakeup_support(); + memory_region_init_io(&ar->pm1.cnt.io, memory_region_owner(parent), &acpi_pm_cnt_ops, ar, "acpi-cnt", 2); memory_region_add_subregion(parent, 4, &ar->pm1.cnt.io); diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 935a3676c8..2143d33b18 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -1405,6 +1405,11 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) state->wakeup.notify = xen_wakeup_notifier; qemu_register_wakeup_notifier(&state->wakeup); + /* + * Register wake-up support in QMP query-current-machine API + */ + qemu_register_wakeup_support(); + rc = xen_map_ioreq_server(state); if (rc < 0) { goto err; diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 8d6095d98b..0446adacc6 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -77,6 +77,7 @@ void qemu_register_suspend_notifier(Notifier *notifier); void qemu_system_wakeup_request(WakeupReason reason); void qemu_system_wakeup_enable(WakeupReason reason, bool enabled); void qemu_register_wakeup_notifier(Notifier *notifier); +void qemu_register_wakeup_support(void); void qemu_system_shutdown_request(ShutdownCause reason); void qemu_system_powerdown_request(void); void qemu_register_powerdown_notifier(Notifier *notifier); diff --git a/qapi/misc.json b/qapi/misc.json index 6c1c5c0a37..deb982ed38 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -2008,6 +2008,30 @@ ## { 'command': 'query-machines', 'returns': ['MachineInfo'] } +## +# @CurrentMachineParams: +# +# Information describing the running machine parameters. +# +# @wakeup-suspend-support: true if the machine supports wake up from +# suspend +# +# Since: 4.0 +## +{ 'struct': 'CurrentMachineParams', + 'data': { 'wakeup-suspend-support': 'bool'} } + +## +# @query-current-machine: +# +# Return information on the current virtual machine. +# +# Returns: CurrentMachineParams +# +# Since: 4.0 +## +{ 'command': 'query-current-machine', 'returns': 'CurrentMachineParams' } + ## # @CpuDefinitionInfo: # diff --git a/vl.c b/vl.c index a5ae5f23d2..8f5b3ef4e9 100644 --- a/vl.c +++ b/vl.c @@ -192,6 +192,7 @@ bool boot_strict; uint8_t *boot_splash_filedata; size_t boot_splash_filedata_size; uint8_t qemu_extra_params_fw[2]; +bool wakeup_suspend_enabled; int icount_align_option; @@ -1780,6 +1781,24 @@ void qemu_register_wakeup_notifier(Notifier *notifier) notifier_list_add(&wakeup_notifiers, notifier); } +void qemu_register_wakeup_support(void) +{ + wakeup_suspend_enabled = true; +} + +static bool qemu_wakeup_suspend_enabled(void) +{ + return wakeup_suspend_enabled; +} + +CurrentMachineParams *qmp_query_current_machine(Error **errp) +{ + CurrentMachineParams *params = g_malloc0(sizeof(*params)); + params->wakeup_suspend_support = qemu_wakeup_suspend_enabled(); + + return params; +} + void qemu_system_killed(int signal, pid_t pid) { shutdown_signal = signal;