From nobody Fri Oct 25 14:58:24 2024
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 4XZmB90Xz8z5ZmwJ;
Fri, 25 Oct 2024 14:58:25 +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 "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4XZmB901qxz4S3m;
Fri, 25 Oct 2024 14:58:25 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1729868305;
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=lCIltLjGiibWEA+FJ9Bjj/qZ87qHfrfBY4+hzRP+hZQ=;
b=QJK5pzUopvNRMhJ6z+eI08eJ6RRlAdX3w4GGeibDckQv2JARVd8ZrmG6cV7aVTZOU6IB7B
pnSczw5VkZ6CubyOoFhpyeIAPJfvR3br3xulfEPGnhHThBhqlXqlCSbKkYCcpoBDKZtJy6
dlaC9sKbnkZ24Kwb18/BfaS+zilkXGgdix0+WSl7qHfnrzLfbmSkdFyhigchK0ObwtoKds
IQ9TcAY6anGZibFoUn90LJoJ331LU6mmTzlZwbOL0ozyC1z2t+9AoCNY4rFWGwV65lO0NG
8RebG3t3QFNXW1ulWUN8r3yKtfe+MFtmpXKhfWalIWFU3ccR8LFB1wrhwWst5g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1729868305;
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=lCIltLjGiibWEA+FJ9Bjj/qZ87qHfrfBY4+hzRP+hZQ=;
b=XaPKolXvGcQ9T8FckljYIXoiLvnad8Q+dL5AbvkLYObT1dgyyVmeb+P51CSyRslpeCrpG2
k4qmhPZDaNM5NCpPUoOGaqmVydM9MHv1dGbGxfejWosRf3XXpO56NkrbJdQa5QPpNs9Dy9
fu39JRHd6iHzgeqLDCDbyI0/ALBUnB4wYg6PtR9LuIPh1u0oNnfyQmnQPHik5N+uVBJFjK
b9RSyv/vjT7hCyYWrUTDRVgL/rBYzDyG0srNZc5YgY21rgSxGBAtvcXvVkxtwqNIGPIgha
dpgfVjG/Sw44rUqpcxJtotYzKHJhctrUKYFpKCAZswstx0B73XCnHJzy/f1Zgg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729868305; a=rsa-sha256; cv=none;
b=Dgrj7lWBJr5BKGy32UDzLy7qTiFhXbjJxNA1FrH/Zrql7j1rO9L9gf1Sv1Pc07qN55uof7
qbGjiHvP6hQdVz4blDJEmEh3LJyahXKDFW4a5+dDk/DBb+07USzdEu1OnGtR5g1aTOUK8h
tUAUdELuvpJp2lKePMcuXrrz0M9xVE9u0lyJL8M6Rykz2a6QUmK1H/xzum1Z37jnc7rcUr
Nr+yDx14lAG02v4xOPybE9oQze3iY9RZo3FffvfqpkkUkg9JbvFQYAm04/7M9WGV0Jcb+t
pxOewFcM6Jh/ndlHkUHQgT7+8VsCbt04IX6Nxft+bB3DeseNAUYJaceTaXWxfg==
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 4XZmB86fdVzVnn;
Fri, 25 Oct 2024 14:58:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PEwOL8090712;
Fri, 25 Oct 2024 14:58:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PEwO8M090709;
Fri, 25 Oct 2024 14:58:24 GMT
(envelope-from git)
Date: Fri, 25 Oct 2024 14:58:24 GMT
Message-Id: <202410251458.49PEwO8M090709@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: a05620b0f67f - main - sctp: cleanup the addition of
addresses which are already known
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@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: a05620b0f67fe526350bf386882262ca8005533f
Auto-Submitted: auto-generated
The branch main has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=a05620b0f67fe526350bf386882262ca8005533f
commit a05620b0f67fe526350bf386882262ca8005533f
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2024-10-25 12:11:09 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2024-10-25 12:11:09 +0000
sctp: cleanup the addition of addresses which are already known
No functional change intended.
MFC after: 3 days
---
sys/netinet/sctp_pcb.c | 83 ++++++++++++++++++++++++++------------------------
1 file changed, 44 insertions(+), 39 deletions(-)
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index 112242a0e7e3..b69e7d764330 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -520,56 +520,61 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index,
atomic_add_int(&SCTP_BASE_INFO(ipi_count_ifns), 1);
}
sctp_ifap = sctp_find_ifa_by_addr(addr, vrf->vrf_id, SCTP_ADDR_LOCKED);
- if (sctp_ifap) {
- /* Hmm, it already exists? */
- if ((sctp_ifap->ifn_p) &&
- (sctp_ifap->ifn_p->ifn_index == ifn_index)) {
- SCTPDBG(SCTP_DEBUG_PCB4, "Using existing ifn %s (0x%x) for ifa %p\n",
- sctp_ifap->ifn_p->ifn_name, ifn_index,
- (void *)sctp_ifap);
- if (new_sctp_ifnp == NULL) {
- /* Remove the created one that we don't want */
- sctp_delete_ifn(sctp_ifnp);
- }
- if (sctp_ifap->localifa_flags & SCTP_BEING_DELETED) {
- /* easy to solve, just switch back to active */
- SCTPDBG(SCTP_DEBUG_PCB4, "Clearing deleted ifa flag\n");
- sctp_ifap->localifa_flags = SCTP_ADDR_VALID;
- sctp_ifap->ifn_p = sctp_ifnp;
- atomic_add_int(&sctp_ifap->ifn_p->refcount, 1);
- }
- exit_stage_left:
- SCTP_IPI_ADDR_WUNLOCK();
- if (new_sctp_ifnp != NULL) {
- SCTP_FREE(new_sctp_ifnp, SCTP_M_IFN);
- }
- SCTP_FREE(new_sctp_ifap, SCTP_M_IFA);
- return (sctp_ifap);
- } else {
- if (sctp_ifap->ifn_p) {
+ if (sctp_ifap != NULL) {
+ /* The address being added is already or still known. */
+ if (sctp_ifap->ifn_p != NULL) {
+ if (sctp_ifap->ifn_p->ifn_index == ifn_index) {
+ SCTPDBG(SCTP_DEBUG_PCB4,
+ "Using existing ifn %s (0x%x) for ifa %p\n",
+ sctp_ifap->ifn_p->ifn_name, ifn_index,
+ (void *)sctp_ifap);
+ if (new_sctp_ifnp == NULL) {
+ /* Remove the created one not used. */
+ sctp_delete_ifn(sctp_ifnp);
+ }
+ if (sctp_ifap->localifa_flags & SCTP_BEING_DELETED) {
+ /* Switch back to active. */
+ SCTPDBG(SCTP_DEBUG_PCB4,
+ "Clearing deleted ifa flag\n");
+ sctp_ifap->localifa_flags = SCTP_ADDR_VALID;
+ sctp_ifap->ifn_p = sctp_ifnp;
+ atomic_add_int(&sctp_ifap->ifn_p->refcount, 1);
+ }
+ } else {
/*
* The last IFN gets the address, remove the
* old one
*/
- SCTPDBG(SCTP_DEBUG_PCB4, "Moving ifa %p from %s (0x%x) to %s (0x%x)\n",
- (void *)sctp_ifap, sctp_ifap->ifn_p->ifn_name,
+ SCTPDBG(SCTP_DEBUG_PCB4,
+ "Moving ifa %p from %s (0x%x) to %s (0x%x)\n",
+ (void *)sctp_ifap,
+ sctp_ifap->ifn_p->ifn_name,
sctp_ifap->ifn_p->ifn_index, if_name,
ifn_index);
/* remove the address from the old ifn */
sctp_remove_ifa_from_ifn(sctp_ifap);
/* move the address over to the new ifn */
sctp_add_ifa_to_ifn(sctp_ifnp, sctp_ifap);
- goto exit_stage_left;
- } else {
- /* repair ifnp which was NULL ? */
- sctp_ifap->localifa_flags = SCTP_ADDR_VALID;
- SCTPDBG(SCTP_DEBUG_PCB4, "Repairing ifn %p for ifa %p\n",
- (void *)sctp_ifnp, (void *)sctp_ifap);
- sctp_add_ifa_to_ifn(sctp_ifnp, sctp_ifap);
}
- goto exit_stage_left;
- }
- }
+ } else {
+ /* Repair ifn_p, which was NULL... */
+ sctp_ifap->localifa_flags = SCTP_ADDR_VALID;
+ SCTPDBG(SCTP_DEBUG_PCB4,
+ "Repairing ifn %p for ifa %p\n",
+ (void *)sctp_ifnp, (void *)sctp_ifap);
+ sctp_add_ifa_to_ifn(sctp_ifnp, sctp_ifap);
+ }
+ SCTP_IPI_ADDR_WUNLOCK();
+ if (new_sctp_ifnp != NULL) {
+ SCTP_FREE(new_sctp_ifnp, SCTP_M_IFN);
+ }
+ SCTP_FREE(new_sctp_ifap, SCTP_M_IFA);
+ return (sctp_ifap);
+ }
+ KASSERT(sctp_ifnp != NULL,
+ ("sctp_add_addr_to_vrf: sctp_ifnp == NULL"));
+ KASSERT(sctp_ifap == NULL,
+ ("sctp_add_addr_to_vrf: sctp_ifap (%p) != NULL", sctp_ifap));
sctp_ifap = new_sctp_ifap;
memset(sctp_ifap, 0, sizeof(struct sctp_ifa));
sctp_ifap->ifn_p = sctp_ifnp;