From 8545de008952d58bd1b3b2a36fd372c3f6349afd Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Fri, 2 Sep 2022 00:23:49 -0400 Subject: [PATCH] Fixes for 5.19 Signed-off-by: Sasha Levin --- ...-cs8409-support-new-dolphin-variants.patch | 37 ++ ...-add-quirks-for-asus-zenbooks-using-.patch | 43 ++ ...40-fix-the-jd-voltage-dropping-issue.patch | 46 ++ ...mprove-error-handling-in-rz_ssi_prob.patch | 79 ++++ ...p-splat-with-reloc-root-extent-buffe.patch | 367 +++++++++++++++ ...e-lockdep-class-helpers-to-locking.c.patch | 248 ++++++++++ ...er-check-for-overlapping-extent-item.patch | 77 ++++ ...add-a-missing-register-field-for-hpo.patch | 39 ++ ...ay-avoid-doing-vm_init-multiple-time.patch | 47 ++ ...-amd-display-avoid-mpc-infinite-loop.patch | 66 +++ ...clear-optc-underflow-before-turn-off.patch | 45 ++ ...device-flash-garbage-before-get-in-o.patch | 42 ++ ...lay-fix-hdmi-vsif-v3-incorrect-issue.patch | 77 ++++ ...-display-fix-pixel-clock-programming.patch | 50 ++ ...fix-plug-unplug-external-monitor-wil.patch | 56 +++ ...fix-tdr-edp-and-usb4-display-light-u.patch | 59 +++ ...splay-for-stereo-keep-flip_any_frame.patch | 40 ++ ...issing-fini_microcode-interface-for-.patch | 34 ++ ...issing-fini_xxxx-interfaces-for-some.patch | 51 +++ ...-potential-gpu_metrics_table-memory-.patch | 38 ++ ...kip-pptable-override-for-smu_v13_0_7.patch | 50 ++ ...-decode_iv_ts-helper-for-ih_v6-block.patch | 34 ++ ...dd-secure-display-ta-load-for-renoir.patch | 43 ++ ...le-3dcgcg-cgls-temporarily-due-to-st.patch | 37 ++ ...x-interrupt-handling-on-ih_soft-ring.patch | 112 +++++ ...increase-tlb-flush-timeout-for-sriov.patch | 87 ++++ ...dle-restart-of-kfd_ioctl_wait_events.patch | 127 ++++++ ...ntfs3-fix-work-with-fragmented-xattr.patch | 46 ++ ...ve-dos-attribute-xattr-on-o_trunc-op.patch | 55 +++ ...tus_bad_network_name-error-status-if.patch | 53 +++ ...lear-interrupts-when-cqe-off-disable.patch | 60 +++ ...mshc-add-reset-call-back-for-rockchi.patch | 93 ++++ ...mshc-re-enable-support-for-the-bluef.patch | 73 +++ ...i-of-dwcmshc-rename-rk3568-to-rk35xx.patch | 204 +++++++++ ...le-dos-due-to-net-iface-start-stop-l.patch | 129 ++++++ ...checking-for-return-value-of-platfor.patch | 59 +++ ...ack-nf_conntrack_procfs-should-no-lo.patch | 36 ++ ...ial-multi-instantiate-add-clsa0101-l.patch | 36 ++ queue-5.19/rtla-fix-tracer-name.patch | 64 +++ ...-hypfs-avoid-error-message-under-kvm.patch | 60 +++ queue-5.19/series | 41 ++ ...s-nft_flowtable.sh-use-random-netns-.patch | 429 ++++++++++++++++++ 42 files changed, 3469 insertions(+) create mode 100644 queue-5.19/alsa-hda-cs8409-support-new-dolphin-variants.patch create mode 100644 queue-5.19/alsa-hda-realtek-add-quirks-for-asus-zenbooks-using-.patch create mode 100644 queue-5.19/asoc-rt5640-fix-the-jd-voltage-dropping-issue.patch create mode 100644 queue-5.19/asoc-sh-rz-ssi-improve-error-handling-in-rz_ssi_prob.patch create mode 100644 queue-5.19/btrfs-fix-lockdep-splat-with-reloc-root-extent-buffe.patch create mode 100644 queue-5.19/btrfs-move-lockdep-class-helpers-to-locking.c.patch create mode 100644 queue-5.19/btrfs-tree-checker-check-for-overlapping-extent-item.patch create mode 100644 queue-5.19/drm-amd-display-add-a-missing-register-field-for-hpo.patch create mode 100644 queue-5.19/drm-amd-display-avoid-doing-vm_init-multiple-time.patch create mode 100644 queue-5.19/drm-amd-display-avoid-mpc-infinite-loop.patch create mode 100644 queue-5.19/drm-amd-display-clear-optc-underflow-before-turn-off.patch create mode 100644 queue-5.19/drm-amd-display-device-flash-garbage-before-get-in-o.patch create mode 100644 queue-5.19/drm-amd-display-fix-hdmi-vsif-v3-incorrect-issue.patch create mode 100644 queue-5.19/drm-amd-display-fix-pixel-clock-programming.patch create mode 100644 queue-5.19/drm-amd-display-fix-plug-unplug-external-monitor-wil.patch create mode 100644 queue-5.19/drm-amd-display-fix-tdr-edp-and-usb4-display-light-u.patch create mode 100644 queue-5.19/drm-amd-display-for-stereo-keep-flip_any_frame.patch create mode 100644 queue-5.19/drm-amd-pm-add-missing-fini_microcode-interface-for-.patch create mode 100644 queue-5.19/drm-amd-pm-add-missing-fini_xxxx-interfaces-for-some.patch create mode 100644 queue-5.19/drm-amd-pm-fix-a-potential-gpu_metrics_table-memory-.patch create mode 100644 queue-5.19/drm-amd-pm-skip-pptable-override-for-smu_v13_0_7.patch create mode 100644 queue-5.19/drm-amdgpu-add-decode_iv_ts-helper-for-ih_v6-block.patch create mode 100644 queue-5.19/drm-amdgpu-add-secure-display-ta-load-for-renoir.patch create mode 100644 queue-5.19/drm-amdgpu-disable-3dcgcg-cgls-temporarily-due-to-st.patch create mode 100644 queue-5.19/drm-amdgpu-fix-interrupt-handling-on-ih_soft-ring.patch create mode 100644 queue-5.19/drm-amdgpu-increase-tlb-flush-timeout-for-sriov.patch create mode 100644 queue-5.19/drm-amdkfd-handle-restart-of-kfd_ioctl_wait_events.patch create mode 100644 queue-5.19/fs-ntfs3-fix-work-with-fragmented-xattr.patch create mode 100644 queue-5.19/ksmbd-don-t-remove-dos-attribute-xattr-on-o_trunc-op.patch create mode 100644 queue-5.19/ksmbd-return-status_bad_network_name-error-status-if.patch create mode 100644 queue-5.19/mmc-mtk-sd-clear-interrupts-when-cqe-off-disable.patch create mode 100644 queue-5.19/mmc-sdhci-of-dwcmshc-add-reset-call-back-for-rockchi.patch create mode 100644 queue-5.19/mmc-sdhci-of-dwcmshc-re-enable-support-for-the-bluef.patch create mode 100644 queue-5.19/mmc-sdhci-of-dwcmshc-rename-rk3568-to-rk35xx.patch create mode 100644 queue-5.19/neigh-fix-possible-dos-due-to-net-iface-start-stop-l.patch create mode 100644 queue-5.19/net-lan966x-fix-checking-for-return-value-of-platfor.patch create mode 100644 queue-5.19/netfilter-conntrack-nf_conntrack_procfs-should-no-lo.patch create mode 100644 queue-5.19/platform-x86-serial-multi-instantiate-add-clsa0101-l.patch create mode 100644 queue-5.19/rtla-fix-tracer-name.patch create mode 100644 queue-5.19/s390-hypfs-avoid-error-message-under-kvm.patch create mode 100644 queue-5.19/testing-selftests-nft_flowtable.sh-use-random-netns-.patch diff --git a/queue-5.19/alsa-hda-cs8409-support-new-dolphin-variants.patch b/queue-5.19/alsa-hda-cs8409-support-new-dolphin-variants.patch new file mode 100644 index 00000000000..d3e3aebf6ee --- /dev/null +++ b/queue-5.19/alsa-hda-cs8409-support-new-dolphin-variants.patch @@ -0,0 +1,37 @@ +From a81996287e2a119141ead45f27657422990700c0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Aug 2022 16:19:01 +0100 +Subject: ALSA: hda/cs8409: Support new Dolphin Variants + +From: Stefan Binding + +[ Upstream commit 1ff954f9ab054675b9eb02dd14add8f7aa376d71 ] + +Add 4 new Dolphin Systems, same configuration as older systems. + +Signed-off-by: Stefan Binding +Link: https://lore.kernel.org/r/20220816151901.1398007-1-sbinding@opensource.cirrus.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_cs8409-tables.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/sound/pci/hda/patch_cs8409-tables.c b/sound/pci/hda/patch_cs8409-tables.c +index 4f4cc82159179..5b140301ca666 100644 +--- a/sound/pci/hda/patch_cs8409-tables.c ++++ b/sound/pci/hda/patch_cs8409-tables.c +@@ -546,6 +546,10 @@ const struct snd_pci_quirk cs8409_fixup_tbl[] = { + SND_PCI_QUIRK(0x1028, 0x0BD6, "Dolphin", CS8409_DOLPHIN), + SND_PCI_QUIRK(0x1028, 0x0BD7, "Dolphin", CS8409_DOLPHIN), + SND_PCI_QUIRK(0x1028, 0x0BD8, "Dolphin", CS8409_DOLPHIN), ++ SND_PCI_QUIRK(0x1028, 0x0C43, "Dolphin", CS8409_DOLPHIN), ++ SND_PCI_QUIRK(0x1028, 0x0C50, "Dolphin", CS8409_DOLPHIN), ++ SND_PCI_QUIRK(0x1028, 0x0C51, "Dolphin", CS8409_DOLPHIN), ++ SND_PCI_QUIRK(0x1028, 0x0C52, "Dolphin", CS8409_DOLPHIN), + {} /* terminator */ + }; + +-- +2.35.1 + diff --git a/queue-5.19/alsa-hda-realtek-add-quirks-for-asus-zenbooks-using-.patch b/queue-5.19/alsa-hda-realtek-add-quirks-for-asus-zenbooks-using-.patch new file mode 100644 index 00000000000..905b8789c42 --- /dev/null +++ b/queue-5.19/alsa-hda-realtek-add-quirks-for-asus-zenbooks-using-.patch @@ -0,0 +1,43 @@ +From 3fddf7bc14f108692906cb2ed3fb0e6951be41b6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Aug 2022 15:19:53 +0100 +Subject: ALSA: hda/realtek: Add quirks for ASUS Zenbooks using CS35L41 + +From: Stefan Binding + +[ Upstream commit 461122b999bda2ebef2086a35d8990f9ccac5ab8 ] + +These Asus Zenbook laptop use Realtek HDA codec combined with +2xCS35L41 Amplifiers using SPI. + +Signed-off-by: Stefan Binding +Link: https://lore.kernel.org/r/20220815141953.25197-1-sbinding@opensource.cirrus.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_realtek.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 1ae9674fa8a3c..b44b882f8378c 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -9248,6 +9248,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { + SND_PCI_QUIRK(0x1043, 0x1271, "ASUS X430UN", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1043, 0x1290, "ASUS X441SA", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1043, 0x12a0, "ASUS X441UV", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE), ++ SND_PCI_QUIRK(0x1043, 0x12af, "ASUS UX582ZS", ALC245_FIXUP_CS35L41_SPI_2), + SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC), + SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC), + SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE), +@@ -9268,6 +9269,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { + SND_PCI_QUIRK(0x1043, 0x19e1, "ASUS UX581LV", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW), + SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC), ++ SND_PCI_QUIRK(0x1043, 0x1a8f, "ASUS UX582ZS", ALC245_FIXUP_CS35L41_SPI_2), + SND_PCI_QUIRK(0x1043, 0x1b11, "ASUS UX431DA", ALC294_FIXUP_ASUS_COEF_1B), + SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC), + SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE), +-- +2.35.1 + diff --git a/queue-5.19/asoc-rt5640-fix-the-jd-voltage-dropping-issue.patch b/queue-5.19/asoc-rt5640-fix-the-jd-voltage-dropping-issue.patch new file mode 100644 index 00000000000..124afe5c22b --- /dev/null +++ b/queue-5.19/asoc-rt5640-fix-the-jd-voltage-dropping-issue.patch @@ -0,0 +1,46 @@ +From eb670f848335eb332529e0caa1aed1a7fcb66de5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Aug 2022 13:28:36 +0800 +Subject: ASoC: rt5640: Fix the JD voltage dropping issue + +From: Oder Chiou + +[ Upstream commit afb176d45870048eea540991b082208270824037 ] + +The patch fixes the JD voltage dropping issue in the HDA JD using. + +Signed-off-by: Oder Chiou +Reported-by: Mohan Kumar D +Link: https://lore.kernel.org/r/20220808052836.25791-1-oder_chiou@realtek.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/rt5640.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c +index 18b3da9211e32..5ada0d318d0ff 100644 +--- a/sound/soc/codecs/rt5640.c ++++ b/sound/soc/codecs/rt5640.c +@@ -1986,7 +1986,7 @@ static int rt5640_set_bias_level(struct snd_soc_component *component, + snd_soc_component_write(component, RT5640_PWR_MIXER, 0x0000); + if (rt5640->jd_src == RT5640_JD_SRC_HDA_HEADER) + snd_soc_component_write(component, RT5640_PWR_ANLG1, +- 0x0018); ++ 0x2818); + else + snd_soc_component_write(component, RT5640_PWR_ANLG1, + 0x0000); +@@ -2592,7 +2592,8 @@ static void rt5640_enable_hda_jack_detect( + snd_soc_component_update_bits(component, RT5640_DUMMY1, 0x400, 0x0); + + snd_soc_component_update_bits(component, RT5640_PWR_ANLG1, +- RT5640_PWR_VREF2, RT5640_PWR_VREF2); ++ RT5640_PWR_VREF2 | RT5640_PWR_MB | RT5640_PWR_BG, ++ RT5640_PWR_VREF2 | RT5640_PWR_MB | RT5640_PWR_BG); + usleep_range(10000, 15000); + snd_soc_component_update_bits(component, RT5640_PWR_ANLG1, + RT5640_PWR_FV2, RT5640_PWR_FV2); +-- +2.35.1 + diff --git a/queue-5.19/asoc-sh-rz-ssi-improve-error-handling-in-rz_ssi_prob.patch b/queue-5.19/asoc-sh-rz-ssi-improve-error-handling-in-rz_ssi_prob.patch new file mode 100644 index 00000000000..0b286d45ced --- /dev/null +++ b/queue-5.19/asoc-sh-rz-ssi-improve-error-handling-in-rz_ssi_prob.patch @@ -0,0 +1,79 @@ +From ec69f66d9eda51bc00e003b827a0d775cd4b80b2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 28 Jul 2022 10:26:12 +0100 +Subject: ASoC: sh: rz-ssi: Improve error handling in rz_ssi_probe() error path + +From: Biju Das + +[ Upstream commit c75ed9f54ce8d349fee557f2b471a4d637ed2a6b ] + +We usually do cleanup in reverse order of init. Currently in case of +error rz_ssi_release_dma_channels() done in the reverse order. This +patch improves error handling in rz_ssi_probe() error path. + +While at it, use "goto cleanup" style to reduce code duplication. + +Reported-by: Pavel Machek +Signed-off-by: Biju Das +Link: https://lore.kernel.org/r/20220728092612.38858-1-biju.das.jz@bp.renesas.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/sh/rz-ssi.c | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/sh/rz-ssi.c +index e392de7a262ef..3d74acffec11f 100644 +--- a/sound/soc/sh/rz-ssi.c ++++ b/sound/soc/sh/rz-ssi.c +@@ -1016,32 +1016,36 @@ static int rz_ssi_probe(struct platform_device *pdev) + + ssi->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL); + if (IS_ERR(ssi->rstc)) { +- rz_ssi_release_dma_channels(ssi); +- return PTR_ERR(ssi->rstc); ++ ret = PTR_ERR(ssi->rstc); ++ goto err_reset; + } + + reset_control_deassert(ssi->rstc); + pm_runtime_enable(&pdev->dev); + ret = pm_runtime_resume_and_get(&pdev->dev); + if (ret < 0) { +- rz_ssi_release_dma_channels(ssi); +- pm_runtime_disable(ssi->dev); +- reset_control_assert(ssi->rstc); +- return dev_err_probe(ssi->dev, ret, "pm_runtime_resume_and_get failed\n"); ++ dev_err(&pdev->dev, "pm_runtime_resume_and_get failed\n"); ++ goto err_pm; + } + + ret = devm_snd_soc_register_component(&pdev->dev, &rz_ssi_soc_component, + rz_ssi_soc_dai, + ARRAY_SIZE(rz_ssi_soc_dai)); + if (ret < 0) { +- rz_ssi_release_dma_channels(ssi); +- +- pm_runtime_put(ssi->dev); +- pm_runtime_disable(ssi->dev); +- reset_control_assert(ssi->rstc); + dev_err(&pdev->dev, "failed to register snd component\n"); ++ goto err_snd_soc; + } + ++ return 0; ++ ++err_snd_soc: ++ pm_runtime_put(ssi->dev); ++err_pm: ++ pm_runtime_disable(ssi->dev); ++ reset_control_assert(ssi->rstc); ++err_reset: ++ rz_ssi_release_dma_channels(ssi); ++ + return ret; + } + +-- +2.35.1 + diff --git a/queue-5.19/btrfs-fix-lockdep-splat-with-reloc-root-extent-buffe.patch b/queue-5.19/btrfs-fix-lockdep-splat-with-reloc-root-extent-buffe.patch new file mode 100644 index 00000000000..523d602bebd --- /dev/null +++ b/queue-5.19/btrfs-fix-lockdep-splat-with-reloc-root-extent-buffe.patch @@ -0,0 +1,367 @@ +From 0a5213f23c8e9e00626309b02512e482d25f0047 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 26 Jul 2022 16:24:04 -0400 +Subject: btrfs: fix lockdep splat with reloc root extent buffers + +From: Josef Bacik + +[ Upstream commit b40130b23ca4a08c5785d5a3559805916bddba3c ] + +We have been hitting the following lockdep splat with btrfs/187 recently + + WARNING: possible circular locking dependency detected + 5.19.0-rc8+ #775 Not tainted + ------------------------------------------------------ + btrfs/752500 is trying to acquire lock: + ffff97e1875a97b8 (btrfs-treloc-02#2){+.+.}-{3:3}, at: __btrfs_tree_lock+0x24/0x110 + + but task is already holding lock: + ffff97e1875a9278 (btrfs-tree-01/1){+.+.}-{3:3}, at: __btrfs_tree_lock+0x24/0x110 + + which lock already depends on the new lock. + + the existing dependency chain (in reverse order) is: + + -> #2 (btrfs-tree-01/1){+.+.}-{3:3}: + down_write_nested+0x41/0x80 + __btrfs_tree_lock+0x24/0x110 + btrfs_init_new_buffer+0x7d/0x2c0 + btrfs_alloc_tree_block+0x120/0x3b0 + __btrfs_cow_block+0x136/0x600 + btrfs_cow_block+0x10b/0x230 + btrfs_search_slot+0x53b/0xb70 + btrfs_lookup_inode+0x2a/0xa0 + __btrfs_update_delayed_inode+0x5f/0x280 + btrfs_async_run_delayed_root+0x24c/0x290 + btrfs_work_helper+0xf2/0x3e0 + process_one_work+0x271/0x590 + worker_thread+0x52/0x3b0 + kthread+0xf0/0x120 + ret_from_fork+0x1f/0x30 + + -> #1 (btrfs-tree-01){++++}-{3:3}: + down_write_nested+0x41/0x80 + __btrfs_tree_lock+0x24/0x110 + btrfs_search_slot+0x3c3/0xb70 + do_relocation+0x10c/0x6b0 + relocate_tree_blocks+0x317/0x6d0 + relocate_block_group+0x1f1/0x560 + btrfs_relocate_block_group+0x23e/0x400 + btrfs_relocate_chunk+0x4c/0x140 + btrfs_balance+0x755/0xe40 + btrfs_ioctl+0x1ea2/0x2c90 + __x64_sys_ioctl+0x88/0xc0 + do_syscall_64+0x38/0x90 + entry_SYSCALL_64_after_hwframe+0x63/0xcd + + -> #0 (btrfs-treloc-02#2){+.+.}-{3:3}: + __lock_acquire+0x1122/0x1e10 + lock_acquire+0xc2/0x2d0 + down_write_nested+0x41/0x80 + __btrfs_tree_lock+0x24/0x110 + btrfs_lock_root_node+0x31/0x50 + btrfs_search_slot+0x1cb/0xb70 + replace_path+0x541/0x9f0 + merge_reloc_root+0x1d6/0x610 + merge_reloc_roots+0xe2/0x260 + relocate_block_group+0x2c8/0x560 + btrfs_relocate_block_group+0x23e/0x400 + btrfs_relocate_chunk+0x4c/0x140 + btrfs_balance+0x755/0xe40 + btrfs_ioctl+0x1ea2/0x2c90 + __x64_sys_ioctl+0x88/0xc0 + do_syscall_64+0x38/0x90 + entry_SYSCALL_64_after_hwframe+0x63/0xcd + + other info that might help us debug this: + + Chain exists of: + btrfs-treloc-02#2 --> btrfs-tree-01 --> btrfs-tree-01/1 + + Possible unsafe locking scenario: + + CPU0 CPU1 + ---- ---- + lock(btrfs-tree-01/1); + lock(btrfs-tree-01); + lock(btrfs-tree-01/1); + lock(btrfs-treloc-02#2); + + *** DEADLOCK *** + + 7 locks held by btrfs/752500: + #0: ffff97e292fdf460 (sb_writers#12){.+.+}-{0:0}, at: btrfs_ioctl+0x208/0x2c90 + #1: ffff97e284c02050 (&fs_info->reclaim_bgs_lock){+.+.}-{3:3}, at: btrfs_balance+0x55f/0xe40 + #2: ffff97e284c00878 (&fs_info->cleaner_mutex){+.+.}-{3:3}, at: btrfs_relocate_block_group+0x236/0x400 + #3: ffff97e292fdf650 (sb_internal#2){.+.+}-{0:0}, at: merge_reloc_root+0xef/0x610 + #4: ffff97e284c02378 (btrfs_trans_num_writers){++++}-{0:0}, at: join_transaction+0x1a8/0x5a0 + #5: ffff97e284c023a0 (btrfs_trans_num_extwriters){++++}-{0:0}, at: join_transaction+0x1a8/0x5a0 + #6: ffff97e1875a9278 (btrfs-tree-01/1){+.+.}-{3:3}, at: __btrfs_tree_lock+0x24/0x110 + + stack backtrace: + CPU: 1 PID: 752500 Comm: btrfs Not tainted 5.19.0-rc8+ #775 + Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-2.fc32 04/01/2014 + Call Trace: + + dump_stack_lvl+0x56/0x73 + check_noncircular+0xd6/0x100 + ? lock_is_held_type+0xe2/0x140 + __lock_acquire+0x1122/0x1e10 + lock_acquire+0xc2/0x2d0 + ? __btrfs_tree_lock+0x24/0x110 + down_write_nested+0x41/0x80 + ? __btrfs_tree_lock+0x24/0x110 + __btrfs_tree_lock+0x24/0x110 + btrfs_lock_root_node+0x31/0x50 + btrfs_search_slot+0x1cb/0xb70 + ? lock_release+0x137/0x2d0 + ? _raw_spin_unlock+0x29/0x50 + ? release_extent_buffer+0x128/0x180 + replace_path+0x541/0x9f0 + merge_reloc_root+0x1d6/0x610 + merge_reloc_roots+0xe2/0x260 + relocate_block_group+0x2c8/0x560 + btrfs_relocate_block_group+0x23e/0x400 + btrfs_relocate_chunk+0x4c/0x140 + btrfs_balance+0x755/0xe40 + btrfs_ioctl+0x1ea2/0x2c90 + ? lock_is_held_type+0xe2/0x140 + ? lock_is_held_type+0xe2/0x140 + ? __x64_sys_ioctl+0x88/0xc0 + __x64_sys_ioctl+0x88/0xc0 + do_syscall_64+0x38/0x90 + entry_SYSCALL_64_after_hwframe+0x63/0xcd + +This isn't necessarily new, it's just tricky to hit in practice. There +are two competing things going on here. With relocation we create a +snapshot of every fs tree with a reloc tree. Any extent buffers that +get initialized here are initialized with the reloc root lockdep key. +However since it is a snapshot, any blocks that are currently in cache +that originally belonged to the fs tree will have the normal tree +lockdep key set. This creates the lock dependency of + + reloc tree -> normal tree + +for the extent buffer locking during the first phase of the relocation +as we walk down the reloc root to relocate blocks. + +However this is problematic because the final phase of the relocation is +merging the reloc root into the original fs root. This involves +searching down to any keys that exist in the original fs root and then +swapping the relocated block and the original fs root block. We have to +search down to the fs root first, and then go search the reloc root for +the block we need to replace. This creates the dependency of + + normal tree -> reloc tree + +which is why lockdep complains. + +Additionally even if we were to fix this particular mismatch with a +different nesting for the merge case, we're still slotting in a block +that has a owner of the reloc root objectid into a normal tree, so that +block will have its lockdep key set to the tree reloc root, and create a +lockdep splat later on when we wander into that block from the fs root. + +Unfortunately the only solution here is to make sure we do not set the +lockdep key to the reloc tree lockdep key normally, and then reset any +blocks we wander into from the reloc root when we're doing the merged. + +This solves the problem of having mixed tree reloc keys intermixed with +normal tree keys, and then allows us to make sure in the merge case we +maintain the lock order of + + normal tree -> reloc tree + +We handle this by setting a bit on the reloc root when we do the search +for the block we want to relocate, and any block we search into or COW +at that point gets set to the reloc tree key. This works correctly +because we only ever COW down to the parent node, so we aren't resetting +the key for the block we're linking into the fs root. + +With this patch we no longer have the lockdep splat in btrfs/187. + +Signed-off-by: Josef Bacik +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/ctree.c | 3 +++ + fs/btrfs/ctree.h | 2 ++ + fs/btrfs/extent-tree.c | 18 +++++++++++++++++- + fs/btrfs/extent_io.c | 11 ++++++++++- + fs/btrfs/locking.c | 11 +++++++++++ + fs/btrfs/locking.h | 5 +++++ + fs/btrfs/relocation.c | 2 ++ + 7 files changed, 50 insertions(+), 2 deletions(-) + +diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c +index 6e556031a8f3a..ebfa35fe1c38b 100644 +--- a/fs/btrfs/ctree.c ++++ b/fs/btrfs/ctree.c +@@ -2075,6 +2075,9 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root *root, + + if (!p->skip_locking) { + level = btrfs_header_level(b); ++ ++ btrfs_maybe_reset_lockdep_class(root, b); ++ + if (level <= write_lock_level) { + btrfs_tree_lock(b); + p->locks[level] = BTRFS_WRITE_LOCK; +diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h +index 7d3ca3ea0bcec..4d8acd7e63eb5 100644 +--- a/fs/btrfs/ctree.h ++++ b/fs/btrfs/ctree.h +@@ -1146,6 +1146,8 @@ enum { + BTRFS_ROOT_ORPHAN_CLEANUP, + /* This root has a drop operation that was started previously. */ + BTRFS_ROOT_UNFINISHED_DROP, ++ /* This reloc root needs to have its buffers lockdep class reset. */ ++ BTRFS_ROOT_RESET_LOCKDEP_CLASS, + }; + + static inline void btrfs_wake_unfinished_drop(struct btrfs_fs_info *fs_info) +diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c +index ced3fc76063f1..92f3f5ed8bf1e 100644 +--- a/fs/btrfs/extent-tree.c ++++ b/fs/btrfs/extent-tree.c +@@ -4871,6 +4871,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root, + { + struct btrfs_fs_info *fs_info = root->fs_info; + struct extent_buffer *buf; ++ u64 lockdep_owner = owner; + + buf = btrfs_find_create_tree_block(fs_info, bytenr, owner, level); + if (IS_ERR(buf)) +@@ -4889,12 +4890,27 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root, + return ERR_PTR(-EUCLEAN); + } + ++ /* ++ * The reloc trees are just snapshots, so we need them to appear to be ++ * just like any other fs tree WRT lockdep. ++ * ++ * The exception however is in replace_path() in relocation, where we ++ * hold the lock on the original fs root and then search for the reloc ++ * root. At that point we need to make sure any reloc root buffers are ++ * set to the BTRFS_TREE_RELOC_OBJECTID lockdep class in order to make ++ * lockdep happy. ++ */ ++ if (lockdep_owner == BTRFS_TREE_RELOC_OBJECTID && ++ !test_bit(BTRFS_ROOT_RESET_LOCKDEP_CLASS, &root->state)) ++ lockdep_owner = BTRFS_FS_TREE_OBJECTID; ++ + /* + * This needs to stay, because we could allocate a freed block from an + * old tree into a new tree, so we need to make sure this new block is + * set to the appropriate level and owner. + */ +- btrfs_set_buffer_lockdep_class(owner, buf, level); ++ btrfs_set_buffer_lockdep_class(lockdep_owner, buf, level); ++ + __btrfs_tree_lock(buf, nest); + btrfs_clean_tree_block(buf); + clear_bit(EXTENT_BUFFER_STALE, &buf->bflags); +diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c +index cda25018ebd74..5785ed241f6f8 100644 +--- a/fs/btrfs/extent_io.c ++++ b/fs/btrfs/extent_io.c +@@ -6228,6 +6228,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, + struct extent_buffer *exists = NULL; + struct page *p; + struct address_space *mapping = fs_info->btree_inode->i_mapping; ++ u64 lockdep_owner = owner_root; + int uptodate = 1; + int ret; + +@@ -6252,7 +6253,15 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, + eb = __alloc_extent_buffer(fs_info, start, len); + if (!eb) + return ERR_PTR(-ENOMEM); +- btrfs_set_buffer_lockdep_class(owner_root, eb, level); ++ ++ /* ++ * The reloc trees are just snapshots, so we need them to appear to be ++ * just like any other fs tree WRT lockdep. ++ */ ++ if (lockdep_owner == BTRFS_TREE_RELOC_OBJECTID) ++ lockdep_owner = BTRFS_FS_TREE_OBJECTID; ++ ++ btrfs_set_buffer_lockdep_class(lockdep_owner, eb, level); + + num_pages = num_extent_pages(eb); + for (i = 0; i < num_pages; i++, index++) { +diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c +index 5747c63929df7..9063072b399bd 100644 +--- a/fs/btrfs/locking.c ++++ b/fs/btrfs/locking.c +@@ -91,6 +91,13 @@ void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb, int + lockdep_set_class_and_name(&eb->lock, &ks->keys[level], ks->names[level]); + } + ++void btrfs_maybe_reset_lockdep_class(struct btrfs_root *root, struct extent_buffer *eb) ++{ ++ if (test_bit(BTRFS_ROOT_RESET_LOCKDEP_CLASS, &root->state)) ++ btrfs_set_buffer_lockdep_class(root->root_key.objectid, ++ eb, btrfs_header_level(eb)); ++} ++ + #endif + + /* +@@ -244,6 +251,8 @@ struct extent_buffer *btrfs_lock_root_node(struct btrfs_root *root) + + while (1) { + eb = btrfs_root_node(root); ++ ++ btrfs_maybe_reset_lockdep_class(root, eb); + btrfs_tree_lock(eb); + if (eb == root->node) + break; +@@ -265,6 +274,8 @@ struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root) + + while (1) { + eb = btrfs_root_node(root); ++ ++ btrfs_maybe_reset_lockdep_class(root, eb); + btrfs_tree_read_lock(eb); + if (eb == root->node) + break; +diff --git a/fs/btrfs/locking.h b/fs/btrfs/locking.h +index b21372cab8409..ab268be09bb54 100644 +--- a/fs/btrfs/locking.h ++++ b/fs/btrfs/locking.h +@@ -133,11 +133,16 @@ void btrfs_drew_read_unlock(struct btrfs_drew_lock *lock); + + #ifdef CONFIG_DEBUG_LOCK_ALLOC + void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb, int level); ++void btrfs_maybe_reset_lockdep_class(struct btrfs_root *root, struct extent_buffer *eb); + #else + static inline void btrfs_set_buffer_lockdep_class(u64 objectid, + struct extent_buffer *eb, int level) + { + } ++static inline void btrfs_maybe_reset_lockdep_class(struct btrfs_root *root, ++ struct extent_buffer *eb) ++{ ++} + #endif + + #endif +diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c +index 33411baf5c7a3..45c02aba2492b 100644 +--- a/fs/btrfs/relocation.c ++++ b/fs/btrfs/relocation.c +@@ -1326,7 +1326,9 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc, + btrfs_release_path(path); + + path->lowest_level = level; ++ set_bit(BTRFS_ROOT_RESET_LOCKDEP_CLASS, &src->state); + ret = btrfs_search_slot(trans, src, &key, path, 0, 1); ++ clear_bit(BTRFS_ROOT_RESET_LOCKDEP_CLASS, &src->state); + path->lowest_level = 0; + if (ret) { + if (ret > 0) +-- +2.35.1 + diff --git a/queue-5.19/btrfs-move-lockdep-class-helpers-to-locking.c.patch b/queue-5.19/btrfs-move-lockdep-class-helpers-to-locking.c.patch new file mode 100644 index 00000000000..8f11fedb053 --- /dev/null +++ b/queue-5.19/btrfs-move-lockdep-class-helpers-to-locking.c.patch @@ -0,0 +1,248 @@ +From 2d4092aea38d9f059ab998eb9a2bb9c603339582 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 26 Jul 2022 16:24:03 -0400 +Subject: btrfs: move lockdep class helpers to locking.c + +From: Josef Bacik + +[ Upstream commit 0a27a0474d146eb79e09ec88bf0d4229f4cfc1b8 ] + +These definitions exist in disk-io.c, which is not related to the +locking. Move this over to locking.h/c where it makes more sense. + +Reviewed-by: Johannes Thumshirn +Signed-off-by: Josef Bacik +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/disk-io.c | 82 ---------------------------------------------- + fs/btrfs/disk-io.h | 10 ------ + fs/btrfs/locking.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ + fs/btrfs/locking.h | 9 +++++ + 4 files changed, 89 insertions(+), 92 deletions(-) + +diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c +index bc30306615837..a2505cfc6bc10 100644 +--- a/fs/btrfs/disk-io.c ++++ b/fs/btrfs/disk-io.c +@@ -121,88 +121,6 @@ struct async_submit_bio { + blk_status_t status; + }; + +-/* +- * Lockdep class keys for extent_buffer->lock's in this root. For a given +- * eb, the lockdep key is determined by the btrfs_root it belongs to and +- * the level the eb occupies in the tree. +- * +- * Different roots are used for different purposes and may nest inside each +- * other and they require separate keysets. As lockdep keys should be +- * static, assign keysets according to the purpose of the root as indicated +- * by btrfs_root->root_key.objectid. This ensures that all special purpose +- * roots have separate keysets. +- * +- * Lock-nesting across peer nodes is always done with the immediate parent +- * node locked thus preventing deadlock. As lockdep doesn't know this, use +- * subclass to avoid triggering lockdep warning in such cases. +- * +- * The key is set by the readpage_end_io_hook after the buffer has passed +- * csum validation but before the pages are unlocked. It is also set by +- * btrfs_init_new_buffer on freshly allocated blocks. +- * +- * We also add a check to make sure the highest level of the tree is the +- * same as our lockdep setup here. If BTRFS_MAX_LEVEL changes, this code +- * needs update as well. +- */ +-#ifdef CONFIG_DEBUG_LOCK_ALLOC +-# if BTRFS_MAX_LEVEL != 8 +-# error +-# endif +- +-#define DEFINE_LEVEL(stem, level) \ +- .names[level] = "btrfs-" stem "-0" #level, +- +-#define DEFINE_NAME(stem) \ +- DEFINE_LEVEL(stem, 0) \ +- DEFINE_LEVEL(stem, 1) \ +- DEFINE_LEVEL(stem, 2) \ +- DEFINE_LEVEL(stem, 3) \ +- DEFINE_LEVEL(stem, 4) \ +- DEFINE_LEVEL(stem, 5) \ +- DEFINE_LEVEL(stem, 6) \ +- DEFINE_LEVEL(stem, 7) +- +-static struct btrfs_lockdep_keyset { +- u64 id; /* root objectid */ +- /* Longest entry: btrfs-free-space-00 */ +- char names[BTRFS_MAX_LEVEL][20]; +- struct lock_class_key keys[BTRFS_MAX_LEVEL]; +-} btrfs_lockdep_keysets[] = { +- { .id = BTRFS_ROOT_TREE_OBJECTID, DEFINE_NAME("root") }, +- { .id = BTRFS_EXTENT_TREE_OBJECTID, DEFINE_NAME("extent") }, +- { .id = BTRFS_CHUNK_TREE_OBJECTID, DEFINE_NAME("chunk") }, +- { .id = BTRFS_DEV_TREE_OBJECTID, DEFINE_NAME("dev") }, +- { .id = BTRFS_CSUM_TREE_OBJECTID, DEFINE_NAME("csum") }, +- { .id = BTRFS_QUOTA_TREE_OBJECTID, DEFINE_NAME("quota") }, +- { .id = BTRFS_TREE_LOG_OBJECTID, DEFINE_NAME("log") }, +- { .id = BTRFS_TREE_RELOC_OBJECTID, DEFINE_NAME("treloc") }, +- { .id = BTRFS_DATA_RELOC_TREE_OBJECTID, DEFINE_NAME("dreloc") }, +- { .id = BTRFS_UUID_TREE_OBJECTID, DEFINE_NAME("uuid") }, +- { .id = BTRFS_FREE_SPACE_TREE_OBJECTID, DEFINE_NAME("free-space") }, +- { .id = 0, DEFINE_NAME("tree") }, +-}; +- +-#undef DEFINE_LEVEL +-#undef DEFINE_NAME +- +-void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb, +- int level) +-{ +- struct btrfs_lockdep_keyset *ks; +- +- BUG_ON(level >= ARRAY_SIZE(ks->keys)); +- +- /* find the matching keyset, id 0 is the default entry */ +- for (ks = btrfs_lockdep_keysets; ks->id; ks++) +- if (ks->id == objectid) +- break; +- +- lockdep_set_class_and_name(&eb->lock, +- &ks->keys[level], ks->names[level]); +-} +- +-#endif +- + /* + * Compute the csum of a btree block and store the result to provided buffer. + */ +diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h +index 4ee8c42c9f783..b4962b7d7117d 100644 +--- a/fs/btrfs/disk-io.h ++++ b/fs/btrfs/disk-io.h +@@ -148,14 +148,4 @@ int btrfs_init_root_free_objectid(struct btrfs_root *root); + int __init btrfs_end_io_wq_init(void); + void __cold btrfs_end_io_wq_exit(void); + +-#ifdef CONFIG_DEBUG_LOCK_ALLOC +-void btrfs_set_buffer_lockdep_class(u64 objectid, +- struct extent_buffer *eb, int level); +-#else +-static inline void btrfs_set_buffer_lockdep_class(u64 objectid, +- struct extent_buffer *eb, int level) +-{ +-} +-#endif +- + #endif +diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c +index 33461b4f9c8b5..5747c63929df7 100644 +--- a/fs/btrfs/locking.c ++++ b/fs/btrfs/locking.c +@@ -13,6 +13,86 @@ + #include "extent_io.h" + #include "locking.h" + ++/* ++ * Lockdep class keys for extent_buffer->lock's in this root. For a given ++ * eb, the lockdep key is determined by the btrfs_root it belongs to and ++ * the level the eb occupies in the tree. ++ * ++ * Different roots are used for different purposes and may nest inside each ++ * other and they require separate keysets. As lockdep keys should be ++ * static, assign keysets according to the purpose of the root as indicated ++ * by btrfs_root->root_key.objectid. This ensures that all special purpose ++ * roots have separate keysets. ++ * ++ * Lock-nesting across peer nodes is always done with the immediate parent ++ * node locked thus preventing deadlock. As lockdep doesn't know this, use ++ * subclass to avoid triggering lockdep warning in such cases. ++ * ++ * The key is set by the readpage_end_io_hook after the buffer has passed ++ * csum validation but before the pages are unlocked. It is also set by ++ * btrfs_init_new_buffer on freshly allocated blocks. ++ * ++ * We also add a check to make sure the highest level of the tree is the ++ * same as our lockdep setup here. If BTRFS_MAX_LEVEL changes, this code ++ * needs update as well. ++ */ ++#ifdef CONFIG_DEBUG_LOCK_ALLOC ++#if BTRFS_MAX_LEVEL != 8 ++#error ++#endif ++ ++#define DEFINE_LEVEL(stem, level) \ ++ .names[level] = "btrfs-" stem "-0" #level, ++ ++#define DEFINE_NAME(stem) \ ++ DEFINE_LEVEL(stem, 0) \ ++ DEFINE_LEVEL(stem, 1) \ ++ DEFINE_LEVEL(stem, 2) \ ++ DEFINE_LEVEL(stem, 3) \ ++ DEFINE_LEVEL(stem, 4) \ ++ DEFINE_LEVEL(stem, 5) \ ++ DEFINE_LEVEL(stem, 6) \ ++ DEFINE_LEVEL(stem, 7) ++ ++static struct btrfs_lockdep_keyset { ++ u64 id; /* root objectid */ ++ /* Longest entry: btrfs-free-space-00 */ ++ char names[BTRFS_MAX_LEVEL][20]; ++ struct lock_class_key keys[BTRFS_MAX_LEVEL]; ++} btrfs_lockdep_keysets[] = { ++ { .id = BTRFS_ROOT_TREE_OBJECTID, DEFINE_NAME("root") }, ++ { .id = BTRFS_EXTENT_TREE_OBJECTID, DEFINE_NAME("extent") }, ++ { .id = BTRFS_CHUNK_TREE_OBJECTID, DEFINE_NAME("chunk") }, ++ { .id = BTRFS_DEV_TREE_OBJECTID, DEFINE_NAME("dev") }, ++ { .id = BTRFS_CSUM_TREE_OBJECTID, DEFINE_NAME("csum") }, ++ { .id = BTRFS_QUOTA_TREE_OBJECTID, DEFINE_NAME("quota") }, ++ { .id = BTRFS_TREE_LOG_OBJECTID, DEFINE_NAME("log") }, ++ { .id = BTRFS_TREE_RELOC_OBJECTID, DEFINE_NAME("treloc") }, ++ { .id = BTRFS_DATA_RELOC_TREE_OBJECTID, DEFINE_NAME("dreloc") }, ++ { .id = BTRFS_UUID_TREE_OBJECTID, DEFINE_NAME("uuid") }, ++ { .id = BTRFS_FREE_SPACE_TREE_OBJECTID, DEFINE_NAME("free-space") }, ++ { .id = 0, DEFINE_NAME("tree") }, ++}; ++ ++#undef DEFINE_LEVEL ++#undef DEFINE_NAME ++ ++void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb, int level) ++{ ++ struct btrfs_lockdep_keyset *ks; ++ ++ BUG_ON(level >= ARRAY_SIZE(ks->keys)); ++ ++ /* Find the matching keyset, id 0 is the default entry */ ++ for (ks = btrfs_lockdep_keysets; ks->id; ks++) ++ if (ks->id == objectid) ++ break; ++ ++ lockdep_set_class_and_name(&eb->lock, &ks->keys[level], ks->names[level]); ++} ++ ++#endif ++ + /* + * Extent buffer locking + * ===================== +diff --git a/fs/btrfs/locking.h b/fs/btrfs/locking.h +index bbc45534ae9a6..b21372cab8409 100644 +--- a/fs/btrfs/locking.h ++++ b/fs/btrfs/locking.h +@@ -131,4 +131,13 @@ void btrfs_drew_write_unlock(struct btrfs_drew_lock *lock); + void btrfs_drew_read_lock(struct btrfs_drew_lock *lock); + void btrfs_drew_read_unlock(struct btrfs_drew_lock *lock); + ++#ifdef CONFIG_DEBUG_LOCK_ALLOC ++void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb, int level); ++#else ++static inline void btrfs_set_buffer_lockdep_class(u64 objectid, ++ struct extent_buffer *eb, int level) ++{ ++} ++#endif ++ + #endif +-- +2.35.1 + diff --git a/queue-5.19/btrfs-tree-checker-check-for-overlapping-extent-item.patch b/queue-5.19/btrfs-tree-checker-check-for-overlapping-extent-item.patch new file mode 100644 index 00000000000..84cff7f9a20 --- /dev/null +++ b/queue-5.19/btrfs-tree-checker-check-for-overlapping-extent-item.patch @@ -0,0 +1,77 @@ +From cd84febc343f41fa21539636cd905411f0ff130f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Aug 2022 14:28:47 -0400 +Subject: btrfs: tree-checker: check for overlapping extent items + +From: Josef Bacik + +[ Upstream commit 899b7f69f244e539ea5df1b4d756046337de44a5 ] + +We're seeing a weird problem in production where we have overlapping +extent items in the extent tree. It's unclear where these are coming +from, and in debugging we realized there's no check in the tree checker +for this sort of problem. Add a check to the tree-checker to make sure +that the extents do not overlap each other. + +Reviewed-by: Qu Wenruo +Signed-off-by: Josef Bacik +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/tree-checker.c | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c +index 9e0e0ae2288cd..43f905ab0a18d 100644 +--- a/fs/btrfs/tree-checker.c ++++ b/fs/btrfs/tree-checker.c +@@ -1233,7 +1233,8 @@ static void extent_err(const struct extent_buffer *eb, int slot, + } + + static int check_extent_item(struct extent_buffer *leaf, +- struct btrfs_key *key, int slot) ++ struct btrfs_key *key, int slot, ++ struct btrfs_key *prev_key) + { + struct btrfs_fs_info *fs_info = leaf->fs_info; + struct btrfs_extent_item *ei; +@@ -1453,6 +1454,26 @@ static int check_extent_item(struct extent_buffer *leaf, + total_refs, inline_refs); + return -EUCLEAN; + } ++ ++ if ((prev_key->type == BTRFS_EXTENT_ITEM_KEY) || ++ (prev_key->type == BTRFS_METADATA_ITEM_KEY)) { ++ u64 prev_end = prev_key->objectid; ++ ++ if (prev_key->type == BTRFS_METADATA_ITEM_KEY) ++ prev_end += fs_info->nodesize; ++ else ++ prev_end += prev_key->offset; ++ ++ if (unlikely(prev_end > key->objectid)) { ++ extent_err(leaf, slot, ++ "previous extent [%llu %u %llu] overlaps current extent [%llu %u %llu]", ++ prev_key->objectid, prev_key->type, ++ prev_key->offset, key->objectid, key->type, ++ key->offset); ++ return -EUCLEAN; ++ } ++ } ++ + return 0; + } + +@@ -1621,7 +1642,7 @@ static int check_leaf_item(struct extent_buffer *leaf, + break; + case BTRFS_EXTENT_ITEM_KEY: + case BTRFS_METADATA_ITEM_KEY: +- ret = check_extent_item(leaf, key, slot); ++ ret = check_extent_item(leaf, key, slot, prev_key); + break; + case BTRFS_TREE_BLOCK_REF_KEY: + case BTRFS_SHARED_DATA_REF_KEY: +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-display-add-a-missing-register-field-for-hpo.patch b/queue-5.19/drm-amd-display-add-a-missing-register-field-for-hpo.patch new file mode 100644 index 00000000000..0835a5c360f --- /dev/null +++ b/queue-5.19/drm-amd-display-add-a-missing-register-field-for-hpo.patch @@ -0,0 +1,39 @@ +From beb92a75f6b22832bce505fd89491823905a6838 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 29 Jul 2022 13:36:31 -0400 +Subject: drm/amd/display: Add a missing register field for HPO DP stream + encoder + +From: Aurabindo Pillai + +[ Upstream commit 37bc31f0e7da4fbad4664e64d906ae7b9009e550 ] + +[Why&How] +Add the missing definition to set the register field +HBLANK_MINIMUM_SYMBOL_WIDTH + +Signed-off-by: Aurabindo Pillai +Acked-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h +index 7c77c71591a08..82c3b3ac1f0d0 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h ++++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h +@@ -162,7 +162,8 @@ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_AUDIO_CONTROL0, AIP_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_AUDIO_CONTROL0, ACM_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL, CRC_ENABLE, mask_sh),\ +- SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL, CRC_CONT_MODE_ENABLE, mask_sh) ++ SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL, CRC_CONT_MODE_ENABLE, mask_sh),\ ++ SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_HBLANK_CONTROL, HBLANK_MINIMUM_SYMBOL_WIDTH, mask_sh) + + + #define DCN3_1_HPO_DP_STREAM_ENC_REG_FIELD_LIST(type) \ +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-display-avoid-doing-vm_init-multiple-time.patch b/queue-5.19/drm-amd-display-avoid-doing-vm_init-multiple-time.patch new file mode 100644 index 00000000000..aa60503cb6c --- /dev/null +++ b/queue-5.19/drm-amd-display-avoid-doing-vm_init-multiple-time.patch @@ -0,0 +1,47 @@ +From 3649a339265b2a982b15dd2d1eff22f8886074b7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Aug 2022 12:59:47 -0400 +Subject: drm/amd/display: avoid doing vm_init multiple time + +From: Charlene Liu + +[ Upstream commit 5544a7b5a07480192eb5fd3536462faed2c21528 ] + +[why] +this is to ensure that driver will not reprogram hvm_prefetch_req again if +it is done. + +Reviewed-by: Martin Leung +Acked-by: Brian Chang +Signed-off-by: Charlene Liu +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c +index c5e200d09038f..5752271f22dfe 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c +@@ -67,9 +67,15 @@ static uint32_t convert_and_clamp( + void dcn21_dchvm_init(struct hubbub *hubbub) + { + struct dcn20_hubbub *hubbub1 = TO_DCN20_HUBBUB(hubbub); +- uint32_t riommu_active; ++ uint32_t riommu_active, prefetch_done; + int i; + ++ REG_GET(DCHVM_RIOMMU_STAT0, HOSTVM_PREFETCH_DONE, &prefetch_done); ++ ++ if (prefetch_done) { ++ hubbub->riommu_active = true; ++ return; ++ } + //Init DCHVM block + REG_UPDATE(DCHVM_CTRL0, HOSTVM_INIT_REQ, 1); + +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-display-avoid-mpc-infinite-loop.patch b/queue-5.19/drm-amd-display-avoid-mpc-infinite-loop.patch new file mode 100644 index 00000000000..3a84ab8aa24 --- /dev/null +++ b/queue-5.19/drm-amd-display-avoid-mpc-infinite-loop.patch @@ -0,0 +1,66 @@ +From 3d39f818b9e25c35bc211cc2a402530fbe467821 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Jul 2022 15:33:00 -0400 +Subject: drm/amd/display: Avoid MPC infinite loop + +From: Josip Pavic + +[ Upstream commit 8de297dc046c180651c0500f8611663ae1c3828a ] + +[why] +In some cases MPC tree bottom pipe ends up point to itself. This causes +iterating from top to bottom to hang the system in an infinite loop. + +[how] +When looping to next MPC bottom pipe, check that the pointer is not same +as current to avoid infinite loop. + +Reviewed-by: Josip Pavic +Reviewed-by: Jun Lei +Acked-by: Alex Hung +Signed-off-by: Aric Cyr +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 6 ++++++ + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c +index 11019c2c62ccb..8192f1967e924 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c +@@ -126,6 +126,12 @@ struct mpcc *mpc1_get_mpcc_for_dpp(struct mpc_tree *tree, int dpp_id) + while (tmp_mpcc != NULL) { + if (tmp_mpcc->dpp_id == dpp_id) + return tmp_mpcc; ++ ++ /* avoid circular linked list */ ++ ASSERT(tmp_mpcc != tmp_mpcc->mpcc_bot); ++ if (tmp_mpcc == tmp_mpcc->mpcc_bot) ++ break; ++ + tmp_mpcc = tmp_mpcc->mpcc_bot; + } + return NULL; +diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c +index 15734db0cdea4..f3c311d093197 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c +@@ -531,6 +531,12 @@ static struct mpcc *mpc2_get_mpcc_for_dpp(struct mpc_tree *tree, int dpp_id) + while (tmp_mpcc != NULL) { + if (tmp_mpcc->dpp_id == 0xf || tmp_mpcc->dpp_id == dpp_id) + return tmp_mpcc; ++ ++ /* avoid circular linked list */ ++ ASSERT(tmp_mpcc != tmp_mpcc->mpcc_bot); ++ if (tmp_mpcc == tmp_mpcc->mpcc_bot) ++ break; ++ + tmp_mpcc = tmp_mpcc->mpcc_bot; + } + return NULL; +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-display-clear-optc-underflow-before-turn-off.patch b/queue-5.19/drm-amd-display-clear-optc-underflow-before-turn-off.patch new file mode 100644 index 00000000000..5af8383431e --- /dev/null +++ b/queue-5.19/drm-amd-display-clear-optc-underflow-before-turn-off.patch @@ -0,0 +1,45 @@ +From 28f1aa63df3ab4f54dddb54b7c8d961ad6febede Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 27 Jul 2022 12:01:29 +0800 +Subject: drm/amd/display: clear optc underflow before turn off odm clock + +From: Fudong Wang + +[ Upstream commit b2a93490201300a749ad261b5c5d05cb50179c44 ] + +[Why] +After ODM clock off, optc underflow bit will be kept there always and clear not work. +We need to clear that before clock off. + +[How] +Clear that if have when clock off. + +Reviewed-by: Alvin Lee +Acked-by: Tom Chung +Signed-off-by: Fudong Wang +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c +index b1671b00ce405..2349977b0abb2 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c +@@ -464,6 +464,11 @@ void optc1_enable_optc_clock(struct timing_generator *optc, bool enable) + OTG_CLOCK_ON, 1, + 1, 1000); + } else { ++ ++ //last chance to clear underflow, otherwise, it will always there due to clock is off. ++ if (optc->funcs->is_optc_underflow_occurred(optc) == true) ++ optc->funcs->clear_optc_underflow(optc); ++ + REG_UPDATE_2(OTG_CLOCK_CONTROL, + OTG_CLOCK_GATE_DIS, 0, + OTG_CLOCK_EN, 0); +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-display-device-flash-garbage-before-get-in-o.patch b/queue-5.19/drm-amd-display-device-flash-garbage-before-get-in-o.patch new file mode 100644 index 00000000000..96fe9072068 --- /dev/null +++ b/queue-5.19/drm-amd-display-device-flash-garbage-before-get-in-o.patch @@ -0,0 +1,42 @@ +From 22568d32d70d6c3a3b7e9eeff7ee70c82a5a9799 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Jul 2022 21:57:05 +0800 +Subject: drm/amd/display: Device flash garbage before get in OS + +From: Chiawen Huang + +[ Upstream commit 9c580e8f6cd6524d4e2c3490c440110526f7ddd6 ] + +[Why] +Enabling stream with tg lock makes config settings +pending causing the garbage until tg unlock. + +[How] +Keep the original lock mechanism +The driver doesn't lock tg if plane_state is null. + +Reviewed-by: Anthony Koo +Acked-by: Tom Chung +Signed-off-by: Chiawen Huang +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +index e3a62873c0e70..d9ab279915355 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +@@ -108,6 +108,7 @@ void dcn10_lock_all_pipes(struct dc *dc, + */ + if (pipe_ctx->top_pipe || + !pipe_ctx->stream || ++ !pipe_ctx->plane_state || + !tg->funcs->is_tg_enabled(tg)) + continue; + +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-display-fix-hdmi-vsif-v3-incorrect-issue.patch b/queue-5.19/drm-amd-display-fix-hdmi-vsif-v3-incorrect-issue.patch new file mode 100644 index 00000000000..075d2d086f5 --- /dev/null +++ b/queue-5.19/drm-amd-display-fix-hdmi-vsif-v3-incorrect-issue.patch @@ -0,0 +1,77 @@ +From 32cefffcadb8d75f4792237a69b148ec3783e13a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 22 Jul 2022 13:42:58 -0400 +Subject: drm/amd/display: Fix HDMI VSIF V3 incorrect issue + +From: Leo Ma + +[ Upstream commit 0591183699fceeafb4c4141072d47775de83ecfb ] + +[Why] +Reported from customer the checksum in AMD VSIF V3 is incorrect and +causing blank screen issue. + +[How] +Fix the packet length issue on AMD HDMI VSIF V3. + +Reviewed-by: Anthony Koo +Acked-by: Tom Chung +Signed-off-by: Leo Ma +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + .../drm/amd/display/modules/freesync/freesync.c | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c +index 03fa63d56fa65..948151e735739 100644 +--- a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c ++++ b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c +@@ -615,10 +615,6 @@ static void build_vrr_infopacket_data_v1(const struct mod_vrr_params *vrr, + * Note: We should never go above the field rate of the mode timing set. + */ + infopacket->sb[8] = (unsigned char)((vrr->max_refresh_in_uhz + 500000) / 1000000); +- +- /* FreeSync HDR */ +- infopacket->sb[9] = 0; +- infopacket->sb[10] = 0; + } + + static void build_vrr_infopacket_data_v3(const struct mod_vrr_params *vrr, +@@ -686,10 +682,6 @@ static void build_vrr_infopacket_data_v3(const struct mod_vrr_params *vrr, + + /* PB16 : Reserved bits 7:1, FixedRate bit 0 */ + infopacket->sb[16] = (vrr->state == VRR_STATE_ACTIVE_FIXED) ? 1 : 0; +- +- //FreeSync HDR +- infopacket->sb[9] = 0; +- infopacket->sb[10] = 0; + } + + static void build_vrr_infopacket_fs2_data(enum color_transfer_func app_tf, +@@ -774,8 +766,7 @@ static void build_vrr_infopacket_header_v2(enum signal_type signal, + /* HB2 = [Bits 7:5 = 0] [Bits 4:0 = Length = 0x09] */ + infopacket->hb2 = 0x09; + +- *payload_size = 0x0A; +- ++ *payload_size = 0x09; + } else if (dc_is_dp_signal(signal)) { + + /* HEADER */ +@@ -824,9 +815,9 @@ static void build_vrr_infopacket_header_v3(enum signal_type signal, + infopacket->hb1 = version; + + /* HB2 = [Bits 7:5 = 0] [Bits 4:0 = Length] */ +- *payload_size = 0x10; +- infopacket->hb2 = *payload_size - 1; //-1 for checksum ++ infopacket->hb2 = 0x10; + ++ *payload_size = 0x10; + } else if (dc_is_dp_signal(signal)) { + + /* HEADER */ +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-display-fix-pixel-clock-programming.patch b/queue-5.19/drm-amd-display-fix-pixel-clock-programming.patch new file mode 100644 index 00000000000..6aab5d5e709 --- /dev/null +++ b/queue-5.19/drm-amd-display-fix-pixel-clock-programming.patch @@ -0,0 +1,50 @@ +From 8ccb4894e71a9ef2cf3cbf826ff8f5bb2e471322 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 26 Jul 2022 16:19:38 -0400 +Subject: drm/amd/display: Fix pixel clock programming + +From: Ilya Bakoulin + +[ Upstream commit 04fb918bf421b299feaee1006e82921d7d381f18 ] + +[Why] +Some pixel clock values could cause HDMI TMDS SSCPs to be misaligned +between different HDMI lanes when using YCbCr420 10-bit pixel format. + +BIOS functions for transmitter/encoder control take pixel clock in kHz +increments, whereas the function for setting the pixel clock is in 100Hz +increments. Setting pixel clock to a value that is not on a kHz boundary +will cause the issue. + +[How] +Round pixel clock down to nearest kHz in 10/12-bpc cases. + +Reviewed-by: Aric Cyr +Acked-by: Brian Chang +Signed-off-by: Ilya Bakoulin +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +index 845aa8a1027d8..c4040adb88b03 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c ++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +@@ -545,9 +545,11 @@ static void dce112_get_pix_clk_dividers_helper ( + switch (pix_clk_params->color_depth) { + case COLOR_DEPTH_101010: + actual_pixel_clock_100hz = (actual_pixel_clock_100hz * 5) >> 2; ++ actual_pixel_clock_100hz -= actual_pixel_clock_100hz % 10; + break; + case COLOR_DEPTH_121212: + actual_pixel_clock_100hz = (actual_pixel_clock_100hz * 6) >> 2; ++ actual_pixel_clock_100hz -= actual_pixel_clock_100hz % 10; + break; + case COLOR_DEPTH_161616: + actual_pixel_clock_100hz = actual_pixel_clock_100hz * 2; +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-display-fix-plug-unplug-external-monitor-wil.patch b/queue-5.19/drm-amd-display-fix-plug-unplug-external-monitor-wil.patch new file mode 100644 index 00000000000..07a8e69729d --- /dev/null +++ b/queue-5.19/drm-amd-display-fix-plug-unplug-external-monitor-wil.patch @@ -0,0 +1,56 @@ +From d4880238a7849adace43cfffb2821963d1b4ca6d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Aug 2022 15:15:17 +0800 +Subject: drm/amd/display: Fix plug/unplug external monitor will hang while + playback MPO video + +From: Tom Chung + +[ Upstream commit e98459c06e3d45c2229b097f7b8cdd412357fa2f ] + +[Why] +Pipes for MPO primary and overlay will be power down and power up during +plug/unplug external monitor while MPO video playback. +But the pipes were the same after plug/unplug and should not need to be +power down and power up or it will make page flip interrupt disabled and +cause hang issue. + +[How] +Add pipe split change condition that not only check the top pipe pointer +but also check the index of top pipe if both top pipes are available. + +Reviewed-by: Sun peng Li +Acked-by: Brian Chang +Signed-off-by: Tom Chung +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/core/dc.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c +index 7d69341acca02..9dbd965d8afb3 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c +@@ -1067,8 +1067,15 @@ static void disable_dangling_plane(struct dc *dc, struct dc_state *context) + struct dc_stream_state *old_stream = + dc->current_state->res_ctx.pipe_ctx[i].stream; + bool should_disable = true; +- bool pipe_split_change = +- context->res_ctx.pipe_ctx[i].top_pipe != dc->current_state->res_ctx.pipe_ctx[i].top_pipe; ++ bool pipe_split_change = false; ++ ++ if ((context->res_ctx.pipe_ctx[i].top_pipe) && ++ (dc->current_state->res_ctx.pipe_ctx[i].top_pipe)) ++ pipe_split_change = context->res_ctx.pipe_ctx[i].top_pipe->pipe_idx != ++ dc->current_state->res_ctx.pipe_ctx[i].top_pipe->pipe_idx; ++ else ++ pipe_split_change = context->res_ctx.pipe_ctx[i].top_pipe != ++ dc->current_state->res_ctx.pipe_ctx[i].top_pipe; + + for (j = 0; j < context->stream_count; j++) { + if (old_stream == context->streams[j]) { +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-display-fix-tdr-edp-and-usb4-display-light-u.patch b/queue-5.19/drm-amd-display-fix-tdr-edp-and-usb4-display-light-u.patch new file mode 100644 index 00000000000..6a686d179b6 --- /dev/null +++ b/queue-5.19/drm-amd-display-fix-tdr-edp-and-usb4-display-light-u.patch @@ -0,0 +1,59 @@ +From 4d6df4055a070992b07c61196cf8cd84352c8503 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Jul 2022 18:37:41 -0400 +Subject: drm/amd/display: Fix TDR eDP and USB4 display light up issue + +From: Meenakshikumar Somasundaram + +[ Upstream commit 30456ffa65469d1d2e5e1da05017e6728d24c11c ] + +[Why] +After TDR recovery, eDP and USB4 display does not light up. Because +dmub outbox notifications are not enabled after dmub reload and link +encoder assignments for the streams are not cleared before dc state +reset. + +[How] +- Dmub outbox notification is enabled after tdr recovery by issuing + inbox command to dmub. +- Link encoders for the streams are unassigned before dc state reset. + +Reviewed-by: Jimmy Kizito +Reviewed-by: Jun Lei +Acked-by: Tom Chung +Signed-off-by: Meenakshikumar Somasundaram +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/core/dc.c | 1 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c +index f144494011882..7d69341acca02 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c +@@ -3783,6 +3783,7 @@ void dc_enable_dmub_outbox(struct dc *dc) + struct dc_context *dc_ctx = dc->ctx; + + dmub_enable_outbox_notification(dc_ctx->dmub_srv); ++ DC_LOG_DC("%s: dmub outbox notifications enabled\n", __func__); + } + + /** +diff --git a/drivers/gpu/drm/amd/display/dc/dc_link.h b/drivers/gpu/drm/amd/display/dc/dc_link.h +index a3c37ee3f849c..f96f53c1bc258 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc_link.h ++++ b/drivers/gpu/drm/amd/display/dc/dc_link.h +@@ -337,6 +337,7 @@ enum dc_detect_reason { + DETECT_REASON_HPDRX, + DETECT_REASON_FALLBACK, + DETECT_REASON_RETRAIN, ++ DETECT_REASON_TDR, + }; + + bool dc_link_detect(struct dc_link *dc_link, enum dc_detect_reason reason); +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-display-for-stereo-keep-flip_any_frame.patch b/queue-5.19/drm-amd-display-for-stereo-keep-flip_any_frame.patch new file mode 100644 index 00000000000..bd2c7f5a604 --- /dev/null +++ b/queue-5.19/drm-amd-display-for-stereo-keep-flip_any_frame.patch @@ -0,0 +1,40 @@ +From fca97680ef82013ad2210ab3eec1cdedeea52ef0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 28 Jul 2022 09:51:05 -0400 +Subject: drm/amd/display: For stereo keep "FLIP_ANY_FRAME" + +From: Alvin Lee + +[ Upstream commit 84ef99c728079dfd21d6bc70b4c3e4af20602b3c ] + +[Description] +Observed in stereomode that programming FLIP_LEFT_EYE +can cause hangs. Keep FLIP_ANY_FRAME in stereo mode so +the surface flip can take place before left or right eye + +Reviewed-by: Martin Leung +Acked-by: Tom Chung +Signed-off-by: Alvin Lee +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c +index 6a4dcafb9bba5..dc3e8df706b34 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c +@@ -86,7 +86,7 @@ bool hubp3_program_surface_flip_and_addr( + VMID, address->vmid); + + if (address->type == PLN_ADDR_TYPE_GRPH_STEREO) { +- REG_UPDATE(DCSURF_FLIP_CONTROL, SURFACE_FLIP_MODE_FOR_STEREOSYNC, 0x1); ++ REG_UPDATE(DCSURF_FLIP_CONTROL, SURFACE_FLIP_MODE_FOR_STEREOSYNC, 0); + REG_UPDATE(DCSURF_FLIP_CONTROL, SURFACE_FLIP_IN_STEREOSYNC, 0x1); + + } else { +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-pm-add-missing-fini_microcode-interface-for-.patch b/queue-5.19/drm-amd-pm-add-missing-fini_microcode-interface-for-.patch new file mode 100644 index 00000000000..a1eed1b9bb6 --- /dev/null +++ b/queue-5.19/drm-amd-pm-add-missing-fini_microcode-interface-for-.patch @@ -0,0 +1,34 @@ +From e9953386c41024fbc78bc3a9571b3d6c594cfe93 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Aug 2022 11:08:31 +0800 +Subject: drm/amd/pm: add missing ->fini_microcode interface for Sienna Cichlid + +From: Evan Quan + +[ Upstream commit 0a2d922a5618377cdf8fa476351362733ef55342 ] + +To avoid any potential memory leak. + +Signed-off-by: Evan Quan +Reviewed-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +index 78f3d9e722bb7..32bb6b1d95261 100644 +--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +@@ -4281,6 +4281,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { + .dump_pptable = sienna_cichlid_dump_pptable, + .init_microcode = smu_v11_0_init_microcode, + .load_microcode = smu_v11_0_load_microcode, ++ .fini_microcode = smu_v11_0_fini_microcode, + .init_smc_tables = sienna_cichlid_init_smc_tables, + .fini_smc_tables = smu_v11_0_fini_smc_tables, + .init_power = smu_v11_0_init_power, +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-pm-add-missing-fini_xxxx-interfaces-for-some.patch b/queue-5.19/drm-amd-pm-add-missing-fini_xxxx-interfaces-for-some.patch new file mode 100644 index 00000000000..fa04b1660a6 --- /dev/null +++ b/queue-5.19/drm-amd-pm-add-missing-fini_xxxx-interfaces-for-some.patch @@ -0,0 +1,51 @@ +From 6f5a3d7df0ac05e1fb4a68ea2a4ccc0d7fa151a8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Aug 2022 11:11:16 +0800 +Subject: drm/amd/pm: add missing ->fini_xxxx interfaces for some SMU13 asics + +From: Evan Quan + +[ Upstream commit 4bac1c846eff8042dd59ddecd0a43f3b9de5fd23 ] + +Without these, potential memory leak may be induced. + +Signed-off-by: Evan Quan +Reviewed-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 ++ + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +index 7432b3e76d3d7..201546c369945 100644 +--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +@@ -1583,7 +1583,9 @@ static const struct pptable_funcs smu_v13_0_0_ppt_funcs = { + .dump_pptable = smu_v13_0_0_dump_pptable, + .init_microcode = smu_v13_0_init_microcode, + .load_microcode = smu_v13_0_load_microcode, ++ .fini_microcode = smu_v13_0_fini_microcode, + .init_smc_tables = smu_v13_0_0_init_smc_tables, ++ .fini_smc_tables = smu_v13_0_fini_smc_tables, + .init_power = smu_v13_0_init_power, + .fini_power = smu_v13_0_fini_power, + .check_fw_status = smu_v13_0_check_fw_status, +diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +index 4e1861fb2c6a4..9cde13b07dd26 100644 +--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +@@ -1539,7 +1539,9 @@ static const struct pptable_funcs smu_v13_0_7_ppt_funcs = { + .dump_pptable = smu_v13_0_7_dump_pptable, + .init_microcode = smu_v13_0_init_microcode, + .load_microcode = smu_v13_0_load_microcode, ++ .fini_microcode = smu_v13_0_fini_microcode, + .init_smc_tables = smu_v13_0_7_init_smc_tables, ++ .fini_smc_tables = smu_v13_0_fini_smc_tables, + .init_power = smu_v13_0_init_power, + .check_fw_status = smu_v13_0_7_check_fw_status, + .setup_pptable = smu_v13_0_7_setup_pptable, +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-pm-fix-a-potential-gpu_metrics_table-memory-.patch b/queue-5.19/drm-amd-pm-fix-a-potential-gpu_metrics_table-memory-.patch new file mode 100644 index 00000000000..104d0f143d1 --- /dev/null +++ b/queue-5.19/drm-amd-pm-fix-a-potential-gpu_metrics_table-memory-.patch @@ -0,0 +1,38 @@ +From 8d5cae1c842d0e14058d1d526b8fb44b487a3a6d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Aug 2022 17:19:58 +0800 +Subject: drm/amd/pm: Fix a potential gpu_metrics_table memory leak + +From: Zhen Ni + +[ Upstream commit 5afb76522a0af0513b6dc01f84128a73206b051b ] + +Memory is allocated for gpu_metrics_table in +smu_v13_0_4_init_smc_tables(), but not freed in +smu_v13_0_4_fini_smc_tables(). This may cause memory leaks, fix it. + +Reviewed-by: Evan Quan +Signed-off-by: Zhen Ni +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +index 5a17b51aa0f9f..7df360c25d51e 100644 +--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +@@ -190,6 +190,9 @@ static int smu_v13_0_4_fini_smc_tables(struct smu_context *smu) + kfree(smu_table->watermarks_table); + smu_table->watermarks_table = NULL; + ++ kfree(smu_table->gpu_metrics_table); ++ smu_table->gpu_metrics_table = NULL; ++ + return 0; + } + +-- +2.35.1 + diff --git a/queue-5.19/drm-amd-pm-skip-pptable-override-for-smu_v13_0_7.patch b/queue-5.19/drm-amd-pm-skip-pptable-override-for-smu_v13_0_7.patch new file mode 100644 index 00000000000..47bca601449 --- /dev/null +++ b/queue-5.19/drm-amd-pm-skip-pptable-override-for-smu_v13_0_7.patch @@ -0,0 +1,50 @@ +From 6e2129d06534325fcaf62d6d724cc7ac7689d9ac Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 9 Aug 2022 10:13:54 +0800 +Subject: drm/amd/pm: skip pptable override for smu_v13_0_7 + +From: Kenneth Feng + +[ Upstream commit 4e64b529c5b04e7944b41de554ee686ecab00744 ] + +skip pptable override for smu_v13_0_7 secure boards only. + +Signed-off-by: Kenneth Feng +Reviewed-by: Feifei Xu +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +index 5aa08c031f721..1d8a9e5b3cc08 100644 +--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +@@ -203,6 +203,9 @@ int smu_v13_0_init_pptable_microcode(struct smu_context *smu) + if (!adev->scpm_enabled) + return 0; + ++ if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 7)) ++ return 0; ++ + /* override pptable_id from driver parameter */ + if (amdgpu_smu_pptable_id >= 0) { + pptable_id = amdgpu_smu_pptable_id; +@@ -210,13 +213,6 @@ int smu_v13_0_init_pptable_microcode(struct smu_context *smu) + } else { + pptable_id = smu->smu_table.boot_values.pp_table_id; + +- if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 7) && +- pptable_id == 3667) +- pptable_id = 36671; +- +- if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 7) && +- pptable_id == 3688) +- pptable_id = 36881; + /* + * Temporary solution for SMU V13.0.0 with SCPM enabled: + * - use 36831 signed pptable when pp_table_id is 3683 +-- +2.35.1 + diff --git a/queue-5.19/drm-amdgpu-add-decode_iv_ts-helper-for-ih_v6-block.patch b/queue-5.19/drm-amdgpu-add-decode_iv_ts-helper-for-ih_v6-block.patch new file mode 100644 index 00000000000..aa1a4c98cf7 --- /dev/null +++ b/queue-5.19/drm-amdgpu-add-decode_iv_ts-helper-for-ih_v6-block.patch @@ -0,0 +1,34 @@ +From 5d7cc5ebb96736adb9bac475c7a514d451355d6b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Aug 2022 18:04:08 -0400 +Subject: drm/amdgpu: Add decode_iv_ts helper for ih_v6 block + +From: Harish Kasiviswanathan + +[ Upstream commit 1af9add1f1512b10d9ce44ec7137612bc81ff069 ] + +Was missing. Add it. + +Signed-off-by: Harish Kasiviswanathan +Reviewed-by: Hawking Zhang +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c b/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c +index 92dc60a9d2094..085e613f3646d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c +@@ -727,6 +727,7 @@ static const struct amd_ip_funcs ih_v6_0_ip_funcs = { + static const struct amdgpu_ih_funcs ih_v6_0_funcs = { + .get_wptr = ih_v6_0_get_wptr, + .decode_iv = amdgpu_ih_decode_iv_helper, ++ .decode_iv_ts = amdgpu_ih_decode_iv_ts_helper, + .set_rptr = ih_v6_0_set_rptr + }; + +-- +2.35.1 + diff --git a/queue-5.19/drm-amdgpu-add-secure-display-ta-load-for-renoir.patch b/queue-5.19/drm-amdgpu-add-secure-display-ta-load-for-renoir.patch new file mode 100644 index 00000000000..4474f4529a3 --- /dev/null +++ b/queue-5.19/drm-amdgpu-add-secure-display-ta-load-for-renoir.patch @@ -0,0 +1,43 @@ +From 6be7e817fa20e0328d393c2e6a4bef0f90216e55 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Aug 2022 16:32:15 +0800 +Subject: drm/amdgpu: Add secure display TA load for Renoir + +From: Shane Xiao + +[ Upstream commit e42dfa66d59240afbdd8d4b47b87486db39504aa ] + +Add secure display TA load for Renoir + +Signed-off-by: Shane Xiao +Reviewed-by: Aaron Liu +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +index a2588200ea580..0b2ac418e4ac4 100644 +--- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +@@ -101,6 +101,16 @@ static int psp_v12_0_init_microcode(struct psp_context *psp) + adev->psp.dtm_context.context.bin_desc.start_addr = + (uint8_t *)adev->psp.hdcp_context.context.bin_desc.start_addr + + le32_to_cpu(ta_hdr->dtm.offset_bytes); ++ ++ if (adev->apu_flags & AMD_APU_IS_RENOIR) { ++ adev->psp.securedisplay_context.context.bin_desc.fw_version = ++ le32_to_cpu(ta_hdr->securedisplay.fw_version); ++ adev->psp.securedisplay_context.context.bin_desc.size_bytes = ++ le32_to_cpu(ta_hdr->securedisplay.size_bytes); ++ adev->psp.securedisplay_context.context.bin_desc.start_addr = ++ (uint8_t *)adev->psp.hdcp_context.context.bin_desc.start_addr + ++ le32_to_cpu(ta_hdr->securedisplay.offset_bytes); ++ } + } + + return 0; +-- +2.35.1 + diff --git a/queue-5.19/drm-amdgpu-disable-3dcgcg-cgls-temporarily-due-to-st.patch b/queue-5.19/drm-amdgpu-disable-3dcgcg-cgls-temporarily-due-to-st.patch new file mode 100644 index 00000000000..7cf51f4aff5 --- /dev/null +++ b/queue-5.19/drm-amdgpu-disable-3dcgcg-cgls-temporarily-due-to-st.patch @@ -0,0 +1,37 @@ +From 43d753362e668d04df27440a3e2d041319b32f7c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Aug 2022 16:13:56 +0800 +Subject: drm/amdgpu: disable 3DCGCG/CGLS temporarily due to stability issue + +From: Evan Quan + +[ Upstream commit 1b586595df6d04c27088ef348b8202204ce26d45 ] + +Some stability issues were reported with these features. + +Signed-off-by: Evan Quan +Reviewed-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/soc21.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c +index 9e18a2b22607b..8d5c452a91007 100644 +--- a/drivers/gpu/drm/amd/amdgpu/soc21.c ++++ b/drivers/gpu/drm/amd/amdgpu/soc21.c +@@ -530,8 +530,10 @@ static int soc21_common_early_init(void *handle) + case IP_VERSION(11, 0, 0): + adev->cg_flags = AMD_CG_SUPPORT_GFX_CGCG | + AMD_CG_SUPPORT_GFX_CGLS | ++#if 0 + AMD_CG_SUPPORT_GFX_3D_CGCG | + AMD_CG_SUPPORT_GFX_3D_CGLS | ++#endif + AMD_CG_SUPPORT_GFX_MGCG | + AMD_CG_SUPPORT_REPEATER_FGCG | + AMD_CG_SUPPORT_GFX_FGCG | +-- +2.35.1 + diff --git a/queue-5.19/drm-amdgpu-fix-interrupt-handling-on-ih_soft-ring.patch b/queue-5.19/drm-amdgpu-fix-interrupt-handling-on-ih_soft-ring.patch new file mode 100644 index 00000000000..8d5281b8a6e --- /dev/null +++ b/queue-5.19/drm-amdgpu-fix-interrupt-handling-on-ih_soft-ring.patch @@ -0,0 +1,112 @@ +From 77c4c287ffed92acf5f08ffabe72e2444af36e6f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Aug 2022 15:23:51 -0400 +Subject: drm/amdgpu: Fix interrupt handling on ih_soft ring +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Mukul Joshi + +[ Upstream commit de8341ee3ce7316883e836a2c4e9bf01ab651e0f ] + +There are no backing hardware registers for ih_soft ring. +As a result, don't try to access hardware registers for read +and write pointers when processing interrupts on the IH soft +ring. + +Signed-off-by: Mukul Joshi +Acked-by: Christian König +Reviewed-by: Felix Kuehling +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 7 ++++++- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 7 ++++++- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 7 ++++++- + 3 files changed, 18 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c +index 4b5396d3e60f6..eec13cb5bf758 100644 +--- a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c ++++ b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c +@@ -409,9 +409,11 @@ static u32 navi10_ih_get_wptr(struct amdgpu_device *adev, + u32 wptr, tmp; + struct amdgpu_ih_regs *ih_regs; + +- if (ih == &adev->irq.ih) { ++ if (ih == &adev->irq.ih || ih == &adev->irq.ih_soft) { + /* Only ring0 supports writeback. On other rings fall back + * to register-based code with overflow checking below. ++ * ih_soft ring doesn't have any backing hardware registers, ++ * update wptr and return. + */ + wptr = le32_to_cpu(*ih->wptr_cpu); + +@@ -483,6 +485,9 @@ static void navi10_ih_set_rptr(struct amdgpu_device *adev, + { + struct amdgpu_ih_regs *ih_regs; + ++ if (ih == &adev->irq.ih_soft) ++ return; ++ + if (ih->use_doorbell) { + /* XXX check if swapping is necessary on BE */ + *ih->rptr_cpu = ih->rptr; +diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c +index cdd599a081258..03b7066471f9a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c ++++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c +@@ -334,9 +334,11 @@ static u32 vega10_ih_get_wptr(struct amdgpu_device *adev, + u32 wptr, tmp; + struct amdgpu_ih_regs *ih_regs; + +- if (ih == &adev->irq.ih) { ++ if (ih == &adev->irq.ih || ih == &adev->irq.ih_soft) { + /* Only ring0 supports writeback. On other rings fall back + * to register-based code with overflow checking below. ++ * ih_soft ring doesn't have any backing hardware registers, ++ * update wptr and return. + */ + wptr = le32_to_cpu(*ih->wptr_cpu); + +@@ -409,6 +411,9 @@ static void vega10_ih_set_rptr(struct amdgpu_device *adev, + { + struct amdgpu_ih_regs *ih_regs; + ++ if (ih == &adev->irq.ih_soft) ++ return; ++ + if (ih->use_doorbell) { + /* XXX check if swapping is necessary on BE */ + *ih->rptr_cpu = ih->rptr; +diff --git a/drivers/gpu/drm/amd/amdgpu/vega20_ih.c b/drivers/gpu/drm/amd/amdgpu/vega20_ih.c +index 3b4eb8285943c..2022ffbb8dba5 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vega20_ih.c ++++ b/drivers/gpu/drm/amd/amdgpu/vega20_ih.c +@@ -385,9 +385,11 @@ static u32 vega20_ih_get_wptr(struct amdgpu_device *adev, + u32 wptr, tmp; + struct amdgpu_ih_regs *ih_regs; + +- if (ih == &adev->irq.ih) { ++ if (ih == &adev->irq.ih || ih == &adev->irq.ih_soft) { + /* Only ring0 supports writeback. On other rings fall back + * to register-based code with overflow checking below. ++ * ih_soft ring doesn't have any backing hardware registers, ++ * update wptr and return. + */ + wptr = le32_to_cpu(*ih->wptr_cpu); + +@@ -461,6 +463,9 @@ static void vega20_ih_set_rptr(struct amdgpu_device *adev, + { + struct amdgpu_ih_regs *ih_regs; + ++ if (ih == &adev->irq.ih_soft) ++ return; ++ + if (ih->use_doorbell) { + /* XXX check if swapping is necessary on BE */ + *ih->rptr_cpu = ih->rptr; +-- +2.35.1 + diff --git a/queue-5.19/drm-amdgpu-increase-tlb-flush-timeout-for-sriov.patch b/queue-5.19/drm-amdgpu-increase-tlb-flush-timeout-for-sriov.patch new file mode 100644 index 00000000000..d903e46322d --- /dev/null +++ b/queue-5.19/drm-amdgpu-increase-tlb-flush-timeout-for-sriov.patch @@ -0,0 +1,87 @@ +From 5012463e2cbbb2674d2426b1b85efdda5eddca5e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Aug 2022 09:43:15 +0200 +Subject: drm/amdgpu: Increase tlb flush timeout for sriov + +From: Dusica Milinkovic + +[ Upstream commit 373008bfc9cdb0f050258947fa5a095f0657e1bc ] + +[Why] +During multi-vf executing benchmark (Luxmark) observed kiq error timeout. +It happenes because all of VFs do the tlb invalidation at the same time. +Although each VF has the invalidate register set, from hardware side +the invalidate requests are queue to execute. + +[How] +In case of 12 VF increase timeout on 12*100ms + +Signed-off-by: Dusica Milinkovic +Acked-by: Shaoyun Liu +Acked-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 ++- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 ++- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 30ce6bb6fa77a..310754b1f6702 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -313,7 +313,7 @@ enum amdgpu_kiq_irq { + AMDGPU_CP_KIQ_IRQ_DRIVER0 = 0, + AMDGPU_CP_KIQ_IRQ_LAST + }; +- ++#define SRIOV_USEC_TIMEOUT 1200000 /* wait 12 * 100ms for SRIOV */ + #define MAX_KIQ_REG_WAIT 5000 /* in usecs, 5ms */ + #define MAX_KIQ_REG_BAILOUT_INTERVAL 5 /* in msecs, 5ms */ + #define MAX_KIQ_REG_TRY 1000 +diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +index 9077dfccaf3cf..809408c8c79a1 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +@@ -416,6 +416,7 @@ static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev, + uint32_t seq; + uint16_t queried_pasid; + bool ret; ++ u32 usec_timeout = amdgpu_sriov_vf(adev) ? SRIOV_USEC_TIMEOUT : adev->usec_timeout; + struct amdgpu_ring *ring = &adev->gfx.kiq.ring; + struct amdgpu_kiq *kiq = &adev->gfx.kiq; + +@@ -434,7 +435,7 @@ static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev, + + amdgpu_ring_commit(ring); + spin_unlock(&adev->gfx.kiq.ring_lock); +- r = amdgpu_fence_wait_polling(ring, seq, adev->usec_timeout); ++ r = amdgpu_fence_wait_polling(ring, seq, usec_timeout); + if (r < 1) { + dev_err(adev->dev, "wait for kiq fence error: %ld.\n", r); + return -ETIME; +diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +index 22761a3bb8181..566c1243c051b 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +@@ -896,6 +896,7 @@ static int gmc_v9_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev, + uint32_t seq; + uint16_t queried_pasid; + bool ret; ++ u32 usec_timeout = amdgpu_sriov_vf(adev) ? SRIOV_USEC_TIMEOUT : adev->usec_timeout; + struct amdgpu_ring *ring = &adev->gfx.kiq.ring; + struct amdgpu_kiq *kiq = &adev->gfx.kiq; + +@@ -935,7 +936,7 @@ static int gmc_v9_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev, + + amdgpu_ring_commit(ring); + spin_unlock(&adev->gfx.kiq.ring_lock); +- r = amdgpu_fence_wait_polling(ring, seq, adev->usec_timeout); ++ r = amdgpu_fence_wait_polling(ring, seq, usec_timeout); + if (r < 1) { + dev_err(adev->dev, "wait for kiq fence error: %ld.\n", r); + up_read(&adev->reset_domain->sem); +-- +2.35.1 + diff --git a/queue-5.19/drm-amdkfd-handle-restart-of-kfd_ioctl_wait_events.patch b/queue-5.19/drm-amdkfd-handle-restart-of-kfd_ioctl_wait_events.patch new file mode 100644 index 00000000000..cee7a267c8f --- /dev/null +++ b/queue-5.19/drm-amdkfd-handle-restart-of-kfd_ioctl_wait_events.patch @@ -0,0 +1,127 @@ +From 57944749731472eb98c7feffc6c251ecc23b02cc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Aug 2022 18:19:38 -0400 +Subject: drm/amdkfd: Handle restart of kfd_ioctl_wait_events + +From: Felix Kuehling + +[ Upstream commit bea9a56afbc4b5a41ea579b8b0dc5e189b439504 ] + +When kfd_ioctl_wait_events needs to restart due to a signal, we need to +update the timeout to account for the time already elapsed. We also need +to undo auto_reset of events that have signaled already, so that the +restarted ioctl will be able to count those signals again. + +This fixes infinite hangs when kfd_ioctl_wait_events is interrupted by a +signal. + +Signed-off-by: Felix Kuehling +Reviewed-and-tested-by: Xiaogang Chen +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 24 ++++++++++++------------ + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- + 3 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +index 1c7016958d6d9..bfca17ca399c6 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +@@ -814,7 +814,7 @@ static int kfd_ioctl_wait_events(struct file *filp, struct kfd_process *p, + err = kfd_wait_on_events(p, args->num_events, + (void __user *)args->events_ptr, + (args->wait_for_all != 0), +- args->timeout, &args->wait_result); ++ &args->timeout, &args->wait_result); + + return err; + } +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c +index 4df9c36146ba9..cbc20d779e5aa 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c +@@ -895,7 +895,8 @@ static long user_timeout_to_jiffies(uint32_t user_timeout_ms) + return msecs_to_jiffies(user_timeout_ms) + 1; + } + +-static void free_waiters(uint32_t num_events, struct kfd_event_waiter *waiters) ++static void free_waiters(uint32_t num_events, struct kfd_event_waiter *waiters, ++ bool undo_auto_reset) + { + uint32_t i; + +@@ -904,6 +905,9 @@ static void free_waiters(uint32_t num_events, struct kfd_event_waiter *waiters) + spin_lock(&waiters[i].event->lock); + remove_wait_queue(&waiters[i].event->wq, + &waiters[i].wait); ++ if (undo_auto_reset && waiters[i].activated && ++ waiters[i].event && waiters[i].event->auto_reset) ++ set_event(waiters[i].event); + spin_unlock(&waiters[i].event->lock); + } + +@@ -912,7 +916,7 @@ static void free_waiters(uint32_t num_events, struct kfd_event_waiter *waiters) + + int kfd_wait_on_events(struct kfd_process *p, + uint32_t num_events, void __user *data, +- bool all, uint32_t user_timeout_ms, ++ bool all, uint32_t *user_timeout_ms, + uint32_t *wait_result) + { + struct kfd_event_data __user *events = +@@ -921,7 +925,7 @@ int kfd_wait_on_events(struct kfd_process *p, + int ret = 0; + + struct kfd_event_waiter *event_waiters = NULL; +- long timeout = user_timeout_to_jiffies(user_timeout_ms); ++ long timeout = user_timeout_to_jiffies(*user_timeout_ms); + + event_waiters = alloc_event_waiters(num_events); + if (!event_waiters) { +@@ -971,15 +975,11 @@ int kfd_wait_on_events(struct kfd_process *p, + } + + if (signal_pending(current)) { +- /* +- * This is wrong when a nonzero, non-infinite timeout +- * is specified. We need to use +- * ERESTARTSYS_RESTARTBLOCK, but struct restart_block +- * contains a union with data for each user and it's +- * in generic kernel code that I don't want to +- * touch yet. +- */ + ret = -ERESTARTSYS; ++ if (*user_timeout_ms != KFD_EVENT_TIMEOUT_IMMEDIATE && ++ *user_timeout_ms != KFD_EVENT_TIMEOUT_INFINITE) ++ *user_timeout_ms = jiffies_to_msecs( ++ max(0l, timeout-1)); + break; + } + +@@ -1020,7 +1020,7 @@ int kfd_wait_on_events(struct kfd_process *p, + event_waiters, events); + + out_unlock: +- free_waiters(num_events, event_waiters); ++ free_waiters(num_events, event_waiters, ret == -ERESTARTSYS); + mutex_unlock(&p->event_mutex); + out: + if (ret) +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +index 2585d6e61d422..c6eec54b8102f 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +@@ -1314,7 +1314,7 @@ void kfd_event_free_process(struct kfd_process *p); + int kfd_event_mmap(struct kfd_process *process, struct vm_area_struct *vma); + int kfd_wait_on_events(struct kfd_process *p, + uint32_t num_events, void __user *data, +- bool all, uint32_t user_timeout_ms, ++ bool all, uint32_t *user_timeout_ms, + uint32_t *wait_result); + void kfd_signal_event_interrupt(u32 pasid, uint32_t partial_id, + uint32_t valid_id_bits); +-- +2.35.1 + diff --git a/queue-5.19/fs-ntfs3-fix-work-with-fragmented-xattr.patch b/queue-5.19/fs-ntfs3-fix-work-with-fragmented-xattr.patch new file mode 100644 index 00000000000..d74590e5fcf --- /dev/null +++ b/queue-5.19/fs-ntfs3-fix-work-with-fragmented-xattr.patch @@ -0,0 +1,46 @@ +From 7b45f7db047bf14d2ab0a29139e51af5a70a3d9c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 May 2022 19:54:23 +0300 +Subject: fs/ntfs3: Fix work with fragmented xattr + +From: Konstantin Komarov + +[ Upstream commit 42f86b1226a42bfc79a7125af435432ad4680a32 ] + +In some cases xattr is too fragmented, +so we need to load it before writing. + +Signed-off-by: Konstantin Komarov +Signed-off-by: Sasha Levin +--- + fs/ntfs3/xattr.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c +index 3629049decac1..e3d443ccb9be6 100644 +--- a/fs/ntfs3/xattr.c ++++ b/fs/ntfs3/xattr.c +@@ -118,7 +118,7 @@ static int ntfs_read_ea(struct ntfs_inode *ni, struct EA_FULL **ea, + + run_init(&run); + +- err = attr_load_runs(attr_ea, ni, &run, NULL); ++ err = attr_load_runs_range(ni, ATTR_EA, NULL, 0, &run, 0, size); + if (!err) + err = ntfs_read_run_nb(sbi, &run, 0, ea_p, size, NULL); + run_close(&run); +@@ -444,6 +444,11 @@ static noinline int ntfs_set_ea(struct inode *inode, const char *name, + /* Delete xattr, ATTR_EA */ + ni_remove_attr_le(ni, attr, mi, le); + } else if (attr->non_res) { ++ err = attr_load_runs_range(ni, ATTR_EA, NULL, 0, &ea_run, 0, ++ size); ++ if (err) ++ goto out; ++ + err = ntfs_sb_write_run(sbi, &ea_run, 0, ea_all, size, 0); + if (err) + goto out; +-- +2.35.1 + diff --git a/queue-5.19/ksmbd-don-t-remove-dos-attribute-xattr-on-o_trunc-op.patch b/queue-5.19/ksmbd-don-t-remove-dos-attribute-xattr-on-o_trunc-op.patch new file mode 100644 index 00000000000..dd509162f62 --- /dev/null +++ b/queue-5.19/ksmbd-don-t-remove-dos-attribute-xattr-on-o_trunc-op.patch @@ -0,0 +1,55 @@ +From 6a6e159d0fe548bd3d4a0a1a7aebe493f1807869 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 14 Aug 2022 22:40:25 +0900 +Subject: ksmbd: don't remove dos attribute xattr on O_TRUNC open + +From: Namjae Jeon + +[ Upstream commit 17661ecf6a64eb11ae7f1108fe88686388b2acd5 ] + +When smb client open file in ksmbd share with O_TRUNC, dos attribute +xattr is removed as well as data in file. This cause the FSCTL_SET_SPARSE +request from the client fails because ksmbd can't update the dos attribute +after setting ATTR_SPARSE_FILE. And this patch fix xfstests generic/469 +test also. + +Signed-off-by: Namjae Jeon +Reviewed-by: Hyunchul Lee +Signed-off-by: Steve French +Signed-off-by: Sasha Levin +--- + fs/ksmbd/smb2pdu.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c +index bbb3958b6469d..35f5ea1c9dfcd 100644 +--- a/fs/ksmbd/smb2pdu.c ++++ b/fs/ksmbd/smb2pdu.c +@@ -2315,15 +2315,15 @@ static int smb2_remove_smb_xattrs(struct path *path) + name += strlen(name) + 1) { + ksmbd_debug(SMB, "%s, len %zd\n", name, strlen(name)); + +- if (strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN) && +- strncmp(&name[XATTR_USER_PREFIX_LEN], DOS_ATTRIBUTE_PREFIX, +- DOS_ATTRIBUTE_PREFIX_LEN) && +- strncmp(&name[XATTR_USER_PREFIX_LEN], STREAM_PREFIX, STREAM_PREFIX_LEN)) +- continue; +- +- err = ksmbd_vfs_remove_xattr(user_ns, path->dentry, name); +- if (err) +- ksmbd_debug(SMB, "remove xattr failed : %s\n", name); ++ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN) && ++ !strncmp(&name[XATTR_USER_PREFIX_LEN], STREAM_PREFIX, ++ STREAM_PREFIX_LEN)) { ++ err = ksmbd_vfs_remove_xattr(user_ns, path->dentry, ++ name); ++ if (err) ++ ksmbd_debug(SMB, "remove xattr failed : %s\n", ++ name); ++ } + } + out: + kvfree(xattr_list); +-- +2.35.1 + diff --git a/queue-5.19/ksmbd-return-status_bad_network_name-error-status-if.patch b/queue-5.19/ksmbd-return-status_bad_network_name-error-status-if.patch new file mode 100644 index 00000000000..f523bda4efd --- /dev/null +++ b/queue-5.19/ksmbd-return-status_bad_network_name-error-status-if.patch @@ -0,0 +1,53 @@ +From dbd4ea65ddac559faab68eed84f948a194e2ffe7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Aug 2022 21:56:48 +0900 +Subject: ksmbd: return STATUS_BAD_NETWORK_NAME error status if share is not + configured + +From: Namjae Jeon + +[ Upstream commit fe54833dc8d97ef387e86f7c80537d51c503ca75 ] + +If share is not configured in smb.conf, smb2 tree connect should return +STATUS_BAD_NETWORK_NAME instead of STATUS_BAD_NETWORK_PATH. + +Signed-off-by: Namjae Jeon +Reviewed-by: Hyunchul Lee +Signed-off-by: Steve French +Signed-off-by: Sasha Levin +--- + fs/ksmbd/mgmt/tree_connect.c | 2 +- + fs/ksmbd/smb2pdu.c | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/fs/ksmbd/mgmt/tree_connect.c b/fs/ksmbd/mgmt/tree_connect.c +index 0d28e723a28c7..940385c6a9135 100644 +--- a/fs/ksmbd/mgmt/tree_connect.c ++++ b/fs/ksmbd/mgmt/tree_connect.c +@@ -18,7 +18,7 @@ + struct ksmbd_tree_conn_status + ksmbd_tree_conn_connect(struct ksmbd_session *sess, char *share_name) + { +- struct ksmbd_tree_conn_status status = {-EINVAL, NULL}; ++ struct ksmbd_tree_conn_status status = {-ENOENT, NULL}; + struct ksmbd_tree_connect_response *resp = NULL; + struct ksmbd_share_config *sc; + struct ksmbd_tree_connect *tree_conn = NULL; +diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c +index a9c33d15ca1fb..bbb3958b6469d 100644 +--- a/fs/ksmbd/smb2pdu.c ++++ b/fs/ksmbd/smb2pdu.c +@@ -1930,8 +1930,9 @@ int smb2_tree_connect(struct ksmbd_work *work) + rsp->hdr.Status = STATUS_SUCCESS; + rc = 0; + break; ++ case -ENOENT: + case KSMBD_TREE_CONN_STATUS_NO_SHARE: +- rsp->hdr.Status = STATUS_BAD_NETWORK_PATH; ++ rsp->hdr.Status = STATUS_BAD_NETWORK_NAME; + break; + case -ENOMEM: + case KSMBD_TREE_CONN_STATUS_NOMEM: +-- +2.35.1 + diff --git a/queue-5.19/mmc-mtk-sd-clear-interrupts-when-cqe-off-disable.patch b/queue-5.19/mmc-mtk-sd-clear-interrupts-when-cqe-off-disable.patch new file mode 100644 index 00000000000..4260c68ee63 --- /dev/null +++ b/queue-5.19/mmc-mtk-sd-clear-interrupts-when-cqe-off-disable.patch @@ -0,0 +1,60 @@ +From 750c7a0f91d5ce8f8bfae0321a17ddf63e2a004c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 28 Jul 2022 16:00:48 +0800 +Subject: mmc: mtk-sd: Clear interrupts when cqe off/disable + +From: Wenbin Mei + +[ Upstream commit cc5d1692600613e72f32af60e27330fe0c79f4fe ] + +Currently we don't clear MSDC interrupts when cqe off/disable, which led +to the data complete interrupt will be reserved for the next command. +If the next command with data transfer after cqe off/disable, we process +the CMD ready interrupt and trigger DMA start for data, but the data +complete interrupt is already exists, then SW assume that the data transfer +is complete, SW will trigger DMA stop, but the data may not be transmitted +yet or is transmitting, so we may encounter the following error: +mtk-msdc 11230000.mmc: CMD bus busy detected. + +Signed-off-by: Wenbin Mei +Fixes: 88bd652b3c74 ("mmc: mediatek: command queue support") +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20220728080048.21336-1-wenbin.mei@mediatek.com +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/mtk-sd.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c +index 9da4489dc345a..378a26a1825c4 100644 +--- a/drivers/mmc/host/mtk-sd.c ++++ b/drivers/mmc/host/mtk-sd.c +@@ -2414,6 +2414,9 @@ static void msdc_cqe_disable(struct mmc_host *mmc, bool recovery) + /* disable busy check */ + sdr_clr_bits(host->base + MSDC_PATCH_BIT1, MSDC_PB1_BUSY_CHECK_SEL); + ++ val = readl(host->base + MSDC_INT); ++ writel(val, host->base + MSDC_INT); ++ + if (recovery) { + sdr_set_field(host->base + MSDC_DMA_CTRL, + MSDC_DMA_CTRL_STOP, 1); +@@ -2871,11 +2874,14 @@ static int __maybe_unused msdc_suspend(struct device *dev) + { + struct mmc_host *mmc = dev_get_drvdata(dev); + int ret; ++ u32 val; + + if (mmc->caps2 & MMC_CAP2_CQE) { + ret = cqhci_suspend(mmc); + if (ret) + return ret; ++ val = readl(((struct msdc_host *)mmc_priv(mmc))->base + MSDC_INT); ++ writel(val, ((struct msdc_host *)mmc_priv(mmc))->base + MSDC_INT); + } + + return pm_runtime_force_suspend(dev); +-- +2.35.1 + diff --git a/queue-5.19/mmc-sdhci-of-dwcmshc-add-reset-call-back-for-rockchi.patch b/queue-5.19/mmc-sdhci-of-dwcmshc-add-reset-call-back-for-rockchi.patch new file mode 100644 index 00000000000..229867d38ae --- /dev/null +++ b/queue-5.19/mmc-sdhci-of-dwcmshc-add-reset-call-back-for-rockchi.patch @@ -0,0 +1,93 @@ +From 3c5f5de43955a880ead9f1ca78d966228a6e7b6c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 May 2022 23:32:39 +0200 +Subject: mmc: sdhci-of-dwcmshc: add reset call back for rockchip Socs + +From: Yifeng Zhao + +[ Upstream commit 70f832206fe72e9998b46363e8e59e89b0b757bc ] + +The reset function build in the SDHCI will not reset the logic +circuit related to the tuning function, which may cause data +reading errors. Resetting the complete SDHCI controller through +the reset controller fixes the issue. + +Signed-off-by: Yifeng Zhao +[rebase, use optional variant of reset getter] +Acked-by: Adrian Hunter +Signed-off-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20220504213251.264819-10-sebastian.reichel@collabora.com +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/sdhci-of-dwcmshc.c | 26 +++++++++++++++++++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c +index bac874ab0b33a..3a1b5ba364051 100644 +--- a/drivers/mmc/host/sdhci-of-dwcmshc.c ++++ b/drivers/mmc/host/sdhci-of-dwcmshc.c +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + + #include "sdhci-pltfm.h" +@@ -63,6 +64,7 @@ + struct rk3568_priv { + /* Rockchip specified optional clocks */ + struct clk_bulk_data rockchip_clks[RK3568_MAX_CLKS]; ++ struct reset_control *reset; + u8 txclk_tapnum; + }; + +@@ -255,6 +257,21 @@ static void dwcmshc_rk3568_set_clock(struct sdhci_host *host, unsigned int clock + sdhci_writel(host, extra, DWCMSHC_EMMC_DLL_STRBIN); + } + ++static void rk35xx_sdhci_reset(struct sdhci_host *host, u8 mask) ++{ ++ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); ++ struct dwcmshc_priv *dwc_priv = sdhci_pltfm_priv(pltfm_host); ++ struct rk35xx_priv *priv = dwc_priv->priv; ++ ++ if (mask & SDHCI_RESET_ALL && priv->reset) { ++ reset_control_assert(priv->reset); ++ udelay(1); ++ reset_control_deassert(priv->reset); ++ } ++ ++ sdhci_reset(host, mask); ++} ++ + static const struct sdhci_ops sdhci_dwcmshc_ops = { + .set_clock = sdhci_set_clock, + .set_bus_width = sdhci_set_bus_width, +@@ -269,7 +286,7 @@ static const struct sdhci_ops sdhci_dwcmshc_rk3568_ops = { + .set_bus_width = sdhci_set_bus_width, + .set_uhs_signaling = dwcmshc_set_uhs_signaling, + .get_max_clock = sdhci_pltfm_clk_get_max_clock, +- .reset = sdhci_reset, ++ .reset = rk35xx_sdhci_reset, + .adma_write_desc = dwcmshc_adma_write_desc, + }; + +@@ -292,6 +309,13 @@ static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_priv *dwc + int err; + struct rk3568_priv *priv = dwc_priv->priv; + ++ priv->reset = devm_reset_control_array_get_optional_exclusive(mmc_dev(host->mmc)); ++ if (IS_ERR(priv->reset)) { ++ err = PTR_ERR(priv->reset); ++ dev_err(mmc_dev(host->mmc), "failed to get reset control %d\n", err); ++ return err; ++ } ++ + priv->rockchip_clks[0].id = "axi"; + priv->rockchip_clks[1].id = "block"; + priv->rockchip_clks[2].id = "timer"; +-- +2.35.1 + diff --git a/queue-5.19/mmc-sdhci-of-dwcmshc-re-enable-support-for-the-bluef.patch b/queue-5.19/mmc-sdhci-of-dwcmshc-re-enable-support-for-the-bluef.patch new file mode 100644 index 00000000000..6c80953da61 --- /dev/null +++ b/queue-5.19/mmc-sdhci-of-dwcmshc-re-enable-support-for-the-bluef.patch @@ -0,0 +1,73 @@ +From 227760324716b54fa7906683d365cec88e9c975a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 9 Aug 2022 13:37:42 -0400 +Subject: mmc: sdhci-of-dwcmshc: Re-enable support for the BlueField-3 SoC + +From: Liming Sun + +[ Upstream commit a0753ef66c34c1739580219dca664eda648164b7 ] + +The commit 08f3dff799d4 (mmc: sdhci-of-dwcmshc: add rockchip platform +support") introduces the use of_device_get_match_data() to check for some +chips. Unfortunately, it also breaks the BlueField-3 FW, which uses ACPI. + +To fix the problem, let's add the ACPI match data and the corresponding +quirks to re-enable the support for the BlueField-3 SoC. + +Reviewed-by: David Woods +Signed-off-by: Liming Sun +Acked-by: Adrian Hunter +Fixes: 08f3dff799d4 ("mmc: sdhci-of-dwcmshc: add rockchip platform support") +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20220809173742.178440-1-limings@nvidia.com +[Ulf: Clarified the commit message a bit] +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/sdhci-of-dwcmshc.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c +index f5fd88c7adef1..335c88fd849c4 100644 +--- a/drivers/mmc/host/sdhci-of-dwcmshc.c ++++ b/drivers/mmc/host/sdhci-of-dwcmshc.c +@@ -296,6 +296,15 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_pdata = { + .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, + }; + ++#ifdef CONFIG_ACPI ++static const struct sdhci_pltfm_data sdhci_dwcmshc_bf3_pdata = { ++ .ops = &sdhci_dwcmshc_ops, ++ .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, ++ .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN | ++ SDHCI_QUIRK2_ACMD23_BROKEN, ++}; ++#endif ++ + static const struct sdhci_pltfm_data sdhci_dwcmshc_rk35xx_pdata = { + .ops = &sdhci_dwcmshc_rk35xx_ops, + .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN | +@@ -360,7 +369,10 @@ MODULE_DEVICE_TABLE(of, sdhci_dwcmshc_dt_ids); + + #ifdef CONFIG_ACPI + static const struct acpi_device_id sdhci_dwcmshc_acpi_ids[] = { +- { .id = "MLNXBF30" }, ++ { ++ .id = "MLNXBF30", ++ .driver_data = (kernel_ulong_t)&sdhci_dwcmshc_bf3_pdata, ++ }, + {} + }; + #endif +@@ -376,7 +388,7 @@ static int dwcmshc_probe(struct platform_device *pdev) + int err; + u32 extra; + +- pltfm_data = of_device_get_match_data(&pdev->dev); ++ pltfm_data = device_get_match_data(&pdev->dev); + if (!pltfm_data) { + dev_err(&pdev->dev, "Error: No device match data found\n"); + return -ENODEV; +-- +2.35.1 + diff --git a/queue-5.19/mmc-sdhci-of-dwcmshc-rename-rk3568-to-rk35xx.patch b/queue-5.19/mmc-sdhci-of-dwcmshc-rename-rk3568-to-rk35xx.patch new file mode 100644 index 00000000000..9cfc29715b8 --- /dev/null +++ b/queue-5.19/mmc-sdhci-of-dwcmshc-rename-rk3568-to-rk35xx.patch @@ -0,0 +1,204 @@ +From f7f6f416808b21fb19be0a18fdcc1de3decb278f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 May 2022 23:32:40 +0200 +Subject: mmc: sdhci-of-dwcmshc: rename rk3568 to rk35xx + +From: Sebastian Reichel + +[ Upstream commit 86e1a8e1f9b555af342c53ae06284eeeab9a4263 ] + +Prepare driver for rk3588 support by renaming the internal data +structures. + +Acked-by: Adrian Hunter +Signed-off-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20220504213251.264819-11-sebastian.reichel@collabora.com +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/sdhci-of-dwcmshc.c | 46 ++++++++++++++--------------- + 1 file changed, 23 insertions(+), 23 deletions(-) + +diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c +index 3a1b5ba364051..f5fd88c7adef1 100644 +--- a/drivers/mmc/host/sdhci-of-dwcmshc.c ++++ b/drivers/mmc/host/sdhci-of-dwcmshc.c +@@ -56,14 +56,14 @@ + #define DLL_LOCK_WO_TMOUT(x) \ + ((((x) & DWCMSHC_EMMC_DLL_LOCKED) == DWCMSHC_EMMC_DLL_LOCKED) && \ + (((x) & DWCMSHC_EMMC_DLL_TIMEOUT) == 0)) +-#define RK3568_MAX_CLKS 3 ++#define RK35xx_MAX_CLKS 3 + + #define BOUNDARY_OK(addr, len) \ + ((addr | (SZ_128M - 1)) == ((addr + len - 1) | (SZ_128M - 1))) + +-struct rk3568_priv { ++struct rk35xx_priv { + /* Rockchip specified optional clocks */ +- struct clk_bulk_data rockchip_clks[RK3568_MAX_CLKS]; ++ struct clk_bulk_data rockchip_clks[RK35xx_MAX_CLKS]; + struct reset_control *reset; + u8 txclk_tapnum; + }; +@@ -178,7 +178,7 @@ static void dwcmshc_rk3568_set_clock(struct sdhci_host *host, unsigned int clock + { + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct dwcmshc_priv *dwc_priv = sdhci_pltfm_priv(pltfm_host); +- struct rk3568_priv *priv = dwc_priv->priv; ++ struct rk35xx_priv *priv = dwc_priv->priv; + u8 txclk_tapnum = DLL_TXCLK_TAPNUM_DEFAULT; + u32 extra, reg; + int err; +@@ -281,7 +281,7 @@ static const struct sdhci_ops sdhci_dwcmshc_ops = { + .adma_write_desc = dwcmshc_adma_write_desc, + }; + +-static const struct sdhci_ops sdhci_dwcmshc_rk3568_ops = { ++static const struct sdhci_ops sdhci_dwcmshc_rk35xx_ops = { + .set_clock = dwcmshc_rk3568_set_clock, + .set_bus_width = sdhci_set_bus_width, + .set_uhs_signaling = dwcmshc_set_uhs_signaling, +@@ -296,18 +296,18 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_pdata = { + .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, + }; + +-static const struct sdhci_pltfm_data sdhci_dwcmshc_rk3568_pdata = { +- .ops = &sdhci_dwcmshc_rk3568_ops, ++static const struct sdhci_pltfm_data sdhci_dwcmshc_rk35xx_pdata = { ++ .ops = &sdhci_dwcmshc_rk35xx_ops, + .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN | + SDHCI_QUIRK_BROKEN_TIMEOUT_VAL, + .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN | + SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN, + }; + +-static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) ++static int dwcmshc_rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) + { + int err; +- struct rk3568_priv *priv = dwc_priv->priv; ++ struct rk35xx_priv *priv = dwc_priv->priv; + + priv->reset = devm_reset_control_array_get_optional_exclusive(mmc_dev(host->mmc)); + if (IS_ERR(priv->reset)) { +@@ -319,14 +319,14 @@ static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_priv *dwc + priv->rockchip_clks[0].id = "axi"; + priv->rockchip_clks[1].id = "block"; + priv->rockchip_clks[2].id = "timer"; +- err = devm_clk_bulk_get_optional(mmc_dev(host->mmc), RK3568_MAX_CLKS, ++ err = devm_clk_bulk_get_optional(mmc_dev(host->mmc), RK35xx_MAX_CLKS, + priv->rockchip_clks); + if (err) { + dev_err(mmc_dev(host->mmc), "failed to get clocks %d\n", err); + return err; + } + +- err = clk_bulk_prepare_enable(RK3568_MAX_CLKS, priv->rockchip_clks); ++ err = clk_bulk_prepare_enable(RK35xx_MAX_CLKS, priv->rockchip_clks); + if (err) { + dev_err(mmc_dev(host->mmc), "failed to enable clocks %d\n", err); + return err; +@@ -348,7 +348,7 @@ static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_priv *dwc + static const struct of_device_id sdhci_dwcmshc_dt_ids[] = { + { + .compatible = "rockchip,rk3568-dwcmshc", +- .data = &sdhci_dwcmshc_rk3568_pdata, ++ .data = &sdhci_dwcmshc_rk35xx_pdata, + }, + { + .compatible = "snps,dwcmshc-sdhci", +@@ -371,7 +371,7 @@ static int dwcmshc_probe(struct platform_device *pdev) + struct sdhci_pltfm_host *pltfm_host; + struct sdhci_host *host; + struct dwcmshc_priv *priv; +- struct rk3568_priv *rk_priv = NULL; ++ struct rk35xx_priv *rk_priv = NULL; + const struct sdhci_pltfm_data *pltfm_data; + int err; + u32 extra; +@@ -426,8 +426,8 @@ static int dwcmshc_probe(struct platform_device *pdev) + host->mmc_host_ops.request = dwcmshc_request; + host->mmc_host_ops.hs400_enhanced_strobe = dwcmshc_hs400_enhanced_strobe; + +- if (pltfm_data == &sdhci_dwcmshc_rk3568_pdata) { +- rk_priv = devm_kzalloc(&pdev->dev, sizeof(struct rk3568_priv), GFP_KERNEL); ++ if (pltfm_data == &sdhci_dwcmshc_rk35xx_pdata) { ++ rk_priv = devm_kzalloc(&pdev->dev, sizeof(struct rk35xx_priv), GFP_KERNEL); + if (!rk_priv) { + err = -ENOMEM; + goto err_clk; +@@ -435,7 +435,7 @@ static int dwcmshc_probe(struct platform_device *pdev) + + priv->priv = rk_priv; + +- err = dwcmshc_rk3568_init(host, priv); ++ err = dwcmshc_rk35xx_init(host, priv); + if (err) + goto err_clk; + } +@@ -452,7 +452,7 @@ static int dwcmshc_probe(struct platform_device *pdev) + clk_disable_unprepare(pltfm_host->clk); + clk_disable_unprepare(priv->bus_clk); + if (rk_priv) +- clk_bulk_disable_unprepare(RK3568_MAX_CLKS, ++ clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, + rk_priv->rockchip_clks); + free_pltfm: + sdhci_pltfm_free(pdev); +@@ -464,14 +464,14 @@ static int dwcmshc_remove(struct platform_device *pdev) + struct sdhci_host *host = platform_get_drvdata(pdev); + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); +- struct rk3568_priv *rk_priv = priv->priv; ++ struct rk35xx_priv *rk_priv = priv->priv; + + sdhci_remove_host(host, 0); + + clk_disable_unprepare(pltfm_host->clk); + clk_disable_unprepare(priv->bus_clk); + if (rk_priv) +- clk_bulk_disable_unprepare(RK3568_MAX_CLKS, ++ clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, + rk_priv->rockchip_clks); + sdhci_pltfm_free(pdev); + +@@ -484,7 +484,7 @@ static int dwcmshc_suspend(struct device *dev) + struct sdhci_host *host = dev_get_drvdata(dev); + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); +- struct rk3568_priv *rk_priv = priv->priv; ++ struct rk35xx_priv *rk_priv = priv->priv; + int ret; + + ret = sdhci_suspend_host(host); +@@ -496,7 +496,7 @@ static int dwcmshc_suspend(struct device *dev) + clk_disable_unprepare(priv->bus_clk); + + if (rk_priv) +- clk_bulk_disable_unprepare(RK3568_MAX_CLKS, ++ clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, + rk_priv->rockchip_clks); + + return ret; +@@ -507,7 +507,7 @@ static int dwcmshc_resume(struct device *dev) + struct sdhci_host *host = dev_get_drvdata(dev); + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); +- struct rk3568_priv *rk_priv = priv->priv; ++ struct rk35xx_priv *rk_priv = priv->priv; + int ret; + + ret = clk_prepare_enable(pltfm_host->clk); +@@ -521,7 +521,7 @@ static int dwcmshc_resume(struct device *dev) + } + + if (rk_priv) { +- ret = clk_bulk_prepare_enable(RK3568_MAX_CLKS, ++ ret = clk_bulk_prepare_enable(RK35xx_MAX_CLKS, + rk_priv->rockchip_clks); + if (ret) + return ret; +-- +2.35.1 + diff --git a/queue-5.19/neigh-fix-possible-dos-due-to-net-iface-start-stop-l.patch b/queue-5.19/neigh-fix-possible-dos-due-to-net-iface-start-stop-l.patch new file mode 100644 index 00000000000..6654eabd188 --- /dev/null +++ b/queue-5.19/neigh-fix-possible-dos-due-to-net-iface-start-stop-l.patch @@ -0,0 +1,129 @@ +From a342a6704d6271f5f7e55361263a85009d0e46c3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Aug 2022 18:20:11 +0300 +Subject: neigh: fix possible DoS due to net iface start/stop loop + +From: Denis V. Lunev + +[ Upstream commit 66ba215cb51323e4e55e38fd5f250e0fae0cbc94 ] + +Normal processing of ARP request (usually this is Ethernet broadcast +packet) coming to the host is looking like the following: +* the packet comes to arp_process() call and is passed through routing + procedure +* the request is put into the queue using pneigh_enqueue() if + corresponding ARP record is not local (common case for container + records on the host) +* the request is processed by timer (within 80 jiffies by default) and + ARP reply is sent from the same arp_process() using + NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED condition (flag is set inside + pneigh_enqueue()) + +And here the problem comes. Linux kernel calls pneigh_queue_purge() +which destroys the whole queue of ARP requests on ANY network interface +start/stop event through __neigh_ifdown(). + +This is actually not a problem within the original world as network +interface start/stop was accessible to the host 'root' only, which +could do more destructive things. But the world is changed and there +are Linux containers available. Here container 'root' has an access +to this API and could be considered as untrusted user in the hosting +(container's) world. + +Thus there is an attack vector to other containers on node when +container's root will endlessly start/stop interfaces. We have observed +similar situation on a real production node when docker container was +doing such activity and thus other containers on the node become not +accessible. + +The patch proposed doing very simple thing. It drops only packets from +the same namespace in the pneigh_queue_purge() where network interface +state change is detected. This is enough to prevent the problem for the +whole node preserving original semantics of the code. + +v2: + - do del_timer_sync() if queue is empty after pneigh_queue_purge() +v3: + - rebase to net tree + +Cc: "David S. Miller" +Cc: Eric Dumazet +Cc: Jakub Kicinski +Cc: Paolo Abeni +Cc: Daniel Borkmann +Cc: David Ahern +Cc: Yajun Deng +Cc: Roopa Prabhu +Cc: Christian Brauner +Cc: netdev@vger.kernel.org +Cc: linux-kernel@vger.kernel.org +Cc: Alexey Kuznetsov +Cc: Alexander Mikhalitsyn +Cc: Konstantin Khorenko +Cc: kernel@openvz.org +Cc: devel@openvz.org +Investigated-by: Alexander Mikhalitsyn +Signed-off-by: Denis V. Lunev +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/core/neighbour.c | 25 +++++++++++++++++-------- + 1 file changed, 17 insertions(+), 8 deletions(-) + +diff --git a/net/core/neighbour.c b/net/core/neighbour.c +index 54625287ee5b0..19d99d1eff532 100644 +--- a/net/core/neighbour.c ++++ b/net/core/neighbour.c +@@ -307,14 +307,23 @@ static int neigh_del_timer(struct neighbour *n) + return 0; + } + +-static void pneigh_queue_purge(struct sk_buff_head *list) ++static void pneigh_queue_purge(struct sk_buff_head *list, struct net *net) + { ++ unsigned long flags; + struct sk_buff *skb; + +- while ((skb = skb_dequeue(list)) != NULL) { +- dev_put(skb->dev); +- kfree_skb(skb); ++ spin_lock_irqsave(&list->lock, flags); ++ skb = skb_peek(list); ++ while (skb != NULL) { ++ struct sk_buff *skb_next = skb_peek_next(skb, list); ++ if (net == NULL || net_eq(dev_net(skb->dev), net)) { ++ __skb_unlink(skb, list); ++ dev_put(skb->dev); ++ kfree_skb(skb); ++ } ++ skb = skb_next; + } ++ spin_unlock_irqrestore(&list->lock, flags); + } + + static void neigh_flush_dev(struct neigh_table *tbl, struct net_device *dev, +@@ -385,9 +394,9 @@ static int __neigh_ifdown(struct neigh_table *tbl, struct net_device *dev, + write_lock_bh(&tbl->lock); + neigh_flush_dev(tbl, dev, skip_perm); + pneigh_ifdown_and_unlock(tbl, dev); +- +- del_timer_sync(&tbl->proxy_timer); +- pneigh_queue_purge(&tbl->proxy_queue); ++ pneigh_queue_purge(&tbl->proxy_queue, dev_net(dev)); ++ if (skb_queue_empty_lockless(&tbl->proxy_queue)) ++ del_timer_sync(&tbl->proxy_timer); + return 0; + } + +@@ -1787,7 +1796,7 @@ int neigh_table_clear(int index, struct neigh_table *tbl) + cancel_delayed_work_sync(&tbl->managed_work); + cancel_delayed_work_sync(&tbl->gc_work); + del_timer_sync(&tbl->proxy_timer); +- pneigh_queue_purge(&tbl->proxy_queue); ++ pneigh_queue_purge(&tbl->proxy_queue, NULL); + neigh_ifdown(tbl, NULL); + if (atomic_read(&tbl->entries)) + pr_crit("neighbour leakage\n"); +-- +2.35.1 + diff --git a/queue-5.19/net-lan966x-fix-checking-for-return-value-of-platfor.patch b/queue-5.19/net-lan966x-fix-checking-for-return-value-of-platfor.patch new file mode 100644 index 00000000000..f026c9300f8 --- /dev/null +++ b/queue-5.19/net-lan966x-fix-checking-for-return-value-of-platfor.patch @@ -0,0 +1,59 @@ +From ef5d3a55c5130ac374875ee3cc32ef5a1900c6ed Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Aug 2022 11:09:54 +0800 +Subject: net: lan966x: fix checking for return value of + platform_get_irq_byname() + +From: Li Qiong + +[ Upstream commit 40b4ac880e21d917da7f3752332fa57564a4c202 ] + +The platform_get_irq_byname() returns non-zero IRQ number +or negative error number. "if (irq)" always true, chang it +to "if (irq > 0)" + +Signed-off-by: Li Qiong +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c +index 1d6e3b641b2e6..d928b75f37803 100644 +--- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c ++++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c +@@ -710,7 +710,7 @@ static void lan966x_cleanup_ports(struct lan966x *lan966x) + disable_irq(lan966x->xtr_irq); + lan966x->xtr_irq = -ENXIO; + +- if (lan966x->ana_irq) { ++ if (lan966x->ana_irq > 0) { + disable_irq(lan966x->ana_irq); + lan966x->ana_irq = -ENXIO; + } +@@ -718,10 +718,10 @@ static void lan966x_cleanup_ports(struct lan966x *lan966x) + if (lan966x->fdma) + devm_free_irq(lan966x->dev, lan966x->fdma_irq, lan966x); + +- if (lan966x->ptp_irq) ++ if (lan966x->ptp_irq > 0) + devm_free_irq(lan966x->dev, lan966x->ptp_irq, lan966x); + +- if (lan966x->ptp_ext_irq) ++ if (lan966x->ptp_ext_irq > 0) + devm_free_irq(lan966x->dev, lan966x->ptp_ext_irq, lan966x); + } + +@@ -1049,7 +1049,7 @@ static int lan966x_probe(struct platform_device *pdev) + } + + lan966x->ana_irq = platform_get_irq_byname(pdev, "ana"); +- if (lan966x->ana_irq) { ++ if (lan966x->ana_irq > 0) { + err = devm_request_threaded_irq(&pdev->dev, lan966x->ana_irq, NULL, + lan966x_ana_irq_handler, IRQF_ONESHOT, + "ana irq", lan966x); +-- +2.35.1 + diff --git a/queue-5.19/netfilter-conntrack-nf_conntrack_procfs-should-no-lo.patch b/queue-5.19/netfilter-conntrack-nf_conntrack_procfs-should-no-lo.patch new file mode 100644 index 00000000000..74f12ea1066 --- /dev/null +++ b/queue-5.19/netfilter-conntrack-nf_conntrack_procfs-should-no-lo.patch @@ -0,0 +1,36 @@ +From 1480585ef8e54586b679e68bf897a5b09bb7942d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Aug 2022 12:39:20 +0200 +Subject: netfilter: conntrack: NF_CONNTRACK_PROCFS should no longer default to + y + +From: Geert Uytterhoeven + +[ Upstream commit aa5762c34213aba7a72dc58e70601370805fa794 ] + +NF_CONNTRACK_PROCFS was marked obsolete in commit 54b07dca68557b09 +("netfilter: provide config option to disable ancient procfs parts") in +v3.3. + +Signed-off-by: Geert Uytterhoeven +Signed-off-by: Florian Westphal +Signed-off-by: Sasha Levin +--- + net/netfilter/Kconfig | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig +index ddc54b6d18ee4..8c0fea1bdc8d6 100644 +--- a/net/netfilter/Kconfig ++++ b/net/netfilter/Kconfig +@@ -144,7 +144,6 @@ config NF_CONNTRACK_ZONES + + config NF_CONNTRACK_PROCFS + bool "Supply CT list in procfs (OBSOLETE)" +- default y + depends on PROC_FS + help + This option enables for the list of known conntrack entries +-- +2.35.1 + diff --git a/queue-5.19/platform-x86-serial-multi-instantiate-add-clsa0101-l.patch b/queue-5.19/platform-x86-serial-multi-instantiate-add-clsa0101-l.patch new file mode 100644 index 00000000000..a07daad79d2 --- /dev/null +++ b/queue-5.19/platform-x86-serial-multi-instantiate-add-clsa0101-l.patch @@ -0,0 +1,36 @@ +From 984a3a7a60056530125d10cf79ee579e95663841 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 27 Jul 2022 10:59:24 +0100 +Subject: platform/x86: serial-multi-instantiate: Add CLSA0101 Laptop + +From: Lucas Tanure + +[ Upstream commit 88392a0dd0ab263edb4ca416ebdecabd8289158a ] + +The device CLSA0101 has two instances of CS35L41 +connected by I2C. + +Signed-off-by: Lucas Tanure +Link: https://lore.kernel.org/r/20220727095924.80884-5-tanureal@opensource.cirrus.com +Link: https://lore.kernel.org/r/20220816194639.13870-1-cam@neo-zeon.de +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/serial-multi-instantiate.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/platform/x86/serial-multi-instantiate.c b/drivers/platform/x86/serial-multi-instantiate.c +index 1e8063b7c169e..e98007197cf52 100644 +--- a/drivers/platform/x86/serial-multi-instantiate.c ++++ b/drivers/platform/x86/serial-multi-instantiate.c +@@ -329,6 +329,7 @@ static const struct acpi_device_id smi_acpi_ids[] = { + { "CSC3551", (unsigned long)&cs35l41_hda }, + /* Non-conforming _HID for Cirrus Logic already released */ + { "CLSA0100", (unsigned long)&cs35l41_hda }, ++ { "CLSA0101", (unsigned long)&cs35l41_hda }, + { } + }; + MODULE_DEVICE_TABLE(acpi, smi_acpi_ids); +-- +2.35.1 + diff --git a/queue-5.19/rtla-fix-tracer-name.patch b/queue-5.19/rtla-fix-tracer-name.patch new file mode 100644 index 00000000000..e3e7f6cb5ea --- /dev/null +++ b/queue-5.19/rtla-fix-tracer-name.patch @@ -0,0 +1,64 @@ +From ee9e00555775a0b31eeabd70374df04a33214b0a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Aug 2022 20:03:43 +0200 +Subject: rtla: Fix tracer name + +From: Alexandre Vicenzi + +[ Upstream commit f1432cd24c240cedf78c0d026631e3b10052c8e1 ] + +The correct tracer name is timerlat and not timelat. + +Link: https://lore.kernel.org/linux-trace-devel/20220808180343.22262-1-alexandre.vicenzi@suse.com + +Signed-off-by: Alexandre Vicenzi +Signed-off-by: Steven Rostedt (Google) +Signed-off-by: Sasha Levin +--- + Documentation/tools/rtla/rtla-timerlat-hist.rst | 2 +- + tools/tracing/rtla/src/timerlat_hist.c | 2 +- + tools/tracing/rtla/src/timerlat_top.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Documentation/tools/rtla/rtla-timerlat-hist.rst b/Documentation/tools/rtla/rtla-timerlat-hist.rst +index e12eae1f33019..6bf7f0ca45564 100644 +--- a/Documentation/tools/rtla/rtla-timerlat-hist.rst ++++ b/Documentation/tools/rtla/rtla-timerlat-hist.rst +@@ -33,7 +33,7 @@ EXAMPLE + ======= + In the example below, **rtla timerlat hist** is set to run for *10* minutes, + in the cpus *0-4*, *skipping zero* only lines. Moreover, **rtla timerlat +-hist** will change the priority of the *timelat* threads to run under ++hist** will change the priority of the *timerlat* threads to run under + *SCHED_DEADLINE* priority, with a *10us* runtime every *1ms* period. The + *1ms* period is also passed to the *timerlat* tracer:: + +diff --git a/tools/tracing/rtla/src/timerlat_hist.c b/tools/tracing/rtla/src/timerlat_hist.c +index f3ec628f5e519..4b48af8a83096 100644 +--- a/tools/tracing/rtla/src/timerlat_hist.c ++++ b/tools/tracing/rtla/src/timerlat_hist.c +@@ -892,7 +892,7 @@ int timerlat_hist_main(int argc, char *argv[]) + return_value = 0; + + if (trace_is_off(&tool->trace, &record->trace)) { +- printf("rtla timelat hit stop tracing\n"); ++ printf("rtla timerlat hit stop tracing\n"); + if (params->trace_output) { + printf(" Saving trace to %s\n", params->trace_output); + save_trace_to_file(record->trace.inst, params->trace_output); +diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src/timerlat_top.c +index 35452a1d45e9f..3342719352222 100644 +--- a/tools/tracing/rtla/src/timerlat_top.c ++++ b/tools/tracing/rtla/src/timerlat_top.c +@@ -687,7 +687,7 @@ int timerlat_top_main(int argc, char *argv[]) + return_value = 0; + + if (trace_is_off(&top->trace, &record->trace)) { +- printf("rtla timelat hit stop tracing\n"); ++ printf("rtla timerlat hit stop tracing\n"); + if (params->trace_output) { + printf(" Saving trace to %s\n", params->trace_output); + save_trace_to_file(record->trace.inst, params->trace_output); +-- +2.35.1 + diff --git a/queue-5.19/s390-hypfs-avoid-error-message-under-kvm.patch b/queue-5.19/s390-hypfs-avoid-error-message-under-kvm.patch new file mode 100644 index 00000000000..bee3518cf23 --- /dev/null +++ b/queue-5.19/s390-hypfs-avoid-error-message-under-kvm.patch @@ -0,0 +1,60 @@ +From bf541578059f9c046f090172d8792988bdaeecfa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 20 Jun 2022 11:45:34 +0200 +Subject: s390/hypfs: avoid error message under KVM + +From: Juergen Gross + +[ Upstream commit 7b6670b03641ac308aaa6fa2e6f964ac993b5ea3 ] + +When booting under KVM the following error messages are issued: + +hypfs.7f5705: The hardware system does not support hypfs +hypfs.7a79f0: Initialization of hypfs failed with rc=-61 + +Demote the severity of first message from "error" to "info" and issue +the second message only in other error cases. + +Signed-off-by: Juergen Gross +Acked-by: Heiko Carstens +Acked-by: Christian Borntraeger +Link: https://lore.kernel.org/r/20220620094534.18967-1-jgross@suse.com +[arch/s390/hypfs/hypfs_diag.c changed description] +Signed-off-by: Alexander Gordeev +Signed-off-by: Sasha Levin +--- + arch/s390/hypfs/hypfs_diag.c | 2 +- + arch/s390/hypfs/inode.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c +index f0bc4dc3e9bf0..6511d15ace45e 100644 +--- a/arch/s390/hypfs/hypfs_diag.c ++++ b/arch/s390/hypfs/hypfs_diag.c +@@ -437,7 +437,7 @@ __init int hypfs_diag_init(void) + int rc; + + if (diag204_probe()) { +- pr_err("The hardware system does not support hypfs\n"); ++ pr_info("The hardware system does not support hypfs\n"); + return -ENODATA; + } + +diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c +index 5c97f48cea91d..ee919bfc81867 100644 +--- a/arch/s390/hypfs/inode.c ++++ b/arch/s390/hypfs/inode.c +@@ -496,9 +496,9 @@ static int __init hypfs_init(void) + hypfs_vm_exit(); + fail_hypfs_diag_exit: + hypfs_diag_exit(); ++ pr_err("Initialization of hypfs failed with rc=%i\n", rc); + fail_dbfs_exit: + hypfs_dbfs_exit(); +- pr_err("Initialization of hypfs failed with rc=%i\n", rc); + return rc; + } + device_initcall(hypfs_init) +-- +2.35.1 + diff --git a/queue-5.19/series b/queue-5.19/series index 6c1a9960531..4ba36b6a614 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -25,3 +25,44 @@ hid-asus-rog-nkey-ignore-portion-of-0x5a-report.patch hid-nintendo-fix-rumble-worker-null-pointer-deref.patch hid-thrustmaster-add-sparco-wheel-and-fix-array-length.patch hid-intel-ish-hid-ipc-add-meteor-lake-pci-device-id.patch +mmc-mtk-sd-clear-interrupts-when-cqe-off-disable.patch +mmc-sdhci-of-dwcmshc-add-reset-call-back-for-rockchi.patch +mmc-sdhci-of-dwcmshc-rename-rk3568-to-rk35xx.patch +mmc-sdhci-of-dwcmshc-re-enable-support-for-the-bluef.patch +fs-ntfs3-fix-work-with-fragmented-xattr.patch +asoc-sh-rz-ssi-improve-error-handling-in-rz_ssi_prob.patch +asoc-rt5640-fix-the-jd-voltage-dropping-issue.patch +rtla-fix-tracer-name.patch +drm-amd-display-add-a-missing-register-field-for-hpo.patch +drm-amd-display-device-flash-garbage-before-get-in-o.patch +drm-amd-display-avoid-mpc-infinite-loop.patch +drm-amd-display-fix-hdmi-vsif-v3-incorrect-issue.patch +drm-amd-display-for-stereo-keep-flip_any_frame.patch +drm-amd-display-clear-optc-underflow-before-turn-off.patch +drm-amd-display-fix-tdr-edp-and-usb4-display-light-u.patch +drm-amd-pm-skip-pptable-override-for-smu_v13_0_7.patch +drm-amdkfd-handle-restart-of-kfd_ioctl_wait_events.patch +drm-amd-pm-fix-a-potential-gpu_metrics_table-memory-.patch +ksmbd-return-status_bad_network_name-error-status-if.patch +net-lan966x-fix-checking-for-return-value-of-platfor.patch +neigh-fix-possible-dos-due-to-net-iface-start-stop-l.patch +alsa-hda-realtek-add-quirks-for-asus-zenbooks-using-.patch +s390-hypfs-avoid-error-message-under-kvm.patch +ksmbd-don-t-remove-dos-attribute-xattr-on-o_trunc-op.patch +drm-amdgpu-disable-3dcgcg-cgls-temporarily-due-to-st.patch +drm-amd-pm-add-missing-fini_microcode-interface-for-.patch +drm-amd-pm-add-missing-fini_xxxx-interfaces-for-some.patch +drm-amd-display-fix-pixel-clock-programming.patch +drm-amdgpu-increase-tlb-flush-timeout-for-sriov.patch +drm-amd-display-fix-plug-unplug-external-monitor-wil.patch +drm-amd-display-avoid-doing-vm_init-multiple-time.patch +drm-amdgpu-add-decode_iv_ts-helper-for-ih_v6-block.patch +drm-amdgpu-add-secure-display-ta-load-for-renoir.patch +drm-amdgpu-fix-interrupt-handling-on-ih_soft-ring.patch +netfilter-conntrack-nf_conntrack_procfs-should-no-lo.patch +testing-selftests-nft_flowtable.sh-use-random-netns-.patch +platform-x86-serial-multi-instantiate-add-clsa0101-l.patch +alsa-hda-cs8409-support-new-dolphin-variants.patch +btrfs-move-lockdep-class-helpers-to-locking.c.patch +btrfs-fix-lockdep-splat-with-reloc-root-extent-buffe.patch +btrfs-tree-checker-check-for-overlapping-extent-item.patch diff --git a/queue-5.19/testing-selftests-nft_flowtable.sh-use-random-netns-.patch b/queue-5.19/testing-selftests-nft_flowtable.sh-use-random-netns-.patch new file mode 100644 index 00000000000..426da7567ae --- /dev/null +++ b/queue-5.19/testing-selftests-nft_flowtable.sh-use-random-netns-.patch @@ -0,0 +1,429 @@ +From 87d5cb38705d0a80b7d258e8faa42128b70c506d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Aug 2022 14:15:21 +0200 +Subject: testing: selftests: nft_flowtable.sh: use random netns names + +From: Florian Westphal + +[ Upstream commit b71b7bfeac38c7a21c423ddafb29aa6258949df8 ] + +"ns1" is a too generic name, use a random suffix to avoid +errors when such a netns exists. Also allows to run multiple +instances of the script in parallel. + +Signed-off-by: Florian Westphal +Signed-off-by: Sasha Levin +--- + .../selftests/netfilter/nft_flowtable.sh | 246 +++++++++--------- + 1 file changed, 128 insertions(+), 118 deletions(-) + +diff --git a/tools/testing/selftests/netfilter/nft_flowtable.sh b/tools/testing/selftests/netfilter/nft_flowtable.sh +index d4ffebb989f88..c336e6c148d1f 100755 +--- a/tools/testing/selftests/netfilter/nft_flowtable.sh ++++ b/tools/testing/selftests/netfilter/nft_flowtable.sh +@@ -14,6 +14,11 @@ + # nft_flowtable.sh -o8000 -l1500 -r2000 + # + ++sfx=$(mktemp -u "XXXXXXXX") ++ns1="ns1-$sfx" ++ns2="ns2-$sfx" ++nsr1="nsr1-$sfx" ++nsr2="nsr2-$sfx" + + # Kselftest framework requirement - SKIP code is 4. + ksft_skip=4 +@@ -36,18 +41,17 @@ checktool (){ + checktool "nft --version" "run test without nft tool" + checktool "ip -Version" "run test without ip tool" + checktool "which nc" "run test without nc (netcat)" +-checktool "ip netns add nsr1" "create net namespace" ++checktool "ip netns add $nsr1" "create net namespace $nsr1" + +-ip netns add ns1 +-ip netns add ns2 +- +-ip netns add nsr2 ++ip netns add $ns1 ++ip netns add $ns2 ++ip netns add $nsr2 + + cleanup() { +- for i in 1 2; do +- ip netns del ns$i +- ip netns del nsr$i +- done ++ ip netns del $ns1 ++ ip netns del $ns2 ++ ip netns del $nsr1 ++ ip netns del $nsr2 + + rm -f "$ns1in" "$ns1out" + rm -f "$ns2in" "$ns2out" +@@ -59,22 +63,21 @@ trap cleanup EXIT + + sysctl -q net.netfilter.nf_log_all_netns=1 + +-ip link add veth0 netns nsr1 type veth peer name eth0 netns ns1 +-ip link add veth1 netns nsr1 type veth peer name veth0 netns nsr2 ++ip link add veth0 netns $nsr1 type veth peer name eth0 netns $ns1 ++ip link add veth1 netns $nsr1 type veth peer name veth0 netns $nsr2 + +-ip link add veth1 netns nsr2 type veth peer name eth0 netns ns2 ++ip link add veth1 netns $nsr2 type veth peer name eth0 netns $ns2 + + for dev in lo veth0 veth1; do +- for i in 1 2; do +- ip -net nsr$i link set $dev up +- done ++ ip -net $nsr1 link set $dev up ++ ip -net $nsr2 link set $dev up + done + +-ip -net nsr1 addr add 10.0.1.1/24 dev veth0 +-ip -net nsr1 addr add dead:1::1/64 dev veth0 ++ip -net $nsr1 addr add 10.0.1.1/24 dev veth0 ++ip -net $nsr1 addr add dead:1::1/64 dev veth0 + +-ip -net nsr2 addr add 10.0.2.1/24 dev veth1 +-ip -net nsr2 addr add dead:2::1/64 dev veth1 ++ip -net $nsr2 addr add 10.0.2.1/24 dev veth1 ++ip -net $nsr2 addr add dead:2::1/64 dev veth1 + + # set different MTUs so we need to push packets coming from ns1 (large MTU) + # to ns2 (smaller MTU) to stack either to perform fragmentation (ip_no_pmtu_disc=1), +@@ -106,49 +109,56 @@ do + esac + done + +-if ! ip -net nsr1 link set veth0 mtu $omtu; then ++if ! ip -net $nsr1 link set veth0 mtu $omtu; then + exit 1 + fi + +-ip -net ns1 link set eth0 mtu $omtu ++ip -net $ns1 link set eth0 mtu $omtu + +-if ! ip -net nsr2 link set veth1 mtu $rmtu; then ++if ! ip -net $nsr2 link set veth1 mtu $rmtu; then + exit 1 + fi + +-ip -net ns2 link set eth0 mtu $rmtu ++ip -net $ns2 link set eth0 mtu $rmtu + + # transfer-net between nsr1 and nsr2. + # these addresses are not used for connections. +-ip -net nsr1 addr add 192.168.10.1/24 dev veth1 +-ip -net nsr1 addr add fee1:2::1/64 dev veth1 +- +-ip -net nsr2 addr add 192.168.10.2/24 dev veth0 +-ip -net nsr2 addr add fee1:2::2/64 dev veth0 +- +-for i in 1 2; do +- ip netns exec nsr$i sysctl net.ipv4.conf.veth0.forwarding=1 > /dev/null +- ip netns exec nsr$i sysctl net.ipv4.conf.veth1.forwarding=1 > /dev/null +- +- ip -net ns$i link set lo up +- ip -net ns$i link set eth0 up +- ip -net ns$i addr add 10.0.$i.99/24 dev eth0 +- ip -net ns$i route add default via 10.0.$i.1 +- ip -net ns$i addr add dead:$i::99/64 dev eth0 +- ip -net ns$i route add default via dead:$i::1 +- if ! ip netns exec ns$i sysctl net.ipv4.tcp_no_metrics_save=1 > /dev/null; then ++ip -net $nsr1 addr add 192.168.10.1/24 dev veth1 ++ip -net $nsr1 addr add fee1:2::1/64 dev veth1 ++ ++ip -net $nsr2 addr add 192.168.10.2/24 dev veth0 ++ip -net $nsr2 addr add fee1:2::2/64 dev veth0 ++ ++for i in 0 1; do ++ ip netns exec $nsr1 sysctl net.ipv4.conf.veth$i.forwarding=1 > /dev/null ++ ip netns exec $nsr2 sysctl net.ipv4.conf.veth$i.forwarding=1 > /dev/null ++done ++ ++for ns in $ns1 $ns2;do ++ ip -net $ns link set lo up ++ ip -net $ns link set eth0 up ++ ++ if ! ip netns exec $ns sysctl net.ipv4.tcp_no_metrics_save=1 > /dev/null; then + echo "ERROR: Check Originator/Responder values (problem during address addition)" + exit 1 + fi +- + # don't set ip DF bit for first two tests +- ip netns exec ns$i sysctl net.ipv4.ip_no_pmtu_disc=1 > /dev/null ++ ip netns exec $ns sysctl net.ipv4.ip_no_pmtu_disc=1 > /dev/null + done + +-ip -net nsr1 route add default via 192.168.10.2 +-ip -net nsr2 route add default via 192.168.10.1 ++ip -net $ns1 addr add 10.0.1.99/24 dev eth0 ++ip -net $ns2 addr add 10.0.2.99/24 dev eth0 ++ip -net $ns1 route add default via 10.0.1.1 ++ip -net $ns2 route add default via 10.0.2.1 ++ip -net $ns1 addr add dead:1::99/64 dev eth0 ++ip -net $ns2 addr add dead:2::99/64 dev eth0 ++ip -net $ns1 route add default via dead:1::1 ++ip -net $ns2 route add default via dead:2::1 ++ ++ip -net $nsr1 route add default via 192.168.10.2 ++ip -net $nsr2 route add default via 192.168.10.1 + +-ip netns exec nsr1 nft -f - < /dev/null; then +- echo "ERROR: ns1 cannot reach ns2" 1>&2 ++if ! ip netns exec $ns1 ping -c 1 -q 10.0.2.99 > /dev/null; then ++ echo "ERROR: $ns1 cannot reach ns2" 1>&2 + exit 1 + fi + +-if ! ip netns exec ns2 ping -c 1 -q 10.0.1.99 > /dev/null; then +- echo "ERROR: ns2 cannot reach ns1" 1>&2 ++if ! ip netns exec $ns2 ping -c 1 -q 10.0.1.99 > /dev/null; then ++ echo "ERROR: $ns2 cannot reach $ns1" 1>&2 + exit 1 + fi + + if [ $ret -eq 0 ];then +- echo "PASS: netns routing/connectivity: ns1 can reach ns2" ++ echo "PASS: netns routing/connectivity: $ns1 can reach $ns2" + fi + + ns1in=$(mktemp) +@@ -312,24 +322,24 @@ make_file "$ns2in" + + # First test: + # No PMTU discovery, nsr1 is expected to fragment packets from ns1 to ns2 as needed. +-if test_tcp_forwarding ns1 ns2; then ++if test_tcp_forwarding $ns1 $ns2; then + echo "PASS: flow offloaded for ns1/ns2" + else + echo "FAIL: flow offload for ns1/ns2:" 1>&2 +- ip netns exec nsr1 nft list ruleset ++ ip netns exec $nsr1 nft list ruleset + ret=1 + fi + + # delete default route, i.e. ns2 won't be able to reach ns1 and + # will depend on ns1 being masqueraded in nsr1. + # expect ns1 has nsr1 address. +-ip -net ns2 route del default via 10.0.2.1 +-ip -net ns2 route del default via dead:2::1 +-ip -net ns2 route add 192.168.10.1 via 10.0.2.1 ++ip -net $ns2 route del default via 10.0.2.1 ++ip -net $ns2 route del default via dead:2::1 ++ip -net $ns2 route add 192.168.10.1 via 10.0.2.1 + + # Second test: + # Same, but with NAT enabled. +-ip netns exec nsr1 nft -f - <&2 +- ip netns exec nsr1 nft list ruleset ++ ip netns exec $nsr1 nft list ruleset + ret=1 + fi + + # Third test: + # Same as second test, but with PMTU discovery enabled. +-handle=$(ip netns exec nsr1 nft -a list table inet filter | grep something-to-grep-for | cut -d \# -f 2) ++handle=$(ip netns exec $nsr1 nft -a list table inet filter | grep something-to-grep-for | cut -d \# -f 2) + +-if ! ip netns exec nsr1 nft delete rule inet filter forward $handle; then ++if ! ip netns exec $nsr1 nft delete rule inet filter forward $handle; then + echo "FAIL: Could not delete large-packet accept rule" + exit 1 + fi + +-ip netns exec ns1 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null +-ip netns exec ns2 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null ++ip netns exec $ns1 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null ++ip netns exec $ns2 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null + +-if test_tcp_forwarding_nat ns1 ns2; then ++if test_tcp_forwarding_nat $ns1 $ns2; then + echo "PASS: flow offloaded for ns1/ns2 with NAT and pmtu discovery" + else + echo "FAIL: flow offload for ns1/ns2 with NAT and pmtu discovery" 1>&2 +- ip netns exec nsr1 nft list ruleset ++ ip netns exec $nsr1 nft list ruleset + fi + + # Another test: + # Add bridge interface br0 to Router1, with NAT enabled. +-ip -net nsr1 link add name br0 type bridge +-ip -net nsr1 addr flush dev veth0 +-ip -net nsr1 link set up dev veth0 +-ip -net nsr1 link set veth0 master br0 +-ip -net nsr1 addr add 10.0.1.1/24 dev br0 +-ip -net nsr1 addr add dead:1::1/64 dev br0 +-ip -net nsr1 link set up dev br0 ++ip -net $nsr1 link add name br0 type bridge ++ip -net $nsr1 addr flush dev veth0 ++ip -net $nsr1 link set up dev veth0 ++ip -net $nsr1 link set veth0 master br0 ++ip -net $nsr1 addr add 10.0.1.1/24 dev br0 ++ip -net $nsr1 addr add dead:1::1/64 dev br0 ++ip -net $nsr1 link set up dev br0 + +-ip netns exec nsr1 sysctl net.ipv4.conf.br0.forwarding=1 > /dev/null ++ip netns exec $nsr1 sysctl net.ipv4.conf.br0.forwarding=1 > /dev/null + + # br0 with NAT enabled. +-ip netns exec nsr1 nft -f - <&2 +- ip netns exec nsr1 nft list ruleset ++ ip netns exec $nsr1 nft list ruleset + ret=1 + fi + + # Another test: + # Add bridge interface br0 to Router1, with NAT and VLAN. +-ip -net nsr1 link set veth0 nomaster +-ip -net nsr1 link set down dev veth0 +-ip -net nsr1 link add link veth0 name veth0.10 type vlan id 10 +-ip -net nsr1 link set up dev veth0 +-ip -net nsr1 link set up dev veth0.10 +-ip -net nsr1 link set veth0.10 master br0 +- +-ip -net ns1 addr flush dev eth0 +-ip -net ns1 link add link eth0 name eth0.10 type vlan id 10 +-ip -net ns1 link set eth0 up +-ip -net ns1 link set eth0.10 up +-ip -net ns1 addr add 10.0.1.99/24 dev eth0.10 +-ip -net ns1 route add default via 10.0.1.1 +-ip -net ns1 addr add dead:1::99/64 dev eth0.10 +- +-if test_tcp_forwarding_nat ns1 ns2; then ++ip -net $nsr1 link set veth0 nomaster ++ip -net $nsr1 link set down dev veth0 ++ip -net $nsr1 link add link veth0 name veth0.10 type vlan id 10 ++ip -net $nsr1 link set up dev veth0 ++ip -net $nsr1 link set up dev veth0.10 ++ip -net $nsr1 link set veth0.10 master br0 ++ ++ip -net $ns1 addr flush dev eth0 ++ip -net $ns1 link add link eth0 name eth0.10 type vlan id 10 ++ip -net $ns1 link set eth0 up ++ip -net $ns1 link set eth0.10 up ++ip -net $ns1 addr add 10.0.1.99/24 dev eth0.10 ++ip -net $ns1 route add default via 10.0.1.1 ++ip -net $ns1 addr add dead:1::99/64 dev eth0.10 ++ ++if test_tcp_forwarding_nat $ns1 $ns2; then + echo "PASS: flow offloaded for ns1/ns2 with bridge NAT and VLAN" + else + echo "FAIL: flow offload for ns1/ns2 with bridge NAT and VLAN" 1>&2 +- ip netns exec nsr1 nft list ruleset ++ ip netns exec $nsr1 nft list ruleset + ret=1 + fi + + # restore test topology (remove bridge and VLAN) +-ip -net nsr1 link set veth0 nomaster +-ip -net nsr1 link set veth0 down +-ip -net nsr1 link set veth0.10 down +-ip -net nsr1 link delete veth0.10 type vlan +-ip -net nsr1 link delete br0 type bridge +-ip -net ns1 addr flush dev eth0.10 +-ip -net ns1 link set eth0.10 down +-ip -net ns1 link set eth0 down +-ip -net ns1 link delete eth0.10 type vlan ++ip -net $nsr1 link set veth0 nomaster ++ip -net $nsr1 link set veth0 down ++ip -net $nsr1 link set veth0.10 down ++ip -net $nsr1 link delete veth0.10 type vlan ++ip -net $nsr1 link delete br0 type bridge ++ip -net $ns1 addr flush dev eth0.10 ++ip -net $ns1 link set eth0.10 down ++ip -net $ns1 link set eth0 down ++ip -net $ns1 link delete eth0.10 type vlan + + # restore address in ns1 and nsr1 +-ip -net ns1 link set eth0 up +-ip -net ns1 addr add 10.0.1.99/24 dev eth0 +-ip -net ns1 route add default via 10.0.1.1 +-ip -net ns1 addr add dead:1::99/64 dev eth0 +-ip -net ns1 route add default via dead:1::1 +-ip -net nsr1 addr add 10.0.1.1/24 dev veth0 +-ip -net nsr1 addr add dead:1::1/64 dev veth0 +-ip -net nsr1 link set up dev veth0 ++ip -net $ns1 link set eth0 up ++ip -net $ns1 addr add 10.0.1.99/24 dev eth0 ++ip -net $ns1 route add default via 10.0.1.1 ++ip -net $ns1 addr add dead:1::99/64 dev eth0 ++ip -net $ns1 route add default via dead:1::1 ++ip -net $nsr1 addr add 10.0.1.1/24 dev veth0 ++ip -net $nsr1 addr add dead:1::1/64 dev veth0 ++ip -net $nsr1 link set up dev veth0 + + KEY_SHA="0x"$(ps -xaf | sha1sum | cut -d " " -f 1) + KEY_AES="0x"$(ps -xaf | md5sum | cut -d " " -f 1) +@@ -480,23 +490,23 @@ do_esp() { + + } + +-do_esp nsr1 192.168.10.1 192.168.10.2 10.0.1.0/24 10.0.2.0/24 $SPI1 $SPI2 ++do_esp $nsr1 192.168.10.1 192.168.10.2 10.0.1.0/24 10.0.2.0/24 $SPI1 $SPI2 + +-do_esp nsr2 192.168.10.2 192.168.10.1 10.0.2.0/24 10.0.1.0/24 $SPI2 $SPI1 ++do_esp $nsr2 192.168.10.2 192.168.10.1 10.0.2.0/24 10.0.1.0/24 $SPI2 $SPI1 + +-ip netns exec nsr1 nft delete table ip nat ++ip netns exec $nsr1 nft delete table ip nat + + # restore default routes +-ip -net ns2 route del 192.168.10.1 via 10.0.2.1 +-ip -net ns2 route add default via 10.0.2.1 +-ip -net ns2 route add default via dead:2::1 ++ip -net $ns2 route del 192.168.10.1 via 10.0.2.1 ++ip -net $ns2 route add default via 10.0.2.1 ++ip -net $ns2 route add default via dead:2::1 + +-if test_tcp_forwarding ns1 ns2; then ++if test_tcp_forwarding $ns1 $ns2; then + echo "PASS: ipsec tunnel mode for ns1/ns2" + else + echo "FAIL: ipsec tunnel mode for ns1/ns2" +- ip netns exec nsr1 nft list ruleset 1>&2 +- ip netns exec nsr1 cat /proc/net/xfrm_stat 1>&2 ++ ip netns exec $nsr1 nft list ruleset 1>&2 ++ ip netns exec $nsr1 cat /proc/net/xfrm_stat 1>&2 + fi + + exit $ret +-- +2.35.1 + -- 2.47.3