From 9a955abb3f517dc6fffb973584b7b2f4ecc32fce Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Tue, 15 Sep 2020 20:21:45 -0400 Subject: [PATCH] Fixes for 4.4 Signed-off-by: Sasha Levin --- queue-4.4/gcov-add-support-for-gcc-10.1.patch | 60 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 61 insertions(+) create mode 100644 queue-4.4/gcov-add-support-for-gcc-10.1.patch diff --git a/queue-4.4/gcov-add-support-for-gcc-10.1.patch b/queue-4.4/gcov-add-support-for-gcc-10.1.patch new file mode 100644 index 00000000000..1eae891e4af --- /dev/null +++ b/queue-4.4/gcov-add-support-for-gcc-10.1.patch @@ -0,0 +1,60 @@ +From 2f0d6ab78bfe46b225a4e29a8caff75b1833348d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Sep 2020 14:52:01 +0200 +Subject: gcov: add support for GCC 10.1 + +From: Peter Oberparleiter + +[ Upstream commit 40249c6962075c040fd071339acae524f18bfac9 ] + +Using gcov to collect coverage data for kernels compiled with GCC 10.1 +causes random malfunctions and kernel crashes. This is the result of a +changed GCOV_COUNTERS value in GCC 10.1 that causes a mismatch between +the layout of the gcov_info structure created by GCC profiling code and +the related structure used by the kernel. + +Fix this by updating the in-kernel GCOV_COUNTERS value. Also re-enable +config GCOV_KERNEL for use with GCC 10. + +Reported-by: Colin Ian King +Reported-by: Leon Romanovsky +Signed-off-by: Peter Oberparleiter +Tested-by: Leon Romanovsky +Tested-and-Acked-by: Colin Ian King +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + kernel/gcov/Kconfig | 1 - + kernel/gcov/gcc_4_7.c | 4 +++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/kernel/gcov/Kconfig b/kernel/gcov/Kconfig +index 1d78ed19a3512..1276aabaab550 100644 +--- a/kernel/gcov/Kconfig ++++ b/kernel/gcov/Kconfig +@@ -3,7 +3,6 @@ menu "GCOV-based kernel profiling" + config GCOV_KERNEL + bool "Enable gcov-based kernel profiling" + depends on DEBUG_FS +- depends on !CC_IS_GCC || GCC_VERSION < 100000 + select CONSTRUCTORS if !UML + default n + ---help--- +diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c +index 46a18e72bce61..6d5ef6220afe7 100644 +--- a/kernel/gcov/gcc_4_7.c ++++ b/kernel/gcov/gcc_4_7.c +@@ -18,7 +18,9 @@ + #include + #include "gcov.h" + +-#if (__GNUC__ >= 7) ++#if (__GNUC__ >= 10) ++#define GCOV_COUNTERS 8 ++#elif (__GNUC__ >= 7) + #define GCOV_COUNTERS 9 + #elif (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) + #define GCOV_COUNTERS 10 +-- +2.25.1 + diff --git a/queue-4.4/series b/queue-4.4/series index 84f72a4cad8..1185fd8bb2e 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -25,3 +25,4 @@ video-fbdev-fix-oob-read-in-vga_8planes_imageblit.patch usb-serial-ftdi_sio-add-ids-for-xsens-mti-usb-converter.patch usb-serial-option-add-support-for-sim7070-sim7080-sim7090-modules.patch usb-fix-out-of-sync-data-toggle-if-a-configured-device-is-reconfigured.patch +gcov-add-support-for-gcc-10.1.patch -- 2.47.3