Skip to content

Commit

Permalink
vdpa/mlx5: fix leak on event thread creation
Browse files Browse the repository at this point in the history
[ upstream commit ea2810f ]

As stated in the manual, pthread_attr_init return value should be
checked.
Besides, a pthread_attr_t should be destroyed once unused.

In practice, we may have no leak (from what I read in glibc current code),
but this may change in the future.
Stick to a correct use of the API.

Fixes: 5cf3fd3 ("vdpa/mlx5: add CPU core parameter to bind polling thread")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Acked-by: Matan Azrad <matan@nvidia.com>
  • Loading branch information
david-marchand authored and bluca committed Jul 12, 2022
1 parent 9224015 commit dbe68f0
Showing 1 changed file with 20 additions and 10 deletions.
30 changes: 20 additions & 10 deletions drivers/vdpa/mlx5/mlx5_vdpa_event.c
Expand Up @@ -460,6 +460,7 @@ mlx5_vdpa_cqe_event_setup(struct mlx5_vdpa_priv *priv)
{
int ret;
rte_cpuset_t cpuset;
pthread_attr_t *attrp = NULL;
pthread_attr_t attr;
char name[16];
const struct sched_param sp = {
Expand All @@ -469,22 +470,27 @@ mlx5_vdpa_cqe_event_setup(struct mlx5_vdpa_priv *priv)
if (!priv->eventc)
/* All virtqs are in poll mode. */
return 0;
pthread_attr_init(&attr);
ret = pthread_attr_setschedpolicy(&attr, SCHED_RR);
ret = pthread_attr_init(&attr);
if (ret != 0) {
DRV_LOG(ERR, "Failed to initialize thread attributes");
goto out;
}
attrp = &attr;
ret = pthread_attr_setschedpolicy(attrp, SCHED_RR);
if (ret) {
DRV_LOG(ERR, "Failed to set thread sched policy = RR.");
return -1;
goto out;
}
ret = pthread_attr_setschedparam(&attr, &sp);
ret = pthread_attr_setschedparam(attrp, &sp);
if (ret) {
DRV_LOG(ERR, "Failed to set thread priority.");
return -1;
goto out;
}
ret = pthread_create(&priv->timer_tid, &attr, mlx5_vdpa_event_handle,
ret = pthread_create(&priv->timer_tid, attrp, mlx5_vdpa_event_handle,
(void *)priv);
if (ret) {
DRV_LOG(ERR, "Failed to create timer thread.");
return -1;
goto out;
}
CPU_ZERO(&cpuset);
if (priv->event_core != -1)
Expand All @@ -494,12 +500,16 @@ mlx5_vdpa_cqe_event_setup(struct mlx5_vdpa_priv *priv)
ret = pthread_setaffinity_np(priv->timer_tid, sizeof(cpuset), &cpuset);
if (ret) {
DRV_LOG(ERR, "Failed to set thread affinity.");
return -1;
goto out;
}
snprintf(name, sizeof(name), "vDPA-mlx5-%d", priv->vid);
ret = rte_thread_setname(priv->timer_tid, name);
if (ret)
if (rte_thread_setname(priv->timer_tid, name) != 0)
DRV_LOG(DEBUG, "Cannot set timer thread name.");
out:
if (attrp != NULL)
pthread_attr_destroy(attrp);
if (ret != 0)
return -1;
return 0;
}

Expand Down

0 comments on commit dbe68f0

Please sign in to comment.