Compare commits
7 Commits
master
...
stable/241
Author | SHA1 | Date | |
---|---|---|---|
|
cfa0953251 | ||
|
21b272622f | ||
|
466b350538 | ||
|
d8d09a9e8a | ||
|
4a43f69ce4 | ||
|
45bd5786b1 | ||
|
b91e15387d |
@ -2,3 +2,4 @@
|
|||||||
host=gerrit.fd.io
|
host=gerrit.fd.io
|
||||||
port=29418
|
port=29418
|
||||||
project=vpp
|
project=vpp
|
||||||
|
defaultbranch=stable/2410
|
||||||
|
8
build/external/Makefile
vendored
8
build/external/Makefile
vendored
@ -51,10 +51,10 @@ include packages/ipsec-mb.mk
|
|||||||
include packages/quicly.mk
|
include packages/quicly.mk
|
||||||
ifneq ($(shell uname), FreeBSD)
|
ifneq ($(shell uname), FreeBSD)
|
||||||
include packages/rdma-core.mk
|
include packages/rdma-core.mk
|
||||||
include packages/dpdk.mk
|
|
||||||
include packages/xdp-tools.mk
|
include packages/xdp-tools.mk
|
||||||
include packages/octeon-roc.mk
|
include packages/octeon-roc.mk
|
||||||
endif # FreeBSD
|
endif # ! FreeBSD
|
||||||
|
include packages/dpdk.mk
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
@ -62,14 +62,14 @@ clean:
|
|||||||
|
|
||||||
.PHONY: install
|
.PHONY: install
|
||||||
ifeq ($(shell uname), FreeBSD)
|
ifeq ($(shell uname), FreeBSD)
|
||||||
install: $(if $(ARCH_X86_64), ipsec-mb-install) quicly-install
|
install: $(if $(ARCH_X86_64), ipsec-mb-install) dpdk-install quicly-install
|
||||||
else
|
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) dpdk-install rdma-core-install quicly-install xdp-tools-install $(if $(AARCH64), octeon-roc-install)
|
||||||
endif # FreeBSD
|
endif # FreeBSD
|
||||||
|
|
||||||
.PHONY: config
|
.PHONY: config
|
||||||
ifeq ($(shell uname), FreeBSD)
|
ifeq ($(shell uname), FreeBSD)
|
||||||
config: $(if $(ARCH_X86_64), ipsec-mb-config) quicly-build
|
config: $(if $(ARCH_X86_64), ipsec-mb-config) dpdk-config quicly-build
|
||||||
else
|
else
|
||||||
config: $(if $(ARCH_X86_64), ipsec-mb-config) dpdk-config rdma-core-config quicly-build
|
config: $(if $(ARCH_X86_64), ipsec-mb-config) dpdk-config rdma-core-config quicly-build
|
||||||
endif # FreeBSD
|
endif # FreeBSD
|
||||||
|
3
build/external/packages/dpdk.mk
vendored
3
build/external/packages/dpdk.mk
vendored
@ -39,6 +39,9 @@ dpdk_depends := $(if $(ARCH_X86_64), ipsec-mb)
|
|||||||
else
|
else
|
||||||
dpdk_depends := rdma-core $(if $(ARCH_X86_64), ipsec-mb)
|
dpdk_depends := rdma-core $(if $(ARCH_X86_64), ipsec-mb)
|
||||||
endif
|
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_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_MLX4_PMD ?= $(DPDK_MLX_DEFAULT)
|
||||||
DPDK_MLX5_PMD ?= $(DPDK_MLX_DEFAULT)
|
DPDK_MLX5_PMD ?= $(DPDK_MLX_DEFAULT)
|
||||||
|
@ -6,6 +6,7 @@ Release notes
|
|||||||
.. toctree::
|
.. toctree::
|
||||||
:maxdepth: 2
|
:maxdepth: 2
|
||||||
|
|
||||||
|
v24.10
|
||||||
v24.06
|
v24.06
|
||||||
v24.02
|
v24.02
|
||||||
v23.10
|
v23.10
|
||||||
|
507
docs/aboutvpp/releasenotes/v24.10.rst
Normal file
507
docs/aboutvpp/releasenotes/v24.10.rst
Normal file
File diff suppressed because it is too large
Load Diff
@ -110,6 +110,7 @@ oct_init_nix (vlib_main_t *vm, vnet_dev_t *dev)
|
|||||||
.reta_sz = ROC_NIX_RSS_RETA_SZ_256,
|
.reta_sz = ROC_NIX_RSS_RETA_SZ_256,
|
||||||
.max_sqb_count = 512,
|
.max_sqb_count = 512,
|
||||||
.pci_dev = &cd->plt_pci_dev,
|
.pci_dev = &cd->plt_pci_dev,
|
||||||
|
.hw_vlan_ins = true,
|
||||||
};
|
};
|
||||||
|
|
||||||
if ((rrv = roc_nix_dev_init (cd->nix)))
|
if ((rrv = roc_nix_dev_init (cd->nix)))
|
||||||
|
@ -64,8 +64,13 @@ oct_port_pause_flow_control_init (vlib_main_t *vm, vnet_dev_port_t *port)
|
|||||||
struct roc_nix_rq *rq;
|
struct roc_nix_rq *rq;
|
||||||
int rrv;
|
int rrv;
|
||||||
|
|
||||||
|
/* pause flow control is not supported on SDP/LBK devices */
|
||||||
if (roc_nix_is_sdp (nix) || roc_nix_is_lbk (nix))
|
if (roc_nix_is_sdp (nix) || roc_nix_is_lbk (nix))
|
||||||
return VNET_DEV_ERR_UNSUPPORTED_DEVICE;
|
{
|
||||||
|
log_notice (dev,
|
||||||
|
"pause flow control is not supported on SDP/LBK devices");
|
||||||
|
return VNET_DEV_OK;
|
||||||
|
}
|
||||||
|
|
||||||
fc_cfg.type = ROC_NIX_FC_RXCHAN_CFG;
|
fc_cfg.type = ROC_NIX_FC_RXCHAN_CFG;
|
||||||
fc_cfg.rxchan_cfg.enable = true;
|
fc_cfg.rxchan_cfg.enable = true;
|
||||||
|
@ -11,8 +11,6 @@
|
|||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static_always_inline clib_dt_node_t *
|
static_always_inline clib_dt_node_t *
|
||||||
clib_dt_node_add_child (clib_dt_main_t *dm, clib_dt_node_t *n, char *name)
|
clib_dt_node_add_child (clib_dt_main_t *dm, clib_dt_node_t *n, char *name)
|
||||||
{
|
{
|
||||||
@ -42,6 +40,7 @@ clib_dt_node_add_child (clib_dt_main_t *dm, clib_dt_node_t *n, char *name)
|
|||||||
|
|
||||||
return cn;
|
return cn;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void
|
void
|
||||||
clib_dt_main_free (clib_dt_main_t *dm)
|
clib_dt_main_free (clib_dt_main_t *dm)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user