From a1b8fd633d2eb3f92151eafcb22e7413ec33bf03 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Thu, 7 Nov 2019 15:02:54 +1100 Subject: [PATCH] LU-10391 lnet: discard lnet_sock_accept() There is no longer any important difference between lnet_sock_accept(), and kernel_accept(..., O_NONBLOCK). So remove lnet_sock_accept(). Signed-off-by: Mr NeilBrown Change-Id: Iad7c91abe2359758982e3740a21c91232c919aa0 Reviewed-on: https://review.whamcloud.com/37303 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Alexey Lyashkov Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lnet/autoconf/lustre-lnet.m4 | 23 ----------------------- lnet/include/lnet/lib-lnet.h | 1 - lnet/lnet/acceptor.c | 3 ++- lnet/lnet/lib-socket.c | 32 -------------------------------- 4 files changed, 2 insertions(+), 57 deletions(-) diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index 42ced43..ccb61b1 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -638,27 +638,6 @@ LB_CHECK_EXPORT([kmap_to_page], [mm/highmem.c], ]) # LN_EXPORT_KMAP_TO_PAG # -# LN_CONFIG_SOCK_ACCEPT -# -# 4.11 commit cdfbabfb2f0ce983fdaa42f20e5f7842178fc01e added a flag -# to handle a possible lockdep condition kernel socket accept. -# -AC_DEFUN([LN_CONFIG_SOCK_ACCEPT], [ -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_CHECK_COMPILE([if 'struct sock' accept function requires a bool argument], -kern_sock_flag, [ - #include -],[ - ((struct socket *)0)->ops->accept(NULL, NULL, O_NONBLOCK, false); -],[ - AC_DEFINE(HAVE_KERN_SOCK_ACCEPT_FLAG_ARG, 1, - ['struct sock' accept function requires bool argument]) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) # LN_CONFIG_SOCK_ACCEPT - -# # LN_HAVE_ORACLE_OFED_EXTENSIONS # # Oracle UEK 5 @@ -766,8 +745,6 @@ LN_EXPORT_KMAP_TO_PAGE LN_CONFIG_SK_DATA_READY # 4.x LN_CONFIG_SOCK_CREATE_KERN -# 4.11 -LN_CONFIG_SOCK_ACCEPT # 4.14 LN_HAVE_ORACLE_OFED_EXTENSIONS # 4.17 diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h index 2f984cc..059a5b4 100644 --- a/lnet/include/lnet/lib-lnet.h +++ b/lnet/include/lnet/lib-lnet.h @@ -847,7 +847,6 @@ int lnet_sock_read(struct socket *sock, void *buffer, int nob, int timeout); int lnet_sock_listen(struct socket **sockp, __u32 ip, int port, int backlog, struct net *ns); -int lnet_sock_accept(struct socket **newsockp, struct socket *sock); int lnet_sock_connect(struct socket **sockp, int *fatal, __u32 local_ip, int local_port, __u32 peer_ip, int peer_port, struct net *ns); diff --git a/lnet/lnet/acceptor.c b/lnet/lnet/acceptor.c index c5ecb87..beb499b 100644 --- a/lnet/lnet/acceptor.c +++ b/lnet/lnet/acceptor.c @@ -414,7 +414,8 @@ lnet_acceptor(void *arg) if (!atomic_read(&lnet_acceptor_state.pta_ready)) continue; atomic_set(&lnet_acceptor_state.pta_ready, 0); - rc = lnet_sock_accept(&newsock, lnet_acceptor_state.pta_sock); + rc = kernel_accept(lnet_acceptor_state.pta_sock, &newsock, + SOCK_NONBLOCK); if (rc != 0) { if (rc != -EAGAIN) { CWARN("Accept error %d: pausing...\n", rc); diff --git a/lnet/lnet/lib-socket.c b/lnet/lnet/lib-socket.c index 99122e8..6e6fe37 100644 --- a/lnet/lnet/lib-socket.c +++ b/lnet/lnet/lib-socket.c @@ -333,38 +333,6 @@ lnet_sock_listen(struct socket **sockp, } int -lnet_sock_accept(struct socket **newsockp, struct socket *sock) -{ - struct socket *newsock; - int rc; - - /* XXX this should add a ref to sock->ops->owner, if - * TCP could be a module */ - rc = sock_create_lite(PF_PACKET, sock->type, IPPROTO_TCP, &newsock); - if (rc) { - CERROR("Can't allocate socket\n"); - return rc; - } - - newsock->ops = sock->ops; - -#ifdef HAVE_KERN_SOCK_ACCEPT_FLAG_ARG - rc = sock->ops->accept(sock, newsock, O_NONBLOCK, false); -#else - rc = sock->ops->accept(sock, newsock, O_NONBLOCK); -#endif - if (rc != 0) - goto failed; - - *newsockp = newsock; - return 0; - -failed: - sock_release(newsock); - return rc; -} - -int lnet_sock_connect(struct socket **sockp, int *fatal, __u32 local_ip, int local_port, __u32 peer_ip, int peer_port, -- 1.8.3.1