From nobody Thu Jun 25 17:24:51 2026 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 4gmQfX1Hwqz6j3Fm for ; Thu, 25 Jun 2026 17:24:52 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmQfX08Pmz3JHg for ; Thu, 25 Jun 2026 17:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782408292; 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=Mo7UmgGbXgVLfJA8ZcMx6MXmJVgwoXJ4pTP4G8y0tsI=; b=wrxnX6uxH5Ml27WfU46P65RczQsNf2FiF9OYzlezioN04vIkhJ48lK/L4zp0gNIpKeTgrP HtAGDzCiiUvUi90WkzHucMZ1c18beJt0/PJVgnFWKjJO6PCHjlkPpO4oy53T6XnilbO0Rq BDaKEB2g5baNKjd2a/CLZmukRxpUoYQVMXVvUns0tG5oEfOPUFngSnSf1K8LyVc3doiEpD 0niLH8blPzTzGjO/k+sHbJvvfHPTkQuxCpXaJoNQu/ljFsXB5MTJDtdPk2NPpWGtQPC98J ZfJdf9xdvcfsoBO82J5oYC/ZE4lDMOo3rWLmU7sYQ5nnr2igRLJGaIJG3pEdQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782408292; a=rsa-sha256; cv=none; b=nWYItgkyqCJFjlovGRgq1xXcs26HBbVnydrq1knlTvRYs766Mh38uglIryQ8p2cb96Wfzi hZYgF/xCXds8Xz8x1OHKMyncoM3ptAqbCcE3lr9JaytSzoHg+XqE119GFzxWCT0HMlMpoU qIAXOE5vtQCHnzgUHdeHNeS2gcGlNZYInroCuYFmj+Zke+wgLu6PhUfZu4+qqP87Y3hXAw ykXJrC580jkK4X27n+zSqllBc+9WCwtdLgst1zKA30P0KlJ03tlOtXdxXTFvRLOXOChr6T i+llgQ+QwsacYndmb2xuYQqPJE6Y2qrRZaqOCe3iKtU607/72CbwYNysIssUsg== 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=1782408292; 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=Mo7UmgGbXgVLfJA8ZcMx6MXmJVgwoXJ4pTP4G8y0tsI=; b=h0X+7O6n9JEvnB1vcZ2ffBYxjV1nOyvKN5uWcKt/qT3/ucW+rmO7zAdV50QuBPBAahOVG3 QmnsmEsRxwUaOvlH1zf5YGWCYsD/5srHiDSOEBqFuim80esTPHVN2b+UPfFwKM+O5IhWB/ 3WBuL+o6VSSC/JLuE9tJhnetCwZMiwWffOmgtps15p/af/G0ROjCkGPTPS36l+IGagoLnj GNe7ihAZL8zoPJSs1mLKCLK3TElfLbTGsRnzK/TyiYl5DoJ0X+Jx/TN0ARYIXclGfaV6/Z +A8MkjbQb/kYBQ573gS0qNZOZvYLmc4K2/o0cTEmW2cYDgDU2ozRSNSTkk4d5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmQfW5wfyz1FBt for ; Thu, 25 Jun 2026 17:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38043 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 17:24:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a64246401e62 - stable/15 - divert: Avoid using atomic_(load|store)_(acq|rel)_16 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: a64246401e62c3351b149445ebe638f4d894f69e Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 17:24:51 +0000 Message-Id: <6a3d6463.38043.c82e86c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a64246401e62c3351b149445ebe638f4d894f69e commit a64246401e62c3351b149445ebe638f4d894f69e Author: Mark Johnston AuthorDate: 2026-05-26 18:21:27 +0000 Commit: Mark Johnston CommitDate: 2026-06-25 15:21:51 +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") (cherry picked from commit c564074c9aaa8a3f9273de3cb802edcb3e2e2a40) --- 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 54789f279272..47c4ad861b8a 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -51,12 +51,14 @@ #include #include #include -#include + +#include #include #include #include #include +#include #include #include @@ -153,7 +155,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]; }; @@ -298,7 +300,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; @@ -667,7 +669,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); @@ -744,7 +746,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;