d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/i40e: fix interrupt throttling setting in PF

Browse Source 
As no matter the PF host driver is DPDK or other kernel drivers,
they are sharing the same virtchnnl interfaces to communicate to VFs.
To follow the generic interface, DPDK PF need to set Interrupt
Throttling (ITR) index according to the rxitr_idx from virtchnnl
instead of ITR_NONE.

Fixes: 6d59e4ea74 ("net/i40e: change version number to support Linux VF")
Cc: stable@dpdk.org

Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
This commit is contained in:
Jingjing Wu 2017-08-24 09:57:51 +08:00 committed by Ferruh Yigit
parent 975ffea6f6
commit cfd662d22e
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/i40e/i40e_ethdev.c
View File

@ -1596,7 +1596,8 @@ i40e_vsi_queues_unbind_intr(struct i40e_vsi *vsi)
static void static void
__vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t msix_vect, __vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t msix_vect,
int base_queue, int nb_queue) int base_queue, int nb_queue,
uint16_t itr_idx)
{ {
int i; int i;
uint32_t val; uint32_t val;
@ -1605,7 +1606,7 @@ __vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t msix_vect,
/* Bind all RX queues to allocated MSIX interrupt */ /* Bind all RX queues to allocated MSIX interrupt */
for (i = 0; i < nb_queue; i++) { for (i = 0; i < nb_queue; i++) {
val = (msix_vect << I40E_QINT_RQCTL_MSIX_INDX_SHIFT) | val = (msix_vect << I40E_QINT_RQCTL_MSIX_INDX_SHIFT) |
I40E_QINT_RQCTL_ITR_INDX_MASK | itr_idx << I40E_QINT_RQCTL_ITR_INDX_SHIFT |
((base_queue + i + 1) << ((base_queue + i + 1) <<
I40E_QINT_RQCTL_NEXTQ_INDX_SHIFT) | I40E_QINT_RQCTL_NEXTQ_INDX_SHIFT) |
(0 << I40E_QINT_RQCTL_NEXTQ_TYPE_SHIFT) | (0 << I40E_QINT_RQCTL_NEXTQ_TYPE_SHIFT) |
@ -1668,7 +1669,7 @@ __vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t msix_vect,
} }
void void
i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi) i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
{ {
struct rte_eth_dev *dev = vsi->adapter->eth_dev; struct rte_eth_dev *dev = vsi->adapter->eth_dev;
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
@ -1696,7 +1697,8 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi)
/* VF bind interrupt */ /* VF bind interrupt */
if (vsi->type == I40E_VSI_SRIOV) { if (vsi->type == I40E_VSI_SRIOV) {
__vsi_queues_bind_intr(vsi, msix_vect, __vsi_queues_bind_intr(vsi, msix_vect,
vsi->base_queue, vsi->nb_qps); vsi->base_queue, vsi->nb_qps,
itr_idx);
return; return;
} }
@ -1722,7 +1724,8 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi)
/* no enough msix_vect, map all to one */ /* no enough msix_vect, map all to one */
__vsi_queues_bind_intr(vsi, msix_vect, __vsi_queues_bind_intr(vsi, msix_vect,
vsi->base_queue + i, vsi->base_queue + i,
vsi->nb_used_qps - i); vsi->nb_used_qps - i,
itr_idx);
for (; !!record && i < vsi->nb_used_qps; i++) for (; !!record && i < vsi->nb_used_qps; i++)
intr_handle->intr_vec[queue_idx + i] = intr_handle->intr_vec[queue_idx + i] =
msix_vect; msix_vect;
@ -1730,7 +1733,8 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi)
} }
/* 1:1 queue/msix_vect mapping */ /* 1:1 queue/msix_vect mapping */
__vsi_queues_bind_intr(vsi, msix_vect, __vsi_queues_bind_intr(vsi, msix_vect,
vsi->base_queue + i, 1); vsi->base_queue + i, 1,
itr_idx);
if (!!record) if (!!record)
intr_handle->intr_vec[queue_idx + i] = msix_vect; intr_handle->intr_vec[queue_idx + i] = msix_vect;
@ -1959,19 +1963,21 @@ i40e_dev_start(struct rte_eth_dev *dev)
/* Map queues with MSIX interrupt */ /* Map queues with MSIX interrupt */
main_vsi->nb_used_qps = dev->data->nb_rx_queues - main_vsi->nb_used_qps = dev->data->nb_rx_queues -
pf->nb_cfg_vmdq_vsi * RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM; pf->nb_cfg_vmdq_vsi * RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM;
i40e_vsi_queues_bind_intr(main_vsi); i40e_vsi_queues_bind_intr(main_vsi, I40E_ITR_INDEX_DEFAULT);
i40e_vsi_enable_queues_intr(main_vsi); i40e_vsi_enable_queues_intr(main_vsi);
/* Map VMDQ VSI queues with MSIX interrupt */ /* Map VMDQ VSI queues with MSIX interrupt */
for (i = 0; i < pf->nb_cfg_vmdq_vsi; i++) { for (i = 0; i < pf->nb_cfg_vmdq_vsi; i++) {
pf->vmdq[i].vsi->nb_used_qps = RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM; pf->vmdq[i].vsi->nb_used_qps = RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM;
i40e_vsi_queues_bind_intr(pf->vmdq[i].vsi); i40e_vsi_queues_bind_intr(pf->vmdq[i].vsi,
I40E_ITR_INDEX_DEFAULT);
i40e_vsi_enable_queues_intr(pf->vmdq[i].vsi); i40e_vsi_enable_queues_intr(pf->vmdq[i].vsi);
} }
/* enable FDIR MSIX interrupt */ /* enable FDIR MSIX interrupt */
if (pf->fdir.fdir_vsi) { if (pf->fdir.fdir_vsi) {
i40e_vsi_queues_bind_intr(pf->fdir.fdir_vsi); i40e_vsi_queues_bind_intr(pf->fdir.fdir_vsi,
I40E_ITR_INDEX_NONE);
i40e_vsi_enable_queues_intr(pf->fdir.fdir_vsi); i40e_vsi_enable_queues_intr(pf->fdir.fdir_vsi);
} }

4
drivers/net/i40e/i40e_ethdev.h
View File

@ -186,9 +186,9 @@ enum i40e_flxpld_layer_idx {
/* Default queue interrupt throttling time in microseconds */ /* Default queue interrupt throttling time in microseconds */
#define I40E_ITR_INDEX_DEFAULT 0 #define I40E_ITR_INDEX_DEFAULT 0
#define I40E_ITR_INDEX_NONE 3
#define I40E_QUEUE_ITR_INTERVAL_DEFAULT 32 /* 32 us */ #define I40E_QUEUE_ITR_INTERVAL_DEFAULT 32 /* 32 us */
#define I40E_QUEUE_ITR_INTERVAL_MAX 8160 /* 8160 us */ #define I40E_QUEUE_ITR_INTERVAL_MAX 8160 /* 8160 us */
/* Special FW support this floating VEB feature */ /* Special FW support this floating VEB feature */
#define FLOATING_VEB_SUPPORTED_FW_MAJ 5 #define FLOATING_VEB_SUPPORTED_FW_MAJ 5
#define FLOATING_VEB_SUPPORTED_FW_MIN 0 #define FLOATING_VEB_SUPPORTED_FW_MIN 0
@ -919,7 +919,7 @@ void i40e_update_vsi_stats(struct i40e_vsi *vsi);
void i40e_pf_disable_irq0(struct i40e_hw *hw); void i40e_pf_disable_irq0(struct i40e_hw *hw);
void i40e_pf_enable_irq0(struct i40e_hw *hw); void i40e_pf_enable_irq0(struct i40e_hw *hw);
int i40e_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete); int i40e_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete);
void i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi); void i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx);
void i40e_vsi_queues_unbind_intr(struct i40e_vsi *vsi); void i40e_vsi_queues_unbind_intr(struct i40e_vsi *vsi);
int i40e_vsi_vlan_pvid_set(struct i40e_vsi *vsi, int i40e_vsi_vlan_pvid_set(struct i40e_vsi *vsi,
struct i40e_vsi_vlan_pvid_info *info); struct i40e_vsi_vlan_pvid_info *info);

5
drivers/net/i40e/i40e_pf.c
View File

@ -647,7 +647,7 @@ i40e_pf_host_process_cmd_config_irq_map(struct i40e_pf_vf *vf,
(struct virtchnl_irq_map_info *)msg; (struct virtchnl_irq_map_info *)msg;
struct virtchnl_vector_map *map; struct virtchnl_vector_map *map;
int i; int i;
uint16_t vector_id; uint16_t vector_id, itr_idx;
unsigned long qbit_max; unsigned long qbit_max;
if (!b_op) { if (!b_op) {
@ -674,12 +674,13 @@ i40e_pf_host_process_cmd_config_irq_map(struct i40e_pf_vf *vf,
vf->vsi->msix_intr = irqmap->vecmap[0].vector_id; vf->vsi->msix_intr = irqmap->vecmap[0].vector_id;
vf->vsi->nb_msix = irqmap->num_vectors; vf->vsi->nb_msix = irqmap->num_vectors;
vf->vsi->nb_used_qps = vf->vsi->nb_qps; vf->vsi->nb_used_qps = vf->vsi->nb_qps;
itr_idx = irqmap->vecmap[0].rxitr_idx;
/* Don't care how the TX/RX queue mapping with this vector. /* Don't care how the TX/RX queue mapping with this vector.
* Link all VF RX queues together. Only did mapping work. * Link all VF RX queues together. Only did mapping work.
* VF can disable/enable the intr by itself. * VF can disable/enable the intr by itself.
*/ */
i40e_vsi_queues_bind_intr(vf->vsi); i40e_vsi_queues_bind_intr(vf->vsi, itr_idx);
goto send_msg; goto send_msg;
} }