From dfcd81838cad25139cb0a67f6950505ffb426730 Mon Sep 17 00:00:00 2001 From: Jasvinder Singh Date: Fri, 6 Jul 2018 18:20:56 +0100 Subject: [PATCH] net/softnic: add link object Add link object implementation to the softnic. Signed-off-by: Cristian Dumitrescu Signed-off-by: Jasvinder Singh --- drivers/net/softnic/Makefile | 1 + drivers/net/softnic/meson.build | 3 +- drivers/net/softnic/rte_eth_softnic.c | 4 + .../net/softnic/rte_eth_softnic_internals.h | 37 +++++++ drivers/net/softnic/rte_eth_softnic_link.c | 98 +++++++++++++++++++ 5 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 drivers/net/softnic/rte_eth_softnic_link.c diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile index 5da78429be..3a7a10ffef 100644 --- a/drivers/net/softnic/Makefile +++ b/drivers/net/softnic/Makefile @@ -23,6 +23,7 @@ LIBABIVER := 1 # SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_swq.c +SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_link.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_tm.c # diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build index 355749d890..814d614fd5 100644 --- a/drivers/net/softnic/meson.build +++ b/drivers/net/softnic/meson.build @@ -4,5 +4,6 @@ install_headers('rte_eth_softnic.h') sources = files('rte_eth_softnic_tm.c', 'rte_eth_softnic.c', - 'rte_eth_softnic_swq.c') + 'rte_eth_softnic_swq.c', + 'rte_eth_softnic_link.c') deps += 'sched' diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c index 5fb9332d8d..18bc41489f 100644 --- a/drivers/net/softnic/rte_eth_softnic.c +++ b/drivers/net/softnic/rte_eth_softnic.c @@ -217,6 +217,8 @@ pmd_init(struct pmd_params *params) /* Resources */ softnic_swq_init(p); + softnic_link_init(p); + return p; } @@ -226,7 +228,9 @@ pmd_free(struct pmd_internals *p) if (p == NULL) return; + softnic_link_free(p); softnic_swq_free(p); + rte_free(p); } diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h index 002b25fcce..36dc24723b 100644 --- a/drivers/net/softnic/rte_eth_softnic_internals.h +++ b/drivers/net/softnic/rte_eth_softnic_internals.h @@ -51,6 +51,24 @@ struct softnic_swq { TAILQ_HEAD(softnic_swq_list, softnic_swq); +/** + * LINK + */ +struct softnic_link_params { + const char *dev_name; + uint16_t port_id; /**< Valid only when *dev_name* is NULL. */ +}; + +struct softnic_link { + TAILQ_ENTRY(softnic_link) node; + char name[NAME_SIZE]; + uint16_t port_id; + uint32_t n_rxq; + uint32_t n_txq; +}; + +TAILQ_HEAD(softnic_link_list, softnic_link); + /** * Traffic Management (TM) Internals */ @@ -176,6 +194,7 @@ struct pmd_internals { } soft; struct softnic_swq_list swq_list; + struct softnic_link_list link_list; }; /** @@ -196,6 +215,24 @@ softnic_swq_create(struct pmd_internals *p, const char *name, struct softnic_swq_params *params); +/** + * LINK + */ +int +softnic_link_init(struct pmd_internals *p); + +void +softnic_link_free(struct pmd_internals *p); + +struct softnic_link * +softnic_link_find(struct pmd_internals *p, + const char *name); + +struct softnic_link * +softnic_link_create(struct pmd_internals *p, + const char *name, + struct softnic_link_params *params); + /** * Traffic Management (TM) Operation */ diff --git a/drivers/net/softnic/rte_eth_softnic_link.c b/drivers/net/softnic/rte_eth_softnic_link.c new file mode 100644 index 0000000000..d669913a4d --- /dev/null +++ b/drivers/net/softnic/rte_eth_softnic_link.c @@ -0,0 +1,98 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2018 Intel Corporation + */ + +#include +#include + +#include +#include + +#include "rte_eth_softnic_internals.h" + +int +softnic_link_init(struct pmd_internals *p) +{ + TAILQ_INIT(&p->link_list); + + return 0; +} + +void +softnic_link_free(struct pmd_internals *p) +{ + for ( ; ; ) { + struct softnic_link *link; + + link = TAILQ_FIRST(&p->link_list); + if (link == NULL) + break; + + TAILQ_REMOVE(&p->link_list, link, node); + free(link); + } +} + +struct softnic_link * +softnic_link_find(struct pmd_internals *p, + const char *name) +{ + struct softnic_link *link; + + if (name == NULL) + return NULL; + + TAILQ_FOREACH(link, &p->link_list, node) + if (strcmp(link->name, name) == 0) + return link; + + return NULL; +} + +struct softnic_link * +softnic_link_create(struct pmd_internals *p, + const char *name, + struct softnic_link_params *params) +{ + struct rte_eth_dev_info port_info; + struct softnic_link *link; + uint16_t port_id; + + /* Check input params */ + if (name == NULL || + softnic_link_find(p, name) || + params == NULL) + return NULL; + + port_id = params->port_id; + if (params->dev_name) { + int status; + + status = rte_eth_dev_get_port_by_name(params->dev_name, + &port_id); + + if (status) + return NULL; + } else { + if (!rte_eth_dev_is_valid_port(port_id)) + return NULL; + } + + rte_eth_dev_info_get(port_id, &port_info); + + /* Node allocation */ + link = calloc(1, sizeof(struct softnic_link)); + if (link == NULL) + return NULL; + + /* Node fill in */ + strlcpy(link->name, name, sizeof(link->name)); + link->port_id = port_id; + link->n_rxq = port_info.nb_rx_queues; + link->n_txq = port_info.nb_tx_queues; + + /* Node add to list */ + TAILQ_INSERT_TAIL(&p->link_list, link, node); + + return link; +} -- 2.20.1