diff options
author | 2016-09-19 13:31:49 +0200 | |
---|---|---|
committer | 2016-09-20 22:26:14 +0000 | |
commit | a7cc4479db4b3be0eb2b3ebf7cb569a0a4ed0c17 (patch) | |
tree | 0e69e62d55f0433c8cc5925b854ddbe37df1f441 /vnet | |
parent | 56431702209f9ae32ef3bfc2b61b41ff9ddf89e9 (diff) |
dpdk: move number of sub-interfaces to 2nd cacheline, introduce flag
This saves 2 bytes from the 1st cacheline.
Change-Id: I691a3a0ee07ec2db4ae85b96b451ef53ad8c9458
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet')
-rw-r--r-- | vnet/vnet/devices/dpdk/device.c | 42 | ||||
-rw-r--r-- | vnet/vnet/devices/dpdk/dpdk.h | 7 | ||||
-rw-r--r-- | vnet/vnet/devices/dpdk/node.c | 3 |
3 files changed, 32 insertions, 20 deletions
diff --git a/vnet/vnet/devices/dpdk/device.c b/vnet/vnet/devices/dpdk/device.c index be54bd27..119d6039 100644 --- a/vnet/vnet/devices/dpdk/device.c +++ b/vnet/vnet/devices/dpdk/device.c @@ -1165,27 +1165,29 @@ dpdk_subif_add_del_function (vnet_main_t * vnm, dpdk_device_t *xd = vec_elt_at_index (xm->devices, hw->dev_instance); vnet_sw_interface_t *t = (vnet_sw_interface_t *) st; int r, vlan_offload; - u32 prev_subifs = xd->vlan_subifs; + u32 prev_subifs = xd->num_subifs; + clib_error_t *err = 0; if (is_add) - xd->vlan_subifs++; - else if (xd->vlan_subifs) - xd->vlan_subifs--; + xd->num_subifs++; + else if (xd->num_subifs) + xd->num_subifs--; if ((xd->flags & DPDK_DEVICE_FLAG_PMD) == 0) - return 0; + goto done; /* currently we program VLANS only for IXGBE VF and I40E VF */ if ((xd->pmd != VNET_DPDK_PMD_IXGBEVF) && (xd->pmd != VNET_DPDK_PMD_I40EVF)) - return 0; + goto done; if (t->sub.eth.flags.no_tags == 1) - return 0; + goto done; if ((t->sub.eth.flags.one_tag != 1) || (t->sub.eth.flags.exact_match != 1)) { - xd->vlan_subifs = prev_subifs; - return clib_error_return (0, "unsupported VLAN setup"); + xd->num_subifs = prev_subifs; + err = clib_error_return (0, "unsupported VLAN setup"); + goto done; } vlan_offload = rte_eth_dev_get_vlan_offload (xd->device_index); @@ -1193,9 +1195,10 @@ dpdk_subif_add_del_function (vnet_main_t * vnm, if ((r = rte_eth_dev_set_vlan_offload (xd->device_index, vlan_offload))) { - xd->vlan_subifs = prev_subifs; - return clib_error_return (0, "rte_eth_dev_set_vlan_offload[%d]: err %d", - xd->device_index, r); + xd->num_subifs = prev_subifs; + err = clib_error_return (0, "rte_eth_dev_set_vlan_offload[%d]: err %d", + xd->device_index, r); + goto done; } @@ -1203,12 +1206,19 @@ dpdk_subif_add_del_function (vnet_main_t * vnm, rte_eth_dev_vlan_filter (xd->device_index, t->sub.eth.outer_vlan_id, is_add))) { - xd->vlan_subifs = prev_subifs; - return clib_error_return (0, "rte_eth_dev_vlan_filter[%d]: err %d", - xd->device_index, r); + xd->num_subifs = prev_subifs; + err = clib_error_return (0, "rte_eth_dev_vlan_filter[%d]: err %d", + xd->device_index, r); + goto done; } - return 0; +done: + if (xd->num_subifs) + xd->flags |= DPDK_DEVICE_FLAG_HAVE_SUBIF; + else + xd->flags &= ~DPDK_DEVICE_FLAG_HAVE_SUBIF; + + return err; } /* *INDENT-OFF* */ diff --git a/vnet/vnet/devices/dpdk/dpdk.h b/vnet/vnet/devices/dpdk/dpdk.h index 025ebf4c..2cb301ce 100644 --- a/vnet/vnet/devices/dpdk/dpdk.h +++ b/vnet/vnet/devices/dpdk/dpdk.h @@ -203,9 +203,6 @@ typedef struct /* vector of traced contexts, per device */ u32 *d_trace_buffers; - /* number of sub-interfaces */ - u16 vlan_subifs; - dpdk_pmd_t pmd:8; i8 cpu_socket; @@ -215,11 +212,15 @@ typedef struct #define DPDK_DEVICE_FLAG_PMD (1 << 2) #define DPDK_DEVICE_FLAG_KNI (1 << 3) #define DPDK_DEVICE_FLAG_VHOST_USER (1 << 4) +#define DPDK_DEVICE_FLAG_HAVE_SUBIF (1 << 5) CLIB_CACHE_LINE_ALIGN_MARK (cacheline1); u8 *interface_name_suffix; + /* number of sub-interfaces */ + u16 num_subifs; + /* PMD related */ u16 tx_q_used; u16 rx_q_used; diff --git a/vnet/vnet/devices/dpdk/node.c b/vnet/vnet/devices/dpdk/node.c index 5852b3dc..a9e286e5 100644 --- a/vnet/vnet/devices/dpdk/node.c +++ b/vnet/vnet/devices/dpdk/node.c @@ -121,7 +121,8 @@ dpdk_rx_next_and_error_from_mb_flags_x1 (dpdk_device_t * xd, HANDOFF_DISPATCH_NEXT_ETHERNET_INPUT; } else - if (PREDICT_FALSE (xd->vlan_subifs || (mb_flags & PKT_RX_VLAN_PKT))) + if (PREDICT_FALSE ((xd->flags & DPDK_DEVICE_FLAG_HAVE_SUBIF) || + (mb_flags & PKT_RX_VLAN_PKT))) n0 = DPDK_RX_NEXT_ETHERNET_INPUT; else { |