mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 09:36:22 +02:00
selftests: net: make busywait timeout clock portable
loopy_wait() expects millisecond timestamps. However, Ubuntu Resolute
can use uutils date, where `date -u +%s%3N` returns seconds plus full
nanoseconds instead of a 3-digit millisecond field. This makes
busywait expire too early and can make vlan_bridge_binding.sh read a
stale operstate.
Fixes: 25ae948b44 ("selftests/net: add lib.sh")
Cc: stable@vger.kernel.org # 6.8+
Link: https://github.com/uutils/coreutils/issues/11658
Signed-off-by: Nirmoy Das <nirmoyd@nvidia.com>
Link: https://patch.msgid.link/20260630165157.3814871-1-nirmoyd@nvidia.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
parent
a0a558ca7e
commit
dd6a23bac3
|
|
@ -70,12 +70,33 @@ ksft_exit_status_merge()
|
|||
$ksft_xfail $ksft_pass $ksft_skip $ksft_fail
|
||||
}
|
||||
|
||||
timestamp_ms()
|
||||
{
|
||||
local now
|
||||
local seconds
|
||||
local nanoseconds
|
||||
|
||||
now=$(date -u +%s:%N) || return
|
||||
seconds=${now%:*}
|
||||
nanoseconds=${now#*:}
|
||||
|
||||
if [[ $nanoseconds =~ ^[0-9]+$ ]]; then
|
||||
nanoseconds=${nanoseconds:0:9}
|
||||
else
|
||||
nanoseconds=0
|
||||
fi
|
||||
|
||||
echo $((seconds * 1000 + 10#$nanoseconds / 1000000))
|
||||
}
|
||||
|
||||
loopy_wait()
|
||||
{
|
||||
local sleep_cmd=$1; shift
|
||||
local timeout_ms=$1; shift
|
||||
local start_time
|
||||
local current_time
|
||||
|
||||
local start_time="$(date -u +%s%3N)"
|
||||
start_time=$(timestamp_ms) || return
|
||||
while true
|
||||
do
|
||||
local out
|
||||
|
|
@ -84,7 +105,7 @@ loopy_wait()
|
|||
return 0
|
||||
fi
|
||||
|
||||
local current_time="$(date -u +%s%3N)"
|
||||
current_time=$(timestamp_ms) || return
|
||||
if ((current_time - start_time > timeout_ms)); then
|
||||
echo -n "$out"
|
||||
return 1
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user