On Fri, 22 May 2020 at 01:09, Sasha Levin <sashal@xxxxxxxxxx> wrote:
>
> On Thu, May 21, 2020 at 03:48:41PM +0100, Lorenz Bauer wrote:
> >commit 634efb750435 ("selftests: bpf: Reset global state between
> >reuseport test runs") uses a macro RET_IF which doesn't exist in
> >the v4.19 tree. It is defined as follows:
> >
> > #define RET_IF(condition, tag, format...) ({
> > if (CHECK_FAIL(condition)) {
> > printf(tag " " format);
> > return;
> > }
> > })
> >
> >CHECK_FAIL in turn is defined as:
> >
> > #define CHECK_FAIL(condition) ({
> > int __ret = !!(condition);
> > int __save_errno = errno;
> > if (__ret) {
> > test__fail();
> > fprintf(stdout, "%s:FAIL:%d\n", __func__, __LINE__);
> > }
> > errno = __save_errno;
> > __ret;
> > })
> >
> >Replace occurences of RET_IF with CHECK. This will abort the test binary
> >if clearing the intermediate state fails.
> >
> >Fixes: 634efb750435 ("selftests: bpf: Reset global state between reuseport test runs")
> >Reported-by: kernel test robot <rong.a.chen@xxxxxxxxx>
> >Signed-off-by: Lorenz Bauer <lmb@xxxxxxxxxxxxxx>
>
> Thanks for the backport Lorenz. We'll need to wait for it to make it
> into Linus's tree before queueing up for the stable trees.
Apologies for sending the patch too early (?), I'm still new to this process.
I've just hit this on 4.19.127. Do you want me to re-submit the patch somewhere?
Lorenz
--
Lorenz Bauer | Systems Engineer
6th Floor, County Hall/The Riverside Building, SE1 7PB, UK
www.cloudflare.com
