[PATCH mptcp-others-next] mptcp: bpf: Pass const struct bpf_prog * to .check_member

Matthieu Baerts posted 1 patch 1 year, 2 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/20230130102608.1278837-1-matthieu.baerts@tessares.net
Maintainers: Matthieu Baerts <matthieu.baerts@tessares.net>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Alexei Starovoitov <ast@kernel.org>, David Vernet <void@manifault.com>
net/mptcp/bpf.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[PATCH mptcp-others-next] mptcp: bpf: Pass const struct bpf_prog * to .check_member
Posted by Matthieu Baerts 1 year, 2 months ago
Adapt our code to a recent API change in BPF, see the Fixes tag.

Fixes: 51a52a29ebaa ("bpf: Pass const struct bpf_prog * to .check_member")
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
 net/mptcp/bpf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c
index c08458a31f46..14ea1342598a 100644
--- a/net/mptcp/bpf.c
+++ b/net/mptcp/bpf.c
@@ -89,7 +89,8 @@ static void bpf_mptcp_sched_unreg(void *kdata)
 }
 
 static int bpf_mptcp_sched_check_member(const struct btf_type *t,
-					const struct btf_member *member)
+					const struct btf_member *member,
+					const struct bpf_prog *prog)
 {
 	return 0;
 }
-- 
2.38.1
Re: [PATCH mptcp-others-next] mptcp: bpf: Pass const struct bpf_prog * to .check_member
Posted by Matthieu Baerts 1 year, 2 months ago
Hello,

On 30/01/2023 11:26, Matthieu Baerts wrote:
> Adapt our code to a recent API change in BPF, see the Fixes tag.

I forgot to mention the goal is to squash this in "bpf: Add
bpf_mptcp_sched_ops" commit.

I just applied it there to have the CI stop complaining:

- 2282363eec43: mptcp: bpf: Pass const struct bpf_prog * to .check_member
- Results: b1869910a6c3..a9e99450a0dc (export)

I guess no other modifications are needed as the modified function is
doing nothing for the moment.

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net