rebase patches on top of Ubuntu-4.13.0-45.50

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

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2018-07-05 09:00:14 +02:00
parent 25d1229b93
commit c32a5136c9
26 changed files with 23 additions and 101 deletions

View File

@ -41,6 +41,3 @@ index fd8fdb91581d..1e35ac9fc810 100755
fi fi
if test -z "$KBUILD_BUILD_USER"; then if test -z "$KBUILD_BUILD_USER"; then
LINUX_COMPILE_BY=$(whoami | sed 's/\\/\\\\/') LINUX_COMPILE_BY=$(whoami | sed 's/\\/\\\\/')
--
2.14.2

View File

@ -33,6 +33,3 @@ index 89110319ef0f..5e73fff65f47 100644
} }
if (ether_addr_equal(br->bridge_id.addr, addr)) if (ether_addr_equal(br->bridge_id.addr, addr))
--
2.14.2

View File

@ -74,10 +74,10 @@ index ce24cb1e8f46..0cc1d4200c24 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 99eec22d99b7..7576c2b0c913 100644 index 9dcd5ed5a05b..8882b8d38d7d 100644
--- a/drivers/pci/quirks.c --- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c
@@ -3687,6 +3687,107 @@ static int __init pci_apply_final_quirks(void) @@ -3694,6 +3694,107 @@ 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 99eec22d99b7..7576c2b0c913 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
@@ -4529,6 +4630,7 @@ static const struct pci_dev_acs_enabled { @@ -4536,6 +4637,7 @@ static const struct pci_dev_acs_enabled {
{ 0x10df, 0x720, pci_quirk_mf_endpoint_acs }, /* Emulex Skyhawk-R */ { 0x10df, 0x720, pci_quirk_mf_endpoint_acs }, /* Emulex Skyhawk-R */
/* Cavium ThunderX */ /* Cavium ThunderX */
{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs }, { PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
@ -193,6 +193,3 @@ index 99eec22d99b7..7576c2b0c913 100644
{ 0 } { 0 }
}; };
--
2.14.2

View File

@ -24,6 +24,3 @@ index 3b3e54742263..d0085c9d6297 100644
module_param(halt_poll_ns_grow, uint, 0644); module_param(halt_poll_ns_grow, uint, 0644);
EXPORT_SYMBOL_GPL(halt_poll_ns_grow); EXPORT_SYMBOL_GPL(halt_poll_ns_grow);
--
2.14.2

View File

@ -61,6 +61,3 @@ index 7bf4b1533f34..ce7426b875f5 100644
if (!strcmp(token, "xattr")) { if (!strcmp(token, "xattr")) {
opts->flags |= CGRP_ROOT_XATTR; opts->flags |= CGRP_ROOT_XATTR;
continue; continue;
--
2.14.2

View File

@ -26,11 +26,10 @@ diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index e8cb34193433..f76c4bf3d46a 100644 index e8cb34193433..f76c4bf3d46a 100644
--- a/kernel/cgroup/cpuset.c --- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c
@@ -299,6 +299,16 @@ static DECLARE_WORK(cpuset_hotplug_work, cpuset_hotplug_workfn); @@ -300,6 +300,16 @@ static DECLARE_WORK(cpuset_hotplug_work, cpuset_hotplug_workfn);
static DECLARE_WAIT_QUEUE_HEAD(cpuset_attach_wq); static DECLARE_WAIT_QUEUE_HEAD(cpuset_attach_wq);
+/* /*
+ * Cgroup v2 behavior is used when on default hierarchy or the + * Cgroup v2 behavior is used when on default hierarchy or the
+ * cgroup_v2_mode flag is set. + * cgroup_v2_mode flag is set.
+ */ + */
@ -40,9 +39,10 @@ index e8cb34193433..f76c4bf3d46a 100644
+ (cpuset_cgrp_subsys.root->flags & CGRP_ROOT_CPUSET_V2_MODE); + (cpuset_cgrp_subsys.root->flags & CGRP_ROOT_CPUSET_V2_MODE);
+} +}
+ +
/* +/*
* This is ugly, but preserves the userspace API for existing cpuset * This is ugly, but preserves the userspace API for existing cpuset
* users. If someone tries to mount the "cpuset" filesystem, we * users. If someone tries to mount the "cpuset" filesystem, we
* silently switch it to mount "cgroup" instead
@@ -489,8 +499,7 @@ static int validate_change(struct cpuset *cur, struct cpuset *trial) @@ -489,8 +499,7 @@ static int validate_change(struct cpuset *cur, struct cpuset *trial)
/* On legacy hiearchy, we must be a subset of our parent cpuset. */ /* On legacy hiearchy, we must be a subset of our parent cpuset. */
@ -136,6 +136,3 @@ index e8cb34193433..f76c4bf3d46a 100644
mutex_lock(&cpuset_mutex); mutex_lock(&cpuset_mutex);
--
2.14.2

View File

@ -88,6 +88,3 @@ index f8f53bb90837..cb91245e9163 100644
list_add(&mad_recv_wc->recv_buf.list, &mad_recv_wc->rmpp_list); list_add(&mad_recv_wc->recv_buf.list, &mad_recv_wc->rmpp_list);
if (ib_mad_kernel_rmpp_agent(&mad_agent_priv->agent)) { if (ib_mad_kernel_rmpp_agent(&mad_agent_priv->agent)) {
mad_recv_wc = ib_process_rmpp_recv_wc(mad_agent_priv, mad_recv_wc = ib_process_rmpp_recv_wc(mad_agent_priv,
--
2.14.2

View File

@ -42,6 +42,3 @@ index 70ad19c4c73e..8f9fd3b757db 100644
ret = ib_security_pkey_access(map->agent.device, ret = ib_security_pkey_access(map->agent.device,
map->agent.port_num, map->agent.port_num,
--
2.14.2

View File

@ -34,10 +34,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
1 file changed, 7 insertions(+) 1 file changed, 7 insertions(+)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 6b1744499a90..5c37c1a1a949 100644 index 068084c8e540..da10db3de636 100644
--- a/arch/x86/kvm/svm.c --- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c
@@ -3650,6 +3650,13 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) @@ -3666,6 +3666,13 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)
u32 ecx = msr->index; u32 ecx = msr->index;
u64 data = msr->data; u64 data = msr->data;
switch (ecx) { switch (ecx) {
@ -51,6 +51,3 @@ index 6b1744499a90..5c37c1a1a949 100644
case MSR_IA32_TSC: case MSR_IA32_TSC:
kvm_write_tsc(vcpu, msr); kvm_write_tsc(vcpu, msr);
break; break;
--
2.14.2

View File

@ -1,7 +1,7 @@
From 727ba748e110b4de50d142edca9d6a9b7e6111d8 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Felix Wilhelm <fwilhelm@google.com> From: Felix Wilhelm <fwilhelm@google.com>
Date: Mon, 11 Jun 2018 09:43:44 +0200 Date: Mon, 11 Jun 2018 09:43:44 +0200
Subject: kvm: nVMX: Enforce cpl=0 for VMX instructions Subject: [PATCH] kvm: nVMX: Enforce cpl=0 for VMX instructions
VMX instructions executed inside a L1 VM will always trigger a VM exit VMX instructions executed inside a L1 VM will always trigger a VM exit
even when executed with cpl 3. This means we must perform the even when executed with cpl 3. This means we must perform the
@ -17,10 +17,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 13 insertions(+), 2 deletions(-) 1 file changed, 13 insertions(+), 2 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 709de996..4bf1f9d 100644 index 54980817194a..b2d75b59b6e5 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
@@ -7905,6 +7905,12 @@ static int handle_vmon(struct kvm_vcpu *vcpu) @@ -7180,6 +7180,12 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
return 1; return 1;
} }
@ -33,7 +33,7 @@ index 709de996..4bf1f9d 100644
if (vmx->nested.vmxon) { if (vmx->nested.vmxon) {
nested_vmx_failValid(vcpu, VMXERR_VMXON_IN_VMX_ROOT_OPERATION); nested_vmx_failValid(vcpu, VMXERR_VMXON_IN_VMX_ROOT_OPERATION);
return kvm_skip_emulated_instruction(vcpu); return kvm_skip_emulated_instruction(vcpu);
@@ -7964,6 +7970,11 @@ static int handle_vmon(struct kvm_vcpu *vcpu) @@ -7239,6 +7245,11 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
*/ */
static int nested_vmx_check_permission(struct kvm_vcpu *vcpu) static int nested_vmx_check_permission(struct kvm_vcpu *vcpu)
{ {
@ -45,7 +45,7 @@ index 709de996..4bf1f9d 100644
if (!to_vmx(vcpu)->nested.vmxon) { if (!to_vmx(vcpu)->nested.vmxon) {
kvm_queue_exception(vcpu, UD_VECTOR); kvm_queue_exception(vcpu, UD_VECTOR);
return 0; return 0;
@@ -8283,7 +8294,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu) @@ -7577,7 +7588,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu)
if (get_vmx_mem_address(vcpu, exit_qualification, if (get_vmx_mem_address(vcpu, exit_qualification,
vmx_instruction_info, true, &gva)) vmx_instruction_info, true, &gva))
return 1; return 1;
@ -54,7 +54,7 @@ index 709de996..4bf1f9d 100644
kvm_write_guest_virt_system(&vcpu->arch.emulate_ctxt, gva, kvm_write_guest_virt_system(&vcpu->arch.emulate_ctxt, gva,
&field_value, (is_long_mode(vcpu) ? 8 : 4), NULL); &field_value, (is_long_mode(vcpu) ? 8 : 4), NULL);
} }
@@ -8448,7 +8459,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu) @@ -7720,7 +7731,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu)
if (get_vmx_mem_address(vcpu, exit_qualification, if (get_vmx_mem_address(vcpu, exit_qualification,
vmx_instruction_info, true, &vmcs_gva)) vmx_instruction_info, true, &vmcs_gva))
return 1; return 1;
@ -63,6 +63,3 @@ index 709de996..4bf1f9d 100644
if (kvm_write_guest_virt_system(&vcpu->arch.emulate_ctxt, vmcs_gva, if (kvm_write_guest_virt_system(&vcpu->arch.emulate_ctxt, vmcs_gva,
(void *)&to_vmx(vcpu)->nested.current_vmptr, (void *)&to_vmx(vcpu)->nested.current_vmptr,
sizeof(u64), &e)) { sizeof(u64), &e)) {
--
cgit v1.1

View File

@ -28,6 +28,3 @@ index df3110d69585..07c10bac06a0 100644
} }
static struct tcf_ematch_ops em_nbyte_ops = { static struct tcf_ematch_ops em_nbyte_ops = {
--
2.14.2

View File

@ -29,6 +29,3 @@ index 537d0a0ad4c4..4450961b1554 100644
case TCF_LAYER_NETWORK: case TCF_LAYER_NETWORK:
return skb_network_header(skb); return skb_network_header(skb);
case TCF_LAYER_TRANSPORT: case TCF_LAYER_TRANSPORT:
--
2.14.2

View File

@ -22,7 +22,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
1 file changed, 10 insertions(+), 2 deletions(-) 1 file changed, 10 insertions(+), 2 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 0510bc11beb2..c79de3ac9d49 100644 index b2d75b59b6e5..a393186d14b1 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
@@ -883,8 +883,16 @@ static inline short vmcs_field_to_offset(unsigned long field) @@ -883,8 +883,16 @@ static inline short vmcs_field_to_offset(unsigned long field)
@ -44,6 +44,3 @@ index 0510bc11beb2..c79de3ac9d49 100644
return -ENOENT; return -ENOENT;
return vmcs_field_to_offset_table[field]; return vmcs_field_to_offset_table[field];
--
2.14.2

View File

@ -32,6 +32,3 @@ index 5c3e707ff3fc..59af590b660c 100644
case PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_RAS: case PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_RAS:
case PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA1_RAS: case PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA1_RAS:
pvt->pci_ras = pdev; pvt->pci_ras = pdev;
--
2.14.2

View File

@ -47,6 +47,3 @@ index d6afed6d0752..c09ebe92a40a 100644
spin_unlock_irqrestore(&wq_head->lock, flags); spin_unlock_irqrestore(&wq_head->lock, flags);
} }
EXPORT_SYMBOL(add_wait_queue); EXPORT_SYMBOL(add_wait_queue);
--
2.14.2

View File

@ -41,7 +41,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
4 files changed, 46 insertions(+), 1 deletion(-) 4 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 2443b9580e94..e0b6aa62b253 100644 index 7e5db5aa37f3..b5bcdf7e94d7 100644
--- a/arch/x86/kernel/cpu/bugs.c --- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
@ -52,7 +52,7 @@ index 2443b9580e94..e0b6aa62b253 100644
#include <linux/nospec.h> #include <linux/nospec.h>
#include <linux/prctl.h> #include <linux/prctl.h>
@@ -130,6 +131,19 @@ static const char *spectre_v2_strings[] = { @@ -131,6 +132,19 @@ static const char *spectre_v2_strings[] = {
static enum spectre_v2_mitigation spectre_v2_enabled __ro_after_init = static enum spectre_v2_mitigation spectre_v2_enabled __ro_after_init =
SPECTRE_V2_NONE; SPECTRE_V2_NONE;
@ -70,9 +70,9 @@ index 2443b9580e94..e0b6aa62b253 100644
+} +}
+#endif +#endif
void x86_spec_ctrl_set(u64 val) void
{ x86_virt_spec_ctrl(u64 guest_spec_ctrl, u64 guest_virt_spec_ctrl, bool setguest)
@@ -615,7 +629,9 @@ static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr @@ -627,7 +641,9 @@ static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr
return sprintf(buf, "Mitigation: OSB (observable speculation barrier, Intel v6)\n"); return sprintf(buf, "Mitigation: OSB (observable speculation barrier, Intel v6)\n");
case X86_BUG_SPECTRE_V2: case X86_BUG_SPECTRE_V2:
@ -104,7 +104,7 @@ index e7bdd549e527..c4fdf7661f82 100644
static inline bool module_sig_ok(struct module *module) static inline bool module_sig_ok(struct module *module)
{ {
diff --git a/kernel/module.c b/kernel/module.c diff --git a/kernel/module.c b/kernel/module.c
index e5b878b26906..de7db074f793 100644 index 41b97a191a72..1c3fd6f767b4 100644
--- a/kernel/module.c --- a/kernel/module.c
+++ b/kernel/module.c +++ b/kernel/module.c
@@ -2855,6 +2855,15 @@ static int check_modinfo_livepatch(struct module *mod, struct load_info *info) @@ -2855,6 +2855,15 @@ static int check_modinfo_livepatch(struct module *mod, struct load_info *info)
@ -159,6 +159,3 @@ index 48397feb08fb..cc91f81ac33e 100644
add_staging_flag(&buf, mod->name); add_staging_flag(&buf, mod->name);
err |= add_versions(&buf, mod); err |= add_versions(&buf, mod);
add_depends(&buf, mod, modules); add_depends(&buf, mod, modules);
--
2.14.2

View File

@ -122,6 +122,3 @@ index e906014890b6..ec1e5de41653 100644
return 0; return 0;
} }
--
2.14.2

View File

@ -84,6 +84,3 @@ index 989a900383b5..e1a3ae4f3cab 100644
dst = &rt->dst; dst = &rt->dst;
break; break;
} }
--
2.14.2

View File

@ -55,6 +55,3 @@ index edb462b0b73b..e626d72868fe 100644
if (!IS_ERR_OR_NULL(dst)) if (!IS_ERR_OR_NULL(dst))
dst_release(dst); dst_release(dst);
--
2.14.2

View File

@ -41,6 +41,3 @@ index 726b6cecf430..fa8f6effcf00 100644
svc_shutdown_net(serv, net); svc_shutdown_net(serv, net);
dprintk("lockd_down_net: per-net data destroyed; net=%p\n", net); dprintk("lockd_down_net: per-net data destroyed; net=%p\n", net);
} }
--
2.14.2

View File

@ -56,6 +56,3 @@ index 88a31e9340a0..77ec9b495027 100644
} }
ret = ocfs2_write_end_nolock(inode->i_mapping, pos, len, len, wc); ret = ocfs2_write_end_nolock(inode->i_mapping, pos, len, len, wc);
--
2.14.2

View File

@ -365,6 +365,3 @@ index 77ec9b495027..2ff02dda97d8 100644
ret = ocfs2_lock_allocators(inode, &et, 0, dwc->dw_zero_count*2, ret = ocfs2_lock_allocators(inode, &et, 0, dwc->dw_zero_count*2,
&data_ac, &meta_ac); &data_ac, &meta_ac);
if (ret) { if (ret) {
--
2.14.2

View File

@ -98,6 +98,3 @@ index 859e4c224b80..2aae929eb90b 100644
iput(inode); iput(inode);
} }
--
2.14.2

View File

@ -41,6 +41,3 @@ index 8b887db33383..5c4093e0be8d 100644
put_page(page); put_page(page);
} }
--
2.14.2

View File

@ -44,6 +44,3 @@ index d74c3f9f1fa8..436005392047 100644
endef endef
# List module undefined symbols (or empty line if not enabled) # List module undefined symbols (or empty line if not enabled)
--
2.14.2

View File

@ -90,6 +90,3 @@ index d0713627deb6..3b495739bf65 100644
return -ENOENT; return -ENOENT;
} }
--
2.14.2