From: Rickard x Andersson rickaran@axis.com
In GCC version 12.1 a checksum field was added.
This patch fixes a kernel crash occurring during boot when using gcov-kernel with GCC version 12.2. The crash occurred on a system running on i.MX6SX.
Fixes: 977ef30a7d88 ("gcov: support GCC 12.1 and newer compilers") Signed-off-by: Rickard x Andersson rickaran@axis.com Reviewed-by: Peter Oberparleiter oberpar@linux.ibm.com Tested-by: Peter Oberparleiter oberpar@linux.ibm.com Cc: stable@vger.kernel.org --- kernel/gcov/gcc_4_7.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c index c699feda21ac..04880d8fba25 100644 --- a/kernel/gcov/gcc_4_7.c +++ b/kernel/gcov/gcc_4_7.c @@ -85,6 +85,7 @@ struct gcov_fn_info { * @version: gcov version magic indicating the gcc version used for compilation * @next: list head for a singly-linked list * @stamp: uniquifying time stamp + * @checksum: unique object checksum * @filename: name of the associated gcov data file * @merge: merge functions (null for unused counter type) * @n_functions: number of instrumented functions @@ -97,6 +98,10 @@ struct gcov_info { unsigned int version; struct gcov_info *next; unsigned int stamp; + /* Since GCC 12.1 a checksum field is added. */ +#if (__GNUC__ >= 12) + unsigned int checksum; +#endif const char *filename; void (*merge[GCOV_COUNTERS])(gcov_type *, unsigned int); unsigned int n_functions;
On 20.12.2022 11:23, Rickard Andersson wrote:
From: Rickard x Andersson rickaran@axis.com
In GCC version 12.1 a checksum field was added.
This patch fixes a kernel crash occurring during boot when using gcov-kernel with GCC version 12.2. The crash occurred on a system running on i.MX6SX.
Fixes: 977ef30a7d88 ("gcov: support GCC 12.1 and newer compilers") Signed-off-by: Rickard x Andersson rickaran@axis.com Reviewed-by: Peter Oberparleiter oberpar@linux.ibm.com Tested-by: Peter Oberparleiter oberpar@linux.ibm.com Cc: stable@vger.kernel.org
Thank you for the fix!
Andrew, could you pick this up via your tree?
kernel/gcov/gcc_4_7.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c index c699feda21ac..04880d8fba25 100644 --- a/kernel/gcov/gcc_4_7.c +++ b/kernel/gcov/gcc_4_7.c @@ -85,6 +85,7 @@ struct gcov_fn_info {
- @version: gcov version magic indicating the gcc version used for compilation
- @next: list head for a singly-linked list
- @stamp: uniquifying time stamp
- @checksum: unique object checksum
- @filename: name of the associated gcov data file
- @merge: merge functions (null for unused counter type)
- @n_functions: number of instrumented functions
@@ -97,6 +98,10 @@ struct gcov_info { unsigned int version; struct gcov_info *next; unsigned int stamp;
- /* Since GCC 12.1 a checksum field is added. */
+#if (__GNUC__ >= 12)
- unsigned int checksum;
+#endif const char *filename; void (*merge[GCOV_COUNTERS])(gcov_type *, unsigned int); unsigned int n_functions;
On 20.12.2022 18:53, Peter Oberparleiter wrote:
On 20.12.2022 11:23, Rickard Andersson wrote:
From: Rickard x Andersson rickaran@axis.com
In GCC version 12.1 a checksum field was added.
This patch fixes a kernel crash occurring during boot when using gcov-kernel with GCC version 12.2. The crash occurred on a system running on i.MX6SX.
Fixes: 977ef30a7d88 ("gcov: support GCC 12.1 and newer compilers") Signed-off-by: Rickard x Andersson rickaran@axis.com Reviewed-by: Peter Oberparleiter oberpar@linux.ibm.com Tested-by: Peter Oberparleiter oberpar@linux.ibm.com Cc: stable@vger.kernel.org
Thank you for the fix!
Andrew, could you pick this up via your tree?
Oh, I forgot to add Martin's R-B from the v1 review (see [1]), so please include:
Reviewed-By: Martin Liska mliska@suse.cz
https://lore.kernel.org/lkml/20221219150621.3310033-1-rickaran@axis.com/t/#m...
kernel/gcov/gcc_4_7.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c index c699feda21ac..04880d8fba25 100644 --- a/kernel/gcov/gcc_4_7.c +++ b/kernel/gcov/gcc_4_7.c @@ -85,6 +85,7 @@ struct gcov_fn_info {
- @version: gcov version magic indicating the gcc version used for compilation
- @next: list head for a singly-linked list
- @stamp: uniquifying time stamp
- @checksum: unique object checksum
- @filename: name of the associated gcov data file
- @merge: merge functions (null for unused counter type)
- @n_functions: number of instrumented functions
@@ -97,6 +98,10 @@ struct gcov_info { unsigned int version; struct gcov_info *next; unsigned int stamp;
- /* Since GCC 12.1 a checksum field is added. */
+#if (__GNUC__ >= 12)
- unsigned int checksum;
+#endif const char *filename; void (*merge[GCOV_COUNTERS])(gcov_type *, unsigned int); unsigned int n_functions;
linux-stable-mirror@lists.linaro.org
-
Peter Oberparleiter -
Rickard Andersson