Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dpdk2011 rebase #737

Merged
merged 23 commits into from
Jul 22, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3eed601
dpvs netif_flow module using generic flow(rte_flow)
ywc689 Sep 19, 2020
dd24c38
sapool: replace flow director with rte_flow
ywc689 Sep 21, 2020
e4e5486
netif_flow: bugfix
ywc689 Sep 22, 2020
5df6130
netif_flow: lock rte_flow api if pmd driver implementation is not thr…
ywc689 Sep 27, 2020
c7604f4
netif_flow: support ixgbe pmd driver
ywc689 Sep 29, 2020
6f7b712
sapool: fix flow mask byte order problem
ywc689 Sep 29, 2020
f10db1e
makefile: update meson build for DPDK
vipinpv85 Jan 25, 2021
b8da933
doc: update the README for meson build
vipinpv85 Jan 25, 2021
6741ce9
fix meson build failure problem
ywc689 Apr 19, 2021
ff650eb
merge dpdk-stable-20.11.x (abandon dpdk-stable-18.11.x)
ywc689 Apr 26, 2021
fa7bc4b
refactor Makefile and fix some bugs after merging dpdk 20.11
ywc689 May 8, 2021
0e37d91
patch: add patches for dpdk-stable-20.11.1
ywc689 Jun 18, 2021
4cb2913
script: add helper script to facilitate dpdk build.
ywc689 Jun 18, 2021
39760a1
patch: remove patches of old dpdk versions
ywc689 Jun 21, 2021
c53a255
main: add dpdk version check
ywc689 Jun 21, 2021
1918017
doc: update docs with dpdk 20.11
ywc689 Jun 21, 2021
c57a0db
makefile: update config.mk
ywc689 Jun 22, 2021
9a5d303
netif: fix rte_flow flush problem for bonding slaves
ywc689 Jun 22, 2021
82f66c5
ci: adapt ci to dpdk-20.11
ywc689 Jun 24, 2021
5e23cc9
patch: add dpdk 20.11.1 bonding mode 4 patch for mlx5
ywc689 Jun 24, 2021
291f4a4
single worker rte_flow invalid process bugfix patch
Jun 29, 2021
2ec96f0
The reason of error return in cons_parse_ntuple_filter() comment
Jul 2, 2021
2947963
fix mbuf dynfield size problem and uniform some coding styles
ywc689 Jul 8, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
main: add dpdk version check
Signed-off-by: ywc689 <ywc689@163.com>
  • Loading branch information
ywc689 committed Jun 24, 2021
commit c53a255f681d0b15ad13ee0956382d71ff2434ef
5 changes: 0 additions & 5 deletions conf/dpvs.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@ netif_defs {
queue_number 8
descriptor_number 1024
}
fdir {
mode perfect
pballoc 64k
status matched
}
! mtu 1500
! promisc_mode
kni_name dpdk1.kni
Expand Down
9 changes: 9 additions & 0 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ extern bool g_dpvs_pdump;
extern int log_slave_init(void);


static void inline dpdk_version_check(void)
{
#if RTE_VERSION < RTE_VERSION_NUM(20, 11, 1, 0)
rte_panic("The current DPVS needs dpdk-stable-20.11.1 or higher. "
"Try old releases if you are using earlier dpdk versions.");
#endif
}

/*
* the initialization order of all the modules
Expand Down Expand Up @@ -253,6 +260,8 @@ int main(int argc, char *argv[])
char pql_conf_buf[LCORE_CONF_BUFFER_LEN];
int pql_conf_buf_len = LCORE_CONF_BUFFER_LEN;

dpdk_version_check();

/**
* add application agruments parse before EAL ones.
* use it like the following:
Expand Down
4 changes: 2 additions & 2 deletions src/netif.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static void fdir_mode_handler(vector_t tokens)
mode, "perfect");
g_fdir_mode = RTE_FDIR_MODE_PERFECT;
}
RTE_LOG(INFO, NETIF, "%s:g_fdir_mode = %s\n", mode);
RTE_LOG(INFO, NETIF, "g_fdir_mode = %s\n", mode);

FREE_PTR(str);
}
Expand Down Expand Up @@ -445,7 +445,7 @@ static void kni_name_handler(vector_t tokens)
struct port_conf_stream, port_list_node);

assert(str);
RTE_LOG(INFO, NETIF, "%s: kni_name = %s\n",current_device->name, str);
RTE_LOG(INFO, NETIF, "%s:kni_name = %s\n",current_device->name, str);
strncpy(current_device->kni_name, str, sizeof(current_device->kni_name));

FREE_PTR(str);
Expand Down