From nobody Fri Oct 31 03:46:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1756591946; cv=none; d=zohomail.com; s=zohoarc; b=IKygfPIVHNhWoWVLerZkxjwIsg8apw9oQjP3fzyoT9DkmpErI+JaDKSue7GsMo2jJ5J8oZdZH2JpKQG66tcj8VQ5TMbjghBSexs4YHRGOeXngvyF7OOasoq2zGQDSwPGpQyEG7H6iHMlElLMjSmqROH0mACfuk51L3HaFNQwBo4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756591946; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+l1ajKvruEehBQlS6tknmImuDpxx3sppzEvUtj7BIK4=; b=ggacZcuUHEhbC/8Qi02sIQXF5bCjr9axlIFA7f0S5/XOYvJ72e6xKMvXxt/E8lKsnj8aXkmY5TRIdFV4UM0LBhpZhacf/sS4sP28goAdGwLdOM6ZzrVoQcVWWB4z+UFu+0DjIbSg1y74pqgAvQyHXuf8IRL47sfw08dBjuPEbBY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1756591946391761.0445652245179; Sat, 30 Aug 2025 15:12:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1103291.1455089 (Exim 4.92) (envelope-from ) id 1usTng-0004JV-0x; Sat, 30 Aug 2025 22:11:56 +0000 Received: by outflank-mailman (output) from mailman id 1103291.1455089; Sat, 30 Aug 2025 22:11:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1usTnf-0004Gv-R6; Sat, 30 Aug 2025 22:11:55 +0000 Received: by outflank-mailman (input) for mailman id 1103291; Sat, 30 Aug 2025 22:11:54 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1usTne-0004DJ-Fd for xen-devel@lists.xenproject.org; Sat, 30 Aug 2025 22:11:54 +0000 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [2a00:1450:4864:20::22f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 54e04af6-85ee-11f0-8adc-4578a1afcccb; Sun, 31 Aug 2025 00:11:52 +0200 (CEST) Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-336ce4a8bfcso4004541fa.0 for ; Sat, 30 Aug 2025 15:11:52 -0700 (PDT) Received: from yp-VivoBook-ASUSLaptop-M1503QA-M1503QA.. ([95.67.15.120]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-336d0e3f39dsm4662091fa.45.2025.08.30.15.11.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Aug 2025 15:11:50 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 54e04af6-85ee-11f0-8adc-4578a1afcccb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756591911; x=1757196711; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+l1ajKvruEehBQlS6tknmImuDpxx3sppzEvUtj7BIK4=; b=BsaXQyM0dR+WzdMGJpxkej9DzkFN9OfCAnTi6nykFiiV1+IhtebKp14ZB7hwz+8fyk 1kQRrnNZKaWbeI7HZF/U/km/1Leu6N+qN8gwqg8+Jr2vFbezC7zl7fL/e09+o0HKalas opOvAeRXPO1K6VFpie4tH7eXX1JNjOqQn1lPS4KzBtoThvqHK1Y17uvtD7x2BNN+2Au+ R74LKbVfwm5l2KBwGUV1XIB5UE5puPTSVBzEUryYzGYLOXuCbm4JcDF5TOeRBtDiO68v jFdEumo67jlNnRAsLi3i4MK4uPWb7LAZ84WkXt7Em+uuIAYcKdnb5kRZ6Ra9ZtPer87k wutQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756591911; x=1757196711; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+l1ajKvruEehBQlS6tknmImuDpxx3sppzEvUtj7BIK4=; b=nGR4WBPTim7lBp30sZZQhx8+M/t5qcpiXUQOoBsbCKgswG6IOzTiFmBSAHis6v7cNc hl/u7C5PEU1qE5oAaYrU3BWpFidCln8gBN3WGHACeQv3OVJ2rYujqFqQHAPRT2Lcd9Xo NJpRYBf2A6a2oZXeAa6iOwV1uIcE7nLMUl1dWz1k3gVwLt9RgCibd9lcEU4Ga7bwDdjc XMkiu/4kd1knqBAnUpDFwOqHYYSgxVUn+prfMbAG57sBYFtrWxWdnesmIov19quXqytM hsKBILd9q/+2TLOIZloaUVJe+/wJhRlTtWfdqYd1Tv4WCkL3t6VTZw/MsOBAt4QE8Gmg yVxA== X-Gm-Message-State: AOJu0YxDzdcmB3/zasXA7++fX2MdPTde3gKzOyCOXWx3ehag/0shg8Cp yYAMtocuF8FdzTGfLvELEad9bpM6MCDsJn4ckhnd/h7+IIVaWqh77K170Go4I/kx X-Gm-Gg: ASbGncv21yPoTk/rgOUy5+qBmS9JkIFjk7bg8IshfQ4/qob4tlhevy8yC2w+ozF+ywL 236BW3nlpDb053NRrFbct9bRh5eQ6qTTf7yqcu2skbZiXZnDpvfgFLscIb2D0+1eghJbU4OxkAi TiHYHRieyasPC1ly1P7WJNtbMEiTYcCCOCraGGyevIyQ2P58vVt9MRzIbzgvZQs7yt7SP4PdWiL 2egkEybfZ16KTQJr/+bBALIrNhiJcoAAWPf8/s9fqh31WWct+HBugRXTt3eXwDmGUPGLVIyyJXS Jl7aAU97kOmevVJAe76GNFNmMhtjgG5ILg6jwCEHKkZQ7LNqjMMZzb4l7s0YeS82GegWSg2C72V t1Iepx1QiADxNmVCBFfckmybEDjmLrAtM2EZrU3/yyIXmm+2Sm/jzgiCDkJuwSA== X-Google-Smtp-Source: AGHT+IFtYSeneux9Y2bWfhFp02RMYgTm44SVwuqGiZdzA2hZBjkQfnZqolNRAygviWe8dPbWPIe/XQ== X-Received: by 2002:a05:651c:b2a:b0:336:da93:1089 with SMTP id 38308e7fff4ca-336da9319e6mr978181fa.39.1756591911024; Sat, 30 Aug 2025 15:11:51 -0700 (PDT) From: Mykola Kvach To: xen-devel@lists.xenproject.org Cc: Mykola Kvach , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk , Andrew Cooper , Anthony PERARD , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Shawn Anastasio , Alistair Francis , Bob Eshleman , Connor Davis , Oleksii Kurochko Subject: [PATCH v12 1/4] xen/arm: Implement PSCI SYSTEM_SUSPEND call for guests Date: Sun, 31 Aug 2025 01:10:28 +0300 Message-ID: <244e5c2bcebad9563595ac7564ffa105d5f568d3.1756586648.git.mykola_kvach@epam.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1756591947524116600 Content-Type: text/plain; charset="utf-8" From: Mykola Kvach Add support for the PSCI SYSTEM_SUSPEND function in the vPSCI interface, allowing guests to request suspend via the PSCI v1.0 SYSTEM_SUSPEND call (both 32-bit and 64-bit variants). Implementation details: - Add SYSTEM_SUSPEND function IDs to PSCI definitions - Trap and handle SYSTEM_SUSPEND in vPSCI - Allow only non-hardware domains to invoke SYSTEM_SUSPEND; return PSCI_NOT_SUPPORTED for the hardware domain to avoid halting the system in hwdom_shutdown() via domain_shutdown - Require all secondary VCPUs of the calling domain to be offline before suspend, as mandated by the PSCI specification The arch_domain_resume() function is an architecture-specific hook that is invoked during domain resume to perform any necessary setup or restoration steps required by the platform. The new vpsci_vcpu_up_prepare() helper is called on the resume path to set = up the vCPU context (such as entry point, some system regs and context ID) bef= ore resuming a suspended guest. This keeps ARM/vPSCI-specific logic out of comm= on code and avoids intrusive changes to the generic resume flow. Usage: For Linux-based guests, suspend can be initiated with: echo mem > /sys/power/state or via: systemctl suspend Resuming the guest is performed from control domain using: xl resume Signed-off-by: Mykola Kvach Reviewed-by: Volodymyr Babchuk --- Changes in v12: - Use the input vCPU from vpsci_vcpu_up_prepare function argument instead o= f current. - Add a check for the wake_cpu pointer on resume. - Call arch_domain_resume() under shutdown_lock. - Drop redundant vgic_clear_pending_irqs() call from vpsci_vcpu_up_prepare(= ). - Cosmetic fixes. Changes in V11: - introduce arch_domain_resume() and vpsci_vcpu_up_prepare(), which are now called on the resume path to avoid extra modifications to common code. The vCPU context is now updated during domain resume. Changes in V10: - small changes to the commit message reflect updates introduced in this version of the patch. - Comments are improved, clarified, and expanded, especially regarding PSCI requirements and context handling. - An ARM-specific helper (domain_resume_nopause_helper) - gprintk() and PRIregister are used for logging in vPSCI code. - An isb() is added before p2m_save_state - The is_64bit_domain check is dropped when masking the upper part of entry point and cid for SMC32 SYSTEM_SUSPEND PSCI calls Changes in V9: - no functional changes - cosmetic chnages after review - enhance commit message and add extra comment to the code after review Changes in V8: - GIC and virtual timer context must be saved when the domain suspends - rework locking - minor changes after code review Changes in V7: - add proper locking - minor changes after code review Changes in V6: - skip execution of ctxt_switch_from for vcpu that is in paused domain - add implementation of domain_resume without domain_pause - add helper function to determine if vcpu is suspended or not - ignore upper 32 bits of argument values when the domain is 64-bit and calls the SMC32 SYSTEM_SUSPEND function - cosmetic changes after review Changes in V5: - don't use standby mode, restore execution in a provided by guest point - move checking that all CPUs, except current one, are offline to after pausing the vCPUs - provide ret status from arch_domain_shutdown and handle it in domain_shutdown - adjust VPSCI_NR_FUNCS to reflect the number of newly added PSCI functions Changes in V4: Dropped all changes related to watchdog, domain is marked as shutting down in domain_shutdown and watchdog timeout handler won't trigger because of it. Previous versions included code to manage Xen watchdog timers during suspen= d, but this was removed. When a guest OS starts the Xen watchdog (either via t= he kernel driver or xenwatchdogd), it is responsible for managing that state across suspend/resume. On Linux, the Xen kernel driver properly stops the watchdog during suspend. However, when xenwatchdogd is used instead, suspend handling is incomplete, potentially leading to watchdog-triggered resets on resume. Xen leaves watchdog handling to the guest OS and its services. Dropped all changes related to VCPU context, because instead domain_shutdown is used, so we don't need any extra changes for suspending domain. Changes in V3: Dropped all domain flags and related code (which touched common functions l= ike vcpu_unblock), keeping only the necessary changes for Xen suspend/resume, i= .e. suspend/resume is now fully supported only for the hardware domain. Proper support for domU suspend/resume will be added in a future patch. This patch does not yet include VCPU context reset or domain context restoration in VCPU. --- xen/arch/arm/domain.c | 37 ++++++++ xen/arch/arm/include/asm/domain.h | 6 ++ xen/arch/arm/include/asm/perfc_defn.h | 1 + xen/arch/arm/include/asm/psci.h | 2 + xen/arch/arm/include/asm/vpsci.h | 5 +- xen/arch/arm/vpsci.c | 116 +++++++++++++++++++++----- xen/arch/ppc/stubs.c | 5 ++ xen/arch/riscv/stubs.c | 5 ++ xen/arch/x86/domain.c | 5 ++ xen/common/domain.c | 9 ++ xen/include/xen/domain.h | 2 + 11 files changed, 171 insertions(+), 22 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 863ae18157..7d7358abe5 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -12,6 +12,8 @@ #include #include =20 +#include + #include #include #include @@ -27,6 +29,7 @@ #include #include #include +#include #include =20 #include "vpci.h" @@ -880,6 +883,40 @@ void arch_domain_creation_finished(struct domain *d) p2m_domain_creation_finished(d); } =20 +int arch_domain_resume(struct domain *d) +{ + int rc; + typeof(d->arch.resume_ctx) *ctx =3D &d->arch.resume_ctx; + + if ( !d->is_shutting_down || d->shutdown_code !=3D SHUTDOWN_suspend ) + { + dprintk(XENLOG_WARNING, + "%pd: Invalid domain state for resume: is_shutting_down=3D= %d, shutdown_code=3D%d\n", + d, d->is_shutting_down, d->shutdown_code); + return -EINVAL; + } + + /* + * It is still possible to call domain_shutdown() with a suspend reason + * via some hypercalls, such as SCHEDOP_shutdown or SCHEDOP_remote_shu= tdown. + * In these cases, the resume context will be empty. + * This is not expected to cause any issues, so we just warn about the + * situation and return without error, allowing the existing logic to + * proceed as expected. + */ + if ( !ctx->wake_cpu ) + { + dprintk(XENLOG_WARNING, "%pd: Invalid wake CPU pointer for resume\= n", + d); + return 0; + } + + rc =3D vpsci_vcpu_up_prepare(ctx->wake_cpu , ctx->ep, ctx->cid); + memset(ctx, 0, sizeof(*ctx)); + + return rc; +} + static int is_guest_pv32_psr(uint32_t psr) { switch (psr & PSR_MODE_MASK) diff --git a/xen/arch/arm/include/asm/domain.h b/xen/arch/arm/include/asm/d= omain.h index a3487ca713..68185fc4d6 100644 --- a/xen/arch/arm/include/asm/domain.h +++ b/xen/arch/arm/include/asm/domain.h @@ -121,6 +121,12 @@ struct arch_domain void *tee; #endif =20 + struct resume_info { + register_t ep; + register_t cid; + struct vcpu *wake_cpu; + } resume_ctx; + } __cacheline_aligned; =20 struct arch_vcpu diff --git a/xen/arch/arm/include/asm/perfc_defn.h b/xen/arch/arm/include/a= sm/perfc_defn.h index effd25b69e..8dfcac7e3b 100644 --- a/xen/arch/arm/include/asm/perfc_defn.h +++ b/xen/arch/arm/include/asm/perfc_defn.h @@ -33,6 +33,7 @@ PERFCOUNTER(vpsci_system_reset, "vpsci: system_res= et") PERFCOUNTER(vpsci_cpu_suspend, "vpsci: cpu_suspend") PERFCOUNTER(vpsci_cpu_affinity_info, "vpsci: cpu_affinity_info") PERFCOUNTER(vpsci_features, "vpsci: features") +PERFCOUNTER(vpsci_system_suspend, "vpsci: system_suspend") =20 PERFCOUNTER(vcpu_kick, "vcpu: notify other vcpu") =20 diff --git a/xen/arch/arm/include/asm/psci.h b/xen/arch/arm/include/asm/psc= i.h index 4780972621..48a93e6b79 100644 --- a/xen/arch/arm/include/asm/psci.h +++ b/xen/arch/arm/include/asm/psci.h @@ -47,10 +47,12 @@ void call_psci_system_reset(void); #define PSCI_0_2_FN32_SYSTEM_OFF PSCI_0_2_FN32(8) #define PSCI_0_2_FN32_SYSTEM_RESET PSCI_0_2_FN32(9) #define PSCI_1_0_FN32_PSCI_FEATURES PSCI_0_2_FN32(10) +#define PSCI_1_0_FN32_SYSTEM_SUSPEND PSCI_0_2_FN32(14) =20 #define PSCI_0_2_FN64_CPU_SUSPEND PSCI_0_2_FN64(1) #define PSCI_0_2_FN64_CPU_ON PSCI_0_2_FN64(3) #define PSCI_0_2_FN64_AFFINITY_INFO PSCI_0_2_FN64(4) +#define PSCI_1_0_FN64_SYSTEM_SUSPEND PSCI_0_2_FN64(14) =20 /* PSCI v0.2 affinity level state returned by AFFINITY_INFO */ #define PSCI_0_2_AFFINITY_LEVEL_ON 0 diff --git a/xen/arch/arm/include/asm/vpsci.h b/xen/arch/arm/include/asm/vp= sci.h index 0cca5e6830..d790ab3715 100644 --- a/xen/arch/arm/include/asm/vpsci.h +++ b/xen/arch/arm/include/asm/vpsci.h @@ -23,12 +23,15 @@ #include =20 /* Number of function implemented by virtual PSCI (only 0.2 or later) */ -#define VPSCI_NR_FUNCS 12 +#define VPSCI_NR_FUNCS 14 =20 /* Functions handle PSCI calls from the guests */ bool do_vpsci_0_1_call(struct cpu_user_regs *regs, uint32_t fid); bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uint32_t fid); =20 +int vpsci_vcpu_up_prepare(struct vcpu *v, register_t entry_point, + register_t context_id); + #endif /* __ASM_VPSCI_H__ */ =20 /* diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c index 7ba9ccd94b..22c3a5f544 100644 --- a/xen/arch/arm/vpsci.c +++ b/xen/arch/arm/vpsci.c @@ -10,32 +10,16 @@ =20 #include =20 -static int do_common_cpu_on(register_t target_cpu, register_t entry_point, - register_t context_id) +int vpsci_vcpu_up_prepare(struct vcpu *v, register_t entry_point, + register_t context_id) { - struct vcpu *v; - struct domain *d =3D current->domain; - struct vcpu_guest_context *ctxt; int rc; + struct domain *d =3D v->domain; bool is_thumb =3D entry_point & 1; - register_t vcpuid; - - vcpuid =3D vaffinity_to_vcpuid(target_cpu); - - if ( (v =3D domain_vcpu(d, vcpuid)) =3D=3D NULL ) - return PSCI_INVALID_PARAMETERS; - - /* THUMB set is not allowed with 64-bit domain */ - if ( is_64bit_domain(d) && is_thumb ) - return PSCI_INVALID_ADDRESS; - - if ( !test_bit(_VPF_down, &v->pause_flags) ) - return PSCI_ALREADY_ON; + struct vcpu_guest_context *ctxt; =20 if ( (ctxt =3D alloc_vcpu_guest_context()) =3D=3D NULL ) - return PSCI_DENIED; - - vgic_clear_pending_irqs(v); + return -ENOMEM; =20 memset(ctxt, 0, sizeof(*ctxt)); ctxt->user_regs.pc64 =3D (u64) entry_point; @@ -76,8 +60,37 @@ static int do_common_cpu_on(register_t target_cpu, regis= ter_t entry_point, free_vcpu_guest_context(ctxt); =20 if ( rc < 0 ) + return rc; + + return 0; +} + +static int do_common_cpu_on(register_t target_cpu, register_t entry_point, + register_t context_id) +{ + struct vcpu *v; + struct domain *d =3D current->domain; + int rc; + bool is_thumb =3D entry_point & 1; + register_t vcpuid; + + vcpuid =3D vaffinity_to_vcpuid(target_cpu); + + if ( (v =3D domain_vcpu(d, vcpuid)) =3D=3D NULL ) + return PSCI_INVALID_PARAMETERS; + + /* THUMB set is not allowed with 64-bit domain */ + if ( is_64bit_domain(d) && is_thumb ) + return PSCI_INVALID_ADDRESS; + + if ( !test_bit(_VPF_down, &v->pause_flags) ) + return PSCI_ALREADY_ON; + + rc =3D vpsci_vcpu_up_prepare(v, entry_point, context_id); + if ( rc ) return PSCI_DENIED; =20 + vgic_clear_pending_irqs(v); vcpu_wake(v); =20 return PSCI_SUCCESS; @@ -197,6 +210,48 @@ static void do_psci_0_2_system_reset(void) domain_shutdown(d,SHUTDOWN_reboot); } =20 +static int32_t do_psci_1_0_system_suspend(register_t epoint, register_t ci= d) +{ + int32_t rc; + struct vcpu *v; + struct domain *d =3D current->domain; + bool is_thumb =3D epoint & 1; + + /* THUMB set is not allowed with 64-bit domain */ + if ( is_64bit_domain(d) && is_thumb ) + return PSCI_INVALID_ADDRESS; + + /* SYSTEM_SUSPEND is not supported for the hardware domain yet */ + if ( is_hardware_domain(d) ) + return PSCI_NOT_SUPPORTED; + + /* Ensure that all CPUs other than the calling one are offline */ + domain_lock(d); + for_each_vcpu ( d, v ) + { + if ( v !=3D current && is_vcpu_online(v) ) + { + domain_unlock(d); + return PSCI_DENIED; + } + } + domain_unlock(d); + + rc =3D domain_shutdown(d, SHUTDOWN_suspend); + if ( rc ) + return PSCI_DENIED; + + d->arch.resume_ctx.ep =3D epoint; + d->arch.resume_ctx.cid =3D cid; + d->arch.resume_ctx.wake_cpu =3D current; + + gprintk(XENLOG_DEBUG, + "SYSTEM_SUSPEND requested, epoint=3D0x%"PRIregister", cid=3D0x= %"PRIregister"\n", + epoint, cid); + + return rc; +} + static int32_t do_psci_1_0_features(uint32_t psci_func_id) { /* /!\ Ordered by function ID and not name */ @@ -214,6 +269,8 @@ static int32_t do_psci_1_0_features(uint32_t psci_func_= id) case PSCI_0_2_FN32_SYSTEM_OFF: case PSCI_0_2_FN32_SYSTEM_RESET: case PSCI_1_0_FN32_PSCI_FEATURES: + case PSCI_1_0_FN32_SYSTEM_SUSPEND: + case PSCI_1_0_FN64_SYSTEM_SUSPEND: case ARM_SMCCC_VERSION_FID: return 0; default: @@ -344,6 +401,23 @@ bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uin= t32_t fid) return true; } =20 + case PSCI_1_0_FN32_SYSTEM_SUSPEND: + case PSCI_1_0_FN64_SYSTEM_SUSPEND: + { + register_t epoint =3D PSCI_ARG(regs, 1); + register_t cid =3D PSCI_ARG(regs, 2); + + if ( fid =3D=3D PSCI_1_0_FN32_SYSTEM_SUSPEND ) + { + epoint &=3D GENMASK(31, 0); + cid &=3D GENMASK(31, 0); + } + + perfc_incr(vpsci_system_suspend); + PSCI_SET_RESULT(regs, do_psci_1_0_system_suspend(epoint, cid)); + return true; + } + default: return false; } diff --git a/xen/arch/ppc/stubs.c b/xen/arch/ppc/stubs.c index bdaf474c5c..0db0627b5c 100644 --- a/xen/arch/ppc/stubs.c +++ b/xen/arch/ppc/stubs.c @@ -224,6 +224,11 @@ void arch_domain_creation_finished(struct domain *d) BUG_ON("unimplemented"); } =20 +int arch_domain_resume(struct domain *d) +{ + return 0; +} + int arch_set_info_guest(struct vcpu *v, vcpu_guest_context_u c) { BUG_ON("unimplemented"); diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index 1a8c86cd8d..52532ae14d 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -198,6 +198,11 @@ void arch_domain_creation_finished(struct domain *d) BUG_ON("unimplemented"); } =20 +int arch_domain_resume(struct domain *d) +{ + return 0; +} + int arch_set_info_guest(struct vcpu *v, vcpu_guest_context_u c) { BUG_ON("unimplemented"); diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 19fd86ce88..94a06bc697 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1138,6 +1138,11 @@ void arch_domain_creation_finished(struct domain *d) hvm_domain_creation_finished(d); } =20 +int arch_domain_resume(struct domain *d) +{ + return 0; +} + #ifdef CONFIG_COMPAT #define xen_vcpu_guest_context vcpu_guest_context #define fpu_ctxt fpu_ctxt.x diff --git a/xen/common/domain.c b/xen/common/domain.c index 104e917f07..667017c5e1 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1352,6 +1352,7 @@ int domain_shutdown(struct domain *d, u8 reason) void domain_resume(struct domain *d) { struct vcpu *v; + int rc; =20 /* * Some code paths assume that shutdown status does not get reset under @@ -1361,6 +1362,13 @@ void domain_resume(struct domain *d) =20 spin_lock(&d->shutdown_lock); =20 + rc =3D arch_domain_resume(d); + if ( rc ) + { + printk("%pd: Failed to resume domain (ret %d)\n", d, rc); + goto fail; + } + d->is_shutting_down =3D d->is_shut_down =3D 0; d->shutdown_code =3D SHUTDOWN_CODE_INVALID; =20 @@ -1371,6 +1379,7 @@ void domain_resume(struct domain *d) v->paused_for_shutdown =3D 0; } =20 + fail: spin_unlock(&d->shutdown_lock); =20 domain_unpause(d); diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index e10baf2615..5f77ffadf1 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -109,6 +109,8 @@ int arch_domain_soft_reset(struct domain *d); =20 void arch_domain_creation_finished(struct domain *d); =20 +int arch_domain_resume(struct domain *d); + void arch_p2m_set_access_required(struct domain *d, bool access_required); =20 int arch_set_info_guest(struct vcpu *v, vcpu_guest_context_u c); --=20 2.48.1