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

dpdk: don't mask interrupts for some drivers

Browse Source 
It is well known that for some NICs, masking
interrupts results in delaying desc writebacks,
which breaks poll mode. This fix introduces an
"int-unmaskable" dpdk device flag to identify such
devices (typically Intel FVL). For such devices,
interrupts are masked by a call to
file_update(...,UNIX_FILE_UPDATE_DELETE) instead
of rte_eth_dev_rx_intr_disable (...)

Change-Id: Ifbc701aebe8572319b7aae19382bd683a47fc3cf
Type: fix
Fixes: 19ff0c3699
Signed-off-by: Mohammed Hawari <mohammed@hawari.fr>
This commit is contained in:
Mohammed Hawari
2021-03-18 12:02:08 +01:00
committed by Florin Coras
parent aa7a2a1f32
commit 34c54dff5c
4 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/dpdk/device/common.c
View File

@ -202,7 +202,8 @@ dpdk_setup_interrupts (dpdk_device_t *xd)
else
{
xd->flags |= DPDK_DEVICE_FLAG_INT_SUPPORTED;
rte_eth_dev_rx_intr_disable (xd->port_id, 0);
if (!(xd->flags & DPDK_DEVICE_FLAG_INT_UNMASKABLE))
rte_eth_dev_rx_intr_disable (xd->port_id, 0);
dpdk_log_info ("Probe for interrupt mode for device %U. Success.\n",
format_dpdk_device_name, xd->port_id);
}
@ -230,6 +231,13 @@ dpdk_setup_interrupts (dpdk_device_t *xd)
rxq->clib_file_index = clib_file_add (&file_main, &f);
vnet_hw_if_set_rx_queue_file_index (vnm, rxq->queue_index,
rxq->clib_file_index);
if (xd->flags & DPDK_DEVICE_FLAG_INT_UNMASKABLE)
{
clib_file_main_t *fm = &file_main;
clib_file_t *f =
pool_elt_at_index (fm->file_pool, rxq->clib_file_index);
fm->file_update (f, UNIX_FILE_UPDATE_DELETE);
}
}
}
vnet_hw_if_update_runtime_data (vnm, xd->hw_if_index);

21
src/plugins/dpdk/device/device.c
View File

@ -22,6 +22,7 @@
#include <dpdk/device/dpdk.h>
#include <dpdk/device/dpdk_priv.h>
#include <vppinfra/error.h>
#include <vlib/unix/unix.h>
#define foreach_dpdk_tx_func_error \
_(BAD_RETVAL, "DPDK tx function returned an error") \
@ -701,13 +702,29 @@ dpdk_interface_rx_mode_change (vnet_main_t *vnm, u32 hw_if_index, u32 qid,
dpdk_main_t *xm = &dpdk_main;
vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
dpdk_device_t *xd = vec_elt_at_index (xm->devices, hw->dev_instance);
clib_file_main_t *fm = &file_main;
dpdk_rx_queue_t *rxq;
clib_file_t *f;
int rv = 0;
if (!(xd->flags & DPDK_DEVICE_FLAG_INT_SUPPORTED))
return clib_error_return (0, "unsupported op (is the interface up?)", rv);
if (mode == VNET_HW_IF_RX_MODE_POLLING)
if (mode == VNET_HW_IF_RX_MODE_POLLING &&
!(xd->flags & DPDK_DEVICE_FLAG_INT_UNMASKABLE))
rv = rte_eth_dev_rx_intr_disable (xd->port_id, qid);
else
else if (mode == VNET_HW_IF_RX_MODE_POLLING)
{
rxq = vec_elt_at_index (xd->rx_queues, qid);
f = pool_elt_at_index (fm->file_pool, rxq->clib_file_index);
fm->file_update (f, UNIX_FILE_UPDATE_DELETE);
}
else if (!(xd->flags & DPDK_DEVICE_FLAG_INT_UNMASKABLE))
rv = rte_eth_dev_rx_intr_enable (xd->port_id, qid);
else
{
rxq = vec_elt_at_index (xd->rx_queues, qid);
f = pool_elt_at_index (fm->file_pool, rxq->clib_file_index);
fm->file_update (f, UNIX_FILE_UPDATE_ADD);
}
if (rv)
return clib_error_return (0, "dpdk_interface_rx_mode_change err %d", rv);
return 0;

3
src/plugins/dpdk/device/dpdk.h
View File

@ -139,7 +139,8 @@ typedef uint16_t dpdk_portid_t;
_ (10, INTEL_PHDR_CKSUM, "intel-phdr-cksum") \
_ (11, RX_FLOW_OFFLOAD, "rx-flow-offload") \
_ (12, RX_IP4_CKSUM, "rx-ip4-cksum") \
_ (13, INT_SUPPORTED, "int-supported")
_ (13, INT_SUPPORTED, "int-supported") \
_ (14, INT_UNMASKABLE, "int-unmaskable")
enum
{

13
src/plugins/dpdk/device/init.c
View File

@ -448,10 +448,11 @@ dpdk_lib_init (dpdk_main_t * dm)
switch (xd->pmd)
{
/* Drivers with valid speed_capa set */
case VNET_DPDK_PMD_I40E:
xd->flags |= DPDK_DEVICE_FLAG_INT_UNMASKABLE;
case VNET_DPDK_PMD_E1000EM:
case VNET_DPDK_PMD_IGB:
case VNET_DPDK_PMD_IXGBE:
case VNET_DPDK_PMD_I40E:
case VNET_DPDK_PMD_ICE:
xd->port_type = port_type_from_speed_capa (&dev_info);
xd->supported_flow_actions = VNET_FLOW_ACTION_MARK |
@ -471,7 +472,6 @@ dpdk_lib_init (dpdk_main_t * dm)
}
xd->port_conf.intr_conf.rxq = 1;
break;
case VNET_DPDK_PMD_CXGBE:
case VNET_DPDK_PMD_MLX4:
@ -482,9 +482,10 @@ dpdk_lib_init (dpdk_main_t * dm)
break;
/* SR-IOV VFs */
case VNET_DPDK_PMD_I40EVF:
xd->flags |= DPDK_DEVICE_FLAG_INT_UNMASKABLE;
case VNET_DPDK_PMD_IGBVF:
case VNET_DPDK_PMD_IXGBEVF:
case VNET_DPDK_PMD_I40EVF:
xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF;
if (dm->conf->no_tx_checksum_offload == 0)
{
@ -494,12 +495,14 @@ dpdk_lib_init (dpdk_main_t * dm)
DPDK_DEVICE_FLAG_TX_OFFLOAD |
DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM;
}
/*xd->port_conf.intr_conf.rxq = 1;*/
/* sDPDK bug in multiqueue... */
/* xd->port_conf.intr_conf.rxq = 1; */
break;
/* iAVF */
case VNET_DPDK_PMD_IAVF:
xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF;
xd->flags |= DPDK_DEVICE_FLAG_INT_UNMASKABLE;
xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF;
xd->supported_flow_actions = VNET_FLOW_ACTION_MARK |
VNET_FLOW_ACTION_REDIRECT_TO_NODE |
VNET_FLOW_ACTION_REDIRECT_TO_QUEUE |