From patchwork Tue Feb 19 14:53:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 50371 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8B07D6C9B; Tue, 19 Feb 2019 15:53:36 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 47BF92AB for ; Tue, 19 Feb 2019 15:53:35 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Feb 2019 06:53:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,388,1544515200"; d="scan'208";a="321589108" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by fmsmga005.fm.intel.com with ESMTP; 19 Feb 2019 06:53:33 -0800 From: Bruce Richardson To: dev@dpdk.org, thomas@monjalon.net Cc: Bruce Richardson , Konstantin Ananyev Date: Tue, 19 Feb 2019 14:53:07 +0000 Message-Id: <20190219145308.65668-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190219145308.65668-1-bruce.richardson@intel.com> References: <20190125202642.66559-1-bruce.richardson@intel.com> <20190219145308.65668-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 4/5] test/bpf: move to examples folder X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The bpf folder didn't actual contain a test application, but instead basic examples of BPF code for use with testpmd. Therefore we can move it to the `examples` folder. Being different, it also needs a README with it, explaining what it is and how to use it. References to the code from the testpmd docs are suitably updated. CC: Konstantin Ananyev Signed-off-by: Bruce Richardson Acked-by: Konstantin Ananyev --- MAINTAINERS | 2 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 8 ++++---- examples/bpf/README | 8 ++++++++ {test => examples}/bpf/dummy.c | 0 {test => examples}/bpf/mbuf.h | 0 examples/bpf/meson.build | 6 ++++++ {test => examples}/bpf/t1.c | 0 {test => examples}/bpf/t2.c | 0 {test => examples}/bpf/t3.c | 0 9 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 examples/bpf/README rename {test => examples}/bpf/dummy.c (100%) rename {test => examples}/bpf/mbuf.h (100%) create mode 100644 examples/bpf/meson.build rename {test => examples}/bpf/t1.c (100%) rename {test => examples}/bpf/t2.c (100%) rename {test => examples}/bpf/t3.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index c4619174a..6d1d0aea7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1230,7 +1230,7 @@ F: doc/guides/howto/telemetry.rst BPF - EXPERIMENTAL M: Konstantin Ananyev F: lib/librte_bpf/ -F: test/bpf/ +F: examples/bpf/ F: test/test/test_bpf.c F: doc/guides/prog_guide/bpf_lib.rst diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 029148041..b079c60d9 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -4503,20 +4503,20 @@ For example: .. code-block:: console - cd test/bpf + cd examples/bpf clang -O2 -target bpf -c t1.c Then to load (and JIT compile) t1.o at RX queue 0, port 1:: .. code-block:: console - testpmd> bpf-load rx 1 0 J ./dpdk.org/test/bpf/t1.o + testpmd> bpf-load rx 1 0 J ./dpdk.org/examples/bpf/t1.o To load (not JITed) t1.o at TX queue 0, port 0:: .. code-block:: console - testpmd> bpf-load tx 0 0 - ./dpdk.org/test/bpf/t1.o + testpmd> bpf-load tx 0 0 - ./dpdk.org/examples/bpf/t1.o bpf-unload ~~~~~~~~~~ @@ -4529,4 +4529,4 @@ For example to unload BPF filter from TX queue 0, port 0: .. code-block:: console - testpmd> bpf-load tx 0 0 - ./dpdk.org/test/bpf/t1.o + testpmd> bpf-unload tx 0 0 diff --git a/examples/bpf/README b/examples/bpf/README new file mode 100644 index 000000000..d714180a5 --- /dev/null +++ b/examples/bpf/README @@ -0,0 +1,8 @@ +This folder contains example BPF programs for use with the DPDK bpf +library. To get details of each program and how to compile it, see +the header on the '.c' file itself. + +Once compiled, these example programs can be loaded into `testpmd` +for execution on a packet stream. See `bpf-load` and `bpf-unload` +commands documented in the `Testpmd Application User Guide` for +details on how to do so. diff --git a/test/bpf/dummy.c b/examples/bpf/dummy.c similarity index 100% rename from test/bpf/dummy.c rename to examples/bpf/dummy.c diff --git a/test/bpf/mbuf.h b/examples/bpf/mbuf.h similarity index 100% rename from test/bpf/mbuf.h rename to examples/bpf/mbuf.h diff --git a/examples/bpf/meson.build b/examples/bpf/meson.build new file mode 100644 index 000000000..0a817aaea --- /dev/null +++ b/examples/bpf/meson.build @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +# This contains BPF example code for use in testing BPF with testpmd, +# therefore it should not be built as part of a meson build. +build=false diff --git a/test/bpf/t1.c b/examples/bpf/t1.c similarity index 100% rename from test/bpf/t1.c rename to examples/bpf/t1.c diff --git a/test/bpf/t2.c b/examples/bpf/t2.c similarity index 100% rename from test/bpf/t2.c rename to examples/bpf/t2.c diff --git a/test/bpf/t3.c b/examples/bpf/t3.c similarity index 100% rename from test/bpf/t3.c rename to examples/bpf/t3.c