|
 |
4a2fec |
From 170662bb45c6a4290391c8f896e437b5dc67e229 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
Date: Tue, 23 Jan 2018 19:12:44 +0100
|
|
|
4a2fec |
Subject: [PATCH 2/8] linux-headers: update
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
Message-id: <1516734766-12075-2-git-send-email-thuth@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 78699
|
|
|
4a2fec |
O-Subject: [RHEL-7.5 qemu-kvm-ma PATCH 1/3] linux-headers: update
|
|
|
4a2fec |
Bugzilla: 1535606
|
|
|
4a2fec |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
From: Cornelia Huck <cohuck@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Update headers against 4.15-rc9.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit 9cbb636270b4df6f0a548e5c34b895330db5df8b)
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Conflicts:
|
|
|
4a2fec |
include/standard-headers/asm-s390/virtio-ccw.h
|
|
|
4a2fec |
linux-headers/linux/kvm.h
|
|
|
4a2fec |
(simple conflicts since commit dd8739669f95b3065 was missing)
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
include/standard-headers/asm-s390/virtio-ccw.h | 5 +----
|
|
|
4a2fec |
linux-headers/asm-powerpc/kvm.h | 25 +++++++++++++++++++++++++
|
|
|
4a2fec |
linux-headers/asm-s390/kvm.h | 9 ++++-----
|
|
|
4a2fec |
linux-headers/asm-s390/kvm_para.h | 4 ----
|
|
|
4a2fec |
linux-headers/linux/kvm.h | 9 +++++++--
|
|
|
4a2fec |
5 files changed, 37 insertions(+), 15 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/include/standard-headers/asm-s390/virtio-ccw.h b/include/standard-headers/asm-s390/virtio-ccw.h
|
|
|
4a2fec |
index a9a4ebf..2b605f7 100644
|
|
|
4a2fec |
--- a/include/standard-headers/asm-s390/virtio-ccw.h
|
|
|
4a2fec |
+++ b/include/standard-headers/asm-s390/virtio-ccw.h
|
|
|
4a2fec |
@@ -1,12 +1,9 @@
|
|
|
4a2fec |
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
|
|
|
4a2fec |
/*
|
|
|
4a2fec |
* Definitions for virtio-ccw devices.
|
|
|
4a2fec |
*
|
|
|
4a2fec |
* Copyright IBM Corp. 2013
|
|
|
4a2fec |
*
|
|
|
4a2fec |
- * This program is free software; you can redistribute it and/or modify
|
|
|
4a2fec |
- * it under the terms of the GNU General Public License (version 2 only)
|
|
|
4a2fec |
- * as published by the Free Software Foundation.
|
|
|
4a2fec |
- *
|
|
|
4a2fec |
* Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
|
|
|
4a2fec |
*/
|
|
|
4a2fec |
#ifndef __KVM_VIRTIO_CCW_H
|
|
|
4a2fec |
diff --git a/linux-headers/asm-powerpc/kvm.h b/linux-headers/asm-powerpc/kvm.h
|
|
|
4a2fec |
index 8cf8f0c..a1cb407 100644
|
|
|
4a2fec |
--- a/linux-headers/asm-powerpc/kvm.h
|
|
|
4a2fec |
+++ b/linux-headers/asm-powerpc/kvm.h
|
|
|
4a2fec |
@@ -442,6 +442,31 @@ struct kvm_ppc_rmmu_info {
|
|
|
4a2fec |
__u32 ap_encodings[8];
|
|
|
4a2fec |
};
|
|
|
4a2fec |
|
|
|
4a2fec |
+/* For KVM_PPC_GET_CPU_CHAR */
|
|
|
4a2fec |
+struct kvm_ppc_cpu_char {
|
|
|
4a2fec |
+ __u64 character; /* characteristics of the CPU */
|
|
|
4a2fec |
+ __u64 behaviour; /* recommended software behaviour */
|
|
|
4a2fec |
+ __u64 character_mask; /* valid bits in character */
|
|
|
4a2fec |
+ __u64 behaviour_mask; /* valid bits in behaviour */
|
|
|
4a2fec |
+};
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+/*
|
|
|
4a2fec |
+ * Values for character and character_mask.
|
|
|
4a2fec |
+ * These are identical to the values used by H_GET_CPU_CHARACTERISTICS.
|
|
|
4a2fec |
+ */
|
|
|
4a2fec |
+#define KVM_PPC_CPU_CHAR_SPEC_BAR_ORI31 (1ULL << 63)
|
|
|
4a2fec |
+#define KVM_PPC_CPU_CHAR_BCCTRL_SERIALISED (1ULL << 62)
|
|
|
4a2fec |
+#define KVM_PPC_CPU_CHAR_L1D_FLUSH_ORI30 (1ULL << 61)
|
|
|
4a2fec |
+#define KVM_PPC_CPU_CHAR_L1D_FLUSH_TRIG2 (1ULL << 60)
|
|
|
4a2fec |
+#define KVM_PPC_CPU_CHAR_L1D_THREAD_PRIV (1ULL << 59)
|
|
|
4a2fec |
+#define KVM_PPC_CPU_CHAR_BR_HINT_HONOURED (1ULL << 58)
|
|
|
4a2fec |
+#define KVM_PPC_CPU_CHAR_MTTRIG_THR_RECONF (1ULL << 57)
|
|
|
4a2fec |
+#define KVM_PPC_CPU_CHAR_COUNT_CACHE_DIS (1ULL << 56)
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+#define KVM_PPC_CPU_BEHAV_FAVOUR_SECURITY (1ULL << 63)
|
|
|
4a2fec |
+#define KVM_PPC_CPU_BEHAV_L1D_FLUSH_PR (1ULL << 62)
|
|
|
4a2fec |
+#define KVM_PPC_CPU_BEHAV_BNDS_CHK_SPEC_BAR (1ULL << 61)
|
|
|
4a2fec |
+
|
|
|
4a2fec |
/* Per-vcpu XICS interrupt controller state */
|
|
|
4a2fec |
#define KVM_REG_PPC_ICP_STATE (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0x8c)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
|
|
|
4a2fec |
index 8387d71..08ee46a 100644
|
|
|
4a2fec |
--- a/linux-headers/asm-s390/kvm.h
|
|
|
4a2fec |
+++ b/linux-headers/asm-s390/kvm.h
|
|
|
4a2fec |
@@ -5,10 +5,6 @@
|
|
|
4a2fec |
*
|
|
|
4a2fec |
* Copyright IBM Corp. 2008
|
|
|
4a2fec |
*
|
|
|
4a2fec |
- * This program is free software; you can redistribute it and/or modify
|
|
|
4a2fec |
- * it under the terms of the GNU General Public License (version 2 only)
|
|
|
4a2fec |
- * as published by the Free Software Foundation.
|
|
|
4a2fec |
- *
|
|
|
4a2fec |
* Author(s): Carsten Otte <cotte@de.ibm.com>
|
|
|
4a2fec |
* Christian Borntraeger <borntraeger@de.ibm.com>
|
|
|
4a2fec |
*/
|
|
|
4a2fec |
@@ -221,6 +217,7 @@ struct kvm_guest_debug_arch {
|
|
|
4a2fec |
#define KVM_SYNC_RICCB (1UL << 7)
|
|
|
4a2fec |
#define KVM_SYNC_FPRS (1UL << 8)
|
|
|
4a2fec |
#define KVM_SYNC_GSCB (1UL << 9)
|
|
|
4a2fec |
+#define KVM_SYNC_BPBC (1UL << 10)
|
|
|
4a2fec |
/* length and alignment of the sdnx as a power of two */
|
|
|
4a2fec |
#define SDNXC 8
|
|
|
4a2fec |
#define SDNXL (1UL << SDNXC)
|
|
|
4a2fec |
@@ -244,7 +241,9 @@ struct kvm_sync_regs {
|
|
|
4a2fec |
};
|
|
|
4a2fec |
__u8 reserved[512]; /* for future vector expansion */
|
|
|
4a2fec |
__u32 fpc; /* valid on KVM_SYNC_VRS or KVM_SYNC_FPRS */
|
|
|
4a2fec |
- __u8 padding1[52]; /* riccb needs to be 64byte aligned */
|
|
|
4a2fec |
+ __u8 bpbc : 1; /* bp mode */
|
|
|
4a2fec |
+ __u8 reserved2 : 7;
|
|
|
4a2fec |
+ __u8 padding1[51]; /* riccb needs to be 64byte aligned */
|
|
|
4a2fec |
__u8 riccb[64]; /* runtime instrumentation controls block */
|
|
|
4a2fec |
__u8 padding2[192]; /* sdnx needs to be 256byte aligned */
|
|
|
4a2fec |
union {
|
|
|
4a2fec |
diff --git a/linux-headers/asm-s390/kvm_para.h b/linux-headers/asm-s390/kvm_para.h
|
|
|
4a2fec |
index ff1f4e7..1a81ec9 100644
|
|
|
4a2fec |
--- a/linux-headers/asm-s390/kvm_para.h
|
|
|
4a2fec |
+++ b/linux-headers/asm-s390/kvm_para.h
|
|
|
4a2fec |
@@ -3,9 +3,5 @@
|
|
|
4a2fec |
*
|
|
|
4a2fec |
* Copyright IBM Corp. 2008
|
|
|
4a2fec |
*
|
|
|
4a2fec |
- * This program is free software; you can redistribute it and/or modify
|
|
|
4a2fec |
- * it under the terms of the GNU General Public License (version 2 only)
|
|
|
4a2fec |
- * as published by the Free Software Foundation.
|
|
|
4a2fec |
- *
|
|
|
4a2fec |
* Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
|
|
|
4a2fec |
*/
|
|
|
4a2fec |
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
|
|
|
4a2fec |
index 7971a4f..fabd075 100644
|
|
|
4a2fec |
--- a/linux-headers/linux/kvm.h
|
|
|
4a2fec |
+++ b/linux-headers/linux/kvm.h
|
|
|
4a2fec |
@@ -629,9 +629,9 @@ struct kvm_s390_irq {
|
|
|
4a2fec |
|
|
|
4a2fec |
struct kvm_s390_irq_state {
|
|
|
4a2fec |
__u64 buf;
|
|
|
4a2fec |
- __u32 flags;
|
|
|
4a2fec |
+ __u32 flags; /* will stay unused for compatibility reasons */
|
|
|
4a2fec |
__u32 len;
|
|
|
4a2fec |
- __u32 reserved[4];
|
|
|
4a2fec |
+ __u32 reserved[4]; /* will stay unused for compatibility reasons */
|
|
|
4a2fec |
};
|
|
|
4a2fec |
|
|
|
4a2fec |
/* for KVM_SET_GUEST_DEBUG */
|
|
|
4a2fec |
@@ -929,6 +929,9 @@ struct kvm_ppc_resize_hpt {
|
|
|
4a2fec |
#define KVM_CAP_PPC_SMT_POSSIBLE 147
|
|
|
4a2fec |
#define KVM_CAP_HYPERV_SYNIC2 148
|
|
|
4a2fec |
#define KVM_CAP_HYPERV_VP_INDEX 149
|
|
|
4a2fec |
+#define KVM_CAP_S390_AIS_MIGRATION 150
|
|
|
4a2fec |
+#define KVM_CAP_PPC_GET_CPU_CHAR 151
|
|
|
4a2fec |
+#define KVM_CAP_S390_BPB 152
|
|
|
4a2fec |
|
|
|
4a2fec |
#ifdef KVM_CAP_IRQ_ROUTING
|
|
|
4a2fec |
|
|
|
4a2fec |
@@ -1258,6 +1261,8 @@ struct kvm_s390_ucas_mapping {
|
|
|
4a2fec |
#define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg)
|
|
|
4a2fec |
/* Available with KVM_CAP_PPC_RADIX_MMU */
|
|
|
4a2fec |
#define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info)
|
|
|
4a2fec |
+/* Available with KVM_CAP_PPC_GET_CPU_CHAR */
|
|
|
4a2fec |
+#define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char)
|
|
|
4a2fec |
|
|
|
4a2fec |
/* ioctl for vm fd */
|
|
|
4a2fec |
#define KVM_CREATE_DEVICE _IOWR(KVMIO, 0xe0, struct kvm_create_device)
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|