Date: Mon, 11 Nov 2024 21:07:53 -0500 From: Mark Johnston <markj@freebsd.org> To: Gleb Smirnoff <glebius@freebsd.org> 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: <ZzK4efU2_7lir2Ez@nuc> In-Reply-To: <ZzKnzNaXdaQ6sOHN@cell.glebi.us> References: <202411041456.4A4EuXKm059669@gitrepo.freebsd.org> <ZzKnzNaXdaQ6sOHN@cell.glebi.us>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Nov 11, 2024 at 04:56:44PM -0800, Gleb Smirnoff wrote:
> 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.
This would break consumers running in a 14.x jail on a 15.x host, no?
With VNET jails, this compatibility is very useful to have in my
experience.
> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ZzK4efU2_7lir2Ez>