From patchwork Fri Jan 27 14:09:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 13118771 X-Patchwork-Delegate: kuba@kernel.org 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 C88C0C38142 for ; Fri, 27 Jan 2023 14:10:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233917AbjA0OJ7 (ORCPT ); Fri, 27 Jan 2023 09:09:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233508AbjA0OJy (ORCPT ); Fri, 27 Jan 2023 09:09:54 -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 4701130B30 for ; Fri, 27 Jan 2023 06:09:53 -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 2CA643FFEF for ; Fri, 27 Jan 2023 14:09:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1674828588; bh=ThPASxkQPa8akyDheX0+gKydQu/0488KOg7wyMg90UM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=A3QTJRhCu6V7dxExDLzkAD+S/aoDzP70aLcf0GDkhFfPqXSDV89v4NAYu262nhgeh 5vujegkaBHXN+TXamI5fJOKq/XYZ3SpTcabynobJO6BpZ/OuoZ8G6KLwl7orXtQME1 8YLvetRleBFXSxsuk7aTy+W4jsTiUo2LJL+X5q3I1Kp2bhGF58N7LJb3wQiybr0ddB EUxcom0U1YARG9EbS05MHssEAHms7Zl0SGaXHVA+ptJn791hNZIGHJ436zwAcFEXHH aSJfD+24eevlShHyYGkZLPX8hhddfRxbLTQMA6Ww+5qywMcb2e07O0sN5F7y5FjoCj TIOy092BevO+w== Received: by mail-wm1-f72.google.com with SMTP id r15-20020a05600c35cf00b003d9a14517b2so4726754wmq.2 for ; Fri, 27 Jan 2023 06:09:48 -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=ThPASxkQPa8akyDheX0+gKydQu/0488KOg7wyMg90UM=; b=uhaBgmLxueT2N2zhsPs7kX8oHH05B8L93TwJJguKhr6tsNRyUK3kTt/tGG9fVb3gDj 3oImEKdP4/G/aF7cKGh9K+kBKXaVCMvXtJ75QFUDJ2QnZbJEAfHKoo1Cp3Khio+fbYr/ VyOGOuaTB8RQQLwfscKZqSMSMKSyBCI+NXcn66GQ+Qb9XHQSGoqqACeC8rpGQehuMHXC fMX536fFIAKkAeBavcS3vGTGm2lSWiY4vBCx2/WYd0k1afxrQBvVbu29qq+vPtY3u9e7 MpL3z67SlWOI3J4wE9bTEapmyymLFRuE/UPpxscg4HEcAsKf0dezNbzl2n7Fz9joCd1D bczw== X-Gm-Message-State: AFqh2krQcRuDBmu5ZVOraGvI9+vDnkxh6yKOUtmdL+uHRd44VhYQ3v8O WR67BqKYUUPG40zJQdFwT0bx8carsG5H6sEfQ8Wk5KnUDrdAMqR0ZUHwXxS8lj9+daaTnT9P9Qu 6a2XbynlRf6RO5GKwwegy8k/MpdYUyonPPQ== X-Received: by 2002:a05:600c:354a:b0:3da:1f6a:7b36 with SMTP id i10-20020a05600c354a00b003da1f6a7b36mr40128692wmq.0.1674828587947; Fri, 27 Jan 2023 06:09:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXs7b7lhU/Xr193ycZjTx4N8Y9Ik+fcCC7Uk9va/piM6WqgeOvJzsU8QQFjACQP4jx7hH+udxQ== X-Received: by 2002:a05:600c:354a:b0:3da:1f6a:7b36 with SMTP id i10-20020a05600c354a00b003da1f6a7b36mr40128673wmq.0.1674828587759; Fri, 27 Jan 2023 06:09:47 -0800 (PST) Received: from qwirkle.internal ([81.2.157.149]) by smtp.gmail.com with ESMTPSA id f21-20020a5d58f5000000b00236883f2f5csm4105833wrd.94.2023.01.27.06.09.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 06:09:47 -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, bpf@vger.kernel.org Subject: [PATCH v3 1/3] selftests: net: .gitignore the scratch directory of bpf Date: Fri, 27 Jan 2023 14:09:42 +0000 Message-Id: <20230127140944.265135-1-andrei.gherzan@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The net/bpf Makefile uses a similar build infrastructure to BPF[1] while building libbpf as a dependency of nat6to4. This change adds a .gitignore entry for SCRATCH_DIR where libbpf and its headers end up built/installed. [1] Introduced in commit 837a3d66d698 ("selftests: net: Add cross-compilation support for BPF programs") Signed-off-by: Andrei Gherzan --- tools/testing/selftests/net/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore index a6911cae368c..0d07dd13c973 100644 --- a/tools/testing/selftests/net/.gitignore +++ b/tools/testing/selftests/net/.gitignore @@ -40,6 +40,7 @@ test_unix_oob timestamping tls toeplitz +/tools tun txring_overwrite txtimestamp From patchwork Fri Jan 27 14:09:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 13118769 X-Patchwork-Delegate: kuba@kernel.org 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 79D37C61DA4 for ; Fri, 27 Jan 2023 14:09:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233886AbjA0OJ4 (ORCPT ); Fri, 27 Jan 2023 09:09:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233231AbjA0OJx (ORCPT ); Fri, 27 Jan 2023 09:09:53 -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 1098536680 for ; Fri, 27 Jan 2023 06:09:52 -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 484713F75F for ; Fri, 27 Jan 2023 14:09:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1674828590; bh=MB6tARXi880QTsQwMRQ5MIMlnD9ffmA7vMVVeWbOrz8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FncMqpJ9SouTzmWNvKJp1FGwu0wTRqc/waTUnz6jSpPcbx0a2HVfBDANAcCzsrmwo ImIgNG4g4HSzK46InCP3Zc3QkIYzVkbAmguk7s2n7W2+1jeQaLcU7734NKJxwACqZR ozh6eMwtvIYd9i6ynJCfL3h5ZAOIXNA3hgBvp3mIl3TYq1T6rA/4z811B4CDviG4fm Py+JBjYgy1GCUJrwZ2JDKW2oNkOV8RHnMKxCQemMpZLO9Ve897CMkiFJnBzw3WCkWB Sv4alrcukhvHvmiV89MtruhjFXVhIbJnbZG/lO2QUSR48PewR/ReNJ0ouXobpBPpxa XUboq9KPoitcQ== Received: by mail-wm1-f71.google.com with SMTP id fl5-20020a05600c0b8500b003db12112fdeso2839362wmb.5 for ; Fri, 27 Jan 2023 06:09: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: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=MB6tARXi880QTsQwMRQ5MIMlnD9ffmA7vMVVeWbOrz8=; b=YH3Ms32Yzbig/nTfkzYpGfxZ35wftrsGZ6Ca0OpU2movTHpqdN0Zm1lxswTmbYQeD7 Glm16HfxIYJsCow+cAb9s09+c4tf0G9dpWhU9a0NIT6ocUUFuUa7MHpTJ8NLLuS+2ETI sw8wJ4GDi7F+G0RYB7xqPFuPcmvP90l42uD+xBQbdJ87W8GCBBDAw7kQUv+xEWeS4PW3 Qro2fA2MDWt3KM1VorHsSXlKl73n+JKYmmQksBCo6AoO0fwcNyHxsjmqMZhJMM0hKEMo hmyyYua2XhzbUWhUntbKU571uoTdpgt05Q/FjyI6AztpFBW++ng6NCSL6L7A0lwPKTYi 4GJQ== X-Gm-Message-State: AFqh2kqfVzI6ZNCSMzdAGJxojR+e1CEb6uEwgmAM2neYKusJCNG5azli ETuz35nA+fACfKemArXhtCRmMCQ1iA5hYGBacr3vdvvkg6+YN4WINHlw/7rcGtF8/sOtfEfW2rW aRawT6J69ASl63649r0RxKe+bGkGocUMv+A== X-Received: by 2002:a5d:620a:0:b0:2bb:6b92:d4cc with SMTP id y10-20020a5d620a000000b002bb6b92d4ccmr32293110wru.53.1674828589668; Fri, 27 Jan 2023 06:09:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXtjtC5+weCOvH9xY9DjnN1e6FzPPGLY0FEoGkcu1j4DBQe6IhUm9IRhuwIfUoi0c6giIHmbZA== X-Received: by 2002:a5d:620a:0:b0:2bb:6b92:d4cc with SMTP id y10-20020a5d620a000000b002bb6b92d4ccmr32293067wru.53.1674828588933; Fri, 27 Jan 2023 06:09:48 -0800 (PST) Received: from qwirkle.internal ([81.2.157.149]) by smtp.gmail.com with ESMTPSA id f21-20020a5d58f5000000b00236883f2f5csm4105833wrd.94.2023.01.27.06.09.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 06:09:48 -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, bpf@vger.kernel.org Subject: [PATCH v3 2/3] selftests: net: Unify references to nat6to4.o when running udpgro_frglist.sh Date: Fri, 27 Jan 2023 14:09:43 +0000 Message-Id: <20230127140944.265135-2-andrei.gherzan@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230127140944.265135-1-andrei.gherzan@canonical.com> References: <20230127140944.265135-1-andrei.gherzan@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org This change refactors the nat6to4.o references to use a variable for consistency and also reformats two long lines. Signed-off-by: Andrei Gherzan --- tools/testing/selftests/net/udpgro_frglist.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/udpgro_frglist.sh b/tools/testing/selftests/net/udpgro_frglist.sh index 0a6359bed0b9..e1ca49de2491 100755 --- a/tools/testing/selftests/net/udpgro_frglist.sh +++ b/tools/testing/selftests/net/udpgro_frglist.sh @@ -6,6 +6,7 @@ readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)" BPF_FILE="../bpf/xdp_dummy.bpf.o" +BPF_NAT6TO4_FILE="nat6to4.o" cleanup() { local -r jobs="$(jobs -p)" @@ -40,9 +41,13 @@ run_one() { ip -n "${PEER_NS}" link set veth1 xdp object ${BPF_FILE} section xdp tc -n "${PEER_NS}" qdisc add dev veth1 clsact - tc -n "${PEER_NS}" filter add dev veth1 ingress prio 4 protocol ipv6 bpf object-file nat6to4.o section schedcls/ingress6/nat_6 direct-action - tc -n "${PEER_NS}" filter add dev veth1 egress prio 4 protocol ip bpf object-file nat6to4.o section schedcls/egress4/snat4 direct-action - echo ${rx_args} + tc -n "${PEER_NS}" filter add dev veth1 ingress prio 4 protocol \ + ipv6 bpf object-file "$BPF_NAT6TO4_FILE" section \ + schedcls/ingress6/nat_6 direct-action + tc -n "${PEER_NS}" filter add dev veth1 egress prio 4 protocol \ + ip bpf object-file "$BPF_NAT6TO4_FILE" section \ + schedcls/egress4/snat4 direct-action + echo ${rx_args} ip netns exec "${PEER_NS}" ./udpgso_bench_rx ${rx_args} -r & # Hack: let bg programs complete the startup @@ -88,7 +93,7 @@ if [ ! -f ${BPF_FILE} ]; then exit -1 fi -if [ ! -f nat6to4.o ]; then +if [ ! -f "$BPF_NAT6TO4_FILE" ]; then echo "Missing nat6to4 helper. Build bpf nat6to4.o selftest first" exit -1 fi From patchwork Fri Jan 27 14:09:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 13118770 X-Patchwork-Delegate: kuba@kernel.org 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 15F4EC636CD for ; Fri, 27 Jan 2023 14:09:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233625AbjA0OJ5 (ORCPT ); Fri, 27 Jan 2023 09:09:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233463AbjA0OJy (ORCPT ); Fri, 27 Jan 2023 09:09:54 -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 D0C521CAE3 for ; Fri, 27 Jan 2023 06:09:52 -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 C08973F20B for ; Fri, 27 Jan 2023 14:09:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1674828590; bh=nTK+Tg/yAxtPIIDooMityTGjVkS2yxq+KGHsQ1IbSWA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=I7oVur5gLqVs4SPsNhI1PX37a/WmeDtK3TV85pIW365JmB+n5n9ESJV5M/BllXkZ2 KDkoODBkxcDolFHi2RjYa3OV9mkbf9nVfMlZ/wlRoA7+lzTITGVfx1ic3o24HqqimG SO/hzLUwQmhHaeeFTiRrllhyUG+/MpZXxNRAv5TxBnU3YOZr7IwkNP4FA7Qe8QZr4d pWd3dlUAH23IIBJ7pnRQPjolscJuq5pfXPzuwBQOXyxhnpHjjrFCVjpf008EQoXS/u fwwMyFvMa1TCxDL6tqbxRjWUh5ELStCD2/ISI2OnMu8bUMA7JMfJpn3wbK1FL6ct9e K48wGDtR1L6SA== Received: by mail-wm1-f71.google.com with SMTP id o7-20020a05600c510700b003dc4312bc2bso139481wms.7 for ; Fri, 27 Jan 2023 06:09: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: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=nTK+Tg/yAxtPIIDooMityTGjVkS2yxq+KGHsQ1IbSWA=; b=Yjf4QwjNTJgyf2tP1Cj1gUycpZ0haCREIa7RCj7D8Skqo3xxfGEhKJtngAhENuUPfA wmmSmZgtw5jYJZKQeeW5uIJoqJesYiFf7VQb5fVYFCzFd8YAA6rVTgcfy8naX5iW84g5 mUl/NLIhJSYHWZTU3x5cDRfjmdhLTCPj4VMe0WnxXVyVSkt3kWJ8HauBwYTPHXRq5jd/ UzQFx1+N0a6YPCcCqQZ86hVd8F+rE8SgT7xfQlP+vReE6M/atwGKpDFA2T1ScdpgavZJ tmBRyPWjeUg12R4wtJDhG5YvB2csf3jgv7qHlGariL4T4hcrdrY61dlPk1giPaR97zC1 Sbgw== X-Gm-Message-State: AO0yUKVX+O4vFLCDnHz3YPXmjp8zy9+OdilHuz7lVXK4Lr/za1P5AzVk SX9L0Q21MFozIDf50nW/dVzEjVLPTkeWQEmrrGNn35lFnUMjdHXdeoc4T8Nf17j0SQicvva3kTI lMfCjFLrmFJnjlFmxZMbbN1CBYcHpIMYjSA== X-Received: by 2002:a5d:558a:0:b0:2bf:d6fc:580d with SMTP id i10-20020a5d558a000000b002bfd6fc580dmr1138176wrv.69.1674828590581; Fri, 27 Jan 2023 06:09:50 -0800 (PST) X-Google-Smtp-Source: AK7set//BxCF5WT5hBFnMpYOxwv7KjXmz6dU/605p3j/UGBsQ9MaoqHMsAfSDxDHOCpDhi8SeEwdaQ== X-Received: by 2002:a5d:558a:0:b0:2bf:d6fc:580d with SMTP id i10-20020a5d558a000000b002bfd6fc580dmr1138149wrv.69.1674828590063; Fri, 27 Jan 2023 06:09:50 -0800 (PST) Received: from qwirkle.internal ([81.2.157.149]) by smtp.gmail.com with ESMTPSA id f21-20020a5d58f5000000b00236883f2f5csm4105833wrd.94.2023.01.27.06.09.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 06:09:49 -0800 (PST) From: Andrei Gherzan To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Lina Wang , Maciej enczykowski Cc: Andrei Gherzan , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] selftests: net: Fix udpgro_frglist.sh shellcheck warnings and errors Date: Fri, 27 Jan 2023 14:09:44 +0000 Message-Id: <20230127140944.265135-3-andrei.gherzan@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230127140944.265135-1-andrei.gherzan@canonical.com> References: <20230127140944.265135-1-andrei.gherzan@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org This change fixes the following shellcheck warnings and errors: * SC2155 (warning): Declare and assign separately to avoid masking return values. * SC2124 (warning): Assigning an array to a string! Assign as array, or use instead of @ to concatenate. * SC2034 (warning): ipv4_args appears unused. Verify use (or export if used externally). * SC2242 (error): Can only exit with status 0-255. Other data should be written to stdout/stderr. * SC2068 (error): Double quote array expansions to avoid re-splitting elements. Fixes: edae34a3ed92 ("selftests net: add UDP GRO fraglist + bpf self-tests") Signed-off-by: Andrei Gherzan --- tools/testing/selftests/net/udpgro_frglist.sh | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/net/udpgro_frglist.sh b/tools/testing/selftests/net/udpgro_frglist.sh index e1ca49de2491..97bf20e9afd8 100755 --- a/tools/testing/selftests/net/udpgro_frglist.sh +++ b/tools/testing/selftests/net/udpgro_frglist.sh @@ -3,7 +3,8 @@ # # Run a series of udpgro benchmarks -readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)" +PEER_NS="ns-peer-$(mktemp -u XXXXXX)" +readonly PEER_NS BPF_FILE="../bpf/xdp_dummy.bpf.o" BPF_NAT6TO4_FILE="nat6to4.o" @@ -19,7 +20,7 @@ trap cleanup EXIT run_one() { # use 'rx' as separator between sender args and receiver args - local -r all="$@" + local -r all="$*" local -r tx_args=${all%rx*} local rx_args=${all#*rx} @@ -56,13 +57,13 @@ run_one() { } run_in_netns() { - local -r args=$@ + local -r args="$*" echo ${args} ./in_netns.sh $0 __subprocess ${args} } run_udp() { - local -r args=$@ + local -r args="$*" echo "udp gso - over veth touching data" run_in_netns ${args} -u -S 0 rx -4 -v @@ -72,7 +73,7 @@ run_udp() { } run_tcp() { - local -r args=$@ + local -r args="$*" echo "tcp - over veth touching data" run_in_netns ${args} -t rx -4 -t @@ -80,7 +81,6 @@ run_tcp() { run_all() { local -r core_args="-l 4" - local -r ipv4_args="${core_args} -4 -D 192.168.1.1" local -r ipv6_args="${core_args} -6 -D 2001:db8::1" echo "ipv6" @@ -90,19 +90,19 @@ run_all() { if [ ! -f ${BPF_FILE} ]; then echo "Missing ${BPF_FILE}. Build bpf selftest first" - exit -1 + exit 1 fi if [ ! -f "$BPF_NAT6TO4_FILE" ]; then echo "Missing nat6to4 helper. Build bpf nat6to4.o selftest first" - exit -1 + exit 1 fi if [[ $# -eq 0 ]]; then run_all elif [[ $1 == "__subprocess" ]]; then shift - run_one $@ + run_one "$@" else - run_in_netns $@ + run_in_netns "$@" fi