6.6-stable patches

added patches:
	btrfs-fix-the-length-of-reserved-qgroup-to-free.patch
	drm-tests-build-kms-helpers-when-drm_kunit_test_helpers-is-enabled.patch

diff --git a/queue-6.6/btrfs-fix-the-length-of-reserved-qgroup-to-free.patch b/queue-6.6/btrfs-fix-the-length-of-reserved-qgroup-to-free.patch
new file mode 100644 (file)
index 0000000..13a0281
--- /dev/null
+++ b/queue-6.6/btrfs-fix-the-length-of-reserved-qgroup-to-free.patch
@@ -0,0 +1,38 @@
+From 2b084d8205949dd804e279df8e68531da78be1e8 Mon Sep 17 00:00:00 2001
+From: Haisu Wang <haisuwang@tencent.com>
+Date: Fri, 25 Oct 2024 14:54:40 +0800
+Subject: btrfs: fix the length of reserved qgroup to free
+
+From: Haisu Wang <haisuwang@tencent.com>
+
+commit 2b084d8205949dd804e279df8e68531da78be1e8 upstream.
+
+The dealloc flag may be cleared and the extent won't reach the disk in
+cow_file_range when errors path. The reserved qgroup space is freed in
+commit 30479f31d44d ("btrfs: fix qgroup reserve leaks in
+cow_file_range"). However, the length of untouched region to free needs
+to be adjusted with the correct remaining region size.
+
+Fixes: 30479f31d44d ("btrfs: fix qgroup reserve leaks in cow_file_range")
+CC: stable@vger.kernel.org # 6.11+
+Reviewed-by: Qu Wenruo <wqu@suse.com>
+Reviewed-by: Boris Burkov <boris@bur.io>
+Signed-off-by: Haisu Wang <haisuwang@tencent.com>
+Reviewed-by: David Sterba <dsterba@suse.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/btrfs/inode.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/btrfs/inode.c
++++ b/fs/btrfs/inode.c
+@@ -1560,7 +1560,7 @@ out_unlock:
+               clear_bits |= EXTENT_CLEAR_DATA_RESV;
+               extent_clear_unlock_delalloc(inode, start, end, locked_page,
+                                            clear_bits, page_ops);
+-              btrfs_qgroup_free_data(inode, NULL, start, cur_alloc_size, NULL);
++              btrfs_qgroup_free_data(inode, NULL, start, end - start + 1, NULL);
+       }
+       return ret;
+ }

diff --git a/queue-6.6/drm-tests-build-kms-helpers-when-drm_kunit_test_helpers-is-enabled.patch b/queue-6.6/drm-tests-build-kms-helpers-when-drm_kunit_test_helpers-is-enabled.patch
new file mode 100644 (file)
index 0000000..0920df3
--- /dev/null
+++ b/queue-6.6/drm-tests-build-kms-helpers-when-drm_kunit_test_helpers-is-enabled.patch
@@ -0,0 +1,46 @@
+From f1a785101d50f5844ed29341142e7224b87f705d Mon Sep 17 00:00:00 2001
+From: Karolina Stolarek <karolina.stolarek@intel.com>
+Date: Wed, 13 Mar 2024 15:21:42 +0100
+Subject: drm/tests: Build KMS helpers when DRM_KUNIT_TEST_HELPERS is enabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Karolina Stolarek <karolina.stolarek@intel.com>
+
+commit f1a785101d50f5844ed29341142e7224b87f705d upstream.
+
+Commit 66671944e176 ("drm/tests: helpers: Add atomic helpers")
+introduced a dependency on CRTC helpers in KUnit test helpers.
+Select the former when building KUnit test helpers to avoid
+linker errors.
+
+Fixes: 66671944e176 ("drm/tests: helpers: Add atomic helpers")
+Cc: Maxime Ripard <mripard@kernel.org>
+Cc: Maíra Canal <mcanal@igalia.com>
+Signed-off-by: Karolina Stolarek <karolina.stolarek@intel.com>
+Link: https://lore.kernel.org/r/20240313142142.1318718-1-karolina.stolarek@intel.com
+Signed-off-by: Maxime Ripard <mripard@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/Kconfig
++++ b/drivers/gpu/drm/Kconfig
+@@ -69,6 +69,7 @@ config DRM_USE_DYNAMIC_DEBUG
+ config DRM_KUNIT_TEST_HELPERS
+       tristate
+       depends on DRM && KUNIT
++      select DRM_KMS_HELPER
+       help
+         KUnit Helpers for KMS drivers.
+ 
+@@ -79,7 +80,6 @@ config DRM_KUNIT_TEST
+       select DRM_DISPLAY_DP_HELPER
+       select DRM_DISPLAY_HELPER
+       select DRM_LIB_RANDOM
+-      select DRM_KMS_HELPER
+       select DRM_BUDDY
+       select DRM_EXPORT_FOR_TESTS if m
+       select DRM_KUNIT_TEST_HELPERS

diff --git a/queue-6.6/series b/queue-6.6/series
index 98b930f9c5497ec4bd69bb68794c3ce1daf51cba..263864e67d80cf5207209dce91d0e35fe53a24ef 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -389,3 +389,5 @@ sign-file-extract-cert-use-pkcs11-provider-for-openssl-major-3.patch
 mips-dec-declare-which_prom-as-static.patch
 mips-cevt-ds1287-add-missing-ds1287.h-include.patch
 mips-ds1287-match-ds1287_set_base_clock-function-types.patch
+btrfs-fix-the-length-of-reserved-qgroup-to-free.patch
+drm-tests-build-kms-helpers-when-drm_kunit_test_helpers-is-enabled.patch