mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-24 01:53:15 +07:00
221bb8a46e
VGIC implementation. - s390: support for trapping software breakpoints, nested virtualization (vSIE), the STHYI opcode, initial extensions for CPU model support. - MIPS: support for MIPS64 hosts (32-bit guests only) and lots of cleanups, preliminary to this and the upcoming support for hardware virtualization extensions. - x86: support for execute-only mappings in nested EPT; reduced vmexit latency for TSC deadline timer (by about 30%) on Intel hosts; support for more than 255 vCPUs. - PPC: bugfixes. The ugly bit is the conflicts. A couple of them are simple conflicts due to 4.7 fixes, but most of them are with other trees. There was definitely too much reliance on Acked-by here. Some conflicts are for KVM patches where _I_ gave my Acked-by, but the worst are for this pull request's patches that touch files outside arch/*/kvm. KVM submaintainers should probably learn to synchronize better with arch maintainers, with the latter providing topic branches whenever possible instead of Acked-by. This is what we do with arch/x86. And I should learn to refuse pull requests when linux-next sends scary signals, even if that means that submaintainers have to rebase their branches. Anyhow, here's the list: - arch/x86/kvm/vmx.c: handle_pcommit and EXIT_REASON_PCOMMIT was removed by the nvdimm tree. This tree adds handle_preemption_timer and EXIT_REASON_PREEMPTION_TIMER at the same place. In general all mentions of pcommit have to go. There is also a conflict between a stable fix and this patch, where the stable fix removed the vmx_create_pml_buffer function and its call. - virt/kvm/kvm_main.c: kvm_cpu_notifier was removed by the hotplug tree. This tree adds kvm_io_bus_get_dev at the same place. - virt/kvm/arm/vgic.c: a few final bugfixes went into 4.7 before the file was completely removed for 4.8. - include/linux/irqchip/arm-gic-v3.h: this one is entirely our fault; this is a change that should have gone in through the irqchip tree and pulled by kvm-arm. I think I would have rejected this kvm-arm pull request. The KVM version is the right one, except that it lacks GITS_BASER_PAGES_SHIFT. - arch/powerpc: what a mess. For the idle_book3s.S conflict, the KVM tree is the right one; everything else is trivial. In this case I am not quite sure what went wrong. The commit that is causing the mess (fd7bacbca4, "KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt", 2016-05-15) touches both arch/powerpc/kernel/ and arch/powerpc/kvm/. It's large, but at 396 insertions/5 deletions I guessed that it wasn't really possible to split it and that the 5 deletions wouldn't conflict. That wasn't the case. - arch/s390: also messy. First is hypfs_diag.c where the KVM tree moved some code and the s390 tree patched it. You have to reapply the relevant part of commits6c22c98637, plus all ofe030c1125e, to arch/s390/kernel/diag.c. Or pick the linux-next conflict resolution from http://marc.info/?l=kvm&m=146717549531603&w=2. Second, there is a conflict in gmap.c between a stable fix and 4.8. The KVM version here is the correct one. I have pushed my resolution at refs/heads/merge-20160802 (commit 3d1f53419842) at git://git.kernel.org/pub/scm/virt/kvm/kvm.git. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJXoGm7AAoJEL/70l94x66DugQIAIj703ePAFepB/fCrKHkZZia SGrsBdvAtNsOhr7FQ5qvvjLxiv/cv7CymeuJivX8H+4kuUHUllDzey+RPHYHD9X7 U6n1PdCH9F15a3IXc8tDjlDdOMNIKJixYuq1UyNZMU6NFwl00+TZf9JF8A2US65b x/41W98ilL6nNBAsoDVmCLtPNWAqQ3lajaZELGfcqRQ9ZGKcAYOaLFXHv2YHf2XC qIDMf+slBGSQ66UoATnYV2gAopNlWbZ7n0vO6tE2KyvhHZ1m399aBX1+k8la/0JI 69r+Tz7ZHUSFtmlmyByi5IAB87myy2WQHyAPwj+4vwJkDGPcl0TrupzbG7+T05Y= =42ti -----END PGP SIGNATURE----- Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Pull KVM updates from Paolo Bonzini: - ARM: GICv3 ITS emulation and various fixes. Removal of the old VGIC implementation. - s390: support for trapping software breakpoints, nested virtualization (vSIE), the STHYI opcode, initial extensions for CPU model support. - MIPS: support for MIPS64 hosts (32-bit guests only) and lots of cleanups, preliminary to this and the upcoming support for hardware virtualization extensions. - x86: support for execute-only mappings in nested EPT; reduced vmexit latency for TSC deadline timer (by about 30%) on Intel hosts; support for more than 255 vCPUs. - PPC: bugfixes. * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (302 commits) KVM: PPC: Introduce KVM_CAP_PPC_HTM MIPS: Select HAVE_KVM for MIPS64_R{2,6} MIPS: KVM: Reset CP0_PageMask during host TLB flush MIPS: KVM: Fix ptr->int cast via KVM_GUEST_KSEGX() MIPS: KVM: Sign extend MFC0/RDHWR results MIPS: KVM: Fix 64-bit big endian dynamic translation MIPS: KVM: Fail if ebase doesn't fit in CP0_EBase MIPS: KVM: Use 64-bit CP0_EBase when appropriate MIPS: KVM: Set CP0_Status.KX on MIPS64 MIPS: KVM: Make entry code MIPS64 friendly MIPS: KVM: Use kmap instead of CKSEG0ADDR() MIPS: KVM: Use virt_to_phys() to get commpage PFN MIPS: Fix definition of KSEGX() for 64-bit KVM: VMX: Add VMCS to CPU's loaded VMCSs before VMPTRLD kvm: x86: nVMX: maintain internal copy of current VMCS KVM: PPC: Book3S HV: Save/restore TM state in H_CEDE KVM: PPC: Book3S HV: Pull out TM state save/restore into separate procedures KVM: arm64: vgic-its: Simplify MAPI error handling KVM: arm64: vgic-its: Make vgic_its_cmd_handle_mapi similar to other handlers KVM: arm64: vgic-its: Turn device_id validation into generic ID validation ...
231 lines
4.6 KiB
C
231 lines
4.6 KiB
C
/*
|
|
* s390 diagnose functions
|
|
*
|
|
* Copyright IBM Corp. 2007
|
|
* Author(s): Michael Holzheu <holzheu@de.ibm.com>
|
|
*/
|
|
|
|
#ifndef _ASM_S390_DIAG_H
|
|
#define _ASM_S390_DIAG_H
|
|
|
|
#include <linux/percpu.h>
|
|
|
|
enum diag_stat_enum {
|
|
DIAG_STAT_X008,
|
|
DIAG_STAT_X00C,
|
|
DIAG_STAT_X010,
|
|
DIAG_STAT_X014,
|
|
DIAG_STAT_X044,
|
|
DIAG_STAT_X064,
|
|
DIAG_STAT_X09C,
|
|
DIAG_STAT_X0DC,
|
|
DIAG_STAT_X204,
|
|
DIAG_STAT_X210,
|
|
DIAG_STAT_X224,
|
|
DIAG_STAT_X250,
|
|
DIAG_STAT_X258,
|
|
DIAG_STAT_X288,
|
|
DIAG_STAT_X2C4,
|
|
DIAG_STAT_X2FC,
|
|
DIAG_STAT_X304,
|
|
DIAG_STAT_X308,
|
|
DIAG_STAT_X500,
|
|
NR_DIAG_STAT
|
|
};
|
|
|
|
void diag_stat_inc(enum diag_stat_enum nr);
|
|
void diag_stat_inc_norecursion(enum diag_stat_enum nr);
|
|
|
|
/*
|
|
* Diagnose 10: Release page range
|
|
*/
|
|
static inline void diag10_range(unsigned long start_pfn, unsigned long num_pfn)
|
|
{
|
|
unsigned long start_addr, end_addr;
|
|
|
|
start_addr = start_pfn << PAGE_SHIFT;
|
|
end_addr = (start_pfn + num_pfn - 1) << PAGE_SHIFT;
|
|
|
|
diag_stat_inc(DIAG_STAT_X010);
|
|
asm volatile(
|
|
"0: diag %0,%1,0x10\n"
|
|
"1: nopr %%r7\n"
|
|
EX_TABLE(0b, 1b)
|
|
EX_TABLE(1b, 1b)
|
|
: : "a" (start_addr), "a" (end_addr));
|
|
}
|
|
|
|
/*
|
|
* Diagnose 14: Input spool file manipulation
|
|
*/
|
|
extern int diag14(unsigned long rx, unsigned long ry1, unsigned long subcode);
|
|
|
|
/*
|
|
* Diagnose 210: Get information about a virtual device
|
|
*/
|
|
struct diag210 {
|
|
u16 vrdcdvno; /* device number (input) */
|
|
u16 vrdclen; /* data block length (input) */
|
|
u8 vrdcvcla; /* virtual device class (output) */
|
|
u8 vrdcvtyp; /* virtual device type (output) */
|
|
u8 vrdcvsta; /* virtual device status (output) */
|
|
u8 vrdcvfla; /* virtual device flags (output) */
|
|
u8 vrdcrccl; /* real device class (output) */
|
|
u8 vrdccrty; /* real device type (output) */
|
|
u8 vrdccrmd; /* real device model (output) */
|
|
u8 vrdccrft; /* real device feature (output) */
|
|
} __attribute__((packed, aligned(4)));
|
|
|
|
extern int diag210(struct diag210 *addr);
|
|
|
|
/* bit is set in flags, when physical cpu info is included in diag 204 data */
|
|
#define DIAG204_LPAR_PHYS_FLG 0x80
|
|
#define DIAG204_LPAR_NAME_LEN 8 /* lpar name len in diag 204 data */
|
|
#define DIAG204_CPU_NAME_LEN 16 /* type name len of cpus in diag224 name table */
|
|
|
|
/* diag 204 subcodes */
|
|
enum diag204_sc {
|
|
DIAG204_SUBC_STIB4 = 4,
|
|
DIAG204_SUBC_RSI = 5,
|
|
DIAG204_SUBC_STIB6 = 6,
|
|
DIAG204_SUBC_STIB7 = 7
|
|
};
|
|
|
|
/* The two available diag 204 data formats */
|
|
enum diag204_format {
|
|
DIAG204_INFO_SIMPLE = 0,
|
|
DIAG204_INFO_EXT = 0x00010000
|
|
};
|
|
|
|
enum diag204_cpu_flags {
|
|
DIAG204_CPU_ONLINE = 0x20,
|
|
DIAG204_CPU_CAPPED = 0x40,
|
|
};
|
|
|
|
struct diag204_info_blk_hdr {
|
|
__u8 npar;
|
|
__u8 flags;
|
|
__u16 tslice;
|
|
__u16 phys_cpus;
|
|
__u16 this_part;
|
|
__u64 curtod;
|
|
} __packed;
|
|
|
|
struct diag204_x_info_blk_hdr {
|
|
__u8 npar;
|
|
__u8 flags;
|
|
__u16 tslice;
|
|
__u16 phys_cpus;
|
|
__u16 this_part;
|
|
__u64 curtod1;
|
|
__u64 curtod2;
|
|
char reserved[40];
|
|
} __packed;
|
|
|
|
struct diag204_part_hdr {
|
|
__u8 pn;
|
|
__u8 cpus;
|
|
char reserved[6];
|
|
char part_name[DIAG204_LPAR_NAME_LEN];
|
|
} __packed;
|
|
|
|
struct diag204_x_part_hdr {
|
|
__u8 pn;
|
|
__u8 cpus;
|
|
__u8 rcpus;
|
|
__u8 pflag;
|
|
__u32 mlu;
|
|
char part_name[DIAG204_LPAR_NAME_LEN];
|
|
char lpc_name[8];
|
|
char os_name[8];
|
|
__u64 online_cs;
|
|
__u64 online_es;
|
|
__u8 upid;
|
|
__u8 reserved:3;
|
|
__u8 mtid:5;
|
|
char reserved1[2];
|
|
__u32 group_mlu;
|
|
char group_name[8];
|
|
char hardware_group_name[8];
|
|
char reserved2[24];
|
|
} __packed;
|
|
|
|
struct diag204_cpu_info {
|
|
__u16 cpu_addr;
|
|
char reserved1[2];
|
|
__u8 ctidx;
|
|
__u8 cflag;
|
|
__u16 weight;
|
|
__u64 acc_time;
|
|
__u64 lp_time;
|
|
} __packed;
|
|
|
|
struct diag204_x_cpu_info {
|
|
__u16 cpu_addr;
|
|
char reserved1[2];
|
|
__u8 ctidx;
|
|
__u8 cflag;
|
|
__u16 weight;
|
|
__u64 acc_time;
|
|
__u64 lp_time;
|
|
__u16 min_weight;
|
|
__u16 cur_weight;
|
|
__u16 max_weight;
|
|
char reseved2[2];
|
|
__u64 online_time;
|
|
__u64 wait_time;
|
|
__u32 pma_weight;
|
|
__u32 polar_weight;
|
|
__u32 cpu_type_cap;
|
|
__u32 group_cpu_type_cap;
|
|
char reserved3[32];
|
|
} __packed;
|
|
|
|
struct diag204_phys_hdr {
|
|
char reserved1[1];
|
|
__u8 cpus;
|
|
char reserved2[6];
|
|
char mgm_name[8];
|
|
} __packed;
|
|
|
|
struct diag204_x_phys_hdr {
|
|
char reserved1[1];
|
|
__u8 cpus;
|
|
char reserved2[6];
|
|
char mgm_name[8];
|
|
char reserved3[80];
|
|
} __packed;
|
|
|
|
struct diag204_phys_cpu {
|
|
__u16 cpu_addr;
|
|
char reserved1[2];
|
|
__u8 ctidx;
|
|
char reserved2[3];
|
|
__u64 mgm_time;
|
|
char reserved3[8];
|
|
} __packed;
|
|
|
|
struct diag204_x_phys_cpu {
|
|
__u16 cpu_addr;
|
|
char reserved1[2];
|
|
__u8 ctidx;
|
|
char reserved2[1];
|
|
__u16 weight;
|
|
__u64 mgm_time;
|
|
char reserved3[80];
|
|
} __packed;
|
|
|
|
struct diag204_x_part_block {
|
|
struct diag204_x_part_hdr hdr;
|
|
struct diag204_x_cpu_info cpus[];
|
|
} __packed;
|
|
|
|
struct diag204_x_phys_block {
|
|
struct diag204_x_phys_hdr hdr;
|
|
struct diag204_x_phys_cpu cpus[];
|
|
} __packed;
|
|
|
|
int diag204(unsigned long subcode, unsigned long size, void *addr);
|
|
int diag224(void *ptr);
|
|
#endif /* _ASM_S390_DIAG_H */
|