Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1724376

[PATCH 3.18 03/24] gcov: add support for GCC 5.1

Show all headers | View raw

3.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Lorenzo Stoakes <lstoakes@gmail.com>

commit 3e44c471a2dab210f7e9b1e5f7d4d54d52df59eb upstream.

Fix kernel gcov support for GCC 5.1.  Similar to commit a992bf836f9
("gcov: add support for GCC 4.9"), this patch takes into account the
existence of a new gcov counter (see gcc's gcc/gcov-counter.def.)

Firstly, it increments GCOV_COUNTERS (to 10), which makes the data
structure struct gcov_info compatible with GCC 5.1.

Secondly, a corresponding counter function __gcov_merge_icall_topn (Top N
value tracking for indirect calls) is included in base.c with the other
gcov counters unused for kernel profiling.

Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com>
Cc: Andrey Ryabinin <a.ryabinin@samsung.com>
Cc: Yuan Pengfei <coolypf@qq.com>
Tested-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 kernel/gcov/base.c    |    6 ++++++
 kernel/gcov/gcc_4_7.c |    4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

--- a/kernel/gcov/base.c
+++ b/kernel/gcov/base.c
@@ -91,6 +91,12 @@ void __gcov_merge_time_profile(gcov_type
 }
 EXPORT_SYMBOL(__gcov_merge_time_profile);
 
+void __gcov_merge_icall_topn(gcov_type *counters, unsigned int n_counters)
+{
+	/* Unused. */
+}
+EXPORT_SYMBOL(__gcov_merge_icall_topn);
+
 /**
  * gcov_enable_events - enable event reporting through gcov_event()
  *
--- a/kernel/gcov/gcc_4_7.c
+++ b/kernel/gcov/gcc_4_7.c
@@ -18,7 +18,9 @@
 #include <linux/vmalloc.h>
 #include "gcov.h"
 
-#if __GNUC__ == 4 && __GNUC_MINOR__ >= 9
+#if __GNUC__ == 5 && __GNUC_MINOR__ >= 1
+#define GCOV_COUNTERS			10
+#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9
 #define GCOV_COUNTERS			9
 #else
 #define GCOV_COUNTERS			8

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 3.18 00/24] 3.18.69-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 15/24] mm: cma: fix incorrect type conversion for size during dma allocation Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 11/24] mm: cma: split cma-reserved in dmesg log Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 05/24] gcov: support GCC 7.1 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 23/24] scsi: sg: reset res_in_use after unlinking reserved array Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 17/24] arm64: flush FP/SIMD state correctly after execve() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 19/24] x86-64: Handle PC-relative relocations on per-CPU data Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 02/24] ALSA: au88x0: Fix zero clear of stream->resources Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 18/24] arm64: fpsimd: Prevent registers leaking across exec Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 10/24] mm/cma: make kmemleak ignore CMA regions Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 12/24] mm: cma: fix totalcma_pages to include DT defined CMA regions Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 22/24] scsi: sg: protect accesses to reserved page array Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 03/24] gcov: add support for GCC 5.1 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 14/24] mm: cma: constify and use correct signness in mm/cma.c Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 09/24] mm: cma: align to physical address, not CMA region position Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 04/24] gcov: add support for gcc version >= 6 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 07/24] arm64: mm: abort uaccess retries upon fatal signal Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  Re: [PATCH 3.18 00/24] 3.18.69-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2017-08-31 21:10 +0200
  Re: [PATCH 3.18 00/24] 3.18.69-stable review Guenter Roeck <linux@roeck-us.net> - 2017-08-31 21:40 +0200
  Re: [PATCH 3.18 00/24] 3.18.69-stable review Guenter Roeck <linux@roeck-us.net> - 2017-09-01 04:40 +0200
    Re: [PATCH 3.18 00/24] 3.18.69-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-09-01 07:10 +0200

csiph-web