2022-07-01 04:32:32

by Lukas Bulwahn

Subject: [PATCH] MAINTAINERS: adjust XDP SOCKETS after file movement

Commit f36600634282 ("libbpf: move xsk.{c,h} into selftests/bpf") moves
files tools/{lib => testing/selftests}/bpf/xsk.[ch], but misses to adjust
the XDP SOCKETS (AF_XDP) section in MAINTAINERS.

Adjust the file entry after this file movement.

Signed-off-by: Lukas Bulwahn <[email protected]>
---
Andrii, please ack.

Alexei, please pick this minor non-urgent clean-up on top of the commit above.

MAINTAINERS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index fa4bfa3d10bf..27d9e65b9a85 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -22042,7 +22042,7 @@ F: include/uapi/linux/xdp_diag.h
F: include/net/netns/xdp.h
F: net/xdp/
F: samples/bpf/xdpsock*
-F: tools/lib/bpf/xsk*
+F: tools/testing/selftests/bpf/xsk*

XEN BLOCK SUBSYSTEM
M: Roger Pau Monné <[email protected]>
--
2.17.1

2022-07-01 12:40:00

by Maciej Fijalkowski

Subject: Re: [PATCH] MAINTAINERS: adjust XDP SOCKETS after file movement

On Fri, Jul 01, 2022 at 06:28:10AM +0200, Lukas Bulwahn wrote:
> Commit f36600634282 ("libbpf: move xsk.{c,h} into selftests/bpf") moves
> files tools/{lib => testing/selftests}/bpf/xsk.[ch], but misses to adjust
> the XDP SOCKETS (AF_XDP) section in MAINTAINERS.
>
> Adjust the file entry after this file movement.
>
> Signed-off-by: Lukas Bulwahn <[email protected]>
> ---
> Andrii, please ack.
>
> Alexei, please pick this minor non-urgent clean-up on top of the commit above.
>
> MAINTAINERS | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index fa4bfa3d10bf..27d9e65b9a85 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -22042,7 +22042,7 @@ F: include/uapi/linux/xdp_diag.h
> F: include/net/netns/xdp.h
> F: net/xdp/
> F: samples/bpf/xdpsock*
> -F: tools/lib/bpf/xsk*
> +F: tools/testing/selftests/bpf/xsk*

Magnus, this doesn't cover xdpxceiver.
How about we move the lib part and xdpxceiver part to a dedicated
directory? Or would it be too nested from main dir POV?

>
> XEN BLOCK SUBSYSTEM
> M: Roger Pau Monn? <[email protected]>
> --
> 2.17.1
>

2022-07-01 13:31:17

by Magnus Karlsson

Subject: Re: [PATCH] MAINTAINERS: adjust XDP SOCKETS after file movement

On Fri, Jul 1, 2022 at 2:38 PM Maciej Fijalkowski
<[email protected]> wrote:
>
> On Fri, Jul 01, 2022 at 06:28:10AM +0200, Lukas Bulwahn wrote:
> > Commit f36600634282 ("libbpf: move xsk.{c,h} into selftests/bpf") moves
> > files tools/{lib => testing/selftests}/bpf/xsk.[ch], but misses to adjust
> > the XDP SOCKETS (AF_XDP) section in MAINTAINERS.
> >
> > Adjust the file entry after this file movement.
> >
> > Signed-off-by: Lukas Bulwahn <[email protected]>
> > ---
> > Andrii, please ack.
> >
> > Alexei, please pick this minor non-urgent clean-up on top of the commit above.
> >
> > MAINTAINERS | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index fa4bfa3d10bf..27d9e65b9a85 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -22042,7 +22042,7 @@ F: include/uapi/linux/xdp_diag.h
> > F: include/net/netns/xdp.h
> > F: net/xdp/
> > F: samples/bpf/xdpsock*
> > -F: tools/lib/bpf/xsk*
> > +F: tools/testing/selftests/bpf/xsk*
>
> Magnus, this doesn't cover xdpxceiver.
> How about we move the lib part and xdpxceiver part to a dedicated
> directory? Or would it be too nested from main dir POV?

Or we can just call everything we add xsk* something?

> >
> > XEN BLOCK SUBSYSTEM
> > M: Roger Pau Monné <[email protected]>
> > --
> > 2.17.1
> >

2022-07-01 14:14:38

by Maciej Fijalkowski

Subject: Re: [PATCH] MAINTAINERS: adjust XDP SOCKETS after file movement

On Fri, Jul 01, 2022 at 03:13:36PM +0200, Magnus Karlsson wrote:
> On Fri, Jul 1, 2022 at 2:38 PM Maciej Fijalkowski
> <[email protected]> wrote:
> >
> > On Fri, Jul 01, 2022 at 06:28:10AM +0200, Lukas Bulwahn wrote:
> > > Commit f36600634282 ("libbpf: move xsk.{c,h} into selftests/bpf") moves
> > > files tools/{lib => testing/selftests}/bpf/xsk.[ch], but misses to adjust
> > > the XDP SOCKETS (AF_XDP) section in MAINTAINERS.
> > >
> > > Adjust the file entry after this file movement.
> > >
> > > Signed-off-by: Lukas Bulwahn <[email protected]>
> > > ---
> > > Andrii, please ack.
> > >
> > > Alexei, please pick this minor non-urgent clean-up on top of the commit above.
> > >
> > > MAINTAINERS | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/MAINTAINERS b/MAINTAINERS
> > > index fa4bfa3d10bf..27d9e65b9a85 100644
> > > --- a/MAINTAINERS
> > > +++ b/MAINTAINERS
> > > @@ -22042,7 +22042,7 @@ F: include/uapi/linux/xdp_diag.h
> > > F: include/net/netns/xdp.h
> > > F: net/xdp/
> > > F: samples/bpf/xdpsock*
> > > -F: tools/lib/bpf/xsk*
> > > +F: tools/testing/selftests/bpf/xsk*
> >
> > Magnus, this doesn't cover xdpxceiver.
> > How about we move the lib part and xdpxceiver part to a dedicated
> > directory? Or would it be too nested from main dir POV?
>
> Or we can just call everything we add xsk* something?

No strong feelings. test_xsk.sh probably also needs to be addressed.
That's why I proposed dedicated dir.

>
> > >
> > > XEN BLOCK SUBSYSTEM
> > > M: Roger Pau Monn? <[email protected]>
> > > --
> > > 2.17.1
> > >

2022-07-05 13:24:38

by Daniel Borkmann

Subject: Re: [PATCH] MAINTAINERS: adjust XDP SOCKETS after file movement

On 7/1/22 3:52 PM, Maciej Fijalkowski wrote:
> On Fri, Jul 01, 2022 at 03:13:36PM +0200, Magnus Karlsson wrote:
>> On Fri, Jul 1, 2022 at 2:38 PM Maciej Fijalkowski
>> <[email protected]> wrote:
>>>
>>> On Fri, Jul 01, 2022 at 06:28:10AM +0200, Lukas Bulwahn wrote:
>>>> Commit f36600634282 ("libbpf: move xsk.{c,h} into selftests/bpf") moves
>>>> files tools/{lib => testing/selftests}/bpf/xsk.[ch], but misses to adjust
>>>> the XDP SOCKETS (AF_XDP) section in MAINTAINERS.
>>>>
>>>> Adjust the file entry after this file movement.
>>>>
>>>> Signed-off-by: Lukas Bulwahn <[email protected]>
>>>> ---
>>>> Andrii, please ack.
>>>>
>>>> Alexei, please pick this minor non-urgent clean-up on top of the commit above.
>>>>
>>>> MAINTAINERS | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>>> index fa4bfa3d10bf..27d9e65b9a85 100644
>>>> --- a/MAINTAINERS
>>>> +++ b/MAINTAINERS
>>>> @@ -22042,7 +22042,7 @@ F: include/uapi/linux/xdp_diag.h
>>>> F: include/net/netns/xdp.h
>>>> F: net/xdp/
>>>> F: samples/bpf/xdpsock*
>>>> -F: tools/lib/bpf/xsk*
>>>> +F: tools/testing/selftests/bpf/xsk*
>>>
>>> Magnus, this doesn't cover xdpxceiver.
>>> How about we move the lib part and xdpxceiver part to a dedicated
>>> directory? Or would it be too nested from main dir POV?
>>
>> Or we can just call everything we add xsk* something?
>
> No strong feelings. test_xsk.sh probably also needs to be addressed.
> That's why I proposed dedicated dir.

Could one of you follow-up on this for bpf-next tree? Maybe for selftests something
similar as in case of the XDP entry could work.

Thanks,
Daniel

2022-07-05 14:40:21

by Maciej Fijalkowski

Subject: Re: [PATCH] MAINTAINERS: adjust XDP SOCKETS after file movement

On Tue, Jul 05, 2022 at 02:01:06PM +0200, Daniel Borkmann wrote:
> On 7/1/22 3:52 PM, Maciej Fijalkowski wrote:
> > On Fri, Jul 01, 2022 at 03:13:36PM +0200, Magnus Karlsson wrote:
> > > On Fri, Jul 1, 2022 at 2:38 PM Maciej Fijalkowski
> > > <[email protected]> wrote:
> > > >
> > > > On Fri, Jul 01, 2022 at 06:28:10AM +0200, Lukas Bulwahn wrote:
> > > > > Commit f36600634282 ("libbpf: move xsk.{c,h} into selftests/bpf") moves
> > > > > files tools/{lib => testing/selftests}/bpf/xsk.[ch], but misses to adjust
> > > > > the XDP SOCKETS (AF_XDP) section in MAINTAINERS.
> > > > >
> > > > > Adjust the file entry after this file movement.
> > > > >
> > > > > Signed-off-by: Lukas Bulwahn <[email protected]>
> > > > > ---
> > > > > Andrii, please ack.
> > > > >
> > > > > Alexei, please pick this minor non-urgent clean-up on top of the commit above.
> > > > >
> > > > > MAINTAINERS | 2 +-
> > > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > > >
> > > > > diff --git a/MAINTAINERS b/MAINTAINERS
> > > > > index fa4bfa3d10bf..27d9e65b9a85 100644
> > > > > --- a/MAINTAINERS
> > > > > +++ b/MAINTAINERS
> > > > > @@ -22042,7 +22042,7 @@ F: include/uapi/linux/xdp_diag.h
> > > > > F: include/net/netns/xdp.h
> > > > > F: net/xdp/
> > > > > F: samples/bpf/xdpsock*
> > > > > -F: tools/lib/bpf/xsk*
> > > > > +F: tools/testing/selftests/bpf/xsk*
> > > >
> > > > Magnus, this doesn't cover xdpxceiver.
> > > > How about we move the lib part and xdpxceiver part to a dedicated
> > > > directory? Or would it be too nested from main dir POV?
> > >
> > > Or we can just call everything we add xsk* something?
> >
> > No strong feelings. test_xsk.sh probably also needs to be addressed.
> > That's why I proposed dedicated dir.
>
> Could one of you follow-up on this for bpf-next tree? Maybe for selftests something
> similar as in case of the XDP entry could work.

Yes, sorry. Let's do:

F: tools/testing/selftests/bpf/*xsk*

then s/xdpxceiver/xskxceiver. I can send a follow-up and add Lukas as a
reporter.

Sounds good?

>
> Thanks,
> Daniel