From patchwork Wed Feb 1 00:16:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 13123576 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50EF4C38142 for ; Wed, 1 Feb 2023 00:18:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231661AbjBAASA (ORCPT ); Tue, 31 Jan 2023 19:18:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231634AbjBAAR4 (ORCPT ); Tue, 31 Jan 2023 19:17:56 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BC9B4C15 for ; Tue, 31 Jan 2023 16:17:54 -0800 (PST) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id BB26B41AB7 for ; Wed, 1 Feb 2023 00:17:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1675210670; bh=B79xjy+K/93G68irDU5evQCBz5+5dY2qXWejhUcP4yM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=m+1y+onjX/EUquwYiuZZ+SEzCTHRzjrQyFwEWryiOYk7E3PQ5rKHh9I+CNLtMTb/h WmT1bdHD4rvq3HSWcLVW+li/nBu4Y5xcgVCIU4i4GPk40HOssEgZaPEUf/HcWFF0xi yMuxbI1qvmNbPCKJEBtZDkuewFj2akwmgAh/GGULbMDzLh1hIGuuWMHNLcpVAbaVmR 6Oh1Rnoo5tQJfgnJlCcM2g7CJnvn/UvaFNcMiFWRQt9AInYdySvajMeqH9B5NGUBBN AHTR8Yl9NhkMh+OdcEnz79DizuJkn1tIjtNK3cLW8qdLzGslvRB9NNAY7+gEFP1tkP FZbVFib5zb1Ww== Received: by mail-wm1-f71.google.com with SMTP id bg24-20020a05600c3c9800b003db0ddddb6fso9613772wmb.0 for ; Tue, 31 Jan 2023 16:17:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=B79xjy+K/93G68irDU5evQCBz5+5dY2qXWejhUcP4yM=; b=sXJt4rfuRk89C6uJ+Ycpgn/BGrCKxTBey0Fez5Zv6Mn+h3R0A2ZqZGse0/WsRwgmw3 TAmDYfKgRXo3cIPkKet4oeaGj8MsrPXJr/eEfU74veNCh6SAZonXgokDdA1quspp9VgF CZ7ZPXqkCDbRWzUoHo8Xx2orCU7MWcRlkgHgMjtEziApv+bDK7Xp8AHFKXae+1/UPPRJ FrDYw/OExqLzxiflBk0YMZmd6cF6B2XJuTCmrptx/+9PCcPD3jmVLitaDBFcbuP4+JZ2 or7xxoDnnXoVlS99sQMigfsKqXEBGxhas5QrkgZEeZqKl2CoYCmx5/1r3TaSfnwiAK74 XDgA== X-Gm-Message-State: AO0yUKXlLHSqdnVVhz9WUiBR0yDXw2Uq/ZYnN4EmdlmM1eXbf/Ap3CP2 JshhESElVHjT8C7xz5AxTHzXiaDOVQdoeBkurSRVYMJUwnL8blONhCtTzPk0f7sn0u2y+O8q4lo aqtcVoTa2RIv6Ex6Lv+G/TiTxUafgr1n/tpyHSkt4tr3R3g== X-Received: by 2002:a05:600c:3c9b:b0:3dc:46e8:982 with SMTP id bg27-20020a05600c3c9b00b003dc46e80982mr117940wmb.19.1675210667585; Tue, 31 Jan 2023 16:17:47 -0800 (PST) X-Google-Smtp-Source: AK7set8m3rFOUfn/2s9rRm1ZfRJ7ufmOaC/r+T7Sr9ucuwaqVN8rvqtqmrDhvLO6w1KBkptDz3dggA== X-Received: by 2002:a05:600c:3c9b:b0:3dc:46e8:982 with SMTP id bg27-20020a05600c3c9b00b003dc46e80982mr117926wmb.19.1675210667336; Tue, 31 Jan 2023 16:17:47 -0800 (PST) Received: from qwirkle.internal ([81.2.157.149]) by smtp.gmail.com with ESMTPSA id n6-20020a7bcbc6000000b003d237d60318sm108925wmi.2.2023.01.31.16.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 16:17:46 -0800 (PST) From: Andrei Gherzan To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: Andrei Gherzan , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v4 1/4] selftests: net: udpgso_bench_rx: Fix 'used uninitialized' compiler warning Date: Wed, 1 Feb 2023 00:16:10 +0000 Message-Id: <20230201001612.515730-1-andrei.gherzan@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org This change fixes the following compiler warning: /usr/include/x86_64-linux-gnu/bits/error.h:40:5: warning: ‘gso_size’ may be used uninitialized [-Wmaybe-uninitialized] 40 | __error_noreturn (__status, __errnum, __format, __va_arg_pack ()); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ udpgso_bench_rx.c: In function ‘main’: udpgso_bench_rx.c:253:23: note: ‘gso_size’ was declared here 253 | int ret, len, gso_size, budget = 256; Fixes: 3327a9c46352 ("selftests: add functionals test for UDP GRO") Signed-off-by: Andrei Gherzan Reviewed-by: Willem de Bruijn --- tools/testing/selftests/net/udpgso_bench_rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/udpgso_bench_rx.c b/tools/testing/selftests/net/udpgso_bench_rx.c index 6a193425c367..d0895bd1933f 100644 --- a/tools/testing/selftests/net/udpgso_bench_rx.c +++ b/tools/testing/selftests/net/udpgso_bench_rx.c @@ -250,7 +250,7 @@ static int recv_msg(int fd, char *buf, int len, int *gso_size) static void do_flush_udp(int fd) { static char rbuf[ETH_MAX_MTU]; - int ret, len, gso_size, budget = 256; + int ret, len, gso_size = 0, budget = 256; len = cfg_read_all ? sizeof(rbuf) : 0; while (budget--) { From patchwork Wed Feb 1 00:16:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 13123577 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28C81C636D3 for ; Wed, 1 Feb 2023 00:18:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231639AbjBAASS (ORCPT ); Tue, 31 Jan 2023 19:18:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230011AbjBAASR (ORCPT ); Tue, 31 Jan 2023 19:18:17 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAE8C113C6 for ; Tue, 31 Jan 2023 16:18:11 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 8C9753FDAE for ; Wed, 1 Feb 2023 00:18:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1675210690; bh=Bj5TXzK2teQXYpcCK8bVKEjwIEUwVyWarV+TEw7ui6E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=s0nsEicXQKoEzN2wpn4yE7n43fxl8Nm0WVJlJ01aamzWG4ttg3+UgpksmaGzmOKks WlkMJAyWx+ZWEn8fkMjl0rDA4GhoLVDsCLBjFJrdDRK4QI2KwbLW15vCLi7o60kfgd P0cCZ/CnsJecBLLnSxY43JlNCNhbDfRSpzGbVM7sWVcsw0/DaznmuCkfI0L7w1tdyc PUNvpnV42kvTPRfTpyyqklunO9jAaE3PHy1edgU1fSvefcgWhOcewJeZHozRHwB4Fq +QzHAYeYqJmJsmfTUZes5rWzAUzQVIbUoVhxEnb/YlILMxVnRrECE+4gTwSEmerHBt pDKXEmy1Ppe/w== Received: by mail-wm1-f69.google.com with SMTP id o5-20020a05600c4fc500b003db0b3230efso155165wmq.9 for ; Tue, 31 Jan 2023 16:18:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Bj5TXzK2teQXYpcCK8bVKEjwIEUwVyWarV+TEw7ui6E=; b=aEIMozii1e/1K/ZZysm5WKqswO6BnuUkhAT+WM8dPx8ZRT1rqdY18qvHfNoAntLKM8 ZXGMHfyv33OUyV6LnH7RR6pPmQ4uJ2lbwB+XTrdjP9elcK8b1H3x3NiJZ/Sny/UWdAVG G0bbnrzs5x1CJjxkHhN2bfvQilz/XIMeN6xgXVo6hdd/XbvgK7JGbXhrgVCupMBACcKC M+QgTjxtKVm6KCpbFOinFiv7Xsz8b5TarEFHUpL22E7rkNYShOmWV6pYO3BSA5o/HXlT PNgUPYIfCnrQw/5tokypf0hxQeILKO816AWt0tPxtJSIa9QYtDa//8qTO9mn7RIgfT1g CFwg== X-Gm-Message-State: AO0yUKW1JWaje5JUH3F8qLhfQG5VeKpzqKZ2JvJRDzVpeG49gEudiooc i1MJKA51b/MsL5f8y6sfMnrdSjOErl3oQLJDujGXNX75W4UXmw7wBd1eiEZ/kIIpyGOBbtxal8s r3VHx5bzA7BOhRO7lWi3lzBS9jx9/9ys2puRx7HaPDl5AhQ== X-Received: by 2002:a05:600c:35c6:b0:3db:1424:e781 with SMTP id r6-20020a05600c35c600b003db1424e781mr105680wmq.23.1675210690419; Tue, 31 Jan 2023 16:18:10 -0800 (PST) X-Google-Smtp-Source: AK7set+XQk4pdzQFDGvVOmPL9SqfY9L49x/YHtPC7w+utWIpSyef+OB7ZAfsRO24423SWNboFGSvqA== X-Received: by 2002:a05:600c:35c6:b0:3db:1424:e781 with SMTP id r6-20020a05600c35c600b003db1424e781mr105663wmq.23.1675210690226; Tue, 31 Jan 2023 16:18:10 -0800 (PST) Received: from qwirkle.internal ([81.2.157.149]) by smtp.gmail.com with ESMTPSA id n6-20020a7bcbc6000000b003d237d60318sm108925wmi.2.2023.01.31.16.18.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 16:18:09 -0800 (PST) From: Andrei Gherzan To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Willem de Bruijn Cc: Andrei Gherzan , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v4 2/4] selftests: net: udpgso_bench_rx/tx: Stop when wrong CLI args are provided Date: Wed, 1 Feb 2023 00:16:12 +0000 Message-Id: <20230201001612.515730-2-andrei.gherzan@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230201001612.515730-1-andrei.gherzan@canonical.com> References: <20230201001612.515730-1-andrei.gherzan@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Leaving unrecognized arguments buried in the output, can easily hide a CLI/script typo. Avoid this by exiting when wrong arguments are provided to the udpgso_bench test programs. Fixes: 3a687bef148d ("selftests: udp gso benchmark") Signed-off-by: Andrei Gherzan Cc: Willem de Bruijn Reviewed-by: Willem de Bruijn --- tools/testing/selftests/net/udpgso_bench_rx.c | 2 ++ tools/testing/selftests/net/udpgso_bench_tx.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tools/testing/selftests/net/udpgso_bench_rx.c b/tools/testing/selftests/net/udpgso_bench_rx.c index d0895bd1933f..4058c7451e70 100644 --- a/tools/testing/selftests/net/udpgso_bench_rx.c +++ b/tools/testing/selftests/net/udpgso_bench_rx.c @@ -336,6 +336,8 @@ static void parse_opts(int argc, char **argv) cfg_verify = true; cfg_read_all = true; break; + default: + exit(1); } } diff --git a/tools/testing/selftests/net/udpgso_bench_tx.c b/tools/testing/selftests/net/udpgso_bench_tx.c index f1fdaa270291..b47b5c32039f 100644 --- a/tools/testing/selftests/net/udpgso_bench_tx.c +++ b/tools/testing/selftests/net/udpgso_bench_tx.c @@ -490,6 +490,8 @@ static void parse_opts(int argc, char **argv) case 'z': cfg_zerocopy = true; break; + default: + exit(1); } } From patchwork Wed Feb 1 00:16:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 13123580 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2449BC38142 for ; Wed, 1 Feb 2023 00:18:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231671AbjBAAS4 (ORCPT ); Tue, 31 Jan 2023 19:18:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231697AbjBAASw (ORCPT ); Tue, 31 Jan 2023 19:18:52 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FEBE4FCE7 for ; Tue, 31 Jan 2023 16:18:43 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id F370F3F135 for ; Wed, 1 Feb 2023 00:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1675210722; bh=dgwEfLtKcE1+A8pxiJOsLVtOJAST1XtfQUhBF4j2P0E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Mk9q9gT/t3SV/+f79dS17dKpOdn1qi08NaRnSl+ZUGjHh4VqAt0AzYZogp1dN8nYS 3M13wae16+HVtngSImLA3RIbfwusfoNHnYd4QpEOEAs9v9FRbPqgpGOKZxTi3o+Bv9 JiwS+/S/YdiR5lvnedkCKjoGLyZ9SzcecVxSRSIhCzy3LlkRr5chBSZqSlGxAwN5jN 1BnZqfW7jWPzZ+ftpCgXo95hsLMXoi49IOAVE1x12qTvtSMNtJ6hle+cmFsesDL1mX ubr2hy1qQJeR4iJa4jAC25tS9jgMQbrM5mcX7jG9eoYXlWq3/OvoErpBNctUD7W/o+ qvAuFiNjeKmaA== Received: by mail-wm1-f72.google.com with SMTP id j37-20020a05600c1c2500b003deaf780ab6so16385wms.4 for ; Tue, 31 Jan 2023 16:18:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dgwEfLtKcE1+A8pxiJOsLVtOJAST1XtfQUhBF4j2P0E=; b=Uzjltllvht0QszhYMJOvojVeVycatlDJu/AedhnZz4mzA+vPNleo+USw398B0icBCY LiLV1+uG5aZu+DBOgYbC4D1ps+WnnR5dIN8pRxX/f9UtL0+gzVG5dF5bgeAycgdj7ZpA ENiP9C4/juodEOFLh7+bbq0Z+N8lKXP5jPwPEqlfwykpzfKbqakDok7NUvOpIpMNKmEi DvT+cw+gQhRUDYor/tW0ePNC/res/b4FsXVajrBw4pbU3HdB0Li7P5I4ly/eE33/MJDa L/SIU41xDc0JhQ2nFXosuuxtLP5hT6LL6ub1vaWLEXvRH6zhimfP00s1MYN0bFgMmlwb UtWQ== X-Gm-Message-State: AO0yUKXGZizwn6bqcOrteQ2IuPIlz3U8gvY9kTCy2Kbo3Y9XjN2JoBpO WcuSS1viLTsCntQdEnT2LzmVTs1xknRSNfl5UsvvT3ZW7XsS4uT9hR4QbUs6eJ8w2TQBGLUOPPR Th3dnD+eD1esVajERD+YKExDDu1fTIah9MUlyQVw+C2pG4A== X-Received: by 2002:a05:600c:354c:b0:3db:1a41:6629 with SMTP id i12-20020a05600c354c00b003db1a416629mr105948wmq.22.1675210721715; Tue, 31 Jan 2023 16:18:41 -0800 (PST) X-Google-Smtp-Source: AK7set9LaXifnlkC7InO8/h7kccJP2n5FYY32pcHw9EtuXxE/QBheUoELSj8Zzng27BuKrGEsioHuA== X-Received: by 2002:a05:600c:354c:b0:3db:1a41:6629 with SMTP id i12-20020a05600c354c00b003db1a416629mr105937wmq.22.1675210721559; Tue, 31 Jan 2023 16:18:41 -0800 (PST) Received: from qwirkle.internal ([81.2.157.149]) by smtp.gmail.com with ESMTPSA id n6-20020a7bcbc6000000b003d237d60318sm108925wmi.2.2023.01.31.16.18.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 16:18:26 -0800 (PST) From: Andrei Gherzan To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Willem de Bruijn Cc: Andrei Gherzan , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v4 3/4] selftests: net: udpgso_bench: Fix racing bug between the rx/tx programs Date: Wed, 1 Feb 2023 00:16:14 +0000 Message-Id: <20230201001612.515730-3-andrei.gherzan@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230201001612.515730-1-andrei.gherzan@canonical.com> References: <20230201001612.515730-1-andrei.gherzan@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org "udpgro_bench.sh" invokes udpgso_bench_rx/udpgso_bench_tx programs subsequently and while doing so, there is a chance that the rx one is not ready to accept socket connections. This racing bug could fail the test with at least one of the following: ./udpgso_bench_tx: connect: Connection refused ./udpgso_bench_tx: sendmsg: Connection refused ./udpgso_bench_tx: write: Connection refused This change addresses this by making udpgro_bench.sh wait for the rx program to be ready before firing off the tx one - up to a 10s timeout. Fixes: 3a687bef148d ("selftests: udp gso benchmark") Signed-off-by: Andrei Gherzan Cc: Paolo Abeni Cc: Willem de Bruijn Reviewed-by: Willem de Bruijn --- tools/testing/selftests/net/udpgso_bench.sh | 24 +++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/udpgso_bench.sh b/tools/testing/selftests/net/udpgso_bench.sh index dc932fd65363..640bc43452fa 100755 --- a/tools/testing/selftests/net/udpgso_bench.sh +++ b/tools/testing/selftests/net/udpgso_bench.sh @@ -7,6 +7,7 @@ readonly GREEN='\033[0;92m' readonly YELLOW='\033[0;33m' readonly RED='\033[0;31m' readonly NC='\033[0m' # No Color +readonly TESTPORT=8000 readonly KSFT_PASS=0 readonly KSFT_FAIL=1 @@ -56,11 +57,26 @@ trap wake_children EXIT run_one() { local -r args=$@ + local nr_socks=0 + local i=0 + local -r timeout=10 + + ./udpgso_bench_rx -p "$TESTPORT" & + ./udpgso_bench_rx -p "$TESTPORT" -t & + + # Wait for the above test program to get ready to receive connections. + while [ "$i" -lt "$timeout" ]; do + nr_socks="$(ss -lnHi | grep -c "\*:${TESTPORT}")" + [ "$nr_socks" -eq 2 ] && break + i=$((i + 1)) + sleep 1 + done + if [ "$nr_socks" -ne 2 ]; then + echo "timed out while waiting for udpgso_bench_rx" + exit 1 + fi - ./udpgso_bench_rx & - ./udpgso_bench_rx -t & - - ./udpgso_bench_tx ${args} + ./udpgso_bench_tx -p "$TESTPORT" ${args} } run_in_netns() { From patchwork Wed Feb 1 00:16:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 13123581 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A227C38142 for ; Wed, 1 Feb 2023 00:19:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231723AbjBAAT1 (ORCPT ); Tue, 31 Jan 2023 19:19:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231719AbjBAATU (ORCPT ); Tue, 31 Jan 2023 19:19:20 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86C535A370 for ; Tue, 31 Jan 2023 16:19:10 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 8C48F442F0 for ; Wed, 1 Feb 2023 00:19:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1675210747; bh=THqFl0me8Ks10Tkt9+ZckNKES+j+lzbfaB3495mdeRc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gNkK6m2mIF9bGJ+i8uFf+P1bGY+DuiGYkQ1viSA+MkPwWSXI3rdGPl4UTPCe3YSzc sAa1bL6oXgp7JiArESTYZyRC+rr1eN2B4X5udax6I5uzlerizolApQHGuDgozlKAiC XNh+NQkBTCbDwG0B+GfE07pRWwJYyKLM4xBpXAnnBhihgx2fJFA/2lJZQNggNutN/c GaLL8/T+tpZqMrZ0/n9I+XgtiaaVnVQnLrme0HMMQ9tWorMB1Lpa44dDM8zZHBe/cS P2CjJI3hAB19ltlLy9Opy0AS9Y/8nKsOMtgx1Ot9YkylvbydZSwwLAZIOGMVd5V/W8 b2Tvz7vhjvgKA== Received: by mail-wm1-f72.google.com with SMTP id k9-20020a05600c1c8900b003dc5dec2ac6so166587wms.4 for ; Tue, 31 Jan 2023 16:19:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=THqFl0me8Ks10Tkt9+ZckNKES+j+lzbfaB3495mdeRc=; b=8QQceDYUnREj62fKX1HgI9jDXChCMB9t5ulPytmNfWz8Zf3DVUbV/spitMW4L/sHw8 DlDSp7Ndiftu0G4bPJgIJSQSduq2Ck0JQXWwi95F5uKygw3SwuVkUwg+zjbfQI6ETrCj /eOvqEDJehT7ZJlRZsmEHUdNkINqKx8EZ/6V1o3CPfZvbSwc/zvz0Qyv7hgDQwIRDlCr 7FlP/fP9f5NDQLupAwj8EG67ph48KT5eWw1rKgzkZzlu13W+cFwBUJyNC0myNPmf3xXn SWiJrjn5ScLCxqaQWgpCfSevlrspYT2CaCL+rWrJbcb6FUItH1SE4zBrqwGOwBeoUte5 ZHPQ== X-Gm-Message-State: AO0yUKVGTt4WuukywAeXAqUeII18YWjC9M71YY1bl265VWK8eD257nWf gD/RaqpYXBsAvun0hm1uBFFg54vFcDH0vyS0p0ZHl7i0zUe+jvkR4531+4dvKK+vHDusBRiOVXY WzYCVJchahE2hkVjDmwn6tAMzQ64GXSmLznW2nBEGT805kg== X-Received: by 2002:a5d:6791:0:b0:2bd:bb5f:6a9f with SMTP id v17-20020a5d6791000000b002bdbb5f6a9fmr695841wru.67.1675210747131; Tue, 31 Jan 2023 16:19:07 -0800 (PST) X-Google-Smtp-Source: AK7set9II6Vfu8dlIujX+EybQlwMJwMubFPOzNguQSRbDTV3j5xSGtpEYZbX4ult2qRMpsHsXInLmA== X-Received: by 2002:a5d:6791:0:b0:2bd:bb5f:6a9f with SMTP id v17-20020a5d6791000000b002bdbb5f6a9fmr695821wru.67.1675210746855; Tue, 31 Jan 2023 16:19:06 -0800 (PST) Received: from qwirkle.internal ([81.2.157.149]) by smtp.gmail.com with ESMTPSA id n6-20020a7bcbc6000000b003d237d60318sm108925wmi.2.2023.01.31.16.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 16:19:06 -0800 (PST) From: Andrei Gherzan To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Fred Klassen Cc: Andrei Gherzan , Willem de Bruijn , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v4 4/4] selftests: net: udpgso_bench_tx: Cater for pending datagrams zerocopy benchmarking Date: Wed, 1 Feb 2023 00:16:16 +0000 Message-Id: <20230201001612.515730-4-andrei.gherzan@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230201001612.515730-1-andrei.gherzan@canonical.com> References: <20230201001612.515730-1-andrei.gherzan@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org The test tool can check that the zerocopy number of completions value is valid taking into consideration the number of datagram send calls. This can catch the system into a state where the datagrams are still in the system (for example in a qdisk, waiting for the network interface to return a completion notification, etc). This change adds a retry logic of computing the number of completions up to a configurable (via CLI) timeout (default: 2 seconds). Fixes: 79ebc3c26010 ("net/udpgso_bench_tx: options to exercise TX CMSG") Signed-off-by: Andrei Gherzan Cc: Willem de Bruijn Cc: Paolo Abeni Reviewed-by: Willem de Bruijn --- tools/testing/selftests/net/udpgso_bench_tx.c | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/net/udpgso_bench_tx.c b/tools/testing/selftests/net/udpgso_bench_tx.c index b47b5c32039f..477392715a9a 100644 --- a/tools/testing/selftests/net/udpgso_bench_tx.c +++ b/tools/testing/selftests/net/udpgso_bench_tx.c @@ -62,6 +62,7 @@ static int cfg_payload_len = (1472 * 42); static int cfg_port = 8000; static int cfg_runtime_ms = -1; static bool cfg_poll; +static int cfg_poll_loop_timeout_ms = 2000; static bool cfg_segment; static bool cfg_sendmmsg; static bool cfg_tcp; @@ -235,16 +236,17 @@ static void flush_errqueue_recv(int fd) } } -static void flush_errqueue(int fd, const bool do_poll) +static void flush_errqueue(int fd, const bool do_poll, + unsigned long poll_timeout, const bool poll_err) { if (do_poll) { struct pollfd fds = {0}; int ret; fds.fd = fd; - ret = poll(&fds, 1, 500); + ret = poll(&fds, 1, poll_timeout); if (ret == 0) { - if (cfg_verbose) + if ((cfg_verbose) && (poll_err)) fprintf(stderr, "poll timeout\n"); } else if (ret < 0) { error(1, errno, "poll"); @@ -254,6 +256,20 @@ static void flush_errqueue(int fd, const bool do_poll) flush_errqueue_recv(fd); } +static void flush_errqueue_retry(int fd, unsigned long num_sends) +{ + unsigned long tnow, tstop; + bool first_try = true; + + tnow = gettimeofday_ms(); + tstop = tnow + cfg_poll_loop_timeout_ms; + do { + flush_errqueue(fd, true, tstop - tnow, first_try); + first_try = false; + tnow = gettimeofday_ms(); + } while ((stat_zcopies != num_sends) && (tnow < tstop)); +} + static int send_tcp(int fd, char *data) { int ret, done = 0, count = 0; @@ -413,7 +429,8 @@ static int send_udp_segment(int fd, char *data) static void usage(const char *filepath) { - error(1, 0, "Usage: %s [-46acmHPtTuvz] [-C cpu] [-D dst ip] [-l secs] [-M messagenr] [-p port] [-s sendsize] [-S gsosize]", + error(1, 0, "Usage: %s [-46acmHPtTuvz] [-C cpu] [-D dst ip] [-l secs] " + "[-L secs] [-M messagenr] [-p port] [-s sendsize] [-S gsosize]", filepath); } @@ -423,7 +440,7 @@ static void parse_opts(int argc, char **argv) int max_len, hdrlen; int c; - while ((c = getopt(argc, argv, "46acC:D:Hl:mM:p:s:PS:tTuvz")) != -1) { + while ((c = getopt(argc, argv, "46acC:D:Hl:L:mM:p:s:PS:tTuvz")) != -1) { switch (c) { case '4': if (cfg_family != PF_UNSPEC) @@ -452,6 +469,9 @@ static void parse_opts(int argc, char **argv) case 'l': cfg_runtime_ms = strtoul(optarg, NULL, 10) * 1000; break; + case 'L': + cfg_poll_loop_timeout_ms = strtoul(optarg, NULL, 10) * 1000; + break; case 'm': cfg_sendmmsg = true; break; @@ -679,7 +699,7 @@ int main(int argc, char **argv) num_sends += send_udp(fd, buf[i]); num_msgs++; if ((cfg_zerocopy && ((num_msgs & 0xF) == 0)) || cfg_tx_tstamp) - flush_errqueue(fd, cfg_poll); + flush_errqueue(fd, cfg_poll, 500, true); if (cfg_msg_nr && num_msgs >= cfg_msg_nr) break; @@ -698,7 +718,7 @@ int main(int argc, char **argv) } while (!interrupted && (cfg_runtime_ms == -1 || tnow < tstop)); if (cfg_zerocopy || cfg_tx_tstamp) - flush_errqueue(fd, true); + flush_errqueue_retry(fd, num_sends); if (close(fd)) error(1, errno, "close");