This series of patches is to move forward() and other util functions to shared dir to enable it to be used from other processes including spp_primary. Yasufumi Ogawa (2): spp_nfv: move forward func to be shared spp_nfv: move util funcs for ports to shared src/nfv/Makefile | 2 +- src/nfv/main.c | 51 +---------------- src/nfv/params.h | 4 -- src/shared/basic_forwarder.c | 55 +++++++++++++++++++ src/shared/basic_forwarder.h | 13 +++++ src/shared/common.h | 3 + .../nfv_utils.h => shared/port_manager.h} | 20 ++++--- src/shared/secondary/common.h | 2 - 8 files changed, 85 insertions(+), 65 deletions(-) create mode 100644 src/shared/basic_forwarder.c create mode 100644 src/shared/basic_forwarder.h rename src/{nfv/nfv_utils.h => shared/port_manager.h} (83%) -- 2.17.1
This update is to move forward() and some data structs used by this function to shared dir to enable it to be used from other processes including spp_primary. Signed-off-by: Yasufumi Ogawa <yasufum.o@gmail.com> --- src/nfv/Makefile | 2 +- src/nfv/main.c | 49 +------------------------------ src/nfv/params.h | 4 --- src/shared/basic_forwarder.c | 55 +++++++++++++++++++++++++++++++++++ src/shared/basic_forwarder.h | 13 +++++++++ src/shared/common.h | 3 ++ src/shared/secondary/common.h | 2 -- 7 files changed, 73 insertions(+), 55 deletions(-) create mode 100644 src/shared/basic_forwarder.c create mode 100644 src/shared/basic_forwarder.h diff --git a/src/nfv/Makefile b/src/nfv/Makefile index 1328f61..a8b5629 100644 --- a/src/nfv/Makefile +++ b/src/nfv/Makefile @@ -14,7 +14,7 @@ APP = spp_nfv # all source are stored in SRCS-y SRCS-y := main.c nfv_status.c -SRCS-y += ../shared/common.c +SRCS-y += ../shared/common.c ../shared/basic_forwarder.c SRCS-y += ../shared/secondary/common.c SRCS-y += ../shared/secondary/utils.c ../shared/secondary/add_port.c diff --git a/src/nfv/main.c b/src/nfv/main.c index 89e7714..dbefba4 100644 --- a/src/nfv/main.c +++ b/src/nfv/main.c @@ -16,6 +16,7 @@ #include "shared/secondary/add_port.h" #include "shared/secondary/common.h" #include "shared/common.h" +#include "shared/basic_forwarder.h" #include "params.h" #include "init.h" @@ -105,54 +106,6 @@ parse_app_args(int argc, char *argv[]) return 0; } -static void -forward(void) -{ - uint16_t nb_rx; - uint16_t nb_tx; - int in_port; - int out_port; - uint16_t buf; - int i; - - /* Go through every possible port numbers*/ - for (i = 0; i < RTE_MAX_ETHPORTS; i++) { - struct rte_mbuf *bufs[MAX_PKT_BURST]; - - if (ports_fwd_array[i].in_port_id == PORT_RESET) - continue; - - if (ports_fwd_array[i].out_port_id == PORT_RESET) - continue; - - /* if status active, i count is in port*/ - in_port = i; - out_port = ports_fwd_array[i].out_port_id; - - /* Get burst of RX packets, from first port of pair. */ - /*first port rx, second port tx*/ - nb_rx = ports_fwd_array[in_port].rx_func(in_port, 0, bufs, - MAX_PKT_BURST); - if (unlikely(nb_rx == 0)) - continue; - - port_map[in_port].stats->rx += nb_rx; - - /* Send burst of TX packets, to second port of pair. */ - nb_tx = ports_fwd_array[out_port].tx_func(out_port, 0, bufs, - nb_rx); - - port_map[out_port].stats->tx += nb_tx; - - /* Free any unsent packets. */ - if (unlikely(nb_tx < nb_rx)) { - port_map[out_port].stats->tx_drop += nb_rx - nb_tx; - for (buf = nb_tx; buf < nb_rx; buf++) - rte_pktmbuf_free(bufs[buf]); - } - } -} - /* main processing loop */ static void nfv_loop(void) diff --git a/src/nfv/params.h b/src/nfv/params.h index 5850791..7197baf 100644 --- a/src/nfv/params.h +++ b/src/nfv/params.h @@ -22,13 +22,9 @@ struct porttype_map portmap[] = { { .port_name = NULL, .port_type = UNDEF, }, }; -static struct port ports_fwd_array[RTE_MAX_ETHPORTS]; - /* the port details */ struct port_info *ports; static enum cmd_type cmd; -static struct port_map port_map[RTE_MAX_ETHPORTS]; - #endif // _NFV_PARAMS_H_ diff --git a/src/shared/basic_forwarder.c b/src/shared/basic_forwarder.c new file mode 100644 index 0000000..7aefaaa --- /dev/null +++ b/src/shared/basic_forwarder.c @@ -0,0 +1,55 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2019 Nippon Telegraph and Telephone Corporation + */ + +#include <stdint.h> +#include "shared/common.h" +#include "shared/basic_forwarder.h" + +void +forward(void) +{ + uint16_t nb_rx; + uint16_t nb_tx; + int in_port; + int out_port; + uint16_t buf; + int i; + + /* Go through every possible port numbers*/ + for (i = 0; i < RTE_MAX_ETHPORTS; i++) { + struct rte_mbuf *bufs[MAX_PKT_BURST]; + + if (ports_fwd_array[i].in_port_id == PORT_RESET) + continue; + + if (ports_fwd_array[i].out_port_id == PORT_RESET) + continue; + + /* if status active, i count is in port*/ + in_port = i; + out_port = ports_fwd_array[i].out_port_id; + + /* Get burst of RX packets, from first port of pair. */ + /*first port rx, second port tx*/ + nb_rx = ports_fwd_array[in_port].rx_func(in_port, 0, bufs, + MAX_PKT_BURST); + if (unlikely(nb_rx == 0)) + continue; + + port_map[in_port].stats->rx += nb_rx; + + /* Send burst of TX packets, to second port of pair. */ + nb_tx = ports_fwd_array[out_port].tx_func(out_port, 0, bufs, + nb_rx); + + port_map[out_port].stats->tx += nb_tx; + + /* Free any unsent packets. */ + if (unlikely(nb_tx < nb_rx)) { + port_map[out_port].stats->tx_drop += nb_rx - nb_tx; + for (buf = nb_tx; buf < nb_rx; buf++) + rte_pktmbuf_free(bufs[buf]); + } + } +} diff --git a/src/shared/basic_forwarder.h b/src/shared/basic_forwarder.h new file mode 100644 index 0000000..173cab3 --- /dev/null +++ b/src/shared/basic_forwarder.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2019 Nippon Telegraph and Telephone Corporation + */ + +#ifndef __SHARED_FORWARDER_H__ +#define __SHARED_FORWARDER_H__ + +struct port_map port_map[RTE_MAX_ETHPORTS]; +struct port ports_fwd_array[RTE_MAX_ETHPORTS]; + +void forward(void); + +#endif diff --git a/src/shared/common.h b/src/shared/common.h index cbd1bcf..9c46a64 100644 --- a/src/shared/common.h +++ b/src/shared/common.h @@ -29,6 +29,9 @@ #define RTE_MP_RX_DESC_DEFAULT 512 #define RTE_MP_TX_DESC_DEFAULT 512 +/* Packets are read in a burst of size MAX_PKT_BURST from RX queue. */ +#define MAX_PKT_BURST 32 + #define VDEV_ETH_RING "eth_ring" #define VDEV_NET_RING "net_ring" #define VDEV_ETH_VHOST "eth_vhost" diff --git a/src/shared/secondary/common.h b/src/shared/secondary/common.h index 44c1b8b..4b70708 100644 --- a/src/shared/secondary/common.h +++ b/src/shared/secondary/common.h @@ -5,8 +5,6 @@ #ifndef __SHARED_SECONDARY_COMMON_H__ #define __SHARED_SECONDARY_COMMON_H__ -#define MAX_PKT_BURST 32 - #define IPADDR_LEN 16 /* Length of IP address in string. */ /** -- 2.17.1
This update is to move util functions for managing ports to shared lib because enable to be used from other processes including spp_primary. Signed-off-by: Yasufumi Ogawa <yasufum.o@gmail.com> --- src/nfv/main.c | 2 +- .../nfv_utils.h => shared/port_manager.h} | 20 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) rename src/{nfv/nfv_utils.h => shared/port_manager.h} (83%) diff --git a/src/nfv/main.c b/src/nfv/main.c index dbefba4..ac82139 100644 --- a/src/nfv/main.c +++ b/src/nfv/main.c @@ -21,7 +21,7 @@ #include "params.h" #include "init.h" #include "nfv_status.h" -#include "nfv_utils.h" +#include "shared/port_manager.h" #include "commands.h" #define RTE_LOGTYPE_SPP_NFV RTE_LOGTYPE_USER1 diff --git a/src/nfv/nfv_utils.h b/src/shared/port_manager.h similarity index 83% rename from src/nfv/nfv_utils.h rename to src/shared/port_manager.h index 9d4f9dd..9756864 100644 --- a/src/nfv/nfv_utils.h +++ b/src/shared/port_manager.h @@ -3,10 +3,12 @@ * Copyright(c) 2019 Nippon Telegraph and Telephone Corporation */ -#ifndef _NFV_NFV_UTILS_H_ -#define _NFV_NFV_UTILS_H_ +#ifndef __SHARED_PORT_MANAGER_H__ +#define __SHARED_PORT_MANAGER_H__ -#define RTE_LOGTYPE_SPP_NFV RTE_LOGTYPE_USER1 +#define RTE_LOGTYPE_SHARED RTE_LOGTYPE_USER1 + +#include "shared/basic_forwarder.h" static void forward_array_remove(int port_id) @@ -78,11 +80,11 @@ add_patch(uint16_t in_port, uint16_t out_port) ports_fwd_array[out_port].rx_func = &rte_eth_rx_burst; ports_fwd_array[out_port].tx_func = &rte_eth_tx_burst; - RTE_LOG(DEBUG, SPP_NFV, "STATUS: in port %d in_port_id %d\n", in_port, + RTE_LOG(DEBUG, SHARED, "STATUS: in port %d in_port_id %d\n", in_port, ports_fwd_array[in_port].in_port_id); - RTE_LOG(DEBUG, SPP_NFV, "STATUS: in port %d patch out port id %d\n", + RTE_LOG(DEBUG, SHARED, "STATUS: in port %d patch out port id %d\n", in_port, ports_fwd_array[in_port].out_port_id); - RTE_LOG(DEBUG, SPP_NFV, "STATUS: outport %d in_port_id %d\n", out_port, + RTE_LOG(DEBUG, SHARED, "STATUS: outport %d in_port_id %d\n", out_port, ports_fwd_array[out_port].in_port_id); return 0; @@ -97,8 +99,8 @@ forward_array_reset(void) for (i = 0; i < RTE_MAX_ETHPORTS; i++) { if (ports_fwd_array[i].in_port_id != PORT_RESET) { ports_fwd_array[i].out_port_id = PORT_RESET; - RTE_LOG(INFO, SPP_NFV, "Port ID %d\n", i); - RTE_LOG(INFO, SPP_NFV, "out_port_id %d\n", + RTE_LOG(INFO, SHARED, "Port ID %d\n", i); + RTE_LOG(INFO, SHARED, "out_port_id %d\n", ports_fwd_array[i].out_port_id); } } @@ -116,4 +118,4 @@ static enum port_type get_port_type(char *portname) return UNDEF; } -#endif // _NFV_COMMAND_UTILS_H_ +#endif // __SHARED_PORT_MANAGER_H__ -- 2.17.1