112 lines
3.7 KiB
Diff
112 lines
3.7 KiB
Diff
|
From 21b19213328826327eba18199b790425659af7d8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Huth <thuth@redhat.com>
|
||
|
|
Date: Fri, 29 Jul 2022 16:55:34 +0200
|
||
|
|
Subject: [PATCH 1/3] redhat: Update linux-headers/linux/kvm.h to v5.18-rc6
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Cédric Le Goater <None>
|
||
|
|
RH-MergeRequest: 220: s390x: Fix skey test in kvm_unit_test
|
||
|
|
RH-Bugzilla: 2124757
|
||
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Commit: [1/2] e514a00305cb0caab9d3acc0efb325853daa6d51
|
||
|
|
|
||
|
|
Upstream Status: RHEL-only
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2124757
|
||
|
|
|
||
|
|
Based on upstream commit e4082063e47e9731dbeb1c26174c17f6038f577f
|
||
|
|
("linux-headers: Update to v5.18-rc6"), but this is focusing on
|
||
|
|
the file linux-headers/linux/kvm.h only (since the other changes
|
||
|
|
related to the VFIO renaming might break some stuff).
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
(cherry picked from commit 71516db15469a02600932a5c1f0d4a9626a91193)
|
||
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
---
|
||
|
|
linux-headers/linux/kvm.h | 27 +++++++++++++++++++++------
|
||
|
|
1 file changed, 21 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
|
||
|
|
index d232feaae9..0d05d02ee4 100644
|
||
|
|
--- a/linux-headers/linux/kvm.h
|
||
|
|
+++ b/linux-headers/linux/kvm.h
|
||
|
|
@@ -445,7 +445,11 @@ struct kvm_run {
|
||
|
|
#define KVM_SYSTEM_EVENT_RESET 2
|
||
|
|
#define KVM_SYSTEM_EVENT_CRASH 3
|
||
|
|
__u32 type;
|
||
|
|
- __u64 flags;
|
||
|
|
+ __u32 ndata;
|
||
|
|
+ union {
|
||
|
|
+ __u64 flags;
|
||
|
|
+ __u64 data[16];
|
||
|
|
+ };
|
||
|
|
} system_event;
|
||
|
|
/* KVM_EXIT_S390_STSI */
|
||
|
|
struct {
|
||
|
|
@@ -562,9 +566,12 @@ struct kvm_s390_mem_op {
|
||
|
|
__u32 op; /* type of operation */
|
||
|
|
__u64 buf; /* buffer in userspace */
|
||
|
|
union {
|
||
|
|
- __u8 ar; /* the access register number */
|
||
|
|
+ struct {
|
||
|
|
+ __u8 ar; /* the access register number */
|
||
|
|
+ __u8 key; /* access key, ignored if flag unset */
|
||
|
|
+ };
|
||
|
|
__u32 sida_offset; /* offset into the sida */
|
||
|
|
- __u8 reserved[32]; /* should be set to 0 */
|
||
|
|
+ __u8 reserved[32]; /* ignored */
|
||
|
|
};
|
||
|
|
};
|
||
|
|
/* types for kvm_s390_mem_op->op */
|
||
|
|
@@ -572,9 +579,12 @@ struct kvm_s390_mem_op {
|
||
|
|
#define KVM_S390_MEMOP_LOGICAL_WRITE 1
|
||
|
|
#define KVM_S390_MEMOP_SIDA_READ 2
|
||
|
|
#define KVM_S390_MEMOP_SIDA_WRITE 3
|
||
|
|
+#define KVM_S390_MEMOP_ABSOLUTE_READ 4
|
||
|
|
+#define KVM_S390_MEMOP_ABSOLUTE_WRITE 5
|
||
|
|
/* flags for kvm_s390_mem_op->flags */
|
||
|
|
#define KVM_S390_MEMOP_F_CHECK_ONLY (1ULL << 0)
|
||
|
|
#define KVM_S390_MEMOP_F_INJECT_EXCEPTION (1ULL << 1)
|
||
|
|
+#define KVM_S390_MEMOP_F_SKEY_PROTECTION (1ULL << 2)
|
||
|
|
|
||
|
|
/* for KVM_INTERRUPT */
|
||
|
|
struct kvm_interrupt {
|
||
|
|
@@ -1134,6 +1144,12 @@ struct kvm_ppc_resize_hpt {
|
||
|
|
#define KVM_CAP_VM_GPA_BITS 207
|
||
|
|
#define KVM_CAP_XSAVE2 208
|
||
|
|
#define KVM_CAP_SYS_ATTRIBUTES 209
|
||
|
|
+#define KVM_CAP_PPC_AIL_MODE_3 210
|
||
|
|
+#define KVM_CAP_S390_MEM_OP_EXTENSION 211
|
||
|
|
+#define KVM_CAP_PMU_CAPABILITY 212
|
||
|
|
+#define KVM_CAP_DISABLE_QUIRKS2 213
|
||
|
|
+/* #define KVM_CAP_VM_TSC_CONTROL 214 */
|
||
|
|
+#define KVM_CAP_SYSTEM_EVENT_DATA 215
|
||
|
|
|
||
|
|
#ifdef KVM_CAP_IRQ_ROUTING
|
||
|
|
|
||
|
|
@@ -1624,9 +1640,6 @@ struct kvm_enc_region {
|
||
|
|
#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
|
||
|
|
#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
|
||
|
|
|
||
|
|
-/* Available with KVM_CAP_XSAVE2 */
|
||
|
|
-#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
|
||
|
|
-
|
||
|
|
struct kvm_s390_pv_sec_parm {
|
||
|
|
__u64 origin;
|
||
|
|
__u64 length;
|
||
|
|
@@ -1973,6 +1986,8 @@ struct kvm_dirty_gfn {
|
||
|
|
#define KVM_BUS_LOCK_DETECTION_OFF (1 << 0)
|
||
|
|
#define KVM_BUS_LOCK_DETECTION_EXIT (1 << 1)
|
||
|
|
|
||
|
|
+#define KVM_PMU_CAP_DISABLE (1 << 0)
|
||
|
|
+
|
||
|
|
/**
|
||
|
|
* struct kvm_stats_header - Header of per vm/vcpu binary statistics data.
|
||
|
|
* @flags: Some extra information for header, always 0 for now.
|
||
|
|
--
|
||
|
|
2.35.3
|
||
|
|
|