forked from Minki/linux
b9085bcbf5
Common: Optional support for adding a small amount of polling on each HLT instruction executed in the guest (or equivalent for other architectures). This can improve latency up to 50% on some scenarios (e.g. O_DSYNC writes or TCP_RR netperf tests). This also has to be enabled manually for now, but the plan is to auto-tune this in the future. ARM/ARM64: the highlights are support for GICv3 emulation and dirty page tracking s390: several optimizations and bugfixes. Also a first: a feature exposed by KVM (UUID and long guest name in /proc/sysinfo) before it is available in IBM's hypervisor! :) MIPS: Bugfixes. x86: Support for PML (page modification logging, a new feature in Broadwell Xeons that speeds up dirty page tracking), nested virtualization improvements (nested APICv---a nice optimization), usual round of emulation fixes. There is also a new option to reduce latency of the TSC deadline timer in the guest; this needs to be tuned manually. Some commits are common between this pull and Catalin's; I see you have already included his tree. ARM has other conflicts where functions are added in the same place by 3.19-rc and 3.20 patches. These are not large though, and entirely within KVM. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJU28rkAAoJEL/70l94x66DXqQH/1TDOfJIjW7P2kb0Sw7Fy1wi cEX1KO/VFxAqc8R0E/0Wb55CXyPjQJM6xBXuFr5cUDaIjQ8ULSktL4pEwXyyv/s5 DBDkN65mriry2w5VuEaRLVcuX9Wy+tqLQXWNkEySfyb4uhZChWWHvKEcgw5SqCyg NlpeHurYESIoNyov3jWqvBjr4OmaQENyv7t2c6q5ErIgG02V+iCux5QGbphM2IC9 LFtPKxoqhfeB2xFxTOIt8HJiXrZNwflsTejIlCl/NSEiDVLLxxHCxK2tWK/tUXMn JfLD9ytXBWtNMwInvtFm4fPmDouv2VDyR0xnK2db+/axsJZnbxqjGu1um4Dqbak= =7gdx -----END PGP SIGNATURE----- Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Pull KVM update from Paolo Bonzini: "Fairly small update, but there are some interesting new features. Common: Optional support for adding a small amount of polling on each HLT instruction executed in the guest (or equivalent for other architectures). This can improve latency up to 50% on some scenarios (e.g. O_DSYNC writes or TCP_RR netperf tests). This also has to be enabled manually for now, but the plan is to auto-tune this in the future. ARM/ARM64: The highlights are support for GICv3 emulation and dirty page tracking s390: Several optimizations and bugfixes. Also a first: a feature exposed by KVM (UUID and long guest name in /proc/sysinfo) before it is available in IBM's hypervisor! :) MIPS: Bugfixes. x86: Support for PML (page modification logging, a new feature in Broadwell Xeons that speeds up dirty page tracking), nested virtualization improvements (nested APICv---a nice optimization), usual round of emulation fixes. There is also a new option to reduce latency of the TSC deadline timer in the guest; this needs to be tuned manually. Some commits are common between this pull and Catalin's; I see you have already included his tree. Powerpc: Nothing yet. The KVM/PPC changes will come in through the PPC maintainers, because I haven't received them yet and I might end up being offline for some part of next week" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (130 commits) KVM: ia64: drop kvm.h from installed user headers KVM: x86: fix build with !CONFIG_SMP KVM: x86: emulate: correct page fault error code for NoWrite instructions KVM: Disable compat ioctl for s390 KVM: s390: add cpu model support KVM: s390: use facilities and cpu_id per KVM KVM: s390/CPACF: Choose crypto control block format s390/kernel: Update /proc/sysinfo file with Extended Name and UUID KVM: s390: reenable LPP facility KVM: s390: floating irqs: fix user triggerable endless loop kvm: add halt_poll_ns module parameter kvm: remove KVM_MMIO_SIZE KVM: MIPS: Don't leak FPU/DSP to guest KVM: MIPS: Disable HTW while in guest KVM: nVMX: Enable nested posted interrupt processing KVM: nVMX: Enable nested virtual interrupt delivery KVM: nVMX: Enable nested apic register virtualization KVM: nVMX: Make nested control MSRs per-cpu KVM: nVMX: Enable nested virtualize x2apic mode KVM: nVMX: Prepare for using hardware MSR bitmap ...
180 lines
3.8 KiB
C
180 lines
3.8 KiB
C
/*
|
|
* definition for store system information stsi
|
|
*
|
|
* Copyright IBM Corp. 2001, 2008
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License (version 2 only)
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* Author(s): Ulrich Weigand <weigand@de.ibm.com>
|
|
* Christian Borntraeger <borntraeger@de.ibm.com>
|
|
*/
|
|
|
|
#ifndef __ASM_S390_SYSINFO_H
|
|
#define __ASM_S390_SYSINFO_H
|
|
|
|
#include <asm/bitsperlong.h>
|
|
#include <linux/uuid.h>
|
|
|
|
struct sysinfo_1_1_1 {
|
|
unsigned char p:1;
|
|
unsigned char :6;
|
|
unsigned char t:1;
|
|
unsigned char :8;
|
|
unsigned char ccr;
|
|
unsigned char cai;
|
|
char reserved_0[28];
|
|
char manufacturer[16];
|
|
char type[4];
|
|
char reserved_1[12];
|
|
char model_capacity[16];
|
|
char sequence[16];
|
|
char plant[4];
|
|
char model[16];
|
|
char model_perm_cap[16];
|
|
char model_temp_cap[16];
|
|
unsigned int model_cap_rating;
|
|
unsigned int model_perm_cap_rating;
|
|
unsigned int model_temp_cap_rating;
|
|
unsigned char typepct[5];
|
|
unsigned char reserved_2[3];
|
|
unsigned int ncr;
|
|
unsigned int npr;
|
|
unsigned int ntr;
|
|
};
|
|
|
|
struct sysinfo_1_2_1 {
|
|
char reserved_0[80];
|
|
char sequence[16];
|
|
char plant[4];
|
|
char reserved_1[2];
|
|
unsigned short cpu_address;
|
|
};
|
|
|
|
struct sysinfo_1_2_2 {
|
|
char format;
|
|
char reserved_0[1];
|
|
unsigned short acc_offset;
|
|
char reserved_1[20];
|
|
unsigned int nominal_cap;
|
|
unsigned int secondary_cap;
|
|
unsigned int capability;
|
|
unsigned short cpus_total;
|
|
unsigned short cpus_configured;
|
|
unsigned short cpus_standby;
|
|
unsigned short cpus_reserved;
|
|
unsigned short adjustment[0];
|
|
};
|
|
|
|
struct sysinfo_1_2_2_extension {
|
|
unsigned int alt_capability;
|
|
unsigned short alt_adjustment[0];
|
|
};
|
|
|
|
struct sysinfo_2_2_1 {
|
|
char reserved_0[80];
|
|
char sequence[16];
|
|
char plant[4];
|
|
unsigned short cpu_id;
|
|
unsigned short cpu_address;
|
|
};
|
|
|
|
struct sysinfo_2_2_2 {
|
|
char reserved_0[32];
|
|
unsigned short lpar_number;
|
|
char reserved_1;
|
|
unsigned char characteristics;
|
|
unsigned short cpus_total;
|
|
unsigned short cpus_configured;
|
|
unsigned short cpus_standby;
|
|
unsigned short cpus_reserved;
|
|
char name[8];
|
|
unsigned int caf;
|
|
char reserved_2[8];
|
|
unsigned char mt_installed;
|
|
unsigned char mt_general;
|
|
unsigned char mt_psmtid;
|
|
char reserved_3[5];
|
|
unsigned short cpus_dedicated;
|
|
unsigned short cpus_shared;
|
|
};
|
|
|
|
#define LPAR_CHAR_DEDICATED (1 << 7)
|
|
#define LPAR_CHAR_SHARED (1 << 6)
|
|
#define LPAR_CHAR_LIMITED (1 << 5)
|
|
|
|
struct sysinfo_3_2_2 {
|
|
char reserved_0[31];
|
|
unsigned char :4;
|
|
unsigned char count:4;
|
|
struct {
|
|
char reserved_0[4];
|
|
unsigned short cpus_total;
|
|
unsigned short cpus_configured;
|
|
unsigned short cpus_standby;
|
|
unsigned short cpus_reserved;
|
|
char name[8];
|
|
unsigned int caf;
|
|
char cpi[16];
|
|
char reserved_1[3];
|
|
char ext_name_encoding;
|
|
unsigned int reserved_2;
|
|
uuid_be uuid;
|
|
} vm[8];
|
|
char reserved_3[1504];
|
|
char ext_names[8][256];
|
|
};
|
|
|
|
extern int topology_max_mnest;
|
|
|
|
#define TOPOLOGY_CORE_BITS 64
|
|
#define TOPOLOGY_NR_MAG 6
|
|
|
|
struct topology_core {
|
|
unsigned char nl;
|
|
unsigned char reserved0[3];
|
|
unsigned char :6;
|
|
unsigned char pp:2;
|
|
unsigned char reserved1;
|
|
unsigned short origin;
|
|
unsigned long mask[TOPOLOGY_CORE_BITS / BITS_PER_LONG];
|
|
};
|
|
|
|
struct topology_container {
|
|
unsigned char nl;
|
|
unsigned char reserved[6];
|
|
unsigned char id;
|
|
};
|
|
|
|
union topology_entry {
|
|
unsigned char nl;
|
|
struct topology_core cpu;
|
|
struct topology_container container;
|
|
};
|
|
|
|
struct sysinfo_15_1_x {
|
|
unsigned char reserved0[2];
|
|
unsigned short length;
|
|
unsigned char mag[TOPOLOGY_NR_MAG];
|
|
unsigned char reserved1;
|
|
unsigned char mnest;
|
|
unsigned char reserved2[4];
|
|
union topology_entry tle[0];
|
|
};
|
|
|
|
int stsi(void *sysinfo, int fc, int sel1, int sel2);
|
|
|
|
/*
|
|
* Service level reporting interface.
|
|
*/
|
|
struct service_level {
|
|
struct list_head list;
|
|
void (*seq_print)(struct seq_file *, struct service_level *);
|
|
};
|
|
|
|
int register_service_level(struct service_level *);
|
|
int unregister_service_level(struct service_level *);
|
|
|
|
#endif /* __ASM_S390_SYSINFO_H */
|