On Tue, Dec 13, 2022 at 3:21 PM Daniel Müller <deso@xxxxxxxxxx> wrote:
>
> On Tue, Dec 13, 2022 at 02:05:00PM -0800, Song Liu wrote:
> > BPF selftests require CONFIG_FUNCTION_ERROR_INJECTION to work. However,
> > CONFIG_FUNCTION_ERROR_INJECTION is no longer 'y' by default after [1].
> > As a result, we are seeing errors like the following from BPF CI:
> >
> > bpf_testmod_test_read() is not modifiable
> > __x64_sys_setdomainname is not sleepable
> > __x64_sys_getpgid is not sleepable
> >
> > Fix this by explicitly selecting CONFIG_FUNCTION_ERROR_INJECTION in the
> > selftest config.
> >
> > [1] commit a4412fdd49dc ("error-injection: Add prompt for function error injection")
> > Reported-by: Daniel Müller <deso@xxxxxxxxxx>
> > Signed-off-by: Song Liu <song@xxxxxxxxxx>
> > ---
> > tools/testing/selftests/bpf/config | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config
> > index 612f699dc4f7..5cbc975fd5c8 100644
> > --- a/tools/testing/selftests/bpf/config
> > +++ b/tools/testing/selftests/bpf/config
> > @@ -76,3 +76,4 @@ CONFIG_USERFAULTFD=y
> > CONFIG_VXLAN=y
> > CONFIG_XDP_SOCKETS=y
> > CONFIG_XFRM_INTERFACE=y
> > +CONFIG_FUNCTION_ERROR_INJECTION=y
> > \ No newline at end of file
>
> Thanks for the fix! I believe we try to keep the file sorted (although I do see
> one violation) to make it easy to diff against arch specific configs but also to
> minimize the risk of merge conflicts (more likely if everybody appends). Would
> you mind sorting the addition in?
>
> Looks good to me otherwise.
>
> Acked-by: Daniel Müller <deso@xxxxxxxxxx>
I've fixed up the patch (order, added Fixes: tag, etc) locally. But
I'm waiting for CI to confirm. Song, no need to resubmit this, but
please add a custom patch to BPF CI, so that this applies to both bpf
and bpf-next trees. Thanks!
