diff options
| -rw-r--r-- | VNFs/DPPD-PROX/main.c | 25 | ||||
| -rw-r--r-- | docs/release/release-notes/release-notes.rst | 12 |
2 files changed, 30 insertions, 7 deletions
diff --git a/VNFs/DPPD-PROX/main.c b/VNFs/DPPD-PROX/main.c index 5ab85d60..ed578c85 100644 --- a/VNFs/DPPD-PROX/main.c +++ b/VNFs/DPPD-PROX/main.c @@ -127,11 +127,33 @@ static void check_zero_rx(void) } } +static void check_nb_mbuf(void) +{ + struct lcore_cfg *lconf = NULL; + struct task_args *targ = NULL; + uint8_t port_id; + int n_txd = 0, n_rxd = 0; + + while (core_targ_next(&lconf, &targ, 0) == 0) { + for (uint8_t i = 0; i < targ->nb_txports; ++i) { + port_id = targ->tx_port_queue[i].port; + n_txd = prox_port_cfg[port_id].n_txd; + } + for (uint8_t i = 0; i < targ->nb_rxports; ++i) { + port_id = targ->rx_port_queue[i].port; + n_rxd = prox_port_cfg[port_id].n_rxd; + } + if (targ->nb_mbuf <= n_rxd + n_txd + targ->nb_cache_mbuf + MAX_PKT_BURST) { + plog_warn("Core %d, task %d might not have enough mbufs (%d) to support %d txd, %d rxd and %d cache_mbuf\n", + lconf->id, targ->id, targ->nb_mbuf, n_txd, n_rxd, targ->nb_cache_mbuf); + } + } +} + static void check_missing_rx(void) { struct lcore_cfg *lconf = NULL, *rx_lconf = NULL, *tx_lconf = NULL; struct task_args *targ, *rx_targ = NULL, *tx_targ = NULL; - struct prox_port_cfg *port; uint8_t port_id, rx_port_id, ok; while (core_targ_next(&lconf, &targ, 0) == 0) { @@ -192,6 +214,7 @@ static void check_missing_rx(void) static void check_cfg_consistent(void) { + check_nb_mbuf(); check_missing_rx(); check_zero_rx(); check_mixed_normal_pipeline(); diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index 74e74f12..a139824b 100644 --- a/docs/release/release-notes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst @@ -43,7 +43,7 @@ Version History | *Date* | *Version* | *Comment* | | | | | +----------------+--------------------+---------------------------------+ -| "Nov 01 2018" | 7.1.0 | SampleVNF for Gambia release | +| "Jan 17 2019" | 7.2.0 | SampleVNF for Gambia release | | | | | +----------------+--------------------+---------------------------------+ @@ -127,13 +127,13 @@ Release Data | **Project** | SampleVNF | | | | +--------------------------------------+--------------------------------------+ -| **Repo/tag** | opnfv-7.1.0 | +| **Repo/tag** | opnfv-7.2.0 | | | | +--------------------------------------+--------------------------------------+ -| **SampleVNF Docker image tag** | Gambia 7.1 | +| **SampleVNF Docker image tag** | Gambia 7.2 | | | | +--------------------------------------+--------------------------------------+ -| **Release designation** | Gambia 7.1 | +| **Release designation** | Gambia 7.2 | | | | +--------------------------------------+--------------------------------------+ | **Release date** | "Dec 14 2018" | @@ -234,7 +234,7 @@ Known Issues/Faults Corrected Faults ---------------- -Gambia 7.1: +Gambia 7.2: +----------------------------+-------------------------------------------------------------------+ | **JIRA REFERENCE** | **DESCRIPTION** | @@ -255,7 +255,7 @@ Gambia 7.1: +----------------------------+-------------------------------------------------------------------+ | SAMPLEVNF-136 | Adding centos.json to be used with packer to generate a VM with PROX| +----------------------------+-------------------------------------------------------------------+ -| SAMPLEVNF-137 | Adding support for Ubuntu 17.10... | +| SAMPLEVNF-137 | Adding support for Ubuntu 17.20... | +----------------------------+-------------------------------------------------------------------+ | SAMPLEVNF-138 | Get multiple port stats simultaneously | +----------------------------+-------------------------------------------------------------------+ |