Compare commits
6 Commits
v24.06-rc2
...
v22.06-rc2
Author | SHA1 | Date | |
---|---|---|---|
|
ea4bcec987 | ||
|
2d4b5c3670 | ||
|
d9f83ae3f1 | ||
|
ea7a4cb891 | ||
|
5373a6bcc8 | ||
|
211fa4748c |
@ -13,32 +13,18 @@ ForEachMacros:
|
||||
- 'clib_bitmap_foreach'
|
||||
- 'pool_foreach'
|
||||
- 'pool_foreach_index'
|
||||
- 'pool_foreach_pointer'
|
||||
- 'vec_foreach'
|
||||
- 'vec_foreach_backwards'
|
||||
- 'vec_foreach_index'
|
||||
- 'vec_foreach_index_backwards'
|
||||
- 'vec_foreach_pointer'
|
||||
- 'vlib_foreach_rx_tx'
|
||||
- 'foreach_int'
|
||||
- 'foreach_pointer'
|
||||
- 'foreach_vlib_main'
|
||||
- 'foreach_set_bit_index'
|
||||
- 'foreach_vlib_frame_bitmap_set_bit_index'
|
||||
- 'FOREACH_ARRAY_ELT'
|
||||
- 'RTE_ETH_FOREACH_DEV'
|
||||
- 'foreach_vnet_dev_rx_queue_runtime'
|
||||
- 'foreach_vnet_dev_counter'
|
||||
- 'foreach_vnet_dev_port_rx_queue'
|
||||
- 'foreach_vnet_dev_port_tx_queue'
|
||||
- 'foreach_vnet_dev_port'
|
||||
- 'foreach_vnet_dev_args'
|
||||
- 'foreach_vnet_dev_port_args'
|
||||
|
||||
StatementMacros:
|
||||
- 'CLIB_MULTIARCH_FN'
|
||||
- 'VLIB_NODE_FN'
|
||||
- 'VNET_DEV_NODE_FN'
|
||||
- 'VNET_DEVICE_CLASS_TX_FN'
|
||||
- '__clib_section'
|
||||
- '__clib_aligned'
|
||||
|
38
.gitignore
vendored
38
.gitignore
vendored
@ -16,13 +16,19 @@
|
||||
/build-root/*.tar.xz
|
||||
/build-root/*.changes
|
||||
/build-root/rpmbuild/
|
||||
/build-root/test-coverage/
|
||||
/build-root/test/
|
||||
/build-root/test-doc/
|
||||
/build-root/test-cov/
|
||||
/test/run/
|
||||
/test/build/
|
||||
/test/coverage/
|
||||
/test/venv/
|
||||
/test/vapi_test/
|
||||
/test/doc/build/
|
||||
/build-config.mk
|
||||
/build/external/*.tar.gz
|
||||
/build/external/*.tar.xz
|
||||
/build/external/vpp-*
|
||||
/build/external/dpdk_mlx_default.sh
|
||||
/build/external/vpp-*.deb
|
||||
/build/external/vpp-*.changes
|
||||
/build/external/downloads/
|
||||
/path_setup
|
||||
/tools/
|
||||
@ -82,7 +88,6 @@ GTAGS
|
||||
# language servers
|
||||
compile_commands.json
|
||||
.clangd
|
||||
.cache
|
||||
|
||||
# indent backup files
|
||||
*.BAK
|
||||
@ -114,26 +119,3 @@ compile_commands.json
|
||||
|
||||
# debian packaging
|
||||
.pc
|
||||
|
||||
# No test log files
|
||||
**/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/summary/
|
||||
|
||||
# ./configure
|
||||
/CMakeFiles
|
||||
/bin
|
||||
/lib
|
||||
/.ninja_deps
|
||||
/.ninja_log
|
||||
/.cmake
|
||||
/CMakeCache.txt
|
||||
/build.ninja
|
||||
/cmake_install.cmake
|
||||
/startup.conf
|
||||
/startup.vpp
|
||||
|
@ -2,4 +2,4 @@
|
||||
host=gerrit.fd.io
|
||||
port=29418
|
||||
project=vpp
|
||||
defaultbranch=stable/2406
|
||||
defaultbranch=stable/2206
|
||||
|
@ -86,10 +86,6 @@ committers:
|
||||
company: 'intel'
|
||||
email: 'roy.fan.zhang@intel.com'
|
||||
id: 'royzhang1980'
|
||||
- name: 'Mohammed HAWARI'
|
||||
company: 'cisco'
|
||||
email: 'momohawari@gmail.com'
|
||||
id: 'momohawari'
|
||||
tsc:
|
||||
# yamllint disable rule:line-length
|
||||
approval: 'https://wiki.fd.io/view/TSC/Meeting_Minutes'
|
||||
@ -100,6 +96,3 @@ tsc:
|
||||
- type: 'Addition'
|
||||
name: 'Fan Zhang'
|
||||
link: 'https://lists.fd.io/g/vpp-dev/message/19068'
|
||||
- type: 'Approval'
|
||||
name: 'Mohammed HAWARI'
|
||||
link: 'https://ircbot.wl.linuxfoundation.org/meetings/fdio-meeting/2023/fd_io_tsc/fdio-meeting-fd_io_tsc.2023-06-01-15.00.html'
|
||||
|
117
MAINTAINERS
117
MAINTAINERS
@ -98,41 +98,31 @@ I: policer
|
||||
M: Neale Ranns <neale@graphiant.com>
|
||||
F: src/vnet/policer/
|
||||
|
||||
VNET New Device Drivers Infra
|
||||
I: dev
|
||||
M: Damjan Marion <damarion@cisco.com>
|
||||
F: src/vnet/dev/
|
||||
|
||||
VNET Device Drivers
|
||||
I: devices
|
||||
Y: src/vnet/devices/af_packet/FEATURE.yaml
|
||||
Y: src/vnet/devices/pipe/FEATURE.yaml
|
||||
M: Damjan Marion <damarion@cisco.com>
|
||||
F: src/vnet/devices/
|
||||
|
||||
AF PACKET Drivers
|
||||
I: af_packet
|
||||
Y: src/plugins/af_packet/FEATURE.yaml
|
||||
M: Mohsin Kazmi <mohsin.kazmi14@gmail.com>
|
||||
F: src/plugins/af_packet
|
||||
|
||||
VNET TAP Drivers
|
||||
I: tap
|
||||
Y: src/vnet/devices/tap/FEATURE.yaml
|
||||
M: Damjan Marion <damarion@cisco.com>
|
||||
M: Steven Luong <sluong@cisco.com>
|
||||
M: Mohsin Kazmi <mohsin.kazmi14@gmail.com>
|
||||
M: Mohsin Kazmi <sykazmi@cisco.com>
|
||||
F: src/vnet/devices/tap/
|
||||
|
||||
VNET Vhost User Driver
|
||||
I: vhost
|
||||
Y: src/plugins/vhost/FEATURE.yaml
|
||||
Y: src/vnet/devices/virtio/FEATURE.yaml
|
||||
M: Steven Luong <sluong@cisco.com>
|
||||
F: src/plugins/vhost
|
||||
F: src/vnet/devices/virtio/vhost_user*
|
||||
|
||||
VNET Native Virtio Drivers
|
||||
I: virtio
|
||||
Y: src/vnet/devices/virtio/FEATURE.yaml
|
||||
M: Mohsin Kazmi <mohsin.kazmi14@gmail.com>
|
||||
M: Mohsin Kazmi <sykazmi@cisco.com>
|
||||
M: Damjan Marion <damarion@cisco.com>
|
||||
F: src/vnet/devices/virtio/
|
||||
|
||||
@ -190,16 +180,15 @@ F: src/vnet/pg/
|
||||
VNET Segment Routing (IPv6 and MPLS)
|
||||
I: sr
|
||||
M: Pablo Camarillo <pcamaril@cisco.com>
|
||||
M: Ahmed Abdelsalam <ahabdels@cisco.com>
|
||||
F: src/vnet/srv6/
|
||||
F: src/plugin/srmpls/
|
||||
F: src/vnet/srmpls/
|
||||
F: src/examples/srv6-sample-localsid/
|
||||
|
||||
VNET IPSec
|
||||
I: ipsec
|
||||
M: Neale Ranns <neale@graphiant.com>
|
||||
M: Radu Nicolau <radu.nicolau@intel.com>
|
||||
M: Fan Zhang <fanzhang.oss@gmail.com>
|
||||
M: Fan Zhang <roy.fan.zhang@intel.com>
|
||||
F: src/vnet/ipsec/
|
||||
|
||||
VNET Crypto Infra
|
||||
@ -231,12 +220,12 @@ F: src/plugins/crypto_openssl/
|
||||
Plugin - Crypto - ipsecmb
|
||||
I: crypto-ipsecmb
|
||||
M: Neale Ranns <neale@graphiant.com>
|
||||
M: Fan Zhang <fanzhang.oss@gmail.com>
|
||||
M: Fan Zhang <roy.fan.zhang@intel.com>
|
||||
F: src/plugins/crypto_ipsecmb/
|
||||
|
||||
Plugin - Crypto - sw_scheduler
|
||||
I: crypto-sw-scheduler
|
||||
M: Fan Zhang <fanzhang.oss@gmail.com>
|
||||
M: Fan Zhang <roy.fan.zhang@intel.com>
|
||||
F: src/plugs/crypto_sw_scheduler/
|
||||
|
||||
VNET L2
|
||||
@ -253,7 +242,7 @@ F: src/vnet/gre/
|
||||
VNET GSO
|
||||
I: gso
|
||||
M: Andrew Yourtchenko <ayourtch@gmail.com>
|
||||
M: Mohsin Kazmi <mohsin.kazmi14@gmail.com>
|
||||
M: Mohsin Kazmi <sykazmi@cisco.com>
|
||||
F: src/vnet/gso/
|
||||
|
||||
Plugin - MAP
|
||||
@ -293,10 +282,9 @@ F: src/vnet/udp
|
||||
|
||||
VNET VXLAN
|
||||
I: vxlan
|
||||
Y: src/plugins/vxlan/FEATURE.yaml
|
||||
M: John Lo <lojultra2020@outlook.com>
|
||||
M: Steven Luong <sluong@cisco.com>
|
||||
F: src/plugins/vxlan/
|
||||
F: src/vnet/vxlan/
|
||||
|
||||
VNET VXLAN-GPE
|
||||
I: vxlan-gpe
|
||||
@ -363,7 +351,7 @@ F: src/vnet/flow/
|
||||
|
||||
VNET Hash
|
||||
I: hash
|
||||
M: Mohsin Kazmi <mohsin.kazmi14@gmail.com>
|
||||
M: Mohsin Kazmi <sykazmi@cisco.com>
|
||||
M: Damjan Marion <damarion@cisco.com>
|
||||
F: src/vnet/hash/
|
||||
|
||||
@ -410,22 +398,6 @@ I: avf
|
||||
M: Damjan Marion <damarion@cisco.com>
|
||||
F: src/plugins/avf/
|
||||
|
||||
Plugin - IAVF Device driver
|
||||
I: iavf
|
||||
M: Damjan Marion <damarion@cisco.com>
|
||||
F: src/plugins/dev_iavf/
|
||||
|
||||
Plugin - Amazon Elastic Network Adapter (ENA) device driver
|
||||
I: ena
|
||||
M: Damjan Marion <damarion@cisco.com>
|
||||
F: src/plugins/dev_ena/
|
||||
|
||||
Plugin - Marvell Octeon device driver
|
||||
I: octeon
|
||||
M: Monendra Singh Kushwaha <kmonendra@marvell.com>
|
||||
M: Damjan Marion <damarion@cisco.com>
|
||||
F: src/plugins/dev_octeon/
|
||||
|
||||
Plugin - Dispatch Trace PCAP
|
||||
I: dispatch-trace
|
||||
M: Dave Barach <vpp@barachs.net>
|
||||
@ -439,8 +411,9 @@ F: src/plugins/dpdk/
|
||||
|
||||
Plugin - DPDK Crypto
|
||||
I: dpdk-cryptodev
|
||||
M: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@outlook.com>
|
||||
M: Radu Nicolau <radu.nicolau@intel.com>
|
||||
M: Fan Zhang <fanzhang.oss@gmail.com>
|
||||
M: Fan Zhang <roy.fan.zhang@intel.com>
|
||||
F: src/plugins/dpdk/cryptodev/
|
||||
|
||||
Plugin - flowprobe
|
||||
@ -449,11 +422,6 @@ Y: src/plugins/flowprobe/FEATURE.yaml
|
||||
M: Ole Troan <otroan@employees.org>
|
||||
F: src/plugins/flowprobe/
|
||||
|
||||
Plugin - fateshare
|
||||
I: fateshare
|
||||
M: Andrew Yourtchenko <ayourtch@gmail.com>
|
||||
F: src/plugins/fateshare/
|
||||
|
||||
Plugin - http_static
|
||||
I: http_static
|
||||
M: Dave Barach <vpp@barachs.net>
|
||||
@ -597,16 +565,6 @@ M: Dave Barach <vpp@barachs.net>
|
||||
M: Florin Coras <fcoras@cisco.com>
|
||||
F: src/plugins/unittest/
|
||||
|
||||
Plugin - IDPF Device driver
|
||||
I: idpf
|
||||
M: Ting Xu <ting.xu@intel.com>
|
||||
F: src/plugins/idpf/
|
||||
|
||||
Plugin - Intel DMA engines
|
||||
I: dma_intel
|
||||
M: Marvin Liu <yong.liu@intel.com>
|
||||
F: src/plugins/dma_intel
|
||||
|
||||
Test Infrastructure
|
||||
I: tests
|
||||
M: Klement Sekera <klement.sekera@gmail.com>
|
||||
@ -686,7 +644,7 @@ F: src/plugins/snort/
|
||||
|
||||
libmemif
|
||||
I: libmemif
|
||||
M: Mohsin Kazmi <sykazmi@cisco.com>
|
||||
M: Damjan Marion <damarion@cisco.com>
|
||||
F: extras/libmemif
|
||||
|
||||
gomemif
|
||||
@ -772,14 +730,9 @@ F: src/plugins/cnat
|
||||
Plugin - Wireguard
|
||||
I: wireguard
|
||||
M: Artem Glazychev <artem.glazychev@xored.com>
|
||||
M: Fan Zhang <fanzhang.oss@gmail.com>
|
||||
M: Fan Zhang <roy.fan.zhang@intel.com>
|
||||
F: src/plugins/wireguard
|
||||
|
||||
Packetforge
|
||||
I: packetforge
|
||||
M: Ting Xu <ting.xu@intel.com>
|
||||
F: extras/packetforge
|
||||
|
||||
VPP Config Tooling
|
||||
I: vpp_config
|
||||
M: John DeNisco <jdenisco@cisco.com>
|
||||
@ -801,11 +754,6 @@ I: geneve
|
||||
M: community vpp-dev@lists.fd.io
|
||||
F: src/plugins/geneve/
|
||||
|
||||
Plugin - IP session redirect
|
||||
I: ip_session_redirect
|
||||
M: Benoît Ganne <bganne@cisco.com>
|
||||
F: src/plugins/ip_session_redirect/
|
||||
|
||||
Plugin - linux-cp
|
||||
I: linux-cp
|
||||
M: Neale Ranns <neale@graphiant.com>
|
||||
@ -837,21 +785,6 @@ I: prom
|
||||
M: Florin Coras <fcoras@cisco.com>
|
||||
F: src/plugins/prom
|
||||
|
||||
Plugin - BPF Trace Filter
|
||||
I: bpf_trace_filter
|
||||
M: Mohammed Hawari <mohammed@hawari.fr>
|
||||
F: src/plugins/bpf_trace_filter
|
||||
|
||||
Plugin - NPTv6
|
||||
I: npt66
|
||||
M: Ole Troan <otroan@employees.org>
|
||||
F: src/plugins/npt66
|
||||
|
||||
Plugin - Trace node
|
||||
I: tracenode
|
||||
M: Maxime Peim <mpeim@cisco.com>
|
||||
F: src/plugins/tracenode
|
||||
|
||||
cJSON
|
||||
I: cjson
|
||||
M: Ole Troan <ot@cisco.com>
|
||||
@ -873,27 +806,9 @@ I: rpm-packaging
|
||||
M: Laszlo Kiraly <laszlo.kiraly@est.tech>
|
||||
F: src/extras/rpm/opensuse
|
||||
|
||||
VPP StrongSwan Daemon
|
||||
I: vpp-swan
|
||||
M: Fan Zhang <fanzhang.oss@gmail.com>
|
||||
M: Gabriel Oginski <gabrielx.oginski@intel.com>
|
||||
F: extras/strongswan/vpp_sswan
|
||||
|
||||
Host stack test framework
|
||||
I: hs-test
|
||||
M: Florin Coras <fcoras@cisco.com>
|
||||
M: Filip Tehlar <ftehlar@cisco.com>
|
||||
M: Maros Ondrejicka <maros.ondrejicka@pantheon.tech>
|
||||
F: extras/hs-test
|
||||
|
||||
THE REST
|
||||
I: misc
|
||||
M: vpp-dev Mailing List <vpp-dev@fd.io>
|
||||
C: Missing Maintainer
|
||||
F: *
|
||||
F: */
|
||||
|
||||
Netmap
|
||||
I: netmap
|
||||
M: Tom Jones <thj@freebsd.org>
|
||||
F: src/plugins/netmap/
|
||||
|
@ -42,4 +42,4 @@ external_configure = echo
|
||||
|
||||
external_build = echo
|
||||
|
||||
external_install = $(MAKE) $(DPDK_MAKE_ARGS) -C external ebuild-build ebuild-install
|
||||
external_install = make $(DPDK_MAKE_ARGS) -C external ebuild-build ebuild-install
|
||||
|
@ -30,15 +30,6 @@ vpp_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(vpp_cmake_prefix_path)"
|
||||
ifeq ("$(V)","1")
|
||||
vpp_cmake_args += -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
|
||||
endif
|
||||
ifneq ($(VPP_PLATFORM),)
|
||||
vpp_cmake_args += -DVPP_PLATFORM="$(VPP_PLATFORM)"
|
||||
endif
|
||||
ifneq ($(VPP_EXCLUDED_PLUGINS),)
|
||||
vpp_cmake_args += -DVPP_EXCLUDED_PLUGINS="$(VPP_EXCLUDED_PLUGINS)"
|
||||
endif
|
||||
ifneq (${SOURCE_DATE_EPOCH}),)
|
||||
vpp_cmake_args += -DVPP_SOURCE_DATE_EPOCH="$(SOURCE_DATE_EPOCH)"
|
||||
endif
|
||||
|
||||
ifneq ($(VPP_EXTRA_CMAKE_ARGS),)
|
||||
vpp_cmake_args += $(VPP_EXTRA_CMAKE_ARGS)
|
||||
|
@ -39,7 +39,7 @@
|
||||
######################################################################
|
||||
|
||||
# Scripts require non-POSIX parts of bash
|
||||
SHELL := $(shell which bash)
|
||||
SHELL := /bin/bash
|
||||
|
||||
# Where this makefile lives
|
||||
MU_BUILD_ROOT_DIR = $(shell pwd)
|
||||
@ -365,7 +365,7 @@ NATIVE_TOOLS_$(IS_LINUX) += $(NATIVE_TOOLS_LINUX)
|
||||
CROSS_TOOLS_$(IS_LINUX) += glibc gcc
|
||||
|
||||
# must be first for bootstrapping
|
||||
NATIVE_TOOLS = findutils $(MAKE)
|
||||
NATIVE_TOOLS = findutils make
|
||||
|
||||
# basic tools needed for build system
|
||||
NATIVE_TOOLS += git automake autoconf libtool texinfo tar
|
||||
@ -614,7 +614,7 @@ check_platform = \
|
||||
-a ! -x "`which 2> /dev/null $${target_gcc}`" ] ; then \
|
||||
$(call build_msg_fn, \
|
||||
No cross-compiler found for platform $(PLATFORM) target $(TARGET); \
|
||||
try $(MAKE) PLATFORM=$(PLATFORM) install-tools) ; \
|
||||
try make PLATFORM=$(PLATFORM) install-tools) ; \
|
||||
exit 1 ; \
|
||||
fi
|
||||
|
||||
@ -650,18 +650,11 @@ configure_check_timestamp = \
|
||||
# /proc/cpuinfo does not exist on platforms without a /proc and on some
|
||||
# platforms, notably inside containers, it has no content. In those cases
|
||||
# we assume there's 1 processor; we use 2*ncpu for the -j option.
|
||||
#
|
||||
# On FreeBSD we can call nproc to get the number of processors.
|
||||
#
|
||||
# NB: GNU Make 4.2 will let us use '$(file </proc/cpuinfo)' to both test
|
||||
# for file presence and content; for now this will have to do.
|
||||
ifndef MAKE_PARALLEL_JOBS
|
||||
ifeq ($(shell uname), FreeBSD)
|
||||
MAKE_PARALLEL_JOBS = $(shell nproc)
|
||||
else
|
||||
MAKE_PARALLEL_JOBS = $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo), \
|
||||
$(shell grep -c ^processor /proc/cpuinfo), 2)
|
||||
endif # FreeBSD
|
||||
endif
|
||||
MAKE_PARALLEL_FLAGS ?= $(if $($(PACKAGE)_make_parallel_fails),,-j $(MAKE_PARALLEL_JOBS))
|
||||
|
||||
@ -807,7 +800,7 @@ pull-all:
|
||||
$(call build_msg_fn,Git pull build tools) ; \
|
||||
$(call tool_make_target_fn,pull-all) ; \
|
||||
$(call build_msg_fn,Git pull packages for platform $(PLATFORM)) ; \
|
||||
$(MAKE) PLATFORM=$(PLATFORM) $(patsubst %,%-pull-all,$(ROOT_PACKAGES))
|
||||
make PLATFORM=$(PLATFORM) $(patsubst %,%-pull-all,$(ROOT_PACKAGES))
|
||||
|
||||
.PHONY: %-diff
|
||||
%-diff:
|
||||
@ -969,13 +962,13 @@ $(PLATFORM_IMAGE_DIR)/ro.img ro-image: $(patsubst %,%-find-source,$(ROOT_PACKAGE
|
||||
chmod 0755 $${tmp_dir} ; \
|
||||
cd $${tmp_dir} ; \
|
||||
trap "rm -rf $${tmp_dir}" err ; \
|
||||
fakeroot $(SHELL) -c "{ \
|
||||
fakeroot /bin/bash -c "{ \
|
||||
set -eu$(BUILD_DEBUG) ; \
|
||||
$(MAKE) -C $(MU_BUILD_ROOT_DIR) IMAGE_INSTALL_DIR=$${tmp_dir} \
|
||||
$(patsubst %,%-image_install, \
|
||||
basic_system \
|
||||
$(ROOT_PACKAGES)) ; \
|
||||
: $(MAKE) dev directory ; \
|
||||
: make dev directory ; \
|
||||
$(linuxrc_makedev) ; \
|
||||
echo @@@@ Relocating ELF executables to run in / @@@@ ; \
|
||||
scripts/set-rpath /$(arch_lib_dir):/lib ; \
|
||||
@ -1061,7 +1054,7 @@ rw-image: rw-image-check-type ro-image
|
||||
chmod 0755 $${tmp_dir} ; \
|
||||
cd $${tmp_dir} ; \
|
||||
trap "rm -rf $${tmp_dir}" err ; \
|
||||
fakeroot $(SHELL) -c "{ \
|
||||
fakeroot /bin/bash -c "{ \
|
||||
set -eu$(BUILD_DEBUG) ; \
|
||||
$(linuxrc_makedev) ; \
|
||||
$(call rw_image_embed_ro_image_fn,$${ro_image}) ; \
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (c) 2015 Cisco and/or its affiliates.
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
|
34
build/external/Makefile
vendored
34
build/external/Makefile
vendored
@ -12,21 +12,17 @@
|
||||
# limitations under the License.
|
||||
|
||||
# Scripts require non-POSIX parts of bash
|
||||
SHELL := $(shell which bash)
|
||||
SHELL := /bin/bash
|
||||
|
||||
DL_CACHE_DIR = $(HOME)/Downloads
|
||||
MAKE ?= make
|
||||
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
|
||||
|
||||
B := $(BUILD_DIR)
|
||||
I := $(INSTALL_DIR)
|
||||
@ -38,35 +34,23 @@ 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
|
||||
ifneq ($(shell uname), FreeBSD)
|
||||
include packages/rdma-core.mk
|
||||
include packages/dpdk.mk
|
||||
include packages/xdp-tools.mk
|
||||
include packages/octeon-roc.mk
|
||||
endif # FreeBSD
|
||||
include packages/rdma-core.mk
|
||||
include packages/libbpf.mk
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
@rm -rf $(B) $(I)
|
||||
|
||||
.PHONY: install
|
||||
ifeq ($(shell uname), FreeBSD)
|
||||
install: $(if $(ARCH_X86_64), ipsec-mb-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)
|
||||
endif # FreeBSD
|
||||
install: $(if $(ARCH_X86_64), ipsec-mb-install) dpdk-install rdma-core-install quicly-install libbpf-install
|
||||
|
||||
.PHONY: config
|
||||
ifeq ($(shell uname), FreeBSD)
|
||||
config: $(if $(ARCH_X86_64), ipsec-mb-config) quicly-build
|
||||
else
|
||||
config: $(if $(ARCH_X86_64), ipsec-mb-config) dpdk-config rdma-core-config quicly-build
|
||||
endif # FreeBSD
|
||||
|
||||
##############################################################################
|
||||
# .deb packaging
|
||||
@ -84,7 +68,7 @@ deb/debian/changelog: Makefile
|
||||
@echo "" >> $@
|
||||
@echo " * Version $(DEB_VER)" >> $@
|
||||
@echo "" >> $@
|
||||
@echo " -- VPP Dev <vpp-dev@lists.fd.io> $(shell date -R --date=@${SOURCE_DATE_EPOCH})" >> $@
|
||||
@echo " -- VPP Dev <vpp-dev@lists.fd.io> $(shell date -R)" >> $@
|
||||
|
||||
$(DEV_DEB): deb/debian/changelog
|
||||
@cd deb && dpkg-buildpackage -b -uc -us
|
||||
@ -172,17 +156,17 @@ ifeq ($(INSTALLED_VER)$(INSTALLED_RPM_VER),)
|
||||
@echo "development package by invoking 'make install-ext-deps'"
|
||||
@echo "from the top level directory"
|
||||
@echo "=========================================================="
|
||||
$(MAKE) config
|
||||
make config
|
||||
else
|
||||
ifneq ($(INSTALLED_VER),)
|
||||
make check-deb
|
||||
endif
|
||||
ifneq ($(INSTALLED_RPM_VER),)
|
||||
$(MAKE) check-rpm
|
||||
make check-rpm
|
||||
endif
|
||||
endif
|
||||
|
||||
ebuild-install:
|
||||
ifeq ($(INSTALLED_VER)$(INSTALLED_RPM_VER),)
|
||||
$(MAKE) install
|
||||
make install
|
||||
endif
|
||||
|
6
build/external/deb/debian/rules
vendored
6
build/external/deb/debian/rules
vendored
@ -1,9 +1,6 @@
|
||||
#!/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-ext-deps
|
||||
|
||||
VERSION = $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: //p')
|
||||
@ -26,8 +23,5 @@ 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/
|
||||
|
2
build/external/mlx_rdma_dpdk_matrix.txt
vendored
2
build/external/mlx_rdma_dpdk_matrix.txt
vendored
@ -1,2 +0,0 @@
|
||||
rdma=49.0 dpdk=23.11
|
||||
rdma=51.0 dpdk=24.03
|
27
build/external/packages.mk
vendored
27
build/external/packages.mk
vendored
@ -101,18 +101,11 @@ define $1_config_cmds
|
||||
endef
|
||||
endif
|
||||
|
||||
ifneq ($(filter $1,$(VPP_SKIP_EXTERNAL)), $1)
|
||||
$(B)/.$1.config.ok: $(B)/.$1.patch.ok $(addprefix $(B)/.,$(addsuffix .install.ok,$($1_depends)))
|
||||
$(B)/.$1.config.ok: $(B)/.$1.patch.ok $(addsuffix -install,$($1_depends))
|
||||
$$(call h1,"configuring $1 $($1_version) - log: $$($1_config_log)")
|
||||
@mkdir -p $$($1_build_dir)
|
||||
$$(call $1_config_cmds)
|
||||
@touch $$@
|
||||
else
|
||||
$(B)/.$1.config.ok:
|
||||
$$(call h1,"Skipping $1 $($1_version)")
|
||||
@mkdir -p $(B)
|
||||
@touch $$@
|
||||
endif
|
||||
|
||||
.PHONY: $1-config
|
||||
$1-config: $(B)/.$1.config.ok
|
||||
@ -127,17 +120,10 @@ define $1_build_cmds
|
||||
endef
|
||||
endif
|
||||
|
||||
ifneq ($(filter $1,$(VPP_SKIP_EXTERNAL)), $1)
|
||||
$(B)/.$1.build.ok: $(B)/.$1.config.ok
|
||||
$$(call h1,"building $1 $($1_version) - log: $$($1_build_log)")
|
||||
$$(call $1_build_cmds)
|
||||
@touch $$@
|
||||
else
|
||||
$(B)/.$1.build.ok:
|
||||
$$(call h1,"Skipping $1 $($1_version)")
|
||||
@mkdir -p $(B)
|
||||
@touch $$@
|
||||
endif
|
||||
|
||||
.PHONY: $1-build
|
||||
$1-build: $(B)/.$1.build.ok
|
||||
@ -152,24 +138,13 @@ define $1_install_cmds
|
||||
endef
|
||||
endif
|
||||
|
||||
ifneq ($(filter $1,$(VPP_SKIP_EXTERNAL)), $1)
|
||||
$(B)/.$1.install.ok: $(B)/.$1.build.ok
|
||||
$$(call h1,"installing $1 $($1_version) - log: $$($1_install_log)")
|
||||
$$(call $1_install_cmds)
|
||||
@touch $$@
|
||||
else
|
||||
$(B)/.$1.install.ok:
|
||||
$$(call h1,"Skipping $1 $($1_version)")
|
||||
@mkdir -p $(B)
|
||||
@touch $$@
|
||||
endif
|
||||
|
||||
.PHONY: $1-install
|
||||
$1-install: $(B)/.$1.install.ok
|
||||
|
||||
.PHONY: $1-show-%
|
||||
$1-show-%:
|
||||
@echo $$($$*)
|
||||
|
||||
ALL_TARGETS += $1-install
|
||||
endef
|
||||
|
44
build/external/packages/dpdk.mk
vendored
44
build/external/packages/dpdk.mk
vendored
@ -14,34 +14,25 @@
|
||||
DPDK_PKTMBUF_HEADROOM ?= 128
|
||||
DPDK_USE_LIBBSD ?= n
|
||||
DPDK_DEBUG ?= n
|
||||
DPDK_MLX4_PMD ?= n
|
||||
DPDK_MLX5_PMD ?= n
|
||||
DPDK_MLX5_COMMON_PMD ?= n
|
||||
DPDK_TAP_PMD ?= n
|
||||
DPDK_FAILSAFE_PMD ?= n
|
||||
DPDK_MACHINE ?= default
|
||||
DPDK_MLX_IBV_LINK ?= static
|
||||
|
||||
dpdk_version ?= 24.03
|
||||
dpdk_version ?= 22.03
|
||||
dpdk_base_url ?= http://fast.dpdk.org/rel
|
||||
dpdk_tarball := dpdk-$(dpdk_version).tar.xz
|
||||
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_21.08 := de33433a1806280996a0ecbe66e3642f
|
||||
dpdk_tarball_md5sum_21.05 := a78bba290b11d9717d1272cc6bfaf7c3
|
||||
dpdk_tarball_md5sum := $(dpdk_tarball_md5sum_$(dpdk_version))
|
||||
dpdk_url := $(dpdk_base_url)/$(dpdk_tarball)
|
||||
dpdk_tarball_strip_dirs := 1
|
||||
ifeq ($(shell uname), FreeBSD)
|
||||
dpdk_depends := $(if $(ARCH_X86_64), ipsec-mb)
|
||||
else
|
||||
dpdk_depends := rdma-core $(if $(ARCH_X86_64), ipsec-mb)
|
||||
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)
|
||||
DPDK_MLX5_COMMON_PMD ?= $(DPDK_MLX_DEFAULT)
|
||||
# Debug or release
|
||||
|
||||
DPDK_BUILD_TYPE:=release
|
||||
@ -52,12 +43,10 @@ endif
|
||||
DPDK_DRIVERS_DISABLED := baseband/\*, \
|
||||
bus/dpaa, \
|
||||
bus/ifpga, \
|
||||
common/cnxk, \
|
||||
compress/isal, \
|
||||
compress/octeontx, \
|
||||
compress/zlib, \
|
||||
crypto/ccp, \
|
||||
crypto/cnxk, \
|
||||
crypto/dpaa_sec, \
|
||||
crypto/openssl, \
|
||||
crypto/aesni_mb, \
|
||||
@ -67,11 +56,9 @@ DPDK_DRIVERS_DISABLED := baseband/\*, \
|
||||
crypto/zuc, \
|
||||
event/\*, \
|
||||
mempool/dpaa, \
|
||||
mempool/cnxk, \
|
||||
net/af_packet, \
|
||||
net/bnx2x, \
|
||||
net/bonding, \
|
||||
net/cnxk, \
|
||||
net/ipn3ke, \
|
||||
net/liquidio, \
|
||||
net/pcap, \
|
||||
@ -87,7 +74,6 @@ DPDK_LIBS_DISABLED := acl, \
|
||||
bitratestats, \
|
||||
bpf, \
|
||||
cfgfile, \
|
||||
cnxk, \
|
||||
distributor, \
|
||||
efd, \
|
||||
fib, \
|
||||
@ -137,19 +123,14 @@ endif
|
||||
DPDK_DRIVERS_DISABLED := $(shell echo $(DPDK_DRIVERS_DISABLED) | tr -d '\\\t ')
|
||||
DPDK_LIBS_DISABLED := $(shell echo $(DPDK_LIBS_DISABLED) | tr -d '\\\t ')
|
||||
|
||||
SED=sed
|
||||
ifeq ($shell(uname), FreeBSD)
|
||||
SED=gsed
|
||||
endif
|
||||
|
||||
HASH := \#
|
||||
# post-meson-setup snippet to alter rte_build_config.h
|
||||
define dpdk_config
|
||||
if grep -q RTE_$(1) $(dpdk_src_dir)/config/rte_config.h ; then \
|
||||
$(SED) -i -e 's/$(HASH)define RTE_$(1).*/$(HASH)define RTE_$(1) $(DPDK_$(1))/' \
|
||||
sed -i -e 's/$(HASH)define RTE_$(1).*/$(HASH)define RTE_$(1) $(DPDK_$(1))/' \
|
||||
$(dpdk_src_dir)/config/rte_config.h; \
|
||||
elif grep -q RTE_$(1) $(dpdk_build_dir)/rte_build_config.h ; then \
|
||||
$(SED) -i -e 's/$(HASH)define RTE_$(1).*/$(HASH)define RTE_$(1) $(DPDK_$(1))/' \
|
||||
sed -i -e 's/$(HASH)define RTE_$(1).*/$(HASH)define RTE_$(1) $(DPDK_$(1))/' \
|
||||
$(dpdk_build_dir)/rte_build_config.h; \
|
||||
else \
|
||||
echo '$(HASH)define RTE_$(1) $(DPDK_$(1))' \
|
||||
@ -165,7 +146,7 @@ if [[ "$(DPDK_$(1))" == "y" ]]; then \
|
||||
>> $(dpdk_build_dir)/rte_build_config.h ; \
|
||||
fi; \
|
||||
elif [[ "$(DPDK_$(1))" == "n" ]]; then \
|
||||
$(SED) -i '/$(HASH)define RTE_$(1) .*/d' $(dpdk_build_dir)/rte_build_config.h \
|
||||
sed -i '/$(HASH)define RTE_$(1) .*/d' $(dpdk_build_dir)/rte_build_config.h \
|
||||
$(dpdk_src_dir)/config/rte_config.h ; \
|
||||
fi
|
||||
endef
|
||||
@ -175,26 +156,23 @@ DPDK_MESON_ARGS = \
|
||||
--libdir lib \
|
||||
--prefix $(dpdk_install_dir) \
|
||||
-Dtests=false \
|
||||
-Denable_driver_sdk=true \
|
||||
"-Ddisable_drivers=$(DPDK_DRIVERS_DISABLED)" \
|
||||
"-Ddisable_libs=$(DPDK_LIBS_DISABLED)" \
|
||||
-Db_pie=true \
|
||||
-Dmachine=$(DPDK_MACHINE) \
|
||||
--buildtype=$(DPDK_BUILD_TYPE) \
|
||||
-Denable_kmods=false \
|
||||
${DPDK_MLX_CONFIG_FLAG}
|
||||
|
||||
PIP_DOWNLOAD_DIR = $(CURDIR)/downloads/
|
||||
|
||||
define dpdk_config_cmds
|
||||
cd $(dpdk_build_dir) && \
|
||||
echo "DPDK_MLX_DEFAULT=$(DPDK_MLX_DEFAULT)" > ../../../dpdk_mlx_default.sh && \
|
||||
rm -rf ../dpdk-meson-venv && \
|
||||
mkdir -p ../dpdk-meson-venv && \
|
||||
python3 -m venv ../dpdk-meson-venv && \
|
||||
source ../dpdk-meson-venv/bin/activate && \
|
||||
(if ! ls $(PIP_DOWNLOAD_DIR)meson* ; then pip3 download -d $(PIP_DOWNLOAD_DIR) -f $(DL_CACHE_DIR) meson==0.55.3 setuptools wheel pyelftools; fi) && \
|
||||
pip3 install --no-index --find-links=$(PIP_DOWNLOAD_DIR) meson==0.55.3 pyelftools && \
|
||||
(if ! ls $(PIP_DOWNLOAD_DIR)meson* ; then pip3 download -d $(PIP_DOWNLOAD_DIR) -f $(DL_CACHE_DIR) meson==0.55 setuptools wheel pyelftools; fi) && \
|
||||
pip3 install --no-index --find-links=$(PIP_DOWNLOAD_DIR) meson==0.55 pyelftools && \
|
||||
PKG_CONFIG_PATH=$(dpdk_install_dir)/lib/pkgconfig meson setup $(dpdk_src_dir) \
|
||||
$(dpdk_build_dir) \
|
||||
$(DPDK_MESON_ARGS) \
|
||||
|
27
build/external/packages/ipsec-mb.mk
vendored
27
build/external/packages/ipsec-mb.mk
vendored
@ -11,21 +11,17 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
ipsec-mb_version := 1.5
|
||||
ipsec-mb_patch_version := 0
|
||||
ipsec-mb_version_str := $(ipsec-mb_version).$(ipsec-mb_patch_version)
|
||||
ipsec-mb_version := 1.2
|
||||
ipsec-mb_tarball := v$(ipsec-mb_version).tar.gz
|
||||
ipsec-mb_tarball_md5sum_0.54 := 258941f7ba90c275fcf9d19c622d2d21
|
||||
ipsec-mb_tarball_md5sum_0.55 := deca674bca7ae2282890e1fa7f953609
|
||||
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_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)
|
||||
ipsec-mb_url := http://github.com/01org/intel-ipsec-mb/archive/$(ipsec-mb_tarball)
|
||||
|
||||
define ipsec-mb_config_cmds
|
||||
@true
|
||||
@ -41,22 +37,7 @@ define ipsec-mb_build_cmds
|
||||
EXTRA_CFLAGS="-g -msse4.2" > $(ipsec-mb_build_log)
|
||||
endef
|
||||
|
||||
ifneq ($(ipsec-mb_system_header), )
|
||||
ipsec-mb_system_ver_str := $(shell awk '/^#define\s+IMB_VERSION_STR/ { print $$3 }' \
|
||||
$(ipsec-mb_system_header))
|
||||
endif
|
||||
|
||||
define ipsec-mb_install_cmds
|
||||
if [[ -n "$(ipsec-mb_system_header)" ]]; then \
|
||||
if [[ "$(ipsec-mb_system_ver_str)" != "$(ipsec-mb_version_str)" ]]; then \
|
||||
echo "Intel-ipsec-mb build Error: System installed Intel IPsec-mb lib \
|
||||
version mismatch with target version, \
|
||||
expecting $(ipsec-mb_version_str), \
|
||||
but system has $(ipsec-mb_system_ver_str) \
|
||||
please align/remove system installed $(ipsec-mb_system_header) before building."; \
|
||||
exit 1; \
|
||||
fi \
|
||||
fi
|
||||
@mkdir -p $(ipsec-mb_install_dir)/include
|
||||
@mkdir -p $(ipsec-mb_install_dir)/lib
|
||||
@cp $(ipsec-mb_src_dir)/lib/intel-ipsec-mb.h $(ipsec-mb_install_dir)/include
|
||||
|
58
build/external/packages/libbpf.mk
vendored
Normal file
58
build/external/packages/libbpf.mk
vendored
Normal file
@ -0,0 +1,58 @@
|
||||
# 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:
|
||||
#
|
||||
# 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.
|
||||
|
||||
LIBBPF_DEBUG?=n
|
||||
|
||||
libbpf_version := 0.5.0
|
||||
libbpf_tarball := v$(libbpf_version).tar.gz
|
||||
libbpf_tarball_md5sum_0.2 := cd0f82d76a9830c1e66b1a249393d5a8
|
||||
libbpf_tarball_md5sum_0.5.0:= ba0a514d2775f033c24a6fec37e587bc
|
||||
libbpf_tarball_md5sum := $(libbpf_tarball_md5sum_$(libbpf_version))
|
||||
libbpf_tarball_strip_dirs := 1
|
||||
libbpf_url := https://github.com/libbpf/libbpf/archive/$(libbpf_tarball)
|
||||
|
||||
LIBBPF_CFLAGS:=-g -Werror -Wall -fPIC -fvisibility=hidden
|
||||
ifeq ($(LIBBPF_DEBUG),y)
|
||||
LIBBPF_CFLAGS+= -O0
|
||||
else
|
||||
LIBBPF_CFLAGS+= -O2
|
||||
endif
|
||||
|
||||
# check for libelf, zlib and kernel if_xdp.h presence
|
||||
LIBBPF_DEPS_CHECK:="\#include <linux/if_xdp.h>\\n\#include <gelf.h>\\n\#include <zlib.h>\\nint main(void){return 0;}"
|
||||
LIBBPF_DEPS_CHECK:=$(shell echo -e $(LIBBPF_DEPS_CHECK) | $(CC) -xc -lelf -lz -o /dev/null - > /dev/null 2>&1)
|
||||
LIBBPF_DEPS_CHECK:=$(.SHELLSTATUS)
|
||||
|
||||
define libbpf_config_cmds
|
||||
@true
|
||||
endef
|
||||
|
||||
define libbpf_build_cmds__
|
||||
BUILD_STATIC_ONLY=y OBJDIR='$(libbpf_build_dir)' PREFIX='' DESTDIR='$(libbpf_install_dir)' CFLAGS='$(LIBBPF_CFLAGS)' make -C '$(libbpf_src_dir)/src' $(1) > $(2)
|
||||
endef
|
||||
|
||||
define libbpf_build_cmds
|
||||
$(call libbpf_build_cmds__,,$(libbpf_build_log))
|
||||
endef
|
||||
|
||||
define libbpf_install_cmds
|
||||
$(call libbpf_build_cmds__,install,$(libbpf_install_log))
|
||||
endef
|
||||
|
||||
ifneq ($(LIBBPF_DEPS_CHECK),0)
|
||||
$(warning "Missing libbpf dependencies. libbpf will be skipped.")
|
||||
libbpf-install:
|
||||
@true
|
||||
else
|
||||
$(eval $(call package,libbpf))
|
||||
endif
|
26
build/external/packages/octeon-roc.mk
vendored
26
build/external/packages/octeon-roc.mk
vendored
@ -1,26 +0,0 @@
|
||||
# Copyright (c) 2023 Marvell.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# https://spdx.org/licenses/Apache-2.0.html
|
||||
|
||||
octeon-roc_version := 0.5
|
||||
octeon-roc_tarball := v$(octeon-roc_version).tar.gz
|
||||
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)
|
||||
|
||||
define octeon-roc_config_cmds
|
||||
@true
|
||||
endef
|
||||
|
||||
define octeon-roc_build_cmds
|
||||
@cd ${octeon-roc_src_dir} && rm -f $(octeon-roc_build_log) && $(CMAKE) ${octeon-roc_src_dir} -DCMAKE_INSTALL_PREFIX='$(octeon-roc_install_dir)' >> $(octeon-roc_build_log)
|
||||
@$(MAKE) -C ${octeon-roc_src_dir} >> $(octeon-roc_build_log)
|
||||
endef
|
||||
|
||||
define octeon-roc_install_cmds
|
||||
@$(MAKE) -C ${octeon-roc_src_dir} install >> $(octeon-roc_install_log)
|
||||
endef
|
||||
|
||||
$(eval $(call package,octeon-roc))
|
||||
|
18
build/external/packages/quicly.mk
vendored
18
build/external/packages/quicly.mk
vendored
@ -11,9 +11,9 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
quicly_version := 0.1.4-vpp
|
||||
quicly_version := 0.1.3-vpp
|
||||
quicly_tarball := quicly_$(quicly_version).tar.gz
|
||||
quicly_tarball_md5sum := 5419a0f340c5572bcf682c08acc84c77
|
||||
quicly_tarball_md5sum := 195f156f311458f1bd4540765e62dd27
|
||||
quicly_tarball_strip_dirs := 1
|
||||
quicly_url := https://github.com/vpp-quic/quicly/releases/download/v$(quicly_version)/quicly_$(quicly_version).tar.gz
|
||||
|
||||
@ -21,17 +21,16 @@ picotls_build_dir := $(B)/build-picotls
|
||||
|
||||
define quicly_build_cmds
|
||||
@cd $(quicly_build_dir) && \
|
||||
rm -f $(quicly_build_log) && \
|
||||
$(CMAKE) -DWITH_DTRACE=OFF \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=$(quicly_install_dir) \
|
||||
$(quicly_src_dir) >> $(quicly_build_log)
|
||||
@$(MAKE) quicly $(MAKE_ARGS) -C $(quicly_build_dir) >> $(quicly_build_log)
|
||||
$(quicly_src_dir) > $(quicly_build_log)
|
||||
@$(MAKE) quicly $(MAKE_ARGS) -C $(quicly_build_dir) > $(quicly_build_log)
|
||||
|
||||
@mkdir -p $(picotls_build_dir)
|
||||
@cd $(picotls_build_dir) && \
|
||||
$(CMAKE) -DWITH_DTRACE=OFF -DCMAKE_INSTALL_PREFIX:PATH=$(quicly_install_dir) \
|
||||
$(quicly_src_dir)/deps/picotls >> $(quicly_build_log)
|
||||
@$(MAKE) picotls-core picotls-openssl $(MAKE_ARGS) -C $(picotls_build_dir) >> $(quicly_build_log)
|
||||
$(quicly_src_dir)/deps/picotls > $(quicly_build_log)
|
||||
@$(MAKE) picotls-core picotls-openssl $(MAKE_ARGS) -C $(picotls_build_dir) > $(quicly_build_log)
|
||||
endef
|
||||
|
||||
define quicly_config_cmds
|
||||
@ -39,9 +38,8 @@ define quicly_config_cmds
|
||||
endef
|
||||
|
||||
define quicly_install_cmds
|
||||
@rm -f $(quicly_install_log)
|
||||
@$(MAKE) $(MAKE_ARGS) -C $(quicly_build_dir) install >> $(quicly_install_log)
|
||||
@$(MAKE) $(MAKE_ARGS) -C $(picotls_build_dir) install >> $(quicly_install_log)
|
||||
@$(MAKE) $(MAKE_ARGS) -C $(quicly_build_dir) install > $(quicly_install_log)
|
||||
@$(MAKE) $(MAKE_ARGS) -C $(picotls_build_dir) install > $(quicly_install_log)
|
||||
endef
|
||||
|
||||
|
||||
|
35
build/external/packages/rdma-core.mk
vendored
35
build/external/packages/rdma-core.mk
vendored
@ -13,20 +13,10 @@
|
||||
|
||||
RDMA_CORE_DEBUG?=n
|
||||
|
||||
# NOTE: When updating the rdma-core version in conjunction with an update of the
|
||||
# dpdk version, please update ../mlx_rdma_dpdk_matrix.txt to include the
|
||||
# updated version matrix with the dpdk and rdma-core version.
|
||||
#
|
||||
# Also, please verify that the DPDK RDMA driver is built into the dpdk plugin
|
||||
# as follows:
|
||||
# 1. from workspace root directory, 'make -C build/external build-deb'
|
||||
# 2. Verify that the file build/external/dpdk_mlx_default.sh was generated
|
||||
# and contains 'DPDK_MLX_DEFAULT=y'
|
||||
#
|
||||
rdma-core_version := 51.0
|
||||
rdma-core_version := 39.1
|
||||
rdma-core_tarball := rdma-core-$(rdma-core_version).tar.gz
|
||||
rdma-core_tarball_md5sum_49.0 := 9fe3909f19c7e0276c9e546411bbb49c
|
||||
rdma-core_tarball_md5sum_51.0 := ed95d79f782ea00bd7233d453abd60b3
|
||||
rdma-core_tarball_md5sum_38.0 := 44e14dd392ac139a0d452148eb0a0514
|
||||
rdma-core_tarball_md5sum_39.1 := 63ba4632fd01173a2331e5b990373330
|
||||
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)
|
||||
@ -42,16 +32,27 @@ define rdma-core_config_cmds
|
||||
-DENABLE_STATIC=1 -DENABLE_RESOLVE_NEIGH=0 -DNO_PYVERBS=1 -DENABLE_VALGRIND=0\
|
||||
-DCMAKE_BUILD_TYPE=$(RDMA_BUILD_TYPE) -DCMAKE_INSTALL_PREFIX=$(rdma-core_install_dir) \
|
||||
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||
-DCMAKE_INSTALL_RUNDIR:PATH=/run \
|
||||
-DCMAKE_C_FLAGS='-fPIC' -DNO_MAN_PAGES=ON | tee $(rdma-core_config_log)
|
||||
-DCMAKE_C_FLAGS='-fPIC -fvisibility=hidden' > $(rdma-core_config_log)
|
||||
endef
|
||||
|
||||
define rdma-core_build_cmds
|
||||
$(CMAKE) --build $(rdma-core_build_dir) | tee $(rdma-core_build_log)
|
||||
$(CMAKE) --build $(rdma-core_build_dir) -- libccan.a libibverbs.a librdma_util.a libmlx5.a libmlx4.a > $(rdma-core_build_log)
|
||||
sed 's/^Libs.private:.*/Libs.private: -lmlx4 -lmlx5 -libverbs -lrdma_util -lccan -lpthread/' -i $(rdma-core_build_dir)/lib/pkgconfig/libibverbs.pc >> $(rdma-core_build_log)
|
||||
endef
|
||||
|
||||
define rdma-core_install_cmds
|
||||
$(CMAKE) --install $(rdma-core_build_dir) | tee $(rdma-core_install_log)
|
||||
mkdir -p $(rdma-core_install_dir)/lib/pkgconfig
|
||||
cp -avL $(rdma-core_build_dir)/include $(rdma-core_install_dir) > $(rdma-core_install_log)
|
||||
cp -avL $(rdma-core_build_dir)/lib/pkgconfig/libibverbs.pc \
|
||||
$(rdma-core_build_dir)/lib/pkgconfig/libmlx5.pc \
|
||||
$(rdma-core_build_dir)/lib/pkgconfig/libmlx4.pc \
|
||||
$(rdma-core_install_dir)/lib/pkgconfig >> $(rdma-core_install_log)
|
||||
cp -avL $(rdma-core_build_dir)/lib/statics/libibverbs.a \
|
||||
$(rdma-core_build_dir)/lib/statics/libmlx5.a \
|
||||
$(rdma-core_build_dir)/lib/statics/libmlx4.a \
|
||||
$(rdma-core_build_dir)/util/librdma_util.a \
|
||||
$(rdma-core_build_dir)/ccan/libccan.a \
|
||||
$(rdma-core_install_dir)/lib >> $(rdma-core_install_log)
|
||||
endef
|
||||
|
||||
$(eval $(call package,rdma-core))
|
||||
|
38
build/external/packages/xdp-tools.mk
vendored
38
build/external/packages/xdp-tools.mk
vendored
@ -1,38 +0,0 @@
|
||||
# Copyright (c) 2023 Intel 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:
|
||||
#
|
||||
# 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.
|
||||
|
||||
xdp-tools_version := 1.2.9
|
||||
xdp-tools_tarball := xdp-tools-$(xdp-tools_version).tar.gz
|
||||
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)
|
||||
|
||||
define xdp-tools_config_cmds
|
||||
@true
|
||||
endef
|
||||
|
||||
define xdp-tools_build_cmds
|
||||
@cd ${xdp-tools_src_dir} && make V=1 BUILD_STATIC_ONLY=y > $(xdp-tools_build_log)
|
||||
endef
|
||||
|
||||
define xdp-tools_install_cmds
|
||||
@rm -f $(xdp-tools_install_log)
|
||||
@cd ${xdp-tools_src_dir} && \
|
||||
make -C lib/libbpf/src install V=1 BUILD_STATIC_ONLY=y PREFIX='' DESTDIR='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log)
|
||||
@cd ${xdp-tools_src_dir} && \
|
||||
make libxdp_install V=1 BUILD_STATIC_ONLY=y PREFIX='' DESTDIR='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log)
|
||||
endef
|
||||
|
||||
$(eval $(call package,xdp-tools))
|
@ -1,76 +0,0 @@
|
||||
From 16449a64d38c7f4b880601ddf3d34087da5e8577 Mon Sep 17 00:00:00 2001
|
||||
From: Xiaoming Jiang <jiangxiaoming@outlook.com>
|
||||
Date: Thu, 9 Jun 2022 06:15:51 +0000
|
||||
Subject: [PATCH 1/1] bus/vmbus: add support allow/block scan mode
|
||||
|
||||
---
|
||||
drivers/bus/vmbus/vmbus_common.c | 32 +++++++++++++++++++++++++++++---
|
||||
1 file changed, 29 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/bus/vmbus/vmbus_common.c b/drivers/bus/vmbus/vmbus_common.c
|
||||
index 3677273..47edacb 100644
|
||||
--- a/drivers/bus/vmbus/vmbus_common.c
|
||||
+++ b/drivers/bus/vmbus/vmbus_common.c
|
||||
@@ -102,7 +102,12 @@ vmbus_probe_one_driver(struct rte_vmbus_driver *dr,
|
||||
VMBUS_LOG(INFO, "VMBUS device %s on NUMA socket %i",
|
||||
guid, dev->device.numa_node);
|
||||
|
||||
- /* TODO add block/allow logic */
|
||||
+ /* no initialization when marked as blocked, return without error */
|
||||
+ if (dev->device.devargs != NULL &&
|
||||
+ dev->device.devargs->policy == RTE_DEV_BLOCKED) {
|
||||
+ RTE_LOG(INFO, EAL, " Device is blocked, not initializing\n");
|
||||
+ return 1;
|
||||
+ }
|
||||
|
||||
/* map resources for device */
|
||||
ret = rte_vmbus_map_device(dev);
|
||||
@@ -134,7 +139,7 @@ vmbus_probe_one_driver(struct rte_vmbus_driver *dr,
|
||||
|
||||
/*
|
||||
* If device class GUID matches, call the probe function of
|
||||
- * register drivers for the vmbus device.
|
||||
+ * registere drivers for the vmbus device.
|
||||
* Return -1 if initialization failed,
|
||||
* and 1 if no driver found for this device.
|
||||
*/
|
||||
@@ -163,6 +168,25 @@ vmbus_probe_all_drivers(struct rte_vmbus_device *dev)
|
||||
return 1;
|
||||
}
|
||||
|
||||
+static bool
|
||||
+rte_vmbus_ignore_device(struct rte_vmbus_device *dev)
|
||||
+{
|
||||
+ struct rte_devargs *devargs = vmbus_devargs_lookup(dev);
|
||||
+
|
||||
+ switch (rte_vmbus_bus.bus.conf.scan_mode) {
|
||||
+ case RTE_BUS_SCAN_ALLOWLIST:
|
||||
+ if (devargs && devargs->policy == RTE_DEV_ALLOWED)
|
||||
+ return false;
|
||||
+ break;
|
||||
+ case RTE_BUS_SCAN_UNDEFINED:
|
||||
+ case RTE_BUS_SCAN_BLOCKLIST:
|
||||
+ if (devargs == NULL || devargs->policy != RTE_DEV_BLOCKED)
|
||||
+ return false;
|
||||
+ break;
|
||||
+ }
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* Scan the vmbus, and call the devinit() function for
|
||||
* all registered drivers that have a matching entry in its id_table
|
||||
@@ -180,7 +204,9 @@ rte_vmbus_probe(void)
|
||||
|
||||
rte_uuid_unparse(dev->device_id, ubuf, sizeof(ubuf));
|
||||
|
||||
- /* TODO: add allowlist/blocklist */
|
||||
+ if (rte_vmbus_ignore_device(dev)) {
|
||||
+ continue;
|
||||
+ }
|
||||
|
||||
if (vmbus_probe_all_drivers(dev) < 0) {
|
||||
VMBUS_LOG(NOTICE,
|
||||
--
|
||||
2.32.0
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,54 +0,0 @@
|
||||
From baa172f1a9e370a0549a31840c3cd148046d1d84 Mon Sep 17 00:00:00 2001
|
||||
From: Xinyao Cai <xinyao.cai@intel.com>
|
||||
Date: Tue, 18 Apr 2023 16:37:17 +0800
|
||||
Subject: [PATCH] allow the use of -a and -b flag the same time in EAL
|
||||
parameters.
|
||||
|
||||
---
|
||||
lib/eal/common/eal_common_options.c | 14 --------------
|
||||
1 file changed, 14 deletions(-)
|
||||
|
||||
diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c
|
||||
index 0305933698..0d8f9c5a38 100644
|
||||
--- a/lib/eal/common/eal_common_options.c
|
||||
+++ b/lib/eal/common/eal_common_options.c
|
||||
@@ -1623,24 +1623,15 @@ int
|
||||
eal_parse_common_option(int opt, const char *optarg,
|
||||
struct internal_config *conf)
|
||||
{
|
||||
- static int b_used;
|
||||
- static int a_used;
|
||||
-
|
||||
switch (opt) {
|
||||
case 'b':
|
||||
- if (a_used)
|
||||
- goto ba_conflict;
|
||||
if (eal_option_device_add(RTE_DEVTYPE_BLOCKED, optarg) < 0)
|
||||
return -1;
|
||||
- b_used = 1;
|
||||
break;
|
||||
|
||||
case 'a':
|
||||
- if (b_used)
|
||||
- goto ba_conflict;
|
||||
if (eal_option_device_add(RTE_DEVTYPE_ALLOWED, optarg) < 0)
|
||||
return -1;
|
||||
- a_used = 1;
|
||||
break;
|
||||
/* coremask */
|
||||
case 'c': {
|
||||
@@ -1929,11 +1920,6 @@ eal_parse_common_option(int opt, const char *optarg,
|
||||
}
|
||||
|
||||
return 0;
|
||||
-
|
||||
-ba_conflict:
|
||||
- RTE_LOG(ERR, EAL,
|
||||
- "Options allow (-a) and block (-b) can't be used at the same time\n");
|
||||
- return -1;
|
||||
}
|
||||
|
||||
static void
|
||||
--
|
||||
2.34.1
|
||||
|
@ -1,54 +0,0 @@
|
||||
From baa172f1a9e370a0549a31840c3cd148046d1d84 Mon Sep 17 00:00:00 2001
|
||||
From: Xinyao Cai <xinyao.cai@intel.com>
|
||||
Date: Tue, 18 Apr 2023 16:37:17 +0800
|
||||
Subject: [PATCH] allow the use of -a and -b flag the same time in EAL
|
||||
parameters.
|
||||
|
||||
---
|
||||
lib/eal/common/eal_common_options.c | 14 --------------
|
||||
1 file changed, 14 deletions(-)
|
||||
|
||||
diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c
|
||||
index 0305933698..0d8f9c5a38 100644
|
||||
--- a/lib/eal/common/eal_common_options.c
|
||||
+++ b/lib/eal/common/eal_common_options.c
|
||||
@@ -1623,24 +1623,15 @@ int
|
||||
eal_parse_common_option(int opt, const char *optarg,
|
||||
struct internal_config *conf)
|
||||
{
|
||||
- static int b_used;
|
||||
- static int a_used;
|
||||
-
|
||||
switch (opt) {
|
||||
case 'b':
|
||||
- if (a_used)
|
||||
- goto ba_conflict;
|
||||
if (eal_option_device_add(RTE_DEVTYPE_BLOCKED, optarg) < 0)
|
||||
return -1;
|
||||
- b_used = 1;
|
||||
break;
|
||||
|
||||
case 'a':
|
||||
- if (b_used)
|
||||
- goto ba_conflict;
|
||||
if (eal_option_device_add(RTE_DEVTYPE_ALLOWED, optarg) < 0)
|
||||
return -1;
|
||||
- a_used = 1;
|
||||
break;
|
||||
/* coremask */
|
||||
case 'c': {
|
||||
@@ -1929,11 +1920,6 @@ eal_parse_common_option(int opt, const char *optarg,
|
||||
}
|
||||
|
||||
return 0;
|
||||
-
|
||||
-ba_conflict:
|
||||
- RTE_LOG(ERR, EAL,
|
||||
- "Options allow (-a) and block (-b) can't be used at the same time\n");
|
||||
- return -1;
|
||||
}
|
||||
|
||||
static void
|
||||
--
|
||||
2.34.1
|
||||
|
@ -1,63 +0,0 @@
|
||||
From 6429e38ae77c7998c84d5a0ed26b4fb0d81424c1 Mon Sep 17 00:00:00 2001
|
||||
From: Ting Xu <ting.xu@intel.com>
|
||||
Date: Thu, 15 Jun 2023 01:33:37 +0000
|
||||
Subject: [PATCH v1] net: fix pkt length type for raw pattern
|
||||
|
||||
In current pattern parsing function for raw pattern, the packet length
|
||||
variable is defined as uint8_t, which is too small for a large packet,
|
||||
such as srv6. Change the type to uint16_t.
|
||||
|
||||
Fixes: 1b9c68120a1c ("net/ice: enable protocol agnostic flow offloading
|
||||
in RSS")
|
||||
|
||||
Signed-off-by: Ting Xu <ting.xu@intel.com>
|
||||
---
|
||||
drivers/net/iavf/iavf_hash.c | 2 +-
|
||||
drivers/net/ice/ice_fdir_filter.c | 2 +-
|
||||
drivers/net/ice/ice_hash.c | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
|
||||
index ae6fb38594..cf4d677101 100644
|
||||
--- a/drivers/net/iavf/iavf_hash.c
|
||||
+++ b/drivers/net/iavf/iavf_hash.c
|
||||
@@ -886,8 +886,8 @@ iavf_hash_parse_raw_pattern(const struct rte_flow_item *item,
|
||||
struct iavf_rss_meta *meta)
|
||||
{
|
||||
const struct rte_flow_item_raw *raw_spec, *raw_mask;
|
||||
+ uint16_t spec_len, pkt_len;
|
||||
uint8_t *pkt_buf, *msk_buf;
|
||||
- uint8_t spec_len, pkt_len;
|
||||
uint8_t tmp_val = 0;
|
||||
uint8_t tmp_c = 0;
|
||||
int i, j;
|
||||
diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c
|
||||
index 480b369af8..e8842bc242 100644
|
||||
--- a/drivers/net/ice/ice_fdir_filter.c
|
||||
+++ b/drivers/net/ice/ice_fdir_filter.c
|
||||
@@ -1876,7 +1876,7 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,
|
||||
(uint8_t *)(uintptr_t)raw_mask->pattern;
|
||||
uint8_t *tmp_spec, *tmp_mask;
|
||||
uint16_t tmp_val = 0;
|
||||
- uint8_t pkt_len = 0;
|
||||
+ uint16_t pkt_len = 0;
|
||||
uint8_t tmp = 0;
|
||||
int i, j;
|
||||
|
||||
diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
|
||||
index f35727856e..52646e9408 100644
|
||||
--- a/drivers/net/ice/ice_hash.c
|
||||
+++ b/drivers/net/ice/ice_hash.c
|
||||
@@ -653,8 +653,8 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad,
|
||||
const struct rte_flow_item_raw *raw_spec, *raw_mask;
|
||||
struct ice_parser_profile prof;
|
||||
struct ice_parser_result rslt;
|
||||
+ uint16_t spec_len, pkt_len;
|
||||
uint8_t *pkt_buf, *msk_buf;
|
||||
- uint8_t spec_len, pkt_len;
|
||||
uint8_t tmp_val = 0;
|
||||
uint8_t tmp_c = 0;
|
||||
int i, j;
|
||||
--
|
||||
2.25.1
|
||||
|
@ -1,70 +0,0 @@
|
||||
From 6b941770f0114d42e87875562d5174bc70c5ac65 Mon Sep 17 00:00:00 2001
|
||||
From: Pablo de Lara <pablo.de.lara.guarch@intel.com>
|
||||
Date: Tue, 6 Dec 2022 10:59:35 +0000
|
||||
Subject: [PATCH] Fix for perf scaling on release 1.3
|
||||
|
||||
---
|
||||
lib/include/error.h | 10 +++++++---
|
||||
lib/include/error.inc | 3 +++
|
||||
lib/x86_64/error.c | 2 +-
|
||||
3 files changed, 11 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/lib/include/error.h b/lib/include/error.h
|
||||
index 73d44f51..778df4b1 100644
|
||||
--- a/lib/include/error.h
|
||||
+++ b/lib/include/error.h
|
||||
@@ -32,7 +32,7 @@
|
||||
* declare global variable to store
|
||||
* process wide error status
|
||||
*/
|
||||
-extern int imb_errno;
|
||||
+extern volatile int imb_errno;
|
||||
|
||||
/**
|
||||
* @brief API to set error status
|
||||
@@ -47,8 +47,12 @@ void imb_set_errno(IMB_MGR *mb_mgr, const int errnum)
|
||||
if (mb_mgr != NULL)
|
||||
mb_mgr->imb_errno = errnum;
|
||||
|
||||
- /* set global error status */
|
||||
- imb_errno = errnum;
|
||||
+ /*
|
||||
+ * set global error status
|
||||
+ * (only if different, to limit unneeded stores)
|
||||
+ */
|
||||
+ if (imb_errno != errnum)
|
||||
+ imb_errno = errnum;
|
||||
}
|
||||
|
||||
#endif /* ERROR_H */
|
||||
diff --git a/lib/include/error.inc b/lib/include/error.inc
|
||||
index 54df265f..5ea53a59 100644
|
||||
--- a/lib/include/error.inc
|
||||
+++ b/lib/include/error.inc
|
||||
@@ -103,7 +103,10 @@ SET_ERRNO_TYPES \
|
||||
;; Reset global imb_errno to 0
|
||||
%macro IMB_ERR_CHECK_RESET 0
|
||||
|
||||
+ cmp dword [rel imb_errno], 0
|
||||
+ jz %%do_not_reset
|
||||
mov dword [rel imb_errno], 0
|
||||
+%%do_not_reset:
|
||||
%endmacro
|
||||
|
||||
;; Set GP reg and global imb_errno to 0
|
||||
diff --git a/lib/x86_64/error.c b/lib/x86_64/error.c
|
||||
index 19189093..24dcded3 100644
|
||||
--- a/lib/x86_64/error.c
|
||||
+++ b/lib/x86_64/error.c
|
||||
@@ -39,7 +39,7 @@
|
||||
#pragma warning(disable : 4996)
|
||||
#endif
|
||||
|
||||
-IMB_DLL_LOCAL int imb_errno;
|
||||
+IMB_DLL_LOCAL volatile int imb_errno;
|
||||
IMB_DLL_LOCAL const int imb_errno_types[] = {
|
||||
IMB_ERR_NULL_MBMGR,
|
||||
IMB_ERR_JOB_NULL_SRC,
|
||||
--
|
||||
2.34.1
|
||||
|
@ -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)
|
@ -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")
|
@ -1,26 +0,0 @@
|
||||
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 358b751..a9bb414 100644
|
||||
--- a/lib/libxdp/Makefile
|
||||
+++ b/lib/libxdp/Makefile
|
||||
@@ -88,7 +88,7 @@ $(SHARED_OBJDIR):
|
||||
$(Q)mkdir -p $(SHARED_OBJDIR)
|
||||
|
||||
$(STATIC_OBJDIR)/%.o: %.c $(EXTRA_LIB_DEPS) | $(STATIC_OBJDIR)
|
||||
- $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) -D LIBXDP_STATIC=1 -Wall -I../../headers -c $< -o $@
|
||||
+ $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -D LIBXDP_STATIC=1 -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
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user