Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/101612

_apply patch failure_

Submitter: David Marchand <david.marchand@redhat.com>
Date: Thursday, October 14 2021 11:37:18 
Applied on: CommitID:9942ebb9c698a53b86e2bbd450f3e24238771fe5
Apply patch set 101612 failed:

Checking patch drivers/net/mlx5/linux/mlx5_socket.c...
error: while searching for:
	int flags;

	MLX5_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);
	if (server_socket)
		return 0;
	ret = socket(AF_UNIX, SOCK_STREAM, 0);
	if (ret < 0) {

error: patch failed: drivers/net/mlx5/linux/mlx5_socket.c:182
Hunk #5 succeeded at 200 (offset 7 lines).
Hunk #6 succeeded at 211 (offset 7 lines).
error: while searching for:
void
mlx5_pmd_socket_uninit(void)
{
	if (!server_socket)
		return;
	mlx5_pmd_interrupt_handler_uninstall();
	claim_zero(close(server_socket));
	server_socket = 0;
	MKSTR(path, MLX5_SOCKET_PATH, getpid());
	claim_zero(remove(path));
}

error: patch failed: drivers/net/mlx5/linux/mlx5_socket.c:233
Applying patch drivers/net/mlx5/linux/mlx5_socket.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Rejected hunk #4.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Rejected hunk #7.
diff a/drivers/net/mlx5/linux/mlx5_socket.c b/drivers/net/mlx5/linux/mlx5_socket.c	(rejected hunks)
@@ -182,7 +182,7 @@ mlx5_pmd_socket_init(void)
 	int flags;
 
 	MLX5_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);
-	if (server_socket)
+	if (server_socket != -1)
 		return 0;
 	ret = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (ret < 0) {
@@ -233,11 +234,11 @@ mlx5_pmd_socket_init(void)
 void
 mlx5_pmd_socket_uninit(void)
 {
-	if (!server_socket)
+	if (server_socket == -1)
 		return;
 	mlx5_pmd_interrupt_handler_uninstall();
 	claim_zero(close(server_socket));
-	server_socket = 0;
+	server_socket = -1;
 	MKSTR(path, MLX5_SOCKET_PATH, getpid());
 	claim_zero(remove(path));
 }

https://lab.dpdk.org/results/dashboard/patchsets/19417/

UNH-IOL DPDK Community Lab