octeon: fix pause flow control for lbk/sdp devices

Pause frame flow control is not supported for LBK (Loopback) and
SDP (System DPI Packet Interface Unit) devices.
This patch skips the pause flow configuration for these devices.

Type: fix
Fixes: 53239b4

Signed-off-by: Alok Mishra <almishra@marvell.com>
Change-Id: I3096fcef9df4ad59d64bfabb83f91f13813128a8
(cherry picked from commit d8022139eb)

.clang-format

@@ -35,8 +35,6 @@ ForEachMacros:
   - 'foreach_vnet_dev_port'
   - 'foreach_vnet_dev_args'
   - 'foreach_vnet_dev_port_args'
-  - 'foreach_clib_dt_tree_node'
-  - 'foreach_clib_dt_child_node'
 
 StatementMacros:
   - 'CLIB_MULTIARCH_FN'

.gitignore

@@ -31,17 +31,6 @@
 /build/external/deb/debian/files/
 /build/external/deb/debian/.debhelper/
 /build/external/deb/debian/vpp-ext-deps*
-/build/optional/downloads/
-/build/optional/*.tar.gz
-/build/optional/*.tar.xz
-/build/optional/vpp-*
-/build/optional/deb/_build/
-/build/optional/deb/debian/changelog
-/build/optional/deb/debian/debhelper-build-stamp
-/build/optional/deb/debian/tmp/
-/build/optional/deb/debian/files/
-/build/optional/deb/debian/.debhelper/
-/build/optional/deb/debian/vpp-ext-deps*
 /path_setup
 /tools/
 # start autotools ignore
@@ -143,9 +132,7 @@ compile_commands.json
 /extras/hs-test/.build.ok
 /extras/hs-test/.build.cov.ok
 /extras/hs-test/.last_hst_ppid
-/extras/hs-test/.goimports.ok
 /extras/hs-test/summary/
-/extras/hs-test/.last_state_hash
 
 # ./configure
 /CMakeFiles

.gitreview

@@ -2,3 +2,4 @@
 host=gerrit.fd.io
 port=29418
 project=vpp
+defaultbranch=stable/2410

MAINTAINERS

@@ -882,8 +882,8 @@ F:	extras/strongswan/vpp_sswan
 Host stack test framework
 I:	hs-test
 M:	Florin Coras <fcoras@cisco.com>
-M:	Matus Fabian <matfabia@cisco.com>
-M:	Adrian Villin <avillin@cisco.com>
+M:	Filip Tehlar <ftehlar@cisco.com>
+M:	Maros Ondrejicka <maros.ondrejicka@pantheon.tech>
 F:	extras/hs-test
 
 THE REST

Makefile

@@ -63,8 +63,6 @@ ifeq ($(filter ubuntu debian linuxmint,$(OS_ID)),$(OS_ID))
 PKG=deb
 else ifeq ($(filter rhel centos fedora opensuse-leap rocky almalinux,$(OS_ID)),$(OS_ID))
 PKG=rpm
-else ifeq ($(filter freebsd,$(OS_ID)),$(OS_ID))
-PKG=pkg
 endif
 
 # +libganglia1-dev if building the gmond plugin
@@ -223,18 +221,6 @@ endif
 
 RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS)
 
-# FreeBSD build and test dependancies
-
-FBSD_PY_PRE=py311
-
-FBSD_TEST_DEPS = setsid rust $(FBSD_PY_PRE)-pyshark
-FBSD_PYTHON_DEPS = python3 $(FBSD_PY_PRE)-pyelftools $(FBSD_PY_PRE)-ply
-FBSD_DEVEL_DEPS = cscope gdb
-FBSD_BUILD_DEPS = bash gmake sudo
-FBSD_BUILD_DEPS += git sudo autoconf automake curl gsed
-FBSD_BUILD_DEPS += pkgconf ninja cmake libepoll-shim jansson
-FBSD_DEPS = $(FBSD_BUILD_DEPS) $(FBSD_PYTHON_DEPS) $(FBSD_TEST_DEPS) $(FBSD_DEVEL_DEPS)
-
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
 endif
@@ -285,7 +271,6 @@ help:
 	@echo " snap-clean           - clean up snap build environment"
 	@echo " pkg-rpm              - build RPM packages"
 	@echo " install-ext-dep[s]   - install external development dependencies"
-	@echo " install-opt-deps     - install optional dependencies"
 	@echo " ctags                - (re)generate ctags database"
 	@echo " gtags                - (re)generate gtags database"
 	@echo " cscope               - (re)generate cscope database"
@@ -405,10 +390,8 @@ endif
 else ifeq ($(filter opensuse-leap-15.3 opensuse-leap-15.4 ,$(OS_ID)-$(OS_VERSION_ID)),$(OS_ID)-$(OS_VERSION_ID))
 	@sudo -E zypper refresh
 	@sudo -E zypper install  -y $(RPM_SUSE_DEPENDS)
-else ifeq ($(OS_ID), freebsd)
-	@sudo pkg install -y $(FBSD_DEPS)
 else
-	$(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS, openSUSE-leap or FreeBSD systems")
+	$(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS or openSUSE-leap systems")
 endif
 	git config commit.template .git_commit_template.txt
 
@@ -757,10 +740,6 @@ install-ext-deps:
 .PHONY: install-ext-dep
 install-ext-dep: install-ext-deps
 
-.PHONY: install-opt-deps
-install-opt-deps:
-	$(MAKE) -C build/optional install-$(PKG)
-
 .PHONY: json-api-files
 json-api-files:
 	$(WS_ROOT)/src/tools/vppapigen/generate_json.py

README.md

@@ -90,13 +90,6 @@ For this to work you will need a working installation of Vagrant. Instructions
 for this can be found [on the Setting up Vagrant wiki page]
 (https://wiki.fd.io/view/DEV/Setting_Up_Vagrant).
 
-### Quick-start: FreeBSD
-
-VPP is packaged in the FreeBSD ports system. Binary packages are available and
-can be installed with the following command:
-
-    # pkg install vpp
-
 
 ## More information
 

build-data/packages/vpp.mk

@@ -19,7 +19,7 @@ else
 CMAKE?=cmake
 endif
 
-vpp_cmake_prefix_path  = /opt/vpp/external/$(shell uname -m) /opt/vpp/optional/$(shell uname -m)
+vpp_cmake_prefix_path  = /opt/vpp/external/$(shell uname -m)
 vpp_cmake_prefix_path += $(PACKAGE_INSTALL_DIR)external
 vpp_cmake_prefix_path := $(subst $() $(),;,$(vpp_cmake_prefix_path))
 

build/build_common.mk

@@ -1,48 +0,0 @@
-# Copyright (c) 2024 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Scripts require non-POSIX parts of bash
-SHELL := $(shell which bash)
-
-DL_CACHE_DIR = $(HOME)/Downloads
-MAKE_ARGS ?= -j
-BUILD_DIR        ?= $(CURDIR)/_build
-INSTALL_DIR      ?= $(CURDIR)/_install
-DOWNLOAD_DIR     ?= $(CURDIR)/downloads
-PKG_VERSION ?= $(shell git describe --abbrev=0 --match 'v[0-9]*' | cut -d- -f1 | cut -dv -f2 | cut -d. -f1,2)
-SOURCE_DATE_EPOCH ?= $(shell git log -1 --pretty=%ct .)
-ifeq ($(shell uname), FreeBSD)
-JOBS := $(shell nproc)
-else
-JOBS := $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo),\
-	$(shell grep -c ^processor /proc/cpuinfo), 2)
-endif	# FreeBSD
-
-B := $(BUILD_DIR)
-I := $(INSTALL_DIR)
-D := $(DOWNLOAD_DIR)
-ifeq ($(WORKSPACE),)
-L := $(B)
-else
-L := $(WORKSPACE)/archives/vpp-ext-deps
-$(shell rm -rf $(L) && mkdir -p $(L))
-endif
-
-ifneq ($(shell which cmake3),)
-CMAKE?=cmake3
-else
-CMAKE?=cmake
-endif
-
-ARCH_X86_64=$(filter x86_64,$(shell uname -m))
-AARCH64=$(filter aarch64,$(shell uname -m))

build/external/Makefile

@@ -11,19 +11,50 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Scripts require non-POSIX parts of bash
+SHELL := $(shell which bash)
+
+DL_CACHE_DIR = $(HOME)/Downloads
+MAKE_ARGS ?= -j
+BUILD_DIR        ?= $(CURDIR)/_build
+INSTALL_DIR      ?= $(CURDIR)/_install
+PKG_VERSION ?= $(shell git describe --abbrev=0 --match 'v[0-9]*' | cut -d- -f1 | cut -dv -f2 | cut -d. -f1,2)
 PKG_SUFFIX ?= $(shell git log --oneline v$(PKG_VERSION)-rc0.. . | wc -l)
+SOURCE_DATE_EPOCH ?= $(shell git log -1 --pretty=%ct .)
+ifeq ($(shell uname), FreeBSD)
+JOBS := $(shell nproc)
+else
+JOBS := $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo),\
+	$(shell grep -c ^processor /proc/cpuinfo), 2)
+endif	# FreeBSD
 
-include ../build_common.mk
-include ../packages_common.mk
+B := $(BUILD_DIR)
+I := $(INSTALL_DIR)
+ifeq ($(WORKSPACE),)
+L := $(B)
+else
+L := $(WORKSPACE)/archives/vpp-ext-deps
+$(shell rm -rf $(L) && mkdir -p $(L))
+endif
 
+ifneq ($(shell which cmake3),)
+CMAKE?=cmake3
+else
+CMAKE?=cmake
+endif
+
+ARCH_X86_64=$(filter x86_64,$(shell uname -m))
+AARCH64=$(filter aarch64,$(shell uname -m))
+
+include packages.mk
 include packages/ipsec-mb.mk
 include packages/quicly.mk
+include packages/dpdk.mk
 ifneq ($(shell uname), FreeBSD)
 include packages/rdma-core.mk
 include packages/xdp-tools.mk
 include packages/octeon-roc.mk
 endif	# ! FreeBSD
-include packages/dpdk.mk
 
 .PHONY: clean
 clean:

build/external/deb/debian/control

@@ -9,3 +9,5 @@ Package: vpp-ext-deps
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: VPP developer package containing dependencies
+Replaces: vpp-dpdk-dev
+Conflicts: vpp-dpdk-dev

build/external/deb/debian/rules

@@ -30,4 +30,4 @@ override_dh_install:
 	dh_install -p$(PKG) --autodest /opt
 
 override_dh_shlibdeps:
-	dh_shlibdeps -l$(INSTALL_DIR)lib/:$(INSTALL_DIR)lib64
+	dh_shlibdeps -l$(INSTALL_DIR)lib/

build/external/packages.mk

@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Cisco and/or its affiliates.
+# Copyright (c) 2018 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -28,8 +28,8 @@ $1_install_log ?= $(L)/$1.install.log
 ##############################################################################
 # Download
 ##############################################################################
-$(D)/$($1_tarball):
-	mkdir -p $(D)
+downloads/$($1_tarball):
+	mkdir -p downloads
 	@if [ -e $(DL_CACHE_DIR)/$($1_tarball) ] ; \
 		then cp $(DL_CACHE_DIR)/$($1_tarball) $$@ ; \
 	else \
@@ -38,15 +38,15 @@ $(D)/$($1_tarball):
 	fi
 	@rm -f $(B)/.$1.download.ok
 
-$(B)/.$1.download.ok: $(D)/$($1_tarball)
+$(B)/.$1.download.ok: downloads/$($1_tarball)
 	@mkdir -p $(B)
 	$$(call h1,"validating $1 $($1_version) checksum")
-	@SHA256SUM=$$(shell openssl sha256 $$< | cut -f 2 -d " " -) ; \
-	(([ "$$$${SHA256SUM}" = "$($1_tarball_sha256sum)" ] && echo "SHA256 OK") || \
+	@SUM=$$(shell openssl md5 $$< | cut -f 2 -d " " -) ; \
+	([ "$$$${SUM}" = "$($1_tarball_md5sum)" ] || \
 	( echo "==========================================================" && \
 	  echo "Bad Checksum!" && \
-	  echo "Expected SHA256:   $($1_tarball_sha256)" && \
-	  echo "Calculated SHA256: $$$${SHA256SUM}" && \
+	  echo "Expected:   $($1_tarball_md5sum)" && \
+	  echo "Calculated: $$$${SUM}" && \
 	  echo "Please remove $$< and retry" && \
 	  echo "==========================================================" && \
 	  false ))
@@ -65,7 +65,7 @@ $(B)/.$1.extract.ok: $(B)/.$1.download.ok
 	  --directory $$($1_src_dir) \
 	  --extract \
 	  --strip-components=$$($1_tarball_strip_dirs) \
-	  --file $(D)/$($1_tarball)
+	  --file downloads/$($1_tarball)
 	@touch $$@
 
 .PHONY: $1-extract

build/external/packages/dpdk.mk

@@ -22,9 +22,16 @@ DPDK_MLX_IBV_LINK            ?= static
 dpdk_version                 ?= 24.07
 dpdk_base_url                ?= http://fast.dpdk.org/rel
 dpdk_tarball                 := dpdk-$(dpdk_version).tar.xz
-dpdk_tarball_sha256sum_24.07 := 9944f7e5f268e7ac9b4193e2cd54ef6d98f6e1d7dddc967c77ae4f6616d6fbbd
-
-dpdk_tarball_sha256sum       := $(dpdk_tarball_sha256sum_$(dpdk_version))
+dpdk_tarball_md5sum_24.07    := 48151b1bd545cd95447979fa033199bb
+dpdk_tarball_md5sum_24.03    := a98da848d6ba09808ef00f9a26aaa49a
+dpdk_tarball_md5sum_23.11    := 896c09f5b45b452bd77287994650b916
+dpdk_tarball_md5sum_23.07    := 2b6d57f077585cb15b885482362fd47f
+dpdk_tarball_md5sum_23.03    := 3cf8ebbcd412d5726db230f2eeb90cc9
+dpdk_tarball_md5sum_22.11.1  := 0594708fe42ce186a55b0235c6e20cfe
+dpdk_tarball_md5sum_22.07    := fb73b58b80b1349cd05fe9cf6984afd4
+dpdk_tarball_md5sum_22.03    := a07ca8839f98062f46e1cc359735cce8
+dpdk_tarball_md5sum_21.11    := 58660bbbe9e95abce86e47692b196555
+dpdk_tarball_md5sum          := $(dpdk_tarball_md5sum_$(dpdk_version))
 dpdk_url                     := $(dpdk_base_url)/$(dpdk_tarball)
 dpdk_tarball_strip_dirs      := 1
 ifeq ($(shell uname), FreeBSD)
@@ -32,9 +39,6 @@ dpdk_depends		     := $(if $(ARCH_X86_64), ipsec-mb)
 else
 dpdk_depends		     := rdma-core $(if $(ARCH_X86_64), ipsec-mb)
 endif
-ifeq ($(rdma-core_version),)
-$(error Missing rdma-core_version)
-endif
 DPDK_MLX_DEFAULT             := $(shell if grep -q "rdma=$(rdma-core_version) dpdk=$(dpdk_version)" mlx_rdma_dpdk_matrix.txt; then echo 'y'; else echo 'n'; fi)
 DPDK_MLX4_PMD                ?= $(DPDK_MLX_DEFAULT)
 DPDK_MLX5_PMD                ?= $(DPDK_MLX_DEFAULT)

build/external/packages/ipsec-mb.mk

@@ -11,13 +11,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ipsec-mb_version             := 2.0
+ipsec-mb_version             := 1.5
 ipsec-mb_patch_version       := 0
 ipsec-mb_version_str         := $(ipsec-mb_version).$(ipsec-mb_patch_version)
 ipsec-mb_tarball             := v$(ipsec-mb_version).tar.gz
-ipsec-mb_tarball_sha256sum_2.0  := 0c60e56f63b14212c7b388668acc219cbc6b79e5e79732aff7542fefbb498413
+ipsec-mb_tarball_md5sum_1.0  := 906e701937751e761671dc83a41cff65
+ipsec-mb_tarball_md5sum_1.1  := 3916471d3713d27e42473cb6af9c65e5
+ipsec-mb_tarball_md5sum_1.2  := f551d9c208893a436c1f5c146a615bd6
+ipsec-mb_tarball_md5sum_1.3  := d8692db9efe32a263b61f12ac0dca950
+ipsec-mb_tarball_md5sum_1.4  := fddba2611f822296ddd82d1c31d22b24
+ipsec-mb_tarball_md5sum_1.5  := f18680f8dd43208a15a19a494423bdb9
 
-ipsec-mb_tarball_sha256sum   := $(ipsec-mb_tarball_sha256sum_$(ipsec-mb_version))
+ipsec-mb_tarball_md5sum      := $(ipsec-mb_tarball_md5sum_$(ipsec-mb_version))
 ipsec-mb_tarball_strip_dirs  := 1
 ipsec-mb_url                 := http://github.com/intel/intel-ipsec-mb/archive/$(ipsec-mb_tarball)
 ipsec-mb_system_header       := $(wildcard /usr/include/intel-ipsec-mb.h)

build/external/packages/octeon-roc.mk

@@ -4,7 +4,7 @@
 
 octeon-roc_version             := 0.5
 octeon-roc_tarball             := v$(octeon-roc_version).tar.gz
-octeon-roc_tarball_sha256sum   := 030fc0f58d761525bf8814ed9d95f5ce999541b19bd75eb123dee90c9e2c52a0
+octeon-roc_tarball_md5sum      := 76bc56c84935da944bbf340fe5283ef0
 
 octeon-roc_tarball_strip_dirs  := 1
 octeon-roc_url                 := https://github.com/MarvellEmbeddedProcessors/marvell-octeon-roc/archive/refs/tags/$(octeon-roc_tarball)

build/external/packages/quicly.mk

@@ -11,9 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-quicly_version := 0.1.5-vpp
+quicly_version := 0.1.4-vpp
 quicly_tarball := quicly_$(quicly_version).tar.gz
-quicly_tarball_sha256sum := fb50ad8ce1136561ee08df02131030d89e38acd2cf8e36c65c074f3bd5034938
+quicly_tarball_md5sum := 5419a0f340c5572bcf682c08acc84c77
 quicly_tarball_strip_dirs := 1
 quicly_url := https://github.com/vpp-quic/quicly/releases/download/v$(quicly_version)/quicly_$(quicly_version).tar.gz
 

build/external/packages/rdma-core.mk

@@ -25,8 +25,10 @@ RDMA_CORE_DEBUG?=n
 #
 rdma-core_version             := 52.0
 rdma-core_tarball             := rdma-core-$(rdma-core_version).tar.gz
-rdma-core_tarball_sha256sum_52.0 := 1f0ce5f2462c982b20d21156707076278807a7adf4d10e9142f3be4bec1b2b83
-rdma-core_tarball_sha256sum      := $(rdma-core_tarball_sha256sum_$(rdma-core_version))
+rdma-core_tarball_md5sum_49.0 := 9fe3909f19c7e0276c9e546411bbb49c
+rdma-core_tarball_md5sum_51.0 := ed95d79f782ea00bd7233d453abd60b3
+rdma-core_tarball_md5sum_52.0 := c78dba484aac72eb8586d88f7b399b0f
+rdma-core_tarball_md5sum      := $(rdma-core_tarball_md5sum_$(rdma-core_version))
 rdma-core_tarball_strip_dirs  := 1
 rdma-core_url                 := http://github.com/linux-rdma/rdma-core/releases/download/v$(rdma-core_version)/$(rdma-core_tarball)
 

build/external/packages/xdp-tools.mk

@@ -14,9 +14,8 @@
 
 xdp-tools_version             := 1.2.9
 xdp-tools_tarball             := xdp-tools-$(xdp-tools_version).tar.gz
-xdp-tools_tarball_sha256sum_1.2.9 := 3f8d30bd2e00c522103d224014f59a95400144aba1f3b322c6ad473541a0f99e
-
-xdp-tools_tarball_sha256sum      := $(xdp-tools_tarball_sha256sum_$(xdp-tools_version))
+xdp-tools_tarball_md5sum_1.2.9:= 6e4a49ceea8354bb7bb3b55990e9aed7
+xdp-tools_tarball_md5sum      := $(xdp-tools_tarball_md5sum_$(xdp-tools_version))
 xdp-tools_tarball_strip_dirs  := 1
 xdp-tools_url                 := https://github.com/xdp-project/xdp-tools/releases/download/v$(xdp-tools_version)/$(xdp-tools_tarball)
 

build/external/patches/quicly_0.1.5-vpp/0001-cmake-install.patch

@@ -1,30 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5142bac..7b95f74 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,6 +33,8 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
- SET(CMAKE_C_FLAGS "-std=c99 -Wall -g ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS}")
- SET(CMAKE_C_FLAGS_DEBUG "-O0")
- SET(CMAKE_C_FLAGS_RELEASE "-O2")
-+SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
-+SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true)
- 
- INCLUDE_DIRECTORIES(
-     ${OPENSSL_INCLUDE_DIR}
-@@ -118,6 +120,16 @@ TARGET_LINK_LIBRARIES(examples-echo quicly ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS}
- 
- ADD_EXECUTABLE(udpfw t/udpfw.c)
- 
-+INSTALL (
-+    DIRECTORY ${CMAKE_SOURCE_DIR}/include/
-+    DESTINATION include
-+    FILES_MATCHING PATTERN "*.h")
-+
-+INSTALL(TARGETS quicly
-+        RUNTIME DESTINATION bin
-+        LIBRARY DESTINATION lib
-+        ARCHIVE DESTINATION lib)
-+
- ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} WITH_DTRACE=${WITH_DTRACE} prove --exec "sh -c" -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t
-     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-     DEPENDS cli test.t)

build/external/patches/quicly_0.1.5-vpp/0002-cmake-install-picotls.patch

@@ -1,30 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d1d6c09..90d7221 100644
---- a/deps/picotls/CMakeLists.txt
-+++ b/deps/picotls/CMakeLists.txt
-@@ -13,6 +13,9 @@ IF (WITH_DTRACE)
- ENDIF ()
- 
- SET(CMAKE_C_FLAGS "-std=c99 -Wall -O2 -g ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS}")
-+SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
-+SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true)
-+
- INCLUDE_DIRECTORIES(
-     deps/cifra/src/ext
-     deps/cifra/src
-@@ -161,6 +164,15 @@ TARGET_LINK_LIBRARIES(ptlsbench ${PTLSBENCH_LIBS})
- 
- ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove --exec '' -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${TEST_EXES} cli)
- 
-+INSTALL (DIRECTORY ${CMAKE_SOURCE_DIR}/include/
-+    DESTINATION include
-+    FILES_MATCHING PATTERN "*.h")
-+
-+INSTALL(TARGETS picotls-core picotls-openssl
-+        RUNTIME DESTINATION bin
-+        LIBRARY DESTINATION lib
-+        ARCHIVE DESTINATION lib)
-+
- IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-      SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -pthread ${CMAKE_C_FLAGS}")
- ELSEIF ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")

build/optional/Makefile

@@ -1,158 +0,0 @@
-# Copyright (c) 2024 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-PKG_SUFFIX ?= $(shell git log --oneline v$(PKG_VERSION)-rc0.. . | wc -l)
-
-include ../build_common.mk
-include ../packages_common.mk
-
-ifneq ($(shell uname), FreeBSD)
-include packages/openssl.mk
-endif	# ! FreeBSD
-
-.PHONY: clean
-clean:
-	@rm -rf $(B) $(I)
-
-.PHONY: install
-ifeq ($(shell uname), FreeBSD)
-install:
-else
-install: openssl-install
-endif	# FreeBSD
-
-.PHONY: config
-ifeq ($(shell uname), FreeBSD)
-config:
-else
-config: openssl-config
-endif	# FreeBSD
-
-##############################################################################
-# .deb packaging
-##############################################################################
-
-DEB_VER := $(PKG_VERSION)
-DEB_ARCH=$(shell dpkg --print-architecture 2> /dev/null)
-DEV_DEB=vpp-opt-deps_$(DEB_VER)-$(PKG_SUFFIX)_$(DEB_ARCH).deb
-INSTALLED_VER=$(shell dpkg-query --showformat='$${Version}' --show vpp-opt-deps 2> /dev/null)
-
-.PHONY: build-deb install-deb check-deb
-
-deb/debian/changelog: Makefile
-	@echo "vpp-opt-deps ($(DEB_VER)-$(PKG_SUFFIX)) unstable; urgency=low" > $@
-	@echo "" >> $@
-	@echo "  * Version $(DEB_VER)" >> $@
-	@echo "" >> $@
-	@echo " -- VPP Dev <vpp-dev@lists.fd.io>  $(shell date -R --date=@${SOURCE_DATE_EPOCH})" >> $@
-
-$(DEV_DEB): deb/debian/changelog
-	@cd deb && dpkg-buildpackage -b -uc -us
-	git clean -fdx deb
-
-build-deb: $(DEV_DEB)
-
-install-deb:
-ifneq ($(INSTALLED_VER),$(DEB_VER)-$(PKG_SUFFIX))
-	@$(MAKE) $(DEV_DEB)
-	@sudo dpkg -i $(DEV_DEB)
-else
-	@echo "=========================================================="
-	@echo " Up-to-date vpp-opt-deps package already installed"
-	@echo "=========================================================="
-endif
-
-check-deb:
-ifneq ($(INSTALLED_VER),$(DEB_VER)-$(PKG_SUFFIX))
-	@echo "=========================================================="
-	@echo " Out of date vpp-opt-deps package installed."
-	@echo " Installed: $(INSTALLED_VER)"
-	@echo " Needed: $(DEB_VER)-$(PKG_SUFFIX)"
-	@echo ""
-	@echo " Please upgrade by invoking 'make install-opt-deps'"
-	@echo " from the top level directory."
-	@echo "=========================================================="
-endif
-
-##############################################################################
-# .rpm packaging
-##############################################################################
-
-RPM_VER := $(PKG_VERSION)
-RPM_ARCH=$(shell rpm --eval "%{_arch}" 2> /dev/null)
-DEV_RPM=vpp-opt-deps-$(RPM_VER)-$(PKG_SUFFIX).$(RPM_ARCH).rpm
-INSTALLED_RPM_VER=$(shell rpm -q --queryformat '%{VERSION}-%{RELEASE}' vpp-opt-deps 2> /dev/null | grep -v "vpp-opt-deps")
-
-.PHONY: build-rpm install-rpm check-rpm
-
-$(DEV_RPM): Makefile rpm/vpp-opt-deps.spec
-	@rpmbuild -bb \
-	  --define "_topdir $(CURDIR)/rpm" \
-	  --define "_version $(RPM_VER)" \
-	  --define "_release $(PKG_SUFFIX)" \
-	  $(CURDIR)/rpm/vpp-opt-deps.spec
-	mv rpm/RPMS/$(RPM_ARCH)/*.rpm .
-	@git clean -fdx rpm
-
-build-rpm: $(DEV_RPM)
-
-install-rpm:
-ifneq ($(INSTALLED_RPM_VER),$(RPM_VER)-$(PKG_SUFFIX))
-	@$(MAKE) $(DEV_RPM)
-	sudo rpm -e vpp-opt-deps || true
-	sudo rpm -Uih --force $(DEV_RPM)
-else
-	@echo "=========================================================="
-	@echo " Up-to-date vpp-opt-deps package already installed"
-	@echo "=========================================================="
-endif
-
-check-rpm:
-ifneq ($(INSTALLED_RPM_VER),$(RPM_VER)-$(PKG_SUFFIX))
-	@echo "=========================================================="
-	@echo " Out of date vpp-opt-deps package installed."
-	@echo " Installed: $(INSTALLED_RPM_VER)"
-	@echo " Needed: $(RPM_VER)-$(PKG_SUFFIX)"
-	@echo ""
-	@echo " Please upgrade by invoking 'make install-opt-deps'"
-	@echo " from the top level directory."
-	@echo "=========================================================="
-endif
-
-##############################################################################
-# ebuild support
-##############################################################################
-
-.PHONY: ebuild-build ebuild-install
-
-ebuild-build:
-ifeq ($(INSTALLED_VER)$(INSTALLED_RPM_VER),)
-	@echo "=========================================================="
-	@echo "Building vpp-opt-deps from source. Consider installing"
-	@echo "development package by invoking 'make install-opt-deps'"
-	@echo "from the top level directory"
-	@echo "=========================================================="
-	$(MAKE) config
-else
-ifneq ($(INSTALLED_VER),)
-	$(MAKE) check-deb
-endif
-ifneq ($(INSTALLED_RPM_VER),)
-	$(MAKE) check-rpm
-endif
-endif
-
-ebuild-install:
-ifeq ($(INSTALLED_VER)$(INSTALLED_RPM_VER),)
-	$(MAKE) install
-endif

build/optional/deb/debian/compat

@@ -1 +0,0 @@
-10

build/optional/deb/debian/control

@@ -1,11 +0,0 @@
-Source: vpp-opt-deps
-Section: net
-Priority: extra
-Maintainer: vpp-dev@lists.fd.io
-Build-Depends: debhelper (>= 9), dkms
-Standards-Version: 3.9.4
-
-Package: vpp-opt-deps
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: VPP developer package containing optional dependencies

build/optional/deb/debian/rules

@@ -1,33 +0,0 @@
-#!/usr/bin/make -f
-DH_VERBOSE = 1
-DEB_BUILD_OPTIONS = noddebs
-DEB_CFLAGS_MAINT_STRIP = -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects -O2
-DEB_LDFLAGS_MAINT_STRIP = -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects
-DEB_CFLAGS_MAINT_APPEND = -O3
-PKG=vpp-opt-deps
-
-VERSION = $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: //p')
-BASE_VER = $(word 1, $(subst -, ,$(VERSION)))
-
-export BUILD_DIR=$(CURDIR)/_build
-export INSTALL_DIR=$(CURDIR)/debian/tmp/opt/vpp/optional/$(shell uname -m)/
-
-MAKE_ARGS=-C ..
-
-include /usr/share/dpkg/default.mk
-
-%:
-	dh $@
-
-override_dh_clean:
-	make $(MAKE_ARGS) clean
-
-override_dh_auto_configure:
-
-override_dh_install:
-	make $(MAKE_ARGS) install
-	@mkdir -p $(INSTALL_DIR)
-	dh_install -p$(PKG) --autodest /opt
-
-override_dh_shlibdeps:
-	dh_shlibdeps -l$(INSTALL_DIR)lib/:$(INSTALL_DIR)lib64

build/optional/packages/openssl.mk

@@ -1,44 +0,0 @@
-# Copyright (c) 2024 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-openssl_version             := 3.4.0
-openssl_tarball             := openssl-$(openssl_version).tar.gz
-openssl_tarball_sha256sum   := e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf
-
-openssl_tarball_strip_dirs  := 1
-openssl_url                 := https://github.com/openssl/openssl/releases/download/openssl-$(openssl_version)/$(openssl_tarball)
-
-define openssl_config_args
---prefix=$(openssl_install_dir) \
---openssldir=$(openssl_build_dir) \
-no-dtls1
-endef
-
-define  openssl_config_cmds
-	@cd $(openssl_src_dir) && \
-		$(openssl_src_dir)/config \
-			$(openssl_config_args) | tee -a $(openssl_config_log)
-endef
-
-define  openssl_build_cmds
-	@cd $(openssl_src_dir) && \
-		$(MAKE) depend build_sw | tee $(openssl_build_log)
-endef
-
-define  openssl_install_cmds
-	@cd $(openssl_src_dir) && \
-		$(MAKE) install_sw | tee $(openssl_install_log)
-endef
-
-$(eval $(call package,openssl))
-

docs/aboutvpp/releasenotes/index.rst

@@ -6,8 +6,8 @@ Release notes
 .. toctree::
     :maxdepth: 2
 
-    v24.10
     v24.06
     v24.02
     v23.10
+    v23.06
     past

docs/aboutvpp/releasenotes/past.rst

@@ -6,7 +6,6 @@ Past releases
 .. toctree::
     :maxdepth: 1
 
-    v23.06
     v23.02
     v22.10.1
     v22.10

docs/configuration/reference.rst

@@ -773,8 +773,8 @@ Enable all plugins by default and then selectively disable specific plugins
    plugin dpdk_plugin.so disable
    plugin acl_plugin.so disable
 
-The statseg Section
--------------------
+Th statseg Section
+^^^^^^^^^^^^^^^^^^
 
 .. code-block:: console
 

docs/gettingstarted/progressivevpp/traces.rst

@@ -66,13 +66,6 @@ The following list of nodes are supported under trace add:
 * virtio-input
 * vmxnet3-input
 
-To display the full list:
-
-.. code-block:: console
-
-  vpp# show graph trace_supported
-
-
 Ping from Host to VPP
 ----------------------