From: Greg Kroah-Hartman Date: Mon, 29 Jun 2020 10:48:55 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.7.7~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc7c073e39161b33c69937f73f21adf60b4653c9;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: acpi-sysfs-fix-pm_profile_attr-type.patch alsa-hda-add-nvidia-codec-ids-9a-9d-through-a0-to-patch-table.patch kvm-nvmx-plumb-l2-gpa-through-to-pml-emulation.patch kvm-x86-fix-msr-range-of-apic-registers-in-x2apic-mode.patch --- diff --git a/queue-4.14/acpi-sysfs-fix-pm_profile_attr-type.patch b/queue-4.14/acpi-sysfs-fix-pm_profile_attr-type.patch new file mode 100644 index 00000000000..d36c3921e61 --- /dev/null +++ b/queue-4.14/acpi-sysfs-fix-pm_profile_attr-type.patch @@ -0,0 +1,94 @@ +From e6d701dca9893990d999fd145e3e07223c002b06 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Thu, 11 Jun 2020 21:51:50 -0700 +Subject: ACPI: sysfs: Fix pm_profile_attr type + +From: Nathan Chancellor + +commit e6d701dca9893990d999fd145e3e07223c002b06 upstream. + +When running a kernel with Clang's Control Flow Integrity implemented, +there is a violation that happens when accessing +/sys/firmware/acpi/pm_profile: + +$ cat /sys/firmware/acpi/pm_profile +0 + +$ dmesg +... +[ 17.352564] ------------[ cut here ]------------ +[ 17.352568] CFI failure (target: acpi_show_profile+0x0/0x8): +[ 17.352572] WARNING: CPU: 3 PID: 497 at kernel/cfi.c:29 __cfi_check_fail+0x33/0x40 +[ 17.352573] Modules linked in: +[ 17.352575] CPU: 3 PID: 497 Comm: cat Tainted: G W 5.7.0-microsoft-standard+ #1 +[ 17.352576] RIP: 0010:__cfi_check_fail+0x33/0x40 +[ 17.352577] Code: 48 c7 c7 50 b3 85 84 48 c7 c6 50 0a 4e 84 e8 a4 d8 60 00 85 c0 75 02 5b c3 48 c7 c7 dc 5e 49 84 48 89 de 31 c0 e8 7d 06 eb ff <0f> 0b 5b c3 00 00 cc cc 00 00 cc cc 00 85 f6 74 25 41 b9 ea ff ff +[ 17.352577] RSP: 0018:ffffaa6dc3c53d30 EFLAGS: 00010246 +[ 17.352578] RAX: 331267e0c06cee00 RBX: ffffffff83d85890 RCX: ffffffff8483a6f8 +[ 17.352579] RDX: ffff9cceabbb37c0 RSI: 0000000000000082 RDI: ffffffff84bb9e1c +[ 17.352579] RBP: ffffffff845b2bc8 R08: 0000000000000001 R09: ffff9cceabbba200 +[ 17.352579] R10: 000000000000019d R11: 0000000000000000 R12: ffff9cc947766f00 +[ 17.352580] R13: ffffffff83d6bd50 R14: ffff9ccc6fa80000 R15: ffffffff845bd328 +[ 17.352582] FS: 00007fdbc8d13580(0000) GS:ffff9cce91ac0000(0000) knlGS:0000000000000000 +[ 17.352582] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 17.352583] CR2: 00007fdbc858e000 CR3: 00000005174d0000 CR4: 0000000000340ea0 +[ 17.352584] Call Trace: +[ 17.352586] ? rev_id_show+0x8/0x8 +[ 17.352587] ? __cfi_check+0x45bac/0x4b640 +[ 17.352589] ? kobj_attr_show+0x73/0x80 +[ 17.352590] ? sysfs_kf_seq_show+0xc1/0x140 +[ 17.352592] ? ext4_seq_options_show.cfi_jt+0x8/0x8 +[ 17.352593] ? seq_read+0x180/0x600 +[ 17.352595] ? sysfs_create_file_ns.cfi_jt+0x10/0x10 +[ 17.352596] ? tlbflush_read_file+0x8/0x8 +[ 17.352597] ? __vfs_read+0x6b/0x220 +[ 17.352598] ? handle_mm_fault+0xa23/0x11b0 +[ 17.352599] ? vfs_read+0xa2/0x130 +[ 17.352599] ? ksys_read+0x6a/0xd0 +[ 17.352601] ? __do_sys_getpgrp+0x8/0x8 +[ 17.352602] ? do_syscall_64+0x72/0x120 +[ 17.352603] ? entry_SYSCALL_64_after_hwframe+0x44/0xa9 +[ 17.352604] ---[ end trace 7b1fa81dc897e419 ]--- + +When /sys/firmware/acpi/pm_profile is read, sysfs_kf_seq_show is called, +which in turn calls kobj_attr_show, which gets the ->show callback +member by calling container_of on attr (casting it to struct +kobj_attribute) then calls it. + +There is a CFI violation because pm_profile_attr is of type +struct device_attribute but kobj_attr_show calls ->show expecting it +to be from struct kobj_attribute. CFI checking ensures that function +pointer types match when doing indirect calls. Fix pm_profile_attr to +be defined in terms of kobj_attribute so there is no violation or +mismatch. + +Fixes: 362b646062b2 ("ACPI: Export FADT pm_profile integer value to userspace") +Link: https://github.com/ClangBuiltLinux/linux/issues/1051 +Reported-by: yuu ichii +Signed-off-by: Nathan Chancellor +Cc: 3.10+ # 3.10+ +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/sysfs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/acpi/sysfs.c ++++ b/drivers/acpi/sysfs.c +@@ -942,13 +942,13 @@ static void __exit interrupt_stats_exit( + } + + static ssize_t +-acpi_show_profile(struct device *dev, struct device_attribute *attr, ++acpi_show_profile(struct kobject *kobj, struct kobj_attribute *attr, + char *buf) + { + return sprintf(buf, "%d\n", acpi_gbl_FADT.preferred_profile); + } + +-static const struct device_attribute pm_profile_attr = ++static const struct kobj_attribute pm_profile_attr = + __ATTR(pm_profile, S_IRUGO, acpi_show_profile, NULL); + + static ssize_t hotplug_enabled_show(struct kobject *kobj, diff --git a/queue-4.14/alsa-hda-add-nvidia-codec-ids-9a-9d-through-a0-to-patch-table.patch b/queue-4.14/alsa-hda-add-nvidia-codec-ids-9a-9d-through-a0-to-patch-table.patch new file mode 100644 index 00000000000..ef6f87ebcb0 --- /dev/null +++ b/queue-4.14/alsa-hda-add-nvidia-codec-ids-9a-9d-through-a0-to-patch-table.patch @@ -0,0 +1,36 @@ +From adb36a8203831e40494a92095dacd566b2ad4a69 Mon Sep 17 00:00:00 2001 +From: Aaron Plattner +Date: Thu, 11 Jun 2020 11:08:45 -0700 +Subject: ALSA: hda: Add NVIDIA codec IDs 9a & 9d through a0 to patch table + +From: Aaron Plattner + +commit adb36a8203831e40494a92095dacd566b2ad4a69 upstream. + +These IDs are for upcoming NVIDIA chips with audio functions that are largely +similar to the existing ones. + +Signed-off-by: Aaron Plattner +Cc: +Link: https://lore.kernel.org/r/20200611180845.39942-1-aplattner@nvidia.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_hdmi.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/sound/pci/hda/patch_hdmi.c ++++ b/sound/pci/hda/patch_hdmi.c +@@ -3861,6 +3861,11 @@ HDA_CODEC_ENTRY(0x10de0095, "GPU 95 HDMI + HDA_CODEC_ENTRY(0x10de0097, "GPU 97 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0098, "GPU 98 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0099, "GPU 99 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de009a, "GPU 9a HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de009d, "GPU 9d HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de009e, "GPU 9e HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de009f, "GPU 9f HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de00a0, "GPU a0 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI", patch_nvhdmi_2ch), + HDA_CODEC_ENTRY(0x10de8067, "MCP67/68 HDMI", patch_nvhdmi_2ch), + HDA_CODEC_ENTRY(0x11069f80, "VX900 HDMI/DP", patch_via_hdmi), diff --git a/queue-4.14/kvm-nvmx-plumb-l2-gpa-through-to-pml-emulation.patch b/queue-4.14/kvm-nvmx-plumb-l2-gpa-through-to-pml-emulation.patch new file mode 100644 index 00000000000..720f589d7ad --- /dev/null +++ b/queue-4.14/kvm-nvmx-plumb-l2-gpa-through-to-pml-emulation.patch @@ -0,0 +1,121 @@ +From 2dbebf7ae1ed9a420d954305e2c9d5ed39ec57c3 Mon Sep 17 00:00:00 2001 +From: Sean Christopherson +Date: Mon, 22 Jun 2020 14:58:29 -0700 +Subject: KVM: nVMX: Plumb L2 GPA through to PML emulation + +From: Sean Christopherson + +commit 2dbebf7ae1ed9a420d954305e2c9d5ed39ec57c3 upstream. + +Explicitly pass the L2 GPA to kvm_arch_write_log_dirty(), which for all +intents and purposes is vmx_write_pml_buffer(), instead of having the +latter pull the GPA from vmcs.GUEST_PHYSICAL_ADDRESS. If the dirty bit +update is the result of KVM emulation (rare for L2), then the GPA in the +VMCS may be stale and/or hold a completely unrelated GPA. + +Fixes: c5f983f6e8455 ("nVMX: Implement emulated Page Modification Logging") +Cc: stable@vger.kernel.org +Signed-off-by: Sean Christopherson +Message-Id: <20200622215832.22090-2-sean.j.christopherson@intel.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/include/asm/kvm_host.h | 2 +- + arch/x86/kvm/mmu.c | 4 ++-- + arch/x86/kvm/mmu.h | 2 +- + arch/x86/kvm/paging_tmpl.h | 7 ++++--- + arch/x86/kvm/vmx.c | 5 ++--- + 5 files changed, 10 insertions(+), 10 deletions(-) + +--- a/arch/x86/include/asm/kvm_host.h ++++ b/arch/x86/include/asm/kvm_host.h +@@ -1060,7 +1060,7 @@ struct kvm_x86_ops { + void (*enable_log_dirty_pt_masked)(struct kvm *kvm, + struct kvm_memory_slot *slot, + gfn_t offset, unsigned long mask); +- int (*write_log_dirty)(struct kvm_vcpu *vcpu); ++ int (*write_log_dirty)(struct kvm_vcpu *vcpu, gpa_t l2_gpa); + + /* pmu operations of sub-arch */ + const struct kvm_pmu_ops *pmu_ops; +--- a/arch/x86/kvm/mmu.c ++++ b/arch/x86/kvm/mmu.c +@@ -1713,10 +1713,10 @@ void kvm_arch_mmu_enable_log_dirty_pt_ma + * Emulate arch specific page modification logging for the + * nested hypervisor + */ +-int kvm_arch_write_log_dirty(struct kvm_vcpu *vcpu) ++int kvm_arch_write_log_dirty(struct kvm_vcpu *vcpu, gpa_t l2_gpa) + { + if (kvm_x86_ops->write_log_dirty) +- return kvm_x86_ops->write_log_dirty(vcpu); ++ return kvm_x86_ops->write_log_dirty(vcpu, l2_gpa); + + return 0; + } +--- a/arch/x86/kvm/mmu.h ++++ b/arch/x86/kvm/mmu.h +@@ -194,7 +194,7 @@ void kvm_mmu_gfn_disallow_lpage(struct k + void kvm_mmu_gfn_allow_lpage(struct kvm_memory_slot *slot, gfn_t gfn); + bool kvm_mmu_slot_gfn_write_protect(struct kvm *kvm, + struct kvm_memory_slot *slot, u64 gfn); +-int kvm_arch_write_log_dirty(struct kvm_vcpu *vcpu); ++int kvm_arch_write_log_dirty(struct kvm_vcpu *vcpu, gpa_t l2_gpa); + + int kvm_mmu_post_init_vm(struct kvm *kvm); + void kvm_mmu_pre_destroy_vm(struct kvm *kvm); +--- a/arch/x86/kvm/paging_tmpl.h ++++ b/arch/x86/kvm/paging_tmpl.h +@@ -202,7 +202,7 @@ static inline unsigned FNAME(gpte_access + static int FNAME(update_accessed_dirty_bits)(struct kvm_vcpu *vcpu, + struct kvm_mmu *mmu, + struct guest_walker *walker, +- int write_fault) ++ gpa_t addr, int write_fault) + { + unsigned level, index; + pt_element_t pte, orig_pte; +@@ -227,7 +227,7 @@ static int FNAME(update_accessed_dirty_b + !(pte & PT_GUEST_DIRTY_MASK)) { + trace_kvm_mmu_set_dirty_bit(table_gfn, index, sizeof(pte)); + #if PTTYPE == PTTYPE_EPT +- if (kvm_arch_write_log_dirty(vcpu)) ++ if (kvm_arch_write_log_dirty(vcpu, addr)) + return -EINVAL; + #endif + pte |= PT_GUEST_DIRTY_MASK; +@@ -424,7 +424,8 @@ retry_walk: + (PT_GUEST_DIRTY_SHIFT - PT_GUEST_ACCESSED_SHIFT); + + if (unlikely(!accessed_dirty)) { +- ret = FNAME(update_accessed_dirty_bits)(vcpu, mmu, walker, write_fault); ++ ret = FNAME(update_accessed_dirty_bits)(vcpu, mmu, walker, ++ addr, write_fault); + if (unlikely(ret < 0)) + goto error; + else if (ret) +--- a/arch/x86/kvm/vmx.c ++++ b/arch/x86/kvm/vmx.c +@@ -12462,11 +12462,10 @@ static void vmx_flush_log_dirty(struct k + kvm_flush_pml_buffers(kvm); + } + +-static int vmx_write_pml_buffer(struct kvm_vcpu *vcpu) ++static int vmx_write_pml_buffer(struct kvm_vcpu *vcpu, gpa_t gpa) + { + struct vmcs12 *vmcs12; + struct vcpu_vmx *vmx = to_vmx(vcpu); +- gpa_t gpa; + struct page *page = NULL; + u64 *pml_address; + +@@ -12487,7 +12486,7 @@ static int vmx_write_pml_buffer(struct k + return 1; + } + +- gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS) & ~0xFFFull; ++ gpa &= ~0xFFFull; + + page = kvm_vcpu_gpa_to_page(vcpu, vmcs12->pml_address); + if (is_error_page(page)) diff --git a/queue-4.14/kvm-x86-fix-msr-range-of-apic-registers-in-x2apic-mode.patch b/queue-4.14/kvm-x86-fix-msr-range-of-apic-registers-in-x2apic-mode.patch new file mode 100644 index 00000000000..3067365de37 --- /dev/null +++ b/queue-4.14/kvm-x86-fix-msr-range-of-apic-registers-in-x2apic-mode.patch @@ -0,0 +1,45 @@ +From bf10bd0be53282183f374af23577b18b5fbf7801 Mon Sep 17 00:00:00 2001 +From: Xiaoyao Li +Date: Tue, 16 Jun 2020 15:33:07 +0800 +Subject: KVM: X86: Fix MSR range of APIC registers in X2APIC mode + +From: Xiaoyao Li + +commit bf10bd0be53282183f374af23577b18b5fbf7801 upstream. + +Only MSR address range 0x800 through 0x8ff is architecturally reserved +and dedicated for accessing APIC registers in x2APIC mode. + +Fixes: 0105d1a52640 ("KVM: x2apic interface to lapic") +Signed-off-by: Xiaoyao Li +Message-Id: <20200616073307.16440-1-xiaoyao.li@intel.com> +Cc: stable@vger.kernel.org +Reviewed-by: Sean Christopherson +Reviewed-by: Jim Mattson +Signed-off-by: Paolo Bonzini +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kvm/x86.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/x86/kvm/x86.c ++++ b/arch/x86/kvm/x86.c +@@ -2344,7 +2344,7 @@ int kvm_set_msr_common(struct kvm_vcpu * + return kvm_mtrr_set_msr(vcpu, msr, data); + case MSR_IA32_APICBASE: + return kvm_set_apic_base(vcpu, msr_info); +- case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: ++ case APIC_BASE_MSR ... APIC_BASE_MSR + 0xff: + return kvm_x2apic_msr_write(vcpu, msr, data); + case MSR_IA32_TSCDEADLINE: + kvm_set_lapic_tscdeadline_msr(vcpu, data); +@@ -2629,7 +2629,7 @@ int kvm_get_msr_common(struct kvm_vcpu * + case MSR_IA32_APICBASE: + msr_info->data = kvm_get_apic_base(vcpu); + break; +- case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: ++ case APIC_BASE_MSR ... APIC_BASE_MSR + 0xff: + return kvm_x2apic_msr_read(vcpu, msr_info->index, &msr_info->data); + break; + case MSR_IA32_TSCDEADLINE: diff --git a/queue-4.14/series b/queue-4.14/series index 48da0833528..793385764a5 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -56,3 +56,7 @@ net-alx-fix-race-condition-in-alx_remove.patch s390-ptrace-fix-setting-syscall-number.patch kbuild-improve-cc-option-to-clean-up-all-temporary-f.patch blktrace-break-out-of-blktrace-setup-on-concurrent-c.patch +alsa-hda-add-nvidia-codec-ids-9a-9d-through-a0-to-patch-table.patch +acpi-sysfs-fix-pm_profile_attr-type.patch +kvm-x86-fix-msr-range-of-apic-registers-in-x2apic-mode.patch +kvm-nvmx-plumb-l2-gpa-through-to-pml-emulation.patch