Skip to content

Commit 97413ce

Browse files
dwmw2oupton
authored andcommitted
KVM: arm64: Add PSCI v1.3 SYSTEM_OFF2 function for hibernation
The PSCI v1.3 specification adds support for a SYSTEM_OFF2 function which is analogous to ACPI S4 state. This will allow hosting environments to determine that a guest is hibernated rather than just powered off, and ensure that they preserve the virtual environment appropriately to allow the guest to resume safely (or bump the hardware_signature in the FACS to trigger a clean reboot instead). This feature is safe to enable unconditionally (in a subsequent commit) because it is exposed to userspace through the existing KVM_SYSTEM_EVENT_SHUTDOWN event, just with an additional flag which userspace can use to know that the instance intended hibernation instead of a plain power-off. As with SYSTEM_RESET2, there is only one type available (in this case HIBERNATE_OFF), and it is not explicitly reported to userspace through the event; userspace can get it from the registers if it cares). Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> Reviewed-by: Miguel Luis <miguel.luis@oracle.com> Link: https://lore.kernel.org/r/20241019172459.2241939-3-dwmw2@infradead.org [oliver: slight cleanup of comments] Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
1 parent 2f2d469 commit 97413ce

3 files changed

Lines changed: 54 additions & 0 deletions

File tree

Documentation/virt/kvm/api.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6855,6 +6855,10 @@ the first `ndata` items (possibly zero) of the data array are valid.
68556855
the guest issued a SYSTEM_RESET2 call according to v1.1 of the PSCI
68566856
specification.
68576857

6858+
- for arm64, data[0] is set to KVM_SYSTEM_EVENT_SHUTDOWN_FLAG_PSCI_OFF2
6859+
if the guest issued a SYSTEM_OFF2 call according to v1.3 of the PSCI
6860+
specification.
6861+
68586862
- for RISC-V, data[0] is set to the value of the second argument of the
68596863
``sbi_system_reset`` call.
68606864

@@ -6888,6 +6892,12 @@ either:
68886892
- Deny the guest request to suspend the VM. See ARM DEN0022D.b 5.19.2
68896893
"Caller responsibilities" for possible return values.
68906894

6895+
Hibernation using the PSCI SYSTEM_OFF2 call is enabled when PSCI v1.3
6896+
is enabled. If a guest invokes the PSCI SYSTEM_OFF2 function, KVM will
6897+
exit to userspace with the KVM_SYSTEM_EVENT_SHUTDOWN event type and with
6898+
data[0] set to KVM_SYSTEM_EVENT_SHUTDOWN_FLAG_PSCI_OFF2. The only
6899+
supported hibernate type for the SYSTEM_OFF2 function is HIBERNATE_OFF.
6900+
68916901
::
68926902

68936903
/* KVM_EXIT_IOAPIC_EOI */

arch/arm64/include/uapi/asm/kvm.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,12 @@ enum {
484484
*/
485485
#define KVM_SYSTEM_EVENT_RESET_FLAG_PSCI_RESET2 (1ULL << 0)
486486

487+
/*
488+
* Shutdown caused by a PSCI v1.3 SYSTEM_OFF2 call.
489+
* Valid only when the system event has a type of KVM_SYSTEM_EVENT_SHUTDOWN.
490+
*/
491+
#define KVM_SYSTEM_EVENT_SHUTDOWN_FLAG_PSCI_OFF2 (1ULL << 0)
492+
487493
/* run->fail_entry.hardware_entry_failure_reason codes. */
488494
#define KVM_EXIT_FAIL_ENTRY_CPU_UNSUPPORTED (1ULL << 0)
489495

arch/arm64/kvm/psci.c

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,12 @@ static void kvm_psci_system_off(struct kvm_vcpu *vcpu)
194194
kvm_prepare_system_event(vcpu, KVM_SYSTEM_EVENT_SHUTDOWN, 0);
195195
}
196196

197+
static void kvm_psci_system_off2(struct kvm_vcpu *vcpu)
198+
{
199+
kvm_prepare_system_event(vcpu, KVM_SYSTEM_EVENT_SHUTDOWN,
200+
KVM_SYSTEM_EVENT_SHUTDOWN_FLAG_PSCI_OFF2);
201+
}
202+
197203
static void kvm_psci_system_reset(struct kvm_vcpu *vcpu)
198204
{
199205
kvm_prepare_system_event(vcpu, KVM_SYSTEM_EVENT_RESET, 0);
@@ -358,6 +364,11 @@ static int kvm_psci_1_x_call(struct kvm_vcpu *vcpu, u32 minor)
358364
if (minor >= 1)
359365
val = 0;
360366
break;
367+
case PSCI_1_3_FN_SYSTEM_OFF2:
368+
case PSCI_1_3_FN64_SYSTEM_OFF2:
369+
if (minor >= 3)
370+
val = PSCI_1_3_OFF_TYPE_HIBERNATE_OFF;
371+
break;
361372
}
362373
break;
363374
case PSCI_1_0_FN_SYSTEM_SUSPEND:
@@ -392,6 +403,33 @@ static int kvm_psci_1_x_call(struct kvm_vcpu *vcpu, u32 minor)
392403
break;
393404
}
394405
break;
406+
case PSCI_1_3_FN_SYSTEM_OFF2:
407+
kvm_psci_narrow_to_32bit(vcpu);
408+
fallthrough;
409+
case PSCI_1_3_FN64_SYSTEM_OFF2:
410+
if (minor < 3)
411+
break;
412+
413+
arg = smccc_get_arg1(vcpu);
414+
/*
415+
* SYSTEM_OFF2 defaults to HIBERNATE_OFF if arg1 is zero. arg2
416+
* must be zero.
417+
*/
418+
if ((arg && arg != PSCI_1_3_OFF_TYPE_HIBERNATE_OFF) ||
419+
smccc_get_arg2(vcpu) != 0) {
420+
val = PSCI_RET_INVALID_PARAMS;
421+
break;
422+
}
423+
kvm_psci_system_off2(vcpu);
424+
/*
425+
* We shouldn't be going back to the guest after receiving a
426+
* SYSTEM_OFF2 request. Preload a return value of
427+
* INTERNAL_FAILURE should userspace ignore the exit and resume
428+
* the vCPU.
429+
*/
430+
val = PSCI_RET_INTERNAL_FAILURE;
431+
ret = 0;
432+
break;
395433
default:
396434
return kvm_psci_0_2_call(vcpu);
397435
}

0 commit comments

Comments
 (0)