From nobody Tue Nov 12 00:56:44 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 4XnSfl4sq3z5csCm; Tue, 12 Nov 2024 00:56:47 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XnSfl4C4bz51WJ; Tue, 12 Nov 2024 00:56:47 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731373007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WetZA04tm/6oWh93aKT8wfYu+yFpMIsd2jioJLIleJw=; b=pf/EVArjKZ786AbvfJN7k1X7OFxQvj37HXWQdXwRrl4mHyYgIXQkARyXmoWl55Gt5y8b48 yIrtxGSfE5djzuJzZC0wtGuRWK6aKi1uofUT1v/piQvM0aAA0DkLCdxNGTcZKGSu+rlZ/v ZWzD98y/mP0V5IRf02RxJtLxqyrqPQ36O/Fz9Eawj1HHwIAruEyvLFhMyVhvIurJVeBXsF VzK1nmFodl1Moj2m3fs6TNX4p5G4vmZhl0kfgDRZRlDF1OouiQME+9ZjbuExC2eNZE6jvg wq9A6EjiMu6Hqux6FcnM7S7cSUpvDxr8G11vbTGcGQHKiu+w6f8nNb+9Edb/Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731373007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WetZA04tm/6oWh93aKT8wfYu+yFpMIsd2jioJLIleJw=; b=E22Qd6e1gEg9gacBrRT70a16HoomA8rq/Amo6nmnacE/xtBcV24KTieuBq7pkl9cudPIOw MQ00ka9fu2Y4V4aSVW+uzRLglYaI7B5CbjacUrARc3sYrvvgAr2WqDAozO3/G1+HIgSa93 WqsGMuhLp28uTO6S1cA/VwXlJkNIxoZzpq/AiNjh6nddr1n1qsV0Ixv1fHpamh1hSb7UNz 4KIvFs932zCTi+u/FOTaHy5eT8oLsmAw2d0Aqn0D6etoorvWLKNoSfn5hH83jNbrAwI2S9 9smLhlySEoR8QRZGkAJ2akGvA7R4RDc40eXMq5zjM5HCODzZas5PU1J0oUAaYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731373007; a=rsa-sha256; cv=none; b=j9tpn9Rhf1rZ8/Gl6oceyjqX4QHqXH6n6MaZ5ADuSa4s0hV4wuQoOancEULz9nhi9Jkd7O 7ob91fnUsFZVInKCiiFAo/dW19VJzpq5CDGdo1pJ5wJga0EQ1uM9cFM+g2X3f1IjKugdVM /XENa6Jqx5j/qIggd+bhTMdP4N5s6+BJ6EA9P6R3BsVeXb/41uwmHHBKdsGFOnbILqb6M0 vGGLt5KgoQ8ZFYe+X0jPq+g4+GjvRbUrJ45G9wywG39edUF3d1uvGApRUnsTwqs/a0aWZi qSRRkIWfcPHd1G2mgX0H41EfrV+625Qnh1zR6DU5r7vPpy/PJIxlH4CnLED+jA== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XnSfk6jg3zQKp; Tue, 12 Nov 2024 00:56:46 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Mon, 11 Nov 2024 16:56:44 -0800 From: Gleb Smirnoff To: Mark Johnston Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 349d1366edd2 - main - socket: Export the FIB number of sockets Message-ID: References: <202411041456.4A4EuXKm059669@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <202411041456.4A4EuXKm059669@gitrepo.freebsd.org> On Mon, Nov 04, 2024 at 02:56:33PM +0000, Mark Johnston wrote: M> diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h M> index 40464f555816..fda8d23f5649 100644 M> --- a/sys/sys/socketvar.h M> +++ b/sys/sys/socketvar.h M> @@ -615,7 +615,8 @@ struct xsocket { M> uint32_t so_qlimit; M> pid_t so_pgid; M> uid_t so_uid; M> - int32_t so_spare32[8]; M> + int32_t so_fibnum; M> + int32_t so_spare32[7]; M> int16_t so_type; M> int16_t so_options; M> int16_t so_linger; I would suggest not to spend the spares in the main branch. So this commit should add the field, keeping 8 spares. But the merge to stable/14 should use a spare. Otherwise we eventually will run out of spares in main and also nearly run out of spares in some stable/22 branch. I'd suggest to follow the policy of not spending spares in the main branch for all structures, not just xsocket. -- Gleb Smirnoff