From nobody Mon May 23 14:12:17 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 C71E81B4652F; Mon, 23 May 2022 14:12:17 +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 4L6K5s5Gz7z4VXN; Mon, 23 May 2022 14:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653315137; 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=uGLA70jokTE1hAv5YSjmZPAyeJ5KZZpXOT1ogrxqPLY=; b=wNdv8pc/qIkcnkZDb98C2zoJsXuYuAdlqdXPGw7EsjlRQPAhR8F6UCKKsp+21Pw/49+g5u 1xML/NSJAuqHKxuTqw1TSjjWZIitDATT2t7Q03Wk4Ut6tY9gEHB/onMB8jf0cFwVa+OU50 H8AoutbZU6jxuo+iJC+4Ppk7i0vMFncgUfQ0hDMI7uY6kfrZRl+kZg83RZHUs0hO7bvzvG laZxtbynNBjhOC6SSVNjB4UjV6ffi3QOnnlCLM9dTP//MOLypxvEEtXhCmKhcZ0p+B1awB MRi8YIu+YT5IC6maTG61vqC6RbrUNURu5nwWxF0tkWPfst0VoHfCPT+HAAS4cA== 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 9502F114B9; Mon, 23 May 2022 14:12:17 +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 24NECHtT048613; Mon, 23 May 2022 14:12:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24NECH9M048612; Mon, 23 May 2022 14:12:17 GMT (envelope-from git) Date: Mon, 23 May 2022 14:12:17 GMT Message-Id: <202205231412.24NECH9M048612@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: 5cebd8305afe - main - sctp: more sb_cc related cleanups 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: 5cebd8305afecad82f5d9628d8f7981d33559037 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653315137; 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=uGLA70jokTE1hAv5YSjmZPAyeJ5KZZpXOT1ogrxqPLY=; b=IpnAKG13tCRZBzWn/p2rJGBIB0NH9QU+Gnuwtn/0eKwZf5uOg59sQCRpVeyh1wa1eeg/64 iC6Z/5QsWvU6nrCTa6rs1QJ/e/6BSBaOaUnrdOKbdqEDfwQ4/TbnOlJH9H9YMkdd2SlpaP 688mio0F5G03MGo5XsT4NtmAuh8AYfypxHziMD0LCI6XipSGij50A0UGUn8sA2wG770YFK GFlQAW5Nl4yGbEuOxDrsI3eSVc97phWB5ovOe74aTAMeUhz4w6ULPlC85s9WjUZeZV8o07 96bCm38wdRHo+XENkpX5gbcsHIo9rLzGXAkkIGNHb1jAnSuL5CcsPRC5qR+lIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653315137; a=rsa-sha256; cv=none; b=HaDZ7oRqimkcOM9hidewCylwWJ9zB4nyCQLRKegvnzE8Hwgn7jqfTV0+wAATV26MWR2YYM Xq8g9E1k4e6VBnjZ9p5uAzT3jtJKOFXh9EWUlErfcIrSHOhq7AtJiedmA+qzzT2axC7IHb QZOtq0qoS30uVys7HYkmP4l+Luy/SnLkFCWsZzCd7SWZnoJ79HhV73KlHBji0JsAfLVRvV 4TsJ7VDDIPNrNZO8xQVzPRGFYxM96u95eiC1AQRUNegO7yeTLQp6gHWCzANPTOuhWp1Ez8 PRkPrnvPjg984sEHHFaFAOWGkpR56faFC/3Jbj+2QTDvmHNUXQGtDqW9kRJSHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5cebd8305afecad82f5d9628d8f7981d33559037 commit 5cebd8305afecad82f5d9628d8f7981d33559037 Author: Michael Tuexen AuthorDate: 2022-05-23 14:09:23 +0000 Commit: Michael Tuexen CommitDate: 2022-05-23 14:09:23 +0000 sctp: more sb_cc related cleanups No functional change intended. It allows a simpler patch for PR 260116. MFC after: 3 days --- sys/netinet/sctp_var.h | 2 +- sys/netinet/sctputil.c | 15 +++++++-------- sys/netinet/sctputil.h | 24 ------------------------ 3 files changed, 8 insertions(+), 33 deletions(-) diff --git a/sys/netinet/sctp_var.h b/sys/netinet/sctp_var.h index b45c4ac410f9..0f2d3d9c61d6 100644 --- a/sys/netinet/sctp_var.h +++ b/sys/netinet/sctp_var.h @@ -85,7 +85,7 @@ extern struct pr_usrreqs sctp_usrreqs; #define sctp_sbspace(asoc, sb) ((long) ((sctp_maxspace(sb) > (asoc)->sb_cc) ? (sctp_maxspace(sb) - (asoc)->sb_cc) : 0)) -#define sctp_sbspace_failedmsgs(sb) ((long) ((sctp_maxspace(sb) > (sb)->sb_cc) ? (sctp_maxspace(sb) - (sb)->sb_cc) : 0)) +#define sctp_sbspace_failedmsgs(sb) ((long) ((sctp_maxspace(sb) > SCTP_SBAVAIL(sb)) ? (sctp_maxspace(sb) - SCTP_SBAVAIL(sb)) : 0)) #define sctp_sbspace_sub(a,b) (((a) > (b)) ? ((a) - (b)) : 0) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index a851631d2f74..23f95353323f 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -5003,7 +5003,6 @@ sctp_generate_no_user_data_cause(uint32_t tsn) return (m); } -#ifdef SCTP_MBCNT_LOGGING void sctp_free_bufspace(struct sctp_tcb *stcb, struct sctp_association *asoc, struct sctp_tmit_chunk *tp1, int chk_cnt) @@ -5011,7 +5010,8 @@ sctp_free_bufspace(struct sctp_tcb *stcb, struct sctp_association *asoc, if (tp1->data == NULL) { return; } - asoc->chunks_on_out_queue -= chk_cnt; + atomic_subtract_int(&asoc->chunks_on_out_queue, chk_cnt); +#ifdef SCTP_MBCNT_LOGGING if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_MBCNT_LOGGING_ENABLE) { sctp_log_mbcnt(SCTP_LOG_MBCNT_DECREASE, asoc->total_output_queue_size, @@ -5019,24 +5019,23 @@ sctp_free_bufspace(struct sctp_tcb *stcb, struct sctp_association *asoc, 0, tp1->mbcnt); } +#endif if (asoc->total_output_queue_size >= tp1->book_size) { - atomic_add_int(&asoc->total_output_queue_size, -tp1->book_size); + atomic_subtract_int(&asoc->total_output_queue_size, tp1->book_size); } else { asoc->total_output_queue_size = 0; } - - if (stcb->sctp_socket && (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) || + 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) { - 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; } } } -#endif - int sctp_release_pr_sctp_chunk(struct sctp_tcb *stcb, struct sctp_tmit_chunk *tp1, uint8_t sent, int so_locked) diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h index 8253fde829e1..1105ea14e1ad 100644 --- a/sys/netinet/sctputil.h +++ b/sys/netinet/sctputil.h @@ -239,34 +239,10 @@ sctp_bindx_delete_address(struct sctp_inpcb *inp, struct sockaddr *sa, int sctp_local_addr_count(struct sctp_tcb *stcb); -#ifdef SCTP_MBCNT_LOGGING void sctp_free_bufspace(struct sctp_tcb *, struct sctp_association *, struct sctp_tmit_chunk *, int); -#else -#define sctp_free_bufspace(stcb, asoc, tp1, chk_cnt) \ -do { \ - if (tp1->data != NULL) { \ - atomic_subtract_int(&((asoc)->chunks_on_out_queue), chk_cnt); \ - if ((asoc)->total_output_queue_size >= tp1->book_size) { \ - atomic_subtract_int(&((asoc)->total_output_queue_size), tp1->book_size); \ - } else { \ - (asoc)->total_output_queue_size = 0; \ - } \ - 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 >= 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; \ - } \ - } \ - } \ -} while (0) - -#endif - #define sctp_free_spbufspace(stcb, asoc, sp) \ do { \ if (sp->data != NULL) { \