From patchwork Wed Jan 25 21:13:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 13116199 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 6006BC54E94 for ; Wed, 25 Jan 2023 21:14:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236160AbjAYVOi (ORCPT ); Wed, 25 Jan 2023 16:14:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236120AbjAYVOh (ORCPT ); Wed, 25 Jan 2023 16:14:37 -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 56F205FCD for ; Wed, 25 Jan 2023 13:14:35 -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-1.canonical.com (Postfix) with ESMTPS id 0DB573F2D7 for ; Wed, 25 Jan 2023 21:14:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1674681273; bh=zuLI4Bp627ZhHkhqlP1iDRjahT6gPWQWdVEKJTBWAPw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=HYYEj7oN1WkD1d0VldRtq5Yukbg0bkezPqswkqyG4NlcsPV1W6GpgTfDE5xV738A4 FiyznUmBZNe4S4k/nBO2jWXiB4nQLmwonRVo1tpRSRJM6On0ocTmr6fK/16rueavPY HJcjGkNOKIuNc08zysgr6x+avf93iNJRpcdoCM6GYx3FrNqzi1d2jcGJ+HGw6UQJ4Z D6LsmoATCAQVfHvBFs2I96NBdbaLc8DsukPcl1kJNb4zLNLiGklVvBdLASjESpCSlT rZlb9lZuqNHyrMKUL7E+/oTfD35XXb9UTlsANNuJD9PlotaNrl/l7aVZUBC68S/Nn4 qg8//+0batvng== Received: by mail-wm1-f69.google.com with SMTP id z22-20020a05600c0a1600b003db00dc4b69so1718126wmp.5 for ; Wed, 25 Jan 2023 13:14:33 -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=zuLI4Bp627ZhHkhqlP1iDRjahT6gPWQWdVEKJTBWAPw=; b=jESow0WF3qNL3Yr9/kECYokUeXnXNAfunrEnnVmFxG0LSsOWpoUC78jFjzvg1Tf3uP jQOjV5381Q+SgLR1KpzMWl4Zsc38UMAixcoKkHtjEgdAb0x2E2WfB9/iwy+bnU14iIZu nm332tmPpW+2gZZtiQVPXcb46hJnvvtiFUOsY0htr3ETI4gB0r8eILJiNTvYzFCqGGMw lmb2PGGZMWNvzGokTat2Yr3K7hIHdeYQFiOi2CQy/D4lsqrFK7yZvsYYKUs1FKmhG6dJ MQsL6RwHZEgangArL+ULOPaSfegQQMKSuwr5X0/b1Fghc3SancVjvaANEFnnP9jv4yzx vKCA== X-Gm-Message-State: AFqh2kqkKNBCU35gXlQX8aHWQX1G3N0ttsgk8u7DWZ4QBHNP/tYicTwx EbxTiVLuNGSfDPJX+HuuRcC7V20dWxzje1fx6EmLWsmEPuGqQKMUN/q/PAxSAJ9S0mv0FvxNoSd NjNBNTBOjIyXKbZjRU90xFuLuSPgYAj3mXFk6zburRo0u/Q== X-Received: by 2002:adf:f0c7:0:b0:2bd:e18d:c9e5 with SMTP id x7-20020adff0c7000000b002bde18dc9e5mr30002378wro.40.1674681272278; Wed, 25 Jan 2023 13:14:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXsEXTSteavR2oIdqHFpmfgQvV0sc0iT8QGFY/uEQuvNeO8SmPQBaIfEVUScik9B0mqdVFu5KA== X-Received: by 2002:adf:f0c7:0:b0:2bd:e18d:c9e5 with SMTP id x7-20020adff0c7000000b002bde18dc9e5mr30002370wro.40.1674681272108; Wed, 25 Jan 2023 13:14:32 -0800 (PST) Received: from qwirkle.internal ([81.2.157.149]) by smtp.gmail.com with ESMTPSA id l10-20020a05600012ca00b002bfb02153d1sm5738146wrx.45.2023.01.25.13.14.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 13:14:31 -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 v2 1/2] selftests: net: Fix missing nat6to4.o when running udpgro_frglist.sh Date: Wed, 25 Jan 2023 21:13:49 +0000 Message-Id: <20230125211350.113855-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 The udpgro_frglist.sh uses nat6to4.o which is tested for existence in bpf/nat6to4.o (relative to the script). This is where the object is compiled. Even so, the script attempts to use it as part of tc with a different path (../bpf/nat6to4.o). As a consequence, this fails the script: Error opening object ../bpf/nat6to4.o: No such file or directory Cannot initialize ELF context! Unable to load program This change refactors these 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 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/udpgro_frglist.sh b/tools/testing/selftests/net/udpgro_frglist.sh index c9c4b9d65839..1fdf2d53944d 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="./bpf/nat6to4.o" cleanup() { local -r jobs="$(jobs -p)" @@ -40,8 +41,12 @@ 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 ../bpf/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 ../bpf/nat6to4.o section schedcls/egress4/snat4 direct-action + 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 & @@ -88,7 +93,7 @@ if [ ! -f ${BPF_FILE} ]; then exit -1 fi -if [ ! -f bpf/nat6to4.o ]; then +if [ ! -f "$BPF_NAT6TO4_FILE" ]; then echo "Missing nat6to4 helper. Build bpfnat6to4.o selftest first" exit -1 fi From patchwork Wed Jan 25 21:13:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 13116200 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 44585C27C76 for ; Wed, 25 Jan 2023 21:15:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235065AbjAYVPD (ORCPT ); Wed, 25 Jan 2023 16:15:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236301AbjAYVOq (ORCPT ); Wed, 25 Jan 2023 16:14:46 -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 15DA21E1D8 for ; Wed, 25 Jan 2023 13:14:40 -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 220D73F2D3 for ; Wed, 25 Jan 2023 21:14:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1674681279; bh=ThPASxkQPa8akyDheX0+gKydQu/0488KOg7wyMg90UM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=B+fmEPVuruQRN+j7SD7H2831vp1TkBBrD7jHiSC0FpTyFnnAzfuGtAUdF6ntk/2B0 V9AygTpNnXO7O9llsz9rRPIO45wHx3UjdOBaceVPZIiRqZnhGWJXTSptG20lyj0g6i oEaE8RBDYkgFpyvR6locEX8K7in5ayInM0Q0D4xwmbJTmkQ/RlEEPtTWuN7fN2wzBJ ZNlYGbmLChk5YltoZJehJmepTcci6WtaPUhKNI+xBV4S+Rf9U/zr95Ain1NRRlbqBI ZRHiQg26yf8wQXT8Tohbf9WzhDwgut0Z530f/F9v1wMzJjw5mY+SnsQO2yeRAdEd25 ea4pW4T5Tt/bg== Received: by mail-wm1-f72.google.com with SMTP id r15-20020a05600c35cf00b003d9a14517b2so1727835wmq.2 for ; Wed, 25 Jan 2023 13:14:39 -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=ThPASxkQPa8akyDheX0+gKydQu/0488KOg7wyMg90UM=; b=ZPLbBz4MygNZkQaj7JL5ZzuApcAbQWzKdzPh+/8c4Hy4/fNZQYDfci39dQx7S0ugDk RQ81FbrCN7H52memGkTOqJ5/Bnn2G9mjn2FuaXMg+jvGh4P4Mlt+4RYiL16ya/GS0zbj +wSVqyzZr+JOIfqJNQNiQlMvtT27GLAYGi1W9APxtmGQriDFbTXXuAv62GQiSs5z+1fR 0UIicAUGdRqEDvgKpD16EdKHcKfgKcoSTQpCmMDOjKoYwvoTe2hIECsgWRgK5WQqZzF4 YBaYjpqelD8h9WrnXy7j11eXIdVTeU1YBCdDaUWegcba74lmxJmsHbHrY1SHCyeJMQii WqqQ== X-Gm-Message-State: AO0yUKXlMiTScP2bA2lze09fgI6JsTQxN+GBe17v2QYGOE3hVx2veBOl hz0aP/3OE1YNr+UUaqv7eMTUygCCwmt+OW23KHEkhjM7JKltmMsuBIiEr7J1lHLbmxFjPnLZL9f lWnVJqTWlIG2Zvv0p+Y0hltJcaImim0l2onYl+VsfYqBs0Q== X-Received: by 2002:adf:a493:0:b0:2bf:b5c0:f157 with SMTP id g19-20020adfa493000000b002bfb5c0f157mr5175453wrb.39.1674681278936; Wed, 25 Jan 2023 13:14:38 -0800 (PST) X-Google-Smtp-Source: AK7set+YG1U/BehDKtOLtFbxMC++ML3k7K+wehcNVLO5HFEq/vSitr9BPNZZqRj5SWCdU9q0dHX8wg== X-Received: by 2002:adf:a493:0:b0:2bf:b5c0:f157 with SMTP id g19-20020adfa493000000b002bfb5c0f157mr5175441wrb.39.1674681278787; Wed, 25 Jan 2023 13:14:38 -0800 (PST) Received: from qwirkle.internal ([81.2.157.149]) by smtp.gmail.com with ESMTPSA id l10-20020a05600012ca00b002bfb02153d1sm5738146wrx.45.2023.01.25.13.14.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 13:14:38 -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 v2 2/2] selftests: net: .gitignore the scratch directory of bpf Date: Wed, 25 Jan 2023 21:13:50 +0000 Message-Id: <20230125211350.113855-2-andrei.gherzan@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230125211350.113855-1-andrei.gherzan@canonical.com> References: <20230125211350.113855-1-andrei.gherzan@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.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