#include <sys/ioctl.h>
#include <unistd.h>
-#if defined(RTE_EXEC_ENV_BSDAPP)
+#if defined(RTE_EXEC_ENV_FREEBSD)
#include <sys/sysctl.h>
#include <net/if_dl.h>
#endif
#include <rte_string_fns.h>
#define RTE_ETH_PCAP_SNAPSHOT_LEN 65535
-#define RTE_ETH_PCAP_SNAPLEN ETHER_MAX_JUMBO_FRAME_LEN
+#define RTE_ETH_PCAP_SNAPLEN RTE_ETHER_MAX_JUMBO_FRAME_LEN
#define RTE_ETH_PCAP_PROMISC 1
#define RTE_ETH_PCAP_TIMEOUT -1
#define ETH_PCAP_TX_IFACE_ARG "tx_iface"
#define ETH_PCAP_IFACE_ARG "iface"
#define ETH_PCAP_PHY_MAC_ARG "phy_mac"
+#define ETH_PCAP_INFINITE_RX_ARG "infinite_rx"
#define ETH_PCAP_ARG_MAXLEN 64
struct queue_stat rx_stat;
char name[PATH_MAX];
char type[ETH_PCAP_ARG_MAXLEN];
+
+ /* Contains pre-generated packets to be looped through */
+ struct rte_ring *pkts;
};
struct pcap_tx_queue {
struct pcap_rx_queue rx_queue[RTE_PMD_PCAP_MAX_QUEUES];
struct pcap_tx_queue tx_queue[RTE_PMD_PCAP_MAX_QUEUES];
char devargs[ETH_PCAP_ARG_MAXLEN];
- struct ether_addr eth_addr;
+ struct rte_ether_addr eth_addr;
int if_index;
int single_iface;
int phy_mac;
+ unsigned int infinite_rx;
};
struct pmd_process_private {
int phy_mac;
};
+struct pmd_devargs_all {
+ struct pmd_devargs rx_queues;
+ struct pmd_devargs tx_queues;
+ int single_iface;
+ unsigned int is_tx_pcap;
+ unsigned int is_tx_iface;
+ unsigned int infinite_rx;
+};
+
static const char *valid_arguments[] = {
ETH_PCAP_RX_PCAP_ARG,
ETH_PCAP_TX_PCAP_ARG,
ETH_PCAP_TX_IFACE_ARG,
ETH_PCAP_IFACE_ARG,
ETH_PCAP_PHY_MAC_ARG,
+ ETH_PCAP_INFINITE_RX_ARG,
NULL
};
}
}
+static uint16_t
+eth_pcap_rx_infinite(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
+{
+ int i;
+ struct pcap_rx_queue *pcap_q = queue;
+ uint32_t rx_bytes = 0;
+
+ if (unlikely(nb_pkts == 0))
+ return 0;
+
+ if (rte_pktmbuf_alloc_bulk(pcap_q->mb_pool, bufs, nb_pkts) != 0)
+ return 0;
+
+ for (i = 0; i < nb_pkts; i++) {
+ struct rte_mbuf *pcap_buf;
+ int err = rte_ring_dequeue(pcap_q->pkts, (void **)&pcap_buf);
+ if (err)
+ return i;
+
+ rte_memcpy(rte_pktmbuf_mtod(bufs[i], void *),
+ rte_pktmbuf_mtod(pcap_buf, void *),
+ pcap_buf->data_len);
+ bufs[i]->data_len = pcap_buf->data_len;
+ bufs[i]->pkt_len = pcap_buf->pkt_len;
+ bufs[i]->port = pcap_q->port_id;
+ rx_bytes += pcap_buf->data_len;
+
+ /* Enqueue packet back on ring to allow infinite rx. */
+ rte_ring_enqueue(pcap_q->pkts, pcap_buf);
+ }
+
+ pcap_q->rx_stat.pkts += i;
+ pcap_q->rx_stat.bytes += rx_bytes;
+
+ return i;
+}
+
static uint16_t
eth_pcap_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
{
pcap_dump((u_char *)dumper, &header,
rte_pktmbuf_mtod(mbuf, void*));
} else {
- if (mbuf->pkt_len <= ETHER_MAX_JUMBO_FRAME_LEN) {
+ if (mbuf->pkt_len <= RTE_ETHER_MAX_JUMBO_FRAME_LEN) {
eth_pcap_gather_data(tx_pcap_data, mbuf);
pcap_dump((u_char *)dumper, &header,
tx_pcap_data);
PMD_LOG(ERR,
"Dropping PCAP packet. Size (%d) > max jumbo size (%d).",
mbuf->pkt_len,
- ETHER_MAX_JUMBO_FRAME_LEN);
+ RTE_ETHER_MAX_JUMBO_FRAME_LEN);
- rte_pktmbuf_free(mbuf);
break;
}
}
return num_tx;
}
+/*
+ * Callback to handle dropping packets in the infinite rx case.
+ */
+static uint16_t
+eth_tx_drop(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
+{
+ unsigned int i;
+ uint32_t tx_bytes = 0;
+ struct pcap_tx_queue *tx_queue = queue;
+
+ if (unlikely(nb_pkts == 0))
+ return 0;
+
+ for (i = 0; i < nb_pkts; i++) {
+ tx_bytes += bufs[i]->data_len;
+ rte_pktmbuf_free(bufs[i]);
+ }
+
+ tx_queue->tx_stat.pkts += nb_pkts;
+ tx_queue->tx_stat.bytes += tx_bytes;
+
+ return i;
+}
+
/*
* Callback to handle sending packets through a real NIC.
*/
rte_pktmbuf_mtod(mbuf, u_char *),
mbuf->pkt_len);
} else {
- if (mbuf->pkt_len <= ETHER_MAX_JUMBO_FRAME_LEN) {
+ if (mbuf->pkt_len <= RTE_ETHER_MAX_JUMBO_FRAME_LEN) {
eth_pcap_gather_data(tx_pcap_data, mbuf);
ret = pcap_sendpacket(pcap,
tx_pcap_data, mbuf->pkt_len);
PMD_LOG(ERR,
"Dropping PCAP packet. Size (%d) > max jumbo size (%d).",
mbuf->pkt_len,
- ETHER_MAX_JUMBO_FRAME_LEN);
+ RTE_ETHER_MAX_JUMBO_FRAME_LEN);
- rte_pktmbuf_free(mbuf);
break;
}
}
return 0;
}
+static uint64_t
+count_packets_in_pcap(pcap_t **pcap, struct pcap_rx_queue *pcap_q)
+{
+ const u_char *packet;
+ struct pcap_pkthdr header;
+ uint64_t pcap_pkt_count = 0;
+
+ while ((packet = pcap_next(*pcap, &header)))
+ pcap_pkt_count++;
+
+ /* The pcap is reopened so it can be used as normal later. */
+ pcap_close(*pcap);
+ *pcap = NULL;
+ open_single_rx_pcap(pcap_q->name, pcap);
+
+ return pcap_pkt_count;
+}
+
static int
eth_dev_start(struct rte_eth_dev *dev)
{
i < dev->data->nb_tx_queues; i++) {
stats->q_opackets[i] = internal->tx_queue[i].tx_stat.pkts;
stats->q_obytes[i] = internal->tx_queue[i].tx_stat.bytes;
- stats->q_errors[i] = internal->tx_queue[i].tx_stat.err_pkts;
tx_packets_total += stats->q_opackets[i];
tx_bytes_total += stats->q_obytes[i];
- tx_packets_err_total += stats->q_errors[i];
+ tx_packets_err_total += internal->tx_queue[i].tx_stat.err_pkts;
}
stats->ipackets = rx_packets_total;
}
static void
-eth_dev_close(struct rte_eth_dev *dev __rte_unused)
+eth_dev_close(struct rte_eth_dev *dev)
{
+ unsigned int i;
+ struct pmd_internals *internals = dev->data->dev_private;
+
+ /* Device wide flag, but cleanup must be performed per queue. */
+ if (internals->infinite_rx) {
+ for (i = 0; i < dev->data->nb_rx_queues; i++) {
+ struct pcap_rx_queue *pcap_q = &internals->rx_queue[i];
+ struct rte_mbuf *pcap_buf;
+
+ while (!rte_ring_dequeue(pcap_q->pkts,
+ (void **)&pcap_buf))
+ rte_pktmbuf_free(pcap_buf);
+
+ rte_ring_free(pcap_q->pkts);
+ }
+ }
+
}
static void
pcap_q->queue_id = rx_queue_id;
dev->data->rx_queues[rx_queue_id] = pcap_q;
+ if (internals->infinite_rx) {
+ struct pmd_process_private *pp;
+ char ring_name[NAME_MAX];
+ static uint32_t ring_number;
+ uint64_t pcap_pkt_count = 0;
+ struct rte_mbuf *bufs[1];
+ pcap_t **pcap;
+
+ pp = rte_eth_devices[pcap_q->port_id].process_private;
+ pcap = &pp->rx_pcap[pcap_q->queue_id];
+
+ if (unlikely(*pcap == NULL))
+ return -ENOENT;
+
+ pcap_pkt_count = count_packets_in_pcap(pcap, pcap_q);
+
+ snprintf(ring_name, sizeof(ring_name), "PCAP_RING%" PRIu16,
+ ring_number);
+
+ pcap_q->pkts = rte_ring_create(ring_name,
+ rte_align64pow2(pcap_pkt_count + 1), 0,
+ RING_F_SP_ENQ | RING_F_SC_DEQ);
+ ring_number++;
+ if (!pcap_q->pkts)
+ return -ENOENT;
+
+ /* Fill ring with packets from PCAP file one by one. */
+ while (eth_pcap_rx(pcap_q, bufs, 1)) {
+ /* Check for multiseg mbufs. */
+ if (bufs[0]->nb_segs != 1) {
+ rte_pktmbuf_free(*bufs);
+
+ while (!rte_ring_dequeue(pcap_q->pkts,
+ (void **)bufs))
+ rte_pktmbuf_free(*bufs);
+
+ rte_ring_free(pcap_q->pkts);
+ PMD_LOG(ERR, "Multiseg mbufs are not supported in infinite_rx "
+ "mode.");
+ return -EINVAL;
+ }
+
+ rte_ring_enqueue_bulk(pcap_q->pkts,
+ (void * const *)bufs, 1, NULL);
+ }
+ /*
+ * Reset the stats for this queue since eth_pcap_rx calls above
+ * didn't result in the application receiving packets.
+ */
+ pcap_q->rx_stat.pkts = 0;
+ pcap_q->rx_stat.bytes = 0;
+ }
+
return 0;
}
return 0;
}
-static struct rte_vdev_driver pmd_pcap_drv;
+static int
+get_infinite_rx_arg(const char *key __rte_unused,
+ const char *value, void *extra_args)
+{
+ if (extra_args) {
+ const int infinite_rx = atoi(value);
+ int *enable_infinite_rx = extra_args;
+
+ if (infinite_rx > 0)
+ *enable_infinite_rx = 1;
+ }
+ return 0;
+}
static int
pmd_init_internals(struct rte_vdev_device *vdev,
* derived from: 'locally administered':'p':'c':'a':'p':'iface_idx'
* where the middle 4 characters are converted to hex.
*/
- (*internals)->eth_addr = (struct ether_addr) {
+ (*internals)->eth_addr = (struct rte_ether_addr) {
.addr_bytes = { 0x02, 0x70, 0x63, 0x61, 0x70, iface_idx++ }
};
(*internals)->phy_mac = 0;
eth_pcap_update_mac(const char *if_name, struct rte_eth_dev *eth_dev,
const unsigned int numa_node)
{
-#if defined(RTE_EXEC_ENV_LINUXAPP)
+#if defined(RTE_EXEC_ENV_LINUX)
void *mac_addrs;
struct ifreq ifr;
int if_fd = socket(AF_INET, SOCK_DGRAM, 0);
return -1;
}
- mac_addrs = rte_zmalloc_socket(NULL, ETHER_ADDR_LEN, 0, numa_node);
+ mac_addrs = rte_zmalloc_socket(NULL, RTE_ETHER_ADDR_LEN, 0, numa_node);
if (!mac_addrs) {
close(if_fd);
return -1;
PMD_LOG(INFO, "Setting phy MAC for %s", if_name);
eth_dev->data->mac_addrs = mac_addrs;
rte_memcpy(eth_dev->data->mac_addrs[0].addr_bytes,
- ifr.ifr_hwaddr.sa_data, ETHER_ADDR_LEN);
+ ifr.ifr_hwaddr.sa_data, RTE_ETHER_ADDR_LEN);
close(if_fd);
return 0;
-#elif defined(RTE_EXEC_ENV_BSDAPP)
+#elif defined(RTE_EXEC_ENV_FREEBSD)
void *mac_addrs;
struct if_msghdr *ifm;
struct sockaddr_dl *sdl;
ifm = (struct if_msghdr *)buf;
sdl = (struct sockaddr_dl *)(ifm + 1);
- mac_addrs = rte_zmalloc_socket(NULL, ETHER_ADDR_LEN, 0, numa_node);
+ mac_addrs = rte_zmalloc_socket(NULL, RTE_ETHER_ADDR_LEN, 0, numa_node);
if (!mac_addrs) {
rte_free(buf);
return -1;
PMD_LOG(INFO, "Setting phy MAC for %s", if_name);
eth_dev->data->mac_addrs = mac_addrs;
rte_memcpy(eth_dev->data->mac_addrs[0].addr_bytes,
- LLADDR(sdl), ETHER_ADDR_LEN);
+ LLADDR(sdl), RTE_ETHER_ADDR_LEN);
rte_free(buf);
static int
eth_from_pcaps_common(struct rte_vdev_device *vdev,
- struct pmd_devargs *rx_queues, const unsigned int nb_rx_queues,
- struct pmd_devargs *tx_queues, const unsigned int nb_tx_queues,
+ struct pmd_devargs_all *devargs_all,
struct pmd_internals **internals, struct rte_eth_dev **eth_dev)
{
struct pmd_process_private *pp;
+ struct pmd_devargs *rx_queues = &devargs_all->rx_queues;
+ struct pmd_devargs *tx_queues = &devargs_all->tx_queues;
+ const unsigned int nb_rx_queues = rx_queues->num_of_queue;
+ const unsigned int nb_tx_queues = tx_queues->num_of_queue;
unsigned int i;
/* do some parameter checking */
struct devargs_queue *queue = &rx_queues->queue[i];
pp->rx_pcap[i] = queue->pcap;
- snprintf(rx->name, sizeof(rx->name), "%s", queue->name);
- snprintf(rx->type, sizeof(rx->type), "%s", queue->type);
+ strlcpy(rx->name, queue->name, sizeof(rx->name));
+ strlcpy(rx->type, queue->type, sizeof(rx->type));
}
for (i = 0; i < nb_tx_queues; i++) {
pp->tx_dumper[i] = queue->dumper;
pp->tx_pcap[i] = queue->pcap;
- snprintf(tx->name, sizeof(tx->name), "%s", queue->name);
- snprintf(tx->type, sizeof(tx->type), "%s", queue->type);
+ strlcpy(tx->name, queue->name, sizeof(tx->name));
+ strlcpy(tx->type, queue->type, sizeof(tx->type));
}
return 0;
static int
eth_from_pcaps(struct rte_vdev_device *vdev,
- struct pmd_devargs *rx_queues, const unsigned int nb_rx_queues,
- struct pmd_devargs *tx_queues, const unsigned int nb_tx_queues,
- int single_iface, unsigned int using_dumpers)
+ struct pmd_devargs_all *devargs_all)
{
struct pmd_internals *internals = NULL;
struct rte_eth_dev *eth_dev = NULL;
+ struct pmd_devargs *rx_queues = &devargs_all->rx_queues;
+ int single_iface = devargs_all->single_iface;
+ unsigned int infinite_rx = devargs_all->infinite_rx;
int ret;
- ret = eth_from_pcaps_common(vdev, rx_queues, nb_rx_queues,
- tx_queues, nb_tx_queues, &internals, ð_dev);
+ ret = eth_from_pcaps_common(vdev, devargs_all, &internals, ð_dev);
if (ret < 0)
return ret;
}
}
- eth_dev->rx_pkt_burst = eth_pcap_rx;
+ internals->infinite_rx = infinite_rx;
+ /* Assign rx ops. */
+ if (infinite_rx)
+ eth_dev->rx_pkt_burst = eth_pcap_rx_infinite;
+ else
+ eth_dev->rx_pkt_burst = eth_pcap_rx;
- if (using_dumpers)
+ /* Assign tx ops. */
+ if (devargs_all->is_tx_pcap)
eth_dev->tx_pkt_burst = eth_pcap_tx_dumper;
- else
+ else if (devargs_all->is_tx_iface)
eth_dev->tx_pkt_burst = eth_pcap_tx;
+ else
+ eth_dev->tx_pkt_burst = eth_tx_drop;
rte_eth_dev_probing_finish(eth_dev);
return 0;
pmd_pcap_probe(struct rte_vdev_device *dev)
{
const char *name;
- unsigned int is_rx_pcap = 0, is_tx_pcap = 0;
+ unsigned int is_rx_pcap = 0;
struct rte_kvargs *kvlist;
struct pmd_devargs pcaps = {0};
struct pmd_devargs dumpers = {0};
struct rte_eth_dev *eth_dev = NULL;
struct pmd_internals *internal;
- int single_iface = 0;
int ret;
+ struct pmd_devargs_all devargs_all = {
+ .single_iface = 0,
+ .is_tx_pcap = 0,
+ .is_tx_iface = 0,
+ .infinite_rx = 0,
+ };
+
name = rte_vdev_device_name(dev);
PMD_LOG(INFO, "Initializing pmd_pcap for %s", name);
dumpers.phy_mac = pcaps.phy_mac;
- single_iface = 1;
+ devargs_all.single_iface = 1;
pcaps.num_of_queue = 1;
dumpers.num_of_queue = 1;
pcaps.num_of_queue = 0;
if (is_rx_pcap) {
+ /*
+ * We check whether we want to infinitely rx the pcap file.
+ */
+ unsigned int infinite_rx_arg_cnt = rte_kvargs_count(kvlist,
+ ETH_PCAP_INFINITE_RX_ARG);
+
+ if (infinite_rx_arg_cnt == 1) {
+ ret = rte_kvargs_process(kvlist,
+ ETH_PCAP_INFINITE_RX_ARG,
+ &get_infinite_rx_arg,
+ &devargs_all.infinite_rx);
+ if (ret < 0)
+ goto free_kvlist;
+ PMD_LOG(INFO, "infinite_rx has been %s for %s",
+ devargs_all.infinite_rx ? "enabled" : "disabled",
+ name);
+
+ } else if (infinite_rx_arg_cnt > 1) {
+ PMD_LOG(WARNING, "infinite_rx has not been enabled since the "
+ "argument has been provided more than once "
+ "for %s", name);
+ }
+
ret = rte_kvargs_process(kvlist, ETH_PCAP_RX_PCAP_ARG,
&open_rx_pcap, &pcaps);
} else {
goto free_kvlist;
/*
- * We check whether we want to open a TX stream to a real NIC or a
- * pcap file
+ * We check whether we want to open a TX stream to a real NIC,
+ * a pcap file, or drop packets on tx
*/
- is_tx_pcap = rte_kvargs_count(kvlist, ETH_PCAP_TX_PCAP_ARG) ? 1 : 0;
+ devargs_all.is_tx_pcap =
+ rte_kvargs_count(kvlist, ETH_PCAP_TX_PCAP_ARG) ? 1 : 0;
+ devargs_all.is_tx_iface =
+ rte_kvargs_count(kvlist, ETH_PCAP_TX_IFACE_ARG) ? 1 : 0;
dumpers.num_of_queue = 0;
- if (is_tx_pcap)
+ if (devargs_all.is_tx_pcap) {
ret = rte_kvargs_process(kvlist, ETH_PCAP_TX_PCAP_ARG,
&open_tx_pcap, &dumpers);
- else
+ } else if (devargs_all.is_tx_iface) {
ret = rte_kvargs_process(kvlist, ETH_PCAP_TX_IFACE_ARG,
&open_tx_iface, &dumpers);
+ } else {
+ unsigned int i;
+
+ PMD_LOG(INFO, "Dropping packets on tx since no tx queues were provided.");
+
+ /* Add 1 dummy queue per rxq which counts and drops packets. */
+ for (i = 0; i < pcaps.num_of_queue; i++)
+ ret = add_queue(&dumpers, "dummy", "tx_drop", NULL,
+ NULL);
+ }
if (ret < 0)
goto free_kvlist;
if (pp == NULL) {
PMD_LOG(ERR,
"Failed to allocate memory for process private");
- return -1;
+ ret = -1;
+ goto free_kvlist;
}
eth_dev->dev_ops = &ops;
eth_dev->process_private = pp;
eth_dev->rx_pkt_burst = eth_pcap_rx;
- if (is_tx_pcap)
+ if (devargs_all.is_tx_pcap)
eth_dev->tx_pkt_burst = eth_pcap_tx_dumper;
else
eth_dev->tx_pkt_burst = eth_pcap_tx;
rte_eth_dev_probing_finish(eth_dev);
- return 0;
+ goto free_kvlist;
}
- ret = eth_from_pcaps(dev, &pcaps, pcaps.num_of_queue, &dumpers,
- dumpers.num_of_queue, single_iface, is_tx_pcap);
+ devargs_all.rx_queues = pcaps;
+ devargs_all.tx_queues = dumpers;
+
+ ret = eth_from_pcaps(dev, &devargs_all);
free_kvlist:
rte_kvargs_free(kvlist);
eth_dev->data->mac_addrs = NULL;
}
+ eth_dev_close(eth_dev);
+
rte_free(eth_dev->process_private);
rte_eth_dev_release_port(eth_dev);
ETH_PCAP_RX_IFACE_IN_ARG "=<ifc> "
ETH_PCAP_TX_IFACE_ARG "=<ifc> "
ETH_PCAP_IFACE_ARG "=<ifc> "
- ETH_PCAP_PHY_MAC_ARG "=<int>");
+ ETH_PCAP_PHY_MAC_ARG "=<int>"
+ ETH_PCAP_INFINITE_RX_ARG "=<0|1>");
RTE_INIT(eth_pcap_init_log)
{
git.droids-corp.org / dpdk.git / blobdiff