Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini:
"A bunch of one-liners (except the s390 one).
The two more serious bugs ("KVM: SVM: Fix CPL export via SS.DPL" and
"KVM: s390: add sie.h uapi header file to Kbuild and remove header
dependency") were introduced in the 3.16 merge window"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: SVM: Fix CPL export via SS.DPL
KVM: s390: add sie.h uapi header file to Kbuild and remove header dependency
MIPS: KVM: Fix memory leak on VCPU
KVM: x86: preserve the high 32-bits of the PAT register
kvm: fix wrong address when writing Hyper-V tsc page
KVM: x86: Increase the number of fixed MTRR regs to 10
+18
-17
+1
arch/mips/kvm/kvm_mips.c
+1
arch/mips/kvm/kvm_mips.c
+1
arch/s390/include/uapi/asm/Kbuild
+1
arch/s390/include/uapi/asm/Kbuild
+12
-14
arch/s390/include/uapi/asm/sie.h
+12
-14
arch/s390/include/uapi/asm/sie.h
···
1
1
#ifndef _UAPI_ASM_S390_SIE_H
2
2
#define _UAPI_ASM_S390_SIE_H
3
3
4
-
#include <asm/sigp.h>
5
-
6
4
#define diagnose_codes \
7
5
{ 0x10, "DIAG (0x10) release pages" }, \
8
6
{ 0x44, "DIAG (0x44) time slice end" }, \
···
11
13
{ 0x500, "DIAG (0x500) KVM virtio functions" }, \
12
14
{ 0x501, "DIAG (0x501) KVM breakpoint" }
13
15
14
-
#define sigp_order_codes \
15
-
{ SIGP_SENSE, "SIGP sense" }, \
16
-
{ SIGP_EXTERNAL_CALL, "SIGP external call" }, \
17
-
{ SIGP_EMERGENCY_SIGNAL, "SIGP emergency signal" }, \
18
-
{ SIGP_STOP, "SIGP stop" }, \
19
-
{ SIGP_STOP_AND_STORE_STATUS, "SIGP stop and store status" }, \
20
-
{ SIGP_SET_ARCHITECTURE, "SIGP set architecture" }, \
21
-
{ SIGP_SET_PREFIX, "SIGP set prefix" }, \
22
-
{ SIGP_SENSE_RUNNING, "SIGP sense running" }, \
23
-
{ SIGP_RESTART, "SIGP restart" }, \
24
-
{ SIGP_INITIAL_CPU_RESET, "SIGP initial cpu reset" }, \
25
-
{ SIGP_STORE_STATUS_AT_ADDRESS, "SIGP store status at address" }
16
+
#define sigp_order_codes \
17
+
{ 0x01, "SIGP sense" }, \
18
+
{ 0x02, "SIGP external call" }, \
19
+
{ 0x03, "SIGP emergency signal" }, \
20
+
{ 0x05, "SIGP stop" }, \
21
+
{ 0x06, "SIGP restart" }, \
22
+
{ 0x09, "SIGP stop and store status" }, \
23
+
{ 0x0b, "SIGP initial cpu reset" }, \
24
+
{ 0x0d, "SIGP set prefix" }, \
25
+
{ 0x0e, "SIGP store status at address" }, \
26
+
{ 0x12, "SIGP set architecture" }, \
27
+
{ 0x15, "SIGP sense running" }
26
28
27
29
#define icpt_prog_codes \
28
30
{ 0x0001, "Prog Operation" }, \
+2
-2
arch/x86/include/asm/kvm_host.h
+2
-2
arch/x86/include/asm/kvm_host.h
···
95
95
#define KVM_REFILL_PAGES 25
96
96
#define KVM_MAX_CPUID_ENTRIES 80
97
97
#define KVM_NR_FIXED_MTRR_REGION 88
98
-
#define KVM_NR_VAR_MTRR 8
98
+
#define KVM_NR_VAR_MTRR 10
99
99
100
100
#define ASYNC_PF_PER_VCPU 64
101
101
···
461
461
bool nmi_injected; /* Trying to inject an NMI this entry */
462
462
463
463
struct mtrr_state_type mtrr_state;
464
-
u32 pat;
464
+
u64 pat;
465
465
466
466
unsigned switch_db_regs;
467
467
unsigned long db[KVM_NR_DB_REGS];
+1
arch/x86/kvm/svm.c
+1
arch/x86/kvm/svm.c
+1
-1
arch/x86/kvm/x86.c
+1
-1
arch/x86/kvm/x86.c
···
1898
1898
if (!(data & HV_X64_MSR_TSC_REFERENCE_ENABLE))
1899
1899
break;
1900
1900
gfn = data >> HV_X64_MSR_TSC_REFERENCE_ADDRESS_SHIFT;
1901
-
if (kvm_write_guest(kvm, data,
1901
+
if (kvm_write_guest(kvm, gfn << HV_X64_MSR_TSC_REFERENCE_ADDRESS_SHIFT,
1902
1902
&tsc_ref, sizeof(tsc_ref)))
1903
1903
return 1;
1904
1904
mark_page_dirty(kvm, gfn);