mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 01:22:07 +00: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 ...
238 lines
5.8 KiB
C
238 lines
5.8 KiB
C
/*
|
|
* Implementation of s390 diagnose codes
|
|
*
|
|
* Copyright IBM Corp. 2007
|
|
* Author(s): Michael Holzheu <holzheu@de.ibm.com>
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/debugfs.h>
|
|
#include <asm/diag.h>
|
|
#include <asm/trace/diag.h>
|
|
|
|
struct diag_stat {
|
|
unsigned int counter[NR_DIAG_STAT];
|
|
};
|
|
|
|
static DEFINE_PER_CPU(struct diag_stat, diag_stat);
|
|
|
|
struct diag_desc {
|
|
int code;
|
|
char *name;
|
|
};
|
|
|
|
static const struct diag_desc diag_map[NR_DIAG_STAT] = {
|
|
[DIAG_STAT_X008] = { .code = 0x008, .name = "Console Function" },
|
|
[DIAG_STAT_X00C] = { .code = 0x00c, .name = "Pseudo Timer" },
|
|
[DIAG_STAT_X010] = { .code = 0x010, .name = "Release Pages" },
|
|
[DIAG_STAT_X014] = { .code = 0x014, .name = "Spool File Services" },
|
|
[DIAG_STAT_X044] = { .code = 0x044, .name = "Voluntary Timeslice End" },
|
|
[DIAG_STAT_X064] = { .code = 0x064, .name = "NSS Manipulation" },
|
|
[DIAG_STAT_X09C] = { .code = 0x09c, .name = "Relinquish Timeslice" },
|
|
[DIAG_STAT_X0DC] = { .code = 0x0dc, .name = "Appldata Control" },
|
|
[DIAG_STAT_X204] = { .code = 0x204, .name = "Logical-CPU Utilization" },
|
|
[DIAG_STAT_X210] = { .code = 0x210, .name = "Device Information" },
|
|
[DIAG_STAT_X224] = { .code = 0x224, .name = "EBCDIC-Name Table" },
|
|
[DIAG_STAT_X250] = { .code = 0x250, .name = "Block I/O" },
|
|
[DIAG_STAT_X258] = { .code = 0x258, .name = "Page-Reference Services" },
|
|
[DIAG_STAT_X288] = { .code = 0x288, .name = "Time Bomb" },
|
|
[DIAG_STAT_X2C4] = { .code = 0x2c4, .name = "FTP Services" },
|
|
[DIAG_STAT_X2FC] = { .code = 0x2fc, .name = "Guest Performance Data" },
|
|
[DIAG_STAT_X304] = { .code = 0x304, .name = "Partition-Resource Service" },
|
|
[DIAG_STAT_X308] = { .code = 0x308, .name = "List-Directed IPL" },
|
|
[DIAG_STAT_X500] = { .code = 0x500, .name = "Virtio Service" },
|
|
};
|
|
|
|
static int show_diag_stat(struct seq_file *m, void *v)
|
|
{
|
|
struct diag_stat *stat;
|
|
unsigned long n = (unsigned long) v - 1;
|
|
int cpu, prec, tmp;
|
|
|
|
get_online_cpus();
|
|
if (n == 0) {
|
|
seq_puts(m, " ");
|
|
|
|
for_each_online_cpu(cpu) {
|
|
prec = 10;
|
|
for (tmp = 10; cpu >= tmp; tmp *= 10)
|
|
prec--;
|
|
seq_printf(m, "%*s%d", prec, "CPU", cpu);
|
|
}
|
|
seq_putc(m, '\n');
|
|
} else if (n <= NR_DIAG_STAT) {
|
|
seq_printf(m, "diag %03x:", diag_map[n-1].code);
|
|
for_each_online_cpu(cpu) {
|
|
stat = &per_cpu(diag_stat, cpu);
|
|
seq_printf(m, " %10u", stat->counter[n-1]);
|
|
}
|
|
seq_printf(m, " %s\n", diag_map[n-1].name);
|
|
}
|
|
put_online_cpus();
|
|
return 0;
|
|
}
|
|
|
|
static void *show_diag_stat_start(struct seq_file *m, loff_t *pos)
|
|
{
|
|
return *pos <= nr_cpu_ids ? (void *)((unsigned long) *pos + 1) : NULL;
|
|
}
|
|
|
|
static void *show_diag_stat_next(struct seq_file *m, void *v, loff_t *pos)
|
|
{
|
|
++*pos;
|
|
return show_diag_stat_start(m, pos);
|
|
}
|
|
|
|
static void show_diag_stat_stop(struct seq_file *m, void *v)
|
|
{
|
|
}
|
|
|
|
static const struct seq_operations show_diag_stat_sops = {
|
|
.start = show_diag_stat_start,
|
|
.next = show_diag_stat_next,
|
|
.stop = show_diag_stat_stop,
|
|
.show = show_diag_stat,
|
|
};
|
|
|
|
static int show_diag_stat_open(struct inode *inode, struct file *file)
|
|
{
|
|
return seq_open(file, &show_diag_stat_sops);
|
|
}
|
|
|
|
static const struct file_operations show_diag_stat_fops = {
|
|
.open = show_diag_stat_open,
|
|
.read = seq_read,
|
|
.llseek = seq_lseek,
|
|
.release = seq_release,
|
|
};
|
|
|
|
|
|
static int __init show_diag_stat_init(void)
|
|
{
|
|
debugfs_create_file("diag_stat", 0400, NULL, NULL,
|
|
&show_diag_stat_fops);
|
|
return 0;
|
|
}
|
|
|
|
device_initcall(show_diag_stat_init);
|
|
|
|
void diag_stat_inc(enum diag_stat_enum nr)
|
|
{
|
|
this_cpu_inc(diag_stat.counter[nr]);
|
|
trace_s390_diagnose(diag_map[nr].code);
|
|
}
|
|
EXPORT_SYMBOL(diag_stat_inc);
|
|
|
|
void diag_stat_inc_norecursion(enum diag_stat_enum nr)
|
|
{
|
|
this_cpu_inc(diag_stat.counter[nr]);
|
|
trace_s390_diagnose_norecursion(diag_map[nr].code);
|
|
}
|
|
EXPORT_SYMBOL(diag_stat_inc_norecursion);
|
|
|
|
/*
|
|
* Diagnose 14: Input spool file manipulation
|
|
*/
|
|
static inline int __diag14(unsigned long rx, unsigned long ry1,
|
|
unsigned long subcode)
|
|
{
|
|
register unsigned long _ry1 asm("2") = ry1;
|
|
register unsigned long _ry2 asm("3") = subcode;
|
|
int rc = 0;
|
|
|
|
asm volatile(
|
|
" sam31\n"
|
|
" diag %2,2,0x14\n"
|
|
" sam64\n"
|
|
" ipm %0\n"
|
|
" srl %0,28\n"
|
|
: "=d" (rc), "+d" (_ry2)
|
|
: "d" (rx), "d" (_ry1)
|
|
: "cc");
|
|
|
|
return rc;
|
|
}
|
|
|
|
int diag14(unsigned long rx, unsigned long ry1, unsigned long subcode)
|
|
{
|
|
diag_stat_inc(DIAG_STAT_X014);
|
|
return __diag14(rx, ry1, subcode);
|
|
}
|
|
EXPORT_SYMBOL(diag14);
|
|
|
|
static inline int __diag204(unsigned long *subcode, unsigned long size, void *addr)
|
|
{
|
|
register unsigned long _subcode asm("0") = *subcode;
|
|
register unsigned long _size asm("1") = size;
|
|
|
|
asm volatile(
|
|
" diag %2,%0,0x204\n"
|
|
"0: nopr %%r7\n"
|
|
EX_TABLE(0b,0b)
|
|
: "+d" (_subcode), "+d" (_size) : "d" (addr) : "memory");
|
|
*subcode = _subcode;
|
|
return _size;
|
|
}
|
|
|
|
int diag204(unsigned long subcode, unsigned long size, void *addr)
|
|
{
|
|
diag_stat_inc(DIAG_STAT_X204);
|
|
size = __diag204(&subcode, size, addr);
|
|
if (subcode)
|
|
return -1;
|
|
return size;
|
|
}
|
|
EXPORT_SYMBOL(diag204);
|
|
|
|
/*
|
|
* Diagnose 210: Get information about a virtual device
|
|
*/
|
|
int diag210(struct diag210 *addr)
|
|
{
|
|
/*
|
|
* diag 210 needs its data below the 2GB border, so we
|
|
* use a static data area to be sure
|
|
*/
|
|
static struct diag210 diag210_tmp;
|
|
static DEFINE_SPINLOCK(diag210_lock);
|
|
unsigned long flags;
|
|
int ccode;
|
|
|
|
spin_lock_irqsave(&diag210_lock, flags);
|
|
diag210_tmp = *addr;
|
|
|
|
diag_stat_inc(DIAG_STAT_X210);
|
|
asm volatile(
|
|
" lhi %0,-1\n"
|
|
" sam31\n"
|
|
" diag %1,0,0x210\n"
|
|
"0: ipm %0\n"
|
|
" srl %0,28\n"
|
|
"1: sam64\n"
|
|
EX_TABLE(0b, 1b)
|
|
: "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory");
|
|
|
|
*addr = diag210_tmp;
|
|
spin_unlock_irqrestore(&diag210_lock, flags);
|
|
|
|
return ccode;
|
|
}
|
|
EXPORT_SYMBOL(diag210);
|
|
|
|
int diag224(void *ptr)
|
|
{
|
|
int rc = -EOPNOTSUPP;
|
|
|
|
diag_stat_inc(DIAG_STAT_X224);
|
|
asm volatile(
|
|
" diag %1,%2,0x224\n"
|
|
"0: lhi %0,0x0\n"
|
|
"1:\n"
|
|
EX_TABLE(0b,1b)
|
|
: "+d" (rc) :"d" (0), "d" (ptr) : "memory");
|
|
return rc;
|
|
}
|
|
EXPORT_SYMBOL(diag224);
|