Hi, Steve,
I am also coding on this part for large VF recently, and see that you sent a
fix patch, and I have some questions not quite clear, which are shown below in
inline.
Thanks!
Best Regards,
Xu Ting
> -----Original Message-----
> From: dev <dev-boun...@dpdk.org> On Behalf Of SteveX Yang
> Sent: Friday, September 4, 2020 3:29 PM
> To: dev@dpdk.org
> Cc: Yang, Qiming <qiming.y...@intel.com>; Wu, Jingjing
> <jingjing...@intel.com>; Xing, Beilei <beilei.x...@intel.com>; Yang, SteveX
> <stevex.y...@intel.com>
> Subject: [dpdk-dev] [PATCH v3 5/6] net/iavf: fix multiple interrupts for VF
>
> Interrupt mapping should be 1:n queue(s).This patch fixes the logic of
> interrupt bind by code reconstruction.
>
> Fixes: 69dd4c3d0898 ("net/avf: enable queue and device")
>
> Signed-off-by: SteveX Yang <stevex.y...@intel.com>
> ---
> drivers/net/iavf/iavf_vchnl.c | 56 ++++++++++++++++++++++++++++-------
> 1 file changed, 45 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
> index
> 33acea54a..614ea7e79 100644
> --- a/drivers/net/iavf/iavf_vchnl.c
> +++ b/drivers/net/iavf/iavf_vchnl.c
> @@ -18,6 +18,7 @@
> #include <rte_ether.h>
> #include <rte_ethdev_driver.h>
> #include <rte_dev.h>
> +#include <rte_bus_pci.h>
>
> #include "iavf.h"
> #include "iavf_rxtx.h"
> @@ -686,20 +687,53 @@ int
> iavf_config_irq_map(struct iavf_adapter *adapter) {
> struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
> + struct iavf_cmd_info args;
> + uint8_t *cmd_buffer = NULL;
> struct virtchnl_irq_map_info *map_info;
> struct virtchnl_vector_map *vecmap;
> - struct iavf_cmd_info args;
> - int len, i, err;
> + struct rte_eth_dev *dev = adapter->eth_dev;
> + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
> + struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
> + uint32_t vec, cmd_buffer_size, max_vectors, nb_msix, msix_base, i;
> + uint16_t rxq_map[vf->vf_res->max_vectors];
> + int err;
>
> - len = sizeof(struct virtchnl_irq_map_info) +
> - sizeof(struct virtchnl_vector_map) * vf->nb_msix;
> + memset(rxq_map, 0, sizeof(rxq_map));
> + if (dev->data->dev_conf.intr_conf.rxq &&
> + rte_intr_allow_others(intr_handle)) {
> + msix_base = IAVF_RX_VEC_START;
> + max_vectors = vf->vf_res->max_vectors - 1;
> + nb_msix = RTE_MIN(max_vectors, intr_handle->nb_efd);
> +
> + vec = msix_base;
> + for (i = 0; i < dev->data->nb_rx_queues; i++) {
> + rxq_map[vec] |= 1 << i;
> + intr_handle->intr_vec[i] = vec++;
> + if (vec >= vf->vf_res->max_vectors)
> + vec = msix_base;
> + }
> + } else {
> + msix_base = IAVF_MISC_VEC_ID;
> + nb_msix = 1;
>
> - map_info = rte_zmalloc("map_info", len, 0);
> - if (!map_info)
> - return -ENOMEM;
> + for (i = 0; i < dev->data->nb_rx_queues; i++) {
> + rxq_map[msix_base] |= 1 << i;
> + if (rte_intr_dp_is_en(intr_handle))
> + intr_handle->intr_vec[i] = msix_base;
> + }
> + }
>
This part to configure parameters like nb_msix, msix_base and rxq_map, is
already done in the upper level function iavf_config_rx_queues_irqs, why shall
we do it again here? Or is it OK to change in that function directly if
necessary?
> - map_info->num_vectors = vf->nb_msix;
> - for (i = 0; i < vf->nb_msix; i++) {
> + cmd_buffer_size = sizeof(struct virtchnl_irq_map_info) +
> + sizeof(struct virtchnl_vector_map) * nb_msix;
> + cmd_buffer = rte_zmalloc("iavf", cmd_buffer_size, 0);
> + if (!cmd_buffer) {
> + PMD_DRV_LOG(ERR, "Failed to allocate memory");
> + return IAVF_ERR_NO_MEMORY;
> + }
> +
> + map_info = (struct virtchnl_irq_map_info *)cmd_buffer;
> + map_info->num_vectors = nb_msix;
> + for (i = 0; i < nb_msix; i++) {
> vecmap = &map_info->vecmap[i];
> vecmap->vsi_id = vf->vsi_res->vsi_id;
> vecmap->rxitr_idx = IAVF_ITR_INDEX_DEFAULT; @@ -709,8
Here is a line of code "vecmap->rxq_map = vf->rxq_map[vf->msix_base + i];" not
displayed. I noticed that this is not changed. That means we still use the
bitmap configured in iavf_config_rx_queues_irqs, not the new one here (although
they may be the same)
But it seems that the new rxq_map is not used. Do I miss something? Thank!
> +743,8 @@ iavf_config_irq_map(struct iavf_adapter *adapter)
> }
>
> args.ops = VIRTCHNL_OP_CONFIG_IRQ_MAP;
> - args.in_args = (u8 *)map_info;
> - args.in_args_size = len;
> + args.in_args = (u8 *)cmd_buffer;
> + args.in_args_size = cmd_buffer_size;
> args.out_buffer = vf->aq_resp;
> args.out_size = IAVF_AQ_BUF_SZ;
> err = iavf_execute_vf_cmd(adapter, &args);
> --
> 2.17.1
