vdpa/mlx5: improve device shutdown time
Subsystems (2)
cover vdpa/mlx5: improve device shutdown time
Xueming Li (7):
vdpa/mlx5: fix interrupt trash that leads to segment fault vdpa/mlx5: fix dead loop when process interrupted vdpa/mlx5: no kick handling during shutdown vdpa/mlx5: reuse resources in reconfiguration vdpa/mlx5: cache and reuse hardware resources vdpa/mlx5: support device cleanup callback vdpa/mlx5: make statistics counter persistent
doc/guides/vdpadevs/mlx5.rst | 6 + drivers/vdpa/mlx5/mlx5_vdpa.c | 229 +++++++++++++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 31 +++- drivers/vdpa/mlx5/mlx5_vdpa_event.c | 23 +-- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 38 +++-- drivers/vdpa/mlx5/mlx5_vdpa_steer.c | 25 +-- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 189 +++++++++++------------ 7 files changed, 334 insertions(+), 207 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/7 vdpa/mlx5: fix interrupt trash that leads to segment fault
Disable interrupt unregister timeout to avoid invalid FD caused interrupt thread segment fault.
--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +8 -12
@@ -17,7 +17,7 @@static void -mlx5_vdpa_virtq_handler (void *cb_arg) +mlx5_vdpa_virtq_kick_handler (void *cb_arg) {struct mlx5_vdpa_virtq *virtq = cb_arg;struct mlx5_vdpa_priv *priv = virtq->priv;
@@ -59,20 +59,16 @@ static int mlx5_vdpa_virtq_unset(struct mlx5_vdpa_virtq *virtq) {unsigned int i; -int retries =MLX5_VDPA_INTR_RETRIES ;int ret = -EAGAIN ; -if (rte_intr_fd_get (virtq->intr_handle) !=-1 ) { -while (retries-- && ret == -EAGAIN ) { +if (rte_intr_fd_get (virtq->intr_handle) >=0 ) { +while (ret == -EAGAIN ) { ret =rte_intr_callback_unregister (virtq->intr_handle, - mlx5_vdpa_virtq_handler, - virtq); + mlx5_vdpa_virtq_kick_handler, virtq);if (ret == -EAGAIN ) { -DRV_LOG (DEBUG ,"Try again to unregister fd %d " -"of virtq %d interrupt, retries = %d." , -rte_intr_fd_get (virtq->intr_handle), - (int )virtq->index, retries); - +DRV_LOG (DEBUG ,"Try again to unregister fd %d of virtq %hu interrupt" , +rte_intr_fd_get (virtq->intr_handle), + (int )virtq->index);usleep (MLX5_VDPA_INTR_RETRIES_USEC ); } }
@@ -359,7 +355,7 @@ mlx5_vdpa_virtq_setup(struct mlx5_vdpa_priv *priv, int index) goto error;if (rte_intr_callback_register (virtq->intr_handle, - mlx5_vdpa_virtq_handler, + mlx5_vdpa_virtq_kick_handler, virtq)) {rte_intr_fd_set (virtq->intr_handle,-1 ); DRV_LOG(ERR, "Failed to register virtq %d interrupt.",
Signature · 1 line
2.35.1
PATCH 2/7 vdpa/mlx5: fix dead loop when process interrupted
In reply to Xueming LiIn Ctrl+C handling, sometimes kick handling thread gets endless EGAIN error and fall into dead lock.
Kick happens frequently in real system due to busy traffic or retry mechanism. This patch simplifies kick firmware anyway and skip setting hardware notifier due to potential device error, notifier could be set in next successful kick request.
--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +5 -3
@@ -23,11 +23,11 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg)struct mlx5_vdpa_priv *priv = virtq->priv;uint64_t buf;int nbytes; +int retry;if (rte_intr_fd_get (virtq->intr_handle) <0 )return ; - - do { +for (retry =0 ; retry <3 ; ++retry) { nbytes =read (rte_intr_fd_get (virtq->intr_handle), &buf,8 );if (nbytes <0 ) {
@@ -39,7 +39,9 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg) virtq->index, strerror(errno)); }break ; - }while (1 ); + } +if (nbytes <0 ) +return ;rte_write32 (virtq->index, priv->virtq_db_addr);if (virtq->notifier_state ==MLX5_VDPA_NOTIFIER_STATE_DISABLED ) {if (rte_vhost_host_notifier_ctrl (priv->vid, virtq->index, true))
Signature · 1 line
2.35.1
PATCH 3/7 vdpa/mlx5: no kick handling during shutdown
In reply to Xueming LiWhen Qemu suspend a VM, hw notifier is un-mmapped while vCPU thread may still active and write notifier through kick socket.
PMD kick handler thread tries to install hw notifier through slave socket in such case will timeout and slow down device close.
This patch skips hw notifier install if VQ or device in middle of shutdown.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 17 ++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 8 +++++++- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 12 +++++++++++- 3 files changed, 28 insertions(+), 9 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa.c +10 -7
@@ -252,13 +252,15 @@ mlx5_vdpa_dev_close(int vid) }mlx5_vdpa_err_event_unset (priv);mlx5_vdpa_cqe_event_unset (priv); -if (priv->configured) +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) { ret |=mlx5_vdpa_lm_log (priv); + priv->state =MLX5_VDPA_STATE_IN_PROGRESS ; + }mlx5_vdpa_steer_unset (priv);mlx5_vdpa_virtqs_release (priv);mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_mem_dereg (priv); - priv->configured =0 ; + priv->state =MLX5_VDPA_STATE_PROBED ; priv->vid =0 ;/* The mutex may stay locked after event thread cancel - initiate it. */ pthread_mutex_init (&priv->vq_config_lock,NULL );
@@ -277,7 +279,8 @@ mlx5_vdpa_dev_config(int vid)DRV_LOG (ERR ,"Invalid vDPA device: %s." , vdev->device->name);return -EINVAL ; } -if (priv->configured &&mlx5_vdpa_dev_close (vid)) { +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED && +mlx5_vdpa_dev_close (vid)) {DRV_LOG (ERR ,"Failed to reconfigure vid %d." , vid);return -1 ; }
@@ -291,7 +294,7 @@ mlx5_vdpa_dev_config(int vid)mlx5_vdpa_dev_close (vid);return -1 ; } - priv->configured =1 ; + priv->state =MLX5_VDPA_STATE_CONFIGURED ;DRV_LOG (INFO ,"vDPA device %d was configured." , vid);return 0 ; }
@@ -373,7 +376,7 @@ mlx5_vdpa_get_stats(struct rte_vdpa_device *vdev, int qid,DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (!priv->configured) { +if (priv->state ==MLX5_VDPA_STATE_PROBED ) {DRV_LOG (ERR ,"Device %s was not configured." , vdev->device->name);return -ENODATA ;
@@ -401,7 +404,7 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (!priv->configured) { +if (priv->state ==MLX5_VDPA_STATE_PROBED ) {DRV_LOG (ERR ,"Device %s was not configured." , vdev->device->name);return -ENODATA ;
@@ -594,7 +597,7 @@ mlx5_vdpa_dev_remove(struct mlx5_common_device *cdev)TAILQ_REMOVE (&priv_list, priv, next);pthread_mutex_unlock (&priv_list_lock);if (found) { -if (priv->configured) +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED )mlx5_vdpa_dev_close (priv->vid);if (priv->var) { mlx5_glue->dv_free_var (priv->var);
drivers/vdpa/mlx5/mlx5_vdpa.h +7 -1
@@ -113,9 +113,15 @@ enum {MLX5_VDPA_EVENT_MODE_ONLY_INTERRUPT }; +enum mlx5_dev_state { +MLX5_VDPA_STATE_PROBED =0 , +MLX5_VDPA_STATE_CONFIGURED , +MLX5_VDPA_STATE_IN_PROGRESS /* Shutting down. */ +}; +struct mlx5_vdpa_priv {TAILQ_ENTRY (mlx5_vdpa_priv) next; -uint8_t configured; +enum mlx5_dev_state state;pthread_mutex_t vq_config_lock;uint64_t no_traffic_counter;pthread_t timer_tid;
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +11 -1
@@ -25,6 +25,11 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg)int nbytes;int retry; +if (priv->state !=MLX5_VDPA_STATE_CONFIGURED && !virtq->enable) { +DRV_LOG (ERR ,"device %d queue %d down, skip kick handling" , + priv->vid, virtq->index); +return ; + }if (rte_intr_fd_get (virtq->intr_handle) <0 )return ;for (retry =0 ; retry <3 ; ++retry) {
@@ -43,6 +48,11 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg)if (nbytes <0 )return ;rte_write32 (virtq->index, priv->virtq_db_addr); +if (priv->state !=MLX5_VDPA_STATE_CONFIGURED && !virtq->enable) { +DRV_LOG (ERR ,"device %d queue %d down, skip kick handling" , + priv->vid, virtq->index); +return ; + }if (virtq->notifier_state ==MLX5_VDPA_NOTIFIER_STATE_DISABLED ) {if (rte_vhost_host_notifier_ctrl (priv->vid, virtq->index, true)) virtq->notifier_state =MLX5_VDPA_NOTIFIER_STATE_ERR ;
@@ -541,7 +551,7 @@ mlx5_vdpa_virtq_enable(struct mlx5_vdpa_priv *priv, int index, int enable)DRV_LOG (INFO ,"Update virtq %d status %sable -> %sable." , index, virtq->enable ?"en" :"dis" , enable ?"en" :"dis" ); -if (!priv->configured) { +if (priv->state ==MLX5_VDPA_STATE_PROBED ) { virtq->enable = !!enable;return 0 ; }
Signature · 1 line
2.35.1
PATCH 4/7 vdpa/mlx5: reuse resources in reconfiguration
In reply to Xueming LiTo speed up device resume, create reuseable resources during device probe state, release when device remove. Reused resources includes TIS, TD, VAR Doorbell mmap, error handling event channel and interrupt handler, UAR, Rx event channel, NULL MR, steer domain and table.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 165 +++++++++++++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 9 ++ drivers/vdpa/mlx5/mlx5_vdpa_event.c | 23 ++-- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 11 -- drivers/vdpa/mlx5/mlx5_vdpa_steer.c | 25 +---- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 44 -------- 6 files changed, 147 insertions(+), 130 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa.c +123 -42
@@ -5,6 +5,7 @@#include <net/if.h> #include <sys/socket.h> #include <sys/ioctl.h> +#include <sys/mman.h> #include <fcntl.h> #include <netinet/in.h>
@@ -49,6 +50,8 @@ TAILQ_HEAD(mlx5_vdpa_privs, mlx5_vdpa_priv) priv_list =TAILQ_HEAD_INITIALIZER (priv_list);static pthread_mutex_t priv_list_lock =PTHREAD_MUTEX_INITIALIZER ; +static void mlx5_vdpa_dev_release (struct mlx5_vdpa_priv *priv); +static struct mlx5_vdpa_priv *mlx5_vdpa_find_priv_resource_by_vdev (struct rte_vdpa_device *vdev) {
@@ -250,7 +253,6 @@ mlx5_vdpa_dev_close(int vid)DRV_LOG (ERR ,"Invalid vDPA device: %s." , vdev->device->name);return -1 ; } -mlx5_vdpa_err_event_unset (priv);mlx5_vdpa_cqe_event_unset (priv);if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) { ret |=mlx5_vdpa_lm_log (priv);
@@ -258,7 +260,6 @@ mlx5_vdpa_dev_close(int vid) }mlx5_vdpa_steer_unset (priv);mlx5_vdpa_virtqs_release (priv); -mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_mem_dereg (priv); priv->state =MLX5_VDPA_STATE_PROBED ; priv->vid =0 ;
@@ -288,7 +289,7 @@ mlx5_vdpa_dev_config(int vid)if (mlx5_vdpa_mtu_set (priv))DRV_LOG (WARNING ,"MTU cannot be set on device %s." , vdev->device->name); -if (mlx5_vdpa_mem_register (priv) ||mlx5_vdpa_err_event_setup (priv) || +if (mlx5_vdpa_mem_register (priv) ||mlx5_vdpa_virtqs_prepare (priv) ||mlx5_vdpa_steer_setup (priv) ||mlx5_vdpa_cqe_event_setup (priv)) {mlx5_vdpa_dev_close (vid);
@@ -507,13 +508,88 @@ mlx5_vdpa_config_get(struct mlx5_kvargs_ctrl *mkvlist,DRV_LOG (DEBUG ,"no traffic max is %u." , priv->no_traffic_max); } +static int +mlx5_vdpa_create_dev_resources (struct mlx5_vdpa_priv *priv) +{ +struct mlx5_devx_tis_attr tis_attr = {0 }; +struct ibv_context *ctx = priv->cdev->ctx; +uint32_t i; +int retry; + +for (retry =0 ; retry <7 ; retry++) { + priv->var = mlx5_glue->dv_alloc_var (ctx,0 ); +if (priv->var !=NULL ) +break ; +DRV_LOG (WARNING ,"Failed to allocate VAR, retry %d." , retry); +/* Wait Qemu release VAR during vdpa restart, 0.1 sec based. */ +usleep (100000U << retry); + } +if (!priv->var) { +DRV_LOG (ERR ,"Failed to allocate VAR %u." , errno); + rte_errno =ENOMEM ; +return -rte_errno; + } +/* Always map the entire page. */ + priv->virtq_db_addr =mmap (NULL , priv->var->length,PROT_READ | +PROT_WRITE ,MAP_SHARED , ctx->cmd_fd, + priv->var->mmap_off); +if (priv->virtq_db_addr ==MAP_FAILED ) { +DRV_LOG (ERR ,"Failed to map doorbell page %u." , errno); + priv->virtq_db_addr =NULL ; + rte_errno = errno; +return -rte_errno; + } +DRV_LOG (DEBUG ,"VAR address of doorbell mapping is %p." , + priv->virtq_db_addr); + priv->td =mlx5_devx_cmd_create_td (ctx); +if (!priv->td) { +DRV_LOG (ERR ,"Failed to create transport domain." ); + rte_errno = errno; +return -rte_errno; + } + tis_attr.transport_domain = priv->td->id; +for (i =0 ; i < priv->num_lag_ports; i++) { +/* 0 is auto affinity, non-zero value to propose port. */ + tis_attr.lag_tx_port_affinity = i +1 ; + priv->tiss[i] =mlx5_devx_cmd_create_tis (ctx, &tis_attr); +if (!priv->tiss[i]) { +DRV_LOG (ERR ,"Failed to create TIS %u." , i); +return -rte_errno; + } + } + priv->null_mr = mlx5_glue->alloc_null_mr (priv->cdev->pd); +if (!priv->null_mr) { +DRV_LOG (ERR ,"Failed to allocate null MR." ); + rte_errno = errno; +return -rte_errno; + } +DRV_LOG (DEBUG ,"Dump fill Mkey = %u." , priv->null_mr->lkey); + priv->steer.domain = mlx5_glue->dr_create_domain (ctx, +MLX5DV_DR_DOMAIN_TYPE_NIC_RX ); +if (!priv->steer.domain) { +DRV_LOG (ERR ,"Failed to create Rx domain." ); + rte_errno = errno; +return -rte_errno; + } + priv->steer.tbl = mlx5_glue->dr_create_flow_tbl (priv->steer.domain,0 ); +if (!priv->steer.tbl) { +DRV_LOG (ERR ,"Failed to create table 0 with Rx domain." ); + rte_errno = errno; +return -rte_errno; + } +if (mlx5_vdpa_err_event_setup (priv) !=0 ) +return -rte_errno; +if (mlx5_vdpa_event_qp_global_prepare (priv)) +return -rte_errno; +return 0 ; +} +static int mlx5_vdpa_dev_probe (struct mlx5_common_device *cdev,struct mlx5_kvargs_ctrl *mkvlist) {struct mlx5_vdpa_priv *priv =NULL ;struct mlx5_hca_attr *attr = &cdev->config.hca_attr; -int retry;if (!attr->vdpa.valid || !attr->vdpa.max_num_virtio_queues) { DRV_LOG(ERR, "Not enough capabilities to support vdpa, maybe "
@@ -537,25 +613,10 @@ mlx5_vdpa_dev_probe(struct mlx5_common_device *cdev, priv->num_lag_ports = attr->num_lag_ports;if (attr->num_lag_ports ==0 ) priv->num_lag_ports =1 ; +pthread_mutex_init (&priv->vq_config_lock,NULL ); priv->cdev = cdev; -for (retry =0 ; retry <7 ; retry++) { - priv->var = mlx5_glue->dv_alloc_var (priv->cdev->ctx,0 ); -if (priv->var !=NULL ) -break ; -DRV_LOG (WARNING ,"Failed to allocate VAR, retry %d.\n" , retry); -/* Wait Qemu release VAR during vdpa restart, 0.1 sec based. */ -usleep (100000U << retry); - } -if (!priv->var) { -DRV_LOG (ERR ,"Failed to allocate VAR %u." , errno); +if (mlx5_vdpa_create_dev_resources (priv)) goto error; - } - priv->err_intr_handle = -rte_intr_instance_alloc (RTE_INTR_INSTANCE_F_SHARED ); -if (priv->err_intr_handle ==NULL ) { -DRV_LOG (ERR ,"Fail to allocate intr_handle" ); - goto error; - } priv->vdev =rte_vdpa_register_device (cdev->dev, &mlx5_vdpa_ops);if (priv->vdev ==NULL ) {DRV_LOG (ERR ,"Failed to register vDPA device." );
@@ -564,19 +625,13 @@ mlx5_vdpa_dev_probe(struct mlx5_common_device *cdev, }mlx5_vdpa_config_get (mkvlist, priv);SLIST_INIT (&priv->mr_list); -pthread_mutex_init (&priv->vq_config_lock,NULL );pthread_mutex_lock (&priv_list_lock);TAILQ_INSERT_TAIL (&priv_list, priv, next);pthread_mutex_unlock (&priv_list_lock);return 0 ; - error: -if (priv) { -if (priv->var) - mlx5_glue->dv_free_var (priv->var); -rte_intr_instance_free (priv->err_intr_handle); -rte_free (priv); - } +if (priv) +mlx5_vdpa_dev_release (priv);return -rte_errno; }
@@ -596,22 +651,48 @@ mlx5_vdpa_dev_remove(struct mlx5_common_device *cdev)if (found)TAILQ_REMOVE (&priv_list, priv, next);pthread_mutex_unlock (&priv_list_lock); -if (found) { -if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) -mlx5_vdpa_dev_close (priv->vid); -if (priv->var) { - mlx5_glue->dv_free_var (priv->var); - priv->var =NULL ; - } -if (priv->vdev) -rte_vdpa_unregister_device (priv->vdev); -pthread_mutex_destroy (&priv->vq_config_lock); -rte_intr_instance_free (priv->err_intr_handle); -rte_free (priv); - } +if (found) +mlx5_vdpa_dev_release (priv);return 0 ; } +static void +mlx5_vdpa_release_dev_resources (struct mlx5_vdpa_priv *priv) +{ +uint32_t i; + +mlx5_vdpa_event_qp_global_release (priv); +mlx5_vdpa_err_event_unset (priv); +if (priv->steer.tbl) +claim_zero (mlx5_glue->dr_destroy_flow_tbl (priv->steer.tbl)); +if (priv->steer.domain) +claim_zero (mlx5_glue->dr_destroy_domain (priv->steer.domain)); +if (priv->null_mr) +claim_zero (mlx5_glue->dereg_mr (priv->null_mr)); +for (i =0 ; i < priv->num_lag_ports; i++) { +if (priv->tiss[i]) +claim_zero (mlx5_devx_cmd_destroy (priv->tiss[i])); + } +if (priv->td) +claim_zero (mlx5_devx_cmd_destroy (priv->td)); +if (priv->virtq_db_addr) +claim_zero (munmap (priv->virtq_db_addr, priv->var->length)); +if (priv->var) + mlx5_glue->dv_free_var (priv->var); +} + +static void +mlx5_vdpa_dev_release (struct mlx5_vdpa_priv *priv) +{ +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) +mlx5_vdpa_dev_close (priv->vid); +mlx5_vdpa_release_dev_resources (priv); +if (priv->vdev) +rte_vdpa_unregister_device (priv->vdev); +pthread_mutex_destroy (&priv->vq_config_lock); +rte_free (priv); +} +static const struct rte_pci_id mlx5_vdpa_pci_id_map[] = { { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
drivers/vdpa/mlx5/mlx5_vdpa.h +9 -0
@@ -233,6 +233,15 @@ int mlx5_vdpa_event_qp_create(struct mlx5_vdpa_priv *priv, uint16_t desc_n,*/ void mlx5_vdpa_event_qp_destroy (struct mlx5_vdpa_event_qp *eqp); +/** +* Create all the event global resources. +* +* @param[in] priv +* The vdpa driver private structure. +*/ +int +mlx5_vdpa_event_qp_global_prepare (struct mlx5_vdpa_priv *priv); +/** * Release all the event global resources. *
drivers/vdpa/mlx5/mlx5_vdpa_event.c +14 -9
@@ -40,11 +40,9 @@ mlx5_vdpa_event_qp_global_release(struct mlx5_vdpa_priv *priv) }/* Prepare all the global resources for all the event objects.*/ -static int +int mlx5_vdpa_event_qp_global_prepare (struct mlx5_vdpa_priv *priv) { -if (priv->eventc) -return 0 ; priv->eventc =mlx5_os_devx_create_event_channel (priv->cdev->ctx,MLX5DV_DEVX_CREATE_EVENT_CHANNEL_FLAGS_OMIT_EV_DATA );if (!priv->eventc) {
@@ -389,22 +387,30 @@ mlx5_vdpa_err_event_setup(struct mlx5_vdpa_priv *priv) flags =fcntl (priv->err_chnl->fd,F_GETFL ); ret =fcntl (priv->err_chnl->fd,F_SETFL , flags |O_NONBLOCK );if (ret) { + rte_errno = errno;DRV_LOG (ERR ,"Failed to change device event channel FD." ); goto error; } - + priv->err_intr_handle = +rte_intr_instance_alloc (RTE_INTR_INSTANCE_F_SHARED ); +if (priv->err_intr_handle ==NULL ) { +DRV_LOG (ERR ,"Fail to allocate intr_handle" ); + goto error; + }if (rte_intr_fd_set (priv->err_intr_handle, priv->err_chnl->fd)) goto error;if (rte_intr_type_set (priv->err_intr_handle,RTE_INTR_HANDLE_EXT )) goto error; -if (rte_intr_callback_register (priv->err_intr_handle, - mlx5_vdpa_err_interrupt_handler, - priv)) { + ret =rte_intr_callback_register (priv->err_intr_handle, + mlx5_vdpa_err_interrupt_handler, + priv); +if (ret !=0 ) {rte_intr_fd_set (priv->err_intr_handle,0 );DRV_LOG (ERR ,"Failed to register error interrupt for device %d." , priv->vid); + rte_errno = -ret; goto error; }else { DRV_LOG(DEBUG, "Registered error interrupt for device%d.",
@@ -453,6 +459,7 @@ mlx5_vdpa_err_event_unset(struct mlx5_vdpa_priv *priv) mlx5_glue->devx_destroy_event_channel (priv->err_chnl); priv->err_chnl =NULL ; } +rte_intr_instance_free (priv->err_intr_handle); }int
@@ -575,8 +582,6 @@ mlx5_vdpa_event_qp_create(struct mlx5_vdpa_priv *priv, uint16_t desc_n,uint16_t log_desc_n =rte_log2_u32 (desc_n);uint32_t ret; -if (mlx5_vdpa_event_qp_global_prepare (priv)) -return -1 ;if (mlx5_vdpa_cq_create (priv, log_desc_n, callfd, &eqp->cq))return -1 ; attr.pd = priv->cdev->pdn;
drivers/vdpa/mlx5/mlx5_vdpa_mem.c +0 -11
@@ -34,10 +34,6 @@ mlx5_vdpa_mem_dereg(struct mlx5_vdpa_priv *priv)SLIST_INIT (&priv->mr_list);if (priv->lm_mr.addr)mlx5_os_wrapped_mkey_destroy (&priv->lm_mr); -if (priv->null_mr) { -claim_zero (mlx5_glue->dereg_mr (priv->null_mr)); - priv->null_mr =NULL ; - }if (priv->vmem) {free (priv->vmem); priv->vmem =NULL ;
@@ -196,13 +192,6 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv)if (!mem)return -rte_errno; priv->vmem = mem; - priv->null_mr = mlx5_glue->alloc_null_mr (priv->cdev->pd); -if (!priv->null_mr) { -DRV_LOG (ERR ,"Failed to allocate null MR." ); - ret = -errno; - goto error; - } -DRV_LOG (DEBUG ,"Dump fill Mkey = %u." , priv->null_mr->lkey);for (i =0 ; i < mem->nregions; i++) { reg = &mem->regions[i]; entry =rte_zmalloc (__func__,sizeof (*entry),0 );
drivers/vdpa/mlx5/mlx5_vdpa_steer.c +1 -24
@@ -45,14 +45,6 @@ void mlx5_vdpa_steer_unset(struct mlx5_vdpa_priv *priv) {mlx5_vdpa_rss_flows_destroy (priv); -if (priv->steer.tbl) { -claim_zero (mlx5_glue->dr_destroy_flow_tbl (priv->steer.tbl)); - priv->steer.tbl =NULL ; - } -if (priv->steer.domain) { -claim_zero (mlx5_glue->dr_destroy_domain (priv->steer.domain)); - priv->steer.domain =NULL ; - }if (priv->steer.rqt) {claim_zero (mlx5_devx_cmd_destroy (priv->steer.rqt)); priv->steer.rqt =NULL ;
@@ -248,11 +240,7 @@ mlx5_vdpa_steer_update(struct mlx5_vdpa_priv *priv)int ret =mlx5_vdpa_rqt_prepare (priv);if (ret ==0 ) { -mlx5_vdpa_rss_flows_destroy (priv); -if (priv->steer.rqt) { -claim_zero (mlx5_devx_cmd_destroy (priv->steer.rqt)); - priv->steer.rqt =NULL ; - } +mlx5_vdpa_steer_unset (priv); }else if (ret <0 ) {return ret; }else if (!priv->steer.rss[0 ].flow) {
@@ -269,17 +257,6 @@ int mlx5_vdpa_steer_setup(struct mlx5_vdpa_priv *priv) {#ifdef HAVE_MLX5DV_DR - priv->steer.domain = mlx5_glue->dr_create_domain (priv->cdev->ctx, -MLX5DV_DR_DOMAIN_TYPE_NIC_RX ); -if (!priv->steer.domain) { -DRV_LOG (ERR ,"Failed to create Rx domain." ); - goto error; - } - priv->steer.tbl = mlx5_glue->dr_create_flow_tbl (priv->steer.domain,0 ); -if (!priv->steer.tbl) { -DRV_LOG (ERR ,"Failed to create table 0 with Rx domain." ); - goto error; - }if (mlx5_vdpa_steer_update (priv)) goto error;return 0 ;
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +0 -44
68 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH 5/7 vdpa/mlx5: cache and reuse hardware resources
In reply to Xueming LiDuring device suspend and resume, resources are not changed normally. When huge resources allocated to VM, like huge memory size or lots of queues, time spent on release and recreate became significant.
To speed up, this patch reuse resoruces like VM MR and VirtQ memory if not changed.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 11 ++++- drivers/vdpa/mlx5/mlx5_vdpa.h | 12 ++++- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 27 ++++++++++- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 73 +++++++++++++++++++++-------- 4 files changed, 99 insertions(+), 24 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa.c +10 -1
@@ -241,6 +241,13 @@ mlx5_vdpa_mtu_set(struct mlx5_vdpa_priv *priv)return kern_mtu == vhost_mtu ?0 :-1 ; } +static void +mlx5_vdpa_dev_cache_clean (struct mlx5_vdpa_priv *priv) +{ +mlx5_vdpa_virtqs_cleanup (priv); +mlx5_vdpa_mem_dereg (priv); +} +static int mlx5_vdpa_dev_close (int vid) {
@@ -260,7 +267,8 @@ mlx5_vdpa_dev_close(int vid) }mlx5_vdpa_steer_unset (priv);mlx5_vdpa_virtqs_release (priv); -mlx5_vdpa_mem_dereg (priv); +if (priv->lm_mr.addr) +mlx5_os_wrapped_mkey_destroy (&priv->lm_mr); priv->state =MLX5_VDPA_STATE_PROBED ; priv->vid =0 ;/* The mutex may stay locked after event thread cancel - initiate it. */
@@ -661,6 +669,7 @@ mlx5_vdpa_release_dev_resources(struct mlx5_vdpa_priv *priv) {uint32_t i; +mlx5_vdpa_dev_cache_clean (priv);mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_err_event_unset (priv);if (priv->steer.tbl)
drivers/vdpa/mlx5/mlx5_vdpa.h +10 -2
@@ -289,13 +289,21 @@ int mlx5_vdpa_err_event_setup(struct mlx5_vdpa_priv *priv);void mlx5_vdpa_err_event_unset (struct mlx5_vdpa_priv *priv);/** -* Release a virtq and all its related resources. +* Release virtqs and resources except that to be reused. * * @param[in] priv * The vdpa driver private structure. */ void mlx5_vdpa_virtqs_release (struct mlx5_vdpa_priv *priv); +/** +* Cleanup cached resources of all virtqs. +* +* @param[in] priv +* The vdpa driver private structure. +*/ +void mlx5_vdpa_virtqs_cleanup (struct mlx5_vdpa_priv *priv); +/** * Create all the HW virtqs resources and all their related resources. *
@@ -323,7 +331,7 @@ int mlx5_vdpa_virtqs_prepare(struct mlx5_vdpa_priv *priv);int mlx5_vdpa_virtq_enable (struct mlx5_vdpa_priv *priv,int index,int enable);/** -* Unset steering and release all its related resources- stop traffic. +* Unset steering - stop traffic. * * @param[in] priv * The vdpa driver private structure.
drivers/vdpa/mlx5/mlx5_vdpa_mem.c +25 -2
@@ -32,8 +32,6 @@ mlx5_vdpa_mem_dereg(struct mlx5_vdpa_priv *priv) entry = next; }SLIST_INIT (&priv->mr_list); -if (priv->lm_mr.addr) -mlx5_os_wrapped_mkey_destroy (&priv->lm_mr);if (priv->vmem) {free (priv->vmem); priv->vmem =NULL ;
@@ -149,6 +147,23 @@ mlx5_vdpa_vhost_mem_regions_prepare(int vid, uint8_t *mode, uint64_t *mem_size,return mem; } +static int +mlx5_vdpa_mem_cmp (struct rte_vhost_memory *mem1,struct rte_vhost_memory *mem2) +{ +uint32_t i; + +if (mem1->nregions != mem2->nregions) +return -1 ; +for (i =0 ; i < mem1->nregions; i++) { +if (mem1->regions[i].guest_phys_addr != + mem2->regions[i].guest_phys_addr) +return -1 ; +if (mem1->regions[i].size != mem2->regions[i].size) +return -1 ; + } +return 0 ; +} +#define KLM_SIZE_MAX_ALIGN (sz) ((sz) > MLX5_MAX_KLM_BYTE_COUNT ? \ MLX5_MAX_KLM_BYTE_COUNT : (sz))
@@ -191,6 +206,14 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv)if (!mem)return -rte_errno; +if (priv->vmem !=NULL ) { +if (mlx5_vdpa_mem_cmp (mem, priv->vmem) ==0 ) { +/* VM memory not changed, reuse resources. */ +free (mem); +return 0 ; + } +mlx5_vdpa_mem_dereg (priv); + } priv->vmem = mem;for (i =0 ; i < mem->nregions; i++) { reg = &mem->regions[i];
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +54 -19
114 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH 6/7 vdpa/mlx5: support device cleanup callback
In reply to Xueming LiThis patch supports device cleanup callback API which called when device disconected with VM. Cached resources like VM MR and VQ memory are released.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 23 +++++++++++++++++++++++ drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + 2 files changed, 24 insertions(+)
drivers/vdpa/mlx5/mlx5_vdpa.c +23 -0
@@ -270,6 +270,8 @@ mlx5_vdpa_dev_close(int vid)if (priv->lm_mr.addr)mlx5_os_wrapped_mkey_destroy (&priv->lm_mr); priv->state =MLX5_VDPA_STATE_PROBED ; +if (!priv->connected) +mlx5_vdpa_dev_cache_clean (priv); priv->vid =0 ;/* The mutex may stay locked after event thread cancel - initiate it. */ pthread_mutex_init (&priv->vq_config_lock,NULL );
@@ -294,6 +296,7 @@ mlx5_vdpa_dev_config(int vid)return -1 ; } priv->vid = vid; + priv->connected = true;if (mlx5_vdpa_mtu_set (priv))DRV_LOG (WARNING ,"MTU cannot be set on device %s." , vdev->device->name);
@@ -431,12 +434,32 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)return mlx5_vdpa_virtq_stats_reset (priv, qid); } +static int +mlx5_vdpa_dev_clean (int vid) +{ +struct rte_vdpa_device *vdev =rte_vhost_get_vdpa_device (vid); +struct mlx5_vdpa_priv *priv; + +if (vdev ==NULL ) +return -1 ; + priv =mlx5_vdpa_find_priv_resource_by_vdev (vdev); +if (priv ==NULL ) { +DRV_LOG (ERR ,"Invalid vDPA device: %s." , vdev->device->name); +return -1 ; + } +if (priv->state ==MLX5_VDPA_STATE_PROBED ) +mlx5_vdpa_dev_cache_clean (priv); + priv->connected = false; +return 0 ; +} +static struct rte_vdpa_dev_ops mlx5_vdpa_ops = { .get_queue_num = mlx5_vdpa_get_queue_num, .get_features = mlx5_vdpa_get_vdpa_features, .get_protocol_features = mlx5_vdpa_get_protocol_features, .dev_conf = mlx5_vdpa_dev_config, .dev_close = mlx5_vdpa_dev_close, + .dev_cleanup = mlx5_vdpa_dev_clean, .set_vring_state = mlx5_vdpa_set_vring_state, .set_features = mlx5_vdpa_features_set, .migration_done =NULL ,
drivers/vdpa/mlx5/mlx5_vdpa.h +1 -0
@@ -121,6 +121,7 @@ enum mlx5_dev_state {struct mlx5_vdpa_priv {TAILQ_ENTRY (mlx5_vdpa_priv) next; +bool connected;enum mlx5_dev_state state;pthread_mutex_t vq_config_lock;uint64_t no_traffic_counter;
Signature · 1 line
2.35.1
PATCH 7/7 vdpa/mlx5: make statistics counter persistent
In reply to Xueming LiTo speed the device suspend and resume time, make counter persitent in reconfiguration until the device gets removed.
--- doc/guides/vdpadevs/mlx5.rst | 6 ++++++ drivers/vdpa/mlx5/mlx5_vdpa.c | 19 +++++++---------- drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 32 +++++++++++------------------ 4 files changed, 26 insertions(+), 32 deletions(-)
doc/guides/vdpadevs/mlx5.rst +6 -0
@@ -109,3 +109,9 @@ Upon potential hardware errors, mlx5 PMD try to recover, give up if failed 3 times in 3 seconds, virtq will be put in disable state. User should check log to get error information, or query vdpa statistics counter to know error type and count report. + +Statistics +^^^^^^^^^^ + +The device statistics counter persists in reconfiguration until the device gets +removed. User can reset counters by calling function rte_vdpa_reset_stats().
drivers/vdpa/mlx5/mlx5_vdpa.c +7 -12
@@ -388,12 +388,7 @@ mlx5_vdpa_get_stats(struct rte_vdpa_device *vdev, int qid,DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (priv->state ==MLX5_VDPA_STATE_PROBED ) { -DRV_LOG (ERR ,"Device %s was not configured." , - vdev->device->name); -return -ENODATA ; - } -if (qid >= (int )priv->nr_virtqs) { +if (qid >= (int )priv->caps.max_num_virtio_queues *2 ) {DRV_LOG (ERR ,"Too big vring id: %d for device %s." , qid, vdev->device->name);return -E2BIG ;
@@ -416,12 +411,7 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (priv->state ==MLX5_VDPA_STATE_PROBED ) { -DRV_LOG (ERR ,"Device %s was not configured." , - vdev->device->name); -return -ENODATA ; - } -if (qid >= (int )priv->nr_virtqs) { +if (qid >= (int )priv->caps.max_num_virtio_queues *2 ) {DRV_LOG (ERR ,"Too big vring id: %d for device %s." , qid, vdev->device->name);return -E2BIG ;
@@ -693,6 +683,11 @@ mlx5_vdpa_release_dev_resources(struct mlx5_vdpa_priv *priv)uint32_t i;mlx5_vdpa_dev_cache_clean (priv); +for (i =0 ; i < priv->caps.max_num_virtio_queues *2 ; i++) { +if (!priv->virtqs[i].counters) +continue ; +claim_zero (mlx5_devx_cmd_destroy (priv->virtqs[i].counters)); + }mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_err_event_unset (priv);if (priv->steer.tbl)
drivers/vdpa/mlx5/mlx5_vdpa.h +1 -0
@@ -92,6 +92,7 @@ struct mlx5_vdpa_virtq {struct rte_intr_handle *intr_handle;uint64_t err_time[3 ];/* RDTSC time of recent errors. */ uint32_t n_retry; +struct mlx5_devx_virtio_q_couners_attr stats;struct mlx5_devx_virtio_q_couners_attr reset; };
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +12 -20
@@ -127,14 +127,9 @@ void mlx5_vdpa_virtqs_release(struct mlx5_vdpa_priv *priv) {int i; -struct mlx5_vdpa_virtq *virtq; -for (i =0 ; i < priv->nr_virtqs; i++) { - virtq = &priv->virtqs[i]; -mlx5_vdpa_virtq_unset (virtq); -if (virtq->counters) -claim_zero (mlx5_devx_cmd_destroy (virtq->counters)); - } +for (i =0 ; i < priv->nr_virtqs; i++) +mlx5_vdpa_virtq_unset (&priv->virtqs[i]); priv->features =0 ; priv->nr_virtqs =0 ; }
@@ -590,7 +585,7 @@ mlx5_vdpa_virtq_stats_get(struct mlx5_vdpa_priv *priv, int qid, struct rte_vdpa_stat *stats, unsigned int n) {struct mlx5_vdpa_virtq *virtq = &priv->virtqs[qid]; -struct mlx5_devx_virtio_q_couners_attr attr = {0 }; +struct mlx5_devx_virtio_q_couners_attr *attr = &virtq->stats;int ret;if (!virtq->counters) {
@@ -598,7 +593,7 @@ mlx5_vdpa_virtq_stats_get(struct mlx5_vdpa_priv *priv, int qid, "is invalid.", qid);return -EINVAL ; } - ret =mlx5_devx_cmd_query_virtio_q_counters (virtq->counters, &attr); + ret =mlx5_devx_cmd_query_virtio_q_counters (virtq->counters, attr);if (ret) {DRV_LOG (ERR ,"Failed to read virtq %d stats from HW." , qid);return ret;
@@ -608,37 +603,37 @@ mlx5_vdpa_virtq_stats_get(struct mlx5_vdpa_priv *priv, int qid,return ret; stats[MLX5_VDPA_STATS_RECEIVED_DESCRIPTORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_RECEIVED_DESCRIPTORS , - .value = attr.received_desc - virtq->reset.received_desc, + .value = attr->received_desc - virtq->reset.received_desc, };if (ret ==MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS )return ret; stats[MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS , - .value = attr.completed_desc - virtq->reset.completed_desc, + .value = attr->completed_desc - virtq->reset.completed_desc, };if (ret ==MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS )return ret; stats[MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS , - .value = attr.bad_desc_errors - virtq->reset.bad_desc_errors, + .value = attr->bad_desc_errors - virtq->reset.bad_desc_errors, };if (ret ==MLX5_VDPA_STATS_EXCEED_MAX_CHAIN )return ret; stats[MLX5_VDPA_STATS_EXCEED_MAX_CHAIN ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_EXCEED_MAX_CHAIN , - .value = attr.exceed_max_chain - virtq->reset.exceed_max_chain, + .value = attr->exceed_max_chain - virtq->reset.exceed_max_chain, };if (ret ==MLX5_VDPA_STATS_INVALID_BUFFER )return ret; stats[MLX5_VDPA_STATS_INVALID_BUFFER ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_INVALID_BUFFER , - .value = attr.invalid_buffer - virtq->reset.invalid_buffer, + .value = attr->invalid_buffer - virtq->reset.invalid_buffer, };if (ret ==MLX5_VDPA_STATS_COMPLETION_ERRORS )return ret; stats[MLX5_VDPA_STATS_COMPLETION_ERRORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_COMPLETION_ERRORS , - .value = attr.error_cqes - virtq->reset.error_cqes, + .value = attr->error_cqes - virtq->reset.error_cqes, };return ret; }
@@ -649,11 +644,8 @@ mlx5_vdpa_virtq_stats_reset(struct mlx5_vdpa_priv *priv, int qid)struct mlx5_vdpa_virtq *virtq = &priv->virtqs[qid];int ret; -if (!virtq->counters) { -DRV_LOG (ERR ,"Failed to read virtq %d statistics - virtq " -"is invalid." , qid); -return -EINVAL ; - } +if (virtq->counters ==NULL )/* VQ not enabled. */ +return 0 ; ret =mlx5_devx_cmd_query_virtio_q_counters (virtq->counters, &virtq->reset);if (ret)
Signature · 1 line
2.35.1
cover vdpa/mlx5: improve device shutdown time
In reply to Xueming Liv1:
- rebase with latest upstream code
- fix coverity issues
Xueming Li (7):
vdpa/mlx5: fix interrupt trash that leads to segment fault vdpa/mlx5: fix dead loop when process interrupted vdpa/mlx5: no kick handling during shutdown vdpa/mlx5: reuse resources in reconfiguration vdpa/mlx5: cache and reuse hardware resources vdpa/mlx5: support device cleanup callback vdpa/mlx5: make statistics counter persistent
doc/guides/vdpadevs/mlx5.rst | 6 + drivers/vdpa/mlx5/mlx5_vdpa.c | 229 +++++++++++++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 31 +++- drivers/vdpa/mlx5/mlx5_vdpa_event.c | 23 +-- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 38 +++-- drivers/vdpa/mlx5/mlx5_vdpa_steer.c | 25 +-- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 189 +++++++++++------------ 7 files changed, 334 insertions(+), 207 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/7 vdpa/mlx5: fix interrupt trash that leads to segment fault
Disable interrupt unregister timeout to avoid invalid FD caused interrupt thread segment fault.
--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +8 -12
@@ -17,7 +17,7 @@static void -mlx5_vdpa_virtq_handler (void *cb_arg) +mlx5_vdpa_virtq_kick_handler (void *cb_arg) {struct mlx5_vdpa_virtq *virtq = cb_arg;struct mlx5_vdpa_priv *priv = virtq->priv;
@@ -59,20 +59,16 @@ static int mlx5_vdpa_virtq_unset(struct mlx5_vdpa_virtq *virtq) {unsigned int i; -int retries =MLX5_VDPA_INTR_RETRIES ;int ret = -EAGAIN ; -if (rte_intr_fd_get (virtq->intr_handle) !=-1 ) { -while (retries-- && ret == -EAGAIN ) { +if (rte_intr_fd_get (virtq->intr_handle) >=0 ) { +while (ret == -EAGAIN ) { ret =rte_intr_callback_unregister (virtq->intr_handle, - mlx5_vdpa_virtq_handler, - virtq); + mlx5_vdpa_virtq_kick_handler, virtq);if (ret == -EAGAIN ) { -DRV_LOG (DEBUG ,"Try again to unregister fd %d " -"of virtq %d interrupt, retries = %d." , -rte_intr_fd_get (virtq->intr_handle), - (int )virtq->index, retries); - +DRV_LOG (DEBUG ,"Try again to unregister fd %d of virtq %hu interrupt" , +rte_intr_fd_get (virtq->intr_handle), + (int )virtq->index);usleep (MLX5_VDPA_INTR_RETRIES_USEC ); } }
@@ -359,7 +355,7 @@ mlx5_vdpa_virtq_setup(struct mlx5_vdpa_priv *priv, int index) goto error;if (rte_intr_callback_register (virtq->intr_handle, - mlx5_vdpa_virtq_handler, + mlx5_vdpa_virtq_kick_handler, virtq)) {rte_intr_fd_set (virtq->intr_handle,-1 ); DRV_LOG(ERR, "Failed to register virtq %d interrupt.",
Signature · 1 line
2.35.1
PATCH 2/7 vdpa/mlx5: fix dead loop when process interrupted
In reply to Xueming LiIn Ctrl+C handling, sometimes kick handling thread gets endless EGAIN error and fall into dead lock.
Kick happens frequently in real system due to busy traffic or retry mechanism. This patch simplifies kick firmware anyway and skip setting hardware notifier due to potential device error, notifier could be set in next successful kick request.
--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +5 -3
@@ -23,11 +23,11 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg)struct mlx5_vdpa_priv *priv = virtq->priv;uint64_t buf;int nbytes; +int retry;if (rte_intr_fd_get (virtq->intr_handle) <0 )return ; - - do { +for (retry =0 ; retry <3 ; ++retry) { nbytes =read (rte_intr_fd_get (virtq->intr_handle), &buf,8 );if (nbytes <0 ) {
@@ -39,7 +39,9 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg) virtq->index, strerror(errno)); }break ; - }while (1 ); + } +if (nbytes <0 ) +return ;rte_write32 (virtq->index, priv->virtq_db_addr);if (virtq->notifier_state ==MLX5_VDPA_NOTIFIER_STATE_DISABLED ) {if (rte_vhost_host_notifier_ctrl (priv->vid, virtq->index, true))
Signature · 1 line
2.35.1
PATCH 3/7 vdpa/mlx5: no kick handling during shutdown
In reply to Xueming LiWhen Qemu suspend a VM, hw notifier is un-mmapped while vCPU thread may still active and write notifier through kick socket.
PMD kick handler thread tries to install hw notifier through client socket in such case will timeout and slow down device close.
This patch skips hw notifier install if VQ or device in middle of shutdown.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 17 ++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 8 +++++++- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 12 +++++++++++- 3 files changed, 28 insertions(+), 9 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa.c +10 -7
@@ -252,13 +252,15 @@ mlx5_vdpa_dev_close(int vid) }mlx5_vdpa_err_event_unset (priv);mlx5_vdpa_cqe_event_unset (priv); -if (priv->configured) +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) { ret |=mlx5_vdpa_lm_log (priv); + priv->state =MLX5_VDPA_STATE_IN_PROGRESS ; + }mlx5_vdpa_steer_unset (priv);mlx5_vdpa_virtqs_release (priv);mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_mem_dereg (priv); - priv->configured =0 ; + priv->state =MLX5_VDPA_STATE_PROBED ; priv->vid =0 ;/* The mutex may stay locked after event thread cancel - initiate it. */ pthread_mutex_init (&priv->vq_config_lock,NULL );
@@ -277,7 +279,8 @@ mlx5_vdpa_dev_config(int vid)DRV_LOG (ERR ,"Invalid vDPA device: %s." , vdev->device->name);return -EINVAL ; } -if (priv->configured &&mlx5_vdpa_dev_close (vid)) { +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED && +mlx5_vdpa_dev_close (vid)) {DRV_LOG (ERR ,"Failed to reconfigure vid %d." , vid);return -1 ; }
@@ -291,7 +294,7 @@ mlx5_vdpa_dev_config(int vid)mlx5_vdpa_dev_close (vid);return -1 ; } - priv->configured =1 ; + priv->state =MLX5_VDPA_STATE_CONFIGURED ;DRV_LOG (INFO ,"vDPA device %d was configured." , vid);return 0 ; }
@@ -373,7 +376,7 @@ mlx5_vdpa_get_stats(struct rte_vdpa_device *vdev, int qid,DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (!priv->configured) { +if (priv->state ==MLX5_VDPA_STATE_PROBED ) {DRV_LOG (ERR ,"Device %s was not configured." , vdev->device->name);return -ENODATA ;
@@ -401,7 +404,7 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (!priv->configured) { +if (priv->state ==MLX5_VDPA_STATE_PROBED ) {DRV_LOG (ERR ,"Device %s was not configured." , vdev->device->name);return -ENODATA ;
@@ -590,7 +593,7 @@ mlx5_vdpa_dev_remove(struct mlx5_common_device *cdev)TAILQ_REMOVE (&priv_list, priv, next);pthread_mutex_unlock (&priv_list_lock);if (found) { -if (priv->configured) +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED )mlx5_vdpa_dev_close (priv->vid);if (priv->var) { mlx5_glue->dv_free_var (priv->var);
drivers/vdpa/mlx5/mlx5_vdpa.h +7 -1
@@ -113,9 +113,15 @@ enum {MLX5_VDPA_EVENT_MODE_ONLY_INTERRUPT }; +enum mlx5_dev_state { +MLX5_VDPA_STATE_PROBED =0 , +MLX5_VDPA_STATE_CONFIGURED , +MLX5_VDPA_STATE_IN_PROGRESS /* Shutting down. */ +}; +struct mlx5_vdpa_priv {TAILQ_ENTRY (mlx5_vdpa_priv) next; -uint8_t configured; +enum mlx5_dev_state state;pthread_mutex_t vq_config_lock;uint64_t no_traffic_counter;pthread_t timer_tid;
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +11 -1
@@ -25,6 +25,11 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg)int nbytes;int retry; +if (priv->state !=MLX5_VDPA_STATE_CONFIGURED && !virtq->enable) { +DRV_LOG (ERR ,"device %d queue %d down, skip kick handling" , + priv->vid, virtq->index); +return ; + }if (rte_intr_fd_get (virtq->intr_handle) <0 )return ;for (retry =0 ; retry <3 ; ++retry) {
@@ -43,6 +48,11 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg)if (nbytes <0 )return ;rte_write32 (virtq->index, priv->virtq_db_addr); +if (priv->state !=MLX5_VDPA_STATE_CONFIGURED && !virtq->enable) { +DRV_LOG (ERR ,"device %d queue %d down, skip kick handling" , + priv->vid, virtq->index); +return ; + }if (virtq->notifier_state ==MLX5_VDPA_NOTIFIER_STATE_DISABLED ) {if (rte_vhost_host_notifier_ctrl (priv->vid, virtq->index, true)) virtq->notifier_state =MLX5_VDPA_NOTIFIER_STATE_ERR ;
@@ -541,7 +551,7 @@ mlx5_vdpa_virtq_enable(struct mlx5_vdpa_priv *priv, int index, int enable)DRV_LOG (INFO ,"Update virtq %d status %sable -> %sable." , index, virtq->enable ?"en" :"dis" , enable ?"en" :"dis" ); -if (!priv->configured) { +if (priv->state ==MLX5_VDPA_STATE_PROBED ) { virtq->enable = !!enable;return 0 ; }
Signature · 1 line
2.35.1
PATCH 4/7 vdpa/mlx5: reuse resources in reconfiguration
In reply to Xueming LiTo speed up device resume, create reuseable resources during device probe state, release when device remove. Reused resources includes TIS, TD, VAR Doorbell mmap, error handling event channel and interrupt handler, UAR, Rx event channel, NULL MR, steer domain and table.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 165 +++++++++++++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 9 ++ drivers/vdpa/mlx5/mlx5_vdpa_event.c | 23 ++-- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 11 -- drivers/vdpa/mlx5/mlx5_vdpa_steer.c | 25 +---- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 44 -------- 6 files changed, 147 insertions(+), 130 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa.c +123 -42
@@ -5,6 +5,7 @@#include <net/if.h> #include <sys/socket.h> #include <sys/ioctl.h> +#include <sys/mman.h> #include <fcntl.h> #include <netinet/in.h>
@@ -49,6 +50,8 @@ TAILQ_HEAD(mlx5_vdpa_privs, mlx5_vdpa_priv) priv_list =TAILQ_HEAD_INITIALIZER (priv_list);static pthread_mutex_t priv_list_lock =PTHREAD_MUTEX_INITIALIZER ; +static void mlx5_vdpa_dev_release (struct mlx5_vdpa_priv *priv); +static struct mlx5_vdpa_priv *mlx5_vdpa_find_priv_resource_by_vdev (struct rte_vdpa_device *vdev) {
@@ -250,7 +253,6 @@ mlx5_vdpa_dev_close(int vid)DRV_LOG (ERR ,"Invalid vDPA device: %s." , vdev->device->name);return -1 ; } -mlx5_vdpa_err_event_unset (priv);mlx5_vdpa_cqe_event_unset (priv);if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) { ret |=mlx5_vdpa_lm_log (priv);
@@ -258,7 +260,6 @@ mlx5_vdpa_dev_close(int vid) }mlx5_vdpa_steer_unset (priv);mlx5_vdpa_virtqs_release (priv); -mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_mem_dereg (priv); priv->state =MLX5_VDPA_STATE_PROBED ; priv->vid =0 ;
@@ -288,7 +289,7 @@ mlx5_vdpa_dev_config(int vid)if (mlx5_vdpa_mtu_set (priv))DRV_LOG (WARNING ,"MTU cannot be set on device %s." , vdev->device->name); -if (mlx5_vdpa_mem_register (priv) ||mlx5_vdpa_err_event_setup (priv) || +if (mlx5_vdpa_mem_register (priv) ||mlx5_vdpa_virtqs_prepare (priv) ||mlx5_vdpa_steer_setup (priv) ||mlx5_vdpa_cqe_event_setup (priv)) {mlx5_vdpa_dev_close (vid);
@@ -504,12 +505,87 @@ mlx5_vdpa_config_get(struct rte_devargs *devargs, struct mlx5_vdpa_priv *priv)DRV_LOG (DEBUG ,"no traffic max is %u." , priv->no_traffic_max); } +static int +mlx5_vdpa_create_dev_resources (struct mlx5_vdpa_priv *priv) +{ +struct mlx5_devx_tis_attr tis_attr = {0 }; +struct ibv_context *ctx = priv->cdev->ctx; +uint32_t i; +int retry; + +for (retry =0 ; retry <7 ; retry++) { + priv->var = mlx5_glue->dv_alloc_var (ctx,0 ); +if (priv->var !=NULL ) +break ; +DRV_LOG (WARNING ,"Failed to allocate VAR, retry %d." , retry); +/* Wait Qemu release VAR during vdpa restart, 0.1 sec based. */ +usleep (100000U << retry); + } +if (!priv->var) { +DRV_LOG (ERR ,"Failed to allocate VAR %u." , errno); + rte_errno =ENOMEM ; +return -rte_errno; + } +/* Always map the entire page. */ + priv->virtq_db_addr =mmap (NULL , priv->var->length,PROT_READ | +PROT_WRITE ,MAP_SHARED , ctx->cmd_fd, + priv->var->mmap_off); +if (priv->virtq_db_addr ==MAP_FAILED ) { +DRV_LOG (ERR ,"Failed to map doorbell page %u." , errno); + priv->virtq_db_addr =NULL ; + rte_errno = errno; +return -rte_errno; + } +DRV_LOG (DEBUG ,"VAR address of doorbell mapping is %p." , + priv->virtq_db_addr); + priv->td =mlx5_devx_cmd_create_td (ctx); +if (!priv->td) { +DRV_LOG (ERR ,"Failed to create transport domain." ); + rte_errno = errno; +return -rte_errno; + } + tis_attr.transport_domain = priv->td->id; +for (i =0 ; i < priv->num_lag_ports; i++) { +/* 0 is auto affinity, non-zero value to propose port. */ + tis_attr.lag_tx_port_affinity = i +1 ; + priv->tiss[i] =mlx5_devx_cmd_create_tis (ctx, &tis_attr); +if (!priv->tiss[i]) { +DRV_LOG (ERR ,"Failed to create TIS %u." , i); +return -rte_errno; + } + } + priv->null_mr = mlx5_glue->alloc_null_mr (priv->cdev->pd); +if (!priv->null_mr) { +DRV_LOG (ERR ,"Failed to allocate null MR." ); + rte_errno = errno; +return -rte_errno; + } +DRV_LOG (DEBUG ,"Dump fill Mkey = %u." , priv->null_mr->lkey); + priv->steer.domain = mlx5_glue->dr_create_domain (ctx, +MLX5DV_DR_DOMAIN_TYPE_NIC_RX ); +if (!priv->steer.domain) { +DRV_LOG (ERR ,"Failed to create Rx domain." ); + rte_errno = errno; +return -rte_errno; + } + priv->steer.tbl = mlx5_glue->dr_create_flow_tbl (priv->steer.domain,0 ); +if (!priv->steer.tbl) { +DRV_LOG (ERR ,"Failed to create table 0 with Rx domain." ); + rte_errno = errno; +return -rte_errno; + } +if (mlx5_vdpa_err_event_setup (priv) !=0 ) +return -rte_errno; +if (mlx5_vdpa_event_qp_global_prepare (priv)) +return -rte_errno; +return 0 ; +} +static int mlx5_vdpa_dev_probe (struct mlx5_common_device *cdev) {struct mlx5_vdpa_priv *priv =NULL ;struct mlx5_hca_attr *attr = &cdev->config.hca_attr; -int retry;if (!attr->vdpa.valid || !attr->vdpa.max_num_virtio_queues) { DRV_LOG(ERR, "Not enough capabilities to support vdpa, maybe "
@@ -533,25 +609,10 @@ mlx5_vdpa_dev_probe(struct mlx5_common_device *cdev) priv->num_lag_ports = attr->num_lag_ports;if (attr->num_lag_ports ==0 ) priv->num_lag_ports =1 ; +pthread_mutex_init (&priv->vq_config_lock,NULL ); priv->cdev = cdev; -for (retry =0 ; retry <7 ; retry++) { - priv->var = mlx5_glue->dv_alloc_var (priv->cdev->ctx,0 ); -if (priv->var !=NULL ) -break ; -DRV_LOG (WARNING ,"Failed to allocate VAR, retry %d.\n" , retry); -/* Wait Qemu release VAR during vdpa restart, 0.1 sec based. */ -usleep (100000U << retry); - } -if (!priv->var) { -DRV_LOG (ERR ,"Failed to allocate VAR %u." , errno); +if (mlx5_vdpa_create_dev_resources (priv)) goto error; - } - priv->err_intr_handle = -rte_intr_instance_alloc (RTE_INTR_INSTANCE_F_SHARED ); -if (priv->err_intr_handle ==NULL ) { -DRV_LOG (ERR ,"Fail to allocate intr_handle" ); - goto error; - } priv->vdev =rte_vdpa_register_device (cdev->dev, &mlx5_vdpa_ops);if (priv->vdev ==NULL ) {DRV_LOG (ERR ,"Failed to register vDPA device." );
@@ -560,19 +621,13 @@ mlx5_vdpa_dev_probe(struct mlx5_common_device *cdev) }mlx5_vdpa_config_get (cdev->dev->devargs, priv);SLIST_INIT (&priv->mr_list); -pthread_mutex_init (&priv->vq_config_lock,NULL );pthread_mutex_lock (&priv_list_lock);TAILQ_INSERT_TAIL (&priv_list, priv, next);pthread_mutex_unlock (&priv_list_lock);return 0 ; - error: -if (priv) { -if (priv->var) - mlx5_glue->dv_free_var (priv->var); -rte_intr_instance_free (priv->err_intr_handle); -rte_free (priv); - } +if (priv) +mlx5_vdpa_dev_release (priv);return -rte_errno; }
@@ -592,22 +647,48 @@ mlx5_vdpa_dev_remove(struct mlx5_common_device *cdev)if (found)TAILQ_REMOVE (&priv_list, priv, next);pthread_mutex_unlock (&priv_list_lock); -if (found) { -if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) -mlx5_vdpa_dev_close (priv->vid); -if (priv->var) { - mlx5_glue->dv_free_var (priv->var); - priv->var =NULL ; - } -if (priv->vdev) -rte_vdpa_unregister_device (priv->vdev); -pthread_mutex_destroy (&priv->vq_config_lock); -rte_intr_instance_free (priv->err_intr_handle); -rte_free (priv); - } +if (found) +mlx5_vdpa_dev_release (priv);return 0 ; } +static void +mlx5_vdpa_release_dev_resources (struct mlx5_vdpa_priv *priv) +{ +uint32_t i; + +mlx5_vdpa_event_qp_global_release (priv); +mlx5_vdpa_err_event_unset (priv); +if (priv->steer.tbl) +claim_zero (mlx5_glue->dr_destroy_flow_tbl (priv->steer.tbl)); +if (priv->steer.domain) +claim_zero (mlx5_glue->dr_destroy_domain (priv->steer.domain)); +if (priv->null_mr) +claim_zero (mlx5_glue->dereg_mr (priv->null_mr)); +for (i =0 ; i < priv->num_lag_ports; i++) { +if (priv->tiss[i]) +claim_zero (mlx5_devx_cmd_destroy (priv->tiss[i])); + } +if (priv->td) +claim_zero (mlx5_devx_cmd_destroy (priv->td)); +if (priv->virtq_db_addr) +claim_zero (munmap (priv->virtq_db_addr, priv->var->length)); +if (priv->var) + mlx5_glue->dv_free_var (priv->var); +} + +static void +mlx5_vdpa_dev_release (struct mlx5_vdpa_priv *priv) +{ +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) +mlx5_vdpa_dev_close (priv->vid); +mlx5_vdpa_release_dev_resources (priv); +if (priv->vdev) +rte_vdpa_unregister_device (priv->vdev); +pthread_mutex_destroy (&priv->vq_config_lock); +rte_free (priv); +} +static const struct rte_pci_id mlx5_vdpa_pci_id_map[] = { { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
drivers/vdpa/mlx5/mlx5_vdpa.h +9 -0
@@ -233,6 +233,15 @@ int mlx5_vdpa_event_qp_create(struct mlx5_vdpa_priv *priv, uint16_t desc_n,*/ void mlx5_vdpa_event_qp_destroy (struct mlx5_vdpa_event_qp *eqp); +/** +* Create all the event global resources. +* +* @param[in] priv +* The vdpa driver private structure. +*/ +int +mlx5_vdpa_event_qp_global_prepare (struct mlx5_vdpa_priv *priv); +/** * Release all the event global resources. *
drivers/vdpa/mlx5/mlx5_vdpa_event.c +14 -9
@@ -40,11 +40,9 @@ mlx5_vdpa_event_qp_global_release(struct mlx5_vdpa_priv *priv) }/* Prepare all the global resources for all the event objects.*/ -static int +int mlx5_vdpa_event_qp_global_prepare (struct mlx5_vdpa_priv *priv) { -if (priv->eventc) -return 0 ; priv->eventc =mlx5_os_devx_create_event_channel (priv->cdev->ctx,MLX5DV_DEVX_CREATE_EVENT_CHANNEL_FLAGS_OMIT_EV_DATA );if (!priv->eventc) {
@@ -389,22 +387,30 @@ mlx5_vdpa_err_event_setup(struct mlx5_vdpa_priv *priv) flags =fcntl (priv->err_chnl->fd,F_GETFL ); ret =fcntl (priv->err_chnl->fd,F_SETFL , flags |O_NONBLOCK );if (ret) { + rte_errno = errno;DRV_LOG (ERR ,"Failed to change device event channel FD." ); goto error; } - + priv->err_intr_handle = +rte_intr_instance_alloc (RTE_INTR_INSTANCE_F_SHARED ); +if (priv->err_intr_handle ==NULL ) { +DRV_LOG (ERR ,"Fail to allocate intr_handle" ); + goto error; + }if (rte_intr_fd_set (priv->err_intr_handle, priv->err_chnl->fd)) goto error;if (rte_intr_type_set (priv->err_intr_handle,RTE_INTR_HANDLE_EXT )) goto error; -if (rte_intr_callback_register (priv->err_intr_handle, - mlx5_vdpa_err_interrupt_handler, - priv)) { + ret =rte_intr_callback_register (priv->err_intr_handle, + mlx5_vdpa_err_interrupt_handler, + priv); +if (ret !=0 ) {rte_intr_fd_set (priv->err_intr_handle,0 );DRV_LOG (ERR ,"Failed to register error interrupt for device %d." , priv->vid); + rte_errno = -ret; goto error; }else { DRV_LOG(DEBUG, "Registered error interrupt for device%d.",
@@ -453,6 +459,7 @@ mlx5_vdpa_err_event_unset(struct mlx5_vdpa_priv *priv) mlx5_glue->devx_destroy_event_channel (priv->err_chnl); priv->err_chnl =NULL ; } +rte_intr_instance_free (priv->err_intr_handle); }int
@@ -575,8 +582,6 @@ mlx5_vdpa_event_qp_create(struct mlx5_vdpa_priv *priv, uint16_t desc_n,uint16_t log_desc_n =rte_log2_u32 (desc_n);uint32_t ret; -if (mlx5_vdpa_event_qp_global_prepare (priv)) -return -1 ;if (mlx5_vdpa_cq_create (priv, log_desc_n, callfd, &eqp->cq))return -1 ; attr.pd = priv->cdev->pdn;
drivers/vdpa/mlx5/mlx5_vdpa_mem.c +0 -11
@@ -34,10 +34,6 @@ mlx5_vdpa_mem_dereg(struct mlx5_vdpa_priv *priv)SLIST_INIT (&priv->mr_list);if (priv->lm_mr.addr)mlx5_os_wrapped_mkey_destroy (&priv->lm_mr); -if (priv->null_mr) { -claim_zero (mlx5_glue->dereg_mr (priv->null_mr)); - priv->null_mr =NULL ; - }if (priv->vmem) {free (priv->vmem); priv->vmem =NULL ;
@@ -196,13 +192,6 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv)if (!mem)return -rte_errno; priv->vmem = mem; - priv->null_mr = mlx5_glue->alloc_null_mr (priv->cdev->pd); -if (!priv->null_mr) { -DRV_LOG (ERR ,"Failed to allocate null MR." ); - ret = -errno; - goto error; - } -DRV_LOG (DEBUG ,"Dump fill Mkey = %u." , priv->null_mr->lkey);for (i =0 ; i < mem->nregions; i++) { reg = &mem->regions[i]; entry =rte_zmalloc (__func__,sizeof (*entry),0 );
drivers/vdpa/mlx5/mlx5_vdpa_steer.c +1 -24
@@ -45,14 +45,6 @@ void mlx5_vdpa_steer_unset(struct mlx5_vdpa_priv *priv) {mlx5_vdpa_rss_flows_destroy (priv); -if (priv->steer.tbl) { -claim_zero (mlx5_glue->dr_destroy_flow_tbl (priv->steer.tbl)); - priv->steer.tbl =NULL ; - } -if (priv->steer.domain) { -claim_zero (mlx5_glue->dr_destroy_domain (priv->steer.domain)); - priv->steer.domain =NULL ; - }if (priv->steer.rqt) {claim_zero (mlx5_devx_cmd_destroy (priv->steer.rqt)); priv->steer.rqt =NULL ;
@@ -248,11 +240,7 @@ mlx5_vdpa_steer_update(struct mlx5_vdpa_priv *priv)int ret =mlx5_vdpa_rqt_prepare (priv);if (ret ==0 ) { -mlx5_vdpa_rss_flows_destroy (priv); -if (priv->steer.rqt) { -claim_zero (mlx5_devx_cmd_destroy (priv->steer.rqt)); - priv->steer.rqt =NULL ; - } +mlx5_vdpa_steer_unset (priv); }else if (ret <0 ) {return ret; }else if (!priv->steer.rss[0 ].flow) {
@@ -269,17 +257,6 @@ int mlx5_vdpa_steer_setup(struct mlx5_vdpa_priv *priv) {#ifdef HAVE_MLX5DV_DR - priv->steer.domain = mlx5_glue->dr_create_domain (priv->cdev->ctx, -MLX5DV_DR_DOMAIN_TYPE_NIC_RX ); -if (!priv->steer.domain) { -DRV_LOG (ERR ,"Failed to create Rx domain." ); - goto error; - } - priv->steer.tbl = mlx5_glue->dr_create_flow_tbl (priv->steer.domain,0 ); -if (!priv->steer.tbl) { -DRV_LOG (ERR ,"Failed to create table 0 with Rx domain." ); - goto error; - }if (mlx5_vdpa_steer_update (priv)) goto error;return 0 ;
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +0 -44
68 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH 5/7 vdpa/mlx5: cache and reuse hardware resources
In reply to Xueming LiDuring device suspend and resume, resources are not changed normally. When huge resources allocated to VM, like huge memory size or lots of queues, time spent on release and recreate became significant.
To speed up, this patch reuse resoruces like VM MR and VirtQ memory if not changed.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 11 ++++- drivers/vdpa/mlx5/mlx5_vdpa.h | 12 ++++- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 27 ++++++++++- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 73 +++++++++++++++++++++-------- 4 files changed, 99 insertions(+), 24 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa.c +10 -1
@@ -241,6 +241,13 @@ mlx5_vdpa_mtu_set(struct mlx5_vdpa_priv *priv)return kern_mtu == vhost_mtu ?0 :-1 ; } +static void +mlx5_vdpa_dev_cache_clean (struct mlx5_vdpa_priv *priv) +{ +mlx5_vdpa_virtqs_cleanup (priv); +mlx5_vdpa_mem_dereg (priv); +} +static int mlx5_vdpa_dev_close (int vid) {
@@ -260,7 +267,8 @@ mlx5_vdpa_dev_close(int vid) }mlx5_vdpa_steer_unset (priv);mlx5_vdpa_virtqs_release (priv); -mlx5_vdpa_mem_dereg (priv); +if (priv->lm_mr.addr) +mlx5_os_wrapped_mkey_destroy (&priv->lm_mr); priv->state =MLX5_VDPA_STATE_PROBED ; priv->vid =0 ;/* The mutex may stay locked after event thread cancel - initiate it. */
@@ -657,6 +665,7 @@ mlx5_vdpa_release_dev_resources(struct mlx5_vdpa_priv *priv) {uint32_t i; +mlx5_vdpa_dev_cache_clean (priv);mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_err_event_unset (priv);if (priv->steer.tbl)
drivers/vdpa/mlx5/mlx5_vdpa.h +10 -2
@@ -289,13 +289,21 @@ int mlx5_vdpa_err_event_setup(struct mlx5_vdpa_priv *priv);void mlx5_vdpa_err_event_unset (struct mlx5_vdpa_priv *priv);/** -* Release a virtq and all its related resources. +* Release virtqs and resources except that to be reused. * * @param[in] priv * The vdpa driver private structure. */ void mlx5_vdpa_virtqs_release (struct mlx5_vdpa_priv *priv); +/** +* Cleanup cached resources of all virtqs. +* +* @param[in] priv +* The vdpa driver private structure. +*/ +void mlx5_vdpa_virtqs_cleanup (struct mlx5_vdpa_priv *priv); +/** * Create all the HW virtqs resources and all their related resources. *
@@ -323,7 +331,7 @@ int mlx5_vdpa_virtqs_prepare(struct mlx5_vdpa_priv *priv);int mlx5_vdpa_virtq_enable (struct mlx5_vdpa_priv *priv,int index,int enable);/** -* Unset steering and release all its related resources- stop traffic. +* Unset steering - stop traffic. * * @param[in] priv * The vdpa driver private structure.
drivers/vdpa/mlx5/mlx5_vdpa_mem.c +25 -2
@@ -32,8 +32,6 @@ mlx5_vdpa_mem_dereg(struct mlx5_vdpa_priv *priv) entry = next; }SLIST_INIT (&priv->mr_list); -if (priv->lm_mr.addr) -mlx5_os_wrapped_mkey_destroy (&priv->lm_mr);if (priv->vmem) {free (priv->vmem); priv->vmem =NULL ;
@@ -149,6 +147,23 @@ mlx5_vdpa_vhost_mem_regions_prepare(int vid, uint8_t *mode, uint64_t *mem_size,return mem; } +static int +mlx5_vdpa_mem_cmp (struct rte_vhost_memory *mem1,struct rte_vhost_memory *mem2) +{ +uint32_t i; + +if (mem1->nregions != mem2->nregions) +return -1 ; +for (i =0 ; i < mem1->nregions; i++) { +if (mem1->regions[i].guest_phys_addr != + mem2->regions[i].guest_phys_addr) +return -1 ; +if (mem1->regions[i].size != mem2->regions[i].size) +return -1 ; + } +return 0 ; +} +#define KLM_SIZE_MAX_ALIGN (sz) ((sz) > MLX5_MAX_KLM_BYTE_COUNT ? \ MLX5_MAX_KLM_BYTE_COUNT : (sz))
@@ -191,6 +206,14 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv)if (!mem)return -rte_errno; +if (priv->vmem !=NULL ) { +if (mlx5_vdpa_mem_cmp (mem, priv->vmem) ==0 ) { +/* VM memory not changed, reuse resources. */ +free (mem); +return 0 ; + } +mlx5_vdpa_mem_dereg (priv); + } priv->vmem = mem;for (i =0 ; i < mem->nregions; i++) { reg = &mem->regions[i];
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +54 -19
114 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH 6/7 vdpa/mlx5: support device cleanup callback
In reply to Xueming LiThis patch supports device cleanup callback API which called when device disconnected with VM. Cached resources like VM MR and VQ memory are released.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 23 +++++++++++++++++++++++ drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + 2 files changed, 24 insertions(+)
drivers/vdpa/mlx5/mlx5_vdpa.c +23 -0
@@ -270,6 +270,8 @@ mlx5_vdpa_dev_close(int vid)if (priv->lm_mr.addr)mlx5_os_wrapped_mkey_destroy (&priv->lm_mr); priv->state =MLX5_VDPA_STATE_PROBED ; +if (!priv->connected) +mlx5_vdpa_dev_cache_clean (priv); priv->vid =0 ;/* The mutex may stay locked after event thread cancel - initiate it. */ pthread_mutex_init (&priv->vq_config_lock,NULL );
@@ -294,6 +296,7 @@ mlx5_vdpa_dev_config(int vid)return -1 ; } priv->vid = vid; + priv->connected = true;if (mlx5_vdpa_mtu_set (priv))DRV_LOG (WARNING ,"MTU cannot be set on device %s." , vdev->device->name);
@@ -431,12 +434,32 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)return mlx5_vdpa_virtq_stats_reset (priv, qid); } +static int +mlx5_vdpa_dev_clean (int vid) +{ +struct rte_vdpa_device *vdev =rte_vhost_get_vdpa_device (vid); +struct mlx5_vdpa_priv *priv; + +if (vdev ==NULL ) +return -1 ; + priv =mlx5_vdpa_find_priv_resource_by_vdev (vdev); +if (priv ==NULL ) { +DRV_LOG (ERR ,"Invalid vDPA device: %s." , vdev->device->name); +return -1 ; + } +if (priv->state ==MLX5_VDPA_STATE_PROBED ) +mlx5_vdpa_dev_cache_clean (priv); + priv->connected = false; +return 0 ; +} +static struct rte_vdpa_dev_ops mlx5_vdpa_ops = { .get_queue_num = mlx5_vdpa_get_queue_num, .get_features = mlx5_vdpa_get_vdpa_features, .get_protocol_features = mlx5_vdpa_get_protocol_features, .dev_conf = mlx5_vdpa_dev_config, .dev_close = mlx5_vdpa_dev_close, + .dev_cleanup = mlx5_vdpa_dev_clean, .set_vring_state = mlx5_vdpa_set_vring_state, .set_features = mlx5_vdpa_features_set, .migration_done =NULL ,
drivers/vdpa/mlx5/mlx5_vdpa.h +1 -0
@@ -121,6 +121,7 @@ enum mlx5_dev_state {struct mlx5_vdpa_priv {TAILQ_ENTRY (mlx5_vdpa_priv) next; +bool connected;enum mlx5_dev_state state;pthread_mutex_t vq_config_lock;uint64_t no_traffic_counter;
Signature · 1 line
2.35.1
PATCH 7/7 vdpa/mlx5: make statistics counter persistent
In reply to Xueming LiTo speed the device suspend and resume time, make counter persitent in reconfiguration until the device gets removed.
--- doc/guides/vdpadevs/mlx5.rst | 6 ++++++ drivers/vdpa/mlx5/mlx5_vdpa.c | 19 +++++++---------- drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 32 +++++++++++------------------ 4 files changed, 26 insertions(+), 32 deletions(-)
doc/guides/vdpadevs/mlx5.rst +6 -0
@@ -182,3 +182,9 @@ Upon potential hardware errors, mlx5 PMD try to recover, give up if failed 3 times in 3 seconds, virtq will be put in disable state. User should check log to get error information, or query vdpa statistics counter to know error type and count report. + +Statistics +^^^^^^^^^^ + +The device statistics counter persists in reconfiguration until the device gets +removed. User can reset counters by calling function rte_vdpa_reset_stats().
drivers/vdpa/mlx5/mlx5_vdpa.c +7 -12
@@ -388,12 +388,7 @@ mlx5_vdpa_get_stats(struct rte_vdpa_device *vdev, int qid,DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (priv->state ==MLX5_VDPA_STATE_PROBED ) { -DRV_LOG (ERR ,"Device %s was not configured." , - vdev->device->name); -return -ENODATA ; - } -if (qid >= (int )priv->nr_virtqs) { +if (qid >= (int )priv->caps.max_num_virtio_queues *2 ) {DRV_LOG (ERR ,"Too big vring id: %d for device %s." , qid, vdev->device->name);return -E2BIG ;
@@ -416,12 +411,7 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (priv->state ==MLX5_VDPA_STATE_PROBED ) { -DRV_LOG (ERR ,"Device %s was not configured." , - vdev->device->name); -return -ENODATA ; - } -if (qid >= (int )priv->nr_virtqs) { +if (qid >= (int )priv->caps.max_num_virtio_queues *2 ) {DRV_LOG (ERR ,"Too big vring id: %d for device %s." , qid, vdev->device->name);return -E2BIG ;
@@ -689,6 +679,11 @@ mlx5_vdpa_release_dev_resources(struct mlx5_vdpa_priv *priv)uint32_t i;mlx5_vdpa_dev_cache_clean (priv); +for (i =0 ; i < priv->caps.max_num_virtio_queues *2 ; i++) { +if (!priv->virtqs[i].counters) +continue ; +claim_zero (mlx5_devx_cmd_destroy (priv->virtqs[i].counters)); + }mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_err_event_unset (priv);if (priv->steer.tbl)
drivers/vdpa/mlx5/mlx5_vdpa.h +1 -0
@@ -92,6 +92,7 @@ struct mlx5_vdpa_virtq {struct rte_intr_handle *intr_handle;uint64_t err_time[3 ];/* RDTSC time of recent errors. */ uint32_t n_retry; +struct mlx5_devx_virtio_q_couners_attr stats;struct mlx5_devx_virtio_q_couners_attr reset; };
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +12 -20
@@ -127,14 +127,9 @@ void mlx5_vdpa_virtqs_release(struct mlx5_vdpa_priv *priv) {int i; -struct mlx5_vdpa_virtq *virtq; -for (i =0 ; i < priv->nr_virtqs; i++) { - virtq = &priv->virtqs[i]; -mlx5_vdpa_virtq_unset (virtq); -if (virtq->counters) -claim_zero (mlx5_devx_cmd_destroy (virtq->counters)); - } +for (i =0 ; i < priv->nr_virtqs; i++) +mlx5_vdpa_virtq_unset (&priv->virtqs[i]); priv->features =0 ; priv->nr_virtqs =0 ; }
@@ -590,7 +585,7 @@ mlx5_vdpa_virtq_stats_get(struct mlx5_vdpa_priv *priv, int qid, struct rte_vdpa_stat *stats, unsigned int n) {struct mlx5_vdpa_virtq *virtq = &priv->virtqs[qid]; -struct mlx5_devx_virtio_q_couners_attr attr = {0 }; +struct mlx5_devx_virtio_q_couners_attr *attr = &virtq->stats;int ret;if (!virtq->counters) {
@@ -598,7 +593,7 @@ mlx5_vdpa_virtq_stats_get(struct mlx5_vdpa_priv *priv, int qid, "is invalid.", qid);return -EINVAL ; } - ret =mlx5_devx_cmd_query_virtio_q_counters (virtq->counters, &attr); + ret =mlx5_devx_cmd_query_virtio_q_counters (virtq->counters, attr);if (ret) {DRV_LOG (ERR ,"Failed to read virtq %d stats from HW." , qid);return ret;
@@ -608,37 +603,37 @@ mlx5_vdpa_virtq_stats_get(struct mlx5_vdpa_priv *priv, int qid,return ret; stats[MLX5_VDPA_STATS_RECEIVED_DESCRIPTORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_RECEIVED_DESCRIPTORS , - .value = attr.received_desc - virtq->reset.received_desc, + .value = attr->received_desc - virtq->reset.received_desc, };if (ret ==MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS )return ret; stats[MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS , - .value = attr.completed_desc - virtq->reset.completed_desc, + .value = attr->completed_desc - virtq->reset.completed_desc, };if (ret ==MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS )return ret; stats[MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS , - .value = attr.bad_desc_errors - virtq->reset.bad_desc_errors, + .value = attr->bad_desc_errors - virtq->reset.bad_desc_errors, };if (ret ==MLX5_VDPA_STATS_EXCEED_MAX_CHAIN )return ret; stats[MLX5_VDPA_STATS_EXCEED_MAX_CHAIN ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_EXCEED_MAX_CHAIN , - .value = attr.exceed_max_chain - virtq->reset.exceed_max_chain, + .value = attr->exceed_max_chain - virtq->reset.exceed_max_chain, };if (ret ==MLX5_VDPA_STATS_INVALID_BUFFER )return ret; stats[MLX5_VDPA_STATS_INVALID_BUFFER ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_INVALID_BUFFER , - .value = attr.invalid_buffer - virtq->reset.invalid_buffer, + .value = attr->invalid_buffer - virtq->reset.invalid_buffer, };if (ret ==MLX5_VDPA_STATS_COMPLETION_ERRORS )return ret; stats[MLX5_VDPA_STATS_COMPLETION_ERRORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_COMPLETION_ERRORS , - .value = attr.error_cqes - virtq->reset.error_cqes, + .value = attr->error_cqes - virtq->reset.error_cqes, };return ret; }
@@ -649,11 +644,8 @@ mlx5_vdpa_virtq_stats_reset(struct mlx5_vdpa_priv *priv, int qid)struct mlx5_vdpa_virtq *virtq = &priv->virtqs[qid];int ret; -if (!virtq->counters) { -DRV_LOG (ERR ,"Failed to read virtq %d statistics - virtq " -"is invalid." , qid); -return -EINVAL ; - } +if (virtq->counters ==NULL )/* VQ not enabled. */ +return 0 ; ret =mlx5_devx_cmd_query_virtio_q_counters (virtq->counters, &virtq->reset);if (ret)
Signature · 1 line
2.35.1
v2 cover vdpa/mlx5: improve device shutdown time
In reply to Xueming Liv1:
- rebase with latest upstream code
- fix coverity issues
v2:
- fix build issue on OS w/o flow DR API
Xueming Li (7):
vdpa/mlx5: fix interrupt trash that leads to segment fault vdpa/mlx5: fix dead loop when process interrupted vdpa/mlx5: no kick handling during shutdown vdpa/mlx5: reuse resources in reconfiguration vdpa/mlx5: cache and reuse hardware resources vdpa/mlx5: support device cleanup callback vdpa/mlx5: make statistics counter persistent
doc/guides/vdpadevs/mlx5.rst | 6 + drivers/vdpa/mlx5/mlx5_vdpa.c | 231 +++++++++++++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 31 +++- drivers/vdpa/mlx5/mlx5_vdpa_event.c | 23 +-- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 38 +++-- drivers/vdpa/mlx5/mlx5_vdpa_steer.c | 30 +--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 189 +++++++++++------------ 7 files changed, 336 insertions(+), 212 deletions(-)
Signature · 1 line
2.35.1
PATCH v2 1/7 vdpa/mlx5: fix interrupt trash that leads to segment fault
Disable interrupt unregister timeout to avoid invalid FD caused interrupt thread segment fault.
--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +8 -12
@@ -17,7 +17,7 @@static void -mlx5_vdpa_virtq_handler (void *cb_arg) +mlx5_vdpa_virtq_kick_handler (void *cb_arg) {struct mlx5_vdpa_virtq *virtq = cb_arg;struct mlx5_vdpa_priv *priv = virtq->priv;
@@ -59,20 +59,16 @@ static int mlx5_vdpa_virtq_unset(struct mlx5_vdpa_virtq *virtq) {unsigned int i; -int retries =MLX5_VDPA_INTR_RETRIES ;int ret = -EAGAIN ; -if (rte_intr_fd_get (virtq->intr_handle) !=-1 ) { -while (retries-- && ret == -EAGAIN ) { +if (rte_intr_fd_get (virtq->intr_handle) >=0 ) { +while (ret == -EAGAIN ) { ret =rte_intr_callback_unregister (virtq->intr_handle, - mlx5_vdpa_virtq_handler, - virtq); + mlx5_vdpa_virtq_kick_handler, virtq);if (ret == -EAGAIN ) { -DRV_LOG (DEBUG ,"Try again to unregister fd %d " -"of virtq %d interrupt, retries = %d." , -rte_intr_fd_get (virtq->intr_handle), - (int )virtq->index, retries); - +DRV_LOG (DEBUG ,"Try again to unregister fd %d of virtq %hu interrupt" , +rte_intr_fd_get (virtq->intr_handle), + (int )virtq->index);usleep (MLX5_VDPA_INTR_RETRIES_USEC ); } }
@@ -359,7 +355,7 @@ mlx5_vdpa_virtq_setup(struct mlx5_vdpa_priv *priv, int index) goto error;if (rte_intr_callback_register (virtq->intr_handle, - mlx5_vdpa_virtq_handler, + mlx5_vdpa_virtq_kick_handler, virtq)) {rte_intr_fd_set (virtq->intr_handle,-1 ); DRV_LOG(ERR, "Failed to register virtq %d interrupt.",
Signature · 1 line
2.35.1
Re: [PATCH v2 1/7] vdpa/mlx5: fix interrupt trash that leads to segment fault
Quoted 12 lines · Xueming Li
Disable interrupt unregister timeout to avoid invalid FD caused interrupt thread segment fault.
Signed-off-by Xueming Li <[email protected]>--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
Thanks,
Maxime
PATCH v2 2/7 vdpa/mlx5: fix dead loop when process interrupted
In reply to Xueming LiIn Ctrl+C handling, sometimes kick handling thread gets endless EGAIN error and fall into dead lock.
Kick happens frequently in real system due to busy traffic or retry mechanism. This patch simplifies kick firmware anyway and skip setting hardware notifier due to potential device error, notifier could be set in next successful kick request.
--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +5 -3
@@ -23,11 +23,11 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg)struct mlx5_vdpa_priv *priv = virtq->priv;uint64_t buf;int nbytes; +int retry;if (rte_intr_fd_get (virtq->intr_handle) <0 )return ; - - do { +for (retry =0 ; retry <3 ; ++retry) { nbytes =read (rte_intr_fd_get (virtq->intr_handle), &buf,8 );if (nbytes <0 ) {
@@ -39,7 +39,9 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg) virtq->index, strerror(errno)); }break ; - }while (1 ); + } +if (nbytes <0 ) +return ;rte_write32 (virtq->index, priv->virtq_db_addr);if (virtq->notifier_state ==MLX5_VDPA_NOTIFIER_STATE_DISABLED ) {if (rte_vhost_host_notifier_ctrl (priv->vid, virtq->index, true))
Signature · 1 line
2.35.1
Re: [PATCH v2 2/7] vdpa/mlx5: fix dead loop when process interrupted
Quoted 35 lines · Xueming Li
In Ctrl+C handling, sometimes kick handling thread gets endless EGAIN error and fall into dead lock.
Kick happens frequently in real system due to busy traffic or retry mechanism. This patch simplifies kick firmware anyway and skip setting hardware notifier due to potential device error, notifier could be set in next successful kick request.
Fixes 62c813706e41 ("vdpa/mlx5: map doorbell")Signed-off-by Xueming Li <[email protected]>--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +2
-2@@ -23,11 +23,11 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg)struct mlx5_vdpa_priv *priv = virtq->priv;uint64_t buf;int nbytes; +int retry;if (rte_intr_fd_get (virtq->intr_handle) <0 )return ; - - do { +for (retry =0 ; retry <3 ; ++retry) { nbytes =read (rte_intr_fd_get (virtq->intr_handle), &buf,8 );if (nbytes <0 ) {
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c mlx5_vdpa_virtq_kick_handler(void *cb_arg) · line 47
Quoted 10 lines
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +3
-1@@ -39,7 +39,9 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg) virtq->index, strerror(errno)); }break ; - }while (1 ); + } +if (nbytes <0 ) +return ;rte_write32 (virtq->index, priv->virtq_db_addr);if (virtq->notifier_state ==MLX5_VDPA_NOTIFIER_STATE_DISABLED ) {if (rte_vhost_host_notifier_ctrl (priv->vid, virtq->index, true))
Thanks,
Maxime
PATCH v2 3/7 vdpa/mlx5: no kick handling during shutdown
In reply to Xueming LiWhen Qemu suspend a VM, hw notifier is un-mmapped while vCPU thread may still active and write notifier through kick socket.
PMD kick handler thread tries to install hw notifier through client socket in such case will timeout and slow down device close.
This patch skips hw notifier install if VQ or device in middle of shutdown.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 17 ++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 8 +++++++- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 12 +++++++++++- 3 files changed, 28 insertions(+), 9 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa.c +10 -7
@@ -252,13 +252,15 @@ mlx5_vdpa_dev_close(int vid) }mlx5_vdpa_err_event_unset (priv);mlx5_vdpa_cqe_event_unset (priv); -if (priv->configured) +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) { ret |=mlx5_vdpa_lm_log (priv); + priv->state =MLX5_VDPA_STATE_IN_PROGRESS ; + }mlx5_vdpa_steer_unset (priv);mlx5_vdpa_virtqs_release (priv);mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_mem_dereg (priv); - priv->configured =0 ; + priv->state =MLX5_VDPA_STATE_PROBED ; priv->vid =0 ;/* The mutex may stay locked after event thread cancel - initiate it. */ pthread_mutex_init (&priv->vq_config_lock,NULL );
@@ -277,7 +279,8 @@ mlx5_vdpa_dev_config(int vid)DRV_LOG (ERR ,"Invalid vDPA device: %s." , vdev->device->name);return -EINVAL ; } -if (priv->configured &&mlx5_vdpa_dev_close (vid)) { +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED && +mlx5_vdpa_dev_close (vid)) {DRV_LOG (ERR ,"Failed to reconfigure vid %d." , vid);return -1 ; }
@@ -291,7 +294,7 @@ mlx5_vdpa_dev_config(int vid)mlx5_vdpa_dev_close (vid);return -1 ; } - priv->configured =1 ; + priv->state =MLX5_VDPA_STATE_CONFIGURED ;DRV_LOG (INFO ,"vDPA device %d was configured." , vid);return 0 ; }
@@ -373,7 +376,7 @@ mlx5_vdpa_get_stats(struct rte_vdpa_device *vdev, int qid,DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (!priv->configured) { +if (priv->state ==MLX5_VDPA_STATE_PROBED ) {DRV_LOG (ERR ,"Device %s was not configured." , vdev->device->name);return -ENODATA ;
@@ -401,7 +404,7 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (!priv->configured) { +if (priv->state ==MLX5_VDPA_STATE_PROBED ) {DRV_LOG (ERR ,"Device %s was not configured." , vdev->device->name);return -ENODATA ;
@@ -590,7 +593,7 @@ mlx5_vdpa_dev_remove(struct mlx5_common_device *cdev)TAILQ_REMOVE (&priv_list, priv, next);pthread_mutex_unlock (&priv_list_lock);if (found) { -if (priv->configured) +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED )mlx5_vdpa_dev_close (priv->vid);if (priv->var) { mlx5_glue->dv_free_var (priv->var);
drivers/vdpa/mlx5/mlx5_vdpa.h +7 -1
@@ -113,9 +113,15 @@ enum {MLX5_VDPA_EVENT_MODE_ONLY_INTERRUPT }; +enum mlx5_dev_state { +MLX5_VDPA_STATE_PROBED =0 , +MLX5_VDPA_STATE_CONFIGURED , +MLX5_VDPA_STATE_IN_PROGRESS /* Shutting down. */ +}; +struct mlx5_vdpa_priv {TAILQ_ENTRY (mlx5_vdpa_priv) next; -uint8_t configured; +enum mlx5_dev_state state;pthread_mutex_t vq_config_lock;uint64_t no_traffic_counter;pthread_t timer_tid;
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +11 -1
@@ -25,6 +25,11 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg)int nbytes;int retry; +if (priv->state !=MLX5_VDPA_STATE_CONFIGURED && !virtq->enable) { +DRV_LOG (ERR ,"device %d queue %d down, skip kick handling" , + priv->vid, virtq->index); +return ; + }if (rte_intr_fd_get (virtq->intr_handle) <0 )return ;for (retry =0 ; retry <3 ; ++retry) {
@@ -43,6 +48,11 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg)if (nbytes <0 )return ;rte_write32 (virtq->index, priv->virtq_db_addr); +if (priv->state !=MLX5_VDPA_STATE_CONFIGURED && !virtq->enable) { +DRV_LOG (ERR ,"device %d queue %d down, skip kick handling" , + priv->vid, virtq->index); +return ; + }if (virtq->notifier_state ==MLX5_VDPA_NOTIFIER_STATE_DISABLED ) {if (rte_vhost_host_notifier_ctrl (priv->vid, virtq->index, true)) virtq->notifier_state =MLX5_VDPA_NOTIFIER_STATE_ERR ;
@@ -541,7 +551,7 @@ mlx5_vdpa_virtq_enable(struct mlx5_vdpa_priv *priv, int index, int enable)DRV_LOG (INFO ,"Update virtq %d status %sable -> %sable." , index, virtq->enable ?"en" :"dis" , enable ?"en" :"dis" ); -if (!priv->configured) { +if (priv->state ==MLX5_VDPA_STATE_PROBED ) { virtq->enable = !!enable;return 0 ; }
Signature · 1 line
2.35.1
Re: [PATCH v2 3/7] vdpa/mlx5: no kick handling during shutdown
Quoted 1 line · Xueming Li
When Qemu suspend a VM, hw notifier is un-mmapped while vCPU thread may
suspends
Quoted 1 line
still active and write notifier through kick socket.
still be active
Quoted 3 lines
PMD kick handler thread tries to install hw notifier through client socket in such case will timeout and slow down device close.
socket. In such case, it will
Quoted 11 lines
This patch skips hw notifier install if VQ or device in middle of shutdown.
Signed-off-by Xueming Li <[email protected]>--- drivers/vdpa/mlx5/mlx5_vdpa.c | 17 ++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 8 +++++++- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 12 +++++++++++- 3 files changed, 28 insertions(+), 9 deletions(-)
Other than the commit messages comments:
If you are fine with my suggestions and no other revision needed, I can fixup while applying.
Thanks,
Maxime
RE: [PATCH v2 3/7] vdpa/mlx5: no kick handling during shutdown
Quoted 34 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Wednesday, April 20, 2022 8:38 PM
To: Xueming(Steven) Li <[email protected]>; [email protected]
Cc: Matan Azrad <[email protected]>; Slava Ovsiienko <[email protected]>
Subject: Re: [PATCH v2 3/7] vdpa/mlx5: no kick handling during shutdownQuoted 2 lines · Xueming Li
When Qemu suspend a VM, hw notifier is un-mmapped while vCPU thread may
suspends
Quoted 1 line
still active and write notifier through kick socket.
still be active
Quoted 3 lines
PMD kick handler thread tries to install hw notifier through client socket in such case will timeout and slow down device close.
socket. In such case, it will
Quoted 11 lines
This patch skips hw notifier install if VQ or device in middle of shutdown.
Signed-off-by Xueming Li <[email protected]>--- drivers/vdpa/mlx5/mlx5_vdpa.c | 17 ++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 8 +++++++- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 12 +++++++++++- 3 files changed, 28 insertions(+), 9 deletions(-)
Quoted 5 lines
Other than the commit messages comments:
Reviewed-by Maxime Coquelin <[email protected]>If you are fine with my suggestions and no other revision needed, I can fixup while applying.
Hi Maxime,
No further changes so far, please continue, thanks for taking care of this series!
Quoted 3 lines
Thanks,
Maxime
PATCH v2 4/7 vdpa/mlx5: reuse resources in reconfiguration
In reply to Xueming LiTo speed up device resume, create reuseable resources during device probe state, release when device remove. Reused resources includes TIS, TD, VAR Doorbell mmap, error handling event channel and interrupt handler, UAR, Rx event channel, NULL MR, steer domain and table.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 167 +++++++++++++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 9 ++ drivers/vdpa/mlx5/mlx5_vdpa_event.c | 23 ++-- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 11 -- drivers/vdpa/mlx5/mlx5_vdpa_steer.c | 30 +---- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 44 -------- 6 files changed, 149 insertions(+), 135 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa.c +125 -42
@@ -5,6 +5,7 @@#include <net/if.h> #include <sys/socket.h> #include <sys/ioctl.h> +#include <sys/mman.h> #include <fcntl.h> #include <netinet/in.h>
@@ -49,6 +50,8 @@ TAILQ_HEAD(mlx5_vdpa_privs, mlx5_vdpa_priv) priv_list =TAILQ_HEAD_INITIALIZER (priv_list);static pthread_mutex_t priv_list_lock =PTHREAD_MUTEX_INITIALIZER ; +static void mlx5_vdpa_dev_release (struct mlx5_vdpa_priv *priv); +static struct mlx5_vdpa_priv *mlx5_vdpa_find_priv_resource_by_vdev (struct rte_vdpa_device *vdev) {
@@ -250,7 +253,6 @@ mlx5_vdpa_dev_close(int vid)DRV_LOG (ERR ,"Invalid vDPA device: %s." , vdev->device->name);return -1 ; } -mlx5_vdpa_err_event_unset (priv);mlx5_vdpa_cqe_event_unset (priv);if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) { ret |=mlx5_vdpa_lm_log (priv);
@@ -258,7 +260,6 @@ mlx5_vdpa_dev_close(int vid) }mlx5_vdpa_steer_unset (priv);mlx5_vdpa_virtqs_release (priv); -mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_mem_dereg (priv); priv->state =MLX5_VDPA_STATE_PROBED ; priv->vid =0 ;
@@ -288,7 +289,7 @@ mlx5_vdpa_dev_config(int vid)if (mlx5_vdpa_mtu_set (priv))DRV_LOG (WARNING ,"MTU cannot be set on device %s." , vdev->device->name); -if (mlx5_vdpa_mem_register (priv) ||mlx5_vdpa_err_event_setup (priv) || +if (mlx5_vdpa_mem_register (priv) ||mlx5_vdpa_virtqs_prepare (priv) ||mlx5_vdpa_steer_setup (priv) ||mlx5_vdpa_cqe_event_setup (priv)) {mlx5_vdpa_dev_close (vid);
@@ -504,12 +505,89 @@ mlx5_vdpa_config_get(struct rte_devargs *devargs, struct mlx5_vdpa_priv *priv)DRV_LOG (DEBUG ,"no traffic max is %u." , priv->no_traffic_max); } +static int +mlx5_vdpa_create_dev_resources (struct mlx5_vdpa_priv *priv) +{ +struct mlx5_devx_tis_attr tis_attr = {0 }; +struct ibv_context *ctx = priv->cdev->ctx; +uint32_t i; +int retry; + +for (retry =0 ; retry <7 ; retry++) { + priv->var = mlx5_glue->dv_alloc_var (ctx,0 ); +if (priv->var !=NULL ) +break ; +DRV_LOG (WARNING ,"Failed to allocate VAR, retry %d." , retry); +/* Wait Qemu release VAR during vdpa restart, 0.1 sec based. */ +usleep (100000U << retry); + } +if (!priv->var) { +DRV_LOG (ERR ,"Failed to allocate VAR %u." , errno); + rte_errno =ENOMEM ; +return -rte_errno; + } +/* Always map the entire page. */ + priv->virtq_db_addr =mmap (NULL , priv->var->length,PROT_READ | +PROT_WRITE ,MAP_SHARED , ctx->cmd_fd, + priv->var->mmap_off); +if (priv->virtq_db_addr ==MAP_FAILED ) { +DRV_LOG (ERR ,"Failed to map doorbell page %u." , errno); + priv->virtq_db_addr =NULL ; + rte_errno = errno; +return -rte_errno; + } +DRV_LOG (DEBUG ,"VAR address of doorbell mapping is %p." , + priv->virtq_db_addr); + priv->td =mlx5_devx_cmd_create_td (ctx); +if (!priv->td) { +DRV_LOG (ERR ,"Failed to create transport domain." ); + rte_errno = errno; +return -rte_errno; + } + tis_attr.transport_domain = priv->td->id; +for (i =0 ; i < priv->num_lag_ports; i++) { +/* 0 is auto affinity, non-zero value to propose port. */ + tis_attr.lag_tx_port_affinity = i +1 ; + priv->tiss[i] =mlx5_devx_cmd_create_tis (ctx, &tis_attr); +if (!priv->tiss[i]) { +DRV_LOG (ERR ,"Failed to create TIS %u." , i); +return -rte_errno; + } + } + priv->null_mr = mlx5_glue->alloc_null_mr (priv->cdev->pd); +if (!priv->null_mr) { +DRV_LOG (ERR ,"Failed to allocate null MR." ); + rte_errno = errno; +return -rte_errno; + } +DRV_LOG (DEBUG ,"Dump fill Mkey = %u." , priv->null_mr->lkey); +#ifdef HAVE_MLX5DV_DR + priv->steer.domain = mlx5_glue->dr_create_domain (ctx, +MLX5DV_DR_DOMAIN_TYPE_NIC_RX ); +if (!priv->steer.domain) { +DRV_LOG (ERR ,"Failed to create Rx domain." ); + rte_errno = errno; +return -rte_errno; + } +#endif + priv->steer.tbl = mlx5_glue->dr_create_flow_tbl (priv->steer.domain,0 ); +if (!priv->steer.tbl) { +DRV_LOG (ERR ,"Failed to create table 0 with Rx domain." ); + rte_errno = errno; +return -rte_errno; + } +if (mlx5_vdpa_err_event_setup (priv) !=0 ) +return -rte_errno; +if (mlx5_vdpa_event_qp_global_prepare (priv)) +return -rte_errno; +return 0 ; +} +static int mlx5_vdpa_dev_probe (struct mlx5_common_device *cdev) {struct mlx5_vdpa_priv *priv =NULL ;struct mlx5_hca_attr *attr = &cdev->config.hca_attr; -int retry;if (!attr->vdpa.valid || !attr->vdpa.max_num_virtio_queues) { DRV_LOG(ERR, "Not enough capabilities to support vdpa, maybe "
@@ -533,25 +611,10 @@ mlx5_vdpa_dev_probe(struct mlx5_common_device *cdev) priv->num_lag_ports = attr->num_lag_ports;if (attr->num_lag_ports ==0 ) priv->num_lag_ports =1 ; +pthread_mutex_init (&priv->vq_config_lock,NULL ); priv->cdev = cdev; -for (retry =0 ; retry <7 ; retry++) { - priv->var = mlx5_glue->dv_alloc_var (priv->cdev->ctx,0 ); -if (priv->var !=NULL ) -break ; -DRV_LOG (WARNING ,"Failed to allocate VAR, retry %d.\n" , retry); -/* Wait Qemu release VAR during vdpa restart, 0.1 sec based. */ -usleep (100000U << retry); - } -if (!priv->var) { -DRV_LOG (ERR ,"Failed to allocate VAR %u." , errno); +if (mlx5_vdpa_create_dev_resources (priv)) goto error; - } - priv->err_intr_handle = -rte_intr_instance_alloc (RTE_INTR_INSTANCE_F_SHARED ); -if (priv->err_intr_handle ==NULL ) { -DRV_LOG (ERR ,"Fail to allocate intr_handle" ); - goto error; - } priv->vdev =rte_vdpa_register_device (cdev->dev, &mlx5_vdpa_ops);if (priv->vdev ==NULL ) {DRV_LOG (ERR ,"Failed to register vDPA device." );
@@ -560,19 +623,13 @@ mlx5_vdpa_dev_probe(struct mlx5_common_device *cdev) }mlx5_vdpa_config_get (cdev->dev->devargs, priv);SLIST_INIT (&priv->mr_list); -pthread_mutex_init (&priv->vq_config_lock,NULL );pthread_mutex_lock (&priv_list_lock);TAILQ_INSERT_TAIL (&priv_list, priv, next);pthread_mutex_unlock (&priv_list_lock);return 0 ; - error: -if (priv) { -if (priv->var) - mlx5_glue->dv_free_var (priv->var); -rte_intr_instance_free (priv->err_intr_handle); -rte_free (priv); - } +if (priv) +mlx5_vdpa_dev_release (priv);return -rte_errno; }
@@ -592,22 +649,48 @@ mlx5_vdpa_dev_remove(struct mlx5_common_device *cdev)if (found)TAILQ_REMOVE (&priv_list, priv, next);pthread_mutex_unlock (&priv_list_lock); -if (found) { -if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) -mlx5_vdpa_dev_close (priv->vid); -if (priv->var) { - mlx5_glue->dv_free_var (priv->var); - priv->var =NULL ; - } -if (priv->vdev) -rte_vdpa_unregister_device (priv->vdev); -pthread_mutex_destroy (&priv->vq_config_lock); -rte_intr_instance_free (priv->err_intr_handle); -rte_free (priv); - } +if (found) +mlx5_vdpa_dev_release (priv);return 0 ; } +static void +mlx5_vdpa_release_dev_resources (struct mlx5_vdpa_priv *priv) +{ +uint32_t i; + +mlx5_vdpa_event_qp_global_release (priv); +mlx5_vdpa_err_event_unset (priv); +if (priv->steer.tbl) +claim_zero (mlx5_glue->dr_destroy_flow_tbl (priv->steer.tbl)); +if (priv->steer.domain) +claim_zero (mlx5_glue->dr_destroy_domain (priv->steer.domain)); +if (priv->null_mr) +claim_zero (mlx5_glue->dereg_mr (priv->null_mr)); +for (i =0 ; i < priv->num_lag_ports; i++) { +if (priv->tiss[i]) +claim_zero (mlx5_devx_cmd_destroy (priv->tiss[i])); + } +if (priv->td) +claim_zero (mlx5_devx_cmd_destroy (priv->td)); +if (priv->virtq_db_addr) +claim_zero (munmap (priv->virtq_db_addr, priv->var->length)); +if (priv->var) + mlx5_glue->dv_free_var (priv->var); +} + +static void +mlx5_vdpa_dev_release (struct mlx5_vdpa_priv *priv) +{ +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) +mlx5_vdpa_dev_close (priv->vid); +mlx5_vdpa_release_dev_resources (priv); +if (priv->vdev) +rte_vdpa_unregister_device (priv->vdev); +pthread_mutex_destroy (&priv->vq_config_lock); +rte_free (priv); +} +static const struct rte_pci_id mlx5_vdpa_pci_id_map[] = { { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
drivers/vdpa/mlx5/mlx5_vdpa.h +9 -0
@@ -233,6 +233,15 @@ int mlx5_vdpa_event_qp_create(struct mlx5_vdpa_priv *priv, uint16_t desc_n,*/ void mlx5_vdpa_event_qp_destroy (struct mlx5_vdpa_event_qp *eqp); +/** +* Create all the event global resources. +* +* @param[in] priv +* The vdpa driver private structure. +*/ +int +mlx5_vdpa_event_qp_global_prepare (struct mlx5_vdpa_priv *priv); +/** * Release all the event global resources. *
drivers/vdpa/mlx5/mlx5_vdpa_event.c +14 -9
@@ -40,11 +40,9 @@ mlx5_vdpa_event_qp_global_release(struct mlx5_vdpa_priv *priv) }/* Prepare all the global resources for all the event objects.*/ -static int +int mlx5_vdpa_event_qp_global_prepare (struct mlx5_vdpa_priv *priv) { -if (priv->eventc) -return 0 ; priv->eventc =mlx5_os_devx_create_event_channel (priv->cdev->ctx,MLX5DV_DEVX_CREATE_EVENT_CHANNEL_FLAGS_OMIT_EV_DATA );if (!priv->eventc) {
@@ -389,22 +387,30 @@ mlx5_vdpa_err_event_setup(struct mlx5_vdpa_priv *priv) flags =fcntl (priv->err_chnl->fd,F_GETFL ); ret =fcntl (priv->err_chnl->fd,F_SETFL , flags |O_NONBLOCK );if (ret) { + rte_errno = errno;DRV_LOG (ERR ,"Failed to change device event channel FD." ); goto error; } - + priv->err_intr_handle = +rte_intr_instance_alloc (RTE_INTR_INSTANCE_F_SHARED ); +if (priv->err_intr_handle ==NULL ) { +DRV_LOG (ERR ,"Fail to allocate intr_handle" ); + goto error; + }if (rte_intr_fd_set (priv->err_intr_handle, priv->err_chnl->fd)) goto error;if (rte_intr_type_set (priv->err_intr_handle,RTE_INTR_HANDLE_EXT )) goto error; -if (rte_intr_callback_register (priv->err_intr_handle, - mlx5_vdpa_err_interrupt_handler, - priv)) { + ret =rte_intr_callback_register (priv->err_intr_handle, + mlx5_vdpa_err_interrupt_handler, + priv); +if (ret !=0 ) {rte_intr_fd_set (priv->err_intr_handle,0 );DRV_LOG (ERR ,"Failed to register error interrupt for device %d." , priv->vid); + rte_errno = -ret; goto error; }else { DRV_LOG(DEBUG, "Registered error interrupt for device%d.",
@@ -453,6 +459,7 @@ mlx5_vdpa_err_event_unset(struct mlx5_vdpa_priv *priv) mlx5_glue->devx_destroy_event_channel (priv->err_chnl); priv->err_chnl =NULL ; } +rte_intr_instance_free (priv->err_intr_handle); }int
@@ -575,8 +582,6 @@ mlx5_vdpa_event_qp_create(struct mlx5_vdpa_priv *priv, uint16_t desc_n,uint16_t log_desc_n =rte_log2_u32 (desc_n);uint32_t ret; -if (mlx5_vdpa_event_qp_global_prepare (priv)) -return -1 ;if (mlx5_vdpa_cq_create (priv, log_desc_n, callfd, &eqp->cq))return -1 ; attr.pd = priv->cdev->pdn;
drivers/vdpa/mlx5/mlx5_vdpa_mem.c +0 -11
@@ -34,10 +34,6 @@ mlx5_vdpa_mem_dereg(struct mlx5_vdpa_priv *priv)SLIST_INIT (&priv->mr_list);if (priv->lm_mr.addr)mlx5_os_wrapped_mkey_destroy (&priv->lm_mr); -if (priv->null_mr) { -claim_zero (mlx5_glue->dereg_mr (priv->null_mr)); - priv->null_mr =NULL ; - }if (priv->vmem) {free (priv->vmem); priv->vmem =NULL ;
@@ -196,13 +192,6 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv)if (!mem)return -rte_errno; priv->vmem = mem; - priv->null_mr = mlx5_glue->alloc_null_mr (priv->cdev->pd); -if (!priv->null_mr) { -DRV_LOG (ERR ,"Failed to allocate null MR." ); - ret = -errno; - goto error; - } -DRV_LOG (DEBUG ,"Dump fill Mkey = %u." , priv->null_mr->lkey);for (i =0 ; i < mem->nregions; i++) { reg = &mem->regions[i]; entry =rte_zmalloc (__func__,sizeof (*entry),0 );
drivers/vdpa/mlx5/mlx5_vdpa_steer.c +1 -29
@@ -45,14 +45,6 @@ void mlx5_vdpa_steer_unset(struct mlx5_vdpa_priv *priv) {mlx5_vdpa_rss_flows_destroy (priv); -if (priv->steer.tbl) { -claim_zero (mlx5_glue->dr_destroy_flow_tbl (priv->steer.tbl)); - priv->steer.tbl =NULL ; - } -if (priv->steer.domain) { -claim_zero (mlx5_glue->dr_destroy_domain (priv->steer.domain)); - priv->steer.domain =NULL ; - }if (priv->steer.rqt) {claim_zero (mlx5_devx_cmd_destroy (priv->steer.rqt)); priv->steer.rqt =NULL ;
@@ -248,11 +240,7 @@ mlx5_vdpa_steer_update(struct mlx5_vdpa_priv *priv)int ret =mlx5_vdpa_rqt_prepare (priv);if (ret ==0 ) { -mlx5_vdpa_rss_flows_destroy (priv); -if (priv->steer.rqt) { -claim_zero (mlx5_devx_cmd_destroy (priv->steer.rqt)); - priv->steer.rqt =NULL ; - } +mlx5_vdpa_steer_unset (priv); }else if (ret <0 ) {return ret; }else if (!priv->steer.rss[0 ].flow) {
@@ -268,26 +256,10 @@ mlx5_vdpa_steer_update(struct mlx5_vdpa_priv *priv)int mlx5_vdpa_steer_setup (struct mlx5_vdpa_priv *priv) { -#ifdef HAVE_MLX5DV_DR - priv->steer.domain = mlx5_glue->dr_create_domain (priv->cdev->ctx, -MLX5DV_DR_DOMAIN_TYPE_NIC_RX ); -if (!priv->steer.domain) { -DRV_LOG (ERR ,"Failed to create Rx domain." ); - goto error; - } - priv->steer.tbl = mlx5_glue->dr_create_flow_tbl (priv->steer.domain,0 ); -if (!priv->steer.tbl) { -DRV_LOG (ERR ,"Failed to create table 0 with Rx domain." ); - goto error; - }if (mlx5_vdpa_steer_update (priv)) goto error;return 0 ; error:mlx5_vdpa_steer_unset (priv);return -1 ; -#else - (void )priv; -return -ENOTSUP ; -#endif /* HAVE_MLX5DV_DR */ }
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +0 -44
68 lines not on this page · raw message
Signature · 1 line
2.35.1
Re: [PATCH v2 4/7] vdpa/mlx5: reuse resources in reconfiguration
Quoted 2 lines · Xueming Li
To speed up device resume, create reuseable resources during device probe state, release when device remove. Reused resources includes TIS,
"when device is removed"
Quoted 4 lines
TD, VAR Doorbell mmap, error handling event channel and interrupt handler, UAR, Rx event channel, NULL MR, steer domain and table.
Signed-off-by Xueming Li <[email protected]>
Quoted 9 lines
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 167 +++++++++++++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 9 ++ drivers/vdpa/mlx5/mlx5_vdpa_event.c | 23 ++-- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 11 -- drivers/vdpa/mlx5/mlx5_vdpa_steer.c | 30 +---- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 44 -------- 6 files changed, 149 insertions(+), 135 deletions(-)
Thanks,
Maxime
PATCH v2 5/7 vdpa/mlx5: cache and reuse hardware resources
In reply to Xueming LiDuring device suspend and resume, resources are not changed normally. When huge resources allocated to VM, like huge memory size or lots of queues, time spent on release and recreate became significant.
To speed up, this patch reuse resoruces like VM MR and VirtQ memory if not changed.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 11 ++++- drivers/vdpa/mlx5/mlx5_vdpa.h | 12 ++++- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 27 ++++++++++- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 73 +++++++++++++++++++++-------- 4 files changed, 99 insertions(+), 24 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa.c +10 -1
@@ -241,6 +241,13 @@ mlx5_vdpa_mtu_set(struct mlx5_vdpa_priv *priv)return kern_mtu == vhost_mtu ?0 :-1 ; } +static void +mlx5_vdpa_dev_cache_clean (struct mlx5_vdpa_priv *priv) +{ +mlx5_vdpa_virtqs_cleanup (priv); +mlx5_vdpa_mem_dereg (priv); +} +static int mlx5_vdpa_dev_close (int vid) {
@@ -260,7 +267,8 @@ mlx5_vdpa_dev_close(int vid) }mlx5_vdpa_steer_unset (priv);mlx5_vdpa_virtqs_release (priv); -mlx5_vdpa_mem_dereg (priv); +if (priv->lm_mr.addr) +mlx5_os_wrapped_mkey_destroy (&priv->lm_mr); priv->state =MLX5_VDPA_STATE_PROBED ; priv->vid =0 ;/* The mutex may stay locked after event thread cancel - initiate it. */
@@ -659,6 +667,7 @@ mlx5_vdpa_release_dev_resources(struct mlx5_vdpa_priv *priv) {uint32_t i; +mlx5_vdpa_dev_cache_clean (priv);mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_err_event_unset (priv);if (priv->steer.tbl)
drivers/vdpa/mlx5/mlx5_vdpa.h +10 -2
@@ -289,13 +289,21 @@ int mlx5_vdpa_err_event_setup(struct mlx5_vdpa_priv *priv);void mlx5_vdpa_err_event_unset (struct mlx5_vdpa_priv *priv);/** -* Release a virtq and all its related resources. +* Release virtqs and resources except that to be reused. * * @param[in] priv * The vdpa driver private structure. */ void mlx5_vdpa_virtqs_release (struct mlx5_vdpa_priv *priv); +/** +* Cleanup cached resources of all virtqs. +* +* @param[in] priv +* The vdpa driver private structure. +*/ +void mlx5_vdpa_virtqs_cleanup (struct mlx5_vdpa_priv *priv); +/** * Create all the HW virtqs resources and all their related resources. *
@@ -323,7 +331,7 @@ int mlx5_vdpa_virtqs_prepare(struct mlx5_vdpa_priv *priv);int mlx5_vdpa_virtq_enable (struct mlx5_vdpa_priv *priv,int index,int enable);/** -* Unset steering and release all its related resources- stop traffic. +* Unset steering - stop traffic. * * @param[in] priv * The vdpa driver private structure.
drivers/vdpa/mlx5/mlx5_vdpa_mem.c +25 -2
@@ -32,8 +32,6 @@ mlx5_vdpa_mem_dereg(struct mlx5_vdpa_priv *priv) entry = next; }SLIST_INIT (&priv->mr_list); -if (priv->lm_mr.addr) -mlx5_os_wrapped_mkey_destroy (&priv->lm_mr);if (priv->vmem) {free (priv->vmem); priv->vmem =NULL ;
@@ -149,6 +147,23 @@ mlx5_vdpa_vhost_mem_regions_prepare(int vid, uint8_t *mode, uint64_t *mem_size,return mem; } +static int +mlx5_vdpa_mem_cmp (struct rte_vhost_memory *mem1,struct rte_vhost_memory *mem2) +{ +uint32_t i; + +if (mem1->nregions != mem2->nregions) +return -1 ; +for (i =0 ; i < mem1->nregions; i++) { +if (mem1->regions[i].guest_phys_addr != + mem2->regions[i].guest_phys_addr) +return -1 ; +if (mem1->regions[i].size != mem2->regions[i].size) +return -1 ; + } +return 0 ; +} +#define KLM_SIZE_MAX_ALIGN (sz) ((sz) > MLX5_MAX_KLM_BYTE_COUNT ? \ MLX5_MAX_KLM_BYTE_COUNT : (sz))
@@ -191,6 +206,14 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv)if (!mem)return -rte_errno; +if (priv->vmem !=NULL ) { +if (mlx5_vdpa_mem_cmp (mem, priv->vmem) ==0 ) { +/* VM memory not changed, reuse resources. */ +free (mem); +return 0 ; + } +mlx5_vdpa_mem_dereg (priv); + } priv->vmem = mem;for (i =0 ; i < mem->nregions; i++) { reg = &mem->regions[i];
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +54 -19
114 lines not on this page · raw message
Signature · 1 line
2.35.1
Re: [PATCH v2 5/7] vdpa/mlx5: cache and reuse hardware resources
Quoted 2 lines · Xueming Li
During device suspend and resume, resources are not changed normally. When huge resources allocated to VM, like huge memory size or lots of
"When huge resources were allocated"
Quoted 3 lines
queues, time spent on release and recreate became significant.
To speed up, this patch reuse resoruces like VM MR and VirtQ memory if
"reuses resources"
Quoted 10 lines
not changed.
Signed-off-by Xueming Li <[email protected]>--- drivers/vdpa/mlx5/mlx5_vdpa.c | 11 ++++- drivers/vdpa/mlx5/mlx5_vdpa.h | 12 ++++- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 27 ++++++++++- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 73 +++++++++++++++++++++-------- 4 files changed, 99 insertions(+), 24 deletions(-)
Thanks,
Maxime
RE: [PATCH v2 5/7] vdpa/mlx5: cache and reuse hardware resources
Hi Maxime,
Thanks for the suggestion, I'll send out a new version.
Regards,
Xueming Li
Quoted 36 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Wednesday, April 20, 2022 11:03 PM
To: Xueming(Steven) Li <[email protected]>; [email protected]
Cc: Matan Azrad <[email protected]>; Slava Ovsiienko <[email protected]>
Subject: Re: [PATCH v2 5/7] vdpa/mlx5: cache and reuse hardware resourcesQuoted 2 lines · Xueming Li
During device suspend and resume, resources are not changed normally. When huge resources allocated to VM, like huge memory size or lots of
"When huge resources were allocated"
Quoted 3 lines
queues, time spent on release and recreate became significant.
To speed up, this patch reuse resoruces like VM MR and VirtQ memory if
"reuses resources"
Quoted 10 lines
not changed.
Signed-off-by Xueming Li <[email protected]>--- drivers/vdpa/mlx5/mlx5_vdpa.c | 11 ++++- drivers/vdpa/mlx5/mlx5_vdpa.h | 12 ++++- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 27 ++++++++++- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 73 +++++++++++++++++++++-------- 4 files changed, 99 insertions(+), 24 deletions(-)Reviewed-by Maxime Coquelin <[email protected]>Thanks,
Maxime
Re: [PATCH v2 5/7] vdpa/mlx5: cache and reuse hardware resources
Hi Xueming,
Quoted 3 lines · Xueming(Steven) Li
Hi Maxime,
Thanks for the suggestion, I'll send out a new version.
Ok, if you sent it early next week, it could be part of next week's PR.
Thanks,
Maxime
Quoted 40 lines
Regards,
Xueming LiQuoted 36 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Wednesday, April 20, 2022 11:03 PM
To: Xueming(Steven) Li <[email protected]>; [email protected]
Cc: Matan Azrad <[email protected]>; Slava Ovsiienko <[email protected]>
Subject: Re: [PATCH v2 5/7] vdpa/mlx5: cache and reuse hardware resourcesQuoted 2 lines · Xueming Li
During device suspend and resume, resources are not changed normally. When huge resources allocated to VM, like huge memory size or lots of
"When huge resources were allocated"
Quoted 3 lines
queues, time spent on release and recreate became significant.
To speed up, this patch reuse resoruces like VM MR and VirtQ memory if
"reuses resources"
Quoted 10 lines
not changed.
Signed-off-by Xueming Li <[email protected]>--- drivers/vdpa/mlx5/mlx5_vdpa.c | 11 ++++- drivers/vdpa/mlx5/mlx5_vdpa.h | 12 ++++- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 27 ++++++++++- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 73 +++++++++++++++++++++-------- 4 files changed, 99 insertions(+), 24 deletions(-)Reviewed-by Maxime Coquelin <[email protected]>Thanks,
Maxime
PATCH v2 6/7 vdpa/mlx5: support device cleanup callback
In reply to Xueming LiThis patch supports device cleanup callback API which called when device disconnected with VM. Cached resources like VM MR and VQ memory are released.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 23 +++++++++++++++++++++++ drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + 2 files changed, 24 insertions(+)
drivers/vdpa/mlx5/mlx5_vdpa.c +23 -0
@@ -270,6 +270,8 @@ mlx5_vdpa_dev_close(int vid)if (priv->lm_mr.addr)mlx5_os_wrapped_mkey_destroy (&priv->lm_mr); priv->state =MLX5_VDPA_STATE_PROBED ; +if (!priv->connected) +mlx5_vdpa_dev_cache_clean (priv); priv->vid =0 ;/* The mutex may stay locked after event thread cancel - initiate it. */ pthread_mutex_init (&priv->vq_config_lock,NULL );
@@ -294,6 +296,7 @@ mlx5_vdpa_dev_config(int vid)return -1 ; } priv->vid = vid; + priv->connected = true;if (mlx5_vdpa_mtu_set (priv))DRV_LOG (WARNING ,"MTU cannot be set on device %s." , vdev->device->name);
@@ -431,12 +434,32 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)return mlx5_vdpa_virtq_stats_reset (priv, qid); } +static int +mlx5_vdpa_dev_clean (int vid) +{ +struct rte_vdpa_device *vdev =rte_vhost_get_vdpa_device (vid); +struct mlx5_vdpa_priv *priv; + +if (vdev ==NULL ) +return -1 ; + priv =mlx5_vdpa_find_priv_resource_by_vdev (vdev); +if (priv ==NULL ) { +DRV_LOG (ERR ,"Invalid vDPA device: %s." , vdev->device->name); +return -1 ; + } +if (priv->state ==MLX5_VDPA_STATE_PROBED ) +mlx5_vdpa_dev_cache_clean (priv); + priv->connected = false; +return 0 ; +} +static struct rte_vdpa_dev_ops mlx5_vdpa_ops = { .get_queue_num = mlx5_vdpa_get_queue_num, .get_features = mlx5_vdpa_get_vdpa_features, .get_protocol_features = mlx5_vdpa_get_protocol_features, .dev_conf = mlx5_vdpa_dev_config, .dev_close = mlx5_vdpa_dev_close, + .dev_cleanup = mlx5_vdpa_dev_clean, .set_vring_state = mlx5_vdpa_set_vring_state, .set_features = mlx5_vdpa_features_set, .migration_done =NULL ,
drivers/vdpa/mlx5/mlx5_vdpa.h +1 -0
@@ -121,6 +121,7 @@ enum mlx5_dev_state {struct mlx5_vdpa_priv {TAILQ_ENTRY (mlx5_vdpa_priv) next; +bool connected;enum mlx5_dev_state state;pthread_mutex_t vq_config_lock;uint64_t no_traffic_counter;
Signature · 1 line
2.35.1
Re: [PATCH v2 6/7] vdpa/mlx5: support device cleanup callback
Quoted 2 lines · Xueming Li
This patch supports device cleanup callback API which called when device disconnected with VM.
"This patch supports device cleanup callback API which is called when the device is disconnected from the VM."
Quoted 31 lines
Cached resources like VM MR and VQ memory are
released.Signed-off-by Xueming Li <[email protected]>--- drivers/vdpa/mlx5/mlx5_vdpa.c | 23 +++++++++++++++++++++++ drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + 2 files changed, 24 insertions(+)drivers/vdpa/mlx5/mlx5_vdpa.c +3
-0@@ -270,6 +270,8 @@ mlx5_vdpa_dev_close(int vid)if (priv->lm_mr.addr)mlx5_os_wrapped_mkey_destroy (&priv->lm_mr); priv->state =MLX5_VDPA_STATE_PROBED ; +if (!priv->connected) +mlx5_vdpa_dev_cache_clean (priv); priv->vid =0 ;/* The mutex may stay locked after event thread cancel - initiate it. */ pthread_mutex_init (&priv->vq_config_lock,NULL );@@ -294,6 +296,7 @@ mlx5_vdpa_dev_config(int vid)return -1 ; } priv->vid = vid; + priv->connected = true;if (mlx5_vdpa_mtu_set (priv))DRV_LOG (WARNING ,"MTU cannot be set on device %s." , vdev->device->name);
drivers/vdpa/mlx5/mlx5_vdpa.c mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid) · line 438
Quoted 5 lines
drivers/vdpa/mlx5/mlx5_vdpa.c +2
-0@@ -431,12 +434,32 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)return mlx5_vdpa_virtq_stats_reset (priv, qid); } +static int +mlx5_vdpa_dev_clean (int vid)
mlx5_vdpa_dev_cleanup
Quoted 32 lines
drivers/vdpa/mlx5/mlx5_vdpa.c +18
-0+{ +struct rte_vdpa_device *vdev =rte_vhost_get_vdpa_device (vid); +struct mlx5_vdpa_priv *priv; + +if (vdev ==NULL ) +return -1 ; + priv =mlx5_vdpa_find_priv_resource_by_vdev (vdev); +if (priv ==NULL ) { +DRV_LOG (ERR ,"Invalid vDPA device: %s." , vdev->device->name); +return -1 ; + } +if (priv->state ==MLX5_VDPA_STATE_PROBED ) +mlx5_vdpa_dev_cache_clean (priv); + priv->connected = false; +return 0 ; +} +static struct rte_vdpa_dev_ops mlx5_vdpa_ops = { .get_queue_num = mlx5_vdpa_get_queue_num, .get_features = mlx5_vdpa_get_vdpa_features, .get_protocol_features = mlx5_vdpa_get_protocol_features, .dev_conf = mlx5_vdpa_dev_config, .dev_close = mlx5_vdpa_dev_close, + .dev_cleanup = mlx5_vdpa_dev_clean, .set_vring_state = mlx5_vdpa_set_vring_state, .set_features = mlx5_vdpa_features_set, .migration_done =NULL ,drivers/vdpa/mlx5/mlx5_vdpa.h +0
-0
drivers/vdpa/mlx5/mlx5_vdpa.h enum mlx5_dev_state { · line 127
Quoted 7 lines
drivers/vdpa/mlx5/mlx5_vdpa.h +1
-0@@ -121,6 +121,7 @@ enum mlx5_dev_state {struct mlx5_vdpa_priv {TAILQ_ENTRY (mlx5_vdpa_priv) next; +bool connected;enum mlx5_dev_state state;pthread_mutex_t vq_config_lock;uint64_t no_traffic_counter;
Other then that:
Thanks,
Maxime
PATCH v2 7/7 vdpa/mlx5: make statistics counter persistent
In reply to Xueming LiTo speed the device suspend and resume time, make counter persitent in reconfiguration until the device gets removed.
--- doc/guides/vdpadevs/mlx5.rst | 6 ++++++ drivers/vdpa/mlx5/mlx5_vdpa.c | 19 +++++++---------- drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 32 +++++++++++------------------ 4 files changed, 26 insertions(+), 32 deletions(-)
doc/guides/vdpadevs/mlx5.rst +6 -0
@@ -182,3 +182,9 @@ Upon potential hardware errors, mlx5 PMD try to recover, give up if failed 3 times in 3 seconds, virtq will be put in disable state. User should check log to get error information, or query vdpa statistics counter to know error type and count report. + +Statistics +^^^^^^^^^^ + +The device statistics counter persists in reconfiguration until the device gets +removed. User can reset counters by calling function rte_vdpa_reset_stats().
drivers/vdpa/mlx5/mlx5_vdpa.c +7 -12
@@ -388,12 +388,7 @@ mlx5_vdpa_get_stats(struct rte_vdpa_device *vdev, int qid,DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (priv->state ==MLX5_VDPA_STATE_PROBED ) { -DRV_LOG (ERR ,"Device %s was not configured." , - vdev->device->name); -return -ENODATA ; - } -if (qid >= (int )priv->nr_virtqs) { +if (qid >= (int )priv->caps.max_num_virtio_queues *2 ) {DRV_LOG (ERR ,"Too big vring id: %d for device %s." , qid, vdev->device->name);return -E2BIG ;
@@ -416,12 +411,7 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (priv->state ==MLX5_VDPA_STATE_PROBED ) { -DRV_LOG (ERR ,"Device %s was not configured." , - vdev->device->name); -return -ENODATA ; - } -if (qid >= (int )priv->nr_virtqs) { +if (qid >= (int )priv->caps.max_num_virtio_queues *2 ) {DRV_LOG (ERR ,"Too big vring id: %d for device %s." , qid, vdev->device->name);return -E2BIG ;
@@ -691,6 +681,11 @@ mlx5_vdpa_release_dev_resources(struct mlx5_vdpa_priv *priv)uint32_t i;mlx5_vdpa_dev_cache_clean (priv); +for (i =0 ; i < priv->caps.max_num_virtio_queues *2 ; i++) { +if (!priv->virtqs[i].counters) +continue ; +claim_zero (mlx5_devx_cmd_destroy (priv->virtqs[i].counters)); + }mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_err_event_unset (priv);if (priv->steer.tbl)
drivers/vdpa/mlx5/mlx5_vdpa.h +1 -0
@@ -92,6 +92,7 @@ struct mlx5_vdpa_virtq {struct rte_intr_handle *intr_handle;uint64_t err_time[3 ];/* RDTSC time of recent errors. */ uint32_t n_retry; +struct mlx5_devx_virtio_q_couners_attr stats;struct mlx5_devx_virtio_q_couners_attr reset; };
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +12 -20
@@ -127,14 +127,9 @@ void mlx5_vdpa_virtqs_release(struct mlx5_vdpa_priv *priv) {int i; -struct mlx5_vdpa_virtq *virtq; -for (i =0 ; i < priv->nr_virtqs; i++) { - virtq = &priv->virtqs[i]; -mlx5_vdpa_virtq_unset (virtq); -if (virtq->counters) -claim_zero (mlx5_devx_cmd_destroy (virtq->counters)); - } +for (i =0 ; i < priv->nr_virtqs; i++) +mlx5_vdpa_virtq_unset (&priv->virtqs[i]); priv->features =0 ; priv->nr_virtqs =0 ; }
@@ -590,7 +585,7 @@ mlx5_vdpa_virtq_stats_get(struct mlx5_vdpa_priv *priv, int qid, struct rte_vdpa_stat *stats, unsigned int n) {struct mlx5_vdpa_virtq *virtq = &priv->virtqs[qid]; -struct mlx5_devx_virtio_q_couners_attr attr = {0 }; +struct mlx5_devx_virtio_q_couners_attr *attr = &virtq->stats;int ret;if (!virtq->counters) {
@@ -598,7 +593,7 @@ mlx5_vdpa_virtq_stats_get(struct mlx5_vdpa_priv *priv, int qid, "is invalid.", qid);return -EINVAL ; } - ret =mlx5_devx_cmd_query_virtio_q_counters (virtq->counters, &attr); + ret =mlx5_devx_cmd_query_virtio_q_counters (virtq->counters, attr);if (ret) {DRV_LOG (ERR ,"Failed to read virtq %d stats from HW." , qid);return ret;
@@ -608,37 +603,37 @@ mlx5_vdpa_virtq_stats_get(struct mlx5_vdpa_priv *priv, int qid,return ret; stats[MLX5_VDPA_STATS_RECEIVED_DESCRIPTORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_RECEIVED_DESCRIPTORS , - .value = attr.received_desc - virtq->reset.received_desc, + .value = attr->received_desc - virtq->reset.received_desc, };if (ret ==MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS )return ret; stats[MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS , - .value = attr.completed_desc - virtq->reset.completed_desc, + .value = attr->completed_desc - virtq->reset.completed_desc, };if (ret ==MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS )return ret; stats[MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS , - .value = attr.bad_desc_errors - virtq->reset.bad_desc_errors, + .value = attr->bad_desc_errors - virtq->reset.bad_desc_errors, };if (ret ==MLX5_VDPA_STATS_EXCEED_MAX_CHAIN )return ret; stats[MLX5_VDPA_STATS_EXCEED_MAX_CHAIN ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_EXCEED_MAX_CHAIN , - .value = attr.exceed_max_chain - virtq->reset.exceed_max_chain, + .value = attr->exceed_max_chain - virtq->reset.exceed_max_chain, };if (ret ==MLX5_VDPA_STATS_INVALID_BUFFER )return ret; stats[MLX5_VDPA_STATS_INVALID_BUFFER ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_INVALID_BUFFER , - .value = attr.invalid_buffer - virtq->reset.invalid_buffer, + .value = attr->invalid_buffer - virtq->reset.invalid_buffer, };if (ret ==MLX5_VDPA_STATS_COMPLETION_ERRORS )return ret; stats[MLX5_VDPA_STATS_COMPLETION_ERRORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_COMPLETION_ERRORS , - .value = attr.error_cqes - virtq->reset.error_cqes, + .value = attr->error_cqes - virtq->reset.error_cqes, };return ret; }
@@ -649,11 +644,8 @@ mlx5_vdpa_virtq_stats_reset(struct mlx5_vdpa_priv *priv, int qid)struct mlx5_vdpa_virtq *virtq = &priv->virtqs[qid];int ret; -if (!virtq->counters) { -DRV_LOG (ERR ,"Failed to read virtq %d statistics - virtq " -"is invalid." , qid); -return -EINVAL ; - } +if (virtq->counters ==NULL )/* VQ not enabled. */ +return 0 ; ret =mlx5_devx_cmd_query_virtio_q_counters (virtq->counters, &virtq->reset);if (ret)
Signature · 1 line
2.35.1
Re: [PATCH v2 7/7] vdpa/mlx5: make statistics counter persistent
"vdpa/mlx5: make statistics counters persistent"
Quoted 2 lines · Xueming Li
To speed the device suspend and resume time, make counter persitent in reconfiguration until the device gets removed.
"In order to speed-up the device suspend and resume, make the statistics counters persistent in reconfiguration..."
Quoted 9 lines
Signed-off-by Xueming Li <[email protected]>--- doc/guides/vdpadevs/mlx5.rst | 6 ++++++ drivers/vdpa/mlx5/mlx5_vdpa.c | 19 +++++++---------- drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 32 +++++++++++------------------ 4 files changed, 26 insertions(+), 32 deletions(-)
Thanks,
Maxime
v3 cover vdpa/mlx5: improve device shutdown time
In reply to Xueming Liv1:
- rebase with latest upstream code
- fix coverity issues
v2:
- fix build issue on OS w/o flow DR API
v3:
- commit message update, thanks Maxime!
Xueming Li (7):
vdpa/mlx5: fix interrupt trash that leads to segment fault vdpa/mlx5: fix dead loop when process interrupted vdpa/mlx5: no kick handling during shutdown vdpa/mlx5: reuse resources in reconfiguration vdpa/mlx5: cache and reuse hardware resources vdpa/mlx5: support device cleanup callback vdpa/mlx5: make statistics counter persistent
doc/guides/vdpadevs/mlx5.rst | 6 + drivers/vdpa/mlx5/mlx5_vdpa.c | 231 +++++++++++++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 31 +++- drivers/vdpa/mlx5/mlx5_vdpa_event.c | 23 +-- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 38 +++-- drivers/vdpa/mlx5/mlx5_vdpa_steer.c | 30 +--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 189 +++++++++++------------ 7 files changed, 336 insertions(+), 212 deletions(-)
Signature · 1 line
2.35.1
PATCH v3 1/7 vdpa/mlx5: fix interrupt trash that leads to segment fault
Disable interrupt unregister timeout to avoid invalid FD caused interrupt thread segment fault.
--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +8 -12
@@ -17,7 +17,7 @@static void -mlx5_vdpa_virtq_handler (void *cb_arg) +mlx5_vdpa_virtq_kick_handler (void *cb_arg) {struct mlx5_vdpa_virtq *virtq = cb_arg;struct mlx5_vdpa_priv *priv = virtq->priv;
@@ -59,20 +59,16 @@ static int mlx5_vdpa_virtq_unset(struct mlx5_vdpa_virtq *virtq) {unsigned int i; -int retries =MLX5_VDPA_INTR_RETRIES ;int ret = -EAGAIN ; -if (rte_intr_fd_get (virtq->intr_handle) !=-1 ) { -while (retries-- && ret == -EAGAIN ) { +if (rte_intr_fd_get (virtq->intr_handle) >=0 ) { +while (ret == -EAGAIN ) { ret =rte_intr_callback_unregister (virtq->intr_handle, - mlx5_vdpa_virtq_handler, - virtq); + mlx5_vdpa_virtq_kick_handler, virtq);if (ret == -EAGAIN ) { -DRV_LOG (DEBUG ,"Try again to unregister fd %d " -"of virtq %d interrupt, retries = %d." , -rte_intr_fd_get (virtq->intr_handle), - (int )virtq->index, retries); - +DRV_LOG (DEBUG ,"Try again to unregister fd %d of virtq %hu interrupt" , +rte_intr_fd_get (virtq->intr_handle), + virtq->index);usleep (MLX5_VDPA_INTR_RETRIES_USEC ); } }
@@ -359,7 +355,7 @@ mlx5_vdpa_virtq_setup(struct mlx5_vdpa_priv *priv, int index) goto error;if (rte_intr_callback_register (virtq->intr_handle, - mlx5_vdpa_virtq_handler, + mlx5_vdpa_virtq_kick_handler, virtq)) {rte_intr_fd_set (virtq->intr_handle,-1 ); DRV_LOG(ERR, "Failed to register virtq %d interrupt.",
Signature · 1 line
2.35.1
PATCH v3 2/7 vdpa/mlx5: fix dead loop when process interrupted
In reply to Xueming LiIn Ctrl+C handling, sometimes kick handling thread gets endless EGAIN error and fall into dead lock.
Kick happens frequently in real system due to busy traffic or retry mechanism. This patch simplifies kick firmware anyway and skip setting hardware notifier due to potential device error, notifier could be set in next successful kick request.
--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +5 -3
@@ -23,11 +23,11 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg)struct mlx5_vdpa_priv *priv = virtq->priv;uint64_t buf;int nbytes; +int retry;if (rte_intr_fd_get (virtq->intr_handle) <0 )return ; - - do { +for (retry =0 ; retry <3 ; ++retry) { nbytes =read (rte_intr_fd_get (virtq->intr_handle), &buf,8 );if (nbytes <0 ) {
@@ -39,7 +39,9 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg) virtq->index, strerror(errno)); }break ; - }while (1 ); + } +if (nbytes <0 ) +return ;rte_write32 (virtq->index, priv->virtq_db_addr);if (virtq->notifier_state ==MLX5_VDPA_NOTIFIER_STATE_DISABLED ) {if (rte_vhost_host_notifier_ctrl (priv->vid, virtq->index, true))
Signature · 1 line
2.35.1
PATCH v3 3/7 vdpa/mlx5: no kick handling during shutdown
In reply to Xueming LiWhen Qemu suspends a VM, hw notifier is un-mmapped while vCPU thread may still be active and write notifier through kick socket.
PMD kick handler thread tries to install hw notifier through client socket. In such case, it will timeout and slow down device close.
This patch skips hw notifier install if VQ or device in middle of shutdown.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 17 ++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 8 +++++++- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 12 +++++++++++- 3 files changed, 28 insertions(+), 9 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa.c +10 -7
@@ -252,13 +252,15 @@ mlx5_vdpa_dev_close(int vid) }mlx5_vdpa_err_event_unset (priv);mlx5_vdpa_cqe_event_unset (priv); -if (priv->configured) +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) { ret |=mlx5_vdpa_lm_log (priv); + priv->state =MLX5_VDPA_STATE_IN_PROGRESS ; + }mlx5_vdpa_steer_unset (priv);mlx5_vdpa_virtqs_release (priv);mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_mem_dereg (priv); - priv->configured =0 ; + priv->state =MLX5_VDPA_STATE_PROBED ; priv->vid =0 ;/* The mutex may stay locked after event thread cancel - initiate it. */ pthread_mutex_init (&priv->vq_config_lock,NULL );
@@ -277,7 +279,8 @@ mlx5_vdpa_dev_config(int vid)DRV_LOG (ERR ,"Invalid vDPA device: %s." , vdev->device->name);return -EINVAL ; } -if (priv->configured &&mlx5_vdpa_dev_close (vid)) { +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED && +mlx5_vdpa_dev_close (vid)) {DRV_LOG (ERR ,"Failed to reconfigure vid %d." , vid);return -1 ; }
@@ -291,7 +294,7 @@ mlx5_vdpa_dev_config(int vid)mlx5_vdpa_dev_close (vid);return -1 ; } - priv->configured =1 ; + priv->state =MLX5_VDPA_STATE_CONFIGURED ;DRV_LOG (INFO ,"vDPA device %d was configured." , vid);return 0 ; }
@@ -373,7 +376,7 @@ mlx5_vdpa_get_stats(struct rte_vdpa_device *vdev, int qid,DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (!priv->configured) { +if (priv->state ==MLX5_VDPA_STATE_PROBED ) {DRV_LOG (ERR ,"Device %s was not configured." , vdev->device->name);return -ENODATA ;
@@ -401,7 +404,7 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (!priv->configured) { +if (priv->state ==MLX5_VDPA_STATE_PROBED ) {DRV_LOG (ERR ,"Device %s was not configured." , vdev->device->name);return -ENODATA ;
@@ -594,7 +597,7 @@ mlx5_vdpa_dev_remove(struct mlx5_common_device *cdev)TAILQ_REMOVE (&priv_list, priv, next);pthread_mutex_unlock (&priv_list_lock);if (found) { -if (priv->configured) +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED )mlx5_vdpa_dev_close (priv->vid);if (priv->var) { mlx5_glue->dv_free_var (priv->var);
drivers/vdpa/mlx5/mlx5_vdpa.h +7 -1
@@ -113,9 +113,15 @@ enum {MLX5_VDPA_EVENT_MODE_ONLY_INTERRUPT }; +enum mlx5_dev_state { +MLX5_VDPA_STATE_PROBED =0 , +MLX5_VDPA_STATE_CONFIGURED , +MLX5_VDPA_STATE_IN_PROGRESS /* Shutting down. */ +}; +struct mlx5_vdpa_priv {TAILQ_ENTRY (mlx5_vdpa_priv) next; -uint8_t configured; +enum mlx5_dev_state state;pthread_mutex_t vq_config_lock;uint64_t no_traffic_counter;pthread_t timer_tid;
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +11 -1
@@ -25,6 +25,11 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg)int nbytes;int retry; +if (priv->state !=MLX5_VDPA_STATE_CONFIGURED && !virtq->enable) { +DRV_LOG (ERR ,"device %d queue %d down, skip kick handling" , + priv->vid, virtq->index); +return ; + }if (rte_intr_fd_get (virtq->intr_handle) <0 )return ;for (retry =0 ; retry <3 ; ++retry) {
@@ -43,6 +48,11 @@ mlx5_vdpa_virtq_kick_handler(void *cb_arg)if (nbytes <0 )return ;rte_write32 (virtq->index, priv->virtq_db_addr); +if (priv->state !=MLX5_VDPA_STATE_CONFIGURED && !virtq->enable) { +DRV_LOG (ERR ,"device %d queue %d down, skip kick handling" , + priv->vid, virtq->index); +return ; + }if (virtq->notifier_state ==MLX5_VDPA_NOTIFIER_STATE_DISABLED ) {if (rte_vhost_host_notifier_ctrl (priv->vid, virtq->index, true)) virtq->notifier_state =MLX5_VDPA_NOTIFIER_STATE_ERR ;
@@ -541,7 +551,7 @@ mlx5_vdpa_virtq_enable(struct mlx5_vdpa_priv *priv, int index, int enable)DRV_LOG (INFO ,"Update virtq %d status %sable -> %sable." , index, virtq->enable ?"en" :"dis" , enable ?"en" :"dis" ); -if (!priv->configured) { +if (priv->state ==MLX5_VDPA_STATE_PROBED ) { virtq->enable = !!enable;return 0 ; }
Signature · 1 line
2.35.1
PATCH v3 4/7 vdpa/mlx5: reuse resources in reconfiguration
In reply to Xueming LiTo speed up device resume, create reuseable resources during device probe state, release when device is removed. Reused resources includes TIS,
TD, VAR Doorbell mmap, error handling event channel and interrupt handler, UAR, Rx event channel, NULL MR, steer domain and table.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 167 +++++++++++++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 9 ++ drivers/vdpa/mlx5/mlx5_vdpa_event.c | 23 ++-- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 11 -- drivers/vdpa/mlx5/mlx5_vdpa_steer.c | 30 +---- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 44 -------- 6 files changed, 149 insertions(+), 135 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa.c +125 -42
@@ -5,6 +5,7 @@#include <net/if.h> #include <sys/socket.h> #include <sys/ioctl.h> +#include <sys/mman.h> #include <fcntl.h> #include <netinet/in.h>
@@ -49,6 +50,8 @@ TAILQ_HEAD(mlx5_vdpa_privs, mlx5_vdpa_priv) priv_list =TAILQ_HEAD_INITIALIZER (priv_list);static pthread_mutex_t priv_list_lock =PTHREAD_MUTEX_INITIALIZER ; +static void mlx5_vdpa_dev_release (struct mlx5_vdpa_priv *priv); +static struct mlx5_vdpa_priv *mlx5_vdpa_find_priv_resource_by_vdev (struct rte_vdpa_device *vdev) {
@@ -250,7 +253,6 @@ mlx5_vdpa_dev_close(int vid)DRV_LOG (ERR ,"Invalid vDPA device: %s." , vdev->device->name);return -1 ; } -mlx5_vdpa_err_event_unset (priv);mlx5_vdpa_cqe_event_unset (priv);if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) { ret |=mlx5_vdpa_lm_log (priv);
@@ -258,7 +260,6 @@ mlx5_vdpa_dev_close(int vid) }mlx5_vdpa_steer_unset (priv);mlx5_vdpa_virtqs_release (priv); -mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_mem_dereg (priv); priv->state =MLX5_VDPA_STATE_PROBED ; priv->vid =0 ;
@@ -288,7 +289,7 @@ mlx5_vdpa_dev_config(int vid)if (mlx5_vdpa_mtu_set (priv))DRV_LOG (WARNING ,"MTU cannot be set on device %s." , vdev->device->name); -if (mlx5_vdpa_mem_register (priv) ||mlx5_vdpa_err_event_setup (priv) || +if (mlx5_vdpa_mem_register (priv) ||mlx5_vdpa_virtqs_prepare (priv) ||mlx5_vdpa_steer_setup (priv) ||mlx5_vdpa_cqe_event_setup (priv)) {mlx5_vdpa_dev_close (vid);
@@ -507,13 +508,90 @@ mlx5_vdpa_config_get(struct mlx5_kvargs_ctrl *mkvlist,DRV_LOG (DEBUG ,"no traffic max is %u." , priv->no_traffic_max); } +static int +mlx5_vdpa_create_dev_resources (struct mlx5_vdpa_priv *priv) +{ +struct mlx5_devx_tis_attr tis_attr = {0 }; +struct ibv_context *ctx = priv->cdev->ctx; +uint32_t i; +int retry; + +for (retry =0 ; retry <7 ; retry++) { + priv->var = mlx5_glue->dv_alloc_var (ctx,0 ); +if (priv->var !=NULL ) +break ; +DRV_LOG (WARNING ,"Failed to allocate VAR, retry %d." , retry); +/* Wait Qemu release VAR during vdpa restart, 0.1 sec based. */ +usleep (100000U << retry); + } +if (!priv->var) { +DRV_LOG (ERR ,"Failed to allocate VAR %u." , errno); + rte_errno =ENOMEM ; +return -rte_errno; + } +/* Always map the entire page. */ + priv->virtq_db_addr =mmap (NULL , priv->var->length,PROT_READ | +PROT_WRITE ,MAP_SHARED , ctx->cmd_fd, + priv->var->mmap_off); +if (priv->virtq_db_addr ==MAP_FAILED ) { +DRV_LOG (ERR ,"Failed to map doorbell page %u." , errno); + priv->virtq_db_addr =NULL ; + rte_errno = errno; +return -rte_errno; + } +DRV_LOG (DEBUG ,"VAR address of doorbell mapping is %p." , + priv->virtq_db_addr); + priv->td =mlx5_devx_cmd_create_td (ctx); +if (!priv->td) { +DRV_LOG (ERR ,"Failed to create transport domain." ); + rte_errno = errno; +return -rte_errno; + } + tis_attr.transport_domain = priv->td->id; +for (i =0 ; i < priv->num_lag_ports; i++) { +/* 0 is auto affinity, non-zero value to propose port. */ + tis_attr.lag_tx_port_affinity = i +1 ; + priv->tiss[i] =mlx5_devx_cmd_create_tis (ctx, &tis_attr); +if (!priv->tiss[i]) { +DRV_LOG (ERR ,"Failed to create TIS %u." , i); +return -rte_errno; + } + } + priv->null_mr = mlx5_glue->alloc_null_mr (priv->cdev->pd); +if (!priv->null_mr) { +DRV_LOG (ERR ,"Failed to allocate null MR." ); + rte_errno = errno; +return -rte_errno; + } +DRV_LOG (DEBUG ,"Dump fill Mkey = %u." , priv->null_mr->lkey); +#ifdef HAVE_MLX5DV_DR + priv->steer.domain = mlx5_glue->dr_create_domain (ctx, +MLX5DV_DR_DOMAIN_TYPE_NIC_RX ); +if (!priv->steer.domain) { +DRV_LOG (ERR ,"Failed to create Rx domain." ); + rte_errno = errno; +return -rte_errno; + } +#endif + priv->steer.tbl = mlx5_glue->dr_create_flow_tbl (priv->steer.domain,0 ); +if (!priv->steer.tbl) { +DRV_LOG (ERR ,"Failed to create table 0 with Rx domain." ); + rte_errno = errno; +return -rte_errno; + } +if (mlx5_vdpa_err_event_setup (priv) !=0 ) +return -rte_errno; +if (mlx5_vdpa_event_qp_global_prepare (priv)) +return -rte_errno; +return 0 ; +} +static int mlx5_vdpa_dev_probe (struct mlx5_common_device *cdev,struct mlx5_kvargs_ctrl *mkvlist) {struct mlx5_vdpa_priv *priv =NULL ;struct mlx5_hca_attr *attr = &cdev->config.hca_attr; -int retry;if (!attr->vdpa.valid || !attr->vdpa.max_num_virtio_queues) { DRV_LOG(ERR, "Not enough capabilities to support vdpa, maybe "
@@ -537,25 +615,10 @@ mlx5_vdpa_dev_probe(struct mlx5_common_device *cdev, priv->num_lag_ports = attr->num_lag_ports;if (attr->num_lag_ports ==0 ) priv->num_lag_ports =1 ; +pthread_mutex_init (&priv->vq_config_lock,NULL ); priv->cdev = cdev; -for (retry =0 ; retry <7 ; retry++) { - priv->var = mlx5_glue->dv_alloc_var (priv->cdev->ctx,0 ); -if (priv->var !=NULL ) -break ; -DRV_LOG (WARNING ,"Failed to allocate VAR, retry %d.\n" , retry); -/* Wait Qemu release VAR during vdpa restart, 0.1 sec based. */ -usleep (100000U << retry); - } -if (!priv->var) { -DRV_LOG (ERR ,"Failed to allocate VAR %u." , errno); +if (mlx5_vdpa_create_dev_resources (priv)) goto error; - } - priv->err_intr_handle = -rte_intr_instance_alloc (RTE_INTR_INSTANCE_F_SHARED ); -if (priv->err_intr_handle ==NULL ) { -DRV_LOG (ERR ,"Fail to allocate intr_handle" ); - goto error; - } priv->vdev =rte_vdpa_register_device (cdev->dev, &mlx5_vdpa_ops);if (priv->vdev ==NULL ) {DRV_LOG (ERR ,"Failed to register vDPA device." );
@@ -564,19 +627,13 @@ mlx5_vdpa_dev_probe(struct mlx5_common_device *cdev, }mlx5_vdpa_config_get (mkvlist, priv);SLIST_INIT (&priv->mr_list); -pthread_mutex_init (&priv->vq_config_lock,NULL );pthread_mutex_lock (&priv_list_lock);TAILQ_INSERT_TAIL (&priv_list, priv, next);pthread_mutex_unlock (&priv_list_lock);return 0 ; - error: -if (priv) { -if (priv->var) - mlx5_glue->dv_free_var (priv->var); -rte_intr_instance_free (priv->err_intr_handle); -rte_free (priv); - } +if (priv) +mlx5_vdpa_dev_release (priv);return -rte_errno; }
@@ -596,22 +653,48 @@ mlx5_vdpa_dev_remove(struct mlx5_common_device *cdev)if (found)TAILQ_REMOVE (&priv_list, priv, next);pthread_mutex_unlock (&priv_list_lock); -if (found) { -if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) -mlx5_vdpa_dev_close (priv->vid); -if (priv->var) { - mlx5_glue->dv_free_var (priv->var); - priv->var =NULL ; - } -if (priv->vdev) -rte_vdpa_unregister_device (priv->vdev); -pthread_mutex_destroy (&priv->vq_config_lock); -rte_intr_instance_free (priv->err_intr_handle); -rte_free (priv); - } +if (found) +mlx5_vdpa_dev_release (priv);return 0 ; } +static void +mlx5_vdpa_release_dev_resources (struct mlx5_vdpa_priv *priv) +{ +uint32_t i; + +mlx5_vdpa_event_qp_global_release (priv); +mlx5_vdpa_err_event_unset (priv); +if (priv->steer.tbl) +claim_zero (mlx5_glue->dr_destroy_flow_tbl (priv->steer.tbl)); +if (priv->steer.domain) +claim_zero (mlx5_glue->dr_destroy_domain (priv->steer.domain)); +if (priv->null_mr) +claim_zero (mlx5_glue->dereg_mr (priv->null_mr)); +for (i =0 ; i < priv->num_lag_ports; i++) { +if (priv->tiss[i]) +claim_zero (mlx5_devx_cmd_destroy (priv->tiss[i])); + } +if (priv->td) +claim_zero (mlx5_devx_cmd_destroy (priv->td)); +if (priv->virtq_db_addr) +claim_zero (munmap (priv->virtq_db_addr, priv->var->length)); +if (priv->var) + mlx5_glue->dv_free_var (priv->var); +} + +static void +mlx5_vdpa_dev_release (struct mlx5_vdpa_priv *priv) +{ +if (priv->state ==MLX5_VDPA_STATE_CONFIGURED ) +mlx5_vdpa_dev_close (priv->vid); +mlx5_vdpa_release_dev_resources (priv); +if (priv->vdev) +rte_vdpa_unregister_device (priv->vdev); +pthread_mutex_destroy (&priv->vq_config_lock); +rte_free (priv); +} +static const struct rte_pci_id mlx5_vdpa_pci_id_map[] = { { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
drivers/vdpa/mlx5/mlx5_vdpa.h +9 -0
@@ -233,6 +233,15 @@ int mlx5_vdpa_event_qp_create(struct mlx5_vdpa_priv *priv, uint16_t desc_n,*/ void mlx5_vdpa_event_qp_destroy (struct mlx5_vdpa_event_qp *eqp); +/** +* Create all the event global resources. +* +* @param[in] priv +* The vdpa driver private structure. +*/ +int +mlx5_vdpa_event_qp_global_prepare (struct mlx5_vdpa_priv *priv); +/** * Release all the event global resources. *
drivers/vdpa/mlx5/mlx5_vdpa_event.c +14 -9
@@ -40,11 +40,9 @@ mlx5_vdpa_event_qp_global_release(struct mlx5_vdpa_priv *priv) }/* Prepare all the global resources for all the event objects.*/ -static int +int mlx5_vdpa_event_qp_global_prepare (struct mlx5_vdpa_priv *priv) { -if (priv->eventc) -return 0 ; priv->eventc =mlx5_os_devx_create_event_channel (priv->cdev->ctx,MLX5DV_DEVX_CREATE_EVENT_CHANNEL_FLAGS_OMIT_EV_DATA );if (!priv->eventc) {
@@ -389,22 +387,30 @@ mlx5_vdpa_err_event_setup(struct mlx5_vdpa_priv *priv) flags =fcntl (priv->err_chnl->fd,F_GETFL ); ret =fcntl (priv->err_chnl->fd,F_SETFL , flags |O_NONBLOCK );if (ret) { + rte_errno = errno;DRV_LOG (ERR ,"Failed to change device event channel FD." ); goto error; } - + priv->err_intr_handle = +rte_intr_instance_alloc (RTE_INTR_INSTANCE_F_SHARED ); +if (priv->err_intr_handle ==NULL ) { +DRV_LOG (ERR ,"Fail to allocate intr_handle" ); + goto error; + }if (rte_intr_fd_set (priv->err_intr_handle, priv->err_chnl->fd)) goto error;if (rte_intr_type_set (priv->err_intr_handle,RTE_INTR_HANDLE_EXT )) goto error; -if (rte_intr_callback_register (priv->err_intr_handle, - mlx5_vdpa_err_interrupt_handler, - priv)) { + ret =rte_intr_callback_register (priv->err_intr_handle, + mlx5_vdpa_err_interrupt_handler, + priv); +if (ret !=0 ) {rte_intr_fd_set (priv->err_intr_handle,0 );DRV_LOG (ERR ,"Failed to register error interrupt for device %d." , priv->vid); + rte_errno = -ret; goto error; }else { DRV_LOG(DEBUG, "Registered error interrupt for device%d.",
@@ -453,6 +459,7 @@ mlx5_vdpa_err_event_unset(struct mlx5_vdpa_priv *priv) mlx5_glue->devx_destroy_event_channel (priv->err_chnl); priv->err_chnl =NULL ; } +rte_intr_instance_free (priv->err_intr_handle); }int
@@ -575,8 +582,6 @@ mlx5_vdpa_event_qp_create(struct mlx5_vdpa_priv *priv, uint16_t desc_n,uint16_t log_desc_n =rte_log2_u32 (desc_n);uint32_t ret; -if (mlx5_vdpa_event_qp_global_prepare (priv)) -return -1 ;if (mlx5_vdpa_cq_create (priv, log_desc_n, callfd, &eqp->cq))return -1 ; attr.pd = priv->cdev->pdn;
drivers/vdpa/mlx5/mlx5_vdpa_mem.c +0 -11
@@ -34,10 +34,6 @@ mlx5_vdpa_mem_dereg(struct mlx5_vdpa_priv *priv)SLIST_INIT (&priv->mr_list);if (priv->lm_mr.addr)mlx5_os_wrapped_mkey_destroy (&priv->lm_mr); -if (priv->null_mr) { -claim_zero (mlx5_glue->dereg_mr (priv->null_mr)); - priv->null_mr =NULL ; - }if (priv->vmem) {free (priv->vmem); priv->vmem =NULL ;
@@ -196,13 +192,6 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv)if (!mem)return -rte_errno; priv->vmem = mem; - priv->null_mr = mlx5_glue->alloc_null_mr (priv->cdev->pd); -if (!priv->null_mr) { -DRV_LOG (ERR ,"Failed to allocate null MR." ); - ret = -errno; - goto error; - } -DRV_LOG (DEBUG ,"Dump fill Mkey = %u." , priv->null_mr->lkey);for (i =0 ; i < mem->nregions; i++) { reg = &mem->regions[i]; entry =rte_zmalloc (__func__,sizeof (*entry),0 );
drivers/vdpa/mlx5/mlx5_vdpa_steer.c +1 -29
@@ -45,14 +45,6 @@ void mlx5_vdpa_steer_unset(struct mlx5_vdpa_priv *priv) {mlx5_vdpa_rss_flows_destroy (priv); -if (priv->steer.tbl) { -claim_zero (mlx5_glue->dr_destroy_flow_tbl (priv->steer.tbl)); - priv->steer.tbl =NULL ; - } -if (priv->steer.domain) { -claim_zero (mlx5_glue->dr_destroy_domain (priv->steer.domain)); - priv->steer.domain =NULL ; - }if (priv->steer.rqt) {claim_zero (mlx5_devx_cmd_destroy (priv->steer.rqt)); priv->steer.rqt =NULL ;
@@ -248,11 +240,7 @@ mlx5_vdpa_steer_update(struct mlx5_vdpa_priv *priv)int ret =mlx5_vdpa_rqt_prepare (priv);if (ret ==0 ) { -mlx5_vdpa_rss_flows_destroy (priv); -if (priv->steer.rqt) { -claim_zero (mlx5_devx_cmd_destroy (priv->steer.rqt)); - priv->steer.rqt =NULL ; - } +mlx5_vdpa_steer_unset (priv); }else if (ret <0 ) {return ret; }else if (!priv->steer.rss[0 ].flow) {
@@ -268,26 +256,10 @@ mlx5_vdpa_steer_update(struct mlx5_vdpa_priv *priv)int mlx5_vdpa_steer_setup (struct mlx5_vdpa_priv *priv) { -#ifdef HAVE_MLX5DV_DR - priv->steer.domain = mlx5_glue->dr_create_domain (priv->cdev->ctx, -MLX5DV_DR_DOMAIN_TYPE_NIC_RX ); -if (!priv->steer.domain) { -DRV_LOG (ERR ,"Failed to create Rx domain." ); - goto error; - } - priv->steer.tbl = mlx5_glue->dr_create_flow_tbl (priv->steer.domain,0 ); -if (!priv->steer.tbl) { -DRV_LOG (ERR ,"Failed to create table 0 with Rx domain." ); - goto error; - }if (mlx5_vdpa_steer_update (priv)) goto error;return 0 ; error:mlx5_vdpa_steer_unset (priv);return -1 ; -#else - (void )priv; -return -ENOTSUP ; -#endif /* HAVE_MLX5DV_DR */ }
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +0 -44
68 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v3 5/7 vdpa/mlx5: cache and reuse hardware resources
In reply to Xueming LiDuring device suspend and resume, resources are not changed normally. When huge resources were allocated to VM, like huge memory size or lots of queues, time spent on release and recreate became significant.
To speed up, this patch reuses resources like VM MR and VirtQ memory if not changed.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 11 ++++- drivers/vdpa/mlx5/mlx5_vdpa.h | 12 ++++- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 27 ++++++++++- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 73 +++++++++++++++++++++-------- 4 files changed, 99 insertions(+), 24 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa.c +10 -1
@@ -241,6 +241,13 @@ mlx5_vdpa_mtu_set(struct mlx5_vdpa_priv *priv)return kern_mtu == vhost_mtu ?0 :-1 ; } +static void +mlx5_vdpa_dev_cache_clean (struct mlx5_vdpa_priv *priv) +{ +mlx5_vdpa_virtqs_cleanup (priv); +mlx5_vdpa_mem_dereg (priv); +} +static int mlx5_vdpa_dev_close (int vid) {
@@ -260,7 +267,8 @@ mlx5_vdpa_dev_close(int vid) }mlx5_vdpa_steer_unset (priv);mlx5_vdpa_virtqs_release (priv); -mlx5_vdpa_mem_dereg (priv); +if (priv->lm_mr.addr) +mlx5_os_wrapped_mkey_destroy (&priv->lm_mr); priv->state =MLX5_VDPA_STATE_PROBED ; priv->vid =0 ;/* The mutex may stay locked after event thread cancel - initiate it. */
@@ -663,6 +671,7 @@ mlx5_vdpa_release_dev_resources(struct mlx5_vdpa_priv *priv) {uint32_t i; +mlx5_vdpa_dev_cache_clean (priv);mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_err_event_unset (priv);if (priv->steer.tbl)
drivers/vdpa/mlx5/mlx5_vdpa.h +10 -2
@@ -289,13 +289,21 @@ int mlx5_vdpa_err_event_setup(struct mlx5_vdpa_priv *priv);void mlx5_vdpa_err_event_unset (struct mlx5_vdpa_priv *priv);/** -* Release a virtq and all its related resources. +* Release virtqs and resources except that to be reused. * * @param[in] priv * The vdpa driver private structure. */ void mlx5_vdpa_virtqs_release (struct mlx5_vdpa_priv *priv); +/** +* Cleanup cached resources of all virtqs. +* +* @param[in] priv +* The vdpa driver private structure. +*/ +void mlx5_vdpa_virtqs_cleanup (struct mlx5_vdpa_priv *priv); +/** * Create all the HW virtqs resources and all their related resources. *
@@ -323,7 +331,7 @@ int mlx5_vdpa_virtqs_prepare(struct mlx5_vdpa_priv *priv);int mlx5_vdpa_virtq_enable (struct mlx5_vdpa_priv *priv,int index,int enable);/** -* Unset steering and release all its related resources- stop traffic. +* Unset steering - stop traffic. * * @param[in] priv * The vdpa driver private structure.
drivers/vdpa/mlx5/mlx5_vdpa_mem.c +25 -2
@@ -32,8 +32,6 @@ mlx5_vdpa_mem_dereg(struct mlx5_vdpa_priv *priv) entry = next; }SLIST_INIT (&priv->mr_list); -if (priv->lm_mr.addr) -mlx5_os_wrapped_mkey_destroy (&priv->lm_mr);if (priv->vmem) {free (priv->vmem); priv->vmem =NULL ;
@@ -149,6 +147,23 @@ mlx5_vdpa_vhost_mem_regions_prepare(int vid, uint8_t *mode, uint64_t *mem_size,return mem; } +static int +mlx5_vdpa_mem_cmp (struct rte_vhost_memory *mem1,struct rte_vhost_memory *mem2) +{ +uint32_t i; + +if (mem1->nregions != mem2->nregions) +return -1 ; +for (i =0 ; i < mem1->nregions; i++) { +if (mem1->regions[i].guest_phys_addr != + mem2->regions[i].guest_phys_addr) +return -1 ; +if (mem1->regions[i].size != mem2->regions[i].size) +return -1 ; + } +return 0 ; +} +#define KLM_SIZE_MAX_ALIGN (sz) ((sz) > MLX5_MAX_KLM_BYTE_COUNT ? \ MLX5_MAX_KLM_BYTE_COUNT : (sz))
@@ -191,6 +206,14 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv)if (!mem)return -rte_errno; +if (priv->vmem !=NULL ) { +if (mlx5_vdpa_mem_cmp (mem, priv->vmem) ==0 ) { +/* VM memory not changed, reuse resources. */ +free (mem); +return 0 ; + } +mlx5_vdpa_mem_dereg (priv); + } priv->vmem = mem;for (i =0 ; i < mem->nregions; i++) { reg = &mem->regions[i];
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +54 -19
114 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v3 6/7 vdpa/mlx5: support device cleanup callback
In reply to Xueming LiThis patch supports device cleanup callback API which is called when the device is disconnected from the VM. Cached resources like VM MR and VQ memory are released.
--- drivers/vdpa/mlx5/mlx5_vdpa.c | 23 +++++++++++++++++++++++ drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + 2 files changed, 24 insertions(+)
drivers/vdpa/mlx5/mlx5_vdpa.c +23 -0
@@ -270,6 +270,8 @@ mlx5_vdpa_dev_close(int vid)if (priv->lm_mr.addr)mlx5_os_wrapped_mkey_destroy (&priv->lm_mr); priv->state =MLX5_VDPA_STATE_PROBED ; +if (!priv->connected) +mlx5_vdpa_dev_cache_clean (priv); priv->vid =0 ;/* The mutex may stay locked after event thread cancel - initiate it. */ pthread_mutex_init (&priv->vq_config_lock,NULL );
@@ -294,6 +296,7 @@ mlx5_vdpa_dev_config(int vid)return -1 ; } priv->vid = vid; + priv->connected = true;if (mlx5_vdpa_mtu_set (priv))DRV_LOG (WARNING ,"MTU cannot be set on device %s." , vdev->device->name);
@@ -431,12 +434,32 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)return mlx5_vdpa_virtq_stats_reset (priv, qid); } +static int +mlx5_vdpa_dev_cleanup (int vid) +{ +struct rte_vdpa_device *vdev =rte_vhost_get_vdpa_device (vid); +struct mlx5_vdpa_priv *priv; + +if (vdev ==NULL ) +return -1 ; + priv =mlx5_vdpa_find_priv_resource_by_vdev (vdev); +if (priv ==NULL ) { +DRV_LOG (ERR ,"Invalid vDPA device: %s." , vdev->device->name); +return -1 ; + } +if (priv->state ==MLX5_VDPA_STATE_PROBED ) +mlx5_vdpa_dev_cache_clean (priv); + priv->connected = false; +return 0 ; +} +static struct rte_vdpa_dev_ops mlx5_vdpa_ops = { .get_queue_num = mlx5_vdpa_get_queue_num, .get_features = mlx5_vdpa_get_vdpa_features, .get_protocol_features = mlx5_vdpa_get_protocol_features, .dev_conf = mlx5_vdpa_dev_config, .dev_close = mlx5_vdpa_dev_close, + .dev_cleanup = mlx5_vdpa_dev_cleanup, .set_vring_state = mlx5_vdpa_set_vring_state, .set_features = mlx5_vdpa_features_set, .migration_done =NULL ,
drivers/vdpa/mlx5/mlx5_vdpa.h +1 -0
@@ -121,6 +121,7 @@ enum mlx5_dev_state {struct mlx5_vdpa_priv {TAILQ_ENTRY (mlx5_vdpa_priv) next; +bool connected;enum mlx5_dev_state state;pthread_mutex_t vq_config_lock;uint64_t no_traffic_counter;
Signature · 1 line
2.35.1
PATCH v3 7/7 vdpa/mlx5: make statistics counter persistent
In reply to Xueming LiIn order to speed-up the device suspend and resume, make the statistics counters persistent in reconfiguration until the device gets removed.
--- doc/guides/vdpadevs/mlx5.rst | 6 ++++++ drivers/vdpa/mlx5/mlx5_vdpa.c | 19 +++++++---------- drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 32 +++++++++++------------------ 4 files changed, 26 insertions(+), 32 deletions(-)
doc/guides/vdpadevs/mlx5.rst +6 -0
@@ -109,3 +109,9 @@ Upon potential hardware errors, mlx5 PMD try to recover, give up if failed 3 times in 3 seconds, virtq will be put in disable state. User should check log to get error information, or query vdpa statistics counter to know error type and count report. + +Statistics +^^^^^^^^^^ + +The device statistics counter persists in reconfiguration until the device gets +removed. User can reset counters by calling function rte_vdpa_reset_stats().
drivers/vdpa/mlx5/mlx5_vdpa.c +7 -12
@@ -388,12 +388,7 @@ mlx5_vdpa_get_stats(struct rte_vdpa_device *vdev, int qid,DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (priv->state ==MLX5_VDPA_STATE_PROBED ) { -DRV_LOG (ERR ,"Device %s was not configured." , - vdev->device->name); -return -ENODATA ; - } -if (qid >= (int )priv->nr_virtqs) { +if (qid >= (int )priv->caps.max_num_virtio_queues *2 ) {DRV_LOG (ERR ,"Too big vring id: %d for device %s." , qid, vdev->device->name);return -E2BIG ;
@@ -416,12 +411,7 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)DRV_LOG (ERR ,"Invalid device: %s." , vdev->device->name);return -ENODEV ; } -if (priv->state ==MLX5_VDPA_STATE_PROBED ) { -DRV_LOG (ERR ,"Device %s was not configured." , - vdev->device->name); -return -ENODATA ; - } -if (qid >= (int )priv->nr_virtqs) { +if (qid >= (int )priv->caps.max_num_virtio_queues *2 ) {DRV_LOG (ERR ,"Too big vring id: %d for device %s." , qid, vdev->device->name);return -E2BIG ;
@@ -695,6 +685,11 @@ mlx5_vdpa_release_dev_resources(struct mlx5_vdpa_priv *priv)uint32_t i;mlx5_vdpa_dev_cache_clean (priv); +for (i =0 ; i < priv->caps.max_num_virtio_queues *2 ; i++) { +if (!priv->virtqs[i].counters) +continue ; +claim_zero (mlx5_devx_cmd_destroy (priv->virtqs[i].counters)); + }mlx5_vdpa_event_qp_global_release (priv);mlx5_vdpa_err_event_unset (priv);if (priv->steer.tbl)
drivers/vdpa/mlx5/mlx5_vdpa.h +1 -0
@@ -92,6 +92,7 @@ struct mlx5_vdpa_virtq {struct rte_intr_handle *intr_handle;uint64_t err_time[3 ];/* RDTSC time of recent errors. */ uint32_t n_retry; +struct mlx5_devx_virtio_q_couners_attr stats;struct mlx5_devx_virtio_q_couners_attr reset; };
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +12 -20
@@ -127,14 +127,9 @@ void mlx5_vdpa_virtqs_release(struct mlx5_vdpa_priv *priv) {int i; -struct mlx5_vdpa_virtq *virtq; -for (i =0 ; i < priv->nr_virtqs; i++) { - virtq = &priv->virtqs[i]; -mlx5_vdpa_virtq_unset (virtq); -if (virtq->counters) -claim_zero (mlx5_devx_cmd_destroy (virtq->counters)); - } +for (i =0 ; i < priv->nr_virtqs; i++) +mlx5_vdpa_virtq_unset (&priv->virtqs[i]); priv->features =0 ; priv->nr_virtqs =0 ; }
@@ -590,7 +585,7 @@ mlx5_vdpa_virtq_stats_get(struct mlx5_vdpa_priv *priv, int qid, struct rte_vdpa_stat *stats, unsigned int n) {struct mlx5_vdpa_virtq *virtq = &priv->virtqs[qid]; -struct mlx5_devx_virtio_q_couners_attr attr = {0 }; +struct mlx5_devx_virtio_q_couners_attr *attr = &virtq->stats;int ret;if (!virtq->counters) {
@@ -598,7 +593,7 @@ mlx5_vdpa_virtq_stats_get(struct mlx5_vdpa_priv *priv, int qid, "is invalid.", qid);return -EINVAL ; } - ret =mlx5_devx_cmd_query_virtio_q_counters (virtq->counters, &attr); + ret =mlx5_devx_cmd_query_virtio_q_counters (virtq->counters, attr);if (ret) {DRV_LOG (ERR ,"Failed to read virtq %d stats from HW." , qid);return ret;
@@ -608,37 +603,37 @@ mlx5_vdpa_virtq_stats_get(struct mlx5_vdpa_priv *priv, int qid,return ret; stats[MLX5_VDPA_STATS_RECEIVED_DESCRIPTORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_RECEIVED_DESCRIPTORS , - .value = attr.received_desc - virtq->reset.received_desc, + .value = attr->received_desc - virtq->reset.received_desc, };if (ret ==MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS )return ret; stats[MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS , - .value = attr.completed_desc - virtq->reset.completed_desc, + .value = attr->completed_desc - virtq->reset.completed_desc, };if (ret ==MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS )return ret; stats[MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS , - .value = attr.bad_desc_errors - virtq->reset.bad_desc_errors, + .value = attr->bad_desc_errors - virtq->reset.bad_desc_errors, };if (ret ==MLX5_VDPA_STATS_EXCEED_MAX_CHAIN )return ret; stats[MLX5_VDPA_STATS_EXCEED_MAX_CHAIN ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_EXCEED_MAX_CHAIN , - .value = attr.exceed_max_chain - virtq->reset.exceed_max_chain, + .value = attr->exceed_max_chain - virtq->reset.exceed_max_chain, };if (ret ==MLX5_VDPA_STATS_INVALID_BUFFER )return ret; stats[MLX5_VDPA_STATS_INVALID_BUFFER ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_INVALID_BUFFER , - .value = attr.invalid_buffer - virtq->reset.invalid_buffer, + .value = attr->invalid_buffer - virtq->reset.invalid_buffer, };if (ret ==MLX5_VDPA_STATS_COMPLETION_ERRORS )return ret; stats[MLX5_VDPA_STATS_COMPLETION_ERRORS ] = (struct rte_vdpa_stat ) { .id =MLX5_VDPA_STATS_COMPLETION_ERRORS , - .value = attr.error_cqes - virtq->reset.error_cqes, + .value = attr->error_cqes - virtq->reset.error_cqes, };return ret; }
@@ -649,11 +644,8 @@ mlx5_vdpa_virtq_stats_reset(struct mlx5_vdpa_priv *priv, int qid)struct mlx5_vdpa_virtq *virtq = &priv->virtqs[qid];int ret; -if (!virtq->counters) { -DRV_LOG (ERR ,"Failed to read virtq %d statistics - virtq " -"is invalid." , qid); -return -EINVAL ; - } +if (virtq->counters ==NULL )/* VQ not enabled. */ +return 0 ; ret =mlx5_devx_cmd_query_virtio_q_counters (virtq->counters, &virtq->reset);if (ret)
Signature · 1 line
2.35.1
Maxime Coquelin
AppliedQuoted 18 lines · Xueming Li
v1:
- rebase with latest upstream code
- fix coverity issues
v2:
- fix build issue on OS w/o flow DR API
v3:
- commit message update, thanks Maxime!Xueming Li (7):
vdpa/mlx5: fix interrupt trash that leads to segment fault vdpa/mlx5: fix dead loop when process interrupted vdpa/mlx5: no kick handling during shutdown vdpa/mlx5: reuse resources in reconfiguration vdpa/mlx5: cache and reuse hardware resources vdpa/mlx5: support device cleanup callback vdpa/mlx5: make statistics counter persistent
Quoted 9 lines
doc/guides/vdpadevs/mlx5.rst | 6 + drivers/vdpa/mlx5/mlx5_vdpa.c | 231 +++++++++++++++++++++------- drivers/vdpa/mlx5/mlx5_vdpa.h | 31 +++- drivers/vdpa/mlx5/mlx5_vdpa_event.c | 23 +-- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 38 +++-- drivers/vdpa/mlx5/mlx5_vdpa_steer.c | 30 +--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 189 +++++++++++------------ 7 files changed, 336 insertions(+), 212 deletions(-)
Applied to dpdk-next-virtio/main.
Thanks,
Maxime