From f2ddc6e78ba590a0d7662c7bd79400db1533690c Mon Sep 17 00:00:00 2001 From: Konrad Sztyber Date: Mon, 5 Sep 2022 03:53:13 +0200 Subject: [PATCH] sock: make sure ssl impl has lowest priority Bumped up the priority of the posix and uring sock implementations to make sure they are selected before SSL, when no impl is explicitly specified. Fixes #2681 Signed-off-by: Konrad Sztyber Change-Id: Ic8e1e2e13f7bce7ccd746f66087e348677df28d9 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14354 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- module/sock/posix/posix.c | 2 +- module/sock/uring/uring.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/sock/posix/posix.c b/module/sock/posix/posix.c index 3ae62988d..e431beae1 100644 --- a/module/sock/posix/posix.c +++ b/module/sock/posix/posix.c @@ -2008,7 +2008,7 @@ static struct spdk_net_impl g_posix_net_impl = { .set_opts = posix_sock_impl_set_opts, }; -SPDK_NET_IMPL_REGISTER(posix, &g_posix_net_impl, DEFAULT_SOCK_PRIORITY); +SPDK_NET_IMPL_REGISTER(posix, &g_posix_net_impl, DEFAULT_SOCK_PRIORITY + 1); static struct spdk_sock * ssl_sock_listen(const char *ip, int port, struct spdk_sock_opts *opts) diff --git a/module/sock/uring/uring.c b/module/sock/uring/uring.c index b59633330..5a43873d0 100644 --- a/module/sock/uring/uring.c +++ b/module/sock/uring/uring.c @@ -1670,4 +1670,4 @@ static struct spdk_net_impl g_uring_net_impl = { .set_opts = uring_sock_impl_set_opts, }; -SPDK_NET_IMPL_REGISTER(uring, &g_uring_net_impl, DEFAULT_SOCK_PRIORITY + 1); +SPDK_NET_IMPL_REGISTER(uring, &g_uring_net_impl, DEFAULT_SOCK_PRIORITY + 2);