* [PATCH] MIPS: op_model_mipsxx: Fix non-executable code bug
@ 2020-08-19 4:58 Gustavo A. R. Silva
2020-08-21 7:46 ` Thomas Bogendoerfer
0 siblings, 1 reply; 2+ messages in thread
From: Gustavo A. R. Silva @ 2020-08-19 4:58 UTC (permalink / raw)
To: Robert Richter, Thomas Bogendoerfer, Huacai Chen, Liangliang Huang
Cc: oprofile-list, linux-mips, linux-kernel, Gustavo A. R. Silva
The fallthrough pseudo-keyword is being wrongly used and is causing
the non-executable code error below:
arch/mips/oprofile/op_model_mipsxx.c: In function ‘mipsxx_perfcount_handler’:
./include/linux/compiler_attributes.h:214:41: warning: statement will never be executed [-Wswitch-unreachable]
# define fallthrough __attribute__((__fallthrough__))
^
arch/mips/oprofile/op_model_mipsxx.c:248:2: note: in expansion of macro ‘fallthrough’
fallthrough; \
^~~~~~~~~~~
arch/mips/oprofile/op_model_mipsxx.c:258:2: note: in expansion of macro ‘HANDLE_COUNTER’
HANDLE_COUNTER(3)
^~~~~~~~~~~~~~
Fix this by placing the fallthrough macro at the proper place.
Fixes: c9b029903466 ("MIPS: Use fallthrough for arch/mips")
Cc: stable@vger.kernel.org
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
arch/mips/oprofile/op_model_mipsxx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index 1493c49ca47a..f200b97bdef7 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -245,7 +245,6 @@ static int mipsxx_perfcount_handler(void)
switch (counters) {
#define HANDLE_COUNTER(n) \
- fallthrough; \
case n + 1: \
control = r_c0_perfctrl ## n(); \
counter = r_c0_perfcntr ## n(); \
@@ -254,7 +253,8 @@ static int mipsxx_perfcount_handler(void)
oprofile_add_sample(get_irq_regs(), n); \
w_c0_perfcntr ## n(reg.counter[n]); \
handled = IRQ_HANDLED; \
- }
+ } \
+ fallthrough;
HANDLE_COUNTER(3)
HANDLE_COUNTER(2)
HANDLE_COUNTER(1)
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] MIPS: op_model_mipsxx: Fix non-executable code bug
2020-08-19 4:58 [PATCH] MIPS: op_model_mipsxx: Fix non-executable code bug Gustavo A. R. Silva
@ 2020-08-21 7:46 ` Thomas Bogendoerfer
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Bogendoerfer @ 2020-08-21 7:46 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Robert Richter, Huacai Chen, Liangliang Huang, oprofile-list,
linux-mips, linux-kernel
On Tue, Aug 18, 2020 at 11:58:13PM -0500, Gustavo A. R. Silva wrote:
> The fallthrough pseudo-keyword is being wrongly used and is causing
> the non-executable code error below:
>
> arch/mips/oprofile/op_model_mipsxx.c: In function ‘mipsxx_perfcount_handler’:
> ./include/linux/compiler_attributes.h:214:41: warning: statement will never be executed [-Wswitch-unreachable]
> # define fallthrough __attribute__((__fallthrough__))
> ^
> arch/mips/oprofile/op_model_mipsxx.c:248:2: note: in expansion of macro ‘fallthrough’
> fallthrough; \
> ^~~~~~~~~~~
> arch/mips/oprofile/op_model_mipsxx.c:258:2: note: in expansion of macro ‘HANDLE_COUNTER’
> HANDLE_COUNTER(3)
> ^~~~~~~~~~~~~~
>
> Fix this by placing the fallthrough macro at the proper place.
>
> Fixes: c9b029903466 ("MIPS: Use fallthrough for arch/mips")
> Cc: stable@vger.kernel.org
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
> ---
> arch/mips/oprofile/op_model_mipsxx.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
applied to mips-fixes.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-21 7:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-19 4:58 [PATCH] MIPS: op_model_mipsxx: Fix non-executable code bug Gustavo A. R. Silva
2020-08-21 7:46 ` Thomas Bogendoerfer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).