c/pve-kernel-lowlatency-qoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase patches on top of Ubuntu-4.15.0-56.62

Browse Source 
(generated with debian/scripts/import-upstream-tag)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-07-26 09:30:59 +02:00
parent 6a0e26366e
commit 442a3e9243
7 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
View File

@ -55,10 +55,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 files changed, 110 insertions(+) 2 files changed, 110 insertions(+)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 11bf7af493e1..4c3d21a1b79f 100644 index d38f977156b5..8e9bfec8ac86 100644
--- a/Documentation/admin-guide/kernel-parameters.txt --- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3127,6 +3127,15 @@ @@ -3131,6 +3131,15 @@
Also, it enforces the PCI Local Bus spec Also, it enforces the PCI Local Bus spec
rule that those bits should be 0 in system reset rule that those bits should be 0 in system reset
events (useful for kexec/kdump cases). events (useful for kexec/kdump cases).
@ -75,10 +75,10 @@ index 11bf7af493e1..4c3d21a1b79f 100644
Safety option to keep boot IRQs enabled. This Safety option to keep boot IRQs enabled. This
should never be necessary. should never be necessary.
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index fb4b0dd22f95..29f7741eafef 100644 index 60d62a5f9e05..b112d494e51b 100644
--- a/drivers/pci/quirks.c --- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c
@@ -3702,6 +3702,106 @@ static int __init pci_apply_final_quirks(void) @@ -3706,6 +3706,106 @@ static int __init pci_apply_final_quirks(void)
fs_initcall_sync(pci_apply_final_quirks); fs_initcall_sync(pci_apply_final_quirks);
@ -185,7 +185,7 @@ index fb4b0dd22f95..29f7741eafef 100644
/* /*
* Following are device-specific reset methods which can be used to * Following are device-specific reset methods which can be used to
* reset a single function if other methods (e.g. FLR, PM D0->D3) are * reset a single function if other methods (e.g. FLR, PM D0->D3) are
@@ -4555,6 +4655,7 @@ static const struct pci_dev_acs_enabled { @@ -4559,6 +4659,7 @@ static const struct pci_dev_acs_enabled {
{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs }, { PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
/* APM X-Gene */ /* APM X-Gene */
{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs }, { PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },

2
patches/kernel/0005-ocfs2-make-metadata-estimation-accurate-and-clear.patch
View File

@ -29,7 +29,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index d1516327b787..256986aca8df 100644 index 99550f4bd159..ef8f00a30d62 100644
--- a/fs/ocfs2/aops.c --- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c
@@ -797,6 +797,7 @@ struct ocfs2_write_ctxt { @@ -797,6 +797,7 @@ struct ocfs2_write_ctxt {

2
patches/kernel/0006-ocfs2-try-to-reuse-extent-block-in-dealloc-without-m.patch
View File

@ -350,7 +350,7 @@ index 27b75cf32cfa..250bcacdf9e9 100644
/* /*
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 256986aca8df..e8e205bf2e41 100644 index ef8f00a30d62..cab26aa30f63 100644
--- a/fs/ocfs2/aops.c --- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c
@@ -2332,6 +2332,12 @@ static int ocfs2_dio_end_io_write(struct inode *inode, @@ -2332,6 +2332,12 @@ static int ocfs2_dio_end_io_write(struct inode *inode,

6
patches/kernel/0008-kvm-x86-Add-AMD-s-EX_CFG-to-the-list-of-ignored-MSRs.patch
View File

@ -34,10 +34,10 @@ index 7ca92f9b5eae..4eb78a908544 100644
/* Fam 10h MSRs */ /* Fam 10h MSRs */
#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 #define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index ac17f53812af..1154795459de 100644 index 0bc041658a1b..e68f7bd79df5 100644
--- a/arch/x86/kvm/x86.c --- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c
@@ -2240,6 +2240,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) @@ -2241,6 +2241,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
case MSR_AMD64_PATCH_LOADER: case MSR_AMD64_PATCH_LOADER:
case MSR_AMD64_BU_CFG2: case MSR_AMD64_BU_CFG2:
case MSR_AMD64_DC_CFG: case MSR_AMD64_DC_CFG:
@ -45,7 +45,7 @@ index ac17f53812af..1154795459de 100644
break; break;
case MSR_IA32_UCODE_REV: case MSR_IA32_UCODE_REV:
@@ -2528,6 +2529,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) @@ -2529,6 +2530,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
case MSR_AMD64_BU_CFG2: case MSR_AMD64_BU_CFG2:
case MSR_IA32_PERF_CTL: case MSR_IA32_PERF_CTL:
case MSR_AMD64_DC_CFG: case MSR_AMD64_DC_CFG:

14
patches/kernel/0009-KVM-Take-vcpu-mutex-outside-vcpu_load.patch
View File

@ -33,10 +33,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 files changed, 15 insertions(+), 28 deletions(-) 4 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 35a212169043..a4a11751df22 100644 index 7c8341e2d3c1..921968c00dde 100644
--- a/arch/x86/kvm/vmx.c --- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c
@@ -9960,10 +9960,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs) @@ -9966,10 +9966,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs)
static void vmx_free_vcpu_nested(struct kvm_vcpu *vcpu) static void vmx_free_vcpu_nested(struct kvm_vcpu *vcpu)
{ {
struct vcpu_vmx *vmx = to_vmx(vcpu); struct vcpu_vmx *vmx = to_vmx(vcpu);
@ -49,10 +49,10 @@ index 35a212169043..a4a11751df22 100644
free_nested(vmx); free_nested(vmx);
vcpu_put(vcpu); vcpu_put(vcpu);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 1154795459de..3bf992a56e56 100644 index e68f7bd79df5..0c971dce8915 100644
--- a/arch/x86/kvm/x86.c --- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c
@@ -7951,16 +7951,12 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, @@ -7957,16 +7957,12 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
{ {
@ -71,7 +71,7 @@ index 1154795459de..3bf992a56e56 100644
} }
void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
@@ -7970,13 +7966,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) @@ -7976,13 +7972,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
kvm_hv_vcpu_postcreate(vcpu); kvm_hv_vcpu_postcreate(vcpu);
@ -88,7 +88,7 @@ index 1154795459de..3bf992a56e56 100644
if (!kvmclock_periodic_sync) if (!kvmclock_periodic_sync)
return; return;
@@ -7987,11 +7985,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) @@ -7993,11 +7991,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
{ {
@ -101,7 +101,7 @@ index 1154795459de..3bf992a56e56 100644
kvm_mmu_unload(vcpu); kvm_mmu_unload(vcpu);
vcpu_put(vcpu); vcpu_put(vcpu);
@@ -8365,9 +8361,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) @@ -8371,9 +8367,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu) static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)
{ {

6
patches/kernel/0010-kvm-x86-Don-t-modify-MSR_PLATFORM_INFO-on-vCPU-reset.patch
View File

@ -19,10 +19,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 3bf992a56e56..3d3d6d6548c3 100644 index 0c971dce8915..be629513de13 100644
--- a/arch/x86/kvm/x86.c --- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c
@@ -7951,6 +7951,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, @@ -7957,6 +7957,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
{ {
@ -30,7 +30,7 @@ index 3bf992a56e56..3d3d6d6548c3 100644
kvm_vcpu_mtrr_init(vcpu); kvm_vcpu_mtrr_init(vcpu);
vcpu_load(vcpu); vcpu_load(vcpu);
kvm_vcpu_reset(vcpu, false); kvm_vcpu_reset(vcpu, false);
@@ -8052,7 +8053,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) @@ -8058,7 +8059,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
kvm_pmu_reset(vcpu); kvm_pmu_reset(vcpu);
vcpu->arch.smbase = 0x30000; vcpu->arch.smbase = 0x30000;

20
patches/kernel/0011-KVM-x86-Emulate-MSR_IA32_ARCH_CAPABILITIES-on-AMD-ho.patch
View File

@ -37,10 +37,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 files changed, 13 insertions(+), 14 deletions(-) 3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index e76012ca0ddc..fa57f78dff2d 100644 index c2bb7da8e5b4..e238785c22d3 100644
--- a/arch/x86/include/asm/kvm_host.h --- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h
@@ -508,6 +508,7 @@ struct kvm_vcpu_arch { @@ -509,6 +509,7 @@ struct kvm_vcpu_arch {
bool tpr_access_reporting; bool tpr_access_reporting;
u64 ia32_xss; u64 ia32_xss;
u64 microcode_version; u64 microcode_version;
@ -49,7 +49,7 @@ index e76012ca0ddc..fa57f78dff2d 100644
/* /*
* Paging state of the vcpu * Paging state of the vcpu
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index a4a11751df22..a6c1b23ea9a4 100644 index 921968c00dde..cddbdd2d615d 100644
--- a/arch/x86/kvm/vmx.c --- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c
@@ -750,7 +750,6 @@ struct vcpu_vmx { @@ -750,7 +750,6 @@ struct vcpu_vmx {
@ -60,7 +60,7 @@ index a4a11751df22..a6c1b23ea9a4 100644
u64 spec_ctrl; u64 spec_ctrl;
u32 vm_entry_controls_shadow; u32 vm_entry_controls_shadow;
@@ -3477,12 +3476,6 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) @@ -3485,12 +3484,6 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
msr_info->data = to_vmx(vcpu)->spec_ctrl; msr_info->data = to_vmx(vcpu)->spec_ctrl;
break; break;
@ -73,7 +73,7 @@ index a4a11751df22..a6c1b23ea9a4 100644
case MSR_IA32_SYSENTER_CS: case MSR_IA32_SYSENTER_CS:
msr_info->data = vmcs_read32(GUEST_SYSENTER_CS); msr_info->data = vmcs_read32(GUEST_SYSENTER_CS);
break; break;
@@ -3644,11 +3637,6 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) @@ -3652,11 +3645,6 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
vmx_disable_intercept_for_msr(vmx->vmcs01.msr_bitmap, MSR_IA32_PRED_CMD, vmx_disable_intercept_for_msr(vmx->vmcs01.msr_bitmap, MSR_IA32_PRED_CMD,
MSR_TYPE_W); MSR_TYPE_W);
break; break;
@ -85,7 +85,7 @@ index a4a11751df22..a6c1b23ea9a4 100644
case MSR_IA32_CR_PAT: case MSR_IA32_CR_PAT:
if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) { if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) {
if (!kvm_mtrr_valid(vcpu, MSR_IA32_CR_PAT, data)) if (!kvm_mtrr_valid(vcpu, MSR_IA32_CR_PAT, data))
@@ -5906,8 +5894,6 @@ static void vmx_vcpu_setup(struct vcpu_vmx *vmx) @@ -5914,8 +5902,6 @@ static void vmx_vcpu_setup(struct vcpu_vmx *vmx)
++vmx->nmsrs; ++vmx->nmsrs;
} }
@ -95,10 +95,10 @@ index a4a11751df22..a6c1b23ea9a4 100644
/* 22.2.1, 20.8.1 */ /* 22.2.1, 20.8.1 */
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 3d3d6d6548c3..92a8b20b7103 100644 index be629513de13..88f910046a60 100644
--- a/arch/x86/kvm/x86.c --- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c
@@ -2247,6 +2247,11 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) @@ -2248,6 +2248,11 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
if (msr_info->host_initiated) if (msr_info->host_initiated)
vcpu->arch.microcode_version = data; vcpu->arch.microcode_version = data;
break; break;
@ -110,7 +110,7 @@ index 3d3d6d6548c3..92a8b20b7103 100644
case MSR_EFER: case MSR_EFER:
return set_efer(vcpu, data); return set_efer(vcpu, data);
case MSR_K7_HWCR: case MSR_K7_HWCR:
@@ -2543,6 +2548,12 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) @@ -2544,6 +2549,12 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
case MSR_IA32_UCODE_REV: case MSR_IA32_UCODE_REV:
msr_info->data = vcpu->arch.microcode_version; msr_info->data = vcpu->arch.microcode_version;
break; break;
@ -123,7 +123,7 @@ index 3d3d6d6548c3..92a8b20b7103 100644
case MSR_IA32_TSC: case MSR_IA32_TSC:
msr_info->data = kvm_scale_tsc(vcpu, rdtsc()) + vcpu->arch.tsc_offset; msr_info->data = kvm_scale_tsc(vcpu, rdtsc()) + vcpu->arch.tsc_offset;
break; break;
@@ -7951,6 +7962,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, @@ -7957,6 +7968,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
{ {