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 X-Spam-Level: X-Spam-Status: No, score=-15.2 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_SANE_1 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 103FEC433DB for ; Tue, 23 Feb 2021 14:52:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CDCC764E58 for ; Tue, 23 Feb 2021 14:52:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233133AbhBWOwE (ORCPT ); Tue, 23 Feb 2021 09:52:04 -0500 Received: from mga07.intel.com ([134.134.136.100]:9507 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232933AbhBWOvx (ORCPT ); Tue, 23 Feb 2021 09:51:53 -0500 IronPort-SDR: +iAW+qkX1LRip02T75/NJUpzNWDmOBtCa2oNSLbsddolJu+zk7oXfrHl8cQYae7Dk063F8K7us Y9PPnUxVyPvw== X-IronPort-AV: E=McAfee;i="6000,8403,9903"; a="248875017" X-IronPort-AV: E=Sophos;i="5.81,200,1610438400"; d="scan'208";a="248875017" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2021 06:50:27 -0800 IronPort-SDR: M5PIPlicTeK8PfvWeC1B+/1pS5oTEDZCw6KWrZDCc/C+S+/rvvzixB9siS5hMiY8yVKkDLxrdX Uce/aK0t2vUQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,200,1610438400"; d="scan'208";a="380511748" Received: from ranger.igk.intel.com ([10.102.21.164]) by orsmga002.jf.intel.com with ESMTP; 23 Feb 2021 06:50:25 -0800 Date: Tue, 23 Feb 2021 15:39:39 +0100 From: Maciej Fijalkowski To: Ciara Loftus Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, magnus.karlsson@intel.com, bjorn@kernel.org, weqaar.a.janjua@intel.com Subject: Re: [PATCH bpf-next v2 2/4] selftests/bpf: expose and rename debug argument Message-ID: <20210223143939.GA51139@ranger.igk.intel.com> References: <20210223103507.10465-1-ciara.loftus@intel.com> <20210223103507.10465-3-ciara.loftus@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210223103507.10465-3-ciara.loftus@intel.com> User-Agent: Mutt/1.12.1 (2019-06-15) Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, Feb 23, 2021 at 10:35:05AM +0000, Ciara Loftus wrote: > Launching xdpxceiver with -D enables what was formerly know as 'debug' > mode. Rename this mode to 'dump-pkts' as it better describes the > behavior enabled by the option. New usage: > > ./xdpxceiver .. -D > or > ./xdpxceiver .. --dump-pkts > > Also make it possible to pass this flag to the app via the test_xsk.sh > shell script like so: > > ./test_xsk.sh -D This doesn't work for me. Not a shell programming expert, but seems like my shell doesn't understand that dump-pkts is a variable. $ sudo ./test_xsk.sh -D ./test_xsk.sh: line 82: dump-pkts=1: command not found If I do: diff --git a/tools/testing/selftests/bpf/test_xsk.sh b/tools/testing/selftests/bpf/test_xsk.sh index cb8a9e5c34ff..378720e22877 100755 --- a/tools/testing/selftests/bpf/test_xsk.sh +++ b/tools/testing/selftests/bpf/test_xsk.sh @@ -79,7 +79,7 @@ do case "${flag}" in c) colorconsole=1;; v) verbose=1;; - D) dump-pkts=1;; + D) dump_pkts=1;; esac done @@ -136,7 +136,7 @@ if [[ $verbose -eq 1 ]]; then VERBOSE_ARG="-v" fi -if [[ $dump-pkts -eq 1 ]]; then +if [[ $dump_pkts -eq 1 ]]; then DUMP_PKTS_ARG="-D" fi Then it's fine. > > Signed-off-by: Ciara Loftus > --- > tools/testing/selftests/bpf/test_xsk.sh | 7 ++++++- > tools/testing/selftests/bpf/xdpxceiver.c | 6 +++--- > tools/testing/selftests/bpf/xsk_prereqs.sh | 3 ++- > 3 files changed, 11 insertions(+), 5 deletions(-) > > diff --git a/tools/testing/selftests/bpf/test_xsk.sh b/tools/testing/selftests/bpf/test_xsk.sh > index 91127a5be90d..870ae3f38818 100755 > --- a/tools/testing/selftests/bpf/test_xsk.sh > +++ b/tools/testing/selftests/bpf/test_xsk.sh > @@ -74,11 +74,12 @@ > > . xsk_prereqs.sh > > -while getopts "cv" flag > +while getopts "cvD" flag > do > case "${flag}" in > c) colorconsole=1;; > v) verbose=1;; > + D) dump-pkts=1;; > esac > done > > @@ -135,6 +136,10 @@ if [[ $verbose -eq 1 ]]; then > VERBOSE_ARG="-v" > fi > > +if [[ $dump-pkts -eq 1 ]]; then > + DUMP_PKTS_ARG="-D" > +fi > + > test_status $retval "${TEST_NAME}" > > ## START TESTS > diff --git a/tools/testing/selftests/bpf/xdpxceiver.c b/tools/testing/selftests/bpf/xdpxceiver.c > index 8af746c9a6b6..506423201197 100644 > --- a/tools/testing/selftests/bpf/xdpxceiver.c > +++ b/tools/testing/selftests/bpf/xdpxceiver.c > @@ -58,7 +58,7 @@ > * - Rx thread verifies if all 10k packets were received and delivered in-order, > * and have the right content > * > - * Enable/disable debug mode: > + * Enable/disable packet dump mode: > * -------------------------- > * To enable L2 - L4 headers and payload dump of each packet on STDOUT, add > * parameter -D to params array in test_xsk.sh, i.e. params=("-S" "-D") > @@ -340,7 +340,7 @@ static struct option long_options[] = { > {"copy", no_argument, 0, 'c'}, > {"tear-down", no_argument, 0, 'T'}, > {"bidi", optional_argument, 0, 'B'}, > - {"debug", optional_argument, 0, 'D'}, > + {"dump-pkts", optional_argument, 0, 'D'}, > {"verbose", no_argument, 0, 'v'}, > {"tx-pkt-count", optional_argument, 0, 'C'}, > {0, 0, 0, 0} > @@ -359,7 +359,7 @@ static void usage(const char *prog) > " -c, --copy Force copy mode\n" > " -T, --tear-down Tear down sockets by repeatedly recreating them\n" > " -B, --bidi Bi-directional sockets test\n" > - " -D, --debug Debug mode - dump packets L2 - L5\n" > + " -D, --dump-pkts Dump packets L2 - L5\n" > " -v, --verbose Verbose output\n" > " -C, --tx-pkt-count=n Number of packets to send\n"; > ksft_print_msg(str, prog); > diff --git a/tools/testing/selftests/bpf/xsk_prereqs.sh b/tools/testing/selftests/bpf/xsk_prereqs.sh > index ef8c5b31f4b6..da93575d757a 100755 > --- a/tools/testing/selftests/bpf/xsk_prereqs.sh > +++ b/tools/testing/selftests/bpf/xsk_prereqs.sh > @@ -128,5 +128,6 @@ execxdpxceiver() > copy[$index]=${!current} > done > > - ./${XSKOBJ} -i ${VETH0} -i ${VETH1},${NS1} ${copy[*]} -C ${NUMPKTS} ${VERBOSE_ARG} > + ./${XSKOBJ} -i ${VETH0} -i ${VETH1},${NS1} ${copy[*]} -C ${NUMPKTS} ${VERBOSE_ARG} \ > + ${DUMP_PKTS_ARG} > } > -- > 2.17.1 >