Re: [PATCH bpf-next] selftests/bpf: consolidate VIRTIO/9P configs in the generic config file

[Manu Bretelle <chantr4@gmail.com>]

On Fri, Oct 27, 2023 at 02:33:34PM -0700, Song Liu wrote:
> On Fri, Oct 27, 2023 at 2:23 PM Manu Bretelle <chantr4@gmail.com> wrote:
> >
> > Those configs are needed to be able to run VM somewhat consistently.
> > For instance, ATM, s390x is missing the `CONFIG_VIRTIO_CONSOLE` which
> > prevents s390x kernels built in CI to leverage qemu-guest-agent.
> >
> > By moving them to `config`, we should have selftest kernels which are
> > equal in term of functionalities.
> >
> > The set of config unabled were picked using
> >
> >     grep -h -E '(_9P|_VIRTIO)' config.x86_64 config | sort | uniq
> >
> > added to `config` and then
> >     grep -vE '(_9P|_VIRTIO)' config.{x86_64,aarch64,s390x}
> >
> > as a side-effect, some config may have disappeared to the aarch64 and
> > s390x kernels, but they should not be needed. CI will tell.
> >
> > Signed-off-by: Manu Bretelle <chantr4@gmail.com>
> > ---
> >  tools/testing/selftests/bpf/config         | 13 +++++++++++++
> >  tools/testing/selftests/bpf/config.aarch64 | 16 ----------------
> >  tools/testing/selftests/bpf/config.s390x   |  9 ---------
> >  tools/testing/selftests/bpf/config.x86_64  | 12 ------------
> >  4 files changed, 13 insertions(+), 37 deletions(-)
> >
> > diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config
> > index 3ec5927ec3e5..c22a068bc1de 100644
> > --- a/tools/testing/selftests/bpf/config
> > +++ b/tools/testing/selftests/bpf/config
> > @@ -86,3 +86,16 @@ CONFIG_VXLAN=y
> >  CONFIG_XDP_SOCKETS=y
> >  CONFIG_XFRM_INTERFACE=y
> >  CONFIG_VSOCKETS=y
> > +# VIRTIO/9P configs to run in VMs
> > +CONFIG_9P_FS_POSIX_ACL=y
> > +CONFIG_9P_FS_SECURITY=y
> > +CONFIG_9P_FS=y
> > +CONFIG_CRYPTO_DEV_VIRTIO=y
> > +CONFIG_NET_9P_VIRTIO=y
> > +CONFIG_NET_9P=y
> > +CONFIG_VIRTIO_BALLOON=y
> > +CONFIG_VIRTIO_BLK=y
> > +CONFIG_VIRTIO_CONSOLE=y
> > +CONFIG_VIRTIO_NET=y
> > +CONFIG_VIRTIO_PCI=y
> > +CONFIG_VIRTIO_VSOCKETS_COMMON=y
> 
> Please keep these in alphabetical order.
> 

ACK, I wanted to keep those related configs together, but by moving it to a
different file, per Andrii comment, that will address 2 birds with one stone.

While at it, I can probably sort the current files, which seem out of order
(per sort result).

> Thanks,
> Song