selftests/bpf: Handle forwarding of UDP CLOCK_TAI packets

With changes in the design to forward CLOCK_TAI in the skbuff
framework,  existing selftest framework needs modification
to handle forwarding of UDP packets with CLOCK_TAI as clockid.

Signed-off-by: Abhishek Chauhan <quic_abchauha@quicinc.com>
Reviewed-by: Martin KaFai Lau <martin.lau@kernel.org>
Link: https://lore.kernel.org/r/20240509211834.3235191-4-quic_abchauha@quicinc.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

diff --git a/tools/testing/selftests/bpf/prog_tests/ctx_rewrite.c b/tools/testing/selftests/bpf/prog_tests/ctx_rewrite.c
index 3b7c57f..08b6391 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/ctx_rewrite.c
+++ b/tools/testing/selftests/bpf/prog_tests/ctx_rewrite.c
@@ -69,15 +69,17 @@ static struct test_case test_cases[] = {
        {
                N(SCHED_CLS, struct __sk_buff, tstamp),
                .read  = "r11 = *(u8 *)($ctx + sk_buff::__mono_tc_offset);"
-                        "w11 &= 3;"
-                        "if w11 != 0x3 goto pc+2;"
+                        "if w11 & 0x4 goto pc+1;"
+                        "goto pc+4;"
+                        "if w11 & 0x3 goto pc+1;"
+                        "goto pc+2;"
                         "$dst = 0;"
                         "goto pc+1;"
                         "$dst = *(u64 *)($ctx + sk_buff::tstamp);",
                .write = "r11 = *(u8 *)($ctx + sk_buff::__mono_tc_offset);"
-                        "if w11 & 0x2 goto pc+1;"
+                        "if w11 & 0x4 goto pc+1;"
                         "goto pc+2;"
-                        "w11 &= -2;"
+                        "w11 &= -4;"
                         "*(u8 *)($ctx + sk_buff::__mono_tc_offset) = r11;"
                         "*(u64 *)($ctx + sk_buff::tstamp) = $src;",
        },

diff --git a/tools/testing/selftests/bpf/prog_tests/tc_redirect.c b/tools/testing/selftests/bpf/prog_tests/tc_redirect.c
index b1073d3..327d51f 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/tc_redirect.c
+++ b/tools/testing/selftests/bpf/prog_tests/tc_redirect.c
@@ -890,9 +890,6 @@ static void test_udp_dtime(struct test_tc_dtime *skel, int family, bool bpf_fwd)
 
        ASSERT_EQ(dtimes[INGRESS_FWDNS_P100], 0,
                  dtime_cnt_str(t, INGRESS_FWDNS_P100));
-       /* non mono delivery time is not forwarded */
-       ASSERT_EQ(dtimes[INGRESS_FWDNS_P101], 0,
-                 dtime_cnt_str(t, INGRESS_FWDNS_P101));
        for (i = EGRESS_FWDNS_P100; i < SET_DTIME; i++)
                ASSERT_GT(dtimes[i], 0, dtime_cnt_str(t, i));
 

diff --git a/tools/testing/selftests/bpf/progs/test_tc_dtime.c b/tools/testing/selftests/bpf/progs/test_tc_dtime.c
index 74ec09f..ca8e873 100644 (file)
--- a/tools/testing/selftests/bpf/progs/test_tc_dtime.c
+++ b/tools/testing/selftests/bpf/progs/test_tc_dtime.c
@@ -222,17 +222,21 @@ int egress_host(struct __sk_buff *skb)
                return TC_ACT_OK;
 
        if (skb_proto(skb_type) == IPPROTO_TCP) {
-               if (skb->tstamp_type == BPF_SKB_TSTAMP_DELIVERY_MONO &&
+               if (skb->tstamp_type == BPF_SKB_CLOCK_MONOTONIC &&
                    skb->tstamp)
                        inc_dtimes(EGRESS_ENDHOST);
                else
                        inc_errs(EGRESS_ENDHOST);
-       } else {
-               if (skb->tstamp_type == BPF_SKB_TSTAMP_UNSPEC &&
+       } else if (skb_proto(skb_type) == IPPROTO_UDP) {
+               if (skb->tstamp_type == BPF_SKB_CLOCK_TAI &&
                    skb->tstamp)
                        inc_dtimes(EGRESS_ENDHOST);
                else
                        inc_errs(EGRESS_ENDHOST);
+       } else {
+               if (skb->tstamp_type == BPF_SKB_CLOCK_REALTIME &&
+                   skb->tstamp)
+                       inc_errs(EGRESS_ENDHOST);
        }
 
        skb->tstamp = EGRESS_ENDHOST_MAGIC;
@@ -252,7 +256,7 @@ int ingress_host(struct __sk_buff *skb)
        if (!skb_type)
                return TC_ACT_OK;
 
-       if (skb->tstamp_type == BPF_SKB_TSTAMP_DELIVERY_MONO &&
+       if (skb->tstamp_type == BPF_SKB_CLOCK_MONOTONIC &&
            skb->tstamp == EGRESS_FWDNS_MAGIC)
                inc_dtimes(INGRESS_ENDHOST);
        else
@@ -315,7 +319,6 @@ int egress_fwdns_prio100(struct __sk_buff *skb)
 SEC("tc")
 int ingress_fwdns_prio101(struct __sk_buff *skb)
 {
-       __u64 expected_dtime = EGRESS_ENDHOST_MAGIC;
        int skb_type;
 
        skb_type = skb_get_type(skb);
@@ -323,29 +326,24 @@ int ingress_fwdns_prio101(struct __sk_buff *skb)
                /* Should have handled in prio100 */
                return TC_ACT_SHOT;
 
-       if (skb_proto(skb_type) == IPPROTO_UDP)
-               expected_dtime = 0;
-
        if (skb->tstamp_type) {
                if (fwdns_clear_dtime() ||
-                   skb->tstamp_type != BPF_SKB_TSTAMP_DELIVERY_MONO ||
-                   skb->tstamp != expected_dtime)
+                   (skb->tstamp_type != BPF_SKB_CLOCK_MONOTONIC &&
+                   skb->tstamp_type != BPF_SKB_CLOCK_TAI) ||
+                   skb->tstamp != EGRESS_ENDHOST_MAGIC)
                        inc_errs(INGRESS_FWDNS_P101);
                else
                        inc_dtimes(INGRESS_FWDNS_P101);
        } else {
-               if (!fwdns_clear_dtime() && expected_dtime)
+               if (!fwdns_clear_dtime())
                        inc_errs(INGRESS_FWDNS_P101);
        }
 
-       if (skb->tstamp_type == BPF_SKB_TSTAMP_DELIVERY_MONO) {
+       if (skb->tstamp_type == BPF_SKB_CLOCK_MONOTONIC) {
                skb->tstamp = INGRESS_FWDNS_MAGIC;
        } else {
                if (bpf_skb_set_tstamp(skb, INGRESS_FWDNS_MAGIC,
-                                      BPF_SKB_TSTAMP_DELIVERY_MONO))
-                       inc_errs(SET_DTIME);
-               if (!bpf_skb_set_tstamp(skb, INGRESS_FWDNS_MAGIC,
-                                       BPF_SKB_TSTAMP_UNSPEC))
+                                      BPF_SKB_CLOCK_MONOTONIC))
                        inc_errs(SET_DTIME);
        }
 
@@ -370,7 +368,7 @@ int egress_fwdns_prio101(struct __sk_buff *skb)
 
        if (skb->tstamp_type) {
                if (fwdns_clear_dtime() ||
-                   skb->tstamp_type != BPF_SKB_TSTAMP_DELIVERY_MONO ||
+                   skb->tstamp_type != BPF_SKB_CLOCK_MONOTONIC ||
                    skb->tstamp != INGRESS_FWDNS_MAGIC)
                        inc_errs(EGRESS_FWDNS_P101);
                else
@@ -380,14 +378,11 @@ int egress_fwdns_prio101(struct __sk_buff *skb)
                        inc_errs(EGRESS_FWDNS_P101);
        }
 
-       if (skb->tstamp_type == BPF_SKB_TSTAMP_DELIVERY_MONO) {
+       if (skb->tstamp_type == BPF_SKB_CLOCK_MONOTONIC) {
                skb->tstamp = EGRESS_FWDNS_MAGIC;
        } else {
                if (bpf_skb_set_tstamp(skb, EGRESS_FWDNS_MAGIC,
-                                      BPF_SKB_TSTAMP_DELIVERY_MONO))
-                       inc_errs(SET_DTIME);
-               if (!bpf_skb_set_tstamp(skb, INGRESS_FWDNS_MAGIC,
-                                       BPF_SKB_TSTAMP_UNSPEC))
+                                      BPF_SKB_CLOCK_MONOTONIC))
                        inc_errs(SET_DTIME);
        }