2: fix NULL deref in l2-efp-filter for short/untagged frames

.gitignore

@@ -137,15 +137,25 @@ compile_commands.json
 **/test-run-*-*-*
 
 # host stack test framework
-/extras/hs-test/vpp-data
-/extras/hs-test/hs-test
-/extras/hs-test/http_server
-/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
+/test-c/hs-test/vpp-data
+/test-c/hs-test/hs-test
+/test-c/hs-test/http_server
+/test-c/hs-test/.build.ok
+/test-c/hs-test/.build.cov.ok
+/test-c/hs-test/.last_hst_ppid
+/test-c/hs-test/summary/
+/test-c/hs-test/.last_state_hash
+/test-c/hs-test/.go_cache/
+
+# kube-test
+/test-c/kube-test/vpp-data
+/test-c/kube-test/.build.ok
+/test-c/kube-test/.last_ppid
+/test-c/kube-test/summary/
+/test-c/kube-test/.last_state_hash
+/test-c/kube-test/.kube_deps.ok
+/test-c/kube-test/kubernetes/calico-config.yaml
+/test-c/kube-test/kubernetes/.vars
 
 # ./configure
 /CMakeFiles

.gitreview

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

MAINTAINERS

@@ -890,7 +890,13 @@ I:	hs-test
 M:	Florin Coras <fcoras@cisco.com>
 M:	Matus Fabian <matfabia@cisco.com>
 M:	Adrian Villin <avillin@cisco.com>
-F:	extras/hs-test
+F:	test-c/hs-test
+
+Kube test framework
+I:	kube-test
+M:	Florin Coras <fcoras@cisco.com>
+M:	Adrian Villin <avillin@cisco.com>
+F:	test-c/kube-test
 
 THE REST
 I:	misc

Makefile

@@ -23,6 +23,10 @@ MACHINE=$(shell uname -m)
 SUDO?=sudo -E
 DPDK_CONFIG?=no-pci
 
+ifeq ($(shell test -d /opt/vpp/optional/${MACHINE}/lib64 && echo yes),yes)
+VPP_OPT_DEPS_LIBRARY_PATH?=/opt/vpp/optional/${MACHINE}/lib64
+endif
+
 # we prefer clang by default
 ifeq ($(CC),cc)
   CC=clang
@@ -61,7 +65,11 @@ GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
 # We allow Darwin (MacOS) for docs generation; VPP build will still fail.
 ifneq ($(shell uname),Darwin)
 OS_ID        = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+ifeq ($(OS_ID),rhel)
+OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | sed -e 's/\..*//')
+else
 OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+endif
 OS_CODENAME  = $(shell grep '^VERSION_CODENAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 endif
 
@@ -202,6 +210,20 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
 	RPM_DEPENDS += infiniband-diags libibumad
 	RPM_DEPENDS += libpcap-devel llvm-toolset
 	RPM_DEPENDS_GROUPS = 'Development Tools'
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),rhel-8)
+	RPM_DEPENDS += yum-utils
+	RPM_DEPENDS += openssl-devel
+	RPM_DEPENDS += python3-ply # for vppapigen
+	RPM_DEPENDS += python36-devel
+	RPM_DEPENDS += python3-pip
+	RPM_DEPENDS += python3-virtualenv
+	RPM_DEPENDS += python3-jsonschema
+	RPM_DEPENDS += gcc-toolset-9
+	RPM_DEPENDS += gcc-toolset-9-libasan-devel
+	RPM_DEPENDS += cmake
+	RPM_DEPENDS += llvm-toolset
+	RPM_DEPENDS += infiniband-diags
+	RPM_DEPENDS += autoconf automake bison byacc libtool
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),anolis-8)
 	RPM_DEPENDS += yum-utils
 	RPM_DEPENDS += compat-openssl10 openssl-devel
@@ -382,7 +404,7 @@ ifeq ($(filter ubuntu debian linuxmint,$(OS_ID)),$(OS_ID))
 	exit 0
 else ifneq ("$(wildcard /etc/redhat-release)","")
 	@for i in $(RPM_DEPENDS) ; do \
-	    RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3,4)  ;	\
+	    RPM=$$(basename -s .rpm "$${i##*/}")  ;	\
 	    MISSING+=$$(rpm -q $$RPM | grep "^package")	   ;    \
 	done							   ;	\
 	if [ -n "$$MISSING" ] ; then \
@@ -404,7 +426,11 @@ ifeq ($(filter ubuntu debian linuxmint,$(OS_ID)),$(OS_ID))
 	@sudo -E apt-get update
 	@sudo -E apt-get $(APT_ARGS) $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
-ifeq ($(OS_ID),rhel)
+ifeq ($(OS_ID)-$(OS_VERSION_ID),rhel-8)
+	@sudo -E dnf install $(CONFIRM) https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+	@sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS)
+	@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),rhel-7)
 	@sudo -E yum-config-manager --enable rhel-server-rhscl-7-rpms
 	@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
 	@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
@@ -554,7 +580,7 @@ test-cov:
 
 .PHONY: test-cov-hs
 test-cov-hs: build-gcov
-	@$(MAKE) CC=$(CC) -C extras/hs-test test-cov \
+	@$(MAKE) CC=$(CC) -C test-c/hs-test test-cov \
 	VPP_BUILD_DIR=$(BR)/build-vpp_gcov-native/vpp
 
 .PHONY: test-cov-post-standalone
@@ -592,6 +618,7 @@ cov-merge:
 		-a $(BR)/test-coverage-merged/coverage-filtered1.info -o $(BR)/test-coverage-merged/coverage-merged.info
 	@genhtml $(BR)/test-coverage-merged/coverage-merged.info \
 		--output-directory $(BR)/test-coverage-merged/html
+	-@rm -f $(BR)/test-coverage-merged/html/cmd_line
 	@echo "Code coverage report is in $(BR)/test-coverage-merged/html/index.html"
 
 .PHONY: test-all
@@ -671,7 +698,7 @@ test-wipe-all:
 .PHONY: test-checkstyle
 test-checkstyle:
 	@$(MAKE) -C test checkstyle-python-all
-	@$(MAKE) -C extras/hs-test checkstyle-go
+	@$(MAKE) -C test-c/hs-test checkstyle-go
 
 # Note: All python venv consolidated in test/Makefile, test/requirements*.txt
 .PHONY: test-checkstyle-diff
@@ -714,12 +741,12 @@ define run
 	@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
 	@echo "         Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
 	@cd $(STARTUP_DIR) && \
-	  $(SUDO) $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF)
+	  $(SUDO) LD_LIBRARY_PATH=$(VPP_OPT_DEPS_LIBRARY_PATH) $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF)
 endef
 else
 define run
 	@cd $(STARTUP_DIR) && \
-	  $(SUDO) $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//')
+	  $(SUDO) LD_LIBRARY_PATH=$(VPP_OPT_DEPS_LIBRARY_PATH) $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//')
 endef
 endif
 
@@ -812,7 +839,11 @@ go-api-files: json-api-files
 
 .PHONY: cleanup-hst
 cleanup-hst:
-	$(MAKE) -C extras/hs-test cleanup-hst
+	$(MAKE) -C test-c/hs-test cleanup-hst
+
+.PHONY: cleanup-perf
+cleanup-perf:
+	$(MAKE) -C test-c/kube-test cleanup-perf
 
 .PHONY: ctags
 ctags: ctags.files
@@ -858,11 +889,13 @@ checkstyle-python:
 
 .PHONY: checkstyle-go
 checkstyle-go:
-	@$(MAKE) -C extras/hs-test checkstyle-go
+	@$(MAKE) -C test-c/hs-test checkstyle-go
+	@$(MAKE) -C test-c/kube-test checkstyle-go
 
 .PHONY: fixstyle-go
 fixstyle-go:
-	@$(MAKE) -C extras/hs-test fixstyle-go
+	@$(MAKE) -C test-c/hs-test fixstyle-go
+	@$(MAKE) -C test-c/kube-test fixstyle-go
 
 .PHONY: checkstyle-all
 checkstyle-all: checkstyle-commit checkstyle checkstyle-python docs-spell checkstyle-go

build/external/Makefile

@@ -16,6 +16,7 @@ PKG_SUFFIX ?= $(shell git log --oneline v$(PKG_VERSION)-rc0.. . | wc -l)
 include ../build_common.mk
 include ../packages_common.mk
 
+include packages/daq.mk
 include packages/ipsec-mb.mk
 include packages/quicly.mk
 ifneq ($(shell uname), FreeBSD)
@@ -31,16 +32,16 @@ clean:
 
 .PHONY: install
 ifeq ($(shell uname), FreeBSD)
-install: $(if $(ARCH_X86_64), ipsec-mb-install) dpdk-install quicly-install
+install: $(if $(ARCH_X86_64), ipsec-mb-install) daq-install dpdk-install quicly-install
 else
-install: $(if $(ARCH_X86_64), ipsec-mb-install) dpdk-install rdma-core-install quicly-install xdp-tools-install $(if $(AARCH64), octeon-roc-install)
+install: $(if $(ARCH_X86_64), ipsec-mb-install) daq-install dpdk-install rdma-core-install quicly-install xdp-tools-install $(if $(AARCH64), octeon-roc-install)
 endif	# FreeBSD
 
 .PHONY: config
 ifeq ($(shell uname), FreeBSD)
-config: $(if $(ARCH_X86_64), ipsec-mb-config) dpdk-config quicly-build
+config: daq-config $(if $(ARCH_X86_64), ipsec-mb-config) dpdk-config quicly-build
 else
-config: $(if $(ARCH_X86_64), ipsec-mb-config) dpdk-config rdma-core-config quicly-build
+config: daq-config $(if $(ARCH_X86_64), ipsec-mb-config) dpdk-config rdma-core-config quicly-build
 endif	# FreeBSD
 
 ##############################################################################

build/external/mlx_rdma_dpdk_matrix.txt

@@ -2,3 +2,4 @@ rdma=49.0 dpdk=23.11
 rdma=51.0 dpdk=24.03
 rdma=55.0 dpdk=24.07
 rdma=55.0 dpdk=24.11.1
+rdma=58.0 dpdk=25.07

build/external/packages/daq.mk

@@ -0,0 +1,40 @@
+# Copyright (c) 2025 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.
+
+daq_version             := 3.0.21
+daq_tarball             := daq-$(daq_version).tar.gz
+daq_tarball_sha256sum_3.0.21 := 60ad9405c1c6b75955e0784511b173570a601491ccdb6399da53ca811c446a96
+daq_tarball_sha256sum      := $(daq_tarball_sha256sum_$(daq_version))
+daq_tarball_strip_dirs  := 1
+daq_url                 := https://github.com/snort3/libdaq/archive/refs/tags/v$(daq_version).tar.gz
+
+define  daq_config_cmds
+       	@rm -f $(daq_config_log)
+        @cd ${daq_src_dir} && ./bootstrap > $(daq_config_log) 2>&1
+	@cd ${daq_src_dir} && ./configure --prefix='$(daq_install_dir)' --enable-shared --enable-static \
+                --disable-bundled-modules \
+		CFLAGS='' \
+		>> $(daq_config_log) 2>&1
+endef
+
+define  daq_build_cmds
+	@cd ${daq_src_dir} && $(MAKE) V=1 > $(daq_build_log)
+endef
+
+define  daq_install_cmds
+	@rm -f $(daq_install_log)
+	@cd ${daq_src_dir} && \
+		$(MAKE) install V=1 PREFIX='$(daq_install_dir)' >> $(daq_install_log)
+endef
+
+$(eval $(call package,daq))

build/external/packages/dpdk.mk

@@ -21,11 +21,11 @@ DPDK_MLX_IBV_LINK            ?= static
 # On most of the systems, default value for max lcores is 128
 DPDK_MAX_LCORES              ?=
 
-dpdk_version                 ?= 24.11.1
+dpdk_version                 ?= 25.07
 dpdk_base_url                ?= http://fast.dpdk.org/rel
 dpdk_tarball                 := dpdk-$(dpdk_version).tar.xz
 
-dpdk_tarball_sha256sum_24.11.1 := bcae7d42c449fc456dfb279feabcbe0599a29bebb2fe2905761e187339d96b8e
+dpdk_tarball_sha256sum_25.07 := 6886cbedc350bb8cbef347d10367d6259e36435627fbb27d578adbdc0d3b410d
 
 dpdk_tarball_sha256sum       := $(dpdk_tarball_sha256sum_$(dpdk_version))
 dpdk_url                     := $(dpdk_base_url)/$(dpdk_tarball)

build/external/packages/octeon-roc.mk

@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 # https://spdx.org/licenses/Apache-2.0.html
 
-octeon-roc_version             := 25.05
+octeon-roc_version             := 25.09
 octeon-roc_tarball             := v$(octeon-roc_version).tar.gz
-octeon-roc_tarball_sha256sum   := fc7c8583e49f76b70fb1da242482fe324e6456c04f17d1a0e8726c28266220c6
+octeon-roc_tarball_sha256sum   := 39caf74eded46a01286dfbc6a90f8ddbf76d59764f89a574206afbf51b9d5613
 
 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/rdma-core.mk

@@ -23,9 +23,9 @@ RDMA_CORE_DEBUG?=n
 #       	2. Verify that the file build/external/dpdk_mlx_default.sh was generated
 #              and contains 'DPDK_MLX_DEFAULT=y'
 #
-rdma-core_version             := 55.0
+rdma-core_version             := 58.0
 rdma-core_tarball             := rdma-core-$(rdma-core_version).tar.gz
-rdma-core_tarball_sha256sum_55.0 := 6f8b97267807cdae54845f542ee3d75de80fdc24fe2632f5db1573ecef132d0f
+rdma-core_tarball_sha256sum_58.0 := 88d67897b793f42d2004eec2629ab8464e425e058f22afabd29faac0a2f54ce4
 rdma-core_tarball_sha256sum      := $(rdma-core_tarball_sha256sum_$(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

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-xdp-tools_version             := 1.2.9
+xdp-tools_version             := 1.5.5
 xdp-tools_tarball             := xdp-tools-$(xdp-tools_version).tar.gz
-xdp-tools_tarball_sha256sum_1.2.9 := 3f8d30bd2e00c522103d224014f59a95400144aba1f3b322c6ad473541a0f99e
+xdp-tools_tarball_sha256sum_1.5.5 := 9a4339ffc40df178c4ddf919cb2b23585a75b3023517c75e82c4dfb0899249c7
 
 xdp-tools_tarball_sha256sum      := $(xdp-tools_tarball_sha256sum_$(xdp-tools_version))
 xdp-tools_tarball_strip_dirs  := 1

build/external/patches/xdp-tools_1.5.5/0001-libxdp-add-fPIC-with-static-lib-build.patch

@@ -0,0 +1,26 @@
+From e83f80443a2f23a68037bf4c7ba16b3723d193a4 Mon Sep 17 00:00:00 2001
+From: Yulong <yulong.pei@intel.com>
+Date: Tue, 3 Jan 2023 14:16:17 +0000
+Subject: [PATCH] libxdp: add fPIC with static lib build
+
+Signed-off-by: Yulong <yulong.pei@intel.com>
+---
+ lib/libxdp/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile
+index 4716fb0..403c2d9 100644
+--- a/lib/libxdp/Makefile
++++ b/lib/libxdp/Makefile
+@@ -87,7 +87,7 @@ $(SHARED_OBJDIR):
+ 	$(Q)mkdir -p $(SHARED_OBJDIR)
+
+ $(STATIC_OBJDIR)/%.o: %.c $(EXTRA_LIB_DEPS) | $(STATIC_OBJDIR)
+-	$(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(STATIC_CFLAGS) -Wall -I../../headers -c $< -o $@
++	$(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(STATIC_CFLAGS) -fPIC -Wall -I../../headers -c $< -o $@
+
+ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DEPS) | $(SHARED_OBJDIR)
+ 	$(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(SHARED_CFLAGS) -Wall -I../../headers -c $< -o $@
+-- 
+2.25.1
+

build/external/patches/xdp-tools_1.5.5/0003-libxdp-fix-maybe-uninitialized-compiler-warning.patch

@@ -0,0 +1,26 @@
+From 3033b9bdbcdb270f15373b27933d554f847e01d4 Mon Sep 17 00:00:00 2001
+From: Yulong <yulong.pei@intel.com>
+Date: Fri, 6 Jan 2023 14:31:24 +0000
+Subject: [PATCH 3/3] libxdp: fix maybe-uninitialized compiler warning
+
+Signed-off-by: Yulong <yulong.pei@intel.com>
+---
+ lib/common.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/common.mk b/lib/common.mk
+index ce24c48..e964bd8 100644
+--- a/lib/common.mk
++++ b/lib/common.mk
+@@ -104,7 +104,7 @@ $(LIB_OBJS): %.o: %.c %.h $(LIB_H)
+
+ ALL_EXEC_TARGETS=$(USER_TARGETS) $(TEST_TARGETS)
+ $(ALL_EXEC_TARGETS): %: %.c  $(OBJECT_LIBBPF) $(OBJECT_LIBXDP) $(LIBMK) $(LIB_OBJS) $(KERN_USER_H) $(EXTRA_DEPS) $(EXTRA_USER_DEPS) $(BPF_SKEL_H) $(USER_EXTRA_C)
+-	$(QUIET_CC)$(CC) -Wall $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(LIB_OBJS) \
++	$(QUIET_CC)$(CC) -Wall -Wno-maybe-uninitialized $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(LIB_OBJS) \
+ 	 $< $(USER_EXTRA_C) $(LDLIBS)
+
+ $(XDP_OBJ): %.o: %.c $(KERN_USER_H) $(EXTRA_DEPS) $(BPF_HEADERS) $(LIBMK)
+-- 
+2.25.1
+

build/optional/packages/openssl.mk

@@ -11,9 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-openssl_version             := 3.5.0
+openssl_version             := 3.5.1
 openssl_tarball             := openssl-$(openssl_version).tar.gz
-openssl_tarball_sha256sum   := 344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0
+openssl_tarball_sha256sum   := 529043b15cffa5f36077a4d0af83f3de399807181d607441d734196d889b641f
 
 openssl_tarball_strip_dirs  := 1
 openssl_url                 := https://github.com/openssl/openssl/releases/download/openssl-$(openssl_version)/$(openssl_tarball)