Commit 58368921 authored Jun 13, 2021 by Zhiqiang Liu Committed by Jim Harris Jun 22, 2021

uring: set fd to -1 after close(fd) in uring_sock_create()



In uring_sock_create(), we loops through all the addresses available.
If something is wrong, we should close(fd) and set fd to -1, and
try the next address. Only, when one fd satisfies all conditions,
we will break the loop with the useful fd.

Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
Change-Id: I22eada5437776fe90a6b57ab42cbad6dc4b0585c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8311


Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>

parent 7ba4ea07

module/sock/uring/uring.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -441,12 +441,14 @@ retry:
		rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof val);
		if (rc != 0) {
		close(fd);
		fd = -1;
		/* error */
		continue;
		}
		rc = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof val);
		if (rc != 0) {
		close(fd);
		fd = -1;
		/* error */
		continue;
		}
		@@ -456,6 +458,7 @@ retry:
		rc = setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &opts->priority, sizeof val);
		if (rc != 0) {
		close(fd);
		fd = -1;
		/* error */
		continue;
		}
		@@ -465,6 +468,7 @@ retry:
		rc = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof val);
		if (rc != 0) {
		close(fd);
		fd = -1;
		/* error */
		continue;
		}