Skip to content

Commit

Permalink
net/mlx5: fix hairpin Tx queue reference count
Browse files Browse the repository at this point in the history
[ upstream commit 9284987a85b07e168b165fc258523a3a4fde58e2 ]

When calling the haipin unbind interface, all the hairpin Tx queues
of the port will be unbound from the peer Rx queues. If one of the
Tx queue is working in the auto bind mode, the interface will return
directly.

Only when the Tx and peer Rx ports are the same, the auto bind mode
is supported. In this condition branch, the Tx queue release is
missed and the reference count is not decreased. Then in the port
stop stage, the hardware resources of this Tx queue won't be
freed. There would be some assertion or failure when starting the
port again.

With this commit, the reference count will be operated correctly.

Fixes: 37cd450 ("net/mlx5: support two ports hairpin mode")

Signed-off-by: Bing Zhao <bingz@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
  • Loading branch information
zorrohahaha authored and kevintraynor committed Mar 21, 2023
1 parent 35f9110 commit 7a7e85c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/mlx5/mlx5_trigger.c
Original file line number Diff line number Diff line change
Expand Up @@ -894,11 +894,11 @@ mlx5_hairpin_unbind_single_port(struct rte_eth_dev *dev, uint16_t rx_port)
}
/* Indeed, only the first used queue needs to be checked. */
if (txq_ctrl->hairpin_conf.manual_bind == 0) {
mlx5_txq_release(dev, i);
if (cur_port != rx_port) {
rte_errno = EINVAL;
DRV_LOG(ERR, "port %u and port %u are in"
" auto-bind mode", cur_port, rx_port);
mlx5_txq_release(dev, i);
return -rte_errno;
} else {
return 0;
Expand Down

0 comments on commit 7a7e85c

Please sign in to comment.