diff options
| author |   Dave Barach <dave@barachs.net> | 2019-02-25 15:27:28 -0500 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-02-26 11:30:29 +0000 |
| commit | 5ecd5a5d159332a964dd840fcdabe5f8d3111b0e (patch) | |
| tree | 99c6fbcd96efce44215bb06363126acfa88f8fb0 /src/plugins/dpdk/device/device.c | |
| parent | f6defa113e2e10a70c5a92ce7e14b7a532154409 (diff) | |
Move pcap rx/tx trace code out of the dpdk plugin
Moved code to the ethernet input node, and the interface output
path(s). Since we no longer skip ethernet-input, there's no reason
for device drivers to know anything about pcap rx tracing, etc.
Change-Id: I08d32fb1b90cbee1bd4f609837d533e047b36fa4
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/plugins/dpdk/device/device.c')
| -rw-r--r-- | src/plugins/dpdk/device/device.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c index 466abc37e68..6285d93ac96 100644 --- a/src/plugins/dpdk/device/device.c +++ b/src/plugins/dpdk/device/device.c @@ -271,7 +271,6 @@ VNET_DEVICE_CLASS_TX_FN (dpdk_device_class) (vlib_main_t * vm, dpdk_device_t *xd = vec_elt_at_index (dm->devices, rd->dev_instance); u32 n_packets = f->n_vectors; u32 n_left; - u32 *from; u32 thread_index = vm->thread_index; int queue_id = thread_index; u32 tx_pkts = 0, all_or_flags = 0; @@ -280,33 +279,13 @@ VNET_DEVICE_CLASS_TX_FN (dpdk_device_class) (vlib_main_t * vm, struct rte_mbuf **mb; vlib_buffer_t *b[4]; - from = vlib_frame_vector_args (f); - ASSERT (n_packets <= VLIB_FRAME_SIZE); - /* TX PCAP tracing */ - if (PREDICT_FALSE (dm->pcap[VLIB_TX].pcap_enable)) - { - n_left = n_packets; - while (n_left > 0) - { - u32 bi0 = from[0]; - vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0); - if (dm->pcap[VLIB_TX].pcap_sw_if_index == 0 || - dm->pcap[VLIB_TX].pcap_sw_if_index - == vnet_buffer (b0)->sw_if_index[VLIB_TX]) - pcap_add_buffer (&dm->pcap[VLIB_TX].pcap_main, vm, bi0, 512); - from++; - n_left--; - } - } - /* calculate rte_mbuf pointers out of buffer indices */ vlib_get_buffers_with_offset (vm, vlib_frame_vector_args (f), (void **) ptd->mbufs, n_packets, -(i32) sizeof (struct rte_mbuf)); - from = vlib_frame_vector_args (f); n_left = n_packets; mb = ptd->mbufs; |