git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/enic: fix freeing memory for descriptor ring
[dpdk.git]
/
drivers
/
net
/
null
/
rte_eth_null.c
diff --git
a/drivers/net/null/rte_eth_null.c
b/drivers/net/null/rte_eth_null.c
index
77fc988
..
2adc43e
100644
(file)
--- a/
drivers/net/null/rte_eth_null.c
+++ b/
drivers/net/null/rte_eth_null.c
@@
-35,7
+35,7
@@
#include <rte_ethdev.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_ethdev.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
-#include <rte_dev.h>
+#include <rte_
v
dev.h>
#include <rte_kvargs.h>
#include <rte_spinlock.h>
#include <rte_kvargs.h>
#include <rte_spinlock.h>
@@
-69,10
+69,7
@@
struct null_queue {
struct pmd_internals {
unsigned packet_size;
unsigned packet_copy;
struct pmd_internals {
unsigned packet_size;
unsigned packet_copy;
- unsigned numa_node;
-
- unsigned nb_rx_queues;
- unsigned nb_tx_queues;
+ uint8_t port_id;
struct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT];
struct null_queue tx_null_queues[RTE_MAX_QUEUES_PER_PORT];
struct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT];
struct null_queue tx_null_queues[RTE_MAX_QUEUES_PER_PORT];
@@
-93,9
+90,10
@@
struct pmd_internals {
static struct ether_addr eth_addr = { .addr_bytes = {0} };
static const char *drivername = "Null PMD";
static struct rte_eth_link pmd_link = {
static struct ether_addr eth_addr = { .addr_bytes = {0} };
static const char *drivername = "Null PMD";
static struct rte_eth_link pmd_link = {
- .link_speed =
10000
,
+ .link_speed =
ETH_SPEED_NUM_10G
,
.link_duplex = ETH_LINK_FULL_DUPLEX,
.link_duplex = ETH_LINK_FULL_DUPLEX,
- .link_status = 0
+ .link_status = ETH_LINK_DOWN,
+ .link_autoneg = ETH_LINK_SPEED_AUTONEG,
};
static uint16_t
};
static uint16_t
@@
-117,6
+115,7
@@
eth_null_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
bufs[i]->pkt_len = packet_size;
bufs[i]->nb_segs = 1;
bufs[i]->next = NULL;
bufs[i]->pkt_len = packet_size;
bufs[i]->nb_segs = 1;
bufs[i]->next = NULL;
+ bufs[i]->port = h->internals->port_id;
}
rte_atomic64_add(&(h->rx_pkts), i);
}
rte_atomic64_add(&(h->rx_pkts), i);
@@
-145,6
+144,7
@@
eth_null_copy_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
bufs[i]->pkt_len = packet_size;
bufs[i]->nb_segs = 1;
bufs[i]->next = NULL;
bufs[i]->pkt_len = packet_size;
bufs[i]->nb_segs = 1;
bufs[i]->next = NULL;
+ bufs[i]->port = h->internals->port_id;
}
rte_atomic64_add(&(h->rx_pkts), i);
}
rte_atomic64_add(&(h->rx_pkts), i);
@@
-192,13
+192,8
@@
eth_null_copy_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
}
static int
}
static int
-eth_dev_configure(struct rte_eth_dev *dev) {
- struct pmd_internals *internals;
-
- internals = dev->data->dev_private;
- internals->nb_rx_queues = dev->data->nb_rx_queues;
- internals->nb_tx_queues = dev->data->nb_tx_queues;
-
+eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
+{
return 0;
}
return 0;
}
@@
-208,7
+203,7
@@
eth_dev_start(struct rte_eth_dev *dev)
if (dev == NULL)
return -EINVAL;
if (dev == NULL)
return -EINVAL;
- dev->data->dev_link.link_status =
1
;
+ dev->data->dev_link.link_status =
ETH_LINK_UP
;
return 0;
}
return 0;
}
@@
-218,7
+213,7
@@
eth_dev_stop(struct rte_eth_dev *dev)
if (dev == NULL)
return;
if (dev == NULL)
return;
- dev->data->dev_link.link_status =
0
;
+ dev->data->dev_link.link_status =
ETH_LINK_DOWN
;
}
static int
}
static int
@@
-237,7
+232,7
@@
eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
internals = dev->data->dev_private;
internals = dev->data->dev_private;
- if (rx_queue_id >=
internals
->nb_rx_queues)
+ if (rx_queue_id >=
dev->data
->nb_rx_queues)
return -ENODEV;
packet_size = internals->packet_size;
return -ENODEV;
packet_size = internals->packet_size;
@@
-246,7
+241,7
@@
eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
dev->data->rx_queues[rx_queue_id] =
&internals->rx_null_queues[rx_queue_id];
dummy_packet = rte_zmalloc_socket(NULL,
dev->data->rx_queues[rx_queue_id] =
&internals->rx_null_queues[rx_queue_id];
dummy_packet = rte_zmalloc_socket(NULL,
- packet_size, 0,
internals
->numa_node);
+ packet_size, 0,
dev->data
->numa_node);
if (dummy_packet == NULL)
return -ENOMEM;
if (dummy_packet == NULL)
return -ENOMEM;
@@
-271,7
+266,7
@@
eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
internals = dev->data->dev_private;
internals = dev->data->dev_private;
- if (tx_queue_id >=
internals
->nb_tx_queues)
+ if (tx_queue_id >=
dev->data
->nb_tx_queues)
return -ENODEV;
packet_size = internals->packet_size;
return -ENODEV;
packet_size = internals->packet_size;
@@
-279,7
+274,7
@@
eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
dev->data->tx_queues[tx_queue_id] =
&internals->tx_null_queues[tx_queue_id];
dummy_packet = rte_zmalloc_socket(NULL,
dev->data->tx_queues[tx_queue_id] =
&internals->tx_null_queues[tx_queue_id];
dummy_packet = rte_zmalloc_socket(NULL,
- packet_size, 0,
internals
->numa_node);
+ packet_size, 0,
dev->data
->numa_node);
if (dummy_packet == NULL)
return -ENOMEM;
if (dummy_packet == NULL)
return -ENOMEM;
@@
-323,7
+318,7
@@
eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats)
internal = dev->data->dev_private;
num_stats = RTE_MIN((unsigned)RTE_ETHDEV_QUEUE_STAT_CNTRS,
internal = dev->data->dev_private;
num_stats = RTE_MIN((unsigned)RTE_ETHDEV_QUEUE_STAT_CNTRS,
- RTE_MIN(
internal
->nb_rx_queues,
+ RTE_MIN(
dev->data
->nb_rx_queues,
RTE_DIM(internal->rx_null_queues)));
for (i = 0; i < num_stats; i++) {
igb_stats->q_ipackets[i] =
RTE_DIM(internal->rx_null_queues)));
for (i = 0; i < num_stats; i++) {
igb_stats->q_ipackets[i] =
@@
-332,7
+327,7
@@
eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats)
}
num_stats = RTE_MIN((unsigned)RTE_ETHDEV_QUEUE_STAT_CNTRS,
}
num_stats = RTE_MIN((unsigned)RTE_ETHDEV_QUEUE_STAT_CNTRS,
- RTE_MIN(
internal
->nb_tx_queues,
+ RTE_MIN(
dev->data
->nb_tx_queues,
RTE_DIM(internal->tx_null_queues)));
for (i = 0; i < num_stats; i++) {
igb_stats->q_opackets[i] =
RTE_DIM(internal->tx_null_queues)));
for (i = 0; i < num_stats; i++) {
igb_stats->q_opackets[i] =
@@
-522,7
+517,7
@@
eth_dev_null_create(const char *name,
goto error;
/* reserve an ethdev entry */
goto error;
/* reserve an ethdev entry */
- eth_dev = rte_eth_dev_allocate(name
, RTE_ETH_DEV_VIRTUAL
);
+ eth_dev = rte_eth_dev_allocate(name);
if (eth_dev == NULL)
goto error;
if (eth_dev == NULL)
goto error;
@@
-535,11
+530,9
@@
eth_dev_null_create(const char *name,
/* NOTE: we'll replace the data element, of originally allocated eth_dev
* so the nulls are local per-process */
/* NOTE: we'll replace the data element, of originally allocated eth_dev
* so the nulls are local per-process */
- internals->nb_rx_queues = nb_rx_queues;
- internals->nb_tx_queues = nb_tx_queues;
internals->packet_size = packet_size;
internals->packet_copy = packet_copy;
internals->packet_size = packet_size;
internals->packet_copy = packet_copy;
- internals->
numa_node = numa_node
;
+ internals->
port_id = eth_dev->data->port_id
;
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 = ETH_RSS_PROTO_MASK;
internals->reta_size = RTE_DIM(internals->reta_conf) * RTE_RETA_GROUP_SIZE;
@@
-560,10
+553,10
@@
eth_dev_null_create(const char *name,
TAILQ_INIT(ð_dev->link_intr_cbs);
eth_dev->driver = NULL;
TAILQ_INIT(ð_dev->link_intr_cbs);
eth_dev->driver = NULL;
-
eth_dev->
data->dev_flags = RTE_ETH_DEV_DETACHABLE;
-
eth_dev->
data->kdrv = RTE_KDRV_NONE;
-
eth_dev->
data->drv_name = drivername;
-
eth_dev->
data->numa_node = numa_node;
+ data->dev_flags = RTE_ETH_DEV_DETACHABLE;
+ data->kdrv = RTE_KDRV_NONE;
+ data->drv_name = drivername;
+ data->numa_node = numa_node;
/* finally assign rx and tx ops */
if (packet_copy) {
/* finally assign rx and tx ops */
if (packet_copy) {
@@
-693,11
+686,12
@@
rte_pmd_null_devuninit(const char *name)
return 0;
}
return 0;
}
-static struct rte_driver pmd_null_drv = {
- .name = "eth_null",
- .type = PMD_VDEV,
+static struct rte_vdev_driver pmd_null_drv = {
.init = rte_pmd_null_devinit,
.uninit = rte_pmd_null_devuninit,
};
.init = rte_pmd_null_devinit,
.uninit = rte_pmd_null_devuninit,
};
-PMD_REGISTER_DRIVER(pmd_null_drv);
+DRIVER_REGISTER_VDEV(net_null, pmd_null_drv);
+DRIVER_REGISTER_PARAM_STRING(net_null,
+ "size=<int> "
+ "copy=<int>");