[PATCH v2] scripts/recordmcount.c: account for .softirqentry.text

[PATCH v2] scripts/recordmcount.c: account for .softirqentry.text

[Dmitry Vyukov]

Commit "arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections"
added .softirqentry.text section, but it was not added to recordmcount.
So functions in the section are untracable.
Add the section to scripts/recordmcount.c and scripts/recordmcount.pl.

Fixes: be7635e7287e ("arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections")
Cc: stable@vger.kernel.org # v4.6+
Signed-off-by: Dmitry Vyukov <dvyukov@google.com>
Acked-by: Steve Rostedt <rostedt@goodmis.org>
---
Changes from v1:
 - updated recordmcount.pl as well

---
 scripts/recordmcount.c  | 1 +
 scripts/recordmcount.pl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index 42396a7..a68f031 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -363,6 +363,7 @@ is_mcounted_section_name(char const *const txtname)
 		strcmp(".sched.text",    txtname) == 0 ||
 		strcmp(".spinlock.text", txtname) == 0 ||
 		strcmp(".irqentry.text", txtname) == 0 ||
+		strcmp(".softirqentry.text", txtname) == 0 ||
 		strcmp(".kprobes.text", txtname) == 0 ||
 		strcmp(".text.unlikely", txtname) == 0;
 }
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 96e2486..2d48011 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -134,6 +134,7 @@ my %text_sections = (
      ".sched.text" => 1,
      ".spinlock.text" => 1,
      ".irqentry.text" => 1,
+     ".softirqentry.text" => 1,
      ".kprobes.text" => 1,
      ".text.unlikely" => 1,
 );
-- 
2.8.0.rc3.226.g39d4020

Re: [PATCH v2] scripts/recordmcount.c: account for .softirqentry.text

[Dmitry Vyukov]

On Mon, Sep 26, 2016 at 5:10 PM, Dmitry Vyukov <dvyukov@google.com> wrote:
> Commit "arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections"
> added .softirqentry.text section, but it was not added to recordmcount.
> So functions in the section are untracable.
> Add the section to scripts/recordmcount.c and scripts/recordmcount.pl.
>
> Fixes: be7635e7287e ("arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections")
> Cc: stable@vger.kernel.org # v4.6+
> Signed-off-by: Dmitry Vyukov <dvyukov@google.com>
> Acked-by: Steve Rostedt <rostedt@goodmis.org>
> ---
> Changes from v1:
>  - updated recordmcount.pl as well


Andrew,

Steven acked this, but can't take to his tree at the moment. Can you
please take this to mm?


> ---
>  scripts/recordmcount.c  | 1 +
>  scripts/recordmcount.pl | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
> index 42396a7..a68f031 100644
> --- a/scripts/recordmcount.c
> +++ b/scripts/recordmcount.c
> @@ -363,6 +363,7 @@ is_mcounted_section_name(char const *const txtname)
>                 strcmp(".sched.text",    txtname) == 0 ||
>                 strcmp(".spinlock.text", txtname) == 0 ||
>                 strcmp(".irqentry.text", txtname) == 0 ||
> +               strcmp(".softirqentry.text", txtname) == 0 ||
>                 strcmp(".kprobes.text", txtname) == 0 ||
>                 strcmp(".text.unlikely", txtname) == 0;
>  }
> diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
> index 96e2486..2d48011 100755
> --- a/scripts/recordmcount.pl
> +++ b/scripts/recordmcount.pl
> @@ -134,6 +134,7 @@ my %text_sections = (
>       ".sched.text" => 1,
>       ".spinlock.text" => 1,
>       ".irqentry.text" => 1,
> +     ".softirqentry.text" => 1,
>       ".kprobes.text" => 1,
>       ".text.unlikely" => 1,
>  );
> --
> 2.8.0.rc3.226.g39d4020
>