2021-04-14 17:47:33

by Florent Revest

Subject: [PATCH] selftests/bpf: Fix the ASSERT_ERR_PTR macro

It is just missing a ';'. This macro is not used by any test yet.

Signed-off-by: Florent Revest <[email protected]>
---
tools/testing/selftests/bpf/test_progs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h
index e87c8546230e..ee7e3b45182a 100644
--- a/tools/testing/selftests/bpf/test_progs.h
+++ b/tools/testing/selftests/bpf/test_progs.h
@@ -210,7 +210,7 @@ extern int test__join_cgroup(const char *path);
#define ASSERT_ERR_PTR(ptr, name) ({ \
static int duration = 0; \
const void *___res = (ptr); \
- bool ___ok = IS_ERR(___res) \
+ bool ___ok = IS_ERR(___res); \
CHECK(!___ok, (name), "unexpected pointer: %p\n", ___res); \
___ok; \
})
--
2.31.1.295.g9ea45b61b8-goog

2021-04-15 00:42:55

by Martin KaFai Lau

Subject: Re: [PATCH] selftests/bpf: Fix the ASSERT_ERR_PTR macro

On Wed, Apr 14, 2021 at 05:56:32PM +0200, Florent Revest wrote:
> It is just missing a ';'. This macro is not used by any test yet.
>
> Signed-off-by: Florent Revest <[email protected]>
Fixes: 22ba36351631 ("selftests/bpf: Move and extend ASSERT_xxx() testing macros")

Since it has not been used, it could be bpf-next. Please also tag
it in the future.

Acked-by: Martin KaFai Lau <[email protected]>

2021-04-15 01:06:50

by Andrii Nakryiko

Subject: Re: [PATCH] selftests/bpf: Fix the ASSERT_ERR_PTR macro

On Wed, Apr 14, 2021 at 11:58 AM Martin KaFai Lau <[email protected]> wrote:
>
> On Wed, Apr 14, 2021 at 05:56:32PM +0200, Florent Revest wrote:
> > It is just missing a ';'. This macro is not used by any test yet.
> >
> > Signed-off-by: Florent Revest <[email protected]>
> Fixes: 22ba36351631 ("selftests/bpf: Move and extend ASSERT_xxx() testing macros")
>

Thanks, Martin. Added Fixes tag and applied to bpf-next.

> Since it has not been used, it could be bpf-next. Please also tag
> it in the future.
>
> Acked-by: Martin KaFai Lau <[email protected]>

2021-04-15 08:49:23

by Florent Revest

Subject: Re: [PATCH] selftests/bpf: Fix the ASSERT_ERR_PTR macro

On Thu, Apr 15, 2021 at 2:28 AM Andrii Nakryiko
<[email protected]> wrote:
> On Wed, Apr 14, 2021 at 11:58 AM Martin KaFai Lau <[email protected]> wrote:
> > On Wed, Apr 14, 2021 at 05:56:32PM +0200, Florent Revest wrote:
> > > It is just missing a ';'. This macro is not used by any test yet.
> > >
> > > Signed-off-by: Florent Revest <[email protected]>
> > Fixes: 22ba36351631 ("selftests/bpf: Move and extend ASSERT_xxx() testing macros")
> >
>
> Thanks, Martin. Added Fixes tag and applied to bpf-next.
>
> > Since it has not been used, it could be bpf-next. Please also tag
> > it in the future.

Sorry about that, I'll make sure I remember it next time :)

> > Acked-by: Martin KaFai Lau <[email protected]>