Skip to contentSkip to conversation

remove a few example applications

PATCH In review Bruce Richardson 6 participants 27 messages Oct 3, 2019 – Oct 26, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

cover remove a few example applications

As discussed by the DPDK technical board e.g. [1][2] and on the DPDK mailing list [3], we have a lot of example applications shipped with DPDK - a number which increases with each DPDK release, and not all of which are probably needed any more. Therefore, this set removes 5 example applications from the repository.

The removal of each app is relatively straight-forward, though the use of a table in the intro section of the sample app guide document makes removing each app individually more difficult, as the table needs to be reformed. Rather than increasing the diff by reformatting the table each time, or the opposite approach of doing all table removals in one shot at the end of the set, we have taken a compromise approach here, and each example table entry is cleared once the example is removed, and the table is finally rebalanced once at the end, by just compressing up the spaces on each side.

[1] https://mails.dpdk.org/archives/dev/2019-May/132288.html
[2] https://mails.dpdk.org/archives/dev/2019-June/135847.html
[3] https://mails.dpdk.org/archives/dev/2019-July/138676.html

Bruce Richardson (3):
examples/exception_path: remove example from DPDK examples/l3fwd-vf: remove example from DPDK
doc: close up gaps in sample app guide table

Ciara Power (3):
examples/quota-watermark: remove example from DPDK examples/netmap-compat: remove example from DPDK examples/load_balancer: remove example from DPDK

 MAINTAINERS                                   |   15 -
 doc/guides/sample_app_ug/exception_path.rst   |  281 -----
 doc/guides/sample_app_ug/index.rst            |    5 -
 doc/guides/sample_app_ug/intro.rst            |   30 +-
 .../sample_app_ug/l3_forward_virtual.rst      |   98 --
 doc/guides/sample_app_ug/load_balancer.rst    |  201 ----
 .../sample_app_ug/netmap_compatibility.rst    |  130 --
 doc/guides/sample_app_ug/quota_watermark.rst  |  465 -------
 examples/Makefile                             |    5 -
 examples/exception_path/Makefile              |   57 -
 examples/exception_path/main.c                |  589 ---------
 examples/exception_path/meson.build           |   11 -
 examples/l3fwd-vf/Makefile                    |   62 -
 examples/l3fwd-vf/main.c                      | 1072 -----------------
 examples/l3fwd-vf/meson.build                 |   12 -
 examples/load_balancer/Makefile               |   62 -
 examples/load_balancer/config.c               | 1030 ----------------
 examples/load_balancer/init.c                 |  520 --------
 examples/load_balancer/main.c                 |   76 --
 examples/load_balancer/main.h                 |  351 ------
 examples/load_balancer/meson.build            |   12 -
 examples/load_balancer/runtime.c              |  642 ----------
 examples/meson.build                          |    9 +-
 examples/netmap_compat/Makefile               |   22 -
 examples/netmap_compat/bridge/Makefile        |   35 -
 examples/netmap_compat/bridge/bridge.c        |  343 ------
 examples/netmap_compat/lib/compat_netmap.c    |  899 --------------
 examples/netmap_compat/lib/compat_netmap.h    |   51 -
 examples/netmap_compat/meson.build            |   10 -
 examples/netmap_compat/netmap/netmap.h        |  289 -----
 examples/netmap_compat/netmap/netmap_user.h   |   95 --
 examples/quota_watermark/Makefile             |   16 -
 examples/quota_watermark/include/conf.h       |   19 -
 examples/quota_watermark/meson.build          |   10 -
 examples/quota_watermark/qw/Makefile          |   22 -
 examples/quota_watermark/qw/args.c            |   78 --
 examples/quota_watermark/qw/args.h            |   12 -
 examples/quota_watermark/qw/init.c            |  164 ---
 examples/quota_watermark/qw/init.h            |   14 -
 examples/quota_watermark/qw/main.c            |  365 ------
 examples/quota_watermark/qw/main.h            |   31 -
 examples/quota_watermark/qwctl/Makefile       |   22 -
 examples/quota_watermark/qwctl/commands.c     |  196 ---
 examples/quota_watermark/qwctl/commands.h     |   12 -
 examples/quota_watermark/qwctl/qwctl.c        |   67 --
 examples/quota_watermark/qwctl/qwctl.h        |   12 -
 46 files changed, 17 insertions(+), 8502 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/exception_path.rst
 delete mode 100644 doc/guides/sample_app_ug/l3_forward_virtual.rst
 delete mode 100644 doc/guides/sample_app_ug/load_balancer.rst
 delete mode 100644 doc/guides/sample_app_ug/netmap_compatibility.rst
 delete mode 100644 doc/guides/sample_app_ug/quota_watermark.rst
 delete mode 100644 examples/exception_path/Makefile
 delete mode 100644 examples/exception_path/main.c
 delete mode 100644 examples/exception_path/meson.build
 delete mode 100644 examples/l3fwd-vf/Makefile
 delete mode 100644 examples/l3fwd-vf/main.c
 delete mode 100644 examples/l3fwd-vf/meson.build
 delete mode 100644 examples/load_balancer/Makefile
 delete mode 100644 examples/load_balancer/config.c
 delete mode 100644 examples/load_balancer/init.c
 delete mode 100644 examples/load_balancer/main.c
 delete mode 100644 examples/load_balancer/main.h
 delete mode 100644 examples/load_balancer/meson.build
 delete mode 100644 examples/load_balancer/runtime.c
 delete mode 100644 examples/netmap_compat/Makefile
 delete mode 100644 examples/netmap_compat/bridge/Makefile
 delete mode 100644 examples/netmap_compat/bridge/bridge.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.h
 delete mode 100644 examples/netmap_compat/meson.build
 delete mode 100644 examples/netmap_compat/netmap/netmap.h
 delete mode 100644 examples/netmap_compat/netmap/netmap_user.h
 delete mode 100644 examples/quota_watermark/Makefile
 delete mode 100644 examples/quota_watermark/include/conf.h
 delete mode 100644 examples/quota_watermark/meson.build
 delete mode 100644 examples/quota_watermark/qw/Makefile
 delete mode 100644 examples/quota_watermark/qw/args.c
 delete mode 100644 examples/quota_watermark/qw/args.h
 delete mode 100644 examples/quota_watermark/qw/init.c
 delete mode 100644 examples/quota_watermark/qw/init.h
 delete mode 100644 examples/quota_watermark/qw/main.c
 delete mode 100644 examples/quota_watermark/qw/main.h
 delete mode 100644 examples/quota_watermark/qwctl/Makefile
 delete mode 100644 examples/quota_watermark/qwctl/commands.c
 delete mode 100644 examples/quota_watermark/qwctl/commands.h
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.c
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.h
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/6 examples/exception_path: remove example from DPDK

The example app shows the use of TUN/TAP with DPDK, but DPDK has a built-in TAP PMD, so this example is obsolete and so can be removed.

---
 MAINTAINERS                                 |   3 -
 doc/guides/sample_app_ug/exception_path.rst | 281 ----------
 doc/guides/sample_app_ug/index.rst          |   1 -
 doc/guides/sample_app_ug/intro.rst          |   2 +-
 examples/Makefile                           |   1 -
 examples/exception_path/Makefile            |  57 --
 examples/exception_path/main.c              | 589 --------------------
 examples/exception_path/meson.build         |  11 -
 examples/meson.build                        |   2 +-
 9 files changed, 2 insertions(+), 945 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/exception_path.rst
 delete mode 100644 examples/exception_path/Makefile
 delete mode 100644 examples/exception_path/main.c
 delete mode 100644 examples/exception_path/meson.build
MAINTAINERS +0 -3
index b3d9aaddd..330a4d77d 100644
@@ -1427,9 +1427,6 @@ Other Example Applications
 F: examples/ethtool/
 F: doc/guides/sample_app_ug/ethtool.rst
 
-F: examples/exception_path/
-F: doc/guides/sample_app_ug/exception_path.rst
-
 M: Marko Kovacevic <[email protected]>
 F: examples/fips_validation/
 F: doc/guides/sample_app_ug/fips_validation.rst
doc/guides/sample_app_ug/exception_path.rst deleted +0 -281

281 lines not on this page · raw message

doc/guides/sample_app_ug/index.rst +0 -1
index f23f8f59e..076346a60 100644
@@ -12,7 +12,6 @@ Sample Applications User Guides
     compiling
     cmd_line
     ethtool
-    exception_path
     hello_world
     skeleton
     rxtx_callbacks
doc/guides/sample_app_ug/intro.rst +1 -1
index 90704194a..7299253bf 100644
@@ -39,7 +39,7 @@ applications that are available in the examples directory of DPDK:
     +---------------------------------------+--------------------------------------+
     | Ethtool                               | Precision Time Protocol (PTP) Client |
     +---------------------------------------+--------------------------------------+
-    | Exception Path                        | Quality of Service (QoS) Metering    |
+    |                                       | Quality of Service (QoS) Metering    |
     +---------------------------------------+--------------------------------------+
     | Hello World                           | QoS Scheduler                        |
     +---------------------------------------+--------------------------------------+
examples/Makefile +0 -1
index de11dd487..c756497d1 100644
@@ -17,7 +17,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_POWER),y)
 DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor
 endif
 DIRS-y += ethtool
-DIRS-y += exception_path
 DIRS-$(CONFIG_RTE_LIBRTE_EFD) += server_node_efd
 DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += fips_validation
 DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += flow_classify
examples/exception_path/Makefile deleted +0 -57

57 lines not on this page · raw message

examples/exception_path/main.c deleted +0 -589

589 lines not on this page · raw message

examples/exception_path/meson.build deleted +0 -11
deleted file mode 100644
index c34e11e36..000000000
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-sources = files(
-	'main.c'
-)
examples/meson.build +1 -1
index a046b74ad..4663d9dea 100644
@@ -13,7 +13,7 @@ all_examples = [
 	'bbdev_app', 'bond',
 	'bpf', 'cmdline',
 	'distributor', 'ethtool',
-	'eventdev_pipeline', 'exception_path',
+	'eventdev_pipeline',
 	'fips_validation', 'flow_classify',
 	'flow_filtering', 'helloworld',
 	'ip_fragmentation', 'ip_pipeline',
Signature · 1 line
2.21.0
#2 lore raw

PATCH 2/6 examples/l3fwd-vf: remove example from DPDK

In reply to Bruce Richardson

The main l3fwd app should work with both PF and VF devices, so remove the VF-only l3fwd example.

---
 MAINTAINERS                                   |    3 -
 doc/guides/sample_app_ug/index.rst            |    1 -
 .../sample_app_ug/l3_forward_virtual.rst      |   98 --
 examples/Makefile                             |    1 -
 examples/l3fwd-vf/Makefile                    |   62 -
 examples/l3fwd-vf/main.c                      | 1072 -----------------
 examples/l3fwd-vf/meson.build                 |   12 -
 examples/meson.build                          |    2 +-
 8 files changed, 1 insertion(+), 1250 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/l3_forward_virtual.rst
 delete mode 100644 examples/l3fwd-vf/Makefile
 delete mode 100644 examples/l3fwd-vf/main.c
 delete mode 100644 examples/l3fwd-vf/meson.build
MAINTAINERS +0 -3
index 330a4d77d..92c3f6af4 100644
@@ -1458,9 +1458,6 @@ F: examples/l2fwd-cat/
 F: examples/l3fwd/
 F: doc/guides/sample_app_ug/l3_forward.rst
 
-F: examples/l3fwd-vf/
-F: doc/guides/sample_app_ug/l3_forward_virtual.rst
-
 F: examples/link_status_interrupt/
 F: doc/guides/sample_app_ug/link_status_intr.rst
 
doc/guides/sample_app_ug/index.rst +0 -1
index 076346a60..d212f81fe 100644
@@ -29,7 +29,6 @@ Sample Applications User Guides
     l3_forward
     l3_forward_power_man
     l3_forward_access_ctrl
-    l3_forward_virtual
     link_status_intr
     load_balancer
     server_node_efd
doc/guides/sample_app_ug/l3_forward_virtual.rst deleted +0 -98

98 lines not on this page · raw message

examples/Makefile +0 -1
index c756497d1..5dd8a72e5 100644
@@ -46,7 +46,6 @@ endif
 DIRS-$(CONFIG_RTE_LIBRTE_ACL) += l3fwd-acl
 ifeq ($(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_HASH),yy)
 DIRS-$(CONFIG_RTE_LIBRTE_POWER) += l3fwd-power
-DIRS-y += l3fwd-vf
 endif
 DIRS-y += link_status_interrupt
 DIRS-$(CONFIG_RTE_LIBRTE_LPM) += load_balancer
examples/l3fwd-vf/Makefile deleted +0 -62

62 lines not on this page · raw message

examples/l3fwd-vf/main.c deleted +0 -1072

1,072 lines not on this page · raw message

examples/l3fwd-vf/meson.build deleted +0 -12
deleted file mode 100644
index 226286e74..000000000
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-deps += ['lpm', 'hash']
-sources = files(
-	'main.c'
-)
examples/meson.build +1 -1
index 4663d9dea..81ac8199a 100644
@@ -23,7 +23,7 @@ all_examples = [
 	'l2fwd-crypto', 'l2fwd-jobstats',
 	'l2fwd-keepalive', 'l3fwd',
 	'l3fwd-acl', 'l3fwd-power',
-	'l3fwd-vf', 'link_status_interrupt',
+	'link_status_interrupt',
 	'load_balancer',
 	'multi_process/client_server_mp/mp_client',
 	'multi_process/client_server_mp/mp_server',
Signature · 1 line
2.21.0
#3 lore raw

PATCH 3/6 examples/quota-watermark: remove example from DPDK

In reply to Bruce Richardson

From: Ciara Power <[email protected]>

Original DPDK rings code had explicit support for a single watermark per-ring, but more recent releases of DPDK had a more general mechanism where each enqueue or dequeue call could return the remaining elements/free-slots in the ring. Therefore, this example is not as relevant as before and can be removed.

---
 MAINTAINERS                                  |   3 -
 doc/guides/sample_app_ug/index.rst           |   1 -
 doc/guides/sample_app_ug/intro.rst           |   2 +-
 doc/guides/sample_app_ug/quota_watermark.rst | 465 -------------------
 examples/Makefile                            |   1 -
 examples/meson.build                         |   2 +-
 examples/quota_watermark/Makefile            |  16 -
 examples/quota_watermark/include/conf.h      |  19 -
 examples/quota_watermark/meson.build         |  10 -
 examples/quota_watermark/qw/Makefile         |  22 -
 examples/quota_watermark/qw/args.c           |  78 ----
 examples/quota_watermark/qw/args.h           |  12 -
 examples/quota_watermark/qw/init.c           | 164 -------
 examples/quota_watermark/qw/init.h           |  14 -
 examples/quota_watermark/qw/main.c           | 365 ---------------
 examples/quota_watermark/qw/main.h           |  31 --
 examples/quota_watermark/qwctl/Makefile      |  22 -
 examples/quota_watermark/qwctl/commands.c    | 196 --------
 examples/quota_watermark/qwctl/commands.h    |  12 -
 examples/quota_watermark/qwctl/qwctl.c       |  67 ---
 examples/quota_watermark/qwctl/qwctl.h       |  12 -
 21 files changed, 2 insertions(+), 1512 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/quota_watermark.rst
 delete mode 100644 examples/quota_watermark/Makefile
 delete mode 100644 examples/quota_watermark/include/conf.h
 delete mode 100644 examples/quota_watermark/meson.build
 delete mode 100644 examples/quota_watermark/qw/Makefile
 delete mode 100644 examples/quota_watermark/qw/args.c
 delete mode 100644 examples/quota_watermark/qw/args.h
 delete mode 100644 examples/quota_watermark/qw/init.c
 delete mode 100644 examples/quota_watermark/qw/init.h
 delete mode 100644 examples/quota_watermark/qw/main.c
 delete mode 100644 examples/quota_watermark/qw/main.h
 delete mode 100644 examples/quota_watermark/qwctl/Makefile
 delete mode 100644 examples/quota_watermark/qwctl/commands.c
 delete mode 100644 examples/quota_watermark/qwctl/commands.h
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.c
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.h
MAINTAINERS +0 -3
index 92c3f6af4..7be363327 100644
@@ -1474,9 +1474,6 @@ F: doc/guides/sample_app_ug/performance_thread.rst
 
 F: examples/ptpclient/
 
-F: examples/quota_watermark/
-F: doc/guides/sample_app_ug/quota_watermark.rst
-
 M: Bruce Richardson <[email protected]>
 M: John McNamara <[email protected]>
 F: examples/rxtx_callbacks/
doc/guides/sample_app_ug/index.rst +0 -1
index d212f81fe..dafe8553f 100644
@@ -36,7 +36,6 @@ Sample Applications User Guides
     multi_process
     qos_metering
     qos_scheduler
-    quota_watermark
     timer
     packet_ordering
     vmdq_dcb_forwarding
doc/guides/sample_app_ug/intro.rst +1 -1
index 7299253bf..6e0af6301 100644
@@ -43,7 +43,7 @@ applications that are available in the examples directory of DPDK:
     +---------------------------------------+--------------------------------------+
     | Hello World                           | QoS Scheduler                        |
     +---------------------------------------+--------------------------------------+
-    | Internet Protocol (IP) Fragmentation  | Quota and Watermark                  |
+    | Internet Protocol (IP) Fragmentation  |                                      |
     +---------------------------------------+--------------------------------------+
     | IP Pipeline                           | RX/TX Callbacks                      |
     +---------------------------------------+--------------------------------------+
doc/guides/sample_app_ug/quota_watermark.rst deleted +0 -465

465 lines not on this page · raw message

examples/Makefile +0 -1
index 5dd8a72e5..02ff86534 100644
@@ -59,7 +59,6 @@ endif
 DIRS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ptpclient
 DIRS-$(CONFIG_RTE_LIBRTE_METER) += qos_meter
 DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += qos_sched
-DIRS-y += quota_watermark
 DIRS-$(CONFIG_RTE_ETHDEV_RXTX_CALLBACKS) += rxtx_callbacks
 DIRS-y += service_cores
 DIRS-y += skeleton
examples/meson.build +1 -1
index 81ac8199a..6c26fffb4 100644
@@ -33,7 +33,7 @@ all_examples = [
 	'netmap_compat', 'ntb', 'packet_ordering',
 	'performance-thread', 'ptpclient',
 	'qos_meter', 'qos_sched',
-	'quota_watermark', 'rxtx_callbacks',
+	'rxtx_callbacks',
 	'server_node_efd', 'service_cores',
 	'skeleton', 'tep_termination',
 	'timer', 'vdpa',
examples/quota_watermark/Makefile deleted +0 -16
deleted file mode 100644
index 8ef053198..000000000
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += qw
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += qwctl
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
examples/quota_watermark/include/conf.h deleted +0 -19
deleted file mode 100644
index 4f29aa64b..000000000
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _CONF_H_
-#define _CONF_H_
-
-#define RING_SIZE 1024
-#define MAX_PKT_QUOTA 64
-
-#define RX_DESC_PER_QUEUE   1024
-#define TX_DESC_PER_QUEUE   1024
-
-#define MBUF_DATA_SIZE     RTE_MBUF_DEFAULT_BUF_SIZE
-#define MBUF_PER_POOL 8192
-
-#define QUOTA_WATERMARK_MEMZONE_NAME "qw_global_vars"
-
-#endif /* _CONF_H_ */
examples/quota_watermark/meson.build deleted +0 -10
deleted file mode 100644
index c370d7476..000000000
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-# Example app currently unsupported by meson build
-build = false
examples/quota_watermark/qw/Makefile deleted +0 -22
deleted file mode 100644
index 3f10f01c3..000000000
@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = qw
-
-# all source are stored in SRCS-y
-SRCS-y := args.c init.c main.c
-
-CFLAGS += -O3 -DQW_SOFTWARE_FC
-CFLAGS += $(WERROR_FLAGS)
-
-include $(RTE_SDK)/mk/rte.extapp.mk
examples/quota_watermark/qw/args.c deleted +0 -78

78 lines not on this page · raw message

examples/quota_watermark/qw/args.h deleted +0 -12
deleted file mode 100644
index ab777db01..000000000
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _ARGS_H_
-#define _ARGS_H_
-
-extern unsigned int portmask;
-
-int parse_qw_args(int argc, char **argv);
-
-#endif /* _ARGS_H_ */
examples/quota_watermark/qw/init.c deleted +0 -164

164 lines not on this page · raw message

examples/quota_watermark/qw/init.h deleted +0 -14
deleted file mode 100644
index e0c90df72..000000000
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _INIT_H_
-#define _INIT_H_
-
-void configure_eth_port(uint16_t port_id);
-void init_dpdk(void);
-void init_ring(int lcore_id, uint16_t port_id);
-void pair_ports(void);
-void setup_shared_variables(void);
-
-#endif /* _INIT_H_ */
examples/quota_watermark/qw/main.c deleted +0 -365

365 lines not on this page · raw message

examples/quota_watermark/qw/main.h deleted +0 -31
deleted file mode 100644
index 9903ddc8c..000000000
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _MAIN_H_
-#define _MAIN_H_
-
-#include "../include/conf.h"
-
-enum ring_state {
-	RING_READY,
-	RING_OVERLOADED,
-};
-
-extern int *quota;
-extern unsigned int *low_watermark;
-extern unsigned int *high_watermark;
-
-extern uint16_t port_pairs[RTE_MAX_ETHPORTS];
-
-extern struct rte_ring *rings[RTE_MAX_LCORE][RTE_MAX_ETHPORTS];
-extern struct rte_mempool *mbuf_pool;
-
-
-static inline int
-is_bit_set(int i, unsigned int mask)
-{
-	return (1 << i) & mask;
-}
-
-#endif /* _MAIN_H_ */
examples/quota_watermark/qwctl/Makefile deleted +0 -22
deleted file mode 100644
index a40f28025..000000000
@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = qwctl
-
-# all source are stored in SRCS-y
-SRCS-y := commands.c qwctl.c
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-include $(RTE_SDK)/mk/rte.extapp.mk
examples/quota_watermark/qwctl/commands.c deleted +0 -196

196 lines not on this page · raw message

examples/quota_watermark/qwctl/commands.h deleted +0 -12
deleted file mode 100644
index 4a4e97475..000000000
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _COMMANDS_H_
-#define _COMMANDS_H_
-
-#include <cmdline_parse.h>
-
-extern cmdline_parse_ctx_t qwctl_ctx[];
-
-#endif /* _COMMANDS_H_ */
examples/quota_watermark/qwctl/qwctl.c deleted +0 -67

67 lines not on this page · raw message

examples/quota_watermark/qwctl/qwctl.h deleted +0 -12
deleted file mode 100644
index 2a4559388..000000000
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _MAIN_H_
-#define _MAIN_H_
-
-extern int *quota;
-extern unsigned int *low_watermark;
-extern unsigned int *high_watermark;
-
-#endif /* _MAIN_H_ */
Signature · 1 line
2.21.0
#4 lore raw

PATCH 4/6 examples/netmap-compat: remove example from DPDK

In reply to Bruce Richardson

From: Ciara Power <[email protected]>

Rather than providing a shim layer on top of netmap, we should instead encourage users to create apps using the DPDK APIs directly.

---
 MAINTAINERS                                   |   3 -
 doc/guides/sample_app_ug/index.rst            |   1 -
 doc/guides/sample_app_ug/intro.rst            |   2 +-
 .../sample_app_ug/netmap_compatibility.rst    | 130 ---
 examples/Makefile                             |   1 -
 examples/meson.build                          |   2 +-
 examples/netmap_compat/Makefile               |  22 -
 examples/netmap_compat/bridge/Makefile        |  35 -
 examples/netmap_compat/bridge/bridge.c        | 343 -------
 examples/netmap_compat/lib/compat_netmap.c    | 899 ------------------
 examples/netmap_compat/lib/compat_netmap.h    |  51 -
 examples/netmap_compat/meson.build            |  10 -
 examples/netmap_compat/netmap/netmap.h        | 289 ------
 examples/netmap_compat/netmap/netmap_user.h   |  95 --
 14 files changed, 2 insertions(+), 1881 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/netmap_compatibility.rst
 delete mode 100644 examples/netmap_compat/Makefile
 delete mode 100644 examples/netmap_compat/bridge/Makefile
 delete mode 100644 examples/netmap_compat/bridge/bridge.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.h
 delete mode 100644 examples/netmap_compat/meson.build
 delete mode 100644 examples/netmap_compat/netmap/netmap.h
 delete mode 100644 examples/netmap_compat/netmap/netmap_user.h
MAINTAINERS +0 -3
index 7be363327..6b9fa4dc2 100644
@@ -1464,9 +1464,6 @@ F: doc/guides/sample_app_ug/link_status_intr.rst
 F: examples/load_balancer/
 F: doc/guides/sample_app_ug/load_balancer.rst
 
-F: examples/netmap_compat/
-F: doc/guides/sample_app_ug/netmap_compatibility.rst
-
 L-threads - EXPERIMENTAL
 M: John McNamara <[email protected]>
 F: examples/performance-thread/
doc/guides/sample_app_ug/index.rst +0 -1
index dafe8553f..5f4924df6 100644
@@ -43,7 +43,6 @@ Sample Applications User Guides
     vhost_scsi
     vhost_crypto
     vdpa
-    netmap_compatibility
     ip_pipeline
     test_pipeline
     eventdev_pipeline
doc/guides/sample_app_ug/intro.rst +1 -1
index 6e0af6301..39af887da 100644
@@ -31,7 +31,7 @@ applications that are available in the examples directory of DPDK:
  .. table:: **Some of the DPDK Sample applications**
 
     +---------------------------------------+--------------------------------------+
-    | Bonding                               | Netmap Compatibility                 |
+    | Bonding                               |                                      |
     +---------------------------------------+--------------------------------------+
     | Command Line                          | Packet Ordering                      |
     +---------------------------------------+--------------------------------------+
doc/guides/sample_app_ug/netmap_compatibility.rst deleted +0 -130

130 lines not on this page · raw message

examples/Makefile +0 -1
index 02ff86534..6bba09ce9 100644
@@ -50,7 +50,6 @@ endif
 DIRS-y += link_status_interrupt
 DIRS-$(CONFIG_RTE_LIBRTE_LPM) += load_balancer
 DIRS-y += multi_process
-DIRS-y += netmap_compat/bridge
 DIRS-y += ntb
 DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += packet_ordering
 ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
examples/meson.build +1 -1
index 6c26fffb4..f0356f2a1 100644
@@ -30,7 +30,7 @@ all_examples = [
 	'multi_process/hotplug_mp',
 	'multi_process/simple_mp',
 	'multi_process/symmetric_mp',
-	'netmap_compat', 'ntb', 'packet_ordering',
+	'ntb', 'packet_ordering',
 	'performance-thread', 'ptpclient',
 	'qos_meter', 'qos_sched',
 	'rxtx_callbacks',
examples/netmap_compat/Makefile deleted +0 -22
deleted file mode 100644
index b9f78d173..000000000
@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-unexport RTE_SRCDIR RTE_OUTPUT RTE_EXTMK
-
-DIRS-y += bridge
-
-.PHONY: all clean $(DIRS-y)
-
-all: $(DIRS-y)
-clean: $(DIRS-y)
-
-$(DIRS-y):
-	$(MAKE) -C $@ $(MAKECMDGOALS) O=$(RTE_OUTPUT)
examples/netmap_compat/bridge/Makefile deleted +0 -35
deleted file mode 100644
index 7ed30e57b..000000000
@@ -1,35 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define the RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-$(info This application can only operate in a linux environment, \
-please change the definition of the RTE_TARGET environment variable)
-all:
-clean:
-else
-
-# binary name
-APP = bridge
-
-# for compat_netmap.c
-VPATH := $(SRCDIR)/../lib
-
-# all source are stored in SRCS-y
-SRCS-y := bridge.c
-SRCS-y += compat_netmap.c
-
-CFLAGS += -O3 -I$(SRCDIR)/../lib -I$(SRCDIR)/../netmap
-CFLAGS += $(WERROR_FLAGS)
-
-include $(RTE_SDK)/mk/rte.extapp.mk
-
-endif
examples/netmap_compat/bridge/bridge.c deleted +0 -343

343 lines not on this page · raw message

examples/netmap_compat/lib/compat_netmap.c deleted +0 -899

899 lines not on this page · raw message

examples/netmap_compat/lib/compat_netmap.h deleted +0 -51

51 lines not on this page · raw message

examples/netmap_compat/meson.build deleted +0 -10
deleted file mode 100644
index c370d7476..000000000
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-# Example app currently unsupported by meson build
-build = false
examples/netmap_compat/netmap/netmap.h deleted +0 -289

289 lines not on this page · raw message

examples/netmap_compat/netmap/netmap_user.h deleted +0 -95

95 lines not on this page · raw message

Signature · 1 line
2.21.0
#5 lore raw

PATCH 5/6 examples/load_balancer: remove example from DPDK

In reply to Bruce Richardson

From: Ciara Power <[email protected]>

This example can be removed because DPDK now has a range of libraries, especially rte_eventdev, that did not exist previously for load balancing, making this less relevant. Also, modern NIC cards have greater ability to do load balancing, e.g. using RSS, over a wider range of fields than earlier cards did.

---
 MAINTAINERS                                |    3 -
 doc/guides/sample_app_ug/index.rst         |    1 -
 doc/guides/sample_app_ug/intro.rst         |    2 +-
 doc/guides/sample_app_ug/load_balancer.rst |  201 ----
 examples/Makefile                          |    1 -
 examples/load_balancer/Makefile            |   62 --
 examples/load_balancer/config.c            | 1030 --------------------
 examples/load_balancer/init.c              |  520 ----------
 examples/load_balancer/main.c              |   76 --
 examples/load_balancer/main.h              |  351 -------
 examples/load_balancer/meson.build         |   12 -
 examples/load_balancer/runtime.c           |  642 ------------
 examples/meson.build                       |    1 -
 13 files changed, 1 insertion(+), 2901 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/load_balancer.rst
 delete mode 100644 examples/load_balancer/Makefile
 delete mode 100644 examples/load_balancer/config.c
 delete mode 100644 examples/load_balancer/init.c
 delete mode 100644 examples/load_balancer/main.c
 delete mode 100644 examples/load_balancer/main.h
 delete mode 100644 examples/load_balancer/meson.build
 delete mode 100644 examples/load_balancer/runtime.c
MAINTAINERS +0 -3
index 6b9fa4dc2..3db771bd7 100644
@@ -1461,9 +1461,6 @@ F: doc/guides/sample_app_ug/l3_forward.rst
 F: examples/link_status_interrupt/
 F: doc/guides/sample_app_ug/link_status_intr.rst
 
-F: examples/load_balancer/
-F: doc/guides/sample_app_ug/load_balancer.rst
-
 L-threads - EXPERIMENTAL
 M: John McNamara <[email protected]>
 F: examples/performance-thread/
doc/guides/sample_app_ug/index.rst +0 -1
index 5f4924df6..191eebb56 100644
@@ -30,7 +30,6 @@ Sample Applications User Guides
     l3_forward_power_man
     l3_forward_access_ctrl
     link_status_intr
-    load_balancer
     server_node_efd
     service_cores
     multi_process
doc/guides/sample_app_ug/intro.rst +1 -1
index 39af887da..981e50f94 100644
@@ -61,7 +61,7 @@ applications that are available in the examples directory of DPDK:
     +---------------------------------------+--------------------------------------+
     | Link Status Interrupt                 | VMDQ Forwarding                      |
     +---------------------------------------+--------------------------------------+
-    | Load Balancer                         | VMDQ and DCB Forwarding              |
+    |                                       | VMDQ and DCB Forwarding              |
     +---------------------------------------+--------------------------------------+
     | Multi-process                         | VM Power Management                  |
     +---------------------------------------+--------------------------------------+
doc/guides/sample_app_ug/load_balancer.rst deleted +0 -201

201 lines not on this page · raw message

examples/Makefile +0 -1
index 6bba09ce9..62d0865c5 100644
@@ -48,7 +48,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_HASH),yy)
 DIRS-$(CONFIG_RTE_LIBRTE_POWER) += l3fwd-power
 endif
 DIRS-y += link_status_interrupt
-DIRS-$(CONFIG_RTE_LIBRTE_LPM) += load_balancer
 DIRS-y += multi_process
 DIRS-y += ntb
 DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += packet_ordering
examples/load_balancer/Makefile deleted +0 -62

62 lines not on this page · raw message

examples/load_balancer/config.c deleted +0 -1030

1,030 lines not on this page · raw message

examples/load_balancer/init.c deleted +0 -520

520 lines not on this page · raw message

examples/load_balancer/main.c deleted +0 -76

76 lines not on this page · raw message

examples/load_balancer/main.h deleted +0 -351

351 lines not on this page · raw message

examples/load_balancer/meson.build deleted +0 -12
deleted file mode 100644
index 4f7ac3999..000000000
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-deps += 'lpm'
-sources = files(
-	'config.c', 'init.c', 'main.c', 'runtime.c'
-)
examples/load_balancer/runtime.c deleted +0 -642

642 lines not on this page · raw message

examples/meson.build +0 -1
index f0356f2a1..e4580f74a 100644
@@ -24,7 +24,6 @@ all_examples = [
 	'l2fwd-keepalive', 'l3fwd',
 	'l3fwd-acl', 'l3fwd-power',
 	'link_status_interrupt',
-	'load_balancer',
 	'multi_process/client_server_mp/mp_client',
 	'multi_process/client_server_mp/mp_server',
 	'multi_process/hotplug_mp',
Signature · 1 line
2.21.0
#6 lore raw

PATCH 6/6 doc: close up gaps in sample app guide table

In reply to Bruce Richardson

Following the removal of some sample applications, close up the gaps introduced in the table so that it is formatted nicely for the next release.

---
 doc/guides/sample_app_ug/intro.rst | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)
doc/guides/sample_app_ug/intro.rst +13 -17
index 981e50f94..dcfe70db2 100644
@@ -31,37 +31,33 @@ applications that are available in the examples directory of DPDK:
  .. table:: **Some of the DPDK Sample applications**
 
     +---------------------------------------+--------------------------------------+
-    | Bonding                               |                                      |
+    | Bonding                               | Packet Ordering                      |
     +---------------------------------------+--------------------------------------+
-    | Command Line                          | Packet Ordering                      |
+    | Command Line                          | Performance Thread                   |
     +---------------------------------------+--------------------------------------+
-    | Distributor                           | Performance Thread                   |
+    | Distributor                           | Precision Time Protocol (PTP) Client |
     +---------------------------------------+--------------------------------------+
-    | Ethtool                               | Precision Time Protocol (PTP) Client |
-    +---------------------------------------+--------------------------------------+
-    |                                       | Quality of Service (QoS) Metering    |
+    | Ethtool                               | Quality of Service (QoS) Metering    |
     +---------------------------------------+--------------------------------------+
     | Hello World                           | QoS Scheduler                        |
     +---------------------------------------+--------------------------------------+
-    | Internet Protocol (IP) Fragmentation  |                                      |
-    +---------------------------------------+--------------------------------------+
-    | IP Pipeline                           | RX/TX Callbacks                      |
+    | Internet Protocol (IP) Fragmentation  | RX/TX Callbacks                      |
     +---------------------------------------+--------------------------------------+
-    | IP Reassembly                         | Server node EFD                      |
+    | IP Pipeline                           | Server node EFD                      |
     +---------------------------------------+--------------------------------------+
-    | IPsec Security Gateway                | Basic Forwarding/Skeleton App        |
+    | IP Reassembly                         | Basic Forwarding/Skeleton App        |
     +---------------------------------------+--------------------------------------+
-    | IPv4 multicast                        | Tunnel End Point (TEP) termination   |
+    | IPsec Security Gateway                | Tunnel End Point (TEP) termination   |
     +---------------------------------------+--------------------------------------+
-    | Kernel NIC Interface                  | Timer                                |
+    | IPv4 multicast                        | Timer                                |
     +---------------------------------------+--------------------------------------+
-    | Network Layer 2 Forwarding + variants | Vhost                                |
+    | Kernel NIC Interface                  | Vhost                                |
     +---------------------------------------+--------------------------------------+
-    | Network Layer 3 Forwarding + variants | Vhost Xen                            |
+    | Network Layer 2 Forwarding + variants | Vhost Xen                            |
     +---------------------------------------+--------------------------------------+
-    | Link Status Interrupt                 | VMDQ Forwarding                      |
+    | Network Layer 3 Forwarding + variants | VMDQ Forwarding                      |
     +---------------------------------------+--------------------------------------+
-    |                                       | VMDQ and DCB Forwarding              |
+    | Link Status Interrupt                 | VMDQ and DCB Forwarding              |
     +---------------------------------------+--------------------------------------+
     | Multi-process                         | VM Power Management                  |
     +---------------------------------------+--------------------------------------+
Signature · 1 line
2.21.0
#7 lore raw

Re: [dpdk-dev] [PATCH 6/6] doc: close up gaps in sample app guide table

03/10/2019 15:19, Bruce Richardson:

Quoted 5 lines

Following the removal of some sample applications, close up the gaps introduced in the table so that it is formatted nicely for the next release.

I don't think we should maintain such table. Either it is a normal list, or we drop the whole listing.

Quoted 50 lines

.. table:: **Some of the DPDK Sample applications**

     +---------------------------------------+--------------------------------------+
doc/guides/sample_app_ug/intro.rst +13 -17
-    | Bonding                               |                                      |
+    | Bonding                               | Packet Ordering                      |
     +---------------------------------------+--------------------------------------+
-    | Command Line                          | Packet Ordering                      |
+    | Command Line                          | Performance Thread                   |
     +---------------------------------------+--------------------------------------+
-    | Distributor                           | Performance Thread                   |
+    | Distributor                           | Precision Time Protocol (PTP) Client |
     +---------------------------------------+--------------------------------------+
-    | Ethtool                               | Precision Time Protocol (PTP) Client |
-    +---------------------------------------+--------------------------------------+
-    |                                       | Quality of Service (QoS) Metering    |
+    | Ethtool                               | Quality of Service (QoS) Metering    |
     +---------------------------------------+--------------------------------------+
     | Hello World                           | QoS Scheduler                        |
     +---------------------------------------+--------------------------------------+
-    | Internet Protocol (IP) Fragmentation  |                                      |
-    +---------------------------------------+--------------------------------------+
-    | IP Pipeline                           | RX/TX Callbacks                      |
+    | Internet Protocol (IP) Fragmentation  | RX/TX Callbacks                      |
     +---------------------------------------+--------------------------------------+
-    | IP Reassembly                         | Server node EFD                      |
+    | IP Pipeline                           | Server node EFD                      |
     +---------------------------------------+--------------------------------------+
-    | IPsec Security Gateway                | Basic Forwarding/Skeleton App        |
+    | IP Reassembly                         | Basic Forwarding/Skeleton App        |
     +---------------------------------------+--------------------------------------+
-    | IPv4 multicast                        | Tunnel End Point (TEP) termination   |
+    | IPsec Security Gateway                | Tunnel End Point (TEP) termination   |
     +---------------------------------------+--------------------------------------+
-    | Kernel NIC Interface                  | Timer                                |
+    | IPv4 multicast                        | Timer                                |
     +---------------------------------------+--------------------------------------+
-    | Network Layer 2 Forwarding + variants | Vhost                                |
+    | Kernel NIC Interface                  | Vhost                                |
     +---------------------------------------+--------------------------------------+
-    | Network Layer 3 Forwarding + variants | Vhost Xen                            |
+    | Network Layer 2 Forwarding + variants | Vhost Xen                            |
     +---------------------------------------+--------------------------------------+
-    | Link Status Interrupt                 | VMDQ Forwarding                      |
+    | Network Layer 3 Forwarding + variants | VMDQ Forwarding                      |
     +---------------------------------------+--------------------------------------+
-    |                                       | VMDQ and DCB Forwarding              |
+    | Link Status Interrupt                 | VMDQ and DCB Forwarding              |
     +---------------------------------------+--------------------------------------+
     | Multi-process                         | VM Power Management                  |
     +---------------------------------------+--------------------------------------+
Acked-by on the v1 series
#8 lore raw
In reply to Bruce Richardson
Quoted 111 lines · On Thu, 3 Oct 2019 14:19:12 +0100 Bruce Richardson…

As discussed by the DPDK technical board e.g. [1][2] and on the DPDK mailing list [3], we have a lot of example applications shipped with DPDK - a number which increases with each DPDK release, and not all of which are probably needed any more. Therefore, this set removes 5 example applications from the repository.

The removal of each app is relatively straight-forward, though the use of a table in the intro section of the sample app guide document makes removing each app individually more difficult, as the table needs to be reformed. Rather than increasing the diff by reformatting the table each time, or the opposite approach of doing all table removals in one shot at the end of the set, we have taken a compromise approach here, and each example table entry is cleared once the example is removed, and the table is finally rebalanced once at the end, by just compressing up the spaces on each side.

[1] https://mails.dpdk.org/archives/dev/2019-May/132288.html
[2] https://mails.dpdk.org/archives/dev/2019-June/135847.html
[3] https://mails.dpdk.org/archives/dev/2019-July/138676.html

Bruce Richardson (3):
examples/exception_path: remove example from DPDK examples/l3fwd-vf: remove example from DPDK
doc: close up gaps in sample app guide table

Ciara Power (3):
examples/quota-watermark: remove example from DPDK examples/netmap-compat: remove example from DPDK examples/load_balancer: remove example from DPDK

 MAINTAINERS                                   |   15 -
 doc/guides/sample_app_ug/exception_path.rst   |  281 -----
 doc/guides/sample_app_ug/index.rst            |    5 -
 doc/guides/sample_app_ug/intro.rst            |   30 +-
 .../sample_app_ug/l3_forward_virtual.rst      |   98 --
 doc/guides/sample_app_ug/load_balancer.rst    |  201 ----
 .../sample_app_ug/netmap_compatibility.rst    |  130 --
 doc/guides/sample_app_ug/quota_watermark.rst  |  465 -------
 examples/Makefile                             |    5 -
 examples/exception_path/Makefile              |   57 -
 examples/exception_path/main.c                |  589 ---------
 examples/exception_path/meson.build           |   11 -
 examples/l3fwd-vf/Makefile                    |   62 -
 examples/l3fwd-vf/main.c                      | 1072 -----------------
 examples/l3fwd-vf/meson.build                 |   12 -
 examples/load_balancer/Makefile               |   62 -
 examples/load_balancer/config.c               | 1030 ----------------
 examples/load_balancer/init.c                 |  520 --------
 examples/load_balancer/main.c                 |   76 --
 examples/load_balancer/main.h                 |  351 ------
 examples/load_balancer/meson.build            |   12 -
 examples/load_balancer/runtime.c              |  642 ----------
 examples/meson.build                          |    9 +-
 examples/netmap_compat/Makefile               |   22 -
 examples/netmap_compat/bridge/Makefile        |   35 -
 examples/netmap_compat/bridge/bridge.c        |  343 ------
 examples/netmap_compat/lib/compat_netmap.c    |  899 --------------
 examples/netmap_compat/lib/compat_netmap.h    |   51 -
 examples/netmap_compat/meson.build            |   10 -
 examples/netmap_compat/netmap/netmap.h        |  289 -----
 examples/netmap_compat/netmap/netmap_user.h   |   95 --
 examples/quota_watermark/Makefile             |   16 -
 examples/quota_watermark/include/conf.h       |   19 -
 examples/quota_watermark/meson.build          |   10 -
 examples/quota_watermark/qw/Makefile          |   22 -
 examples/quota_watermark/qw/args.c            |   78 --
 examples/quota_watermark/qw/args.h            |   12 -
 examples/quota_watermark/qw/init.c            |  164 ---
 examples/quota_watermark/qw/init.h            |   14 -
 examples/quota_watermark/qw/main.c            |  365 ------
 examples/quota_watermark/qw/main.h            |   31 -
 examples/quota_watermark/qwctl/Makefile       |   22 -
 examples/quota_watermark/qwctl/commands.c     |  196 ---
 examples/quota_watermark/qwctl/commands.h     |   12 -
 examples/quota_watermark/qwctl/qwctl.c        |   67 --
 examples/quota_watermark/qwctl/qwctl.h        |   12 -
 46 files changed, 17 insertions(+), 8502 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/exception_path.rst
 delete mode 100644 doc/guides/sample_app_ug/l3_forward_virtual.rst
 delete mode 100644 doc/guides/sample_app_ug/load_balancer.rst
 delete mode 100644 doc/guides/sample_app_ug/netmap_compatibility.rst
 delete mode 100644 doc/guides/sample_app_ug/quota_watermark.rst
 delete mode 100644 examples/exception_path/Makefile
 delete mode 100644 examples/exception_path/main.c
 delete mode 100644 examples/exception_path/meson.build
 delete mode 100644 examples/l3fwd-vf/Makefile
 delete mode 100644 examples/l3fwd-vf/main.c
 delete mode 100644 examples/l3fwd-vf/meson.build
 delete mode 100644 examples/load_balancer/Makefile
 delete mode 100644 examples/load_balancer/config.c
 delete mode 100644 examples/load_balancer/init.c
 delete mode 100644 examples/load_balancer/main.c
 delete mode 100644 examples/load_balancer/main.h
 delete mode 100644 examples/load_balancer/meson.build
 delete mode 100644 examples/load_balancer/runtime.c
 delete mode 100644 examples/netmap_compat/Makefile
 delete mode 100644 examples/netmap_compat/bridge/Makefile
 delete mode 100644 examples/netmap_compat/bridge/bridge.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.h
 delete mode 100644 examples/netmap_compat/meson.build
 delete mode 100644 examples/netmap_compat/netmap/netmap.h
 delete mode 100644 examples/netmap_compat/netmap/netmap_user.h
 delete mode 100644 examples/quota_watermark/Makefile
 delete mode 100644 examples/quota_watermark/include/conf.h
 delete mode 100644 examples/quota_watermark/meson.build
 delete mode 100644 examples/quota_watermark/qw/Makefile
 delete mode 100644 examples/quota_watermark/qw/args.c
 delete mode 100644 examples/quota_watermark/qw/args.h
 delete mode 100644 examples/quota_watermark/qw/init.c
Quoted 9 lines
 delete mode 100644 examples/quota_watermark/qw/init.h
 delete mode 100644 examples/quota_watermark/qw/main.c
 delete mode 100644 examples/quota_watermark/qw/main.h
 delete mode 100644 examples/quota_watermark/qwctl/Makefile
 delete mode 100644 examples/quota_watermark/qwctl/commands.c
 delete mode 100644 examples/quota_watermark/qwctl/commands.h
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.c
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.h

Ack for whole series, lets make this the smallest release

#10 lore raw

v2 cover remove a few example applications

In reply to Bruce Richardson

As discussed by the DPDK technical board e.g. [1][2] and on the DPDK mailing list [3], we have a lot of example applications shipped with DPDK - a number which increases with each DPDK release, and not all of which are probably needed any more. Therefore, this set removes 5 example applications from the repository.

v2: Remove the table listing sample applications

[1] https://mails.dpdk.org/archives/dev/2019-May/132288.html
[2] https://mails.dpdk.org/archives/dev/2019-June/135847.html
[3] https://mails.dpdk.org/archives/dev/2019-July/138676.html

Bruce Richardson (2):
examples/exception_path: remove example from DPDK examples/l3fwd-vf: remove example from DPDK

Ciara Power (4):
doc: remove unnecessary sample app guide table examples/quota-watermark: remove example from DPDK examples/netmap-compat: remove example from DPDK examples/load_balancer: remove example from DPDK

 MAINTAINERS                                   |   15 -
 doc/guides/sample_app_ug/exception_path.rst   |  281 -----
 doc/guides/sample_app_ug/index.rst            |    5 -
 doc/guides/sample_app_ug/intro.rst            |   44 +-
 .../sample_app_ug/l3_forward_virtual.rst      |   98 --
 doc/guides/sample_app_ug/load_balancer.rst    |  201 ----
 .../sample_app_ug/netmap_compatibility.rst    |  130 --
 doc/guides/sample_app_ug/quota_watermark.rst  |  465 -------
 examples/Makefile                             |    5 -
 examples/exception_path/Makefile              |   57 -
 examples/exception_path/main.c                |  589 ---------
 examples/exception_path/meson.build           |   11 -
 examples/l3fwd-vf/Makefile                    |   62 -
 examples/l3fwd-vf/main.c                      | 1072 -----------------
 examples/l3fwd-vf/meson.build                 |   12 -
 examples/load_balancer/Makefile               |   62 -
 examples/load_balancer/config.c               | 1030 ----------------
 examples/load_balancer/init.c                 |  520 --------
 examples/load_balancer/main.c                 |   76 --
 examples/load_balancer/main.h                 |  351 ------
 examples/load_balancer/meson.build            |   12 -
 examples/load_balancer/runtime.c              |  642 ----------
 examples/meson.build                          |    9 +-
 examples/netmap_compat/Makefile               |   22 -
 examples/netmap_compat/bridge/Makefile        |   35 -
 examples/netmap_compat/bridge/bridge.c        |  343 ------
 examples/netmap_compat/lib/compat_netmap.c    |  899 --------------
 examples/netmap_compat/lib/compat_netmap.h    |   51 -
 examples/netmap_compat/meson.build            |   10 -
 examples/netmap_compat/netmap/netmap.h        |  289 -----
 examples/netmap_compat/netmap/netmap_user.h   |   95 --
 examples/quota_watermark/Makefile             |   16 -
 examples/quota_watermark/include/conf.h       |   19 -
 examples/quota_watermark/meson.build          |   10 -
 examples/quota_watermark/qw/Makefile          |   22 -
 examples/quota_watermark/qw/args.c            |   78 --
 examples/quota_watermark/qw/args.h            |   12 -
 examples/quota_watermark/qw/init.c            |  164 ---
 examples/quota_watermark/qw/init.h            |   14 -
 examples/quota_watermark/qw/main.c            |  365 ------
 examples/quota_watermark/qw/main.h            |   31 -
 examples/quota_watermark/qwctl/Makefile       |   22 -
 examples/quota_watermark/qwctl/commands.c     |  196 ---
 examples/quota_watermark/qwctl/commands.h     |   12 -
 examples/quota_watermark/qwctl/qwctl.c        |   67 --
 examples/quota_watermark/qwctl/qwctl.h        |   12 -
 46 files changed, 5 insertions(+), 8528 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/exception_path.rst
 delete mode 100644 doc/guides/sample_app_ug/l3_forward_virtual.rst
 delete mode 100644 doc/guides/sample_app_ug/load_balancer.rst
 delete mode 100644 doc/guides/sample_app_ug/netmap_compatibility.rst
 delete mode 100644 doc/guides/sample_app_ug/quota_watermark.rst
 delete mode 100644 examples/exception_path/Makefile
 delete mode 100644 examples/exception_path/main.c
 delete mode 100644 examples/exception_path/meson.build
 delete mode 100644 examples/l3fwd-vf/Makefile
 delete mode 100644 examples/l3fwd-vf/main.c
 delete mode 100644 examples/l3fwd-vf/meson.build
 delete mode 100644 examples/load_balancer/Makefile
 delete mode 100644 examples/load_balancer/config.c
 delete mode 100644 examples/load_balancer/init.c
 delete mode 100644 examples/load_balancer/main.c
 delete mode 100644 examples/load_balancer/main.h
 delete mode 100644 examples/load_balancer/meson.build
 delete mode 100644 examples/load_balancer/runtime.c
 delete mode 100644 examples/netmap_compat/Makefile
 delete mode 100644 examples/netmap_compat/bridge/Makefile
 delete mode 100644 examples/netmap_compat/bridge/bridge.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.h
 delete mode 100644 examples/netmap_compat/meson.build
 delete mode 100644 examples/netmap_compat/netmap/netmap.h
 delete mode 100644 examples/netmap_compat/netmap/netmap_user.h
 delete mode 100644 examples/quota_watermark/Makefile
 delete mode 100644 examples/quota_watermark/include/conf.h
 delete mode 100644 examples/quota_watermark/meson.build
 delete mode 100644 examples/quota_watermark/qw/Makefile
 delete mode 100644 examples/quota_watermark/qw/args.c
 delete mode 100644 examples/quota_watermark/qw/args.h
 delete mode 100644 examples/quota_watermark/qw/init.c
 delete mode 100644 examples/quota_watermark/qw/init.h
 delete mode 100644 examples/quota_watermark/qw/main.c
 delete mode 100644 examples/quota_watermark/qw/main.h
 delete mode 100644 examples/quota_watermark/qwctl/Makefile
 delete mode 100644 examples/quota_watermark/qwctl/commands.c
 delete mode 100644 examples/quota_watermark/qwctl/commands.h
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.c
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.h
Signature · 1 line
2.17.1
#11 lore raw

PATCH v2 1/6 doc: remove unnecessary sample app guide table

The table of examples in the sample application guide is now removed, as it was unnecessary and difficult to update when adding/removing examples.

---
 doc/guides/sample_app_ug/intro.rst | 44 +-----------------------------
 1 file changed, 1 insertion(+), 43 deletions(-)
doc/guides/sample_app_ug/intro.rst +1 -43
index 90704194a..a7576837c 100644
@@ -23,49 +23,7 @@ command-line options.
 The DPDK Sample Applications
 ----------------------------
 
-Table :numref:`table_sample_apps` shows a list of some of the main sample
-applications that are available in the examples directory of DPDK:
-
- .. _table_sample_apps:
-
- .. table:: **Some of the DPDK Sample applications**
-
-    +---------------------------------------+--------------------------------------+
-    | Bonding                               | Netmap Compatibility                 |
-    +---------------------------------------+--------------------------------------+
-    | Command Line                          | Packet Ordering                      |
-    +---------------------------------------+--------------------------------------+
-    | Distributor                           | Performance Thread                   |
-    +---------------------------------------+--------------------------------------+
-    | Ethtool                               | Precision Time Protocol (PTP) Client |
-    +---------------------------------------+--------------------------------------+
-    | Exception Path                        | Quality of Service (QoS) Metering    |
-    +---------------------------------------+--------------------------------------+
-    | Hello World                           | QoS Scheduler                        |
-    +---------------------------------------+--------------------------------------+
-    | Internet Protocol (IP) Fragmentation  | Quota and Watermark                  |
-    +---------------------------------------+--------------------------------------+
-    | IP Pipeline                           | RX/TX Callbacks                      |
-    +---------------------------------------+--------------------------------------+
-    | IP Reassembly                         | Server node EFD                      |
-    +---------------------------------------+--------------------------------------+
-    | IPsec Security Gateway                | Basic Forwarding/Skeleton App        |
-    +---------------------------------------+--------------------------------------+
-    | IPv4 multicast                        | Tunnel End Point (TEP) termination   |
-    +---------------------------------------+--------------------------------------+
-    | Kernel NIC Interface                  | Timer                                |
-    +---------------------------------------+--------------------------------------+
-    | Network Layer 2 Forwarding + variants | Vhost                                |
-    +---------------------------------------+--------------------------------------+
-    | Network Layer 3 Forwarding + variants | Vhost Xen                            |
-    +---------------------------------------+--------------------------------------+
-    | Link Status Interrupt                 | VMDQ Forwarding                      |
-    +---------------------------------------+--------------------------------------+
-    | Load Balancer                         | VMDQ and DCB Forwarding              |
-    +---------------------------------------+--------------------------------------+
-    | Multi-process                         | VM Power Management                  |
-    +---------------------------------------+--------------------------------------+
-
+There are many sample applications available in the examples directory of DPDK.
 These examples range from simple to reasonably complex but most are designed
 to demonstrate one particular feature of DPDK. Some of the more interesting
 examples are highlighted below.
Signature · 1 line
2.17.1
#12 lore raw

PATCH v2 2/6 examples/exception_path: remove example from DPDK

In reply to Ciara Power

From: Bruce Richardson <[email protected]>

The example app shows the use of TUN/TAP with DPDK, but DPDK has a built-in TAP PMD, so this example is obsolete and so can be removed.

---
 MAINTAINERS                                 |   3 -
 doc/guides/sample_app_ug/exception_path.rst | 281 ----------
 doc/guides/sample_app_ug/index.rst          |   1 -
 examples/Makefile                           |   1 -
 examples/exception_path/Makefile            |  57 --
 examples/exception_path/main.c              | 589 --------------------
 examples/exception_path/meson.build         |  11 -
 examples/meson.build                        |   2 +-
 8 files changed, 1 insertion(+), 944 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/exception_path.rst
 delete mode 100644 examples/exception_path/Makefile
 delete mode 100644 examples/exception_path/main.c
 delete mode 100644 examples/exception_path/meson.build
MAINTAINERS +0 -3
index b3d9aaddd..330a4d77d 100644
@@ -1427,9 +1427,6 @@ Other Example Applications
 F: examples/ethtool/
 F: doc/guides/sample_app_ug/ethtool.rst
 
-F: examples/exception_path/
-F: doc/guides/sample_app_ug/exception_path.rst
-
 M: Marko Kovacevic <[email protected]>
 F: examples/fips_validation/
 F: doc/guides/sample_app_ug/fips_validation.rst
doc/guides/sample_app_ug/exception_path.rst deleted +0 -281

281 lines not on this page · raw message

doc/guides/sample_app_ug/index.rst +0 -1
index f23f8f59e..076346a60 100644
@@ -12,7 +12,6 @@ Sample Applications User Guides
     compiling
     cmd_line
     ethtool
-    exception_path
     hello_world
     skeleton
     rxtx_callbacks
examples/Makefile +0 -1
index de11dd487..c756497d1 100644
@@ -17,7 +17,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_POWER),y)
 DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor
 endif
 DIRS-y += ethtool
-DIRS-y += exception_path
 DIRS-$(CONFIG_RTE_LIBRTE_EFD) += server_node_efd
 DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += fips_validation
 DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += flow_classify
examples/exception_path/Makefile deleted +0 -57

57 lines not on this page · raw message

examples/exception_path/main.c deleted +0 -589

589 lines not on this page · raw message

examples/exception_path/meson.build deleted +0 -11
deleted file mode 100644
index c34e11e36..000000000
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-sources = files(
-	'main.c'
-)
examples/meson.build +1 -1
index a046b74ad..4663d9dea 100644
@@ -13,7 +13,7 @@ all_examples = [
 	'bbdev_app', 'bond',
 	'bpf', 'cmdline',
 	'distributor', 'ethtool',
-	'eventdev_pipeline', 'exception_path',
+	'eventdev_pipeline',
 	'fips_validation', 'flow_classify',
 	'flow_filtering', 'helloworld',
 	'ip_fragmentation', 'ip_pipeline',
Signature · 1 line
2.17.1
#13 lore raw

PATCH v2 3/6 examples/l3fwd-vf: remove example from DPDK

In reply to Ciara Power

From: Bruce Richardson <[email protected]>

The main l3fwd app should work with both PF and VF devices, so remove the VF-only l3fwd example.

---
 MAINTAINERS                                   |    3 -
 doc/guides/sample_app_ug/index.rst            |    1 -
 .../sample_app_ug/l3_forward_virtual.rst      |   98 --
 examples/Makefile                             |    1 -
 examples/l3fwd-vf/Makefile                    |   62 -
 examples/l3fwd-vf/main.c                      | 1072 -----------------
 examples/l3fwd-vf/meson.build                 |   12 -
 examples/meson.build                          |    2 +-
 8 files changed, 1 insertion(+), 1250 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/l3_forward_virtual.rst
 delete mode 100644 examples/l3fwd-vf/Makefile
 delete mode 100644 examples/l3fwd-vf/main.c
 delete mode 100644 examples/l3fwd-vf/meson.build
MAINTAINERS +0 -3
index 330a4d77d..92c3f6af4 100644
@@ -1458,9 +1458,6 @@ F: examples/l2fwd-cat/
 F: examples/l3fwd/
 F: doc/guides/sample_app_ug/l3_forward.rst
 
-F: examples/l3fwd-vf/
-F: doc/guides/sample_app_ug/l3_forward_virtual.rst
-
 F: examples/link_status_interrupt/
 F: doc/guides/sample_app_ug/link_status_intr.rst
 
doc/guides/sample_app_ug/index.rst +0 -1
index 076346a60..d212f81fe 100644
@@ -29,7 +29,6 @@ Sample Applications User Guides
     l3_forward
     l3_forward_power_man
     l3_forward_access_ctrl
-    l3_forward_virtual
     link_status_intr
     load_balancer
     server_node_efd
doc/guides/sample_app_ug/l3_forward_virtual.rst deleted +0 -98

98 lines not on this page · raw message

examples/Makefile +0 -1
index c756497d1..5dd8a72e5 100644
@@ -46,7 +46,6 @@ endif
 DIRS-$(CONFIG_RTE_LIBRTE_ACL) += l3fwd-acl
 ifeq ($(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_HASH),yy)
 DIRS-$(CONFIG_RTE_LIBRTE_POWER) += l3fwd-power
-DIRS-y += l3fwd-vf
 endif
 DIRS-y += link_status_interrupt
 DIRS-$(CONFIG_RTE_LIBRTE_LPM) += load_balancer
examples/l3fwd-vf/Makefile deleted +0 -62

62 lines not on this page · raw message

examples/l3fwd-vf/main.c deleted +0 -1072

1,072 lines not on this page · raw message

examples/l3fwd-vf/meson.build deleted +0 -12
deleted file mode 100644
index 226286e74..000000000
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-deps += ['lpm', 'hash']
-sources = files(
-	'main.c'
-)
examples/meson.build +1 -1
index 4663d9dea..81ac8199a 100644
@@ -23,7 +23,7 @@ all_examples = [
 	'l2fwd-crypto', 'l2fwd-jobstats',
 	'l2fwd-keepalive', 'l3fwd',
 	'l3fwd-acl', 'l3fwd-power',
-	'l3fwd-vf', 'link_status_interrupt',
+	'link_status_interrupt',
 	'load_balancer',
 	'multi_process/client_server_mp/mp_client',
 	'multi_process/client_server_mp/mp_server',
Signature · 1 line
2.17.1
#14 lore raw

PATCH v2 4/6 examples/quota-watermark: remove example from DPDK

In reply to Ciara Power

Original DPDK rings code had explicit support for a
single watermark per-ring, but more recent releases of
DPDK had a more general mechanism where each enqueue
or dequeue call could return the remaining elements/free-slots in the ring.
Therefore, this example is not as relevant as before and can be removed.

---
 MAINTAINERS                                  |   3 -
 doc/guides/sample_app_ug/index.rst           |   1 -
 doc/guides/sample_app_ug/quota_watermark.rst | 465 -------------------
 examples/Makefile                            |   1 -
 examples/meson.build                         |   2 +-
 examples/quota_watermark/Makefile            |  16 -
 examples/quota_watermark/include/conf.h      |  19 -
 examples/quota_watermark/meson.build         |  10 -
 examples/quota_watermark/qw/Makefile         |  22 -
 examples/quota_watermark/qw/args.c           |  78 ----
 examples/quota_watermark/qw/args.h           |  12 -
 examples/quota_watermark/qw/init.c           | 164 -------
 examples/quota_watermark/qw/init.h           |  14 -
 examples/quota_watermark/qw/main.c           | 365 ---------------
 examples/quota_watermark/qw/main.h           |  31 --
 examples/quota_watermark/qwctl/Makefile      |  22 -
 examples/quota_watermark/qwctl/commands.c    | 196 --------
 examples/quota_watermark/qwctl/commands.h    |  12 -
 examples/quota_watermark/qwctl/qwctl.c       |  67 ---
 examples/quota_watermark/qwctl/qwctl.h       |  12 -
 20 files changed, 1 insertion(+), 1511 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/quota_watermark.rst
 delete mode 100644 examples/quota_watermark/Makefile
 delete mode 100644 examples/quota_watermark/include/conf.h
 delete mode 100644 examples/quota_watermark/meson.build
 delete mode 100644 examples/quota_watermark/qw/Makefile
 delete mode 100644 examples/quota_watermark/qw/args.c
 delete mode 100644 examples/quota_watermark/qw/args.h
 delete mode 100644 examples/quota_watermark/qw/init.c
 delete mode 100644 examples/quota_watermark/qw/init.h
 delete mode 100644 examples/quota_watermark/qw/main.c
 delete mode 100644 examples/quota_watermark/qw/main.h
 delete mode 100644 examples/quota_watermark/qwctl/Makefile
 delete mode 100644 examples/quota_watermark/qwctl/commands.c
 delete mode 100644 examples/quota_watermark/qwctl/commands.h
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.c
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.h
MAINTAINERS +0 -3
index 92c3f6af4..7be363327 100644
@@ -1474,9 +1474,6 @@ F: doc/guides/sample_app_ug/performance_thread.rst
 
 F: examples/ptpclient/
 
-F: examples/quota_watermark/
-F: doc/guides/sample_app_ug/quota_watermark.rst
-
 M: Bruce Richardson <[email protected]>
 M: John McNamara <[email protected]>
 F: examples/rxtx_callbacks/
doc/guides/sample_app_ug/index.rst +0 -1
index d212f81fe..dafe8553f 100644
@@ -36,7 +36,6 @@ Sample Applications User Guides
     multi_process
     qos_metering
     qos_scheduler
-    quota_watermark
     timer
     packet_ordering
     vmdq_dcb_forwarding
doc/guides/sample_app_ug/quota_watermark.rst deleted +0 -465

465 lines not on this page · raw message

examples/Makefile +0 -1
index 5dd8a72e5..02ff86534 100644
@@ -59,7 +59,6 @@ endif
 DIRS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ptpclient
 DIRS-$(CONFIG_RTE_LIBRTE_METER) += qos_meter
 DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += qos_sched
-DIRS-y += quota_watermark
 DIRS-$(CONFIG_RTE_ETHDEV_RXTX_CALLBACKS) += rxtx_callbacks
 DIRS-y += service_cores
 DIRS-y += skeleton
examples/meson.build +1 -1
index 81ac8199a..6c26fffb4 100644
@@ -33,7 +33,7 @@ all_examples = [
 	'netmap_compat', 'ntb', 'packet_ordering',
 	'performance-thread', 'ptpclient',
 	'qos_meter', 'qos_sched',
-	'quota_watermark', 'rxtx_callbacks',
+	'rxtx_callbacks',
 	'server_node_efd', 'service_cores',
 	'skeleton', 'tep_termination',
 	'timer', 'vdpa',
examples/quota_watermark/Makefile deleted +0 -16
deleted file mode 100644
index 8ef053198..000000000
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += qw
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += qwctl
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
examples/quota_watermark/include/conf.h deleted +0 -19
deleted file mode 100644
index 4f29aa64b..000000000
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _CONF_H_
-#define _CONF_H_
-
-#define RING_SIZE 1024
-#define MAX_PKT_QUOTA 64
-
-#define RX_DESC_PER_QUEUE   1024
-#define TX_DESC_PER_QUEUE   1024
-
-#define MBUF_DATA_SIZE     RTE_MBUF_DEFAULT_BUF_SIZE
-#define MBUF_PER_POOL 8192
-
-#define QUOTA_WATERMARK_MEMZONE_NAME "qw_global_vars"
-
-#endif /* _CONF_H_ */
examples/quota_watermark/meson.build deleted +0 -10
deleted file mode 100644
index c370d7476..000000000
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-# Example app currently unsupported by meson build
-build = false
examples/quota_watermark/qw/Makefile deleted +0 -22
deleted file mode 100644
index 3f10f01c3..000000000
@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = qw
-
-# all source are stored in SRCS-y
-SRCS-y := args.c init.c main.c
-
-CFLAGS += -O3 -DQW_SOFTWARE_FC
-CFLAGS += $(WERROR_FLAGS)
-
-include $(RTE_SDK)/mk/rte.extapp.mk
examples/quota_watermark/qw/args.c deleted +0 -78

78 lines not on this page · raw message

examples/quota_watermark/qw/args.h deleted +0 -12
deleted file mode 100644
index ab777db01..000000000
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _ARGS_H_
-#define _ARGS_H_
-
-extern unsigned int portmask;
-
-int parse_qw_args(int argc, char **argv);
-
-#endif /* _ARGS_H_ */
examples/quota_watermark/qw/init.c deleted +0 -164

164 lines not on this page · raw message

examples/quota_watermark/qw/init.h deleted +0 -14
deleted file mode 100644
index e0c90df72..000000000
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _INIT_H_
-#define _INIT_H_
-
-void configure_eth_port(uint16_t port_id);
-void init_dpdk(void);
-void init_ring(int lcore_id, uint16_t port_id);
-void pair_ports(void);
-void setup_shared_variables(void);
-
-#endif /* _INIT_H_ */
examples/quota_watermark/qw/main.c deleted +0 -365

365 lines not on this page · raw message

examples/quota_watermark/qw/main.h deleted +0 -31
deleted file mode 100644
index 9903ddc8c..000000000
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _MAIN_H_
-#define _MAIN_H_
-
-#include "../include/conf.h"
-
-enum ring_state {
-	RING_READY,
-	RING_OVERLOADED,
-};
-
-extern int *quota;
-extern unsigned int *low_watermark;
-extern unsigned int *high_watermark;
-
-extern uint16_t port_pairs[RTE_MAX_ETHPORTS];
-
-extern struct rte_ring *rings[RTE_MAX_LCORE][RTE_MAX_ETHPORTS];
-extern struct rte_mempool *mbuf_pool;
-
-
-static inline int
-is_bit_set(int i, unsigned int mask)
-{
-	return (1 << i) & mask;
-}
-
-#endif /* _MAIN_H_ */
examples/quota_watermark/qwctl/Makefile deleted +0 -22
deleted file mode 100644
index a40f28025..000000000
@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = qwctl
-
-# all source are stored in SRCS-y
-SRCS-y := commands.c qwctl.c
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-include $(RTE_SDK)/mk/rte.extapp.mk
examples/quota_watermark/qwctl/commands.c deleted +0 -196

196 lines not on this page · raw message

examples/quota_watermark/qwctl/commands.h deleted +0 -12
deleted file mode 100644
index 4a4e97475..000000000
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _COMMANDS_H_
-#define _COMMANDS_H_
-
-#include <cmdline_parse.h>
-
-extern cmdline_parse_ctx_t qwctl_ctx[];
-
-#endif /* _COMMANDS_H_ */
examples/quota_watermark/qwctl/qwctl.c deleted +0 -67

67 lines not on this page · raw message

examples/quota_watermark/qwctl/qwctl.h deleted +0 -12
deleted file mode 100644
index 2a4559388..000000000
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _MAIN_H_
-#define _MAIN_H_
-
-extern int *quota;
-extern unsigned int *low_watermark;
-extern unsigned int *high_watermark;
-
-#endif /* _MAIN_H_ */
Signature · 1 line
2.17.1
#15 lore raw

PATCH v2 5/6 examples/netmap-compat: remove example from DPDK

In reply to Ciara Power

Rather than providing a shim layer on top of netmap, we should instead encourage users to create apps using the DPDK APIs directly.

---
 MAINTAINERS                                   |   3 -
 doc/guides/sample_app_ug/index.rst            |   1 -
 .../sample_app_ug/netmap_compatibility.rst    | 130 ---
 examples/Makefile                             |   1 -
 examples/meson.build                          |   2 +-
 examples/netmap_compat/Makefile               |  22 -
 examples/netmap_compat/bridge/Makefile        |  35 -
 examples/netmap_compat/bridge/bridge.c        | 343 -------
 examples/netmap_compat/lib/compat_netmap.c    | 899 ------------------
 examples/netmap_compat/lib/compat_netmap.h    |  51 -
 examples/netmap_compat/meson.build            |  10 -
 examples/netmap_compat/netmap/netmap.h        | 289 ------
 examples/netmap_compat/netmap/netmap_user.h   |  95 --
 13 files changed, 1 insertion(+), 1880 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/netmap_compatibility.rst
 delete mode 100644 examples/netmap_compat/Makefile
 delete mode 100644 examples/netmap_compat/bridge/Makefile
 delete mode 100644 examples/netmap_compat/bridge/bridge.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.h
 delete mode 100644 examples/netmap_compat/meson.build
 delete mode 100644 examples/netmap_compat/netmap/netmap.h
 delete mode 100644 examples/netmap_compat/netmap/netmap_user.h
MAINTAINERS +0 -3
index 7be363327..6b9fa4dc2 100644
@@ -1464,9 +1464,6 @@ F: doc/guides/sample_app_ug/link_status_intr.rst
 F: examples/load_balancer/
 F: doc/guides/sample_app_ug/load_balancer.rst
 
-F: examples/netmap_compat/
-F: doc/guides/sample_app_ug/netmap_compatibility.rst
-
 L-threads - EXPERIMENTAL
 M: John McNamara <[email protected]>
 F: examples/performance-thread/
doc/guides/sample_app_ug/index.rst +0 -1
index dafe8553f..5f4924df6 100644
@@ -43,7 +43,6 @@ Sample Applications User Guides
     vhost_scsi
     vhost_crypto
     vdpa
-    netmap_compatibility
     ip_pipeline
     test_pipeline
     eventdev_pipeline
doc/guides/sample_app_ug/netmap_compatibility.rst deleted +0 -130

130 lines not on this page · raw message

examples/Makefile +0 -1
index 02ff86534..6bba09ce9 100644
@@ -50,7 +50,6 @@ endif
 DIRS-y += link_status_interrupt
 DIRS-$(CONFIG_RTE_LIBRTE_LPM) += load_balancer
 DIRS-y += multi_process
-DIRS-y += netmap_compat/bridge
 DIRS-y += ntb
 DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += packet_ordering
 ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
examples/meson.build +1 -1
index 6c26fffb4..f0356f2a1 100644
@@ -30,7 +30,7 @@ all_examples = [
 	'multi_process/hotplug_mp',
 	'multi_process/simple_mp',
 	'multi_process/symmetric_mp',
-	'netmap_compat', 'ntb', 'packet_ordering',
+	'ntb', 'packet_ordering',
 	'performance-thread', 'ptpclient',
 	'qos_meter', 'qos_sched',
 	'rxtx_callbacks',
examples/netmap_compat/Makefile deleted +0 -22
deleted file mode 100644
index b9f78d173..000000000
@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-unexport RTE_SRCDIR RTE_OUTPUT RTE_EXTMK
-
-DIRS-y += bridge
-
-.PHONY: all clean $(DIRS-y)
-
-all: $(DIRS-y)
-clean: $(DIRS-y)
-
-$(DIRS-y):
-	$(MAKE) -C $@ $(MAKECMDGOALS) O=$(RTE_OUTPUT)
examples/netmap_compat/bridge/Makefile deleted +0 -35
deleted file mode 100644
index 7ed30e57b..000000000
@@ -1,35 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define the RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-$(info This application can only operate in a linux environment, \
-please change the definition of the RTE_TARGET environment variable)
-all:
-clean:
-else
-
-# binary name
-APP = bridge
-
-# for compat_netmap.c
-VPATH := $(SRCDIR)/../lib
-
-# all source are stored in SRCS-y
-SRCS-y := bridge.c
-SRCS-y += compat_netmap.c
-
-CFLAGS += -O3 -I$(SRCDIR)/../lib -I$(SRCDIR)/../netmap
-CFLAGS += $(WERROR_FLAGS)
-
-include $(RTE_SDK)/mk/rte.extapp.mk
-
-endif
examples/netmap_compat/bridge/bridge.c deleted +0 -343

343 lines not on this page · raw message

examples/netmap_compat/lib/compat_netmap.c deleted +0 -899

899 lines not on this page · raw message

examples/netmap_compat/lib/compat_netmap.h deleted +0 -51

51 lines not on this page · raw message

examples/netmap_compat/meson.build deleted +0 -10
deleted file mode 100644
index c370d7476..000000000
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-# Example app currently unsupported by meson build
-build = false
examples/netmap_compat/netmap/netmap.h deleted +0 -289

289 lines not on this page · raw message

examples/netmap_compat/netmap/netmap_user.h deleted +0 -95

95 lines not on this page · raw message

Signature · 1 line
2.17.1
#16 lore raw

PATCH v2 6/6 examples/load_balancer: remove example from DPDK

In reply to Ciara Power

This example can be removed because DPDK now has a range of libraries, especially rte_eventdev, that did not exist previously for load balancing, making this less relevant. Also, modern NIC cards have greater ability to do load balancing, e.g. using RSS, over a wider range of fields than earlier cards did.

---
 MAINTAINERS                                |    3 -
 doc/guides/sample_app_ug/index.rst         |    1 -
 doc/guides/sample_app_ug/load_balancer.rst |  201 ----
 examples/Makefile                          |    1 -
 examples/load_balancer/Makefile            |   62 --
 examples/load_balancer/config.c            | 1030 --------------------
 examples/load_balancer/init.c              |  520 ----------
 examples/load_balancer/main.c              |   76 --
 examples/load_balancer/main.h              |  351 -------
 examples/load_balancer/meson.build         |   12 -
 examples/load_balancer/runtime.c           |  642 ------------
 examples/meson.build                       |    1 -
 12 files changed, 2900 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/load_balancer.rst
 delete mode 100644 examples/load_balancer/Makefile
 delete mode 100644 examples/load_balancer/config.c
 delete mode 100644 examples/load_balancer/init.c
 delete mode 100644 examples/load_balancer/main.c
 delete mode 100644 examples/load_balancer/main.h
 delete mode 100644 examples/load_balancer/meson.build
 delete mode 100644 examples/load_balancer/runtime.c
MAINTAINERS +0 -3
index 6b9fa4dc2..3db771bd7 100644
@@ -1461,9 +1461,6 @@ F: doc/guides/sample_app_ug/l3_forward.rst
 F: examples/link_status_interrupt/
 F: doc/guides/sample_app_ug/link_status_intr.rst
 
-F: examples/load_balancer/
-F: doc/guides/sample_app_ug/load_balancer.rst
-
 L-threads - EXPERIMENTAL
 M: John McNamara <[email protected]>
 F: examples/performance-thread/
doc/guides/sample_app_ug/index.rst +0 -1
index 5f4924df6..191eebb56 100644
@@ -30,7 +30,6 @@ Sample Applications User Guides
     l3_forward_power_man
     l3_forward_access_ctrl
     link_status_intr
-    load_balancer
     server_node_efd
     service_cores
     multi_process
doc/guides/sample_app_ug/load_balancer.rst deleted +0 -201

201 lines not on this page · raw message

examples/Makefile +0 -1
index 6bba09ce9..62d0865c5 100644
@@ -48,7 +48,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_HASH),yy)
 DIRS-$(CONFIG_RTE_LIBRTE_POWER) += l3fwd-power
 endif
 DIRS-y += link_status_interrupt
-DIRS-$(CONFIG_RTE_LIBRTE_LPM) += load_balancer
 DIRS-y += multi_process
 DIRS-y += ntb
 DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += packet_ordering
examples/load_balancer/Makefile deleted +0 -62

62 lines not on this page · raw message

examples/load_balancer/config.c deleted +0 -1030

1,030 lines not on this page · raw message

examples/load_balancer/init.c deleted +0 -520

520 lines not on this page · raw message

examples/load_balancer/main.c deleted +0 -76

76 lines not on this page · raw message

examples/load_balancer/main.h deleted +0 -351

351 lines not on this page · raw message

examples/load_balancer/meson.build deleted +0 -12
deleted file mode 100644
index 4f7ac3999..000000000
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-deps += 'lpm'
-sources = files(
-	'config.c', 'init.c', 'main.c', 'runtime.c'
-)
examples/load_balancer/runtime.c deleted +0 -642

642 lines not on this page · raw message

examples/meson.build +0 -1
index f0356f2a1..e4580f74a 100644
@@ -24,7 +24,6 @@ all_examples = [
 	'l2fwd-keepalive', 'l3fwd',
 	'l3fwd-acl', 'l3fwd-power',
 	'link_status_interrupt',
-	'load_balancer',
 	'multi_process/client_server_mp/mp_client',
 	'multi_process/client_server_mp/mp_server',
 	'multi_process/hotplug_mp',
Signature · 1 line
2.17.1
#17 lore raw
In reply to Ciara Power
Quoted 17 lines · Ciara Power

As discussed by the DPDK technical board e.g. [1][2] and on the DPDK mailing list [3], we have a lot of example applications shipped with DPDK - a number which increases with each DPDK release, and not all of which are probably needed any more. Therefore, this set removes 5 example applications from the repository.

v2: Remove the table listing sample applications

[1] https://mails.dpdk.org/archives/dev/2019-May/132288.html
[2] https://mails.dpdk.org/archives/dev/2019-June/135847.html
[3] https://mails.dpdk.org/archives/dev/2019-July/138676.html

Bruce Richardson (2):
examples/exception_path: remove example from DPDK examples/l3fwd-vf: remove example from DPDK

Quoted 5 lines

Ciara Power (4):
doc: remove unnecessary sample app guide table examples/quota-watermark: remove example from DPDK examples/netmap-compat: remove example from DPDK examples/load_balancer: remove example from DPDK

- No need to repeat "from DPDK" in the patch title.

- The conflicts are trivial but please, rebase this series on master.

- Can you add an entry in the release notes for each removal?

Thanks.

Signature · 1 line
David Marchand
#18 lore raw

v3 cover remove a few example applications

In reply to Bruce Richardson

As discussed by the DPDK technical board e.g. [1][2] and on the DPDK mailing list [3], we have a lot of example applications shipped with DPDK - a number which increases with each DPDK release, and not all of which are probably needed any more. Therefore, this set removes 5 example applications from the repository.

v3:
- Document removed applications in release notes.
- Removed "from DPDK" in patch titles.

v2: Remove the table listing sample applications

[1] https://mails.dpdk.org/archives/dev/2019-May/132288.html
[2] https://mails.dpdk.org/archives/dev/2019-June/135847.html
[3] https://mails.dpdk.org/archives/dev/2019-July/138676.html

Bruce Richardson (2):
examples/exception_path: remove example
examples/l3fwd-vf: remove example

Ciara Power (4):
doc: remove unnecessary sample app guide table
examples/quota-watermark: remove example
examples/netmap-compat: remove example
examples/load_balancer: remove example

 MAINTAINERS                                   |   15 -
 doc/guides/rel_notes/release_19_11.rst        |   12 +
 doc/guides/sample_app_ug/exception_path.rst   |  281 -----
 doc/guides/sample_app_ug/index.rst            |    5 -
 doc/guides/sample_app_ug/intro.rst            |   44 +-
 .../sample_app_ug/l3_forward_virtual.rst      |   98 --
 doc/guides/sample_app_ug/load_balancer.rst    |  201 ---
 .../sample_app_ug/netmap_compatibility.rst    |  130 --
 doc/guides/sample_app_ug/quota_watermark.rst  |  465 -------
 examples/Makefile                             |    5 -
 examples/exception_path/Makefile              |   57 -
 examples/exception_path/main.c                |  605 ---------
 examples/exception_path/meson.build           |   11 -
 examples/l3fwd-vf/Makefile                    |   62 -
 examples/l3fwd-vf/main.c                      | 1077 -----------------
 examples/l3fwd-vf/meson.build                 |   12 -
 examples/load_balancer/Makefile               |   62 -
 examples/load_balancer/config.c               | 1030 ----------------
 examples/load_balancer/init.c                 |  537 --------
 examples/load_balancer/main.c                 |   76 --
 examples/load_balancer/main.h                 |  351 ------
 examples/load_balancer/meson.build            |   12 -
 examples/load_balancer/runtime.c              |  642 ----------
 examples/meson.build                          |    9 +-
 examples/netmap_compat/Makefile               |   22 -
 examples/netmap_compat/bridge/Makefile        |   35 -
 examples/netmap_compat/bridge/bridge.c        |  347 ------
 examples/netmap_compat/lib/compat_netmap.c    |  906 --------------
 examples/netmap_compat/lib/compat_netmap.h    |   51 -
 examples/netmap_compat/meson.build            |   10 -
 examples/netmap_compat/netmap/netmap.h        |  289 -----
 examples/netmap_compat/netmap/netmap_user.h   |   95 --
 examples/quota_watermark/Makefile             |   16 -
 examples/quota_watermark/include/conf.h       |   19 -
 examples/quota_watermark/meson.build          |   10 -
 examples/quota_watermark/qw/Makefile          |   22 -
 examples/quota_watermark/qw/args.c            |   78 --
 examples/quota_watermark/qw/args.h            |   12 -
 examples/quota_watermark/qw/init.c            |  168 ---
 examples/quota_watermark/qw/init.h            |   14 -
 examples/quota_watermark/qw/main.c            |  373 ------
 examples/quota_watermark/qw/main.h            |   31 -
 examples/quota_watermark/qwctl/Makefile       |   22 -
 examples/quota_watermark/qwctl/commands.c     |  196 ---
 examples/quota_watermark/qwctl/commands.h     |   12 -
 examples/quota_watermark/qwctl/qwctl.c        |   67 -
 examples/quota_watermark/qwctl/qwctl.h        |   12 -
 47 files changed, 17 insertions(+), 8589 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/exception_path.rst
 delete mode 100644 doc/guides/sample_app_ug/l3_forward_virtual.rst
 delete mode 100644 doc/guides/sample_app_ug/load_balancer.rst
 delete mode 100644 doc/guides/sample_app_ug/netmap_compatibility.rst
 delete mode 100644 doc/guides/sample_app_ug/quota_watermark.rst
 delete mode 100644 examples/exception_path/Makefile
 delete mode 100644 examples/exception_path/main.c
 delete mode 100644 examples/exception_path/meson.build
 delete mode 100644 examples/l3fwd-vf/Makefile
 delete mode 100644 examples/l3fwd-vf/main.c
 delete mode 100644 examples/l3fwd-vf/meson.build
 delete mode 100644 examples/load_balancer/Makefile
 delete mode 100644 examples/load_balancer/config.c
 delete mode 100644 examples/load_balancer/init.c
 delete mode 100644 examples/load_balancer/main.c
 delete mode 100644 examples/load_balancer/main.h
 delete mode 100644 examples/load_balancer/meson.build
 delete mode 100644 examples/load_balancer/runtime.c
 delete mode 100644 examples/netmap_compat/Makefile
 delete mode 100644 examples/netmap_compat/bridge/Makefile
 delete mode 100644 examples/netmap_compat/bridge/bridge.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.h
 delete mode 100644 examples/netmap_compat/meson.build
 delete mode 100644 examples/netmap_compat/netmap/netmap.h
 delete mode 100644 examples/netmap_compat/netmap/netmap_user.h
 delete mode 100644 examples/quota_watermark/Makefile
 delete mode 100644 examples/quota_watermark/include/conf.h
 delete mode 100644 examples/quota_watermark/meson.build
 delete mode 100644 examples/quota_watermark/qw/Makefile
 delete mode 100644 examples/quota_watermark/qw/args.c
 delete mode 100644 examples/quota_watermark/qw/args.h
 delete mode 100644 examples/quota_watermark/qw/init.c
 delete mode 100644 examples/quota_watermark/qw/init.h
 delete mode 100644 examples/quota_watermark/qw/main.c
 delete mode 100644 examples/quota_watermark/qw/main.h
 delete mode 100644 examples/quota_watermark/qwctl/Makefile
 delete mode 100644 examples/quota_watermark/qwctl/commands.c
 delete mode 100644 examples/quota_watermark/qwctl/commands.h
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.c
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.h
Signature · 1 line
2.17.1
#19 lore raw

PATCH v3 1/6 doc: remove unnecessary sample app guide table

The table of examples in the sample application guide is now removed, as it was unnecessary and difficult to update when adding/removing examples.

---

v2: Remove the table listing sample applications

---
 doc/guides/sample_app_ug/intro.rst | 44 +-----------------------------
 1 file changed, 1 insertion(+), 43 deletions(-)
doc/guides/sample_app_ug/intro.rst +1 -43
index 90704194a..a7576837c 100644
@@ -23,49 +23,7 @@ command-line options.
 The DPDK Sample Applications
 ----------------------------
 
-Table :numref:`table_sample_apps` shows a list of some of the main sample
-applications that are available in the examples directory of DPDK:
-
- .. _table_sample_apps:
-
- .. table:: **Some of the DPDK Sample applications**
-
-    +---------------------------------------+--------------------------------------+
-    | Bonding                               | Netmap Compatibility                 |
-    +---------------------------------------+--------------------------------------+
-    | Command Line                          | Packet Ordering                      |
-    +---------------------------------------+--------------------------------------+
-    | Distributor                           | Performance Thread                   |
-    +---------------------------------------+--------------------------------------+
-    | Ethtool                               | Precision Time Protocol (PTP) Client |
-    +---------------------------------------+--------------------------------------+
-    | Exception Path                        | Quality of Service (QoS) Metering    |
-    +---------------------------------------+--------------------------------------+
-    | Hello World                           | QoS Scheduler                        |
-    +---------------------------------------+--------------------------------------+
-    | Internet Protocol (IP) Fragmentation  | Quota and Watermark                  |
-    +---------------------------------------+--------------------------------------+
-    | IP Pipeline                           | RX/TX Callbacks                      |
-    +---------------------------------------+--------------------------------------+
-    | IP Reassembly                         | Server node EFD                      |
-    +---------------------------------------+--------------------------------------+
-    | IPsec Security Gateway                | Basic Forwarding/Skeleton App        |
-    +---------------------------------------+--------------------------------------+
-    | IPv4 multicast                        | Tunnel End Point (TEP) termination   |
-    +---------------------------------------+--------------------------------------+
-    | Kernel NIC Interface                  | Timer                                |
-    +---------------------------------------+--------------------------------------+
-    | Network Layer 2 Forwarding + variants | Vhost                                |
-    +---------------------------------------+--------------------------------------+
-    | Network Layer 3 Forwarding + variants | Vhost Xen                            |
-    +---------------------------------------+--------------------------------------+
-    | Link Status Interrupt                 | VMDQ Forwarding                      |
-    +---------------------------------------+--------------------------------------+
-    | Load Balancer                         | VMDQ and DCB Forwarding              |
-    +---------------------------------------+--------------------------------------+
-    | Multi-process                         | VM Power Management                  |
-    +---------------------------------------+--------------------------------------+
-
+There are many sample applications available in the examples directory of DPDK.
 These examples range from simple to reasonably complex but most are designed
 to demonstrate one particular feature of DPDK. Some of the more interesting
 examples are highlighted below.
Signature · 1 line
2.17.1
author Acked-by on v3 1/6
#20 lore raw

Re: [dpdk-dev] [dpdk-techboard] [PATCH v3 1/6] doc: remove unnecessary sample app guide table

Quoted 71 lines · Ciara Power

The table of examples in the sample application guide is now removed, as it was unnecessary and difficult to update when adding/removing examples.

---

v2: Remove the table listing sample applications

---
 doc/guides/sample_app_ug/intro.rst | 44 +-----------------------------
 1 file changed, 1 insertion(+), 43 deletions(-)
doc/guides/sample_app_ug/intro.rst +1 -43
index 90704194a..a7576837c 100644
@@ -23,49 +23,7 @@ command-line options.
 The DPDK Sample Applications
 ----------------------------
 
-Table :numref:`table_sample_apps` shows a list of some of the main sample
-applications that are available in the examples directory of DPDK:
-
- .. _table_sample_apps:
-
- .. table:: **Some of the DPDK Sample applications**
-
-    +---------------------------------------+--------------------------------------+
-    | Bonding                               | Netmap Compatibility                 |
-    +---------------------------------------+--------------------------------------+
-    | Command Line                          | Packet Ordering                      |
-    +---------------------------------------+--------------------------------------+
-    | Distributor                           | Performance Thread                   |
-    +---------------------------------------+--------------------------------------+
-    | Ethtool                               | Precision Time Protocol (PTP) Client |
-    +---------------------------------------+--------------------------------------+
-    | Exception Path                        | Quality of Service (QoS) Metering    |
-    +---------------------------------------+--------------------------------------+
-    | Hello World                           | QoS Scheduler                        |
-    +---------------------------------------+--------------------------------------+
-    | Internet Protocol (IP) Fragmentation  | Quota and Watermark                  |
-    +---------------------------------------+--------------------------------------+
-    | IP Pipeline                           | RX/TX Callbacks                      |
-    +---------------------------------------+--------------------------------------+
-    | IP Reassembly                         | Server node EFD                      |
-    +---------------------------------------+--------------------------------------+
-    | IPsec Security Gateway                | Basic Forwarding/Skeleton App        |
-    +---------------------------------------+--------------------------------------+
-    | IPv4 multicast                        | Tunnel End Point (TEP) termination   |
-    +---------------------------------------+--------------------------------------+
-    | Kernel NIC Interface                  | Timer                                |
-    +---------------------------------------+--------------------------------------+
-    | Network Layer 2 Forwarding + variants | Vhost                                |
-    +---------------------------------------+--------------------------------------+
-    | Network Layer 3 Forwarding + variants | Vhost Xen                            |
-    +---------------------------------------+--------------------------------------+
-    | Link Status Interrupt                 | VMDQ Forwarding                      |
-    +---------------------------------------+--------------------------------------+
-    | Load Balancer                         | VMDQ and DCB Forwarding              |
-    +---------------------------------------+--------------------------------------+
-    | Multi-process                         | VM Power Management                  |
-    +---------------------------------------+--------------------------------------+
-
+There are many sample applications available in the examples directory of DPDK.
 These examples range from simple to reasonably complex but most are designed
 to demonstrate one particular feature of DPDK. Some of the more interesting
 examples are highlighted below.
Signature · 1 line
2.17.1

This table was pointless anyway, since the index gives a list of all the apps, and a select are already called out below this in the doc.

#21 lore raw

PATCH v3 2/6 examples/exception_path: remove example

In reply to Ciara Power

From: Bruce Richardson <[email protected]>

The example app shows the use of TUN/TAP with DPDK, but DPDK has a built-in TAP PMD, so this example is obsolete and so can be removed.

---

v3: Document removed application in release notes.

---
 MAINTAINERS                                 |   3 -
 doc/guides/rel_notes/release_19_11.rst      |   4 +
 doc/guides/sample_app_ug/exception_path.rst | 281 ---------
 doc/guides/sample_app_ug/index.rst          |   1 -
 examples/Makefile                           |   1 -
 examples/exception_path/Makefile            |  57 --
 examples/exception_path/main.c              | 605 --------------------
 examples/exception_path/meson.build         |  11 -
 examples/meson.build                        |   2 +-
 9 files changed, 5 insertions(+), 960 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/exception_path.rst
 delete mode 100644 examples/exception_path/Makefile
 delete mode 100644 examples/exception_path/main.c
 delete mode 100644 examples/exception_path/meson.build
MAINTAINERS +0 -3
index f0f555b37..e8f3cd787 100644
@@ -1454,9 +1454,6 @@ Other Example Applications
 F: examples/ethtool/
 F: doc/guides/sample_app_ug/ethtool.rst
 
-F: examples/exception_path/
-F: doc/guides/sample_app_ug/exception_path.rst
-
 M: Marko Kovacevic <[email protected]>
 F: examples/fips_validation/
 F: doc/guides/sample_app_ug/fips_validation.rst
doc/guides/rel_notes/release_19_11.rst +4 -0
index f59a28307..a313d75bf 100644
@@ -183,6 +183,10 @@ Removed Items
                                      ipv4_cksum|udp_cksum|tcp_cksum|timestamp|
                                      vlan_strip|vlan_filter|vlan_extend on|off
 
+* The following sample applications have been removed in this release:
+
+  * Exception Path
+
 
 API Changes
 -----------
doc/guides/sample_app_ug/exception_path.rst deleted +0 -281

281 lines not on this page · raw message

doc/guides/sample_app_ug/index.rst +0 -1
index f23f8f59e..076346a60 100644
@@ -12,7 +12,6 @@ Sample Applications User Guides
     compiling
     cmd_line
     ethtool
-    exception_path
     hello_world
     skeleton
     rxtx_callbacks
examples/Makefile +0 -1
index de11dd487..c756497d1 100644
@@ -17,7 +17,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_POWER),y)
 DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor
 endif
 DIRS-y += ethtool
-DIRS-y += exception_path
 DIRS-$(CONFIG_RTE_LIBRTE_EFD) += server_node_efd
 DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += fips_validation
 DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += flow_classify
examples/exception_path/Makefile deleted +0 -57

57 lines not on this page · raw message

examples/exception_path/main.c deleted +0 -605

605 lines not on this page · raw message

examples/exception_path/meson.build deleted +0 -11
deleted file mode 100644
index c34e11e36..000000000
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-sources = files(
-	'main.c'
-)
examples/meson.build +1 -1
index a046b74ad..4663d9dea 100644
@@ -13,7 +13,7 @@ all_examples = [
 	'bbdev_app', 'bond',
 	'bpf', 'cmdline',
 	'distributor', 'ethtool',
-	'eventdev_pipeline', 'exception_path',
+	'eventdev_pipeline',
 	'fips_validation', 'flow_classify',
 	'flow_filtering', 'helloworld',
 	'ip_fragmentation', 'ip_pipeline',
Signature · 1 line
2.17.1
#22 lore raw

PATCH v3 3/6 examples/l3fwd-vf: remove example

In reply to Ciara Power

From: Bruce Richardson <[email protected]>

The main l3fwd app should work with both PF and VF devices, so remove the VF-only l3fwd example.

---

v3: Document removed application in release notes.

---
 MAINTAINERS                                   |    3 -
 doc/guides/rel_notes/release_19_11.rst        |    2 +
 doc/guides/sample_app_ug/index.rst            |    1 -
 .../sample_app_ug/l3_forward_virtual.rst      |   98 --
 examples/Makefile                             |    1 -
 examples/l3fwd-vf/Makefile                    |   62 -
 examples/l3fwd-vf/main.c                      | 1077 -----------------
 examples/l3fwd-vf/meson.build                 |   12 -
 examples/meson.build                          |    2 +-
 9 files changed, 3 insertions(+), 1255 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/l3_forward_virtual.rst
 delete mode 100644 examples/l3fwd-vf/Makefile
 delete mode 100644 examples/l3fwd-vf/main.c
 delete mode 100644 examples/l3fwd-vf/meson.build
MAINTAINERS +0 -3
index e8f3cd787..aa9cfd9fc 100644
@@ -1485,9 +1485,6 @@ F: examples/l2fwd-cat/
 F: examples/l3fwd/
 F: doc/guides/sample_app_ug/l3_forward.rst
 
-F: examples/l3fwd-vf/
-F: doc/guides/sample_app_ug/l3_forward_virtual.rst
-
 F: examples/link_status_interrupt/
 F: doc/guides/sample_app_ug/link_status_intr.rst
 
doc/guides/rel_notes/release_19_11.rst +2 -0
index a313d75bf..52bb8ba08 100644
@@ -187,6 +187,8 @@ Removed Items
 
   * Exception Path
 
+  * L3 Forwarding in a Virtualization Environment
+
 
 API Changes
 -----------
doc/guides/sample_app_ug/index.rst +0 -1
index 076346a60..d212f81fe 100644
@@ -29,7 +29,6 @@ Sample Applications User Guides
     l3_forward
     l3_forward_power_man
     l3_forward_access_ctrl
-    l3_forward_virtual
     link_status_intr
     load_balancer
     server_node_efd
doc/guides/sample_app_ug/l3_forward_virtual.rst deleted +0 -98

98 lines not on this page · raw message

examples/Makefile +0 -1
index c756497d1..5dd8a72e5 100644
@@ -46,7 +46,6 @@ endif
 DIRS-$(CONFIG_RTE_LIBRTE_ACL) += l3fwd-acl
 ifeq ($(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_HASH),yy)
 DIRS-$(CONFIG_RTE_LIBRTE_POWER) += l3fwd-power
-DIRS-y += l3fwd-vf
 endif
 DIRS-y += link_status_interrupt
 DIRS-$(CONFIG_RTE_LIBRTE_LPM) += load_balancer
examples/l3fwd-vf/Makefile deleted +0 -62

62 lines not on this page · raw message

examples/l3fwd-vf/main.c deleted +0 -1077

1,077 lines not on this page · raw message

examples/l3fwd-vf/meson.build deleted +0 -12
deleted file mode 100644
index 226286e74..000000000
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-deps += ['lpm', 'hash']
-sources = files(
-	'main.c'
-)
examples/meson.build +1 -1
index 4663d9dea..81ac8199a 100644
@@ -23,7 +23,7 @@ all_examples = [
 	'l2fwd-crypto', 'l2fwd-jobstats',
 	'l2fwd-keepalive', 'l3fwd',
 	'l3fwd-acl', 'l3fwd-power',
-	'l3fwd-vf', 'link_status_interrupt',
+	'link_status_interrupt',
 	'load_balancer',
 	'multi_process/client_server_mp/mp_client',
 	'multi_process/client_server_mp/mp_server',
Signature · 1 line
2.17.1
#23 lore raw

PATCH v3 4/6 examples/quota-watermark: remove example

In reply to Ciara Power

Original DPDK rings code had explicit support for a
single watermark per-ring, but more recent releases of
DPDK had a more general mechanism where each enqueue
or dequeue call could return the remaining elements/free-slots in the ring.
Therefore, this example is not as relevant as before and can be removed.

---

v3: Document removed application in release notes.

---
 MAINTAINERS                                  |   3 -
 doc/guides/rel_notes/release_19_11.rst       |   2 +
 doc/guides/sample_app_ug/index.rst           |   1 -
 doc/guides/sample_app_ug/quota_watermark.rst | 465 -------------------
 examples/Makefile                            |   1 -
 examples/meson.build                         |   2 +-
 examples/quota_watermark/Makefile            |  16 -
 examples/quota_watermark/include/conf.h      |  19 -
 examples/quota_watermark/meson.build         |  10 -
 examples/quota_watermark/qw/Makefile         |  22 -
 examples/quota_watermark/qw/args.c           |  78 ----
 examples/quota_watermark/qw/args.h           |  12 -
 examples/quota_watermark/qw/init.c           | 168 -------
 examples/quota_watermark/qw/init.h           |  14 -
 examples/quota_watermark/qw/main.c           | 373 ---------------
 examples/quota_watermark/qw/main.h           |  31 --
 examples/quota_watermark/qwctl/Makefile      |  22 -
 examples/quota_watermark/qwctl/commands.c    | 196 --------
 examples/quota_watermark/qwctl/commands.h    |  12 -
 examples/quota_watermark/qwctl/qwctl.c       |  67 ---
 examples/quota_watermark/qwctl/qwctl.h       |  12 -
 21 files changed, 3 insertions(+), 1523 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/quota_watermark.rst
 delete mode 100644 examples/quota_watermark/Makefile
 delete mode 100644 examples/quota_watermark/include/conf.h
 delete mode 100644 examples/quota_watermark/meson.build
 delete mode 100644 examples/quota_watermark/qw/Makefile
 delete mode 100644 examples/quota_watermark/qw/args.c
 delete mode 100644 examples/quota_watermark/qw/args.h
 delete mode 100644 examples/quota_watermark/qw/init.c
 delete mode 100644 examples/quota_watermark/qw/init.h
 delete mode 100644 examples/quota_watermark/qw/main.c
 delete mode 100644 examples/quota_watermark/qw/main.h
 delete mode 100644 examples/quota_watermark/qwctl/Makefile
 delete mode 100644 examples/quota_watermark/qwctl/commands.c
 delete mode 100644 examples/quota_watermark/qwctl/commands.h
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.c
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.h
MAINTAINERS +0 -3
index aa9cfd9fc..85e7b433f 100644
@@ -1501,9 +1501,6 @@ F: doc/guides/sample_app_ug/performance_thread.rst
 
 F: examples/ptpclient/
 
-F: examples/quota_watermark/
-F: doc/guides/sample_app_ug/quota_watermark.rst
-
 M: Bruce Richardson <[email protected]>
 M: John McNamara <[email protected]>
 F: examples/rxtx_callbacks/
doc/guides/rel_notes/release_19_11.rst +2 -0
index 52bb8ba08..c07763ce9 100644
@@ -189,6 +189,8 @@ Removed Items
 
   * L3 Forwarding in a Virtualization Environment
 
+  * Quota and Watermark
+
 
 API Changes
 -----------
doc/guides/sample_app_ug/index.rst +0 -1
index d212f81fe..dafe8553f 100644
@@ -36,7 +36,6 @@ Sample Applications User Guides
     multi_process
     qos_metering
     qos_scheduler
-    quota_watermark
     timer
     packet_ordering
     vmdq_dcb_forwarding
doc/guides/sample_app_ug/quota_watermark.rst deleted +0 -465

465 lines not on this page · raw message

examples/Makefile +0 -1
index 5dd8a72e5..02ff86534 100644
@@ -59,7 +59,6 @@ endif
 DIRS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ptpclient
 DIRS-$(CONFIG_RTE_LIBRTE_METER) += qos_meter
 DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += qos_sched
-DIRS-y += quota_watermark
 DIRS-$(CONFIG_RTE_ETHDEV_RXTX_CALLBACKS) += rxtx_callbacks
 DIRS-y += service_cores
 DIRS-y += skeleton
examples/meson.build +1 -1
index 81ac8199a..6c26fffb4 100644
@@ -33,7 +33,7 @@ all_examples = [
 	'netmap_compat', 'ntb', 'packet_ordering',
 	'performance-thread', 'ptpclient',
 	'qos_meter', 'qos_sched',
-	'quota_watermark', 'rxtx_callbacks',
+	'rxtx_callbacks',
 	'server_node_efd', 'service_cores',
 	'skeleton', 'tep_termination',
 	'timer', 'vdpa',
examples/quota_watermark/Makefile deleted +0 -16
deleted file mode 100644
index 8ef053198..000000000
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += qw
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += qwctl
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
examples/quota_watermark/include/conf.h deleted +0 -19
deleted file mode 100644
index 4f29aa64b..000000000
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _CONF_H_
-#define _CONF_H_
-
-#define RING_SIZE 1024
-#define MAX_PKT_QUOTA 64
-
-#define RX_DESC_PER_QUEUE   1024
-#define TX_DESC_PER_QUEUE   1024
-
-#define MBUF_DATA_SIZE     RTE_MBUF_DEFAULT_BUF_SIZE
-#define MBUF_PER_POOL 8192
-
-#define QUOTA_WATERMARK_MEMZONE_NAME "qw_global_vars"
-
-#endif /* _CONF_H_ */
examples/quota_watermark/meson.build deleted +0 -10
deleted file mode 100644
index c370d7476..000000000
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-# Example app currently unsupported by meson build
-build = false
examples/quota_watermark/qw/Makefile deleted +0 -22
deleted file mode 100644
index 3f10f01c3..000000000
@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = qw
-
-# all source are stored in SRCS-y
-SRCS-y := args.c init.c main.c
-
-CFLAGS += -O3 -DQW_SOFTWARE_FC
-CFLAGS += $(WERROR_FLAGS)
-
-include $(RTE_SDK)/mk/rte.extapp.mk
examples/quota_watermark/qw/args.c deleted +0 -78

78 lines not on this page · raw message

examples/quota_watermark/qw/args.h deleted +0 -12
deleted file mode 100644
index ab777db01..000000000
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _ARGS_H_
-#define _ARGS_H_
-
-extern unsigned int portmask;
-
-int parse_qw_args(int argc, char **argv);
-
-#endif /* _ARGS_H_ */
examples/quota_watermark/qw/init.c deleted +0 -168

168 lines not on this page · raw message

examples/quota_watermark/qw/init.h deleted +0 -14
deleted file mode 100644
index e0c90df72..000000000
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _INIT_H_
-#define _INIT_H_
-
-void configure_eth_port(uint16_t port_id);
-void init_dpdk(void);
-void init_ring(int lcore_id, uint16_t port_id);
-void pair_ports(void);
-void setup_shared_variables(void);
-
-#endif /* _INIT_H_ */
examples/quota_watermark/qw/main.c deleted +0 -373

373 lines not on this page · raw message

examples/quota_watermark/qw/main.h deleted +0 -31
deleted file mode 100644
index 9903ddc8c..000000000
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _MAIN_H_
-#define _MAIN_H_
-
-#include "../include/conf.h"
-
-enum ring_state {
-	RING_READY,
-	RING_OVERLOADED,
-};
-
-extern int *quota;
-extern unsigned int *low_watermark;
-extern unsigned int *high_watermark;
-
-extern uint16_t port_pairs[RTE_MAX_ETHPORTS];
-
-extern struct rte_ring *rings[RTE_MAX_LCORE][RTE_MAX_ETHPORTS];
-extern struct rte_mempool *mbuf_pool;
-
-
-static inline int
-is_bit_set(int i, unsigned int mask)
-{
-	return (1 << i) & mask;
-}
-
-#endif /* _MAIN_H_ */
examples/quota_watermark/qwctl/Makefile deleted +0 -22
deleted file mode 100644
index a40f28025..000000000
@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = qwctl
-
-# all source are stored in SRCS-y
-SRCS-y := commands.c qwctl.c
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-include $(RTE_SDK)/mk/rte.extapp.mk
examples/quota_watermark/qwctl/commands.c deleted +0 -196

196 lines not on this page · raw message

examples/quota_watermark/qwctl/commands.h deleted +0 -12
deleted file mode 100644
index 4a4e97475..000000000
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _COMMANDS_H_
-#define _COMMANDS_H_
-
-#include <cmdline_parse.h>
-
-extern cmdline_parse_ctx_t qwctl_ctx[];
-
-#endif /* _COMMANDS_H_ */
examples/quota_watermark/qwctl/qwctl.c deleted +0 -67

67 lines not on this page · raw message

examples/quota_watermark/qwctl/qwctl.h deleted +0 -12
deleted file mode 100644
index 2a4559388..000000000
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifndef _MAIN_H_
-#define _MAIN_H_
-
-extern int *quota;
-extern unsigned int *low_watermark;
-extern unsigned int *high_watermark;
-
-#endif /* _MAIN_H_ */
Signature · 1 line
2.17.1
#24 lore raw

PATCH v3 5/6 examples/netmap-compat: remove example

In reply to Ciara Power

Rather than providing a shim layer on top of netmap, we should instead encourage users to create apps using the DPDK APIs directly.

---

v3: Document removed application in release notes.

---
 MAINTAINERS                                   |   3 -
 doc/guides/rel_notes/release_19_11.rst        |   2 +
 doc/guides/sample_app_ug/index.rst            |   1 -
 .../sample_app_ug/netmap_compatibility.rst    | 130 ---
 examples/Makefile                             |   1 -
 examples/meson.build                          |   2 +-
 examples/netmap_compat/Makefile               |  22 -
 examples/netmap_compat/bridge/Makefile        |  35 -
 examples/netmap_compat/bridge/bridge.c        | 347 -------
 examples/netmap_compat/lib/compat_netmap.c    | 906 ------------------
 examples/netmap_compat/lib/compat_netmap.h    |  51 -
 examples/netmap_compat/meson.build            |  10 -
 examples/netmap_compat/netmap/netmap.h        | 289 ------
 examples/netmap_compat/netmap/netmap_user.h   |  95 --
 14 files changed, 3 insertions(+), 1891 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/netmap_compatibility.rst
 delete mode 100644 examples/netmap_compat/Makefile
 delete mode 100644 examples/netmap_compat/bridge/Makefile
 delete mode 100644 examples/netmap_compat/bridge/bridge.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.h
 delete mode 100644 examples/netmap_compat/meson.build
 delete mode 100644 examples/netmap_compat/netmap/netmap.h
 delete mode 100644 examples/netmap_compat/netmap/netmap_user.h
MAINTAINERS +0 -3
index 85e7b433f..dfe9355a5 100644
@@ -1491,9 +1491,6 @@ F: doc/guides/sample_app_ug/link_status_intr.rst
 F: examples/load_balancer/
 F: doc/guides/sample_app_ug/load_balancer.rst
 
-F: examples/netmap_compat/
-F: doc/guides/sample_app_ug/netmap_compatibility.rst
-
 L-threads - EXPERIMENTAL
 M: John McNamara <[email protected]>
 F: examples/performance-thread/
doc/guides/rel_notes/release_19_11.rst +2 -0
index c07763ce9..83ec7ef59 100644
@@ -191,6 +191,8 @@ Removed Items
 
   * Quota and Watermark
 
+  * Netmap Compatibility
+
 
 API Changes
 -----------
doc/guides/sample_app_ug/index.rst +0 -1
index dafe8553f..5f4924df6 100644
@@ -43,7 +43,6 @@ Sample Applications User Guides
     vhost_scsi
     vhost_crypto
     vdpa
-    netmap_compatibility
     ip_pipeline
     test_pipeline
     eventdev_pipeline
doc/guides/sample_app_ug/netmap_compatibility.rst deleted +0 -130

130 lines not on this page · raw message

examples/Makefile +0 -1
index 02ff86534..6bba09ce9 100644
@@ -50,7 +50,6 @@ endif
 DIRS-y += link_status_interrupt
 DIRS-$(CONFIG_RTE_LIBRTE_LPM) += load_balancer
 DIRS-y += multi_process
-DIRS-y += netmap_compat/bridge
 DIRS-y += ntb
 DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += packet_ordering
 ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
examples/meson.build +1 -1
index 6c26fffb4..f0356f2a1 100644
@@ -30,7 +30,7 @@ all_examples = [
 	'multi_process/hotplug_mp',
 	'multi_process/simple_mp',
 	'multi_process/symmetric_mp',
-	'netmap_compat', 'ntb', 'packet_ordering',
+	'ntb', 'packet_ordering',
 	'performance-thread', 'ptpclient',
 	'qos_meter', 'qos_sched',
 	'rxtx_callbacks',
examples/netmap_compat/Makefile deleted +0 -22
deleted file mode 100644
index b9f78d173..000000000
@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-unexport RTE_SRCDIR RTE_OUTPUT RTE_EXTMK
-
-DIRS-y += bridge
-
-.PHONY: all clean $(DIRS-y)
-
-all: $(DIRS-y)
-clean: $(DIRS-y)
-
-$(DIRS-y):
-	$(MAKE) -C $@ $(MAKECMDGOALS) O=$(RTE_OUTPUT)
examples/netmap_compat/bridge/Makefile deleted +0 -35
deleted file mode 100644
index 7ed30e57b..000000000
@@ -1,35 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define the RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-$(info This application can only operate in a linux environment, \
-please change the definition of the RTE_TARGET environment variable)
-all:
-clean:
-else
-
-# binary name
-APP = bridge
-
-# for compat_netmap.c
-VPATH := $(SRCDIR)/../lib
-
-# all source are stored in SRCS-y
-SRCS-y := bridge.c
-SRCS-y += compat_netmap.c
-
-CFLAGS += -O3 -I$(SRCDIR)/../lib -I$(SRCDIR)/../netmap
-CFLAGS += $(WERROR_FLAGS)
-
-include $(RTE_SDK)/mk/rte.extapp.mk
-
-endif
examples/netmap_compat/bridge/bridge.c deleted +0 -347

347 lines not on this page · raw message

examples/netmap_compat/lib/compat_netmap.c deleted +0 -906

906 lines not on this page · raw message

examples/netmap_compat/lib/compat_netmap.h deleted +0 -51

51 lines not on this page · raw message

examples/netmap_compat/meson.build deleted +0 -10
deleted file mode 100644
index c370d7476..000000000
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-# Example app currently unsupported by meson build
-build = false
examples/netmap_compat/netmap/netmap.h deleted +0 -289

289 lines not on this page · raw message

examples/netmap_compat/netmap/netmap_user.h deleted +0 -95

95 lines not on this page · raw message

Signature · 1 line
2.17.1
#25 lore raw

PATCH v3 6/6 examples/load_balancer: remove example

In reply to Ciara Power

This example can be removed because DPDK now has a range of libraries, especially rte_eventdev, that did not exist previously for load balancing, making this less relevant. Also, modern NIC cards have greater ability to do load balancing, e.g. using RSS, over a wider range of fields than earlier cards did.

---

v3: Document removed applications in release notes.

---
 MAINTAINERS                                |    3 -
 doc/guides/rel_notes/release_19_11.rst     |    2 +
 doc/guides/sample_app_ug/index.rst         |    1 -
 doc/guides/sample_app_ug/load_balancer.rst |  201 ----
 examples/Makefile                          |    1 -
 examples/load_balancer/Makefile            |   62 --
 examples/load_balancer/config.c            | 1030 --------------------
 examples/load_balancer/init.c              |  537 ----------
 examples/load_balancer/main.c              |   76 --
 examples/load_balancer/main.h              |  351 -------
 examples/load_balancer/meson.build         |   12 -
 examples/load_balancer/runtime.c           |  642 ------------
 examples/meson.build                       |    1 -
 13 files changed, 2 insertions(+), 2917 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/load_balancer.rst
 delete mode 100644 examples/load_balancer/Makefile
 delete mode 100644 examples/load_balancer/config.c
 delete mode 100644 examples/load_balancer/init.c
 delete mode 100644 examples/load_balancer/main.c
 delete mode 100644 examples/load_balancer/main.h
 delete mode 100644 examples/load_balancer/meson.build
 delete mode 100644 examples/load_balancer/runtime.c
MAINTAINERS +0 -3
index dfe9355a5..40f3c7257 100644
@@ -1488,9 +1488,6 @@ F: doc/guides/sample_app_ug/l3_forward.rst
 F: examples/link_status_interrupt/
 F: doc/guides/sample_app_ug/link_status_intr.rst
 
-F: examples/load_balancer/
-F: doc/guides/sample_app_ug/load_balancer.rst
-
 L-threads - EXPERIMENTAL
 M: John McNamara <[email protected]>
 F: examples/performance-thread/
doc/guides/rel_notes/release_19_11.rst +2 -0
index 83ec7ef59..7c807d554 100644
@@ -193,6 +193,8 @@ Removed Items
 
   * Netmap Compatibility
 
+  * Load Balancer
+
 
 API Changes
 -----------
doc/guides/sample_app_ug/index.rst +0 -1
index 5f4924df6..191eebb56 100644
@@ -30,7 +30,6 @@ Sample Applications User Guides
     l3_forward_power_man
     l3_forward_access_ctrl
     link_status_intr
-    load_balancer
     server_node_efd
     service_cores
     multi_process
doc/guides/sample_app_ug/load_balancer.rst deleted +0 -201

201 lines not on this page · raw message

examples/Makefile +0 -1
index 6bba09ce9..62d0865c5 100644
@@ -48,7 +48,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_HASH),yy)
 DIRS-$(CONFIG_RTE_LIBRTE_POWER) += l3fwd-power
 endif
 DIRS-y += link_status_interrupt
-DIRS-$(CONFIG_RTE_LIBRTE_LPM) += load_balancer
 DIRS-y += multi_process
 DIRS-y += ntb
 DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += packet_ordering
examples/load_balancer/Makefile deleted +0 -62

62 lines not on this page · raw message

examples/load_balancer/config.c deleted +0 -1030

1,030 lines not on this page · raw message

examples/load_balancer/init.c deleted +0 -537

537 lines not on this page · raw message

examples/load_balancer/main.c deleted +0 -76

76 lines not on this page · raw message

examples/load_balancer/main.h deleted +0 -351

351 lines not on this page · raw message

examples/load_balancer/meson.build deleted +0 -12
deleted file mode 100644
index 4f7ac3999..000000000
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-deps += 'lpm'
-sources = files(
-	'config.c', 'init.c', 'main.c', 'runtime.c'
-)
examples/load_balancer/runtime.c deleted +0 -642

642 lines not on this page · raw message

examples/meson.build +0 -1
index f0356f2a1..e4580f74a 100644
@@ -24,7 +24,6 @@ all_examples = [
 	'l2fwd-keepalive', 'l3fwd',
 	'l3fwd-acl', 'l3fwd-power',
 	'link_status_interrupt',
-	'load_balancer',
 	'multi_process/client_server_mp/mp_client',
 	'multi_process/client_server_mp/mp_server',
 	'multi_process/hotplug_mp',
Signature · 1 line
2.17.1
#26 lore raw
In reply to Ciara Power
Quoted 118 lines · Ciara Power

As discussed by the DPDK technical board e.g. [1][2] and on the DPDK mailing list [3], we have a lot of example applications shipped with DPDK - a number which increases with each DPDK release, and not all of which are probably needed any more. Therefore, this set removes 5 example applications from the repository.

v3:
- Document removed applications in release notes.
- Removed "from DPDK" in patch titles.

v2: Remove the table listing sample applications

[1] https://mails.dpdk.org/archives/dev/2019-May/132288.html
[2] https://mails.dpdk.org/archives/dev/2019-June/135847.html
[3] https://mails.dpdk.org/archives/dev/2019-July/138676.html

Bruce Richardson (2):
examples/exception_path: remove example
examples/l3fwd-vf: remove example

Ciara Power (4):
doc: remove unnecessary sample app guide table
examples/quota-watermark: remove example
examples/netmap-compat: remove example
examples/load_balancer: remove example

 MAINTAINERS                                   |   15 -
 doc/guides/rel_notes/release_19_11.rst        |   12 +
 doc/guides/sample_app_ug/exception_path.rst   |  281 -----
 doc/guides/sample_app_ug/index.rst            |    5 -
 doc/guides/sample_app_ug/intro.rst            |   44 +-
 .../sample_app_ug/l3_forward_virtual.rst      |   98 --
 doc/guides/sample_app_ug/load_balancer.rst    |  201 ---
 .../sample_app_ug/netmap_compatibility.rst    |  130 --
 doc/guides/sample_app_ug/quota_watermark.rst  |  465 -------
 examples/Makefile                             |    5 -
 examples/exception_path/Makefile              |   57 -
 examples/exception_path/main.c                |  605 ---------
 examples/exception_path/meson.build           |   11 -
 examples/l3fwd-vf/Makefile                    |   62 -
 examples/l3fwd-vf/main.c                      | 1077 -----------------
 examples/l3fwd-vf/meson.build                 |   12 -
 examples/load_balancer/Makefile               |   62 -
 examples/load_balancer/config.c               | 1030 ----------------
 examples/load_balancer/init.c                 |  537 --------
 examples/load_balancer/main.c                 |   76 --
 examples/load_balancer/main.h                 |  351 ------
 examples/load_balancer/meson.build            |   12 -
 examples/load_balancer/runtime.c              |  642 ----------
 examples/meson.build                          |    9 +-
 examples/netmap_compat/Makefile               |   22 -
 examples/netmap_compat/bridge/Makefile        |   35 -
 examples/netmap_compat/bridge/bridge.c        |  347 ------
 examples/netmap_compat/lib/compat_netmap.c    |  906 --------------
 examples/netmap_compat/lib/compat_netmap.h    |   51 -
 examples/netmap_compat/meson.build            |   10 -
 examples/netmap_compat/netmap/netmap.h        |  289 -----
 examples/netmap_compat/netmap/netmap_user.h   |   95 --
 examples/quota_watermark/Makefile             |   16 -
 examples/quota_watermark/include/conf.h       |   19 -
 examples/quota_watermark/meson.build          |   10 -
 examples/quota_watermark/qw/Makefile          |   22 -
 examples/quota_watermark/qw/args.c            |   78 --
 examples/quota_watermark/qw/args.h            |   12 -
 examples/quota_watermark/qw/init.c            |  168 ---
 examples/quota_watermark/qw/init.h            |   14 -
 examples/quota_watermark/qw/main.c            |  373 ------
 examples/quota_watermark/qw/main.h            |   31 -
 examples/quota_watermark/qwctl/Makefile       |   22 -
 examples/quota_watermark/qwctl/commands.c     |  196 ---
 examples/quota_watermark/qwctl/commands.h     |   12 -
 examples/quota_watermark/qwctl/qwctl.c        |   67 -
 examples/quota_watermark/qwctl/qwctl.h        |   12 -
 47 files changed, 17 insertions(+), 8589 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/exception_path.rst
 delete mode 100644 doc/guides/sample_app_ug/l3_forward_virtual.rst
 delete mode 100644 doc/guides/sample_app_ug/load_balancer.rst
 delete mode 100644 doc/guides/sample_app_ug/netmap_compatibility.rst
 delete mode 100644 doc/guides/sample_app_ug/quota_watermark.rst
 delete mode 100644 examples/exception_path/Makefile
 delete mode 100644 examples/exception_path/main.c
 delete mode 100644 examples/exception_path/meson.build
 delete mode 100644 examples/l3fwd-vf/Makefile
 delete mode 100644 examples/l3fwd-vf/main.c
 delete mode 100644 examples/l3fwd-vf/meson.build
 delete mode 100644 examples/load_balancer/Makefile
 delete mode 100644 examples/load_balancer/config.c
 delete mode 100644 examples/load_balancer/init.c
 delete mode 100644 examples/load_balancer/main.c
 delete mode 100644 examples/load_balancer/main.h
 delete mode 100644 examples/load_balancer/meson.build
 delete mode 100644 examples/load_balancer/runtime.c
 delete mode 100644 examples/netmap_compat/Makefile
 delete mode 100644 examples/netmap_compat/bridge/Makefile
 delete mode 100644 examples/netmap_compat/bridge/bridge.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.c
 delete mode 100644 examples/netmap_compat/lib/compat_netmap.h
 delete mode 100644 examples/netmap_compat/meson.build
 delete mode 100644 examples/netmap_compat/netmap/netmap.h
 delete mode 100644 examples/netmap_compat/netmap/netmap_user.h
 delete mode 100644 examples/quota_watermark/Makefile
 delete mode 100644 examples/quota_watermark/include/conf.h
 delete mode 100644 examples/quota_watermark/meson.build
 delete mode 100644 examples/quota_watermark/qw/Makefile
 delete mode 100644 examples/quota_watermark/qw/args.c
 delete mode 100644 examples/quota_watermark/qw/args.h
 delete mode 100644 examples/quota_watermark/qw/init.c
 delete mode 100644 examples/quota_watermark/qw/init.h
 delete mode 100644 examples/quota_watermark/qw/main.c
 delete mode 100644 examples/quota_watermark/qw/main.h
 delete mode 100644 examples/quota_watermark/qwctl/Makefile
 delete mode 100644 examples/quota_watermark/qwctl/commands.c
 delete mode 100644 examples/quota_watermark/qwctl/commands.h
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.c
 delete mode 100644 examples/quota_watermark/qwctl/qwctl.h
Quoted 3 lines

--
2.17.1

Moved vhost-scsi removal notice into the list of removed example introduced by this patchset.
Sorted this list alphabetically.

Applied, thanks.

Signature · 1 line
David Marchand