From nobody Fri Jul 28 22:03:12 2023 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 4RCM8J4TSGz4phJq; Fri, 28 Jul 2023 22:03: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 4RCM8J40r2z4NnP; Fri, 28 Jul 2023 22:03:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690581792; 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=EDnuN0uXUjEYfvh259fykNxvaDCyo2c8aQEYy3fCNRs=; b=LfHaWK7CNJRv+JefOIJ7uLHm9CC9N8z0QmgGQYv4GqAZJSY5jXw1VgU/5lNyqaSw23TVQg V5tohY45fY83LDHzBctGU6Vs0hToCmCCEwrJAdB8rAVquM2HMJC/9YHln9B3l/JcSZ3cLg 0nZ0TN8ieOvo3IJOZpeyCBEvmZuM3q/UtXDnfkAyZjbn/82m6rBmkrjeI1ViOFLdtXU29Z 6NJ74Po5GNwgUHKkZQ8XvTUEWkj1wO/XXNRDVi0C7tul6RbV/Ar1iAj2HABA4vdVhtetJJ la+whg1XkJDVayt9+2ys6m3rmRnoDuf+ymPdSC7V+07y9nu8gvQv7rZKAMZHQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690581792; 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=EDnuN0uXUjEYfvh259fykNxvaDCyo2c8aQEYy3fCNRs=; b=TQDVM/yW/GkqhZGbjGTQAwSdlVv+7Jfu6qDHG4j1XfxetxJ/PrnYzCb9fZJbqZginWKwNU SDVIwJr55K9Kx0gQySIoQCvbW0uh+oMlWh12TeFS6LGRE2UCcmbtKWpJ/tlxd6pQSFGZzG rTLav/FrR+vyfBlrIAB2PxW13eDgi41QqOqTHSPc5t5wrZFog3Ae4/ncmO/0VoDo38NK48 dkHOcmUIVwHJ0jOkDDVBtR3L7+qrqhEA9Wxl0ZDq6BdOMw/KiOZJnr6SHaQBla73QF8L/P mCY/9hqCUo/S/2Ai44TRgIOvdZ3XiJXfhCPzLwWzjv8EnmcZVU2/dTwRkkELAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690581792; a=rsa-sha256; cv=none; b=sTJwRF29BIeVA/vLSoXfineTYY/oiIRqcsqJjAY8lpR39IemgtgKrvBNAxkJGIpyoeA+QW cE5B6P4Hk6OqVFp38geB7OFEd7Kjev5D3Qr0WmE/2o/4GHSyuDgP+sB20wPLQYW1aGVebt yGm9lnwe7ENBb8pttQB0HCHWvEROxR4wHQZ0DONIo5VyO6OZFi7E9gQ4ExnhqS0w5hU/Hl 83V2vZHNVrDvDUeqAM3Z+c6MwoKGFL3K1rgdN35EubkTxdEGaKTpYhjmdw4fybW4Aj5Q2e oomsgUYjhPYXO4l03qxcTMKD9EsXISMujG8D2tjcyJxJloZiHSRZcKc4Z7gU8g== 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 4RCM8J361kz16mj; Fri, 28 Jul 2023 22:03:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36SM3C1b056355; Fri, 28 Jul 2023 22:03:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36SM3C98056354; Fri, 28 Jul 2023 22:03:12 GMT (envelope-from git) Date: Fri, 28 Jul 2023 22:03:12 GMT Message-Id: <202307282203.36SM3C98056354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: b279e84a47dd - main - sctp: improve consistency 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b279e84a47ddb59e55b5a3cec31c51cd41bf0dc3 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b279e84a47ddb59e55b5a3cec31c51cd41bf0dc3 commit b279e84a47ddb59e55b5a3cec31c51cd41bf0dc3 Author: Michael Tuexen AuthorDate: 2023-07-28 12:36:11 +0000 Commit: Michael Tuexen CommitDate: 2023-07-28 12:36:11 +0000 sctp: improve consistency This is simplifying a patch to address PR 260116. PR: 260116 MFC after: 1 week --- sys/netinet/sctputil.c | 8 ++------ sys/netinet/sctputil.h | 6 +----- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 00a8953336de..ef8d763efabf 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -5044,11 +5044,7 @@ sctp_free_bufspace(struct sctp_tcb *stcb, struct sctp_association *asoc, if ((stcb->sctp_socket != NULL) && (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) || ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE)))) { - if (stcb->sctp_socket->so_snd.sb_cc >= tp1->book_size) { - atomic_subtract_int(&((stcb)->sctp_socket->so_snd.sb_cc), tp1->book_size); - } else { - stcb->sctp_socket->so_snd.sb_cc = 0; - } + SCTP_SAVE_ATOMIC_DECREMENT(&stcb->sctp_socket->so_snd.sb_cc, tp1->book_size); } } @@ -6125,7 +6121,7 @@ get_more_data: if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_SB_LOGGING_ENABLE) { sctp_sblog(&so->so_rcv, control->do_not_ref_stcb ? NULL : stcb, SCTP_LOG_SBFREE, (int)cp_len); } - atomic_subtract_int(&so->so_rcv.sb_cc, (int)cp_len); + SCTP_SAVE_ATOMIC_DECREMENT(&so->so_rcv.sb_cc, (int)cp_len); if ((control->do_not_ref_stcb == 0) && stcb) { atomic_subtract_int(&stcb->asoc.sb_cc, (int)cp_len); diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h index 1105ea14e1ad..60b5661c309c 100644 --- a/sys/netinet/sctputil.h +++ b/sys/netinet/sctputil.h @@ -253,11 +253,7 @@ do { \ } \ if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \ (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \ - if (stcb->sctp_socket->so_snd.sb_cc >= sp->length) { \ - atomic_subtract_int(&stcb->sctp_socket->so_snd.sb_cc,sp->length); \ - } else { \ - stcb->sctp_socket->so_snd.sb_cc = 0; \ - } \ + SCTP_SAVE_ATOMIC_DECREMENT(&stcb->sctp_socket->so_snd.sb_cc, sp->length); \ } \ } \ } while (0)