From nobody Thu Jan 11 12:42:33 2024 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 4T9kpK65Swz55dqX; Thu, 11 Jan 2024 12:42:33 +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 4T9kpK5ff8z46qQ; Thu, 11 Jan 2024 12:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704976953; 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=n35+OuVbOYcDwHl9Ps4JdeM8pgVMte7hXqpuZitoerA=; b=DCswbkTA5ySx/aLgJvi1iM8GanCQ3lLycH4cTyFHShEWfNzudoAQCrJdnmrih8D30eOAKc SIVAQOGRsI1BAvxG9bb4HFIR+/bAYTaZDovEtb5zXn/Eh8cbgpSag1YgVlOwvPz91ErrMo wCJ475O6gb7N9wSiUOsyHoayFO2YjDlA1KKW35krHoypqlWeYG6UrmE3aH+xftxkNWiZ5w rJBusMT1GOEWpCMMI4yVXDoBgRACAkDq+9FoDNoRtKVK0gJPIhAT2BxQdpIlfYJDccV3vP w0ySlUHnU8CgUlNUziOkWQ85bqcmwEd6o7I4ZjReXoi6M5rKkm9J+sJB2U189w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704976953; 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=n35+OuVbOYcDwHl9Ps4JdeM8pgVMte7hXqpuZitoerA=; b=X8gXzIhrKW3azEtuNX8JNTDb5cQxn+HmfDpweDPJzO1VqT4SRkAlGLneeADlo2B0KcMMlS 5o2VmyyaCpfNP+Jw6XzGnXT5CT89YViJsPsPd+bXF28vqFRKQFsKgSHHugEM83rFmla4ZT N68ilhHpEVu5pkIycDscQkW4lHPNXBeHxU83/nsSJygy8saKdwnqV4+qIFfnGoE1FnUPRG EdO15aG9mEMcWTGQdLIWosVN7jpwzpfvHvd4JFgv15dZSt95mxt0T4XHPJ+/SDgy9CUvLS fQQa4LQqQYwRk1xLRq19K2DRbw23C24oh8XsddNAalmytLzQGLBKgOW3AhrW9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704976953; a=rsa-sha256; cv=none; b=VusXdW4Eb4vZsSoNedXcycZiSXv2GO4e1wn6iaq8lBOPysfQp4wTMPuAQ3oEO5KGzrkwVF phvnAzwAXfJxKJbYXVV6aRRAQgqr3iVt4Xa3dyDmh0JU+8sk2VTWBQ8pujZzcOO2vLl47U Hx9Raci3oHivK6HHUj5arrNXc1bgWkJ3rCQVAH9rJLq3qYXXM4jchrDLTDaJaoVmqwkg7X 1D+vuoUqANeQ7YeaFfmqTHxOcSiBkzW6lNOogEJuZgYGDndc08Z9G9SPv/1vd4wWXnEcNN Vj4sfEqrqaR+avdw3hmDxb7QUPJmDsIGjSl8WBLxc4XiMXzibicczdgCgd+7sQ== 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 4T9kpK4kZczKC4; Thu, 11 Jan 2024 12:42:33 +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 40BCgX7R034573; Thu, 11 Jan 2024 12:42:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BCgXln034570; Thu, 11 Jan 2024 12:42:33 GMT (envelope-from git) Date: Thu, 11 Jan 2024 12:42:33 GMT Message-Id: <202401111242.40BCgXln034570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: db083b5e571a - stable/13 - sctp: cleanup 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/stable/13 X-Git-Reftype: branch X-Git-Commit: db083b5e571a1c20044f543b10f31e32eee9a2bf Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=db083b5e571a1c20044f543b10f31e32eee9a2bf commit db083b5e571a1c20044f543b10f31e32eee9a2bf Author: Michael Tuexen AuthorDate: 2023-08-14 10:27:39 +0000 Commit: Michael Tuexen CommitDate: 2024-01-11 12:41:56 +0000 sctp: cleanup Do not put a variable in the stcb for passing it to a function. Just use a parameter of the function. No functional change intended. (cherry picked from commit 749a7fb588c4a872a4f1ce3ee92be86bab1b1f17) --- sys/netinet/sctp_indata.c | 9 ++------- sys/netinet/sctp_pcb.c | 11 +++-------- sys/netinet/sctputil.c | 27 ++++++++++----------------- 3 files changed, 15 insertions(+), 32 deletions(-) diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c index e389cf7826b7..25819af0bdb2 100644 --- a/sys/netinet/sctp_indata.c +++ b/sys/netinet/sctp_indata.c @@ -5489,9 +5489,8 @@ sctp_handle_forward_tsn(struct sctp_tcb *stcb, struct sctp_association *asoc; uint32_t new_cum_tsn, gap; unsigned int i, fwd_sz, m_size; - uint32_t str_seq; struct sctp_stream_in *strm; - struct sctp_queued_to_read *control, *ncontrol, *sv; + struct sctp_queued_to_read *control, *ncontrol; asoc = &stcb->asoc; if ((fwd_sz = ntohs(fwd->ch.chunk_length)) < sizeof(struct sctp_forward_tsn_chunk)) { @@ -5672,9 +5671,7 @@ sctp_handle_forward_tsn(struct sctp_tcb *stcb, TAILQ_FOREACH(control, &stcb->sctp_ep->read_queue, next) { if ((control->sinfo_stream == sid) && (SCTP_MID_EQ(asoc->idata_supported, control->mid, mid))) { - str_seq = (sid << 16) | (0x0000ffff & mid); control->pdapi_aborted = 1; - sv = stcb->asoc.control_pdapi; control->end_added = 1; if (control->on_strm_q == SCTP_ON_ORDERED) { TAILQ_REMOVE(&strm->inqueue, control, next_instrm); @@ -5697,13 +5694,11 @@ sctp_handle_forward_tsn(struct sctp_tcb *stcb, #endif } control->on_strm_q = 0; - stcb->asoc.control_pdapi = control; sctp_ulp_notify(SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION, stcb, SCTP_PARTIAL_DELIVERY_ABORTED, - (void *)&str_seq, + (void *)control, SCTP_SO_NOT_LOCKED); - stcb->asoc.control_pdapi = sv; break; } else if ((control->sinfo_stream == sid) && SCTP_MID_GT(asoc->idata_supported, control->mid, mid)) { diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 15f406eae32d..282ffebad541 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -4774,20 +4774,15 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int from_inpcbfre * added right after this * msg. */ - uint32_t strseq; - - stcb->asoc.control_pdapi = sq; - strseq = (sq->sinfo_stream << 16) | (sq->mid & 0x0000ffff); sctp_ulp_notify(SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION, stcb, SCTP_PARTIAL_DELIVERY_ABORTED, - (void *)&strseq, + (void *)sq, SCTP_SO_LOCKED); - stcb->asoc.control_pdapi = NULL; } + /* Add an end to wake them */ + sq->end_added = 1; } - /* Add an end to wake them */ - sq->end_added = 1; } } SCTP_INP_READ_UNLOCK(inp); diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index e21fbe041291..828455207fe2 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3638,7 +3638,8 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb) static void sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, - uint32_t val, int so_locked) + struct sctp_queued_to_read *aborted_control, + int so_locked) { struct mbuf *m_notify; struct sctp_pdapi_event *pdapi; @@ -3651,6 +3652,7 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, return; } + KASSERT(aborted_control != NULL, ("aborted_control is NULL")); SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_pdapi_event), 0, M_NOWAIT, 1, MT_DATA); @@ -3664,8 +3666,8 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, pdapi->pdapi_flags = 0; pdapi->pdapi_length = sizeof(struct sctp_pdapi_event); pdapi->pdapi_indication = error; - pdapi->pdapi_stream = (val >> 16); - pdapi->pdapi_seq = (val & 0x0000ffff); + pdapi->pdapi_stream = aborted_control->sinfo_stream; + pdapi->pdapi_seq = (uint16_t)aborted_control->mid; pdapi->pdapi_assoc_id = sctp_get_associd(stcb); SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_pdapi_event); @@ -3691,12 +3693,7 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, sctp_sblog(sb, control->do_not_ref_stcb ? NULL : stcb, SCTP_LOG_SBRESULT, 0); } control->end_added = 1; - if (stcb->asoc.control_pdapi) - TAILQ_INSERT_AFTER(&stcb->sctp_ep->read_queue, stcb->asoc.control_pdapi, control, next); - else { - /* we really should not see this case */ - TAILQ_INSERT_TAIL(&stcb->sctp_ep->read_queue, control, next); - } + TAILQ_INSERT_AFTER(&stcb->sctp_ep->read_queue, aborted_control, control, next); if (stcb->sctp_ep && stcb->sctp_socket) { /* This should always be the case */ sctp_sorwakeup(stcb->sctp_ep, stcb->sctp_socket); @@ -4132,14 +4129,10 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, (struct sctp_tmit_chunk *)data, so_locked); break; case SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION: - { - uint32_t val; - - val = *((uint32_t *)data); - - sctp_notify_partial_delivery_indication(stcb, error, val, so_locked); - break; - } + sctp_notify_partial_delivery_indication(stcb, error, + (struct sctp_queued_to_read *)data, + so_locked); + break; case SCTP_NOTIFY_ASSOC_LOC_ABORTED: if ((SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_WAIT) || (SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_ECHOED)) {