From patchwork Mon Feb 8 09:05:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Loftus, Ciara" X-Patchwork-Id: 379022 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C72AC433DB for ; Mon, 8 Feb 2021 09:40:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 31AE464E66 for ; Mon, 8 Feb 2021 09:40:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231805AbhBHJjj (ORCPT ); Mon, 8 Feb 2021 04:39:39 -0500 Received: from mga05.intel.com ([192.55.52.43]:41336 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231563AbhBHJgd (ORCPT ); Mon, 8 Feb 2021 04:36:33 -0500 IronPort-SDR: iF0Pj3Iht5mEwbd1hyP0Yidw3K5d8tvkF0hGffxAaBHnZhpEKtqsltCYGIP6PP/R56h8Ae82cZ DjrSm1fIU0+w== X-IronPort-AV: E=McAfee;i="6000,8403,9888"; a="266517691" X-IronPort-AV: E=Sophos;i="5.81,161,1610438400"; d="scan'208";a="266517691" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 01:35:50 -0800 IronPort-SDR: tWuAbVDjHyxaYNXPrOLzr8Ip9hG1Kk9QAbk81LULXDmN8TBX5ocLg3zjqxqZ2DQNZAzyz59U6G cYKc7RWTQw5g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,161,1610438400"; d="scan'208";a="358680843" Received: from silpixa00399839.ir.intel.com (HELO localhost.localdomain) ([10.237.222.142]) by orsmga003.jf.intel.com with ESMTP; 08 Feb 2021 01:35:48 -0800 From: Ciara Loftus To: netdev@vger.kernel.org, bpf@vger.kernel.org, magnus.karlsson@intel.com, bjorn@kernel.org, weqaar.a.janjua@intel.com Cc: daniel@iogearbox.net, song@kernel.org, Ciara Loftus Subject: [PATCH bpf-next v5 2/6] selftests/bpf: restructure setting the packet count Date: Mon, 8 Feb 2021 09:05:26 +0000 Message-Id: <20210208090530.5032-3-ciara.loftus@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210208090530.5032-1-ciara.loftus@intel.com> References: <20210208090530.5032-1-ciara.loftus@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Prior to this, the packet count was fixed at 10000 for every test. Future tracing tests need to modify the count in order to ensure the trace buffer does not become full. So, make it possible to set the count from test_xsk.h using the -C opt. Signed-off-by: Ciara Loftus --- tools/testing/selftests/bpf/test_xsk.sh | 17 +++++++++-------- tools/testing/selftests/bpf/xsk_prereqs.sh | 3 +-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/bpf/test_xsk.sh b/tools/testing/selftests/bpf/test_xsk.sh index 88a7483eaae4..2b4a4f42b220 100755 --- a/tools/testing/selftests/bpf/test_xsk.sh +++ b/tools/testing/selftests/bpf/test_xsk.sh @@ -82,6 +82,7 @@ do done TEST_NAME="PREREQUISITES" +DEFAULTPKTS=10000 URANDOM=/dev/urandom [ ! -e "${URANDOM}" ] && { echo "${URANDOM} not found. Skipping tests."; test_exit 1 1; } @@ -154,7 +155,7 @@ TEST_NAME="SKB NOPOLL" vethXDPgeneric ${VETH0} ${VETH1} ${NS1} -params=("-S") +params=("-S" "-C" "${DEFAULTPKTS}") execxdpxceiver params retval=$? @@ -166,7 +167,7 @@ TEST_NAME="SKB POLL" vethXDPgeneric ${VETH0} ${VETH1} ${NS1} -params=("-S" "-p") +params=("-S" "-p" "-C" "${DEFAULTPKTS}") execxdpxceiver params retval=$? @@ -178,7 +179,7 @@ TEST_NAME="DRV NOPOLL" vethXDPnative ${VETH0} ${VETH1} ${NS1} -params=("-N") +params=("-N" "-C" "${DEFAULTPKTS}") execxdpxceiver params retval=$? @@ -190,7 +191,7 @@ TEST_NAME="DRV POLL" vethXDPnative ${VETH0} ${VETH1} ${NS1} -params=("-N" "-p") +params=("-N" "-p" "-C" "${DEFAULTPKTS}") execxdpxceiver params retval=$? @@ -202,7 +203,7 @@ TEST_NAME="SKB SOCKET TEARDOWN" vethXDPgeneric ${VETH0} ${VETH1} ${NS1} -params=("-S" "-T") +params=("-S" "-T" "-C" "${DEFAULTPKTS}") execxdpxceiver params retval=$? @@ -214,7 +215,7 @@ TEST_NAME="DRV SOCKET TEARDOWN" vethXDPnative ${VETH0} ${VETH1} ${NS1} -params=("-N" "-T") +params=("-N" "-T" "-C" "${DEFAULTPKTS}") execxdpxceiver params retval=$? @@ -226,7 +227,7 @@ TEST_NAME="SKB BIDIRECTIONAL SOCKETS" vethXDPgeneric ${VETH0} ${VETH1} ${NS1} -params=("-S" "-B") +params=("-S" "-B" "-C" "${DEFAULTPKTS}") execxdpxceiver params retval=$? @@ -238,7 +239,7 @@ TEST_NAME="DRV BIDIRECTIONAL SOCKETS" vethXDPnative ${VETH0} ${VETH1} ${NS1} -params=("-N" "-B") +params=("-N" "-B" "-C" "${DEFAULTPKTS}") execxdpxceiver params retval=$? diff --git a/tools/testing/selftests/bpf/xsk_prereqs.sh b/tools/testing/selftests/bpf/xsk_prereqs.sh index 9d54c4645127..41dd713d14df 100755 --- a/tools/testing/selftests/bpf/xsk_prereqs.sh +++ b/tools/testing/selftests/bpf/xsk_prereqs.sh @@ -15,7 +15,6 @@ NC='\033[0m' STACK_LIM=131072 SPECFILE=veth.spec XSKOBJ=xdpxceiver -NUMPKTS=10000 validate_root_exec() { @@ -131,5 +130,5 @@ execxdpxceiver() copy[$index]=${!current} done - ./${XSKOBJ} -i ${VETH0} -i ${VETH1},${NS1} ${copy[*]} -C ${NUMPKTS} + ./${XSKOBJ} -i ${VETH0} -i ${VETH1},${NS1} ${copy[*]} }