selftests/bpf: fix ct status check in bpf_nf selftests

Check properly the connection tracking entry status configured running
bpf_ct_change_status kfunc.
Remove unnecessary IPS_CONFIRMED status configuration since it is
already done during entry allocation.

Fixes: 6eb7fba007a7 ("selftests/bpf: Add tests for new nf_conntrack kfuncs")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Acked-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/813a5161a71911378dfac8770ec890428e4998aa.1662623574.git.lorenzo@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_nf.c b/tools/testing/selftests/bpf/prog_tests/bpf_nf.c
index ab9117ae75451c4b673510f912cc80388c4b34f4..0677a51694c900932e09c7e0ad07a3e1dd4a3fb5 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/bpf_nf.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_nf.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <test_progs.h>
 #include <network_helpers.h>
+#include <linux/netfilter/nf_conntrack_common.h>
 #include "test_bpf_nf.skel.h"
 #include "test_bpf_nf_fail.skel.h"
 
@@ -112,9 +113,9 @@ static void test_bpf_nf_ct(int mode)
        /* allow some tolerance for test_delta_timeout value to avoid races. */
        ASSERT_GT(skel->bss->test_delta_timeout, 8, "Test for min ct timeout update");
        ASSERT_LE(skel->bss->test_delta_timeout, 10, "Test for max ct timeout update");
-       /* expected status is IPS_SEEN_REPLY */
-       ASSERT_EQ(skel->bss->test_status, 2, "Test for ct status update ");
        ASSERT_EQ(skel->bss->test_insert_lookup_mark, 77, "Test for insert and lookup mark value");
+       ASSERT_EQ(skel->bss->test_status, IPS_CONFIRMED | IPS_SEEN_REPLY,
+                 "Test for ct status update ");
        ASSERT_EQ(skel->data->test_exist_lookup, 0, "Test existing connection lookup");
        ASSERT_EQ(skel->bss->test_exist_lookup_mark, 43, "Test existing connection lookup ctmark");
 end:

diff --git a/tools/testing/selftests/bpf/progs/test_bpf_nf.c b/tools/testing/selftests/bpf/progs/test_bpf_nf.c
index b5e7079701e8a70af60ab7ffd0af86e5ec88ee5c..88842da86ddc8d994fca94e5cb4a5929c3b9af70 100644 (file)
--- a/tools/testing/selftests/bpf/progs/test_bpf_nf.c
+++ b/tools/testing/selftests/bpf/progs/test_bpf_nf.c
@@ -144,7 +144,6 @@ nf_ct_test(struct nf_conn *(*lookup_fn)(void *, struct bpf_sock_tuple *, u32,
                struct nf_conn *ct_ins;
 
                bpf_ct_set_timeout(ct, 10000);
-               bpf_ct_set_status(ct, IPS_CONFIRMED);
                ct->mark = 77;
 
                ct_ins = bpf_ct_insert_entry(ct);
@@ -158,9 +157,11 @@ nf_ct_test(struct nf_conn *(*lookup_fn)(void *, struct bpf_sock_tuple *, u32,
                                bpf_ct_change_timeout(ct_lk, 10000);
                                test_delta_timeout = ct_lk->timeout - bpf_jiffies64();
                                test_delta_timeout /= CONFIG_HZ;
-                               test_status = IPS_SEEN_REPLY;
                                test_insert_lookup_mark = ct_lk->mark;
-                               bpf_ct_change_status(ct_lk, IPS_SEEN_REPLY);
+                               bpf_ct_change_status(ct_lk,
+                                                    IPS_CONFIRMED | IPS_SEEN_REPLY);
+                               test_status = ct_lk->status;
+
                                bpf_ct_release(ct_lk);
                                test_succ_lookup = 0;
                        }