From nobody Wed Nov 02 17:47:12 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 4N2Z8c6gNkz4gVfD; Wed, 2 Nov 2022 17:47:12 +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 4N2Z8c5qfSz41bn; Wed, 2 Nov 2022 17:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667411232; 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=kU1HtajuyQ6P1qZVK0gaLZU3AlPoCpZImXFd0fZn40g=; b=tObfElMSAdd63QfCQ43INU+6wYSYVPc4QekIfRCnRTWuAjubqBYY7ZMVQ+JH6HvxLORK0s MudnBI1UArNzOHs9zuuQyD+PQdYMYqM06WsdGadif+7vkC84jzQ53bTNsauhxadRVJbmlW 0igfAnYi61B9Qe4wZtIZ6K/PaD1O1axVNZmOVrw1xGeMphQ7aQWK966hvKvwmzGq0YrnsH dbe4b7HRUB6gLt8UGKHuOTKX5qhXqo5jLCZIF4q44A48ND0XOSG2wEE9of1soGyCOdLWDQ VkbIGj8Drvcv+TpewtplCp80z6mA8qqMnXa0+q9DnCA1ZQjfKCV2pXtPuNCoTA== 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 4N2Z8c4jTpz14Tx; Wed, 2 Nov 2022 17:47:12 +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 2A2HlCKV022608; Wed, 2 Nov 2022 17:47:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A2HlCPP022607; Wed, 2 Nov 2022 17:47:12 GMT (envelope-from git) Date: Wed, 2 Nov 2022 17:47:12 GMT Message-Id: <202211021747.2A2HlCPP022607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a152dd863418 - main - inpcb: Remove a PCB from its LB group upon a subsequent error 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a152dd863418638c3eb08b5c101b10b82f8072f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667411232; 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=kU1HtajuyQ6P1qZVK0gaLZU3AlPoCpZImXFd0fZn40g=; b=O8CHRZf7T6CzoGJ05UW0pacp2A3yYw9puPOv27yDTYqkxkPWA0wE+ajlxVUnXX768xPmUP 68nMHFvVNHs63seESB9Pyry52ytWSThjaxY4DCH+pi6A5ti5cA4tiDVHtFyPLU0AH/UesP 7HMTCmmzSB5j43I5wOpYK6oFMYwR3tI6qwUbrOh6SiMiG5h1E5uGMKaaCXZ55nD4IhsYMP rYm1YWcsQBxlt/HJL5/2Cq6TXrzfYZwh5KZ7c13dJ+ZOSmtYbAilBTpYl6jNfyENlJi9tF WOGaBQ8fkk/+xqfc9ztdjzFqm61VPoZTt/blouJ8xmikFlBW4jnFNzDsYnj1qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667411232; a=rsa-sha256; cv=none; b=P2sbVRyRP2Gwzt95WEiS8Gszz4lpa6LV7aXApFNF9GL6StJXdOJXCbwrTxMaH0TChfc8R/ g10u7YzztDtDn65+oj+Pn4BdW+z+WOLWus1fUkjc7+rbrEZcc/fphi+dsJsKnQnmmfNhTb dxMJcidLi/mWHJR6BDXgTkZQ4K+/3WQwGtRt2rWCyMTlyNe7vbieASbYOR+nJULnmFj4sz hSfyMebyntqmCy5SufstunXLIRkEPA5v5RLS2PTdQZhqCDZMuIp0C2VobC/foYte1JS9tp zLAqPu/rc/cA9ZZ9VWndltYE5VW4T5T2vhWhMr5GDq53HYxgzc+Tji8n9d+lqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a152dd863418638c3eb08b5c101b10b82f8072f5 commit a152dd863418638c3eb08b5c101b10b82f8072f5 Author: Mark Johnston AuthorDate: 2022-11-02 17:05:14 +0000 Commit: Mark Johnston CommitDate: 2022-11-02 17:46:24 +0000 inpcb: Remove a PCB from its LB group upon a subsequent error If a memory allocation failure causes bind to fail, we should take the inpcb back out of its LB group since it's not prepared to handle connections. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D37027 --- sys/netinet/in_pcb.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 39d147464cfa..af3f8d8d9d4d 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2404,7 +2404,6 @@ in_pcbinshash(struct inpcb *inp) struct inpcbporthead *pcbporthash; struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct inpcbport *phd; - int so_options; INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK_ASSERT(pcbinfo); @@ -2428,13 +2427,10 @@ in_pcbinshash(struct inpcb *inp) * Add entry to load balance group. * Only do this if SO_REUSEPORT_LB is set. */ - so_options = inp_so_options(inp); - if (so_options & SO_REUSEPORT_LB) { - int ret = in_pcbinslbgrouphash(inp, M_NODOM); - if (ret) { - /* pcb lb group malloc fail (ret=ENOBUFS). */ - return (ret); - } + if ((inp->inp_flags2 & INP_REUSEPORT_LB) != 0) { + int error = in_pcbinslbgrouphash(inp, M_NODOM); + if (error != 0) + return (error); } /* @@ -2444,13 +2440,16 @@ in_pcbinshash(struct inpcb *inp) if (phd->phd_port == inp->inp_lport) break; } + /* * If none exists, malloc one and tack it on. */ if (phd == NULL) { phd = uma_zalloc_smr(pcbinfo->ipi_portzone, M_NOWAIT); if (phd == NULL) { - return (ENOBUFS); /* XXX */ + if ((inp->inp_flags2 & INP_REUSEPORT_LB) != 0) + in_pcbremlbgrouphash(inp); + return (ENOMEM); } phd->phd_port = inp->inp_lport; CK_LIST_INIT(&phd->phd_pcblist);