[PATCH mptcp-next] Squash to "selftests: bpf: add bpf_first scheduler v8"

[PATCH mptcp-next] Squash to "selftests: bpf: add bpf_first scheduler v8"

[Geliang Tang]

- Move mptcp_sched_ops to bpf_mptcp_helpers.h.
- Update MAINTAINERS.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 MAINTAINERS                                         |  1 +
 tools/testing/selftests/bpf/bpf_mptcp_helpers.h     | 12 ++++++++++++
 tools/testing/selftests/bpf/bpf_tcp_helpers.h       | 12 ------------
 tools/testing/selftests/bpf/progs/mptcp_bpf_first.c |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 40a62dc29e31..852e21ca47f8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13746,6 +13746,7 @@ F:	include/trace/events/mptcp.h
 F:	include/uapi/linux/mptcp.h
 F:	net/mptcp/
 F:	tools/testing/selftests/bpf/bpf_mptcp_helpers.h
+F:	tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
 F:	tools/testing/selftests/bpf/progs/mptcp_sock.c
 F:	tools/testing/selftests/bpf/prog_tests/mptcp.c
 F:	tools/testing/selftests/net/mptcp/
diff --git a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h
index b5a43b108982..5135eb6710e8 100644
--- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h
+++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h
@@ -14,4 +14,16 @@ struct mptcp_sock {
 	char		ca_name[TCP_CA_NAME_MAX];
 } __attribute__((preserve_access_index));
 
+#define MPTCP_SCHED_NAME_MAX 16
+
+struct mptcp_sched_ops {
+	char name[MPTCP_SCHED_NAME_MAX];
+
+	void (*init)(struct mptcp_sock *msk);
+	void (*release)(struct mptcp_sock *msk);
+
+	struct sock *	(*get_subflow)(struct mptcp_sock *msk);
+	void *owner;
+};
+
 #endif
diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
index ee66a8bef85d..89750d732cfa 100644
--- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h
+++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
@@ -189,18 +189,6 @@ struct tcp_congestion_ops {
 	void *owner;
 };
 
-#define MPTCP_SCHED_NAME_MAX 16
-
-struct mptcp_sched_ops {
-	char name[MPTCP_SCHED_NAME_MAX];
-
-	void (*init)(struct mptcp_sock *msk);
-	void (*release)(struct mptcp_sock *msk);
-
-	struct sock *	(*get_subflow)(struct mptcp_sock *msk);
-	void *owner;
-};
-
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) > (b) ? (a) : (b))
 #define min_not_zero(x, y) ({			\
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
index 3ae5c1eab5f5..21890a60f9c2 100644
--- a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
+++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
@@ -2,7 +2,7 @@
 /* Copyright (c) 2022, SUSE. */
 
 #include <linux/bpf.h>
-#include "bpf_tcp_helpers.h"
+#include "bpf_mptcp_helpers.h"
 
 char _license[] SEC("license") = "GPL";
 
-- 
2.34.1

Re: [PATCH mptcp-next] Squash to "selftests: bpf: add bpf_first scheduler v8"

[Matthieu Baerts]

Hi Geliang,

On 31/03/2022 10:23, Geliang Tang wrote:
> - Move mptcp_sched_ops to bpf_mptcp_helpers.h.
> - Update MAINTAINERS.
> 
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> ---
>  MAINTAINERS                                         |  1 +
>  tools/testing/selftests/bpf/bpf_mptcp_helpers.h     | 12 ++++++++++++
>  tools/testing/selftests/bpf/bpf_tcp_helpers.h       | 12 ------------
>  tools/testing/selftests/bpf/progs/mptcp_bpf_first.c |  2 +-
>  4 files changed, 14 insertions(+), 13 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 40a62dc29e31..852e21ca47f8 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -13746,6 +13746,7 @@ F:	include/trace/events/mptcp.h
>  F:	include/uapi/linux/mptcp.h
>  F:	net/mptcp/
>  F:	tools/testing/selftests/bpf/bpf_mptcp_helpers.h
> +F:	tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
>  F:	tools/testing/selftests/bpf/progs/mptcp_sock.c
>  F:	tools/testing/selftests/bpf/prog_tests/mptcp.c

Maybe we should start using '*' to avoid having to update this file all
the time :)

  tools/testing/selftests/bpf/bpf_mptcp_helpers.h
  tools/testing/selftests/bpf/*/*mptcp*.[ch]

WDYT?

I know in 2020, we didn't list these files here not knowing who would be
"officially" maintaining them. But I guess it is best to list them here
to be notified when they are modified.

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

Re: [PATCH mptcp-next] Squash to "selftests: bpf: add bpf_first scheduler v8"

[Geliang Tang]

Hi Matt,

On Thu, Mar 31, 2022 at 12:07:45PM +0200, Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 31/03/2022 10:23, Geliang Tang wrote:
> > - Move mptcp_sched_ops to bpf_mptcp_helpers.h.
> > - Update MAINTAINERS.
> > 
> > Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> > ---
> >  MAINTAINERS                                         |  1 +
> >  tools/testing/selftests/bpf/bpf_mptcp_helpers.h     | 12 ++++++++++++
> >  tools/testing/selftests/bpf/bpf_tcp_helpers.h       | 12 ------------
> >  tools/testing/selftests/bpf/progs/mptcp_bpf_first.c |  2 +-
> >  4 files changed, 14 insertions(+), 13 deletions(-)
> > 
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 40a62dc29e31..852e21ca47f8 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -13746,6 +13746,7 @@ F:	include/trace/events/mptcp.h
> >  F:	include/uapi/linux/mptcp.h
> >  F:	net/mptcp/
> >  F:	tools/testing/selftests/bpf/bpf_mptcp_helpers.h
> > +F:	tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
> >  F:	tools/testing/selftests/bpf/progs/mptcp_sock.c
> >  F:	tools/testing/selftests/bpf/prog_tests/mptcp.c
> 
> Maybe we should start using '*' to avoid having to update this file all
> the time :)
> 
>   tools/testing/selftests/bpf/bpf_mptcp_helpers.h
>   tools/testing/selftests/bpf/*/*mptcp*.[ch]
> 
> WDYT?

Yes, using '*' is much better. Could you please update this for me when
squashing it? Or should I send a v2 for this?

Thanks,
-Geliang

> 
> I know in 2020, we didn't list these files here not knowing who would be
> "officially" maintaining them. But I guess it is best to list them here
> to be notified when they are modified.
> 
> Cheers,
> Matt
> -- 
> Tessares | Belgium | Hybrid Access Solutions
> www.tessares.net
> 

Re: [PATCH mptcp-next] Squash to "selftests: bpf: add bpf_first scheduler v8"

[Matthieu Baerts]

Hi Geliang,

On 31/03/2022 12:40, Geliang Tang wrote:
> Hi Matt,
> 
> On Thu, Mar 31, 2022 at 12:07:45PM +0200, Matthieu Baerts wrote:
>> Hi Geliang,
>>
>> On 31/03/2022 10:23, Geliang Tang wrote:
>>> - Move mptcp_sched_ops to bpf_mptcp_helpers.h.
>>> - Update MAINTAINERS.
>>>
>>> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
>>> ---
>>>  MAINTAINERS                                         |  1 +
>>>  tools/testing/selftests/bpf/bpf_mptcp_helpers.h     | 12 ++++++++++++
>>>  tools/testing/selftests/bpf/bpf_tcp_helpers.h       | 12 ------------
>>>  tools/testing/selftests/bpf/progs/mptcp_bpf_first.c |  2 +-
>>>  4 files changed, 14 insertions(+), 13 deletions(-)
>>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index 40a62dc29e31..852e21ca47f8 100644
>>> --- a/MAINTAINERS
>>> +++ b/MAINTAINERS
>>> @@ -13746,6 +13746,7 @@ F:	include/trace/events/mptcp.h
>>>  F:	include/uapi/linux/mptcp.h
>>>  F:	net/mptcp/
>>>  F:	tools/testing/selftests/bpf/bpf_mptcp_helpers.h
>>> +F:	tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
>>>  F:	tools/testing/selftests/bpf/progs/mptcp_sock.c
>>>  F:	tools/testing/selftests/bpf/prog_tests/mptcp.c
>>
>> Maybe we should start using '*' to avoid having to update this file all
>> the time :)
>>
>>   tools/testing/selftests/bpf/bpf_mptcp_helpers.h
>>   tools/testing/selftests/bpf/*/*mptcp*.[ch]
>>
>> WDYT?
> 
> Yes, using '*' is much better. Could you please update this for me when
> squashing it? Or should I send a v2 for this?

I can do that directly, probably easier! :)

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