From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 51185C5AC82 for ; Thu, 6 Aug 2026 23:29:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 1A94B408F3; Thu, 6 Aug 2026 23:29:33 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id mD1imPHqXfgg; Thu, 6 Aug 2026 23:29:32 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4FBBF40909 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1786058972; bh=kMvizLUHUgWoAQ2a15IzPnCt/bdK0Ped3AtGw1CCqzs=; h=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=q/5ox57zJRNQNpZWdhFMFP3InnkQgMbkpYhqdKhl472P0Du6NKlUc7mYhobKxx033 juBL02G3Rf2eTkujVuKApb8d6PV2jerWl9wiPpn+dhvJ249JJnQrn2bNxfUCdwlyMt sVdYACvxeB5wK27GbKX1yRXE+4pytHq9fVtkIHsN6O7CfJNCEuIjm3870u+yqiP5Rq KhkkGdjaj+RY+9Z6BB7fyOsWkkKVi4d5ZE1Oy6XAsI1k1598GSZnlk1KdO28ed3rRi mmTUc+7uCTomp7Rj/1R5w8autHnWLXo8GQwGk8IBAG8m81Yy3C3OWwV2InmqMWRR/n CcS6dTz/agfLw== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id 4FBBF40909; Thu, 6 Aug 2026 23:29:32 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists1.osuosl.org (Postfix) with ESMTP id 41F63198 for ; Thu, 6 Aug 2026 23:29:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 33CF24090C for ; Thu, 6 Aug 2026 23:29:31 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id KTvqTxyyZ2Ov for ; Thu, 6 Aug 2026 23:29:30 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::b129; helo=mail-yx1-xb129.google.com; envelope-from=willemdebruijn.kernel@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 1F8F1408FB DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 1F8F1408FB Received: from mail-yx1-xb129.google.com (mail-yx1-xb129.google.com [IPv6:2607:f8b0:4864:20::b129]) by smtp4.osuosl.org (Postfix) with ESMTPS id 1F8F1408FB for ; Thu, 6 Aug 2026 23:29:30 +0000 (UTC) Received: by mail-yx1-xb129.google.com with SMTP id 956f58d0204a3-66804667af2so2516376d50.0 for ; Thu, 06 Aug 2026 16:29:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786058969; x=1786663769; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=kMvizLUHUgWoAQ2a15IzPnCt/bdK0Ped3AtGw1CCqzs=; b=cXGgdtUxar9VkOSMNHe/6HZ3nbdSryFYGelL9T1rzsUYfRdTEW3ohnklLMz/Dr+6T5 0OBdyzm6i1Y+y6k7FdtaoT50PFPXtKTeIs1UamJuAlPbY8vQ2ULr2JCdvb/h1mWwiYzQ 460ohLhZ8See1mr4sOxcFO7y/pjiHhN5PpXPvGlqPSCh/grJrztdi2aLAkSjO8HlEOrc AKWzeEvB0HbJo0rTVUP69xu4KXg+WDFMH5MBvEB3dkOP39MISXKA+yK+ZJ/Ph+vGicj5 v58Yv29xtnVCtWL6iUMzSUhBxb+aOxkZ37q6pzRxhfWDtlK11wEhIVMrpw8z4bPSV2iV slJQ== X-Gm-Message-State: AOJu0YwTi8yGTpByYiPoZ8Ko/PMfISHmIpMSBGXvvDuBnAWy7zBqKUcz M9UI3qLlABI2zLxm67Ohr4H1pvYGoLVbPbpSb0Ed9KjTm6qo3ULhSXuS X-Gm-Gg: AR+sD105wTWqaT3t603XhqhSttTIFBKr1/0u8pg1bTF4Sp/qiSt6hQu6frIlNYS3HGd 1jOe0lS4fPPrHR9wpUvwGPOUJ5S1bX+FOaQOLZCzifHP87n8Da/XKARtxvnMwEYiyZPjLo32EjZ r5fMQImmKjx5bDN2dpS7lk4DBa1UuXya65tBQ7NNVBveX55i7WimymlN06+QZDRzdxuoHm7emA6 1aXAA94aZtHlMcx8XZc9kThVDShyS0tvGXi8Kcr0ojfou4pN/K02345L/9A8c9/bQ6/zow32t/1 W2mB+TVgriF0mi3ooXVoIEOHYesOH8Pz2JGqOpKHLan5AwbO3EJS7sVTyj4cOiI6js77J7G0EQm uuCKHMlYAR309lcodVsknY4xk73x/EKIik1jMwca/HI0o71rOLlqm9qThhyrh2GTXj1QLxgiTcW AvEBWt5Xl2vhHo+nZ1L7imdZnvwmiLapT7QLgg1MpLr04+yB09S9y6D5NuyYvipgxl45pWJpNca HJ7MpYeHjDfFAsyuilf1F223dYQMbwzPVrO1kaNh42EeQ9Thc1AHKfXMoNNOKVm1SYOqA== X-Received: by 2002:a53:e141:0:b0:664:cd4c:83ef with SMTP id 956f58d0204a3-66ac2fb0dc5mr2297573d50.30.1786058968799; Thu, 06 Aug 2026 16:29:28 -0700 (PDT) Received: from willemb.c.googlers.com.com (250.4.48.34.bc.googleusercontent.com. [34.48.4.250]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-66acacdbdf2sm209273d50.4.2026.08.06.16.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2026 16:29:27 -0700 (PDT) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: intel-wired-lan@lists.osuosl.org, anthony.l.nguyen@intel.com, joshua.a.hay@intel.com, przemyslaw.kitszel@intel.com, Willem de Bruijn Date: Thu, 6 Aug 2026 19:26:02 -0400 Message-ID: <20260806232913.4020403-6-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.55.0.679.g6767b8d81c-goog In-Reply-To: <20260806232913.4020403-1-willemdebruijn.kernel@gmail.com> References: <20260806232913.4020403-1-willemdebruijn.kernel@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786058969; x=1786663769; darn=lists.osuosl.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kMvizLUHUgWoAQ2a15IzPnCt/bdK0Ped3AtGw1CCqzs=; b=d1O/4lMfQvo2FVB605oFbLFe9e/ptqkMDayq+sfhPipWfTUx2eIFaDO3M/Rgx6Dfpb LcfTH2GVcLDlieCUGFIYhmHqJln6/ez4vzeeuIdsAcJapiprgxaskD/FTHqkl7d1ootx WKbCfkGwZ5vW3D+dq9IHYeIR5bvvTMx/Swa4xit7C3rV/itU5XdPd0j3/ZQJH3XHtF62 c0qPccypHMyNEvv5twu33zga0dY83W3Wy9QPi9txnQG71iWItVlRl7jGI8nS7HlpdtlE R5U9cyl/Isq/2Ysapde5Z6MQFRZXSBKoidzSQF09t21A6P+g6RVmBOQ4cdYmXkG9jaeI Ectw== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=d1O/4lMf Subject: [Intel-wired-lan] [PATCH net-next v4 5/6] selftests: drv-net: in so_txtime tell apart sw from hw pacing X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Willem de Bruijn Detect software pacing in so_txtime.c using SO_TIMESTAMPING. If '-H' (hw) is passed 1. measure sw tx delay with SOF_TIMESTAMPING_TX_SOFTWARE, and 2. fail if delay exceeds a threshold, indicating pacing Also extend while condition to account for possible variance. This applies to all tests, not just the new '-H' variants. Also reorder getopt parameters to make them alphabetical. Signed-off-by: Willem de Bruijn --- Changes v3 -> v4 - rename -h to -H to avoid aliasing implicit getopt -h - count sw timestamps to verify that they were actually checked - (minor) do not ask for SOF_TIMESTAMPING_OPT_ID as not used - (minor) remove unused parameter Reading timestamps from the error queue is never particularly slow, so errors are always counted, not only if !KSFT_MACHINE_SLOW. --- .../testing/selftests/drivers/net/so_txtime.c | 93 +++++++++++++++---- 1 file changed, 77 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/drivers/net/so_txtime.c b/tools/testing/selftests/drivers/net/so_txtime.c index f6f3253ed174..951312e67b66 100644 --- a/tools/testing/selftests/drivers/net/so_txtime.c +++ b/tools/testing/selftests/drivers/net/so_txtime.c @@ -42,8 +42,10 @@ static bool cfg_machine_slow; static uint64_t cfg_start_time_ns; static int cfg_mark; static bool cfg_rx; +static bool cfg_verify_hw_offload; static uint64_t glob_tstart; +static uint64_t glob_tstart_real; static uint64_t tdeliver_max; static int errors; @@ -191,12 +193,32 @@ static int do_recv_errqueue_txtime(struct sock_extended_err *err, return 1; } -static int do_recv_errqueue(int fdt) +static int do_recv_errqueue_timestamping(struct scm_timestamping *tss) +{ + int64_t ts; + + ts = tss->ts[0].tv_sec * 1000ULL * 1000 * 1000; + ts += tss->ts[0].tv_nsec; + ts -= glob_tstart_real; + ts /= 1000; + + if (ts > cfg_variance_us) { + fprintf(stderr, "sw delay %" PRId64 "us exceeds bounds\n", ts); + if (!cfg_machine_slow) + errors++; + } + + return 1; +} + +static int do_recv_errqueue(int fdt, int *num_ts) { char control[CMSG_SPACE(sizeof(struct sock_extended_err)) + + CMSG_SPACE(sizeof(struct scm_timestamping)) + CMSG_SPACE(sizeof(struct sockaddr_in6))] = {0}; char data[sizeof(struct ethhdr) + sizeof(struct ipv6hdr) + sizeof(struct udphdr) + 1]; + struct scm_timestamping *tss; struct sock_extended_err *err; int ret, num_tstamp = 0; struct msghdr msg = {0}; @@ -222,16 +244,29 @@ static int do_recv_errqueue(int fdt) error(1, 0, "errqueue: flags 0x%x\n", msg.msg_flags); cm = CMSG_FIRSTHDR(&msg); + tss = NULL; + + if (cm->cmsg_level == SOL_SOCKET && + cm->cmsg_type == SCM_TIMESTAMPING) { + tss = (void *)CMSG_DATA(cm); + cm = CMSG_NXTHDR(&msg, cm); + if (!cm) + error(1, 0, "timestamp missing ip err\n"); + } + if (cm->cmsg_level != cfg_errq_level || cm->cmsg_type != cfg_errq_type) error(1, 0, "errqueue: type 0x%x.0x%x\n", cm->cmsg_level, cm->cmsg_type); err = (struct sock_extended_err *)CMSG_DATA(cm); - if (err->ee_origin != SO_EE_ORIGIN_TXTIME) + if (err->ee_origin == SO_EE_ORIGIN_TXTIME) + num_tstamp += do_recv_errqueue_txtime(err, data[ret - 1]); + else if (err->ee_origin == SO_EE_ORIGIN_TIMESTAMPING && tss) + *num_ts += do_recv_errqueue_timestamping(tss); + else error(1, 0, "errqueue: origin 0x%x\n", err->ee_origin); - num_tstamp += do_recv_errqueue_txtime(err, data[ret - 1]); msg.msg_flags = 0; msg.msg_controllen = sizeof(control); } @@ -243,7 +278,7 @@ static void recv_errqueue_msgs(int fdt) { struct pollfd pfd = { .fd = fdt, .events = POLLERR }; const int timeout_ms = 10; - int ret, num_tstamp = 0; + int ret, num_tstamp = 0, num_ts = 0; do { ret = poll(&pfd, 1, timeout_ms); @@ -251,12 +286,19 @@ static void recv_errqueue_msgs(int fdt) error(1, errno, "poll"); if (ret && (pfd.revents & POLLERR)) - num_tstamp += do_recv_errqueue(fdt); + num_tstamp += do_recv_errqueue(fdt, &num_ts); - if (num_tstamp == cfg_num_pkt) + if (num_tstamp == cfg_num_pkt || num_ts == cfg_num_pkt) break; - } while (gettime_ns(cfg_clockid) < tdeliver_max); + } while (gettime_ns(cfg_clockid) < + tdeliver_max + (cfg_variance_us * 1000)); + + if (cfg_verify_hw_offload && num_ts != cfg_num_pkt) { + fprintf(stderr, "missing timestamps: expected %d, got %d\n", + cfg_num_pkt, num_ts); + errors++; + } } static void start_time_wait(void) @@ -301,6 +343,17 @@ static void setsockopt_txtime(int fd) error(1, 0, "getsockopt txtime: mismatch"); } +static void setsockopt_txtimestamping(int fd) +{ + int val = SOF_TIMESTAMPING_TX_SOFTWARE | + SOF_TIMESTAMPING_SOFTWARE | + SOF_TIMESTAMPING_OPT_TSONLY; + + if (setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, + &val, sizeof(val))) + error(1, errno, "setsockopt timestamping"); +} + static int setup_tx(struct sockaddr *addr, socklen_t alen) { int fd; @@ -314,6 +367,9 @@ static int setup_tx(struct sockaddr *addr, socklen_t alen) setsockopt_txtime(fd); + if (cfg_verify_hw_offload) + setsockopt_txtimestamping(fd); + if (cfg_mark && setsockopt(fd, SOL_SOCKET, SO_MARK, &cfg_mark, sizeof(cfg_mark))) error(1, errno, "setsockopt mark"); @@ -354,6 +410,7 @@ static void do_test_tx(struct sockaddr *addr, socklen_t alen) start_time_wait(); glob_tstart = gettime_ns(cfg_clockid); + glob_tstart_real = gettime_ns(CLOCK_REALTIME); for (i = 0; i < cfg_num_pkt; i++) do_send_one(fdt, &cfg_buf[i]); @@ -446,10 +503,11 @@ static void usage(const char *progname) " -6 only IPv6\n" " -c monotonic or tai (default)\n" " -D destination IP address (server)\n" - " -S source IP address (client)\n" + " -H verify hardware offload (tx)\n" + " -m socket mark\n" " -r run rx mode\n" + " -S source IP address (client)\n" " -t start time (UTC nanoseconds)\n" - " -m socket mark\n" "\n", progname); exit(1); @@ -461,7 +519,7 @@ static void parse_opts(int argc, char **argv) int domain = PF_UNSPEC; int c; - while ((c = getopt(argc, argv, "46c:S:D:rt:m:")) != -1) { + while ((c = getopt(argc, argv, "46c:D:Hm:rS:t:")) != -1) { switch (c) { case '4': if (domain != PF_UNSPEC) @@ -488,21 +546,24 @@ static void parse_opts(int argc, char **argv) else error(1, 0, "unknown clock id %s", optarg); break; - case 'S': - saddr = optarg; - break; case 'D': daddr = optarg; break; + case 'H': + cfg_verify_hw_offload = true; + break; + case 'm': + cfg_mark = strtol(optarg, NULL, 0); + break; case 'r': cfg_rx = true; break; + case 'S': + saddr = optarg; + break; case 't': cfg_start_time_ns = strtoll(optarg, NULL, 0); break; - case 'm': - cfg_mark = strtol(optarg, NULL, 0); - break; default: usage(argv[0]); } -- 2.55.0.679.g6767b8d81c-goog From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx1-f50.google.com (mail-yx1-f50.google.com [74.125.224.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1E64490C08 for ; Thu, 6 Aug 2026 23:29:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786058971; cv=none; b=t+oizyYAOVU5axQjYszB5cy+Rwix/4+T7nnm5IEILN4Aw5u8LEGSlkIVYacs+6EG2Tn0BFpH3V3VW/6ngJ0xF+rQYTcsQAIo6xhewD/cYVPwan+X8rYbzbR9itTJkJhDnQPSmxMmjp149qFXOjjuvRxN9K7XyibVI/aqp5Q59bU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786058971; c=relaxed/simple; bh=CRKqXtch1uz/GpDuCPGJyuZJfoei3xhr++H8DgVKrNc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u/kIcIbb4JZo+aBusJZF1LWPDhXX6PX/zydybJJepICcBkkwARqdFQraSSyKTm5NPxBzdF0s+gp11j3PI6xrkrWnB7ou1wp2Ir6Q4k/vdibUwyy4V1REP0UZMiGo3KdghJ+SK47NTOh7FT/tN3EQH1UKTEF5+NSpOeTtTEuAFr0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DfCypP65; arc=none smtp.client-ip=74.125.224.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DfCypP65" Received: by mail-yx1-f50.google.com with SMTP id 956f58d0204a3-6680ae2031fso2814134d50.3 for ; Thu, 06 Aug 2026 16:29:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786058969; x=1786663769; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kMvizLUHUgWoAQ2a15IzPnCt/bdK0Ped3AtGw1CCqzs=; b=DfCypP65glMT7hsAwIp2GokgWt8t76UcmP3eRkca0BkB696k+ae22+A2aEzsvpriAS ePHKB92lfZF10JkKK9fpVTWlSicCDprtjCsRokmtZryuH6su5mTia3yP5pNksiFYdHpS lacF91bbDPv2uNUHqnIH7LNGVfjB4ZrWS/F7mihZkzSEbcPBUjn5yngKNHtVQYtAnvvZ IQEyAvHyYX41uV636VyscgMmVQ8HzYm764I3Fi2HmMbK/pBtqwgN2Ik4AE5Vl8+jAMXv JiY+8wBeGvcGP4w2gVOgasocjOyKUosxanvnLoG5C/AGGI4QH5ftHcZLYfAfCbpFQHp1 Tl1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786058969; x=1786663769; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=kMvizLUHUgWoAQ2a15IzPnCt/bdK0Ped3AtGw1CCqzs=; b=IY5F1JDKCt96dGLIGhIu70CEv55P9/ZshiEkrlhcFpMZzRn9O0fkgPYjIpU92hSe7k nG5zWkL3Tj31sd0arsOxRxMBflWSKzIhTbZb0RcB/KnEd3Apj+97JlgRdVEUJ/d/OTT+ JYWEmmHJHUyJ7b/Cu4wV768wljrrMfakqlgjZWC7nVH8KnTYCpckB0BP2lKdVp3JbWts QnSVyzyk9yueJd0G9O1CRjD6tdocHfOaWrTWW/Ofr/srTOBkAuu8UKDPhNHM1Zpdiv7o CMttrPH75zJ9G4HXIwECPDIjwppQKKh0keSPy425MPQY61TJMA5+PfEE8KoGxvOu4CRq 92Kg== X-Gm-Message-State: AOJu0YxTkynXD7WVWLXtB1VtGyOANqglKDo8k7EbIU8cSoE2Y+2yliHD 8dLQSOs4kFnrrwdUuhcaxTYegJ3OTz/Oo2TmqIDc8yM5bEAfKJImzsQNq942NA== X-Gm-Gg: AR+sD12qe40fPJKweWhgnRGpfzPx0rQkwpk7b5lpIB36o7ZGFySg8lGkDVow3x4I9Fb yVCfS+Nf5sQee69lWXCmYgRBSderU8TUqxF7s+y+UZvzQMCaRsenlYQ1zcxvhSgojN35Jg7/r6w F/sXDEOK64tS4rBawQgN4rr4t1NK3AZ1Tr2OQDYbND7rAXa9InIVaN6rdcugMlhHsOlNFn4mmQh KZaouO5OXOWXu8DotNpDnOKEPxInZ4Vo2m4wuR6ou8xfRFSMoAuMJM0ECGZyrlFg4anVRekQ5Uh bilQKMqirngZnHxwU8KMjak/1H5AMh5mwDDonpm0DkUXP5cUfotXJn4gRHg1bR48fmPSLPHBYkE bNkBOdnxIt4T0ltBiUo5x1R1RW3YsHOdrsXt6OtUDJ/zFOnWEUXCl5v2f7od28/l5Bsltjk86rF yy8bBhpv+swxctODMBnnEupoXu7n24alcWgie0en530X0jJ1kw/crxsToHhZTFUXiCWBytyRcz7 LSAOjjlkdyr/sZy1Dh4tGve+iyihK0H5e3TiBYpOpood7Uzykmhx7d6c1PaPYowbda5lQ== X-Received: by 2002:a53:e141:0:b0:664:cd4c:83ef with SMTP id 956f58d0204a3-66ac2fb0dc5mr2297573d50.30.1786058968799; Thu, 06 Aug 2026 16:29:28 -0700 (PDT) Received: from willemb.c.googlers.com.com (250.4.48.34.bc.googleusercontent.com. [34.48.4.250]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-66acacdbdf2sm209273d50.4.2026.08.06.16.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2026 16:29:27 -0700 (PDT) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: intel-wired-lan@lists.osuosl.org, anthony.l.nguyen@intel.com, joshua.a.hay@intel.com, przemyslaw.kitszel@intel.com, Willem de Bruijn Subject: [PATCH net-next v4 5/6] selftests: drv-net: in so_txtime tell apart sw from hw pacing Date: Thu, 6 Aug 2026 19:26:02 -0400 Message-ID: <20260806232913.4020403-6-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.55.0.679.g6767b8d81c-goog In-Reply-To: <20260806232913.4020403-1-willemdebruijn.kernel@gmail.com> References: <20260806232913.4020403-1-willemdebruijn.kernel@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Willem de Bruijn Detect software pacing in so_txtime.c using SO_TIMESTAMPING. If '-H' (hw) is passed 1. measure sw tx delay with SOF_TIMESTAMPING_TX_SOFTWARE, and 2. fail if delay exceeds a threshold, indicating pacing Also extend while condition to account for possible variance. This applies to all tests, not just the new '-H' variants. Also reorder getopt parameters to make them alphabetical. Signed-off-by: Willem de Bruijn --- Changes v3 -> v4 - rename -h to -H to avoid aliasing implicit getopt -h - count sw timestamps to verify that they were actually checked - (minor) do not ask for SOF_TIMESTAMPING_OPT_ID as not used - (minor) remove unused parameter Reading timestamps from the error queue is never particularly slow, so errors are always counted, not only if !KSFT_MACHINE_SLOW. --- .../testing/selftests/drivers/net/so_txtime.c | 93 +++++++++++++++---- 1 file changed, 77 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/drivers/net/so_txtime.c b/tools/testing/selftests/drivers/net/so_txtime.c index f6f3253ed174..951312e67b66 100644 --- a/tools/testing/selftests/drivers/net/so_txtime.c +++ b/tools/testing/selftests/drivers/net/so_txtime.c @@ -42,8 +42,10 @@ static bool cfg_machine_slow; static uint64_t cfg_start_time_ns; static int cfg_mark; static bool cfg_rx; +static bool cfg_verify_hw_offload; static uint64_t glob_tstart; +static uint64_t glob_tstart_real; static uint64_t tdeliver_max; static int errors; @@ -191,12 +193,32 @@ static int do_recv_errqueue_txtime(struct sock_extended_err *err, return 1; } -static int do_recv_errqueue(int fdt) +static int do_recv_errqueue_timestamping(struct scm_timestamping *tss) +{ + int64_t ts; + + ts = tss->ts[0].tv_sec * 1000ULL * 1000 * 1000; + ts += tss->ts[0].tv_nsec; + ts -= glob_tstart_real; + ts /= 1000; + + if (ts > cfg_variance_us) { + fprintf(stderr, "sw delay %" PRId64 "us exceeds bounds\n", ts); + if (!cfg_machine_slow) + errors++; + } + + return 1; +} + +static int do_recv_errqueue(int fdt, int *num_ts) { char control[CMSG_SPACE(sizeof(struct sock_extended_err)) + + CMSG_SPACE(sizeof(struct scm_timestamping)) + CMSG_SPACE(sizeof(struct sockaddr_in6))] = {0}; char data[sizeof(struct ethhdr) + sizeof(struct ipv6hdr) + sizeof(struct udphdr) + 1]; + struct scm_timestamping *tss; struct sock_extended_err *err; int ret, num_tstamp = 0; struct msghdr msg = {0}; @@ -222,16 +244,29 @@ static int do_recv_errqueue(int fdt) error(1, 0, "errqueue: flags 0x%x\n", msg.msg_flags); cm = CMSG_FIRSTHDR(&msg); + tss = NULL; + + if (cm->cmsg_level == SOL_SOCKET && + cm->cmsg_type == SCM_TIMESTAMPING) { + tss = (void *)CMSG_DATA(cm); + cm = CMSG_NXTHDR(&msg, cm); + if (!cm) + error(1, 0, "timestamp missing ip err\n"); + } + if (cm->cmsg_level != cfg_errq_level || cm->cmsg_type != cfg_errq_type) error(1, 0, "errqueue: type 0x%x.0x%x\n", cm->cmsg_level, cm->cmsg_type); err = (struct sock_extended_err *)CMSG_DATA(cm); - if (err->ee_origin != SO_EE_ORIGIN_TXTIME) + if (err->ee_origin == SO_EE_ORIGIN_TXTIME) + num_tstamp += do_recv_errqueue_txtime(err, data[ret - 1]); + else if (err->ee_origin == SO_EE_ORIGIN_TIMESTAMPING && tss) + *num_ts += do_recv_errqueue_timestamping(tss); + else error(1, 0, "errqueue: origin 0x%x\n", err->ee_origin); - num_tstamp += do_recv_errqueue_txtime(err, data[ret - 1]); msg.msg_flags = 0; msg.msg_controllen = sizeof(control); } @@ -243,7 +278,7 @@ static void recv_errqueue_msgs(int fdt) { struct pollfd pfd = { .fd = fdt, .events = POLLERR }; const int timeout_ms = 10; - int ret, num_tstamp = 0; + int ret, num_tstamp = 0, num_ts = 0; do { ret = poll(&pfd, 1, timeout_ms); @@ -251,12 +286,19 @@ static void recv_errqueue_msgs(int fdt) error(1, errno, "poll"); if (ret && (pfd.revents & POLLERR)) - num_tstamp += do_recv_errqueue(fdt); + num_tstamp += do_recv_errqueue(fdt, &num_ts); - if (num_tstamp == cfg_num_pkt) + if (num_tstamp == cfg_num_pkt || num_ts == cfg_num_pkt) break; - } while (gettime_ns(cfg_clockid) < tdeliver_max); + } while (gettime_ns(cfg_clockid) < + tdeliver_max + (cfg_variance_us * 1000)); + + if (cfg_verify_hw_offload && num_ts != cfg_num_pkt) { + fprintf(stderr, "missing timestamps: expected %d, got %d\n", + cfg_num_pkt, num_ts); + errors++; + } } static void start_time_wait(void) @@ -301,6 +343,17 @@ static void setsockopt_txtime(int fd) error(1, 0, "getsockopt txtime: mismatch"); } +static void setsockopt_txtimestamping(int fd) +{ + int val = SOF_TIMESTAMPING_TX_SOFTWARE | + SOF_TIMESTAMPING_SOFTWARE | + SOF_TIMESTAMPING_OPT_TSONLY; + + if (setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, + &val, sizeof(val))) + error(1, errno, "setsockopt timestamping"); +} + static int setup_tx(struct sockaddr *addr, socklen_t alen) { int fd; @@ -314,6 +367,9 @@ static int setup_tx(struct sockaddr *addr, socklen_t alen) setsockopt_txtime(fd); + if (cfg_verify_hw_offload) + setsockopt_txtimestamping(fd); + if (cfg_mark && setsockopt(fd, SOL_SOCKET, SO_MARK, &cfg_mark, sizeof(cfg_mark))) error(1, errno, "setsockopt mark"); @@ -354,6 +410,7 @@ static void do_test_tx(struct sockaddr *addr, socklen_t alen) start_time_wait(); glob_tstart = gettime_ns(cfg_clockid); + glob_tstart_real = gettime_ns(CLOCK_REALTIME); for (i = 0; i < cfg_num_pkt; i++) do_send_one(fdt, &cfg_buf[i]); @@ -446,10 +503,11 @@ static void usage(const char *progname) " -6 only IPv6\n" " -c monotonic or tai (default)\n" " -D destination IP address (server)\n" - " -S source IP address (client)\n" + " -H verify hardware offload (tx)\n" + " -m socket mark\n" " -r run rx mode\n" + " -S source IP address (client)\n" " -t start time (UTC nanoseconds)\n" - " -m socket mark\n" "\n", progname); exit(1); @@ -461,7 +519,7 @@ static void parse_opts(int argc, char **argv) int domain = PF_UNSPEC; int c; - while ((c = getopt(argc, argv, "46c:S:D:rt:m:")) != -1) { + while ((c = getopt(argc, argv, "46c:D:Hm:rS:t:")) != -1) { switch (c) { case '4': if (domain != PF_UNSPEC) @@ -488,21 +546,24 @@ static void parse_opts(int argc, char **argv) else error(1, 0, "unknown clock id %s", optarg); break; - case 'S': - saddr = optarg; - break; case 'D': daddr = optarg; break; + case 'H': + cfg_verify_hw_offload = true; + break; + case 'm': + cfg_mark = strtol(optarg, NULL, 0); + break; case 'r': cfg_rx = true; break; + case 'S': + saddr = optarg; + break; case 't': cfg_start_time_ns = strtoll(optarg, NULL, 0); break; - case 'm': - cfg_mark = strtol(optarg, NULL, 0); - break; default: usage(argv[0]); } -- 2.55.0.679.g6767b8d81c-goog