* [PATCH 1/2] bpf: annotate implicit fall through
@ 2019-01-14 20:29 Mathieu Malaterre
2019-01-14 20:29 ` [PATCH 2/2] " Mathieu Malaterre
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Mathieu Malaterre @ 2019-01-14 20:29 UTC (permalink / raw)
To: Alexei Starovoitov
Cc: Mathieu Malaterre, Daniel Borkmann, David S. Miller, netdev,
linux-kernel
There is a plan to build the kernel with -Wimplicit-fallthrough and
this place in the code produced a warnings (W=1).
This commit remove the following warning:
kernel/bpf/cgroup.c:719:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
Signed-off-by: Mathieu Malaterre <malat@debian.org>
---
kernel/bpf/cgroup.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
index 9425c2fb872f..ab612fe9862f 100644
--- a/kernel/bpf/cgroup.c
+++ b/kernel/bpf/cgroup.c
@@ -718,6 +718,7 @@ cgroup_dev_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
case BPF_FUNC_trace_printk:
if (capable(CAP_SYS_ADMIN))
return bpf_get_trace_printk_proto();
+ /* fall through */
default:
return NULL;
}
--
2.19.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/2] bpf: annotate implicit fall through
2019-01-14 20:29 [PATCH 1/2] bpf: annotate implicit fall through Mathieu Malaterre
@ 2019-01-14 20:29 ` Mathieu Malaterre
2019-01-15 9:03 ` Sergei Shtylyov
2019-01-16 19:35 ` [PATCH v2 2/2] bpf: Correctly annotate implicit fall through in bpf_base_func_proto Mathieu Malaterre
2019-01-16 19:32 ` [PATCH v2 1/2] bpf: Annotate implicit fall through in cgroup_dev_func_proto Mathieu Malaterre
2019-01-16 19:35 ` Mathieu Malaterre
2 siblings, 2 replies; 8+ messages in thread
From: Mathieu Malaterre @ 2019-01-14 20:29 UTC (permalink / raw)
To: Alexei Starovoitov
Cc: Mathieu Malaterre, Daniel Borkmann, David S. Miller, netdev,
linux-kernel
There is a plan to build the kernel with -Wimplicit-fallthrough and
thise place in the code produced a warnings (W=1).
In this particular case change a ‘:’ with a ‘,’ so as to match the
regular expression expected by GCC.
This commit remove the following warning:
net/core/filter.c:5310:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
Signed-off-by: Mathieu Malaterre <malat@debian.org>
---
net/core/filter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/filter.c b/net/core/filter.c
index 447dd1bad31f..c8069a142994 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -5309,7 +5309,7 @@ bpf_base_func_proto(enum bpf_func_id func_id)
case BPF_FUNC_trace_printk:
if (capable(CAP_SYS_ADMIN))
return bpf_get_trace_printk_proto();
- /* else: fall through */
+ /* else, fall through */
default:
return NULL;
}
--
2.19.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] bpf: annotate implicit fall through
2019-01-14 20:29 ` [PATCH 2/2] " Mathieu Malaterre
@ 2019-01-15 9:03 ` Sergei Shtylyov
2019-01-15 20:01 ` Daniel Borkmann
2019-01-16 19:35 ` [PATCH v2 2/2] bpf: Correctly annotate implicit fall through in bpf_base_func_proto Mathieu Malaterre
1 sibling, 1 reply; 8+ messages in thread
From: Sergei Shtylyov @ 2019-01-15 9:03 UTC (permalink / raw)
To: Mathieu Malaterre, Alexei Starovoitov
Cc: Daniel Borkmann, David S. Miller, netdev, linux-kernel
On 14.01.2019 23:29, Mathieu Malaterre wrote:
> There is a plan to build the kernel with -Wimplicit-fallthrough and
> thise place in the code produced a warnings (W=1).
This?
> In this particular case change a ‘:’ with a ‘,’ so as to match the
> regular expression expected by GCC.
>
> This commit remove the following warning:
>
> net/core/filter.c:5310:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
>
> Signed-off-by: Mathieu Malaterre <malat@debian.org>
> ---
> net/core/filter.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/core/filter.c b/net/core/filter.c
> index 447dd1bad31f..c8069a142994 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -5309,7 +5309,7 @@ bpf_base_func_proto(enum bpf_func_id func_id)
> case BPF_FUNC_trace_printk:
> if (capable(CAP_SYS_ADMIN))
> return bpf_get_trace_printk_proto();
> - /* else: fall through */
> + /* else, fall through */
The other patches seem to just drop "else:"...
> default:
> return NULL;
> }
>
MBR, Sergei
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 2/2] bpf: annotate implicit fall through
2019-01-15 9:03 ` Sergei Shtylyov
@ 2019-01-15 20:01 ` Daniel Borkmann
0 siblings, 0 replies; 8+ messages in thread
From: Daniel Borkmann @ 2019-01-15 20:01 UTC (permalink / raw)
To: Sergei Shtylyov, Mathieu Malaterre, Alexei Starovoitov
Cc: David S. Miller, netdev, linux-kernel
On 01/15/2019 10:03 AM, Sergei Shtylyov wrote:
> On 14.01.2019 23:29, Mathieu Malaterre wrote:
>
>> There is a plan to build the kernel with -Wimplicit-fallthrough and
>> thise place in the code produced a warnings (W=1).
>
> This?
>
>> In this particular case change a ‘:’ with a ‘,’ so as to match the
>> regular expression expected by GCC.
>>
>> This commit remove the following warning:
>>
>> net/core/filter.c:5310:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
>>
>> Signed-off-by: Mathieu Malaterre <malat@debian.org>
Please respin and also make the two subject lines not exactly the same.
Thanks,
Daniel
>> ---
>> net/core/filter.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/net/core/filter.c b/net/core/filter.c
>> index 447dd1bad31f..c8069a142994 100644
>> --- a/net/core/filter.c
>> +++ b/net/core/filter.c
>> @@ -5309,7 +5309,7 @@ bpf_base_func_proto(enum bpf_func_id func_id)
>> case BPF_FUNC_trace_printk:
>> if (capable(CAP_SYS_ADMIN))
>> return bpf_get_trace_printk_proto();
>> - /* else: fall through */
>> + /* else, fall through */
>
> The other patches seem to just drop "else:"...
>
>> default:
>> return NULL;
>> }
>>
>
> MBR, Sergei
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 2/2] bpf: Correctly annotate implicit fall through in bpf_base_func_proto
2019-01-14 20:29 ` [PATCH 2/2] " Mathieu Malaterre
2019-01-15 9:03 ` Sergei Shtylyov
@ 2019-01-16 19:35 ` Mathieu Malaterre
1 sibling, 0 replies; 8+ messages in thread
From: Mathieu Malaterre @ 2019-01-16 19:35 UTC (permalink / raw)
To: Daniel Borkmann
Cc: Mathieu Malaterre, Alexei Starovoitov, David S. Miller, netdev,
linux-kernel
There is a plan to build the kernel with -Wimplicit-fallthrough and
this place in the code produced a warnings (W=1).
To preserve as much of the existing comment only change a ‘:’ into a ‘,’.
This is enough change, to match the regular expression expected by GCC.
This commit remove the following warning:
net/core/filter.c:5310:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
Signed-off-by: Mathieu Malaterre <malat@debian.org>
---
v2: reword the patch subject, remove a typo
net/core/filter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/filter.c b/net/core/filter.c
index 2b3b436ef545..d9076e609fca 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -5309,7 +5309,7 @@ bpf_base_func_proto(enum bpf_func_id func_id)
case BPF_FUNC_trace_printk:
if (capable(CAP_SYS_ADMIN))
return bpf_get_trace_printk_proto();
- /* else: fall through */
+ /* else, fall through */
default:
return NULL;
}
--
2.19.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 1/2] bpf: Annotate implicit fall through in cgroup_dev_func_proto
2019-01-14 20:29 [PATCH 1/2] bpf: annotate implicit fall through Mathieu Malaterre
2019-01-14 20:29 ` [PATCH 2/2] " Mathieu Malaterre
@ 2019-01-16 19:32 ` Mathieu Malaterre
2019-01-16 19:35 ` Mathieu Malaterre
2 siblings, 0 replies; 8+ messages in thread
From: Mathieu Malaterre @ 2019-01-16 19:32 UTC (permalink / raw)
To: Daniel Borkmann
Cc: Mathieu Malaterre, Alexei Starovoitov, David S. Miller, netdev,
linux-kernel
There is a plan to build the kernel with -Wimplicit-fallthrough and
this place in the code produced a warnings (W=1).
This commit remove the following warning:
kernel/bpf/cgroup.c:719:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
Signed-off-by: Mathieu Malaterre <malat@debian.org>
---
kernel/bpf/cgroup.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
index 9425c2fb872f..ab612fe9862f 100644
--- a/kernel/bpf/cgroup.c
+++ b/kernel/bpf/cgroup.c
@@ -718,6 +718,7 @@ cgroup_dev_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
case BPF_FUNC_trace_printk:
if (capable(CAP_SYS_ADMIN))
return bpf_get_trace_printk_proto();
+ /* fall through */
default:
return NULL;
}
--
2.19.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 1/2] bpf: Annotate implicit fall through in cgroup_dev_func_proto
2019-01-14 20:29 [PATCH 1/2] bpf: annotate implicit fall through Mathieu Malaterre
2019-01-14 20:29 ` [PATCH 2/2] " Mathieu Malaterre
2019-01-16 19:32 ` [PATCH v2 1/2] bpf: Annotate implicit fall through in cgroup_dev_func_proto Mathieu Malaterre
@ 2019-01-16 19:35 ` Mathieu Malaterre
2019-01-17 15:57 ` Daniel Borkmann
2 siblings, 1 reply; 8+ messages in thread
From: Mathieu Malaterre @ 2019-01-16 19:35 UTC (permalink / raw)
To: Daniel Borkmann
Cc: Mathieu Malaterre, Alexei Starovoitov, David S. Miller, netdev,
linux-kernel
There is a plan to build the kernel with -Wimplicit-fallthrough and
this place in the code produced a warnings (W=1).
This commit remove the following warning:
kernel/bpf/cgroup.c:719:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
Signed-off-by: Mathieu Malaterre <malat@debian.org>
---
v2: Reword the patch subject
kernel/bpf/cgroup.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
index 9425c2fb872f..ab612fe9862f 100644
--- a/kernel/bpf/cgroup.c
+++ b/kernel/bpf/cgroup.c
@@ -718,6 +718,7 @@ cgroup_dev_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
case BPF_FUNC_trace_printk:
if (capable(CAP_SYS_ADMIN))
return bpf_get_trace_printk_proto();
+ /* fall through */
default:
return NULL;
}
--
2.19.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/2] bpf: Annotate implicit fall through in cgroup_dev_func_proto
2019-01-16 19:35 ` Mathieu Malaterre
@ 2019-01-17 15:57 ` Daniel Borkmann
0 siblings, 0 replies; 8+ messages in thread
From: Daniel Borkmann @ 2019-01-17 15:57 UTC (permalink / raw)
To: Mathieu Malaterre
Cc: Alexei Starovoitov, David S. Miller, netdev, linux-kernel
On 01/16/2019 08:35 PM, Mathieu Malaterre wrote:
> There is a plan to build the kernel with -Wimplicit-fallthrough and
> this place in the code produced a warnings (W=1).
>
> This commit remove the following warning:
>
> kernel/bpf/cgroup.c:719:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
>
> Signed-off-by: Mathieu Malaterre <malat@debian.org>
Both applied, thanks!
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-01-17 15:57 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-14 20:29 [PATCH 1/2] bpf: annotate implicit fall through Mathieu Malaterre
2019-01-14 20:29 ` [PATCH 2/2] " Mathieu Malaterre
2019-01-15 9:03 ` Sergei Shtylyov
2019-01-15 20:01 ` Daniel Borkmann
2019-01-16 19:35 ` [PATCH v2 2/2] bpf: Correctly annotate implicit fall through in bpf_base_func_proto Mathieu Malaterre
2019-01-16 19:32 ` [PATCH v2 1/2] bpf: Annotate implicit fall through in cgroup_dev_func_proto Mathieu Malaterre
2019-01-16 19:35 ` Mathieu Malaterre
2019-01-17 15:57 ` Daniel Borkmann
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).