From patchwork Fri Mar 11 17:57:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12778493 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E8D3C433EF for ; Fri, 11 Mar 2022 17:57:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350479AbiCKR6n (ORCPT ); Fri, 11 Mar 2022 12:58:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350458AbiCKR6n (ORCPT ); Fri, 11 Mar 2022 12:58:43 -0500 Received: from mail-io1-xd4a.google.com (mail-io1-xd4a.google.com [IPv6:2607:f8b0:4864:20::d4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70BDD6C96B for ; Fri, 11 Mar 2022 09:57:39 -0800 (PST) Received: by mail-io1-xd4a.google.com with SMTP id f11-20020a056602070b00b00645d08010fcso6772056iox.15 for ; Fri, 11 Mar 2022 09:57:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=BGsr6pN9enYniNk4zGr+nWX2xORuU1JL7wS+cLweFVM=; b=G8cB3TIlGOvwQlgqnb6Mv3A6ZDlk82Jx93jjWrLxun3vDuSleV+2ZENfuUS1eSZq+K IgQ+GM9Xo82V8Mun7Lw//GhahVM4rZ371b9ilQF12s4J9ZiMeW81c7rONn3ZnADLdkRR u2WDOuwVoayXZQ+3DSiHPrNnfLhLIsa/IdvllbJZZ7pvFOzW7aSZNQ8W7lifUWwLCuf2 DzxMLwqWeIeg6ntp2KnMOFHYpbHF7VkUH7zkgVfTqKkbCvbnG93z8jQ35Nzt65Ow3VLB yQHFcdwj2Grigd5frLaWlCQhcWFuBSzZAr/5LUkcx2FguOxyMPYLNFA5zfXBNAuS2oIg Zn/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=BGsr6pN9enYniNk4zGr+nWX2xORuU1JL7wS+cLweFVM=; b=yuTGfsFc89Ae4QW45S3dm5oP53TRf2THMvOTesUsd7UpJ/HmbVhG+6TiyNP93AUcx1 HCu0Usmbqb5NBLa75oBYZxmy1NJyN2DJUYwxyK4UGbRUb6WlHK9gy531SPLftkMghcCc UHob9G0PgX7YysWXaDKdfKlIcUrjrpSjQLHieO8E8rFseFectWOu9X1flQ8rXbZJrPjY zhio60OqTUmqliNaAiE2U6wQ+OBvDah9uEeeWOZCJGeqbmuMUneu1H4YJRj/VUUOwY6g MTI3mFI7oCJ/nbHZOECyJ5uEp0JZHwZBMy9RXsM+GaGiwXjIDIoHD9gUGzMMvF0w/IIO R5Uw== X-Gm-Message-State: AOAM532aSIA3sbsnbZ3Panpar6Qny083tF2mBweNf3Vfe6KADiLWUCOL bvbYK2BO/UZD4ffE40HGQiznM/N70Mw= X-Google-Smtp-Source: ABdhPJzy7TljJ49dSoKSsh7qQwadwo8KUyffYqNTXf0RMjBpnuNAtwt/ATgmZWQS3claaoNqk/pp2mmirz8= X-Received: from oupton.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:404]) (user=oupton job=sendgmr) by 2002:a05:6602:15c5:b0:646:4d0f:7728 with SMTP id f5-20020a05660215c500b006464d0f7728mr8810250iow.63.1647021458831; Fri, 11 Mar 2022 09:57:38 -0800 (PST) Date: Fri, 11 Mar 2022 17:57:13 +0000 In-Reply-To: <20220311175717.616958-1-oupton@google.com> Message-Id: <20220311175717.616958-2-oupton@google.com> Mime-Version: 1.0 References: <20220311174001.605719-1-oupton@google.com> <20220311175717.616958-1-oupton@google.com> X-Mailer: git-send-email 2.35.1.723.g4982287a31-goog Subject: [RFC PATCH kvmtool 1/5] TESTONLY: Sync KVM headers with pending changes From: Oliver Upton To: kvmarm@lists.cs.columbia.edu Cc: kvm@vger.kernel.org, Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , linux-arm-kernel@lists.infradead.org, Peter Shier , Ricardo Koller , Reiji Watanabe , Will Deacon , Julien Thierry , Oliver Upton Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Oliver Upton --- include/linux/kvm.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 1daa452..e5bb5f1 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -444,6 +444,8 @@ struct kvm_run { #define KVM_SYSTEM_EVENT_SHUTDOWN 1 #define KVM_SYSTEM_EVENT_RESET 2 #define KVM_SYSTEM_EVENT_CRASH 3 +#define KVM_SYSTEM_EVENT_WAKEUP 4 +#define KVM_SYSTEM_EVENT_SUSPEND 5 __u32 type; __u64 flags; } system_event; @@ -634,6 +636,7 @@ struct kvm_vapic_addr { #define KVM_MP_STATE_OPERATING 7 #define KVM_MP_STATE_LOAD 8 #define KVM_MP_STATE_AP_RESET_HOLD 9 +#define KVM_MP_STATE_SUSPENDED 10 struct kvm_mp_state { __u32 mp_state; @@ -1131,6 +1134,10 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_EXIT_ON_EMULATION_FAILURE 204 #define KVM_CAP_ARM_MTE 205 #define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206 +#define KVM_CAP_VM_GPA_BITS 207 +#define KVM_CAP_XSAVE2 208 +#define KVM_CAP_SYS_ATTRIBUTES 209 +#define KVM_CAP_ARM_SYSTEM_SUSPEND 210 #ifdef KVM_CAP_IRQ_ROUTING @@ -1162,11 +1169,20 @@ struct kvm_irq_routing_hv_sint { __u32 sint; }; +struct kvm_irq_routing_xen_evtchn { + __u32 port; + __u32 vcpu; + __u32 priority; +}; + +#define KVM_IRQ_ROUTING_XEN_EVTCHN_PRIO_2LEVEL ((__u32)(-1)) + /* gsi routing entry types */ #define KVM_IRQ_ROUTING_IRQCHIP 1 #define KVM_IRQ_ROUTING_MSI 2 #define KVM_IRQ_ROUTING_S390_ADAPTER 3 #define KVM_IRQ_ROUTING_HV_SINT 4 +#define KVM_IRQ_ROUTING_XEN_EVTCHN 5 struct kvm_irq_routing_entry { __u32 gsi; @@ -1178,6 +1194,7 @@ struct kvm_irq_routing_entry { struct kvm_irq_routing_msi msi; struct kvm_irq_routing_s390_adapter adapter; struct kvm_irq_routing_hv_sint hv_sint; + struct kvm_irq_routing_xen_evtchn xen_evtchn; __u32 pad[8]; } u; }; @@ -1208,6 +1225,7 @@ struct kvm_x86_mce { #define KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL (1 << 1) #define KVM_XEN_HVM_CONFIG_SHARED_INFO (1 << 2) #define KVM_XEN_HVM_CONFIG_RUNSTATE (1 << 3) +#define KVM_XEN_HVM_CONFIG_EVTCHN_2LEVEL (1 << 4) struct kvm_xen_hvm_config { __u32 flags; @@ -2031,4 +2049,7 @@ struct kvm_stats_desc { #define KVM_GET_STATS_FD _IO(KVMIO, 0xce) +/* Available with KVM_CAP_XSAVE2 */ +#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave) + #endif /* __LINUX_KVM_H */ From patchwork Fri Mar 11 17:57:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12778494 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1018FC433F5 for ; Fri, 11 Mar 2022 17:57:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350756AbiCKR6w (ORCPT ); Fri, 11 Mar 2022 12:58:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350493AbiCKR6q (ORCPT ); Fri, 11 Mar 2022 12:58:46 -0500 Received: from mail-io1-xd49.google.com (mail-io1-xd49.google.com [IPv6:2607:f8b0:4864:20::d49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD7E178925 for ; Fri, 11 Mar 2022 09:57:41 -0800 (PST) Received: by mail-io1-xd49.google.com with SMTP id y3-20020a056602178300b00645d25c30c1so6779531iox.6 for ; Fri, 11 Mar 2022 09:57:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=reY3JxO0Qz3iJXrFE+fLTwQO2MuKL1UPGAjn20Lqoao=; b=n/M+lnBk+N7zApRlOssTP+KALpqfkDUpxmbbZf9OVnsbAGTF24lyWr2yvrKj3eJhHh KlwuG3VKWe3524zQ0pEL4J6TBwFwPOoRAebN3n0vpides8mGXB+EbYFeJmmkZfQTfGzZ XYvyGdDyjkXVzSAzkiq91lVWeQmg14E+ZshflwW/ntyiQxAJxwuPNucacslawQCbPYYm WD3ZFVMIGBG78tv4VKrrv5Q/SbGCWnBDtlQP2/T9o/33WqeTY/4Pf+YD0SNDX81gEwaX G3KYqOFofFz3jHwq3lO7/3gzvWvfYvIGk9aFdVJLuYnlmsuLWzAaO0YJUmB9pJCY0LLG 0zmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=reY3JxO0Qz3iJXrFE+fLTwQO2MuKL1UPGAjn20Lqoao=; b=OiKI6s2LmE5gmNqwR8gMPYvMcWgrZhnGNtzAFf8n+v+gDnnO6RNCX4DT7HIsHF2/BM eQFgWbsC20xX30vbqMSW04dASF7cq9X5OoJcZ+kFg7P3GIrNJvjxydibNAuCosMvO9CQ XvXq3Kf1hULWf098cfbLc1NThUjmDdFZKFp6NULzZiVqLdMqBo6CBm2PcqE8VdJxNrD3 n412pE0P8Hhqv4H7gqQMbtvwo9VFxH7vRvIUz8ZjBbf27RryTwQZnU/wfnctSst79IH3 Q/ko3TOExbWMjQOE89cmAkALT8MSLeFtnwmQ8zR/DAZxp+hY1Fcx9wm1e7UGmu3luM1x pkFQ== X-Gm-Message-State: AOAM531CvsvgFgmhzv/MOGa65uKdfKtn0AssirzIxy3xxxok4Swhu85j xdgO/kAqKS+sEa0ZWYRaz2MWEsER1Ic= X-Google-Smtp-Source: ABdhPJwIV2dE5aKw/FZ4JxGUOLBoR07htZIM8UZWxJDfUBN8z5M+T3xIKkUCNUzF/rey8m9ZGZWSrRl15SE= X-Received: from oupton.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:404]) (user=oupton job=sendgmr) by 2002:a02:a081:0:b0:317:b141:29ca with SMTP id g1-20020a02a081000000b00317b14129camr9018933jah.275.1647021461237; Fri, 11 Mar 2022 09:57:41 -0800 (PST) Date: Fri, 11 Mar 2022 17:57:14 +0000 In-Reply-To: <20220311175717.616958-1-oupton@google.com> Message-Id: <20220311175717.616958-3-oupton@google.com> Mime-Version: 1.0 References: <20220311174001.605719-1-oupton@google.com> <20220311175717.616958-1-oupton@google.com> X-Mailer: git-send-email 2.35.1.723.g4982287a31-goog Subject: [RFC PATCH kvmtool 2/5] Allow architectures to hook KVM_EXIT_SYSTEM_EVENT From: Oliver Upton To: kvmarm@lists.cs.columbia.edu Cc: kvm@vger.kernel.org, Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , linux-arm-kernel@lists.infradead.org, Peter Shier , Ricardo Koller , Reiji Watanabe , Will Deacon , Julien Thierry , Oliver Upton Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Certain system events require architecture-specific handling. Allow architectures to intervene for exits unhandled by the default exit handler. Signed-off-by: Oliver Upton --- include/kvm/kvm-cpu.h | 1 + kvm-cpu.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/include/kvm/kvm-cpu.h b/include/kvm/kvm-cpu.h index 0f16f8d..75e42d8 100644 --- a/include/kvm/kvm-cpu.h +++ b/include/kvm/kvm-cpu.h @@ -20,6 +20,7 @@ void kvm_cpu__run(struct kvm_cpu *vcpu); int kvm_cpu__start(struct kvm_cpu *cpu); bool kvm_cpu__handle_exit(struct kvm_cpu *vcpu); int kvm_cpu__get_endianness(struct kvm_cpu *vcpu); +bool kvm_cpu__arch_handle_system_event(struct kvm_cpu *vcpu); int kvm_cpu__get_debug_fd(void); void kvm_cpu__set_debug_fd(int fd); diff --git a/kvm-cpu.c b/kvm-cpu.c index 7dec088..d615c37 100644 --- a/kvm-cpu.c +++ b/kvm-cpu.c @@ -23,6 +23,11 @@ int __attribute__((weak)) kvm_cpu__get_endianness(struct kvm_cpu *vcpu) return VIRTIO_ENDIAN_HOST; } +bool __attribute__((weak)) kvm_cpu__arch_handle_system_event(struct kvm_cpu *vcpu) +{ + return false; +} + void kvm_cpu__enable_singlestep(struct kvm_cpu *vcpu) { struct kvm_guest_debug debug = { @@ -224,6 +229,9 @@ int kvm_cpu__start(struct kvm_cpu *cpu) */ switch (cpu->kvm_run->system_event.type) { default: + if (kvm_cpu__arch_handle_system_event(cpu)) + break; + pr_warning("unknown system event type %d", cpu->kvm_run->system_event.type); /* fall through for now */ From patchwork Fri Mar 11 17:57:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12778495 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83FDCC4332F for ; Fri, 11 Mar 2022 17:57:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350549AbiCKR6x (ORCPT ); Fri, 11 Mar 2022 12:58:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350472AbiCKR6t (ORCPT ); Fri, 11 Mar 2022 12:58:49 -0500 Received: from mail-io1-xd4a.google.com (mail-io1-xd4a.google.com [IPv6:2607:f8b0:4864:20::d4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C62F972D8 for ; Fri, 11 Mar 2022 09:57:43 -0800 (PST) Received: by mail-io1-xd4a.google.com with SMTP id g11-20020a056602072b00b00645cc0735d7so6791052iox.1 for ; Fri, 11 Mar 2022 09:57:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=BxxrnSwrIA4lSZ5dK5jxyr2r2tLhZUFOrxcbnlilois=; b=fa5WoWeDUYBwu4AqAKpVBlulmdk6ITEQVYZONtJ2u9pcPIxaUyOx/pOBQgOFg52Yd/ wSfGcWikT539Mu8oowRqbz3fzCMwnwM2i5FeKo6/JzeMJsuGnlAwC+RArs0TelINjAXJ YiiylZhsdD+TKZvFRp2bvcQju/VH3KxGC+y7ml99Qp85+xH7mQOVUVbQSpIhRWsaekAN zUx51OPbUCnvBVDxI6VrdMmWwvrjuDqtvEB+rxlLXPR1SULdF0qUS6NAVJnqAB18H1g1 DwvvD2Doyg3jUEWe2BlVwIkjcpUQlP74u15eK66wr6aSPlw3R/xOQ6q7VbMENibsurOl iEYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=BxxrnSwrIA4lSZ5dK5jxyr2r2tLhZUFOrxcbnlilois=; b=oCaFnXkZTcvsy6nvd5E1DtANhgZ8YXZ2BLaBeI8AuqJvZ5hBDVJAntnrnaC5vG8Rwf ZSohyXBka6k05fgQtUDTeGO7RYoBsPR2fCt1p/ZSuP5snasvsx9GlPa4UBwr2yvCGmrX NKzFsmZyKK8yfYukE934B9ev0NLpdTlsJalDHxG2EMLJdVJD6rNAWcMaWUZ/CwpFKicK jBiQouwSRjvR2cGNW2nRHTGkhzbn7YVomdHukc3pDcnEEg0Ywn9/d5+3XKFK+Dlga9bb tnA/PNsMssVK7FHVdppm9xEYRSG51dYfUelkKr+YXZK/IZM5yMyDG8oD2tJIxfYSNjVz CYow== X-Gm-Message-State: AOAM533sdKZ6rWX+9AAKR6TsZ27TLloPGtvIIVQD+rbgctZxExPbdETD xOXEl3eOfqNJnk+qke8rj0IZPacea7A= X-Google-Smtp-Source: ABdhPJwX1T89M6pC5yjyrmOZYn4413egwXefNOi34Uw2IPjEjKr6OBMM3S5JvF/Oiv1+jz9CqWb3dK8SDTQ= X-Received: from oupton.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:404]) (user=oupton job=sendgmr) by 2002:a05:6638:2388:b0:314:1ec0:b012 with SMTP id q8-20020a056638238800b003141ec0b012mr9295720jat.224.1647021462801; Fri, 11 Mar 2022 09:57:42 -0800 (PST) Date: Fri, 11 Mar 2022 17:57:15 +0000 In-Reply-To: <20220311175717.616958-1-oupton@google.com> Message-Id: <20220311175717.616958-4-oupton@google.com> Mime-Version: 1.0 References: <20220311174001.605719-1-oupton@google.com> <20220311175717.616958-1-oupton@google.com> X-Mailer: git-send-email 2.35.1.723.g4982287a31-goog Subject: [RFC PATCH kvmtool 3/5] ARM: Stash vcpu_init in the vCPU structure From: Oliver Upton To: kvmarm@lists.cs.columbia.edu Cc: kvm@vger.kernel.org, Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , linux-arm-kernel@lists.infradead.org, Peter Shier , Ricardo Koller , Reiji Watanabe , Will Deacon , Julien Thierry , Oliver Upton Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org A subsequent change to kvmtool will require that a vCPU be reset more than once. Derive a valid target/feature set exactly once and stash that for later use. Signed-off-by: Oliver Upton --- arm/include/arm-common/kvm-cpu-arch.h | 18 +++++++++--------- arm/kvm-cpu.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arm/include/arm-common/kvm-cpu-arch.h b/arm/include/arm-common/kvm-cpu-arch.h index 923d2c4..4027afe 100644 --- a/arm/include/arm-common/kvm-cpu-arch.h +++ b/arm/include/arm-common/kvm-cpu-arch.h @@ -10,18 +10,18 @@ struct kvm; struct kvm_cpu { pthread_t thread; - unsigned long cpu_id; - unsigned long cpu_type; - const char *cpu_compatible; + unsigned long cpu_id; + struct kvm_vcpu_init init; + const char *cpu_compatible; - struct kvm *kvm; - int vcpu_fd; - struct kvm_run *kvm_run; + struct kvm *kvm; + int vcpu_fd; + struct kvm_run *kvm_run; struct kvm_cpu_task *task; - u8 is_running; - u8 paused; - u8 needs_nmi; + u8 is_running; + u8 paused; + u8 needs_nmi; struct kvm_coalesced_mmio_ring *ring; diff --git a/arm/kvm-cpu.c b/arm/kvm-cpu.c index 6a2408c..1ea56bb 100644 --- a/arm/kvm-cpu.c +++ b/arm/kvm-cpu.c @@ -128,7 +128,7 @@ struct kvm_cpu *kvm_cpu__arch_init(struct kvm *kvm, unsigned long cpu_id) /* Populate the vcpu structure. */ vcpu->kvm = kvm; vcpu->cpu_id = cpu_id; - vcpu->cpu_type = vcpu_init.target; + vcpu->init = vcpu_init; vcpu->cpu_compatible = target->compatible; vcpu->is_running = true; From patchwork Fri Mar 11 17:57:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12778496 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1ACBAC4167B for ; Fri, 11 Mar 2022 17:57:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350497AbiCKR6y (ORCPT ); Fri, 11 Mar 2022 12:58:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350633AbiCKR6v (ORCPT ); Fri, 11 Mar 2022 12:58:51 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BF50A94DB for ; Fri, 11 Mar 2022 09:57:45 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id b11-20020a5b008b000000b00624ea481d55so7932286ybp.19 for ; Fri, 11 Mar 2022 09:57:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=iMUX4p8oYYdLskY6YlQfUR43FNfUoWfkZJK4wIrDvVI=; b=kbWvR7NSwT//jyD2uA/WkBGtSra3OAWNZLtQDDPfNKfREZh2jH89JBDrkrpTgQ+YNv BUozf2+Uo6ONunKNVgwoR5E9m7HxiNyKMvg/WGnR+sSX0XuH3X6nfPaGNxi3vJ37o/lM d+e2mKjeL9oPXKYywZpE/b7Xl/51yZO7v1R8Wc8yzsnBcH7u1/IxQKScxbUdOYyJ2EmK LOX+JHVm4kFAdEXVqPovN8vrY7fDTjstsHEv/kIjboyaWqWt/BP/PCBTiUiUXfkaA2m/ FTSD1xnG8bA32t2Mx3cnmlZRYON6s8EvQNUCszZAool1frje4oMd6fFK+SEr9nABWojl +9xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=iMUX4p8oYYdLskY6YlQfUR43FNfUoWfkZJK4wIrDvVI=; b=VjJFhT6nTysXOA6sJ2KYcH8vNCfAJIJQFiR1YHiphBaLz+buzeytfpfpiFau83m1lO ZjVmntJCyZGrfZcrseWtyagokAV54d+0wyj4g3Io/yqQ9S0iwOQMnCOBeHr/5cNdN7U/ FHI+vVSjzTZDO28DOojrHf/K2BOYPmFxNA/fItlCyVGn586WpM4wM4faa49b4PNHLGH0 0CZP2oLl9KFTL1wH77KL/xUjo0cSt+Uya7yiLAznQvWxtVpVY1jMNVZzL3/LjIUIyDyt yDEJ9B6JS19OAbaTHY4FolWa6wZtOB/lzJvAC+i7osxCjYcvdKC7LwZyv4REbUGfREpD rb7g== X-Gm-Message-State: AOAM530luwNq31QB61xr9bwjDDY3qyG7O9uDq2DWcN/J+R4Q3n/+3Pi4 5LK42nNP7D7wkYO/X/mQeEjAs2hFGP0= X-Google-Smtp-Source: ABdhPJzPRbWq+blf3W5J139AGKxE7e6TJnEjyAP/74A7vawiP9FcCu7oAu7fi1c5ZnCuQttujGbnOdDK+/Y= X-Received: from oupton.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:404]) (user=oupton job=sendgmr) by 2002:a81:d847:0:b0:2d8:1c55:942a with SMTP id n7-20020a81d847000000b002d81c55942amr9375589ywl.260.1647021464480; Fri, 11 Mar 2022 09:57:44 -0800 (PST) Date: Fri, 11 Mar 2022 17:57:16 +0000 In-Reply-To: <20220311175717.616958-1-oupton@google.com> Message-Id: <20220311175717.616958-5-oupton@google.com> Mime-Version: 1.0 References: <20220311174001.605719-1-oupton@google.com> <20220311175717.616958-1-oupton@google.com> X-Mailer: git-send-email 2.35.1.723.g4982287a31-goog Subject: [RFC PATCH kvmtool 4/5] ARM: Add a helper to re-init a vCPU From: Oliver Upton To: kvmarm@lists.cs.columbia.edu Cc: kvm@vger.kernel.org, Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , linux-arm-kernel@lists.infradead.org, Peter Shier , Ricardo Koller , Reiji Watanabe , Will Deacon , Julien Thierry , Oliver Upton Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Create a helper that can be called to reinitialize a particular vCPU, or in other words issue the KVM_ARM_VCPU_INIT and KVM_ARM_VCPU_FINALIZE ioctls accordingly. Make use of the helper from kvm_cpu__arch_init() after the correct target/feature set have been identified. Calling KVM_ARM_VCPU_INIT with the same target more than once is benign. Signed-off-by: Oliver Upton --- arm/kvm-cpu.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arm/kvm-cpu.c b/arm/kvm-cpu.c index 1ea56bb..164e399 100644 --- a/arm/kvm-cpu.c +++ b/arm/kvm-cpu.c @@ -35,6 +35,15 @@ int kvm_cpu__register_kvm_arm_target(struct kvm_arm_target *target) return -ENOSPC; } +static void kvm_cpu__arch_reinit(struct kvm_cpu *vcpu) +{ + if (ioctl(vcpu->vcpu_fd, KVM_ARM_VCPU_INIT, &vcpu->init) < 0) + die("KVM_ARM_VCPU_INIT failed"); + + if (kvm_cpu__configure_features(vcpu)) + die("Unable to configure requested vcpu features"); +} + struct kvm_cpu *kvm_cpu__arch_init(struct kvm *kvm, unsigned long cpu_id) { struct kvm_arm_target *target; @@ -132,8 +141,7 @@ struct kvm_cpu *kvm_cpu__arch_init(struct kvm *kvm, unsigned long cpu_id) vcpu->cpu_compatible = target->compatible; vcpu->is_running = true; - if (kvm_cpu__configure_features(vcpu)) - die("Unable to configure requested vcpu features"); + kvm_cpu__arch_reinit(vcpu); return vcpu; } From patchwork Fri Mar 11 17:57:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12778497 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DD82C433F5 for ; Fri, 11 Mar 2022 17:57:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346895AbiCKR66 (ORCPT ); Fri, 11 Mar 2022 12:58:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350562AbiCKR64 (ORCPT ); Fri, 11 Mar 2022 12:58:56 -0500 Received: from mail-io1-xd49.google.com (mail-io1-xd49.google.com [IPv6:2607:f8b0:4864:20::d49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E573C085F for ; Fri, 11 Mar 2022 09:57:47 -0800 (PST) Received: by mail-io1-xd49.google.com with SMTP id g11-20020a056602072b00b00645cc0735d7so6791155iox.1 for ; Fri, 11 Mar 2022 09:57:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=4Pv27JBfLZfH/CmvIWK/wVlW7nXuMPk8mN4kvQnrF8Y=; b=LkJFfaF+QDSe8RcIrq5JqVH3HGsEBs6ubj8L5VyPFuDtXYYvW5BAzKcm+lxvvq4MKL iw6Ci+dRx3gDW6Il7hzdXHUXBSOu2ZR3LpsAvK3ISNBGxKKNzwD7mB11XiEaz+Ef7jIh vTpUPJM1SnQPELYHqYezGl0SjuOO9A1V0ezaQ8f+PgJnQ+WwCGIW4wG5me1oNdrmXwxI DmBiVhMsWpXaKbTiNZMqkwamgxdJR2++mu51KA23u7F7k7p9sdvSrPnB/xpF/QzHDKy/ d8EFpp61p/23yPk7SAe/1JkL3dRSgNU0l0v5RNMsOVmyBmEaHQstYer3GWULVNLnaz72 +kvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=4Pv27JBfLZfH/CmvIWK/wVlW7nXuMPk8mN4kvQnrF8Y=; b=b8oKxnWLujtjaj8XJRq48CsyKChXAW65gzmcM8FFss5+IxNedyPpvjXr1CiUk76Cw+ 8HBQyM+OeQZE6w1kqGTXZkQyaesjRSfU4LiJP+j7fk1DvVAY7f+sx9dIdBSOUCZAj/WC YWaumojutd049uCUD3e9iLThnGKwGlhVaVU/wAleLC51k+U+7psGW7OYddDteXTfhkWi Cyjk8dYCGAqcjHegsZeF251UU7VCLkg7Nt7oi21HwIst8cZ+RC+AxC46Vowuq8bGEaQQ OMZqPvG+pW/ZPRVwK3cxq5TWnXKfqMUPmhsZ2NE1t3yoJgAf8Ug9gPTqJed/Bbn9yyFn WOpg== X-Gm-Message-State: AOAM531Wek3js/3IWeaDq6z4Jna0BIWDbI4bIguKuHz0lA2h2RJKLL5u bmLTnUo3pX1yjc7EDYPI6DM8NwfL1ec= X-Google-Smtp-Source: ABdhPJxMl3lNbjrYiw3dPTWd6Qtur4nKZbyrPolqLB3Wtk5CoxQO4h6cUg3DgclyKsOnvihxhaP1UAZjIDM= X-Received: from oupton.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:404]) (user=oupton job=sendgmr) by 2002:a05:6638:d93:b0:317:ca63:2d38 with SMTP id l19-20020a0566380d9300b00317ca632d38mr3186286jaj.171.1647021466505; Fri, 11 Mar 2022 09:57:46 -0800 (PST) Date: Fri, 11 Mar 2022 17:57:17 +0000 In-Reply-To: <20220311175717.616958-1-oupton@google.com> Message-Id: <20220311175717.616958-6-oupton@google.com> Mime-Version: 1.0 References: <20220311174001.605719-1-oupton@google.com> <20220311175717.616958-1-oupton@google.com> X-Mailer: git-send-email 2.35.1.723.g4982287a31-goog Subject: [RFC PATCH kvmtool 5/5] ARM: Implement PSCI SYSTEM_SUSPEND From: Oliver Upton To: kvmarm@lists.cs.columbia.edu Cc: kvm@vger.kernel.org, Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , linux-arm-kernel@lists.infradead.org, Peter Shier , Ricardo Koller , Reiji Watanabe , Will Deacon , Julien Thierry , Oliver Upton Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org KVM_CAP_ARM_SYSTEM_SUSPEND allows VMMs to trap guest attempts to use the PSCI SYSTEM_SUSPEND hypercall. Make use of that capability in KVM tool to implement guest suspend support. Add some minimal SMCCC register handling (params, return values) for AArch32 and AArch64. Perform only the required sanity check before suspending the VM by ensuring all other vCPUs besides the caller are powered off. Leverage KVM_MP_STATE_SUSPENDED to emulate the suspend as an architectural WFI. Signed-off-by: Oliver Upton --- arm/aarch32/kvm-cpu.c | 72 ++++++++++++++++++++++++ arm/aarch64/kvm-cpu.c | 66 ++++++++++++++++++++++ arm/include/arm-common/kvm-cpu-arch.h | 5 ++ arm/kvm-cpu.c | 81 +++++++++++++++++++++++++++ arm/kvm.c | 9 +++ 5 files changed, 233 insertions(+) diff --git a/arm/aarch32/kvm-cpu.c b/arm/aarch32/kvm-cpu.c index 95fb1da..dd5f70f 100644 --- a/arm/aarch32/kvm-cpu.c +++ b/arm/aarch32/kvm-cpu.c @@ -130,3 +130,75 @@ void kvm_cpu__show_registers(struct kvm_cpu *vcpu) die("KVM_GET_ONE_REG failed (LR_svc)"); dprintf(debug_fd, " LR_svc: 0x%x\n", data); } + +u64 kvm_cpu__smccc_get_arg1(struct kvm_vcpu *vcpu) +{ + struct kvm_one_reg reg; + u32 data; + + reg.addr = (u64)&data; + reg.id = ARM_CORE_REG(usr_regs.ARM_r1); + if (ioctl(vcpu->vcpu_fd, KVM_GET_ONE_REG, ®) < 0) + die("KVM_GET_ONE_REG failed (r1)"); + + return data; +} + +u64 kvm_cpu__smccc_get_arg2(struct kvm_vcpu *vcpu) +{ + struct kvm_one_reg reg; + u32 data; + + reg.addr = (u64)&data; + reg.id = ARM_CORE_REG(usr_regs.ARM_r2); + if (ioctl(vcpu->vcpu_fd, KVM_GET_ONE_REG, ®) < 0) + die("KVM_GET_ONE_REG failed (r2)"); + + return data; +} + +void kvm_cpu__smccc_return(struct kvm_cpu *vcpu, u64 a0, u64 a1, u64 a2, u64 a3) +{ + struct kvm_one_reg reg; + u32 data; + + reg.addr = (u64)&data; + + data = (u32)a0; + reg.id = ARM_CORE_REG(usr_regs.ARM_r0); + if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®) < 0) + die("KVM_SET_ONE_REG failed (r0)"); + + data = (u32)a1; + reg.id = ARM_CORE_REG(usr_regs.ARM_r1); + if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®) < 0) + die("KVM_SET_ONE_REG failed (r1)"); + + data = (u32)a2; + reg.id = ARM_CORE_REG(usr_regs.ARM_r2); + if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®) < 0) + die("KVM_SET_ONE_REG failed (r2)"); + + data = (u32)a3; + reg.id = ARM_CORE_REG(usr_regs.ARM_r3); + if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®) < 0) + die("KVM_SET_ONE_REG failed (r3)"); +} + +void kvm_cpu__psci_set_entry(struct kvm_cpu *vcpu, u64 entry_addr, u64 context_id) +{ + struct kvm_one_reg reg; + u32 data; + + reg.addr = (u64)&data; + + data = (u32)entry_addr; + reg.id = ARM_CORE_REG(usr_regs.ARM_pc); + if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®) < 0) + die("KVM_SET_ONE_REG failed (pc)"); + + data = (u32)context_id; + reg.id = ARM64_CORE_REG(usr_regs.ARM_r0); + if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®) < 0) + die("KVM_SET_ONE_REG failed (r0)"); +} diff --git a/arm/aarch64/kvm-cpu.c b/arm/aarch64/kvm-cpu.c index 9f3e858..3118c54 100644 --- a/arm/aarch64/kvm-cpu.c +++ b/arm/aarch64/kvm-cpu.c @@ -254,3 +254,69 @@ void kvm_cpu__show_registers(struct kvm_cpu *vcpu) die("KVM_GET_ONE_REG failed (lr)"); dprintf(debug_fd, " LR: 0x%lx\n", data); } + +u64 kvm_cpu__smccc_get_arg1(struct kvm_cpu *vcpu) +{ + struct kvm_one_reg reg; + u64 data; + + reg.addr = (u64)&data; + reg.id = ARM64_CORE_REG(regs.regs[1]); + if (ioctl(vcpu->vcpu_fd, KVM_GET_ONE_REG, ®) < 0) + die("KVM_GET_ONE_REG failed (x1)"); + + return data; +} + +u64 kvm_cpu__smccc_get_arg2(struct kvm_cpu *vcpu) +{ + struct kvm_one_reg reg; + u64 data; + + reg.addr = (u64)&data; + reg.id = ARM64_CORE_REG(regs.regs[2]); + if (ioctl(vcpu->vcpu_fd, KVM_GET_ONE_REG, ®) < 0) + die("KVM_GET_ONE_REG failed (x2)"); + + return data; +} + +void kvm_cpu__smccc_return(struct kvm_cpu *vcpu, u64 a0, u64 a1, u64 a2, u64 a3) +{ + struct kvm_one_reg reg; + + reg.addr = (u64)&a0; + reg.id = ARM64_CORE_REG(regs.regs[0]); + if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®) < 0) + die("KVM_SET_ONE_REG failed (x0)"); + + reg.addr = (u64)&a1; + reg.id = ARM64_CORE_REG(regs.regs[1]); + if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®) < 0) + die("KVM_SET_ONE_REG failed (x1)"); + + reg.addr = (u64)&a2; + reg.id = ARM64_CORE_REG(regs.regs[2]); + if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®) < 0) + die("KVM_SET_ONE_REG failed (x2)"); + + reg.addr = (u64)&a3; + reg.id = ARM64_CORE_REG(regs.regs[3]); + if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®) < 0) + die("KVM_SET_ONE_REG failed (x3)"); +} + +void kvm_cpu__psci_set_entry(struct kvm_cpu *vcpu, u64 entry_addr, u64 context_id) +{ + struct kvm_one_reg reg; + + reg.addr = (u64)&entry_addr; + reg.id = ARM64_CORE_REG(regs.pc); + if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®) < 0) + die("KVM_SET_ONE_REG failed (pc)"); + + reg.addr = (u64)&context_id; + reg.id = ARM64_CORE_REG(regs.regs[0]); + if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®) < 0) + die("KVM_SET_ONE_REG failed (x0)"); +} diff --git a/arm/include/arm-common/kvm-cpu-arch.h b/arm/include/arm-common/kvm-cpu-arch.h index 4027afe..17179c2 100644 --- a/arm/include/arm-common/kvm-cpu-arch.h +++ b/arm/include/arm-common/kvm-cpu-arch.h @@ -59,4 +59,9 @@ static inline bool kvm_cpu__emulate_mmio(struct kvm_cpu *vcpu, u64 phys_addr, unsigned long kvm_cpu__get_vcpu_mpidr(struct kvm_cpu *vcpu); +u64 kvm_cpu__smccc_get_arg1(struct kvm_cpu *vcpu); +u64 kvm_cpu__smccc_get_arg2(struct kvm_cpu *vcpu); +void kvm_cpu__smccc_return(struct kvm_cpu *vcpu, u64 a0, u64 a1, u64 a2, u64 a3); +void kvm_cpu__psci_set_entry(struct kvm_cpu *vcpu, u64 entry_addr, u64 context_id); + #endif /* ARM_COMMON__KVM_CPU_ARCH_H */ diff --git a/arm/kvm-cpu.c b/arm/kvm-cpu.c index 164e399..677f8bb 100644 --- a/arm/kvm-cpu.c +++ b/arm/kvm-cpu.c @@ -163,3 +163,84 @@ bool kvm_cpu__handle_exit(struct kvm_cpu *vcpu) void kvm_cpu__show_page_tables(struct kvm_cpu *vcpu) { } + +static void kvm_cpu__arm_suspend(struct kvm_cpu *vcpu) +{ + struct kvm_mp_state mp_state = { + .mp_state = KVM_MP_STATE_SUSPENDED, + }; + + if (ioctl(vcpu->vcpu_fd, KVM_SET_MP_STATE, &mp_state) < 0) + die("KVM_SET_MP_STATE failed"); +} + +static void kvm_cpu__wakeup(struct kvm_cpu *vcpu) +{ + u64 entry_addr, context_id; + + entry_addr = kvm_cpu__smccc_get_arg1(vcpu); + context_id = kvm_cpu__smccc_get_arg2(vcpu); + + /* + * The resuming CPU could have been a secondary CPU at boot. Ensure the + * vCPU is made runnable. + */ + vcpu->init.features[0] &= ~(1ul << KVM_ARM_VCPU_POWER_OFF); + + kvm_cpu__arch_reinit(vcpu); + kvm_cpu__reset_vcpu(vcpu); + kvm_cpu__psci_set_entry(vcpu, entry_addr, context_id); +} + +static void kvm_cpu__psci_system_suspend(struct kvm_cpu *vcpu) +{ + struct kvm *kvm = vcpu->kvm; + bool denied = false; + int i; + + /* + * Mark the caller as paused before actually pausing the VM. This avoids + * the hazard of attempting to acquire the pause_lock in the SIGKVMPAUSE + * handler from the thread that already holds it. + */ + vcpu->paused = 1; + + kvm__pause(kvm); + for (i = 0; i < kvm->nrcpus; i++) { + struct kvm_cpu *tmp = kvm->cpus[i]; + struct kvm_mp_state mp_state; + + if (vcpu == tmp) + continue; + + if (ioctl(tmp->vcpu_fd, KVM_GET_MP_STATE, &mp_state) < 0) + die("KVM_GET_MP_STATE failed"); + + if (mp_state.mp_state != KVM_MP_STATE_STOPPED) { + denied = true; + break; + } + } + + if (!denied) + kvm_cpu__arm_suspend(vcpu); + else + kvm_cpu__smccc_return(vcpu, PSCI_RET_DENIED, 0, 0, 0); + + vcpu->paused = 0; + kvm__continue(kvm); +} + +bool kvm_cpu__arch_handle_system_event(struct kvm_cpu *vcpu) +{ + switch (vcpu->kvm_run->system_event.type) { + case KVM_SYSTEM_EVENT_SUSPEND: + kvm_cpu__psci_system_suspend(vcpu); + return true; + case KVM_SYSTEM_EVENT_WAKEUP: + kvm_cpu__wakeup(vcpu); + return true; + default: + return false; + } +} diff --git a/arm/kvm.c b/arm/kvm.c index 80d233f..8ae4711 100644 --- a/arm/kvm.c +++ b/arm/kvm.c @@ -86,6 +86,15 @@ void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size) /* Create the virtual GIC. */ if (gic__create(kvm, kvm->cfg.arch.irqchip)) die("Failed to create virtual GIC"); + + if (kvm__supports_extension(kvm, KVM_CAP_ARM_SYSTEM_SUSPEND)) { + struct kvm_enable_cap cap = { + .cap = KVM_CAP_ARM_SYSTEM_SUSPEND, + }; + + if (ioctl(kvm->vm_fd, KVM_ENABLE_CAP, &cap) < 0) + die("Enabling KVM_CAP_ARM_SYSTEM_SUSPEND failed"); + } } #define FDT_ALIGN SZ_2M