From 733bbf518f53fbc596b40a528dc73f69eea77ca0 Mon Sep 17 00:00:00 2001 From: Xueming Li Date: Tue, 3 Nov 2020 08:28:43 +0000 Subject: [PATCH] net/mlx5: fix Unix socket path mlx_steering_dump_parser.py tool failed to dump flow due to socket file name changed. Change socket file name back to make it consistent. Fixes: e4b7b8d082db ("common/mlx5: fix PCI driver name") Cc: stable@dpdk.org Signed-off-by: Xueming Li Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/linux/mlx5_socket.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_socket.c b/drivers/net/mlx5/linux/mlx5_socket.c index 08af905126..1938453980 100644 --- a/drivers/net/mlx5/linux/mlx5_socket.c +++ b/drivers/net/mlx5/linux/mlx5_socket.c @@ -20,16 +20,11 @@ /* PMD socket service for tools. */ +#define MLX5_SOCKET_PATH "/var/tmp/dpdk_net_mlx5_%d" + int server_socket; /* Unix socket for primary process. */ struct rte_intr_handle server_intr_handle; /* Interrupt handler. */ -static void -mlx5_pmd_make_path(struct sockaddr_un *addr, int pid) -{ - snprintf(addr->sun_path, sizeof(addr->sun_path), "/var/tmp/dpdk_%s_%d", - MLX5_DRIVER_NAME, pid); -} - /** * Handle server pmd socket interrupts. */ @@ -186,7 +181,8 @@ mlx5_pmd_socket_init(void) ret = fcntl(server_socket, F_SETFL, flags | O_NONBLOCK); if (ret < 0) goto error; - mlx5_pmd_make_path(&sun, getpid()); + snprintf(sun.sun_path, sizeof(sun.sun_path), MLX5_SOCKET_PATH, + getpid()); remove(sun.sun_path); ret = bind(server_socket, (const struct sockaddr *)&sun, sizeof(sun)); if (ret < 0) { @@ -225,6 +221,6 @@ RTE_FINI(mlx5_pmd_socket_uninit) mlx5_pmd_interrupt_handler_uninstall(); claim_zero(close(server_socket)); server_socket = 0; - MKSTR(path, "/var/tmp/dpdk_%s_%d", MLX5_DRIVER_NAME, getpid()); + MKSTR(path, MLX5_SOCKET_PATH, getpid()); claim_zero(remove(path)); } -- 2.20.1