From nobody Tue May 17 17:11:57 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B02E61AD932B; Tue, 17 May 2022 17:11:57 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L2jMx47xFz3LMV; Tue, 17 May 2022 17:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652807517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7GvQRZrL2y5ezKiYbHEBLgGP9FVtumeST7v+m0OBSEw=; b=RdsMlp/2vMsX4My3Cg0I1eM9pEytBkixGk2uzs5R9h3DcOappz6gwrtZHMkMreEE2zWyzH dLXPcf3o9S6lfaOrqCCdpIPN+xdcmIQSP0maKZ3bms6bYsiXYHSzUjU4L0LK8XaXpVYjmO hmRLs+PfZC7a4hY6PT6kqmvRP/9VVNePQtyiV4B6iHNesJH9EIugw4bnCSA7VxTer8a/hf brD5hhqHJyKAUvrSEJzfbIJOcIX4pnmdY/dUr4Y9XKBpvGPYYEYnnEeIjRyUr6L5GBZF0s fWMARO/JAsM6gzPlPNoOrXnA/Wf9aROn8ZIGEjVH8DroqKkfzMP75scYT/2j1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 62F2118E11; Tue, 17 May 2022 17:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24HHBvi9094652; Tue, 17 May 2022 17:11:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24HHBvqt094639; Tue, 17 May 2022 17:11:57 GMT (envelope-from git) Date: Tue, 17 May 2022 17:11:57 GMT Message-Id: <202205171711.24HHBvqt094639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: eac7f0798b28 - main - unix: garbage collect unp_dispose_mbuf() for brevity List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eac7f0798b2837d1389ab2bfbf53d08c7f80aca2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652807517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7GvQRZrL2y5ezKiYbHEBLgGP9FVtumeST7v+m0OBSEw=; b=T+XwjGxAN8BQ8u4oP5Cny0B8NXdjd9B1gChgX2VeW/XXFswGgkdV6dR2RSNP7YjVK8in2Q PEQEE+pJibvkuuI4CyTwuBfL1VkpX1OfgIjw8TSUoRLT1LzhckrH9xjFycsOYLlOyhiLgk L5+rmoOApjr2IwL4pvaJaaWNw8HGbasfBB2kH/t4rN743e8/Y8pB5WnBnuUASa/kfENsSn 8NAAMjvkuSym0XCphLrgUhuRukutDP+Xstt8SZe6HOr6Oqb/e9SXtMvCYwg4j9mMHlsTL3 3B4xlil9rWgvisArZY6w/QAtEpLBc7vjTrPA1WEEG1CtTlEC+xdJbme1ZB1fBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652807517; a=rsa-sha256; cv=none; b=OwNkLuSrXySfjTYh+DFh/L8bec/nIPqgd1PacmnvUtZrVuACT9o4gqWk1x/V88Z6M/YE1v brg7MuSamMTDxAPC4iugqD2hRWTBWRdYYYdTpq1Hb99uHAOZOwB4jIWj7zZ5A6qeI9bI8e mAr3pXz7iryhGT8pOuxOl1g0bFE/tOcbHx9+KaX9jUXjBpf7OyH5MT4ePpliyt5VvChZVV fc+bD3Xohp9u1sSHfVlz7yQ1UOiSIvqnDvlDfvkSlvSrdOGPHeOxCoe4wfC5BF8w4Acu8i OaDXyuB7UgZVyWtgcSIyBUARYaWYVh5TALJz8Lmd1X0KBFCdOhsMsTfT0Zc0iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=eac7f0798b2837d1389ab2bfbf53d08c7f80aca2 commit eac7f0798b2837d1389ab2bfbf53d08c7f80aca2 Author: Gleb Smirnoff AuthorDate: 2022-05-17 17:10:41 +0000 Commit: Gleb Smirnoff CommitDate: 2022-05-17 17:10:41 +0000 unix: garbage collect unp_dispose_mbuf() for brevity --- sys/kern/uipc_usrreq.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 556a1de142d4..e89d7567fcda 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -296,7 +296,6 @@ static int unp_connectat(int, struct socket *, struct sockaddr *, static void unp_connect2(struct socket *so, struct socket *so2, int); static void unp_disconnect(struct unpcb *unp, struct unpcb *unp2); static void unp_dispose(struct socket *so); -static void unp_dispose_mbuf(struct mbuf *); static void unp_shutdown(struct unpcb *); static void unp_drop(struct unpcb *); static void unp_gc(__unused void *, int); @@ -1160,7 +1159,7 @@ uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, UNP_PCB_UNLOCK(unp); } if (control != NULL && error != 0) - unp_dispose_mbuf(control); + unp_scan(control, unp_freerights); release: if (control != NULL) @@ -2744,14 +2743,6 @@ unp_gc(__unused void *arg, int pending) free(unref, M_TEMP); } -static void -unp_dispose_mbuf(struct mbuf *m) -{ - - if (m) - unp_scan(m, unp_freerights); -} - /* * Synchronize against unp_gc, which can trip over data as we are freeing it. */ @@ -2783,7 +2774,7 @@ unp_dispose(struct socket *so) SOCK_IO_RECV_UNLOCK(so); if (m != NULL) { - unp_dispose_mbuf(m); + unp_scan(m, unp_freerights); m_freem(m); } }