From nobody Mon Nov 04 14:56:33 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 4XhvgP4hDWz5c9jv; Mon, 04 Nov 2024 14:56:33 +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 4XhvgP468jz4YLh; Mon, 4 Nov 2024 14:56:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730732193; 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=7hnViQkUEXHuDu0Au1ayuRAkCcRVmqb5AQWMUzMdr8Q=; b=U6CA9sRnT2vOjhrAfxGuu67F51U0Z8mezYtIPhLrb8sHjntA12+tIbTo04FY1YYmP5wqBs xTvdBcYYDkNtsQ9pNQvqmZuGUZ6nMJgJG6j75q8RM+6reclQAPiQZKcNDIvGC1QTfgHleQ guaL3K+86bLV6Uj1Pn4TtdvTVBa8aNlT/eizcIVc9ewRuyQRKFsUJPfyCS5OUd+gm14tUZ a+y4IRF4LICYuEDgEkjNejI0wmv02ZA/nRUw5q2RHlWTssbN1nRzh2QZzy1X1eqy7Qcz1O eM3xIaaj4hjFLl0cpQ3SFze+bm8aJVXxr3+loRpjxNbJRtbTJcm9EOq30mPIKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730732193; 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=7hnViQkUEXHuDu0Au1ayuRAkCcRVmqb5AQWMUzMdr8Q=; b=HplrE9KxpAVoFz0cH75VpDFCfXmWmhNMDOk98Ds+XOXUqrutSQXDtwserBdMyJXGLjS0Up 9TyZ49/jqF/N+qqgfW0GQg9bzPWHAII/ZXAZA+pPBAE04SB0DAqW/OqeE8hI6z62I0z/5F 3WnQeW8EuMoubPIaXB19v1TJrfOJ/z8uRMVS9SRW2ecnDBR9oMnnZ4uclZHkUaz7qnCtId 8d+hD3DD8EJgKoqOfjoc5LGmOpaG60cIfzLgGNOk9duMEkMY9s9RvDAHR3XFyEottpS0x/ apwmh1A/t9BEi+VO3rOJFDThp11m3lrxp+6D2moJPIPKLcZ1fO05rdp8Gxmukg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730732193; a=rsa-sha256; cv=none; b=maEDCCzMaK/yKtfq+R44vGrhxWb7ABZQZPve9SSy9sLHs1ULJmjZEuKn3uKsXJvytpSQC2 TAMKRXQ9gLeMxAWaZzYVXOUDpwkwkfac0RgZp02YvdTjNdTQm4bYp3wDvXnUHyyG42ygd2 Hd+2x3eFWGbEPjJlJ7+o3B1GRpB/maL5hhSM8F358HZN590QVABgz5zbtJF4BmnRWKZlfT +nK4V5E+OMSFBw5DwCy4q+gefLDJ4oPXjCXO/4N/bThyDMTW3OGb/Hr6d6PnrOCqx0LD5K CmAdKPN70KozSF6SK/IsJzcRPzv0sIPGbGnpzoa/GDvFchScwqxqczTUj4DhTA== 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 4XhvgP3cp1zdQC; Mon, 4 Nov 2024 14:56:33 +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 4A4EuX6I059672; Mon, 4 Nov 2024 14:56:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4EuXKm059669; Mon, 4 Nov 2024 14:56:33 GMT (envelope-from git) Date: Mon, 4 Nov 2024 14:56:33 GMT Message-Id: <202411041456.4A4EuXKm059669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 349d1366edd2 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 349d1366edd23af0059e1798f436089e861d934f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=349d1366edd23af0059e1798f436089e861d934f commit 349d1366edd23af0059e1798f436089e861d934f Author: Mark Johnston AuthorDate: 2024-11-04 14:39:48 +0000 Commit: Mark Johnston CommitDate: 2024-11-04 14:56:19 +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 --- 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 a139a9d1f301..d8878505d511 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -5033,6 +5033,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 40464f555816..fda8d23f5649 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;