Patch "selftests/bpf: Relax time_tai test for equal timestamps in tai_forward" has been added to the 6.7-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    selftests/bpf: Relax time_tai test for equal timestamps in tai_forward

to the 6.7-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     selftests-bpf-relax-time_tai-test-for-equal-timestam.patch
and it can be found in the queue-6.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 4c4e411b947896b814d77b70e2c8d88b0e5e3ba2
Author: YiFei Zhu <zhuyifei@xxxxxxxxxx>
Date:   Tue Dec 12 18:29:11 2023 +0000

    selftests/bpf: Relax time_tai test for equal timestamps in tai_forward
    
    [ Upstream commit e1ba7f64b192f083b4423644be03bb9e3dc8ae84 ]
    
    We're observing test flakiness on an arm64 platform which might not
    have timestamps as precise as x86. The test log looks like:
    
      test_time_tai:PASS:tai_open 0 nsec
      test_time_tai:PASS:test_run 0 nsec
      test_time_tai:PASS:tai_ts1 0 nsec
      test_time_tai:PASS:tai_ts2 0 nsec
      test_time_tai:FAIL:tai_forward unexpected tai_forward: actual 1702348135471494160 <= expected 1702348135471494160
      test_time_tai:PASS:tai_gettime 0 nsec
      test_time_tai:PASS:tai_future_ts1 0 nsec
      test_time_tai:PASS:tai_future_ts2 0 nsec
      test_time_tai:PASS:tai_range_ts1 0 nsec
      test_time_tai:PASS:tai_range_ts2 0 nsec
      #199     time_tai:FAIL
    
    This patch changes ASSERT_GT to ASSERT_GE in the tai_forward assertion
    so that equal timestamps are permitted.
    
    Fixes: 64e15820b987 ("selftests/bpf: Add BPF-helper test for CLOCK_TAI access")
    Signed-off-by: YiFei Zhu <zhuyifei@xxxxxxxxxx>
    Signed-off-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
    Link: https://lore.kernel.org/bpf/20231212182911.3784108-1-zhuyifei@xxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/bpf/prog_tests/time_tai.c b/tools/testing/selftests/bpf/prog_tests/time_tai.c
index a31119823666..f45af1b0ef2c 100644
--- a/tools/testing/selftests/bpf/prog_tests/time_tai.c
+++ b/tools/testing/selftests/bpf/prog_tests/time_tai.c
@@ -56,7 +56,7 @@ void test_time_tai(void)
 	ASSERT_NEQ(ts2, 0, "tai_ts2");
 
 	/* TAI is moving forward only */
-	ASSERT_GT(ts2, ts1, "tai_forward");
+	ASSERT_GE(ts2, ts1, "tai_forward");
 
 	/* Check for future */
 	ret = clock_gettime(CLOCK_TAI, &now_tai);