From nobody Tue Nov 12 02:07:53 2024 X-Original-To: dev-commits-src-main@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 4XnVDt3Wmtz5cy4p; Tue, 12 Nov 2024 02:07:58 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XnVDt1lVWz40Mj; Tue, 12 Nov 2024 02:07:58 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-83b2a41b81cso191255539f.0; Mon, 11 Nov 2024 18:07:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731377276; x=1731982076; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=v+MJS1XjTxMDA9I0zBKv3eAvtlgeZ4xuMakfJ8zNp0o=; b=QP2bJeNkl5ALMIualuj6H1mhv1qV+C3yMAD0zCaO2VJOd3+uTeEQkEZ8FqJBEmy37e RoGjFTHW6xAbrz6OhHy+QK08AGeQOc0LnPcWcx/UuDLvVTKPcSWklbvrhxVSaUQZby9x qZVmW9yMVhrx0pA8lyhCrbVVcmdYTOJ6Xm3OWX4TAChwDYArSUlq89WovCZUcAh5F0xw e/1qPU5PqiGRYNHU7lzqZBD8NPYy14lxh/EzUSSWIjRbH//HvqyEVHdspf5E+MNZRE4G PzifGbv1r+hVj/HMAkIQuxKnpYLz0fC+9pvS6pqg1WB1+m8nru6IPG48YkCDoh1eYeIB 6Z/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731377276; x=1731982076; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v+MJS1XjTxMDA9I0zBKv3eAvtlgeZ4xuMakfJ8zNp0o=; b=HSgCgsOApGBm/QD+aRx0PigWB9VATn0POClam+Wtit8dOyf49Bjgi22/zuDts0KItQ UUz4PtsAofUVBUEA5qo3fd3IBsCzUcuQtcDju/xtCZ+dfYM96ZW7ShG0FOd0HJEbO5GS 4Q4smVWm5mu6O5yUyJt9LBHd591WezfRYoAWaUlGVqY2UHII2X+q7KWVCETlhjGNqRIL 8e21dCjpqZJQgIFAVb8rt1JnoVKM0Jj0lagjy1+TzNvhMBKiRwlGDSjpZrbX0rFU3nmr QttaowTp91iIlyjQ0Fj+TiSQkb42kCDQoE26Kd6KwmpPTeQ5OVu8zEKTvoeP3qQ0LuUe Pz7A== X-Forwarded-Encrypted: i=1; AJvYcCV4XqhJ6lzNG8tn+E656LH9HyRaEEFppPI+JST4WjVkDP6x1V27VrcIrqtbCtZQsww0Np+Kco2RvTjPnH0Pt20G0yVe3c0=@freebsd.org, AJvYcCXYaB0+7HC7Y317cyvpK9l8EAgpdnoutu/xUpqGOddTbAOkAmcOLNVDLPqEZoEfxFlpMaB+dwypAh4d7BQ8TmaPOpIy@freebsd.org X-Gm-Message-State: AOJu0Yz3V+ctwRfTQyPd8NT8OMfSE6ujT6l6Txv77amLdnLQe18/2ASO nH+RqcChs7VuZLl1BlNwTpXhqlBiMocrB8TiO2CaD1kial9+yfSNyzUKAA== X-Google-Smtp-Source: AGHT+IHqRsgX/3Mq96JYW8cDE8iK3OhMhoI2RaABYvd224+w++v/axnZYOfoWiDY97077ICvFSrHVw== X-Received: by 2002:a05:6602:1607:b0:83a:71c6:26fb with SMTP id ca18e2360f4ac-83e032a82c0mr1794223239f.6.1731377276595; Mon, 11 Nov 2024 18:07:56 -0800 (PST) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de7883c8absm1612806173.154.2024.11.11.18.07.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2024 18:07:56 -0800 (PST) Date: Mon, 11 Nov 2024 21:07:53 -0500 From: Mark Johnston To: Gleb Smirnoff 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4XnVDt1lVWz40Mj X-Spamd-Bar: ---- 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