ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

features: take device-input buffer advance value directly

Browse Source 
Change-Id: Ifac7d9134d03d79164ce6f06ae9413279bbaadb3
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2017-03-06 12:02:50 +01:00
committed by Neale Ranns
parent 0e2e0dfe8b
commit 35af9e50cd
7 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/dpdk/device/node.c
View File

@ -439,9 +439,7 @@ dpdk_device_input (dpdk_main_t * dm, dpdk_device_t * xd,
/* Do we have any driver RX features configured on the interface? */
vnet_feature_start_device_input_x4 (xd->vlib_sw_if_index,
&next0, &next1, &next2, &next3,
b0, b1, b2, b3,
l3_offset0, l3_offset1,
l3_offset2, l3_offset3);
b0, b1, b2, b3);
vlib_validate_buffer_enqueue_x4 (vm, node, next_index,
to_next, n_left_to_next,
@ -502,7 +500,7 @@ dpdk_device_input (dpdk_main_t * dm, dpdk_device_t * xd,
/* Do we have any driver RX features configured on the interface? */
vnet_feature_start_device_input_x1 (xd->vlib_sw_if_index, &next0,
b0, l3_offset0);
b0);
vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
to_next, n_left_to_next,

3
src/vnet/devices/af_packet/node.c
View File

@ -216,8 +216,7 @@ af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
}
/* redirect if feature path enabled */
vnet_feature_start_device_input_x1 (apif->sw_if_index, &next0, b0,
0);
vnet_feature_start_device_input_x1 (apif->sw_if_index, &next0, b0);
/* enque and take next packet */
vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,

2
src/vnet/devices/netmap/node.c
View File

@ -218,7 +218,7 @@ netmap_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
/* redirect if feature path enabled */
vnet_feature_start_device_input_x1 (nif->sw_if_index, &next0,
first_b0, 0);
first_b0);
/* enque and take next packet */
vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,

2
src/vnet/devices/virtio/vhost-user.c
View File

@ -1747,7 +1747,7 @@ vhost_user_if_input (vlib_main_t * vm,
/* redirect if feature path enabled */
vnet_feature_start_device_input_x1 (vui->sw_if_index, &next0,
b_head, 0);
b_head);
u32 bi = to_next[-1]; //Cannot use to_next[-1] in the macro
vlib_validate_buffer_enqueue_x1 (vm, node, next_index,

62
src/vnet/feature/feature.h
View File

@ -18,6 +18,7 @@
#include <vnet/vnet.h>
#include <vnet/api_errno.h>
#include <vnet/devices/devices.h>
/** feature registration object */
typedef struct _vnet_feature_arc_registration
@ -227,7 +228,7 @@ vnet_feature_next (u32 sw_if_index, u32 * next0, vlib_buffer_t * b0)
static_always_inline void
vnet_feature_start_device_input_x1 (u32 sw_if_index, u32 * next0,
vlib_buffer_t * b0, u16 buffer_advanced0)
vlib_buffer_t * b0)
{
vnet_feature_main_t *fm = &feature_main;
vnet_feature_config_main_t *cm;
@ -242,9 +243,12 @@ vnet_feature_start_device_input_x1 (u32 sw_if_index, u32 * next0,
* Save next0 so that the last feature in the chain
* can skip ethernet-input if indicated...
*/
u16 adv;
vnet_buffer (b0)->device_input_feat.saved_next_index = *next0;
vnet_buffer (b0)->device_input_feat.buffer_advance = buffer_advanced0;
vlib_buffer_advance (b0, -buffer_advanced0);
adv = device_input_next_node_advance[*next0];
vnet_buffer (b0)->device_input_feat.buffer_advance = adv;
vlib_buffer_advance (b0, -adv);
b0->feature_arc_index = feature_arc_index;
b0->current_config_index =
@ -258,10 +262,7 @@ static_always_inline void
vnet_feature_start_device_input_x2 (u32 sw_if_index,
u32 * next0,
u32 * next1,
vlib_buffer_t * b0,
vlib_buffer_t * b1,
u16 buffer_advanced0,
u16 buffer_advanced1)
vlib_buffer_t * b0, vlib_buffer_t * b1)
{
vnet_feature_main_t *fm = &feature_main;
vnet_feature_config_main_t *cm;
@ -276,12 +277,17 @@ vnet_feature_start_device_input_x2 (u32 sw_if_index,
* Save next0 so that the last feature in the chain
* can skip ethernet-input if indicated...
*/
u16 adv;
vnet_buffer (b0)->device_input_feat.saved_next_index = *next0;
adv = device_input_next_node_advance[*next0];
vnet_buffer (b0)->device_input_feat.buffer_advance = adv;
vlib_buffer_advance (b0, -adv);
vnet_buffer (b1)->device_input_feat.saved_next_index = *next1;
vnet_buffer (b0)->device_input_feat.buffer_advance = buffer_advanced0;
vnet_buffer (b1)->device_input_feat.buffer_advance = buffer_advanced1;
vlib_buffer_advance (b0, -buffer_advanced0);
vlib_buffer_advance (b1, -buffer_advanced1);
adv = device_input_next_node_advance[*next1];
vnet_buffer (b1)->device_input_feat.buffer_advance = adv;
vlib_buffer_advance (b1, -adv);
b0->feature_arc_index = feature_arc_index;
b1->feature_arc_index = feature_arc_index;
@ -303,12 +309,7 @@ vnet_feature_start_device_input_x4 (u32 sw_if_index,
u32 * next3,
vlib_buffer_t * b0,
vlib_buffer_t * b1,
vlib_buffer_t * b2,
vlib_buffer_t * b3,
u16 buffer_advanced0,
u16 buffer_advanced1,
u16 buffer_advanced2,
u16 buffer_advanced3)
vlib_buffer_t * b2, vlib_buffer_t * b3)
{
vnet_feature_main_t *fm = &feature_main;
vnet_feature_config_main_t *cm;
@ -323,20 +324,27 @@ vnet_feature_start_device_input_x4 (u32 sw_if_index,
* Save next0 so that the last feature in the chain
* can skip ethernet-input if indicated...
*/
u16 adv;
vnet_buffer (b0)->device_input_feat.saved_next_index = *next0;
adv = device_input_next_node_advance[*next0];
vnet_buffer (b0)->device_input_feat.buffer_advance = adv;
vlib_buffer_advance (b0, -adv);
vnet_buffer (b1)->device_input_feat.saved_next_index = *next1;
adv = device_input_next_node_advance[*next1];
vnet_buffer (b1)->device_input_feat.buffer_advance = adv;
vlib_buffer_advance (b1, -adv);
vnet_buffer (b2)->device_input_feat.saved_next_index = *next2;
adv = device_input_next_node_advance[*next2];
vnet_buffer (b2)->device_input_feat.buffer_advance = adv;
vlib_buffer_advance (b2, -adv);
vnet_buffer (b3)->device_input_feat.saved_next_index = *next3;
vnet_buffer (b0)->device_input_feat.buffer_advance = buffer_advanced0;
vnet_buffer (b1)->device_input_feat.buffer_advance = buffer_advanced1;
vnet_buffer (b2)->device_input_feat.buffer_advance = buffer_advanced2;
vnet_buffer (b3)->device_input_feat.buffer_advance = buffer_advanced3;
vlib_buffer_advance (b0, -buffer_advanced0);
vlib_buffer_advance (b1, -buffer_advanced1);
vlib_buffer_advance (b2, -buffer_advanced2);
vlib_buffer_advance (b3, -buffer_advanced3);
adv = device_input_next_node_advance[*next3];
vnet_buffer (b3)->device_input_feat.buffer_advance = adv;
vlib_buffer_advance (b3, -adv);
b0->feature_arc_index = feature_arc_index;
b1->feature_arc_index = feature_arc_index;

3
src/vnet/unix/tapcli.c
View File

@ -355,8 +355,7 @@ static uword tapcli_rx_iface(vlib_main_t * vm,
to_next++;
n_left_to_next--;
vnet_feature_start_device_input_x1 (ti->sw_if_index, &next_index,
b_first, 0);
vnet_feature_start_device_input_x1 (ti->sw_if_index, &next_index, b_first);
vlib_validate_buffer_enqueue_x1 (vm, node, next,
to_next, n_left_to_next,

2
src/vnet/unix/tuntap.c
View File

@ -351,7 +351,7 @@ tuntap_rx (vlib_main_t * vm,
next_index = VNET_DEVICE_INPUT_NEXT_DROP;
}
vnet_feature_start_device_input_x1 (tm->sw_if_index, &next_index, b, 0);
vnet_feature_start_device_input_x1 (tm->sw_if_index, &next_index, b);
vlib_set_next_frame_buffer (vm, node, next_index, bi);