History

Merge tag 'kvm-s390-next-7.0-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

- gmap rewrite: completely new memory management for kvm/s390 - vSIE improvement - maintainership change for s390 vfio-pci - small quality of life improvement for protected guests

Paolo Bonzini committed 9 months ago

Commit b1195182 parents bf2c313 e3372ff51 files · +5920 −5502Browse files

Showing the changes to include/uapi/linux (1 of 51 files). Show all

Unified · Split

include/uapi/linux/kvm.h+12−0
@@ -984,6 +984,7 @@ struct kvm_enable_cap { · 983 unmodified lines
984#define KVM_CAP_GUEST_MEMFD_FLAGS 244984#define KVM_CAP_GUEST_MEMFD_FLAGS 244
985#define KVM_CAP_ARM_SEA_TO_USER 245985#define KVM_CAP_ARM_SEA_TO_USER 245
986#define KVM_CAP_S390_USER_OPEREXEC 246986#define KVM_CAP_S390_USER_OPEREXEC 246
987#define KVM_CAP_S390_KEYOP 247
987 988
988struct kvm_irq_routing_irqchip {989struct kvm_irq_routing_irqchip {
989 __u32 irqchip;990 __u32 irqchip;
@@ -1229,6 +1230,16 @@ struct kvm_vfio_spapr_tce { · 239 unmodified lines
1229 __s32 tablefd;1230 __s32 tablefd;
1230};1231};
1231 1232
1233#define KVM_S390_KEYOP_ISKE 0x01
1234#define KVM_S390_KEYOP_RRBE 0x02
1235#define KVM_S390_KEYOP_SSKE 0x03
1236struct kvm_s390_keyop {
1237 __u64 guest_addr;
1238 __u8 key;
1239 __u8 operation;
1240 __u8 pad[6];
1241};
1242
1232/*1243/*
1233 * KVM_CREATE_VCPU receives as a parameter the vcpu slot, and returns1244 * KVM_CREATE_VCPU receives as a parameter the vcpu slot, and returns
1234 * a vcpu fd.1245 * a vcpu fd.
@@ -1248,6 +1259,7 @@ struct kvm_vfio_spapr_tce { · 13 unmodified lines
1248#define KVM_S390_UCAS_MAP _IOW(KVMIO, 0x50, struct kvm_s390_ucas_mapping)1259#define KVM_S390_UCAS_MAP _IOW(KVMIO, 0x50, struct kvm_s390_ucas_mapping)
1249#define KVM_S390_UCAS_UNMAP _IOW(KVMIO, 0x51, struct kvm_s390_ucas_mapping)1260#define KVM_S390_UCAS_UNMAP _IOW(KVMIO, 0x51, struct kvm_s390_ucas_mapping)
1250#define KVM_S390_VCPU_FAULT _IOW(KVMIO, 0x52, unsigned long)1261#define KVM_S390_VCPU_FAULT _IOW(KVMIO, 0x52, unsigned long)
1262#define KVM_S390_KEYOP _IOWR(KVMIO, 0x53, struct kvm_s390_keyop)
1251 1263
1252/* Device model IOC */1264/* Device model IOC */
1253#define KVM_CREATE_IRQCHIP _IO(KVMIO, 0x60)1265#define KVM_CREATE_IRQCHIP _IO(KVMIO, 0x60)