On Mon, Mar 4, 2024 at 5:15 AM <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > This is a note to let you know that I've just added the patch titled > > Revert "interconnect: Teach lockdep about icc_bw_lock order" > > to the 5.15-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > The filename of the patch is: > revert-interconnect-teach-lockdep-about-icc_bw_lock-order.patch > and it can be found in the queue-5.15 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > From 705e471bdd5262d48ca5462efd1292a34d9726b0 Mon Sep 17 00:00:00 2001 > From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Date: Mon, 4 Mar 2024 14:12:15 +0100 > Subject: Revert "interconnect: Teach lockdep about icc_bw_lock order" > > From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > This reverts commit e3a29b80e9e6df217dd61c670ac42864fa4a0e67 which is > commit 13619170303878e1dae86d9a58b039475c957fcf upstream. > > It is reported to cause boot crashes in Android systems, so revert it > from the stable trees for now. Sorry, I didn't see the reported crash (could someone link to the discussion?), but was it possibly a lockdep splat? Ie. exactly what this patch was intended to catch? BR, -R > Cc: Rob Clark <robdclark@xxxxxxxxxxxx> > Cc: Georgi Djakov <djakov@xxxxxxxxxx> > Cc: Guenter Roeck <linux@xxxxxxxxxxxx> > Cc: Jon Hunter <jonathanh@xxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > --- > drivers/interconnect/core.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > --- a/drivers/interconnect/core.c > +++ b/drivers/interconnect/core.c > @@ -1135,21 +1135,13 @@ void icc_sync_state(struct device *dev) > } > } > } > - mutex_unlock(&icc_bw_lock); > mutex_unlock(&icc_lock); > } > EXPORT_SYMBOL_GPL(icc_sync_state); > > static int __init icc_init(void) > { > - struct device_node *root; > - > - /* Teach lockdep about lock ordering wrt. shrinker: */ > - fs_reclaim_acquire(GFP_KERNEL); > - might_lock(&icc_bw_lock); > - fs_reclaim_release(GFP_KERNEL); > - > - root = of_find_node_by_path("/"); > + struct device_node *root = of_find_node_by_path("/"); > > providers_count = of_count_icc_providers(root); > of_node_put(root); > > > Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are > > queue-5.15/revert-drm-bridge-lt8912b-register-and-attach-our-dsi-device-at-probe.patch > queue-5.15/mptcp-push-at-dss-boundaries.patch > queue-5.15/selftests-mptcp-add-missing-kconfig-for-nf-filter.patch > queue-5.15/mmc-core-fix-emmc-initialization-with-1-bit-bus-connection.patch > queue-5.15/alsa-firewire-lib-fix-to-check-cycle-continuity.patch > queue-5.15/netfilter-nf_tables-disallow-timeout-for-anonymous-sets.patch > queue-5.15/af_unix-drop-oob_skb-ref-before-purging-queue-in-gc.patch > queue-5.15/selftests-mptcp-add-missing-kconfig-for-nf-filter-in-v6.patch > queue-5.15/dmaengine-ptdma-use-consistent-dma-masks.patch > queue-5.15/dmaengine-fsl-qdma-init-irq-after-reg-initialization.patch > queue-5.15/mptcp-add-needs_id-for-netlink-appending-addr.patch > queue-5.15/mptcp-rename-timer-related-helper-to-less-confusing-names.patch > queue-5.15/fs-aio-make-io_cancel-generate-completions-again.patch > queue-5.15/riscv-add-caller_addrx-support.patch > queue-5.15/wifi-nl80211-reject-iftype-change-with-mesh-id-change.patch > queue-5.15/mptcp-process-pending-subflow-error-on-close.patch > queue-5.15/revert-interconnect-fix-locking-for-runpm-vs-reclaim.patch > queue-5.15/x86-cpu-intel-detect-tme-keyid-bits-before-setting-mtrr-mask-registers.patch > queue-5.15/mptcp-fix-possible-deadlock-in-subflow-diag.patch > queue-5.15/mmc-sdhci-xenon-fix-phy-init-clock-stability.patch > queue-5.15/tomoyo-fix-uaf-write-bug-in-tomoyo_write_control.patch > queue-5.15/mptcp-clean-up-harmless-false-expressions.patch > queue-5.15/fs-hugetlb-fix-null-pointer-dereference-in-hugetlbs_fill_superpatch > queue-5.15/gtp-fix-use-after-free-and-null-ptr-deref-in-gtp_newlink.patch > queue-5.15/revert-interconnect-teach-lockdep-about-icc_bw_lock-order.patch > queue-5.15/btrfs-dev-replace-properly-validate-device-names.patch > queue-5.15/mptcp-move-__mptcp_error_report-in-protocol.c.patch > queue-5.15/pmdomain-qcom-rpmhpd-fix-enabled_corner-aggregation.patch > queue-5.15/cachefiles-fix-memory-leak-in-cachefiles_add_cache.patch > queue-5.15/mmc-sdhci-xenon-add-timeout-for-phy-init-complete.patch > queue-5.15/dmaengine-fsl-qdma-fix-soc-may-hang-on-16-byte-unaligned-read.patch
