Skip to contentSkip to conversation

Remove disabled functionality

PATCH In review Stephen Hemminger 4 participants 9 messages Aug 1, 2023 – Aug 9, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover Remove disabled functionality

The KNI and flow_classify library were already marked disabled in 23.11 release.

Stephen Hemminger (2):
flow_classify: remove library
kni: remove deprecated kernel network interface

 MAINTAINERS                                   |  17 -
 app/test/meson.build                          |   6 -
 app/test/test_flow_classify.c                 | 895 ------------------
 app/test/test_flow_classify.h                 |  26 -
 app/test/test_kni.c                           | 740 ---------------
 doc/api/doxy-api-index.md                     |   3 -
 doc/api/doxy-api.conf.in                      |   2 -
 doc/guides/contributing/documentation.rst     |   4 +-
 doc/guides/freebsd_gsg/build_sample_apps.rst  |   2 +-
 doc/guides/freebsd_gsg/install_from_ports.rst |   2 +-
 doc/guides/howto/flow_bifurcation.rst         |   3 +-
 doc/guides/nics/index.rst                     |   1 -
 doc/guides/nics/kni.rst                       | 170 ----
 doc/guides/nics/virtio.rst                    |  92 +-
 .../prog_guide/env_abstraction_layer.rst      |   2 -
 doc/guides/prog_guide/flow_classify_lib.rst   | 424 ---------
 doc/guides/prog_guide/glossary.rst            |   3 -
 doc/guides/prog_guide/index.rst               |   2 -
 .../prog_guide/kernel_nic_interface.rst       | 423 ---------
 doc/guides/prog_guide/packet_framework.rst    |   9 +-
 doc/guides/rel_notes/deprecation.rst          |  15 +-
 doc/guides/rel_notes/release_23_11.rst        |   4 +
 doc/guides/sample_app_ug/flow_classify.rst    | 242 -----
 doc/guides/sample_app_ug/index.rst            |   1 -
 doc/guides/sample_app_ug/ip_pipeline.rst      |  22 -
 drivers/net/cnxk/cnxk_ethdev.c                |   2 +-
 drivers/net/kni/meson.build                   |  11 -
 drivers/net/kni/rte_eth_kni.c                 | 524 ----------
 drivers/net/meson.build                       |   1 -
 examples/flow_classify/Makefile               |  51 -
 examples/flow_classify/flow_classify.c        | 878 -----------------
 examples/flow_classify/ipv4_rules_file.txt    |  14 -
 examples/flow_classify/meson.build            |  13 -
 examples/ip_pipeline/Makefile                 |   1 -
 examples/ip_pipeline/cli.c                    |  95 --
 examples/ip_pipeline/examples/kni.cli         |  69 --
 examples/ip_pipeline/kni.c                    | 168 ----
 examples/ip_pipeline/kni.h                    |  46 -
 examples/ip_pipeline/main.c                   |  10 -
 examples/ip_pipeline/meson.build              |   1 -
 examples/ip_pipeline/pipeline.c               |  57 --
 examples/ip_pipeline/pipeline.h               |   2 -
 examples/meson.build                          |   1 -
 kernel/linux/kni/Kbuild                       |   6 -
 kernel/linux/kni/compat.h                     | 157 ---
 kernel/linux/kni/kni_dev.h                    | 137 ---
 kernel/linux/kni/kni_fifo.h                   |  87 --
 kernel/linux/kni/kni_misc.c                   | 719 --------------
 kernel/linux/kni/kni_net.c                    | 878 -----------------
 kernel/linux/kni/meson.build                  |  41 -
 kernel/linux/meson.build                      |   2 +-
 lib/eal/common/eal_common_log.c               |   1 -
 lib/eal/include/rte_log.h                     |   2 +-
 lib/eal/linux/eal.c                           |  19 -
 lib/flow_classify/meson.build                 |  12 -
 lib/flow_classify/rte_flow_classify.c         | 670 -------------
 lib/flow_classify/rte_flow_classify.h         | 284 ------
 lib/flow_classify/rte_flow_classify_parse.c   | 532 -----------
 lib/flow_classify/rte_flow_classify_parse.h   |  58 --
 lib/flow_classify/version.map                 |  13 -
 lib/kni/meson.build                           |  21 -
 lib/kni/rte_kni.c                             | 843 -----------------
 lib/kni/rte_kni.h                             | 269 ------
 lib/kni/rte_kni_common.h                      | 147 ---
 lib/kni/rte_kni_fifo.h                        | 117 ---
 lib/kni/version.map                           |  24 -
 lib/meson.build                               |   9 -
 lib/port/meson.build                          |   6 -
 lib/port/rte_port_kni.c                       | 515 ----------
 lib/port/rte_port_kni.h                       |  63 --
 lib/port/version.map                          |   3 -
 meson_options.txt                             |   2 +-
 72 files changed, 18 insertions(+), 10673 deletions(-)
 delete mode 100644 app/test/test_flow_classify.c
 delete mode 100644 app/test/test_flow_classify.h
 delete mode 100644 app/test/test_kni.c
 delete mode 100644 doc/guides/nics/kni.rst
 delete mode 100644 doc/guides/prog_guide/flow_classify_lib.rst
 delete mode 100644 doc/guides/prog_guide/kernel_nic_interface.rst
 delete mode 100644 doc/guides/sample_app_ug/flow_classify.rst
 delete mode 100644 drivers/net/kni/meson.build
 delete mode 100644 drivers/net/kni/rte_eth_kni.c
 delete mode 100644 examples/flow_classify/Makefile
 delete mode 100644 examples/flow_classify/flow_classify.c
 delete mode 100644 examples/flow_classify/ipv4_rules_file.txt
 delete mode 100644 examples/flow_classify/meson.build
 delete mode 100644 examples/ip_pipeline/examples/kni.cli
 delete mode 100644 examples/ip_pipeline/kni.c
 delete mode 100644 examples/ip_pipeline/kni.h
 delete mode 100644 kernel/linux/kni/Kbuild
 delete mode 100644 kernel/linux/kni/compat.h
 delete mode 100644 kernel/linux/kni/kni_dev.h
 delete mode 100644 kernel/linux/kni/kni_fifo.h
 delete mode 100644 kernel/linux/kni/kni_misc.c
 delete mode 100644 kernel/linux/kni/kni_net.c
 delete mode 100644 kernel/linux/kni/meson.build
 delete mode 100644 lib/flow_classify/meson.build
 delete mode 100644 lib/flow_classify/rte_flow_classify.c
 delete mode 100644 lib/flow_classify/rte_flow_classify.h
 delete mode 100644 lib/flow_classify/rte_flow_classify_parse.c
 delete mode 100644 lib/flow_classify/rte_flow_classify_parse.h
 delete mode 100644 lib/flow_classify/version.map
 delete mode 100644 lib/kni/meson.build
 delete mode 100644 lib/kni/rte_kni.c
 delete mode 100644 lib/kni/rte_kni.h
 delete mode 100644 lib/kni/rte_kni_common.h
 delete mode 100644 lib/kni/rte_kni_fifo.h
 delete mode 100644 lib/kni/version.map
 delete mode 100644 lib/port/rte_port_kni.c
 delete mode 100644 lib/port/rte_port_kni.h
Signature · 1 line
2.39.2
#1 lore raw

PATCH v2 1/2 flow_classify: remove library

The flow_classify library was marked for removal last year because there was no maintainer and the functionality is limited.

---
 MAINTAINERS                                   |   7 -
 app/test/meson.build                          |   4 -
 app/test/test_flow_classify.c                 | 895 ------------------
 app/test/test_flow_classify.h                 |  26 -
 doc/api/doxy-api-index.md                     |   1 -
 doc/api/doxy-api.conf.in                      |   1 -
 doc/guides/freebsd_gsg/build_sample_apps.rst  |   2 +-
 doc/guides/freebsd_gsg/install_from_ports.rst |   2 +-
 doc/guides/prog_guide/flow_classify_lib.rst   | 424 ---------
 doc/guides/prog_guide/index.rst               |   1 -
 doc/guides/rel_notes/deprecation.rst          |   8 +-
 doc/guides/rel_notes/release_23_11.rst        |   2 +
 doc/guides/sample_app_ug/flow_classify.rst    | 242 -----
 doc/guides/sample_app_ug/index.rst            |   1 -
 examples/flow_classify/Makefile               |  51 -
 examples/flow_classify/flow_classify.c        | 878 -----------------
 examples/flow_classify/ipv4_rules_file.txt    |  14 -
 examples/flow_classify/meson.build            |  13 -
 examples/meson.build                          |   1 -
 lib/flow_classify/meson.build                 |  12 -
 lib/flow_classify/rte_flow_classify.c         | 670 -------------
 lib/flow_classify/rte_flow_classify.h         | 284 ------
 lib/flow_classify/rte_flow_classify_parse.c   | 532 -----------
 lib/flow_classify/rte_flow_classify_parse.h   |  58 --
 lib/flow_classify/version.map                 |  13 -
 lib/meson.build                               |   3 -
 meson_options.txt                             |   2 +-
 27 files changed, 6 insertions(+), 4141 deletions(-)
 delete mode 100644 app/test/test_flow_classify.c
 delete mode 100644 app/test/test_flow_classify.h
 delete mode 100644 doc/guides/prog_guide/flow_classify_lib.rst
 delete mode 100644 doc/guides/sample_app_ug/flow_classify.rst
 delete mode 100644 examples/flow_classify/Makefile
 delete mode 100644 examples/flow_classify/flow_classify.c
 delete mode 100644 examples/flow_classify/ipv4_rules_file.txt
 delete mode 100644 examples/flow_classify/meson.build
 delete mode 100644 lib/flow_classify/meson.build
 delete mode 100644 lib/flow_classify/rte_flow_classify.c
 delete mode 100644 lib/flow_classify/rte_flow_classify.h
 delete mode 100644 lib/flow_classify/rte_flow_classify_parse.c
 delete mode 100644 lib/flow_classify/rte_flow_classify_parse.h
 delete mode 100644 lib/flow_classify/version.map
MAINTAINERS +0 -7
index 18bc05fccd0d..dbb25211c367 100644
@@ -1511,13 +1511,6 @@ F: lib/pdcp/
 F: doc/guides/prog_guide/pdcp_lib.rst
 F: app/test/test_pdcp*
 
-Flow Classify - EXPERIMENTAL - UNMAINTAINED
-F: lib/flow_classify/
-F: app/test/test_flow_classify*
-F: doc/guides/prog_guide/flow_classify_lib.rst
-F: examples/flow_classify/
-F: doc/guides/sample_app_ug/flow_classify.rst
-
 Distributor
 M: David Hunt <[email protected]>
 F: lib/distributor/
app/test/meson.build +0 -4
index b89cf0368fb5..90a2e350c7ae 100644
@@ -359,10 +359,6 @@ if dpdk_conf.has('RTE_EVENT_SKELETON')
     test_deps += 'event_skeleton'
 endif
 
-if dpdk_conf.has('RTE_LIB_FLOW_CLASSIFY')
-    test_sources += 'test_flow_classify.c'
-    fast_tests += [['flow_classify_autotest', false, true]]
-endif
 if dpdk_conf.has('RTE_LIB_GRAPH')
     test_sources += 'test_graph.c'
     fast_tests += [['graph_autotest', true, true]]
app/test/test_flow_classify.c deleted +0 -895

895 lines not on this page · raw message

app/test/test_flow_classify.h deleted +0 -26
deleted file mode 100644
index 6bd10ec972e5..000000000000
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2017 Intel Corporation
- */
-
-#ifndef TEST_FLOW_CLASSIFY_H_
-#define TEST_FLOW_CLASSIFY_H_
-
-/* ACL field definitions for IPv4 5 tuple rule */
-
-enum {
-	PROTO_FIELD_IPV4,
-	SRC_FIELD_IPV4,
-	DST_FIELD_IPV4,
-	SRCP_FIELD_IPV4,
-	DSTP_FIELD_IPV4,
-	NUM_FIELDS_IPV4
-};
-
-enum {
-	PROTO_INPUT_IPV4,
-	SRC_INPUT_IPV4,
-	DST_INPUT_IPV4,
-	SRCP_DESTP_INPUT_IPV4
-};
-
-#endif /* TEST_FLOW_CLASSIFY_H_ */
doc/api/doxy-api-index.md +0 -1
index 3bc8778981f6..5cd8c9de8105 100644
@@ -160,7 +160,6 @@ The public API headers are grouped by topics:
   [EFD](@ref rte_efd.h),
   [ACL](@ref rte_acl.h),
   [member](@ref rte_member.h),
-  [flow classify](@ref rte_flow_classify.h),
   [BPF](@ref rte_bpf.h)
 
 - **containers**:
doc/api/doxy-api.conf.in +0 -1
index 1a4210b948a8..9a9c52e5569c 100644
@@ -40,7 +40,6 @@ INPUT                   = @TOPDIR@/doc/api/doxy-api-index.md \
                           @TOPDIR@/lib/ethdev \
                           @TOPDIR@/lib/eventdev \
                           @TOPDIR@/lib/fib \
-                          @TOPDIR@/lib/flow_classify \
                           @TOPDIR@/lib/gpudev \
                           @TOPDIR@/lib/graph \
                           @TOPDIR@/lib/gro \
doc/guides/freebsd_gsg/build_sample_apps.rst +1 -1
index b1ab7545b1ce..7bdd88e56d32 100644
@@ -31,7 +31,7 @@ the installation of DPDK using `meson install` as described previously::
         $ gmake
         cc -O3 -I/usr/local/include -include rte_config.h -march=native
         -D__BSD_VISIBLE  main.c -o build/helloworld-shared
-        -L/usr/local/lib -lrte_telemetry -lrte_bpf -lrte_flow_classify
+        -L/usr/local/lib -lrte_telemetry -lrte_bpf
         -lrte_pipeline -lrte_table -lrte_port -lrte_fib -lrte_ipsec
         -lrte_stack -lrte_security -lrte_sched -lrte_reorder -lrte_rib
         -lrte_rcu -lrte_rawdev -lrte_pdump -lrte_member -lrte_lpm
doc/guides/freebsd_gsg/install_from_ports.rst +1 -1
index d946f3f3b2eb..3c98c46b298f 100644
@@ -84,7 +84,7 @@ via the contigmem module, and 4 NIC ports bound to the nic_uio module::
     cd helloworld/
 
     gmake
-    cc -O3 -I/usr/local/include -include rte_config.h -march=corei7 -D__BSD_VISIBLE  main.c -o build/helloworld-shared  -L/usr/local/lib -lrte_bpf -lrte_flow_classify -lrte_pipeline -lrte_table -lrte_port -lrte_fib -lrte_ipsec -lrte_stack -lrte_security -lrte_sched -lrte_reorder -lrte_rib -lrte_rcu -lrte_rawdev -lrte_pdump -lrte_member -lrte_lpm -lrte_latencystats -lrte_jobstats -lrte_ip_frag -lrte_gso -lrte_gro -lrte_eventdev -lrte_efd -lrte_distributor -lrte_cryptodev -lrte_compressdev -lrte_cfgfile -lrte_bitratestats -lrte_bbdev -lrte_acl -lrte_timer -lrte_hash -lrte_metrics -lrte_cmdline -lrte_pci -lrte_ethdev -lrte_meter -lrte_net -lrte_mbuf -lrte_mempool -lrte_ring -lrte_eal -lrte_kvargs
+    cc -O3 -I/usr/local/include -include rte_config.h -march=corei7 -D__BSD_VISIBLE  main.c -o build/helloworld-shared  -L/usr/local/lib -lrte_bpf -lrte_pipeline -lrte_table -lrte_port -lrte_fib -lrte_ipsec -lrte_stack -lrte_security -lrte_sched -lrte_reorder -lrte_rib -lrte_rcu -lrte_rawdev -lrte_pdump -lrte_member -lrte_lpm -lrte_latencystats -lrte_jobstats -lrte_ip_frag -lrte_gso -lrte_gro -lrte_eventdev -lrte_efd -lrte_distributor -lrte_cryptodev -lrte_compressdev -lrte_cfgfile -lrte_bitratestats -lrte_bbdev -lrte_acl -lrte_timer -lrte_hash -lrte_metrics -lrte_cmdline -lrte_pci -lrte_ethdev -lrte_meter -lrte_net -lrte_mbuf -lrte_mempool -lrte_ring -lrte_eal -lrte_kvargs
     ln -sf helloworld-shared build/helloworld
 
     sudo ./build/helloworld -l 0-3
doc/guides/prog_guide/flow_classify_lib.rst deleted +0 -424

424 lines not on this page · raw message

doc/guides/prog_guide/index.rst +0 -1
index d89cd3edb63c..c04847bfa148 100644
@@ -43,7 +43,6 @@ Programmer's Guide
     lpm6_lib
     fib_lib
     rib_lib
-    flow_classify_lib
     packet_distrib_lib
     reorder_lib
     ip_fragment_reassembly_lib
doc/guides/rel_notes/deprecation.rst +1 -7
index 494b401cda4b..ce5a8f0361cb 100644
@@ -35,7 +35,7 @@ Deprecation Notices
     which also added support for standard atomics
     (Ref: https://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html)
 
-* build: Enabling deprecated libraries (``flow_classify``, ``kni``)
+* build: Enabling deprecated libraries (``kni``)
   won't be possible anymore through the use of the ``disable_libs`` build option.
   A new build option for deprecated libraries will be introduced instead.
 
@@ -200,12 +200,6 @@ Deprecation Notices
   Since these functions are not called directly by the application,
   the API remains unaffected.
 
-* flow_classify: The flow_classify library and example have no maintainer.
-  The library is experimental and, as such, it could be removed from DPDK.
-  Its removal has been postponed to let potential users report interest
-  in maintaining it.
-  In the absence of such interest, this library will be removed in DPDK 23.11.
-
 * pipeline: The pipeline library legacy API (functions rte_pipeline_*)
   will be deprecated and subsequently removed in DPDK 24.11 release.
   Before this, the new pipeline library API (functions rte_swx_pipeline_*)
doc/guides/rel_notes/release_23_11.rst +2 -0
index 6b4dd21fd0e1..9d96dbdcd302 100644
@@ -68,6 +68,8 @@ Removed Items
    Also, make sure to start the actual text at the margin.
    =======================================================
 
+* flow_classify: Removed flow classification library and examples.
+
 
 API Changes
 -----------
doc/guides/sample_app_ug/flow_classify.rst deleted +0 -242

242 lines not on this page · raw message

doc/guides/sample_app_ug/index.rst +0 -1
index 6e1e83d7d7c8..19485556c765 100644
@@ -15,7 +15,6 @@ Sample Applications User Guides
     hello_world
     skeleton
     rxtx_callbacks
-    flow_classify
     flow_filtering
     ip_frag
     ipv4_multicast
examples/flow_classify/Makefile deleted +0 -51

51 lines not on this page · raw message

examples/flow_classify/flow_classify.c deleted +0 -878

878 lines not on this page · raw message

examples/flow_classify/ipv4_rules_file.txt deleted +0 -14
deleted file mode 100644
index cd5215736aaf..000000000000
@@ -1,14 +0,0 @@
-#file format:
-#src_ip/masklen dst_ip/masklen src_port : mask dst_port : mask proto/mask priority
-#
-2.2.2.3/24 2.2.2.7/24 32 : 0xffff 33 : 0xffff 17/0xff 0
-9.9.9.3/24 9.9.9.7/24 32 : 0xffff 33 : 0xffff 17/0xff 1
-9.9.9.3/24 9.9.9.7/24 32 : 0xffff 33 : 0xffff 6/0xff 2
-9.9.8.3/24 9.9.8.7/24 32 : 0xffff 33 : 0xffff 6/0xff 3
-6.7.8.9/24 2.3.4.5/24 32 : 0x0000 33 : 0x0000 132/0xff 4
-6.7.8.9/32 192.168.0.36/32 10 : 0xffff 11 : 0xffff 6/0xfe 5
-6.7.8.9/24 192.168.0.36/24 10 : 0xffff 11 : 0xffff 6/0xfe 6
-6.7.8.9/16 192.168.0.36/16 10 : 0xffff 11 : 0xffff 6/0xfe 7
-6.7.8.9/8 192.168.0.36/8 10 : 0xffff 11 : 0xffff 6/0xfe 8
-#error rules
-#9.8.7.6/8 192.168.0.36/8 10 : 0xffff 11 : 0xffff 6/0xfe 9
examples/flow_classify/meson.build deleted +0 -13
deleted file mode 100644
index 1be1bf037427..000000000000
@@ -1,13 +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 += 'flow_classify'
-allow_experimental_apis = true
-sources = files(
-        'flow_classify.c',
-)
examples/meson.build +0 -1
index 55ba8847a053..65c8303a9d23 100644
@@ -16,7 +16,6 @@ all_examples = [
         'ethtool',
         'eventdev_pipeline',
         'fips_validation',
-        'flow_classify',
         'flow_filtering',
         'helloworld',
         'ip_fragmentation',
lib/flow_classify/meson.build deleted +0 -12
deleted file mode 100644
index 3bb861c68fb5..000000000000
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-if is_windows
-    build = false
-    reason = 'not supported on Windows'
-    subdir_done()
-endif
-
-sources = files('rte_flow_classify.c', 'rte_flow_classify_parse.c')
-headers = files('rte_flow_classify.h')
-deps += ['net', 'table']
lib/flow_classify/rte_flow_classify.c deleted +0 -670

343 lines not on this page · raw message

lib/flow_classify/rte_flow_classify.h deleted +0 -284

284 lines not on this page · raw message

lib/flow_classify/rte_flow_classify_parse.c deleted +0 -532

532 lines not on this page · raw message

lib/flow_classify/rte_flow_classify_parse.h deleted +0 -58

58 lines not on this page · raw message

lib/flow_classify/version.map deleted +0 -13
deleted file mode 100644
index 49bc25c6a087..000000000000

Lines of this file are not shown. View the raw message.

lib/meson.build +0 -3
index fac2f52cad4f..ecac701161c8 100644

Lines of this file are not shown. View the raw message.

meson_options.txt +1 -1
index 82c8297065f0..95e22e0ce70c 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.39.2

Part of the diff is not shown here. View the raw message.

#2 lore raw

PATCH v2 2/2 kni: remove deprecated kernel network interface

In reply to Stephen Hemminger

The KNI driver had design flaws such as calling userspace with kernel mutex held that made it prone to deadlock. The design also introduced security risks because the kernel driver trusted that the userspace (DPDK) kni interface. The kernel driver was never reviewed by the upstream kernel community and would never have been accepted.

And since the Linux kernel API is not stable, it was a continual source of maintenance issues especially with distribution kernels.

There are better ways to inject packets into the kernel such as virtio_user, tap and XDP drivers. All of these do not need out of tree kernel drivers.

The deprecation was announced in 22.11 release; and users were directed to alternatives there.

---
 MAINTAINERS                                   |  10 -
 app/test/meson.build                          |   2 -
 app/test/test_kni.c                           | 740 ---------------
 doc/api/doxy-api-index.md                     |   2 -
 doc/api/doxy-api.conf.in                      |   1 -
 doc/guides/contributing/documentation.rst     |   4 +-
 doc/guides/howto/flow_bifurcation.rst         |   3 +-
 doc/guides/nics/index.rst                     |   1 -
 doc/guides/nics/kni.rst                       | 170 ----
 doc/guides/nics/virtio.rst                    |  92 +-
 .../prog_guide/env_abstraction_layer.rst      |   2 -
 doc/guides/prog_guide/glossary.rst            |   3 -
 doc/guides/prog_guide/index.rst               |   1 -
 .../prog_guide/kernel_nic_interface.rst       | 423 ---------
 doc/guides/prog_guide/packet_framework.rst    |   9 +-
 doc/guides/rel_notes/deprecation.rst          |   9 +-
 doc/guides/rel_notes/release_23_11.rst        |   2 +
 doc/guides/sample_app_ug/ip_pipeline.rst      |  22 -
 drivers/net/cnxk/cnxk_ethdev.c                |   2 +-
 drivers/net/kni/meson.build                   |  11 -
 drivers/net/kni/rte_eth_kni.c                 | 524 -----------
 drivers/net/meson.build                       |   1 -
 examples/ip_pipeline/Makefile                 |   1 -
 examples/ip_pipeline/cli.c                    |  95 --
 examples/ip_pipeline/examples/kni.cli         |  69 --
 examples/ip_pipeline/kni.c                    | 168 ----
 examples/ip_pipeline/kni.h                    |  46 -
 examples/ip_pipeline/main.c                   |  10 -
 examples/ip_pipeline/meson.build              |   1 -
 examples/ip_pipeline/pipeline.c               |  57 --
 examples/ip_pipeline/pipeline.h               |   2 -
 kernel/linux/kni/Kbuild                       |   6 -
 kernel/linux/kni/compat.h                     | 157 ----
 kernel/linux/kni/kni_dev.h                    | 137 ---
 kernel/linux/kni/kni_fifo.h                   |  87 --
 kernel/linux/kni/kni_misc.c                   | 719 --------------
 kernel/linux/kni/kni_net.c                    | 878 ------------------
 kernel/linux/kni/meson.build                  |  41 -
 kernel/linux/meson.build                      |   2 +-
 lib/eal/common/eal_common_log.c               |   1 -
 lib/eal/include/rte_log.h                     |   2 +-
 lib/eal/linux/eal.c                           |  19 -
 lib/kni/meson.build                           |  21 -
 lib/kni/rte_kni.c                             | 843 -----------------
 lib/kni/rte_kni.h                             | 269 ------
 lib/kni/rte_kni_common.h                      | 147 ---
 lib/kni/rte_kni_fifo.h                        | 117 ---
 lib/kni/version.map                           |  24 -
 lib/meson.build                               |   6 -
 lib/port/meson.build                          |   6 -
 lib/port/rte_port_kni.c                       | 515 ----------
 lib/port/rte_port_kni.h                       |  63 --
 lib/port/version.map                          |   3 -
 meson_options.txt                             |   2 +-
 54 files changed, 14 insertions(+), 6534 deletions(-)
 delete mode 100644 app/test/test_kni.c
 delete mode 100644 doc/guides/nics/kni.rst
 delete mode 100644 doc/guides/prog_guide/kernel_nic_interface.rst
 delete mode 100644 drivers/net/kni/meson.build
 delete mode 100644 drivers/net/kni/rte_eth_kni.c
 delete mode 100644 examples/ip_pipeline/examples/kni.cli
 delete mode 100644 examples/ip_pipeline/kni.c
 delete mode 100644 examples/ip_pipeline/kni.h
 delete mode 100644 kernel/linux/kni/Kbuild
 delete mode 100644 kernel/linux/kni/compat.h
 delete mode 100644 kernel/linux/kni/kni_dev.h
 delete mode 100644 kernel/linux/kni/kni_fifo.h
 delete mode 100644 kernel/linux/kni/kni_misc.c
 delete mode 100644 kernel/linux/kni/kni_net.c
 delete mode 100644 kernel/linux/kni/meson.build
 delete mode 100644 lib/kni/meson.build
 delete mode 100644 lib/kni/rte_kni.c
 delete mode 100644 lib/kni/rte_kni.h
 delete mode 100644 lib/kni/rte_kni_common.h
 delete mode 100644 lib/kni/rte_kni_fifo.h
 delete mode 100644 lib/kni/version.map
 delete mode 100644 lib/port/rte_port_kni.c
 delete mode 100644 lib/port/rte_port_kni.h
MAINTAINERS +0 -10
index dbb25211c367..6345e7f8a65d 100644
@@ -617,12 +617,6 @@ F: doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
 F: app/test/test_link_bonding*
 F: examples/bond/
 
-Linux KNI
-F: kernel/linux/kni/
-F: lib/kni/
-F: doc/guides/prog_guide/kernel_nic_interface.rst
-F: app/test/test_kni.c
-
 Linux AF_PACKET
 M: John W. Linville <[email protected]>
 F: drivers/net/af_packet/
@@ -1027,10 +1021,6 @@ F: drivers/net/tap/
 F: doc/guides/nics/tap.rst
 F: doc/guides/nics/features/tap.ini
 
-KNI PMD
-F: drivers/net/kni/
-F: doc/guides/nics/kni.rst
-
 Ring PMD
 M: Bruce Richardson <[email protected]>
 F: drivers/net/ring/
app/test/meson.build +0 -2
index 90a2e350c7ae..66897c14a399 100644
@@ -72,7 +72,6 @@ test_sources = files(
         'test_ipsec.c',
         'test_ipsec_sad.c',
         'test_ipsec_perf.c',
-        'test_kni.c',
         'test_kvargs.c',
         'test_lcores.c',
         'test_logs.c',
@@ -237,7 +236,6 @@ fast_tests = [
         ['fbarray_autotest', true, true],
         ['hash_readwrite_func_autotest', false, true],
         ['ipsec_autotest', true, true],
-        ['kni_autotest', false, true],
         ['kvargs_autotest', true, true],
         ['member_autotest', true, true],
         ['power_cpufreq_autotest', false, true],
app/test/test_kni.c deleted +0 -740

740 lines not on this page · raw message

doc/api/doxy-api-index.md +0 -2
index 5cd8c9de8105..fdeda139329e 100644
@@ -43,7 +43,6 @@ The public API headers are grouped by topics:
   [bond](@ref rte_eth_bond.h),
   [vhost](@ref rte_vhost.h),
   [vdpa](@ref rte_vdpa.h),
-  [KNI](@ref rte_kni.h),
   [ixgbe](@ref rte_pmd_ixgbe.h),
   [i40e](@ref rte_pmd_i40e.h),
   [iavf](@ref rte_pmd_iavf.h),
@@ -177,7 +176,6 @@ The public API headers are grouped by topics:
     [frag](@ref rte_port_frag.h),
     [reass](@ref rte_port_ras.h),
     [sched](@ref rte_port_sched.h),
-    [kni](@ref rte_port_kni.h),
     [src/sink](@ref rte_port_source_sink.h)
   * [table](@ref rte_table.h):
     [lpm IPv4](@ref rte_table_lpm.h),
doc/api/doxy-api.conf.in +0 -1
index 9a9c52e5569c..31885039c768 100644
@@ -48,7 +48,6 @@ INPUT                   = @TOPDIR@/doc/api/doxy-api-index.md \
                           @TOPDIR@/lib/ip_frag \
                           @TOPDIR@/lib/ipsec \
                           @TOPDIR@/lib/jobstats \
-                          @TOPDIR@/lib/kni \
                           @TOPDIR@/lib/kvargs \
                           @TOPDIR@/lib/latencystats \
                           @TOPDIR@/lib/lpm \
doc/guides/contributing/documentation.rst +2 -2
index 7fcbb7fc43b2..38e184a130ee 100644
@@ -94,8 +94,8 @@ added to by the developer.
 
 * **The Programmers Guide**
 
-  The Programmers Guide explains how the API components of DPDK such as the EAL, Memzone, Rings and the Hash Library work.
-  It also explains how some higher level functionality such as Packet Distributor, Packet Framework and KNI work.
+  The Programmers Guide explains how the API components of the DPDK such as the EAL, Memzone, Rings and the Hash Library work.
+  It also describes how some of the higher level functionality such as Packet Distributor and Packet Framework.
   It also shows the build system and explains how to add applications.
 
   The Programmers Guide should be expanded when new functionality is added to DPDK.
doc/guides/howto/flow_bifurcation.rst +1 -2
index 838eb2a4cc89..554dd24c32c5 100644
@@ -7,8 +7,7 @@ Flow Bifurcation How-to Guide
 Flow Bifurcation is a mechanism which uses hardware capable Ethernet devices
 to split traffic between Linux user space and kernel space. Since it is a
 hardware assisted feature this approach can provide line rate processing
-capability. Other than :ref:`KNI <kni>`, the software is just required to
-enable device configuration, there is no need to take care of the packet
+capability. There is no need to take care of the packet
 movement during the traffic split. This can yield better performance with
 less CPU overhead.
 
doc/guides/nics/index.rst +0 -1
index 31296822e5ec..7bfcac880f44 100644
@@ -43,7 +43,6 @@ Network Interface Controller Drivers
     ionic
     ipn3ke
     ixgbe
-    kni
     mana
     memif
     mlx4
doc/guides/nics/kni.rst deleted +0 -170

170 lines not on this page · raw message

doc/guides/nics/virtio.rst +1 -91

109 lines not on this page · raw message

doc/guides/prog_guide/env_abstraction_layer.rst +0 -2
index 93c8a031be56..5d382fdd9032 100644
@@ -610,8 +610,6 @@ devices would fail anyway.
     ``RTE_PCI_DRV_NEED_IOVA_AS_VA`` flag is used to dictate that this PCI
     driver can only work in RTE_IOVA_VA mode.
 
-    When the KNI kernel module is detected, RTE_IOVA_PA mode is preferred as a
-    performance penalty is expected in RTE_IOVA_VA mode.
 
 IOVA Mode Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~
doc/guides/prog_guide/glossary.rst +0 -3
index fb0910ba5b3f..8d6349701e43 100644
@@ -103,9 +103,6 @@ lcore
    A logical execution unit of the processor, sometimes called a *hardware
    thread*.
 
-KNI
-   Kernel Network Interface
-
 L1
    Layer 1
 
doc/guides/prog_guide/index.rst +0 -1
index c04847bfa148..2c47d9d010f4 100644
@@ -53,7 +53,6 @@ Programmer's Guide
     pcapng_lib
     pdump_lib
     multi_proc_support
-    kernel_nic_interface
     thread_safety_dpdk_functions
     eventdev
     event_ethernet_rx_adapter
doc/guides/prog_guide/kernel_nic_interface.rst deleted +0 -423

423 lines not on this page · raw message

doc/guides/prog_guide/packet_framework.rst +3 -6
index 3d4e3b66cc5c..ebc69d8c3e75 100644
@@ -87,18 +87,15 @@ Port Types
    |   |                  | management and hierarchical scheduling according to pre-defined SLAs.                 |
    |   |                  |                                                                                       |
    +---+------------------+---------------------------------------------------------------------------------------+
-   | 6 | KNI              | Send/receive packets to/from Linux kernel space.                                      |
-   |   |                  |                                                                                       |
-   +---+------------------+---------------------------------------------------------------------------------------+
-   | 7 | Source           | Input port used as packet generator. Similar to Linux kernel /dev/zero character      |
+   | 6 | Source           | Input port used as packet generator. Similar to Linux kernel /dev/zero character      |
    |   |                  | device.                                                                               |
    |   |                  |                                                                                       |
    +---+------------------+---------------------------------------------------------------------------------------+
-   | 8 | Sink             | Output port used to drop all input packets. Similar to Linux kernel /dev/null         |
+   | 7 | Sink             | Output port used to drop all input packets. Similar to Linux kernel /dev/null         |
    |   |                  | character device.                                                                     |
    |   |                  |                                                                                       |
    +---+------------------+---------------------------------------------------------------------------------------+
-   | 9 | Sym_crypto       | Output port used to extract DPDK Cryptodev operations from a fixed offset of the      |
+   | 8 | Sym_crypto       | Output port used to extract DPDK Cryptodev operations from a fixed offset of the      |
    |   |                  | packet and then enqueue to the Cryptodev PMD. Input port used to dequeue the          |
    |   |                  | Cryptodev operations from the Cryptodev PMD and then retrieve the packets from them.  |
    +---+------------------+---------------------------------------------------------------------------------------+
doc/guides/rel_notes/deprecation.rst +1 -8
index ce5a8f0361cb..bb5d23c87669 100644
@@ -35,7 +35,7 @@ Deprecation Notices
     which also added support for standard atomics
     (Ref: https://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html)
 
-* build: Enabling deprecated libraries (``kni``)
+* build: Enabling deprecated libraries
   won't be possible anymore through the use of the ``disable_libs`` build option.
   A new build option for deprecated libraries will be introduced instead.
 
@@ -78,13 +78,6 @@ Deprecation Notices
   ``__atomic_thread_fence`` must be used for patches that need to be merged in
   20.08 onwards. This change will not introduce any performance degradation.
 
-* kni: The KNI kernel module and library are not recommended for use by new
-  applications - other technologies such as virtio-user are recommended instead.
-  Following the DPDK technical board
-  `decision <https://mails.dpdk.org/archives/dev/2021-January/197077.html>`_
-  and `refinement <https://mails.dpdk.org/archives/dev/2022-June/243596.html>`_,
-  the KNI kernel module, library and PMD will be removed from the DPDK 23.11 release.
-
 * lib: will fix extending some enum/define breaking the ABI. There are multiple
   samples in DPDK that enum/define terminated with a ``.*MAX.*`` value which is
   used by iterators, and arrays holding these values are sized with this
doc/guides/rel_notes/release_23_11.rst +2 -0
index 9d96dbdcd302..0d5c4a60d020 100644
@@ -70,6 +70,8 @@ Removed Items
 
 * flow_classify: Removed flow classification library and examples.
 
+* kni: Removed the Kernel Network Interface (KNI) library and driver.
+
 
 API Changes
 -----------
doc/guides/sample_app_ug/ip_pipeline.rst +0 -22
index b521d3b8be20..f30ac5e19db7 100644
@@ -164,15 +164,6 @@ Examples
    |                       |                      |                | 8. Pipeline table rule add default |
    |                       |                      |                | 9. Pipeline table rule add         |
    +-----------------------+----------------------+----------------+------------------------------------+
-   | KNI                   | Stub                 | Forward        | 1. Mempool create                  |
-   |                       |                      |                | 2. Link create                     |
-   |                       |                      |                | 3. Pipeline create                 |
-   |                       |                      |                | 4. Pipeline port in/out            |
-   |                       |                      |                | 5. Pipeline table                  |
-   |                       |                      |                | 6. Pipeline port in table          |
-   |                       |                      |                | 7. Pipeline enable                 |
-   |                       |                      |                | 8. Pipeline table rule add         |
-   +-----------------------+----------------------+----------------+------------------------------------+
    | Firewall              | ACL                  | Allow/Drop     | 1. Mempool create                  |
    |                       |                      |                | 2. Link create                     |
    |                       | * Key = n-tuple      |                | 3. Pipeline create                 |
@@ -297,17 +288,6 @@ Tap
   tap <name>
 
 
-Kni
-~~~
-
-  Create kni port ::
-
-   kni <kni_name>
-    link <link_name>
-    mempool <mempool_name>
-    [thread <thread_id>]
-
-
 Cryptodev
 ~~~~~~~~~
 
@@ -366,7 +346,6 @@ Create pipeline input port ::
    | swq <swq_name>
    | tmgr <tmgr_name>
    | tap <tap_name> mempool <mempool_name> mtu <mtu>
-   | kni <kni_name>
    | source mempool <mempool_name> file <file_name> bpp <n_bytes_per_pkt>
    [action <port_in_action_profile_name>]
    [disabled]
@@ -379,7 +358,6 @@ Create pipeline output port ::
    | swq <swq_name>
    | tmgr <tmgr_name>
    | tap <tap_name>
-   | kni <kni_name>
    | sink [file <file_name> pkts <max_n_pkts>]
 
 Create pipeline table ::
drivers/net/cnxk/cnxk_ethdev.c +1 -1
index 4b98faa72980..01b707b6c4ac 100644
@@ -1130,7 +1130,7 @@ nix_set_nop_rxtx_function(struct rte_eth_dev *eth_dev)
 {
 	/* These dummy functions are required for supporting
 	 * some applications which reconfigure queues without
-	 * stopping tx burst and rx burst threads(eg kni app)
+	 * stopping tx burst and rx burst threads.
 	 * When the queues context is saved, txq/rxqs are released
 	 * which caused app crash since rx/tx burst is still
 	 * on different lcores
drivers/net/kni/meson.build deleted +0 -11
deleted file mode 100644
index 2acc98969426..000000000000
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-if is_windows
-    build = false
-    reason = 'not supported on Windows'
-    subdir_done()
-endif
-
-deps += 'kni'
-sources = files('rte_eth_kni.c')
drivers/net/kni/rte_eth_kni.c deleted +0 -524

524 lines not on this page · raw message

drivers/net/meson.build +0 -1
index f68bbc27a784..bd38b533c573 100644
@@ -35,7 +35,6 @@ drivers = [
         'ionic',
         'ipn3ke',
         'ixgbe',
-        'kni',
         'mana',
         'memif',
         'mlx4',
examples/ip_pipeline/Makefile +0 -1
index 785c7ee38ce5..bc5e0a9f1800 100644
@@ -8,7 +8,6 @@ APP = ip_pipeline
 SRCS-y := action.c
 SRCS-y += cli.c
 SRCS-y += conn.c
-SRCS-y += kni.c
 SRCS-y += link.c
 SRCS-y += main.c
 SRCS-y += mempool.c
examples/ip_pipeline/cli.c +0 -95

149 lines not on this page · raw message

examples/ip_pipeline/examples/kni.cli deleted +0 -69

69 lines not on this page · raw message

examples/ip_pipeline/kni.c deleted +0 -168

168 lines not on this page · raw message

examples/ip_pipeline/kni.h deleted +0 -46

46 lines not on this page · raw message

examples/ip_pipeline/main.c +0 -10
index e35d9bce3984..663f538f024a 100644
@@ -14,7 +14,6 @@
 
 #include "cli.h"
 #include "conn.h"
-#include "kni.h"
 #include "cryptodev.h"
 #include "link.h"
 #include "mempool.h"
@@ -205,13 +204,6 @@ main(int argc, char **argv)
 		return status;
 	}
 
-	/* KNI */
-	status = kni_init();
-	if (status) {
-		printf("Error: KNI initialization failed (%d)\n", status);
-		return status;
-	}
-
 	/* Sym Crypto */
 	status = cryptodev_init();
 	if (status) {
@@ -264,7 +256,5 @@ main(int argc, char **argv)
 		conn_poll_for_conn(conn);
 
 		conn_poll_for_msg(conn);
-
-		kni_handle_request();
 	}
 }
examples/ip_pipeline/meson.build +0 -1
index 57f522c24cf9..68049157e429 100644
@@ -18,7 +18,6 @@ sources = files(
         'cli.c',
         'conn.c',
         'cryptodev.c',
-        'kni.c',
         'link.c',
         'main.c',
         'mempool.c',
examples/ip_pipeline/pipeline.c +0 -57

99 lines not on this page · raw message

examples/ip_pipeline/pipeline.h +0 -2
index 4d2ee29a54c7..083d5e852421 100644
@@ -25,7 +25,6 @@ enum port_in_type {
 	PORT_IN_SWQ,
 	PORT_IN_TMGR,
 	PORT_IN_TAP,
-	PORT_IN_KNI,
 	PORT_IN_SOURCE,
 	PORT_IN_CRYPTODEV,
 };
@@ -67,7 +66,6 @@ enum port_out_type {
 	PORT_OUT_SWQ,
 	PORT_OUT_TMGR,
 	PORT_OUT_TAP,
-	PORT_OUT_KNI,
 	PORT_OUT_SINK,
 	PORT_OUT_CRYPTODEV,
 };
kernel/linux/kni/Kbuild deleted +0 -6
deleted file mode 100644
index e5452d6c00db..000000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Luca Boccassi <[email protected]>
-
-ccflags-y := $(MODULE_CFLAGS)
-obj-m := rte_kni.o
-rte_kni-y := $(patsubst $(src)/%.c,%.o,$(wildcard $(src)/*.c))
kernel/linux/kni/compat.h deleted +0 -157

157 lines not on this page · raw message

kernel/linux/kni/kni_dev.h deleted +0 -137

56 lines not on this page · raw message

kernel/linux/kni/kni_fifo.h deleted +0 -87

87 lines not on this page · raw message

kernel/linux/kni/kni_misc.c deleted +0 -719

719 lines not on this page · raw message

kernel/linux/kni/kni_net.c deleted +0 -878

878 lines not on this page · raw message

kernel/linux/kni/meson.build deleted +0 -41

41 lines not on this page · raw message

kernel/linux/meson.build +1 -1
index 16a094899446..8d47074621f7 100644

Lines of this file are not shown. View the raw message.

lib/eal/common/eal_common_log.c +0 -1
index bd7b188ceb4a..0a1d219d6924 100644

Lines of this file are not shown. View the raw message.

lib/eal/include/rte_log.h +1 -1
index 6d2b0856a565..bdefff2a5933 100644

Lines of this file are not shown. View the raw message.

lib/eal/linux/eal.c +0 -19
index c6efd920145c..a1fefcd9d83a 100644

Lines of this file are not shown. View the raw message.

lib/kni/meson.build deleted +0 -21
deleted file mode 100644
index 5ce410f7f2d2..000000000000

Lines of this file are not shown. View the raw message.

lib/kni/rte_kni.c deleted +0 -843

843 lines not on this page · raw message

lib/kni/rte_kni.h deleted +0 -269

269 lines not on this page · raw message

lib/kni/rte_kni_common.h deleted +0 -147

147 lines not on this page · raw message

lib/kni/rte_kni_fifo.h deleted +0 -117

117 lines not on this page · raw message

lib/kni/version.map deleted +0 -24
deleted file mode 100644
index 13ffaa5bfd65..000000000000

Lines of this file are not shown. View the raw message.

lib/meson.build +0 -6
index ecac701161c8..bbfa28ba86dd 100644

Lines of this file are not shown. View the raw message.

lib/port/meson.build +0 -6
index 3ab37e2cb4b7..b0af2b185b39 100644

Lines of this file are not shown. View the raw message.

lib/port/rte_port_kni.c deleted +0 -515

515 lines not on this page · raw message

lib/port/rte_port_kni.h deleted +0 -63

63 lines not on this page · raw message

lib/port/version.map +0 -3
index 83dbec7b01d2..fefcf29063f6 100644

Lines of this file are not shown. View the raw message.

meson_options.txt +1 -1
index 95e22e0ce70c..621e1ca9ba8c 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.39.2

Part of the diff is not shown here. View the raw message.

#3 lore raw

Re: [PATCH v2 2/2] kni: remove deprecated kernel network interface

Hello CI people,

Quoted 8 lines · Stephen Hemminger
 kernel/linux/kni/Kbuild                       |   6 -
 kernel/linux/kni/compat.h                     | 157 ----
 kernel/linux/kni/kni_dev.h                    | 137 ---
 kernel/linux/kni/kni_fifo.h                   |  87 --
 kernel/linux/kni/kni_misc.c                   | 719 --------------
 kernel/linux/kni/kni_net.c                    | 878 ------------------
 kernel/linux/kni/meson.build                  |  41 -
 kernel/linux/meson.build                      |   2 +-

This is a heads up for KNI removal in the *main* branch.

With this removal, there is no remaining out of tree Linux kernel module to compile/test in DPDK sources.
This means that jobs (like the one in UNH lab that was compile-testing KNI against the latest Linux kernel sources) can be disabled.

Important note: this mail does not ask for any change to LTS releases testing. If KNI was built and tested with LTS releases, you should continue to do so.

Signature · 1 line
David Marchand
#4 lore raw

Re: [PATCH v2 2/2] kni: remove deprecated kernel network interface

Quoted 15 lines · David Marchand

Hello CI people,

Quoted 8 lines · Stephen Hemminger
 kernel/linux/kni/Kbuild                       |   6 -
 kernel/linux/kni/compat.h                     | 157 ----
 kernel/linux/kni/kni_dev.h                    | 137 ---
 kernel/linux/kni/kni_fifo.h                   |  87 --
 kernel/linux/kni/kni_misc.c                   | 719 --------------
 kernel/linux/kni/kni_net.c                    | 878 ------------------
 kernel/linux/kni/meson.build                  |  41 -
 kernel/linux/meson.build                      |   2 +-

This is a heads up for KNI removal in the *main* branch.

Quoted 9 lines

With this removal, there is no remaining out of tree Linux kernel module to compile/test in DPDK sources. This means that jobs (like the one in UNH lab that was compile-testing KNI against the latest Linux kernel sources) can be disabled.

Important note: this mail does not ask for any change to LTS releases testing. If KNI was built and tested with LTS releases, you should continue to do so.

Given that there are no linux modules left, can we consider changing the default setting of "enable_kmods" from "no" to "yes". For FreeBSD there are no in-tree modules that can support DPDK, so the kernel modules for that OS should always be built. The only reason for it being disabled was Linux, but that seems unnecessary now.

Alternative: remove the option completely, and always build kernel modules for FreeBSD (and any for Windows in future). If in future we add in more Linux modules (which I can't see happening), add in an "enable_linux_kmods" option instead to control that.

WDYT?

/Bruce

#5 lore raw

Re: [PATCH v2 2/2] kni: remove deprecated kernel network interface

Quoted 9 lines · Bruce Richardson
Quoted 9 lines

With this removal, there is no remaining out of tree Linux kernel module to compile/test in DPDK sources. This means that jobs (like the one in UNH lab that was compile-testing KNI against the latest Linux kernel sources) can be disabled.

Important note: this mail does not ask for any change to LTS releases testing. If KNI was built and tested with LTS releases, you should continue to do so.

Quoted 5 lines

Given that there are no linux modules left, can we consider changing the default setting of "enable_kmods" from "no" to "yes". For FreeBSD there are no in-tree modules that can support DPDK, so the kernel modules for that OS should always be built. The only reason for it being disabled was Linux, but that seems unnecessary now.

This seems ok to me.

Signature · 1 line
David Marchand
#6 lore raw

Re: [PATCH v2 2/2] kni: remove deprecated kernel network interface

In reply to David Marchand
Quoted 26 lines · David Marchand

Hello CI people,

Quoted 8 lines · Stephen Hemminger
 kernel/linux/kni/Kbuild                       |   6 -
 kernel/linux/kni/compat.h                     | 157 ----
 kernel/linux/kni/kni_dev.h                    | 137 ---
 kernel/linux/kni/kni_fifo.h                   |  87 --
 kernel/linux/kni/kni_misc.c                   | 719 --------------
 kernel/linux/kni/kni_net.c                    | 878 ------------------
 kernel/linux/kni/meson.build                  |  41 -
 kernel/linux/meson.build                      |   2 +-

This is a heads up for KNI removal in the *main* branch.

With this removal, there is no remaining out of tree Linux kernel module to compile/test in DPDK sources.
This means that jobs (like the one in UNH lab that was compile-testing KNI against the latest Linux kernel sources) can be disabled.

Important note: this mail does not ask for any change to LTS releases testing.
If KNI was built and tested with LTS releases, you should continue to do so.

Quoted 4 lines

--
David Marchand

Sorry, I didn't see this at first. We are currently running kmods testing

1x/day for the periodic testing on the main branch, per the original request from last year. I am disabling this now.

It makes sense to me that this testing should be shifted to 22.11 LTS periodic runs, but I will leave it up to the community to decide whether that is valuable or not.

#7 lore raw
In reply to Stephen Hemminger
Quoted 110 lines · Stephen Hemminger

The KNI and flow_classify library were already marked disabled in 23.11 release.

Stephen Hemminger (2):
flow_classify: remove library
kni: remove deprecated kernel network interface

 MAINTAINERS                                   |  17 -
 app/test/meson.build                          |   6 -
 app/test/test_flow_classify.c                 | 895 ------------------
 app/test/test_flow_classify.h                 |  26 -
 app/test/test_kni.c                           | 740 ---------------
 doc/api/doxy-api-index.md                     |   3 -
 doc/api/doxy-api.conf.in                      |   2 -
 doc/guides/contributing/documentation.rst     |   4 +-
 doc/guides/freebsd_gsg/build_sample_apps.rst  |   2 +-
 doc/guides/freebsd_gsg/install_from_ports.rst |   2 +-
 doc/guides/howto/flow_bifurcation.rst         |   3 +-
 doc/guides/nics/index.rst                     |   1 -
 doc/guides/nics/kni.rst                       | 170 ----
 doc/guides/nics/virtio.rst                    |  92 +-
 .../prog_guide/env_abstraction_layer.rst      |   2 -
 doc/guides/prog_guide/flow_classify_lib.rst   | 424 ---------
 doc/guides/prog_guide/glossary.rst            |   3 -
 doc/guides/prog_guide/index.rst               |   2 -
 .../prog_guide/kernel_nic_interface.rst       | 423 ---------
 doc/guides/prog_guide/packet_framework.rst    |   9 +-
 doc/guides/rel_notes/deprecation.rst          |  15 +-
 doc/guides/rel_notes/release_23_11.rst        |   4 +
 doc/guides/sample_app_ug/flow_classify.rst    | 242 -----
 doc/guides/sample_app_ug/index.rst            |   1 -
 doc/guides/sample_app_ug/ip_pipeline.rst      |  22 -
 drivers/net/cnxk/cnxk_ethdev.c                |   2 +-
 drivers/net/kni/meson.build                   |  11 -
 drivers/net/kni/rte_eth_kni.c                 | 524 ----------
 drivers/net/meson.build                       |   1 -
 examples/flow_classify/Makefile               |  51 -
 examples/flow_classify/flow_classify.c        | 878 -----------------
 examples/flow_classify/ipv4_rules_file.txt    |  14 -
 examples/flow_classify/meson.build            |  13 -
 examples/ip_pipeline/Makefile                 |   1 -
 examples/ip_pipeline/cli.c                    |  95 --
 examples/ip_pipeline/examples/kni.cli         |  69 --
 examples/ip_pipeline/kni.c                    | 168 ----
 examples/ip_pipeline/kni.h                    |  46 -
 examples/ip_pipeline/main.c                   |  10 -
 examples/ip_pipeline/meson.build              |   1 -
 examples/ip_pipeline/pipeline.c               |  57 --
 examples/ip_pipeline/pipeline.h               |   2 -
 examples/meson.build                          |   1 -
 kernel/linux/kni/Kbuild                       |   6 -
 kernel/linux/kni/compat.h                     | 157 ---
 kernel/linux/kni/kni_dev.h                    | 137 ---
 kernel/linux/kni/kni_fifo.h                   |  87 --
 kernel/linux/kni/kni_misc.c                   | 719 --------------
 kernel/linux/kni/kni_net.c                    | 878 -----------------
 kernel/linux/kni/meson.build                  |  41 -
 kernel/linux/meson.build                      |   2 +-
 lib/eal/common/eal_common_log.c               |   1 -
 lib/eal/include/rte_log.h                     |   2 +-
 lib/eal/linux/eal.c                           |  19 -
 lib/flow_classify/meson.build                 |  12 -
 lib/flow_classify/rte_flow_classify.c         | 670 -------------
 lib/flow_classify/rte_flow_classify.h         | 284 ------
 lib/flow_classify/rte_flow_classify_parse.c   | 532 -----------
 lib/flow_classify/rte_flow_classify_parse.h   |  58 --
 lib/flow_classify/version.map                 |  13 -
 lib/kni/meson.build                           |  21 -
 lib/kni/rte_kni.c                             | 843 -----------------
 lib/kni/rte_kni.h                             | 269 ------
 lib/kni/rte_kni_common.h                      | 147 ---
 lib/kni/rte_kni_fifo.h                        | 117 ---
 lib/kni/version.map                           |  24 -
 lib/meson.build                               |   9 -
 lib/port/meson.build                          |   6 -
 lib/port/rte_port_kni.c                       | 515 ----------
 lib/port/rte_port_kni.h                       |  63 --
 lib/port/version.map                          |   3 -
 meson_options.txt                             |   2 +-
 72 files changed, 18 insertions(+), 10673 deletions(-)
 delete mode 100644 app/test/test_flow_classify.c
 delete mode 100644 app/test/test_flow_classify.h
 delete mode 100644 app/test/test_kni.c
 delete mode 100644 doc/guides/nics/kni.rst
 delete mode 100644 doc/guides/prog_guide/flow_classify_lib.rst
 delete mode 100644 doc/guides/prog_guide/kernel_nic_interface.rst
 delete mode 100644 doc/guides/sample_app_ug/flow_classify.rst
 delete mode 100644 drivers/net/kni/meson.build
 delete mode 100644 drivers/net/kni/rte_eth_kni.c
 delete mode 100644 examples/flow_classify/Makefile
 delete mode 100644 examples/flow_classify/flow_classify.c
 delete mode 100644 examples/flow_classify/ipv4_rules_file.txt
 delete mode 100644 examples/flow_classify/meson.build
 delete mode 100644 examples/ip_pipeline/examples/kni.cli
 delete mode 100644 examples/ip_pipeline/kni.c
 delete mode 100644 examples/ip_pipeline/kni.h
 delete mode 100644 kernel/linux/kni/Kbuild
 delete mode 100644 kernel/linux/kni/compat.h
 delete mode 100644 kernel/linux/kni/kni_dev.h
 delete mode 100644 kernel/linux/kni/kni_fifo.h
 delete mode 100644 kernel/linux/kni/kni_misc.c
 delete mode 100644 kernel/linux/kni/kni_net.c
 delete mode 100644 kernel/linux/kni/meson.build
 delete mode 100644 lib/flow_classify/meson.build
 delete mode 100644 lib/flow_classify/rte_flow_classify.c
 delete mode 100644 lib/flow_classify/rte_flow_classify.h
 delete mode 100644 lib/flow_classify/rte_flow_classify_parse.c
 delete mode 100644 lib/flow_classify/rte_flow_classify_parse.h
 delete mode 100644 lib/flow_classify/version.map
Quoted 8 lines
 delete mode 100644 lib/kni/meson.build
 delete mode 100644 lib/kni/rte_kni.c
 delete mode 100644 lib/kni/rte_kni.h
 delete mode 100644 lib/kni/rte_kni_common.h
 delete mode 100644 lib/kni/rte_kni_fifo.h
 delete mode 100644 lib/kni/version.map
 delete mode 100644 lib/port/rte_port_kni.c
 delete mode 100644 lib/port/rte_port_kni.h

It took some time to remove this code (especially the KNI bits). Thanks to all who contributed to the effort.

Series applied, thanks.

Signature · 1 line
David Marchand
#8 lore raw
Quoted 4 lines · On Fri, 4 Aug 2023 15:02:23 +0200 David Marchand <[email protected]>…

It took some time to remove this code (especially the KNI bits). Thanks to all who contributed to the effort.

Series applied, thanks.

Thanks, still waiting for the first user complaints about this. No one ever reads the release notes.