*/
#include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_bus_vdev.h>
#define ETH_NULL_PACKET_SIZE_ARG "size"
#define ETH_NULL_PACKET_COPY_ARG "copy"
+#define ETH_NULL_PACKET_NO_RX_ARG "no-rx"
-static unsigned default_packet_size = 64;
-static unsigned default_packet_copy;
+static unsigned int default_packet_size = 64;
+static unsigned int default_packet_copy;
+static unsigned int default_no_rx;
static const char *valid_arguments[] = {
ETH_NULL_PACKET_SIZE_ARG,
ETH_NULL_PACKET_COPY_ARG,
+ ETH_NULL_PACKET_NO_RX_ARG,
NULL
};
rte_atomic64_t tx_pkts;
};
+struct pmd_options {
+ unsigned int packet_copy;
+ unsigned int packet_size;
+ unsigned int no_rx;
+};
+
struct pmd_internals {
- unsigned packet_size;
- unsigned packet_copy;
+ unsigned int packet_size;
+ unsigned int packet_copy;
+ unsigned int no_rx;
uint16_t port_id;
struct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT];
rte_spinlock_t rss_lock;
uint16_t reta_size;
- struct rte_eth_rss_reta_entry64 reta_conf[ETH_RSS_RETA_SIZE_128 /
- RTE_RETA_GROUP_SIZE];
+ struct rte_eth_rss_reta_entry64 reta_conf[RTE_ETH_RSS_RETA_SIZE_128 /
+ RTE_ETH_RETA_GROUP_SIZE];
uint8_t rss_key[40]; /**< 40-byte hash key. */
};
static struct rte_eth_link pmd_link = {
- .link_speed = ETH_SPEED_NUM_10G,
- .link_duplex = ETH_LINK_FULL_DUPLEX,
- .link_status = ETH_LINK_DOWN,
- .link_autoneg = ETH_LINK_FIXED,
+ .link_speed = RTE_ETH_SPEED_NUM_10G,
+ .link_duplex = RTE_ETH_LINK_FULL_DUPLEX,
+ .link_status = RTE_ETH_LINK_DOWN,
+ .link_autoneg = RTE_ETH_LINK_FIXED,
};
-static int eth_null_logtype;
+RTE_LOG_REGISTER_DEFAULT(eth_null_logtype, NOTICE);
#define PMD_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, eth_null_logtype, \
{
int i;
struct null_queue *h = q;
- unsigned packet_size;
+ unsigned int packet_size;
if ((q == NULL) || (bufs == NULL))
return 0;
{
int i;
struct null_queue *h = q;
- unsigned packet_size;
+ unsigned int packet_size;
if ((q == NULL) || (bufs == NULL))
return 0;
return i;
}
+static uint16_t
+eth_null_no_rx(void *q __rte_unused, struct rte_mbuf **bufs __rte_unused,
+ uint16_t nb_bufs __rte_unused)
+{
+ return 0;
+}
+
static uint16_t
eth_null_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
{
{
int i;
struct null_queue *h = q;
- unsigned packet_size;
+ unsigned int packet_size;
if ((q == NULL) || (bufs == NULL))
return 0;
if (dev == NULL)
return -EINVAL;
- dev->data->dev_link.link_status = ETH_LINK_UP;
+ dev->data->dev_link.link_status = RTE_ETH_LINK_UP;
return 0;
}
-static void
+static int
eth_dev_stop(struct rte_eth_dev *dev)
{
if (dev == NULL)
- return;
+ return 0;
+
+ dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN;
- dev->data->dev_link.link_status = ETH_LINK_DOWN;
+ return 0;
}
static int
{
struct rte_mbuf *dummy_packet;
struct pmd_internals *internals;
- unsigned packet_size;
+ unsigned int packet_size;
if ((dev == NULL) || (mb_pool == NULL))
return -EINVAL;
{
struct rte_mbuf *dummy_packet;
struct pmd_internals *internals;
- unsigned packet_size;
+ unsigned int packet_size;
if (dev == NULL)
return -EINVAL;
static int
eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats)
{
- unsigned i, num_stats;
+ unsigned int i, num_stats;
unsigned long rx_total = 0, tx_total = 0;
const struct pmd_internals *internal;
return -EINVAL;
internal = dev->data->dev_private;
- num_stats = RTE_MIN((unsigned)RTE_ETHDEV_QUEUE_STAT_CNTRS,
+ num_stats = RTE_MIN((unsigned int)RTE_ETHDEV_QUEUE_STAT_CNTRS,
RTE_MIN(dev->data->nb_rx_queues,
RTE_DIM(internal->rx_null_queues)));
for (i = 0; i < num_stats; i++) {
rx_total += igb_stats->q_ipackets[i];
}
- num_stats = RTE_MIN((unsigned)RTE_ETHDEV_QUEUE_STAT_CNTRS,
+ num_stats = RTE_MIN((unsigned int)RTE_ETHDEV_QUEUE_STAT_CNTRS,
RTE_MIN(dev->data->nb_tx_queues,
RTE_DIM(internal->tx_null_queues)));
for (i = 0; i < num_stats; i++) {
static int
eth_stats_reset(struct rte_eth_dev *dev)
{
- unsigned i;
+ unsigned int i;
struct pmd_internals *internal;
if (dev == NULL)
}
static void
-eth_queue_release(void *q)
+eth_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
{
- struct null_queue *nq;
+ struct null_queue *nq = dev->data->rx_queues[qid];
- if (q == NULL)
+ if (nq == NULL)
+ return;
+
+ rte_free(nq->dummy_packet);
+}
+
+static void
+eth_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
+{
+ struct null_queue *nq = dev->data->tx_queues[qid];
+
+ if (nq == NULL)
return;
- nq = q;
rte_free(nq->dummy_packet);
}
rte_spinlock_lock(&internal->rss_lock);
/* Copy RETA table */
- for (i = 0; i < (internal->reta_size / RTE_RETA_GROUP_SIZE); i++) {
+ for (i = 0; i < (internal->reta_size / RTE_ETH_RETA_GROUP_SIZE); i++) {
internal->reta_conf[i].mask = reta_conf[i].mask;
- for (j = 0; j < RTE_RETA_GROUP_SIZE; j++)
+ for (j = 0; j < RTE_ETH_RETA_GROUP_SIZE; j++)
if ((reta_conf[i].mask >> j) & 0x01)
internal->reta_conf[i].reta[j] = reta_conf[i].reta[j];
}
rte_spinlock_lock(&internal->rss_lock);
/* Copy RETA table */
- for (i = 0; i < (internal->reta_size / RTE_RETA_GROUP_SIZE); i++) {
- for (j = 0; j < RTE_RETA_GROUP_SIZE; j++)
+ for (i = 0; i < (internal->reta_size / RTE_ETH_RETA_GROUP_SIZE); i++) {
+ for (j = 0; j < RTE_ETH_RETA_GROUP_SIZE; j++)
if ((reta_conf[i].mask >> j) & 0x01)
reta_conf[i].reta[j] = internal->reta_conf[i].reta[j];
}
return 0;
}
+static int
+eth_dev_close(struct rte_eth_dev *dev)
+{
+ PMD_LOG(INFO, "Closing null ethdev on NUMA socket %u",
+ rte_socket_id());
+
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
+ /* mac_addrs must not be freed alone because part of dev_private */
+ dev->data->mac_addrs = NULL;
+
+ return 0;
+}
+
static const struct eth_dev_ops ops = {
+ .dev_close = eth_dev_close,
.dev_start = eth_dev_start,
.dev_stop = eth_dev_stop,
.dev_configure = eth_dev_configure,
.dev_infos_get = eth_dev_info,
.rx_queue_setup = eth_rx_queue_setup,
.tx_queue_setup = eth_tx_queue_setup,
- .rx_queue_release = eth_queue_release,
- .tx_queue_release = eth_queue_release,
+ .rx_queue_release = eth_rx_queue_release,
+ .tx_queue_release = eth_tx_queue_release,
.mtu_set = eth_mtu_set,
.link_update = eth_link_update,
.mac_addr_set = eth_mac_address_set,
};
static int
-eth_dev_null_create(struct rte_vdev_device *dev,
- unsigned packet_size,
- unsigned packet_copy)
+eth_dev_null_create(struct rte_vdev_device *dev, struct pmd_options *args)
{
- const unsigned nb_rx_queues = 1;
- const unsigned nb_tx_queues = 1;
+ const unsigned int nb_rx_queues = 1;
+ const unsigned int nb_tx_queues = 1;
struct rte_eth_dev_data *data;
struct pmd_internals *internals = NULL;
struct rte_eth_dev *eth_dev = NULL;
* so the nulls are local per-process */
internals = eth_dev->data->dev_private;
- internals->packet_size = packet_size;
- internals->packet_copy = packet_copy;
+ internals->packet_size = args->packet_size;
+ internals->packet_copy = args->packet_copy;
+ internals->no_rx = args->no_rx;
internals->port_id = eth_dev->data->port_id;
rte_eth_random_addr(internals->eth_addr.addr_bytes);
- internals->flow_type_rss_offloads = ETH_RSS_PROTO_MASK;
- internals->reta_size = RTE_DIM(internals->reta_conf) * RTE_RETA_GROUP_SIZE;
+ internals->flow_type_rss_offloads = RTE_ETH_RSS_PROTO_MASK;
+ internals->reta_size = RTE_DIM(internals->reta_conf) * RTE_ETH_RETA_GROUP_SIZE;
rte_memcpy(internals->rss_key, default_rss_key, 40);
data->mac_addrs = &internals->eth_addr;
data->promiscuous = 1;
data->all_multicast = 1;
+ data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
eth_dev->dev_ops = &ops;
/* finally assign rx and tx ops */
- if (packet_copy) {
+ if (internals->packet_copy) {
eth_dev->rx_pkt_burst = eth_null_copy_rx;
eth_dev->tx_pkt_burst = eth_null_copy_tx;
+ } else if (internals->no_rx) {
+ eth_dev->rx_pkt_burst = eth_null_no_rx;
+ eth_dev->tx_pkt_burst = eth_null_tx;
} else {
eth_dev->rx_pkt_burst = eth_null_rx;
eth_dev->tx_pkt_burst = eth_null_tx;
const char *value, void *extra_args)
{
const char *a = value;
- unsigned *packet_size = extra_args;
+ unsigned int *packet_size = extra_args;
if ((value == NULL) || (extra_args == NULL))
return -EINVAL;
- *packet_size = (unsigned)strtoul(a, NULL, 0);
+ *packet_size = (unsigned int)strtoul(a, NULL, 0);
if (*packet_size == UINT_MAX)
return -1;
const char *value, void *extra_args)
{
const char *a = value;
- unsigned *packet_copy = extra_args;
+ unsigned int *packet_copy = extra_args;
if ((value == NULL) || (extra_args == NULL))
return -EINVAL;
- *packet_copy = (unsigned)strtoul(a, NULL, 0);
+ *packet_copy = (unsigned int)strtoul(a, NULL, 0);
if (*packet_copy == UINT_MAX)
return -1;
return 0;
}
+static int
+get_packet_no_rx_arg(const char *key __rte_unused,
+ const char *value, void *extra_args)
+{
+ const char *a = value;
+ unsigned int no_rx;
+
+ if (value == NULL || extra_args == NULL)
+ return -EINVAL;
+
+ no_rx = (unsigned int)strtoul(a, NULL, 0);
+ if (no_rx != 0 && no_rx != 1)
+ return -1;
+
+ *(unsigned int *)extra_args = no_rx;
+ return 0;
+}
+
static int
rte_pmd_null_probe(struct rte_vdev_device *dev)
{
const char *name, *params;
- unsigned packet_size = default_packet_size;
- unsigned packet_copy = default_packet_copy;
+ struct pmd_options args = {
+ .packet_copy = default_packet_copy,
+ .packet_size = default_packet_size,
+ .no_rx = default_no_rx,
+ };
struct rte_kvargs *kvlist = NULL;
struct rte_eth_dev *eth_dev;
int ret;
PMD_LOG(INFO, "Initializing pmd_null for %s", name);
if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+ struct pmd_internals *internals;
eth_dev = rte_eth_dev_attach_secondary(name);
if (!eth_dev) {
PMD_LOG(ERR, "Failed to probe %s", name);
/* TODO: request info from primary to set up Rx and Tx */
eth_dev->dev_ops = &ops;
eth_dev->device = &dev->device;
- if (packet_copy) {
+ internals = eth_dev->data->dev_private;
+ if (internals->packet_copy) {
eth_dev->rx_pkt_burst = eth_null_copy_rx;
eth_dev->tx_pkt_burst = eth_null_copy_tx;
+ } else if (internals->no_rx) {
+ eth_dev->rx_pkt_burst = eth_null_no_rx;
+ eth_dev->tx_pkt_burst = eth_null_tx;
} else {
eth_dev->rx_pkt_burst = eth_null_rx;
eth_dev->tx_pkt_burst = eth_null_tx;
if (kvlist == NULL)
return -1;
- if (rte_kvargs_count(kvlist, ETH_NULL_PACKET_SIZE_ARG) == 1) {
-
- ret = rte_kvargs_process(kvlist,
- ETH_NULL_PACKET_SIZE_ARG,
- &get_packet_size_arg, &packet_size);
- if (ret < 0)
- goto free_kvlist;
- }
-
- if (rte_kvargs_count(kvlist, ETH_NULL_PACKET_COPY_ARG) == 1) {
-
- ret = rte_kvargs_process(kvlist,
- ETH_NULL_PACKET_COPY_ARG,
- &get_packet_copy_arg, &packet_copy);
- if (ret < 0)
- goto free_kvlist;
+ ret = rte_kvargs_process(kvlist,
+ ETH_NULL_PACKET_SIZE_ARG,
+ &get_packet_size_arg, &args.packet_size);
+ if (ret < 0)
+ goto free_kvlist;
+
+
+ ret = rte_kvargs_process(kvlist,
+ ETH_NULL_PACKET_COPY_ARG,
+ &get_packet_copy_arg, &args.packet_copy);
+ if (ret < 0)
+ goto free_kvlist;
+
+ ret = rte_kvargs_process(kvlist,
+ ETH_NULL_PACKET_NO_RX_ARG,
+ &get_packet_no_rx_arg, &args.no_rx);
+ if (ret < 0)
+ goto free_kvlist;
+
+ if (args.no_rx && args.packet_copy) {
+ PMD_LOG(ERR,
+ "Both %s and %s arguments at the same time not supported",
+ ETH_NULL_PACKET_COPY_ARG,
+ ETH_NULL_PACKET_NO_RX_ARG);
+ goto free_kvlist;
}
}
PMD_LOG(INFO, "Configure pmd_null: packet size is %d, "
- "packet copy is %s", packet_size,
- packet_copy ? "enabled" : "disabled");
+ "packet copy is %s", args.packet_size,
+ args.packet_copy ? "enabled" : "disabled");
- ret = eth_dev_null_create(dev, packet_size, packet_copy);
+ ret = eth_dev_null_create(dev, &args);
free_kvlist:
if (kvlist)
if (!dev)
return -EINVAL;
- PMD_LOG(INFO, "Closing null ethdev on numa socket %u",
- rte_socket_id());
-
/* find the ethdev entry */
eth_dev = rte_eth_dev_allocated(rte_vdev_device_name(dev));
if (eth_dev == NULL)
- return -1;
-
- if (rte_eal_process_type() == RTE_PROC_PRIMARY)
- /* mac_addrs must not be freed alone because part of dev_private */
- eth_dev->data->mac_addrs = NULL;
+ return 0; /* port already released */
+ eth_dev_close(eth_dev);
rte_eth_dev_release_port(eth_dev);
return 0;
RTE_PMD_REGISTER_ALIAS(net_null, eth_null);
RTE_PMD_REGISTER_PARAM_STRING(net_null,
"size=<int> "
- "copy=<int>");
-
-RTE_INIT(eth_null_init_log)
-{
- eth_null_logtype = rte_log_register("pmd.net.null");
- if (eth_null_logtype >= 0)
- rte_log_set_level(eth_null_logtype, RTE_LOG_NOTICE);
-}
+ "copy=<int> "
+ ETH_NULL_PACKET_NO_RX_ARG "=0|1");
git.droids-corp.org / dpdk.git / blobdiff