Skip to content

Commit f2d7993

Browse files
committed
KVM: x86: Revert kvm_x86_ops.mem_enc_ioctl() back to an OPTIONAL hook
Restore KVM's handling of a NULL kvm_x86_ops.mem_enc_ioctl, as the hook is NULL on SVM when CONFIG_KVM_AMD_SEV=n, and TDX will soon follow suit. ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at arch/x86/include/asm/kvm-x86-ops.h:130 kvm_x86_vendor_init+0x178b/0x18e0 Modules linked in: CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.15.0-rc2-dc1aead1a985-sink-vm #2 NONE Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015 RIP: 0010:kvm_x86_vendor_init+0x178b/0x18e0 Call Trace: <TASK> svm_init+0x2e/0x60 do_one_initcall+0x56/0x290 kernel_init_freeable+0x192/0x1e0 kernel_init+0x16/0x130 ret_from_fork+0x30/0x50 ret_from_fork_asm+0x1a/0x30 </TASK> ---[ end trace 0000000000000000 ]--- Opportunistically drop the superfluous curly braces. Link: https://lore.kernel.org/all/[email protected] Fixes: b2aaf38 ("KVM: TDX: Add place holder for TDX VM specific mem_enc_op ioctl") Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sean Christopherson <[email protected]>
1 parent a0ee1d5 commit f2d7993

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

arch/x86/include/asm/kvm-x86-ops.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ KVM_X86_OP(leave_smm)
127127
KVM_X86_OP(enable_smi_window)
128128
#endif
129129
KVM_X86_OP_OPTIONAL(dev_get_attr)
130-
KVM_X86_OP(mem_enc_ioctl)
130+
KVM_X86_OP_OPTIONAL(mem_enc_ioctl)
131131
KVM_X86_OP_OPTIONAL(vcpu_mem_enc_ioctl)
132132
KVM_X86_OP_OPTIONAL(mem_enc_register_region)
133133
KVM_X86_OP_OPTIONAL(mem_enc_unregister_region)

arch/x86/kvm/x86.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7324,10 +7324,13 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
73247324
r = READ_ONCE(kvm->arch.default_tsc_khz);
73257325
goto out;
73267326
}
7327-
case KVM_MEMORY_ENCRYPT_OP: {
7327+
case KVM_MEMORY_ENCRYPT_OP:
7328+
r = -ENOTTY;
7329+
if (!kvm_x86_ops.mem_enc_ioctl)
7330+
goto out;
7331+
73287332
r = kvm_x86_call(mem_enc_ioctl)(kvm, argp);
73297333
break;
7330-
}
73317334
case KVM_MEMORY_ENCRYPT_REG_REGION: {
73327335
struct kvm_enc_region region;
73337336

0 commit comments

Comments
 (0)