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

net/mlx5: fix representor interrupt handler

Browse Source 
In mlx5 PMD the PCI device interrupt vector was used by Uplink
representor exclusively and other VF representors did not support
interrupt mode.
All the VFs and Uplink representors are separate ethernet devices
and must have dedicated interrupt vectors.
The fix provides each representor with a dedicated interrupt
vector.

Fixes: 5882bde88d ("net/mlx5: fix representor interrupts handler")
Cc: stable@dpdk.org

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
This commit is contained in:
Gregory Etelson 2021-07-20 18:38:19 +03:00 committed by Raslan Darawsheh
parent 149211698c
commit 494d6863c2
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/mlx5/linux/mlx5_os.c
View File

@ -2525,6 +2525,31 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,
} }
restore = list[i].eth_dev->data->dev_flags; restore = list[i].eth_dev->data->dev_flags;
rte_eth_copy_pci_info(list[i].eth_dev, pci_dev); rte_eth_copy_pci_info(list[i].eth_dev, pci_dev);
/**
* Each representor has a dedicated interrupts vector.
* rte_eth_copy_pci_info() assigns PF interrupts handle to
* representor eth_dev object because representor and PF
* share the same PCI address.
* Override representor device with a dedicated
* interrupts handle here.
* Representor interrupts handle is released in mlx5_dev_stop().
*/
if (list[i].info.representor) {
struct rte_intr_handle *intr_handle;
intr_handle = mlx5_malloc(MLX5_MEM_SYS | MLX5_MEM_ZERO,
sizeof(*intr_handle), 0,
SOCKET_ID_ANY);
if (!intr_handle) {
DRV_LOG(ERR,
"port %u failed to allocate memory for interrupt handler "
"Rx interrupts will not be supported",
i);
rte_errno = ENOMEM;
ret = -rte_errno;
goto exit;
}
list[i].eth_dev->intr_handle = intr_handle;
}
/* Restore non-PCI flags cleared by the above call. */ /* Restore non-PCI flags cleared by the above call. */
list[i].eth_dev->data->dev_flags |= restore; list[i].eth_dev->data->dev_flags |= restore;
rte_eth_dev_probing_finish(list[i].eth_dev); rte_eth_dev_probing_finish(list[i].eth_dev);

5
drivers/net/mlx5/mlx5.c
View File

@ -1580,6 +1580,11 @@ mlx5_dev_close(struct rte_eth_dev *dev)
priv->rxqs_n = 0; priv->rxqs_n = 0;
priv->rxqs = NULL; priv->rxqs = NULL;
} }
if (priv->representor) {
/* Each representor has a dedicated interrupts handler */
mlx5_free(dev->intr_handle);
dev->intr_handle = NULL;
}
if (priv->txqs != NULL) { if (priv->txqs != NULL) {
/* XXX race condition if mlx5_tx_burst() is still running. */ /* XXX race condition if mlx5_tx_burst() is still running. */
rte_delay_us_sleep(1000); rte_delay_us_sleep(1000);

6
drivers/net/mlx5/mlx5_rxq.c
View File

@ -834,9 +834,6 @@ mlx5_rx_intr_vec_enable(struct rte_eth_dev *dev)
unsigned int count = 0; unsigned int count = 0;
struct rte_intr_handle *intr_handle = dev->intr_handle; struct rte_intr_handle *intr_handle = dev->intr_handle;
/* Representor shares dev->intr_handle with PF. */
if (priv->representor)
return 0;
if (!dev->data->dev_conf.intr_conf.rxq) if (!dev->data->dev_conf.intr_conf.rxq)
return 0; return 0;
mlx5_rx_intr_vec_disable(dev); mlx5_rx_intr_vec_disable(dev);
@ -917,9 +914,6 @@ mlx5_rx_intr_vec_disable(struct rte_eth_dev *dev)
unsigned int rxqs_n = priv->rxqs_n; unsigned int rxqs_n = priv->rxqs_n;
unsigned int n = RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID); unsigned int n = RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID);
/* Representor shares dev->intr_handle with PF. */
if (priv->representor)
return;
if (!dev->data->dev_conf.intr_conf.rxq) if (!dev->data->dev_conf.intr_conf.rxq)
return; return;
if (!intr_handle->intr_vec) if (!intr_handle->intr_vec)