summaryrefslogtreecommitdiffstats
path: root/src/plugins/dpdk
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-04-13 19:43:39 +0200
committerDamjan Marion <damarion@cisco.com>2018-04-13 19:45:57 +0200
commitfe7d4a2e31529eed5416b38b520fdc84687df03c (patch)
treedd3e603fc305d486840f844d919c87f5d0b4b101 /src/plugins/dpdk
parentbca9290056b1ee206a05c13bbb46b1b40a8bd804 (diff)
Revert "MTU: Setting of MTU on software interface (instead of hardware interface)"
This reverts commit 70083ee74c3141bbefb185525315f1b34497dcaa. Reverting as this patch is causing following crash: 0: /home/damarion/cisco/vpp3/build-data/../src/vnet/devices/devices.h:131 (vnet_get_device_input_thread_index) assertion `queue_id < vec_len (hw->input_node_thread_index_by_queue)' fails Aborted Change-Id: Ie2a365032110b1f67be7a9d832885b9899813d39 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins/dpdk')
-rwxr-xr-xsrc/plugins/dpdk/device/init.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
index ac20edca303..76d122d37d5 100755
--- a/src/plugins/dpdk/device/init.c
+++ b/src/plugins/dpdk/device/init.c
@@ -696,9 +696,12 @@ dpdk_lib_init (dpdk_main_t * dm)
clib_warning ("VLAN strip cannot be supported by interface\n");
}
- vnet_sw_interface_set_mtu (dm->vnet_main, sw->sw_if_index,
- xd->port_conf.rxmode.max_rx_pkt_len -
- sizeof (ethernet_header_t));
+ if (hi)
+ hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] =
+ xd->port_conf.rxmode.max_rx_pkt_len - sizeof (ethernet_header_t);
+ else
+ clib_warning ("hi NULL");
+
rte_eth_dev_set_mtu (xd->device_index, mtu);
}
@@ -1527,10 +1530,9 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
/* Init l3 packet size allowed on bonded interface */
bhi->max_packet_bytes = ETHERNET_MAX_PACKET_BYTES;
- vnet_sw_interface_set_mtu (vnm, bhi->sw_if_index,
- ETHERNET_MAX_PACKET_BYTES -
- sizeof (ethernet_header_t));
-
+ bhi->max_l3_packet_bytes[VLIB_RX] =
+ bhi->max_l3_packet_bytes[VLIB_TX] =
+ ETHERNET_MAX_PACKET_BYTES - sizeof (ethernet_header_t);
while (nlink >= 1)
{ /* for all slave links */
int slave = slink[--nlink];
@@ -1568,13 +1570,11 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
clib_memcpy (shi->hw_address, addr, 6);
clib_memcpy (sei->address, addr, 6);
/* Set l3 packet size allowed as the lowest of slave */
- vnet_sw_interface_t *bsi =
- vnet_get_sw_interface (vnm, bhi->sw_if_index);
- if (bsi->max_l3_packet_bytes[VLIB_RX] >
- ssi->max_l3_packet_bytes[VLIB_RX])
- bsi->max_l3_packet_bytes[VLIB_RX] =
- bsi->max_l3_packet_bytes[VLIB_TX] =
- ssi->max_l3_packet_bytes[VLIB_RX];
+ if (bhi->max_l3_packet_bytes[VLIB_RX] >
+ shi->max_l3_packet_bytes[VLIB_RX])
+ bhi->max_l3_packet_bytes[VLIB_RX] =
+ bhi->max_l3_packet_bytes[VLIB_TX] =
+ shi->max_l3_packet_bytes[VLIB_RX];
/* Set max packet size allowed as the lowest of slave */
if (bhi->max_packet_bytes > shi->max_packet_bytes)
bhi->max_packet_bytes = shi->max_packet_bytes;