2020-11-27 19:56:59

by Tom Rix

Subject: [PATCH] bpf: remove trailing semicolon in macro definition

From: Tom Rix <[email protected]>

The macro use will already have a semicolon.

Signed-off-by: Tom Rix <[email protected]>
---
include/trace/events/xdp.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/trace/events/xdp.h b/include/trace/events/xdp.h
index cd24e8a59529..65ffedf8386f 100644
--- a/include/trace/events/xdp.h
+++ b/include/trace/events/xdp.h
@@ -146,13 +146,13 @@ DEFINE_EVENT(xdp_redirect_template, xdp_redirect_err,
);

#define _trace_xdp_redirect(dev, xdp, to) \
- trace_xdp_redirect(dev, xdp, NULL, 0, NULL, to);
+ trace_xdp_redirect(dev, xdp, NULL, 0, NULL, to)

#define _trace_xdp_redirect_err(dev, xdp, to, err) \
trace_xdp_redirect_err(dev, xdp, NULL, err, NULL, to);

#define _trace_xdp_redirect_map(dev, xdp, to, map, index) \
- trace_xdp_redirect(dev, xdp, to, 0, map, index);
+ trace_xdp_redirect(dev, xdp, to, 0, map, index)

#define _trace_xdp_redirect_map_err(dev, xdp, to, map, index, err) \
trace_xdp_redirect_err(dev, xdp, to, err, map, index);
--
2.18.4

2020-11-28 01:22:23

by Daniel Borkmann

Subject: Re: [PATCH] bpf: remove trailing semicolon in macro definition

On 11/27/20 8:27 PM, [email protected] wrote:
> From: Tom Rix <[email protected]>
>
> The macro use will already have a semicolon.
>
> Signed-off-by: Tom Rix <[email protected]>
> ---
> include/trace/events/xdp.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/trace/events/xdp.h b/include/trace/events/xdp.h
> index cd24e8a59529..65ffedf8386f 100644
> --- a/include/trace/events/xdp.h
> +++ b/include/trace/events/xdp.h
> @@ -146,13 +146,13 @@ DEFINE_EVENT(xdp_redirect_template, xdp_redirect_err,
> );
>
> #define _trace_xdp_redirect(dev, xdp, to) \
> - trace_xdp_redirect(dev, xdp, NULL, 0, NULL, to);
> + trace_xdp_redirect(dev, xdp, NULL, 0, NULL, to)
>
> #define _trace_xdp_redirect_err(dev, xdp, to, err) \
> trace_xdp_redirect_err(dev, xdp, NULL, err, NULL, to);
>
> #define _trace_xdp_redirect_map(dev, xdp, to, map, index) \
> - trace_xdp_redirect(dev, xdp, to, 0, map, index);
> + trace_xdp_redirect(dev, xdp, to, 0, map, index)
>
> #define _trace_xdp_redirect_map_err(dev, xdp, to, map, index, err) \
> trace_xdp_redirect_err(dev, xdp, to, err, map, index);
>

This looks random, why those but not other locations ?

Thanks,
Daniel

2020-11-29 17:31:57

by Tom Rix

Subject: Re: [PATCH] bpf: remove trailing semicolon in macro definition

On 11/27/20 4:54 PM, Daniel Borkmann wrote:
> On 11/27/20 8:27 PM, [email protected] wrote:
>> From: Tom Rix <[email protected]>
>>
>> The macro use will already have a semicolon.
>>
>> Signed-off-by: Tom Rix <[email protected]>
>> ---
>>   include/trace/events/xdp.h | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/include/trace/events/xdp.h b/include/trace/events/xdp.h
>> index cd24e8a59529..65ffedf8386f 100644
>> --- a/include/trace/events/xdp.h
>> +++ b/include/trace/events/xdp.h
>> @@ -146,13 +146,13 @@ DEFINE_EVENT(xdp_redirect_template, xdp_redirect_err,
>>   );
>>     #define _trace_xdp_redirect(dev, xdp, to)        \
>> -     trace_xdp_redirect(dev, xdp, NULL, 0, NULL, to);
>> +     trace_xdp_redirect(dev, xdp, NULL, 0, NULL, to)
>>     #define _trace_xdp_redirect_err(dev, xdp, to, err)    \
>>        trace_xdp_redirect_err(dev, xdp, NULL, err, NULL, to);
>>     #define _trace_xdp_redirect_map(dev, xdp, to, map, index)        \
>> -     trace_xdp_redirect(dev, xdp, to, 0, map, index);
>> +     trace_xdp_redirect(dev, xdp, to, 0, map, index)
>>     #define _trace_xdp_redirect_map_err(dev, xdp, to, map, index, err)    \
>>        trace_xdp_redirect_err(dev, xdp, to, err, map, index);
>>
>
> This looks random, why those but not other locations ?

Those other macros were never used.

Tom

>
> Thanks,
> Daniel
>