[PATCH bpf-next] bpf: fix inconsistent return types of bpf_xdp_copy_buf().

[PATCH bpf-next] bpf: fix inconsistent return types of bpf_xdp_copy_buf().

[thinker.li]

From: Kui-Feng Lee <thinker.li@gmail.com>

Fix inconsistent return types in two implementations of bpf_xdp_copy_buf().

There are two implementations: one is an empty implementation whose return
type does not match the actual implementation.

Suggested-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Signed-off-by: Kui-Feng Lee <thinker.li@gmail.com>
---
 include/linux/filter.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/linux/filter.h b/include/linux/filter.h
index 2d6fe30bad5f..761af6b3cf2b 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -1572,10 +1572,9 @@ static inline void *bpf_xdp_pointer(struct xdp_buff *xdp, u32 offset, u32 len)
 	return NULL;
 }
 
-static inline void *bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned long off, void *buf,
-				     unsigned long len, bool flush)
+static inline void bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned long off, void *buf,
+				    unsigned long len, bool flush)
 {
-	return NULL;
 }
 #endif /* CONFIG_NET */
 
-- 
2.34.1

Re: [PATCH bpf-next] bpf: fix inconsistent return types of bpf_xdp_copy_buf().

[Yonghong Song]

On 8/3/23 5:51 PM, thinker.li@gmail.com wrote:
> From: Kui-Feng Lee <thinker.li@gmail.com>
> 
> Fix inconsistent return types in two implementations of bpf_xdp_copy_buf().
> 
> There are two implementations: one is an empty implementation whose return
> type does not match the actual implementation.
> 
> Suggested-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
> Signed-off-by: Kui-Feng Lee <thinker.li@gmail.com>

Looks like a fix tag is not needed as the old code won't cause
compilation warnings or runtime errors despite the signature mismatch.

Acked-by: Yonghong Song <yonghong.song@linux.dev>

> ---
>   include/linux/filter.h | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/filter.h b/include/linux/filter.h
> index 2d6fe30bad5f..761af6b3cf2b 100644
> --- a/include/linux/filter.h
> +++ b/include/linux/filter.h
> @@ -1572,10 +1572,9 @@ static inline void *bpf_xdp_pointer(struct xdp_buff *xdp, u32 offset, u32 len)
>   	return NULL;
>   }
>   
> -static inline void *bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned long off, void *buf,
> -				     unsigned long len, bool flush)
> +static inline void bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned long off, void *buf,
> +				    unsigned long len, bool flush)
>   {
> -	return NULL;
>   }
>   #endif /* CONFIG_NET */
>   

Re: [PATCH bpf-next] bpf: fix inconsistent return types of bpf_xdp_copy_buf().

[Kui-Feng Lee]

On 8/3/23 18:41, Yonghong Song wrote:
> 
> 
> On 8/3/23 5:51 PM, thinker.li@gmail.com wrote:
>> From: Kui-Feng Lee <thinker.li@gmail.com>
>>
>> Fix inconsistent return types in two implementations of 
>> bpf_xdp_copy_buf().
>>
>> There are two implementations: one is an empty implementation whose 
>> return
>> type does not match the actual implementation.
>>
>> Suggested-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
>> Signed-off-by: Kui-Feng Lee <thinker.li@gmail.com>
> 
> Looks like a fix tag is not needed as the old code won't cause
> compilation warnings or runtime errors despite the signature mismatch.
> 
> Acked-by: Yonghong Song <yonghong.song@linux.dev>

Thank you for the review!

> 
>> ---
>>   include/linux/filter.h | 5 ++---
>>   1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/include/linux/filter.h b/include/linux/filter.h
>> index 2d6fe30bad5f..761af6b3cf2b 100644
>> --- a/include/linux/filter.h
>> +++ b/include/linux/filter.h
>> @@ -1572,10 +1572,9 @@ static inline void *bpf_xdp_pointer(struct 
>> xdp_buff *xdp, u32 offset, u32 len)
>>       return NULL;
>>   }
>> -static inline void *bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned 
>> long off, void *buf,
>> -                     unsigned long len, bool flush)
>> +static inline void bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned 
>> long off, void *buf,
>> +                    unsigned long len, bool flush)
>>   {
>> -    return NULL;
>>   }
>>   #endif /* CONFIG_NET */

Re: [PATCH bpf-next] bpf: fix inconsistent return types of bpf_xdp_copy_buf().

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Martin KaFai Lau <martin.lau@kernel.org>:

On Thu,  3 Aug 2023 17:51:01 -0700 you wrote:
> From: Kui-Feng Lee <thinker.li@gmail.com>
> 
> Fix inconsistent return types in two implementations of bpf_xdp_copy_buf().
> 
> There are two implementations: one is an empty implementation whose return
> type does not match the actual implementation.
> 
> [...]

Here is the summary with links:
  - [bpf-next] bpf: fix inconsistent return types of bpf_xdp_copy_buf().
    https://git.kernel.org/bpf/bpf-next/c/8a60a041eada

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html