From patchwork Fri May 10 00:57:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13660765 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3FABE136E05; Fri, 10 May 2024 00:58:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715302701; cv=none; b=i7TNnGZopJiFbp16HkL09N/stmLzjU2pfub2ivbMisZvUocokYGUDL2RaWVqU+PSIU/JlvJ/ZDXF1w4qWm9b1RArmTeUrY93tU4JQzHTMGMYTkC7GfqaSHfmyl2fJAgOrdjTS4WcrdyFF7POJY07ze2Rql7PZtCMD8uUeVXKpzs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715302701; c=relaxed/simple; bh=E1Hg2lIBJlVqWA1nCzaSvAkp8dfFdEjxUy2gGOp3VKw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=UTTDfxgl43yM3SjBn02XmElJzCpXlqUulcFNt9imSuT/J9v3Gf2LXmAVL0DJ2dGJumKWUESgzGLfMBL2WhMTxw5bfhqJw8R0rAr3nLai6rE9DcGzSq+TM91CFW//1imSprcvNa9WC7VPCtM4T43jY8gLUCqLrPU87RmIDi+7US8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MBtotgt6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MBtotgt6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7BA06C116B1; Fri, 10 May 2024 00:58:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715302700; bh=E1Hg2lIBJlVqWA1nCzaSvAkp8dfFdEjxUy2gGOp3VKw=; h=From:To:Cc:Subject:Date:From; b=MBtotgt6iq92VJbWASqS2h9TDJv+i9Tn/BudkZToXQytIp6I3d3ptkOTAhUaaT43e VjhyiozaWgstU1K56SmhAjhob904nUPSf+o4AYBmp6ubeTuJYnf7Isly3UlG+xl5ZH hpWzaq+oa7bBbMNRTcZXzknbBkrgEFJmvuBwFWw67x628SPNVItIBMf4o+lzGwnF6h zBwjKicxxcS8L6k2Sbp8WtQ74PnrSu2Hnh8hQO6KNDyOvpkbqN+YSNsR4mLszFQIMZ naEWSdKoL13OJx07AguBJFPT3YcH8jcob89wKrsw9+GdTXEHdhFZng2/AZSVun8j0l OfHpyBlRtXHoA== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, Jakub Kicinski , shuah@kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH net-next 1/2] selftests: net: fix timestamp not arriving in cmsg_time.sh Date: Thu, 9 May 2024 17:57:04 -0700 Message-ID: <20240510005705.43069-1-kuba@kernel.org> X-Mailer: git-send-email 2.45.0 Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On slow machines the SND timestamp sometimes doesn't arrive before we quit. The test only waits as long as the packet delay, so it's easy for a race condition to happen. Double the wait but do a bit of polling, once the SND timestamp arrives there's no point to wait any longer. This fixes the "TXTIME abs" failures on debug kernels, like: Case ICMPv4 - TXTIME abs returned '', expected 'OK' Signed-off-by: Jakub Kicinski Reviewed-by: Willem de Bruijn --- CC: shuah@kernel.org CC: linux-kselftest@vger.kernel.org --- tools/testing/selftests/net/cmsg_sender.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/cmsg_sender.c b/tools/testing/selftests/net/cmsg_sender.c index c79e65581dc3..f25268504937 100644 --- a/tools/testing/selftests/net/cmsg_sender.c +++ b/tools/testing/selftests/net/cmsg_sender.c @@ -333,16 +333,17 @@ static const char *cs_ts_info2str(unsigned int info) return "unknown"; } -static void +static unsigned long cs_read_cmsg(int fd, struct msghdr *msg, char *cbuf, size_t cbuf_sz) { struct sock_extended_err *see; struct scm_timestamping *ts; + unsigned int ts_seen = 0; struct cmsghdr *cmsg; int i, err; if (!opt.ts.ena) - return; + return 0; msg->msg_control = cbuf; msg->msg_controllen = cbuf_sz; @@ -396,8 +397,11 @@ cs_read_cmsg(int fd, struct msghdr *msg, char *cbuf, size_t cbuf_sz) printf(" %5s ts%d %lluus\n", cs_ts_info2str(see->ee_info), i, rel_time); + ts_seen |= 1 << see->ee_info; } } + + return ts_seen; } static void ca_set_sockopts(int fd) @@ -509,10 +513,16 @@ int main(int argc, char *argv[]) err = ERN_SUCCESS; if (opt.ts.ena) { - /* Make sure all timestamps have time to loop back */ - usleep(opt.txtime.delay); + unsigned long seen; + int i; - cs_read_cmsg(fd, &msg, cbuf, sizeof(cbuf)); + /* Make sure all timestamps have time to loop back */ + for (i = 0; i < 40; i++) { + seen = cs_read_cmsg(fd, &msg, cbuf, sizeof(cbuf)); + if (seen & (1 << SCM_TSTAMP_SND)) + break; + usleep(opt.txtime.delay / 20); + } } err_out: From patchwork Fri May 10 00:57:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13660766 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DA43137925; Fri, 10 May 2024 00:58:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715302701; cv=none; b=gJew4+5I4dVstGeic7kZtp8yUaaTykjCydYjlIJZyrL4u+97yZ+gsn6TRG7MMpHRdQMCX9pvwlvMW1SJuUhQMbYRYCyoO6qglEtD17MBEg8MW+zDXFV6FADkJwucjOV+4IktuColCsT8MToSL79ObzSsTCgHDQcJzxLqhFuZsgM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715302701; c=relaxed/simple; bh=7T+Yp+4uFqfXgd2aYFPdSwfxDXWerTLDOmWnFl37rEk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nfGZnTO94MAPTxyYFd+lrW1QtGr737U98KhUN3+M/8CjtCaD4HLvNd56Vcppf3tC1YCscebcN88Yovr7VXMvVrtiPaxlRnNUvuvCxTp+jS3ZmrmWOypK13nQQViPv3k+LZg22BPISUfxoyahNDtriy74C66ZcT11RedZ4CYGGhE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SNCIvRRK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SNCIvRRK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F354BC3277B; Fri, 10 May 2024 00:58:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715302701; bh=7T+Yp+4uFqfXgd2aYFPdSwfxDXWerTLDOmWnFl37rEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SNCIvRRKRnr2QVi+J6iFi80IkYQbGPLFHfRupzW1Ni7ToTB+wZ6w8oiua5rDl1L6O zTEaEanhfDlUBg3jEJqZWpTM3Lhv4EdmBBAMIuiyloCKMyiLc3tGPOowlfYGKsA+FL 0IhqW2zPB9hPg8SYLFipxX3rrLInqb1pxS6+xCArDStLn0+nzLGkR2doe3XjEYdWMe pWsgOBdJo+V0TzPGFu6mjurqUUlPEPxv+32nbVDIaigbRBSAaFAPyDuuSnffJdaDSL RLVUMgeGuaPQJ2Hv4yxWrQGjtTepy063HVn9RYlWD/k0a3lfyB+VFGgZ0HLYA6deD+ 4wWWiKcz51UUw== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, Jakub Kicinski , shuah@kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH net-next 2/2] selftests: net: increase the delay for relative cmsg_time.sh test Date: Thu, 9 May 2024 17:57:05 -0700 Message-ID: <20240510005705.43069-2-kuba@kernel.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240510005705.43069-1-kuba@kernel.org> References: <20240510005705.43069-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Slow machines can delay scheduling of the packets for milliseconds. Increase the delay to 8ms if KSFT_MACHINE_SLOW. Try to limit the variability by moving setsockopts earlier (before we read time). This fixes the "TXTIME rel" failures on debug kernels, like: Case ICMPv4 - TXTIME rel returned '', expected 'OK' Signed-off-by: Jakub Kicinski Reviewed-by: Willem de Bruijn --- CC: shuah@kernel.org CC: linux-kselftest@vger.kernel.org --- tools/testing/selftests/net/cmsg_sender.c | 32 +++++++++++++---------- tools/testing/selftests/net/cmsg_time.sh | 7 +++-- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/net/cmsg_sender.c b/tools/testing/selftests/net/cmsg_sender.c index f25268504937..b2df05ef71cb 100644 --- a/tools/testing/selftests/net/cmsg_sender.c +++ b/tools/testing/selftests/net/cmsg_sender.c @@ -260,15 +260,8 @@ cs_write_cmsg(int fd, struct msghdr *msg, char *cbuf, size_t cbuf_sz) SOL_IPV6, IPV6_HOPLIMIT, &opt.v6.hlimit); if (opt.txtime.ena) { - struct sock_txtime so_txtime = { - .clockid = CLOCK_MONOTONIC, - }; __u64 txtime; - if (setsockopt(fd, SOL_SOCKET, SO_TXTIME, - &so_txtime, sizeof(so_txtime))) - error(ERN_SOCKOPT, errno, "setsockopt TXTIME"); - txtime = time_start_mono.tv_sec * (1000ULL * 1000 * 1000) + time_start_mono.tv_nsec + opt.txtime.delay * 1000; @@ -284,13 +277,6 @@ cs_write_cmsg(int fd, struct msghdr *msg, char *cbuf, size_t cbuf_sz) memcpy(CMSG_DATA(cmsg), &txtime, sizeof(txtime)); } if (opt.ts.ena) { - __u32 val = SOF_TIMESTAMPING_SOFTWARE | - SOF_TIMESTAMPING_OPT_TSONLY; - - if (setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, - &val, sizeof(val))) - error(ERN_SOCKOPT, errno, "setsockopt TIMESTAMPING"); - cmsg = (struct cmsghdr *)(cbuf + cmsg_len); cmsg_len += CMSG_SPACE(sizeof(__u32)); if (cbuf_sz < cmsg_len) @@ -426,6 +412,24 @@ static void ca_set_sockopts(int fd) setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &opt.sockopt.priority, sizeof(opt.sockopt.priority))) error(ERN_SOCKOPT, errno, "setsockopt SO_PRIORITY"); + + if (opt.txtime.ena) { + struct sock_txtime so_txtime = { + .clockid = CLOCK_MONOTONIC, + }; + + if (setsockopt(fd, SOL_SOCKET, SO_TXTIME, + &so_txtime, sizeof(so_txtime))) + error(ERN_SOCKOPT, errno, "setsockopt TXTIME"); + } + if (opt.ts.ena) { + __u32 val = SOF_TIMESTAMPING_SOFTWARE | + SOF_TIMESTAMPING_OPT_TSONLY; + + if (setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, + &val, sizeof(val))) + error(ERN_SOCKOPT, errno, "setsockopt TIMESTAMPING"); + } } int main(int argc, char *argv[]) diff --git a/tools/testing/selftests/net/cmsg_time.sh b/tools/testing/selftests/net/cmsg_time.sh index af85267ad1e3..1d7e756644bc 100755 --- a/tools/testing/selftests/net/cmsg_time.sh +++ b/tools/testing/selftests/net/cmsg_time.sh @@ -66,10 +66,13 @@ for i in "-4 $TGT4" "-6 $TGT6"; do awk '/SND/ { if ($3 > 1000) print "OK"; }') check_result $? "$ts" "OK" "$prot - TXTIME abs" - ts=$(ip netns exec $NS ./cmsg_sender -p $p $i 1234 -t -d 1000 | + [ "$KSFT_MACHINE_SLOW" = yes ] && delay=8000 || delay=1000 + + ts=$(ip netns exec $NS ./cmsg_sender -p $p $i 1234 -t -d $delay | awk '/SND/ {snd=$3} /SCHED/ {sch=$3} - END { if (snd - sch > 500) print "OK"; }') + END { if (snd - sch > '$((delay/2))') print "OK"; + else print snd, "-", sch, "<", '$((delay/2))'; }') check_result $? "$ts" "OK" "$prot - TXTIME rel" done done