From nobody Tue May 26 18:27:44 2026 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 4gQ1Sw6PSsz6gGH2 for ; Tue, 26 May 2026 18:27:44 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQ1Sw4mqXz3R1k for ; Tue, 26 May 2026 18:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779820064; 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=gzjiswqOfTbDqSfVsC2yoEVOYBlxw0XKsBJrUfyBsn0=; b=olZVaGfhfkvVYoTgIwBWBQKIJw2dVtihSE3RPJoTwv6xcMSOVGGq5U0Y8KS+v2sC2Xc6DE BFsrSyfig6Bplg3G5sPnyo7e2ThhxYRLRwQDeCKyF/j4EBvIluIIA0OAbnzbo9Nim84nxg s0UWJ8/ofHxc36ggyYYodC15Hz5v/OrZ0Nz6/MihbNyl4HoCiMSikzi8CaMrdkStvuJ9uo ZJWNyRcwio3hWkEd52EYxNuZswbeKoQr1GiA7ULfraeTRTEn6pW7eGoULmY2QRmmNKnque jN2s+YdBToKTwD1nd97MRgRpwpPw/RlJChEPEkHwV/xwPTjCIr7jfMRj+12oyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779820064; a=rsa-sha256; cv=none; b=VRlx7XdQXfiknwGc9LujUIcysSMzfNvh8RqcPcZiTVft5O8+aG9Uem46Uv2uqZOihJtRa3 t/UtIbIs5u3JKZpclIxhK95s9Xq7dGKFo8+Bw7yA9NKLbh2SQ/IW39LYTfNkCQstlmJe2O zHZEpQP3qqK7XIBmqsRKrdvZNFmVBcWRH0ri6KLkroL1NfHnnU0EDLmZcoT1SG3WqKtw3U eroCVhQ2Y7am3IsYTsoQvrRhivoybITSYKU5ZQkmVG/5+cR/Ys065PDSeVZJxqrFR0eRiX xuARsZ82cSfxuDQBW3KRAx5RFsPYINJ0R3lhVoztdGuF2ZxD4/I/RWB2hdFNJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779820064; 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=gzjiswqOfTbDqSfVsC2yoEVOYBlxw0XKsBJrUfyBsn0=; b=M0BPJjm9nORYqkba2nI2OOdWr8wL/tWLyD82Bh4Exochm9uirxV7hEFglr8GY7174Vuyv+ o/tin6wHBInuiXla589fucmky5aMdzQTAhFBtaAu25UirWcOGvtILZLjEkg+e3F35lf7VN guDKlHQdtxG77tQmXQgnF9lj9X57Xjp1dsXc58MND/tf9jSjunMuUtfZNqXwM79lqW8JZX UfGqWVgxad6qlT60s0gMwMRKpfNVasz8qeVC8dO7SF+XsxJG17lFADGXHVcYD7XZyLzRRF yoLtJxhX0T7TWRROgbhVKcPUVRVEM4OT8y5xWOVhzNoBA5TVU7Y30x+07kC2cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQ1Sw4NXJz8GQ for ; Tue, 26 May 2026 18:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41304 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 26 May 2026 18:27:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c564074c9aaa - main - divert: Avoid using atomic_(load|store)_(acq|rel)_16 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c564074c9aaa8a3f9273de3cb802edcb3e2e2a40 Auto-Submitted: auto-generated Date: Tue, 26 May 2026 18:27:44 +0000 Message-Id: <6a15e620.41304.be8363a@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c564074c9aaa8a3f9273de3cb802edcb3e2e2a40 commit c564074c9aaa8a3f9273de3cb802edcb3e2e2a40 Author: Mark Johnston AuthorDate: 2026-05-26 18:21:27 +0000 Commit: Mark Johnston CommitDate: 2026-05-26 18:26:43 +0000 divert: Avoid using atomic_(load|store)_(acq|rel)_16 It's not implemented on some arches. Use a plain int to count the number of sockets in a divert lbgroup. Reported by: Jenkins Fixes: 895a0ae67fe2 ("divert: Define semantics for SO_REUSEPORT_LB on divert sockets") --- sys/netinet/ip_divert.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 839048908f9f..390fdd9368b6 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -50,12 +50,14 @@ #include #include #include -#include + +#include #include #include #include #include +#include #include #include @@ -152,7 +154,7 @@ struct divcblbgroup { CK_SLIST_ENTRY(divcblbgroup) dl_next; struct epoch_context dl_epochctx; uint16_t dl_port; - uint16_t dl_count; + int dl_count; #define DIVCBLBGROUP_SIZE 32 struct divcb *dl_dcb[DIVCBLBGROUP_SIZE]; }; @@ -297,7 +299,7 @@ divert_packet(struct mbuf *m, uint64_t id, bool incoming) CK_SLIST_FOREACH(dlb, &V_divlbhash[DIVHASH(nport)], dl_next) { uint16_t count; - count = atomic_load_acq_16(&dlb->dl_count); + count = atomic_load_acq_int(&dlb->dl_count); if (dlb->dl_port == nport && count > 0) { uint32_t hash; @@ -666,7 +668,7 @@ div_lbgroup_detach(struct divcb *dcb) count = dlb->dl_count; if (i != count - 1) dlb->dl_dcb[i] = dlb->dl_dcb[count - 1]; - atomic_store_rel_16(&dlb->dl_count, count - 1); + atomic_store_rel_int(&dlb->dl_count, count - 1); if (count == 1) { CK_SLIST_REMOVE(&V_divlbhash[DCBHASH(dcb)], dlb, divcblbgroup, dl_next); @@ -743,7 +745,7 @@ div_bind(struct socket *so, struct sockaddr *nam, struct thread *td) ("div_bind: lbgroup %p has count 0", tmp)); tmp->dl_dcb[tmp->dl_count] = dcb; - atomic_store_rel_16(&tmp->dl_count, tmp->dl_count + 1); + atomic_store_rel_int(&tmp->dl_count, tmp->dl_count + 1); free(dlb, M_PCB); } else { error = ENOSPC;