From 29de1a5f5387dcfc5c1b173c1111f2e763b678d8 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Fri, 15 Aug 2025 14:01:00 -0700 Subject: [PATCH] patches: Drop KCSAN dummy variable patch It has been included in 6.12.42, 6.6.102, and 6.1.148. Signed-off-by: Nathan Chancellor --- ...kcsan_test_initialize_dummy_variable.patch | 47 ------------------- patches/6.1/series | 1 - ...kcsan_test_initialize_dummy_variable.patch | 47 ------------------- patches/6.12/series | 1 - ...kcsan_test_initialize_dummy_variable.patch | 47 ------------------- patches/6.6/series | 1 - 6 files changed, 144 deletions(-) delete mode 100644 patches/6.1/20250722_elver_kcsan_test_initialize_dummy_variable.patch delete mode 100644 patches/6.12/20250722_elver_kcsan_test_initialize_dummy_variable.patch delete mode 100644 patches/6.6/20250722_elver_kcsan_test_initialize_dummy_variable.patch diff --git a/patches/6.1/20250722_elver_kcsan_test_initialize_dummy_variable.patch b/patches/6.1/20250722_elver_kcsan_test_initialize_dummy_variable.patch deleted file mode 100644 index 0eb4f368..00000000 --- a/patches/6.1/20250722_elver_kcsan_test_initialize_dummy_variable.patch +++ /dev/null @@ -1,47 +0,0 @@ -From git@z Thu Jan 1 00:00:00 1970 -Subject: [PATCH] kcsan: test: Initialize dummy variable -From: Marco Elver -Date: Tue, 22 Jul 2025 20:38:35 +0200 -Message-Id: <20250722183839.151809-1-elver@google.com> -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 7bit - -Newer compiler versions rightfully point out: - - kernel/kcsan/kcsan_test.c:591:41: error: variable 'dummy' is - uninitialized when passed as a const pointer argument here - [-Werror,-Wuninitialized-const-pointer] - 591 | KCSAN_EXPECT_READ_BARRIER(atomic_read(&dummy), false); - | ^~~~~ - 1 error generated. - -Although this particular test does not care about the value stored in -the dummy atomic variable, let's silence the warning. - -Link: https://lkml.kernel.org/r/CA+G9fYu8JY=k-r0hnBRSkQQrFJ1Bz+ShdXNwC1TNeMt0eXaxeA@mail.gmail.com -Fixes: 8bc32b348178 ("kcsan: test: Add test cases for memory barrier instrumentation") -Reported-by: Linux Kernel Functional Testing -Signed-off-by: Marco Elver -Reviewed-by: Alexander Potapenko -Link: https://lore.kernel.org/r/20250722183839.151809-1-elver@google.com ---- - kernel/kcsan/kcsan_test.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/kcsan/kcsan_test.c b/kernel/kcsan/kcsan_test.c -index c2871180edcc..49ab81faaed9 100644 ---- a/kernel/kcsan/kcsan_test.c -+++ b/kernel/kcsan/kcsan_test.c -@@ -533,7 +533,7 @@ static void test_barrier_nothreads(struct kunit *test) - struct kcsan_scoped_access *reorder_access = NULL; - #endif - arch_spinlock_t arch_spinlock = __ARCH_SPIN_LOCK_UNLOCKED; -- atomic_t dummy; -+ atomic_t dummy = ATOMIC_INIT(0); - - KCSAN_TEST_REQUIRES(test, reorder_access != NULL); - KCSAN_TEST_REQUIRES(test, IS_ENABLED(CONFIG_SMP)); --- -2.50.0.727.gbf7dc18ff4-goog - diff --git a/patches/6.1/series b/patches/6.1/series index f5ad867f..4f16cf07 100644 --- a/patches/6.1/series +++ b/patches/6.1/series @@ -1,6 +1,5 @@ 0001-HACK-rtl8712-Zero-initialize-val-in-read_rfreg_hdl.patch 8d1b02e5d7e3a6d2acffb1f4c094678fda9e3456.patch 81284e86bf8849f8e98e8ead3ff5811926b2107f.patch -20250722_elver_kcsan_test_initialize_dummy_variable.patch 20250728_justinstitt_kvm_arm64_sys_regs_disable_wuninitialized_const_pointer_warning.patch ccc35ff2fd2911986b716a87fe65e03fac2312c9.patch diff --git a/patches/6.12/20250722_elver_kcsan_test_initialize_dummy_variable.patch b/patches/6.12/20250722_elver_kcsan_test_initialize_dummy_variable.patch deleted file mode 100644 index 0eb4f368..00000000 --- a/patches/6.12/20250722_elver_kcsan_test_initialize_dummy_variable.patch +++ /dev/null @@ -1,47 +0,0 @@ -From git@z Thu Jan 1 00:00:00 1970 -Subject: [PATCH] kcsan: test: Initialize dummy variable -From: Marco Elver -Date: Tue, 22 Jul 2025 20:38:35 +0200 -Message-Id: <20250722183839.151809-1-elver@google.com> -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 7bit - -Newer compiler versions rightfully point out: - - kernel/kcsan/kcsan_test.c:591:41: error: variable 'dummy' is - uninitialized when passed as a const pointer argument here - [-Werror,-Wuninitialized-const-pointer] - 591 | KCSAN_EXPECT_READ_BARRIER(atomic_read(&dummy), false); - | ^~~~~ - 1 error generated. - -Although this particular test does not care about the value stored in -the dummy atomic variable, let's silence the warning. - -Link: https://lkml.kernel.org/r/CA+G9fYu8JY=k-r0hnBRSkQQrFJ1Bz+ShdXNwC1TNeMt0eXaxeA@mail.gmail.com -Fixes: 8bc32b348178 ("kcsan: test: Add test cases for memory barrier instrumentation") -Reported-by: Linux Kernel Functional Testing -Signed-off-by: Marco Elver -Reviewed-by: Alexander Potapenko -Link: https://lore.kernel.org/r/20250722183839.151809-1-elver@google.com ---- - kernel/kcsan/kcsan_test.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/kcsan/kcsan_test.c b/kernel/kcsan/kcsan_test.c -index c2871180edcc..49ab81faaed9 100644 ---- a/kernel/kcsan/kcsan_test.c -+++ b/kernel/kcsan/kcsan_test.c -@@ -533,7 +533,7 @@ static void test_barrier_nothreads(struct kunit *test) - struct kcsan_scoped_access *reorder_access = NULL; - #endif - arch_spinlock_t arch_spinlock = __ARCH_SPIN_LOCK_UNLOCKED; -- atomic_t dummy; -+ atomic_t dummy = ATOMIC_INIT(0); - - KCSAN_TEST_REQUIRES(test, reorder_access != NULL); - KCSAN_TEST_REQUIRES(test, IS_ENABLED(CONFIG_SMP)); --- -2.50.0.727.gbf7dc18ff4-goog - diff --git a/patches/6.12/series b/patches/6.12/series index da6f7552..77b150c5 100644 --- a/patches/6.12/series +++ b/patches/6.12/series @@ -3,5 +3,4 @@ 81284e86bf8849f8e98e8ead3ff5811926b2107f.patch 20250715_nathan_media_s5p_mfc_always_pass_null_to_s5p_mfc_cmd_host2risc_v6.patch 20250715_nathan_wifi_mt76_mt7996_initialize_hdr_before_passing_to_skb_put_data.patch -20250722_elver_kcsan_test_initialize_dummy_variable.patch c90f2e1172c51fa25492471dc9910e2d7c1444b9.patch diff --git a/patches/6.6/20250722_elver_kcsan_test_initialize_dummy_variable.patch b/patches/6.6/20250722_elver_kcsan_test_initialize_dummy_variable.patch deleted file mode 100644 index 0eb4f368..00000000 --- a/patches/6.6/20250722_elver_kcsan_test_initialize_dummy_variable.patch +++ /dev/null @@ -1,47 +0,0 @@ -From git@z Thu Jan 1 00:00:00 1970 -Subject: [PATCH] kcsan: test: Initialize dummy variable -From: Marco Elver -Date: Tue, 22 Jul 2025 20:38:35 +0200 -Message-Id: <20250722183839.151809-1-elver@google.com> -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 7bit - -Newer compiler versions rightfully point out: - - kernel/kcsan/kcsan_test.c:591:41: error: variable 'dummy' is - uninitialized when passed as a const pointer argument here - [-Werror,-Wuninitialized-const-pointer] - 591 | KCSAN_EXPECT_READ_BARRIER(atomic_read(&dummy), false); - | ^~~~~ - 1 error generated. - -Although this particular test does not care about the value stored in -the dummy atomic variable, let's silence the warning. - -Link: https://lkml.kernel.org/r/CA+G9fYu8JY=k-r0hnBRSkQQrFJ1Bz+ShdXNwC1TNeMt0eXaxeA@mail.gmail.com -Fixes: 8bc32b348178 ("kcsan: test: Add test cases for memory barrier instrumentation") -Reported-by: Linux Kernel Functional Testing -Signed-off-by: Marco Elver -Reviewed-by: Alexander Potapenko -Link: https://lore.kernel.org/r/20250722183839.151809-1-elver@google.com ---- - kernel/kcsan/kcsan_test.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/kcsan/kcsan_test.c b/kernel/kcsan/kcsan_test.c -index c2871180edcc..49ab81faaed9 100644 ---- a/kernel/kcsan/kcsan_test.c -+++ b/kernel/kcsan/kcsan_test.c -@@ -533,7 +533,7 @@ static void test_barrier_nothreads(struct kunit *test) - struct kcsan_scoped_access *reorder_access = NULL; - #endif - arch_spinlock_t arch_spinlock = __ARCH_SPIN_LOCK_UNLOCKED; -- atomic_t dummy; -+ atomic_t dummy = ATOMIC_INIT(0); - - KCSAN_TEST_REQUIRES(test, reorder_access != NULL); - KCSAN_TEST_REQUIRES(test, IS_ENABLED(CONFIG_SMP)); --- -2.50.0.727.gbf7dc18ff4-goog - diff --git a/patches/6.6/series b/patches/6.6/series index 881b4348..6b03cee7 100644 --- a/patches/6.6/series +++ b/patches/6.6/series @@ -2,5 +2,4 @@ 8d1b02e5d7e3a6d2acffb1f4c094678fda9e3456.patch 81284e86bf8849f8e98e8ead3ff5811926b2107f.patch 20250715_nathan_wifi_mt76_mt7996_initialize_hdr_before_passing_to_skb_put_data.patch -20250722_elver_kcsan_test_initialize_dummy_variable.patch ccc35ff2fd2911986b716a87fe65e03fac2312c9.patch