84 lines
3.0 KiB
Diff
84 lines
3.0 KiB
Diff
|
From d9a63d12b5804eb172a040a16d7e725853c41a8c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Huth <thuth@redhat.com>
|
||
|
|
Date: Wed, 11 Nov 2020 12:03:12 -0500
|
||
|
|
Subject: [PATCH 12/18] linux-headers: Partial update against Linux 5.9-rc4
|
||
|
|
|
||
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||
|
|
Message-id: <20201111120316.707489-9-thuth@redhat.com>
|
||
|
|
Patchwork-id: 99505
|
||
|
|
O-Subject: [RHEL-8.4.0 qemu-kvm PATCH v2 08/12] linux-headers: Partial update against Linux 5.9-rc4
|
||
|
|
Bugzilla: 1798506
|
||
|
|
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
||
|
|
|
||
|
|
Upstream-status: N/A
|
||
|
|
|
||
|
|
This is based on upstream commit e6546342a830e520d14ef03aa95677611de0d90c
|
||
|
|
but only the two files have been included (there were too many conflicts
|
||
|
|
in the other unrelated files, so they have been dropped from this patch).
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
linux-headers/asm-s390/kvm.h | 7 +++++--
|
||
|
|
linux-headers/linux/kvm.h | 6 ++++++
|
||
|
|
2 files changed, 11 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
|
||
|
|
index 0138ccb0d89..f053b8304a8 100644
|
||
|
|
--- a/linux-headers/asm-s390/kvm.h
|
||
|
|
+++ b/linux-headers/asm-s390/kvm.h
|
||
|
|
@@ -231,11 +231,13 @@ struct kvm_guest_debug_arch {
|
||
|
|
#define KVM_SYNC_GSCB (1UL << 9)
|
||
|
|
#define KVM_SYNC_BPBC (1UL << 10)
|
||
|
|
#define KVM_SYNC_ETOKEN (1UL << 11)
|
||
|
|
+#define KVM_SYNC_DIAG318 (1UL << 12)
|
||
|
|
|
||
|
|
#define KVM_SYNC_S390_VALID_FIELDS \
|
||
|
|
(KVM_SYNC_PREFIX | KVM_SYNC_GPRS | KVM_SYNC_ACRS | KVM_SYNC_CRS | \
|
||
|
|
KVM_SYNC_ARCH0 | KVM_SYNC_PFAULT | KVM_SYNC_VRS | KVM_SYNC_RICCB | \
|
||
|
|
- KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN)
|
||
|
|
+ KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN | \
|
||
|
|
+ KVM_SYNC_DIAG318)
|
||
|
|
|
||
|
|
/* length and alignment of the sdnx as a power of two */
|
||
|
|
#define SDNXC 8
|
||
|
|
@@ -264,7 +266,8 @@ struct kvm_sync_regs {
|
||
|
|
__u8 reserved2 : 7;
|
||
|
|
__u8 padding1[51]; /* riccb needs to be 64byte aligned */
|
||
|
|
__u8 riccb[64]; /* runtime instrumentation controls block */
|
||
|
|
- __u8 padding2[192]; /* sdnx needs to be 256byte aligned */
|
||
|
|
+ __u64 diag318; /* diagnose 0x318 info */
|
||
|
|
+ __u8 padding2[184]; /* sdnx needs to be 256byte aligned */
|
||
|
|
union {
|
||
|
|
__u8 sdnx[SDNXL]; /* state description annex */
|
||
|
|
struct {
|
||
|
|
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
|
||
|
|
index 578cd97c0d9..6bba4ec136b 100644
|
||
|
|
--- a/linux-headers/linux/kvm.h
|
||
|
|
+++ b/linux-headers/linux/kvm.h
|
||
|
|
@@ -276,6 +276,7 @@ struct kvm_run {
|
||
|
|
/* KVM_EXIT_FAIL_ENTRY */
|
||
|
|
struct {
|
||
|
|
__u64 hardware_entry_failure_reason;
|
||
|
|
+ __u32 cpu;
|
||
|
|
} fail_entry;
|
||
|
|
/* KVM_EXIT_EXCEPTION */
|
||
|
|
struct {
|
||
|
|
@@ -1011,6 +1012,11 @@ struct kvm_ppc_resize_hpt {
|
||
|
|
#define KVM_CAP_S390_VCPU_RESETS 179
|
||
|
|
#define KVM_CAP_S390_PROTECTED 180
|
||
|
|
#define KVM_CAP_PPC_SECURE_GUEST 181
|
||
|
|
+#define KVM_CAP_HALT_POLL 182
|
||
|
|
+#define KVM_CAP_ASYNC_PF_INT 183
|
||
|
|
+#define KVM_CAP_LAST_CPU 184
|
||
|
|
+#define KVM_CAP_SMALLER_MAXPHYADDR 185
|
||
|
|
+#define KVM_CAP_S390_DIAG318 186
|
||
|
|
|
||
|
|
#ifdef KVM_CAP_IRQ_ROUTING
|
||
|
|
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|