port: ethdev
The input port ethdev_reader implements the Packet Framework port API on top of the Intel DPDK poll mode driver for a NIC RX queue. The output port ethdev_writer implements the Packet Framework port API on top of the Intel DPDK poll mode driver for a NIC TX queue. Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com> Acked-by: Pablo de Lara Guarch <pablo.de.lara.guarch@intel.com> Acked by: Ivan Boule <ivan.boule@6wind.com>
This commit is contained in:
Cristian Dumitrescu
Thomas Monjalon
parent
eb77db3ed9
commit
4d97e8b565
@ -102,6 +102,7 @@ There are many libraries, so their headers may be grouped by topics:
|
||||
|
||||
- **packet framework**:
|
||||
* [port] (@ref rte_port.h):
|
||||
[ethdev] (@ref rte_port_ethdev.h),
|
||||
|
||||
- **basic**:
|
||||
[approx fraction] (@ref rte_approx.h),
|
||||
|
||||
@ -42,9 +42,11 @@ CFLAGS += $(WERROR_FLAGS)
|
||||
#
|
||||
# all source are stored in SRCS-y
|
||||
#
|
||||
SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ethdev.c
|
||||
|
||||
# install includes
|
||||
SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port.h
|
||||
SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ethdev.h
|
||||
|
||||
# this lib depends upon:
|
||||
DEPDIRS-$(CONFIG_RTE_LIBRTE_PORT) := lib/librte_eal
|
||||
|
||||
305
lib/librte_port/rte_port_ethdev.c
Normal file
305
lib/librte_port/rte_port_ethdev.c
Normal file
@ -0,0 +1,305 @@
|
||||
/*-
|
||||
* BSD LICENSE
|
||||
*
|
||||
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* * Neither the name of Intel Corporation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#include <string.h>
|
||||
|
||||
#include <rte_mbuf.h>
|
||||
#include <rte_ethdev.h>
|
||||
#include <rte_malloc.h>
|
||||
|
||||
#include "rte_port_ethdev.h"
|
||||
|
||||
/*
|
||||
* Port ETHDEV Reader
|
||||
*/
|
||||
struct rte_port_ethdev_reader {
|
||||
uint16_t queue_id;
|
||||
uint8_t port_id;
|
||||
};
|
||||
|
||||
static void *
|
||||
rte_port_ethdev_reader_create(void *params, int socket_id)
|
||||
{
|
||||
struct rte_port_ethdev_reader_params *conf =
|
||||
(struct rte_port_ethdev_reader_params *) params;
|
||||
struct rte_port_ethdev_reader *port;
|
||||
|
||||
/* Check input parameters */
|
||||
if (conf == NULL) {
|
||||
RTE_LOG(ERR, PORT, "%s: params is NULL\n", __func__);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Memory allocation */
|
||||
port = rte_zmalloc_socket("PORT", sizeof(*port),
|
||||
CACHE_LINE_SIZE, socket_id);
|
||||
if (port == NULL) {
|
||||
RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Initialization */
|
||||
port->port_id = conf->port_id;
|
||||
port->queue_id = conf->queue_id;
|
||||
|
||||
return port;
|
||||
}
|
||||
|
||||
static int
|
||||
rte_port_ethdev_reader_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts)
|
||||
{
|
||||
struct rte_port_ethdev_reader *p =
|
||||
(struct rte_port_ethdev_reader *) port;
|
||||
|
||||
return rte_eth_rx_burst(p->port_id, p->queue_id, pkts, n_pkts);
|
||||
}
|
||||
|
||||
static int
|
||||
rte_port_ethdev_reader_free(void *port)
|
||||
{
|
||||
if (port == NULL) {
|
||||
RTE_LOG(ERR, PORT, "%s: port is NULL\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
rte_free(port);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Port ETHDEV Writer
|
||||
*/
|
||||
#define RTE_PORT_ETHDEV_WRITER_APPROACH 1
|
||||
|
||||
struct rte_port_ethdev_writer {
|
||||
struct rte_mbuf *tx_buf[2 * RTE_PORT_IN_BURST_SIZE_MAX];
|
||||
uint32_t tx_burst_sz;
|
||||
uint16_t tx_buf_count;
|
||||
uint64_t bsz_mask;
|
||||
uint16_t queue_id;
|
||||
uint8_t port_id;
|
||||
};
|
||||
|
||||
static void *
|
||||
rte_port_ethdev_writer_create(void *params, int socket_id)
|
||||
{
|
||||
struct rte_port_ethdev_writer_params *conf =
|
||||
(struct rte_port_ethdev_writer_params *) params;
|
||||
struct rte_port_ethdev_writer *port;
|
||||
|
||||
/* Check input parameters */
|
||||
if ((conf == NULL) ||
|
||||
(conf->tx_burst_sz == 0) ||
|
||||
(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX) ||
|
||||
(!rte_is_power_of_2(conf->tx_burst_sz))) {
|
||||
RTE_LOG(ERR, PORT, "%s: Invalid input parameters\n", __func__);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Memory allocation */
|
||||
port = rte_zmalloc_socket("PORT", sizeof(*port),
|
||||
CACHE_LINE_SIZE, socket_id);
|
||||
if (port == NULL) {
|
||||
RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Initialization */
|
||||
port->port_id = conf->port_id;
|
||||
port->queue_id = conf->queue_id;
|
||||
port->tx_burst_sz = conf->tx_burst_sz;
|
||||
port->tx_buf_count = 0;
|
||||
port->bsz_mask = 1LLU << (conf->tx_burst_sz - 1);
|
||||
|
||||
return port;
|
||||
}
|
||||
|
||||
static inline void
|
||||
send_burst(struct rte_port_ethdev_writer *p)
|
||||
{
|
||||
uint32_t nb_tx;
|
||||
|
||||
nb_tx = rte_eth_tx_burst(p->port_id, p->queue_id,
|
||||
p->tx_buf, p->tx_buf_count);
|
||||
|
||||
for ( ; nb_tx < p->tx_buf_count; nb_tx++)
|
||||
rte_pktmbuf_free(p->tx_buf[nb_tx]);
|
||||
|
||||
p->tx_buf_count = 0;
|
||||
}
|
||||
|
||||
static int
|
||||
rte_port_ethdev_writer_tx(void *port, struct rte_mbuf *pkt)
|
||||
{
|
||||
struct rte_port_ethdev_writer *p =
|
||||
(struct rte_port_ethdev_writer *) port;
|
||||
|
||||
p->tx_buf[p->tx_buf_count++] = pkt;
|
||||
if (p->tx_buf_count >= p->tx_burst_sz)
|
||||
send_burst(p);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if RTE_PORT_ETHDEV_WRITER_APPROACH == 0
|
||||
|
||||
static int
|
||||
rte_port_ethdev_writer_tx_bulk(void *port,
|
||||
struct rte_mbuf **pkts,
|
||||
uint64_t pkts_mask)
|
||||
{
|
||||
struct rte_port_ethdev_writer *p =
|
||||
(struct rte_port_ethdev_writer *) port;
|
||||
|
||||
if ((pkts_mask & (pkts_mask + 1)) == 0) {
|
||||
uint64_t n_pkts = __builtin_popcountll(pkts_mask);
|
||||
uint32_t i;
|
||||
|
||||
for (i = 0; i < n_pkts; i++) {
|
||||
struct rte_mbuf *pkt = pkts[i];
|
||||
|
||||
p->tx_buf[p->tx_buf_count++] = pkt;
|
||||
if (p->tx_buf_count >= p->tx_burst_sz)
|
||||
send_burst(p);
|
||||
}
|
||||
} else {
|
||||
for ( ; pkts_mask; ) {
|
||||
uint32_t pkt_index = __builtin_ctzll(pkts_mask);
|
||||
uint64_t pkt_mask = 1LLU << pkt_index;
|
||||
struct rte_mbuf *pkt = pkts[pkt_index];
|
||||
|
||||
p->tx_buf[p->tx_buf_count++] = pkt;
|
||||
if (p->tx_buf_count >= p->tx_burst_sz)
|
||||
send_burst(p);
|
||||
pkts_mask &= ~pkt_mask;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#elif RTE_PORT_ETHDEV_WRITER_APPROACH == 1
|
||||
|
||||
static int
|
||||
rte_port_ethdev_writer_tx_bulk(void *port,
|
||||
struct rte_mbuf **pkts,
|
||||
uint64_t pkts_mask)
|
||||
{
|
||||
struct rte_port_ethdev_writer *p =
|
||||
(struct rte_port_ethdev_writer *) port;
|
||||
uint32_t bsz_mask = p->bsz_mask;
|
||||
uint32_t tx_buf_count = p->tx_buf_count;
|
||||
uint64_t expr = (pkts_mask & (pkts_mask + 1)) |
|
||||
((pkts_mask & bsz_mask) ^ bsz_mask);
|
||||
|
||||
if (expr == 0) {
|
||||
uint64_t n_pkts = __builtin_popcountll(pkts_mask);
|
||||
uint32_t n_pkts_ok;
|
||||
|
||||
if (tx_buf_count)
|
||||
send_burst(p);
|
||||
|
||||
n_pkts_ok = rte_eth_tx_burst(p->port_id, p->queue_id, pkts,
|
||||
n_pkts);
|
||||
|
||||
for ( ; n_pkts_ok < n_pkts; n_pkts_ok++) {
|
||||
struct rte_mbuf *pkt = pkts[n_pkts_ok];
|
||||
|
||||
rte_pktmbuf_free(pkt);
|
||||
}
|
||||
} else {
|
||||
for ( ; pkts_mask; ) {
|
||||
uint32_t pkt_index = __builtin_ctzll(pkts_mask);
|
||||
uint64_t pkt_mask = 1LLU << pkt_index;
|
||||
struct rte_mbuf *pkt = pkts[pkt_index];
|
||||
|
||||
p->tx_buf[tx_buf_count++] = pkt;
|
||||
pkts_mask &= ~pkt_mask;
|
||||
}
|
||||
|
||||
p->tx_buf_count = tx_buf_count;
|
||||
if (tx_buf_count >= p->tx_burst_sz)
|
||||
send_burst(p);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
#error Invalid value for RTE_PORT_ETHDEV_WRITER_APPROACH
|
||||
|
||||
#endif
|
||||
|
||||
static int
|
||||
rte_port_ethdev_writer_flush(void *port)
|
||||
{
|
||||
struct rte_port_ethdev_writer *p =
|
||||
(struct rte_port_ethdev_writer *) port;
|
||||
|
||||
if (p->tx_buf_count > 0)
|
||||
send_burst(p);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
rte_port_ethdev_writer_free(void *port)
|
||||
{
|
||||
if (port == NULL) {
|
||||
RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
rte_port_ethdev_writer_flush(port);
|
||||
rte_free(port);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Summary of port operations
|
||||
*/
|
||||
struct rte_port_in_ops rte_port_ethdev_reader_ops = {
|
||||
.f_create = rte_port_ethdev_reader_create,
|
||||
.f_free = rte_port_ethdev_reader_free,
|
||||
.f_rx = rte_port_ethdev_reader_rx,
|
||||
};
|
||||
|
||||
struct rte_port_out_ops rte_port_ethdev_writer_ops = {
|
||||
.f_create = rte_port_ethdev_writer_create,
|
||||
.f_free = rte_port_ethdev_writer_free,
|
||||
.f_tx = rte_port_ethdev_writer_tx,
|
||||
.f_tx_bulk = rte_port_ethdev_writer_tx_bulk,
|
||||
.f_flush = rte_port_ethdev_writer_flush,
|
||||
};
|
||||
86
lib/librte_port/rte_port_ethdev.h
Normal file
86
lib/librte_port/rte_port_ethdev.h
Normal file
@ -0,0 +1,86 @@
|
||||
/*-
|
||||
* BSD LICENSE
|
||||
*
|
||||
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* * Neither the name of Intel Corporation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef __INCLUDE_RTE_PORT_ETHDEV_H__
|
||||
#define __INCLUDE_RTE_PORT_ETHDEV_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @file
|
||||
* RTE Port Ethernet Device
|
||||
*
|
||||
* ethdev_reader: input port built on top of pre-initialized NIC RX queue
|
||||
* ethdev_writer: output port built on top of pre-initialized NIC TX queue
|
||||
*
|
||||
***/
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "rte_port.h"
|
||||
|
||||
/** ethdev_reader port parameters */
|
||||
struct rte_port_ethdev_reader_params {
|
||||
/** NIC RX port ID */
|
||||
uint8_t port_id;
|
||||
|
||||
/** NIC RX queue ID */
|
||||
uint16_t queue_id;
|
||||
};
|
||||
|
||||
/** ethdev_reader port operations */
|
||||
extern struct rte_port_in_ops rte_port_ethdev_reader_ops;
|
||||
|
||||
/** ethdev_writer port parameters */
|
||||
struct rte_port_ethdev_writer_params {
|
||||
/** NIC RX port ID */
|
||||
uint8_t port_id;
|
||||
|
||||
/** NIC RX queue ID */
|
||||
uint16_t queue_id;
|
||||
|
||||
/** Recommended burst size to NIC TX queue. The actual burst size can be
|
||||
bigger or smaller than this value. */
|
||||
uint32_t tx_burst_sz;
|
||||
};
|
||||
|
||||
/** ethdev_writer port operations */
|
||||
extern struct rte_port_out_ops rte_port_ethdev_writer_ops;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
Loading…
x
Reference in New Issue
Block a user