2022-07-29 20:25:18

by Daniel Xu

Subject: [PATCH bpf] bpf: Fix oudated __bpf_skc_lookup() comment

The function returns a pointer now.

Fixes: edbf8c01de5a ("bpf: add skc_lookup_tcp helper")
Signed-off-by: Daniel Xu <[email protected]>
---
net/core/filter.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/net/core/filter.c b/net/core/filter.c
index 5d16d66727fc..866ca05f95e0 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -6463,8 +6463,6 @@ static struct sock *sk_lookup(struct net *net, struct bpf_sock_tuple *tuple,

/* bpf_skc_lookup performs the core lookup for different types of sockets,
* taking a reference on the socket if it doesn't have the flag SOCK_RCU_FREE.
- * Returns the socket as an 'unsigned long' to simplify the casting in the
- * callers to satisfy BPF_CALL declarations.
*/
static struct sock *
__bpf_skc_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,
--
2.37.1

2022-07-29 22:42:45

by Andrii Nakryiko

Subject: Re: [PATCH bpf] bpf: Fix oudated __bpf_skc_lookup() comment

On Fri, Jul 29, 2022 at 12:47 PM Daniel Xu <[email protected]> wrote:
>
> The function returns a pointer now.
>
> Fixes: edbf8c01de5a ("bpf: add skc_lookup_tcp helper")
> Signed-off-by: Daniel Xu <[email protected]>
> ---

This was already done in [0] in bpf-next.

[0] f5be22c64bd6 ("bpf: Fix bpf_skc_lookup comment wrt. return type")


> net/core/filter.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/net/core/filter.c b/net/core/filter.c
> index 5d16d66727fc..866ca05f95e0 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -6463,8 +6463,6 @@ static struct sock *sk_lookup(struct net *net, struct bpf_sock_tuple *tuple,
>
> /* bpf_skc_lookup performs the core lookup for different types of sockets,
> * taking a reference on the socket if it doesn't have the flag SOCK_RCU_FREE.
> - * Returns the socket as an 'unsigned long' to simplify the casting in the
> - * callers to satisfy BPF_CALL declarations.
> */
> static struct sock *
> __bpf_skc_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,
> --
> 2.37.1
>