From owner-svn-src-all@freebsd.org Thu Dec 17 18:15:07 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ED3A64BE6D3; Thu, 17 Dec 2020 18:15:07 +0000 (UTC) (envelope-from afedorov@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CxgBz6F68z4VxN; Thu, 17 Dec 2020 18:15:07 +0000 (UTC) (envelope-from afedorov@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C91361CC54; Thu, 17 Dec 2020 18:15:07 +0000 (UTC) (envelope-from afedorov@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BHIF76n017246; Thu, 17 Dec 2020 18:15:07 GMT (envelope-from afedorov@FreeBSD.org) Received: (from afedorov@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BHIF7x1017245; Thu, 17 Dec 2020 18:15:07 GMT (envelope-from afedorov@FreeBSD.org) Message-Id: <202012171815.0BHIF7x1017245@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: afedorov set sender to afedorov@FreeBSD.org using -f From: Aleksandr Fedorov Date: Thu, 17 Dec 2020 18:15:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368727 - head/sys/netgraph X-SVN-Group: head X-SVN-Commit-Author: afedorov X-SVN-Commit-Paths: head/sys/netgraph X-SVN-Commit-Revision: 368727 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2020 18:15:08 -0000 Author: afedorov Date: Thu Dec 17 18:15:07 2020 New Revision: 368727 URL: https://svnweb.freebsd.org/changeset/base/368727 Log: [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 Modified: head/sys/netgraph/ng_socket.c Modified: head/sys/netgraph/ng_socket.c ============================================================================== --- head/sys/netgraph/ng_socket.c Thu Dec 17 17:21:12 2020 (r368726) +++ head/sys/netgraph/ng_socket.c Thu Dec 17 18:15:07 2020 (r368727) @@ -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); }