Skip to contentSkip to conversation

x86/events: Mark expected switch fall-throughs

PATCH In review Gustavo A. R. Silva 3 participants 8 messages Jan 25, 2019 – Jan 29, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/events: Mark expected switch fall-throughs

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warnings:

In file included from arch/x86/events/intel/core.c:22:
arch/x86/events/intel/core.c: In function ‘intel_pmu_init’:
arch/x86/events/intel/../perf_event.h:668:17: warning: this statement may fall through [-Wimplicit-fallthrough=]
x86_pmu.quirks = &__quirk; \
~~~~~~~~~~~~~~~^~~~~~~~~~
arch/x86/events/intel/core.c:4170:3: note: in expansion of macro ‘x86_add_quirk’
x86_add_quirk(intel_clovertown_quirk);
^~~~~~~~~~~~~
arch/x86/events/intel/core.c:4171:2: note: here
case INTEL_FAM6_CORE2_MEROM_L:
^~~~
arch/x86/events/intel/lbr.c:929:6: warning: this statement may fall through [-Wimplicit-fallthrough=]

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enabling -Wimplicit-fallthrough.

---
 arch/x86/events/intel/core.c | 2 ++
 arch/x86/events/intel/lbr.c  | 1 +
 2 files changed, 3 insertions(+)
arch/x86/events/intel/core.c +2 -0
index 40e12cfc87f6..ece43e7e4569 100644
@@ -4168,6 +4168,8 @@ __init int intel_pmu_init(void)
 
 	case INTEL_FAM6_CORE2_MEROM:
 		x86_add_quirk(intel_clovertown_quirk);
+		/* fall through */
+
 	case INTEL_FAM6_CORE2_MEROM_L:
 	case INTEL_FAM6_CORE2_PENRYN:
 	case INTEL_FAM6_CORE2_DUNNINGTON:
arch/x86/events/intel/lbr.c +1 -0
index c88ed39582a1..580c1b91c454 100644
@@ -931,6 +931,7 @@ static int branch_type(unsigned long from, unsigned long to, int abort)
 			ret = X86_BR_ZERO_CALL;
 			break;
 		}
+		/* fall through */
 	case 0x9a: /* call far absolute */
 		ret = X86_BR_CALL;
 		break;
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 20 lines · Gustavo A. R. Silva

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warnings:

In file included from arch/x86/events/intel/core.c:22:
arch/x86/events/intel/core.c: In function ‘intel_pmu_init’:
arch/x86/events/intel/../perf_event.h:668:17: warning: this statement may fall through [-Wimplicit-fallthrough=]
x86_pmu.quirks = &__quirk; \
~~~~~~~~~~~~~~~^~~~~~~~~~
arch/x86/events/intel/core.c:4170:3: note: in expansion of macro ‘x86_add_quirk’

   x86_add_quirk(intel_clovertown_quirk);
   ^~~~~~~~~~~~~

arch/x86/events/intel/core.c:4171:2: note: here
case INTEL_FAM6_CORE2_MEROM_L:
^~~~
arch/x86/events/intel/lbr.c:929:6: warning: this statement may fall through [-Wimplicit-fallthrough=]

Warning level 3 was used: -Wimplicit-fallthrough=3

Quoted 7 lines

This patch is part of the ongoing efforts to enabling -Wimplicit-fallthrough.

---
 arch/x86/events/intel/core.c | 2 ++
 arch/x86/events/intel/lbr.c  | 1 +
 2 files changed, 3 insertions(+)

You do know how to use scripts/get_maintainer.pl, right?

Because I don't see PeterZ on CC.

Please use that script when preparing patches.

Signature · 4 lines
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.
#2 lore raw
Quoted 29 lines · Borislav Petkov
Quoted 20 lines · Gustavo A. R. Silva

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warnings:

In file included from arch/x86/events/intel/core.c:22:
arch/x86/events/intel/core.c: In function ‘intel_pmu_init’:
arch/x86/events/intel/../perf_event.h:668:17: warning: this statement may fall through [-Wimplicit-fallthrough=]
x86_pmu.quirks = &__quirk; \
~~~~~~~~~~~~~~~^~~~~~~~~~
arch/x86/events/intel/core.c:4170:3: note: in expansion of macro ‘x86_add_quirk’

   x86_add_quirk(intel_clovertown_quirk);
   ^~~~~~~~~~~~~

arch/x86/events/intel/core.c:4171:2: note: here
case INTEL_FAM6_CORE2_MEROM_L:
^~~~
arch/x86/events/intel/lbr.c:929:6: warning: this statement may fall through [-Wimplicit-fallthrough=]

Warning level 3 was used: -Wimplicit-fallthrough=3

Quoted 7 lines

This patch is part of the ongoing efforts to enabling -Wimplicit-fallthrough.

---
 arch/x86/events/intel/core.c | 2 ++
 arch/x86/events/intel/lbr.c  | 1 +
 2 files changed, 3 insertions(+)
Quoted 6 lines

You do know how to use scripts/get_maintainer.pl, right?

Because I don't see PeterZ on CC.

Please use that script when preparing patches.

$ scripts/get_maintainer.pl --nokeywords --nogit --nogit-fallback arch/x86/events/intel/core.c
Thomas Gleixner <[email protected]> (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
Ingo Molnar <[email protected]> (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
Borislav Petkov <[email protected]> (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
"H. Peter Anvin" <[email protected]> (reviewer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
[email protected] (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
[email protected] (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT))
$ scripts/get_maintainer.pl --nokeywords --nogit --nogit-fallback arch/x86/events/intel/lbr.c
Thomas Gleixner <[email protected]> (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
Ingo Molnar <[email protected]> (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
Borislav Petkov <[email protected]> (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
"H. Peter Anvin" <[email protected]> (reviewer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
[email protected] (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
[email protected] (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT))

Does the MAINTAINERS file need an update?

--
Gustavo

maintainer
#3 lore raw
Quoted 1 line · Gustavo A. R. Silva
$ scripts/get_maintainer.pl --nokeywords --nogit --nogit-fallback arch/x86/events/intel/core.c

You need to have -f when supplying a file:

scripts/get_maintainer.pl -f arch/x86/events/intel/core.c

and the pattern is there:

PERFORMANCE EVENTS SUBSYSTEM
M: Peter Zijlstra <[email protected]>
...
F: arch/*/events/*

yet it still doesn't list Peter as maintainer:

Thomas Gleixner <[email protected]> (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
Ingo Molnar <[email protected]> (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT),commit_signer:21/22=95%) Borislav Petkov <[email protected]> (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
"H. Peter Anvin" <[email protected]> (reviewer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
[email protected] (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
Peter Zijlstra <[email protected]> (commit_signer:19/22=86%,authored:3/22=14%,added_lines:22/382=6%,removed_lines:13/122=11%) Kan Liang <[email protected]> (commit_signer:11/22=50%,authored:10/22=45%,added_lines:144/382=38%,removed_lines:73/122=60%) Jiri Olsa <[email protected]> (commit_signer:4/22=18%,authored:4/22=18%,added_lines:99/382=26%,removed_lines:32/122=26%) Andi Kleen <[email protected]> (added_lines:113/382=30%)
[email protected] (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)

if you change the pattern to

F: arch/*/events/

i.e., drop the '*', then it works:

$ scripts/get_maintainer.pl -f arch/x86/events/intel/core.c
Peter Zijlstra <[email protected]> (supporter:PERFORMANCE EVENTS SUBSYSTEM,commit_signer:19/22=86%,authored:3/22=14%,added_lines:22/382=6%,removed_lines:13/122=11%)
Ingo Molnar <[email protected]> (supporter:PERFORMANCE EVENTS SUBSYSTEM,commit_signer:21/22=95%)
Arnaldo Carvalho de Melo <[email protected]> (supporter:PERFORMANCE EVENTS SUBSYSTEM)
Alexander Shishkin <[email protected]> (reviewer:PERFORMANCE EVENTS SUBSYSTEM)
Jiri Olsa <[email protected]> (reviewer:PERFORMANCE EVENTS SUBSYSTEM,commit_signer:4/22=18%,authored:4/22=18%,added_lines:99/382=26%,removed_lines:32/122=26%)
Namhyung Kim <[email protected]> (reviewer:PERFORMANCE EVENTS SUBSYSTEM)
...
Signature · 4 lines
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.
#4 lore raw
Quoted 7 lines · Borislav Petkov
Quoted 1 line · Gustavo A. R. Silva
$ scripts/get_maintainer.pl --nokeywords --nogit --nogit-fallback arch/x86/events/intel/core.c

You need to have -f when supplying a file:

scripts/get_maintainer.pl -f arch/x86/events/intel/core.c

You're correct. I used the command I use for patches.

Quoted 9 lines

and the pattern is there:

PERFORMANCE EVENTS SUBSYSTEM
M: Peter Zijlstra <[email protected]>
...
F: arch/*/events/*

yet it still doesn't list Peter as maintainer:

Yep. And this is the reason why I didn't include him.

Quoted 11 lines

Thomas Gleixner <[email protected]> (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
Ingo Molnar <[email protected]> (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT),commit_signer:21/22=95%) Borislav Petkov <[email protected]> (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
"H. Peter Anvin" <[email protected]> (reviewer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
[email protected] (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT))
Peter Zijlstra <[email protected]> (commit_signer:19/22=86%,authored:3/22=14%,added_lines:22/382=6%,removed_lines:13/122=11%) Kan Liang <[email protected]> (commit_signer:11/22=50%,authored:10/22=45%,added_lines:144/382=38%,removed_lines:73/122=60%) Jiri Olsa <[email protected]> (commit_signer:4/22=18%,authored:4/22=18%,added_lines:99/382=26%,removed_lines:32/122=26%) Andi Kleen <[email protected]> (added_lines:113/382=30%)
[email protected] (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)

Quoted 7 lines

if you change the pattern to

F: arch/*/events/

i.e., drop the '*', then it works:

$ scripts/get_maintainer.pl -f arch/x86/events/intel/core.c

Yeah. But I don't want to send patches to every person that has touched the file.

Quoted 8 lines

Peter Zijlstra <[email protected]> (supporter:PERFORMANCE EVENTS SUBSYSTEM,commit_signer:19/22=86%,authored:3/22=14%,added_lines:22/382=6%,removed_lines:13/122=11%) Ingo Molnar <[email protected]> (supporter:PERFORMANCE EVENTS SUBSYSTEM,commit_signer:21/22=95%)
Arnaldo Carvalho de Melo <[email protected]> (supporter:PERFORMANCE EVENTS SUBSYSTEM)
Alexander Shishkin <[email protected]> (reviewer:PERFORMANCE EVENTS SUBSYSTEM)
Jiri Olsa <[email protected]> (reviewer:PERFORMANCE EVENTS SUBSYSTEM,commit_signer:4/22=18%,authored:4/22=18%,added_lines:99/382=26%,removed_lines:32/122=26%) Namhyung Kim <[email protected]> (reviewer:PERFORMANCE EVENTS SUBSYSTEM)
...

--
Gustavo

maintainer
#5 lore raw
Quoted 1 line · Gustavo A. R. Silva

Yeah. But I don't want to send patches to every person that has touched the file.

Yes but you should *definitely* CC supporters and reviewers.

Signature · 4 lines
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.
#6 lore raw
Quoted 5 lines · Borislav Petkov
Quoted 1 line · Gustavo A. R. Silva

Yeah. But I don't want to send patches to every person that has touched the file.

Yes but you should *definitely* CC supporters and reviewers.

Okay. I'll take note of that.

Thanks for the feedback.
--
Gustavo

#7 lore raw

[tip:x86/cleanups] x86/events: Mark expected switch-case fall-throughs

In reply to Gustavo A. R. Silva
x86/events: Mark expected switch-case fall-throughs
Commit-ID:  2b0fc3742bc77687f58d389c902ee092df6f8669
Gitweb:     https://git.kernel.org/tip/2b0fc3742bc77687f58d389c902ee092df6f8669
Author:     Gustavo A. R. Silva <[email protected]>
AuthorDate: Fri, 25 Jan 2019 12:49:17 -0600
Committer:  Borislav Petkov <[email protected]>
CommitDate: Tue, 29 Jan 2019 16:23:47 +0100

x86/events: Mark expected switch-case fall-throughs

In preparation to enable -Wimplicit-fallthrough by default, mark switch-case statements where fall-through is intentional, explicitly in order to fix a couple of -Wimplicit-fallthrough warnings.

Warning level 3 was used: -Wimplicit-fallthrough=3.

[ bp: Massasge and trim commit message. ]

---
 arch/x86/events/intel/core.c | 2 ++
 arch/x86/events/intel/lbr.c  | 1 +
 2 files changed, 3 insertions(+)
arch/x86/events/intel/core.c +2 -0
index 40e12cfc87f6..ece43e7e4569 100644
@@ -4168,6 +4168,8 @@ __init int intel_pmu_init(void)
 
 	case INTEL_FAM6_CORE2_MEROM:
 		x86_add_quirk(intel_clovertown_quirk);
+		/* fall through */
+
 	case INTEL_FAM6_CORE2_MEROM_L:
 	case INTEL_FAM6_CORE2_PENRYN:
 	case INTEL_FAM6_CORE2_DUNNINGTON:
arch/x86/events/intel/lbr.c +1 -0
index c88ed39582a1..580c1b91c454 100644
@@ -931,6 +931,7 @@ static int branch_type(unsigned long from, unsigned long to, int abort)
 			ret = X86_BR_ZERO_CALL;
 			break;
 		}
+		/* fall through */
 	case 0x9a: /* call far absolute */
 		ret = X86_BR_CALL;
 		break;