FAILED: patch "[PATCH] Compiler Attributes: disable __counted_by for clang < 19.1.3" failed to apply to 6.6-stable tree

All of lore.kernel.org
 help / color / mirror / Atom feed

* FAILED: patch "[PATCH] Compiler Attributes: disable __counted_by for clang < 19.1.3" failed to apply to 6.6-stable tree
@ 2024-12-02 15:09 gregkh
  2024-12-02 16:23 ` [PATCH 6.6.y] Compiler Attributes: disable __counted_by for clang < 19.1.3 Jan Hendrik Farr
  0 siblings, 1 reply; 4+ messages in thread
From: gregkh @ 2024-12-02 15:09 UTC (permalink / raw)
  To: kernel, kees, nathan, ojeda, oliver.sang, thorsten.blum; +Cc: stable


The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x f06e108a3dc53c0f5234d18de0bd224753db5019
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024120221-gizzard-thermos-ba19@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..

Possible dependencies:



thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From f06e108a3dc53c0f5234d18de0bd224753db5019 Mon Sep 17 00:00:00 2001
From: Jan Hendrik Farr <kernel@jfarr.cc>
Date: Tue, 29 Oct 2024 15:00:36 +0100
Subject: [PATCH] Compiler Attributes: disable __counted_by for clang < 19.1.3

This patch disables __counted_by for clang versions < 19.1.3 because
of the two issues listed below. It does this by introducing
CONFIG_CC_HAS_COUNTED_BY.

1. clang < 19.1.2 has a bug that can lead to __bdos returning 0:
https://github.com/llvm/llvm-project/pull/110497

2. clang < 19.1.3 has a bug that can lead to __bdos being off by 4:
https://github.com/llvm/llvm-project/pull/112636

Fixes: c8248faf3ca2 ("Compiler Attributes: counted_by: Adjust name and identifier expansion")
Cc: stable@vger.kernel.org # 6.6.x: 16c31dd7fdf6: Compiler Attributes: counted_by: bump min gcc version
Cc: stable@vger.kernel.org # 6.6.x: 2993eb7a8d34: Compiler Attributes: counted_by: fixup clang URL
Cc: stable@vger.kernel.org # 6.6.x: 231dc3f0c936: lkdtm/bugs: Improve warning message for compilers without counted_by support
Cc: stable@vger.kernel.org # 6.6.x
Reported-by: Nathan Chancellor <nathan@kernel.org>
Closes: https://lore.kernel.org/all/20240913164630.GA4091534@thelio-3990X/
Reported-by: kernel test robot <oliver.sang@intel.com>
Closes: https://lore.kernel.org/oe-lkp/202409260949.a1254989-oliver.sang@intel.com
Link: https://lore.kernel.org/all/Zw8iawAF5W2uzGuh@archlinux/T/#m204c09f63c076586a02d194b87dffc7e81b8de7b
Suggested-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Jan Hendrik Farr <kernel@jfarr.cc>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Miguel Ojeda <ojeda@kernel.org>
Reviewed-by: Thorsten Blum <thorsten.blum@linux.dev>
Link: https://lore.kernel.org/r/20241029140036.577804-2-kernel@jfarr.cc
Signed-off-by: Kees Cook <kees@kernel.org>

diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c
index 62ba01525479..376047beea3d 100644
--- a/drivers/misc/lkdtm/bugs.c
+++ b/drivers/misc/lkdtm/bugs.c
@@ -445,7 +445,7 @@ static void lkdtm_FAM_BOUNDS(void)
 
 	pr_err("FAIL: survived access of invalid flexible array member index!\n");
 
-	if (!__has_attribute(__counted_by__))
+	if (!IS_ENABLED(CONFIG_CC_HAS_COUNTED_BY))
 		pr_warn("This is expected since this %s was built with a compiler that does not support __counted_by\n",
 			lkdtm_kernel_info);
 	else if (IS_ENABLED(CONFIG_UBSAN_BOUNDS))
diff --git a/include/linux/compiler_attributes.h b/include/linux/compiler_attributes.h
index 32284cd26d52..c16d4199bf92 100644
--- a/include/linux/compiler_attributes.h
+++ b/include/linux/compiler_attributes.h
@@ -94,19 +94,6 @@
 # define __copy(symbol)
 #endif
 
-/*
- * Optional: only supported since gcc >= 15
- * Optional: only supported since clang >= 18
- *
- *   gcc: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108896
- * clang: https://github.com/llvm/llvm-project/pull/76348
- */
-#if __has_attribute(__counted_by__)
-# define __counted_by(member)		__attribute__((__counted_by__(member)))
-#else
-# define __counted_by(member)
-#endif
-
 /*
  * Optional: not supported by gcc
  * Optional: only supported since clang >= 14.0
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 1a957ea2f4fe..639be0f30b45 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -323,6 +323,25 @@ struct ftrace_likely_data {
 #define __no_sanitize_or_inline __always_inline
 #endif
 
+/*
+ * Optional: only supported since gcc >= 15
+ * Optional: only supported since clang >= 18
+ *
+ *   gcc: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108896
+ * clang: https://github.com/llvm/llvm-project/pull/76348
+ *
+ * __bdos on clang < 19.1.2 can erroneously return 0:
+ * https://github.com/llvm/llvm-project/pull/110497
+ *
+ * __bdos on clang < 19.1.3 can be off by 4:
+ * https://github.com/llvm/llvm-project/pull/112636
+ */
+#ifdef CONFIG_CC_HAS_COUNTED_BY
+# define __counted_by(member)		__attribute__((__counted_by__(member)))
+#else
+# define __counted_by(member)
+#endif
+
 /*
  * Apply __counted_by() when the Endianness matches to increase test coverage.
  */
diff --git a/init/Kconfig b/init/Kconfig
index 530a382ee0fe..92f106cf5572 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -116,6 +116,15 @@ config CC_HAS_ASM_INLINE
 config CC_HAS_NO_PROFILE_FN_ATTR
 	def_bool $(success,echo '__attribute__((no_profile_instrument_function)) int x();' | $(CC) -x c - -c -o /dev/null -Werror)
 
+config CC_HAS_COUNTED_BY
+	# TODO: when gcc 15 is released remove the build test and add
+	# a gcc version check
+	def_bool $(success,echo 'struct flex { int count; int array[] __attribute__((__counted_by__(count))); };' | $(CC) $(CLANG_FLAGS) -x c - -c -o /dev/null -Werror)
+	# clang needs to be at least 19.1.3 to avoid __bdos miscalculations
+	# https://github.com/llvm/llvm-project/pull/110497
+	# https://github.com/llvm/llvm-project/pull/112636
+	depends on !(CC_IS_CLANG && CLANG_VERSION < 190103)
+
 config PAHOLE_VERSION
 	int
 	default $(shell,$(srctree)/scripts/pahole-version.sh $(PAHOLE))
diff --git a/lib/overflow_kunit.c b/lib/overflow_kunit.c
index 2abc78367dd1..5222c6393f11 100644
--- a/lib/overflow_kunit.c
+++ b/lib/overflow_kunit.c
@@ -1187,7 +1187,7 @@ static void DEFINE_FLEX_test(struct kunit *test)
 {
 	/* Using _RAW_ on a __counted_by struct will initialize "counter" to zero */
 	DEFINE_RAW_FLEX(struct foo, two_but_zero, array, 2);
-#if __has_attribute(__counted_by__)
+#ifdef CONFIG_CC_HAS_COUNTED_BY
 	int expected_raw_size = sizeof(struct foo);
 #else
 	int expected_raw_size = sizeof(struct foo) + 2 * sizeof(s16);


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 6.6.y] Compiler Attributes: disable __counted_by for clang < 19.1.3
  2024-12-02 15:09 FAILED: patch "[PATCH] Compiler Attributes: disable __counted_by for clang < 19.1.3" failed to apply to 6.6-stable tree gregkh
@ 2024-12-02 16:23 ` Jan Hendrik Farr
  2024-12-03 18:13     ` Sasha Levin
  0 siblings, 1 reply; 4+ messages in thread
From: Jan Hendrik Farr @ 2024-12-02 16:23 UTC (permalink / raw)
  To: stable
  Cc: gregkh, Jan Hendrik Farr, Nathan Chancellor, kernel test robot,
	Miguel Ojeda, Thorsten Blum, Kees Cook

commit f06e108a3dc53c0f5234d18de0bd224753db5019 upstream.

This patch disables __counted_by for clang versions < 19.1.3 because
of the two issues listed below. It does this by introducing
CONFIG_CC_HAS_COUNTED_BY.

1. clang < 19.1.2 has a bug that can lead to __bdos returning 0:
https://github.com/llvm/llvm-project/pull/110497

2. clang < 19.1.3 has a bug that can lead to __bdos being off by 4:
https://github.com/llvm/llvm-project/pull/112636

Fixes: c8248faf3ca2 ("Compiler Attributes: counted_by: Adjust name and identifier expansion")
Cc: stable@vger.kernel.org # 6.6.x: 16c31dd7fdf6: Compiler Attributes: counted_by: bump min gcc version
Cc: stable@vger.kernel.org # 6.6.x: 2993eb7a8d34: Compiler Attributes: counted_by: fixup clang URL
Cc: stable@vger.kernel.org # 6.6.x: 231dc3f0c936: lkdtm/bugs: Improve warning message for compilers without counted_by support
Cc: stable@vger.kernel.org # 6.6.x
Reported-by: Nathan Chancellor <nathan@kernel.org>
Closes: https://lore.kernel.org/all/20240913164630.GA4091534@thelio-3990X/
Reported-by: kernel test robot <oliver.sang@intel.com>
Closes: https://lore.kernel.org/oe-lkp/202409260949.a1254989-oliver.sang@intel.com
Link: https://lore.kernel.org/all/Zw8iawAF5W2uzGuh@archlinux/T/#m204c09f63c076586a02d194b87dffc7e81b8de7b
Suggested-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Jan Hendrik Farr <kernel@jfarr.cc>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Miguel Ojeda <ojeda@kernel.org>
Reviewed-by: Thorsten Blum <thorsten.blum@linux.dev>
Link: https://lore.kernel.org/r/20241029140036.577804-2-kernel@jfarr.cc
Signed-off-by: Kees Cook <kees@kernel.org>
(cherry picked from commit f06e108a3dc53c0f5234d18de0bd224753db5019)
Signed-off-by: Jan Hendrik Farr <kernel@jfarr.cc>
---
 drivers/misc/lkdtm/bugs.c           |  4 ++--
 include/linux/compiler_attributes.h | 13 -------------
 include/linux/compiler_types.h      | 19 +++++++++++++++++++
 init/Kconfig                        |  9 +++++++++
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c
index c66cc05a68c4..473ec58f87a2 100644
--- a/drivers/misc/lkdtm/bugs.c
+++ b/drivers/misc/lkdtm/bugs.c
@@ -388,8 +388,8 @@ static void lkdtm_FAM_BOUNDS(void)
 
 	pr_err("FAIL: survived access of invalid flexible array member index!\n");
 
-	if (!__has_attribute(__counted_by__))
-		pr_warn("This is expected since this %s was built a compiler supporting __counted_by\n",
+	if (!IS_ENABLED(CONFIG_CC_HAS_COUNTED_BY))
+		pr_warn("This is expected since this %s was built with a compiler that does not support __counted_by\n",
 			lkdtm_kernel_info);
 	else if (IS_ENABLED(CONFIG_UBSAN_BOUNDS))
 		pr_expected_config(CONFIG_UBSAN_TRAP);
diff --git a/include/linux/compiler_attributes.h b/include/linux/compiler_attributes.h
index f5859b8c68b4..7e0a2efd90ca 100644
--- a/include/linux/compiler_attributes.h
+++ b/include/linux/compiler_attributes.h
@@ -94,19 +94,6 @@
 # define __copy(symbol)
 #endif
 
-/*
- * Optional: only supported since gcc >= 14
- * Optional: only supported since clang >= 18
- *
- *   gcc: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108896
- * clang: https://reviews.llvm.org/D148381
- */
-#if __has_attribute(__counted_by__)
-# define __counted_by(member)		__attribute__((__counted_by__(member)))
-#else
-# define __counted_by(member)
-#endif
-
 /*
  * Optional: not supported by gcc
  * Optional: only supported since clang >= 14.0
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 0a182f088c89..02f616dfb15f 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -295,6 +295,25 @@ struct ftrace_likely_data {
 #define __no_sanitize_or_inline __always_inline
 #endif
 
+/*
+ * Optional: only supported since gcc >= 15
+ * Optional: only supported since clang >= 18
+ *
+ *   gcc: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108896
+ * clang: https://github.com/llvm/llvm-project/pull/76348
+ *
+ * __bdos on clang < 19.1.2 can erroneously return 0:
+ * https://github.com/llvm/llvm-project/pull/110497
+ *
+ * __bdos on clang < 19.1.3 can be off by 4:
+ * https://github.com/llvm/llvm-project/pull/112636
+ */
+#ifdef CONFIG_CC_HAS_COUNTED_BY
+# define __counted_by(member)		__attribute__((__counted_by__(member)))
+#else
+# define __counted_by(member)
+#endif
+
 /* Section for code which can't be instrumented at all */
 #define __noinstr_section(section)					\
 	noinline notrace __attribute((__section__(section)))		\
diff --git a/init/Kconfig b/init/Kconfig
index 6054ba684c53..60ed7713b5ee 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -107,6 +107,15 @@ config CC_HAS_ASM_INLINE
 config CC_HAS_NO_PROFILE_FN_ATTR
 	def_bool $(success,echo '__attribute__((no_profile_instrument_function)) int x();' | $(CC) -x c - -c -o /dev/null -Werror)
 
+config CC_HAS_COUNTED_BY
+	# TODO: when gcc 15 is released remove the build test and add
+	# a gcc version check
+	def_bool $(success,echo 'struct flex { int count; int array[] __attribute__((__counted_by__(count))); };' | $(CC) $(CLANG_FLAGS) -x c - -c -o /dev/null -Werror)
+	# clang needs to be at least 19.1.3 to avoid __bdos miscalculations
+	# https://github.com/llvm/llvm-project/pull/110497
+	# https://github.com/llvm/llvm-project/pull/112636
+	depends on !(CC_IS_CLANG && CLANG_VERSION < 190103)
+
 config PAHOLE_VERSION
 	int
 	default $(shell,$(srctree)/scripts/pahole-version.sh $(PAHOLE))
-- 
2.47.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 6.6.y] Compiler Attributes: disable __counted_by for clang < 19.1.3
@ 2024-12-03 18:13     ` Sasha Levin
  0 siblings, 0 replies; 4+ messages in thread
From: Sasha Levin @ 2024-12-02 19:15 UTC (permalink / raw)
  To: stable; +Cc: Jan Hendrik Farr, Sasha Levin

[ Sasha's backport helper bot ]

Hi,

The upstream commit SHA1 provided is correct: f06e108a3dc53c0f5234d18de0bd224753db5019


Status in newer kernel trees:
6.12.y | Not found
6.11.y | Not found
6.6.y | Not found

Note: The patch differs from the upstream commit:
---
1:  f06e108a3dc53 ! 1:  22bf799c95105 Compiler Attributes: disable __counted_by for clang < 19.1.3
    @@ Metadata
      ## Commit message ##
         Compiler Attributes: disable __counted_by for clang < 19.1.3
     
    +    commit f06e108a3dc53c0f5234d18de0bd224753db5019 upstream.
    +
         This patch disables __counted_by for clang versions < 19.1.3 because
         of the two issues listed below. It does this by introducing
         CONFIG_CC_HAS_COUNTED_BY.
    @@ Commit message
         Reviewed-by: Thorsten Blum <thorsten.blum@linux.dev>
         Link: https://lore.kernel.org/r/20241029140036.577804-2-kernel@jfarr.cc
         Signed-off-by: Kees Cook <kees@kernel.org>
    +    (cherry picked from commit f06e108a3dc53c0f5234d18de0bd224753db5019)
    +    Signed-off-by: Jan Hendrik Farr <kernel@jfarr.cc>
     
      ## drivers/misc/lkdtm/bugs.c ##
     @@ drivers/misc/lkdtm/bugs.c: static void lkdtm_FAM_BOUNDS(void)
    @@ drivers/misc/lkdtm/bugs.c: static void lkdtm_FAM_BOUNDS(void)
      	pr_err("FAIL: survived access of invalid flexible array member index!\n");
      
     -	if (!__has_attribute(__counted_by__))
    +-		pr_warn("This is expected since this %s was built a compiler supporting __counted_by\n",
     +	if (!IS_ENABLED(CONFIG_CC_HAS_COUNTED_BY))
    - 		pr_warn("This is expected since this %s was built with a compiler that does not support __counted_by\n",
    ++		pr_warn("This is expected since this %s was built with a compiler that does not support __counted_by\n",
      			lkdtm_kernel_info);
      	else if (IS_ENABLED(CONFIG_UBSAN_BOUNDS))
    + 		pr_expected_config(CONFIG_UBSAN_TRAP);
     
      ## include/linux/compiler_attributes.h ##
     @@
    @@ include/linux/compiler_attributes.h
      #endif
      
     -/*
    -- * Optional: only supported since gcc >= 15
    +- * Optional: only supported since gcc >= 14
     - * Optional: only supported since clang >= 18
     - *
     - *   gcc: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108896
    -- * clang: https://github.com/llvm/llvm-project/pull/76348
    +- * clang: https://reviews.llvm.org/D148381
     - */
     -#if __has_attribute(__counted_by__)
     -# define __counted_by(member)		__attribute__((__counted_by__(member)))
    @@ include/linux/compiler_types.h: struct ftrace_likely_data {
     +# define __counted_by(member)
     +#endif
     +
    - /*
    -  * Apply __counted_by() when the Endianness matches to increase test coverage.
    -  */
    + /* Section for code which can't be instrumented at all */
    + #define __noinstr_section(section)					\
    + 	noinline notrace __attribute((__section__(section)))		\
     
      ## init/Kconfig ##
     @@ init/Kconfig: config CC_HAS_ASM_INLINE
    @@ init/Kconfig: config CC_HAS_ASM_INLINE
      config PAHOLE_VERSION
      	int
      	default $(shell,$(srctree)/scripts/pahole-version.sh $(PAHOLE))
    -
    - ## lib/overflow_kunit.c ##
    -@@ lib/overflow_kunit.c: static void DEFINE_FLEX_test(struct kunit *test)
    - {
    - 	/* Using _RAW_ on a __counted_by struct will initialize "counter" to zero */
    - 	DEFINE_RAW_FLEX(struct foo, two_but_zero, array, 2);
    --#if __has_attribute(__counted_by__)
    -+#ifdef CONFIG_CC_HAS_COUNTED_BY
    - 	int expected_raw_size = sizeof(struct foo);
    - #else
    - 	int expected_raw_size = sizeof(struct foo) + 2 * sizeof(s16);
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y        |  Success    |  Success   |

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 6.6.y] Compiler Attributes: disable __counted_by for clang < 19.1.3
@ 2024-12-03 18:13     ` Sasha Levin
  0 siblings, 0 replies; 4+ messages in thread
From: Sasha Levin @ 2024-12-03 18:13 UTC (permalink / raw)
  To: stable; +Cc: Jan Hendrik Farr, Sasha Levin

[ Sasha's backport helper bot ]

Hi,

The upstream commit SHA1 provided is correct: f06e108a3dc53c0f5234d18de0bd224753db5019


Status in newer kernel trees:
6.12.y | Not found
6.11.y | Not found
6.6.y | Not found

Note: The patch differs from the upstream commit:
---
1:  f06e108a3dc53 ! 1:  22bf799c95105 Compiler Attributes: disable __counted_by for clang < 19.1.3
    @@ Metadata
      ## Commit message ##
         Compiler Attributes: disable __counted_by for clang < 19.1.3
     
    +    commit f06e108a3dc53c0f5234d18de0bd224753db5019 upstream.
    +
         This patch disables __counted_by for clang versions < 19.1.3 because
         of the two issues listed below. It does this by introducing
         CONFIG_CC_HAS_COUNTED_BY.
    @@ Commit message
         Reviewed-by: Thorsten Blum <thorsten.blum@linux.dev>
         Link: https://lore.kernel.org/r/20241029140036.577804-2-kernel@jfarr.cc
         Signed-off-by: Kees Cook <kees@kernel.org>
    +    (cherry picked from commit f06e108a3dc53c0f5234d18de0bd224753db5019)
    +    Signed-off-by: Jan Hendrik Farr <kernel@jfarr.cc>
     
      ## drivers/misc/lkdtm/bugs.c ##
     @@ drivers/misc/lkdtm/bugs.c: static void lkdtm_FAM_BOUNDS(void)
    @@ drivers/misc/lkdtm/bugs.c: static void lkdtm_FAM_BOUNDS(void)
      	pr_err("FAIL: survived access of invalid flexible array member index!\n");
      
     -	if (!__has_attribute(__counted_by__))
    +-		pr_warn("This is expected since this %s was built a compiler supporting __counted_by\n",
     +	if (!IS_ENABLED(CONFIG_CC_HAS_COUNTED_BY))
    - 		pr_warn("This is expected since this %s was built with a compiler that does not support __counted_by\n",
    ++		pr_warn("This is expected since this %s was built with a compiler that does not support __counted_by\n",
      			lkdtm_kernel_info);
      	else if (IS_ENABLED(CONFIG_UBSAN_BOUNDS))
    + 		pr_expected_config(CONFIG_UBSAN_TRAP);
     
      ## include/linux/compiler_attributes.h ##
     @@
    @@ include/linux/compiler_attributes.h
      #endif
      
     -/*
    -- * Optional: only supported since gcc >= 15
    +- * Optional: only supported since gcc >= 14
     - * Optional: only supported since clang >= 18
     - *
     - *   gcc: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108896
    -- * clang: https://github.com/llvm/llvm-project/pull/76348
    +- * clang: https://reviews.llvm.org/D148381
     - */
     -#if __has_attribute(__counted_by__)
     -# define __counted_by(member)		__attribute__((__counted_by__(member)))
    @@ include/linux/compiler_types.h: struct ftrace_likely_data {
     +# define __counted_by(member)
     +#endif
     +
    - /*
    -  * Apply __counted_by() when the Endianness matches to increase test coverage.
    -  */
    + /* Section for code which can't be instrumented at all */
    + #define __noinstr_section(section)					\
    + 	noinline notrace __attribute((__section__(section)))		\
     
      ## init/Kconfig ##
     @@ init/Kconfig: config CC_HAS_ASM_INLINE
    @@ init/Kconfig: config CC_HAS_ASM_INLINE
      config PAHOLE_VERSION
      	int
      	default $(shell,$(srctree)/scripts/pahole-version.sh $(PAHOLE))
    -
    - ## lib/overflow_kunit.c ##
    -@@ lib/overflow_kunit.c: static void DEFINE_FLEX_test(struct kunit *test)
    - {
    - 	/* Using _RAW_ on a __counted_by struct will initialize "counter" to zero */
    - 	DEFINE_RAW_FLEX(struct foo, two_but_zero, array, 2);
    --#if __has_attribute(__counted_by__)
    -+#ifdef CONFIG_CC_HAS_COUNTED_BY
    - 	int expected_raw_size = sizeof(struct foo);
    - #else
    - 	int expected_raw_size = sizeof(struct foo) + 2 * sizeof(s16);
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y        |  Success    |  Success   |

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-12-03 18:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-02 15:09 FAILED: patch "[PATCH] Compiler Attributes: disable __counted_by for clang < 19.1.3" failed to apply to 6.6-stable tree gregkh
2024-12-02 16:23 ` [PATCH 6.6.y] Compiler Attributes: disable __counted_by for clang < 19.1.3 Jan Hendrik Farr
2024-12-02 19:15   ` Sasha Levin
2024-12-03 18:13     ` Sasha Levin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.