From nobody Mon Nov 11 14:09:07 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 4XnBHS1778z5bd6K; Mon, 11 Nov 2024 14:09:08 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XnBHS0bwvz3xsf; Mon, 11 Nov 2024 14:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731334148; 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=356AggNgn2A/pAkxAD1K/ce/ZJLp6bczgEAgaFU971E=; b=eed4UuXr0KvX56FIN295JUL7F+ks3N7+vZKoebH+m0crrQxzt4GSyFDAkhUKMNoZkmaPnN fZTehHqze+hT4etT9YOWdn94XBTavCQuKoMUDBT7u494logPknHftkUKzL0qxU5gCZwQVj NMhZbvaDJGyGfYV9h+XsEh4QNCR0X37QPGQ8BMiS1VzYB4knAfByyID/2zrZ/3lExRGK7Q nQESn27TMozsxicdZLW749wRhY/LDmZoJPaIyZX+k6ZfgAppoqisB/MnRfU3z5G7imMLfU /oa38eHmj/XVpNi8NWxQRjGeokpsC5Yr5R+S3nv/1ft8aW7UMmeZ80HGVKrukA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731334148; 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=356AggNgn2A/pAkxAD1K/ce/ZJLp6bczgEAgaFU971E=; b=Ff41LDivvWV2RiG8jBd3saz/sTHviH+GCezNTNJee6i4SI/t4/dcv05wOP1tcU25yORxiA DzVOelsUjL072ffRrKA191FRbvMqjIOzL8okH2ouO4LsZfX4Kz0opbdxrzx5UEZ6j6wRuh Jk6fOiam5kLJDRcysiz9rIg88rSeHU27X/g+ZW9k2PLu0soeBftI+AAs//yMbpbk28ZClc a/vJkhhYOHhKwdYIi2jKr9i0bE8Q3p2BRTrbkY8GdAmbgVZZ+6JNPqmYqUJLe+kE8p+lg1 gGbPIKvHmDhDHy+aDKfpT6M5Nez9uTjvLi94fbqFgZmilGFOANEh0BoQTOlEdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731334148; a=rsa-sha256; cv=none; b=od0K9p4Zxp2YJoxe9lrUXzE3wTc2Gcmy5IkhDzq4laeObkI99ywUKPsk1Ezz1y1gNl+oRg NDTKtNZG+plVdShP7ziT0jXBshPe35/ArM3zfZU5AoFFRNKUbyLm9BK2AmZYg7DT2OA9Zm B2HfUnXxv/Ch1fIaJNS5gC5TI+LNi5DXu9v8vU+Odki4EUo/S6mUMDX5dW0P1L7PJ8UMO4 8JxvEJS/tJTWY7Ml1cs9LujKH+sAqLFF7vfVCdmJ91ahBcnx5dNFKZ1GBEtYXcz/Z5wef6 fawfGAE+ki5IsNni1u+ji8/inxvM0Vr8Ntz7A1FDc/PhNFQ0UQE97QeeDodweg== 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 4XnBHS04bhzSjW; Mon, 11 Nov 2024 14:09:07 +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 4ABE97K1092004; Mon, 11 Nov 2024 14:09:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ABE97Xv092001; Mon, 11 Nov 2024 14:09:07 GMT (envelope-from git) Date: Mon, 11 Nov 2024 14:09:07 GMT Message-Id: <202411111409.4ABE97Xv092001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5b0bc0edac5c - stable/14 - socket: Export the FIB number of sockets 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 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/14 X-Git-Reftype: branch X-Git-Commit: 5b0bc0edac5c8c2469748442a042037115354eb5 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5b0bc0edac5c8c2469748442a042037115354eb5 commit 5b0bc0edac5c8c2469748442a042037115354eb5 Author: Mark Johnston AuthorDate: 2024-11-04 14:39:48 +0000 Commit: Mark Johnston CommitDate: 2024-11-11 14:01:34 +0000 socket: Export the FIB number of sockets Reviewed by: zlei MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D47315 (cherry picked from commit 349d1366edd23af0059e1798f436089e861d934f) --- sys/kern/uipc_socket.c | 1 + sys/sys/socketvar.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 84d817c9ada1..4ecd69d509ed 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -5020,6 +5020,7 @@ sotoxsocket(struct socket *so, struct xsocket *xso) xso->so_uid = so->so_cred->cr_uid; xso->so_pgid = so->so_sigio ? so->so_sigio->sio_pgid : 0; SOCK_LOCK(so); + xso->so_fibnum = so->so_fibnum; if (SOLISTENING(so)) { xso->so_qlen = so->sol_qlen; xso->so_incqlen = so->sol_incqlen; diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index f1407b7ea237..b60c8726833b 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -615,7 +615,8 @@ struct xsocket { uint32_t so_qlimit; pid_t so_pgid; uid_t so_uid; - int32_t so_spare32[8]; + int32_t so_fibnum; + int32_t so_spare32[7]; int16_t so_type; int16_t so_options; int16_t so_linger;