From nobody Wed Feb 23 00:00:25 2022 X-Original-To: dev-commits-src-branches@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 2D09419D0B89; Wed, 23 Feb 2022 00:00: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 4K3GQ16GW0z4V6V; Wed, 23 Feb 2022 00:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645574425; 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=hS2maGkDTAh5OW7OOgYSLiJC6GRyJWkbFJMiBBbEXns=; b=IWknXBkposbMKF1t565gQbpouSd8okt/9SCaoIgGW3KtphzgezDd6ZcEz0cr5TswsS9EYf mi18U81SYk8oCz8unn8K34EG5w3bZI+r/fSd61s9INFJJ9x2kcFVM8/mm2xTbBlFW0U9FM pjBQ8qYE0QJwV5sgpsVDLU65wWpb3tcHHJxbZgqs5JvTNR9AcKyAzwzumh2bHCzinnXq21 QyLPcO/QOuC4pQcMxASfGgVLRuxNAy+1J7E4Fkvs36FdniqjGhwArvCDM0ZLzR6jeKMPIL Jk1p5Dmm7KXhWOMj1gPhQVmkBePhnwZ1F79zyyyJfYBxvOjJfTIMZDhQoenNcw== 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 B8D535B73; Wed, 23 Feb 2022 00:00:25 +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 21N00P0N061147; Wed, 23 Feb 2022 00:00:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21N00Pjg061146; Wed, 23 Feb 2022 00:00:25 GMT (envelope-from git) Date: Wed, 23 Feb 2022 00:00:25 GMT Message-Id: <202202230000.21N00Pjg061146@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: f921b952dc19 - stable/13 - sctp: retire sctp_mtu_size_reset() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: f921b952dc192b1cef0f9c5ef6625dd7acb7f42c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645574425; 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=hS2maGkDTAh5OW7OOgYSLiJC6GRyJWkbFJMiBBbEXns=; b=H3k302Ex1jMtlvMhQNdFSXXQJTUjmDutw8FyIZlOxj9HG0X1v+1EeapoemRJrpYcwr3TAg 2q4WlYrWhE8Zw5psSCQUCriE1KzfckAmAK+OkPxrkEuNP2smPIIfRs0PH1P1aD/Mbo1HHV F+wwvOXxBkEEJ9Y0xKSaW15BuLIoYDGEoQmbWHauzyrCwKMP9Rkx2FLnsLbzo6UMg+Wq7G zOJyW0JqT3HgmY6SscIV8wrPubv7OBZCkeZCPf28vBJwhmR1zFQvMnh1yk9yrD518UoJ3q nmkcRLAWZMGZGg+u+tvnuZyRaK5XsLKDnVIK0+344RLJgrqsT4LihiixHNb5JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645574425; a=rsa-sha256; cv=none; b=DONqOFaMDvdzZFlDetirI+VtskD/3c6Kn3RTh7cw1+mlNJkC5c+s/I9i6ZDLtKJKQJksv7 exOB1o1UEii2hVvawMFyNG/6r6jwOPEHdfMrC3FC6RJx1OMKxkVg3OTHd3Tbi0C77EEYu+ 0d8BWV6nAMvisHO3eEsk7Q9MbRhxAzzyR4SYgczwHP7g3KoZfkVVqChF/klKML7WDWjXny 96gowZEO/9q9vs0EdEzDU9NR3ZFrPJbpKNC/hXYqYkSN4I30z8msu3/jEfUCBWz/O7cCsr fceC3EwJMb1f3nDXvMV8OQzjhv4Ha5Ym+z9YxvsehNPC7TgX2Y3lTzA8VagxsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f921b952dc192b1cef0f9c5ef6625dd7acb7f42c commit f921b952dc192b1cef0f9c5ef6625dd7acb7f42c Author: Michael Tuexen AuthorDate: 2021-12-30 14:30:11 +0000 Commit: Michael Tuexen CommitDate: 2022-02-22 23:58:56 +0000 sctp: retire sctp_mtu_size_reset() Thanks to Timo Voelker for making me aware that sctp_mtu_size_reset() is very similar to sctp_pathmtu_adjustment(). (cherry picked from commit 1adb91e52164af634c816327f8cdb3751dc76ce4) --- sys/netinet/sctp_output.c | 16 +++++++--------- sys/netinet/sctputil.c | 31 ------------------------------- sys/netinet/sctputil.h | 3 --- 3 files changed, 7 insertions(+), 43 deletions(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index 27c384ca5b5a..35a0406a5a9d 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -4244,10 +4244,10 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp, mtu -= sizeof(struct udphdr); } if (mtu < net->mtu) { + net->mtu = mtu; if ((stcb != NULL) && (stcb->asoc.smallest_mtu > mtu)) { - sctp_mtu_size_reset(inp, &stcb->asoc, mtu); + sctp_pathmtu_adjustment(stcb, mtu, true); } - net->mtu = mtu; } } } else if (ro->ro_nh == NULL) { @@ -4586,18 +4586,16 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp, mtu -= sizeof(struct udphdr); } if (mtu < net->mtu) { + net->mtu = mtu; if ((stcb != NULL) && (stcb->asoc.smallest_mtu > mtu)) { - sctp_mtu_size_reset(inp, &stcb->asoc, mtu); + sctp_pathmtu_adjustment(stcb, mtu, false); } - net->mtu = mtu; } } - } else if (ifp) { - if (ND_IFINFO(ifp)->linkmtu && + } else if (ifp != NULL) { + if ((ND_IFINFO(ifp)->linkmtu > 0) && (stcb->asoc.smallest_mtu > ND_IFINFO(ifp)->linkmtu)) { - sctp_mtu_size_reset(inp, - &stcb->asoc, - ND_IFINFO(ifp)->linkmtu); + sctp_pathmtu_adjustment(stcb, ND_IFINFO(ifp)->linkmtu, false); } } } diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index df3768ca2a35..04a7e12f10eb 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -2905,37 +2905,6 @@ sctp_calculate_len(struct mbuf *m) return (tlen); } -void -sctp_mtu_size_reset(struct sctp_inpcb *inp, - struct sctp_association *asoc, uint32_t mtu) -{ - /* - * Reset the P-MTU size on this association, this involves changing - * the asoc MTU, going through ANY chunk+overhead larger than mtu to - * allow the DF flag to be cleared. - */ - struct sctp_tmit_chunk *chk; - unsigned int eff_mtu, ovh; - - asoc->smallest_mtu = mtu; - if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) { - ovh = SCTP_MIN_OVERHEAD; - } else { - ovh = SCTP_MIN_V4_OVERHEAD; - } - eff_mtu = mtu - ovh; - TAILQ_FOREACH(chk, &asoc->send_queue, sctp_next) { - if (chk->send_size > eff_mtu) { - chk->flags |= CHUNK_FLAGS_FRAGMENT_OK; - } - } - TAILQ_FOREACH(chk, &asoc->sent_queue, sctp_next) { - if (chk->send_size > eff_mtu) { - chk->flags |= CHUNK_FLAGS_FRAGMENT_OK; - } - } -} - /* * Given an association and starting time of the current RTT period, update * RTO in number of msecs. net should point to the current network. diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h index 3319eb4f455b..8253fde829e1 100644 --- a/sys/netinet/sctputil.h +++ b/sys/netinet/sctputil.h @@ -108,9 +108,6 @@ sctp_timer_stop(int, struct sctp_inpcb *, struct sctp_tcb *, int sctp_dynamic_set_primary(struct sockaddr *sa, uint32_t vrf_id); -void - sctp_mtu_size_reset(struct sctp_inpcb *, struct sctp_association *, uint32_t); - void sctp_wakeup_the_read_socket(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int so_locked