From 81782839541754f6fb9052723a306e18a59f77ea Mon Sep 17 00:00:00 2001 From: afedorov Date: Thu, 17 Dec 2020 18:15:07 +0000 Subject: [PATCH] [ng_socket] Don't take the SOCKBUF_LOCK() twice in the RX data path. This is just a minor optimization, but it's sensitive. This gives an improvement of 30-50 kpps. Reviewed by: kp, markj, glebius, lutz_donnerhacke.de Approved by: vmaffione (mentor) Sponsored by: vstack.com Differential Revision: https://reviews.freebsd.org/D27382 --- sys/netgraph/ng_socket.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c index 421f11bc1fd..865e9dd7948 100644 --- a/sys/netgraph/ng_socket.c +++ b/sys/netgraph/ng_socket.c @@ -987,6 +987,8 @@ ngs_rcvmsg(node_p node, item_p item, hook_p lasthook) m_freem(m); return (ENOBUFS); } + + /* sorwakeup_locked () releases the lock internally. */ sorwakeup_locked(so); return (error); @@ -1025,12 +1027,17 @@ ngs_rcvdata(hook_p hook, item_p item) addr->sg_data[addrlen] = '\0'; /* Try to tell the socket which hook it came in on. */ - if (sbappendaddr(&so->so_rcv, (struct sockaddr *)addr, m, NULL) == 0) { + SOCKBUF_LOCK(&so->so_rcv); + if (sbappendaddr_locked(&so->so_rcv, (struct sockaddr *)addr, m, + NULL) == 0) { + SOCKBUF_UNLOCK(&so->so_rcv); m_freem(m); TRAP_ERROR; return (ENOBUFS); } - sorwakeup(so); + + /* sorwakeup_locked () releases the lock internally. */ + sorwakeup_locked(so); return (0); } -- 2.45.0