From: Sasha Levin Date: Sat, 12 Feb 2022 05:44:11 +0000 (-0500) Subject: Fixes for 5.10 X-Git-Tag: v4.9.302~51 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0207562475c31af43d1d571f5e50f2720d0114d;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.10 Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/drm-panel-orientation-quirks-add-quirk-for-the-1netb.patch b/queue-5.10/drm-panel-orientation-quirks-add-quirk-for-the-1netb.patch new file mode 100644 index 00000000000..c50d48e01e0 --- /dev/null +++ b/queue-5.10/drm-panel-orientation-quirks-add-quirk-for-the-1netb.patch @@ -0,0 +1,53 @@ +From c566b2a5d27856d3f13510112fb6738cfc4e76cf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 13 Jan 2022 08:06:20 +0800 +Subject: drm: panel-orientation-quirks: Add quirk for the 1Netbook OneXPlayer + +From: Raymond Jay Golo + +[ Upstream commit d3cbc6e323c9299d10c8d2e4127c77c7d05d07b1 ] + +The 1Netbook OneXPlayer uses a panel which has been mounted +90 degrees rotated. Add a quirk for this. + +Signed-off-by: Raymond Jay Golo +Signed-off-by: Daniel Vetter +Link: https://patchwork.freedesktop.org/patch/msgid/20220113000619.90988-1-rjgolo@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/drivers/gpu/drm/drm_panel_orientation_quirks.c b/drivers/gpu/drm/drm_panel_orientation_quirks.c +index 9d1bd8f491ad7..448c2f2d803a6 100644 +--- a/drivers/gpu/drm/drm_panel_orientation_quirks.c ++++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c +@@ -115,6 +115,12 @@ static const struct drm_dmi_panel_orientation_data lcd1280x1920_rightside_up = { + .orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP, + }; + ++static const struct drm_dmi_panel_orientation_data lcd1600x2560_leftside_up = { ++ .width = 1600, ++ .height = 2560, ++ .orientation = DRM_MODE_PANEL_ORIENTATION_LEFT_UP, ++}; ++ + static const struct dmi_system_id orientation_data[] = { + { /* Acer One 10 (S1003) */ + .matches = { +@@ -261,6 +267,12 @@ static const struct dmi_system_id orientation_data[] = { + DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "Default string"), + }, + .driver_data = (void *)&onegx1_pro, ++ }, { /* OneXPlayer */ ++ .matches = { ++ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ONE-NETBOOK TECHNOLOGY CO., LTD."), ++ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "ONE XPLAYER"), ++ }, ++ .driver_data = (void *)&lcd1600x2560_leftside_up, + }, { /* Samsung GalaxyBook 10.6 */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), +-- +2.34.1 + diff --git a/queue-5.10/kvm-eventfd-fix-false-positive-rcu-usage-warning.patch b/queue-5.10/kvm-eventfd-fix-false-positive-rcu-usage-warning.patch new file mode 100644 index 00000000000..dfd702eda3b --- /dev/null +++ b/queue-5.10/kvm-eventfd-fix-false-positive-rcu-usage-warning.patch @@ -0,0 +1,87 @@ +From 73bd993255b7f9f3b456e6e9a7e9153124703815 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Jan 2022 14:54:49 +0800 +Subject: KVM: eventfd: Fix false positive RCU usage warning + +From: Hou Wenlong + +[ Upstream commit 6a0c61703e3a5d67845a4b275e1d9d7bc1b5aad7 ] + +Fix the following false positive warning: + ============================= + WARNING: suspicious RCU usage + 5.16.0-rc4+ #57 Not tainted + ----------------------------- + arch/x86/kvm/../../../virt/kvm/eventfd.c:484 RCU-list traversed in non-reader section!! + + other info that might help us debug this: + + rcu_scheduler_active = 2, debug_locks = 1 + 3 locks held by fc_vcpu 0/330: + #0: ffff8884835fc0b0 (&vcpu->mutex){+.+.}-{3:3}, at: kvm_vcpu_ioctl+0x88/0x6f0 [kvm] + #1: ffffc90004c0bb68 (&kvm->srcu){....}-{0:0}, at: vcpu_enter_guest+0x600/0x1860 [kvm] + #2: ffffc90004c0c1d0 (&kvm->irq_srcu){....}-{0:0}, at: kvm_notify_acked_irq+0x36/0x180 [kvm] + + stack backtrace: + CPU: 26 PID: 330 Comm: fc_vcpu 0 Not tainted 5.16.0-rc4+ + Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 + Call Trace: + + dump_stack_lvl+0x44/0x57 + kvm_notify_acked_gsi+0x6b/0x70 [kvm] + kvm_notify_acked_irq+0x8d/0x180 [kvm] + kvm_ioapic_update_eoi+0x92/0x240 [kvm] + kvm_apic_set_eoi_accelerated+0x2a/0xe0 [kvm] + handle_apic_eoi_induced+0x3d/0x60 [kvm_intel] + vmx_handle_exit+0x19c/0x6a0 [kvm_intel] + vcpu_enter_guest+0x66e/0x1860 [kvm] + kvm_arch_vcpu_ioctl_run+0x438/0x7f0 [kvm] + kvm_vcpu_ioctl+0x38a/0x6f0 [kvm] + __x64_sys_ioctl+0x89/0xc0 + do_syscall_64+0x3a/0x90 + entry_SYSCALL_64_after_hwframe+0x44/0xae + +Since kvm_unregister_irq_ack_notifier() does synchronize_srcu(&kvm->irq_srcu), +kvm->irq_ack_notifier_list is protected by kvm->irq_srcu. In fact, +kvm->irq_srcu SRCU read lock is held in kvm_notify_acked_irq(), making it +a false positive warning. So use hlist_for_each_entry_srcu() instead of +hlist_for_each_entry_rcu(). + +Reviewed-by: Sean Christopherson +Signed-off-by: Hou Wenlong +Message-Id: +Signed-off-by: Paolo Bonzini +Signed-off-by: Sasha Levin +--- + virt/kvm/eventfd.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c +index c2323c27a28b5..518cd8dc390e2 100644 +--- a/virt/kvm/eventfd.c ++++ b/virt/kvm/eventfd.c +@@ -451,8 +451,8 @@ bool kvm_irq_has_notifier(struct kvm *kvm, unsigned irqchip, unsigned pin) + idx = srcu_read_lock(&kvm->irq_srcu); + gsi = kvm_irq_map_chip_pin(kvm, irqchip, pin); + if (gsi != -1) +- hlist_for_each_entry_rcu(kian, &kvm->irq_ack_notifier_list, +- link) ++ hlist_for_each_entry_srcu(kian, &kvm->irq_ack_notifier_list, ++ link, srcu_read_lock_held(&kvm->irq_srcu)) + if (kian->gsi == gsi) { + srcu_read_unlock(&kvm->irq_srcu, idx); + return true; +@@ -468,8 +468,8 @@ void kvm_notify_acked_gsi(struct kvm *kvm, int gsi) + { + struct kvm_irq_ack_notifier *kian; + +- hlist_for_each_entry_rcu(kian, &kvm->irq_ack_notifier_list, +- link) ++ hlist_for_each_entry_srcu(kian, &kvm->irq_ack_notifier_list, ++ link, srcu_read_lock_held(&kvm->irq_srcu)) + if (kian->gsi == gsi) + kian->irq_acked(kian); + } +-- +2.34.1 + diff --git a/queue-5.10/kvm-nvmx-also-filter-msr_ia32_vmx_true_pinbased_ctls.patch b/queue-5.10/kvm-nvmx-also-filter-msr_ia32_vmx_true_pinbased_ctls.patch new file mode 100644 index 00000000000..2b4068bea63 --- /dev/null +++ b/queue-5.10/kvm-nvmx-also-filter-msr_ia32_vmx_true_pinbased_ctls.patch @@ -0,0 +1,42 @@ +From b2b6e1278a1d6bc26f5731cf1e5036be974e3af6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 12 Jan 2022 18:01:30 +0100 +Subject: KVM: nVMX: Also filter MSR_IA32_VMX_TRUE_PINBASED_CTLS when eVMCS + +From: Vitaly Kuznetsov + +[ Upstream commit f80ae0ef089a09e8c18da43a382c3caac9a424a7 ] + +Similar to MSR_IA32_VMX_EXIT_CTLS/MSR_IA32_VMX_TRUE_EXIT_CTLS, +MSR_IA32_VMX_ENTRY_CTLS/MSR_IA32_VMX_TRUE_ENTRY_CTLS pair, +MSR_IA32_VMX_TRUE_PINBASED_CTLS needs to be filtered the same way +MSR_IA32_VMX_PINBASED_CTLS is currently filtered as guests may solely rely +on 'true' MSR data. + +Note, none of the currently existing Windows/Hyper-V versions are known +to stumble upon the unfiltered MSR_IA32_VMX_TRUE_PINBASED_CTLS, the change +is aimed at making the filtering future proof. + +Signed-off-by: Vitaly Kuznetsov +Message-Id: <20220112170134.1904308-2-vkuznets@redhat.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Sasha Levin +--- + arch/x86/kvm/vmx/evmcs.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/x86/kvm/vmx/evmcs.c b/arch/x86/kvm/vmx/evmcs.c +index c0d6fee9225fe..5b68034ec5f9c 100644 +--- a/arch/x86/kvm/vmx/evmcs.c ++++ b/arch/x86/kvm/vmx/evmcs.c +@@ -361,6 +361,7 @@ void nested_evmcs_filter_control_msr(u32 msr_index, u64 *pdata) + case MSR_IA32_VMX_PROCBASED_CTLS2: + ctl_high &= ~EVMCS1_UNSUPPORTED_2NDEXEC; + break; ++ case MSR_IA32_VMX_TRUE_PINBASED_CTLS: + case MSR_IA32_VMX_PINBASED_CTLS: + ctl_high &= ~EVMCS1_UNSUPPORTED_PINCTRL; + break; +-- +2.34.1 + diff --git a/queue-5.10/kvm-nvmx-evmcs-filter-out-vm_exit_save_vmx_preemptio.patch b/queue-5.10/kvm-nvmx-evmcs-filter-out-vm_exit_save_vmx_preemptio.patch new file mode 100644 index 00000000000..54665478744 --- /dev/null +++ b/queue-5.10/kvm-nvmx-evmcs-filter-out-vm_exit_save_vmx_preemptio.patch @@ -0,0 +1,43 @@ +From 051df5398b2b949c44c0413310ad663447a1dfb9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 12 Jan 2022 18:01:31 +0100 +Subject: KVM: nVMX: eVMCS: Filter out VM_EXIT_SAVE_VMX_PREEMPTION_TIMER + +From: Vitaly Kuznetsov + +[ Upstream commit 7a601e2cf61558dfd534a9ecaad09f5853ad8204 ] + +Enlightened VMCS v1 doesn't have VMX_PREEMPTION_TIMER_VALUE field, +PIN_BASED_VMX_PREEMPTION_TIMER is also filtered out already so it makes +sense to filter out VM_EXIT_SAVE_VMX_PREEMPTION_TIMER too. + +Note, none of the currently existing Windows/Hyper-V versions are known +to enable 'save VMX-preemption timer value' when eVMCS is in use, the +change is aimed at making the filtering future proof. + +Signed-off-by: Vitaly Kuznetsov +Message-Id: <20220112170134.1904308-3-vkuznets@redhat.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Sasha Levin +--- + arch/x86/kvm/vmx/evmcs.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/kvm/vmx/evmcs.h b/arch/x86/kvm/vmx/evmcs.h +index bd41d9462355f..011929a638230 100644 +--- a/arch/x86/kvm/vmx/evmcs.h ++++ b/arch/x86/kvm/vmx/evmcs.h +@@ -59,7 +59,9 @@ DECLARE_STATIC_KEY_FALSE(enable_evmcs); + SECONDARY_EXEC_SHADOW_VMCS | \ + SECONDARY_EXEC_TSC_SCALING | \ + SECONDARY_EXEC_PAUSE_LOOP_EXITING) +-#define EVMCS1_UNSUPPORTED_VMEXIT_CTRL (VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL) ++#define EVMCS1_UNSUPPORTED_VMEXIT_CTRL \ ++ (VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL | \ ++ VM_EXIT_SAVE_VMX_PREEMPTION_TIMER) + #define EVMCS1_UNSUPPORTED_VMENTRY_CTRL (VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL) + #define EVMCS1_UNSUPPORTED_VMFUNC (VMX_VMFUNC_EPTP_SWITCHING) + +-- +2.34.1 + diff --git a/queue-5.10/kvm-svm-don-t-kill-sev-guest-if-smap-erratum-trigger.patch b/queue-5.10/kvm-svm-don-t-kill-sev-guest-if-smap-erratum-trigger.patch new file mode 100644 index 00000000000..68810adbaf0 --- /dev/null +++ b/queue-5.10/kvm-svm-don-t-kill-sev-guest-if-smap-erratum-trigger.patch @@ -0,0 +1,54 @@ +From bbc2a457fc7c28b6836b02c9e04faea3a236ab6f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 Jan 2022 01:07:19 +0000 +Subject: KVM: SVM: Don't kill SEV guest if SMAP erratum triggers in usermode + +From: Sean Christopherson + +[ Upstream commit cdf85e0c5dc766fc7fc779466280e454a6d04f87 ] + +Inject a #GP instead of synthesizing triple fault to try to avoid killing +the guest if emulation of an SEV guest fails due to encountering the SMAP +erratum. The injected #GP may still be fatal to the guest, e.g. if the +userspace process is providing critical functionality, but KVM should +make every attempt to keep the guest alive. + +Signed-off-by: Sean Christopherson +Reviewed-by: Liam Merwick +Message-Id: <20220120010719.711476-10-seanjc@google.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Sasha Levin +--- + arch/x86/kvm/svm/svm.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c +index fa543c355fbdb..d515c8e68314c 100644 +--- a/arch/x86/kvm/svm/svm.c ++++ b/arch/x86/kvm/svm/svm.c +@@ -4155,7 +4155,21 @@ static bool svm_can_emulate_instruction(struct kvm_vcpu *vcpu, void *insn, int i + return true; + + pr_err_ratelimited("KVM: SEV Guest triggered AMD Erratum 1096\n"); +- kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu); ++ ++ /* ++ * If the fault occurred in userspace, arbitrarily inject #GP ++ * to avoid killing the guest and to hopefully avoid confusing ++ * the guest kernel too much, e.g. injecting #PF would not be ++ * coherent with respect to the guest's page tables. Request ++ * triple fault if the fault occurred in the kernel as there's ++ * no fault that KVM can inject without confusing the guest. ++ * In practice, the triple fault is moot as no sane SEV kernel ++ * will execute from user memory while also running with SMAP=1. ++ */ ++ if (is_user) ++ kvm_inject_gp(vcpu, 0); ++ else ++ kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu); + } + + return false; +-- +2.34.1 + diff --git a/queue-5.10/kvm-vmx-set-vmcs.pending_dbg.bs-on-db-in-sti-movss-b.patch b/queue-5.10/kvm-vmx-set-vmcs.pending_dbg.bs-on-db-in-sti-movss-b.patch new file mode 100644 index 00000000000..2c98e6b67f8 --- /dev/null +++ b/queue-5.10/kvm-vmx-set-vmcs.pending_dbg.bs-on-db-in-sti-movss-b.patch @@ -0,0 +1,101 @@ +From fc78433acef1c19d42b6fb817d51e26c591efe0c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 Jan 2022 00:06:24 +0000 +Subject: KVM: VMX: Set vmcs.PENDING_DBG.BS on #DB in STI/MOVSS blocking shadow + +From: Sean Christopherson + +[ Upstream commit b9bed78e2fa9571b7c983b20666efa0009030c71 ] + +Set vmcs.GUEST_PENDING_DBG_EXCEPTIONS.BS, a.k.a. the pending single-step +breakpoint flag, when re-injecting a #DB with RFLAGS.TF=1, and STI or +MOVSS blocking is active. Setting the flag is necessary to make VM-Entry +consistency checks happy, as VMX has an invariant that if RFLAGS.TF is +set and STI/MOVSS blocking is true, then the previous instruction must +have been STI or MOV/POP, and therefore a single-step #DB must be pending +since the RFLAGS.TF cannot have been set by the previous instruction, +i.e. the one instruction delay after setting RFLAGS.TF must have already +expired. + +Normally, the CPU sets vmcs.GUEST_PENDING_DBG_EXCEPTIONS.BS appropriately +when recording guest state as part of a VM-Exit, but #DB VM-Exits +intentionally do not treat the #DB as "guest state" as interception of +the #DB effectively makes the #DB host-owned, thus KVM needs to manually +set PENDING_DBG.BS when forwarding/re-injecting the #DB to the guest. + +Note, although this bug can be triggered by guest userspace, doing so +requires IOPL=3, and guest userspace running with IOPL=3 has full access +to all I/O ports (from the guest's perspective) and can crash/reboot the +guest any number of ways. IOPL=3 is required because STI blocking kicks +in if and only if RFLAGS.IF is toggled 0=>1, and if CPL>IOPL, STI either +takes a #GP or modifies RFLAGS.VIF, not RFLAGS.IF. + +MOVSS blocking can be initiated by userspace, but can be coincident with +a #DB if and only if DR7.GD=1 (General Detect enabled) and a MOV DR is +executed in the MOVSS shadow. MOV DR #GPs at CPL>0, thus MOVSS blocking +is problematic only for CPL0 (and only if the guest is crazy enough to +access a DR in a MOVSS shadow). All other sources of #DBs are either +suppressed by MOVSS blocking (single-step, code fetch, data, and I/O), +are mutually exclusive with MOVSS blocking (T-bit task switch), or are +already handled by KVM (ICEBP, a.k.a. INT1). + +This bug was originally found by running tests[1] created for XSA-308[2]. +Note that Xen's userspace test emits ICEBP in the MOVSS shadow, which is +presumably why the Xen bug was deemed to be an exploitable DOS from guest +userspace. KVM already handles ICEBP by skipping the ICEBP instruction +and thus clears MOVSS blocking as a side effect of its "emulation". + +[1] http://xenbits.xenproject.org/docs/xtf/xsa-308_2main_8c_source.html +[2] https://xenbits.xen.org/xsa/advisory-308.html + +Reported-by: David Woodhouse +Reported-by: Alexander Graf +Signed-off-by: Sean Christopherson +Message-Id: <20220120000624.655815-1-seanjc@google.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Sasha Levin +--- + arch/x86/kvm/vmx/vmx.c | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c +index 351ef5cf1436a..94f5f2129e3b4 100644 +--- a/arch/x86/kvm/vmx/vmx.c ++++ b/arch/x86/kvm/vmx/vmx.c +@@ -4846,8 +4846,33 @@ static int handle_exception_nmi(struct kvm_vcpu *vcpu) + dr6 = vmx_get_exit_qual(vcpu); + if (!(vcpu->guest_debug & + (KVM_GUESTDBG_SINGLESTEP | KVM_GUESTDBG_USE_HW_BP))) { ++ /* ++ * If the #DB was due to ICEBP, a.k.a. INT1, skip the ++ * instruction. ICEBP generates a trap-like #DB, but ++ * despite its interception control being tied to #DB, ++ * is an instruction intercept, i.e. the VM-Exit occurs ++ * on the ICEBP itself. Note, skipping ICEBP also ++ * clears STI and MOVSS blocking. ++ * ++ * For all other #DBs, set vmcs.PENDING_DBG_EXCEPTIONS.BS ++ * if single-step is enabled in RFLAGS and STI or MOVSS ++ * blocking is active, as the CPU doesn't set the bit ++ * on VM-Exit due to #DB interception. VM-Entry has a ++ * consistency check that a single-step #DB is pending ++ * in this scenario as the previous instruction cannot ++ * have toggled RFLAGS.TF 0=>1 (because STI and POP/MOV ++ * don't modify RFLAGS), therefore the one instruction ++ * delay when activating single-step breakpoints must ++ * have already expired. Note, the CPU sets/clears BS ++ * as appropriate for all other VM-Exits types. ++ */ + if (is_icebp(intr_info)) + WARN_ON(!skip_emulated_instruction(vcpu)); ++ else if ((vmx_get_rflags(vcpu) & X86_EFLAGS_TF) && ++ (vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & ++ (GUEST_INTR_STATE_STI | GUEST_INTR_STATE_MOV_SS))) ++ vmcs_writel(GUEST_PENDING_DBG_EXCEPTIONS, ++ vmcs_readl(GUEST_PENDING_DBG_EXCEPTIONS) | DR6_BS); + + kvm_queue_exception_p(vcpu, DB_VECTOR, dr6); + return 1; +-- +2.34.1 + diff --git a/queue-5.10/net-sched-clarify-error-message-when-qdisc-kind-is-u.patch b/queue-5.10/net-sched-clarify-error-message-when-qdisc-kind-is-u.patch new file mode 100644 index 00000000000..63ff3207df8 --- /dev/null +++ b/queue-5.10/net-sched-clarify-error-message-when-qdisc-kind-is-u.patch @@ -0,0 +1,41 @@ +From bef8e950a71928a2a40685cc8e4505aee611492c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 18 Jan 2022 14:19:09 -0300 +Subject: net: sched: Clarify error message when qdisc kind is unknown + +From: Victor Nogueira + +[ Upstream commit 973bf8fdd12f0e70ea351c018e68edd377a836d1 ] + +When adding a tc rule with a qdisc kind that is not supported or not +compiled into the kernel, the kernel emits the following error: "Error: +Specified qdisc not found.". Found via tdc testing when ETS qdisc was not +compiled in and it was not obvious right away what the message meant +without looking at the kernel code. + +Change the error message to be more explicit and say the qdisc kind is +unknown. + +Signed-off-by: Victor Nogueira +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/sched/sch_api.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c +index 7b24582a8a164..6758968e79327 100644 +--- a/net/sched/sch_api.c ++++ b/net/sched/sch_api.c +@@ -1204,7 +1204,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev, + + err = -ENOENT; + if (!ops) { +- NL_SET_ERR_MSG(extack, "Specified qdisc not found"); ++ NL_SET_ERR_MSG(extack, "Specified qdisc kind is unknown"); + goto err_out; + } + +-- +2.34.1 + diff --git a/queue-5.10/net-stmmac-dwmac-sun8i-use-return-val-of-readl_poll_.patch b/queue-5.10/net-stmmac-dwmac-sun8i-use-return-val-of-readl_poll_.patch new file mode 100644 index 00000000000..84c9d8df5b2 --- /dev/null +++ b/queue-5.10/net-stmmac-dwmac-sun8i-use-return-val-of-readl_poll_.patch @@ -0,0 +1,42 @@ +From ad323fe9b0fe7115305b19e33b8e5984c907e7e7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Jan 2022 00:52:15 +0800 +Subject: net: stmmac: dwmac-sun8i: use return val of readl_poll_timeout() + +From: Jisheng Zhang + +[ Upstream commit 9e0db41e7a0b6f1271cbcfb16dbf5b8641b4e440 ] + +When readl_poll_timeout() timeout, we'd better directly use its return +value. + +Before this patch: +[ 2.145528] dwmac-sun8i: probe of 4500000.ethernet failed with error -14 + +After this patch: +[ 2.138520] dwmac-sun8i: probe of 4500000.ethernet failed with error -110 + +Signed-off-by: Jisheng Zhang +Acked-by: Jernej Skrabec +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +index 9f5ccf1a0a540..cad6588840d8b 100644 +--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c ++++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +@@ -734,7 +734,7 @@ static int sun8i_dwmac_reset(struct stmmac_priv *priv) + + if (err) { + dev_err(priv->device, "EMAC reset timeout\n"); +- return -EFAULT; ++ return err; + } + return 0; + } +-- +2.34.1 + diff --git a/queue-5.10/nfs-change-nfs_access_get_cached-to-only-report-the-.patch b/queue-5.10/nfs-change-nfs_access_get_cached-to-only-report-the-.patch new file mode 100644 index 00000000000..4dcc0c64940 --- /dev/null +++ b/queue-5.10/nfs-change-nfs_access_get_cached-to-only-report-the-.patch @@ -0,0 +1,171 @@ +From 1ed77ebc4407bd1c59f8032e98cfbdbae83af621 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 28 Sep 2021 09:47:57 +1000 +Subject: NFS: change nfs_access_get_cached to only report the mask + +From: NeilBrown + +[ Upstream commit b5e7b59c3480f355910f9d2c6ece5857922a5e54 ] + +Currently the nfs_access_get_cached family of functions report a +'struct nfs_access_entry' as the result, with both .mask and .cred set. +However the .cred is never used. This is probably good and there is no +guarantee that it won't be freed before use. + +Change to only report the 'mask' - as this is all that is used or needed. + +Signed-off-by: NeilBrown +Signed-off-by: Anna Schumaker +Signed-off-by: Sasha Levin +--- + fs/nfs/dir.c | 20 +++++++++----------- + fs/nfs/nfs4proc.c | 18 +++++++++--------- + include/linux/nfs_fs.h | 4 ++-- + 3 files changed, 20 insertions(+), 22 deletions(-) + +diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c +index a23b7a5dec9ee..682c7b45d8b71 100644 +--- a/fs/nfs/dir.c ++++ b/fs/nfs/dir.c +@@ -2489,7 +2489,7 @@ static struct nfs_access_entry *nfs_access_search_rbtree(struct inode *inode, co + return NULL; + } + +-static int nfs_access_get_cached_locked(struct inode *inode, const struct cred *cred, struct nfs_access_entry *res, bool may_block) ++static int nfs_access_get_cached_locked(struct inode *inode, const struct cred *cred, u32 *mask, bool may_block) + { + struct nfs_inode *nfsi = NFS_I(inode); + struct nfs_access_entry *cache; +@@ -2519,8 +2519,7 @@ static int nfs_access_get_cached_locked(struct inode *inode, const struct cred * + spin_lock(&inode->i_lock); + retry = false; + } +- res->cred = cache->cred; +- res->mask = cache->mask; ++ *mask = cache->mask; + list_move_tail(&cache->lru, &nfsi->access_cache_entry_lru); + err = 0; + out: +@@ -2532,7 +2531,7 @@ static int nfs_access_get_cached_locked(struct inode *inode, const struct cred * + return -ENOENT; + } + +-static int nfs_access_get_cached_rcu(struct inode *inode, const struct cred *cred, struct nfs_access_entry *res) ++static int nfs_access_get_cached_rcu(struct inode *inode, const struct cred *cred, u32 *mask) + { + /* Only check the most recently returned cache entry, + * but do it without locking. +@@ -2554,22 +2553,21 @@ static int nfs_access_get_cached_rcu(struct inode *inode, const struct cred *cre + goto out; + if (nfs_check_cache_invalid(inode, NFS_INO_INVALID_ACCESS)) + goto out; +- res->cred = cache->cred; +- res->mask = cache->mask; ++ *mask = cache->mask; + err = 0; + out: + rcu_read_unlock(); + return err; + } + +-int nfs_access_get_cached(struct inode *inode, const struct cred *cred, struct +-nfs_access_entry *res, bool may_block) ++int nfs_access_get_cached(struct inode *inode, const struct cred *cred, ++ u32 *mask, bool may_block) + { + int status; + +- status = nfs_access_get_cached_rcu(inode, cred, res); ++ status = nfs_access_get_cached_rcu(inode, cred, mask); + if (status != 0) +- status = nfs_access_get_cached_locked(inode, cred, res, ++ status = nfs_access_get_cached_locked(inode, cred, mask, + may_block); + + return status; +@@ -2690,7 +2688,7 @@ static int nfs_do_access(struct inode *inode, const struct cred *cred, int mask) + + trace_nfs_access_enter(inode); + +- status = nfs_access_get_cached(inode, cred, &cache, may_block); ++ status = nfs_access_get_cached(inode, cred, &cache.mask, may_block); + if (status == 0) + goto out_cached; + +diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c +index 3106bd28b1132..d222a980164b7 100644 +--- a/fs/nfs/nfs4proc.c ++++ b/fs/nfs/nfs4proc.c +@@ -7597,7 +7597,7 @@ static int nfs4_xattr_set_nfs4_user(const struct xattr_handler *handler, + const char *key, const void *buf, + size_t buflen, int flags) + { +- struct nfs_access_entry cache; ++ u32 mask; + int ret; + + if (!nfs_server_capable(inode, NFS_CAP_XATTR)) +@@ -7612,8 +7612,8 @@ static int nfs4_xattr_set_nfs4_user(const struct xattr_handler *handler, + * do a cached access check for the XA* flags to possibly avoid + * doing an RPC and getting EACCES back. + */ +- if (!nfs_access_get_cached(inode, current_cred(), &cache, true)) { +- if (!(cache.mask & NFS_ACCESS_XAWRITE)) ++ if (!nfs_access_get_cached(inode, current_cred(), &mask, true)) { ++ if (!(mask & NFS_ACCESS_XAWRITE)) + return -EACCES; + } + +@@ -7634,14 +7634,14 @@ static int nfs4_xattr_get_nfs4_user(const struct xattr_handler *handler, + struct dentry *unused, struct inode *inode, + const char *key, void *buf, size_t buflen) + { +- struct nfs_access_entry cache; ++ u32 mask; + ssize_t ret; + + if (!nfs_server_capable(inode, NFS_CAP_XATTR)) + return -EOPNOTSUPP; + +- if (!nfs_access_get_cached(inode, current_cred(), &cache, true)) { +- if (!(cache.mask & NFS_ACCESS_XAREAD)) ++ if (!nfs_access_get_cached(inode, current_cred(), &mask, true)) { ++ if (!(mask & NFS_ACCESS_XAREAD)) + return -EACCES; + } + +@@ -7666,13 +7666,13 @@ nfs4_listxattr_nfs4_user(struct inode *inode, char *list, size_t list_len) + ssize_t ret, size; + char *buf; + size_t buflen; +- struct nfs_access_entry cache; ++ u32 mask; + + if (!nfs_server_capable(inode, NFS_CAP_XATTR)) + return 0; + +- if (!nfs_access_get_cached(inode, current_cred(), &cache, true)) { +- if (!(cache.mask & NFS_ACCESS_XALIST)) ++ if (!nfs_access_get_cached(inode, current_cred(), &mask, true)) { ++ if (!(mask & NFS_ACCESS_XALIST)) + return 0; + } + +diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h +index aff5cd382fef5..1e0a3497bdb46 100644 +--- a/include/linux/nfs_fs.h ++++ b/include/linux/nfs_fs.h +@@ -501,8 +501,8 @@ extern int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fh, + struct nfs_fattr *fattr, struct nfs4_label *label); + extern int nfs_may_open(struct inode *inode, const struct cred *cred, int openflags); + extern void nfs_access_zap_cache(struct inode *inode); +-extern int nfs_access_get_cached(struct inode *inode, const struct cred *cred, struct nfs_access_entry *res, +- bool may_block); ++extern int nfs_access_get_cached(struct inode *inode, const struct cred *cred, ++ u32 *mask, bool may_block); + + /* + * linux/fs/nfs/symlink.c +-- +2.34.1 + diff --git a/queue-5.10/nfs-nfs4clinet-check-the-return-value-of-kstrdup.patch b/queue-5.10/nfs-nfs4clinet-check-the-return-value-of-kstrdup.patch new file mode 100644 index 00000000000..844fcb12ef5 --- /dev/null +++ b/queue-5.10/nfs-nfs4clinet-check-the-return-value-of-kstrdup.patch @@ -0,0 +1,40 @@ +From b4ad59ee254908c9f16205a0acd22af4d9935da9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Dec 2021 01:01:33 +0800 +Subject: nfs: nfs4clinet: check the return value of kstrdup() + +From: Xiaoke Wang + +[ Upstream commit fbd2057e5329d3502a27491190237b6be52a1cb6 ] + +kstrdup() returns NULL when some internal memory errors happen, it is +better to check the return value of it so to catch the memory error in +time. + +Signed-off-by: Xiaoke Wang +Signed-off-by: Anna Schumaker +Signed-off-by: Sasha Levin +--- + fs/nfs/nfs4client.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c +index 6d74f2e2de461..0e6437b08a3a5 100644 +--- a/fs/nfs/nfs4client.c ++++ b/fs/nfs/nfs4client.c +@@ -1330,8 +1330,11 @@ int nfs4_update_server(struct nfs_server *server, const char *hostname, + } + nfs_put_client(clp); + +- if (server->nfs_client->cl_hostname == NULL) ++ if (server->nfs_client->cl_hostname == NULL) { + server->nfs_client->cl_hostname = kstrdup(hostname, GFP_KERNEL); ++ if (server->nfs_client->cl_hostname == NULL) ++ return -ENOMEM; ++ } + nfs_server_insert_lists(server); + + return nfs_probe_destination(server); +-- +2.34.1 + diff --git a/queue-5.10/nfsv4-expose-nfs_parse_server_name-function.patch b/queue-5.10/nfsv4-expose-nfs_parse_server_name-function.patch new file mode 100644 index 00000000000..9fd01b770ab --- /dev/null +++ b/queue-5.10/nfsv4-expose-nfs_parse_server_name-function.patch @@ -0,0 +1,51 @@ +From 94b8a2f83813f830c175339e00178ddc76fb5ca9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Dec 2021 14:53:32 -0500 +Subject: NFSv4 expose nfs_parse_server_name function + +From: Olga Kornievskaia + +[ Upstream commit f5b27cc6761e27ee6387a24df1a99ca77b360fea ] + +Make nfs_parse_server_name available outside of nfs4namespace.c. + +Signed-off-by: Olga Kornievskaia +Signed-off-by: Anna Schumaker +Signed-off-by: Sasha Levin +--- + fs/nfs/nfs4_fs.h | 3 ++- + fs/nfs/nfs4namespace.c | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h +index 3e344bec3647b..de71cf89a24ee 100644 +--- a/fs/nfs/nfs4_fs.h ++++ b/fs/nfs/nfs4_fs.h +@@ -281,7 +281,8 @@ struct rpc_clnt *nfs4_negotiate_security(struct rpc_clnt *, struct inode *, + int nfs4_submount(struct fs_context *, struct nfs_server *); + int nfs4_replace_transport(struct nfs_server *server, + const struct nfs4_fs_locations *locations); +- ++size_t nfs_parse_server_name(char *string, size_t len, struct sockaddr *sa, ++ size_t salen, struct net *net); + /* nfs4proc.c */ + extern int nfs4_handle_exception(struct nfs_server *, int, struct nfs4_exception *); + extern int nfs4_async_handle_error(struct rpc_task *task, +diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c +index 873342308dc0d..f1ed4f60a7f33 100644 +--- a/fs/nfs/nfs4namespace.c ++++ b/fs/nfs/nfs4namespace.c +@@ -164,8 +164,8 @@ static int nfs4_validate_fspath(struct dentry *dentry, + return 0; + } + +-static size_t nfs_parse_server_name(char *string, size_t len, +- struct sockaddr *sa, size_t salen, struct net *net) ++size_t nfs_parse_server_name(char *string, size_t len, struct sockaddr *sa, ++ size_t salen, struct net *net) + { + ssize_t ret; + +-- +2.34.1 + diff --git a/queue-5.10/nfsv4-handle-port-presence-in-fs_location-server-str.patch b/queue-5.10/nfsv4-handle-port-presence-in-fs_location-server-str.patch new file mode 100644 index 00000000000..cfc7854ee20 --- /dev/null +++ b/queue-5.10/nfsv4-handle-port-presence-in-fs_location-server-str.patch @@ -0,0 +1,86 @@ +From 359c1284a2aba19da4a715832a446934502aaf2e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Dec 2021 14:53:33 -0500 +Subject: NFSv4 handle port presence in fs_location server string + +From: Olga Kornievskaia + +[ Upstream commit a8d54baba7c65db2d3278873def61f8d3753d766 ] + +An fs_location attribute returns a string that can be ipv4, ipv6, +or DNS name. An ip location can have a port appended to it and if +no port is present a default port needs to be set. If rpc_pton() +fails to parse, try calling rpc_uaddr2socaddr() that can convert +an universal address. + +Signed-off-by: Olga Kornievskaia +Signed-off-by: Anna Schumaker +Signed-off-by: Sasha Levin +--- + fs/nfs/nfs4_fs.h | 2 +- + fs/nfs/nfs4namespace.c | 17 +++++++++++------ + 2 files changed, 12 insertions(+), 7 deletions(-) + +diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h +index de71cf89a24ee..6d916563356ef 100644 +--- a/fs/nfs/nfs4_fs.h ++++ b/fs/nfs/nfs4_fs.h +@@ -282,7 +282,7 @@ int nfs4_submount(struct fs_context *, struct nfs_server *); + int nfs4_replace_transport(struct nfs_server *server, + const struct nfs4_fs_locations *locations); + size_t nfs_parse_server_name(char *string, size_t len, struct sockaddr *sa, +- size_t salen, struct net *net); ++ size_t salen, struct net *net, int port); + /* nfs4proc.c */ + extern int nfs4_handle_exception(struct nfs_server *, int, struct nfs4_exception *); + extern int nfs4_async_handle_error(struct rpc_task *task, +diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c +index f1ed4f60a7f33..3680c8da510c9 100644 +--- a/fs/nfs/nfs4namespace.c ++++ b/fs/nfs/nfs4namespace.c +@@ -165,15 +165,20 @@ static int nfs4_validate_fspath(struct dentry *dentry, + } + + size_t nfs_parse_server_name(char *string, size_t len, struct sockaddr *sa, +- size_t salen, struct net *net) ++ size_t salen, struct net *net, int port) + { + ssize_t ret; + + ret = rpc_pton(net, string, len, sa, salen); + if (ret == 0) { +- ret = nfs_dns_resolve_name(net, string, len, sa, salen); +- if (ret < 0) +- ret = 0; ++ ret = rpc_uaddr2sockaddr(net, string, len, sa, salen); ++ if (ret == 0) { ++ ret = nfs_dns_resolve_name(net, string, len, sa, salen); ++ if (ret < 0) ++ ret = 0; ++ } ++ } else if (port) { ++ rpc_set_port(sa, port); + } + return ret; + } +@@ -328,7 +333,7 @@ static int try_location(struct fs_context *fc, + nfs_parse_server_name(buf->data, buf->len, + &ctx->nfs_server.address, + sizeof(ctx->nfs_server._address), +- fc->net_ns); ++ fc->net_ns, 0); + if (ctx->nfs_server.addrlen == 0) + continue; + +@@ -496,7 +501,7 @@ static int nfs4_try_replacing_one_location(struct nfs_server *server, + continue; + + salen = nfs_parse_server_name(buf->data, buf->len, +- sap, addr_bufsize, net); ++ sap, addr_bufsize, net, 0); + if (salen == 0) + continue; + rpc_set_port(sap, NFS_PORT); +-- +2.34.1 + diff --git a/queue-5.10/nfsv4-only-print-the-label-when-its-queried.patch b/queue-5.10/nfsv4-only-print-the-label-when-its-queried.patch new file mode 100644 index 00000000000..32f3bdd84c5 --- /dev/null +++ b/queue-5.10/nfsv4-only-print-the-label-when-its-queried.patch @@ -0,0 +1,42 @@ +From 5a6ad6992866576f03fc626ae240aae84ee6c3e9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Nov 2021 15:33:56 -0500 +Subject: NFSv4 only print the label when its queried + +From: Olga Kornievskaia + +[ Upstream commit 2c52c8376db7160a1dd8a681c61c9258405ef143 ] + +When the bitmask of the attributes doesn't include the security label, +don't bother printing it. Since the label might not be null terminated, +adjust the printing format accordingly. + +Signed-off-by: Olga Kornievskaia +Signed-off-by: Anna Schumaker +Signed-off-by: Sasha Levin +--- + fs/nfs/nfs4xdr.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c +index c16b93df1bc14..9f8bd45379e72 100644 +--- a/fs/nfs/nfs4xdr.c ++++ b/fs/nfs/nfs4xdr.c +@@ -4184,10 +4184,11 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, + } else + printk(KERN_WARNING "%s: label too long (%u)!\n", + __func__, len); ++ if (label && label->label) ++ dprintk("%s: label=%.*s, len=%d, PI=%d, LFS=%d\n", ++ __func__, label->len, (char *)label->label, ++ label->len, label->pi, label->lfs); + } +- if (label && label->label) +- dprintk("%s: label=%s, len=%d, PI=%d, LFS=%d\n", __func__, +- (char *)label->label, label->len, label->pi, label->lfs); + return status; + } + +-- +2.34.1 + diff --git a/queue-5.10/nfsv4-remove-zero-number-of-fs_locations-entries-err.patch b/queue-5.10/nfsv4-remove-zero-number-of-fs_locations-entries-err.patch new file mode 100644 index 00000000000..fe8870bc7d0 --- /dev/null +++ b/queue-5.10/nfsv4-remove-zero-number-of-fs_locations-entries-err.patch @@ -0,0 +1,50 @@ +From 23454203172ab62038e4c9e477f53e90763bc78b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Dec 2021 14:53:29 -0500 +Subject: NFSv4 remove zero number of fs_locations entries error check + +From: Olga Kornievskaia + +[ Upstream commit 90e12a3191040bd3854d3e236c35921e4e92a044 ] + +Remove the check for the zero length fs_locations reply in the +xdr decoding, and instead check for that in the migration code. + +Signed-off-by: Olga Kornievskaia +Signed-off-by: Anna Schumaker +Signed-off-by: Sasha Levin +--- + fs/nfs/nfs4state.c | 3 +++ + fs/nfs/nfs4xdr.c | 2 -- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c +index 4bf10792cb5b1..cbeec29e9f21a 100644 +--- a/fs/nfs/nfs4state.c ++++ b/fs/nfs/nfs4state.c +@@ -2104,6 +2104,9 @@ static int nfs4_try_migration(struct nfs_server *server, const struct cred *cred + } + + result = -NFS4ERR_NXIO; ++ if (!locations->nlocations) ++ goto out; ++ + if (!(locations->fattr.valid & NFS_ATTR_FATTR_V4_LOCATIONS)) { + dprintk("<-- %s: No fs_locations data, migration skipped\n", + __func__); +diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c +index 9f8bd45379e72..e2f0e3446e22a 100644 +--- a/fs/nfs/nfs4xdr.c ++++ b/fs/nfs/nfs4xdr.c +@@ -3680,8 +3680,6 @@ static int decode_attr_fs_locations(struct xdr_stream *xdr, uint32_t *bitmap, st + if (unlikely(!p)) + goto out_eio; + n = be32_to_cpup(p); +- if (n <= 0) +- goto out_eio; + for (res->nlocations = 0; res->nlocations < n; res->nlocations++) { + u32 m; + struct nfs4_fs_location *loc; +-- +2.34.1 + diff --git a/queue-5.10/nfsv4.1-fix-uninitialised-variable-in-devicenotify.patch b/queue-5.10/nfsv4.1-fix-uninitialised-variable-in-devicenotify.patch new file mode 100644 index 00000000000..64106baf11d --- /dev/null +++ b/queue-5.10/nfsv4.1-fix-uninitialised-variable-in-devicenotify.patch @@ -0,0 +1,106 @@ +From 31b97f7e4aeb72393869ceadab8aa9535a702903 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 3 Jan 2022 14:50:16 -0500 +Subject: NFSv4.1: Fix uninitialised variable in devicenotify + +From: Trond Myklebust + +[ Upstream commit b05bf5c63b326ce1da84ef42498d8e0e292e694c ] + +When decode_devicenotify_args() exits with no entries, we need to +ensure that the struct cb_devicenotifyargs is initialised to +{ 0, NULL } in order to avoid problems in +nfs4_callback_devicenotify(). + +Reported-by: +Signed-off-by: Trond Myklebust +Signed-off-by: Anna Schumaker +Signed-off-by: Sasha Levin +--- + fs/nfs/callback.h | 2 +- + fs/nfs/callback_proc.c | 2 +- + fs/nfs/callback_xdr.c | 18 +++++++++--------- + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h +index 6a2033131c068..ccd4f245cae24 100644 +--- a/fs/nfs/callback.h ++++ b/fs/nfs/callback.h +@@ -170,7 +170,7 @@ struct cb_devicenotifyitem { + }; + + struct cb_devicenotifyargs { +- int ndevs; ++ uint32_t ndevs; + struct cb_devicenotifyitem *devs; + }; + +diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c +index be546ece383f5..b44219ce60b86 100644 +--- a/fs/nfs/callback_proc.c ++++ b/fs/nfs/callback_proc.c +@@ -353,7 +353,7 @@ __be32 nfs4_callback_devicenotify(void *argp, void *resp, + struct cb_process_state *cps) + { + struct cb_devicenotifyargs *args = argp; +- int i; ++ uint32_t i; + __be32 res = 0; + struct nfs_client *clp = cps->clp; + struct nfs_server *server = NULL; +diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c +index 79ff172eb1c81..1725079a05276 100644 +--- a/fs/nfs/callback_xdr.c ++++ b/fs/nfs/callback_xdr.c +@@ -259,11 +259,9 @@ __be32 decode_devicenotify_args(struct svc_rqst *rqstp, + void *argp) + { + struct cb_devicenotifyargs *args = argp; ++ uint32_t tmp, n, i; + __be32 *p; + __be32 status = 0; +- u32 tmp; +- int n, i; +- args->ndevs = 0; + + /* Num of device notifications */ + p = xdr_inline_decode(xdr, sizeof(uint32_t)); +@@ -272,7 +270,7 @@ __be32 decode_devicenotify_args(struct svc_rqst *rqstp, + goto out; + } + n = ntohl(*p++); +- if (n <= 0) ++ if (n == 0) + goto out; + if (n > ULONG_MAX / sizeof(*args->devs)) { + status = htonl(NFS4ERR_BADXDR); +@@ -331,19 +329,21 @@ __be32 decode_devicenotify_args(struct svc_rqst *rqstp, + dev->cbd_immediate = 0; + } + +- args->ndevs++; +- + dprintk("%s: type %d layout 0x%x immediate %d\n", + __func__, dev->cbd_notify_type, dev->cbd_layout_type, + dev->cbd_immediate); + } ++ args->ndevs = n; ++ dprintk("%s: ndevs %d\n", __func__, args->ndevs); ++ return 0; ++err: ++ kfree(args->devs); + out: ++ args->devs = NULL; ++ args->ndevs = 0; + dprintk("%s: status %d ndevs %d\n", + __func__, ntohl(status), args->ndevs); + return status; +-err: +- kfree(args->devs); +- goto out; + } + + static __be32 decode_sessionid(struct xdr_stream *xdr, +-- +2.34.1 + diff --git a/queue-5.10/nvme-pci-add-the-ignore_dev_subnqn-quirk-for-intel-p.patch b/queue-5.10/nvme-pci-add-the-ignore_dev_subnqn-quirk-for-intel-p.patch new file mode 100644 index 00000000000..cf18158ef29 --- /dev/null +++ b/queue-5.10/nvme-pci-add-the-ignore_dev_subnqn-quirk-for-intel-p.patch @@ -0,0 +1,41 @@ +From 80e1af9ac86fa12e1fe0f7a5da5472e22c16d01d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Jun 2021 19:07:01 -0400 +Subject: nvme-pci: add the IGNORE_DEV_SUBNQN quirk for Intel P4500/P4600 SSDs + +From: Wu Zheng + +[ Upstream commit 25e58af4be412d59e056da65cc1cefbd89185bd2 ] + +The Intel P4500/P4600 SSDs do not report a subsystem NQN despite claiming +compliance to a standards version where reporting one is required. + +Add the IGNORE_DEV_SUBNQN quirk to not fail the initialization of a +second such SSDs in a system. + +Signed-off-by: Zheng Wu +Signed-off-by: Ye Jinhe +Reviewed-by: Keith Busch +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/host/pci.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c +index 1b85349f57af0..97afeb898b253 100644 +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -3198,7 +3198,8 @@ static const struct pci_device_id nvme_id_table[] = { + NVME_QUIRK_DEALLOCATE_ZEROES, }, + { PCI_VDEVICE(INTEL, 0x0a54), /* Intel P4500/P4600 */ + .driver_data = NVME_QUIRK_STRIPE_SIZE | +- NVME_QUIRK_DEALLOCATE_ZEROES, }, ++ NVME_QUIRK_DEALLOCATE_ZEROES | ++ NVME_QUIRK_IGNORE_DEV_SUBNQN, }, + { PCI_VDEVICE(INTEL, 0x0a55), /* Dell Express Flash P4600 */ + .driver_data = NVME_QUIRK_STRIPE_SIZE | + NVME_QUIRK_DEALLOCATE_ZEROES, }, +-- +2.34.1 + diff --git a/queue-5.10/perf-always-wake-the-parent-event.patch b/queue-5.10/perf-always-wake-the-parent-event.patch new file mode 100644 index 00000000000..0e42615ce92 --- /dev/null +++ b/queue-5.10/perf-always-wake-the-parent-event.patch @@ -0,0 +1,96 @@ +From 80bd81ff7bc0b2215566b66eb2bcabfcec1156d9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 6 Dec 2021 11:38:40 +0000 +Subject: perf: Always wake the parent event + +From: James Clark + +[ Upstream commit 961c39121759ad09a89598ec4ccdd34ae0468a19 ] + +When using per-process mode and event inheritance is set to true, +forked processes will create a new perf events via inherit_event() -> +perf_event_alloc(). But these events will not have ring buffers +assigned to them. Any call to wakeup will be dropped if it's called on +an event with no ring buffer assigned because that's the object that +holds the wakeup list. + +If the child event is disabled due to a call to +perf_aux_output_begin() or perf_aux_output_end(), the wakeup is +dropped leaving userspace hanging forever on the poll. + +Normally the event is explicitly re-enabled by userspace after it +wakes up to read the aux data, but in this case it does not get woken +up so the event remains disabled. + +This can be reproduced when using Arm SPE and 'stress' which forks once +before running the workload. By looking at the list of aux buffers read, +it's apparent that they stop after the fork: + + perf record -e arm_spe// -vvv -- stress -c 1 + +With this patch applied they continue to be printed. This behaviour +doesn't happen when using systemwide or per-cpu mode. + +Reported-by: Ruben Ayrapetyan +Signed-off-by: James Clark +Signed-off-by: Peter Zijlstra (Intel) +Link: https://lkml.kernel.org/r/20211206113840.130802-2-james.clark@arm.com +Signed-off-by: Sasha Levin +--- + kernel/events/core.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/kernel/events/core.c b/kernel/events/core.c +index c6493f7e02359..6d3a67bef3951 100644 +--- a/kernel/events/core.c ++++ b/kernel/events/core.c +@@ -5877,6 +5877,8 @@ static void ring_buffer_attach(struct perf_event *event, + struct perf_buffer *old_rb = NULL; + unsigned long flags; + ++ WARN_ON_ONCE(event->parent); ++ + if (event->rb) { + /* + * Should be impossible, we set this when removing +@@ -5934,6 +5936,9 @@ static void ring_buffer_wakeup(struct perf_event *event) + { + struct perf_buffer *rb; + ++ if (event->parent) ++ event = event->parent; ++ + rcu_read_lock(); + rb = rcu_dereference(event->rb); + if (rb) { +@@ -5947,6 +5952,9 @@ struct perf_buffer *ring_buffer_get(struct perf_event *event) + { + struct perf_buffer *rb; + ++ if (event->parent) ++ event = event->parent; ++ + rcu_read_lock(); + rb = rcu_dereference(event->rb); + if (rb) { +@@ -6618,7 +6626,7 @@ static unsigned long perf_prepare_sample_aux(struct perf_event *event, + if (WARN_ON_ONCE(READ_ONCE(sampler->oncpu) != smp_processor_id())) + goto out; + +- rb = ring_buffer_get(sampler->parent ? sampler->parent : sampler); ++ rb = ring_buffer_get(sampler); + if (!rb) + goto out; + +@@ -6684,7 +6692,7 @@ static void perf_aux_sample_output(struct perf_event *event, + if (WARN_ON_ONCE(!sampler || !data->aux_size)) + return; + +- rb = ring_buffer_get(sampler->parent ? sampler->parent : sampler); ++ rb = ring_buffer_get(sampler); + if (!rb) + return; + +-- +2.34.1 + diff --git a/queue-5.10/pm-hibernate-remove-register_nosave_region_late.patch b/queue-5.10/pm-hibernate-remove-register_nosave_region_late.patch new file mode 100644 index 00000000000..83ec8377e09 --- /dev/null +++ b/queue-5.10/pm-hibernate-remove-register_nosave_region_late.patch @@ -0,0 +1,96 @@ +From 5f62313818c50aa246d0012bbbdf899385e2ec55 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 19 Jan 2022 11:47:51 +0100 +Subject: PM: hibernate: Remove register_nosave_region_late() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Amadeusz Sławiński + +[ Upstream commit 33569ef3c754a82010f266b7b938a66a3ccf90a4 ] + +It is an unused wrapper forcing kmalloc allocation for registering +nosave regions. Also, rename __register_nosave_region() to +register_nosave_region() now that there is no need for disambiguation. + +Signed-off-by: Amadeusz Sławiński +Reviewed-by: Cezary Rojewski +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + include/linux/suspend.h | 11 +---------- + kernel/power/snapshot.c | 21 +++++++-------------- + 2 files changed, 8 insertions(+), 24 deletions(-) + +diff --git a/include/linux/suspend.h b/include/linux/suspend.h +index 8af13ba60c7e4..c1310c571d805 100644 +--- a/include/linux/suspend.h ++++ b/include/linux/suspend.h +@@ -430,15 +430,7 @@ struct platform_hibernation_ops { + + #ifdef CONFIG_HIBERNATION + /* kernel/power/snapshot.c */ +-extern void __register_nosave_region(unsigned long b, unsigned long e, int km); +-static inline void __init register_nosave_region(unsigned long b, unsigned long e) +-{ +- __register_nosave_region(b, e, 0); +-} +-static inline void __init register_nosave_region_late(unsigned long b, unsigned long e) +-{ +- __register_nosave_region(b, e, 1); +-} ++extern void register_nosave_region(unsigned long b, unsigned long e); + extern int swsusp_page_is_forbidden(struct page *); + extern void swsusp_set_page_free(struct page *); + extern void swsusp_unset_page_free(struct page *); +@@ -457,7 +449,6 @@ int pfn_is_nosave(unsigned long pfn); + int hibernate_quiet_exec(int (*func)(void *data), void *data); + #else /* CONFIG_HIBERNATION */ + static inline void register_nosave_region(unsigned long b, unsigned long e) {} +-static inline void register_nosave_region_late(unsigned long b, unsigned long e) {} + static inline int swsusp_page_is_forbidden(struct page *p) { return 0; } + static inline void swsusp_set_page_free(struct page *p) {} + static inline void swsusp_unset_page_free(struct page *p) {} +diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c +index 46b1804c1ddf7..1da013f50059a 100644 +--- a/kernel/power/snapshot.c ++++ b/kernel/power/snapshot.c +@@ -944,8 +944,7 @@ static void memory_bm_recycle(struct memory_bitmap *bm) + * Register a range of page frames the contents of which should not be saved + * during hibernation (to be used in the early initialization code). + */ +-void __init __register_nosave_region(unsigned long start_pfn, +- unsigned long end_pfn, int use_kmalloc) ++void __init register_nosave_region(unsigned long start_pfn, unsigned long end_pfn) + { + struct nosave_region *region; + +@@ -961,18 +960,12 @@ void __init __register_nosave_region(unsigned long start_pfn, + goto Report; + } + } +- if (use_kmalloc) { +- /* During init, this shouldn't fail */ +- region = kmalloc(sizeof(struct nosave_region), GFP_KERNEL); +- BUG_ON(!region); +- } else { +- /* This allocation cannot fail */ +- region = memblock_alloc(sizeof(struct nosave_region), +- SMP_CACHE_BYTES); +- if (!region) +- panic("%s: Failed to allocate %zu bytes\n", __func__, +- sizeof(struct nosave_region)); +- } ++ /* This allocation cannot fail */ ++ region = memblock_alloc(sizeof(struct nosave_region), ++ SMP_CACHE_BYTES); ++ if (!region) ++ panic("%s: Failed to allocate %zu bytes\n", __func__, ++ sizeof(struct nosave_region)); + region->start_pfn = start_pfn; + region->end_pfn = end_pfn; + list_add_tail(®ion->list, &nosave_regions); +-- +2.34.1 + diff --git a/queue-5.10/powerpc-fixmap-fix-vm-debug-warning-on-unmap.patch b/queue-5.10/powerpc-fixmap-fix-vm-debug-warning-on-unmap.patch new file mode 100644 index 00000000000..692d8244c58 --- /dev/null +++ b/queue-5.10/powerpc-fixmap-fix-vm-debug-warning-on-unmap.patch @@ -0,0 +1,148 @@ +From 1f59090db364b1f44c397ce05e9f69e2e803bf4e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 6 Dec 2021 11:11:51 +0000 +Subject: powerpc/fixmap: Fix VM debug warning on unmap + +From: Christophe Leroy + +[ Upstream commit aec982603aa8cc0a21143681feb5f60ecc69d718 ] + +Unmapping a fixmap entry is done by calling __set_fixmap() +with FIXMAP_PAGE_CLEAR as flags. + +Today, powerpc __set_fixmap() calls map_kernel_page(). + +map_kernel_page() is not happy when called a second time +for the same page. + + WARNING: CPU: 0 PID: 1 at arch/powerpc/mm/pgtable.c:194 set_pte_at+0xc/0x1e8 + CPU: 0 PID: 1 Comm: swapper Not tainted 5.16.0-rc3-s3k-dev-01993-g350ff07feb7d-dirty #682 + NIP: c0017cd4 LR: c00187f0 CTR: 00000010 + REGS: e1011d50 TRAP: 0700 Not tainted (5.16.0-rc3-s3k-dev-01993-g350ff07feb7d-dirty) + MSR: 00029032 CR: 42000208 XER: 00000000 + + GPR00: c0165fec e1011e10 c14c0000 c0ee2550 ff800000 c0f3d000 00000000 c001686c + GPR08: 00001000 b00045a9 00000001 c0f58460 c0f50000 00000000 c0007e10 00000000 + GPR16: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 + GPR24: 00000000 00000000 c0ee2550 00000000 c0f57000 00000ff8 00000000 ff800000 + NIP [c0017cd4] set_pte_at+0xc/0x1e8 + LR [c00187f0] map_kernel_page+0x9c/0x100 + Call Trace: + [e1011e10] [c0736c68] vsnprintf+0x358/0x6c8 (unreliable) + [e1011e30] [c0165fec] __set_fixmap+0x30/0x44 + [e1011e40] [c0c13bdc] early_iounmap+0x11c/0x170 + [e1011e70] [c0c06cb0] ioremap_legacy_serial_console+0x88/0xc0 + [e1011e90] [c0c03634] do_one_initcall+0x80/0x178 + [e1011ef0] [c0c0385c] kernel_init_freeable+0xb4/0x250 + [e1011f20] [c0007e34] kernel_init+0x24/0x140 + [e1011f30] [c0016268] ret_from_kernel_thread+0x5c/0x64 + Instruction dump: + 7fe3fb78 48019689 80010014 7c630034 83e1000c 5463d97e 7c0803a6 38210010 + 4e800020 81250000 712a0001 41820008 <0fe00000> 9421ffe0 93e1001c 48000030 + +Implement unmap_kernel_page() which clears an existing pte. + +Reported-by: Maxime Bizon +Signed-off-by: Christophe Leroy +Tested-by: Maxime Bizon +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/b0b752f6f6ecc60653e873f385c6f0dce4e9ab6a.1638789098.git.christophe.leroy@csgroup.eu +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/asm/book3s/32/pgtable.h | 1 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 2 ++ + arch/powerpc/include/asm/fixmap.h | 6 ++++-- + arch/powerpc/include/asm/nohash/32/pgtable.h | 1 + + arch/powerpc/include/asm/nohash/64/pgtable.h | 1 + + arch/powerpc/mm/pgtable.c | 9 +++++++++ + 6 files changed, 18 insertions(+), 2 deletions(-) + +diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h +index 523d3e6e24009..94c5c66231a8c 100644 +--- a/arch/powerpc/include/asm/book3s/32/pgtable.h ++++ b/arch/powerpc/include/asm/book3s/32/pgtable.h +@@ -142,6 +142,7 @@ static inline bool pte_user(pte_t pte) + #ifndef __ASSEMBLY__ + + int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot); ++void unmap_kernel_page(unsigned long va); + + #endif /* !__ASSEMBLY__ */ + +diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h +index 4a3dca0271f1e..71e2c524f1eea 100644 +--- a/arch/powerpc/include/asm/book3s/64/pgtable.h ++++ b/arch/powerpc/include/asm/book3s/64/pgtable.h +@@ -1054,6 +1054,8 @@ static inline int map_kernel_page(unsigned long ea, unsigned long pa, pgprot_t p + return hash__map_kernel_page(ea, pa, prot); + } + ++void unmap_kernel_page(unsigned long va); ++ + static inline int __meminit vmemmap_create_mapping(unsigned long start, + unsigned long page_size, + unsigned long phys) +diff --git a/arch/powerpc/include/asm/fixmap.h b/arch/powerpc/include/asm/fixmap.h +index 591b2f4deed53..897cc68758d44 100644 +--- a/arch/powerpc/include/asm/fixmap.h ++++ b/arch/powerpc/include/asm/fixmap.h +@@ -111,8 +111,10 @@ static inline void __set_fixmap(enum fixed_addresses idx, + BUILD_BUG_ON(idx >= __end_of_fixed_addresses); + else if (WARN_ON(idx >= __end_of_fixed_addresses)) + return; +- +- map_kernel_page(__fix_to_virt(idx), phys, flags); ++ if (pgprot_val(flags)) ++ map_kernel_page(__fix_to_virt(idx), phys, flags); ++ else ++ unmap_kernel_page(__fix_to_virt(idx)); + } + + #define __early_set_fixmap __set_fixmap +diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h +index 96522f7f0618a..e53cc07e6b9ec 100644 +--- a/arch/powerpc/include/asm/nohash/32/pgtable.h ++++ b/arch/powerpc/include/asm/nohash/32/pgtable.h +@@ -65,6 +65,7 @@ extern int icache_44x_need_flush; + #ifndef __ASSEMBLY__ + + int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot); ++void unmap_kernel_page(unsigned long va); + + #endif /* !__ASSEMBLY__ */ + +diff --git a/arch/powerpc/include/asm/nohash/64/pgtable.h b/arch/powerpc/include/asm/nohash/64/pgtable.h +index 57cd3892bfe05..1eacff0fff029 100644 +--- a/arch/powerpc/include/asm/nohash/64/pgtable.h ++++ b/arch/powerpc/include/asm/nohash/64/pgtable.h +@@ -311,6 +311,7 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma, + #define __swp_entry_to_pte(x) __pte((x).val) + + int map_kernel_page(unsigned long ea, unsigned long pa, pgprot_t prot); ++void unmap_kernel_page(unsigned long va); + extern int __meminit vmemmap_create_mapping(unsigned long start, + unsigned long page_size, + unsigned long phys); +diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c +index 15555c95cebc7..faaf33e204de1 100644 +--- a/arch/powerpc/mm/pgtable.c ++++ b/arch/powerpc/mm/pgtable.c +@@ -194,6 +194,15 @@ void set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, + __set_pte_at(mm, addr, ptep, pte, 0); + } + ++void unmap_kernel_page(unsigned long va) ++{ ++ pmd_t *pmdp = pmd_off_k(va); ++ pte_t *ptep = pte_offset_kernel(pmdp, va); ++ ++ pte_clear(&init_mm, va, ptep); ++ flush_tlb_kernel_range(va, va + PAGE_SIZE); ++} ++ + /* + * This is called when relaxing access to a PTE. It's also called in the page + * fault path when we don't hit any of the major fault cases, ie, a minor +-- +2.34.1 + diff --git a/queue-5.10/scsi-myrs-fix-crash-in-error-case.patch b/queue-5.10/scsi-myrs-fix-crash-in-error-case.patch new file mode 100644 index 00000000000..91e26ade3cf --- /dev/null +++ b/queue-5.10/scsi-myrs-fix-crash-in-error-case.patch @@ -0,0 +1,48 @@ +From 2e8387bd71e3ec2f93d2b40acfd91af1da4d0051 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 23 Jan 2022 14:57:17 -0800 +Subject: scsi: myrs: Fix crash in error case + +From: Tong Zhang + +[ Upstream commit 4db09593af0b0b4d7d4805ebb3273df51d7cc30d ] + +In myrs_detect(), cs->disable_intr is NULL when privdata->hw_init() fails +with non-zero. In this case, myrs_cleanup(cs) will call a NULL ptr and +crash the kernel. + +[ 1.105606] myrs 0000:00:03.0: Unknown Initialization Error 5A +[ 1.105872] myrs 0000:00:03.0: Failed to initialize Controller +[ 1.106082] BUG: kernel NULL pointer dereference, address: 0000000000000000 +[ 1.110774] Call Trace: +[ 1.110950] myrs_cleanup+0xe4/0x150 [myrs] +[ 1.111135] myrs_probe.cold+0x91/0x56a [myrs] +[ 1.111302] ? DAC960_GEM_intr_handler+0x1f0/0x1f0 [myrs] +[ 1.111500] local_pci_probe+0x48/0x90 + +Link: https://lore.kernel.org/r/20220123225717.1069538-1-ztong0001@gmail.com +Reviewed-by: Hannes Reinecke +Signed-off-by: Tong Zhang +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/myrs.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c +index 78c41bbf67562..e6a6678967e52 100644 +--- a/drivers/scsi/myrs.c ++++ b/drivers/scsi/myrs.c +@@ -2272,7 +2272,8 @@ static void myrs_cleanup(struct myrs_hba *cs) + myrs_unmap(cs); + + if (cs->mmio_base) { +- cs->disable_intr(cs); ++ if (cs->disable_intr) ++ cs->disable_intr(cs); + iounmap(cs->mmio_base); + cs->mmio_base = NULL; + } +-- +2.34.1 + diff --git a/queue-5.10/scsi-pm8001-fix-bogus-fw-crash-for-maxcpus-1.patch b/queue-5.10/scsi-pm8001-fix-bogus-fw-crash-for-maxcpus-1.patch new file mode 100644 index 00000000000..ef8502dbd6b --- /dev/null +++ b/queue-5.10/scsi-pm8001-fix-bogus-fw-crash-for-maxcpus-1.patch @@ -0,0 +1,84 @@ +From 71b3a62877b13eb67480b0dd53933e8d24c072ec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 18 Jan 2022 20:15:05 +0800 +Subject: scsi: pm8001: Fix bogus FW crash for maxcpus=1 + +From: John Garry + +[ Upstream commit 62afb379a0fee7e9c2f9f68e1abeb85ceddf51b9 ] + +According to the comment in check_fw_ready() we should not check the +IOP1_READY field in register SCRATCH_PAD_1 for 8008 or 8009 controllers. + +However we check this very field in process_oq() for processing the highest +index interrupt vector. The highest interrupt vector is checked as the FW +is programmed to signal fatal errors through this irq. + +Change that function to not check IOP1_READY for those mentioned +controllers, but do check ILA_READY in both cases. + +The reason I assume that this was not hit earlier was because we always +allocated 64 MSI(X), and just did not pass the vector index check in +process_oq(), i.e. the handler never ran for vector index 63. + +Link: https://lore.kernel.org/r/1642508105-95432-1-git-send-email-john.garry@huawei.com +Tested-by: Damien Le Moal +Reviewed-by: Damien Le Moal +Signed-off-by: John Garry +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/pm8001/pm80xx_hwi.c | 16 ++++++++++++++-- + drivers/scsi/pm8001/pm80xx_hwi.h | 6 +++++- + 2 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c +index a203a4fc2674a..b22a8ab754faa 100644 +--- a/drivers/scsi/pm8001/pm80xx_hwi.c ++++ b/drivers/scsi/pm8001/pm80xx_hwi.c +@@ -4057,10 +4057,22 @@ static int process_oq(struct pm8001_hba_info *pm8001_ha, u8 vec) + unsigned long flags; + u32 regval; + ++ /* ++ * Fatal errors are programmed to be signalled in irq vector ++ * pm8001_ha->max_q_num - 1 through pm8001_ha->main_cfg_tbl.pm80xx_tbl. ++ * fatal_err_interrupt ++ */ + if (vec == (pm8001_ha->max_q_num - 1)) { ++ u32 mipsall_ready; ++ ++ if (pm8001_ha->chip_id == chip_8008 || ++ pm8001_ha->chip_id == chip_8009) ++ mipsall_ready = SCRATCH_PAD_MIPSALL_READY_8PORT; ++ else ++ mipsall_ready = SCRATCH_PAD_MIPSALL_READY_16PORT; ++ + regval = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1); +- if ((regval & SCRATCH_PAD_MIPSALL_READY) != +- SCRATCH_PAD_MIPSALL_READY) { ++ if ((regval & mipsall_ready) != mipsall_ready) { + pm8001_ha->controller_fatal_error = true; + pm8001_dbg(pm8001_ha, FAIL, + "Firmware Fatal error! Regval:0x%x\n", +diff --git a/drivers/scsi/pm8001/pm80xx_hwi.h b/drivers/scsi/pm8001/pm80xx_hwi.h +index 701951a0f715b..0dfe9034f7e7f 100644 +--- a/drivers/scsi/pm8001/pm80xx_hwi.h ++++ b/drivers/scsi/pm8001/pm80xx_hwi.h +@@ -1391,8 +1391,12 @@ typedef struct SASProtocolTimerConfig SASProtocolTimerConfig_t; + #define SCRATCH_PAD_BOOT_LOAD_SUCCESS 0x0 + #define SCRATCH_PAD_IOP0_READY 0xC00 + #define SCRATCH_PAD_IOP1_READY 0x3000 +-#define SCRATCH_PAD_MIPSALL_READY (SCRATCH_PAD_IOP1_READY | \ ++#define SCRATCH_PAD_MIPSALL_READY_16PORT (SCRATCH_PAD_IOP1_READY | \ + SCRATCH_PAD_IOP0_READY | \ ++ SCRATCH_PAD_ILA_READY | \ ++ SCRATCH_PAD_RAAE_READY) ++#define SCRATCH_PAD_MIPSALL_READY_8PORT (SCRATCH_PAD_IOP0_READY | \ ++ SCRATCH_PAD_ILA_READY | \ + SCRATCH_PAD_RAAE_READY) + + /* boot loader state */ +-- +2.34.1 + diff --git a/queue-5.10/scsi-qedf-add-stag_work-to-all-the-vports.patch b/queue-5.10/scsi-qedf-add-stag_work-to-all-the-vports.patch new file mode 100644 index 00000000000..9db7f87823c --- /dev/null +++ b/queue-5.10/scsi-qedf-add-stag_work-to-all-the-vports.patch @@ -0,0 +1,73 @@ +From 2f71137eebb1884ef7f9de1b0517f9bfe16dc2e0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 17 Jan 2022 05:53:09 -0800 +Subject: scsi: qedf: Add stag_work to all the vports + +From: Saurav Kashyap + +[ Upstream commit b70a99fd13282d7885f69bf1372e28b7506a1613 ] + +Call trace seen when creating NPIV ports, only 32 out of 64 show online. +stag work was not initialized for vport, hence initialize the stag work. + +WARNING: CPU: 8 PID: 645 at kernel/workqueue.c:1635 __queue_delayed_work+0x68/0x80 +CPU: 8 PID: 645 Comm: kworker/8:1 Kdump: loaded Tainted: G IOE --------- -- + 4.18.0-348.el8.x86_64 #1 +Hardware name: Dell Inc. PowerEdge MX740c/0177V9, BIOS 2.12.2 07/09/2021 +Workqueue: events fc_lport_timeout [libfc] +RIP: 0010:__queue_delayed_work+0x68/0x80 +Code: 89 b2 88 00 00 00 44 89 82 90 00 00 00 48 01 c8 48 89 42 50 41 81 +f8 00 20 00 00 75 1d e9 60 24 07 00 44 89 c7 e9 98 f6 ff ff <0f> 0b eb +c5 0f 0b eb a1 0f 0b eb a7 0f 0b eb ac 44 89 c6 e9 40 23 +RSP: 0018:ffffae514bc3be40 EFLAGS: 00010006 +RAX: ffff8d25d6143750 RBX: 0000000000000202 RCX: 0000000000000002 +RDX: ffff8d2e31383748 RSI: ffff8d25c000d600 RDI: ffff8d2e31383788 +RBP: ffff8d2e31380de0 R08: 0000000000002000 R09: ffff8d2e31383750 +R10: ffffffffc0c957e0 R11: ffff8d2624800000 R12: ffff8d2e31380a58 +R13: ffff8d2d915eb000 R14: ffff8d25c499b5c0 R15: ffff8d2e31380e18 +FS: 0000000000000000(0000) GS:ffff8d2d1fb00000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 000055fd0484b8b8 CR3: 00000008ffc10006 CR4: 00000000007706e0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +PKRU: 55555554 +Call Trace: + queue_delayed_work_on+0x36/0x40 + qedf_elsct_send+0x57/0x60 [qedf] + fc_lport_enter_flogi+0x90/0xc0 [libfc] + fc_lport_timeout+0xb7/0x140 [libfc] + process_one_work+0x1a7/0x360 + ? create_worker+0x1a0/0x1a0 + worker_thread+0x30/0x390 + ? create_worker+0x1a0/0x1a0 + kthread+0x116/0x130 + ? kthread_flush_work_fn+0x10/0x10 + ret_from_fork+0x35/0x40 + ---[ end trace 008f00f722f2c2ff ]-- + +Initialize stag work for all the vports. + +Link: https://lore.kernel.org/r/20220117135311.6256-2-njavali@marvell.com +Signed-off-by: Saurav Kashyap +Signed-off-by: Nilesh Javali +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/qedf/qedf_main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c +index c63dcc39f76c2..e64457f53da86 100644 +--- a/drivers/scsi/qedf/qedf_main.c ++++ b/drivers/scsi/qedf/qedf_main.c +@@ -1859,6 +1859,7 @@ static int qedf_vport_create(struct fc_vport *vport, bool disabled) + vport_qedf->cmd_mgr = base_qedf->cmd_mgr; + init_completion(&vport_qedf->flogi_compl); + INIT_LIST_HEAD(&vport_qedf->fcports); ++ INIT_DELAYED_WORK(&vport_qedf->stag_work, qedf_stag_change_work); + + rc = qedf_vport_libfc_config(vport, vn_port); + if (rc) { +-- +2.34.1 + diff --git a/queue-5.10/scsi-qedf-fix-refcount-issue-when-logo-is-received-d.patch b/queue-5.10/scsi-qedf-fix-refcount-issue-when-logo-is-received-d.patch new file mode 100644 index 00000000000..dec486ad295 --- /dev/null +++ b/queue-5.10/scsi-qedf-fix-refcount-issue-when-logo-is-received-d.patch @@ -0,0 +1,72 @@ +From 49ff89b3e6fb4f4c5710d5879df3e25b363e6999 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 17 Jan 2022 05:53:10 -0800 +Subject: scsi: qedf: Fix refcount issue when LOGO is received during TMF + +From: Saurav Kashyap + +[ Upstream commit 5239ab63f17cee643bd4bf6addfedebaa7d4f41e ] + +Hung task call trace was seen during LOGO processing. + +[ 974.309060] [0000:00:00.0]:[qedf_eh_device_reset:868]: 1:0:2:0: LUN RESET Issued... +[ 974.309065] [0000:00:00.0]:[qedf_initiate_tmf:2422]: tm_flags 0x10 sc_cmd 00000000c16b930f op = 0x2a target_id = 0x2 lun=0 +[ 974.309178] [0000:00:00.0]:[qedf_initiate_tmf:2431]: portid=016900 tm_flags =LUN RESET +[ 974.309222] [0000:00:00.0]:[qedf_initiate_tmf:2438]: orig io_req = 00000000ec78df8f xid = 0x180 ref_cnt = 1. +[ 974.309625] host1: rport 016900: Received LOGO request while in state Ready +[ 974.309627] host1: rport 016900: Delete port +[ 974.309642] host1: rport 016900: work event 3 +[ 974.309644] host1: rport 016900: lld callback ev 3 +[ 974.313243] [0000:61:00.2]:[qedf_execute_tmf:2383]:1: fcport is uploading, not executing flush. +[ 974.313295] [0000:61:00.2]:[qedf_execute_tmf:2400]:1: task mgmt command success... +[ 984.031088] INFO: task jbd2/dm-15-8:7645 blocked for more than 120 seconds. +[ 984.031136] Not tainted 4.18.0-305.el8.x86_64 #1 + +[ 984.031166] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. +[ 984.031209] jbd2/dm-15-8 D 0 7645 2 0x80004080 +[ 984.031212] Call Trace: +[ 984.031222] __schedule+0x2c4/0x700 +[ 984.031230] ? unfreeze_partials.isra.83+0x16e/0x1a0 +[ 984.031233] ? bit_wait_timeout+0x90/0x90 +[ 984.031235] schedule+0x38/0xa0 +[ 984.031238] io_schedule+0x12/0x40 +[ 984.031240] bit_wait_io+0xd/0x50 +[ 984.031243] __wait_on_bit+0x6c/0x80 +[ 984.031248] ? free_buffer_head+0x21/0x50 +[ 984.031251] out_of_line_wait_on_bit+0x91/0xb0 +[ 984.031257] ? init_wait_var_entry+0x50/0x50 +[ 984.031268] jbd2_journal_commit_transaction+0x112e/0x19f0 [jbd2] +[ 984.031280] kjournald2+0xbd/0x270 [jbd2] +[ 984.031284] ? finish_wait+0x80/0x80 +[ 984.031291] ? commit_timeout+0x10/0x10 [jbd2] +[ 984.031294] kthread+0x116/0x130 +[ 984.031300] ? kthread_flush_work_fn+0x10/0x10 +[ 984.031305] ret_from_fork+0x1f/0x40 + +There was a ref count issue when LOGO is received during TMF. This leads to +one of the I/Os hanging with the driver. Fix the ref count. + +Link: https://lore.kernel.org/r/20220117135311.6256-3-njavali@marvell.com +Signed-off-by: Saurav Kashyap +Signed-off-by: Nilesh Javali +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/qedf/qedf_io.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c +index 63f99f4eeed97..472374d83cede 100644 +--- a/drivers/scsi/qedf/qedf_io.c ++++ b/drivers/scsi/qedf/qedf_io.c +@@ -2268,6 +2268,7 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req, + io_req->tm_flags == FCP_TMF_TGT_RESET) { + clear_bit(QEDF_CMD_OUTSTANDING, &io_req->flags); + io_req->sc_cmd = NULL; ++ kref_put(&io_req->refcount, qedf_release_cmd); + complete(&io_req->tm_done); + } + +-- +2.34.1 + diff --git a/queue-5.10/scsi-target-iscsi-make-sure-the-np-under-each-tpg-is.patch b/queue-5.10/scsi-target-iscsi-make-sure-the-np-under-each-tpg-is.patch new file mode 100644 index 00000000000..9ca88e7d2f8 --- /dev/null +++ b/queue-5.10/scsi-target-iscsi-make-sure-the-np-under-each-tpg-is.patch @@ -0,0 +1,43 @@ +From b43ab8804441a1123da953e3e1054d9902e72f03 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Jan 2022 13:47:42 +0800 +Subject: scsi: target: iscsi: Make sure the np under each tpg is unique + +From: ZouMingzhe + +[ Upstream commit a861790afaa8b6369eee8a88c5d5d73f5799c0c6 ] + +iscsit_tpg_check_network_portal() has nested for_each loops and is supposed +to return true when a match is found. However, the tpg loop will still +continue after existing the tpg_np loop. If this tpg_np is not the last the +match value will be changed. + +Break the outer loop after finding a match and make sure the np under each +tpg is unique. + +Link: https://lore.kernel.org/r/20220111054742.19582-1-mingzhe.zou@easystack.cn +Signed-off-by: ZouMingzhe +Reviewed-by: Mike Christie +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/target/iscsi/iscsi_target_tpg.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c +index 8075f60fd02c3..2d5cf1714ae05 100644 +--- a/drivers/target/iscsi/iscsi_target_tpg.c ++++ b/drivers/target/iscsi/iscsi_target_tpg.c +@@ -443,6 +443,9 @@ static bool iscsit_tpg_check_network_portal( + break; + } + spin_unlock(&tpg->tpg_np_lock); ++ ++ if (match) ++ break; + } + spin_unlock(&tiqn->tiqn_tpg_lock); + +-- +2.34.1 + diff --git a/queue-5.10/scsi-ufs-treat-link-loss-as-fatal-error.patch b/queue-5.10/scsi-ufs-treat-link-loss-as-fatal-error.patch new file mode 100644 index 00000000000..6478d1b9c95 --- /dev/null +++ b/queue-5.10/scsi-ufs-treat-link-loss-as-fatal-error.patch @@ -0,0 +1,41 @@ +From 169531216e449fc9f03b201ef0a7d49a1b3fcaf6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Jan 2022 14:37:55 +0900 +Subject: scsi: ufs: Treat link loss as fatal error + +From: Kiwoong Kim + +[ Upstream commit c99b9b2301492b665b6e51ba6c06ec362eddcd10 ] + +This event is raised when link is lost as specified in UFSHCI spec and that +means communication is not possible. Thus initializing UFS interface needs +to be done. + +Make UFS driver considers Link Lost as fatal in the INT_FATAL_ERRORS +mask. This will trigger a host reset whenever a link lost interrupt occurs. + +Link: https://lore.kernel.org/r/1642743475-54275-1-git-send-email-kwmad.kim@samsung.com +Signed-off-by: Kiwoong Kim +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/ufs/ufshci.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/ufs/ufshci.h b/drivers/scsi/ufs/ufshci.h +index 6795e1f0e8f8c..1d999228efc85 100644 +--- a/drivers/scsi/ufs/ufshci.h ++++ b/drivers/scsi/ufs/ufshci.h +@@ -138,7 +138,8 @@ enum { + #define INT_FATAL_ERRORS (DEVICE_FATAL_ERROR |\ + CONTROLLER_FATAL_ERROR |\ + SYSTEM_BUS_FATAL_ERROR |\ +- CRYPTO_ENGINE_FATAL_ERROR) ++ CRYPTO_ENGINE_FATAL_ERROR |\ ++ UIC_LINK_LOST) + + /* HCS - Host Controller Status 30h */ + #define DEVICE_PRESENT 0x1 +-- +2.34.1 + diff --git a/queue-5.10/scsi-ufs-ufshcd-pltfrm-check-the-return-value-of-dev.patch b/queue-5.10/scsi-ufs-ufshcd-pltfrm-check-the-return-value-of-dev.patch new file mode 100644 index 00000000000..09e53eb5d2d --- /dev/null +++ b/queue-5.10/scsi-ufs-ufshcd-pltfrm-check-the-return-value-of-dev.patch @@ -0,0 +1,49 @@ +From 5c8b8ea7fb099ef802994a49e80463433f7a8fac Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 16 Jan 2022 11:06:49 +0800 +Subject: scsi: ufs: ufshcd-pltfrm: Check the return value of devm_kstrdup() + +From: Xiaoke Wang + +[ Upstream commit a65b32748f4566f986ba2495a8236c141fa42a26 ] + +devm_kstrdup() returns pointer to allocated string on success, NULL on +failure. So it is better to check the return value of it. + +Link: https://lore.kernel.org/r/tencent_4257E15D4A94FF9020DDCC4BB9B21C041408@qq.com +Reviewed-by: Bean Huo +Signed-off-by: Xiaoke Wang +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/ufs/ufshcd-pltfrm.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c +index e49505534d498..0f2430fb398db 100644 +--- a/drivers/scsi/ufs/ufshcd-pltfrm.c ++++ b/drivers/scsi/ufs/ufshcd-pltfrm.c +@@ -92,6 +92,11 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba) + clki->min_freq = clkfreq[i]; + clki->max_freq = clkfreq[i+1]; + clki->name = devm_kstrdup(dev, name, GFP_KERNEL); ++ if (!clki->name) { ++ ret = -ENOMEM; ++ goto out; ++ } ++ + if (!strcmp(name, "ref_clk")) + clki->keep_link_active = true; + dev_dbg(dev, "%s: min %u max %u name %s\n", "freq-table-hz", +@@ -128,6 +133,8 @@ static int ufshcd_populate_vreg(struct device *dev, const char *name, + return -ENOMEM; + + vreg->name = devm_kstrdup(dev, name, GFP_KERNEL); ++ if (!vreg->name) ++ return -ENOMEM; + + snprintf(prop_name, MAX_PROP_SIZE, "%s-max-microamp", name); + if (of_property_read_u32(np, prop_name, &vreg->max_uA)) { +-- +2.34.1 + diff --git a/queue-5.10/series b/queue-5.10/series index 97056fdeed5..4b649eb3fad 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -11,3 +11,31 @@ nfsd-clamp-write-offsets.patch nfsd-fix-offset-type-in-i-o-trace-points.patch drm-amdgpu-set-a-suitable-dev_info.gart_page_size.patch tracing-propagate-is_signed-to-expression.patch +nfs-change-nfs_access_get_cached-to-only-report-the-.patch +nfsv4-only-print-the-label-when-its-queried.patch +nfs-nfs4clinet-check-the-return-value-of-kstrdup.patch +nfsv4.1-fix-uninitialised-variable-in-devicenotify.patch +nfsv4-remove-zero-number-of-fs_locations-entries-err.patch +nfsv4-expose-nfs_parse_server_name-function.patch +nfsv4-handle-port-presence-in-fs_location-server-str.patch +x86-perf-avoid-warning-for-arch-lbr-without-xsave.patch +drm-panel-orientation-quirks-add-quirk-for-the-1netb.patch +net-sched-clarify-error-message-when-qdisc-kind-is-u.patch +powerpc-fixmap-fix-vm-debug-warning-on-unmap.patch +scsi-target-iscsi-make-sure-the-np-under-each-tpg-is.patch +scsi-ufs-ufshcd-pltfrm-check-the-return-value-of-dev.patch +scsi-qedf-add-stag_work-to-all-the-vports.patch +scsi-qedf-fix-refcount-issue-when-logo-is-received-d.patch +scsi-pm8001-fix-bogus-fw-crash-for-maxcpus-1.patch +scsi-ufs-treat-link-loss-as-fatal-error.patch +scsi-myrs-fix-crash-in-error-case.patch +pm-hibernate-remove-register_nosave_region_late.patch +usb-dwc2-gadget-don-t-try-to-disable-ep0-in-dwc2_hso.patch +perf-always-wake-the-parent-event.patch +nvme-pci-add-the-ignore_dev_subnqn-quirk-for-intel-p.patch +net-stmmac-dwmac-sun8i-use-return-val-of-readl_poll_.patch +kvm-eventfd-fix-false-positive-rcu-usage-warning.patch +kvm-nvmx-evmcs-filter-out-vm_exit_save_vmx_preemptio.patch +kvm-nvmx-also-filter-msr_ia32_vmx_true_pinbased_ctls.patch +kvm-svm-don-t-kill-sev-guest-if-smap-erratum-trigger.patch +kvm-vmx-set-vmcs.pending_dbg.bs-on-db-in-sti-movss-b.patch diff --git a/queue-5.10/usb-dwc2-gadget-don-t-try-to-disable-ep0-in-dwc2_hso.patch b/queue-5.10/usb-dwc2-gadget-don-t-try-to-disable-ep0-in-dwc2_hso.patch new file mode 100644 index 00000000000..10b7c730ba8 --- /dev/null +++ b/queue-5.10/usb-dwc2-gadget-don-t-try-to-disable-ep0-in-dwc2_hso.patch @@ -0,0 +1,50 @@ +From 081fdf68e13460ae2b0fb923f08b7777feca4475 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 Dec 2021 14:01:01 +0100 +Subject: usb: dwc2: gadget: don't try to disable ep0 in dwc2_hsotg_suspend + +From: Amelie Delaunay + +[ Upstream commit ac55d163855924aa5af9f1560977da8f346963c8 ] + +Calling dwc2_hsotg_ep_disable on ep0 (in/out) will lead to the following +logs before returning -EINVAL: +dwc2 49000000.usb-otg: dwc2_hsotg_ep_disable: called for ep0 +dwc2 49000000.usb-otg: dwc2_hsotg_ep_disable: called for ep0 + +To avoid these two logs while suspending, start disabling the endpoint +from the index 1, as done in dwc2_hsotg_udc_stop: + + /* all endpoints should be shutdown */ + for (ep = 1; ep < hsotg->num_of_eps; ep++) { + if (hsotg->eps_in[ep]) + dwc2_hsotg_ep_disable_lock(&hsotg->eps_in[ep]->ep); + if (hsotg->eps_out[ep]) + dwc2_hsotg_ep_disable_lock(&hsotg->eps_out[ep]->ep); + } + +Acked-by: Minas Harutyunyan +Signed-off-by: Amelie Delaunay +Link: https://lore.kernel.org/r/20211207130101.270314-1-amelie.delaunay@foss.st.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/dwc2/gadget.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c +index 449f19c3633c2..ec54971063f8f 100644 +--- a/drivers/usb/dwc2/gadget.c ++++ b/drivers/usb/dwc2/gadget.c +@@ -5032,7 +5032,7 @@ int dwc2_hsotg_suspend(struct dwc2_hsotg *hsotg) + hsotg->gadget.speed = USB_SPEED_UNKNOWN; + spin_unlock_irqrestore(&hsotg->lock, flags); + +- for (ep = 0; ep < hsotg->num_of_eps; ep++) { ++ for (ep = 1; ep < hsotg->num_of_eps; ep++) { + if (hsotg->eps_in[ep]) + dwc2_hsotg_ep_disable_lock(&hsotg->eps_in[ep]->ep); + if (hsotg->eps_out[ep]) +-- +2.34.1 + diff --git a/queue-5.10/x86-perf-avoid-warning-for-arch-lbr-without-xsave.patch b/queue-5.10/x86-perf-avoid-warning-for-arch-lbr-without-xsave.patch new file mode 100644 index 00000000000..280929bbf03 --- /dev/null +++ b/queue-5.10/x86-perf-avoid-warning-for-arch-lbr-without-xsave.patch @@ -0,0 +1,38 @@ +From 8ba438a95f486b6d21d8eee3e5c27faee0be8699 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 15 Dec 2021 12:40:29 -0800 +Subject: x86/perf: Avoid warning for Arch LBR without XSAVE + +From: Andi Kleen + +[ Upstream commit 8c16dc047b5dd8f7b3bf4584fa75733ea0dde7dc ] + +Some hypervisors support Arch LBR, but without the LBR XSAVE support. +The current Arch LBR init code prints a warning when the xsave size (0) is +unexpected. Avoid printing the warning for the "no LBR XSAVE" case. + +Signed-off-by: Andi Kleen +Signed-off-by: Peter Zijlstra (Intel) +Link: https://lkml.kernel.org/r/20211215204029.150686-1-ak@linux.intel.com +Signed-off-by: Sasha Levin +--- + arch/x86/events/intel/lbr.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c +index 9c1a013d56822..bd8516e6c353c 100644 +--- a/arch/x86/events/intel/lbr.c ++++ b/arch/x86/events/intel/lbr.c +@@ -1734,6 +1734,9 @@ static bool is_arch_lbr_xsave_available(void) + * Check the LBR state with the corresponding software structure. + * Disable LBR XSAVES support if the size doesn't match. + */ ++ if (xfeature_size(XFEATURE_LBR) == 0) ++ return false; ++ + if (WARN_ON(xfeature_size(XFEATURE_LBR) != get_lbr_state_size())) + return false; + +-- +2.34.1 +