From nobody Thu May 12 21:29:26 2022 X-Original-To: dev-commits-src-main@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 E316F1AD4782; Thu, 12 May 2022 21:29:26 +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 4KzlKL62gQz4ppD; Thu, 12 May 2022 21:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652390966; 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=Cq8uuhZVjX6K7qUVGCVdgSO9onShtX5MryrFs4hyvKg=; b=V4RFpCarNu5Gen4JlFAETn8cvJZNwyBQ3ICJPe3Rczrwdf5xTQI67fzNBxiS2cAKE99tVk s78ZPPA7Sw6PDpAI/WWLRWobUW5hRQkwDQ1MkJEB5UOfFPa7rZ0icVRMVpJgJ+3HKe6VnA UrwFrxtp9TxpYD1HmSITouHFPX6C0OwgFgZFcjQDirfmbG4xe4buK3qU/SxoTmxuSK1oMQ k+sW7VfGEjzqkGMo3Whf/1TQe/FjAZqKWwbgvng9iZERj/2aF/JEj03oYMkbTO8cE5r5x3 eVFkFboyrx9TdVbB/6Qcr82wgIAWNFPHLpGWygTqKjcPWJvi1SgXAPmNDSoSMA== 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 A0D2016223; Thu, 12 May 2022 21:29:26 +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 24CLTQgL098806; Thu, 12 May 2022 21:29:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24CLTQXG098805; Thu, 12 May 2022 21:29:26 GMT (envelope-from git) Date: Thu, 12 May 2022 21:29:26 GMT Message-Id: <202205122129.24CLTQXG098805@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: 4581cffb3d52 - main - sockets: fix build, convert missed sbreserve_locked() calls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4581cffb3d52b863cd853e923edc8e2b5cce425c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652390966; 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=Cq8uuhZVjX6K7qUVGCVdgSO9onShtX5MryrFs4hyvKg=; b=V0aWcXdOsT/HxoDT/zM9YPHRw6r7VIYOJc4wJUSHmpvuliSo+EeflpfvvprwjjAqHcVe84 oNmS+jQYF53z6xytxNom9iqWxbErisobG7TdFDNY0Xli5gIjl1s+f/0IEW8KsZQh8kvn7F aiLfI7j0tZO0+YfuRRvkX/slOXFmGIvO7Lsl25lUQK0tc/7dZOKWiasno69MlnAwRjw1cT Q4GpCSLRvzAh8YFGyCDT7bvUFr6oQYv55dWFj0juDHm2R3elz6VoeTZsdFIuCbq+p1wmGG sDW4UPgercaAyPZkyHwD81axg+RRzVtFyz//AnTdw/0G8vC8C4CQHW2wIrcvqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652390966; a=rsa-sha256; cv=none; b=kl4Q6X5kH2xT07rIZeunvCZ4+13H4wsAOUXJKemeaXKBrxZCkjtoD3HE8zPTCFxmbrnAxg KfMFiySWBX1WHGFBMdToGnh/n3TtbkyzkKNch4Y6xTf4BH9S1EzjceIBNTZQB82I94oO10 cy458CUn/TVTUQts/2VZ8vWVAIhnKfDa7oyB3vJ9YM4n7OYp0xUgfEZfKAPVxmKxbbPGmK SinctDml98/rwQfebsH0PUObwHEdSha3lZergo6J6+O/9iZgC9wUUa81CrzPr7HAt9tUky 4MeJ24aghnVs4rCn8E/7KWySxHgqezqtPqyShGHaAgbENmWToAWUeJg1WvxcTQ== 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=4581cffb3d52b863cd853e923edc8e2b5cce425c commit 4581cffb3d52b863cd853e923edc8e2b5cce425c Author: Gleb Smirnoff AuthorDate: 2022-05-12 21:27:45 +0000 Commit: Gleb Smirnoff CommitDate: 2022-05-12 21:29:19 +0000 sockets: fix build, convert missed sbreserve_locked() calls Fixes: 4328318445ae --- sys/dev/cxgbe/tom/t4_tls.c | 4 ++-- sys/netinet/tcp_stacks/bbr.c | 3 +-- sys/netinet/tcp_stacks/rack.c | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tls.c b/sys/dev/cxgbe/tom/t4_tls.c index 06a21ade04c1..936199fd18f1 100644 --- a/sys/dev/cxgbe/tom/t4_tls.c +++ b/sys/dev/cxgbe/tom/t4_tls.c @@ -786,7 +786,7 @@ t4_push_ktls(struct adapter *sc, struct toepcb *toep, int drop) int newsize = min(sb->sb_hiwat + V_tcp_autosndbuf_inc, V_tcp_autosndbuf_max); - if (!sbreserve_locked(sb, newsize, so, NULL)) + if (!sbreserve_locked(so, SO_SND, newsize, NULL)) sb->sb_flags &= ~SB_AUTOSIZE; else sowwakeup = 1; /* room available */ @@ -1108,7 +1108,7 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) unsigned int newsize = min(hiwat + sc->tt.autorcvbuf_inc, V_tcp_autorcvbuf_max); - if (!sbreserve_locked(sb, newsize, so, NULL)) + if (!sbreserve_locked(so, SO_RCV, newsize, NULL)) sb->sb_flags &= ~SB_AUTOSIZE; } diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index ced2d9658b28..67d0b7a5c64c 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -8541,8 +8541,7 @@ bbr_do_fastnewdata(struct mbuf *m, struct tcphdr *th, struct socket *so, * reached. */ if (newsize) - if (!sbreserve_locked(&so->so_rcv, - newsize, so, NULL)) + if (!sbreserve_locked(so, SO_RCV, newsize, NULL)) so->so_rcv.sb_flags &= ~SB_AUTOSIZE; m_adj(m, drop_hdrlen); /* delayed header drop */ diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index cda6bd1fcf84..0f02c5615286 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -10882,8 +10882,7 @@ rack_do_fastnewdata(struct mbuf *m, struct tcphdr *th, struct socket *so, * reached. */ if (newsize) - if (!sbreserve_locked(&so->so_rcv, - newsize, so, NULL)) + if (!sbreserve_locked(so, SO_RCV, newsize, NULL)) so->so_rcv.sb_flags &= ~SB_AUTOSIZE; m_adj(m, drop_hdrlen); /* delayed header drop */ #ifdef NETFLIX_SB_LIMITS @@ -16125,7 +16124,7 @@ rack_sndbuf_autoscale(struct tcp_rack *rack) scaleup += so->so_snd.sb_hiwat; if (scaleup > V_tcp_autosndbuf_max) scaleup = V_tcp_autosndbuf_max; - if (!sbreserve_locked(&so->so_snd, scaleup, so, curthread)) + if (!sbreserve_locked(so, SO_SND, scaleup, curthread)) so->so_snd.sb_flags &= ~SB_AUTOSIZE; } }