This fixes a compilation issue that we have in our tree after having
synced with upstream. See the Fixes commit for more details.

Fixes: 4cbb270e115b ("bpf: take into account BPF token when fetching helper protos")
Signed-off-by: Matthieu Baerts <matttbe@kernel.org>
---

Notes:
    to be squashed in "bpf: Add bpf_mptcp_sched_ops"

 net/mptcp/bpf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c
index 6b61dd54e69f..dfcaaf0e07dd 100644
--- a/net/mptcp/bpf.c
+++ b/net/mptcp/bpf.c
@@ -35,7 +35,7 @@ bpf_mptcp_sched_get_func_proto(enum bpf_func_id func_id,
 	case BPF_FUNC_skc_to_tcp_sock:
 		return &bpf_skc_to_tcp_sock_proto;
 	default:
-		return bpf_base_func_proto(func_id);
+		return bpf_base_func_proto(func_id, prog);
 	}
 }
 

base-commit: 5763f7d7b0e50d486c63e51c0495459f2eb93d2d
-- 
2.40.1

On Tue, 2023-12-19 at 10:27 +0100, Matthieu Baerts wrote:
> This fixes a compilation issue that we have in our tree after having
> synced with upstream. See the Fixes commit for more details.
> 
> Fixes: 4cbb270e115b ("bpf: take into account BPF token when fetching
> helper protos")
> Signed-off-by: Matthieu Baerts <matttbe@kernel.org>
> ---

Thanks, Matt.

Reviewed-and-tested-by: Geliang Tang <geliang.tang@linux.dev>

> 
> Notes:
>     to be squashed in "bpf: Add bpf_mptcp_sched_ops"
> 
>  net/mptcp/bpf.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c
> index 6b61dd54e69f..dfcaaf0e07dd 100644
> --- a/net/mptcp/bpf.c
> +++ b/net/mptcp/bpf.c
> @@ -35,7 +35,7 @@ bpf_mptcp_sched_get_func_proto(enum bpf_func_id
> func_id,
>         case BPF_FUNC_skc_to_tcp_sock:
>                 return &bpf_skc_to_tcp_sock_proto;
>         default:
> -               return bpf_base_func_proto(func_id);
> +               return bpf_base_func_proto(func_id, prog);
>         }
>  }
>  
> 
> base-commit: 5763f7d7b0e50d486c63e51c0495459f2eb93d2d

Hi Geliang,

On 19/12/2023 11:02, Geliang Tang wrote:
> On Tue, 2023-12-19 at 10:27 +0100, Matthieu Baerts wrote:
>> This fixes a compilation issue that we have in our tree after having
>> synced with upstream. See the Fixes commit for more details.
>>
>> Fixes: 4cbb270e115b ("bpf: take into account BPF token when fetching
>> helper protos")
>> Signed-off-by: Matthieu Baerts <matttbe@kernel.org>
>> ---
> 
> Thanks, Matt.
> 
> Reviewed-and-tested-by: Geliang Tang <geliang.tang@linux.dev>

Thank you for the quick review and test!

Now in our tree (in fact, I applied it just after having sent the patch,
not to block other tests):

New patches for t/upstream:
- 7180accd4086: Squash to "bpf: Add bpf_mptcp_sched_ops"
- Results: 518c786b5f89..0bd72c880c6d (export)

Tests are *not* in progress: I just disabled Cirrus builds as we already
reached the monthly limit:

- ac6e9cb8a375: cirrus: disable it for the moment

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

Hi Matthieu,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- {"code":404,"message":
  - "Can't find artifacts containing file conclusion.txt"}:
  - Task: https://cirrus-ci.com/task/5454052591403008
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5454052591403008/summary/summary.txt

- {"code":404,"message":
  - "Can't find artifacts containing file conclusion.txt"}:
  - Task: https://cirrus-ci.com/task/6579952498245632
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6579952498245632/summary/summary.txt

- {"code":404,"message":
  - "Can't find artifacts containing file conclusion.txt"}:
  - Task: https://cirrus-ci.com/task/5876265056468992
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5876265056468992/summary/summary.txt

- {"code":404,"message":
  - "Can't find artifacts containing file conclusion.txt"}:
  - Task: https://cirrus-ci.com/task/4750365149626368
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/4750365149626368/summary/summary.txt

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/c7b2d91a1382


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-debug

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)