- Linux-stable-mirror - lists.linaro.org

FAILED: patch "[PATCH] KVM: SVM: Set target pCPU during IRTE update if target vCPU" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x f3cebc75e7425d6949d726bb8e937095b0aef025 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091658-ardently-stony-3b87@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: f3cebc75e742 ("KVM: SVM: Set target pCPU during IRTE update if target vCPU is running") 4c08e737f056 ("KVM: SVM: Take and hold ir_list_lock when updating vCPU's Physical ID entry") 935a7333958e ("KVM: SVM: Drop AVIC's intermediate avic_set_running() helper") 782f64558de7 ("KVM: SVM: Skip AVIC and IRTE updates when loading blocking vCPU") af52f5aa5c1b ("KVM: SVM: Use kvm_vcpu_is_blocking() in AVIC load to handle preemption") e422b8896948 ("KVM: SVM: Remove unnecessary APICv/AVIC update in vCPU unblocking path") 7cfc5c653b07 ("KVM: fix avic_set_running for preemptable kernels") bf5f6b9d7ad6 ("KVM: SVM: move check for kvm_vcpu_apicv_active outside of avic_vcpu_{put|load}") 02ffbe6351f5 ("KVM: SVM: fix doc warnings") a7fc06dd2f14 ("KVM: SVM: use .prepare_guest_switch() to handle CPU register save/setup") 553cc15f6e8d ("KVM: SVM: remove uneeded fields from host_save_users_msrs") e79b91bb3c91 ("KVM: SVM: use vmsave/vmload for saving/restoring additional host state") 35a7831912f4 ("KVM: SVM: Use asm goto to handle unexpected #UD on SVM instructions") 647daca25d24 ("KVM: SVM: Add support for booting APs in an SEV-ES guest") f65cf84ee769 ("KVM: SVM: Add register operand to vmsave call in sev_es_vcpu_load") 8640ca588b03 ("KVM: SVM: Add AP_JUMP_TABLE support in prep for AP booting") 16809ecdc1e8 ("KVM: SVM: Provide an updated VMRUN invocation for SEV-ES guests") 861377730aa9 ("KVM: SVM: Provide support for SEV-ES vCPU loading") 376c6d285017 ("KVM: SVM: Provide support for SEV-ES vCPU creation/loading") 85ca8be938c0 ("KVM: SVM: Set the encryption mask for the SVM host save area") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f3cebc75e7425d6949d726bb8e937095b0aef025 Mon Sep 17 00:00:00 2001 From: Sean Christopherson <seanjc(a)google.com> Date: Tue, 8 Aug 2023 16:31:32 -0700 Subject: [PATCH] KVM: SVM: Set target pCPU during IRTE update if target vCPU is running Update the target pCPU for IOMMU doorbells when updating IRTE routing if KVM is actively running the associated vCPU. KVM currently only updates the pCPU when loading the vCPU (via avic_vcpu_load()), and so doorbell events will be delayed until the vCPU goes through a put+load cycle (which might very well "never" happen for the lifetime of the VM). To avoid inserting a stale pCPU, e.g. due to racing between updating IRTE routing and vCPU load/put, get the pCPU information from the vCPU's Physical APIC ID table entry (a.k.a. avic_physical_id_cache in KVM) and update the IRTE while holding ir_list_lock. Add comments with --verbose enabled to explain exactly what is and isn't protected by ir_list_lock. Fixes: 411b44ba80ab ("svm: Implements update_pi_irte hook to setup posted interrupt") Reported-by: dengqiao.joey <dengqiao.joey(a)bytedance.com> Cc: stable(a)vger.kernel.org Cc: Alejandro Jimenez <alejandro.j.jimenez(a)oracle.com> Cc: Joao Martins <joao.m.martins(a)oracle.com> Cc: Maxim Levitsky <mlevitsk(a)redhat.com> Cc: Suravee Suthikulpanit <suravee.suthikulpanit(a)amd.com> Tested-by: Alejandro Jimenez <alejandro.j.jimenez(a)oracle.com> Reviewed-by: Joao Martins <joao.m.martins(a)oracle.com> Link: https://lore.kernel.org/r/20230808233132.2499764-3-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc(a)google.com> diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 8e041b215ddb..2092db892d7d 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -791,6 +791,7 @@ static int svm_ir_list_add(struct vcpu_svm *svm, struct amd_iommu_pi_data *pi) int ret = 0; unsigned long flags; struct amd_svm_iommu_ir *ir; + u64 entry; /** * In some cases, the existing irte is updated and re-set, @@ -824,6 +825,18 @@ static int svm_ir_list_add(struct vcpu_svm *svm, struct amd_iommu_pi_data *pi) ir->data = pi->ir_data; spin_lock_irqsave(&svm->ir_list_lock, flags); + + /* + * Update the target pCPU for IOMMU doorbells if the vCPU is running. + * If the vCPU is NOT running, i.e. is blocking or scheduled out, KVM + * will update the pCPU info when the vCPU awkened and/or scheduled in. + * See also avic_vcpu_load(). + */ + entry = READ_ONCE(*(svm->avic_physical_id_cache)); + if (entry & AVIC_PHYSICAL_ID_ENTRY_IS_RUNNING_MASK) + amd_iommu_update_ga(entry & AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK, + true, pi->ir_data); + list_add(&ir->node, &svm->ir_list); spin_unlock_irqrestore(&svm->ir_list_lock, flags); out: @@ -1031,6 +1044,13 @@ void avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu) if (kvm_vcpu_is_blocking(vcpu)) return; + /* + * Grab the per-vCPU interrupt remapping lock even if the VM doesn't + * _currently_ have assigned devices, as that can change. Holding + * ir_list_lock ensures that either svm_ir_list_add() will consume + * up-to-date entry information, or that this task will wait until + * svm_ir_list_add() completes to set the new target pCPU. + */ spin_lock_irqsave(&svm->ir_list_lock, flags); entry = READ_ONCE(*(svm->avic_physical_id_cache)); @@ -1067,6 +1087,14 @@ void avic_vcpu_put(struct kvm_vcpu *vcpu) if (!(entry & AVIC_PHYSICAL_ID_ENTRY_IS_RUNNING_MASK)) return; + /* + * Take and hold the per-vCPU interrupt remapping lock while updating + * the Physical ID entry even though the lock doesn't protect against + * multiple writers (see above). Holding ir_list_lock ensures that + * either svm_ir_list_add() will consume up-to-date entry information, + * or that this task will wait until svm_ir_list_add() completes to + * mark the vCPU as not running. + */ spin_lock_irqsave(&svm->ir_list_lock, flags); avic_update_iommu_vcpu_affinity(vcpu, -1, 0);

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] KVM: SVM: Set target pCPU during IRTE update if target vCPU" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x f3cebc75e7425d6949d726bb8e937095b0aef025 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091657-decidable-garbage-b5fa@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: f3cebc75e742 ("KVM: SVM: Set target pCPU during IRTE update if target vCPU is running") 4c08e737f056 ("KVM: SVM: Take and hold ir_list_lock when updating vCPU's Physical ID entry") 935a7333958e ("KVM: SVM: Drop AVIC's intermediate avic_set_running() helper") 782f64558de7 ("KVM: SVM: Skip AVIC and IRTE updates when loading blocking vCPU") af52f5aa5c1b ("KVM: SVM: Use kvm_vcpu_is_blocking() in AVIC load to handle preemption") e422b8896948 ("KVM: SVM: Remove unnecessary APICv/AVIC update in vCPU unblocking path") 7cfc5c653b07 ("KVM: fix avic_set_running for preemptable kernels") bf5f6b9d7ad6 ("KVM: SVM: move check for kvm_vcpu_apicv_active outside of avic_vcpu_{put|load}") 02ffbe6351f5 ("KVM: SVM: fix doc warnings") a7fc06dd2f14 ("KVM: SVM: use .prepare_guest_switch() to handle CPU register save/setup") 553cc15f6e8d ("KVM: SVM: remove uneeded fields from host_save_users_msrs") e79b91bb3c91 ("KVM: SVM: use vmsave/vmload for saving/restoring additional host state") 35a7831912f4 ("KVM: SVM: Use asm goto to handle unexpected #UD on SVM instructions") 647daca25d24 ("KVM: SVM: Add support for booting APs in an SEV-ES guest") f65cf84ee769 ("KVM: SVM: Add register operand to vmsave call in sev_es_vcpu_load") 8640ca588b03 ("KVM: SVM: Add AP_JUMP_TABLE support in prep for AP booting") 16809ecdc1e8 ("KVM: SVM: Provide an updated VMRUN invocation for SEV-ES guests") 861377730aa9 ("KVM: SVM: Provide support for SEV-ES vCPU loading") 376c6d285017 ("KVM: SVM: Provide support for SEV-ES vCPU creation/loading") 85ca8be938c0 ("KVM: SVM: Set the encryption mask for the SVM host save area") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f3cebc75e7425d6949d726bb8e937095b0aef025 Mon Sep 17 00:00:00 2001 From: Sean Christopherson <seanjc(a)google.com> Date: Tue, 8 Aug 2023 16:31:32 -0700 Subject: [PATCH] KVM: SVM: Set target pCPU during IRTE update if target vCPU is running Update the target pCPU for IOMMU doorbells when updating IRTE routing if KVM is actively running the associated vCPU. KVM currently only updates the pCPU when loading the vCPU (via avic_vcpu_load()), and so doorbell events will be delayed until the vCPU goes through a put+load cycle (which might very well "never" happen for the lifetime of the VM). To avoid inserting a stale pCPU, e.g. due to racing between updating IRTE routing and vCPU load/put, get the pCPU information from the vCPU's Physical APIC ID table entry (a.k.a. avic_physical_id_cache in KVM) and update the IRTE while holding ir_list_lock. Add comments with --verbose enabled to explain exactly what is and isn't protected by ir_list_lock. Fixes: 411b44ba80ab ("svm: Implements update_pi_irte hook to setup posted interrupt") Reported-by: dengqiao.joey <dengqiao.joey(a)bytedance.com> Cc: stable(a)vger.kernel.org Cc: Alejandro Jimenez <alejandro.j.jimenez(a)oracle.com> Cc: Joao Martins <joao.m.martins(a)oracle.com> Cc: Maxim Levitsky <mlevitsk(a)redhat.com> Cc: Suravee Suthikulpanit <suravee.suthikulpanit(a)amd.com> Tested-by: Alejandro Jimenez <alejandro.j.jimenez(a)oracle.com> Reviewed-by: Joao Martins <joao.m.martins(a)oracle.com> Link: https://lore.kernel.org/r/20230808233132.2499764-3-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc(a)google.com> diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 8e041b215ddb..2092db892d7d 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -791,6 +791,7 @@ static int svm_ir_list_add(struct vcpu_svm *svm, struct amd_iommu_pi_data *pi) int ret = 0; unsigned long flags; struct amd_svm_iommu_ir *ir; + u64 entry; /** * In some cases, the existing irte is updated and re-set, @@ -824,6 +825,18 @@ static int svm_ir_list_add(struct vcpu_svm *svm, struct amd_iommu_pi_data *pi) ir->data = pi->ir_data; spin_lock_irqsave(&svm->ir_list_lock, flags); + + /* + * Update the target pCPU for IOMMU doorbells if the vCPU is running. + * If the vCPU is NOT running, i.e. is blocking or scheduled out, KVM + * will update the pCPU info when the vCPU awkened and/or scheduled in. + * See also avic_vcpu_load(). + */ + entry = READ_ONCE(*(svm->avic_physical_id_cache)); + if (entry & AVIC_PHYSICAL_ID_ENTRY_IS_RUNNING_MASK) + amd_iommu_update_ga(entry & AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK, + true, pi->ir_data); + list_add(&ir->node, &svm->ir_list); spin_unlock_irqrestore(&svm->ir_list_lock, flags); out: @@ -1031,6 +1044,13 @@ void avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu) if (kvm_vcpu_is_blocking(vcpu)) return; + /* + * Grab the per-vCPU interrupt remapping lock even if the VM doesn't + * _currently_ have assigned devices, as that can change. Holding + * ir_list_lock ensures that either svm_ir_list_add() will consume + * up-to-date entry information, or that this task will wait until + * svm_ir_list_add() completes to set the new target pCPU. + */ spin_lock_irqsave(&svm->ir_list_lock, flags); entry = READ_ONCE(*(svm->avic_physical_id_cache)); @@ -1067,6 +1087,14 @@ void avic_vcpu_put(struct kvm_vcpu *vcpu) if (!(entry & AVIC_PHYSICAL_ID_ENTRY_IS_RUNNING_MASK)) return; + /* + * Take and hold the per-vCPU interrupt remapping lock while updating + * the Physical ID entry even though the lock doesn't protect against + * multiple writers (see above). Holding ir_list_lock ensures that + * either svm_ir_list_add() will consume up-to-date entry information, + * or that this task will wait until svm_ir_list_add() completes to + * mark the vCPU as not running. + */ spin_lock_irqsave(&svm->ir_list_lock, flags); avic_update_iommu_vcpu_affinity(vcpu, -1, 0);

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] KVM: SVM: Set target pCPU during IRTE update if target vCPU" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x f3cebc75e7425d6949d726bb8e937095b0aef025 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091655-resize-playmate-ac62@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: f3cebc75e742 ("KVM: SVM: Set target pCPU during IRTE update if target vCPU is running") 4c08e737f056 ("KVM: SVM: Take and hold ir_list_lock when updating vCPU's Physical ID entry") 935a7333958e ("KVM: SVM: Drop AVIC's intermediate avic_set_running() helper") 782f64558de7 ("KVM: SVM: Skip AVIC and IRTE updates when loading blocking vCPU") af52f5aa5c1b ("KVM: SVM: Use kvm_vcpu_is_blocking() in AVIC load to handle preemption") e422b8896948 ("KVM: SVM: Remove unnecessary APICv/AVIC update in vCPU unblocking path") 7cfc5c653b07 ("KVM: fix avic_set_running for preemptable kernels") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f3cebc75e7425d6949d726bb8e937095b0aef025 Mon Sep 17 00:00:00 2001 From: Sean Christopherson <seanjc(a)google.com> Date: Tue, 8 Aug 2023 16:31:32 -0700 Subject: [PATCH] KVM: SVM: Set target pCPU during IRTE update if target vCPU is running Update the target pCPU for IOMMU doorbells when updating IRTE routing if KVM is actively running the associated vCPU. KVM currently only updates the pCPU when loading the vCPU (via avic_vcpu_load()), and so doorbell events will be delayed until the vCPU goes through a put+load cycle (which might very well "never" happen for the lifetime of the VM). To avoid inserting a stale pCPU, e.g. due to racing between updating IRTE routing and vCPU load/put, get the pCPU information from the vCPU's Physical APIC ID table entry (a.k.a. avic_physical_id_cache in KVM) and update the IRTE while holding ir_list_lock. Add comments with --verbose enabled to explain exactly what is and isn't protected by ir_list_lock. Fixes: 411b44ba80ab ("svm: Implements update_pi_irte hook to setup posted interrupt") Reported-by: dengqiao.joey <dengqiao.joey(a)bytedance.com> Cc: stable(a)vger.kernel.org Cc: Alejandro Jimenez <alejandro.j.jimenez(a)oracle.com> Cc: Joao Martins <joao.m.martins(a)oracle.com> Cc: Maxim Levitsky <mlevitsk(a)redhat.com> Cc: Suravee Suthikulpanit <suravee.suthikulpanit(a)amd.com> Tested-by: Alejandro Jimenez <alejandro.j.jimenez(a)oracle.com> Reviewed-by: Joao Martins <joao.m.martins(a)oracle.com> Link: https://lore.kernel.org/r/20230808233132.2499764-3-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc(a)google.com> diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 8e041b215ddb..2092db892d7d 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -791,6 +791,7 @@ static int svm_ir_list_add(struct vcpu_svm *svm, struct amd_iommu_pi_data *pi) int ret = 0; unsigned long flags; struct amd_svm_iommu_ir *ir; + u64 entry; /** * In some cases, the existing irte is updated and re-set, @@ -824,6 +825,18 @@ static int svm_ir_list_add(struct vcpu_svm *svm, struct amd_iommu_pi_data *pi) ir->data = pi->ir_data; spin_lock_irqsave(&svm->ir_list_lock, flags); + + /* + * Update the target pCPU for IOMMU doorbells if the vCPU is running. + * If the vCPU is NOT running, i.e. is blocking or scheduled out, KVM + * will update the pCPU info when the vCPU awkened and/or scheduled in. + * See also avic_vcpu_load(). + */ + entry = READ_ONCE(*(svm->avic_physical_id_cache)); + if (entry & AVIC_PHYSICAL_ID_ENTRY_IS_RUNNING_MASK) + amd_iommu_update_ga(entry & AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK, + true, pi->ir_data); + list_add(&ir->node, &svm->ir_list); spin_unlock_irqrestore(&svm->ir_list_lock, flags); out: @@ -1031,6 +1044,13 @@ void avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu) if (kvm_vcpu_is_blocking(vcpu)) return; + /* + * Grab the per-vCPU interrupt remapping lock even if the VM doesn't + * _currently_ have assigned devices, as that can change. Holding + * ir_list_lock ensures that either svm_ir_list_add() will consume + * up-to-date entry information, or that this task will wait until + * svm_ir_list_add() completes to set the new target pCPU. + */ spin_lock_irqsave(&svm->ir_list_lock, flags); entry = READ_ONCE(*(svm->avic_physical_id_cache)); @@ -1067,6 +1087,14 @@ void avic_vcpu_put(struct kvm_vcpu *vcpu) if (!(entry & AVIC_PHYSICAL_ID_ENTRY_IS_RUNNING_MASK)) return; + /* + * Take and hold the per-vCPU interrupt remapping lock while updating + * the Physical ID entry even though the lock doesn't protect against + * multiple writers (see above). Holding ir_list_lock ensures that + * either svm_ir_list_add() will consume up-to-date entry information, + * or that this task will wait until svm_ir_list_add() completes to + * mark the vCPU as not running. + */ spin_lock_irqsave(&svm->ir_list_lock, flags); avic_update_iommu_vcpu_affinity(vcpu, -1, 0);

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] mtd: spi-nor: spansion: preserve CFR2V[7] when writing MEMLAT" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 1e611e104b9acb6310b8c684d5acee0e11ca7bd1 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091600-powdered-lanky-892a@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 1e611e104b9a ("mtd: spi-nor: spansion: preserve CFR2V[7] when writing MEMLAT") d534fd9787d5 ("mtd: spi-nor: spansion: use CLPEF as an alternative to CLSR") 4095f4d9225a ("mtd: spi-nor: Fix divide by zero for spi-nor-generic flashes") df6def86b9dc ("mtd: spi-nor: spansion: Add support for s25hl02gt and s25hs02gt") 91f3c430f622 ("mtd: spi-nor: spansion: Add a new ->ready() hook for multi-chip device") 6c01ae11130c ("mtd: spi-nor: spansion: Rework cypress_nor_get_page_size() for multi-chip device support") e570f7872a34 ("mtd: spi-nor: Allow post_sfdp hook to return errors") 120c94a67b26 ("mtd: spi-nor: spansion: Rename method to cypress_nor_get_page_size") a9180c298d35 ("mtd: spi-nor: spansion: Enable JFFS2 write buffer for S25FS256T") 4199c1719e24 ("mtd: spi-nor: spansion: Enable JFFS2 write buffer for Infineon s25hx SEMPER flash") 9fd0945fe6fa ("mtd: spi-nor: spansion: Enable JFFS2 write buffer for Infineon s28hx SEMPER flash") c87c9b11c53c ("mtd: spi-nor: spansion: Determine current address mode") 4e53ab0c292d ("mtd: spi-nor: Set the 4-Byte Address Mode method based on SFDP data") d75c22f376f6 ("mtd: spi-nor: core: Update name and description of spi_nor_set_4byte_addr_mode") f1f1976224f3 ("mtd: spi-nor: core: Update name and description of spansion_set_4byte_addr_mode") 288df4378319 ("mtd: spi-nor: core: Update name and description of micron_st_nor_set_4byte_addr_mode") 076aa4eac8b3 ("mtd: spi-nor: core: Move generic method to core - micron_st_nor_set_4byte_addr_mode") 79a4db50192c ("mtd: spi-nor: Delay the initialization of bank_size") 4eddee70140b ("mtd: spi-nor: Add a RWW flag") 6afcc84080c4 ("mtd: spi-nor: spansion: Add support for Infineon S25FS256T") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 1e611e104b9acb6310b8c684d5acee0e11ca7bd1 Mon Sep 17 00:00:00 2001 From: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> Date: Wed, 26 Jul 2023 10:52:48 +0300 Subject: [PATCH] mtd: spi-nor: spansion: preserve CFR2V[7] when writing MEMLAT CFR2V[7] is assigned to Flash's address mode (3- or 4-ybte) and must not be changed when writing MEMLAT (CFR2V[3:0]). CFR2V shall be used in a read, update, write back fashion. Fixes: c3266af101f2 ("mtd: spi-nor: spansion: add support for Cypress Semper flash") Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20230726075257.12985-3-tudor.ambarus@linaro.org Signed-off-by: Tudor Ambarus <tudor.ambarus(a)linaro.org> diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c index 6b2532ed053c..6460d2247bdf 100644 --- a/drivers/mtd/spi-nor/spansion.c +++ b/drivers/mtd/spi-nor/spansion.c @@ -4,6 +4,7 @@ * Copyright (C) 2014, Freescale Semiconductor, Inc. */ +#include <linux/bitfield.h> #include <linux/device.h> #include <linux/mtd/spi-nor.h> @@ -28,6 +29,7 @@ #define SPINOR_REG_CYPRESS_CFR2 0x3 #define SPINOR_REG_CYPRESS_CFR2V \ (SPINOR_REG_CYPRESS_VREG + SPINOR_REG_CYPRESS_CFR2) +#define SPINOR_REG_CYPRESS_CFR2_MEMLAT_MASK GENMASK(3, 0) #define SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24 0xb #define SPINOR_REG_CYPRESS_CFR2_ADRBYT BIT(7) #define SPINOR_REG_CYPRESS_CFR3 0x4 @@ -161,8 +163,18 @@ static int cypress_nor_octal_dtr_en(struct spi_nor *nor) int ret; u8 addr_mode_nbytes = nor->params->addr_mode_nbytes; + op = (struct spi_mem_op) + CYPRESS_NOR_RD_ANY_REG_OP(addr_mode_nbytes, + SPINOR_REG_CYPRESS_CFR2V, 0, buf); + + ret = spi_nor_read_any_reg(nor, &op, nor->reg_proto); + if (ret) + return ret; + /* Use 24 dummy cycles for memory array reads. */ - *buf = SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24; + *buf &= ~SPINOR_REG_CYPRESS_CFR2_MEMLAT_MASK; + *buf |= FIELD_PREP(SPINOR_REG_CYPRESS_CFR2_MEMLAT_MASK, + SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24); op = (struct spi_mem_op) CYPRESS_NOR_WR_ANY_REG_OP(addr_mode_nbytes, SPINOR_REG_CYPRESS_CFR2V, 1, buf);

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] mtd: spi-nor: spansion: preserve CFR2V[7] when writing MEMLAT" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 1e611e104b9acb6310b8c684d5acee0e11ca7bd1 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091659-unguarded-greeting-7dbb@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 1e611e104b9a ("mtd: spi-nor: spansion: preserve CFR2V[7] when writing MEMLAT") d534fd9787d5 ("mtd: spi-nor: spansion: use CLPEF as an alternative to CLSR") 4095f4d9225a ("mtd: spi-nor: Fix divide by zero for spi-nor-generic flashes") df6def86b9dc ("mtd: spi-nor: spansion: Add support for s25hl02gt and s25hs02gt") 91f3c430f622 ("mtd: spi-nor: spansion: Add a new ->ready() hook for multi-chip device") 6c01ae11130c ("mtd: spi-nor: spansion: Rework cypress_nor_get_page_size() for multi-chip device support") e570f7872a34 ("mtd: spi-nor: Allow post_sfdp hook to return errors") 120c94a67b26 ("mtd: spi-nor: spansion: Rename method to cypress_nor_get_page_size") a9180c298d35 ("mtd: spi-nor: spansion: Enable JFFS2 write buffer for S25FS256T") 4199c1719e24 ("mtd: spi-nor: spansion: Enable JFFS2 write buffer for Infineon s25hx SEMPER flash") 9fd0945fe6fa ("mtd: spi-nor: spansion: Enable JFFS2 write buffer for Infineon s28hx SEMPER flash") c87c9b11c53c ("mtd: spi-nor: spansion: Determine current address mode") 4e53ab0c292d ("mtd: spi-nor: Set the 4-Byte Address Mode method based on SFDP data") d75c22f376f6 ("mtd: spi-nor: core: Update name and description of spi_nor_set_4byte_addr_mode") f1f1976224f3 ("mtd: spi-nor: core: Update name and description of spansion_set_4byte_addr_mode") 288df4378319 ("mtd: spi-nor: core: Update name and description of micron_st_nor_set_4byte_addr_mode") 076aa4eac8b3 ("mtd: spi-nor: core: Move generic method to core - micron_st_nor_set_4byte_addr_mode") 79a4db50192c ("mtd: spi-nor: Delay the initialization of bank_size") 4eddee70140b ("mtd: spi-nor: Add a RWW flag") 6afcc84080c4 ("mtd: spi-nor: spansion: Add support for Infineon S25FS256T") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 1e611e104b9acb6310b8c684d5acee0e11ca7bd1 Mon Sep 17 00:00:00 2001 From: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> Date: Wed, 26 Jul 2023 10:52:48 +0300 Subject: [PATCH] mtd: spi-nor: spansion: preserve CFR2V[7] when writing MEMLAT CFR2V[7] is assigned to Flash's address mode (3- or 4-ybte) and must not be changed when writing MEMLAT (CFR2V[3:0]). CFR2V shall be used in a read, update, write back fashion. Fixes: c3266af101f2 ("mtd: spi-nor: spansion: add support for Cypress Semper flash") Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20230726075257.12985-3-tudor.ambarus@linaro.org Signed-off-by: Tudor Ambarus <tudor.ambarus(a)linaro.org> diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c index 6b2532ed053c..6460d2247bdf 100644 --- a/drivers/mtd/spi-nor/spansion.c +++ b/drivers/mtd/spi-nor/spansion.c @@ -4,6 +4,7 @@ * Copyright (C) 2014, Freescale Semiconductor, Inc. */ +#include <linux/bitfield.h> #include <linux/device.h> #include <linux/mtd/spi-nor.h> @@ -28,6 +29,7 @@ #define SPINOR_REG_CYPRESS_CFR2 0x3 #define SPINOR_REG_CYPRESS_CFR2V \ (SPINOR_REG_CYPRESS_VREG + SPINOR_REG_CYPRESS_CFR2) +#define SPINOR_REG_CYPRESS_CFR2_MEMLAT_MASK GENMASK(3, 0) #define SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24 0xb #define SPINOR_REG_CYPRESS_CFR2_ADRBYT BIT(7) #define SPINOR_REG_CYPRESS_CFR3 0x4 @@ -161,8 +163,18 @@ static int cypress_nor_octal_dtr_en(struct spi_nor *nor) int ret; u8 addr_mode_nbytes = nor->params->addr_mode_nbytes; + op = (struct spi_mem_op) + CYPRESS_NOR_RD_ANY_REG_OP(addr_mode_nbytes, + SPINOR_REG_CYPRESS_CFR2V, 0, buf); + + ret = spi_nor_read_any_reg(nor, &op, nor->reg_proto); + if (ret) + return ret; + /* Use 24 dummy cycles for memory array reads. */ - *buf = SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24; + *buf &= ~SPINOR_REG_CYPRESS_CFR2_MEMLAT_MASK; + *buf |= FIELD_PREP(SPINOR_REG_CYPRESS_CFR2_MEMLAT_MASK, + SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24); op = (struct spi_mem_op) CYPRESS_NOR_WR_ANY_REG_OP(addr_mode_nbytes, SPINOR_REG_CYPRESS_CFR2V, 1, buf);

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] mtd: spi-nor: spansion: preserve CFR2V[7] when writing MEMLAT" failed to apply to 6.5-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.5-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.5.y git checkout FETCH_HEAD git cherry-pick -x 1e611e104b9acb6310b8c684d5acee0e11ca7bd1 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091658-glare-spinster-90d6@gregkh' --subject-prefix 'PATCH 6.5.y' HEAD^.. Possible dependencies: 1e611e104b9a ("mtd: spi-nor: spansion: preserve CFR2V[7] when writing MEMLAT") d534fd9787d5 ("mtd: spi-nor: spansion: use CLPEF as an alternative to CLSR") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 1e611e104b9acb6310b8c684d5acee0e11ca7bd1 Mon Sep 17 00:00:00 2001 From: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> Date: Wed, 26 Jul 2023 10:52:48 +0300 Subject: [PATCH] mtd: spi-nor: spansion: preserve CFR2V[7] when writing MEMLAT CFR2V[7] is assigned to Flash's address mode (3- or 4-ybte) and must not be changed when writing MEMLAT (CFR2V[3:0]). CFR2V shall be used in a read, update, write back fashion. Fixes: c3266af101f2 ("mtd: spi-nor: spansion: add support for Cypress Semper flash") Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20230726075257.12985-3-tudor.ambarus@linaro.org Signed-off-by: Tudor Ambarus <tudor.ambarus(a)linaro.org> diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c index 6b2532ed053c..6460d2247bdf 100644 --- a/drivers/mtd/spi-nor/spansion.c +++ b/drivers/mtd/spi-nor/spansion.c @@ -4,6 +4,7 @@ * Copyright (C) 2014, Freescale Semiconductor, Inc. */ +#include <linux/bitfield.h> #include <linux/device.h> #include <linux/mtd/spi-nor.h> @@ -28,6 +29,7 @@ #define SPINOR_REG_CYPRESS_CFR2 0x3 #define SPINOR_REG_CYPRESS_CFR2V \ (SPINOR_REG_CYPRESS_VREG + SPINOR_REG_CYPRESS_CFR2) +#define SPINOR_REG_CYPRESS_CFR2_MEMLAT_MASK GENMASK(3, 0) #define SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24 0xb #define SPINOR_REG_CYPRESS_CFR2_ADRBYT BIT(7) #define SPINOR_REG_CYPRESS_CFR3 0x4 @@ -161,8 +163,18 @@ static int cypress_nor_octal_dtr_en(struct spi_nor *nor) int ret; u8 addr_mode_nbytes = nor->params->addr_mode_nbytes; + op = (struct spi_mem_op) + CYPRESS_NOR_RD_ANY_REG_OP(addr_mode_nbytes, + SPINOR_REG_CYPRESS_CFR2V, 0, buf); + + ret = spi_nor_read_any_reg(nor, &op, nor->reg_proto); + if (ret) + return ret; + /* Use 24 dummy cycles for memory array reads. */ - *buf = SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24; + *buf &= ~SPINOR_REG_CYPRESS_CFR2_MEMLAT_MASK; + *buf |= FIELD_PREP(SPINOR_REG_CYPRESS_CFR2_MEMLAT_MASK, + SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24); op = (struct spi_mem_op) CYPRESS_NOR_WR_ANY_REG_OP(addr_mode_nbytes, SPINOR_REG_CYPRESS_CFR2V, 1, buf);

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] btrfs: zoned: activate metadata block group on write time" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 13bb483d32abb6f8ebd40141d87eb68f11cc2dd2 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091640-upstroke-gopher-c666@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 13bb483d32ab ("btrfs: zoned: activate metadata block group on write time") 0356ad41e0dd ("btrfs: zoned: defer advancing meta write pointer") 2ad8c0510a96 ("btrfs: zoned: return int from btrfs_check_meta_write_pointer") 7db94301a980 ("btrfs: zoned: introduce block group context to btrfs_eb_write_context") 861093eff4f0 ("btrfs: introduce struct to consolidate extent buffer write context") 71df088c1cc0 ("btrfs: defer splitting of ordered extents until I/O completion") a6f3e205e491 ("btrfs: move split_extent_map to extent_map.c") cbfce4c7fbde ("btrfs: optimize the logical to physical mapping for zoned writes") 5cfe76f846d5 ("btrfs: rename the bytenr field in struct btrfs_ordered_sum to logical") 6e4b2479ab38 ("btrfs: mark the len field in struct btrfs_ordered_sum as unsigned") 50b21d7a066f ("btrfs: submit a writeback bio per extent_buffer") 9fdd160160f0 ("btrfs: return bool from lock_extent_buffer_for_io") adbe7e388e42 ("btrfs: use SECTOR_SHIFT to convert LBA to physical offset") 7edd339c8a41 ("btrfs: pass an ordered_extent to btrfs_extract_ordered_extent") 2e38a84bc6ab ("btrfs: simplify extent map splitting and rename split_zoned_em") 11d33ab6c1f3 ("btrfs: simplify splitting logic in btrfs_extract_ordered_extent") e44ca71cfe07 ("btrfs: move ordered_extent internal sanity checks into btrfs_split_ordered_extent") 2cef0c79bb81 ("btrfs: make btrfs_split_bio work on struct btrfs_bio") ae42a154ca89 ("btrfs: pass a btrfs_bio to btrfs_submit_bio") 34f888ce3a35 ("btrfs: cleanup main loop in btrfs_encoded_read_regular_fill_pages") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 13bb483d32abb6f8ebd40141d87eb68f11cc2dd2 Mon Sep 17 00:00:00 2001 From: Naohiro Aota <naohiro.aota(a)wdc.com> Date: Tue, 8 Aug 2023 01:12:37 +0900 Subject: [PATCH] btrfs: zoned: activate metadata block group on write time In the current implementation, block groups are activated at reservation time to ensure that all reserved bytes can be written to an active metadata block group. However, this approach has proven to be less efficient, as it activates block groups more frequently than necessary, putting pressure on the active zone resource and leading to potential issues such as early ENOSPC or hung_task. Another drawback of the current method is that it hampers metadata over-commit, and necessitates additional flush operations and block group allocations, resulting in decreased overall performance. To address these issues, this commit introduces a write-time activation of metadata and system block group. This involves reserving at least one active block group specifically for a metadata and system block group. Since metadata write-out is always allocated sequentially, when we need to write to a non-active block group, we can wait for the ongoing IOs to complete, activate a new block group, and then proceed with writing to the new block group. Fixes: b09315139136 ("btrfs: zoned: activate metadata block group on flush_space") CC: stable(a)vger.kernel.org # 6.1+ Signed-off-by: Naohiro Aota <naohiro.aota(a)wdc.com> Signed-off-by: David Sterba <dsterba(a)suse.com> diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index a127865f49f9..b0e432c30e1d 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -4287,6 +4287,17 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info) struct btrfs_caching_control *caching_ctl; struct rb_node *n; + if (btrfs_is_zoned(info)) { + if (info->active_meta_bg) { + btrfs_put_block_group(info->active_meta_bg); + info->active_meta_bg = NULL; + } + if (info->active_system_bg) { + btrfs_put_block_group(info->active_system_bg); + info->active_system_bg = NULL; + } + } + write_lock(&info->block_group_cache_lock); while (!list_empty(&info->caching_block_groups)) { caching_ctl = list_entry(info->caching_block_groups.next, diff --git a/fs/btrfs/fs.h b/fs/btrfs/fs.h index ef07c6c252d8..a523d64d5491 100644 --- a/fs/btrfs/fs.h +++ b/fs/btrfs/fs.h @@ -770,6 +770,9 @@ struct btrfs_fs_info { u64 data_reloc_bg; struct mutex zoned_data_reloc_io_lock; + struct btrfs_block_group *active_meta_bg; + struct btrfs_block_group *active_system_bg; + u64 nr_global_roots; spinlock_t zone_active_bgs_lock; diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c index fc69041bb6b4..099cb6a6d3b3 100644 --- a/fs/btrfs/zoned.c +++ b/fs/btrfs/zoned.c @@ -65,6 +65,9 @@ #define SUPER_INFO_SECTORS ((u64)BTRFS_SUPER_INFO_SIZE >> SECTOR_SHIFT) +static void wait_eb_writebacks(struct btrfs_block_group *block_group); +static int do_zone_finish(struct btrfs_block_group *block_group, bool fully_written); + static inline bool sb_zone_is_full(const struct blk_zone *zone) { return (zone->cond == BLK_ZONE_COND_FULL) || @@ -1747,6 +1750,62 @@ void btrfs_finish_ordered_zoned(struct btrfs_ordered_extent *ordered) } } +static bool check_bg_is_active(struct btrfs_eb_write_context *ctx, + struct btrfs_block_group **active_bg) +{ + const struct writeback_control *wbc = ctx->wbc; + struct btrfs_block_group *block_group = ctx->zoned_bg; + struct btrfs_fs_info *fs_info = block_group->fs_info; + + if (test_bit(BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE, &block_group->runtime_flags)) + return true; + + if (fs_info->treelog_bg == block_group->start) { + if (!btrfs_zone_activate(block_group)) { + int ret_fin = btrfs_zone_finish_one_bg(fs_info); + + if (ret_fin != 1 || !btrfs_zone_activate(block_group)) + return false; + } + } else if (*active_bg != block_group) { + struct btrfs_block_group *tgt = *active_bg; + + /* zoned_meta_io_lock protects fs_info->active_{meta,system}_bg. */ + lockdep_assert_held(&fs_info->zoned_meta_io_lock); + + if (tgt) { + /* + * If there is an unsent IO left in the allocated area, + * we cannot wait for them as it may cause a deadlock. + */ + if (tgt->meta_write_pointer < tgt->start + tgt->alloc_offset) { + if (wbc->sync_mode == WB_SYNC_NONE || + (wbc->sync_mode == WB_SYNC_ALL && !wbc->for_sync)) + return false; + } + + /* Pivot active metadata/system block group. */ + btrfs_zoned_meta_io_unlock(fs_info); + wait_eb_writebacks(tgt); + do_zone_finish(tgt, true); + btrfs_zoned_meta_io_lock(fs_info); + if (*active_bg == tgt) { + btrfs_put_block_group(tgt); + *active_bg = NULL; + } + } + if (!btrfs_zone_activate(block_group)) + return false; + if (*active_bg != block_group) { + ASSERT(*active_bg == NULL); + *active_bg = block_group; + btrfs_get_block_group(block_group); + } + } + + return true; +} + /* * Check if @ctx->eb is aligned to the write pointer. * @@ -1781,8 +1840,26 @@ int btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info, ctx->zoned_bg = block_group; } - if (block_group->meta_write_pointer == eb->start) - return 0; + if (block_group->meta_write_pointer == eb->start) { + struct btrfs_block_group **tgt; + + if (!test_bit(BTRFS_FS_ACTIVE_ZONE_TRACKING, &fs_info->flags)) + return 0; + + if (block_group->flags & BTRFS_BLOCK_GROUP_SYSTEM) + tgt = &fs_info->active_system_bg; + else + tgt = &fs_info->active_meta_bg; + if (check_bg_is_active(ctx, tgt)) + return 0; + } + + /* + * Since we may release fs_info->zoned_meta_io_lock, someone can already + * start writing this eb. In that case, we can just bail out. + */ + if (block_group->meta_write_pointer > eb->start) + return -EBUSY; /* If for_sync, this hole will be filled with trasnsaction commit. */ if (wbc->sync_mode == WB_SYNC_ALL && !wbc->for_sync)

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] btrfs: zoned: activate metadata block group on write time" failed to apply to 6.5-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.5-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.5.y git checkout FETCH_HEAD git cherry-pick -x 13bb483d32abb6f8ebd40141d87eb68f11cc2dd2 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091639-mundane-justice-4caa@gregkh' --subject-prefix 'PATCH 6.5.y' HEAD^.. Possible dependencies: 13bb483d32ab ("btrfs: zoned: activate metadata block group on write time") 0356ad41e0dd ("btrfs: zoned: defer advancing meta write pointer") 2ad8c0510a96 ("btrfs: zoned: return int from btrfs_check_meta_write_pointer") 7db94301a980 ("btrfs: zoned: introduce block group context to btrfs_eb_write_context") 861093eff4f0 ("btrfs: introduce struct to consolidate extent buffer write context") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 13bb483d32abb6f8ebd40141d87eb68f11cc2dd2 Mon Sep 17 00:00:00 2001 From: Naohiro Aota <naohiro.aota(a)wdc.com> Date: Tue, 8 Aug 2023 01:12:37 +0900 Subject: [PATCH] btrfs: zoned: activate metadata block group on write time In the current implementation, block groups are activated at reservation time to ensure that all reserved bytes can be written to an active metadata block group. However, this approach has proven to be less efficient, as it activates block groups more frequently than necessary, putting pressure on the active zone resource and leading to potential issues such as early ENOSPC or hung_task. Another drawback of the current method is that it hampers metadata over-commit, and necessitates additional flush operations and block group allocations, resulting in decreased overall performance. To address these issues, this commit introduces a write-time activation of metadata and system block group. This involves reserving at least one active block group specifically for a metadata and system block group. Since metadata write-out is always allocated sequentially, when we need to write to a non-active block group, we can wait for the ongoing IOs to complete, activate a new block group, and then proceed with writing to the new block group. Fixes: b09315139136 ("btrfs: zoned: activate metadata block group on flush_space") CC: stable(a)vger.kernel.org # 6.1+ Signed-off-by: Naohiro Aota <naohiro.aota(a)wdc.com> Signed-off-by: David Sterba <dsterba(a)suse.com> diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index a127865f49f9..b0e432c30e1d 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -4287,6 +4287,17 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info) struct btrfs_caching_control *caching_ctl; struct rb_node *n; + if (btrfs_is_zoned(info)) { + if (info->active_meta_bg) { + btrfs_put_block_group(info->active_meta_bg); + info->active_meta_bg = NULL; + } + if (info->active_system_bg) { + btrfs_put_block_group(info->active_system_bg); + info->active_system_bg = NULL; + } + } + write_lock(&info->block_group_cache_lock); while (!list_empty(&info->caching_block_groups)) { caching_ctl = list_entry(info->caching_block_groups.next, diff --git a/fs/btrfs/fs.h b/fs/btrfs/fs.h index ef07c6c252d8..a523d64d5491 100644 --- a/fs/btrfs/fs.h +++ b/fs/btrfs/fs.h @@ -770,6 +770,9 @@ struct btrfs_fs_info { u64 data_reloc_bg; struct mutex zoned_data_reloc_io_lock; + struct btrfs_block_group *active_meta_bg; + struct btrfs_block_group *active_system_bg; + u64 nr_global_roots; spinlock_t zone_active_bgs_lock; diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c index fc69041bb6b4..099cb6a6d3b3 100644 --- a/fs/btrfs/zoned.c +++ b/fs/btrfs/zoned.c @@ -65,6 +65,9 @@ #define SUPER_INFO_SECTORS ((u64)BTRFS_SUPER_INFO_SIZE >> SECTOR_SHIFT) +static void wait_eb_writebacks(struct btrfs_block_group *block_group); +static int do_zone_finish(struct btrfs_block_group *block_group, bool fully_written); + static inline bool sb_zone_is_full(const struct blk_zone *zone) { return (zone->cond == BLK_ZONE_COND_FULL) || @@ -1747,6 +1750,62 @@ void btrfs_finish_ordered_zoned(struct btrfs_ordered_extent *ordered) } } +static bool check_bg_is_active(struct btrfs_eb_write_context *ctx, + struct btrfs_block_group **active_bg) +{ + const struct writeback_control *wbc = ctx->wbc; + struct btrfs_block_group *block_group = ctx->zoned_bg; + struct btrfs_fs_info *fs_info = block_group->fs_info; + + if (test_bit(BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE, &block_group->runtime_flags)) + return true; + + if (fs_info->treelog_bg == block_group->start) { + if (!btrfs_zone_activate(block_group)) { + int ret_fin = btrfs_zone_finish_one_bg(fs_info); + + if (ret_fin != 1 || !btrfs_zone_activate(block_group)) + return false; + } + } else if (*active_bg != block_group) { + struct btrfs_block_group *tgt = *active_bg; + + /* zoned_meta_io_lock protects fs_info->active_{meta,system}_bg. */ + lockdep_assert_held(&fs_info->zoned_meta_io_lock); + + if (tgt) { + /* + * If there is an unsent IO left in the allocated area, + * we cannot wait for them as it may cause a deadlock. + */ + if (tgt->meta_write_pointer < tgt->start + tgt->alloc_offset) { + if (wbc->sync_mode == WB_SYNC_NONE || + (wbc->sync_mode == WB_SYNC_ALL && !wbc->for_sync)) + return false; + } + + /* Pivot active metadata/system block group. */ + btrfs_zoned_meta_io_unlock(fs_info); + wait_eb_writebacks(tgt); + do_zone_finish(tgt, true); + btrfs_zoned_meta_io_lock(fs_info); + if (*active_bg == tgt) { + btrfs_put_block_group(tgt); + *active_bg = NULL; + } + } + if (!btrfs_zone_activate(block_group)) + return false; + if (*active_bg != block_group) { + ASSERT(*active_bg == NULL); + *active_bg = block_group; + btrfs_get_block_group(block_group); + } + } + + return true; +} + /* * Check if @ctx->eb is aligned to the write pointer. * @@ -1781,8 +1840,26 @@ int btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info, ctx->zoned_bg = block_group; } - if (block_group->meta_write_pointer == eb->start) - return 0; + if (block_group->meta_write_pointer == eb->start) { + struct btrfs_block_group **tgt; + + if (!test_bit(BTRFS_FS_ACTIVE_ZONE_TRACKING, &fs_info->flags)) + return 0; + + if (block_group->flags & BTRFS_BLOCK_GROUP_SYSTEM) + tgt = &fs_info->active_system_bg; + else + tgt = &fs_info->active_meta_bg; + if (check_bg_is_active(ctx, tgt)) + return 0; + } + + /* + * Since we may release fs_info->zoned_meta_io_lock, someone can already + * start writing this eb. In that case, we can just bail out. + */ + if (block_group->meta_write_pointer > eb->start) + return -EBUSY; /* If for_sync, this hole will be filled with trasnsaction commit. */ if (wbc->sync_mode == WB_SYNC_ALL && !wbc->for_sync)

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] fuse: nlookup missing decrement in fuse_direntplus_link" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x b8bd342d50cbf606666488488f9fea374aceb2d5 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091602-untapped-scapegoat-dd85@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: b8bd342d50cb ("fuse: nlookup missing decrement in fuse_direntplus_link") d123d8e1833c ("fuse: split out readdir.c") 63576c13bd17 ("fuse: fix initial parallel dirops") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From b8bd342d50cbf606666488488f9fea374aceb2d5 Mon Sep 17 00:00:00 2001 From: ruanmeisi <ruan.meisi(a)zte.com.cn> Date: Tue, 25 Apr 2023 19:13:54 +0800 Subject: [PATCH] fuse: nlookup missing decrement in fuse_direntplus_link During our debugging of glusterfs, we found an Assertion failed error: inode_lookup >= nlookup, which was caused by the nlookup value in the kernel being greater than that in the FUSE file system. The issue was introduced by fuse_direntplus_link, where in the function, fuse_iget increments nlookup, and if d_splice_alias returns failure, fuse_direntplus_link returns failure without decrementing nlookup https://github.com/gluster/glusterfs/pull/4081 Signed-off-by: ruanmeisi <ruan.meisi(a)zte.com.cn> Fixes: 0b05b18381ee ("fuse: implement NFS-like readdirplus support") Cc: <stable(a)vger.kernel.org> # v3.9 Signed-off-by: Miklos Szeredi <mszeredi(a)redhat.com> diff --git a/fs/fuse/readdir.c b/fs/fuse/readdir.c index dc603479b30e..b3d498163f97 100644 --- a/fs/fuse/readdir.c +++ b/fs/fuse/readdir.c @@ -243,8 +243,16 @@ static int fuse_direntplus_link(struct file *file, dput(dentry); dentry = alias; } - if (IS_ERR(dentry)) + if (IS_ERR(dentry)) { + if (!IS_ERR(inode)) { + struct fuse_inode *fi = get_fuse_inode(inode); + + spin_lock(&fi->lock); + fi->nlookup--; + spin_unlock(&fi->lock); + } return PTR_ERR(dentry); + } } if (fc->readdirplus_auto) set_bit(FUSE_I_INIT_RDPLUS, &get_fuse_inode(inode)->state);

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ext4: don't use CR_BEST_AVAIL_LEN for non-regular files" failed to apply to 6.5-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.5-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.5.y git checkout FETCH_HEAD git cherry-pick -x 772c9f691dcf3a487f29ddb90a5a15c78d7328e1 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091649-ember-remindful-28e0@gregkh' --subject-prefix 'PATCH 6.5.y' HEAD^.. Possible dependencies: 772c9f691dcf ("ext4: don't use CR_BEST_AVAIL_LEN for non-regular files") b50675a4a6a6 ("ext4: return found group directly in ext4_mb_choose_next_group_goal_fast") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 772c9f691dcf3a487f29ddb90a5a15c78d7328e1 Mon Sep 17 00:00:00 2001 From: Ritesh Harjani <ritesh.list(a)gmail.com> Date: Sun, 16 Jul 2023 19:33:34 +0530 Subject: [PATCH] ext4: don't use CR_BEST_AVAIL_LEN for non-regular files Using CR_BEST_AVAIL_LEN only make sense for regular files, as for non-regular files we never normalize the allocation request length i.e. goal len is same as original length (ac_g_ex.fe_len == ac_o_ex.fe_len). Hence there is no scope of trimming the goal length to make it satisfy original request len. Thus this patch avoids using CR_BEST_AVAIL_LEN criteria for non-regular files request. Cc: stable(a)kernel.org Fixes: 33122aa930f1 ("ext4: Add allocation criteria 1.5 (CR1_5)") Reported-by: Eric Whitney <enwlinux(a)gmail.com> Signed-off-by: Ritesh Harjani (IBM) <ritesh.list(a)gmail.com> Tested-by: Eric Whitney <enwlinux(a)gmail.com> Link: https://lore.kernel.org/r/2a694c748ff8b8c4b416995a24f06f07b55047a8.16895160… Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index b89b5f0816e7..3d5b0b71d7f5 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -966,7 +966,18 @@ static void ext4_mb_choose_next_group_goal_fast(struct ext4_allocation_context * } } - *new_cr = CR_BEST_AVAIL_LEN; + /* + * CR_BEST_AVAIL_LEN works based on the concept that we have + * a larger normalized goal len request which can be trimmed to + * a smaller goal len such that it can still satisfy original + * request len. However, allocation request for non-regular + * files never gets normalized. + * See function ext4_mb_normalize_request() (EXT4_MB_HINT_DATA). + */ + if (ac->ac_flags & EXT4_MB_HINT_DATA) + *new_cr = CR_BEST_AVAIL_LEN; + else + *new_cr = CR_GOAL_LEN_SLOW; } /*

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x bc056e7163ac7db945366de219745cf94f32a3e6 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091649-spotlight-ounce-dd0d@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: bc056e7163ac ("ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow") 7e170922f06b ("ext4: Add allocation criteria 1.5 (CR1_5)") 1b4200112108 ("ext4: Avoid scanning smaller extents in BG during CR1") 3ef5d2638796 ("ext4: Add counter to track successful allocation of goal length") 4eb7a4a1a33b ("ext4: Convert mballoc cr (criteria) to enum") c3defd99d58c ("ext4: treat stripe in block unit") 361eb69fc99f ("ext4: Remove the logic to trim inode PAs") 3872778664e3 ("ext4: Use rbtrees to manage PAs instead of inode i_prealloc_list") a8e38fd37cff ("ext4: Convert pa->pa_inode_list and pa->pa_obj_lock into a union") 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()") 0830344c953a ("ext4: Abstract out overlap fix/check logic in ext4_mb_normalize_request()") 7692094ac513 ("ext4: Move overlap assert logic into a separate function") bcf434992145 ("ext4: Refactor code in ext4_mb_normalize_request() and ext4_mb_use_preallocated()") e86a718228b6 ("ext4: Stop searching if PA doesn't satisfy non-extent file") 91a48aaf59d0 ("ext4: avoid unnecessary pointer dereference in ext4_mb_normalize_request") 83e80a6e3543 ("ext4: use buckets for cr 1 block scan instead of rbtree") 4fca50d440cc ("ext4: make mballoc try target group first even with mb_optimize_scan") cf4ff938b47f ("ext4: correct the judgment of BUG in ext4_mb_normalize_request") 359745d78351 ("proc: remove PDE_DATA() completely") 6dfbbae14a7b ("fs: proc: store PDE()->data into inode->i_private") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From bc056e7163ac7db945366de219745cf94f32a3e6 Mon Sep 17 00:00:00 2001 From: Baokun Li <libaokun1(a)huawei.com> Date: Mon, 24 Jul 2023 20:10:58 +0800 Subject: [PATCH] ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow When we calculate the end position of ext4_free_extent, this position may be exactly where ext4_lblk_t (i.e. uint) overflows. For example, if ac_g_ex.fe_logical is 4294965248 and ac_orig_goal_len is 2048, then the computed end is 0x100000000, which is 0. If ac->ac_o_ex.fe_logical is not the first case of adjusting the best extent, that is, new_bex_end > 0, the following BUG_ON will be triggered: ========================================================= kernel BUG at fs/ext4/mballoc.c:5116! invalid opcode: 0000 [#1] PREEMPT SMP PTI CPU: 3 PID: 673 Comm: xfs_io Tainted: G E 6.5.0-rc1+ #279 RIP: 0010:ext4_mb_new_inode_pa+0xc5/0x430 Call Trace: <TASK> ext4_mb_use_best_found+0x203/0x2f0 ext4_mb_try_best_found+0x163/0x240 ext4_mb_regular_allocator+0x158/0x1550 ext4_mb_new_blocks+0x86a/0xe10 ext4_ext_map_blocks+0xb0c/0x13a0 ext4_map_blocks+0x2cd/0x8f0 ext4_iomap_begin+0x27b/0x400 iomap_iter+0x222/0x3d0 __iomap_dio_rw+0x243/0xcb0 iomap_dio_rw+0x16/0x80 ========================================================= A simple reproducer demonstrating the problem: mkfs.ext4 -F /dev/sda -b 4096 100M mount /dev/sda /tmp/test fallocate -l1M /tmp/test/tmp fallocate -l10M /tmp/test/file fallocate -i -o 1M -l16777203M /tmp/test/file fsstress -d /tmp/test -l 0 -n 100000 -p 8 & sleep 10 && killall -9 fsstress rm -f /tmp/test/tmp xfs_io -c "open -ad /tmp/test/file" -c "pwrite -S 0xff 0 8192" We simply refactor the logic for adjusting the best extent by adding a temporary ext4_free_extent ex and use extent_logical_end() to avoid overflow, which also simplifies the code. Cc: stable(a)kernel.org # 6.4 Fixes: 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()") Signed-off-by: Baokun Li <libaokun1(a)huawei.com> Reviewed-by: Ritesh Harjani (IBM) <ritesh.list(a)gmail.com> Link: https://lore.kernel.org/r/20230724121059.11834-3-libaokun1@huawei.com Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 4cb13b3e41b3..86bce870dc5a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5177,8 +5177,11 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) pa = ac->ac_pa; if (ac->ac_b_ex.fe_len < ac->ac_orig_goal_len) { - int new_bex_start; - int new_bex_end; + struct ext4_free_extent ex = { + .fe_logical = ac->ac_g_ex.fe_logical, + .fe_len = ac->ac_orig_goal_len, + }; + loff_t orig_goal_end = extent_logical_end(sbi, &ex); /* we can't allocate as much as normalizer wants. * so, found space must get proper lstart @@ -5197,29 +5200,23 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) * still cover original start * 3. Else, keep the best ex at start of original request. */ - new_bex_end = ac->ac_g_ex.fe_logical + - EXT4_C2B(sbi, ac->ac_orig_goal_len); - new_bex_start = new_bex_end - EXT4_C2B(sbi, ac->ac_b_ex.fe_len); - if (ac->ac_o_ex.fe_logical >= new_bex_start) - goto adjust_bex; + ex.fe_len = ac->ac_b_ex.fe_len; - new_bex_start = ac->ac_g_ex.fe_logical; - new_bex_end = - new_bex_start + EXT4_C2B(sbi, ac->ac_b_ex.fe_len); - if (ac->ac_o_ex.fe_logical < new_bex_end) + ex.fe_logical = orig_goal_end - EXT4_C2B(sbi, ex.fe_len); + if (ac->ac_o_ex.fe_logical >= ex.fe_logical) goto adjust_bex; - new_bex_start = ac->ac_o_ex.fe_logical; - new_bex_end = - new_bex_start + EXT4_C2B(sbi, ac->ac_b_ex.fe_len); + ex.fe_logical = ac->ac_g_ex.fe_logical; + if (ac->ac_o_ex.fe_logical < extent_logical_end(sbi, &ex)) + goto adjust_bex; + ex.fe_logical = ac->ac_o_ex.fe_logical; adjust_bex: - ac->ac_b_ex.fe_logical = new_bex_start; + ac->ac_b_ex.fe_logical = ex.fe_logical; BUG_ON(ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical); BUG_ON(ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len); - BUG_ON(new_bex_end > (ac->ac_g_ex.fe_logical + - EXT4_C2B(sbi, ac->ac_orig_goal_len))); + BUG_ON(extent_logical_end(sbi, &ex) > orig_goal_end); } pa->pa_lstart = ac->ac_b_ex.fe_logical;

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y git checkout FETCH_HEAD git cherry-pick -x bc056e7163ac7db945366de219745cf94f32a3e6 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091648-dinginess-legacy-08ce@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: bc056e7163ac ("ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow") 7e170922f06b ("ext4: Add allocation criteria 1.5 (CR1_5)") 1b4200112108 ("ext4: Avoid scanning smaller extents in BG during CR1") 3ef5d2638796 ("ext4: Add counter to track successful allocation of goal length") 4eb7a4a1a33b ("ext4: Convert mballoc cr (criteria) to enum") c3defd99d58c ("ext4: treat stripe in block unit") 361eb69fc99f ("ext4: Remove the logic to trim inode PAs") 3872778664e3 ("ext4: Use rbtrees to manage PAs instead of inode i_prealloc_list") a8e38fd37cff ("ext4: Convert pa->pa_inode_list and pa->pa_obj_lock into a union") 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()") 0830344c953a ("ext4: Abstract out overlap fix/check logic in ext4_mb_normalize_request()") 7692094ac513 ("ext4: Move overlap assert logic into a separate function") bcf434992145 ("ext4: Refactor code in ext4_mb_normalize_request() and ext4_mb_use_preallocated()") e86a718228b6 ("ext4: Stop searching if PA doesn't satisfy non-extent file") 91a48aaf59d0 ("ext4: avoid unnecessary pointer dereference in ext4_mb_normalize_request") 83e80a6e3543 ("ext4: use buckets for cr 1 block scan instead of rbtree") 4fca50d440cc ("ext4: make mballoc try target group first even with mb_optimize_scan") cf4ff938b47f ("ext4: correct the judgment of BUG in ext4_mb_normalize_request") 359745d78351 ("proc: remove PDE_DATA() completely") 6dfbbae14a7b ("fs: proc: store PDE()->data into inode->i_private") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From bc056e7163ac7db945366de219745cf94f32a3e6 Mon Sep 17 00:00:00 2001 From: Baokun Li <libaokun1(a)huawei.com> Date: Mon, 24 Jul 2023 20:10:58 +0800 Subject: [PATCH] ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow When we calculate the end position of ext4_free_extent, this position may be exactly where ext4_lblk_t (i.e. uint) overflows. For example, if ac_g_ex.fe_logical is 4294965248 and ac_orig_goal_len is 2048, then the computed end is 0x100000000, which is 0. If ac->ac_o_ex.fe_logical is not the first case of adjusting the best extent, that is, new_bex_end > 0, the following BUG_ON will be triggered: ========================================================= kernel BUG at fs/ext4/mballoc.c:5116! invalid opcode: 0000 [#1] PREEMPT SMP PTI CPU: 3 PID: 673 Comm: xfs_io Tainted: G E 6.5.0-rc1+ #279 RIP: 0010:ext4_mb_new_inode_pa+0xc5/0x430 Call Trace: <TASK> ext4_mb_use_best_found+0x203/0x2f0 ext4_mb_try_best_found+0x163/0x240 ext4_mb_regular_allocator+0x158/0x1550 ext4_mb_new_blocks+0x86a/0xe10 ext4_ext_map_blocks+0xb0c/0x13a0 ext4_map_blocks+0x2cd/0x8f0 ext4_iomap_begin+0x27b/0x400 iomap_iter+0x222/0x3d0 __iomap_dio_rw+0x243/0xcb0 iomap_dio_rw+0x16/0x80 ========================================================= A simple reproducer demonstrating the problem: mkfs.ext4 -F /dev/sda -b 4096 100M mount /dev/sda /tmp/test fallocate -l1M /tmp/test/tmp fallocate -l10M /tmp/test/file fallocate -i -o 1M -l16777203M /tmp/test/file fsstress -d /tmp/test -l 0 -n 100000 -p 8 & sleep 10 && killall -9 fsstress rm -f /tmp/test/tmp xfs_io -c "open -ad /tmp/test/file" -c "pwrite -S 0xff 0 8192" We simply refactor the logic for adjusting the best extent by adding a temporary ext4_free_extent ex and use extent_logical_end() to avoid overflow, which also simplifies the code. Cc: stable(a)kernel.org # 6.4 Fixes: 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()") Signed-off-by: Baokun Li <libaokun1(a)huawei.com> Reviewed-by: Ritesh Harjani (IBM) <ritesh.list(a)gmail.com> Link: https://lore.kernel.org/r/20230724121059.11834-3-libaokun1@huawei.com Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 4cb13b3e41b3..86bce870dc5a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5177,8 +5177,11 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) pa = ac->ac_pa; if (ac->ac_b_ex.fe_len < ac->ac_orig_goal_len) { - int new_bex_start; - int new_bex_end; + struct ext4_free_extent ex = { + .fe_logical = ac->ac_g_ex.fe_logical, + .fe_len = ac->ac_orig_goal_len, + }; + loff_t orig_goal_end = extent_logical_end(sbi, &ex); /* we can't allocate as much as normalizer wants. * so, found space must get proper lstart @@ -5197,29 +5200,23 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) * still cover original start * 3. Else, keep the best ex at start of original request. */ - new_bex_end = ac->ac_g_ex.fe_logical + - EXT4_C2B(sbi, ac->ac_orig_goal_len); - new_bex_start = new_bex_end - EXT4_C2B(sbi, ac->ac_b_ex.fe_len); - if (ac->ac_o_ex.fe_logical >= new_bex_start) - goto adjust_bex; + ex.fe_len = ac->ac_b_ex.fe_len; - new_bex_start = ac->ac_g_ex.fe_logical; - new_bex_end = - new_bex_start + EXT4_C2B(sbi, ac->ac_b_ex.fe_len); - if (ac->ac_o_ex.fe_logical < new_bex_end) + ex.fe_logical = orig_goal_end - EXT4_C2B(sbi, ex.fe_len); + if (ac->ac_o_ex.fe_logical >= ex.fe_logical) goto adjust_bex; - new_bex_start = ac->ac_o_ex.fe_logical; - new_bex_end = - new_bex_start + EXT4_C2B(sbi, ac->ac_b_ex.fe_len); + ex.fe_logical = ac->ac_g_ex.fe_logical; + if (ac->ac_o_ex.fe_logical < extent_logical_end(sbi, &ex)) + goto adjust_bex; + ex.fe_logical = ac->ac_o_ex.fe_logical; adjust_bex: - ac->ac_b_ex.fe_logical = new_bex_start; + ac->ac_b_ex.fe_logical = ex.fe_logical; BUG_ON(ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical); BUG_ON(ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len); - BUG_ON(new_bex_end > (ac->ac_g_ex.fe_logical + - EXT4_C2B(sbi, ac->ac_orig_goal_len))); + BUG_ON(extent_logical_end(sbi, &ex) > orig_goal_end); } pa->pa_lstart = ac->ac_b_ex.fe_logical;

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x bc056e7163ac7db945366de219745cf94f32a3e6 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091646-safely-preflight-9684@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: bc056e7163ac ("ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow") 7e170922f06b ("ext4: Add allocation criteria 1.5 (CR1_5)") 1b4200112108 ("ext4: Avoid scanning smaller extents in BG during CR1") 3ef5d2638796 ("ext4: Add counter to track successful allocation of goal length") 4eb7a4a1a33b ("ext4: Convert mballoc cr (criteria) to enum") c3defd99d58c ("ext4: treat stripe in block unit") 361eb69fc99f ("ext4: Remove the logic to trim inode PAs") 3872778664e3 ("ext4: Use rbtrees to manage PAs instead of inode i_prealloc_list") a8e38fd37cff ("ext4: Convert pa->pa_inode_list and pa->pa_obj_lock into a union") 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()") 0830344c953a ("ext4: Abstract out overlap fix/check logic in ext4_mb_normalize_request()") 7692094ac513 ("ext4: Move overlap assert logic into a separate function") bcf434992145 ("ext4: Refactor code in ext4_mb_normalize_request() and ext4_mb_use_preallocated()") e86a718228b6 ("ext4: Stop searching if PA doesn't satisfy non-extent file") 91a48aaf59d0 ("ext4: avoid unnecessary pointer dereference in ext4_mb_normalize_request") 83e80a6e3543 ("ext4: use buckets for cr 1 block scan instead of rbtree") 4fca50d440cc ("ext4: make mballoc try target group first even with mb_optimize_scan") cf4ff938b47f ("ext4: correct the judgment of BUG in ext4_mb_normalize_request") 359745d78351 ("proc: remove PDE_DATA() completely") 6dfbbae14a7b ("fs: proc: store PDE()->data into inode->i_private") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From bc056e7163ac7db945366de219745cf94f32a3e6 Mon Sep 17 00:00:00 2001 From: Baokun Li <libaokun1(a)huawei.com> Date: Mon, 24 Jul 2023 20:10:58 +0800 Subject: [PATCH] ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow When we calculate the end position of ext4_free_extent, this position may be exactly where ext4_lblk_t (i.e. uint) overflows. For example, if ac_g_ex.fe_logical is 4294965248 and ac_orig_goal_len is 2048, then the computed end is 0x100000000, which is 0. If ac->ac_o_ex.fe_logical is not the first case of adjusting the best extent, that is, new_bex_end > 0, the following BUG_ON will be triggered: ========================================================= kernel BUG at fs/ext4/mballoc.c:5116! invalid opcode: 0000 [#1] PREEMPT SMP PTI CPU: 3 PID: 673 Comm: xfs_io Tainted: G E 6.5.0-rc1+ #279 RIP: 0010:ext4_mb_new_inode_pa+0xc5/0x430 Call Trace: <TASK> ext4_mb_use_best_found+0x203/0x2f0 ext4_mb_try_best_found+0x163/0x240 ext4_mb_regular_allocator+0x158/0x1550 ext4_mb_new_blocks+0x86a/0xe10 ext4_ext_map_blocks+0xb0c/0x13a0 ext4_map_blocks+0x2cd/0x8f0 ext4_iomap_begin+0x27b/0x400 iomap_iter+0x222/0x3d0 __iomap_dio_rw+0x243/0xcb0 iomap_dio_rw+0x16/0x80 ========================================================= A simple reproducer demonstrating the problem: mkfs.ext4 -F /dev/sda -b 4096 100M mount /dev/sda /tmp/test fallocate -l1M /tmp/test/tmp fallocate -l10M /tmp/test/file fallocate -i -o 1M -l16777203M /tmp/test/file fsstress -d /tmp/test -l 0 -n 100000 -p 8 & sleep 10 && killall -9 fsstress rm -f /tmp/test/tmp xfs_io -c "open -ad /tmp/test/file" -c "pwrite -S 0xff 0 8192" We simply refactor the logic for adjusting the best extent by adding a temporary ext4_free_extent ex and use extent_logical_end() to avoid overflow, which also simplifies the code. Cc: stable(a)kernel.org # 6.4 Fixes: 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()") Signed-off-by: Baokun Li <libaokun1(a)huawei.com> Reviewed-by: Ritesh Harjani (IBM) <ritesh.list(a)gmail.com> Link: https://lore.kernel.org/r/20230724121059.11834-3-libaokun1@huawei.com Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 4cb13b3e41b3..86bce870dc5a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5177,8 +5177,11 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) pa = ac->ac_pa; if (ac->ac_b_ex.fe_len < ac->ac_orig_goal_len) { - int new_bex_start; - int new_bex_end; + struct ext4_free_extent ex = { + .fe_logical = ac->ac_g_ex.fe_logical, + .fe_len = ac->ac_orig_goal_len, + }; + loff_t orig_goal_end = extent_logical_end(sbi, &ex); /* we can't allocate as much as normalizer wants. * so, found space must get proper lstart @@ -5197,29 +5200,23 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) * still cover original start * 3. Else, keep the best ex at start of original request. */ - new_bex_end = ac->ac_g_ex.fe_logical + - EXT4_C2B(sbi, ac->ac_orig_goal_len); - new_bex_start = new_bex_end - EXT4_C2B(sbi, ac->ac_b_ex.fe_len); - if (ac->ac_o_ex.fe_logical >= new_bex_start) - goto adjust_bex; + ex.fe_len = ac->ac_b_ex.fe_len; - new_bex_start = ac->ac_g_ex.fe_logical; - new_bex_end = - new_bex_start + EXT4_C2B(sbi, ac->ac_b_ex.fe_len); - if (ac->ac_o_ex.fe_logical < new_bex_end) + ex.fe_logical = orig_goal_end - EXT4_C2B(sbi, ex.fe_len); + if (ac->ac_o_ex.fe_logical >= ex.fe_logical) goto adjust_bex; - new_bex_start = ac->ac_o_ex.fe_logical; - new_bex_end = - new_bex_start + EXT4_C2B(sbi, ac->ac_b_ex.fe_len); + ex.fe_logical = ac->ac_g_ex.fe_logical; + if (ac->ac_o_ex.fe_logical < extent_logical_end(sbi, &ex)) + goto adjust_bex; + ex.fe_logical = ac->ac_o_ex.fe_logical; adjust_bex: - ac->ac_b_ex.fe_logical = new_bex_start; + ac->ac_b_ex.fe_logical = ex.fe_logical; BUG_ON(ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical); BUG_ON(ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len); - BUG_ON(new_bex_end > (ac->ac_g_ex.fe_logical + - EXT4_C2B(sbi, ac->ac_orig_goal_len))); + BUG_ON(extent_logical_end(sbi, &ex) > orig_goal_end); } pa->pa_lstart = ac->ac_b_ex.fe_logical;

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x bc056e7163ac7db945366de219745cf94f32a3e6 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091644-chamomile-presoak-599f@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: bc056e7163ac ("ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow") 7e170922f06b ("ext4: Add allocation criteria 1.5 (CR1_5)") 1b4200112108 ("ext4: Avoid scanning smaller extents in BG during CR1") 3ef5d2638796 ("ext4: Add counter to track successful allocation of goal length") 4eb7a4a1a33b ("ext4: Convert mballoc cr (criteria) to enum") c3defd99d58c ("ext4: treat stripe in block unit") 361eb69fc99f ("ext4: Remove the logic to trim inode PAs") 3872778664e3 ("ext4: Use rbtrees to manage PAs instead of inode i_prealloc_list") a8e38fd37cff ("ext4: Convert pa->pa_inode_list and pa->pa_obj_lock into a union") 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()") 0830344c953a ("ext4: Abstract out overlap fix/check logic in ext4_mb_normalize_request()") 7692094ac513 ("ext4: Move overlap assert logic into a separate function") bcf434992145 ("ext4: Refactor code in ext4_mb_normalize_request() and ext4_mb_use_preallocated()") e86a718228b6 ("ext4: Stop searching if PA doesn't satisfy non-extent file") 91a48aaf59d0 ("ext4: avoid unnecessary pointer dereference in ext4_mb_normalize_request") 83e80a6e3543 ("ext4: use buckets for cr 1 block scan instead of rbtree") 4fca50d440cc ("ext4: make mballoc try target group first even with mb_optimize_scan") cf4ff938b47f ("ext4: correct the judgment of BUG in ext4_mb_normalize_request") 359745d78351 ("proc: remove PDE_DATA() completely") 6dfbbae14a7b ("fs: proc: store PDE()->data into inode->i_private") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From bc056e7163ac7db945366de219745cf94f32a3e6 Mon Sep 17 00:00:00 2001 From: Baokun Li <libaokun1(a)huawei.com> Date: Mon, 24 Jul 2023 20:10:58 +0800 Subject: [PATCH] ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow When we calculate the end position of ext4_free_extent, this position may be exactly where ext4_lblk_t (i.e. uint) overflows. For example, if ac_g_ex.fe_logical is 4294965248 and ac_orig_goal_len is 2048, then the computed end is 0x100000000, which is 0. If ac->ac_o_ex.fe_logical is not the first case of adjusting the best extent, that is, new_bex_end > 0, the following BUG_ON will be triggered: ========================================================= kernel BUG at fs/ext4/mballoc.c:5116! invalid opcode: 0000 [#1] PREEMPT SMP PTI CPU: 3 PID: 673 Comm: xfs_io Tainted: G E 6.5.0-rc1+ #279 RIP: 0010:ext4_mb_new_inode_pa+0xc5/0x430 Call Trace: <TASK> ext4_mb_use_best_found+0x203/0x2f0 ext4_mb_try_best_found+0x163/0x240 ext4_mb_regular_allocator+0x158/0x1550 ext4_mb_new_blocks+0x86a/0xe10 ext4_ext_map_blocks+0xb0c/0x13a0 ext4_map_blocks+0x2cd/0x8f0 ext4_iomap_begin+0x27b/0x400 iomap_iter+0x222/0x3d0 __iomap_dio_rw+0x243/0xcb0 iomap_dio_rw+0x16/0x80 ========================================================= A simple reproducer demonstrating the problem: mkfs.ext4 -F /dev/sda -b 4096 100M mount /dev/sda /tmp/test fallocate -l1M /tmp/test/tmp fallocate -l10M /tmp/test/file fallocate -i -o 1M -l16777203M /tmp/test/file fsstress -d /tmp/test -l 0 -n 100000 -p 8 & sleep 10 && killall -9 fsstress rm -f /tmp/test/tmp xfs_io -c "open -ad /tmp/test/file" -c "pwrite -S 0xff 0 8192" We simply refactor the logic for adjusting the best extent by adding a temporary ext4_free_extent ex and use extent_logical_end() to avoid overflow, which also simplifies the code. Cc: stable(a)kernel.org # 6.4 Fixes: 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()") Signed-off-by: Baokun Li <libaokun1(a)huawei.com> Reviewed-by: Ritesh Harjani (IBM) <ritesh.list(a)gmail.com> Link: https://lore.kernel.org/r/20230724121059.11834-3-libaokun1@huawei.com Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 4cb13b3e41b3..86bce870dc5a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5177,8 +5177,11 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) pa = ac->ac_pa; if (ac->ac_b_ex.fe_len < ac->ac_orig_goal_len) { - int new_bex_start; - int new_bex_end; + struct ext4_free_extent ex = { + .fe_logical = ac->ac_g_ex.fe_logical, + .fe_len = ac->ac_orig_goal_len, + }; + loff_t orig_goal_end = extent_logical_end(sbi, &ex); /* we can't allocate as much as normalizer wants. * so, found space must get proper lstart @@ -5197,29 +5200,23 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) * still cover original start * 3. Else, keep the best ex at start of original request. */ - new_bex_end = ac->ac_g_ex.fe_logical + - EXT4_C2B(sbi, ac->ac_orig_goal_len); - new_bex_start = new_bex_end - EXT4_C2B(sbi, ac->ac_b_ex.fe_len); - if (ac->ac_o_ex.fe_logical >= new_bex_start) - goto adjust_bex; + ex.fe_len = ac->ac_b_ex.fe_len; - new_bex_start = ac->ac_g_ex.fe_logical; - new_bex_end = - new_bex_start + EXT4_C2B(sbi, ac->ac_b_ex.fe_len); - if (ac->ac_o_ex.fe_logical < new_bex_end) + ex.fe_logical = orig_goal_end - EXT4_C2B(sbi, ex.fe_len); + if (ac->ac_o_ex.fe_logical >= ex.fe_logical) goto adjust_bex; - new_bex_start = ac->ac_o_ex.fe_logical; - new_bex_end = - new_bex_start + EXT4_C2B(sbi, ac->ac_b_ex.fe_len); + ex.fe_logical = ac->ac_g_ex.fe_logical; + if (ac->ac_o_ex.fe_logical < extent_logical_end(sbi, &ex)) + goto adjust_bex; + ex.fe_logical = ac->ac_o_ex.fe_logical; adjust_bex: - ac->ac_b_ex.fe_logical = new_bex_start; + ac->ac_b_ex.fe_logical = ex.fe_logical; BUG_ON(ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical); BUG_ON(ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len); - BUG_ON(new_bex_end > (ac->ac_g_ex.fe_logical + - EXT4_C2B(sbi, ac->ac_orig_goal_len))); + BUG_ON(extent_logical_end(sbi, &ex) > orig_goal_end); } pa->pa_lstart = ac->ac_b_ex.fe_logical;

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x bc056e7163ac7db945366de219745cf94f32a3e6 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091643-excluding-lining-7075@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: bc056e7163ac ("ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow") 7e170922f06b ("ext4: Add allocation criteria 1.5 (CR1_5)") 1b4200112108 ("ext4: Avoid scanning smaller extents in BG during CR1") 3ef5d2638796 ("ext4: Add counter to track successful allocation of goal length") 4eb7a4a1a33b ("ext4: Convert mballoc cr (criteria) to enum") c3defd99d58c ("ext4: treat stripe in block unit") 361eb69fc99f ("ext4: Remove the logic to trim inode PAs") 3872778664e3 ("ext4: Use rbtrees to manage PAs instead of inode i_prealloc_list") a8e38fd37cff ("ext4: Convert pa->pa_inode_list and pa->pa_obj_lock into a union") 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()") 0830344c953a ("ext4: Abstract out overlap fix/check logic in ext4_mb_normalize_request()") 7692094ac513 ("ext4: Move overlap assert logic into a separate function") bcf434992145 ("ext4: Refactor code in ext4_mb_normalize_request() and ext4_mb_use_preallocated()") e86a718228b6 ("ext4: Stop searching if PA doesn't satisfy non-extent file") 91a48aaf59d0 ("ext4: avoid unnecessary pointer dereference in ext4_mb_normalize_request") 83e80a6e3543 ("ext4: use buckets for cr 1 block scan instead of rbtree") 4fca50d440cc ("ext4: make mballoc try target group first even with mb_optimize_scan") cf4ff938b47f ("ext4: correct the judgment of BUG in ext4_mb_normalize_request") 359745d78351 ("proc: remove PDE_DATA() completely") 6dfbbae14a7b ("fs: proc: store PDE()->data into inode->i_private") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From bc056e7163ac7db945366de219745cf94f32a3e6 Mon Sep 17 00:00:00 2001 From: Baokun Li <libaokun1(a)huawei.com> Date: Mon, 24 Jul 2023 20:10:58 +0800 Subject: [PATCH] ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow When we calculate the end position of ext4_free_extent, this position may be exactly where ext4_lblk_t (i.e. uint) overflows. For example, if ac_g_ex.fe_logical is 4294965248 and ac_orig_goal_len is 2048, then the computed end is 0x100000000, which is 0. If ac->ac_o_ex.fe_logical is not the first case of adjusting the best extent, that is, new_bex_end > 0, the following BUG_ON will be triggered: ========================================================= kernel BUG at fs/ext4/mballoc.c:5116! invalid opcode: 0000 [#1] PREEMPT SMP PTI CPU: 3 PID: 673 Comm: xfs_io Tainted: G E 6.5.0-rc1+ #279 RIP: 0010:ext4_mb_new_inode_pa+0xc5/0x430 Call Trace: <TASK> ext4_mb_use_best_found+0x203/0x2f0 ext4_mb_try_best_found+0x163/0x240 ext4_mb_regular_allocator+0x158/0x1550 ext4_mb_new_blocks+0x86a/0xe10 ext4_ext_map_blocks+0xb0c/0x13a0 ext4_map_blocks+0x2cd/0x8f0 ext4_iomap_begin+0x27b/0x400 iomap_iter+0x222/0x3d0 __iomap_dio_rw+0x243/0xcb0 iomap_dio_rw+0x16/0x80 ========================================================= A simple reproducer demonstrating the problem: mkfs.ext4 -F /dev/sda -b 4096 100M mount /dev/sda /tmp/test fallocate -l1M /tmp/test/tmp fallocate -l10M /tmp/test/file fallocate -i -o 1M -l16777203M /tmp/test/file fsstress -d /tmp/test -l 0 -n 100000 -p 8 & sleep 10 && killall -9 fsstress rm -f /tmp/test/tmp xfs_io -c "open -ad /tmp/test/file" -c "pwrite -S 0xff 0 8192" We simply refactor the logic for adjusting the best extent by adding a temporary ext4_free_extent ex and use extent_logical_end() to avoid overflow, which also simplifies the code. Cc: stable(a)kernel.org # 6.4 Fixes: 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()") Signed-off-by: Baokun Li <libaokun1(a)huawei.com> Reviewed-by: Ritesh Harjani (IBM) <ritesh.list(a)gmail.com> Link: https://lore.kernel.org/r/20230724121059.11834-3-libaokun1@huawei.com Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 4cb13b3e41b3..86bce870dc5a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5177,8 +5177,11 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) pa = ac->ac_pa; if (ac->ac_b_ex.fe_len < ac->ac_orig_goal_len) { - int new_bex_start; - int new_bex_end; + struct ext4_free_extent ex = { + .fe_logical = ac->ac_g_ex.fe_logical, + .fe_len = ac->ac_orig_goal_len, + }; + loff_t orig_goal_end = extent_logical_end(sbi, &ex); /* we can't allocate as much as normalizer wants. * so, found space must get proper lstart @@ -5197,29 +5200,23 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) * still cover original start * 3. Else, keep the best ex at start of original request. */ - new_bex_end = ac->ac_g_ex.fe_logical + - EXT4_C2B(sbi, ac->ac_orig_goal_len); - new_bex_start = new_bex_end - EXT4_C2B(sbi, ac->ac_b_ex.fe_len); - if (ac->ac_o_ex.fe_logical >= new_bex_start) - goto adjust_bex; + ex.fe_len = ac->ac_b_ex.fe_len; - new_bex_start = ac->ac_g_ex.fe_logical; - new_bex_end = - new_bex_start + EXT4_C2B(sbi, ac->ac_b_ex.fe_len); - if (ac->ac_o_ex.fe_logical < new_bex_end) + ex.fe_logical = orig_goal_end - EXT4_C2B(sbi, ex.fe_len); + if (ac->ac_o_ex.fe_logical >= ex.fe_logical) goto adjust_bex; - new_bex_start = ac->ac_o_ex.fe_logical; - new_bex_end = - new_bex_start + EXT4_C2B(sbi, ac->ac_b_ex.fe_len); + ex.fe_logical = ac->ac_g_ex.fe_logical; + if (ac->ac_o_ex.fe_logical < extent_logical_end(sbi, &ex)) + goto adjust_bex; + ex.fe_logical = ac->ac_o_ex.fe_logical; adjust_bex: - ac->ac_b_ex.fe_logical = new_bex_start; + ac->ac_b_ex.fe_logical = ex.fe_logical; BUG_ON(ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical); BUG_ON(ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len); - BUG_ON(new_bex_end > (ac->ac_g_ex.fe_logical + - EXT4_C2B(sbi, ac->ac_orig_goal_len))); + BUG_ON(extent_logical_end(sbi, &ex) > orig_goal_end); } pa->pa_lstart = ac->ac_b_ex.fe_logical;

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x bc056e7163ac7db945366de219745cf94f32a3e6 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091642-shucking-scant-a1b0@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: bc056e7163ac ("ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow") 7e170922f06b ("ext4: Add allocation criteria 1.5 (CR1_5)") 1b4200112108 ("ext4: Avoid scanning smaller extents in BG during CR1") 3ef5d2638796 ("ext4: Add counter to track successful allocation of goal length") 4eb7a4a1a33b ("ext4: Convert mballoc cr (criteria) to enum") c3defd99d58c ("ext4: treat stripe in block unit") 361eb69fc99f ("ext4: Remove the logic to trim inode PAs") 3872778664e3 ("ext4: Use rbtrees to manage PAs instead of inode i_prealloc_list") a8e38fd37cff ("ext4: Convert pa->pa_inode_list and pa->pa_obj_lock into a union") 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()") 0830344c953a ("ext4: Abstract out overlap fix/check logic in ext4_mb_normalize_request()") 7692094ac513 ("ext4: Move overlap assert logic into a separate function") bcf434992145 ("ext4: Refactor code in ext4_mb_normalize_request() and ext4_mb_use_preallocated()") e86a718228b6 ("ext4: Stop searching if PA doesn't satisfy non-extent file") 91a48aaf59d0 ("ext4: avoid unnecessary pointer dereference in ext4_mb_normalize_request") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From bc056e7163ac7db945366de219745cf94f32a3e6 Mon Sep 17 00:00:00 2001 From: Baokun Li <libaokun1(a)huawei.com> Date: Mon, 24 Jul 2023 20:10:58 +0800 Subject: [PATCH] ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow When we calculate the end position of ext4_free_extent, this position may be exactly where ext4_lblk_t (i.e. uint) overflows. For example, if ac_g_ex.fe_logical is 4294965248 and ac_orig_goal_len is 2048, then the computed end is 0x100000000, which is 0. If ac->ac_o_ex.fe_logical is not the first case of adjusting the best extent, that is, new_bex_end > 0, the following BUG_ON will be triggered: ========================================================= kernel BUG at fs/ext4/mballoc.c:5116! invalid opcode: 0000 [#1] PREEMPT SMP PTI CPU: 3 PID: 673 Comm: xfs_io Tainted: G E 6.5.0-rc1+ #279 RIP: 0010:ext4_mb_new_inode_pa+0xc5/0x430 Call Trace: <TASK> ext4_mb_use_best_found+0x203/0x2f0 ext4_mb_try_best_found+0x163/0x240 ext4_mb_regular_allocator+0x158/0x1550 ext4_mb_new_blocks+0x86a/0xe10 ext4_ext_map_blocks+0xb0c/0x13a0 ext4_map_blocks+0x2cd/0x8f0 ext4_iomap_begin+0x27b/0x400 iomap_iter+0x222/0x3d0 __iomap_dio_rw+0x243/0xcb0 iomap_dio_rw+0x16/0x80 ========================================================= A simple reproducer demonstrating the problem: mkfs.ext4 -F /dev/sda -b 4096 100M mount /dev/sda /tmp/test fallocate -l1M /tmp/test/tmp fallocate -l10M /tmp/test/file fallocate -i -o 1M -l16777203M /tmp/test/file fsstress -d /tmp/test -l 0 -n 100000 -p 8 & sleep 10 && killall -9 fsstress rm -f /tmp/test/tmp xfs_io -c "open -ad /tmp/test/file" -c "pwrite -S 0xff 0 8192" We simply refactor the logic for adjusting the best extent by adding a temporary ext4_free_extent ex and use extent_logical_end() to avoid overflow, which also simplifies the code. Cc: stable(a)kernel.org # 6.4 Fixes: 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()") Signed-off-by: Baokun Li <libaokun1(a)huawei.com> Reviewed-by: Ritesh Harjani (IBM) <ritesh.list(a)gmail.com> Link: https://lore.kernel.org/r/20230724121059.11834-3-libaokun1@huawei.com Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 4cb13b3e41b3..86bce870dc5a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5177,8 +5177,11 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) pa = ac->ac_pa; if (ac->ac_b_ex.fe_len < ac->ac_orig_goal_len) { - int new_bex_start; - int new_bex_end; + struct ext4_free_extent ex = { + .fe_logical = ac->ac_g_ex.fe_logical, + .fe_len = ac->ac_orig_goal_len, + }; + loff_t orig_goal_end = extent_logical_end(sbi, &ex); /* we can't allocate as much as normalizer wants. * so, found space must get proper lstart @@ -5197,29 +5200,23 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) * still cover original start * 3. Else, keep the best ex at start of original request. */ - new_bex_end = ac->ac_g_ex.fe_logical + - EXT4_C2B(sbi, ac->ac_orig_goal_len); - new_bex_start = new_bex_end - EXT4_C2B(sbi, ac->ac_b_ex.fe_len); - if (ac->ac_o_ex.fe_logical >= new_bex_start) - goto adjust_bex; + ex.fe_len = ac->ac_b_ex.fe_len; - new_bex_start = ac->ac_g_ex.fe_logical; - new_bex_end = - new_bex_start + EXT4_C2B(sbi, ac->ac_b_ex.fe_len); - if (ac->ac_o_ex.fe_logical < new_bex_end) + ex.fe_logical = orig_goal_end - EXT4_C2B(sbi, ex.fe_len); + if (ac->ac_o_ex.fe_logical >= ex.fe_logical) goto adjust_bex; - new_bex_start = ac->ac_o_ex.fe_logical; - new_bex_end = - new_bex_start + EXT4_C2B(sbi, ac->ac_b_ex.fe_len); + ex.fe_logical = ac->ac_g_ex.fe_logical; + if (ac->ac_o_ex.fe_logical < extent_logical_end(sbi, &ex)) + goto adjust_bex; + ex.fe_logical = ac->ac_o_ex.fe_logical; adjust_bex: - ac->ac_b_ex.fe_logical = new_bex_start; + ac->ac_b_ex.fe_logical = ex.fe_logical; BUG_ON(ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical); BUG_ON(ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len); - BUG_ON(new_bex_end > (ac->ac_g_ex.fe_logical + - EXT4_C2B(sbi, ac->ac_orig_goal_len))); + BUG_ON(extent_logical_end(sbi, &ex) > orig_goal_end); } pa->pa_lstart = ac->ac_b_ex.fe_logical;

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ext4: fix memory leaks in" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 7ca4b085f430f3774c3838b3da569ceccd6a0177 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091607-removal-popular-03e9@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 7ca4b085f430 ("ext4: fix memory leaks in ext4_fname_{setup_filename,prepare_lookup}") 3030b59c8533 ("ext4: cleanup function defs from ext4.h into crypto.c") b1241c8eb977 ("ext4: move ext4 crypto code to its own file crypto.c") 5298d4bfe80f ("unicode: clean up the Kconfig symbol confusion") 6661224e66f0 ("Merge tag 'unicode-for-next-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7ca4b085f430f3774c3838b3da569ceccd6a0177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Henriques?= <lhenriques(a)suse.de> Date: Thu, 3 Aug 2023 10:17:13 +0100 Subject: [PATCH] ext4: fix memory leaks in ext4_fname_{setup_filename,prepare_lookup} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the filename casefolding fails, we'll be leaking memory from the fscrypt_name struct, namely from the 'crypto_buf.name' member. Make sure we free it in the error path on both ext4_fname_setup_filename() and ext4_fname_prepare_lookup() functions. Cc: stable(a)kernel.org Fixes: 1ae98e295fa2 ("ext4: optimize match for casefolded encrypted dirs") Signed-off-by: Luís Henriques <lhenriques(a)suse.de> Reviewed-by: Eric Biggers <ebiggers(a)google.com> Link: https://lore.kernel.org/r/20230803091713.13239-1-lhenriques@suse.de Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c index e20ac0654b3f..453d4da5de52 100644 --- a/fs/ext4/crypto.c +++ b/fs/ext4/crypto.c @@ -33,6 +33,8 @@ int ext4_fname_setup_filename(struct inode *dir, const struct qstr *iname, #if IS_ENABLED(CONFIG_UNICODE) err = ext4_fname_setup_ci_filename(dir, iname, fname); + if (err) + ext4_fname_free_filename(fname); #endif return err; } @@ -51,6 +53,8 @@ int ext4_fname_prepare_lookup(struct inode *dir, struct dentry *dentry, #if IS_ENABLED(CONFIG_UNICODE) err = ext4_fname_setup_ci_filename(dir, &dentry->d_name, fname); + if (err) + ext4_fname_free_filename(fname); #endif return err; }

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] jbd2: correct the end of the journal recovery scan range" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 2dfba3bb40ad8536b9fa802364f2d40da31aa88e # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091621-unviable-character-f8d2@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 2dfba3bb40ad ("jbd2: correct the end of the journal recovery scan range") cb3b3bf22cf3 ("jbd2: rename jbd_debug() to jbd2_debug()") f7f497cb7024 ("jbd2: kill t_handle_lock transaction spinlock") cc16eecae687 ("jbd2: fix use-after-free of transaction_t race") 4f9818684870 ("jbd2: refactor wait logic for transaction updates into a common function") fcdf3c34b7ab ("ext4: fix debug format string warning") d556435156b7 ("jbd2: avoid -Wempty-body warnings") 3042b1b45c41 ("Updated locking documentation for transaction_t") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 2dfba3bb40ad8536b9fa802364f2d40da31aa88e Mon Sep 17 00:00:00 2001 From: Zhang Yi <yi.zhang(a)huawei.com> Date: Mon, 26 Jun 2023 15:33:22 +0800 Subject: [PATCH] jbd2: correct the end of the journal recovery scan range We got a filesystem inconsistency issue below while running generic/475 I/O failure pressure test with fast_commit feature enabled. Symlink /p3/d3/d1c/d6c/dd6/dce/l101 (inode #132605) is invalid. If fast_commit feature is enabled, a special fast_commit journal area is appended to the end of the normal journal area. The journal->j_last point to the first unused block behind the normal journal area instead of the whole log area, and the journal->j_fc_last point to the first unused block behind the fast_commit journal area. While doing journal recovery, do_one_pass(PASS_SCAN) should first scan the normal journal area and turn around to the first block once it meet journal->j_last, but the wrap() macro misuse the journal->j_fc_last, so the recovering could not read the next magic block (commit block perhaps) and would end early mistakenly and missing tN and every transaction after it in the following example. Finally, it could lead to filesystem inconsistency. | normal journal area | fast commit area | +-------------------------------------------------+------------------+ | tN(rere) | tN+1 |~| tN-x |...| tN-1 | tN(front) | .... | +-------------------------------------------------+------------------+ / / / start journal->j_last journal->j_fc_last This patch fix it by use the correct ending journal->j_last. Fixes: 5b849b5f96b4 ("jbd2: fast commit recovery path") Cc: stable(a)kernel.org Reported-by: Theodore Ts'o <tytso(a)mit.edu> Link: https://lore.kernel.org/linux-ext4/20230613043120.GB1584772@mit.edu/ Signed-off-by: Zhang Yi <yi.zhang(a)huawei.com> Reviewed-by: Jan Kara <jack(a)suse.cz> Link: https://lore.kernel.org/r/20230626073322.3956567-1-yi.zhang@huaweicloud.com Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c index 0184931d47f7..c269a7d29a46 100644 --- a/fs/jbd2/recovery.c +++ b/fs/jbd2/recovery.c @@ -230,12 +230,8 @@ static int count_tags(journal_t *journal, struct buffer_head *bh) /* Make sure we wrap around the log correctly! */ #define wrap(journal, var) \ do { \ - unsigned long _wrap_last = \ - jbd2_has_feature_fast_commit(journal) ? \ - (journal)->j_fc_last : (journal)->j_last; \ - \ - if (var >= _wrap_last) \ - var -= (_wrap_last - (journal)->j_first); \ + if (var >= (journal)->j_last) \ + var -= ((journal)->j_last - (journal)->j_first); \ } while (0) static int fc_do_one_pass(journal_t *journal, @@ -524,9 +520,7 @@ static int do_one_pass(journal_t *journal, break; jbd2_debug(2, "Scanning for sequence ID %u at %lu/%lu\n", - next_commit_ID, next_log_block, - jbd2_has_feature_fast_commit(journal) ? - journal->j_fc_last : journal->j_last); + next_commit_ID, next_log_block, journal->j_last); /* Skip over each chunk of the transaction looking * either the next descriptor block or the final commit

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] jbd2: correct the end of the journal recovery scan range" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 2dfba3bb40ad8536b9fa802364f2d40da31aa88e # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091620-stage-racoon-f926@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 2dfba3bb40ad ("jbd2: correct the end of the journal recovery scan range") cb3b3bf22cf3 ("jbd2: rename jbd_debug() to jbd2_debug()") f7f497cb7024 ("jbd2: kill t_handle_lock transaction spinlock") cc16eecae687 ("jbd2: fix use-after-free of transaction_t race") 4f9818684870 ("jbd2: refactor wait logic for transaction updates into a common function") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 2dfba3bb40ad8536b9fa802364f2d40da31aa88e Mon Sep 17 00:00:00 2001 From: Zhang Yi <yi.zhang(a)huawei.com> Date: Mon, 26 Jun 2023 15:33:22 +0800 Subject: [PATCH] jbd2: correct the end of the journal recovery scan range We got a filesystem inconsistency issue below while running generic/475 I/O failure pressure test with fast_commit feature enabled. Symlink /p3/d3/d1c/d6c/dd6/dce/l101 (inode #132605) is invalid. If fast_commit feature is enabled, a special fast_commit journal area is appended to the end of the normal journal area. The journal->j_last point to the first unused block behind the normal journal area instead of the whole log area, and the journal->j_fc_last point to the first unused block behind the fast_commit journal area. While doing journal recovery, do_one_pass(PASS_SCAN) should first scan the normal journal area and turn around to the first block once it meet journal->j_last, but the wrap() macro misuse the journal->j_fc_last, so the recovering could not read the next magic block (commit block perhaps) and would end early mistakenly and missing tN and every transaction after it in the following example. Finally, it could lead to filesystem inconsistency. | normal journal area | fast commit area | +-------------------------------------------------+------------------+ | tN(rere) | tN+1 |~| tN-x |...| tN-1 | tN(front) | .... | +-------------------------------------------------+------------------+ / / / start journal->j_last journal->j_fc_last This patch fix it by use the correct ending journal->j_last. Fixes: 5b849b5f96b4 ("jbd2: fast commit recovery path") Cc: stable(a)kernel.org Reported-by: Theodore Ts'o <tytso(a)mit.edu> Link: https://lore.kernel.org/linux-ext4/20230613043120.GB1584772@mit.edu/ Signed-off-by: Zhang Yi <yi.zhang(a)huawei.com> Reviewed-by: Jan Kara <jack(a)suse.cz> Link: https://lore.kernel.org/r/20230626073322.3956567-1-yi.zhang@huaweicloud.com Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c index 0184931d47f7..c269a7d29a46 100644 --- a/fs/jbd2/recovery.c +++ b/fs/jbd2/recovery.c @@ -230,12 +230,8 @@ static int count_tags(journal_t *journal, struct buffer_head *bh) /* Make sure we wrap around the log correctly! */ #define wrap(journal, var) \ do { \ - unsigned long _wrap_last = \ - jbd2_has_feature_fast_commit(journal) ? \ - (journal)->j_fc_last : (journal)->j_last; \ - \ - if (var >= _wrap_last) \ - var -= (_wrap_last - (journal)->j_first); \ + if (var >= (journal)->j_last) \ + var -= ((journal)->j_last - (journal)->j_first); \ } while (0) static int fc_do_one_pass(journal_t *journal, @@ -524,9 +520,7 @@ static int do_one_pass(journal_t *journal, break; jbd2_debug(2, "Scanning for sequence ID %u at %lu/%lu\n", - next_commit_ID, next_log_block, - jbd2_has_feature_fast_commit(journal) ? - journal->j_fc_last : journal->j_last); + next_commit_ID, next_log_block, journal->j_last); /* Skip over each chunk of the transaction looking * either the next descriptor block or the final commit

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] misc: fastrpc: Fix incorrect DMA mapping unmap request" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x a2cb9cd6a3949a3804ad9fd7da234892ce6719ec # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091639-gallantly-pellet-e738@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: a2cb9cd6a394 ("misc: fastrpc: Fix incorrect DMA mapping unmap request") 791da5c7fedb ("misc: fastrpc: Prepare to dynamic dma-buf locking specification") e90d91190619 ("misc: fastrpc: Add support to secure memory map") 7f1f481263c3 ("misc: fastrpc: check before loading process to the DSP") 3abe3ab3cdab ("misc: fastrpc: add secure domain support") 6c16fd8bdd40 ("misc: fastrpc: Add support to get DSP capabilities") 5c1b97c7d7b7 ("misc: fastrpc: add support for FASTRPC_IOCTL_MEM_MAP/UNMAP") 965602eabb57 ("misc: fastrpc: separate fastrpc device from channel context") 304b0ba0a21b ("misc: fastrpc: Update number of max fastrpc sessions") 6010d9befc8d ("misc: fastrpc: add ioctl for attaching to sensors pd") 84195d206e1f ("misc: fastrpc: define names for protection domain ids") 7c920da30e04 ("misc: fastrpc: fix indentation error in uapi header") 0978de9fc733 ("misc: fastrpc: Fix an incomplete memory release in fastrpc_rpmsg_probe()") 2d10d2d17072 ("misc: fastrpc: fix memory leak from miscdev->name") 2419e55e532d ("misc: fastrpc: add mmap/unmap support") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From a2cb9cd6a3949a3804ad9fd7da234892ce6719ec Mon Sep 17 00:00:00 2001 From: Ekansh Gupta <quic_ekangupt(a)quicinc.com> Date: Fri, 11 Aug 2023 12:56:42 +0100 Subject: [PATCH] misc: fastrpc: Fix incorrect DMA mapping unmap request Scatterlist table is obtained during map create request and the same table is used for DMA mapping unmap. In case there is any failure while getting the sg_table, ERR_PTR is returned instead of sg_table. When the map is getting freed, there is only a non-NULL check of sg_table which will also be true in case failure was returned instead of sg_table. This would result in improper unmap request. Add proper check before setting map table to avoid bad unmap request. Fixes: c68cfb718c8f ("misc: fastrpc: Add support for context Invoke method") Cc: stable <stable(a)kernel.org> Signed-off-by: Ekansh Gupta <quic_ekangupt(a)quicinc.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Link: https://lore.kernel.org/r/20230811115643.38578-3-srinivas.kandagatla@linaro… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 7d8818a4089f..0b376d9a2744 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -757,6 +757,7 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd, { struct fastrpc_session_ctx *sess = fl->sctx; struct fastrpc_map *map = NULL; + struct sg_table *table; int err = 0; if (!fastrpc_map_lookup(fl, fd, ppmap, true)) @@ -784,11 +785,12 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd, goto attach_err; } - map->table = dma_buf_map_attachment_unlocked(map->attach, DMA_BIDIRECTIONAL); - if (IS_ERR(map->table)) { - err = PTR_ERR(map->table); + table = dma_buf_map_attachment_unlocked(map->attach, DMA_BIDIRECTIONAL); + if (IS_ERR(table)) { + err = PTR_ERR(table); goto map_err; } + map->table = table; if (attr & FASTRPC_ATTR_SECUREMAP) { map->phys = sg_phys(map->table->sgl);

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] misc: fastrpc: Fix incorrect DMA mapping unmap request" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x a2cb9cd6a3949a3804ad9fd7da234892ce6719ec # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091638-hamstring-rocky-cf79@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: a2cb9cd6a394 ("misc: fastrpc: Fix incorrect DMA mapping unmap request") 791da5c7fedb ("misc: fastrpc: Prepare to dynamic dma-buf locking specification") e90d91190619 ("misc: fastrpc: Add support to secure memory map") 7f1f481263c3 ("misc: fastrpc: check before loading process to the DSP") 3abe3ab3cdab ("misc: fastrpc: add secure domain support") 6c16fd8bdd40 ("misc: fastrpc: Add support to get DSP capabilities") 5c1b97c7d7b7 ("misc: fastrpc: add support for FASTRPC_IOCTL_MEM_MAP/UNMAP") 965602eabb57 ("misc: fastrpc: separate fastrpc device from channel context") 304b0ba0a21b ("misc: fastrpc: Update number of max fastrpc sessions") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From a2cb9cd6a3949a3804ad9fd7da234892ce6719ec Mon Sep 17 00:00:00 2001 From: Ekansh Gupta <quic_ekangupt(a)quicinc.com> Date: Fri, 11 Aug 2023 12:56:42 +0100 Subject: [PATCH] misc: fastrpc: Fix incorrect DMA mapping unmap request Scatterlist table is obtained during map create request and the same table is used for DMA mapping unmap. In case there is any failure while getting the sg_table, ERR_PTR is returned instead of sg_table. When the map is getting freed, there is only a non-NULL check of sg_table which will also be true in case failure was returned instead of sg_table. This would result in improper unmap request. Add proper check before setting map table to avoid bad unmap request. Fixes: c68cfb718c8f ("misc: fastrpc: Add support for context Invoke method") Cc: stable <stable(a)kernel.org> Signed-off-by: Ekansh Gupta <quic_ekangupt(a)quicinc.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Link: https://lore.kernel.org/r/20230811115643.38578-3-srinivas.kandagatla@linaro… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 7d8818a4089f..0b376d9a2744 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -757,6 +757,7 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd, { struct fastrpc_session_ctx *sess = fl->sctx; struct fastrpc_map *map = NULL; + struct sg_table *table; int err = 0; if (!fastrpc_map_lookup(fl, fd, ppmap, true)) @@ -784,11 +785,12 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd, goto attach_err; } - map->table = dma_buf_map_attachment_unlocked(map->attach, DMA_BIDIRECTIONAL); - if (IS_ERR(map->table)) { - err = PTR_ERR(map->table); + table = dma_buf_map_attachment_unlocked(map->attach, DMA_BIDIRECTIONAL); + if (IS_ERR(table)) { + err = PTR_ERR(table); goto map_err; } + map->table = table; if (attr & FASTRPC_ATTR_SECUREMAP) { map->phys = sg_phys(map->table->sgl);

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] misc: fastrpc: Fix incorrect DMA mapping unmap request" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x a2cb9cd6a3949a3804ad9fd7da234892ce6719ec # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091637-clinic-wanted-7595@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: a2cb9cd6a394 ("misc: fastrpc: Fix incorrect DMA mapping unmap request") 791da5c7fedb ("misc: fastrpc: Prepare to dynamic dma-buf locking specification") e90d91190619 ("misc: fastrpc: Add support to secure memory map") 7f1f481263c3 ("misc: fastrpc: check before loading process to the DSP") 3abe3ab3cdab ("misc: fastrpc: add secure domain support") 6c16fd8bdd40 ("misc: fastrpc: Add support to get DSP capabilities") 5c1b97c7d7b7 ("misc: fastrpc: add support for FASTRPC_IOCTL_MEM_MAP/UNMAP") 965602eabb57 ("misc: fastrpc: separate fastrpc device from channel context") 304b0ba0a21b ("misc: fastrpc: Update number of max fastrpc sessions") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From a2cb9cd6a3949a3804ad9fd7da234892ce6719ec Mon Sep 17 00:00:00 2001 From: Ekansh Gupta <quic_ekangupt(a)quicinc.com> Date: Fri, 11 Aug 2023 12:56:42 +0100 Subject: [PATCH] misc: fastrpc: Fix incorrect DMA mapping unmap request Scatterlist table is obtained during map create request and the same table is used for DMA mapping unmap. In case there is any failure while getting the sg_table, ERR_PTR is returned instead of sg_table. When the map is getting freed, there is only a non-NULL check of sg_table which will also be true in case failure was returned instead of sg_table. This would result in improper unmap request. Add proper check before setting map table to avoid bad unmap request. Fixes: c68cfb718c8f ("misc: fastrpc: Add support for context Invoke method") Cc: stable <stable(a)kernel.org> Signed-off-by: Ekansh Gupta <quic_ekangupt(a)quicinc.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Link: https://lore.kernel.org/r/20230811115643.38578-3-srinivas.kandagatla@linaro… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 7d8818a4089f..0b376d9a2744 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -757,6 +757,7 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd, { struct fastrpc_session_ctx *sess = fl->sctx; struct fastrpc_map *map = NULL; + struct sg_table *table; int err = 0; if (!fastrpc_map_lookup(fl, fd, ppmap, true)) @@ -784,11 +785,12 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd, goto attach_err; } - map->table = dma_buf_map_attachment_unlocked(map->attach, DMA_BIDIRECTIONAL); - if (IS_ERR(map->table)) { - err = PTR_ERR(map->table); + table = dma_buf_map_attachment_unlocked(map->attach, DMA_BIDIRECTIONAL); + if (IS_ERR(table)) { + err = PTR_ERR(table); goto map_err; } + map->table = table; if (attr & FASTRPC_ATTR_SECUREMAP) { map->phys = sg_phys(map->table->sgl);

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] misc: fastrpc: Fix incorrect DMA mapping unmap request" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x a2cb9cd6a3949a3804ad9fd7da234892ce6719ec # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091636-perceive-unabashed-178b@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: a2cb9cd6a394 ("misc: fastrpc: Fix incorrect DMA mapping unmap request") 791da5c7fedb ("misc: fastrpc: Prepare to dynamic dma-buf locking specification") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From a2cb9cd6a3949a3804ad9fd7da234892ce6719ec Mon Sep 17 00:00:00 2001 From: Ekansh Gupta <quic_ekangupt(a)quicinc.com> Date: Fri, 11 Aug 2023 12:56:42 +0100 Subject: [PATCH] misc: fastrpc: Fix incorrect DMA mapping unmap request Scatterlist table is obtained during map create request and the same table is used for DMA mapping unmap. In case there is any failure while getting the sg_table, ERR_PTR is returned instead of sg_table. When the map is getting freed, there is only a non-NULL check of sg_table which will also be true in case failure was returned instead of sg_table. This would result in improper unmap request. Add proper check before setting map table to avoid bad unmap request. Fixes: c68cfb718c8f ("misc: fastrpc: Add support for context Invoke method") Cc: stable <stable(a)kernel.org> Signed-off-by: Ekansh Gupta <quic_ekangupt(a)quicinc.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Link: https://lore.kernel.org/r/20230811115643.38578-3-srinivas.kandagatla@linaro… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 7d8818a4089f..0b376d9a2744 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -757,6 +757,7 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd, { struct fastrpc_session_ctx *sess = fl->sctx; struct fastrpc_map *map = NULL; + struct sg_table *table; int err = 0; if (!fastrpc_map_lookup(fl, fd, ppmap, true)) @@ -784,11 +785,12 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd, goto attach_err; } - map->table = dma_buf_map_attachment_unlocked(map->attach, DMA_BIDIRECTIONAL); - if (IS_ERR(map->table)) { - err = PTR_ERR(map->table); + table = dma_buf_map_attachment_unlocked(map->attach, DMA_BIDIRECTIONAL); + if (IS_ERR(table)) { + err = PTR_ERR(table); goto map_err; } + map->table = table; if (attr & FASTRPC_ATTR_SECUREMAP) { map->phys = sg_phys(map->table->sgl);

2 years, 1 month

1
0
0 0

Fix colorspace warning on MST displays

by Mario Limonciello

Hi, There are some warning traces being reported in linux-6.5.y related to the relatively recent colorspace property. A workaround is landed in 6.6-rc1 to avoid the traces. Can you please backport this back to linux-6.5.y? 69a959610229 ("drm/amd/display: Temporary Disable MST DP Colorspace Property") Thanks!

2 years, 1 month

2
1
0 0

Please apply "watchdog: advantech_ec_wdt: fix Kconfig dependencies" to 6.5.y

by Yoann Congal

Hi, Can you please apply "watchdog: advantech_ec_wdt: fix Kconfig dependencies" to the 6.5.y branch? commit 6eb28a38f6478a650c7e76b2d6910669615d8a62 upstream. This patch fixes a configuration bug in the advantech_ec_wdt (Advantech Embedded Controller Watchdog) driver where it can be compiled into a noop driver. I come at the Debian kernel maintainer suggestion following my attempt at adding this driver to their kernel [0]. Thanks! Regards, [0]: https://salsa.debian.org/kernel-team/linux/-/merge_requests/841#note_427523 -- Yoann Congal Smile ECS - Tech Expert

2 years, 1 month

2
1
0 0

FAILED: patch "[PATCH] Multi-gen LRU: avoid race in inc_min_seq()" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x bb5e7f234eacf34b65be67ebb3613e3b8cf11b87 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091354-atom-tinderbox-b9be@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: bb5e7f234eac ("Multi-gen LRU: avoid race in inc_min_seq()") 391655fe08d1 ("mm: multi-gen LRU: rename lru_gen_struct to lru_gen_folio") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From bb5e7f234eacf34b65be67ebb3613e3b8cf11b87 Mon Sep 17 00:00:00 2001 From: Kalesh Singh <kaleshsingh(a)google.com> Date: Tue, 1 Aug 2023 19:56:03 -0700 Subject: [PATCH] Multi-gen LRU: avoid race in inc_min_seq() inc_max_seq() will try to inc_min_seq() if nr_gens == MAX_NR_GENS. This is because the generations are reused (the last oldest now empty generation will become the next youngest generation). inc_min_seq() is retried until successful, dropping the lru_lock and yielding the CPU on each failure, and retaking the lock before trying again: while (!inc_min_seq(lruvec, type, can_swap)) { spin_unlock_irq(&lruvec->lru_lock); cond_resched(); spin_lock_irq(&lruvec->lru_lock); } However, the initial condition that required incrementing the min_seq (nr_gens == MAX_NR_GENS) is not retested. This can change by another call to inc_max_seq() from run_aging() with force_scan=true from the debugfs interface. Since the eviction stalls when the nr_gens == MIN_NR_GENS, avoid unnecessarily incrementing the min_seq by rechecking the number of generations before each attempt. This issue was uncovered in previous discussion on the list by Yu Zhao and Aneesh Kumar [1]. [1] https://lore.kernel.org/linux-mm/CAOUHufbO7CaVm=xjEb1avDhHVvnC8pJmGyKcFf2iY… Link: https://lkml.kernel.org/r/20230802025606.346758-2-kaleshsingh@google.com Fixes: d6c3af7d8a2b ("mm: multi-gen LRU: debugfs interface") Signed-off-by: Kalesh Singh <kaleshsingh(a)google.com> Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> [mediatek] Tested-by: Charan Teja Kalla <quic_charante(a)quicinc.com> Cc: Yu Zhao <yuzhao(a)google.com> Cc: Aneesh Kumar K V <aneesh.kumar(a)linux.ibm.com> Cc: Barry Song <baohua(a)kernel.org> Cc: Brian Geffon <bgeffon(a)google.com> Cc: Jan Alexander Steffens (heftig) <heftig(a)archlinux.org> Cc: Lecopzer Chen <lecopzer.chen(a)mediatek.com> Cc: Matthias Brugger <matthias.bgg(a)gmail.com> Cc: Oleksandr Natalenko <oleksandr(a)natalenko.name> Cc: Qi Zheng <zhengqi.arch(a)bytedance.com> Cc: Steven Barrett <steven(a)liquorix.net> Cc: Suleiman Souhlal <suleiman(a)google.com> Cc: Suren Baghdasaryan <surenb(a)google.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> diff --git a/mm/vmscan.c b/mm/vmscan.c index 489a4fc7d9b1..6eecd291756c 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4439,7 +4439,7 @@ static void inc_max_seq(struct lruvec *lruvec, bool can_swap, bool force_scan) int prev, next; int type, zone; struct lru_gen_folio *lrugen = &lruvec->lrugen; - +restart: spin_lock_irq(&lruvec->lru_lock); VM_WARN_ON_ONCE(!seq_is_valid(lruvec)); @@ -4450,11 +4450,12 @@ static void inc_max_seq(struct lruvec *lruvec, bool can_swap, bool force_scan) VM_WARN_ON_ONCE(!force_scan && (type == LRU_GEN_FILE || can_swap)); - while (!inc_min_seq(lruvec, type, can_swap)) { - spin_unlock_irq(&lruvec->lru_lock); - cond_resched(); - spin_lock_irq(&lruvec->lru_lock); - } + if (inc_min_seq(lruvec, type, can_swap)) + continue; + + spin_unlock_irq(&lruvec->lru_lock); + cond_resched(); + goto restart; } /*

2 years, 1 month

3
2
0 0

[STABLE][PATCH] linux/export: fix reference to exported functions for parisc64

by Helge Deller

Hi Greg, could you please cherry-pick this upstream commit: 08700ec70504 ("linux/export: fix reference to exported functions for parisc64") to the v6.5 stable kernel series? Thanks! Helge --- From 08700ec705043eb0cee01b35cf5b9d63f0230d12 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada <masahiroy(a)kernel.org> Date: Wed, 6 Sep 2023 03:46:57 +0900 Subject: [PATCH] linux/export: fix reference to exported functions for parisc64 John David Anglin reported parisc has been broken since commit ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost"). Like ia64, parisc64 uses a function descriptor. The function references must be prefixed with P%. Also, symbols prefixed $$ from the library have the symbol type STT_LOPROC instead of STT_FUNC. They should be handled as functions too. Fixes: ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost") Reported-by: John David Anglin <dave.anglin(a)bell.net> Tested-by: John David Anglin <dave.anglin(a)bell.net> Tested-by: Helge Deller <deller(a)gmx.de> Closes: https://lore.kernel.org/linux-parisc/1901598a-e11d-f7dd-a5d9-9a69d06e6b6e@b… Signed-off-by: Masahiro Yamada <masahiroy(a)kernel.org> Signed-off-by: Helge Deller <deller(a)gmx.de> diff --git a/include/linux/export-internal.h b/include/linux/export-internal.h index 1c849db953a5..45fca09b2319 100644 --- a/include/linux/export-internal.h +++ b/include/linux/export-internal.h @@ -52,6 +52,8 @@ #ifdef CONFIG_IA64 #define KSYM_FUNC(name) @fptr(name) +#elif defined(CONFIG_PARISC) && defined(CONFIG_64BIT) +#define KSYM_FUNC(name) P%name #else #define KSYM_FUNC(name) name #endif diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index b29b29707f10..ba981f22908a 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1226,6 +1226,15 @@ static void check_export_symbol(struct module *mod, struct elf_info *elf, */ s->is_func = (ELF_ST_TYPE(sym->st_info) == STT_FUNC); + /* + * For parisc64, symbols prefixed $$ from the library have the symbol type + * STT_LOPROC. They should be handled as functions too. + */ + if (elf->hdr->e_ident[EI_CLASS] == ELFCLASS64 && + elf->hdr->e_machine == EM_PARISC && + ELF_ST_TYPE(sym->st_info) == STT_LOPROC) + s->is_func = true; + if (match(secname, PATTERNS(INIT_SECTIONS))) warn("%s: %s: EXPORT_SYMBOL used for init symbol. Remove __init or EXPORT_SYMBOL.\n", mod->name, name);

2 years, 1 month

2
1
0 0

[PATCH 0/4 v6.1.y] net: fix roundup issue in kmalloc_reserve()

by Ajay Kaher

From: Eric Dumazet <edumazet(a)google.com> This patch series is to backport upstream commit: 915d975b2ffa: net: deal with integer overflows in kmalloc_reserve() patch 1-3/4 backport requires to apply patch 4/4 to fix roundup issue in kmalloc_reserve() 1/4 net: add SKB_HEAD_ALIGN() helper 2/4 net: remove osize variable in __alloc_skb() 3/4 net: factorize code in kmalloc_reserve() 4/4 net: deal with integer overflows in kmalloc_reserve() include/linux/skbuff.h | 8 ++++++++ net/core/skbuff.c | 49 +++++++++++++++++++++---------------------------- 2 files changed, 29 insertions(+), 28 deletions(-) -- 2.7.4

2 years, 1 month

2
5
0 0

[PATCH] nvme: avoid bogus CRTO values

by Keith Busch

From: Keith Busch <kbusch(a)kernel.org> Some devices are reporting controller ready mode support, but return 0 for CRTO. These devices require a much higher time to ready than that, so they are failing to initialize after the driver starter preferring that value over CAP.TO. The spec requires that CAP.TO match the appropritate CRTO value, or be set to 0xff if CRTO is larger than that. This means that CAP.TO can be used to validate if CRTO is reliable, and provides an appropriate fallback for setting the timeout value if not. Use whichever is larger. Link: https://bugzilla.kernel.org/show_bug.cgi?id=217863 Reported-by: Cláudio Sampaio <patola(a)gmail.com> Reported-by: Felix Yan <felixonmars(a)archlinux.org> Based-on-a-patch-by: Felix Yan <felixonmars(a)archlinux.org> Cc: stable(a)vger.kernel.org Signed-off-by: Keith Busch <kbusch(a)kernel.org> --- drivers/nvme/host/core.c | 48 ++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 37b6fa7466620..4adc0b2f12f1e 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2245,25 +2245,8 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl) else ctrl->ctrl_config = NVME_CC_CSS_NVM; - if (ctrl->cap & NVME_CAP_CRMS_CRWMS) { - u32 crto; - - ret = ctrl->ops->reg_read32(ctrl, NVME_REG_CRTO, &crto); - if (ret) { - dev_err(ctrl->device, "Reading CRTO failed (%d)\n", - ret); - return ret; - } - - if (ctrl->cap & NVME_CAP_CRMS_CRIMS) { - ctrl->ctrl_config |= NVME_CC_CRIME; - timeout = NVME_CRTO_CRIMT(crto); - } else { - timeout = NVME_CRTO_CRWMT(crto); - } - } else { - timeout = NVME_CAP_TIMEOUT(ctrl->cap); - } + if (ctrl->cap & NVME_CAP_CRMS_CRWMS && ctrl->cap & NVME_CAP_CRMS_CRIMS) + ctrl->ctrl_config |= NVME_CC_CRIME; ctrl->ctrl_config |= (NVME_CTRL_PAGE_SHIFT - 12) << NVME_CC_MPS_SHIFT; ctrl->ctrl_config |= NVME_CC_AMS_RR | NVME_CC_SHN_NONE; @@ -2277,6 +2260,33 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl) if (ret) return ret; + /* CAP value may change after initial CC write */ + ret = ctrl->ops->reg_read64(ctrl, NVME_REG_CAP, &ctrl->cap); + if (ret) + return ret; + + timeout = NVME_CAP_TIMEOUT(ctrl->cap); + if (ctrl->cap & NVME_CAP_CRMS_CRWMS) { + u32 crto; + + ret = ctrl->ops->reg_read32(ctrl, NVME_REG_CRTO, &crto); + if (ret) { + dev_err(ctrl->device, "Reading CRTO failed (%d)\n", + ret); + return ret; + } + + /* + * CRTO should always be greater or equal to CAP.TO, but some + * devices are known to get this wrong. Use the larger of the + * two values. + */ + if (ctrl->ctrl_config & NVME_CC_CRIME) + timeout = max(timeout, NVME_CRTO_CRIMT(crto)); + else + timeout = max(timeout, NVME_CRTO_CRWMT(crto)); + } + ctrl->ctrl_config |= NVME_CC_ENABLE; ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC, ctrl->ctrl_config); if (ret) -- 2.34.1

2 years, 1 month

5
10
0 0

[PATCH bpf v3 0/2] link to v1: https://lore.kernel.org/bpf/20230915103228.1196234-1-jolsa@kernel.org/

by Nick Desaulniers

Signed-off-by: Nick Desaulniers <ndesaulniers(a)google.com> --- Changes in v3: - combine v1 and v2 into a series; I didn't recognize that this macro appeared twice in the kernel sources. - Use __PASTE twice. - Link to v2: https://lore.kernel.org/r/20230915-bpf_collision-v2-1-027670d38bdf@google.c… --- Jiri Olsa (1): bpf: Fix BTF_ID symbol generation collision Nick Desaulniers (1): bpf: Fix BTF_ID symbol generation collision in tools/ include/linux/btf_ids.h | 2 +- tools/include/linux/btf_ids.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- base-commit: 9fdfb15a3dbf818e06be514f4abbfc071004cbe7 change-id: 20230915-bpf_collision-36889a391d44 Best regards, -- Nick Desaulniers <ndesaulniers(a)google.com>

2 years, 1 month

3
4
0 0

[PATCH] drm/amd/display: fix the ability to use lower resolution modes on eDP

by Hamza Mahfooz

On eDP we can receive invalid modes from dm_update_crtc_state() for entirely new streams for which drm_mode_set_crtcinfo() shouldn't be called on. So, instead of calling drm_mode_set_crtcinfo() from within create_stream_for_sink() we can instead call it from amdgpu_dm_connector_mode_valid(). Since, we are guaranteed to only call drm_mode_set_crtcinfo() for valid modes from that function (invalid modes are rejected by that callback) and that is the only user of create_validate_stream_for_sink() that we need to call drm_mode_set_crtcinfo() for (as before commit cb841d27b876 ("drm/amd/display: Always pass connector_state to stream validation"), that is the only place where create_validate_stream_for_sink()'s dm_state was NULL). Cc: stable(a)vger.kernel.org Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2693 Fixes: cb841d27b876 ("drm/amd/display: Always pass connector_state to stream validation") Signed-off-by: Hamza Mahfooz <hamza.mahfooz(a)amd.com> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 933c9b5d5252..beef4fef7338 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6128,8 +6128,6 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, if (recalculate_timing) drm_mode_set_crtcinfo(&saved_mode, 0); - else if (!old_stream) - drm_mode_set_crtcinfo(&mode, 0); /* * If scaling is enabled and refresh rate didn't change @@ -6691,6 +6689,8 @@ enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connec goto fail; } + drm_mode_set_crtcinfo(mode, 0); + stream = create_validate_stream_for_sink(aconnector, mode, to_dm_connector_state(connector->state), NULL); -- 2.42.0

2 years, 1 month

2
4
0 0

[PATCH v2] bpf: Fix BTF_ID symbol generation collision

by Nick Desaulniers

Marcus and Satya reported an issue where BTF_ID macro generates same symbol in separate objects and that breaks final vmlinux link. ld.lld: error: ld-temp.o <inline asm>:14577:1: symbol '__BTF_ID__struct__cgroup__624' is already defined This can be triggered under specific configs when __COUNTER__ happens to be the same for the same symbol in two different translation units, which is already quite unlikely to happen. Add __LINE__ number suffix to make BTF_ID symbol more unique, which is not a complete fix, but it would help for now and meanwhile we can work on better solution as suggested by Andrii. Cc: stable(a)vger.kernel.org Reported-by: Satya Durga Srinivasu Prabhala <quic_satyap(a)quicinc.com> Reported-by: Marcus Seyfarth <m.seyfarth(a)gmail.com> Closes: https://github.com/ClangBuiltLinux/linux/issues/1913 Tested-by: Marcus Seyfarth <m.seyfarth(a)gmail.com> Debugged-by: Nathan Chancellor <nathan(a)kernel.org> Co-developed-by: Jiri Olsa <jolsa(a)kernel.org> Link: https://lore.kernel.org/bpf/CAEf4Bzb5KQ2_LmhN769ifMeSJaWfebccUasQOfQKaOd0nQ… Signed-off-by: Nick Desaulniers <ndesaulniers(a)google.com> --- tools/include/linux/btf_ids.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/include/linux/btf_ids.h b/tools/include/linux/btf_ids.h index 71e54b1e3796..30e920b96a18 100644 --- a/tools/include/linux/btf_ids.h +++ b/tools/include/linux/btf_ids.h @@ -38,7 +38,7 @@ asm( \ ____BTF_ID(symbol) #define __ID(prefix) \ - __PASTE(prefix, __COUNTER__) + __PASTE(prefix, __COUNTER__ __LINE__) /* * The BTF_ID defines unique symbol for each ID pointing --- base-commit: 9fdfb15a3dbf818e06be514f4abbfc071004cbe7 change-id: 20230915-bpf_collision-36889a391d44 Best regards, -- Nick Desaulniers <ndesaulniers(a)google.com>

2 years, 1 month

3
7
0 0

[PATCH] tracing/synthetic: Print out u64 values properly

by Tero Kristo

The synth traces incorrectly print pointer to the synthetic event values instead of the actual value when using u64 type. Fix by addressing the contents of the union properly. Fixes: ddeea494a16f ("tracing/synthetic: Use union instead of casts") Cc: stable(a)vger.kernel.org Signed-off-by: Tero Kristo <tero.kristo(a)linux.intel.com> --- kernel/trace/trace_events_synth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c index 7fff8235075f..070365959c0a 100644 --- a/kernel/trace/trace_events_synth.c +++ b/kernel/trace/trace_events_synth.c @@ -337,7 +337,7 @@ static void print_synth_event_num_val(struct trace_seq *s, break; default: - trace_seq_printf(s, print_fmt, name, val, space); + trace_seq_printf(s, print_fmt, name, val->as_u64, space); break; } } -- 2.40.1

2 years, 1 month

3
4
0 0

[PATCH 4/4] xhci: Preserve RsvdP bits in ERSTBA register correctly

by Mathias Nyman

From: Lukas Wunner <lukas(a)wunner.de> xhci_add_interrupter() erroneously preserves only the lowest 4 bits when writing the ERSTBA register, not the lowest 6 bits. Fix it. Migrate the ERST_BASE_RSVDP macro to the modern GENMASK_ULL() syntax to avoid a u64 cast. This was previously fixed by commit 8c1cbec9db1a ("xhci: fix event ring segment table related masks and variables in header"), but immediately undone by commit b17a57f89f69 ("xhci: Refactor interrupter code for initial multi interrupter support."). Fixes: b17a57f89f69 ("xhci: Refactor interrupter code for initial multi interrupter support.") Signed-off-by: Lukas Wunner <lukas(a)wunner.de> Cc: stable(a)vger.kernel.org # v6.3+ Signed-off-by: Mathias Nyman <mathias.nyman(a)linux.intel.com> --- drivers/usb/host/xhci-mem.c | 4 ++-- drivers/usb/host/xhci.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index 8714ab5bf04d..0a37f0d511cf 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -2285,8 +2285,8 @@ xhci_add_interrupter(struct xhci_hcd *xhci, struct xhci_interrupter *ir, writel(erst_size, &ir->ir_set->erst_size); erst_base = xhci_read_64(xhci, &ir->ir_set->erst_base); - erst_base &= ERST_PTR_MASK; - erst_base |= (ir->erst.erst_dma_addr & (u64) ~ERST_PTR_MASK); + erst_base &= ERST_BASE_RSVDP; + erst_base |= ir->erst.erst_dma_addr & ~ERST_BASE_RSVDP; xhci_write_64(xhci, erst_base, &ir->ir_set->erst_base); /* Set the event ring dequeue address of this interrupter */ diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 7e282b4522c0..5df370482521 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -514,7 +514,7 @@ struct xhci_intr_reg { #define ERST_SIZE_MASK (0xffff << 16) /* erst_base bitmasks */ -#define ERST_BASE_RSVDP (0x3f) +#define ERST_BASE_RSVDP (GENMASK_ULL(5, 0)) /* erst_dequeue bitmasks */ /* Dequeue ERST Segment Index (DESI) - Segment number (or alias) -- 2.25.1

2 years, 1 month

1
0
0 0

[PATCH 3/4] xhci: Clear EHB bit only at end of interrupt handler

by Mathias Nyman

From: Lukas Wunner <lukas(a)wunner.de> The Event Handler Busy bit shall be cleared by software when the Event Ring is empty. The xHC is thereby informed that it may raise another interrupt once it has enqueued new events (sec 4.17.2). However since commit dc0ffbea5729 ("usb: host: xhci: update event ring dequeue pointer on purpose"), the EHB bit is already cleared after half a segment has been processed. As a result, spurious interrupts may occur: - xhci_irq() processes half a segment, clears EHB, continues processing remaining events. - xHC enqueues new events. Because EHB has been cleared, xHC sets Interrupt Pending bit. Interrupt moderation countdown begins. - Meanwhile xhci_irq() continues processing events. Interrupt moderation countdown reaches zero, so an MSI interrupt is signaled. - xhci_irq() empties the Event Ring, clears EHB again and is done. - Because an MSI interrupt has been signaled, xhci_irq() is run again. It discovers there's nothing to do and returns IRQ_NONE. Avoid by clearing the EHB bit only at the end of xhci_irq(). Fixes: dc0ffbea5729 ("usb: host: xhci: update event ring dequeue pointer on purpose") Signed-off-by: Lukas Wunner <lukas(a)wunner.de> Cc: stable(a)vger.kernel.org # v5.5+ Cc: Peter Chen <peter.chen(a)kernel.org> Signed-off-by: Mathias Nyman <mathias.nyman(a)linux.intel.com> --- drivers/usb/host/xhci-ring.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 98389b568633..3e5dc0723a8f 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -2996,7 +2996,8 @@ static int xhci_handle_event(struct xhci_hcd *xhci, struct xhci_interrupter *ir) */ static void xhci_update_erst_dequeue(struct xhci_hcd *xhci, struct xhci_interrupter *ir, - union xhci_trb *event_ring_deq) + union xhci_trb *event_ring_deq, + bool clear_ehb) { u64 temp_64; dma_addr_t deq; @@ -3017,12 +3018,13 @@ static void xhci_update_erst_dequeue(struct xhci_hcd *xhci, return; /* Update HC event ring dequeue pointer */ - temp_64 &= ERST_PTR_MASK; + temp_64 &= ERST_DESI_MASK; temp_64 |= ((u64) deq & (u64) ~ERST_PTR_MASK); } /* Clear the event handler busy flag (RW1C) */ - temp_64 |= ERST_EHB; + if (clear_ehb) + temp_64 |= ERST_EHB; xhci_write_64(xhci, temp_64, &ir->ir_set->erst_dequeue); } @@ -3103,7 +3105,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd) while (xhci_handle_event(xhci, ir) > 0) { if (event_loop++ < TRBS_PER_SEGMENT / 2) continue; - xhci_update_erst_dequeue(xhci, ir, event_ring_deq); + xhci_update_erst_dequeue(xhci, ir, event_ring_deq, false); event_ring_deq = ir->event_ring->dequeue; /* ring is half-full, force isoc trbs to interrupt more often */ @@ -3113,7 +3115,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd) event_loop = 0; } - xhci_update_erst_dequeue(xhci, ir, event_ring_deq); + xhci_update_erst_dequeue(xhci, ir, event_ring_deq, true); ret = IRQ_HANDLED; out: -- 2.25.1

2 years, 1 month

1
0
0 0

[PATCH 2/4] xhci: track port suspend state correctly in unsuccessful resume cases

by Mathias Nyman

xhci-hub.c tracks suspended ports in a suspended_port bitfield. This is checked when responding to a Get_Status(PORT) request to see if a port in running U0 state was recently resumed, and adds the required USB_PORT_STAT_C_SUSPEND change bit in those cases. The suspended_port bit was left uncleared if a device is disconnected during suspend. The bit remained set even when a new device was connected and enumerated. The set bit resulted in a incorrect Get_Status(PORT) response with a bogus USB_PORT_STAT_C_SUSPEND change bit set once the new device reached U0 link state. USB_PORT_STAT_C_SUSPEND change bit is only used for USB2 ports, but xhci-hub keeps track of both USB2 and USB3 suspended ports. Cc: stable(a)vger.kernel.org Reported-by: Wesley Cheng <quic_wcheng(a)quicinc.com> Closes: https://lore.kernel.org/linux-usb/d68aa806-b26a-0e43-42fb-b8067325e967@quic… Fixes: 1d5810b6923c ("xhci: Rework port suspend structures for limited ports.") Tested-by: Wesley Cheng <quic_wcheng(a)quicinc.com> Signed-off-by: Mathias Nyman <mathias.nyman(a)linux.intel.com> --- drivers/usb/host/xhci-hub.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index 0054d02239e2..0df5d807a77e 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -1062,19 +1062,19 @@ static void xhci_get_usb3_port_status(struct xhci_port *port, u32 *status, *status |= USB_PORT_STAT_C_CONFIG_ERROR << 16; /* USB3 specific wPortStatus bits */ - if (portsc & PORT_POWER) { + if (portsc & PORT_POWER) *status |= USB_SS_PORT_STAT_POWER; - /* link state handling */ - if (link_state == XDEV_U0) - bus_state->suspended_ports &= ~(1 << portnum); - } - /* remote wake resume signaling complete */ - if (bus_state->port_remote_wakeup & (1 << portnum) && + /* no longer suspended or resuming */ + if (link_state != XDEV_U3 && link_state != XDEV_RESUME && link_state != XDEV_RECOVERY) { - bus_state->port_remote_wakeup &= ~(1 << portnum); - usb_hcd_end_port_resume(&hcd->self, portnum); + /* remote wake resume signaling complete */ + if (bus_state->port_remote_wakeup & (1 << portnum)) { + bus_state->port_remote_wakeup &= ~(1 << portnum); + usb_hcd_end_port_resume(&hcd->self, portnum); + } + bus_state->suspended_ports &= ~(1 << portnum); } xhci_hub_report_usb3_link_state(xhci, status, portsc); @@ -1131,6 +1131,7 @@ static void xhci_get_usb2_port_status(struct xhci_port *port, u32 *status, usb_hcd_end_port_resume(&port->rhub->hcd->self, portnum); } port->rexit_active = 0; + bus_state->suspended_ports &= ~(1 << portnum); } } -- 2.25.1

2 years, 1 month

1
0
0 0

[PATCH 1/4] usb: xhci: xhci-ring: Use sysdev for mapping bounce buffer

by Mathias Nyman

From: Wesley Cheng <quic_wcheng(a)quicinc.com> As mentioned in: commit 474ed23a6257 ("xhci: align the last trb before link if it is easily splittable.") A bounce buffer is utilized for ensuring that transfers that span across ring segments are aligned to the EP's max packet size. However, the device that is used to map the DMA buffer to is currently using the XHCI HCD, which does not carry any DMA operations in certain configrations. Migration to using the sysdev entry was introduced for DWC3 based implementations where the IOMMU operations are present. Replace the reference to the controller device to sysdev instead. This allows the bounce buffer to be properly mapped to any implementations that have an IOMMU involved. cc: <stable(a)vger.kernel.org> Fixes: 4c39d4b949d3 ("usb: xhci: use bus->sysdev for DMA configuration") Signed-off-by: Wesley Cheng <quic_wcheng(a)quicinc.com> Signed-off-by: Mathias Nyman <mathias.nyman(a)linux.intel.com> --- drivers/usb/host/xhci-ring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 1dde53f6eb31..98389b568633 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -798,7 +798,7 @@ static void xhci_giveback_urb_in_irq(struct xhci_hcd *xhci, static void xhci_unmap_td_bounce_buffer(struct xhci_hcd *xhci, struct xhci_ring *ring, struct xhci_td *td) { - struct device *dev = xhci_to_hcd(xhci)->self.controller; + struct device *dev = xhci_to_hcd(xhci)->self.sysdev; struct xhci_segment *seg = td->bounce_seg; struct urb *urb = td->urb; size_t len; @@ -3469,7 +3469,7 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred, static int xhci_align_td(struct xhci_hcd *xhci, struct urb *urb, u32 enqd_len, u32 *trb_buff_len, struct xhci_segment *seg) { - struct device *dev = xhci_to_hcd(xhci)->self.controller; + struct device *dev = xhci_to_hcd(xhci)->self.sysdev; unsigned int unalign; unsigned int max_pkt; u32 new_buff_len; -- 2.25.1

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] net/mlx5: Free IRQ rmap and notifier on kernel shutdown" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 314ded538e5f22e7610b1bf621402024a180ec80 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023080708-livable-distress-7173@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 314ded538e5f ("net/mlx5: Free IRQ rmap and notifier on kernel shutdown") 1da438c0ae02 ("net/mlx5: Fix indexing of mlx5_irq") 9c2d08010963 ("net/mlx5: Free irqs only on shutdown callback") 3354822cde5a ("net/mlx5: Use dynamic msix vectors allocation") 8bebfd767909 ("net/mlx5: Improve naming of pci function vectors") bbac70c74183 ("net/mlx5: Use newer affinity descriptor") 235a25fe28de ("net/mlx5: Modify struct mlx5_irq to use struct msi_map") 2acda57736de ("net/mlx5e: Improve remote NUMA preferences used for the IRQ affinity hints") 147cc5838c0f ("Merge tag 'irq-core-2022-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 314ded538e5f22e7610b1bf621402024a180ec80 Mon Sep 17 00:00:00 2001 From: Saeed Mahameed <saeedm(a)nvidia.com> Date: Thu, 8 Jun 2023 12:00:54 -0700 Subject: [PATCH] net/mlx5: Free IRQ rmap and notifier on kernel shutdown The kernel IRQ system needs the irq affinity notifier to be clear before attempting to free the irq, see WARN_ON log below. On a normal driver unload we don't have this issue since we do the complete cleanup of the irq resources. To fix this, put the important resources cleanup in a helper function and use it in both normal driver unload and shutdown flows. [ 4497.498434] ------------[ cut here ]------------ [ 4497.498726] WARNING: CPU: 0 PID: 9 at kernel/irq/manage.c:2034 free_irq+0x295/0x340 [ 4497.499193] Modules linked in: [ 4497.499386] CPU: 0 PID: 9 Comm: kworker/0:1 Tainted: G W 6.4.0-rc4+ #10 [ 4497.499876] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.2-1.fc38 04/01/2014 [ 4497.500518] Workqueue: events do_poweroff [ 4497.500849] RIP: 0010:free_irq+0x295/0x340 [ 4497.501132] Code: 85 c0 0f 84 1d ff ff ff 48 89 ef ff d0 0f 1f 00 e9 10 ff ff ff 0f 0b e9 72 ff ff ff 49 8d 7f 28 ff d0 0f 1f 00 e9 df fd ff ff <0f> 0b 48 c7 80 c0 008 [ 4497.502269] RSP: 0018:ffffc90000053da0 EFLAGS: 00010282 [ 4497.502589] RAX: ffff888100949600 RBX: ffff88810330b948 RCX: 0000000000000000 [ 4497.503035] RDX: ffff888100949600 RSI: ffff888100400490 RDI: 0000000000000023 [ 4497.503472] RBP: ffff88810330c7e0 R08: ffff8881004005d0 R09: ffffffff8273a260 [ 4497.503923] R10: 0000000000000000 R11: 0000000000000000 R12: ffff8881009ae000 [ 4497.504359] R13: ffff8881009ae148 R14: 0000000000000000 R15: ffff888100949600 [ 4497.504804] FS: 0000000000000000(0000) GS:ffff88813bc00000(0000) knlGS:0000000000000000 [ 4497.505302] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 4497.505671] CR2: 00007fce98806298 CR3: 000000000262e005 CR4: 0000000000370ef0 [ 4497.506104] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 4497.506540] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 4497.507002] Call Trace: [ 4497.507158] <TASK> [ 4497.507299] ? free_irq+0x295/0x340 [ 4497.507522] ? __warn+0x7c/0x130 [ 4497.507740] ? free_irq+0x295/0x340 [ 4497.507963] ? report_bug+0x171/0x1a0 [ 4497.508197] ? handle_bug+0x3c/0x70 [ 4497.508417] ? exc_invalid_op+0x17/0x70 [ 4497.508662] ? asm_exc_invalid_op+0x1a/0x20 [ 4497.508926] ? free_irq+0x295/0x340 [ 4497.509146] mlx5_irq_pool_free_irqs+0x48/0x90 [ 4497.509421] mlx5_irq_table_free_irqs+0x38/0x50 [ 4497.509714] mlx5_core_eq_free_irqs+0x27/0x40 [ 4497.509984] shutdown+0x7b/0x100 [ 4497.510184] pci_device_shutdown+0x30/0x60 [ 4497.510440] device_shutdown+0x14d/0x240 [ 4497.510698] kernel_power_off+0x30/0x70 [ 4497.510938] process_one_work+0x1e6/0x3e0 [ 4497.511183] worker_thread+0x49/0x3b0 [ 4497.511407] ? __pfx_worker_thread+0x10/0x10 [ 4497.511679] kthread+0xe0/0x110 [ 4497.511879] ? __pfx_kthread+0x10/0x10 [ 4497.512114] ret_from_fork+0x29/0x50 [ 4497.512342] </TASK> Fixes: 9c2d08010963 ("net/mlx5: Free irqs only on shutdown callback") Signed-off-by: Saeed Mahameed <saeedm(a)nvidia.com> Reviewed-by: Shay Drory <shayd(a)nvidia.com> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c index 33b9359de53d..98412bd5a696 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c @@ -126,14 +126,22 @@ int mlx5_set_msix_vec_count(struct mlx5_core_dev *dev, int function_id, return ret; } -static void irq_release(struct mlx5_irq *irq) +/* mlx5_system_free_irq - Free an IRQ + * @irq: IRQ to free + * + * Free the IRQ and other resources such as rmap from the system. + * BUT doesn't free or remove reference from mlx5. + * This function is very important for the shutdown flow, where we need to + * cleanup system resoruces but keep mlx5 objects alive, + * see mlx5_irq_table_free_irqs(). + */ +static void mlx5_system_free_irq(struct mlx5_irq *irq) { struct mlx5_irq_pool *pool = irq->pool; #ifdef CONFIG_RFS_ACCEL struct cpu_rmap *rmap; #endif - xa_erase(&pool->irqs, irq->pool_index); /* free_irq requires that affinity_hint and rmap will be cleared before * calling it. To satisfy this requirement, we call * irq_cpu_rmap_remove() to remove the notifier @@ -145,10 +153,18 @@ static void irq_release(struct mlx5_irq *irq) irq_cpu_rmap_remove(rmap, irq->map.virq); #endif - free_cpumask_var(irq->mask); free_irq(irq->map.virq, &irq->nh); if (irq->map.index && pci_msix_can_alloc_dyn(pool->dev->pdev)) pci_msix_free_irq(pool->dev->pdev, irq->map); +} + +static void irq_release(struct mlx5_irq *irq) +{ + struct mlx5_irq_pool *pool = irq->pool; + + xa_erase(&pool->irqs, irq->pool_index); + mlx5_system_free_irq(irq); + free_cpumask_var(irq->mask); kfree(irq); } @@ -705,7 +721,8 @@ static void mlx5_irq_pool_free_irqs(struct mlx5_irq_pool *pool) unsigned long index; xa_for_each(&pool->irqs, index, irq) - free_irq(irq->map.virq, &irq->nh); + mlx5_system_free_irq(irq); + } static void mlx5_irq_pools_free_irqs(struct mlx5_irq_table *table)

2 years, 1 month

2
1
0 0

FAILED: patch "[PATCH] net/mlx5: Free IRQ rmap and notifier on kernel shutdown" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 314ded538e5f22e7610b1bf621402024a180ec80 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023080706-enclosure-disobey-0b27@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 314ded538e5f ("net/mlx5: Free IRQ rmap and notifier on kernel shutdown") 1da438c0ae02 ("net/mlx5: Fix indexing of mlx5_irq") 9c2d08010963 ("net/mlx5: Free irqs only on shutdown callback") 3354822cde5a ("net/mlx5: Use dynamic msix vectors allocation") 8bebfd767909 ("net/mlx5: Improve naming of pci function vectors") bbac70c74183 ("net/mlx5: Use newer affinity descriptor") 235a25fe28de ("net/mlx5: Modify struct mlx5_irq to use struct msi_map") 2acda57736de ("net/mlx5e: Improve remote NUMA preferences used for the IRQ affinity hints") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 314ded538e5f22e7610b1bf621402024a180ec80 Mon Sep 17 00:00:00 2001 From: Saeed Mahameed <saeedm(a)nvidia.com> Date: Thu, 8 Jun 2023 12:00:54 -0700 Subject: [PATCH] net/mlx5: Free IRQ rmap and notifier on kernel shutdown The kernel IRQ system needs the irq affinity notifier to be clear before attempting to free the irq, see WARN_ON log below. On a normal driver unload we don't have this issue since we do the complete cleanup of the irq resources. To fix this, put the important resources cleanup in a helper function and use it in both normal driver unload and shutdown flows. [ 4497.498434] ------------[ cut here ]------------ [ 4497.498726] WARNING: CPU: 0 PID: 9 at kernel/irq/manage.c:2034 free_irq+0x295/0x340 [ 4497.499193] Modules linked in: [ 4497.499386] CPU: 0 PID: 9 Comm: kworker/0:1 Tainted: G W 6.4.0-rc4+ #10 [ 4497.499876] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.2-1.fc38 04/01/2014 [ 4497.500518] Workqueue: events do_poweroff [ 4497.500849] RIP: 0010:free_irq+0x295/0x340 [ 4497.501132] Code: 85 c0 0f 84 1d ff ff ff 48 89 ef ff d0 0f 1f 00 e9 10 ff ff ff 0f 0b e9 72 ff ff ff 49 8d 7f 28 ff d0 0f 1f 00 e9 df fd ff ff <0f> 0b 48 c7 80 c0 008 [ 4497.502269] RSP: 0018:ffffc90000053da0 EFLAGS: 00010282 [ 4497.502589] RAX: ffff888100949600 RBX: ffff88810330b948 RCX: 0000000000000000 [ 4497.503035] RDX: ffff888100949600 RSI: ffff888100400490 RDI: 0000000000000023 [ 4497.503472] RBP: ffff88810330c7e0 R08: ffff8881004005d0 R09: ffffffff8273a260 [ 4497.503923] R10: 0000000000000000 R11: 0000000000000000 R12: ffff8881009ae000 [ 4497.504359] R13: ffff8881009ae148 R14: 0000000000000000 R15: ffff888100949600 [ 4497.504804] FS: 0000000000000000(0000) GS:ffff88813bc00000(0000) knlGS:0000000000000000 [ 4497.505302] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 4497.505671] CR2: 00007fce98806298 CR3: 000000000262e005 CR4: 0000000000370ef0 [ 4497.506104] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 4497.506540] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 4497.507002] Call Trace: [ 4497.507158] <TASK> [ 4497.507299] ? free_irq+0x295/0x340 [ 4497.507522] ? __warn+0x7c/0x130 [ 4497.507740] ? free_irq+0x295/0x340 [ 4497.507963] ? report_bug+0x171/0x1a0 [ 4497.508197] ? handle_bug+0x3c/0x70 [ 4497.508417] ? exc_invalid_op+0x17/0x70 [ 4497.508662] ? asm_exc_invalid_op+0x1a/0x20 [ 4497.508926] ? free_irq+0x295/0x340 [ 4497.509146] mlx5_irq_pool_free_irqs+0x48/0x90 [ 4497.509421] mlx5_irq_table_free_irqs+0x38/0x50 [ 4497.509714] mlx5_core_eq_free_irqs+0x27/0x40 [ 4497.509984] shutdown+0x7b/0x100 [ 4497.510184] pci_device_shutdown+0x30/0x60 [ 4497.510440] device_shutdown+0x14d/0x240 [ 4497.510698] kernel_power_off+0x30/0x70 [ 4497.510938] process_one_work+0x1e6/0x3e0 [ 4497.511183] worker_thread+0x49/0x3b0 [ 4497.511407] ? __pfx_worker_thread+0x10/0x10 [ 4497.511679] kthread+0xe0/0x110 [ 4497.511879] ? __pfx_kthread+0x10/0x10 [ 4497.512114] ret_from_fork+0x29/0x50 [ 4497.512342] </TASK> Fixes: 9c2d08010963 ("net/mlx5: Free irqs only on shutdown callback") Signed-off-by: Saeed Mahameed <saeedm(a)nvidia.com> Reviewed-by: Shay Drory <shayd(a)nvidia.com> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c index 33b9359de53d..98412bd5a696 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c @@ -126,14 +126,22 @@ int mlx5_set_msix_vec_count(struct mlx5_core_dev *dev, int function_id, return ret; } -static void irq_release(struct mlx5_irq *irq) +/* mlx5_system_free_irq - Free an IRQ + * @irq: IRQ to free + * + * Free the IRQ and other resources such as rmap from the system. + * BUT doesn't free or remove reference from mlx5. + * This function is very important for the shutdown flow, where we need to + * cleanup system resoruces but keep mlx5 objects alive, + * see mlx5_irq_table_free_irqs(). + */ +static void mlx5_system_free_irq(struct mlx5_irq *irq) { struct mlx5_irq_pool *pool = irq->pool; #ifdef CONFIG_RFS_ACCEL struct cpu_rmap *rmap; #endif - xa_erase(&pool->irqs, irq->pool_index); /* free_irq requires that affinity_hint and rmap will be cleared before * calling it. To satisfy this requirement, we call * irq_cpu_rmap_remove() to remove the notifier @@ -145,10 +153,18 @@ static void irq_release(struct mlx5_irq *irq) irq_cpu_rmap_remove(rmap, irq->map.virq); #endif - free_cpumask_var(irq->mask); free_irq(irq->map.virq, &irq->nh); if (irq->map.index && pci_msix_can_alloc_dyn(pool->dev->pdev)) pci_msix_free_irq(pool->dev->pdev, irq->map); +} + +static void irq_release(struct mlx5_irq *irq) +{ + struct mlx5_irq_pool *pool = irq->pool; + + xa_erase(&pool->irqs, irq->pool_index); + mlx5_system_free_irq(irq); + free_cpumask_var(irq->mask); kfree(irq); } @@ -705,7 +721,8 @@ static void mlx5_irq_pool_free_irqs(struct mlx5_irq_pool *pool) unsigned long index; xa_for_each(&pool->irqs, index, irq) - free_irq(irq->map.virq, &irq->nh); + mlx5_system_free_irq(irq); + } static void mlx5_irq_pools_free_irqs(struct mlx5_irq_table *table)

2 years, 1 month

2
1
0 0

[PATCH 1/2] s390/vfio-ap: unpin pages on gisc registration failure

by Tony Krowiak

From: Anthony Krowiak <akrowiak(a)linux.ibm.com> In the vfio_ap_irq_enable function, after the page containing the notification indicator byte (NIB) is pinned, the function attempts to register the guest ISC. If registration fails, the function sets the status response code and returns without unpinning the page containing the NIB. In order to avoid a memory leak, the NIB should be unpinned before returning from the vfio_ap_irq_enable function. Fixes: 783f0a3ccd79 ("s390/vfio-ap: add s390dbf logging to the vfio_ap_irq_enable function") Signed-off-by: Janosch Frank <frankja(a)linux.ibm.com> Signed-off-by: Anthony Krowiak <akrowiak(a)linux.ibm.com> Cc: <stable(a)vger.kernel.org> --- drivers/s390/crypto/vfio_ap_ops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c index 4db538a55192..9cb28978c186 100644 --- a/drivers/s390/crypto/vfio_ap_ops.c +++ b/drivers/s390/crypto/vfio_ap_ops.c @@ -457,6 +457,7 @@ static struct ap_queue_status vfio_ap_irq_enable(struct vfio_ap_queue *q, VFIO_AP_DBF_WARN("%s: gisc registration failed: nisc=%d, isc=%d, apqn=%#04x\n", __func__, nisc, isc, q->apqn); + vfio_unpin_pages(&q->matrix_mdev->vdev, nib, 1); status.response_code = AP_RESPONSE_INVALID_GISA; return status; } -- 2.41.0

2 years, 1 month

2
2
0 0

[PATCH] drm: bridge: it66121: ->get_edid callback must not return err pointers

by Jani Nikula

The drm stack does not expect error valued pointers for EDID anywhere. Fixes: e66856508746 ("drm: bridge: it66121: Set DDC preamble only once before reading EDID") Cc: Paul Cercueil <paul(a)crapouillou.net> Cc: Robert Foss <robert.foss(a)linaro.org> Cc: Phong LE <ple(a)baylibre.com> Cc: Neil Armstrong <neil.armstrong(a)linaro.org> Cc: Andrzej Hajda <andrzej.hajda(a)intel.com> Cc: Robert Foss <rfoss(a)kernel.org> Cc: Laurent Pinchart <Laurent.pinchart(a)ideasonboard.com> Cc: Jonas Karlman <jonas(a)kwiboo.se> Cc: Jernej Skrabec <jernej.skrabec(a)gmail.com> Cc: <stable(a)vger.kernel.org> # v6.3+ Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> --- UNTESTED --- drivers/gpu/drm/bridge/ite-it66121.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c index 3c9b42c9d2ee..1cf3fb1f13dc 100644 --- a/drivers/gpu/drm/bridge/ite-it66121.c +++ b/drivers/gpu/drm/bridge/ite-it66121.c @@ -884,14 +884,14 @@ static struct edid *it66121_bridge_get_edid(struct drm_bridge *bridge, mutex_lock(&ctx->lock); ret = it66121_preamble_ddc(ctx); if (ret) { - edid = ERR_PTR(ret); + edid = NULL; goto out_unlock; } ret = regmap_write(ctx->regmap, IT66121_DDC_HEADER_REG, IT66121_DDC_HEADER_EDID); if (ret) { - edid = ERR_PTR(ret); + edid = NULL; goto out_unlock; } -- 2.39.2

2 years, 1 month

3
2
0 0

Re: [PATCH v2] drm/amdgpu: always use legacy tlb flush on cyan_skilfish

by Lang Yu

On 09/14/ , Felix Kuehling wrote: > On 2023-09-14 10:02, Christian König wrote: Do we still need to use legacy flush to emulate heavyweight flush if we don't use SVM? And can I push this now? Regards, Lang > > > > Am 14.09.23 um 15:59 schrieb Felix Kuehling: > > > > > > On 2023-09-14 9:39, Christian König wrote: > > > > Is a single legacy flush sufficient to emulate an heavyweight > > > > flush as well? > > > > > > > > On previous generations we needed to issue at least two legacy > > > > flushes for this. > > > I assume you are referring to the Vega20 XGMI workaround. That is a > > > very different issue. Because PTEs would be cached in L2, we had to > > > always use a heavy-weight flush that would also flush the L2 cache > > > as well, and follow that with another legacy flush to deal with race > > > conditions where stale PTEs could be re-fetched from L2 before the > > > L2 flush was complete. > > > > No, we also have another (badly documented) workaround which issues a > > legacy flush before each heavy weight on some hw generations. See the my > > TLB flush cleanup patches. > > > > > > > > A heavy-weight flush guarantees that there are no more possible > > > memory accesses using the old PTEs. With physically addressed caches > > > on GFXv9 that includes a cache flush because the address translation > > > happened before putting data into the cache. I think the address > > > translation and cache architecture works differently on GFXv10. So > > > maybe the cache-flush is not required here. > > > > > > But even then a legacy flush probably allows for in-flight memory > > > accesses with old physical addresses to complete after the TLB > > > flush. So there is a small risk of memory corruption that was > > > assumed to not be accessed by the GPU any more. Or when using IOMMU > > > device isolation it would result in IOMMU faults if the DMA mappings > > > are invalidated slightly too early. > > > > Mhm, that's quite bad. Any idea how to avoid that? > > A few ideas > > * Add an arbitrary delay and hope that it is longer than the FIFOs in > the HW > * Execute an atomic operation to memory on some GPU engine that could > act as a fence, maybe just a RELEASE_MEM on the CP to some writeback > location would do the job > * If needed, RELEASE_MEM could also perform a cache flush > > Regards, > Felix > > > > > > Regards, > > Christian. > > > > > > > > Regards, > > > Felix > > > > > > > > > > > > > > And please don't push before getting an rb from Felix as well. > > > > > > > > Regards, > > > > Christian. > > > > > > > > > > > > Am 14.09.23 um 11:23 schrieb Lang Yu: > > > > > cyan_skilfish has problems with other flush types. > > > > > > > > > > v2: fix incorrect ternary conditional operator usage.(Yifan) > > > > > > > > > > Signed-off-by: Lang Yu <Lang.Yu(a)amd.com> > > > > > Cc: <stable(a)vger.kernel.org> # v5.15+ > > > > > --- > > > > > drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 7 ++++++- > > > > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > > > > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c > > > > > b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c > > > > > index d3da13f4c80e..c6d11047169a 100644 > > > > > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c > > > > > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c > > > > > @@ -236,7 +236,8 @@ static void > > > > > gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t > > > > > vmid, > > > > > { > > > > > bool use_semaphore = > > > > > gmc_v10_0_use_invalidate_semaphore(adev, vmhub); > > > > > struct amdgpu_vmhub *hub = &adev->vmhub[vmhub]; > > > > > - u32 inv_req = > > > > > hub->vmhub_funcs->get_invalidate_req(vmid, flush_type); > > > > > + u32 inv_req = hub->vmhub_funcs->get_invalidate_req(vmid, > > > > > + (adev->asic_type != CHIP_CYAN_SKILLFISH) ? > > > > > flush_type : 0); > > > > > u32 tmp; > > > > > /* Use register 17 for GART */ > > > > > const unsigned int eng = 17; > > > > > @@ -331,6 +332,8 @@ static void > > > > > gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t > > > > > vmid, > > > > > int r; > > > > > + flush_type = (adev->asic_type != CHIP_CYAN_SKILLFISH) > > > > > ? flush_type : 0; > > > > > + > > > > > /* flush hdp cache */ > > > > > adev->hdp.funcs->flush_hdp(adev, NULL); > > > > > @@ -426,6 +429,8 @@ static int > > > > > gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev, > > > > > struct amdgpu_ring *ring = &adev->gfx.kiq[0].ring; > > > > > struct amdgpu_kiq *kiq = &adev->gfx.kiq[0]; > > > > > + flush_type = (adev->asic_type != CHIP_CYAN_SKILLFISH) > > > > > ? flush_type : 0; > > > > > + > > > > > if (amdgpu_emu_mode == 0 && ring->sched.ready) { > > > > > spin_lock(&adev->gfx.kiq[0].ring_lock); > > > > > /* 2 dwords flush + 8 dwords fence */ > > > > > >

2 years, 1 month

2
1
0 0

Do Contact me for more details

by Mr Psacal Yembiline

Hi friend I am a banker in ADB BANK. I want to transfer an abandoned $18.5Million to your Bank account. 50/percent will be your share. No risk involved but keep it as secret. Contact me for more details. I am requesting for your urgent assistance to collaborate with you to move the balance sum of $18.5 Million US Dollars and 950kg of gold bars, this is a very genuine business that need full concentration, corporation and transparency between the both of us and its %100 free from any risk. I agreed to share the funds and gold bars with you in ratio of %50 %50. Yours Mr Pascal Yembiline

2 years, 1 month

1
0
0 0

[PATCH v5] driver core: platform: set numa_node before platform_add_device()

by Jinhui Guo

platform_add_device() creates the numa_node attribute of sysfs according to whether dev_to_node(dev) is equal to NUMA_NO_NODE. So set the numa node of device before creating numa_node attribute of sysfs. Fixes: 4a60406d3592 ("driver core: platform: expose numa_node to users in sysfs") Cc: stable(a)vger.kernel.org Reported-by: kernel test robot <lkp(a)intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202309122309.mbxAnAIe-lkp@intel.com/ Signed-off-by: Jinhui Guo <guojinhui.liam(a)bytedance.com> --- V4 -> V5: Add Cc: stable line and changes from the previous submited patches V3 -> V4: Refactor code to be an ACPI function call V2 -> V3: Fix Signed-off name V1 -> V2: Fix compile error without enabling CONFIG_ACPI drivers/acpi/acpi_platform.c | 4 +--- drivers/base/platform.c | 1 + include/linux/acpi.h | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c index 48d15dd785f6..adcbfbdc343f 100644 --- a/drivers/acpi/acpi_platform.c +++ b/drivers/acpi/acpi_platform.c @@ -178,11 +178,9 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev, if (IS_ERR(pdev)) dev_err(&adev->dev, "platform device creation failed: %ld\n", PTR_ERR(pdev)); - else { - set_dev_node(&pdev->dev, acpi_get_node(adev->handle)); + else dev_dbg(&adev->dev, "created platform device %s\n", dev_name(&pdev->dev)); - } kfree(resources); diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 76bfcba25003..35c891075d95 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -841,6 +841,7 @@ struct platform_device *platform_device_register_full( goto err; } + set_dev_node(&pdev->dev, ACPI_NODE_GET(ACPI_COMPANION(&pdev->dev))); ret = platform_device_add(pdev); if (ret) { err: diff --git a/include/linux/acpi.h b/include/linux/acpi.h index a73246c3c35e..6a349d53f19e 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -477,6 +477,10 @@ static inline int acpi_get_node(acpi_handle handle) return 0; } #endif + +#define ACPI_NODE_GET(adev) ((adev) && (adev)->handle ? \ + acpi_get_node((adev)->handle) : NUMA_NO_NODE) + extern int pnpacpi_disabled; #define PXM_INVAL (-1) @@ -770,6 +774,7 @@ const char *acpi_get_subsystem_id(acpi_handle handle); #define ACPI_COMPANION_SET(dev, adev) do { } while (0) #define ACPI_HANDLE(dev) (NULL) #define ACPI_HANDLE_FWNODE(fwnode) (NULL) +#define ACPI_NODE_GET(adev) NUMA_NO_NODE #include <acpi/acpi_numa.h> -- 2.20.1

2 years, 1 month

1
0
0 0

[to-be-updated] kasan-fix-access-invalid-shadow-address-when-input-is-illegal.patch removed from -mm tree

by Andrew Morton

The quilt patch titled Subject: kasan: fix access invalid shadow address when input is illegal has been removed from the -mm tree. Its filename was kasan-fix-access-invalid-shadow-address-when-input-is-illegal.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Haibo Li <haibo.li(a)mediatek.com> Subject: kasan: fix access invalid shadow address when input is illegal Date: Thu, 14 Sep 2023 16:08:33 +0800 when the input address is illegal,the corresponding shadow address from kasan_mem_to_shadow may have no mapping in mmu table. Access such shadow address causes kernel oops. Here is a sample about oops on arm64(VA 39bit) with KASAN_SW_TAGS on: [ffffffb80aaaaaaa] pgd=000000005d3ce003, p4d=000000005d3ce003, pud=000000005d3ce003, pmd=0000000000000000 Internal error: Oops: 0000000096000006 [#1] PREEMPT SMP Modules linked in: CPU: 3 PID: 100 Comm: sh Not tainted 6.6.0-rc1-dirty #43 Hardware name: linux,dummy-virt (DT) pstate: 80000005 (Nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : __hwasan_load8_noabort+0x5c/0x90 lr : do_ib_ob+0xf4/0x110 ffffffb80aaaaaaa is the shadow address for efffff80aaaaaaaa. The problem is reading invalid shadow in kasan_check_range. The generic kasan also has similar oops. To fix it,check shadow address by reading it with no fault. After this patch,KASAN is able to report invalid memory access for this case. Link: https://lkml.kernel.org/r/20230914080833.50026-1-haibo.li@mediatek.com Signed-off-by: Haibo Li <haibo.li(a)mediatek.com> Cc: Alexander Potapenko <glider(a)google.com> Cc: Andrey Konovalov <andreyknvl(a)gmail.com> Cc: Andrey Ryabinin <ryabinin.a.a(a)gmail.com> Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> Cc: Dmitry Vyukov <dvyukov(a)google.com> Cc: Matthias Brugger <matthias.bgg(a)gmail.com> Cc: Vincenzo Frascino <vincenzo.frascino(a)arm.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/kasan/kasan.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) --- a/mm/kasan/kasan.h~kasan-fix-access-invalid-shadow-address-when-input-is-illegal +++ a/mm/kasan/kasan.h @@ -304,8 +304,17 @@ static __always_inline bool addr_has_met #ifdef __HAVE_ARCH_SHADOW_MAP return (kasan_mem_to_shadow((void *)addr) != NULL); #else - return (kasan_reset_tag(addr) >= - kasan_shadow_to_mem((void *)KASAN_SHADOW_START)); + u8 *shadow, shadow_val; + + if (kasan_reset_tag(addr) < + kasan_shadow_to_mem((void *)KASAN_SHADOW_START)) + return false; + /* use read with nofault to check whether the shadow is accessible */ + shadow = kasan_mem_to_shadow((void *)addr); + __get_kernel_nofault(&shadow_val, shadow, u8, fault); + return true; +fault: + return false; #endif } _ Patches currently in -mm which might be from haibo.li(a)mediatek.com are

2 years, 1 month

1
0
0 0

[PATCH v1] mmc: Add quirk MMC_QUIRK_BROKEN_CACHE_FLUSH for Micron eMMC Q2J54A

by Bean Huo

From: Bean Huo <beanhuo(a)micron.com> Micron MTFC4GACAJCN eMMC supports cache but requires that flush cache operation be allowed only after a write has occurred. Otherwise, the cache flush command or subsequent commands will time out. Signed-off-by: Bean Huo <beanhuo(a)micron.com> Cc: stable(a)vger.kernel.org --- drivers/mmc/core/core.c | 6 ++++++ drivers/mmc/core/mmc.c | 5 +++++ drivers/mmc/core/quirks.h | 7 ++++--- include/linux/mmc/card.h | 2 ++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 3d3e0ca52614..5f858eb5f62c 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -259,6 +259,12 @@ static void __mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) host->cqe_ops->cqe_off(host); host->ops->request(host, mrq); + + if (host->card->quirks & MMC_QUIRK_BROKEN_CACHE_FLUSH && !host->card->written_flag) { + if (mrq->cmd->opcode == MMC_WRITE_MULTIPLE_BLOCK || + mrq->cmd->opcode == MMC_WRITE_BLOCK) + host->card->written_flag = true; + } } static void mmc_mrq_pr_debug(struct mmc_host *host, struct mmc_request *mrq, diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 89cd48fcec79..a2edd065fa1b 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1929,6 +1929,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, if (!oldcard) host->card = card; + card->written_flag = false; + return 0; free_card: @@ -2081,6 +2083,9 @@ static int _mmc_flush_cache(struct mmc_host *host) { int err = 0; + if (host->card->quirks & MMC_QUIRK_BROKEN_CACHE_FLUSH && !host->card->written_flag) + return err; + if (_mmc_cache_enabled(host)) { err = mmc_switch(host->card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_FLUSH_CACHE, 1, diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h index 32b64b564fb1..5e68c8b4cdca 100644 --- a/drivers/mmc/core/quirks.h +++ b/drivers/mmc/core/quirks.h @@ -110,11 +110,12 @@ static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = { MMC_QUIRK_TRIM_BROKEN), /* - * Micron MTFC4GACAJCN-1M advertises TRIM but it does not seems to - * support being used to offload WRITE_ZEROES. + * Micron MTFC4GACAJCN-1M supports TRIM but does not appear to suppor + * WRITE_ZEROES offloading. It also supports caching, but the cache can + * only be flushed after a write has occurred. */ MMC_FIXUP("Q2J54A", CID_MANFID_MICRON, 0x014e, add_quirk_mmc, - MMC_QUIRK_TRIM_BROKEN), + MMC_QUIRK_TRIM_BROKEN | MMC_QUIRK_BROKEN_CACHE_FLUSH), /* * Kingston EMMC04G-M627 advertises TRIM but it does not seems to diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index daa2f40d9ce6..7b12eebc5586 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -295,7 +295,9 @@ struct mmc_card { #define MMC_QUIRK_BROKEN_HPI (1<<13) /* Disable broken HPI support */ #define MMC_QUIRK_BROKEN_SD_DISCARD (1<<14) /* Disable broken SD discard support */ #define MMC_QUIRK_BROKEN_SD_CACHE (1<<15) /* Disable broken SD cache support */ +#define MMC_QUIRK_BROKEN_CACHE_FLUSH (1<<16) /* Don't flush cache until the write has occurred */ + bool written_flag; /* Indicates eMMC has been written since power on */ bool reenable_cmdq; /* Re-enable Command Queue */ unsigned int erase_size; /* erase size in sectors */ -- 2.34.1

2 years, 1 month

2
3
0 0

[PATCHv2] nvme: avoid bogus CRTO values

by Keith Busch

From: Keith Busch <kbusch(a)kernel.org> Some devices are reporting Controller Ready Modes Supported, but return 0 for CRTO. These devices require a much higher time to ready than that, so they are failing to initialize after the driver started preferring that value over CAP.TO. The spec requires CAP.TO match the appropritate CRTO value, or be set to 0xff if CRTO is larger than that. This means that CAP.TO can be used to validate if CRTO is reliable, and provides an appropriate fallback for setting the timeout value if not. Use whichever is larger. Link: https://bugzilla.kernel.org/show_bug.cgi?id=217863 Reported-by: Cláudio Sampaio <patola(a)gmail.com> Reported-by: Felix Yan <felixonmars(a)archlinux.org> Based-on-a-patch-by: Felix Yan <felixonmars(a)archlinux.org> Reviewed-by: Sagi Grimberg <sagi(a)grimberg.me> Cc: stable(a)vger.kernel.org Signed-off-by: Keith Busch <kbusch(a)kernel.org> --- v1->v2: Warn once if driver isn't relying on CRTO values drivers/nvme/host/core.c | 54 ++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 37b6fa7466620..0685ed4f2dc49 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2245,25 +2245,8 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl) else ctrl->ctrl_config = NVME_CC_CSS_NVM; - if (ctrl->cap & NVME_CAP_CRMS_CRWMS) { - u32 crto; - - ret = ctrl->ops->reg_read32(ctrl, NVME_REG_CRTO, &crto); - if (ret) { - dev_err(ctrl->device, "Reading CRTO failed (%d)\n", - ret); - return ret; - } - - if (ctrl->cap & NVME_CAP_CRMS_CRIMS) { - ctrl->ctrl_config |= NVME_CC_CRIME; - timeout = NVME_CRTO_CRIMT(crto); - } else { - timeout = NVME_CRTO_CRWMT(crto); - } - } else { - timeout = NVME_CAP_TIMEOUT(ctrl->cap); - } + if (ctrl->cap & NVME_CAP_CRMS_CRWMS && ctrl->cap & NVME_CAP_CRMS_CRIMS) + ctrl->ctrl_config |= NVME_CC_CRIME; ctrl->ctrl_config |= (NVME_CTRL_PAGE_SHIFT - 12) << NVME_CC_MPS_SHIFT; ctrl->ctrl_config |= NVME_CC_AMS_RR | NVME_CC_SHN_NONE; @@ -2277,6 +2260,39 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl) if (ret) return ret; + /* CAP value may change after initial CC write */ + ret = ctrl->ops->reg_read64(ctrl, NVME_REG_CAP, &ctrl->cap); + if (ret) + return ret; + + timeout = NVME_CAP_TIMEOUT(ctrl->cap); + if (ctrl->cap & NVME_CAP_CRMS_CRWMS) { + u32 crto, ready_timeout; + + ret = ctrl->ops->reg_read32(ctrl, NVME_REG_CRTO, &crto); + if (ret) { + dev_err(ctrl->device, "Reading CRTO failed (%d)\n", + ret); + return ret; + } + + /* + * CRTO should always be greater or equal to CAP.TO, but some + * devices are known to get this wrong. Use the larger of the + * two values. + */ + if (ctrl->ctrl_config & NVME_CC_CRIME) + ready_timeout = NVME_CRTO_CRIMT(crto); + else + ready_timeout = NVME_CRTO_CRWMT(crto); + + if (ready_timeout < timeout) + dev_warn_once(ctrl->device, "bad crto:%x cap:%llx\n", + crto, ctrl->cap); + else + timeout = ready_timeout; + } + ctrl->ctrl_config |= NVME_CC_ENABLE; ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC, ctrl->ctrl_config); if (ret) -- 2.34.1

2 years, 1 month

3
4
0 0

[PATCH v3 1/5] mm/cma: use nth_page() in place of direct struct page manipulation.

by Zi Yan

From: Zi Yan <ziy(a)nvidia.com> When dealing with hugetlb pages, manipulating struct page pointers directly can get to wrong struct page, since struct page is not guaranteed to be contiguous on SPARSEMEM without VMEMMAP. Use nth_page() to handle it properly. Fixes: 2813b9c02962 ("kasan, mm, arm64: tag non slab memory allocated via pagealloc") Cc: <stable(a)vger.kernel.org> Signed-off-by: Zi Yan <ziy(a)nvidia.com> Reviewed-by: Muchun Song <songmuchun(a)bytedance.com> --- mm/cma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/cma.c b/mm/cma.c index da2967c6a223..2b2494fd6b59 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -505,7 +505,7 @@ struct page *cma_alloc(struct cma *cma, unsigned long count, */ if (page) { for (i = 0; i < count; i++) - page_kasan_tag_reset(page + i); + page_kasan_tag_reset(nth_page(page, i)); } if (ret && !no_warn) { -- 2.40.1

2 years, 1 month

3
2
0 0

+ proc-nommu-proc-pid-maps-release-mmap-read-lock.patch added to mm-hotfixes-unstable branch

by Andrew Morton

The patch titled Subject: proc: nommu: /proc/<pid>/maps: release mmap read lock has been added to the -mm mm-hotfixes-unstable branch. Its filename is proc-nommu-proc-pid-maps-release-mmap-read-lock.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche… This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Ben Wolsieffer <Ben.Wolsieffer(a)hefring.com> Subject: proc: nommu: /proc/<pid>/maps: release mmap read lock Date: Thu, 14 Sep 2023 12:30:20 -0400 On NOMMU, when running "cat /proc/1/maps" twice the second run hangs. The no-MMU implementation of /proc/<pid>/map doesn't normally release the mmap read lock, because it uses !IS_ERR_OR_NULL(_vml) to determine whether to release the lock. Since _vml is NULL when the end of the mappings is reached, the lock is not released. This code was incorrectly adapted from the MMU implementation, which at the time released the lock in m_next() before returning the last entry. The MMU implementation has diverged further from the no-MMU version since then, so this patch brings their locking and error handling into sync, fixing the bug and hopefully avoiding similar issues in the future. Link: https://lkml.kernel.org/r/20230914163019.4050530-2-ben.wolsieffer@hefring.c… Fixes: 47fecca15c09 ("fs/proc/task_nommu.c: don't use priv->task->mm") Signed-off-by: Ben Wolsieffer <ben.wolsieffer(a)hefring.com> Cc: Giulio Benetti <giulio.benetti(a)benettiengineering.com> Cc: Greg Ungerer <gerg(a)uclinux.org> Cc: Oleg Nesterov <oleg(a)redhat.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- fs/proc/task_nommu.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) --- a/fs/proc/task_nommu.c~proc-nommu-proc-pid-maps-release-mmap-read-lock +++ a/fs/proc/task_nommu.c @@ -192,11 +192,16 @@ static void *m_start(struct seq_file *m, return ERR_PTR(-ESRCH); mm = priv->mm; - if (!mm || !mmget_not_zero(mm)) + if (!mm || !mmget_not_zero(mm)) { + put_task_struct(priv->task); + priv->task = NULL; return NULL; + } if (mmap_read_lock_killable(mm)) { mmput(mm); + put_task_struct(priv->task); + priv->task = NULL; return ERR_PTR(-EINTR); } @@ -205,23 +210,21 @@ static void *m_start(struct seq_file *m, if (vma) return vma; - mmap_read_unlock(mm); - mmput(mm); return NULL; } -static void m_stop(struct seq_file *m, void *_vml) +static void m_stop(struct seq_file *m, void *v) { struct proc_maps_private *priv = m->private; + struct mm_struct *mm = priv->mm; - if (!IS_ERR_OR_NULL(_vml)) { - mmap_read_unlock(priv->mm); - mmput(priv->mm); - } - if (priv->task) { - put_task_struct(priv->task); - priv->task = NULL; - } + if (!priv->task) + return; + + mmap_read_unlock(mm); + mmput(mm); + put_task_struct(priv->task); + priv->task = NULL; } static void *m_next(struct seq_file *m, void *_p, loff_t *pos) _ Patches currently in -mm which might be from Ben.Wolsieffer(a)hefring.com are proc-nommu-proc-pid-maps-release-mmap-read-lock.patch

2 years, 1 month

1
0
0 0

[PATCH 0/5] selftests/resctrl: Fixes to failing tests

by Ilpo Järvinen

Fix three issues with resctrl selftests. The signal handling fix became necessary after the mount/umount fixes. The other two came up when I ran resctrl selftests across the server fleet in our lab to validate the upcoming CAT test rewrite (the rewrite is not part of this series). These are developed and should apply cleanly at least on top the benchmark cleanup series (might apply cleanly also w/o the benchmark series, I didn't test). Ilpo Järvinen (5): selftests/resctrl: Extend signal handler coverage to unmount on receiving signal selftests/resctrl: Remove duplicate feature check from CMT test selftests/resctrl: Refactor feature check to use resource and feature name selftests/resctrl: Fix feature checks selftests/resctrl: Reduce failures due to outliers in MBA/MBM tests tools/testing/selftests/resctrl/cat_test.c | 8 --- tools/testing/selftests/resctrl/cmt_test.c | 3 - tools/testing/selftests/resctrl/mba_test.c | 2 +- tools/testing/selftests/resctrl/mbm_test.c | 2 +- tools/testing/selftests/resctrl/resctrl.h | 6 +- .../testing/selftests/resctrl/resctrl_tests.c | 37 ++++++++-- tools/testing/selftests/resctrl/resctrl_val.c | 22 +++--- tools/testing/selftests/resctrl/resctrlfs.c | 69 ++++++++----------- 8 files changed, 73 insertions(+), 76 deletions(-) -- 2.30.2

2 years, 1 month

2
24
0 0

[PATCH] init/main: Clear boot task idle flag

by Liam R. Howlett

Initial booting is setting the task flag to idle (PF_IDLE) by the call path sched_init() -> init_idle(). Having the task idle and calling call_rcu() in kernel/rcu/tiny.c means that TIF_NEED_RESCHED will be set. Subsequent calls to any cond_resched() will enable IRQs, potentially earlier than the IRQ setup has completed. Recent changes have caused just this scenario and IRQs have been enabled early. This causes a warning later in start_kernel() as interrupts are enabled before they are fully set up. Fix this issue by clearing the PF_IDLE flag on return from sched_init() and restore the flag in rest_init(). Although the boot task was marked as idle since (at least) d80e4fda576d, I am not sure that it is wrong to do so. The forced context-switch on idle task was introduced in the tiny_rcu update, so I'm going to claim this fixes 5f6130fa52ee. Link: https://lore.kernel.org/linux-mm/87v8cv22jh.fsf@mail.lhotse/ Link: https://lore.kernel.org/linux-mm/CAMuHMdWpvpWoDa=Ox-do92czYRvkok6_x6pYUH+Zo… Fixes: 5f6130fa52ee ("tiny_rcu: Directly force QS when call_rcu_[bh|sched]() on idle_task") Cc: stable(a)vger.kernel.org Cc: Geert Uytterhoeven <geert(a)linux-m68k.org> Cc: "Paul E. McKenney" <paulmck(a)kernel.org> Cc: Christophe Leroy <christophe.leroy(a)csgroup.eu> Cc: Andreas Schwab <schwab(a)linux-m68k.org> Cc: Matthew Wilcox <willy(a)infradead.org> Cc: Peng Zhang <zhangpeng.00(a)bytedance.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Juri Lelli <juri.lelli(a)redhat.com> Cc: Vincent Guittot <vincent.guittot(a)linaro.org> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: "Mike Rapoport (IBM)" <rppt(a)kernel.org> Cc: Vlastimil Babka <vbabka(a)suse.cz> Signed-off-by: Liam R. Howlett <Liam.Howlett(a)oracle.com> --- init/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/init/main.c b/init/main.c index ad920fac325c..f74772acf612 100644 --- a/init/main.c +++ b/init/main.c @@ -696,7 +696,7 @@ noinline void __ref __noreturn rest_init(void) */ rcu_read_lock(); tsk = find_task_by_pid_ns(pid, &init_pid_ns); - tsk->flags |= PF_NO_SETAFFINITY; + tsk->flags |= PF_NO_SETAFFINITY | PF_IDLE; set_cpus_allowed_ptr(tsk, cpumask_of(smp_processor_id())); rcu_read_unlock(); @@ -938,6 +938,8 @@ void start_kernel(void) * time - but meanwhile we still have a functioning scheduler. */ sched_init(); + /* Avoid early context switch, rest_init() restores PF_IDLE */ + current->flags &= ~PF_IDLE; if (WARN(!irqs_disabled(), "Interrupts were enabled *very* early, fixing it\n")) -- 2.39.2

2 years, 1 month

6
10
0 0

[PATCH] power: supply: rk817: Add missing module alias

by Nicolas Frattaroli

Similar to the rk817 codec alias that was missing, the rk817 charger driver is missing a module alias as well. This absence prevents the driver from autoprobing on OF systems when it is built as a module. Add the right MODULE_ALIAS to fix this. Fixes: 11cb8da0189b ("power: supply: Add charger driver for Rockchip RK817") Cc: stable(a)vger.kernel.org Signed-off-by: Nicolas Frattaroli <frattaroli.nicolas(a)gmail.com> --- drivers/power/supply/rk817_charger.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c index 1a2143641e66..76b991e112da 100644 --- a/drivers/power/supply/rk817_charger.c +++ b/drivers/power/supply/rk817_charger.c @@ -1211,3 +1211,4 @@ MODULE_DESCRIPTION("Battery power supply driver for RK817 PMIC"); MODULE_AUTHOR("Maya Matuszczyk <maccraft123mc(a)gmail.com>"); MODULE_AUTHOR("Chris Morgan <macromorgan(a)hotmail.com>"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:rk817-charger"); -- 2.41.0

2 years, 1 month

3
2
0 0

+ mm-memcontrol-fix-gfp_nofs-recursion-in-memoryhigh-enforcement.patch added to mm-hotfixes-unstable branch

by Andrew Morton

The patch titled Subject: mm: memcontrol: fix GFP_NOFS recursion in memory.high enforcement has been added to the -mm mm-hotfixes-unstable branch. Its filename is mm-memcontrol-fix-gfp_nofs-recursion-in-memoryhigh-enforcement.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche… This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Johannes Weiner <hannes(a)cmpxchg.org> Subject: mm: memcontrol: fix GFP_NOFS recursion in memory.high enforcement Date: Thu, 14 Sep 2023 11:21:39 -0400 Breno and Josef report a deadlock scenario from cgroup reclaim re-entering the filesystem: [ 361.546690] ====================================================== [ 361.559210] WARNING: possible circular locking dependency detected [ 361.571703] 6.5.0-0_fbk700_debug_rc0_kbuilder_13159_gbf787a128001 #1 Tainted: G S E [ 361.589704] ------------------------------------------------------ [ 361.602277] find/9315 is trying to acquire lock: [ 361.611625] ffff88837ba140c0 (&delayed_node->mutex){+.+.}-{4:4}, at: __btrfs_release_delayed_node+0x68/0x4f0 [ 361.631437] [ 361.631437] but task is already holding lock: [ 361.643243] ffff8881765b8678 (btrfs-tree-01){++++}-{4:4}, at: btrfs_tree_read_lock+0x1e/0x40 [ 362.904457] mutex_lock_nested+0x1c/0x30 [ 362.912414] __btrfs_release_delayed_node+0x68/0x4f0 [ 362.922460] btrfs_evict_inode+0x301/0x770 [ 362.982726] evict+0x17c/0x380 [ 362.988944] prune_icache_sb+0x100/0x1d0 [ 363.005559] super_cache_scan+0x1f8/0x260 [ 363.013695] do_shrink_slab+0x2a2/0x540 [ 363.021489] shrink_slab_memcg+0x237/0x3d0 [ 363.050606] shrink_slab+0xa7/0x240 [ 363.083382] shrink_node_memcgs+0x262/0x3b0 [ 363.091870] shrink_node+0x1a4/0x720 [ 363.099150] shrink_zones+0x1f6/0x5d0 [ 363.148798] do_try_to_free_pages+0x19b/0x5e0 [ 363.157633] try_to_free_mem_cgroup_pages+0x266/0x370 [ 363.190575] reclaim_high+0x16f/0x1f0 [ 363.208409] mem_cgroup_handle_over_high+0x10b/0x270 [ 363.246678] try_charge_memcg+0xaf2/0xc70 [ 363.304151] charge_memcg+0xf0/0x350 [ 363.320070] __mem_cgroup_charge+0x28/0x40 [ 363.328371] __filemap_add_folio+0x870/0xd50 [ 363.371303] filemap_add_folio+0xdd/0x310 [ 363.399696] __filemap_get_folio+0x2fc/0x7d0 [ 363.419086] pagecache_get_page+0xe/0x30 [ 363.427048] alloc_extent_buffer+0x1cd/0x6a0 [ 363.435704] read_tree_block+0x43/0xc0 [ 363.443316] read_block_for_search+0x361/0x510 [ 363.466690] btrfs_search_slot+0xc8c/0x1520 This is caused by the mem_cgroup_handle_over_high() not respecting the gfp_mask of the allocation context. We used to only call this function on resume to userspace, where no locks were held. But c9afe31ec443 ("memcg: synchronously enforce memory.high for large overcharges") added a call from the allocation context without considering the gfp. Link: https://lkml.kernel.org/r/20230914152139.100822-1-hannes@cmpxchg.org Fixes: c9afe31ec443 ("memcg: synchronously enforce memory.high for large overcharges") Signed-off-by: Johannes Weiner <hannes(a)cmpxchg.org> Reported-by: Breno Leitao <leitao(a)debian.org> Reported-by: Josef Bacik <josef(a)toxicpanda.com> Cc: Shakeel Butt <shakeelb(a)google.com> Cc: Michal Hocko <mhocko(a)suse.com> Cc: Roman Gushchin <roman.gushchin(a)linux.dev> Cc: Muchun Song <songmuchun(a)bytedance.com> Cc: <stable(a)vger.kernel.org> [5.17+] Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- include/linux/memcontrol.h | 4 ++-- include/linux/resume_user_mode.h | 2 +- mm/memcontrol.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) --- a/include/linux/memcontrol.h~mm-memcontrol-fix-gfp_nofs-recursion-in-memoryhigh-enforcement +++ a/include/linux/memcontrol.h @@ -920,7 +920,7 @@ unsigned long mem_cgroup_get_zone_lru_si return READ_ONCE(mz->lru_zone_size[zone_idx][lru]); } -void mem_cgroup_handle_over_high(void); +void mem_cgroup_handle_over_high(gfp_t gfp_mask); unsigned long mem_cgroup_get_max(struct mem_cgroup *memcg); @@ -1458,7 +1458,7 @@ static inline void mem_cgroup_unlock_pag rcu_read_unlock(); } -static inline void mem_cgroup_handle_over_high(void) +static inline void mem_cgroup_handle_over_high(gfp_t gfp_mask) { } --- a/include/linux/resume_user_mode.h~mm-memcontrol-fix-gfp_nofs-recursion-in-memoryhigh-enforcement +++ a/include/linux/resume_user_mode.h @@ -55,7 +55,7 @@ static inline void resume_user_mode_work } #endif - mem_cgroup_handle_over_high(); + mem_cgroup_handle_over_high(GFP_KERNEL); blkcg_maybe_throttle_current(); rseq_handle_notify_resume(NULL, regs); --- a/mm/memcontrol.c~mm-memcontrol-fix-gfp_nofs-recursion-in-memoryhigh-enforcement +++ a/mm/memcontrol.c @@ -2555,7 +2555,7 @@ static unsigned long calculate_high_dela * Scheduled by try_charge() to be executed from the userland return path * and reclaims memory over the high limit. */ -void mem_cgroup_handle_over_high(void) +void mem_cgroup_handle_over_high(gfp_t gfp_mask) { unsigned long penalty_jiffies; unsigned long pflags; @@ -2583,7 +2583,7 @@ retry_reclaim: */ nr_reclaimed = reclaim_high(memcg, in_retry ? SWAP_CLUSTER_MAX : nr_pages, - GFP_KERNEL); + gfp_mask); /* * memory.high is breached and reclaim is unable to keep up. Throttle @@ -2819,7 +2819,7 @@ done_restock: if (current->memcg_nr_pages_over_high > MEMCG_CHARGE_BATCH && !(current->flags & PF_MEMALLOC) && gfpflags_allow_blocking(gfp_mask)) { - mem_cgroup_handle_over_high(); + mem_cgroup_handle_over_high(gfp_mask); } return 0; } _ Patches currently in -mm which might be from hannes(a)cmpxchg.org are mm-page_alloc-fix-cma-and-highatomic-landing-on-the-wrong-buddy-list.patch mm-memcontrol-fix-gfp_nofs-recursion-in-memoryhigh-enforcement.patch mm-page_alloc-remove-pcppage-migratetype-caching.patch mm-page_alloc-fix-up-block-types-when-merging-compatible-blocks.patch mm-page_alloc-move-free-pages-when-converting-block-during-isolation.patch mm-page_alloc-fix-move_freepages_block-range-error.patch mm-page_alloc-fix-freelist-movement-during-block-conversion.patch mm-page_alloc-consolidate-free-page-accounting.patch

2 years, 1 month

1
0
0 0

[PATCH v2] drm/amdgpu: always use legacy tlb flush on cyan_skilfish

by Lang Yu

cyan_skilfish has problems with other flush types. v2: fix incorrect ternary conditional operator usage.(Yifan) Signed-off-by: Lang Yu <Lang.Yu(a)amd.com> Cc: <stable(a)vger.kernel.org> # v5.15+ --- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c index d3da13f4c80e..c6d11047169a 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c @@ -236,7 +236,8 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid, { bool use_semaphore = gmc_v10_0_use_invalidate_semaphore(adev, vmhub); struct amdgpu_vmhub *hub = &adev->vmhub[vmhub]; - u32 inv_req = hub->vmhub_funcs->get_invalidate_req(vmid, flush_type); + u32 inv_req = hub->vmhub_funcs->get_invalidate_req(vmid, + (adev->asic_type != CHIP_CYAN_SKILLFISH) ? flush_type : 0); u32 tmp; /* Use register 17 for GART */ const unsigned int eng = 17; @@ -331,6 +332,8 @@ static void gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, int r; + flush_type = (adev->asic_type != CHIP_CYAN_SKILLFISH) ? flush_type : 0; + /* flush hdp cache */ adev->hdp.funcs->flush_hdp(adev, NULL); @@ -426,6 +429,8 @@ static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev, struct amdgpu_ring *ring = &adev->gfx.kiq[0].ring; struct amdgpu_kiq *kiq = &adev->gfx.kiq[0]; + flush_type = (adev->asic_type != CHIP_CYAN_SKILLFISH) ? flush_type : 0; + if (amdgpu_emu_mode == 0 && ring->sched.ready) { spin_lock(&adev->gfx.kiq[0].ring_lock); /* 2 dwords flush + 8 dwords fence */ -- 2.25.1

2 years, 1 month

4
4
0 0

[PATCH v3] mmc: sdhci-pci-gli: fix LPM negotiation so x86/S0ix SoCs can suspend

by Sven van Ashbrook

To improve the r/w performance of GL9763E, the current driver inhibits LPM negotiation while the device is active. This prevents a large number of SoCs from suspending, notably x86 systems which commonly use S0ix as the suspend mechanism - for example, Intel Alder Lake and Raptor Lake processors. Failure description: 1. Userspace initiates s2idle suspend (e.g. via writing to /sys/power/state) 2. This switches the runtime_pm device state to active, which disables LPM negotiation, then calls the "regular" suspend callback 3. With LPM negotiation disabled, the bus cannot enter low-power state 4. On a large number of SoCs, if the bus not in a low-power state, S0ix cannot be entered, which in turn prevents the SoC from entering suspend. Fix by re-enabling LPM negotiation in the device's suspend callback. Suggested-by: Stanislaw Kardach <skardach(a)google.com> Fixes: f9e5b33934ce ("mmc: host: Improve I/O read/write performance for GL9763E") Cc: stable(a)vger.kernel.org Signed-off-by: Sven van Ashbrook <svenva(a)chromium.org> --- Changes in v3: - applied maintainer feedback from https://lore.kernel.org/lkml/CACT4zj-BaX4tHji8B8gS5jiKkd-2BcwfzHM4fS-OUn0f8… Changes in v2: - improved symmetry and error path in s2idle suspend callback (internal review) drivers/mmc/host/sdhci-pci-gli.c | 104 ++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 38 deletions(-) diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c index 1792665c9494a..a4ccb6c3e27a6 100644 --- a/drivers/mmc/host/sdhci-pci-gli.c +++ b/drivers/mmc/host/sdhci-pci-gli.c @@ -745,42 +745,6 @@ static u32 sdhci_gl9750_readl(struct sdhci_host *host, int reg) return value; } -#ifdef CONFIG_PM_SLEEP -static int sdhci_pci_gli_resume(struct sdhci_pci_chip *chip) -{ - struct sdhci_pci_slot *slot = chip->slots[0]; - - pci_free_irq_vectors(slot->chip->pdev); - gli_pcie_enable_msi(slot); - - return sdhci_pci_resume_host(chip); -} - -static int sdhci_cqhci_gli_resume(struct sdhci_pci_chip *chip) -{ - struct sdhci_pci_slot *slot = chip->slots[0]; - int ret; - - ret = sdhci_pci_gli_resume(chip); - if (ret) - return ret; - - return cqhci_resume(slot->host->mmc); -} - -static int sdhci_cqhci_gli_suspend(struct sdhci_pci_chip *chip) -{ - struct sdhci_pci_slot *slot = chip->slots[0]; - int ret; - - ret = cqhci_suspend(slot->host->mmc); - if (ret) - return ret; - - return sdhci_suspend_host(slot->host); -} -#endif - static void gl9763e_hs400_enhanced_strobe(struct mmc_host *mmc, struct mmc_ios *ios) { @@ -1029,6 +993,70 @@ static int gl9763e_runtime_resume(struct sdhci_pci_chip *chip) } #endif +#ifdef CONFIG_PM_SLEEP +static int sdhci_pci_gli_resume(struct sdhci_pci_chip *chip) +{ + struct sdhci_pci_slot *slot = chip->slots[0]; + + pci_free_irq_vectors(slot->chip->pdev); + gli_pcie_enable_msi(slot); + + return sdhci_pci_resume_host(chip); +} + +static int gl9763e_resume(struct sdhci_pci_chip *chip) +{ + struct sdhci_pci_slot *slot = chip->slots[0]; + int ret; + + ret = sdhci_pci_gli_resume(chip); + if (ret) + return ret; + + ret = cqhci_resume(slot->host->mmc); + if (ret) + return ret; + + /* + * Disable LPM negotiation to bring device back in sync + * with its runtime_pm state. + */ + gl9763e_set_low_power_negotiation(slot, false); + + return 0; +} + +static int gl9763e_suspend(struct sdhci_pci_chip *chip) +{ + struct sdhci_pci_slot *slot = chip->slots[0]; + int ret; + + /* + * Certain SoCs can suspend only with the bus in low- + * power state, notably x86 SoCs when using S0ix. + * Re-enable LPM negotiation to allow entering L1 state + * and entering system suspend. + */ + gl9763e_set_low_power_negotiation(slot, true); + + ret = cqhci_suspend(slot->host->mmc); + if (ret) + goto err_suspend; + + ret = sdhci_suspend_host(slot->host); + if (ret) + goto err_suspend_host; + + return 0; + +err_suspend_host: + cqhci_resume(slot->host->mmc); +err_suspend: + gl9763e_set_low_power_negotiation(slot, false); + return ret; +} +#endif + static int gli_probe_slot_gl9763e(struct sdhci_pci_slot *slot) { struct pci_dev *pdev = slot->chip->pdev; @@ -1113,8 +1141,8 @@ const struct sdhci_pci_fixes sdhci_gl9763e = { .probe_slot = gli_probe_slot_gl9763e, .ops = &sdhci_gl9763e_ops, #ifdef CONFIG_PM_SLEEP - .resume = sdhci_cqhci_gli_resume, - .suspend = sdhci_cqhci_gli_suspend, + .resume = gl9763e_resume, + .suspend = gl9763e_suspend, #endif #ifdef CONFIG_PM .runtime_suspend = gl9763e_runtime_suspend, -- 2.42.0.283.g2d96d420d3-goog

2 years, 1 month

5
7
0 0

[PATCH 1/2] dt-bindings: mmc: sdhci-msm: correct minimum number of clocks

by Krzysztof Kozlowski

In the TXT binding before conversion, the "xo" clock was listed as optional. Conversion kept it optional in "clock-names", but not in "clocks". This fixes dbts_check warnings like: qcom-sdx65-mtp.dtb: mmc@8804000: clocks: [[13, 59], [13, 58]] is too short Cc: <stable(a)vger.kernel.org> Fixes: a45537723f4b ("dt-bindings: mmc: sdhci-msm: Convert bindings to yaml") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- Documentation/devicetree/bindings/mmc/sdhci-msm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml index 80141eb7fc6b..10f34aa8ba8a 100644 --- a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml +++ b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml @@ -69,7 +69,7 @@ properties: maxItems: 4 clocks: - minItems: 3 + minItems: 2 items: - description: Main peripheral bus clock, PCLK/HCLK - AHB Bus clock - description: SDC MMC clock, MCLK -- 2.34.1

2 years, 1 month

3
2
0 0

[PATCH 5.10] btrfs: fix region size in count_bitmap_extents

by Anastasia Belova

count_bitmap_extents was deleted in version 5.11, but there is possible mistake in versions 5.6-5.10. Region size should be calculated by subtracting the end from the beginning. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: dfb79ddb130e ("btrfs: track discardable extents for async discard") Signed-off-by: Anastasia Belova <abelova(a)astralinux.ru> --- fs/btrfs/free-space-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 4989c60b1df9..a34e266a0969 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -1930,7 +1930,7 @@ static int count_bitmap_extents(struct btrfs_free_space_ctl *ctl, bitmap_for_each_set_region(bitmap_info->bitmap, rs, re, 0, BITS_PER_BITMAP) { - bytes -= (rs - re) * ctl->unit; + bytes -= (re - rs) * ctl->unit; count++; if (!bytes) -- 2.30.2

2 years, 1 month

3
2
0 0

[PATCH v3 1/2] drm/tests: helpers: Avoid a driver uaf

by Thomas Hellström

when using __drm_kunit_helper_alloc_drm_device() the driver may be dereferenced by device-managed resources up until the device is freed, which is typically later than the kunit-managed resource code frees it. Fix this by simply make the driver device-managed as well. In short, the sequence leading to the UAF is as follows: INIT: Code allocates a struct device as a kunit-managed resource. Code allocates a drm driver as a kunit-managed resource. Code allocates a drm device as a device-managed resource. EXIT: Kunit resource cleanup frees the drm driver Kunit resource cleanup puts the struct device, which starts a device-managed resource cleanup device-managed cleanup calls drm_dev_put() drm_dev_put() dereferences the (now freed) drm driver -> Boom. Related KASAN message: [55272.551542] ================================================================== [55272.551551] BUG: KASAN: slab-use-after-free in drm_dev_put.part.0+0xd4/0xe0 [drm] [55272.551603] Read of size 8 at addr ffff888127502828 by task kunit_try_catch/10353 [55272.551612] CPU: 4 PID: 10353 Comm: kunit_try_catch Tainted: G U N 6.5.0-rc7+ #155 [55272.551620] Hardware name: ASUS System Product Name/PRIME B560M-A AC, BIOS 0403 01/26/2021 [55272.551626] Call Trace: [55272.551629] <TASK> [55272.551633] dump_stack_lvl+0x57/0x90 [55272.551639] print_report+0xcf/0x630 [55272.551645] ? _raw_spin_lock_irqsave+0x5f/0x70 [55272.551652] ? drm_dev_put.part.0+0xd4/0xe0 [drm] [55272.551694] kasan_report+0xd7/0x110 [55272.551699] ? drm_dev_put.part.0+0xd4/0xe0 [drm] [55272.551742] drm_dev_put.part.0+0xd4/0xe0 [drm] [55272.551783] devres_release_all+0x15d/0x1f0 [55272.551790] ? __pfx_devres_release_all+0x10/0x10 [55272.551797] device_unbind_cleanup+0x16/0x1a0 [55272.551802] device_release_driver_internal+0x3e5/0x540 [55272.551808] ? kobject_put+0x5d/0x4b0 [55272.551814] bus_remove_device+0x1f1/0x3f0 [55272.551819] device_del+0x342/0x910 [55272.551826] ? __pfx_device_del+0x10/0x10 [55272.551830] ? lock_release+0x339/0x5e0 [55272.551836] ? kunit_remove_resource+0x128/0x290 [kunit] [55272.551845] ? __pfx_lock_release+0x10/0x10 [55272.551851] platform_device_del.part.0+0x1f/0x1e0 [55272.551856] ? _raw_spin_unlock_irqrestore+0x30/0x60 [55272.551863] kunit_remove_resource+0x195/0x290 [kunit] [55272.551871] ? _raw_spin_unlock_irqrestore+0x30/0x60 [55272.551877] kunit_cleanup+0x78/0x120 [kunit] [55272.551885] ? __kthread_parkme+0xc1/0x1f0 [55272.551891] ? __pfx_kunit_try_run_case_cleanup+0x10/0x10 [kunit] [55272.551900] ? __pfx_kunit_generic_run_threadfn_adapter+0x10/0x10 [kunit] [55272.551909] kunit_generic_run_threadfn_adapter+0x4a/0x90 [kunit] [55272.551919] kthread+0x2e7/0x3c0 [55272.551924] ? __pfx_kthread+0x10/0x10 [55272.551929] ret_from_fork+0x2d/0x70 [55272.551935] ? __pfx_kthread+0x10/0x10 [55272.551940] ret_from_fork_asm+0x1b/0x30 [55272.551948] </TASK> [55272.551953] Allocated by task 10351: [55272.551956] kasan_save_stack+0x1c/0x40 [55272.551962] kasan_set_track+0x21/0x30 [55272.551966] __kasan_kmalloc+0x8b/0x90 [55272.551970] __kmalloc+0x5e/0x160 [55272.551976] kunit_kmalloc_array+0x1c/0x50 [kunit] [55272.551984] drm_exec_test_init+0xfa/0x2c0 [drm_exec_test] [55272.551991] kunit_try_run_case+0xdd/0x250 [kunit] [55272.551999] kunit_generic_run_threadfn_adapter+0x4a/0x90 [kunit] [55272.552008] kthread+0x2e7/0x3c0 [55272.552012] ret_from_fork+0x2d/0x70 [55272.552017] ret_from_fork_asm+0x1b/0x30 [55272.552024] Freed by task 10353: [55272.552027] kasan_save_stack+0x1c/0x40 [55272.552032] kasan_set_track+0x21/0x30 [55272.552036] kasan_save_free_info+0x27/0x40 [55272.552041] __kasan_slab_free+0x106/0x180 [55272.552046] slab_free_freelist_hook+0xb3/0x160 [55272.552051] __kmem_cache_free+0xb2/0x290 [55272.552056] kunit_remove_resource+0x195/0x290 [kunit] [55272.552064] kunit_cleanup+0x78/0x120 [kunit] [55272.552072] kunit_generic_run_threadfn_adapter+0x4a/0x90 [kunit] [55272.552080] kthread+0x2e7/0x3c0 [55272.552085] ret_from_fork+0x2d/0x70 [55272.552089] ret_from_fork_asm+0x1b/0x30 [55272.552096] The buggy address belongs to the object at ffff888127502800 which belongs to the cache kmalloc-512 of size 512 [55272.552105] The buggy address is located 40 bytes inside of freed 512-byte region [ffff888127502800, ffff888127502a00) [55272.552115] The buggy address belongs to the physical page: [55272.552119] page:00000000af6c70ff refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x127500 [55272.552127] head:00000000af6c70ff order:3 entire_mapcount:0 nr_pages_mapped:0 pincount:0 [55272.552133] anon flags: 0x17ffffc0010200(slab|head|node=0|zone=2|lastcpupid=0x1fffff) [55272.552141] page_type: 0xffffffff() [55272.552145] raw: 0017ffffc0010200 ffff888100042c80 0000000000000000 dead000000000001 [55272.552152] raw: 0000000000000000 0000000080200020 00000001ffffffff 0000000000000000 [55272.552157] page dumped because: kasan: bad access detected [55272.552163] Memory state around the buggy address: [55272.552167] ffff888127502700: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [55272.552173] ffff888127502780: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [55272.552178] >ffff888127502800: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [55272.552184] ^ [55272.552187] ffff888127502880: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [55272.552193] ffff888127502900: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [55272.552198] ================================================================== [55272.552203] Disabling lock debugging due to kernel taint v2: - Update commit message, add Fixes: tag and Cc stable. v3: - Further commit message updates (Maxime Ripard). Cc: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> Cc: Maxime Ripard <mripard(a)kernel.org> Cc: Thomas Zimmermann <tzimmermann(a)suse.de> Cc: David Airlie <airlied(a)gmail.com> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: dri-devel(a)lists.freedesktop.org Cc: <stable(a)vger.kernel.org> # v6.3+ Fixes: d98780310719 ("drm/tests: helpers: Allow to pass a custom drm_driver") Signed-off-by: Thomas Hellström <thomas.hellstrom(a)linux.intel.com> --- include/drm/drm_kunit_helpers.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/drm/drm_kunit_helpers.h b/include/drm/drm_kunit_helpers.h index 514c8a7a32f0..ba483c87f0e7 100644 --- a/include/drm/drm_kunit_helpers.h +++ b/include/drm/drm_kunit_helpers.h @@ -3,6 +3,8 @@ #ifndef DRM_KUNIT_HELPERS_H_ #define DRM_KUNIT_HELPERS_H_ +#include <linux/device.h> + #include <kunit/test.h> struct drm_device; @@ -51,7 +53,7 @@ __drm_kunit_helper_alloc_drm_device(struct kunit *test, { struct drm_driver *driver; - driver = kunit_kzalloc(test, sizeof(*driver), GFP_KERNEL); + driver = devm_kzalloc(dev, sizeof(*driver), GFP_KERNEL); KUNIT_ASSERT_NOT_NULL(test, driver); driver->driver_features = features; -- 2.41.0

2 years, 1 month

3
4
0 0

[PATCH] drm/amdgpu: always use legacy tlb flush on cyan_skilfish

by Lang Yu

cyan_skilfish has problems with other flush types. Signed-off-by: Lang Yu <Lang.Yu(a)amd.com> Cc: <stable(a)vger.kernel.org> # v5.15+ --- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c index d3da13f4c80e..27504ac21653 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c @@ -236,7 +236,8 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid, { bool use_semaphore = gmc_v10_0_use_invalidate_semaphore(adev, vmhub); struct amdgpu_vmhub *hub = &adev->vmhub[vmhub]; - u32 inv_req = hub->vmhub_funcs->get_invalidate_req(vmid, flush_type); + u32 inv_req = hub->vmhub_funcs->get_invalidate_req(vmid, + (adev->asic_type != CHIP_CYAN_SKILLFISH) ? flush_type : 0); u32 tmp; /* Use register 17 for GART */ const unsigned int eng = 17; @@ -331,6 +332,8 @@ static void gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, int r; + flush_type = (adev->asic_type != CHIP_CYAN_SKILLFISH) ? : 0; + /* flush hdp cache */ adev->hdp.funcs->flush_hdp(adev, NULL); @@ -426,6 +429,8 @@ static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev, struct amdgpu_ring *ring = &adev->gfx.kiq[0].ring; struct amdgpu_kiq *kiq = &adev->gfx.kiq[0]; + flush_type = (adev->asic_type != CHIP_CYAN_SKILLFISH) ? : 0; + if (amdgpu_emu_mode == 0 && ring->sched.ready) { spin_lock(&adev->gfx.kiq[0].ring_lock); /* 2 dwords flush + 8 dwords fence */ -- 2.25.1

2 years, 1 month

2
2
0 0

[PATCH v3 5/5] mips: use nth_page() in place of direct struct page manipulation.

by Zi Yan

From: Zi Yan <ziy(a)nvidia.com> __flush_dcache_pages() is called during hugetlb migration via migrate_pages() -> migrate_hugetlbs() -> unmap_and_move_huge_page() -> move_to_new_folio() -> flush_dcache_folio(). And with hugetlb and without sparsemem vmemmap, struct page is not guaranteed to be contiguous beyond a section. Use nth_page() instead. Fixes: 15fa3e8e3269 ("mips: implement the new page table range API") Cc: <stable(a)vger.kernel.org> Signed-off-by: Zi Yan <ziy(a)nvidia.com> --- arch/mips/mm/cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c index 02042100e267..7f830634dbe7 100644 --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c @@ -117,7 +117,7 @@ void __flush_dcache_pages(struct page *page, unsigned int nr) * get faulted into the tlb (and thus flushed) anyways. */ for (i = 0; i < nr; i++) { - addr = (unsigned long)kmap_local_page(page + i); + addr = (unsigned long)kmap_local_page(nth_page(page, i)); flush_data_cache_page(addr); kunmap_local((void *)addr); } -- 2.40.1

2 years, 1 month

2
1
0 0

[PATCH v3 4/5] fs: use nth_page() in place of direct struct page manipulation.

by Zi Yan

From: Zi Yan <ziy(a)nvidia.com> When dealing with hugetlb pages, struct page is not guaranteed to be contiguous on SPARSEMEM without VMEMMAP. Use nth_page() to handle it properly. Fixes: 38c1ddbde6c6 ("hugetlbfs: improve read HWPOISON hugepage") Cc: <stable(a)vger.kernel.org> Signed-off-by: Zi Yan <ziy(a)nvidia.com> Reviewed-by: Muchun Song <songmuchun(a)bytedance.com> --- fs/hugetlbfs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 7083fa0caaab..14d3d28e41b0 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -295,7 +295,7 @@ static size_t adjust_range_hwpoison(struct page *page, size_t offset, size_t byt size_t res = 0; /* First subpage to start the loop. */ - page += offset / PAGE_SIZE; + page = nth_page(page, offset / PAGE_SIZE); offset %= PAGE_SIZE; while (1) { if (is_raw_hwpoison_page_in_hugepage(page)) @@ -309,7 +309,7 @@ static size_t adjust_range_hwpoison(struct page *page, size_t offset, size_t byt break; offset += n; if (offset == PAGE_SIZE) { - page++; + page = nth_page(page, 1); offset = 0; } } -- 2.40.1

2 years, 1 month

2
1
0 0

[PATCH v3 3/5] mm/memory_hotplug: use pfn math in place of direct struct page manipulation.

by Zi Yan

From: Zi Yan <ziy(a)nvidia.com> When dealing with hugetlb pages, manipulating struct page pointers directly can get to wrong struct page, since struct page is not guaranteed to be contiguous on SPARSEMEM without VMEMMAP. Use pfn calculation to handle it properly. Fixes: eeb0efd071d8 ("mm,memory_hotplug: fix scan_movable_pages() for gigantic hugepages") Cc: <stable(a)vger.kernel.org> Signed-off-by: Zi Yan <ziy(a)nvidia.com> Reviewed-by: Muchun Song <songmuchun(a)bytedance.com> Acked-by: David Hildenbrand <david(a)redhat.com> --- mm/memory_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 1b03f4ec6fd2..3b301c4023ff 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1689,7 +1689,7 @@ static int scan_movable_pages(unsigned long start, unsigned long end, */ if (HPageMigratable(head)) goto found; - skip = compound_nr(head) - (page - head); + skip = compound_nr(head) - (pfn - page_to_pfn(head)); pfn += skip - 1; } return -ENOENT; -- 2.40.1

2 years, 1 month

2
1
0 0

[PATCH v3 2/5] mm/hugetlb: use nth_page() in place of direct struct page manipulation.

by Zi Yan

From: Zi Yan <ziy(a)nvidia.com> When dealing with hugetlb pages, manipulating struct page pointers directly can get to wrong struct page, since struct page is not guaranteed to be contiguous on SPARSEMEM without VMEMMAP. Use nth_page() to handle it properly. Fixes: 57a196a58421 ("hugetlb: simplify hugetlb handling in follow_page_mask") Cc: <stable(a)vger.kernel.org> Signed-off-by: Zi Yan <ziy(a)nvidia.com> Reviewed-by: Muchun Song <songmuchun(a)bytedance.com> --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index af74e83d92aa..8e68e6c53e66 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6469,7 +6469,7 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, } } - page += ((address & ~huge_page_mask(h)) >> PAGE_SHIFT); + page = nth_page(page, ((address & ~huge_page_mask(h)) >> PAGE_SHIFT)); /* * Note that page may be a sub-page, and with vmemmap -- 2.40.1

2 years, 1 month

2
1
0 0

[PATCH AUTOSEL 5.10] dma-debug: don't call __dma_entry_alloc_check_leak() under free_entries_lock

by Sasha Levin

From: Sergey Senozhatsky <senozhatsky(a)chromium.org> [ Upstream commit fb5a4315591dae307a65fc246ca80b5159d296e1 ] __dma_entry_alloc_check_leak() calls into printk -> serial console output (qcom geni) and grabs port->lock under free_entries_lock spin lock, which is a reverse locking dependency chain as qcom_geni IRQ handler can call into dma-debug code and grab free_entries_lock under port->lock. Move __dma_entry_alloc_check_leak() call out of free_entries_lock scope so that we don't acquire serial console's port->lock under it. Trimmed-down lockdep splat: The existing dependency chain (in reverse order) is: -> #2 (free_entries_lock){-.-.}-{2:2}: _raw_spin_lock_irqsave+0x60/0x80 dma_entry_alloc+0x38/0x110 debug_dma_map_page+0x60/0xf8 dma_map_page_attrs+0x1e0/0x230 dma_map_single_attrs.constprop.0+0x6c/0xc8 geni_se_rx_dma_prep+0x40/0xcc qcom_geni_serial_isr+0x310/0x510 __handle_irq_event_percpu+0x110/0x244 handle_irq_event_percpu+0x20/0x54 handle_irq_event+0x50/0x88 handle_fasteoi_irq+0xa4/0xcc handle_irq_desc+0x28/0x40 generic_handle_domain_irq+0x24/0x30 gic_handle_irq+0xc4/0x148 do_interrupt_handler+0xa4/0xb0 el1_interrupt+0x34/0x64 el1h_64_irq_handler+0x18/0x24 el1h_64_irq+0x64/0x68 arch_local_irq_enable+0x4/0x8 ____do_softirq+0x18/0x24 ... -> #1 (&port_lock_key){-.-.}-{2:2}: _raw_spin_lock_irqsave+0x60/0x80 qcom_geni_serial_console_write+0x184/0x1dc console_flush_all+0x344/0x454 console_unlock+0x94/0xf0 vprintk_emit+0x238/0x24c vprintk_default+0x3c/0x48 vprintk+0xb4/0xbc _printk+0x68/0x90 register_console+0x230/0x38c uart_add_one_port+0x338/0x494 qcom_geni_serial_probe+0x390/0x424 platform_probe+0x70/0xc0 really_probe+0x148/0x280 __driver_probe_device+0xfc/0x114 driver_probe_device+0x44/0x100 __device_attach_driver+0x64/0xdc bus_for_each_drv+0xb0/0xd8 __device_attach+0xe4/0x140 device_initial_probe+0x1c/0x28 bus_probe_device+0x44/0xb0 device_add+0x538/0x668 of_device_add+0x44/0x50 of_platform_device_create_pdata+0x94/0xc8 of_platform_bus_create+0x270/0x304 of_platform_populate+0xac/0xc4 devm_of_platform_populate+0x60/0xac geni_se_probe+0x154/0x160 platform_probe+0x70/0xc0 ... -> #0 (console_owner){-...}-{0:0}: __lock_acquire+0xdf8/0x109c lock_acquire+0x234/0x284 console_flush_all+0x330/0x454 console_unlock+0x94/0xf0 vprintk_emit+0x238/0x24c vprintk_default+0x3c/0x48 vprintk+0xb4/0xbc _printk+0x68/0x90 dma_entry_alloc+0xb4/0x110 debug_dma_map_sg+0xdc/0x2f8 __dma_map_sg_attrs+0xac/0xe4 dma_map_sgtable+0x30/0x4c get_pages+0x1d4/0x1e4 [msm] msm_gem_pin_pages_locked+0x38/0xac [msm] msm_gem_pin_vma_locked+0x58/0x88 [msm] msm_ioctl_gem_submit+0xde4/0x13ac [msm] drm_ioctl_kernel+0xe0/0x15c drm_ioctl+0x2e8/0x3f4 vfs_ioctl+0x30/0x50 ... Chain exists of: console_owner --> &port_lock_key --> free_entries_lock Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(free_entries_lock); lock(&port_lock_key); lock(free_entries_lock); lock(console_owner); *** DEADLOCK *** Call trace: dump_backtrace+0xb4/0xf0 show_stack+0x20/0x30 dump_stack_lvl+0x60/0x84 dump_stack+0x18/0x24 print_circular_bug+0x1cc/0x234 check_noncircular+0x78/0xac __lock_acquire+0xdf8/0x109c lock_acquire+0x234/0x284 console_flush_all+0x330/0x454 console_unlock+0x94/0xf0 vprintk_emit+0x238/0x24c vprintk_default+0x3c/0x48 vprintk+0xb4/0xbc _printk+0x68/0x90 dma_entry_alloc+0xb4/0x110 debug_dma_map_sg+0xdc/0x2f8 __dma_map_sg_attrs+0xac/0xe4 dma_map_sgtable+0x30/0x4c get_pages+0x1d4/0x1e4 [msm] msm_gem_pin_pages_locked+0x38/0xac [msm] msm_gem_pin_vma_locked+0x58/0x88 [msm] msm_ioctl_gem_submit+0xde4/0x13ac [msm] drm_ioctl_kernel+0xe0/0x15c drm_ioctl+0x2e8/0x3f4 vfs_ioctl+0x30/0x50 ... Reported-by: Rob Clark <robdclark(a)chromium.org> Signed-off-by: Sergey Senozhatsky <senozhatsky(a)chromium.org> Acked-by: Robin Murphy <robin.murphy(a)arm.com> Signed-off-by: Christoph Hellwig <hch(a)lst.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- kernel/dma/debug.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index ae9fc1ee6d206..0263983089097 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -606,15 +606,19 @@ static struct dma_debug_entry *__dma_entry_alloc(void) return entry; } -static void __dma_entry_alloc_check_leak(void) +/* + * This should be called outside of free_entries_lock scope to avoid potential + * deadlocks with serial consoles that use DMA. + */ +static void __dma_entry_alloc_check_leak(u32 nr_entries) { - u32 tmp = nr_total_entries % nr_prealloc_entries; + u32 tmp = nr_entries % nr_prealloc_entries; /* Shout each time we tick over some multiple of the initial pool */ if (tmp < DMA_DEBUG_DYNAMIC_ENTRIES) { pr_info("dma_debug_entry pool grown to %u (%u00%%)\n", - nr_total_entries, - (nr_total_entries / nr_prealloc_entries)); + nr_entries, + (nr_entries / nr_prealloc_entries)); } } @@ -625,8 +629,10 @@ static void __dma_entry_alloc_check_leak(void) */ static struct dma_debug_entry *dma_entry_alloc(void) { + bool alloc_check_leak = false; struct dma_debug_entry *entry; unsigned long flags; + u32 nr_entries; spin_lock_irqsave(&free_entries_lock, flags); if (num_free_entries == 0) { @@ -636,13 +642,17 @@ static struct dma_debug_entry *dma_entry_alloc(void) pr_err("debugging out of memory - disabling\n"); return NULL; } - __dma_entry_alloc_check_leak(); + alloc_check_leak = true; + nr_entries = nr_total_entries; } entry = __dma_entry_alloc(); spin_unlock_irqrestore(&free_entries_lock, flags); + if (alloc_check_leak) + __dma_entry_alloc_check_leak(nr_entries); + #ifdef CONFIG_STACKTRACE entry->stack_len = stack_trace_save(entry->stack_entries, ARRAY_SIZE(entry->stack_entries), -- 2.40.1

2 years, 1 month

1
0
0 0

[PATCH AUTOSEL 5.15 1/3] dma-debug: don't call __dma_entry_alloc_check_leak() under free_entries_lock

by Sasha Levin

From: Sergey Senozhatsky <senozhatsky(a)chromium.org> [ Upstream commit fb5a4315591dae307a65fc246ca80b5159d296e1 ] __dma_entry_alloc_check_leak() calls into printk -> serial console output (qcom geni) and grabs port->lock under free_entries_lock spin lock, which is a reverse locking dependency chain as qcom_geni IRQ handler can call into dma-debug code and grab free_entries_lock under port->lock. Move __dma_entry_alloc_check_leak() call out of free_entries_lock scope so that we don't acquire serial console's port->lock under it. Trimmed-down lockdep splat: The existing dependency chain (in reverse order) is: -> #2 (free_entries_lock){-.-.}-{2:2}: _raw_spin_lock_irqsave+0x60/0x80 dma_entry_alloc+0x38/0x110 debug_dma_map_page+0x60/0xf8 dma_map_page_attrs+0x1e0/0x230 dma_map_single_attrs.constprop.0+0x6c/0xc8 geni_se_rx_dma_prep+0x40/0xcc qcom_geni_serial_isr+0x310/0x510 __handle_irq_event_percpu+0x110/0x244 handle_irq_event_percpu+0x20/0x54 handle_irq_event+0x50/0x88 handle_fasteoi_irq+0xa4/0xcc handle_irq_desc+0x28/0x40 generic_handle_domain_irq+0x24/0x30 gic_handle_irq+0xc4/0x148 do_interrupt_handler+0xa4/0xb0 el1_interrupt+0x34/0x64 el1h_64_irq_handler+0x18/0x24 el1h_64_irq+0x64/0x68 arch_local_irq_enable+0x4/0x8 ____do_softirq+0x18/0x24 ... -> #1 (&port_lock_key){-.-.}-{2:2}: _raw_spin_lock_irqsave+0x60/0x80 qcom_geni_serial_console_write+0x184/0x1dc console_flush_all+0x344/0x454 console_unlock+0x94/0xf0 vprintk_emit+0x238/0x24c vprintk_default+0x3c/0x48 vprintk+0xb4/0xbc _printk+0x68/0x90 register_console+0x230/0x38c uart_add_one_port+0x338/0x494 qcom_geni_serial_probe+0x390/0x424 platform_probe+0x70/0xc0 really_probe+0x148/0x280 __driver_probe_device+0xfc/0x114 driver_probe_device+0x44/0x100 __device_attach_driver+0x64/0xdc bus_for_each_drv+0xb0/0xd8 __device_attach+0xe4/0x140 device_initial_probe+0x1c/0x28 bus_probe_device+0x44/0xb0 device_add+0x538/0x668 of_device_add+0x44/0x50 of_platform_device_create_pdata+0x94/0xc8 of_platform_bus_create+0x270/0x304 of_platform_populate+0xac/0xc4 devm_of_platform_populate+0x60/0xac geni_se_probe+0x154/0x160 platform_probe+0x70/0xc0 ... -> #0 (console_owner){-...}-{0:0}: __lock_acquire+0xdf8/0x109c lock_acquire+0x234/0x284 console_flush_all+0x330/0x454 console_unlock+0x94/0xf0 vprintk_emit+0x238/0x24c vprintk_default+0x3c/0x48 vprintk+0xb4/0xbc _printk+0x68/0x90 dma_entry_alloc+0xb4/0x110 debug_dma_map_sg+0xdc/0x2f8 __dma_map_sg_attrs+0xac/0xe4 dma_map_sgtable+0x30/0x4c get_pages+0x1d4/0x1e4 [msm] msm_gem_pin_pages_locked+0x38/0xac [msm] msm_gem_pin_vma_locked+0x58/0x88 [msm] msm_ioctl_gem_submit+0xde4/0x13ac [msm] drm_ioctl_kernel+0xe0/0x15c drm_ioctl+0x2e8/0x3f4 vfs_ioctl+0x30/0x50 ... Chain exists of: console_owner --> &port_lock_key --> free_entries_lock Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(free_entries_lock); lock(&port_lock_key); lock(free_entries_lock); lock(console_owner); *** DEADLOCK *** Call trace: dump_backtrace+0xb4/0xf0 show_stack+0x20/0x30 dump_stack_lvl+0x60/0x84 dump_stack+0x18/0x24 print_circular_bug+0x1cc/0x234 check_noncircular+0x78/0xac __lock_acquire+0xdf8/0x109c lock_acquire+0x234/0x284 console_flush_all+0x330/0x454 console_unlock+0x94/0xf0 vprintk_emit+0x238/0x24c vprintk_default+0x3c/0x48 vprintk+0xb4/0xbc _printk+0x68/0x90 dma_entry_alloc+0xb4/0x110 debug_dma_map_sg+0xdc/0x2f8 __dma_map_sg_attrs+0xac/0xe4 dma_map_sgtable+0x30/0x4c get_pages+0x1d4/0x1e4 [msm] msm_gem_pin_pages_locked+0x38/0xac [msm] msm_gem_pin_vma_locked+0x58/0x88 [msm] msm_ioctl_gem_submit+0xde4/0x13ac [msm] drm_ioctl_kernel+0xe0/0x15c drm_ioctl+0x2e8/0x3f4 vfs_ioctl+0x30/0x50 ... Reported-by: Rob Clark <robdclark(a)chromium.org> Signed-off-by: Sergey Senozhatsky <senozhatsky(a)chromium.org> Acked-by: Robin Murphy <robin.murphy(a)arm.com> Signed-off-by: Christoph Hellwig <hch(a)lst.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- kernel/dma/debug.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index 2caafd13f8aac..1f9a8cee42241 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -605,15 +605,19 @@ static struct dma_debug_entry *__dma_entry_alloc(void) return entry; } -static void __dma_entry_alloc_check_leak(void) +/* + * This should be called outside of free_entries_lock scope to avoid potential + * deadlocks with serial consoles that use DMA. + */ +static void __dma_entry_alloc_check_leak(u32 nr_entries) { - u32 tmp = nr_total_entries % nr_prealloc_entries; + u32 tmp = nr_entries % nr_prealloc_entries; /* Shout each time we tick over some multiple of the initial pool */ if (tmp < DMA_DEBUG_DYNAMIC_ENTRIES) { pr_info("dma_debug_entry pool grown to %u (%u00%%)\n", - nr_total_entries, - (nr_total_entries / nr_prealloc_entries)); + nr_entries, + (nr_entries / nr_prealloc_entries)); } } @@ -624,8 +628,10 @@ static void __dma_entry_alloc_check_leak(void) */ static struct dma_debug_entry *dma_entry_alloc(void) { + bool alloc_check_leak = false; struct dma_debug_entry *entry; unsigned long flags; + u32 nr_entries; spin_lock_irqsave(&free_entries_lock, flags); if (num_free_entries == 0) { @@ -635,13 +641,17 @@ static struct dma_debug_entry *dma_entry_alloc(void) pr_err("debugging out of memory - disabling\n"); return NULL; } - __dma_entry_alloc_check_leak(); + alloc_check_leak = true; + nr_entries = nr_total_entries; } entry = __dma_entry_alloc(); spin_unlock_irqrestore(&free_entries_lock, flags); + if (alloc_check_leak) + __dma_entry_alloc_check_leak(nr_entries); + #ifdef CONFIG_STACKTRACE entry->stack_len = stack_trace_save(entry->stack_entries, ARRAY_SIZE(entry->stack_entries), -- 2.40.1

2 years, 1 month

1
2
0 0

[PATCH AUTOSEL 6.1 1/6] x86/reboot: VMCLEAR active VMCSes before emergency reboot

by Sasha Levin

From: Sean Christopherson <seanjc(a)google.com> [ Upstream commit b23c83ad2c638420ec0608a9de354507c41bec29 ] VMCLEAR active VMCSes before any emergency reboot, not just if the kernel may kexec into a new kernel after a crash. Per Intel's SDM, the VMX architecture doesn't require the CPU to flush the VMCS cache on INIT. If an emergency reboot doesn't RESET CPUs, cached VMCSes could theoretically be kept and only be written back to memory after the new kernel is booted, i.e. could effectively corrupt memory after reboot. Opportunistically remove the setting of the global pointer to NULL to make checkpatch happy. Cc: Andrew Cooper <Andrew.Cooper3(a)citrix.com> Link: https://lore.kernel.org/r/20230721201859.2307736-2-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc(a)google.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- arch/x86/include/asm/kexec.h | 2 -- arch/x86/include/asm/reboot.h | 2 ++ arch/x86/kernel/crash.c | 31 ------------------------------- arch/x86/kernel/reboot.c | 22 ++++++++++++++++++++++ arch/x86/kvm/vmx/vmx.c | 10 +++------- 5 files changed, 27 insertions(+), 40 deletions(-) diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h index a3760ca796aa2..256eee99afc8f 100644 --- a/arch/x86/include/asm/kexec.h +++ b/arch/x86/include/asm/kexec.h @@ -208,8 +208,6 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image); #endif #endif -typedef void crash_vmclear_fn(void); -extern crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss; extern void kdump_nmi_shootdown_cpus(void); #endif /* __ASSEMBLY__ */ diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h index bc5b4d788c08d..2551baec927d2 100644 --- a/arch/x86/include/asm/reboot.h +++ b/arch/x86/include/asm/reboot.h @@ -25,6 +25,8 @@ void __noreturn machine_real_restart(unsigned int type); #define MRR_BIOS 0 #define MRR_APM 1 +typedef void crash_vmclear_fn(void); +extern crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss; void cpu_emergency_disable_virtualization(void); typedef void (*nmi_shootdown_cb)(int, struct pt_regs*); diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index cdd92ab43cda4..54cd959cb3160 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -48,38 +48,12 @@ struct crash_memmap_data { unsigned int type; }; -/* - * This is used to VMCLEAR all VMCSs loaded on the - * processor. And when loading kvm_intel module, the - * callback function pointer will be assigned. - * - * protected by rcu. - */ -crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss = NULL; -EXPORT_SYMBOL_GPL(crash_vmclear_loaded_vmcss); - -static inline void cpu_crash_vmclear_loaded_vmcss(void) -{ - crash_vmclear_fn *do_vmclear_operation = NULL; - - rcu_read_lock(); - do_vmclear_operation = rcu_dereference(crash_vmclear_loaded_vmcss); - if (do_vmclear_operation) - do_vmclear_operation(); - rcu_read_unlock(); -} - #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) static void kdump_nmi_callback(int cpu, struct pt_regs *regs) { crash_save_cpu(regs, cpu); - /* - * VMCLEAR VMCSs loaded on all cpus if needed. - */ - cpu_crash_vmclear_loaded_vmcss(); - /* * Disable Intel PT to stop its logging */ @@ -133,11 +107,6 @@ void native_machine_crash_shutdown(struct pt_regs *regs) crash_smp_send_stop(); - /* - * VMCLEAR VMCSs loaded on this cpu if needed. - */ - cpu_crash_vmclear_loaded_vmcss(); - cpu_emergency_disable_virtualization(); /* diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index d03c551defccf..299b970e5f829 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -787,6 +787,26 @@ void machine_crash_shutdown(struct pt_regs *regs) } #endif +/* + * This is used to VMCLEAR all VMCSs loaded on the + * processor. And when loading kvm_intel module, the + * callback function pointer will be assigned. + * + * protected by rcu. + */ +crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss; +EXPORT_SYMBOL_GPL(crash_vmclear_loaded_vmcss); + +static inline void cpu_crash_vmclear_loaded_vmcss(void) +{ + crash_vmclear_fn *do_vmclear_operation = NULL; + + rcu_read_lock(); + do_vmclear_operation = rcu_dereference(crash_vmclear_loaded_vmcss); + if (do_vmclear_operation) + do_vmclear_operation(); + rcu_read_unlock(); +} /* This is the CPU performing the emergency shutdown work. */ int crashing_cpu = -1; @@ -798,6 +818,8 @@ int crashing_cpu = -1; */ void cpu_emergency_disable_virtualization(void) { + cpu_crash_vmclear_loaded_vmcss(); + cpu_emergency_vmxoff(); cpu_emergency_svm_disable(); } diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 4e972b9b68e59..31a10d774df6d 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -40,7 +40,7 @@ #include <asm/idtentry.h> #include <asm/io.h> #include <asm/irq_remapping.h> -#include <asm/kexec.h> +#include <asm/reboot.h> #include <asm/perf_event.h> #include <asm/mmu_context.h> #include <asm/mshyperv.h> @@ -702,7 +702,6 @@ static int vmx_set_guest_uret_msr(struct vcpu_vmx *vmx, return ret; } -#ifdef CONFIG_KEXEC_CORE static void crash_vmclear_local_loaded_vmcss(void) { int cpu = raw_smp_processor_id(); @@ -712,7 +711,6 @@ static void crash_vmclear_local_loaded_vmcss(void) loaded_vmcss_on_cpu_link) vmcs_clear(v->vmcs); } -#endif /* CONFIG_KEXEC_CORE */ static void __loaded_vmcs_clear(void *arg) { @@ -8522,10 +8520,9 @@ static void __vmx_exit(void) { allow_smaller_maxphyaddr = false; -#ifdef CONFIG_KEXEC_CORE RCU_INIT_POINTER(crash_vmclear_loaded_vmcss, NULL); synchronize_rcu(); -#endif + vmx_cleanup_l1d_flush(); } @@ -8598,10 +8595,9 @@ static int __init vmx_init(void) pi_init_cpu(cpu); } -#ifdef CONFIG_KEXEC_CORE rcu_assign_pointer(crash_vmclear_loaded_vmcss, crash_vmclear_local_loaded_vmcss); -#endif + vmx_check_vmcs12_offsets(); /* -- 2.40.1

2 years, 1 month

1
5
0 0

[PATCH AUTOSEL 6.5] gfs2: Stop using gfs2_make_fs_ro for withdraw

by Sasha Levin

From: Andreas Gruenbacher <agruenba(a)redhat.com> [ Upstream commit f66af88e33212b57ea86da2c5d66c0d9d5c46344 ] [ 81.372851][ T5532] CPU: 1 PID: 5532 Comm: syz-executor.0 Not tainted 6.2.0-rc1-syzkaller-dirty #0 [ 81.382080][ T5532] Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/12/2023 [ 81.392343][ T5532] Call Trace: [ 81.395654][ T5532] <TASK> [ 81.398603][ T5532] dump_stack_lvl+0x1b1/0x290 [ 81.418421][ T5532] gfs2_assert_warn_i+0x19a/0x2e0 [ 81.423480][ T5532] gfs2_quota_cleanup+0x4c6/0x6b0 [ 81.428611][ T5532] gfs2_make_fs_ro+0x517/0x610 [ 81.457802][ T5532] gfs2_withdraw+0x609/0x1540 [ 81.481452][ T5532] gfs2_inode_refresh+0xb2d/0xf60 [ 81.506658][ T5532] gfs2_instantiate+0x15e/0x220 [ 81.511504][ T5532] gfs2_glock_wait+0x1d9/0x2a0 [ 81.516352][ T5532] do_sync+0x485/0xc80 [ 81.554943][ T5532] gfs2_quota_sync+0x3da/0x8b0 [ 81.559738][ T5532] gfs2_sync_fs+0x49/0xb0 [ 81.564063][ T5532] sync_filesystem+0xe8/0x220 [ 81.568740][ T5532] generic_shutdown_super+0x6b/0x310 [ 81.574112][ T5532] kill_block_super+0x79/0xd0 [ 81.578779][ T5532] deactivate_locked_super+0xa7/0xf0 [ 81.584064][ T5532] cleanup_mnt+0x494/0x520 [ 81.593753][ T5532] task_work_run+0x243/0x300 [ 81.608837][ T5532] exit_to_user_mode_loop+0x124/0x150 [ 81.614232][ T5532] exit_to_user_mode_prepare+0xb2/0x140 [ 81.619820][ T5532] syscall_exit_to_user_mode+0x26/0x60 [ 81.625287][ T5532] do_syscall_64+0x49/0xb0 [ 81.629710][ T5532] entry_SYSCALL_64_after_hwframe+0x63/0xcd In this backtrace, gfs2_quota_sync() takes quota data references and then calls do_sync(). Function do_sync() encounters filesystem corruption and withdraws the filesystem, which (among other things) calls gfs2_quota_cleanup(). Function gfs2_quota_cleanup() wrongly assumes that nobody is holding any quota data references anymore, and destroys all quota data objects. When gfs2_quota_sync() then resumes and dereferences the quota data objects it is holding, those objects are no longer there. Function gfs2_quota_cleanup() deals with resource deallocation and can easily be delayed until gfs2_put_super() in the case of a filesystem withdraw. In fact, most of the other work gfs2_make_fs_ro() does is unnecessary during a withdraw as well, so change signal_our_withdraw() to skip gfs2_make_fs_ro() and perform the necessary steps directly instead. Thanks to Edward Adam Davis <eadavis(a)sina.com> for the initial patches. Link: https://lore.kernel.org/all/0000000000002b5e2405f14e860f@google.com Reported-by: syzbot+3f6a670108ce43356017(a)syzkaller.appspotmail.com Signed-off-by: Andreas Gruenbacher <agruenba(a)redhat.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- fs/gfs2/super.c | 9 ++------- fs/gfs2/util.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 9f4d5d6549ee6..2382c755362d7 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -580,15 +580,8 @@ void gfs2_make_fs_ro(struct gfs2_sbd *sdp) gfs2_log_is_empty(sdp), HZ * 5); gfs2_assert_warn(sdp, gfs2_log_is_empty(sdp)); - } else { - wait_event_timeout(sdp->sd_log_waitq, - gfs2_log_is_empty(sdp), - HZ * 5); } gfs2_quota_cleanup(sdp); - - if (!log_write_allowed) - sdp->sd_vfs->s_flags |= SB_RDONLY; } /** @@ -622,6 +615,8 @@ static void gfs2_put_super(struct super_block *sb) if (!sb_rdonly(sb)) { gfs2_make_fs_ro(sdp); } + if (gfs2_withdrawn(sdp)) + gfs2_quota_cleanup(sdp); WARN_ON(gfs2_withdrawing(sdp)); /* At this point, we're through modifying the disk */ diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c index dac22b1c1a2e1..b3086a9baf001 100644 --- a/fs/gfs2/util.c +++ b/fs/gfs2/util.c @@ -9,6 +9,7 @@ #include <linux/spinlock.h> #include <linux/completion.h> #include <linux/buffer_head.h> +#include <linux/kthread.h> #include <linux/crc32.h> #include <linux/gfs2_ondisk.h> #include <linux/delay.h> @@ -150,7 +151,23 @@ static void signal_our_withdraw(struct gfs2_sbd *sdp) if (!sb_rdonly(sdp->sd_vfs)) { bool locked = mutex_trylock(&sdp->sd_freeze_mutex); - gfs2_make_fs_ro(sdp); + if (sdp->sd_quotad_process && + current != sdp->sd_quotad_process) { + kthread_stop(sdp->sd_quotad_process); + sdp->sd_quotad_process = NULL; + } + + if (sdp->sd_logd_process && + current != sdp->sd_logd_process) { + kthread_stop(sdp->sd_logd_process); + sdp->sd_logd_process = NULL; + } + + wait_event_timeout(sdp->sd_log_waitq, + gfs2_log_is_empty(sdp), + HZ * 5); + + sdp->sd_vfs->s_flags |= SB_RDONLY; if (locked) mutex_unlock(&sdp->sd_freeze_mutex); -- 2.40.1

2 years, 1 month

1
0
0 0

[PATCH 1/2] scsi: ufs: ufs-qcom: Update PHY settings only when scaling to higher gears

by Manivannan Sadhasivam

The "hs_gear" variable is used to program the PHY settings (submode) during ufs_qcom_power_up_sequence(). Currently, it is being updated every time the agreed gear changes. Due to this, if the gear got downscaled before suspend (runtime/system), then while resuming, the PHY settings for the lower gear will be applied first and later when scaling to max gear with REINIT, the PHY settings for the max gear will be applied. This adds a latency while resuming and also really not needed as the PHY gear settings are backwards compatible i.e., we can continue using the PHY settings for max gear with lower gear speed. So let's update the "hs_gear" variable _only_ when the agreed gear is greater than the current one. This guarantees that the PHY settings will be changed only during probe time and fatal error condition. Due to this, UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH can now be skipped when the PM operation is in progress. Cc: stable(a)vger.kernel.org Fixes: 96a7141da332 ("scsi: ufs: core: Add support for reinitializing the UFS device") Reported-by: Can Guo <quic_cang(a)quicinc.com> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> --- drivers/ufs/core/ufshcd.c | 3 ++- drivers/ufs/host/ufs-qcom.c | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 34472871610d..1f0a9d96e613 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -8782,7 +8782,8 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params) if (ret) goto out; - if (hba->quirks & UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH) { + if (!hba->pm_op_in_progress && + (hba->quirks & UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH)) { /* Reset the device and controller before doing reinit */ ufshcd_device_reset(hba); ufshcd_hba_stop(hba); diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c index 78689d3479e4..ebb8054a3b3e 100644 --- a/drivers/ufs/host/ufs-qcom.c +++ b/drivers/ufs/host/ufs-qcom.c @@ -909,8 +909,13 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba, return ret; } - /* Use the agreed gear */ - host->hs_gear = dev_req_params->gear_tx; + /* + * Update hs_gear only when the gears are scaled to a higher value. This is because, + * the PHY gear settings are backwards compatible and we only need to change the PHY + * settings while scaling to higher gears. + */ + if (dev_req_params->gear_tx > host->hs_gear) + host->hs_gear = dev_req_params->gear_tx; /* enable the device ref clock before changing to HS mode */ if (!ufshcd_is_hs_mode(&hba->pwr_info) && -- 2.25.1

2 years, 1 month

4
4
0 0

RE: Good News

by ALLEMOZ Julie

You are a recipient to Mrs Julie Leach Donation of $2 million USD. Contact ( ms.julieleach001(a)gmail.com ) for claims.

2 years, 1 month

1
0
0 0

[PATCH 6.5 000/739] 6.5.3-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.5.3 release. There are 739 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 13 Sep 2023 13:44:56 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.3-rc1.… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.5.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 6.5.3-rc1 Lorenz Bauer <lmb(a)isovalent.com> net: remove duplicate INDIRECT_CALLABLE_DECLARE of udp[6]_ehashfn Andrew Morton <akpm(a)linux-foundation.org> revert "memfd: improve userspace warnings for missing exec-related flags". Aleksa Sarai <cyphar(a)cyphar.com> memfd: improve userspace warnings for missing exec-related flags Aleksa Sarai <cyphar(a)cyphar.com> memfd: replace ratcheting feature from vm.memfd_noexec with hierarchy Aleksa Sarai <cyphar(a)cyphar.com> memfd: do not -EACCES old memfd_create() users with vm.memfd_noexec=2 Jeff Xu <jeffxu(a)google.com> selftests/memfd: sysctl: fix MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED Jeff Xu <jeffxu(a)google.com> mm/memfd: sysctl: fix MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED Hugo Villeneuve <hvilleneuve(a)dimonoff.com> serial: sc16is7xx: fix regression with GPIO configuration Hugo Villeneuve <hvilleneuve(a)dimonoff.com> serial: sc16is7xx: remove obsolete out_thread label Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: HCI: Introduce HCI_QUIRK_BROKEN_LE_CODED Hilda Wu <hildawu(a)realtek.com> Bluetooth: msft: Extended monitor tracking by address filter Arnd Bergmann <arnd(a)kernel.org> media: ipu3-cio2: allow ipu_bridge to be a module again Kan Liang <kan.liang(a)linux.intel.com> perf/x86/uncore: Correct the number of CHAs on EMR Song Liu <song(a)kernel.org> x86/build: Fix linker fill bytes quirk/incompatibility for ld.lld Jack Wang <jinpu.wang(a)ionos.com> x86/sgx: Break up long non-preemptible delays in sgx_vepc_release() Thomas Gleixner <tglx(a)linutronix.de> x86/smp: Don't send INIT to non-present and non-booted CPUs Alan Stern <stern(a)rowland.harvard.edu> USB: core: Fix oversight in SuperSpeed initialization Douglas Anderson <dianders(a)chromium.org> of: property: fw_devlink: Add a devlink for panel followers Gustavo A. R. Silva <gustavoars(a)kernel.org> cpufreq: brcmstb-avs-cpufreq: Fix -Warray-bounds bug Thomas Bourgoin <thomas.bourgoin(a)foss.st.com> crypto: stm32 - fix MDMAT condition Thomas Bourgoin <thomas.bourgoin(a)foss.st.com> crypto: stm32 - fix loop iterating through scatterlist for DMA Benjamin Tissoires <benjamin.tissoires(a)redhat.com> HID: logitech-hidpp: rework one more time the retries attempts Heiko Carstens <hca(a)linux.ibm.com> s390/dasd: fix string length handling Sven Schnelle <svens(a)linux.ibm.com> s390/ipl: add missing secure/has_secure file to ipl type 'unknown' Gerald Schaefer <gerald.schaefer(a)linux.ibm.com> s390/dcssblk: fix kernel crash with list_add corruption Andy Chiu <andy.chiu(a)sifive.com> RISC-V: Add ptrace support for vectors David Howells <dhowells(a)redhat.com> iov_iter: Fix iov_iter_extract_pages() with zero-sized entries Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> regulator: dt-bindings: qcom,rpm: fix pattern for children D Scott Phillips <scott(a)os.amperecomputing.com> arm64: sdei: abort running SDEI handlers during crash Enlin Mu <enlin.mu(a)unisoc.com> pstore/ram: Check start of empty przs during init Wolfram Sang <wsa+renesas(a)sang-engineering.com> mmc: renesas_sdhi: register irqs before registering controller Tzung-Bi Shih <tzungbi(a)kernel.org> platform/chrome: chromeos_acpi: print hex string for ACPI_TYPE_BUFFER Frederick Lawler <fred(a)cloudflare.com> crypto: af_alg - Decrement struct key.usage in alg_set_by_key_serial() Yazen Ghannam <yazen.ghannam(a)amd.com> x86/MCE: Always save CS register on AMD Zen IF Poison errors Eric Biggers <ebiggers(a)google.com> fsverity: skip PKCS#7 parser when keyring is empty Nicolas Dichtel <nicolas.dichtel(a)6wind.com> net: handle ARPHRD_PPP in dev_is_mac_header_xmit() Thore Sommer <public(a)thson.de> X.509: if signature is unsupported skip validation Heiner Kallweit <hkallweit1(a)gmail.com> r8169: fix ASPM-related issues on a number of systems with NIC version from RTL8168h Steve Rutherford <srutherford(a)google.com> x86/sev: Make enc_dec_hypercall() accept a size instead of npages Jann Horn <jannh(a)google.com> dccp: Fix out of bounds access in DCCP error handler Alexander Aring <aahringo(a)redhat.com> dlm: fix plock lookup when using multiple lockspaces Yafang Shao <laoar.shao(a)gmail.com> bpf: Fix issue in verifying allow_ptr_leaks Fudong Wang <fudong.wang(a)amd.com> drm/amd/display: Add smu write msg id fail retry process Ekansh Gupta <quic_ekangupt(a)quicinc.com> misc: fastrpc: Pass proper scm arguments for static process init Helge Deller <deller(a)gmx.de> parisc: Fix /proc/cpuinfo output for lscpu Aleksa Sarai <cyphar(a)cyphar.com> procfs: block chmod on /proc/thread-self/comm Li Lingfeng <lilingfeng3(a)huawei.com> block: don't add or resize partition on the disk with GENHD_FL_NO_PART Christoph Hellwig <hch(a)lst.de> block: fix pin count management when merging same-page segments Bjorn Helgaas <bhelgaas(a)google.com> Revert "PCI: Mark NVIDIA T4 GPUs to avoid bus reset" Dave Jiang <dave.jiang(a)intel.com> ntb: Fix calculation ntb_transport_tx_free_entry() Dave Jiang <dave.jiang(a)intel.com> ntb: Clean up tx tail index on link down Dave Jiang <dave.jiang(a)intel.com> ntb: Drop packets when qp link is down Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> dt-bindings: PCI: qcom: Fix SDX65 compatible Feiyang Chen <chenfeiyang(a)loongson.cn> PCI/PM: Only read PCI_PM_CTRL register when available Dexuan Cui <decui(a)microsoft.com> PCI: hv: Fix a crash in hv_pci_restore_msi_msg() during hibernation Ross Lagerwall <ross.lagerwall(a)citrix.com> PCI: Free released resource after coalescing Ranjan Kumar <ranjan.kumar(a)broadcom.com> scsi: mpt3sas: Perform additional retries if doorbell read returns 0 Nilesh Javali <njavali(a)marvell.com> Revert "scsi: qla2xxx: Fix buffer overrun" Yang Yingliang <yangyingliang(a)huawei.com> media: nxp: Fix wrong return pointer check in mxc_isi_crossbar_init() Konrad Dybcio <konrad.dybcio(a)linaro.org> media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> media: dvb: symbol fixup for dvb_attach() Ding Xiang <dingxiang(a)cmss.chinamobile.com> selftests/landlock: Fix a resource leak Vitaly Rodionov <vitalyr(a)opensource.cirrus.com> ALSA: hda/cirrus: Fix broken audio on hardware with two CS42L42 codecs. Takashi Iwai <tiwai(a)suse.de> ALSA: seq: Fix snd_seq_expand_var_event() call to user-space Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix potential memory leaks at error path for UMP open Will Deacon <will(a)kernel.org> arm64: csum: Fix OoB access in IP checksum code for negative lengths Gabriel Krisman Bertazi <krisman(a)suse.de> io_uring: Don't set affinity on a dying sqpoll thread Frank Li <Frank.Li(a)nxp.com> i3c: master: svc: fix probe failure when no i3c device exist Naveen N Rao <naveen(a)kernel.org> powerpc/ftrace: Fix dropping weak symbols with older toolchains Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> powercap: intel_rapl: Fix invalid setting of Power Limit 4 Hongchen Zhang <zhanghongchen(a)loongson.cn> LoongArch: mm: Add p?d_leaf() definitions Max Filippov <jcmvbkbc(a)gmail.com> xtensa: PMU: fix base address for the newer hardware Hamza Mahfooz <hamza.mahfooz(a)amd.com> drm/amd/display: register edp_backlight_control() for DCN301 Thomas Zimmermann <tzimmermann(a)suse.de> backlight/lv5207lp: Compare against struct fb_info.device Thomas Zimmermann <tzimmermann(a)suse.de> backlight/bd6107: Compare against struct fb_info.device Thomas Zimmermann <tzimmermann(a)suse.de> backlight/gpio_backlight: Compare against struct fb_info.device Pavel Begunkov <asml.silence(a)gmail.com> io_uring: break out of iowq iopoll on teardown Pavel Begunkov <asml.silence(a)gmail.com> io_uring/net: don't overflow multishot accept Pavel Begunkov <asml.silence(a)gmail.com> io_uring/net: don't overflow multishot recv Jens Axboe <axboe(a)kernel.dk> io_uring/sqpoll: fix io-wq affinity when IORING_SETUP_SQPOLL is used Pavel Begunkov <asml.silence(a)gmail.com> io_uring: break iopolling on signal Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fix false positive KASAN warnings Matthew Wilcox (Oracle) <willy(a)infradead.org> XArray: Do not return sibling entries from xa_load() Alexandre Ghiti <alexghiti(a)rivosinc.com> riscv: Mark KASAN tmp* page tables variables as static Alexandre Ghiti <alexghiti(a)rivosinc.com> riscv: Move create_tmp_mapping() to init sections Gustavo A. R. Silva <gustavoars(a)kernel.org> ARM: OMAP2+: Fix -Warray-bounds warning in _pwrdm_state_switch() Yi Yang <yiyang13(a)huawei.com> ipmi_si: fix a memleak in try_smi_init() Rick Wertenbroek <rick.wertenbroek(a)gmail.com> PCI: rockchip: Use 64-bit mask on MSI 64-bit PCI address Sakari Ailus <sakari.ailus(a)linux.intel.com> media: i2c: Add a camera sensor top level menu Sakari Ailus <sakari.ailus(a)linux.intel.com> media: i2c: ccs: Check rules is non-NULL Thomas Gleixner <tglx(a)linutronix.de> cpu/hotplug: Prevent self deadlock on CPU hot-unplug Joel Fernandes (Google) <joel(a)joelfernandes.org> mm/vmalloc: add a safer version of find_vm_area() for debug Bart Van Assche <bvanassche(a)acm.org> scsi: core: Fix the scsi_set_resid() documentation Kees Cook <keescook(a)chromium.org> printk: ringbuffer: Fix truncating buffer size min_t cast Zqiang <qiang.zhang1211(a)gmail.com> rcu: dump vmalloc memory info safely Hou Tao <houtao1(a)huawei.com> virtio_pmem: add the missing REQ_OP_WRITE for flush bio Takashi Iwai <tiwai(a)suse.de> ALSA: pcm: Fix missing fixup call in compat hw_refine ioctl Kalesh Singh <kaleshsingh(a)google.com> Multi-gen LRU: fix per-zone reclaim Boris Brezillon <boris.brezillon(a)collabora.com> PM / devfreq: Fix leak in devfreq_dev_release() Helge Deller <deller(a)gmx.de> parisc: ccio-dma: Create private runway procfs root entry Radoslaw Tyl <radoslawx.tyl(a)intel.com> igb: set max size RX buffer when store bad packet is enabled Daniel Mack <daniel(a)zonque.org> gpio: zynq: restore zynq_gpio_irq_reqres/zynq_gpio_irq_relres callbacks Christoph Böhmwalder <christoph.boehmwalder(a)linbit.com> drbd: swap bvec_set_page len and offset Mohamed Khalfella <mkhalfella(a)purestorage.com> skbuff: skb_segment, Call zero copy functions before using skbuff frags Wander Lairson Costa <wander(a)redhat.com> netfilter: xt_sctp: validate the flag_info count Wander Lairson Costa <wander(a)redhat.com> netfilter: xt_u32: validate user space input Xiao Liang <shaw.leon(a)gmail.com> netfilter: nft_exthdr: Fix non-linear header modification Kyle Zeng <zengyhkyle(a)gmail.com> netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c Eric Dumazet <edumazet(a)google.com> igmp: limit igmpv3_newpack() packet size to IP_MAX_MTU Eric Dumazet <edumazet(a)google.com> net: deal with integer overflows in kmalloc_reserve() Yuan Yao <yuanyaogoog(a)chromium.org> virtio_ring: fix avail_wrap_counter in virtqueue_add_packed Jason Wang <jasowang(a)redhat.com> virtio_vdpa: build affinity masks conditionally Liao Chang <liaochang1(a)huawei.com> cpufreq: Fix the race condition while updating the transition_task of policy Vincent Whitchurch <vincent.whitchurch(a)axis.com> um: virt-pci: fix missing declaration warning Maciej S. Szmigiero <maciej.szmigiero(a)oracle.com> Drivers: hv: vmbus: Don't dereference ACPI root object handle Arnd Bergmann <arnd(a)arndb.de> remoteproc: stm32: fix incorrect optional pointers Fenghua Yu <fenghua.yu(a)intel.com> dmaengine: idxd: Fix issues with PRS disable sysfs knob Fenghua Yu <fenghua.yu(a)intel.com> dmaengine: idxd: Allow ATS disable update only for configurable devices Fenghua Yu <fenghua.yu(a)intel.com> dmaengine: idxd: Expose ATS disable knob only when WQ ATS is supported Fenghua Yu <fenghua.yu(a)intel.com> dmaengine: idxd: Simplify WQ attribute visibility checks ruanjinjie <ruanjinjie(a)huawei.com> dmaengine: ste_dma40: Add missing IRQ check in d40_probe Randy Dunlap <rdunlap(a)infradead.org> um: Fix hostaudio build errors Arnd Bergmann <arnd(a)arndb.de> mfd: rz-mtu3: Link time dependencies Geert Uytterhoeven <geert+renesas(a)glider.be> mfd: rk808: Make MFD_RK8XX tristate Yi Yang <yiyang13(a)huawei.com> mtd: rawnand: fsmc: handle clk prepare error in fsmc_nand_resume() Hsin-Yi Wang <hsinyi(a)chromium.org> mtd: spi-nor: Check bus width while setting QE bit Marek Behún <kabel(a)kernel.org> leds: trigger: tty: Do not use LED_ON/OFF constants, use led_blink_set_oneshot instead Marek Behún <kabel(a)kernel.org> leds: Fix BUG_ON check for LED_COLOR_ID_MULTI that is always false Marek Behún <kabel(a)kernel.org> leds: multicolor: Use rounded division when calculating color components Ahmad Fatoum <a.fatoum(a)pengutronix.de> thermal/drivers/imx8mm: Suppress log message on probe deferral Nícolas F. R. A. Prado <nfraprado(a)collabora.com> thermal/drivers/mediatek/lvts_thermal: Manage threshold between sensors Nícolas F. R. A. Prado <nfraprado(a)collabora.com> thermal/drivers/mediatek/lvts_thermal: Don't leave threshold zeroed Nícolas F. R. A. Prado <nfraprado(a)collabora.com> thermal/drivers/mediatek/lvts_thermal: Disable undesired interrupts Nícolas F. R. A. Prado <nfraprado(a)collabora.com> thermal/drivers/mediatek/lvts_thermal: Use offset threshold for IRQ Nícolas F. R. A. Prado <nfraprado(a)collabora.com> thermal/drivers/mediatek/lvts_thermal: Honor sensors in immediate mode Nícolas F. R. A. Prado <nfraprado(a)collabora.com> thermal/drivers/mediatek/lvts_thermal: Handle IRQ on all controllers Dan Carpenter <dan.carpenter(a)linaro.org> leds: pwm: Fix error code in led_pwm_create_fwnode() Arnd Bergmann <arnd(a)arndb.de> leds: simatic-ipc-leds-gpio: Restore LEDS_CLASS dependency Dan Carpenter <dan.carpenter(a)linaro.org> leds: aw200xx: Fix error code in probe() Jiasheng Jiang <jiasheng(a)iscas.ac.cn> rpmsg: glink: Add check for kstrdup Jonas Karlman <jonas(a)kwiboo.se> phy/rockchip: inno-hdmi: do not power on rk3328 post pll on reg write Zheng Yang <zhengyang(a)rock-chips.com> phy/rockchip: inno-hdmi: round fractal pixclock in rk3328 recalc_rate Jonas Karlman <jonas(a)kwiboo.se> phy/rockchip: inno-hdmi: use correct vco_div_5 macro on rk3328 Rex Zhang <rex.zhang(a)intel.com> dmaengine: idxd: Modify the dependence of attribute pasid_enabled William Zhang <william.zhang(a)broadcom.com> mtd: rawnand: brcmnand: Fix mtd oobsize Hugh Dickins <hughd(a)google.com> mm/pagewalk: fix bootstopping regression from extra pte_unmap() Zheng Yejian <zhengyejian1(a)huawei.com> tracing: Fix race issue between cpu buffer write and swap Mikhail Kobuk <m.kobuk(a)ispras.ru> tracing: Remove extra space at the end of hwlat_detector/mode Dave Hansen <dave.hansen(a)linux.intel.com> x86/speculation: Mark all Skylake CPUs as vulnerable to GDS Paul Gortmaker <paul.gortmaker(a)windriver.com> tick/rcu: Fix false positive "softirq work is pending" messages Mirsad Goran Todorovac <mirsad.todorovac(a)alu.unizg.hr> workqueue: fix data race with the pwq->stats[] increment Mario Limonciello <mario.limonciello(a)amd.com> platform/x86/amd/pmf: Fix a missing cleanup path Rahul Rameshbabu <rrameshbabu(a)nvidia.com> HID: nvidia-shield: Reference hid_device devm allocation of input_dev name Rahul Rameshbabu <sergeantsagara(a)protonmail.com> HID: multitouch: Correct devm device reference for hidinput input_dev name Rahul Rameshbabu <sergeantsagara(a)protonmail.com> HID: uclogic: Correct devm device reference for hidinput input_dev name Chao Yu <chao(a)kernel.org> f2fs: compress: fix to assign compress_level for lz4 correctly Björn Töpel <bjorn(a)rivosinc.com> riscv: Require FRAME_POINTER for some configurations Miquel Raynal <miquel.raynal(a)bootlin.com> nvmem: core: Return NULL when no nvmem layout is found Nikita Zhandarovich <n.zhandarovich(a)fintech.ru> HID: logitech-dj: Fix error handling in logi_dj_recv_switch_to_dj_mode() Yonatan Nachum <ynachum(a)amazon.com> RDMA/efa: Fix wrong resources deallocation order Guoqing Jiang <guoqing.jiang(a)linux.dev> RDMA/siw: Correct wrong debug message Guoqing Jiang <guoqing.jiang(a)linux.dev> RDMA/siw: Balance the reference of cep->kref in the error path Leon Romanovsky <leon(a)kernel.org> Revert "IB/isert: Fix incorrect release of isert connection" Peng Fan <peng.fan(a)nxp.com> amba: bus: fix refcount leak Christophe Leroy <christophe.leroy(a)csgroup.eu> Documentation: devices.txt: Fix minors for ttyCPM* Christophe Leroy <christophe.leroy(a)csgroup.eu> Documentation: devices.txt: Remove ttySIOC* Christophe Leroy <christophe.leroy(a)csgroup.eu> Documentation: devices.txt: Remove ttyIOC* Yi Yang <yiyang13(a)huawei.com> serial: tegra: handle clk prepare error in tegra_uart_hw_init() Sam Protsenko <semen.protsenko(a)linaro.org> dt-bindings: usb: samsung,exynos-dwc3: Fix Exynos5433 compatible Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> dt-bindings: usb: samsung,exynos-dwc3: fix order of clocks on Exynos5433 Konrad Dybcio <konrad.dybcio(a)linaro.org> interconnect: qcom: bcm-voter: Use enable_maks for keepalive voting Konrad Dybcio <konrad.dybcio(a)linaro.org> interconnect: qcom: bcm-voter: Improve enable_mask handling Konrad Dybcio <konrad.dybcio(a)linaro.org> interconnect: qcom: sm8450: Enable sync_state Chengfeng Ye <dg573847474(a)gmail.com> scsi: fcoe: Fix potential deadlock on &fip->ctlr_lock Tony Battersby <tonyb(a)cybernetics.com> scsi: core: Use 32-bit hostnum in scsi_host_lookup() Christopher Bednarz <christopher.n.bednarz(a)intel.com> RDMA/irdma: Prevent zero-length STAG registration Chao Yu <chao(a)kernel.org> Revert "f2fs: do not issue small discard commands during checkpoint" Junhao He <hejunhao3(a)huawei.com> coresight: trbe: Fix TRBE potential sleep in atomic context Junhao He <hejunhao3(a)huawei.com> coresight: Fix memory leak in acpi_buffer->pointer Suzuki K Poulose <suzuki.poulose(a)arm.com> coresight: platform: acpi: Ignore the absence of graph Suzuki K Poulose <suzuki.poulose(a)arm.com> coresight: trbe: Allocate platform data per device Lu Jialin <lujialin4(a)huawei.com> cgroup:namespace: Remove unused cgroup_namespaces_init() Chao Yu <chao(a)kernel.org> f2fs: fix to account cp stats correctly Chao Yu <chao(a)kernel.org> f2fs: fix to account gc stats correctly Chao Yu <chao(a)kernel.org> Revert "f2fs: fix to do sanity check on extent cache correctly" Chunhai Guo <guochunhai(a)vivo.com> f2fs: Only lfs mode is allowed with zoned block device feature Shin'ichiro Kawasaki <shinichiro.kawasaki(a)wdc.com> f2fs: check zone type before sending async reset zone command Christoph Hellwig <hch(a)lst.de> f2fs: don't reopen the main block device in f2fs_scan_devices Chao Yu <chao(a)kernel.org> f2fs: fix to avoid mmap vs set_compress_option case Randy Dunlap <rdunlap(a)infradead.org> f2fs: fix spelling in ABI documentation Jacopo Mondi <jacopo.mondi(a)ideasonboard.com> media: i2c: rdacm21: Fix uninitialized value Hans de Goede <hdegoede(a)redhat.com> media: ov2680: Fix regulators being left enabled on ov2680_power_on() errors Hans de Goede <hdegoede(a)redhat.com> media: ov2680: Fix ov2680_set_fmt() which == V4L2_SUBDEV_FORMAT_TRY not working Hans de Goede <hdegoede(a)redhat.com> media: ov2680: Add ov2680_fill_format() helper function Hans de Goede <hdegoede(a)redhat.com> media: ov2680: Don't take the lock for try_fmt calls Hans de Goede <hdegoede(a)redhat.com> media: ov2680: Remove VIDEO_V4L2_SUBDEV_API ifdef-s Hans de Goede <hdegoede(a)redhat.com> media: ov2680: Fix vflip / hflip set functions Hans de Goede <hdegoede(a)redhat.com> media: ov2680: Fix ov2680_bayer_order() Hans de Goede <hdegoede(a)redhat.com> media: ov2680: Remove auto-gain and auto-exposure controls Tomi Valkeinen <tomi.valkeinen(a)ideasonboard.com> media: Documentation: Fix [GS]_ROUTING documentation Marek Vasut <marex(a)denx.de> media: ov5640: Fix initial RESETB state and annotate timings Marek Vasut <marex(a)denx.de> media: ov5640: Enable MIPI interface in ov5640_set_power_mipi() Rahul Rameshbabu <rrameshbabu(a)nvidia.com> HID: nvidia-shield: Remove led_classdev_unregister in thunderstrike_create Illia Ostapyshyn <ostapyshyn(a)sra.uni-hannover.de> HID: input: Support devices sending Eraser without Invert David Gow <davidgow(a)google.com> drivers: base: Free devm resources when unregistering a device Alan Stern <stern(a)rowland.harvard.edu> USB: gadget: f_mass_storage: Fix unused variable warning Alan Stern <stern(a)rowland.harvard.edu> USB: gadget: core: Add missing kerneldoc for vbus_work Randy Dunlap <rdunlap(a)infradead.org> docs: ABI: fix spelling/grammar in SBEFIFO timeout interface Hans de Goede <hdegoede(a)redhat.com> media: ipu-bridge: Do not use on stack memory for software_node.name field Bingbu Cao <bingbu.cao(a)intel.com> media: ipu3-cio2: rename cio2 bridge to ipu bridge and move out of ipu3 Hans de Goede <hdegoede(a)redhat.com> media: ipu-bridge: Fix null pointer deref on SSDB/PLD parsing warnings Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> arm64: defconfig: Drop CONFIG_VIDEO_IMX_MEDIA Konrad Dybcio <konrad.dybcio(a)linaro.org> media: venus: hfi_venus: Only consider sys_idle_indicator on V1 Colin Ian King <colin.i.king(a)gmail.com> media: go7007: Remove redundant if statement Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: cec: core: add adap_unconfigured() callback Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: cec: core: add adap_nb_transmit_canceled() callback Armin Wolf <W_Armin(a)gmx.de> platform/x86: dell-sysman: Fix reference leak Yanfei Xu <yanfei.xu(a)intel.com> iommu/vt-d: Fix to flush cache of PASID directory table Vijaya Krishna Nivarthi <quic_vnivarth(a)quicinc.com> tty: serial: qcom-geni-serial: Poll primary sequencer irq status after cancel_tx AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> iommu/qcom: Disable and reset context bank before programming Eddie James <eajames(a)linux.ibm.com> fsi: aspeed: Reset master errors after CFAM reset Xiang Yang <xiangyang3(a)huawei.com> IB/uverbs: Fix an potential error pointer dereference Chengchang Tang <tangchengchang(a)huawei.com> RDMA/hns: Fix CQ and QP cache affinity Junxian Huang <huangjunxian6(a)hisilicon.com> RDMA/hns: Fix inaccurate error label name in init instance Junxian Huang <huangjunxian6(a)hisilicon.com> RDMA/hns: Fix incorrect post-send with direct wqe of wr-list Chengchang Tang <tangchengchang(a)huawei.com> RDMA/hns: Fix port active speed Kalesh AP <kalesh-anakkur.purayil(a)broadcom.com> RDMA/bnxt_re: Remove a redundant flag Kalesh AP <kalesh-anakkur.purayil(a)broadcom.com> RDMA/bnxt_re: Fix max_qp count for virtual functions Chandramohan Akula <chandramohan.akula(a)broadcom.com> RDMA/bnxt_re: Initialize Doorbell pacing feature Chandramohan Akula <chandramohan.akula(a)broadcom.com> bnxt_en: Share the bar0 address with the RoCE driver Chandramohan Akula <chandramohan.akula(a)broadcom.com> bnxt_en: Update HW interface headers Zhu Wang <wangzhu9(a)huawei.com> iommu: Remove kernel-doc warnings Jason Gunthorpe <jgg(a)ziepe.ca> iommu/sprd: Add missing force_aperture Chengci.Xu <chengci.xu(a)mediatek.com> iommu/mediatek: Fix two IOMMU share pagetable issue Arnd Bergmann <arnd(a)arndb.de> extcon: cht_wc: add POWER_SUPPLY dependency Arnd Bergmann <arnd(a)arndb.de> kernfs: add stub helper for kernfs_generic_poll() Jason Gunthorpe <jgg(a)ziepe.ca> driver core: Call dma_cleanup() on the test_remove path Dan Carpenter <dan.carpenter(a)linaro.org> driver core: test_async: fix an error code Rob Clark <robdclark(a)chromium.org> dma-buf/sync_file: Fix docs syntax Konrad Dybcio <konrad.dybcio(a)linaro.org> interconnect: qcom: qcm2290: Enable sync state Ruidong Tian <tianruidong(a)linux.alibaba.com> coresight: tmc: Explicit type conversions to prevent integer overflow Gustavo A. R. Silva <gustavoars(a)kernel.org> RDMA/irdma: Replace one-element array with flexible-array member Oleksandr Natalenko <oleksandr(a)natalenko.name> scsi: qedf: Do not touch __user pointer in qedf_dbg_fp_int_cmd_read() directly Oleksandr Natalenko <oleksandr(a)natalenko.name> scsi: qedf: Do not touch __user pointer in qedf_dbg_debug_cmd_read() directly Oleksandr Natalenko <oleksandr(a)natalenko.name> scsi: qedf: Do not touch __user pointer in qedf_dbg_stop_io_on_error_cmd_read() directly Bob Pearson <rpearsonhpe(a)gmail.com> RDMA/rxe: Fix incomplete state save in rxe_requester Bob Pearson <rpearsonhpe(a)gmail.com> RDMA/rxe: Fix rxe_modify_srq Bob Pearson <rpearsonhpe(a)gmail.com> RDMA/rxe: Fix unsafe drain work queue code Bob Pearson <rpearsonhpe(a)gmail.com> RDMA/rxe: Move work queue code to subroutines Randy Dunlap <rdunlap(a)infradead.org> x86/APM: drop the duplicate APM_MINOR_DEV macro Chunyan Zhang <chunyan.zhang(a)unisoc.com> serial: sprd: Fix DMA buffer leak issue Chunyan Zhang <chunyan.zhang(a)unisoc.com> serial: sprd: Assign sprd_port after initialized to avoid wrong access Biju Das <biju.das.jz(a)bp.renesas.com> iio: accel: adxl313: Fix adxl313_i2c_id[] table Lin Ma <linma(a)zju.edu.cn> scsi: qla4xxx: Add length check when parsing nlattrs Lin Ma <linma(a)zju.edu.cn> scsi: be2iscsi: Add length check when parsing nlattrs Lin Ma <linma(a)zju.edu.cn> scsi: iscsi: Add strlen() check in iscsi_if_set{_host}_param() Lin Ma <linma(a)zju.edu.cn> scsi: iscsi: Add length check for nlattr payload Bart Van Assche <bvanassche(a)acm.org> scsi: ufs: Fix residual handling Bart Van Assche <bvanassche(a)acm.org> scsi: RDMA/srp: Fix residual handling Xu Yang <xu.yang_2(a)nxp.com> usb: phy: mxs: fix getting wrong state with mxs_phy_is_otg_host() Dan Carpenter <dan.carpenter(a)linaro.org> media: mediatek: vcodec: fix resource leaks in vdec_msg_queue_init() Dan Carpenter <dan.carpenter(a)linaro.org> media: mediatek: vcodec: fix potential double free Irui Wang <irui.wang(a)mediatek.com> media: mediatek: vcodec: Return NULL if no vdec_fb is found Xiaoyong Lu <xiaoyong.lu(a)mediatek.com> media: mediatek: vcodec: fix AV1 decode fail for 36bit iova Ming Qian <ming.qian(a)nxp.com> media: amphion: ensure the bitops don't cross boundaries Ming Qian <ming.qian(a)nxp.com> media: amphion: fix UNUSED_VALUE issue reported by coverity Ming Qian <ming.qian(a)nxp.com> media: amphion: fix UNINIT issues reported by coverity Ming Qian <ming.qian(a)nxp.com> media: amphion: fix REVERSE_INULL issues reported by coverity Ming Qian <ming.qian(a)nxp.com> media: amphion: fix CHECKED_RETURN issues reported by coverity Benjamin Gaignard <benjamin.gaignard(a)collabora.com> media: rkvdec: increase max supported height for H.264 Ming Qian <ming.qian(a)nxp.com> media: amphion: decoder support display delay for all formats Zheng Wang <zyytlz.wz(a)163.com> media: mtk-jpeg: Fix use after free bug due to uncanceled work Michael Tretter <m.tretter(a)pengutronix.de> media: verisilicon: Fix TRY_FMT on encoder OUTPUT Ming Qian <ming.qian(a)nxp.com> media: amphion: add helper function to get id name Ming Qian <ming.qian(a)nxp.com> media: amphion: reinit vpu if reqbufs output 0 Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> dt-bindings: extcon: maxim,max77843: restrict connector properties Xingui Yang <yangxingui(a)huawei.com> scsi: hisi_sas: Fix normally completed I/O analysed as failed Chuck Lever <chuck.lever(a)oracle.com> RDMA/siw: Fabricate a GID on tun and loopback devices Daniil Dulov <d.dulov(a)aladdin.ru> media: cx24120: Add retval check for cx24120_message_send() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> media: dvb-usb: m920x: Fix a potential memory leak in m920x_i2c_xfer() Daniil Dulov <d.dulov(a)aladdin.ru> media: dib7000p: Fix potential division by zero Dongliang Mu <dzm91(a)hust.edu.cn> drivers: usb: smsusb: fix error handling code in smsusb_init_device Jonas Karlman <jonas(a)kwiboo.se> iommu: rockchip: Fix directory table address encoding Daniel Marcovitch <dmarcovitch(a)nvidia.com> iommu/amd/iommu_v2: Fix pasid_state refcount dec hit 0 warning on pasid unbind Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link() Claudiu Beznea <claudiu.beznea(a)microchip.com> media: i2c: tvp5150: check return value of devm_kasprintf() Hans de Goede <hdegoede(a)redhat.com> media: ad5820: Drop unsupported ad5823 from i2c_ and of_device_id tables Tommaso Merciai <tomm.merciai(a)gmail.com> media: i2c: imx290: drop format param from imx290_ctrl_update Guoniu.zhou <guoniu.zhou(a)nxp.com> media: ov5640: fix low resolution image abnormal issue Minjie Du <duminjie(a)vivo.com> RDMA/qedr: Remove a duplicate assignment in irdma_query_ah() Waiman Long <longman(a)redhat.com> cgroup/cpuset: Inherit parent's load balance state in v2 Anna Schumaker <Anna.Schumaker(a)Netapp.com> pNFS: Fix assignment of xprtdata.cred Olga Kornievskaia <kolga(a)netapp.com> NFSv4.2: fix handling of COPY ERR_OFFLOAD_NO_REQ Benjamin Coddington <bcodding(a)redhat.com> NFS: Guard against READDIR loop when entry names exceed MAXNAMELEN Nathan Chancellor <nathan(a)kernel.org> clk: qcom: Fix SM_GPUCC_8450 dependencies Chuck Lever <chuck.lever(a)oracle.com> NFSD: da_addr_body field missing in some GETDEVICEINFO replies Su Hui <suhui(a)nfschina.com> fs: lockd: avoid possible wrong NULL parameter Chuck Lever <chuck.lever(a)oracle.com> SUNRPC: Fix the recent bv_offset fix Alexei Filippov <halip0503(a)gmail.com> jfs: validate max amount of blocks before allocation. Zhihao Cheng <chengzhihao1(a)huawei.com> ext4: fix unttached inode after power cut with orphan file feature enabled Russell Currey <ruscur(a)russell.cc> powerpc/iommu: Fix notifiers being shared by PCI and VIO buses Liang He <windhl(a)126.com> powerpc/mpc5xxx: Add missing fwnode_handle_put() Nicholas Piggin <npiggin(a)gmail.com> powerpc/pseries: Fix hcall tracepoints with JUMP_LABEL=n Dan Carpenter <dan.carpenter(a)linaro.org> nfs/blocklayout: Use the passed in gfp flags Russell Currey <ruscur(a)russell.cc> powerpc/pseries: Rework lppaca_shared_proc() to avoid DEBUG_PREEMPT Michael Ellerman <mpe(a)ellerman.id.au> powerpc: Don't include lppaca.h in paca.h Xiaowei Bao <xiaowei.bao(a)nxp.com> PCI: layerscape: Add workaround for lost link capabilities during reset Anna Schumaker <Anna.Schumaker(a)Netapp.com> NFSv4.2: Rework scratch handling for READ_PLUS (again) Anna Schumaker <Anna.Schumaker(a)Netapp.com> NFSv4.2: Fix READ_PLUS size calculations Anna Schumaker <Anna.Schumaker(a)Netapp.com> NFSv4.2: Fix READ_PLUS smatch warnings Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> wifi: ath10k: Use RMW accessors for changing LNKCTL Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> wifi: ath12k: Use RMW accessors for changing LNKCTL Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> wifi: ath11k: Use RMW accessors for changing LNKCTL Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> net/mlx5: Use RMW accessors for changing LNKCTL Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> drm/radeon: Use RMW accessors for changing LNKCTL Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> drm/amdgpu: Use RMW accessors for changing LNKCTL Daniel Golle <daniel(a)makrotopia.org> pinctrl: mediatek: assign functions to configure pin bias on MT7986 Daniel Golle <daniel(a)makrotopia.org> pinctrl: mediatek: fix pull_type data for MT7981 Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/perf: Convert fsl_emb notifier to state machine callbacks Sourabh Jain <sourabhjain(a)linux.ibm.com> powerpc/fadump: reset dump area size if fadump memory reserve fails Konstantin Meskhidze <konstantin.meskhidze(a)huawei.com> nvdimm: Fix dereference after free in register_nvdimm_pmu() Konstantin Meskhidze <konstantin.meskhidze(a)huawei.com> nvdimm: Fix memleak of pmu attr_groups in unregister_nvdimm_pmu() Stefan Hajnoczi <stefanha(a)redhat.com> vfio/type1: fix cap_migration information leak Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/radix: Move some functions into #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE Ahmad Fatoum <a.fatoum(a)pengutronix.de> clk: imx: composite-8m: fix clock pauses when set_rate would be a no-op Marco Felsch <m.felsch(a)pengutronix.de> clk: imx8mp: fix sai4 clock Peng Fan <peng.fan(a)nxp.com> clk: imx: imx8ulp: update SPLL2 type Ye Li <ye.li(a)nxp.com> clk: imx: pllv4: Fix SPLL2 MULT range Imran Shaik <quic_imrashai(a)quicinc.com> clk: qcom: gcc-qdu1000: Fix clkref clocks handling Imran Shaik <quic_imrashai(a)quicinc.com> clk: qcom: gcc-qdu1000: Fix gcc_pcie_0_pipe_clk_src clock handling Konrad Dybcio <konrad.dybcio(a)linaro.org> clk: qcom: gcc-sm8450: Use floor ops for SDCC RCGs Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> PCI/ASPM: Use RMW accessors for changing LNKCTL Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> PCI: pciehp: Use RMW accessors for changing LNKCTL Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> PCI: Make link retraining use RMW accessors for changing LNKCTL Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> PCI: Add locking to RMW PCI Express Capability Register accessors Claudiu Beznea <claudiu.beznea(a)microchip.com> pinctrl: mcp23s08: check return value of devm_kasprintf() Wu Zongyong <wuzongyong(a)linux.alibaba.com> PCI: Mark NVIDIA T4 GPUs to avoid bus reset Daire McNamara <daire.mcnamara(a)microchip.com> PCI: microchip: Correct the DED and SEC interrupt bit offsets Luca Weiss <luca.weiss(a)fairphone.com> clk: qcom: gcc-sm6350: Fix gcc_sdcc2_apps_clk_src Konrad Dybcio <konrad.dybcio(a)linaro.org> clk: qcom: reset: Use the correct type of sleep/delay based on length Dmitry Torokhov <dmitry.torokhov(a)gmail.com> kvm/vfio: ensure kvg instance stays around in kvm_vfio_group_add() Yi Liu <yi.l.liu(a)intel.com> kvm/vfio: Prepare for accepting vfio device fd Arnd Bergmann <arnd(a)arndb.de> clk: qcom: fix some Kconfig corner cases Patrick Whewell <patrick.whewell(a)sightlineapplications.com> clk: qcom: gcc-sm8250: Fix gcc_sdcc2_apps_clk_src Kemeng Shi <shikemeng(a)huaweicloud.com> ext4: avoid potential data overflow in next_linear_group Kemeng Shi <shikemeng(a)huaweicloud.com> ext4: correct grp validation in ext4_mb_good_group Qiuxu Zhuo <qiuxu.zhuo(a)intel.com> EDAC/igen6: Fix the issue of no error events David Wronek <davidwronek(a)gmail.com> clk: qcom: gcc-sc7180: Fix up gcc_sdcc2_apps_clk_src Zhang Jianhua <chris.zjh(a)huawei.com> clk: sunxi-ng: Modify mismatched function name Konrad Dybcio <konrad.dybcio(a)linaro.org> clk: qcom: dispcc-sc8280xp: Use ret registers on GDSCs Ira Weiny <ira.weiny(a)intel.com> PCI/DOE: Fix destroy_work_on_stack() race Jason Gunthorpe <jgg(a)ziepe.ca> iommufd: Fix locking around hwpt allocation Qiuxu Zhuo <qiuxu.zhuo(a)intel.com> EDAC/i10nm: Skip the absent memory controllers Minjie Du <duminjie(a)vivo.com> drivers: clk: keystone: Fix parameter judgment in _of_pll_clk_init() Johan Hovold <johan+linaro(a)kernel.org> clk: qcom: gcc-sc8280xp: fix runtime PM imbalance on probe errors Manivannan Sadhasivam <mani(a)kernel.org> PCI: qcom-ep: Switch MHI bus master clock off during L1SS Sven Peter <sven(a)svenpeter.dev> PCI: apple: Initialize pcie->nvecs before use Alibek Omarov <a1ba.omarov(a)gmail.com> clk: rockchip: rk3568: Fix PLL rate setting for 78.75MHz Danila Tikhonov <danila(a)jiaxyga.com> clk: qcom: gcc-sm7150: Add CLK_OPS_PARENT_ENABLE to sdcc2 rcg Konrad Dybcio <konrad.dybcio(a)linaro.org> clk: qcom: gcc-sc8280xp: Add missing GDSCs Konrad Dybcio <konrad.dybcio(a)linaro.org> dt-bindings: clock: qcom,gcc-sc8280xp: Add missing GDSCs Konrad Dybcio <konrad.dybcio(a)linaro.org> clk: qcom: gcc-sc8280xp: Add missing GDSC flags Konrad Dybcio <konrad.dybcio(a)linaro.org> clk: qcom: gpucc-sm6350: Fix clock source names Konrad Dybcio <konrad.dybcio(a)linaro.org> clk: qcom: gpucc-sm6350: Introduce index-based clk lookup Corey Minyard <minyard(a)acm.org> ipmi:ssif: Fix a memory leak when scanning for an adapter Jiasheng Jiang <jiasheng(a)iscas.ac.cn> ipmi:ssif: Add check for kstrdup Takashi Iwai <tiwai(a)suse.de> ALSA: ump: Fix -Wformat-truncation warnings Takashi Iwai <tiwai(a)suse.de> ALSA: ump: Don't create unused substreams for static blocks Takashi Iwai <tiwai(a)suse.de> ALSA: ump: Fill group names for legacy rawmidi substreams Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Attach legacy rawmidi after probing all UMP EPs Su Hui <suhui(a)nfschina.com> ALSA: ac97: Fix possible error value of *rac97 Geert Uytterhoeven <geert+renesas(a)glider.be> of: unittest: Fix overlay type in apply/revert check Geert Uytterhoeven <geert+renesas(a)glider.be> of: overlay: Call of_changeset_init() early Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> ASoC: SOF: amd: clear dsp to host interrupt status Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ASoC: fsl: merge DAI call back functions into ops Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ASoC: soc-dai.h: merge DAI call back functions into ops Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ASoC: pxa: merge DAI call back functions into ops David Jeffery <djeffery(a)redhat.com> md: raid0: account for split bio in iostat accounting Jan Kara <jack(a)suse.cz> md/raid0: Fix performance regression for large sequential writes Jan Kara <jack(a)suse.cz> md/raid0: Factor out helper for mapping and submitting a bio Xueshi Hu <xueshi.hu(a)smartx.com> md/raid1: hold the barrier until handle_read_error() finishes Xueshi Hu <xueshi.hu(a)smartx.com> md/raid1: free the r1bio before waiting for blocked rdev Tejun Heo <tj(a)kernel.org> blk-cgroup: Fix NULL deref caused by blkg_policy_data being installed before init Vlad Karpovich <vkarpovi(a)opensource.cirrus.com> firmware: cs_dsp: Fix new control name check Yu Kuai <yukuai3(a)huawei.com> md/raid5-cache: fix null-ptr-deref for r5l_flush_stripe_to_raid() Yu Kuai <yukuai3(a)huawei.com> md/raid5-cache: fix a deadlock in r5l_exit_log() Damien Le Moal <dlemoal(a)kernel.org> block: uapi: Fix compilation errors using ioprio.h with C++ Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Fix cast to enum warning Rob Clark <robdclark(a)chromium.org> drm/msm/a690: Switch to a660_gmu.bin Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sc8280xp-x13s: Unreserve NC pins David Wronek <davidwronek(a)gmail.com> arm64: dts: qcom: msm8996: Fix dsi1 interrupts Rohit Agarwal <quic_rohiagar(a)quicinc.com> ARM: dts: qcom: sdx65-mtp: Update the pmic used in sdx65 Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: msm8998: Add missing power domain to MMSS SMMU Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: msm8998: Drop bus clock reference from MMSS SMMU Bryan O'Donoghue <bryan.odonoghue(a)linaro.org> arm64: dts: qcom: apq8016-sbc: Rename ov5640 enable-gpios to powerdown-gpios Bryan O'Donoghue <bryan.odonoghue(a)linaro.org> arm64: dts: qcom: apq8016-sbc: Fix ov5640 regulator supply names Jason-JH.Lin <jason-jh.lin(a)mediatek.com> drm/mediatek: Fix void-pointer-to-enum-cast warning Sui Jingfeng <suijingfeng(a)loongson.cn> drm/mediatek: Fix potential memory leak if vmap() fail Aradhya Bhatia <a-bhatia1(a)ti.com> arm64: dts: ti: k3-am62x-sk-common: Update main-i2c1 frequency Robert Marko <robert.marko(a)sartura.hr> ARM: dts: qcom: ipq4019: correct SDHCI XO clock Marco Felsch <m.felsch(a)pengutronix.de> arm64: dts: imx8mp-debix: remove unused fec pinctrl node Jason-JH.Lin <jason-jh.lin(a)mediatek.com> drm/mediatek: Add cnt checking for coverity issue Jason-JH.Lin <jason-jh.lin(a)mediatek.com> drm/mediatek: Remove freeing not dynamic allocated memory Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Fix build warning for 64-bit build Apelete Seketeli <aseketeli(a)baylibre.com> arm64: dts: ti: k3-j784s4: Fix interrupt ranges for wkup & main gpio Udit Kumar <u-kumar1(a)ti.com> arm64: dts: ti: k3-j784s4-evm: Correct Pin mux offset for ADC AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> drm/mediatek: dp: Add missing error checks in mtk_dp_parse_capabilities Jinyoung Choi <j-young.choi(a)samsung.com> bio-integrity: create multi-page bvecs in bio_integrity_add_page() Jinyoung Choi <j-young.choi(a)samsung.com> block: make bvec_try_merge_hw_page() non-static Christoph Hellwig <hch(a)lst.de> block: don't pass a bio to bio_try_merge_hw_seg Christoph Hellwig <hch(a)lst.de> block: move the bi_size update out of __bio_try_merge_page Christoph Hellwig <hch(a)lst.de> block: move the bi_size overflow check in __bio_try_merge_page Christoph Hellwig <hch(a)lst.de> block: move the bi_vcnt check out of __bio_try_merge_page Christoph Hellwig <hch(a)lst.de> block: move the BIO_CLONED checks out of __bio_try_merge_page Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fix drain stalls by invalid SQE Zhiguo Niu <zhiguo.niu(a)unisoc.com> block/mq-deadline: use correct way to throttling write requests Gaosheng Cui <cuigaosheng1(a)huawei.com> audit: fix possible soft lockup in __audit_inode_child() Nancy.Lin <nancy.lin(a)mediatek.com> drm/mediatek: Fix uninitialized symbol Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: SOF: Intel: fix u16/32 confusion in LSDIID Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: SOF: Intel: hda-mlink: fix off-by-one error Rob Clark <robdclark(a)chromium.org> drm/msm/a6xx: Fix GMU lockdep splat Fabio Estevam <festevam(a)denx.de> drm/msm/a2xx: Call adreno_gpu_init() earlier Yang Wang <kevinyang.wang(a)amd.com> drm/amd/pm: fix variable dereferenced issue in amdgpu_device_attr_create() Srinivasan Shanmugam <srinivasan.shanmugam(a)amd.com> drm/amdgpu: Move vram, gtt & flash defines to amdgpu_ ttm & _psp.h Srinivasan Shanmugam <srinivasan.shanmugam(a)amd.com> drm/amdgpu: Sort the includes in amdgpu/amdgpu_drv.c Dan Carpenter <dan.carpenter(a)linaro.org> smackfs: Prevent underflow in smk_set_cipso() Udit Kumar <u-kumar1(a)ti.com> arm64: dts: ti: k3-j721s2: correct pinmux offset for ospi Udit Kumar <u-kumar1(a)ti.com> arm64: dts: ti: k3-j784s4-evm: Correct Pin mux offset for ospi Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dpu: fix the irq index in dpu_encoder_phys_wb_wait_for_commit_done Zhang Shurong <zhang_shurong(a)foxmail.com> firmware: meson_sm: fix to avoid potential NULL pointer dereference Daniel Vetter <daniel.vetter(a)ffwll.ch> drm/msm/mdp5: Don't leak some plane state Chen Jiahao <chenjiahao16(a)huawei.com> soc: qcom: smem: Fix incompatible types in comparison Abel Vesa <abel.vesa(a)linaro.org> arm64: dts: qcom: sm8550-mtp: Add missing supply for L1B regulator Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dpu: fix DSC 1.2 enc subblock length Ryan McCann <quic_rmccann(a)quicinc.com> drm/msm/dpu: Define names for unnamed sblks Konrad Dybcio <konrad.dybcio(a)linaro.org> drm/msm/dpu1: Rename sm8150_dspp_blk to sdm845_dspp_blk Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dpu: fix DSC 1.2 block lengths Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dpu: inline DSC_BLK and DSC_BLK_1_2 macros Jonathan Marek <jonathan(a)marek.ca> drm/msm/dpu: increase memtype count to 16 for sm8550 Jiasheng Jiang <jiasheng(a)iscas.ac.cn> drm: xlnx: zynqmp_dpsub: Add missing check for dma_set_mask Nayna Jain <nayna(a)linux.ibm.com> ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig Marek Vasut <marex(a)denx.de> drm/panel: simple: Add missing connector type and pixel format for AUO T215HVN01 Geert Uytterhoeven <geert(a)linux-m68k.org> drm/repaper: Reduce temporary buffer size in repaper_fb_dirty() Geert Uytterhoeven <geert+renesas(a)glider.be> drm/armada: Fix off-by-one error in armada_overlay_get_property() Rafał Miłecki <rafal(a)milecki.pl> ARM: dts: BCM53573: Fix Tenda AC9 switch CPU port Jocelyn Falempe <jfalempe(a)redhat.com> drm/ast: report connection status on Display Port. Zeyan Li <qaz6750(a)outlook.com> arm64: dts: qcom: sm8150: Fix the I2C7 interrupt Ruan Jinjie <ruanjinjie(a)huawei.com> of: unittest: fix null pointer dereferencing in of_unittest_find_node_by_name() Yangtao Li <frank.li(a)vivo.com> drm/tegra: dpaux: Fix incorrect return value of platform_get_irq Ryan McCann <quic_rmccann(a)quicinc.com> drm/msm: Update dev core dump to not print backwards Yu Kuai <yukuai3(a)huawei.com> md/md-bitmap: hold 'reconfig_mutex' in backlog_store() Yu Kuai <yukuai3(a)huawei.com> md/md-bitmap: remove unnecessary local variable in backlog_store() Li Nan <linan122(a)huawei.com> md/raid10: use dereference_rdev_and_rrdev() to get devices Li Nan <linan122(a)huawei.com> md/raid10: factor out dereference_rdev_and_rrdev() Yu Kuai <yukuai3(a)huawei.com> md: restore 'noio_flag' for the last mddev_resume() Herve Codina <herve.codina(a)bootlin.com> ASoC: fsl: fsl_qmc_audio: Fix snd_pcm_format_t values handling YingKun Meng <mengyingkun(a)loongson.cn> ASoC: loongson: drop of_match_ptr for OF device id Jonas Karlman <jonas(a)kwiboo.se> arm64: dts: rockchip: Enable SATA on Radxa E25 Jonas Karlman <jonas(a)kwiboo.se> arm64: dts: rockchip: Fix PCIe regulators on Radxa E25 Srinivasan Shanmugam <srinivasan.shanmugam(a)amd.com> drm/amdgpu: Use seq_puts() instead of seq_printf() Srinivasan Shanmugam <srinivasan.shanmugam(a)amd.com> drm/amdgpu: Update min() to min_t() in 'amdgpu_info_ioctl' Konrad Dybcio <konrad.dybcio(a)linaro.org> dt-bindings: arm: msm: kpss-acc: Make the optional reg truly optional Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: sc8180x-pmics: align LPG node name with dtschema Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: sc8180x-pmics: align SPMI PMIC Power-on node name with dtschema Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: sc8180x-pmics: add missing gpio-ranges Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: sc8180x-pmics: add missing qcom,spmi-gpio fallbacks Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: msm8996-gemini: fix touchscreen VIO supply Bjorn Andersson <quic_bjorande(a)quicinc.com> arm64: dts: qcom: sc8180x: Fix LLCC reg property Manivannan Sadhasivam <mani(a)kernel.org> arm64: dts: qcom: sdm845: Fix the min frequency of "ice_core_clk" Manivannan Sadhasivam <mani(a)kernel.org> arm64: dts: qcom: sdm845: Add missing RPMh power domain to GCC Rafał Miłecki <rafal(a)milecki.pl> ARM: dts: BCM53573: Fix Ethernet info for Luxul devices Bogdan Togorean <bogdan.togorean(a)analog.com> drm: adv7511: Fix low refresh rate register for ADV7533/5 Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> ARM: dts: samsung: s5pv210-smdkv210: correct ethernet reg addresses (split) Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> ARM: dts: samsung: s3c6410-mini6410: correct ethernet reg addresses (split) Chen-Yu Tsai <wenst(a)chromium.org> drm/bridge: anx7625: Use common macros for HDCP capabilities Chen-Yu Tsai <wenst(a)chromium.org> drm/bridge: anx7625: Use common macros for DP power sequencing commands Janusz Krzysztofik <janusz.krzysztofik(a)linux.intel.com> x86/mm: Fix PAT bit missing from page protection modify mask Chengming Zhou <zhouchengming(a)bytedance.com> blk-flush: fix rq->flush.seq for post-flush requests Christoph Hellwig <hch(a)lst.de> block: don't allow enabling a cache on devices that don't support it Christoph Hellwig <hch(a)lst.de> block: cleanup queue_wc_store Lucas Stach <l.stach(a)pengutronix.de> drm/etnaviv: fix dumping of active MMU context Diogo Ivo <diogo.ivo(a)tecnico.ulisboa.pt> arm64: tegra: Fix HSUART for Smaug Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sc8180x: Add missing 'cache-unified' to L3 Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: pmi8994: Add missing OVP interrupt Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: pmi8950: Add missing OVP interrupt Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: pm660l: Add missing short interrupt Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: pm6150l: Add missing short interrupt Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: sm8250-sony-xperia: correct GPIO keys wakeup again Jon Hunter <jonathanh(a)nvidia.com> arm64: tegra: Fix HSUART for Jetson AGX Orin Jon Hunter <jonathanh(a)nvidia.com> arm64: tegra: Add missing alias for NVIDIA IGX Orin Rafał Miłecki <rafal(a)milecki.pl> ARM: dts: BCM53573: Use updated "spi-gpio" binding properties Rafał Miłecki <rafal(a)milecki.pl> ARM: dts: BCM53573: Add cells sizes to PCIe node Rafał Miłecki <rafal(a)milecki.pl> ARM: dts: BCM53573: Drop nonexistent #usb-cells Rafał Miłecki <rafal(a)milecki.pl> ARM: dts: BCM53573: Drop nonexistent "default-off" LED trigger Arnd Bergmann <arnd(a)arndb.de> drm/amdgpu: avoid integer overflow warning in amdgpu_device_resize_fb_bar() Nishanth Menon <nm(a)ti.com> firmware: ti_sci: Use system_state to determine polling Marek Vasut <marex(a)denx.de> ARM: dts: stm32: Add missing detach mailbox for DHCOR SoM Marek Vasut <marex(a)denx.de> ARM: dts: stm32: Add missing detach mailbox for DHCOM SoM Marek Vasut <marex(a)denx.de> ARM: dts: stm32: Add missing detach mailbox for Odyssey SoM Marek Vasut <marex(a)denx.de> ARM: dts: stm32: Add missing detach mailbox for emtrion emSBC-Argon Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sm8250: Mark SMMUs as DMA coherent Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: minor whitespace cleanup around '=' Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sm8250: Mark PCIe hosts as DMA coherent Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> arm64: dts: qcom: sm8450-hdk: remove pmr735b PMIC inclusion Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> arm64: dts: qcom: pmk8350: fix ADC-TM compatible string Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> arm64: dts: qcom: pmr735b: fix thermal zone name Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> arm64: dts: qcom: pm8350b: fix thermal zone name Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> arm64: dts: qcom: pm8350: fix thermal zone name Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sm8350: Use proper CPU compatibles Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sc8180x: Fix cluster PSCI suspend param Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sm8350: Add missing LMH interrupts to cpufreq Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sm8350: Fix CPU idle state residency times Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sdm845-tama: Set serial indices and stdout-path Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: msm8996: Add missing interrupt to the USB2 controller Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: msm8939: Add missing 'cache-unified' to L2 Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: msm8939: Drop "qcom,idle-state-spc" compatible Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sc8280xp: Add missing SCM interconnect Bjorn Andersson <quic_bjorande(a)quicinc.com> arm64: dts: qcom: sc8280xp-crd: Correct vreg_misc_3p3 GPIO Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sm8250-edo: Rectify gpio-keys Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sm8250-edo: Add GPIO line names for PMIC GPIOs Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sm8250-edo: Add gpio line names for TLMM Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: msm8916-l8150: correct light sensor VDDIO supply Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: sm8450: correct crypto unit address Vincent Guittot <vincent.guittot(a)linaro.org> arm64: dts: qcom: sm8250: correct dynamic power coefficients Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> Revert "arm64: dts: qcom: msm8996: rename labels for HDMI nodes" Konrad Dybcio <konrad.dybcio(a)somainline.org> arm64: dts: qcom: sm6350: Fix ZAP region Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> arm64: dts: qcom: sm8150: use proper DSI PHY compatible Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> arm64: defconfig: enable Qualcomm MSM8996 Global Clock Controller as built-in Luca Weiss <luca(a)z3ntu.xyz> soc: qcom: ocmem: Fix NUM_PORTS & NUM_MACROS macros Randy Dunlap <rdunlap(a)infradead.org> ASoC: stac9766: fix build errors with REGMAP_AC97 Sui Jingfeng <suijingfeng(a)loongson.cn> drm/hyperv: Fix a compilation issue because of not including screen_info.h Wesley Chalmers <Wesley.Chalmers(a)amd.com> drm/amd/display: Do not set drr on pipe commit Baokun Li <libaokun1(a)huawei.com> quota: fix dqput() to follow the guarantees dquot_srcu should provide Baokun Li <libaokun1(a)huawei.com> quota: add new helper dquot_active() Baokun Li <libaokun1(a)huawei.com> quota: rename dquot_active() to inode_quota_active() Baokun Li <libaokun1(a)huawei.com> quota: factor out dquot_write_dquot() Ondrej Jirman <megi(a)xff.cz> drm: bridge: dw-mipi-dsi: Fix enable/disable of DSI controller Phil Elwell <phil(a)raspberrypi.com> ASoC: cs43130: Fix numerator/denominator mixup yixuanjiang <yixuanjiang(a)google.com> ASoC: soc-compress: Fix deadlock in soc_compr_open_fe Marek Vasut <marex(a)denx.de> drm/bridge: tc358764: Fix debug print parameter order Kuniyuki Iwashima <kuniyu(a)amazon.com> netrom: Deny concurrent connect(). Shannon Nelson <shannon.nelson(a)amd.com> pds_core: pass opcode to devcmd_wait Shannon Nelson <shannon.nelson(a)amd.com> pds_core: check for work queue before use Shannon Nelson <shannon.nelson(a)amd.com> pds_core: no reset command for VF Shannon Nelson <shannon.nelson(a)amd.com> pds_core: no health reporter in VF Shannon Nelson <shannon.nelson(a)amd.com> pds_core: protect devlink callbacks from fw_down state Budimir Markovic <markovicbudimir(a)gmail.com> net/sched: sch_hfsc: Ensure inner classes have fsc curve Alex Austin <alex.austin(a)amd.com> sfc: Check firmware supports Ethernet PTP filter Suman Ghosh <sumang(a)marvell.com> cteonxt2-pf: Fix backpressure config for multiple PFC priorities to work simultaneously Hariprasad Kelam <hkelam(a)marvell.com> octeontx2-af: CN10KB: fix PFC configuration Suman Ghosh <sumang(a)marvell.com> octeontx2-pf: Fix PFC TX scheduler free Biju Das <biju.das.jz(a)bp.renesas.com> hwmon: (tmp513) Fix the channel number in tmp51x_is_visible() Adam Guerin <adam.guerin(a)intel.com> crypto: qat - fix crypto capability detection for 4xxx Vadim Pasternak <vadimp(a)nvidia.com> mlxsw: core_hwmon: Adjust module label names based on MTCAP sensor counter Vadim Pasternak <vadimp(a)nvidia.com> mlxsw: i2c: Limit single transaction buffer size Vadim Pasternak <vadimp(a)nvidia.com> mlxsw: i2c: Fix chunk size setting in output mailbox buffer Christophe Leroy <christophe.leroy(a)csgroup.eu> kunit: Fix checksum tests on big endian CPUs Jinjie Ruan <ruanjinjie(a)huawei.com> net: arcnet: Do not call kfree_skb() under local_irq_disable() Ratheesh Kannoth <rkannoth(a)marvell.com> octeontx2-pf: fix page_pool creation fail for rings > 32k Jacob Keller <jacob.e.keller(a)intel.com> ice: avoid executing commands on other ports when driving sync Wang Ming <machel(a)vivo.com> wifi: ath9k: use IS_ERR() with debugfs_create_dir() Rahul Rameshbabu <rrameshbabu(a)nvidia.com> net/mlx5: Dynamic cyclecounter shift calculation for PTP free running clock Qi Zheng <zhengqi.arch(a)bytedance.com> arm64: mm: use ptep_clear() instead of pte_clear() in clear_flush() Jinjie Ruan <ruanjinjie(a)huawei.com> Bluetooth: btusb: Do not call kfree_skb() under spin_lock_irqsave() Pauli Virtanen <pav(a)iki.fi> Bluetooth: hci_conn: fail SCO/ISO via hci_conn_failed if ACL gone early Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_sync: Fix UAF in hci_disconnect_all_sync Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_sync: Fix UAF on hci_abort_conn_sync Iulia Tanasescu <iulia.tanasescu(a)nxp.com> Bluetooth: ISO: Notify user space about failed bis connections Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_conn: Consolidate code for aborting connections Dmitry Antipov <dmantipov(a)yandex.ru> wifi: mwifiex: avoid possible NULL skb pointer dereference Kumar Kartikeya Dwivedi <memxor(a)gmail.com> bpf: Fix check_func_arg_reg_off bug for graph root/node Arnd Bergmann <arnd(a)arndb.de> mac80211: make ieee80211_tx_info padding explicit Lin Ma <linma(a)zju.edu.cn> wifi: nl80211/cfg80211: add forgotten nla_policy for BSS color attribute Johannes Berg <johannes.berg(a)intel.com> wifi: mac80211: fix puncturing bitmap handling in CSA Yonghong Song <yonghong.song(a)linux.dev> bpf: Fix a bpf_kptr_xchg() issue with local kptr Fedor Pchelkin <pchelkin(a)ispras.ru> wifi: ath9k: protect WMI command response buffer replacement with a lock Fedor Pchelkin <pchelkin(a)ispras.ru> wifi: ath9k: fix races between ath9k_wmi_cmd and ath9k_wmi_ctrl_rx Daniel T. Lee <danieltimlee(a)gmail.com> samples/bpf: fix broken map lookup probe Daniel T. Lee <danieltimlee(a)gmail.com> samples/bpf: fix bio latency check with tracepoint Aleksa Sarai <cyphar(a)cyphar.com> selftests: memfd: error out test process when child test fails Ping-Ke Shih <pkshih(a)realtek.com> wifi: rtw89: 8852b: rfk: fine tune IQK parameters to improve performance on 2GHz band Polaris Pi <pinkperfect2021(a)gmail.com> wifi: mwifiex: Fix missed return in oob checks failed path Dmitry Antipov <dmantipov(a)yandex.ru> wifi: mwifiex: fix memory leak in mwifiex_histogram_read() Eugene Shalygin <eugene.shalygin(a)gmail.com> hwmon: (asus-ec-sensosrs) fix mutex path for X670E Hero Eric Dumazet <edumazet(a)google.com> net: annotate data-races around sk->sk_lingertime Ruan Jinjie <ruanjinjie(a)huawei.com> net: lan966x: Fix return value check for vcap_get_rule() Artem Chernyshev <artem.chernyshev(a)red-soft.ru> fs: ocfs2: namei: check return value of ocfs2_add_entry() Douglas Anderson <dianders(a)chromium.org> watchdog/hardlockup: avoid large stack frames in watchdog_hardlockup_check() Douglas Anderson <dianders(a)chromium.org> nmi_backtrace: allow excluding an arbitrary CPU Kuan-Ying Lee <Kuan-Ying.Lee(a)mediatek.com> scripts/gdb: fix 'lx-lsmod' show the wrong size Alan Stern <stern(a)rowland.harvard.edu> USB: core: Fix race by not overwriting udev->descriptor in hub_port_init() Alan Stern <stern(a)rowland.harvard.edu> USB: core: Change usb_get_device_descriptor() API Alan Stern <stern(a)rowland.harvard.edu> USB: core: Unite old scheme and new scheme descriptor reads RD Babiera <rdbabiera(a)google.com> usb: typec: bus: verify partner exists in typec_altmode_attention RD Babiera <rdbabiera(a)google.com> usb: typec: tcpm: set initial svdm version based on pd revision Yan Zhai <yan(a)cloudflare.com> lwt: Check LWTUNNEL_XMIT_CONTINUE strictly Yan Zhai <yan(a)cloudflare.com> lwt: Fix return values of BPF xmit ops Florian Fainelli <florian.fainelli(a)broadcom.com> hwrng: iproc-rng200 - Implement suspend and resume calls Gaurav Jain <gaurav.jain(a)nxp.com> crypto: caam - fix unchecked return value error Przemek Kitszel <przemyslaw.kitszel(a)intel.com> ice: ice_aq_check_events: fix off-by-one check when filling buffer Abel Wu <wuyun.abel(a)bytedance.com> net-memcg: Fix scope of sockmem pressure indicators Jijie Shao <shaojijie(a)huawei.com> net: hns3: fix wrong rpu tln reg issue Jijie Shao <shaojijie(a)huawei.com> net: hns3: Support tlv in regs data for HNS3 PF driver Jijie Shao <shaojijie(a)huawei.com> net: hns3: move dump regs function to a separate file Lorenz Bauer <lmb(a)isovalent.com> net: Fix slab-out-of-bounds in inet[6]_steal_sock Alexander Danilenko <al.b.danilenko(a)gmail.com> spi: tegra114: Remove unnecessary NULL-pointer checks Yipeng Zou <zouyipeng(a)huawei.com> selftests/bpf: Clean up fmod_ret in bench_rename test script Yipeng Zou <zouyipeng(a)huawei.com> selftests/bpf: Fix repeat option when kfunc_call verification fails Marco Vedovati <marco.vedovati(a)crowdstrike.com> libbpf: Set close-on-exec flag on gzopen Vladimir Oltean <vladimir.oltean(a)nxp.com> net: pcs: lynx: fix lynx_pcs_link_up_sgmii() not doing anything in fixed-link mode Menglong Dong <imagedong(a)tencent.com> net: tcp: fix unexcepted socket die when snd_wnd is 0 Pauli Virtanen <pav(a)iki.fi> Bluetooth: hci_event: drop only unbound CIS if Set CIG Parameters fails Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_conn: Always allocate unique handles Manish Mandlik <mmandlik(a)google.com> Bluetooth: hci_sync: Avoid use-after-free in dbg for hci_add_adv_monitor() Douglas Anderson <dianders(a)chromium.org> Bluetooth: hci_sync: Don't double print name in add/remove adv_monitor Min Li <lm0963hack(a)gmail.com> Bluetooth: Fix potential use-after-free when clear keys Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_conn: Fix hci_le_set_cig_params Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_conn: Fix not allowing valid CIS ID Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: ISO: Fix not checking for valid CIG/CIS IDs Yuanjun Gong <ruc_gongyuanjun(a)163.com> Bluetooth: nokia: fix value check in nokia_bluetooth_serdev_probe() Pauli Virtanen <pav(a)iki.fi> Bluetooth: ISO: do not emit new LE Create CIS if previous is pending Iulia Tanasescu <iulia.tanasescu(a)nxp.com> Bluetooth: ISO: Add support for connecting multiple BISes Herbert Xu <herbert(a)gondor.apana.org.au> crypto: api - Use work queue in crypto_destroy_instance Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> crypto: stm32 - Properly handle pm_runtime_get failing Miguel Ojeda <ojeda(a)kernel.org> kbuild: rust_is_available: fix confusion when a version appears in the path Miguel Ojeda <ojeda(a)kernel.org> kbuild: rust_is_available: add check for `bindgen` invocation Russell Currey <ruscur(a)russell.cc> kbuild: rust_is_available: fix version check when CC has multiple arguments Masahiro Yamada <masahiroy(a)kernel.org> kbuild: rust_is_available: remove -v option Kui-Feng Lee <thinker.li(a)gmail.com> bpf: fix bpf_dynptr_slice() to stop return an ERR_PTR. David Howells <dhowells(a)redhat.com> crypto: af_alg - Fix missing initialisation affecting gcm-aes-s390 Li Zetao <lizetao1(a)huawei.com> spi: mpc5xxx-psc: Fix unsigned expression compared with zero Yu Liao <liaoyu15(a)huawei.com> power: supply: qcom_pmi8998_charger: fix uninitialized variable Alan Maguire <alan.maguire(a)oracle.com> selftests/bpf: fix static assert compilation issue for test_cls_*.c Arnd Bergmann <arnd(a)arndb.de> wifi: ath12k: fix memcpy array overflow in ath12k_peer_assoc_h_he() Aditya Kumar Singh <quic_adisi(a)quicinc.com> wifi: ath11k: fix band selection for ppdu received in channel 177 of 5 GHz Dmitry Antipov <dmantipov(a)yandex.ru> wifi: mwifiex: fix error recovery in PCIE buffer descriptor management Polaris Pi <pinkperfect2021(a)gmail.com> wifi: mwifiex: Fix OOB and integer underflow when rx packets Larry Finger <Larry.Finger(a)lwfinger.net> wifi: rtw89: Fix loading of compressed firmware Ryder Lee <ryder.lee(a)mediatek.com> wifi: mt76: mt7915: fix power-limits while chan_switch Ryder Lee <ryder.lee(a)mediatek.com> wifi: mt76: mt7915: fix tlv length of mt7915_mcu_get_chan_mib_info Markus Schneider-Pargmann <msp(a)baylibre.com> can: tcan4x5x: Remove reserved register 0x814 from writable table Marc Kleine-Budde <mkl(a)pengutronix.de> can: gs_usb: gs_usb_receive_bulk_callback(): count RX overflow errors also in case of OOM Zhang Shurong <zhang_shurong(a)foxmail.com> spi: tegra20-sflash: fix to check return value of platform_get_irq() in tegra_sflash_probe() Lin Ma <linma(a)zju.edu.cn> wifi: mt76: testmode: add nla_policy for MT76_TM_ATTR_TX_LENGTH Felix Fietkau <nbd(a)nbd.name> wifi: mt76: mt7915: remove VHT160 capability on MT7915 Felix Fietkau <nbd(a)nbd.name> wifi: mt76: mt7915: fix capabilities in non-AP mode Rany Hany <rany_hany(a)riseup.net> wifi: mt76: mt7915: fix command timeout in AP stop period Lorenz Bauer <lmb(a)isovalent.com> bpf, net: Support SO_REUSEPORT sockets with bpf_sk_assign Lorenz Bauer <lmb(a)isovalent.com> net: remove duplicate reuseport_lookup functions Lorenz Bauer <lmb(a)isovalent.com> net: export inet_lookup_reuseport and inet6_lookup_reuseport Lorenz Bauer <lmb(a)isovalent.com> bpf: reject unhashed sockets in bpf_sk_assign Lorenz Bauer <lmb(a)isovalent.com> udp: re-score reuseport groups when connected sockets are present StanleyYP Wang <StanleyYP.Wang(a)mediatek.com> wifi: mt76: mt7996: fix WA event ring size StanleyYP Wang <StanleyYP.Wang(a)mediatek.com> wifi: mt76: mt7996: use correct phy for background radar event Peter Chiu <chui-hao.chiu(a)mediatek.com> wifi: mt76: mt7996: fix bss wlan_idx when sending bss_info command Ming Yen Hsieh <mingyen.hsieh(a)mediatek.com> wifi: mt76: mt7921: fix non-PSC channel scan fail Peter Chiu <chui-hao.chiu(a)mediatek.com> wifi: mt76: mt7915: rework tx bytes counting when WED is active Peter Chiu <chui-hao.chiu(a)mediatek.com> wifi: mt76: mt7915: rework tx packets counting when WED is active StanleyYP Wang <StanleyYP.Wang(a)mediatek.com> wifi: mt76: mt7915: fix background radar event being blocked Ryder Lee <ryder.lee(a)mediatek.com> wifi: mt76: mt7996: fix header translation logic Zhang Shurong <zhang_shurong(a)foxmail.com> wifi: rtw89: debug: Fix error handling in rtw89_debug_priv_btc_manual_set() Dan Carpenter <dan.carpenter(a)linaro.org> regmap: rbtree: Use alloc_flags for memory allocations Guenter Roeck <linux(a)roeck-us.net> regmap: maple: Use alloc_flags for memory allocations Martin Kaiser <martin(a)kaiser.cx> hwrng: pic32 - use devm_clk_get_enabled Martin Kaiser <martin(a)kaiser.cx> hwrng: nomadik - keep clock enabled while hwrng is registered Eric Dumazet <edumazet(a)google.com> tcp: tcp_enter_quickack_mode() should be static Giovanni Cabiddu <giovanni.cabiddu(a)intel.com> crypto: qat - change value of default idle filter Yafang Shao <laoar.shao(a)gmail.com> bpf: Fix an error in verifying a field in a union Yafang Shao <laoar.shao(a)gmail.com> bpf: Fix an error around PTR_UNTRUSTED Yafang Shao <laoar.shao(a)gmail.com> bpf: Clear the probe_addr for uprobe Andrii Nakryiko <andrii(a)kernel.org> libbpf: Fix realloc API handling in zero-sized edge cases Alexander Lobakin <alobakin(a)pm.me> bpftool: Use a local bpf_perf_event_value to fix accessing its fields Quentin Monnet <quentin(a)isovalent.com> bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in pid_iter.bpf.c Alexander Lobakin <alobakin(a)pm.me> bpftool: Define a local bpf_perf_link to fix accessing its fields Alexander Lobakin <alobakin(a)pm.me> bpftool: use a local copy of perf_event to fix accessing :: Bpf_cookie Andrii Nakryiko <andrii(a)kernel.org> libbpf: only reset sec_def handler when necessary Daniel Borkmann <daniel(a)iogearbox.net> selftests/bpf: Fix bpf_nf failure upon test rerun Sumit Gupta <sumitg(a)nvidia.com> cpufreq: tegra194: remove opp table in exit hook Sumit Gupta <sumitg(a)nvidia.com> cpufreq: tegra194: add online/offline hooks Liao Chang <liaochang1(a)huawei.com> cpufreq: powernow-k8: Use related_cpus instead of cpus in driver.exit() Mikel Rychliski <mikel(a)mikelr.com> x86/efistub: Fix PCI ROM preservation in mixed mode Zhangjin Wu <falcon(a)tinylab.org> tools/nolibc: fix up startup failures for -O0 under gcc < 11.1.0 Zhangjin Wu <falcon(a)tinylab.org> tools/nolibc: arch-*.h: add missing space after ',' Swapnil Sapkal <swapnil.sapkal(a)amd.com> cpufreq: amd-pstate-ut: Fix kernel panic when loading the driver Swapnil Sapkal <swapnil.sapkal(a)amd.com> cpufreq: amd-pstate-ut: Remove module parameter access Peng Fan <peng.fan(a)nxp.com> thermal/of: Fix potential uninitialized value access Mario Limonciello <mario.limonciello(a)amd.com> ACPI: x86: s2idle: Fix a logic error parsing AMD constraints table Mario Limonciello <mario.limonciello(a)amd.com> ACPI: x86: s2idle: Post-increment variables when getting constraints Bibo Mao <maobibo(a)loongson.cn> irqchip/loongson-eiointc: Fix return value checking of eiointc_index Holger Dengler <dengler(a)linux.ibm.com> s390/paes: fix PKEY_TYPE_EP11_AES handling for secure keyblobs Holger Dengler <dengler(a)linux.ibm.com> s390/pkey: fix PKEY_TYPE_EP11_AES handling for sysfs attributes Holger Dengler <dengler(a)linux.ibm.com> s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_VERIFYKEY2 IOCTL Holger Dengler <dengler(a)linux.ibm.com> s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_KBLOB2PROTK[23] Holger Dengler <dengler(a)linux.ibm.com> s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_CLR2SECK2 IOCTL Holger Dengler <dengler(a)linux.ibm.com> s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_GENSECK2 IOCTL Holger Dengler <dengler(a)linux.ibm.com> s390/pkey: fix/harmonize internal keyblob headers Nysal Jan K.A <nysal(a)linux.ibm.com> selftests/futex: Order calls to futex_lock_pi Xu Yang <xu.yang_2(a)nxp.com> perf/imx_ddr: don't enable counter0 if none of 4 counters are used Cyril Hrubis <chrubis(a)suse.cz> sched/rt: Fix sysctl_sched_rr_timeslice intial value Mark Brown <broonie(a)kernel.org> arm64/fpsimd: Only provide the length to cpufeature for xCR registers Ard Biesheuvel <ardb(a)kernel.org> x86/decompressor: Don't rely on upper 32 bits of GPRs being preserved Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> cpuidle: teo: Update idle duration estimate when choosing shallower state Randy Dunlap <rdunlap(a)infradead.org> sched/psi: Select KERNFS as needed Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> arm64/ptrace: Clean up error handling path in sve_set_common() Vincent Guittot <vincent.guittot(a)linaro.org> sched/fair: remove util_est boosting Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> selftests/resctrl: Close perf value read fd on errors Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> selftests/resctrl: Unmount resctrl FS if child fails to run benchmark Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> selftests/resctrl: Don't leak buffer in fill_cache() Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> selftests/resctrl: Add resctrl.h into build deps Manivannan Sadhasivam <mani(a)kernel.org> OPP: Fix passing 0 to PTR_ERR in _opp_attach_genpd() Manivannan Sadhasivam <mani(a)kernel.org> OPP: Fix potential null ptr dereference in dev_pm_opp_get_required_pstate() Cristian Marussi <cristian.marussi(a)arm.com> powercap: arm_scmi: Remove recursion while parsing zones Paul E. McKenney <paulmck(a)kernel.org> clocksource: Handle negative skews in "skew is too large" messages Waiman Long <longman(a)redhat.com> refscale: Fix uninitalized use of wait_queue_head_t Uros Bizjak <ubizjak(a)gmail.com> locking/arch: Avoid variable shadowing in local_try_cmpxchg() Jingbo Xu <jefflexu(a)linux.alibaba.com> erofs: release ztailpacking pclusters properly Naohiro Aota <naohiro.aota(a)wdc.com> btrfs: zoned: skip splitting and logical rewriting on pre-alloc write Kees Cook <keescook(a)chromium.org> ARM: ptrace: Restore syscall skipping for tracers Kees Cook <keescook(a)chromium.org> ARM: ptrace: Restore syscall restart tracing David Howells <dhowells(a)redhat.com> vfs, security: Fix automount superblock LSM init problem, preventing NFS sb sharing Kees Cook <keescook(a)chromium.org> selftests/harness: Actually report SKIP for signal tests Christian Brauner <brauner(a)kernel.org> tmpfs: verify {g,u}id mount options correctly Matthew Wilcox (Oracle) <willy(a)infradead.org> iomap: Remove large folio handling in iomap_invalidate_folio() Wang Ming <machel(a)vivo.com> fs: Fix error checking for d_hash_and_lookup() Wen Yang <wenyang.linux(a)foxmail.com> eventfd: prevent underflow for eventfd semaphores Ahelenia Ziemiańska <nabijaczleweli(a)nabijaczleweli.xyz> splice: fsnotify_access(in), fsnotify_modify(out) on success in tee Ahelenia Ziemiańska <nabijaczleweli(a)nabijaczleweli.xyz> splice: fsnotify_access(fd)/fsnotify_modify(fd) in vmsplice Ahelenia Ziemiańska <nabijaczleweli(a)nabijaczleweli.xyz> splice: always fsnotify_access(in), fsnotify_modify(out) on success Matthew Wilcox <willy(a)infradead.org> reiserfs: Check the return value from __getblk() Sabrina Dubroca <sd(a)queasysnail.net> Revert "net: macsec: preserve ingress frame ordering" Vidya Sagar <vidyas(a)nvidia.com> Revert "PCI: tegra194: Enable support for 256 Byte payload" Jaegeuk Kim <jaegeuk(a)kernel.org> Revert "f2fs: clean up w/ sbi->log_sectors_per_block" Miklos Szeredi <mszeredi(a)redhat.com> Revert "fuse: in fuse_flush only wait if someone wants the return code" Werner Sembach <wse(a)tuxedocomputers.com> Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN Max Chou <max.chou(a)realtek.com> Bluetooth: btrtl: Load FW v2 otherwise FW v1 for RTL8852C Jordan Rife <jrife(a)google.com> net: Avoid address overwrite in kernel_connect Jarkko Sakkinen <jarkko(a)kernel.org> tpm: Enable hwrng only for Pluton on AMD CPUs Doug Smythies <dsmythies(a)telus.net> cpufreq: intel_pstate: set stale CPU frequency to minimum Hamza Mahfooz <hamza.mahfooz(a)amd.com> drm/amd/display: ensure async flips are only accepted for fast updates ------------- Diffstat: .../ABI/testing/sysfs-bus-fsi-devices-sbefifo | 6 +- .../ABI/testing/sysfs-driver-chromeos-acpi | 2 +- Documentation/ABI/testing/sysfs-fs-f2fs | 8 +- Documentation/admin-guide/devices.txt | 16 +- .../devicetree/bindings/extcon/maxim,max77843.yaml | 1 + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 12 +- .../bindings/power/qcom,kpss-acc-v2.yaml | 1 + .../bindings/regulator/qcom,rpm-regulator.yaml | 2 +- .../bindings/usb/samsung,exynos-dwc3.yaml | 4 +- Documentation/scsi/scsi_mid_low_api.rst | 4 +- .../media/v4l/vidioc-subdev-g-routing.rst | 7 +- Makefile | 8 +- .../boot/dts/broadcom/bcm47189-luxul-xap-1440.dts | 14 +- .../boot/dts/broadcom/bcm47189-luxul-xap-810.dts | 15 +- arch/arm/boot/dts/broadcom/bcm47189-tenda-ac9.dts | 4 +- arch/arm/boot/dts/broadcom/bcm53573.dtsi | 5 +- arch/arm/boot/dts/broadcom/bcm947189acdbmr.dts | 6 +- arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 9 +- arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts | 2 +- arch/arm/boot/dts/samsung/s3c6410-mini6410.dts | 2 +- arch/arm/boot/dts/samsung/s5pv210-smdkv210.dts | 2 +- .../arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi | 4 +- arch/arm/boot/dts/st/stm32mp157c-odyssey-som.dtsi | 4 +- arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi | 4 +- arch/arm/boot/dts/st/stm32mp15xx-dhcor-som.dtsi | 4 +- arch/arm/include/asm/irq.h | 2 +- arch/arm/include/asm/syscall.h | 3 + arch/arm/kernel/entry-common.S | 1 + arch/arm/kernel/ptrace.c | 5 +- arch/arm/kernel/smp.c | 4 +- arch/arm/mach-omap2/powerdomain.c | 2 +- .../boot/dts/freescale/imx8mp-debix-model-a.dts | 22 - arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 1 + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 1 + .../dts/nvidia/tegra234-p3740-0002+p3701-0008.dts | 1 + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 8 +- arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 50 +- arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 6 +- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 +- .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 2 +- .../boot/dts/qcom/msm8916-samsung-serranove.dts | 6 +- arch/arm64/boot/dts/qcom/msm8939.dtsi | 16 +- arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts | 2 +- arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts | 2 +- arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 4 +- arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 2 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 27 +- .../boot/dts/qcom/msm8996pro-xiaomi-natrium.dts | 2 +- arch/arm64/boot/dts/qcom/msm8998.dtsi | 26 +- arch/arm64/boot/dts/qcom/pm6150l.dtsi | 5 +- arch/arm64/boot/dts/qcom/pm660l.dtsi | 5 +- arch/arm64/boot/dts/qcom/pm8350.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm8350b.dtsi | 2 +- arch/arm64/boot/dts/qcom/pmi8950.dtsi | 5 +- arch/arm64/boot/dts/qcom/pmi8994.dtsi | 5 +- arch/arm64/boot/dts/qcom/pmk8350.dtsi | 2 +- arch/arm64/boot/dts/qcom/pmr735b.dtsi | 2 +- arch/arm64/boot/dts/qcom/qcm2290.dtsi | 2 +- arch/arm64/boot/dts/qcom/qcs404.dtsi | 8 +- arch/arm64/boot/dts/qcom/sa8540p.dtsi | 2 +- .../qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi | 12 +- arch/arm64/boot/dts/qcom/sc8180x.dtsi | 12 +- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 4 +- .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 2 +- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 1 + arch/arm64/boot/dts/qcom/sdm630.dtsi | 10 +- .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 2 +- .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 9 + arch/arm64/boot/dts/qcom/sdm845.dtsi | 3 +- arch/arm64/boot/dts/qcom/sdx75.dtsi | 4 +- arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm6350.dtsi | 10 +- arch/arm64/boot/dts/qcom/sm8150.dtsi | 6 +- .../dts/qcom/sm8250-sony-xperia-edo-pdx203.dts | 233 +++++++ .../dts/qcom/sm8250-sony-xperia-edo-pdx206.dts | 243 ++++++++ .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 54 +- arch/arm64/boot/dts/qcom/sm8250.dtsi | 211 +++---- arch/arm64/boot/dts/qcom/sm8350.dtsi | 227 +++---- arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 1 - arch/arm64/boot/dts/qcom/sm8450.dtsi | 196 +++--- arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 1 + arch/arm64/boot/dts/qcom/sm8550.dtsi | 196 +++--- arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 24 +- arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 2 +- .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 19 +- arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 3 - arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 61 +- arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 2 +- arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 2 +- arch/arm64/configs/defconfig | 2 +- arch/arm64/include/asm/sdei.h | 6 + arch/arm64/kernel/entry.S | 27 +- arch/arm64/kernel/fpsimd.c | 22 +- arch/arm64/kernel/ptrace.c | 3 +- arch/arm64/kernel/sdei.c | 3 + arch/arm64/kernel/smp.c | 8 +- arch/arm64/lib/csum.c | 2 +- arch/arm64/mm/hugetlbpage.c | 2 +- arch/loongarch/include/asm/irq.h | 2 +- arch/loongarch/include/asm/local.h | 4 +- arch/loongarch/include/asm/pgtable.h | 3 + arch/loongarch/kernel/process.c | 4 +- arch/mips/include/asm/irq.h | 2 +- arch/mips/include/asm/local.h | 4 +- arch/mips/kernel/process.c | 4 +- arch/parisc/include/asm/runway.h | 3 - arch/parisc/kernel/processor.c | 13 +- arch/powerpc/include/asm/ftrace.h | 2 +- arch/powerpc/include/asm/irq.h | 2 +- arch/powerpc/include/asm/lppaca.h | 13 +- arch/powerpc/include/asm/paca.h | 6 +- arch/powerpc/include/asm/paravirt.h | 1 + arch/powerpc/include/asm/plpar_wrappers.h | 1 + arch/powerpc/kernel/fadump.c | 1 + arch/powerpc/kernel/iommu.c | 17 +- arch/powerpc/kernel/stacktrace.c | 4 +- arch/powerpc/kernel/watchdog.c | 4 +- arch/powerpc/kvm/book3s_hv_ras.c | 1 + arch/powerpc/mm/book3s64/radix_tlb.c | 240 ++++---- arch/powerpc/mm/book3s64/slb.c | 1 + arch/powerpc/perf/core-fsl-emb.c | 8 +- arch/powerpc/platforms/pseries/hvCall.S | 1 + arch/powerpc/platforms/pseries/lpar.c | 10 +- arch/powerpc/platforms/pseries/lparcfg.c | 4 +- arch/powerpc/platforms/pseries/setup.c | 2 +- arch/powerpc/sysdev/mpc5xxx_clocks.c | 4 +- arch/powerpc/xmon/xmon.c | 1 + arch/riscv/Kconfig | 1 + arch/riscv/Makefile | 3 - arch/riscv/include/uapi/asm/ptrace.h | 13 +- arch/riscv/kernel/ptrace.c | 79 +++ arch/riscv/mm/kasan_init.c | 8 +- arch/s390/crypto/paes_s390.c | 2 +- arch/s390/include/uapi/asm/pkey.h | 2 +- arch/s390/kernel/ipl.c | 2 + arch/sparc/include/asm/irq_64.h | 2 +- arch/sparc/kernel/process_64.c | 6 +- arch/um/configs/i386_defconfig | 1 + arch/um/configs/x86_64_defconfig | 1 + arch/um/drivers/Kconfig | 16 +- arch/um/drivers/Makefile | 2 +- arch/um/drivers/virt-pci.c | 2 + arch/x86/boot/compressed/head_64.S | 30 +- arch/x86/events/intel/uncore_snbep.c | 12 +- arch/x86/include/asm/irq.h | 2 +- arch/x86/include/asm/local.h | 4 +- arch/x86/include/asm/mem_encrypt.h | 6 +- arch/x86/include/asm/pgtable_types.h | 11 +- arch/x86/kernel/apic/hw_nmi.c | 4 +- arch/x86/kernel/apm_32.c | 6 - arch/x86/kernel/cpu/common.c | 8 +- arch/x86/kernel/cpu/mce/core.c | 26 + arch/x86/kernel/cpu/mce/internal.h | 5 +- arch/x86/kernel/cpu/sgx/virt.c | 3 + arch/x86/kernel/kvm.c | 4 +- arch/x86/kernel/smpboot.c | 2 +- arch/x86/kernel/vmlinux.lds.S | 2 +- arch/x86/mm/mem_encrypt_amd.c | 13 +- arch/xtensa/include/asm/core.h | 9 + arch/xtensa/kernel/perf_event.c | 17 +- block/bio-integrity.c | 31 +- block/bio.c | 112 ++-- block/blk-cgroup.c | 32 +- block/blk-flush.c | 2 +- block/blk-map.c | 7 +- block/blk-settings.c | 7 +- block/blk-sysfs.c | 21 +- block/blk.h | 4 + block/ioctl.c | 2 + block/mq-deadline.c | 3 +- crypto/af_alg.c | 4 + crypto/algapi.c | 16 +- crypto/asymmetric_keys/x509_public_key.c | 5 + drivers/acpi/x86/s2idle.c | 39 +- drivers/amba/bus.c | 1 + drivers/base/core.c | 11 + drivers/base/dd.c | 2 + drivers/base/regmap/regcache-maple.c | 16 +- drivers/base/regmap/regcache-rbtree.c | 10 +- drivers/base/test/test_async_driver_probe.c | 2 +- drivers/block/drbd/drbd_main.c | 2 +- drivers/bluetooth/btintel.c | 6 + drivers/bluetooth/btrtl.c | 74 ++- drivers/bluetooth/btusb.c | 2 +- drivers/bluetooth/hci_nokia.c | 6 +- drivers/bus/ti-sysc.c | 2 +- drivers/char/hw_random/iproc-rng200.c | 25 + drivers/char/hw_random/nomadik-rng.c | 12 +- drivers/char/hw_random/pic32-rng.c | 19 +- drivers/char/ipmi/ipmi_si_intf.c | 5 + drivers/char/ipmi/ipmi_ssif.c | 7 +- drivers/char/tpm/tpm_crb.c | 33 +- drivers/clk/imx/clk-composite-8m.c | 12 +- drivers/clk/imx/clk-imx8mp.c | 5 - drivers/clk/imx/clk-imx8ulp.c | 2 +- drivers/clk/imx/clk-pllv4.c | 46 +- drivers/clk/imx/clk.h | 1 + drivers/clk/keystone/pll.c | 2 +- drivers/clk/qcom/Kconfig | 5 + drivers/clk/qcom/dispcc-sc8280xp.c | 8 +- drivers/clk/qcom/gcc-qdu1000.c | 33 +- drivers/clk/qcom/gcc-sc7180.c | 1 + drivers/clk/qcom/gcc-sc8280xp.c | 135 ++++- drivers/clk/qcom/gcc-sm6350.c | 1 + drivers/clk/qcom/gcc-sm7150.c | 1 + drivers/clk/qcom/gcc-sm8250.c | 1 + drivers/clk/qcom/gcc-sm8450.c | 4 +- drivers/clk/qcom/gpucc-sm6350.c | 18 +- drivers/clk/qcom/reset.c | 3 +- drivers/clk/rockchip/clk-rk3568.c | 2 +- drivers/clk/sunxi-ng/ccu_mmc_timing.c | 2 +- drivers/counter/Kconfig | 2 +- drivers/cpufreq/amd-pstate-ut.c | 46 +- drivers/cpufreq/brcmstb-avs-cpufreq.c | 6 +- drivers/cpufreq/cpufreq.c | 2 + drivers/cpufreq/intel_pstate.c | 5 + drivers/cpufreq/powernow-k8.c | 3 +- drivers/cpufreq/tegra194-cpufreq.c | 29 + drivers/cpuidle/cpuidle-pseries.c | 8 +- drivers/cpuidle/governors/teo.c | 40 +- drivers/crypto/caam/caampkc.c | 4 +- .../crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c | 9 + drivers/crypto/intel/qat/qat_common/adf_gen4_pm.h | 2 +- drivers/crypto/intel/qat/qat_common/icp_qat_hw.h | 5 +- drivers/crypto/stm32/stm32-hash.c | 11 +- drivers/devfreq/devfreq.c | 1 + drivers/dma/idxd/sysfs.c | 33 +- drivers/dma/ste_dma40.c | 4 + drivers/edac/i10nm_base.c | 54 +- drivers/edac/igen6_edac.c | 8 +- drivers/extcon/Kconfig | 1 + drivers/firmware/arm_sdei.c | 19 + drivers/firmware/cirrus/cs_dsp.c | 3 +- drivers/firmware/efi/libstub/x86-stub.c | 2 +- drivers/firmware/meson/meson_sm.c | 2 + drivers/firmware/ti_sci.c | 36 +- drivers/fsi/fsi-master-aspeed.c | 2 + drivers/gpio/gpio-zynq.c | 26 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 26 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 3 + drivers/gpu/drm/amd/amdgpu/cik.c | 36 +- drivers/gpu/drm/amd/amdgpu/si.c | 36 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 24 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 12 - .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 20 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 6 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 7 + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 10 +- drivers/gpu/drm/armada/armada_overlay.c | 6 +- drivers/gpu/drm/ast/ast_dp.c | 11 + drivers/gpu/drm/ast/ast_dp501.c | 37 +- drivers/gpu/drm/ast/ast_drv.h | 2 + drivers/gpu/drm/ast/ast_mode.c | 30 +- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 9 +- drivers/gpu/drm/bridge/analogix/anx7625.c | 12 +- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 28 +- drivers/gpu/drm/bridge/tc358764.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_dump.c | 14 +- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 1 + drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 2 +- drivers/gpu/drm/mediatek/mtk_dp.c | 15 +- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 7 +- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 16 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 7 +- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 +- drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 8 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 11 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 - drivers/gpu/drm/msm/adreno/adreno_device.c | 2 +- .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 9 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 25 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 29 +- .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 39 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 29 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 2 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 2 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 8 +- .../drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 2 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 8 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 33 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 9 +- .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 45 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 33 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 37 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 57 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 +- drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 2 +- drivers/gpu/drm/panel/panel-simple.c | 4 +- drivers/gpu/drm/radeon/cik.c | 36 +- drivers/gpu/drm/radeon/si.c | 37 +- drivers/gpu/drm/tegra/dpaux.c | 2 +- drivers/gpu/drm/tiny/repaper.c | 2 +- drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 4 +- drivers/hid/hid-input.c | 18 +- drivers/hid/hid-logitech-dj.c | 5 +- drivers/hid/hid-logitech-hidpp.c | 115 ++-- drivers/hid/hid-multitouch.c | 13 +- drivers/hid/hid-nvidia-shield.c | 15 +- drivers/hid/hid-uclogic-core.c | 13 +- drivers/hv/vmbus_drv.c | 3 +- drivers/hwmon/asus-ec-sensors.c | 2 +- drivers/hwmon/tmp513.c | 2 +- drivers/hwtracing/coresight/coresight-platform.c | 44 +- drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- drivers/hwtracing/coresight/coresight-tmc-etr.c | 5 +- drivers/hwtracing/coresight/coresight-tmc.h | 2 +- drivers/hwtracing/coresight/coresight-trbe.c | 43 +- drivers/i3c/master/svc-i3c-master.c | 14 +- drivers/iio/accel/adxl313_i2c.c | 4 +- .../infiniband/core/uverbs_std_types_counters.c | 2 + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 23 +- drivers/infiniband/hw/bnxt_re/main.c | 107 +++- drivers/infiniband/hw/bnxt_re/qplib_res.h | 19 + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 7 +- drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 +- drivers/infiniband/hw/efa/efa_verbs.c | 6 +- drivers/infiniband/hw/hns/hns_roce_device.h | 1 + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 11 +- drivers/infiniband/hw/hns/hns_roce_main.c | 7 +- drivers/infiniband/hw/hns/hns_roce_qp.c | 28 +- drivers/infiniband/hw/irdma/ctrl.c | 6 + drivers/infiniband/hw/irdma/main.h | 2 +- drivers/infiniband/hw/irdma/type.h | 2 + drivers/infiniband/hw/irdma/verbs.c | 11 +- drivers/infiniband/sw/rxe/rxe_comp.c | 4 + drivers/infiniband/sw/rxe/rxe_loc.h | 6 - drivers/infiniband/sw/rxe/rxe_qp.c | 159 +++-- drivers/infiniband/sw/rxe/rxe_req.c | 45 +- drivers/infiniband/sw/rxe/rxe_resp.c | 4 + drivers/infiniband/sw/rxe/rxe_srq.c | 60 +- drivers/infiniband/sw/siw/siw.h | 1 + drivers/infiniband/sw/siw/siw_cm.c | 1 - drivers/infiniband/sw/siw/siw_main.c | 22 +- drivers/infiniband/sw/siw/siw_verbs.c | 6 +- drivers/infiniband/ulp/isert/ib_isert.c | 2 + drivers/infiniband/ulp/srp/ib_srp.c | 4 - drivers/input/serio/i8042-acpipnpio.h | 7 + drivers/interconnect/qcom/bcm-voter.c | 43 +- drivers/interconnect/qcom/qcm2290.c | 1 + drivers/interconnect/qcom/sm8450.c | 1 + drivers/iommu/amd/iommu_v2.c | 4 +- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 7 + drivers/iommu/intel/pasid.c | 2 +- drivers/iommu/iommu.c | 4 +- drivers/iommu/iommufd/device.c | 2 +- drivers/iommu/mtk_iommu.c | 22 +- drivers/iommu/rockchip-iommu.c | 43 +- drivers/iommu/sprd-iommu.c | 1 + drivers/irqchip/irq-loongson-eiointc.c | 2 +- drivers/leds/led-class-multicolor.c | 8 +- drivers/leds/led-core.c | 8 +- drivers/leds/leds-aw200xx.c | 2 +- drivers/leds/leds-pwm.c | 2 +- drivers/leds/simple/Kconfig | 1 + drivers/leds/trigger/ledtrig-tty.c | 12 +- drivers/md/md-bitmap.c | 9 +- drivers/md/md.c | 6 +- drivers/md/raid0.c | 82 +-- drivers/md/raid1.c | 8 +- drivers/md/raid10.c | 42 +- drivers/md/raid5-cache.c | 12 +- drivers/media/cec/core/cec-adap.c | 8 +- drivers/media/dvb-frontends/ascot2e.c | 2 +- drivers/media/dvb-frontends/atbm8830.c | 2 +- drivers/media/dvb-frontends/au8522_dig.c | 2 +- drivers/media/dvb-frontends/bcm3510.c | 2 +- drivers/media/dvb-frontends/cx22700.c | 2 +- drivers/media/dvb-frontends/cx22702.c | 2 +- drivers/media/dvb-frontends/cx24110.c | 2 +- drivers/media/dvb-frontends/cx24113.c | 2 +- drivers/media/dvb-frontends/cx24116.c | 2 +- drivers/media/dvb-frontends/cx24120.c | 6 +- drivers/media/dvb-frontends/cx24123.c | 2 +- drivers/media/dvb-frontends/cxd2820r_core.c | 2 +- drivers/media/dvb-frontends/cxd2841er.c | 4 +- drivers/media/dvb-frontends/cxd2880/cxd2880_top.c | 2 +- drivers/media/dvb-frontends/dib0070.c | 2 +- drivers/media/dvb-frontends/dib0090.c | 4 +- drivers/media/dvb-frontends/dib3000mb.c | 2 +- drivers/media/dvb-frontends/dib3000mc.c | 2 +- drivers/media/dvb-frontends/dib7000m.c | 2 +- drivers/media/dvb-frontends/dib7000p.c | 4 +- drivers/media/dvb-frontends/dib8000.c | 2 +- drivers/media/dvb-frontends/dib9000.c | 2 +- drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 +- drivers/media/dvb-frontends/drxd_hard.c | 2 +- drivers/media/dvb-frontends/drxk_hard.c | 2 +- drivers/media/dvb-frontends/ds3000.c | 2 +- drivers/media/dvb-frontends/dvb-pll.c | 2 +- drivers/media/dvb-frontends/ec100.c | 2 +- drivers/media/dvb-frontends/helene.c | 4 +- drivers/media/dvb-frontends/horus3a.c | 2 +- drivers/media/dvb-frontends/isl6405.c | 2 +- drivers/media/dvb-frontends/isl6421.c | 2 +- drivers/media/dvb-frontends/isl6423.c | 2 +- drivers/media/dvb-frontends/itd1000.c | 2 +- drivers/media/dvb-frontends/ix2505v.c | 2 +- drivers/media/dvb-frontends/l64781.c | 2 +- drivers/media/dvb-frontends/lg2160.c | 2 +- drivers/media/dvb-frontends/lgdt3305.c | 2 +- drivers/media/dvb-frontends/lgdt3306a.c | 2 +- drivers/media/dvb-frontends/lgdt330x.c | 2 +- drivers/media/dvb-frontends/lgs8gxx.c | 2 +- drivers/media/dvb-frontends/lnbh25.c | 2 +- drivers/media/dvb-frontends/lnbp21.c | 4 +- drivers/media/dvb-frontends/lnbp22.c | 2 +- drivers/media/dvb-frontends/m88ds3103.c | 2 +- drivers/media/dvb-frontends/m88rs2000.c | 2 +- drivers/media/dvb-frontends/mb86a16.c | 2 +- drivers/media/dvb-frontends/mb86a20s.c | 2 +- drivers/media/dvb-frontends/mt312.c | 2 +- drivers/media/dvb-frontends/mt352.c | 2 +- drivers/media/dvb-frontends/nxt200x.c | 2 +- drivers/media/dvb-frontends/nxt6000.c | 2 +- drivers/media/dvb-frontends/or51132.c | 2 +- drivers/media/dvb-frontends/or51211.c | 2 +- drivers/media/dvb-frontends/s5h1409.c | 2 +- drivers/media/dvb-frontends/s5h1411.c | 2 +- drivers/media/dvb-frontends/s5h1420.c | 2 +- drivers/media/dvb-frontends/s5h1432.c | 2 +- drivers/media/dvb-frontends/s921.c | 2 +- drivers/media/dvb-frontends/si21xx.c | 2 +- drivers/media/dvb-frontends/sp887x.c | 2 +- drivers/media/dvb-frontends/stb0899_drv.c | 2 +- drivers/media/dvb-frontends/stb6000.c | 2 +- drivers/media/dvb-frontends/stb6100.c | 2 +- drivers/media/dvb-frontends/stv0288.c | 2 +- drivers/media/dvb-frontends/stv0297.c | 2 +- drivers/media/dvb-frontends/stv0299.c | 2 +- drivers/media/dvb-frontends/stv0367.c | 6 +- drivers/media/dvb-frontends/stv0900_core.c | 2 +- drivers/media/dvb-frontends/stv090x.c | 2 +- drivers/media/dvb-frontends/stv6110.c | 2 +- drivers/media/dvb-frontends/stv6110x.c | 2 +- drivers/media/dvb-frontends/tda10021.c | 2 +- drivers/media/dvb-frontends/tda10023.c | 2 +- drivers/media/dvb-frontends/tda10048.c | 2 +- drivers/media/dvb-frontends/tda1004x.c | 4 +- drivers/media/dvb-frontends/tda10086.c | 2 +- drivers/media/dvb-frontends/tda665x.c | 2 +- drivers/media/dvb-frontends/tda8083.c | 2 +- drivers/media/dvb-frontends/tda8261.c | 2 +- drivers/media/dvb-frontends/tda826x.c | 2 +- drivers/media/dvb-frontends/ts2020.c | 2 +- drivers/media/dvb-frontends/tua6100.c | 2 +- drivers/media/dvb-frontends/ves1820.c | 2 +- drivers/media/dvb-frontends/ves1x93.c | 2 +- drivers/media/dvb-frontends/zl10036.c | 2 +- drivers/media/dvb-frontends/zl10039.c | 2 +- drivers/media/dvb-frontends/zl10353.c | 2 +- drivers/media/i2c/Kconfig | 13 +- drivers/media/i2c/ad5820.c | 2 - drivers/media/i2c/ccs/ccs-data.c | 101 ++-- drivers/media/i2c/imx290.c | 7 +- drivers/media/i2c/ov2680.c | 330 +++------- drivers/media/i2c/ov5640.c | 22 +- drivers/media/i2c/rdacm21.c | 2 +- drivers/media/i2c/tvp5150.c | 4 + drivers/media/pci/Kconfig | 2 +- drivers/media/pci/bt8xx/dst.c | 2 +- drivers/media/pci/bt8xx/dst_ca.c | 2 +- drivers/media/pci/ddbridge/ddbridge-dummy-fe.c | 2 +- drivers/media/pci/intel/Kconfig | 10 + drivers/media/pci/intel/Makefile | 4 +- .../pci/intel/{ipu3/cio2-bridge.c => ipu-bridge.c} | 192 +++--- .../pci/intel/{ipu3/cio2-bridge.h => ipu-bridge.h} | 57 +- drivers/media/pci/intel/ipu3/Kconfig | 1 + drivers/media/pci/intel/ipu3/Makefile | 1 - drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 4 +- drivers/media/pci/intel/ipu3/ipu3-cio2.h | 6 - drivers/media/platform/amphion/vdec.c | 41 +- drivers/media/platform/amphion/venc.c | 6 +- drivers/media/platform/amphion/vpu.h | 3 + drivers/media/platform/amphion/vpu_cmds.c | 16 +- drivers/media/platform/amphion/vpu_core.c | 2 + drivers/media/platform/amphion/vpu_dbg.c | 17 +- drivers/media/platform/amphion/vpu_helpers.c | 61 ++ drivers/media/platform/amphion/vpu_msgs.c | 14 +- drivers/media/platform/amphion/vpu_v4l2.c | 7 +- .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 1 + .../mediatek/vcodec/vdec/vdec_av1_req_lat_if.c | 12 +- .../platform/mediatek/vcodec/vdec/vdec_vp9_if.c | 5 +- .../platform/mediatek/vcodec/vdec_msg_queue.c | 6 +- .../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 2 +- drivers/media/platform/qcom/venus/hfi_venus.c | 20 +- drivers/media/platform/verisilicon/hantro_v4l2.c | 9 +- drivers/media/tuners/fc0011.c | 2 +- drivers/media/tuners/fc0012.c | 2 +- drivers/media/tuners/fc0013.c | 2 +- drivers/media/tuners/max2165.c | 2 +- drivers/media/tuners/mc44s803.c | 2 +- drivers/media/tuners/mt2060.c | 2 +- drivers/media/tuners/mt2131.c | 2 +- drivers/media/tuners/mt2266.c | 2 +- drivers/media/tuners/mxl5005s.c | 2 +- drivers/media/tuners/qt1010.c | 2 +- drivers/media/tuners/tda18218.c | 2 +- drivers/media/tuners/xc2028.c | 2 +- drivers/media/tuners/xc4000.c | 2 +- drivers/media/tuners/xc5000.c | 2 +- drivers/media/usb/dvb-usb/m920x.c | 5 +- drivers/media/usb/go7007/go7007-i2c.c | 2 - drivers/media/usb/siano/smsusb.c | 21 +- drivers/media/v4l2-core/v4l2-fwnode.c | 18 +- drivers/mfd/Kconfig | 2 +- drivers/misc/fastrpc.c | 13 +- drivers/mmc/host/renesas_sdhi_core.c | 10 +- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 7 +- drivers/mtd/nand/raw/fsmc_nand.c | 7 +- drivers/mtd/spi-nor/core.c | 19 +- drivers/net/arcnet/arcnet.c | 2 +- drivers/net/can/m_can/tcan4x5x-regmap.c | 1 - drivers/net/can/usb/gs_usb.c | 5 +- drivers/net/ethernet/amd/pds_core/core.c | 11 +- drivers/net/ethernet/amd/pds_core/dev.c | 9 +- drivers/net/ethernet/amd/pds_core/devlink.c | 3 + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 54 ++ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 1 + drivers/net/ethernet/hisilicon/hns3/Makefile | 4 +- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 4 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 1 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 560 +---------------- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 - .../ethernet/hisilicon/hns3/hns3pf/hclge_regs.c | 668 +++++++++++++++++++++ .../ethernet/hisilicon/hns3/hns3pf/hclge_regs.h | 17 + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 121 +--- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c | 127 ++++ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.h | 13 + drivers/net/ethernet/intel/ice/ice_main.c | 13 +- drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 55 +- drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 3 +- drivers/net/ethernet/intel/igb/igb_main.c | 11 +- drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 +- .../ethernet/marvell/octeontx2/nic/otx2_common.c | 3 +- .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 19 +- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 2 + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 9 +- .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 32 +- drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 3 +- drivers/net/ethernet/mellanox/mlxsw/i2c.c | 5 +- .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 4 +- drivers/net/ethernet/realtek/r8169_main.c | 4 - drivers/net/ethernet/sfc/ptp.c | 4 +- drivers/net/macsec.c | 3 +- drivers/net/pcs/pcs-lynx.c | 2 +- drivers/net/wireless/ath/ath10k/pci.c | 9 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +- drivers/net/wireless/ath/ath11k/pci.c | 10 +- drivers/net/wireless/ath/ath12k/mac.c | 4 +- drivers/net/wireless/ath/ath12k/pci.c | 10 +- drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 2 +- drivers/net/wireless/ath/ath9k/wmi.c | 20 +- drivers/net/wireless/marvell/mwifiex/debugfs.c | 9 +- drivers/net/wireless/marvell/mwifiex/pcie.c | 25 +- drivers/net/wireless/marvell/mwifiex/sta_rx.c | 12 +- drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 30 +- drivers/net/wireless/marvell/mwifiex/util.c | 10 +- drivers/net/wireless/mediatek/mt76/mt76.h | 2 +- .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 11 +- .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 1 + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 7 +- drivers/net/wireless/mediatek/mt76/mt7915/main.c | 93 ++- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 105 +++- drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 30 +- drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 15 + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 3 +- drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 13 +- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 11 +- drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 1 + drivers/net/wireless/mediatek/mt76/testmode.c | 1 + drivers/net/wireless/mediatek/mt76/tx.c | 9 +- drivers/net/wireless/realtek/rtw89/debug.c | 8 +- drivers/net/wireless/realtek/rtw89/fw.c | 27 +- drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c | 4 +- drivers/ntb/ntb_transport.c | 19 +- drivers/nvdimm/nd_perf.c | 3 +- drivers/nvdimm/nd_virtio.c | 3 +- drivers/of/overlay.c | 3 +- drivers/of/property.c | 2 + drivers/of/unittest.c | 12 +- drivers/opp/core.c | 10 +- drivers/parisc/ccio-dma.c | 11 +- drivers/parisc/sba_iommu.c | 2 +- drivers/pci/access.c | 20 +- drivers/pci/controller/dwc/pci-layerscape-ep.c | 19 + drivers/pci/controller/dwc/pcie-qcom-ep.c | 2 +- drivers/pci/controller/dwc/pcie-tegra194.c | 10 - drivers/pci/controller/pci-hyperv.c | 3 + drivers/pci/controller/pcie-apple.c | 6 +- drivers/pci/controller/pcie-microchip-host.c | 8 +- drivers/pci/controller/pcie-rockchip.h | 6 +- drivers/pci/doe.c | 2 +- drivers/pci/hotplug/pciehp_hpc.c | 12 +- drivers/pci/pci.c | 21 +- drivers/pci/pcie/aspm.c | 30 +- drivers/pci/probe.c | 2 + drivers/perf/fsl_imx8_ddr_perf.c | 24 +- drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 18 +- drivers/pinctrl/mediatek/pinctrl-mt7981.c | 44 +- drivers/pinctrl/mediatek/pinctrl-mt7986.c | 8 + drivers/pinctrl/pinctrl-mcp23s08_spi.c | 10 + drivers/platform/chrome/chromeos_acpi.c | 31 +- drivers/platform/x86/amd/pmf/core.c | 3 +- drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 9 +- drivers/power/supply/qcom_pmi8998_charger.c | 3 +- drivers/powercap/arm_scmi_powercap.c | 159 ++--- drivers/powercap/intel_rapl_common.c | 4 +- drivers/pwm/Kconfig | 2 +- drivers/remoteproc/stm32_rproc.c | 12 +- drivers/rpmsg/qcom_glink_native.c | 4 + drivers/s390/block/dasd_devmap.c | 6 +- drivers/s390/block/dasd_eckd.c | 10 +- drivers/s390/block/dasd_int.h | 4 + drivers/s390/block/dcssblk.c | 4 +- drivers/s390/crypto/pkey_api.c | 98 ++- drivers/s390/crypto/zcrypt_ep11misc.c | 287 ++++++--- drivers/s390/crypto/zcrypt_ep11misc.h | 20 +- drivers/scsi/be2iscsi/be_iscsi.c | 4 + drivers/scsi/fcoe/fcoe_ctlr.c | 20 +- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 11 +- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 6 +- drivers/scsi/hosts.c | 4 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 46 +- drivers/scsi/mpt3sas/mpt3sas_base.h | 1 + drivers/scsi/qedf/qedf_dbg.h | 2 + drivers/scsi/qedf/qedf_debugfs.c | 35 +- drivers/scsi/qla2xxx/qla_init.c | 2 +- drivers/scsi/qla4xxx/ql4_os.c | 15 + drivers/scsi/scsi_transport_iscsi.c | 80 ++- drivers/soc/qcom/ocmem.c | 4 +- drivers/soc/qcom/smem.c | 2 +- drivers/spi/spi-mpc512x-psc.c | 2 +- drivers/spi/spi-tegra114.c | 18 +- drivers/spi/spi-tegra20-sflash.c | 6 +- drivers/staging/media/av7110/sp8870.c | 2 +- drivers/staging/media/rkvdec/rkvdec.c | 2 +- drivers/thermal/imx8mm_thermal.c | 6 +- drivers/thermal/mediatek/lvts_thermal.c | 152 +++-- drivers/thermal/thermal_of.c | 8 +- drivers/tty/serial/qcom_geni_serial.c | 7 +- drivers/tty/serial/sc16is7xx.c | 145 +++-- drivers/tty/serial/serial-tegra.c | 6 +- drivers/tty/serial/sprd_serial.c | 30 +- drivers/ufs/core/ufshcd.c | 12 +- drivers/usb/core/hcd.c | 10 +- drivers/usb/core/hub.c | 349 ++++++----- drivers/usb/core/message.c | 29 +- drivers/usb/core/usb.h | 4 +- drivers/usb/gadget/function/f_mass_storage.c | 2 +- drivers/usb/gadget/udc/core.c | 1 + drivers/usb/phy/phy-mxs-usb.c | 10 +- drivers/usb/typec/bus.c | 12 +- drivers/usb/typec/tcpm/tcpm.c | 38 +- drivers/vfio/vfio_iommu_type1.c | 2 +- drivers/video/backlight/bd6107.c | 2 +- drivers/video/backlight/gpio_backlight.c | 2 +- drivers/video/backlight/lv5207lp.c | 2 +- drivers/virtio/virtio_ring.c | 2 +- drivers/virtio/virtio_vdpa.c | 17 +- fs/btrfs/zoned.c | 19 +- fs/dlm/plock.c | 6 +- fs/erofs/zdata.c | 5 +- fs/eventfd.c | 2 +- fs/ext4/mballoc.c | 7 +- fs/ext4/namei.c | 3 + fs/f2fs/checkpoint.c | 2 +- fs/f2fs/debug.c | 33 +- fs/f2fs/f2fs.h | 72 ++- fs/f2fs/file.c | 27 +- fs/f2fs/gc.c | 18 +- fs/f2fs/inode.c | 12 +- fs/f2fs/recovery.c | 1 + fs/f2fs/segment.c | 68 ++- fs/f2fs/super.c | 41 +- fs/f2fs/sysfs.c | 18 +- fs/fs_context.c | 23 +- fs/fuse/file.c | 89 +-- fs/iomap/buffered-io.c | 5 - fs/jfs/jfs_extent.c | 5 + fs/lockd/mon.c | 3 + fs/namei.c | 2 +- fs/nfs/blocklayout/dev.c | 4 +- fs/nfs/internal.h | 1 + fs/nfs/nfs2xdr.c | 2 +- fs/nfs/nfs3xdr.c | 2 +- fs/nfs/nfs42.h | 1 + fs/nfs/nfs42proc.c | 5 +- fs/nfs/nfs42xdr.c | 17 +- fs/nfs/nfs4proc.c | 13 +- fs/nfs/pnfs_nfs.c | 2 +- fs/nfs/read.c | 10 + fs/nfsd/blocklayoutxdr.c | 9 + fs/nfsd/flexfilelayoutxdr.c | 9 + fs/nfsd/nfs4xdr.c | 25 +- fs/ocfs2/namei.c | 4 + fs/proc/base.c | 3 +- fs/pstore/ram_core.c | 2 +- fs/quota/dquot.c | 174 ++++-- fs/reiserfs/journal.c | 4 +- fs/splice.c | 44 +- fs/verity/signature.c | 16 + include/crypto/algapi.h | 3 + include/dt-bindings/clock/qcom,gcc-sc8280xp.h | 10 + include/linux/arm_sdei.h | 2 + include/linux/blkdev.h | 1 + include/linux/hid.h | 1 + include/linux/if_arp.h | 4 + include/linux/kernfs.h | 4 + include/linux/lsm_hook_defs.h | 1 + include/linux/memcontrol.h | 9 +- include/linux/mfd/rz-mtu3.h | 66 -- include/linux/nmi.h | 14 +- include/linux/nvmem-consumer.h | 2 +- include/linux/pci.h | 34 +- include/linux/pid_namespace.h | 39 +- include/linux/security.h | 6 + include/linux/trace_events.h | 3 +- include/linux/usb/typec_altmode.h | 2 +- include/media/cec.h | 11 +- include/net/bluetooth/hci.h | 20 + include/net/bluetooth/hci_core.h | 67 ++- include/net/bluetooth/hci_sync.h | 2 +- include/net/inet6_hashtables.h | 72 ++- include/net/inet_hashtables.h | 67 ++- include/net/lwtunnel.h | 5 +- include/net/mac80211.h | 4 +- include/net/sock.h | 7 +- include/net/tcp.h | 1 - include/scsi/scsi_host.h | 2 +- include/sound/soc-dai.h | 13 + include/sound/ump.h | 1 + include/uapi/linux/bpf.h | 3 - include/uapi/linux/elf.h | 2 + include/uapi/linux/ioprio.h | 21 +- include/uapi/linux/sync_file.h | 2 +- include/ufs/ufs.h | 6 + init/Kconfig | 1 + io_uring/io-wq.c | 19 +- io_uring/io-wq.h | 3 +- io_uring/io_uring.c | 37 +- io_uring/io_uring.h | 1 - io_uring/net.c | 4 +- io_uring/sqpoll.c | 17 + io_uring/sqpoll.h | 1 + kernel/auditsc.c | 2 + kernel/bpf/btf.c | 22 +- kernel/bpf/helpers.c | 2 +- kernel/bpf/verifier.c | 58 +- kernel/cgroup/cpuset.c | 33 +- kernel/cgroup/namespace.c | 6 - kernel/cpu.c | 24 +- kernel/pid.c | 3 + kernel/pid_namespace.c | 6 +- kernel/pid_sysctl.h | 28 +- kernel/printk/printk_ringbuffer.c | 2 +- kernel/rcu/refscale.c | 3 +- kernel/sched/fair.c | 3 - kernel/sched/rt.c | 2 +- kernel/time/clocksource.c | 8 +- kernel/time/tick-sched.c | 2 +- kernel/trace/bpf_trace.c | 2 +- kernel/trace/trace.c | 17 +- kernel/trace/trace_hwlat.c | 2 +- kernel/trace/trace_uprobe.c | 3 +- kernel/watchdog.c | 11 +- kernel/workqueue.c | 2 +- lib/checksum_kunit.c | 54 +- lib/iov_iter.c | 30 +- lib/nmi_backtrace.c | 6 +- lib/xarray.c | 2 +- mm/memfd.c | 56 +- mm/pagewalk.c | 2 +- mm/shmem.c | 28 +- mm/util.c | 4 +- mm/vmalloc.c | 26 +- mm/vmpressure.c | 8 + mm/vmscan.c | 18 +- net/bluetooth/hci_conn.c | 622 +++++++++---------- net/bluetooth/hci_core.c | 28 +- net/bluetooth/hci_event.c | 133 ++-- net/bluetooth/hci_sync.c | 188 ++++-- net/bluetooth/iso.c | 78 ++- net/bluetooth/mgmt.c | 15 +- net/bluetooth/msft.c | 412 ++++++++++++- net/bluetooth/sco.c | 2 +- net/core/filter.c | 4 +- net/core/lwt_bpf.c | 7 +- net/core/skbuff.c | 44 +- net/core/sock.c | 18 +- net/dccp/ipv4.c | 13 +- net/dccp/ipv6.c | 15 +- net/ipv4/igmp.c | 3 +- net/ipv4/inet_hashtables.c | 27 +- net/ipv4/ip_output.c | 2 +- net/ipv4/tcp_input.c | 3 +- net/ipv4/tcp_timer.c | 18 +- net/ipv4/udp.c | 60 +- net/ipv6/inet6_hashtables.c | 25 +- net/ipv6/ip6_output.c | 2 +- net/ipv6/udp.c | 66 +- net/mac80211/cfg.c | 12 +- net/netfilter/ipset/ip_set_hash_netportnet.c | 1 + net/netfilter/nft_exthdr.c | 20 +- net/netfilter/xt_sctp.c | 2 + net/netfilter/xt_u32.c | 21 + net/netrom/af_netrom.c | 5 + net/sched/em_meta.c | 2 +- net/sched/sch_hfsc.c | 4 + net/smc/af_smc.c | 2 +- net/socket.c | 6 +- net/sunrpc/svcsock.c | 4 +- net/wireless/nl80211.c | 1 + samples/bpf/tracex3_kern.c | 36 +- samples/bpf/tracex6_kern.c | 17 +- scripts/gdb/linux/constants.py.in | 3 + scripts/gdb/linux/modules.py | 12 +- scripts/rust_is_available.sh | 122 ++-- security/integrity/ima/Kconfig | 12 - security/security.c | 14 + security/selinux/hooks.c | 22 + security/smack/smack_lsm.c | 51 ++ security/smack/smackfs.c | 2 +- sound/Kconfig | 2 +- sound/core/pcm_compat.c | 8 +- sound/core/seq/seq_memory.c | 9 +- sound/core/ump.c | 58 +- sound/pci/ac97/ac97_codec.c | 5 +- sound/pci/hda/patch_cs8409.c | 2 +- sound/pci/hda/patch_cs8409.h | 1 + sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/cs43130.h | 138 ++--- sound/soc/fsl/fsl_asrc.c | 16 +- sound/soc/fsl/fsl_aud2htx.c | 10 +- sound/soc/fsl/fsl_easrc.c | 16 +- sound/soc/fsl/fsl_esai.c | 20 +- sound/soc/fsl/fsl_micfil.c | 14 +- sound/soc/fsl/fsl_qmc_audio.c | 28 +- sound/soc/fsl/fsl_sai.c | 24 +- sound/soc/fsl/fsl_spdif.c | 17 +- sound/soc/fsl/fsl_ssi.c | 3 +- sound/soc/fsl/fsl_xcvr.c | 16 +- sound/soc/generic/audio-graph-card.c | 2 +- sound/soc/loongson/loongson_card.c | 2 +- sound/soc/pxa/mmp-sspa.c | 2 +- sound/soc/soc-compress.c | 1 + sound/soc/soc-core.c | 25 + sound/soc/soc-dai.c | 44 +- sound/soc/sof/amd/acp.c | 6 +- sound/soc/sof/intel/hda-mlink.c | 20 +- sound/usb/midi2.c | 22 +- tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 26 +- tools/bpf/bpftool/skeleton/profiler.bpf.c | 27 +- tools/include/nolibc/arch-aarch64.h | 2 +- tools/include/nolibc/arch-arm.h | 2 +- tools/include/nolibc/arch-i386.h | 2 +- tools/include/nolibc/arch-loongarch.h | 2 +- tools/include/nolibc/arch-mips.h | 2 +- tools/include/nolibc/arch-riscv.h | 2 +- tools/include/nolibc/arch-s390.h | 2 +- tools/include/nolibc/arch-x86_64.h | 2 +- tools/include/uapi/linux/bpf.h | 3 - tools/lib/bpf/libbpf.c | 46 +- tools/lib/bpf/usdt.c | 5 +- tools/testing/radix-tree/multiorder.c | 68 ++- .../selftests/bpf/benchs/run_bench_rename.sh | 2 +- tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 5 +- .../testing/selftests/bpf/prog_tests/kfunc_call.c | 2 +- .../selftests/bpf/progs/test_cls_redirect.h | 9 + .../futex/functional/futex_wait_timeout.c | 7 + tools/testing/selftests/kselftest_harness.h | 11 +- tools/testing/selftests/landlock/fs_test.c | 8 +- tools/testing/selftests/memfd/memfd_test.c | 40 +- tools/testing/selftests/resctrl/Makefile | 2 +- tools/testing/selftests/resctrl/cache.c | 18 +- tools/testing/selftests/resctrl/fill_buf.c | 3 +- tools/testing/selftests/resctrl/resctrl.h | 1 + virt/kvm/vfio.c | 115 ++-- 889 files changed, 10463 insertions(+), 6112 deletions(-)

2 years, 1 month

16
761
0 0

+ mips-use-nth_page-in-place-of-direct-struct-page-manipulation.patch added to mm-hotfixes-unstable branch

by Andrew Morton

The patch titled Subject: mips: use nth_page() in place of direct struct page manipulation has been added to the -mm mm-hotfixes-unstable branch. Its filename is mips-use-nth_page-in-place-of-direct-struct-page-manipulation.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche… This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Zi Yan <ziy(a)nvidia.com> Subject: mips: use nth_page() in place of direct struct page manipulation Date: Wed, 13 Sep 2023 16:12:48 -0400 __flush_dcache_pages() is called during hugetlb migration via migrate_pages() -> migrate_hugetlbs() -> unmap_and_move_huge_page() -> move_to_new_folio() -> flush_dcache_folio(). And with hugetlb and without sparsemem vmemmap, struct page is not guaranteed to be contiguous beyond a section. Use nth_page() instead. Link: https://lkml.kernel.org/r/20230913201248.452081-6-zi.yan@sent.com Fixes: 15fa3e8e3269 ("mips: implement the new page table range API") Signed-off-by: Zi Yan <ziy(a)nvidia.com> Cc: <stable(a)vger.kernel.org> Cc: David Hildenbrand <david(a)redhat.com> Cc: Matthew Wilcox (Oracle) <willy(a)infradead.org> Cc: Mike Kravetz <mike.kravetz(a)oracle.com> Cc: Mike Rapoport (IBM) <rppt(a)kernel.org> Cc: Muchun Song <songmuchun(a)bytedance.com> Cc: Thomas Bogendoerfer <tsbogend(a)alpha.franken.de> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- arch/mips/mm/cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/mips/mm/cache.c~mips-use-nth_page-in-place-of-direct-struct-page-manipulation +++ a/arch/mips/mm/cache.c @@ -117,7 +117,7 @@ void __flush_dcache_pages(struct page *p * get faulted into the tlb (and thus flushed) anyways. */ for (i = 0; i < nr; i++) { - addr = (unsigned long)kmap_local_page(page + i); + addr = (unsigned long)kmap_local_page(nth_page(page, i)); flush_data_cache_page(addr); kunmap_local((void *)addr); } _ Patches currently in -mm which might be from ziy(a)nvidia.com are mm-cma-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mm-hugetlb-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mm-memory_hotplug-use-pfn-math-in-place-of-direct-struct-page-manipulation.patch fs-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mips-use-nth_page-in-place-of-direct-struct-page-manipulation.patch

2 years, 1 month

1
0
0 0

+ fs-use-nth_page-in-place-of-direct-struct-page-manipulation.patch added to mm-hotfixes-unstable branch

by Andrew Morton

The patch titled Subject: fs: use nth_page() in place of direct struct page manipulation has been added to the -mm mm-hotfixes-unstable branch. Its filename is fs-use-nth_page-in-place-of-direct-struct-page-manipulation.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche… This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Zi Yan <ziy(a)nvidia.com> Subject: fs: use nth_page() in place of direct struct page manipulation Date: Wed, 13 Sep 2023 16:12:47 -0400 When dealing with hugetlb pages, struct page is not guaranteed to be contiguous on SPARSEMEM without VMEMMAP. Use nth_page() to handle it properly. Link: https://lkml.kernel.org/r/20230913201248.452081-5-zi.yan@sent.com Fixes: 38c1ddbde6c6 ("hugetlbfs: improve read HWPOISON hugepage") Cc: <stable(a)vger.kernel.org> Signed-off-by: Zi Yan <ziy(a)nvidia.com> Reviewed-by: Muchun Song <songmuchun(a)bytedance.com> Cc: David Hildenbrand <david(a)redhat.com> Cc: Matthew Wilcox (Oracle) <willy(a)infradead.org> Cc: Mike Kravetz <mike.kravetz(a)oracle.com> Cc: Mike Rapoport (IBM) <rppt(a)kernel.org> Cc: Thomas Bogendoerfer <tsbogend(a)alpha.franken.de> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- fs/hugetlbfs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/fs/hugetlbfs/inode.c~fs-use-nth_page-in-place-of-direct-struct-page-manipulation +++ a/fs/hugetlbfs/inode.c @@ -295,7 +295,7 @@ static size_t adjust_range_hwpoison(stru size_t res = 0; /* First subpage to start the loop. */ - page += offset / PAGE_SIZE; + page = nth_page(page, offset / PAGE_SIZE); offset %= PAGE_SIZE; while (1) { if (is_raw_hwpoison_page_in_hugepage(page)) @@ -309,7 +309,7 @@ static size_t adjust_range_hwpoison(stru break; offset += n; if (offset == PAGE_SIZE) { - page++; + page = nth_page(page, 1); offset = 0; } } _ Patches currently in -mm which might be from ziy(a)nvidia.com are mm-cma-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mm-hugetlb-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mm-memory_hotplug-use-pfn-math-in-place-of-direct-struct-page-manipulation.patch fs-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mips-use-nth_page-in-place-of-direct-struct-page-manipulation.patch

2 years, 1 month

1
0
0 0

+ mm-memory_hotplug-use-pfn-math-in-place-of-direct-struct-page-manipulation.patch added to mm-hotfixes-unstable branch

by Andrew Morton

The patch titled Subject: mm/memory_hotplug: use pfn math in place of direct struct page manipulation has been added to the -mm mm-hotfixes-unstable branch. Its filename is mm-memory_hotplug-use-pfn-math-in-place-of-direct-struct-page-manipulation.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche… This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Zi Yan <ziy(a)nvidia.com> Subject: mm/memory_hotplug: use pfn math in place of direct struct page manipulation Date: Wed, 13 Sep 2023 16:12:46 -0400 When dealing with hugetlb pages, manipulating struct page pointers directly can get to wrong struct page, since struct page is not guaranteed to be contiguous on SPARSEMEM without VMEMMAP. Use pfn calculation to handle it properly. Link: https://lkml.kernel.org/r/20230913201248.452081-4-zi.yan@sent.com Fixes: eeb0efd071d8 ("mm,memory_hotplug: fix scan_movable_pages() for gigantic hugepages") Signed-off-by: Zi Yan <ziy(a)nvidia.com> Reviewed-by: Muchun Song <songmuchun(a)bytedance.com> Acked-by: David Hildenbrand <david(a)redhat.com> Cc: <stable(a)vger.kernel.org> Cc: Matthew Wilcox (Oracle) <willy(a)infradead.org> Cc: Mike Kravetz <mike.kravetz(a)oracle.com> Cc: Mike Rapoport (IBM) <rppt(a)kernel.org> Cc: Thomas Bogendoerfer <tsbogend(a)alpha.franken.de> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/memory_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/memory_hotplug.c~mm-memory_hotplug-use-pfn-math-in-place-of-direct-struct-page-manipulation +++ a/mm/memory_hotplug.c @@ -1689,7 +1689,7 @@ static int scan_movable_pages(unsigned l */ if (HPageMigratable(head)) goto found; - skip = compound_nr(head) - (page - head); + skip = compound_nr(head) - (pfn - page_to_pfn(head)); pfn += skip - 1; } return -ENOENT; _ Patches currently in -mm which might be from ziy(a)nvidia.com are mm-cma-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mm-hugetlb-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mm-memory_hotplug-use-pfn-math-in-place-of-direct-struct-page-manipulation.patch fs-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mips-use-nth_page-in-place-of-direct-struct-page-manipulation.patch

2 years, 1 month

1
0
0 0

+ mm-hugetlb-use-nth_page-in-place-of-direct-struct-page-manipulation.patch added to mm-hotfixes-unstable branch

by Andrew Morton

The patch titled Subject: mm/hugetlb: use nth_page() in place of direct struct page manipulation has been added to the -mm mm-hotfixes-unstable branch. Its filename is mm-hugetlb-use-nth_page-in-place-of-direct-struct-page-manipulation.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche… This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Zi Yan <ziy(a)nvidia.com> Subject: mm/hugetlb: use nth_page() in place of direct struct page manipulation Date: Wed, 13 Sep 2023 16:12:45 -0400 When dealing with hugetlb pages, manipulating struct page pointers directly can get to wrong struct page, since struct page is not guaranteed to be contiguous on SPARSEMEM without VMEMMAP. Use nth_page() to handle it properly. Link: https://lkml.kernel.org/r/20230913201248.452081-3-zi.yan@sent.com Fixes: 57a196a58421 ("hugetlb: simplify hugetlb handling in follow_page_mask") Signed-off-by: Zi Yan <ziy(a)nvidia.com> Reviewed-by: Muchun Song <songmuchun(a)bytedance.com> Cc: <stable(a)vger.kernel.org> Cc: David Hildenbrand <david(a)redhat.com> Cc: Matthew Wilcox (Oracle) <willy(a)infradead.org> Cc: Mike Kravetz <mike.kravetz(a)oracle.com> Cc: Mike Rapoport (IBM) <rppt(a)kernel.org> Cc: Thomas Bogendoerfer <tsbogend(a)alpha.franken.de> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/hugetlb.c~mm-hugetlb-use-nth_page-in-place-of-direct-struct-page-manipulation +++ a/mm/hugetlb.c @@ -6474,7 +6474,7 @@ struct page *hugetlb_follow_page_mask(st } } - page += ((address & ~huge_page_mask(h)) >> PAGE_SHIFT); + page = nth_page(page, ((address & ~huge_page_mask(h)) >> PAGE_SHIFT)); /* * Note that page may be a sub-page, and with vmemmap _ Patches currently in -mm which might be from ziy(a)nvidia.com are mm-cma-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mm-hugetlb-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mm-memory_hotplug-use-pfn-math-in-place-of-direct-struct-page-manipulation.patch fs-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mips-use-nth_page-in-place-of-direct-struct-page-manipulation.patch

2 years, 1 month

1
0
0 0

+ mm-cma-use-nth_page-in-place-of-direct-struct-page-manipulation.patch added to mm-hotfixes-unstable branch

by Andrew Morton

The patch titled Subject: mm/cma: use nth_page() in place of direct struct page manipulation has been added to the -mm mm-hotfixes-unstable branch. Its filename is mm-cma-use-nth_page-in-place-of-direct-struct-page-manipulation.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche… This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Zi Yan <ziy(a)nvidia.com> Subject: mm/cma: use nth_page() in place of direct struct page manipulation Date: Wed, 13 Sep 2023 16:12:44 -0400 Patch series "Use nth_page() in place of direct struct page manipulation", v3. On SPARSEMEM without VMEMMAP, struct page is not guaranteed to be contiguous, since each memory section's memmap might be allocated independently. hugetlb pages can go beyond a memory section size, thus direct struct page manipulation on hugetlb pages/subpages might give wrong struct page. Kernel provides nth_page() to do the manipulation properly. Use that whenever code can see hugetlb pages. This patch (of 5): When dealing with hugetlb pages, manipulating struct page pointers directly can get to wrong struct page, since struct page is not guaranteed to be contiguous on SPARSEMEM without VMEMMAP. Use nth_page() to handle it properly. Link: https://lkml.kernel.org/r/20230913201248.452081-1-zi.yan@sent.com Link: https://lkml.kernel.org/r/20230913201248.452081-2-zi.yan@sent.com Fixes: 2813b9c02962 ("kasan, mm, arm64: tag non slab memory allocated via pagealloc") Signed-off-by: Zi Yan <ziy(a)nvidia.com> Reviewed-by: Muchun Song <songmuchun(a)bytedance.com> Cc: David Hildenbrand <david(a)redhat.com> Cc: Matthew Wilcox (Oracle) <willy(a)infradead.org> Cc: Mike Kravetz <mike.kravetz(a)oracle.com> Cc: Mike Rapoport (IBM) <rppt(a)kernel.org> Cc: Thomas Bogendoerfer <tsbogend(a)alpha.franken.de> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/cma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/cma.c~mm-cma-use-nth_page-in-place-of-direct-struct-page-manipulation +++ a/mm/cma.c @@ -505,7 +505,7 @@ struct page *cma_alloc(struct cma *cma, */ if (page) { for (i = 0; i < count; i++) - page_kasan_tag_reset(page + i); + page_kasan_tag_reset(nth_page(page, i)); } if (ret && !no_warn) { _ Patches currently in -mm which might be from ziy(a)nvidia.com are mm-cma-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mm-hugetlb-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mm-memory_hotplug-use-pfn-math-in-place-of-direct-struct-page-manipulation.patch fs-use-nth_page-in-place-of-direct-struct-page-manipulation.patch mips-use-nth_page-in-place-of-direct-struct-page-manipulation.patch

2 years, 1 month

1
0
0 0

[PATCH v3] virtio-mmio: fix memory leak of vm_dev

by Maximilian Heyne

With the recent removal of vm_dev from devres its memory is only freed via the callback virtio_mmio_release_dev. However, this only takes effect after device_add is called by register_virtio_device. Until then it's an unmanaged resource and must be explicitly freed on error exit. This bug was discovered and resolved using Coverity Static Analysis Security Testing (SAST) by Synopsys, Inc. Cc: <stable(a)vger.kernel.org> Fixes: 55c91fedd03d ("virtio-mmio: don't break lifecycle of vm_dev") Signed-off-by: Maximilian Heyne <mheyne(a)amazon.de> Reviewed-by: Catalin Marinas <catalin.marinas(a)arm.com> Tested-by: Catalin Marinas <catalin.marinas(a)arm.com> Reviewed-by: Xuan Zhuo <xuanzhuo(a)linux.alibaba.com> --- Resending this patch because the previous email wasn't delivered to lore. Copied the reviewed-bys from https://lore.kernel.org/all/ZPn6KZpdPdG2LQqL@arm.com/ and https://lore.kernel.org/all/1694137778.7008362-1-xuanzhuo@linux.alibaba.com/ drivers/virtio/virtio_mmio.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 97760f611295..59892a31cf76 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -631,14 +631,17 @@ static int virtio_mmio_probe(struct platform_device *pdev) spin_lock_init(&vm_dev->lock); vm_dev->base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(vm_dev->base)) - return PTR_ERR(vm_dev->base); + if (IS_ERR(vm_dev->base)) { + rc = PTR_ERR(vm_dev->base); + goto free_vm_dev; + } /* Check magic value */ magic = readl(vm_dev->base + VIRTIO_MMIO_MAGIC_VALUE); if (magic != ('v' | 'i' << 8 | 'r' << 16 | 't' << 24)) { dev_warn(&pdev->dev, "Wrong magic value 0x%08lx!\n", magic); - return -ENODEV; + rc = -ENODEV; + goto free_vm_dev; } /* Check device version */ @@ -646,7 +649,8 @@ static int virtio_mmio_probe(struct platform_device *pdev) if (vm_dev->version < 1 || vm_dev->version > 2) { dev_err(&pdev->dev, "Version %ld not supported!\n", vm_dev->version); - return -ENXIO; + rc = -ENXIO; + goto free_vm_dev; } vm_dev->vdev.id.device = readl(vm_dev->base + VIRTIO_MMIO_DEVICE_ID); @@ -655,7 +659,8 @@ static int virtio_mmio_probe(struct platform_device *pdev) * virtio-mmio device with an ID 0 is a (dummy) placeholder * with no function. End probing now with no error reported. */ - return -ENODEV; + rc = -ENODEV; + goto free_vm_dev; } vm_dev->vdev.id.vendor = readl(vm_dev->base + VIRTIO_MMIO_VENDOR_ID); @@ -685,6 +690,10 @@ static int virtio_mmio_probe(struct platform_device *pdev) put_device(&vm_dev->vdev.dev); return rc; + +free_vm_dev: + kfree(vm_dev); + return rc; } static int virtio_mmio_remove(struct platform_device *pdev) -- 2.40.1 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879

2 years, 1 month

2
1
0 0

FAILED: patch "[PATCH] bus: mhi: host: Skip MHI reset if device is in RDDM" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x cabce92dd805945a090dc6fc73b001bb35ed083a # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091350-mahogany-jump-02dd@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: cabce92dd805 ("bus: mhi: host: Skip MHI reset if device is in RDDM") a0f5a630668c ("bus: mhi: Move host MHI code to "host" directory") 44b1eba44dc5 ("bus: mhi: core: Fix power down latency") a03c7a86e127 ("bus: mhi: core: Mark and maintain device states early on after power down") 556bbb442bbb ("bus: mhi: core: Separate system error and power down handling") 855a70c12021 ("bus: mhi: Add MHI PCI support for WWAN modems") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From cabce92dd805945a090dc6fc73b001bb35ed083a Mon Sep 17 00:00:00 2001 From: Qiang Yu <quic_qianyu(a)quicinc.com> Date: Thu, 18 May 2023 14:22:39 +0800 Subject: [PATCH] bus: mhi: host: Skip MHI reset if device is in RDDM In RDDM EE, device can not process MHI reset issued by host. In case of MHI power off, host is issuing MHI reset and polls for it to get cleared until it times out. Since this timeout can not be avoided in case of RDDM, skip the MHI reset in this scenarios. Cc: <stable(a)vger.kernel.org> Fixes: a6e2e3522f29 ("bus: mhi: core: Add support for PM state transitions") Signed-off-by: Qiang Yu <quic_qianyu(a)quicinc.com> Reviewed-by: Jeffrey Hugo <quic_jhugo(a)quicinc.com> Reviewed-by: Manivannan Sadhasivam <mani(a)kernel.org> Link: https://lore.kernel.org/r/1684390959-17836-1-git-send-email-quic_qianyu@qui… Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> diff --git a/drivers/bus/mhi/host/pm.c b/drivers/bus/mhi/host/pm.c index 083459028a4b..8a4362d75fc4 100644 --- a/drivers/bus/mhi/host/pm.c +++ b/drivers/bus/mhi/host/pm.c @@ -470,6 +470,10 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl) /* Trigger MHI RESET so that the device will not access host memory */ if (!MHI_PM_IN_FATAL_STATE(mhi_cntrl->pm_state)) { + /* Skip MHI RESET if in RDDM state */ + if (mhi_cntrl->rddm_image && mhi_get_exec_env(mhi_cntrl) == MHI_EE_RDDM) + goto skip_mhi_reset; + dev_dbg(dev, "Triggering MHI Reset in device\n"); mhi_set_mhi_state(mhi_cntrl, MHI_STATE_RESET); @@ -495,6 +499,7 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl) } } +skip_mhi_reset: dev_dbg(dev, "Waiting for all pending event ring processing to complete\n"); mhi_event = mhi_cntrl->mhi_event;

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] clk: qcom: mss-sc7180: fix missing resume during probe" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x e2349da0fa7ca822cda72f427345b95795358fe7 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091302-payer-bless-094d@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: e2349da0fa7c ("clk: qcom: mss-sc7180: fix missing resume during probe") 72cfc73f4663 ("clk: qcom: use devm_pm_runtime_enable and devm_pm_clk_create") ce8c195e652f ("clk: qcom: lpasscc: Introduce pm autosuspend for SC7180") 8d4025943e13 ("clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones") a2d8f507803e ("clk: qcom: Add support to LPASS AUDIO_CC Glitch Free Mux clocks") 4ee9fe3e292b ("clk: qcom: lpass-sc7180: Disentangle the two clock devices") 7635622b77b5 ("clk: qcom: lpasscc-sc7810: Use devm in probe") 15d09e830bbc ("clk: qcom: camcc: Add camera clock controller driver for SC7180") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From e2349da0fa7ca822cda72f427345b95795358fe7 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan+linaro(a)kernel.org> Date: Tue, 18 Jul 2023 15:29:01 +0200 Subject: [PATCH] clk: qcom: mss-sc7180: fix missing resume during probe Drivers that enable runtime PM must make sure that the controller is runtime resumed before accessing its registers to prevent the power domain from being disabled. Fixes: 8def929c4097 ("clk: qcom: Add modem clock controller driver for SC7180") Cc: stable(a)vger.kernel.org # 5.7 Cc: Taniya Das <quic_tdas(a)quicinc.com> Signed-off-by: Johan Hovold <johan+linaro(a)kernel.org> Link: https://lore.kernel.org/r/20230718132902.21430-8-johan+linaro@kernel.org Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/drivers/clk/qcom/mss-sc7180.c b/drivers/clk/qcom/mss-sc7180.c index 5a1407440662..d106bc65470e 100644 --- a/drivers/clk/qcom/mss-sc7180.c +++ b/drivers/clk/qcom/mss-sc7180.c @@ -87,11 +87,22 @@ static int mss_sc7180_probe(struct platform_device *pdev) return ret; } + ret = pm_runtime_resume_and_get(&pdev->dev); + if (ret) + return ret; + ret = qcom_cc_probe(pdev, &mss_sc7180_desc); if (ret < 0) - return ret; + goto err_put_rpm; + + pm_runtime_put(&pdev->dev); return 0; + +err_put_rpm: + pm_runtime_put_sync(&pdev->dev); + + return ret; } static const struct dev_pm_ops mss_sc7180_pm_ops = {

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] clk: qcom: q6sstop-qcs404: fix missing resume during probe" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 97112c83f4671a4a722f99a53be4e91fac4091bc # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091329-grudging-engraver-d7b5@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 97112c83f467 ("clk: qcom: q6sstop-qcs404: fix missing resume during probe") 72cfc73f4663 ("clk: qcom: use devm_pm_runtime_enable and devm_pm_clk_create") ce8c195e652f ("clk: qcom: lpasscc: Introduce pm autosuspend for SC7180") 8d4025943e13 ("clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones") a2d8f507803e ("clk: qcom: Add support to LPASS AUDIO_CC Glitch Free Mux clocks") 4ee9fe3e292b ("clk: qcom: lpass-sc7180: Disentangle the two clock devices") 7635622b77b5 ("clk: qcom: lpasscc-sc7810: Use devm in probe") 15d09e830bbc ("clk: qcom: camcc: Add camera clock controller driver for SC7180") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 97112c83f4671a4a722f99a53be4e91fac4091bc Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan+linaro(a)kernel.org> Date: Tue, 18 Jul 2023 15:29:00 +0200 Subject: [PATCH] clk: qcom: q6sstop-qcs404: fix missing resume during probe Drivers that enable runtime PM must make sure that the controller is runtime resumed before accessing its registers to prevent the power domain from being disabled. Fixes: 6cdef2738db0 ("clk: qcom: Add Q6SSTOP clock controller for QCS404") Cc: stable(a)vger.kernel.org # 5.5 Signed-off-by: Johan Hovold <johan+linaro(a)kernel.org> Link: https://lore.kernel.org/r/20230718132902.21430-7-johan+linaro@kernel.org Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/drivers/clk/qcom/q6sstop-qcs404.c b/drivers/clk/qcom/q6sstop-qcs404.c index 780074e05841..26e2d63614ac 100644 --- a/drivers/clk/qcom/q6sstop-qcs404.c +++ b/drivers/clk/qcom/q6sstop-qcs404.c @@ -174,21 +174,32 @@ static int q6sstopcc_qcs404_probe(struct platform_device *pdev) return ret; } + ret = pm_runtime_resume_and_get(&pdev->dev); + if (ret) + return ret; + q6sstop_regmap_config.name = "q6sstop_tcsr"; desc = &tcsr_qcs404_desc; ret = qcom_cc_probe_by_index(pdev, 1, desc); if (ret) - return ret; + goto err_put_rpm; q6sstop_regmap_config.name = "q6sstop_cc"; desc = &q6sstop_qcs404_desc; ret = qcom_cc_probe_by_index(pdev, 0, desc); if (ret) - return ret; + goto err_put_rpm; + + pm_runtime_put(&pdev->dev); return 0; + +err_put_rpm: + pm_runtime_put_sync(&pdev->dev); + + return ret; } static const struct dev_pm_ops q6sstopcc_pm_ops = {

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] clk: imx: pll14xx: dynamically configure PLL for" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 72d00e560d10665e6139c9431956a87ded6e9880 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091351-humongous-upriver-d78b@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 72d00e560d10 ("clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz") 57795654fb55 ("clk: imx: pll14xx: Add new frequency entries for pll1443x table") 8f2d3c1759d1 ("clk: imx: clk-pll14xx: Make two variables static") 43cdaa1567ad ("clk: imx8mm: Move 1443X/1416X PLL clock structure to common place") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 72d00e560d10665e6139c9431956a87ded6e9880 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum <a.fatoum(a)pengutronix.de> Date: Mon, 7 Aug 2023 10:47:44 +0200 Subject: [PATCH] clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz Since commit b09c68dc57c9 ("clk: imx: pll14xx: Support dynamic rates"), the driver has the ability to dynamically compute PLL parameters to approximate the requested rates. This is not always used, because the logic is as follows: - Check if the target rate is hardcoded in the frequency table - Check if varying only kdiv is possible, so switch over is glitch free - Compute rate dynamically by iterating over pdiv range If we skip the frequency table for the 1443x PLL, we find that the computed values differ to the hardcoded ones. This can be valid if the hardcoded values guarantee for example an earlier lock-in or if the divisors are chosen, so that other important rates are more likely to be reached glitch-free. For rates (393216000 and 361267200, this doesn't seem to be the case: They are only approximated by existing parameters (393215995 and 361267196 Hz, respectively) and they aren't reachable glitch-free from other hardcoded frequencies. Dropping them from the table allows us to lock-in to these frequencies exactly. This is immediately noticeable because they are the assigned-clock-rates for IMX8MN_AUDIO_PLL1 and IMX8MN_AUDIO_PLL2, respectively and a look into clk_summary so far showed that they were a few Hz short of the target: imx8mn-board:~# grep audio_pll[12]_out /sys/kernel/debug/clk/clk_summary audio_pll2_out 0 0 0 361267196 0 0 50000 N audio_pll1_out 1 1 0 393215995 0 0 50000 Y and afterwards: imx8mn-board:~# grep audio_pll[12]_out /sys/kernel/debug/clk/clk_summary audio_pll2_out 0 0 0 361267200 0 0 50000 N audio_pll1_out 1 1 0 393216000 0 0 50000 Y This change is equivalent to adding following hardcoded values: /* rate mdiv pdiv sdiv kdiv */ PLL_1443X_RATE(393216000, 655, 5, 3, 23593), PLL_1443X_RATE(361267200, 497, 33, 0, -16882), Fixes: 053a4ffe2988 ("clk: imx: imx8mm: fix audio pll setting") Cc: stable(a)vger.kernel.org # v5.18+ Signed-off-by: Ahmad Fatoum <a.fatoum(a)pengutronix.de> Signed-off-by: Marco Felsch <m.felsch(a)pengutronix.de> Link: https://lore.kernel.org/r/20230807084744.1184791-2-m.felsch@pengutronix.de Signed-off-by: Abel Vesa <abel.vesa(a)linaro.org> diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c index dc6bc21dff41..0d58d85c375e 100644 --- a/drivers/clk/imx/clk-pll14xx.c +++ b/drivers/clk/imx/clk-pll14xx.c @@ -64,8 +64,6 @@ static const struct imx_pll14xx_rate_table imx_pll1443x_tbl[] = { PLL_1443X_RATE(650000000U, 325, 3, 2, 0), PLL_1443X_RATE(594000000U, 198, 2, 2, 0), PLL_1443X_RATE(519750000U, 173, 2, 2, 16384), - PLL_1443X_RATE(393216000U, 262, 2, 3, 9437), - PLL_1443X_RATE(361267200U, 361, 3, 3, 17511), }; struct imx_pll14xx_clk imx_1443x_pll = {

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] pinctrl: cherryview: fix address_space_handler() argument" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x d5301c90716a8e20bc961a348182daca00c8e8f0 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091308-backfield-resample-5e13@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: d5301c90716a ("pinctrl: cherryview: fix address_space_handler() argument") 3ea2e2cabd2d ("pinctrl: cherryview: Switch to use struct intel_pinctrl") 8a8285707780 ("pinctrl: cherryview: Move custom community members to separate data struct") 0e2d769d4b4e ("pinctrl: cherryview: Drop stale comment") 293428f93260 ("pinctrl: cherryview: Re-use data structures from pinctrl-intel.h (part 3)") bfc8a4baec93 ("pinctrl: cherryview: Convert chv_writel() to use chv_padreg()") 99fd6512278e ("pinctrl: cherryview: Introduce helpers to IO with common registers") 4e7293e3a2a3 ("pinctrl: cherryview: Introduce chv_readl() helper") 3dbf1ee6abbb ("pinctrl: cherryview: Add missing spinlock usage in chv_gpio_irq_handler") 36ad7b24486a ("pinctrl: cherryview: Re-use data structures from pinctrl-intel.h (part 2)") b9a19bdbc843 ("pinctrl: cherryview: Pass irqchip when adding gpiochip") bd90633a5c54 ("pinctrl: cherryview: Add GPIO <-> pin mapping ranges via callback") 82d9beb4b7f7 ("pinctrl: cherryview: Split out irq hw-init into a separate helper function") 8ae93b5ed9be ("pinctrl: cherryview: Missed type change to unsigned int") e58e177392b9 ("pinctrl: cherryview: Allocate IRQ chip dynamic") 17d49c6258e6 ("pinctrl: cherryview: Fix spelling mistake in the comment") 3c2edc36a774 ("Merge tag 'pinctrl-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From d5301c90716a8e20bc961a348182daca00c8e8f0 Mon Sep 17 00:00:00 2001 From: Raag Jadav <raag.jadav(a)intel.com> Date: Tue, 22 Aug 2023 12:53:40 +0530 Subject: [PATCH] pinctrl: cherryview: fix address_space_handler() argument First argument of acpi_*_address_space_handler() APIs is acpi_handle of the device, which is incorrectly passed in driver ->remove() path here. Fix it by passing the appropriate argument and while at it, make both API calls consistent using ACPI_HANDLE(). Fixes: a0b028597d59 ("pinctrl: cherryview: Add support for GMMR GPIO opregion") Cc: stable(a)vger.kernel.org Signed-off-by: Raag Jadav <raag.jadav(a)intel.com> Acked-by: Mika Westerberg <mika.westerberg(a)linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c index 55a42dbf97b6..81ee949b946d 100644 --- a/drivers/pinctrl/intel/pinctrl-cherryview.c +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c @@ -1649,7 +1649,6 @@ static int chv_pinctrl_probe(struct platform_device *pdev) struct intel_community_context *cctx; struct intel_community *community; struct device *dev = &pdev->dev; - struct acpi_device *adev = ACPI_COMPANION(dev); struct intel_pinctrl *pctrl; acpi_status status; unsigned int i; @@ -1717,7 +1716,7 @@ static int chv_pinctrl_probe(struct platform_device *pdev) if (ret) return ret; - status = acpi_install_address_space_handler(adev->handle, + status = acpi_install_address_space_handler(ACPI_HANDLE(dev), community->acpi_space_id, chv_pinctrl_mmio_access_handler, NULL, pctrl); @@ -1734,7 +1733,7 @@ static int chv_pinctrl_remove(struct platform_device *pdev) struct intel_pinctrl *pctrl = platform_get_drvdata(pdev); const struct intel_community *community = &pctrl->communities[0]; - acpi_remove_address_space_handler(ACPI_COMPANION(&pdev->dev), + acpi_remove_address_space_handler(ACPI_HANDLE(&pdev->dev), community->acpi_space_id, chv_pinctrl_mmio_access_handler);

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] pinctrl: cherryview: fix address_space_handler() argument" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y git checkout FETCH_HEAD git cherry-pick -x d5301c90716a8e20bc961a348182daca00c8e8f0 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091307-reimburse-afraid-436c@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: d5301c90716a ("pinctrl: cherryview: fix address_space_handler() argument") 3ea2e2cabd2d ("pinctrl: cherryview: Switch to use struct intel_pinctrl") 8a8285707780 ("pinctrl: cherryview: Move custom community members to separate data struct") 0e2d769d4b4e ("pinctrl: cherryview: Drop stale comment") 293428f93260 ("pinctrl: cherryview: Re-use data structures from pinctrl-intel.h (part 3)") bfc8a4baec93 ("pinctrl: cherryview: Convert chv_writel() to use chv_padreg()") 99fd6512278e ("pinctrl: cherryview: Introduce helpers to IO with common registers") 4e7293e3a2a3 ("pinctrl: cherryview: Introduce chv_readl() helper") 3dbf1ee6abbb ("pinctrl: cherryview: Add missing spinlock usage in chv_gpio_irq_handler") 36ad7b24486a ("pinctrl: cherryview: Re-use data structures from pinctrl-intel.h (part 2)") b9a19bdbc843 ("pinctrl: cherryview: Pass irqchip when adding gpiochip") bd90633a5c54 ("pinctrl: cherryview: Add GPIO <-> pin mapping ranges via callback") 82d9beb4b7f7 ("pinctrl: cherryview: Split out irq hw-init into a separate helper function") 8ae93b5ed9be ("pinctrl: cherryview: Missed type change to unsigned int") e58e177392b9 ("pinctrl: cherryview: Allocate IRQ chip dynamic") 17d49c6258e6 ("pinctrl: cherryview: Fix spelling mistake in the comment") 3c2edc36a774 ("Merge tag 'pinctrl-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From d5301c90716a8e20bc961a348182daca00c8e8f0 Mon Sep 17 00:00:00 2001 From: Raag Jadav <raag.jadav(a)intel.com> Date: Tue, 22 Aug 2023 12:53:40 +0530 Subject: [PATCH] pinctrl: cherryview: fix address_space_handler() argument First argument of acpi_*_address_space_handler() APIs is acpi_handle of the device, which is incorrectly passed in driver ->remove() path here. Fix it by passing the appropriate argument and while at it, make both API calls consistent using ACPI_HANDLE(). Fixes: a0b028597d59 ("pinctrl: cherryview: Add support for GMMR GPIO opregion") Cc: stable(a)vger.kernel.org Signed-off-by: Raag Jadav <raag.jadav(a)intel.com> Acked-by: Mika Westerberg <mika.westerberg(a)linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c index 55a42dbf97b6..81ee949b946d 100644 --- a/drivers/pinctrl/intel/pinctrl-cherryview.c +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c @@ -1649,7 +1649,6 @@ static int chv_pinctrl_probe(struct platform_device *pdev) struct intel_community_context *cctx; struct intel_community *community; struct device *dev = &pdev->dev; - struct acpi_device *adev = ACPI_COMPANION(dev); struct intel_pinctrl *pctrl; acpi_status status; unsigned int i; @@ -1717,7 +1716,7 @@ static int chv_pinctrl_probe(struct platform_device *pdev) if (ret) return ret; - status = acpi_install_address_space_handler(adev->handle, + status = acpi_install_address_space_handler(ACPI_HANDLE(dev), community->acpi_space_id, chv_pinctrl_mmio_access_handler, NULL, pctrl); @@ -1734,7 +1733,7 @@ static int chv_pinctrl_remove(struct platform_device *pdev) struct intel_pinctrl *pctrl = platform_get_drvdata(pdev); const struct intel_community *community = &pctrl->communities[0]; - acpi_remove_address_space_handler(ACPI_COMPANION(&pdev->dev), + acpi_remove_address_space_handler(ACPI_HANDLE(&pdev->dev), community->acpi_space_id, chv_pinctrl_mmio_access_handler);

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] pinctrl: cherryview: fix address_space_handler() argument" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x d5301c90716a8e20bc961a348182daca00c8e8f0 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091306-alfalfa-reflector-b0cb@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: d5301c90716a ("pinctrl: cherryview: fix address_space_handler() argument") 3ea2e2cabd2d ("pinctrl: cherryview: Switch to use struct intel_pinctrl") 8a8285707780 ("pinctrl: cherryview: Move custom community members to separate data struct") 0e2d769d4b4e ("pinctrl: cherryview: Drop stale comment") 293428f93260 ("pinctrl: cherryview: Re-use data structures from pinctrl-intel.h (part 3)") bfc8a4baec93 ("pinctrl: cherryview: Convert chv_writel() to use chv_padreg()") 99fd6512278e ("pinctrl: cherryview: Introduce helpers to IO with common registers") 4e7293e3a2a3 ("pinctrl: cherryview: Introduce chv_readl() helper") 3dbf1ee6abbb ("pinctrl: cherryview: Add missing spinlock usage in chv_gpio_irq_handler") 36ad7b24486a ("pinctrl: cherryview: Re-use data structures from pinctrl-intel.h (part 2)") b9a19bdbc843 ("pinctrl: cherryview: Pass irqchip when adding gpiochip") bd90633a5c54 ("pinctrl: cherryview: Add GPIO <-> pin mapping ranges via callback") 82d9beb4b7f7 ("pinctrl: cherryview: Split out irq hw-init into a separate helper function") 8ae93b5ed9be ("pinctrl: cherryview: Missed type change to unsigned int") e58e177392b9 ("pinctrl: cherryview: Allocate IRQ chip dynamic") 17d49c6258e6 ("pinctrl: cherryview: Fix spelling mistake in the comment") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From d5301c90716a8e20bc961a348182daca00c8e8f0 Mon Sep 17 00:00:00 2001 From: Raag Jadav <raag.jadav(a)intel.com> Date: Tue, 22 Aug 2023 12:53:40 +0530 Subject: [PATCH] pinctrl: cherryview: fix address_space_handler() argument First argument of acpi_*_address_space_handler() APIs is acpi_handle of the device, which is incorrectly passed in driver ->remove() path here. Fix it by passing the appropriate argument and while at it, make both API calls consistent using ACPI_HANDLE(). Fixes: a0b028597d59 ("pinctrl: cherryview: Add support for GMMR GPIO opregion") Cc: stable(a)vger.kernel.org Signed-off-by: Raag Jadav <raag.jadav(a)intel.com> Acked-by: Mika Westerberg <mika.westerberg(a)linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c index 55a42dbf97b6..81ee949b946d 100644 --- a/drivers/pinctrl/intel/pinctrl-cherryview.c +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c @@ -1649,7 +1649,6 @@ static int chv_pinctrl_probe(struct platform_device *pdev) struct intel_community_context *cctx; struct intel_community *community; struct device *dev = &pdev->dev; - struct acpi_device *adev = ACPI_COMPANION(dev); struct intel_pinctrl *pctrl; acpi_status status; unsigned int i; @@ -1717,7 +1716,7 @@ static int chv_pinctrl_probe(struct platform_device *pdev) if (ret) return ret; - status = acpi_install_address_space_handler(adev->handle, + status = acpi_install_address_space_handler(ACPI_HANDLE(dev), community->acpi_space_id, chv_pinctrl_mmio_access_handler, NULL, pctrl); @@ -1734,7 +1733,7 @@ static int chv_pinctrl_remove(struct platform_device *pdev) struct intel_pinctrl *pctrl = platform_get_drvdata(pdev); const struct intel_community *community = &pctrl->communities[0]; - acpi_remove_address_space_handler(ACPI_COMPANION(&pdev->dev), + acpi_remove_address_space_handler(ACPI_HANDLE(&pdev->dev), community->acpi_space_id, chv_pinctrl_mmio_access_handler);

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 91994e59079dcb455783d3f9ea338eea6f671af3 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091359-preppy-domestic-2bdc@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 91994e59079d ("ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 91994e59079dcb455783d3f9ea338eea6f671af3 Mon Sep 17 00:00:00 2001 From: Aleksey Nasibulin <alealexpro100(a)ya.ru> Date: Wed, 12 Jul 2023 03:40:17 +0200 Subject: [PATCH] ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Linksys ea6500-v2 have 256MB of ram. Currently we only use 128MB. Expand the definition to use all the available RAM. Fixes: 03e96644d7a8 ("ARM: dts: BCM5301X: Add basic DT for Linksys EA6500 V2") Signed-off-by: Aleksey Nasibulin <alealexpro100(a)ya.ru> Signed-off-by: Christian Marangi <ansuelsmth(a)gmail.com> Cc: stable(a)vger.kernel.org Acked-by: Rafał Miłecki <rafal(a)milecki.pl> Link: https://lore.kernel.org/r/20230712014017.28123-1-ansuelsmth@gmail.com Signed-off-by: Florian Fainelli <florian.fainelli(a)broadcom.com> diff --git a/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts b/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts index f1412ba83def..0454423fe166 100644 --- a/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts +++ b/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts @@ -19,7 +19,8 @@ chosen { memory@0 { device_type = "memory"; - reg = <0x00000000 0x08000000>; + reg = <0x00000000 0x08000000>, + <0x88000000 0x08000000>; }; gpio-keys {

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 91994e59079dcb455783d3f9ea338eea6f671af3 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091358-uncoated-stinging-119f@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 91994e59079d ("ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 91994e59079dcb455783d3f9ea338eea6f671af3 Mon Sep 17 00:00:00 2001 From: Aleksey Nasibulin <alealexpro100(a)ya.ru> Date: Wed, 12 Jul 2023 03:40:17 +0200 Subject: [PATCH] ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Linksys ea6500-v2 have 256MB of ram. Currently we only use 128MB. Expand the definition to use all the available RAM. Fixes: 03e96644d7a8 ("ARM: dts: BCM5301X: Add basic DT for Linksys EA6500 V2") Signed-off-by: Aleksey Nasibulin <alealexpro100(a)ya.ru> Signed-off-by: Christian Marangi <ansuelsmth(a)gmail.com> Cc: stable(a)vger.kernel.org Acked-by: Rafał Miłecki <rafal(a)milecki.pl> Link: https://lore.kernel.org/r/20230712014017.28123-1-ansuelsmth@gmail.com Signed-off-by: Florian Fainelli <florian.fainelli(a)broadcom.com> diff --git a/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts b/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts index f1412ba83def..0454423fe166 100644 --- a/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts +++ b/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts @@ -19,7 +19,8 @@ chosen { memory@0 { device_type = "memory"; - reg = <0x00000000 0x08000000>; + reg = <0x00000000 0x08000000>, + <0x88000000 0x08000000>; }; gpio-keys {

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 91994e59079dcb455783d3f9ea338eea6f671af3 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091357-hypnoses-slurp-55e5@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 91994e59079d ("ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 91994e59079dcb455783d3f9ea338eea6f671af3 Mon Sep 17 00:00:00 2001 From: Aleksey Nasibulin <alealexpro100(a)ya.ru> Date: Wed, 12 Jul 2023 03:40:17 +0200 Subject: [PATCH] ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Linksys ea6500-v2 have 256MB of ram. Currently we only use 128MB. Expand the definition to use all the available RAM. Fixes: 03e96644d7a8 ("ARM: dts: BCM5301X: Add basic DT for Linksys EA6500 V2") Signed-off-by: Aleksey Nasibulin <alealexpro100(a)ya.ru> Signed-off-by: Christian Marangi <ansuelsmth(a)gmail.com> Cc: stable(a)vger.kernel.org Acked-by: Rafał Miłecki <rafal(a)milecki.pl> Link: https://lore.kernel.org/r/20230712014017.28123-1-ansuelsmth@gmail.com Signed-off-by: Florian Fainelli <florian.fainelli(a)broadcom.com> diff --git a/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts b/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts index f1412ba83def..0454423fe166 100644 --- a/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts +++ b/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts @@ -19,7 +19,8 @@ chosen { memory@0 { device_type = "memory"; - reg = <0x00000000 0x08000000>; + reg = <0x00000000 0x08000000>, + <0x88000000 0x08000000>; }; gpio-keys {

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 91994e59079dcb455783d3f9ea338eea6f671af3 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091356-hangnail-unmovable-37c8@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 91994e59079d ("ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 91994e59079dcb455783d3f9ea338eea6f671af3 Mon Sep 17 00:00:00 2001 From: Aleksey Nasibulin <alealexpro100(a)ya.ru> Date: Wed, 12 Jul 2023 03:40:17 +0200 Subject: [PATCH] ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Linksys ea6500-v2 have 256MB of ram. Currently we only use 128MB. Expand the definition to use all the available RAM. Fixes: 03e96644d7a8 ("ARM: dts: BCM5301X: Add basic DT for Linksys EA6500 V2") Signed-off-by: Aleksey Nasibulin <alealexpro100(a)ya.ru> Signed-off-by: Christian Marangi <ansuelsmth(a)gmail.com> Cc: stable(a)vger.kernel.org Acked-by: Rafał Miłecki <rafal(a)milecki.pl> Link: https://lore.kernel.org/r/20230712014017.28123-1-ansuelsmth@gmail.com Signed-off-by: Florian Fainelli <florian.fainelli(a)broadcom.com> diff --git a/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts b/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts index f1412ba83def..0454423fe166 100644 --- a/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts +++ b/arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts @@ -19,7 +19,8 @@ chosen { memory@0 { device_type = "memory"; - reg = <0x00000000 0x08000000>; + reg = <0x00000000 0x08000000>, + <0x88000000 0x08000000>; }; gpio-keys {

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y git checkout FETCH_HEAD git cherry-pick -x 7c74379afdfee7b13f1cd8ff1ad6e0f986aec96c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091332-luminance-favoring-097e@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: 7c74379afdfe ("ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode") 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") 86684c2481b6 ("ARM: dts: Add .dts files missing from the build") 313c22bb3195 ("Merge tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux into soc/dt") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7c74379afdfee7b13f1cd8ff1ad6e0f986aec96c Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Date: Thu, 20 Jul 2023 13:53:35 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode There is no syna,nosleep property in Synaptics RMI4 touchscreen: qcom-msm8974pro-sony-xperia-shinano-castor.dtb: synaptics@2c: rmi4-f01@1: 'syna,nosleep' does not match any of the regexes: 'pinctrl-[0-9]+' Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20230720115335.137354-6-krzysztof.kozlowski@linar… Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 726ed67415e1..11468d1409f7 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -127,7 +127,7 @@ synaptics@2c { rmi4-f01@1 { reg = <0x1>; - syna,nosleep = <1>; + syna,nosleep-mode = <1>; }; rmi4-f11@11 {

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 7c74379afdfee7b13f1cd8ff1ad6e0f986aec96c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091331-garnet-parabola-1d4a@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 7c74379afdfe ("ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode") 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") 86684c2481b6 ("ARM: dts: Add .dts files missing from the build") 313c22bb3195 ("Merge tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux into soc/dt") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7c74379afdfee7b13f1cd8ff1ad6e0f986aec96c Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Date: Thu, 20 Jul 2023 13:53:35 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode There is no syna,nosleep property in Synaptics RMI4 touchscreen: qcom-msm8974pro-sony-xperia-shinano-castor.dtb: synaptics@2c: rmi4-f01@1: 'syna,nosleep' does not match any of the regexes: 'pinctrl-[0-9]+' Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20230720115335.137354-6-krzysztof.kozlowski@linar… Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 726ed67415e1..11468d1409f7 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -127,7 +127,7 @@ synaptics@2c { rmi4-f01@1 { reg = <0x1>; - syna,nosleep = <1>; + syna,nosleep-mode = <1>; }; rmi4-f11@11 {

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 7c74379afdfee7b13f1cd8ff1ad6e0f986aec96c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091330-blog-morbidly-92f3@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 7c74379afdfe ("ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode") 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") 86684c2481b6 ("ARM: dts: Add .dts files missing from the build") 313c22bb3195 ("Merge tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux into soc/dt") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7c74379afdfee7b13f1cd8ff1ad6e0f986aec96c Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Date: Thu, 20 Jul 2023 13:53:35 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode There is no syna,nosleep property in Synaptics RMI4 touchscreen: qcom-msm8974pro-sony-xperia-shinano-castor.dtb: synaptics@2c: rmi4-f01@1: 'syna,nosleep' does not match any of the regexes: 'pinctrl-[0-9]+' Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20230720115335.137354-6-krzysztof.kozlowski@linar… Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 726ed67415e1..11468d1409f7 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -127,7 +127,7 @@ synaptics@2c { rmi4-f01@1 { reg = <0x1>; - syna,nosleep = <1>; + syna,nosleep-mode = <1>; }; rmi4-f11@11 {

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 7c74379afdfee7b13f1cd8ff1ad6e0f986aec96c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091329-twenty-cardboard-b45c@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 7c74379afdfe ("ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode") 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") 86684c2481b6 ("ARM: dts: Add .dts files missing from the build") 313c22bb3195 ("Merge tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux into soc/dt") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7c74379afdfee7b13f1cd8ff1ad6e0f986aec96c Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Date: Thu, 20 Jul 2023 13:53:35 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode There is no syna,nosleep property in Synaptics RMI4 touchscreen: qcom-msm8974pro-sony-xperia-shinano-castor.dtb: synaptics@2c: rmi4-f01@1: 'syna,nosleep' does not match any of the regexes: 'pinctrl-[0-9]+' Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20230720115335.137354-6-krzysztof.kozlowski@linar… Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 726ed67415e1..11468d1409f7 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -127,7 +127,7 @@ synaptics@2c { rmi4-f01@1 { reg = <0x1>; - syna,nosleep = <1>; + syna,nosleep-mode = <1>; }; rmi4-f11@11 {

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 7c74379afdfee7b13f1cd8ff1ad6e0f986aec96c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091328-pretty-overcome-38ed@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 7c74379afdfe ("ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7c74379afdfee7b13f1cd8ff1ad6e0f986aec96c Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Date: Thu, 20 Jul 2023 13:53:35 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode There is no syna,nosleep property in Synaptics RMI4 touchscreen: qcom-msm8974pro-sony-xperia-shinano-castor.dtb: synaptics@2c: rmi4-f01@1: 'syna,nosleep' does not match any of the regexes: 'pinctrl-[0-9]+' Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20230720115335.137354-6-krzysztof.kozlowski@linar… Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 726ed67415e1..11468d1409f7 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -127,7 +127,7 @@ synaptics@2c { rmi4-f01@1 { reg = <0x1>; - syna,nosleep = <1>; + syna,nosleep-mode = <1>; }; rmi4-f11@11 {

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y git checkout FETCH_HEAD git cherry-pick -x 31fba16c19c45b2b3a7c23b0bfef80aed1b29050 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091318-commend-stiffly-dbd6@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: 31fba16c19c4 ("ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names") 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") 86684c2481b6 ("ARM: dts: Add .dts files missing from the build") 313c22bb3195 ("Merge tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux into soc/dt") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 31fba16c19c45b2b3a7c23b0bfef80aed1b29050 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Date: Thu, 20 Jul 2023 13:53:34 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names The node names for functions of Synaptics RMI4 touchscreen must be as "rmi4-fXX", as required by bindings and Linux driver. qcom-msm8974pro-sony-xperia-shinano-castor.dtb: synaptics@2c: Unevaluated properties are not allowed ('rmi-f01@1', 'rmi-f11@11' were unexpected) Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20230720115335.137354-5-krzysztof.kozlowski@linar… Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index c41e25367bc9..726ed67415e1 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -125,12 +125,12 @@ synaptics@2c { syna,startup-delay-ms = <100>; - rmi-f01@1 { + rmi4-f01@1 { reg = <0x1>; syna,nosleep = <1>; }; - rmi-f11@11 { + rmi4-f11@11 { reg = <0x11>; syna,sensor-type = <1>; touchscreen-inverted-x;

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 31fba16c19c45b2b3a7c23b0bfef80aed1b29050 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091317-constrict-rewind-760c@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 31fba16c19c4 ("ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names") 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") 86684c2481b6 ("ARM: dts: Add .dts files missing from the build") 313c22bb3195 ("Merge tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux into soc/dt") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 31fba16c19c45b2b3a7c23b0bfef80aed1b29050 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Date: Thu, 20 Jul 2023 13:53:34 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names The node names for functions of Synaptics RMI4 touchscreen must be as "rmi4-fXX", as required by bindings and Linux driver. qcom-msm8974pro-sony-xperia-shinano-castor.dtb: synaptics@2c: Unevaluated properties are not allowed ('rmi-f01@1', 'rmi-f11@11' were unexpected) Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20230720115335.137354-5-krzysztof.kozlowski@linar… Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index c41e25367bc9..726ed67415e1 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -125,12 +125,12 @@ synaptics@2c { syna,startup-delay-ms = <100>; - rmi-f01@1 { + rmi4-f01@1 { reg = <0x1>; syna,nosleep = <1>; }; - rmi-f11@11 { + rmi4-f11@11 { reg = <0x11>; syna,sensor-type = <1>; touchscreen-inverted-x;

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 31fba16c19c45b2b3a7c23b0bfef80aed1b29050 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091316-croak-supermom-888e@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 31fba16c19c4 ("ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names") 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") 86684c2481b6 ("ARM: dts: Add .dts files missing from the build") 313c22bb3195 ("Merge tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux into soc/dt") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 31fba16c19c45b2b3a7c23b0bfef80aed1b29050 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Date: Thu, 20 Jul 2023 13:53:34 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names The node names for functions of Synaptics RMI4 touchscreen must be as "rmi4-fXX", as required by bindings and Linux driver. qcom-msm8974pro-sony-xperia-shinano-castor.dtb: synaptics@2c: Unevaluated properties are not allowed ('rmi-f01@1', 'rmi-f11@11' were unexpected) Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20230720115335.137354-5-krzysztof.kozlowski@linar… Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index c41e25367bc9..726ed67415e1 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -125,12 +125,12 @@ synaptics@2c { syna,startup-delay-ms = <100>; - rmi-f01@1 { + rmi4-f01@1 { reg = <0x1>; syna,nosleep = <1>; }; - rmi-f11@11 { + rmi4-f11@11 { reg = <0x11>; syna,sensor-type = <1>; touchscreen-inverted-x;

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 31fba16c19c45b2b3a7c23b0bfef80aed1b29050 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091315-outline-rasping-d81e@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 31fba16c19c4 ("ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names") 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") 86684c2481b6 ("ARM: dts: Add .dts files missing from the build") 313c22bb3195 ("Merge tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux into soc/dt") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 31fba16c19c45b2b3a7c23b0bfef80aed1b29050 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Date: Thu, 20 Jul 2023 13:53:34 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names The node names for functions of Synaptics RMI4 touchscreen must be as "rmi4-fXX", as required by bindings and Linux driver. qcom-msm8974pro-sony-xperia-shinano-castor.dtb: synaptics@2c: Unevaluated properties are not allowed ('rmi-f01@1', 'rmi-f11@11' were unexpected) Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20230720115335.137354-5-krzysztof.kozlowski@linar… Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index c41e25367bc9..726ed67415e1 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -125,12 +125,12 @@ synaptics@2c { syna,startup-delay-ms = <100>; - rmi-f01@1 { + rmi4-f01@1 { reg = <0x1>; syna,nosleep = <1>; }; - rmi-f11@11 { + rmi4-f11@11 { reg = <0x11>; syna,sensor-type = <1>; touchscreen-inverted-x;

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 31fba16c19c45b2b3a7c23b0bfef80aed1b29050 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091313-delusion-urologist-35ec@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 31fba16c19c4 ("ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 31fba16c19c45b2b3a7c23b0bfef80aed1b29050 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Date: Thu, 20 Jul 2023 13:53:34 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names The node names for functions of Synaptics RMI4 touchscreen must be as "rmi4-fXX", as required by bindings and Linux driver. qcom-msm8974pro-sony-xperia-shinano-castor.dtb: synaptics@2c: Unevaluated properties are not allowed ('rmi-f01@1', 'rmi-f11@11' were unexpected) Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20230720115335.137354-5-krzysztof.kozlowski@linar… Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index c41e25367bc9..726ed67415e1 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -125,12 +125,12 @@ synaptics@2c { syna,startup-delay-ms = <100>; - rmi-f01@1 { + rmi4-f01@1 { reg = <0x1>; syna,nosleep = <1>; }; - rmi-f11@11 { + rmi4-f11@11 { reg = <0x11>; syna,sensor-type = <1>; touchscreen-inverted-x;

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct inverted X of" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y git checkout FETCH_HEAD git cherry-pick -x 43db69268149049540b1d2bbe8a69e59d5cb43b6 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091356-suffering-trickily-50f2@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: 43db69268149 ("ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen") 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") 86684c2481b6 ("ARM: dts: Add .dts files missing from the build") 313c22bb3195 ("Merge tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux into soc/dt") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 43db69268149049540b1d2bbe8a69e59d5cb43b6 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Date: Thu, 20 Jul 2023 13:53:33 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen There is no syna,f11-flip-x property, so assume intention was to use touchscreen-inverted-x. Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20230720115335.137354-4-krzysztof.kozlowski@linar… Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 154639d56f35..c41e25367bc9 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -132,8 +132,8 @@ rmi-f01@1 { rmi-f11@11 { reg = <0x11>; - syna,f11-flip-x = <1>; syna,sensor-type = <1>; + touchscreen-inverted-x; }; }; };

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct inverted X of" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 43db69268149049540b1d2bbe8a69e59d5cb43b6 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091355-brewery-playhouse-5786@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 43db69268149 ("ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen") 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") 86684c2481b6 ("ARM: dts: Add .dts files missing from the build") 313c22bb3195 ("Merge tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux into soc/dt") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 43db69268149049540b1d2bbe8a69e59d5cb43b6 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Date: Thu, 20 Jul 2023 13:53:33 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen There is no syna,f11-flip-x property, so assume intention was to use touchscreen-inverted-x. Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20230720115335.137354-4-krzysztof.kozlowski@linar… Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 154639d56f35..c41e25367bc9 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -132,8 +132,8 @@ rmi-f01@1 { rmi-f11@11 { reg = <0x11>; - syna,f11-flip-x = <1>; syna,sensor-type = <1>; + touchscreen-inverted-x; }; }; };

2 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct inverted X of" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 43db69268149049540b1d2bbe8a69e59d5cb43b6 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023091354-those-sanctuary-1380@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 43db69268149 ("ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen") 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") 86684c2481b6 ("ARM: dts: Add .dts files missing from the build") 313c22bb3195 ("Merge tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux into soc/dt") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 43db69268149049540b1d2bbe8a69e59d5cb43b6 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Date: Thu, 20 Jul 2023 13:53:33 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen There is no syna,f11-flip-x property, so assume intention was to use touchscreen-inverted-x. Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Link: https://lore.kernel.org/r/20230720115335.137354-4-krzysztof.kozlowski@linar… Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 154639d56f35..c41e25367bc9 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -132,8 +132,8 @@ rmi-f01@1 { rmi-f11@11 { reg = <0x11>; - syna,f11-flip-x = <1>; syna,sensor-type = <1>; + touchscreen-inverted-x; }; }; };

2 years, 1 month

1
0
0 0