From nobody Mon Aug 18 03:25:44 2025 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 4c4ylr6R8Dz64VgL; Mon, 18 Aug 2025 03:25:44 +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 4c4ylr5qrkz47pq; Mon, 18 Aug 2025 03:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755487544; 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=wG4lS1vXgjOokfOQq2kH8LNFb83yGmP4j9DAo2UephU=; b=ZHTNiIxY+cox8BOxu6k3JSXCNFi6o+MWi5J0iM3S86kvsGwpxW5sgCZ4zTN2mA8ie/l0s/ AWsWQdqBPKgUIlOL4a+LKUMVnsGvNL4SdXcCTCClg++2KZGo6SoGJtWu+gLvuh53umbIf5 ETgYGhRzBbYstBHcCRWrOJ0ZclBiC6yx5MKjO141IXoI0jn70cDe4ZAY7QPt1mATEoSZ4B MHh5F/X1cVCysQxT4Co5rx/ryCQT5kfnABPBE9l5xjzdLAXK8E/lmxKK2cBg3ITbEK7PVB Yb4zOues6DIYMIVEoUEDDuYbE9bKfXu2KuENliYDMLsxgwSlmZFxjtFi/TkvZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755487544; 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=wG4lS1vXgjOokfOQq2kH8LNFb83yGmP4j9DAo2UephU=; b=AZgAChatUvrQk8JbdZMAXrfVBTc93dFobyV5z7WqzQB0hsCHUIrahpyHETwnzWVatBL3ka 50135TrS9+vQAcygkd+VqS1dW3V91ub5jC+m89gyQBMNda05QqZH8goswE08iZEkYOmQZk /5RTheBiXw9Vq8u2sBF6x/IdXSP7RhAcW4AHtbRaPtcb41wOj4Xd44Sx4vALY9ruXtfnSh DiHKT6iahIcbN2JM25u1iSiFTysgmk8Xbzh3dPaSN6S4s+h0HEPg0XvlW1yJZjyXFyt8T+ nKLvjzN38wMT+HMVZXUJmxGVGlpS1mYKM24wyLmmnJcOnjMHEe8aY8CkR2GDMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755487544; a=rsa-sha256; cv=none; b=DjDZ+cRhJXHLZd36Pqhf3lr0IxN15LWWO3oXNCIqvyno+FHPf4Z2f/QErL8CH2uZwMhOue GIYc2qS0DJi+6tiHSfxyUJiT7wSN1vZIxhA4OfXpPg7DqmHsRy501m8tJjD/coJwYZnqrz royBgJStmwT47BeNMdHmT294AIldAaRkpRSP73fUUP6pDFs+tpzbL1irGAmDDQi0+BAM8L gfrKwRC+auSTxkl+4moxbmG5dWo/a8C86qDzDjd1N5WqToJPTvYf7m9pkxnc9DLMZ3jIdX vBqO8SBusZ0gGqyY3qTvn9iAPr2zP7l3moDnGOOO3zmQsMkCPc3hlhQKSq05DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c4ylr5FKJzfkl; Mon, 18 Aug 2025 03:25:44 +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 57I3PiRG000939; Mon, 18 Aug 2025 03:25:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57I3Pi35000934; Mon, 18 Aug 2025 03:25:44 GMT (envelope-from git) Date: Mon, 18 Aug 2025 03:25:44 GMT Message-Id: <202508180325.57I3Pi35000934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c04fe26aa2f7 - main - nfsport.h: minor comments cleanup 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c04fe26aa2f7d4c10070fc5cdbe047102f83c1be Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c04fe26aa2f7d4c10070fc5cdbe047102f83c1be commit c04fe26aa2f7d4c10070fc5cdbe047102f83c1be Author: Konstantin Belousov AuthorDate: 2025-08-18 02:49:24 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-18 03:24:29 +0000 nfsport.h: minor comments cleanup Reviewed by: rmacklem Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D51987 --- sys/fs/nfs/nfsport.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h index bd6107187966..5a019b4989cf 100644 --- a/sys/fs/nfs/nfsport.h +++ b/sys/fs/nfs/nfsport.h @@ -908,15 +908,6 @@ int nfsmsleep(void *, void *, int, const char *, struct timespec *); #define NFSBCMP(s, d, l) bcmp((s), (d), (l)) #define NFSBZERO(s, l) bzero((s), (l)) -/* - * Some queue.h files don't have these dfined in them. - */ -#ifndef LIST_END -#define LIST_END(head) NULL -#define SLIST_END(head) NULL -#define TAILQ_END(head) NULL -#endif - /* * This must be defined to be a global variable that increments once * per second, but never stops or goes backwards, even when a "date" @@ -1037,9 +1028,6 @@ void ncl_copy_vattr(struct vattr *dst, struct vattr *src); #define NFSINCRGLOBAL(a) ((a)++) #define NFSDECRGLOBAL(a) ((a)--) -/* - * Assorted funky stuff to make things work under Darwin8. - */ /* * These macros checks for a field in vattr being set. */ From nobody Mon Aug 18 09:18:19 2025 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 4c56Zg6Gs9z64t4P; Mon, 18 Aug 2025 09:18:19 +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 4c56Zg5QCsz3bmm; Mon, 18 Aug 2025 09:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755508699; 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=vOM7p7FkwlTyHlUVoJ7wJqzeBbe/Pnx0A3nufJqUrNg=; b=T3zqa8rxZmnEYUG1t5YW7EIkCF/gXTDFMxjokw9DsMVhPZuloBpWumNASVtyXGaDgvAoZe LD2CiHnVl/fs6e2QvI1ETsQFxVldYwfTTXl6zM5DpfCVdXcoo1Zy+gtisdZZYTBlIESSed TGKTQ/HX11YKU6k2tnn7DRsEN/NfgUh6MkQuB1VBUDRrHwUog2J5hyku3kcAPgkB+ehS81 J0I/MZ7OswkGMGT7NqV86EBw96bNOYGo3WtCQt9pUv2wyOwRhJXB6NCbGrekd80CnRZVHa FKe20NbDE0w1bc4Gbbl4ghYIhZC5+1fF94Fue7r6lJIBr5Tv8CR6ZTPGFaRwSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755508699; 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=vOM7p7FkwlTyHlUVoJ7wJqzeBbe/Pnx0A3nufJqUrNg=; b=hRG3ldNc4Y6oun8Qcqh0e1V1OlZdwq4us4kjBIogStVDeALyHWTjDHi8bVtdoNS8k/2pKl uaLxErwOAZr+ZnhPZCLpFrJaO4so4SYw2KSsJA+S0SggZgLqFzg8WkLWzJ9IM6ISeL/m7Z 2cggPMUZsAyezbDg5JgAwL/umiMtjPgatiP2tAIi212Dd8cn0c3+1+eGiolUs90CbcZD58 bYar/QIEQ4abxy1KhRvB+utJMEwxm0QBTJrwr62zx3kmPB0oCLP9/zhE4Nbd9SqE6gFuzi w8aIvWE5z7ejKk9l2T0yEKiU+BhJVBdX7C1iEVZ6xbdMMn8+8/svgrSfyZF2Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755508699; a=rsa-sha256; cv=none; b=XxE/ccHD8KktDTxlwYKuuvQ7cxRjp7YWjB+TbtMhJobIEVRCfCNG94LrFIdXK7y6HkN76t 0uiBpfehamb5fRTJKZq6+Cw3T/ZzdWmfQxt1L4POGeFrV2tdpBIkfPrr2k0ECnTbBsy0s2 V7jZ28js+t7SI8I2lYfd/9y1Km0qK1EgjjX672cQmbW8bSJRjFNxjBfNM9KOzH05ditKm/ 99nC1SEyYh66dGKlLYVGJyg+CfDWMNMCqR8O6nxIINm/wXs4tPoWZk2S89ziJOp4leBBi6 DdUtr8LM20wzZxETPJB/wRoPVRZkBjQhUxfnhccgY1QJ6TT6avEUeqhHYPBDAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c56Zg4kX2zr1s; Mon, 18 Aug 2025 09:18:19 +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 57I9IJ3L061933; Mon, 18 Aug 2025 09:18:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57I9IJvU061930; Mon, 18 Aug 2025 09:18:19 GMT (envelope-from git) Date: Mon, 18 Aug 2025 09:18:19 GMT Message-Id: <202508180918.57I9IJvU061930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pietro Cerutti Subject: git: 4d41e3a22d32 - stable/14 - null: support EVFILT_READ/EVFILT_WRITE kevent filters 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: gahr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4d41e3a22d320e45619c2a10ce73957d15c3efc2 Auto-Submitted: auto-generated The branch stable/14 has been updated by gahr: URL: https://cgit.FreeBSD.org/src/commit/?id=4d41e3a22d320e45619c2a10ce73957d15c3efc2 commit 4d41e3a22d320e45619c2a10ce73957d15c3efc2 Author: Pietro Cerutti AuthorDate: 2025-08-07 20:24:06 +0000 Commit: Pietro Cerutti CommitDate: 2025-08-18 09:18:01 +0000 null: support EVFILT_READ/EVFILT_WRITE kevent filters This enhances the full, null, and zero devices to support read and write kevent filters. A read event is immediately triggered for full and null, and never for zero. A write event is immediately triggered for zero and null, and never for full. Reviewed by: cognet MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51807 (cherry picked from commit b89104dfd5cf001b34963b9e02083027f9d215d5) --- sys/dev/null/null.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c index 4565639574f3..b04f4cd8919a 100644 --- a/sys/dev/null/null.c +++ b/sys/dev/null/null.c @@ -4,6 +4,7 @@ * Copyright (c) 2000 Mark R. V. Murray & Jeroen C. van Gelderen * Copyright (c) 2001-2004 Mark R. V. Murray * Copyright (c) 2014 Eitan Adler + * Copyright (c) 2025 Pietro Cerutti * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,6 +41,7 @@ #include #include #include +#include #include #include @@ -54,12 +56,26 @@ static d_write_t null_write; static d_ioctl_t null_ioctl; static d_ioctl_t zero_ioctl; static d_read_t zero_read; +static d_kqfilter_t kqfilter; +static int one_ev(struct knote *kn, long hint); +static int zero_ev(struct knote *kn, long hint); + +static const struct filterops one_fop = { + .f_isfd = 1, + .f_event = one_ev +}; + +static const struct filterops zero_fop = { + .f_isfd = 1, + .f_event = zero_ev +}; static struct cdevsw full_cdevsw = { .d_version = D_VERSION, .d_read = zero_read, .d_write = full_write, .d_ioctl = zero_ioctl, + .d_kqfilter = kqfilter, .d_name = "full", }; @@ -68,6 +84,7 @@ static struct cdevsw null_cdevsw = { .d_read = (d_read_t *)nullop, .d_write = null_write, .d_ioctl = null_ioctl, + .d_kqfilter = kqfilter, .d_name = "null", }; @@ -76,6 +93,7 @@ static struct cdevsw zero_cdevsw = { .d_read = zero_read, .d_write = null_write, .d_ioctl = zero_ioctl, + .d_kqfilter = kqfilter, .d_name = "zero", .d_flags = D_MMAP_ANON, }; @@ -198,5 +216,35 @@ null_modevent(module_t mod __unused, int type, void *data __unused) return (0); } +static int +one_ev(struct knote *kn, long hint) +{ + + return (1); +} + +static int +zero_ev(struct knote *kn, long hint) +{ + + return (0); +} + +static int +kqfilter(struct cdev *dev, struct knote *kn) +{ + + switch (kn->kn_filter) { + case EVFILT_READ: + kn->kn_fop = dev->si_devsw == &null_cdevsw ? &zero_fop : &one_fop; + return (0); + case EVFILT_WRITE: + kn->kn_fop = dev->si_devsw == &full_cdevsw ? &zero_fop : &one_fop; + return (0); + default: + return (EOPNOTSUPP); + } +} + DEV_MODULE(null, null_modevent, NULL); MODULE_VERSION(null, 1); From nobody Mon Aug 18 09:46:10 2025 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 4c57Bq1TFnz64vPg; Mon, 18 Aug 2025 09:46:11 +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 4c57Bp6HMVz3d5y; Mon, 18 Aug 2025 09:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755510370; 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=1W0vFOSBCfCapKkgto1WMvdyoPn7HyL1kYEGkrG7Jwc=; b=Ule4x6NqjjTkp3OdXqorF2zYkDY2sZgEAvU7AguxXxWsUES9/eQt2aHANwxkBROfixNkpS 2qx66o6+xbFAwN4yHwBZs7iCE5Q3LVhGx/6dFkIy+tDx8d0OAbWqmRhLL/N4BEMKdGhZeM x8YyfZ+R3LeWoL8F5M5oI5h0f+UqS1V0RyhEwljCNnGam3Bs4X3VYWHeMa0tSa7EjIRnZd UB9CF2uIrAA77yELzEEp5+wF0pY6/qpWSiSOB5Whfq4MVHh8ePH+OTrnf6mMR5++BUi0Uj 3pmHVxNNbV6y5lFr9LYc00emv9J/pYN5cGXjeNBKZOfCyh9x03iiSrDMDVuWwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755510370; 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=1W0vFOSBCfCapKkgto1WMvdyoPn7HyL1kYEGkrG7Jwc=; b=ocQsz5js99BqqI5dFOWKgZcoozQzTV9PQHqvAkxsO6xVd1odeahKmoHwyx7lMlfAGFDz1R tV8HXQVuTBnRyXJW3JC/mmt8sRhnOU4Jq3Wa94ZmeK8e7fZrWbbtIvX1c5i8X7PZBh8r7u G6zYVa8Pmfr0NOzDDdN6EVaEx11W0WfSEm4tu18AZW8risI3LdpEA6grr0/W3luKLFH8Jl nk77bfAiJmBzCJz8P4WbLBsKQxsTDQ8XVsCwmC442MIms32NYvZb3qLiDR9+Z3vHQGQfUF iqqLK95ICPJGQe4PwOYqF752kqE8fu7768cyPYWAN0Hol+Djqo7UvzFsGXKRmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755510370; a=rsa-sha256; cv=none; b=byAxUYBeMNzCG1z4896zfbsShmxSpKUzIQFIzGzp/xBz55ziUT1/Pc57TgA3OY3PmL4lBW h6qLX1fpDwj8Dr/Y8dsg1TWcdiT7TI3M1QlGLFep/f2jUcvXyVLpDj2mLlKvs1KfBajAuF p8oVblXN8M4skmdjNKl7PEPSfqCMje8BLJLoh5v4M4AWqkxAIGUMTE9Ok5bIv8fRd6SPrp Z9puZfp8oLQd/h8sHtJqF0MIMiQpvc9dNbbvRVi5oMGJlPnlU28ocnrXRDoWdQNDK8eJX4 SKbiCGUUQrer7Pn2CYjFhEtJMw3q4wrtZY9hVxTvQx/uj2d+a8dL81tc+vSfqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c57Bp4lTpzrdQ; Mon, 18 Aug 2025 09:46:10 +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 57I9kAVn017224; Mon, 18 Aug 2025 09:46:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57I9kATM017221; Mon, 18 Aug 2025 09:46:10 GMT (envelope-from git) Date: Mon, 18 Aug 2025 09:46:10 GMT Message-Id: <202508180946.57I9kATM017221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a2e28ba79238 - main - kboot: Support reading the smbios vis sysfs 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2e28ba79238ef5842db7e4581ed85c2fb63c317 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a2e28ba79238ef5842db7e4581ed85c2fb63c317 commit a2e28ba79238ef5842db7e4581ed85c2fb63c317 Author: Andrew Turner AuthorDate: 2025-07-25 02:07:17 +0000 Commit: Andrew Turner CommitDate: 2025-07-30 18:35:29 +0000 kboot: Support reading the smbios vis sysfs When reading the smbios on Linux we try to access it via /dev/mem. On some systems we can't do this as /dev/mem is locked down. To handle this try reading the sysfs file first, and if that fails fall back to /dev/mem. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51413 --- stand/kboot/kboot/main.c | 49 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/stand/kboot/kboot/main.c b/stand/kboot/kboot/main.c index a8c725a514be..4a136b42a4a1 100644 --- a/stand/kboot/kboot/main.c +++ b/stand/kboot/kboot/main.c @@ -229,6 +229,7 @@ static struct mapping uintptr_t pa; caddr_t va; } map[MAX_MAP]; +static bool smbios_mmap_file; static int smbios_fd; static int nmap; @@ -238,12 +239,17 @@ caddr_t ptov(uintptr_t pa) uintptr_t pa2; struct mapping *m = map; - pa2 = rounddown(pa, PAGE); + if (smbios_mmap_file) + pa2 = rounddown(pa, PAGE); + else + pa2 = pa; for (int i = 0; i < nmap; i++, m++) { if (m->pa == pa2) { return (m->va + pa - m->pa); } } + if (!smbios_mmap_file) + panic("Out of bounds smbios access"); if (nmap == MAX_MAP) panic("Too many maps for smbios"); @@ -298,6 +304,7 @@ static void find_smbios(void) { char buf[40]; + void *dmi_data; uintptr_t pa; caddr_t va; @@ -306,17 +313,47 @@ find_smbios(void) if (pa == 0) return; + dmi_data = NULL; + smbios_fd = host_open("/sys/firmware/dmi/tables/DMI", O_RDONLY, 0); + if (smbios_fd >= 0) { + struct host_kstat sb; + struct mapping *m; + + if (host_fstat(smbios_fd, &sb) < 0) { + host_close(smbios_fd); + goto try_dev_mem; + } + + dmi_data = malloc(sb.st_size); + if (dmi_data == NULL) { + host_close(smbios_fd); + goto try_dev_mem; + } + + host_read(smbios_fd, dmi_data, sb.st_size); + + m = &map[nmap++]; + m->pa = pa; + m->va = dmi_data; + smbios_mmap_file = false; + } else { +try_dev_mem: + smbios_fd = host_open("/dev/mem", O_RDONLY, 0); + if (smbios_fd < 0) { + printf("Can't open /sys/firmware/dmi/tables/DMI or " + "/dev/mem to read smbios\n"); + return; + } + smbios_mmap_file = true; + } snprintf(buf, sizeof(buf), "%#jx", (uintmax_t)pa); setenv("hint.smbios.0.mem", buf, 1); - smbios_fd = host_open("/dev/mem", O_RDONLY, 0); - if (smbios_fd < 0) { - printf("Can't open /dev/mem to read smbios\n"); - return; - } + va = ptov(pa); printf("Start of smbios at pa %p va %p\n", (void *)pa, va); smbios_detect(va); smbios_cleanup(); + free(dmi_data); host_close(smbios_fd); } From nobody Mon Aug 18 10:07:57 2025 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 4c57gy3Mpzz64w8r; Mon, 18 Aug 2025 10:07:58 +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 4c57gy0lbHz3fkL; Mon, 18 Aug 2025 10:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755511678; 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=PAdPRUT8DWzuE4yaQVNk9eEAc7pTxOT3SKq6v2Rx+Yg=; b=w5j35diayvHLtbFHrISO3/cM1mcR2VihBeaNKnLz5scTVQ7vs0buNJmNdq+h5MpV9tja4+ QbEj2g4oAfL3pbRN2YEoOq4R9NLlmFkDkMaA9BJaXubt0xULySPuLyOJuPUvbKMhsqVsIV 3Zxonv7TZ+SRv4ndsJfJ9XOfdsvllm1PCAui49xdXS5gsfTaUtz/yRK/heaYiCMkpNv7Rk VCglkPq7rlEFJ2sy/jsMPAtOji86CbEv2f39kiTIK4nkIrLriBuNf/HHRgJ3XPnRbt6M4k tFSFzDhnpl3LIGm9GJlZfgi3ofxWnkeJivD6ng5PGuUSEViLtWxZ/N2OzS/y4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755511678; 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=PAdPRUT8DWzuE4yaQVNk9eEAc7pTxOT3SKq6v2Rx+Yg=; b=De9qQQJ7rbVDiaemOGh7PvN0tYReT7n3g5dAmXICWvV8H8r7gmlA+IkB5ej1jaL9SL+Ceu jSZeyceZn5KIecT0l/U4OAFV/aIakvpHUfRyf4W1moDebNoyjiF3UAsjxqQIm0nRIuuWie +juCt1upLab9+2k88ipFwmyR2uYa6I8ZywPBODTquwguZuDd+GO8z2PwY2YJatRRwZid4a bzpr1FErgJdSEdGLTCw76W6uqK76SFEEI/QuylyofPsZ0KIpKgWTdFW69k5TCngS63dHQf 2AwJof+BLX8exQPJfBkSS/4Ea7Y8LgnQoXFbpnN9MCesC2e4F1PPmKE+S8xiWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755511678; a=rsa-sha256; cv=none; b=x0TDdzby8QjCeji6sT85FxetkAJvR5hxQDF9MtKWTirkrYjTgHumt+NaoBkXERzCGmoNKP ZRUuYWruMsLWztBlVZxj++q+Q8DpomctjON49ZV7HlKgQaWX3Ox9lUmuzoTjWdgKT9LsVH p76XAK//rD9Y6cZWFCuu4eKO/s8rRzs8BRwvkmR7yerF8gbIQ3QfxAkAWaoEMFh9rX16OH 9Tqv43tFFIwA1AZkY6tyk5wvHaow6e2PpK5qFhLvb4Kl57tmJjythrq9p8fg/WAF6mgOQq oXSosNnYuvyh4BHQMgdJLKDvXjXLgvVatpo4Z5luxOXbp9/19m+p/yCr8PMBoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c57gy0GsnzsHK; Mon, 18 Aug 2025 10:07:58 +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 57IA7vQA055992; Mon, 18 Aug 2025 10:07:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IA7vRS055989; Mon, 18 Aug 2025 10:07:57 GMT (envelope-from git) Date: Mon, 18 Aug 2025 10:07:57 GMT Message-Id: <202508181007.57IA7vRS055989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 094a60281b9e - main - pf: fix potential infinite loop adding/deleting addresses in tables 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 094a60281b9e8faf8f3e1a4497ab46955b5a1417 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=094a60281b9e8faf8f3e1a4497ab46955b5a1417 commit 094a60281b9e8faf8f3e1a4497ab46955b5a1417 Author: Kristof Provost AuthorDate: 2025-08-18 06:42:26 +0000 Commit: Kristof Provost CommitDate: 2025-08-18 10:03:23 +0000 pf: fix potential infinite loop adding/deleting addresses in tables The 'nadd' returned by these calls is the number of addresses actually added or deleted. It can differ from the number userspace sent to the kernel if the addresses are already present (or not present for the delete case). This meant that if all of the addresses were already handled the kernel would return zero, putting us in an infinite loop. Handle this, and extend the test case to provoke this scenario. Reported by: netchild@ Fixes: bad279e12deb ("pf: convert DIOCRDELADDRS to netlink") Fixes: 8b388995b8b2 ("pf: convert DIOCRADDADDRS to netlink") Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 22 ++++++++++------------ tests/sys/netpfil/pf/table.sh | 24 +++++++++++++++++++++++- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index cbd9d4677146..0037f31df04b 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -2453,7 +2453,7 @@ _pfctl_table_add_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, struct p snl_add_msg_attr_table(&nw, PF_TA_TABLE, tbl); snl_add_msg_attr_u32(&nw, PF_TA_FLAGS, flags); - for (int i = 0; i < size && i < 256; i++) + for (int i = 0; i < size; i++) snl_add_msg_attr_pfr_addr(&nw, PF_TA_ADDR, &addrs[i]); if ((hdr = snl_finalize_msg(&nw)) == NULL) @@ -2481,19 +2481,18 @@ pfctl_table_add_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, struct pf int ret; int off = 0; int partial_added; + int chunk_size; do { - ret = _pfctl_table_add_addrs_h(h, tbl, &addr[off], size - off, &partial_added, flags); + chunk_size = MIN(size - off, 256); + ret = _pfctl_table_add_addrs_h(h, tbl, &addr[off], chunk_size, &partial_added, flags); if (ret != 0) break; if (nadd) *nadd += partial_added; - off += partial_added; + off += chunk_size; } while (off < size); - if (nadd) - *nadd = off; - return (ret); } @@ -2521,7 +2520,7 @@ _pfctl_table_del_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, struct p snl_add_msg_attr_table(&nw, PF_TA_TABLE, tbl); snl_add_msg_attr_u32(&nw, PF_TA_FLAGS, flags); - for (int i = 0; i < size && i < 256; i++) + for (int i = 0; i < size; i++) snl_add_msg_attr_pfr_addr(&nw, PF_TA_ADDR, &addrs[i]); if ((hdr = snl_finalize_msg(&nw)) == NULL) @@ -2572,20 +2571,19 @@ pfctl_table_del_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, struct pf int ret; int off = 0; int partial_deleted; + int chunk_size; do { - ret = _pfctl_table_del_addrs_h(h, tbl, &addr[off], size - off, + chunk_size = MIN(size - off, 256); + ret = _pfctl_table_del_addrs_h(h, tbl, &addr[off], chunk_size, &partial_deleted, flags); if (ret != 0) break; if (ndel) *ndel += partial_deleted; - off += partial_deleted; + off += chunk_size; } while (off < size); - if (ndel) - *ndel = off; - return (ret); } diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index c773518e95e4..65492545a13b 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -641,9 +641,31 @@ large_body() -e match:"${expected}/${expected} addresses added." \ jexec alcatraz pfctl -t foo -T add -f ${pwd}/foo.lst actual=$(jexec alcatraz pfctl -t foo -T show | wc -l | awk '{ print $1; }') - if [[ $actual -ne $expected ]]; then + if [ $actual -ne $expected ]; then atf_fail "Unexpected number of table entries $expected $acual" fi + + # The second pass should work too, but confirm we've inserted everything + atf_check -s exit:0 \ + -e match:"0/${expected} addresses added." \ + jexec alcatraz pfctl -t foo -T add -f ${pwd}/foo.lst + + echo '42.42.42.42' >> ${pwd}/foo.lst + expected=$((${expected} + 1)) + + # And we can also insert one additional address + atf_check -s exit:0 \ + -e match:"1/${expected} addresses added." \ + jexec alcatraz pfctl -t foo -T add -f ${pwd}/foo.lst + + # Try to delete one address + atf_check -s exit:0 \ + -e match:"1/1 addresses deleted." \ + jexec alcatraz pfctl -t foo -T delete 42.42.42.42 + # And again, for the same address + atf_check -s exit:0 \ + -e match:"0/1 addresses deleted." \ + jexec alcatraz pfctl -t foo -T delete 42.42.42.42 } large_cleanup() From nobody Mon Aug 18 10:07:59 2025 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 4c57gz2nPPz64w16; Mon, 18 Aug 2025 10:07:59 +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 4c57gz1bmgz3fVh; Mon, 18 Aug 2025 10:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755511679; 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=f7sMCRUYebI4X3nw1coksat6ERHKe+gPsF8z584yhpY=; b=YM7oJexkukb2cbwtnX6s7+c47P4Oi1U8v6uBOGbz9ZOYkTMK7KeoY69wNbVrSUeqyA/N+N RB5dUUQz40PPcDENbe3CnMn8l5F1OSj5fD/0oxFt/n+5LEW5PXkgADGsnjosuavl0xXaQ7 V6gSGDOO9xn9pIUkbZZ5RGIT9EuYGkDfqp7vsqMf0Z8OmgN3Jg5LqjMJSsiNyFRdz2tLei XMmX8Lvwsd+iMDNCg+KYlYspaW+VMzHC8JadQzFGD94M4Ua7oimJL96qBbJwX9UHpOe91Z feb6Ql6PGlgothbuRzC6iAVLMZbyT/X+gxDoElcj2Vs4t9CQIb+9YWB0Y5j+Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755511679; 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=f7sMCRUYebI4X3nw1coksat6ERHKe+gPsF8z584yhpY=; b=doh3rCR9VEuXG/ZfecY8cKLeu8GHeMU7gMBHurdR88uSbzqESwGWMSfjChWkXJMGw9mOx3 /IsotXFVAL3t3bxMIq592JiySluZOSxjPt0kWNaROsr2ELkS7NLt5+hTEzF5p3amOSPnHd XlsDGuZOnuw9QgpynZh1BMrUMpX3ZVsO2FJo/ljKtx92CqwsGM6YjG1V2RLETd1caOuGcq JD3TCv1wGTnDnIPokTswZRy6rRNfIGHq1I0JuG96jPpPsW4FejjucblAiFIgcZjqUNx1iZ vg42zBJnWBoTGlAbWk2xGFrjhoif/rc8fKghVF7K6z4rfv7f3LnGtNm5FSvkXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755511679; a=rsa-sha256; cv=none; b=tW4ne3g25/1HU3eDuPxh08yGMgvFUS1O7eFIkoOdPdSZLAM3bcz81mvdABz2REcyQlRjZc IohEhbtw6qISfWOJfszkzS9pdH0aISVBd+K6onjEzLyGC1qo2vidjxx9CKwBTCaDm8p2Sg LTaCSCiZTd7s7/42k/btImuJP57XXai4KoQyPiTH63pIfPv3aYPD/pNlIKmZiQfKOcGfsz fIMeqA4C8OGPHGMKZSac6nTOeIOS/dHHNtPEfn4GIv4IZbFrdW4Pm4nJ3dJwOnk+H3/2+P A99DCnyGlEWaGtcGGqE1KP+p4ubK4kZRVz9DsbM6IMbqdaMRXDL9lSeINXEJkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c57gz1BQTzsHL; Mon, 18 Aug 2025 10:07:59 +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 57IA7xO5056032; Mon, 18 Aug 2025 10:07:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IA7xmY056029; Mon, 18 Aug 2025 10:07:59 GMT (envelope-from git) Date: Mon, 18 Aug 2025 10:07:59 GMT Message-Id: <202508181007.57IA7xmY056029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: da64f6e047b5 - main - pfctl: zero the number of added/deleted addresses 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da64f6e047b5f6cd9b9e8450d19072cb0b6e44d0 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=da64f6e047b5f6cd9b9e8450d19072cb0b6e44d0 commit da64f6e047b5f6cd9b9e8450d19072cb0b6e44d0 Author: Kristof Provost AuthorDate: 2025-08-18 06:49:38 +0000 Commit: Kristof Provost CommitDate: 2025-08-18 10:04:01 +0000 pfctl: zero the number of added/deleted addresses pfctl re-uses nadd between adding the table and adding the addresses, which lead to potential incorrect numbers if a table was created in addition to addresses being added. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_radix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 0fe9ca8813bb..398c5e998330 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -122,6 +122,9 @@ pfr_add_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size, { int ret; + if (*nadd) + *nadd = 0; + ret = pfctl_table_add_addrs_h(pfh, tbl, addr, size, nadd, flags); if (ret) { errno = ret; From nobody Mon Aug 18 13:30:33 2025 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 4c5D9k0wn7z63h2S; Mon, 18 Aug 2025 13:30:34 +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 4c5D9j738Bz3vqx; Mon, 18 Aug 2025 13:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755523834; 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=66+HKTP2qands3TgN8wb2pHBUljh1bw1Vd7F/CkpO8E=; b=F1qjDyw/INHDCROo9FHIo7c5EDABpY5xOcDXwetoOlCipd7do5uzEGXahXwnkGsYMtPEeo xtOtZeNsxvDyIoPH4pBz4/85MRZNM5xj+tRHX6/2vlXB2gIUtlDAiVIiObTDMvePrVXVOa 1urx9mbqv/pwEuEj7HzbgVt87tV58ysc5f40b7HSBbKJ25yiW8QD0znWEDerofO/wbAHtc 1MZbZB/N2jxJizuobwATgvyiwNzgLbpUGIjOZGI0KfFkEBaGqSmm/XsklkCYetgC2eVCM/ JVjZ3MttSjka5aIKZyTiQJvBUCeh1Csm/kWVTVvu7cOZsAcckcKXgP9oKdu5Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755523834; 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=66+HKTP2qands3TgN8wb2pHBUljh1bw1Vd7F/CkpO8E=; b=eqTkammP4OilvDEfgA91wYr+gaRSx+CWOuh+KY73C3Ee8bI1HgVL+thiR4nGkQcWlb3X7W UmZxuQ65AW7VSkVtaJLeNj2BkQS2ydzbIgvuPN7fzbSJVwnzIVPBKIzydUsFZeHHh/+hTA 6tBhUwWRaujJzMoEaFELxW2PbVV9rrjRVU/lY6q86pzuL3E/oXnQkP8Ub8Ghbk4bNWFFAO Emd4V5wi9U50ajBFqYCgL0Ud3FuzsrHOg7LpEPL4AzgHhkJ3fGgiWGrEbyVMfrsRA8dx8y A3ZtKhWtyFLB3aV2m4bIvpB8MNXkohnKPa7qhqk/gwSgDc1VRt2UlXoJYzfMrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755523834; a=rsa-sha256; cv=none; b=eOcG4T1DnU2kxcH0RJB2A5o/xuLwyArBUZ9sLxTsKXtxKTIA8VHWk8veHuFUxY8qUCxHx7 KQEQrNHlNaF/zyDDWs7FvLwGT2Gb+uwTps2naAgx0mfI+3yZd7ibut+DV3mxM5M6FgItx7 YwZTXtzj7SLFQQwpEVMBN8Uo525cQXV/jdIPmWghTwH9wCMDedhJw65ixEmDFoxSfKOu7l iVQGmygi8YYIUjQB5+z69YTaYIr4ooEORh4WGPKWz8raw+OtoNqp14LcJkAC2r6flZTbRO fW1+f0wiEZ4yc1QLE524R+IPJXDPDtnbUO3Br4eB3JPr3+S7QTGJcai6aFr9GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5D9j6cRlzyG7; Mon, 18 Aug 2025 13:30: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 57IDUXZZ042241; Mon, 18 Aug 2025 13:30:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IDUXDn042238; Mon, 18 Aug 2025 13:30:33 GMT (envelope-from git) Date: Mon, 18 Aug 2025 13:30:33 GMT Message-Id: <202508181330.57IDUXDn042238@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1031208ebceb - main - zfsctl_root_readdir(): properly set eof 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1031208ebceb8554a0fe9c6d9c4b98a6631d4718 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1031208ebceb8554a0fe9c6d9c4b98a6631d4718 commit 1031208ebceb8554a0fe9c6d9c4b98a6631d4718 Author: Konstantin Belousov AuthorDate: 2025-08-16 02:37:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-18 13:29:47 +0000 zfsctl_root_readdir(): properly set eof PR: 288889 Reported by: bakul Reviewed by: allanjude, markj, rmacklem Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D51930 --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index 3377db7952ef..4de48e013ec4 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -688,6 +688,8 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) * count to return is 0. */ if (zfs_uio_offset(&uio) == 3 * sizeof (entry)) { + if (eofp != NULL) + *eofp = 1; return (0); } From nobody Mon Aug 18 13:30:34 2025 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 4c5D9l48MDz63gwW; Mon, 18 Aug 2025 13:30:35 +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 4c5D9l0xchz3w9Y; Mon, 18 Aug 2025 13:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755523835; 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=S/rZzAJ9f99N1b2dDysamiPKvZ0tuubNE5BlnxvnYQ0=; b=sDz60n63D0B0gFCvqZ6OeA56q/wibQGaHdCdXBsbcxUqD5hAXPfZgidWglGXfoVeelM8lx 7zDn9iosHpAxwm1e/o5azCUKVU0EbacVoZwsSUgOXfxCemDLm2h17u2GPDiOxK5CbviXJS 0y+GKUQ2k38YadU5NgWzlCQaeGxMHwtdJ7rPCOPsH6Dd68+HolqCE0eFnc/kI+s+j7VJY5 HWB0xIaaq+qArq3Q5E8WSEKkY3MYz0Xu7zWheKSiKCPBSpfktcS6x1gzg/e0Wk8C65Ck3/ CsCwAm0Jpy7KkbwM2fJWXWDMI64HcgjIqDUBNwh8zJ90d75Bm4BO+n9NpySaqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755523835; 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=S/rZzAJ9f99N1b2dDysamiPKvZ0tuubNE5BlnxvnYQ0=; b=aGNMjL8lxu9n9YyTsmEu2ufSRxqOwd73TzJcEjrqAjw/CuE0DzbDIr8aD0wejY9vUCw76y N7cOulLPiFSZejeor2SpTkht4COeMKQ59DQpm2AydNMy0oau1N1ijP50cJHLiv6uygijjh k7mQZBkh8ayhVbec4o9fvOG1mo3qoPn12pE84qNW/YM/NNWMgpa966sFDOcM6RQl49Dzcc HTCAFilgmCGcLTD5V7fyKNmUBwXMMLekaAxxypRyTIGG01uPdAlvW/UFdLeSHrYcbdW0CK qksiqxoL7TbjKb8FStvQxWWHib2EZ481rMbhFv3b4qddwi5vS5oVpCRHZWvrmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755523835; a=rsa-sha256; cv=none; b=Hq6RyTp02q5wcFc40j9CkRvzFxqdC84hhvjKCwnXZa9tca915YuQ//cGR11FBSD10BV1p1 j+vcXMbK66b+M6vjTJvzTyQEfdjfVtNw0odfUbLNAvftXT/DqU0IAtxCl6OmqvryJrgfcV U4QkqhGUzyCbCy5eb+/3C1iWJ1rvzK+vT+yyXn5hnlAaxdczrYGkd681iGvG/VRLizk0Zh rQl46da8I9QKzpWpcHbNs7vh2eHwOJuStPiPaCTV4B6tXkGqC7XUR3j/VWMgyr9lg7iMjd zNnE14CaXA1mvMHol4lOysgCBUXpOMGM5C0rpeWt8+7YgnQIJnLl4Bduw9EkiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5D9l0QGXzyG9; Mon, 18 Aug 2025 13:30:35 +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 57IDUYRD042275; Mon, 18 Aug 2025 13:30:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IDUYpg042272; Mon, 18 Aug 2025 13:30:34 GMT (envelope-from git) Date: Mon, 18 Aug 2025 13:30:34 GMT Message-Id: <202508181330.57IDUYpg042272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cead6157cc1b - main - zfsctl_root_readdir: if there were no dirents to copy out, return EINVAL 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cead6157cc1b748df29b32072f492d4f6afae65a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cead6157cc1b748df29b32072f492d4f6afae65a commit cead6157cc1b748df29b32072f492d4f6afae65a Author: Konstantin Belousov AuthorDate: 2025-08-16 02:40:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-18 13:29:54 +0000 zfsctl_root_readdir: if there were no dirents to copy out, return EINVAL same as UFS. Reviewed by: allanjude, markj, rmacklem Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D51930 --- .../openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 40 ++++++++++++++-------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index 4de48e013ec4..a222c5de4a2a 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -674,6 +674,7 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) zfs_uio_t uio; int *eofp = ap->a_eofflag; off_t dots_offset; + ssize_t orig_resid; int error; zfs_uio_init(&uio, ap->a_uio); @@ -693,13 +694,11 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) return (0); } + orig_resid = zfs_uio_resid(&uio); error = sfs_readdir_common(zfsvfs->z_root, ZFSCTL_INO_ROOT, ap, &uio, &dots_offset); - if (error != 0) { - if (error == ENAMETOOLONG) /* ran out of destination space */ - error = 0; - return (error); - } + if (error != 0) + goto err; if (zfs_uio_offset(&uio) != dots_offset) return (SET_ERROR(EINVAL)); @@ -712,8 +711,11 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) entry.d_reclen = sizeof (entry); error = vfs_read_dirent(ap, &entry, zfs_uio_offset(&uio)); if (error != 0) { - if (error == ENAMETOOLONG) - error = 0; +err: + if (error == ENAMETOOLONG) { + error = orig_resid == zfs_uio_resid(&uio) ? + EINVAL : 0; + } return (SET_ERROR(error)); } if (eofp != NULL) @@ -1058,17 +1060,21 @@ zfsctl_snapdir_readdir(struct vop_readdir_args *ap) zfs_uio_t uio; int *eofp = ap->a_eofflag; off_t dots_offset; + ssize_t orig_resid; int error; zfs_uio_init(&uio, ap->a_uio); + orig_resid = zfs_uio_resid(&uio); ASSERT3S(vp->v_type, ==, VDIR); error = sfs_readdir_common(ZFSCTL_INO_ROOT, ZFSCTL_INO_SNAPDIR, ap, &uio, &dots_offset); if (error != 0) { - if (error == ENAMETOOLONG) /* ran out of destination space */ - error = 0; + if (error == ENAMETOOLONG) { /* ran out of destination space */ + error = orig_resid == zfs_uio_resid(&uio) ? + EINVAL : 0; + } return (error); } @@ -1086,9 +1092,13 @@ zfsctl_snapdir_readdir(struct vop_readdir_args *ap) dsl_pool_config_exit(dmu_objset_pool(zfsvfs->z_os), FTAG); if (error != 0) { if (error == ENOENT) { - if (eofp != NULL) - *eofp = 1; - error = 0; + if (orig_resid == zfs_uio_resid(&uio)) { + error = EINVAL; + } else { + error = 0; + if (eofp != NULL) + *eofp = 1; + } } zfs_exit(zfsvfs, FTAG); return (error); @@ -1101,8 +1111,10 @@ zfsctl_snapdir_readdir(struct vop_readdir_args *ap) entry.d_reclen = sizeof (entry); error = vfs_read_dirent(ap, &entry, zfs_uio_offset(&uio)); if (error != 0) { - if (error == ENAMETOOLONG) - error = 0; + if (error == ENAMETOOLONG) { + error = orig_resid == zfs_uio_resid(&uio) ? + EINVAL : 0; + } zfs_exit(zfsvfs, FTAG); return (SET_ERROR(error)); } From nobody Mon Aug 18 13:30:36 2025 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 4c5D9m6Hgxz63h0K; Mon, 18 Aug 2025 13:30:36 +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 4c5D9m24jBz3w9j; Mon, 18 Aug 2025 13:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755523836; 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=J4VaLsHQoHZByxMcYjHeOFojGQpado68VX+IJM4FPvE=; b=qBJhn3w1cPgi1ilOu+c2I9jjTDyIm2h1xGzXGMyzsVWuxQ2UVZvqJsL+FGOc7Tp42//5ul ar56hKlx9VPF9xKTUcciUltULb/asd8NQ7udmjVy2aRDoD+0qcGdyWQGMUa7RP5588ENth 6xzhJiVE4Kl/N0Xvq+e3V7RjhzRCf7Dpz1p5wXziRGwFnEHUFb5kG3kF5z7W4HPPTXaZAm IQ/oFUltODC7smdJZn1Dq1sL7tddrFxJyW6FY5kJB8o26U3hB/cqZwaeL+5s2PE+815hX1 PJAx+N/9IqCkRiRPYboFLK9B6rn6NvU1OPNVycAAvl9tETsqcitqliEwwz1krA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755523836; 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=J4VaLsHQoHZByxMcYjHeOFojGQpado68VX+IJM4FPvE=; b=pxFhs235dQUoNbREMTTPOCVTT62KDDDaVyrDVypZmIUr9htLUsQTx5Q2BkCBJlcTZ4e2vs hllDR75iVv7qtDQqGkbRdV+5Vao0/squMrrR0TOiS+OqFJ4cgdNCuTrZe7yJ+fGnwWMc9c hWAEakPiLXbi485Id4h9WI00qn6X6Z6SofJDY56fL7oybdICpekzaXEDbPQrtOej4mPPYu ni6I9kJlYwVynVf8mVASSA78C/EAW8K7FiBfJmSpU94kYka4R+QvUlNhf86LJZtFqT3rHS /s4gF1pN6GFE7/ZEdLvk0syDchbeRYHOncvXwsw5zd37kpPudPSBP5BJJSQfig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755523836; a=rsa-sha256; cv=none; b=fwgxes9hS+6Lyb3Yuj8HeaN6Upr7lm+nieFPixWgIr7XBUcW/VyWDyZbruk9ibW0W1A7Nn JNP0hADhgoqGcfW4I2lGXgqi/7QqnRSWr0mQpjAmHlE2AxINhwhzxIS7bEsyBUW21CiHWi +Rrvi8txgm89e29H1JAlwkRG/eGj1FfqMrS7dQoYZ6Sh1EULWW3FAP0v173R/Z62dFeDoI Dbi+D3erm89izxIxxKDrxB8sjLf5XPLYbIQOYqQEmFrzWVDZkORgYCsxLhGCFzGFvrENSZ wJsqBIIKP4N8tuMI3Bd14xSUIKC3ez4NGWfKqgD5jxQrMshE52g+KA7cFnNFcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5D9m14WNzymQ; Mon, 18 Aug 2025 13:30:36 +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 57IDUaXi042327; Mon, 18 Aug 2025 13:30:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IDUa4h042323; Mon, 18 Aug 2025 13:30:36 GMT (envelope-from git) Date: Mon, 18 Aug 2025 13:30:36 GMT Message-Id: <202508181330.57IDUa4h042323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: adba3e087173 - main - zfs readdir: set *eofp to 1 on eof 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adba3e087173b8ca6c5e9db7241812d4ac752608 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=adba3e087173b8ca6c5e9db7241812d4ac752608 commit adba3e087173b8ca6c5e9db7241812d4ac752608 Author: Konstantin Belousov AuthorDate: 2025-08-16 00:56:15 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-18 13:29:59 +0000 zfs readdir: set *eofp to 1 on eof Reported by: rmacklem Reviewed by: allanjude, markj, rmacklem Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D51930 --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 64995f14ee5f..6b55329da7a7 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -1735,7 +1735,7 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, int *eofp, /* * Quit if directory has been removed (posix) */ - if ((*eofp = zp->z_unlinked) != 0) { + if ((*eofp = (zp->z_unlinked != 0)) != 0) { zfs_exit(zfsvfs, FTAG); return (0); } From nobody Mon Aug 18 13:30:37 2025 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 4c5D9n6fv6z63h4t; Mon, 18 Aug 2025 13:30:37 +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 4c5D9n2j48z3w5Z; Mon, 18 Aug 2025 13:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755523837; 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=N8Ut6hvXw+LV/FozDjFURGKCE0OfHnhNUSiwWIEHuNw=; b=XeofKnSXoUEIUEBQqWkwEBEFpir9/HjZ22K0eZ3AoDwCs8+Kwo77bnwf06kjd9CEQAqNw3 9LnrgnlA1VBGcLWdPNOSc8MUkw1Zu++8/C5XQp8CtpJvjMMscY9gB15irEpCn0xkGwyNVR 7GlV+lpUQbqAMKl4lN+BmrRB5djJtrP39VJEKOLqoPUAa4nzyPkh7QMv+7Ey2ZKlQbJZul AYZZLYu6shfrhCKKcV1lDTGVWAggvzd31oI80W7t79VgAl3v8lQ+2ufUyIWq3/6nERBXSD V1k1oTjrqtDJEyJMzjl8qFV45p/eE+Wwy6A8zfwRgcVTk+kH4k+1prDebqFT/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755523837; 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=N8Ut6hvXw+LV/FozDjFURGKCE0OfHnhNUSiwWIEHuNw=; b=F2G5oxRLUi8PJrE4m83gMbUuLifs4F0IS3SslHQXVAxFqnEdbI0pn4n95U0ez63RwZiQVl Q6SG4MkOPHfDtJa1/Typ/sQtTP3HXRh6C6oeOMc2BKwa91qpv+NdRFLkuDsVmU/QRs/nlU /XpsmPDZWpR7a+KVzpP8vDuIoTl1C1nBrr8a4WF8GrV/I18PZgjVNb7Pnu9C7RWtm4M4wF hk7TB+PSTXFb5FrZTp7JVPExJ32qesXRJi+mYYzC/Uwe/UmbKXVoLF84GYiHEpM6g5otHc 4iFCqggtnWmTg38C60sTn3GYW4tUny6jjQkks9UuL6v9dxrSAPEyprBc0COI+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755523837; a=rsa-sha256; cv=none; b=OZhjo1OMG8/shBOQx83hjM357M8afcjJCoKEm/Y5CDx/wUL7PDr6mIpcWUVwdU7FeTSArS X0QIgjQVMt8eX0gb2YVpBtI+mcO6DtGhYS8QOEHv8vtexfG7QdVIfzZ31oIaWZHSwhgDgl 3xtBTTC0xujRAVyetIzUw9ebv5+zJuLxn2Aq6CkqV6xewF6oXRlN+NZ9qxU6lXIaDSs+oh l31fm6CWyl/VzA/TjjCCYkjQv3h4g6VUnsFyaluTTG+vmqToiKU3VTs1gmL+XX+VynKl6N dj77L2ejc1Er2CEyockPuPD5bjtFAd+BlLQRi1SWFonwFnv+VJ4bp2GhhazVSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5D9n24dSzyGB; Mon, 18 Aug 2025 13:30:37 +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 57IDUbQJ042361; Mon, 18 Aug 2025 13:30:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IDUbrU042358; Mon, 18 Aug 2025 13:30:37 GMT (envelope-from git) Date: Mon, 18 Aug 2025 13:30:37 GMT Message-Id: <202508181330.57IDUbrU042358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9a3edc8d5dbc - main - zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a3edc8d5dbcb896179cfa7867f961184e146a09 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9a3edc8d5dbcb896179cfa7867f961184e146a09 commit 9a3edc8d5dbcb896179cfa7867f961184e146a09 Author: Konstantin Belousov AuthorDate: 2025-08-16 01:33:09 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-18 13:30:04 +0000 zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS Reviewed by: allanjude, markj, rmacklem Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D51930 --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 6b55329da7a7..174141a5deab 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -1695,6 +1695,7 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, int *eofp, objset_t *os; caddr_t outbuf; size_t bufsize; + ssize_t orig_resid; zap_cursor_t zc; zap_attribute_t *zap; uint_t bytes_wanted; @@ -1743,6 +1744,7 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, int *eofp, error = 0; os = zfsvfs->z_os; offset = zfs_uio_offset(uio); + orig_resid = zfs_uio_resid(uio); prefetch = zp->z_zn_prefetch; zap = zap_attribute_long_alloc(); @@ -1922,7 +1924,7 @@ update: kmem_free(outbuf, bufsize); if (error == ENOENT) - error = 0; + error = orig_resid == zfs_uio_resid(uio) ? EINVAL : 0; ZFS_ACCESSTIME_STAMP(zfsvfs, zp); From nobody Mon Aug 18 13:57:25 2025 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 4c5Dmj59ylz63jl1; Mon, 18 Aug 2025 13:57:25 +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 4c5Dmj4bdnz42gM; Mon, 18 Aug 2025 13:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755525445; 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=k7XlwVyldoxDezrxyqu2Usp346zyratI5haYtUDwV5A=; b=Nhyrh4gOOeX7RsqOX0oEcClAcHxx0gwbvtFQkHt0zzNfnVhBEYydh/dSErTphIwoHTRIq9 qJHtcBo6iAl07seft1oHk9npyxmpUhK9o6oypEC9CVXYtkcPva3INj4Bt4pfkb53IYSmPW 6PJjNmHWL+RnK0gvPyoPQjbaxy60toKyanWpfTFrV/g9fsQd7B3YSNFqO22CpYwoS7GyVV 92PNeRvnZkDXkodK1unzJgD5Rz6nJZeoVn92JmW251psx2A5RklmLxFo5QXpRszzuiOmoo XmCscogsnNuhzChCUAH0OxtdzACr8xuJrhdJweUUpe1dKBpys05L6vlWHY9JFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755525445; 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=k7XlwVyldoxDezrxyqu2Usp346zyratI5haYtUDwV5A=; b=D8jMupM4EQ7g6Qve6t+lsu3lphYNEEtnlMa1+MYkjxdT7rxehUHMSmrhu1gZ37qgS+3XEa lM9vS5x2+M83sdlW2q703L4PVTEap6GfhPCzIBRBBUEL+cWgIWBXeZ8Nm0W4kus2UXooCK iUspjEo6RrkeG0Wgu1vwST+C0WdXvF211A5SdKM+rmNF0TbHAXXW1tbO5JM4N08jvF3bmh fOpqrzWvuIROcXdftt5ZG1bwzIoovQpe+DVs3GKhz9j/fS/8Np2vefEqt7NzDGpfR/GLmp YxFYHFxPCCPqGZ2jwDhcISIjMaIs+obavWlIcg1sQWdx97h7HMrh54P2gLmwNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755525445; a=rsa-sha256; cv=none; b=nHWfWQhj9XOvBRS3APffkQkgUacucwpjRJUI3mR3KVeBjOXdUzcwZKhP/9OIO7K7IN+llO umA2Z/GiqZCq4gfKO8DnVDdAk4AMTmNbZ/7Hv953glaI24uI2EwOc44grZyUmlOeedn9Mb qYuo7hhp382gd6jxF69WMGC8Pi9T3m62a6vBxPZ33OS2ZaBxYb72SMfV92cvNks7bDimv5 Viyonl/hbPQphubSMce7nCphM+NHdeGPVsZp8JR7Im5eOwIA0eId5t4iJJQpTqOn9sw9YW JNQfslKE7POJAWpkTTUq4SWZtcU7uXWVPOJ2BiTGy/RxJAr/Ilzu0N1lc2K0WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5Dmj48grz10SW; Mon, 18 Aug 2025 13:57:25 +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 57IDvPKn089995; Mon, 18 Aug 2025 13:57:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IDvP9Y089992; Mon, 18 Aug 2025 13:57:25 GMT (envelope-from git) Date: Mon, 18 Aug 2025 13:57:25 GMT Message-Id: <202508181357.57IDvP9Y089992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 39dbadb7a410 - main - netlink: Fix IFF_UP flag handling in RTM_NEWLINK's modify_link handler 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39dbadb7a410f3955540041848d669264266e552 Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=39dbadb7a410f3955540041848d669264266e552 commit 39dbadb7a410f3955540041848d669264266e552 Author: Muhammad Saheed AuthorDate: 2025-08-18 13:50:08 +0000 Commit: Aymeric Wibo CommitDate: 2025-08-18 13:51:10 +0000 netlink: Fix IFF_UP flag handling in RTM_NEWLINK's modify_link handler IFF_UP could previously only be unset via RTM_NEWLINK. Requests to set IFF_UP, though they succeed, did not actually set the flag. RTM_NEWLINK messages with ifi_change=0 are treated as ifi_change=0xFFFFFFFF, modifying all the link flags (currently IFF_UP and IFF_PROMISC) to match the behavior seen on Linux. Reviewed by: obiwac, kp, mckusick (mentor) Approved by: obiwac, mckusick (mentor) Sponsored by: Google LLC (GSoC) Differential Revision: https://reviews.freebsd.org/D51871 --- sys/netlink/route/iface_drivers.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c index 4bf913d9c978..5f605b05f7b8 100644 --- a/sys/netlink/route/iface_drivers.c +++ b/sys/netlink/route/iface_drivers.c @@ -82,9 +82,12 @@ _nl_modify_ifp_generic(struct ifnet *ifp, struct nl_parsed_link *lattrs, } } - if ((lattrs->ifi_change & IFF_UP) && (lattrs->ifi_flags & IFF_UP) == 0) { - /* Request to down the interface */ - if_down(ifp); + if ((lattrs->ifi_change & IFF_UP) != 0 || lattrs->ifi_change == 0) { + /* Request to up or down the interface */ + if (lattrs->ifi_flags & IFF_UP) + if_up(ifp); + else + if_down(ifp); } if (lattrs->ifla_mtu > 0) { @@ -97,7 +100,8 @@ _nl_modify_ifp_generic(struct ifnet *ifp, struct nl_parsed_link *lattrs, } } - if (lattrs->ifi_change & IFF_PROMISC) { + if ((lattrs->ifi_change & IFF_PROMISC) != 0 || + lattrs->ifi_change == 0) { error = ifpromisc(ifp, lattrs->ifi_flags & IFF_PROMISC); if (error != 0) { nlmsg_report_err_msg(npt, "unable to set promisc"); From nobody Mon Aug 18 14:03:51 2025 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 4c5Dw73GTQz63jwB; Mon, 18 Aug 2025 14:03:51 +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 4c5Dw72cqcz43HX; Mon, 18 Aug 2025 14:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755525831; 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=TWujF1+/XnPrZ0XECx3zaNOOJAMt+QHdDtrqkxMEoHI=; b=N3VjYhweoexD15BjtxvJi1fQaE3QIQpXn6RnX8DXQ3aZJCzCJwCgtWIEh9THDtqfLmvpYt 37Zb94NIwYNvH8ElTCwzHRVl/JdtD5XwkCebFKfjFJHWW+7sq4PvNtiw+o8Hipo6YMtDDY 062fisptTY4BDAYeSwWUwvBP/b7OsVEEPFAaGsQNFHEBbY5mGUmV9HTd25DiDUoBRy83kS 0xd152NRlNImdfsX50eNxBOMAb12JlEQvl61hEwh7EEhg4nt5Q4Kh0OdKT40fUVBVappxY mjsS8pVO3ciJxSY3tmPDjQrpLGnmVv929N3PISL4Z3dZA2LeZZJR8IC9+lFhRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755525831; 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=TWujF1+/XnPrZ0XECx3zaNOOJAMt+QHdDtrqkxMEoHI=; b=kJSKenaX5EM4fiQmfSg5ivPbiUQBA5tDBv+OF6DNapBa10Mt09lSXxfSWj3RI0cTsUBYe7 dGGtVhr2O5w9O5II/MVp5CnT0Uc7KmKzycHdKxY+KIFi5dEu2oBxUcjIwh2/wzeh8+BaFQ VoLZYdxqYeeyybnJ/JBgp53oG40ehWugrY1pltkDGiR9NswR4AnxYpFhd/BOE+U5vIdXdp r6F+qLDkB9rUUlndauYwL+Pe19hKkN4oZ+a8XO0NXhUfERdAmlUb8bvqSklAnXKkTvZUmV Bgp8ExCc4T8TVZa3HxpjiL5QT0e592sKil19bME4kgoZmT9yjJzckC7ISQnowQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755525831; a=rsa-sha256; cv=none; b=Ohuk03EKCxvKTt1t2XIHSdDE+OL8zyRJ+KszgX/4pZE4r+EeIln6Gw2qFcpM7AhAXu8bi8 HiupHBRXkrbizn87Cs0y8dXcJIbFrePw0zwv8pp3G9+CLWw98LS3MHhojL/tx0EkN0rmCw ru5CWK3HaP4E7xSvX3ZThhTgEqgLItVX4/vegZ3bYChha+IIWjUetuaewK09U6d3f92udx uUQBAo0YT1lxmTKYaBfXTmaQsOjZxrqj3Z2a9CYvejcRMTCjxZKy6kSptbMDAItAD/Bmcz S/iZwhveqK/Lta8paOSBVDJnfCohppRQVOBEgWWi//c8/k4lvGSoz05MIwwkRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5Dw726bqz10dJ; Mon, 18 Aug 2025 14:03:51 +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 57IE3p19008311; Mon, 18 Aug 2025 14:03:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IE3pY4008308; Mon, 18 Aug 2025 14:03:51 GMT (envelope-from git) Date: Mon, 18 Aug 2025 14:03:51 GMT Message-Id: <202508181403.57IE3pY4008308@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: a13f28d57ecf - main - acpi_powerres: Fix turning off power resources on first D-state switch 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a13f28d57ecfd136ce73493659c28a47fa1a4b9f Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=a13f28d57ecfd136ce73493659c28a47fa1a4b9f commit a13f28d57ecfd136ce73493659c28a47fa1a4b9f Author: Aymeric Wibo AuthorDate: 2025-08-18 14:00:59 +0000 Commit: Aymeric Wibo CommitDate: 2025-08-18 14:01:06 +0000 acpi_powerres: Fix turning off power resources on first D-state switch The power resource dependencies for each `_PRx` object are discovered and cached in `ac_prx` on the power consumer struct (`struct acpi_powerconsumer`) when a power consumer is registered. This is done in `acpi_pwr_get_power_resources`. ACPI guarantees these `_PRx` objects will evaluate to the same thing each time they are called. This discovery process also registers those power resources, which were previously only registered when they were referenced by the relevant `_PRx` object for the target D-state when switching. This meant that the first D-state switch for a power consumer would not turn off any power resources as they wouldn't have been registered yet. This change fixes this. `ac_prx` will be used by subsequent patches. Reviewed by: markj, imp, jrm (mentor) Approved by: markj, jrm (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48385 --- sys/dev/acpica/acpi_powerres.c | 110 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 105 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c index 29d1690f1bdd..0baa5c595470 100644 --- a/sys/dev/acpica/acpi_powerres.c +++ b/sys/dev/acpica/acpi_powerres.c @@ -76,6 +76,13 @@ struct acpi_powerconsumer { /* Device which is powered */ ACPI_HANDLE ac_consumer; int ac_state; + + struct { + bool prx_has; + size_t prx_count; + ACPI_HANDLE *prx_deps; + } ac_prx[ACPI_D_STATE_COUNT]; + TAILQ_ENTRY(acpi_powerconsumer) ac_link; TAILQ_HEAD(,acpi_powerreference) ac_references; }; @@ -96,9 +103,7 @@ static TAILQ_HEAD(acpi_powerconsumer_list, acpi_powerconsumer) ACPI_SERIAL_DECL(powerres, "ACPI power resources"); static ACPI_STATUS acpi_pwr_register_consumer(ACPI_HANDLE consumer); -#ifdef notyet static ACPI_STATUS acpi_pwr_deregister_consumer(ACPI_HANDLE consumer); -#endif /* notyet */ static ACPI_STATUS acpi_pwr_register_resource(ACPI_HANDLE res); #ifdef notyet static ACPI_STATUS acpi_pwr_deregister_resource(ACPI_HANDLE res); @@ -221,6 +226,84 @@ acpi_pwr_deregister_resource(ACPI_HANDLE res) } #endif /* notyet */ +/* + * Evaluate the _PRx (power resources each D-state depends on). This also + * populates the acpi_powerresources queue with the power resources discovered + * during this step. + * + * ACPI 7.3.8 - 7.3.11 guarantee that _PRx will return the same data each + * time they are evaluated. + * + * If this function fails, acpi_pwr_deregister_consumer() must be called on the + * power consumer to free already allocated memory. + */ +static ACPI_STATUS +acpi_pwr_get_power_resources(ACPI_HANDLE consumer, struct acpi_powerconsumer *pc) +{ + ACPI_INTEGER status; + ACPI_STRING reslist_name; + ACPI_HANDLE reslist_handle; + ACPI_STRING reslist_names[] = {"_PR0", "_PR1", "_PR2", "_PR3"}; + ACPI_BUFFER reslist; + ACPI_OBJECT *reslist_object; + ACPI_OBJECT *dep; + ACPI_HANDLE *res; + + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); + ACPI_SERIAL_ASSERT(powerres); + + MPASS(consumer != NULL); + + for (int state = ACPI_STATE_D0; state <= ACPI_STATE_D3_HOT; state++) { + pc->ac_prx[state].prx_has = false; + pc->ac_prx[state].prx_count = 0; + pc->ac_prx[state].prx_deps = NULL; + + reslist_name = reslist_names[state - ACPI_STATE_D0]; + if (ACPI_FAILURE(AcpiGetHandle(consumer, reslist_name, &reslist_handle))) + continue; + + reslist.Pointer = NULL; + reslist.Length = ACPI_ALLOCATE_BUFFER; + status = AcpiEvaluateObjectTyped(reslist_handle, NULL, NULL, &reslist, + ACPI_TYPE_PACKAGE); + if (ACPI_FAILURE(status) || reslist.Pointer == NULL) + /* + * ACPI_ALLOCATE_BUFFER entails everything will be freed on error + * by AcpiEvaluateObjectTyped. + */ + continue; + + reslist_object = (ACPI_OBJECT *)reslist.Pointer; + pc->ac_prx[state].prx_has = true; + pc->ac_prx[state].prx_count = reslist_object->Package.Count; + + if (reslist_object->Package.Count == 0) { + AcpiOsFree(reslist_object); + continue; + } + + pc->ac_prx[state].prx_deps = mallocarray(pc->ac_prx[state].prx_count, + sizeof(*pc->ac_prx[state].prx_deps), M_ACPIPWR, M_NOWAIT); + if (pc->ac_prx[state].prx_deps == NULL) { + AcpiOsFree(reslist_object); + return_ACPI_STATUS (AE_NO_MEMORY); + } + + for (size_t i = 0; i < reslist_object->Package.Count; i++) { + dep = &reslist_object->Package.Elements[i]; + res = dep->Reference.Handle; + pc->ac_prx[state].prx_deps[i] = res; + + /* It's fine to attempt to register the same resource twice. */ + acpi_pwr_register_resource(res); + } + AcpiOsFree(reslist_object); + } + + return_ACPI_STATUS (AE_OK); +} + /* * Register a power consumer. * @@ -229,6 +312,7 @@ acpi_pwr_deregister_resource(ACPI_HANDLE res) static ACPI_STATUS acpi_pwr_register_consumer(ACPI_HANDLE consumer) { + ACPI_INTEGER status; struct acpi_powerconsumer *pc; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -239,12 +323,27 @@ acpi_pwr_register_consumer(ACPI_HANDLE consumer) return_ACPI_STATUS (AE_OK); /* Allocate a new power consumer */ - if ((pc = malloc(sizeof(*pc), M_ACPIPWR, M_NOWAIT)) == NULL) + if ((pc = malloc(sizeof(*pc), M_ACPIPWR, M_NOWAIT | M_ZERO)) == NULL) return_ACPI_STATUS (AE_NO_MEMORY); TAILQ_INSERT_HEAD(&acpi_powerconsumers, pc, ac_link); TAILQ_INIT(&pc->ac_references); pc->ac_consumer = consumer; + /* + * Get all its power resource dependencies, if it has _PRx. We do this now + * as an opportunity to populate the acpi_powerresources queue. + * + * If this fails, immediately deregister it. + */ + status = acpi_pwr_get_power_resources(consumer, pc); + if (ACPI_FAILURE(status)) { + ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, + "failed to get power resources for %s\n", + acpi_name(consumer))); + acpi_pwr_deregister_consumer(consumer); + return_ACPI_STATUS (status); + } + /* XXX we should try to find its current state */ pc->ac_state = ACPI_STATE_UNKNOWN; @@ -254,7 +353,6 @@ acpi_pwr_register_consumer(ACPI_HANDLE consumer) return_ACPI_STATUS (AE_OK); } -#ifdef notyet /* * Deregister a power consumer. * @@ -279,6 +377,9 @@ acpi_pwr_deregister_consumer(ACPI_HANDLE consumer) /* Pull the consumer off the list and free it */ TAILQ_REMOVE(&acpi_powerconsumers, pc, ac_link); + for (size_t i = 0; i < sizeof(pc->ac_prx) / sizeof(*pc->ac_prx); i++) + if (pc->ac_prx[i].prx_deps != NULL) + free(pc->ac_prx[i].prx_deps, M_ACPIPWR); free(pc, M_ACPIPWR); ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "deregistered power consumer %s\n", @@ -286,7 +387,6 @@ acpi_pwr_deregister_consumer(ACPI_HANDLE consumer) return_ACPI_STATUS (AE_OK); } -#endif /* notyet */ /* * Set a power consumer to a particular power state. From nobody Mon Aug 18 14:07:53 2025 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 4c5F0p27kjz63jmd; Mon, 18 Aug 2025 14:07:54 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c5F0p1Hg6z43pr; Mon, 18 Aug 2025 14:07:54 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755526074; 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: in-reply-to:in-reply-to:references:references; bh=DaB0CWJbu9guJN1BhL+9hrFYiNU6/DbOdBhVEmjrgvg=; b=Md9to5KLBeBhq3gbs01xrz4BmhSIxPeLx4irx56NHdYQ+UZ2aFN5lhnRwFyK/rmRkVCXcJ JQTjuENIuX7sXIYE5lrABAmOhTItoE0mwQEwr6dMywYO3zf2GxsJhFXw5nVtQwmd6DAuVM BrasANOEz+LNjW+XKc4FHhjaxssKF1PMXAn4TZDFTSNyO1cF0WT/ntLfrjdWauvIJ4KzUR nCiiwLz0w5qolT2jeoQDl7xeSkVLU4kbZF+qvEG0C55Nj7bWYm2Izw99MJu6puzX72+Bv3 VxpitKKXn5AjyNR0tMMOCi8h7lxUAjgWwE5qWTY1nWunNaVDJHZeH7IDawa6KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755526074; 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: in-reply-to:in-reply-to:references:references; bh=DaB0CWJbu9guJN1BhL+9hrFYiNU6/DbOdBhVEmjrgvg=; b=dtKWLHG77RTEdMGn3LQ1y8AzYZOjV8w/fm+woP4Zk09j2T3fDhdMhqeEMyUTbI8rMEV9Dq RiGf51gWSokHUEjolczXlFXKbSB0ZvqtPqM/kwgH99zk7Kx9kjXXcWiW8ABxxKXr+cSB0e b1UUrJRNa9BcT3ps2rozSDxnOS4eSFwLUON9EsSQVuX3c0lloTAHadaxbuba3v+BH10hhV C04cjQ6SlCe6SIJBeq92OSGvf4aq/E/XlS8ds7rarU32fDnP4nKDIVB7DC1QpmSZ2dRaR1 xaBEyJBVyRdQ3Xv+ZW1KoENT+0PmgC06G6FflU3rGhVGMM9hMTaBy3FgMvjiOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755526074; a=rsa-sha256; cv=none; b=BAzL7PMy7D7EKMu1RgYbWSiSl8eThD8wZyEMDmT4v34QJ0TwQhRDs5yF03YBe2M+FHbxkJ lllhu2CXJs3+TMU0OUWRFPVbJtv3ttzQKqIzLwEaSiEqloP0iMJaqTeyCNHFoLTmzIugat ILK13WKM2/GA5XVD3UmDoqHDFdOmhMY8lsx14jCJiz1eJX7FhHuGf0DijcQHiEAvQM4F9Z nLyQesxZoLCfIDDURSSPgl/PCEyI1EvWXkf1Ks8GVurBs073VkbHQpL2XdPBCT/DrOd5SO FwDajFuA9iH+yMAUpONGz9v1WDmQPcivkG9Ux/V25Z+Dx8HMI4m/rsqYjVeqUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:d81:5653:3ddf:690e] (unknown [IPv6:2601:5c0:4202:5670:d81:5653:3ddf:690e]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c5F0n6Nh0zQLq; Mon, 18 Aug 2025 14:07:53 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <77e12d8d-3634-4d6e-bf17-220eca030eb0@FreeBSD.org> Date: Mon, 18 Aug 2025 10:07:53 -0400 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 User-Agent: Mozilla Thunderbird Subject: Re: git: c6778f3a4423 - main - Makefile.libcompat: Tweak krb5 compat dirs Content-Language: en-US To: Lexi Winter , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202508170227.57H2R862074953@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202508170227.57H2R862074953@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/16/25 22:27, Lexi Winter wrote: > The branch main has been updated by ivy: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c6778f3a4423743a3f30d8d09bc4e4a086863928 > > commit c6778f3a4423743a3f30d8d09bc4e4a086863928 > Author: Lexi Winter > AuthorDate: 2025-08-17 01:19:21 +0000 > Commit: Lexi Winter > CommitDate: 2025-08-17 01:19:21 +0000 > > Makefile.libcompat: Tweak krb5 compat dirs > > krb5/util contains both programs and libraries; trying to build that > for compat confuses bsd.prog.mk and results in unwanted files being > created in the source tree. Remove krb5/util and instead list only > the directories underneath krb5/util which contain libraries. > > The libdata change from the diff isn't included; that will be fixed > in a different way. > > Fixes: fb13ae28b2e8 ("Makefile.libcompat: Add krb5/util") > Reviewed by: ngie (previous version) > Differential Revision: https://reviews.freebsd.org/D51937 Why not just move these directories over to krb5/lib? In fact, I'm not sure why we need a separate krb5/util at all really? Hmm, it seems it builds some bootstrap tools as well as libraries. Note that the order you used here doesn't match the order that krb5/util/Makefile seems to want: SUBDIR= build-tools compile_et .WAIT \ support .WAIT \ et .WAIT \ ss profile verto It does seem though that we could just move the libraries at least into krb5/lib and use .WAIT when needed leaving only build-tools and compile_et in krb5/util? -- John Baldwin From nobody Mon Aug 18 14:35:19 2025 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 4c5FcR3YHkz641D8; Mon, 18 Aug 2025 14:35:19 +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 4c5FcR3Jt8z45s5; Mon, 18 Aug 2025 14:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755527719; 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=FVgys6+jv0HdI8F4zSJXQ7Q7qBfkCbvYeaeDqgPJlwE=; b=lhAT3voR0+fFmJ1T1uETQdyJlUQVYVXGlUiNka4SMN17xbkY+dM/LmNYU+yLYChwVnGcnS AjR7Cb3v2hBMKrZJ7XcR7SutoNaEHO8OtO0DT8OXzDUNrvad53bAWTQZe2GDWHH3O3cGOL gAHxJ7q58JKvQ2TzDj9exXqdDg9pNwB2wVsQqDinnS3a1wYEwFK/aJVIPsJXvT/PI8H9gS D2/UfCP1FYN1vFuQR2e0I4e0qxnQaSY9eesID0pez8EhrLC0xSvVWEFJtGad6zC6IIoYqD JTHp1RKwUFLQwqxh1jXFQRXMuwwwoWxxYsh5Rc6Ifopb1WTHXP3mRLbnye6vbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755527719; 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=FVgys6+jv0HdI8F4zSJXQ7Q7qBfkCbvYeaeDqgPJlwE=; b=mGbrPM6D8jOxgNOQ/IhHI+8+kRWYH6upyfCvzMgjn+lbFbsPQOA8IDdRJINZ0mw1RwA6Ro +et+C32Uz2oHQDyDHrYTzJRrmuY5XBh8OjZxslwbOnokS4BYR3oYXEfH6vUgG7dRhReNm6 /m4n0WPckHgrLag7e32jVscse3u2yWK3xIxnnbn2MEjX3WCVynJidt/b+PXPUSNTJKFWVt no7g1S2GUv6H5Oqj1yjwfISC1HwG94L0PVHlHOe27cyrPSS4r7uHOvzzDSdOShvq77kquv 3u1JlH57xgy380nGovoK30yC8sXMWHYpVTffuBMUWK7F36wqeyLS/AMj/SaD/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755527719; a=rsa-sha256; cv=none; b=dy5m+3WFFhgDzLxoGnLCT3PhybNNfcBt+70pqPBbGO2b75+uB66KqYOtq9wE3SfD3R2ndL F4GBDUutN3Oda/8fpdHd/5N6yQlYbj3I3Etoy8A5SzZ89AXrkaU9xQb5LNZFjXMQhore/B z/Y7O3ZGdiYcSnJwaWWjgWk7nitR+NDjw992W/fybNwd8BA9pxiU1unjMgy6GmiBAQKE24 pzAerupxgEfwUj9YpEQQ2xkaEhYrlknSpLciVbxfhw530MiMujm3Jc+HW8suPjWKX1GWMB OVRYrFJgJMcw0gjFRCfVZo1wjCGdeccXcPlQ4eV3xY6OXqaqWfcsLoNDCvAvDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5FcR2vDnz112X; Mon, 18 Aug 2025 14:35:19 +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 57IEZJn3065177; Mon, 18 Aug 2025 14:35:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IEZJoB065174; Mon, 18 Aug 2025 14:35:19 GMT (envelope-from git) Date: Mon, 18 Aug 2025 14:35:19 GMT Message-Id: <202508181435.57IEZJoB065174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c340ef28fd38 - main - certctl: Reimplement in C 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c340ef28fd384b567e35882d04ce17fa31b7384f Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c340ef28fd384b567e35882d04ce17fa31b7384f commit c340ef28fd384b567e35882d04ce17fa31b7384f Author: Dag-Erling Smørgrav AuthorDate: 2025-08-18 14:26:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-18 14:28:29 +0000 certctl: Reimplement in C Notable changes include: * We no longer forget manually untrusted certificates when rehashing. * Rehash will now scan the existing directory and progressively replace its contents with those of the new trust store. The trust store as a whole is not replaced atomically, but each file within it is. * We no longer attempt to link to the original files, but we don't copy them either. Instead, we write each certificate out in its minimal form. * We now generate a trust bundle in addition to the hashed diretory. This also contains only the minimal DER form of each certificate. This allows e.g. Unbound to preload the bundle before chrooting. * The C version is approximately two orders of magnitude faster than the sh version, with rehash taking ~100 ms vs ~5-25 s depending on whether ca_root_nss is installed. * We now also have tests. Reviewed by: kevans, markj Differential Revision: https://reviews.freebsd.org/D42320 Differential Revision: https://reviews.freebsd.org/D51896 --- Makefile.inc1 | 18 +- etc/mtree/BSD.tests.dist | 2 + share/man/man7/hier.7 | 17 +- sys/sys/param.h | 2 +- usr.sbin/certctl/Makefile | 11 +- usr.sbin/certctl/certctl.8 | 96 ++- usr.sbin/certctl/certctl.c | 1114 ++++++++++++++++++++++++++++++++ usr.sbin/certctl/certctl.sh | 366 ----------- usr.sbin/certctl/tests/Makefile | 5 + usr.sbin/certctl/tests/certctl.subr | 44 ++ usr.sbin/certctl/tests/certctl_test.sh | 332 ++++++++++ 11 files changed, 1596 insertions(+), 411 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d8853fef321b..a16af09caea0 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1542,14 +1542,10 @@ distributeworld installworld stageworld: _installcheck_world .PHONY .endif # make(distributeworld) ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} -.if !make(packageworld) && ${MK_CAROOT} != "no" - @if which openssl>/dev/null; then \ - PATH=${TMPPATH:Q}:${PATH:Q} \ - LOCALBASE=${LOCALBASE:Q} \ - sh ${SRCTOP}/usr.sbin/certctl/certctl.sh ${CERTCTLFLAGS} rehash; \ - else \ - echo "No openssl on the host, not rehashing certificates target -- /etc/ssl may not be populated."; \ - fi +.if !make(packageworld) && ${MK_CAROOT} != "no" && ${MK_OPENSSL} != "no" + PATH=${TMPPATH:Q}:${PATH:Q} \ + LOCALBASE=${LOCALBASE:Q} \ + certctl ${CERTCTLFLAGS} rehash .endif .if make(distributeworld) .for dist in ${EXTRA_DISTRIBUTIONS} @@ -2713,6 +2709,11 @@ _basic_bootstrap_tools+=sbin/md5 _basic_bootstrap_tools+=usr.sbin/tzsetup .endif +# certctl is needed as an install tool +.if ${MK_CAROOT} != "no" && ${MK_OPENSSL} != "no" +_certctl=usr.sbin/certctl +.endif + .if defined(BOOTSTRAP_ALL_TOOLS) _other_bootstrap_tools+=${_basic_bootstrap_tools} .for _subdir _links in ${_basic_bootstrap_tools_multilink} @@ -2776,6 +2777,7 @@ bootstrap-tools: ${_bt}-links .PHONY ${_strfile} \ usr.bin/dtc \ ${_cat} \ + ${_certctl} \ ${_kbdcontrol} \ ${_elftoolchain_libs} \ ${_libkldelf} \ diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 2c25d9386032..e6a013f010de 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1255,6 +1255,8 @@ .. .. usr.sbin + certctl + .. chown .. ctladm diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 1c69b911f53b..814f5b769be8 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 10, 2024 +.Dd August 18, 2025 .Dt HIER 7 .Os .Sh NAME @@ -308,6 +308,21 @@ OpenSSH configuration files; see .Xr ssh 1 .It Pa ssl/ OpenSSL configuration files +.Pp +.Bl -tag -width "untrusted/" -compact +.It Pa cert.pem +System trust store in bundle form; see +.Xr certctl 8 . +.It Pa certs/ +System trust store in OpenSSL hashed-directory form; see +.Xr certctl 8 . +.It Pa openssl.cnf +OpenSSL configuration file; see +.Xr openssl.cnf 5 . +.It Pa untrusted/ +Explicitly distrusted certificates; see +.Xr certctl 8 . +.El .It Pa sysctl.conf kernel state defaults; see .Xr sysctl.conf 5 diff --git a/sys/sys/param.h b/sys/sys/param.h index 915bfe1abfcd..fc2a78883f1e 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500062 +#define __FreeBSD_version 1500063 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, diff --git a/usr.sbin/certctl/Makefile b/usr.sbin/certctl/Makefile index 88c024daf7e6..6900f0ce3b65 100644 --- a/usr.sbin/certctl/Makefile +++ b/usr.sbin/certctl/Makefile @@ -1,5 +1,14 @@ +.include + PACKAGE= certctl -SCRIPTS=certctl.sh +PROG= certctl MAN= certctl.8 +LIBADD= crypto +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests + +.ifdef BOOTSTRAPPING +CFLAGS+=-DBOOTSTRAPPING +.endif .include diff --git a/usr.sbin/certctl/certctl.8 b/usr.sbin/certctl/certctl.8 index 7e49bb89e2ac..edf993e1361a 100644 --- a/usr.sbin/certctl/certctl.8 +++ b/usr.sbin/certctl/certctl.8 @@ -24,7 +24,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 17, 2025 +.Dd August 18, 2025 .Dt CERTCTL 8 .Os .Sh NAME @@ -32,63 +32,85 @@ .Nd "tool for managing trusted and untrusted TLS certificates" .Sh SYNOPSIS .Nm -.Op Fl v +.Op Fl lv .Ic list .Nm -.Op Fl v +.Op Fl lv .Ic untrusted .Nm -.Op Fl cnUv +.Op Fl BnUv .Op Fl D Ar destdir .Op Fl M Ar metalog .Ic rehash .Nm -.Op Fl cnv -.Ic untrust Ar file +.Op Fl nv +.Ic untrust Ar .Nm -.Op Fl cnv -.Ic trust Ar file +.Op Fl nv +.Ic trust Ar .Sh DESCRIPTION The .Nm utility manages the list of TLS Certificate Authorities that are trusted by applications that use OpenSSL. .Pp -Flags: +The following options are available: .Bl -tag -width 4n -.It Fl c -Copy certificates instead of linking to them. +.It Fl B +Do not generate a bundle. +This option is only valid in conjunction with the +.Ic rehash +command. .It Fl D Ar destdir Specify the DESTDIR (overriding values from the environment). .It Fl d Ar distbase Specify the DISTBASE (overriding values from the environment). +.It Fl l +When listing installed (trusted or untrusted) certificates, show the +full path and distinguished name for each certificate. .It Fl M Ar metalog -Specify the path of the METALOG file (default: $DESTDIR/METALOG). +Specify the path of the METALOG file +.Po +default: +.Pa ${DESTDIR}/METALOG +.Pc . +This option is only valid in conjunction with the +.Ic rehash +command. .It Fl n -No-Op mode, do not actually perform any actions. +Dry-run mode. +Do not actually perform any actions except write the metalog. .It Fl v -Be verbose, print details about actions before performing them. +Verbose mode. +Print detailed information about each action taken. .It Fl U -Unprivileged mode, do not change the ownership of created links. -Do record the ownership in the METALOG file. +Unprivileged mode. +Do not attempt to set the ownership of created files. +This option is only valid in conjunction with the +.Fl M +option and the +.Ic rehash +command. .El .Pp Primary command functions: .Bl -tag -width untrusted .It Ic list -List all currently trusted certificate authorities. +List all currently trusted certificates. .It Ic untrusted List all currently untrusted certificates. .It Ic rehash -Rebuild the list of trusted certificate authorities by scanning all directories +Rebuild the list of trusted certificates by scanning all directories in .Ev TRUSTPATH and all untrusted certificates in .Ev UNTRUSTPATH . -A symbolic link to each trusted certificate is placed in +A copy of each trusted certificate is placed in .Ev CERTDESTDIR and each untrusted certificate in .Ev UNTRUSTDESTDIR . +In addition, a bundle containing the trusted certificates is placed in +.Ev BUNDLEFILE . .It Ic untrust Add the specified file to the untrusted list. .It Ic trust @@ -97,9 +119,13 @@ Remove the specified file from the untrusted list. .Sh ENVIRONMENT .Bl -tag -width UNTRUSTDESTDIR .It Ev DESTDIR -Alternate destination directory to operate on. +Absolute path to an alternate destination directory to operate on +instead of the file system root, e.g. +.Dq Li /tmp/install . .It Ev DISTBASE Additional path component to include when operating on certificate directories. +This must start with a slash, e.g. +.Dq Li /base . .It Ev LOCALBASE Location for local programs. Defaults to the value of the user.localbase sysctl which is usually @@ -107,32 +133,34 @@ Defaults to the value of the user.localbase sysctl which is usually .It Ev TRUSTPATH List of paths to search for trusted certificates. Default: -.Pa /usr/share/certs/trusted -.Pa /usr/local/share/certs -.Pa /etc/ssl/certs +.Pa ${DESTDIR}${DISTBASE}/usr/share/certs/trusted +.Pa ${DESTDIR}${LOCALBASE}/share/certs/trusted +.Pa ${DESTDIR}${LOCALBASE}/share/certs .It Ev UNTRUSTPATH List of paths to search for untrusted certificates. Default: -.Pa /usr/share/certs/untrusted -.Pa /etc/ssl/untrusted -.Pa /etc/ssl/blacklisted -.It Ev CERTDESTDIR +.Pa ${DESTDIR}${DISTBASE}/usr/share/certs/untrusted +.Pa ${DESTDIR}${LOCALBASE}/share/certs/untrusted +.It Ev TRUSTDESTDIR Destination directory for symbolic links to trusted certificates. Default: -.Pa /etc/ssl/certs +.Pa ${DESTDIR}${DISTBASE}/etc/ssl/certs .It Ev UNTRUSTDESTDIR Destination directory for symbolic links to untrusted certificates. Default: -.Pa /etc/ssl/untrusted -.It Ev EXTENSIONS -List of file extensions to read as certificate files. -Default: *.pem *.crt *.cer *.crl *.0 +.Pa ${DESTDIR}${DISTBASE}/etc/ssl/untrusted +.It Ev BUNDLE +File name of bundle to produce. .El .Sh SEE ALSO .Xr openssl 1 .Sh HISTORY .Nm first appeared in -.Fx 12.2 +.Fx 12.2 . .Sh AUTHORS -.An Allan Jude Aq Mt allanjude@freebsd.org +.An -nosplit +The original shell implementation was written by +.An Allan Jude Aq Mt allanjude@FreeBSD.org . +The current C implementation was written by +.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org . diff --git a/usr.sbin/certctl/certctl.c b/usr.sbin/certctl/certctl.c new file mode 100644 index 000000000000..ed7f05126ca7 --- /dev/null +++ b/usr.sbin/certctl/certctl.c @@ -0,0 +1,1114 @@ +/*- + * Copyright (c) 2023-2025 Dag-Erling Smørgrav + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define info(fmt, ...) \ + do { \ + if (verbose) \ + fprintf(stderr, fmt "\n", ##__VA_ARGS__); \ + } while (0) + +static char * +xasprintf(const char *fmt, ...) +{ + va_list ap; + char *str; + int ret; + + va_start(ap, fmt); + ret = vasprintf(&str, fmt, ap); + va_end(ap); + if (ret < 0 || str == NULL) + err(1, NULL); + return (str); +} + +static char * +xstrdup(const char *str) +{ + char *dup; + + if ((dup = strdup(str)) == NULL) + err(1, NULL); + return (dup); +} + +static void usage(void); + +static bool dryrun; +static bool longnames; +static bool nobundle; +static bool unprivileged; +static bool verbose; + +static const char *localbase; +static const char *destdir; +static const char *distbase; +static const char *metalog; + +static const char *uname = "root"; +static const char *gname = "wheel"; + +static const char *const default_trusted_paths[] = { + "/usr/share/certs/trusted", + "%L/share/certs/trusted", + "%L/share/certs", + NULL +}; +static char **trusted_paths; + +static const char *const default_untrusted_paths[] = { + "/usr/share/certs/untrusted", + "%L/share/certs/untrusted", + NULL +}; +static char **untrusted_paths; + +static char *trusted_dest; +static char *untrusted_dest; +static char *bundle_dest; + +#define SSL_PATH "/etc/ssl" +#define TRUSTED_DIR "certs" +#define TRUSTED_PATH SSL_PATH "/" TRUSTED_DIR +#define UNTRUSTED_DIR "untrusted" +#define UNTRUSTED_PATH SSL_PATH "/" UNTRUSTED_DIR +#define LEGACY_DIR "blacklisted" +#define LEGACY_PATH SSL_PATH "/" LEGACY_DIR +#define BUNDLE_FILE "cert.pem" +#define BUNDLE_PATH SSL_PATH "/" BUNDLE_FILE + +static FILE *mlf; + +/* + * Remove duplicate and trailing slashes from a path. + */ +static char * +normalize_path(const char *str) +{ + char *buf, *dst; + + if ((buf = malloc(strlen(str) + 1)) == NULL) + err(1, NULL); + for (dst = buf; *str != '\0'; dst++) { + if ((*dst = *str++) == '/') { + while (*str == '/') + str++; + if (*str == '\0') + break; + } + } + *dst = '\0'; + return (buf); +} + +/* + * Split a colon-separated list into a NULL-terminated array. + */ +static char ** +split_paths(const char *str) +{ + char **paths; + const char *p, *q; + unsigned int i, n; + + for (p = str, n = 1; *p; p++) { + if (*p == ':') + n++; + } + if ((paths = calloc(n + 1, sizeof(*paths))) == NULL) + err(1, NULL); + for (p = q = str, i = 0; i < n; i++, p = q + 1) { + q = strchrnul(p, ':'); + if ((paths[i] = strndup(p, q - p)) == NULL) + err(1, NULL); + } + return (paths); +} + +/* + * Expand %L into LOCALBASE and prefix DESTDIR and DISTBASE as needed. + */ +static char * +expand_path(const char *template) +{ + if (template[0] == '%' && template[1] == 'L') + return (xasprintf("%s%s%s", destdir, localbase, template + 2)); + return (xasprintf("%s%s%s", destdir, distbase, template)); +} + +/* + * Expand an array of paths. + */ +static char ** +expand_paths(const char *const *templates) +{ + char **paths; + unsigned int i, n; + + for (n = 0; templates[n] != NULL; n++) + continue; + if ((paths = calloc(n + 1, sizeof(*paths))) == NULL) + err(1, NULL); + for (i = 0; i < n; i++) + paths[i] = expand_path(templates[i]); + return (paths); +} + +/* + * If destdir is a prefix of path, returns a pointer to the rest of path, + * otherwise returns path. + * + * Note that this intentionally does not strip distbase from the path! + * Unlike destdir, distbase is expected to be included in the metalog. + */ +static const char * +unexpand_path(const char *path) +{ + const char *p = path; + const char *q = destdir; + + while (*p && *p == *q) { + p++; + q++; + } + return (*q == '\0' && *p == '/' ? p : path); +} + +/* + * X509 certificate in a rank-balanced tree. + */ +struct cert { + RB_ENTRY(cert) entry; + unsigned long hash; + char *name; + X509 *x509; + char *path; +}; + +static void +free_cert(struct cert *cert) +{ + free(cert->name); + X509_free(cert->x509); + free(cert->path); + free(cert); +} + +static int +certcmp(const struct cert *a, const struct cert *b) +{ + return (X509_cmp(a->x509, b->x509)); +} + +RB_HEAD(cert_tree, cert); +static struct cert_tree trusted = RB_INITIALIZER(&trusted); +static struct cert_tree untrusted = RB_INITIALIZER(&untrusted); +RB_GENERATE_STATIC(cert_tree, cert, entry, certcmp); + +static void +free_certs(struct cert_tree *tree) +{ + struct cert *cert, *tmp; + + RB_FOREACH_SAFE(cert, cert_tree, tree, tmp) { + RB_REMOVE(cert_tree, tree, cert); + free_cert(cert); + } +} + +static struct cert * +find_cert(struct cert_tree *haystack, X509 *x509) +{ + struct cert needle = { .x509 = x509 }; + + return (RB_FIND(cert_tree, haystack, &needle)); +} + +/* + * File containing a certificate in a rank-balanced tree sorted by + * certificate hash and disambiguating counter. This is needed because + * the certificate hash function is prone to collisions, necessitating a + * counter to distinguish certificates that hash to the same value. + */ +struct file { + RB_ENTRY(file) entry; + const struct cert *cert; + unsigned int c; +}; + +static int +filecmp(const struct file *a, const struct file *b) +{ + if (a->cert->hash > b->cert->hash) + return (1); + if (a->cert->hash < b->cert->hash) + return (-1); + return (a->c - b->c); +} + +RB_HEAD(file_tree, file); +RB_GENERATE_STATIC(file_tree, file, entry, filecmp); + +/* + * Lexicographical sort for scandir(). + */ +static int +lexisort(const struct dirent **d1, const struct dirent **d2) +{ + return (strcmp((*d1)->d_name, (*d2)->d_name)); +} + +/* + * Read certificate(s) from a single file and insert them into a tree. + * Ignore certificates that already exist in the tree. If exclude is not + * null, also ignore certificates that exist in exclude. + * + * Returns the number certificates added to the tree, or -1 on failure. + */ +static int +read_cert(const char *path, struct cert_tree *tree, struct cert_tree *exclude) +{ + FILE *f; + X509 *x509; + X509_NAME *name; + struct cert *cert; + unsigned long hash; + int len, ni, no; + + if ((f = fopen(path, "r")) == NULL) { + warn("%s", path); + return (-1); + } + for (ni = no = 0; + (x509 = PEM_read_X509(f, NULL, NULL, NULL)) != NULL; + ni++) { + hash = X509_subject_name_hash(x509); + if (exclude && find_cert(exclude, x509)) { + info("%08lx: excluded", hash); + X509_free(x509); + continue; + } + if (find_cert(tree, x509)) { + info("%08lx: duplicate", hash); + X509_free(x509); + continue; + } + if ((cert = calloc(1, sizeof(*cert))) == NULL) + err(1, NULL); + cert->x509 = x509; + name = X509_get_subject_name(x509); + cert->hash = X509_NAME_hash_ex(name, NULL, NULL, NULL); + len = X509_NAME_get_text_by_NID(name, NID_commonName, + NULL, 0); + if (len > 0) { + if ((cert->name = malloc(len + 1)) == NULL) + err(1, NULL); + X509_NAME_get_text_by_NID(name, NID_commonName, + cert->name, len + 1); + } else { + /* fallback for certificates without CN */ + cert->name = X509_NAME_oneline(name, NULL, 0); + } + cert->path = xstrdup(unexpand_path(path)); + if (RB_INSERT(cert_tree, tree, cert) != NULL) + errx(1, "unexpected duplicate"); + info("%08lx: %s", cert->hash, cert->name); + no++; + } + /* + * ni is the number of certificates we found in the file. + * no is the number of certificates that weren't already in our + * tree or on the exclusion list. + */ + if (ni == 0) + warnx("%s: no valid certificates found", path); + fclose(f); + return (no); +} + +/* + * Load all certificates found in the specified path into a tree, + * optionally excluding those that already exist in a different tree. + * + * Returns the number of certificates added to the tree, or -1 on failure. + */ +static int +read_certs(const char *path, struct cert_tree *tree, struct cert_tree *exclude) +{ + struct stat sb; + char *paths[] = { (char *)(uintptr_t)path, NULL }; + FTS *fts; + FTSENT *ent; + int fts_options = FTS_LOGICAL | FTS_NOCHDIR; + int ret, total = 0; + + if (stat(path, &sb) != 0) { + return (-1); + } else if (!S_ISDIR(sb.st_mode)) { + errno = ENOTDIR; + return (-1); + } + if ((fts = fts_open(paths, fts_options, NULL)) == NULL) + err(1, "fts_open()"); + while ((ent = fts_read(fts)) != NULL) { + if (ent->fts_info != FTS_F) { + if (ent->fts_info == FTS_ERR) + warnc(ent->fts_errno, "fts_read()"); + continue; + } + info("found %s", ent->fts_path); + ret = read_cert(ent->fts_path, tree, exclude); + if (ret > 0) + total += ret; + } + fts_close(fts); + return (total); +} + +/* + * Save the contents of a cert tree to disk. + * + * Returns 0 on success and -1 on failure. + */ +static int +write_certs(const char *dir, struct cert_tree *tree) +{ + struct file_tree files = RB_INITIALIZER(&files); + struct cert *cert; + struct file *file, *tmp; + struct dirent **dents, **ent; + char *path, *tmppath = NULL; + FILE *f; + mode_t mode = 0444; + int cmp, d, fd, ndents, ret = 0; + + /* + * Start by generating unambiguous file names for each certificate + * and storing them in lexicographical order + */ + RB_FOREACH(cert, cert_tree, tree) { + if ((file = calloc(1, sizeof(*file))) == NULL) + err(1, NULL); + file->cert = cert; + for (file->c = 0; file->c < INT_MAX; file->c++) + if (RB_INSERT(file_tree, &files, file) == NULL) + break; + if (file->c == INT_MAX) + errx(1, "unable to disambiguate %08lx", cert->hash); + free(cert->path); + cert->path = xasprintf("%08lx.%d", cert->hash, file->c); + } + /* + * Open and scan the directory. + */ + if ((d = open(dir, O_DIRECTORY | O_RDONLY)) < 0 || +#ifdef BOOTSTRAPPING + (ndents = scandir(dir, &dents, NULL, lexisort)) +#else + (ndents = fdscandir(d, &dents, NULL, lexisort)) +#endif + < 0) + err(1, "%s", dir); + /* + * Iterate over the directory listing and the certificate listing + * in parallel. If the directory listing gets ahead of the + * certificate listing, we need to write the current certificate + * and advance the certificate listing. If the certificate + * listing is ahead of the directory listing, we need to delete + * the current file and advance the directory listing. If they + * are neck and neck, we have a match and could in theory compare + * the two, but in practice it's faster to just replace the + * current file with the current certificate (and advance both). + */ + ent = dents; + file = RB_MIN(file_tree, &files); + for (;;) { + if (ent < dents + ndents) { + /* skip directories */ + if ((*ent)->d_type == DT_DIR) { + free(*ent++); + continue; + } + if (file != NULL) { + /* compare current dirent to current cert */ + path = file->cert->path; + cmp = strcmp((*ent)->d_name, path); + } else { + /* trailing files in directory */ + path = NULL; + cmp = -1; + } + } else { + if (file != NULL) { + /* trailing certificates */ + path = file->cert->path; + cmp = 1; + } else { + /* end of both lists */ + path = NULL; + break; + } + } + if (cmp < 0) { + /* a file on disk with no matching certificate */ + info("removing %s/%s", dir, (*ent)->d_name); + if (!dryrun) + (void)unlinkat(d, (*ent)->d_name, 0); + free(*ent++); + continue; + } + if (cmp == 0) { + /* a file on disk with a matching certificate */ + info("replacing %s/%s", dir, (*ent)->d_name); + if (dryrun) { + fd = open(_PATH_DEVNULL, O_WRONLY); + } else { + tmppath = xasprintf(".%s", path); + fd = openat(d, tmppath, + O_CREAT | O_WRONLY | O_TRUNC, mode); + if (!unprivileged && fd >= 0) + (void)fchmod(fd, mode); + } + free(*ent++); + } else { + /* a certificate with no matching file */ + info("writing %s/%s", dir, path); + if (dryrun) { + fd = open(_PATH_DEVNULL, O_WRONLY); + } else { + tmppath = xasprintf(".%s", path); + fd = openat(d, tmppath, + O_CREAT | O_WRONLY | O_EXCL, mode); + } + } + /* write the certificate */ + if (fd < 0 || + (f = fdopen(fd, "w")) == NULL || + !PEM_write_X509(f, file->cert->x509)) { + if (tmppath != NULL && fd >= 0) { + int serrno = errno; + (void)unlinkat(d, tmppath, 0); + errno = serrno; + } + err(1, "%s/%s", dir, tmppath ? tmppath : path); + } + /* rename temp file if applicable */ + if (tmppath != NULL) { + if (ret == 0 && renameat(d, tmppath, d, path) != 0) { + warn("%s/%s", dir, path); + ret = -1; + } + if (ret != 0) + (void)unlinkat(d, tmppath, 0); + free(tmppath); + tmppath = NULL; + } + fflush(f); + /* emit metalog */ + if (mlf != NULL) { + fprintf(mlf, ".%s/%s type=file " + "uname=%s gname=%s mode=%#o size=%ld\n", + unexpand_path(dir), path, + uname, gname, mode, ftell(f)); + } + fclose(f); + /* advance certificate listing */ + tmp = RB_NEXT(file_tree, &files, file); + RB_REMOVE(file_tree, &files, file); + free(file); + file = tmp; + } + free(dents); + close(d); + return (ret); +} + +/* + * Save all certs in a tree to a single file (bundle). + * + * Returns 0 on success and -1 on failure. + */ +static int +write_bundle(const char *dir, const char *file, struct cert_tree *tree) +{ + struct cert *cert; + char *tmpfile = NULL; + FILE *f; + int d, fd, ret = 0; + mode_t mode = 0444; + + if (dir != NULL) { + if ((d = open(dir, O_DIRECTORY | O_RDONLY)) < 0) + err(1, "%s", dir); + } else { + dir = "."; + d = AT_FDCWD; + } + info("writing %s/%s", dir, file); + if (dryrun) { + fd = open(_PATH_DEVNULL, O_WRONLY); + } else { + tmpfile = xasprintf(".%s", file); + fd = openat(d, tmpfile, O_WRONLY | O_CREAT | O_EXCL, mode); + } + if (fd < 0 || (f = fdopen(fd, "w")) == NULL) { + if (tmpfile != NULL && fd >= 0) { + int serrno = errno; + (void)unlinkat(d, tmpfile, 0); + errno = serrno; + } + err(1, "%s/%s", dir, tmpfile ? tmpfile : file); + } + RB_FOREACH(cert, cert_tree, tree) { + if (!PEM_write_X509(f, cert->x509)) { + warn("%s/%s", dir, tmpfile ? tmpfile : file); + ret = -1; + break; + } + } + if (tmpfile != NULL) { + if (ret == 0 && renameat(d, tmpfile, d, file) != 0) { + warn("%s/%s", dir, file); + ret = -1; + } + if (ret != 0) + (void)unlinkat(d, tmpfile, 0); + free(tmpfile); + } + if (ret == 0 && mlf != NULL) { + fprintf(mlf, + ".%s/%s type=file uname=%s gname=%s mode=%#o size=%ld\n", + unexpand_path(dir), file, uname, gname, mode, ftell(f)); + } + fclose(f); + if (d != AT_FDCWD) + close(d); + return (ret); +} + +/* + * Load trusted certificates. + * + * Returns the number of certificates loaded. + */ +static unsigned int +load_trusted(bool all, struct cert_tree *exclude) +{ + unsigned int i, n; + int ret; + + /* load external trusted certs */ + for (i = n = 0; all && trusted_paths[i] != NULL; i++) { + ret = read_certs(trusted_paths[i], &trusted, exclude); + if (ret > 0) + n += ret; *** 1260 LINES SKIPPED *** From nobody Mon Aug 18 14:35:20 2025 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 4c5FcS5MGhz641VS; Mon, 18 Aug 2025 14:35:20 +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 4c5FcS4K16z46Kl; Mon, 18 Aug 2025 14:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755527720; 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=ltciqfCeA5cMOSL3RwwtY0mCPnhc29fNyZaYncv14ng=; b=ZqmtRx2A/FBKRccde9tu8LBX1EF6KJmrWyUFdCpumZDBWNfigpqqWa/CaLKtUwDEbI0+Vy igZ0nrb7EHWr/FIooaQj7M+O/0gpBKWOU5vA9N5nh3hl7IILtQwVxqyvK7DwiMia1IX26B zLp3Uug5dEqthDrHvmoyD8COHC04OYwuAB8SZba4uFKWal3+eB7TvEwmNNaOMePpEmy7SD 4JRsa7eTkQ997z4oqPlWTAAeiVuj3wIek6cKgadhdHB2l6yG/eTTeLfj7QeK76Qua8WlVf g7A7zUQpydA9e9i+CFXYfqKXKarORj1W4+bUoiyJaU0M7dqyTNP5AsoiehWSng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755527720; 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=ltciqfCeA5cMOSL3RwwtY0mCPnhc29fNyZaYncv14ng=; b=xGiyTenwEJx+ZlkGA/tdDNHUOCz0exButi9gjBKl+mdco35ZfyMTVdQLIc5OOsLgXxBAvY cBOriDz3hXQKSezpvX1aV5+egDDkTRj5b35dwthLFovwq+AWS+VIphHBd0pjf27kGIfbar UvFrqsdaHKmPp8ajd5z7Tpp6Qm0dn9APRIkrZmjD1dZDx7Ds03EInV0cIFI6Z6+50KN9p9 HaUzYrJZigyzKZdQPzYgrEA7pBM6rKUaHJDM/D53VWj/2elkrRj1964xhpqIudRQHPwi4V pneewDx126bq8mx5ANFUWmsMYRi/L8CJEJWk7WOzl3a4yKWTVfOL8NocnGxyOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755527720; a=rsa-sha256; cv=none; b=IyKSAB13ULxpoeyo9mtPIqcZDff/CYze1hvfLNsafpfzXJArKu4VQ/gTOefLHziPTykVz4 we+0KQU9qotzjQLYOXg26HemCUjh4RVrvcilSJEiar6QTCMYZ2mG4OUjw6SUgV2BZTVuWo JIemo9ggRfbRaDlCLbFhpFykWMfqow/vLDkhR0D4okJ7IZV6EeGH7L1UXX1+lU3GmPJgQN aqAFXt+sASmzmQTpRVY5cQ/AMdRvk1LRHPpuq2XKiFlwNpQbOrpkdk7WCfHZmFTO6qruno cF5tMau3TpCaNGsBP+c9nYN/U66hrx4Wl84v2mQ3gi1Jf1SLoosH0PVzOkCkfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5FcS3r9yz114S; Mon, 18 Aug 2025 14:35:20 +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 57IEZKmp065213; Mon, 18 Aug 2025 14:35:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IEZKL4065210; Mon, 18 Aug 2025 14:35:20 GMT (envelope-from git) Date: Mon, 18 Aug 2025 14:35:20 GMT Message-Id: <202508181435.57IEZKL4065210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e687f38a36ce - main - local-unbound-setup: If TLS is enabled, use the certificate bundle 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e687f38a36ceb681ff7fe0668050f95828f73831 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e687f38a36ceb681ff7fe0668050f95828f73831 commit e687f38a36ceb681ff7fe0668050f95828f73831 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-18 14:31:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-18 14:31:42 +0000 local-unbound-setup: If TLS is enabled, use the certificate bundle Now that certctl(8) always produces a bundle, use it in preference to the hashed directory, since the latter cannot be preloaded before chrooting. --- usr.sbin/unbound/setup/local-unbound-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/unbound/setup/local-unbound-setup.sh b/usr.sbin/unbound/setup/local-unbound-setup.sh index d52534b46fa3..d57d74952fc7 100755 --- a/usr.sbin/unbound/setup/local-unbound-setup.sh +++ b/usr.sbin/unbound/setup/local-unbound-setup.sh @@ -259,7 +259,7 @@ gen_unbound_conf() { echo " pidfile: ${pidfile}" echo " auto-trust-anchor-file: ${anchor}" if [ "${use_tls}" = "yes" ] ; then - echo " tls-system-cert: yes" + echo " tls-cert-bundle: /etc/ssl/cert.pem" fi echo "" if [ -f "${forward_conf}" ] ; then From nobody Mon Aug 18 14:45:15 2025 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 4c5Fqv6D20z6425P; Mon, 18 Aug 2025 14:45:15 +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 4c5Fqv5X9pz479m; Mon, 18 Aug 2025 14:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755528315; 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=ag0IXKP0UQB5sxtsoQaalm9YDk7ioRQbDsrCj8nOEzM=; b=beGmwR8TCErKtOZ+Gede5KtNG1c9WGWFW7SkWlI2cQl8yhuivlzR1UP/mzGdNo690ZAQra WSwLcG1B+GITNQpn3cDKnnDCC4uQ/ZpiN2uopuylT7Q8zz6senH4wS/ZlY+nQceM+Hm0uX v9PwkXBCQbI6qtx1RHsDL+Vu3jqtiNLjRsbvAVJyM/MgJJLPEXRVehaIKyJ2H9wNr8CaPX G8wK6MMSRxApoqn7Iii8NjrCL09WIiAKMYn7NqE/jQenpYG8AY9iZhyXAteTNusMGpuvMx F0YbkUlv/9OVoAVa/J7U8sYCslAqtK8vISyU2YOKZneCChuBf0f5U6XSAfau9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755528315; 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=ag0IXKP0UQB5sxtsoQaalm9YDk7ioRQbDsrCj8nOEzM=; b=VpY5ngYkIPFJpE2/vFzGBJRMEQs/XSnX+OCo6Z8Sj4pQzNLoSq1II2Eulam5w6jn+TbO8F cYBbB23jLxMuNMU7F8SWgPm1HhUAEJ6a44kuOuClY4/B1cXXgquaHfyzP5SbolX/GDe2It wFx7jCT/lgDw9zRM7UGRfsEWkS6yJNE+B3HnQpS6e7EAwdEntygINANwQLffzvjNlim7Ld 3tZazHdDg0df/nqb/PrsUnb2fpGrDlpMe+xds5+Qf4tPc4c+fP/tuVU+tfPshs4xjeHEgm 7Qq+fFVxwRBRCucX3fd2Va9pENt4JyOxb0RPUBvnFsHskmuhzp6sHD+kLnfssg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755528315; a=rsa-sha256; cv=none; b=Y+F8/18YyxCuKz+0YPCeBE2Gdd+9tPuRRhoFCkRXKnW407DPpHcNrKN7xcKP2kcapJK3Wh vbcKNI51JjFeK7MN26mjVZmYWkHli7pTyV+OknNROdzwdJGBaY41Q7ZxaBc+00Ahd/7FEL d+96YKLdtd2Xe4KxwfxHEDBt0tucwpZilVs7rNce0DcD1weprPMIOMwYdwj/nfadVX2aWw wjc6iGH8Tz1aiowmsOEfNYGotlpqKfgY8yT0/BycwL/kaZx8oFCdqh7Dn7dQJU3DrfrEDp SU0iN5INWCJWjvaOd/6iEFvVn4mihTdl/Wo2967XBw8LJh439rhGGxKVttxbTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5Fqv57Rwz11Ys; Mon, 18 Aug 2025 14:45:15 +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 57IEjFkL084154; Mon, 18 Aug 2025 14:45:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IEjFEB084151; Mon, 18 Aug 2025 14:45:15 GMT (envelope-from git) Date: Mon, 18 Aug 2025 14:45:15 GMT Message-Id: <202508181445.57IEjFEB084151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 02a8fadd2c4d - main - acpi_powerres: `acpi_pwr_get_state` and getting initial D-state for device 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02a8fadd2c4dc4b78d6d93d9d8b70e9348a6de6d Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=02a8fadd2c4dc4b78d6d93d9d8b70e9348a6de6d commit 02a8fadd2c4dc4b78d6d93d9d8b70e9348a6de6d Author: Aymeric Wibo AuthorDate: 2025-08-18 14:35:52 +0000 Commit: Aymeric Wibo CommitDate: 2025-08-18 14:44:59 +0000 acpi_powerres: `acpi_pwr_get_state` and getting initial D-state for device Add `acpi_pwr_get_state` as a prerequisite to LPI (low-power idle) states. Since these states define minimum D-state constraints on other devices to be able to enter them, it will be necessary to use this function to check them before attempting to do so. Aside from that, this function is used to get the initial D-state of a power consumer when registering it (previously the `ac_state` value would be set to `ACPI_STATE_UNKNOWN`). It uses the `_PSC` method if available (older devices), or infers the D-state through the `_PRx` objects (cached in `ac_prx`) with `acpi_pwr_infer_state` if not. `acpi_pwr_switch_consumer` now uses this to verify that the D-state of a power consumer was switched correctly. Reviewed by: imp, markj, jrm (mentor) Approved by: markj, jrm (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48386 --- sys/dev/acpica/acpi_powerres.c | 164 +++++++++++++++++++++++++++++++++++++++-- sys/dev/acpica/acpivar.h | 1 + 2 files changed, 160 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c index 0baa5c595470..0a8b67a5fa84 100644 --- a/sys/dev/acpica/acpi_powerres.c +++ b/sys/dev/acpica/acpi_powerres.c @@ -117,6 +117,8 @@ static struct acpi_powerresource *acpi_pwr_find_resource(ACPI_HANDLE res); static struct acpi_powerconsumer *acpi_pwr_find_consumer(ACPI_HANDLE consumer); +static ACPI_STATUS acpi_pwr_infer_state(struct acpi_powerconsumer *pc); +static ACPI_STATUS acpi_pwr_get_state_locked(ACPI_HANDLE consumer, int *state); /* * Register a power resource. @@ -344,8 +346,9 @@ acpi_pwr_register_consumer(ACPI_HANDLE consumer) return_ACPI_STATUS (status); } - /* XXX we should try to find its current state */ - pc->ac_state = ACPI_STATE_UNKNOWN; + /* Find its initial state. */ + if (ACPI_FAILURE(acpi_pwr_get_state_locked(consumer, &pc->ac_state))) + pc->ac_state = ACPI_STATE_UNKNOWN; ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "registered power consumer %s\n", acpi_name(consumer))); @@ -389,7 +392,137 @@ acpi_pwr_deregister_consumer(ACPI_HANDLE consumer) } /* - * Set a power consumer to a particular power state. + * The _PSC control method isn't required if it's possible to infer the D-state + * from the _PRx control methods. (See 7.3.6.) + * We can infer that a given D-state has been achieved when all the dependencies + * are in the ON state. + */ +static ACPI_STATUS +acpi_pwr_infer_state(struct acpi_powerconsumer *pc) +{ + ACPI_HANDLE *res; + uint32_t on; + bool all_on = false; + + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); + ACPI_SERIAL_ASSERT(powerres); + + /* It is important we go from the hottest to the coldest state. */ + for ( + pc->ac_state = ACPI_STATE_D0; + pc->ac_state <= ACPI_STATE_D3_HOT && !all_on; + pc->ac_state++ + ) { + MPASS(pc->ac_state <= sizeof(pc->ac_prx) / sizeof(*pc->ac_prx)); + + if (!pc->ac_prx[pc->ac_state].prx_has) + continue; + + all_on = true; + + for (size_t i = 0; i < pc->ac_prx[pc->ac_state].prx_count; i++) { + res = pc->ac_prx[pc->ac_state].prx_deps[i]; + /* If failure, better to assume D-state is hotter than colder. */ + if (ACPI_FAILURE(acpi_GetInteger(res, "_STA", &on))) + continue; + if (on == 0) { + all_on = false; + break; + } + } + } + + MPASS(pc->ac_state != ACPI_STATE_D0); + + /* + * If none of the power resources required for the shallower D-states are + * on, then we can assume it is unpowered (i.e. D3cold). A device is not + * required to support D3cold however; in that case, _PR3 is not explicitly + * provided. Those devices should default to D3hot instead. + * + * See comments of first row of table 7.1 in ACPI spec. + */ + if (!all_on) + pc->ac_state = pc->ac_prx[ACPI_STATE_D3_HOT].prx_has ? + ACPI_STATE_D3_COLD : ACPI_STATE_D3_HOT; + else + pc->ac_state--; + + return_ACPI_STATUS (AE_OK); +} + +static ACPI_STATUS +acpi_pwr_get_state_locked(ACPI_HANDLE consumer, int *state) +{ + struct acpi_powerconsumer *pc; + ACPI_HANDLE method_handle; + ACPI_STATUS status; + ACPI_BUFFER result; + ACPI_OBJECT *object = NULL; + + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); + ACPI_SERIAL_ASSERT(powerres); + + if (consumer == NULL) + return_ACPI_STATUS (AE_NOT_FOUND); + + if ((pc = acpi_pwr_find_consumer(consumer)) == NULL) { + if (ACPI_FAILURE(status = acpi_pwr_register_consumer(consumer))) + goto out; + if ((pc = acpi_pwr_find_consumer(consumer)) == NULL) + panic("acpi added power consumer but can't find it"); + } + + status = AcpiGetHandle(consumer, "_PSC", &method_handle); + if (ACPI_FAILURE(status)) { + ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "no _PSC object - %s\n", + AcpiFormatException(status))); + status = acpi_pwr_infer_state(pc); + if (ACPI_FAILURE(status)) { + ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "couldn't infer D-state - %s\n", + AcpiFormatException(status))); + pc->ac_state = ACPI_STATE_UNKNOWN; + } + goto out; + } + + result.Pointer = NULL; + result.Length = ACPI_ALLOCATE_BUFFER; + status = AcpiEvaluateObjectTyped(method_handle, NULL, NULL, &result, ACPI_TYPE_INTEGER); + if (ACPI_FAILURE(status) || result.Pointer == NULL) { + ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "failed to get state with _PSC - %s\n", + AcpiFormatException(status))); + pc->ac_state = ACPI_STATE_UNKNOWN; + goto out; + } + + object = (ACPI_OBJECT *)result.Pointer; + pc->ac_state = ACPI_STATE_D0 + object->Integer.Value; + status = AE_OK; + +out: + if (object != NULL) + AcpiOsFree(object); + *state = pc->ac_state; + return_ACPI_STATUS (status); +} + +/* + * Get a power consumer's D-state. + */ +ACPI_STATUS +acpi_pwr_get_state(ACPI_HANDLE consumer, int *state) +{ + ACPI_STATUS res; + + ACPI_SERIAL_BEGIN(powerres); + res = acpi_pwr_get_state_locked(consumer, state); + ACPI_SERIAL_END(powerres); + return (res); +} + +/* + * Set a power consumer to a particular D-state. */ ACPI_STATUS acpi_pwr_switch_consumer(ACPI_HANDLE consumer, int state) @@ -400,6 +533,7 @@ acpi_pwr_switch_consumer(ACPI_HANDLE consumer, int state) ACPI_OBJECT *reslist_object; ACPI_STATUS status; char *method_name, *reslist_name = NULL; + int new_state; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -601,8 +735,28 @@ acpi_pwr_switch_consumer(ACPI_HANDLE consumer, int state) } } - /* Transition was successful */ - pc->ac_state = state; + /* + * Make sure the transition succeeded. If getting new state failed, + * just assume the new state is what we wanted. This was the behaviour + * before we were checking D-states. + */ + if (ACPI_FAILURE(acpi_pwr_get_state_locked(consumer, &new_state))) { + printf("%s: failed to get new D-state\n", __func__); + pc->ac_state = state; + } else { + if (new_state != state) + printf("%s: new power state %s is not the one requested %s\n", + __func__, acpi_d_state_to_str(new_state), + acpi_d_state_to_str(state)); + pc->ac_state = new_state; + } + + /* + * We consider the transition successful even if the state we got doesn't + * reflect what we set it to. This is because we weren't previously + * checking the new state at all, so there might exist buggy platforms on + * which suspend would otherwise succeed if we failed here. + */ status = AE_OK; out: diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 6887f080311d..7495a010432b 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -490,6 +490,7 @@ EVENTHANDLER_DECLARE(acpi_video_event, acpi_event_handler_t); /* Device power control. */ ACPI_STATUS acpi_pwr_wake_enable(ACPI_HANDLE consumer, int enable); +ACPI_STATUS acpi_pwr_get_state(ACPI_HANDLE consumer, int *state); ACPI_STATUS acpi_pwr_switch_consumer(ACPI_HANDLE consumer, int state); acpi_pwr_for_sleep_t acpi_device_pwr_for_sleep; int acpi_set_powerstate(device_t child, int state); From nobody Mon Aug 18 15:10:24 2025 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 4c5GNx0Htsz643Cw; Mon, 18 Aug 2025 15:10:25 +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 4c5GNw6gPcz4CtZ; Mon, 18 Aug 2025 15:10:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755529824; 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=xicWPiYhjOFsf6XOXAqHfTm04Wx3frQdlSqh1cirrzw=; b=x2cUd+v07DRboMv/iF/+VYJceQCZ/FOlmGPlWNx9Df4E0DXCv2/ORLVLRWBhxYXFjeYTOP KhGka4y9OZ+MngqCZ8XrURyvAQNuGDRcnwqgQ7Py4VCAIww6RyY0Udsn3xzt4LSx2goYPa m3+EBgkFHSvetq31SLiasElvTgMYcQs4E4EjW1gbnT8UlMwzkNFj8iYwjUteWKxec5q1+M cNgd3EutYVPOIXm6/WaCEyInG3DMlWn5lVulE1qm5fD95bkt5n1GWKIohUt32RDug0wd7r uT8iWE3Mt7m5pyRcWlgV5Ucb8I3oiZiy1YIwsuMeQj/mEmIYJ/jr6IPwjS0EHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755529824; 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=xicWPiYhjOFsf6XOXAqHfTm04Wx3frQdlSqh1cirrzw=; b=fBiKLRabhoRPkDUaH4dMw144Ll9fGvkzuSeZVkALxXo29uLxv7f+ESOjxpaKKLWsDLI9DT C9Ib6WiWBJwcxJ/hD+DF5U6Gwc+l0S5cXfNyknk+A4mHxcQXFBtN+BGV0gZM/puhyRTQeT Nek42zP2kgPO/2XJl05zKS8EMyzfc7IlcC/Wc5UPz0P4/5Crb249yTs6jAXCS1hT6w4jbF TzSfFXwUgsFOsGXUkmpVW9bMVCZJjgdXi1ojJ8CG0h5KPB1+Y7gTxlChsX29kyiKuVEhGZ nTyM5R1vzLI3o3x0WQiHQPems/aAwmRbLzEvV6BSEwMfXR4URZGjo1kGXiy4kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755529824; a=rsa-sha256; cv=none; b=Lk7mAYLpxsePc8F+O6Q8VDqGjyVLUWBbg0dOgWZYtQ26v2hqDRGDqmBWhZrgaNYi1XfwM7 6igLm/pyw7Ye+ZxSSkznc3wHDnMobV1JrZpPMzEzDTesZBrVfoHluLZzMZo7rsshdyK7ul 3F1aGVGpmeRQlBQcNyJLNoptqCAQ82kCu5+2KVJrukPuB0Xa4cX4iF6/4iEvFAzOgg/aOR JmHHku/nxnecP/ESMD6wOL7SEt2lz4Mfz0qq/su1lcH0LPDa5j0ST3h2wzlqPQgdRbPHG5 91XFWR3r5zT2dFADi33Z43nV0paqBbDpjzDvKfN4eHWmuc3B1OkcQY3IXO+Gsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5GNw61Qfz11y2; Mon, 18 Aug 2025 15:10:24 +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 57IFAORp034334; Mon, 18 Aug 2025 15:10:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IFAOG9034331; Mon, 18 Aug 2025 15:10:24 GMT (envelope-from git) Date: Mon, 18 Aug 2025 15:10:24 GMT Message-Id: <202508181510.57IFAOG9034331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 47785e6a39cd - main - syslogd: EAGAIN and ECONNREFUSED are not permanently fatal 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47785e6a39cdcbf4eb7d02c381a53916774ed991 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=47785e6a39cdcbf4eb7d02c381a53916774ed991 commit 47785e6a39cdcbf4eb7d02c381a53916774ed991 Author: Kristof Provost AuthorDate: 2025-08-18 09:52:04 +0000 Commit: Kristof Provost CommitDate: 2025-08-18 15:10:01 +0000 syslogd: EAGAIN and ECONNREFUSED are not permanently fatal When we're forwarding syslog messages to a remote host we can get temporary failures such as EAGAIN or ECONNREFUSED from the sendmsg() call. These are not fatal. Future attempts to send might succeed. Don't mark the remote target as F_UNUSED so we'll try to log again on future messages. While here remove the commented out ENOBUFS case, because we actually handle that (by ignoring it, so we retry with future logs). Reviewed by: markj, jfree Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D51995 --- usr.sbin/syslogd/syslogd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index fe7427130b78..81bbbbe66be8 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -1830,15 +1830,14 @@ fprintlog_write(struct filed *f, struct iovlist *il, int flags) case EHOSTUNREACH: case EHOSTDOWN: case EADDRNOTAVAIL: + case EAGAIN: + case ECONNREFUSED: break; /* case EBADF: */ /* case EACCES: */ /* case ENOTSOCK: */ /* case EFAULT: */ /* case EMSGSIZE: */ - /* case EAGAIN: */ - /* case ENOBUFS: */ - /* case ECONNREFUSED: */ default: dprintf("removing entry: errno=%d\n", e); f->f_type = F_UNUSED; From nobody Mon Aug 18 15:32:03 2025 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 4c5Gsz50mLz6456W; Mon, 18 Aug 2025 15:32:07 +0000 (UTC) (envelope-from ivy@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c5Gsz4CNqz4GmQ; Mon, 18 Aug 2025 15:32:07 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755531127; 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=IHQ4+wYMQ6io4LJrRdZ1fIYK4EG5P0yZgHHWm2B6/L4=; b=If+dkvNZL+Jux6k2KbKLlQzG49d8uv+y9JqFtJYyq1LZzWsC3xYemk0xEERYejpaI1JhOu xTvki6dwV4ulzdyBq7Z/v0mCIWqIPR9PpTiVkhCMZADmTY6sq6EpKZWysw4JXqFLkTGN4A Tu7dxnVgPte0XtIlz3FOsazBtE+Q6o20X5I5hFr4ZnWqUtKwutrlR+haLvcwaNA3xjW96E CC0MkoE1mAps/qzhgvRKXQ4A03e8H6nnxmxov7I4Qvhfwpy8A6bOOSTylwcK/EbgyPcCJF Shb79nCTaqclsoURoXeVJteIYbNxHHSky8aT05ge54mWXhRdRhViKsrV+hBt5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755531127; 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=IHQ4+wYMQ6io4LJrRdZ1fIYK4EG5P0yZgHHWm2B6/L4=; b=Q2/RVb3Z3zXduCyQaEg7J5rkLgS80GAJw+wF25Tnf/KQ6ZuEKPWRyR1NH1rfUimkDsaqLt JvhZ3UhzCk2HwJbk+7BbeCqXkNq8kuzkS0x4ZWj4LXiv2cpG57zdsgGoomqHz1Ja8w4Fo/ qlsGhROGun2pe4b3Qe8Tmw7OaEiJpCUEzzNB31yuZ209G1RVjhPS69RN0cCH/XKl22+gvb uQa42BscOquiBL5c+nRLIpOsKrn6kNh97GxRyR4ruGhinH9RTxMOmOCGizYNBYjYGyAGmg KycHNDfG16RyiwVrKHwDPeyJmkHna8mOCS3nKyAcWxfJvmilmTzwAWzXhfDc5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755531127; a=rsa-sha256; cv=none; b=ZMXfyLOqtk4N4JsObBY6ORsQci7C96hUfCrVPZs0+nW9QvTpCi8aYuSKAK2JrDeKzlsUrH HayByD/Fy19gyqSNtzuSXsACPCMZFYZtq2HfBQbshHUoekQ367T6dD2o0cP/dEEd2ou8oq WXzeKuyLW5n0JID7ow43wR9krmw+0NmXYXN0YazKWAAknFp7NZZkePpZtHhB9IsSChpmYY FVcFF1i1bV/cczlSH/kxWgui5LwsXEVmn5XginRMlNd1r7Ev99owh9O69WlwdEEhxcc18G bOtevUAzkRulw+FasM27CWKQp6T0JrYD/1SbaDlFD98+AK+bVA47OY2l4DMK7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (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: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c5Gsz0DFrzZPR; Mon, 18 Aug 2025 15:32:06 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Mon, 18 Aug 2025 16:32:03 +0100 From: Lexi Winter To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c6778f3a4423 - main - Makefile.libcompat: Tweak krb5 compat dirs Message-ID: Mail-Followup-To: John Baldwin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202508170227.57H2R862074953@gitrepo.freebsd.org> <77e12d8d-3634-4d6e-bf17-220eca030eb0@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: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="l9uxEjpedwkz2Cdv" Content-Disposition: inline In-Reply-To: <77e12d8d-3634-4d6e-bf17-220eca030eb0@FreeBSD.org> --l9uxEjpedwkz2Cdv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable John Baldwin: > On 8/16/25 22:27, Lexi Winter wrote: > > Makefile.libcompat: Tweak krb5 compat dirs >=20 > Why not just move these directories over to krb5/lib? i was planning to discuss this with Cy, but the reason is that some of the libraries in util/ require compile_et, which is also in util/, so it's more complicated than just moving the libraries to lib/.=20 > Note that the order you used here doesn't match the order that > krb5/util/Makefile seems to want: that does seem like a bug, i'll have another look at that. thanks. --l9uxEjpedwkz2Cdv Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaKNHcAAKCRD1nT63mIK/ YKvZAP4qD6pBP9ShRwrGA8zobLviSIKZP9TVb1lYfMi8ylErCwD+IB0f2cug/Ggm kbMK7A1HrY5Uw8ftIB6b4Q9phxaFxwE= =ykjf -----END PGP SIGNATURE----- --l9uxEjpedwkz2Cdv-- From nobody Mon Aug 18 17:10:19 2025 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 4c5K3H2wT7z64BxJ; Mon, 18 Aug 2025 17:10:19 +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 4c5K3H2gslz3C92; Mon, 18 Aug 2025 17:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755537019; 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=pO241GHQyW9d8L7OREdUkvwkSk71XZMQiUCm0LmZ83s=; b=nREeH+J3H66O8XxizmptAzw1nqY7OoB3Q0NDX+7CNAOXjdYWFMuTYgATEFTwTY/duEl6kF OGaIu2Rtpkzb/weTzbEy0Pa5FI7gzrRtFjlp5zjBgkweLbPvMbg72m+H4jkw3XR9EV79sC jGSY7ZpkSJ84DZkwPAckOY4f+ERPzbxYQGORFUF8hvFQkBmQlxHo398geKfmnpg+yqLTiP MqyXYFACIybuF9dNef6DwuI8TjSGx1t/QyyMUZCMSUJgGXtNW39aeeezh50g4G7LK6HaCh VwGWrr9Za6g6hV/HzzxQ689yZotVGYL1LF/pQfOutjnFYtGRTjbA3178kB46Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755537019; 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=pO241GHQyW9d8L7OREdUkvwkSk71XZMQiUCm0LmZ83s=; b=KwYmiBc/uZOgguViQ5o3xSzcz2a5UEvv2BTv1ukjH/xl3jBxEDkVyvqQ+FLbDGzXSTUsad ZMaaLkEOjoa+ytj/cllnSu0cyniDcCnQAqy4EyX2Xn6lILnDpMXQuFWKanCA3n69UJkK1e K5EUHn91HeNNkmUyXpv313qZXh0kO4rstgHh4MRyRSE0VtHhHcF6PWOY1n9Ltyc4SStb4Q zsg/tvnvxCGlUodOZzGqmKXCSHAPNPTwvLgpJzLdElWnQUAsV1/MQFOw/yvMqv/wIzsaCq 6F71XqPwgQZ6ov0U2vWvzbVtMSAeiC1rT63tGValcqUf95WyAiGe9usRqhmyxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755537019; a=rsa-sha256; cv=none; b=ClZeoyxNvslJ+pGRVTNBnikwEjnUqZlGHcAmE7uvIUQNGg6Kb/gYGjPo6dRXvkHxS/jHex sG8hB7CG1AhjVm9LMXFtK9LB2cz1EyRx8shMBDZPGOYwGPx1nTSv3d1RW0n+rZZVFQ/nJZ Da1R5vv8EDJbKy5YqWGhEr9ECFkutN3rotgtdk02vIK3HOkqUsYOczASXTrsY3d4psku4O bDYoAMGh5rebJHLHNfVAcnEfjG/jInjDN7FIXOVZMPHzDyH0A2Jj9qKbgNou4uma6AZSCA XYtIQaaBmngzGdkbUfsgUhQNgHl7vSaDX6gdVtr3xkpnH+3SFCwnfDnfA/5V5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5K3H1x0Nz14yJ; Mon, 18 Aug 2025 17:10:19 +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 57IHAJdc061064; Mon, 18 Aug 2025 17:10:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IHAJY1061061; Mon, 18 Aug 2025 17:10:19 GMT (envelope-from git) Date: Mon, 18 Aug 2025 17:10:19 GMT Message-Id: <202508181710.57IHAJY1061061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 8c9937df84e6 - main - man4: Use arch specifier of Dt consistently 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c9937df84e6cc7f1a98054fe34f01f2810f90a4 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=8c9937df84e6cc7f1a98054fe34f01f2810f90a4 commit 8c9937df84e6cc7f1a98054fe34f01f2810f90a4 Author: Alexander Ziaee AuthorDate: 2025-08-18 17:06:10 +0000 Commit: Alexander Ziaee CommitDate: 2025-08-18 17:06:35 +0000 man4: Use arch specifier of Dt consistently Use the mdoc(7) arch specifier in the document title for all remaining manuals reflecting drivers which are only for one architecture. Most are in architecture specific folders, but amd64 only manuals are denoted in `man4/Makefile`. These display at the top of the manual [0] without taking up extra lines and are useful in any case, however I hope to use these in the Hardware Release Notes, where architecture specificity is difficult to maintain. [0] Example: https://man-dev.freebsd.org/boot MFC after: 3 days Reviewed by: 0mp Discussed with: emaste, imp, mhorne Differential Revision: https://reviews.freebsd.org/D51264 --- share/man/man4/ioat.4 | 2 +- share/man/man4/iwx.4 | 2 +- share/man/man4/man4.aarch64/armv8crypto.4 | 2 +- share/man/man4/man4.aarch64/enetc.4 | 2 +- share/man/man4/man4.aarch64/felix.4 | 2 +- share/man/man4/man4.aarch64/rk_gpio.4 | 2 +- share/man/man4/man4.aarch64/rk_grf.4 | 2 +- share/man/man4/man4.aarch64/rk_grf_gpio.4 | 2 +- share/man/man4/man4.aarch64/rk_i2c.4 | 2 +- share/man/man4/man4.aarch64/rk_pinctrl.4 | 2 +- share/man/man4/man4.arm/am335x_dmtpps.4 | 2 +- share/man/man4/man4.arm/aw_gpio.4 | 2 +- share/man/man4/man4.arm/aw_mmc.4 | 2 +- share/man/man4/man4.arm/aw_rtc.4 | 2 +- share/man/man4/man4.arm/aw_sid.4 | 2 +- share/man/man4/man4.arm/aw_spi.4 | 2 +- share/man/man4/man4.arm/aw_syscon.4 | 2 +- share/man/man4/man4.arm/bcm283x_pwm.4 | 2 +- share/man/man4/man4.arm/devcfg.4 | 2 +- share/man/man4/man4.arm/imx6_ahci.4 | 2 +- share/man/man4/man4.arm/imx6_snvs.4 | 2 +- share/man/man4/man4.arm/imx_spi.4 | 2 +- share/man/man4/man4.arm/imx_wdog.4 | 2 +- share/man/man4/man4.arm/mge.4 | 2 +- share/man/man4/man4.arm/ti_adc.4 | 2 +- share/man/man4/man4.powerpc/abtn.4 | 2 +- share/man/man4/man4.powerpc/adb.4 | 2 +- share/man/man4/man4.powerpc/akbd.4 | 2 +- share/man/man4/man4.powerpc/ams.4 | 2 +- share/man/man4/man4.powerpc/cuda.4 | 2 +- share/man/man4/man4.powerpc/dtsec.4 | 2 +- share/man/man4/man4.powerpc/llan.4 | 2 +- share/man/man4/man4.powerpc/pmu.4 | 2 +- share/man/man4/man4.powerpc/smu.4 | 2 +- share/man/man4/man4.powerpc/snd_ai2s.4 | 2 +- share/man/man4/man4.powerpc/snd_davbus.4 | 2 +- share/man/man4/man4.powerpc/tsec.4 | 2 +- share/man/man4/nvdimm.4 | 2 +- share/man/man4/qlnxe.4 | 2 +- share/man/man4/qlxgb.4 | 2 +- share/man/man4/qlxgbe.4 | 2 +- share/man/man4/qlxge.4 | 2 +- share/man/man4/sfxge.4 | 2 +- share/man/man4/smartpqi.4 | 2 +- share/man/man4/sume.4 | 2 +- 45 files changed, 45 insertions(+), 45 deletions(-) diff --git a/share/man/man4/ioat.4 b/share/man/man4/ioat.4 index deef466c0ae0..1c0e1dd49fd1 100644 --- a/share/man/man4/ioat.4 +++ b/share/man/man4/ioat.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd May 3, 2016 -.Dt IOAT 4 +.Dt IOAT 4 amd64 .Os .Sh NAME .Nm I/OAT diff --git a/share/man/man4/iwx.4 b/share/man/man4/iwx.4 index 7cd54d61b920..295a5f318afa 100644 --- a/share/man/man4/iwx.4 +++ b/share/man/man4/iwx.4 @@ -18,7 +18,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .Dd May 2, 2025 -.Dt IWX 4 +.Dt IWX 4 amd64 .Os .Sh NAME .Nm iwx diff --git a/share/man/man4/man4.aarch64/armv8crypto.4 b/share/man/man4/man4.aarch64/armv8crypto.4 index 7b8704395daf..0f763adc5766 100644 --- a/share/man/man4/man4.aarch64/armv8crypto.4 +++ b/share/man/man4/man4.aarch64/armv8crypto.4 @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .Dd July 29, 2020 -.Dt ARMV8CRYPTO 4 +.Dt ARMV8CRYPTO 4 aarch64 .Os .Sh NAME .Nm armv8crypto diff --git a/share/man/man4/man4.aarch64/enetc.4 b/share/man/man4/man4.aarch64/enetc.4 index 33f796347f96..e7cfcb7ebe0e 100644 --- a/share/man/man4/man4.aarch64/enetc.4 +++ b/share/man/man4/man4.aarch64/enetc.4 @@ -25,7 +25,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd June 11, 2021 -.Dt ENETC 4 +.Dt ENETC 4 aarch64 .Os .Sh NAME .Nm enetc diff --git a/share/man/man4/man4.aarch64/felix.4 b/share/man/man4/man4.aarch64/felix.4 index 15caef6d274f..b97f3c2168e8 100644 --- a/share/man/man4/man4.aarch64/felix.4 +++ b/share/man/man4/man4.aarch64/felix.4 @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .Dd June 21, 2021 -.Dt FELIX 4 +.Dt FELIX 4 aarch64 .Os .Sh NAME .Nm felix diff --git a/share/man/man4/man4.aarch64/rk_gpio.4 b/share/man/man4/man4.aarch64/rk_gpio.4 index b5648662cf5e..b2767dd66dce 100644 --- a/share/man/man4/man4.aarch64/rk_gpio.4 +++ b/share/man/man4/man4.aarch64/rk_gpio.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd Apr 26, 2018 -.Dt RK_GPIO 4 +.Dt RK_GPIO 4 aarch64 .Os .Sh NAME .Nm rk_gpio diff --git a/share/man/man4/man4.aarch64/rk_grf.4 b/share/man/man4/man4.aarch64/rk_grf.4 index 64ed468c1983..b01a93091ecb 100644 --- a/share/man/man4/man4.aarch64/rk_grf.4 +++ b/share/man/man4/man4.aarch64/rk_grf.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd Apr 26, 2018 -.Dt RK_GRF 4 +.Dt RK_GRF 4 aarch64 .Os .Sh NAME .Nm rk_grf diff --git a/share/man/man4/man4.aarch64/rk_grf_gpio.4 b/share/man/man4/man4.aarch64/rk_grf_gpio.4 index 6a5ebbe19e3b..2bfbebce1b76 100644 --- a/share/man/man4/man4.aarch64/rk_grf_gpio.4 +++ b/share/man/man4/man4.aarch64/rk_grf_gpio.4 @@ -4,7 +4,7 @@ .\" SPDX-License-Identifier: BSD-2-Clause .\" .Dd March 18, 2025 -.Dt RK_GRF_GPIO 4 +.Dt RK_GRF_GPIO 4 aarch64 .Os .Sh NAME .Nm rk_grf_gpio diff --git a/share/man/man4/man4.aarch64/rk_i2c.4 b/share/man/man4/man4.aarch64/rk_i2c.4 index be1a0fab943e..363cdeac7f72 100644 --- a/share/man/man4/man4.aarch64/rk_i2c.4 +++ b/share/man/man4/man4.aarch64/rk_i2c.4 @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .Dd June 14, 2018 -.Dt RK_I2C 4 +.Dt RK_I2C 4 aarch64 .Os .Sh NAME .Nm rk_i2c diff --git a/share/man/man4/man4.aarch64/rk_pinctrl.4 b/share/man/man4/man4.aarch64/rk_pinctrl.4 index 519b3e793cd1..2be5f363498d 100644 --- a/share/man/man4/man4.aarch64/rk_pinctrl.4 +++ b/share/man/man4/man4.aarch64/rk_pinctrl.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd Apr 26, 2018 -.Dt RK_PINCTRL 4 +.Dt RK_PINCTRL 4 aarch64 .Os .Sh NAME .Nm rk_pinctrl diff --git a/share/man/man4/man4.arm/am335x_dmtpps.4 b/share/man/man4/man4.arm/am335x_dmtpps.4 index d565c65e2cf1..bec5ff7726a0 100644 --- a/share/man/man4/man4.arm/am335x_dmtpps.4 +++ b/share/man/man4/man4.arm/am335x_dmtpps.4 @@ -24,7 +24,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd August 12, 2015 -.Dt AM335X_DMTPPS 4 +.Dt AM335X_DMTPPS 4 arm .Os .Sh NAME .Nm am335x_dmtpps diff --git a/share/man/man4/man4.arm/aw_gpio.4 b/share/man/man4/man4.arm/aw_gpio.4 index 5cbc7562d9bd..ef9fc1fe2733 100644 --- a/share/man/man4/man4.arm/aw_gpio.4 +++ b/share/man/man4/man4.arm/aw_gpio.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd October 8, 2024 -.Dt AW_GPIO 4 +.Dt AW_GPIO 4 arm .Os .Sh NAME .Nm aw_gpio diff --git a/share/man/man4/man4.arm/aw_mmc.4 b/share/man/man4/man4.arm/aw_mmc.4 index eb7fc9ce020a..e3f961fa5067 100644 --- a/share/man/man4/man4.arm/aw_mmc.4 +++ b/share/man/man4/man4.arm/aw_mmc.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd Dec 25, 2017 -.Dt AW_MMC 4 +.Dt AW_MMC 4 arm .Os .Sh NAME .Nm aw_mmc diff --git a/share/man/man4/man4.arm/aw_rtc.4 b/share/man/man4/man4.arm/aw_rtc.4 index 1296cd41da68..87212d85116c 100644 --- a/share/man/man4/man4.arm/aw_rtc.4 +++ b/share/man/man4/man4.arm/aw_rtc.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd December 10, 2024 -.Dt AW_RTC 4 +.Dt AW_RTC 4 arm .Os .Sh NAME .Nm aw_rtc diff --git a/share/man/man4/man4.arm/aw_sid.4 b/share/man/man4/man4.arm/aw_sid.4 index 5cd2f3d5e072..8b3691259f22 100644 --- a/share/man/man4/man4.arm/aw_sid.4 +++ b/share/man/man4/man4.arm/aw_sid.4 @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .Dd October 8, 2024 -.Dt AW_SID 4 +.Dt AW_SID 4 arm .Os .Sh NAME .Nm aw_sid diff --git a/share/man/man4/man4.arm/aw_spi.4 b/share/man/man4/man4.arm/aw_spi.4 index f8985e1c16bb..d0566a45b54b 100644 --- a/share/man/man4/man4.arm/aw_spi.4 +++ b/share/man/man4/man4.arm/aw_spi.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd May 17, 2018 -.Dt AW_SPI 4 +.Dt AW_SPI 4 arm .Os .Sh NAME .Nm aw_spi diff --git a/share/man/man4/man4.arm/aw_syscon.4 b/share/man/man4/man4.arm/aw_syscon.4 index e32f329e489a..97f01196a8a6 100644 --- a/share/man/man4/man4.arm/aw_syscon.4 +++ b/share/man/man4/man4.arm/aw_syscon.4 @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .Dd November 11, 2024 -.Dt AW_SYSCON 4 +.Dt AW_SYSCON 4 arm .Os .Sh NAME .Nm aw_syscon diff --git a/share/man/man4/man4.arm/bcm283x_pwm.4 b/share/man/man4/man4.arm/bcm283x_pwm.4 index 1fb5a830ace7..71d7f0cc3cca 100644 --- a/share/man/man4/man4.arm/bcm283x_pwm.4 +++ b/share/man/man4/man4.arm/bcm283x_pwm.4 @@ -25,7 +25,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd September 10, 2018 -.Dt BCM283X_PWM 4 +.Dt BCM283X_PWM 4 arm .Os .Sh NAME .Nm bcm283x_pwm diff --git a/share/man/man4/man4.arm/devcfg.4 b/share/man/man4/man4.arm/devcfg.4 index ddf368a85f24..cbc205814c69 100644 --- a/share/man/man4/man4.arm/devcfg.4 +++ b/share/man/man4/man4.arm/devcfg.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd February 28, 2013 -.Dt DEVCFG 4 +.Dt DEVCFG 4 arm .Os .Sh NAME .Nm devcfg diff --git a/share/man/man4/man4.arm/imx6_ahci.4 b/share/man/man4/man4.arm/imx6_ahci.4 index 9979cef50d79..50689e323db8 100644 --- a/share/man/man4/man4.arm/imx6_ahci.4 +++ b/share/man/man4/man4.arm/imx6_ahci.4 @@ -24,7 +24,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd July 7, 2018 -.Dt IMX6_AHCI 4 +.Dt IMX6_AHCI 4 arm .Os .Sh NAME .Nm imx6_ahci diff --git a/share/man/man4/man4.arm/imx6_snvs.4 b/share/man/man4/man4.arm/imx6_snvs.4 index b36c3ddd91c1..2c1db97b231c 100644 --- a/share/man/man4/man4.arm/imx6_snvs.4 +++ b/share/man/man4/man4.arm/imx6_snvs.4 @@ -24,7 +24,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd July 8, 2018 -.Dt IMX6_SNVS 4 +.Dt IMX6_SNVS 4 arm .Os .Sh NAME .Nm imx6_snvs diff --git a/share/man/man4/man4.arm/imx_spi.4 b/share/man/man4/man4.arm/imx_spi.4 index e7555ed20d94..54a5339e3276 100644 --- a/share/man/man4/man4.arm/imx_spi.4 +++ b/share/man/man4/man4.arm/imx_spi.4 @@ -24,7 +24,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd July 9, 2018 -.Dt IMX_SPI 4 +.Dt IMX_SPI 4 arm .Os .Sh NAME .Nm imx_spi diff --git a/share/man/man4/man4.arm/imx_wdog.4 b/share/man/man4/man4.arm/imx_wdog.4 index 4b993e1d066b..cb4d0e13865b 100644 --- a/share/man/man4/man4.arm/imx_wdog.4 +++ b/share/man/man4/man4.arm/imx_wdog.4 @@ -24,7 +24,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd July 7, 2018 -.Dt IMX_WDOG 4 +.Dt IMX_WDOG 4 arm .Os .Sh NAME .Nm imx_wdog diff --git a/share/man/man4/man4.arm/mge.4 b/share/man/man4/man4.arm/mge.4 index e949b36f4307..cba9327eadcf 100644 --- a/share/man/man4/man4.arm/mge.4 +++ b/share/man/man4/man4.arm/mge.4 @@ -24,7 +24,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd November 27, 2008 -.Dt MGE 4 +.Dt MGE 4 arm .Os .Sh NAME .Nm mge diff --git a/share/man/man4/man4.arm/ti_adc.4 b/share/man/man4/man4.arm/ti_adc.4 index d71547231e4c..fb59e1d3e57c 100644 --- a/share/man/man4/man4.arm/ti_adc.4 +++ b/share/man/man4/man4.arm/ti_adc.4 @@ -23,7 +23,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd June 1, 2014 -.Dt TI_ADC 4 +.Dt TI_ADC 4 arm .Os .Sh NAME .Nm ti_adc diff --git a/share/man/man4/man4.powerpc/abtn.4 b/share/man/man4/man4.powerpc/abtn.4 index 92d643d5cf32..7421d0a0b5a6 100644 --- a/share/man/man4/man4.powerpc/abtn.4 +++ b/share/man/man4/man4.powerpc/abtn.4 @@ -25,7 +25,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd October 16, 2011 -.Dt ABTN 4 +.Dt ABTN 4 powerpc .Os .Sh NAME .Nm abtn diff --git a/share/man/man4/man4.powerpc/adb.4 b/share/man/man4/man4.powerpc/adb.4 index a781787995ab..6041484b5e33 100644 --- a/share/man/man4/man4.powerpc/adb.4 +++ b/share/man/man4/man4.powerpc/adb.4 @@ -24,7 +24,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd December 3, 2009 -.Dt ADB 4 +.Dt ADB 4 powerpc .Os .Sh NAME .Nm adb diff --git a/share/man/man4/man4.powerpc/akbd.4 b/share/man/man4/man4.powerpc/akbd.4 index 44af08961122..3406f5a1aa76 100644 --- a/share/man/man4/man4.powerpc/akbd.4 +++ b/share/man/man4/man4.powerpc/akbd.4 @@ -24,7 +24,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd December 3, 2009 -.Dt AKBD 4 +.Dt AKBD 4 powerpc .Os .Sh NAME .Nm akbd diff --git a/share/man/man4/man4.powerpc/ams.4 b/share/man/man4/man4.powerpc/ams.4 index 21be3c098920..d7fa922e7307 100644 --- a/share/man/man4/man4.powerpc/ams.4 +++ b/share/man/man4/man4.powerpc/ams.4 @@ -24,7 +24,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd December 3, 2009 -.Dt AMS 4 +.Dt AMS 4 powerpc .Os .Sh NAME .Nm ams diff --git a/share/man/man4/man4.powerpc/cuda.4 b/share/man/man4/man4.powerpc/cuda.4 index 7171ebb42373..a52b9a447c9d 100644 --- a/share/man/man4/man4.powerpc/cuda.4 +++ b/share/man/man4/man4.powerpc/cuda.4 @@ -24,7 +24,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd December 3, 2009 -.Dt CUDA 4 +.Dt CUDA 4 powerpc .Os .Sh NAME .Nm cuda diff --git a/share/man/man4/man4.powerpc/dtsec.4 b/share/man/man4/man4.powerpc/dtsec.4 index 4a60dd0b8824..f18de90c4757 100644 --- a/share/man/man4/man4.powerpc/dtsec.4 +++ b/share/man/man4/man4.powerpc/dtsec.4 @@ -24,7 +24,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd October 31, 2017 -.Dt DTSEC 4 +.Dt DTSEC 4 powerpc .Os .Sh NAME .Nm dtsec diff --git a/share/man/man4/man4.powerpc/llan.4 b/share/man/man4/man4.powerpc/llan.4 index c32ddbca6a00..b78109cac626 100644 --- a/share/man/man4/man4.powerpc/llan.4 +++ b/share/man/man4/man4.powerpc/llan.4 @@ -24,7 +24,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd February 19, 2015 -.Dt LLAN 4 +.Dt LLAN 4 powerpc .Os .Sh NAME .Nm llan diff --git a/share/man/man4/man4.powerpc/pmu.4 b/share/man/man4/man4.powerpc/pmu.4 index 6eac20cfa6b7..4dfb31f175bd 100644 --- a/share/man/man4/man4.powerpc/pmu.4 +++ b/share/man/man4/man4.powerpc/pmu.4 @@ -24,7 +24,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd December 6, 2008 -.Dt PMU 4 +.Dt PMU 4 powerpc .Os .Sh NAME .Nm pmu diff --git a/share/man/man4/man4.powerpc/smu.4 b/share/man/man4/man4.powerpc/smu.4 index ef2654746e62..852a08abaa9e 100644 --- a/share/man/man4/man4.powerpc/smu.4 +++ b/share/man/man4/man4.powerpc/smu.4 @@ -24,7 +24,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd February 22, 2010 -.Dt SMU 4 +.Dt SMU 4 powerpc .Os .Sh NAME .Nm smu diff --git a/share/man/man4/man4.powerpc/snd_ai2s.4 b/share/man/man4/man4.powerpc/snd_ai2s.4 index 3880751e65c9..7a3cd9cb94af 100644 --- a/share/man/man4/man4.powerpc/snd_ai2s.4 +++ b/share/man/man4/man4.powerpc/snd_ai2s.4 @@ -24,7 +24,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd January 20, 2009 -.Dt SND_AI2S 4 +.Dt SND_AI2S 4 powerpc .Os .Sh NAME .Nm snd_ai2s diff --git a/share/man/man4/man4.powerpc/snd_davbus.4 b/share/man/man4/man4.powerpc/snd_davbus.4 index 6958ebd4b4b5..028225accf52 100644 --- a/share/man/man4/man4.powerpc/snd_davbus.4 +++ b/share/man/man4/man4.powerpc/snd_davbus.4 @@ -24,7 +24,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd January 20, 2009 -.Dt SND_DAVBUS 4 +.Dt SND_DAVBUS 4 powerpc .Os .Sh NAME .Nm snd_davbus diff --git a/share/man/man4/man4.powerpc/tsec.4 b/share/man/man4/man4.powerpc/tsec.4 index b3ccae648ab8..09510e329ff0 100644 --- a/share/man/man4/man4.powerpc/tsec.4 +++ b/share/man/man4/man4.powerpc/tsec.4 @@ -24,7 +24,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd February 20, 2015 -.Dt TSEC 4 +.Dt TSEC 4 powerpc .Os .Sh NAME .Nm tsec diff --git a/share/man/man4/nvdimm.4 b/share/man/man4/nvdimm.4 index 5b7dbe435c46..2bec51b42d72 100644 --- a/share/man/man4/nvdimm.4 +++ b/share/man/man4/nvdimm.4 @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .Dd September 5, 2019 -.Dt NVDIMM 4 +.Dt NVDIMM 4 amd64 .Os .Sh NAME .Nm nvdimm diff --git a/share/man/man4/qlnxe.4 b/share/man/man4/qlnxe.4 index f545235ec1ff..70bad789add1 100644 --- a/share/man/man4/qlnxe.4 +++ b/share/man/man4/qlnxe.4 @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .Dd May 9, 2017 -.Dt QLNXE 4 +.Dt QLNXE 4 amd64 .Os .Sh NAME .Nm qlnxe diff --git a/share/man/man4/qlxgb.4 b/share/man/man4/qlxgb.4 index 4bf8000d15da..cc97cd060a3f 100644 --- a/share/man/man4/qlxgb.4 +++ b/share/man/man4/qlxgb.4 @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .Dd November 3, 2011 -.Dt QLXGB 4 +.Dt QLXGB 4 amd64 .Os .Sh NAME .Nm qlxgb diff --git a/share/man/man4/qlxgbe.4 b/share/man/man4/qlxgbe.4 index 486a5ec0f682..465e4fc018ad 100644 --- a/share/man/man4/qlxgbe.4 +++ b/share/man/man4/qlxgbe.4 @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .Dd April 1, 2013 -.Dt QLXGBE 4 +.Dt QLXGBE 4 amd64 .Os .Sh NAME .Nm qlxgbe diff --git a/share/man/man4/qlxge.4 b/share/man/man4/qlxge.4 index 4723c56ff68b..14a1e1284fab 100644 --- a/share/man/man4/qlxge.4 +++ b/share/man/man4/qlxge.4 @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .Dd June 21, 2013 -.Dt QLXGE 4 +.Dt QLXGE 4 amd64 .Os .Sh NAME .Nm qlxge diff --git a/share/man/man4/sfxge.4 b/share/man/man4/sfxge.4 index a9724074581e..ea35cf3e573c 100644 --- a/share/man/man4/sfxge.4 +++ b/share/man/man4/sfxge.4 @@ -27,7 +27,7 @@ .\" policies, either expressed or implied, of the FreeBSD Project. .\" .Dd February 22, 2015 -.Dt SFXGE 4 +.Dt SFXGE 4 amd64 .Os .Sh NAME .Nm sfxge diff --git a/share/man/man4/smartpqi.4 b/share/man/man4/smartpqi.4 index 5b7ea923e13e..f5fab85d13bd 100644 --- a/share/man/man4/smartpqi.4 +++ b/share/man/man4/smartpqi.4 @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .Dd August 24, 2023 -.Dt SMARTPQI 4 +.Dt SMARTPQI 4 amd64 .Os .Sh NAME .Nm smartpqi diff --git a/share/man/man4/sume.4 b/share/man/man4/sume.4 index 219328a4f4c4..b36f924875e6 100644 --- a/share/man/man4/sume.4 +++ b/share/man/man4/sume.4 @@ -25,7 +25,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd August 30, 2020 -.Dt SUME 4 +.Dt SUME 4 amd64 .Os .Sh NAME .Nm sume From nobody Mon Aug 18 17:19:19 2025 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 4c5KFg4knyz64CMN; Mon, 18 Aug 2025 17:19:19 +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 4c5KFg3vqPz3CXL; Mon, 18 Aug 2025 17:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755537559; 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=iyyJuiNtzuzTaZGF3dNgP/Yt5CxtNKuHYNg6oKMDSf0=; b=l9as0+Q2YKdaqyhJVpZ34cHjYnjkEY26Pg/X7c5ocvvr+I1819t5yxfWJQCXJygtI6UDJz vDsHg0IPILvHuDXzqO9jwAd8FdQIbdJaHyE764pjPxEMohvh/J1em09cSKin3gESVGmhI8 10g9HGS5EX4bogsC8Ycr5aFG6n6qwPOcXisHH9W2RBDhP3E/gfWokt6Bb/TXs4XRBGYbLD Nfz9U+TGmQKNUUforVkifaROoXzhXeTJhJHPOurlYTJSGjBf+1MYs0W2dt01G3ZIkGe3oM 8kPoLOkzElVT8sy5u8AMvcit8VgKCopkJf2rgqgwifl+aQofBj8oQrpGEM5rcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755537559; 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=iyyJuiNtzuzTaZGF3dNgP/Yt5CxtNKuHYNg6oKMDSf0=; b=xoigsCJMsBx4SQKcudbve/mCNB74PXUd/xr63Iv5KQFNJLREGhK7/wghk01kvaJvQPsjvl LDQXv/pLd527pXYLURl0lzlqFP/DtPh+DUzhlE0lnRgdKeqX/gtTXhjPY4pViLMYlYanEG M4/QRD984/+0ZmiwrO8T5ixi5EStZ9WbLWfD3DwBTlbLiTyW3WiX64JdTd7rqbvxmGCakw hqzarUs4ShBskF+T1pQORutha5vxJiHN720sHdYJES3bE3QUbICMnU1XS6+NU+0bBgaaPT fhRXpAn4W38p8Dxc0pfJMwiaqNONSumu8lmVHXTEc0zGE2for9K5/QCXoA6tDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755537559; a=rsa-sha256; cv=none; b=OP/Kr1SjNiAFYaAlyjhydlNpf67DV3jm+Vw94rhBlCExpUH6sHNokRu4i99HQqfBZKy2vu iGiRQmTDWJRmAfPA6APgQCq6or90fhYnloKKW38vTMTD8t/G72/JETYX3NGOsOrlbHacM3 V3Bta3Oqkn4JpSZktgFhhs462uSCblZfdKTEKn7YrXNDYj5qwiT1q9V4xzJpPVOV5hWdLt tfRayEFjjCSqok8oJDUUDAxQWUibrM8omhxycfsCB+ROx/y3+CP+VksS2R1rEbqh8MDmZU TPzNmTrjPV4I3oRqxj6l4pyRoAMT3kZ3hZCdKwM6cFREnmE88tBgy5wLTmOPIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5KFg30dmz15D3; Mon, 18 Aug 2025 17:19:19 +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 57IHJJCv071504; Mon, 18 Aug 2025 17:19:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IHJJ85071501; Mon, 18 Aug 2025 17:19:19 GMT (envelope-from git) Date: Mon, 18 Aug 2025 17:19:19 GMT Message-Id: <202508181719.57IHJJ85071501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: b9a2d84b1bf7 - main - icmp: clear offset and flags when reflecting a packet 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9a2d84b1bf7f9cf556e2f0b68023d5af8362797 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b9a2d84b1bf7f9cf556e2f0b68023d5af8362797 commit b9a2d84b1bf7f9cf556e2f0b68023d5af8362797 Author: Michael Tuexen AuthorDate: 2025-08-18 17:15:39 +0000 Commit: Michael Tuexen CommitDate: 2025-08-18 17:19:13 +0000 icmp: clear offset and flags when reflecting a packet When reflecting a packet, use an offset of 0 and clear all three bits, in particular the DF bit. PR: 288558 Reviewed by: markj, zlei MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51991 --- sys/netinet/ip_icmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 543b846fbba5..fc0848b2c944 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -391,7 +391,6 @@ stdreply: icmpelen = max(8, min(V_icmp_quotelen, ntohs(oip->ip_len) - nip->ip_hl = 5; nip->ip_p = IPPROTO_ICMP; nip->ip_tos = 0; - nip->ip_off = 0; if (V_error_keeptags) m_tag_copy_chain(m, n, M_NOWAIT); @@ -872,6 +871,8 @@ match: mac_netinet_icmp_replyinplace(m); #endif ip->ip_src = t; + /* ip->ip_tos will be reflected. */ + ip->ip_off = htons(0); ip->ip_ttl = V_ip_defttl; if (optlen > 0) { From nobody Mon Aug 18 17:30:42 2025 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 4c5KVq0y6tz64DgK; Mon, 18 Aug 2025 17:30:43 +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 4c5KVq08xSz3GRs; Mon, 18 Aug 2025 17:30:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755538243; 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=63UsVAT8R5kxFjAIzsIqQ5G99ZLKA57dhnRm2TMRGEY=; b=FonxRcDquHEpUagrXcSPpDI+AJRo2byPl68fpUYtry/VuHg7LmJsE6oXfi4+Fr9AmtM9D/ id//YdmshxcC1f5H1gOv0VtU8Ztpon4EWI9JkcH8RDIpnPFO2nxXPIt6h7dYGmez0Xo/+d IvdpfxL/wEb0ZIBNAy//fFjToxC6rKhnkqzjlPwkYb2FViGqyGjDO+7MIOofPzoPcygKPl HW66M6gBIvw5lfDn3Zc9l9IpsK8tGy28PTJGav/pRxL7Jc0nM7vPe6K1Z2FCmqsd2YHVsL +3Pq6ElrLbpDD826mUvdFjOqrIEpcgnhxyhPpeSeiexrgYY3iKJOYD0NDzvIoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755538243; 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=63UsVAT8R5kxFjAIzsIqQ5G99ZLKA57dhnRm2TMRGEY=; b=uossxuZ0i+5t6H92/vhq0eWAcSPOCYXCON82EhiJiaEl9xav9L5JSr8s/F8JwdQdSG4LwD BxyaFo9YwagK7FkAIu3a+wW+7+leq7qoPLMoQ6kWWcNQfYQrPRU0UBrmIv/s0ivCzwdzbe ZQ3lAYazsVSm21SsKbKvCxIhJM801ClQZg2c1/h5TApHZak8wu6xRPkGqZwjL0BPcKoZ81 st/VYW9Xtzon/v8q0dvMssJbbhBO01NuzlEwJdE8GT46bUxaxgpzhB2yHP9uZrb+nimrC4 3WvBi8Yl3XJV4E1T7rKvENGuhMWvBA6WCeuo/CslJOZjiYgDzCuEhIKE17DGIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755538243; a=rsa-sha256; cv=none; b=lMUcoQxu/iSG8XnguFncQml2qUt8dhvfJyWxyIuba5kAtZrlkfBfz9/nrSNSyV/tvq0fCz CNPe8TamAyAMzz+Ftwm1NnPAbVY0dHDzpivdp5pmECvdSckQtoWRwM4TEYeF31w13dksS2 eAz3M7Qw51ig687bcmvDjBMmVhM4jydupbUoDrS9hXyMikkByEKoCp1IypFP0QMiXqOdcU K7R0xvZS2Yt/a8FSBvgAA5VQSzmwTPGPVpI+pHGdOu7siaDemaaA60BkL7c9Cti2auZxB1 UAbX4TizsygNUlM4f8cCOa+KjtGp/xDaxaWse9IlD3hxkFOSoBmyI0vmWRYu1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5KVp6n46z15PZ; Mon, 18 Aug 2025 17:30:42 +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 57IHUgEk004251; Mon, 18 Aug 2025 17:30:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IHUgrY004233; Mon, 18 Aug 2025 17:30:42 GMT (envelope-from git) Date: Mon, 18 Aug 2025 17:30:42 GMT Message-Id: <202508181730.57IHUgrY004233@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 131b3b575170 - main - RELNOTES: Mention nolocaltimewait change 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 131b3b575170c8acc03d2be69b44baed92f29c9d Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=131b3b575170c8acc03d2be69b44baed92f29c9d commit 131b3b575170c8acc03d2be69b44baed92f29c9d Author: Alexander Ziaee AuthorDate: 2025-08-18 17:25:03 +0000 Commit: Alexander Ziaee CommitDate: 2025-08-18 17:28:23 +0000 RELNOTES: Mention nolocaltimewait change Fixes: c3fc0db3bc50d (tcp: set net.inet.tcp.nolocaltimewait to 0) Co-Authored-By: Michael Tuexen Differential Revision: https://reviews.freebsd.org/D51161 --- RELNOTES | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/RELNOTES b/RELNOTES index 6e962d2df910..2444b050220d 100644 --- a/RELNOTES +++ b/RELNOTES @@ -85,6 +85,16 @@ f1f230439fa4: and obj NFSv4 mounted, the total RPC count dropped from 5461286 to 945643, with a 20% drop in elapsed time. +c3fc0db3bc50 + The default value of the sysctl variable + net.inet.tcp.nolocaltimewait has changed from 1 to 0. This means + that FreeBSD does not skip the TIME_WAIT state anymore for + endpoints for which the remote address is local. The new sysctl + variable net.inet.tcp.msl_local can be used to control the time + these endpoints stay in the TIME_WAIT state. The sysctl variable + net.inet.tcp.nolocaltimewait is deprecated and intended to be + removed in FreeBSD 16. + cd240957d7ba Making a connection to INADDR_ANY (i.e., using INADDR_ANY as an alias for localhost) is now disabled by default. This functionality can be From nobody Mon Aug 18 17:57:23 2025 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 4c5L5b5K5hz64GTV for ; Mon, 18 Aug 2025 17:57:23 +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 4c5L5b4lDwz3LbM; Mon, 18 Aug 2025 17:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755539843; 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=K3tE3PrYDnYr6GmNAT5953WLr7FwQMh0sdHfpN4SepI=; b=yFKqbi2QeS7C2w7F8vDjgn9FUFpNIdE4CZ6GG5SXX7p1TT0xoGHMLPTYsiCjXGuwNFXYry Q+JU7hhz2Op8fhvlCvQU8Fm9Lxnrw/0fDDhBByks6VhdnbXiyFkqarHAom2IgDSfE044zv 5kgClwvy35NCXIGfP1m8LsPnUKl0rSxdSFE1lwQ4681WFIfqQmP1imJGAWHwSsdLOAlQlq YU0mW8O+kFknWOhGnfV1wmtJ1AGhBEBd4A3Iv5ytYFmPR1xCi9aRpJP2+ty4iR0YiVTqID fsOiEsIddolCDvzVFcKZq9LpC4/ptfyJtIjUncqwP5YoKTNNFrYAxfX4p8iuDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755539843; 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=K3tE3PrYDnYr6GmNAT5953WLr7FwQMh0sdHfpN4SepI=; b=lEWGooXyaTDfluAZ0iR9zc4DleUd2wRjJYcET1sUv4nlYyt/QPBRGzCQzryAfgX0peXLrI DE956XwEqLGkauRvrB5fgoqrJJlvIkadSrDXW1w8US7rnsADACvciMY/VP3G1+gleMG9/X lSYwSLQcBTJizUQ8+UqVoXE2UK6IWKJzJcwwTckyTBHX0hFjTDKEDHPy8Y0fXSBURrGCE3 4q0DldjNb2J6TXYsUZir8ecnSnpYNG4Kcy1g28tWlOejWCiT/aHcVkBJjehwHkLW9wUBIE fYOe6++5iAxqrMfLRzir6i7iJJSgtxPN/0j6cBPB50CJT2dXn1R+tUbhSzZi9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755539843; a=rsa-sha256; cv=none; b=dp1VQno0y9+Grz5YHFRZqAfjTLTF7aqIPWAnrf0lvnTEFUSuOYXpWIMZUdZsY7Xhtp2ywG Wb2i4+fkHO5+4rFnFPLWv5Q+TNdGGL8DxBQA3isPY+P447TjT8CgV/gmX93WgqyfJ5gMOr znVDJaHUiL9gIHo4NAM0XE9tljOybSSmxKSAH+gMoudXWgpb2Q/l3GK5QtjuWWYSdT60PJ lVIrJ7OKIMBVHQ0nIZfpW7swjiJrWaovjCiK74GS9NsTZbmpXlJTVwXhv9H2IGt8nlHWHO /zJ5KFY+oFcrR8086CCTe26cJshCCx6nwmEWy9EbokEPY9D89uEwbz++VOBrQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5L5b3Wv2z16TR; Mon, 18 Aug 2025 17:57:23 +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 57IHvNnk045423; Mon, 18 Aug 2025 17:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IHvNxx045422; Mon, 18 Aug 2025 17:57:23 GMT (envelope-from git) Date: Mon, 18 Aug 2025 17:57:23 GMT Message-Id: <202508181757.57IHvNxx045422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Warner Losh Subject: git: e32b2740f7b6..2f2a0304d0de - vendor/one-true-awk - vendor branch updated 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/vendor/one-true-awk X-Git-Reftype: branch X-Git-Commit: 2f2a0304d0de65466eee733e9d6ed88dbcfdf925 X-Git-Oldrev: e32b2740f7b6846335741577412cc3ae492633c8 X-Git-Newrev: 2f2a0304d0de65466eee733e9d6ed88dbcfdf925 Auto-Submitted: auto-generated The branch vendor/one-true-awk has been updated by imp: URL: https://cgit.FreeBSD.org/src/log/?id=e32b2740f7b6..2f2a0304d0de 2f2a0304d0de awk: update to 20250804 bsd-feature 4d5b3604b34b From nobody Mon Aug 18 17:57:42 2025 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 4c5L5y5515z64GLs for ; Mon, 18 Aug 2025 17:57:42 +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 4c5L5y4Nnsz3LwK; Mon, 18 Aug 2025 17:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755539862; 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=w+IAmdnvxybxbIT+aRrs9OYis7n5dfKk2UO8eHUdVa4=; b=e02Z9OMuKjStz7YFMY6IlAZK6uQXuEjFaJhwF9FnAGBcM6ZD+B4Ne+G5fsorwNumc7p5wb DRA7pMICDv/D/cBPT7vmHkJUz1zYaEauhWqJWrbX6I7IPic72kbGZbNmLPkTd5a1pGkDfB J3aBVJ3fZR4HbvPl7IMmslV5z+GMV9KgWVuw0S53wRuDcTFsFm8z9aNHWoEeek9clwiQ3E DdpwEkwBlviznjogpqhTJIzuEaohxApuM4eFgMXymgVtMr1YB8tGc6ekMlVyb18SXcZtjA FSrjUx8LLmf9cgW/aJ1ICLSQY//9w2VUp0XSA00gyh0SAt7QXmwtJfL/HVZtDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755539862; 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=w+IAmdnvxybxbIT+aRrs9OYis7n5dfKk2UO8eHUdVa4=; b=mMOLqh95h9qh7Cgt7r5A3gwMHZeC5GsiIozsNxwa0mYtB3yugLeNoH/QKRQPhd2xjTJnZB +/oNYWYxei5rEW4h+Qp2LaCNlJjcAeyc8ROeoQ/7lDq0QeA8mXvp/3LZwF6c3QpoYYtv14 TSA2AiJhQ74je6vMGBvJYTvgpWTQAj/RT/8ODocBeL8bvPLQFGGXgaWpo178ozYLVgUS8e l2x7O5SRKgsBRnrkNKA6BLYcNeKf9CqR42McckbKO2gqJbIji3U7EyXdgRmjG9Pfg32Prg WB1XY0zuIsv2CPatWEFb+rJT2dk39Q44jRb83YJW85Oq2eAdo0C4RHccAGBeww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755539862; a=rsa-sha256; cv=none; b=Gn4sjh/bKJ6rYSW4Nts1dVBJ69Xj1jvnOyGVlK/N8qaviFTuHkvFvvqDrlzsXbIrQa/xbX yj5rMVMgn1o1EEr0OMRYzAUK0+xXmHJur7vtfzWrPRILcfs0IWEry8NAkhrecRd/w/ssWD kecHD/0qMHsIildFE38zJ31wiLmVna68NG2LjYl/QG2OUSy5XTPd8zScoff/klVWiqziIH STcqJz/Y0TwnoarbUiqpl8LOjltt+epWN9DotSvOJnW0gW880r5WX4YvWxJosXwF1U/HLx GMQq4Sk5D2Xo9Qg3hz7ME6qsG4xBF4pfohzWcHibX8fO8VJW/Qtg4+0TjLpBMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5L5y3lScz16RJ; Mon, 18 Aug 2025 17:57:42 +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 57IHvgUq045642; Mon, 18 Aug 2025 17:57:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IHvgli045641; Mon, 18 Aug 2025 17:57:42 GMT (envelope-from git) Date: Mon, 18 Aug 2025 17:57:42 GMT Message-Id: <202508181757.57IHvgli045641@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Warner Losh Subject: git: 1a78aec3d574 - Create tag vendor/one-true-awk/4d5b3604b34b 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: imp X-Git-Repository: src X-Git-Refname: refs/tags/vendor/one-true-awk/4d5b3604b34b X-Git-Reftype: annotated tag X-Git-Commit: 1a78aec3d5742d79aabd927412f2f31c6a02c970 Auto-Submitted: auto-generated The annotated tag vendor/one-true-awk/4d5b3604b34b has been created by imp: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/one-true-awk/4d5b3604b34b tag vendor/one-true-awk/4d5b3604b34b Tagger: Warner Losh TaggerDate: 2025-08-18 17:55:37 +0000 Awk 20250804 bsd-features branch Aug 04, 2025 Fix incorrect divisor in rand() - it was returning even random numbers only. Thanks to Ozan Yigit. Fix a syntax issue with /= that caused constants to turn into variables [eg. 42 /= 7]. Thanks to Arnold Robbins. commit 2f2a0304d0de65466eee733e9d6ed88dbcfdf925 Author: Warner Losh AuthorDate: 2025-08-18 17:52:21 +0000 Commit: Warner Losh CommitDate: 2025-08-18 17:52:21 +0000 awk: update to 20250804 bsd-feature 4d5b3604b34b Aug 04, 2025 Fix incorrect divisor in rand() - it was returning even random numbers only. Thanks to Ozan Yigit. Fix a syntax issue with /= that caused constants to turn into variables [eg. 42 /= 7]. Thanks to Arnold Robbins. Sponsored by: Netflix From nobody Mon Aug 18 18:02:37 2025 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 4c5LCf0vh5z64GZP for ; Mon, 18 Aug 2025 18:02:38 +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 4c5LCd6y5Wz3MT0; Mon, 18 Aug 2025 18:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755540158; 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=/PtOF8FFEcX8FwSECrkg95xqq9ZP0hUPv2Da/Nkl+4o=; b=CnHoy1HEltjYDopRCo4AgBGr0uUpUOHNlOS9OO4n6pig+0xMtIXESuLO8Qncbdi06voPdb zhPB2ublCsKd1rotKvMRQloZDdTIBJluF4dG8Mk/U/5nmNEYvDn80IYB0Ew9rJUg8+1/mN y0q3KBBEuSiVybPUTRbESSDe1dFHQaCB1SH6mf2bQnHa24NWSUWEj+hv+rLghqXU1woLVc x6bUFU/1pxzZ+YabVjDHRQEkZv2OcyY2SAHLazK9ZTFmtkeVk+kI94g6WZydIlhPnRNqsr aqwIUaHZckJnx0lGsdcy3OsXD8vzqvtZkCOyJpNopdhL8Clnx6XD0FKKP0V2KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755540158; 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=/PtOF8FFEcX8FwSECrkg95xqq9ZP0hUPv2Da/Nkl+4o=; b=fSv3ci2d+g7nkd1i7GEbq9Hd3EMqwBuLYEOBba/JDcCd5hKgo2W0H6x0wpBBAutpH/zaAe wdSCCt4SyHdFMzKVeTJy24QtNLHIoYV0ejt7apfC1sSSN2lJSUlVkpnty/ucjlMF4D+Lru 0Y6zT6D9EMY2VrCVweVBBXcJJLhnRmbJNoWSzBkoFTYE+ArxiQemx/JXdbN1UoUlrXJuNG Kg7phbTQrhWhVTc2xTbRfKvUzHhuCOL5kfK93Zat0xaoYfkyu0xjdD8JQqr3mx82s+dfDe nYWH04/Qf8Su9IzZ1AfD/NZShfFuy5jgQsjx7ciDuifUS/YFfrBfEY7TgpTdFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755540158; a=rsa-sha256; cv=none; b=xmS6qRgDvYGwV0PbV6+Q7H7LNcMdDFI/F5U5jdE0fWtlwnnUc9M3IoGeYp75hWNcphK/GZ bHWtJ4z18ygiMMPfsmUvM9ifqRLOp8TT5pJtOsKEotKWCFb83tne4Fh3vacBvAbd3bCpOL AOCV3oY3zkexmbH85952lIHwrvSVyz66i1j9/NAU/vAc4VYm3LVv9l4AnF1IXIFJXdgW7p 2XArguCeAxBnXjXnRsOhY2LCUbyaGEQb8AAX0Z1mRx5JQTe+I1LR3K/x1WtBxjYQ7wKNF2 v3TIF/zWgWLU171N16A5bwvjfAaUsObLNupYVfqKrJxHvZSaFmTWETj2ly1NHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5LCd6Dmbz163t; Mon, 18 Aug 2025 18:02:37 +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 57II2b2k063776; Mon, 18 Aug 2025 18:02:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57II2blC063775; Mon, 18 Aug 2025 18:02:37 GMT (envelope-from git) Date: Mon, 18 Aug 2025 18:02:37 GMT Message-Id: <202508181802.57II2blC063775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Warner Losh Subject: git: 2f2a0304d0de..f7603feee9e1 - vendor/one-true-awk - vendor branch updated 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/vendor/one-true-awk X-Git-Reftype: branch X-Git-Commit: f7603feee9e1ff25e6a246e1fc9b1b74030ba203 X-Git-Oldrev: 2f2a0304d0de65466eee733e9d6ed88dbcfdf925 X-Git-Newrev: f7603feee9e1ff25e6a246e1fc9b1b74030ba203 Auto-Submitted: auto-generated The branch vendor/one-true-awk has been updated by imp: URL: https://cgit.FreeBSD.org/src/log/?id=2f2a0304d0de..f7603feee9e1 f7603feee9e1 awk: Add missing file from 20250804 update From nobody Mon Aug 18 18:11:59 2025 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 4c5LQS0KwPz64HB1 for ; Mon, 18 Aug 2025 18:12:00 +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 4c5LQR5b3Kz3MwN; Mon, 18 Aug 2025 18:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755540719; 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=HiY1uWUrQAzAM6NuLG0nvymutTqTrJChuBPAabGO7g0=; b=gZdXc5gGBgwSN6pQJ8N83unetGf1+oB13tNBDGwnVHhlgGg4vPIQZnwOt71zArtWkZqwLx SBjO8modYmhzlCrU/EDydxOW6xRgfPCuW93IHebnLEXRdw7uq5vpT9UohasdSQ+yzizu6B keuLHwi+AbHX5CtD94W8TQaXmLfIQKEB54N4MhysKkdSZDv0CYh/chhcVDBr9hmzA+Dkik RvWEOSoN4F7fM+k/wZrrGRsSIvjOqXdEwvEtzrS7pyuqul36ZuGdfgdW971Hu4dKvzyKE7 pRE4pYB0J4xMKBAZdNJ9zcOfUnxAe84ae4b75je5UpiHskPAFlGVMV2U/bhHSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755540719; 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=HiY1uWUrQAzAM6NuLG0nvymutTqTrJChuBPAabGO7g0=; b=BnRzunfzTV3nUOIXwxTc2aoLUUC+lmGgA3XVLiGsaY0s5c81BCH7PzMH2Sa2OAaizDTu/J IXq6yE2zIvDgtU41/8dNX86ibX47NhXDt3+gDS077LHAsAqJB62n5e81jkHgATMwfMUp1U 4QWmtaEHRcICi4u8gfZ6Pj/leeSO1njEoLm90O3+nIWgGJzvAKC838Er++vIVHROq/ce9C 6c0cenkCB3eAe0Mx4d6TB6vMGfF6zMCA4U81GF4DdTYYfYsb/QC/Ul7Z7FMJAJ+JOqn+Qu ZEssap7HvGQEn6cCmNMqvA8mmllBYZlvP6smDrjB0tW+ZrDQEZ7vRkQfmfUwgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755540719; a=rsa-sha256; cv=none; b=jmTHD4EUHM4UJAnD/Gk8l5g9cRdG5lfvST6lj0FTX8xKFZZpwnugHu4Yq5MnBYLqE4NfhU vKIJFdtGIaVCd4uk5/yu/28b4w1WjrBvrwP2CQi1ELflJp2TO0GQ1xdBMcX2Pdr5ApC+VX R97htSdoZun6Wv2i6OGuJMlJnmBt4RxkJUxwV3v27AXLGnV1pKzc5jj+o0GWubUVVmbe7i SeS2K5tXKXT+kOcVkbRYCtkoqwBFl/lQoSaHGFQoAEmu0kxJjAbozPWtgoJ2gTzwbBkph/ sc4Z4/tJy2NTCDZGxIq6QIWZVdlb8M7eTHlNM9nqiPCy5VerRJIP99S3a4AWjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5LQR58dKz16qM; Mon, 18 Aug 2025 18:11:59 +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 57IIBxtV079680; Mon, 18 Aug 2025 18:11:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IIBx70079679; Mon, 18 Aug 2025 18:11:59 GMT (envelope-from git) Date: Mon, 18 Aug 2025 18:11:59 GMT Message-Id: <202508181811.57IIBx70079679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Warner Losh Subject: git: c6cd968b593d - Create tag vendor/one-true-awk/4d5b3604b34b_1 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: imp X-Git-Repository: src X-Git-Refname: refs/tags/vendor/one-true-awk/4d5b3604b34b_1 X-Git-Reftype: annotated tag X-Git-Commit: c6cd968b593de5449f680c06d73efac6ff372727 Auto-Submitted: auto-generated The annotated tag vendor/one-true-awk/4d5b3604b34b_1 has been created by imp: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/one-true-awk/4d5b3604b34b_1 tag vendor/one-true-awk/4d5b3604b34b_1 Tagger: Warner Losh TaggerDate: 2025-08-18 18:06:51 +0000 Replacement tag for vendor/one-true-awk/4d5b3604b34b I thought I'd snagged all the changed, but run.c was omitted when I tagged and pushed before. This new tag documents where we merged from. commit f7603feee9e1ff25e6a246e1fc9b1b74030ba203 Author: Warner Losh AuthorDate: 2025-08-18 18:01:51 +0000 Commit: Warner Losh CommitDate: 2025-08-18 18:01:51 +0000 awk: Add missing file from 20250804 update run.c wasn't included in the 20250804 update. Include it now. Sponsored by: Netflix From nobody Mon Aug 18 18:28:18 2025 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 4c5LnH6Sh1z64J8G; Mon, 18 Aug 2025 18:28:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c5LnH5wQGz3PNq; Mon, 18 Aug 2025 18:28:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755541699; 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: in-reply-to:in-reply-to:references:references; bh=WK3wj/0JCxQ5LpPVIFBupfdDOXNEx1onjfInPLA0u5E=; b=Sq8yYwkMcCTYw8lV9qf1aeDkfxEJp9GyS/7Qh2qxgwIK3TubqKo5qWK9dxBwaEVxw8OKUg 2Shn/RIT/QdfF5aTUvGkrRdKTASglQSZoMsYSebdOZWzTRqSAJwLrl9af/WYeSRT5tCDFx 2ZzjOw1L0bKbyMIqa/B80wW1dkQKM/mEJxa2o/LF0W+SB0SXNnGuxHL32YC+DTMuEhr9ii GFct2I0Z9/b/dTA+L4nYRC/pgfIUkHBA3NjTqgf+nP0srA/S6D7tjPWBRXate7oq6cQii0 rWNoOc6jVAcqavRWHPFhHfwzEsgda8h/fM+64piKgfcMU0Hh9MdOHXrNLbNjAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755541699; 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: in-reply-to:in-reply-to:references:references; bh=WK3wj/0JCxQ5LpPVIFBupfdDOXNEx1onjfInPLA0u5E=; b=cdxFxM4gwQS28etPl93hzjj8sEaMAZUHggiVLety/OkMu+JRUb7HqLYMZ+UTuKdFGNz+ti SZJlCgqplI/NdKE9ItvIQq8u2vuEz1JY2S/v6lVTxIyMvDzDkWgkLqC7QWkvCFWkJrbwh5 fmXZ3ojMvarlzM5vZFRaoRNfphnqPNtxScfmplAAnHmyUtPE1pEtZP7wXyLp1pF3WIsf9x EceC2BZS7ZxGgP/RSFEyKgl4RB87T/l/cxDi5UWXaTCA/gmjH/W9tGnAcAxHdZR7MnCDh/ LjvSYFb0b1F/vhU8dTORYE1BZoJ2iKWx7vsbda1XeufjsjtTqqjrQ/jUE/wJaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755541699; a=rsa-sha256; cv=none; b=e6A12kDNJdyj73aFrWRCxnfDT0jOz4gv/uMcKSmDPTGFN3tWrsYKeCdA1p/yyCjt0Xb5u/ D5hzVHyelKyq50R40A/QWwH4RfQ+LWPvDfXQsGWOPT51Mo/m+TZQp6KXpoimIDkJYzqdHr CjLwGJm+iyVeX7DCBp8Ls8DxoRBIUBR69PanMVEx20waikgV4OgPp94On/qHFu9Rpt2EEF O/9eUNURbnCOvLDN3PXZ/kH/bKVw+TfY4ErAtufOUsEpruwcybWvBFSj0E2In/t98vI4ux eLZa1csP88IHw2yj3KRaz2PRZj9OvKHscKYA340EFNBk2u598CQQujCwMg9Iug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:d81:5653:3ddf:690e] (unknown [IPv6:2601:5c0:4202:5670:d81:5653:3ddf:690e]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c5LnH47qnzmtr; Mon, 18 Aug 2025 18:28:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <6820006a-8621-40b3-9e3e-a21a98347829@FreeBSD.org> Date: Mon, 18 Aug 2025 14:28:18 -0400 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 User-Agent: Mozilla Thunderbird Subject: Re: git: c6778f3a4423 - main - Makefile.libcompat: Tweak krb5 compat dirs Content-Language: en-US To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202508170227.57H2R862074953@gitrepo.freebsd.org> <77e12d8d-3634-4d6e-bf17-220eca030eb0@FreeBSD.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/18/25 11:32, Lexi Winter wrote: > John Baldwin: >> On 8/16/25 22:27, Lexi Winter wrote: >>> Makefile.libcompat: Tweak krb5 compat dirs >> >> Why not just move these directories over to krb5/lib? > > i was planning to discuss this with Cy, but the reason is that some of > the libraries in util/ require compile_et, which is also in util/, so > it's more complicated than just moving the libraries to lib/. As noted on IRC, I think this would be a no-op. Today krb5/Makefile builds util before lib, so moving items from the end of krb5/util/Makefile to the start of krb5/lib/Makefile should preserve the same relative order (I'm assuming changing the relative position of krb5/include shouldn't matter). -- John Baldwin From nobody Mon Aug 18 18:31:53 2025 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 4c5Lsh0gFKz64KCW for ; Mon, 18 Aug 2025 18:32:08 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 4c5Lsg5Fttz3Pv6 for ; Mon, 18 Aug 2025 18:32:07 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-45a1b05a49cso32695925e9.1 for ; Mon, 18 Aug 2025 11:32:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755541925; x=1756146725; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p2zm7PlTHHs3bzZdTLYk7B0ta5m/aMZ0Q2+rZ/2LxKE=; b=iQUDBz6s5cg4hGLMu1n0ByVmEESLHo+BgSeV08MR37AQtO4IY4Vd9+RZCs/nfqvDrG FBlOxQAqqacYjSv1pFG13qedSictQEs03DFd59urPP7t19hCd1JLBqCvmF8zLdR12rD3 R2YL2Fc/yhcLcwui5dPUcZjcRILPxjXoReAai+1N7cQqEaUnP1hSshXbS1yKOEr7ecX3 2ywoXYAlyRYBBpa4Dx5J+6/ttW3vixUfbofYqlnJTvRdL7S3hsKjX9T9E6vVofu5/xSI XIDylSHlPTPc3bmuYcCaL2bZdbj6Sy8xpxTiz9WE1YBJU9bVXg5vFzGDRw0uGBrIV4NV gleg== X-Forwarded-Encrypted: i=1; AJvYcCXkefHODgYgJVrea8peISvq6Df8mR0uuc8NMLDZw4hVo3eqZtJm2mCnfkZcwwx5nGNxmQ7AGht/OC3Mpop3+yBT1fy7@freebsd.org X-Gm-Message-State: AOJu0Ywxdp79QtpIco06VPGtDhNmKF2r3EKCHIMhc2Sby7ZmKEMBgksB J/yKQ0QSlZIv6fAXGWinNgIm1bBdo4VA/KXmFTJtyedXs6eLBKsjAL9/tdZFUmFU92U= X-Gm-Gg: ASbGncvqtAkfVcthcP1zhBhui7+9e67oSsPiYnO7yu15s4YsF9LDojNYXQLArWYC2HA dQXe723IpWysGM2gEjjOopQ5PeRHmkKpj6Fu1o4lRaVRSJEpXJoNMntq3ek0hz12e58hvko4YfD Iq3Pd8N5ebqDfck+oIjK9EfgNDoCRZs9y4VZoypYTps+kaOu0Tf7VlCUw0tSixX77vj6pV4HntC 8Gp+EjbkLlmUoth1o3Tr/4vPVh/7ZACVj4ea4qPlwVX/GUh5HVPGw9WIMD3FUWDoK0OL1+/hact se4BOf7lcYwO7JQ4/DdOQl2Bpv1Y3Y5LYqDTCRbcadxa7KFJo0buDwGF7QXCXTx1cPnBN9TkRqG xk9ckPT9A3qixdOfdE4YZGKK01L/pPXPo7Jd6zyHxuugqVynvXTrSm8ABHEE1Az8V8w9R X-Google-Smtp-Source: AGHT+IE0eF2T9IPLd6E4sTSDO8iVD+6f8OL8+asdE0T9tJ7tGGM1bc5J7IelMvjm0FsdNQyvHFif9A== X-Received: by 2002:a05:600c:19cd:b0:456:a1b:e906 with SMTP id 5b1f17b1804b1-45b4367b78amr428645e9.33.1755541925100; Mon, 18 Aug 2025 11:32:05 -0700 (PDT) Received: from smtpclient.apple (global-184-7.n-1.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c07487a009sm477684f8f.11.2025.08.18.11.32.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Aug 2025 11:32:04 -0700 (PDT) Content-Type: text/plain; charset=us-ascii 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 (Mac OS X Mail 16.0 \(3826.600.51.1.1\)) Subject: Re: git: c6778f3a4423 - main - Makefile.libcompat: Tweak krb5 compat dirs From: Jessica Clarke In-Reply-To: <6820006a-8621-40b3-9e3e-a21a98347829@FreeBSD.org> Date: Mon, 18 Aug 2025 19:31:53 +0100 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: 7bit Message-Id: <698440A1-566C-4A7A-A301-9BC89825CC3F@freebsd.org> References: <202508170227.57H2R862074953@gitrepo.freebsd.org> <77e12d8d-3634-4d6e-bf17-220eca030eb0@FreeBSD.org> <6820006a-8621-40b3-9e3e-a21a98347829@FreeBSD.org> To: John Baldwin X-Mailer: Apple Mail (2.3826.600.51.1.1) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c5Lsg5Fttz3Pv6 On 18 Aug 2025, at 19:28, John Baldwin wrote: > > On 8/18/25 11:32, Lexi Winter wrote: >> John Baldwin: >>> On 8/16/25 22:27, Lexi Winter wrote: >>>> Makefile.libcompat: Tweak krb5 compat dirs >>> >>> Why not just move these directories over to krb5/lib? >> i was planning to discuss this with Cy, but the reason is that some of >> the libraries in util/ require compile_et, which is also in util/, so >> it's more complicated than just moving the libraries to lib/. > > As noted on IRC, I think this would be a no-op. Today krb5/Makefile > builds util before lib, so moving items from the end of krb5/util/Makefile > to the start of krb5/lib/Makefile should preserve the same relative > order (I'm assuming changing the relative position of krb5/include > shouldn't matter). Libraries are built before executables, so ordering between them in subdirectories is often irrelevant, and libraries require the *bootstrap* compile_et, not the one built for the target (even if the same architecture). There should be no need for any of this, and it just makes things more annoying to get right for libcompat. Jessica From nobody Mon Aug 18 18:59:15 2025 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 4c5MSz4Tq4z64LSn; Mon, 18 Aug 2025 18:59:15 +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 4c5MSz3q4Gz3Rkb; Mon, 18 Aug 2025 18:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755543555; 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=pSQxNxFgldhPoq6qlhR2FJD130sgukJqGtJ7PHwZCD0=; b=h+xok4Sa4rAbZuy5uC45Er3N324Q6zZ9g73gSsPVKHq4q6Ee8cxtvMwE4DAo7Q/ul8G+BQ 37ga5h2c1qwYWfkV1N/UUp9XPsgJuzSRarc9cmzszNeDEr7LamTm+DLc4MBviiAK3EosC0 3QHJ1VTxyhodNbsNWh+Gvs/2gnqm1VNPsGuU5pPC0i/yImYmAdWDLGNDByb1bhvX7/SS74 I1lhxhUgnWEMKju6zpZXflaTXWN7y7tLTHgJIBO+u+CLUX3K0NAzgeGAk+7OZyzkGtlo2X TG4126oUccL0Vq/EQXtQGJJZXo621BPv/aQy/EDenf+CBIDf44yMCQeerYx9aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755543555; 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=pSQxNxFgldhPoq6qlhR2FJD130sgukJqGtJ7PHwZCD0=; b=v9//vXmfpFcre+UMdIukVZe2Q5j6SXHWU+L+vCuxzbGLlYuL60x5zj3ZC77QXpVLK2AXF8 VWIykLFwyBhkFp292gYLvzl3R7mNGlNya9JSWnSh6iqxLDr1xceHLoDb1blBM02TR2xHkw bSfA1aDxEM512eIAefCiWYrg/E6FRIvxZwsIDyJYgCgPmzoSAZhVkyn8tLHy/ReyEa8jIe QUcPWSrk6tzINX85ue03uChEPEZLx2aRGmHWHyq/O5Az5rqMiRrhxE34plXr91EMWQ72M1 EhVE9TlWZUYzEZW4v+Y3askzHsibbRsUAOCUUtJbHvMeJdCALPSSecbl6sX8lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755543555; a=rsa-sha256; cv=none; b=Og/ZBc7q2mgLaN6dNJATza53KDdBk485GLqZx5GdyvzqORo/7lH2OT1j2qIgsK21TjaqAs vrX6vyDWshJ9GyWK6bUmEYk9IMmtYcuPz/+jWs+5vPsph9kiKZI+OYNxgMg0F8A+PC3Hbe ccGlu9KyGp8Cys/Ny4zdAOx8jfJ/PzCneHNVKWowEXQmT/hINWEm3cnF0fvX3xT7c5Y9Jc rDkuSkmJz/8quaTydHRJtH4hkCkRzx4n1P5K/bjHFcI9igJeLxQdsZwqYSikNpYXw32den Nj4EyUlzTz1jCqQ++IkXHtx78E6Zma9BEaf7rP98JGGbfW2fYXp0dzSQh/q7nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5MSz3LTLz183j; Mon, 18 Aug 2025 18:59:15 +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 57IIxFKQ059356; Mon, 18 Aug 2025 18:59:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IIxFsM059353; Mon, 18 Aug 2025 18:59:15 GMT (envelope-from git) Date: Mon, 18 Aug 2025 18:59:15 GMT Message-Id: <202508181859.57IIxFsM059353@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: ce9c325a2e92 - main - krb5: Build pkgconfig files with libraries 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce9c325a2e9254eef3def2999a3b65848b574727 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=ce9c325a2e9254eef3def2999a3b65848b574727 commit ce9c325a2e9254eef3def2999a3b65848b574727 Author: Lexi Winter AuthorDate: 2025-08-18 17:45:26 +0000 Commit: Lexi Winter CommitDate: 2025-08-18 18:57:59 +0000 krb5: Build pkgconfig files with libraries For various reasons, trying to build 32-bit compatibility PCFILES outside of a directory which is not a library doesn't work. Add a new krb5/Makefile.pc with the build rule for .pc.in.pc, and use this to build each pc file along with the library it's associated with. This means we automatically get 32-bit pcfiles in /usr/lib32, and is arguably more correct anyway since if we don't build a library for some reason, we also won't build its pcfiles. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D51986 --- krb5/Makefile | 2 +- krb5/{libdata/Makefile => Makefile.pc} | 30 +++++------------------------- krb5/lib/gssapi/Makefile | 13 ++++++++++--- krb5/lib/kadm5clnt/Makefile | 13 +++++++++---- krb5/lib/kadm5srv/Makefile | 13 +++++++++---- krb5/lib/kdb/Makefile | 13 +++++++++---- krb5/lib/krb5/Makefile | 14 ++++++++++---- krb5/lib/rpc/Makefile | 13 +++++++++---- 8 files changed, 62 insertions(+), 49 deletions(-) diff --git a/krb5/Makefile b/krb5/Makefile index e9bbcae106c1..c49601990c4a 100644 --- a/krb5/Makefile +++ b/krb5/Makefile @@ -1,7 +1,7 @@ SUBDIR= util .WAIT \ include .WAIT \ lib .WAIT\ - plugins libdata libexec usr.bin usr.sbin + plugins libexec usr.bin usr.sbin # SUBDIR_PARALLEL= .include diff --git a/krb5/libdata/Makefile b/krb5/Makefile.pc similarity index 73% rename from krb5/libdata/Makefile rename to krb5/Makefile.pc index c9a2e8e9259f..693a4636d749 100644 --- a/krb5/libdata/Makefile +++ b/krb5/Makefile.pc @@ -2,26 +2,15 @@ # # SPDX-License-Identifier: BSD-2-Clause OR ISC -.include "../Makefile.inc" - -.PATH: ${KRB5_DIR}/build-tools - -PACKAGE=kerberos-lib - -PCFILES=gssrpc.pc \ - kadm-client.pc \ - kadm-server.pc \ - kdb.pc \ - krb5.pc \ - krb5-gssapi.pc \ - mit-krb5.pc \ - mit-krb5-gssapi.pc - -CLEANFILES+= ${PCFILES} .SUFFIXES: .pc .pc.in .pc.in.pc: + @if ! grep -q "^PACKAGE_VERSION='${KRB5_VERSION}'$$" ${KRB5_DIR}/configure; then \ + echo "KRB5_VERSION ${KRB5_VERSION} does not match the source:"; \ + grep "^PACKAGE_VERSION=" ${KRB5_DIR}/configure; \ + exit 1; \ + fi >&2 sed -e 's,@prefix@,/usr,g ; \ s,@exec_prefix@,$${prefix},g ; \ s,@libdir@,${LIBDIR},g ; \ @@ -33,12 +22,3 @@ CLEANFILES+= ${PCFILES} s,@DEFCKTNAME@,FILE:/var/krb5/user/%{euid}/client.keytab,g ; \ s,@COM_ERR_LIB@,-lcom_err,g ;' \ ${.IMPSRC} > ${.TARGET} - -all: ${PCFILES} - @if ! grep -q "^PACKAGE_VERSION='${KRB5_VERSION}'$$" ${KRB5_DIR}/configure; then \ - echo "KRB5_VERSION ${KRB5_VERSION} does not match the source:"; \ - grep "^PACKAGE_VERSION=" ${KRB5_DIR}/configure; \ - exit 1; \ - fi >&2 - -.include diff --git a/krb5/lib/gssapi/Makefile b/krb5/lib/gssapi/Makefile index c3948c6ffe28..a434b29a2dfb 100644 --- a/krb5/lib/gssapi/Makefile +++ b/krb5/lib/gssapi/Makefile @@ -10,12 +10,15 @@ .include .include "../Makefile.inc" +.include "${KRB5_SRCTOP}/Makefile.pc" LIB= gssapi_krb5 -# SHLIB_MAJOR= 2 -LDFLAGS=-Wl,--no-undefined -LIBADD= krb5 k5crypto com_err krb5profile krb5support +LDFLAGS= -Wl,--no-undefined +LIBADD= krb5 k5crypto com_err krb5profile krb5support VERSION_MAP= ${.CURDIR}/version.map +PCFILES= krb5-gssapi.pc \ + mit-krb5-gssapi.pc +CLEANFILES+= ${PCFILES} # This is a contcatonation of: # crypto/krb5/src/lib/gssapi/libgssapi_krb5.exports @@ -44,4 +47,8 @@ CFLAGS+=${DEFINES} \ .include +all: ${PCFILES} + .SUFFIXES: .h .c .et + +.PATH: ${KRB5_DIR}/build-tools diff --git a/krb5/lib/kadm5clnt/Makefile b/krb5/lib/kadm5clnt/Makefile index 9b17644e86de..52a7187cf9bb 100644 --- a/krb5/lib/kadm5clnt/Makefile +++ b/krb5/lib/kadm5clnt/Makefile @@ -10,12 +10,14 @@ .include .include "../Makefile.inc" +.include "${KRB5_SRCTOP}/Makefile.pc" LIB= kadm5clnt_mit -# SHLIB_MAJOR= 12 -LDFLAGS=-Wl,--no-undefined -LIBADD= krb5profile gssrpc gssapi_krb5 krb5 k5crypto krb5support com_err +LDFLAGS= -Wl,--no-undefined +LIBADD= krb5profile gssrpc gssapi_krb5 krb5 k5crypto krb5support com_err VERSION_MAP= ${.CURDIR}/version.map +PCFILES= kadm-client.pc +CLEANFILES+= ${PCFILES} SRCS= alt_prof.c \ chpass_util.c \ @@ -88,6 +90,9 @@ afterinstall: .include +all: ${PCFILES} + .SUFFIXES: .h .c -.PATH: ${KRB5_DIR}/lib/kadm5 +.PATH: ${KRB5_DIR}/build-tools \ + ${KRB5_DIR}/lib/kadm5 diff --git a/krb5/lib/kadm5srv/Makefile b/krb5/lib/kadm5srv/Makefile index c3996af2225b..9eecd20ca822 100644 --- a/krb5/lib/kadm5srv/Makefile +++ b/krb5/lib/kadm5srv/Makefile @@ -10,12 +10,14 @@ .include .include "../Makefile.inc" +.include "${KRB5_SRCTOP}/Makefile.pc" LIB= kadm5srv_mit -# SHLIB_MAJOR= 12 -LDFLAGS=-Wl,--no-undefined -LIBADD= krb5profile gssrpc gssapi_krb5 kdb5 krb5 k5crypto krb5support com_err +LDFLAGS= -Wl,--no-undefined +LIBADD= krb5profile gssrpc gssapi_krb5 kdb5 krb5 k5crypto krb5support com_err VERSION_MAP= ${.CURDIR}/version.map +PCFILES= kadm-server.pc +CLEANFILES+= ${PCFILES} SRCS= alt_prof.c \ chpass_util.c \ @@ -88,6 +90,9 @@ ${GEN_CHPASS_UTIL_STRINGS_C}: ${GEN_CHPASS_UTIL_STRINGS} .include +all: ${PCFILES} + .SUFFIXES: .h .c .et -.PATH: ${KRB5_DIR}/lib/kadm5 +.PATH: ${KRB5_DIR}/build-tools \ + ${KRB5_DIR}/lib/kadm5 diff --git a/krb5/lib/kdb/Makefile b/krb5/lib/kdb/Makefile index d6fbc71b7584..80039ad83502 100644 --- a/krb5/lib/kdb/Makefile +++ b/krb5/lib/kdb/Makefile @@ -10,12 +10,14 @@ .include .include "../Makefile.inc" +.include "${KRB5_SRCTOP}/Makefile.pc" LIB= kdb5 -# SHLIB_MAJOR= 10 -LDFLAGS=-Wl,--no-undefined -LIBADD= krb5profile gssrpc krb5 k5crypto com_err krb5support gssapi_krb5 +LDFLAGS= -Wl,--no-undefined +LIBADD= krb5profile gssrpc krb5 k5crypto com_err krb5support gssapi_krb5 VERSION_MAP= ${.CURDIR}/version.map +PCFILES= kdb.pc +CLEANFILES+= ${PCFILES} SRCS= decrypt_key.c \ encrypt_key.c \ @@ -60,6 +62,9 @@ ${ADB_ERR_C}: ${ADB_ERR} .include +all: ${PCFILES} + .SUFFIXES: .h .c -.PATH: ${KRB5_DIR}/lib/kdb +.PATH: ${KRB5_DIR}/build-tools \ + ${KRB5_DIR}/lib/kdb diff --git a/krb5/lib/krb5/Makefile b/krb5/lib/krb5/Makefile index a1576fcc256f..b3587cf58c2b 100644 --- a/krb5/lib/krb5/Makefile +++ b/krb5/lib/krb5/Makefile @@ -10,12 +10,15 @@ .include .include "../Makefile.inc" +.include "${KRB5_SRCTOP}/Makefile.pc" LIB= krb5 -LDFLAGS=-Wl,--no-undefined -LIBADD= krb5profile k5crypto com_err krb5support -# SHLIB_MAJOR= 3 +LDFLAGS= -Wl,--no-undefined +LIBADD= krb5profile k5crypto com_err krb5support VERSION_MAP= ${.CURDIR}/version.map +PCFILES= krb5.pc \ + mit-krb5.pc +CLEANFILES+= ${PCFILES} SRCS= krb5_libinit.c @@ -67,6 +70,8 @@ KDCPACKAGE= kerberos-kdc .include +all: ${PCFILES} + .SUFFIXES: .et .man .man.5: @@ -75,5 +80,6 @@ KDCPACKAGE= kerberos-kdc .man.7: @cp ${.ALLSRC} ${.TARGET} -.PATH: ${KRB5_DIR}/lib/krb5 \ +.PATH: ${KRB5_DIR}/build-tools \ + ${KRB5_DIR}/lib/krb5 \ ${KRB5_DIR}/man diff --git a/krb5/lib/rpc/Makefile b/krb5/lib/rpc/Makefile index 6f09020261e1..7e37a5479132 100644 --- a/krb5/lib/rpc/Makefile +++ b/krb5/lib/rpc/Makefile @@ -10,12 +10,14 @@ .include .include "../Makefile.inc" +.include "${KRB5_SRCTOP}/Makefile.pc" LIB= gssrpc -# SHLIB_MAJOR= 4 -LDFLAGS=-Wl,--no-undefined -LIBADD= gssapi_krb5 krb5 k5crypto com_err krb5support +LDFLAGS= -Wl,--no-undefined +LIBADD= gssapi_krb5 krb5 k5crypto com_err krb5support VERSION_MAP= ${.CURDIR}/version.map +PCFILES= gssrpc.pc +CLEANFILES+= ${PCFILES} SRCS= auth_gss.c \ auth_gssapi.c \ @@ -75,4 +77,7 @@ CFLAGS+=-I${KRB5_DIR}/lib/rpc \ .include -.PATH: ${KRB5_DIR}/lib/rpc +all: ${PCFILES} + +.PATH: ${KRB5_DIR}/build-tools \ + ${KRB5_DIR}/lib/rpc From nobody Mon Aug 18 19:07:19 2025 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 4c5MfL4WQCz64M2r; Mon, 18 Aug 2025 19:07:22 +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 4c5MfL3kZTz3TBq; Mon, 18 Aug 2025 19:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755544042; 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=y5yKWGMnEnhZ5CweupM2sAxGockon0RM6P3/KVdaRDE=; b=VDDMDjwuCvQGGS7n+AJOxSpqpDJ0E9KBqe5UIYf6/4KrMWd43+y9ggKzNlOxRnpYVtHjts Oyr+0JZAbdHbpIe3G9ftTzzg9FsQZmHmuQVoOOjMGQH9Ph3ohOuMBEMCcNcvt0OAyQfpzt s+kurVJI8+LgQgw4acpPKms84tF3zbmeAvn6vFbz6fTgmeKkemofzcl9eDJLCPr6CqTw6p opZKu/TWfYioiyte1177mdxxkbXLHVSMsAlTyz8DoRYu3l/G/pi7XUEMvL63iPS+z4Sxsj 5zLk9ONmgazniMeGgQw1J1xuQsPE3ouj1jLuAdrPd2W62DcLiKig7eVMO693ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755544042; 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=y5yKWGMnEnhZ5CweupM2sAxGockon0RM6P3/KVdaRDE=; b=ER/88ELZ4ftSi+jAXGg5IyimatmDMIgc8dUyrk/Iy0FF2WAwxMac8vJPkI4YCqXny/dxbX meVi0Ow1MUJQua2K+z0Hj5O+5fPzDpUaWpoJtgYgcL4IsCACKASbelmekdTptUuqIXI1M2 uhmWT11tB+Nj/1AH0jfSEXFKov7x5aHb88StfixcxyDhd56cTqVELRYjsfUsinV1wub/v1 PNkEbTwq0C+Mj5nbNIiuETPgSqZK5QuCJ+YVNQTLMerd7rX4nOSZ52bLx/WJatPzUoahJK iVJNgMT67SGjOhgA26VY18s+kq4/0wZdwSR24WWMT5Jkjl0fa0qee3nVstrP4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755544042; a=rsa-sha256; cv=none; b=aBielXvcWrlawhvZpXA97GjtemVHadstJDSfBDZk1hLNjMB9/2b2XsTKG/Fv4GMk/4mVhx phPbbhsIJ0P0kB0xqYnjf3tz7dplIm+4xTwVSnEvjZ7cPj6jgUp7I26/Soz/KN+Hvq9gFO /vqwjqDJWi4ojfWgG37uy/5RlKIFrqY7IxjacipBc8ifkFoJ2HsAFAwghAzDO8EpQL1hDa tSCNJZf+CCJ1W+BQAbN++89yV4/YjlG8WFttyf0PDqp4luvudsYAm7aGw3b9SsrVUyxRqK JuBzi9jHA3CZ3DQCLf52TJWzLm4fxZCu2Ca+aeymtNKAxRgKSqqYUuPL6xMofw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5MfL3BYzz18Ll; Mon, 18 Aug 2025 19:07:22 +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 57IJ7MDm079023; Mon, 18 Aug 2025 19:07:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IJ7JYM079011; Mon, 18 Aug 2025 19:07:19 GMT (envelope-from git) Date: Mon, 18 Aug 2025 19:07:19 GMT Message-Id: <202508181907.57IJ7JYM079011@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b45a181a74c8 - main - awk: Merge one true awk 20250804 bsd-feature branch 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b45a181a74c816cfc553e8210954916887fb94dc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b45a181a74c816cfc553e8210954916887fb94dc commit b45a181a74c816cfc553e8210954916887fb94dc Merge: ce9c325a2e92 f7603feee9e1 Author: Warner Losh AuthorDate: 2025-08-18 19:05:48 +0000 Commit: Warner Losh CommitDate: 2025-08-18 19:06:46 +0000 awk: Merge one true awk 20250804 bsd-feature branch Merge in the latest one true awk to pick up two small bug fixes: Aug 04, 2025 Fix incorrect divisor in rand() - it was returning even random numbers only. Thanks to Ozan Yigit. Fix a syntax issue with /= that caused constants to turn into variables [eg. 42 /= 7]. Thanks to Arnold Robbins. Note: vendor/one-true-awk/4d5b3604b34b_1 was the merge tag. Sponsored by: Netflix contrib/one-true-awk/FIXES | 8 ++++++++ contrib/one-true-awk/main.c | 2 +- contrib/one-true-awk/run.c | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) From nobody Tue Aug 19 01:09:25 2025 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 4c5Wh55V67z64lKt; Tue, 19 Aug 2025 01:09:25 +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 4c5Wh54s3Nz446D; Tue, 19 Aug 2025 01:09:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755565765; 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=n52/ZzDyPFisMzwFWJgL4koEWYCvh65KwwWLiURT6VU=; b=TyrwvZf5T1spEbO+dkhuDcE0NcVQi5A8d9RHPRc36Z9tmqtn/7gGcdTOCsO3pD+P/zRVkh o4Icosi4wa4xRuf0kt9POggasNa3bgssz7woLMimh2TC1LaS9tmJT4kqWMf6Ow4xeQ+8E9 LeU4YNaT5PrdFahgXeZV50N/fcYuGSXPeJB31zegvLPv7Puv+w11+KTLFsrn2Euwh/xY4h e0HnHiETBCXfOUmRjo0nbpxeCuomjhqY5xuHxK/to84mzWoDw4r6CwlpA86d53Hz4z701S gvGgTtLyazjix6/ryMEKBPHd6vH/xPCIfPIf4+fH9CH7LQbWyOdOBOcHT/iZ4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755565765; 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=n52/ZzDyPFisMzwFWJgL4koEWYCvh65KwwWLiURT6VU=; b=JC160AuN/PfhiHmGZtJ9TkFJFsBGL2T6cu1781EXxQ9McYbNvpEVYG0z4wAgP6zzIXe9yv /8l9s7aslDl8LhzGOEK8rqFsPxzbzV5MhTupQKmg7Y+G6K3lCIvZPKMiAIuTYrBnHRGBBk B71Y5usUBcW2XyAdXxQDkwhzkdYYfrRToSZaOrvQ+OvnaV5YlnWopdmvaHX4TvhKa1LmBC uH5VrzYIwtfqZsxm0tNxCM7c2BrwYMMLyDIY3qLvYu6Ook9ONGYHjDST4BsqsJDeRDM7yr 0dszax1UIFq/WfRoOTtPwP/530FhmC348nJltC3+PnSxUMbom2KGhEQO7xnO9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755565765; a=rsa-sha256; cv=none; b=Bu7J34UKjA2X2cbDSqJ+96L7KXFtIRyQcJBgKJNKrYJ3rV6Rgkl/SbIlNVPEZ/SiLPznpv pOxCu+U2fOXp4yGLASMEh3gf1JI57dwb4u+FxbzIdVjHl9ZwBUMe+3AxYwOpZPsyAuy8ae h857QPFHpOhkXl1e0Q54KXpBlVE7eBiHh4GHqB4uuPvoephfVjuMVTEJrZhQmHaE6o6ggD eUJDElqwRQ3i/aUafUZqQDcpb6A96kGx9cRITwr5GGs1rEg1wyoSY9bPYE8Cnl02rgBPXn Vy150vQJjor0+EHwQ2bB/CnxmrfSZXZJmmKuvIAB4JBOYsU+AAMHTgZNcxXHyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5Wh54DDFz1KNp; Tue, 19 Aug 2025 01:09:25 +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 57J19P91055540; Tue, 19 Aug 2025 01:09:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57J19PKs055537; Tue, 19 Aug 2025 01:09:25 GMT (envelope-from git) Date: Tue, 19 Aug 2025 01:09:25 GMT Message-Id: <202508190109.57J19PKs055537@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 19c8cc3162ac - main - Remove inotify example code when MK_EXAMPLES == no 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19c8cc3162aca9fde56581caee743d68d322c909 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=19c8cc3162aca9fde56581caee743d68d322c909 commit 19c8cc3162aca9fde56581caee743d68d322c909 Author: Enji Cooper AuthorDate: 2025-08-16 04:31:58 +0000 Commit: Enji Cooper CommitDate: 2025-08-19 01:09:12 +0000 Remove inotify example code when MK_EXAMPLES == no This change adds the needed entries to OLD_DIRS and OLD_FILES to ensure that the paths are properly cleaned up when `make delete-old` is run and MK_EXAMPLES == no. MFC after: 2 months Fixes: 1d8664d69041 ("examples: Add a demo program for inotify") Differential Revision: https://reviews.freebsd.org/D51934 --- tools/build/mk/OptionalObsoleteFiles.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index b30604238855..dcd606feea1d 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1709,6 +1709,8 @@ OLD_FILES+=usr/share/examples/hostapd/hostapd.conf OLD_FILES+=usr/share/examples/hostapd/hostapd.eap_user OLD_FILES+=usr/share/examples/hostapd/hostapd.wpa_psk OLD_FILES+=usr/share/examples/indent/indent.pro +OLD_FILES+=usr/share/examples/inotify/Makefile +OLD_FILES+=usr/share/examples/inotify/inotify.c OLD_FILES+=usr/share/examples/ipfilter/BASIC.NAT OLD_FILES+=usr/share/examples/ipfilter/BASIC_1.FW OLD_FILES+=usr/share/examples/ipfilter/BASIC_2.FW @@ -1921,6 +1923,7 @@ OLD_DIRS+=usr/share/examples/hast OLD_DIRS+=usr/share/examples/ibcs2 OLD_DIRS+=usr/share/examples/hostapd OLD_DIRS+=usr/share/examples/indent +OLD_DIRS+=usr/share/examples/inotify OLD_DIRS+=usr/share/examples/ipfilter OLD_DIRS+=usr/share/examples/ipfw OLD_DIRS+=usr/share/examples/jails From nobody Tue Aug 19 01:09:26 2025 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 4c5Wh665Bgz64lVh; Tue, 19 Aug 2025 01:09:26 +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 4c5Wh65SH6z448l; Tue, 19 Aug 2025 01:09:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755565766; 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=MZ5xSEuM5ce9+ozvqDfejSV1jtRf3sMTQZMYIgil8GU=; b=oLruc6/k8zb+py5wHVryoVku+AP0vvlWRWE0Qio0Jpn+KqAszlBTs8E7eXVEAu9IwI57C8 +tmlauvdpAottpWvLB2e+k4PFI/520r9I1JCyWG09m2OO5JY4ipD5M5ZTTTsb02b4iVbQ5 NgFz9zEaKmg0GizhT86ojSbVrd0WkO//gSbG/9f6jQC8YJ6QGeb9k89LoJ2ByRSHna73BC 4mVaCAn4VBWZnfYpIfoy2GwAMzpLJZMuIsrJeprpVVAnW0Kdmx0bQe0+WCdauRQj3GkYEi C9CGJpy7yTqjFuEArYrp/p0YMpZ2253ZiE3hxBYYiGGOtBpeP/NnIFLuLphtRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755565766; 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=MZ5xSEuM5ce9+ozvqDfejSV1jtRf3sMTQZMYIgil8GU=; b=fLZwtm+/5nyxUC/mvP4i2LFCIqzUYbKi6jBP8a0gj4oTpi3VpIujJ+qlmbfQuPSOnu/P/o SDphyvp+4XMWo/GNETXX6a9lYliJuUtGj0vkor0R5d1y3JX8k/1jPhS8xP935lcR+Pnrie H6XMgotOCaO1lW4hT6/ve9JaFSZ2e1o28MCPHKMxOwEBmugoNxvgtwl0+WV76F6FG74x6H wtXzqzSmuMSOR8fYBPqfsxAIqaSC1IRfYm5jVXGoMT2K6WUGwbLkB0yeDOtkvrw7zVQE37 WpQH8soq17sQpoEU31Wp6m+U+nC6DSDZ7C8CdIERaSmbwIQ/ogYDxwIM0cCcLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755565766; a=rsa-sha256; cv=none; b=gjScwcrRWZ4QBUK2nrj1b4JY5qp1hiB5hQoLBTl/ViQZLsD4OfS+f7SV0NO6+pmglG+rz8 IXTQWjubfzdpHbf/klraOHUriXBf3B1ouYamaoZmJa5yvtf3+BNUD1D7NgZq3J55T/j2t/ a0qq+E4aiLEjtpzitUiIhhieQ7tHtpERzLkPIct0nZ4EGqiYbzog0yFJRDm03jgVB44xc6 bojm+prkjClUnsT28ewwWCJ0UrH5oqY+B/RicVmoyb6/5n3wHWZu96DEKXOh1dlQZaKHAN YjkizPhiJQHW9+Jm1BADoTZK4hy7N9yS+iYzdVlUHOy7ZsKMAXT25nOKnKCwnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5Wh64lHzz1K7c; Tue, 19 Aug 2025 01:09:26 +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 57J19QoT055579; Tue, 19 Aug 2025 01:09:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57J19QZW055576; Tue, 19 Aug 2025 01:09:26 GMT (envelope-from git) Date: Tue, 19 Aug 2025 01:09:26 GMT Message-Id: <202508190109.57J19QZW055576@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: de3e5dbea171 - main - Makefile.inc1: garbage collect unused variable: install-info 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de3e5dbea171f576e9e6d89ea5238ea3c9c8b26a Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=de3e5dbea171f576e9e6d89ea5238ea3c9c8b26a commit de3e5dbea171f576e9e6d89ea5238ea3c9c8b26a Author: Enji Cooper AuthorDate: 2025-08-19 01:06:41 +0000 Commit: Enji Cooper CommitDate: 2025-08-19 01:09:12 +0000 Makefile.inc1: garbage collect unused variable: install-info The variable's definition was removed with texinfo in 2d2813618c3818d7d41a7ced1fca4a1a01d3591d, but the reference to the variable was left behind. This is effectively a no-op cleanup. MFC after: 3 days --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index a16af09caea0..3f35dafc6441 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1417,7 +1417,7 @@ _sysctl=sysctl .endif ITOOLS= [ awk cap_mkdb cat chflags chmod chown cmp cp \ - date echo egrep find grep id install ${_install-info} \ + date echo egrep find grep id install \ ln make mkdir mtree mv pwd_mkdb \ rm sed services_mkdb sh sort strip ${_sysctl} test time true uname wc From nobody Tue Aug 19 02:03:49 2025 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 4c5Xts28T7z64q8m; Tue, 19 Aug 2025 02:03:49 +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 4c5Xts1W8kz48wG; Tue, 19 Aug 2025 02:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755569029; 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=I5ot526jVk8HopDVH1YX7Do+qV/HRVi1ulxggr5y4Pg=; b=uzX6aKMft97snoaDos95tHMhv3i+sEXnn7OlJRDU1HV8GAubI1TeKvxS77VDS/yHGHpobT 3QS/W8TiZDPG1f1fM3mkZBAPFQFu1bWg0wEuMddlb8SYreBXqYEYmpaVJCc2wjXJIuB4lZ Vz8A+2dChXmW12WgSe3HP8UVNS7hP0Chfm1AarxsEg/uPaDrS8JGbkjgyAMJ5+7waYNe6m 9kpnzLm8vgcMm6dfmWY+LUc3l4uOQxr5irIWZ2GA64ihS74UDiqNZD+2LYf0XqA404k3RH qz8pKHpQGkwiq+HkxgCdarqUCr6zrrPFgp2SekpTktazoBECE/wQ1ZYyYZeG+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755569029; 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=I5ot526jVk8HopDVH1YX7Do+qV/HRVi1ulxggr5y4Pg=; b=WutKZpwAmUf6z8C+a3pGEMs4z4AgpCwH7hDWifskThmJ018lpvsQouEFtv4QF6Gy0qG1Ui ncWX2AtOwtvhoQBYENjhNc4M4qywFGu3glYUosv7B9b2pguOfnHj0w8WP4yCTfjwUq2XW7 9oevWsO3A83iDGM4tDOBKj/7UUdDu1vH9yTuinhvpFVWygjxDVf2myafDJzI2O8RafCJno dG0oJ4NLZ+rBCv9aWt5y5KDeQ+lRdIVdKN9Nmd6mQVechhABiFJt5qJtfWYCfYBR+tkIKu HcvsQ/ag08BBVxOqnxik/q4cjYarW2oeKylyZz0OA82roovCwLmkVlg17DjO3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755569029; a=rsa-sha256; cv=none; b=TdvRP+RWZxkr6pKOmckmZKh9umXXZho0q+jCVrRpAe4qKN5IqKtRku4xEVqkKSZh1aJrTr R2kyhm5uLvTFmjEfHPROIKC7VDRk0tnsi8WOBRh/5Roajyl2WB1p8vPNPCo8TeKm1VOGbl YRloA2da8B74PCXHIsgBPJOiCno2YzYIY+uicCBddBPrrr0njr8jkvkX/9yWz5XuNXHvPd 7Py2u1dWbITXpW1bx18ef/QQPZf2+c+/1+LyzlVdgjLhpA2cXrr/1f81S5dJc+84CWUOkF uY+wyUwNC3eVy7bqy9XdtvVW62cjQ0Sux5sNWk1naxb5YRuoaPDv5dRT+VEkYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5Xts0wQJz1Lh3; Tue, 19 Aug 2025 02:03:49 +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 57J23nqS066537; Tue, 19 Aug 2025 02:03:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57J23n24066534; Tue, 19 Aug 2025 02:03:49 GMT (envelope-from git) Date: Tue, 19 Aug 2025 02:03:49 GMT Message-Id: <202508190203.57J23n24066534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: cb3eac927b5d - main - krb5: Update version strings 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb3eac927b5dc5621f102149d3751b72e6fd7e81 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=cb3eac927b5dc5621f102149d3751b72e6fd7e81 commit cb3eac927b5dc5621f102149d3751b72e6fd7e81 Author: Cy Schubert AuthorDate: 2025-08-19 02:03:18 +0000 Commit: Cy Schubert CommitDate: 2025-08-19 02:03:18 +0000 krb5: Update version strings Fixes: f1c4c3daccba --- krb5/include/autoconf.h | 4 ++-- krb5/util/build-tools/krb5-config.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h index fe281d136954..19979b060f10 100644 --- a/krb5/include/autoconf.h +++ b/krb5/include/autoconf.h @@ -641,7 +641,7 @@ #define PACKAGE_NAME "Kerberos 5" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Kerberos 5 1.21.1" +#define PACKAGE_STRING "Kerberos 5 1.22.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "krb5" @@ -650,7 +650,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.21.1" +#define PACKAGE_VERSION "1.22.0" /* Default PKCS11 module name */ #define PKCS11_MODNAME "opensc-pkcs11.so" diff --git a/krb5/util/build-tools/krb5-config.sh b/krb5/util/build-tools/krb5-config.sh index c0481f3417e1..b23fe0141345 100755 --- a/krb5/util/build-tools/krb5-config.sh +++ b/krb5/util/build-tools/krb5-config.sh @@ -26,7 +26,7 @@ # Configurable parameters set by autoconf # Disreagard the above. Edit this by hand in the bespoke FreeBSD build. -version_string="Kerberos 5 release 1.21.3" +version_string="Kerberos 5 release 1.22.0" prefix=/usr exec_prefix=${prefix} From nobody Tue Aug 19 03:18:56 2025 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 4c5ZYX2KzCz64tmL; Tue, 19 Aug 2025 03:18:56 +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 4c5ZYX1nHqz3GMV; Tue, 19 Aug 2025 03:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755573536; 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=UrXxJigxm78gMaGPuDWFKpW8ib/bX84x6O24YN/KssI=; b=NOoU6KGNenUIIwDm1U6MhYOgG4xL4RsXcdaOo5LSVn5du7oYswy1LqREdUpcPAMeGBtL9L zWzHWD2w09st+CBF0rBF76Kkq4FJVqEQNTgs20eEnw4Lz1mmkBpNm7VfJF1/FFmpl7wb8Y 1FiHdAFv4Vd6dFf7Ze59UnKl8cXu7ZVyjigVSRH5SczL9yTzJHcg7dTaWsAEMGAm2vHT2T yyl3tUEDGkRZY+Bs1Osm6rcokKk9HLKJ99XPwaPBAShpXVhkPsTEAHuOl2feitOrDnp7xM 6TtdyIvQUSQWHMxEvU7TcDqh5m2nGCEthAHzPmItj/MxYMWmb8UcYybbNuxf2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755573536; 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=UrXxJigxm78gMaGPuDWFKpW8ib/bX84x6O24YN/KssI=; b=d6LkKO5dswkQjZAgSsM7gahJxPrFuAfJ8pFxYXfcbt8SRECm+dqX0fQV3QI4xXtzl+1qZa 6zTIiyk1vDQpyS051kl4JJx2OIQeLnIBYzjgYBS/ZH0GIMjxKQRyshLy7cWwiindhb070D OwpSfsOg0SOrmgHHBiDtb29HXTOXCbS8rSMZN0PCH1pF75yOoyCkKyNxZ5AEc4+db0+RYb V2z8nSpltOiuooaNkKq9ZdKRcTYHCYIv/qLMi5APOdFrNVBzt8h5uwhhuFVq0YtmW1IfQ3 nFEFCyrjdR4Rt/qYWP0zpo9iUB+nkoLObQ7Hy8MDqFAA6rIsr4F0LfR83cotnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755573536; a=rsa-sha256; cv=none; b=WRyXBNupCWjjA5nCniKIywIbLZXjahmodUR+aiGtxpsir9vMj8DUAlLA2khnhq4AP8nfMb Bl2i2lENzbESj8x3EC+93KN7q3dGtmzFMjQGMx5VChM/RXQW8HYeKXYtjKvJqr6xkqFFiM 0gvEp3+Xm3paV0uiQjhfhQ570XMevmih0pU1aR5/prl8AXMAtFxsRO6RDh6DZK/HEmj+by EL/cssMra8WBs8xIKFF0eqE6Dx++NyUJPeDCkJqW7Dv9cUUkFdrlEWBa7dkDCAgvaDWRIT Jv9i2LSOgy80xq9VMUHRoLQbQCE+v/tz25LJmCX6N09D1MJa8F/fQGCWpwZKaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5ZYX1GlKz1NDy; Tue, 19 Aug 2025 03:18:56 +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 57J3Iuok000653; Tue, 19 Aug 2025 03:18:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57J3IuFA000650; Tue, 19 Aug 2025 03:18:56 GMT (envelope-from git) Date: Tue, 19 Aug 2025 03:18:56 GMT Message-Id: <202508190318.57J3IuFA000650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7c4565e3e75e - stable/14 - [libm] Fix undefined behavior of a left shifted of a signed integer 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7c4565e3e75e110b167f04efbe9d9d6355fcf2de Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7c4565e3e75e110b167f04efbe9d9d6355fcf2de commit 7c4565e3e75e110b167f04efbe9d9d6355fcf2de Author: Steve Kargl AuthorDate: 2025-08-12 04:26:29 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-18 19:23:29 +0000 [libm] Fix undefined behavior of a left shifted of a signed integer PR: 288778 (cherry picked from commit d180086e6eae2e152e803ed6cf13775a7c006dc7) --- lib/msun/src/e_fmod.c | 30 ++++++++++++------------------ lib/msun/src/math_private.h | 21 +++++++++++++++++++++ lib/msun/src/s_ilogb.c | 13 +++++-------- lib/msun/src/s_remquo.c | 30 ++++++++++++------------------ 4 files changed, 50 insertions(+), 44 deletions(-) diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c index dd96f6bcd7cb..f8f1bcd88c6d 100644 --- a/lib/msun/src/e_fmod.c +++ b/lib/msun/src/e_fmod.c @@ -27,14 +27,14 @@ static const double one = 1.0, Zero[] = {0.0, -0.0,}; double fmod(double x, double y) { - int32_t n,hx,hy,hz,ix,iy,sx,i; - u_int32_t lx,ly,lz; + int32_t hx, hy, hz, ix, iy, n, sx; + u_int32_t lx, ly, lz; EXTRACT_WORDS(hx,lx,x); EXTRACT_WORDS(hy,ly,y); sx = hx&0x80000000; /* sign of x */ - hx ^=sx; /* |x| */ - hy &= 0x7fffffff; /* |y| */ + hx ^= sx; /* |x| */ + hy &= 0x7fffffff; /* |y| */ /* purge off exception values */ if((hy|ly)==0||(hx>=0x7ff00000)|| /* y=0,or x not finite */ @@ -47,22 +47,16 @@ fmod(double x, double y) } /* determine ix = ilogb(x) */ - if(hx<0x00100000) { /* subnormal x */ - if(hx==0) { - for (ix = -1043, i=lx; i>0; i<<=1) ix -=1; - } else { - for (ix = -1022,i=(hx<<11); i>0; i<<=1) ix -=1; - } - } else ix = (hx>>20)-1023; + if(hx<0x00100000) + ix = subnormal_ilogb(hx, lx); + else + ix = (hx>>20)-1023; /* determine iy = ilogb(y) */ - if(hy<0x00100000) { /* subnormal y */ - if(hy==0) { - for (iy = -1043, i=ly; i>0; i<<=1) iy -=1; - } else { - for (iy = -1022,i=(hy<<11); i>0; i<<=1) iy -=1; - } - } else iy = (hy>>20)-1023; + if(hy<0x00100000) + iy = subnormal_ilogb(hy, ly); + else + iy = (hy>>20)-1023; /* set up {hx,lx}, {hy,ly} and align y to x */ if(ix >= -1022) diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index bdf45a9035bc..1f5878445a8c 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -740,6 +740,27 @@ irintl(long double x) (ar) = (x) - (ai); \ } while (0) +/* + * For a double entity split into high and low parts, compute ilogb. + */ +static inline int32_t +subnormal_ilogb(int32_t hi, int32_t lo) +{ + int32_t j; + uint32_t i; + + j = -1022; + if (hi == 0) { + j -= 21; + i = (uint32_t)lo; + } else + i = (uint32_t)hi << 11; + + for (; i < 0x7fffffff; i <<= 1) j -= 1; + + return (j); +} + #ifdef DEBUG #if defined(__amd64__) || defined(__i386__) #define breakpoint() asm("int $3") diff --git a/lib/msun/src/s_ilogb.c b/lib/msun/src/s_ilogb.c index ac9feceaf14e..c85c689024a3 100644 --- a/lib/msun/src/s_ilogb.c +++ b/lib/msun/src/s_ilogb.c @@ -22,21 +22,18 @@ #include "math.h" #include "math_private.h" - int ilogb(double x) +int +ilogb(double x) { - int32_t hx,lx,ix; + int32_t hx, ix, lx; EXTRACT_WORDS(hx,lx,x); hx &= 0x7fffffff; if(hx<0x00100000) { if((hx|lx)==0) return FP_ILOGB0; - else /* subnormal x */ - if(hx==0) { - for (ix = -1043; lx>0; lx<<=1) ix -=1; - } else { - for (ix = -1022,hx<<=11; hx>0; hx<<=1) ix -=1; - } + else + ix = subnormal_ilogb(hx, lx); return ix; } else if (hx<0x7ff00000) return (hx>>20)-1023; diff --git a/lib/msun/src/s_remquo.c b/lib/msun/src/s_remquo.c index a3f73f779c1b..5630838fe3b4 100644 --- a/lib/msun/src/s_remquo.c +++ b/lib/msun/src/s_remquo.c @@ -5,7 +5,7 @@ * * Developed at SunSoft, a Sun Microsystems, Inc. business. * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice + * software is freely granted, provided that this notice * is preserved. * ==================================================== */ @@ -28,7 +28,7 @@ static const double Zero[] = {0.0, -0.0,}; double remquo(double x, double y, int *quo) { - int32_t n,hx,hy,hz,ix,iy,sx,i; + int32_t hx,hy,hz,ix,iy,n,sx; u_int32_t lx,ly,lz,q,sxy; EXTRACT_WORDS(hx,lx,x); @@ -54,25 +54,19 @@ remquo(double x, double y, int *quo) } /* determine ix = ilogb(x) */ - if(hx<0x00100000) { /* subnormal x */ - if(hx==0) { - for (ix = -1043, i=lx; i>0; i<<=1) ix -=1; - } else { - for (ix = -1022,i=(hx<<11); i>0; i<<=1) ix -=1; - } - } else ix = (hx>>20)-1023; + if(hx<0x00100000) + ix = subnormal_ilogb(hx, lx); + else + ix = (hx>>20)-1023; /* determine iy = ilogb(y) */ - if(hy<0x00100000) { /* subnormal y */ - if(hy==0) { - for (iy = -1043, i=ly; i>0; i<<=1) iy -=1; - } else { - for (iy = -1022,i=(hy<<11); i>0; i<<=1) iy -=1; - } - } else iy = (hy>>20)-1023; + if(hy<0x00100000) + iy = subnormal_ilogb(hy, ly); + else + iy = (hy>>20)-1023; /* set up {hx,lx}, {hy,ly} and align y to x */ - if(ix >= -1022) + if(ix >= -1022) hx = 0x00100000|(0x000fffff&hx); else { /* subnormal x, shift x to normal */ n = -1022-ix; @@ -84,7 +78,7 @@ remquo(double x, double y, int *quo) lx = 0; } } - if(iy >= -1022) + if(iy >= -1022) hy = 0x00100000|(0x000fffff&hy); else { /* subnormal y, shift y to normal */ n = -1022-iy; From nobody Tue Aug 19 04:28:06 2025 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 4c5c5L71zmz60HpS; Tue, 19 Aug 2025 04:28:06 +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 4c5c5L5xVVz3Mrx; Tue, 19 Aug 2025 04:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755577686; 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=6ZVHaTHgK9/H0x9hIz70lVuaxHlrvgz7q3YA3JvsPO4=; b=BHl5SmiwJ5e+h7nxlyxiRqstzG3njRwDsx/cecLTzjd34evi7dNM11B1+Uk6ZgX73j6uT1 e9/FTVLAzy6Nro7sdUF2/zs42baAaBlLDHCSHMExvIRbLJKK9m8QgEBLJKs8GTkGbK2TL5 KuKxW8DBrjfKDKUxxnSqv8hVP2gP0UcdG5EpPJxC2aN3bhlcXjbaoguYLsjBDvDNO09rgG OcQY4JmA77ntZTOsXq/u24gaTZuyKh4Tt6oWNxftTrliuWlHSKBtU1Feivn9//wR7MeMip nxW4Qr/q60F/SVYBhQb3nZzsweZFC8BPRWSJAj8CJIXQS4tyDSb0FdkT9Lyohg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755577686; 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=6ZVHaTHgK9/H0x9hIz70lVuaxHlrvgz7q3YA3JvsPO4=; b=FAScbdhV+TjtbpL7ljVhyPDaHIBAjyyLARFlpo09TBiH8cc25X3gQ0q2QagDirmcIO2mCl B0Z9PApnsHDLVVgqROeh3AzLKCIt6Rke//v9bxsc7A/GDRARAvaINMBga068AXs3EHYms0 WiWX0a0V3HDa9cP7LFO7qXujMQgH/pL0iser0MjnoXw+CAhu3no2x6vfn3mcuTz3YYAMLg Ftkqc1GY0oEEXIN1ANMc4gb94T0K9chsA9OJPLasocACQ/QeYM4u2r48WwwTawKrQZLUQu 4A8et0mL/EpvN/n2vwz0dqmQxwU1QdCasOQpT9tcecSKYmczEfvz3PRkXup+1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755577686; a=rsa-sha256; cv=none; b=NOwRlgGqtKL0Qsyf2k/QL4l7XCn+/up6SS/yBqBjKN/9fU420y2VOb9NWvoq80ZyWUQsiV Fxroc2BrnaUfno2maWKN+EvUBqBsXW0gxqLSfX0ER1Oevdzj95o04rOLubXF2gi4LX2Pof mrFS/Pio6xCq/dfOwWyCKyemN11WS7X3cMBxyUVRawwLf+cJpD2idaWWpVS0UjMCy48K8F zS2Dk8cEUzgHuwUlAEv434hKpmmYhyWybo34RtAsXVFmy+gtj8qbDXeVfVfS56A1OQRxwM FTZDKh+Hknz/YFxif/oO86yZtPSvjCpgStgNizmIRMiwQNskAnezfG7BypGJbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5c5L5P2Rz1QL2; Tue, 19 Aug 2025 04:28:06 +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 57J4S6Wl030587; Tue, 19 Aug 2025 04:28:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57J4S6or030584; Tue, 19 Aug 2025 04:28:06 GMT (envelope-from git) Date: Tue, 19 Aug 2025 04:28:06 GMT Message-Id: <202508190428.57J4S6or030584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: aef16fc30bb2 - main - build: remove certctl requirement for host OpenSSL libs on macOS 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aef16fc30bb2298e65a5fcc0c503d343e428c1b2 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=aef16fc30bb2298e65a5fcc0c503d343e428c1b2 commit aef16fc30bb2298e65a5fcc0c503d343e428c1b2 Author: Kyle Evans AuthorDate: 2025-08-16 18:34:30 +0000 Commit: Kyle Evans CommitDate: 2025-08-19 04:27:59 +0000 build: remove certctl requirement for host OpenSSL libs on macOS Some platforms, like macOS, do not expose headers for the system's libcrypto for public consumption. libcrypto is relatively heavy and needs to know, e.g., the host system's endianness, so we scope the build down to macOS where OpenSSL headers are known to not be present and we can be reasonably certain that most of the systems today that would be cross-building are little endian. We still don't bother if building WITHOUT_OPENSSL since the end result is expected to be used by OpenSSL, but perhaps we could revisit that independently in case one, e.g., brings their own implementation. Reported by: jrtc27 Reviewed by: jrtc27, ngie Fixes: c340ef28fd38 ("certctl: Reimplement in C") Differential Revision: https://reviews.freebsd.org/D51935 --- Makefile.inc1 | 9 ++++++++- secure/lib/libcrypto/Makefile | 5 ++++- secure/lib/libcrypto/Makefile.common | 2 +- share/mk/bsd.endian.mk | 13 ++++++++++--- tools/build/Makefile | 1 + 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 3f35dafc6441..861d368af838 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2709,8 +2709,14 @@ _basic_bootstrap_tools+=sbin/md5 _basic_bootstrap_tools+=usr.sbin/tzsetup .endif -# certctl is needed as an install tool +# certctl is needed as an install tool. libcrypto is rather heavy, so we'll +# build that alongside it only for platforms that don't expose headers for +# OpenSSL, like macOS. .if ${MK_CAROOT} != "no" && ${MK_OPENSSL} != "no" +.if ${.MAKE.OS} == "Darwin" +_bootstrap_libcrypto=secure/lib/libcrypto +${_bt}-usr.sbin/certctl: ${_bt}-secure/lib/libcrypto +.endif _certctl=usr.sbin/certctl .endif @@ -2777,6 +2783,7 @@ bootstrap-tools: ${_bt}-links .PHONY ${_strfile} \ usr.bin/dtc \ ${_cat} \ + ${_bootstrap_libcrypto} \ ${_certctl} \ ${_kbdcontrol} \ ${_elftoolchain_libs} \ diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index e7e491124241..7e2350fb33ea 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -1,7 +1,10 @@ SHLIBDIR?= /lib -.if !defined(LIBCRYPTO_WITHOUT_SUBDIRS) +.if !defined(LIBCRYPTO_WITHOUT_SUBDIRS) && !defined(BOOTSTRAPPING) SUBDIR= engines modules .endif +.ifdef BOOTSTRAPPING +CFLAGS+= -DOPENSSL_NO_SCTP +.endif .include .include diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Makefile.common index afcc2a48660c..ad48e2b434cf 100644 --- a/secure/lib/libcrypto/Makefile.common +++ b/secure/lib/libcrypto/Makefile.common @@ -6,7 +6,7 @@ CFLAGS+= -DL_ENDIAN CFLAGS+= -DB_ENDIAN .endif -.ifndef WITHOUT_AUTO_ASM +.if !defined(WITHOUT_AUTO_ASM) && !defined(BOOTSTRAPPING) .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386" ASM_${MACHINE_CPUARCH}= diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk index ba662ffc7439..24da57954b5a 100644 --- a/share/mk/bsd.endian.mk +++ b/share/mk/bsd.endian.mk @@ -20,10 +20,17 @@ LOCALEDEF_ENDIAN= -b # # During bootstrapping on !FreeBSD OSes, we need to define some value. Short of # having an exhaustive list for all variants of Linux and MacOS we simply do not -# set TARGET_ENDIANNESS and poison the other variables. They should be unused -# during the bootstrap phases (apart from one place that's adequately protected -# in bsd.compiler.mk) where we're building the bootstrap tools. +# set TARGET_ENDIANNESS (on Linux) and poison the other variables. They should +# be unused during the bootstrap phases (apart from one place that's adequately +# protected in bsd.compiler.mk) where we're building the bootstrap tools. # +.if ${.MAKE.OS} == "Darwin" +# We do assume the endianness on macOS because Apple's modern hardware is all +# little-endian. This might need revisited in the far future, but for the time +# being Apple Silicon's reign of terror continues. We only set this one up +# because libcrypto is now built in bootstrap. +TARGET_ENDIANNESS= 1234 +.endif CAP_MKDB_ENDIAN= -B # Poisoned value, invalid flags for both cap_mkdb LOCALEDEF_ENDIAN= -B # and localedef. .endif diff --git a/tools/build/Makefile b/tools/build/Makefile index 83f589ce3864..3c4e07e3cfc2 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -495,6 +495,7 @@ INSTALLDIR_LIST= \ bin \ lib/geom \ usr/include/casper \ + usr/include/openssl \ usr/include/private/ucl \ usr/include/private/zstd \ usr/lib \ From nobody Tue Aug 19 11:15:26 2025 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 4c5n7M0WvTz64lXW; Tue, 19 Aug 2025 11:15:27 +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 4c5n7L641Vz47kT; Tue, 19 Aug 2025 11:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755602126; 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=a+3Gh9359Io8+yEGZYKZWxgJKaRe/b8WAZmWNPsZ8Wo=; b=wXXY1tJSKiHcAJCNGNEPLwAwlsdEWHIwPPpinqpIdCkhDNQaTMuqqwnJw9USm5vexIL12B TxfkdC83SfJNXi2BycClFw7HPkVIx01PJOCIMiR60CwycWVzr/Wd5hrHS33F7Lw0olx9jM /v4qoWV0JD5EBz4JnMcdHwvBMJ2pgiddY5ZATGoqGUU7NFRQjyMIaL73inTeNyq7orQCd/ HPYvOugyu3L3x7Fl7fQZ7WNepMytq2kTJ1K4D74W/sPGOkzTjzH0fuT4kUkbLuBxOBJgA/ iVLeeSvBxdjN+ss9+B6bTjcNEY7b+e8p96nsyPvTxewYE0RrkBv9kNX/wY2ZPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755602126; 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=a+3Gh9359Io8+yEGZYKZWxgJKaRe/b8WAZmWNPsZ8Wo=; b=dOU125dqzSI5qEU2FhcXn8Yb1am9Av/giSAYIvMdWDNBffAkj31wwRMYCLBD9aKcJsvF0z 3KuMnEX6pP7qHHnRuu+9UdEyUz8xyrZvfezo7pl/RHnV6rs2Gecd7OE/YZhufErVn2hYVJ igadfAOekqDyZMvmbjD0x2pLrFzKDySk/r8xWM5FrOto3Le3chjaTm7A1RyOtUEQ1YXMYz TVuyKvjuAxT24I6clmTLyqgWwLeYLVkfD5EqohC51lmnHKnJ3oQQd+BBFuPdss618eJD3D /QLA/9D6YeU5DT/BTw4r6ltA/yCSohTSF+ph3yd4pmymFjHJIc11bMxz+fw4Vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755602126; a=rsa-sha256; cv=none; b=r3Zv2VR+7kMH7bVLMHlbejeJdDn4Xt1jqwzaS+SG7tNW/RDS6rKU3QKe6M69zGM9f+XBo0 ZJdy69eCs2yK2cBzusQGhTGKQH6VWrotgei1l9OrYalgqzjwQzQdxfDZQBjt02JoOQLk8X P2pghvfLILrfhqvMWbwdYMwA2GsWWNRYQBt5szTT4qj8G2QyeYLk0amUZONSiW5dUQZWA1 fv1FMBipt8OaNQrXTXcWbU7PPAzKNsN6/dmPXy6OIp8SZ3EenUZzh1Guf5L20GrRWbvIn6 VwIE4HR20TIKmrqAGZjXSusFJbJSH9YTJXzV8gpCd048MqLK9XvrwnpUUEz0XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5n7L5Sn2z8Sm; Tue, 19 Aug 2025 11:15:26 +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 57JBFQCo000577; Tue, 19 Aug 2025 11:15:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JBFQVU000574; Tue, 19 Aug 2025 11:15:26 GMT (envelope-from git) Date: Tue, 19 Aug 2025 11:15:26 GMT Message-Id: <202508191115.57JBFQVU000574@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 13449796878f - main - usbtest: fix usbtest compilation error by an unused variable 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13449796878fd45419fee75bb2ff76a64c542cdf Auto-Submitted: auto-generated The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=13449796878fd45419fee75bb2ff76a64c542cdf commit 13449796878fd45419fee75bb2ff76a64c542cdf Author: ShengYi Hung AuthorDate: 2025-08-12 06:26:58 +0000 Commit: ShengYi Hung CommitDate: 2025-08-19 11:15:18 +0000 usbtest: fix usbtest compilation error by an unused variable Approved by: lwhsu (mentor), markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51867 --- tools/tools/usbtest/usb_msc_test.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/tools/usbtest/usb_msc_test.c b/tools/tools/usbtest/usb_msc_test.c index 713da381820e..1b9c3192a472 100644 --- a/tools/tools/usbtest/usb_msc_test.c +++ b/tools/tools/usbtest/usb_msc_test.c @@ -952,7 +952,6 @@ find_usb_endpoints(struct libusb20_device *pdev, uint8_t class, struct libusb20_interface *iface; struct libusb20_endpoint *ep; uint8_t x; - uint8_t y; uint8_t z; *in_ep = 0; @@ -966,9 +965,6 @@ find_usb_endpoints(struct libusb20_device *pdev, uint8_t class, return; for (x = 0; x != pcfg->num_interface; x++) { - - y = alt_setting; - iface = (pcfg->interface + x); if ((iface->desc.bInterfaceClass == class) && From nobody Tue Aug 19 12:50:48 2025 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 4c5qFN6mwZz64sNt; Tue, 19 Aug 2025 12:50:48 +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 4c5qFN61gPz3KtH; Tue, 19 Aug 2025 12:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755607848; 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=4k5WYg0N8wF9N8Lyton+q/s6d09GsqhYv0AgfC+1k70=; b=Av9FhtisBt/+7rkc3T5ELHJkk3bkUW7iGAVehV0yt/tl2FBh4zn0ya1KzW+4q4CGRrEft6 r4q9bAAU5iRDttYukoKgjA1ldCb5Gpk/GvlersRT92Ntei/xveZGvVHiaqhVsg7n/s8YKX yZD//bgLXJHeiAiYx7ItmDR94TYIMQWuMYkuC8T8P3KU9kgHhZKCg0fH3Ku4yjUfUFterz k7VDvZrGhivqY8PgZv+iBtIe73j+e4o7S78ppX5SXjD+r/kbVPovcji5pqUVm8HxtPYQJz FgtOdE63WmHZLRpKYbVgXen3+YANOQTzpMTgoXw4pIE/HMPlIEW1t2Nj4DFumw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755607848; 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=4k5WYg0N8wF9N8Lyton+q/s6d09GsqhYv0AgfC+1k70=; b=k/XBMlPtABi69wmVWF1224KMDNSzJ/WOSizZ0F3N/SW/3sknN58poTIksV9Pn/SsjVq5f6 zHfOgUzjwPUp9SkChhGMo38nk/oWBeEpAW8qQC34kOH8tQFG1RMPAIIHlasGytCDjuGOSZ G3haRdbHJ4eA9hfoPfATYYge/PWsd+KTqT+6gFXPt1gSr+l7h2QEtQP/DLb4DoaA7jaLlj hC0tloCCQL7VTJT4dkFz2ksGjxOXriU7obO/CWMLV2BN2rXJhHjxstJ13v4lP6B7jGjau9 KMnZDBOCHkkbnDg5EPyoDseUhh95ZLPTzDSopf2EcZ+CdU5Yu/qqVXl++NFZLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755607848; a=rsa-sha256; cv=none; b=EDVs54Q10QmxPDXQndiEIBACo1/52pULk/3cYO4cM0DPHwzl9MXwKacgHiPpzLkF74TB9m spIVaAJ+qfzaetiWkOyH2NuWFAzF3eA31vhQtcSuea9ZcgNmlmaEWXMHrLwAVO2b+XNDa+ I9jJgfsoGl9yPPfDNJyqu0FVnT5UfynlJgTDoLtCf/bd9ovftBCfMrpDZxKMIsAjOZuqX3 M3KqcrH3ej5ne5QA51OAZRuj+lwbj892JPYoAuI2vfXePk3mCySDo0lWqippqU5KHrxtGk DSukLqVxZtgLxI1cMm0Nvlex3OeSm7t2ck3caNpQagB6iusXPvz/M0tDCkBEsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5qFN5c41zCJM; Tue, 19 Aug 2025 12:50:48 +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 57JCombE078383; Tue, 19 Aug 2025 12:50:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JComoL078380; Tue, 19 Aug 2025 12:50:48 GMT (envelope-from git) Date: Tue, 19 Aug 2025 12:50:48 GMT Message-Id: <202508191250.57JComoL078380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 142b4309f42d - main - pw: Skip root check with alternate root 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 142b4309f42d5018a92ad5e08943fd1081a9ea57 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=142b4309f42d5018a92ad5e08943fd1081a9ea57 commit 142b4309f42d5018a92ad5e08943fd1081a9ea57 Author: Ed Maste AuthorDate: 2025-06-06 01:27:50 +0000 Commit: Ed Maste CommitDate: 2025-08-19 12:48:35 +0000 pw: Skip root check with alternate root pw may be run by an unprivileged user for creating an image or jail. EPERM will still be reported from the file open if the user does not have appropriate permission. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50710 --- usr.sbin/pw/pw.8 | 9 +++++++-- usr.sbin/pw/pw.c | 1 + usr.sbin/pw/pw_user.c | 18 ++++++++++++------ usr.sbin/pw/pwupd.h | 1 + 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index c72623ee05b3..5eae810b6732 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 29, 2024 +.Dd August 19, 2025 .Dt PW 8 .Os .Sh NAME @@ -191,7 +191,12 @@ utility handles updating the .Xr master.passwd 5 , .Xr group 5 and the secure and insecure -password database files, and must be run as root. +password database files, and must be run as root +.Po except when using +.Fl R +or +.Fl V +.Pc . .Pp The first one or two keywords provided to .Nm diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c index fc17f6dba022..a4c95258f3bb 100644 --- a/usr.sbin/pw/pw.c +++ b/usr.sbin/pw/pw.c @@ -162,6 +162,7 @@ main(int argc, char *argv[]) snprintf(conf.etcpath, sizeof(conf.etcpath), "%s%s", optarg, arg == 'R' ? _PATH_PWD : ""); + conf.altroot = true; } else break; } diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c index d9fd8c77c13e..8a9a4342f5ef 100644 --- a/usr.sbin/pw/pw_user.c +++ b/usr.sbin/pw/pw_user.c @@ -238,6 +238,13 @@ perform_chgpwent(const char *name, struct passwd *pwd, char *nispasswd) } } +static void +pw_check_root(void) +{ + if (!conf.altroot && geteuid() != 0) + errx(EX_NOPERM, "you must be root"); +} + /* * The M_LOCK and M_UNLOCK functions simply add or remove * a "*LOCKED*" prefix from in front of the password to @@ -256,8 +263,7 @@ pw_userlock(char *arg1, int mode) bool locked = false; uid_t id = (uid_t)-1; - if (geteuid() != 0) - errx(EX_NOPERM, "you must be root"); + pw_check_root(); if (arg1 == NULL) errx(EX_DATAERR, "username or id required"); @@ -1324,8 +1330,8 @@ pw_user_add(int argc, char **argv, char *arg1) if (argc > 0) usage(); - if (geteuid() != 0 && ! dryrun) - errx(EX_NOPERM, "you must be root"); + if (!dryrun) + pw_check_root(); if (quiet) freopen(_PATH_DEVNULL, "w", stderr); @@ -1641,8 +1647,8 @@ pw_user_mod(int argc, char **argv, char *arg1) if (argc > 0) usage(); - if (geteuid() != 0 && ! dryrun) - errx(EX_NOPERM, "you must be root"); + if (!dryrun) + pw_check_root(); if (quiet) freopen(_PATH_DEVNULL, "w", stderr); diff --git a/usr.sbin/pw/pwupd.h b/usr.sbin/pw/pwupd.h index 262b044e07fc..a39a022ca309 100644 --- a/usr.sbin/pw/pwupd.h +++ b/usr.sbin/pw/pwupd.h @@ -78,6 +78,7 @@ struct pwconf { char etcpath[MAXPATHLEN]; int fd; int rootfd; + bool altroot; bool checkduplicate; }; From nobody Tue Aug 19 13:01:10 2025 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 4c5qTM3BpNz64sy2; Tue, 19 Aug 2025 13:01:11 +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 4c5qTL6J0Lz3NJn; Tue, 19 Aug 2025 13:01:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755608470; 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=0QBReVBy5KITQCN0F0p0n+I380TveXfKMGqXP57W1Sk=; b=k79XsapQ/vcunp9gumkyLxFTopZvyMH7KZhgMaDr0j8DGF4SMPeEO842wCXMPDtH4WF9Ji Y9lhDIX9Ar20D8tu+1ix1jfs+SsqO4sMx/a5d//374CMWEVnWzG1yBSUMDk9rhkqSRG2En KqeDx6vi3fHWhiNxXmjvKgcWYWoxFlHfGbUH32gddIRR9UL6QZwprk0mIXtJM480GNwRtf jnH8F9jy2S2Q/8Iw/GXnse2Bf+MmzZp5QOYEPiKpciITcy+WTvTAYZAxPmsKif9XZ3LQKd 82hz1KeDNaDUO30hnlDTjUkvpdxxQIsjXR0wkz83dDxZSoQh/7bz0Pbf+EPbBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755608470; 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=0QBReVBy5KITQCN0F0p0n+I380TveXfKMGqXP57W1Sk=; b=pEq8PW41imCNkLNaEciWgqevyd/Rvl6RqB6kKPym3UKqHxdltzuH09uomiYc/sHYq75B5d NnPVgv7QOkpS0QoxgZ/Jfsy2BkGXLKo8l9jncIzK3huhMFlaeDcWMa2Ad20XY7uHXketLC Z926m3/6sGzLqyW37zoAkPNe4DT7yOBPO+x3YJ8hI3WhHgLZwUUpMFLS6dRnD9/j0Mb8ef OmY4gBlX6WgS1Jvgj5qixuoM1pyvuIPnOlgxsz9ezprQtpKqJY6LI+1VgTVARltOsQVZcl VG7C2TqgAu+MMyC80ilewG5DmOC5gpZfJYA5x5EEmE2cun24FtQLhfmdya9GFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755608470; a=rsa-sha256; cv=none; b=yys24xHVYqtRBky5GXmrN9d2HEaB8r71EGr2yJuMAAnUA8zoUKMI5DcGGR2TKwPnrWMqAP wADboeSN1Pa6DojlREVWAjyf3Qd3Vt/v5yYMfKQyLUmcuurkwH2stSafmGZeXYCmelaW4H xEUEllIDK2WluYbdAgEDwO4dseosVqxvt5MzNWuJCYYNTAtO63yFolXJXsyTo9v1225onx O/WVtWEIxgNyc7fPM02TR8iZew4qAUfSdsp8BBM8d3t/XrhDTIJ0FvWJPxoSBAuaLlOl3T iXdznKipSUn9Srlk5w+f/SjbP68MbV04kNzSi7YecOJUWOof5CshU/l+62o/vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5qTL5hh7zCHm; Tue, 19 Aug 2025 13:01:10 +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 57JD1AOD002049; Tue, 19 Aug 2025 13:01:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JD1AGV002046; Tue, 19 Aug 2025 13:01:10 GMT (envelope-from git) Date: Tue, 19 Aug 2025 13:01:10 GMT Message-Id: <202508191301.57JD1AGV002046@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: ba61aa417a04 - main - u2f.4: Polish 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba61aa417a047c79122539ffb5b0075cbe8af0bf Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=ba61aa417a047c79122539ffb5b0075cbe8af0bf commit ba61aa417a047c79122539ffb5b0075cbe8af0bf Author: Alexander Ziaee AuthorDate: 2025-08-19 12:59:18 +0000 Commit: Alexander Ziaee CommitDate: 2025-08-19 12:59:29 +0000 u2f.4: Polish + add USB to Nd for search results + convert SYNOPSIS to consistent style + add HARDWARE + tag SPDX Fixes: 4a04e0a6c703 (a HID driver for FIDO/U2F security keys) Reviewed by: wulf Differential Revision: https://reviews.freebsd.org/D52000 --- share/man/man4/u2f.4 | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/share/man/man4/u2f.4 b/share/man/man4/u2f.4 index 7f0e076028db..4c51e140242e 100644 --- a/share/man/man4/u2f.4 +++ b/share/man/man4/u2f.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: ISC +.\" .\" $OpenBSD: fido.4,v 1.4 2020/08/21 19:02:46 mglocker Exp $ .\" .\" Copyright (c) 2019 Reyk Floeter @@ -20,21 +23,17 @@ .Os .Sh NAME .Nm u2f -.Nd FIDO/U2F security keys +.Nd FIDO/U2F USB security keys .Sh SYNOPSIS -To compile this driver into the kernel, -place the following line in your -kernel configuration file: -.Bd -ragged -offset indent .Cd "device u2f" -.Ed .Pp -Alternatively, to load the driver as a -module at boot time, place the following line in +In .Xr loader.conf 5 : -.Bd -literal -offset indent -u2f_load="YES" -.Ed +.Cd u2f_load="YES" +.Pp +In +.Xr sysctl.conf 5 : +.Cd hw.hid.u2f.debug .Sh DESCRIPTION The .Nm @@ -53,6 +52,10 @@ operations of the generic device but only accepts the optional HID .Xr ioctl 2 calls from u2f group users. +.Sh HARDWARE +The +.Nm +driver supports FIDO/U2F-compatible USB security keys. .Sh SYSCTL VARIABLES The following variables are available as both .Xr sysctl 8 From nobody Tue Aug 19 13:11:55 2025 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 4c5qjl5tPBz64tQR; Tue, 19 Aug 2025 13:11:55 +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 4c5qjl55J3z3PMj; Tue, 19 Aug 2025 13:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755609115; 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=dgUvrqEq2cS4Vm9T9RQ8X3fr4Q7N/G0W7ACP0QgLpnU=; b=TYq2kjlcV1rwx6Rhj/1sZWzkClAnckcZ1lr3tOk00P5yn0JcHSVwD/gtAVkMn/Jk6p6u9F cz955m296PyrAWOeYl35M6djj2QAEs7EMwgvJlERRTDAA/CH+IIYdWezOe4X3cEB+7GI7a SyC4GIPy2sE/19/ZtdzJcJRl1HMTtolzIUf6Mx/I1BXJuDbn/I/kuqkSnKx4wKRYqfNyZ1 MJLkLT1fCWj3hoQHRIaiXM0xah3UEf6vbm2EhwlXWcDVVGuPJeAjqbEZhNmN8+RQnX2Lwq AgbJsKqgVCa6Ly4Jg9DIcW7zflDmDNlGmnSqU5XO24eYlagUqrEEM1m1GnLYwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755609115; 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=dgUvrqEq2cS4Vm9T9RQ8X3fr4Q7N/G0W7ACP0QgLpnU=; b=FdbFRP5u85J2/9IGpDffjF/Zl96AE4x0qbKZzbqzlLQG3u6zHrlcHtcBl3eIV9yx/KZULF gHI3aOR6huHeWT5bCwwujmUC8m5R9cb5Cq+AeFlPYIwkaOASgdSePmbCkXQktr+2Qz03az 9AjExh61YWSdEKlPXSHxkY5EZp/sR7BcAxp0ZZKkVFMhN59BeewwbD/C6vlFPLw/5/4QXe d9lnsTnlrcRXJ6buyGPaHfMDFoZix0bC8IKR/dj63Ap8UuDtYpAkP9dEFeGXVvkIrlZVpO 0lFYMnQzD8BeothMctxEJFCZRsIznJF0SyG527meTl877fx8rQZl+H9CptV+gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755609115; a=rsa-sha256; cv=none; b=SOuvZ5v+6F6UfEJ+BsBeexKSnEStqOQJn171vHhXkPF/OG9OMO1IzIFRz7BbAjCitbSx6M dVorf/okZHsTPq1X7BV+JDdVV4kZDXZ6HUvcfCytgEVHQe/AlePvt3jBhzcsh9VmS+BX6j 2gz5MpIMBYbxY5X1A5akbcyIAADgAP4IBmLgyN6KsbOr/3+IZ55o3PRYeZyMdTuEyokwE7 kQtmGfz5XgMgtbjONOtR3sTsa7mDFyezbmj82tqOQv62tEPZP5xEmxmdhnkht7ESskOK9B 2r+lukYZvC56G/hhB5TudkLjVThYBluMLKMd0W9597KwgbEAEMKUW7oe3qO7NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5qjl4MNYzCpn; Tue, 19 Aug 2025 13:11:55 +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 57JDBtkF021463; Tue, 19 Aug 2025 13:11:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JDBt7r021460; Tue, 19 Aug 2025 13:11:55 GMT (envelope-from git) Date: Tue, 19 Aug 2025 13:11:55 GMT Message-Id: <202508191311.57JDBt7r021460@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Krzysztof Galazka Subject: git: 6f41c1fc39d9 - main - ixl(4): Fix queue MSI and legacy IRQ rearming 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: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f41c1fc39d9fa9db989a7b4f325c3ab85b8fb45 Auto-Submitted: auto-generated The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=6f41c1fc39d9fa9db989a7b4f325c3ab85b8fb45 commit 6f41c1fc39d9fa9db989a7b4f325c3ab85b8fb45 Author: Krzysztof Galazka AuthorDate: 2025-08-19 12:50:33 +0000 Commit: Krzysztof Galazka CommitDate: 2025-08-19 13:11:32 +0000 ixl(4): Fix queue MSI and legacy IRQ rearming When MSI or legacy interrupt is used driver controls wheter queues can trigger an interrupt with the Interrupt Linked List. While processing traffic first index of the list is set to EOL value to stop queues from triggering interrupts. This index was not reset to the correct value when driver attempted to re-enable interrupts from queues, what prevented driver from processing any traffic. Fix that by setting correct first index in the ixl_if_enable_intr function. While at that fix the comments style and make ixl_if_enable_intr and ixl_if_disable_intr more consistent. Signed-off-by: Krzysztof Galazka PR: 288077 Suggested by: Mike Belanger Approved by: kbowling (mentor), erj (mentor) Tested by: gowtham.kumar.ks_intel.com, Sponsored by: Intel Corporation MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51331 --- sys/dev/ixl/if_ixl.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/sys/dev/ixl/if_ixl.c b/sys/dev/ixl/if_ixl.c index 60e66aeaf579..43c3af056b67 100644 --- a/sys/dev/ixl/if_ixl.c +++ b/sys/dev/ixl/if_ixl.c @@ -1151,13 +1151,20 @@ ixl_if_enable_intr(if_ctx_t ctx) struct ixl_pf *pf = iflib_get_softc(ctx); struct ixl_vsi *vsi = &pf->vsi; struct i40e_hw *hw = vsi->hw; - struct ixl_rx_queue *que = vsi->rx_queues; + struct ixl_rx_queue *rx_que = vsi->rx_queues; ixl_enable_intr0(hw); /* Enable queue interrupts */ - for (int i = 0; i < vsi->num_rx_queues; i++, que++) - /* TODO: Queue index parameter is probably wrong */ - ixl_enable_queue(hw, que->rxr.me); + if (vsi->shared->isc_intr == IFLIB_INTR_MSIX) { + for (int i = 0; i < vsi->num_rx_queues; i++, rx_que++) + ixl_enable_queue(hw, rx_que->rxr.me); + } else { + /* + * Set PFINT_LNKLST0 FIRSTQ_INDX to 0x0 to enable + * triggering interrupts by queues. + */ + wr32(hw, I40E_PFINT_LNKLST0, 0x0); + } } /* @@ -1175,11 +1182,13 @@ ixl_if_disable_intr(if_ctx_t ctx) if (vsi->shared->isc_intr == IFLIB_INTR_MSIX) { for (int i = 0; i < vsi->num_rx_queues; i++, rx_que++) - ixl_disable_queue(hw, rx_que->msix - 1); + ixl_disable_queue(hw, rx_que->rxr.me); } else { - // Set PFINT_LNKLST0 FIRSTQ_INDX to 0x7FF - // stops queues from triggering interrupts - wr32(hw, I40E_PFINT_LNKLST0, 0x7FF); + /* + * Set PFINT_LNKLST0 FIRSTQ_INDX to End of List (0x7FF) + * to stop queues from triggering interrupts. + */ + wr32(hw, I40E_PFINT_LNKLST0, IXL_QUEUE_EOL); } } From nobody Tue Aug 19 13:20:46 2025 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 4c5qvy5pGQz64tZH; Tue, 19 Aug 2025 13:20:46 +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 4c5qvy50ZXz3S12; Tue, 19 Aug 2025 13:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755609646; 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=uuSuzJTw0gZSOSjcYuuHuOMmr9NCyUZvC4L3SMSrZ5Q=; b=p156QDZa4Q5/DsYQxMTiZhch7p2GJHBNoncDz0EWuYdgASWBYcx3FgmAETt4BVBa8kOp0m 9CtRGuJqvb3lHTa9L5KxrHU3v4OP1I/OVmTLUPrc5jrW/BuDqCIJs/2crpB2lh7xFmawnx ZxPc/J9bfnah1n1IwAyjdsxVeHAS6H5NuWHaVUbh2hbf0sQC0vTI4ya66o4u7x51pkeVT9 FD5StS9HC+GkTY5fQGHOIC/Wz1RSYKu8oSV+hbSO42RNYbqMqFgFJS+EpfyYbfndCJAdyw RrMNkQQJbZuDX3dU8Vg9fOVk3HXuxR8XXOBd53PzV8DrIGGL71SNLizyu1aVnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755609646; 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=uuSuzJTw0gZSOSjcYuuHuOMmr9NCyUZvC4L3SMSrZ5Q=; b=qFU6UDBezu4xQwFrvPG/rUsxmzS/tyaWaJVmjyuZxBpuBNTGmqYjJ723LszBkdx3U5baJn ZIOUXaeN+Z0NzX4IRPQu3gHLyE1EChtPA2GGqW93pq9nPiW7wlVMfIJ/JWVKvGQ1WyZNWc Uz3l/5kmQEOe3i3gjI4ZHwz+Zb1650RBpCIMBFFSzpr3+p8NuVP7BFp4WMgkRpSWOqiPqe I5mmMlZi/EjmUX2LSh4dB3SFebM/njblFPe/IS8FQxVAcx4+gFjlm4d26BecYAle59FJHc BhNeA9relrerPd6DYRxUqDJIDYD///4ybAC0ExWAm9wOIlmCWmtB5PRSTHvRxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755609646; a=rsa-sha256; cv=none; b=wcJZmA6IurgAsu+crB+fFoaCSFwVCzkGailq7slwPmJhnNLUtb+vHHgxl47rurUlDuW+BY /IVGxbdbnr45NXYBm8U7Ze58WWgH7ml9+A9zSY+IWZyB3eDboYckrKUH62XvdO2/+CAyWU sZSYn7WKT7DP73EdJhnWSnbHngVfbD+SxQY6K4GMM423nSdAdgEL1he4e5ab3gFgwheL26 vBKY0CM5Qw4uGzDnGLHUfZjnm2jPfTUulwalUgF9N7qJva5K/kzv+VKz95qkTOJibFdPG6 jahD8FqtICNRNuvnZQtCbe0WvNqAw804sHfpP1U5+j4MR2LUAsLXMruJg9mTLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5qvy4b6QzD0m; Tue, 19 Aug 2025 13:20:46 +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 57JDKkA2035858; Tue, 19 Aug 2025 13:20:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JDKkFi035855; Tue, 19 Aug 2025 13:20:46 GMT (envelope-from git) Date: Tue, 19 Aug 2025 13:20:46 GMT Message-Id: <202508191320.57JDKkFi035855@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: 5105e1ebecc7 - main - krb5: Fix the installed compile_et 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: 5105e1ebecc784dcf8101ec6f3c79b27c43b004b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5105e1ebecc784dcf8101ec6f3c79b27c43b004b commit 5105e1ebecc784dcf8101ec6f3c79b27c43b004b Author: Mark Johnston AuthorDate: 2025-08-19 13:02:00 +0000 Commit: Mark Johnston CommitDate: 2025-08-19 13:20:16 +0000 krb5: Fix the installed compile_et We now build compile_et from krb5/util/compile_et. The compile_et make target runs compile_et.sh through a preprocessor that does some substitution on the script, in particular it defines the directory where compile_et can find et_h.awk and et_c.awk. We build compile_et as a bootstrap tool since it's used to build krb5. It also gets installed by installworld, presumably because we did that with Heimdal Kerberos too and there's some chance that third-party projects are using it. There are two problems, both fixed by this patch: First, we don't actually install those awk scripts anywhere, so /usr/sbin/compile_et isn't usable on an installed system. Let's simply install them to /usr/share/et, which is where upstream puts them. Second, compile_et is a bootstrap tool and gets installed into WORLDTMP during the bootstrap phase of the build. At that point we preprocess it to set the directory where it can find those awk scripts. That directory is currently set with `KRB5_ETDIR?= ${DESTDIR}/usr/share/et`, but DESTDIR points into the object directory, so this value is bogus. Since all build-time invocations of compile_et explicitly specify the script directory with the -d option, let's just update the path to point to the installed script directory. In particular, avoid fixing DESTDIR in the script, since we don't do that generally. PR: 288929 Reviewed by: ivy, cy Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D52004 --- etc/mtree/BSD.usr.dist | 2 ++ krb5/Makefile.inc | 2 +- krb5/util/et/Makefile | 9 ++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 68977a6b8282..ffdd82ae9911 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -267,6 +267,8 @@ .. dtrace .. + et + .. examples BSD_daemon .. diff --git a/krb5/Makefile.inc b/krb5/Makefile.inc index cd54f7a0eff6..6db4e8d964aa 100644 --- a/krb5/Makefile.inc +++ b/krb5/Makefile.inc @@ -14,7 +14,7 @@ KRB5_VERSION= 1.22-final # MIT KRB5 uses KRB5_DIR. Heimdal uses KRB5DIR. KRB5_SRCTOP= ${SRCTOP}/krb5 KRB5_DIR= ${SRCTOP}/crypto/krb5/src -KRB5_ETDIR?= ${DESTDIR}/usr/share/et +KRB5_ETDIR?= /usr/share/et KRB5_SRCLIBDIR= ${KRB5_DIR}/lib KRB5_OBJTOP= ${OBJTOP}/krb5 diff --git a/krb5/util/et/Makefile b/krb5/util/et/Makefile index 6eceb253c3b0..0d474efa1e8e 100644 --- a/krb5/util/et/Makefile +++ b/krb5/util/et/Makefile @@ -20,7 +20,6 @@ INCSDIR=${INCLUDEDIR} LIBADD= krb5support VERSION_MAP= ${.CURDIR}/version.map - SRCS= com_err.c \ error_message.c \ et_name.c \ @@ -38,6 +37,14 @@ CFLAGS+=-I${KRB5_DIR}/util/et \ -I${.CURDIR:H:H}/include \ -I${.OBJDIR} +FILESGROUPS= ETSCRIPTS + +ETSCRIPTS= et_c.awk \ + et_h.awk + +ETSCRIPTSDIR= ${KRB5_ETDIR} +ETSCRIPTSMODE= 0444 + .include .SUFFIXES: .h .c .et .ct .man .3 From nobody Tue Aug 19 13:20:47 2025 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 4c5qw01BKYz64tlW; Tue, 19 Aug 2025 13:20:48 +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 4c5qvz6CmWz3S3J; Tue, 19 Aug 2025 13:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755609647; 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=OAvfJB0Rd0AVhSrHbrYwBOHTbtwS1Mok0ZL++jgiZNI=; b=a9ttOODXKYps71R6vcmOmStdQS5nTbZwRLIjqRtrdIqqlahjbJLqu6ZmhD1JcfE19s1Z/+ e/QLFlSCUUZjshWeg12rC6FmoYWM0zUEeQ74ZrIZs+rBXUb6EkuV7wUc859SKluhBcoO6u 3F/+RJ1YcFILvRozuq/ZamfM9aI278RMFXwxK7n3X3Mr/vtLyDrmQmNIpruNhYyBp/H5Mn yuEwswqKOrYK7R0GVmSYt4lrDUGPXW0BzyKuA7Y+HJOb1wc/scrghmxjd+/q4QkHNnipTy OroqhEoRypydL5aLwEBrDG9B3PAErX/3mWqOqLkTIcbyvIWa73cwyNjRrlv9tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755609647; 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=OAvfJB0Rd0AVhSrHbrYwBOHTbtwS1Mok0ZL++jgiZNI=; b=Ad+K+K6LSFTxqRIdcwhMa2G70E/iYm/4omgg4/9LPrK4hgYvijQoOFrqA8/YDTPl+WRM3h rbD/fh+yEXhAKoW9ReAAqFT2GxbkdN/2MLgUUCEeCp+OoGIh+xS6WYvEWlV5xGN9E2rFDz 7NFJE1Z08paUT0hI7dzf0wY6ZWJZrcECGBJ/o9/9rBajZcsrFKMxhQg9WMCMV2SvGiPNrk 7rbrWffefLbXITXeD1EbGGTmJBJevSar8cZppFQ4z7Pb5JXgNT6ZvZdPeo45GpHGdoiDpJ dZpUiBjHirdcey9Dg8CG0a7QHgHtAe+SGv6iMpdZcLjLaa2lrg2JXAyfn9Oyhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755609647; a=rsa-sha256; cv=none; b=U+QMycHxDgM+ylOGzQ7DtZbHMvp5iGKk+FGlOAZgY+bfOXeqIOb52ixNsIK83pN/AcTm/o f7n769ld7SZSUuJExrk//+CdtsdL6axO2+e4QJDRxEmnhANJ9prwliTYSWRqnlkeHATHwS UC6jyKBjczs6QsWJXPzBEbvZ0dquierHxXPaJt55I+9T3hHB5pT8+UvIcrITzvwRy1aZ7d UVKdaFRQKTVUWAEZPyMzociIWpkPC5w9NwV8KdbqpcoW0Bzwwo+Zcn24VQpai6x3vFf3vj rsYqU3q96+kL8HmW+RQi7IL++dNLA8X/hVq2qRP76akN7RcH1CbAnA9rjaNeQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5qvz5Vj3zCc5; Tue, 19 Aug 2025 13:20:47 +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 57JDKlF4035897; Tue, 19 Aug 2025 13:20:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JDKllh035894; Tue, 19 Aug 2025 13:20:47 GMT (envelope-from git) Date: Tue, 19 Aug 2025 13:20:47 GMT Message-Id: <202508191320.57JDKllh035894@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: b9b0e105c357 - main - krb5: Remove some stray FreeBSD version tags 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: b9b0e105c35761a992891f48cabfa0d595898c3f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b9b0e105c35761a992891f48cabfa0d595898c3f commit b9b0e105c35761a992891f48cabfa0d595898c3f Author: Mark Johnston AuthorDate: 2025-08-19 13:02:36 +0000 Commit: Mark Johnston CommitDate: 2025-08-19 13:20:21 +0000 krb5: Remove some stray FreeBSD version tags --- krb5/libexec/Makefile | 2 -- krb5/usr.sbin/Makefile | 2 -- 2 files changed, 4 deletions(-) diff --git a/krb5/libexec/Makefile b/krb5/libexec/Makefile index 7658ed8f19ef..38199ed09aa9 100644 --- a/krb5/libexec/Makefile +++ b/krb5/libexec/Makefile @@ -7,8 +7,6 @@ # under sponsorship from the FreeBSD Foundation. # -#DIR $FreeBSD$ - SUBDIR= kdc kadmind kpropd kprop kproplog SUBDIR_PARALLEL= diff --git a/krb5/usr.sbin/Makefile b/krb5/usr.sbin/Makefile index 63a8e2978c3f..84e4a4dac99a 100644 --- a/krb5/usr.sbin/Makefile +++ b/krb5/usr.sbin/Makefile @@ -7,8 +7,6 @@ # under sponsorship from the FreeBSD Foundation. # -# $FreeBSD$ - SUBDIR= kadmin.local kdb5_util sim_server gss-server SUBDIR_PARALLEL= From nobody Tue Aug 19 13:54:25 2025 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 4c5rg00w8lz64x3T; Tue, 19 Aug 2025 13:54:36 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) (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 4c5rfy5dLkz3WbS; Tue, 19 Aug 2025 13:54:34 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=VCV0yEkd; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::72c as permitted sender) smtp.mailfrom=markjdb@gmail.com Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-7e864c4615aso627524585a.1; Tue, 19 Aug 2025 06:54:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755611669; x=1756216469; 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=iUWEhaC1YQa7nyPWFln1MITyhW+QboQhr/Ufhh/arlU=; b=VCV0yEkdtYiTrunBOn/DhYTinpAwtOnXUsCMkDQxer7JyzbQT7Rfcn9emxI7WQbdqy ogj5L0e9/HzEfjyq6FGgR12naveQkeAEV6uwpEh4T+u3oJmFWv9usWbeTcKVdH9WtKLf +mLr27I9C5zts0cXjmVc5WhWjZ4V3SDSkwzY5wN4eP5xQk0RjFa66fXKEJBROG+G2r0d 8m+GRoJfDI1vxRKEdu2A0BwpKAlOwocYylcwAVX1//5fYyJBI65xoI/8vVO4qMRyWrgW 18u2SShNscWw9vQb23W+FLI9QiHQ06BrZaH44MxNXdqtTVlB4dFN3/R8oGY2szp1cs2d 24Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755611669; x=1756216469; 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=iUWEhaC1YQa7nyPWFln1MITyhW+QboQhr/Ufhh/arlU=; b=IvqJane6sMOqI9fZwQqmAJ8diRpYC5yQNGCuRWkdD3RHgpQoqhLUFzcVd78C5l4YDW XQpEGBDqZwh79XrBieASHpKji0pACyEE5fEDSrDzGghNK67Yda9i5YJyuZP70Ks/16Up GrzPUp6JkRY1TiVzkPJrESPTQz9UCt44yKmszUDzcOkYrUFS3ymfrz09BH7Jn/kGBUxL zoJj0R31CkHpZ4q5tvEt6nhYJGG1ouHM2WAdWmIoU9l7Ola8VhBcKxbagDtRsnq9GMn7 qhb7lEzKRyP7azDT2r7qRrOojjI1ZjegZbRFwPeMtR7mNAThcp9XSL1lWRZmb5Vh7gN+ GIxQ== X-Forwarded-Encrypted: i=1; AJvYcCWps753jwKSfypmpnU133Ejh5bULsuH5/UtTlqmzW8ouJP04i5IY2QT8+sp6a+YKDb6oXWkSupFtSMlrJXnez2C27ZMfTk=@freebsd.org, AJvYcCXhoDNi0oU86rH+o6TRW7u8wOKcF5bDpGiI8EQD1PXEH8Xr2dhadlM2d//oC82l4z/losEE6FO0TBvyFN709i6EjzYC@freebsd.org X-Gm-Message-State: AOJu0YzViYiSxvjonK4ZQVl1pa3coX40VFGnQ+rCbvgXVcfB15r5l87Z PWbd9RtltWplxmOPf7Ty6wgbZwYKDQrrc3jzZ1BI5j/qmqjZ28F4J2jiRAUdlzlw X-Gm-Gg: ASbGnctHy/EBkmhpoEtl1X5Z7NvaL44sPlxGerR6EZ2BZf1oECRY2QCbug/hPvJUEO9 ebSqBLRPAqWptO/nfBYr4ui/jPiA+klPhK3v/1rtwfTJwvQGe0B7nnpyrtQSOmljpdGZIF3nTyt y7YO+SogHE5u2G6QmQQTEmMJTPtoOG4dMH5ncBpef/arUGJfDRATY7aQFPFvHlhNnlCVwTdjFod 850dWBkbCLm+fKcu+7Hs0BsUIlXHeHfXCjfK6qClY1Buz7ban09CAHE4sdngR/QehtGZLm3cQwo Y0vbK40C0lJHbaZDEEcXRvFDPScWAYdtyqXAEGYED2Vf9engpmptN8kHjqLbgt3FytgaGjGlB27 a7fFTx6kFzLroB8YdCIaLO+t3alRUMLTNLMn6 X-Google-Smtp-Source: AGHT+IH4xBzPaqdNUX6OY4vXuAXIpg5lcLg1qqa4QD3ebYGxiFkfTd11LBVlsU1ADpYXdaXFhoWhDw== X-Received: by 2002:a05:620a:708e:b0:7e7:f2a2:251 with SMTP id af79cd13be357-7e9f4b7d38cmr219678685a.27.1755611668617; Tue, 19 Aug 2025 06:54:28 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7e87e1c10f2sm765634085a.59.2025.08.19.06.54.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Aug 2025 06:54:27 -0700 (PDT) Date: Tue, 19 Aug 2025 09:54:25 -0400 From: Mark Johnston To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 00294d7b0a2e - main - bsdinstall: Guard against invalid branch/revision Message-ID: References: <202507251534.56PFY5PS085339@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: <202507251534.56PFY5PS085339@gitrepo.freebsd.org> X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.90)[-0.902]; MID_RHS_NOT_FQDN(0.50)[]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), DKIM not aligned (relaxed),none]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[gmail.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MISSING_XM_UA(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72c:from] X-Rspamd-Queue-Id: 4c5rfy5dLkz3WbS On Fri, Jul 25, 2025 at 03:34:05PM +0000, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=00294d7b0a2e3ae3e870333ef7c8ecbc9fa26da3 > > commit 00294d7b0a2e3ae3e870333ef7c8ecbc9fa26da3 > Author: Ed Maste > AuthorDate: 2025-07-25 14:56:22 +0000 > Commit: Ed Maste > CommitDate: 2025-07-25 15:33:56 +0000 > > bsdinstall: Guard against invalid branch/revision > > I somehow ended up with a tree where make -V BRANCH and make -V REVISION > were broken, resulting in a FreeBSD-base.conf with a broken repo URL. > Check for BRANCH == RELEASE explicitly and emit a warning if BRANCH does > not match an expected case. > > Reviewed by: Isaac Freund > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D51528 > --- > usr.sbin/bsdinstall/Makefile | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile > index 75db149b814b..e5bb3197fa05 100644 > --- a/usr.sbin/bsdinstall/Makefile > +++ b/usr.sbin/bsdinstall/Makefile > @@ -22,8 +22,11 @@ REVISION?= ${_REVISION} > > .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE > SUBURL= base_latest > -.else > +.elif ${BRANCH} == RELEASE > SUBURL= base_release_${REVISION:C/[0-9]+\.//} > +.else > +.warning Invalid branch "${BRANCH}" This warning gets tripped now that the branch is PRERELEASE. I guess we should still be using base_latest at this point? > +SUBURL= base_latest > .endif > > FreeBSD-base.conf: FreeBSD-base.conf.in From nobody Tue Aug 19 14:09:18 2025 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 4c5rzy3r1Tz64y1M; Tue, 19 Aug 2025 14:09:18 +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 4c5rzy3GDqz3YJZ; Tue, 19 Aug 2025 14:09:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755612558; 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=gF5N01K9+XhLYo1Mk7PMfSW3/kCR6hx3vHAPb48b1eQ=; b=fJP19OUREFDPPJPazTA8hT/eL4tTvVQQtM14ttJ9mtrUpS7caNjnhRaKVo6YHIkvppOG2+ Hvp15PBz3PH3W9r9tL5pJzllLaqdnHeE6Qa/VJnkn7KEri8jbIe/Oyl+OvQ6Un2U14ahxP JcnnY3Zd8M5uGVUCeUIxDU2mt+Sf+DwaLrAzpBgB6FIfpCz+wR/fQK3K4ksfB/UqziWR1W 5uWR2O2EHGQK6/3+UdL2XkYLlm5Nu3iZ6JiiLatzrDci0mTu0dhwNo5Ni/T+sy8iI0fY6t UK9UArnOHMoCkz8y+cVogw3AnprWy3UB1tTijkM5VzsqFL/1FRzfW9R/gPWQTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755612558; 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=gF5N01K9+XhLYo1Mk7PMfSW3/kCR6hx3vHAPb48b1eQ=; b=xwY21TobBe04vLhQctvPC9C6Sm4ucecpcSxdo0/KPPpgzLuxWZI2rhXSdbikV7AlAXKjvD cuVErfYaZQzC+hRfzWqz7tmMCmTysuSMHev5buZwp0dClGprStjq54CoVOdjW65Mpyfd7B VfKYSbb5KxdVsqb3WAX3DVRrILYJSFedHZPM7cQaQZPYkPic2DUvYfbLz8/U2RTRFC+VM7 9gEg2WsdGqF8yD/FRW5FjNP9aRbM/29IBpKFplsoE50rfXeW2tujM82dBAjbpXM1rAyAVf GK/aUU5uaZEGnTleH6E/aZZPxrji4SsOI0w7oxGrfNwo24+vxY64t017Cwe+GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755612558; a=rsa-sha256; cv=none; b=ev5pPusgTUlp7JW4YvpGP9leefDhRzMgIvx57/SjBQgyaCkVeY8E3nM0k48eaam+LGFE9y Dt/GI+VGbSVtNP7NKgtnOnr+72P3yXMID5P8ia8516+goOE6+P8nTuA1W/g+EJvNObHElL J9HOSGh4sOSWYWkSSoiyZvSzlthMVNSj/joLNjRVgglw7elfjtbZwLJt7WcZUGQYbK2rOJ /f689gKJlqqWXnTg11suA5/XH3iE5I65emwg8hbuZDacjajWSxDpLb4tZ1NRzsKkSOhCne EmS5kjNUz0T4SGTfRf81O04/z2ypHWIy43XsG/GJWPWOugtnyOZoHZfEz6xpDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5rzy2qjVzVV7; Tue, 19 Aug 2025 14:09:18 +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 57JE9ITu021799; Tue, 19 Aug 2025 14:09:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JE9Ild021796; Tue, 19 Aug 2025 14:09:18 GMT (envelope-from git) Date: Tue, 19 Aug 2025 14:09:18 GMT Message-Id: <202508191409.57JE9Ild021796@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: 3d4d778262e4 - main - random: Correct wording in a comment 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: 3d4d778262e459c9c80781a3474908d090ffb061 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3d4d778262e459c9c80781a3474908d090ffb061 commit 3d4d778262e459c9c80781a3474908d090ffb061 Author: Mark Johnston AuthorDate: 2025-08-19 14:04:57 +0000 Commit: Mark Johnston CommitDate: 2025-08-19 14:04:57 +0000 random: Correct wording in a comment In the calculation of the cutoff value, we haven't changed the window size itself, just the example formula, which takes the window size as a parameter. Reviewed by: cem Fixes: f92ff79720fb ("random: Add NIST SP 800-90B entropy source health test implementations") Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D52002 --- sys/dev/random/random_harvestq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index c7762967c4fb..ced15262457f 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -493,9 +493,9 @@ random_healthtest_init(enum random_entropy_source source) * The RCT limit comes from the formula in section 4.4.1. * * The APT cutoff is calculated using the formula in section 4.4.2 - * footnote 10 with the window size changed from 512 to 511, since the - * test as written counts the number of samples equal to the first - * sample in the window, and thus tests W-1 samples. + * footnote 10 with the number of Bernoulli trials changed from W to + * W-1, since the test as written counts the number of samples equal to + * the first sample in the window, and thus tests W-1 samples. */ ht->ht_rct_limit = 35; ht->ht_apt_cutoff = 330; From nobody Tue Aug 19 14:09:19 2025 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 4c5rzz4yBDz64yDD; Tue, 19 Aug 2025 14:09:19 +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 4c5rzz4V1jz3YX5; Tue, 19 Aug 2025 14:09:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755612559; 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=EiUKy0KnMM8Npb5quQTG3SZXMFA2AqUrjkZuFk92A34=; b=j/aFSf1ejwzk1swJlNPtXvFHWMBe7nFrml5WKrn4wJRyDxWyFP6vii1o2pAOMvr1CCU7iS 0hpGT415bSalmIw57Ts/btqo2sEwnwCRfPmHgedh5aDAuZHtAP1i7NKB6CX0FiPPJn8kKK tzZyliWCILnwEh9BeEpGFUCN6h5qOakSGwct5LHZ7kgBVvKogqAUvcn+nHxFDBgkvB3Bae qcpUsOqMhBnm5qIaDE4b7FBDZtUBJkeJDPwqNVnppADU8ePk7bj5pz6a9fA3blFNbBd90s xI6qkA1GSQB7D3Pq2BzQMRRa1KybDqYUbKXLzB+CDNG5tibcnX//7WINV1uzLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755612559; 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=EiUKy0KnMM8Npb5quQTG3SZXMFA2AqUrjkZuFk92A34=; b=VFAmFOuKvIlWZz0Ep+HrBybCdM27upJ+sZNWiyUYPU0TZonTbH+fqFZ6feG9M7wL2DG8uD HawsJHFKohvagqkHscGN3FUgDRdZfm8B9dc0SWGUUxFtcoNKi0xIuOt3ja13ayv5DWK0L/ 1nQn1fMjYDVRaLD/woMOnhhx0NtHiqYKqFeUelAspny1jHaDyBDZNkKAcbmu05pCdcivzo xgzUPujjUC2teb1k837z0WdNTKdWoz/46uw/KOpKY4c+qrcEqse4oRFBeu93d9cOuxuhbh cI9eBQLzad9L5EQVyCxO6VprOGA5iwi5vjLfIpdI7CF9ZnzFDMgP7VGr4ZMiMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755612559; a=rsa-sha256; cv=none; b=aWb8OLq04ANBZi+rrGl8IiG4UeXIef7QFbP4ez0FISb7bgSXiCijPQT14dSmuUvxGq/GDY 5QTWlLUaTYdTOflCGO6ls4TQ8DMWPG5oaMOKP86WfPOLV8WoJwLx7ATFcJd0XMPuX0P7DX 4AxdJBuin2bxVg3fA9yUUoXCg13EgkO5Ga2Hu/9alpwWhBv8/+1jdQmuy/Qtrf696GRnG+ 1w+lFvcwPpBaN34WgweIeOj7hRPGtsSK3o95N77UVaO1G9R7zsOs1u5g/4hec+MedsvYnK r93Be0CDzBoP9aZlGzxlHJOXIOwf35fRxWdXaXZrzSIx+I7FSxdtpt4tH9aeDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5rzz3mkbzVTl; Tue, 19 Aug 2025 14:09:19 +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 57JE9JSx021837; Tue, 19 Aug 2025 14:09:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JE9JlM021834; Tue, 19 Aug 2025 14:09:19 GMT (envelope-from git) Date: Tue, 19 Aug 2025 14:09:19 GMT Message-Id: <202508191409.57JE9JlM021834@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: d5f55356a2fb - main - random: Make random_source definitions const 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: d5f55356a2fbf8222fb236fe509821e12f1ea456 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d5f55356a2fbf8222fb236fe509821e12f1ea456 commit d5f55356a2fbf8222fb236fe509821e12f1ea456 Author: Mark Johnston AuthorDate: 2025-08-19 14:06:02 +0000 Commit: Mark Johnston CommitDate: 2025-08-19 14:06:02 +0000 random: Make random_source definitions const We can do so trivially, so make these tables read-only. No functional change intended. Reviewed by: cem, emaste MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D52003 --- sys/crypto/ccp/ccp.c | 2 +- sys/dev/psci/smccc_trng.c | 2 +- sys/dev/qcom_rnd/qcom_rnd.c | 2 +- sys/dev/random/armv8rng.c | 2 +- sys/dev/random/darn.c | 2 +- sys/dev/random/ivy.c | 2 +- sys/dev/random/nehemiah.c | 2 +- sys/dev/random/random_harvestq.c | 6 +++--- sys/dev/random/randomdev.h | 4 ++-- sys/dev/virtio/random/virtio_random.c | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/crypto/ccp/ccp.c b/sys/crypto/ccp/ccp.c index 7db9a27ab059..c3d40f6e99ac 100644 --- a/sys/crypto/ccp/ccp.c +++ b/sys/crypto/ccp/ccp.c @@ -79,7 +79,7 @@ static struct pciid { { 0x15df1022, "AMD CCP-5a" }, }; -static struct random_source random_ccp = { +static const struct random_source random_ccp = { .rs_ident = "AMD CCP TRNG", .rs_source = RANDOM_PURE_CCP, .rs_read = random_ccp_read, diff --git a/sys/dev/psci/smccc_trng.c b/sys/dev/psci/smccc_trng.c index ab98837d3841..8a2e5508ef48 100644 --- a/sys/dev/psci/smccc_trng.c +++ b/sys/dev/psci/smccc_trng.c @@ -58,7 +58,7 @@ static device_attach_t trng_attach; static unsigned trng_read(void *, unsigned); -static struct random_source random_trng = { +static const struct random_source random_trng = { .rs_ident = "Arm SMCCC TRNG", .rs_source = RANDOM_PURE_ARM_TRNG, .rs_read = trng_read, diff --git a/sys/dev/qcom_rnd/qcom_rnd.c b/sys/dev/qcom_rnd/qcom_rnd.c index fdd0b553523e..a5ece7e00f28 100644 --- a/sys/dev/qcom_rnd/qcom_rnd.c +++ b/sys/dev/qcom_rnd/qcom_rnd.c @@ -63,7 +63,7 @@ static int qcom_rnd_detach(device_t); static int qcom_rnd_harvest(struct qcom_rnd_softc *, void *, size_t *); static unsigned qcom_rnd_read(void *, unsigned); -static struct random_source random_qcom_rnd = { +static const struct random_source random_qcom_rnd = { .rs_ident = "Qualcomm Entropy Adapter", .rs_source = RANDOM_PURE_QUALCOMM, .rs_read = qcom_rnd_read, diff --git a/sys/dev/random/armv8rng.c b/sys/dev/random/armv8rng.c index 61698bfff820..524d80317681 100644 --- a/sys/dev/random/armv8rng.c +++ b/sys/dev/random/armv8rng.c @@ -44,7 +44,7 @@ static u_int random_rndr_read(void *, u_int); static bool has_rndr; -static struct random_source random_armv8_rndr = { +static const struct random_source random_armv8_rndr = { .rs_ident = "Armv8 rndr RNG", .rs_source = RANDOM_PURE_ARMV8, .rs_read = random_rndr_read, diff --git a/sys/dev/random/darn.c b/sys/dev/random/darn.c index a66754e095fb..9bb4991df82f 100644 --- a/sys/dev/random/darn.c +++ b/sys/dev/random/darn.c @@ -56,7 +56,7 @@ static u_int random_darn_read(void *, u_int); -static struct random_source random_darn = { +static const struct random_source random_darn = { .rs_ident = "PowerISA DARN random number generator", .rs_source = RANDOM_PURE_DARN, .rs_read = random_darn_read diff --git a/sys/dev/random/ivy.c b/sys/dev/random/ivy.c index 05474d977276..fa1e4831f1b9 100644 --- a/sys/dev/random/ivy.c +++ b/sys/dev/random/ivy.c @@ -51,7 +51,7 @@ static bool has_rdrand, has_rdseed; static u_int random_ivy_read(void *, u_int); -static struct random_source random_ivy = { +static const struct random_source random_ivy = { .rs_ident = "Intel Secure Key RNG", .rs_source = RANDOM_PURE_RDRAND, .rs_read = random_ivy_read diff --git a/sys/dev/random/nehemiah.c b/sys/dev/random/nehemiah.c index f76071290b8f..56f144169dae 100644 --- a/sys/dev/random/nehemiah.c +++ b/sys/dev/random/nehemiah.c @@ -44,7 +44,7 @@ static u_int random_nehemiah_read(void *, u_int); -static struct random_source random_nehemiah = { +static const struct random_source random_nehemiah = { .rs_ident = "VIA Nehemiah Padlock RNG", .rs_source = RANDOM_PURE_NEHEMIAH, .rs_read = random_nehemiah_read diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index ced15262457f..84ec174bd08e 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -110,7 +110,7 @@ __read_frequently u_int hc_source_mask; struct random_sources { CK_LIST_ENTRY(random_sources) rrs_entries; - struct random_source *rrs_source; + const struct random_source *rrs_source; }; static CK_LIST_HEAD(sources_head, random_sources) source_list = @@ -849,7 +849,7 @@ random_harvest_deregister_source(enum random_entropy_source source) } void -random_source_register(struct random_source *rsource) +random_source_register(const struct random_source *rsource) { struct random_sources *rrs; @@ -868,7 +868,7 @@ random_source_register(struct random_source *rsource) } void -random_source_deregister(struct random_source *rsource) +random_source_deregister(const struct random_source *rsource) { struct random_sources *rrs = NULL; diff --git a/sys/dev/random/randomdev.h b/sys/dev/random/randomdev.h index e1c9ac7b680d..6d742447ea8b 100644 --- a/sys/dev/random/randomdev.h +++ b/sys/dev/random/randomdev.h @@ -103,8 +103,8 @@ struct random_source { random_source_read_t *rs_read; }; -void random_source_register(struct random_source *); -void random_source_deregister(struct random_source *); +void random_source_register(const struct random_source *); +void random_source_deregister(const struct random_source *); #endif /* _KERNEL */ diff --git a/sys/dev/virtio/random/virtio_random.c b/sys/dev/virtio/random/virtio_random.c index f938ba99ae53..3f30c8b68f4c 100644 --- a/sys/dev/virtio/random/virtio_random.c +++ b/sys/dev/virtio/random/virtio_random.c @@ -77,7 +77,7 @@ static struct virtio_feature_desc vtrnd_feature_desc[] = { { 0, NULL } }; -static struct random_source random_vtrnd = { +static const struct random_source random_vtrnd = { .rs_ident = "VirtIO Entropy Adapter", .rs_source = RANDOM_PURE_VIRTIO, .rs_read = vtrnd_read, From nobody Tue Aug 19 14:42:16 2025 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 4c5sk12BXGz657WF; Tue, 19 Aug 2025 14:42:17 +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 4c5sk113jRz3dj3; Tue, 19 Aug 2025 14:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755614537; 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=sY7FMUvlMmD3oQTa2DgmU/9qB4a9Ggo+iEFqfObjBJY=; b=yUi+g7abEAjNvYP2pX23ULglUCzCzZxQInpHL+Bj/7lcZJbwxTi7FF2FuylahFudQUWgqb c2HfUk9GjjVAdsXW0SmTjGhnPQFzkpNn7RuGcvjQO1E5M881anBh2AUb8a3rm06B/hog/V qAcBWg6lv170DoLKbq115g5T7WMqqDEOtf8vEb2IKMfdUNZe4wahFd7zv0H/lY35BliUWZ nu+02bwT/sNFMsNV4L3/AYavVFk+ofBCm63N83vnNh8pDwS/AjZQcyFWZ/yNg8s48x2lZc MFt5ZwHw3vVugwmKdgCNmDHNwsV1h4+XFSbpJe4nzegBOGvWOIybzV5muJpYDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755614537; 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=sY7FMUvlMmD3oQTa2DgmU/9qB4a9Ggo+iEFqfObjBJY=; b=NsFr55zW4SC0M9zzUodEDdyPYMZkLcS3HoLq8tft9z4cnuRKE6XHdMrHSQQbvaZ9H0l4D+ fng1h7S/4JFAkcF+kvj7uy7y7acj32OvylbCIUFVXXdGKkBX739Dw2FXJKvq1bs7sOQCJs qwmsCVOHvvhE7cfDxnFCUelzBQ15xff/hlsHk/o2PVA2cEfWVwKm8lr74Qi/WdBWnDJsJe zD+HqWvLaP5AZ8RMN9tSpigurLIxrpZ3BEGKsQI5y1JGuStaVvQdpTtARKMWq9lzi9EeeQ Tr1Kl+wLshcmCgOCR/2J7br8/zilyEnxGXN7geHadAMppHUwBdWBoZfkLUoCOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755614537; a=rsa-sha256; cv=none; b=HVQF8zsxnYGKpAnkxSzLsrgeFx9k51c2B3K1SSo5i+iqczk++8F/SHCPAEtyIRqTyAZSt2 fqd0+07xdpUc5aZzSl5HzuSdivVxKVqf06Ae6q+f0f2GoBmwPHwBRHgmASCPMkF336H8uY dbkTboMhBJgyyGCj8w2PNvZysi7lakLIOJ2kRERX3Z3w7BA72k87onXM9MKa60teTVqO9j 7svgn1h6tAP/wno5CLBY9En+f30ZUby0Tozgm/ppvGgFjQ+xPTh1dansqLm71aUN2EPWss paIavx8sQ5NOdl1TsZysiwK0Qj2+feeA1PIg7gMWnnDaAYsFsU60ddjMycWNKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5sk10ZYwzWnt; Tue, 19 Aug 2025 14:42:17 +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 57JEgGRm094572; Tue, 19 Aug 2025 14:42:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JEgGZT094569; Tue, 19 Aug 2025 14:42:16 GMT (envelope-from git) Date: Tue, 19 Aug 2025 14:42:16 GMT Message-Id: <202508191442.57JEgGZT094569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: f96110babbe1 - main - krb5: Fix MIT KRB5 Bug #9181 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f96110babbe16a2a475b0bb954a50aa374f8aae5 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=f96110babbe16a2a475b0bb954a50aa374f8aae5 commit f96110babbe16a2a475b0bb954a50aa374f8aae5 Author: Cy Schubert AuthorDate: 2025-08-17 08:05:42 +0000 Commit: Cy Schubert CommitDate: 2025-08-19 14:41:12 +0000 krb5: Fix MIT KRB5 Bug #9181 According to https://krbdev.mit.edu/rt/Ticket/Display.html?id=9181, The function verify_mic_v3() in src/lib/gssapi/krb5/verify_mic.c calls kg_verify_checksum_v3() as it returns an OM_uint32 status but kg_verify_checksum_v3() returns a krb5_boolean which has the opposite interpretation: - OM_uint32 0 is GSS_S_COMPLETE so no error - krb5_boolean 0 is false so failure This patch will be in MIT KRB5 1.22.1. Obtained from: Greg Hudson on krbdev.mit.edu ML. Reviewed by: ivy, ngie Differential review: https://reviews.freebsd.org/D51990 --- crypto/krb5/src/lib/gssapi/krb5/util_crypt.c | 10 +++++++--- crypto/krb5/src/lib/gssapi/krb5/verify_mic.c | 11 ++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/crypto/krb5/src/lib/gssapi/krb5/util_crypt.c b/crypto/krb5/src/lib/gssapi/krb5/util_crypt.c index 28411429bf6e..386842e8a6e3 100644 --- a/crypto/krb5/src/lib/gssapi/krb5/util_crypt.c +++ b/crypto/krb5/src/lib/gssapi/krb5/util_crypt.c @@ -322,12 +322,16 @@ kg_verify_checksum_v3(krb5_context context, krb5_key key, krb5_keyusage usage, uint8_t ckhdr[16]; krb5_boolean valid; - /* Compose an RFC 4121 token header with EC and RRC set to 0. */ + /* + * Compose an RFC 4121 token header for the checksum. For a wrap token, + * the EC and RRC fields have the value 0 for the checksum operation, + * regardless of their values in the actual token (RFC 4121 section 4.2.4). + * For a MIC token, the corresponding four bytes have the value 0xFF. + */ store_16_be(toktype, ckhdr); ckhdr[2] = flags; ckhdr[3] = 0xFF; - store_16_be(0, ckhdr + 4); - store_16_be(0, ckhdr + 6); + store_32_be((toktype == KG2_TOK_MIC_MSG) ? 0xFFFFFFFF : 0, ckhdr + 4); store_64_be(seqnum, ckhdr + 8); /* Verify the checksum over the data and composed header. */ diff --git a/crypto/krb5/src/lib/gssapi/krb5/verify_mic.c b/crypto/krb5/src/lib/gssapi/krb5/verify_mic.c index 9852f49912a9..1c11d2016fca 100644 --- a/crypto/krb5/src/lib/gssapi/krb5/verify_mic.c +++ b/crypto/krb5/src/lib/gssapi/krb5/verify_mic.c @@ -90,7 +90,6 @@ verify_mic_v3(krb5_context context, OM_uint32 *minor_status, krb5_gss_ctx_id_rec *ctx, struct k5input *in, gss_buffer_t message) { - OM_uint32 status; krb5_keyusage usage; krb5_key key; krb5_cksumtype cksumtype; @@ -124,12 +123,10 @@ verify_mic_v3(krb5_context context, OM_uint32 *minor_status, } assert(key != NULL); - status = kg_verify_checksum_v3(context, key, usage, cksumtype, - KG2_TOK_MIC_MSG, flags, seqnum, - message->value, message->length, - in->ptr, in->len); - if (status != GSS_S_COMPLETE) - return status; + if (!kg_verify_checksum_v3(context, key, usage, cksumtype, KG2_TOK_MIC_MSG, + flags, seqnum, message->value, message->length, + in->ptr, in->len)) + return GSS_S_BAD_SIG; return g_seqstate_check(ctx->seqstate, seqnum); } From nobody Tue Aug 19 15:12:00 2025 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 4c5tNJ24P5z65922; Tue, 19 Aug 2025 15:12:00 +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 4c5tNJ1sByz3gPq; Tue, 19 Aug 2025 15:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755616320; 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=9pUBOmxapdVCRs/w7cie5i6LIDJ5HIA7MC0goV5ueJQ=; b=Du9oKaNlB3DQG2iz6n3u3XpktZC4kACNNAJI6WDy6s0gS4uDVCRPUlKlII27Yi6wbGJcZL Yxa4E0/dl5dWpIE46dfyif7iuiROmG9r3kQuzi5TpZmahF/j92cMGNLWqRqu5Q8iDz6azC cY9yMRYjNj++pPcGlI4MSLFLFOH7ME2DLtG1kWABpnoovyEzcvdJLMuEMcIr/L0tFvCYrI 6+b8PmNel9iFTBwmYfKw+zV2Y4JsXOhbSJLFy3nee3ctmPaUhfT9dIw7nS/Ou3JHpWT9It 06DYzWpG0RoRjqN7VS++lSS/bVeTT6QoAZkxmvgGdaOtz+uajhiWelbROElc2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755616320; 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=9pUBOmxapdVCRs/w7cie5i6LIDJ5HIA7MC0goV5ueJQ=; b=OkO6DPUm5Ui1e4O6dF5n4ptdjB8epyumq+dHoAmK2IjGPz+FhsA1hryPf+fZ+ecQa4+RSV JCPUqTULZUHxd/JQMftDVzw4bcuHbpw26ImBvxAE01zTZ3yLIxF5FSUVBp6y5CZ3kw3lDf yOo/qkFt6o60ePDpCLprbCGJe+SW3fIfyaeauk7Iq+kDE65XmaIKl3xAp5V/JgAOmAK95G bnIlr+S9zqjYOtXseAWRGWRGRaruTw4mMU3vYmMcBc4J5E7v+QWpm/sBdE/iEOZkNXzzvp yZA0SLbYgK2Te428XxUUjXfKQjLGjqFDSSzsVpfiJYvl7DJGpDg131qqlY07hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755616320; a=rsa-sha256; cv=none; b=PmANf2PA9v8krcibrqD3IY4j3JA1JLt9WJBKkp4NCSHXaaTLsxWgsxcFtW0l1PtZ/iyRNN vNuHPZGtTeYmWu5LNP57VA9GP1ez0/o2skIzl+2VJbwtQREOuo7XXD8dUoLZCNNX5EueNW F6ID10ZzC/jA9p4+lkqolDanEjE9uMa3whArFCctjgbqglVjCgFXwlxffzKAv17d4uFfIj iT7eDsAkCMXcRpjDBPMNAO7wCS6Dc86zNZOHv2VSDwSl4C4RQowmehadSKzjFbUz2LWN4Y TWc4p1ZExNM39LWKGrwup98gvt/eUV+WqdAlH1/7qNmE5koYW0iffVkvyxAjIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5tNJ1R6KzXST; Tue, 19 Aug 2025 15:12:00 +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 57JFC0Jx049903; Tue, 19 Aug 2025 15:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JFC0U7049897; Tue, 19 Aug 2025 15:12:00 GMT (envelope-from git) Date: Tue, 19 Aug 2025 15:12:00 GMT Message-Id: <202508191512.57JFC0U7049897@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Krzysztof Galazka Subject: git: dea5f973d0c8 - main - ix/ixv: Add support for new Intel Ethernet E610 family devices 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: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dea5f973d0c8d29a79b433283d0a2de8f4615957 Auto-Submitted: auto-generated The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=dea5f973d0c8d29a79b433283d0a2de8f4615957 commit dea5f973d0c8d29a79b433283d0a2de8f4615957 Author: Bhosale, Yogeshnull AuthorDate: 2025-08-19 14:19:07 +0000 Commit: Krzysztof Galazka CommitDate: 2025-08-19 15:09:33 +0000 ix/ixv: Add support for new Intel Ethernet E610 family devices This is part 1 of the support for the new Intel Ethernet E610 family of devices. Introduce new PCI device IDs: • 57AE: Intel(R) E610 (Backplane) • 57AF: Intel(R) E610 (SFP) • 57B0: Intel(R) E610 (10 GbE) • 57B1: Intel(R) E610 (2.5 GbE) • 57B2: Intel(R) E610 (SGMII) Key updates for E610 family: • Firmware manages Link and PHY • Implement new CSR-based Admin Command Interface (ACI) for SW-FW interaction • Tested exclusively for x64 operating systems on E610-XT2/XT4 (10G) and E610-IT4 (2.5G) • Enable link speeds above 1G: 2.5G, 5G and 10G • NVM Recovery Mode and Rollback support Signed-off-by: Yogesh Bhosale yogesh.bhosale@intel.com Co-developed-by: Krzysztof Galazka krzysztof.galazka@intel.com Approved by: kbowling (mentor), erj (mentor) Tested by: gowtham.kumar.ks_intel.com Sponsored by: Intel Corporation MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50067 --- sys/conf/files | 2 + sys/dev/ixgbe/if_ix.c | 231 +- sys/dev/ixgbe/if_ixv.c | 6 + sys/dev/ixgbe/ixgbe.h | 11 + sys/dev/ixgbe/ixgbe_api.c | 16 + sys/dev/ixgbe/ixgbe_api.h | 1 + sys/dev/ixgbe/ixgbe_common.c | 25 +- sys/dev/ixgbe/ixgbe_e610.c | 5567 +++++++++++++++++++++++++++++++++++++++ sys/dev/ixgbe/ixgbe_e610.h | 224 ++ sys/dev/ixgbe/ixgbe_osdep.c | 26 + sys/dev/ixgbe/ixgbe_osdep.h | 31 + sys/dev/ixgbe/ixgbe_type.h | 69 +- sys/dev/ixgbe/ixgbe_type_e610.h | 2278 ++++++++++++++++ sys/dev/ixgbe/ixgbe_vf.c | 3 +- sys/modules/ix/Makefile | 2 +- sys/modules/ixv/Makefile | 2 +- 16 files changed, 8458 insertions(+), 36 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 35318dbc8367..8bb14bd3d953 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2281,6 +2281,8 @@ dev/ixgbe/ixgbe_x540.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/ixgbe/ixgbe_x550.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_e610.c optional ix inet | ixv inet \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/ixgbe/ixgbe_dcb.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/ixgbe/ixgbe_dcb_82598.c optional ix inet | ixv inet \ diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 959afa79e7da..73c0fd1ab16f 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -45,7 +45,7 @@ /************************************************************************ * Driver version ************************************************************************/ -static const char ixgbe_driver_version[] = "4.0.1-k"; +static const char ixgbe_driver_version[] = "5.0.1-k"; /************************************************************************ * PCI Device ID Table @@ -144,6 +144,16 @@ static const pci_vendor_info_t ixgbe_vendor_info_array[] = "Intel(R) X540-T2 (Bypass)"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_BYPASS, "Intel(R) X520 82599 (Bypass)"), + PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_E610_BACKPLANE, + "Intel(R) E610 (Backplane)"), + PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_E610_SFP, + "Intel(R) E610 (SFP)"), + PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_E610_2_5G_T, + "Intel(R) E610 (2.5 GbE)"), + PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_E610_10G_T, + "Intel(R) E610 (10 GbE)"), + PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_E610_SGMII, + "Intel(R) E610 (SGMII)"), /* required last entry */ PVID_END }; @@ -253,6 +263,10 @@ static int ixgbe_sysctl_tso_tcp_flags_mask(SYSCTL_HANDLER_ARGS); static void ixgbe_handle_msf(void *); static void ixgbe_handle_mod(void *); static void ixgbe_handle_phy(void *); +static void ixgbe_handle_fw_event(void *); + +static int ixgbe_enable_lse(struct ixgbe_softc *sc); +static int ixgbe_disable_lse(struct ixgbe_softc *sc); /************************************************************************ * FreeBSD Device Interface Entry Points @@ -621,6 +635,7 @@ ixgbe_initialize_rss_mapping(struct ixgbe_softc *sc) case ixgbe_mac_X550: case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_a: + case ixgbe_mac_E610: table_size = 512; break; default: @@ -902,6 +917,32 @@ ixgbe_initialize_transmit_units(if_ctx_t ctx) } /* ixgbe_initialize_transmit_units */ +static int +ixgbe_check_fw_api_version(struct ixgbe_softc *sc) +{ + struct ixgbe_hw *hw = &sc->hw; + if (hw->api_maj_ver > IXGBE_FW_API_VER_MAJOR) { + device_printf(sc->dev, + "The driver for the device stopped because the NVM " + "image is newer than expected. You must install the " + "most recent version of the network driver.\n"); + return (EOPNOTSUPP); + } else if (hw->api_maj_ver == IXGBE_FW_API_VER_MAJOR && + hw->api_min_ver > (IXGBE_FW_API_VER_MINOR + 2)) { + device_printf(sc->dev, + "The driver for the device detected a newer version of " + "the NVM image than expected. Please install the most " + "recent version of the network driver.\n"); + } else if (hw->api_maj_ver < IXGBE_FW_API_VER_MAJOR || + hw->api_min_ver < IXGBE_FW_API_VER_MINOR - 2) { + device_printf(sc->dev, + "The driver for the device detected an older version " + "of the NVM image than expected. " + "Please update the NVM image.\n"); + } + return (0); +} + /************************************************************************ * ixgbe_register ************************************************************************/ @@ -970,6 +1011,9 @@ ixgbe_if_attach_pre(if_ctx_t ctx) goto err_pci; } + if (hw->mac.type == ixgbe_mac_E610) + ixgbe_init_aci(hw); + if (hw->mac.ops.fw_recovery_mode && hw->mac.ops.fw_recovery_mode(hw)) { device_printf(dev, @@ -1058,6 +1102,12 @@ ixgbe_if_attach_pre(if_ctx_t ctx) break; } + /* Check the FW API version */ + if (hw->mac.type == ixgbe_mac_E610 && ixgbe_check_fw_api_version(sc)) { + error = EIO; + goto err_pci; + } + /* Most of the iflib initialization... */ iflib_set_mac(ctx, hw->mac.addr); @@ -1111,6 +1161,9 @@ err_pci: IXGBE_WRITE_REG(&sc->hw, IXGBE_CTRL_EXT, ctrl_ext); ixgbe_free_pci_resources(ctx); + if (hw->mac.type == ixgbe_mac_E610) + ixgbe_shutdown_aci(hw); + return (error); } /* ixgbe_if_attach_pre */ @@ -1358,6 +1411,10 @@ ixgbe_add_media_types(if_ctx_t ctx) /* Media types with matching FreeBSD media defines */ if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_T) ifmedia_add(sc->media, IFM_ETHER | IFM_10G_T, 0, NULL); + if (layer & IXGBE_PHYSICAL_LAYER_5000BASE_T) + ifmedia_add(sc->media, IFM_ETHER | IFM_5000_T, 0, NULL); + if (layer & IXGBE_PHYSICAL_LAYER_2500BASE_T) + ifmedia_add(sc->media, IFM_ETHER | IFM_2500_T, 0, NULL); if (layer & IXGBE_PHYSICAL_LAYER_1000BASE_T) ifmedia_add(sc->media, IFM_ETHER | IFM_1000_T, 0, NULL); if (layer & IXGBE_PHYSICAL_LAYER_100BASE_TX) @@ -1459,6 +1516,7 @@ ixgbe_is_sfp(struct ixgbe_hw *hw) } case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_a: + case ixgbe_mac_E610: if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) return (true); return (false); @@ -1525,6 +1583,15 @@ ixgbe_config_link(if_ctx_t ctx) IXGBE_LINK_SPEED_5GB_FULL); } + if (hw->mac.type == ixgbe_mac_E610) { + hw->phy.ops.init(hw); + err = ixgbe_enable_lse(sc); + if (err) + device_printf(sc->dev, + "Failed to enable Link Status Event, " + "error: %d", err); + } + if (hw->mac.ops.setup_link) err = hw->mac.ops.setup_link(hw, autoneg, sc->link_up); @@ -2158,14 +2225,15 @@ get_parent_info: ixgbe_set_pci_config_data_generic(hw, link); display: - device_printf(dev, "PCI Express Bus: Speed %s %s\n", - ((hw->bus.speed == ixgbe_bus_speed_8000) ? "8.0GT/s" : + device_printf(dev, "PCI Express Bus: Speed %s Width %s\n", + ((hw->bus.speed == ixgbe_bus_speed_16000) ? "16.0GT/s" : + (hw->bus.speed == ixgbe_bus_speed_8000) ? "8.0GT/s" : (hw->bus.speed == ixgbe_bus_speed_5000) ? "5.0GT/s" : (hw->bus.speed == ixgbe_bus_speed_2500) ? "2.5GT/s" : "Unknown"), - ((hw->bus.width == ixgbe_bus_width_pcie_x8) ? "Width x8" : - (hw->bus.width == ixgbe_bus_width_pcie_x4) ? "Width x4" : - (hw->bus.width == ixgbe_bus_width_pcie_x1) ? "Width x1" : + ((hw->bus.width == ixgbe_bus_width_pcie_x8) ? "x8" : + (hw->bus.width == ixgbe_bus_width_pcie_x4) ? "x4" : + (hw->bus.width == ixgbe_bus_width_pcie_x1) ? "x1" : "Unknown")); if (bus_info_valid) { @@ -2372,14 +2440,17 @@ ixgbe_if_media_status(if_ctx_t ctx, struct ifmediareq * ifmr) ifmr->ifm_status |= IFM_ACTIVE; layer = sc->phy_layer; - if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_T || - layer & IXGBE_PHYSICAL_LAYER_1000BASE_T || - layer & IXGBE_PHYSICAL_LAYER_100BASE_TX || - layer & IXGBE_PHYSICAL_LAYER_10BASE_T) + if (layer & IXGBE_PHYSICAL_LAYERS_BASE_T_ALL) switch (sc->link_speed) { case IXGBE_LINK_SPEED_10GB_FULL: ifmr->ifm_active |= IFM_10G_T | IFM_FDX; break; + case IXGBE_LINK_SPEED_5GB_FULL: + ifmr->ifm_active |= IFM_5000_T | IFM_FDX; + break; + case IXGBE_LINK_SPEED_2_5GB_FULL: + ifmr->ifm_active |= IFM_2500_T | IFM_FDX; + break; case IXGBE_LINK_SPEED_1GB_FULL: ifmr->ifm_active |= IFM_1000_T | IFM_FDX; break; @@ -2390,15 +2461,6 @@ ixgbe_if_media_status(if_ctx_t ctx, struct ifmediareq * ifmr) ifmr->ifm_active |= IFM_10_T | IFM_FDX; break; } - if (hw->mac.type == ixgbe_mac_X550) - switch (sc->link_speed) { - case IXGBE_LINK_SPEED_5GB_FULL: - ifmr->ifm_active |= IFM_5000_T | IFM_FDX; - break; - case IXGBE_LINK_SPEED_2_5GB_FULL: - ifmr->ifm_active |= IFM_2500_T | IFM_FDX; - break; - } if (layer & IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU || layer & IXGBE_PHYSICAL_LAYER_SFP_ACTIVE_DA) switch (sc->link_speed) { @@ -2676,6 +2738,11 @@ ixgbe_msix_link(void *arg) sc->task_requests |= IXGBE_REQUEST_TASK_LSC; } + if (eicr & IXGBE_EICR_FW_EVENT) { + IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_EICR_FW_EVENT); + sc->task_requests |= IXGBE_REQUEST_TASK_FWEVENT; + } + if (sc->hw.mac.type != ixgbe_mac_82598EB) { if ((sc->feat_en & IXGBE_FEATURE_FDIR) && (eicr & IXGBE_EICR_FLOW_DIR)) { @@ -2734,11 +2801,16 @@ ixgbe_msix_link(void *arg) /* Check for VF message */ if ((sc->feat_en & IXGBE_FEATURE_SRIOV) && - (eicr & IXGBE_EICR_MAILBOX)) + (eicr & IXGBE_EICR_MAILBOX)) { sc->task_requests |= IXGBE_REQUEST_TASK_MBX; + } } - if (ixgbe_is_sfp(hw)) { + /* + * On E610, the firmware handles PHY configuration, so + * there is no need to perform any SFP-specific tasks. + */ + if (hw->mac.type != ixgbe_mac_E610 && ixgbe_is_sfp(hw)) { /* Pluggable optics-related interrupt */ if (hw->mac.type >= ixgbe_mac_X540) eicr_mask = IXGBE_EICR_GPI_SDP0_X540; @@ -2985,7 +3057,13 @@ ixgbe_if_detach(if_ctx_t ctx) callout_drain(&sc->fw_mode_timer); + if (sc->hw.mac.type == ixgbe_mac_E610) { + ixgbe_disable_lse(sc); + ixgbe_shutdown_aci(&sc->hw); + } + ixgbe_free_pci_resources(ctx); + free(sc->mta, M_IXGBE); return (0); @@ -3404,6 +3482,7 @@ ixgbe_set_ivar(struct ixgbe_softc *sc, u8 entry, u8 vector, s8 type) case ixgbe_mac_X550: case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_a: + case ixgbe_mac_E610: if (type == -1) { /* MISC IVAR */ index = (entry & 1) * 8; ivar = IXGBE_READ_REG(hw, IXGBE_IVAR_MISC); @@ -3825,6 +3904,96 @@ ixgbe_handle_phy(void *context) "Error handling LASI interrupt: %d\n", error); } /* ixgbe_handle_phy */ +/************************************************************************ + * ixgbe_enable_lse - enable link status events + * + * Sets mask and enables link status events + ************************************************************************/ +s32 ixgbe_enable_lse(struct ixgbe_softc *sc) +{ + s32 error; + + u16 mask = ~((u16)(IXGBE_ACI_LINK_EVENT_UPDOWN | + IXGBE_ACI_LINK_EVENT_MEDIA_NA | + IXGBE_ACI_LINK_EVENT_MODULE_QUAL_FAIL | + IXGBE_ACI_LINK_EVENT_PHY_FW_LOAD_FAIL)); + + error = ixgbe_configure_lse(&sc->hw, TRUE, mask); + if (error) + return (error); + + sc->lse_mask = mask; + return (IXGBE_SUCCESS); +} /* ixgbe_enable_lse */ + +/************************************************************************ + * ixgbe_disable_lse - disable link status events + ************************************************************************/ +s32 ixgbe_disable_lse(struct ixgbe_softc *sc) +{ + s32 error; + + error = ixgbe_configure_lse(&sc->hw, false, sc->lse_mask); + if (error) + return (error); + + sc->lse_mask = 0; + return (IXGBE_SUCCESS); +} /* ixgbe_disable_lse */ + +/************************************************************************ + * ixgbe_handle_fw_event - Tasklet for MSI-X Link Status Event interrupts + ************************************************************************/ +static void +ixgbe_handle_fw_event(void *context) +{ + if_ctx_t ctx = context; + struct ixgbe_softc *sc = iflib_get_softc(ctx); + struct ixgbe_hw *hw = &sc->hw; + struct ixgbe_aci_event event; + bool pending = false; + s32 error; + + event.buf_len = IXGBE_ACI_MAX_BUFFER_SIZE; + event.msg_buf = malloc(event.buf_len, M_IXGBE, M_ZERO | M_NOWAIT); + if (!event.msg_buf) { + device_printf(sc->dev, "Can not allocate buffer for " + "event message\n"); + return; + } + + do { + error = ixgbe_aci_get_event(hw, &event, &pending); + if (error) { + device_printf(sc->dev, "Error getting event from " + "FW:%d\n", error); + break; + } + + switch (le16toh(event.desc.opcode)) { + case ixgbe_aci_opc_get_link_status: + sc->task_requests |= IXGBE_REQUEST_TASK_LSC; + break; + + case ixgbe_aci_opc_temp_tca_event: + if (hw->adapter_stopped == FALSE) + ixgbe_if_stop(ctx); + device_printf(sc->dev, + "CRITICAL: OVER TEMP!! PHY IS SHUT DOWN!!\n"); + device_printf(sc->dev, "System shutdown required!\n"); + break; + + default: + device_printf(sc->dev, + "Unknown FW event captured, opcode=0x%04X\n", + le16toh(event.desc.opcode)); + break; + } + } while (pending); + + free(event.msg_buf, M_IXGBE); +} /* ixgbe_handle_fw_event */ + /************************************************************************ * ixgbe_if_stop - Stop the hardware * @@ -3899,6 +4068,8 @@ ixgbe_if_update_admin_status(if_ctx_t ctx) } /* Handle task requests from msix_link() */ + if (sc->task_requests & IXGBE_REQUEST_TASK_FWEVENT) + ixgbe_handle_fw_event(ctx); if (sc->task_requests & IXGBE_REQUEST_TASK_MOD) ixgbe_handle_mod(ctx); if (sc->task_requests & IXGBE_REQUEST_TASK_MSF) @@ -3986,6 +4157,9 @@ ixgbe_if_enable_intr(if_ctx_t ctx) mask |= IXGBE_EICR_GPI_SDP0_X540; mask |= IXGBE_EIMS_ECC; break; + case ixgbe_mac_E610: + mask |= IXGBE_EIMS_FW_EVENT; + break; default: break; } @@ -4008,6 +4182,7 @@ ixgbe_if_enable_intr(if_ctx_t ctx) /* Don't autoclear Link */ mask &= ~IXGBE_EIMS_OTHER; mask &= ~IXGBE_EIMS_LSC; + mask &= ~IXGBE_EIMS_FW_EVENT; if (sc->feat_cap & IXGBE_FEATURE_SRIOV) mask &= ~IXGBE_EIMS_MAILBOX; IXGBE_WRITE_REG(hw, IXGBE_EIAC, mask); @@ -4026,7 +4201,7 @@ ixgbe_if_enable_intr(if_ctx_t ctx) } /* ixgbe_if_enable_intr */ /************************************************************************ - * ixgbe_disable_intr + * ixgbe_if_disable_intr ************************************************************************/ static void ixgbe_if_disable_intr(if_ctx_t ctx) @@ -4176,8 +4351,9 @@ ixgbe_intr(void *arg) /* External PHY interrupt */ if ((hw->phy.type == ixgbe_phy_x550em_ext_t) && - (eicr & IXGBE_EICR_GPI_SDP0_X540)) + (eicr & IXGBE_EICR_GPI_SDP0_X540)) { sc->task_requests |= IXGBE_REQUEST_TASK_PHY; + } return (FILTER_SCHEDULE_THREAD); } /* ixgbe_intr */ @@ -4219,7 +4395,7 @@ ixgbe_sysctl_flowcntl(SYSCTL_HANDLER_ARGS) int error, fc; sc = (struct ixgbe_softc *)arg1; - fc = sc->hw.fc.current_mode; + fc = sc->hw.fc.requested_mode; error = sysctl_handle_int(oidp, &fc, 0, req); if ((error) || (req->newptr == NULL)) @@ -4248,12 +4424,10 @@ ixgbe_set_flowcntl(struct ixgbe_softc *sc, int fc) case ixgbe_fc_rx_pause: case ixgbe_fc_tx_pause: case ixgbe_fc_full: - sc->hw.fc.requested_mode = fc; if (sc->num_rx_queues > 1) ixgbe_disable_rx_drop(sc); break; case ixgbe_fc_none: - sc->hw.fc.requested_mode = ixgbe_fc_none; if (sc->num_rx_queues > 1) ixgbe_enable_rx_drop(sc); break; @@ -4261,6 +4435,8 @@ ixgbe_set_flowcntl(struct ixgbe_softc *sc, int fc) return (EINVAL); } + sc->hw.fc.requested_mode = fc; + /* Don't autoneg if forcing a value */ sc->hw.fc.disable_fc_autoneg = true; ixgbe_fc_enable(&sc->hw); @@ -4978,6 +5154,9 @@ ixgbe_init_device_features(struct ixgbe_softc *sc) if (sc->hw.device_id == IXGBE_DEV_ID_82599_QSFP_SF_QP) sc->feat_cap &= ~IXGBE_FEATURE_LEGACY_IRQ; break; + case ixgbe_mac_E610: + sc->feat_cap |= IXGBE_FEATURE_RECOVERY_MODE; + break; default: break; } diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c index 54b2c8c1dd68..8a1c1aae041d 100644 --- a/sys/dev/ixgbe/if_ixv.c +++ b/sys/dev/ixgbe/if_ixv.c @@ -68,6 +68,8 @@ static const pci_vendor_info_t ixv_vendor_info_array[] = "Intel(R) X552 Virtual Function"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_A_VF, "Intel(R) X553 Virtual Function"), + PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_E610_VF, + "Intel(R) E610 Virtual Function"), /* required last entry */ PVID_END }; @@ -1020,6 +1022,9 @@ ixv_identify_hardware(if_ctx_t ctx) case IXGBE_DEV_ID_X550EM_A_VF: hw->mac.type = ixgbe_mac_X550EM_a_vf; break; + case IXGBE_DEV_ID_E610_VF: + hw->mac.type = ixgbe_mac_E610_vf; + break; default: device_printf(dev, "unknown mac type\n"); hw->mac.type = ixgbe_mac_unknown; @@ -1955,6 +1960,7 @@ ixv_init_device_features(struct ixgbe_softc *sc) case ixgbe_mac_X550_vf: case ixgbe_mac_X550EM_x_vf: case ixgbe_mac_X550EM_a_vf: + case ixgbe_mac_E610_vf: sc->feat_cap |= IXGBE_FEATURE_NEEDS_CTXD; sc->feat_cap |= IXGBE_FEATURE_RSS; break; diff --git a/sys/dev/ixgbe/ixgbe.h b/sys/dev/ixgbe/ixgbe.h index 341d4ebfcebc..844064bf8543 100644 --- a/sys/dev/ixgbe/ixgbe.h +++ b/sys/dev/ixgbe/ixgbe.h @@ -86,6 +86,7 @@ #include "ixgbe_phy.h" #include "ixgbe_vf.h" #include "ixgbe_features.h" +#include "ixgbe_e610.h" /* Tunables */ @@ -195,6 +196,15 @@ CSUM_IP_UDP|CSUM_IP_TCP|CSUM_IP_SCTP| \ CSUM_IP6_UDP|CSUM_IP6_TCP|CSUM_IP6_SCTP) +/* All BASE-T Physical layers */ +#define IXGBE_PHYSICAL_LAYERS_BASE_T_ALL \ + (IXGBE_PHYSICAL_LAYER_10GBASE_T |\ + IXGBE_PHYSICAL_LAYER_5000BASE_T |\ + IXGBE_PHYSICAL_LAYER_2500BASE_T |\ + IXGBE_PHYSICAL_LAYER_1000BASE_T |\ + IXGBE_PHYSICAL_LAYER_100BASE_TX |\ + IXGBE_PHYSICAL_LAYER_10BASE_T) + #define IXGBE_CAPS (IFCAP_HWCSUM | IFCAP_HWCSUM_IPV6 | IFCAP_TSO | \ IFCAP_LRO | IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_HWTSO | \ IFCAP_VLAN_HWCSUM | IFCAP_JUMBO_MTU | IFCAP_VLAN_MTU | \ @@ -464,6 +474,7 @@ struct ixgbe_softc { /* Feature capable/enabled flags. See ixgbe_features.h */ u32 feat_cap; u32 feat_en; + u16 lse_mask; }; /* Precision Time Sync (IEEE 1588) defines */ diff --git a/sys/dev/ixgbe/ixgbe_api.c b/sys/dev/ixgbe/ixgbe_api.c index 4c50f10ed92e..f11f52a646e4 100644 --- a/sys/dev/ixgbe/ixgbe_api.c +++ b/sys/dev/ixgbe/ixgbe_api.c @@ -112,11 +112,15 @@ s32 ixgbe_init_shared_code(struct ixgbe_hw *hw) case ixgbe_mac_X550EM_a: status = ixgbe_init_ops_X550EM_a(hw); break; + case ixgbe_mac_E610: + status = ixgbe_init_ops_E610(hw); + break; case ixgbe_mac_82599_vf: case ixgbe_mac_X540_vf: case ixgbe_mac_X550_vf: case ixgbe_mac_X550EM_x_vf: case ixgbe_mac_X550EM_a_vf: + case ixgbe_mac_E610_vf: status = ixgbe_init_ops_vf(hw); break; default: @@ -240,6 +244,18 @@ s32 ixgbe_set_mac_type(struct ixgbe_hw *hw) hw->mac.type = ixgbe_mac_X550EM_a_vf; hw->mvals = ixgbe_mvals_X550EM_a; break; + case IXGBE_DEV_ID_E610_BACKPLANE: + case IXGBE_DEV_ID_E610_SFP: + case IXGBE_DEV_ID_E610_10G_T: + case IXGBE_DEV_ID_E610_2_5G_T: + case IXGBE_DEV_ID_E610_SGMII: + hw->mac.type = ixgbe_mac_E610; + hw->mvals = ixgbe_mvals_X550EM_a; + break; + case IXGBE_DEV_ID_E610_VF: + hw->mac.type = ixgbe_mac_E610_vf; + hw->mvals = ixgbe_mvals_X550EM_a; + break; default: ret_val = IXGBE_ERR_DEVICE_NOT_SUPPORTED; ERROR_REPORT2(IXGBE_ERROR_UNSUPPORTED, diff --git a/sys/dev/ixgbe/ixgbe_api.h b/sys/dev/ixgbe/ixgbe_api.h index b81510dacb95..2b4cec8d110e 100644 --- a/sys/dev/ixgbe/ixgbe_api.h +++ b/sys/dev/ixgbe/ixgbe_api.h @@ -48,6 +48,7 @@ extern s32 ixgbe_init_ops_X550(struct ixgbe_hw *hw); extern s32 ixgbe_init_ops_X550EM(struct ixgbe_hw *hw); extern s32 ixgbe_init_ops_X550EM_x(struct ixgbe_hw *hw); extern s32 ixgbe_init_ops_X550EM_a(struct ixgbe_hw *hw); +extern s32 ixgbe_init_ops_E610(struct ixgbe_hw *hw); extern s32 ixgbe_init_ops_vf(struct ixgbe_hw *hw); s32 ixgbe_set_mac_type(struct ixgbe_hw *hw); diff --git a/sys/dev/ixgbe/ixgbe_common.c b/sys/dev/ixgbe/ixgbe_common.c index df7ab90e72ab..bff022585a03 100644 --- a/sys/dev/ixgbe/ixgbe_common.c +++ b/sys/dev/ixgbe/ixgbe_common.c @@ -178,6 +178,7 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw) case IXGBE_DEV_ID_X550EM_A_SFP_N: case IXGBE_DEV_ID_X550EM_A_QSFP: case IXGBE_DEV_ID_X550EM_A_QSFP_N: + case IXGBE_DEV_ID_E610_SFP: supported = false; break; default: @@ -210,6 +211,8 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw) case IXGBE_DEV_ID_X550EM_A_10G_T: case IXGBE_DEV_ID_X550EM_A_1G_T: case IXGBE_DEV_ID_X550EM_A_1G_T_L: + case IXGBE_DEV_ID_E610_10G_T: + case IXGBE_DEV_ID_E610_2_5G_T: supported = true; break; default: @@ -616,7 +619,8 @@ s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw) } } - if (hw->mac.type == ixgbe_mac_X550 || hw->mac.type == ixgbe_mac_X540) { + if (hw->mac.type == ixgbe_mac_X540 || + hw->mac.type == ixgbe_mac_X550) { if (hw->phy.id == 0) ixgbe_identify_phy(hw); hw->phy.ops.read_reg(hw, IXGBE_PCRC8ECL, @@ -1037,6 +1041,9 @@ void ixgbe_set_pci_config_data_generic(struct ixgbe_hw *hw, u16 link_status) case IXGBE_PCI_LINK_SPEED_8000: hw->bus.speed = ixgbe_bus_speed_8000; break; + case IXGBE_PCI_LINK_SPEED_16000: + hw->bus.speed = ixgbe_bus_speed_16000; + break; default: hw->bus.speed = ixgbe_bus_speed_unknown; break; @@ -1059,7 +1066,9 @@ s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw) DEBUGFUNC("ixgbe_get_bus_info_generic"); /* Get the negotiated link width and speed from PCI config space */ - link_status = IXGBE_READ_PCIE_WORD(hw, IXGBE_PCI_LINK_STATUS); + link_status = IXGBE_READ_PCIE_WORD(hw, hw->mac.type == ixgbe_mac_E610 ? + IXGBE_PCI_LINK_STATUS_E610 : + IXGBE_PCI_LINK_STATUS); ixgbe_set_pci_config_data_generic(hw, link_status); @@ -1878,7 +1887,6 @@ static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw) DEBUGFUNC("ixgbe_get_eeprom_semaphore"); - /* Get SMBI software semaphore between device drivers first */ for (i = 0; i < timeout; i++) { /* @@ -3363,7 +3371,6 @@ s32 ixgbe_disable_sec_rx_path_generic(struct ixgbe_hw *hw) DEBUGFUNC("ixgbe_disable_sec_rx_path_generic"); - secrxreg = IXGBE_READ_REG(hw, IXGBE_SECRXCTRL); secrxreg |= IXGBE_SECRXCTRL_RX_DIS; IXGBE_WRITE_REG(hw, IXGBE_SECRXCTRL, secrxreg); @@ -3692,6 +3699,10 @@ u16 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw) pcie_offset = IXGBE_PCIE_MSIX_82599_CAPS; max_msix_count = IXGBE_MAX_MSIX_VECTORS_82599; break; + case ixgbe_mac_E610: + pcie_offset = IXGBE_PCIE_MSIX_E610_CAPS; + max_msix_count = IXGBE_MAX_MSIX_VECTORS_82599; + break; default: return msix_count; } @@ -4139,7 +4150,6 @@ s32 ixgbe_clear_vfta_generic(struct ixgbe_hw *hw) return IXGBE_SUCCESS; } - /** * ixgbe_toggle_txdctl_generic - Toggle VF's queues * @hw: pointer to hardware structure @@ -4323,7 +4333,8 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed, break; case IXGBE_LINKS_SPEED_100_82599: *speed = IXGBE_LINK_SPEED_100_FULL; - if (hw->mac.type == ixgbe_mac_X550) { + if (hw->mac.type == ixgbe_mac_X550 || + hw->mac.type == ixgbe_mac_E610) { if (links_reg & IXGBE_LINKS_SPEED_NON_STD) *speed = IXGBE_LINK_SPEED_5GB_FULL; } @@ -5494,6 +5505,7 @@ void ixgbe_get_nvm_version(struct ixgbe_hw *hw, case ixgbe_mac_X550: case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_a: + case ixgbe_mac_E610: /* version of eeprom section */ if (ixgbe_read_eeprom(hw, NVM_EEP_OFFSET_X540, &word)) word = NVM_VER_INVALID; @@ -5512,6 +5524,7 @@ void ixgbe_get_nvm_version(struct ixgbe_hw *hw, case ixgbe_mac_X550: case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_a: + case ixgbe_mac_E610: /* intel phy firmware version */ if (ixgbe_read_eeprom(hw, NVM_EEP_PHY_OFF_X540, &word)) word = NVM_VER_INVALID; diff --git a/sys/dev/ixgbe/ixgbe_e610.c b/sys/dev/ixgbe/ixgbe_e610.c new file mode 100644 index 000000000000..95c6dca416c6 --- /dev/null +++ b/sys/dev/ixgbe/ixgbe_e610.c @@ -0,0 +1,5567 @@ +/****************************************************************************** + SPDX-License-Identifier: BSD-3-Clause + + Copyright (c) 2025, Intel Corporation + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. Neither the name of the Intel Corporation nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +******************************************************************************/ + +#include "ixgbe_type.h" +#include "ixgbe_e610.h" +#include "ixgbe_x550.h" +#include "ixgbe_common.h" +#include "ixgbe_phy.h" +#include "ixgbe_api.h" + +/** + * ixgbe_init_aci - initialization routine for Admin Command Interface + * @hw: pointer to the hardware structure + * + * Initialize the ACI lock. + */ +void ixgbe_init_aci(struct ixgbe_hw *hw) +{ + ixgbe_init_lock(&hw->aci.lock); +} + +/** + * ixgbe_shutdown_aci - shutdown routine for Admin Command Interface + * @hw: pointer to the hardware structure + * + * Destroy the ACI lock. + */ +void ixgbe_shutdown_aci(struct ixgbe_hw *hw) +{ + ixgbe_destroy_lock(&hw->aci.lock); +} + +/** + * ixgbe_should_retry_aci_send_cmd_execute - decide if ACI command should + * be resent + * @opcode: ACI opcode + * + * Check if ACI command should be sent again depending on the provided opcode. + * + * Return: true if the sending command routine should be repeated, + * otherwise false. + */ +static bool ixgbe_should_retry_aci_send_cmd_execute(u16 opcode) +{ + switch (opcode) { + case ixgbe_aci_opc_disable_rxen: + case ixgbe_aci_opc_get_phy_caps: + case ixgbe_aci_opc_get_link_status: + case ixgbe_aci_opc_get_link_topo: + return true; + } + + return false; +} + +/** + * ixgbe_aci_send_cmd_execute - execute sending FW Admin Command to FW Admin + * Command Interface + * @hw: pointer to the HW struct + * @desc: descriptor describing the command + * @buf: buffer to use for indirect commands (NULL for direct commands) + * @buf_size: size of buffer for indirect commands (0 for direct commands) + * + * Admin Command is sent using CSR by setting descriptor and buffer in specific + * registers. + * + * Return: the exit code of the operation. + * * - IXGBE_SUCCESS - success. + * * - IXGBE_ERR_ACI_DISABLED - CSR mechanism is not enabled. + * * - IXGBE_ERR_ACI_BUSY - CSR mechanism is busy. + * * - IXGBE_ERR_PARAM - buf_size is too big or + * invalid argument buf or buf_size. + * * - IXGBE_ERR_ACI_TIMEOUT - Admin Command X command timeout. + * * - IXGBE_ERR_ACI_ERROR - Admin Command X invalid state of HICR register or + * Admin Command failed because of bad opcode was returned or + * Admin Command failed with error Y. + */ +static s32 +ixgbe_aci_send_cmd_execute(struct ixgbe_hw *hw, struct ixgbe_aci_desc *desc, + void *buf, u16 buf_size) +{ + u32 hicr = 0, tmp_buf_size = 0, i = 0; + u32 *raw_desc = (u32 *)desc; + s32 status = IXGBE_SUCCESS; + bool valid_buf = false; + u32 *tmp_buf = NULL; + u16 opcode = 0; + + do { + hw->aci.last_status = IXGBE_ACI_RC_OK; + + /* It's necessary to check if mechanism is enabled */ + hicr = IXGBE_READ_REG(hw, PF_HICR); + if (!(hicr & PF_HICR_EN)) { + status = IXGBE_ERR_ACI_DISABLED; + break; + } + if (hicr & PF_HICR_C) { + hw->aci.last_status = IXGBE_ACI_RC_EBUSY; + status = IXGBE_ERR_ACI_BUSY; + break; + } + opcode = desc->opcode; + + if (buf_size > IXGBE_ACI_MAX_BUFFER_SIZE) { + status = IXGBE_ERR_PARAM; + break; + } + + if (buf) + desc->flags |= IXGBE_CPU_TO_LE16(IXGBE_ACI_FLAG_BUF); + + /* Check if buf and buf_size are proper params */ + if (desc->flags & IXGBE_CPU_TO_LE16(IXGBE_ACI_FLAG_BUF)) { + if ((buf && buf_size == 0) || + (buf == NULL && buf_size)) { + status = IXGBE_ERR_PARAM; + break; + } + if (buf && buf_size) + valid_buf = true; + } + + if (valid_buf == true) { + if (buf_size % 4 == 0) + tmp_buf_size = buf_size; + else + tmp_buf_size = (buf_size & (u16)(~0x03)) + 4; + + tmp_buf = (u32*)ixgbe_malloc(hw, tmp_buf_size); + if (!tmp_buf) + return IXGBE_ERR_OUT_OF_MEM; + + /* tmp_buf will be firstly filled with 0xFF and after + * that the content of buf will be written into it. + * This approach lets us use valid buf_size and + * prevents us from reading past buf area + * when buf_size mod 4 not equal to 0. + */ + memset(tmp_buf, 0xFF, tmp_buf_size); + memcpy(tmp_buf, buf, buf_size); + + if (tmp_buf_size > IXGBE_ACI_LG_BUF) + desc->flags |= + IXGBE_CPU_TO_LE16(IXGBE_ACI_FLAG_LB); + + desc->datalen = IXGBE_CPU_TO_LE16(buf_size); + + if (desc->flags & IXGBE_CPU_TO_LE16(IXGBE_ACI_FLAG_RD)) { + for (i = 0; i < tmp_buf_size / 4; i++) { + IXGBE_WRITE_REG(hw, PF_HIBA(i), + IXGBE_LE32_TO_CPU(tmp_buf[i])); + } + } + } + + /* Descriptor is written to specific registers */ + for (i = 0; i < IXGBE_ACI_DESC_SIZE_IN_DWORDS; i++) + IXGBE_WRITE_REG(hw, PF_HIDA(i), + IXGBE_LE32_TO_CPU(raw_desc[i])); + + /* SW has to set PF_HICR.C bit and clear PF_HICR.SV and + * PF_HICR_EV + */ + hicr = IXGBE_READ_REG(hw, PF_HICR); + hicr = (hicr | PF_HICR_C) & ~(PF_HICR_SV | PF_HICR_EV); + IXGBE_WRITE_REG(hw, PF_HICR, hicr); + + /* Wait for sync Admin Command response */ + for (i = 0; i < IXGBE_ACI_SYNC_RESPONSE_TIMEOUT; i += 1) { + hicr = IXGBE_READ_REG(hw, PF_HICR); + if ((hicr & PF_HICR_SV) || !(hicr & PF_HICR_C)) + break; + + msec_delay(1); + } + + /* Wait for async Admin Command response */ + if ((hicr & PF_HICR_SV) && (hicr & PF_HICR_C)) { + for (i = 0; i < IXGBE_ACI_ASYNC_RESPONSE_TIMEOUT; + i += 1) { + hicr = IXGBE_READ_REG(hw, PF_HICR); + if ((hicr & PF_HICR_EV) || !(hicr & PF_HICR_C)) + break; + + msec_delay(1); + } + } + + /* Read sync Admin Command response */ + if ((hicr & PF_HICR_SV)) { + for (i = 0; i < IXGBE_ACI_DESC_SIZE_IN_DWORDS; i++) { + raw_desc[i] = IXGBE_READ_REG(hw, PF_HIDA(i)); + raw_desc[i] = IXGBE_CPU_TO_LE32(raw_desc[i]); + } + } + + /* Read async Admin Command response */ + if ((hicr & PF_HICR_EV) && !(hicr & PF_HICR_C)) { + for (i = 0; i < IXGBE_ACI_DESC_SIZE_IN_DWORDS; i++) { + raw_desc[i] = IXGBE_READ_REG(hw, PF_HIDA_2(i)); + raw_desc[i] = IXGBE_CPU_TO_LE32(raw_desc[i]); + } *** 8201 LINES SKIPPED *** From nobody Tue Aug 19 16:52:08 2025 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 4c5wbs11Wrz65GZg; Tue, 19 Aug 2025 16:52:09 +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 4c5wbs0Nyrz3vtd; Tue, 19 Aug 2025 16:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755622329; 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=vBuaqgBb/UeveVFbCZwzGyDEAavwFAr6sGdEm3c+600=; b=cgFhGGfmRp9MgdJkLKo4mZCDTPEXDH3Do8Py95zLnclcHhWAnAV0V45KvC8MBm86bJuzAX 4xIPQJXlQQp3HDqQLXvoeq8zrHN/tpip/wIHDI3MHj5uxqc0QKBtr9rVVKqzinz8tIMAgi D2AngwwwL8/bGOA8IczKEfgaHh9/hoVZqOjP3pb3G61TvGIJXAveL6TDkKKaspdzViqqAZ 9q31jM3E0N3O9p0zsGP531r4nPLvzg9/98vQGcGJ9l41lF/M7RPQvcyhOUfvJBCbF+uiEL Ivn8VZywfYPw8MjrNPCOfYxhTBwEs1sGM7RfKd98IKNDr8TMmd+TqmVz9FS4aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755622329; 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=vBuaqgBb/UeveVFbCZwzGyDEAavwFAr6sGdEm3c+600=; b=KkzZtZm9szLZtmo1hWxRZiCJ1mtiJkr6miWBSRglkY4l5bchsa/66B5nsyaQ8UjLuSqxpJ q9P8CEd5bnE5NjLGbfjHP3iX/dUnrBwpvu0B53J1vMwb6CLA+ck/5bj+eZ/j8AppUeToBV HN4h7ZmYKTPyqGE7OMwv8JcoL/5XVNBsBtT6SaHYTuJP8ziPt6sv+MP3ios2IXACquOado e1rZvICEvPFGDaij7yQkE90mNxbIyds1yRCgYcjabxu9eQLCBgWD6liwIHC06IYJNcpqzE N2kzjFf+ta9R6Xwes7Gz/pP6xDiwnJfJbYOcYhgksjwCEKDgUfw0YqcU4y4aNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755622329; a=rsa-sha256; cv=none; b=wOjluVV3lBTZUP3ON/hXS92YumF9DU7CpfxWRIvxO73e5vcpQe1JyLfSJUHkReq3Wv+U6Z 03xJ7jN+g/9Ywf8dYMiYSMOdzWNkmcuZIvHIot3oecEPuGQ5QfrK+SGYWAU5jvyX0X7T25 H2eyDD6qt3p4yRDUcIX0JXUqp0AfKvaxB5Q5u8A5XKMvTjPVxQx7uiUOS+ZgliKTqeZJVB ocgPibDOOZYzkkf24bW4LrC1Qjr8I5o4EwV3IaYpDVc6NopMBOk1ry4G3mMKSofwFbw16x 73mUalMcdpf4Qdfv4APnsuv3DGF1E10kRZWmmIRjxjWbBzpT/DjUfdBz9c5H0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5wbr74p4zbpL; Tue, 19 Aug 2025 16:52:08 +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 57JGq8qL038911; Tue, 19 Aug 2025 16:52:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JGq8qQ038908; Tue, 19 Aug 2025 16:52:08 GMT (envelope-from git) Date: Tue, 19 Aug 2025 16:52:08 GMT Message-Id: <202508191652.57JGq8qQ038908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 3ff0231c87f3 - main - Revert "e1000: Try auto-negotiation for fixed 100 or 10 configuration" 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ff0231c87f360afa4521e635b46f6c711dc4ee3 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=3ff0231c87f360afa4521e635b46f6c711dc4ee3 commit 3ff0231c87f360afa4521e635b46f6c711dc4ee3 Author: Kevin Bowling AuthorDate: 2025-08-19 16:45:48 +0000 Commit: Kevin Bowling CommitDate: 2025-08-19 16:51:00 +0000 Revert "e1000: Try auto-negotiation for fixed 100 or 10 configuration" We've gotten a report of this breaking a fixed no autoneg setup. Since no link is worse than what this intends to fix (negotiating full duplex at forced speed), revert for the undeway 15.0 release cycle until this can be further reviewed. PR: 288827 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47336 This reverts commit 645c45e297c0fcbbb9d2d24cdeeb124234825019. --- sys/dev/e1000/e1000_phy.c | 5 ++--- sys/dev/e1000/if_em.c | 44 ++++++-------------------------------------- 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/sys/dev/e1000/e1000_phy.c b/sys/dev/e1000/e1000_phy.c index c34897e3b31a..634f48171c3e 100644 --- a/sys/dev/e1000/e1000_phy.c +++ b/sys/dev/e1000/e1000_phy.c @@ -1707,10 +1707,9 @@ s32 e1000_setup_copper_link_generic(struct e1000_hw *hw) * autonegotiation. */ ret_val = e1000_copper_link_autoneg(hw); - if (ret_val && !hw->mac.forced_speed_duplex) + if (ret_val) return ret_val; - } - if (!hw->mac.autoneg || (ret_val && hw->mac.forced_speed_duplex)) { + } else { /* PHY will be set to 10H, 10F, 100H or 100F * depending on user settings. */ diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index f0ef6051fab1..9c5ae2806f75 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -2000,18 +2000,7 @@ em_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) (sc->hw.phy.media_type == e1000_media_type_internal_serdes)) { if (sc->hw.mac.type == e1000_82545) fiber_type = IFM_1000_LX; - switch (sc->link_speed) { - case 10: - ifmr->ifm_active |= IFM_10_FL; - break; - case 100: - ifmr->ifm_active |= IFM_100_FX; - break; - case 1000: - default: - ifmr->ifm_active |= fiber_type | IFM_FDX; - break; - } + ifmr->ifm_active |= fiber_type | IFM_FDX; } else { switch (sc->link_speed) { case 10: @@ -2024,12 +2013,11 @@ em_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) ifmr->ifm_active |= IFM_1000_T; break; } + if (sc->link_duplex == FULL_DUPLEX) + ifmr->ifm_active |= IFM_FDX; + else + ifmr->ifm_active |= IFM_HDX; } - - if (sc->link_duplex == FULL_DUPLEX) - ifmr->ifm_active |= IFM_FDX; - else - ifmr->ifm_active |= IFM_HDX; } /********************************************************************* @@ -2063,26 +2051,6 @@ em_if_media_change(if_ctx_t ctx) sc->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL; break; case IFM_100_TX: - sc->hw.mac.autoneg = DO_AUTO_NEG; - if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) { - sc->hw.phy.autoneg_advertised = ADVERTISE_100_FULL; - sc->hw.mac.forced_speed_duplex = ADVERTISE_100_FULL; - } else { - sc->hw.phy.autoneg_advertised = ADVERTISE_100_HALF; - sc->hw.mac.forced_speed_duplex = ADVERTISE_100_HALF; - } - break; - case IFM_10_T: - sc->hw.mac.autoneg = DO_AUTO_NEG; - if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) { - sc->hw.phy.autoneg_advertised = ADVERTISE_10_FULL; - sc->hw.mac.forced_speed_duplex = ADVERTISE_10_FULL; - } else { - sc->hw.phy.autoneg_advertised = ADVERTISE_10_HALF; - sc->hw.mac.forced_speed_duplex = ADVERTISE_10_HALF; - } - break; - case IFM_100_FX: sc->hw.mac.autoneg = false; sc->hw.phy.autoneg_advertised = 0; if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) @@ -2090,7 +2058,7 @@ em_if_media_change(if_ctx_t ctx) else sc->hw.mac.forced_speed_duplex = ADVERTISE_100_HALF; break; - case IFM_10_FL: + case IFM_10_T: sc->hw.mac.autoneg = false; sc->hw.phy.autoneg_advertised = 0; if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) From nobody Tue Aug 19 17:33:49 2025 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 4c5xX15FNPz65JYY; Tue, 19 Aug 2025 17:33:53 +0000 (UTC) (envelope-from fluffy@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c5xX14Sw2z422j; Tue, 19 Aug 2025 17:33:53 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755624833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=grxJM5nVVUpluRIOkHndeXfXn/f81cN7NL/jF9mH4SQ=; b=psRu2cqLoWYyi7vG857cMgzWUp4q9LmH9ETemQCOI5aqFyn1Yjf0dXJkITOp4vZGvjy2ma dBwQfXHOzYF3L5mWHTrMPQemvuAA8FyOjoQXxnkUiM33hSWx59kQYyd//smEBELW99zhM4 id58z3km3sGCyIrt7qb6acN7b07OAA+Cwj94B2bmnLFtp1U9yc0GgGzObIcFRhLNvPM6v7 rgYSnbyx8Qn7b4mGQ40Ll7C9PBSk/2PI4/I9mNOw1Z3vxcCL0R/AskkovEDlNSG0mOGs+0 4EhInCo/10xmWLCCKvsHagJNFUPV//LyKrd18bFHc1AoFDgXkXjaDJ6PXqwLXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755624833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=grxJM5nVVUpluRIOkHndeXfXn/f81cN7NL/jF9mH4SQ=; b=gZw1mzsyL4a0mefKXS2x0k/KDmNALcO2upkxz/rwwdLWDxtVaUiIIWy5W7Oi5OdGB66XbV jl4GUywLBrvPraNz/Nk084MxOeq7kUoI2DJ2TRoin72xlfJdXXttQhcq01QVuYE5OuMU1d Q5T9IBPtHFuUeD6/vTO46HhLWwaSSSnC+7YRVj2lyAXuwY9Hm2IefcbfEZFtZqvraMpG9N njb7Bb5eLsMcPtuTUhi9NalJ8Ellx2lrtxnfoqiMkKbloO5mm/2XzEpCL3xKJX6KtjFP6r e+bA94EkGd1mCUy6vMblW9JwnXDSfhu6pxTWk7ONVRiT8IcdhbhlH8egRR6pzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755624833; a=rsa-sha256; cv=none; b=eUigai3CMGZM6TWb2RXEwMEm8quMyBEL/k31NBU9O8hVIuVg2GXCagqDTIwYxlky0y1NwT /xEkAQijj3cT1avkMWgMenRI7HUd2pMxnF5jjRYCqobNnHr5wz97HoUM3RliXK4CGOs2m7 VtMSWUyzopU3Jzy8reZ/FBHeI8kIGQQemfYQLbIGMFQiIrRrmIVgymZhRdbzSXvhI51byy AXDUmMkLQXgyvIjMR9L0ss/ylN3iKX9iy3VqV3mI6In5ekO4R8r59/k0cc6RtXjDUHXr2e AT5Nuj/d+QNKmofi3SNoY6wkuuUqON9X1zC1JLiGF9+Hwxl/Ioi/zvsM/k6xkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [10.192.0.6] (unknown [134.209.23.4]) (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 did not present a certificate) (Authenticated sender: fluffy) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c5xX043Rlz3bh; Tue, 19 Aug 2025 17:33:52 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Message-ID: <80b17387-74d5-40b0-80e5-ca756bed0649@FreeBSD.org> Date: Tue, 19 Aug 2025 20:33:49 +0300 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 5105e1ebecc7 - main - krb5: Fix the installed compile_et To: Mark Johnston , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202508191320.57JDKkFi035855@gitrepo.freebsd.org> Content-Language: ru, en-GB From: Dima Panov Autocrypt: addr=fluffy@FreeBSD.org; keydata= xsFNBEp+xiUBEAD01RkOYcyzU/Fnam2FI7PPwYqW00SwVmfUHihvVniiaMwzaYzchb+mzSha NsqRgjIN/i59OBpnS25OXMLEpQP7jDJnY2xKyJN2H4qn1HPHkF9cYuqvqkm+r5459g+2ZoGY 9Sr1PA0XSzXJMSQ1nRK3cFfqlN/L2//P36U5VuOWXGZUTwr/n2B/N0HAsYsqDOdjofLg7x9z 8p8elqwJbT/O4ltg8JBVAnof+FzqefYW4CzqkHRjq/9ORiGYh14ST9ECsCaVpfdDUTor0wgp JqzCN1HsQcHqgdMmOqigWIgN7Eg4MRQU3LDCISrNJ/45zvcKUXR0RHOjnSuflYba74q58XhZ 4eCTqHeMHjA8st4IWRzy9l0V4RunnZxjOTb806jyIhdxcb2m8o5tXwsqjf0TQ7vYowDHrQ6g XlhPg4Jvvwf+BwlB2p+w7Cs/Y9QA0YHnIOIVZAwU1wv66YSI9IDL2AbnY2gQGx+dkHiC3S5L G8HcPrMcjayyThKKIi5KQsWa3snFeK5ky+cRpVEOPQfUXFOas++91v90Xe9j+lsmRofsyvuy gzoaZE2fud0kCsOgYEg+kiLPlQicNAx5IToOs8BrVFLcxmbPKuVBfbLdWsYLjXGzbXEmzV9f NDZ1r1uNmVema8YYCiNjUDZhxIfKt8nbp6cx8UgVLGRVDEfXeQARAQABzTdEaW1hIFBhbm92 IChGcmVlQlNELk9SRyBDb21taXR0ZXIpIDxmbHVmZnlARnJlZUJTRC5PUkc+wsF2BBMBAgAg BQJKfsYlAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ+4ugndU5jyk6dhAArHclTYjw VRjDnoRfO3Zfj9Ssab9Vrbo7DNFWeAqPE3OTCmiq9Q0fzRHzmhVyedYMm9qNA3i0J1De3KTn LanXOrBIqsmmZpSqmrp/xXdZngDLW5H6hpE0f2PeAPwxrb9uBQax8WMR7Z4STSHAP4GRjve3 0wNNS0MlawGllcs9VKRxG5PsDA8k3ACTSjdpQ76RWldORN4LA8M40yHRX377SGMzO+XsCeOw ad65GKyLrx+6Gnd3PMOjVCJCrqd04Jgqg9G0xKNImchwIZ5ulx9jAt+ixfNbY6hwslleqimr 2t5+MMqo6dRrvJ+BsR8NHt9vGi2Jy4+4smg05fR18fck0Sk4vCYyVvtvnOk3qZf0F8zJu06G cjWWC2ZbDPbmksWXFIMxoJbyVxK55xOqcFs0t12sR6gbVJb8Nb88WrQub3MgePyMF6R3Tkfa OqkjvQur1xC2AXESTxtJw1FkdGSb3UopNKgvSPHSLFW8B0LbyDxdYRTRWPGGEUhFP6tdXi5R vb1210ks2EQAqF4Cm3iRIhYgtZvQqQgMSiO9fVyeJ0U6dYGDtg2Boi+NtXKRdmtL7pRSnI3n fAbVJ05Hhd7PBnJeob6R08nHRo9DdAG7o8ToM+egUAuEsEvoRV+v4f6k3mShdxE7gG/anwVy eh3n6LGwg9KHDr1X2FODsLLxgUjOwU0ESn7GJQEQAMBTMHQgb0vcPMAiRvb357ihlh/YYA22 FXj4p3XTrDlBlRL0QCRq1I8XDeQmL3mG3s3NBtDXSefnNM06jZ3XCAfHIDBdxJJvQZZCXfvL p/JK7nnEuqoeqT6/oKs1MeZVdUnvh1nZhphs+Z6dl01GIE8YDpzT1JMD2f3G9PHChGi3Ddzq m3VdXt/87khYJkPbaf6EN5+vDthKgMjba8jwbQ+7IUPqkfnNFIZS6irZ2LYb79BLNI5JSl9l ReSfEX2d8ByQlLzuf0TS4voy3nWGeCyj6BIOMiRSxg+hZmJLYxhNkyK4GQVCt/rLT7dIfBQM syBbX0Qw2NOcfba9VgdPZBgdrawwB4/xF9SA3NB0J0lUjhjpH9iG8NxlpleEg8OSUApyFZEJ q2A/flns4kKzNH7AGYDOFORytDzA3qkgCJrZ7nzQSsdtZ2qbyAoze0tl+YrShJhOcmQBtFem omhWVeJ8T/Bw1KH8M1ihrENBTSzYzLvN18YjNP6P0Dh/7Zda5yYI8fNqd84K3Uq5xBiI0S6+ qxViw84z2tJj8TxiNqFAk7Tbeo2Ximtq7uQ9UnFRSK3jw96yi19KU9rQQZs0xUjN5gn/tF5l BZWKjwuZCkcOiI0EWHAR+ATAEsFNXcuoC9CAGK5HFW4nI4WtE3pv1KYvivlGtF1wzf0Qrhye RrmxABEBAAHCwV8EGAECAAkFAkp+xiUCGwwACgkQ+4ugndU5jymgKg//RvnI7zEDKv6nQUqK RyLawPTrCKCtQ2vSoWyTNgRB6byNS1w5wNSAMnqaESx2bdhauaxe167VEJYqgQy241yFslpC 6v/xlH25Ppos+Jg6AKaQG/JABHO6Co4tHtBbNmM+14HESxAodA4NJuEU19iIPjRhUKC8F8R9 xBmW1uLpPiljU9Km0P3EIKjAdtdZNeMLhwsbSHBwJROFrxFGiTzWNREWZoZpQxgSbHYhwYbx HEbJi1cybl9IQvSGHrysctZsxD04Jxh6ogaziiT8aV6ear6BNh008yRf61FvrinfG3USLR3i JO8aHap4QGCPjZ3cyT+DEq8/zVfDdeidTeNEhSgRKk856RcA+yAE79KYdKkvmDUiC8poAJ7F GEYHMB+g/1+LczCr2g9GYkiB/53boYfU9esYYlarxCgedCrwXv6T48FZ3xxoH3XJ2KV8K6M8 CUb04jj3kEeCwq+R6Bk2ZXrnMzyQmmn223X+Zp89B/gchH32JY8y3j7BICcoZmgMu62XNMgW I/hRgfi3JlVCne6XPj3/w00JYG7vo+eTJOflqYr3WRTPYh7DxzYtshZswHmmkZtwizUQUZzF 9dX2CM8nY7cKucEmtcnUpjGwXMOufa/DmCTlk8ggRZ0ukCUZOlIA4ILxp95sS2oqyucARv+p wMWvrqJ/LfbZexSsIjI= Organization: FreeBSD.org In-Reply-To: <202508191320.57JDKkFi035855@gitrepo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------N2gaEHgAKomVJPGhy6IUUbbN" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------N2gaEHgAKomVJPGhy6IUUbbN Content-Type: multipart/mixed; boundary="------------hn9cz7eHCVzTL50EDzSDe5cq"; protected-headers="v1" From: Dima Panov To: Mark Johnston , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Message-ID: <80b17387-74d5-40b0-80e5-ca756bed0649@FreeBSD.org> Subject: Re: git: 5105e1ebecc7 - main - krb5: Fix the installed compile_et References: <202508191320.57JDKkFi035855@gitrepo.freebsd.org> In-Reply-To: <202508191320.57JDKkFi035855@gitrepo.freebsd.org> --------------hn9cz7eHCVzTL50EDzSDe5cq Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 SGVsbG8hDQoNCk9uIDE5LjA4LjIwMjUgMTY6MjAsIE1hcmsgSm9obnN0b24gd3JvdGU6DQo+ IGRpZmYgLS1naXQgYS9rcmI1L01ha2VmaWxlLmluYyBiL2tyYjUvTWFrZWZpbGUuaW5jDQo+ IGluZGV4IGNkNTRmN2EwZWZmNi4uNmRiNGU4ZDk2NGFhIDEwMDY0NA0KPiAtLS0gYS9rcmI1 L01ha2VmaWxlLmluYw0KPiArKysgYi9rcmI1L01ha2VmaWxlLmluYw0KPiBAQCAtMTQsNyAr MTQsNyBAQCBLUkI1X1ZFUlNJT049CTEuMjItZmluYWwNCj4gICAjIE1JVCBLUkI1IHVzZXMg S1JCNV9ESVIuIEhlaW1kYWwgdXNlcyBLUkI1RElSLg0KPiAgIEtSQjVfU1JDVE9QPQkke1NS Q1RPUH0va3JiNQ0KPiAgIEtSQjVfRElSPQkke1NSQ1RPUH0vY3J5cHRvL2tyYjUvc3JjDQo+ IC1LUkI1X0VURElSPz0JJHtERVNURElSfS91c3Ivc2hhcmUvZXQNCj4gK0tSQjVfRVRESVI/ PQkvdXNyL3NoYXJlL2V0DQo+ICAgS1JCNV9TUkNMSUJESVI9CSR7S1JCNV9ESVJ9L2xpYg0K PiAgIA0KPiAgIEtSQjVfT0JKVE9QPQkke09CSlRPUH0va3JiNQ0KPiBkaWZmIC0tZ2l0IGEv a3JiNS91dGlsL2V0L01ha2VmaWxlIGIva3JiNS91dGlsL2V0L01ha2VmaWxlDQo+IGluZGV4 IDZlY2ViMjUzYzNiMC4uMGQ0NzRlZmExZThlIDEwMDY0NA0KDQoNCldoYXQgdGhlIHJlYXNv biB0byBvbWl0ICR7REVTVERJUn0gaGVyZT8NCkl0IHdpbGwgYmUgYWx3YXlzIGluc3RhbGwg YnkgZ2xvYmFsIHBhdGggaW5zdGVhZCBvZiByZXF1ZXN0ZWQgZGVzdGluYXRpb24gcm9vdC4N Cg0KLS0gDQpTaW5jZXJlbHksDQpEaW1hIChmbHVmZnlARnJlZUJTRC5vcmcsIGh0dHBzOi8v dC5tZS9GbHVmZnlCU0QsIEBmbHVmZnk6bWF0cml4LWRldi5mcmVlYnNkLm9yZykNCihkZXNr dG9wLCBrZGUsIHgxMSwgb2ZmaWNlLCBwb3J0cy1zZWN0ZWFtKUBGcmVlQlNEIHRlYW0NCg0K --------------hn9cz7eHCVzTL50EDzSDe5cq-- --------------N2gaEHgAKomVJPGhy6IUUbbN Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEELTAsy5mEEwxvh7r8+4ugndU5jykFAmiktX0FAwAAAAAACgkQ+4ugndU5jylH 3Q//e8Yp9bN4lOEZSMvWiNzo+wrc1IlhpF/9rwV4rs6Mmf4KkFH1zxS6+BjL9WK+U8Y7keaBZVPS G7yaUNmvMvVQFVY6P0ziLPZLCA+nLINHRlwx/1HQduDF+SYQ7P93X/lP65WVO/RWxpAjCv5qHuvs yv4PzOrOG7pkOsIJ7FIRU8aOKYb3QDPw8ZuGFN33ZSAC32yAvBnusrkbzjS3cOPJnQ9pIdwQQL29 3o6vU0+CfletspOiyCXwfxwIQfl8tBcpkhBYfG0k8DxKloQ1Copadz0jQRnIfrZ9DiosShh01jhK rMWQedKs4vweVuFnHOXLxze9VEGijSVxrS6wOyD7qtLUYKQYZM7HlaSfgol0urv/xC+t+8Ssi1Ex oAxE43PvLRcdxwBL4so6wumroiwVsXVUvFf4RvvyPQdSRU+M2y5vCugBr67mmR39wj28mIH/Lxmw NrQgmpOu+ZK7e7LTiWon8b/ZtM9PO7CRdPby+FHWqZy8EcIqFcjy27JKpx4joXC6grJATxMZuzeu 26T5hugcNJiuV8TJvhZ3pLMfI78OItwpgn7Uf6CAfAz779OnhX7cFuyhc+woigTqSH92gE4OqcO7 ktj+R3wdmTCTvQ9Mq/rPWOJtylcQdI89gO5r12leba4NF5tmU+UwEaPqKlHHaILlAaxRb1jDb+KG wkw= =JFMY -----END PGP SIGNATURE----- --------------N2gaEHgAKomVJPGhy6IUUbbN-- From nobody Tue Aug 19 17:42:20 2025 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 4c5xjx63qVz65K1d; Tue, 19 Aug 2025 17:42:29 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) (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 4c5xjx40Fmz444B; Tue, 19 Aug 2025 17:42:29 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-x82b.google.com with SMTP id d75a77b69052e-4b109919a09so68821911cf.0; Tue, 19 Aug 2025 10:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755625343; x=1756230143; 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=vcDD+Nc+rTNCF9PXZYbALVeco2WIkoiOJTiOcMnQ+Wk=; b=X5SU7D0LnWfuBE9RxpOS5uxZOvZZ6dcO2bXyJ3MURsMbe7uRZql/IyeHosO7Qzszh9 +iF3PtkQ3xiowQvwLawhz5GHvCUTzwO2W6L/inMyncEsXmFENei4sVWaPwqZxGrSptZY N6bguFPs5KDQlazH0SGozpUCgHd0qPnWll5aY6JOklTZL+gE88l6Os2jq3oLOUd/AmQf hCFIMgxIq1YcZGpxphQ7Y2svXsll7GCUFAwvRadbQNObuhviXjRbOTlLibrTRiQdl0En NkJN79ZX9pQdXVVOWeqQY7ByZ4l2V/2Tp4s50ZLbTDq76tNn11eLraoswxNqR4doI4vE wfNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755625343; x=1756230143; 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=vcDD+Nc+rTNCF9PXZYbALVeco2WIkoiOJTiOcMnQ+Wk=; b=FrNsRTNInq+zm266hSjN/xQ+MdLLEU6id3ROLc6tGwK75yBWGMD2eYQAQEcAFafGMh UZcFBacWZT+6Pb0S0aiTY+NUB6P3bOLLMruiEvL3UxXLcyh4FZCXt92vs5GPajUZmk7T TK8a++RYOjqkHxsRWctJ1uuwU9h1yCZocVRwiD5dx9mZdbZlxDmbU37HXTKhWHyV5hCk bJC3knJmX0P0XVZ981zmDntZJ+CGzG9DDAOCOM74y1hlWgonq1Rv7JSadYBZ5xoQpCON Cs+Y44h8XpGi06XidEdnOJ0kEYBDFXEZwnFrsvpyGCv0xHxZOZY+ODcgJsMgMepwFuuQ 9YMw== X-Forwarded-Encrypted: i=1; AJvYcCUCKcXMyEJAwm27p+KLwGIzkVilXd/49YwTO7Moz1LGNdd4Y0XVEVBb2WcIetMcqmrjotc1Y9SN5VIvBr4dT5OER954@freebsd.org, AJvYcCVeQxvllXgeHYRpem+FL90ezq4xkMSWEu2PhmQUhRDipuDO75cXBrr3le5dQBzPEDbGvZ+XxP0LIrcGQ+zD8+ZbYOQyAw8=@freebsd.org X-Gm-Message-State: AOJu0YyPPU9mFtH4YOroxsPZam/K0idbvupcdk0fbcH9W46X6Ifet5wK HgFBmsQl33nOC7i5vFS7LYqLoltNnHjhpFBOfUKF5VF/nEUnSQEHvDrRxwnPIzOa X-Gm-Gg: ASbGncsPCApcx/T9Wo56RUrdCmChciq5DVa4vVeFPUfk7loIXr/TwTwdg1StCw8aXhv YVTQkYIFemZiKqLV/tQ9ri49/cNZ7YnNxKwFDqWHpPDSETeGzIp66Itrtnjz5Xo2etjT5K7tER1 DErrWVq2XOixZIfRU6pD+H7k0OYh7HIOqZgM0GN5sCSMi0iQ5tX+Tve6qcyU35/T6quO+I8KHbM ngvQv6+oEaTzEs584s6wheMkpMYQFF/DENPf7cDiHT1XTYQ9DHsnMjFVoHQacesp5gCiRskzZD4 u0js91/iD6Aali4kU66nJrp4gFLvx2t2VQb4yVmdU26m0r+AGRRbwuB4OdyDy3KTFkQAk6dZQrL Mk3erhVOm5m0AynbOzdiX6hIy4Z5U4vS2DC7J X-Google-Smtp-Source: AGHT+IH/Oi84xEMiFBec8dDQs3ZYW5zIIiKiz5FfITKpjkWhLHGdmc+vjO7zdBijkpNWyhVoeanM5g== X-Received: by 2002:ac8:5941:0:b0:4b0:7581:4dbf with SMTP id d75a77b69052e-4b286cf51eamr39074651cf.18.1755625343335; Tue, 19 Aug 2025 10:42:23 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4b27e61a597sm24417431cf.38.2025.08.19.10.42.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Aug 2025 10:42:22 -0700 (PDT) Date: Tue, 19 Aug 2025 13:42:20 -0400 From: Mark Johnston To: Dima Panov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 5105e1ebecc7 - main - krb5: Fix the installed compile_et Message-ID: References: <202508191320.57JDKkFi035855@gitrepo.freebsd.org> <80b17387-74d5-40b0-80e5-ca756bed0649@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: <80b17387-74d5-40b0-80e5-ca756bed0649@FreeBSD.org> X-Spamd-Bar: ---- 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-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c5xjx40Fmz444B On Tue, Aug 19, 2025 at 08:33:49PM +0300, Dima Panov wrote: > Hello! > > On 19.08.2025 16:20, Mark Johnston wrote: > > diff --git a/krb5/Makefile.inc b/krb5/Makefile.inc > > index cd54f7a0eff6..6db4e8d964aa 100644 > > --- a/krb5/Makefile.inc > > +++ b/krb5/Makefile.inc > > @@ -14,7 +14,7 @@ KRB5_VERSION= 1.22-final > > # MIT KRB5 uses KRB5_DIR. Heimdal uses KRB5DIR. > > KRB5_SRCTOP= ${SRCTOP}/krb5 > > KRB5_DIR= ${SRCTOP}/crypto/krb5/src > > -KRB5_ETDIR?= ${DESTDIR}/usr/share/et > > +KRB5_ETDIR?= /usr/share/et > > KRB5_SRCLIBDIR= ${KRB5_DIR}/lib > > KRB5_OBJTOP= ${OBJTOP}/krb5 > > diff --git a/krb5/util/et/Makefile b/krb5/util/et/Makefile > > index 6eceb253c3b0..0d474efa1e8e 100644 > > > What the reason to omit ${DESTDIR} here? > It will be always install by global path instead of requested destination root. This is consistent with how we handle other utilities. For instance, man(1) searches /usr/share/man, not ${DESTDIR}/usr/share/man, executables are started by /libexec/ld-elf.so.1, not ${DESTDIR}/libexec/ld-elf.so.1, etc.. From nobody Tue Aug 19 17:42:50 2025 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 4c5xkQ2vCpz65KRS; Tue, 19 Aug 2025 17:42:54 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c5xkQ2Bf7z44JV; Tue, 19 Aug 2025 17:42:54 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755625374; 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=RtH94dG/ZZVIUjD97zJL9G7Gy4TlFfb0i8Sklu1qyc8=; b=flwnsHY1sfrwQny4jV/nRg7ZAOqmxkrnA6jVMLu7OOGYwmOtvq5i/KWJBimOStCEF3+cch XAGM3MFyreWOWpVPoppXDYOoc1LHH8iz9ubnfdYn/JFXL2KJspC5uTdy9MvwXHpZhPYF53 B4x5cki6CMx2CTJ1PgyNaWEOOvoVMMDObiLgKBEYij+t5/DyMbUBLshtj4ps9U90GC9kSA J53AIfuD7RffIPLv7sVonLlZfhGuBBiLB858vCFi9P+WmtyWPu1hpbDIP8sZLX46nMwL7Y BfKnuka1ZArCEl322ee7zYfenBwre0nOVIvhoAzIS6E9/u5qI8KHT5E915HRQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755625374; 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=RtH94dG/ZZVIUjD97zJL9G7Gy4TlFfb0i8Sklu1qyc8=; b=CW0Cs261iylmDZ7mlXD2TY4xINUaR9iMuZeMuG4OxGsyooZxDNdI05jZGYE9CzfNcgOOix EBDKAR57EmEltiDBOKMHmuGNE42N3IYzMvn9cIFtH/1Xcbo50Q4B8EWe7uoDSJc4FyV0Wo xqNPsDrx5IcYO/M5OrnRC17vw0fBW3nOwrSmJnzeZgBn73vgssI2lmJqm5JqnSt92m/jCR vH6X9xMK9YIrRpW+MwyFsKyTWhzmh3z6ZpoUM/5Rqs/q0cEVlOGGpkJ+yjwJ3N0c+QjiT+ 7idphRpLZk51VFCHrnnYckFW9daI3OwW63FYOaSyO7dPfkNhyfy7FOG5shlPdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755625374; a=rsa-sha256; cv=none; b=ehWepcv0XtkK5cDC5/kQ3+TrtX5C2eRpsWr1+qbuFvLHbRggTBWgHJy7dt3Rh96jSaWLSg ooGQWYYwdnAZJtbtYcR/ix8WUofO5F4pwJ+JNKGQdMMVhnENyRn2EgV+7L5izbM+3bG5A3 KeMb95K7zMzutG4/5rmRld0Y/9IEfJgUAGPytn7ckwcGX4AwuSSYDIk/bebBOe7oTB8Dpz kZTa/tEWUTz+MlqAxaAF6PY+dRi6EUxaOabAAiD1zkTFGY/yvHrThVQUWyqkt7m8CbzwDw abvM2Bvi5vtlRLnPCmQ+Yb/P1ffviyEFVG5TxrH2QIgEI+HBEK+SmWMppF2jPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (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: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c5xkP4x4rz45l; Tue, 19 Aug 2025 17:42:53 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Tue, 19 Aug 2025 18:42:50 +0100 From: Lexi Winter To: Dima Panov Cc: Mark Johnston , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 5105e1ebecc7 - main - krb5: Fix the installed compile_et Message-ID: Mail-Followup-To: Dima Panov , Mark Johnston , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202508191320.57JDKkFi035855@gitrepo.freebsd.org> <80b17387-74d5-40b0-80e5-ca756bed0649@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: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="m7/DkJl8NBW5T6YV" Content-Disposition: inline In-Reply-To: <80b17387-74d5-40b0-80e5-ca756bed0649@FreeBSD.org> --m7/DkJl8NBW5T6YV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Dima Panov: > On 19.08.2025 16:20, Mark Johnston wrote: > > -KRB5_ETDIR?=3D ${DESTDIR}/usr/share/et > > +KRB5_ETDIR?=3D /usr/share/et >=20 > What the reason to omit ${DESTDIR} here? > It will be always install by global path instead of requested destination= root. ${KRB5_ETDIR} is used as ETSCRIPTSDIR in krb5/util/et/Makefile: FILESGROUPS=3D ETSCRIPTS [...] ETSCRIPTSDIR=3D ${KRB5_ETDIR} the files install target in bsd.files.mk already prepends ${DESTDIR} when installing. --m7/DkJl8NBW5T6YV Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaKS3lAAKCRD1nT63mIK/ YA5lAQC5kVOEy7REhQm3qWWpJtv8JA1Zp4D+jXnx6k24ESeeUQD/XCqvLPvT7aZC qf/1GNWIdWBzFXzRBsjlHT8WwQuaYQQ= =czUa -----END PGP SIGNATURE----- --m7/DkJl8NBW5T6YV-- From nobody Tue Aug 19 19:25:18 2025 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 4c600b5Qpbz65Q77; Tue, 19 Aug 2025 19:25:19 +0000 (UTC) (envelope-from mhorne@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c600b57ygz4GpV; Tue, 19 Aug 2025 19:25:19 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755631519; 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: in-reply-to:in-reply-to:references:references; bh=3ny8YO7XE1FCFleLqrWm6775oJw7CVr9pIrKxlNd3/Q=; b=MYbtlCz3oSA8wJcnIOODHTfJdRy3xGggkH3WGIbAnFajvzjEIHqKJZR8ez3E54YGC+uO4s Fy5dMQcfqbE5fASXgL253lom6RHo97WC3RRNtK23J1HbjpHZ+zj9ZexJTj+H6btYYCWDJn Ax5F6kEc1Jo5nhZ72YrnmXrqZnKuYQJsCo05XS9HVLB3rjH+RhyjJ9UgthFyI3ojVUCQRG 70h9e0rpf2jo26LdSVPMABjA3thTqIl3kr2PqBQw0nXy8vEgqBwHarRK3TYITtrhlfFnK4 TpqgBFPjTPcnZEY1M4Aga31g2p2gS99SavEuCTyxZFbugPne/CWNztbw7XRn7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755631519; 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: in-reply-to:in-reply-to:references:references; bh=3ny8YO7XE1FCFleLqrWm6775oJw7CVr9pIrKxlNd3/Q=; b=TzoePLZ7koQGolu/ms2nEmfuXfBQOPrbSPVAwj28lTkg+4q4PoPin5TvnWNR5RAXkP/wBa zXj3Y3SaQCr5/zBRk/2/SwykWkZI1cIwvgkUmbLUbINurilo6vblcMbyVfq1Yoed86PZsn uJrVYX3rNDBMNyUDme0dxSR1udh2R+4pHtWJhSMLI3nwRwfag//4PQFnd9RuyPKLaWfR95 Mni6e/bRfkCEB/eD49Dg+YgOogxKYZ8oSz3mme97U5ZT+qnU0JAzTSIL1HtkaJ2p+MQ5Lq FOITeAIhuTcRdFzmXjJgUX8Icapd4Il5DIL1EGl+8iLyBq6VUyMojv66884L0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755631519; a=rsa-sha256; cv=none; b=pBs9WL0lXznl+pjr86ja6vwx3vht9dgGP97EU98wIzCxUx2Wk/l1qO+Hakc77UfiAmwPot 9xnEPmX0dZvT1oflOOafaHvFxIG6f+y9nxFs2PMJkYitqBiQ0RIF8kD4tC3niF6Kbd84JS yk/NcWMhmt5v26p3zwcEvgw/vXvuu7Ao0FOxVzAvRH0K5C451Zy7s6nXnduYb4W342x10U GuELRLqJPiftpMOYizhmaSMegLf5XLTowcFFnxuqWal8fuCAQOFGYm/X903+1Ycd0m4G7V tNbHPcOdTutNT9QVeCO/FONx1ygcjTV7x7etc44XNRiuss2zCASSyzHP8yObAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.1.217] (hlfxns018gw-134-41-175-217.dhcp-dynamic.fibreop.ns.bellaliant.net [134.41.175.217]) (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 did not present a certificate) (Authenticated sender: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c600b360qz4J6; Tue, 19 Aug 2025 19:25:19 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: <7704c59a-5ca1-4493-b362-ee81e78fab0f@freebsd.org> Date: Tue, 19 Aug 2025 16:25:18 -0300 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 User-Agent: Mozilla Thunderbird From: Mitchell Horne Subject: Re: git: 26d6617f3e54 - main - watchdog: Convert to using sbintime_t format To: Justin Hibbits , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202508141903.57EJ39C9018272@gitrepo.freebsd.org> Content-Language: en-CA In-Reply-To: <202508141903.57EJ39C9018272@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 8/14/25 16:03, Justin Hibbits wrote: > The branch main has been updated by jhibbits: > > URL: https://cgit.FreeBSD.org/src/commit/?id=26d6617f3e5406d9f92d87674f1667dd856828a3 > > commit 26d6617f3e5406d9f92d87674f1667dd856828a3 > Author: Justin Hibbits > AuthorDate: 2025-02-26 20:25:36 +0000 > Commit: Justin Hibbits > CommitDate: 2025-08-14 19:02:46 +0000 > > watchdog: Convert to using sbintime_t format > > Summary: > Some watchdogs are now based on a countdown timer instead of a bit > check. To deal with these, convert the watchdog framework to use > sbintime_t instead of power-of-2-nanoseconds. This allows more > precision, and more variety of watchdog timeouts. Keep the old method > as a compatibility layer, so that drivers can be migrated slowly, as > needed. Hi Justin, The watchdog(4) man page needs to be updated for the new ioctl API. Can you please handle this? There is also the watchdog(9) page, which is of lower quality and detail. I would not insist on changes here, but I do note that it is affected. Best, Mitchell > > Reviewed by: jhb > Sponsored by: Juniper Networks, Inc. > Differential Revision: https://reviews.freebsd.org/D49183 > --- > sys/dev/watchdog/watchdog.c | 202 ++++++++++++++++++++++------------------- > sys/sys/watchdog.h | 17 ++-- > usr.sbin/watchdogd/watchdogd.c | 99 +++++--------------- > 3 files changed, 143 insertions(+), 175 deletions(-) > > diff --git a/sys/dev/watchdog/watchdog.c b/sys/dev/watchdog/watchdog.c > index c0babef1b29b..e1b2e08c3f10 100644 > --- a/sys/dev/watchdog/watchdog.c > +++ b/sys/dev/watchdog/watchdog.c > @@ -50,11 +50,20 @@ > > #include /* kern_clock_gettime() */ > > -static int wd_set_pretimeout(int newtimeout, int disableiftoolong); > +#ifdef COMPAT_FREEBSD14 > +#define WDIOCPATPAT_14 _IOW('W', 42, u_int) /* pat the watchdog */ > +#define WDIOC_SETTIMEOUT_14 _IOW('W', 43, int) /* set/reset the timer */ > +#define WDIOC_GETTIMEOUT_14 _IOR('W', 44, int) /* get total timeout */ > +#define WDIOC_GETTIMELEFT_14 _IOR('W', 45, int) /* get time left */ > +#define WDIOC_GETPRETIMEOUT_14 _IOR('W', 46, int) /* get the pre-timeout */ > +#define WDIOC_SETPRETIMEOUT_14 _IOW('W', 47, int) /* set the pre-timeout */ > +#endif > + > +static int wd_set_pretimeout(sbintime_t newtimeout, int disableiftoolong); > static void wd_timeout_cb(void *arg); > > static struct callout wd_pretimeo_handle; > -static int wd_pretimeout; > +static sbintime_t wd_pretimeout; > static int wd_pretimeout_act = WD_SOFT_LOG; > > static struct callout wd_softtimeo_handle; > @@ -63,6 +72,8 @@ static int wd_softtimer; /* true = use softtimer instead of hardware > static int wd_softtimeout_act = WD_SOFT_LOG; /* action for the software timeout */ > > static struct cdev *wd_dev; > +static volatile sbintime_t wd_last_sbt; /* last timeout value (sbt) */ > +static sbintime_t wd_last_sbt_sysctl; /* last timeout value (sbt) */ > static volatile u_int wd_last_u; /* last timeout value set by kern_do_pat */ > static u_int wd_last_u_sysctl; /* last timeout value set by kern_do_pat */ > static u_int wd_last_u_sysctl_secs; /* wd_last_u in seconds */ > @@ -73,6 +84,8 @@ SYSCTL_UINT(_hw_watchdog, OID_AUTO, wd_last_u, CTLFLAG_RD, > &wd_last_u_sysctl, 0, "Watchdog last update time"); > SYSCTL_UINT(_hw_watchdog, OID_AUTO, wd_last_u_secs, CTLFLAG_RD, > &wd_last_u_sysctl_secs, 0, "Watchdog last update time"); > +SYSCTL_SBINTIME_MSEC(_hw_watchdog, OID_AUTO, wd_last_msecs, CTLFLAG_RD, > + &wd_last_sbt_sysctl, "Watchdog last update time (milliseconds)"); > > static int wd_lastpat_valid = 0; > static time_t wd_lastpat = 0; /* when the watchdog was last patted */ > @@ -80,41 +93,26 @@ static time_t wd_lastpat = 0; /* when the watchdog was last patted */ > /* Hook for external software watchdog to register for use if needed */ > void (*wdog_software_attach)(void); > > -static void > -pow2ns_to_ts(int pow2ns, struct timespec *ts) > +/* Legacy interface to watchdog. */ > +int > +wdog_kern_pat(u_int utim) > { > - uint64_t ns; > + sbintime_t sbt; > > - ns = 1ULL << pow2ns; > - ts->tv_sec = ns / 1000000000ULL; > - ts->tv_nsec = ns % 1000000000ULL; > -} > + if ((utim & WD_LASTVAL) != 0 && (utim & WD_INTERVAL) > 0) > + return (EINVAL); > > -static int > -pow2ns_to_ticks(int pow2ns) > -{ > - struct timeval tv; > - struct timespec ts; > + if ((utim & WD_LASTVAL) != 0) { > + return (wdog_control(WD_CTRL_RESET)); > + } > > - pow2ns_to_ts(pow2ns, &ts); > - TIMESPEC_TO_TIMEVAL(&tv, &ts); > - return (tvtohz(&tv)); > -} > + utim &= WD_INTERVAL; > + if (utim == WD_TO_NEVER) > + sbt = 0; > + else > + sbt = nstosbt(1 << utim); > > -static int > -seconds_to_pow2ns(int seconds) > -{ > - uint64_t power; > - uint64_t ns; > - uint64_t shifted; > - > - ns = ((uint64_t)seconds) * 1000000000ULL; > - power = flsll(ns); > - shifted = 1ULL << power; > - if (shifted <= ns) { > - power++; > - } > - return (power); > + return (wdog_kern_pat_sbt(sbt)); > } > > int > @@ -126,76 +124,63 @@ wdog_control(int ctrl) > } > > if ((ctrl & WD_CTRL_RESET) != 0) { > - wdog_kern_pat(WD_ACTIVE | WD_LASTVAL); > + wdog_kern_pat_sbt(wd_last_sbt); > } else if ((ctrl & WD_CTRL_ENABLE) != 0) { > - wdog_kern_pat(WD_ACTIVE | WD_LASTVAL); > + wdog_kern_pat_sbt(wd_last_sbt); > } > > return (0); > } > > int > -wdog_kern_pat(u_int utim) > +wdog_kern_pat_sbt(sbintime_t sbt) > { > - int error; > - static int first = 1; > - > - if ((utim & WD_LASTVAL) != 0 && (utim & WD_INTERVAL) > 0) > - return (EINVAL); > - > - if ((utim & WD_LASTVAL) != 0) { > - /* > - * if WD_LASTVAL is set, fill in the bits for timeout > - * from the saved value in wd_last_u. > - */ > - MPASS((wd_last_u & ~WD_INTERVAL) == 0); > - utim &= ~WD_LASTVAL; > - utim |= wd_last_u; > - } else { > - /* > - * Otherwise save the new interval. > - * This can be zero (to disable the watchdog) > - */ > - wd_last_u = (utim & WD_INTERVAL); > + sbintime_t error_sbt = 0; > + int pow2ns = 0; > + int error = 0; > + static bool first = true; > + > + /* legacy uses power-of-2-nanoseconds time. */ > + if (sbt != 0) { > + pow2ns = flsl(sbttons(sbt)); > + } > + if (wd_last_sbt != sbt) { > + wd_last_u = pow2ns; > wd_last_u_sysctl = wd_last_u; > - wd_last_u_sysctl_secs = pow2ns_to_ticks(wd_last_u) / hz; > + wd_last_u_sysctl_secs = sbt / SBT_1S; > + > + wd_last_sbt = sbt; > } > - if ((utim & WD_INTERVAL) == WD_TO_NEVER) { > - utim = 0; > > - /* Assume all is well; watchdog signals failure. */ > - error = 0; > - } else { > - /* Assume no watchdog available; watchdog flags success */ > + if (sbt != 0) > error = EOPNOTSUPP; > - } > + > if (wd_softtimer) { > - if (utim == 0) { > + if (sbt == 0) { > callout_stop(&wd_softtimeo_handle); > } else { > - (void) callout_reset(&wd_softtimeo_handle, > - pow2ns_to_ticks(utim), wd_timeout_cb, "soft"); > + (void) callout_reset_sbt(&wd_softtimeo_handle, > + sbt, 0, wd_timeout_cb, "soft", 0); > } > error = 0; > } else { > - EVENTHANDLER_INVOKE(watchdog_list, utim, &error); > + EVENTHANDLER_INVOKE(watchdog_sbt_list, sbt, &error_sbt, &error); > + EVENTHANDLER_INVOKE(watchdog_list, pow2ns, &error); > } > /* > - * If we no hardware watchdog responded, we have not tried to > + * If no hardware watchdog responded, we have not tried to > * attach an external software watchdog, and one is available, > * attach it now and retry. > */ > - if (error == EOPNOTSUPP && first && *wdog_software_attach != NULL) { > + if (error == EOPNOTSUPP && first && wdog_software_attach != NULL) { > (*wdog_software_attach)(); > - EVENTHANDLER_INVOKE(watchdog_list, utim, &error); > + EVENTHANDLER_INVOKE(watchdog_sbt_list, sbt, &error_sbt, &error); > + EVENTHANDLER_INVOKE(watchdog_list, pow2ns, &error); > } > - first = 0; > + first = false; > > + /* TODO: Print a (rate limited?) warning if error_sbt is too far away */ > wd_set_pretimeout(wd_pretimeout, true); > - /* > - * If we were able to arm/strobe the watchdog, then > - * update the last time it was strobed for WDIOC_GETTIMELEFT > - */ > if (!error) { > struct timespec ts; > > @@ -206,6 +191,7 @@ wdog_kern_pat(u_int utim) > wd_lastpat_valid = 1; > } > } > + > return (error); > } > > @@ -282,16 +268,14 @@ wd_timeout_cb(void *arg) > * current actual watchdog timeout. > */ > static int > -wd_set_pretimeout(int newtimeout, int disableiftoolong) > +wd_set_pretimeout(sbintime_t newtimeout, int disableiftoolong) > { > - u_int utime; > - struct timespec utime_ts; > - int timeout_ticks; > + sbintime_t utime; > + sbintime_t timeout_left; > > - utime = wdog_kern_last_timeout(); > - pow2ns_to_ts(utime, &utime_ts); > + utime = wdog_kern_last_timeout_sbt(); > /* do not permit a pre-timeout >= than the timeout. */ > - if (newtimeout >= utime_ts.tv_sec) { > + if (newtimeout >= utime) { > /* > * If 'disableiftoolong' then just fall through > * so as to disable the pre-watchdog > @@ -309,7 +293,7 @@ wd_set_pretimeout(int newtimeout, int disableiftoolong) > return 0; > } > > - timeout_ticks = pow2ns_to_ticks(utime) - (hz*newtimeout); > + timeout_left = utime - newtimeout; > #if 0 > printf("wd_set_pretimeout: " > "newtimeout: %d, " > @@ -323,8 +307,8 @@ wd_set_pretimeout(int newtimeout, int disableiftoolong) > #endif > > /* We determined the value is sane, so reset the callout */ > - (void) callout_reset(&wd_pretimeo_handle, > - timeout_ticks, wd_timeout_cb, "pre"); > + (void) callout_reset_sbt(&wd_pretimeo_handle, > + timeout_left, 0, wd_timeout_cb, "pre", 0); > wd_pretimeout = newtimeout; > return 0; > } > @@ -333,6 +317,7 @@ static int > wd_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data, > int flags __unused, struct thread *td) > { > + sbintime_t sb; > u_int u; > time_t timeleft; > int error; > @@ -368,32 +353,55 @@ wd_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data, > error = EINVAL; > } > break; > - case WDIOC_GETPRETIMEOUT: > - *(int *)data = (int)wd_pretimeout; > +#ifdef COMPAT_FREEBSD14 > + case WDIOC_GETPRETIMEOUT_14: > + *(int *)data = (int)(wd_pretimeout / SBT_1S); > break; > - case WDIOC_SETPRETIMEOUT: > - error = wd_set_pretimeout(*(int *)data, false); > + case WDIOC_SETPRETIMEOUT_14: > + error = wd_set_pretimeout(*(int *)data * SBT_1S, false); > break; > - case WDIOC_GETTIMELEFT: > + case WDIOC_GETTIMELEFT_14: > error = wd_get_time_left(td, &timeleft); > if (error) > break; > *(int *)data = (int)timeleft; > break; > - case WDIOC_SETTIMEOUT: > + case WDIOC_SETTIMEOUT_14: > u = *(u_int *)data; > - error = wdog_kern_pat(seconds_to_pow2ns(u)); > + error = wdog_kern_pat_sbt(mstosbt(u * 1000ULL)); > break; > - case WDIOC_GETTIMEOUT: > + case WDIOC_GETTIMEOUT_14: > u = wdog_kern_last_timeout(); > *(u_int *)data = u; > break; > - case WDIOCPATPAT: > + case WDIOCPATPAT_14: > error = wd_ioctl_patpat(data); > break; > +#endif > + > + /* New API */ > case WDIOC_CONTROL: > wdog_control(*(int *)data); > break; > + case WDIOC_SETTIMEOUT: > + sb = *(sbintime_t *)data; > + error = wdog_kern_pat_sbt(sb); > + break; > + case WDIOC_GETTIMEOUT: > + *(sbintime_t *)data = wdog_kern_last_timeout_sbt(); > + break; > + case WDIOC_GETTIMELEFT: > + error = wd_get_time_left(td, &timeleft); > + if (error) > + break; > + *(sbintime_t *)data = (sbintime_t)timeleft * SBT_1S; > + break; > + case WDIOC_GETPRETIMEOUT: > + *(sbintime_t *)data = wd_pretimeout; > + break; > + case WDIOC_SETPRETIMEOUT: > + error = wd_set_pretimeout(*(sbintime_t *)data, false); > + break; > default: > error = ENOIOCTL; > break; > @@ -412,6 +420,12 @@ wdog_kern_last_timeout(void) > return (wd_last_u); > } > > +sbintime_t > +wdog_kern_last_timeout_sbt(void) > +{ > + return (wd_last_sbt); > +} > + > static struct cdevsw wd_cdevsw = { > .d_version = D_VERSION, > .d_ioctl = wd_ioctl, > diff --git a/sys/sys/watchdog.h b/sys/sys/watchdog.h > index 3c9d31eb577b..8401d343a6b7 100644 > --- a/sys/sys/watchdog.h > +++ b/sys/sys/watchdog.h > @@ -32,15 +32,16 @@ > #define _SYS_WATCHDOG_H > > #include > +#include > > #define _PATH_WATCHDOG "fido" > > -#define WDIOCPATPAT _IOW('W', 42, u_int) /* pat the watchdog */ > -#define WDIOC_SETTIMEOUT _IOW('W', 43, int) /* set/reset the timer */ > -#define WDIOC_GETTIMEOUT _IOR('W', 44, int) /* get total timeout */ > -#define WDIOC_GETTIMELEFT _IOR('W', 45, int) /* get time left */ > -#define WDIOC_GETPRETIMEOUT _IOR('W', 46, int) /* get the pre-timeout */ > -#define WDIOC_SETPRETIMEOUT _IOW('W', 47, int) /* set the pre-timeout */ > +#define WDIOC_PATPAT _IOW('W', 52, sbintime_t) /* pat the watchdog */ > +#define WDIOC_SETTIMEOUT _IOW('W', 53, sbintime_t) /* set/reset the timer */ > +#define WDIOC_GETTIMEOUT _IOR('W', 54, sbintime_t) /* get total timeout */ > +#define WDIOC_GETTIMELEFT _IOR('W', 55, sbintime_t) /* get time left */ > +#define WDIOC_GETPRETIMEOUT _IOR('W', 56, sbintime_t) /* get the pre-timeout */ > +#define WDIOC_SETPRETIMEOUT _IOW('W', 57, sbintime_t) /* set the pre-timeout */ > /* set the action when a pre-timeout occurs see: WD_SOFT_* */ > #define WDIOC_SETPRETIMEOUTACT _IOW('W', 48, int) > > @@ -112,11 +113,15 @@ > #include > > typedef void (*watchdog_fn)(void *, u_int, int *); > +typedef void (*watchdog_sbt_fn)(void *, sbintime_t, sbintime_t *, int *); > > EVENTHANDLER_DECLARE(watchdog_list, watchdog_fn); > +EVENTHANDLER_DECLARE(watchdog_sbt_list, watchdog_sbt_fn); > > u_int wdog_kern_last_timeout(void); > int wdog_kern_pat(u_int utim); > +sbintime_t wdog_kern_last_timeout_sbt(void); > +int wdog_kern_pat_sbt(sbintime_t utim); > int wdog_control(int ctrl); > > /* > diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c > index 228438955006..27123f2143d0 100644 > --- a/usr.sbin/watchdogd/watchdogd.c > +++ b/usr.sbin/watchdogd/watchdogd.c > @@ -63,25 +63,25 @@ > static long fetchtimeout(int opt, > const char *longopt, const char *myoptarg, int zero_ok); > static void parseargs(int, char *[]); > -static int seconds_to_pow2ns(int); > static void sighandler(int); > static void watchdog_loop(void); > static int watchdog_init(void); > static int watchdog_onoff(int onoff); > -static int watchdog_patpat(u_int timeout); > +static int watchdog_patpat(sbintime_t); > static void usage(void); > -static int tstotv(struct timeval *tv, struct timespec *ts); > static int tvtohz(struct timeval *tv); > > static int debugging = 0; > static int end_program = 0; > static const char *pidfile = _PATH_VARRUN "watchdogd.pid"; > -static u_int timeout = WD_TO_128SEC; > +static sbintime_t timeout = 128 * SBT_1S; > static u_int exit_timeout = WD_TO_NEVER; > static u_int pretimeout = 0; > static u_int timeout_sec; > static u_int nap = 10; > +#ifdef notyet > static int passive = 0; > +#endif > static int is_daemon = 0; > static int is_dry_run = 0; /* do not arm the watchdog, only > report on timing of the watch > @@ -174,38 +174,23 @@ main(int argc, char *argv[]) > pidfile_remove(pfh); > return (EX_OK); > } else { > - if (passive) > - timeout |= WD_PASSIVE; > - else > - timeout |= WD_ACTIVE; > if (watchdog_patpat(timeout) < 0) > err(EX_OSERR, "patting the dog"); > return (EX_OK); > } > } > > -static void > -pow2ns_to_ts(int pow2ns, struct timespec *ts) > -{ > - uint64_t ns; > - > - ns = 1ULL << pow2ns; > - ts->tv_sec = ns / 1000000000ULL; > - ts->tv_nsec = ns % 1000000000ULL; > -} > - > /* > * Convert a timeout in seconds to N where 2^N nanoseconds is close to > * "seconds". > * > * The kernel expects the timeouts for watchdogs in "2^N nanosecond format". > */ > -static u_int > -parse_timeout_to_pow2ns(char opt, const char *longopt, const char *myoptarg) > +static sbintime_t > +parse_timeout_to_sbt(char opt, const char *longopt, const char *myoptarg) > { > - double a; > - u_int rv; > - struct timespec ts; > + long a; > + sbintime_t rv; > struct timeval tv; > int ticks; > char shortopt[] = "- "; > @@ -216,19 +201,17 @@ parse_timeout_to_pow2ns(char opt, const char *longopt, const char *myoptarg) > a = fetchtimeout(opt, longopt, myoptarg, 1); > > if (a == 0) > - rv = WD_TO_NEVER; > + rv = 0; > else > - rv = seconds_to_pow2ns(a); > - pow2ns_to_ts(rv, &ts); > - tstotv(&tv, &ts); > + rv = a * SBT_1S; > + tv = sbttotv(rv); > ticks = tvtohz(&tv); > if (debugging) { > printf("Timeout for %s%s " > - "is 2^%d nanoseconds " > - "(in: %s sec -> out: %jd sec %ld ns -> %d ticks)\n", > + "is " > + "(in: %s sec -> out: %jd sec %ld us -> %d ticks)\n", > longopt ? "-" : "", longopt ? longopt : shortopt, > - rv, > - myoptarg, (intmax_t)ts.tv_sec, ts.tv_nsec, ticks); > + myoptarg, (intmax_t)tv.tv_sec, tv.tv_usec, ticks); > } > if (ticks <= 0) { > errx(1, "Timeout for %s%s is too small, please choose a higher timeout.", longopt ? "-" : "", longopt ? longopt : shortopt); > @@ -364,7 +347,7 @@ watchdog_loop(void) > } > > if (failed == 0) > - watchdog_patpat(timeout|WD_ACTIVE); > + watchdog_patpat(timeout); > > waited = watchdog_check_dogfunction_time(&ts_start, &ts_end); > if (nap - waited > 0) > @@ -387,13 +370,13 @@ try_end: > * to keep the watchdog from firing. > */ > static int > -watchdog_patpat(u_int t) > +watchdog_patpat(sbintime_t sbt) > { > > if (is_dry_run) > return 0; > > - return ioctl(fd, WDIOCPATPAT, &t); > + return ioctl(fd, WDIOC_SETTIMEOUT, &sbt); > } > > static int > @@ -429,7 +412,7 @@ watchdog_onoff(int onoff) > warn("setting WDIOC_SETSOFT %d", softtimeout_set); > return (error); > } > - error = watchdog_patpat((timeout|WD_ACTIVE)); > + error = watchdog_patpat(timeout); > if (error) { > warn("watchdog_patpat failed"); > goto failsafe; > @@ -461,7 +444,7 @@ watchdog_onoff(int onoff) > } > } > /* pat one more time for good measure */ > - return watchdog_patpat((timeout|WD_ACTIVE)); > + return watchdog_patpat(timeout); > } else { > return watchdog_control(WD_CTRL_DISABLE); > } > @@ -576,15 +559,6 @@ timeout_act_str2int(const char *lopt, const char *acts) > return rv; > } > > -int > -tstotv(struct timeval *tv, struct timespec *ts) > -{ > - > - tv->tv_sec = ts->tv_sec; > - tv->tv_usec = ts->tv_nsec / 1000; > - return 0; > -} > - > /* > * Convert a timeval to a number of ticks. > * Mostly copied from the kernel. > @@ -656,30 +630,6 @@ tvtohz(struct timeval *tv) > return ((int)ticks); > } > > -static int > -seconds_to_pow2ns(int seconds) > -{ > - uint64_t power; > - uint64_t ns; > - uint64_t shifted; > - > - if (seconds <= 0) > - errx(1, "seconds %d < 0", seconds); > - ns = ((uint64_t)seconds) * 1000000000ULL; > - power = flsll(ns); > - shifted = 1ULL << power; > - if (shifted <= ns) { > - power++; > - } > - if (debugging) { > - printf("shifted %lld\n", (long long)shifted); > - printf("seconds_to_pow2ns: seconds: %d, ns %lld, power %d\n", > - seconds, (long long)ns, (int)power); > - } > - return (power); > -} > - > - > /* > * Handle the few command line arguments supported. > */ > @@ -692,8 +642,7 @@ parseargs(int argc, char *argv[]) > const char *lopt; > > /* Get the default value of timeout_sec from the default timeout. */ > - pow2ns_to_ts(timeout, &ts); > - timeout_sec = ts.tv_sec; > + timeout_sec = sbintime_getsec(timeout); > > /* > * if we end with a 'd' aka 'watchdogd' then we are the daemon program, > @@ -736,10 +685,10 @@ parseargs(int argc, char *argv[]) > break; > case 't': > timeout_sec = atoi(optarg); > - timeout = parse_timeout_to_pow2ns(c, NULL, optarg); > + timeout = parse_timeout_to_sbt(c, NULL, optarg); > if (debugging) > - printf("Timeout is 2^%d nanoseconds\n", > - timeout); > + printf("Timeout is %d\n", > + (int)(timeout / SBT_1S)); > break; > case 'T': > carp_thresh_seconds = > @@ -749,7 +698,7 @@ parseargs(int argc, char *argv[]) > do_timedog = 1; > break; > case 'x': > - exit_timeout = parse_timeout_to_pow2ns(c, NULL, optarg); > + exit_timeout = parse_timeout_to_sbt(c, NULL, optarg); > if (exit_timeout != 0) > exit_timeout |= WD_ACTIVE; > break; From nobody Tue Aug 19 19:31:55 2025 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 4c608F1cYXz65QGb; Tue, 19 Aug 2025 19:31:57 +0000 (UTC) (envelope-from jhibbits@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c608F0Nxvz4HbJ; Tue, 19 Aug 2025 19:31:57 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755631917; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b+Y9aNT5YwQ57ZRvqciqcbS6xs6COGk7QwlkguwF+lg=; b=HoR+8P2UoYIMIy3IA39Y8PcwWNTxVK0u6cse70njbuF77APFT5rOTTdW3awyZNvUduOH9V zt/h3X/j7JfJfQnJgmbwoOjFJzeAPIbMLB2d6/FgCX8mDul652H/3t0TonPxh3gcU9HAY5 2xlskR7QlK1Ufop29KOjKjEDCisz9CJYVrhyvkILZd5iqNZVj1LiXSnnBkKAnEofkREDuo TDYuT2x1DKTxTf/3cQVdmhHhXb6jkAfMG73oKXu7Vls1jXkm79QjQRou39H6RA7Q0JRCSa t6oesgvQJUi1RvVlNKlyvWdgB/Zt2ryjqj03n7Bsc/U49iMMTakRxASEsJvvUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755631917; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b+Y9aNT5YwQ57ZRvqciqcbS6xs6COGk7QwlkguwF+lg=; b=vHcbA1w1EHTuUQ+CGbhA/JRSWRsATImX/ND1/mlWDYbKDfXVRmePY6MdmT+TStOpXJnnt3 /XFEm6PkFTWrkMGssvUAA745Ywt5shyr44c+53O7l8T28GPsn0hi+fcyki4AEh5UjXXIKv Z9tJJmzHVUR20Pz3aMrg4bJfm6AOzc0QZNs68T9Ak6BBg5iXNXPd7O3ge0PlMeqkKxEg3w Vvm8lKr5JtxsdMoLszJby5rrX5eSxbd6vayYP8U4VTXsfBOOZl5wgq05jaygBgHPTp/QDC 6Xyho3xk9aWpJofYUoBBWsg6Ki48RFVn/6+/7Xs0vzgFA15LslzGtDQu3Ttykg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755631917; a=rsa-sha256; cv=none; b=T/LCzEUwX2BmIsBmSEsiH/BlHmMfTwGhbAY30oxR65UkrdQHRAQIdNGjpb5LZxi8g3zM1e vOyUTYMbyaQQhSce/12cEebV9ZLBkzzgAoDDKqDfAARduTy84Y/4e+inZOiLEwVCc4OWNz 3YllZy+U9DwTngLjP8ITgGMCFvgxZicUeA++mwhUSWYZi6JR2nB8i0C56ZuS8ASHlLqlrK jzelLlH8TiIK5BC0LIKTGzXtLKgG4/t0h8kusT0WFtN0O1ucp/0nfVaeQQyjg6io/Wqkui gF7NP3NLVLLLSdj5O8hmxx/ivM8UQBghoryd6kRF8bXBrauP0c8lxfH86SVhZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ralga.knownspace (unknown [IPv6:2600:2b00:a720:d301::6417:2000]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhibbits) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c608D600Dz6fV; Tue, 19 Aug 2025 19:31:56 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Date: Tue, 19 Aug 2025 15:31:55 -0400 From: Justin Hibbits To: Mitchell Horne Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 26d6617f3e54 - main - watchdog: Convert to using sbintime_t format Message-ID: <20250819153155.0070d4e5@ralga.knownspace> In-Reply-To: <7704c59a-5ca1-4493-b362-ee81e78fab0f@freebsd.org> References: <202508141903.57EJ39C9018272@gitrepo.freebsd.org> <7704c59a-5ca1-4493-b362-ee81e78fab0f@freebsd.org> X-Mailer: Claws Mail 4.3.1 (GTK 3.24.49; powerpc64le-unknown-linux-gnu) 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-Transfer-Encoding: 7bit On Tue, 19 Aug 2025 16:25:18 -0300 Mitchell Horne wrote: > On 8/14/25 16:03, Justin Hibbits wrote: > > The branch main has been updated by jhibbits: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=26d6617f3e5406d9f92d87674f1667dd856828a3 > > > > commit 26d6617f3e5406d9f92d87674f1667dd856828a3 > > Author: Justin Hibbits > > AuthorDate: 2025-02-26 20:25:36 +0000 > > Commit: Justin Hibbits > > CommitDate: 2025-08-14 19:02:46 +0000 > > > > watchdog: Convert to using sbintime_t format > > > > Summary: > > Some watchdogs are now based on a countdown timer instead of a > > bit check. To deal with these, convert the watchdog framework to > > use sbintime_t instead of power-of-2-nanoseconds. This allows more > > precision, and more variety of watchdog timeouts. Keep the old > > method as a compatibility layer, so that drivers can be migrated > > slowly, as needed. > > Hi Justin, > > The watchdog(4) man page needs to be updated for the new ioctl API. > Can you please handle this? > > There is also the watchdog(9) page, which is of lower quality and > detail. I would not insist on changes here, but I do note that it is > affected. > > Best, > Mitchell Hi Mitchell, Sure, I'll fix the man page. I have a bad habit of forgetting about those. - Justin > > > > > Reviewed by: jhb > > Sponsored by: Juniper Networks, Inc. > > Differential Revision: https://reviews.freebsd.org/D49183 > > --- > > sys/dev/watchdog/watchdog.c | 202 > > ++++++++++++++++++++++------------------- sys/sys/watchdog.h > > | 17 ++-- usr.sbin/watchdogd/watchdogd.c | 99 > > +++++--------------- 3 files changed, 143 insertions(+), 175 > > deletions(-) > > > > diff --git a/sys/dev/watchdog/watchdog.c > > b/sys/dev/watchdog/watchdog.c index c0babef1b29b..e1b2e08c3f10 > > 100644 --- a/sys/dev/watchdog/watchdog.c > > +++ b/sys/dev/watchdog/watchdog.c > > @@ -50,11 +50,20 @@ > > > > #include /* kern_clock_gettime() */ > > > > -static int wd_set_pretimeout(int newtimeout, int disableiftoolong); > > +#ifdef COMPAT_FREEBSD14 > > +#define WDIOCPATPAT_14 _IOW('W', 42, u_int) /* pat > > the watchdog */ +#define WDIOC_SETTIMEOUT_14 _IOW('W', 43, > > int) /* set/reset the timer */ +#define WDIOC_GETTIMEOUT_14 > > _IOR('W', 44, int) /* get total timeout */ +#define > > WDIOC_GETTIMELEFT_14 _IOR('W', 45, int) /* get time left > > */ +#define WDIOC_GETPRETIMEOUT_14 _IOR('W', 46, int) /* get > > the pre-timeout */ +#define WDIOC_SETPRETIMEOUT_14 _IOW('W', 47, > > int) /* set the pre-timeout */ +#endif + > > +static int wd_set_pretimeout(sbintime_t newtimeout, int > > disableiftoolong); static void wd_timeout_cb(void *arg); > > > > static struct callout wd_pretimeo_handle; > > -static int wd_pretimeout; > > +static sbintime_t wd_pretimeout; > > static int wd_pretimeout_act = WD_SOFT_LOG; > > > > static struct callout wd_softtimeo_handle; > > @@ -63,6 +72,8 @@ static int wd_softtimer; /* true = use > > softtimer instead of hardware static int wd_softtimeout_act = > > WD_SOFT_LOG; /* action for the software timeout */ > > static struct cdev *wd_dev; > > +static volatile sbintime_t wd_last_sbt; /* last timeout > > value (sbt) */ +static sbintime_t wd_last_sbt_sysctl; /* > > last timeout value (sbt) */ static volatile u_int wd_last_u; /* > > last timeout value set by kern_do_pat */ static u_int > > wd_last_u_sysctl; /* last timeout value set by kern_do_pat */ > > static u_int wd_last_u_sysctl_secs; /* wd_last_u in seconds */ > > @@ -73,6 +84,8 @@ SYSCTL_UINT(_hw_watchdog, OID_AUTO, wd_last_u, > > CTLFLAG_RD, &wd_last_u_sysctl, 0, "Watchdog last update time"); > > SYSCTL_UINT(_hw_watchdog, OID_AUTO, wd_last_u_secs, CTLFLAG_RD, > > &wd_last_u_sysctl_secs, 0, "Watchdog last update time"); > > +SYSCTL_SBINTIME_MSEC(_hw_watchdog, OID_AUTO, wd_last_msecs, > > CTLFLAG_RD, > > + &wd_last_sbt_sysctl, "Watchdog last update time > > (milliseconds)"); > > static int wd_lastpat_valid = 0; > > static time_t wd_lastpat = 0; /* when the watchdog was last > > patted */ @@ -80,41 +93,26 @@ static time_t wd_lastpat = 0; > > /* when the watchdog was last patted */ /* Hook for external > > software watchdog to register for use if needed */ void > > (*wdog_software_attach)(void); > > -static void > > -pow2ns_to_ts(int pow2ns, struct timespec *ts) > > +/* Legacy interface to watchdog. */ > > +int > > +wdog_kern_pat(u_int utim) > > { > > - uint64_t ns; > > + sbintime_t sbt; > > > > - ns = 1ULL << pow2ns; > > - ts->tv_sec = ns / 1000000000ULL; > > - ts->tv_nsec = ns % 1000000000ULL; > > -} > > + if ((utim & WD_LASTVAL) != 0 && (utim & WD_INTERVAL) > 0) > > + return (EINVAL); > > > > -static int > > -pow2ns_to_ticks(int pow2ns) > > -{ > > - struct timeval tv; > > - struct timespec ts; > > + if ((utim & WD_LASTVAL) != 0) { > > + return (wdog_control(WD_CTRL_RESET)); > > + } > > > > - pow2ns_to_ts(pow2ns, &ts); > > - TIMESPEC_TO_TIMEVAL(&tv, &ts); > > - return (tvtohz(&tv)); > > -} > > + utim &= WD_INTERVAL; > > + if (utim == WD_TO_NEVER) > > + sbt = 0; > > + else > > + sbt = nstosbt(1 << utim); > > > > -static int > > -seconds_to_pow2ns(int seconds) > > -{ > > - uint64_t power; > > - uint64_t ns; > > - uint64_t shifted; > > - > > - ns = ((uint64_t)seconds) * 1000000000ULL; > > - power = flsll(ns); > > - shifted = 1ULL << power; > > - if (shifted <= ns) { > > - power++; > > - } > > - return (power); > > + return (wdog_kern_pat_sbt(sbt)); > > } > > > > int > > @@ -126,76 +124,63 @@ wdog_control(int ctrl) > > } > > > > if ((ctrl & WD_CTRL_RESET) != 0) { > > - wdog_kern_pat(WD_ACTIVE | WD_LASTVAL); > > + wdog_kern_pat_sbt(wd_last_sbt); > > } else if ((ctrl & WD_CTRL_ENABLE) != 0) { > > - wdog_kern_pat(WD_ACTIVE | WD_LASTVAL); > > + wdog_kern_pat_sbt(wd_last_sbt); > > } > > > > return (0); > > } > > > > int > > -wdog_kern_pat(u_int utim) > > +wdog_kern_pat_sbt(sbintime_t sbt) > > { > > - int error; > > - static int first = 1; > > - > > - if ((utim & WD_LASTVAL) != 0 && (utim & WD_INTERVAL) > 0) > > - return (EINVAL); > > - > > - if ((utim & WD_LASTVAL) != 0) { > > - /* > > - * if WD_LASTVAL is set, fill in the bits for > > timeout > > - * from the saved value in wd_last_u. > > - */ > > - MPASS((wd_last_u & ~WD_INTERVAL) == 0); > > - utim &= ~WD_LASTVAL; > > - utim |= wd_last_u; > > - } else { > > - /* > > - * Otherwise save the new interval. > > - * This can be zero (to disable the watchdog) > > - */ > > - wd_last_u = (utim & WD_INTERVAL); > > + sbintime_t error_sbt = 0; > > + int pow2ns = 0; > > + int error = 0; > > + static bool first = true; > > + > > + /* legacy uses power-of-2-nanoseconds time. */ > > + if (sbt != 0) { > > + pow2ns = flsl(sbttons(sbt)); > > + } > > + if (wd_last_sbt != sbt) { > > + wd_last_u = pow2ns; > > wd_last_u_sysctl = wd_last_u; > > - wd_last_u_sysctl_secs = pow2ns_to_ticks(wd_last_u) > > / hz; > > + wd_last_u_sysctl_secs = sbt / SBT_1S; > > + > > + wd_last_sbt = sbt; > > } > > - if ((utim & WD_INTERVAL) == WD_TO_NEVER) { > > - utim = 0; > > > > - /* Assume all is well; watchdog signals failure. */ > > - error = 0; > > - } else { > > - /* Assume no watchdog available; watchdog flags > > success */ > > + if (sbt != 0) > > error = EOPNOTSUPP; > > - } > > + > > if (wd_softtimer) { > > - if (utim == 0) { > > + if (sbt == 0) { > > callout_stop(&wd_softtimeo_handle); > > } else { > > - (void) callout_reset(&wd_softtimeo_handle, > > - pow2ns_to_ticks(utim), wd_timeout_cb, > > "soft"); > > + (void) > > callout_reset_sbt(&wd_softtimeo_handle, > > + sbt, 0, wd_timeout_cb, "soft", 0); > > } > > error = 0; > > } else { > > - EVENTHANDLER_INVOKE(watchdog_list, utim, &error); > > + EVENTHANDLER_INVOKE(watchdog_sbt_list, sbt, > > &error_sbt, &error); > > + EVENTHANDLER_INVOKE(watchdog_list, pow2ns, &error); > > } > > /* > > - * If we no hardware watchdog responded, we have not tried > > to > > + * If no hardware watchdog responded, we have not tried to > > * attach an external software watchdog, and one is > > available, > > * attach it now and retry. > > */ > > - if (error == EOPNOTSUPP && first && *wdog_software_attach > > != NULL) { > > + if (error == EOPNOTSUPP && first && wdog_software_attach > > != NULL) { (*wdog_software_attach)(); > > - EVENTHANDLER_INVOKE(watchdog_list, utim, &error); > > + EVENTHANDLER_INVOKE(watchdog_sbt_list, sbt, > > &error_sbt, &error); > > + EVENTHANDLER_INVOKE(watchdog_list, pow2ns, &error); > > } > > - first = 0; > > + first = false; > > > > + /* TODO: Print a (rate limited?) warning if error_sbt is > > too far away */ wd_set_pretimeout(wd_pretimeout, true); > > - /* > > - * If we were able to arm/strobe the watchdog, then > > - * update the last time it was strobed for > > WDIOC_GETTIMELEFT > > - */ > > if (!error) { > > struct timespec ts; > > > > @@ -206,6 +191,7 @@ wdog_kern_pat(u_int utim) > > wd_lastpat_valid = 1; > > } > > } > > + > > return (error); > > } > > > > @@ -282,16 +268,14 @@ wd_timeout_cb(void *arg) > > * current actual watchdog timeout. > > */ > > static int > > -wd_set_pretimeout(int newtimeout, int disableiftoolong) > > +wd_set_pretimeout(sbintime_t newtimeout, int disableiftoolong) > > { > > - u_int utime; > > - struct timespec utime_ts; > > - int timeout_ticks; > > + sbintime_t utime; > > + sbintime_t timeout_left; > > > > - utime = wdog_kern_last_timeout(); > > - pow2ns_to_ts(utime, &utime_ts); > > + utime = wdog_kern_last_timeout_sbt(); > > /* do not permit a pre-timeout >= than the timeout. */ > > - if (newtimeout >= utime_ts.tv_sec) { > > + if (newtimeout >= utime) { > > /* > > * If 'disableiftoolong' then just fall through > > * so as to disable the pre-watchdog > > @@ -309,7 +293,7 @@ wd_set_pretimeout(int newtimeout, int > > disableiftoolong) return 0; > > } > > > > - timeout_ticks = pow2ns_to_ticks(utime) - (hz*newtimeout); > > + timeout_left = utime - newtimeout; > > #if 0 > > printf("wd_set_pretimeout: " > > "newtimeout: %d, " > > @@ -323,8 +307,8 @@ wd_set_pretimeout(int newtimeout, int > > disableiftoolong) #endif > > > > /* We determined the value is sane, so reset the callout */ > > - (void) callout_reset(&wd_pretimeo_handle, > > - timeout_ticks, wd_timeout_cb, "pre"); > > + (void) callout_reset_sbt(&wd_pretimeo_handle, > > + timeout_left, 0, wd_timeout_cb, "pre", 0); > > wd_pretimeout = newtimeout; > > return 0; > > } > > @@ -333,6 +317,7 @@ static int > > wd_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data, > > int flags __unused, struct thread *td) > > { > > + sbintime_t sb; > > u_int u; > > time_t timeleft; > > int error; > > @@ -368,32 +353,55 @@ wd_ioctl(struct cdev *dev __unused, u_long > > cmd, caddr_t data, error = EINVAL; > > } > > break; > > - case WDIOC_GETPRETIMEOUT: > > - *(int *)data = (int)wd_pretimeout; > > +#ifdef COMPAT_FREEBSD14 > > + case WDIOC_GETPRETIMEOUT_14: > > + *(int *)data = (int)(wd_pretimeout / SBT_1S); > > break; > > - case WDIOC_SETPRETIMEOUT: > > - error = wd_set_pretimeout(*(int *)data, false); > > + case WDIOC_SETPRETIMEOUT_14: > > + error = wd_set_pretimeout(*(int *)data * SBT_1S, > > false); break; > > - case WDIOC_GETTIMELEFT: > > + case WDIOC_GETTIMELEFT_14: > > error = wd_get_time_left(td, &timeleft); > > if (error) > > break; > > *(int *)data = (int)timeleft; > > break; > > - case WDIOC_SETTIMEOUT: > > + case WDIOC_SETTIMEOUT_14: > > u = *(u_int *)data; > > - error = wdog_kern_pat(seconds_to_pow2ns(u)); > > + error = wdog_kern_pat_sbt(mstosbt(u * 1000ULL)); > > break; > > - case WDIOC_GETTIMEOUT: > > + case WDIOC_GETTIMEOUT_14: > > u = wdog_kern_last_timeout(); > > *(u_int *)data = u; > > break; > > - case WDIOCPATPAT: > > + case WDIOCPATPAT_14: > > error = wd_ioctl_patpat(data); > > break; > > +#endif > > + > > + /* New API */ > > case WDIOC_CONTROL: > > wdog_control(*(int *)data); > > break; > > + case WDIOC_SETTIMEOUT: > > + sb = *(sbintime_t *)data; > > + error = wdog_kern_pat_sbt(sb); > > + break; > > + case WDIOC_GETTIMEOUT: > > + *(sbintime_t *)data = wdog_kern_last_timeout_sbt(); > > + break; > > + case WDIOC_GETTIMELEFT: > > + error = wd_get_time_left(td, &timeleft); > > + if (error) > > + break; > > + *(sbintime_t *)data = (sbintime_t)timeleft * > > SBT_1S; > > + break; > > + case WDIOC_GETPRETIMEOUT: > > + *(sbintime_t *)data = wd_pretimeout; > > + break; > > + case WDIOC_SETPRETIMEOUT: > > + error = wd_set_pretimeout(*(sbintime_t *)data, > > false); > > + break; > > default: > > error = ENOIOCTL; > > break; > > @@ -412,6 +420,12 @@ wdog_kern_last_timeout(void) > > return (wd_last_u); > > } > > > > +sbintime_t > > +wdog_kern_last_timeout_sbt(void) > > +{ > > + return (wd_last_sbt); > > +} > > + > > static struct cdevsw wd_cdevsw = { > > .d_version = D_VERSION, > > .d_ioctl = wd_ioctl, > > diff --git a/sys/sys/watchdog.h b/sys/sys/watchdog.h > > index 3c9d31eb577b..8401d343a6b7 100644 > > --- a/sys/sys/watchdog.h > > +++ b/sys/sys/watchdog.h > > @@ -32,15 +32,16 @@ > > #define _SYS_WATCHDOG_H > > > > #include > > +#include > > > > #define _PATH_WATCHDOG "fido" > > > > -#define WDIOCPATPAT _IOW('W', 42, u_int) /* pat the > > watchdog */ -#define WDIOC_SETTIMEOUT _IOW('W', 43, int) > > /* set/reset the timer */ -#define WDIOC_GETTIMEOUT _IOR('W', > > 44, int) /* get total timeout */ -#define WDIOC_GETTIMELEFT > > _IOR('W', 45, int) /* get time left */ -#define > > WDIOC_GETPRETIMEOUT _IOR('W', 46, int) /* get the > > pre-timeout */ -#define WDIOC_SETPRETIMEOUT _IOW('W', 47, > > int) /* set the pre-timeout */ +#define WDIOC_PATPAT > > _IOW('W', 52, sbintime_t) /* pat the watchdog */ +#define > > WDIOC_SETTIMEOUT _IOW('W', 53, sbintime_t) /* set/reset > > the timer */ +#define WDIOC_GETTIMEOUT _IOR('W', 54, > > sbintime_t) /* get total timeout */ +#define > > WDIOC_GETTIMELEFT _IOR('W', 55, sbintime_t) /* get time > > left */ +#define WDIOC_GETPRETIMEOUT _IOR('W', 56, > > sbintime_t) /* get the pre-timeout */ +#define > > WDIOC_SETPRETIMEOUT _IOW('W', 57, sbintime_t) /* set the > > pre-timeout */ /* set the action when a pre-timeout occurs see: > > WD_SOFT_* */ #define WDIOC_SETPRETIMEOUTACT _IOW('W', 48, int) @@ > > -112,11 +113,15 @@ #include typedef void > > (*watchdog_fn)(void *, u_int, int *); +typedef void > > (*watchdog_sbt_fn)(void *, sbintime_t, sbintime_t *, int *); > > EVENTHANDLER_DECLARE(watchdog_list, watchdog_fn); > > +EVENTHANDLER_DECLARE(watchdog_sbt_list, watchdog_sbt_fn); > > > > u_int wdog_kern_last_timeout(void); > > int wdog_kern_pat(u_int utim); > > +sbintime_t wdog_kern_last_timeout_sbt(void); > > +int wdog_kern_pat_sbt(sbintime_t utim); > > int wdog_control(int ctrl); > > > > /* > > diff --git a/usr.sbin/watchdogd/watchdogd.c > > b/usr.sbin/watchdogd/watchdogd.c index 228438955006..27123f2143d0 > > 100644 --- a/usr.sbin/watchdogd/watchdogd.c > > +++ b/usr.sbin/watchdogd/watchdogd.c > > @@ -63,25 +63,25 @@ > > static long fetchtimeout(int opt, > > const char *longopt, const char *myoptarg, int zero_ok); > > static void parseargs(int, char *[]); > > -static int seconds_to_pow2ns(int); > > static void sighandler(int); > > static void watchdog_loop(void); > > static int watchdog_init(void); > > static int watchdog_onoff(int onoff); > > -static int watchdog_patpat(u_int timeout); > > +static int watchdog_patpat(sbintime_t); > > static void usage(void); > > -static int tstotv(struct timeval *tv, struct timespec *ts); > > static int tvtohz(struct timeval *tv); > > > > static int debugging = 0; > > static int end_program = 0; > > static const char *pidfile = _PATH_VARRUN "watchdogd.pid"; > > -static u_int timeout = WD_TO_128SEC; > > +static sbintime_t timeout = 128 * SBT_1S; > > static u_int exit_timeout = WD_TO_NEVER; > > static u_int pretimeout = 0; > > static u_int timeout_sec; > > static u_int nap = 10; > > +#ifdef notyet > > static int passive = 0; > > +#endif > > static int is_daemon = 0; > > static int is_dry_run = 0; /* do not arm the watchdog, only > > report on timing of the watch > > @@ -174,38 +174,23 @@ main(int argc, char *argv[]) > > pidfile_remove(pfh); > > return (EX_OK); > > } else { > > - if (passive) > > - timeout |= WD_PASSIVE; > > - else > > - timeout |= WD_ACTIVE; > > if (watchdog_patpat(timeout) < 0) > > err(EX_OSERR, "patting the dog"); > > return (EX_OK); > > } > > } > > > > -static void > > -pow2ns_to_ts(int pow2ns, struct timespec *ts) > > -{ > > - uint64_t ns; > > - > > - ns = 1ULL << pow2ns; > > - ts->tv_sec = ns / 1000000000ULL; > > - ts->tv_nsec = ns % 1000000000ULL; > > -} > > - > > /* > > * Convert a timeout in seconds to N where 2^N nanoseconds is > > close to > > * "seconds". > > * > > * The kernel expects the timeouts for watchdogs in "2^N > > nanosecond format". */ > > -static u_int > > -parse_timeout_to_pow2ns(char opt, const char *longopt, const char > > *myoptarg) +static sbintime_t > > +parse_timeout_to_sbt(char opt, const char *longopt, const char > > *myoptarg) { > > - double a; > > - u_int rv; > > - struct timespec ts; > > + long a; > > + sbintime_t rv; > > struct timeval tv; > > int ticks; > > char shortopt[] = "- "; > > @@ -216,19 +201,17 @@ parse_timeout_to_pow2ns(char opt, const char > > *longopt, const char *myoptarg) a = fetchtimeout(opt, longopt, > > myoptarg, 1); > > if (a == 0) > > - rv = WD_TO_NEVER; > > + rv = 0; > > else > > - rv = seconds_to_pow2ns(a); > > - pow2ns_to_ts(rv, &ts); > > - tstotv(&tv, &ts); > > + rv = a * SBT_1S; > > + tv = sbttotv(rv); > > ticks = tvtohz(&tv); > > if (debugging) { > > printf("Timeout for %s%s " > > - "is 2^%d nanoseconds " > > - "(in: %s sec -> out: %jd sec %ld ns -> %d > > ticks)\n", > > + "is " > > + "(in: %s sec -> out: %jd sec %ld us -> %d > > ticks)\n", longopt ? "-" : "", longopt ? longopt : shortopt, > > - rv, > > - myoptarg, (intmax_t)ts.tv_sec, ts.tv_nsec, > > ticks); > > + myoptarg, (intmax_t)tv.tv_sec, tv.tv_usec, > > ticks); } > > if (ticks <= 0) { > > errx(1, "Timeout for %s%s is too small, please > > choose a higher timeout.", longopt ? "-" : "", longopt ? longopt : > > shortopt); @@ -364,7 +347,7 @@ watchdog_loop(void) } > > > > if (failed == 0) > > - watchdog_patpat(timeout|WD_ACTIVE); > > + watchdog_patpat(timeout); > > > > waited = > > watchdog_check_dogfunction_time(&ts_start, &ts_end); if (nap - > > waited > 0) @@ -387,13 +370,13 @@ try_end: > > * to keep the watchdog from firing. > > */ > > static int > > -watchdog_patpat(u_int t) > > +watchdog_patpat(sbintime_t sbt) > > { > > > > if (is_dry_run) > > return 0; > > > > - return ioctl(fd, WDIOCPATPAT, &t); > > + return ioctl(fd, WDIOC_SETTIMEOUT, &sbt); > > } > > > > static int > > @@ -429,7 +412,7 @@ watchdog_onoff(int onoff) > > warn("setting WDIOC_SETSOFT %d", > > softtimeout_set); return (error); > > } > > - error = watchdog_patpat((timeout|WD_ACTIVE)); > > + error = watchdog_patpat(timeout); > > if (error) { > > warn("watchdog_patpat failed"); > > goto failsafe; > > @@ -461,7 +444,7 @@ watchdog_onoff(int onoff) > > } > > } > > /* pat one more time for good measure */ > > - return watchdog_patpat((timeout|WD_ACTIVE)); > > + return watchdog_patpat(timeout); > > } else { > > return watchdog_control(WD_CTRL_DISABLE); > > } > > @@ -576,15 +559,6 @@ timeout_act_str2int(const char *lopt, const > > char *acts) return rv; > > } > > > > -int > > -tstotv(struct timeval *tv, struct timespec *ts) > > -{ > > - > > - tv->tv_sec = ts->tv_sec; > > - tv->tv_usec = ts->tv_nsec / 1000; > > - return 0; > > -} > > - > > /* > > * Convert a timeval to a number of ticks. > > * Mostly copied from the kernel. > > @@ -656,30 +630,6 @@ tvtohz(struct timeval *tv) > > return ((int)ticks); > > } > > > > -static int > > -seconds_to_pow2ns(int seconds) > > -{ > > - uint64_t power; > > - uint64_t ns; > > - uint64_t shifted; > > - > > - if (seconds <= 0) > > - errx(1, "seconds %d < 0", seconds); > > - ns = ((uint64_t)seconds) * 1000000000ULL; > > - power = flsll(ns); > > - shifted = 1ULL << power; > > - if (shifted <= ns) { > > - power++; > > - } > > - if (debugging) { > > - printf("shifted %lld\n", (long long)shifted); > > - printf("seconds_to_pow2ns: seconds: %d, ns %lld, > > power %d\n", > > - seconds, (long long)ns, (int)power); > > - } > > - return (power); > > -} > > - > > - > > /* > > * Handle the few command line arguments supported. > > */ > > @@ -692,8 +642,7 @@ parseargs(int argc, char *argv[]) > > const char *lopt; > > > > /* Get the default value of timeout_sec from the default > > timeout. */ > > - pow2ns_to_ts(timeout, &ts); > > - timeout_sec = ts.tv_sec; > > + timeout_sec = sbintime_getsec(timeout); > > > > /* > > * if we end with a 'd' aka 'watchdogd' then we are the > > daemon program, @@ -736,10 +685,10 @@ parseargs(int argc, char > > *argv[]) break; > > case 't': > > timeout_sec = atoi(optarg); > > - timeout = parse_timeout_to_pow2ns(c, NULL, > > optarg); > > + timeout = parse_timeout_to_sbt(c, NULL, > > optarg); if (debugging) > > - printf("Timeout is 2^%d > > nanoseconds\n", > > - timeout); > > + printf("Timeout is %d\n", > > + (int)(timeout / SBT_1S)); > > break; > > case 'T': > > carp_thresh_seconds = > > @@ -749,7 +698,7 @@ parseargs(int argc, char *argv[]) > > do_timedog = 1; > > break; > > case 'x': > > - exit_timeout = parse_timeout_to_pow2ns(c, > > NULL, optarg); > > + exit_timeout = parse_timeout_to_sbt(c, > > NULL, optarg); if (exit_timeout != 0) > > exit_timeout |= WD_ACTIVE; > > break; > From nobody Tue Aug 19 21:26:40 2025 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 4c62hc2tYPz62ZR4; Tue, 19 Aug 2025 21:26:40 +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 4c62hc26rCz3D11; Tue, 19 Aug 2025 21:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755638800; 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=J9VVPcL0g1AIX6C8/5le55zc4s0I8upJ18S7PqvyQWE=; b=ZXJ0++vHXQACZw2R4vh3oDhTwzg/NYkZUgZc4tiHhR7n+iRUGUTC6yg4AqL1s9wv1Kz6wX 9CJbAzEFJ8nGL/J2iAXfwxknNrrNc72idVgjugZdo0pUswan8yM0mzOW7XZxKpbCKA8EzY rVvcSO8o7V7PO46VauUjCwe/Hob0lmkzFOudX3pC1tlTGBNrmr7pfpGnRewRptNIxwfT4h 8sIJ8lnhFItQwR2hKPAwQwRfP7cf4BPQ6LPen1Qp1BKSuSiKB4l4T10v2x444bAacLNSxL nI6r/ZuoY5qSQWqeGm86WSyLDiyDGKipwLPdQnjIp2BYFJwLUBC50CEaei0sPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755638800; 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=J9VVPcL0g1AIX6C8/5le55zc4s0I8upJ18S7PqvyQWE=; b=rBsXI0GAKLEPSZuxtmf3fpWvFAsXt/plUfbDWv3Io4kgJYihDKASLW7yMD3DF9mjLnbK2C RvJ6yk/vnQLbuRBgaEYugGI3ft9CX9nAavOMMGWCWayUaqeajn5+ri7RFq2lpUbA/h7kbP mSEMZWKMzoMd2btnRJZFALWGS2Wi/vdwll1T7Jx0jBQZ9rmzgUtAi2gNXBJW6P/yMaynul sabUb/MczxFEs5Dnhmlbjffb96pOX14lK5ZaQiyITag4gHLLmm1/R04Tb6v90B5J0ytqVk uNFMB9ouBo1vjKn6GnIVqtNVk1zEmmA9u1nWOwYeg/1yoTONe6r/WPQk/o+4Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755638800; a=rsa-sha256; cv=none; b=iYSzKKWrQMjqPhHg7FPPqKTMl0Gk1Ar+v9jP0tMyI9bAqwE/kPumykFM1fipwuhBh+fHPF Gv0mt+R56scWsPd1W/jEQONc0PnetylXjS0Si99qHGLKcKwwoo7qwC6wcDM4Ln4Y80vEqc VThaY7j+EByuolhM9Jwx3hmv/SW3p+ywWnUXBu6N1ecZefJKwwlZZbi7JWcAF7GnxmeNRn cprd8nSg+3KhiCqHCFBuIjmFrJDehlS1nfMSIqiWbArh2Mh7bPMgTIb8L1p5Gh6YVmTjhp AIp1BlIUVfiIuw5572h5Pn4TbDMMGuGSEnI8pveka2TIRD/ihrMeoZk1YlMV0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c62hc1hv6zkS6; Tue, 19 Aug 2025 21:26:40 +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 57JLQexL048351; Tue, 19 Aug 2025 21:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JLQevP048347; Tue, 19 Aug 2025 21:26:40 GMT (envelope-from git) Date: Tue, 19 Aug 2025 21:26:40 GMT Message-Id: <202508192126.57JLQevP048347@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 632f7051709d - main - libc: convert ai_errlist array to designated initializers syntax 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 632f7051709da98d4c9e59f11404f00d456b592c Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=632f7051709da98d4c9e59f11404f00d456b592c commit 632f7051709da98d4c9e59f11404f00d456b592c Author: Konstantin Belousov AuthorDate: 2025-08-19 02:55:24 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-19 21:22:26 +0000 libc: convert ai_errlist array to designated initializers syntax Reviewed by: emaste, glebius Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D52010 --- lib/libc/net/gai_strerror.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c index 0d4303e76a73..d2f679a6782f 100644 --- a/lib/libc/net/gai_strerror.c +++ b/lib/libc/net/gai_strerror.c @@ -46,21 +46,21 @@ * but are or may be used as extensions or in old code. */ static const char *ai_errlist[] = { - "Success", /* 0 */ - "Address family for hostname not supported", /* EAI_ADDRFAMILY */ - "Name could not be resolved at this time", /* EAI_AGAIN */ - "Flags parameter had an invalid value", /* EAI_BADFLAGS */ - "Non-recoverable failure in name resolution", /* EAI_FAIL */ - "Address family not recognized", /* EAI_FAMILY */ - "Memory allocation failure", /* EAI_MEMORY */ - "No address associated with hostname", /* EAI_NODATA*/ - "Name does not resolve", /* EAI_NONAME */ - "Service was not recognized for socket type", /* EAI_SERVICE */ - "Intended socket type was not recognized", /* EAI_SOCKTYPE */ - "System error returned in errno", /* EAI_SYSTEM */ - "Invalid value for hints", /* EAI_BADHINTS */ - "Resolved protocol is unknown", /* EAI_PROTOCOL */ - "Argument buffer overflow" /* EAI_OVERFLOW */ + [0] = "Success", + [EAI_ADDRFAMILY] = "Address family for hostname not supported", + [EAI_AGAIN] = "Name could not be resolved at this time", + [EAI_BADFLAGS] = "Flags parameter had an invalid value", + [EAI_FAIL] = "Non-recoverable failure in name resolution", + [EAI_FAMILY] = "Address family not recognized", + [EAI_MEMORY] = "Memory allocation failure", + [EAI_NODATA] = "No address associated with hostname", + [EAI_NONAME] = "Name does not resolve", + [EAI_SERVICE] = "Service was not recognized for socket type", + [EAI_SOCKTYPE] = "Intended socket type was not recognized", + [EAI_SYSTEM] = "System error returned in errno", + [EAI_BADHINTS] = "Invalid value for hints", + [EAI_PROTOCOL] = "Resolved protocol is unknown", + [EAI_OVERFLOW] = "Argument buffer overflow", }; #if defined(NLS) From nobody Tue Aug 19 21:26:41 2025 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 4c62hd3s3tz62ZTs; Tue, 19 Aug 2025 21:26:41 +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 4c62hd2l5Xz3CwW; Tue, 19 Aug 2025 21:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755638801; 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=5CoEFHGC4Xb1exafX6WoKog1eAm0LMGp2LBLDBJQJ7E=; b=Lr0VPoqY6QG+sAePY90qmqtyA930q3c+KGm75vsahspkHfhYslmZEKdu7YP2KdU5/I2WZD RYMBD8sN189wyhZtpOUsVsu3vs3z3DeWIBXIEANaV5pjvCqMnhSlNRSnPE6UUz4nKF54Zg nH6L/hyfDfIcPMSBFTXbKcR+tnG+WLN0tmxytynI0Z8AHfJCtwKhuDnvHksPMwEWfvS8zi n4ZVNmprudD4V4wJV7gtiHbIgw1VFtJbqH0CTkWtHrkMc/j1RjjUG8/WbB3CktDy1YJCY7 xEF4EM4HaFghiLcBGLXch4WSXG5KScpBSxKYIlmdMWioFWs8eS30oHgJ4HG6BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755638801; 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=5CoEFHGC4Xb1exafX6WoKog1eAm0LMGp2LBLDBJQJ7E=; b=x7FPB6Ngw6niaKBZZ2ojPh9GYGvP6K0s6hUscWZRCfCQHGOZWT8d9Bk4UbAP9Vdo1r+4GZ 9G7RaGBERARmxC34/TxUbKYyPh54VXjivzL6d7MZ5Hk1FIij4087aFPYt6BAqPr6y5Me9j H+O50KOeeO2zy15kqoj2p0g2GjfP1eZmrvUb/5aBoz2QjAGYqfxrfG3pTTVK8vIb5Zq8qt cQzM0ZWN+ot2W3BITt30T01/GLeysTSic9ekcXVYT3sU4T3WHsbzhhOa7Z5MlPpcxWszLC oBco6bt0cu4AU+WlydXCtLyReGBKAvKvy0F1SphsT6CKRGH9bfKsOLg1u2AwMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755638801; a=rsa-sha256; cv=none; b=UcKxZTLzJczLBTAyBl12mKZqhAX7LSaoYniWbkf71OGK4crrBoJUKasoWKsHCJ5QVZp/PS 0qVLauOXli7QSHv6RI1csudTZYlYERiuqcRw3DEQsjViqPMYHWpTStRkoZ2Eg6l0dXOn/I 90YxOj7F8HLQFM0qmKZhmYCbN+YiXBzFJNRS5sfyAoPd1JIS9XksfH9yI30OofOTpHTuTn 1RYpFtzeTWkYbMfLnaV7XE5XANtBUQiaHbZQLwPDFX7+I0Vsd5aiIkt/TEzPHAoOzOPFZG eFvc/ls2shO2rumkAWG2RUVmBe6f5CJJWBxeOwBMJBfCNaCP35C/8WJJIk9rDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c62hd2LSzzlQG; Tue, 19 Aug 2025 21:26:41 +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 57JLQfAQ048385; Tue, 19 Aug 2025 21:26:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JLQfpT048382; Tue, 19 Aug 2025 21:26:41 GMT (envelope-from git) Date: Tue, 19 Aug 2025 21:26:41 GMT Message-Id: <202508192126.57JLQfpT048382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 47d1788c2e98 - main - libc: mark ai_errlist as const 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47d1788c2e984f99521fd5b31194f96d94bf8a6b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=47d1788c2e984f99521fd5b31194f96d94bf8a6b commit 47d1788c2e984f99521fd5b31194f96d94bf8a6b Author: Konstantin Belousov AuthorDate: 2025-08-19 02:57:34 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-19 21:22:30 +0000 libc: mark ai_errlist as const Reviewed by: emaste, glebius Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D52010 --- lib/libc/net/gai_strerror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c index d2f679a6782f..8d3501197c73 100644 --- a/lib/libc/net/gai_strerror.c +++ b/lib/libc/net/gai_strerror.c @@ -45,7 +45,7 @@ * Entries EAI_ADDRFAMILY (1) and EAI_NODATA (7) were omitted from RFC 3493, * but are or may be used as extensions or in old code. */ -static const char *ai_errlist[] = { +static const char *const ai_errlist[] = { [0] = "Success", [EAI_ADDRFAMILY] = "Address family for hostname not supported", [EAI_AGAIN] = "Name could not be resolved at this time", From nobody Tue Aug 19 21:26:42 2025 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 4c62hf6k6Cz62Yvs; Tue, 19 Aug 2025 21:26:42 +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 4c62hf3tyRz3D9k; Tue, 19 Aug 2025 21:26:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755638802; 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=6NxeJ39/ilNnoMb7Xft8+TAWHhtW1srlHjLfLlW9L8E=; b=l1JjhUoYHsX7vyeHRURg+HEiJlT0MFlMe79zvxrJKDltwaaWe7Wbe47NeLy7Kz4ku79PWT lgOKu/4iqc8zul7MS/dBp8J21MBS39EItkaFnt+sosi4z55DEftDTDhRdpiRnxVStbTMcl jmc+WlcX4wSJo6qKEwVvtz6RyfWseOEIupqR7vBkOIFc9XR43QnTTf8GIUy8SSytaIxGts b+Gh3Mu9F0EBrKlQLLlXj+fBRw1asWLluwkoruQk+AEacqF/E4mM639wn3iRX1qVtxqdk2 rCKHKhbNXXZYz3pvc9zuHR9qZ6hz1v0l4DGJYklDTeU5iFKCrSu96AZg59ngLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755638802; 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=6NxeJ39/ilNnoMb7Xft8+TAWHhtW1srlHjLfLlW9L8E=; b=rZ0OwOYgwjnZKSpW0wql3uFrw4lTBjljxpiejL+FdjNqabhdby9jx9EUKK+tymGUhBlHiy MnbFNfuHm7oZM0Z2tYGwWK/IYaDiPUAgLiMzaFYJNi2+B+sRbK95APZ1dW+TGFi5YUftSI cn0OGeK17LBaiOxaifkV7nvEyZF+xJ3kAfDeikiRZdytr9U9mQmzhxlpXKDu1GtGEYua1X pAKPs6cOYWRiOIu7hDYAABEfUbi4xC/RseClt97RDCzaiIytvG/hIVjqJBKMd6ejpOx7JT YmpnhuWprr55ZDBMHln3kLYqpPQka1NfkohNTioQhmU4xpFJuNDJmpCNa1Lynw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755638802; a=rsa-sha256; cv=none; b=va29iFB3gVHtSUcvYrha7/VRX/Cq/HGKsZ6dsQvsf4jpbeuFMEaisKJUuTfmwAjRKbSaam CHHst6HTjXinskTrT2gxyevtW3gRCbrRDTLPFbyDHadDZEHhwQ2gUDJPuRJVU5rT4Iha/H ceNJ5jen5s9svfGLdWtqvBvc0xIyDZ6STMbhFS2v27CczU1nOicCwQPaUq+AwMvGjr1Tlc neY6eZEzV6AkJE7hYbNiI2d+19+AVEj7p0OOvKkyGxTQ9BnR7TQlQjNdTqZ0uaoxz+IYcq MjUD30/A8Pbzen9WeXmZyHNQrJjbaosuzIbw4wWnZ/2XSxtU69rQ3l0ZGArGPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c62hf2qn8zlQH; Tue, 19 Aug 2025 21:26:42 +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 57JLQgWo048418; Tue, 19 Aug 2025 21:26:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JLQg6v048415; Tue, 19 Aug 2025 21:26:42 GMT (envelope-from git) Date: Tue, 19 Aug 2025 21:26:42 GMT Message-Id: <202508192126.57JLQg6v048415@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: bd4dd5d951ea - main - libc: some style in gai_strerror.c 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd4dd5d951ea022b478c455c3eabb2a1b8cc4936 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bd4dd5d951ea022b478c455c3eabb2a1b8cc4936 commit bd4dd5d951ea022b478c455c3eabb2a1b8cc4936 Author: Konstantin Belousov AuthorDate: 2025-08-19 03:00:11 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-19 21:22:35 +0000 libc: some style in gai_strerror.c Reviewed by: emaste, glebius Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D52010 --- lib/libc/net/gai_strerror.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c index 8d3501197c73..96bc32b593fa 100644 --- a/lib/libc/net/gai_strerror.c +++ b/lib/libc/net/gai_strerror.c @@ -72,7 +72,7 @@ static int gai_keycreated = 0; static void gai_keycreate(void) { - gai_keycreated = (thr_keycreate(&gai_key, free) == 0); + gai_keycreated = thr_keycreate(&gai_key, free) == 0; } #endif @@ -110,11 +110,11 @@ gai_strerror(int ecode) strlcpy(buf, catgets(catd, 3, NL_MSGMAX, "Unknown error"), sizeof(gai_buf)); catclose(catd); - return buf; + return (buf); thr_err: #endif if (ecode >= 0 && ecode < EAI_MAX) - return ai_errlist[ecode]; - return "Unknown error"; + return (ai_errlist[ecode]); + return ("Unknown error"); } From nobody Tue Aug 19 21:26:43 2025 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 4c62hg5brVz62Yw0; Tue, 19 Aug 2025 21:26:43 +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 4c62hg3yFzz3D9x; Tue, 19 Aug 2025 21:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755638803; 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=LRD2mfzMt3qX9/0NNp18O2p1ZR9K4gX5uLAvRHXHzLE=; b=etoKQKfKtR2sHzGgCvqKPF+miSImM7iR0UDbgfEWIXlew7DBqiG6VATXcXe7p9GSd1Vt72 ULiO68pl0aSu5TRfKMI4JKoiSnS77mAuEPS4/Jw09Ddqk/bPU5X5FhMk+/j0evJKdLeKxL JtLrKl6lEin3WHkaKZH6DMRY66RqRy6BYyIgCu5lVr3UAyXjjSTanJw1YywatIuZQUj1i0 A5xKgOzKuM67bmPHJGzsuAyC+sLsaSjIlkrfnkBFrPNb42b6Yq6apT1zQc17SLuZEHmtvG P6i3s11I2PSKNIJNvdIF7PZfjebLOeXWcr0GohtBUONn6FvtpEBeHKoL1Ng1cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755638803; 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=LRD2mfzMt3qX9/0NNp18O2p1ZR9K4gX5uLAvRHXHzLE=; b=jgxvfv9j+Ifc92SXs69mnrzZCogHjyZarjODlpmzwpsDwPqoUTOOsBOmXtm/3O6lqMTvew cZYWheWEaAsZfUmX2XsvWolnD7VOLbrJFGlf9R2DNmNueGbWt+4FmLRUeQs7C9rr0FWO1g VW1wI0HQzHY+mqdHMt2swzEFrYHPw4/wB3EonFpdQF6EBsUbO9/OJINEHpcExgDbETSFtp YJLbMO1+gvXbK0LvsZYcCnV/o5miU/k6bLyIkKB0r+NIu1sL/7nVE2aUKkfgCfF7sk7FS7 eAiiAHAhp8Sv292XSXw1NXntO18/xra/7ltp+NyzLsxIGm+XirE4CImmu342xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755638803; a=rsa-sha256; cv=none; b=MDnHF0MpVq0RzAnYiPZ+03ekR47zIJ9tXuqom8tHYsAHT8XB0Vk8c9BPSt8TeGHLnEjsAv x9GR9oazgp/cjNzYTP2r9S0pjmRJhzz1H9QcYiyob7Q71Yn8S1WrYKzxN4RrDX9ndPcUal Nc7bpYiwVqenLDRxRXOAGjURSOKF1PryvZBZgYrq5i20zt7OlXVs5r4L+g/uKC9vChDJYc dcQMaX0HzI+Zh4s6wnBvkrtqoYyK/PoatVkblIArJ8eGF7FPYr5npU0FLqbtMXxK7025rf pzO7BYLGVh4K5qDZmHFl4mYV6C9Bo1+gCQOY0KPUhbLL2ESYepwr44HynYHOWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c62hg3Vd8zl2X; Tue, 19 Aug 2025 21:26:43 +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 57JLQhQe048458; Tue, 19 Aug 2025 21:26:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JLQheA048455; Tue, 19 Aug 2025 21:26:43 GMT (envelope-from git) Date: Tue, 19 Aug 2025 21:26:43 GMT Message-Id: <202508192126.57JLQheA048455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f892e509c1a0 - main - libc: preserve errno in gai_strerror() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f892e509c1a07f7116b9788a05e4ae99a06d54d0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f892e509c1a07f7116b9788a05e4ae99a06d54d0 commit f892e509c1a07f7116b9788a05e4ae99a06d54d0 Author: Konstantin Belousov AuthorDate: 2025-08-19 03:05:37 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-19 21:22:40 +0000 libc: preserve errno in gai_strerror() PR: 288931 Reviewed by: emaste, glebius Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D52010 --- lib/libc/net/gai_strerror.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c index 96bc32b593fa..23f58b763573 100644 --- a/lib/libc/net/gai_strerror.c +++ b/lib/libc/net/gai_strerror.c @@ -82,7 +82,9 @@ gai_strerror(int ecode) #if defined(NLS) nl_catd catd; char *buf; + int saved_errno; + saved_errno = errno; if (thr_main() != 0) buf = gai_buf; else { @@ -110,9 +112,11 @@ gai_strerror(int ecode) strlcpy(buf, catgets(catd, 3, NL_MSGMAX, "Unknown error"), sizeof(gai_buf)); catclose(catd); + errno = saved_errno; return (buf); thr_err: + errno = saved_errno; #endif if (ecode >= 0 && ecode < EAI_MAX) return (ai_errlist[ecode]); From nobody Tue Aug 19 21:34:40 2025 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 4c62sr4mnDz62b6X; Tue, 19 Aug 2025 21:34:40 +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 4c62sr3gDDz3GR4; Tue, 19 Aug 2025 21:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755639280; 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=1vTUrhoZ4htrWYWdtM1XAOmLXkB33ztjZagGSQQwOps=; b=qurxhcvNWlfNG9ebuh2U2sIMHzUfmZYFcIpZ1w/mruu6HDegVmCvJwts0MIFRDDRMN/xoU ZApUAHS9pePcaEazfdaGVx96gyi9KeRie6nGTC6NFxgu/ATsfXXMv+gQ+J7AK85OwLV+pU xq0tzsATUpVwq0M8l+oIMlk6BSCsPnENxGb29llWz/p5ooT4mvlYM1VtfNlV+ZsCsQjx0j cJqQnmBKVhpsDlvzv+AVF0hiB41alt6KHXpxQsCkRbxfRHFI6BmkRrxHBkGczg9Kwq9nwb wTynJDRm/fujkJYMRKT0Cs61J8YWRVwMff0n2N7/MbFnuoNN+S0WFY8kDwvm6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755639280; 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=1vTUrhoZ4htrWYWdtM1XAOmLXkB33ztjZagGSQQwOps=; b=auZPDOgoWfEU07HrnOd4zFLfQN3DGISM1P3gAb8RR0u1aT3EXdiy6xrO3bJbroIrBrWdys DKThOxJFf+s1L7AjL6V04Uc/inbI6KI/o5epW91K6eyRja+5Cnbe4PURyPNxMOZhTEcBDi CF961lRRiRH+GdGX56lvgofS+NiS+QZrRL79XsFVzrl7FA1fipWMX4pft44UxJD8jaqLXZ g7MDTgpTE0JxDM0+Rq1mXPXBptSkvXX/q1YqgN4OyyZENNBWDpDKtcsNR4V0Yg1ICWUF5K u31/U/VrLi46t05QsJlXeSoJcZfENGs3rFvNPFN8uZwgEzJ9h3nct6NzOzETog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755639280; a=rsa-sha256; cv=none; b=CmgEpYi9bu8Gu5TXsyvZKQEQtOh1EH2eo0TNN0Y/bPJ4tpojvlRFcF1fD8yYQbfGlfDf2L s/oKPFr55PU4fj5fwgUudllyM3iAdBMOa3okuYsonhxMl6by6ataXjK4dJvuNlDg2ENW62 tFoVD13xOOtwckRwV6enDE7g5Z37eNK1U9rm46o2ReoZq6Cr3DaUaVck6oVQXEt5Kr7Jn3 usRzfWu6Di4NI9lOuflS9rTgd1ay0LY/pcsZJtx3IwUax6NCPdOEhHXT3imU/BUrN0mAQj M5j+EOpWBmSi2RteGWSJoSEXPsPzmM9d34PKOV0oo2vzhcTsc6c0qkhXVRxYIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c62sr3GsRzlRB; Tue, 19 Aug 2025 21:34:40 +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 57JLYeRb066293; Tue, 19 Aug 2025 21:34:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JLYei0066290; Tue, 19 Aug 2025 21:34:40 GMT (envelope-from git) Date: Tue, 19 Aug 2025 21:34:40 GMT Message-Id: <202508192134.57JLYei0066290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bryan Drewery Subject: git: 5be78ccf7a8a - main - src.sys.mk: Allow DEFAULTWARNS to be overridden. 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: bdrewery X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5be78ccf7a8af3ec27c29ab26d2f5f70bd6ff89f Auto-Submitted: auto-generated The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/src/commit/?id=5be78ccf7a8af3ec27c29ab26d2f5f70bd6ff89f commit 5be78ccf7a8af3ec27c29ab26d2f5f70bd6ff89f Author: Bryan Drewery AuthorDate: 2025-08-15 15:20:45 +0000 Commit: Bryan Drewery CommitDate: 2025-08-19 21:34:10 +0000 src.sys.mk: Allow DEFAULTWARNS to be overridden. Sponsored by: Dell, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D51921 --- share/mk/src.sys.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index d5c2af0c559d..2b9fc255a26d 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -42,7 +42,7 @@ CFLAGS+= ${CFCOMMONFLAG} CFLAGS+= -fmacro-prefix-map=${SRCTOP}=/usr/src -fdebug-prefix-map=${SRCTOP}=/usr/src .endif -DEFAULTWARNS= 6 +DEFAULTWARNS?= 6 # tempting, but bsd.compiler.mk causes problems this early # probably need to remove dependence on bsd.own.mk From nobody Tue Aug 19 23:03:11 2025 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 4c64qz4xPpz62hyv; Tue, 19 Aug 2025 23:03:11 +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 4c64qz423Zz3SRb; Tue, 19 Aug 2025 23:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755644591; 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=+589FyFa7EvU/WKsPbDhZu95i1CFZN02w11/0npCp3c=; b=MJIDGg4S/oeGD+QIm/w6wxodxBBVpTjtLvbiFhNPx9sahOeWJyPK1xdnIdxEEmFlB5YQZo MrKmJrzXsdhuoR+RBN82CTXIRLIyqSkzS4i2dN/K0xRH+ex8Cl3rIS+2bk03NSlbeot3qg pu7YW/upBwBDmApOLRfHjMmhgZlw8q/VM8VAbnUNRxvIPgaHluvKVYKPTCcOhyKotWaItZ 0Hw/IKpqFSorjdHMR/ceu4JbVmaOnqgsQ9RUgJqWn17lb2P3lbiH0RrFR21tJC5GxR7fTM hr8BRK/JXmi71E6BnChy5E/u+R59gszJF2FCFtFVPAj4HK4Kyui36cEuC4HZQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755644591; 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=+589FyFa7EvU/WKsPbDhZu95i1CFZN02w11/0npCp3c=; b=neCcKD+d8gfc/o+uBbWgBduKyJ95lSjGpbWxghg1HuBsoZ40wilxJeOiG69JRgGJIIUsK5 FoUYFDhTFEHr0orQrixRP/Tftdd+9Hz7GuslfDDrVCBdumeYt8aK6qoXsgN8jiYMC1vUSp si06dMaowthYn1gG2Fcb2eNITvCB85Uni711P7euopFlDYLrEZW1DLEwWuFIz9Xzhq7I+8 XWlX+IrWvVmAW1OLjV+GdExmn9O2xNDBQqERtZc9OGv5vFdLzBdZ7d58E5ssRtT0fnnJUI 1168NV2gjAs/So5etHKJgCS3AhbAsu6yXEbh3C5e/i/YhwrHOxiC84m0MOvZXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755644591; a=rsa-sha256; cv=none; b=uRvE9j+1wTF8hyhkeIE99w9vtiU+GCxkQ4Boj0BMKY9QX1xjUDSZJNXnjxaaPndAxLlrnP jI0E0/dJdmP4uIdMYw7OSG9NYypbAmB7z2mnhncIeVVJZd3D6GBav6arzwEeRZ1fTFuS1w JMd77nZVcf4i737M+u1mPNI7ilI/RqYXKhZA8QR2KfnFUoDIQmH4yAYDK4A6lBIok1iVuf /QAOGAKLETdpZ+a7WFoPpDdVjfxWmiwuTjThBtjwsJkn1gat/VNBIfHOGgV0t35XyW9rYA jQ1syUsNJ4GAvee8cy2qlfUZ4GdftD0BA3OD3nB+nhMyJyAQZ2oCW/f2OFktHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c64qz3VLWzn9M; Tue, 19 Aug 2025 23:03:11 +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 57JN3BRF036380; Tue, 19 Aug 2025 23:03:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JN3Blu036377; Tue, 19 Aug 2025 23:03:11 GMT (envelope-from git) Date: Tue, 19 Aug 2025 23:03:11 GMT Message-Id: <202508192303.57JN3Blu036377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John-Mark Gurney Subject: git: 740b879c6ade - main - arm64: prevent panic when using syscall mux + large arg call (mmap) 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: jmg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 740b879c6ade531adebeba7cd2f261bbe650797f Auto-Submitted: auto-generated The branch main has been updated by jmg: URL: https://cgit.FreeBSD.org/src/commit/?id=740b879c6ade531adebeba7cd2f261bbe650797f commit 740b879c6ade531adebeba7cd2f261bbe650797f Author: John-Mark Gurney AuthorDate: 2025-08-18 20:25:37 +0000 Commit: John-Mark Gurney CommitDate: 2025-08-19 22:37:07 +0000 arm64: prevent panic when using syscall mux + large arg call (mmap) if the syscall muxes are used, up to two additional arguments may be required. This means that the 8 required for mmap increases up to 10 (for __syscall). Sponsored by: Juniper Networks, Inc. --- sys/arm64/arm64/elf32_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index 7cd5327b9f1b..5c81c6cdce3d 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -195,7 +195,7 @@ freebsd32_fetch_syscall_args(struct thread *td) register_t *ap; struct syscall_args *sa; int error, i, nap, narg; - unsigned int args[4]; + unsigned int args[6]; nap = 4; p = td->td_proc; From nobody Tue Aug 19 23:09:38 2025 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 4c64zQ3nWvz62jZY; Tue, 19 Aug 2025 23:09:38 +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 4c64zQ2Lk7z3Sf0; Tue, 19 Aug 2025 23:09:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755644978; 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=IgKakCRZy5UtDP4Bn3eN2RfjGC1GQR8AsU0C7zPVcmE=; b=eNUJIFP34a0lzH7EALKKatGDRR7gOr738HEwcgfjBM7AIfiShfUYRjXKy5za4AHfmUFmPG HaKseYqOEHdAaHJALWm73PNjqhNz4aqtV+GOFmCvwdg30FHYcqH7fcVuBTHOksa6BKpGA3 oOsNLJgkB1zEa6vbmxSd4MtlS18Qh5Of5Qu/h9vHZQAzLN+9yvClQXZbmpfEy818iRtwbx Kxox/uvVOVxOQ16flW+iLDaIybgcrZRqGTlFdVZ3dJFJEIipSCGND4KHpuYkBQ7WQH2VN5 JkI21GwRnRbgenMdWIE0ndMJ06dsHJYF6t3oF8QO4Oke4I3leta5ApuSzlLbow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755644978; 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=IgKakCRZy5UtDP4Bn3eN2RfjGC1GQR8AsU0C7zPVcmE=; b=nnbwYEDGJRNTeN0fEXYEfgleR8Fjf1fw8eL3fyR31k2tnq2gBsa2NdQpKhCshzCBCbhWRn IY/hbF4yw+bOcv6j16WDlMPFVKuQZoebMfKBoTmsjIsEqYzaQjq1uhLFFQJLM3yZndRJQL F1kLHQfVuDi45xIYSE39S43e3o397T8Q+Zx6OfMjUCF227m0OMZwTJhQPa9gEIguU2ANY5 RczhIOMcWuPMRgZuV2n/UKyQxjGui6Lgpuq9TS+ph7fYOClJryq6LOrFj7EdmUFqnGs/3a LFLlGbdablSjTYkfov9gSXgXN7F9HgDgpxu1qiS3BdvWuZVGBR7HeqdVU7XhOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755644978; a=rsa-sha256; cv=none; b=lnkBwne+4Wamg+PKIRozNYtABLDwvTxwV5kWmzjTLoyeI0PYN+UqHGQNTWjgMXMH8rpL0i IvggkC/DMtkm6pBV6ilHJKlskmv+pixXP55zOVsuqlS+UABCj3wN7cbsgXApzPr8PBJZwO OwuhX02KNrkPVevhqNLFbr37OBUH7RJ0FrG1chU31aftirt8SmAWl2XmjMaq3hAr7+hsWO fj5XJ4SmjeWHNFeJ8L0Y7zZlo9lat2fGG/uXA/9mrBVoqZoPT6nkz8tas+CtVfFzH/KhVe IYH9+vpMsstqJMPjMdHFaoWxgfnZxFXLmrQdAiJezTGDaKaWDN502QpbF1hy0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c64zQ1yXmzn9N; Tue, 19 Aug 2025 23:09:38 +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 57JN9cUA038462; Tue, 19 Aug 2025 23:09:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JN9cNK038457; Tue, 19 Aug 2025 23:09:38 GMT (envelope-from git) Date: Tue, 19 Aug 2025 23:09:38 GMT Message-Id: <202508192309.57JN9cNK038457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 75acf71786f2 - main - libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75acf71786f201093b76f45eff03a8665fb79a72 Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=75acf71786f201093b76f45eff03a8665fb79a72 commit 75acf71786f201093b76f45eff03a8665fb79a72 Author: Muhammad Saheed AuthorDate: 2025-08-19 23:06:53 +0000 Commit: Aymeric Wibo CommitDate: 2025-08-19 23:07:15 +0000 libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp Remove the declaration of ifconfig_set_fib from libifconfig.h as it had no definition. ifconfig_sfp_id_is_qsfp is defined as a static header function in libifconfig_sfp.h and doesn't generate a symbol. Both have been removed from Symbol.map. Reviewed by: obiwac, mckusick (mentor) Approved by: obiwac, mckusick (mentor) Sponsored by: Google LLC (GSoC) Differential Revision: https://reviews.freebsd.org/D50666 --- lib/libifconfig/Symbol.map | 2 -- lib/libifconfig/libifconfig.h | 1 - 2 files changed, 3 deletions(-) diff --git a/lib/libifconfig/Symbol.map b/lib/libifconfig/Symbol.map index 2d80fb31652a..2e11ff963909 100644 --- a/lib/libifconfig/Symbol.map +++ b/lib/libifconfig/Symbol.map @@ -40,7 +40,6 @@ FBSD_1.6 { ifconfig_open; ifconfig_set_capability; ifconfig_set_description; - ifconfig_set_fib; ifconfig_set_metric; ifconfig_set_mtu; ifconfig_set_name; @@ -81,7 +80,6 @@ FBSD_1.6 { ifconfig_sfp_fc_speed_symbol; ifconfig_sfp_id_description; ifconfig_sfp_id_display; - ifconfig_sfp_id_is_qsfp; ifconfig_sfp_id_symbol; ifconfig_sfp_rev_description; ifconfig_sfp_rev_symbol; diff --git a/lib/libifconfig/libifconfig.h b/lib/libifconfig/libifconfig.h index b2f0cf9744ea..a5ce7b375830 100644 --- a/lib/libifconfig/libifconfig.h +++ b/lib/libifconfig/libifconfig.h @@ -171,7 +171,6 @@ int ifconfig_set_name(ifconfig_handle_t *h, const char *name, const char *newname); int ifconfig_get_orig_name(ifconfig_handle_t *h, const char *ifname, char **orig_name); -int ifconfig_set_fib(ifconfig_handle_t *h, const char *name, int fib); int ifconfig_get_fib(ifconfig_handle_t *h, const char *name, int *fib); int ifconfig_set_mtu(ifconfig_handle_t *h, const char *name, const int mtu); int ifconfig_get_mtu(ifconfig_handle_t *h, const char *name, int *mtu); From nobody Tue Aug 19 23:22:35 2025 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 4c65GM584hz62jrJ; Tue, 19 Aug 2025 23:22:35 +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 4c65GM3vtDz3Tk5; Tue, 19 Aug 2025 23:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755645755; 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=fe4Ehf1jEvbRLnIpX4jDB23CQBkr0r6PmlsAzEJxU3E=; b=GIkGQgy78VowIKtv+TImRSgUbUdXhwx9le1loImerLAYUAUGULvcS+6XaI1gmZgERRHgqP Hk3WqQBvHLOoxeFCTZJntMdJbvokL5dybuXYjOGI5zS5P4fpznJqhx+psDK40wGgR/dWFK /ooeX3tD08xX7TPCMgrOFNCPpTea6ZJylbY09OiecZs9Zhs7TyooZyKfN72T3jKq3ZMB6n TlTs6Jdx6uINMtNNlnO/dzKMY9iA0TD3+1ECXF+X4XyHzGXYkKWoo1TFk1fJCJcIxXVlTT AeZYrCMdzIRlUEiXnBVsTVJE4ZYZlni1UKpwvun0XxzOJCGRt0DOoPCXz6z5BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755645755; 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=fe4Ehf1jEvbRLnIpX4jDB23CQBkr0r6PmlsAzEJxU3E=; b=E/7fczElrqi63MYXa/ghHiU9sXQARpr8Lm7Xw8nP8NcNoMkuuSk+pBoq/wiAC+ahIm6jEO j5/89XUJUvuLvKWKD5mczbReOX35pGvoE1rNWDzow4S2WT/qohQ+5yOiclb9OU9h/LKPfB fo769uCK3jPEfylLb8MDKhg248x7CsbR37mNiPB4oD+KM8qfn++EOeA+5Gngk2jHGo3kCa 8OnX63jg6pmvYW5PxEryIjDQ7gK//FdRqHwJQMaHQZ9aGD49sOiG3Qpjf4Wte4KD7Vrtmf VbPkVpMYmqF2Pp6iJ6ws+qvWPU5awmTvOHObBicja7H42dgxVCNeCb3e0h6VXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755645755; a=rsa-sha256; cv=none; b=gY9+YDHbGN+2BfNdaKF22gEgro4554y7hRtArdgO1OpnaBJeTMpHfQyv22o1NLp3pE9m0A vaFH7DLWAh+yrnD2+WpJT3XnRA3AFPbLoi5jl/dW8YjqqEgkokuQibuOAPASFjeAz9LpKZ IhfzIg9B8eA+5Gy6I/8CtddrgRVmltch1pjmGiX43NTKJah9csIMSdrVwVYskw3hlx3t/x PFFXW9U/3MmYeeVGMU/UmAjx9msfQlSnQRqVjO1MgLGYOd+udXEjHPbEciMcZqOG76fgzZ nF9tvcI+zRuu7QV4tPs9n7nClua6V8aN+iaBFKXsBZkdfgZ/A2hE+1EOU5Y8+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c65GM3WZLzpF9; Tue, 19 Aug 2025 23:22:35 +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 57JNMZlM073255; Tue, 19 Aug 2025 23:22:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JNMZJR073252; Tue, 19 Aug 2025 23:22:35 GMT (envelope-from git) Date: Tue, 19 Aug 2025 23:22:35 GMT Message-Id: <202508192322.57JNMZJR073252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0f73fdfc2ab9 - main - iwlwifi.4: add link to bugzilla in the BUGS section 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f73fdfc2ab990f0b576c23c27d43436d3304755 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0f73fdfc2ab990f0b576c23c27d43436d3304755 commit 0f73fdfc2ab990f0b576c23c27d43436d3304755 Author: Bjoern A. Zeeb AuthorDate: 2025-08-19 23:16:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-19 23:16:33 +0000 iwlwifi.4: add link to bugzilla in the BUGS section Given iwlwifi has a (hopefully) fully categorized bug-set under one meta-bug (tracking) we can give a link to that. Suggested by: grahamperrin (as part of a large GH pull request) Suggested by: ziaee (final markup) Sponosred by: The FreeBSD Foundation Reviewed by: ziaee Pull Request: https://github.com/freebsd/freebsd-src/pull/1541 --- share/man/man4/iwlwifi.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/iwlwifi.4 b/share/man/man4/iwlwifi.4 index 4a251f239a55..660f6a9bf57c 100644 --- a/share/man/man4/iwlwifi.4 +++ b/share/man/man4/iwlwifi.4 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 13, 2025 +.Dd August 19, 2025 .Dt IWLWIFI 4 .Os .Sh NAME @@ -331,7 +331,7 @@ driver first appeared in 802.11n and 802.11ac support for the 22000 and later chipsets first appeared in .Fx 14.3 . .Sh BUGS -Certainly. +.Lk https://bugs.freebsd.org/bugzilla/showdependencytree.cgi?id=iwlwifi "iwlwifi known bugs" .Pp While .Nm From nobody Wed Aug 20 04:15:16 2025 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 4c6Cm43jTGz642jg; Wed, 20 Aug 2025 04:15:16 +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 4c6Cm42Jc9z3CJb; Wed, 20 Aug 2025 04:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755663316; 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=3zCDzx83dagHYvdtURbWADm9VoA9d+RBemnO9XppWH4=; b=bobY8XdPdKKu8IRaEFW+Zybp2BOUjc9Zr5Y9JGLSecDhfO7olfTTLxw/6z4OOt76QmHYJw nSlmAAOpbJUmLnr6Y9HzqeWInRcuP5kk7ex9paY2hZkNLiFUPQWEKiWIAQrvzTbouzZZXb 2Uhp6aqWhkwqO6vQBNw4ZxHXaYsHJ5gb4rWQxFv/NoaTdSGv0P8bzEw1W8O5BDEBH0in17 tqMUTA4bg+hfQvircDNpxdpBG0Yo63hJDnjBWO7YUEcBLVWCXS3tQn67J4Ys61xOun87sq 1P1MU5Y28z+Yz/JjNIdBA68LX8pRM0PoXDTNa0mI/FXgY/SqiOIO6KucInty6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755663316; 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=3zCDzx83dagHYvdtURbWADm9VoA9d+RBemnO9XppWH4=; b=ZhOB3bcv/tzpZTs/0d7b8RzSS2qmAb4+bwbx0KVWqhaBk/bX4IFzodEgg79u/KSZdf/W02 mVtRNyxyB0EBRVLhRHixlFPweLIiuw2pKJyfFVKjsFAwPDNw90f9z+mtgHDE2rJ4VPWAz2 kfp1IakPedTptxaQnZozSb3vm3jKx9vIn16m/QcTvRxqR8KdOp0yC1wWP68rS5U9GXOQFI Mw64q0CXoAxzaQwBLlKd8aHr8l3fO9auNWALlyTTLubaCouSp3mB9J8sGZqkRQPJ/pnFCJ uuYLV9NFaNqpDHgkfIFCplFOIAEK63zenP+0XPfgWIKuvrLuuD2PVGwxWcTWlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755663316; a=rsa-sha256; cv=none; b=fiAUITryp2p7OJkr8AQggevYDFVtNtQf7YtxdGwLRQjuZC3S44cN6Cf8ZXMh+phkZgAI5y 1bYrOBtthVPXpAY7VBuEVOZBaWDZODclLUaSrS41uU6yhmVHDwDzkUGbdZg4Pd8OJ9o6pP A7BSCuNFZ5oGB0nZAaWvX2wefQsJdfDwXj4ks78R6pzOeA6xVisCVXlM7h5H3+xK92DD+U MYDnL9DidcPVWwFasr9P+KaYy6Umbtq7Ssin12NsaydJYJ+3hMZ8/W19eOzrtt/+iBdJZH UZds/weI7cJc6ie1nXsQpZtg/NYn9gcCewigiXHhJHpdlGtSAeYNFJiVB2hNyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6Cm41jFyzxcG; Wed, 20 Aug 2025 04:15:16 +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 57K4FGUX021761; Wed, 20 Aug 2025 04:15:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K4FGnK021758; Wed, 20 Aug 2025 04:15:16 GMT (envelope-from git) Date: Wed, 20 Aug 2025 04:15:16 GMT Message-Id: <202508200415.57K4FGnK021758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: dc5f8c344299 - main - build: Switch CLEAN back off by default, again 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc5f8c344299106f9a28dc6f692184d8379468a0 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=dc5f8c344299106f9a28dc6f692184d8379468a0 commit dc5f8c344299106f9a28dc6f692184d8379468a0 Author: Kyle Evans AuthorDate: 2025-08-20 04:14:13 +0000 Commit: Kyle Evans CommitDate: 2025-08-20 04:14:48 +0000 build: Switch CLEAN back off by default, again Now that we have the notion of a build epoch, we have sufficient tooling to handle changes that might need a larger hammer to unbreak the build. Future changes may extend our cleanup to avoid scenarios like with the MITKRB5 knob where flipping it will still require a cleanup, but on the whole most users aren't regularly flipping breaking knobs enough for this to cause the same level of problems. Those users are advised to do a CLEAN build when they flip it until we start recording build options and doing another clean for important knob switches (see D52011). When knobs of that sort are newly introduced or switch defaults, we can explicitly record an epoch for them in the interim until option-switching is detected and handled properly. This reverts commit 6dab48b9de6c1bff61b0ce78029c1e3cba20895a. Reviewed by: jrtc27, markj Differential Revision: https://reviews.freebsd.org/D51923 --- UPDATING | 7 +++++++ share/man/man5/src.conf.5 | 9 ++++++--- share/mk/src.opts.mk | 2 +- tools/build/options/WITH_CLEAN | 4 ++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/UPDATING b/UPDATING index f90036c1a3ad..e00b0c21f5c6 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20250819: + The CLEAN option has been switched back from default-on to default-off. + This reverts the 20250808 change below, which had reverted the 20240729 + change before it. Note that some src.conf(5) options are known to break + ABI or compatibility in ways that may require a clean build initially + when switched. + 20250816: Sendmail's libmilter has been moved to its own package. If you want to compile applications that use libmilter, you should install the diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 2e694bfe3293..f79d160255bf 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd August 8, 2025 +.Dd August 19, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -411,8 +411,11 @@ Build clang-format. .It Va WITHOUT_CLANG_FULL Avoid building the ARCMigrate, Rewriter and StaticAnalyzer components of the Clang C/C++ compiler. -.It Va WITHOUT_CLEAN -Do not clean before building world and/or kernel. +.It Va WITH_CLEAN +Clean before building world and/or kernel. +Note that recording a new epoch in +.Pa .clean_build_epoch +in the root of the source tree will also force a clean world build. .It Va WITHOUT_CPP Do not build .Xr cpp 1 . diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index f146a4b24424..8a52fe03221e 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -80,7 +80,6 @@ __DEFAULT_YES_OPTIONS = \ CDDL \ CLANG \ CLANG_BOOTSTRAP \ - CLEAN \ CPP \ CROSS_COMPILER \ CRYPT \ @@ -201,6 +200,7 @@ __DEFAULT_NO_OPTIONS = \ BHYVE_SNAPSHOT \ CLANG_EXTRAS \ CLANG_FORMAT \ + CLEAN \ DIALOG \ DETECT_TZ_CHANGES \ DISK_IMAGE_TOOLS_BOOTSTRAP \ diff --git a/tools/build/options/WITH_CLEAN b/tools/build/options/WITH_CLEAN new file mode 100644 index 000000000000..0bb05e33371b --- /dev/null +++ b/tools/build/options/WITH_CLEAN @@ -0,0 +1,4 @@ +Clean before building world and/or kernel. +Note that recording a new epoch in +.Pa .clean_build_epoch +in the root of the source tree will also force a clean world build. From nobody Wed Aug 20 06:55:25 2025 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 4c6HJt1Wf6z64FBD; Wed, 20 Aug 2025 06:55:26 +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 4c6HJt0g6Fz3S7N; Wed, 20 Aug 2025 06:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755672926; 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=Kg9+n9kxguq59dxGJJdFZhLUmp0N8G+0OB4HJSCh2tU=; b=kk9ERPtPGwGgQpCG2Pmi2WShTKYNT3s40otXuucXQurmAqGz03tRIqbZJMngzJx6duh8Tr /stgAEfYmRVWBgrIgeQZjgwhyp5oc1Zy3cZFcQokh+Tft0DOg0z0+7ZYuKhdLPNwO6VSOU pf+CVkOs8kOmshdDo+0YK6RyyF/jynhyKsH3v+0cTFfaiMW7hpY/HPlktLBad3WyCqt8G7 sYk8fjlbi+WZBGUEbi0AABrxHTFrIhkMIDXNVBIvaC+uwuZNQqpD1qxtznylq4t52C2VC9 T6b1dNMZNF6ZrIWXQJ5doO+zm3A4TVylrrSFHzlxSefio8XUu5Icgxs2m3PVOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755672926; 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=Kg9+n9kxguq59dxGJJdFZhLUmp0N8G+0OB4HJSCh2tU=; b=D3/Nh/ggc/8lECV7IB0y8tQQeA0uVpxnm28jk9uw5SLcVqhx5wR+hjNMc6r0LOBZAL0j/4 HPtSPXTo8ucBXL6IcTj8jAccbGaHG/LVeNwv6DsHRTCm1FO4UDNQSOrFk4gLzmaFBe5uQc j+nPHCOw0uqytdGTERkQCx8ZkkEfLnwDyKR4AbhvauzYp7W0cO6xELkaV5/BBb0WtELI2S RauvkNodqj60QogB/rzcM357VrE4gnmYk9u4BLQWbzEOzebbboXmV/m0c8FrP1fX2Cl8PJ 4tX9Bagph8YRWm3w+T6xMSKgPFXmJ45p/tdAnsGX/ZxXjHWwozEQzoi5htNZhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755672926; a=rsa-sha256; cv=none; b=pVscAIn46pqpOubiXzQ2N4QMTJzT5vyxIo+QIplO45BnNzxCZ+8ShXj1WcueSQulnB7rxL 5ENKhr9MPZLQ23DJ8KmoRbhIdz4oJR4BgwtpNmmAHpTxGwZ6cfpLbQylT8+bYEoWnTKgRW xsz19tq0lILsNoPPfbrWpBx7TC3Qhe3a6PpEJ04Bxkp0Lh1qLnkz0ZNi45NFBtG23eSyD5 L8yIHHEhNMdAKjxvZUN/alPFzajJfzXVa911sHkG3YLfNj5bnWGN2pf51o4lj/Wr9MnGjq OclqpKMdGTnNo4ekWrQjbWdKxDA5ZtwL+aIAp0lkvhu+icfI/EEE+d/ok3xUZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HJt04ywz12tQ; Wed, 20 Aug 2025 06:55:26 +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 57K6tPmD022296; Wed, 20 Aug 2025 06:55:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6tPJE022293; Wed, 20 Aug 2025 06:55:25 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:55:25 GMT Message-Id: <202508200655.57K6tPJE022293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f7fb177c0221 - stable/14 - stand/efi: Fix a typo in a source code comment 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f7fb177c02216272a5d145885e213c4eabdf829d Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f7fb177c02216272a5d145885e213c4eabdf829d commit f7fb177c02216272a5d145885e213c4eabdf829d Author: Gordon Bergling AuthorDate: 2025-08-17 09:23:45 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:53:30 +0000 stand/efi: Fix a typo in a source code comment - s/externel/external/ (cherry picked from commit a7818e34209579b5e1bba0df73c4d0d5ed2b1397) --- stand/efi/include/amd64/pe.h | 2 +- stand/efi/include/i386/pe.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/include/amd64/pe.h b/stand/efi/include/amd64/pe.h index ad5985cc2740..df84d26b2414 100644 --- a/stand/efi/include/amd64/pe.h +++ b/stand/efi/include/amd64/pe.h @@ -83,7 +83,7 @@ typedef struct _IMAGE_FILE_HEADER { #define IMAGE_SIZEOF_FILE_HEADER 20 #define IMAGE_FILE_RELOCS_STRIPPED 0x0001 // Relocation info stripped from file. -#define IMAGE_FILE_EXECUTABLE_IMAGE 0x0002 // File is executable (i.e. no unresolved externel references). +#define IMAGE_FILE_EXECUTABLE_IMAGE 0x0002 // File is executable (i.e. no unresolved external references). #define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004 // Line nunbers stripped from file. #define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008 // Local symbols stripped from file. #define IMAGE_FILE_BYTES_REVERSED_LO 0x0080 // Bytes of machine word are reversed. diff --git a/stand/efi/include/i386/pe.h b/stand/efi/include/i386/pe.h index ede10814939f..b73673cf715b 100644 --- a/stand/efi/include/i386/pe.h +++ b/stand/efi/include/i386/pe.h @@ -83,7 +83,7 @@ typedef struct _IMAGE_FILE_HEADER { #define IMAGE_SIZEOF_FILE_HEADER 20 #define IMAGE_FILE_RELOCS_STRIPPED 0x0001 // Relocation info stripped from file. -#define IMAGE_FILE_EXECUTABLE_IMAGE 0x0002 // File is executable (i.e. no unresolved externel references). +#define IMAGE_FILE_EXECUTABLE_IMAGE 0x0002 // File is executable (i.e. no unresolved external references). #define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004 // Line nunbers stripped from file. #define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008 // Local symbols stripped from file. #define IMAGE_FILE_BYTES_REVERSED_LO 0x0080 // Bytes of machine word are reversed. From nobody Wed Aug 20 06:55:27 2025 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 4c6HJv2f16z64FBF; Wed, 20 Aug 2025 06:55:27 +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 4c6HJv1CzFz3SGY; Wed, 20 Aug 2025 06:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755672927; 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=SG2RNNmE16BlHsOnKUQ0LSXV5bX3k3VA71x36AtnNWU=; b=nVB0RUiGkptFFBUAEXyr8wW1BhpuXkr8/K2wnZp4UgW8O9OXuM8j3/zcmyhdOI2QHXWWKb 6A9S4mIORAPn2oFTTputR8lq0nB6qY+wP46xsaiUmXWENjJtrFWqlTcZfSZwM7EofLoKz0 on5CKanEOhdPXroFZBd6xjmmgebFNWF4BUMv1r9hbiym7B63/YchIoRSqDC6hvlgKOqnDF lCkTxMei/Vn5KqhGRiXHBw8oGQH1JzhOnvFcwjFPHyy/mTyKwV9mDaD/Sfx5l7rBr6eQie SDRcdyTOowAa0SYydAbs/Se2S0sgCVieGB9Y/eMs39HfNZONEIFfMKYPojxoiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755672927; 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=SG2RNNmE16BlHsOnKUQ0LSXV5bX3k3VA71x36AtnNWU=; b=AT9uU0zpjdswwkFWRaEnhC2EerSVpb0o/oA7AHD06FyYRn7+3nbZ2EvU2GAcwZ0PhG3bRS ivcNlyKfDv0qL483JWBD2iZnyFcpS1wkMiBQd7tknrOISTozBCdd1FTWC+EaRQwH9gdKVr e5x1G4Zwmx3Ple5jp+xEeZHc35RyX8kBPxVyMbbtb4qEYJCke5xI8wwkw61Pzy8kTS446u EZpwnGaCZ9dbO8jvxDdE6583f9ugeL3furuvRKjId7pmb9ZmDw30l4aDrA2RxPlhcGgksL 140nY6PFSdoQVkjcPWs0yB+LmypyNTCbxJfYtx860p9hf6+8ZQVihoDr8X9tzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755672927; a=rsa-sha256; cv=none; b=dMqb6eGyyQd1xjygSD3V9+xEi8k+dZaYzAdz+CcCPxoVBdharIVzbwIrODYmxmieWjOcKe NPZe6zNjFDF7TKn9pA8ttlVrGBJdyYS8n2oqaJ4xwkC3EGloCNP2yTRDG+b5x4/O8nh+Tg ArHYv1fdUBUgE4t6pY7/D7VPEq3TWWuYWcwlUKmEm1y3d1Kyp+05eiPVzAY96KJJoKk/+u iewr4ChgqbmfzIvwW24DbQAldbqJ5raPhF2RU7FPwVRjCC7rNUIOFrwnIj9jU0/UZylTPd 888aUCHAglcq1LyZbiq9IdJIXAeGS8pOAzF5I+t7CLXFPyiAUqKuRJ5bosiu7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HJv0pR9z12tR; Wed, 20 Aug 2025 06:55:27 +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 57K6tR3i022329; Wed, 20 Aug 2025 06:55:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6tRCJ022326; Wed, 20 Aug 2025 06:55:27 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:55:27 GMT Message-Id: <202508200655.57K6tRCJ022326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e3ba3105f735 - stable/14 - isci(4): Fix a typo in a source code comment 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e3ba3105f735c8ab1b7fb726345498d4aa3d456c Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e3ba3105f735c8ab1b7fb726345498d4aa3d456c commit e3ba3105f735c8ab1b7fb726345498d4aa3d456c Author: Gordon Bergling AuthorDate: 2025-08-17 07:33:50 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:53:44 +0000 isci(4): Fix a typo in a source code comment - s/contants/constants/ (cherry picked from commit 663061da205e4112fa25bc628f35a56f0e31a39a) --- sys/dev/isci/scil/intel_sata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/isci/scil/intel_sata.h b/sys/dev/isci/scil/intel_sata.h index 4cf4adf03e07..fdad5be9b083 100644 --- a/sys/dev/isci/scil/intel_sata.h +++ b/sys/dev/isci/scil/intel_sata.h @@ -61,7 +61,7 @@ * * @brief This file defines all of the SATA releated constants, enumerations, * and types. Please note that this file does not necessarily contain - * an exhaustive list of all contants and commands. + * an exhaustive list of all constants and commands. */ /** From nobody Wed Aug 20 06:55:28 2025 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 4c6HJw3mcHz64V71; Wed, 20 Aug 2025 06:55:28 +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 4c6HJw2CyFz3SV8; Wed, 20 Aug 2025 06:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755672928; 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=CJF67CNr33xRUqEV22WksaY53X+m0x44uOs2NdL48RY=; b=EW//fSpxQQsVS1aeP05AR2V5H4dvk47c+rug8PbtvCh+65mLAsF+Xh1TlE9bEcxIXPfA8W vAYSJG91FMvT2LC4VuHf8GqMOXuWsqdKA5kqMl+iW7pBfDVKkQDI3UvCD/2ktphvQ6RlkZ fkbXQTY5yw3vSPmocC9s82FG72aFlkGEoUNB+pw/DsbyZ/YcQK7dxsnAe3n4n59NHHSdum VZ0OEhVb3nNAYzext4pGkAleGM58jCqndrbQvBp6sI+5BraJufXS4mmBtUAhy1QNs0e0Xs z3kewlkoRNq06kzXL+fBO44UUpTLIGcyUOkJLY5XyVcjjHnj1Km553wZSlRCsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755672928; 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=CJF67CNr33xRUqEV22WksaY53X+m0x44uOs2NdL48RY=; b=cGsH/gqbKrVPCyDJdZ7iVeAZIdxgT3opLYn3E6E+W+W7O14/D4P4RnyncE3dPemLVgH3F4 1xEyobNwvP8akmsdOYHYGS/CynJvYkyets4svZLbkXk2rDebNilfheY3JW0f2vtcmYI+7M CWcru4uxedi2rii8H54Hia6IZc7LqGmI9NUih3zWkQDayvHFThu6izToBn3AF/9KefXQg1 viLt6K74RX1tC+Al5dhpZH4V92lAEnyu6O/4i1+U1eg+hxlznwTzbpXJSjTQRPEQOqYFy/ YtfCtqiiwJ1gfxrxtZu6Z+VZ3K7LaPLqzbIY/PA7OmI8VIOd+FojjeJFDJQYJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755672928; a=rsa-sha256; cv=none; b=FQO2gmDGHNBNeClE5EE/0pM1rBmB16FjQrpvljLZAyW9JjYlyChUhzvSVWgBmrPF80H4hr ydVan7Dh5uIG8qn/vdMNAXJnJjfJqFYaSyMN7ok+/neNjzYPMhHRYiCLrB5+4731hBk0du ai3Ef1yHVx5eKrqKssM6n+hCTNjT4Vj/mF9suUUWnZA3S1Fbp/6A5MfVQVImgSEtKd3bAN DxUrPIE2u1Zwun5x7Qcc0iZhDIPnInF2r7zXI0YhgNl92ZrrY2nzAQaQX/f5iMVr6bcjMr Zs1rbomrusW7cwokx4WIXxwkAk2XPAtbJqc9nBkmoCc6L+4+/Z2uydIwmLuNSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HJw1kmgz12M5; Wed, 20 Aug 2025 06:55:28 +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 57K6tS3e022362; Wed, 20 Aug 2025 06:55:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6tSh7022359; Wed, 20 Aug 2025 06:55:28 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:55:28 GMT Message-Id: <202508200655.57K6tSh7022359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 1458494b92e6 - stable/14 - test/netfibs: Fix a typo in a source code comment 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1458494b92e6e55ede271e3faa4b074353f1cb00 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1458494b92e6e55ede271e3faa4b074353f1cb00 commit 1458494b92e6e55ede271e3faa4b074353f1cb00 Author: Gordon Bergling AuthorDate: 2025-08-17 07:32:10 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:54:00 +0000 test/netfibs: Fix a typo in a source code comment - s/aguments/arguments/ (cherry picked from commit f066a425059e6ce80997f8ed850b74cc168c4d5e) --- tools/test/netfibs/reflector.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test/netfibs/reflector.sh b/tools/test/netfibs/reflector.sh index b9500689a321..a68019532010 100755 --- a/tools/test/netfibs/reflector.sh +++ b/tools/test/netfibs/reflector.sh @@ -897,7 +897,7 @@ testrx_run_test() *) _opts="-d" ;; esac - # Convert netcat options to reflect aguments. + # Convert netcat options to reflect arguments. case "${_o}" in -i) _opts="${_opts} -T TCP6" ;; # Use TCP for START/DONE. -u) _opts="${_opts} -T UDP6" ;; From nobody Wed Aug 20 06:59:12 2025 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 4c6HPD5wcxz64VGt; Wed, 20 Aug 2025 06:59:12 +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 4c6HPD5L5Yz3T1l; Wed, 20 Aug 2025 06:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673152; 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=ZFT9TMYZI93zf+SYc/x4QtQSOh1FfbVXN+mR9Ib4DtA=; b=Iy3WjuWIuLgaRBtJ9zNOwbFcntd49IBA3bw+ob+wtriFqOxjduGKc+I/D8pFCz6Ygbzn1N hiQgJVzz1sXJ+7HD8koddYAbf/mDWY34qRJrBzBst4DKEmUqbGJHfYiBEvQQhbJs6NQPqY 9AjkMfuM7LO5cyFtv/UF/20oVzSDjmiyhMaNXHcHAe6sQExa+a71pMub3+aWJqZwABkcwo Nb8qT2m9uTvIIavhdH+VTmsudbshYcz3fjF9ofQWa9NgnrAyDDQEaatorSMlq4CbCCMknc +PKgV3IWJUTAvct7RpLXd40Kc9nZp7P8sMX/x6RSovBXoUxUzkvIp4ibCxatMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673152; 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=ZFT9TMYZI93zf+SYc/x4QtQSOh1FfbVXN+mR9Ib4DtA=; b=OTQj6aBinGc/mvYtXuhySI40QqC8PtuC3CRf+c6PWRhsVX4YLUIZ8lOo41re4eGukx0+ad lWMUngbIvvGiAmnLOiNvEZJshd1tkM8HcOoBnxbCRTrNCXFEcXpkeQWi9zVeguOTT6rEF/ NHfXwyCqSavhNXYFU7Fr1RChplOlmKlYiA9+dIwMIflaAIBQZFCso0OFwwxUSt3b0fmi9o 1XKONwgXYdlodI9oU35gpuzjLW96AJbvA1f0MvoRf3u9wT5aNvaZPLZ/yn17kNy/4i5obs /2blZ9Ga+N6kmrQSWGDnm3A5k0xeWzd4dfm8mEPK/ihP091xVgHEyvt/r4Lj9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673152; a=rsa-sha256; cv=none; b=w6npms8tbh1rfHUWqwMWyD8/7YtljXLogsWa8rscc2uGZYm0f3Y9/FppvoYHwra14ySDOQ nwQeq0JKhUWfkjHVZEj9lqzngTM0bXngyxWBju/2L6P1yRMacncmPquyNzgpZ0GWCeLghD 3FkBrMqFl7W41afoZFv3vzvoYvxjyUkJvPhIHaR3yw8is0z/4oU2C7wKZ01mrMV4Yb9hse NmZNNQYiU0Vcph86g8dqaPCmyVLWHQUyA+Kh64MVZ+1bzr9XxxtNsfYLBPs/bhI2ZlAYlm LBSvP7jB0hSy98WGFn1deMMAMf810e5ZUaJ9a7TCZpSb31CmT/sF3wuSolIm/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HPD4xyhz12WG; Wed, 20 Aug 2025 06:59:12 +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 57K6xCYE023603; Wed, 20 Aug 2025 06:59:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xC3o023600; Wed, 20 Aug 2025 06:59:12 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:12 GMT Message-Id: <202508200659.57K6xC3o023600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 03fb545e27ef - stable/14 - localedef.1: Fix a typo in the manual page 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 03fb545e27ef01db821a0cdc0d40035225a2d5ac Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=03fb545e27ef01db821a0cdc0d40035225a2d5ac commit 03fb545e27ef01db821a0cdc0d40035225a2d5ac Author: Gordon Bergling AuthorDate: 2025-08-17 07:29:04 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:56:16 +0000 localedef.1: Fix a typo in the manual page - s/contants/content/ (cherry picked from commit c0367c654a3340c5aa194a3137489f760d556139) --- usr.bin/localedef/localedef.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/localedef/localedef.1 b/usr.bin/localedef/localedef.1 index be37715f490d..918b57961c6c 100644 --- a/usr.bin/localedef/localedef.1 +++ b/usr.bin/localedef/localedef.1 @@ -164,7 +164,7 @@ unless instructed otherwise by the .Fl D ( BSD output) option. -The contants of this directory should generally be copied into the +The content of this directory should generally be copied into the appropriate subdirectory of .Pa /usr/share/locale in order the definitions to be visible to programs linked with libc. From nobody Wed Aug 20 06:59:13 2025 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 4c6HPF6Zkqz64VGv; Wed, 20 Aug 2025 06:59:13 +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 4c6HPF66fhz3T1m; Wed, 20 Aug 2025 06:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673153; 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=D8JlGJ4FFHbWAMXTKfLiybkgZStJe+WB3DLPsZp7/wA=; b=mXMtBw4f6Bavvh0SWtLcX9Nx3LaCuEcM9wzs003N0hCw5j1ma7h0YaMW1zoKXORsUh4o9Z 1MYbRg2L4NpvH/GEafMDcbf5//epiH8ComMKu071OkgG7d/0PSVEPWmedcFF5Zbf1PkqGO xur8BPEzEZ9zGoREv8KkPgHtrYahzmYjpi4fJdi93RyO9b9pMhiCtGMhz6+CTqmQyCaxWa L9kFrJGldwe+S8QpCHQI7yL/FWI6edjwMYplap/sDYerQEPVH4Qhn552f6kAsYFCKaOPob UNqNiupfO+ODEsiY5nhVj40VtyZugd81K+SmBsq71Wty6+witRsTqEPYIgx1AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673153; 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=D8JlGJ4FFHbWAMXTKfLiybkgZStJe+WB3DLPsZp7/wA=; b=KLKtjRB2iM9oFdqfnMAwHYGhiO3eKXWpDT6YRQ+IRE7ueuDrUv5ogQt1GduBv4N8KVAnYI jfsbQVLH5yGryOgXypZipTHvsxysQWJ84OF7PfESuPUhsJSQ21v5UWtO5f2BsPVy7zc3KJ Cksz8Ub6oDr8rN8ZTtY6ebaLDdfyANxTjFciWZ0+A1y6OC418IVAD9KeWSQexfkfg0GBQo 58hjHXBwBeJ73u2rLp99K+BHt0IK+p7UKSmmbjAxGPmL79GX4ZKHXcilvWsxgAYAC4uBHp 8h/bpLhcCbDdbfwi78BbtVabxSMZ/U4M8tKbUuxnCI8+ZaBDn0jrMOHzsLjm7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673153; a=rsa-sha256; cv=none; b=P4VFzAd+Y/S7wmyD41k2y/xMusvu4hh1PGiV2S/V1F3vy91l8C008Xwhtl2Zvy10cJIdUA o697ndvsNRlZu+rp+g3taZ7mGMPTZPlJ3lwqhPI45Dhpj1+TBIaHnr66+jUBi1AQXKwESE uOF/g0RUljR6Phoa+bgFebHZ3UX4x45l7HX1MUN6s6FgnvCUG+C/1KQTa+POtXtvPQy/Bd c5gitbMpuGFR5UdvNpaiCjYAjHRJY/pkSr+hS7hDMpgp+TRD3ucjO5G4seklvUkWmQCl7C SsHUdNfqbYBrwL6VeYNoM54zySn8i6vDHHKpuRVd+bYYBuActkTKoKeyuuWLug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HPF5kvHz13Cp; Wed, 20 Aug 2025 06:59:13 +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 57K6xDRk023635; Wed, 20 Aug 2025 06:59:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xD7T023632; Wed, 20 Aug 2025 06:59:13 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:13 GMT Message-Id: <202508200659.57K6xD7T023632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 7f1296b8dab1 - stable/14 - services_mkdb(8): Fix a typo in a source code comment 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7f1296b8dab1b177a150dff150cb2585e9f833d7 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7f1296b8dab1b177a150dff150cb2585e9f833d7 commit 7f1296b8dab1b177a150dff150cb2585e9f833d7 Author: Gordon Bergling AuthorDate: 2025-08-17 07:26:53 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:56:30 +0000 services_mkdb(8): Fix a typo in a source code comment - s/priviledged/privileged/ (cherry picked from commit fbf0efd02608473021692d377dd567f247a1a85c) --- usr.sbin/services_mkdb/services | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/services_mkdb/services b/usr.sbin/services_mkdb/services index 799778c3c365..8f066cd24379 100644 --- a/usr.sbin/services_mkdb/services +++ b/usr.sbin/services_mkdb/services @@ -896,7 +896,7 @@ biff 512/udp comsat #used by mail system to notify users # processes on the same machine login 513/tcp #remote login a la telnet; # automatic authentication performed -# based on priviledged port numbers +# based on privileged port numbers # and distributed data bases which # identify "authentication domains" who 513/udp whod #maintains data bases showing who's From nobody Wed Aug 20 06:59:14 2025 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 4c6HPH22cSz64VPk; Wed, 20 Aug 2025 06:59:15 +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 4c6HPH0RrYz3TDx; Wed, 20 Aug 2025 06:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673155; 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=17U/D0CpINJrAGK/nt49tk2MN4MvrW3AuaL+sCNOQKY=; b=s/ZjSTaBl/FEpn7lWwQUvpzF/TlD0ltZ6Ex4d3CJc91IBRdswJxC2MUP/XGBdFaYzxtZfY D+ctY882D87La3H7eQSTUB8Lpr8MmT2kHy4393zGcaGnoRfxoDU5BTfLSK3u6adTfAbNFF zVpAzGmZzjUU8JppnN81P4vuHABQBCJcD+fLKJmzKpwzbTHWhtomErkKRP4YPY0YcS9HjC Su7RjEkOLcpcq5A0/bvszNS5hN+IS7C/jP1h2qsY+cankh38GerDCkrH6b0koeOxIpNr3H VpP1tHjU6qNtwWkgqJ9PlcYPr+vH4sLpGfRl3iilJ83rMwUSD07W7xci78g+xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673155; 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=17U/D0CpINJrAGK/nt49tk2MN4MvrW3AuaL+sCNOQKY=; b=HzeKxirsN0njaj585ZrFy0qSzi/gBnVP+VJsaza/rpCtPYhjLxE6ws8fzfNocHtskiz65d 3XnUIkATDlzmovvQu7bHlBRcb1xyYfb9dCIn7kXBXhBZYiSGVPjZXBqep0v1tPqWew1nCw eqiIPx38OEkbg/M+HGknFmwdUapWuMQ+UcOj8TotckSeNwRQ+jSGzwATSzJCiVxRLa7BxQ Z65mfFAghqzEgUBYQ1cpCRMYpiDCG1DW/TdjA46xU9iFXMHEEDxGdR8VL3in0U96jl/03W 9upubenLXvHCnW+zmBo5izhSOcvNeaWI6rZZYSsMBXqZgADLlZFnplBa7ZNRUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673155; a=rsa-sha256; cv=none; b=tjSOhsZ9E/lcVRndJ3sG9tol+mj82LvEE7JsoYB3vgwvqHyhBMpjvd4L9s6HB5ceOt3CsQ IrehEuJwKL1w4HkuftvYx/nEcZcIFgmLZwlO8UNthY2DNX01GEBkhRfacDzxMzssWDotq+ eh5j/QyJ/wcLoHtOMMCZ32RsJB6zAhyyvO8dzBwCJqPbXRc3Ef2wf9oKDLpQPd7eguZ/V9 dUxXUkPkym6GZypRtTXL8cxkoavqr6YFAkwlMslmElNnXRiX3L0pjRRXcs7o26HKuCh+e2 yJTFVxQuevrbXPje/ETIchHRZbcf4PRGGQsQxvMLIjIrjTiZeeaGNSpUyWuBwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HPG6yX5z139M; Wed, 20 Aug 2025 06:59:14 +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 57K6xEYD023674; Wed, 20 Aug 2025 06:59:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xE4E023671; Wed, 20 Aug 2025 06:59:14 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:14 GMT Message-Id: <202508200659.57K6xE4E023671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d88135570023 - stable/14 - libc: Fix a typo in a source code comment 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d88135570023b2699744db78f8e76f298a00b1b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d88135570023b2699744db78f8e76f298a00b1b4 commit d88135570023b2699744db78f8e76f298a00b1b4 Author: Gordon Bergling AuthorDate: 2025-08-17 07:24:59 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:56:45 +0000 libc: Fix a typo in a source code comment - s/aguments/arguments/ (cherry picked from commit 333b0490e3132bf8f1a0d974d8b2597caf765970) --- lib/libc/i386/gen/makecontext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/i386/gen/makecontext.c b/lib/libc/i386/gen/makecontext.c index 7b4845ac6bee..9fedd8b99c47 100644 --- a/lib/libc/i386/gen/makecontext.c +++ b/lib/libc/i386/gen/makecontext.c @@ -124,7 +124,7 @@ __makecontext(ucontext_t *ucp, void (*start)(void), int argc, ...) /* * Setup the top of the stack with the user start routine - * followed by all of its aguments and the pointer to the + * followed by all of its arguments and the pointer to the * ucontext. We need to leave a spare spot at the top of * the stack because setcontext will move eip to the top * of the stack before returning. From nobody Wed Aug 20 06:59:16 2025 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 4c6HPJ2QcRz64V86; Wed, 20 Aug 2025 06:59:16 +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 4c6HPJ1DVfz3TH3; Wed, 20 Aug 2025 06:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673156; 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=z8QEIlXtSryFs9XEmAsML++y0N2t4WX9U9x2+SoKu6A=; b=twO1autWzfuQvyY3aCSCO5CLS6Hh2mXqo/RAvWjRZeury98YiMMfBKAKs1+gUdVAyObOAT 87lXEJGCMlAZhmhBhUfMukEjgKLETwOtXD5sNLqbOZk2z1WRRY3/x+T1cyHw5gKsZv/kha xdAXudyRJw4Sw2B5s+t9TSNOdCUslq4i8aKa/B956YNuz/0Rqcx4mMGhNkjwGZIktJ9OLM Rzh4umJ3z5E+gMBNioouIsfj50mix+Q7d/bUP4dApK0Q1dN/dIUUur0CZIvq2AuQ/XNJSi eZ1mFe5qdRlps8rQDY759twx1ZKNPLKU1uZ1K2jSoy5lIvcEp1Txm5SBKnw8bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673156; 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=z8QEIlXtSryFs9XEmAsML++y0N2t4WX9U9x2+SoKu6A=; b=labyl2o4245xucxSsEEnU4zTLy8VGxPjo9Bnw4erYs1YdfQtxqOMAAxihdeOrXGpDplgM5 H2Z4p6WfAeeRh56vgj1+LQDEU5j6I5WmHc7KVm3ZP1Laa9QtR56E+z5U1XPLt5rfD3R7IH D9sw2sdO0bf4wy9kuoRZmydfaO5uUWYvPumRIlqz3qJ7nzExafdS3sZrG2C87NC+wmmhKL DyrJUHdsxhtk5yGRnqyJJGwY0IP9ruPUiLd2oPYzqZDi6zyWrVBg+RXeZWpa3sJQKRDNZX /9wg1MNyslpe6DMH3SJUyQv8memkxC+mmBovQALVZnVWBAg1VsO0eV2FaVzdYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673156; a=rsa-sha256; cv=none; b=fNwtCb/0QawIXbgmKYwvgRwHa4g57bSD+dSbm4vRjHDx/VOQ151w4fbNPIjXTc1L/JrQ8b z7P888MPYoo4d3Zr4yCS58U0YUoapXezD3uEhPjf2+Xb/tgB2sAbc/5cBWSd22vkhR2H73 x0djTqtHcV+fbAnEORlrjgLE/z9JR71naH231MP4hb7oY2tC9ZrFLsK2wfW9I3hi41Z5rN qsEFMOmnGP9QR7hui2sN80i8XHep7G5trJGxC/ZplX/rCEj2kN7pqW/rIt8KIIE86idJsM I9ypbyHSB61yQ5B/VEdGcpqHJKqcNkuHN3z8cwrfxe4FmIJw5e82djl2AC2RrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HPJ0nz2z12tS; Wed, 20 Aug 2025 06:59:16 +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 57K6xGIr023706; Wed, 20 Aug 2025 06:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xGZn023703; Wed, 20 Aug 2025 06:59:16 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:16 GMT Message-Id: <202508200659.57K6xGZn023703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f5a611989fa4 - stable/14 - g_part: Fix a few typos in source code comments 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f5a611989fa442706665d87afcc0607fe7d2cc6e Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f5a611989fa442706665d87afcc0607fe7d2cc6e commit f5a611989fa442706665d87afcc0607fe7d2cc6e Author: Gordon Bergling AuthorDate: 2025-08-17 09:30:16 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:57:03 +0000 g_part: Fix a few typos in source code comments - s/partitition/partition/ (cherry picked from commit 7ce07c41423d143cd3f7b8f7e61c2f3e8b6336c2) --- sys/geom/part/g_part.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index c0baf5cc8992..13752bbe8afe 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -1046,7 +1046,7 @@ g_part_ctl_create(struct gctl_req *req, struct g_part_parms *gpp) /* * Synthesize a disk geometry. Some partitioning schemes * depend on it and since some file systems need it even - * when the partitition scheme doesn't, we do it here in + * when the partition scheme doesn't, we do it here in * scheme-independent code. */ g_part_geometry(table, cp, pp->mediasize / pp->sectorsize); @@ -1539,7 +1539,7 @@ g_part_ctl_undo(struct gctl_req *req, struct g_part_parms *gpp) /* * Synthesize a disk geometry. Some partitioning schemes * depend on it and since some file systems need it even - * when the partitition scheme doesn't, we do it here in + * when the partition scheme doesn't, we do it here in * scheme-independent code. */ pp = cp->provider; @@ -2023,7 +2023,7 @@ g_part_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) /* * Synthesize a disk geometry. Some partitioning schemes * depend on it and since some file systems need it even - * when the partitition scheme doesn't, we do it here in + * when the partition scheme doesn't, we do it here in * scheme-independent code. */ g_part_geometry(table, cp, pp->mediasize / pp->sectorsize); From nobody Wed Aug 20 06:59:17 2025 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 4c6HPK48gyz64VDS; Wed, 20 Aug 2025 06:59:17 +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 4c6HPK257lz3TCc; Wed, 20 Aug 2025 06:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673157; 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=RjCIjNzSARr8nuIuveYhzd40009Y5PngHTZHBhgku7w=; b=B5NnX3cksaj4eZajhfO2a+1yJq93IwmQxOHwYsDJfLZz94Iu57ZUN3hEx4rya2T2upTzRf LmtxuKMiLyT2R3AUG9Ws3ptYLSHFMoML6p5yPR2WxqjQhuYtCogfH6Kenj+xyUyiVJo0tJ ZGR4IYqAZTCiA3fQet4imfzjEIWgTPWjbEWfxp0V66kmXjxLsrmzwOplJhB8kuhxZhuldq Owg91Xk9JnjbvyhMtulDbZVV10iZZhH5cpChnwM7NU+GlOjX2uzb7Hoh5NvXROllSCUbEs AyLOP1O57yDE1cYaURVRzUib60tJNissSldcoRAthKkpfQ+pz5rtjGleRrgcNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673157; 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=RjCIjNzSARr8nuIuveYhzd40009Y5PngHTZHBhgku7w=; b=HnQCVqi6fHVLQ5dDgYDnXTY9L9RnveeZ++1L/Bpn7YWTAMfPicrZ9xDlTqLOhxCA2YM8yK 0lOHjLY/34rGSvSxo178CU3pDO/terzZBrZIa/tk40Cl7ch+oq0+DCR8nQ2rbmIZvN5SoG bf6tgzxsOO396nrLtH12qAsgLAepTCjSaNrX+dmLPRbye680E/cvq/kCXe/nJgQ+vOGfth lZ2/+D/QyCEE1Pf/9Z16E0NcSdnIvJtf/oqdkHpfkVKNp8zBp8qY96I/VFPiwIxVPWm6RJ E0UPgxitnsRZ08qPxjNV6AKf5aVnf4r94Rm4IBupQbSkVTAt1F0+7HEXGqzjRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673157; a=rsa-sha256; cv=none; b=nVNoUrgpBp3mxO7kzChGoWlqh88BYUE8QUhHnBsjKOtPne8jqJbjZc4UFxNKh//Q8Vntco yI9hx9AkevX77bt6VcB2Ait3m0V0G+HzfZ13BrMHo4k7AcPrR7WFq8lXKfmpX77bLZxp63 aGv49YrpPxKqcrozZONEE8cpWPvyLT3OEdWRp46xIh+M63AfXKywBiXO9bn129Qvt/vOxO z5zLquxJi7d9RCAlNiG6Vw6/hUlnxR/wTe+huWYM5KxomJNAzzMNdv515gQnUOVmV0/Czw Hed4Mmjzgr00dixROYKZ7cqTJ+ycmlTwj2NlwTw4SAdccJOHa3dt7cEG/RDOJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HPK1ShXz12WH; Wed, 20 Aug 2025 06:59:17 +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 57K6xHKq023738; Wed, 20 Aug 2025 06:59:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xHMN023735; Wed, 20 Aug 2025 06:59:17 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:17 GMT Message-Id: <202508200659.57K6xHMN023735@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 3807e87f4eec - stable/14 - udp: Fix a typo in a source code comment 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3807e87f4eec6614d2e975f43a4f8308f3a4743a Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3807e87f4eec6614d2e975f43a4f8308f3a4743a commit 3807e87f4eec6614d2e975f43a4f8308f3a4743a Author: Gordon Bergling AuthorDate: 2025-08-17 09:26:44 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:57:17 +0000 udp: Fix a typo in a source code comment - s/datgram/datagram/ (cherry picked from commit a3a78bd7a7446a9a437391c681ba196d956987da) --- sys/netinet/udp_usrreq.c | 2 +- sys/netinet6/udp6_usrreq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index adf8f0afc125..653c42a84214 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -450,7 +450,7 @@ udp_multi_input(struct mbuf *m, int proto, struct sockaddr_in *udp_in) /* * No matching pcb found; discard datagram. (No need * to send an ICMP Port Unreachable for a broadcast - * or multicast datgram.) + * or multicast datagram.) */ UDPSTAT_INC(udps_noport); if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 4a82315ea2f0..066cf79c3a07 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -333,7 +333,7 @@ udp6_multi_input(struct mbuf *m, int off, int proto, /* * No matching pcb found; discard datagram. (No need * to send an ICMP Port Unreachable for a broadcast - * or multicast datgram.) + * or multicast datagram.) */ UDPSTAT_INC(udps_noport); UDPSTAT_INC(udps_noportmcast); From nobody Wed Aug 20 06:59:18 2025 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 4c6HPL4yyVz64VK8; Wed, 20 Aug 2025 06:59:18 +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 4c6HPL35Zgz3THl; Wed, 20 Aug 2025 06:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673158; 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=Vi6ssl3hcNxZlOUQBmLggxw4cSXdAKf3J6fx769Ashk=; b=JRgCXpXkRsjZOJMHL252ZLh9Dej/0yl6j5BSMl5P9pByCHRKhn55Tb9hI9F4Fw2R8ZwrXS XUuyBO+bRSgJLlJLEiWP/6TI3jSmUsn9aOlBAiYWKdrxheIR+VhPDV2P1/Aoexid8b59YA MLqxMNmSkgkG6ZKtcaZ3q6YquODjk25AnJ9MZAR6Q13bqnT3ODGLXtxjnSUmcOg6hen9Lo Co0EAbvx2TJ4V8ccbQivBbE8bnFPg1on/SU2zspFvFFXjEUxJKEKCFzf6QSG9UWeCf4lvL MTiMw82pxsU3we7wJBZlYWVNBZ7GV7QNqGAIinsS+auc7DHRZr5jHoakorjn0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673158; 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=Vi6ssl3hcNxZlOUQBmLggxw4cSXdAKf3J6fx769Ashk=; b=u8ItDUvFkFIVACxTDkHmbfhltdJbqCxO4E9SBdzPZx5PovV/550/n27Gkzlja2tQnJ8H2A rhmHd6KoURrAHt0LFpFXl7TVLaeubOBtwwJuzQUiUe/VbWOWiIbDmlUf/RbrctiguaDuGm nrFKaJwci0ZEBTiWhAqxkdn7iqDyQNxie2znRgCaEJKEyPeUXWCmW/Zboaf87E2Y45n5Hg uMT3oaBYZEbExHHo2pSxR93f8Hnp16tRuEGSaKmcT+qyaXzvx+eHAHBbzT7BH0AX/BU88Z zidPjF4XaUu+hcWKlaorlFInWO47nWs2Ea1v/eMeybtT7/NTrimDv5mbk4vPzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673158; a=rsa-sha256; cv=none; b=ovWNkM83w3lFVeMoT9TYTRq2ltEx6FOG9CkGyraH6SkRwA5fG8AplF8lNJGNj3m5CCM5YE f5S4Flvd49VR1F/hovqqRSif0z59IPPTYsoH42gLkicGcbimOyjxYfutBGK8aNlPL4vFW0 Hx/7URJAIRW3EGcFVbOo+JlaoHGp33aJciAdJhWXMRSEuzSD8WqeyoR9Xr4X6dT4rrzBFP fZUYEBs+X0D6HS7t4/Wvwdfkp9TR12DsUkI6crJyJlFXFwJUpZ0Fw0GWcfdBt1NnKD8rra xz99kK5qMhw/pWGn+vH6E9iSb4m2pBgq0uLOsGLvEGfpD5HjnMN0KxRBA5kN5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HPL2Scbz134T; Wed, 20 Aug 2025 06:59:18 +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 57K6xIMW023772; Wed, 20 Aug 2025 06:59:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xIEV023769; Wed, 20 Aug 2025 06:59:18 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:18 GMT Message-Id: <202508200659.57K6xIEV023769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 15f637f65c22 - stable/14 - ice(4): Fix a few typos in source code comments 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 15f637f65c22cc608d18f6155ffd2f6b2171b46a Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=15f637f65c22cc608d18f6155ffd2f6b2171b46a commit 15f637f65c22cc608d18f6155ffd2f6b2171b46a Author: Gordon Bergling AuthorDate: 2025-08-17 08:32:24 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:57:33 +0000 ice(4): Fix a few typos in source code comments - s/wit/with/ - s/Recceive/Receive/ - s/convenction/convention/ - s/metaddata/metadata/ Obtained from: OpenBSD (cherry picked from commit 9113e9d687058877009c8f3a871fbe845db6a592) --- sys/dev/ice/ice_bitops.h | 4 ++-- sys/dev/ice/ice_lan_tx_rx.h | 2 +- sys/dev/ice/ice_lib.h | 2 +- sys/dev/ice/ice_protocol_type.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/ice/ice_bitops.h b/sys/dev/ice/ice_bitops.h index c480900596f4..a623f810c101 100644 --- a/sys/dev/ice/ice_bitops.h +++ b/sys/dev/ice/ice_bitops.h @@ -198,7 +198,7 @@ static inline void ice_zero_bitmap(ice_bitmap_t *bmp, u16 size) * ice_and_bitmap - bitwise AND 2 bitmaps and store result in dst bitmap * @dst: Destination bitmap that receive the result of the operation * @bmp1: The first bitmap to intersect - * @bmp2: The second bitmap to intersect wit the first + * @bmp2: The second bitmap to intersect with the first * @size: Size of the bitmaps in bits * * This function performs a bitwise AND on two "source" bitmaps of the same size @@ -237,7 +237,7 @@ ice_and_bitmap(ice_bitmap_t *dst, const ice_bitmap_t *bmp1, * ice_or_bitmap - bitwise OR 2 bitmaps and store result in dst bitmap * @dst: Destination bitmap that receive the result of the operation * @bmp1: The first bitmap to intersect - * @bmp2: The second bitmap to intersect wit the first + * @bmp2: The second bitmap to intersect with the first * @size: Size of the bitmaps in bits * * This function performs a bitwise OR on two "source" bitmaps of the same size diff --git a/sys/dev/ice/ice_lan_tx_rx.h b/sys/dev/ice/ice_lan_tx_rx.h index 693e0ca5efc6..eedacdab0216 100644 --- a/sys/dev/ice/ice_lan_tx_rx.h +++ b/sys/dev/ice/ice_lan_tx_rx.h @@ -630,7 +630,7 @@ enum ice_rxdid { ICE_RXDID_LAST = 63, }; -/* Recceive Flex descriptor Dword Index */ +/* Receive Flex descriptor Dword Index */ enum ice_flex_word { ICE_RX_FLEX_DWORD_0 = 0, ICE_RX_FLEX_DWORD_1, diff --git a/sys/dev/ice/ice_lib.h b/sys/dev/ice/ice_lib.h index b6b23ec82161..28c4f668292c 100644 --- a/sys/dev/ice/ice_lib.h +++ b/sys/dev/ice/ice_lib.h @@ -313,7 +313,7 @@ enum ice_dyn_idx_t { ICE_ITR_NONE = 3 /* ITR_NONE must not be used as an index */ }; -/* By convenction ITR0 is used for RX, and ITR1 is used for TX */ +/* By convention ITR0 is used for RX, and ITR1 is used for TX */ #define ICE_RX_ITR ICE_IDX_ITR0 #define ICE_TX_ITR ICE_IDX_ITR1 diff --git a/sys/dev/ice/ice_protocol_type.h b/sys/dev/ice/ice_protocol_type.h index 300d61bfb5d9..b90c25e6c427 100644 --- a/sys/dev/ice/ice_protocol_type.h +++ b/sys/dev/ice/ice_protocol_type.h @@ -143,7 +143,7 @@ enum ice_prot_id { ICE_PROT_LLDP_OF = 117, ICE_PROT_ARP_OF = 118, ICE_PROT_EAPOL_OF = 120, - ICE_PROT_META_ID = 255, /* when offset == metaddata */ + ICE_PROT_META_ID = 255, /* when offset == metadata */ ICE_PROT_INVALID = 255 /* when offset == ICE_FV_OFFSET_INVAL */ }; From nobody Wed Aug 20 06:59:19 2025 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 4c6HPN0fWGz64VBQ; Wed, 20 Aug 2025 06:59:20 +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 4c6HPM4DrCz3T6d; Wed, 20 Aug 2025 06:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673159; 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=fkp3TcYQN1tSVVS82Y1oF3AzejUoSNtdgt6t3x6E7iU=; b=jeLocTDDi3QzDB3xQFX2zEVYZHB7ZeUvGJtm6+HLFoQ/UXSwrnggWrO7XByj0bRmzR4XS5 BHsD5gare1TZ8v4qDX5l9v0OLcqVPfzl4abGFkm0PIZa+VTn0/Nu8f+o8RmgVA7JOe8qgM 75oq4tZckhCa32bpZntzoKQQftXX4MoAhuhBciKMBlzTOX9rSf8d4RE3pPitdCTzaxrp0y FqD2giyjRF/cEFjT9GsgmKXX3JzOe1FqZ8NVR8I8rcbp3YF7Hez0CWu5+STmwLp+CYV4XF +e7Bi+VHuzteV/z/F10rj0qt5lCa0FyGFIGWb+7MTF3gC7MenEx0l7azEhF1dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673159; 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=fkp3TcYQN1tSVVS82Y1oF3AzejUoSNtdgt6t3x6E7iU=; b=GmTtMqNvl6zuw9om/47X/3w1+MAqROj/huEEkrJi2Y+HvPO+kxHCiU3Au+GZCmeeX3TK7N swDDqv9AVsxPXM8bdXPgV1bTGa1VowT25u6l8LQZQvG57KTsebC022LxKIOd9+kTTyW98c chveKDzNObTxx8GsHvA4Z8MuC7kBBFO5A580tCt3q3Qk9E+D2vdbamAHTdaiFnpc9ofvYw 3IuxkVwLRZT9Cfp6nAwMRB8t5dWJTKRdxGtZNQ0HiUeb9bWzTStBaDyKYI/WecdWE/OHSq ZFpEJ/UUs2irKv7hpsF5qN4VRDazY9ydsSr8YxC1OBTBzmdgu47LES1xJPlxoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673159; a=rsa-sha256; cv=none; b=myG1e0fIX+RSEGDgByhttzwiujvWL9boa7UqQozOZ/refiAJORquMuAZwHeaKWcQ3Z7MoF GxCQ4RDTcImbT2cZecHd8a4ym+NexdCBEuOOmxtCoWfQke1XSYN0earPodhP8XbFHToYDS tUhmMYHpe5SU1anvWaM15OwPdD1/PDUQRianWfVqW05jajiGJn0Jr/qPiy8/6lcSV/xLFR hKurLbIiVBVzhdoEtGxLws5zVHb6C3Q9zambjhHVvsRkWIRBldubGU5vIWZZXeeAQVdLyY FrMVAOfpBn8AJkfwGVe+xv2/PArXxuig5GfMcypoU9h5AZABmMtg/OmFYOuBZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HPM3ltKz12Q7; Wed, 20 Aug 2025 06:59:19 +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 57K6xJL0023805; Wed, 20 Aug 2025 06:59:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xJZw023802; Wed, 20 Aug 2025 06:59:19 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:19 GMT Message-Id: <202508200659.57K6xJZw023802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f17d7105cbca - stable/14 - isa: Fix a typo in a source code comment 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f17d7105cbca4679aa9dcc92cdac7b5ffd2b569f Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f17d7105cbca4679aa9dcc92cdac7b5ffd2b569f commit f17d7105cbca4679aa9dcc92cdac7b5ffd2b569f Author: Gordon Bergling AuthorDate: 2025-08-17 09:28:20 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:57:48 +0000 isa: Fix a typo in a source code comment - s/Monochome/Monochrome/ (cherry picked from commit 4c7b81cfa29084bb0013969c175700069e6d7019) --- sys/isa/isareg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h index 8cbc0b171c4f..17a203bb7466 100644 --- a/sys/isa/isareg.h +++ b/sys/isa/isareg.h @@ -51,7 +51,7 @@ #define IO_RTC 0x070 /* RTC */ #define IO_ICU2 0x0A0 /* 8259A Interrupt Controller #2 */ -#define IO_MDA 0x3B0 /* Monochome Adapter */ +#define IO_MDA 0x3B0 /* Monochrome Adapter */ #define IO_VGA 0x3C0 /* E/VGA Ports */ #define IO_CGA 0x3D0 /* CGA Ports */ From nobody Wed Aug 20 06:59:47 2025 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 4c6HPw2V7wz64VJ1; Wed, 20 Aug 2025 06:59:48 +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 4c6HPw16PNz3VKm; Wed, 20 Aug 2025 06:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673188; 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=mJmg0QZauWRB/SrpshwgV6J9IS3zJ6rdWfhYR45tqV8=; b=WQHxW4x9g8qAZC+1pB9LoZHNviI5r7kppPq2EnOBD8ZliUujOdcM1GWjIebVEwfS4G4t5P PG04VFKMOh7SXA0P2O3jiqoKLRVRebs9yPmTF1pIsLHS1NsdZhgPDYfMjPBuNIoP6sSfro 2iyKLh2PAn/knApE4i7njqpN/gQX+FwA92ohGJsvV6VBfdh2YCoaEGo9/VUiG+r0aIH9qL APWs/RKo0dZJvb6wB11mp3xAmiNHFR17wP8gqiwDUwWa4QbHXmB3AvStiYgU7Xc8Gc5BPb +m4cpUt3U/25Kde0RE+K86iDUtAXWSZCUpkGl3Wjq1BrUMLp3szld8xC6fTpqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673188; 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=mJmg0QZauWRB/SrpshwgV6J9IS3zJ6rdWfhYR45tqV8=; b=cxqwmCwsWsvFhH5q8AJxJcZSSoKBV3rsg3kGntDkVy1ZcSkem4wlfCDtFA1p5XVw4MX3UY /z33Z1kVXc2SlIUpC8DjZ1E0ArHgSMygjRVmojDAW3plIq2H3ozf4/SCaQYh+K9R3mr6ni o3MhXqPw9j+GyyGOIhKJGlW3uWqwC6IRqOaGrizEH2L1uH5SMFltjDcAxoWNi8GFnzDBBN i4QQep2JfM4MbYrgf0ME1GzAus/Fd+o6yG9HVXSQFJ0Vg19pcJGz7r1x8g+ziD94FhZWik 2/6lKCgtOsCY1DVuMU7V4D4FgfvHpUZy1oBUklAibzdtmlrhLMaUkQ0VEnRrWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673188; a=rsa-sha256; cv=none; b=NVR8NYfctGjiFpQmrFuA/obr9/WbHYbyMjM0V7+a+2VNlusgqbKx2WFn2MMBDMkA9LhsZm I2fX7LvqElPhwF5uCG30HcXc4mY0yIwo3i0x38o80kNgL4amW1ZwoZrafHSuYeaj5vc3li sK2TCfwtZIq4N4VgM0ROg+/Vl4ZrHaD73aONt9feM4HKbiGCoxQw5qm5a5PN4ZWieKl+gs JkzM7YYJEd/dNML4rN6cDo50b0TVBKQkX9GKOZqehAcqCbCWu+hzmt4qJk/KKE1yH0qH3J GiCjuvmP7NkrF++Gl2MGIaEsWjw6CfJ6VD8Bcu+No/P6wNMXpHScLHpPmSW0Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HPw0P0Pz13Cq; Wed, 20 Aug 2025 06:59:48 +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 57K6xlqU024091; Wed, 20 Aug 2025 06:59:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xlOp024088; Wed, 20 Aug 2025 06:59:47 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:47 GMT Message-Id: <202508200659.57K6xlOp024088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 7f53cf7e1e89 - main - gpiobus: factorize common add_child code 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f53cf7e1e8902dec78f6831e69a89e424169acf Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=7f53cf7e1e8902dec78f6831e69a89e424169acf commit 7f53cf7e1e8902dec78f6831e69a89e424169acf Author: Ahmad Khalifa AuthorDate: 2025-08-20 06:03:25 +0000 Commit: Ahmad Khalifa CommitDate: 2025-08-20 06:03:25 +0000 gpiobus: factorize common add_child code Move common bus_add_child code to gpiobus_add_child_common. Reviewed by: andrew Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D51582 --- sys/dev/gpio/gpiobus.c | 16 +++++++++++++--- sys/dev/gpio/gpiobus_internal.h | 1 + sys/dev/gpio/ofw_gpiobus.c | 14 ++++---------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index c25c41f43042..2f448ea3a956 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -674,16 +674,19 @@ gpiobus_child_location(device_t bus, device_t child, struct sbuf *sb) return (0); } -static device_t -gpiobus_add_child(device_t dev, u_int order, const char *name, int unit) +device_t +gpiobus_add_child_common(device_t dev, u_int order, const char *name, int unit, + size_t ivars_size) { device_t child; struct gpiobus_ivar *devi; + KASSERT(ivars_size >= sizeof(struct gpiobus_ivar), + ("child ivars must include gpiobus_ivar as their first member")); child = device_add_child_ordered(dev, order, name, unit); if (child == NULL) return (child); - devi = malloc(sizeof(struct gpiobus_ivar), M_DEVBUF, M_NOWAIT | M_ZERO); + devi = malloc(ivars_size, M_DEVBUF, M_NOWAIT | M_ZERO); if (devi == NULL) { device_delete_child(dev, child); return (NULL); @@ -694,6 +697,13 @@ gpiobus_add_child(device_t dev, u_int order, const char *name, int unit) return (child); } +static device_t +gpiobus_add_child(device_t dev, u_int order, const char *name, int unit) +{ + return (gpiobus_add_child_common(dev, order, name, unit, + sizeof(struct gpiobus_ivar))); +} + static void gpiobus_child_deleted(device_t dev, device_t child) { diff --git a/sys/dev/gpio/gpiobus_internal.h b/sys/dev/gpio/gpiobus_internal.h index de3f57663132..82f1354d9e75 100644 --- a/sys/dev/gpio/gpiobus_internal.h +++ b/sys/dev/gpio/gpiobus_internal.h @@ -42,6 +42,7 @@ void gpiobus_free_ivars(struct gpiobus_ivar *); int gpiobus_read_ivar(device_t, device_t, int, uintptr_t *); int gpiobus_acquire_pin(device_t, uint32_t); void gpiobus_release_pin(device_t, uint32_t); +device_t gpiobus_add_child_common(device_t, u_int, const char *, int, size_t); extern driver_t gpiobus_driver; #endif diff --git a/sys/dev/gpio/ofw_gpiobus.c b/sys/dev/gpio/ofw_gpiobus.c index fc5fb03d6824..b12b78fac18c 100644 --- a/sys/dev/gpio/ofw_gpiobus.c +++ b/sys/dev/gpio/ofw_gpiobus.c @@ -451,28 +451,22 @@ ofw_gpiobus_add_child(device_t dev, u_int order, const char *name, int unit) device_t child; struct ofw_gpiobus_devinfo *devi; - child = device_add_child_ordered(dev, order, name, unit); + child = gpiobus_add_child_common(dev, order, name, unit, + sizeof(struct ofw_gpiobus_devinfo)); if (child == NULL) - return (child); - devi = malloc(sizeof(struct ofw_gpiobus_devinfo), M_DEVBUF, - M_NOWAIT | M_ZERO); - if (devi == NULL) { - device_delete_child(dev, child); - return (0); - } + return (NULL); /* * NULL all the OFW-related parts of the ivars for non-OFW * children. */ + devi = device_get_ivars(child); devi->opd_obdinfo.obd_node = -1; devi->opd_obdinfo.obd_name = NULL; devi->opd_obdinfo.obd_compat = NULL; devi->opd_obdinfo.obd_type = NULL; devi->opd_obdinfo.obd_model = NULL; - device_set_ivars(child, devi); - return (child); } From nobody Wed Aug 20 06:59:50 2025 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 4c6HPy45nhz64VJ4; Wed, 20 Aug 2025 06:59:50 +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 4c6HPy26vQz3VJK; Wed, 20 Aug 2025 06:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673190; 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=2fp0zgJOsk8Zc2eTCyga24DvufUZ9+93FUv1ThQVmO8=; b=B82dY2T51dW3aDzRkgteISahXAdHcTJkhD0tRGgEUBXbvQ6llM9UH8q6kCLEg4kPFbZcwE Xtrsy0BI6gC5dcleQT6VlJcN6mBG3m80NvBfPkSr48AThQX+4G+EntX9FnjklnBhPY4f3O zAIy9uC3oq8QWlS07vXBSEERRMFmhxQ7mAuVjqVZtYmHTuZAxiwR/tOUqwv0wGHohk8xdV Rh6ncLujyRddYNW74orytGIWuCFGMN94P+LZaV/o28V6LwJh69xTAwrMVqzWxdqqWbirnn Z/j5DpDxTM94IM8GfCTt1W8kDnovvoluZm/sco8c1UKeIgI/zQMzPS33gL4D8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673190; 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=2fp0zgJOsk8Zc2eTCyga24DvufUZ9+93FUv1ThQVmO8=; b=UT7T2Sn2YwGHM1/myUM4OSxHFocdyHN4Job7O9EOGOlUfgo0u2+qp31l7djNy/BcrM+kzt j6MUtNZgkRTkW/wML9F2GosZu21wH/kw3/RRNtsPxbtxDBQ4sG16iJdeeslyCtk1n6fEyJ We51TiNn5BDtoyFC2pTVt8Uc2gl52lZ6e7kDGifM8fF0NHZeMej4hZlcxC8+zBVR9jRX81 6PEWfi8dPeT9LPDlE2yF6F0ZzeKeDfyeqvCPy9c9H5yFmh/UTALJ45/GiLO7VPtNbIKHfa VTWj5mEDNPufLMc52DhnOle8Pkt3iQdghxZ+JGfjc0AHHSXzSoWk/02jMezNtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673190; a=rsa-sha256; cv=none; b=ZjwZu6iD/He4JjKLlQGeAdrKDHLf1DwNnFet2Am/d310WEF0YkoqQ+u+HaHQKeSeBFaHEn /iEpzMJXWf+7CqmlKHeqdhP3pdBPPAacE3l+rkk99NGtX/21b9Wnn+JKuMYPUNGamsKwyA KTlN0XE6RklH6VWsjdO6Zq31jd0ceZrsLYG/09Q0WdtiCB8t7g57UKvduddH935gPPiHYR ozo+LnSWYGvXtpE+WJshYfBNqX7oM40InFERCHT0xsMWuHmXie4sJ1paCd8IEvjvxrRVrg 1u2iPz6mnJb6BhFvdtAW2H8JkZ+/kYnQJT7E/TVGmFU4kNb/MyUCrz5wAEO6LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HPy1bdfz12M6; Wed, 20 Aug 2025 06:59:50 +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 57K6xojE024166; Wed, 20 Aug 2025 06:59:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xoAr024163; Wed, 20 Aug 2025 06:59:50 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:50 GMT Message-Id: <202508200659.57K6xoAr024163@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 0269dc575e83 - main - acpi_gpiobus: implement bus_child_location 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0269dc575e8321b0f0166ba1797a4a3cdc9ece7d Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=0269dc575e8321b0f0166ba1797a4a3cdc9ece7d commit 0269dc575e8321b0f0166ba1797a4a3cdc9ece7d Author: Ahmad Khalifa AuthorDate: 2025-08-20 06:10:02 +0000 Commit: Ahmad Khalifa CommitDate: 2025-08-20 06:52:11 +0000 acpi_gpiobus: implement bus_child_location Reviewed by: imp, andrew Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D51586 --- sys/dev/gpio/acpi_gpiobus.c | 17 +++++++++++++++++ sys/dev/gpio/gpiobus.c | 3 +-- sys/dev/gpio/gpiobus_internal.h | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c index a9a2238695f7..0d2455cab399 100644 --- a/sys/dev/gpio/acpi_gpiobus.c +++ b/sys/dev/gpio/acpi_gpiobus.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "gpiobus_if.h" @@ -411,6 +412,21 @@ acpi_gpiobus_add_child(device_t dev, u_int order, const char *name, int unit) sizeof(struct acpi_gpiobus_ivar))); } +static int +acpi_gpiobus_child_location(device_t bus, device_t child, struct sbuf *sb) +{ + struct acpi_gpiobus_ivar *devi; + int err; + + err = gpiobus_child_location(bus, child, sb); + if (err != 0) + return (err); + + devi = device_get_ivars(child); + sbuf_printf(sb, " handle=%s", acpi_name(devi->handle)); + return (0); +} + static device_method_t acpi_gpiobus_methods[] = { /* Device interface */ DEVMETHOD(device_probe, acpi_gpiobus_probe), @@ -420,6 +436,7 @@ static device_method_t acpi_gpiobus_methods[] = { /* Bus interface */ DEVMETHOD(bus_read_ivar, acpi_gpiobus_read_ivar), DEVMETHOD(bus_add_child, acpi_gpiobus_add_child), + DEVMETHOD(bus_child_location, acpi_gpiobus_child_location), DEVMETHOD_END }; diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index 2f448ea3a956..5f1f6532a79b 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -57,7 +57,6 @@ static int gpiobus_suspend(device_t); static int gpiobus_resume(device_t); static void gpiobus_probe_nomatch(device_t, device_t); static int gpiobus_print_child(device_t, device_t); -static int gpiobus_child_location(device_t, device_t, struct sbuf *); static device_t gpiobus_add_child(device_t, u_int, const char *, int); static void gpiobus_hinted_child(device_t, const char *, int); @@ -662,7 +661,7 @@ gpiobus_print_child(device_t dev, device_t child) return (retval); } -static int +int gpiobus_child_location(device_t bus, device_t child, struct sbuf *sb) { struct gpiobus_ivar *devi; diff --git a/sys/dev/gpio/gpiobus_internal.h b/sys/dev/gpio/gpiobus_internal.h index 82f1354d9e75..c198e5f79989 100644 --- a/sys/dev/gpio/gpiobus_internal.h +++ b/sys/dev/gpio/gpiobus_internal.h @@ -42,6 +42,7 @@ void gpiobus_free_ivars(struct gpiobus_ivar *); int gpiobus_read_ivar(device_t, device_t, int, uintptr_t *); int gpiobus_acquire_pin(device_t, uint32_t); void gpiobus_release_pin(device_t, uint32_t); +int gpiobus_child_location(device_t, device_t, struct sbuf *); device_t gpiobus_add_child_common(device_t, u_int, const char *, int, size_t); extern driver_t gpiobus_driver; From nobody Wed Aug 20 06:59:49 2025 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 4c6HPy1zcdz64VR2; Wed, 20 Aug 2025 06:59:50 +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 4c6HPx1V8fz3VFm; Wed, 20 Aug 2025 06:59:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673189; 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=p+//7QT3cVKd9Y8vbhuQtPzSvT1J6QxuVfomxROT6z8=; b=yxuwvb0DUubNpRR2YXSWaE/nOzd87RBAKKah0rcoBR9p7L5KhLSnbOWkaMxhp+/n+IOWhl mbl+MgVkeQVjvgWrCi4qR6IflqLYJ0k40cQhai4AQfJuboKwwHoDZuwAkX1xZCtaCg/uXD bXIl9m/hsZTwFLboMIIsIzyFJ5oOkmMHWVWn077G4RGXhSryl2nsTTU8BiwjI5FJQqiCPy 4Yh5X8wIXQfS0U9P8qNnn7rxPQwO4JJK+gwFZs3aSGxsYCMIMmNiQRUf4b+eutZM3Mj+4q ulGMBR4FFOmQsGY9UmUXkoL8SxrFIoOrrfocfuFr6b+LAJaCTxJd/VUTTZgMww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673189; 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=p+//7QT3cVKd9Y8vbhuQtPzSvT1J6QxuVfomxROT6z8=; b=kTXGbVAwINY0QdurnUs9LvUuyunmOoaQiS/PQnp2DphYQ7fSZfTBG2CxN35hTGepTQyKZj gUDeiy+4KPJHyACo9/TffatAb4pDqtV4/D+GC/7EhCJJjAVqBPlZJ3yN1csZ13+yxd0d6A CL1SbvoeTRd/DRyhc6Z3BGM/91EkqJVEjpqGmvod8c1MstEOzdMMCDUjw4ptRiDmiMrGTL Ylz7TzZBBas+FzkIKZN4TKU8Kh50UlpoVhOIljXhmnHTqDz/j8Ym80nWXM31hzQ8tipspU OcDVmH9I/47AENJiTZRkdjAk/W3yZlqaeKVvTjIF68tL64X9m0GdLVnx4rZ/RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673189; a=rsa-sha256; cv=none; b=Qdb+yVSNGfO/uqVK8DyTvZuxg3a9u8bD48ZjO9MqkDJqV57E2kMhh4qmVYH4n3PdxYw+cP LNH64/Os/5+ke2VYGfG3JK0miIbfk7W27tBRI/oqO7upyen+a44Va4teV+mXIDACNXUezY N6MRLKwoSnCJF9vsBlN0nghVvsKwoWKBzK/POtu9cs4Mdqov2Jchesv1oG5rQeCjcTYUhA bRF85rdb66GZPqBquxBZeLRPn2B9OqdVDDT05KVkKpiPIGH4X+LlDDuShSgWFVn6F9G58t MHIWUGgqD36HRRt9cM+Xo/VNqJxCLY1+itXeyGg76NNomEb+qgfJgZ5Vhpgokg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HPx11MWz12tT; Wed, 20 Aug 2025 06:59:49 +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 57K6xnA0024130; Wed, 20 Aug 2025 06:59:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xnEG024127; Wed, 20 Aug 2025 06:59:49 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:49 GMT Message-Id: <202508200659.57K6xnEG024127@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: ed60e694f4a9 - main - gpio: rework gpioaei 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed60e694f4a975eaf269ae3784aa6b4fd4aa582d Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=ed60e694f4a975eaf269ae3784aa6b4fd4aa582d commit ed60e694f4a975eaf269ae3784aa6b4fd4aa582d Author: Ahmad Khalifa AuthorDate: 2025-08-20 06:04:12 +0000 Commit: Ahmad Khalifa CommitDate: 2025-08-20 06:52:11 +0000 gpio: rework gpioaei Rework gpioaei to make it support more than one pin per GPIO resource. Also allow one instance of gpioaei to handle multiple resources. Reviewed by: imp, jhb Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D51584 --- sys/dev/gpio/acpi_gpiobus.c | 148 ++++++++++++++++-------------- sys/dev/gpio/acpi_gpiobusvar.h | 6 +- sys/dev/gpio/gpioaei.c | 204 ++++++++++++++++++++++++++++++----------- 3 files changed, 235 insertions(+), 123 deletions(-) diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c index 170f23615416..a9a2238695f7 100644 --- a/sys/dev/gpio/acpi_gpiobus.c +++ b/sys/dev/gpio/acpi_gpiobus.c @@ -52,12 +52,11 @@ struct acpi_gpiobus_ctx { struct acpi_gpiobus_ivar { - struct gpiobus_ivar gpiobus; /* Must come first */ - ACPI_HANDLE dev_handle; /* ACPI handle for bus */ - uint32_t flags; + struct gpiobus_ivar gpiobus; + ACPI_HANDLE handle; }; -static uint32_t +uint32_t acpi_gpiobus_convflags(ACPI_RESOURCE_GPIO *gpio_res) { uint32_t flags = 0; @@ -150,70 +149,24 @@ acpi_gpiobus_enumerate_res(ACPI_RESOURCE *res, void *context) return (AE_OK); } -static struct acpi_gpiobus_ivar * -acpi_gpiobus_setup_devinfo(device_t bus, device_t child, - ACPI_RESOURCE_GPIO *gpio_res) -{ - struct acpi_gpiobus_ivar *devi; - - devi = malloc(sizeof(*devi), M_DEVBUF, M_NOWAIT | M_ZERO); - if (devi == NULL) - return (NULL); - resource_list_init(&devi->gpiobus.rl); - - devi->flags = acpi_gpiobus_convflags(gpio_res); - if (acpi_quirks & ACPI_Q_AEI_NOPULL) - devi->flags &= ~GPIO_PIN_PULLUP; - - devi->gpiobus.npins = 1; - if (gpiobus_alloc_ivars(&devi->gpiobus) != 0) { - free(devi, M_DEVBUF); - return (NULL); - } - - for (int i = 0; i < devi->gpiobus.npins; i++) - devi->gpiobus.pins[i] = gpio_res->PinTable[i]; - - return (devi); -} - static ACPI_STATUS acpi_gpiobus_enumerate_aei(ACPI_RESOURCE *res, void *context) { ACPI_RESOURCE_GPIO *gpio_res = &res->Data.Gpio; - struct acpi_gpiobus_ctx *ctx = context; - device_t bus = ctx->sc->sc_busdev; - device_t child; - struct acpi_gpiobus_ivar *devi; + uint32_t *npins = context, *pins = npins + 1; - /* Check that we have a GpioInt object. */ + /* + * Check that we have a GpioInt object. + * Note that according to the spec this + * should always be the case. + */ if (res->Type != ACPI_RESOURCE_TYPE_GPIO) return (AE_OK); if (gpio_res->ConnectionType != ACPI_RESOURCE_GPIO_TYPE_INT) return (AE_OK); - /* Add a child. */ - child = device_add_child_ordered(bus, 0, "gpio_aei", DEVICE_UNIT_ANY); - if (child == NULL) - return (AE_OK); - devi = acpi_gpiobus_setup_devinfo(bus, child, gpio_res); - if (devi == NULL) { - device_delete_child(bus, child); - return (AE_OK); - } - device_set_ivars(child, devi); - - for (int i = 0; i < devi->gpiobus.npins; i++) { - if (GPIOBUS_PIN_SETFLAGS(bus, child, 0, devi->flags & - ~GPIO_INTR_MASK)) { - device_delete_child(bus, child); - return (AE_OK); - } - } - - /* Pass ACPI information to children. */ - devi->dev_handle = ctx->dev_handle; - + for (int i = 0; i < gpio_res->PinTableLength; i++) + pins[(*npins)++] = gpio_res->PinTable[i]; return (AE_OK); } @@ -296,6 +249,63 @@ err: return (AE_BAD_PARAMETER); } +static void +acpi_gpiobus_attach_aei(struct acpi_gpiobus_softc *sc, ACPI_HANDLE handle) +{ + struct acpi_gpiobus_ivar *devi; + ACPI_HANDLE aei_handle; + device_t child; + uint32_t *pins; + ACPI_STATUS status; + int err; + + status = AcpiGetHandle(handle, "_AEI", &aei_handle); + if (ACPI_FAILURE(status)) + return; + + /* pins[0] specifies the length of the array. */ + pins = mallocarray(sc->super_sc.sc_npins + 1, + sizeof(uint32_t), M_DEVBUF, M_WAITOK); + pins[0] = 0; + + status = AcpiWalkResources(handle, "_AEI", + acpi_gpiobus_enumerate_aei, pins); + if (ACPI_FAILURE(status)) { + device_printf(sc->super_sc.sc_busdev, + "Failed to enumerate AEI resources\n"); + free(pins, M_DEVBUF); + return; + } + + child = BUS_ADD_CHILD(sc->super_sc.sc_busdev, 0, "gpio_aei", + DEVICE_UNIT_ANY); + if (child == NULL) { + device_printf(sc->super_sc.sc_busdev, + "Failed to add gpio_aei child\n"); + free(pins, M_DEVBUF); + return; + } + + devi = device_get_ivars(child); + devi->gpiobus.npins = pins[0]; + devi->handle = aei_handle; + + err = gpiobus_alloc_ivars(&devi->gpiobus); + if (err != 0) { + device_printf(sc->super_sc.sc_busdev, + "Failed to allocate gpio_aei ivars\n"); + device_delete_child(sc->super_sc.sc_busdev, child); + free(pins, M_DEVBUF); + return; + } + + for (int i = 0; i < pins[0]; i++) + devi->gpiobus.pins[i] = pins[i + 1]; + free(pins, M_DEVBUF); + + bus_attach_children(sc->super_sc.sc_busdev); +} + static int acpi_gpiobus_probe(device_t dev) { @@ -353,13 +363,8 @@ acpi_gpiobus_attach(device_t dev) if (ACPI_FAILURE(status)) device_printf(dev, "Failed to enumerate GPIO resources\n"); - /* Look for AEI children */ - status = AcpiWalkResources(handle, "_AEI", acpi_gpiobus_enumerate_aei, - &ctx); - - if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) - device_printf(dev, "Failed to enumerate AEI resources\n"); - + /* Look for AEI child */ + acpi_gpiobus_attach_aei(sc, handle); return (0); } @@ -390,10 +395,7 @@ acpi_gpiobus_read_ivar(device_t dev, device_t child, int which, switch (which) { case ACPI_GPIOBUS_IVAR_HANDLE: - *result = (uintptr_t)devi->dev_handle; - break; - case ACPI_GPIOBUS_IVAR_FLAGS: - *result = (uintptr_t)devi->flags; + *result = (uintptr_t)devi->handle; break; default: return (gpiobus_read_ivar(dev, child, which, result)); @@ -402,6 +404,13 @@ acpi_gpiobus_read_ivar(device_t dev, device_t child, int which, return (0); } +static device_t +acpi_gpiobus_add_child(device_t dev, u_int order, const char *name, int unit) +{ + return (gpiobus_add_child_common(dev, order, name, unit, + sizeof(struct acpi_gpiobus_ivar))); +} + static device_method_t acpi_gpiobus_methods[] = { /* Device interface */ DEVMETHOD(device_probe, acpi_gpiobus_probe), @@ -410,6 +419,7 @@ static device_method_t acpi_gpiobus_methods[] = { /* Bus interface */ DEVMETHOD(bus_read_ivar, acpi_gpiobus_read_ivar), + DEVMETHOD(bus_add_child, acpi_gpiobus_add_child), DEVMETHOD_END }; diff --git a/sys/dev/gpio/acpi_gpiobusvar.h b/sys/dev/gpio/acpi_gpiobusvar.h index f8d502eab9d1..288e8bd0f2af 100644 --- a/sys/dev/gpio/acpi_gpiobusvar.h +++ b/sys/dev/gpio/acpi_gpiobusvar.h @@ -33,16 +33,16 @@ #include enum acpi_gpiobus_ivars { - ACPI_GPIOBUS_IVAR_HANDLE = 10600, - ACPI_GPIOBUS_IVAR_FLAGS, + ACPI_GPIOBUS_IVAR_HANDLE = 10600 }; #define ACPI_GPIOBUS_ACCESSOR(var, ivar, type) \ __BUS_ACCESSOR(acpi_gpiobus, var, ACPI_GPIOBUS, ivar, type) ACPI_GPIOBUS_ACCESSOR(handle, HANDLE, ACPI_HANDLE) -ACPI_GPIOBUS_ACCESSOR(flags, FLAGS, uint32_t) #undef ACPI_GPIOBUS_ACCESSOR +uint32_t acpi_gpiobus_convflags(ACPI_RESOURCE_GPIO *); + #endif /* __ACPI_GPIOBUS_H__ */ diff --git a/sys/dev/gpio/gpioaei.c b/sys/dev/gpio/gpioaei.c index ecae8ccaf2fa..7b97277aaf61 100644 --- a/sys/dev/gpio/gpioaei.c +++ b/sys/dev/gpio/gpioaei.c @@ -45,13 +45,21 @@ enum gpio_aei_type { ACPI_AEI_TYPE_EVT }; -struct gpio_aei_softc { - ACPI_HANDLE handle; - enum gpio_aei_type type; - int pin; +struct gpio_aei_ctx { + SLIST_ENTRY(gpio_aei_ctx) next; struct resource * intr_res; - int intr_rid; void * intr_cookie; + ACPI_HANDLE handle; + gpio_pin_t gpio; + uint32_t pin; + int intr_rid; + enum gpio_aei_type type; +}; + +struct gpio_aei_softc { + SLIST_HEAD(, gpio_aei_ctx) aei_ctx; + ACPI_HANDLE dev_handle; + device_t dev; }; static int @@ -65,69 +73,157 @@ gpio_aei_probe(device_t dev) static void gpio_aei_intr(void * arg) { - struct gpio_aei_softc * sc = arg; + struct gpio_aei_ctx * ctx = arg; /* Ask ACPI to run the appropriate _EVT, _Exx or _Lxx method. */ - if (sc->type == ACPI_AEI_TYPE_EVT) - acpi_SetInteger(sc->handle, NULL, sc->pin); + if (ctx->type == ACPI_AEI_TYPE_EVT) + acpi_SetInteger(ctx->handle, NULL, ctx->pin); else - AcpiEvaluateObject(sc->handle, NULL, NULL, NULL); + AcpiEvaluateObject(ctx->handle, NULL, NULL, NULL); +} + +static ACPI_STATUS +gpio_aei_enumerate(ACPI_RESOURCE * res, void * context) +{ + ACPI_RESOURCE_GPIO * gpio_res = &res->Data.Gpio; + struct gpio_aei_softc * sc = context; + uint32_t flags, maxpin; + device_t busdev; + int err; + + /* + * Check that we have a GpioInt object. + * Note that according to the spec this + * should always be the case. + */ + if (res->Type != ACPI_RESOURCE_TYPE_GPIO) + return (AE_OK); + if (gpio_res->ConnectionType != ACPI_RESOURCE_GPIO_TYPE_INT) + return (AE_OK); + + flags = acpi_gpiobus_convflags(gpio_res); + if (acpi_quirks & ACPI_Q_AEI_NOPULL) + flags &= ~GPIO_PIN_PULLUP; + + err = GPIO_PIN_MAX(acpi_get_device(sc->dev_handle), &maxpin); + if (err != 0) + return (AE_ERROR); + + busdev = GPIO_GET_BUS(acpi_get_device(sc->dev_handle)); + for (int i = 0; i < gpio_res->PinTableLength; i++) { + struct gpio_aei_ctx * ctx; + uint32_t pin = gpio_res->PinTable[i]; + + if (__predict_false(pin > maxpin)) { + device_printf(sc->dev, + "Invalid pin 0x%x, max: 0x%x (bad ACPI tables?)\n", + pin, maxpin); + continue; + } + + ctx = malloc(sizeof(struct gpio_aei_ctx), M_DEVBUF, M_WAITOK); + ctx->type = ACPI_AEI_TYPE_UNKNOWN; + if (pin <= 255) { + char objname[5]; /* "_EXX" or "_LXX" */ + sprintf(objname, "_%c%02X", + (flags & GPIO_INTR_EDGE_MASK) ? 'E' : 'L', pin); + if (ACPI_SUCCESS(AcpiGetHandle(sc->dev_handle, objname, + &ctx->handle))) + ctx->type = ACPI_AEI_TYPE_ELX; + } + + if (ctx->type == ACPI_AEI_TYPE_UNKNOWN) { + if (ACPI_SUCCESS(AcpiGetHandle(sc->dev_handle, "_EVT", + &ctx->handle))) + ctx->type = ACPI_AEI_TYPE_EVT; + else { + device_printf(sc->dev, + "AEI Device type is unknown for pin 0x%x\n", + pin); + + free(ctx, M_DEVBUF); + continue; + } + } + + err = gpio_pin_get_by_bus_pinnum(busdev, pin, &ctx->gpio); + if (err != 0) { + device_printf(sc->dev, "Cannot acquire pin 0x%x\n", + pin); + + free(ctx, M_DEVBUF); + continue; + } + + err = gpio_pin_setflags(ctx->gpio, flags & ~GPIO_INTR_MASK); + if (err != 0) { + device_printf(sc->dev, + "Cannot set pin flags for pin 0x%x\n", pin); + + gpio_pin_release(ctx->gpio); + free(ctx, M_DEVBUF); + continue; + } + + ctx->intr_rid = 0; + ctx->intr_res = gpio_alloc_intr_resource(sc->dev, + &ctx->intr_rid, RF_ACTIVE, ctx->gpio, + flags & GPIO_INTR_MASK); + if (ctx->intr_res == NULL) { + device_printf(sc->dev, + "Cannot allocate an IRQ for pin 0x%x\n", pin); + + gpio_pin_release(ctx->gpio); + free(ctx, M_DEVBUF); + continue; + } + + err = bus_setup_intr(sc->dev, ctx->intr_res, INTR_TYPE_MISC | + INTR_MPSAFE | INTR_EXCL | INTR_SLEEPABLE, NULL, + gpio_aei_intr, ctx, &ctx->intr_cookie); + if (err != 0) { + device_printf(sc->dev, + "Cannot set up an IRQ for pin 0x%x\n", pin); + + bus_release_resource(sc->dev, ctx->intr_res); + gpio_pin_release(ctx->gpio); + free(ctx, M_DEVBUF); + continue; + } + + ctx->pin = pin; + SLIST_INSERT_HEAD(&sc->aei_ctx, ctx, next); + } + + return (AE_OK); } static int gpio_aei_attach(device_t dev) { struct gpio_aei_softc * sc = device_get_softc(dev); - gpio_pin_t pin; - uint32_t flags; ACPI_HANDLE handle; - int err; + ACPI_STATUS status; /* This is us. */ device_set_desc(dev, "ACPI Event Information Device"); - /* Store parameters needed by gpio_aei_intr. */ handle = acpi_gpiobus_get_handle(dev); - if (gpio_pin_get_by_child_index(dev, 0, &pin) != 0) { - device_printf(dev, "Unable to get the input pin\n"); + status = AcpiGetParent(handle, &sc->dev_handle); + if (ACPI_FAILURE(status)) { + device_printf(dev, "Cannot get parent of %s\n", + acpi_name(handle)); return (ENXIO); } - sc->type = ACPI_AEI_TYPE_UNKNOWN; - sc->pin = pin->pin; - - flags = acpi_gpiobus_get_flags(dev); - if (pin->pin <= 255) { - char objname[5]; /* "_EXX" or "_LXX" */ - sprintf(objname, "_%c%02X", - (flags & GPIO_INTR_EDGE_MASK) ? 'E' : 'L', pin->pin); - if (ACPI_SUCCESS(AcpiGetHandle(handle, objname, &sc->handle))) - sc->type = ACPI_AEI_TYPE_ELX; - } - if (sc->type == ACPI_AEI_TYPE_UNKNOWN) { - if (ACPI_SUCCESS(AcpiGetHandle(handle, "_EVT", &sc->handle))) - sc->type = ACPI_AEI_TYPE_EVT; - } - - if (sc->type == ACPI_AEI_TYPE_UNKNOWN) { - device_printf(dev, "ACPI Event Information Device type is unknown"); - return (ENOTSUP); - } + SLIST_INIT(&sc->aei_ctx); + sc->dev = dev; - /* Set up the interrupt. */ - if ((sc->intr_res = gpio_alloc_intr_resource(dev, &sc->intr_rid, - RF_ACTIVE, pin, flags & GPIO_INTR_MASK)) == NULL) { - device_printf(dev, "Cannot allocate an IRQ\n"); - return (ENOTSUP); - } - err = bus_setup_intr(dev, sc->intr_res, INTR_TYPE_MISC | INTR_MPSAFE | - INTR_EXCL | INTR_SLEEPABLE, NULL, gpio_aei_intr, sc, - &sc->intr_cookie); - if (err != 0) { - device_printf(dev, "Cannot set up IRQ\n"); - bus_release_resource(dev, SYS_RES_IRQ, sc->intr_rid, - sc->intr_res); - return (err); + status = AcpiWalkResources(sc->dev_handle, "_AEI", + gpio_aei_enumerate, sc); + if (ACPI_FAILURE(status)) { + device_printf(dev, "Failed to enumerate AEI resources\n"); + return (ENXIO); } return (0); @@ -137,9 +233,15 @@ static int gpio_aei_detach(device_t dev) { struct gpio_aei_softc * sc = device_get_softc(dev); + struct gpio_aei_ctx * ctx, * tctx; + + SLIST_FOREACH_SAFE(ctx, &sc->aei_ctx, next, tctx) { + bus_teardown_intr(dev, ctx->intr_res, ctx->intr_cookie); + bus_release_resource(dev, ctx->intr_res); + gpio_pin_release(ctx->gpio); + free(ctx, M_DEVBUF); + } - bus_teardown_intr(dev, sc->intr_res, sc->intr_cookie); - bus_release_resource(dev, SYS_RES_IRQ, sc->intr_rid, sc->intr_res); return (0); } From nobody Wed Aug 20 07:09:49 2025 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 4c6HdT2tvwz64Vgx for ; Wed, 20 Aug 2025 07:09:49 +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 4c6HdT2KPCz3XKt; Wed, 20 Aug 2025 07:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673789; 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=bjL4wDz/Y/nQjbLsdb+Zl+4gjtqJbTWAQs70lwxwu8c=; b=AilHa+zSYb1B0RKqVL26jN1s7yGNx+3xmye7WifreNI7AI4cThFuSHJ1MG9AivsySYclAk ANonDi51VniKaPTAl9ayViMlM3p9CWlor2F4UWc+8x56pYBq8DrfxHDHRPmIb8skTh3XBn 0lmeEH/c6KM3JpdRUe28n9rRmGXcf0l1g8q8WSh01JylPk26+79YAMr0OdpDI7cvFGI9ky xeqO3ZvfRY6cf7M1mo0ghIqKApCHTJj5cXX1xbBRLIZacCdAFzZVhOpUrDXNsX3kVkbR5z M970nRcbVAWNMj43VpMJu3m/+qbwqEPm6WdK97gf/woZVGz0AG4X9JGCNur9Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673789; 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=bjL4wDz/Y/nQjbLsdb+Zl+4gjtqJbTWAQs70lwxwu8c=; b=rUEkfnk4omTl9D3FRATYCq2AX1uXtPcrq5Z2UBkdspZWm+Z7Tb6PVCIitJ9z4OFEhYriWG MV2oEXFfzo22RHqpUxCfm2zyxh/1fuBarHfnhgxElAaLYrAMK+biY3lMc30YsyV+88eHxB TpTxQMdwtyatzcQ4fh7x0lNB3/CRpRHPfDjQwqmGO0ID4Hcqjl08OCmFxbcXGGr8MnugxV hm/DG1Rk1MJls2Ayv9YFSlNx9+gCczu7xrKCu17Of/6MMeBSW3lZRJEg7fH14fTHY7yWa4 omvhEAZBd1kGzfDt6jjCeDa0d92MNBnVlUdoclwaE9YVsnCTLrwJqz2DZB8rkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673789; a=rsa-sha256; cv=none; b=LI+V8duq80pLFCbJXF6z683RMhp2c0eiQR6+2nksxXZpkVEGSICvoyaRK85wx7/3WbPGxp sUcCGkxn8sUaJfr2zMPviOkzkwJg9UqOTys+u7QOU0J+UJYEK3vanOM/FNisGzswRieIQo S2k4VmNh0eXup6B86kcLzgFkegsQtyniuAkBjZwGbd46tbuo7PdxiaPAmtvJJTBNoMmdU9 xnFYlinLl9kkv/0sSWHpBGPxW0d7vPxBI+teqk9gEsZ1oSrOsQOnUPB+stwEimYo5AUAV8 Uhnk/bN20D9UAjCjz9jaTbfAWfclPdna7FQ8snJiAt5C8w/ZpH47U96iqZL6kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6HdT1whrz13SF; Wed, 20 Aug 2025 07:09:49 +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 57K79nbs043726; Wed, 20 Aug 2025 07:09:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K79nPp043725; Wed, 20 Aug 2025 07:09:49 GMT (envelope-from git) Date: Wed, 20 Aug 2025 07:09:49 GMT Message-Id: <202508200709.57K79nPp043725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 1d0b94c4e73d..a9410ccbd9f0 - vendor/openzfs/master - vendor branch updated 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: a9410ccbd9f0375a7eeb6bc35eb55efe9c21493e X-Git-Oldrev: 1d0b94c4e73d83299528c44fb4fa3b29eb6009a3 X-Git-Newrev: a9410ccbd9f0375a7eeb6bc35eb55efe9c21493e Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=1d0b94c4e73d..a9410ccbd9f0 6b3333de2d89 Linux 6.16 compat: META 508c54697550 ZIL: use a bitfield for LWB "slog" and "slim" state flags 92da3e18c842 ZIL: flag crashed LWBs so we know not to process them f562e0f69115 ZIL: single zil_commit_waiter_done() function to complete a waiter 7c9adc68584e zil_process_commit_list: fail better if the pool suspends in stall 531568f43811 zil_suspend: fix cookie leak if ZIL crashes during wait e0e60d319c29 Better pack struct zio_prop 1ccae433e9eb Allow vmem_alloc backed multilists 152e34822b46 Silence zstd large allocation warning 22671c4da47a FreeBSD 15.0 is now "PRERELEASE" f8bc01c79f37 contrib/initramfs/scripts/zfs: shellcheck fixup d3c1d27afd62 zdb: better handling for corrupt block pointers 077269bfeddf Fix Assert in dbuf_undirty, which triggers during usage zap shrink 3cfd670e74f7 Add conflict/replacement with older SONAME libzfs and libzpool packages 885d929cf8ab Fix missed assertion update in physical rewrite patch bb9225ea86dc Backport AVX2 AES-GCM implementation from BoringSSL 930f9cc66c24 crypto_test: include AVX2 GCM implementation in tests 28433c454789 simd_stat: expose availability of VAES and VPCLMULQDQ 8d35a022e45f AUTHORS/mailmap: update with new contributors d15143207369 ZIL: Make allocations more flexible 5061f959d169 Retire zfs_autoimport_disable kmod option 9b0a9b410e84 CI: Add optional patch level, fix hostname on F42 f65321e30cb8 Add missing AC_MSG_RESULT 7b54567c1fbc trace_zil.h: rename zcw_zio_error to zcw_error 30a915efed4d zfs-send.8: mention combination of -c/-e flags and zstd_compress feature 6bb8fe552828 ZTS: stress test concurrent zvol create/destroy b2c792778cca zvol: generalise zvol_remove_minors_impl() for single zvol case 96f9d271eaad zvol: remove the OS-side minor before freeing the zvol 8a0e5e8b5400 zvol: stop using zvol_state_lock to protect OS-side private data dcd73069f053 zvol_remove_minors_impl: remove all async fallbacks 2c877e8453a2 FreeBSD: Set st_rdev to NODEV, not 0, when not a device a9410ccbd9f0 Make zpool_find_config() report errors From nobody Wed Aug 20 08:10:37 2025 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 4c6Jzd5Zwsz64ZFD; Wed, 20 Aug 2025 08:10:37 +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 4c6Jzd4rvFz3cWj; Wed, 20 Aug 2025 08:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755677437; 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=D4iNx7BRzpKtMA3YVcIoK1Ki+rFibFRp8xUkxD1zRQk=; b=aox2EH8gC2xlOJDSK55xTg7fAGbAk2rO20GyG9e41NcRfIx5mGAqc5dEYkzDh6SV4cvhUQ xhKYIozEKarKz4oW81GhfC9rZApexQX9rnX+qslDN0BOFYrB+bgBYdQmvw51jXMsiOV83h BP0sPh953iqGnyHAGkOCTe/fLRQPRFBxsnsZEDyJcS81jCFCNfDUSJXkHtc3xSCI0R3yuM GWTFd4y1U6eM1KtIY+CMrO3nd7epTo6AU1HnJ9V7SNpV4TK6bRjGohUTOazKGUIhUhMhmP qHWgDtFr4Asm/H4GadRd7qKOlFPkyMHxbv/RbCwFAsGiLtorSlECfTd4FQeU4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755677437; 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=D4iNx7BRzpKtMA3YVcIoK1Ki+rFibFRp8xUkxD1zRQk=; b=eLTnHa3xQrM1rQZe1db2pAFQaM696YV6s1LkAweoRVXke1Bt97Rj4QCUbI01rrfHLv95/N +vXKut5y7BNvxMlypiLs5j1yLcI9ZXLV4NiJ0X2WWNuzit76cT2NhHVHfCWJMgLM0BHJzY aWNe+CYXLWXsFy6xRZnstWav9dzuuzVun9gfIBRocgaSDeZOl+5r9h1irFqr+aZ6J7NfUT hzTukXKEmc2xgJu3rf74SnOwUJ1fqsdgXjE4WvDAWHVXZQGkWPv5+nYZJeX0a7GLnu1Q2W rJ8jggye+zetlAb/23jV0DhMAOMPPSXTYbimPeJlUxQfBNCcxEpEJeRvvdqkKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755677437; a=rsa-sha256; cv=none; b=HsvGymJlzaBtgNT/9ing4LTLYB6Lk+Rb8ohiQvQAx53vzUy5pEJ73LUt8EJarFj2VMckNZ AWsWP2hAjXNetzUppzmSmlOgyRnP9E6SP9xhRqVDjaPbrsmluQH5O76aKpreXR8Hx7VEn/ daZgJ+i9Eo1jBO7mcMbM8K02LtzSzLp+gp0rCUW7C0ZTqRrHEzg1+Gwlk/KlslZ7589zUn I1E9ATO0ExpmkAvFc5MU61UBgtgUqbB4KK+BQeSpdqbNsf8JbsqMg3o89lfSova3TYPloz 739TFCjTuHHaqjRaUjEL7dH/a2CYkl0SL4zIsFRE+vcPN0Jup7q6DSNNUkrrKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6Jzd4PyYz14ht; Wed, 20 Aug 2025 08:10:37 +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 57K8Ab15065978; Wed, 20 Aug 2025 08:10:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K8Abjs065975; Wed, 20 Aug 2025 08:10:37 GMT (envelope-from git) Date: Wed, 20 Aug 2025 08:10:37 GMT Message-Id: <202508200810.57K8Abjs065975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 005e24b7a546 - main - pf: remove duplicate struct definition 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 005e24b7a546b1c3c37e7cb7df95a3f9679e2d9a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=005e24b7a546b1c3c37e7cb7df95a3f9679e2d9a commit 005e24b7a546b1c3c37e7cb7df95a3f9679e2d9a Author: Kristof Provost AuthorDate: 2025-08-05 12:46:32 +0000 Commit: Kristof Provost CommitDate: 2025-08-20 08:08:46 +0000 pf: remove duplicate struct definition pfsync_state_peer and pf_state_peer_export are identical struct defintions. Make all users of pfsync_state_peer use pf_state_peer_export instead, and remove the pfsync_state_peer definition. Sponsored by: Rubicon Communications, LLC ("Netgate") --- contrib/tcpdump/print-pfsync.c | 12 ++++++------ sys/net/if_pfsync.h | 4 ++-- sys/net/pfvar.h | 36 ++++++++---------------------------- sys/netpfil/pf/if_pfsync.c | 12 ++++++------ sys/netpfil/pf/pf_nl.c | 2 +- 5 files changed, 23 insertions(+), 43 deletions(-) diff --git a/contrib/tcpdump/print-pfsync.c b/contrib/tcpdump/print-pfsync.c index 6bf9abaf3903..e4f11930816c 100644 --- a/contrib/tcpdump/print-pfsync.c +++ b/contrib/tcpdump/print-pfsync.c @@ -53,8 +53,8 @@ static void pfsync_print(netdissect_options *, struct pfsync_header *, const u_char *, u_int); static void print_src_dst(netdissect_options *, - const struct pfsync_state_peer *, - const struct pfsync_state_peer *, uint8_t); + const struct pf_state_peer_export *, + const struct pf_state_peer_export *, uint8_t); static void print_state(netdissect_options *, union pfsync_state_union *, int); void @@ -330,7 +330,7 @@ print_host(netdissect_options *ndo, struct pf_addr *addr, uint16_t port, } static void -print_seq(netdissect_options *ndo, const struct pfsync_state_peer *p) +print_seq(netdissect_options *ndo, const struct pf_state_peer_export *p) { if (p->seqdiff) ND_PRINT("[%u + %u](+%u)", ntohl(p->seqlo), @@ -341,8 +341,8 @@ print_seq(netdissect_options *ndo, const struct pfsync_state_peer *p) } static void -print_src_dst(netdissect_options *ndo, const struct pfsync_state_peer *src, - const struct pfsync_state_peer *dst, uint8_t proto) +print_src_dst(netdissect_options *ndo, const struct pf_state_peer_export *src, + const struct pf_state_peer_export *dst, uint8_t proto) { if (proto == IPPROTO_TCP) { @@ -390,7 +390,7 @@ print_src_dst(netdissect_options *ndo, const struct pfsync_state_peer *src, static void print_state(netdissect_options *ndo, union pfsync_state_union *s, int version) { - struct pfsync_state_peer *src, *dst; + struct pf_state_peer_export *src, *dst; struct pfsync_state_key *sk, *nk; int min, sec; diff --git a/sys/net/if_pfsync.h b/sys/net/if_pfsync.h index 1efc220aa8e1..e99df0b85ccf 100644 --- a/sys/net/if_pfsync.h +++ b/sys/net/if_pfsync.h @@ -160,8 +160,8 @@ struct pfsync_ins_ack { struct pfsync_upd_c { u_int64_t id; - struct pfsync_state_peer src; - struct pfsync_state_peer dst; + struct pf_state_peer_export src; + struct pf_state_peer_export dst; u_int32_t creatorid; u_int32_t expire; u_int8_t timeout; diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index c397f0b67896..fe12df0f7dc8 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1020,7 +1020,7 @@ struct pf_state_scrub_export { #define PF_SCRUB_FLAG_VALID 0x01 uint8_t scrub_flag; uint32_t pfss_ts_mod; /* timestamp modulation */ -}; +} __packed; struct pf_state_key_export { struct pf_addr addr[2]; @@ -1037,7 +1037,7 @@ struct pf_state_peer_export { uint8_t state; /* active state level */ uint8_t wscale; /* window scaling factor */ uint8_t dummy[6]; -}; +} __packed; _Static_assert(sizeof(struct pf_state_peer_export) == 32, "size incorrect"); struct pf_state_export { @@ -1179,26 +1179,6 @@ struct pf_test_ctx { * Unified state structures for pulling states out of the kernel * used by pfsync(4) and the pf(4) ioctl. */ -struct pfsync_state_scrub { - u_int16_t pfss_flags; - u_int8_t pfss_ttl; /* stashed TTL */ -#define PFSYNC_SCRUB_FLAG_VALID 0x01 - u_int8_t scrub_flag; - u_int32_t pfss_ts_mod; /* timestamp modulation */ -} __packed; - -struct pfsync_state_peer { - struct pfsync_state_scrub scrub; /* state is scrubbed */ - u_int32_t seqlo; /* Max sequence number sent */ - u_int32_t seqhi; /* Max the other end ACKd + win */ - u_int32_t seqdiff; /* Sequence number modulator */ - u_int16_t max_win; /* largest window (pre scaling) */ - u_int16_t mss; /* Maximum segment size option */ - u_int8_t state; /* active state level */ - u_int8_t wscale; /* window scaling factor */ - u_int8_t pad[6]; -} __packed; - struct pfsync_state_key { struct pf_addr addr[2]; u_int16_t port[2]; @@ -1208,8 +1188,8 @@ struct pfsync_state_1301 { u_int64_t id; char ifname[IFNAMSIZ]; struct pfsync_state_key key[2]; - struct pfsync_state_peer src; - struct pfsync_state_peer dst; + struct pf_state_peer_export src; + struct pf_state_peer_export dst; struct pf_addr rt_addr; u_int32_t rule; u_int32_t anchor; @@ -1235,8 +1215,8 @@ struct pfsync_state_1400 { u_int64_t id; char ifname[IFNAMSIZ]; struct pfsync_state_key key[2]; - struct pfsync_state_peer src; - struct pfsync_state_peer dst; + struct pf_state_peer_export src; + struct pf_state_peer_export dst; struct pf_addr rt_addr; u_int32_t rule; u_int32_t anchor; @@ -1336,7 +1316,7 @@ extern pflog_packet_t *pflog_packet_ptr; htons((s)->scrub->pfss_flags & PFSS_TIMESTAMP); \ (d)->scrub.pfss_ttl = (s)->scrub->pfss_ttl; \ (d)->scrub.pfss_ts_mod = htonl((s)->scrub->pfss_ts_mod);\ - (d)->scrub.scrub_flag = PFSYNC_SCRUB_FLAG_VALID; \ + (d)->scrub.scrub_flag = PF_SCRUB_FLAG_VALID; \ } \ } while (0) @@ -1348,7 +1328,7 @@ extern pflog_packet_t *pflog_packet_ptr; (d)->mss = ntohs((s)->mss); \ (d)->state = (s)->state; \ (d)->wscale = (s)->wscale; \ - if ((s)->scrub.scrub_flag == PFSYNC_SCRUB_FLAG_VALID && \ + if ((s)->scrub.scrub_flag == PF_SCRUB_FLAG_VALID && \ (d)->scrub != NULL) { \ (d)->scrub->pfss_flags = \ ntohs((s)->scrub.pfss_flags) & PFSS_TIMESTAMP; \ diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index e34c08c8c4db..585c196391c0 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -123,8 +123,8 @@ union inet_template { sizeof(struct pfsync_header) + \ sizeof(struct pfsync_subheader) ) -static int pfsync_upd_tcp(struct pf_kstate *, struct pfsync_state_peer *, - struct pfsync_state_peer *); +static int pfsync_upd_tcp(struct pf_kstate *, struct pf_state_peer_export *, + struct pf_state_peer_export *); static int pfsync_in_clr(struct mbuf *, int, int, int, int); static int pfsync_in_ins(struct mbuf *, int, int, int, int); static int pfsync_in_iack(struct mbuf *, int, int, int, int); @@ -330,7 +330,7 @@ SYSCTL_UINT(_net_pfsync, OID_AUTO, defer_delay, CTLFLAG_VNET | CTLFLAG_RW, static int pfsync_clone_create(struct if_clone *, int, caddr_t); static void pfsync_clone_destroy(struct ifnet *); -static int pfsync_alloc_scrub_memory(struct pfsync_state_peer *, +static int pfsync_alloc_scrub_memory(struct pf_state_peer_export *, struct pf_state_peer *); static int pfsyncoutput(struct ifnet *, struct mbuf *, const struct sockaddr *, struct route *); @@ -502,7 +502,7 @@ pfsync_clone_destroy(struct ifnet *ifp) } static int -pfsync_alloc_scrub_memory(struct pfsync_state_peer *s, +pfsync_alloc_scrub_memory(struct pf_state_peer_export *s, struct pf_state_peer *d) { if (s->scrub.scrub_flag && d->scrub == NULL) { @@ -1172,8 +1172,8 @@ pfsync_in_iack(struct mbuf *m, int offset, int count, int flags, int action) } static int -pfsync_upd_tcp(struct pf_kstate *st, struct pfsync_state_peer *src, - struct pfsync_state_peer *dst) +pfsync_upd_tcp(struct pf_kstate *st, struct pf_state_peer_export *src, + struct pf_state_peer_export *dst) { int sync = 0; diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 09754359ec2d..45b5b8dd5fef 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -118,7 +118,7 @@ dump_state_peer(struct nl_writer *nw, int attr, const struct pf_state_peer *peer nlattr_add_u16(nw, PF_STP_PFSS_FLAGS, pfss_flags); nlattr_add_u32(nw, PF_STP_PFSS_TS_MOD, sc->pfss_ts_mod); nlattr_add_u8(nw, PF_STP_PFSS_TTL, sc->pfss_ttl); - nlattr_add_u8(nw, PF_STP_SCRUB_FLAG, PFSYNC_SCRUB_FLAG_VALID); + nlattr_add_u8(nw, PF_STP_SCRUB_FLAG, PF_SCRUB_FLAG_VALID); } nlattr_set_len(nw, off); From nobody Wed Aug 20 08:10:38 2025 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 4c6Jzg0S5dz64ZQL; Wed, 20 Aug 2025 08:10:39 +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 4c6Jzf5tNyz3c95; Wed, 20 Aug 2025 08:10:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755677438; 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=SS4U7c1N+wBJF4Sorn1E7IL0Sd8hr3u6LIDDwbe/chk=; b=Bn22D/drwGCsoHOSGAMf8rAtyplEArTZf29mQ/ZBPb5324wip6pIBBcgoIcf1Hmg0Dvj6V KVwu8enM6pqxYqB4miWEPleNmiKEMHXRbZJr1+uEitW+PMLxiDIOHBLeBImMKUtCTncoYs HNZrHiJhxeJdz/UypPFXIBt+waKMkD0XgrN24vT69WqgI7MOn34DUfq782+3oiOpID46Rn q5nVXsJ0iNjPOZNWYHEaPZyu/MxEJ8eHTGSpzeRXctMXxI9KoCawcWAAiAeFxG2wZfRChA EhF3O2M/8WmWeqkmtdm5rjK0oCHRunDaU1W1itlM85nObdmQOojam+ORdECGsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755677438; 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=SS4U7c1N+wBJF4Sorn1E7IL0Sd8hr3u6LIDDwbe/chk=; b=t9iqnudAdqVucMEEgKFezTlL/Trn+RuEy/ay9MWZlb+zcexQoU0LoVYOJmJJaBCsX3I/YP gxxQS6VK2NtGXxFdpFm0NvjFkOixoW56W6H5I2XB+9zCYbLGdIPGZCOH9ZZOuM0lgJjyAx lqi0k9XwAt334Pd2YsyT4OumEbyv4pRB5PABYd0KfM7JpnKc97WTIB3laaMePNe8s9xQSh mp4cDoX65uTFX5B88TJ/ay6n8BRrSv+aULQiJLsmdhFPOq7rqb7DCrrKX3iz5PA/ABXV3h ulmm4+12YqLXvoTt8tQugKT8bqEgHeZMYNVEkOr3GuQBjgMoLBUzoxW2gZahIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755677438; a=rsa-sha256; cv=none; b=AItQWbNlPVNN5ppxVuOVOkXmQVcVuV4/PDC8pskmqRAHjMoHT7YEvwITlYeVY1fpvN/fmy V1UGdDcY8BI0FER3f9OiVZ4poBMf00lJujFzMldIUjYGfX3IYOwZNayEwwOvCqpPCxTz7s oEx6w5LMmAvRtvJ1Dv5B57JPbTg07PCatw1WWXeRRjBMAGYduYW0NjqzwE8Ep3jFQ1EVFO RV7syRK2BrqqLo1Ck2RRSvetCZ28nLcDnwqESJVd4lnm5cFda5R/YqvpG8V95+hjCjcsJv Pmtc901TZ8hAhuX4sV/d6kQAU/SaUtx3uWOBks0exskD4HHE0ga6eL02f9eXjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6Jzf5Pwgz14kx; Wed, 20 Aug 2025 08:10:38 +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 57K8Ac9U066012; Wed, 20 Aug 2025 08:10:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K8AcXw066009; Wed, 20 Aug 2025 08:10:38 GMT (envelope-from git) Date: Wed, 20 Aug 2025 08:10:38 GMT Message-Id: <202508200810.57K8AcXw066009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 95fda90b84d7 - main - pf: rewrite the pf_state_peer_ntoh and pf_state_peer_hton macros as functions. 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95fda90b84d79959109b781db6dab4f5547203b4 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=95fda90b84d79959109b781db6dab4f5547203b4 commit 95fda90b84d79959109b781db6dab4f5547203b4 Author: Kristof Provost AuthorDate: 2025-08-04 15:46:32 +0000 Commit: Kristof Provost CommitDate: 2025-08-20 08:08:46 +0000 pf: rewrite the pf_state_peer_ntoh and pf_state_peer_hton macros as functions. I can read this code as functions, but it takes too much effort as macros. Obtained from: OpenBSD, dlg , 4103306ead Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 37 ++++--------------------------------- sys/netpfil/pf/pf.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index fe12df0f7dc8..d6c13470f2eb 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1303,39 +1303,10 @@ extern pflog_packet_t *pflog_packet_ptr; /* for copies to/from network byte order */ /* ioctl interface also uses network byte order */ -#define pf_state_peer_hton(s,d) do { \ - (d)->seqlo = htonl((s)->seqlo); \ - (d)->seqhi = htonl((s)->seqhi); \ - (d)->seqdiff = htonl((s)->seqdiff); \ - (d)->max_win = htons((s)->max_win); \ - (d)->mss = htons((s)->mss); \ - (d)->state = (s)->state; \ - (d)->wscale = (s)->wscale; \ - if ((s)->scrub) { \ - (d)->scrub.pfss_flags = \ - htons((s)->scrub->pfss_flags & PFSS_TIMESTAMP); \ - (d)->scrub.pfss_ttl = (s)->scrub->pfss_ttl; \ - (d)->scrub.pfss_ts_mod = htonl((s)->scrub->pfss_ts_mod);\ - (d)->scrub.scrub_flag = PF_SCRUB_FLAG_VALID; \ - } \ -} while (0) - -#define pf_state_peer_ntoh(s,d) do { \ - (d)->seqlo = ntohl((s)->seqlo); \ - (d)->seqhi = ntohl((s)->seqhi); \ - (d)->seqdiff = ntohl((s)->seqdiff); \ - (d)->max_win = ntohs((s)->max_win); \ - (d)->mss = ntohs((s)->mss); \ - (d)->state = (s)->state; \ - (d)->wscale = (s)->wscale; \ - if ((s)->scrub.scrub_flag == PF_SCRUB_FLAG_VALID && \ - (d)->scrub != NULL) { \ - (d)->scrub->pfss_flags = \ - ntohs((s)->scrub.pfss_flags) & PFSS_TIMESTAMP; \ - (d)->scrub->pfss_ttl = (s)->scrub.pfss_ttl; \ - (d)->scrub->pfss_ts_mod = ntohl((s)->scrub.pfss_ts_mod);\ - } \ -} while (0) +void pf_state_peer_hton(const struct pf_state_peer *, + struct pf_state_peer_export *); +void pf_state_peer_ntoh(const struct pf_state_peer_export *, + struct pf_state_peer *); #define pf_state_counter_hton(s,d) do { \ d[0] = htonl((s>>32)&0xffffffff); \ diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 9d83e7b82e6f..8cd4fff95b15 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -2069,6 +2069,44 @@ pf_find_state_all_exists(const struct pf_state_key_cmp *key, u_int dir) return (false); } +void +pf_state_peer_hton(const struct pf_state_peer *s, struct pf_state_peer_export *d) +{ + d->seqlo = htonl(s->seqlo); + d->seqhi = htonl(s->seqhi); + d->seqdiff = htonl(s->seqdiff); + d->max_win = htons(s->max_win); + d->mss = htons(s->mss); + d->state = s->state; + d->wscale = s->wscale; + if (s->scrub) { + d->scrub.pfss_flags = htons( + s->scrub->pfss_flags & PFSS_TIMESTAMP); + d->scrub.pfss_ttl = (s)->scrub->pfss_ttl; + d->scrub.pfss_ts_mod = htonl((s)->scrub->pfss_ts_mod); + d->scrub.scrub_flag = PF_SCRUB_FLAG_VALID; + } +} + +void +pf_state_peer_ntoh(const struct pf_state_peer_export *s, struct pf_state_peer *d) +{ + d->seqlo = ntohl(s->seqlo); + d->seqhi = ntohl(s->seqhi); + d->seqdiff = ntohl(s->seqdiff); + d->max_win = ntohs(s->max_win); + d->mss = ntohs(s->mss); + d->state = s->state; + d->wscale = s->wscale; + if (s->scrub.scrub_flag == PF_SCRUB_FLAG_VALID && + d->scrub != NULL) { + d->scrub->pfss_flags = ntohs(s->scrub.pfss_flags) & + PFSS_TIMESTAMP; + d->scrub->pfss_ttl = s->scrub.pfss_ttl; + d->scrub->pfss_ts_mod = ntohl(s->scrub.pfss_ts_mod); + } +} + struct pf_udp_mapping * pf_udp_mapping_create(sa_family_t af, struct pf_addr *src_addr, uint16_t src_port, struct pf_addr *nat_addr, uint16_t nat_port) From nobody Wed Aug 20 08:10:39 2025 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 4c6Jzj1rFnz64ZQM; Wed, 20 Aug 2025 08:10:41 +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 4c6Jzh4rmHz3cj4; Wed, 20 Aug 2025 08:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755677440; 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=zLWe/Dq4U5m0Vl8rhz3adTLz6GqdM8PZW8z8Bagka7o=; b=WA+/V6rrhVbH98cQAl8KeQK1WeSqC3A3KxP0m6l0cVpvs+Li7sKidmKEbmMZbPdAn9z3BL PRtFnhffHcMxIoHFGacGQRTD54qqnkUq9kEf03UbyrYMdcvDVnnxeIDDJClT9VEC2nxSAo nkXYWcbbSpKBBunO/v1TTPRygQ/4tsSDFOGFuXs62QB+BzdMNRjR6z4A+heT/V65V+uv0m XYLW0VSLcTMO7v5atjeDh72fEAYJJh8wvlf/DQvs445ZXkcF8W/8cFLFps0HVMkXkLoKii R/uNyyVXOrx2SZQ/TV/hiCHtKxUa1uqQtgUxdL+lFafgM4Y0opbY6ODRp2BqtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755677440; 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=zLWe/Dq4U5m0Vl8rhz3adTLz6GqdM8PZW8z8Bagka7o=; b=INd5BlOb3ko25H9Ivt8fnTqZcPXcf5b7cqXWPsOf88wKpsmO9BDCQdFO7zO8ZApR2veBOP rH0339yyOW8JJoLxrl9Onh6wOi4vSGAhmCX0X6cGfoUjDNTovNa+7RVe8V7vwC193l2aqk 84NDxewsSi/1T6T9Ldh3pD+vzPauHvQT18s6M1fJpNMMCF1xlieRCeqTQZ06u2TSDTEDCA pWzLxl9VggFgdsVVpWoJDgUK4gsKgB/juveoc+2v/2eh62DMdc3pa+grhtNWELiA9CNQd5 6OLxuCoHIf/IzHO1Heq383sV4kNiJAgj3/9zZtPsFvRKj91NNc4ZGmj52kqd+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755677440; a=rsa-sha256; cv=none; b=yz5n6mGvXEr+mU4iSrgplxx+63RlCMcCzBNtfq/cVpwIrHu4wCQiNaXYT+Dxh2psoH71eS cIUFyvjDeRmFrobVMnjtuV2Uf3+tDzT8zdwVcjY1x6Ib5sqrcYL2TwK0xucDOG832cnFxy 1/IS33agiOy5+JjYL3HS9LziFb5k9gKFT7kJysgt6kHTVYEqZNcFIeXJjmHrG/xyaCFRIg 0rXHLkm1jvEimVP9OSzR4CL4LTtMJz+wY+0T8WqICOKktQuIvVGv9qKS9PWEk2N67T+mH1 rvMynqwRQ9c3NVRCsj5UvRhnoJP7rPux50tMr1dphE3Zd0By/yC2HbmTKfdunA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6Jzg6L34z14Pk; Wed, 20 Aug 2025 08:10:39 +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 57K8AdIe066046; Wed, 20 Aug 2025 08:10:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K8AdpS066043; Wed, 20 Aug 2025 08:10:39 GMT (envelope-from git) Date: Wed, 20 Aug 2025 08:10:39 GMT Message-Id: <202508200810.57K8AdpS066043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 063dc452cc96 - main - pfctl.8: small cleanups 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 063dc452cc963e87553d5afb501df062c7f37eb8 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=063dc452cc963e87553d5afb501df062c7f37eb8 commit 063dc452cc963e87553d5afb501df062c7f37eb8 Author: Kristof Provost AuthorDate: 2025-08-05 13:42:25 +0000 Commit: Kristof Provost CommitDate: 2025-08-20 08:08:46 +0000 pfctl.8: small cleanups - show -R with -s in options list - show -t with -T in options list - sort the -T commands - small text/formatting tweaks ok sthen ok kn on an earlier version Obtained from: OpenBSD, jmc , bc345da85f Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.8 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8 index f582c6301124..5a74a8fd3444 100644 --- a/sbin/pfctl/pfctl.8 +++ b/sbin/pfctl/pfctl.8 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 7, 2025 +.Dd August 5, 2025 .Dt PFCTL 8 .Os .Sh NAME @@ -410,6 +410,7 @@ This is the default behaviour. .It Fl o Cm profile Enable basic ruleset optimizations with profiling. .El +.Pp For further information on the ruleset optimizer, see .Xr pf.conf 5 . .It Fl P @@ -431,7 +432,7 @@ Perform reverse DNS lookups on states and tables when displaying them. and .Fl r are mutually exclusive. -.It Fl s Ar modifier +.It Fl s Ar modifier Op Fl R Ar id Show the filter parameters specified by .Ar modifier (may be abbreviated): @@ -563,19 +564,16 @@ no free ports in translation port range .It Fl S Do not perform domain name resolution. If a name cannot be resolved without DNS, an error will be reported. -.It Fl T Ar command Op Ar address ... +.It Fl t Ar table Fl T Ar command Op Ar address ... Specify the .Ar command -(may be abbreviated) to apply to the table. +(may be abbreviated) to apply to +.Ar table . Commands include: .Pp -.Bl -tag -width xxxxxxxxxxxx -compact -.It Fl T Cm kill -Kill a table. -.It Fl T Cm flush -Flush all addresses of a table. +.Bl -tag -width "-T expire number" -compact .It Fl T Cm add -Add one or more addresses in a table. +Add one or more addresses to a table. Automatically create a persistent table if it does not exist. .It Fl T Cm delete Delete one or more addresses from a table. @@ -586,6 +584,10 @@ seconds ago. For entries which have never had their statistics cleared, .Ar number refers to the time they were added to the table. +.It Fl T Cm flush +Flush all addresses in a table. +.It Fl T Cm kill +Kill a table. .It Fl T Cm replace Replace the addresses of the table. Automatically create a persistent table if it does not exist. @@ -765,8 +767,6 @@ tables of the same name from anchors attached below it. .It C This flag is set when per-address counters are enabled on the table. .El -.It Fl t Ar table -Specify the name of the table. .It Fl v Produce more verbose output. A second use of From nobody Wed Aug 20 08:11:51 2025 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 4c6K1M03H2z64ZGR; Wed, 20 Aug 2025 08:12:07 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4c6K1L3SQRz3dvg; Wed, 20 Aug 2025 08:12:06 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 57K8BqZe035943; Wed, 20 Aug 2025 11:11:55 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 57K8BqZe035943 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 57K8Bp3P035942; Wed, 20 Aug 2025 11:11:51 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 20 Aug 2025 11:11:51 +0300 From: Konstantin Belousov To: Aymeric Wibo Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 75acf71786f2 - main - libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp Message-ID: References: <202508192309.57JN9cNK038457@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: <202508192309.57JN9cNK038457@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c6K1L3SQRz3dvg On Tue, Aug 19, 2025 at 11:09:38PM +0000, Aymeric Wibo wrote: > The branch main has been updated by obiwac: > > URL: https://cgit.FreeBSD.org/src/commit/?id=75acf71786f201093b76f45eff03a8665fb79a72 > > commit 75acf71786f201093b76f45eff03a8665fb79a72 > Author: Muhammad Saheed > AuthorDate: 2025-08-19 23:06:53 +0000 > Commit: Aymeric Wibo > CommitDate: 2025-08-19 23:07:15 +0000 > > libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp > > Remove the declaration of ifconfig_set_fib from libifconfig.h as it had > no definition. > > ifconfig_sfp_id_is_qsfp is defined as a static header function in > libifconfig_sfp.h and doesn't generate a symbol. > > Both have been removed from Symbol.map. > > Reviewed by: obiwac, mckusick (mentor) > Approved by: obiwac, mckusick (mentor) > Sponsored by: Google LLC (GSoC) > Differential Revision: https://reviews.freebsd.org/D50666 > --- > lib/libifconfig/Symbol.map | 2 -- > lib/libifconfig/libifconfig.h | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/lib/libifconfig/Symbol.map b/lib/libifconfig/Symbol.map > index 2d80fb31652a..2e11ff963909 100644 > --- a/lib/libifconfig/Symbol.map > +++ b/lib/libifconfig/Symbol.map > @@ -40,7 +40,6 @@ FBSD_1.6 { > ifconfig_open; > ifconfig_set_capability; > ifconfig_set_description; > - ifconfig_set_fib; > ifconfig_set_metric; > ifconfig_set_mtu; > ifconfig_set_name; > @@ -81,7 +80,6 @@ FBSD_1.6 { > ifconfig_sfp_fc_speed_symbol; > ifconfig_sfp_id_description; > ifconfig_sfp_id_display; > - ifconfig_sfp_id_is_qsfp; > ifconfig_sfp_id_symbol; > ifconfig_sfp_rev_description; > ifconfig_sfp_rev_symbol; This breaks the ABI, of course. Or, it makes no sense to have the overhead of symbol versioning if it is fine to break the ABI. Symbol removal should have resulted in the library version bump. From nobody Wed Aug 20 08:14:11 2025 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 4c6K3l2qxXz64b2T; Wed, 20 Aug 2025 08:14:11 +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 4c6K3l1ppmz3f7x; Wed, 20 Aug 2025 08:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755677651; 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=S54pgR59OSZ2ewMj5KkcmMf9ZmnT4LI1tJdQHVz8kVk=; b=e5LoWeO1cHcjWxbcPcI/QUVXQO3o4TvbaCFMHQDUnSJTpyt1VqoD3N2r11k2ogslZyj8DR Or9m/8I0eWbfCQRSZlk5U2J8k1yRu56xu6lPhzfPM0sn/sz3yth+XmSM/F9K2JIS9aoTcz 5oekbrk92+4Vm69Kob4AgZ8Pah1u78q5LYwj7144+HPU4zfJQHjVUItDeNK1gG3Uwly7kd DkXBV/uEphKGEdu0vR19abitlKN2jQqwf8CV/WHQToBMI2Sh3iRLyvSa6PWT+/BUrsz5uG troyzvkzfte0+1pAPVG+zL93l6sQT41Hi7HqVcqULbUXHghFXM8BlDKTx/NcGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755677651; 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=S54pgR59OSZ2ewMj5KkcmMf9ZmnT4LI1tJdQHVz8kVk=; b=CPgv6ZZuxyaY3IBGsCFSWHPtwY96g/6LnNzMmjwpPltDxvF6BP71lEHpt1mkwZD0yeR/AI fL1APTp8fjftIuVBXAQKu1ENDVZFLyrHe2GHmkjWpx8gawHoyn6n9UrTN3qIp1Av6jV0M3 yCnCb+cgwHCStyF7RDnTU6dcVf5pKQRofXTo2dB2IbOhveT79stVe+aVw6uKdelDgH8yTl hTVQZIsU7Q93VCYZnCNYM1BoaQKz56kJWsmNZ5yfIBOoAUSFNsrJtJGgkq8hVO5uuW1yWa cFKn8bQ/IehB6YDCcy+xUpua1v8WCihoXWcpzMBxG0VogHoyrZfUL+bymzpMew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755677651; a=rsa-sha256; cv=none; b=HQ6coZGr/vLtYCzdovh9U2pXqBoRrcf9OplfHD2TNvhZhMf/1S6yKVSr0uAuxsc7gFuylv WN4dG9eGruE8TeWvE/mNtkchEp2YAxvgYL2x17yGX0oHAPJz0FXBvISBtZNIKOHX+KIQuX 0GWPNREt6FmgCUgSIL0347sbqjNPAND7rsiJ3C5f/s8+QEXi4zRIH1KiP8LIpMMy/JzmP6 TENyN4ByYKPSfijDgY1m1NZgZbnF2LULdE8v7g7FqwU6hmXIi8ts4CEgfGO8NH1pJcExN/ VcO8EqG75s30x6wNOw+tFYEgvAhW4y3eqxfOheMSTVFYhvFxU7wW281bchXvmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6K3l1Kwxz153t; Wed, 20 Aug 2025 08:14:11 +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 57K8EBkE073817; Wed, 20 Aug 2025 08:14:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K8EBrr073814; Wed, 20 Aug 2025 08:14:11 GMT (envelope-from git) Date: Wed, 20 Aug 2025 08:14:11 GMT Message-Id: <202508200814.57K8EBrr073814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c1ccb7d304fb - stable/14 - ufs_times_locked(): style 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c1ccb7d304fbaa28531c604318a6b50cd5f8ecc9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c1ccb7d304fbaa28531c604318a6b50cd5f8ecc9 commit c1ccb7d304fbaa28531c604318a6b50cd5f8ecc9 Author: Konstantin Belousov AuthorDate: 2025-08-17 14:03:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-20 08:09:35 +0000 ufs_times_locked(): style (cherry picked from commit 054c6e5b2fd629d651ce709e2916e13a0279309d) --- sys/ufs/ufs/ufs_vnops.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index bc62ad59ff00..4aed4f7db42c 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -161,27 +161,27 @@ ufs_itimes_locked(struct vnode *vp) if ((vp->v_type == VBLK || vp->v_type == VCHR) && !DOINGSOFTDEP(vp)) UFS_INODE_SET_FLAG(ip, IN_LAZYMOD); else if (((vp->v_mount->mnt_kern_flag & - (MNTK_SUSPENDED | MNTK_SUSPEND)) == 0) || - (ip->i_flag & (IN_CHANGE | IN_UPDATE))) + (MNTK_SUSPENDED | MNTK_SUSPEND)) == 0) || + (ip->i_flag & (IN_CHANGE | IN_UPDATE)) != 0) UFS_INODE_SET_FLAG(ip, IN_MODIFIED); - else if (ip->i_flag & IN_ACCESS) + else if ((ip->i_flag & IN_ACCESS) != 0) UFS_INODE_SET_FLAG(ip, IN_LAZYACCESS); vfs_timestamp(&ts); - if (ip->i_flag & IN_ACCESS) { + if ((ip->i_flag & IN_ACCESS) != 0) { DIP_SET(ip, i_atime, ts.tv_sec); DIP_SET(ip, i_atimensec, ts.tv_nsec); } - if (ip->i_flag & IN_UPDATE) { + if ((ip->i_flag & IN_UPDATE) != 0) { DIP_SET(ip, i_mtime, ts.tv_sec); DIP_SET(ip, i_mtimensec, ts.tv_nsec); } - if (ip->i_flag & IN_CHANGE) { + if ((ip->i_flag & IN_CHANGE) != 0) { DIP_SET(ip, i_ctime, ts.tv_sec); DIP_SET(ip, i_ctimensec, ts.tv_nsec); DIP_SET(ip, i_modrev, DIP(ip, i_modrev) + 1); } - out: +out: ip->i_flag &= ~(IN_ACCESS | IN_CHANGE | IN_UPDATE); } From nobody Wed Aug 20 08:50:10 2025 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 4c6KsH0rx9z64chS; Wed, 20 Aug 2025 08:50:11 +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 4c6KsH0C7Yz3kRF; Wed, 20 Aug 2025 08:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755679811; 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=YZAgIFN6vxi6SYRCcIBcZC0kCMMSNBZNe279TppmEk0=; b=Zewd3WE/w8+OWwjFTfVbK3WrDEXTS6ll462dfdxISHg1El8acVQNVdYcEh1dnltaR9NVp6 g8ODiSPsXE07K6myNsVyj9g1ZaoJ/1iyEus3nx7pNX/48KAJyRPe/VjGz0zdSlCy6LJYQ5 8rfGIe3qtClUIzi7Tr19y3xyoFri/HqJEE9kqwIxgF1dRXi+78+YpFEVLfVlp+pZOJ6Xzr Z76HE1wr1Ds3+cIjMV+MfHMj6A9qIDBTnqgbfsY2IFEv6agzTvZIrZ+OJ4xDpxP+uO7R8a 8Kw6oVr7CyC7Cyj3UxhOtDurLWsUfuMxZLo5kvsmPiGV47vC5lDuqS4r/JoD8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755679811; 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=YZAgIFN6vxi6SYRCcIBcZC0kCMMSNBZNe279TppmEk0=; b=OW4Q79wrJfhYWEjuon3F5szsqI8YiAPChkg0k7rIaTgOOYiflS+sl+5WSMqB/3gSxz2mVo m8DUKB8cNyvLADdKwOEh6b3ArsycbJw3/NGY3Tdfm/vIpnDTWVt9G+vNrd0Cu7T4QQfvCY Hh+3txZOhdbyTrd7basIjsDuSvd/vMJXrVJv0fercOJ1ZRXF6Vo1kRUrc3ltN2u6jPRegz PoATuowOW/WGO0v6o2TnXN7sZsVYztm3X0//z36nm9QMcAsGyL9in6pRb2alhct57LRDbI 8Ux7jJcsZggq3OhzNhDddyRiyqdt4omGqRfelaJwuY53xn7E1Zc7YVY7HCbTWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755679811; a=rsa-sha256; cv=none; b=cLNMT/HkheoU5fV9hGBI90zHWKdlRB7ru1Pq0eUbUNEbeRueCv4PjF4OawR5ybtIvm3xiN rqi5DIdSNHMialvJspj7o2imjNHQXPzfqsJbrLF8QhGf8uyowFpyh6HvEmSbzuu4OdAvgQ TqOkvRX5X6VEVjPAJhE0e1PDhXWFulvmRDLkZa9WMOxo4cmqeoO7zO3zFmsVntqXjIwkUF tjWTVOZXI1a1Q/ls9itq/S5wsI3KoAnKPX91mOGTLOqW2EVzfQI+Z/Kk/VyR+AChNkkpY2 YJOmSz9UGDFbLVxBRbU91d9WGa42YHpkvzO59lhns2VjKuRXq/U/Hu9Y/+1eig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6KsG6kbmz15Ps; Wed, 20 Aug 2025 08:50:10 +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 57K8oAq4036691; Wed, 20 Aug 2025 08:50:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K8oA3R036685; Wed, 20 Aug 2025 08:50:10 GMT (envelope-from git) Date: Wed, 20 Aug 2025 08:50:10 GMT Message-Id: <202508200850.57K8oA3R036685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7acae33bc950 - main - mlx5 ipsec: for tx, enable SN autoincrement whenever ESN is enabled 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7acae33bc950170cab718802c70978537a08b947 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7acae33bc950170cab718802c70978537a08b947 commit 7acae33bc950170cab718802c70978537a08b947 Author: Konstantin Belousov AuthorDate: 2025-08-07 07:24:22 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-20 08:49:50 +0000 mlx5 ipsec: for tx, enable SN autoincrement whenever ESN is enabled Sponsored by: Nvidia networking --- sys/dev/mlx5/mlx5_accel/mlx5_ipsec_offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec_offload.c b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec_offload.c index 978e5f25ceaf..cc0bc1f3fcd2 100644 --- a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec_offload.c +++ b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec_offload.c @@ -120,7 +120,7 @@ static void mlx5e_ipsec_packet_setup(void *obj, u32 pdn, switch (attrs->dir) { case IPSEC_DIR_OUTBOUND: - if (attrs->replay_esn.replay_window != 0) + if (attrs->replay_esn.trigger) MLX5_SET(ipsec_aso, aso_ctx, mode, MLX5_IPSEC_ASO_INC_SN); else MLX5_SET(ipsec_aso, aso_ctx, mode, MLX5_IPSEC_ASO_MODE); From nobody Wed Aug 20 09:01:43 2025 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 4c6L6c6RQSz64d7L; Wed, 20 Aug 2025 09:01:44 +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 4c6L6c6CKKz3lPW; Wed, 20 Aug 2025 09:01:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755680504; 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=R7dLmfIwXYHwdj9ToGr38TI0eRpnOpHctgA/n5BIxSs=; b=GNhGbOwCo9gLb6ecYNhTkq4vDdeyWK8O/YTfzgepY4DMPGT8vkuK73B2A8Ziqd7ifR9Ukm 22UX9Hp80q3OeH0UPUTPq9wuT6UJ1S55nIVPefr5VsCEfnzK3HAm4id8Ob5rC7Fp+wkT+r 1J14rmt5qQOezPYv790+D/QwTCHed0kQcKOOCsVnMv332fRDOiDtuQlWPOEd2H97oTLNgk ENGAFiU/OZVLqoA3uwUkKUb08USxEk0cT4gTk+uTAzLr5QuW86zkpDRqYM7SxnQxlYXMtW V7EQkrWfc7rW0uSOx1RFkh4+SQdc2UtpLW3TVnojy78CyLfZtMrjTsm1ZHxFJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755680504; 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=R7dLmfIwXYHwdj9ToGr38TI0eRpnOpHctgA/n5BIxSs=; b=YwaKTRox2HizO0z6XEfzLzvmz5BsGdnQ2egawTdubCDKwdH1vpCXwBPnkxgss9XTOJttyT CRl48PAAtqg4oztxPBG9Z7dMTTd+4H3/gz80Y7B0g/nWXcACexbDXGb4RCIMKd/rLGRsag mU09oPw0VDF3223WhZELteoe5T/5vE+dlvB7JqlbZzbRG841ujKvL27XPxr5PG/BmlZyBH ugXUEGLc0OMZ/klRNcE0snxrdc7CYB7JN7poZafNcVlqrsIHrcOlp0fSBsG9TOFJIt9NIn NYSkT9Aq/5SKCd4sepugWcYizWeKDVe9V3rDWlxrMrzdDQp8KbrCcxMUgm+YxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755680504; a=rsa-sha256; cv=none; b=kge+OsvlAxod/qjAJrYNQDH4tHaoe2HZOnl+DIpmO8jsrAz+BT/KYJMGMAMRuJeptV7/g6 ZySm7SVYgDWhW90xn3aKxgPKfhYdRMm9TJVs3Im2spxdKQvOtXdXhPC7eg19wqzcjtBO/r FO4bm8EWtvhgyhXva9mTMnACIcMpLLlr7JhlYjFz/wkH0BRd64glAJrakYD9COqpXkt3oD NTDdz8qrCI8uOPOrSTgOuCMDw/+vTW1pEvqGZKN8SzHoQDXhoE9buhHKIcBu6wCRvn3rvX 6Ot2wyS2YvFu5DhNOh+hyq0uyGuU9SGutnXrI+d0HMoYXOd/I5OxOSrjIU4JFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6L6c53C8z16QR; Wed, 20 Aug 2025 09:01:44 +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 57K91iDR061806; Wed, 20 Aug 2025 09:01:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K91hlO061803; Wed, 20 Aug 2025 09:01:43 GMT (envelope-from git) Date: Wed, 20 Aug 2025 09:01:43 GMT Message-Id: <202508200901.57K91hlO061803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 53a2e2635ab2 - main - zfs: merge openzfs/zfs@a9410ccbd 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53a2e2635ab2d17bed1de7b4e0d782dd23ceb6ea Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=53a2e2635ab2d17bed1de7b4e0d782dd23ceb6ea commit 53a2e2635ab2d17bed1de7b4e0d782dd23ceb6ea Merge: 7acae33bc950 a9410ccbd9f0 Author: Martin Matuska AuthorDate: 2025-08-20 08:57:58 +0000 Commit: Martin Matuska CommitDate: 2025-08-20 09:00:29 +0000 zfs: merge openzfs/zfs@a9410ccbd Notable upstream pull request merges: #17058 -multiple Port AVX2 implementation of aes-gcm from BoringSSL #17602 077269bfe Fix Assert in dbuf_undirty, which triggers during usage zap shrink #17613 d15143207 ZIL: Make allocations more flexible #17618 5061f959d Retire zfs_autoimport_disable kmod option #17166 d3c1d27af zdb: better handling for corrupt block pointers #17616 1ccae433e Allow vmem_alloc backed multilists #17619 e0e60d319 Better pack struct zio_prop #17620 152e34822 Silence zstd large allocation warning #17622 -multiple ZIL: restore some things lost in "ZIL-crash" review #17625 -multiple zvol: cleanup & fixup zvol destruction sequence and locking #17631 885d929cf Fix missed assertion update in physical rewrite patch #17642 a9410ccbd Make zpool_find_config() report errors #17647 30a915efe zfs-send.8: mention combination of -c/-e flags and zstd_compress feature #17649 2c877e845 FreeBSD: Set st_rdev to NODEV, not 0, when not a device (already backported) Obtained from: OpenZFS OpenZFS commit: a9410ccbd9f0375a7eeb6bc35eb55efe9c21493e sys/conf/kern.pre.mk | 3 +- .../.github/workflows/scripts/qemu-2-start.sh | 2 +- .../.github/workflows/scripts/qemu-4-build-vm.sh | 23 +- .../.github/workflows/zfs-qemu-packages.yml | 13 +- sys/contrib/openzfs/.mailmap | 4 + sys/contrib/openzfs/AUTHORS | 13 + sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 61 +- sys/contrib/openzfs/config/kernel-mkdir.m4 | 2 + sys/contrib/openzfs/config/toolchain-simd.m4 | 44 + sys/contrib/openzfs/contrib/debian/control | 8 +- .../openzfs/contrib/icp/gcm-simd/boringssl/LICENSE | 253 ++++ .../openzfs/contrib/icp/gcm-simd/boringssl/README | 11 + .../gcm-simd/boringssl/aes-gcm-avx2-x86_64-linux.S | 1328 ++++++++++++++++++++ sys/contrib/openzfs/contrib/initramfs/scripts/zfs | 3 +- .../include/os/linux/kernel/linux/simd_x86.h | 26 + .../openzfs/include/os/linux/zfs/sys/trace_zil.h | 6 +- sys/contrib/openzfs/include/sys/spa.h | 2 - sys/contrib/openzfs/include/sys/zil_impl.h | 18 +- sys/contrib/openzfs/include/sys/zio.h | 29 +- sys/contrib/openzfs/include/sys/zvol_impl.h | 5 +- sys/contrib/openzfs/lib/libicp/Makefile.am | 1 + sys/contrib/openzfs/lib/libspl/include/sys/simd.h | 28 +- sys/contrib/openzfs/lib/libzpool/kernel.c | 75 ++ sys/contrib/openzfs/lib/libzutil/zutil_import.c | 39 +- sys/contrib/openzfs/man/man4/zfs.4 | 4 - sys/contrib/openzfs/man/man8/zdb.8 | 14 +- sys/contrib/openzfs/man/man8/zfs-send.8 | 24 +- sys/contrib/openzfs/module/Kbuild.in | 1 + sys/contrib/openzfs/module/icp/algs/modes/gcm.c | 371 ++++-- sys/contrib/openzfs/module/icp/algs/modes/modes.c | 2 +- .../asm-x86_64/modes/THIRDPARTYLICENSE.boringssl | 253 ++++ .../modes/THIRDPARTYLICENSE.boringssl.descrip | 1 + .../icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S | 1323 +++++++++++++++++++ .../openzfs/module/icp/include/modes/modes.h | 13 +- .../openzfs/module/os/freebsd/zfs/kmod_core.c | 7 - .../openzfs/module/os/freebsd/zfs/zvol_os.c | 210 ++-- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 153 ++- sys/contrib/openzfs/module/zcommon/simd_stat.c | 4 + sys/contrib/openzfs/module/zfs/dbuf.c | 7 +- sys/contrib/openzfs/module/zfs/multilist.c | 4 +- sys/contrib/openzfs/module/zfs/spa_config.c | 115 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 8 - sys/contrib/openzfs/module/zfs/zil.c | 349 +++-- sys/contrib/openzfs/module/zfs/zio.c | 51 +- sys/contrib/openzfs/module/zfs/zvol.c | 281 ++--- sys/contrib/openzfs/module/zstd/zfs_zstd.c | 8 +- sys/contrib/openzfs/scripts/spdxcheck.pl | 1 + sys/contrib/openzfs/tests/runfiles/common.run | 2 +- .../openzfs/tests/zfs-tests/cmd/crypto_test.c | 2 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + .../zvol/zvol_stress/zvol_stress_destroy.ksh | 66 + sys/modules/zfs/Makefile | 3 +- sys/modules/zfs/zfs_config.h | 16 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 55 files changed, 4519 insertions(+), 776 deletions(-) diff --cc sys/conf/kern.pre.mk index 78178065e15b,000000000000..1fcfd6467e7f mode 100644,000000..100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@@ -1,351 -1,0 +1,352 @@@ + +# Part of a unified Makefile for building kernels. This part contains all +# of the definitions that need to be before %BEFORE_DEPEND. + +# Allow user to configure things that only effect src tree builds. +# Note: This is duplicated from src.sys.mk to ensure that we include +# /etc/src.conf when building the kernel. Kernels can be built without +# the rest of /usr/src, but they still always process SRCCONF even though +# the normal mechanisms to prevent that (compiling out of tree) won't +# work. To ensure they do work, we have to duplicate thee few lines here. +SRCCONF?= /etc/src.conf +.if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_) +.include "${SRCCONF}" +_srcconf_included_: +.endif + +.include +.include +.include "kern.opts.mk" +.-include + +# The kernel build always occurs in the object directory which is .CURDIR. +.if ${.MAKE.MODE:Unormal:Mmeta} +.MAKE.MODE+= curdirOk=yes +.endif + +# The kernel build always expects .OBJDIR=.CURDIR. +.OBJDIR: ${.CURDIR} + +.if defined(NO_OBJWALK) || ${MK_AUTO_OBJ} == "yes" +NO_OBJWALK= t +NO_MODULES_OBJ= t +.endif +.if !defined(NO_OBJWALK) +_obj= obj +.endif + +# Can be overridden by makeoptions or /etc/make.conf +KERNEL_KO?= kernel +KERNEL?= kernel +KODIR?= /boot/${KERNEL} +LDSCRIPT_NAME?= ldscript.$M +LDSCRIPT?= $S/conf/${LDSCRIPT_NAME} + +M= ${MACHINE} + +AWK?= awk +CP?= cp +ELFDUMP?= elfdump +NM?= nm +OBJCOPY?= objcopy +SIZE?= size + +.if defined(DEBUG) +CTFFLAGS+= -g +.endif +.if ${MACHINE_CPUARCH} == "amd64" && ${COMPILER_TYPE} != "clang" +_COPTFLAGS_EXTRA=-frename-registers +.else +_COPTFLAGS_EXTRA= +.endif +COPTFLAGS?=-O2 -pipe ${_COPTFLAGS_EXTRA} +.if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing) +COPTFLAGS+= -fno-strict-aliasing +.endif +.if !defined(NO_CPU_COPTFLAGS) +COPTFLAGS+= ${_CPUCFLAGS} +.endif +NOSTDINC= -nostdinc + +INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S -I$S/contrib/ck/include + +CFLAGS= ${COPTFLAGS} ${DEBUG} +CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h +CFLAGS_PARAM_INLINE_UNIT_GROWTH?=100 +CFLAGS_PARAM_LARGE_FUNCTION_GROWTH?=1000 +CFLAGS.gcc+= -fms-extensions -finline-limit=${INLINE_LIMIT} +CFLAGS.gcc+= --param inline-unit-growth=${CFLAGS_PARAM_INLINE_UNIT_GROWTH} +CFLAGS.gcc+= --param large-function-growth=${CFLAGS_PARAM_LARGE_FUNCTION_GROWTH} +CFLAGS.gcc+= -fms-extensions +.if defined(CFLAGS_ARCH_PARAMS) +CFLAGS.gcc+=${CFLAGS_ARCH_PARAMS} +.endif +WERROR?= -Werror +# The following should be removed no earlier than LLVM11 being imported into the +# tree, to ensure we don't regress the build. LLVM11 and GCC10 will switch the +# default over to -fno-common, making this redundant. +CFLAGS+= -fno-common + +# XXX LOCORE means "don't declare C stuff" not "for locore.s". +ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} ${ASM_CFLAGS.${.IMPSRC:T}} + +COMPAT_FREEBSD32_ENABLED!= grep COMPAT_FREEBSD32 opt_global.h || true ; echo + +KASAN_ENABLED!= grep KASAN opt_global.h || true ; echo +KCSAN_ENABLED!= grep KCSAN opt_global.h || true ; echo +KMSAN_ENABLED!= grep KMSAN opt_global.h || true ; echo +KUBSAN_ENABLED!= grep KUBSAN opt_global.h || true ; echo +COVERAGE_ENABLED!= grep COVERAGE opt_global.h || true ; echo + +GCOV_ENABLED!= grep GCOV opt_global.h || true ; echo +.if !empty(GCOV_ENABLED) +.if ${COMPILER_TYPE} == "gcc" +GCOV_CFLAGS+= -fprofile-arcs -ftest-coverage +.endif +.endif + +CFLAGS+= ${GCOV_CFLAGS} + +# Put configuration-specific C flags last so that they can override +# the others. +CFLAGS+= ${CONF_CFLAGS} + +.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id} +LDFLAGS+= --build-id=sha1 +.endif + +.if (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ + ${MACHINE_CPUARCH} == "i386" || ${MACHINE} == "powerpc") && \ + defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == "" && \ + !make(install) +.error amd64/arm64/i386/ppc* kernel requires linker ifunc support +.endif +.if ${MACHINE_CPUARCH} == "amd64" +LDFLAGS+= -z max-page-size=2097152 +.if ${LINKER_TYPE} != "lld" +LDFLAGS+= -z common-page-size=4096 +.else +.if defined(LINKER_FEATURES) && !${LINKER_FEATURES:Mifunc-noplt} +.warning "Linker ${LD} does not support -z ifunc-noplt -> ifunc calls are unoptimized." +.else +LDFLAGS+= -z notext -z ifunc-noplt +.endif +.endif +.endif # ${MACHINE_CPUARCH} == "amd64" + +.if ${MACHINE_CPUARCH} == "riscv" +# Hack: Work around undefined weak symbols being out of range when linking with +# LLD (address is a PC-relative calculation, and BFD works around this by +# rewriting the instructions to generate an absolute address of 0); -fPIE +# avoids this since it uses the GOT for all extern symbols, which is overly +# inefficient for us. Drop once undefined weak symbols work with medany. +.if ${LINKER_TYPE} == "lld" +CFLAGS+= -fPIE +.endif +.endif + +NORMAL_C= ${CC} -c ${CFLAGS} ${WERROR} ${.IMPSRC} +NORMAL_S= ${CC:N${CCACHE_BIN}} -c ${ASM_CFLAGS} ${WERROR} ${.IMPSRC} +NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${.IMPSRC} + +NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \ + ${CC} -c ${CFLAGS} ${WERROR} ${.PREFIX}.c + +NORMAL_FW= uudecode -o ${.TARGET} ${.ALLSRC} +NORMAL_FWO= ${CC:N${CCACHE_BIN}} -c ${ASM_CFLAGS} ${WERROR} -o ${.TARGET} \ + $S/kern/firmw.S -DFIRMW_FILE=\""${.ALLSRC:M*.fw}"\" \ + -DFIRMW_SYMBOL="${.ALLSRC:M*.fw:C/[-.\/]/_/g}" + +# Remove sanitizer arguments. Some -fno-sanitize* and -fasan-shadow-offset* +# arguments become an error if the appropriate sanitizer is not enabled. +NOSAN_C= ${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-fasan-shadow-offset*} + +# for ZSTD in the kernel (include zstd/lib/freebsd before other CFLAGS) +ZSTD_C= ${CC} -c -DZSTD_HEAPMODE=1 -I$S/contrib/zstd/lib/freebsd ${CFLAGS} \ + -I$S/contrib/zstd/lib -I$S/contrib/zstd/lib/common ${WERROR} \ + -Wno-missing-prototypes -U__BMI__ -DZSTD_NO_INTRINSICS ${.IMPSRC} +# https://github.com/facebook/zstd/commit/812e8f2a [zstd 1.4.1] +# "Note that [GCC] autovectorization still does not do a good job on the +# optimized version, so it's turned off via attribute and flag. I found +# that neither attribute nor command-line flag were entirely successful in +# turning off vectorization, which is why there were both." +.if ${COMPILER_TYPE} == "gcc" +ZSTD_DECOMPRESS_BLOCK_FLAGS= -fno-tree-vectorize +.endif + +ZINCDIR=$S/contrib/openzfs/include +# Common for dtrace / zfs +CDDL_CFLAGS= \ + -DFREEBSD_NAMECACHE \ + -D_SYS_VMEM_H_ \ + -D__KERNEL \ + -D__KERNEL__ \ + -nostdinc \ + -include $S/modules/zfs/static_ccompile.h \ + -I${ZINCDIR} \ + -I${ZINCDIR}/os/freebsd \ + -I${ZINCDIR}/os/freebsd/spl \ + -I${ZINCDIR}/os/freebsd/zfs \ + -I$S/modules/zfs \ + -I$S/contrib/openzfs/module/zstd/include \ + ${CFLAGS} \ + -Wno-cast-qual \ + -Wno-duplicate-decl-specifier \ + -Wno-missing-braces \ + -Wno-missing-prototypes \ + -Wno-parentheses \ + -Wno-pointer-arith \ + -Wno-strict-prototypes \ + -Wno-switch \ + -Wno-undef \ + -Wno-uninitialized \ + -Wno-unknown-pragmas \ + -Wno-unused \ + -include ${ZINCDIR}/os/freebsd/spl/sys/ccompile.h \ + -I$S/cddl/contrib/opensolaris/uts/common \ + -I$S -I$S/cddl/compat/opensolaris +CDDL_C= ${CC} -c ${CDDL_CFLAGS} ${WERROR} ${.IMPSRC} + +# Special flags for managing the compat compiles for ZFS +ZFS_CFLAGS+= -I$S/contrib/openzfs/module/icp/include \ + ${CDDL_CFLAGS} -DBUILDING_ZFS -DHAVE_UIO_ZEROCOPY \ + -DWITH_NETDUMP -D__KERNEL__ -D_SYS_CONDVAR_H_ -DSMP + +.if ${MACHINE_ARCH} == "amd64" +ZFS_CFLAGS+= -D__x86_64 -DHAVE_SSE2 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 \ - -DHAVE_AVX -DHAVE_AVX2 -DHAVE_AVX512F -DHAVE_AVX512VL -DHAVE_AVX512BW ++ -DHAVE_AVX -DHAVE_AVX2 -DHAVE_AVX512F -DHAVE_AVX512VL -DHAVE_AVX512BW \ ++ -DHAVE_VAES -DHAVE_VPCLMULQDQ +.endif + +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ + ${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm" +ZFS_CFLAGS+= -DBITS_PER_LONG=32 +.else +ZFS_CFLAGS+= -DBITS_PER_LONG=64 +.endif + + +ZFS_ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${ZFS_CFLAGS} +ZFS_C= ${CC} -c ${ZFS_CFLAGS} ${WERROR} ${.IMPSRC} +ZFS_RPC_C= ${CC} -c ${ZFS_CFLAGS} -DHAVE_RPC_TYPES ${WERROR} ${.IMPSRC} +ZFS_S= ${CC} -c ${ZFS_ASM_CFLAGS} ${WERROR} ${.IMPSRC} + +# ATH driver +ATH_CFLAGS= -I${SRCTOP}/sys/dev/ath ${NO_WUNUSED_BUT_SET_VARIABLE} +ATH_C= ${CC} -c ${CFLAGS} ${WERROR} ${ATH_CFLAGS} ${.IMPSRC} + +# Special flags for managing the compat compiles for DTrace +DTRACE_CFLAGS= -DBUILDING_DTRACE ${CDDL_CFLAGS} -I$S/cddl/dev/dtrace -I$S/cddl/dev/dtrace/${MACHINE_CPUARCH} +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +DTRACE_CFLAGS+= -I$S/cddl/contrib/opensolaris/uts/intel -I$S/cddl/dev/dtrace/x86 +.endif +DTRACE_CFLAGS+= -I$S/cddl/contrib/opensolaris/common/util -I$S -DDIS_MEM -DSMP -I$S/cddl/compat/opensolaris +DTRACE_CFLAGS+= -I$S/cddl/contrib/opensolaris/uts/common +DTRACE_ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${DTRACE_CFLAGS} +DTRACE_C= ${CC} -c ${DTRACE_CFLAGS} ${WERROR} ${.IMPSRC} +DTRACE_S= ${CC} -c ${DTRACE_ASM_CFLAGS} ${WERROR} ${.IMPSRC} + +# zlib code supports systems that are quite old, but will fix this issue once C2x gets radified. +# see https://github.com/madler/zlib/issues/633 for details +ZLIB_CFLAGS= -Wno-cast-qual ${NO_WDEPRECATED_NON_PROTOTYPE} ${NO_WSTRICT_PROTOTYPES} +ZLIB_C= ${CC} -c ${CFLAGS} ${WERROR} ${ZLIB_CFLAGS} ${.IMPSRC} + +# Special flags for managing the compat compiles for DTrace/FBT +FBT_CFLAGS= -DBUILDING_DTRACE -nostdinc -I$S/cddl/dev/fbt/${MACHINE_CPUARCH} -I$S/cddl/dev/fbt ${CDDL_CFLAGS} -I$S/cddl/compat/opensolaris -I$S/cddl/contrib/opensolaris/uts/common +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +FBT_CFLAGS+= -I$S/cddl/dev/fbt/x86 +.endif +FBT_C= ${CC} -c ${FBT_CFLAGS} ${WERROR} ${.IMPSRC} + +.if ${MK_CTF} != "no" +NORMAL_CTFCONVERT= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.elif ${MAKE_VERSION} >= 5201111300 +NORMAL_CTFCONVERT= +.else +NORMAL_CTFCONVERT= @: +.endif + +# Linux Kernel Programming Interface C-flags +LINUXKPI_INCLUDES= -I$S/compat/linuxkpi/common/include \ + -I$S/compat/linuxkpi/dummy/include \ + -include $S/compat/linuxkpi/common/include/linux/kconfig.h +LINUXKPI_C= ${NORMAL_C} ${LINUXKPI_INCLUDES} + +# Infiniband C flags. Correct include paths and omit errors that linux +# does not honor. +OFEDINCLUDES= -I$S/ofed/include -I$S/ofed/include/uapi ${LINUXKPI_INCLUDES} +OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith +OFEDCFLAGS= ${CFLAGS:N-I*} -DCONFIG_INFINIBAND_USER_MEM \ + ${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR} +OFED_C_NOIMP= ${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR} +OFED_C= ${OFED_C_NOIMP} ${.IMPSRC} + +# mlxfw C flags. +MLXFW_C= ${OFED_C_NOIMP} \ + -I${SRCTOP}/sys/contrib/xz-embedded/freebsd \ + -I${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz \ + ${.IMPSRC} +# BNXT Driver +BNXT_CFLAGS= -I$S/dev/bnxt/bnxt_en ${OFEDCFLAGS} +BNXT_C_NOIMP= ${CC} -c -o ${.TARGET} ${BNXT_CFLAGS} ${WERROR} +BNXT_C= ${BNXT_C_NOIMP} ${.IMPSRC} + +# IP Filter +IPFILTER_CFLAGS= -I$S/netpfil/ipfilter +IPFILTER_C= ${NORMAL_C} ${IPFILTER_CFLAGS} + +GEN_CFILES= $S/$M/$M/genassym.c ${MFILES:T:S/.m$/.c/} +SYSTEM_CFILES= config.c env.c hints.c vnode_if.c +SYSTEM_DEP= Makefile ${SYSTEM_OBJS} +SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS} +SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o} +SYSTEM_OBJS+= force-dynamic-hack.pico + +KEYMAP=kbdcontrol -P ${SRCTOP}/share/vt/keymaps -P ${SRCTOP}/share/syscons/keymaps +KEYMAP_FIX=sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' + +MD_ROOT_SIZE_CONFIGURED!= grep MD_ROOT_SIZE opt_md.h || true ; echo +.if ${MFS_IMAGE:Uno} != "no" +.if empty(MD_ROOT_SIZE_CONFIGURED) +SYSTEM_OBJS+= embedfs_${MFS_IMAGE:T:R}.o +.endif +.endif +SYSTEM_LD_BASECMD= \ + ${LD} -m ${LD_EMULATION} -Bdynamic -L $S/conf -T ${LDSCRIPT} ${_LDFLAGS} \ + --no-warn-mismatch --warn-common --export-dynamic \ + --dynamic-linker /red/herring -X +SYSTEM_LD= @${SYSTEM_LD_BASECMD} -o ${.TARGET} ${SYSTEM_OBJS} vers.o +SYSTEM_LD_TAIL= @${SIZE} ${.TARGET} ; chmod 755 ${.TARGET} +SYSTEM_DEP+= ${LDSCRIPT} + +# Calculate path for .m files early, if needed. +.if !defined(NO_MODULES) && !defined(__MPATH) && !make(install) && \ + (empty(.MAKEFLAGS:M-V) || defined(NO_SKIP_MPATH)) +__MPATH!=find ${S:tA}/ -name \*_if.m +.endif + +# MKMODULESENV is set here so that port makefiles can augment +# them. + +MKMODULESENV+= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} +MKMODULESENV+= MACHINE_CPUARCH=${MACHINE_CPUARCH} +MKMODULESENV+= MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} +MKMODULESENV+= MODULES_EXTRA="${MODULES_EXTRA}" WITHOUT_MODULES="${WITHOUT_MODULES}" +MKMODULESENV+= ARCH_FLAGS="${ARCH_FLAGS}" +.if (${KERN_IDENT} == LINT) +MKMODULESENV+= ALL_MODULES=LINT +.endif +.if defined(MODULES_OVERRIDE) +MKMODULESENV+= MODULES_OVERRIDE="${MODULES_OVERRIDE}" +.endif +.if defined(DEBUG) +MKMODULESENV+= DEBUG_FLAGS="${DEBUG}" +.endif +.if !defined(NO_MODULES) +MKMODULESENV+= __MPATH="${__MPATH}" +.endif + +# Detect kernel config options that force stack frames to be turned on. +DDB_ENABLED!= grep DDB opt_ddb.h || true ; echo +DTRACE_ENABLED!=grep KDTRACE_FRAME opt_kdtrace.h || true ; echo +HWPMC_ENABLED!= grep HWPMC opt_hwpmc_hooks.h || true ; echo diff --cc sys/contrib/openzfs/.mailmap index b6d942c000b8,000000000000..e6f09c6c9d43 mode 100644,000000..100644 --- a/sys/contrib/openzfs/.mailmap +++ b/sys/contrib/openzfs/.mailmap @@@ -1,225 -1,0 +1,229 @@@ +# This file maps the name+email seen in a commit back to a canonical +# name+email. Git will replace the commit name/email with the canonical version +# wherever it sees it. +# +# If there is a commit in the history with a "wrong" name or email, list it +# here. If you regularly commit with an alternate name or email address and +# would like to ensure that you are always listed consistently in the repo, add +# mapping here. +# +# On the other hand, if you use multiple names or email addresses legitimately +# (eg you use a company email address for your paid OpenZFS work, and a +# personal address for your evening side projects), then don't map one to the +# other here. +# +# The most common formats are: +# +# Canonical Name +# Canonical Name +# Canonical Name Commit Name +# +# See https://git-scm.com/docs/gitmailmap for more info. + +# These maps are making names consistent where they have varied but the email +# address has never changed. In most cases, the full name is in the +# Signed-off-by of a commit with a matching author. ++Achill Gilgenast +Ahelenia Ziemiańska +Ahelenia Ziemiańska +Alex John +Andreas Dilger +Andrew Walker +Benedikt Neuffer +Chengfei Zhu +ChenHao Lu <18302010006@fudan.edu.cn> +Chris Lindee +Colm Buckley +Crag Wang +Damian Szuberski +Daniel Kolesa +Debabrata Banerjee ++Diwakar Kristappagari +Finix Yan +Gaurav Kumar +Gionatan Danti +Glenn Washburn +Gordan Bobic +Gregory Bartholomew +hedong zhang +Ilkka Sovanto +InsanePrawn +Jason Cohen +Jason Harmening +Jeremy Faulkner +Jinshan Xiong +John Poduska +Justin Scholz +Ka Ho Ng +Kash Pande +Kay Pedersen +KernelOfTruth +Liu Hua +Liu Qing +loli10K +Mart Frauenlob +Matthias Blankertz +Michael Gmelin +Olivier Mazouffre +Piotr Kubaj +Quentin Zdanis +Roberto Ricci +Rob Norris +Rob Norris +Sam Lunt +Sanjeev Bagewadi +Sebastian Wuerl +SHENGYI HONG +Stoiko Ivanov +Tamas TEVESZ +WHR +Yanping Gao +Youzhong Yang + +# Signed-off-by: overriding Author: +Alexander Ziaee +Felix Schmidt +Olivier Certner +Phil Sutter +poscat +Qiuhao Chen +Ryan +Sietse +Yuxin Wang +Zhenlei Huang + +# Commits from strange places, long ago +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Herb Wartens +Ned Bass +Tulsi Jain + +# Mappings from Github no-reply addresses +ajs124 +Alek Pinchuk +Aleksandr Liber <61714074+AleksandrLiber@users.noreply.github.com> +Alexander Lobakin +Alexey Smirnoff +Allen Holl <65494904+allen-4@users.noreply.github.com> +Alphan Yılmaz +Ameer Hamza <106930537+ixhamza@users.noreply.github.com> +Andrew J. Hesford <48421688+ahesford@users.noreply.github.com>> +Andrew Sun +Aron Xu +Arun KV <65647132+arun-kv@users.noreply.github.com> +Ben Wolsieffer +bernie1995 <42413912+bernie1995@users.noreply.github.com> +Bojan Novković <72801811+bnovkov@users.noreply.github.com> +Boris Protopopov +Brad Forschinger +Brandon Thetford +buzzingwires <131118055+buzzingwires@users.noreply.github.com> +Cedric Maunoury <38213715+cedricmaunoury@users.noreply.github.com> +Charles Suh +Chris Peredun <126915832+chrisperedun@users.noreply.github.com> +Dacian Reece-Stremtan <35844628+dacianstremtan@users.noreply.github.com> +Damian Szuberski <30863496+szubersk@users.noreply.github.com> +Daniel Hiepler <32984777+heeplr@users.noreply.github.com> +Daniel Kobras +Daniel Reichelt +David Quigley +Dennis R. Friedrichsen <31087738+dennisfriedrichsen@users.noreply.github.com> +Dex Wood +DHE +Dmitri John Ledkov <19779+xnox@users.noreply.github.com> +Dries Michiels <32487486+driesmp@users.noreply.github.com> +Edmund Nadolski <137826107+ednadolski-ix@users.noreply.github.com> +Érico Nogueira <34201958+ericonr@users.noreply.github.com> +Fedor Uporov <60701163+fuporovvStack@users.noreply.github.com> +Felix Dörre +Felix Neumärker <34678034+xdch47@users.noreply.github.com> +Finix Yan +Friedrich Weber <56110206+frwbr@users.noreply.github.com> +Gaurav Kumar +George Gaydarov +Georgy Yakovlev <168902+gyakovlev@users.noreply.github.com> +Gerardwx ++Germano Massullo +Gian-Carlo DeFazio +Giuseppe Di Natale +Hajo Möller +Harry Mallon <1816667+hjmallon@users.noreply.github.com> +Hiếu Lê +Jake Howard +James Cowgill +Jaron Kent-Dobias +Jason King +Jeff Dike <52420226+jdike@users.noreply.github.com> +Jitendra Patidar <53164267+jsai20@users.noreply.github.com> +João Carlos Mendes Luís +John Eismeier <32205350+jeis2497052@users.noreply.github.com> +John L. Hammond <35266395+jhammond-intel@users.noreply.github.com> +John-Mark Gurney +John Ramsden +Jonathon Fernyhough <559369+jonathonf@users.noreply.github.com> +Jose Luis Duran +Justin Hibbits ++Kaitlin Hoang +Kevin Greene <104801862+kxgreene@users.noreply.github.com> +Kevin Jin <33590050+jxdking@users.noreply.github.com> +Kevin P. Fleming +Krzysztof Piecuch <3964215+pikrzysztof@users.noreply.github.com> +Kyle Evans +Laurențiu Nicola +loli10K +Lorenz Hüdepohl +Luís Henriques <73643340+lumigch@users.noreply.github.com> +Marcin Skarbek +Matt Fiddaman <81489167+matt-fidd@users.noreply.github.com> +Maxim Filimonov +Max Zettlmeißl <6818198+maxz@users.noreply.github.com> +Michael Niewöhner +Michael Zhivich <33133421+mzhivich@users.noreply.github.com> +MigeljanImeri <78048439+MigeljanImeri@users.noreply.github.com> +Mo Zhou <5723047+cdluminate@users.noreply.github.com> +Nick Mattis +omni <79493359+omnivagant@users.noreply.github.com> +Pablo Correa Gómez <32678034+pablofsf@users.noreply.github.com> +Paul Zuchowski <31706010+PaulZ-98@users.noreply.github.com> +Peter Ashford +Peter Dave Hello +Peter Wirdemo <4224155+pewo@users.noreply.github.com> +Petros Koutoupis +Ping Huang <101400146+hpingfs@users.noreply.github.com> +Piotr P. Stefaniak +Richard Allen <33836503+belperite@users.noreply.github.com> +Rich Ercolani <214141+rincebrain@users.noreply.github.com> +Rick Macklem <64620010+rmacklem@users.noreply.github.com> +Rob Wing <98866084+rob-wing@users.noreply.github.com> +Roman Strashkin +Ryan Hirasaki <4690732+RyanHir@users.noreply.github.com> +Samuel Wycliffe J <115969550+samwyc@users.noreply.github.com> +Samuel Wycliffe <50765275+npc203@users.noreply.github.com> +Savyasachee Jha +Scott Colby +Sean Eric Fagan +Spencer Kinny <30333052+Spencer-Kinny@users.noreply.github.com> +Srikanth N S <75025422+nssrikanth@users.noreply.github.com> +Stefan Lendl <1321542+stfl@users.noreply.github.com> +Thomas Bertschinger <101425190+bertschinger@users.noreply.github.com> +Thomas Geppert +Tim Crawford +Todd Seidelmann <18294602+seidelma@users.noreply.github.com> +Tom Matthews +Tony Perkins <62951051+tony-zfs@users.noreply.github.com> +Torsten Wörtwein +Tulsi Jain +Václav Skála <33496485+vaclavskala@users.noreply.github.com> +Vaibhav Bhanawat <88050553+vaibhav-delphix@users.noreply.github.com> +Vandana Rungta <46906819+vandanarungta@users.noreply.github.com> +Violet Purcell <66446404+vimproved@users.noreply.github.com> +Vipin Kumar Verma <75025470+vermavipinkumar@users.noreply.github.com> +Wolfgang Bumiller +XDTG <35128600+XDTG@users.noreply.github.com> +xtouqh <72357159+xtouqh@users.noreply.github.com> +Yuri Pankov <113725409+yuripv@users.noreply.github.com> +Yuri Pankov <82001006+yuripv@users.noreply.github.com> diff --cc sys/contrib/openzfs/contrib/icp/gcm-simd/boringssl/LICENSE index 000000000000,04c03a37e0cb..04c03a37e0cb mode 000000,100644..100644 --- a/sys/contrib/openzfs/contrib/icp/gcm-simd/boringssl/LICENSE +++ b/sys/contrib/openzfs/contrib/icp/gcm-simd/boringssl/LICENSE diff --cc sys/contrib/openzfs/contrib/icp/gcm-simd/boringssl/README index 000000000000,aa6fb6d477fa..aa6fb6d477fa mode 000000,100644..100644 --- a/sys/contrib/openzfs/contrib/icp/gcm-simd/boringssl/README +++ b/sys/contrib/openzfs/contrib/icp/gcm-simd/boringssl/README diff --cc sys/contrib/openzfs/contrib/icp/gcm-simd/boringssl/aes-gcm-avx2-x86_64-linux.S index 000000000000,e7327c9de872..e7327c9de872 mode 000000,100644..100644 --- a/sys/contrib/openzfs/contrib/icp/gcm-simd/boringssl/aes-gcm-avx2-x86_64-linux.S +++ b/sys/contrib/openzfs/contrib/icp/gcm-simd/boringssl/aes-gcm-avx2-x86_64-linux.S diff --cc sys/contrib/openzfs/module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.boringssl index 000000000000,04c03a37e0cb..04c03a37e0cb mode 000000,100644..100644 --- a/sys/contrib/openzfs/module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.boringssl +++ b/sys/contrib/openzfs/module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.boringssl diff --cc sys/contrib/openzfs/module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.boringssl.descrip index 000000000000,f63a67a4d2ae..f63a67a4d2ae mode 000000,100644..100644 --- a/sys/contrib/openzfs/module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.boringssl.descrip +++ b/sys/contrib/openzfs/module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.boringssl.descrip diff --cc sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S index 000000000000,3d1b045127e2..3d1b045127e2 mode 000000,100644..100644 --- a/sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S +++ b/sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_stress/zvol_stress_destroy.ksh index 000000000000,669b59fac01f..669b59fac01f mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_stress/zvol_stress_destroy.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_stress/zvol_stress_destroy.ksh diff --cc sys/modules/zfs/Makefile index 2dd9e2be3f56,000000000000..0dc85e3fa684 mode 100644,000000..100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@@ -1,533 -1,0 +1,534 @@@ +SRCDIR=${SRCTOP}/sys/contrib/openzfs/module +INCDIR=${SRCTOP}/sys/contrib/openzfs/include + +KMOD= zfs + +.PATH: ${SRCDIR}/avl \ + ${SRCDIR}/lua \ + ${SRCDIR}/nvpair \ + ${SRCDIR}/icp/algs/blake3 \ + ${SRCDIR}/icp/algs/edonr \ + ${SRCDIR}/icp/algs/sha2 \ + ${SRCDIR}/icp/asm-aarch64/blake3 \ + ${SRCDIR}/icp/asm-aarch64/sha2 \ + ${SRCDIR}/icp/asm-arm/sha2 \ + ${SRCDIR}/icp/asm-ppc64/sha2 \ + ${SRCDIR}/icp/asm-ppc64/blake3 \ + ${SRCDIR}/icp/asm-x86_64/blake3 \ + ${SRCDIR}/icp/asm-x86_64/sha2 \ + ${SRCDIR}/os/freebsd/spl \ + ${SRCDIR}/os/freebsd/zfs \ + ${SRCDIR}/unicode \ + ${SRCDIR}/zcommon \ + ${SRCDIR}/zfs \ + ${SRCDIR}/zstd \ + ${SRCDIR}/zstd/lib/common \ + ${SRCDIR}/zstd/lib/compress \ + ${SRCDIR}/zstd/lib/decompress + +CFLAGS+= -I${INCDIR} +CFLAGS+= -I${SRCDIR}/icp/include +CFLAGS+= -I${INCDIR}/os/freebsd +CFLAGS+= -I${INCDIR}/os/freebsd/spl +CFLAGS+= -I${INCDIR}/os/freebsd/zfs +CFLAGS+= -I${SRCDIR}/zstd/include +CFLAGS+= -I${.CURDIR} + +CFLAGS+= -D__KERNEL__ -DFREEBSD_NAMECACHE -DBUILDING_ZFS \ + -DHAVE_UIO_ZEROCOPY -DWITHOUT_NETDUMP -D__KERNEL -D_SYS_CONDVAR_H_ \ + -D_SYS_VMEM_H_ + +.if ${MACHINE_ARCH} == "amd64" +CFLAGS+= -D__x86_64 -DHAVE_SSE2 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 \ - -DHAVE_AVX -DHAVE_AVX2 -DHAVE_AVX512F -DHAVE_AVX512VL -DHAVE_AVX512BW ++ -DHAVE_AVX -DHAVE_AVX2 -DHAVE_AVX512F -DHAVE_AVX512VL -DHAVE_AVX512BW \ ++ -DHAVE_VAES HAVE_VPCLMULQDQ +.endif + +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ + ${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm" +CFLAGS+= -DBITS_PER_LONG=32 +.else +CFLAGS+= -DBITS_PER_LONG=64 +.endif + +SRCS= vnode_if.h device_if.h bus_if.h + +# avl +SRCS+= avl.c + +# icp +SRCS+= edonr.c + +#icp/algs/blake3 +SRCS+= blake3.c \ + blake3_generic.c \ + blake3_impl.c + + +.if ${MACHINE_ARCH} == "aarch64" +#icp/asm-aarch64/blake3 +SRCS+= b3_aarch64_sse2.S \ + b3_aarch64_sse41.S +.endif + +.if ${MACHINE_ARCH} == "powerpc64le" +#icp/asm-ppc64/blake3 +SRCS+= b3_ppc64le_sse2.S \ + b3_ppc64le_sse41.S +.endif + +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +#icp/asm-x86_64/blake3 +SRCS+= blake3_avx2.S \ + blake3_avx512.S \ + blake3_sse2.S \ + blake3_sse41.S +.endif + +#icp/algs/sha2 +SRCS+= sha2_generic.c \ + sha256_impl.c \ + sha512_impl.c + +.if ${MACHINE_ARCH} == "armv7" +#icp/asm-arm/sha2 +SRCS+= sha256-armv7.S \ + sha512-armv7.S +.endif + +.if ${MACHINE_ARCH} == "aarch64" +#icp/asm-aarch64/sha2 +OBJS+= zfs-sha256-armv8.o \ + zfs-sha512-armv8.o +.endif + +.if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc64le" +#icp/asm-ppc64/sha2 +SRCS+= sha256-p8.S \ + sha512-p8.S \ + sha256-ppc.S \ + sha512-ppc.S +.endif + +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +#icp/asm-x86_64/sha2 +OBJS+= zfs-sha256-x86_64.o \ + zfs-sha512-x86_64.o +.endif + +#lua +SRCS+= lapi.c \ + lauxlib.c \ + lbaselib.c \ + lcode.c \ + lcompat.c \ + lcorolib.c \ + lctype.c \ + ldebug.c \ + ldo.c \ + lfunc.c \ + lgc.c \ + llex.c \ + lmem.c \ + lobject.c \ + lopcodes.c \ + lparser.c \ + lstate.c \ + lstring.c \ + lstrlib.c \ + ltable.c \ + ltablib.c \ + ltm.c \ + lvm.c \ + lzio.c + +#nvpair +SRCS+= nvpair.c \ + fnvpair.c \ + nvpair_alloc_spl.c \ + nvpair_alloc_fixed.c + +#os/freebsd/spl +SRCS+= acl_common.c \ + callb.c \ + list.c \ + spl_acl.c \ + spl_cmn_err.c \ + spl_dtrace.c \ + spl_kmem.c \ + spl_kstat.c \ + spl_misc.c \ + spl_policy.c \ + spl_procfs_list.c \ + spl_string.c \ + spl_sunddi.c \ + spl_sysevent.c \ + spl_taskq.c \ + spl_uio.c \ + spl_vfs.c \ + spl_vm.c \ + spl_zlib.c \ + spl_zone.c + + +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ + ${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm" +SRCS+= spl_atomic.c +.endif + +#os/freebsd/zfs +SRCS+= abd_os.c \ + arc_os.c \ + crypto_os.c \ + dmu_os.c \ + event_os.c \ + hkdf.c \ + kmod_core.c \ + spa_os.c \ + sysctl_os.c \ + vdev_geom.c \ + vdev_label_os.c \ + zfs_acl.c \ + zfs_ctldir.c \ + zfs_crrd.c \ + zfs_debug.c \ + zfs_dir.c \ + zfs_ioctl_compat.c \ + zfs_ioctl_os.c \ + zfs_racct.c \ + zfs_vfsops.c \ + zfs_vnops_os.c \ + zfs_znode_os.c \ + zio_crypt.c \ + zvol_os.c + +#unicode +SRCS+= u8_textprep.c + +#zcommon +SRCS+= zfeature_common.c \ + zfs_comutil.c \ + zfs_deleg.c \ + zfs_fletcher.c \ + zfs_fletcher_avx512.c \ + zfs_fletcher_intel.c \ + zfs_fletcher_sse.c \ + zfs_fletcher_superscalar.c \ + zfs_fletcher_superscalar4.c \ + zfs_namecheck.c \ + zfs_prop.c \ + zfs_valstr.c \ + zpool_prop.c \ + zprop_common.c + +#zfs +SRCS+= abd.c \ + aggsum.c \ + arc.c \ + blake3_zfs.c \ + blkptr.c \ + bplist.c \ + bpobj.c \ + brt.c \ + btree.c \ + cityhash.c \ + dbuf.c \ + dbuf_stats.c \ + bptree.c \ + bqueue.c \ + dataset_kstats.c \ + ddt.c \ + ddt_log.c \ + ddt_stats.c \ + ddt_zap.c \ + dmu.c \ + dmu_direct.c \ + dmu_diff.c \ + dmu_object.c \ + dmu_objset.c \ + dmu_recv.c \ + dmu_redact.c \ + dmu_send.c \ + dmu_traverse.c \ + dmu_tx.c \ + dmu_zfetch.c \ + dnode.c \ + dnode_sync.c \ + dsl_dataset.c \ + dsl_deadlist.c \ *** 1172 LINES SKIPPED *** From nobody Wed Aug 20 09:26:24 2025 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 4c6Lg64tryz64fld; Wed, 20 Aug 2025 09:26:26 +0000 (UTC) (envelope-from des@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6Lg641Ylz3n4F; Wed, 20 Aug 2025 09:26:26 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755681986; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t4zRT1qKZiH38Sk12qxWik41hV3+pzyHgPsZdhNIVXg=; b=E3loCEqT2yFQp0hNT+PuN5L0W81gkDPjOvmBKWTPcTi3DHFXLH0Qgy6fSb8DZyi8AcwGhU dfMVBJfw8vo0rf0/qXaObturrMmihX6AGG0PQf0IiLTbWtj/iaLpRAjLSvQtCBkz023S4q cBkqB9OqrmYoTRrvwOScaKUFDklrM7cEVzhPRAEqqxcUf10xKD3EnLka/eDy3FU2RV3bQM YSG+Qtzpz/pT412vlnJzJ6CRE2j88z8QNrJlliqp4c2ENZAOoPUTE6usxvJQHngttzYwSG d+r9xmxjCPzZfxeGkVsWoINGtYHufKOrMwwFTtWa8CorSiE9D9s7AxyWt8OPqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755681986; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t4zRT1qKZiH38Sk12qxWik41hV3+pzyHgPsZdhNIVXg=; b=kNtSWRWJVf5CKpB5OTmVOceHQcGlu4utdcHDyQ87B02TP2SqvpkGJdfRFwVp2NDBkTmi66 XbqR6FYYruHxE3TV23Uq6DjVqymq82gumItrZS6mWIr4Nm4E6sz+DmaNPokWfka5RA8GJ7 Om/VRAjakUyICppH0yitlltskCACf+NJ2rbHfmwpqdii+2w05BheplQvr1B/octmPJTwma +hIAQRj+ZXWp7BOSGnQdKWuW0lffFR5d8V84+Rw6E8NBVPB0drSkEjn/bnpnugHMRbd++C Bxzg+gd/NRFP0YMmnDjxslGnQeNoPp/DrjQQi7/Qjm1VPqk9E5V37TaSyKGRXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755681986; a=rsa-sha256; cv=none; b=LqfmJCzFowoK2LwuBX711MhVS5ZOGj3R32G8HH+SdAL1K7FrvVHCPeK1hWXmNSNWTLvDDk ET18FcEjB+kmU3y6rwGDKA58W3T5x4VrAszixWbfXP7DteG3HNUqbI1KHF7NhV0yH+QvGw IBgkVbxXK+g+0/F4Jj/Ona+kML0WJ+ZUQOJB1sy3wKQQwyF3+vvjsYHK6bjezUvCc3fP6k 5Zi/zbShQxxWclYN0sq7iEhZVHnRHqcYuXV8zljn8Mp/+DVdDs73a6vCBJJ6KlJhnHanzj +fIHukyc6sXqBuJTN2PWGV2bDmM/AfRjl1OUonZfymJw4uAzVZroYjzibxUH1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.dev (88-177-82-251.subs.proxad.net [88.177.82.251]) (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: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c6Lg62MDlzQN3; Wed, 20 Aug 2025 09:26:26 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 46A0A3C1AB; Wed, 20 Aug 2025 11:26:24 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Konstantin Belousov Cc: Aymeric Wibo , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 75acf71786f2 - main - libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp In-Reply-To: (Konstantin Belousov's message of "Wed, 20 Aug 2025 11:11:51 +0300") References: <202508192309.57JN9cNK038457@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 20 Aug 2025 11:26:24 +0200 Message-ID: <868qjejqdb.fsf@ltc.des.dev> 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: quoted-printable Konstantin Belousov writes: > Aymeric Wibo writes: >> libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp > This breaks the ABI, of course. No, it does not. Please take the time to check before throwing accusations around. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Wed Aug 20 09:38:15 2025 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 4c6Lwz3vvkz64gFY; Wed, 20 Aug 2025 09:38:27 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4c6Lwz0ffYz3s1h; Wed, 20 Aug 2025 09:38:26 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 57K9cFC0038789; Wed, 20 Aug 2025 12:38:18 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 57K9cFC0038789 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 57K9cFY6038786; Wed, 20 Aug 2025 12:38:15 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 20 Aug 2025 12:38:15 +0300 From: Konstantin Belousov To: Dag-Erling =?utf-8?B?U23DuHJncmF2?= Cc: Aymeric Wibo , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 75acf71786f2 - main - libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp Message-ID: References: <202508192309.57JN9cNK038457@gitrepo.freebsd.org> <868qjejqdb.fsf@ltc.des.dev> 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-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <868qjejqdb.fsf@ltc.des.dev> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c6Lwz0ffYz3s1h On Wed, Aug 20, 2025 at 11:26:24AM +0200, Dag-Erling Smørgrav wrote: > Konstantin Belousov writes: > > Aymeric Wibo writes: > >> libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp > > This breaks the ABI, of course. > > No, it does not. Please take the time to check before throwing > accusations around. If a symbol is removed from the library export list, its ABI is broken. If a symbol was not present in the object but it is listed in the version script, then the build is broken (ld.lld --no-undefined-version was missed). From nobody Wed Aug 20 10:04:25 2025 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 4c6MVz1V5cz64hjZ; Wed, 20 Aug 2025 10:04:27 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6MVz0c2Rz3wLY; Wed, 20 Aug 2025 10:04:27 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755684267; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kf67OmKKFL4nciErvn1UrvLsiepOqgjiYXYDHs+t+pI=; b=bbQ/F9gQqr7AARDCNXCa7X/1LPDakiEPetqeM2oo0bEdG244JJE20hYco3mZ7DEAlzebA0 YafZz2mZyYPkNW7S/QQO9KISXgxqA7mD7nN2oS9Gmqm2hFE4c73+ZqhlqJbqJJxVid02ZJ gWWuul5coIXsJxLUOmar77azxpFSVfr9XuD1pdZsY8Trgch584tmipotNzQLW7qxfNeAYG Nhrgw2Bvj4rpCqJ3Ev7KnqCOT+Q6r8RJH3j6bbmNqS0HRsCoZ2m40myF2XN1EaHYfmZCyo twJLtRq2nBos02X5PdlPIsBbd5FMSq19Xk7Nmuve8fnj9wZ4M6LV5ZcUDdMSDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755684267; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kf67OmKKFL4nciErvn1UrvLsiepOqgjiYXYDHs+t+pI=; b=sgIRCm8SAyyZohHJyzgdLy70Tm16qGQzGT9djDla8YYMpBDUQpr0qcT8vzaBnlKxzOXrnK HzLHaCJebadf2CEtEEPqo5Cnh86vcfO0bc5g1nLsNifMoMkr0gM5lOFXUa++tGgBWnvVMO 9/PfxemUMrGrceLDV6O1lDv3trCW7zn2B3IpM7H5se19uiLl/NzyL/GqbDsXYTp42k4xQD 5vkpqnRgMG7lZ+Cjj7LIp7JQOtzinN3cr8klIlFcYJYfEHck05jLEkaY+P64AbI/I+PYH0 wZ/QVxXjHnw0Jgc3+0DtYdbd4UCzUgNn/xCtgCveD3QvErEI+kJgTeC8Kqw07Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755684267; a=rsa-sha256; cv=none; b=WGUt/6crKOyNiUNNQ/pcgq6env5jPr/5u9b2A2tyxLlDrOzB76dKk/LGVplGhOJWb+nQ8d IDdNBws7oF1j7i+weK1NPuHI9a+HeyHefLRURi9STuVaDg9VVbmulnCAfGr57nVi8azB6r J4YEx4HJ1x54HQAODJ5MW4S5Pg4C4jjLvb4tKpFpocvaYIOQj6Jwwzg+TAfTvgRv5XJ+cv vHLK/bQ0Ge4KbYTFFPZxxHAzFiTsWsGb1H6oTvxHdhwi32abx4u152dlXuM1KX0DfOD8b7 JH/g3QOfn6tEMwWe1sJ4Y5LfQYn5TqgDbJl2u8Ano6wICvgIZfYk4yzsbZVqnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.dev (unknown [IPv6:2a01:e0a:c54:bed0:922e:16ff:fef1:acef]) (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: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c6MVy6MSYzR8D; Wed, 20 Aug 2025 10:04:26 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 6D49B3C08B; Wed, 20 Aug 2025 12:04:25 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Konstantin Belousov Cc: Aymeric Wibo , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 75acf71786f2 - main - libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp In-Reply-To: (Konstantin Belousov's message of "Wed, 20 Aug 2025 12:38:15 +0300") References: <202508192309.57JN9cNK038457@gitrepo.freebsd.org> <868qjejqdb.fsf@ltc.des.dev> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 20 Aug 2025 12:04:25 +0200 Message-ID: <86wm6yia1i.fsf@ltc.des.dev> 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: quoted-printable Konstantin Belousov writes: > Dag-Erling Sm=C3=B8rgrav writes: > > Konstantin Belousov writes: > > > Aymeric Wibo writes: > > > > libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp > > > This breaks the ABI, of course. > > No, it does not. Please take the time to check before throwing > > accusations around. > If a symbol is removed from the library export list, its ABI is broken. Again, please *take the time to check* before lashing out. I promise you we'll still be here when you get back. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Wed Aug 20 10:45:59 2025 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 4c6NQv6sCKz64lBD; Wed, 20 Aug 2025 10:45:59 +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 4c6NQv5FV3z452q; Wed, 20 Aug 2025 10:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755686759; 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=R+1oY5GZ/EyBMkIHj92IfccZ9q3x4IOg0/5nLHo7WPU=; b=YU0aVIU9nUglx9JeNqDs7xP4Jfl3R/6Q4ES8t/OyD81JQdGYtP8VP3NvwusoWFPJBelfH9 pfi2gNn2FP/Mw2BrH+zbuddQDKSl3puxEjR0aFQoIqRxQpRHTjP5zObEIeMnKdWdEUcOrV cxqgJYFLPoQ/jcBo09LayC6PpXNYARfJlep/fc/bMYt1TsNQRZV09ayc0uY0Ex5/p3JBsx USZcAGPnnSlMJCLAK1KKnLUyOnnGx1xDfGe/UE/B5KAqHuo5bIT8aCL2+RX9Cz8lRP/+D6 8EW3aSerU08H7NEl5eIQd3QlF+M0YsGvMRaAuCVl9UCoO23fvMEKL5esokXWsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755686759; 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=R+1oY5GZ/EyBMkIHj92IfccZ9q3x4IOg0/5nLHo7WPU=; b=W1VVjhiDIunOiaJAU+XDGsiuf9otj1r/fy9TV34jlQxfvdcJtqdSxE4QW2nXJep1MlBk+h U2ucmd6En8pBi+Zzc5nbm4xHAfMydmKdjlNV+RvFwiKkEl2vNSGUA2YPmTrjj77YokQ2ia TZ43XVr+kYT6to28IiQEv0PRMUohckI4nIandIKLjEfySbx2G2XMN+I4Y7S6GOe0vupjPU Qwdi4hsvcZwlpjLROprQIxe8bv2ld52A8PvuX5LdNf5jaxtHM/ByERo/eLpWxxqu6k42pc YYSnOrE00iRRp3XXptFKbwPAym5IgEztO74JfxyJcMrdrz4ApaExLyXhWpWL7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755686759; a=rsa-sha256; cv=none; b=L9XfeMiSmmox668lqffa0XalgAFMhoHNI1Qc1Hdy2xBq5JSZGccd3xlVxNEYGI9YrQAbeV LK0g3HyhXIrVaZ1TdICrpCJ90QBenjDbD87IeFrl690g7D98VPnSXzAtmCSMjqUbXnTtgN Ra5kwBUyRepHvrfHJcdmaMLt/sysQXbGIXd1u7FYCUEj8S4nfE5C3o7LQDtnZ4gwh2TjOH KAE9xKkdxgODiBFHMoPezj+QxTyXWiCJapv1hsSgT9xLZPtYhbWE3PDZXYxemxHCkuGIZ/ aa2tcYe3zWNiQdbK+CvRxgdAT+yVboUFEjZpSKOvmk4E4Qu4SaGzsrUXU1AI/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6NQv4X8tz18n7; Wed, 20 Aug 2025 10:45:59 +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 57KAjxav057946; Wed, 20 Aug 2025 10:45:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KAjx69057941; Wed, 20 Aug 2025 10:45:59 GMT (envelope-from git) Date: Wed, 20 Aug 2025 10:45:59 GMT Message-Id: <202508201045.57KAjx69057941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 6a1e5dcb0051 - stable/14 - sysctl.3: Reference kinfo_getvmmap(3), kinfo_getfile(3), and kinfo_getproc(3) 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6a1e5dcb00514e056c1d702b46603142fcf48454 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=6a1e5dcb00514e056c1d702b46603142fcf48454 commit 6a1e5dcb00514e056c1d702b46603142fcf48454 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-31 16:06:08 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-08-20 10:45:31 +0000 sysctl.3: Reference kinfo_getvmmap(3), kinfo_getfile(3), and kinfo_getproc(3) It seems to be a good place to help the user discover those useful wrappers. Reviewed by: christos MFC after: 3 days Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51654 (cherry picked from commit 04c8bba8c8672d186837e353d4f2335a26f0c3c1) --- lib/libc/gen/sysctl.3 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3 index a87aa7772413..c82bcf3c0d72 100644 --- a/lib/libc/gen/sysctl.3 +++ b/lib/libc/gen/sysctl.3 @@ -27,7 +27,7 @@ .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 .\" -.Dd March 16, 2023 +.Dd July 31, 2025 .Dt SYSCTL 3 .Os .Sh NAME @@ -529,8 +529,12 @@ The path of the process' text file is returned. The in-kernel call stacks for the threads of the specified process. .It Dv KERN_PROC_VMMAP The description of the map entries for the process. +Also refer to +.Xr kinfo_getvmmap 3 . .It Dv KERN_PROC_FILEDESC The file descriptors for files opened in the specified process. +Also refer to +.Xr kinfo_getfile 3 . .It Dv KERN_PROC_GROUPS Groups associated with the process. .It Dv KERN_PROC_ENV @@ -951,6 +955,7 @@ A process without appropriate privilege attempts to set a value. .El .Sh SEE ALSO .Xr confstr 3 , +.Xr kinfo_getproc 3 , .Xr kvm 3 , .Xr sysconf 3 , .Xr sysctl 8 From nobody Wed Aug 20 10:46:23 2025 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 4c6NRN0fgLz64l7y; Wed, 20 Aug 2025 10:46:24 +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 4c6NRM70dcz45F8; Wed, 20 Aug 2025 10:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755686784; 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=ktcSWMcFxaE69B9tnjYensGeI09WIODeRGavwhgJ6vA=; b=qZxTucKnG4ZrEGquK+C2AtdFp22K8+ZGwXgb8vShWm+fw/Czl/3idKTWnFLmYuQ2aT/JOe jzYkGhSMaXaE6EF0ObePDbpe73LWkjG+qnUMG72ZVQHH+pQRX4vMwc6FfrAmol1TTzpNmf Jle9G14nmJXhWeNmqYRgk+efQ6BHWCgEOmtgi7uopJ5DxSDp3VSF1OMCIt+V56pKVFx+ZK HgztoVW3UlDZoRFvVVRGKfuY+VSJNxoshN5mOyYVhYeYvjMEhZK3F2Tvq/2dz+edbuVusm ajsAgGJqTVN/Zhkm8ESFmh7Zy09lGJOq+busckll9g70pXyzG6bdt2llM+Y2fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755686784; 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=ktcSWMcFxaE69B9tnjYensGeI09WIODeRGavwhgJ6vA=; b=Tf/DXbUxwFMfWdcSSL4rwFIdbGRIxDwmsgS3T5LR3Zks1iMLXhtB4p/UWgQPLMrVWtxjFg KSUUqflAJhbKH/MMFgB/uee8B7xM9IJRtzFPU/Mm5Vn3/oIlUdZEMUW7LMqeejt7IthW1l gB4WZnI9lD+/+xKIb39dhFaYrBbr+tXV3Vh0XPnODMeaf5vzm6cJyBeQKyhgDpEgsSzDWn r/YuQpKuNMnTlRqbWtLKmNF8QPe/9Y4ylEWnHLtY9hWr+bJ0apx+yVVK5vwo+7wq8a8Sgx y5P8qj8xXpwvPMi1aWAbqBpFROpFRxhTpw73wis1tLuYlhSD9Aiu4nnEOsWH/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755686784; a=rsa-sha256; cv=none; b=YQsskVPgZh4tLO4FEf1E/mS7cVT/ODL9mG8KaRbznH8f3XquAX8+rYiCvXc+mcfFXjfav+ eiG7mPjR98uuVsQySWBvBzATTzKf4ryt7wUU+DiJ6QIN54y8s9dyO9sL6c6tJy/fhsPd2c jTI7u7Ef0/evkMgo+PJELWlrRjC3KhJCyMCUImoQPDDjnrFrYp1NRhqlTH3gF7VnTFvqWx EJOqDmyO35GdSJIySnijPeP8ua9bQWHJ33IdqlUFYCO7SA1MUrjKxZVdZjQR10HhM8eYRc Geop3sPoNWeRwXtg6c4k+7sp3kIOHTrRei1y/tYkM1znY7MrZBaEYc14Vvo51w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6NRM6YGdz18Yb; Wed, 20 Aug 2025 10:46:23 +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 57KAkNmA058179; Wed, 20 Aug 2025 10:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KAkN54058176; Wed, 20 Aug 2025 10:46:23 GMT (envelope-from git) Date: Wed, 20 Aug 2025 10:46:23 GMT Message-Id: <202508201046.57KAkN54058176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: b09a75d675dc - stable/14 - dtrace.1: Document security.bsd.allow_destructive_dtrace 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b09a75d675dcaa9a1e5dcc63f7cfbb5df85419e6 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=b09a75d675dcaa9a1e5dcc63f7cfbb5df85419e6 commit b09a75d675dcaa9a1e5dcc63f7cfbb5df85419e6 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-08-01 15:23:20 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-08-20 10:46:18 +0000 dtrace.1: Document security.bsd.allow_destructive_dtrace PR: 288284 Reviewed by: bcr, markj MFC after: 3 days Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51633 (cherry picked from commit 1acfb873cf2e59f9ddf53602cbc67fa810c878a6) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 0603a32da5e2..eafc25f187d5 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 16, 2025 +.Dd July 30, 2025 .Dt DTRACE 1 .Os .Sh NAME @@ -537,6 +537,17 @@ option is not specified, .Nm does not permit the compilation or enabling of a D program that contains destructive actions. +.Pp +Set the +.Va security.bsd.allow_destructive_dtrace +.Xr loader 8 +tunable +to +.Ql 0 +to disallow the possibility of enabling destructive actions system-wide at any point at all. +Any attempts to enable destructive actions will cause +.Nm +to exit with a runtime error. .It Fl x Ar arg Op Ns = Ns value Enable or modify a DTrace runtime option or D compiler option. Boolean options are enabled by specifying their name. @@ -1219,6 +1230,18 @@ failed or that the specified request could not be satisfied. .It 2 Invalid command line options or arguments were specified. .El +.Sh DIAGNOSTICS +.Bl -diag +.It dtrace: could not enable tracing: Permission denied +This can happen when +.Nm +fails to enable destructive actions because +.Va security.bsd.allow_destructive_dtrace +is set to +.Ql 0 +in +.Xr loader.conf 5 . +.El .Sh SEE ALSO .Xr cpp 1 , .Xr dtrace_audit 4 , From nobody Wed Aug 20 10:50:07 2025 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 4c6NWg58gzz64l88; Wed, 20 Aug 2025 10:50:07 +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 4c6NWg4YM7z45Ts; Wed, 20 Aug 2025 10:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755687007; 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=k2aXAglmhWigwFUBKTBDFXeCAJtVC/heK8mBVlkdCvU=; b=SnJ3MrjWfmL9Pl13X0XszsB9AF9ADq7AZZGjq4qav7E79fhdEkuqw9slHwncL/TzY4oz2K d8mkUMAbkPAdsKeHrwxQi/FuHjpUxXGLmoUQzO3W3PIfeFgDrRBTKHdWRI0W/OxFfDj7B1 9PglnzmknrGuYGuOyCO0AqQ/OEiEKyWNHRwD3p/DXQ7ZgQURqawUN/iouNWYnny0iolWoJ xZW1SqARep1edWvk8ZpJd1ViLteQAuG4BzplSuIDgaTLAovSHXi7x2yjMLbd1T6sBKSCci rBzi8Iv0Se5btVM3Uji3nggefq4mL8l0r4PWmxz1nJtdHMV52gKUrFHD4jjpyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755687007; 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=k2aXAglmhWigwFUBKTBDFXeCAJtVC/heK8mBVlkdCvU=; b=HyBxLWMKCBM5tEv6Eau/9BfPB+J0lxPFIVNd82Y6Fvg+78G6NoFKTmkONxSfkp0A97mT13 QSXWEQL5Hi5yNnTR4ZpeoJDDERBfSeXQvhp2p0toQgmGtVy9+OdaE/HfcjIYRvgw/LzZBU h/kZYsbYmsyAMeB8hXCs3v2eRRqPis9MpStb/O9XIjQdnEJIofjJxQ5OIT1FKtBMmGKBDj BtCfXZrEDN+k3cbc/uEK+D1hiHMpSeJqxxCfagSFLvImBhJ1Jz+GGoGhII8CArwhKoycZu edP1CG3vlmNPOEy0po9p8v0hb7T+Vt8jBG0KbVrVqW23BS3IlPYpeHgPvY79jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755687007; a=rsa-sha256; cv=none; b=OsRe1T0y3gbMiLeD7UzJ42S95+Az0CwUuz523kVJhyGrE7u7/fGz/rcaVkwS1vDLnajeSZ xxndvLV4U7cNmKfAgo4G/UcQR3tjLZsI02ym7yFPUp/6YkoFRkp0J14S3uNN1g7B5T7FSe dlVq31pDzuCSBim5Ob4uTzTiHUQbZqUBzj67tA/PMrWgQx5f241qVMq5UCxy15Hx90GHgj CO4zoHBjsxiljDaWWh3RcMRVZOYRZcBQbGyjWtudZoCRSfjh5gLWJVidE9qwuQ5mZle43J yA/NpQY43olL27DHjEuzXF7roqFYDVbkx39HJAHphi94JTd+q5KtF7MmNmoIkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6NWg48MXz18n9; Wed, 20 Aug 2025 10:50: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 57KAo7h0062656; Wed, 20 Aug 2025 10:50:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KAo7WE062652; Wed, 20 Aug 2025 10:50:07 GMT (envelope-from git) Date: Wed, 20 Aug 2025 10:50:07 GMT Message-Id: <202508201050.57KAo7WE062652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 1a6f2bf37241 - stable/13 - dtrace.1: fix mandoc -Tlint 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1a6f2bf37241d57168cdecc75f3f432e44e9cc8f Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=1a6f2bf37241d57168cdecc75f3f432e44e9cc8f commit 1a6f2bf37241d57168cdecc75f3f432e44e9cc8f Author: Christos Margiolis AuthorDate: 2023-05-23 14:29:19 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-08-20 10:49:07 +0000 dtrace.1: fix mandoc -Tlint Reviewed by: markj Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D40230 (cherry picked from commit ed35c7cf7762c26246cb032b7ed30dcfbcee7a3b) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 853538949a4d..609bf00655e7 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -803,11 +803,6 @@ failed or that the specified request could not be satisfied. .It 2 Invalid command line options or arguments were specified. .El -.Sh HISTORY -The -.Nm -utility first appeared in -.Fx 7.1 . .Sh SEE ALSO .Xr cpp 1 , .Xr dtrace_audit 4 , @@ -826,3 +821,8 @@ utility first appeared in .Rs .%T Solaris Dynamic Tracing Guide .Re +.Sh HISTORY +The +.Nm +utility first appeared in +.Fx 7.1 . From nobody Wed Aug 20 10:50:08 2025 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 4c6NWh6RVmz64lhY; Wed, 20 Aug 2025 10:50: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 4c6NWh4lyBz45My; Wed, 20 Aug 2025 10:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755687008; 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=AAx9VdBKDcWUzbFo3a2EQEeRKcF3J8+a9B/nB/Kdpig=; b=KduuoAjGlmJKwI2Wd2V2bQrwy67XXUpNzKWqBYzwowk7/3Hi+D3xK11TP19W+c9oRhqZPK fBJ5OSlH6jNIHJ/UXACaUR2himRs5A1GNDG3XU77dHR2EBb/JrZiP7xqlDyA2sVwDPSGo8 KJOY0VaPqD2ukOEHD8u4g3SIJROjQ8rpkRUlnXBAvxcDiZ+JrmL81fXI2ACXvm/P7qEM4q bobGvq3enxJbGlk/inT+4m4sBR+cdtQk4R+oTxn1/AI5kf4kYsqfAtYMzN/7M8n8vtAn4D FvYw8JpPE3GlcEm/CMJ67gh5iC4p+9C+uWHZNB04lP85O0Z/8rwul6+JzSSziA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755687008; 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=AAx9VdBKDcWUzbFo3a2EQEeRKcF3J8+a9B/nB/Kdpig=; b=eIHrHreOnEf1NCYj6p8+YBsxB+Rqgv2MnWLeujJssaB5JJywMngE3Zr9ebBfFXlaLVivV7 T/zkZxzbNlOozBPiSvsWRr/zeHPeozHKPugP/CUBfqtNVwNLa/SIiLuZhdwPmVJcIrOvkS d5LJ2l3CbvZr2okJETf/ZDO2oITAXngBgfd9UELBKRCIKB3kkbLBDWsRSLw5SqAqHFXY8f MjaZ6beIxSLx/UqbfHBkkrhPiIXHE0k1O+WTEi7KVZ1U754MsssExbGMONvQqOGvaVbJIK B11JmzuVfXiCU5KY18dzoE3D5f+SUWGM/kNjnhLqEaZj82RoZZtoxuhG3mnWRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755687008; a=rsa-sha256; cv=none; b=CMAheFdDJXfF0YgTN6RW2g2sJCFo0g80N41jKmY0QkES9QWExRPkpDXrb9OAsVICEWArQr uvn9tSiu/qrD0fBEXMglZxmPN3nGXIQIG9eVuFGoeAeAzzU0DHaeB2hBEt3+lRAC9lpur/ 5t0fwNMXyl50hSc4EQx2ZRQ9Vsgs01YmQckibXptncFfpj69epajB1H3/xfLZm9hdStJDM OK/Vfii9ZpctQ9xAC+4h1HkP73fXMc2U3XcNm1bls8il70sz7vaoRFLwc0oYSQZAaYbWPO RCGfKsJ8SQTBTecYfdBjaOC2ZjLN88gqlIVnxhdJdtl66mf8PBGeCQpWSks90Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6NWh4MHxz193W; Wed, 20 Aug 2025 10:50:08 +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 57KAo88U062917; Wed, 20 Aug 2025 10:50:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KAo8JL062912; Wed, 20 Aug 2025 10:50:08 GMT (envelope-from git) Date: Wed, 20 Aug 2025 10:50:08 GMT Message-Id: <202508201050.57KAo8JL062912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: e84d5425bf53 - stable/13 - dtrace.1: Document security.bsd.allow_destructive_dtrace 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e84d5425bf533c61d00aaa8e52f505d328f4b02d Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=e84d5425bf533c61d00aaa8e52f505d328f4b02d commit e84d5425bf533c61d00aaa8e52f505d328f4b02d Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-08-01 15:23:20 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-08-20 10:49:10 +0000 dtrace.1: Document security.bsd.allow_destructive_dtrace PR: 288284 Reviewed by: bcr, markj MFC after: 3 days Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51633 (cherry picked from commit 1acfb873cf2e59f9ddf53602cbc67fa810c878a6) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 609bf00655e7..a98d851b9998 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 16, 2025 +.Dd July 30, 2025 .Dt DTRACE 1 .Os .Sh NAME @@ -517,6 +517,17 @@ option is not specified, .Nm does not permit the compilation or enabling of a D program that contains destructive actions. +.Pp +Set the +.Va security.bsd.allow_destructive_dtrace +.Xr loader 8 +tunable +to +.Ql 0 +to disallow the possibility of enabling destructive actions system-wide at any point at all. +Any attempts to enable destructive actions will cause +.Nm +to exit with a runtime error. .It Fl x Ar arg Op Ns = Ns value Enable or modify a DTrace runtime option or D compiler option. Boolean options are enabled by specifying their name. @@ -803,6 +814,18 @@ failed or that the specified request could not be satisfied. .It 2 Invalid command line options or arguments were specified. .El +.Sh DIAGNOSTICS +.Bl -diag +.It dtrace: could not enable tracing: Permission denied +This can happen when +.Nm +fails to enable destructive actions because +.Va security.bsd.allow_destructive_dtrace +is set to +.Ql 0 +in +.Xr loader.conf 5 . +.El .Sh SEE ALSO .Xr cpp 1 , .Xr dtrace_audit 4 , From nobody Wed Aug 20 11:55:41 2025 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 4c6PzZ1DYbz64qd2; Wed, 20 Aug 2025 11:55:54 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) (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 4c6PzY5L9Lz3GSZ; Wed, 20 Aug 2025 11:55:53 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-il1-f177.google.com with SMTP id e9e14a558f8ab-3e570045e05so54739675ab.2; Wed, 20 Aug 2025 04:55:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755690953; x=1756295753; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=R5G5w61Gad1kZGRSI8Vt3GR4R79tRxXWuPsfjrKvZeU=; b=JTEURLW8S2jnS6L9lgufdSFygz1PokXnR/132ESlcpDOjmOV23WC7onOfWcdorJ5pq qSZXAJnKN4dYZb6X+gGWf/snsfFnFSS43VBt07hVLZ5Zzev1FV6MtczpPNGUo6sBFzmk c9iFBh4u7g4+N+wF0TprRiVLl6T/3nwkbxBqLfuF9dUmQlhE7wB7jmn4ThLl4p9CzIbr ia3BlT1vJ3qy9lU9DhlhuHsEAgcn7Vg+Pgp2OOtkH68SjleSM4t6o9or3uecnlF9R/NA BY8i24XoRycevvXGGIQFOS/MxSUHTtbj1EZHojAVH7VuLHMNI/MXlw/B/E36RJSKdv58 La8w== X-Forwarded-Encrypted: i=1; AJvYcCU50bxv1bjCZfI+HfzjrhAWpVE7V+aXCZPqwDaTrSP2fC3776+2r+o9WlpiMTNtFyWMgGE89fU5RIDzhfOLsMQ=@freebsd.org, AJvYcCVMvYY28myLtczuk/PJ8uO7m0kPrMb4ala06SWbtwUX2e2JVUrZTpMxbrDerBr5wAILRM2NmOsXNzhvPybRm6ZyCpTd@freebsd.org, AJvYcCX/e/F0OwNrIiZ6sgyy07dziIUeLLL568YOa33ogDOy7vBDYOX/zwxnPhXvjlLhMICOPNVGG/SnHbdYy3q8QxeZVQytxXE=@freebsd.org X-Gm-Message-State: AOJu0YyjeSeK3Vipcz5jd2m4s1cuRi3WgsECewsehPRmSYM0eRJ0QdAd HRRQ3NSOrnYIy1dfYsGhYDsy/vBwQ/12Bf7VksQfCosbPw5Sl8Dvnodf/1pNNfZLI9MeNX7iUUU ZyW68qQmk0frM/Lc9WvXbO3xBAgnI+engvw== X-Gm-Gg: ASbGncubejQQUVj5u3UGLHDAUKVnC2lM5S0fACyMqbEEmi/ZzcIJ+bw+zHVYArMvLj4 J2wKISiY4855254XvQQN+b+I3sra9Wpie87hQ8QJIHppubGZ+w7q7MaNwA3Tjslx7V6Yxi/YzXS lxrkak+Y1odPJ+H7B7bw3k8alVHqm2uUxZtBC1Q8lRPk7Yo29uQ1Bb7SxoMpBFax6qol9/+bF8I 3Fk2vIZPh6xnoetsycVGfrTtylWFxHhRtx26oGCbrQLEmfPBwiV X-Google-Smtp-Source: AGHT+IFRIja7cyj3ZS4iezwnFqad0W3fQVVXyHKD+RdXL2vudJbFxcraZjd9okNxCGIKAIhVcLnXusOWvSq9ZiMLtKw= X-Received: by 2002:a05:6e02:1521:b0:3e5:6a2e:e3bd with SMTP id e9e14a558f8ab-3e67ca22de7mr44725425ab.15.1755690952732; Wed, 20 Aug 2025 04:55:52 -0700 (PDT) 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 References: <202508192309.57JN9cNK038457@gitrepo.freebsd.org> In-Reply-To: From: Ed Maste Date: Wed, 20 Aug 2025 07:55:41 -0400 X-Gm-Features: Ac12FXwNjlGApc2p3tmWIP-VgPQVcugfzzThVAIHYlpQUvXmGd0BQ7aZD42vmsY Message-ID: Subject: Re: git: 75acf71786f2 - main - libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp To: Konstantin Belousov Cc: Aymeric Wibo , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c6PzY5L9Lz3GSZ On Wed, 20 Aug 2025 at 04:12, Konstantin Belousov wrote: > > On Tue, Aug 19, 2025 at 11:09:38PM +0000, Aymeric Wibo wrote: > > The branch main has been updated by obiwac: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=75acf71786f201093b76f45eff03a8665fb79a72 > > > > commit 75acf71786f201093b76f45eff03a8665fb79a72 > > Author: Muhammad Saheed > > AuthorDate: 2025-08-19 23:06:53 +0000 > > Commit: Aymeric Wibo > > CommitDate: 2025-08-19 23:07:15 +0000 > > > > libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp > > This breaks the ABI, of course. > > Or, it makes no sense to have the overhead of symbol versioning if it is > fine to break the ABI. > > Symbol removal should have resulted in the library version bump. libifconfig is an INTERNALLIB without a shared library so the symbol map is just unused. From nobody Wed Aug 20 13:09:51 2025 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 4c6Rcv2jTfz64vq9; Wed, 20 Aug 2025 13:09:51 +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 4c6Rcv24kvz3Qx4; Wed, 20 Aug 2025 13:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755695391; 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=IHrquTJ1xFzlyVq0IHpF0WX3vUcXkeSqlHYWYSBGBhE=; b=tTPiqebadVR279+1LsQNT3MzQToE/CzCuMgqrfLIpgZa68DpvHfweZXuqVUtFSajyqA6DN njbnInpHUfeYSF/DnPzsCYQVj3pGt7gAyPLpqzxLefcepq2/824q9duaySfvClf7cvIco2 d7CH0XU40HuaORGXEp3EuBPW1VVgNwHJMEE9koPthg7ctr9Y1SiP5RUbmtBTdyUfuKJBoG qOMcdTPq84WFca1mjYRsVqx9Ud+0NAHN5UwShTf08CFkUObZ1sa4IUS9OMbM1TDdXCcOzs qLfVDGAHygAUlJTgcF4gvWLoaVUHHqjmvUNKMLt+4TMc9d5uSNbAEBiprygvbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755695391; 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=IHrquTJ1xFzlyVq0IHpF0WX3vUcXkeSqlHYWYSBGBhE=; b=tska+8lnFWyXi9oHsC4LlJUVCYKy6qD7w7fFqL2ddBRdiFuSQVdFdlDOdiJXItg0y9723H jnHZ+pjMRepXejxYl2WQt+kMx4/4CPXAO8vBGWWdHvTy+EQh5+IgA9M6Zc2mO2R8n/cFSV SF8SAffxCg+AMt2Sgn5AUSurbq/q9mkB8IynJyMkcCSYu3EmG7H1v/zxdqj5yS4UtMi0or BUbccv6mDXdVqzHBlNi0v+WBtrcynpFy6xcLUR6Uu89hGSz8Bydf6a9qFyH1bzQAC2VSAh XniLdsApkQl/ZErjVicDmEAuZOFYJ21jhs0+BVTfchv1j7bXl00r+r33Lyvgcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755695391; a=rsa-sha256; cv=none; b=lwtVI8ADoWoqeguk4WX0NNsj0e2d0TA27IIr8tpoecSwyNM9SGewUldiJ6I1XWjwQrH98n 4keynjiN1w0jY9tX8O1BLErIwJHeMPSQJk8dG1i3FSZipRHZlmYEry3TVJ8zXk1Dqzw0GT YDeGJ28J7Aia7NMOwrzb5+SlO76NbpxCf57tt1tYZNrJ/yNA1SwVoNQ5FxdSpRyyMLk4pn 7YgY73uxMHoPE4KEean2oxgc+PChgDxTwBTpLIS/aN+5RRMXUgEnq93r1WnjI5u0rT7nFn a1Zpc0AyUut/I6Ko6mXVnlQWWZ9OfFwDUIjtoIId0V3wD8kn9IYzYze1aAmLmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6Rcv1McvzTQ; Wed, 20 Aug 2025 13:09:51 +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 57KD9pCY023842; Wed, 20 Aug 2025 13:09:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KD9peU023839; Wed, 20 Aug 2025 13:09:51 GMT (envelope-from git) Date: Wed, 20 Aug 2025 13:09:51 GMT Message-Id: <202508201309.57KD9peU023839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 8d23b31485fb - main - depend-cleanup: Add a clean_obj function 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d23b31485fb60049cd9344b80b362ec08e9cf75 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8d23b31485fb60049cd9344b80b362ec08e9cf75 commit 8d23b31485fb60049cd9344b80b362ec08e9cf75 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-20 12:55:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-20 13:09:11 +0000 depend-cleanup: Add a clean_obj function The clean_dep function is primarily intended for when a source file is renamed. The 20241025 entry for libcrypt was not related to a rename and resulted in libcrypt getting cleaned out and rebuilt every time. Add a clean_obj function which does what the 20241025 entry needs: delete an object file if it matches a particular regex. This also changes every occurrence of `rm -f` to `rm -fv` so we can more easily tell what gets cleaned up. Fixes: d8cd2d0833e0 ("depend-cleanup.sh: clean up after hash function removal from libcrypt") Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D52012 --- tools/build/depend-cleanup.sh | 64 ++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 19 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index cd51c59ff0e1..22bf34439758 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -50,12 +50,12 @@ # - Replacing generated files with files committed to the tree. This is special # case of moving from one directory to another. The stale generated file also # needs to be deleted, so that it isn't found in make's .PATH. Note the -# unconditional `rm -f`: there's no need for an extra call to first check for +# unconditional `rm -fv`: there's no need for an extra call to first check for # the file's existence. # # # 20250110 3863fec1ce2d add strlen SIMD implementation # clean_dep lib/libc strlen S arm-optimized-routines -# run rm -f "$OBJTOP"/lib/libc/strlen.S +# run rm -fv "$OBJTOP"/lib/libc/strlen.S # # A rule may be required for only one architecture: # @@ -152,6 +152,11 @@ run() fi } +# Clean the depend and object files for a given source file if the +# depend file matches a regex (which defaults to the source file +# name). This is typically used if a file was renamed, especially if +# only its extension was changed (e.g. from .c to .cc). +# # $1 directory # $2 source filename w/o extension # $3 source extension @@ -162,13 +167,34 @@ clean_dep() dirprfx=${libcompat:+obj-lib${libcompat}/} if egrep -qw "${4:-$2\.$3}" "$OBJTOP"/$dirprfx$1/.depend.$2.*o 2>/dev/null; then echo "Removing stale ${libcompat:+lib${libcompat} }dependencies and objects for $2.$3" - run rm -f \ + run rm -fv \ "$OBJTOP"/$dirprfx$1/.depend.$2.* \ "$OBJTOP"/$dirprfx$1/$2.*o fi done } +# Clean the object file for a given source file if it exists and +# matches a regex. This is typically used if a a change in CFLAGS or +# similar caused a change in the generated code without a change in +# the sources. +# +# $1 directory +# $2 source filename w/o extension +# $3 source extension +# $4 regex for egrep -w +clean_obj() +{ + for libcompat in "" $ALL_libcompats; do + dirprfx=${libcompat:+obj-lib${libcompat}/} + if strings "$OBJTOP"/$dirprfx$1/$2.*o 2>/dev/null | egrep -qw "${4}"; then + echo "Removing stale ${libcompat:+lib${libcompat} }objects for $2.$3" + run rm -fv \ + "$OBJTOP"/$dirprfx$1/$2.*o + fi + done +} + extract_epoch() { [ -s "$1" ] || return 0 @@ -243,7 +269,7 @@ fi if stat "$OBJTOP"/tests/sys/kqueue/libkqueue/*kqtest* \ "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.kqtest* >/dev/null 2>&1; then echo "Removing old kqtest" - run rm -f "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.* \ + run rm -fv "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.* \ "$OBJTOP"/tests/sys/kqueue/libkqueue/* fi @@ -317,7 +343,7 @@ fi if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ ! grep -q 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then echo "removing rescue.mk without nvme_util.o" - run rm -f "$OBJTOP"/rescue/rescue/rescue.mk + run rm -fv "$OBJTOP"/rescue/rescue/rescue.mk fi # 20240910 e2df9bb44109 @@ -337,7 +363,7 @@ if [ ${MACHINE} = riscv ]; then fi if ! grep -q 'lib/libc/csu/riscv/reloc\.c' "$f"; then echo "Removing stale dependencies and objects for libc_start1.c" - run rm -f \ + run rm -fv \ "$OBJTOP"/lib/libc/.depend.libc_start1.* \ "$OBJTOP"/lib/libc/libc_start1.*o break @@ -351,28 +377,28 @@ f="$p"/arm_mve_builtin_sema.inc if [ -e "$f" ]; then if grep -q SemaBuiltinConstantArgRange "$f"; then echo "Removing pre-llvm19 clang-tblgen output" - run rm -f "$p"/*.inc + run rm -fv "$p"/*.inc fi fi # 20241025 cb5e41b16083 Unbundle hash functions fom lib/libcrypt -clean_dep lib/libcrypt crypt-md5 c -clean_dep lib/libcrypt crypt-nthash c -clean_dep lib/libcrypt crypt-sha256 c -clean_dep lib/libcrypt crypt-sha512 c +clean_obj lib/libcrypt crypt-md5 c __MD5Init +clean_obj lib/libcrypt crypt-nthash c __MD4Init +clean_obj lib/libcrypt crypt-sha256 c __SHA256Init +clean_obj lib/libcrypt crypt-sha512 c __SHA512Init # 20241213 b55f5e1c4ae3 jemalloc: Move generated jemalloc.3 into lib/libc tree if [ -h "$OBJTOP"/lib/libc/jemalloc.3 ]; then # Have to cleanup the jemalloc.3 in the obj tree since make gets # confused and won't use the one in lib/libc/malloc/jemalloc/jemalloc.3 echo "Removing stale jemalloc.3 object" - run rm -f "$OBJTOP"/lib/libc/jemalloc.3 + run rm -fv "$OBJTOP"/lib/libc/jemalloc.3 fi if [ $MACHINE_ARCH = aarch64 ]; then # 20250110 5e7d93a60440 add strcmp SIMD implementation ALL_libcompats= clean_dep lib/libc strcmp S arm-optimized-routines - run rm -f "$OBJTOP"/lib/libc/strcmp.S + run rm -fv "$OBJTOP"/lib/libc/strcmp.S # 20250110 b91003acffe7 add strspn optimized implementation ALL_libcompats= clean_dep lib/libc strspn c @@ -391,7 +417,7 @@ if [ $MACHINE_ARCH = aarch64 ]; then # 20250110 25c485e14769 add strncmp SIMD implementation ALL_libcompats= clean_dep lib/libc strncmp S arm-optimized-routines - run rm -f "$OBJTOP"/lib/libc/strncmp.S + run rm -fv "$OBJTOP"/lib/libc/strncmp.S # 20250110 bad17991c06d add memccpy SIMD implementation ALL_libcompats= clean_dep lib/libc memccpy c @@ -402,11 +428,11 @@ if [ $MACHINE_ARCH = aarch64 ]; then # 20250110 bea89d038ac5 add strlcat SIMD implementation, and move memchr ALL_libcompats= clean_dep lib/libc strlcat c "libc.string.strlcat.c" ALL_libcompats= clean_dep lib/libc memchr S "[[:space:]]memchr.S" - run rm -f "$OBJTOP"/lib/libc/memchr.S + run rm -fv "$OBJTOP"/lib/libc/memchr.S # 20250110 3863fec1ce2d add strlen SIMD implementation ALL_libcompats= clean_dep lib/libc strlen S arm-optimized-routines - run rm -f "$OBJTOP"/lib/libc/strlen.S + run rm -fv "$OBJTOP"/lib/libc/strlen.S # 20250110 79e01e7e643c add bcopy & bzero wrapper ALL_libcompats= clean_dep lib/libc bcopy c "libc.string.bcopy.c" @@ -431,15 +457,15 @@ clean_dep usr.sbin/ctld uclparse c # 20250425 2e47f35be5dc libllvm, libclang and liblldb became shared libraries if [ -f "$OBJTOP"/lib/clang/libllvm/libllvm.a ]; then echo "Removing old static libllvm library" - run rm -f "$OBJTOP"/lib/clang/libllvm/libllvm.a + run rm -fv "$OBJTOP"/lib/clang/libllvm/libllvm.a fi if [ -f "$OBJTOP"/lib/clang/libclang/libclang.a ]; then echo "Removing old static libclang library" - run rm -f "$OBJTOP"/lib/clang/libclang/libclang.a + run rm -fv "$OBJTOP"/lib/clang/libclang/libclang.a fi if [ -f "$OBJTOP"/lib/clang/liblldb/liblldb.a ]; then echo "Removing old static liblldb library" - run rm -f "$OBJTOP"/lib/clang/liblldb/liblldb.a + run rm -fv "$OBJTOP"/lib/clang/liblldb/liblldb.a fi # 20250813 4f766afc1ca0 tcopy converted to C++ From nobody Wed Aug 20 13:14:59 2025 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 4c6Rkr51Grz64vrN; Wed, 20 Aug 2025 13:15:00 +0000 (UTC) (envelope-from jhb@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6Rkr3Sq4z3Rxb; Wed, 20 Aug 2025 13:15:00 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755695700; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2wPI7Y3PtPMuzMqfdJKUGYphEOfp1g2hHqC+swZo0mw=; b=VSIYtMAQCybfLGo5+Dh37xDulDhUfybLl/LdFpzjeZXxW57MS5MYLBqNfyKSst2sOo2TFY WnU7GJIw+AQNvDBW5lPnQLTxay62JIJ7bjLvL6qGmxplbrLm8L5W4KWjJkPoh5Y5Jwbqgh bRYRYnXLTAh7tz23yhMcRsdz8kIjswaT6sl9DmxVlFLbmeEIsFjRikHP1Z7sPYJnaJfcKa R6EcI8DK2e0UGYW21zI87hpdImOtzE/a1qSsL+4Jbtys9JlPK6XpXyBoHRm3H1YP4bF8tL Ev0FS4nHXIutUlA9xtT6d3nYRJor+gJP+A3e8zF/fQ1i9HGwi/HKT5MtPmf68A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755695700; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2wPI7Y3PtPMuzMqfdJKUGYphEOfp1g2hHqC+swZo0mw=; b=rFIF43+dStb5n4d3GS6KO3Z3C7M7bPqraLf7uKUudlXKPjvxkMLHgWoc75ylsLOowUVTMW wmCB+QJVt9aniaGDKC2OgHhK4yJo34Mu2bXDQwu9UWq3Hyn2v3oIfM6E3rewvkNIgzG/wT 9xGYGbBumudiROgrmNBt1QJVNeIB0R42roxN/1TcT1NtBcwOU+wmAOZ0miCDxDivy+FNdP gz/PAcgQcgmnuIMuZnthfootSOLpKas2UtPqdmdWvSEC3igH4ouhJXzLI9l61Qq7zka9Fz dJwGQH/Cnjqi8FqXpsiGaNdPYmQXXauDH2+YqTDNVHph/YmeYezI8v/GZrcR9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755695700; a=rsa-sha256; cv=none; b=O52ogY1JtBfallqYlt+MoWiVrch3wTco88JvWTqgPqpt7rZf8GU63PLe7vyWAc83JJGrNG xke1m6FTp2nQtOiGpBApdUFhYouopJKwIudVkNyxNsIBy0VCEiFVHykUfUrwVXE/uwRXmO tWH38+efbkI/Ba1D25vxtzhM90yZQGz5BglbzFfor9FlXbp8Hr1BfNZipuPaJh2n4XSPVg iC6UJiSLuZsXAuLqcqeUPb9VaVZWKRg6c/lp/2XIeur1T7PGbNHKbN4xNhr1VVOtWo/Rb2 ikEXN2T/W90gCZ1hLIqPsvalJVVyIKb683FFki0/JfQD7BR3O6dgdgES3pgyjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:dcd8:8b69:c90b:430f] (unknown [IPv6:2601:5c0:4202:5670:dcd8:8b69:c90b:430f]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c6Rkr0tWhzmBf; Wed, 20 Aug 2025 13:15:00 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Wed, 20 Aug 2025 09:14:59 -0400 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 75acf71786f2 - main - libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp Content-Language: en-US To: =?UTF-8?Q?Dag-Erling_Sm=C3=B8rgrav?= , Konstantin Belousov Cc: Aymeric Wibo , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202508192309.57JN9cNK038457@gitrepo.freebsd.org> <868qjejqdb.fsf@ltc.des.dev> <86wm6yia1i.fsf@ltc.des.dev> From: John Baldwin In-Reply-To: <86wm6yia1i.fsf@ltc.des.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 8/20/25 06:04, Dag-Erling Smørgrav wrote: > Konstantin Belousov writes: >> Dag-Erling Smørgrav writes: >>> Konstantin Belousov writes: >>>> Aymeric Wibo writes: >>>>> libifconfig: Remove ifconfig_set_fib and ifconfig_sfp_id_is_qsfp >>>> This breaks the ABI, of course. >>> No, it does not. Please take the time to check before throwing >>> accusations around. >> If a symbol is removed from the library export list, its ABI is broken. > > Again, please *take the time to check* before lashing out. I promise > you we'll still be here when you get back. Well, in kib's defense, it is rather stupid to have a symbol map that is never used and thus _never verified_ checked into the tree for an internal lib. The bug was adding this symbol map in the first place, and it should probably be deleted. If at some point we decide to convert this library to actually be a shared library, that is the point at which we would have an ABI we are committed to and is when we should add a symbol map. This was arguably broken on the initial import back in 2016 as libifc as that Makefile set SHLIBDIR and SHLIB_MAJOR, but also set NO_PIC to disable the shared library build. I think adding the version map just built on this mistake, and we should remove all the shlib cruft and symbol versions until this library has a stable ABI. -- John Baldwin From nobody Wed Aug 20 13:42:57 2025 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 4c6SM60qXQz64xkl; Wed, 20 Aug 2025 13:42:58 +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 4c6SM60KnBz3WBL; Wed, 20 Aug 2025 13:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755697378; 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=uK3HCT9gWTTnyypc4nfqZKCBaqxew/LRoh8pl06TwII=; b=AAjrFBGvyDi+zEcbqTzj17TRxlEwna9HyLPRqmymUJtFThTzM8Ktk+sI8ZY0FL/llCUQci n2b2qG8fbdsa28krxblTHpi0+ve9o13g/en6DuqAilHh84Sw5iEXenFE8py1gzaUmazzkd mD99XO3IyWq3MQyJMxVp6utmF5c3GXc16OWIxwHvzOzruaDULibcVPdtoGGi3CBxyyabpp V1rDCjLzcd4TGdJs42lVRCx24obcyH+75pAISdhH9iCoa1RS5OTzkZiDYoGeG343AsmsV9 AJoWNydCfYb3Zy7Se9K71bpVc2YOWMG4+V3KrgTnvBe5Mxqd0NSwBlGQ5OzfdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755697378; 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=uK3HCT9gWTTnyypc4nfqZKCBaqxew/LRoh8pl06TwII=; b=VkF7QxqiZd4++l7uFcO4/9vqIMTRQ6tQz8K/sNuCN6VyLYWQcxICOEXvIpeuS1xXykZPsO aeALrA5dE9/G8pEkqZcHExvpW4TPu9hA/UB3orPaxILzm4/Zlpaf07ylLpkYg2xGJa5XPr zwc+iNWprpqZCP2LK0BB62gkZskk3gcNufu0MCMH+xF2YYwtI9JIGdbrGGgsDRKr2LQzRe 8sGjD5y6zdmaZg6v+y1e4l9nkJZPt09NeWecvYWi0BtYX9O2uYIe9fHT/NbAHQkTHp8K7i WH661w6XB8tk8LTXAXgMgAkAsOKX2aD2RzWBowm4lw7bSR86gyyMtFO9K2kYuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755697378; a=rsa-sha256; cv=none; b=t09gAhalA4G/t5J3F7fwTL2aGuQsZFBWB/sCcgqxZM7NOJgawjUUpf+vE3zHptHjhVfj2O 9BfbBMsVoXsHoFZv1lfCoLr9i1Yf64nfQTFiQRRTy72GKQ19UenrDcYJ2PYVDVFmkOdfNW t3FGurBdMpd1Ve6MEHJfP6UAyGGbrN9WYomEbH9kecuwZuumSrpLle9afwS1LHQch4dCvd 1XhHHJMkSggLm/WvU+WOzhHwvn5N5/rtQyA2yMZoKPf8qznDQIam7H7vY2MNB7DUiiPSeX /HqlbcefHCIxkX/fYlJNctbUDN7fe4MMkrnCU+ZZtDhf3PL8qf8lW6Xr2cit/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6SM5711Bz1ZN; Wed, 20 Aug 2025 13:42:57 +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 57KDgvST096877; Wed, 20 Aug 2025 13:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KDgvVE096874; Wed, 20 Aug 2025 13:42:57 GMT (envelope-from git) Date: Wed, 20 Aug 2025 13:42:57 GMT Message-Id: <202508201342.57KDgvVE096874@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 94ca18c18bb0 - main - zfs: fix build issues from 53a2e2635 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94ca18c18bb0d231c66f146704d9233da48bc84e Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=94ca18c18bb0d231c66f146704d9233da48bc84e commit 94ca18c18bb0d231c66f146704d9233da48bc84e Author: Martin Matuska AuthorDate: 2025-08-20 12:57:36 +0000 Commit: Martin Matuska CommitDate: 2025-08-20 13:42:33 +0000 zfs: fix build issues from 53a2e2635 Add aesni-gcm-avx2-vaes.S to libicp, libicp_rescue and module build This was somehow not catched by my make universe --- cddl/lib/libicp/Makefile | 2 ++ cddl/lib/libicp_rescue/Makefile | 2 ++ sys/conf/files.amd64 | 3 +++ sys/modules/zfs/Makefile | 6 +++++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index f097e7e6ff58..8e801246215f 100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -11,6 +11,7 @@ ASM_SOURCES_AS = \ asm-x86_64/aes/aes_aesni.S \ asm-x86_64/modes/gcm_pclmulqdq.S \ asm-x86_64/modes/aesni-gcm-x86_64.S \ + asm-x86_64/modes/aesni-gcm-avx2-vaes.S \ asm-x86_64/modes/ghash-x86_64.S \ asm-x86_64/sha2/sha256-x86_64.S \ asm-x86_64/sha2/sha512-x86_64.S \ @@ -112,6 +113,7 @@ CFLAGS.aes_amd64.S+= -DLOCORE CFLAGS.aes_aesni.S+= -DLOCORE CFLAGS.gcm_pclmulqdq.S+= -DLOCORE CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE +CFLAGS.aesni-gcm-avx2-vaes.S+= -DLOCORE CFLAGS.ghash-x86_64.S+= -DLOCORE CFLAGS.sha256-x86_64.S+= -DLOCORE CFLAGS.sha512-x86_64.S+= -DLOCORE diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile index 3a8b6746fe61..0a5a81f4ab7f 100644 --- a/cddl/lib/libicp_rescue/Makefile +++ b/cddl/lib/libicp_rescue/Makefile @@ -11,6 +11,7 @@ ASM_SOURCES_AS = \ asm-x86_64/aes/aes_aesni.S \ asm-x86_64/modes/gcm_pclmulqdq.S \ asm-x86_64/modes/aesni-gcm-x86_64.S \ + asm-x86_64/modes/aesni-gcm-avx2-vaes.S \ asm-x86_64/sha2/sha256-x86_64.S \ asm-x86_64/sha2/sha512-x86_64.S \ asm-x86_64/blake3/blake3_avx2.S \ @@ -109,6 +110,7 @@ CFLAGS.aes_amd64.S+= -DLOCORE CFLAGS.aes_aesni.S+= -DLOCORE CFLAGS.gcm_pclmulqdq.S+= -DLOCORE CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE +CFLAGS.aesni-gcm-avx2-vaes.S+= -DLOCORE CFLAGS.ghash-x86_64.S+= -DLOCORE CFLAGS.sha256-x86_64.S+= -DLOCORE CFLAGS.sha512-x86_64.S+= -DLOCORE diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 80548320c3fc..9b6ba03b78df 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -419,6 +419,9 @@ contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_avx512.S optional zfs com contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_sse2.S optional zfs compile-with "${ZFS_S}" contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_sse41.S optional zfs compile-with "${ZFS_S}" +# zfs AVX2 implementation of aes-gcm from BoringSSL +contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S optional zfs compile-with "${ZFS_S}" + # zfs sha2 hash support zfs-sha256-x86_64.o optional zfs \ dependency "$S/contrib/openzfs/module/icp/asm-x86_64/sha2/sha256-x86_64.S" \ diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 0dc85e3fa684..ec531ed646a7 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -15,6 +15,7 @@ KMOD= zfs ${SRCDIR}/icp/asm-ppc64/sha2 \ ${SRCDIR}/icp/asm-ppc64/blake3 \ ${SRCDIR}/icp/asm-x86_64/blake3 \ + ${SRCDIR}/icp/asm-x86_64/modes \ ${SRCDIR}/icp/asm-x86_64/sha2 \ ${SRCDIR}/os/freebsd/spl \ ${SRCDIR}/os/freebsd/zfs \ @@ -41,7 +42,7 @@ CFLAGS+= -D__KERNEL__ -DFREEBSD_NAMECACHE -DBUILDING_ZFS \ .if ${MACHINE_ARCH} == "amd64" CFLAGS+= -D__x86_64 -DHAVE_SSE2 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 \ -DHAVE_AVX -DHAVE_AVX2 -DHAVE_AVX512F -DHAVE_AVX512VL -DHAVE_AVX512BW \ - -DHAVE_VAES HAVE_VPCLMULQDQ + -DHAVE_VAES -DHAVE_VPCLMULQDQ .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ @@ -83,6 +84,9 @@ SRCS+= blake3_avx2.S \ blake3_avx512.S \ blake3_sse2.S \ blake3_sse41.S + +#icp/asm-x86_64/modes +SRCS+= aesni-gcm-avx2-vaes.S .endif #icp/algs/sha2 From nobody Wed Aug 20 13:44:14 2025 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 4c6SNc20QYz64xmw; Wed, 20 Aug 2025 13:44:16 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6SNc1Gtyz3WZK; Wed, 20 Aug 2025 13:44:16 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755697456; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zZh3y5kAtzBTCDJmGk3457hAHEfsBc+UZspKLi59yVs=; b=dUxQ2/E7fw3KJ/V3DG7eS790dvw/ny8zjT0Dm0eHAXKEd2FrMSeoX95i9x7FEcZEsDRPfz V8m6sQvzG3xOxL8r8y4oT+6UU6Ag++yKTYjBxJBkwIZOEh+twfIHo4Caf7VTz3F8aPk3mX lh8rMycp77fQ6+YFj3qJnEsL9aTtb464U3ehBCJiW1GBob9Gd6ZYQTnpNG7oeJxoSByqZY 6zVBaTSxMsv81XZS98xJlPbgGgqqZqz20B69cNJg2dIa2IE0JAw4KvLE6ihyahXLbNtUHj tOD80q5acY1icJXCrY20r11rK7QCHFO6z+nclFhiYsU0KzE3ZOvyf9d70+P6Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755697456; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zZh3y5kAtzBTCDJmGk3457hAHEfsBc+UZspKLi59yVs=; b=K7mABe4PohoyLAFlBpdlvOi2RPtkuscmGaNGXe9hH2Z1exuIcuZ2s3UTYze2SliTk8z46G hPXY5dPGCSd8K8Qgf3+EXi2pMFSzAnWCB74sXkZYzQkf85m5xnDULoFF+7yrPSy7EI1tI6 Uxbr6IeNeCRhKlvl2Q0w+OqCXvjbEeoh4yrjjTU0sKVS9zK4wCrkKMuCc6Mr4+fieemcQ0 jwbPimr/DilT/MHvWSOphkYsDdMsLrz3Qt1rBXbUaOmepUwyZcjE9LK7RMmA+1bbgmmlUO iOWjGQi+bABjZBKYi3E6j8mqLb3onVLjSBBIKFJOu7AtCL7xxHKJjeH9BOacGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755697456; a=rsa-sha256; cv=none; b=SzDJpGWPEFMYgMhVwLt/SKcp4UnPvx3zjmoKLnoa36NpbbsvRoI5ATMRQUtcRAslZMtx6r F0JGi8wYY7PNkrRlZzRolunVMnwGeHKO1xd9ctjfc146dI5e3dHz8rrNdSCeWkrewjbsOe k6NNjGpNkeyrmvGw1dnr5sZFk9ASMt2Y9u6sxEOmxEAR/gyMVIhu5FCS3uIaolDV5xIpG4 wVZGKr0PoVuE85Y0Qc1w2qX3t9UEetR+Idcbtn23NT73AWPipIAUe5qtrIiBzF21QsxDx5 NC4hLJxpx3Ux3zU9Sel/5CbQv+NoKwoC3DEI8xZcWKcvWVyutm7Yzvi7YiVrKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.dev (88-177-82-251.subs.proxad.net [88.177.82.251]) (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: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c6SNb74kjzkZm; Wed, 20 Aug 2025 13:44:15 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 8FABC3C2D5; Wed, 20 Aug 2025 15:44:14 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Martin Matuska Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 53a2e2635ab2 - main - zfs: merge openzfs/zfs@a9410ccbd In-Reply-To: <202508200901.57K91hlO061803@gitrepo.freebsd.org> (Martin Matuska's message of "Wed, 20 Aug 2025 09:01:43 GMT") References: <202508200901.57K91hlO061803@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 20 Aug 2025 15:44:14 +0200 Message-ID: <86plcqhzv5.fsf@ltc.des.dev> 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: quoted-printable Martin Matuska writes: > zfs: merge openzfs/zfs@a9410ccbd This doesn't build, please either fix asap or revert. cc -target x86_64-unknown-freebsd15.0 --sysroot=3D/usr/obj/usr/src/amd6= 4.amd64/tmp -B/usr/obj/usr/src/amd64.amd64/tmp/usr/bin -O2 -pipe -fno-commo= n -DIN_BASE -I/usr/src/sys/contrib/openzfs/include -I/usr/src/sys/contrib/o= penzfs/lib/libspl/include -I/usr/src/sys/contrib/openzfs/lib/libspl/include= /os/freebsd -I/usr/src/sys/contrib/openzfs/lib/libzpool/include -I/usr/src/= cddl/compat/opensolaris/include -I/usr/src/sys/contrib/openzfs/module/icp/i= nclude -include /usr/src/sys/contrib/openzfs/include/os/freebsd/spl/sys/cco= mpile.h -DHAVE_ISSETUGID -include /usr/src/sys/modules/zfs/zfs_config.h -g = -DDEBUG=3D1 -Wno-format -DZFS_DEBUG=3D1 -DNEED_SOLARIS_BOOLEAN -DHAVE_STRLC= AT -DHAVE_STRLCPY -fPIE -g -gz=3Dzlib -std=3Diso9899:1999 -Wno-format-zero-= length -fstack-protector-strong -Wsystem-headers -Werror -Wall -Wno-format-= y2k -Wno-uninitialized -Wno-pointer-sign -Wdate-time -Wno-unknown-pragmas -= Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Wno-error= =3Dunused-but-set-parameter -Wno-error=3Dcast-function-type-mismatch -Wno-t= autological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-unused= -function -Wno-enum-conversion -Wno-unused-local-typedef -Wno-address-of-pa= cked-member -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Qunus= ed-arguments -Wl,-zrelro -pie -o ztest.full ztest.pieo -lgeom -lm -= lnvpair -lumem -lzpool -lavl -lzfs_core -lspl -lzutil -lzfs -luuti= l -licp -lpthread=20 ld: error: undefined reference: gcm_ghash_vpclmulqdq_avx2 >>> referenced by /usr/obj/usr/src/amd64.amd64/tmp/usr/lib/libicp.so (d= isallowed by --no-allow-shlib-undefined) =20=20=20=20 ld: error: undefined reference: gcm_init_vpclmulqdq_avx2 >>> referenced by /usr/obj/usr/src/amd64.amd64/tmp/usr/lib/libicp.so (d= isallowed by --no-allow-shlib-undefined) =20=20=20=20 ld: error: undefined reference: aes_gcm_enc_update_vaes_avx2 >>> referenced by /usr/obj/usr/src/amd64.amd64/tmp/usr/lib/libicp.so (d= isallowed by --no-allow-shlib-undefined) =20=20=20=20 ld: error: undefined reference: aes_gcm_dec_update_vaes_avx2 >>> referenced by /usr/obj/usr/src/amd64.amd64/tmp/usr/lib/libicp.so (d= isallowed by --no-allow-shlib-undefined) cc: error: linker command failed with exit code 1 (use -v to see invoca= tion) *** Error code 1 =20=20=20=20 Stop. make[5]: stopped making "all" in /usr/src/cddl/usr.bin/ztest DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Wed Aug 20 13:50:12 2025 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 4c6SWV0Ht6z64xvN; Wed, 20 Aug 2025 13:50:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6SWT6bD0z3XVd; Wed, 20 Aug 2025 13:50:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755697814; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PG08ri22QzDNpJr+rJXJWzlhtUgP3lal3h0BM6HMe84=; b=yD+XMUDBHpuja9T4UQuBxnzwH1hVsdc8xjOEN0dg/FS3XIvm6fOPBe5/Apx1vOVd5iAQrC 9dZwB4ots6maXK4trHVHsodGE1xH3YYWvXZalmOJ+8mtoJ/TaL0ix5LVd4OuF92JJxfpFc dsJYMyhJBiAl42M3VZmb5ZblXL1Hg+10LbhZu3Cw3xNl8ewJUzSIRU01IQ8AuYf3yxEFsb M043EOeO4l+uWYSt3z87/HOTg8YsyrhjQ6vjkVE2pqQdKPa2lxskegYAqw3PFKo63IgKJw beYJs/b0nk4UDJZ+46k37qWuZcN2Xgqc4c3O6IPtRbzY3yyqMPyJSj3k1gkOsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755697813; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PG08ri22QzDNpJr+rJXJWzlhtUgP3lal3h0BM6HMe84=; b=No+U9W7XXOlo2eqKeiqg+20ofugAfMvsdeNKPjAJIdFxtK2iB8pEvJVraC2zjpmIVa16od s+CLy/RpxyFxAzER/K0CGG/hDVaBwsvHFEmWGcBVL1R1SGRd9yqBqjqscUNXzcYiqnz5+E YJFZ2VZxMQUIS6FRNX91lheuAMXNh6IsjEhkBXOytWyfWWWDPA9gOxjJEaYx8ktCNPKLnn TPyvPNw2rbpocL6XzJT/u5ODNjT7uqqMLbXaiCSau0XByPBLDdTtWsb5x6iSveEsLN3nXA zNEmsUd9DfzRdUafoErxYbs7AfnqmlUeZScqy/B1lse0iFBrGRRbLYeT1nNdWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755697813; a=rsa-sha256; cv=none; b=aopwjO1sWx7lM/ZrQBU2q85tjFgh7Gv6w1Xhzn2ZBxQIcZCnC9tEVBAdbXU61EpjizmJrs +B07G/IrzzyvBodXIX9+EUAZlbPpjhpzHFc1cbo4taQe03habrp/J6xMBykH/okfd2t4ee YxZJM4QR3DZNWKVdh3tDLwH214P+lpilsOOCLoNS1oWvJy4QlhbnHl4GloqlvpTqWASleN 1NtNIgSHIGfit1qOCi6I+cyAUBrA5RvjCEBawZyeIp4tMBAiNtMpEckhufqwcDfo4f+9PU HPsBmrLSxE/4lycXcZmOiqbgLYW9xmx8BLHwLbyg94DenOXY1zCKGrOCfc41Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:ada5:e608:9ff9:8e6a] (unknown [IPv6:2601:5c0:4202:5670:ada5:e608:9ff9:8e6a]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c6SWT440xzjy9; Wed, 20 Aug 2025 13:50:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Wed, 20 Aug 2025 09:50:12 -0400 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 53a2e2635ab2 - main - zfs: merge openzfs/zfs@a9410ccbd Content-Language: en-US To: =?UTF-8?Q?Dag-Erling_Sm=C3=B8rgrav?= , Martin Matuska Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202508200901.57K91hlO061803@gitrepo.freebsd.org> <86plcqhzv5.fsf@ltc.des.dev> From: John Baldwin In-Reply-To: <86plcqhzv5.fsf@ltc.des.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 T24gOC8yMC8yNSAwOTo0NCwgRGFnLUVybGluZyBTbcO4cmdyYXYgd3JvdGU6DQo+IE1hcnRp biBNYXR1c2thIDxtbUBGcmVlQlNELm9yZz4gd3JpdGVzOg0KPj4gICAgICB6ZnM6IG1lcmdl IG9wZW56ZnMvemZzQGE5NDEwY2NiZA0KPiANCj4gVGhpcyBkb2Vzbid0IGJ1aWxkLCBwbGVh c2UgZWl0aGVyIGZpeCBhc2FwIG9yIHJldmVydC4NCj4gDQo+ICAgICAgY2MgLXRhcmdldCB4 ODZfNjQtdW5rbm93bi1mcmVlYnNkMTUuMCAtLXN5c3Jvb3Q9L3Vzci9vYmovdXNyL3NyYy9h bWQ2NC5hbWQ2NC90bXAgLUIvdXNyL29iai91c3Ivc3JjL2FtZDY0LmFtZDY0L3RtcC91c3Iv YmluIC1PMiAtcGlwZSAtZm5vLWNvbW1vbiAtRElOX0JBU0UgLUkvdXNyL3NyYy9zeXMvY29u dHJpYi9vcGVuemZzL2luY2x1ZGUgLUkvdXNyL3NyYy9zeXMvY29udHJpYi9vcGVuemZzL2xp Yi9saWJzcGwvaW5jbHVkZSAtSS91c3Ivc3JjL3N5cy9jb250cmliL29wZW56ZnMvbGliL2xp YnNwbC9pbmNsdWRlL29zL2ZyZWVic2QgLUkvdXNyL3NyYy9zeXMvY29udHJpYi9vcGVuemZz L2xpYi9saWJ6cG9vbC9pbmNsdWRlIC1JL3Vzci9zcmMvY2RkbC9jb21wYXQvb3BlbnNvbGFy aXMvaW5jbHVkZSAtSS91c3Ivc3JjL3N5cy9jb250cmliL29wZW56ZnMvbW9kdWxlL2ljcC9p bmNsdWRlIC1pbmNsdWRlIC91c3Ivc3JjL3N5cy9jb250cmliL29wZW56ZnMvaW5jbHVkZS9v cy9mcmVlYnNkL3NwbC9zeXMvY2NvbXBpbGUuaCAtREhBVkVfSVNTRVRVR0lEIC1pbmNsdWRl IC91c3Ivc3JjL3N5cy9tb2R1bGVzL3pmcy96ZnNfY29uZmlnLmggLWcgLURERUJVRz0xIC1X bm8tZm9ybWF0IC1EWkZTX0RFQlVHPTEgLURORUVEX1NPTEFSSVNfQk9PTEVBTiAtREhBVkVf U1RSTENBVCAtREhBVkVfU1RSTENQWSAtZlBJRSAtZyAtZ3o9emxpYiAtc3RkPWlzbzk4OTk6 MTk5OSAtV25vLWZvcm1hdC16ZXJvLWxlbmd0aCAtZnN0YWNrLXByb3RlY3Rvci1zdHJvbmcg LVdzeXN0ZW0taGVhZGVycyAtV2Vycm9yIC1XYWxsIC1Xbm8tZm9ybWF0LXkyayAtV25vLXVu aW5pdGlhbGl6ZWQgLVduby1wb2ludGVyLXNpZ24gLVdkYXRlLXRpbWUgLVduby11bmtub3du LXByYWdtYXMgLVduby1lbXB0eS1ib2R5IC1Xbm8tc3RyaW5nLXBsdXMtaW50IC1Xbm8tdW51 c2VkLWNvbnN0LXZhcmlhYmxlIC1Xbm8tZXJyb3I9dW51c2VkLWJ1dC1zZXQtcGFyYW1ldGVy IC1Xbm8tZXJyb3I9Y2FzdC1mdW5jdGlvbi10eXBlLW1pc21hdGNoIC1Xbm8tdGF1dG9sb2dp Y2FsLWNvbXBhcmUgLVduby11bnVzZWQtdmFsdWUgLVduby1wYXJlbnRoZXNlcy1lcXVhbGl0 eSAtV25vLXVudXNlZC1mdW5jdGlvbiAtV25vLWVudW0tY29udmVyc2lvbiAtV25vLXVudXNl ZC1sb2NhbC10eXBlZGVmIC1Xbm8tYWRkcmVzcy1vZi1wYWNrZWQtbWVtYmVyIC1Xbm8tc3dp dGNoIC1Xbm8tc3dpdGNoLWVudW0gLVduby1rbnItcHJvbW90ZWQtcGFyYW1ldGVyIC1RdW51 c2VkLWFyZ3VtZW50cyAgLVdsLC16cmVscm8gLXBpZSAgICAtbyB6dGVzdC5mdWxsIHp0ZXN0 LnBpZW8gICAtbGdlb20gIC1sbSAgLWxudnBhaXIgIC1sdW1lbSAgLWx6cG9vbCAgIC1sYXZs ICAtbHpmc19jb3JlICAtbHNwbCAgLWx6dXRpbCAgLWx6ZnMgIC1sdXV0aWwgIC1saWNwIC1s cHRocmVhZA0KPiAgICAgIGxkOiBlcnJvcjogdW5kZWZpbmVkIHJlZmVyZW5jZTogZ2NtX2do YXNoX3ZwY2xtdWxxZHFfYXZ4Mg0KPiAgICAgID4+PiByZWZlcmVuY2VkIGJ5IC91c3Ivb2Jq L3Vzci9zcmMvYW1kNjQuYW1kNjQvdG1wL3Vzci9saWIvbGliaWNwLnNvIChkaXNhbGxvd2Vk IGJ5IC0tbm8tYWxsb3ctc2hsaWItdW5kZWZpbmVkKQ0KPiAgICAgIA0KPiAgICAgIGxkOiBl cnJvcjogdW5kZWZpbmVkIHJlZmVyZW5jZTogZ2NtX2luaXRfdnBjbG11bHFkcV9hdngyDQo+ ICAgICAgPj4+IHJlZmVyZW5jZWQgYnkgL3Vzci9vYmovdXNyL3NyYy9hbWQ2NC5hbWQ2NC90 bXAvdXNyL2xpYi9saWJpY3Auc28gKGRpc2FsbG93ZWQgYnkgLS1uby1hbGxvdy1zaGxpYi11 bmRlZmluZWQpDQo+ICAgICAgDQo+ICAgICAgbGQ6IGVycm9yOiB1bmRlZmluZWQgcmVmZXJl bmNlOiBhZXNfZ2NtX2VuY191cGRhdGVfdmFlc19hdngyDQo+ICAgICAgPj4+IHJlZmVyZW5j ZWQgYnkgL3Vzci9vYmovdXNyL3NyYy9hbWQ2NC5hbWQ2NC90bXAvdXNyL2xpYi9saWJpY3Au c28gKGRpc2FsbG93ZWQgYnkgLS1uby1hbGxvdy1zaGxpYi11bmRlZmluZWQpDQo+ICAgICAg DQo+ICAgICAgbGQ6IGVycm9yOiB1bmRlZmluZWQgcmVmZXJlbmNlOiBhZXNfZ2NtX2RlY191 cGRhdGVfdmFlc19hdngyDQo+ICAgICAgPj4+IHJlZmVyZW5jZWQgYnkgL3Vzci9vYmovdXNy L3NyYy9hbWQ2NC5hbWQ2NC90bXAvdXNyL2xpYi9saWJpY3Auc28gKGRpc2FsbG93ZWQgYnkg LS1uby1hbGxvdy1zaGxpYi11bmRlZmluZWQpDQo+ICAgICAgY2M6IGVycm9yOiBsaW5rZXIg Y29tbWFuZCBmYWlsZWQgd2l0aCBleGl0IGNvZGUgMSAodXNlIC12IHRvIHNlZSBpbnZvY2F0 aW9uKQ0KPiAgICAgICoqKiBFcnJvciBjb2RlIDENCj4gICAgICANCj4gICAgICBTdG9wLg0K PiAgICAgIG1ha2VbNV06IHN0b3BwZWQgbWFraW5nICJhbGwiIGluIC91c3Ivc3JjL2NkZGwv dXNyLmJpbi96dGVzdA0KDQpQcm9iYWJseSBqdXN0IG5lZWRzIHRoZSBuZXcgZmlsZSBhZGRl ZCB0byBTUkMgaW4gb3VyIGJlc3Bva2UgYnVpbGQgZ2x1ZT8NCg0KSG93ZXZlciwgaXQgZG9l cyByYWlzZSB0aGUgcXVlc3Rpb24gb2YgaG93IHRoaXMgd2FzIHRlc3RlZCAoZHVyaW5nIGNv ZGUgc2x1c2gNCm5vIGxlc3MpPw0KDQotLSANCkpvaG4gQmFsZHdpbg0KDQo= From nobody Wed Aug 20 14:05:17 2025 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 4c6Srt1zNnz64V9J; Wed, 20 Aug 2025 14:05:18 +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 4c6Srt18CDz3Z9T; Wed, 20 Aug 2025 14:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755698718; 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=IBjMD915rava+pueAkLh+wARoly7eNYLurih34r1AL8=; b=FUBGWtMdAXQEuRmogMqax6g4OTUQsNFZa09166lDN6LP2cjpaxbtzPK7d3b87dYsY/XssZ KEdLfpau3Hhwco7l1etBUGtRE1+hi4whCtrzbSiY2p/jusKcaj9J0uuiMtzxt43gEjLUC/ xop+Z7coTNL46LwCXXseY0jqxL9cQSUDTsAx7OfutIQ74rD46cwznWtbJXItHemneAuXOx CccAf8lw0K4I+F4oK4fZjYvcOgnbDI2wYYfXo2k0iuAY3YHHqORJeakvLhMrh+Cat2Myci PcuGC6VRw+b0kE8S9MrwCALeD1UIN8I+zDkDMy7Tq4aqD6HVdyr6ZlKDh9iXRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755698718; 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=IBjMD915rava+pueAkLh+wARoly7eNYLurih34r1AL8=; b=plvYw0L7/dtqaSC2254Zc9oLhYNTNByzFy5+8unLcOmp0NHoSrHkpbX/r55MRMSNa298lu YTgbfDyed1ShCqKYMNTHzHML16OtCwOcEA8L+k/XxkAZdkUDVOmbPd01KU1x8bV+uVompn A0cyGheDRK79zjZ94VsEVYeET0+65siSn+eyujyLYvBrQZt3SICgR8Yd7p9BWA9qKal9mm Qn2IyYXcKT82R2P4oh/lJJDlDY6QqgzwOQrRGXju7C8mQaXbVyjDtrRHZE/9N/+/7Dtzgf Yzr4C41Bbupo1PMw+Z6zRX4VJdYP4VXBopMpbdzaZbpAWLpm6WstCDXqk/ELxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755698718; a=rsa-sha256; cv=none; b=xcmjh2XjS79aPkMW4C0i9fTdY8VP5T9pihmOs/kCa8uLr/ijs12t4mGaeIcK06+YKRoSmZ BYrjXYLULvHIX2RT/TpSCc11cO1QQorOzasR5pm652p4W55m0+BW0t4PlXEaoUt2/cadl3 W74bxx7TdsYTCn3TSZ1RyuK7b7IO3UVmBjYGDIsXcxeYU8vddmLVSyRnEvsEgO8K/mkcZ8 nskQyqg2Wzez72yl2sriGvG93poLIl8waNpacsFgsZz5g1XB7P61uqSMyMRh5JyT5BTh+S cTk44JAhKFqLKKn6CF7tTg+imaW79GtELaU/MrjoAZ7FYcIscxkYx5kmcXX3Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6Srt0kr1z1dk; Wed, 20 Aug 2025 14:05:18 +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 57KE5IN9036064; Wed, 20 Aug 2025 14:05:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KE5HiU036062; Wed, 20 Aug 2025 14:05:17 GMT (envelope-from git) Date: Wed, 20 Aug 2025 14:05:17 GMT Message-Id: <202508201405.57KE5HiU036062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 39fea5c8dc59 - main - ObsoleteFiles.inc: Don't remove /usr/share/et 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39fea5c8dc598021e900c4feaf0e18111fda57b2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=39fea5c8dc598021e900c4feaf0e18111fda57b2 commit 39fea5c8dc598021e900c4feaf0e18111fda57b2 Author: John Baldwin AuthorDate: 2025-08-20 14:02:40 +0000 Commit: John Baldwin CommitDate: 2025-08-20 14:05:03 +0000 ObsoleteFiles.inc: Don't remove /usr/share/et This directory is in use again. Fixes: 5105e1ebecc7 ("krb5: Fix the installed compile_et") --- ObsoleteFiles.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index aaec7ace84fc..95d4c06fe07e 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -76,7 +76,6 @@ OLD_FILES+=usr/lib/libopencsd.so # 20250801: Move compile_et to /usr/sbin OLD_FILES+=usr/share/et/compile_et -OLD_DIRS+=usr/share/et # 20250728: zfsboot (MBR) removed OLD_FILES+=boot/zfsboot From nobody Wed Aug 20 13:54:24 2025 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 4c6T4J0mqgz64VTL; Wed, 20 Aug 2025 14:15:12 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from www541.your-server.de (www541.your-server.de [213.133.107.7]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4c6T4H3klLz3bHw; Wed, 20 Aug 2025 14:15:11 +0000 (UTC) (envelope-from mm@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: from sslproxy04.your-server.de ([78.46.152.42]) by www541.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1uojGj-0003UG-2I; Wed, 20 Aug 2025 15:54:25 +0200 Received: from localhost ([127.0.0.1]) by sslproxy04.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uojGj-0003OH-0a; Wed, 20 Aug 2025 15:54:24 +0200 Message-ID: <2a9986a5-77c0-406f-8e86-a4e853229ff4@FreeBSD.org> Date: Wed, 20 Aug 2025 15:54:24 +0200 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 53a2e2635ab2 - main - zfs: merge openzfs/zfs@a9410ccbd To: John Baldwin , =?UTF-8?Q?Dag-Erling_Sm=C3=B8rgrav?= Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202508200901.57K91hlO061803@gitrepo.freebsd.org> <86plcqhzv5.fsf@ltc.des.dev> Content-Language: en-US From: Martin Matuska Autocrypt: addr=mm@FreeBSD.org; keydata= xsDNBGOTSakBDADYnE8uP/uR+viUTGNdMG8tWtoopvEEACFOwqx6NPb9sXvip5z20ochmO+j NqbV+OiS/6gjpd2f2fmJ241ooqbqZrWklabohbr2ros25bmi1C/77FEKsGulay334p1LXPxQ A3kjEQSINMresnt8FYCO5q50VHgmnhSNaom8jPAy9S06fWqPyXAXoJ53hwzYN6Bgb2CnU5FT wC9O4v5sI4wjQYq5JC9cbl1hM5PzC5bIse79l5NqYTsSuSY2RhOQ7w6L6V295l7C6TPkPBcq kg4Q+AYzdTTZagMN9NcchembtR/aMbuExg1PiUMdPOu99uW605XikwwYTy0ZGlz7GZE9Ecpo BaoSX5m3haM5k59e5839YtnCVbS0XOLCDp8uPMbLElGsLH6J1f1RxxV+h4r6ZypDSC0vTi54 qI1nxsdJm1n21iwQ0zP77oLUaIc+Nb0Mmh61+YFPLMgeHlfEsnsYzTWJU/tt6rlFFECKSlBG kiIXy1IeyKx2D+OlCZJ7FQMAEQEAAc0fTWFydGluIE1hdHVza2EgPG1tQEZyZWVCU0Qub3Jn PsLBFAQTAQoAPhYhBNssfPG0wmX671bj/FhIoYuPFBhLBQJjk0mpAhsDBQkFo5qABQsJCAcC BhUKCQgLAgQWAgMBAh4BAheAAAoJEFhIoYuPFBhLbPkMAM3tMymnbjprFzY1hhPOYczWI3f0 QREf+BdPt2X5325j2LV09mu3O4uiH/JBfzPc/9Z5HZzNJFaGTGpnhHrihiI6rZUDVon1CikU oiIMDWbNOMO+4WK6FVHTjziDFd/g3ql5WESgZm9SEtpHWfgvnKQAbAovKrA5CrAr8FePENKA zjlsJaEiYTrK7HrI2s5hMZkDQixFKFGgNuZe89k8HEy9ARrxGfMj1CrFtlHXts0K3hVFhdRS kPW8BxwlwuXVQYrXY5Ih6+5R2/XtjTkNrgg6EYfP11eyiN4Vfi5LuHUmwZkVXg7tfJWmcXmr Cpi6Q39JxiDZAkiSb8izebYBXHnzGHa3CgV8F7DqogO2e5a3MqUio6UVJPmeFIJogCgaJUMS KxcxjVl99Qmy6Boorpy58LDXp1T0Lcp7PhNqnmPW+Qh0/KUvuLrfWDtSc2+mL/llrEAHfIHT QbQsqpNEaOpEBpecIO5cDz1ussX/AurCw5E7DoHWJD87IOFM9LTPqM7AzQRjk0mpAQwAuz9d wJX5d7fhMD945bJDhB6ps0x2M0HFdbeClqkIbmkwq2Ws396XJhM8kd5qzrdVZZjJYSGl9vni AhLJk6uTBTZLqRG01LDh0AMsNsyN9yUH4QwqQXeui+GUHPnjzc8LkNvDgpUi9k+B1ZsDNQRE F7Jc6U3afkRCNwpym4CVeWBHhm032fU+jlKALKMlu58gHECGj4SbVChf6Gd7h4Z8p/yjx94d sqJsGog2PnwakLPKjIMNDg1X6BHFTcBHzmnaM0mtKsUQuHtmcctNC8TUP1v8NGFEcOyFNFOI BUcauUK+EhAvU2ew6qplTPjO/TcKw/Mw1++DGXDyu+3VIgBl5wIv3HPo/nNVvSy9Wrz1JztL kBjvFDtiEx/5+4baKGkkUwAQEALKlyqcuPSl0bVxmK93Hs/DgZ3+xqDm5SJGP6bI/M6jkul9 tTxpyYYSh6Z1k6w7Vc7UAEkU6FcdjpzIuAPGTuxC+eU7a1O7Wq/A/MpKvRdfox+pSC0fCQQt KcRVABEBAAHCwPwEGAEKACYWIQTbLHzxtMJl+u9W4/xYSKGLjxQYSwUCY5NJqQIbDAUJBaOa gAAKCRBYSKGLjxQYS04fC/4uG3TaACwvF2qgyzmAGEL+NjYowmHH+OuEJ4i91lYBmIEn3CyW omRuHAXq023/HUFjylqbiPl6cuQsJbLKnfCbRBaIkwTQ3f603lAwWk7mQxsXKAIIhdI536R+ sDXEV9C3zjQtNXWvO+n5hbxJgEWNa1qdbgrj0Ltx7Bpxltj7PCxZn8VXVtsRkacHuUvSGLA6 Jd+ObGDR9WUSMvLtu3/ynEnrDjBCybvxriXcPY6jW7H3spxv7KYm8AGYbtctz3S4tskUGJJv HFtVxu8fHnmQa0TO2035jMm45MOBcegVcvjAxOzJWWTMLDWb+pa5brw87tG1daXgLVpror/E LaOCIVPwjCmmQQg15vaUjL3qLI48oP43OhwcEJxvHhZ/3Je57zHwGm2vk/O/UbjbbJEu/g30 d1vd9IAuzUUKNUkW6i/cU+OkrPpiHJjS8uM81xip6FCmG0WzStrz46S6lw0GIBiw9SUwaEVB qQ/GkSXj8gzl2fLRiu1O5gkB2sgdcMs= In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Virus-Scanned: Clear (ClamAV 1.0.7/27738/Wed Aug 20 10:28:17 2025) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:213.133.96.0/19, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c6T4H3klLz3bHw Hi I have committed a fix one minute before Dag's email. I don't understand why my make universe on a amd64 with a clean obj could pass without that fix. On 20. 8. 2025 15:50, John Baldwin wrote: > On 8/20/25 09:44, Dag-Erling Smørgrav wrote: >> Martin Matuska writes: >>>      zfs: merge openzfs/zfs@a9410ccbd >> >> This doesn't build, please either fix asap or revert. >> >>      cc -target x86_64-unknown-freebsd15.0 >> --sysroot=/usr/obj/usr/src/amd64.amd64/tmp >> -B/usr/obj/usr/src/amd64.amd64/tmp/usr/bin -O2 -pipe -fno-common >> -DIN_BASE -I/usr/src/sys/contrib/openzfs/include >> -I/usr/src/sys/contrib/openzfs/lib/libspl/include >> -I/usr/src/sys/contrib/openzfs/lib/libspl/include/os/freebsd >> -I/usr/src/sys/contrib/openzfs/lib/libzpool/include >> -I/usr/src/cddl/compat/opensolaris/include >> -I/usr/src/sys/contrib/openzfs/module/icp/include -include >> /usr/src/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h >> -DHAVE_ISSETUGID -include /usr/src/sys/modules/zfs/zfs_config.h -g >> -DDEBUG=1 -Wno-format -DZFS_DEBUG=1 -DNEED_SOLARIS_BOOLEAN >> -DHAVE_STRLCAT -DHAVE_STRLCPY -fPIE -g -gz=zlib -std=iso9899:1999 >> -Wno-format-zero-length -fstack-protector-strong -Wsystem-headers >> -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign >> -Wdate-time -Wno-unknown-pragmas -Wno-empty-body -Wno-string-plus-int >> -Wno-unused-const-variable -Wno-error=unused-but-set-parameter >> -Wno-error=cast-function-type-mismatch -Wno-tautological-compare >> -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function >> -Wno-enum-conversion -Wno-unused-local-typedef >> -Wno-address-of-packed-member -Wno-switch -Wno-switch-enum >> -Wno-knr-promoted-parameter -Qunused-arguments  -Wl,-zrelro -pie    >> -o ztest.full ztest.pieo   -lgeom  -lm  -lnvpair -lumem  -lzpool   >> -lavl  -lzfs_core  -lspl  -lzutil  -lzfs -luutil  -licp -lpthread >>      ld: error: undefined reference: gcm_ghash_vpclmulqdq_avx2 >>      >>> referenced by >> /usr/obj/usr/src/amd64.amd64/tmp/usr/lib/libicp.so (disallowed by >> --no-allow-shlib-undefined) >>           ld: error: undefined reference: gcm_init_vpclmulqdq_avx2 >>      >>> referenced by >> /usr/obj/usr/src/amd64.amd64/tmp/usr/lib/libicp.so (disallowed by >> --no-allow-shlib-undefined) >>           ld: error: undefined reference: aes_gcm_enc_update_vaes_avx2 >>      >>> referenced by >> /usr/obj/usr/src/amd64.amd64/tmp/usr/lib/libicp.so (disallowed by >> --no-allow-shlib-undefined) >>           ld: error: undefined reference: aes_gcm_dec_update_vaes_avx2 >>      >>> referenced by >> /usr/obj/usr/src/amd64.amd64/tmp/usr/lib/libicp.so (disallowed by >> --no-allow-shlib-undefined) >>      cc: error: linker command failed with exit code 1 (use -v to see >> invocation) >>      *** Error code 1 >>           Stop. >>      make[5]: stopped making "all" in /usr/src/cddl/usr.bin/ztest > > Probably just needs the new file added to SRC in our bespoke build glue? > > However, it does raise the question of how this was tested (during > code slush > no less)? > From nobody Wed Aug 20 14:53:37 2025 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 4c6Twf27Jzz64XVw; Wed, 20 Aug 2025 14:53:38 +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 4c6Twf1DlDz3m4p; Wed, 20 Aug 2025 14:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701618; 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=I9mhDcFpS5zR3SsPDCkOntVFgiJraRmMfCMcD0GGD/s=; b=A+ZQI7h3/txzNX/+yv7RnaIpXsiUFVhKFdpqJ1cismNyOBz+0LDSvQ2vy3OmDf0RVUGxEB Ig0W3CZn5kMuoc/V7JIseicpOS64QfGFPejrfXNO813zlHcqzOOLM+pY5z1Yb3714Pz1Yk GX+4SdX/xhfiwaJ7uBT3KwK7L1nLok8mFKa/5p+D2S4jYudZssg02lGjwHLen6Y7g2Yzni 1pVX57b2IgaDlrOMjnoMUFBgI7NrjCGH5XCCz5YYQxXZiJUg6TZ58LjK5bS+yAZWO8lt60 k0DEImMPyUoPF4ujJvHmbUFJFNzyfjOH2F73xNcmVLOXxJFAFrZP7zfW4/unmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701618; 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=I9mhDcFpS5zR3SsPDCkOntVFgiJraRmMfCMcD0GGD/s=; b=VjD90+jdmHrDk7knhX4+qnfe7zIkoYElUBuDxg4m5vYWa+CpAxkfN2d2VFbVvD/XcLRe9y PeX3yVxbrPHnctJVLjy+k7sgQ8ZtE/MG5YZT6qVp1GmM8Hg02iiT/ZOmGDLxaM6YYtMzkE skGzXsj1g1gYPJEVjofmDiL0phL9Hk83ax6yKJxLGF/dshiFu5C52UPhFHntWdrO/yRxRF 6PZWBjyZRenpU309dWMpQAymJVkZJlOaV6WCTRHUnZ9MzihdcgKNsrggJ+8j1tQjO9vHmB tdczI7ocyZJXyF6bw6RpaCKqBmb/Nei5R0p8AdNEeuC6n9qmQz0HCGds/983OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755701618; a=rsa-sha256; cv=none; b=nbIxIlsyO7ipMb7jgBH/nMm6NjZFA3nu9eKE1AESMoLhSI2oCeNfbRjZDfxz1sv553O7LI sOxwbfCNmPjjTjHInCoqY6Z42JQQyx/LE39sHQRG1SJrz6ycOq6k/rXjTOGbvAktAglM4/ wBg05yQORGKNrAWO0BJb8yk1c57oegHYKnOjdbVHMW2RBRwNjznCIT0IRrDQkGBmiTYSet noqosRR+4cjF6s3GSTnCZOaJ1dqNGoMm2ZgR/HGqvwvQYZNP7YemJwuBCyRtWZxAqwFKBq uMe3k6wuiGLtSDoyATz98pW8Cw8/Irminy/8NFStqIFBcncnUkrkcAwI9QfCbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6Twf0fC7z30j; Wed, 20 Aug 2025 14:53:38 +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 57KErb1u028445; Wed, 20 Aug 2025 14:53:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KErbow028442; Wed, 20 Aug 2025 14:53:37 GMT (envelope-from git) Date: Wed, 20 Aug 2025 14:53:37 GMT Message-Id: <202508201453.57KErbow028442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 5d5d03356e21 - main - libsa/zfs: remove unused variable 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d5d03356e21123f7002aa4c13136db9761eb98c Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=5d5d03356e21123f7002aa4c13136db9761eb98c commit 5d5d03356e21123f7002aa4c13136db9761eb98c Author: Gleb Smirnoff AuthorDate: 2025-08-20 14:50:58 +0000 Commit: Gleb Smirnoff CommitDate: 2025-08-20 14:50:58 +0000 libsa/zfs: remove unused variable In vdev_init_from_label() we obtain the pool guid but don't use it. Reviewed by: tsoome, mav, imp Differential Revision: https://reviews.freebsd.org/D51909 --- stand/libsa/zfs/zfsimpl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index 971d71d098d3..0bf232710d7f 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -1165,13 +1165,11 @@ done: static int vdev_init_from_label(spa_t *spa, const nvlist_t *nvlist) { - uint64_t pool_guid, top_guid, txg; + uint64_t top_guid, txg; nvlist_t *vdevs; int rc; - if (nvlist_find(nvlist, ZPOOL_CONFIG_POOL_GUID, DATA_TYPE_UINT64, - NULL, &pool_guid, NULL) || - nvlist_find(nvlist, ZPOOL_CONFIG_TOP_GUID, DATA_TYPE_UINT64, + if (nvlist_find(nvlist, ZPOOL_CONFIG_TOP_GUID, DATA_TYPE_UINT64, NULL, &top_guid, NULL) || nvlist_find(nvlist, ZPOOL_CONFIG_POOL_TXG, DATA_TYPE_UINT64, NULL, &txg, NULL) != 0 || From nobody Wed Aug 20 14:53:39 2025 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 4c6Twg2GHRz64XW0; Wed, 20 Aug 2025 14:53:39 +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 4c6Twg1mLtz3m4r; Wed, 20 Aug 2025 14:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701619; 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=rMVWpbUU401KO2Dl8nfPzYUXvvZQ/bkvQ3aVjwTsENM=; b=y3L2kw/kXEg69yX+ic3J3lk/iG0z0M07Zg7X8LuYGL/nsV/nkd7aibCA89dIz1wsXtbTXN C/7vwog2XJ4+Q3RFAdwUbYZB3FAWqR77N89vjFsWKh6wP/7pJXZSD2oNWp5PMOaEJgKajO erXdluYYOqmZurb4yDEhIynF+nkq1gtxd0p2MkRXNeL6xAQfCfxTKDtLabXhlDADV+gkkE 96fgFLDDzkvATNPWANFK4aCt/S2ZJbAA2UAtnNmh4J+s7+T3hVLF3Z4AFHxMNMB2aQAPwz poKW/JJRlReE/khozUP2DXSI5T5OcrKmhLP3t03Kf6NYA54lcXXF7h/OIwhA0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701619; 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=rMVWpbUU401KO2Dl8nfPzYUXvvZQ/bkvQ3aVjwTsENM=; b=LMygS/klYTx5s3F/IXk8EjtkZZ2vsOwRl4xbtX7i/MZWX+19xinz8on2MMQV46Lk8ftRUC sCWIYpkwT6C5edCY6vgWrABvggIsEOi7Am4/g8V4x76zU7sDEFlikU4r3OtgOPY0mVC3UA dP6jVDeCnYady6tHeq75AF8XfECBCxyoK44UH+rSNkf58yT0lqpT/w3Ry5TfIN6tXZLdum kNQwHvM4kyItEYsNKIBRL7pkO8R35Q4c5JsYtzhdY+Mx1a2QJNwdWp17kfUzZCiPdlRBnV y/WoyI98VlYFU74JApVHh9c8gxItFfSyNeZqhs3kN0WAYzbx/7IUFaShwzVYMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755701619; a=rsa-sha256; cv=none; b=ZDRJRRyUsOpX1agimNoqEWF2NlmTtYgnurEOhgWVmjfLjxyWOydA9xk91qTZQKXNhCWTgX Uv8s26tJevLg+94VsZjm4BbdvtzN+cJjBmyMX9t6+L8ILVeVV8dS5QeqT0+yuxvw/cpJpw ojMQ7kVi8n2pWUvJylRAvxGgyCBjSyt0ZaW8yGRhwdUyW3XtsAcz2JmRXthCf7q7Nhdz7b dJk6KGW0sthvqyElsNZXHOgoa+f5deeaB3JhW/73ZoE1nBwvRuop9BUp0ZuX1T0HoZ8n6v 1CyjSNjUCVGJD2N6Dk86tDkM32I3imC64XOsjfuCNUC1VeF53Jiy3t2iigjbxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6Twg1JrCz2sh; Wed, 20 Aug 2025 14:53:39 +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 57KErdps028479; Wed, 20 Aug 2025 14:53:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KErd12028476; Wed, 20 Aug 2025 14:53:39 GMT (envelope-from git) Date: Wed, 20 Aug 2025 14:53:39 GMT Message-Id: <202508201453.57KErd12028476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: de055556a0d1 - main - libsa/zfs: ignore labels with zero txg 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de055556a0d18b0523f65fe0d5615723a8b4369b Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=de055556a0d18b0523f65fe0d5615723a8b4369b commit de055556a0d18b0523f65fe0d5615723a8b4369b Author: Gleb Smirnoff AuthorDate: 2025-08-20 14:51:08 +0000 Commit: Gleb Smirnoff CommitDate: 2025-08-20 14:51:08 +0000 libsa/zfs: ignore labels with zero txg Zero txg means this vdev has been correctly removed from the pool. For reference see module/zfs/vdev_removal.c in OpenZFS. It calls vdev_label_init(vd, 0, VDEV_LABEL_REMOVE), and second argument there is the txg to write. Reviewed by: tsoome, mav, imp Differential Revision: https://reviews.freebsd.org/D51910 --- stand/libsa/zfs/zfsimpl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index 0bf232710d7f..4bfb7d4179fb 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -2081,6 +2081,7 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, if (nvlist_find(nvl, ZPOOL_CONFIG_POOL_TXG, DATA_TYPE_UINT64, NULL, &txg, NULL) != 0 || + txg == 0 || nvlist_find(nvl, ZPOOL_CONFIG_TOP_GUID, DATA_TYPE_UINT64, NULL, &top_guid, NULL) != 0 || nvlist_find(nvl, ZPOOL_CONFIG_POOL_GUID, DATA_TYPE_UINT64, @@ -2090,7 +2091,7 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, nvlist_find(nvl, ZPOOL_CONFIG_GUID, DATA_TYPE_UINT64, NULL, &guid, NULL) != 0) { /* - * Cache and spare devices end up here - just ignore + * Cache, spare and replaced devices end up here - just ignore * them. */ nvlist_destroy(nvl); From nobody Wed Aug 20 14:53:40 2025 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 4c6Twh5KSWz64Xkn; Wed, 20 Aug 2025 14:53:40 +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 4c6Twh32T4z3mPW; Wed, 20 Aug 2025 14:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701620; 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=1Wywo0qOV9FqmULNkfZFkUbVwPpEj2CzPbC9P1Wk6ug=; b=W/H4cy6+Apd3O4mhrX3Uzd1/llcCy02X4dLotSC9HJiG3OBJWWiu2vPrB5gZv8K9Q2a8Td C+9dBiNj2YeJvk3gV3p/sPJMfwo4+WzKvAoD1nYpjm6htedMqPOJwEfEM283LquGLf4RSH fIPzaPaBKphDJaIYxii4w5glYtgA1ohMJKfkHtlx8b1ku7IPjkwM4y41lo3l+K80dNNp1J DHe8KiFNI9TH5PogRztsGNSOX8NOsn2tVj7Be0yUnkySVlGis8x9ygdK9U2do5cdYXnKzL 2Evoj6bYPxJdLYsdGtJ8OPbLT/taD35H4+4hxxZab5rc7zpBeIzLhaVTAnR+Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701620; 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=1Wywo0qOV9FqmULNkfZFkUbVwPpEj2CzPbC9P1Wk6ug=; b=Q3YkFyoI9L4t79DLVGKqL3uv6M+1Eq/HOsjVtOe0zKdWPu0ouiTRKRfuxT8lMjLvLEZwcl ihBHi6jxSbM8s7/FIvObYGijeV04obl9nkHAEWO92nQ0JcnySgPthgW9IPUEybGTv06s1g 9LpDujNfx+cforGUF1YeuKfY9rAVbcOejxWSGeiixFS5mn8LHlcnmWeyMUwYC+fCblRHDj cNeNMgMfEbnV/w5pAzuck4NPFABAffw9Xi+30NrMODv06RvZRB0mHLiIAN4uXcJvBL0vBl iY7wke4Ps7gqjobu2oz68hF+4Ftcro5IT5DzIIRLdIrCU+C7o0hMFOF7D/ceOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755701620; a=rsa-sha256; cv=none; b=oWk55+BHPTwcKVDPdjaBXn9Tam+alaj3YNUEiaKF4HrE9rY1zqeyqBnHS7lS6xAqOs8hJa cKtcCZUG0y1WOXUg9KmvXVZ6oy42I3uFbEv1slH2aZctb7ckqbLa2DTYpxe+svLs3q/fF5 HbJa8Op9NLznaWm9Pjf2kpcHliFfYVSCOczdX5wFZ+wmdSK0Oq4vd2wsFXYTi/3KSc697J BiAuaHjDzAptsrYHKO1GUsRCoUxuLJBIMzXsjYr75sZZuMBFMR/O9HPviKGpUuPWlPBM1c OF9r5z1MiiEcB0COMRqNQOf6H4gpiB6eRUn+jFl0A+aLgNxbU0UILPcsBoU+KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6Twh2ZZXz3TZ; Wed, 20 Aug 2025 14:53:40 +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 57KEreqF028513; Wed, 20 Aug 2025 14:53:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KEreeA028510; Wed, 20 Aug 2025 14:53:40 GMT (envelope-from git) Date: Wed, 20 Aug 2025 14:53:40 GMT Message-Id: <202508201453.57KEreeA028510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 8ef5016f73b9 - main - libsa/zfs: simplify vdev_find_previous() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ef5016f73b9a4db8ee7b268bd27bb7246c84960 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8ef5016f73b9a4db8ee7b268bd27bb7246c84960 commit 8ef5016f73b9a4db8ee7b268bd27bb7246c84960 Author: Gleb Smirnoff AuthorDate: 2025-08-20 14:51:14 +0000 Commit: Gleb Smirnoff CommitDate: 2025-08-20 14:51:14 +0000 libsa/zfs: simplify vdev_find_previous() An empty list case is properly covered by the cycle. Don't pass pointer to vdev being looked up, pass just id. Reviewed by: mav, imp Differential Revision: https://reviews.freebsd.org/D51911 --- stand/libsa/zfs/zfsimpl.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index 4bfb7d4179fb..d923abeee56e 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -1035,22 +1035,19 @@ vdev_init(uint64_t guid, const nvlist_t *nvlist, vdev_t **vdevp) * STAILQ_INSERT_AFTER. */ static vdev_t * -vdev_find_previous(vdev_t *top_vdev, vdev_t *vdev) +vdev_find_previous(vdev_t *top_vdev, uint64_t id) { vdev_t *v, *previous; - if (STAILQ_EMPTY(&top_vdev->v_children)) - return (NULL); - previous = NULL; STAILQ_FOREACH(v, &top_vdev->v_children, v_childlink) { - if (v->v_id > vdev->v_id) + if (v->v_id > id) return (previous); - if (v->v_id == vdev->v_id) + if (v->v_id == id) return (v); - if (v->v_id < vdev->v_id) + if (v->v_id < id) previous = v; } return (previous); @@ -1085,7 +1082,7 @@ vdev_insert(vdev_t *top_vdev, vdev_t *vdev) * so we can use either STAILQ_INSERT_HEAD or STAILQ_INSERT_AFTER * as STAILQ does not have insert before. */ - previous = vdev_find_previous(top_vdev, vdev); + previous = vdev_find_previous(top_vdev, vdev->v_id); if (previous == NULL) { STAILQ_INSERT_HEAD(&top_vdev->v_children, vdev, v_childlink); From nobody Wed Aug 20 14:53:41 2025 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 4c6Twj5xLsz64XD6; Wed, 20 Aug 2025 14:53:41 +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 4c6Twj4ZBhz3m2b; Wed, 20 Aug 2025 14:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701621; 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=JKEb69a5YlJTcfKJS6lBiBsTpSsxWwUmkz6onPG66eI=; b=OktFtj/5PQaL0CFIqIRlTeUNrXC88qBgb7/qkz7ifqrU4qV77m+ikgbS6dM+O6xnH+eHQW b9kRHNJruBdArA+bMuHLMar/kXSVbOqZVcOVnccwq3p4ZMjVCrD7+Gj575AlionbrLZR1C SdwC+Y6kNNotRECFXNUr6k7Xd3tzw4iT9YgiVa6nmHEFpdHb8N/xqJTEoCMttcA+V2te+I tatd2CLkKqtuPnUfMP5/qmXvC00sur0/75mG/0e2miP0k67HgceInDXL+zpfgocfL7so7U uexC5oqoqIymmSCAFVwlOkMNvhplVXc8ZekbG/gKY1ryQJv69PdVrR7MotrTKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701621; 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=JKEb69a5YlJTcfKJS6lBiBsTpSsxWwUmkz6onPG66eI=; b=sHvWpeVSV6NRelesEwxIbKFO/n/1006IYHyT6oG9bXW1ahNRGOTwizfxnbP1N7Otmf644J 4d61y/zrwiVfbV/VMSRcGY6CyaU3p7z5Sh3anNHc/+nvRJ33i5lUFYJbk3to52wSBFNULS i/fFc+EwO2gToLkYNc8IP3bw2vpXwLc33ROh45Cs0ka2qZSTAOWupmu5g2iXg9QITIKuIM KEtHF22qNah820TbLXJ6PFQg83lvL5+7/D6Es8VTbwlcsf8vmQ3q+PakU1jKRzofbKAxsP Rj3Agaj7tjsySgwXqvEZoYxrwLUT1/0uWOwkim+SqUVnrkJrkiu5unCEC/kpbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755701621; a=rsa-sha256; cv=none; b=XIATaJIwBRkpQhQdKB1Ronx73JNZfd1Sw6twkNKp9oJjldmyDNiZUv5IHcmps0hQ0a7EGd yCuLHNdeLeFeiP47bLl/AgxKaT2cgcHzVG7zU/3Kujw/f3zZDP3WfTYt4LqyozflevVXHi WGi27mOUUKOfitmQ7BXmErVjKqnNUn0peRtMgPxsOPiOYp5/GDYJoj2bknGBK7aR8/pg6m /3nkNhuYGy0oRcIZd+4qZPAAgVajCDNsOCqNigkpk1j6GgmMTY4pFEqB8GhJ9tcEJhe+my 7Y0352k6iiQMF3KRYQyfI7Q3lX4yma0YXaNaRgTn4T0TKE27PShbuceQkpVlLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6Twj3CDbz2v7; Wed, 20 Aug 2025 14:53:41 +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 57KErfpj028551; Wed, 20 Aug 2025 14:53:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KErfKE028548; Wed, 20 Aug 2025 14:53:41 GMT (envelope-from git) Date: Wed, 20 Aug 2025 14:53:41 GMT Message-Id: <202508201453.57KErfKE028548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 9dbd8ee11675 - main - libsa/zfs: refactor vdev tree for better resiliency against stale disks 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9dbd8ee1167520eafdd373f6a995f1232e024b1e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=9dbd8ee1167520eafdd373f6a995f1232e024b1e commit 9dbd8ee1167520eafdd373f6a995f1232e024b1e Author: Gleb Smirnoff AuthorDate: 2025-08-20 14:51:21 +0000 Commit: Gleb Smirnoff CommitDate: 2025-08-20 14:51:21 +0000 libsa/zfs: refactor vdev tree for better resiliency against stale disks Before this change in vdev_insert() we would avoid inserting a duplicate vdev to the list of children, however this duplicate being unlinked from the parent is still stored on the global list with initialized v_guid. Such leaked duplicate can later be returned by vdev_find(). After 6dd0803ffd31 such leaked vdev may be freed or pointing to a freed parent, which leads to a loader crash. Note that the leak problem was there before 6dd0803ffd31. First, in vdev_insert() free conflicting vdev and return the existing one. Update callers accordingly. There is only one caller that actually may encounter this condition. Second, eliminate global list of vdevs and make vdev_find() to work recursively on the tree that a caller must provide. Of course, a chance of GUID collision between members of different pools is extremely low. The main motivation here is just to increase code robustness and fully isolate the data structures of different pools being tasted by the loader, and make easier debugging of bugs like the one being fixed. Reviewed by: mav, imp Differential Revision: https://reviews.freebsd.org/D51912 Fixes: 6dd0803ffd31c60a84488d06928813353c6303d3 --- stand/libsa/zfs/zfsimpl.c | 50 ++++++++++++++++++++------------------------- sys/cddl/boot/zfs/zfsimpl.h | 1 - 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index d923abeee56e..fb5b5fb4606f 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -106,11 +106,6 @@ typedef struct indirect_vsd { list_t iv_splits; /* list of indirect_split_t's */ } indirect_vsd_t; -/* - * List of all vdevs, chained through v_alllink. - */ -static vdev_list_t zfs_vdevs; - /* * List of supported read-incompatible ZFS features. Do not add here features * marked as ZFEATURE_FLAG_READONLY_COMPAT, they are irrelevant for read-only! @@ -167,7 +162,6 @@ vdev_indirect_mapping_entry_phys_t * static void zfs_init(void) { - STAILQ_INIT(&zfs_vdevs); STAILQ_INIT(&zfs_pools); dnode_cache_buf = malloc(SPA_MAXBLOCKSIZE); @@ -840,15 +834,18 @@ vdev_replacing_read(vdev_t *vdev, const blkptr_t *bp, void *buf, } static vdev_t * -vdev_find(uint64_t guid) +vdev_find(vdev_list_t *list, uint64_t guid) { - vdev_t *vdev; + vdev_t *vdev, *safe; - STAILQ_FOREACH(vdev, &zfs_vdevs, v_alllink) + STAILQ_FOREACH_SAFE(vdev, list, v_childlink, safe) { if (vdev->v_guid == guid) return (vdev); + if ((vdev = vdev_find(&vdev->v_children, guid)) != NULL) + return (vdev); + } - return (0); + return (NULL); } static vdev_t * @@ -871,7 +868,6 @@ vdev_create(uint64_t guid, vdev_read_t *_read) if (_read != NULL) { vic = &vdev->vdev_indirect_config; vic->vic_prev_indirect_vdev = UINT64_MAX; - STAILQ_INSERT_TAIL(&zfs_vdevs, vdev, v_alllink); } } @@ -1069,7 +1065,7 @@ vdev_child_count(vdev_t *vdev) /* * Insert vdev into top_vdev children list. List is ordered by v_id. */ -static void +static vdev_t * vdev_insert(vdev_t *top_vdev, vdev_t *vdev) { vdev_t *previous; @@ -1091,7 +1087,8 @@ vdev_insert(vdev_t *top_vdev, vdev_t *vdev) * This vdev was configured from label config, * do not insert duplicate. */ - return; + free(vdev); + return (previous); } else { STAILQ_INSERT_AFTER(&top_vdev->v_children, previous, vdev, v_childlink); @@ -1100,6 +1097,7 @@ vdev_insert(vdev_t *top_vdev, vdev_t *vdev) count = vdev_child_count(top_vdev); if (top_vdev->v_nchildren < count) top_vdev->v_nchildren = count; + return (vdev); } static int @@ -1111,7 +1109,7 @@ vdev_from_nvlist(spa_t *spa, uint64_t top_guid, uint64_t txg, int rc, nkids; /* Get top vdev. */ - top_vdev = vdev_find(top_guid); + top_vdev = vdev_find(&spa->spa_root_vdev->v_children, top_guid); if (top_vdev == NULL) { rc = vdev_init(top_guid, nvlist, &top_vdev); if (rc != 0) @@ -1119,7 +1117,7 @@ vdev_from_nvlist(spa_t *spa, uint64_t top_guid, uint64_t txg, top_vdev->v_spa = spa; top_vdev->v_top = top_vdev; top_vdev->v_txg = txg; - vdev_insert(spa->spa_root_vdev, top_vdev); + (void )vdev_insert(spa->spa_root_vdev, top_vdev); } /* Add children if there are any. */ @@ -1140,7 +1138,7 @@ vdev_from_nvlist(spa_t *spa, uint64_t top_guid, uint64_t txg, vdev->v_spa = spa; vdev->v_top = top_vdev; - vdev_insert(top_vdev, vdev); + vdev = vdev_insert(top_vdev, vdev); } } else { /* @@ -1227,14 +1225,14 @@ vdev_set_state(vdev_t *vdev) } static int -vdev_update_from_nvlist(uint64_t top_guid, const nvlist_t *nvlist) +vdev_update_from_nvlist(vdev_t *root, uint64_t top_guid, const nvlist_t *nvlist) { vdev_t *vdev; nvlist_t **kids = NULL; int rc, nkids; /* Update top vdev. */ - vdev = vdev_find(top_guid); + vdev = vdev_find(&root->v_children, top_guid); if (vdev != NULL) vdev_set_initial_state(vdev, nvlist); @@ -1250,7 +1248,7 @@ vdev_update_from_nvlist(uint64_t top_guid, const nvlist_t *nvlist) if (rc != 0) break; - vdev = vdev_find(guid); + vdev = vdev_find(&root->v_children, guid); if (vdev != NULL) vdev_set_initial_state(vdev, kids[i]); } @@ -1266,10 +1264,6 @@ vdev_update_from_nvlist(uint64_t top_guid, const nvlist_t *nvlist) return (rc); } -/* - * Shall not be called on root vdev, that is not linked into zfs_vdevs. - * See comment in vdev_create(). - */ static void vdev_free(struct vdev *vdev) { @@ -1277,7 +1271,6 @@ vdev_free(struct vdev *vdev) STAILQ_FOREACH_SAFE(kid, &vdev->v_children, v_childlink, safe) vdev_free(kid); - STAILQ_REMOVE(&zfs_vdevs, vdev, vdev, v_alllink); free(vdev); } @@ -1324,7 +1317,7 @@ vdev_init_from_nvlist(spa_t *spa, const nvlist_t *nvlist) NULL, &guid, NULL); if (rc != 0) break; - vdev = vdev_find(guid); + vdev = vdev_find(&spa->spa_root_vdev->v_children, guid); /* * Top level vdev is missing, create it. * XXXGL: how can this happen? @@ -1332,7 +1325,8 @@ vdev_init_from_nvlist(spa_t *spa, const nvlist_t *nvlist) if (vdev == NULL) rc = vdev_from_nvlist(spa, guid, 0, kids[i]); else - rc = vdev_update_from_nvlist(guid, kids[i]); + rc = vdev_update_from_nvlist(spa->spa_root_vdev, guid, + kids[i]); if (rc != 0) break; } @@ -2138,7 +2132,7 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, * be some kind of alias (overlapping slices, dangerously dedicated * disks etc). */ - vdev = vdev_find(guid); + vdev = vdev_find(&spa->spa_root_vdev->v_children, guid); /* Has this vdev already been inited? */ if (vdev && vdev->v_phys_read) { nvlist_destroy(nvl); @@ -2154,7 +2148,7 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, * We should already have created an incomplete vdev for this * vdev. Find it and initialise it with our read proc. */ - vdev = vdev_find(guid); + vdev = vdev_find(&spa->spa_root_vdev->v_children, guid); if (vdev != NULL) { vdev->v_phys_read = _read; vdev->v_phys_write = _write; diff --git a/sys/cddl/boot/zfs/zfsimpl.h b/sys/cddl/boot/zfs/zfsimpl.h index 915aeeda3c9e..d3bc090738ff 100644 --- a/sys/cddl/boot/zfs/zfsimpl.h +++ b/sys/cddl/boot/zfs/zfsimpl.h @@ -2021,7 +2021,6 @@ typedef struct vdev_indirect_config { typedef struct vdev { STAILQ_ENTRY(vdev) v_childlink; /* link in parent's child list */ - STAILQ_ENTRY(vdev) v_alllink; /* link in global vdev list */ vdev_list_t v_children; /* children of this vdev */ const char *v_name; /* vdev name */ uint64_t v_guid; /* vdev guid */ From nobody Wed Aug 20 14:53:42 2025 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 4c6Twl02mvz64XSB; Wed, 20 Aug 2025 14:53:43 +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 4c6Twk4hpNz3mQ5; Wed, 20 Aug 2025 14:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701622; 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=4fvLP8AQFtOIbNTmN1s7EKuui7HEfWGGDkiUjlWx2Ac=; b=yU3AwtfdkIx7BlQ/gEXuS9KdUFG/BYKCKYwRhWpJnuYRrozbrj0H7hZFkz8qG3Nm2UKErp +HCPLl/Cps2r1TbzmJNykKEvBknGksjg+/D6FnHqke9OW3MYziO4MxKbC3z43zvP5vWI04 tIHNZO+F8V9gJSV43EKSeeQ824fyB7LJDCNW3xKRLIHFqW360g/Au1e6FKnJ/cT7EnrQIs 4va/2qdqaebRQtP+MCV52XAVj7LcbtcVd2O7bphpO1BpQi7Z7Bjpi26fcbPn1jyXhZDCxT CswD2dfyUgGRmK/r4KM50TCRfMZUUj1D0nBvWsjdtPv4Yasv149e2vJPTg3AcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701622; 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=4fvLP8AQFtOIbNTmN1s7EKuui7HEfWGGDkiUjlWx2Ac=; b=qtrJp5V1KPXtfDqkXAflR+jTq21ZMayUorGh8+EaTpQLYP9WXF+LcSGnfk91uEY+pNRfkM DxjHmGQowG1Uq5mIoK5r8SaHpm+xhftsuMXe5rl32w6+/EUtXnnwCmFbYkVrRncYhvKO/n H43oq1uajA8Ip/91UMT8cC+29ELoPGjD2rRT1n8VcNfF0oKHXfCPMT/TeucGU7UuM3hXpd hlHAuYnab+g3lNjIc8mfkMEpThG09FiVwXAfJnrF+dC9Ok4htZuTXQkRS5wXBBOEHndX5e D/yZ+Admc3vuFtaTY+o7fnrnq2aoA7gzZojz/YEql7HIIjSl5qhTOsz6qgZfig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755701622; a=rsa-sha256; cv=none; b=QJCbrmQUYLdMCRhawEGNSmwOuo5Yi7p3O+QZykq3bKk5qKKR6zIHtuMNoh6nohKRRXKLRh +pZPVGQgyCnC4NQ1aJF3NePHx9x2Lqxwg2he+imJ1SK6T01oWYTqf0Bhj60KQdg6YJDMku MUv3P4OB4vcIOy/GFEhsGjhNkCCC/EWDpjIcXRNadQ0rMsZS4TilUehiXNp9CSu+SNXvOr 71VrQOICN+IESwhGd2H7i/ZxTDzMW6MtAqyn8tqIgdRr6Ef1JtWYxT9leE8B1VKJfbzi78 q07JJi2/yUzBudUxrPiagZXd+4TbGvrxUACo2dXOAcJD+Q1BkXTDEJvPyiUVTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6Twk4BLsz3J3; Wed, 20 Aug 2025 14:53:42 +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 57KErgxd028584; Wed, 20 Aug 2025 14:53:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KErgMR028581; Wed, 20 Aug 2025 14:53:42 GMT (envelope-from git) Date: Wed, 20 Aug 2025 14:53:42 GMT Message-Id: <202508201453.57KErgMR028581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a1572e202a18 - main - libsa/zfs: further improve handling of stale labels 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1572e202a1840c26c950ed728358965f535ec7a Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a1572e202a1840c26c950ed728358965f535ec7a commit a1572e202a1840c26c950ed728358965f535ec7a Author: Gleb Smirnoff AuthorDate: 2025-08-20 14:52:20 +0000 Commit: Gleb Smirnoff CommitDate: 2025-08-20 14:52:20 +0000 libsa/zfs: further improve handling of stale labels Fix two problems with 6dd0803ffd31. First problem is that situation when newer label was read before stale one, was handled differently to reverse order case. Second problem is that vdev_free() would free the fully initialized leaf vdev that carried stale label. In a case when vdev carries a stale label, but is still referenced by a different label with new a configuration, we don't want to free it, but rather insert it into the new configuration. o Provide a helper function nvlist_find_vdev_guid() that checks presence of certain GUID in a label. o In top level vdev store the GUID of vdev used to instantiate top vdev. o Cover all possible cases in the block in vdev_probe() where we encounter a known configuration. Make the diagnostic print more informative and looking same regardless of probe order. Make this whole block easier to read reducing one level of indentation for a price of a single comparison at runtime. Reviewed by: mav, imp Differential Revision: https://reviews.freebsd.org/D51913 Fixes: 6dd0803ffd31c60a84488d06928813353c6303d3 --- stand/libsa/zfs/zfsimpl.c | 131 +++++++++++++++++++++++++++++++++++++------- sys/cddl/boot/zfs/zfsimpl.h | 3 +- 2 files changed, 113 insertions(+), 21 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index fb5b5fb4606f..bc960a1fe3c0 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -833,6 +833,14 @@ vdev_replacing_read(vdev_t *vdev, const blkptr_t *bp, void *buf, return (kid->v_read(kid, bp, buf, offset, bytes)); } +/* + * List of vdevs that were fully initialized from their own label, but later a + * newer label was found that obsoleted the stale label, freeing its + * configuration tree. We keep those vdevs around, since a new configuration + * may include them. + */ +static vdev_list_t orphans = STAILQ_HEAD_INITIALIZER(orphans); + static vdev_t * vdev_find(vdev_list_t *list, uint64_t guid) { @@ -854,6 +862,11 @@ vdev_create(uint64_t guid, vdev_read_t *_read) vdev_t *vdev; vdev_indirect_config_t *vic; + if ((vdev = vdev_find(&orphans, guid))) { + STAILQ_REMOVE(&orphans, vdev, vdev, v_childlink); + return (vdev); + } + vdev = calloc(1, sizeof(vdev_t)); if (vdev != NULL) { STAILQ_INIT(&vdev->v_children); @@ -1101,8 +1114,8 @@ vdev_insert(vdev_t *top_vdev, vdev_t *vdev) } static int -vdev_from_nvlist(spa_t *spa, uint64_t top_guid, uint64_t txg, - const nvlist_t *nvlist) +vdev_from_nvlist(spa_t *spa, uint64_t top_guid, uint64_t label_guid, + uint64_t txg, const nvlist_t *nvlist) { vdev_t *top_vdev, *vdev; nvlist_t **kids = NULL; @@ -1116,6 +1129,7 @@ vdev_from_nvlist(spa_t *spa, uint64_t top_guid, uint64_t txg, return (rc); top_vdev->v_spa = spa; top_vdev->v_top = top_vdev; + top_vdev->v_label = label_guid; top_vdev->v_txg = txg; (void )vdev_insert(spa->spa_root_vdev, top_vdev); } @@ -1160,12 +1174,14 @@ done: static int vdev_init_from_label(spa_t *spa, const nvlist_t *nvlist) { - uint64_t top_guid, txg; + uint64_t top_guid, label_guid, txg; nvlist_t *vdevs; int rc; if (nvlist_find(nvlist, ZPOOL_CONFIG_TOP_GUID, DATA_TYPE_UINT64, NULL, &top_guid, NULL) || + nvlist_find(nvlist, ZPOOL_CONFIG_GUID, DATA_TYPE_UINT64, + NULL, &label_guid, NULL) != 0 || nvlist_find(nvlist, ZPOOL_CONFIG_POOL_TXG, DATA_TYPE_UINT64, NULL, &txg, NULL) != 0 || nvlist_find(nvlist, ZPOOL_CONFIG_VDEV_TREE, DATA_TYPE_NVLIST, @@ -1174,7 +1190,7 @@ vdev_init_from_label(spa_t *spa, const nvlist_t *nvlist) return (ENOENT); } - rc = vdev_from_nvlist(spa, top_guid, txg, vdevs); + rc = vdev_from_nvlist(spa, top_guid, label_guid, txg, vdevs); nvlist_destroy(vdevs); return (rc); } @@ -1271,7 +1287,10 @@ vdev_free(struct vdev *vdev) STAILQ_FOREACH_SAFE(kid, &vdev->v_children, v_childlink, safe) vdev_free(kid); - free(vdev); + if (vdev->v_phys_read != NULL) + STAILQ_INSERT_HEAD(&orphans, vdev, v_childlink); + else + free(vdev); } static int @@ -1323,7 +1342,7 @@ vdev_init_from_nvlist(spa_t *spa, const nvlist_t *nvlist) * XXXGL: how can this happen? */ if (vdev == NULL) - rc = vdev_from_nvlist(spa, guid, 0, kids[i]); + rc = vdev_from_nvlist(spa, guid, 0, 0, kids[i]); else rc = vdev_update_from_nvlist(spa->spa_root_vdev, guid, kids[i]); @@ -1344,6 +1363,53 @@ vdev_init_from_nvlist(spa_t *spa, const nvlist_t *nvlist) return (rc); } +static bool +nvlist_find_child_guid(const nvlist_t *nvlist, uint64_t guid) +{ + nvlist_t **kids = NULL; + int nkids, i; + bool rv = false; + + if (nvlist_find(nvlist, ZPOOL_CONFIG_CHILDREN, DATA_TYPE_NVLIST_ARRAY, + &nkids, &kids, NULL) != 0) + nkids = 0; + + for (i = 0; i < nkids; i++) { + uint64_t kid_guid; + + if (nvlist_find(kids[i], ZPOOL_CONFIG_GUID, DATA_TYPE_UINT64, + NULL, &kid_guid, NULL) != 0) + break; + if (kid_guid == guid) + rv = true; + else + rv = nvlist_find_child_guid(kids[i], guid); + if (rv) + break; + } + + for (i = 0; i < nkids; i++) + nvlist_destroy(kids[i]); + free(kids); + + return (rv); +} + +static bool +nvlist_find_vdev_guid(const nvlist_t *nvlist, uint64_t guid) +{ + nvlist_t *vdevs; + bool rv; + + if (nvlist_find(nvlist, ZPOOL_CONFIG_VDEV_TREE, DATA_TYPE_NVLIST, NULL, + &vdevs, NULL) != 0) + return (false); + rv = nvlist_find_child_guid(vdevs, guid); + nvlist_destroy(vdevs); + + return (rv); +} + static spa_t * spa_find_by_guid(uint64_t guid) { @@ -2012,7 +2078,7 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, { vdev_t vtmp; spa_t *spa; - vdev_t *vdev; + vdev_t *vdev, *top; nvlist_t *nvl; uint64_t val; uint64_t guid, pool_guid, top_guid, txg; @@ -2109,22 +2175,47 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, nvlist_destroy(nvl); return (ENOMEM); } - } else { - struct vdev *kid; - - STAILQ_FOREACH(kid, &spa->spa_root_vdev->v_children, - v_childlink) - if (kid->v_guid == top_guid && kid->v_txg < txg) { - printf("ZFS: pool %s vdev %s ignoring stale " - "label from txg 0x%jx, using 0x%jx@0x%jx\n", - spa->spa_name, kid->v_name, - kid->v_txg, guid, txg); + } + + /* + * Check if configuration is already known. If configuration is known + * and txg numbers don't match, we got 2x2 scenarios here. First, is + * the label being read right now _newer_ than the one read before. + * Second, is the vdev that provided the stale label _present_ in the + * newer configuration. If neither is true, we completely ignore the + * label. + */ + STAILQ_FOREACH(top, &spa->spa_root_vdev->v_children, v_childlink) + if (top->v_guid == top_guid) { + bool newer, present; + + if (top->v_txg == txg) + break; + newer = (top->v_txg < txg); + present = newer ? + nvlist_find_vdev_guid(nvl, top->v_label) : + (vdev_find(&top->v_children, guid) != NULL); + printf("ZFS: pool %s vdev %s %s stale label from " + "0x%jx@0x%jx, %s 0x%jx@0x%jx\n", + spa->spa_name, top->v_name, + present ? "using" : "ignoring", + newer ? top->v_label : guid, + newer ? top->v_txg : txg, + present ? "referred by" : "using", + newer ? guid : top->v_label, + newer ? txg : top->v_txg); + if (newer) { STAILQ_REMOVE(&spa->spa_root_vdev->v_children, - kid, vdev, v_childlink); - vdev_free(kid); + top, vdev, v_childlink); + vdev_free(top); break; + } else if (present) { + break; + } else { + nvlist_destroy(nvl); + return (EIO); } - } + } /* * Get the vdev tree and create our in-core copy of it. diff --git a/sys/cddl/boot/zfs/zfsimpl.h b/sys/cddl/boot/zfs/zfsimpl.h index d3bc090738ff..c9de1fe4c391 100644 --- a/sys/cddl/boot/zfs/zfsimpl.h +++ b/sys/cddl/boot/zfs/zfsimpl.h @@ -2024,7 +2024,8 @@ typedef struct vdev { vdev_list_t v_children; /* children of this vdev */ const char *v_name; /* vdev name */ uint64_t v_guid; /* vdev guid */ - uint64_t v_txg; /* most recent transaction */ + uint64_t v_label; /* label instantiated from (top vdev) */ + uint64_t v_txg; /* most recent transaction (top vdev) */ uint64_t v_id; /* index in parent */ uint64_t v_psize; /* physical device capacity */ int v_ashift; /* offset to block shift */ From nobody Wed Aug 20 14:53:43 2025 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 4c6Twm0sV9z64Xkv; Wed, 20 Aug 2025 14:53:44 +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 4c6Twl5cHRz3mQM; Wed, 20 Aug 2025 14:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701623; 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=OaC7b+xNVKZhgZ6w+vXF/ocH3cA8oOk+FLA6xcjbsew=; b=ZU0eL6qcRliWwmO2LDTvfWPpe3g255ZT58rDpzUi31IivC78/VlvgH8vEyvGwdaiIkgM0z qIOrqwtBGXHHSawMoO+1zw00njxNABgdA/lAO17nrkH8K+L/nIE+GlzODRa3hYqWMWPuSK Z5Hcsf3HDWtd+c/wjVi/F3Gu4Ypf0kw51ifepcCb39qdRtC1odErzjGWPmEkBbjLbeyvFN LnM3PdZynMifiFinLJY2+zGOrSJpmjd/1uuw76+0HdpFBCm9VVA5EoACQIZSGq3NAeQ2DU IcM5ZVMpcLKf4X9l+RgUvAj7rs+ASjdzdlClqSVMVm4yn8RSoCpqJxYWfP45oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701623; 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=OaC7b+xNVKZhgZ6w+vXF/ocH3cA8oOk+FLA6xcjbsew=; b=CDUvQuZ5Sdi5HFz4Ue7Ax5lv86ZApOUAto2rSGxRbq7j9kZaiO5sCNoLpS8k+mILYuoVan 2l9u/vh1ZGyOzu6O7VAkX0gBdHH/ndt2SLdG/2ydM5dCxPLpNzhTszuFEof+dIMWRc9QbH 26F4G6s1V+iiuZ3vNbsE0Zfc0Yl5IqGTVIrUckPx1ZItO5TeaAvoFRWQLj3Vf1SDD10L3g /KUZsVsxNlyhjZF4vHur2uKl/0I1asyNrgkJPL4edIgupa/islnd89M8R22kPm1ph09Jq7 r33hy3uCufTsHUpw6QUZt6d11o+s8XZgeilpkcGOIuHgLJgAqHx1iSJrvjFoiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755701623; a=rsa-sha256; cv=none; b=aw9kmP++sEjflF9C3CuLlmfa0HRnCmsIxlYiwUc43ejiDaxK6QdVgbbVvtY82KilEXKW/7 GCpi81qWj8fIhnzhvC5MqAS9hqFbqdlb9P/2IWJZgnY99Aw0ROtvmdNV3QGkkPxNglvP9V fN2HkzqyKNHAubJ+quvrDbGvRJnnTn1ujd9I7Ob7rm/6gSAWr+TvMDiFFfTbzTj0+1vSHG sfRSsVeCGJ44Roop4BAHonW0RvRAtcCVPODMBm2TOm93Zb4HqzjuPl5+y/T8AXBgXcfa/u bvrNSzMxhw44di1UAhMzeMo7MbN857UKyGJkUahOPXBX3bVwsIvjZBjmbI+PHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6Twl5DBZz30k; Wed, 20 Aug 2025 14:53:43 +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 57KErhIC028623; Wed, 20 Aug 2025 14:53:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KErhYv028620; Wed, 20 Aug 2025 14:53:43 GMT (envelope-from git) Date: Wed, 20 Aug 2025 14:53:43 GMT Message-Id: <202508201453.57KErhYv028620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: fe2418f26ed0 - main - libsa/zfs: inline vdev_init_from_label() into vdev_probe() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe2418f26ed0b2b9e06152c16f72f2bb4ec27c29 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=fe2418f26ed0b2b9e06152c16f72f2bb4ec27c29 commit fe2418f26ed0b2b9e06152c16f72f2bb4ec27c29 Author: Gleb Smirnoff AuthorDate: 2025-08-20 14:53:20 +0000 Commit: Gleb Smirnoff CommitDate: 2025-08-20 14:53:20 +0000 libsa/zfs: inline vdev_init_from_label() into vdev_probe() This function is used only once and also pulls three variables from the nvlist that the only caller have already pulled out. Reviewed by: mav, imp Differential Revision: https://reviews.freebsd.org/D52031 --- stand/libsa/zfs/zfsimpl.c | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index bc960a1fe3c0..f15d9b016068 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -1171,30 +1171,6 @@ done: return (rc); } -static int -vdev_init_from_label(spa_t *spa, const nvlist_t *nvlist) -{ - uint64_t top_guid, label_guid, txg; - nvlist_t *vdevs; - int rc; - - if (nvlist_find(nvlist, ZPOOL_CONFIG_TOP_GUID, DATA_TYPE_UINT64, - NULL, &top_guid, NULL) || - nvlist_find(nvlist, ZPOOL_CONFIG_GUID, DATA_TYPE_UINT64, - NULL, &label_guid, NULL) != 0 || - nvlist_find(nvlist, ZPOOL_CONFIG_POOL_TXG, DATA_TYPE_UINT64, - NULL, &txg, NULL) != 0 || - nvlist_find(nvlist, ZPOOL_CONFIG_VDEV_TREE, DATA_TYPE_NVLIST, - NULL, &vdevs, NULL)) { - printf("ZFS: can't find vdev details\n"); - return (ENOENT); - } - - rc = vdev_from_nvlist(spa, top_guid, label_guid, txg, vdevs); - nvlist_destroy(vdevs); - return (rc); -} - static void vdev_set_state(vdev_t *vdev) { @@ -2079,7 +2055,7 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, vdev_t vtmp; spa_t *spa; vdev_t *vdev, *top; - nvlist_t *nvl; + nvlist_t *nvl, *vdevs; uint64_t val; uint64_t guid, pool_guid, top_guid, txg; const char *pool_name; @@ -2230,7 +2206,15 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, return (EIO); } - rc = vdev_init_from_label(spa, nvl); + if (nvlist_find(nvl, ZPOOL_CONFIG_VDEV_TREE, DATA_TYPE_NVLIST, NULL, + &vdevs, NULL)) { + printf("ZFS: can't find vdev details\n"); + nvlist_destroy(nvl); + return (ENOENT); + } + + rc = vdev_from_nvlist(spa, top_guid, guid, txg, vdevs); + nvlist_destroy(vdevs); nvlist_destroy(nvl); if (rc != 0) return (rc); From nobody Wed Aug 20 16:51:16 2025 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 4c6XXP0WRKz64h2t; Wed, 20 Aug 2025 16:51:17 +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 4c6XXN6q7Dz46tn; Wed, 20 Aug 2025 16:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755708677; 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=TIiNvDETo8vMMGgKxmg9yOvuteVOXG1CsQ9ucyJNMIc=; b=Q1GTnSrSFBGHAoTbhgg5+snhiXSZJsPYMV1Yw75XboRhJY+4rb0cQ8Bk1M5wJxnPs99Wx6 FLbmpdq55TXNzq4UcEIDFqfyN6HwQ3oXQnzjYidupTKJHLry1uXyOZzancr2tmxwrCM+c8 UVoymOMEUKGsb5sGlqrwtRcO6IeGEyIDLLFnKL5aX/CCUPmI8nF1kPf/BCUoI7JdhKQU8A dFs2bPCrTEoL98bceI5E3A2u4SuMJ+40vX4rHYQHaWVxpJ2uIwM7FLKAY7N3hI182mi6Tq qA+zf0v9+Y3GfqXyrkPu3qRQ2zh3Dtgtmh03BkIieroqfj5xq2Ba+f/GxESRow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755708677; 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=TIiNvDETo8vMMGgKxmg9yOvuteVOXG1CsQ9ucyJNMIc=; b=ASDRW7sKN3A/Wsr2AJppdH9LyS4MM86JpXiXSGs2TmmUKT4KpqKey42tGKOvYhDFWAQxSx mIAJeHEdd3Wnn1loYIkGQmp32IaTnBwX/JWjBoEgWM8hUwdIcvThmw17CJagvYnm/uoO8L 7DNYAF6+D0S06mufAHJ8QfolVaMqum/Gcwnv7ZTMGvu0tfpZ4KiapiiEbyUikaHNFCO5cA zczK+7GQngrft5D3PviLjBvTOwSSHWwUMex8ndriV+65ssZGChM6pK+TwTrS5yE8L54PT6 nyCkUaSDmIi8CHUNt+MMQQlE7ZJGiqPTsMjWQlx39lp8gOUXoVWdAaewwoHqFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755708677; a=rsa-sha256; cv=none; b=DakLzhP/wRlfp/fpcKGYGn0L7etMdxR5zXfygemPfAWLVTDhsBlhuY2qXJbiVLI2RRR3M+ HNI3I18hJx/66XRslkjT7rwiW0boTTPj606zLEetMuzcMy51oIH+urrx920c98OPe7Inlp 1aY5POoqspmt9ITdTo8dQa5X5xrybHNzoUu+1bOQpVKXhZaxxnDBjW9l2reM3PNIWXGOTO 9FAZCcS4yrCahYXGXjwmiwm0ZTkscl9CqoDW7+yF+QP2lFcsVIqI6hLPmqf6GW1NRpD1bd pNtXu4a/01O/Fz2dMEIXKcidWBvPZf5vrEtRKlrS2ONEBwiSE4estbIX0VhIoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6XXN6Nzgz623; Wed, 20 Aug 2025 16:51:16 +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 57KGpGcl051021; Wed, 20 Aug 2025 16:51:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KGpGc4051018; Wed, 20 Aug 2025 16:51:16 GMT (envelope-from git) Date: Wed, 20 Aug 2025 16:51:16 GMT Message-Id: <202508201651.57KGpGc4051018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 84f8ca1bd11d - main - iflib: add a simple transmit routine 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: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84f8ca1bd11d97d8d254248da7c09507038be505 Auto-Submitted: auto-generated The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=84f8ca1bd11d97d8d254248da7c09507038be505 commit 84f8ca1bd11d97d8d254248da7c09507038be505 Author: Andrew Gallatin AuthorDate: 2025-08-20 16:49:32 +0000 Commit: Andrew Gallatin CommitDate: 2025-08-20 16:49:32 +0000 iflib: add a simple transmit routine While mp_ring can provide amazing scalability in scenarios where the number of cores exceeds the number of NIC tx rings, it can also lead to greatly reduced performance in simpler, high packet rate scenarios due to extra CPU cycles and cache misses stemming from its complexity. This change implements a simple if_transmit routine, selected at driver load. This routine does not queue anything, and uses a simple queue selection and ends up being far more cache friendly. In testing on a 400GbE NIC in an AMD 7502P EPYC server, this simple tx routine is roughly 2.5 times as fast as mp_ring (8Gbs -> 20Gb/s). and 5x as fast as mp_ring with tx_abdicate=1 (4Gbs -> 20Gb/s) for a simple in-kernel packet generator, which is closed source currently. It also shows a 50% speedup for a simple netperf -tUDP_STREAM test (5Gb/s -> 8Gbs). This change is mostly a noop, as it not enabled by default. The one exception is the change to iflib_encap() to immediately reclaim completed tx descriptors, and only failing the transmit and scheduling a later reclaim if iflib_completed_tx_reclaim() didn't free enough descriptors. Reviewed by: kbowling, sumit.saxena_broadcom.com, vmaffione Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D51905 --- share/man/man4/iflib.4 | 14 +++++++- sys/net/iflib.c | 92 +++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 93 insertions(+), 13 deletions(-) diff --git a/share/man/man4/iflib.4 b/share/man/man4/iflib.4 index 0114263e6ca2..2040698f0087 100644 --- a/share/man/man4/iflib.4 +++ b/share/man/man4/iflib.4 @@ -1,4 +1,4 @@ -.Dd September 27, 2018 +.Dd August 20, 2025 .Dt IFLIB 4 .Os .Sh NAME @@ -64,6 +64,18 @@ If this is zero or not set, an RX and TX queue pair will be assigned to each core. When set to a non-zero value, TX queues are assigned to cores following the last RX queue. +.It Va simple_tx +When set to one, iflib uses a simple transmit routine with no queuing at all. +By default, iflib uses a highly optimized, lockless, transmit queue called +mp_ring. +This performs well when there are more CPU cores than NIC +queues and prevents lock contention for transmit resources. +Unfortunately, mp_ring incurs unneeded overheads on workloads where +resource contention is not a problem (well behaved applications on +systems where there are as many NIC queues as CPU cores). +Note that when this is enabled, the tx_abdicate sysctl is no longer +applicable and is ignored. +Defaults to zero. .El .Pp These diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 2b43f6f19051..98c59e5de988 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -142,6 +142,7 @@ struct iflib_ctx; static void iru_init(if_rxd_update_t iru, iflib_rxq_t rxq, uint8_t flid); static void iflib_timer(void *arg); static void iflib_tqg_detach(if_ctx_t ctx); +static int iflib_simple_transmit(if_t ifp, struct mbuf *m); typedef struct iflib_filter_info { driver_filter_t *ifi_filter; @@ -198,6 +199,7 @@ struct iflib_ctx { uint8_t ifc_sysctl_use_logical_cores; uint16_t ifc_sysctl_extra_msix_vectors; bool ifc_cpus_are_physical_cores; + bool ifc_sysctl_simple_tx; qidx_t ifc_sysctl_ntxds[8]; qidx_t ifc_sysctl_nrxds[8]; @@ -725,6 +727,7 @@ static void iflib_free_intr_mem(if_ctx_t ctx); #ifndef __NO_STRICT_ALIGNMENT static struct mbuf *iflib_fixup_rx(struct mbuf *m); #endif +static __inline int iflib_completed_tx_reclaim(iflib_txq_t txq, int thresh); static SLIST_HEAD(cpu_offset_list, cpu_offset) cpu_offsets = SLIST_HEAD_INITIALIZER(cpu_offsets); @@ -2624,8 +2627,10 @@ iflib_stop(if_ctx_t ctx) #endif /* DEV_NETMAP */ CALLOUT_UNLOCK(txq); - /* clean any enqueued buffers */ - iflib_ifmp_purge(txq); + if (!ctx->ifc_sysctl_simple_tx) { + /* clean any enqueued buffers */ + iflib_ifmp_purge(txq); + } /* Free any existing tx buffers. */ for (j = 0; j < txq->ift_size; j++) { iflib_txsd_free(ctx, txq, j); @@ -3635,13 +3640,16 @@ defrag: * cxgb */ if (__predict_false(nsegs + 2 > TXQ_AVAIL(txq))) { - txq->ift_no_desc_avail++; - bus_dmamap_unload(buf_tag, map); - DBG_COUNTER_INC(encap_txq_avail_fail); - DBG_COUNTER_INC(encap_txd_encap_fail); - if ((txq->ift_task.gt_task.ta_flags & TASK_ENQUEUED) == 0) - GROUPTASK_ENQUEUE(&txq->ift_task); - return (ENOBUFS); + (void)iflib_completed_tx_reclaim(txq, RECLAIM_THRESH(ctx)); + if (__predict_false(nsegs + 2 > TXQ_AVAIL(txq))) { + txq->ift_no_desc_avail++; + bus_dmamap_unload(buf_tag, map); + DBG_COUNTER_INC(encap_txq_avail_fail); + DBG_COUNTER_INC(encap_txd_encap_fail); + if ((txq->ift_task.gt_task.ta_flags & TASK_ENQUEUED) == 0) + GROUPTASK_ENQUEUE(&txq->ift_task); + return (ENOBUFS); + } } /* * On Intel cards we can greatly reduce the number of TX interrupts @@ -4014,6 +4022,12 @@ _task_fn_tx(void *context) netmap_tx_irq(ifp, txq->ift_id)) goto skip_ifmp; #endif + if (ctx->ifc_sysctl_simple_tx) { + mtx_lock(&txq->ift_mtx); + (void)iflib_completed_tx_reclaim(txq, RECLAIM_THRESH(ctx)); + mtx_unlock(&txq->ift_mtx); + goto skip_ifmp; + } #ifdef ALTQ if (if_altq_is_enabled(ifp)) iflib_altq_if_start(ifp); @@ -4027,9 +4041,8 @@ _task_fn_tx(void *context) */ if (abdicate) ifmp_ring_check_drainage(txq->ift_br, TX_BATCH_SIZE); -#ifdef DEV_NETMAP + skip_ifmp: -#endif if (ctx->ifc_flags & IFC_LEGACY) IFDI_INTR_ENABLE(ctx); else @@ -5131,7 +5144,14 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct scctx = &ctx->ifc_softc_ctx; ifp = ctx->ifc_ifp; - + if (ctx->ifc_sysctl_simple_tx) { +#ifndef ALTQ + if_settransmitfn(ifp, iflib_simple_transmit); + device_printf(dev, "using simple if_transmit\n"); +#else + device_printf(dev, "ALTQ prevents using simple if_transmit\n"); +#endif + } iflib_reset_qvalues(ctx); IFNET_WLOCK(); CTX_LOCK(ctx); @@ -6766,6 +6786,9 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx) SYSCTL_ADD_CONST_STRING(ctx_list, oid_list, OID_AUTO, "driver_version", CTLFLAG_RD, ctx->ifc_sctx->isc_driver_version, "driver version"); + SYSCTL_ADD_BOOL(ctx_list, oid_list, OID_AUTO, "simple_tx", + CTLFLAG_RDTUN, &ctx->ifc_sysctl_simple_tx, 0, + "use simple tx ring"); SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "override_ntxqs", CTLFLAG_RWTUN, &ctx->ifc_sysctl_ntxqs, 0, "# of txqs to use, 0 => use default #"); @@ -7088,3 +7111,48 @@ iflib_debugnet_poll(if_t ifp, int count) return (0); } #endif /* DEBUGNET */ + + +static inline iflib_txq_t +iflib_simple_select_queue(if_ctx_t ctx, struct mbuf *m) +{ + int qidx; + + if ((NTXQSETS(ctx) > 1) && M_HASHTYPE_GET(m)) + qidx = QIDX(ctx, m); + else + qidx = NTXQSETS(ctx) + FIRST_QSET(ctx) - 1; + return (&ctx->ifc_txqs[qidx]); +} + +static int +iflib_simple_transmit(if_t ifp, struct mbuf *m) +{ + if_ctx_t ctx; + iflib_txq_t txq; + int error; + int bytes_sent = 0, pkt_sent = 0, mcast_sent = 0; + + + ctx = if_getsoftc(ifp); + if ((if_getdrvflags(ifp) & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != + IFF_DRV_RUNNING) + return (EBUSY); + txq = iflib_simple_select_queue(ctx, m); + mtx_lock(&txq->ift_mtx); + error = iflib_encap(txq, &m); + if (error == 0) { + pkt_sent++; + bytes_sent += m->m_pkthdr.len; + mcast_sent += !!(m->m_flags & M_MCAST); + (void)iflib_txd_db_check(txq, true); + } + (void)iflib_completed_tx_reclaim(txq, RECLAIM_THRESH(ctx)); + mtx_unlock(&txq->ift_mtx); + if_inc_counter(ifp, IFCOUNTER_OBYTES, bytes_sent); + if_inc_counter(ifp, IFCOUNTER_OPACKETS, pkt_sent); + if (mcast_sent) + if_inc_counter(ifp, IFCOUNTER_OMCASTS, mcast_sent); + + return (error); +} From nobody Wed Aug 20 17:33:48 2025 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 4c6YTV4FXDz64kPd; Wed, 20 Aug 2025 17:33:50 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6YTV375Xz4DRf; Wed, 20 Aug 2025 17:33:50 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755711230; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ocF+m477L4uR/T0zF2xgtyd7sxuX6uLIZO4YGvubwio=; b=OHfd0bwsTV3kyOVtvPEujRRAb4LJ2KwveYkV37kBfe/3C9OonEOJ5N9c3w+faYR2PHNFps 4IiO45j/XAsOM9m2XkWr7xe7gK2syxtoqMolVrlDyUlcF5I+pJQtvwXcd20lhGjLVqmGJn 6hlU5W0xAaNSa2qfskbiLufWSdcAXCqDVwKtre+NF8TLrkcMY4nhWOkUG8s5JZxur0aXLC 2HCLHuVJndrJydL3VvMWmL5IW4IukHjUZQqNhxraxkfRq/SRRUImFFvh/DeqRE+Ip1R9zd P71gdBY7ktkhEmXYclhqkegIhGS0m+3y+fFZktZKqIv//MMy1YS0cNbnia4D3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755711230; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ocF+m477L4uR/T0zF2xgtyd7sxuX6uLIZO4YGvubwio=; b=iagPTOWNMuWGJPYvwduNUQKxADF5nv9AOvyh1Gm2XYYhMJh8NRFY8nDU2Ln+gnnLiNkxU7 PUDfuWJ8RlSHlqUlGe7Ui96uNi4noWmmFNOc4yOCNoajLMC1YcAP+x7E80LnbzpuXsk3mE yqDadRFH0syiC+kmWdRRUOpYi8FDzA3su34dPt6dapKL2asWWL1czBohAnRf+RIMNKzyF/ D3fSYPSZQzFmNQxMeUS5dRBBauJ7oAy0gDcj+cTNZVnA1agjcj5fK2/3X/tWDtUJ0L4KFM S68cvQ81p76f9RmHXuSiQ0FaCZvJpx6aDxLIf3ocKVBqtpvjBu2HcVEvJbDNtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755711230; a=rsa-sha256; cv=none; b=FFtRSPMU885EL/2p6scIsYVo2UdXP88mgY6aiN/OZB7gIiVPHTT/8w4+jp50euDPJwI6v9 /OeEfv1etZwVVQD5C3wuVIkOxtRTlE8240hKz9QKG7UmF5BfyaGq7c5LTGwW0mcszBRibK UzcDudoxgx0thpITMH02Ko8FMOimYYOcM69f5Qv5oAbNAtIGL6thdyOefyFeYHjuhju07t rPdnpyIPG+ixozVDYddCo+vuaoNiwawtBlBVljZ93mECS8N6sMsWZZwi2ookiImOzQpMEd XQnKiOg9ivsLHWD6K2kyY8YQ0ue/QLGvGCNC/GGNjGVIv1VqAE03YzvRgA+sbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.dev (88-177-82-251.subs.proxad.net [88.177.82.251]) (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: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c6YTV1mhJzpLq; Wed, 20 Aug 2025 17:33:50 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id D20CB3BFA7; Wed, 20 Aug 2025 19:33:48 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Martin Matuska Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 94ca18c18bb0 - main - zfs: fix build issues from 53a2e2635 In-Reply-To: <202508201342.57KDgvVE096874@gitrepo.freebsd.org> (Martin Matuska's message of "Wed, 20 Aug 2025 13:42:57 GMT") References: <202508201342.57KDgvVE096874@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 20 Aug 2025 19:33:48 +0200 Message-ID: <86frdlj3sz.fsf@ltc.des.dev> 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: quoted-printable Martin Matuska writes: > zfs: fix build issues from 53a2e2635 Thank you for the quick fix. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Wed Aug 20 18:11:29 2025 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 4c6ZJx6qvgz64mnK; Wed, 20 Aug 2025 18:11:29 +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 4c6ZJx61ygz4MMK; Wed, 20 Aug 2025 18:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755713489; 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=98toItlmW1yzmE4VPoh6lSalhCb6yCb7ETi2oTB2K8E=; b=Ksb8SAZAUYQYYNa5LioBnOBCXhoQrzWqniT0wD71AV0mJrFlktbcCfSE/ZK2HUryXr3tEF eRkhoE0DLu1Y3lnoHnjLdYq2ltr9H9lTfZ3TVes6gFZ7FQ5nXRCyofSvA2x2yZJnqQA2cD IVZDtttF0fVqmAP1IxQc/+wLXvtl6FO+X2/SJVtUeqGra+2aLRcFIvNzgad9l6OBYu5io0 PH20j/M0IwgoZ4vTsVZzNoAh2WCLMcI2F8LTmzzDyICNBOCaxCZUqJTWuGMVFNu4CQUuvd K6ZjBTVbaIQ0gDwwsPxqyHTXX27+9huv8b7zfcNefGAY54txcahyBRZ5Pc+IVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755713489; 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=98toItlmW1yzmE4VPoh6lSalhCb6yCb7ETi2oTB2K8E=; b=N7eSiQC5oz+Vk9AVvtfS6yChH7Pq4jbA6D3YmiSs4iFChrwI+lkyQLBMDe7ZiZsuxMPt73 I9ETlcdOm6bev7XAntCLdSqm+F+9fj9AZpNvYnTDHxzL2c2ESmh12ancOYo09eQKbNR1mU 3Zrr1LXvdyWn6OwZVVKs2amsw3NctUaTlSZ3rtMObpuSwB1VPxHGlG42Tykv807DDfH+U8 a1WoRBrk3oIwhbbvoKQLzIgawLV3HXfb0t+Yb/uHsGa5N8aMJlQiiJFQXE6wTXlYSoGJrn rVAVV7276ZGnCeuZCNrJ8076BsfLLM3cjyuzbGHfrwbt1ceuzKvuGBKsZFiKyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755713489; a=rsa-sha256; cv=none; b=aJdMUhkG7yJbaBJCTpZ4YkirmC2dykT11vw97dMOklYfBNyuTN/98WyiX8iLNMzhysDCN/ cWMvP3DGL8jo84dcGgZh7B3tbE911c0NLcNQRT6dWmzunI3NcsWJmma5GYI6kQjo0ZP3xl fuoYaLTiGIugnkFQYPew7QXwFlOg9342WH2PaB+/0J4ibQUNODyD0fyww0qkXZJJt7lNYp qfTHWgi5kO06hC1kKphgV+CO/hW/ez/N2TkNhO2J63N8Jk7pkfWhhNJhfuNWl8kz+sgYP9 uQmfdeyXkb8z8Zyu7lwEcsxHFIyR99AEy25EqyJb8cOU9sHJMKpiOR8dyiVgkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6ZJx5W19z83T; Wed, 20 Aug 2025 18:11:29 +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 57KIBTPi002330; Wed, 20 Aug 2025 18:11:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KIBTT5002327; Wed, 20 Aug 2025 18:11:29 GMT (envelope-from git) Date: Wed, 20 Aug 2025 18:11:29 GMT Message-Id: <202508201811.57KIBTT5002327@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: c0771d8c78b4 - main - jh7110_pcie.c: add empty PIC methods to conform conventions 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0771d8c78b421b26c9b32a899f8d0131bb46ef4 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c0771d8c78b421b26c9b32a899f8d0131bb46ef4 commit c0771d8c78b421b26c9b32a899f8d0131bb46ef4 Author: Jari Sihvola AuthorDate: 2025-08-20 17:13:00 +0000 Commit: Mitchell Horne CommitDate: 2025-08-20 18:09:37 +0000 jh7110_pcie.c: add empty PIC methods to conform conventions This commit updates the driver code to conform with an undocumented convention which says that certain functions need always be implemented together regardless of their content (or lack of). It's been said that unimplemented KOBJ methods become stubs which return ENXIO so this commit does not imply a functional change. Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D52042 --- sys/riscv/starfive/jh7110_pcie.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/riscv/starfive/jh7110_pcie.c b/sys/riscv/starfive/jh7110_pcie.c index 2d0a4be69b2c..5181252ab2dc 100644 --- a/sys/riscv/starfive/jh7110_pcie.c +++ b/sys/riscv/starfive/jh7110_pcie.c @@ -482,6 +482,16 @@ jh7110_pcie_msi_enable_intr(device_t dev, struct intr_irqsrc *isrc) jh7110_pcie_msi_mask(dev, isrc, false); } +static void +jh7110_pcie_msi_post_filter(device_t dev, struct intr_irqsrc *isrc) +{ +} + +static void +jh7110_pcie_msi_post_ithread(device_t dev, struct intr_irqsrc *isrc) +{ +} + static void jh7110_pcie_msi_pre_ithread(device_t dev, struct intr_irqsrc *isrc) { @@ -1008,6 +1018,8 @@ static device_method_t jh7110_pcie_methods[] = { /* Interrupt controller interface */ DEVMETHOD(pic_enable_intr, jh7110_pcie_msi_enable_intr), DEVMETHOD(pic_disable_intr, jh7110_pcie_msi_disable_intr), + DEVMETHOD(pic_post_filter, jh7110_pcie_msi_post_filter), + DEVMETHOD(pic_post_ithread, jh7110_pcie_msi_post_ithread), DEVMETHOD(pic_pre_ithread, jh7110_pcie_msi_pre_ithread), /* OFW bus interface */ From nobody Wed Aug 20 18:14:59 2025 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 4c6ZNz2xpPz64nB3; Wed, 20 Aug 2025 18:14:59 +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 4c6ZNz2Bwwz4PHs; Wed, 20 Aug 2025 18:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755713699; 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=DyhEqIu09lojuwLfAPh1MSNHNHJceaSjW/hOJuwuySg=; b=j+Ou3d181aE7o0Oy974jgRJ5vjBeWleBRBc3mnXEhjPEg7vGQsJUKkU8BIj4i9vRHcdmmn IRsPAoW0rRjDKcpiMusGr4xa1Cr8Zsc2eH/YxShmKCfz5D7GgE8/o5h8dn0Hcdke/KXd4d 89D4e7ULGR+QnsDBP3rONIHQDO6xx4OReDrGzYLO2IWaJ9fRP7FN/7eLaBYPrJaCereluK aL4wsosyyBwT9w0YBLF7UQdehw6uszqcLxbvmUMmgWvXeciolqyw9an9Xd79kDJeAWugii 6xl69uowqXzAt8CbNJCVzhZ7J+bipsUWb/Qk9oVWdQNyhHLyw1ZQ+2A56N8yAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755713699; 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=DyhEqIu09lojuwLfAPh1MSNHNHJceaSjW/hOJuwuySg=; b=swb3VEujrK6sKbY9jIJ3mimOC6JmGiLPLtAxMjrEfBgMMknqWh/06/tk477y+M6LW1S972 idWst/hEzmjdBFdEZny+fNSLSmACabApMyoFFKmCvodR+gtL8yj/S+vSjtnqx2z0z4EJGz yhx0jXgBQoSDm9xJN3xJlcG0WRavpfqr1tqtYoIlU6qosJUyQ3V66Zdq9MSDcuTs2XbaqA YkfoumIMn+8MKme1sbGHgJ9n+glZN/WH8qOroalaous0wFlZa1M+Bdcjtnkwx5zrppnbfR 0U8ZwbcvjB4bKlIcbS4i4u0+Wzaqv7cfIKREBwhd9uYcatxo08jL3JabKU3f9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755713699; a=rsa-sha256; cv=none; b=Xe83gvc3vKjTXfIn4ARlWfqTFqHxzx84LQwnViDHiUxwpueFwxwFU1swWW7gKbTwepIoTR CBwQoxUv0z+lQ0lz90AEhW6jHSYL+hduarKIYYsFjBH28SpW9CPMr2HmOkl3FU1UiFQZJ1 LA/dJecwVt/55hAK4y7ltCEvZe95Y+Fv8fT1OiQ4IB+IOEIyEHWQzPJP23h8sLPgvkBxl6 WZcq/JlVGurira6tUYXr4RgnHqxVxgjF1P7ATtDgh/4zGIiOuIZet6OTKELoGCNIoC5mdl zV1fE5Ndlhq/GS6TLoJPZJbAyBE3luON7GUd08W44UTloL7SwUZCyMd3yUwdEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6ZNz1kDgz8nP; Wed, 20 Aug 2025 18:14:59 +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 57KIEx6i007692; Wed, 20 Aug 2025 18:14:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KIExov007689; Wed, 20 Aug 2025 18:14:59 GMT (envelope-from git) Date: Wed, 20 Aug 2025 18:14:59 GMT Message-Id: <202508201814.57KIExov007689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: ba487345f85f - main - UPDATING: Add an entry covering recent libvmmapi ABI changes 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: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba487345f85fae815ec5983ff1987401de3152e4 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=ba487345f85fae815ec5983ff1987401de3152e4 commit ba487345f85fae815ec5983ff1987401de3152e4 Author: Bojan Novković AuthorDate: 2025-08-20 18:07:50 +0000 Commit: Bojan Novković CommitDate: 2025-08-20 18:12:45 +0000 UPDATING: Add an entry covering recent libvmmapi ABI changes Reviewed by: des Differential Revision: https://reviews.freebsd.org/D52054 --- UPDATING | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/UPDATING b/UPDATING index e00b0c21f5c6..8620df648703 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20250820: + Commits 08c7dd2fbe4f and a4197ea47777 have changed the ABI between + libvmmapi and the vmm device. If using a custom kernel configuration, + please ensure that the COMPAT_FREEBSD14 option is included so older + versions of libvmmapi continue working as expected. + 20250819: The CLEAN option has been switched back from default-on to default-off. This reverts the 20250808 change below, which had reverted the 20240729 From nobody Wed Aug 20 19:33:07 2025 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 4c6c7C1HD8z64tZd; Wed, 20 Aug 2025 19:33:11 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6c7C0kBGz3SnX; Wed, 20 Aug 2025 19:33:11 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755718391; 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=K4KPs+b6+kz8S64Nn/TMEZnOv4uj2THjJu5TZfUyw5M=; b=WSrfFKHqg3vZCZTZotHlq8Jw1qcA0pGRk/19Ctgb3AlrZpcdC2oLqmB4jLuGnMGJcAs9/0 Ga0CW8ChkMs15xRjX538dJBlJiB3URE7ET10Pm+YdW6fvgIKc2KaqhPSFzTMZ9hOXA9sxU mCYBjn/DRTnEp67LZ8xmdJqZTdyjzKKc+r2YoN0QtwRA7cIkl8wFUdlevN9Ha0P7uzu1/h itGEUOKwWeGFg3bmzIiKNNIRWJOK2p1qdL1FF7pfYxN8RzTzPx0HBRdUZdle9kx6JoREtZ FLIexmRvJhNTabs7+KPZjwzdxJNQ6aiAXB9QA3RcoEDA7yYM2ShRCvovtetL+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755718391; 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=K4KPs+b6+kz8S64Nn/TMEZnOv4uj2THjJu5TZfUyw5M=; b=Fk44K6WxnCUtMFLt75flpW+lNXmtUOnjNTJr/uxV1kMIFoZBzii6vgeLcrek9LwxS3xgYv rEeRPzoRWRuxc6IA9lhKIZwru+06xlFejEWIy1RFF0wIVoVHMNE3wGaXK0cRyRF+SSb5Ek k09rZCe10E1w7u9VgPuRl9eRGpjA03nAExf0tWVS301Medj6oUDlflrEI8YUjZe0ZR/n2v zvaZukXHrZ8HtO0jPTaDSklWiLZGIDtblgBcxZOAbD9NBaE6Lu1Kluh+fKXTiaMbEZ+brA Mj+b95cvSYdLlIZyC5+oygUtvsw7isGCZCTQZlfvPqjvxP449uLJ84+VN5ECog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755718391; a=rsa-sha256; cv=none; b=TnDdbtMJygWa3lYn7tHWYeuKue3rCgMddLrz2xoBCOEKddifs7UPwsvMXtVH7YPJ6FdsOJ /HDx/c+gBqo96BNayFfQhQhXTJIlmzIxerTVbIkWtCKfFZXvHbQCoAjbACWt/x4eZOFe/m mXRIbZMzf5EgrvyAYELbIVWjmFlkB/KiO3+tZ0QmFMA44z+DzSlJcYiVvWetm6LYcgmBRk HX+hLnsagR+FUoiZuxRAD28iSEc+eB1CbG/BBX+TST+HsZtkIYYHRTN4EGpkVnZiN96sda BS0nmcZKciwInHBuSehOKYIMsX5jQrpNG6kPrVu+R6fdjbMRPrhl01s3fYfWLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (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: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c6c7B43j5zshW; Wed, 20 Aug 2025 19:33:10 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Wed, 20 Aug 2025 20:33:07 +0100 From: Lexi Winter To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: cb3eac927b5d - main - krb5: Update version strings Message-ID: Mail-Followup-To: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202508190203.57J23n24066534@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: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="1TciSP0QTdr6NjDi" Content-Disposition: inline In-Reply-To: <202508190203.57J23n24066534@gitrepo.freebsd.org> --1TciSP0QTdr6NjDi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Cy Schubert: > /* Define to the full name and version of this package. */ > -#define PACKAGE_STRING "Kerberos 5 1.21.1" > +#define PACKAGE_STRING "Kerberos 5 1.22.0" is this right? in the source code it's called "1.22-final"[0], which is also the version we set in Makefile.inc. =20 [0] see crypto/krb5/src/configure or crypto/krb5/src/patchlevel.h --1TciSP0QTdr6NjDi Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaKYi7wAKCRD1nT63mIK/ YEq6AQDGeobT2frnGFaBX3cMuQdyZ9CPigijBGxeBP+s2SW/EgD6Aza2rqxOdYbz tU223y+mlYNubtC2hgR7C1wat8Q6nAc= =5z7W -----END PGP SIGNATURE----- --1TciSP0QTdr6NjDi-- From nobody Wed Aug 20 20:06:20 2025 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 4c6csX2HFkz64wKx; Wed, 20 Aug 2025 20:06:24 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6csW3SYXz3W7w; Wed, 20 Aug 2025 20:06:23 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=permerror reason="p tag has invalid value: quarantine rua=mailto:p[ostmaster@cschubert.com" header.from=cschubert.com (policy=permerror); spf=pass (mx1.freebsd.org: domain of cy.schubert@cschubert.com designates 3.97.99.32 as permitted sender) smtp.mailfrom=cy.schubert@cschubert.com Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id ohmoujuDx9JM2op4gubCAs; Wed, 20 Aug 2025 20:06:22 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id op4eunNgVWX70op4fuj7RB; Wed, 20 Aug 2025 20:06:22 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=d71WygjE c=1 sm=1 tr=0 ts=68a62abe a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=2OwXVqhp2XgA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=Rk-M77FJAAAA:8 a=YxBL1-UpAAAA:8 a=PyOKIMRrKuaTZibx-HcA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=ef1k35tKgZpiIrJ2aQ5N:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 82ED129F; Wed, 20 Aug 2025 13:06:20 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 4F38011A; Wed, 20 Aug 2025 13:06:20 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: cb3eac927b5d - main - krb5: Update version strings In-reply-to: References: <202508190203.57J23n24066534@gitrepo.freebsd.org> Comments: In-reply-to Lexi Winter message dated "Wed, 20 Aug 2025 20:33:07 +0100." 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 Date: Wed, 20 Aug 2025 13:06:20 -0700 Message-Id: <20250820200620.4F38011A@slippy.cwsent.com> X-CMAE-Envelope: MS4xfJMVKDQNsETzw3NEHRwrErbhZolREq4SbPLrr1D8Nom/n6AEaRQ2QRrhGODZiunLuEhCZPCqtP8S5IYOlRMzJXM6VwoRd9iwuU/jh4c67ED73sqI2FL+ sQ548YNcSX+ExwZwjg//yEE+WlcSs3JHisD0zUZlYhP1yoGtZcdASt18YvYwMZS28AuFPFSqlTgLERQ63rulnOCJd0S7WdMFnuy5qG7gpJ4Dtladr0wLTiHy b0rIDzIGS3QG85Gbgcl/XZqUxJd3ifNrkYc/LblaOgQX4HCdoG9aLefLOQsStJWDBzW8KnU50kzB1YyVk8w0YYw7WPW5Me62tvbLjIb582Q= X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.30 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; RWL_MAILSPIKE_EXCELLENT(-0.40)[3.97.99.32:from]; R_SPF_ALLOW(-0.20)[+ip4:3.97.99.32/31]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[3.97.99.32:from]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; DMARC_BAD_POLICY(0.00)[cschubert.com : p tag has invalid value: quarantine rua=mailto:p[ostmaster@cschubert.com]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_NA(0.00)[]; REPLYTO_EQ_FROM(0.00)[] X-Rspamd-Queue-Id: 4c6csW3SYXz3W7w In message , Lexi Winter writes: > > > --1TciSP0QTdr6NjDi > Content-Type: text/plain; charset=us-ascii > Content-Disposition: inline > Content-Transfer-Encoding: quoted-printable > > Cy Schubert: > > /* Define to the full name and version of this package. */ > > -#define PACKAGE_STRING "Kerberos 5 1.21.1" > > +#define PACKAGE_STRING "Kerberos 5 1.22.0" > > is this right? in the source code it's called "1.22-final"[0], which is > also the version we set in Makefile.inc. Yes. IMO the version string in base should probably be different than that of the port. Maybe 1.22.0-FreeBSD ?? There is a possibility the port also be installed for those who use LDAP as the KDB backend. Or mysql or postgresql as a backend. Thoughts? > > [0] see crypto/krb5/src/configure or crypto/krb5/src/patchlevel.h -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Wed Aug 20 20:12:30 2025 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 4c6d0Z3HQdz64x5S; Wed, 20 Aug 2025 20:12:30 +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 4c6d0Z2XY1z3XBw; Wed, 20 Aug 2025 20:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755720750; 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=PtgiqlqDhwHvZRghYNF2KI1qksp0dlNVOsM+ScVPMiE=; b=xVWLC8iRG7d2cRh9JV6q9dXuni8LJR8QvQA/6I0kkXLjE+crbaOnDZMkp/HH9Ydp5mOGTZ oSUNDMfrSlJj/QQaS1IJ2LoAaFGWsobsg0fzUgoTu4uONmiyssr4hHhboBUGpvxDvofapp UL8o6n6sKDk8k4qEyBHpEaihQ//23YZcW3M8IhmeFi1tDbFl2HawJunQ4AreJ8tRzg0Elb 1jp27KBhkDeeYNW4A/TNhJNajuA0Rw2YExz14avUz52eMeonopXdgpJykBCIxmQkyoE5SZ eZg3Q96kqKYfOo6u+09lyxCTi63Aa0tkBNwtm/1QzooeFZZRxpzn8yd2xd3YLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755720750; 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=PtgiqlqDhwHvZRghYNF2KI1qksp0dlNVOsM+ScVPMiE=; b=aLzqF+PIVc0RgFoG/gvsU6uxqO6LyGlgbGFxzSUW1/QfB/nGCPACQ1a1ix9aik1bVnUrW7 0UC8ei3Po5FVOofKgWEswbRkArguvmuRu9+WuQFxeLfy2ZIyLSst/2s2Na8BFmgbtNWMm4 Wybs2REDPAOcYR9kNmnWTJZOTEmlvq7oGkmas8YSYoqQ5PHmqgkuIWhy4Pq8aI/N/3CJ2t +9CnfVuiY8OrBC4HERCgLRyaYMGuHBGEjhwWYc5SVdO3WbehhCXazLzYg+Vd32BPxfGMfI DhiMuDONikPcuqs7O/9PHzAGjVLEg21dSIYanlKXYpq8adGS27ucROxmr3bpkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755720750; a=rsa-sha256; cv=none; b=h7+Z8vkeas9KlAYuTTi7j7g1ABZc0PUWzbFXEmB4jyuNhyT7P0vo4SZSKzMzibrT+TXfXw kuhwhMLHk5BLhJsisASCskEQ271YvtuRw9aCcu92e30f6jSoHV2NW4/gi3YFeq4JvZykbH X948uHiHOlMMnrmMnS7d3bt424oXaFYjYylxPhm7p0TTZ/DGhFhZQ2aQJAUcgXLMPnc3DU VsgN9ALZCsS2KDFMGuaNW9Bl4s495k7Y8CPMOP3T2j/b3RP8moHd8t1oiBFzOUM+KSzA5Q SbSUL6bRcnSmcDrJ+PJvMQtzkW1Rgku4jXSH9Lrxkv73jVNwqVFyyIs9IPhunQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6d0Z27nYzCbr; Wed, 20 Aug 2025 20:12:30 +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 57KKCUAX032645; Wed, 20 Aug 2025 20:12:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KKCULV032642; Wed, 20 Aug 2025 20:12:30 GMT (envelope-from git) Date: Wed, 20 Aug 2025 20:12:30 GMT Message-Id: <202508202012.57KKCULV032642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: dc5ba6b8b4f0 - main - Remove MK_GSSAPI 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc5ba6b8b4f028eb944434be82838d272330f26f Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=dc5ba6b8b4f028eb944434be82838d272330f26f commit dc5ba6b8b4f028eb944434be82838d272330f26f Author: Lexi Winter AuthorDate: 2025-08-20 18:42:20 +0000 Commit: Lexi Winter CommitDate: 2025-08-20 18:42:20 +0000 Remove MK_GSSAPI For MIT Kerberos, MK_GSSAPI has no meaning: GSSAPI is a required part of Kerberos and is always built if MK_KERBEROS is enabled. Backport this behaviour to Heimdal so it works the same way. While here, change Heimdal's libcom_err and compile_et to be selected by MK_KERBEROS, not MK_KERBEROS_SUPPORT, since these are part of Kerberos and third-party users might need it even if Kerberos support is disabled in the base system. This means MK_KERBEROS_SUPPORT installs the same files with both MIT and Heimdal. Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D51859 --- Makefile.inc1 | 6 ++---- UPDATING | 9 +++++++++ include/Makefile | 2 +- kerberos5/Makefile.inc | 2 -- kerberos5/lib/Makefile | 2 -- kerberos5/libexec/Makefile | 2 -- lib/Makefile | 6 +++--- libexec/rc/rc.d/Makefile | 2 +- secure/libexec/sshd-session/Makefile | 2 +- secure/ssh.mk | 3 +-- secure/usr.bin/ssh/Makefile | 2 +- secure/usr.sbin/sshd/Makefile | 2 +- share/man/man5/src.conf.5 | 22 ++++++---------------- share/mk/local.dirdeps.mk | 2 +- share/mk/src.opts.mk | 2 +- tools/build/mk/OptionalObsoleteFiles.inc | 4 ++-- tools/build/options/WITHOUT_GSSAPI | 1 - tools/build/options/WITHOUT_KERBEROS | 2 +- usr.bin/Makefile | 2 +- usr.sbin/Makefile | 4 +--- 20 files changed, 33 insertions(+), 46 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 861d368af838..d65d1c86deac 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3387,7 +3387,7 @@ secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L secure/lib/libssh__L: lib/libldns__L .endif -.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_KERBEROS_SUPPORT} != "no" .if ${MK_MITKRB5} != "no" secure/lib/libssh__L: krb5/lib/gssapi__L krb5/lib/krb5__L \ krb5/lib/crypto__L krb5/util/et__L lib/libmd__L krb5/util/support__L @@ -3446,11 +3446,9 @@ kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbas lib/libsqlite3__L: lib/libthr__L -.if ${MK_GSSAPI} != "no" -.if ${MK_MITKRB5} == "no" +.if ${MK_KERBEROS} != "no" && ${MK_MITKRB5} == "no" _lib_libgssapi= lib/libgssapi .endif -.endif .if ${MK_KERBEROS} != "no" .if ${MK_MITKRB5} != "no" diff --git a/UPDATING b/UPDATING index 8620df648703..575669b8bc64 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20250820: + The WITHOUT_GSSAPI src.conf knob has been removed. This was already + a no-op for MIT Kerberos, so this only affects builds which set + WITHOUT_MITKRB5=1, in which case you now always get libgssapi. + + Also, Heimdal's compile_et and libcom_err are now controlled by + WITHOUT_KERBEROS, not WITHOUT_KERBEROS_SUPPORT. This matches + the behaviour of the MIT Kerberos versions. + 20250820: Commits 08c7dd2fbe4f and a4197ea47777 have changed the ABI between libvmmapi and the vmm device. If using a custom kernel configuration, diff --git a/include/Makefile b/include/Makefile index 2792d594a888..07890362d7a6 100644 --- a/include/Makefile +++ b/include/Makefile @@ -293,7 +293,7 @@ LSUBSUBDIRS+= netgraph/bluetooth/include LSUBDIRS+= fs/cuse .endif -.if ${MK_GSSAPI} != "no" && ${MK_MITKRB5} == "no" +.if ${MK_KERBEROS} != "no" && ${MK_MITKRB5} == "no" SUBDIR+= gssapi INCS+= gssapi.h .endif diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index 2525f3888806..e02e110b5786 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -29,9 +29,7 @@ ETSRCS= \ ${KRB5DIR}/lib/wind/wind_err.et \ ${KRB5DIR}/lib/ntlm/ntlm_err.et -.if ${MK_GSSAPI} != "no" ETSRCS+= ${KRB5DIR}/lib/gssapi/krb5/gkrb5_err.et -.endif .for ET in ${ETSRCS} .for _ET in ${ET:T:R} diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile index 7b63da16e360..1f631b48ce83 100644 --- a/kerberos5/lib/Makefile +++ b/kerberos5/lib/Makefile @@ -7,10 +7,8 @@ SUBDIR= libasn1 libhdb \ SUBDIR+= libkafs5 # requires krb_err.h from libkrb5 SUBDIR_DEPEND_libkafs5= libkrb5 -.if ${MK_GSSAPI} != "no" SUBDIR+= libgssapi_krb5 SUBDIR+= libgssapi_ntlm SUBDIR+= libgssapi_spnego -.endif .include diff --git a/kerberos5/libexec/Makefile b/kerberos5/libexec/Makefile index 543331d5029b..2ac9c2d45f28 100644 --- a/kerberos5/libexec/Makefile +++ b/kerberos5/libexec/Makefile @@ -4,8 +4,6 @@ SUBDIR= digest-service ipropd-master ipropd-slave hprop hpropd kdc \ kdigest kfd kimpersonate kpasswdd kcm SUBDIR_PARALLEL= -.if ${MK_GSSAPI} != "no" SUBDIR+= kadmind -.endif .include diff --git a/lib/Makefile b/lib/Makefile index 9447cc4551c0..2b7cf2fdcb7d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -179,12 +179,12 @@ SUBDIR.${MK_FDT}+= libfdt SUBDIR.${MK_FILE}+= libmagic SUBDIR.${MK_GPIO}+= libgpio .if ${MK_MITKRB5} == "no" -SUBDIR.${MK_GSSAPI}+= libgssapi +SUBDIR.${MK_KERBEROS}+= libgssapi .endif -SUBDIR.${MK_GSSAPI}+= librpcsec_gss +SUBDIR.${MK_KERBEROS}+= librpcsec_gss SUBDIR.${MK_ICONV}+= libiconv_modules .if ${MK_MITKRB5} == "no" -SUBDIR.${MK_KERBEROS_SUPPORT}+= libcom_err +SUBDIR.${MK_KERBEROS}+= libcom_err .endif SUBDIR.${MK_LDNS}+= libldns SUBDIR.${MK_STATS}+= libstats diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index d0c6fc1dee46..7c1f50b027a9 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -215,7 +215,7 @@ FTPD= ftpd FTPDPACKAGE= ftpd .endif -.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_KERBEROS_SUPPORT} != "no" CONFGROUPS+= GSSD GSSD= gssd GSSDPACKAGE= gssd diff --git a/secure/libexec/sshd-session/Makefile b/secure/libexec/sshd-session/Makefile index 37e099794bd5..5ed459fe492a 100644 --- a/secure/libexec/sshd-session/Makefile +++ b/secure/libexec/sshd-session/Makefile @@ -38,7 +38,7 @@ LIBADD+= blacklist LDFLAGS+=-L${LIBBLACKLISTDIR} .endif -.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_KERBEROS_SUPPORT} != "no" .if ${MK_MITKRB5} != "no" LIBADD+= gssapi_krb5 krb5 .include "../../krb5/Makefile.inc" diff --git a/secure/ssh.mk b/secure/ssh.mk index bb6dd9b748e4..97dd089d98e8 100644 --- a/secure/ssh.mk +++ b/secure/ssh.mk @@ -9,12 +9,11 @@ SKSRCS= ssh-sk-client.c CFLAGS+= -I${SSHDIR} -include ssh_namespace.h -.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h .if ${MK_MITKRB5} == "no" CFLAGS+= -DHEIMDAL=1 .endif - .endif CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE:U/usr/local}/bin/xauth\" diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index a4f36d0fe2df..2b11b783c007 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -17,7 +17,7 @@ SRCS+= gss-genr.c LIBADD= ssh -.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_KERBEROS_SUPPORT} != "no" .if ${MK_MITKRB5} == "no" LIBADD+= gssapi .else diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index f37dfe1c1b3a..433a87984e42 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -18,7 +18,7 @@ moduli: .MADE LIBADD= ssh util -.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_KERBEROS_SUPPORT} != "no" .if ${MK_MITKRB5} == "no" LIBADD+= gssapi_krb5 gssapi krb5 .else diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index f79d160255bf..2895c0cf4746 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd August 19, 2025 +.Dd August 20, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -452,8 +452,6 @@ When set, it enforces these options: .It .Va WITHOUT_KERBEROS .It -.Va WITHOUT_KERBEROS_SUPPORT -.It .Va WITHOUT_LDNS .It .Va WITHOUT_LDNS_UTILS @@ -480,9 +478,9 @@ When set, it enforces these options: When set, these options are also in effect: .Pp .Bl -inset -compact -.It Va WITHOUT_GSSAPI +.It Va WITHOUT_KERBEROS_SUPPORT (unless -.Va WITH_GSSAPI +.Va WITH_KERBEROS_SUPPORT is set explicitly) .El .It Va WITH_CTF @@ -739,8 +737,6 @@ and dependent tests. Do not build .Xr gpioctl 8 as part of the base system. -.It Va WITHOUT_GSSAPI -Do not build libgssapi. .It Va WITHOUT_HAST Do not build .Xr hastd 8 @@ -840,14 +836,10 @@ Do not build and .Xr truss 1 . .It Va WITHOUT_KERBEROS -Set this to not build Kerberos 5 (KTH Heimdal). +Set this to not build Kerberos. When set, these options are also in effect: .Pp .Bl -inset -compact -.It Va WITHOUT_GSSAPI -(unless -.Va WITH_GSSAPI -is set explicitly) .It Va WITHOUT_KERBEROS_SUPPORT (unless .Va WITH_KERBEROS_SUPPORT @@ -1433,8 +1425,6 @@ When set, it enforces these options: .It .Va WITHOUT_KERBEROS .It -.Va WITHOUT_KERBEROS_SUPPORT -.It .Va WITHOUT_LDNS .It .Va WITHOUT_LDNS_UTILS @@ -1459,9 +1449,9 @@ When set, it enforces these options: When set, these options are also in effect: .Pp .Bl -inset -compact -.It Va WITHOUT_GSSAPI +.It Va WITHOUT_KERBEROS_SUPPORT (unless -.Va WITH_GSSAPI +.Va WITH_KERBEROS_SUPPORT is set explicitly) .El .It Va WITHOUT_OPENSSL_KTLS diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index a92539689a31..bdc7242d4bfd 100644 --- a/share/mk/local.dirdeps.mk +++ b/share/mk/local.dirdeps.mk @@ -185,7 +185,7 @@ C_DIRDEPS= \ # libgcc is needed as well but is added later. -.if ${MK_GSSAPI} != "no" +.if ${MK_KERBEROS} != "no" && ${MK_MITKRB5} == "no" C_DIRDEPS+= include/gssapi .endif diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 8a52fe03221e..85a003eb4eaf 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -508,7 +508,7 @@ MK_LOADER_VERIEXEC_PASS_MANIFEST := no # MK_* options whose default value depends on another option. # .for vv in \ - GSSAPI/KERBEROS \ + KERBEROS_SUPPORT/KERBEROS \ MAN_UTILS/MAN .if defined(WITH_${vv:H}) MK_${vv:H}:= yes diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index dcd606feea1d..27d03f13c4e3 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2262,13 +2262,13 @@ OLD_FILES+=usr/share/man/man3/gpio_pin_tristate.3.gz OLD_FILES+=usr/share/man/man8/gpioctl.8.gz .endif -.if ${MK_GSSAPI} == "no" || ${MK_KERBEROS_SUPPORT} == "no" +.if ${MK_KERBEROS_SUPPORT} == "no" OLD_FILES+=etc/rc.d/gssd OLD_FILES+=usr/sbin/gssd OLD_FILES+=usr/share/man/man8/gssd.8.gz .endif -.if ${MK_GSSAPI} == no +.if ${MK_KERBEROS} == no OLD_FILES+=usr/include/gssapi/gssapi.h OLD_DIRS+=usr/include/gssapi OLD_FILES+=usr/include/gssapi.h diff --git a/tools/build/options/WITHOUT_GSSAPI b/tools/build/options/WITHOUT_GSSAPI deleted file mode 100644 index 3b208b6edecd..000000000000 --- a/tools/build/options/WITHOUT_GSSAPI +++ /dev/null @@ -1 +0,0 @@ -Do not build libgssapi. diff --git a/tools/build/options/WITHOUT_KERBEROS b/tools/build/options/WITHOUT_KERBEROS index 98e1ffe3721d..e0301ee1d786 100644 --- a/tools/build/options/WITHOUT_KERBEROS +++ b/tools/build/options/WITHOUT_KERBEROS @@ -1 +1 @@ -Set this to not build Kerberos 5 (KTH Heimdal). +Set this to not build Kerberos. diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 512f75b5d093..da1a9b3a681f 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -219,7 +219,7 @@ SUBDIR.${MK_ISCSI}+= iscsictl SUBDIR.${MK_KDUMP}+= kdump SUBDIR.${MK_KDUMP}+= truss .if ${MK_MITKRB5} == "no" -SUBDIR.${MK_KERBEROS_SUPPORT}+= compile_et +SUBDIR.${MK_KERBEROS}+= compile_et .endif SUBDIR.${MK_LDNS_UTILS}+= drill SUBDIR.${MK_LDNS_UTILS}+= host diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index dcfe2037f8ce..b97c22ffeb08 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -139,9 +139,7 @@ SUBDIR.${MK_FLOPPY}+= fdformat SUBDIR.${MK_FLOPPY}+= fdread SUBDIR.${MK_FLOPPY}+= fdwrite SUBDIR.${MK_FREEBSD_UPDATE}+= freebsd-update -.if ${MK_KERBEROS_SUPPORT} != "no" -SUBDIR.${MK_GSSAPI}+= gssd -.endif +SUBDIR.${MK_KERBEROS_SUPPORT}+= gssd SUBDIR.${MK_GPIO}+= gpioctl SUBDIR.${MK_HYPERV}+= hyperv SUBDIR.${MK_INET6}+= ip6addrctl From nobody Wed Aug 20 20:12:31 2025 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 4c6d0b4WJ4z64x5T; Wed, 20 Aug 2025 20:12:31 +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 4c6d0b3L9Hz3X8b; Wed, 20 Aug 2025 20:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755720751; 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=LSH0PN+hiPN/a5IyIVcXKIEKyPGg5fwgDV6E4s4I0bo=; b=L/2DnusD/auD4Iik+WX2WTedcYzb3paoWfEJg96eGGbaefyFzkIC8Si/uZbaWYXA54umJp WDCo+2jnBRs4OydQM3muQTvZ71uW+PF1uLUI2pofiZE0Ae/IZNJW7HXYN/N+NO0CcPLq8F RJYuv6CWDMVd3uJAx0JueFyYVWhG1uHzG48pgbGfQD3m/UiCBNXTq0eWH10KSxlyAQVVUu IYZgKg8LnCb7L4upXAe/8zaNE9nt2h8zg/7dHE4pa6N8iRl8ULMTsAmccre/qRkB1vIoZJ T4bi3bghJnUr4roQr73k3QpyrIIYBttAtXUokrgrlZyjw93NwTYx7WYyfaJkNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755720751; 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=LSH0PN+hiPN/a5IyIVcXKIEKyPGg5fwgDV6E4s4I0bo=; b=odE0Mgl2FsJbri3Q2cewLfTLVy9Y+m+xr+RcswIFKriYcEaCepU+a4BlsQjPImf/f9ymDX 3ZM+WCjBavwpDMvqPIU5brnDmSejNxprPWjYsY31+DrUKbJhxFibrLsCewyIi3wXFyLh2d ufrQVGaRT5xVZnMXM/dKwzB5OJ7GO9tyH/rmRD9kOFn3dhgjXq0ozKJb+dsyPMHjynCRdg oYmpnbGI3EeIRd3DzfodMwqZziMs+bNSKfTMRBa50f9eTXt2cmgVPIgeulYMxegmjYBarl GVGDWSBUkK0Fkl0JY47wIJKRq3O5Wucjpv5BLdRiuQ2hi0QSxCxc+QPmmwi5fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755720751; a=rsa-sha256; cv=none; b=HUnvVcPt/KCdUVuOEV01Hja0SvgqT0BlWHbiq0wrfsoRSDvXZmIXGU8/tnZSzT5K3+e2yi tU2PdvV13GA/Me771/10ZjxuZUADW5Gasc/DNBJ8MjAftjKSlohICdpLgh/pLaoU0T+k18 19lN1kgU73K3D/8veYMoNb35yiFUeeCDlG4/9AjIl3KiTOlNF1MItq+koMm6rJh/1XU8xA BKZfwgxR2o9qQspQ8HYfFzMsXPwLceGxULXWDnB6yEeNG+WYFT3fu+xWn3K+1cG3svWJLu oTB5wou7uM9fgiyhqJCUeGe8ur3so0hslgbBhnsUgs09qgZ9bx3mKD2ruTURTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6d0b2wV2zCQ7; Wed, 20 Aug 2025 20:12:31 +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 57KKCVFQ032678; Wed, 20 Aug 2025 20:12:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KKCVXD032675; Wed, 20 Aug 2025 20:12:31 GMT (envelope-from git) Date: Wed, 20 Aug 2025 20:12:31 GMT Message-Id: <202508202012.57KKCVXD032675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 721c98dd89cc - main - OptionalObsoleteFiles: Update Kerberos entries 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 721c98dd89ccfe4f9b5af4bc5fec7411eeea764f Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=721c98dd89ccfe4f9b5af4bc5fec7411eeea764f commit 721c98dd89ccfe4f9b5af4bc5fec7411eeea764f Author: Lexi Winter AuthorDate: 2025-08-20 18:43:09 +0000 Commit: Lexi Winter CommitDate: 2025-08-20 19:00:06 +0000 OptionalObsoleteFiles: Update Kerberos entries Consolidate the various lists of Kerberos files into three sets: common files, files only installed by MIT Kerberos, and files only installed by Heimdal. This avoids having to list the same files in multiple places and makes the logic a lot easier to maintain. The new file lists were created by comparing the actual result of make installworld with the various options enabled or disabled. Reviewed by: des, cy Differential Revision: https://reviews.freebsd.org/D51874 --- tools/build/mk/OptionalObsoleteFiles.inc | 3546 ++---------------------------- 1 file changed, 206 insertions(+), 3340 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 27d03f13c4e3..fe92cf671ebc 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2262,83 +2262,6 @@ OLD_FILES+=usr/share/man/man3/gpio_pin_tristate.3.gz OLD_FILES+=usr/share/man/man8/gpioctl.8.gz .endif -.if ${MK_KERBEROS_SUPPORT} == "no" -OLD_FILES+=etc/rc.d/gssd -OLD_FILES+=usr/sbin/gssd -OLD_FILES+=usr/share/man/man8/gssd.8.gz -.endif - -.if ${MK_KERBEROS} == no -OLD_FILES+=usr/include/gssapi/gssapi.h -OLD_DIRS+=usr/include/gssapi -OLD_FILES+=usr/include/gssapi.h -OLD_FILES+=usr/lib/libgssapi.a -OLD_FILES+=usr/lib/libgssapi.so -OLD_LIBS+=usr/lib/libgssapi.so.10 -OLD_FILES+=usr/lib/libgssapi_p.a -OLD_FILES+=usr/lib/librpcsec_gss.a -OLD_FILES+=usr/lib/librpcsec_gss.so -OLD_LIBS+=usr/lib/librpcsec_gss.so.1 -OLD_FILES+=usr/share/man/man3/gss_accept_sec_context.3.gz -OLD_FILES+=usr/share/man/man3/gss_acquire_cred.3.gz -OLD_FILES+=usr/share/man/man3/gss_add_cred.3.gz -OLD_FILES+=usr/share/man/man3/gss_add_oid_set_member.3.gz -OLD_FILES+=usr/share/man/man3/gss_canonicalize_name.3.gz -OLD_FILES+=usr/share/man/man3/gss_compare_name.3.gz -OLD_FILES+=usr/share/man/man3/gss_context_time.3.gz -OLD_FILES+=usr/share/man/man3/gss_create_empty_oid_set.3.gz -OLD_FILES+=usr/share/man/man3/gss_delete_sec_context.3.gz -OLD_FILES+=usr/share/man/man3/gss_display_name.3.gz -OLD_FILES+=usr/share/man/man3/gss_display_status.3.gz -OLD_FILES+=usr/share/man/man3/gss_duplicate_name.3.gz -OLD_FILES+=usr/share/man/man3/gss_export_name.3.gz -OLD_FILES+=usr/share/man/man3/gss_export_sec_context.3.gz -OLD_FILES+=usr/share/man/man3/gss_get_mic.3.gz -OLD_FILES+=usr/share/man/man3/gss_import_name.3.gz -OLD_FILES+=usr/share/man/man3/gss_import_sec_context.3.gz -OLD_FILES+=usr/share/man/man3/gss_indicate_mechs.3.gz -OLD_FILES+=usr/share/man/man3/gss_init_sec_context.3.gz -OLD_FILES+=usr/share/man/man3/gss_inquire_context.3.gz -OLD_FILES+=usr/share/man/man3/gss_inquire_cred.3.gz -OLD_FILES+=usr/share/man/man3/gss_inquire_cred_by_mech.3.gz -OLD_FILES+=usr/share/man/man3/gss_inquire_mechs_for_name.3.gz -OLD_FILES+=usr/share/man/man3/gss_inquire_names_for_mech.3.gz -OLD_FILES+=usr/share/man/man3/gss_process_context_token.3.gz -OLD_FILES+=usr/share/man/man3/gss_release_buffer.3.gz -OLD_FILES+=usr/share/man/man3/gss_release_cred.3.gz -OLD_FILES+=usr/share/man/man3/gss_release_name.3.gz -OLD_FILES+=usr/share/man/man3/gss_release_oid_set.3.gz -OLD_FILES+=usr/share/man/man3/gss_seal.3.gz -OLD_FILES+=usr/share/man/man3/gss_sign.3.gz -OLD_FILES+=usr/share/man/man3/gss_test_oid_set_member.3.gz -OLD_FILES+=usr/share/man/man3/gss_unseal.3.gz -OLD_FILES+=usr/share/man/man3/gss_unwrap.3.gz -OLD_FILES+=usr/share/man/man3/gss_verify.3.gz -OLD_FILES+=usr/share/man/man3/gss_verify_mic.3.gz -OLD_FILES+=usr/share/man/man3/gss_wrap.3.gz -OLD_FILES+=usr/share/man/man3/gss_wrap_size_limit.3.gz -OLD_FILES+=usr/share/man/man3/gssapi.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_get_error.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_get_mech_info.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_get_mechanisms.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_get_principal_name.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_get_versions.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_getcred.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_is_installed.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_max_data_length.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_mech_to_oid.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_oid_to_mech.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_qop_to_num.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_seccreate.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_set_callback.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_set_defaults.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_set_svc_name.3.gz -OLD_FILES+=usr/share/man/man3/rpc_gss_svc_max_data_length.3.gz -OLD_FILES+=usr/share/man/man3/rpcsec_gss.3.gz -OLD_FILES+=usr/share/man/man5/mech.5.gz -OLD_FILES+=usr/share/man/man5/qop.5.gz -.endif - .if ${MK_HAST} == no OLD_FILES+=etc/rc.d/hastd OLD_FILES+=sbin/hastctl @@ -2736,25 +2659,99 @@ OLD_FILES+=usr/share/man/man1/kdump.1.gz OLD_FILES+=usr/share/man/man1/truss.1.gz .endif -.if ${MK_KERBEROS} == no -.if ${MK_MITKRB5} == no -# Remove Heimdal because we do not want Kerberos -OLD_FILES+=etc/rc.d/ipropd_master -OLD_FILES+=etc/rc.d/ipropd_slave -OLD_FILES+=usr/bin/asn1_compile +.if ${MK_KERBEROS_SUPPORT} == "no" +OLD_FILES+=etc/rc.d/gssd +OLD_FILES+=usr/sbin/gssd +OLD_FILES+=usr/share/man/man8/gssd.8.gz +.endif + +# Kerberos files which are installed by both Heimdal and MIT. These should +# only be removed if Kerberos is disabled entirely. +.if ${MK_KERBEROS} == "no" + OLD_FILES+=usr/bin/compile_et -OLD_FILES+=usr/bin/hxtool +OLD_FILES+=usr/share/man/man1/compile_et.1.gz +# This is kadmin(1) in MIT but kadmin(8) in Heimdal, therefore the manpage +# is not listed here. OLD_FILES+=usr/bin/kadmin -OLD_FILES+=usr/bin/kcc OLD_FILES+=usr/bin/kdestroy -OLD_FILES+=usr/bin/kf -OLD_FILES+=usr/bin/kgetcred +OLD_FILES+=usr/share/man/man1/kdestroy.1.gz OLD_FILES+=usr/bin/kinit +OLD_FILES+=usr/share/man/man1/kinit.1.gz OLD_FILES+=usr/bin/klist +OLD_FILES+=usr/share/man/man1/klist.1.gz OLD_FILES+=usr/bin/kpasswd +OLD_FILES+=usr/share/man/man1/kpasswd.1.gz OLD_FILES+=usr/bin/krb5-config -OLD_FILES+=usr/bin/ksu +OLD_FILES+=usr/share/man/man1/krb5-config.1.gz OLD_FILES+=usr/bin/kswitch +OLD_FILES+=usr/share/man/man1/kswitch.1.gz +# MIT has a manpage for this, Heimdal does not. +OLD_FILES+=usr/bin/ksu + +OLD_FILES+=usr/include/com_err.h +OLD_FILES+=usr/include/gssapi.h +OLD_FILES+=usr/include/gssapi/gssapi.h +OLD_FILES+=usr/include/gssapi/gssapi_krb5.h +OLD_FILES+=usr/include/kadm5/admin.h +OLD_FILES+=usr/include/krb5.h +OLD_FILES+=usr/include/krb5/locate_plugin.h + +OLD_FILES+=usr/lib/libcom_err.a +OLD_FILES+=usr/lib/libcom_err.so +OLD_FILES+=usr/lib/libgssapi_krb5.a +OLD_FILES+=usr/lib/libgssapi_krb5.so +OLD_FILES+=usr/lib/libkadm5clnt.so +OLD_FILES+=usr/lib/libkrb5.a +OLD_FILES+=usr/lib/libkrb5.so +OLD_FILES+=usr/lib/librpcsec_gss.a +OLD_FILES+=usr/lib/librpcsec_gss.so +OLD_LIBS+=usr/lib/librpcsec_gss.so.1 +OLD_FILES+=usr/lib/pam_krb5.so +OLD_LIBS+=usr/lib/pam_krb5.so.6 +OLD_FILES+=usr/share/man/man8/pam_krb5.8.gz +OLD_FILES+=usr/lib/pam_ksu.so +OLD_LIBS+=usr/lib/pam_ksu.so.6 +OLD_FILES+=usr/share/man/man8/pam_ksu.8.gz + +OLD_FILES+=usr/libexec/kadmind +OLD_FILES+=usr/share/man/man8/kadmind.8.gz + +OLD_FILES+=usr/share/man/man3/com_err.3.gz +OLD_FILES+=usr/share/man/man3/rpcsec_gss.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_get_error.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_get_mech_info.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_get_mechanisms.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_get_principal_name.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_get_versions.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_getcred.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_is_installed.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_max_data_length.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_mech_to_oid.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_oid_to_mech.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_qop_to_num.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_seccreate.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_set_callback.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_set_defaults.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_set_svc_name.3.gz +OLD_FILES+=usr/share/man/man3/rpc_gss_svc_max_data_length.3.gz +OLD_FILES+=usr/share/man/man5/krb5.conf.5.gz +.endif # ${MK_KERBEROS} == "no" + +# Heimdal-specific files that don't exist in MIT Kerberos. These should be +# removed if Kerberos is disabled, or if MIT Kerberos is selected. +.if ${MK_KERBEROS} == "no" || ${MK_MITKRB5} != "no" + +# compile_et is a binary in Heimdal, but a shell script in MIT Kerberos. +# When switching from Heimdal to MIT, we need to remove the debug symbols +# explicitly. +OLD_FILES+=usr/lib/debug/usr/bin/compile_et.debug + +OLD_FILES+=usr/bin/asn1_compile +OLD_FILES+=usr/bin/hxtool +OLD_FILES+=usr/bin/kcc +OLD_FILES+=usr/bin/kf +OLD_FILES+=usr/bin/kgetcred OLD_FILES+=usr/bin/make-roken OLD_FILES+=usr/bin/slc OLD_FILES+=usr/bin/string2key @@ -2763,17 +2760,13 @@ OLD_FILES+=usr/include/asn1-common.h OLD_FILES+=usr/include/asn1_err.h OLD_FILES+=usr/include/base64.h OLD_FILES+=usr/include/cms_asn1.h -OLD_FILES+=usr/include/common.h +OLD_FILES+=usr/include/com_right.h OLD_FILES+=usr/include/crmf_asn1.h OLD_FILES+=usr/include/der-private.h OLD_FILES+=usr/include/der-protos.h OLD_FILES+=usr/include/der.h OLD_FILES+=usr/include/digest_asn1.h -OLD_FILES+=usr/include/edwards25519_fiat.h -OLD_FILES+=usr/include/edwards25519_tables.h OLD_FILES+=usr/include/getarg.h -OLD_FILES+=usr/include/groups.h -OLD_FILES+=usr/include/gssapi/gssapi_krb5.h OLD_FILES+=usr/include/hdb-protos.h OLD_FILES+=usr/include/hdb.h OLD_FILES+=usr/include/hdb_asn1.h @@ -2789,27 +2782,21 @@ OLD_FILES+=usr/include/hx509-private.h OLD_FILES+=usr/include/hx509-protos.h OLD_FILES+=usr/include/hx509.h OLD_FILES+=usr/include/hx509_err.h -OLD_FILES+=usr/include/iana.h OLD_FILES+=usr/include/k524_err.h -OLD_FILES+=usr/include/kadm5/admin.h OLD_FILES+=usr/include/kadm5/kadm5-private.h OLD_FILES+=usr/include/kadm5/kadm5-protos.h OLD_FILES+=usr/include/kadm5/kadm5-pwcheck.h OLD_FILES+=usr/include/kadm5/kadm5_err.h OLD_FILES+=usr/include/kadm5/private.h -OLD_DIRS+=usr/include/kadm5 OLD_FILES+=usr/include/kafs.h OLD_FILES+=usr/include/kdc-protos.h OLD_FILES+=usr/include/kdc.h OLD_FILES+=usr/include/krb5-private.h OLD_FILES+=usr/include/krb5-protos.h OLD_FILES+=usr/include/krb5-types.h -OLD_FILES+=usr/include/krb5.h OLD_FILES+=usr/include/krb5/ccache_plugin.h -OLD_FILES+=usr/include/krb5/locate_plugin.h OLD_FILES+=usr/include/krb5/send_to_kdc_plugin.h OLD_FILES+=usr/include/krb5/windc_plugin.h -OLD_DIRS+=usr/include/krb5 OLD_FILES+=usr/include/krb5_asn1.h OLD_FILES+=usr/include/krb5_ccapi.h OLD_FILES+=usr/include/krb5_err.h @@ -2827,114 +2814,99 @@ OLD_FILES+=usr/include/pkinit_asn1.h OLD_FILES+=usr/include/resolve.h OLD_FILES+=usr/include/rfc2459_asn1.h OLD_FILES+=usr/include/roken-common.h +OLD_FILES+=usr/include/roken.h OLD_FILES+=usr/include/rtbl.h -OLD_FILES+=usr/include/trace.h -OLD_FILES+=usr/include/util.h OLD_FILES+=usr/include/wind.h OLD_FILES+=usr/include/wind_err.h OLD_FILES+=usr/include/xdbm.h OLD_FILES+=usr/lib/libasn1.a OLD_FILES+=usr/lib/libasn1.so -OLD_LIBS+=usr/lib/libasn1.so.11 -OLD_FILES+=usr/lib/libasn1_p.a -OLD_FILES+=usr/lib/libcom_err.a -OLD_FILES+=usr/lib/libcom_err.so -OLD_LIBS+=usr/lib/libcom_err.so.5 -OLD_FILES+=usr/lib/libcom_err_p.a -OLD_FILES+=usr/lib/libgssapi_krb5.a -OLD_FILES+=usr/lib/libgssapi_krb5.so -OLD_LIBS+=usr/lib/libgssapi_krb5.so.10 -OLD_FILES+=usr/lib/libgssapi_krb5_p.a -OLD_FILES+=usr/lib/libgssapi_mech.a -OLD_FILES+=usr/lib/libgssapi_mech.so -OLD_LIBS+=usr/lib/libgssapi_mech.so.10 +OLD_FILES+=usr/lib/libgssapi.a +OLD_FILES+=usr/lib/libgssapi.so OLD_FILES+=usr/lib/libgssapi_ntlm.a OLD_FILES+=usr/lib/libgssapi_ntlm.so -OLD_LIBS+=usr/lib/libgssapi_ntlm.so.10 -OLD_FILES+=usr/lib/libgssapi_ntlm_p.a OLD_FILES+=usr/lib/libgssapi_spnego.a OLD_FILES+=usr/lib/libgssapi_spnego.so -OLD_LIBS+=usr/lib/libgssapi_spnego.so.10 -OLD_FILES+=usr/lib/libgssapi_spnego_p.a OLD_FILES+=usr/lib/libhdb.a OLD_FILES+=usr/lib/libhdb.so -OLD_LIBS+=usr/lib/libhdb.so.11 -OLD_FILES+=usr/lib/libhdb_p.a OLD_FILES+=usr/lib/libheimbase.a OLD_FILES+=usr/lib/libheimbase.so -OLD_LIBS+=usr/lib/libheimbase.so.11 -OLD_FILES+=usr/lib/libheimbase_p.a OLD_FILES+=usr/lib/libheimntlm.a OLD_FILES+=usr/lib/libheimntlm.so -OLD_LIBS+=usr/lib/libheimntlm.so.11 -OLD_FILES+=usr/lib/libheimntlm_p.a -OLD_FILES+=usr/lib/libheimsqlite.a -OLD_FILES+=usr/lib/libheimsqlite.so -OLD_LIBS+=usr/lib/libheimsqlite.so.11 -OLD_FILES+=usr/lib/libheimsqlite_p.a OLD_FILES+=usr/lib/libhx509.a OLD_FILES+=usr/lib/libhx509.so -OLD_LIBS+=usr/lib/libhx509.so.11 -OLD_FILES+=usr/lib/libhx509_p.a OLD_FILES+=usr/lib/libkadm5clnt.a -OLD_FILES+=usr/lib/libkadm5clnt.so -OLD_LIBS+=usr/lib/libkadm5clnt.so.11 -OLD_FILES+=usr/lib/libkadm5clnt_p.a OLD_FILES+=usr/lib/libkadm5srv.a OLD_FILES+=usr/lib/libkadm5srv.so -OLD_LIBS+=usr/lib/libkadm5srv.so.11 -OLD_FILES+=usr/lib/libkadm5srv_p.a OLD_FILES+=usr/lib/libkafs5.a OLD_FILES+=usr/lib/libkafs5.so -OLD_LIBS+=usr/lib/libkafs5.so.11 -OLD_FILES+=usr/lib/libkafs5_p.a OLD_FILES+=usr/lib/libkdc.a OLD_FILES+=usr/lib/libkdc.so -OLD_LIBS+=usr/lib/libkdc.so.11 -OLD_FILES+=usr/lib/libkdc_p.a -OLD_FILES+=usr/lib/libkrb5.a -OLD_FILES+=usr/lib/libkrb5.so -OLD_LIBS+=usr/lib/libkrb5.so.11 -OLD_FILES+=usr/lib/libkrb5_p.a -OLD_FILES+=usr/lib/libroken.a -OLD_FILES+=usr/lib/libroken.so -OLD_LIBS+=usr/lib/libroken.so.11 -OLD_FILES+=usr/lib/libroken_p.a -OLD_FILES+=usr/lib/libwind.a -OLD_FILES+=usr/lib/libwind.so -OLD_LIBS+=usr/lib/libwind.so.11 -OLD_FILES+=usr/lib/libwind_p.a OLD_FILES+=usr/lib/libprivateheimipcc.a OLD_FILES+=usr/lib/libprivateheimipcc.so -OLD_LIBS+=usr/lib/libprivateheimipcc.so.11 -OLD_FILES+=usr/lib/libprivateheimipcc_p.a OLD_FILES+=usr/lib/libprivateheimipcs.a OLD_FILES+=usr/lib/libprivateheimipcs.so -OLD_LIBS+=usr/lib/libprivateheimipcs.so.11 -OLD_FILES+=usr/lib/libprivateheimipcs_p.a +OLD_FILES+=usr/lib/libroken.a +OLD_FILES+=usr/lib/libroken.so +OLD_FILES+=usr/lib/libwind.a +OLD_FILES+=usr/lib/libwind.so +OLD_FILES+=usr/lib/libwind.so.11 OLD_FILES+=usr/libexec/digest-service OLD_FILES+=usr/libexec/hprop OLD_FILES+=usr/libexec/hpropd OLD_FILES+=usr/libexec/ipropd-master OLD_FILES+=usr/libexec/ipropd-slave -OLD_FILES+=usr/libexec/kadmind OLD_FILES+=usr/libexec/kcm OLD_FILES+=usr/libexec/kdc OLD_FILES+=usr/libexec/kdigest OLD_FILES+=usr/libexec/kfd OLD_FILES+=usr/libexec/kimpersonate OLD_FILES+=usr/libexec/kpasswdd +OLD_FILES+=usr/sbin/iprop-log OLD_FILES+=usr/sbin/kstash OLD_FILES+=usr/sbin/ktutil -OLD_FILES+=usr/sbin/iprop-log -OLD_FILES+=usr/share/man/man1/kdestroy.1.gz OLD_FILES+=usr/share/man/man1/kf.1.gz -OLD_FILES+=usr/share/man/man1/kinit.1.gz -OLD_FILES+=usr/share/man/man1/klist.1.gz -OLD_FILES+=usr/share/man/man1/kpasswd.1.gz -OLD_FILES+=usr/share/man/man1/krb5-config.1.gz -OLD_FILES+=usr/share/man/man1/kswitch.1.gz +OLD_FILES+=usr/share/man/man1/kgetcred.1.gz OLD_FILES+=usr/share/man/man3/HDB.3.gz +OLD_FILES+=usr/share/man/man3/gss_accept_sec_context.3.gz +OLD_FILES+=usr/share/man/man3/gss_acquire_cred.3.gz +OLD_FILES+=usr/share/man/man3/gss_add_cred.3.gz +OLD_FILES+=usr/share/man/man3/gss_add_oid_set_member.3.gz +OLD_FILES+=usr/share/man/man3/gss_canonicalize_name.3.gz +OLD_FILES+=usr/share/man/man3/gss_compare_name.3.gz +OLD_FILES+=usr/share/man/man3/gss_context_time.3.gz +OLD_FILES+=usr/share/man/man3/gss_create_empty_oid_set.3.gz +OLD_FILES+=usr/share/man/man3/gss_delete_sec_context.3.gz +OLD_FILES+=usr/share/man/man3/gss_display_name.3.gz +OLD_FILES+=usr/share/man/man3/gss_display_status.3.gz +OLD_FILES+=usr/share/man/man3/gss_duplicate_name.3.gz +OLD_FILES+=usr/share/man/man3/gss_export_name.3.gz +OLD_FILES+=usr/share/man/man3/gss_export_sec_context.3.gz +OLD_FILES+=usr/share/man/man3/gss_get_mic.3.gz +OLD_FILES+=usr/share/man/man3/gss_import_name.3.gz +OLD_FILES+=usr/share/man/man3/gss_import_sec_context.3.gz +OLD_FILES+=usr/share/man/man3/gss_indicate_mechs.3.gz +OLD_FILES+=usr/share/man/man3/gss_init_sec_context.3.gz +OLD_FILES+=usr/share/man/man3/gss_inquire_context.3.gz +OLD_FILES+=usr/share/man/man3/gss_inquire_cred.3.gz +OLD_FILES+=usr/share/man/man3/gss_inquire_cred_by_mech.3.gz +OLD_FILES+=usr/share/man/man3/gss_inquire_mechs_for_name.3.gz +OLD_FILES+=usr/share/man/man3/gss_inquire_names_for_mech.3.gz +OLD_FILES+=usr/share/man/man3/gss_process_context_token.3.gz +OLD_FILES+=usr/share/man/man3/gss_release_buffer.3.gz +OLD_FILES+=usr/share/man/man3/gss_release_cred.3.gz +OLD_FILES+=usr/share/man/man3/gss_release_name.3.gz +OLD_FILES+=usr/share/man/man3/gss_release_oid_set.3.gz +OLD_FILES+=usr/share/man/man3/gss_seal.3.gz +OLD_FILES+=usr/share/man/man3/gss_sign.3.gz +OLD_FILES+=usr/share/man/man3/gss_test_oid_set_member.3.gz +OLD_FILES+=usr/share/man/man3/gss_unseal.3.gz +OLD_FILES+=usr/share/man/man3/gss_unwrap.3.gz +OLD_FILES+=usr/share/man/man3/gss_verify.3.gz +OLD_FILES+=usr/share/man/man3/gss_verify_mic.3.gz +OLD_FILES+=usr/share/man/man3/gss_wrap.3.gz +OLD_FILES+=usr/share/man/man3/gss_wrap_size_limit.3.gz +OLD_FILES+=usr/share/man/man3/gssapi.3.gz OLD_FILES+=usr/share/man/man3/hdb__del.3.gz OLD_FILES+=usr/share/man/man3/hdb__get.3.gz OLD_FILES+=usr/share/man/man3/hdb__put.3.gz @@ -3624,2123 +3596,67 @@ OLD_FILES+=usr/share/man/man3/ntlm_core.3.gz OLD_FILES+=usr/share/man/man3/ntlm_type1.3.gz OLD_FILES+=usr/share/man/man3/ntlm_type2.3.gz OLD_FILES+=usr/share/man/man3/ntlm_type3.3.gz -OLD_FILES+=usr/share/man/man5/krb5.conf.5.gz +OLD_FILES+=usr/share/man/man5/mech.5.gz +OLD_FILES+=usr/share/man/man5/qop.5.gz OLD_FILES+=usr/share/man/man8/hprop.8.gz OLD_FILES+=usr/share/man/man8/hpropd.8.gz OLD_FILES+=usr/share/man/man8/iprop-log.8.gz OLD_FILES+=usr/share/man/man8/iprop.8.gz OLD_FILES+=usr/share/man/man8/kadmin.8.gz -OLD_FILES+=usr/share/man/man8/kadmind.8.gz OLD_FILES+=usr/share/man/man8/kcm.8.gz OLD_FILES+=usr/share/man/man8/kdc.8.gz OLD_FILES+=usr/share/man/man8/kdigest.8.gz OLD_FILES+=usr/share/man/man8/kerberos.8.gz +OLD_FILES+=usr/share/man/man8/kfd.8.gz OLD_FILES+=usr/share/man/man8/kimpersonate.8.gz OLD_FILES+=usr/share/man/man8/kpasswdd.8.gz OLD_FILES+=usr/share/man/man8/kstash.8.gz OLD_FILES+=usr/share/man/man8/ktutil.8.gz OLD_FILES+=usr/share/man/man8/string2key.8.gz OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz -.else -# Remove MIT KRB5 because we do not want Kerberos -OLD_FILES+=usr/bin/compile_et -OLD_FILES+=usr/bin/gss-client -OLD_FILES+=usr/bin/k5srvutil -OLD_FILES+=usr/bin/kadmin -OLD_FILES+=usr/bin/kdestroy -OLD_FILES+=usr/bin/kinit -OLD_FILES+=usr/bin/klist -OLD_FILES+=usr/bin/kpasswd -OLD_FILES+=usr/bin/krb5-config -OLD_FILES+=usr/bin/ksu -OLD_FILES+=usr/bin/kswitch -OLD_FILES+=usr/bin/ktutil -OLD_FILES+=usr/bin/kvno -OLD_FILES+=usr/bin/sclient -OLD_FILES+=usr/bin/sim_client -OLD_FILES+=usr/bin/uuclient -OLD_FILES+=etc/rc.d/kpropd -OLD_FILES+=usr/include/com_err.h -OLD_FILES+=usr/include/common.h -OLD_FILES+=usr/include/edwards25519_fiat.h -OLD_FILES+=usr/include/edwards25519_tables.h -OLD_FILES+=usr/include/groups.h -OLD_FILES+=usr/include/gssapi.h -OLD_FILES+=usr/include/gssapi/gssapi.h -OLD_FILES+=usr/include/gssapi/gssapi_alloc.h -OLD_FILES+=usr/include/gssapi/gssapi_ext.h -OLD_FILES+=usr/include/gssapi/gssapi_generic.h -OLD_FILES+=usr/include/gssapi/gssapi_krb5.h -OLD_FILES+=usr/include/gssapi/mechglue.h -OLD_FILES+=usr/include/gssrpc/auth.h -OLD_FILES+=usr/include/gssrpc/auth_gss.h -OLD_FILES+=usr/include/gssrpc/auth_gssapi.h -OLD_FILES+=usr/include/gssrpc/auth_unix.h -OLD_FILES+=usr/include/gssrpc/clnt.h -OLD_FILES+=usr/include/gssrpc/netdb.h -OLD_FILES+=usr/include/gssrpc/pmap_clnt.h -OLD_FILES+=usr/include/gssrpc/pmap_prot.h -OLD_FILES+=usr/include/gssrpc/pmap_rmt.h -OLD_FILES+=usr/include/gssrpc/rename.h -OLD_FILES+=usr/include/gssrpc/rpc.h -OLD_FILES+=usr/include/gssrpc/rpc_msg.h -OLD_FILES+=usr/include/gssrpc/svc.h -OLD_FILES+=usr/include/gssrpc/svc_auth.h -OLD_FILES+=usr/include/gssrpc/types.h -OLD_FILES+=usr/include/gssrpc/xdr.h -OLD_FILES+=usr/include/iana.h -OLD_FILES+=usr/include/kadm5/admin.h -OLD_FILES+=usr/include/kadm5/chpass_util_strings.h -OLD_FILES+=usr/include/kadm5/kadm_err.h -OLD_FILES+=usr/include/kdb.h -OLD_FILES+=usr/include/krad.h -OLD_FILES+=usr/include/krb5.h -OLD_FILES+=usr/include/krb5/ccselect_plugin.h -OLD_FILES+=usr/include/krb5/certauth_plugin.h -OLD_FILES+=usr/include/krb5/clpreauth_plugin.h -OLD_FILES+=usr/include/krb5/hostrealm_plugin.h -OLD_FILES+=usr/include/krb5/kadm5_auth_plugin.h -OLD_FILES+=usr/include/krb5/kadm5_hook_plugin.h -OLD_FILES+=usr/include/krb5/kdcpolicy_plugin.h -OLD_FILES+=usr/include/krb5/kdcpreauth_plugin.h -OLD_FILES+=usr/include/krb5/krb5.h -OLD_FILES+=usr/include/krb5/localauth_plugin.h -OLD_FILES+=usr/include/krb5/locate_plugin.h -OLD_FILES+=usr/include/krb5/plugin.h -OLD_FILES+=usr/include/krb5/preauth_plugin.h -OLD_FILES+=usr/include/krb5/pwqual_plugin.h -OLD_FILES+=usr/include/profile.h -OLD_FILES+=usr/include/trace.h -OLD_FILES+=usr/include/util.h -OLD_FILES+=usr/include/verto-module.h -OLD_FILES+=usr/include/verto.h -OLD_FILES+=usr/lib/krb5/plugins/kdb/db2.so -OLD_FILES+=usr/lib/krb5/plugins/preauth/otp.so -OLD_FILES+=usr/lib/krb5/plugins/preauth/pkinit.so -OLD_FILES+=usr/lib/krb5/plugins/preauth/spake.so -OLD_FILES+=usr/lib/krb5/plugins/preauth/test.so -OLD_FILES+=usr/lib/krb5/plugins/tls/k5tls.so -OLD_FILES+=usr/lib/libcom_err.a -OLD_LIBS+=usr/lib/libcom_err.so -OLD_LIBS+=usr/lib/libcom_err.so.122 -OLD_FILES+=usr/lib/libgssapi_krb5.so -OLD_LIBS+=usr/lib/libgssapi_krb5.so.122 -OLD_FILES+=usr/lib/libgssrpc.so -OLD_LIBS+=usr/lib/libgssrpc.so.122 -OLD_FILES+=usr/lib/libk5crypto.so -OLD_LIBS+=usr/lib/libk5crypto.so.122 -OLD_FILES+=usr/lib/libkadm5clnt.so -OLD_FILES+=usr/lib/libkadm5clnt_mit.so -OLD_LIBS+=usr/lib/libkadm5clnt_mit.so.122 -OLD_FILES+=usr/lib/libkadm5srv.so -OLD_FILES+=usr/lib/libkadm5srv_mit.so -OLD_LIBS+=usr/lib/libkadm5srv_mit.so.122 -OLD_FILES+=usr/lib/libkdb5.so -OLD_LIBS+=usr/lib/libkdb5.so.122 -OLD_FILES+=usr/lib/libkrad.so -OLD_LIBS+=usr/lib/libkrad.so.122 -OLD_FILES+=usr/lib/libkrb5.so -OLD_LIBS+=usr/lib/libkrb5.so.122 -OLD_FILES+=usr/lib/libkrb5profile.a -OLD_FILES+=usr/lib/libkrb5profile.so -OLD_LIBS+=usr/lib/libkrb5profile.so.122 -OLD_FILES+=usr/lib/libkrb5support.a -OLD_FILES+=usr/lib/libkrb5support.so -OLD_LIBS+=usr/lib/libkrb5support.so.122 -OLD_FILES+=usr/lib/libverto.so -OLD_LIBS+=usr/lib/libverto.so.122 -OLD_FILES+=usr/libdata/pkgconfig/gssrpc.pc -OLD_FILES+=usr/libdata/pkgconfig/kadm-client.pc -OLD_FILES+=usr/libdata/pkgconfig/kadm-server.pc -OLD_FILES+=usr/libdata/pkgconfig/kdb.pc -OLD_FILES+=usr/libdata/pkgconfig/krb5-gssapi.pc -OLD_FILES+=usr/libdata/pkgconfig/krb5.pc -OLD_FILES+=usr/libdata/pkgconfig/mit-krb5-gssapi.pc -OLD_FILES+=usr/libdata/pkgconfig/mit-krb5.pc -OLD_FILES+=usr/libexec/krb5kdc -OLD_FILES+=usr/libexec/kadmind -OLD_FILES+=usr/libexec/kprop -OLD_FILES+=usr/libexec/kpropd -OLD_FILES+=usr/sbin/gss-server -OLD_FILES+=usr/sbin/kadmin.local -OLD_FILES+=usr/sbin/kdb5_util -OLD_FILES+=usr/sbin/kproplog -OLD_FILES+=usr/sbin/krb5-send-pr -OLD_FILES+=usr/sbin/sim_server -OLD_FILES+=usr/sbin/sserver -OLD_FILES+=usr/sbin/uuserver -OLD_FILES+=usr/share/doc/krb5/doc/html/.buildinfo -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/agogo.css -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/basic.css -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/bgfooter.png -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/bgtop.png -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/doctools.js -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/documentation_options.js -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/file.png -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/jquery.js -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/kerb.css -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/language_data.js -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/minus.png -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/plus.png -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/pygments.css -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/searchtools.js -OLD_FILES+=usr/share/doc/krb5/doc/html/_static/underscore.js -OLD_FILES+=usr/share/doc/krb5/doc/html/about.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/index.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/k5srvutil.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kadmin_local.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kadmind.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kdb5_ldap_util.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kdb5_util.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kprop.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kpropd.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kproplog.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/krb5kdc.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/ktutil.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/sserver.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/advanced/index.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/advanced/retiring-des.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/appl_servers.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/auth_indicator.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/backup_host.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/conf_files/index.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/conf_files/kadm5_acl.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/conf_files/kdc_conf.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/conf_files/krb5_conf.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/conf_ldap.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/database.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/dbtypes.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/dictionary.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/enctypes.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/env_variables.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/host_config.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/https.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/index.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/install.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/install_appl_srv.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/install_clients.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/install_kdc.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/lockout.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/otp.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/pkinit.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/princ_dns.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/realm_config.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/spake.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/troubleshoot.html -OLD_FILES+=usr/share/doc/krb5/doc/html/admin/various_envs.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/gssapi.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/h5l_mit_apidiff.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/index.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/init_creds.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/princ_handle.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/index.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_425_conv_principal.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_524_conv_principal.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_524_convert_creds.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_address_compare.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_address_order.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_address_search.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_allow_weak_crypto.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_aname_to_localname.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_anonymous_principal.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_anonymous_realm.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_appdefault_boolean.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_appdefault_string.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_free.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_genaddrs.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_get_checksum_func.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getaddrs.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getauthenticator.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getflags.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getkey.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getkey_k.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getlocalseqnumber.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getlocalsubkey.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getrcache.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getrecvsubkey.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getrecvsubkey_k.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getremoteseqnumber.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getremotesubkey.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getsendsubkey.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getsendsubkey_k.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_init.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_initivector.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_set_checksum_func.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_set_req_cksumtype.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setaddrs.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setflags.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setports.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setrcache.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setrecvsubkey.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setrecvsubkey_k.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setsendsubkey.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setsendsubkey_k.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setuseruserkey.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_build_principal.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_build_principal_alloc_va.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_build_principal_ext.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_build_principal_va.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_block_size.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_checksum_length.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_crypto_length.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_crypto_length_iov.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_decrypt.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_decrypt_iov.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_derive_prfplus.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_encrypt.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_encrypt_iov.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_encrypt_length.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_enctype_compare.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_free_state.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_fx_cf2_simple.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_init_state.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_is_coll_proof_cksum.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_is_keyed_cksum.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_keyed_checksum_types.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_keylengths.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_make_checksum.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_make_checksum_iov.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_make_random_key.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_padding_length.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_prf.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_prf_length.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_prfplus.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_random_add_entropy.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_random_make_octets.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_random_os_entropy.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_random_seed.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_random_to_key.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_string_to_key.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_string_to_key_with_params.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_valid_cksumtype.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_valid_enctype.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_verify_checksum.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_verify_checksum_iov.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_calculate_checksum.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_cache_match.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_close.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_copy_creds.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_default.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_default_name.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_destroy.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_dup.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_end_seq_get.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_gen_new.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_get_config.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_get_flags.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_get_full_name.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_get_name.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_get_principal.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_get_type.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_initialize.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_move.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_new_unique.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_next_cred.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_remove_cred.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_resolve.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_retrieve_cred.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_select.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_set_config.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_set_default_name.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_set_flags.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_start_seq_get.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_store_cred.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_support_switch.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_switch.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cccol_cursor_free.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cccol_cursor_new.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cccol_cursor_next.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cccol_have_content.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_change_password.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_check_clockskew.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_checksum_size.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_chpw_message.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cksumtype_to_string.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_clear_error_message.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_addresses.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_authdata.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_authenticator.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_checksum.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_context.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_creds.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_data.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_error_message.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_keyblock.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_keyblock_contents.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_principal.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_ticket.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_decode_authdata_container.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_decode_ticket.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_decrypt.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_deltat_to_string.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_eblock_enctype.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_encode_authdata_container.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_encrypt.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_encrypt_size.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_enctype_to_name.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_enctype_to_string.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_expand_hostname.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_find_authdata.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_finish_key.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_finish_random_key.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_addresses.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_ap_rep_enc_part.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_authdata.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_authenticator.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_checksum.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_checksum_contents.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_cksumtypes.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_context.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_cred_contents.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_creds.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_data.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_data_contents.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_default_realm.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_enctypes.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_error.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_error_message.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_host_realm.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_keyblock.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_keyblock_contents.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_keytab_entry_contents.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_principal.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_string.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_tgt_creds.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_ticket.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_unparsed_name.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_fwd_tgt_creds.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_credentials.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_credentials_renew.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_credentials_validate.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_default_realm.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_error_message.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_etype_info.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_fallback_host_realm.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_host_realm.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_in_tkt_with_keytab.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_in_tkt_with_password.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_in_tkt_with_skey.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_keytab.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_alloc.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_free.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_get_fast_flags.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_init.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_address_list.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_anonymous.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_canonicalize.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_change_password_prompt.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_etype_list.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_expire_callback.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_fast_ccache.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_fast_ccache_name.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_fast_flags.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_forwardable.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_in_ccache.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_out_ccache.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_pa.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_pac_request.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_preauth_list.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_proxiable.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_renew_life.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_responder.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_salt.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_tkt_life.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_password.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_permitted_enctypes.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_profile.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_prompt_types.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_renewed_creds.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_server_rcache.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_time_offsets.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_validated_creds.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_context.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_context_profile.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_free.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_get.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_get_creds.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_get_error.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_get_times.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_init.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_set_keytab.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_set_password.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_set_service.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_step.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_keyblock.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_random_key.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_secure_context.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_is_config_principal.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_is_referral_realm.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_is_thread_safe.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_create_key.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_decrypt.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_decrypt_iov.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_encrypt.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_encrypt_iov.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_free_key.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_key_enctype.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_key_keyblock.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_make_checksum.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_make_checksum_iov.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_prf.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_reference_key.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_verify_checksum.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_verify_checksum_iov.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kdc_sign_ticket.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kdc_verify_ticket.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_add_entry.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_client_default.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_close.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_default.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_default_name.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_dup.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_end_seq_get.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_free_entry.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_get_entry.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_get_name.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_get_type.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_have_content.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_next_entry.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_read_service_key.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_remove_entry.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_resolve.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_start_seq_get.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kuserok.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_make_authdata_kdc_issued.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_marshal_credentials.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_merge_authdata.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_1cred.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_error.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_ncred.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_priv.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_rep.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_rep_dce.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_req.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_req_extended.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_safe.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_os_localaddr.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_add_buffer.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_free.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_get_buffer.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_get_client_info.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_get_types.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_init.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_parse.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_sign.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_sign_ext.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_verify.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_verify_ext.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_parse_name.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_parse_name_flags.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_prepend_error_message.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_principal2salt.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_principal_compare.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_principal_compare_any_realm.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_principal_compare_flags.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_process_key.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_prompter_posix.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_random_key.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_cred.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_error.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_priv.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_rep.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_rep_dce.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_req.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_safe.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_read_password.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_realm_compare.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_recvauth.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_recvauth_version.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_get_challenge.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_list_questions.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_otp_challenge_free.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_otp_get_challenge.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_otp_set_answer.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_pkinit_challenge_free.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_pkinit_get_challenge.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_pkinit_set_answer.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_set_answer.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_salttype_to_string.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_sendauth.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_server_decrypt_ticket_keytab.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_default_realm.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_default_tgs_enctypes.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_error_message.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_kdc_recv_hook.html -OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_kdc_send_hook.html *** 2802 LINES SKIPPED *** From nobody Wed Aug 20 20:55:12 2025 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 4c6dxr6S1nz65F6d; Wed, 20 Aug 2025 20:55:12 +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 4c6dxr5nx5z3dmR; Wed, 20 Aug 2025 20:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755723312; 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=fgty08+yssd/518EzryW8lDmQFnD7Os/VJ2PTNocGAQ=; b=VuXqjguX6d2gkSAd1OfPEjXSDyEbx3EZB0lFydoY0AGvvPF3j8zFYAtfokrVfj85LbjMEI iPsZueL8REQp0QbDD/SiKCLJCW3ZCT/I1sdTd5fJ3kquq39x61u715jGcIK7BWtk3u0Ndm SYZsJ/hmDQzSs0IG7C964vkAOK3q2j8m9res+jtTeF9Py49J0I+nPppmnYzoGSxHFmef6S 6B7wt5Ynx+L5SmmsYeGAaMaOQ/Z9t+wPQbmL14HkBVBHRCYWgzDap9BA4iuh75omWA6iL8 DbLWiQpVOsdZpYr87mo8Niusx0ZmbkmQndv7sIxkBifiK2opZe0cO05i0Ae6fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755723312; 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=fgty08+yssd/518EzryW8lDmQFnD7Os/VJ2PTNocGAQ=; b=T83+rCXvDVG1aisONj1DCK5GB1JxICbLie7i7bcDLgxTepWCP6Lpdq0rGBGWzvMYgFJUn2 fKGGTdVy6M7XV3YpdhxyjtH6Zg3EzkCw9F/ZIX7DRZTIDkUJoBDtgByIkRgOwpWR/UcX5p waqv9Fx7tDLWbXrXXpCTGEmxJG8DDixlG4CWAlHFP73uEt66nFRPUpeA765t2KxZAA2a4E JWgm1wvVx5y3EJqgubdhw8zTOMwvDhQR9IU88vQjXvoBuDmWtVJ+Ho3M8hBwTJ9Rkkx79z 3Cnku0BPhmi36e0ctU8Eqxxwj05R2Iq6ml8KGgiynJaaURlixMtOYigiks4fLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755723312; a=rsa-sha256; cv=none; b=rfPfwaL70ODLvyLmj7UC/gNNO9NybXn2VA6HJUhpeL7RCXQauAM90vf7LCLITXxIBHsK46 bBz/1piioKxmIyKxInx2xdj7HKXXqIyrybm3czoRKVSA5rf8DbgUCybyzpG+1/iWcMk+My G4BAJ0N98hiDGlzFwy7G9NrImJIH5CszxtJscZZtc1oe/IEUWNnSePxIpEpScdZtXTnsHX G7i4ymeFfamSzOEXnnrxjB9SWmJjJ3dG9atd8sOlhb5ImrtU88vkLrI/PHWM9xUdzEizeS ev2lOS9WrYpMfh9CGdWRWht7F2zk3gNtgLPb0WcvYVxn/pK8WYI2sAd4nSmqRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6dxr5PG4zTSw; Wed, 20 Aug 2025 20:55:12 +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 57KKtCVq007828; Wed, 20 Aug 2025 20:55:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KKtCdE007825; Wed, 20 Aug 2025 20:55:12 GMT (envelope-from git) Date: Wed, 20 Aug 2025 20:55:12 GMT Message-Id: <202508202055.57KKtCdE007825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 095e23bfd4c5 - main - RELNOTES: Note WITHOUT_GSSAPI removal (dc5ba6b8b4f0) 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 095e23bfd4c514107bf3694d9d0e2428ae198680 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=095e23bfd4c514107bf3694d9d0e2428ae198680 commit 095e23bfd4c514107bf3694d9d0e2428ae198680 Author: Lexi Winter AuthorDate: 2025-08-20 20:53:29 +0000 Commit: Lexi Winter CommitDate: 2025-08-20 20:54:36 +0000 RELNOTES: Note WITHOUT_GSSAPI removal (dc5ba6b8b4f0) --- RELNOTES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELNOTES b/RELNOTES index 2444b050220d..3aec631bc15e 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,10 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +dc5ba6b8b4f0: + The WITHOUT_GSSAPI src.conf(5) option has been removed. The GSSAPI + libraries are now always built unless WITHOUT_KERBEROS is set. + c43cad871720: jemalloc 5.3.0 has landed. See contrib/jemalloc/ChangeLog for the long list of changes. From nobody Wed Aug 20 22:46:57 2025 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 4c6hQp3Jgfz65M0D; Wed, 20 Aug 2025 22:46:58 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6hQp0hj8z3r2j; Wed, 20 Aug 2025 22:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755730018; 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=pO30mu44itdtxsHizLAV/9MHBASQgZW8K875uNEeRJY=; b=Vbv0E71N/5v1DosiZf/AYPpYt+f+XhhwNFzTFUUT/5cwp6BFTcauEPImKjjVe/cOuWxNIm plfSk4mPi5KJ3kzyIBE6iQCcOCDexkxvUPxUNjb2p3HaqoZufAaM3qH2qktKZ1YqXvq5pJ oXcmtQLHWg+gLQ/zNxia8Pw1hoXdixkYthNy3FLM8i7cRmYAuCx01lAUsWF3N32KKR6zCe 0EtK9Ulyor0SXFMA8sFOZNm4L7UKXQCUVv8Yb9lR1/LZym8i42VaHgPW2X9Vga+htgiXzA Ag520jWdsku2lZUHWv8Al7bmJ5Q1pXpAD5Qe4SkXXqJ4SLEnBbTQL9PWDpdkHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755730018; 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=pO30mu44itdtxsHizLAV/9MHBASQgZW8K875uNEeRJY=; b=T6hBVdv7SRV7dlNuElirqiocHT8L+z8Q/S4ONdtSkvBRvbH6/GFuzGQGxCFn8sZGBLcQ7A +JVvuUrQ/MZJnO6eEozThLQTSdJQza/VgCZsiRQqt40SmCHUMznwm7VlWTXI8wBGpv05Wi iNzeAVfqtM+No4oLtQkZnJ+CSi97UWkfwrSzwq/4PSw0+j1m9XBbbEYp7dqw9wHngl9BZn yxyrdePrZxPl+95Tb8+4dvaC2Qy3d9ld/tX0fRl34H75hiu7Mua/uhZvKiFwHXMbxUldT6 1R/rUs0/aB67dWB7b4MggtAifU6PFXy/MskaZhygo4hWOhyehO1uXzEBs+VHJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755730018; a=rsa-sha256; cv=none; b=ZKEz/3NtaE6Iqkgf6oCeuuU0eeeqGDlQ+6pHnrGLLvwBNf6rsxTsa4CNSizBKEy56X4pxy tIVQrjdnaCPpR5MVojcs3kMOBW5lORPyyzw6YBZrrnbl5b8hsxrlvVl5WZgYQ8jyafG6x/ K3Q4FZX2smJD1Ag3E4EgldrTqP9LmhghzcoCTGzdoRP5Ykcvu3RQu269wxQS7GJ+xxGWSf mgUTWhqmy10mT+wOClQ3W4wA1163Ac28u7Wb22IXSiWs7TLUkB67XBvr7YGPOQU1v77X3/ QSsBya+IqmC/TEok/QfysosU2f0jsYOk87XPiHfb1O2LeXgQXqCPeNi025FMfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6hQp0J4DzZ3W; Wed, 20 Aug 2025 22:46:58 +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 57KMkvGl015680; Wed, 20 Aug 2025 22:46:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KMkvAN015677; Wed, 20 Aug 2025 22:46:57 GMT (envelope-from git) Date: Wed, 20 Aug 2025 22:46:57 GMT Message-Id: <202508202246.57KMkvAN015677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: aaf65a13c06a - main - stand: add fs_ops.fs_flag 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aaf65a13c06a2555257a75b7f2fe63319238cf4f Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=aaf65a13c06a2555257a75b7f2fe63319238cf4f commit aaf65a13c06a2555257a75b7f2fe63319238cf4f Author: Simon J. Gerraty AuthorDate: 2025-08-20 22:42:35 +0000 Commit: Simon J. Gerraty CommitDate: 2025-08-20 22:42:35 +0000 stand: add fs_ops.fs_flag To avoid a layering violation in open() allow fs_ops to indicate that devopen() should be skipped. This is only true for pkgfs. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D51684 --- stand/libsa/bzipfs.c | 1 + stand/libsa/cd9660.c | 1 + stand/libsa/dosfs.c | 1 + stand/libsa/ext2fs.c | 1 + stand/libsa/gzipfs.c | 1 + stand/libsa/nfs.c | 1 + stand/libsa/open.c | 33 +++++++++++++++++++-------------- stand/libsa/pkgfs.c | 1 + stand/libsa/splitfs.c | 1 + stand/libsa/stand.h | 3 +++ stand/libsa/tftp.c | 1 + stand/libsa/ufs.c | 1 + 12 files changed, 32 insertions(+), 14 deletions(-) diff --git a/stand/libsa/bzipfs.c b/stand/libsa/bzipfs.c index f4002796f0ae..ff7ec16e7dc6 100644 --- a/stand/libsa/bzipfs.c +++ b/stand/libsa/bzipfs.c @@ -68,6 +68,7 @@ static int bzf_stat(struct open_file *f, struct stat *sb); #ifndef REGRESSION struct fs_ops bzipfs_fsops = { .fs_name = "bzip", + .fs_flags = 0, .fo_open = bzf_open, .fo_close = bzf_close, .fo_read = bzf_read, diff --git a/stand/libsa/cd9660.c b/stand/libsa/cd9660.c index 973a7dddcda9..d1da39aa479a 100644 --- a/stand/libsa/cd9660.c +++ b/stand/libsa/cd9660.c @@ -81,6 +81,7 @@ static ISO_SUSP_HEADER *susp_lookup_record(struct open_file *f, struct fs_ops cd9660_fsops = { .fs_name = "cd9660", + .fs_flags = 0, .fo_open = cd9660_open, .fo_close = cd9660_close, .fo_read = cd9660_read, diff --git a/stand/libsa/dosfs.c b/stand/libsa/dosfs.c index aca198cdf6fa..38610d917007 100644 --- a/stand/libsa/dosfs.c +++ b/stand/libsa/dosfs.c @@ -61,6 +61,7 @@ static int dos_unmount(const char *dev, void *data); struct fs_ops dosfs_fsops = { .fs_name = "dosfs", + .fs_flags = 0, .fo_open = dos_open, .fo_close = dos_close, .fo_read = dos_read, diff --git a/stand/libsa/ext2fs.c b/stand/libsa/ext2fs.c index 47812f4543a1..f7096282f156 100644 --- a/stand/libsa/ext2fs.c +++ b/stand/libsa/ext2fs.c @@ -106,6 +106,7 @@ static int dtmap[] = { DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, struct fs_ops ext2fs_fsops = { .fs_name = "ext2fs", + .fs_flags = 0, .fo_open = ext2fs_open, .fo_close = ext2fs_close, .fo_read = ext2fs_read, diff --git a/stand/libsa/gzipfs.c b/stand/libsa/gzipfs.c index 6c2b8cac9e34..6b22f750f3ef 100644 --- a/stand/libsa/gzipfs.c +++ b/stand/libsa/gzipfs.c @@ -50,6 +50,7 @@ static int zf_stat(struct open_file *f, struct stat *sb); struct fs_ops gzipfs_fsops = { .fs_name = "zip", + .fs_flags = 0, .fo_open = zf_open, .fo_close = zf_close, .fo_read = zf_read, diff --git a/stand/libsa/nfs.c b/stand/libsa/nfs.c index ee6af8a726c7..f3e9060c9881 100644 --- a/stand/libsa/nfs.c +++ b/stand/libsa/nfs.c @@ -131,6 +131,7 @@ struct nfs_iodesc nfs_root_node; struct fs_ops nfs_fsops = { .fs_name = "nfs", + .fs_flags = 0, .fo_open = nfs_open, .fo_close = nfs_close, .fo_read = nfs_read, diff --git a/stand/libsa/open.c b/stand/libsa/open.c index ccee4aa5c07b..c97aa5977f9e 100644 --- a/stand/libsa/open.c +++ b/stand/libsa/open.c @@ -154,27 +154,32 @@ open(const char *fname, int mode) f->f_devdata = NULL; file = NULL; + if (exclusive_file_system == NULL || + (exclusive_file_system->fs_flags & FS_OPS_NO_DEVOPEN) == 0) { + error = devopen(f, fname, &file); + if (error || + (((f->f_flags & F_NODEV) == 0) && f->f_dev == NULL)) + goto err; + + /* see if we opened a raw device; otherwise, 'file' is the file name. */ + if (file == NULL || *file == '\0') { + f->f_flags |= F_RAW; + f->f_rabuf = NULL; + TSEXIT(); + return (fd); + } + } else + file = fname; + if (exclusive_file_system != NULL) { + /* loader is forcing the filesystem to be used */ fs = exclusive_file_system; - error = (fs->fo_open)(fname, f); + error = (fs->fo_open)(file, f); if (error == 0) goto ok; goto err; } - error = devopen(f, fname, &file); - if (error || - (((f->f_flags & F_NODEV) == 0) && f->f_dev == NULL)) - goto err; - - /* see if we opened a raw device; otherwise, 'file' is the file name. */ - if (file == NULL || *file == '\0') { - f->f_flags |= F_RAW; - f->f_rabuf = NULL; - TSEXIT(); - return (fd); - } - /* pass file name to the different filesystem open routines */ besterror = ENOENT; for (i = 0; file_system[i] != NULL; i++) { diff --git a/stand/libsa/pkgfs.c b/stand/libsa/pkgfs.c index 32d488de5cfb..6eb3badf7068 100644 --- a/stand/libsa/pkgfs.c +++ b/stand/libsa/pkgfs.c @@ -41,6 +41,7 @@ static off_t pkg_atol(const char *, unsigned); struct fs_ops pkgfs_fsops = { .fs_name = "pkg", + .fs_flags = FS_OPS_NO_DEVOPEN, .fo_open = pkg_open, .fo_close = pkg_close, .fo_read = pkg_read, diff --git a/stand/libsa/splitfs.c b/stand/libsa/splitfs.c index 69912522000e..eb4b3a1feb11 100644 --- a/stand/libsa/splitfs.c +++ b/stand/libsa/splitfs.c @@ -50,6 +50,7 @@ static int splitfs_stat(struct open_file *f, struct stat *sb); struct fs_ops splitfs_fsops = { .fs_name = "split", + .fs_flags = 0, .fo_open = splitfs_open, .fo_close = splitfs_close, .fo_read = splitfs_read, diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h index 0e99d8778fa6..c6a08be2f7e3 100644 --- a/stand/libsa/stand.h +++ b/stand/libsa/stand.h @@ -94,6 +94,8 @@ __BEGIN_DECLS struct open_file; +#define FS_OPS_NO_DEVOPEN 1 + /* * This structure is used to define file system operations in a file system * independent way. @@ -104,6 +106,7 @@ struct open_file; */ struct fs_ops { const char *fs_name; + int fs_flags; int (*fo_open)(const char *path, struct open_file *f); int (*fo_close)(struct open_file *f); int (*fo_read)(struct open_file *f, void *buf, diff --git a/stand/libsa/tftp.c b/stand/libsa/tftp.c index c6cc8f11a765..0584246a6dea 100644 --- a/stand/libsa/tftp.c +++ b/stand/libsa/tftp.c @@ -73,6 +73,7 @@ static int tftp_preload(struct open_file *); struct fs_ops tftp_fsops = { .fs_name = "tftp", + .fs_flags = 0, .fo_open = tftp_open, .fo_close = tftp_close, .fo_read = tftp_read, diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c index e1d540ed2321..86cd3be9a27a 100644 --- a/stand/libsa/ufs.c +++ b/stand/libsa/ufs.c @@ -93,6 +93,7 @@ static int ufs_unmount(const char *dev, void *data); struct fs_ops ufs_fsops = { .fs_name = "ufs", + .fs_flags = 0, .fo_open = ufs_open, .fo_close = ufs_close, .fo_read = ufs_read, From nobody Wed Aug 20 22:48:38 2025 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 4c6hSk4HyPz65M6K; Wed, 20 Aug 2025 22:48:38 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6hSk3mK1z3rHJ; Wed, 20 Aug 2025 22:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755730118; 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=8QdBn3bZE8Dflkk+f+ahuVGEf4VCK6XacpJxD7pW3KQ=; b=xzE0OzKzebew1S8OO8Pelg2YRAYItBEGBBE1HLxKNylGZ3HQ/pcLqpGWA3I+nvNwdIonMt 6U89YD7YN4ty9qseR4gKPe+C/PnHhEGujFxZDtSQ4dmSx0SjIPfrtOhtczArMI7fYa3cy4 YkpMFv6muEg/X5rC1dBVH+Hhg2aWZvYhK/1hFvu+s6WK9HaBvsxDy/8m3TiKLYCq0Kvk4B iC+TG/HBNaF0pmfeaXbbb76p9nhpz3SyULRwvIF0xwx4Ue+J2OUDxJ555yJDW64or+5Ov/ wrceoC4jHgQcIBo9Q4o5My9YkPwIzzy3Ax2hPwXcIUwXkUdjTbSHOVXD+C3EsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755730118; 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=8QdBn3bZE8Dflkk+f+ahuVGEf4VCK6XacpJxD7pW3KQ=; b=A1kSUPlk40NZ4Ior9epvNeS0Lm+M/bNAxw5BQO9BPvsvBNVvx2CZ8eUuI+Vkxta9JUwEMI n/gCIfPikrZOtFMdSWmF6MCgybbQL751AADTTUSx8gjBrPjG6Mk3B9F5gi5b6RXtaWn48z qYFMdw5cxsOUfiCf3whEBd9ubsfg9TPV7Ym4OEiGX6uaO7rlfquCmMIzxGYKPj2ZVZcLM+ m57Rro58lfvWDSd28Ab8C5YY0792SlbSAHYMF+T16C8w1PoMQxRYlSTy1NazEqekkkvyPm aO5i2aKh9NkWHsf5VCwGrply0D7OOuineOwRUkduiG+M2P3OLTrfr2J1Y6gRcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755730118; a=rsa-sha256; cv=none; b=wsjHUcRmb6+Te1jCWie8hz5q9RQqTZdjkPPFkyibveGLtGwOV77b4mVpNJP/zxG8ykL2b3 RcYhgI0UEfbaR4mWTbiOheKrUI+ILCX3xhhLKm+k3TPKKXTC2OYO7sbAQzFpdZk9M6IQ7L XWsXcrW0FkLZicZNb4jHgNH6BOT5LBUlUzwCk9up2rQuubCZzkI/IW8w17Pkp0WEO9RA/g ukKEES+t09GLmBqvgbDR9ydpjPUGN1oixP37k+AXd63mIcAtEIccMgxuF4AbZBlu6OAjQP ybGrq4bz5iujT/TPPSbiz/H1+YIxtyKC57FeXSVeeCxNTkBoX7WxiLie9TpO1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6hSk33BWzYpn; Wed, 20 Aug 2025 22:48:38 +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 57KMmckX016283; Wed, 20 Aug 2025 22:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KMmcTO016280; Wed, 20 Aug 2025 22:48:38 GMT (envelope-from git) Date: Wed, 20 Aug 2025 22:48:38 GMT Message-Id: <202508202248.57KMmcTO016280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: b44cc1b479fe - main - loader: do not try to open directories with TFTP 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b44cc1b479fefc8570611309c3f5a6966fb26e3b Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b44cc1b479fefc8570611309c3f5a6966fb26e3b commit b44cc1b479fefc8570611309c3f5a6966fb26e3b Author: Simon J. Gerraty AuthorDate: 2025-08-20 22:45:54 +0000 Commit: Simon J. Gerraty CommitDate: 2025-08-20 22:45:54 +0000 loader: do not try to open directories with TFTP Attempting to mount or even open / with some tftp servers causes a several minute delay in boot. Since opening a directory via TFTP does not make sense, we avoid it. We don't know if using TFTP until after net_open() has been called. Add an is_tftp() accessor to avoid everyone having to include all the net* headers. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D51447 --- stand/common/dev_net.c | 9 ++++++++- stand/libsa/mount.c | 5 ++++- stand/libsa/open.c | 8 ++++++++ stand/libsa/stand.h | 3 +++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/stand/common/dev_net.c b/stand/common/dev_net.c index 964fa514cac5..10389db27b99 100644 --- a/stand/common/dev_net.c +++ b/stand/common/dev_net.c @@ -182,6 +182,7 @@ net_open(struct open_file *f, ...) setenv("boot.netif.mtu", mtu, 1); } + DEBUG_PRINTF(1,("%s: netproto=%d\n", __func__, netproto)); } netdev_opens++; dev->d_opendata = &netdev_sock; @@ -193,7 +194,7 @@ net_close(struct open_file *f) { struct devdesc *dev; - DEBUG_PRINTF(1,("%s: opens=%d\n", __func__, netdev_opens)); + DEBUG_PRINTF(2,("%s: opens=%d\n", __func__, netdev_opens)); dev = f->f_devdata; dev->d_opendata = NULL; @@ -344,6 +345,12 @@ net_print(int verbose) return (ret); } +bool +is_tftp(void) +{ + return (netproto == NET_TFTP); +} + /* * Parses the rootpath if present * diff --git a/stand/libsa/mount.c b/stand/libsa/mount.c index 73bf6ab8118c..c866dc9c7055 100644 --- a/stand/libsa/mount.c +++ b/stand/libsa/mount.c @@ -107,7 +107,10 @@ mount(const char *dev, const char *path, int flags __unused, void *data) fs = file_system[i]; if (fs->fo_mount == NULL) continue; - + DEBUG_PRINTF(1,("%s: fs=%s path=%s\n", + __func__, fs->fs_name, path)); + if (is_tftp()) + break; if (fs->fo_mount(dev, path, &data) != 0) continue; diff --git a/stand/libsa/open.c b/stand/libsa/open.c index c97aa5977f9e..91848aca7dbe 100644 --- a/stand/libsa/open.c +++ b/stand/libsa/open.c @@ -138,6 +138,8 @@ open(const char *fname, int mode) struct fs_ops *fs; struct open_file *f; int fd, i, error, besterror; + bool is_dir; + size_t n; const char *file; TSENTER(); @@ -182,8 +184,14 @@ open(const char *fname, int mode) /* pass file name to the different filesystem open routines */ besterror = ENOENT; + n = strlen(file); + is_dir = (n > 0 && file[n - 1] == '/'); for (i = 0; file_system[i] != NULL; i++) { fs = file_system[i]; + if (is_dir && is_tftp()) { + error = EOPNOTSUPP; + goto err; + } error = (fs->fo_open)(file, f); if (error == 0) goto ok; diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h index c6a08be2f7e3..233d11ab3ecb 100644 --- a/stand/libsa/stand.h +++ b/stand/libsa/stand.h @@ -507,6 +507,9 @@ extern void *reallocf(void *, size_t); */ caddr_t ptov(uintptr_t); +/* dev_net.c */ +bool is_tftp(void); + /* features.c */ typedef void (feature_iter_fn)(void *, const char *, const char *, bool); From nobody Wed Aug 20 22:56:23 2025 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 4c6hdh0HYqz65MC6; Wed, 20 Aug 2025 22:56:24 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6hdg6lNdz3tDD; Wed, 20 Aug 2025 22:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755730583; 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=j7sf1b5MQE6+THhihhCHyHJKb4x00kZzGNDIG/aQE5A=; b=wY5ZHuLiWRlDIWQJF12asDN6pjC73RvaT6lDBAAX3I1zpJD166aA6pby9iAr6O/BumEyMM ztzFrjeGdh1Cfyz6ZYylElFm65lzV0wsZifhlA6OL8v0zTu7ek77mm6nRpDNTmViJQvaG9 CrGyHtFLw8X+rTOeAf0gq5obS8SBF7eVtVFYY9f3klyR61aEpL5QNdTO123BiUYar+sYaM bSU/W6m0m3INKUAqwKve+mWSnsMb/2VQyxghGgW9rsxi5gmA2S0Khv44HW/1cXLn1MJHR3 cCkbP5FuPPO9T48MGgdAU8wkvqsvwzrNSn3PuQjLPt3YxBTPfMubiQ5Uc6pNhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755730583; 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=j7sf1b5MQE6+THhihhCHyHJKb4x00kZzGNDIG/aQE5A=; b=GbCoT6GpUJ53qeIzDzieD9hxiT5NDoXjdKgABoqkqn53MzzBXrPfpfGGwMx9XPbLYu/u2Y 3UKiBd3WW+L+wGlBLt31zSO3XuQzUrQ6RHCJVIy3YqOGqKf9uz797hwykGukd3a2chb3ur g+sZSGJlXv2nZPzoGBcjoHwZ3MnS+EqTiKzT+GWinvb0HrBl3a2CYb/2QXpNpBc/pJ5tL6 8bm6ADv1nI+O1kwTPTEirMem0Xvtqtj8P7SEBTL/B4L03Rb9pOvmlxjYmLncirUZZh7PRX LULIy3JWJ2wIg640jHb5n6PQEpKvb9wtWocMUTnJUbCR9jAE4lHkMfGRoqbNAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755730583; a=rsa-sha256; cv=none; b=gyAPsVVB70Wvw1U4c+od1l+wI24/oqjTECYLFqjEGb1t9uKXGQ9zZ7DSxTSiXHOEcoPp7O v/pb7DMTJ7Ouyn+nXI3SLBAVeCfum55UhYEZeB6T54QtN/Va3j58yZ2uO9crJlD8X8aTej OBiW9++al6hI5McHeOyRAsJkCFAAZEw3hTt8RmjKkIC0K9tGCMqSMx+fbi5WbPumy+g0pq V3yd9HFVg+0JRJJFrfBH8xm7NJ7QxdB/ryfWbEje0wMFcrEDa+3n2x274qfPmfijyhu2y+ B3LG442p1fm98mbjBvkmSsvMRpwReoZeGMU58HEbnt/3hOy56TZ6wvcTA7Z6dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6hdg6LKrzYnc; Wed, 20 Aug 2025 22:56:23 +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 57KMuN4F034165; Wed, 20 Aug 2025 22:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KMuNMW034162; Wed, 20 Aug 2025 22:56:23 GMT (envelope-from git) Date: Wed, 20 Aug 2025 22:56:23 GMT Message-Id: <202508202256.57KMuNMW034162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 5bfb3045d25b - main - Allow secure-netboot 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bfb3045d25b3e097f1e55fdc5b3f929f2b7da55 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5bfb3045d25b3e097f1e55fdc5b3f929f2b7da55 commit 5bfb3045d25b3e097f1e55fdc5b3f929f2b7da55 Author: Simon J. Gerraty AuthorDate: 2025-08-20 22:49:53 +0000 Commit: Simon J. Gerraty CommitDate: 2025-08-20 22:49:53 +0000 Allow secure-netboot When doing file verification, tftp needs to be able to handle multiple open files concurrently. We also need tftp_stat() to provide useful values for st_dev and st_ino. Allow an architecture to define NETPROTO_DEFAULT. The default is NET_NFS for backwards compatability. In net_parse_rootpath() fix parsing of ://[: and ensure we return INADDR_NONE unless we successfully parsed an addr, so we don't end up clobbering rootip obtained from bootp(). Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D51187 --- stand/common/dev_net.c | 32 +++++++---- stand/defs.mk | 2 + stand/libsa/globals.c | 1 + stand/libsa/libsa.3 | 4 ++ stand/libsa/net.h | 1 + stand/libsa/tftp.c | 153 +++++++++++++++++++++++++++++++++++-------------- stand/loader.mk | 2 - 7 files changed, 140 insertions(+), 55 deletions(-) diff --git a/stand/common/dev_net.c b/stand/common/dev_net.c index 10389db27b99..d1c48d40691a 100644 --- a/stand/common/dev_net.c +++ b/stand/common/dev_net.c @@ -66,6 +66,10 @@ #include "dev_net.h" #include "bootstrap.h" +#ifndef NETPROTO_DEFAULT +# define NETPROTO_DEFAULT NET_NFS +#endif + static char *netdev_name; static int netdev_sock = -1; static int netdev_opens; @@ -304,7 +308,7 @@ net_getparams(int sock) return (EIO); } exit: - if ((rootaddr = net_parse_rootpath()) != INADDR_NONE) + if ((rootaddr = net_parse_rootpath()) != htonl(INADDR_NONE)) rootip.s_addr = rootaddr; DEBUG_PRINTF(1,("%s: proto: %d\n", __func__, netproto)); @@ -355,7 +359,7 @@ is_tftp(void) * Parses the rootpath if present * * The rootpath format can be in the form - * ://ip/path + * ://ip[:port]/path * :/path * * For compatibility with previous behaviour it also accepts as an NFS scheme @@ -370,10 +374,10 @@ is_tftp(void) uint32_t net_parse_rootpath(void) { - n_long addr = htonl(INADDR_NONE); + n_long addr = 0; size_t i; char ip[FNAME_SIZE]; - char *ptr, *val; + char *ptr, *portp, *val; netproto = NET_NONE; @@ -388,7 +392,7 @@ net_parse_rootpath(void) ptr = rootpath; /* Fallback for compatibility mode */ if (netproto == NET_NONE) { - netproto = NET_NFS; + netproto = NETPROTO_DEFAULT; (void)strsep(&ptr, ":"); if (ptr != NULL) { addr = inet_addr(rootpath); @@ -401,16 +405,21 @@ net_parse_rootpath(void) if (*ptr == '/') { /* we are in the form ://, we do expect an ip */ ptr++; - /* - * XXX when http will be there we will need to check for - * a port, but right now we do not need it yet - */ + portp = val = strchr(ptr, ':'); + if (val != NULL) { + val++; + rootport = strtol(val, NULL, 10); + } val = strchr(ptr, '/'); if (val != NULL) { + if (portp == NULL) + portp = val; snprintf(ip, sizeof(ip), "%.*s", - (int)((uintptr_t)val - (uintptr_t)ptr), + (int)(portp - ptr), ptr); addr = inet_addr(ip); + DEBUG_PRINTF(1,("ip=%s addr=%#x\n", + ip, addr)); bcopy(val, rootpath, strlen(val) + 1); } } else { @@ -418,6 +427,7 @@ net_parse_rootpath(void) bcopy(ptr, rootpath, strlen(ptr) + 1); } } - + if (addr == 0) + addr = htonl(INADDR_NONE); return (addr); } diff --git a/stand/defs.mk b/stand/defs.mk index 8ef84267b198..eb4133b604eb 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -207,6 +207,8 @@ LOADER_INTERP?=${LOADER_DEFAULT_INTERP} # Make sure we use the machine link we're about to create CFLAGS+=-I. +.include "${BOOTSRC}/veriexec.mk" + all: ${PROG} CLEANFILES+= teken_state.h diff --git a/stand/libsa/globals.c b/stand/libsa/globals.c index 2797045d4faf..6bd3a4243d73 100644 --- a/stand/libsa/globals.c +++ b/stand/libsa/globals.c @@ -17,6 +17,7 @@ u_char bcea[6] = BA; /* broadcast ethernet address */ char rootpath[FNAME_SIZE] = "/"; /* root mount path */ +int rootport; /* port for rootpath server */ char bootfile[FNAME_SIZE]; /* bootp says to boot this */ char hostname[FNAME_SIZE]; /* our hostname */ int hostnamelen; diff --git a/stand/libsa/libsa.3 b/stand/libsa/libsa.3 index 3e3f70610516..0947f97a0a1f 100644 --- a/stand/libsa/libsa.3 +++ b/stand/libsa/libsa.3 @@ -781,6 +781,10 @@ The same as but for .Xr bzip2 1 Ns -compressed files. +.It Va pkgfs_fsops +File access from a tar file typically streamed via TFTP. +The order of files in the tar file must match the order they are +to be consumed as rewind is not practical. .El .Pp The array of diff --git a/stand/libsa/net.h b/stand/libsa/net.h index d4823d88f58b..945b6b9ea45f 100644 --- a/stand/libsa/net.h +++ b/stand/libsa/net.h @@ -75,6 +75,7 @@ enum net_proto { extern u_char bcea[6]; extern char rootpath[FNAME_SIZE]; +extern int rootport; extern char bootfile[FNAME_SIZE]; extern char hostname[FNAME_SIZE]; extern int hostnamelen; diff --git a/stand/libsa/tftp.c b/stand/libsa/tftp.c index 0584246a6dea..656c402683bb 100644 --- a/stand/libsa/tftp.c +++ b/stand/libsa/tftp.c @@ -50,6 +50,10 @@ #include #include +#ifdef LOADER_VERIEXEC +#include +#endif + #include #include "stand.h" @@ -85,7 +89,6 @@ struct fs_ops tftp_fsops = { }; static int tftpport = 2000; -static int is_open = 0; /* * The legacy TFTP_BLKSIZE value was SEGSIZE(512). @@ -99,10 +102,14 @@ static int is_open = 0; * Jumbo frames in the future. */ #define TFTP_MAX_BLKSIZE 9008 -#define TFTP_TRIES 2 +#define TFTP_TRIES 3 struct tftp_handle { struct iodesc *iodesc; + struct iodesc io; + int id; + ino_t ino; + int port; int currblock; /* contents of lastdata */ unsigned int islastblock:1; /* flag */ unsigned int tries:4; /* number of read attempts */ @@ -178,6 +185,9 @@ tftp_sendack(struct tftp_handle *h, u_short block) wbuf.t.th_block = htons(block); wtail += 2; + DEBUG_PRINTF(5,("%s: myport=%hu xid=%lu, block=%hu\n", + __func__, h->iodesc->myport, h->iodesc->xid, block)); + sendudp(h->iodesc, &wbuf.t, wtail - (char *)&wbuf.t); } @@ -191,6 +201,7 @@ recvtftp(struct iodesc *d, void **pkt, void **payload, time_t tleft, void *ptr = NULL; ssize_t len; int tftp_error; + unsigned short block; errno = 0; extra = recv_extra; @@ -204,19 +215,22 @@ recvtftp(struct iodesc *d, void **pkt, void **payload, time_t tleft, } extra->rtype = ntohs(t->th_opcode); - switch (ntohs(t->th_opcode)) { + block = ntohs(t->th_block); + DEBUG_PRINTF(6,("%s: myport=%hu xid=%lu, block=%hu, opcode=%hu\n", + __func__, d->myport, d->xid, block, extra->rtype)); + switch (extra->rtype) { case DATA: { int got; - if (htons(t->th_block) < (u_short)d->xid) { + if (block < (u_short)d->xid) { /* * Apparently our ACK was missed, re-send. */ - tftp_sendack(h, htons(t->th_block)); + tftp_sendack(h, block); free(ptr); return (-1); } - if (htons(t->th_block) != (u_short)d->xid) { + if (block != (u_short)d->xid) { /* * Packet from the future, drop this. */ @@ -242,9 +256,7 @@ recvtftp(struct iodesc *d, void **pkt, void **payload, time_t tleft, printf("illegal tftp error %d\n", tftp_error); errno = EIO; } else { -#ifdef TFTP_DEBUG - printf("tftp-error %d\n", tftp_error); -#endif + DEBUG_PRINTF(0, ("tftp-error %d\n", tftp_error)); errno = tftperrors[tftp_error]; } free(ptr); @@ -285,9 +297,7 @@ recvtftp(struct iodesc *d, void **pkt, void **payload, time_t tleft, return (0); } default: -#ifdef TFTP_DEBUG - printf("tftp type %d not handled\n", ntohs(t->th_opcode)); -#endif + DEBUG_PRINTF(0, ("tftp type %hu not handled\n", extra->rtype)); free(ptr); return (-1); } @@ -344,7 +354,7 @@ tftp_makereq(struct tftp_handle *h) bcopy("0", wtail, 2); wtail += 2; - h->iodesc->myport = htons(tftpport + (getsecs() & 0x3ff)); + h->iodesc->myport = htons(h->port + (getsecs() & 0x3ff)); h->iodesc->destport = htons(IPPORT_TFTP); h->iodesc->xid = 1; /* expected block */ @@ -352,11 +362,15 @@ tftp_makereq(struct tftp_handle *h) h->islastblock = 0; h->validsize = 0; + DEBUG_PRINTF(5,("%s: %s: id=%d port=%d myport=%hu xid=1\n", + __func__, h->path, h->id, h->port, ntohs(h->iodesc->myport))); pkt = NULL; recv_extra.tftp_handle = h; res = sendrecv(h->iodesc, &sendudp, &wbuf.t, wtail - (char *)&wbuf.t, &recvtftp, &pkt, (void **)&t, &recv_extra); if (res == -1) { + DEBUG_PRINTF(3,("%s: %s: id=%d errno=%d\n", + __func__, h->path, h->id, errno)); free(pkt); return (errno); } @@ -411,12 +425,18 @@ tftp_getnextblock(struct tftp_handle *h) h->iodesc->xid = h->currblock + 1; /* expected block */ + DEBUG_PRINTF(5,("%s: %s: id=%d port=%d myport=%hu xid=%lu\n", + __func__, h->path, h->id, h->port, + ntohs(h->iodesc->myport), h->iodesc->xid)); + pkt = NULL; recv_extra.tftp_handle = h; res = sendrecv(h->iodesc, &sendudp, &wbuf.t, wtail - (char *)&wbuf.t, &recvtftp, &pkt, (void **)&t, &recv_extra); if (res == -1) { /* 0 is OK! */ + DEBUG_PRINTF(3,("%s: %s: id=%d errno=%d\n", + __func__, h->path, h->id, errno)); free(pkt); return (errno); } @@ -429,21 +449,32 @@ tftp_getnextblock(struct tftp_handle *h) if (res < h->tftp_blksize) h->islastblock = 1; /* EOF */ - if (h->islastblock == 1) { + DEBUG_PRINTF(5,("%s: %s: id=%d res=%d blksz=%d last=%d\n", + __func__, h->path, h->id, res, h->tftp_blksize, h->islastblock)); + + if (h->islastblock) { /* Send an ACK for the last block */ - wbuf.t.th_block = htons((u_short)h->currblock); - sendudp(h->iodesc, &wbuf.t, wtail - (char *)&wbuf.t); + tftp_sendack(h, h->currblock); } return (0); } +/* + * If doing verification we need to handle multiple + * files at the same time. + */ +#define TOPEN_MAX 8 +static struct tftp_handle *handles[TOPEN_MAX]; + static int tftp_open(const char *path, struct open_file *f) { struct devdesc *dev; struct tftp_handle *tftpfile; struct iodesc *io; + static int lx = 0; + int i, x; int res; size_t pathsize; const char *extraslash; @@ -451,24 +482,39 @@ tftp_open(const char *path, struct open_file *f) if (netproto != NET_TFTP) return (EINVAL); - if (f->f_dev->dv_type != DEVT_NET) + if (f->f_dev == NULL || f->f_dev->dv_type != DEVT_NET) return (EINVAL); - if (is_open) + tftpfile = NULL; + for (x = lx + 1, i = 0; i < TOPEN_MAX; i++, x++) { + x %= TOPEN_MAX; + if (handles[x] == NULL) { + handles[x] = tftpfile = calloc(1, sizeof(*tftpfile)); + if (tftpfile == NULL) + return (ENOMEM); + /* id allows us to clear the slot on close */ + tftpfile->id = lx = x; + /* port ensures a different session with server */ + tftpfile->port = (tftpport + (x * tftpport)) & 0xffff; + DEBUG_PRINTF(1, ("%s(%s) id=%d port=%d\n", + __func__, path, tftpfile->id, tftpfile->port)); + break; + } + } + if (tftpfile == NULL) { + DEBUG_PRINTF(1, ("%s: EBUSY\n", __func__)); return (EBUSY); - - tftpfile = calloc(1, sizeof(*tftpfile)); - if (!tftpfile) - return (ENOMEM); - + } tftpfile->tftp_blksize = TFTP_REQUESTED_BLKSIZE; dev = f->f_devdata; - tftpfile->iodesc = io = socktodesc(*(int *)(dev->d_opendata)); + io = socktodesc(*(int *)(dev->d_opendata)); if (io == NULL) { free(tftpfile); return (EINVAL); } + memcpy(&tftpfile->io, io, sizeof(tftpfile->io)); + io = tftpfile->iodesc = &tftpfile->io; io->destip = rootip; tftpfile->off = 0; pathsize = (strlen(rootpath) + 1 + strlen(path) + 1) * sizeof(char); @@ -481,8 +527,11 @@ tftp_open(const char *path, struct open_file *f) extraslash = ""; else extraslash = "/"; - res = snprintf(tftpfile->path, pathsize, "%s%s%s", - rootpath, extraslash, path); + if (rootpath[0] == '/' && rootpath[1] == '\0' && path[0] == '/') + res = strlcpy(tftpfile->path, path, pathsize); + else + res = snprintf(tftpfile->path, pathsize, "%s%s%s", + rootpath, extraslash, path); if (res < 0 || res > pathsize) { free(tftpfile->path); free(tftpfile); @@ -492,13 +541,13 @@ tftp_open(const char *path, struct open_file *f) res = tftp_makereq(tftpfile); if (res) { + handles[tftpfile->id] = NULL; free(tftpfile->path); free(tftpfile->pkt); free(tftpfile); return (res); } f->f_fsdata = tftpfile; - is_open = 1; return (0); } @@ -548,9 +597,7 @@ tftp_read(struct open_file *f, void *addr, size_t size, rc = tftp_getnextblock(tftpfile); if (rc) { /* no answer */ -#ifdef TFTP_DEBUG - printf("tftp: read error\n"); -#endif + DEBUG_PRINTF(0, ("tftp: read error\n")); if (tftpfile->tries > TFTP_TRIES) { return (rc); } else { @@ -569,10 +616,8 @@ tftp_read(struct open_file *f, void *addr, size_t size, inbuffer = tftpfile->validsize - offinblock; if (inbuffer < 0) { -#ifdef TFTP_DEBUG - printf("tftp: invalid offset %d\n", - tftpfile->off); -#endif + DEBUG_PRINTF(0, ("tftp: invalid offset %d\n", + tftpfile->off)); return (EINVAL); } count = (size < inbuffer ? size : inbuffer); @@ -587,15 +632,15 @@ tftp_read(struct open_file *f, void *addr, size_t size, if ((tftpfile->islastblock) && (count == inbuffer)) break; /* EOF */ } else { -#ifdef TFTP_DEBUG - printf("tftp: block %d not found\n", needblock); -#endif + DEBUG_PRINTF(0, ("tftp: block %d not found\n", needblock)); return (EINVAL); } } out: + DEBUG_PRINTF(4, ("%s(%s) res=%ld\n", __func__, tftpfile->path, + (tftpfile->tftp_tsize - tftpfile->off))); if (resid != NULL) *resid = res; return (rc); @@ -611,15 +656,18 @@ tftp_close(struct open_file *f) tftp_senderr(tftpfile, 0, "No error: file closed"); if (tftpfile) { + DEBUG_PRINTF(1, ("%s(%d): %s\n", __func__, + tftpfile->id, tftpfile->path)); + handles[tftpfile->id] = NULL; free(tftpfile->path); free(tftpfile->pkt); free(tftpfile->tftp_cache); free(tftpfile); } - is_open = 0; return (0); } + static int tftp_stat(struct open_file *f, struct stat *sb) { @@ -631,6 +679,29 @@ tftp_stat(struct open_file *f, struct stat *sb) sb->st_uid = 0; sb->st_gid = 0; sb->st_size = tftpfile->tftp_tsize; + sb->st_mtime = 0; +#ifdef LOADER_VERIEXEC + /* libsecureboot needs st_dev and st_ino at minimum; + * we need to fake something that will be close enough to + * unique. + */ + sb->st_dev = (dev_t)tftpfile->iodesc->destip.s_addr; + /* we don't want to compute this more than once */ + if (tftpfile->ino == 0) { + union { + unsigned char digest[SHA_DIGEST_LENGTH]; + ino_t ino; + } u; + + hash_string(tftpfile->path, 0, u.digest, sizeof(u.digest)); + + tftpfile->ino = u.ino & 0x7fffffff; + DEBUG_PRINTF(2,("%s(%s) dev=%lu ino=%lu\n", __func__, + tftpfile->path, (unsigned long)sb->st_dev, + (unsigned long)tftpfile->ino)); + } + sb->st_ino = tftpfile->ino; +#endif return (0); } @@ -828,9 +899,7 @@ tftp_parse_oack(struct tftp_handle *h, char *buf, size_t len) return (-1); } -#ifdef TFTP_DEBUG - printf("tftp_blksize: %u\n", h->tftp_blksize); - printf("tftp_tsize: %lu\n", h->tftp_tsize); -#endif + DEBUG_PRINTF(2, ("tftp_blksize: %u\n", h->tftp_blksize)); + DEBUG_PRINTF(2, ("tftp_tsize: %lu\n", h->tftp_tsize)); return (0); } diff --git a/stand/loader.mk b/stand/loader.mk index 0f2ff31a5343..4073e523e552 100644 --- a/stand/loader.mk +++ b/stand/loader.mk @@ -101,8 +101,6 @@ SRCS+= interp_simple.c .error Unknown interpreter ${LOADER_INTERP} .endif -.include "${BOOTSRC}/veriexec.mk" - .if defined(BOOT_PROMPT_123) CFLAGS+= -DBOOT_PROMPT_123 .endif From nobody Thu Aug 21 01:50:30 2025 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 4c6mVb01ZSz65ZNk; Thu, 21 Aug 2025 01:50:31 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6mVZ5wCpz3F3t; Thu, 21 Aug 2025 01:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755741030; 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=azHQxSpzeF7cDBl9bbPTIAXDtsbrFvbmmdDQT6t2ySY=; b=fSzdfEHdZ3cdzOpwNCXMYfQFhICQj7QhE4qz4PCmF0F80xDymYCb7VcMeLV0GnCI6iXcFI M7W6l7TxnzoIYFkwQY7CxcVKJ+m13ZckQMHxvdsjeJfCTI4h7PaDeqV/zaUH16d7TOsJ0K QJGr/kjviTLsbrr0DBx9ZWDf/o/J+y6LkzWRd8uRSM9jCNrBOqAwBA7DTwccuUeJW4n73M f+bq48dKYPMJsCWfACchm0ZRqZJR254Z0J7KkQ483AoRG1BQngLe2HuDL/BdKCM5doo3c4 gSUJ/CVOvDE6clv40g9h6DGahbe2nmS/l+lObNuAJgwusiWMOwJEEvWf6YCXng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755741030; 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=azHQxSpzeF7cDBl9bbPTIAXDtsbrFvbmmdDQT6t2ySY=; b=Z+x4R6C+N464qk4NjQPWwex6+IXWxlXGl+upAiK06Dd7U8tMLJ/NGjjkJnte94X7xXdLBq /628Co2JHH1P8vxyuNjOYZ8ZBgx1X8/W9MbJ0uJjJOIDeITuIjXedDra8K5fRSWopi3vuA FNvFMYTdu15NQEXb7IbLchXMg2Y7tEqRZ88X0id+FpecI7VUGqaBL15ga2QFH/XWzyjli6 Y7pSGtkJDKq7mt9uW5ktPlQztNpk04tqtMS1eH7VTXvuoGS93+qH1Lx+J6Mm1WzyMdg2hz 4A/dY0MdM0H/7IAuB6aTNkiBpRgmo5xUFduLCVX8tR5LpDhBfS73n3ZvbedBRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755741030; a=rsa-sha256; cv=none; b=pPCfkXnLWKKXzblCQ3ss35xJhai253/ZZYdlikUvLELfA0C4Ur/Q32enoU3+oU/AOdsmn9 RG3o6lqsDs1NkGcdord+Lh8LsJIvc3jyNMlQECsaLaYUnfsBhRUNP4s600ws6QKW/VZPMS rQ7xfUE1PLmjqHsx+33/pMOIqTEbEP86KG2T+nvCDvq8eZjGcl9MCe8Aq3CpzCI4VCIWvb 8GfJyg1NxeF8yMhKSoIWoFSO29jfVKTdsAtmOUza3yk/nFQ/zmwSHUqC3rzEa59Wo5IFDr o1WN9hbyCW98zSEjaogK5MB/gjhuzjuERB0VAix70pi/XFaPbCvkxG/Q77By4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6mVZ5TFpzfGQ; Thu, 21 Aug 2025 01:50:30 +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 57L1oU7Y063304; Thu, 21 Aug 2025 01:50:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57L1oUwr063301; Thu, 21 Aug 2025 01:50:30 GMT (envelope-from git) Date: Thu, 21 Aug 2025 01:50:30 GMT Message-Id: <202508210150.57L1oUwr063301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 458ac2b6e445 - main - umb.4: Improve synposis, add netmap 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 458ac2b6e4452acc1a614352c8945ecc37667aa0 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=458ac2b6e4452acc1a614352c8945ecc37667aa0 commit 458ac2b6e4452acc1a614352c8945ecc37667aa0 Author: Alexander Ziaee AuthorDate: 2025-08-20 14:45:08 +0000 Commit: Alexander Ziaee CommitDate: 2025-08-21 01:48:13 +0000 umb.4: Improve synposis, add netmap Rewrite synopsis in a more consistent style, and add "device netmap", In FreeBSD 15, netmap is included in GENERIC/{amd64,arm64,powerpc64}, but it still needs to be used in FreeBSD 14 or custom kernels which don't include GENERIC. MFC after: umb does not mfc Reviewed by: gbe Differential Revision: https://reviews.freebsd.org/D51732 --- share/man/man4/umb.4 | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/share/man/man4/umb.4 b/share/man/man4/umb.4 index 7ecc9a39c1ca..311a50faf8e7 100644 --- a/share/man/man4/umb.4 +++ b/share/man/man4/umb.4 @@ -17,34 +17,34 @@ .\" .\" $NetBSD: umb.4,v 1.4 2019/08/30 09:22:17 wiz Exp $ .\" -.Dd May 11, 2025 +.Dd August 4, 2025 .Dt UMB 4 .Os .Sh NAME .Nm umb .Nd USB Mobile Broadband Interface Model (MBIM) cellular modem driver .Sh SYNOPSIS -To compile this driver into the kernel, -place the following lines in your -kernel configuration file: -.Bd -ragged -offset indent +.Cd "device netmap" .Cd "device usb" .Cd "device umb" -.Ed .Pp -Alternatively, to load the driver as a -module at boot time, place the following line in +In .Xr loader.conf 5 : -.Bd -literal -offset indent -umb_load="YES" -.Ed -.Pp -If neither of the above is done, the driver will automatically be loaded -by devd(8) when the device is connected. +.Cd umb_load="YES" .Sh DESCRIPTION The .Nm driver provides support for USB MBIM devices. +If the appropriate hardware is detected, +the driver will be loaded automatically by +.Xr devmatch 8 . +To load the driver manually, +.Cm load +it in +.Xr loader.conf 5 +or at the +.Xr loader 8 +prompt. .Pp MBIM devices establish connections via cellular networks such as GPRS, UMTS, and LTE. From nobody Thu Aug 21 03:21:15 2025 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 4c6pWR4dGgz65gdx; Thu, 21 Aug 2025 03:21:23 +0000 (UTC) (envelope-from zlei@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6pWR3Kwvz3S02; Thu, 21 Aug 2025 03:21:23 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755746483; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1ktDTAoIqMYxvmh71dqL8NdrDcOS+0XCOn3TCbyn9+A=; b=ASDFj+SJxL8WxwiMd7YklhqGIvhdcdUp23extrxFslN0gf4DcvUz0MpQrN9/CbJDRp6FDZ /ZSHbLnaG+fPclb1N2U+39d5nGunHt+wxvk8V20XYC8Mj4izrhYi13b0uNx9vCPPiCQzQP rbu687bvQMAZ543cmgrkUrjB9PHqNYnSgyYgPhEY0G3NzRoY9Ajrj6vn56nhyTKeNwnKyg mjMGa/ZsXrAHmZY3DvWgLJa/BQPXxkUt+/jzfKy6zCcwFGSkue9Tf6/HA8PO12ut5W7d9S DxnSP7PqdXdG9XpgaVjhhIXWR281FG+BEsIXfsBOV1tN87igXy7Z4dW3dM/lXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755746483; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1ktDTAoIqMYxvmh71dqL8NdrDcOS+0XCOn3TCbyn9+A=; b=O4LcIWA4dfEsfVZv3kqgtTk09w/1XUsZML9vS9rd2Frrs+gfMYb0iF6uqyo+lulwZdX+nI SSTSLrOFwEHcYs2dodC1FKRAJ7x7z2HRVAskTgWMXSwsqOYTxAibcb5e7NuvEbqgJwwZTR xYyRT5aGyYcZg/A2XVsMH8s2o9b0FF8x11Rw04Rmp+itSwNFbV+tVK2AID1U25Vpo2WiiT RfZx6BI94Aqh5IU6O65h6yifUWCZQ52iFyo1hB98CMDAjGGZWWxek98BSTmwJbNRsOKAZY 0TzpBx+f7q9XK3MbWy+yK3X5gkHWjt2iUNglhCMymCUJGnwgZMoY6ketfC34Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755746483; a=rsa-sha256; cv=none; b=uWHH0NtAs57OkFVSSX3JpXCtfJDmCZ41U+AUt5EdGTHT1CI3aiGe9F+OXGTngfAH2gWZIq VkgvPWgLDx5RLsweALgRPWwU2d7xyIbSuxYYckqxACW9iki5d8tKwfKR6QFnwkPZLZEULX kxfI7eOykkRrtNbaGQwziIKFG3GGhOJOrftGSMidiiuIbq049W6o5PxL1rprlIZjllslGn 7CtuG6iUFrxlUlx1HGzWeXpTmQQyw9nxB3cuLHJIdFGKqLEddyDuGZlf7m6HWTVsoP/8Er H/uk9yB6GYcKBw8MX3uH6pgs4NDpC68zgeqysKqLQhmJJ8gJ0gcyntDcG2B1Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c6pWQ1Snvz14bw; Thu, 21 Aug 2025 03:21:21 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii 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 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 458ac2b6e445 - main - umb.4: Improve synposis, add netmap From: Zhenlei Huang In-Reply-To: <202508210150.57L1oUwr063301@gitrepo.freebsd.org> Date: Thu, 21 Aug 2025 11:21:15 +0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <97B579B6-654E-45EF-9F48-6D6BC39262B6@FreeBSD.org> References: <202508210150.57L1oUwr063301@gitrepo.freebsd.org> To: Alexander Ziaee X-Mailer: Apple Mail (2.3696.120.41.1.10) Hi Alexander, I'd presume umb(4) does not depends on netmap. A quick search of = DEV_NETMAP ``` #ifdef DEV_NETMAP static void umb_input(if_t , struct mbuf *); #endif ... #ifdef DEV_NETMAP if_setinputfn(ifp, umb_input); #endif ``` I think the #ifdef can be removed. I currently do not have that hardware = so I'd appreciate if someone can test it. Best regards, Zhenlei > On Aug 21, 2025, at 9:50 AM, Alexander Ziaee = wrote: >=20 > The branch main has been updated by ziaee: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D458ac2b6e4452acc1a614352c8945ecc= 37667aa0 >=20 > commit 458ac2b6e4452acc1a614352c8945ecc37667aa0 > Author: Alexander Ziaee > AuthorDate: 2025-08-20 14:45:08 +0000 > Commit: Alexander Ziaee > CommitDate: 2025-08-21 01:48:13 +0000 >=20 > umb.4: Improve synposis, add netmap >=20 > Rewrite synopsis in a more consistent style, and add "device = netmap", > In FreeBSD 15, netmap is included in = GENERIC/{amd64,arm64,powerpc64}, > but it still needs to be used in FreeBSD 14 or custom kernels which > don't include GENERIC. >=20 > MFC after: umb does not mfc > Reviewed by: gbe > Differential Revision: https://reviews.freebsd.org/D51732 > --- > share/man/man4/umb.4 | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) >=20 > diff --git a/share/man/man4/umb.4 b/share/man/man4/umb.4 > index 7ecc9a39c1ca..311a50faf8e7 100644 > --- a/share/man/man4/umb.4 > +++ b/share/man/man4/umb.4 > @@ -17,34 +17,34 @@ > .\" > .\" $NetBSD: umb.4,v 1.4 2019/08/30 09:22:17 wiz Exp $ > .\" > -.Dd May 11, 2025 > +.Dd August 4, 2025 > .Dt UMB 4 > .Os > .Sh NAME > .Nm umb > .Nd USB Mobile Broadband Interface Model (MBIM) cellular modem driver > .Sh SYNOPSIS > -To compile this driver into the kernel, > -place the following lines in your > -kernel configuration file: > -.Bd -ragged -offset indent > +.Cd "device netmap" > .Cd "device usb" > .Cd "device umb" > -.Ed > .Pp > -Alternatively, to load the driver as a > -module at boot time, place the following line in > +In > .Xr loader.conf 5 : > -.Bd -literal -offset indent > -umb_load=3D"YES" > -.Ed > -.Pp > -If neither of the above is done, the driver will automatically be = loaded > -by devd(8) when the device is connected. > +.Cd umb_load=3D"YES" > .Sh DESCRIPTION > The > .Nm > driver provides support for USB MBIM devices. > +If the appropriate hardware is detected, > +the driver will be loaded automatically by > +.Xr devmatch 8 . > +To load the driver manually, > +.Cm load > +it in > +.Xr loader.conf 5 > +or at the > +.Xr loader 8 > +prompt. > .Pp > MBIM devices establish connections via cellular networks such as > GPRS, UMTS, and LTE. From nobody Thu Aug 21 04:12:17 2025 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 4c6qfp6LRMz65kJ8; Thu, 21 Aug 2025 04:12:50 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp6.goneo.de (smtp6.goneo.de [85.220.129.31]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4c6qfp47jvz3YW0; Thu, 21 Aug 2025 04:12:50 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub1.goneo.de (hub1.goneo.de [IPv6:2001:1640:5::8:52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp6.goneo.de (Postfix) with ESMTPS id C4356240F6F; Thu, 21 Aug 2025 06:12:47 +0200 (CEST) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id EEA302400FE; Thu, 21 Aug 2025 06:12:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1755749566; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aIO3CY0D7zzLi6SJfWO84s0tYziFbKtuhBGbjWW2JtE=; b=YyPv/GqGb38bzYUqEfffHzi8gC1CSS9Q+G1f7V7+3SADx/YIEey0uta1yhluz1cY8wwH48 x7Mgt8/PIjmqzEfYYcwNAHiiti4ZaMXUZ/bGx2ZUT5DxIxcmwxlnv5RJYaRfHNyYvVLed+ fIUaCgpSCZvMREOPDPAK1frpGkkTj18fLnQC5LfHrAytsDhjsj+NHPps4gS7803FpmNeQ2 FS5Y8B0T0Vj+LMjtJJ/v7vmuYpCCw+qSx9BiSI3+JGUzkbVx1fPhh4VDNDtbj9Xdccj0pZ mx1yo0ZjA9JwSckkwFBf0KCb+AUL3xj402ghZ6MGVleMzFT8qLRhQ9suYxao4w== Received: from thor.sb211.local (dynamic-2a02-3100-1961-5702-0029-39ab-2988-8b92.310.pool.telefonica.de [IPv6:2a02:3100:1961:5702:29:39ab:2988:8b92]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id 94A14240159; Thu, 21 Aug 2025 06:12:45 +0200 (CEST) Date: Thu, 21 Aug 2025 06:12:17 +0200 From: A FreeBSD User To: "Simon J. Gerraty" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b44cc1b479fe - main - loader: do not try to open directories with TFTP Message-ID: <20250821060752.001c9599@thor.sb211.local> In-Reply-To: <202508202248.57KMmcTO016280@gitrepo.freebsd.org> References: <202508202248.57KMmcTO016280@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-Transfer-Encoding: 7bit X-Rspamd-UID: 644c95 X-Rspamd-UID: cb5e7c X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:85.220.128.0/17, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c6qfp47jvz3YW0 Am Tage des Herren Wed, 20 Aug 2025 22:48:38 GMT "Simon J. Gerraty" schrieb: > The branch main has been updated by sjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b44cc1b479fefc8570611309c3f5a6966fb26e3b > > commit b44cc1b479fefc8570611309c3f5a6966fb26e3b > Author: Simon J. Gerraty > AuthorDate: 2025-08-20 22:45:54 +0000 > Commit: Simon J. Gerraty > CommitDate: 2025-08-20 22:45:54 +0000 > > loader: do not try to open directories with TFTP > > Attempting to mount or even open / with some tftp servers > causes a several minute delay in boot. > > Since opening a directory via TFTP does not make sense, we > avoid it. We don't know if using TFTP until after net_open() > has been called. > > Add an is_tftp() accessor to avoid everyone having to include > all the net* headers. > > Sponsored by: Juniper Networks, Inc. > Differential Revision: https://reviews.freebsd.org/D51447 > --- > stand/common/dev_net.c | 9 ++++++++- > stand/libsa/mount.c | 5 ++++- > stand/libsa/open.c | 8 ++++++++ > stand/libsa/stand.h | 3 +++ > 4 files changed, 23 insertions(+), 2 deletions(-) > > diff --git a/stand/common/dev_net.c b/stand/common/dev_net.c > index 964fa514cac5..10389db27b99 100644 > --- a/stand/common/dev_net.c > +++ b/stand/common/dev_net.c > @@ -182,6 +182,7 @@ net_open(struct open_file *f, ...) > setenv("boot.netif.mtu", mtu, 1); > } > > + DEBUG_PRINTF(1,("%s: netproto=%d\n", __func__, netproto)); > } > netdev_opens++; > dev->d_opendata = &netdev_sock; > @@ -193,7 +194,7 @@ net_close(struct open_file *f) > { > struct devdesc *dev; > > - DEBUG_PRINTF(1,("%s: opens=%d\n", __func__, netdev_opens)); > + DEBUG_PRINTF(2,("%s: opens=%d\n", __func__, netdev_opens)); > > dev = f->f_devdata; > dev->d_opendata = NULL; > @@ -344,6 +345,12 @@ net_print(int verbose) > return (ret); > } > > +bool > +is_tftp(void) > +{ > + return (netproto == NET_TFTP); > +} > + > /* > * Parses the rootpath if present > * > diff --git a/stand/libsa/mount.c b/stand/libsa/mount.c > index 73bf6ab8118c..c866dc9c7055 100644 > --- a/stand/libsa/mount.c > +++ b/stand/libsa/mount.c > @@ -107,7 +107,10 @@ mount(const char *dev, const char *path, int flags __unused, void *data) > fs = file_system[i]; > if (fs->fo_mount == NULL) > continue; > - > + DEBUG_PRINTF(1,("%s: fs=%s path=%s\n", > + __func__, fs->fs_name, path)); > + if (is_tftp()) > + break; > if (fs->fo_mount(dev, path, &data) != 0) > continue; > > diff --git a/stand/libsa/open.c b/stand/libsa/open.c > index c97aa5977f9e..91848aca7dbe 100644 > --- a/stand/libsa/open.c > +++ b/stand/libsa/open.c > @@ -138,6 +138,8 @@ open(const char *fname, int mode) > struct fs_ops *fs; > struct open_file *f; > int fd, i, error, besterror; > + bool is_dir; > + size_t n; > const char *file; > > TSENTER(); > @@ -182,8 +184,14 @@ open(const char *fname, int mode) > > /* pass file name to the different filesystem open routines */ > besterror = ENOENT; > + n = strlen(file); > + is_dir = (n > 0 && file[n - 1] == '/'); > for (i = 0; file_system[i] != NULL; i++) { > fs = file_system[i]; > + if (is_dir && is_tftp()) { > + error = EOPNOTSUPP; > + goto err; > + } > error = (fs->fo_open)(file, f); > if (error == 0) > goto ok; > diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h > index c6a08be2f7e3..233d11ab3ecb 100644 > --- a/stand/libsa/stand.h > +++ b/stand/libsa/stand.h > @@ -507,6 +507,9 @@ extern void *reallocf(void *, size_t); > */ > caddr_t ptov(uintptr_t); > > +/* dev_net.c */ > +bool is_tftp(void); > + > /* features.c */ > typedef void (feature_iter_fn)(void *, const char *, const char *, bool); > > Build of world/kernel fails with the error below: [...] --- all_subdir_stand/i386 --- --- all_subdir_stand/i386/gptzfsboot --- ld: error: undefined symbol: is_tftp >>> referenced by open.c >>> open.o:(open) in archive /usr/obj/usr/src/amd64.amd64/stand/libsa32/libsa32.a >>> referenced by mount.c >>> mount.o:(mount) in archive >>> /usr/obj/usr/src/amd64.amd64/stand/libsa32/libsa32.a --- all_subdir_usr.sbin --- -function -Wno-enum-conversion -Wno-unused-local-typedef -Wno-address-of-packed-member -Qunused-arguments -c /usr/src/contrib/tcpdump/print-ntp.c -o print-ntp.pieo --- all_subdir_stand --- *** [gptzfsboot.out] Error code 1 -- A FreeBSD user From nobody Thu Aug 21 05:24:57 2025 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 4c6sG22XwDz65nvj for ; Thu, 21 Aug 2025 05:24:58 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6sG21VBVz3gQQ; Thu, 21 Aug 2025 05:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755753898; 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=HdkFZJLROQZ1TusMSh2bB7jBLHcqMPwwrcXfFAFklWw=; b=Agv+ZamNHI2o416ovB4SmizNP8JPj7Q2GHyoUq0K+WpjygQcO85D9KXqy3Gqyk6uvQHb3K +zpmdaoZvE3nMXd0d0QW4j3alIvfVtASajZq0CKKjtolenk0khI7md6C3U9wXCsc8vaIe5 YBeOQ77I6Cbk//lnewzOwjfwRtLtK4MDho3GMc6b4psH+TfGK01wpJMi8mdK6PkexoDZUw RKWO1LvNGpsvHWhvJyMCR+cLFmbnayCikdlDxDBA2JxfVdG+MapK0Rp85sC5sp0urBYQU4 valkMwwdGV1Ig6LQKGA0HMVNxrNLlcZbVAoK9F4cYJJIWWIUoONPW3b/txc7Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755753898; 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=HdkFZJLROQZ1TusMSh2bB7jBLHcqMPwwrcXfFAFklWw=; b=B5ZNfPO1O6Fm68TT/YjdYQPyoUiyrdp8BZsVQKKaRs4s1f638lA4wzyauRqWr8ATUsGwDe 8mqvLELQUkt79eprkTNdhym3UZG6VDv+hoVYNsCWTQsDVoVo+Kwf8nkm+2VTXqJNGuV7S0 Zlmf7U6S0pbVPehD99ig4na8uokoGlnVYayCin4/Wy1m1G37R2QOfswLbAkYwqviBHb75S vmM31j0K37apJVLJ0ZnX/nxjc4pF1t1iODRO/RJ4lFNF3op6jUAkJTCwW/U3cjx7u8vkkO zVcnv3WNwfKUM0AANJWs4c1jYpsP1z18n+aAJUQrVNSteL5jjJ5kqfb+wfgqZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755753898; a=rsa-sha256; cv=none; b=XCXw5T5/Djp06eYAl11agqUm7Q+E/SdaSEShI7BIFFPVP+epiUjD54yl61zBfijjEfxAeW Sl00D3KA4JicjYNy7ZDqZRVI+zHHNgcz6ruaZ6rnIqGenyMY4/neaFepKeYsml/N5jYVEq ELZVO3WaA0ytLF5trT66YrvYoXCMTr5tPzbMV/u/1WrjwRYtAQdqQwK8x8eLxZXZEJBu/8 8usVfm3zsiJb1NYfj9Vz754kTRZFOjKfvQPNm+gBXX78xW4Y9mmFK4h0k4STjXwKeYJtwZ SVlyTeMcoh2fo6YMjurO4lPt5SnSug6HzR4jT2Pyw/uJwwCEmG1Q4JFrhHy9kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6sG212Z2zmPX; Thu, 21 Aug 2025 05:24:58 +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 57L5OvXb070480; Thu, 21 Aug 2025 05:24:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57L5OvpA070479; Thu, 21 Aug 2025 05:24:57 GMT (envelope-from git) Date: Thu, 21 Aug 2025 05:24:57 GMT Message-Id: <202508210524.57L5OvpA070479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Cy Schubert Subject: git: b080a24afb8a - Create tag vendor/krb5/1.22.1 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: cy X-Git-Repository: src X-Git-Refname: refs/tags/vendor/krb5/1.22.1 X-Git-Reftype: annotated tag X-Git-Commit: b080a24afb8a4b3add742849dc7cb27c9742ffe5 Auto-Submitted: auto-generated The annotated tag vendor/krb5/1.22.1 has been created by cy: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/krb5/1.22.1 tag vendor/krb5/1.22.1 Tagger: Cy Schubert TaggerDate: 2025-08-21 05:24:18 +0000 krb5: Tag 1.22.1 commit e5fe63eaf1d35ebbeac17eeed04cf873fbb9b3da Author: Cy Schubert AuthorDate: 2025-08-21 05:22:31 +0000 Commit: Cy Schubert CommitDate: 2025-08-21 05:22:47 +0000 krb5: Import MIT 1.22.1 Security: CVE-2025-57736 From nobody Thu Aug 21 05:24:57 2025 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 4c6sG22Xvjz65nsl for ; Thu, 21 Aug 2025 05:24:58 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6sG214B1z3gFG; Thu, 21 Aug 2025 05:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755753898; 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=RunfD8btjMvRoLmrT2W1AvlB3zGL3W7GyIBezc+P5GY=; b=dIdo1kG1AdXyEfsb94eZlT6+tRrr4Eftr52hLNM2NcFiQwz0R80egMNcyGEHCU5U/KV7DI 90PggaFxKPSj2rLLHGH465D3j/+6OsYVjMDHiDFRdRblgITzqYIkHxiR7mEtnrULo0Cumi Fmn6el2HE69DWGLsPrCCUTAbrh+Nleh6rpsAwbdEO3CXtZzuccvIPPBj2IFLOQS/hrQ+Fa X2e1MzZyZhVDB/Mi/jWOQh/bT/FuguUeAXWoXlXAj83OnkppU0CaC/z9SqHS/bBqR3rhDs Xmg1i+CxaFXpWRgARgII9mgffg3TSbCIEYZW7/bMaMRBVzhrWinWfFr9IyfAGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755753898; 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=RunfD8btjMvRoLmrT2W1AvlB3zGL3W7GyIBezc+P5GY=; b=LV1MVuqpAKRkQsccCt09AdXJdWhoOIRilDEQixoPs3CuKVLpjel192rXij+nQSkCqBtW64 XdmZFNWv7UrLM8U6Och+pc2qdFIVRBnnxcDmGdHAvepE8RuwOP4WJqLfXsVNzW3J8UFGsF YXCIBYHSvImnC2nE/Dx1DuvNeukJX08q571QAWUIjn7VhTHTRVcgJB5794PVpIVPY7Iv9G 9C0o6JvDQFAm/BDLUMM/UxzGqmFnuwxDj1h3vGZDPoyUtQExJ8RFnD8B7rhpp7zpkYI+94 J7NBMk50615k9E8A+qa5Fanj5bp6nB755H64eofBo5egAgY+jmOOnQSlxOflew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755753898; a=rsa-sha256; cv=none; b=QnA1ifjG5y+8Mbj/lhVhUP8l9+jnGndLP/UWjR4ZmiAw/8QN6rytBBE+90Em5u+Mh+ryCa 2te9YW0OajABZmQ7dmZuaJNPYeSH4J0Lk4luXX/oiO7/4JgCzzitv2AUxilE7vlqBnSWng 1756pnZ7TwjshHDXQIpT3a0CIDm/8sD5CHyTLxM7XX+eSqpp6+40WiiI6PT9yehbMqZmX7 4pGxUbmsVmdnL4mFKHc0NWjn9CiFPqN0h3EMPErt3Mlk7sXHdel7w2IQbzVGkzbnpnl9lP 2V4PSPoCOeG0eycGVvcErUh7m+Wqz2v8n1zn/fuVhqQVqql+4i5J77tRa0BRVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6sG208GVzmMT; Thu, 21 Aug 2025 05:24:58 +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 57L5Ovu1070460; Thu, 21 Aug 2025 05:24:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57L5OvvC070459; Thu, 21 Aug 2025 05:24:57 GMT (envelope-from git) Date: Thu, 21 Aug 2025 05:24:57 GMT Message-Id: <202508210524.57L5OvvC070459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Cy Schubert Subject: git: d82a140dad3a..e5fe63eaf1d3 - vendor/krb5 - vendor branch updated 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/vendor/krb5 X-Git-Reftype: branch X-Git-Commit: e5fe63eaf1d35ebbeac17eeed04cf873fbb9b3da X-Git-Oldrev: d82a140dad3a571d66abb2da24acbba90191f168 X-Git-Newrev: e5fe63eaf1d35ebbeac17eeed04cf873fbb9b3da Auto-Submitted: auto-generated The branch vendor/krb5 has been updated by cy: URL: https://cgit.FreeBSD.org/src/log/?id=d82a140dad3a..e5fe63eaf1d3 e5fe63eaf1d3 krb5: Import MIT 1.22.1 From nobody Thu Aug 21 06:40:27 2025 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 4c6txH2PSCz65swP; Thu, 21 Aug 2025 06:40:35 +0000 (UTC) (envelope-from bz@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6txH1qM1z3qMj; Thu, 21 Aug 2025 06:40:35 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755758435; 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=dAL3HC+cUK1H4zbE6cqmmcEpXxgajHsrtRGOG2UblPE=; b=cQnSXBfnIkpkFOraNLK8C64DY5YlnFdZ1mWa4VJjTzcTrr2jMm0qq+I/xxyJwBgm1Nv1nF y7aiu7BrSbJV7/MRdrZV1gpK8k2guUJXANtSJQCFkJnsR00vbfb2ovRLCCF7IfB1BxkYYV 989edEJPQ36jQJnRQigk0YHWtSTiIRDygqH5w6TQqNY5Hynbegt3XsEm0zeE9/SwAA+YVt EKRD+Fa5sqCyc60avkQ+tiA/r5y9SRNobQE/OftzQT4aAkKI5oiYUSUEO17XoUDeDMJjGJ SLUX8xWiLpy9NA1UDwIgW6fGoYln1JB1Vi8u4naFkzABR6vOoo4tia6w3ebb0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755758435; 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=dAL3HC+cUK1H4zbE6cqmmcEpXxgajHsrtRGOG2UblPE=; b=V7scDHmgiHrOESji33y9e5Jbjaqo+4ntfwKYFnqWCLO0rVCYGeZdKW7fcVMOtYoNOnW+a1 TFW64H7AG4kInC4iwdPHLbyO2aptXOQORY7LYw9EwfP80hAViAVK3aIrZgPSykgankrTtD DRXGotNNM++/UcZDtNGghjMw9Cndsw7GSiZ63FydmXMuE0ktBafq/YDY3vMa9LSMi6eGXY 8sjJB9jJ5NZ6vyrLZYP/a58jdUPmdKd5TsMCT3ETNVYYzofSZMhLUImjaMVueV9kyKePLn HE//OT1EA9vGSbZh4NpDxiqz4nbeQMha9ofXoMoPEr9Sg5Au6gEI4elZx0QkVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755758435; a=rsa-sha256; cv=none; b=httbG4K2lFqg2ETaE8sZfhQhzCjCzxeFFnHrt0X5/jR2QCLVYkIh8jFN7KcuAh+fL86n7/ mVvzvwjphMSzTB5rrgdAH9DlkM2UYbf6aBjbR/TGdPB2tyvM4yaNtJ4fljQXLxDvu/4AXy kUlIFSULi+7UzPf2sAKz9YifiPhcopr3D08h2Eulq6ZRiIu3uBgLmBNn+ftwPzckeERlSZ XTjHamVmYyQcQAyXq3urKxkGr/jbkNmLR35v/I7/QLuiwOBMNuKlMmRmvt4HqiJfcX7z/7 r+97hrHWtQaNXNZs+HOu710CSxTdNLjs9HsSrZgdqGYT9Utyppn2IsMbnDbtiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E6" (verified OK)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c6txG5drRz17dD; Thu, 21 Aug 2025 06:40:34 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id AA8A9A64805; Thu, 21 Aug 2025 06:40:25 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 291EF2D029E1; Thu, 21 Aug 2025 06:40:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id n02-OH7AQPo5; Thu, 21 Aug 2025 06:40:30 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:a66b:b6ff:fe40:39a9]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 9F39F2D029D8; Thu, 21 Aug 2025 06:40:30 +0000 (UTC) Date: Thu, 21 Aug 2025 06:40:27 +0000 (UTC) From: "Bjoern A. Zeeb" To: A FreeBSD User cc: "Simon J. Gerraty" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b44cc1b479fe - main - loader: do not try to open directories with TFTP In-Reply-To: <20250821060752.001c9599@thor.sb211.local> Message-ID: <8006s3o4-3nns-509q-n89q-oq88r8o09sn8@SerrOFQ.bet> References: <202508202248.57KMmcTO016280@gitrepo.freebsd.org> <20250821060752.001c9599@thor.sb211.local> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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; format=flowed On Thu, 21 Aug 2025, A FreeBSD User wrote: > Am Tage des Herren Wed, 20 Aug 2025 22:48:38 GMT > "Simon J. Gerraty" schrieb: > >> The branch main has been updated by sjg: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=b44cc1b479fefc8570611309c3f5a6966fb26e3b >> >> commit b44cc1b479fefc8570611309c3f5a6966fb26e3b >> Author: Simon J. Gerraty >> AuthorDate: 2025-08-20 22:45:54 +0000 >> Commit: Simon J. Gerraty >> CommitDate: 2025-08-20 22:45:54 +0000 >> >> loader: do not try to open directories with TFTP >> >> Attempting to mount or even open / with some tftp servers >> causes a several minute delay in boot. >> >> Since opening a directory via TFTP does not make sense, we >> avoid it. We don't know if using TFTP until after net_open() >> has been called. >> >> Add an is_tftp() accessor to avoid everyone having to include >> all the net* headers. >> >> Sponsored by: Juniper Networks, Inc. >> Differential Revision: https://reviews.freebsd.org/D51447 >> --- >> stand/common/dev_net.c | 9 ++++++++- >> stand/libsa/mount.c | 5 ++++- >> stand/libsa/open.c | 8 ++++++++ >> stand/libsa/stand.h | 3 +++ >> 4 files changed, 23 insertions(+), 2 deletions(-) > > Build of world/kernel fails with the error below: > > [...] > > --- all_subdir_stand/i386 --- > --- all_subdir_stand/i386/gptzfsboot --- > ld: error: undefined symbol: is_tftp >>>> referenced by open.c >>>> open.o:(open) in archive /usr/obj/usr/src/amd64.amd64/stand/libsa32/libsa32.a >>>> referenced by mount.c >>>> mount.o:(mount) in archive >>>> /usr/obj/usr/src/amd64.amd64/stand/libsa32/libsa32.a > --- all_subdir_usr.sbin --- > -function -Wno-enum-conversion -Wno-unused-local-typedef -Wno-address-of-packed-member > -Qunused-arguments -c /usr/src/contrib/tcpdump/print-ntp.c -o print-ntp.pieo --- > all_subdir_stand --- *** [gptzfsboot.out] Error code 1 shot in the dark (haven't checked that LOADER_NET_SUPPORT would be defined for these files): diff --git stand/libsa/mount.c stand/libsa/mount.c index c866dc9c7055..4b579c17a782 100644 --- stand/libsa/mount.c +++ stand/libsa/mount.c @@ -109,8 +109,10 @@ mount(const char *dev, const char *path, int flags __unused, void *data) continue; DEBUG_PRINTF(1,("%s: fs=%s path=%s\n", __func__, fs->fs_name, path)); +#ifdef LOADER_NET_SUPPORT if (is_tftp()) break; +#endif if (fs->fo_mount(dev, path, &data) != 0) continue; diff --git stand/libsa/open.c stand/libsa/open.c index 91848aca7dbe..0e44dc7b0942 100644 --- stand/libsa/open.c +++ stand/libsa/open.c @@ -138,8 +138,10 @@ open(const char *fname, int mode) struct fs_ops *fs; struct open_file *f; int fd, i, error, besterror; +#ifdef LOADER_NET_SUPPORT bool is_dir; size_t n; +#endif const char *file; TSENTER(); @@ -184,14 +186,18 @@ open(const char *fname, int mode) /* pass file name to the different filesystem open routines */ besterror = ENOENT; +#ifdef LOADER_NET_SUPPORT n = strlen(file); is_dir = (n > 0 && file[n - 1] == '/'); +#endif for (i = 0; file_system[i] != NULL; i++) { fs = file_system[i]; +#ifdef LOADER_NET_SUPPORT if (is_dir && is_tftp()) { error = EOPNOTSUPP; goto err; } +#endif error = (fs->fo_open)(file, f); if (error == 0) goto ok; -- Bjoern A. Zeeb r15:7 From nobody Thu Aug 21 06:57:26 2025 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 4c6vK4342Bz65tnD for ; Thu, 21 Aug 2025 06:57:44 +0000 (UTC) (envelope-from tsoome@me.com) Received: from outbound.ci.icloud.com (p-east1-cluster1-host11-snip4-4.eps.apple.com [57.103.91.107]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4c6vK34q1Gz3vxV for ; Thu, 21 Aug 2025 06:57:43 +0000 (UTC) (envelope-from tsoome@me.com) Authentication-Results: mx1.freebsd.org; none Received: from outbound.ci.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-central-1k-100-percent-10 (Postfix) with ESMTPS id 0B31218002D9; Thu, 21 Aug 2025 06:57:39 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; bh=CGLWBM0fDgMJA7zevXyt9hh9fOdyb8T/Rymek/BkxzA=; h=From:Message-Id:Content-Type:Mime-Version:Subject:Date:To:x-icloud-hme; b=qpE+1nF6xe/ahEuS99/5zb2Z7yRtZxDhvbiFk522oaU5Q7iP0HLb/4ecsqN0jjbhVaFughFFPfNfkHsLlqbmywuZ/p89BAzmdFuzGkbkiMVuD9js9EUuPq9vZxJaJ9ExEEVAo0Fan8Z7ByZHuTTrlU06xBjPwo5ziN8R7HtEYnqUTmyQPd/QDPTC1u0IQ2xjsXAYZbnwXO6BM2Cw6q4AgobuUNug3FJGbHa61yTXW5cUNJvgGBJav7+r1E7TKknfCDOQDxcDye+Rct7oiLMiiEwhaaj5GU5mDed+rNTQ8QLDox0fi35VMbA7DSqb2VnbZcPEg/vWi0CSvqG2xydSaA== Received: from smtpclient.apple (ci-asmtp-me-k8s.p00.prod.me.com [17.57.156.36]) by p00-icloudmta-asmtp-us-central-1k-100-percent-10 (Postfix) with ESMTPSA id 4F40A180016D; Thu, 21 Aug 2025 06:57:38 +0000 (UTC) From: Toomas Soome Message-Id: <9EEDE524-1ED3-4F41-9584-460DCBF61D81@me.com> Content-Type: multipart/alternative; boundary="Apple-Mail=_934F1BC3-226F-4DA7-AD5A-B9B3614F975F" 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 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: b44cc1b479fe - main - loader: do not try to open directories with TFTP Date: Thu, 21 Aug 2025 09:57:26 +0300 In-Reply-To: <8006s3o4-3nns-509q-n89q-oq88r8o09sn8@SerrOFQ.bet> Cc: A FreeBSD User , "Simon J. Gerraty" , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: "Bjoern A. Zeeb" References: <202508202248.57KMmcTO016280@gitrepo.freebsd.org> <20250821060752.001c9599@thor.sb211.local> <8006s3o4-3nns-509q-n89q-oq88r8o09sn8@SerrOFQ.bet> X-Mailer: Apple Mail (2.3826.700.81) X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODIxMDA1MiBTYWx0ZWRfX5EE/tpW23S5X YPoE4xA8ruL7mvpzjhcsn3xGvZBzdHV3MqK5o5WptgbDArq7MW7jkJDlsMsODZ37Lrfl+6wU8dS R4UgkUUj7CjkQJDAmbsEEcgdT7pAm7o+9jTFQ3g36DKUkWL2WbxSa99Fz2KVT6CtX/SSoOXJaFz 0DH/D5LWXb1AJK1ykjR0YsaacXMStgJbzHAEzJM8wVvO/jMtgqom8mhlbbSvlQa6UdZqiVbO5R+ GnJqtXH/bv2B2ZFF26gAWLCxXV2cFHFk8EmRdDErTGQV+4RufUbWDhNDV5h20Q3MY0quzggzk= X-Proofpoint-ORIG-GUID: rewys7FPU3L7_n-hlkrduWJLGIa-le0J X-Proofpoint-GUID: rewys7FPU3L7_n-hlkrduWJLGIa-le0J X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-21_01,2025-08-20_03,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 clxscore=1011 spamscore=0 suspectscore=0 phishscore=0 bulkscore=0 malwarescore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2508210052 X-JNJ: AAAAAAAB4VY9tu5XyYH+G9dE2pUeK1RPuFf0q4W6E4E/5CU9CQDI8FRuSh9NBATaY5Xr4rlNUxcApgT7YIhoNjh2Doy4GaLZiz1W2S1JeZP2Oq6NOlBkgerjMbXlxLJJEMXO3h2q6gBXMKqPw5DcH/IjGvsLS9CQADU6xEk9SmjSRqdPd7kFOVkstlNy2VOxIT7o2y2xq/trNoxDVQl7YW3tf1vBUbYGIEZ0AB2AJnKpmSSBjJyc2RCdlnIBpvdACfNjbQ4N7lUkTTdgf6igDKthYCpfdvs5ioHFKajsJL/uA5tmvCljDOqRjqtankUmCJAgZq/z8O+p7NsCdVZpQ6W0mzHggRpR4WuDmQZ69D24ByFw+aIRISVTczsQR6u689g7KFkWuY9O5p7UgmwcgrZSbY4OYYDcZAf9pgdOQu0YYfenPl9kgz2hi1eZyFq5JAM3uUAotzMKKSuqHBwzZYsoQLQLX4n1vxXqFpruwVA= X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:714, ipnet:57.103.88.0/22, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c6vK34q1Gz3vxV --Apple-Mail=_934F1BC3-226F-4DA7-AD5A-B9B3614F975F Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 21. Aug 2025, at 09:40, Bjoern A. Zeeb wrote: >=20 > On Thu, 21 Aug 2025, A FreeBSD User wrote: >=20 >> Am Tage des Herren Wed, 20 Aug 2025 22:48:38 GMT >> "Simon J. Gerraty" schrieb: >>=20 >>> The branch main has been updated by sjg: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Db44cc1b479fefc8570611309c3f5a696= 6fb26e3b >>>=20 >>> commit b44cc1b479fefc8570611309c3f5a6966fb26e3b >>> Author: Simon J. Gerraty >>> AuthorDate: 2025-08-20 22:45:54 +0000 >>> Commit: Simon J. Gerraty >>> CommitDate: 2025-08-20 22:45:54 +0000 >>>=20 >>> loader: do not try to open directories with TFTP >>>=20 >>> Attempting to mount or even open / with some tftp servers >>> causes a several minute delay in boot. >>>=20 >>> Since opening a directory via TFTP does not make sense, we >>> avoid it. We don't know if using TFTP until after net_open() >>> has been called. >>>=20 >>> Add an is_tftp() accessor to avoid everyone having to include >>> all the net* headers. >>>=20 >>> Sponsored by: Juniper Networks, Inc. >>> Differential Revision: https://reviews.freebsd.org/D51447 >>> --- >>> stand/common/dev_net.c | 9 ++++++++- >>> stand/libsa/mount.c | 5 ++++- >>> stand/libsa/open.c | 8 ++++++++ >>> stand/libsa/stand.h | 3 +++ >>> 4 files changed, 23 insertions(+), 2 deletions(-) >>=20 >> Build of world/kernel fails with the error below: >>=20 >> [...] >>=20 >> --- all_subdir_stand/i386 --- >> --- all_subdir_stand/i386/gptzfsboot --- >> ld: error: undefined symbol: is_tftp >>>>> referenced by open.c >>>>> open.o:(open) in archive = /usr/obj/usr/src/amd64.amd64/stand/libsa32/libsa32.a >>>>> referenced by mount.c >>>>> mount.o:(mount) in archive >>>>> /usr/obj/usr/src/amd64.amd64/stand/libsa32/libsa32.a >> --- all_subdir_usr.sbin --- >> -function -Wno-enum-conversion -Wno-unused-local-typedef = -Wno-address-of-packed-member >> -Qunused-arguments -c /usr/src/contrib/tcpdump/print-ntp.c -o = print-ntp.pieo --- >> all_subdir_stand --- *** [gptzfsboot.out] Error code 1 >=20 > shot in the dark (haven't checked that LOADER_NET_SUPPORT would be = defined for these files): I do not think it is the approach you want to take there, because this = means you would need to build all those variants to build different = components=E2=80=A6 I would think of having weak is_tftp() implementation returning false = for case the dev_net.c is not built or move dev_net.c into libsa. I=E2=80=99= m not quite sure why dev_net.c is outside libsa anyhow;) rgds, toomas >=20 > diff --git stand/libsa/mount.c stand/libsa/mount.c > index c866dc9c7055..4b579c17a782 100644 > --- stand/libsa/mount.c > +++ stand/libsa/mount.c > @@ -109,8 +109,10 @@ mount(const char *dev, const char *path, int = flags __unused, void *data) > continue; > DEBUG_PRINTF(1,("%s: fs=3D%s path=3D%s\n", > __func__, fs->fs_name, path)); > +#ifdef LOADER_NET_SUPPORT > if (is_tftp()) > break; > +#endif > if (fs->fo_mount(dev, path, &data) !=3D 0) > continue; >=20 > diff --git stand/libsa/open.c stand/libsa/open.c > index 91848aca7dbe..0e44dc7b0942 100644 > --- stand/libsa/open.c > +++ stand/libsa/open.c > @@ -138,8 +138,10 @@ open(const char *fname, int mode) > struct fs_ops *fs; > struct open_file *f; > int fd, i, error, besterror; > +#ifdef LOADER_NET_SUPPORT > bool is_dir; > size_t n; > +#endif > const char *file; >=20 > TSENTER(); > @@ -184,14 +186,18 @@ open(const char *fname, int mode) >=20 > /* pass file name to the different filesystem open routines */ > besterror =3D ENOENT; > +#ifdef LOADER_NET_SUPPORT > n =3D strlen(file); > is_dir =3D (n > 0 && file[n - 1] =3D=3D '/'); > +#endif > for (i =3D 0; file_system[i] !=3D NULL; i++) { > fs =3D file_system[i]; > +#ifdef LOADER_NET_SUPPORT > if (is_dir && is_tftp()) { > error =3D EOPNOTSUPP; > goto err; > } > +#endif > error =3D (fs->fo_open)(file, f); > if (error =3D=3D 0) > goto ok; >=20 >=20 > --=20 > Bjoern A. Zeeb = r15:7 --Apple-Mail=_934F1BC3-226F-4DA7-AD5A-B9B3614F975F Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

On 21. Aug 2025, at 09:40, Bjoern A. Zeeb = <bz@FreeBSD.org> wrote:

On Thu, 21 Aug 2025, A = FreeBSD User wrote:

Am Tage des Herren Wed, 20 Aug 2025 22:48:38 = GMT
"Simon J. Gerraty" <sjg@FreeBSD.org> = schrieb:

The branch main has been = updated by sjg:

URL: = https://cgit.FreeBSD.org/src/commit/?id=3Db44cc1b479fefc8570611309c3f5a696= 6fb26e3b

commit = b44cc1b479fefc8570611309c3f5a6966fb26e3b
Author: =     Simon J. Gerraty = <sjg@FreeBSD.org>
AuthorDate: 2025-08-20 22:45:54 = +0000
Commit:     Simon J. Gerraty = <sjg@FreeBSD.org>
CommitDate: 2025-08-20 22:45:54 = +0000

   loader: do not try to open directories = with TFTP

   Attempting to mount or even open / = with some tftp servers
   causes a several minute = delay in boot.

   Since opening a directory via = TFTP does not make sense, we
   avoid it.  We = don't know if using TFTP until after net_open()
   has = been called.

   Add an is_tftp() accessor to avoid = everyone having to include
   all the net* = headers.

   Sponsored by:   Juniper = Networks, Inc.
   Differential Revision: =  https://reviews.freebsd.org/D51447
---
stand/common/dev_net.c = | 9 ++++++++-
stand/libsa/mount.c    | 5 = ++++-
stand/libsa/open.c     | 8 = ++++++++
stand/libsa/stand.h    | 3 +++
4 files = changed, 23 insertions(+), 2 deletions(-)

Build of = world/kernel fails with the error below:

[...]

--- = all_subdir_stand/i386 ---
--- all_subdir_stand/i386/gptzfsboot = ---
ld: error: undefined symbol: is_tftp
referenced by = open.c
          &nbs= p;  open.o:(open) in archive = /usr/obj/usr/src/amd64.amd64/stand/libsa32/libsa32.a
referenced by = mount.c
          &nb= sp;  mount.o:(mount) in = archive
/usr/obj/usr/src/amd64.amd64/stand/libsa32/libsa32.a
--- all_subdir_usr.sbin ---
-function = -Wno-enum-conversion -Wno-unused-local-typedef = -Wno-address-of-packed-member
-Qunused-arguments =      -c /usr/src/contrib/tcpdump/print-ntp.c -o = print-ntp.pieo ---
all_subdir_stand --- *** [gptzfsboot.out] Error = code 1

shot in = the dark (haven't checked that LOADER_NET_SUPPORT would be defined for = these files):


I do not = think it is the approach you want to take there, because this means you = would need to build all those variants to build different = components=E2=80=A6

I would think of having = weak is_tftp() implementation returning false for case the dev_net.c is not built or move dev_net.c into libsa. I=E2=80=99m not quite sure why = dev_net.c is outside libsa = anyhow;)

rgds,
toomas

diff = --git stand/libsa/mount.c stand/libsa/mount.c
index = c866dc9c7055..4b579c17a782 100644
--- = stand/libsa/mount.c
+++ = stand/libsa/mount.c
@@ = -109,8 +109,10 @@ mount(const char *dev, const char *path, int flags = __unused, void *data)
          &= nbsp;           &nb= sp;continue;
          &= nbsp;    DEBUG_PRINTF(1,("%s: fs=3D%s = path=3D%s\n",
          &= nbsp;           &nb= sp;__func__, fs->fs_name, path));
+#ifdef = LOADER_NET_SUPPORT
          &= nbsp;    if (is_tftp())
          &= nbsp;           &nb= sp;break;
+#endif
          &= nbsp;    if (fs->fo_mount(dev, path, &data) = !=3D 0)
          &= nbsp;           &nb= sp;continue;

diff --git = stand/libsa/open.c stand/libsa/open.c
index = 91848aca7dbe..0e44dc7b0942 100644
--- = stand/libsa/open.c
+++ = stand/libsa/open.c
@@ = -138,8 +138,10 @@ open(const char *fname, int mode)
       struct fs_ops = *fs;
       struct open_file = *f;
       int fd, i, error, = besterror;
+#ifdef = LOADER_NET_SUPPORT
       bool = is_dir;
       size_t = n;
+#endif
       const char = *file;

       TSENTER();@@ -184,14 +186,18 @@ = open(const char *fname, int mode)

       /* pass file name = to the different filesystem open routines */
       besterror =3D = ENOENT;
+#ifdef = LOADER_NET_SUPPORT
       n =3D = strlen(file);
       is_dir =3D (n = > 0 && file[n - 1] =3D=3D '/');
+#endif
       for (i =3D 0; = file_system[i] !=3D NULL; i++) {
          &= nbsp;    fs =3D file_system[i];
+#ifdef = LOADER_NET_SUPPORT
          &= nbsp;    if (is_dir && is_tftp()) = {
          &= nbsp;           &nb= sp;error =3D EOPNOTSUPP;
          &= nbsp;           &nb= sp;goto err;
          &= nbsp;    }
+#endif
          &= nbsp;    error =3D (fs->fo_open)(file, = f);
          &= nbsp;    if (error =3D=3D 0)
          &= nbsp;           &nb= sp;goto ok;


-- 
Bjoern A. Zeeb =             &n= bsp;           &nbs= p;            =             &n= bsp;  r15:7

= --Apple-Mail=_934F1BC3-226F-4DA7-AD5A-B9B3614F975F-- From nobody Thu Aug 21 07:02:50 2025 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 4c6vR22sDRz65v2Q; Thu, 21 Aug 2025 07:02:54 +0000 (UTC) (envelope-from bz@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6vR22BCtz3wX7; Thu, 21 Aug 2025 07:02:54 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755759774; 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=HFCQLQGsp6XUpil3Ak+XaWYoWBy9XDYyozBMcBF96Ro=; b=TCcRLSuyu4f8g/LqZjtTI0urDuj79ZBhCLDZ8TzP+Pe8/Ke4oYeNcIHZ4+vBHkv0fC8JlR h5HIbuzHpyAZYzbvLD0zQPZ9vDju737QpUjpqajeDUe6VbKss3LGYHHMwe/rslJr8fIz5M QdVWlj0jNrzlxuDolUyZ7KLoEDYe4fvW2wogxk/WSNhKROUHgZVloPjFM0S5zMvFTGKnsC bizjCPgoig+qECdbzFC+tWlPgnhGPKRiwcpkazYVPuiI/6GHZcO5nw7SdUJZ/yrAod+tye ti1jk9jLUpCDZD09JEL6W7IiZtp9piklLAceXLngPqU9/9zZr3XXfan0mhQrDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755759774; 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=HFCQLQGsp6XUpil3Ak+XaWYoWBy9XDYyozBMcBF96Ro=; b=jpZ8QPH0BqVRQjC0vGUQscy+34yd2g7V+mZPbeTz3Q+7Q+yfrVGINmID1KqMWTIbknn/L9 M+gc/RsFJma4Rdup5mqfDL7XD1JL7LnqvOLewMNEGqmVS6+JEkgkB1zgtqPdd1+o03aJ5j m5fpMe8jq9xv7QnyJoAs10ULTx2q/CC0PeEIa3ap5yT5lUcPv6EjBwX7Q9wfd+kIfX/kaH jBgF4BnjoAYL2riaG2dyLNj+xRcD18pFrDl7tA6SDnt2V1Aq62gBB5AZqSDXNVX0HSEL9R l5vOZYsEhr24djCmw+gBuZKJy/NpSYh4kzDYarqvL7LAoPldSzGcEaZWDB3TTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755759774; a=rsa-sha256; cv=none; b=qTbMrdNDbm40onU8DdzdtPn7YO4fTExDbhEwcXB053TI3Lgyxj3SjmnGJtTULMDU1A694m wKbAWjQ1RAzYFLG65wTrZKnp/ppsZRcnOFjiXjenBooxccD8FiDE9AtJK5RDBidfnAwDiM cEqFMkSoOsABIwDWVcjH3wZcWpDSaaDR/oLeD+I6OKCZIE5AcAC/kngJT4g8NMzP2EmaXA I6w21VkRAe332SKl1r/Ti1irFTaiAdmE6StmeNwRJdh8+zgOTvEYCLxE04JdSX0dS2BP3Q cqZBxrcMlu0wCrlQhELwmxhAJ4AUItYxSf+RZMQJ6TVrfZZvPKakmtLtVKCggg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E6" (verified OK)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c6vR20BvVz18Yb; Thu, 21 Aug 2025 07:02:54 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id 0741EA64805; Thu, 21 Aug 2025 07:02:44 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 721B32D029E1; Thu, 21 Aug 2025 07:02:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id 1LwxCYzQK79Z; Thu, 21 Aug 2025 07:02:50 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:a66b:b6ff:fe40:39a9]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 8ADBA2D029D8; Thu, 21 Aug 2025 07:02:50 +0000 (UTC) Date: Thu, 21 Aug 2025 07:02:50 +0000 (UTC) From: "Bjoern A. Zeeb" To: Toomas Soome cc: A FreeBSD User , "Simon J. Gerraty" , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: b44cc1b479fe - main - loader: do not try to open directories with TFTP In-Reply-To: <9EEDE524-1ED3-4F41-9584-460DCBF61D81@me.com> Message-ID: References: <202508202248.57KMmcTO016280@gitrepo.freebsd.org> <20250821060752.001c9599@thor.sb211.local> <8006s3o4-3nns-509q-n89q-oq88r8o09sn8@SerrOFQ.bet> <9EEDE524-1ED3-4F41-9584-460DCBF61D81@me.com> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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: multipart/mixed; boundary="1098556516-1251459429-1755759770=:4606" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1098556516-1251459429-1755759770=:4606 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Thu, 21 Aug 2025, Toomas Soome wrote: >> shot in the dark (haven't checked that LOADER_NET_SUPPORT would be defined for these files): > > > I do not think it is the approach you want to take there, because this means you would need to build all those variants to build different components… > > I would think of having weak is_tftp() implementation returning false for case the dev_net.c is not built or move dev_net.c into libsa. I’m not quite sure why dev_net.c is outside libsa anyhow;) Even just moving is_tftp into stand.h would work. -- Bjoern A. Zeeb r15:7 --1098556516-1251459429-1755759770=:4606-- From nobody Thu Aug 21 07:46:23 2025 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 4c6wPC1mCMz65xWL; Thu, 21 Aug 2025 07:46:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6wPC1Cj0z42ly; Thu, 21 Aug 2025 07:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755762383; 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=ajwztm/qe9bwljpdeoo49OdFWZChpo6z6D3S7LOmR14=; b=DKmJrbPmyemDT33t0cboRNzVlGvfZIdcaVuSVk/bM27OWnB34hVXbNG17pezNGODOHXXLc JAUOIwF82vMcoUCdY99Dca8LDiKJLf/wRd4O2Jz3Qm8yqhrnfwivK/HuRHpGZ1ui/YzfL5 qRigIVPw/06rgkmL1oTovZrHL3kj4yqnWrCCfuWXwY1Av0qsGbhAwv7pfKQO8ZL+pX5LI4 Pdo628qUfwch1xqeJfnqZAHMNQ75qMgVpChDLgQAtWDogOSOJCNzmHbTEx7k6m/Jpb5Xzo JZmOfQqdTqJaEOr0wZysvPZIa2IOiIdLhZPKA23Yhb+mXAExKKa4oi2lJdE+Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755762383; 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=ajwztm/qe9bwljpdeoo49OdFWZChpo6z6D3S7LOmR14=; b=j0oOS1xsaXM4X0tEUQzMk0JIhEnnnWOMl1kifO1vL6ZvboMy9tFNhmQZAgLOImrXADyJu6 gkyYy0HhirZ05TxSO2h4JQfflxnfZlEk8rTUeGh78kHNPlyikXTPH/5MZenuaQ3QCth5OB mmmFlB9OqvuVHBA4GtpoZUahoZJFItm5KwtN6oJdiCzR45/hrdQ/J1rt0jPN7PAZ/OO3nE EFJR7L8KX/NY5+xtBTtRrIYEro6YZpvn85lhKWVOvfuTvEAI9ghLzyCC26pUEte4U8+GRT Sx2d6+zSJ5bTkC76srFgiLyVVvASvHTYswxswz5GXIkMN7edfmmYd7UAr6izTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755762383; a=rsa-sha256; cv=none; b=KWDQkfD+RP4iVpv9Jd0OyMnEN3FF8g7cC0ZXRRUhqyZqXbJ/XFfemb93+rXrISUwKFsS1T amAc2Q0aIDQluUDqy1oPyZ81snZ2DpoGJLCimFhSf152KG0iIhh2od/7RbJzbls0B7D/Am JEFGQloHRTX9Mrdq/Eq+bIQmitHGSqAObcpGMFNn+M5AyHTzdb/wK72x9tFlDLElJIYc9U XzzCKObI1YnMY+XJ+tnxaXBsMM+XW1Xosrrin2pnObgwtv8QZyBADveoae5DTWICbWZenU vPuv/LdRPvwaDBjAqNv0bmT7hwqkNe+oYU4OOB0WpAueDy2U4KaefflIE4772w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6wPC0ncDzrB7; Thu, 21 Aug 2025 07:46:23 +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 57L7kNei034719; Thu, 21 Aug 2025 07:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57L7kNG8034716; Thu, 21 Aug 2025 07:46:23 GMT (envelope-from git) Date: Thu, 21 Aug 2025 07:46:23 GMT Message-Id: <202508210746.57L7kNG8034716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d94b403b590f - stable/14 - nfsport.h: minor comments cleanup 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d94b403b590f381ac924078b80c5e04ee62dd79c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d94b403b590f381ac924078b80c5e04ee62dd79c commit d94b403b590f381ac924078b80c5e04ee62dd79c Author: Konstantin Belousov AuthorDate: 2025-08-18 02:49:24 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-21 07:46:01 +0000 nfsport.h: minor comments cleanup (cherry picked from commit c04fe26aa2f7d4c10070fc5cdbe047102f83c1be) --- sys/fs/nfs/nfsport.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h index 0b16ba9b85a8..557ed0a5dfc9 100644 --- a/sys/fs/nfs/nfsport.h +++ b/sys/fs/nfs/nfsport.h @@ -901,15 +901,6 @@ int nfsmsleep(void *, void *, int, const char *, struct timespec *); #define NFSBCMP(s, d, l) bcmp((s), (d), (l)) #define NFSBZERO(s, l) bzero((s), (l)) -/* - * Some queue.h files don't have these dfined in them. - */ -#ifndef LIST_END -#define LIST_END(head) NULL -#define SLIST_END(head) NULL -#define TAILQ_END(head) NULL -#endif - /* * This must be defined to be a global variable that increments once * per second, but never stops or goes backwards, even when a "date" @@ -1030,9 +1021,6 @@ void ncl_copy_vattr(struct vattr *dst, struct vattr *src); #define NFSINCRGLOBAL(a) ((a)++) #define NFSDECRGLOBAL(a) ((a)--) -/* - * Assorted funky stuff to make things work under Darwin8. - */ /* * These macros checks for a field in vattr being set. */ From nobody Thu Aug 21 08:44:00 2025 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 4c6xgh3sXcz64XKg; Thu, 21 Aug 2025 08:44:00 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6xgh1jjhz3D4Y; Thu, 21 Aug 2025 08:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755765840; 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=7dYAWKzc2ENwd1USo/Mw7ySXsi5nvMG7eiNFcmM9r2o=; b=WPqggf7MEIrOqxCMvLF2L2Pj7D95OmGp8rlf5++f1T5r6sH0o9HtSb4fuqsQY7fGNxqmJ8 /RDfwT3AIQahWLtGsArNIpfvYzplxAKpcYE+xIdfDVrWbWA+tcEkWvrYztHqLIqCPwdnk3 zahkZBjalQUmytDSD7u4K8NDksQ1UbhcDWVmiahIjZnuukNVKrpZU1LKUi3ieUM1+uT3u9 6NEWv5utEcHClmo5hlnsqtMHen47PgPnK1BlOvaldSn028onttXv7DFMeti+JZ81ANU1AF Sw3xGl+WVwqfDghQot3S3zwCvzursMvp6Or3QiTa9wNRt7oYRRv+BDkEggfzkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755765840; 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=7dYAWKzc2ENwd1USo/Mw7ySXsi5nvMG7eiNFcmM9r2o=; b=SRsqGdaj/SWBvuJwtqz00OJkdTXM8PxyhNbZVycy0g9zsLc7lep3KRb4uF0crhEOexjTy4 rdqqQi02YqwHTupC7N8+TtAvmOo6PrHIM/qaV1bB3HZIz+hSVL/x+qffb6TEJxRhIvFiYl YDxV9nLWH7D3/iyXJXAh1bsgaqQHspzIffmmyk+ZDUkf/iAyV4TYJlD+QT3eoUF508NKJR U6h/Or/zaMqMlj7aDxibMkordgyYsR0UmM/DWPsVEHO0UivMC4q+YGw2hS0wUnT6k/wKAd JDtVAKN4vfyzbJX2+Op6HhVel96eugSHox0pz+oRdUJewitzbasXIazPTHfHSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755765840; a=rsa-sha256; cv=none; b=d9J3nFgWXeAa2Kz/P+ASzKzw3fPpNBJrtDF+cLKuOIt1EkD01HUUBeOzc/N/r/WRfmof9q nNUnqMRSWHHk1X9Mioc+vMpJ/A/KpsG3iNJl3xAluzuWmYhNNrscaLhM18NgncyvEPcqZ5 HhUN5POuKrsg49l09rmqMIWl43enO434WEaAuh04SBu4wNVOeOqd6VbbrumaHNO42/aVs2 m81bMRDiMKts+aIpaPt4TR+9svAeT0D48YB7RGC2XRrJn5G+HKsGtaOwBQmpzdGBnxL23f sxtBgoqDL1q5r0RgmIcUJIuGd/EEXAx2TXXmF9yF+c1H3JrOb/nsQciHpmRzww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6xgh19B9zsLC; Thu, 21 Aug 2025 08:44:00 +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 57L8i0Zw050233; Thu, 21 Aug 2025 08:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57L8i0Bq050230; Thu, 21 Aug 2025 08:44:00 GMT (envelope-from git) Date: Thu, 21 Aug 2025 08:44:00 GMT Message-Id: <202508210844.57L8i0Bq050230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 4740d47238cf - main - virtio/mmio: Remove the unused virtio_mmio_if.m 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4740d47238cf2d707aae8f060fa37ac046bd06dc Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4740d47238cf2d707aae8f060fa37ac046bd06dc commit 4740d47238cf2d707aae8f060fa37ac046bd06dc Author: Andrew Turner AuthorDate: 2025-08-19 03:53:52 +0000 Commit: Andrew Turner CommitDate: 2025-08-21 08:37:53 +0000 virtio/mmio: Remove the unused virtio_mmio_if.m The only driver I know that implemented this interface was removed 7 months ago. Remove the interface and platform from the softc. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51992 --- sys/conf/files | 1 - sys/dev/virtio/mmio/virtio_mmio.c | 48 ++--------------- sys/dev/virtio/mmio/virtio_mmio.h | 1 - sys/dev/virtio/mmio/virtio_mmio_fdt.c | 47 ----------------- sys/dev/virtio/mmio/virtio_mmio_if.m | 99 ----------------------------------- 5 files changed, 3 insertions(+), 193 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 8bb14bd3d953..d89813c70355 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3451,7 +3451,6 @@ dev/virtio/mmio/virtio_mmio.c optional virtio_mmio dev/virtio/mmio/virtio_mmio_acpi.c optional virtio_mmio acpi dev/virtio/mmio/virtio_mmio_cmdline.c optional virtio_mmio dev/virtio/mmio/virtio_mmio_fdt.c optional virtio_mmio fdt -dev/virtio/mmio/virtio_mmio_if.m optional virtio_mmio dev/virtio/network/if_vtnet.c optional vtnet dev/virtio/balloon/virtio_balloon.c optional virtio_balloon dev/virtio/block/virtio_blk.c optional virtio_blk diff --git a/sys/dev/virtio/mmio/virtio_mmio.c b/sys/dev/virtio/mmio/virtio_mmio.c index 5a81c8a24779..fe531fced998 100644 --- a/sys/dev/virtio/mmio/virtio_mmio.c +++ b/sys/dev/virtio/mmio/virtio_mmio.c @@ -53,7 +53,6 @@ #include #include -#include "virtio_mmio_if.h" #include "virtio_bus_if.h" #include "virtio_if.h" @@ -79,7 +78,6 @@ static int vtmmio_alloc_virtqueues(device_t, int, struct vq_alloc_info *); static int vtmmio_setup_intr(device_t, enum intr_type); static void vtmmio_stop(device_t); -static void vtmmio_poll(device_t); static int vtmmio_reinit(device_t, uint64_t); static void vtmmio_reinit_complete(device_t); static void vtmmio_notify_virtqueue(device_t, uint16_t, bus_size_t); @@ -104,29 +102,11 @@ static void vtmmio_vq_intr(void *); * I/O port read/write wrappers. */ #define vtmmio_write_config_1(sc, o, v) \ -do { \ - if (sc->platform != NULL) \ - VIRTIO_MMIO_PREWRITE(sc->platform, (o), (v)); \ - bus_write_1((sc)->res[0], (o), (v)); \ - if (sc->platform != NULL) \ - VIRTIO_MMIO_NOTE(sc->platform, (o), (v)); \ -} while (0) + bus_write_1((sc)->res[0], (o), (v)) #define vtmmio_write_config_2(sc, o, v) \ -do { \ - if (sc->platform != NULL) \ - VIRTIO_MMIO_PREWRITE(sc->platform, (o), (v)); \ - bus_write_2((sc)->res[0], (o), (v)); \ - if (sc->platform != NULL) \ - VIRTIO_MMIO_NOTE(sc->platform, (o), (v)); \ -} while (0) + bus_write_2((sc)->res[0], (o), (v)) #define vtmmio_write_config_4(sc, o, v) \ -do { \ - if (sc->platform != NULL) \ - VIRTIO_MMIO_PREWRITE(sc->platform, (o), (v)); \ - bus_write_4((sc)->res[0], (o), (v)); \ - if (sc->platform != NULL) \ - VIRTIO_MMIO_NOTE(sc->platform, (o), (v)); \ -} while (0) + bus_write_4((sc)->res[0], (o), (v)) #define vtmmio_read_config_1(sc, o) \ bus_read_1((sc)->res[0], (o)) @@ -157,7 +137,6 @@ static device_method_t vtmmio_methods[] = { DEVMETHOD(virtio_bus_alloc_virtqueues, vtmmio_alloc_virtqueues), DEVMETHOD(virtio_bus_setup_intr, vtmmio_setup_intr), DEVMETHOD(virtio_bus_stop, vtmmio_stop), - DEVMETHOD(virtio_bus_poll, vtmmio_poll), DEVMETHOD(virtio_bus_reinit, vtmmio_reinit), DEVMETHOD(virtio_bus_reinit_complete, vtmmio_reinit_complete), DEVMETHOD(virtio_bus_notify_vq, vtmmio_notify_virtqueue), @@ -220,19 +199,9 @@ vtmmio_setup_intr(device_t dev, enum intr_type type) { struct vtmmio_softc *sc; int rid; - int err; sc = device_get_softc(dev); - if (sc->platform != NULL) { - err = VIRTIO_MMIO_SETUP_INTR(sc->platform, sc->dev, - vtmmio_vq_intr, sc); - if (err == 0) { - /* Okay we have backend-specific interrupts */ - return (0); - } - } - rid = 0; sc->res[1] = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); @@ -597,17 +566,6 @@ vtmmio_stop(device_t dev) vtmmio_reset(device_get_softc(dev)); } -static void -vtmmio_poll(device_t dev) -{ - struct vtmmio_softc *sc; - - sc = device_get_softc(dev); - - if (sc->platform != NULL) - VIRTIO_MMIO_POLL(sc->platform); -} - static int vtmmio_reinit(device_t dev, uint64_t features) { diff --git a/sys/dev/virtio/mmio/virtio_mmio.h b/sys/dev/virtio/mmio/virtio_mmio.h index ac6a96c1c7fe..edcbf0519acc 100644 --- a/sys/dev/virtio/mmio/virtio_mmio.h +++ b/sys/dev/virtio/mmio/virtio_mmio.h @@ -37,7 +37,6 @@ struct vtmmio_virtqueue; struct vtmmio_softc { device_t dev; - device_t platform; struct resource *res[2]; uint64_t vtmmio_features; diff --git a/sys/dev/virtio/mmio/virtio_mmio_fdt.c b/sys/dev/virtio/mmio/virtio_mmio_fdt.c index 7fba8aad8db8..bb9ea8efbaeb 100644 --- a/sys/dev/virtio/mmio/virtio_mmio_fdt.c +++ b/sys/dev/virtio/mmio/virtio_mmio_fdt.c @@ -63,12 +63,10 @@ #include static int vtmmio_fdt_probe(device_t); -static int vtmmio_fdt_attach(device_t); static device_method_t vtmmio_fdt_methods[] = { /* Device interface. */ DEVMETHOD(device_probe, vtmmio_fdt_probe), - DEVMETHOD(device_attach, vtmmio_fdt_attach), DEVMETHOD_END }; @@ -93,48 +91,3 @@ vtmmio_fdt_probe(device_t dev) return (vtmmio_probe(dev)); } - -static int -vtmmio_setup_platform(device_t dev, struct vtmmio_softc *sc) -{ - phandle_t platform_node; - struct fdt_ic *ic; - phandle_t xref; - phandle_t node; - - sc->platform = NULL; - - if ((node = ofw_bus_get_node(dev)) == -1) - return (ENXIO); - - if (OF_searchencprop(node, "platform", &xref, - sizeof(xref)) == -1) { - return (ENXIO); - } - - platform_node = OF_node_from_xref(xref); - - SLIST_FOREACH(ic, &fdt_ic_list_head, fdt_ics) { - if (ic->iph == platform_node) { - sc->platform = ic->dev; - break; - } - } - - if (sc->platform == NULL) { - /* No platform-specific device. Ignore it. */ - } - - return (0); -} - -static int -vtmmio_fdt_attach(device_t dev) -{ - struct vtmmio_softc *sc; - - sc = device_get_softc(dev); - vtmmio_setup_platform(dev, sc); - - return (vtmmio_attach(dev)); -} diff --git a/sys/dev/virtio/mmio/virtio_mmio_if.m b/sys/dev/virtio/mmio/virtio_mmio_if.m deleted file mode 100644 index baebbd9a0b1c..000000000000 --- a/sys/dev/virtio/mmio/virtio_mmio_if.m +++ /dev/null @@ -1,99 +0,0 @@ -#- -# Copyright (c) 2014 Ruslan Bukin -# All rights reserved. -# -# This software was developed by SRI International and the University of -# Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) -# ("CTSRD"), as part of the DARPA CRASH research programme. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# - -#include - -# -# This is optional interface to virtio mmio backend. -# Useful when backend is implemented not by the hardware but software, e.g. -# by using another cpu core. -# - -INTERFACE virtio_mmio; - -CODE { - static int - virtio_mmio_prewrite(device_t dev, size_t offset, int val) - { - - return (1); - } - - static int - virtio_mmio_note(device_t dev, size_t offset, int val) - { - - return (1); - } - - static int - virtio_mmio_setup_intr(device_t dev, device_t mmio_dev, - void *handler, void *ih_user) - { - - return (1); - } -}; - -# -# Inform backend we are going to write data at offset. -# -METHOD int prewrite { - device_t dev; - size_t offset; - int val; -} DEFAULT virtio_mmio_prewrite; - -# -# Inform backend we have data wrotten to offset. -# -METHOD int note { - device_t dev; - size_t offset; - int val; -} DEFAULT virtio_mmio_note; - -# -# Inform backend we are going to poll virtqueue. -# -METHOD int poll { - device_t dev; -}; - -# -# Setup backend-specific interrupts. -# -METHOD int setup_intr { - device_t dev; - device_t mmio_dev; - void *handler; - void *ih_user; -} DEFAULT virtio_mmio_setup_intr; From nobody Thu Aug 21 08:44:01 2025 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 4c6xgj3WFHz64XDy; Thu, 21 Aug 2025 08:44:01 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6xgj2nkwz3DRc; Thu, 21 Aug 2025 08:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755765841; 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=qNBipzvbuBa/Z7mDy4fd5c+6cfL7zF76OPAGFkOstDw=; b=lvlBoEWID98TopXHDlv6sOd/3/cl1wrX0j3ym2yyKb1TL1CNGaPI83jBejBUbjrPoKEvTw TtAWDIu1sFUxOuQpNf+rP85XmRXX3oIm8m1rtyw4LTppHC4/z4TP5ZmjDr/CHG842gEeX2 WvWsCKeTlCecN75csJpiDLo3UUBktuRwGlwt6vCVXzOTwrfg+Ym1dSvNLVWvFm1gdYRQAS iOamg3032SKGLPMFYSODYpInp8CgSF3lqt93ZLhQh4DC0IJyzNfTsm8hXYNKM8vxU8PXc3 Y/IgCzSVYJtsX95R0hkHT72GrGSj+AiNAkNX8NzeconeMbiK4Y40M+T6bTuJwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755765841; 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=qNBipzvbuBa/Z7mDy4fd5c+6cfL7zF76OPAGFkOstDw=; b=U+O42BWU/zKM5ErNHPFO9cktIAY1Ot+noRnHGysUPKfhOAJ5AwYIAMQwYkZ/gFJARERsQC OFSnlIKGSeTCXUAmsEzXyPLDcrdelUgD6UEVIyh2ikcaInQbXhstkyhSEzlaeXwRXq+kNH TJM4Ge6aMDGGzhvMcrV4QtDSICkzjJaBgecTOhUQc9Nevs2FbenEZ8TRGJApee/QTLdemc fVxVGEriPbfYJbK3LNPpjcJwpcRkraULkvImvV8p8V+Vjz31wvYZuCpaywEgcZhqTr4B33 4wm72O5jEy78SaUir/z2YTk/ZgsyWGshOrO0nTh7GI79DKNgT2/DkD5kTs6yUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755765841; a=rsa-sha256; cv=none; b=ja2jQGNelmteCL5dSrkVeIjNmB463GHqzi9y7ovW4JpFKYTEY8zwxkL6dQCx8xyjiLjaKa aBNKzjU1M8V4W1Et3zBc/HKAYdv9udBHMYZWEFv7ZTRq00LzhM5qJubKsM0md9badykX1Z YQyyFGv0QSSogbrEJucc8Xy1bEydQO/V9b/JvUV1bl2BZO07rikEMV02Y2onXdsy4vMJn/ BngAZxpxYEu0/iceA3tzD87aX7pTRFsrLWdln9mmUnjMtauGyrDLCDLKDDu4vkG282UkWD bmD9l/5l9zuj70pSKNETmEvrVk4QnFwSS1xaEd6P3znJBgdv2IZozS71krRmsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6xgj2N28zsZ3; Thu, 21 Aug 2025 08:44:01 +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 57L8i1SH050279; Thu, 21 Aug 2025 08:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57L8i1H8050276; Thu, 21 Aug 2025 08:44:01 GMT (envelope-from git) Date: Thu, 21 Aug 2025 08:44:01 GMT Message-Id: <202508210844.57L8i1H8050276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: ad17789a8569 - main - virtio: Remove the unused poll method 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad17789a8569c6712c6d789232df2703a21088a4 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ad17789a8569c6712c6d789232df2703a21088a4 commit ad17789a8569c6712c6d789232df2703a21088a4 Author: Andrew Turner AuthorDate: 2025-08-20 09:14:36 +0000 Commit: Andrew Turner CommitDate: 2025-08-21 08:37:53 +0000 virtio: Remove the unused poll method This was used by virtio_mmio to poll via another driver. This support has been removed so we can remove it from here too. Reviewed by: br Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51993 --- sys/dev/virtio/virtio_bus_if.m | 4 ---- sys/dev/virtio/virtqueue.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/sys/dev/virtio/virtio_bus_if.m b/sys/dev/virtio/virtio_bus_if.m index 57ae90bdc917..4181b641faad 100644 --- a/sys/dev/virtio/virtio_bus_if.m +++ b/sys/dev/virtio/virtio_bus_if.m @@ -109,7 +109,3 @@ METHOD void write_device_config { int len; }; -METHOD void poll { - device_t dev; -}; - diff --git a/sys/dev/virtio/virtqueue.c b/sys/dev/virtio/virtqueue.c index 8cc3326dc08e..cc7a233d60ee 100644 --- a/sys/dev/virtio/virtqueue.c +++ b/sys/dev/virtio/virtqueue.c @@ -605,10 +605,8 @@ virtqueue_poll(struct virtqueue *vq, uint32_t *len) { void *cookie; - VIRTIO_BUS_POLL(vq->vq_dev); while ((cookie = virtqueue_dequeue(vq, len)) == NULL) { cpu_spinwait(); - VIRTIO_BUS_POLL(vq->vq_dev); } return (cookie); From nobody Thu Aug 21 08:44:02 2025 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 4c6xgl2x0Kz64XKl; Thu, 21 Aug 2025 08:44:03 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6xgk4qVgz3DV9; Thu, 21 Aug 2025 08:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755765842; 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=a4f/VN4yQfC9591xIieotvwYvmZAUW0MMKpn8VUP4j4=; b=jocZkFwGq+GtvNAIOhy8pKHdAtJjdGlB8WFYJI8Q2so7SI3n7T3rI/FgunWdYYRMJIsfXB 7L/Pi0qLlQ54hrx9jwQnya0qp6HDUFIolVWLGfhUQQcnI6GEiiLcbPbBu7PPXXCWL/VwK0 wIOIJRhJH5ds/+DbjQXq3R0D45WAJ5qIFMaOYeYiBXV6KEmZtp2Q0mdml5TpaGTudDB+nt ky8SU6NYoesB+bApsLYM46QzFAj5m2RB3/EsPYZMQ3JeW82q3yk7wjBYTbC6Xy0REv6wiA G23fsjK4+BjUcHssjKpkHprdyUiZGoEuyjUEmzY9EV+ESsHMIa2fHeFuiwkx9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755765842; 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=a4f/VN4yQfC9591xIieotvwYvmZAUW0MMKpn8VUP4j4=; b=cYc5YhwD2+XIzOCT9vrkRcoP8V34k2IbGQQqH/h8GRKQ7PiHYzN+XK6/uR/onj6NJi31Aq m0dKoBOslyPWvryv+t7rteSVf5W3Xq5Qzhwbwt/12ings+vHM09al8jkv0cNibHOLj84ZW H2b2+5ZnB11AMasYI4iUu7oSZkXFGcSU5R8I1SvmA8WqkEvFd95SAO116cPLPR6328FCZu LNZn3RK/rYKhyv+/cN6StQGoEAgS+w+o1Ure4SxOZeGLE+J0xxPCywGWgmZT0+LB0OEIh2 v5W8z5dAkuI/612113cFNsyxNDrWrVnU+TdyE/KnwuG7s0Teo6IVWdXW2gCEDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755765842; a=rsa-sha256; cv=none; b=jViW8POWeecOYSDUwgdFu/r07YgDPXoyNOqoT18hncHdi2vABo4EgKP0Qd3ZN+X/Oqdh0O tlUDTmataa/+86oI3zd0etUVV52nCDZi/UTDkFyydN2ggKYcBcxKMTu45/+51AtEEezJ3e 16DKfad5h9OtqwJg603Cg+sRR8dTbqlS4xTbmu2la+DY8l/26piym5fHKSlTxhva7thKWg 36G3ZCUpCq8vZ5g1gLS7jNl9BCtqirJncJNwDzctJZOPPy7thy7IUumk/TY5iOwicoSVzg O/X51Sc2AEIp4CocB6yb4XjzMDckJid/FZ4lwxRm2J2o2PTZlckoODFri1eOoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6xgk36X9zsZ4; Thu, 21 Aug 2025 08:44:02 +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 57L8i2K5050313; Thu, 21 Aug 2025 08:44:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57L8i28A050310; Thu, 21 Aug 2025 08:44:02 GMT (envelope-from git) Date: Thu, 21 Aug 2025 08:44:02 GMT Message-Id: <202508210844.57L8i28A050310@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: d118ccd74598 - main - dev/fdt: Remove fdt_ic_list 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d118ccd745986e01289245c805036bbe436e7a25 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d118ccd745986e01289245c805036bbe436e7a25 commit d118ccd745986e01289245c805036bbe436e7a25 Author: Andrew Turner AuthorDate: 2025-08-20 09:14:50 +0000 Commit: Andrew Turner CommitDate: 2025-08-21 08:37:53 +0000 dev/fdt: Remove fdt_ic_list It was last used in virtio_mmio. As it appears to have been used for cross referencing devices and the existing xref support should be used in new code it can be removed. Reviewed by: br Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51994 --- sys/dev/fdt/fdt_common.c | 2 -- sys/dev/fdt/fdt_common.h | 7 ------- 2 files changed, 9 deletions(-) diff --git a/sys/dev/fdt/fdt_common.c b/sys/dev/fdt/fdt_common.c index 1fea4c6f1392..f43551c6310e 100644 --- a/sys/dev/fdt/fdt_common.c +++ b/sys/dev/fdt/fdt_common.c @@ -62,8 +62,6 @@ SYSCTL_NODE(_hw, OID_AUTO, fdt, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Flattened Device Tree"); -struct fdt_ic_list fdt_ic_list_head = SLIST_HEAD_INITIALIZER(fdt_ic_list_head); - static int fdt_get_range_by_busaddr(phandle_t node, u_long addr, u_long *base, u_long *size) diff --git a/sys/dev/fdt/fdt_common.h b/sys/dev/fdt/fdt_common.h index ece54290a6ad..f597233f9771 100644 --- a/sys/dev/fdt/fdt_common.h +++ b/sys/dev/fdt/fdt_common.h @@ -59,13 +59,6 @@ struct fdt_fixup_entry { extern struct fdt_fixup_entry fdt_fixup_table[]; #endif -extern SLIST_HEAD(fdt_ic_list, fdt_ic) fdt_ic_list_head; -struct fdt_ic { - SLIST_ENTRY(fdt_ic) fdt_ics; - ihandle_t iph; - device_t dev; -}; - #if defined(FDT_DTB_STATIC) extern u_char fdt_static_dtb; #endif From nobody Thu Aug 21 10:43:21 2025 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 4c70KP3Q0bz64ghR; Thu, 21 Aug 2025 10:43:21 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c70KP1tx1z3SWl; Thu, 21 Aug 2025 10:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755773001; 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=KvpSbqqllL11bJaSYrmkgPmTP8iArPAfdJ/jCwluhSE=; b=ddNCftN/5i440xmIO6KnTXwJHIE3ip2v2YXx7iudrZu0gMYiMiQiwVVG4LeQpsu5lCxhZ7 XIwkIFuR7OmjgNCFkQJn0BUPAcDsvUQb0bmlJaUMwoF8GVajYY7uRvxOld53Jcur6FJaFu XnynTY2mBxmVtxzDYUKt6g7Vux5dg3DDveRabC7t1dMZCOc87N3rQWu6iVs9lVZJ5mOqIi ze1LVetMDG48i3BTvDRKoDxu1nG2sGt38UEHbpGZO58EH3LwGytAQsPH5af5GXC8KQuDBj k3gA+TH4ozPfwvR7xugbciYOdzDWwIruT91C5kTVkAJmv0eKy4gmfZ8YsSZfMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755773001; 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=KvpSbqqllL11bJaSYrmkgPmTP8iArPAfdJ/jCwluhSE=; b=c66hjMVlrH2yfRYRn3oxf+0wzLFMEqMyXQH+nZn0iRydGY+dXPMlHucw9jpULnNr0O4OA2 +OvBZyVUoY5rCX/QOxb1vv5wawuC7PUyKukQj7GqL/VL9x0L3JcKdRLeWo7Tq76JB06Hf0 j9eZfOhSE+xH6DS39PUIV2wGzjOgUY/HCbUNFFsPuPPJ6XoMsjeVt4+Lh6azjujrCeeTIu lH5DrDoPEiw+qIgl6b8wGlFa3zhhzy0rXvWYJ9bPy0WdaFqUzww4ldl7VDx/wRbUF1DFvo T4o5sfRMVPLqRB6E/h5gNc2Jc0OZl2yqce8j62Zij9OmgyiNsZfvyG8mX5bixg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755773001; a=rsa-sha256; cv=none; b=ar62j1ZtwLX621W4lSmbhuDpX5MM4kZaG21f07VthtmzzATleTL8tF6rw0WpcyOOajwXvn BfpM4Xk0EYKNKQ33CSPvbr8+GZnpHihDxYp0qaTdY/eQly0eYMlOCLODwX3zFuJHwrwoaX 9ksQ+H3C1fB8CvysHrHqeJ3j064cHc4qC6UI3S3k0ZBDYRfKUD0/z7kxRNNXQ8RXhAwNRL u50bKz2esAnXpiXrMy7gtj/i48R4HT5BLTw+SNmr0FrmqzvUSn7l0ERKGH7ICe/zTw+ncz LNXPqlWDAHElxwRNVzrU3SHUwaCWE6vY7BovbMOU4kIFApsxNgIIFI50MuEYYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c70KP1GcSzwZM; Thu, 21 Aug 2025 10:43:21 +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 57LAhL7d075525; Thu, 21 Aug 2025 10:43:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LAhLC3075522; Thu, 21 Aug 2025 10:43:21 GMT (envelope-from git) Date: Thu, 21 Aug 2025 10:43:21 GMT Message-Id: <202508211043.57LAhLC3075522@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 0a0f3b405100 - stable/14 - [libm] Avoid left shift of signed integer entities 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0a0f3b405100e2c8a51234a4fe77c92bbfe9746c Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0a0f3b405100e2c8a51234a4fe77c92bbfe9746c commit 0a0f3b405100e2c8a51234a4fe77c92bbfe9746c Author: Steve Kargl AuthorDate: 2025-08-14 18:38:41 +0000 Commit: Dimitry Andric CommitDate: 2025-08-21 10:41:18 +0000 [libm] Avoid left shift of signed integer entities Follow-up commit d180086e6eae by fixing the left shift of signed integer entities through the use of a helper function. Specific per file changes are: * lib/msun/src/e_fmodf.c: * lib/msun/src/s_remquof.c: . Eliminate now unused variable 'i'. . Sort declaration statement. . Use subnormal_ilogbf() to avoid left shift of signed integer. * lib/msun/src/math_private.h b/lib/msun/src/math_private.h: . Implement subnormal_ilogbf() to extract an exponent of a subnormal float. This avoids left shifts of signed integers. . Update nearby comment. * lib/msun/src/s_ilogbf.c . Fix declaration of the function statement in accordance with style(9). . Use subnormal_ilogbf() to avoid left shift of signed integer. PR: 288850 MFC after: 1 week (cherry picked from commit c58c77246f88da87f309e8c449e98195d43e2c76) --- lib/msun/src/e_fmodf.c | 16 +++++++++------- lib/msun/src/math_private.h | 16 +++++++++++++++- lib/msun/src/s_ilogbf.c | 5 +++-- lib/msun/src/s_remquof.c | 16 +++++++++------- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c index a7d1a0c22acd..ada969db44c7 100644 --- a/lib/msun/src/e_fmodf.c +++ b/lib/msun/src/e_fmodf.c @@ -27,7 +27,7 @@ static const float one = 1.0, Zero[] = {0.0, -0.0,}; float fmodf(float x, float y) { - int32_t n,hx,hy,hz,ix,iy,sx,i; + int32_t hx, hy, hz, ix, iy, n, sx; GET_FLOAT_WORD(hx,x); GET_FLOAT_WORD(hy,y); @@ -44,14 +44,16 @@ fmodf(float x, float y) return Zero[(u_int32_t)sx>>31]; /* |x|=|y| return x*0*/ /* determine ix = ilogb(x) */ - if(hx<0x00800000) { /* subnormal x */ - for (ix = -126,i=(hx<<8); i>0; i<<=1) ix -=1; - } else ix = (hx>>23)-127; + if(hx<0x00800000) + ix = subnormal_ilogbf(hx); + else + ix = (hx>>23)-127; /* determine iy = ilogb(y) */ - if(hy<0x00800000) { /* subnormal y */ - for (iy = -126,i=(hy<<8); i>=0; i<<=1) iy -=1; - } else iy = (hy>>23)-127; + if(hy<0x00800000) + iy = subnormal_ilogbf(hy); + else + iy = (hy>>23)-127; /* set up {hx,lx}, {hy,ly} and align y to x */ if(ix >= -126) diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index 1f5878445a8c..08c45b7602b4 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -741,7 +741,7 @@ irintl(long double x) } while (0) /* - * For a double entity split into high and low parts, compute ilogb. + * For a subnormal double entity split into high and low parts, compute ilogb. */ static inline int32_t subnormal_ilogb(int32_t hi, int32_t lo) @@ -761,6 +761,20 @@ subnormal_ilogb(int32_t hi, int32_t lo) return (j); } +/* + * For a subnormal float entity represented as an int32_t, compute ilogb. + */ +static inline int32_t +subnormal_ilogbf(int32_t hx) +{ + int32_t j; + uint32_t i; + i = (uint32_t) hx << 8; + for (j = -126; i < 0x7fffffff; i <<= 1) j -=1; + + return (j); +} + #ifdef DEBUG #if defined(__amd64__) || defined(__i386__) #define breakpoint() asm("int $3") diff --git a/lib/msun/src/s_ilogbf.c b/lib/msun/src/s_ilogbf.c index e0f8fee26ac8..5195e2331af3 100644 --- a/lib/msun/src/s_ilogbf.c +++ b/lib/msun/src/s_ilogbf.c @@ -18,7 +18,8 @@ #include "math.h" #include "math_private.h" - int ilogbf(float x) +int +ilogbf(float x) { int32_t hx,ix; @@ -28,7 +29,7 @@ if(hx==0) return FP_ILOGB0; else /* subnormal x */ - for (ix = -126,hx<<=8; hx>0; hx<<=1) ix -=1; + ix = subnormal_ilogbf(hx); return ix; } else if (hx<0x7f800000) return (hx>>23)-127; diff --git a/lib/msun/src/s_remquof.c b/lib/msun/src/s_remquof.c index 5818cc55cf6f..6ffca7c3c737 100644 --- a/lib/msun/src/s_remquof.c +++ b/lib/msun/src/s_remquof.c @@ -26,7 +26,7 @@ static const float Zero[] = {0.0, -0.0,}; float remquof(float x, float y, int *quo) { - int32_t n,hx,hy,hz,ix,iy,sx,i; + int32_t hx, hy, hz, ix, iy, n, sx; u_int32_t q,sxy; GET_FLOAT_WORD(hx,x); @@ -48,14 +48,16 @@ remquof(float x, float y, int *quo) } /* determine ix = ilogb(x) */ - if(hx<0x00800000) { /* subnormal x */ - for (ix = -126,i=(hx<<8); i>0; i<<=1) ix -=1; - } else ix = (hx>>23)-127; + if(hx<0x00800000) + ix = subnormal_ilogbf(hx); + else + ix = (hx>>23)-127; /* determine iy = ilogb(y) */ - if(hy<0x00800000) { /* subnormal y */ - for (iy = -126,i=(hy<<8); i>0; i<<=1) iy -=1; - } else iy = (hy>>23)-127; + if(hy<0x00800000) + iy = subnormal_ilogbf(hy); + else + iy = (hy>>23)-127; /* set up {hx,lx}, {hy,ly} and align y to x */ if(ix >= -126) From nobody Thu Aug 21 10:43:32 2025 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 4c70Kc5Xk0z64gl1; Thu, 21 Aug 2025 10:43:32 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c70Kc49Xrz3Svc; Thu, 21 Aug 2025 10:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755773012; 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=P69n9WS9OKLxlvbxLB3gJAJ39UyqnCJVYm3SrPpHdb8=; b=kOLloYXW+2uRMtPYK/CyejwYp/M9QNBgKsLUcvv4r/bif5VROPbYZOYbhE48UL1V3+YLIO ASry9nmDXtJzjrjoxFF+KXujztl8ji158Fefdzk1ix7vM9w+ksVhqya9URkVALfuW12NjB sdsXVwyKsOStRxEL3O+PqNx44Lm4twWAMS5W16XyupOjF0eCvHR5OmJxMD4XltZum4B8/0 5de2n/M/cKzzUJdqPBIPwvuY0ogMCUeNwmixTIYEdDUlhegcWJigSmjcMhg5Gnug3/tvD/ NMBGWO+K01lRoEsTzXc1muicWWt60/I9BoQTh35ZBjem/GqEHHGAdMfUYW+PBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755773012; 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=P69n9WS9OKLxlvbxLB3gJAJ39UyqnCJVYm3SrPpHdb8=; b=t+vEDNcyrBceB8XLOfFqbLlgf8bMUzUq3eKTTnRK38aDRx1bfJrHQnYxRP709tiWV8j+P9 OZ6yHijR1/GssC5wS6Q/U5z+gZxL6XUmdzDida/FF4szWtcXv/A0vatDu4TIUe8m0lf8gA x3Ybyridoifd36hMmvXHTiaHLoAV5befw2UiUfc+7k0dsKE9FPFNWvlL/FTRHkgJxils7i dTXEWDHYWI9auzjGJ6HUUy6emyD44RQajiJhZvSEI90cQW5KcfVTp3diPgFCojVWrtPOqQ ZEHelcOnaVBh2LNGQ2bO8nFlBOfVtNh3XVicFrAcVFxA32kjZ7Rj2SQLLXb7eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755773012; a=rsa-sha256; cv=none; b=t0cFdfhchXJ4gGgOoGrCPaHQnWKZilCOaxvcZDIM04L25g25SpwP+cPnEldBNJQNbyZHzn HaiXWPCr2vs5mQyWFg9joDJr5QF7Np7ALpg0XNMo2pJs2ACAJHh93WLt9cyuuGTkEQ/iZw 4VSD4MebldiJL/l+Fa0PgSHvc4Lbf+jAGJz3oTKunHhsY3kXUS96BLrPBAAL7hL0AJaXNv Yfo8ZpITp67Ze6kJmBLqzZGjNEKj+NF27CE9XeD/W1Vu9LYwucjeG9iW0oxm5wfAOS4hMQ 49t4fBF5orCpgndTBAauTlevpZvGpRm8imFemJGEXAQq9oWDK/KfCWSjFtmAQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c70Kc3mTHzwcB; Thu, 21 Aug 2025 10:43:32 +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 57LAhWd1075703; Thu, 21 Aug 2025 10:43:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LAhWc7075700; Thu, 21 Aug 2025 10:43:32 GMT (envelope-from git) Date: Thu, 21 Aug 2025 10:43:32 GMT Message-Id: <202508211043.57LAhWc7075700@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 94b09b2f3440 - stable/13 - [libm] Fix undefined behavior of a left shifted of a signed integer 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 94b09b2f3440b16b58dd744fcaa73229f6503c10 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=94b09b2f3440b16b58dd744fcaa73229f6503c10 commit 94b09b2f3440b16b58dd744fcaa73229f6503c10 Author: Steve Kargl AuthorDate: 2025-08-12 04:26:29 +0000 Commit: Dimitry Andric CommitDate: 2025-08-21 10:41:41 +0000 [libm] Fix undefined behavior of a left shifted of a signed integer The patch fixes a few instances of left shifts on signed integer entities. A 'static inline' helper function 'subnormal_ilogb()' has been added to math_private.h. This function is then used e_fmod.c, s_ilogb(), and s_remquo.c. The change in s_remquo.c has only been compile tested. The change to e_fmod.c has been test on over 3 billion pairs of subnormal numbers where testing included x > y and x < y pairs. The test compared the output from fmod() with the output from mpfr_fmod() from MPFR. There were no difference. The change to s_ilogb() has had limited testing where its output was compared against frexp(). In this testing, no differences in output were detected. PR: 288778 MFC after: 1 week (cherry picked from commit d180086e6eae2e152e803ed6cf13775a7c006dc7) --- lib/msun/src/e_fmod.c | 30 ++++++++++++------------------ lib/msun/src/math_private.h | 21 +++++++++++++++++++++ lib/msun/src/s_ilogb.c | 13 +++++-------- lib/msun/src/s_remquo.c | 30 ++++++++++++------------------ 4 files changed, 50 insertions(+), 44 deletions(-) diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c index fdfb56c2a475..973ab2ef30c4 100644 --- a/lib/msun/src/e_fmod.c +++ b/lib/msun/src/e_fmod.c @@ -28,14 +28,14 @@ static const double one = 1.0, Zero[] = {0.0, -0.0,}; double fmod(double x, double y) { - int32_t n,hx,hy,hz,ix,iy,sx,i; - u_int32_t lx,ly,lz; + int32_t hx, hy, hz, ix, iy, n, sx; + u_int32_t lx, ly, lz; EXTRACT_WORDS(hx,lx,x); EXTRACT_WORDS(hy,ly,y); sx = hx&0x80000000; /* sign of x */ - hx ^=sx; /* |x| */ - hy &= 0x7fffffff; /* |y| */ + hx ^= sx; /* |x| */ + hy &= 0x7fffffff; /* |y| */ /* purge off exception values */ if((hy|ly)==0||(hx>=0x7ff00000)|| /* y=0,or x not finite */ @@ -48,22 +48,16 @@ fmod(double x, double y) } /* determine ix = ilogb(x) */ - if(hx<0x00100000) { /* subnormal x */ - if(hx==0) { - for (ix = -1043, i=lx; i>0; i<<=1) ix -=1; - } else { - for (ix = -1022,i=(hx<<11); i>0; i<<=1) ix -=1; - } - } else ix = (hx>>20)-1023; + if(hx<0x00100000) + ix = subnormal_ilogb(hx, lx); + else + ix = (hx>>20)-1023; /* determine iy = ilogb(y) */ - if(hy<0x00100000) { /* subnormal y */ - if(hy==0) { - for (iy = -1043, i=ly; i>0; i<<=1) iy -=1; - } else { - for (iy = -1022,i=(hy<<11); i>0; i<<=1) iy -=1; - } - } else iy = (hy>>20)-1023; + if(hy<0x00100000) + iy = subnormal_ilogb(hy, ly); + else + iy = (hy>>20)-1023; /* set up {hx,lx}, {hy,ly} and align y to x */ if(ix >= -1022) diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index b71a8d03c0a1..8023cdf05857 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -740,6 +740,27 @@ irintl(long double x) (ar) = (x) - (ai); \ } while (0) +/* + * For a double entity split into high and low parts, compute ilogb. + */ +static inline int32_t +subnormal_ilogb(int32_t hi, int32_t lo) +{ + int32_t j; + uint32_t i; + + j = -1022; + if (hi == 0) { + j -= 21; + i = (uint32_t)lo; + } else + i = (uint32_t)hi << 11; + + for (; i < 0x7fffffff; i <<= 1) j -= 1; + + return (j); +} + #ifdef DEBUG #if defined(__amd64__) || defined(__i386__) #define breakpoint() asm("int $3") diff --git a/lib/msun/src/s_ilogb.c b/lib/msun/src/s_ilogb.c index 0b076edbd9b5..a958182a2a35 100644 --- a/lib/msun/src/s_ilogb.c +++ b/lib/msun/src/s_ilogb.c @@ -23,21 +23,18 @@ #include "math.h" #include "math_private.h" - int ilogb(double x) +int +ilogb(double x) { - int32_t hx,lx,ix; + int32_t hx, ix, lx; EXTRACT_WORDS(hx,lx,x); hx &= 0x7fffffff; if(hx<0x00100000) { if((hx|lx)==0) return FP_ILOGB0; - else /* subnormal x */ - if(hx==0) { - for (ix = -1043; lx>0; lx<<=1) ix -=1; - } else { - for (ix = -1022,hx<<=11; hx>0; hx<<=1) ix -=1; - } + else + ix = subnormal_ilogb(hx, lx); return ix; } else if (hx<0x7ff00000) return (hx>>20)-1023; diff --git a/lib/msun/src/s_remquo.c b/lib/msun/src/s_remquo.c index e3aac25230e0..fba788ed5104 100644 --- a/lib/msun/src/s_remquo.c +++ b/lib/msun/src/s_remquo.c @@ -5,7 +5,7 @@ * * Developed at SunSoft, a Sun Microsystems, Inc. business. * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice + * software is freely granted, provided that this notice * is preserved. * ==================================================== */ @@ -29,7 +29,7 @@ static const double Zero[] = {0.0, -0.0,}; double remquo(double x, double y, int *quo) { - int32_t n,hx,hy,hz,ix,iy,sx,i; + int32_t hx,hy,hz,ix,iy,n,sx; u_int32_t lx,ly,lz,q,sxy; EXTRACT_WORDS(hx,lx,x); @@ -55,25 +55,19 @@ remquo(double x, double y, int *quo) } /* determine ix = ilogb(x) */ - if(hx<0x00100000) { /* subnormal x */ - if(hx==0) { - for (ix = -1043, i=lx; i>0; i<<=1) ix -=1; - } else { - for (ix = -1022,i=(hx<<11); i>0; i<<=1) ix -=1; - } - } else ix = (hx>>20)-1023; + if(hx<0x00100000) + ix = subnormal_ilogb(hx, lx); + else + ix = (hx>>20)-1023; /* determine iy = ilogb(y) */ - if(hy<0x00100000) { /* subnormal y */ - if(hy==0) { - for (iy = -1043, i=ly; i>0; i<<=1) iy -=1; - } else { - for (iy = -1022,i=(hy<<11); i>0; i<<=1) iy -=1; - } - } else iy = (hy>>20)-1023; + if(hy<0x00100000) + iy = subnormal_ilogb(hy, ly); + else + iy = (hy>>20)-1023; /* set up {hx,lx}, {hy,ly} and align y to x */ - if(ix >= -1022) + if(ix >= -1022) hx = 0x00100000|(0x000fffff&hx); else { /* subnormal x, shift x to normal */ n = -1022-ix; @@ -85,7 +79,7 @@ remquo(double x, double y, int *quo) lx = 0; } } - if(iy >= -1022) + if(iy >= -1022) hy = 0x00100000|(0x000fffff&hy); else { /* subnormal y, shift y to normal */ n = -1022-iy; From nobody Thu Aug 21 10:43:33 2025 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 4c70Kd5xx9z64gxx; Thu, 21 Aug 2025 10:43: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c70Kd5Lt7z3Ss8; Thu, 21 Aug 2025 10:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755773013; 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=SIzdbBKUPr9BE7NqTkjl5a0dpR5FopasnxlLAavKkx8=; b=WzyYJZxjaI/1BTgbILjAQmWuaS7A6ZDV5XI3PuqX/awC6Xfla3If29HU3uSVvhgJ0nyumN PomFO0KQ97k8fWJqNY+ZnHZw714HzFrCR6EpruUZrQTNO6W85yMdanfPst8s3jgO2etHq/ RP7qoTGXhSfSe/MgX9ishUONwBr1Y6QSkdMORgnt6EYYhGJT1CNNpnRDuCjvkujutlfTgA FsmeHFYrlBSEnX8y6FMcBk59+3X9HzhyWU4Qs500q9Kf2bBROvabylYh5bfLwWGW+yGcOn Tk4k6bvLze/gbHvEYreX6Oy15zGGMgMjjIGo+ydq8bOS7D6edF6LjNIbdeol7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755773013; 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=SIzdbBKUPr9BE7NqTkjl5a0dpR5FopasnxlLAavKkx8=; b=cBkmfutCYrm5CeiDShdeHytFoZyykmdqVB0oEuOSUkMzTFu7/7S0Jto9Nd2eSCjVZcQzf8 ZDxbYxEAC9ZioWSF3vqhRO7F7uCWlDGpfkkbFvEAxdZFPh2wtFDMXEaC71/U7f4wRP3FZg P1uBdMD/tODbVF+dhlfyDZfPY68H5K59m5Z78sotqRJrH/ldFYr8POZioCn6Zx9YHMRoFw OCykkZReeMoQPpGyjwWASKsh2kDbjAMAYi9PCyMTeo1OrANxQXgiCT7WylIGgFmY9nhGu3 Wie9wKo1nAxRxT2ObI3Zoa6MAXWJyI08G0k0DKJ2aWgEuaJ9O2kQxcXdbX+yBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755773013; a=rsa-sha256; cv=none; b=YavF9ZXpoCN3UzphU+grMFKMZeOYb2laEVCkQ8rVpoXPZ+Db+9g93t8fiLMxOh3DPWunit AyEhkWWmfnhG+h1+w3FlPg6Q4wnfwntGPTgRtUhOLk1jAmbjQvutzNi5hPd9eH7y9zWlyY Fectd8ee0Uesv+nxqVOBw/6wuk5Wl6NZu5nN8C4Q9A/xt1yTjRPuQNLgLQ8acnDJPcRvor oKCz6FXcXMnDFqZas+dT1EyunImZgr3+ewbE5Gu3psFHgM81hAPmHypVeQeYmWn611FnSD Nr6IsMMDeRUaPp0bQpW8g4PlDlatclgyZBnmpESzlBzivPdQpTGugtm51kQ2sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c70Kd4jZ0zwcC; Thu, 21 Aug 2025 10:43: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 57LAhXlP075739; Thu, 21 Aug 2025 10:43:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LAhXjZ075736; Thu, 21 Aug 2025 10:43:33 GMT (envelope-from git) Date: Thu, 21 Aug 2025 10:43:33 GMT Message-Id: <202508211043.57LAhXjZ075736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 8d2c0354e138 - stable/13 - [libm] Avoid left shift of signed integer entities 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8d2c0354e138c49e2d5f6e0160fd3c710052a0ef Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8d2c0354e138c49e2d5f6e0160fd3c710052a0ef commit 8d2c0354e138c49e2d5f6e0160fd3c710052a0ef Author: Steve Kargl AuthorDate: 2025-08-14 18:38:41 +0000 Commit: Dimitry Andric CommitDate: 2025-08-21 10:41:43 +0000 [libm] Avoid left shift of signed integer entities Follow-up commit d180086e6eae by fixing the left shift of signed integer entities through the use of a helper function. Specific per file changes are: * lib/msun/src/e_fmodf.c: * lib/msun/src/s_remquof.c: . Eliminate now unused variable 'i'. . Sort declaration statement. . Use subnormal_ilogbf() to avoid left shift of signed integer. * lib/msun/src/math_private.h b/lib/msun/src/math_private.h: . Implement subnormal_ilogbf() to extract an exponent of a subnormal float. This avoids left shifts of signed integers. . Update nearby comment. * lib/msun/src/s_ilogbf.c . Fix declaration of the function statement in accordance with style(9). . Use subnormal_ilogbf() to avoid left shift of signed integer. PR: 288850 MFC after: 1 week (cherry picked from commit c58c77246f88da87f309e8c449e98195d43e2c76) --- lib/msun/src/e_fmodf.c | 16 +++++++++------- lib/msun/src/math_private.h | 16 +++++++++++++++- lib/msun/src/s_ilogbf.c | 5 +++-- lib/msun/src/s_remquof.c | 16 +++++++++------- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c index 0e6633fbe739..fc6fee879f52 100644 --- a/lib/msun/src/e_fmodf.c +++ b/lib/msun/src/e_fmodf.c @@ -28,7 +28,7 @@ static const float one = 1.0, Zero[] = {0.0, -0.0,}; float fmodf(float x, float y) { - int32_t n,hx,hy,hz,ix,iy,sx,i; + int32_t hx, hy, hz, ix, iy, n, sx; GET_FLOAT_WORD(hx,x); GET_FLOAT_WORD(hy,y); @@ -45,14 +45,16 @@ fmodf(float x, float y) return Zero[(u_int32_t)sx>>31]; /* |x|=|y| return x*0*/ /* determine ix = ilogb(x) */ - if(hx<0x00800000) { /* subnormal x */ - for (ix = -126,i=(hx<<8); i>0; i<<=1) ix -=1; - } else ix = (hx>>23)-127; + if(hx<0x00800000) + ix = subnormal_ilogbf(hx); + else + ix = (hx>>23)-127; /* determine iy = ilogb(y) */ - if(hy<0x00800000) { /* subnormal y */ - for (iy = -126,i=(hy<<8); i>=0; i<<=1) iy -=1; - } else iy = (hy>>23)-127; + if(hy<0x00800000) + iy = subnormal_ilogbf(hy); + else + iy = (hy>>23)-127; /* set up {hx,lx}, {hy,ly} and align y to x */ if(ix >= -126) diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index 8023cdf05857..6513c2ce14fc 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -741,7 +741,7 @@ irintl(long double x) } while (0) /* - * For a double entity split into high and low parts, compute ilogb. + * For a subnormal double entity split into high and low parts, compute ilogb. */ static inline int32_t subnormal_ilogb(int32_t hi, int32_t lo) @@ -761,6 +761,20 @@ subnormal_ilogb(int32_t hi, int32_t lo) return (j); } +/* + * For a subnormal float entity represented as an int32_t, compute ilogb. + */ +static inline int32_t +subnormal_ilogbf(int32_t hx) +{ + int32_t j; + uint32_t i; + i = (uint32_t) hx << 8; + for (j = -126; i < 0x7fffffff; i <<= 1) j -=1; + + return (j); +} + #ifdef DEBUG #if defined(__amd64__) || defined(__i386__) #define breakpoint() asm("int $3") diff --git a/lib/msun/src/s_ilogbf.c b/lib/msun/src/s_ilogbf.c index ff3df1fc5b90..75508ab77120 100644 --- a/lib/msun/src/s_ilogbf.c +++ b/lib/msun/src/s_ilogbf.c @@ -19,7 +19,8 @@ #include "math.h" #include "math_private.h" - int ilogbf(float x) +int +ilogbf(float x) { int32_t hx,ix; @@ -29,7 +30,7 @@ if(hx==0) return FP_ILOGB0; else /* subnormal x */ - for (ix = -126,hx<<=8; hx>0; hx<<=1) ix -=1; + ix = subnormal_ilogbf(hx); return ix; } else if (hx<0x7f800000) return (hx>>23)-127; diff --git a/lib/msun/src/s_remquof.c b/lib/msun/src/s_remquof.c index c42bd8c4320d..39b87a91845f 100644 --- a/lib/msun/src/s_remquof.c +++ b/lib/msun/src/s_remquof.c @@ -27,7 +27,7 @@ static const float Zero[] = {0.0, -0.0,}; float remquof(float x, float y, int *quo) { - int32_t n,hx,hy,hz,ix,iy,sx,i; + int32_t hx, hy, hz, ix, iy, n, sx; u_int32_t q,sxy; GET_FLOAT_WORD(hx,x); @@ -49,14 +49,16 @@ remquof(float x, float y, int *quo) } /* determine ix = ilogb(x) */ - if(hx<0x00800000) { /* subnormal x */ - for (ix = -126,i=(hx<<8); i>0; i<<=1) ix -=1; - } else ix = (hx>>23)-127; + if(hx<0x00800000) + ix = subnormal_ilogbf(hx); + else + ix = (hx>>23)-127; /* determine iy = ilogb(y) */ - if(hy<0x00800000) { /* subnormal y */ - for (iy = -126,i=(hy<<8); i>0; i<<=1) iy -=1; - } else iy = (hy>>23)-127; + if(hy<0x00800000) + iy = subnormal_ilogbf(hy); + else + iy = (hy>>23)-127; /* set up {hx,lx}, {hy,ly} and align y to x */ if(ix >= -126) From nobody Thu Aug 21 12:51:41 2025 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 4c739V0ZF9z64rH2; Thu, 21 Aug 2025 12:51:42 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c739T6wgLz3h3M; Thu, 21 Aug 2025 12:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755780702; 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=axKCHRsqoRq6IOE5XKb7Wa+ZugnZGD4Fc8EqAw+ZpHc=; b=lF7SApr1+RYjq67lQMibZM7pFFUtcD8Dz5ffe1VtU/9BdsGwc9FCOhkkxA6AtMBHFzn2df 62MtUehfMcaiJ1Zi7mK7U0f7v+i1fvXNR6mw0VDGsXxRc+Ko5VurGQpIgZYn+vbi2VCh37 +sTJeTEoGHGQLbUfzskbRdeiOXK3xl3h74uxGpWl1mQ7P/o9oFQqPFByfFV7A19hx5LL3Q KeVyf2EkFc7VF9QYFoaFySphoQf0Pr7rO3qhe/ebuVjx4RowUdlKI3FTwivDIqaYR5V8iA BNs3GnhyY0fYwN5SxLTGruD7DVi0/BS8TLqVsd2Z0eOcyRbA2a9AJHcgl6zekA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755780702; 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=axKCHRsqoRq6IOE5XKb7Wa+ZugnZGD4Fc8EqAw+ZpHc=; b=vEh+cpYC2Qg6XGNticnVv6TRz0jmTNsFVHExd04JM5no0hx0IuT8zNr7aVk2XbxXzdXQh9 Lsr3cWQkM2C5M4xRR1n/03KEsgRz2pzj91HF2iF48iwzxADSMLLBWHiLp1o3oDynG4Pat0 HWYnx/EMnJ5inFfnrUljgeqlAB7RX1gOh4UfOZuaf2tP/1pV44Wtg5xeDPgMYNyc+CKnHh +8a7PlWtE1TwKtDFRNnaTEZ1BiXg2mVwMbVvjjnfEsSDs2JaSCLMzp1J3vNWseyAC8cVaL dHFDoKdLH76Guatzl0Ck2RgXvr30FDi6fBU2tYb4OGjoo/6UdIg8zpl1MBl+Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755780702; a=rsa-sha256; cv=none; b=pM/YgrxO6nwTLfzfJ3ZFwwOjsTlXX9YmN139I4PHrhfMyhhpY4cLHbcRCqy6AlimVY36D1 12WOdjX+vFLtAI+LzK4iGGyiIJfTXtmPMwfDc+FWqQu02h8JOoU4I/9UwqZtjDJXCW3bh1 GYN3U1nbk1FdndkyLqXyJbjmDknixxC/0x8itL4aWvoP3oQXiVYsbJWOPwKXQxdtVYBi8I 729q7b2scPEcaLz7JWWn8mTcRKshigcluuB4jbE2VX2csQnD9dORZztIal/W0bAl1F6nnN TrTSBHgF1if09Ot+FcKugeV6wurWk/SJyZpCjqHU6REgfLccs/oGczucg0rmKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c739T6D9lz11C3; Thu, 21 Aug 2025 12:51:41 +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 57LCpfZR016307; Thu, 21 Aug 2025 12:51:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LCpfAc016304; Thu, 21 Aug 2025 12:51:41 GMT (envelope-from git) Date: Thu, 21 Aug 2025 12:51:41 GMT Message-Id: <202508211251.57LCpfAc016304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 6612fc306d3e - main - MAC/do: Rename the internal malloc type 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6612fc306d3eb58f85f4cf4533161a1340374709 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6612fc306d3eb58f85f4cf4533161a1340374709 commit 6612fc306d3eb58f85f4cf4533161a1340374709 Author: Kushagra Srivastava AuthorDate: 2025-08-21 10:01:48 +0000 Commit: Olivier Certner CommitDate: 2025-08-21 12:49:20 +0000 MAC/do: Rename the internal malloc type From M_DO to M_MAC_DO. While here, make the descriptions more accurate. (Commit message by olce@.) Reviewed by: olce MFC after: 3 days Sponsored by: Google LLC (GSoC 2025) Sponsored by: The FreeBSD Foundation --- sys/security/mac_do/mac_do.c | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 8856be5fa1a3..7a5ac2e01f75 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -44,7 +44,7 @@ SYSCTL_INT(_security_mac_do, OID_AUTO, print_parse_error, CTLFLAG_RWTUN, &print_parse_error, 0, "Print parse errors on setting rules " "(via sysctl(8))."); -static MALLOC_DEFINE(M_DO, "do_rule", "Rules for mac_do"); +static MALLOC_DEFINE(M_MAC_DO, "mac_do", "mac_do(4) security module"); #define MAC_RULE_STRING_LEN 1024 @@ -319,17 +319,17 @@ toast_rules(struct rules *const rules) struct rule *rule, *rule_next; STAILQ_FOREACH_SAFE(rule, head, r_entries, rule_next) { - free(rule->uids, M_DO); - free(rule->gids, M_DO); - free(rule, M_DO); + free(rule->uids, M_MAC_DO); + free(rule->gids, M_MAC_DO); + free(rule, M_MAC_DO); } - free(rules, M_DO); + free(rules, M_MAC_DO); } static struct rules * alloc_rules(void) { - struct rules *const rules = malloc(sizeof(*rules), M_DO, M_WAITOK); + struct rules *const rules = malloc(sizeof(*rules), M_MAC_DO, M_WAITOK); _Static_assert(MAC_RULE_STRING_LEN > 0, "MAC_RULE_STRING_LEN <= 0!"); rules->string[0] = 0; @@ -433,7 +433,7 @@ static void make_parse_error(struct parse_error **const parse_error, const size_t pos, const char *const fmt, ...) { - struct parse_error *const err = malloc(sizeof(*err), M_DO, M_WAITOK); + struct parse_error *const err = malloc(sizeof(*err), M_MAC_DO, M_WAITOK); va_list ap; err->pos = pos; @@ -448,7 +448,7 @@ make_parse_error(struct parse_error **const parse_error, const size_t pos, static void free_parse_error(struct parse_error *const parse_error) { - free(parse_error, M_DO); + free(parse_error, M_MAC_DO); } static int @@ -733,7 +733,7 @@ parse_target_clause(char *to, struct rule *const rule, "Too many target clauses of type '%s'.", to_type); return (EOVERFLOW); } - ie = malloc(sizeof(*ie), M_DO, M_WAITOK); + ie = malloc(sizeof(*ie), M_MAC_DO, M_WAITOK); ie->spec = is; STAILQ_INSERT_TAIL(list, ie, ie_entries); check_type_and_id_spec(type, &is); @@ -784,7 +784,7 @@ pour_list_into_rule(const id_type_t type, struct id_list *const list, STAILQ_FOREACH_SAFE(ie, list, ie_entries, ie_next) { MPASS(idx < *nb); array[idx] = ie->spec; - free(ie, M_DO); + free(ie, M_MAC_DO); ++idx; } MPASS(idx == *nb); @@ -874,7 +874,7 @@ parse_single_rule(char *rule, struct rules *const rules, STAILQ_INIT(&gid_list); /* Freed when the 'struct rules' container is freed. */ - new = malloc(sizeof(*new), M_DO, M_WAITOK | M_ZERO); + new = malloc(sizeof(*new), M_MAC_DO, M_WAITOK | M_ZERO); from_type = strsep_noblanks(&rule, "="); MPASS(from_type != NULL); /* Because 'rule' was not NULL. */ @@ -933,7 +933,7 @@ parse_single_rule(char *rule, struct rules *const rules, } while (to_list != NULL); if (new->uids_nb != 0) { - new->uids = malloc(sizeof(*new->uids) * new->uids_nb, M_DO, + new->uids = malloc(sizeof(*new->uids) * new->uids_nb, M_MAC_DO, M_WAITOK); error = pour_list_into_rule(IT_UID, &uid_list, new->uids, &new->uids_nb, parse_error); @@ -949,7 +949,7 @@ parse_single_rule(char *rule, struct rules *const rules, } if (new->gids_nb != 0) { - new->gids = malloc(sizeof(*new->gids) * new->gids_nb, M_DO, + new->gids = malloc(sizeof(*new->gids) * new->gids_nb, M_MAC_DO, M_WAITOK); error = pour_list_into_rule(IT_GID, &gid_list, new->gids, &new->gids_nb, parse_error); @@ -969,13 +969,13 @@ parse_single_rule(char *rule, struct rules *const rules, return (0); einval: - free(new->gids, M_DO); - free(new->uids, M_DO); - free(new, M_DO); + free(new->gids, M_MAC_DO); + free(new->uids, M_MAC_DO); + free(new, M_MAC_DO); STAILQ_FOREACH_SAFE(ie, &gid_list, ie_entries, ie_next) - free(ie, M_DO); + free(ie, M_MAC_DO); STAILQ_FOREACH_SAFE(ie, &uid_list, ie_entries, ie_next) - free(ie, M_DO); + free(ie, M_MAC_DO); MPASS(*parse_error != NULL); return (EINVAL); } @@ -1028,7 +1028,7 @@ parse_rules(const char *const string, struct rules **const rulesp, bcopy(string, rules->string, len + 1); MPASS(rules->string[len] == '\0'); /* Catch some races. */ - copy = malloc(len + 1, M_DO, M_WAITOK); + copy = malloc(len + 1, M_MAC_DO, M_WAITOK); bcopy(string, copy, len + 1); MPASS(copy[len] == '\0'); /* Catch some races. */ @@ -1046,7 +1046,7 @@ parse_rules(const char *const string, struct rules **const rulesp, *rulesp = rules; out: - free(copy, M_DO); + free(copy, M_MAC_DO); return (error); } @@ -1226,7 +1226,7 @@ parse_and_set_rules(struct prison *const pr, const char *rules_string, static int mac_do_sysctl_rules(SYSCTL_HANDLER_ARGS) { - char *const buf = malloc(MAC_RULE_STRING_LEN, M_DO, M_WAITOK); + char *const buf = malloc(MAC_RULE_STRING_LEN, M_MAC_DO, M_WAITOK); struct prison *const td_pr = req->td->td_ucred->cr_prison; struct prison *pr; struct rules *rules; @@ -1250,7 +1250,7 @@ mac_do_sysctl_rules(SYSCTL_HANDLER_ARGS) free_parse_error(parse_error); } out: - free(buf, M_DO); + free(buf, M_MAC_DO); return (error); } @@ -1573,7 +1573,7 @@ set_data_header(void *const data, const size_t size, const int priv, static void * alloc_data(void *const data, const size_t size) { - struct mac_do_data_header *const hdr = realloc(data, size, M_DO, + struct mac_do_data_header *const hdr = realloc(data, size, M_MAC_DO, M_WAITOK); MPASS(size >= sizeof(struct mac_do_data_header)); @@ -1602,7 +1602,7 @@ alloc_data(void *const data, const size_t size) static void dealloc_thread_osd(void *const value) { - free(value, M_DO); + free(value, M_MAC_DO); } /* From nobody Thu Aug 21 14:02:08 2025 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 4c74l22lFQz64x72 for ; Thu, 21 Aug 2025 14:02:22 +0000 (UTC) (envelope-from ziaee@FreeBSD.org) Received: from mailtransmit05.runbox.com (mailtransmit05.runbox.com [IPv6:2a0c:5a00:149::26]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4c74l14Xd8z3wWx; Thu, 21 Aug 2025 14:02:21 +0000 (UTC) (envelope-from ziaee@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1up5rm-007l4J-2N; Thu, 21 Aug 2025 16:02:10 +0200 Received: from [10.9.9.129] (helo=rmmprod07.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1up5rk-0003S1-IV; Thu, 21 Aug 2025 16:02:09 +0200 Received: from mail by rmmprod07.runbox with local (Exim 4.86_2) (envelope-from ) id 1up5rk-0004cI-Gi; Thu, 21 Aug 2025 16:02:08 +0200 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 Received: from [Authenticated alias (960477)] by runbox.com with http (RMM6); Thu, 21 Aug 2025 14:02:08 GMT From: "Alexander Ziaee" To: "Zhenlei Huang" CC: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 458ac2b6e445 - main - umb.4: Improve synposis, add netmap Date: Thu, 21 Aug 2025 14:02:08 +0000 (UTC) X-RMM-Aliasid: 960477 X-Mailer: RMM6 In-Reply-To: <97B579B6-654E-45EF-9F48-6D6BC39262B6@FreeBSD.org> Message-Id: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:50304, ipnet:2a0c:5a00::/29, country:NO] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c74l14Xd8z3wWx On 2025-08-20 23:21 -04:00 EDT, "Zhenlei Huang" wrote: > Hi Alexander, >=20 > I'd presume umb(4) does not depends on netmap. A quick search of DEV_NETM= AP >=20 > ``` > #ifdef DEV_NETMAP > static void umb_input(if_t , struct mbuf *); > #endif > ... > #ifdef DEV_NETMAP > if_setinputfn(ifp, umb_input); > #endif > ``` >=20 > I think the #ifdef can be removed. I currently do not have that hardware = so I'd appreciate if someone can test it. I didn't get that far myself, this commit was partially in response to comm= ent 67 [0] on the original bug where a user got the driver working on FreeB= SD 14 by adding `device netmap` to their kernconf, and it didn't work witho= ut that. Should we send this to khorben? [0] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D263783#c67 Best, Alex >=20 > Best regards, > Zhenlei >=20 >> On Aug 21, 2025, at 9:50 AM, Alexander Ziaee wrote: >>=20 >> The branch main has been updated by ziaee: >>=20 >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D458ac2b6e4452acc1a614352c= 8945ecc37667aa0 >>=20 >> commit 458ac2b6e4452acc1a614352c8945ecc37667aa0 >> Author: Alexander Ziaee >> AuthorDate: 2025-08-20 14:45:08 +0000 >> Commit: Alexander Ziaee >> CommitDate: 2025-08-21 01:48:13 +0000 >>=20 >> umb.4: Improve synposis, add netmap >>=20 >> Rewrite synopsis in a more consistent style, and add "device netmap", >> In FreeBSD 15, netmap is included in GENERIC/{amd64,arm64,powerpc64}, >> but it still needs to be used in FreeBSD 14 or custom kernels which >> don't include GENERIC. >>=20 >> MFC after: umb does not mfc >> Reviewed by: gbe >> Differential Revision: https://reviews.freebsd.org/D51732 >> --- >> share/man/man4/umb.4 | 28 ++++++++++++++-------------- >> 1 file changed, 14 insertions(+), 14 deletions(-) >>=20 >> diff --git a/share/man/man4/umb.4 b/share/man/man4/umb.4 >> index 7ecc9a39c1ca..311a50faf8e7 100644 >> --- a/share/man/man4/umb.4 >> +++ b/share/man/man4/umb.4 >> @@ -17,34 +17,34 @@ >> .\" >> .\" $NetBSD: umb.4,v 1.4 2019/08/30 09:22:17 wiz Exp $ >> .\" >> -.Dd May 11, 2025 >> +.Dd August 4, 2025 >> .Dt UMB 4 >> .Os >> .Sh NAME >> .Nm umb >> .Nd USB Mobile Broadband Interface Model (MBIM) cellular modem driver >> .Sh SYNOPSIS >> -To compile this driver into the kernel, >> -place the following lines in your >> -kernel configuration file: >> -.Bd -ragged -offset indent >> +.Cd "device netmap" >> .Cd "device usb" >> .Cd "device umb" >> -.Ed >> .Pp >> -Alternatively, to load the driver as a >> -module at boot time, place the following line in >> +In >> .Xr loader.conf 5 : >> -.Bd -literal -offset indent >> -umb_load=3D"YES" >> -.Ed >> -.Pp >> -If neither of the above is done, the driver will automatically be loaded >> -by devd(8) when the device is connected. >> +.Cd umb_load=3D"YES" >> .Sh DESCRIPTION >> The >> .Nm >> driver provides support for USB MBIM devices. >> +If the appropriate hardware is detected, >> +the driver will be loaded automatically by >> +.Xr devmatch 8 . >> +To load the driver manually, >> +.Cm load >> +it in >> +.Xr loader.conf 5 >> +or at the >> +.Xr loader 8 >> +prompt. >> .Pp >> MBIM devices establish connections via cellular networks such as >> GPRS, UMTS, and LTE. >=20 >=20 >=20 >=20= From nobody Thu Aug 21 14:08:31 2025 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 4c74t92DnFz64xfM; Thu, 21 Aug 2025 14:08:33 +0000 (UTC) (envelope-from ziaee@FreeBSD.org) Received: from mailtransmit04.runbox.com (mailtransmit04.runbox.com [IPv6:2a0c:5a00:149::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4c74t91PNfz3xRK; Thu, 21 Aug 2025 14:08:33 +0000 (UTC) (envelope-from ziaee@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1up5xv-006xnZ-RW; Thu, 21 Aug 2025 16:08:31 +0200 Received: from [10.9.9.129] (helo=rmmprod07.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1up5xv-0003wR-BQ; Thu, 21 Aug 2025 16:08:31 +0200 Received: from mail by rmmprod07.runbox with local (Exim 4.86_2) (envelope-from ) id 1up5xv-0005kE-9z; Thu, 21 Aug 2025 16:08:31 +0200 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 Received: from [Authenticated alias (960477)] by runbox.com with http (RMM6); Thu, 21 Aug 2025 14:08:31 GMT From: "Alexander Ziaee" To: "Zhenlei Huang" CC: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 458ac2b6e445 - main - umb.4: Improve synposis, add netmap Date: Thu, 21 Aug 2025 14:08:31 +0000 (UTC) X-RMM-Aliasid: 960477 X-Mailer: RMM6 In-Reply-To: <97B579B6-654E-45EF-9F48-6D6BC39262B6@FreeBSD.org> Message-Id: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:50304, ipnet:2a0c:5a00::/29, country:NO] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c74t91PNfz3xRK On 2025-08-20 23:21 -04:00 EDT, "Zhenlei Huang" wrote: > Hi Alexander, >=20 > I'd presume umb(4) does not depends on netmap. A quick search of DEV_NETM= AP >=20 > ``` > #ifdef DEV_NETMAP > static void umb_input(if_t , struct mbuf *); > #endif > ... > #ifdef DEV_NETMAP > if_setinputfn(ifp, umb_input); > #endif > ``` >=20 > I think the #ifdef can be removed. I currently do not have that hardware = so I'd appreciate if someone can test it. I didn't get that far myself, this commit was partially in response to comm= ent 67 [0] on the original bug where a user got the driver working on FreeB= SD 14 by adding `device netmap` to their kernconf, and it didn't work witho= ut that. Should we send this to khorben? [0] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D263783#c67 Best, Alex >=20 > Best regards, > Zhenlei >=20 >> On Aug 21, 2025, at 9:50 AM, Alexander Ziaee wrote: >>=20 >> The branch main has been updated by ziaee: >>=20 >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D458ac2b6e4452acc1a614352c= 8945ecc37667aa0 >>=20 >> commit 458ac2b6e4452acc1a614352c8945ecc37667aa0 >> Author: Alexander Ziaee >> AuthorDate: 2025-08-20 14:45:08 +0000 >> Commit: Alexander Ziaee >> CommitDate: 2025-08-21 01:48:13 +0000 >>=20 >> umb.4: Improve synposis, add netmap >>=20 >> Rewrite synopsis in a more consistent style, and add "device netmap", >> In FreeBSD 15, netmap is included in GENERIC/{amd64,arm64,powerpc64}, >> but it still needs to be used in FreeBSD 14 or custom kernels which >> don't include GENERIC. >>=20 >> MFC after: umb does not mfc >> Reviewed by: gbe >> Differential Revision: https://reviews.freebsd.org/D51732 >> --- >> share/man/man4/umb.4 | 28 ++++++++++++++-------------- >> 1 file changed, 14 insertions(+), 14 deletions(-) >>=20 >> diff --git a/share/man/man4/umb.4 b/share/man/man4/umb.4 >> index 7ecc9a39c1ca..311a50faf8e7 100644 >> --- a/share/man/man4/umb.4 >> +++ b/share/man/man4/umb.4 >> @@ -17,34 +17,34 @@ >> .\" >> .\" $NetBSD: umb.4,v 1.4 2019/08/30 09:22:17 wiz Exp $ >> .\" >> -.Dd May 11, 2025 >> +.Dd August 4, 2025 >> .Dt UMB 4 >> .Os >> .Sh NAME >> .Nm umb >> .Nd USB Mobile Broadband Interface Model (MBIM) cellular modem driver >> .Sh SYNOPSIS >> -To compile this driver into the kernel, >> -place the following lines in your >> -kernel configuration file: >> -.Bd -ragged -offset indent >> +.Cd "device netmap" >> .Cd "device usb" >> .Cd "device umb" >> -.Ed >> .Pp >> -Alternatively, to load the driver as a >> -module at boot time, place the following line in >> +In >> .Xr loader.conf 5 : >> -.Bd -literal -offset indent >> -umb_load=3D"YES" >> -.Ed >> -.Pp >> -If neither of the above is done, the driver will automatically be loaded >> -by devd(8) when the device is connected. >> +.Cd umb_load=3D"YES" >> .Sh DESCRIPTION >> The >> .Nm >> driver provides support for USB MBIM devices. >> +If the appropriate hardware is detected, >> +the driver will be loaded automatically by >> +.Xr devmatch 8 . >> +To load the driver manually, >> +.Cm load >> +it in >> +.Xr loader.conf 5 >> +or at the >> +.Xr loader 8 >> +prompt. >> .Pp >> MBIM devices establish connections via cellular networks such as >> GPRS, UMTS, and LTE. >=20 >=20 >=20 >=20= From nobody Thu Aug 21 14:22:21 2025 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 4c75B60vg2z64yRy; Thu, 21 Aug 2025 14:22:22 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c75B60R8dz43Cx; Thu, 21 Aug 2025 14:22:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786142; 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=owrg/O6e1rh+4PU8YbIORDVhh4mmzz9RghNzUjzyzuE=; b=RrpHNjZ+ilBLFEuTg7oMdyt+DrJHWfd5OfCUJyia/XhmBrALj2fn4xeSyD5P0n/xx6WwkX yuBvaNYnEEvU8qhAZztK912eLiLUF2nIL3t3j2jrruApf1kDalj/sSnD+1ORL7VcDIZDK+ m4k68KYwFsrTUFbA16oiPGscq96tDov8L5wK1oQdVtwQjeyg4FyMmxYoBJV/mJbymx5rSx t8gaiOuzL2DOGrHFuvpqwadN/PXtaXYnBTmJ/k4rnFbakjEOaDt/Kblv0h7IS8E8LZWVtR VvgPKgxFbdvMcg3MCE6ssbdPp9E10vKD3sa8SYGig0AmKbGpAE7/ALXCrLyR8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786142; 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=owrg/O6e1rh+4PU8YbIORDVhh4mmzz9RghNzUjzyzuE=; b=iRIjVr8JSjJqi3JcMuLTH2YFBas+vB8ATcaLG3qefOXMoMjbLDMCGBYeAgYR5c3XB6UBaS 3T1A19LLpcdq69rhoH+LDxVzylGdZBkb8iaDQ8i2teAaWGlwOCp27Qlk1qvdf/HuZmhlEz pB2L84lQ8EbdZiclzFBZYVRYtdPvD7sGDQM8ZU3dKGXNj6CY3/E/HzSX2ZP4bGh9TXQNFE y+v9m8Scc80JbvDdOJ9sr8EUf4J0Za26vOVGPV+4VVclDaFLGFEmuFOAIJgSea0TkK49Vn H/IzY4k8OU5R0guRI9ppZr1H9Y22sCTyK7xZZ4bLzRLtbYVCGqFPOsGMLGkstw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755786142; a=rsa-sha256; cv=none; b=ebBi3eA+VPOofqZt3qHxjyLCnLgDf/YPAwpvb0rkPVlz09ER93FgvXtPggTKQB5dgmAiRU KgVeyH8PgA9V/vJR0r8BNlBTXb7hgS+jf6Jl6WtTNr2oPSLKHQdjN5x65yO/SMK/6AflGz +xQo5R9n4j3FhtLHxw3mD1t24BsUWjgr3WN6fbKM4H3nA8ZQs2u3z79hyTjCV5RJXnDYS8 OccAIrNIjWwHaVib/8o2ReEU4I29bkPCoBjw+e0YqV7LpkXAIiXQyy06+JE0mnpCaFo9V5 6BCrkdb81t3T17qkm3V5HyV5oez2jmu1+X90OslQiGgf7AgzYLhcq8GmZ8bQ1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c75B56zQ2z13Mh; Thu, 21 Aug 2025 14:22:21 +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 57LEMLX3089834; Thu, 21 Aug 2025 14:22:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LEMLMI089831; Thu, 21 Aug 2025 14:22:21 GMT (envelope-from git) Date: Thu, 21 Aug 2025 14:22:21 GMT Message-Id: <202508211422.57LEMLMI089831@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: aecd63f44794 - main - rtw88 / rtw89: define LINUXKPI_VERSION 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aecd63f4479423a65bdde7f93da66139293f0928 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=aecd63f4479423a65bdde7f93da66139293f0928 commit aecd63f4479423a65bdde7f93da66139293f0928 Author: Bjoern A. Zeeb AuthorDate: 2025-08-21 06:28:56 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-21 14:21:10 +0000 rtw88 / rtw89: define LINUXKPI_VERSION Always define the LINUXKPI_VERSION for LinuxKPI based wireless drivers. This ensures that LinuxKPI can move indepdent of drivers. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/modules/rtw88/Makefile | 1 + sys/modules/rtw89/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile index 9739ede11073..822be639da43 100644 --- a/sys/modules/rtw88/Makefile +++ b/sys/modules/rtw88/Makefile @@ -43,6 +43,7 @@ SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h CFLAGS+= -DKBUILD_MODNAME='"rtw88"' +CFLAGS+= -DLINUXKPI_VERSION=61400 CFLAGS+= -I${DEVRTW88DIR} CFLAGS+= ${LINUXKPI_INCLUDES} diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile index 09580f288c62..e66f85c3ac17 100644 --- a/sys/modules/rtw89/Makefile +++ b/sys/modules/rtw89/Makefile @@ -39,6 +39,7 @@ SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h CFLAGS+= -DKBUILD_MODNAME='"rtw89"' +CFLAGS+= -DLINUXKPI_VERSION=61400 CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI CFLAGS+= -I${DEVRTW89DIR} From nobody Thu Aug 21 14:22:22 2025 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 4c75B81CcLz64ybW; Thu, 21 Aug 2025 14:22:24 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c75B70fkgz439q; Thu, 21 Aug 2025 14:22:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786143; 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=/mWaNypkMGpAd2mBpu5tkMEFCpaLPn+n3OapxL4Wy/A=; b=Zc0JqIwxD9wblDOeg2UW7Kjnkq2N6OSyI4zfbNnUU+akl42QDcO96VqIOpgqXpFiTuB7Lw Ivq4b+ziKd60KmicJQcjDhrLxCsIS759VSm+HfhqJxW7ZSk0GHOs9P5ucPCpXN2GW9S8ra LnayfiTTw5l9Vqhi4fZ5znV+gKALgbXrUPU9VjZjZbrftUhUu/A+VNhJpQizu4ITHbuZmr 32MaVJkvQIp2r0sKhU1wP45HrB3O8aILltWaJo8zoJmP+imNf5l5kjk4STtoYf+2+7zV+D R1kYRsDGDdx94qFv9n9JZRXSG4K++LRTztsz6HPA4lFY9fzJKG1Ga3sTHfVaFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786143; 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=/mWaNypkMGpAd2mBpu5tkMEFCpaLPn+n3OapxL4Wy/A=; b=HwIByqViYencdVy5lirfgbMntUG470u9Te4hz2nSL+3iZ8sjfM/lxGKkDimhRKfHY7Z0pr h2Pmb17y34OQvpe4bLJZUoSICVW1l2sMxFxPrhDK8MMgzIa9CySQ9IENav73PJhs6Yn5xl VEJER0gt09ukIwOZzh7UjHYeebR9wMH4TBwbEEohtxgPFZipjCDebd2Ta5GPRlqHkiyELP qA7I7SNwI6uSBKgWHGRUdoONlpl18RngJLRRZGCuGpWwqjLHL6ed6UM5nHWODuBFWGmuur BORehlOp66vcLU7se61lDbMFdijPpoVHzwCzw3ebYJ6QClnOFq5ANU3t4s1AUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755786143; a=rsa-sha256; cv=none; b=GQF/4zzf1eqXtlSZQfjTHoVMvhNnvhUZgEUYKIhqcgsIXomXMXKQ+smaGkjAs8cmxVMg2S j8s03uxK2y7f4zdcKRGKTJnkgiOfWDN/fahDWdb6w+lwoSTlNxT0DUP0srjVJvBNDwz/8N 6GYledpK1xpLKIus56xlbdkAym3Kd8YdTA9oAEBYhkxZfvN9bP/9fk6yFeJk87biGceNh4 V5IWW8lpbmpvIraJ//wmRG71lxsysWc/5BWw07NrQz/RF1axjwBF1uH4kOZGdYOKz0sHsl ArEwgfGGxL1n5uH2dadyYiB42fRHu+NTMSw862AckJf2eWfM3EXU3+gN1dmusQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c75B70862z13B0; Thu, 21 Aug 2025 14:22:23 +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 57LEMMHh089875; Thu, 21 Aug 2025 14:22:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LEMMZH089872; Thu, 21 Aug 2025 14:22:22 GMT (envelope-from git) Date: Thu, 21 Aug 2025 14:22:22 GMT Message-Id: <202508211422.57LEMMZH089872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7d49a336d5bf - main - LinuxKPI: 802.11: add bitfield.h to ieee80211.h 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d49a336d5bf8ce4174286c2c5d1d93b3549cb88 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7d49a336d5bf8ce4174286c2c5d1d93b3549cb88 commit 7d49a336d5bf8ce4174286c2c5d1d93b3549cb88 Author: Bjoern A. Zeeb AuthorDate: 2025-08-14 00:46:34 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-21 14:21:31 +0000 LinuxKPI: 802.11: add bitfield.h to ieee80211.h Add the include to make some driver code compile without having to add FreeBSD-specific includes to drivers. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 3644ef80861b..4c97ae8e3bc0 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -35,6 +35,7 @@ #include #include #include +#include #include /* linux_80211.c */ From nobody Thu Aug 21 14:22:24 2025 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 4c75B86rhdz64yMm; Thu, 21 Aug 2025 14:22:24 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c75B81nh5z438x; Thu, 21 Aug 2025 14:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786144; 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=PCte10JxX3iGHPAmPC7tCVf+GLnMhYhpl+PZ6g0x54Y=; b=BGjxI2qIw03sNe8Ln/8zJ0o1j+JUvM/dmaAb+OOklJcoYVg2X5psWXFPp5mkm7/3Qb+/zO xKPIlbSGVnY6T2mzcHGpDjJ9xARaIyvwQBIa+GRaqwq56T5fftQv4LLd6uPi5zgqQSjPth 0lOiJnZtjVBlk7DvmCCmSufc1+g9XP+pr60C6Ugwb3TCW9QtThx6EaEZm+iOH06ugzRuQ2 doJtAnNoIUJNetS+Te1oWAnrNumSMTOJ9Ld4MCg5bA6h23BTnh1ZVAogn9KFcrcO5VCtZz BsoLmBvsdIOGXQXpZJt5aLD8L6ShX4YLeTbZ1OzxJhzfQDVeMI5FZRPnKgnF/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786144; 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=PCte10JxX3iGHPAmPC7tCVf+GLnMhYhpl+PZ6g0x54Y=; b=AtjX89G6d8wwI7fNv2Npn7MH2yjiob59xmX1w6Jb6FajgRUUgkSpR9cHOmgLKLP7w8x/wT JiEgd3TOxWIxo2eAz19WVOZ5oqrsBDvw8QdfRj5U1/L5WE+bucU/lKogi/xb5iJ4vUM2NT nVQEjZ5x+4r8sFeULSje3pHxFL/yn42C4J2QVjk2QmXsRuLbjNnJJTC6C4O33qCHxeSc/7 AfOWk1wMgJQyst833/x23DjcS1b6Z00oMtGlJOuvhWwouR85c0aKoen7isEe8CkYjVHVjB ORIreIRUd/xrfmDlkKW57P2Ym6pyj3x4kVEeDSIXeJc3MF5ll+Nxpte1fkDQcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755786144; a=rsa-sha256; cv=none; b=uc5UFMoGZEWIdShZmmtNwVjPi+19MSSYvNgimnQE3Fv3PrvXNsHXwXFAUfijzY79acy5M4 MfxQ4z/Y9Jexg+hgJQve1bl6rIn6iA1wWgLXmJNlyUd39sTvxx/v1dtX8i1gPqSUBKz5GY beGbHwpLpKFps8y3ugHfY/MxYb/m+gOr67d7h2h+EO/ySDQ6ChVwHVJVlp9FBtqelxlfur 3IlyaC5F2s/FLPNOUy5IZsu8RfGRoaCEjgngy3CTv7yikhAE0hFT87ZtiPbEfzc3hUI9DZ 3PbMgNU6BGSM7dergE7EWyB4r6dFhcXHLaq7q6cMTtDStVvT2bzFjosDKmsTDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c75B81NFGz13H6; Thu, 21 Aug 2025 14:22:24 +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 57LEMO0u089916; Thu, 21 Aug 2025 14:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LEMOh4089913; Thu, 21 Aug 2025 14:22:24 GMT (envelope-from git) Date: Thu, 21 Aug 2025 14:22:24 GMT Message-Id: <202508211422.57LEMOh4089913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 97cf5a33709b - main - LinuxKPI: 802.11: define the full set of IEEE80211_VHT_MAX_AMPDU_* 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97cf5a33709b130fb108b75859af8fdc0ac4a9e3 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=97cf5a33709b130fb108b75859af8fdc0ac4a9e3 commit 97cf5a33709b130fb108b75859af8fdc0ac4a9e3 Author: Bjoern A. Zeeb AuthorDate: 2025-08-13 05:38:34 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-21 14:21:48 +0000 LinuxKPI: 802.11: define the full set of IEEE80211_VHT_MAX_AMPDU_* Define all of IEEE80211_VHT_MAX_AMPDU_* and add a reference to the standard section. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 4c97ae8e3bc0..5851ac08f083 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -122,7 +122,20 @@ enum ieee80211_rate_control_changed_flags { /* 802.11-2016, 9.4.2.158.3 Supported VHT-MCS and NSS Set field. */ #define IEEE80211_VHT_EXT_NSS_BW_CAPABLE (1 << 13) /* part of tx_highest */ -#define IEEE80211_VHT_MAX_AMPDU_1024K 7 /* 9.4.2.56.3 A-MPDU Parameters field, Table 9-163 */ +/* + * 802.11-2020, 9.4.2.157.2 VHT Capabilities Information field, + * Table 9-271-Subfields of the VHT Capabilities Information field (continued). + */ +enum ieee80211_vht_max_ampdu_len_exp { + IEEE80211_VHT_MAX_AMPDU_8K = 0, + IEEE80211_VHT_MAX_AMPDU_16K = 1, + IEEE80211_VHT_MAX_AMPDU_32K = 2, + IEEE80211_VHT_MAX_AMPDU_64K = 3, + IEEE80211_VHT_MAX_AMPDU_128K = 4, + IEEE80211_VHT_MAX_AMPDU_256K = 5, + IEEE80211_VHT_MAX_AMPDU_512K = 6, + IEEE80211_VHT_MAX_AMPDU_1024K = 7, +}; #define IEEE80211_WEP_IV_LEN 3 /* net80211: IEEE80211_WEP_IVLEN */ #define IEEE80211_WEP_ICV_LEN 4 From nobody Thu Aug 21 14:22:25 2025 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 4c75BB3nmDz64ybX; Thu, 21 Aug 2025 14:22:26 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c75B93LwYz438y; Thu, 21 Aug 2025 14:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786145; 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=rs+7k6OhAaopKAUKcGsNdj3L52qG+ucE+ezcIphlVDE=; b=nCxcmEXeYdlTgdsOhtsfuUTYJzvGqrMrK1VgrHMlfRJWYZSInNku69v0Rrpd8kbfqWIH1Q L++P09+kJXx+e0Wv/XvAQC0Ybcz3ZpfpzcT1q6bRN0rsclt4coMuwYeY9CURzNsPYmcnwA mOD96x/l5Y7Fam9RfK6asYLRNdX6jdAQnWdP6i4u25ExID2s4I0uF/8wLF5qQXBCDegyjq D/dVlxaw/uN3xPVPdH1Q6AFUdZDTat7tb8YkpRTtUvsfDqUSYmSj8OFD5yH2yF46/isVjn IzBiDxakqCA2zDert8BQOO2zi54tFS3ovB7gohYbDGGbOC8dydEM7fCV8McHUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786145; 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=rs+7k6OhAaopKAUKcGsNdj3L52qG+ucE+ezcIphlVDE=; b=a43P3KJScs/dF/wbPHiCTpwvCJ8SIf1bIGUk2hUXoZ27kFTmobnOkKRtTUqAnjNkFEsv7x bsHdrMqagZNV2WsvF46kocyCv5x8yCf3gQCE+Uj+jl3hN7gwyc83vWZYcPPdnHV//DC7Bd 34/Lcs2TqEaELC6EE1QDs+OZj/9cqdA69VHai130KR6gut5o7JJEW844x+kLqFbL6IrFZy XXmwOy2KW9W50+NRpn1BXjS72yCPoZxgH8LcV+/GImJ0N/3C/7pBb2gn6pxKNxHrSE0fcM El5BG7LPnFQWwzvV8NxyrGjSOsyzMdwHOj3bNuchn8egPT8vdPgO0qI/iRWpew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755786145; a=rsa-sha256; cv=none; b=i41jYITRafAjvVDMaTkD1q9osIgWJ6p7yWqh5tFahZtMdWm0Y+sTUhRVLZBpceoWRZNgfr S2NZopgpUC7JxjJ3ZH6ZRU8qmccsbFYIOosFNMBqBkTYWwJY7BqVO4EmAC3gxD6k0RQ8s6 XadbQwfaENTxzhvcMUmJKcLc4tCPN/sxiRJkxS8QjeN9P3/XDqv9ay/XhqH1j0pvsbqX8j Lhv4cricRpoWOCZjPYxhPRlcegUJpZivV0IxwCqNi/+ViSOHB96wa6Tuo7EPSeAiT6VkMj PruY3t7ULZaGqzeXPnV9Q59Lf9+RyVqSIe1o5WH0CLlPv8Go9sqGElh5QhFYaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c75B92NR3z13H7; Thu, 21 Aug 2025 14:22:25 +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 57LEMPVv089953; Thu, 21 Aug 2025 14:22:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LEMPQc089950; Thu, 21 Aug 2025 14:22:25 GMT (envelope-from git) Date: Thu, 21 Aug 2025 14:22:25 GMT Message-Id: <202508211422.57LEMPQc089950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 2b37274a9a26 - main - LinuxKPI: 802.11: ieee80211_probereq_get() takes const arguments 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b37274a9a26d66010001217d53901de5b254b8b Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2b37274a9a26d66010001217d53901de5b254b8b commit 2b37274a9a26d66010001217d53901de5b254b8b Author: Bjoern A. Zeeb AuthorDate: 2025-08-13 21:54:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-21 14:21:48 +0000 LinuxKPI: 802.11: ieee80211_probereq_get() takes const arguments With a wireless driver updates we are passed const arguments for addr and ssid. Adjust the local implementation to take the const in order to avoid compiler warnings (at no extra harm). Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 6 +++--- sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index af3199c38939..2ed595095f9e 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1184,7 +1184,7 @@ struct wireless_dev *linuxkpi_ieee80211_vif_to_wdev(struct ieee80211_vif *); void linuxkpi_ieee80211_connection_loss(struct ieee80211_vif *); void linuxkpi_ieee80211_beacon_loss(struct ieee80211_vif *); struct sk_buff *linuxkpi_ieee80211_probereq_get(struct ieee80211_hw *, - uint8_t *, uint8_t *, size_t, size_t); + const uint8_t *, const uint8_t *, size_t, size_t); void linuxkpi_ieee80211_tx_status(struct ieee80211_hw *, struct sk_buff *); void linuxkpi_ieee80211_tx_status_ext(struct ieee80211_hw *, struct ieee80211_tx_status *); @@ -2161,8 +2161,8 @@ ieee80211_nullfunc_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif, } static __inline struct sk_buff * -ieee80211_probereq_get(struct ieee80211_hw *hw, uint8_t *addr, - uint8_t *ssid, size_t ssid_len, size_t tailroom) +ieee80211_probereq_get(struct ieee80211_hw *hw, const uint8_t *addr, + const uint8_t *ssid, size_t ssid_len, size_t tailroom) { return (linuxkpi_ieee80211_probereq_get(hw, addr, ssid, ssid_len, diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 1d00e8da8f9a..a7d6003843ba 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -7668,8 +7668,8 @@ linuxkpi_ieee80211_queue_work(struct ieee80211_hw *hw, } struct sk_buff * -linuxkpi_ieee80211_probereq_get(struct ieee80211_hw *hw, uint8_t *addr, - uint8_t *ssid, size_t ssid_len, size_t tailroom) +linuxkpi_ieee80211_probereq_get(struct ieee80211_hw *hw, const uint8_t *addr, + const uint8_t *ssid, size_t ssid_len, size_t tailroom) { struct sk_buff *skb; struct ieee80211_frame *wh; From nobody Thu Aug 21 14:22:26 2025 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 4c75BC3SKsz64yPy; Thu, 21 Aug 2025 14:22:27 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c75BB3kJ5z43D3; Thu, 21 Aug 2025 14:22:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786146; 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=xM2aUZSweFdmGdYjJXyVbLwLpRhPrpoJllPa7EsvxwU=; b=sRpDIzr7PLQVOBfatszrm4aZzp5uXFTUeR591h0ClO0DhzKLavHLDYxUk3RgjSvrUpViSV OeaYNnH7gfydSDvb9DkBmp9b7X9WlrwhylYcnr1LUUUeGmJvUwUm6KaYDQN9FQyzViYn4a 7mi5MmOhsND7tCVP0WUptXhbJem9ZZo1gLoT7LaW7Q588bBhPU4baPwnZEQZG3gnQcCWTz FHFAB7MoiYYdP6qoQZO3PNu/sut1fiBXeyChzN1zXJdC4ZcN10zl5WZDfdeVzJ4RCD1yX+ VMqOHZUVRA9+yTws35q1zX0cT79iQ+cIz0RcWj3iu4aBCGux0EEbNwS7p9kdZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786146; 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=xM2aUZSweFdmGdYjJXyVbLwLpRhPrpoJllPa7EsvxwU=; b=ntnll50cMbBzJABfK57sSDaLKjqeoJr9n4IyqjQQMBqGpBnclcT/tHTjswsVa4dX9EHfiD vlQBuF2VMgGkqWfE6XZxcocH5IxSdN2dB23Rj+YJZ7SZDNqjXnibigrE9sa8W6f/vzK+3t NrwF1vI+6M1h87RzFWeiR+AR76CURw+A40uYaecnIvOK7Ic5OIYhYec225U0CDGLsbPP1o B7kd+PY2DYbve9NM+oGDls+YQbRxVS3NCz61sEuQkL28C0JWPzoBoeF5iEH16uLEUv5WZa O32CF7E4jDRV7ziOcN8UQBcWAyDtOAROSCdQf7r1vVz/a+C0zu+lWDOCJdOomw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755786146; a=rsa-sha256; cv=none; b=F9R1f26ECqFxRA3OUmM0vDZFtiwGWWZw9GSog2PV1vwXvQ+LTKbpnHofMx1Q2cileZZN6V lqbM8qVtOuNyCxZKo6ElaNvEepRlIOT00XY2GthsCr3e6d0JqRYRScbeVZExs1MSjOAD+C 0SQF7BtnZgbN63sWHWa5Yso4glxtg/iIoD6xeanGq32pSBaK1S85vrZUpU758Sw1YceXP/ VPD2mS7LJCxIy0kc5V7HddsMQmFsxpvuCxDSqeY0PTnf0yyomEss1mZvNMPKoLPI8je3qr N7OATtcf0W+0HN99tpxCEGoXEbRBbvT/uoNGxmSMi8sTZ0p5F1y/kpbktVP6UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c75BB3Kcqz13YM; Thu, 21 Aug 2025 14:22:26 +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 57LEMQ0t089993; Thu, 21 Aug 2025 14:22:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LEMQGT089990; Thu, 21 Aug 2025 14:22:26 GMT (envelope-from git) Date: Thu, 21 Aug 2025 14:22:26 GMT Message-Id: <202508211422.57LEMQGT089990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0dcce5bd70b0 - main - LinuxKPI: 802.11: add wiphy_locked_debugfs_read() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0dcce5bd70b00430c6c4b447724e88551e0eab0d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0dcce5bd70b00430c6c4b447724e88551e0eab0d commit 0dcce5bd70b00430c6c4b447724e88551e0eab0d Author: Bjoern A. Zeeb AuthorDate: 2025-08-13 22:00:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-21 14:21:48 +0000 LinuxKPI: 802.11: add wiphy_locked_debugfs_read() A wifi driver update required wiphy_locked_debugfs_read(). Add a skeleton implementation just reminding us of the TODO() for now. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 18b34f0e90ec..89d83b59f8f9 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -2064,6 +2065,18 @@ nl80211_chan_width_to_mhz(enum nl80211_chan_width width) } } +static __inline ssize_t +wiphy_locked_debugfs_read(struct wiphy *wiphy, struct file *file, + char *buf, size_t bufsize, const char __user *userbuf, size_t count, + loff_t *ppos, + ssize_t (*handler)(struct wiphy *, struct file *, char *, size_t, void *), + void *data) +{ + TODO(); + return (-ENXIO); +} + + static __inline ssize_t wiphy_locked_debugfs_write(struct wiphy *wiphy, struct file *file, char *buf, size_t bufsize, const char __user *userbuf, size_t count, From nobody Thu Aug 21 14:22:27 2025 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 4c75BD25bSz6500j; Thu, 21 Aug 2025 14:22:28 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c75BC4PXjz43GS; Thu, 21 Aug 2025 14:22:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786147; 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=cqQzmNTBiQePEW+I298viJ61kfF3FU3kPeCb+X2irzY=; b=qcyb4WDsY6mso/5r9f0guHLkeS/LjuWUxytBFj70dadGW3ZqjRwQQbFRkBOu0piRu3P6sk hrkpIeKcDTDL5J7oJpTgOirigH79lbcwPL2bDeDCi4nrAn9pVc9+I0Q9BOkRTlHKdWm5W1 oinEkOhR/BGNQLat2VLmLxT+eVTCn0WsgNsts6xBdIRbUz9DTatKbH+XgL/dqw5/kxFJGp 7QrQzN+PW4aYsIfTKN/B3nQQxTuDsvFIv8ve97MWmBGycuPUYOzkbtg5yrpsDG8vgrRnMm uoBad7Rv6oHZXWjqgsex34M5Xm9AsYkOEeae2txPrDXeRomqLY1TGSCqEQcneg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786147; 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=cqQzmNTBiQePEW+I298viJ61kfF3FU3kPeCb+X2irzY=; b=QHaLBIMBK2BAvfzxyn8gOwh0a1lYKvRfCB+CxM0SPK6qqpTZFRqg546TDl4j1lQOFB+Bjy +WxhgDvojVbwg8zfc6fdkb/J8a3mxm4FetY+lUZTMFfJPffofuWfF39TgUgfhXR520NlWc TE3PRXYidnvSp0S14xQSX3354/fD2CJEQPZKP/bdw8uZXvfJkWFH5p81HZYr1uQvmTdjyb e+GqPCBBBDfAd5cAgtFJyPXMQ9KW9La9sHZ9fzr6KaHfeLmYylxNB3Q1+IVLz3b/uSnE8D n341k6nv/87NuucSTrYVpK4EG30NzJoumqnQ4wI2dqgZu7EmKbL9ZU1rm4Aezg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755786147; a=rsa-sha256; cv=none; b=epANJ2VQzf0aTJRfcV0j6e2yaVPSuxtW9qAq9Y77RWpgZrerrmnwuJ9gUYXk+WrK7TlY3u URbb7RFk5hZO+uLL21+D5qpKJ8VD0XbrKvbAPzTdam2yj2OINux6LfZGA2bp5BtB56Zdew AEOIbGxttShLYWD8H7/u3cVx79+8QCbGQPM0UL7bQP3gNsRQxKlaHmC6lLVsGf9UIMGLga nbciYpsifocdAEbGqv2A901A/xtlkdvla9vMZoxAYxR7rz4GZ+0wKQ4l09YLih+r2q1YMY 1tHoqkq60hTbMSuJPKUY0DXUqmbBpiAJBBbBxUxnr+S9XxxyVhJ2CCTcUBIw7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c75BC3yrqz13H9; Thu, 21 Aug 2025 14:22:27 +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 57LEMRp7090541; Thu, 21 Aug 2025 14:22:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LEMRgF090527; Thu, 21 Aug 2025 14:22:27 GMT (envelope-from git) Date: Thu, 21 Aug 2025 14:22:27 GMT Message-Id: <202508211422.57LEMRgF090527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9f779097032c - main - LinuxKPI: 802.11: add dummy IEEE80211_EML_CAP_EMLSR_*_DELAY_256US 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f779097032cb9d41dfc6f7a57f41768463899f8 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9f779097032cb9d41dfc6f7a57f41768463899f8 commit 9f779097032cb9d41dfc6f7a57f41768463899f8 Author: Bjoern A. Zeeb AuthorDate: 2025-08-13 22:02:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-21 14:21:48 +0000 LinuxKPI: 802.11: add dummy IEEE80211_EML_CAP_EMLSR_*_DELAY_256US A wifi driver update needs these to compile. Just add them. We'll given them porper values when we'll do a full pass needing them. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 89d83b59f8f9..044f348ef08b 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -723,8 +723,10 @@ struct linuxkpi_ieee80211_regdomain { #define IEEE80211_EML_CAP_TRANSITION_TIMEOUT_128TU 0x04 #define IEEE80211_EML_CAP_EMLSR_PADDING_DELAY 0x08 #define IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_32US 0x10 +#define IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_256US 0x10 #define IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY 0x20 #define IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_64US 0x40 +#define IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_256US 0x40 #define VENDOR_CMD_RAW_DATA (void *)(uintptr_t)(-ENOENT) From nobody Thu Aug 21 14:22:47 2025 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 4c75Bc2fSxz6506p; Thu, 21 Aug 2025 14:22:48 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c75Bb64dkz43fj; Thu, 21 Aug 2025 14:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786167; 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=uRd75cbWXo3js+NHecg9HhA43K1uYyfwhqPC1Y+5qsI=; b=SeNjMG41+Y/NkfO1His03G4j+xRPDdl2BoNHjDv7atQRPNPQQZbhXw3kFOIOOveuiL7mXV wPMSh3OAAGYZ+YDng6KbbN2iDQTIZGaHYVA9xSh0KiNzNTDMIhnTlVTTfXpXElPgt8J6hR D8p855U9jDgEEUPZdcMcPeVRgHb76faaOZeGF2fkZaF6ILz3hnaUj5mNpKU3MWT/O191Mu /8oho/m4fYck3yKru3/bgGdwXz1l8/WoDpU8B4VsoAV63l/w7oeE01PEsVfhiGiOahNFxB n62fnqdhn2DYwmeRUxELBvciOpH0LQ87XamXI0wiW6LaOsY94wOSKQ5rfQr86Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786167; 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=uRd75cbWXo3js+NHecg9HhA43K1uYyfwhqPC1Y+5qsI=; b=cbq3npuu77WOz1KKWVQ/pwPhTockYgKrHQgODaZPe6EBmB4SPatcXTRisRsishAKdXfM9u qkLzErH/L1zaMN2FxaC8AsNrvJvFcQyX18NFvAIe3m7wMo+6itDZYXU8LwqsCy885pCTuP NZHcNFWfaJQZb7w1wfs3kaALH9Ri9HmHrD5PTQNxSXqnQPY6Ua8roEBrz6Uap1pOpX28y7 Nt9RNpIg1CKRgHpd4xFQKsVFabGOE/h8rrk8jtc75IgfJqd5XRz0xJ7DoCzBdBn53cMFxx lYdY2TSbgGPJIMp0S1cYlM509CD5+mDACbesXNxWFDWcPblF915dkUEfF3fgRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755786167; a=rsa-sha256; cv=none; b=xRjEdPkYoNEh4G1GsrHxUgFdq+BPvQrOQ+bikGXBCGoaX+85UDKkad6HGUwRx8oz2IIEtT 3NHK7XJwpxmW0Kr4byGSWKBqb5Ti2tqTyv6xZOrvaRyen+jNv5/qp6bLiIojwXXVMIRSpE Svb4nKrUhTLvVRPGimbTXaK2R9DBL4dOWQV/WG3khQGopcjCK9/wkoWQcYToehBboWBl5N BDJ7JXy1caHotQK/2OR8lT/e1VbVsvaePFas79iNxLe3QNYBJAFeSSM6xClJWsBVfdrFpK yqHqrWODzMk8x1+1VaHPx++mlprLUemJ6hLYiDgDVkeYVExPP4vLnzLtfP1kIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c75Bb5fsNz13YQ; Thu, 21 Aug 2025 14:22:47 +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 57LEMlYH092929; Thu, 21 Aug 2025 14:22:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LEMl95092926; Thu, 21 Aug 2025 14:22:47 GMT (envelope-from git) Date: Thu, 21 Aug 2025 14:22:47 GMT Message-Id: <202508211422.57LEMl95092926@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 274bf7c8ae7e - main - if_tuntap: make SIOCIFDESTROY interruptible 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 274bf7c8ae7e7b51853cd541481985f0e687f10e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=274bf7c8ae7e7b51853cd541481985f0e687f10e commit 274bf7c8ae7e7b51853cd541481985f0e687f10e Author: Kyle Evans AuthorDate: 2025-08-21 14:21:41 +0000 Commit: Kyle Evans CommitDate: 2025-08-21 14:22:44 +0000 if_tuntap: make SIOCIFDESTROY interruptible There's no good justification to permanently hang a thread until the tunnel can be destroyed. Make it interruptible so that the admin can ^C it and remedy the situation if something erroneously has the tunnel open, rather than forcing them to open another shell to resolve it. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D39740 --- sys/net/if_tuntap.c | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index 5e6f65c04b2f..275581ea2d4e 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -615,19 +615,34 @@ out: CURVNET_RESTORE(); } -static void -tun_destroy(struct tuntap_softc *tp) +static int +tun_destroy(struct tuntap_softc *tp, bool may_intr) { + int error; TUN_LOCK(tp); + MPASS((tp->tun_flags & TUN_DYING) == 0); tp->tun_flags |= TUN_DYING; - if (tp->tun_busy != 0) - cv_wait_unlock(&tp->tun_cv, &tp->tun_mtx); - else - TUN_UNLOCK(tp); + error = 0; + while (tp->tun_busy != 0) { + if (may_intr) + error = cv_wait_sig(&tp->tun_cv, &tp->tun_mtx); + else + cv_wait(&tp->tun_cv, &tp->tun_mtx); + if (error != 0) { + tp->tun_flags &= ~TUN_DYING; + TUN_UNLOCK(tp); + return (error); + } + } + TUN_UNLOCK(tp); CURVNET_SET(TUN2IFP(tp)->if_vnet); + mtx_lock(&tunmtx); + TAILQ_REMOVE(&tunhead, tp, tun_list); + mtx_unlock(&tunmtx); + /* destroy_dev will take care of any alias. */ destroy_dev(tp->tun_dev); seldrain(&tp->tun_rsel); @@ -648,6 +663,8 @@ tun_destroy(struct tuntap_softc *tp) cv_destroy(&tp->tun_cv); free(tp, M_TUN); CURVNET_RESTORE(); + + return (0); } static int @@ -655,12 +672,7 @@ tun_clone_destroy(struct if_clone *ifc __unused, struct ifnet *ifp, uint32_t fla { struct tuntap_softc *tp = ifp->if_softc; - mtx_lock(&tunmtx); - TAILQ_REMOVE(&tunhead, tp, tun_list); - mtx_unlock(&tunmtx); - tun_destroy(tp); - - return (0); + return (tun_destroy(tp, true)); } static void @@ -702,9 +714,9 @@ tun_uninit(const void *unused __unused) mtx_lock(&tunmtx); while ((tp = TAILQ_FIRST(&tunhead)) != NULL) { - TAILQ_REMOVE(&tunhead, tp, tun_list); mtx_unlock(&tunmtx); - tun_destroy(tp); + /* tun_destroy() will remove it from the tailq. */ + tun_destroy(tp, false); mtx_lock(&tunmtx); } mtx_unlock(&tunmtx); From nobody Thu Aug 21 14:22:48 2025 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 4c75Bd5qngz65DrX; Thu, 21 Aug 2025 14:22:49 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c75Bc6m7Gz43ll; Thu, 21 Aug 2025 14:22:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786168; 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=6mZNm9UkQo8rzhJANdS8UNyf4dFyasn1h8SMiZyoBT4=; b=VQS667EM3nPn51hk08+5L8Eq82lu0TAEdeo7l5ilvBwOs7y0HhVhyek2ToBrd8A8tWz/sO jaY89JSd65KSXN80fEMcWQfpRoLsQZeS9Iy90w4HFGC1HB2BaZ/NKtG1tndllE4/mHn59O NnwAMd7HH3UfIo55AP0Y7WClxIC7cEYdXd2S+q3N10XUldGSW6A7iSzgtB1njeVWUgbHxd gQ30aeqoxsPMgt0mxeshgFkZ56wGUc6Uu5NqaWVxlwHOQYh2s6/3wMhl/Mae2lbnvv5ywR P7H8jLXJEHRABeDQOOH4NgZ5MN8AsBR2kAoISsIJakQePBN6RBAnKSVdfgK4yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786168; 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=6mZNm9UkQo8rzhJANdS8UNyf4dFyasn1h8SMiZyoBT4=; b=DEbNutvKYmo6rXCPWkNAu4oUdr+Sh9Il7Fr8PkvxToTq7O3OjRNkRSewe1TmTiasTlQxo1 meKFzdl05LGwXKCqlJFMExZkjU8bwRRdRDcLb/Jp2DaEfNJ2v2kOnEXZcSETqWKifmIAZJ q67x4YK7rKM7rlcXAf4u//zVuRSh4oEQS1shF9/SDLQz7VxZZDGDK4WV7NI281BdHoiJ81 rTaqL8TBjctRP3QBLHoJDyMd0mpt+gmFt/unPAzDPTZ1O5GC12SBWj3Uu4ynKTkY5Jw1YY Xbq7KiyD4h8iUL6rsju0MeR2rrkikyI5twxBE54ZPT3mebkOfzjNueNmUvtCyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755786168; a=rsa-sha256; cv=none; b=IPiMKA5XQOwKnjylgnZwPTwfJPzguJXZbQdbIO3vWrozmvy64ZG7HT3UkpGmEYbdl1lzt5 aWHZ9WUq7lMXH+JXHHLsdRuuX3pQfo6qc8qYCtKNa/3XM+msQIhrjnpxdvI2q6P6rhVOwb ggzd0xGv+B1efGCcj2QX6jjBQcmlOQmGItOL4qX2/KOXZmUuGNtTRHtr/1R8WiqKCTxyqU PQaoEe+Tw/ppx8ZMnKM+HW0Xz6RNLDtPzAiRmgBuevQEZZPkx8Ekgpx4qkWyA8tUqFKCxA 27+vJ9UKSifu7Cipth99rYsp2eap1QxgtBSyaiDocsGauSxOCOXbOxOfGhd/MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c75Bc6MJHz13Mk; Thu, 21 Aug 2025 14:22:48 +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 57LEMm3K092962; Thu, 21 Aug 2025 14:22:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LEMmgp092959; Thu, 21 Aug 2025 14:22:48 GMT (envelope-from git) Date: Thu, 21 Aug 2025 14:22:48 GMT Message-Id: <202508211422.57LEMmgp092959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: a1174b3b1174 - main - tun(4)/tap(4): allow devices to be configured as transient 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1174b3b1174754b1f69406bff4456d002e8f583 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a1174b3b1174754b1f69406bff4456d002e8f583 commit a1174b3b1174754b1f69406bff4456d002e8f583 Author: Kyle Evans AuthorDate: 2025-08-21 14:21:42 +0000 Commit: Kyle Evans CommitDate: 2025-08-21 14:22:44 +0000 tun(4)/tap(4): allow devices to be configured as transient Transient tunnel devices are removed immediately after last close, so that an application that's created the tunnel could eliminate the need to manually destroy the tunnel whose lifetime it's already managing. Reviewed by: zlei Differential Revision: https://reviews.freebsd.org/D44200 --- share/man/man4/tap.4 | 15 +++++++++++ share/man/man4/tun.4 | 15 +++++++++++ sys/net/if_clone.h | 2 +- sys/net/if_tap.h | 2 ++ sys/net/if_tun.h | 2 ++ sys/net/if_tuntap.c | 50 ++++++++++++++++++++++++++++++++++++- tests/sys/net/Makefile | 1 + tests/sys/net/if_tun_test.sh | 22 ++++++++++++++++ tests/sys/net/transient_tuntap.c | 54 ++++++++++++++++++++++++++++++++++++++++ 9 files changed, 161 insertions(+), 2 deletions(-) diff --git a/share/man/man4/tap.4 b/share/man/man4/tap.4 index 95a681a923d2..a4fe98cdfecf 100644 --- a/share/man/man4/tap.4 +++ b/share/man/man4/tap.4 @@ -203,6 +203,21 @@ The argument should be a pointer to a The interface name will be returned in the .Va ifr_name field. +.It Dv TAPSTRANSIENT +The argument should be a pointer to an +.Va int ; +this sets the transient flag on +the +.Nm +device. +A transient +.Nm +will be destroyed upon last close. +.It Dv TAPGTRANSIENT +The argument should be a pointer to an +.Va int ; +this stores the current state (enabled or disabled) of the transient flag into +it. .It Dv FIONBIO Turn non-blocking I/O for reads off or on, according as the argument .Va int Ns 's diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4 index 58f67cb20acb..1c5bd35f0ab8 100644 --- a/share/man/man4/tun.4 +++ b/share/man/man4/tun.4 @@ -282,6 +282,21 @@ The argument should be a pointer to an the ioctl sets the value to one if the device is in .Dq multi-af mode, and zero otherwise. +.It Dv TUNSTRANSIENT +The argument should be a pointer to an +.Va int ; +this sets the transient flag on +the +.Nm +device. +A transient +.Nm +will be destroyed upon last close. +.It Dv TUNGTRANSIENT +The argument should be a pointer to an +.Va int ; +this stores the current state (enabled or disabled) of the transient flag into +it. .It Dv FIONBIO Turn non-blocking I/O for reads off or on, according as the argument .Vt int Ns 's diff --git a/sys/net/if_clone.h b/sys/net/if_clone.h index 5a74ffa1cc2f..d780e49af25f 100644 --- a/sys/net/if_clone.h +++ b/sys/net/if_clone.h @@ -153,7 +153,7 @@ int if_clone_destroy(const char *); int if_clone_list(struct if_clonereq *); void if_clone_restoregroup(struct ifnet *); -/* The below interfaces are used only by epair(4). */ +/* The below interfaces are used only by epair(4) and tun(4)/tap(4). */ void if_clone_addif(struct if_clone *, struct ifnet *); int if_clone_destroyif(struct if_clone *, struct ifnet *); diff --git a/sys/net/if_tap.h b/sys/net/if_tap.h index d84cd2eba6f3..8297b8d9e3d2 100644 --- a/sys/net/if_tap.h +++ b/sys/net/if_tap.h @@ -57,6 +57,8 @@ #define TAPGIFNAME TUNGIFNAME #define TAPSVNETHDR _IOW('t', 91, int) #define TAPGVNETHDR _IOR('t', 94, int) +#define TAPSTRANSIENT TUNSTRANSIENT +#define TAPGTRANSIENT TUNGTRANSIENT /* VMware ioctl's */ #define VMIO_SIOCSIFFLAGS _IOWINT('V', 0) diff --git a/sys/net/if_tun.h b/sys/net/if_tun.h index a8fb61db45a2..ccdc25944823 100644 --- a/sys/net/if_tun.h +++ b/sys/net/if_tun.h @@ -43,5 +43,7 @@ struct tuninfo { #define TUNSIFPID _IO('t', 95) #define TUNSIFHEAD _IOW('t', 96, int) #define TUNGIFHEAD _IOR('t', 97, int) +#define TUNSTRANSIENT _IOW('t', 98, int) +#define TUNGTRANSIENT _IOR('t', 99, int) #endif /* !_NET_IF_TUN_H_ */ diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index 275581ea2d4e..c8dbb6aa8893 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -132,6 +132,7 @@ struct tuntap_softc { #define TUN_DYING 0x0200 #define TUN_L2 0x0400 #define TUN_VMNET 0x0800 +#define TUN_TRANSIENT 0x1000 #define TUN_DRIVER_IDENT_MASK (TUN_L2 | TUN_VMNET) #define TUN_READY (TUN_OPEN | TUN_INITED) @@ -443,6 +444,18 @@ tuntap_name2info(const char *name, int *outunit, int *outflags) return (0); } +static struct if_clone * +tuntap_cloner_from_flags(int tun_flags) +{ + + for (u_int i = 0; i < NDRV; i++) + if ((tun_flags & TUN_DRIVER_IDENT_MASK) == + tuntap_drivers[i].ident_flags) + return (V_tuntap_driver_cloners[i]); + + return (NULL); +} + /* * Get driver information from a set of flags specified. Masks the identifying * part of the flags and compares it against all of the available @@ -621,7 +634,12 @@ tun_destroy(struct tuntap_softc *tp, bool may_intr) int error; TUN_LOCK(tp); - MPASS((tp->tun_flags & TUN_DYING) == 0); + + /* + * Transient tunnels may have set TUN_DYING if we're being destroyed as + * a result of the last close, which we'll allow. + */ + MPASS((tp->tun_flags & (TUN_DYING | TUN_TRANSIENT)) != TUN_DYING); tp->tun_flags |= TUN_DYING; error = 0; while (tp->tun_busy != 0) { @@ -1229,6 +1247,23 @@ out: tun_vnethdr_set(ifp, 0); tun_unbusy_locked(tp); + if ((tp->tun_flags & TUN_TRANSIENT) != 0) { + struct if_clone *cloner; + int error __diagused; + + /* Mark it busy so that nothing can re-open it. */ + tp->tun_flags |= TUN_DYING; + TUN_UNLOCK(tp); + + CURVNET_SET_QUIET(ifp->if_home_vnet); + cloner = tuntap_cloner_from_flags(tp->tun_flags); + CURVNET_RESTORE(); + + error = if_clone_destroyif(cloner, ifp); + MPASS(error == 0 || error == EINTR || error == ERESTART); + return; + } + TUN_UNLOCK(tp); } @@ -1680,6 +1715,19 @@ tunioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, case TUNGDEBUG: *(int *)data = tundebug; break; + case TUNSTRANSIENT: + TUN_LOCK(tp); + if (*(int *)data) + tp->tun_flags |= TUN_TRANSIENT; + else + tp->tun_flags &= ~TUN_TRANSIENT; + TUN_UNLOCK(tp); + break; + case TUNGTRANSIENT: + TUN_LOCK(tp); + *(int *)data = (tp->tun_flags & TUN_TRANSIENT) != 0; + TUN_UNLOCK(tp); + break; case FIONBIO: break; case FIOASYNC: diff --git a/tests/sys/net/Makefile b/tests/sys/net/Makefile index 65cc99a3e932..e390c6e8059d 100644 --- a/tests/sys/net/Makefile +++ b/tests/sys/net/Makefile @@ -40,6 +40,7 @@ ${PACKAGE}FILESMODE_stp.py= 0555 MAN= PROGS+= randsleep +PROGS+= transient_tuntap CFLAGS+= -I${.CURDIR:H:H} diff --git a/tests/sys/net/if_tun_test.sh b/tests/sys/net/if_tun_test.sh index a4ffe66e04ce..f4ce7800272e 100755 --- a/tests/sys/net/if_tun_test.sh +++ b/tests/sys/net/if_tun_test.sh @@ -56,8 +56,30 @@ basic_cleanup() vnet_cleanup } +atf_test_case "transient" "cleanup" +transient_head() +{ + atf_set descr "Test transient tunnel support" + atf_set require.user root +} +transient_body() +{ + vnet_init + vnet_mkjail one + + tun=$(jexec one ifconfig tun create) + atf_check -s exit:0 -o not-empty jexec one ifconfig ${tun} + jexec one $(atf_get_srcdir)/transient_tuntap /dev/${tun} + atf_check -s not-exit:0 -e not-empty jexec one ifconfig ${tun} +} +transient_cleanup() +{ + vnet_cleanup +} + atf_init_test_cases() { atf_add_test_case "235704" atf_add_test_case "basic" + atf_add_test_case "transient" } diff --git a/tests/sys/net/transient_tuntap.c b/tests/sys/net/transient_tuntap.c new file mode 100644 index 000000000000..b0cf43064317 --- /dev/null +++ b/tests/sys/net/transient_tuntap.c @@ -0,0 +1,54 @@ +/*- + * Copyright (c) 2024 Kyle Evans + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +/* + * This test simply configures the tunnel as transient and exits. By the time + * we return, the tunnel should be gone because the last reference disappears. + */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +int +main(int argc, char *argv[]) +{ + unsigned long tunreq; + const char *tundev; + int one = 1, tunfd; + + assert(argc > 1); + tundev = argv[1]; + + tunfd = open(tundev, O_RDWR); + assert(tunfd >= 0); + + /* + * These are technically the same request, but we'll use the technically + * correct one just in case. + */ + if (strstr(tundev, "tun") != NULL) { + tunreq = TUNSTRANSIENT; + } else { + assert(strstr(tundev, "tap") != NULL); + tunreq = TAPSTRANSIENT; + } + + if (ioctl(tunfd, tunreq, &one) == -1) + err(1, "ioctl"); + + /* Final close should destroy the tunnel automagically. */ + close(tunfd); + + return (0); +} From nobody Thu Aug 21 15:02:01 2025 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 4c76467125z65GfX; Thu, 21 Aug 2025 15:02:14 +0000 (UTC) (envelope-from zlei@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c76466l92z3C11; Thu, 21 Aug 2025 15:02:14 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755788534; 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=RJS4vrOh3L0w3HHUi0Bh5zUM9cwVX2ByCp+daTqohUk=; b=suDmlzhsV5zqStzy6wua/BwD1r82HKcxO7rh/aSh5C8wkfrzewECuzVsfBQxidt8l2zDde Ngfmd9bchVQh9FsmOckKRENOIhwltpwwBoDKCPnsnAhiGm6+PS2Rc81v2+cQv7UfqqttZS HRy6mKIsjFs/sIhW63D4VI/LjQZb3wdL4vWl47YVD63O//qLUDMizQpr/6JHppif6nOQXd N6FoUKOFE2/4IY/YcXtHvyHob/5U+A4eX0R7i11Tbf3zPYuejW6hegkavYpjoqb5wOex63 HSrllDRJYgCuPTlvNKgkujCUOcPgERZ1xqg8+dWS0L9FlWq5oX3EUUCWtsQXiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755788534; 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=RJS4vrOh3L0w3HHUi0Bh5zUM9cwVX2ByCp+daTqohUk=; b=rHaCq5Vq4n+d8ikpNz3CcAuQwZag9VjzOyxcApKz617vcLyEoFw+YsrRvuLRw5tONHxYPn Tx1s2j+6vfWiAai9n4S7Lb9pxAxWvrqyZsVaUpUohnVnW3HE6uj6cMzebBxGvWm/Ugqgxs Q5qgUVLPhpD9qtJOgSPFaPqcUX+yMQ/e5k2blyvEPhOc3jSqLnBKHY3iJ1LfsqEBDUWtfM 0L5hNjI8iJzMJ3pWM/iNWf6umyUCbg1E99QOaKM/uPThVhGBA0H/uxhh9bmR1obrOtKTei 9UL6ts0dLdJIsbBi3jdBZju9C3p6f++AQ/G6uf1RUGSy8qbOp9GcsJZ8w574ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755788534; a=rsa-sha256; cv=none; b=oF6kawScIbG70CUSgVoJVTNeSZSdAcKZgRWrWfO4/xuHhae6lkt3YGHzslSQpo2CSyxjv4 B4RkbLV71C0s7czREjUS+D/13S7zdnSC5bt/q1Q8wSA2+UA5luEjaA1BhaVrwD2h6Tl232 ziPhjoh8tnrYgT7EU7uuFj3KOoYZwbwgGbp7WQt5X8Ri1OJ9tICSvxxsUAf8KkQ7b0cDQP 8PmCv9v+WPYRog8xsYtjNRAEySj12nkI5Dhv5Q7JX+6QLJB0A4edk/262UaL4I36AhnJS2 A6P1TOl6V4zTj81p4N09uXMhdtCJ2ZHPSQtiivWZoEgOXhRqp6TPR9qoMJWAjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2001:19f0:6001:9db:98f0:9fe0:3545:10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c764439QSz5hY; Thu, 21 Aug 2025 15:02:12 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: <65F7C538-6AF3-429B-AC08-541A7C7CA1D0@FreeBSD.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_A0529DCA-96D6-4CB5-A525-0800EA98418A" 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 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 458ac2b6e445 - main - umb.4: Improve synposis, add netmap Date: Thu, 21 Aug 2025 23:02:01 +0800 In-Reply-To: Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: Alexander Ziaee References: X-Mailer: Apple Mail (2.3696.120.41.1.10) --Apple-Mail=_A0529DCA-96D6-4CB5-A525-0800EA98418A Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Aug 21, 2025, at 10:08 PM, Alexander Ziaee = wrote: >=20 > On 2025-08-20 23:21 -04:00 EDT, "Zhenlei Huang" > wrote: >> Hi Alexander, >>=20 >> I'd presume umb(4) does not depends on netmap. A quick search of = DEV_NETMAP >>=20 >> ``` >> #ifdef DEV_NETMAP >> static void umb_input(if_t , struct mbuf *); >> #endif >> ... >> #ifdef DEV_NETMAP >> if_setinputfn(ifp, umb_input); >> #endif >> ``` >>=20 >> I think the #ifdef can be removed. I currently do not have that = hardware so I'd appreciate if someone can test it. >=20 > I didn't get that far myself, this commit was partially in response to = comment 67 [0] on the original bug where a user got the driver working = on FreeBSD 14 by adding `device netmap` to their kernconf, and it didn't = work without that. >=20 > Should we send this to khorben? >=20 > [0] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D263783#c67 = I replied to PR 263783.=20 >=20 > Best, > Alex >=20 >>=20 >> Best regards, >> Zhenlei >>=20 >>> On Aug 21, 2025, at 9:50 AM, Alexander Ziaee = wrote: >>>=20 >>> The branch main has been updated by ziaee: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D458ac2b6e4452acc1a614352c8945ecc= 37667aa0 >>>=20 >>> commit 458ac2b6e4452acc1a614352c8945ecc37667aa0 >>> Author: Alexander Ziaee >>> AuthorDate: 2025-08-20 14:45:08 +0000 >>> Commit: Alexander Ziaee >>> CommitDate: 2025-08-21 01:48:13 +0000 >>>=20 >>> umb.4: Improve synposis, add netmap >>>=20 >>> Rewrite synopsis in a more consistent style, and add "device = netmap", >>> In FreeBSD 15, netmap is included in = GENERIC/{amd64,arm64,powerpc64}, >>> but it still needs to be used in FreeBSD 14 or custom kernels = which >>> don't include GENERIC. >>>=20 >>> MFC after: umb does not mfc >>> Reviewed by: gbe >>> Differential Revision: https://reviews.freebsd.org/D51732 >>> --- >>> share/man/man4/umb.4 | 28 ++++++++++++++-------------- >>> 1 file changed, 14 insertions(+), 14 deletions(-) >>>=20 >>> diff --git a/share/man/man4/umb.4 b/share/man/man4/umb.4 >>> index 7ecc9a39c1ca..311a50faf8e7 100644 >>> --- a/share/man/man4/umb.4 >>> +++ b/share/man/man4/umb.4 >>> @@ -17,34 +17,34 @@ >>> .\" >>> .\" $NetBSD: umb.4,v 1.4 2019/08/30 09:22:17 wiz Exp $ >>> .\" >>> -.Dd May 11, 2025 >>> +.Dd August 4, 2025 >>> .Dt UMB 4 >>> .Os >>> .Sh NAME >>> .Nm umb >>> .Nd USB Mobile Broadband Interface Model (MBIM) cellular modem = driver >>> .Sh SYNOPSIS >>> -To compile this driver into the kernel, >>> -place the following lines in your >>> -kernel configuration file: >>> -.Bd -ragged -offset indent >>> +.Cd "device netmap" >>> .Cd "device usb" >>> .Cd "device umb" >>> -.Ed >>> .Pp >>> -Alternatively, to load the driver as a >>> -module at boot time, place the following line in >>> +In >>> .Xr loader.conf 5 : >>> -.Bd -literal -offset indent >>> -umb_load=3D"YES" >>> -.Ed >>> -.Pp >>> -If neither of the above is done, the driver will automatically be = loaded >>> -by devd(8) when the device is connected. >>> +.Cd umb_load=3D"YES" >>> .Sh DESCRIPTION >>> The >>> .Nm >>> driver provides support for USB MBIM devices. >>> +If the appropriate hardware is detected, >>> +the driver will be loaded automatically by >>> +.Xr devmatch 8 . >>> +To load the driver manually, >>> +.Cm load >>> +it in >>> +.Xr loader.conf 5 >>> +or at the >>> +.Xr loader 8 >>> +prompt. >>> .Pp >>> MBIM devices establish connections via cellular networks such as >>> GPRS, UMTS, and LTE. --Apple-Mail=_A0529DCA-96D6-4CB5-A525-0800EA98418A Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii

On Aug 21, 2025, at 10:08 PM, Alexander Ziaee <ziaee@FreeBSD.org> = wrote:

On 2025-08-20 23:21 -04:00 EDT, "Zhenlei Huang" <zlei@FreeBSD.org> = wrote:
Hi = Alexander,

I'd presume umb(4) does not = depends on netmap. A quick search of DEV_NETMAP

```
#ifdef DEV_NETMAP
static void =      umb_input(if_t , struct mbuf *);
#endif
...
#ifdef DEV_NETMAP
       if_setinputfn(ifp, = umb_input);
#endif
```

I think the #ifdef can be removed. I currently do not have = that hardware so I'd appreciate if someone can test it.

I didn't get that far myself, this commit was partially in = response to comment 67 [0] on the original bug where a user got the = driver working on FreeBSD 14 by adding `device netmap` to their = kernconf, and it didn't work without that.

Should we send this to khorben?

[0] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D263783#c67<= /a>

I = replied to PR 263783. 


Best,
Alex


Best regards,
Zhenlei

On Aug 21, 2025, at 9:50 AM, Alexander Ziaee <ziaee@FreeBSD.org> = wrote:

The branch main has been updated by = ziaee:

URL: https://cgit.FreeBSD.org/src/commit/?id=3D458ac2b6e4452acc1a614= 352c8945ecc37667aa0

commit = 458ac2b6e4452acc1a614352c8945ecc37667aa0
Author: =     Alexander Ziaee <ziaee@FreeBSD.org>
AuthorDate: 2025-08-20 14:45:08 +0000
Commit: =     Alexander Ziaee <ziaee@FreeBSD.org>
CommitDate: 2025-08-21 01:48:13 +0000

  umb.4: Improve synposis, add netmap

  Rewrite synopsis in a more = consistent style, and add "device netmap",
  In = FreeBSD 15, netmap is included in GENERIC/{amd64,arm64,powerpc64},
  but it still needs to be used in FreeBSD 14 or = custom kernels which
  don't include GENERIC.

  MFC after: =             &n= bsp;umb does not mfc
  Reviewed by: =            gbe
  Differential Revision:  https://reviews.freebsd.org/D51732
---
share/man/man4/umb.4 | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/share/man/man4/umb.4 = b/share/man/man4/umb.4
index 7ecc9a39c1ca..311a50faf8e7 = 100644
--- a/share/man/man4/umb.4
+++ = b/share/man/man4/umb.4
@@ -17,34 +17,34 @@
.\"
.\" $NetBSD: umb.4,v 1.4 2019/08/30 = 09:22:17 wiz Exp $
.\"
-.Dd May 11, 2025
+.Dd August 4, 2025
.Dt UMB 4
.Os
.Sh NAME
.Nm umb
.Nd USB Mobile Broadband Interface Model (MBIM) cellular = modem driver
.Sh SYNOPSIS
-To compile this = driver into the kernel,
-place the following lines in = your
-kernel configuration file:
-.Bd = -ragged -offset indent
+.Cd "device netmap"
.Cd "device usb"
.Cd "device umb"
-.Ed
.Pp
-Alternatively, to load = the driver as a
-module at boot time, place the following = line in
+In
.Xr loader.conf 5 :
-.Bd -literal -offset indent
-umb_load=3D"YES"-.Ed
-.Pp
-If neither of the = above is done, the driver will automatically be loaded
-by = devd(8) when the device is connected.
+.Cd = umb_load=3D"YES"
.Sh DESCRIPTION
The
.Nm
driver provides support for USB MBIM = devices.
+If the appropriate hardware is detected,
+the driver will be loaded automatically by
+.Xr = devmatch 8 .
+To load the driver manually,
+.Cm load
+it in
+.Xr loader.conf = 5
+or at the
+.Xr loader 8
+prompt.
.Pp
MBIM devices = establish connections via cellular networks such as
GPRS, = UMTS, and LTE.



= --Apple-Mail=_A0529DCA-96D6-4CB5-A525-0800EA98418A-- From nobody Thu Aug 21 15:10:47 2025 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 4c76Fz67BHz65GvP; Thu, 21 Aug 2025 15:10:47 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c76Fz5LW0z3DwB; Thu, 21 Aug 2025 15:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755789047; 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=9O33Ttz6XosEDasKb3vNN/Gza3pXCLLzwilN9dESaCk=; b=NY9Hy6Ijqth4+EOgXPJYbO+TnHLC+wkjRym0hWHqdA0yRPdnkBelWFg2P2FTXziIOt6Geg bCv8KflhjADNxwSqPj8X2DV9jOWi+L5LwfiXBACm1Tpss5xfHHL5gcLRpoylsgaK3hHhE5 EF98lR173tVz1OXs9FgVHvil7pWAw6eJk9vlB6F8qFHr/ln3tVej/TrIg5lnhjgyJrVppz KctR5/2IKc+dB0I6TxstfFsXG0J56e+v+E8UcP1Vz0BLWtWaHDhhngm6bo+JnkVZj3F95Y I6mYR7GwpXdvVTb5/tD8G6IwmqAosUgyT50Nt/3F1p5pWgCVzIOyBvtwkCbTzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755789047; 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=9O33Ttz6XosEDasKb3vNN/Gza3pXCLLzwilN9dESaCk=; b=wtTZoECt6m/7Q7xsner2waSeKZer3h2BRpcxoFhEfpgbmRQgfMHE+MnX6vr3tR4s9puYIC fwDLy6QWogx2sgwIFM4p0pEi2xgIK/qOf1vIH69xfwu1b78lIPr86ta9/dZ+Qm86COeDy7 V3m6P3ynipHFywInFVrvmTUFpoaGo8VGjfusSgdVJu/rh/Xs39uy6Xnd4uqthVtI05eiM7 pSsU3j5dLrSa8Vigi+5/s6D46O7op3dkQHYOXEy+zpi8ZwGEcbzwHQjV5QFW+kt9TbGuTK PMop5CqdZzGfRlksLBkFgM8eEQRZ1FmhMoinbzkMDQ8izESkwGCLeT9scHnGWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755789047; a=rsa-sha256; cv=none; b=BMi113vl4HQb9EuUNw9jMAs+757nlAoP0xZAKkNOqK0aQdrEVKUIq+fktgpvkAlLTQyFDL LV1tP22lVvq/Oit+guVvcBAo0vyMNcayoQoDWea5FnSoSqClZkyUajwFhz59jwq5+9arvY 5acJVFp+FW+ARpQTs/nZTAFE37DG3TaURiSaMxvUYbdgkwT0kFIAdfisCjwEpkvUDCX2J+ lrh5GffV++TSRLYhFBQiHtqUr2xq9FHZHGpbO08OIYH/Olqn3VhIuejnWSIEAys7ZG7fH5 IdqMWf9MC4vwXdTyuR+hP+AFbR4Kyy0AoYKdlauDy2+VRBUXFjVpbn83olKOdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c76Fz4ddtz14MJ; Thu, 21 Aug 2025 15:10:47 +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 57LFAlmE079491; Thu, 21 Aug 2025 15:10:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LFAliU079488; Thu, 21 Aug 2025 15:10:47 GMT (envelope-from git) Date: Thu, 21 Aug 2025 15:10:47 GMT Message-Id: <202508211510.57LFAliU079488@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 027be99b1f33 - main - Stub is_tftp when LOADER_NET_SUPPORT is not enabled 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 027be99b1f33a5121380e46db54ca6e40a80fe9d Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=027be99b1f33a5121380e46db54ca6e40a80fe9d commit 027be99b1f33a5121380e46db54ca6e40a80fe9d Author: Simon J. Gerraty AuthorDate: 2025-08-21 15:08:53 +0000 Commit: Simon J. Gerraty CommitDate: 2025-08-21 15:08:53 +0000 Stub is_tftp when LOADER_NET_SUPPORT is not enabled common/misc.c is a non-optional part of loader. If LOADER_NET_SUPPORT is not defined provide a stub that always returns false. Reviewed by: kevans, des Differential Revision: https://reviews.freebsd.org/D52060 --- stand/common/misc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/stand/common/misc.c b/stand/common/misc.c index 402213100951..a7c46ad2e74c 100644 --- a/stand/common/misc.c +++ b/stand/common/misc.c @@ -220,3 +220,16 @@ set_currdev(const char *devname) env_setenv("loaddev", EV_VOLATILE | EV_NOHOOK, devname, env_noset, env_nounset); } + +#ifndef LOADER_NET_SUPPORT +/* + * This api is normally provided by dev_net.c + * This stub keeps libsa happy when LOADER_NET_SUPPORT + * is not enabled. + */ +bool +is_tftp(void) +{ + return false; +} +#endif From nobody Thu Aug 21 15:56:39 2025 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 4c77Jf4QT0z65Klb; Thu, 21 Aug 2025 15:58:10 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from mx0b-00273201.pphosted.com (mx0b-00273201.pphosted.com [67.231.152.164]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.pphosted.com", Issuer "Sectigo RSA Organization Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c77Jf07y2z3Lfq; Thu, 21 Aug 2025 15:58:09 +0000 (UTC) (envelope-from sjg@juniper.net) Authentication-Results: mx1.freebsd.org; none Received: from pps.filterd (m0108161.ppops.net [127.0.0.1]) by mx0b-00273201.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 57LEPJut001523; Thu, 21 Aug 2025 08:58:08 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h= cc:content-id:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS1017; bh=LSDWjcYFDiJBddolvMQ1RK5BsyVX0PEwxmzEYpMrSFM=; b=ElQM MjNti9Dqcb8VR7dEdjkK9V/xUxqcYv49lzeko1zpEu3qUGAlvR4BtvEDH1LFzvoP 2lwh23Aiqz3QlDjtulVdeo4hBo69wgIvZyYJNiru1qDBbOMmKEZM61Xi5eYSWWnp Ah4DKSfoIk6ACW4hPY2Nb5EZ0Q4Eahp0arqn44BRdDLnK3Jx0wHmzVigvve1/gkA Xw5nGls7FtfOh92ZFjaXLc8jV6L3pFy5f0G7TdjLj2tju+D1+9hs+uJgEw09CnzU UpN7mh8iDTKvv/og27qfgMqh/7cdtYHjGzy27+sa7JEK/ZoQaRafTD0cvNBEuI/v N8Qn0TtLURIrU3x+qA== Received: from sj2pr03cu001.outbound.protection.outlook.com (mail-westusazon11022106.outbound.protection.outlook.com [52.101.43.106]) by mx0b-00273201.pphosted.com (PPS) with ESMTPS id 48nrg7tcxg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 21 Aug 2025 08:58:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qAEw8M8aLYdp2FO64Cvi3S29LubQFqgI1UaKmTraw87nMm2Z1/CZCCsqUJdDmU9TBhDMMSLijc+KiTtTW8zdJEIxQXniE211WVCDWAdFv5cOkZjKUdwtMcvieXRHumIs6OFxp0RZ3D9IX6p1hbqWor1SuzweIazaekCOvIJyBlWtTFxcwGkMfqYtJzKOb5eaGwuR9PM5FpiD26DXD6YcxhHH+iWjE0eTXBS3+IRx008S/g9SCijzonsHspQzVqned0okrE940EuIkI+0peyC0ZGY9CfKeLG2g5kiMBb7bN9sgcTWt/SCRPnvnse+6ISaHXHtsTaPTbis/2VPcjlYlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LSDWjcYFDiJBddolvMQ1RK5BsyVX0PEwxmzEYpMrSFM=; b=a+wnwAAgB0DKmQmE1spGNsrEAjoIAoztn+Qzgn1E6kC2bL8l/FK0iziq9oWwTtojc1NePoD3hYEN+aEWAqVH88XRKB3YWVb8X/4ndqF4WSOwJXlm+IJ6YShK8mZuCpfUBLQimVQFEx+eknsmH1E2uquzBQjyLxxa8vHb22451zP5uVYL+3qrTQCYx7Pu9PP+kUYxbj5zfQP/91zm334CStCMxKOmYiyNRQ2jjBc4beHhLPFXerewock0Klm966f890F+ByUYoGqNsk/mFOWkAvJkXj9jnjRyGc7e4r6iW6m+gTTeRcphBdpE74YEMoNjZ/Q6g7R8t0Mhs55wz9l8RA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 66.129.239.14) smtp.rcpttodomain=freebsd.org smtp.mailfrom=juniper.net; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=juniper.net; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LSDWjcYFDiJBddolvMQ1RK5BsyVX0PEwxmzEYpMrSFM=; b=VqvoRF5v1auXWC+1lOwSfff6uUeBMXfoNHFoJ99hgFzF1F6c73uoY5LxRSjx2odjkAu4rOAUUYKOwhno7PtK8P1kjCO0ueSZqITmQ0lxcFJ40qrl3ojn7WGbEA5w+mds3//5+RHmI5PVsfNPhOkPdD8caPX3ql9HMX0C/DHhjEg= Received: from SJ2PR07CA0010.namprd07.prod.outlook.com (2603:10b6:a03:505::27) by IA1PR05MB9453.namprd05.prod.outlook.com (2603:10b6:208:42f::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.23; Thu, 21 Aug 2025 15:58:03 +0000 Received: from CY4PEPF0000FCBE.namprd03.prod.outlook.com (2603:10b6:a03:505:cafe::55) by SJ2PR07CA0010.outlook.office365.com (2603:10b6:a03:505::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.16 via Frontend Transport; Thu, 21 Aug 2025 15:58:03 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 66.129.239.14) smtp.mailfrom=juniper.net; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=juniper.net; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.14 as permitted sender) Received: from p-exchfe-eqx-01.jnpr.net (66.129.239.14) by CY4PEPF0000FCBE.mail.protection.outlook.com (10.167.242.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.8 via Frontend Transport; Thu, 21 Aug 2025 15:58:03 +0000 Received: from p-exchbe-eqx-02.jnpr.net (10.104.9.15) by p-exchfe-eqx-01.jnpr.net (10.104.9.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Thu, 21 Aug 2025 10:58:02 -0500 Received: from kaos.jnpr.net (10.104.20.6) by p-exchbe-eqx-02.jnpr.net (10.104.9.15) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Thu, 21 Aug 2025 10:58:02 -0500 Received: by kaos.jnpr.net (Postfix, from userid 1377) id E82A6DDAEC; Thu, 21 Aug 2025 08:56:39 -0700 (PDT) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id E5569DDCC3; Thu, 21 Aug 2025 08:56:39 -0700 (PDT) To: A FreeBSD User CC: , , , Subject: Re: git: b44cc1b479fe - main - loader: do not try to open directories with TFTP In-Reply-To: <20250821060752.001c9599@thor.sb211.local> References: <202508202248.57KMmcTO016280@gitrepo.freebsd.org> <20250821060752.001c9599@thor.sb211.local> Comments: In-reply-to: A FreeBSD User message dated "Thu, 21 Aug 2025 06:12:17 +0200." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.8; Emacs 30.1 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-ID: <73036.1755791799.1@kaos.jnpr.net> Content-Transfer-Encoding: quoted-printable Date: Thu, 21 Aug 2025 08:56:39 -0700 Message-ID: <77790.1755791799@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCBE:EE_|IA1PR05MB9453:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a636ef7-0cdb-45f0-4d46-08dde0cb82cd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?DF8gqg5j9Z4lz65xvUZwooypL76mHicxsjkGubDDQsZ+AY/TbhYeUlpv41+C?= =?us-ascii?Q?qg/KIk/005OZSCHMVX+8A0YVorbM2s3D82HVrkhzn04nWMMCRnqU4rFDTCvg?= =?us-ascii?Q?jWY7jkaomaDX96UeLFJH/r+eQ31EomUACEij5J1MIhxKm63lICCaTagm3S8h?= =?us-ascii?Q?Eb/rNsyMV1c/IF7u6c6NlZQEXh+J+6GO3RQ5ebdI72N/RcapruKXcQQK9T+q?= =?us-ascii?Q?GuhMSrAFRdESKqB9oAZL7MMp/jJ+vewPdI2CYHIoeO26unSR+LmHvEXrLf0e?= =?us-ascii?Q?ij1KkYql4G/OK9kAjcJXwWpEtcmCC5ZN0+7BsM0NjZXgd1PluHZRFcOKft3Y?= =?us-ascii?Q?7xH3mMpEgaO0OUUxTRhC/M2VBnaGVQ4+f1bNLWkeYLkrxU3EyAQ9NOpn9hrV?= =?us-ascii?Q?XFjOh5sKnGVyQNWFYY2TqrQEKqohTvLdtknMP4qvaU3iQubOqvgtz52pGS3h?= =?us-ascii?Q?L7M0IXbetRWoPEM4wKpu8eFcUiwoRX9MSUmsZK15mfqKRAZzfXSiMJbFqh+S?= =?us-ascii?Q?iMoTd4Eg77VN1S5bGQ3CeZ/Ip/FZePu/RkXXpVUCsChg1q9a5h25JDEObN70?= =?us-ascii?Q?uJQEOqMuZbXKVWbPF+FprinNUAthW/TPx51V2JfEKqJzJyENyHbOM1nCEtB5?= =?us-ascii?Q?OR9QQN76toneXHg6OXy4IgvVlzHGbwKxBj7Ntb8qN3EwkGqYTBN7j2KB5LO+?= =?us-ascii?Q?fXMxT5PIIrINzu0LlaMpZ7ZXvhwCuUj+VPpmHdxL+KGA7VKuI5mW55h4iHUX?= =?us-ascii?Q?dbQjY19etL0MTNqZ4Jqo+0761UvG9Idyf+bLTY4Irij1FrlPUycebLeq/DaC?= =?us-ascii?Q?DIok8efSgxW5yoGMsSKiAV6YPGLfhGxJpzdNejDAfac08RSkQaIGXUklbmFj?= =?us-ascii?Q?TT6+SmTzL+hIKgnUQ9Zmz8SVvxvCUT3+kuMXwabdPfTVgl6jPgAuwiD6i+Rf?= =?us-ascii?Q?KHoRcAhKK/WjPbpHcIeVZKD6N+EvL3A8jr+mTEfDNaQm55bBuAx/V5KQqcfn?= =?us-ascii?Q?2ApFRfHE2ykOsl2XwFEYDi75v79EXKsV+KWH3Cgul4nnMkdGFPo771SPTp7o?= =?us-ascii?Q?PMzoSvwGwzz0i4YutgU8SN2hXuqFBQxnVxfGH7eFl0q1atPGvCE4jZ4O9jLV?= =?us-ascii?Q?lkZn8s6jhxE6kulU1Hdk8bg0uP/aTK5o5aHNq9dX4LyXjiWpOeLwuO0Jqetj?= =?us-ascii?Q?9Q33+IYk0RnVoZOl4F8GFWRDVpMzPHlDeurwZ2Rxn+6FQdvGP2Ezls9HfTwW?= =?us-ascii?Q?UT3TgVko1IasZ6hgnbdmzqzhJoTZNJmQeYGqMahPs8PwI3ovPsP0RvcRYPYX?= =?us-ascii?Q?fGNosVj2P4CLEkOFIor3mnhLnVGeY2o5RWHWZ0eeaL4iTI3NEd/lO0X7XiaN?= =?us-ascii?Q?NvpXo3xrhgrLIEfMiO6ao03OoQCFvebT/p+HeSiJdtvXjLaSdClzOY3CMn2f?= =?us-ascii?Q?39flJ4C63IoqGIGkmPyQlV0Uv7rGMFFuFAU9JKXmj4P0pIwxu9dvm3zCH9Wj?= =?us-ascii?Q?6gKVo5eaG16m9CA375DnImR7CoosNKmFZJg0?= X-Forefront-Antispam-Report: CIP:66.129.239.14;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:p-exchfe-eqx-01.jnpr.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1102; X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2025 15:58:03.3373 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1a636ef7-0cdb-45f0-4d46-08dde0cb82cd X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.239.14];Helo=[p-exchfe-eqx-01.jnpr.net] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000FCBE.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR05MB9453 X-Proofpoint-ORIG-GUID: Jz_gfLQQrkvmjpEE4pDXlnQGJpY0_g0n X-Authority-Analysis: v=2.4 cv=FItCB+os c=1 sm=1 tr=0 ts=68a74210 cx=c_pps a=6iYJ5OEDqVuPLaleVyjC8A==:117 a=f/rncuQqEjTEF/G1odkJ9w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=h8e1o3o8w34MuCiiGQrqVE4VwXA=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=kj9zAlcOel0A:10 a=2OwXVqhp2XgA:10 a=s63m1ICgrNkA:10 a=rhJc5-LppCAA:10 a=g5FOr8Xe_G7IYw9hO9AA:9 a=CjuIK1q_8ugA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODIwMDIxMCBTYWx0ZWRfX/pzalGYaRKSp zOKqnQ+opADtAEJK8zV1U9LqrEWnBtqIGTKvnuGeRmUXA1AwKespUs5MHyGR93e7Y060GXX6XDx 8DSYcxLcVuFWAOn2uoJNh+KYW1FnNC+UtZZtWnunG+QyU7Db80TxQH8q0J0o6LQkBSbQtMWwdcS MP5WIeG4kmgNgFcsO+8bsr3KcJXayD2iUkYg2MXej6mCKhASOZ+bYzvzsVa+sBHKqs0hmLeLTDj XbxwZtdTB41Fhksfed0j6xWr8jlAOMvXwtSGGY2quPGhVnqCGOO4GroVLCSMXurEnt5ST63rwgC 9IMniH9MOiC57RaJTbYdtwlTQV2rLBgoZAYdeteJvtiaGzZYsC/koRZ4IhcxfUowPNFlai6v3S+ fGQtjYQaxLHTIZ7g+IX2JFO2Xyc2Sg== X-Proofpoint-GUID: Jz_gfLQQrkvmjpEE4pDXlnQGJpY0_g0n X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-21_03,2025-08-20_03,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 lowpriorityscore=0 malwarescore=0 spamscore=0 adultscore=0 impostorscore=0 suspectscore=0 phishscore=0 clxscore=1011 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2508110000 definitions=main-2508200210 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:22843, ipnet:67.231.152.0/24, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c77Jf07y2z3Lfq A FreeBSD User wrote: > = > Build of world/kernel fails with the error below: Thanks, this should be fixed now > --- all_subdir_stand/i386/gptzfsboot --- > ld: error: undefined symbol: is_tftp > >>> referenced by open.c > >>> open.o:(open) in archive /usr/obj/usr/src/amd64.amd64/= stand From nobody Thu Aug 21 15:58:19 2025 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 4c77Jq490bz65Kln; Thu, 21 Aug 2025 15:58:19 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c77Jq2HYcz3LlF; Thu, 21 Aug 2025 15:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791899; 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=9vfOsJjrvy3PqfgklrsWaBCus0KQO1BZKGSf5f6u3W8=; b=ahDaER5G2Or3oJS+Y8RtGHoTgNulgjvCjSfJqvpfF8qDzPVr2ZkxLSfJG0LkehdiHCt7pc 3mMr8K/Hps08SrKBe8c8vKPj7A8tPjrgmVLZfCD3FtNjzRAuoLKKxi2yLGbxr3+EsELg49 z8qTofCZYQ4PKNTedRAjGcmZJQqhTy9Quh2dlL3LXjqHYJ3vsdGX3Am61iKPzXTLp3Jqjh D+gnaX23QO4A3xGx+8tG5P7cA2NMaJ6JFaaB6pqgFN3+23oTPH/DDn8tSYO713bnRyDpve FmhoGVvheCQDZCV0AlGr390mUWgm3qpTMzMsNEUWZ76sUSRhpKNVLyKp05AyLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791899; 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=9vfOsJjrvy3PqfgklrsWaBCus0KQO1BZKGSf5f6u3W8=; b=m2fw0LeMDereZSHBd4MibJyz0BYBCYf8hND6e0h0m+Xfyd08rRoTV8k6oxiqUDDEsJ9+IR SPDKhC+fpbrWaZiwr1s7QIHGjzn7NXLzeqUzWF7srxZCFjp1Yk1KJBYYk/299usjoXT25m wUrNgI6KJ8sPV6sWYkhjWS+j4sedeGs8PkQd+0pRZpZ0q9Pwj4dgPMIJFN8JhCVEFkI7UO 6UTWvpPAba2OKCfkgyYmy7qJwB49TCV7WM7gluy8VT/hONWe1ajAnqZaaH8UB543DWGC8g kjAt0Qw9Iso0usABtoXWmGhbD/w77Wh7j/BJ4JJJipQalSIS38qItlIVOnyjhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755791899; a=rsa-sha256; cv=none; b=t5fnolyys+2HTGKZW9iTNrrfb+tqmLoy6X8JRAegHWdeXgfgukPpBqVxAgmi+z7wIHfLu8 a5Hsq+0M7VEm+Ne3BQx4UkEM7mN1vV9qn/Exal4+GRnIQDDhzfyPSuc8j/0r31mJKrCItj mfA9NaVabyE1CLFUEEknuQQeKoDOUpfYp1uaXlxANl/A6N+klSL5C2Cy4slg4ADq8Tj+mq 3JN27N/3CDcu9bW67ET6fFIzvKnAoa3UtRMyWqobzqznQULP8dPlxLxv/fSflfN6YX4uxi M6QgCBSQHqZAnHIT/ty5vF8FA2b4LwH4AVBw7M/rAibfRzoM4gHKE6Y1YkU7hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c77Jq1psVz154m; Thu, 21 Aug 2025 15:58:19 +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 57LFwJhm062694; Thu, 21 Aug 2025 15:58:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LFwJBY062691; Thu, 21 Aug 2025 15:58:19 GMT (envelope-from git) Date: Thu, 21 Aug 2025 15:58:19 GMT Message-Id: <202508211558.57LFwJBY062691@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: eebadc7d8590 - main - sys/conf: Remap paths for reproducibility 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: eebadc7d8590ff8d38fdbcfd90651c931e713648 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eebadc7d8590ff8d38fdbcfd90651c931e713648 commit eebadc7d8590ff8d38fdbcfd90651c931e713648 Author: Mark Johnston AuthorDate: 2025-08-21 14:04:14 +0000 Commit: Mark Johnston CommitDate: 2025-08-21 15:56:23 +0000 sys/conf: Remap paths for reproducibility As in bsd.lib.mk and bsd.prog.mk, we need to remap paths in the kernel and in kernel modules when reproducible builds are configured. Add directives to kern.post.mk and kmod.mk to remap the src, obj and sysroot dirs. For the sysroot, we need to pass the value of the SYSROOT variable to the kernel makefiles, which involves changing Makefile.inc1. In so doing I reverted a portion of commit 35fb812adfc21; I can't see any harm in passing the SYSROOT variable down. MFC after: 1 month Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50953 --- Makefile.inc1 | 2 +- sys/conf/kern.post.mk | 17 +++++++++++++++-- sys/conf/kmod.mk | 23 +++++++++++++++++++++-- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d65d1c86deac..d899f994a40d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1051,7 +1051,7 @@ DESTDIR_MTREE= ${DISTR_MTREECMD} ${DESTDIR_MTREEFLAGS} METALOG_SORT_CMD= env -i LC_COLLATE=C sort # kernel stage -KMAKEENV= ${WMAKEENV:NSYSROOT=*} +KMAKEENV= ${WMAKEENV} KMAKE= ${TIME_ENV} ${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME} # diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 0e4ffd92724e..1accd3fa8df4 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -372,6 +372,19 @@ _ILINKS+= x86 _ILINKS+= i386 .endif +.if ${MK_REPRODUCIBLE_BUILD} != "no" +PREFIX_SYSDIR=/usr/src/sys +PREFIX_OBJDIR=/usr/obj/usr/src/${MACHINE}.${MACHINE_CPUARCH}/sys/${KERN_IDENT} +CFLAGS+= -ffile-prefix-map=${SYSDIR}=${PREFIX_SYSDIR} +CFLAGS+= -ffile-prefix-map=${.OBJDIR}=${PREFIX_OBJDIR} +.if defined(SYSROOT) +CFLAGS+= -ffile-prefix-map=${SYSROOT}=/sysroot +.endif +.else +PREFIX_SYSDIR=${SYSDIR} +PREFIX_OBJDIR=${.OBJDIR} +.endif + # Ensure that the link exists without depending on it when it exists. # Ensure that debug info references the path in the source tree. .for _link in ${_ILINKS} @@ -379,9 +392,9 @@ _ILINKS+= i386 ${SRCS} ${DEPENDOBJS}: ${_link} .endif .if ${_link} == "machine" -CFLAGS+= -fdebug-prefix-map=./machine=${SYSDIR}/${MACHINE}/include +CFLAGS+= -fdebug-prefix-map=./machine=${PREFIX_SYSDIR}/${MACHINE}/include .else -CFLAGS+= -fdebug-prefix-map=./${_link}=${SYSDIR}/${_link}/include +CFLAGS+= -fdebug-prefix-map=./${_link}=${PREFIX_SYSDIR}/${_link}/include .endif .endfor diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 645c04cdd135..0fd2d4050cf1 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -303,6 +303,25 @@ all: ${PROG} beforedepend: ${_ILINKS} beforebuild: ${_ILINKS} +.if ${MK_REPRODUCIBLE_BUILD} != "no" +PREFIX_SYSDIR=/usr/src/sys +CFLAGS+= -ffile-prefix-map=${SYSDIR}=${PREFIX_SYSDIR} +.if defined(KERNBUILDDIR) +PREFIX_KERNBUILDDIR=/usr/obj/usr/src/${MACHINE}.${MACHINE_CPUARCH}/sys/${KERNBUILDDIR:T} +PREFIX_OBJDIR=${PREFIX_KERNBUILDDIR}/modules/usr/src/sys/modules/${.OBJDIR:T} +CFLAGS+= -ffile-prefix-map=${KERNBUILDDIR}=${PREFIX_KERNBUILDDIR} +.else +PREFIX_OBJDIR=/usr/obj/usr/src/${MACHINE}.${MACHINE_CPUARCH}/sys/modules/${.OBJDIR:T} +.endif +CFLAGS+= -ffile-prefix-map=${.OBJDIR}=${PREFIX_OBJDIR} +.if defined(SYSROOT) +CFLAGS+= -ffile-prefix-map=${SYSROOT}=/sysroot +.endif +.else +PREFIX_SYSDIR=${SYSDIR} +PREFIX_OBJDIR=${.OBJDIR} +.endif + # Ensure that the links exist without depending on it when it exists which # causes all the modules to be rebuilt when the directory pointed to changes. # Ensure that debug info references the path in the source tree. @@ -311,9 +330,9 @@ beforebuild: ${_ILINKS} OBJS_DEPEND_GUESS+= ${_link} .endif .if ${_link} == "machine" -CFLAGS+= -fdebug-prefix-map=./machine=${SYSDIR}/${MACHINE}/include +CFLAGS+= -fdebug-prefix-map=./machine=${PREFIX_SYSDIR}/${MACHINE}/include .else -CFLAGS+= -fdebug-prefix-map=./${_link}=${SYSDIR}/${_link}/include +CFLAGS+= -fdebug-prefix-map=./${_link}=${PREFIX_SYSDIR}/${_link}/include .endif .endfor From nobody Thu Aug 21 15:58:16 2025 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 4c77Jp18fhz65KT3; Thu, 21 Aug 2025 15:58:18 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c77Jn1KQsz3LHX; Thu, 21 Aug 2025 15:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791897; 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=20vTwWXSNF0DfkFPBtJUkSz1z8HlFoW9EXLfhPckL+8=; b=p4UoLrdFifOsWxxtIhhBDsssZccWVvBOQ+VmMXXq/KzDKA43g2HSF+YNfZXrDiGb135FPI UA7NblBA7T6Wal/+9wl0qqCvZHItHz/pOm3IFPSiKbesZLbCevVJa5vM8Osu5t1RhapX8N o48c6ofEk5rV8vD417aFo4gI1ULST7ma/8dXCLrHxB+YnHuNSt2LNyMpTGyhqURwliKtI4 XR2TOToIVtw2bppGWBMQWoo1oSzbZ5RC1Fw/ZJ7WfgaT4RIXGF9wkdEyn1TckDRJl/i42T C5OXLVqxLxd+V9ET7rV9vSQPnLZ83j7d92rcvho3mDpz6uFMErizh65c1ENiWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791897; 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=20vTwWXSNF0DfkFPBtJUkSz1z8HlFoW9EXLfhPckL+8=; b=q2iwI+xS4svVAwwmGeTvqeQSpHBEyWb4ahx9hWZ21LwxfbWo2+8ssA1sa6UeQIGW31LKBs tm6tqL9j0sulXUDCCTaqaMyB4Zs/yxDOCiJfG6RhOLnQwtYTOUZRf5kvpQyc9fZRjUYZFn PGruwV1X1KvzidWP7r0eAH178Y9MYx0ZqogMtP7sTRAaR4B4TBzV5oySo0jZCJ6o3xDwHU T7RmyY6dpV8cmOMAMGTqa7axobwtai7/rlzVbczXICh5OcGMowaaQXDEcJtNrbLG+BFV2K ll7FwKyxUWUhu91g3f5IOQGhNmlTs9hYX4sTxlko49dloDF3UdawB52+Nmnncw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755791897; a=rsa-sha256; cv=none; b=Yr60A4Z1u2mDiCNcAGUM8xEpI1M7w5MYnwmV3Ew5mPYEckp3P0snq8KJolnlJZ4HgGZLFk jfzcp2CqDXvg8D4IRrm0bl/JdVWDHB3+WVhvUYyOvdCB8v6oGa/a1DgW++oenMIaKVhVea q87h1I1BGaniTvx5RjKu1RRe4AT43G/3/Me4fFXS1yjx3Jc2tv3V6EhfX07RkyEEKAewG4 uJP6m6ELV3s96D3bseTW30OLnY8sUxqT8zs9NgUeNNQQ6zN8/FBV/crum4RgylOp3Lfqk0 0IpXh3cYgv+ia8rc5Mces23q+fpe1MSMhFtemTDC8OjHonKF301Pn27lgazhEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c77Jn0c2Pz154l; Thu, 21 Aug 2025 15:58:17 +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 57LFwGYb062622; Thu, 21 Aug 2025 15:58:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LFwGQ1062619; Thu, 21 Aug 2025 15:58:16 GMT (envelope-from git) Date: Thu, 21 Aug 2025 15:58:16 GMT Message-Id: <202508211558.57LFwGQ1062619@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: 3a239e46c4aa - main - share/mk: Deduplicate some handling of debug info 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: 3a239e46c4aa1dc62a74b40f6a0feb030f089a0c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3a239e46c4aa1dc62a74b40f6a0feb030f089a0c commit 3a239e46c4aa1dc62a74b40f6a0feb030f089a0c Author: Mark Johnston AuthorDate: 2025-08-21 14:06:19 +0000 Commit: Mark Johnston CommitDate: 2025-08-21 15:56:23 +0000 share/mk: Deduplicate some handling of debug info bsd.prog.mk and bsd.lib.mk contain a bunch of duplicated logic used to handle DEBUG_FLAGS and standalone debug file info (enabled by MK_DEBUG_FILES). In anticipation of adding more duplicated logic, let's try factoring it out into a separate bsd.debug.mk first. bsd.debug.mk now handles the following: - MK_ASSERT_DEBUG - installation rules for debug files (the consumer has to set DEBUGFILE) - updating CFLAGS and CXXFLAGS based on DEBUG_FLAGS - optionally stripping installed files No functional change intended. Reviewed by: bdrewery Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D51805 --- share/mk/Makefile | 1 + share/mk/bsd.README | 1 + share/mk/bsd.debug.mk | 46 ++++++++++++++++++++++++++++++++++++++++++ share/mk/bsd.lib.mk | 52 ++++++++---------------------------------------- share/mk/bsd.own.mk | 7 ++++++- share/mk/bsd.prog.mk | 55 ++++++++++----------------------------------------- 6 files changed, 72 insertions(+), 90 deletions(-) diff --git a/share/mk/Makefile b/share/mk/Makefile index 4ab5c8cc314b..0e786b381fe2 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -22,6 +22,7 @@ FILES= \ bsd.confs.mk \ bsd.cpu.mk \ bsd.crunchgen.mk \ + bsd.debug.mk \ bsd.dep.mk \ bsd.dirs.mk \ bsd.doc.mk \ diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 4820bf12c72d..89ee8527895e 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -20,6 +20,7 @@ bsd.compiler.mk - defined based on current compiler bsd.confs.mk - install of configuration files bsd.cpu.mk - sets CPU/arch-related variables (included from sys.mk) bsd.crunchgen.mk - building crunched binaries using crunchgen(1) +bsd.debug.mk - handling debug options for bsd.{prog,lib}.mk bsd.dep.mk - handle Makefile dependencies bsd.dirs.mk - handle directory creation bsd.doc.mk - building troff system documents diff --git a/share/mk/bsd.debug.mk b/share/mk/bsd.debug.mk new file mode 100644 index 000000000000..fc80bc103061 --- /dev/null +++ b/share/mk/bsd.debug.mk @@ -0,0 +1,46 @@ +# +# This file configures debug options for compiled targets. It is meant +# to consolidate common logic in bsd.prog.mk and bsd.lib.mk. It should +# not be included directly by Makefiles. +# + +.include + +.if ${MK_ASSERT_DEBUG} == "no" +CFLAGS+= -DNDEBUG +# XXX: shouldn't we ensure that !asserts marks potentially unused variables as +# __unused instead of disabling -Werror globally? +MK_WERROR= no +.endif + +.if defined(DEBUG_FLAGS) +CFLAGS+=${DEBUG_FLAGS} +CXXFLAGS+=${DEBUG_FLAGS} + +.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" +CTFFLAGS+= -g +.endif +.else +STRIP?= -s +.endif + +.if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \ + empty(DEBUG_FLAGS:M-gdwarf*) +.if !${COMPILER_FEATURES:Mcompressed-debug} +CFLAGS+= ${DEBUG_FILES_CFLAGS:N-gz*} +CXXFLAGS+= ${DEBUG_FILES_CFLAGS:N-gz*} +.else +CFLAGS+= ${DEBUG_FILES_CFLAGS} +CXXFLAGS+= ${DEBUG_FILES_CFLAGS} +.endif +CTFFLAGS+= -g +.endif + +_debuginstall: +.if ${MK_DEBUG_FILES} != "no" && defined(DEBUGFILE) +.if defined(DEBUGMKDIR) + ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dbg} -d ${DESTDIR}${DEBUGFILEDIR}/ +.endif + ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dbg} -o ${DEBUGOWN} -g ${DEBUGGRP} -m ${DEBUGMODE} \ + ${DEBUGFILE} ${DESTDIR}${DEBUGFILEDIR}/${DEBUGFILE} +.endif diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 3013f32c2b36..fa851984df91 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,3 @@ - .include .include .include @@ -45,23 +44,6 @@ SONAME?= ${SHLIB_NAME} CFLAGS+= ${CRUNCH_CFLAGS} .endif -.if ${MK_ASSERT_DEBUG} == "no" -CFLAGS+= -DNDEBUG -# XXX: shouldn't we ensure that !asserts marks potentially unused variables as -# __unused instead of disabling -Werror globally? -MK_WERROR= no -.endif - -.if defined(DEBUG_FLAGS) -CFLAGS+= ${DEBUG_FLAGS} - -.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" -CTFFLAGS+= -g -.endif -.else -STRIP?= -s -.endif - .for _libcompat in ${_ALL_libcompats} .if ${SHLIBDIR:M*/lib${_libcompat}} || ${SHLIBDIR:M*/lib${_libcompat}/*} TAGS+= lib${_libcompat} @@ -130,18 +112,6 @@ CXXFLAGS+= -fzero-call-used-regs=${ZEROREG_TYPE} # bsd.sanitizer.mk is not installed, so don't require it (e.g. for ports). .sinclude "bsd.sanitizer.mk" -.if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \ - empty(DEBUG_FLAGS:M-gdwarf*) -.if !${COMPILER_FEATURES:Mcompressed-debug} -CFLAGS+= ${DEBUG_FILES_CFLAGS:N-gz*} -CXXFLAGS+= ${DEBUG_FILES_CFLAGS:N-gz*} -.else -CFLAGS+= ${DEBUG_FILES_CFLAGS} -CXXFLAGS+= ${DEBUG_FILES_CFLAGS} -.endif -CTFFLAGS+= -g -.endif - .if ${MACHINE_CPUARCH} == "riscv" && ${LINKER_FEATURES:Mriscv-relaxations} == "" CFLAGS += -mno-relax .endif @@ -156,6 +126,7 @@ _SHLIBDIR:=${SHLIBDIR} .if defined(SHLIB_NAME) .if ${MK_DEBUG_FILES} != "no" SHLIB_NAME_FULL=${SHLIB_NAME}.full +DEBUGFILE= ${SHLIB_NAME}.debug # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory .if ${_SHLIBDIR} == "/boot" ||\ ${SHLIBDIR:C%/lib(/.*)?$%/lib%} == "/lib" ||\ @@ -272,16 +243,16 @@ ${SHLIB_NAME_FULL}: ${SOBJS} .endif .if ${MK_DEBUG_FILES} != "no" -CLEANFILES+= ${SHLIB_NAME_FULL} ${SHLIB_NAME}.debug -${SHLIB_NAME}: ${SHLIB_NAME_FULL} ${SHLIB_NAME}.debug - ${OBJCOPY} --strip-debug --add-gnu-debuglink=${SHLIB_NAME}.debug \ +CLEANFILES+= ${SHLIB_NAME_FULL} ${DEBUGFILE} +${SHLIB_NAME}: ${SHLIB_NAME_FULL} ${DEBUGFILE} + ${OBJCOPY} --strip-debug --add-gnu-debuglink=${DEBUGFILE} \ ${SHLIB_NAME_FULL} ${.TARGET} .if defined(SHLIB_LINK) && !commands(${SHLIB_LINK:R}.ld) # Note: This uses ln instead of ${INSTALL_LIBSYMLINK} since we are in OBJDIR @${LN:Uln} -fs ${SHLIB_NAME} ${SHLIB_LINK} .endif -${SHLIB_NAME}.debug: ${SHLIB_NAME_FULL} +${DEBUGFILE}: ${SHLIB_NAME_FULL} ${OBJCOPY} --only-keep-debug ${SHLIB_NAME_FULL} ${.TARGET} .endif .endif #defined(SHLIB_NAME) @@ -392,8 +363,8 @@ installpcfiles-${pcfile}: ${pcfile} installpcfiles: .PHONY .if !defined(INTERNALLIB) -realinstall: _libinstall installpcfiles -.ORDER: beforeinstall _libinstall +realinstall: _libinstall installpcfiles _debuginstall +.ORDER: beforeinstall _libinstall _debuginstall _libinstall: .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ @@ -403,14 +374,6 @@ _libinstall: ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/ -.if ${MK_DEBUG_FILES} != "no" -.if defined(DEBUGMKDIR) - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dbg} -d ${DESTDIR}${DEBUGFILEDIR}/ -.endif - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dbg} -o ${LIBOWN} -g ${LIBGRP} -m ${DEBUGMODE} \ - ${_INSTALLFLAGS} \ - ${SHLIB_NAME}.debug ${DESTDIR}${DEBUGFILEDIR}/ -.endif .if defined(SHLIB_LINK) .if commands(${SHLIB_LINK:R}.ld) ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ @@ -501,6 +464,7 @@ SUBDIR_TARGETS+= check TESTS_LD_LIBRARY_PATH+= ${.OBJDIR} .endif +.include .include .include .include diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 00a048fedc1d..4dffe9723a9e 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -44,6 +44,10 @@ # # DEBUGMODE Mode for debug files. [${NOBINMODE}] # +# DEBUGOWN Owner for debug info files. [root] +# +# DEBUGGRP Group for debug info files. [wheel] +# # # KMODDIR Base path for loadable kernel modules # (see kld(4)). [/boot/modules] @@ -197,7 +201,8 @@ LIBMODE?= ${NOBINMODE} DEBUGDIR?= /usr/lib/debug DEBUGMODE?= ${NOBINMODE} - +DEBUGOWN?= ${BINOWN} +DEBUGGRP?= ${BINGRP} # Share files SHAREDIR?= /usr/share diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 9350d4786cec..10e1c177e2b2 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -12,22 +12,6 @@ CFLAGS+=${COPTS} .endif -.if ${MK_ASSERT_DEBUG} == "no" -CFLAGS+= -DNDEBUG -# XXX: shouldn't we ensure that !asserts marks potentially unused variables as -# __unused instead of disabling -Werror globally? -MK_WERROR= no -.endif - -.if defined(DEBUG_FLAGS) -CFLAGS+=${DEBUG_FLAGS} -CXXFLAGS+=${DEBUG_FLAGS} - -.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" -CTFFLAGS+= -g -.endif -.endif - .if defined(PROG_CXX) PROG= ${PROG_CXX} .endif @@ -109,20 +93,6 @@ CFLAGS += -mno-relax .if defined(CRUNCH_CFLAGS) CFLAGS+=${CRUNCH_CFLAGS} -.else -.if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \ - empty(DEBUG_FLAGS:M-gdwarf-*) -.if !${COMPILER_FEATURES:Mcompressed-debug} -CFLAGS+= ${DEBUG_FILES_CFLAGS:N-gz*} -.else -CFLAGS+= ${DEBUG_FILES_CFLAGS} -.endif -CTFFLAGS+= -g -.endif -.endif - -.if !defined(DEBUG_FLAGS) -STRIP?= -s .endif .if defined(NO_ROOT) @@ -159,6 +129,9 @@ PROG_FULL= ${PROG} .if defined(PROG) PROGNAME?= ${PROG} +.if ${MK_DEBUG_FILES} != "no" +DEBUGFILE= ${PROGNAME}.debug +.endif .if defined(SRCS) @@ -223,11 +196,12 @@ ${PROG_FULL}: ${OBJS} .endif # !defined(SRCS) .if ${MK_DEBUG_FILES} != "no" -${PROG}: ${PROG_FULL} ${PROGNAME}.debug - ${OBJCOPY} --strip-debug --add-gnu-debuglink=${PROGNAME}.debug \ +CLEANFILES+= ${PROG_FULL} ${DEBUGFILE} +${PROG}: ${PROG_FULL} ${DEBUGFILE} + ${OBJCOPY} --strip-debug --add-gnu-debuglink=${DEBUGFILE} \ ${PROG_FULL} ${.TARGET} -${PROGNAME}.debug: ${PROG_FULL} +${DEBUGFILE}: ${PROG_FULL} ${OBJCOPY} --only-keep-debug ${PROG_FULL} ${.TARGET} .endif @@ -266,9 +240,6 @@ all: all-man .if defined(PROG) CLEANFILES+= ${PROG} ${PROG}.bc ${PROG}.ll -.if ${MK_DEBUG_FILES} != "no" -CLEANFILES+= ${PROG_FULL} ${PROGNAME}.debug -.endif .endif .if defined(OBJS) @@ -308,19 +279,12 @@ _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} .endfor .if !target(realinstall) && !defined(INTERNALPROG) -realinstall: _proginstall -.ORDER: beforeinstall _proginstall +realinstall: _proginstall _debuginstall +.ORDER: beforeinstall _proginstall _debuginstall _proginstall: .if defined(PROG) ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} -.if ${MK_DEBUG_FILES} != "no" -.if defined(DEBUGMKDIR) - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dbg} -d ${DESTDIR}${DEBUGFILEDIR}/ -.endif - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dbg} -o ${BINOWN} -g ${BINGRP} -m ${DEBUGMODE} \ - ${PROGNAME}.debug ${DESTDIR}${DEBUGFILEDIR}/${PROGNAME}.debug -.endif .endif .endif # !target(realinstall) @@ -391,6 +355,7 @@ TESTS_PATH+= ${.OBJDIR} OBJS_DEPEND_GUESS+= ${SRCS:M*.h} .endif +.include .include .include .include From nobody Thu Aug 21 15:58:18 2025 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 4c77Jq14yrz65KjL; Thu, 21 Aug 2025 15:58:19 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c77Jp1w2qz3Ll9; Thu, 21 Aug 2025 15:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791898; 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=7EbqxRaGqNtPxYEVSyAK/QjtuPS2R+T7snaB9cwaCJ4=; b=h09D4CVSYN2Ws5YtPT4PH2HF9uLINSe0638hB/ppqnRGjzpCuJhGpNXIOMJj4f8w4ptVU0 nie2g+Bdr48MSAxqn1xluy5HX6dcPCqnx3UZgwjnrMetCcYVdBfK6L8j6dFQNeAF1o5UGq X/hFvEbAAqJlWDWBPF+K51TlXG+nIAJ3Z8+oleOt/b6zgjEOpjcDsZ9zkdtdvDf9wIPiqT PsJeg31ycLntoMukVitVptMnmjLxS8AJ4QbjMBVwBrK8IE5IyzShrAd5sVTUf2W7vi8+wA 51BsFWGSVoSLgEa5l5c5ORa/whUYnenyEHJwg9Pbb7h8s5KYVX2YPc+RZVBFIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791898; 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=7EbqxRaGqNtPxYEVSyAK/QjtuPS2R+T7snaB9cwaCJ4=; b=l080CmOpigPMr6dF4ZQs6uAAPwVxORA06R8P+XiPdbfQyG1jtf/7Eu9wKilZdHJclSsRZi PfCWhGbJMG3LqQmgtONu1lcEOJVXJ2mxsd3Tv1h4cqCgX5tRWGcubr7QR6aidYJBVOvhtj u+jc3oIinhGFmxXAGzpnOvtVB2zBU42VUfXEkVmjyODFUBiR2PI7nP0S8rnbHB7ur0wwcq fiWyBbvN2vVvUjdfq5R3lAxWJXZcIjiAEFs3yc0DbnlldKx+DHKEWJRZuqsAtrZiavxI3q AbQMS21kBU8/8YP6BDn1NlD8uQiWF8vV7cfYqepEs927fmVKT2Mk+uB9lLZnLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755791898; a=rsa-sha256; cv=none; b=lJeTUHAIy+bUuh8x0hCumJubGZFmPmtMsqTXLxyfSOoLTXfKzQNW9B7m2rhux3kkgA0kPS zqe3kg1Ge2mswifuCJXpi7N1bOpIhjVF3XFZ02woqL0RVRPfZwFeVqwKi/ohtD75qYiITS NjJIMJTTavml5HgA8idl/6Y34A8I761Z3lwpC7Ipww+1GbPrStzjBVSUIPOIVriGLXFBiZ 9ASfJzeaAys4veTW2iynJ8BuVT5Php1t5Jrd8TMWhUsRSATvMLeAYRYIJnJsFa7udlKTZN wJ0wHFMOXEt7Vp3aVKqkruLc9lT1TZtroizgLHA66f4ZNtRUxDFHwtD1EN+CZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c77Jp0rFpz15mr; Thu, 21 Aug 2025 15:58:18 +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 57LFwIcv062661; Thu, 21 Aug 2025 15:58:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LFwIQg062658; Thu, 21 Aug 2025 15:58:18 GMT (envelope-from git) Date: Thu, 21 Aug 2025 15:58:18 GMT Message-Id: <202508211558.57LFwIQg062658@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: 4f81c42fbd76 - main - share/mk: Substitute reproducible prefixes in dwarf info 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: 4f81c42fbd76e25c9fe696fa08296b79c55fbf09 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4f81c42fbd76e25c9fe696fa08296b79c55fbf09 commit 4f81c42fbd76e25c9fe696fa08296b79c55fbf09 Author: Mark Johnston AuthorDate: 2025-08-21 14:06:34 +0000 Commit: Mark Johnston CommitDate: 2025-08-21 15:56:23 +0000 share/mk: Substitute reproducible prefixes in dwarf info Ensure that worlds/releases built from different source paths are reproducible. Currently they are not since src and obj paths are embedded in DWARF info. There are some uses of __FILE__ in the src tree as well, and they are similarly handled by this change. Use /usr/src and /usr/obj as the canonical src and obj paths when WITH_REPRODUCIBLE_BUILD is defined. Define a DEBUG_PREFIX variable which is used to ask the compiler to substitute paths in output files using -ffile-prefix-map. Compat builds (i.e., lib32) complicate things since they override OBJROOT to point to obj-${compat} but still refer to headers from the native objroot (e.g., llvm headers). MFC after: 1 month Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50951 --- share/mk/bsd.debug.mk | 22 ++++++++++++++++++++++ share/mk/bsd.opts.mk | 1 + 2 files changed, 23 insertions(+) diff --git a/share/mk/bsd.debug.mk b/share/mk/bsd.debug.mk index fc80bc103061..cf2fb4356aef 100644 --- a/share/mk/bsd.debug.mk +++ b/share/mk/bsd.debug.mk @@ -13,6 +13,28 @@ CFLAGS+= -DNDEBUG MK_WERROR= no .endif +# If reproducible build mode is enabled, map the root of the source +# directory to /usr/src and the root of the object directory to +# /usr/obj. +.if ${MK_REPRODUCIBLE_BUILD} != "no" && !defined(DEBUG_PREFIX) +.if defined(SRCTOP) +DEBUG_PREFIX+= ${SRCTOP:S,/$,,}=/usr/src +.endif +.if defined(OBJROOT) +# Strip off compat subdirectories, e.g., /usr/obj/usr/src/amd64.amd64/obj-lib32 +# becomes /usr/obj/usr/src/amd64.amd64, since object files compiled there might +# refer to something outside the root. +DEBUG_PREFIX+= ${OBJROOT:S,/$,,:C,/obj-[^/]*$,,}=/usr/obj +.endif +.endif + +.if defined(DEBUG_PREFIX) +.for map in ${DEBUG_PREFIX} +CFLAGS+= -ffile-prefix-map=${map} +CXXFLAGS+= -ffile-prefix-map=${map} +.endfor +.endif + .if defined(DEBUG_FLAGS) CFLAGS+=${DEBUG_FLAGS} CXXFLAGS+=${DEBUG_FLAGS} diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 85247d733a14..439924d0d596 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -78,6 +78,7 @@ __DEFAULT_NO_OPTIONS = \ CCACHE_BUILD \ CTF \ INSTALL_AS_USER \ + REPRODUCIBLE_BUILD \ RETPOLINE \ RUN_TESTS \ STALE_STAGED \ From nobody Thu Aug 21 15:58:20 2025 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 4c77Jr6F23z65KwH; Thu, 21 Aug 2025 15:58:20 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c77Jr3lCWz3Lwf; Thu, 21 Aug 2025 15:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791900; 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=GjYrJgqWGOcny3iQ37B2S2YYW8G5pEsZtf7gyJxyXKI=; b=NzU8BVJcd4QKmo83+2fS2UcIfjAC0zSnNNXOtBaDooz/KBHHCRYAauhdODfXE5I1PzdhP/ rAhPy2rRmpSQ9gU+ut2o5l7RV9b+SLDN9kmfS/MTv4ICy9BUiStpGCkB9SIrA4BzX/qw/T 4t8VGMcqqVjgZGYREg8rIZV5e/t4ghhtLF7pTc7KTQKo3Ct+FsLveW/98s4nxzea0Lge/8 hp2TZFQLgJX0raqBgGyPmgSdKfnXWsLPMExWAXpXWfD2FxKzz6PnkMRVMEaUlm0VoBu1Ab pULyzx8XRBsjVL1D9A3T0JHLNFzf8IFD55DhyhiuAeSmP+YvOZlsydvD2EBNLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791900; 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=GjYrJgqWGOcny3iQ37B2S2YYW8G5pEsZtf7gyJxyXKI=; b=Z11GmZjtp5VNVsvmGyhTBYpVN8gqpNblfXroX0WasjjtWtMPqjzeDnAnhlNjKXKOhrbU9g EPYKmDH15YiolLOgBcqqaf0/GE6eULpeAggNGkhGo3VBYL0ERFHKQ4gv7Rbm9V3arVYBjl rmDd+1hVvHaVx+ylBF7surP8BRXcD2+DVpm7YFsid0w3u0/HxeDkONtkO4ftYnY29fa1F+ 01SwLs6fmRnuab/K4Vxx/RBIaGJ9NtWsPvaKN7q4W3dFOKCOyF7PTCkIeZOONmZr7FlyMC twsC6479hAJzo38uhxT0rVwFJUqFZ+AnRaBKZ42H7mb6+mmX4ALj/g6hG/UESQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755791900; a=rsa-sha256; cv=none; b=XV04zXbXaH0ODa4vfUxZDdX7+BVvAgk4yO2E2Yc4+fBheYKZcHPZ2RrJ6a19j98o61kjQY i1OnOctfH3C4jHvvjqzWIUenbkZVq7jtajALDlKXSELYC0f0EGU704a4BMZfiSQaiMko7Z nN/D53F8EMzpkJCg+rWxMB65iEX7f/ZabL4EPIQHDJQv5aS/NoaRFg/7WFEbFG7lTYALut y1GqSXD+siWhx+AbPNDuwWT6dOuJzr8gDPi3K+YHTv5EFye4Up1tp6IZRvZg8dRcOghtpW mG2XbF3f9gBKg2Hg4aRSpCglqntixztGG1z5oRA9asJIcK8VMZ4FcXYHGYUjMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c77Jr2mYPz15GX; Thu, 21 Aug 2025 15:58:20 +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 57LFwKhn062728; Thu, 21 Aug 2025 15:58:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LFwK9r062725; Thu, 21 Aug 2025 15:58:20 GMT (envelope-from git) Date: Thu, 21 Aug 2025 15:58:20 GMT Message-Id: <202508211558.57LFwK9r062725@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: 3238878379d3 - main - newvers: Add a builddir parameter 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: 3238878379d3bd4bb9796ccb41c090139bbde94f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3238878379d3bd4bb9796ccb41c090139bbde94f commit 3238878379d3bd4bb9796ccb41c090139bbde94f Author: Mark Johnston AuthorDate: 2025-08-21 14:05:19 +0000 Commit: Mark Johnston CommitDate: 2025-08-21 15:56:23 +0000 newvers: Add a builddir parameter When reproducible builds are configured, we should use /usr/obj as the canonical objdir. Add a parameter to newvers.sh to ensure that build metadata is reproducible. Reviewed by: emaste MFC after: 1 month Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50954 --- sys/conf/kern.post.mk | 2 +- sys/conf/newvers.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 1accd3fa8df4..bb3c7af82a4d 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -467,7 +467,7 @@ config.o env.o hints.o vers.o vnode_if.o: NEWVERS_ENV+= MAKE="${MAKE}" .if ${MK_REPRODUCIBLE_BUILD} != "no" -NEWVERS_ARGS+= -R +NEWVERS_ARGS+= -R -d ${PREFIX_OBJDIR} .endif vers.c: .NOMETA_CMP $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP:Nvers.*} ${NEWVERS_ENV} sh $S/conf/newvers.sh ${NEWVERS_ARGS} ${KERN_IDENT} diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 66926805052c..8b60da95741e 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -110,14 +110,18 @@ COPYRIGHT="$COPYRIGHT # We expand include_metadata later since we may set it to the # future value of modified. +builddir=$(pwd) include_metadata=yes modified=no -while getopts crRvV: opt; do +while getopts cd:rRvV: opt; do case "$opt" in c) echo "$COPYRIGHT" exit 0 ;; + d) + builddir=$OPTARG + ;; r) include_metadata=no ;; @@ -187,7 +191,7 @@ fi touch version v=$(cat version) u=${USER:-root} -d=$(pwd) +d=$builddir h=${HOSTNAME:-$(hostname)} if [ -n "$SOURCE_DATE_EPOCH" ]; then if ! t=$(date -ur $SOURCE_DATE_EPOCH 2>/dev/null); then From nobody Thu Aug 21 15:58:21 2025 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 4c77Jt3TDRz65Kr1; Thu, 21 Aug 2025 15:58:22 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c77Js4RXPz3LlS; Thu, 21 Aug 2025 15:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791901; 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=mgUubpkdiW/vUme7oRMQyRDA4HB6gir/TgeTCXw/fZA=; b=uNSAgaFDT/1Ax9Fn9Q25nvyzHGzpfmRLA6wNtrBYnvNVn3tTz18tZdjv9g9aPLrBrCId5A PkLpji3HnnmRTyakzyUHteSAAc3z7kTL3j73mUmPAw8SYCYmvnuigGTutJ43LMBLFvrPcZ gT6ykx1Dh+e6XvvpiRU29E+Y0POYs4UnQbqyCBzZhY1qVi8nFcflEo3IHsAAJoehltbkts rrCmi842Dm+lolXP4TJfIPorWOcjHQG7f9xdBtFDn1vsdtl3K+YRTmqBGpi/p3xQ8QW4zs TaczHv6AYNaO26bYgLA+yRv3a0bio55ml5qkh7rCw0RNhMYzKd+ScOlzRiCfwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791901; 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=mgUubpkdiW/vUme7oRMQyRDA4HB6gir/TgeTCXw/fZA=; b=itd/4ZPvP0L0Wu5hLwOuPFn0UG39TzUOVaoa7J5Pr29naj02LhCjGe1OnEIWyHGbVVwt/q g/y/E66Atag3HnDNfD8uGn1JkeqlRqXDFaUrc9SOPX5fX9EBGFHCA1RlUZys+1rJ/Jf3FC Z1NBRzTQ2tFUA66h8lg7F2HnDQ89E4jNNUUcftiOkyxlz4VZxJMMtKyi7ZUGj4f+ol33dG 1E2H4PTHA8e/mHOqQ2IKe6QWf4nPXVvTdaeLhynu4+UognMOarmttL9c0pYgFsJktrMpW7 ZwUr2MEZF8gWWFP1pHEm/mIhincVkUfmk3npK50g59LKRTpO166+PcCaoMWtlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755791901; a=rsa-sha256; cv=none; b=thnSa6/CQu3c3wdM8nwhDbKncqWMRiNa7vIp5DR3pJnWmKB+MCcM1Rc8LGN/se4MrWHSa1 B68KkPX0T/xxgE+rh1C9GJiNfQWracuu78noh9Yyn0E0lprMFWwSI4BkIYfcHgejSrchg2 yajq3x1F4OHOQ3wd9mvzc9lS0ku79CW7KS6Y+ckRRl3lNbD6PUtBWDoYNNiLHc84i8jHm3 TSlMAwLU0jYPsN/yS87L++P8nINi1tNnr+s7aia7RcpLQgHPLwwRme/vd73TJbjoARQ6Yd 2qKTATr726RSWx78QbUbFtJvwS18T6BTScPaZS1wy2wU5jxN7YMvN5Hlenv5pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c77Js3PgGz15W6; Thu, 21 Aug 2025 15:58:21 +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 57LFwLxF062761; Thu, 21 Aug 2025 15:58:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LFwLx3062758; Thu, 21 Aug 2025 15:58:21 GMT (envelope-from git) Date: Thu, 21 Aug 2025 15:58:21 GMT Message-Id: <202508211558.57LFwLx3062758@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: 61288a578511 - main - zdb: Fix the 32-bit build 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: 61288a5785115ea15556f60bd04d9026f47eb43a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=61288a5785115ea15556f60bd04d9026f47eb43a commit 61288a5785115ea15556f60bd04d9026f47eb43a Author: Mark Johnston AuthorDate: 2025-08-21 15:33:25 +0000 Commit: Mark Johnston CommitDate: 2025-08-21 15:56:23 +0000 zdb: Fix the 32-bit build --- sys/contrib/openzfs/cmd/zdb/zdb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/cmd/zdb/zdb.c b/sys/contrib/openzfs/cmd/zdb/zdb.c index 957e6c67dd12..a5f23be2aaaf 100644 --- a/sys/contrib/openzfs/cmd/zdb/zdb.c +++ b/sys/contrib/openzfs/cmd/zdb/zdb.c @@ -2627,8 +2627,8 @@ print_indirect(spa_t *spa, blkptr_t *bp, const zbookmark_phys_t *zb, } if (BP_GET_LEVEL(bp) != zb->zb_level) { (void) printf(" (ERROR: Block pointer level " - "(%llu) does not match bookmark level (%ld))", - BP_GET_LEVEL(bp), zb->zb_level); + "(%llu) does not match bookmark level (%lld))", + BP_GET_LEVEL(bp), (u_longlong_t)zb->zb_level); corruption_found = B_TRUE; } } @@ -2681,8 +2681,8 @@ visit_indirect(spa_t *spa, const dnode_phys_t *dnp, if (fill != BP_GET_FILL(bp)) { (void) printf("%16llx: Block pointer " "fill (%llu) does not match calculated " - "value (%lu)\n", offset, BP_GET_FILL(bp), - fill); + "value (%llu)\n", offset, BP_GET_FILL(bp), + (u_longlong_t)fill); corruption_found = B_TRUE; } } From nobody Thu Aug 21 16:28:09 2025 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 4c77zG35xtz65Mq1; Thu, 21 Aug 2025 16:28:10 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c77zF5DT3z3T5m; Thu, 21 Aug 2025 16:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755793689; 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=ys1n5DfrNxwbOFPk8uAnG/PxHVs+ljkhNQVR5Y616jA=; b=RnkAW3MTFxb2a0rhJw3vRaZsay6Yf8oq+KZsZseBvxENK1NeXQgUz06r6H+d+Y2qdI+NiP mxhms+Ew4y0FtvZMC7HCJnpyKA99ZFz6qt1twVYWD5nVF1G5WgUgfaCIA9i2oIIjJ9xUHn NRojkE1wOLDEy8px5rniUtN4ps27GhtHHbuTA7Xz93k+s9ba4FJ+AgvrvjBGZn0bGkwsAr iEpjYFEedQrarDM4wG6YwCRc8r87wFmjiyYyOzU3AM9+CDZfYyTUsmq52xr+BqfQ+r5X4w 33y/U4baPs7u/cfu2Ns+DMobUR11dRU7WnaHbzRPsoDOjmjVblIQvZERtl76ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755793689; 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=ys1n5DfrNxwbOFPk8uAnG/PxHVs+ljkhNQVR5Y616jA=; b=g89D9U3z4nld+HAv101E869iOZ2waH+1AnWexKp7Lz8+PPi/TuSRa8QaywJaRLI5lngJFA Rgh2O9jVg/N0UoD6WL8zr5aaYh1ODeUsNKSSNDbff2BLRiZPbMY0LPhcHdfL7m0iBp+v0C htrkcYcPReSyGRRxX9Xk1va6n3/7Mr3WQBMqd/tbtuNoo1pTCyec59oR5YFfg63cEs6A42 7qQEJvDL54+ZGsjee+QO/XqGE2A/zP2V27pct1SsCqREVOC+546ldQIZf94HPEFn4S1+9p /d8IAh7NcbhfwkuATu5avhezbFBv44eRcBzRZdE5B+Cp34peIwBDJcjP8VbJyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755793689; a=rsa-sha256; cv=none; b=rSC6cP0mRT8jDna+HvkTAIpNMCkMpOX3jyL+IA6I4kNqhiIvKLJaX232M8tPFNMsgclnhg jAjAXfNGFPw/oSm+EUxKMnDVtAf8x/fh50JXDg7NiKzOgutX4N2Tp9uw9pC1RkFWQcKcc1 oFyG6ST8nGtkptoWeeG/wjf3FG6ZqLa7WPU5KInfy+cvuOWQ338vskNkcLDAAdLv0HaC63 xsMKvH/okc3BeXM859Vq7WDP5My3HlhgCQjTLDeMxLvlXU46DX5WV/MOc0OyV6ygTPKbTO NTCcYGg5X1usVKICdfSf3vfZB9Jpwy+TqE6F0S7pEsOfV3ksDee2WYxnnYOs7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c77zF4qRKz15pP; Thu, 21 Aug 2025 16:28:09 +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 57LGS9JY020427; Thu, 21 Aug 2025 16:28:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LGS9qL020424; Thu, 21 Aug 2025 16:28:09 GMT (envelope-from git) Date: Thu, 21 Aug 2025 16:28:09 GMT Message-Id: <202508211628.57LGS9qL020424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 439685ee69e4 - main - libssl: unbreak building the library with KTLS 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 439685ee69e4fc066df5c54f802248d8e3805605 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=439685ee69e4fc066df5c54f802248d8e3805605 commit 439685ee69e4fc066df5c54f802248d8e3805605 Author: Enji Cooper AuthorDate: 2025-08-21 16:18:30 +0000 Commit: Enji Cooper CommitDate: 2025-08-21 16:28:02 +0000 libssl: unbreak building the library with KTLS The 3.5.1 update dropped a `SRCS` entry for the MK_OPENSSL_KTLS != no case (the source was renamed from `ktls.c` to `ktls_meth.c`). Add the new file to SRCS in order to unbreak linking the library when KTLS is enabled. This bug isn't apparent now because KTLS is always disabled in `include/openssl/configuration.h` (this will be fixed soon). Found when doing `make universe` with KTLS enabled in `include/openssl/configuration.h`. Fixes: 4757b351ea9d59d ("openssl: Import version 3.5.1") --- secure/lib/libssl/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index 45f23c9e9ca2..682c7bbc2693 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -73,6 +73,8 @@ SRCS+= rio_notifier.c poll_builder.c .if ${MK_OPENSSL_KTLS} == "no" CFLAGS+=-DOPENSSL_NO_KTLS +.else +SRCS+= ktls_meth.c .endif LIBADD= crypto From nobody Thu Aug 21 16:51:53 2025 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 4c78W00hMRz65Nrq for ; Thu, 21 Aug 2025 16:52:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) (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 4c78Vz1rVRz3XQP for ; Thu, 21 Aug 2025 16:52:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-323267bcee7so1568442a91.1 for ; Thu, 21 Aug 2025 09:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1755795125; x=1756399925; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=80YiuuhPBNQ4oINnrzxXRpiPh/zqKFwxg/S1HHe0cqY=; b=sMzIyzSMRxqWXvNBtOQi+is8uxIKPoLurSe2Y/kl5gXRqRLdYwfGnmnu+5o/bIdlZ3 4o7/UouPHYzkLkX6LhT50gKPpNEBzg2hJjEfshiQAPetQhvCoueO0HOj1KIYujY6qFi0 yHQdWTaGBjjHJ6GHmeFNsBrom+m5Gferlf9KyHHFSdoO5eFwXCx9VdAczMfWqn0zOolp DGub33BxhM0HrxoHRcpKIJwW1siynMHV3XqXTxEhaAHJDDiptwOkWL05nDWUrx90owWN BBRMy8GDfkfK5B/IsvOHHajlcJ/4yCeqq9E9ZbNHoZENthAYCxp9S9XPY5PGnvQmc+q9 49eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755795125; x=1756399925; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=80YiuuhPBNQ4oINnrzxXRpiPh/zqKFwxg/S1HHe0cqY=; b=Xxvc6PwYIIiXfnxd+gSXZQCfH+qyuSwmAT3bjXddkFLJi8mKCYWSiZ1Te7AXwNfUG0 b7laY9zyBh10YrWcdQFvRcFZdhVtwPnX5j0vjpuW+aaY32zL9a9Vhh6jbV5wYXQIFIXz f5ocPQarA7ZVjubiBOuS5QBnbuJk8J+lUrOMQOhQcxkCbOspC8nz/dm3vEZS6xx6LZQz /x2Gbb/G/w6T+X9I3vqPc7W3s9Xtdbnnvh7VPfNeZDPCXN/Guf6EuHc5s+wStl0FaCly syMW2yXM+hVgd/HzAnhokdn+HFE9LkImnLDwJkE6XLJ/8yJvK72nsdCt4pwgwZs9nHQ7 R5WQ== X-Forwarded-Encrypted: i=1; AJvYcCWvkBd3S6tiAaqDh/MFm+uSZ9DrY8iC1VRbmT4CjzZVwHrvRBev/jM4RXnISpfETWl/iOFHHsAPsf+B01HLPFE0BWaD@freebsd.org X-Gm-Message-State: AOJu0YxVBLYaKUuUDAwcRNvbKecop6lJqRT32cwCFO3wruY39BHqlXPp bS2rVk2lsptojF6TjXqQFHTMmebFlKnTe0kwW7yFRStIYdPI4/s4LKUeWTI5nH0PFSAwavOcuKw 9Q8w9THcAiD3M4/OBxXmZZ5y5u9717nU38gaC5m8uLw== X-Gm-Gg: ASbGncu2i+HjXa4X0w8CiIyaVV/Gg3pPt/XyfCVKPshP2XDBbtNrXyIGcCSXmlFfIqg 3mLsfGIofFwSdmw06pzNKJfyKzVS4K3B3sSIamgp8/HW6fW9zD3OZaO2HR8GbuKoR9f5ByJ1ZvI KuFvUb6Klqt0ZN4rhgln7xzCJOaoFlLzEV0N4nQIUoATAUCNhIA+6vTS2zxmoQtYdQSzSiSyuzy 9mvyxU9r57gGtX2OQ== X-Google-Smtp-Source: AGHT+IFNEGgp4nJE4SxITc6ZXLddjIMHi1Rx4R02TUzAyCl+MwPPORn8RfkKrMzW+uOQsiPimEu+APRb8qvjBhVvY2M= X-Received: by 2002:a17:90b:4ace:b0:324:ecb2:fabc with SMTP id 98e67ed59e1d1-32515ee3ba6mr231394a91.6.1755795124428; Thu, 21 Aug 2025 09:52:04 -0700 (PDT) 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 References: <202508202248.57KMmcTO016280@gitrepo.freebsd.org> <20250821060752.001c9599@thor.sb211.local> <8006s3o4-3nns-509q-n89q-oq88r8o09sn8@SerrOFQ.bet> <9EEDE524-1ED3-4F41-9584-460DCBF61D81@me.com> In-Reply-To: From: Warner Losh Date: Thu, 21 Aug 2025 10:51:53 -0600 X-Gm-Features: Ac12FXwBaGy2N_qiOK3U2Cpd8C_qBX49IzSx79tHXr6-qYf3WXr-d2EKLvUZsy4 Message-ID: Subject: Re: git: b44cc1b479fe - main - loader: do not try to open directories with TFTP To: "Bjoern A. Zeeb" Cc: Toomas Soome , A FreeBSD User , "Simon J. Gerraty" , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000b0b77a063ce2e872" X-Spamd-Bar: ---- 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-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c78Vz1rVRz3XQP --000000000000b0b77a063ce2e872 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Aug 21, 2025 at 1:02=E2=80=AFAM Bjoern A. Zeeb wro= te: > On Thu, 21 Aug 2025, Toomas Soome wrote: > > >> shot in the dark (haven't checked that LOADER_NET_SUPPORT would be > defined for these files): > > > > > > I do not think it is the approach you want to take there, because this > means you would need to build all those variants to build different > components=E2=80=A6 > > > > I would think of having weak is_tftp() implementation returning false > for case the dev_net.c is not built or move dev_net.c into libsa. I=E2=80= =99m not > quite sure why dev_net.c is outside libsa anyhow;) > > Even just moving is_tftp into stand.h would work. > Even better: deleting it entirely. It's not a good solution to the problem. But it's a better solution than what we had before. It will be gone when I do my next loader tech debt reduction pass. I didn't have time to do that before the release, so simon's changes went in. He's since committed an adequate fix. Warner --000000000000b0b77a063ce2e872 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Aug 21,= 2025 at 1:02=E2=80=AFAM Bjoern A. Zeeb <bz@freebsd.org> wrote:
On Thu, 21 Aug 2025, Toomas Soome wrote:

>> shot in the dark (haven't checked that LOADER_NET_SUPPORT woul= d be defined for these files):
>
>
> I do not think it is the approach you want to take there, because this= means you would need to build all those variants to build different compon= ents=E2=80=A6
>
> I would think of having weak is_tftp() implementation returning false = for case the dev_net.c is not built or move dev_net.c into libsa. I=E2=80= =99m not quite sure why dev_net.c is outside libsa anyhow;)

Even just moving is_tftp into stand.h would work.

=
Even better: deleting it entirely. It's not a good solution = to the problem. But it's a better solution than what we had before. It = will be gone when I do my next loader tech debt reduction pass. I didn'= t have time to do that before the release, so simon's changes went in. = He's since committed an adequate fix.

Warner= =C2=A0
--000000000000b0b77a063ce2e872-- From nobody Thu Aug 21 17:05:00 2025 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 4c78nm6LDZz65Pv9; Thu, 21 Aug 2025 17:05:00 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c78nm64PRz3ZjT; Thu, 21 Aug 2025 17:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755795900; 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=Ab5fYavtJufp11Lj9swy4XrsLr/MZJXbEHFDxaFIWw8=; b=XrBmQNp9COPDUfWCmMxiT27cMeOKP/sRQhQtIvpoz2+DmhjWmkBn1f9y1aAiK8C/KQWf3o cPfpui0aFUqIFgnbCO81gAI2qVtF4c/caLCLsT++f2tC1zoLzzme2zz5FBoiP+PuTAX5at Z9dj9y0myY9LXraAmWgMckcsAL9+RfG4VNNFbeB9K8jlu0E/xZkQJ4PZzd5pcfopuE/EKR Hih3ZclpZOQ5wXyFTBIUOP6NbOaxp7XM1bdGvp55Xy9BSdDoPofKtSKoOKHbOuSr3OzZeQ bV8jrVoCdcifr5IBaB31fCRSR41slFJsXYPp6iztwICBakvN2+3NZ/3tUc6e8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755795900; 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=Ab5fYavtJufp11Lj9swy4XrsLr/MZJXbEHFDxaFIWw8=; b=F/v/PAzBPfvIoRGxDgLq6KbDtar6y2OhF1O1jLXL/lHR26HFXpamnRFMGMx4zicIqiMmlz 8npFJbl67v8n4d09diz++CFqlz+8F9hXst0yNc3n+8+f4Fs13gKeAc0tlznD4b+Yz1Vi3z YP1he4GFyuJ3CgkdiJVS9tBKy/3cIITiKoG46YgaWbywfy7iUdBSO9XvN7x1X8bpclCwma kSQwvMhpPI5CA9ZOBOsCckCZD/CnuDKTcaUAhLD1Zqcu39VKl3mpkokv3YHOVzeTOsku9A I6xDXha/FtYfGbDP/7EUmB7mToENw6ksr98SbPFbDrM2K1bASos1Zgvoys4HIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755795900; a=rsa-sha256; cv=none; b=nEK9XetjVJTA/WBG31AoEQjwK4/wKE2Dg2WDn3zoDp6Vd5+mfO7bT5q1jVW1UNycnbaHg6 6L1iCCj+tClXNFBUqKdF7dCrCD5RzDauE8VMq4Y0npwxWhtYZhlsRkuVrJssdHtJBMYmnG SvKfI7nAPuPpGE5nO5e6pW+y+aHnjQ+QtEhTLZqqsn2WyEU+aaM5nN3KNH57QkHlA+1ZvA Itn1RtSIgR15u0AD+E9/cxCY70ZkKGY+D+H60Cwrz2AQdrua+lIR1uKGLEZNGcVLVdxkeF ZisdvAnoBA063IPQF3PfGeAn8CVFGZJQLRp99lDCiH2Q/Bf68e1Ar3NGyvWZrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c78nm5fdyz17M4; Thu, 21 Aug 2025 17:05:00 +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 57LH50BH095157; Thu, 21 Aug 2025 17:05:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LH50gR095150; Thu, 21 Aug 2025 17:05:00 GMT (envelope-from git) Date: Thu, 21 Aug 2025 17:05:00 GMT Message-Id: <202508211705.57LH50gR095150@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 267f8c1f4b09 - main - crypto/openssl: make vendor imports easier/less error prone 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 267f8c1f4b09431b335d5f48d84586047471f978 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=267f8c1f4b09431b335d5f48d84586047471f978 commit 267f8c1f4b09431b335d5f48d84586047471f978 Author: Enji Cooper AuthorDate: 2025-08-01 04:03:33 +0000 Commit: Enji Cooper CommitDate: 2025-08-21 17:02:46 +0000 crypto/openssl: make vendor imports easier/less error prone This change adds a custom BSD makefile containing multiple high-level PHONY targets, similar to targets provided by the ports framework. The Makefile does the following: - Reruns Configure with a deterministic set of arguments to ensure that all appropriate features have been enabled/disabled in OpenSSL. - Preens the pkgconfig files to remove duplicate paths in their `CFLAGS` and `includedir` variables. - Rebuilds all ASM files to ensure that the content contained is fresh. - Rebuilds all manpages to ensure that the content contained in the manpages is fresh. Some additional work needs to be done to make the manpage regeneration "operation" reproducible (the date the manpages were generated is embedded in the files). All dynamic configuration previously captured in `include/openssl/configuration.h` and `include/crypto/bn_conf.h` has been moved to `freebsd/include/dynamic_freebsd_configuration.h` and `freebsd/include/crypto/bn_conf.h`, respectively. This helps ensure that future updates don't wipe out FreeBSD customizations to these files, which tune behavior on a per-target architecture basis, e.g., ARM vs x86, 32-bit vs 64-bit, etc. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D51663 --- crypto/openssl/BSDmakefile | 99 + crypto/openssl/apps/CA.pl | 2 +- crypto/openssl/apps/progs.c | 11 +- crypto/openssl/apps/progs.h | 4 +- crypto/openssl/configdata.pm | 2295 ++++---------------- crypto/openssl/exporters/libcrypto.pc | 13 + crypto/openssl/exporters/libssl.pc | 11 + crypto/openssl/exporters/openssl.pc | 9 + .../freebsd/dump_version_from_configdata.pl | 21 + crypto/openssl/freebsd/include/crypto/bn_conf.h | 27 + .../freebsd/include/openssl/configuration.h | 38 + crypto/openssl/include/crypto/bn_conf.h | 27 + crypto/openssl/include/openssl/configuration.h | 53 +- crypto/openssl/include/openssl/fipskey.h | 2 +- crypto/openssl/include/openssl/opensslv.h | 2 +- crypto/openssl/libcrypto.pc | 13 + crypto/openssl/libssl.pc | 11 + crypto/openssl/openssl.pc | 9 + crypto/openssl/tools/c_rehash | 6 +- crypto/openssl/util/shlib_wrap.sh | 4 +- crypto/openssl/util/wrap.pl | 8 +- secure/lib/libcrypto/Makefile.inc | 3 +- secure/lib/libcrypto/Makefile.version | 2 + 23 files changed, 718 insertions(+), 1952 deletions(-) diff --git a/crypto/openssl/BSDmakefile b/crypto/openssl/BSDmakefile new file mode 100644 index 000000000000..bd2bfe0ea033 --- /dev/null +++ b/crypto/openssl/BSDmakefile @@ -0,0 +1,99 @@ +# This BSD makefile helps provide a deterministic means of doing a "clean" +# vendor import of OpenSSL. +# +# Recommended use: +# +# % make clean +# % make all + +NO_OBJ= + +LCRYPTO_SRC= ${SRCTOP}/crypto/openssl +LCRYPTO_DOC= ${LCRYPTO_SRC}/doc + +CAT?= /bin/cat +MV?= /bin/mv +PERL?= perl + +BN_CONF_H= include/crypto/bn_conf.h +BN_CONF_H_ORIG= ${BN_CONF_H}.orig +CONFIGURATION_H= include/openssl/configuration.h +CONFIGURATION_H_ORIG= ${CONFIGURATION_H}.orig + +.PHONY: configure patch all +.ORDER: configure patch all + +configure: + @cd ${.CURDIR} && \ + ${PERL} ./Configure \ + disable-aria \ + disable-egd \ + disable-idea \ + disable-mdc2 \ + disable-sm2 \ + disable-sm3 \ + disable-sm4 \ + enable-ec_nistp_64_gcc_128 \ + enable-ktls \ + enable-sctp \ + --openssldir=etc \ + --prefix=/usr + @cd ${.CURDIR} && gmake configdata.pm + @cd ${LCRYPTO_SRC} && ${PERL} \ + ${LCRYPTO_SRC}/freebsd/dump_version_from_configdata.pl > \ + ${SRCTOP}/secure/lib/libcrypto/Makefile.version + +all: patch + # Passing `-j ${.MAKE.JOBS}` doesn't work here for some reason. + @cd ${.CURDIR} && gmake build_all_generated + + # Clean the pkgconfig files: + # 1. Fix --prefix (not sure why configure --prefix isn't honored properly). + # 2. Remove duplicate path in CFLAGS. + # 3. Remove duplicate path in includedir(s). + @find . -name \*.pc -print -exec sed -i '' -E \ + -e 's,^prefix=.+,prefix=/usr,' \ + -e 's,[[:space:]]+(\-I)?\$\{prefix\}/\./include[[:space:]]*,,g' \ + {} + + + @cd ${SRCTOP}/secure/lib/libcrypto && \ + ${MAKE} cleanasm && \ + ${MAKE} buildasm + + @rsync -a --delete \ + --exclude 'Makefile*' --exclude '*.1' \ + ${LCRYPTO_DOC}/man/ \ + ${SRCTOP}/secure/lib/libcrypto/man + + @rsync -a --delete \ + --exclude 'Makefile*' --exclude '*.[357]' \ + ${LCRYPTO_DOC}/man/man1/ \ + ${SRCTOP}/secure/usr.bin/openssl/man + + +# This doesn't use standard patching since the generated files can vary +# depending on the host architecture. +patch: configure + # Spam arch-specific overrides to config files. + + @cd ${.CURDIR} && gmake ${BN_CONF_H} && \ + ${MV} ${BN_CONF_H} ${BN_CONF_H_ORIG} && \ + ${CAT} ${BN_CONF_H}.orig \ + ${LCRYPTO_SRC}/freebsd/${BN_CONF_H} >> \ + ${BN_CONF_H} + + @cd ${.CURDIR} && \ + ${MV} ${CONFIGURATION_H} ${CONFIGURATION_H_ORIG} && \ + ${CAT} ${CONFIGURATION_H_ORIG} \ + ${LCRYPTO_SRC}/freebsd/${CONFIGURATION_H} >> \ + ${CONFIGURATION_H} + + +clean: .PHONY + @cd ${.CURDIR} && rm -f ${BN_CONF_H_ORIG} ${CONFIGURATION_H_ORIG} + + @cd ${SRCTOP}/secure/lib/libcrypto && ${MAKE} cleanasm + + -@cd ${.CURDIR} && gmake ${.TARGET} + +.include diff --git a/crypto/openssl/apps/CA.pl b/crypto/openssl/apps/CA.pl index 70ad231fff04..0861fd7a4da7 100755 --- a/crypto/openssl/apps/CA.pl +++ b/crypto/openssl/apps/CA.pl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/env perl # Copyright 2000-2025 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/crypto/openssl/apps/progs.c b/crypto/openssl/apps/progs.c index 2646a1a35bf3..acc204a3e6e7 100644 --- a/crypto/openssl/apps/progs.c +++ b/crypto/openssl/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -89,6 +89,7 @@ FUNCTION functions[] = { {FT_general, "s_time", s_time_main, s_time_options, NULL, NULL}, #endif {FT_general, "sess_id", sess_id_main, sess_id_options, NULL, NULL}, + {FT_general, "skeyutl", skeyutl_main, skeyutl_options, NULL, NULL}, {FT_general, "smime", smime_main, smime_options, NULL, NULL}, {FT_general, "speed", speed_main, speed_options, NULL, NULL}, {FT_general, "spkac", spkac_main, spkac_options, NULL, NULL}, @@ -225,9 +226,15 @@ FUNCTION functions[] = { {FT_cipher, "camellia-256-ecb", enc_main, enc_options, NULL}, #endif {FT_cipher, "base64", enc_main, enc_options, NULL}, -#ifdef ZLIB +#ifndef OPENSSL_NO_ZLIB {FT_cipher, "zlib", enc_main, enc_options, NULL}, #endif +#ifndef OPENSSL_NO_BROTLI + {FT_cipher, "brotli", enc_main, enc_options, NULL}, +#endif +#ifndef OPENSSL_NO_ZSTD + {FT_cipher, "zstd", enc_main, enc_options, NULL}, +#endif #ifndef OPENSSL_NO_DES {FT_cipher, "des", enc_main, enc_options, NULL}, #endif diff --git a/crypto/openssl/apps/progs.h b/crypto/openssl/apps/progs.h index 83c829a721bf..1b62ec37dec1 100644 --- a/crypto/openssl/apps/progs.h +++ b/crypto/openssl/apps/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -56,6 +56,7 @@ extern int s_client_main(int argc, char *argv[]); extern int s_server_main(int argc, char *argv[]); extern int s_time_main(int argc, char *argv[]); extern int sess_id_main(int argc, char *argv[]); +extern int skeyutl_main(int argc, char *argv[]); extern int smime_main(int argc, char *argv[]); extern int speed_main(int argc, char *argv[]); extern int spkac_main(int argc, char *argv[]); @@ -110,6 +111,7 @@ extern const OPTIONS s_client_options[]; extern const OPTIONS s_server_options[]; extern const OPTIONS s_time_options[]; extern const OPTIONS sess_id_options[]; +extern const OPTIONS skeyutl_options[]; extern const OPTIONS smime_options[]; extern const OPTIONS speed_options[]; extern const OPTIONS spkac_options[]; diff --git a/crypto/openssl/configdata.pm b/crypto/openssl/configdata.pm index b2ea8dcd87ca..ec70eaba9f07 100755 --- a/crypto/openssl/configdata.pm +++ b/crypto/openssl/configdata.pm @@ -1,4 +1,4 @@ -#! /usr/local/bin/perl +#! /usr/bin/env perl # -*- mode: perl -*- package configdata; @@ -21,24 +21,16 @@ our %config = ( "ASFLAGS" => [], "CC" => "cc", "CFLAGS" => [ - "-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " + "-Wall -O3" ], - "CPP" => "cpp", "CPPDEFINES" => [], - "CPPFLAGS" => [ - "" - ], + "CPPFLAGS" => [], "CPPINCLUDES" => [], - "CXX" => "c++", - "CXXFLAGS" => [ - "-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " - ], + "CXXFLAGS" => [], "FIPSKEY" => "f4556650ac31d35461610bac4ed81b1a181b2d8a43ea2854cbae22ca74560813", - "FIPS_VENDOR" => "OpenSSL FIPS Provider", - "HASHBANGPERL" => "/usr/local/bin/perl", - "LDFLAGS" => [ - " " - ], + "FIPS_VENDOR" => "OpenSSL non-compliant FIPS Provider", + "HASHBANGPERL" => "/usr/bin/env perl", + "LDFLAGS" => [], "LDLIBS" => [], "OBJCOPY" => "objcopy", "PERL" => "/usr/local/bin/perl", @@ -139,7 +131,6 @@ our %config = ( "apps/lib/build.info", "providers/common/build.info", "providers/implementations/build.info", - "providers/fips/build.info", "doc/man1/build.info", "ssl/record/methods/build.info", "providers/common/der/build.info", @@ -178,6 +169,7 @@ our %config = ( "ex_libs" => [], "full_version" => "3.5.1", "includes" => [], + "ktls" => "", "lflags" => [], "lib_defines" => [ "OPENSSL_PIC" @@ -192,6 +184,7 @@ our %config = ( "openssl_feature_defines" => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_THREADS", + "OPENSSL_NO_ACVP_TESTS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ARIA", "OPENSSL_NO_ASAN", @@ -203,13 +196,14 @@ our %config = ( "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FIPS_JITTER", + "OPENSSL_NO_FIPS_POST", + "OPENSSL_NO_FIPS_SECURITYCHECKS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_H3DEMO", "OPENSSL_NO_HQINTEROP", "OPENSSL_NO_IDEA", "OPENSSL_NO_JITTER", - "OPENSSL_NO_KTLS", "OPENSSL_NO_MD2", "OPENSSL_NO_MDC2", "OPENSSL_NO_MSAN", @@ -222,7 +216,6 @@ our %config = ( "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_SSLKEYLOG", "OPENSSL_NO_TFO", - "OPENSSL_NO_TLS_DEPRECATED_EC", "OPENSSL_NO_TRACE", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", @@ -235,30 +228,26 @@ our %config = ( "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_STATIC_ENGINE" ], - "openssl_other_defines" => [ - "OPENSSL_NO_KTLS" - ], "openssl_sys_defines" => [], - "openssldir" => "/usr/local/openssl", - "options" => "--openssldir=/usr/local/openssl --prefix=/usr/local enable-ec_nistp_64_gcc_128 enable-fips enable-sctp no-afalgeng no-aria no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-idea no-jitter no-ktls no-legacy no-md2 no-mdc2 no-msan no-pie no-rc5 no-sm2 no-sm3 no-sm4 no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-tls-deprecated-ec no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "openssldir" => "etc", + "options" => "enable-ec_nistp_64_gcc_128 enable-ktls enable-sctp --openssldir=etc --prefix=/usr no-acvp-tests no-afalgeng no-aria no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-egd no-external-tests no-fips no-fips-jitter no-fips-post no-fips-securitychecks no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-idea no-jitter no-md2 no-mdc2 no-msan no-pie no-rc5 no-sm2 no-sm3 no-sm4 no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", "patch" => "1", "perl_archname" => "amd64-freebsd-thread-multi", "perl_cmd" => "/usr/local/bin/perl", "perl_version" => "5.40.2", "perlargv" => [ - "--openssldir=/usr/local/openssl", - "--prefix=/usr/local", - "no-aria", + "disable-aria", + "disable-egd", + "disable-idea", + "disable-mdc2", + "disable-sm2", + "disable-sm3", + "disable-sm4", "enable-ec_nistp_64_gcc_128", - "enable-fips", - "no-idea", - "no-legacy", - "no-mdc2", + "enable-ktls", "enable-sctp", - "no-sm2", - "no-sm3", - "no-sm4", - "no-tls-deprecated-ec" + "--openssldir=etc", + "--prefix=/usr" ], "perlenv" => { "AR" => undef, @@ -266,24 +255,24 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "cc", - "CFLAGS" => "-O2 -pipe -fstack-protector-strong -fno-strict-aliasing ", - "CPP" => "cpp", + "CC" => undef, + "CFLAGS" => undef, + "CPP" => undef, "CPPDEFINES" => undef, - "CPPFLAGS" => "", + "CPPFLAGS" => undef, "CPPINCLUDES" => undef, "CROSS_COMPILE" => undef, - "CXX" => "c++", - "CXXFLAGS" => "-O2 -pipe -fstack-protector-strong -fno-strict-aliasing ", + "CXX" => undef, + "CXXFLAGS" => undef, "HASHBANGPERL" => undef, "LD" => undef, - "LDFLAGS" => " ", + "LDFLAGS" => undef, "LDLIBS" => undef, "MT" => undef, "MTFLAGS" => undef, "OBJCOPY" => undef, "OPENSSL_LOCAL_CONFIG_DIR" => undef, - "PERL" => "/usr/local/bin/perl", + "PERL" => undef, "RANLIB" => undef, "RC" => undef, "RCFLAGS" => undef, @@ -297,12 +286,12 @@ our %config = ( "__CNF_LDFLAGS" => undef, "__CNF_LDLIBS" => undef }, - "prefix" => "/usr/local", + "prefix" => "/usr", "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", "release_date" => "1 Jul 2025", - "shlib_version" => "17", + "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86_64", "version" => "3.5.1" @@ -521,6 +510,7 @@ our @disablables_int = ( "crmf" ); our %disabled = ( + "acvp-tests" => "cascade", "afalgeng" => "not-linux", "aria" => "option", "asan" => "default", @@ -530,17 +520,18 @@ our %disabled = ( "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", - "egd" => "default", + "egd" => "option", "external-tests" => "default", + "fips" => "default", "fips-jitter" => "default", + "fips-post" => "cascade", + "fips-securitychecks" => "cascade", "fuzz-afl" => "default", "fuzz-libfuzzer" => "default", "h3demo" => "default", "hqinterop" => "default", "idea" => "option", "jitter" => "default", - "ktls" => "default", - "legacy" => "option", "md2" => "default", "mdc2" => "option", "msan" => "default", @@ -553,7 +544,6 @@ our %disabled = ( "ssl3-method" => "default", "sslkeylog" => "default", "tfo" => "default", - "tls-deprecated-ec" => "option", "trace" => "default", "ubsan" => "default", "unit-test" => "default", @@ -880,7 +870,7 @@ our %unified_info = ( "providers/libdefault.a" => { "noinst" => "1" }, - "providers/libfips.a" => { + "providers/liblegacy.a" => { "noinst" => "1" }, "providers/libtemplate.a" => { @@ -912,9 +902,6 @@ our %unified_info = ( "engines/padlock" => { "engine" => "1" }, - "providers/fips" => { - "fips" => "1" - }, "test/p_minimal" => { "noinst" => "1" }, @@ -1016,9 +1003,6 @@ our %unified_info = ( "test/aborttest" => { "noinst" => "1" }, - "test/acvp_test" => { - "noinst" => "1" - }, "test/aesgcmtest" => { "noinst" => "1" }, @@ -1142,6 +1126,9 @@ our %unified_info = ( "test/buildtest_c_conf_api" => { "noinst" => "1" }, + "test/buildtest_c_configuration" => { + "noinst" => "1" + }, "test/buildtest_c_conftypes" => { "noinst" => "1" }, @@ -1996,9 +1983,6 @@ our %unified_info = ( "libssl" => [ "AES_ASM" ], - "providers/fips" => [ - "FIPS_MODULE" - ], "providers/legacy" => [ "OPENSSL_CPUID_OBJ" ], @@ -2053,8 +2037,11 @@ our %unified_info = ( "VPAES_ASM", "X25519_ASM" ], - "test/evp_test" => [ - "NO_LEGACY_MODULE" + "test/endecode_test" => [ + "STATIC_LEGACY" + ], + "test/evp_extra_test" => [ + "STATIC_LEGACY" ], "test/provider_internal_test" => [ "PROVIDER_INIT_FUNCTION_NAME=p_test_init" @@ -2296,9 +2283,6 @@ our %unified_info = ( "apps/progs.h" => [ "apps/progs.c" ], - "build_modules_nodep" => [ - "providers/fipsmodule.cnf" - ], "crypto/aes/aes-586.S" => [ "crypto/perlasm/x86asm.pl" ], @@ -8214,10 +8198,6 @@ our %unified_info = ( "providers/common/include/prov/der_digests.h", "providers/common/include/prov/der_rsa.h" ], - "providers/common/der/libfips-lib-der_rsa_sig.o" => [ - "providers/common/include/prov/der_digests.h", - "providers/common/include/prov/der_rsa.h" - ], "providers/common/include/prov/der_digests.h" => [ "providers/common/der/DIGESTS.asn1", "providers/common/der/NIST.asn1", @@ -8252,21 +8232,12 @@ our %unified_info = ( "providers/common/der/oids_to_c.pm", "providers/common/der/wrap.asn1" ], - "providers/fips" => [ - "providers/libfips.a" - ], - "providers/fipsmodule.cnf" => [ - "providers/fips" - ], "providers/implementations/encode_decode/libdefault-lib-encode_key2any.o" => [ "providers/common/include/prov/der_rsa.h" ], "providers/implementations/kdfs/libdefault-lib-x942kdf.o" => [ "providers/common/include/prov/der_wrap.h" ], - "providers/implementations/kdfs/libfips-lib-x942kdf.o" => [ - "providers/common/include/prov/der_wrap.h" - ], "providers/implementations/signature/libdefault-lib-dsa_sig.o" => [ "providers/common/include/prov/der_dsa.h" ], @@ -8285,27 +8256,13 @@ our %unified_info = ( "providers/implementations/signature/libdefault-lib-slh_dsa_sig.o" => [ "providers/common/include/prov/der_slh_dsa.h" ], - "providers/implementations/signature/libfips-lib-dsa_sig.o" => [ - "providers/common/include/prov/der_dsa.h" - ], - "providers/implementations/signature/libfips-lib-ecdsa_sig.o" => [ - "providers/common/include/prov/der_ec.h" - ], - "providers/implementations/signature/libfips-lib-eddsa_sig.o" => [ - "providers/common/include/prov/der_ecx.h" - ], - "providers/implementations/signature/libfips-lib-ml_dsa_sig.o" => [ - "providers/common/include/prov/der_ml_dsa.h" - ], - "providers/implementations/signature/libfips-lib-rsa_sig.o" => [ - "providers/common/include/prov/der_rsa.h" - ], - "providers/implementations/signature/libfips-lib-slh_dsa_sig.o" => [ - "providers/common/include/prov/der_slh_dsa.h" - ], "providers/implementations/signature/sm2_sig.o" => [ "providers/common/include/prov/der_sm2.h" ], + "providers/legacy" => [ + "libcrypto", + "providers/liblegacy.a" + ], "providers/libcommon.a" => [ "libcrypto" ], @@ -8318,10 +8275,6 @@ our %unified_info = ( "test/aborttest" => [ "libcrypto" ], - "test/acvp_test" => [ - "libcrypto.a", - "test/libtestutil.a" - ], "test/aesgcmtest" => [ "libcrypto", "test/libtestutil.a" @@ -8487,6 +8440,10 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_configuration" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_conftypes" => [ "libcrypto", "libssl" @@ -8917,6 +8874,8 @@ our %unified_info = ( ], "test/endecode_test" => [ "libcrypto.a", + "providers/libcommon.a", + "providers/liblegacy.a", "test/libtestutil.a" ], "test/endecoder_legacy_test" => [ @@ -8937,6 +8896,8 @@ our %unified_info = ( ], "test/evp_extra_test" => [ "libcrypto.a", + "providers/libcommon.a", + "providers/liblegacy.a", "test/libtestutil.a" ], "test/evp_extra_test2" => [ @@ -9676,6 +9637,9 @@ our %unified_info = ( "crypto/packettest-bin-quic_vlint.o", "crypto/tls13secretstest-bin-packet.o", "crypto/tls13secretstest-bin-quic_vlint.o", + "crypto/legacy-dso-cpuid.o", + "crypto/legacy-dso-ctype.o", + "crypto/legacy-dso-x86_64cpuid.o", "crypto/libcrypto-lib-asn1_dsa.o", "crypto/libcrypto-lib-bsearch.o", "crypto/libcrypto-lib-comp_methods.o", @@ -9792,37 +9756,7 @@ our %unified_info = ( "crypto/libssl-shlib-getenv.o", "crypto/libssl-shlib-packet.o", "crypto/libssl-shlib-quic_vlint.o", - "crypto/libssl-shlib-time.o", - "crypto/libfips-lib-asn1_dsa.o", - "crypto/libfips-lib-bsearch.o", - "crypto/libfips-lib-context.o", - "crypto/libfips-lib-core_algorithm.o", - "crypto/libfips-lib-core_fetch.o", - "crypto/libfips-lib-core_namemap.o", - "crypto/libfips-lib-cpuid.o", - "crypto/libfips-lib-cryptlib.o", - "crypto/libfips-lib-ctype.o", - "crypto/libfips-lib-der_writer.o", - "crypto/libfips-lib-ex_data.o", - "crypto/libfips-lib-initthread.o", - "crypto/libfips-lib-o_str.o", - "crypto/libfips-lib-packet.o", - "crypto/libfips-lib-param_build.o", - "crypto/libfips-lib-param_build_set.o", - "crypto/libfips-lib-params.o", - "crypto/libfips-lib-params_dup.o", - "crypto/libfips-lib-params_from_text.o", - "crypto/libfips-lib-params_idx.o", - "crypto/libfips-lib-provider_core.o", - "crypto/libfips-lib-provider_predefined.o", - "crypto/libfips-lib-self_test_core.o", - "crypto/libfips-lib-sparse_array.o", - "crypto/libfips-lib-threads_lib.o", - "crypto/libfips-lib-threads_none.o", - "crypto/libfips-lib-threads_pthread.o", - "crypto/libfips-lib-threads_win.o", - "crypto/libfips-lib-time.o", - "crypto/libfips-lib-x86_64cpuid.o" + "crypto/libssl-shlib-time.o" ], "products" => { "bin" => [ @@ -9831,10 +9765,12 @@ our %unified_info = ( "test/packettest", "test/tls13secretstest" ], + "dso" => [ + "providers/legacy" + ], "lib" => [ "libcrypto", - "libssl", - "providers/libfips.a" + "libssl" ] } }, @@ -9867,22 +9803,11 @@ our %unified_info = ( "crypto/aes/libcrypto-shlib-aesni-x86_64.o", "crypto/aes/libcrypto-shlib-aesni-xts-avx512.o", "crypto/aes/libcrypto-shlib-bsaes-x86_64.o", - "crypto/aes/libcrypto-shlib-vpaes-x86_64.o", - "crypto/aes/libfips-lib-aes-x86_64.o", - "crypto/aes/libfips-lib-aes_ecb.o", - "crypto/aes/libfips-lib-aes_misc.o", - "crypto/aes/libfips-lib-aesni-mb-x86_64.o", - "crypto/aes/libfips-lib-aesni-sha1-x86_64.o", - "crypto/aes/libfips-lib-aesni-sha256-x86_64.o", - "crypto/aes/libfips-lib-aesni-x86_64.o", - "crypto/aes/libfips-lib-aesni-xts-avx512.o", - "crypto/aes/libfips-lib-bsaes-x86_64.o", - "crypto/aes/libfips-lib-vpaes-x86_64.o" + "crypto/aes/libcrypto-shlib-vpaes-x86_64.o" ], "products" => { "lib" => [ - "libcrypto", - "providers/libfips.a" + "libcrypto" ] } }, @@ -10234,65 +10159,22 @@ our %unified_info = ( "crypto/bn/libcrypto-shlib-rsaz_exp_x2.o", "crypto/bn/libcrypto-shlib-x86_64-gf2m.o", "crypto/bn/libcrypto-shlib-x86_64-mont.o", - "crypto/bn/libcrypto-shlib-x86_64-mont5.o", - "crypto/bn/libfips-lib-bn_add.o", - "crypto/bn/libfips-lib-bn_blind.o", - "crypto/bn/libfips-lib-bn_const.o", - "crypto/bn/libfips-lib-bn_conv.o", - "crypto/bn/libfips-lib-bn_ctx.o", - "crypto/bn/libfips-lib-bn_dh.o", - "crypto/bn/libfips-lib-bn_div.o", - "crypto/bn/libfips-lib-bn_exp.o", - "crypto/bn/libfips-lib-bn_exp2.o", - "crypto/bn/libfips-lib-bn_gcd.o", - "crypto/bn/libfips-lib-bn_gf2m.o", - "crypto/bn/libfips-lib-bn_intern.o", - "crypto/bn/libfips-lib-bn_kron.o", - "crypto/bn/libfips-lib-bn_lib.o", - "crypto/bn/libfips-lib-bn_mod.o", - "crypto/bn/libfips-lib-bn_mont.o", - "crypto/bn/libfips-lib-bn_mpi.o", - "crypto/bn/libfips-lib-bn_mul.o", - "crypto/bn/libfips-lib-bn_nist.o", - "crypto/bn/libfips-lib-bn_prime.o", - "crypto/bn/libfips-lib-bn_rand.o", - "crypto/bn/libfips-lib-bn_recp.o", - "crypto/bn/libfips-lib-bn_rsa_fips186_4.o", - "crypto/bn/libfips-lib-bn_shift.o", - "crypto/bn/libfips-lib-bn_sqr.o", - "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsaz-2k-avx512.o", - "crypto/bn/libfips-lib-rsaz-2k-avxifma.o", - "crypto/bn/libfips-lib-rsaz-3k-avx512.o", - "crypto/bn/libfips-lib-rsaz-3k-avxifma.o", - "crypto/bn/libfips-lib-rsaz-4k-avx512.o", - "crypto/bn/libfips-lib-rsaz-4k-avxifma.o", - "crypto/bn/libfips-lib-rsaz-avx2.o", - "crypto/bn/libfips-lib-rsaz-x86_64.o", - "crypto/bn/libfips-lib-rsaz_exp.o", - "crypto/bn/libfips-lib-rsaz_exp_x2.o", - "crypto/bn/libfips-lib-x86_64-gf2m.o", - "crypto/bn/libfips-lib-x86_64-mont.o", - "crypto/bn/libfips-lib-x86_64-mont5.o" + "crypto/bn/libcrypto-shlib-x86_64-mont5.o" ], "products" => { "lib" => [ - "libcrypto", - "providers/libfips.a" + "libcrypto" ] } }, "crypto/bn/asm" => { "deps" => [ "crypto/bn/asm/libcrypto-lib-x86_64-gcc.o", - "crypto/bn/asm/libcrypto-shlib-x86_64-gcc.o", - "crypto/bn/asm/libfips-lib-x86_64-gcc.o" + "crypto/bn/asm/libcrypto-shlib-x86_64-gcc.o" ], "products" => { "lib" => [ - "libcrypto", - "providers/libfips.a" + "libcrypto" ] } }, @@ -10301,13 +10183,11 @@ our %unified_info = ( "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/buffer/libcrypto-shlib-buf_err.o", - "crypto/buffer/libcrypto-shlib-buffer.o", - "crypto/buffer/libfips-lib-buffer.o" + "crypto/buffer/libcrypto-shlib-buffer.o" ], "products" => { "lib" => [ - "libcrypto", - "providers/libfips.a" + "libcrypto" ] } }, @@ -10365,13 +10245,11 @@ our %unified_info = ( "crypto/cmac" => { "deps" => [ "crypto/cmac/libcrypto-lib-cmac.o", - "crypto/cmac/libcrypto-shlib-cmac.o", - "crypto/cmac/libfips-lib-cmac.o" + "crypto/cmac/libcrypto-shlib-cmac.o" ], "products" => { "lib" => [ - "libcrypto", - "providers/libfips.a" + "libcrypto" ] } }, @@ -10583,15 +10461,13 @@ our %unified_info = ( "crypto/des/libcrypto-shlib-set_key.o", "crypto/des/libcrypto-shlib-str2key.o", "crypto/des/libcrypto-shlib-xcbc_enc.o", - "crypto/des/libfips-lib-des_enc.o", - "crypto/des/libfips-lib-ecb3_enc.o", - "crypto/des/libfips-lib-fcrypt_b.o", - "crypto/des/libfips-lib-set_key.o" + "crypto/des/liblegacy-lib-des_enc.o", + "crypto/des/liblegacy-lib-fcrypt_b.o" ], "products" => { "lib" => [ "libcrypto", - "providers/libfips.a" + "providers/liblegacy.a" ] } }, @@ -10626,19 +10502,11 @@ our %unified_info = ( "crypto/dh/libcrypto-shlib-dh_meth.o", "crypto/dh/libcrypto-shlib-dh_pmeth.o", "crypto/dh/libcrypto-shlib-dh_prn.o", - "crypto/dh/libcrypto-shlib-dh_rfc5114.o", - "crypto/dh/libfips-lib-dh_backend.o", - "crypto/dh/libfips-lib-dh_check.o", - "crypto/dh/libfips-lib-dh_gen.o", - "crypto/dh/libfips-lib-dh_group_params.o", - "crypto/dh/libfips-lib-dh_kdf.o", - "crypto/dh/libfips-lib-dh_key.o", - "crypto/dh/libfips-lib-dh_lib.o" + "crypto/dh/libcrypto-shlib-dh_rfc5114.o" ], "products" => { "lib" => [ - "libcrypto", - "providers/libfips.a" + "libcrypto" ] } }, @@ -10673,20 +10541,11 @@ our %unified_info = ( "crypto/dsa/libcrypto-shlib-dsa_pmeth.o", "crypto/dsa/libcrypto-shlib-dsa_prn.o", "crypto/dsa/libcrypto-shlib-dsa_sign.o", - "crypto/dsa/libcrypto-shlib-dsa_vrf.o", - "crypto/dsa/libfips-lib-dsa_backend.o", - "crypto/dsa/libfips-lib-dsa_check.o", - "crypto/dsa/libfips-lib-dsa_gen.o", - "crypto/dsa/libfips-lib-dsa_key.o", - "crypto/dsa/libfips-lib-dsa_lib.o", - "crypto/dsa/libfips-lib-dsa_ossl.o", - "crypto/dsa/libfips-lib-dsa_sign.o", - "crypto/dsa/libfips-lib-dsa_vrf.o" + "crypto/dsa/libcrypto-shlib-dsa_vrf.o" ], "products" => { "lib" => [ - "libcrypto", - "providers/libfips.a" + "libcrypto" ] } }, @@ -10792,44 +10651,11 @@ our %unified_info = ( "crypto/ec/libcrypto-shlib-ecx_backend.o", "crypto/ec/libcrypto-shlib-ecx_key.o", "crypto/ec/libcrypto-shlib-ecx_meth.o", - "crypto/ec/libcrypto-shlib-x25519-x86_64.o", - "crypto/ec/libfips-lib-curve25519.o", - "crypto/ec/libfips-lib-ec2_oct.o", - "crypto/ec/libfips-lib-ec2_smpl.o", - "crypto/ec/libfips-lib-ec_asn1.o", - "crypto/ec/libfips-lib-ec_backend.o", - "crypto/ec/libfips-lib-ec_check.o", - "crypto/ec/libfips-lib-ec_curve.o", - "crypto/ec/libfips-lib-ec_cvt.o", - "crypto/ec/libfips-lib-ec_key.o", - "crypto/ec/libfips-lib-ec_kmeth.o", - "crypto/ec/libfips-lib-ec_lib.o", - "crypto/ec/libfips-lib-ec_mult.o", - "crypto/ec/libfips-lib-ec_oct.o", - "crypto/ec/libfips-lib-ecdh_kdf.o", - "crypto/ec/libfips-lib-ecdh_ossl.o", - "crypto/ec/libfips-lib-ecdsa_ossl.o", - "crypto/ec/libfips-lib-ecdsa_sign.o", - "crypto/ec/libfips-lib-ecdsa_vrf.o", - "crypto/ec/libfips-lib-ecp_mont.o", - "crypto/ec/libfips-lib-ecp_nist.o", - "crypto/ec/libfips-lib-ecp_nistp224.o", - "crypto/ec/libfips-lib-ecp_nistp256.o", - "crypto/ec/libfips-lib-ecp_nistp384.o", - "crypto/ec/libfips-lib-ecp_nistp521.o", - "crypto/ec/libfips-lib-ecp_nistputil.o", - "crypto/ec/libfips-lib-ecp_nistz256-x86_64.o", - "crypto/ec/libfips-lib-ecp_nistz256.o", - "crypto/ec/libfips-lib-ecp_oct.o", - "crypto/ec/libfips-lib-ecp_smpl.o", - "crypto/ec/libfips-lib-ecx_backend.o", - "crypto/ec/libfips-lib-ecx_key.o", - "crypto/ec/libfips-lib-x25519-x86_64.o" + "crypto/ec/libcrypto-shlib-x25519-x86_64.o" ], "products" => { "lib" => [ - "libcrypto", - "providers/libfips.a" + "libcrypto" ] } }, @@ -10844,43 +10670,33 @@ our %unified_info = ( "crypto/ec/curve448/libcrypto-shlib-curve448_tables.o", "crypto/ec/curve448/libcrypto-shlib-eddsa.o", "crypto/ec/curve448/libcrypto-shlib-f_generic.o", - "crypto/ec/curve448/libcrypto-shlib-scalar.o", - "crypto/ec/curve448/libfips-lib-curve448.o", - "crypto/ec/curve448/libfips-lib-curve448_tables.o", - "crypto/ec/curve448/libfips-lib-eddsa.o", - "crypto/ec/curve448/libfips-lib-f_generic.o", - "crypto/ec/curve448/libfips-lib-scalar.o" + "crypto/ec/curve448/libcrypto-shlib-scalar.o" ], "products" => { "lib" => [ - "libcrypto", - "providers/libfips.a" + "libcrypto" ] } }, "crypto/ec/curve448/arch_32" => { "deps" => [ "crypto/ec/curve448/arch_32/libcrypto-lib-f_impl32.o", - "crypto/ec/curve448/arch_32/libcrypto-shlib-f_impl32.o", - "crypto/ec/curve448/arch_32/libfips-lib-f_impl32.o" + "crypto/ec/curve448/arch_32/libcrypto-shlib-f_impl32.o" ], "products" => { "lib" => [ - "libcrypto", - "providers/libfips.a" + "libcrypto" ] } }, "crypto/ec/curve448/arch_64" => { "deps" => [ "crypto/ec/curve448/arch_64/libcrypto-lib-f_impl64.o", - "crypto/ec/curve448/arch_64/libcrypto-shlib-f_impl64.o", - "crypto/ec/curve448/arch_64/libfips-lib-f_impl64.o" + "crypto/ec/curve448/arch_64/libcrypto-shlib-f_impl64.o" ], *** 3348 LINES SKIPPED *** From nobody Thu Aug 21 18:38:03 2025 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 4c7Bs743p5z65Vqq; Thu, 21 Aug 2025 18:38:03 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7Bs71Xp7z3k3D; Thu, 21 Aug 2025 18:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755801483; 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=HEjVmiPjWiES7GZNdI+DLT9g3NI41CAhWGbTaRvz6tQ=; b=SFNhaPLPAFINOnIOA+4d/2e8yYS5CYYgXqKnWBBtdYYxh8VA1vNCw5bHpS4t2Ia9Gg3PmF VG+7RLnyePpzXGX4ggdsdItqVbrojYmQMQGeQqmcC4goJ6Oo4oDw+f7qfGcxC+68++99Ew 9aij0Ld7JOKw26Yay5YPaJH6ayQ5Kd5JHkELxFrOn0juRQNlyppUm3vJG91Rt8pVxwNODU cHTPA2KKf+EQP46yqXy4s1BOOPvg/A+NzyHwGbGm/5gb3HSTxWrq2glKaY6Jc/k3tBo0Lx IL0tcab9fwwSbW9tlvVJBmZ+hZ/xOlnMEbGG9cRtu1z3LVZulzykaOQByRJRNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755801483; 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=HEjVmiPjWiES7GZNdI+DLT9g3NI41CAhWGbTaRvz6tQ=; b=fLMa7PY1t392peJZ8vhpbi9XenO3K6/WgwKJ95H+sHZgNoNY0xP5lZ4c1xkeCmIogtOtNq 3DrD5haeYzX94CfkggQjWatmagwKMVJ18F+k22fxplPwtJTbBEft2Ay/XEb3arMEsSEKDR /nlwdS9537bfqz3y3EaS4RbAwsamD+antbIJyrXRWqv/IgW7qLQuDw7Oz50Orwpq+RDPcF 2+7s2p8cKIB54bjyXylCdw/U3fQDU6c96YjzDUlt7xVbqH5DNBxekztZfAuKw3J56XZyR7 ROrkpeT5KXxoouapOropJhVbOF0D2niTaYp4sMyWNnJStLLTBwctm5mBjAROBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755801483; a=rsa-sha256; cv=none; b=a7GoIjWNhQhBN4uR3n5E5k1RlNiqHXuRafUG0nTbIvjNYl1t9/g5n9Nksmtb8aD86wI7Td WUgLJIPz1FD9MYY46lnvP6pa0Sx8X4WZe1nq2MgEWZAorfdY4e1q2JUPp55zv2JcOwy1DA 1P1FY5SjwXuGyp4RDjC7Bj6pHIZL4F8wGTY2phDVxflPXjGYF35sw1iKzvcjLwmUeqY3nR 8rjDDVDRbCDQnqCxOsjxqdrlQ88DAmsz+Deb5Ti4Mr7XCT35vakAncQ2FL/ajxKTX6d+dU wDoSQYjttFDlSIor9n8ElEvsl6Uak5epEJf/s/WUQQKkij22MNWixBzpzMEWCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7Bs716htz19G9; Thu, 21 Aug 2025 18:38:03 +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 57LIc39G065566; Thu, 21 Aug 2025 18:38:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LIc35S065563; Thu, 21 Aug 2025 18:38:03 GMT (envelope-from git) Date: Thu, 21 Aug 2025 18:38:03 GMT Message-Id: <202508211838.57LIc35S065563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: ac87d70563f8 - main - vtnet.4: improve existing descriptions and add missing ones 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac87d70563f85d53575956c6fe40615b2e501c13 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ac87d70563f85d53575956c6fe40615b2e501c13 commit ac87d70563f85d53575956c6fe40615b2e501c13 Author: Michael Tuexen AuthorDate: 2025-08-21 15:11:06 +0000 Commit: Michael Tuexen CommitDate: 2025-08-21 15:11:06 +0000 vtnet.4: improve existing descriptions and add missing ones Improve several descriptions for loader tunables and add descriptions of the statistics provided by read only sysctl-variables. Reviewed by: bcr MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51985 --- share/man/man4/vtnet.4 | 142 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 136 insertions(+), 6 deletions(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index 8b99cd9f17b9..43c10afa8561 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 29, 2025 +.Dd August 21, 2025 .Dt VTNET 4 .Os .Sh NAME @@ -68,20 +68,29 @@ prompt before booting the kernel or stored in .Bl -tag -width "xxxxxx" .It Va hw.vtnet.csum_disable .It Va hw.vtnet. Ns Ar X Ns Va .csum_disable -This tunable disables receive and send checksum offload. +This tunable disables receive and transmission checksum offloading for TCP and +UDP. +This also implies that TCP segmentation offloading and large receive offload +are disabled. The default value is 0. .It Va hw.vtnet.fixup_needs_csum .It Va hw.vtnet. Ns Ar X Ns Va .fixup_needs_csum -This tunable enforces the calculation of a valid checksum for NEEDS_CSUM -packets. +This tunable enforces the calculation of a valid TCP or UDP checksum for +packets received with +.Dv VIRTIO_NET_HDR_F_NEEDS_CSUM +being set in the +.Va flags +field of the structure +.Vt struct virtio_net_hdr . +It also marks the checksum as being correct in the mbuf packet header. The default value is 0. .It Va hw.vtnet.tso_disable .It Va hw.vtnet. Ns Ar X Ns Va .tso_disable -This tunable disables TSO. +This tunable disables TCP segmentation offloading. The default value is 0. .It Va hw.vtnet.lro_disable .It Va hw.vtnet. Ns Ar X Ns Va .lro_disable -This tunable disables LRO. +This tunable disables large receive offload. The default value is 0. .It Va hw.vtnet.mq_disable .It Va hw.vtnet. Ns Ar X Ns Va .mq_disable @@ -117,6 +126,127 @@ This tunable disables ALTQ support, allowing the use of multiqueue instead. This option applies to all interfaces. The default value is 0. .El +.Sh TRANSMIT QUEUE STATISTICS +.Bl -tag -width "xxxxxx" +For each transmit queue of each interface the following read-only statistics +are provided: +.Bl -tag -width "xxxxxx" +.It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .rescheduled +The number of times the transmit interrupt handler was rescheduled. +.It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .tso +The number of times TCP segment offloading was performed. +.It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .csum +The number of times transmission checksum offloading for UDP or TCP was +performed. +.It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .omcasts +The number of multicast packets that were transmitted. +.It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .obytes +The number of bytes that were transmitted (based on Ethernet frames). +.It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .opackets +The number of packets that were transmitted (Ethernet frames). +.El +.Sh RECEIVE QUEUE STATISTICS +For each receive queue of each interface the following read-only statistics +are provided: +.Bl -tag -width "xxxxxx" +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .rescheduled +The number of times the receive interrupt handler was rescheduled. +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .host_lro +The number of times TCP large receive offload was performed. +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .csum_failed +Currently not used. +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .csum +The number of times receive checksum offloading for UDP or TCP was performed. +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .ierrors +The number of times an error occurred during input processing. +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .iqdrops +The number of times a packet was dropped during input processing. +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .ibytes +The number of bytes that were received (based on Ethernet frames). +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .ipackets +The number of packets that were received (Ethernet frames). +.El +.Sh INTERFACE TRANSMIT STATISTICS +For each interface the following read-only transmit statistics are provided: +.Bl -tag -width "xxxxxx" +.It Va dev.vtnet. Ns Ar X Ns Va .tx_task_rescheduled +The sum of +.Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .rescheduled +over all transmit queues of the interface. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_tso_offloaded +The sum of +.Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .tso +over all transmit queues of the interface. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_csum_offloaded +The sum of +.Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .csum +over all transmit queues of the interface. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_defrag_failed +The number of times an attempt to defragment an mbuf chain failed during a +transmit operation. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_defragged +The number of times an mbuf chain was defragmented during a transmit operation. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_tso_without_csum +The number of times TCP segment offloading was attempted without transmission +checksum offloading. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_tso_not_tcp +The number of times TCP segment offloading was attempted for a non-TCP packet. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_csum_proto_mismatch +The number of times the IP protocol version of the transmission checksum +offloading request did not match the IP protocol version of the packet. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_csum_unknown_ethtype +The number of times a transmission offload operation was requested for an +ethernet frame for which the EtherType was neither IPv4 nor IPv6 +(considering simple VLAN tagging). +.El +.Sh INTERFACE RECEIVE STATISTICS +For each interface the following read-only receive statistics are provided: +.Bl -tag -width "xxxxxx" +.It Va dev.vtnet. Ns Ar X Ns Va .rx_task_rescheduled +The sum of +.Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .rescheduled +over all receive queues of the interface. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_csum_offloaded +The sum of +.Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .csum +over all receive queues of the interface. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_csum_failed +The sum of +.Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .csum_failed +over all receive queues of the interface. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_csum_bad_proto +Currently unused. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_csum_bad_offset +Currently unused. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_csum_bad_ipproto +Currently unused. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_csum_bad_ethtype +The number of times fixing the checksum required by +.Va hw.vtnet.fixup_needs_csum +or +.Va hw.vtnet. Ns Ar X Ns Va .fixup_needs_csum +was attempted for a packet with an EtherType other than IPv4 or IPv6. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_mergeable_failed +The number of times receiving a mergable buffer failed. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_enq_replacement_failed +The number of times the enqueuing the replacement receive mbuf chain failed. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_frame_too_large +The number of times the frame was loger than the mbuf chain during large +receive offload without mergeable buffers. +.It Va dev.vtnet. Ns Ar X Ns Va .mbuf_alloc_failed +The number of times an mbuf cluster allocation for the receive buffer failed. +.El +.Sh INTERFACE CONFIGURATION PARAMETER +For each interface the following read-only configuration parameters are +provided: +.Bl -tag -width "xxxxxx" +.It Va dev.vtnet. Ns Ar X Ns Va .act_vq_pairs +The number of active virtqueue pairs. +.It Va dev.vtnet. Ns Ar X Ns Va .req_vq_pairs +The number of requested virtqueue pairs. +.It Va dev.vtnet. Ns Ar X Ns Va .max_vq_pairs +The maximum number of supported virtqueue pairs. +.El .Sh SEE ALSO .Xr arp 4 , .Xr netintro 4 , From nobody Thu Aug 21 18:45:25 2025 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 4c7C1d5HFgz65WC0; Thu, 21 Aug 2025 18:45:25 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7C1d43nRz3klR; Thu, 21 Aug 2025 18:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755801925; 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=8SG9z98wt+7v9ykDVUjQ9rAh1lDjh+gwnaKxLmI6P0Y=; b=F3Cije/KBMx+QX3RvYxbyaKBrcOlGtvR+5fOPNvis01WW5UjuZV1inpnTwBY9G9FPjA0yf 48QFUN4Ujdx5306hZ1VAWLPC2U+Mvj/jfMAJkP9bECF21hCQR6ATubHKoHsamDHUyMHQZK 4WzD2DTwaM7LLpR/OJvBUuyvSeuB0dsrAkXPdecPm7kqJ0QaWUhVgNCZmhXqJrfZvshC0u tpF2cSEYbTEx8qkFwtq9F89YQh57jLzLRhvzOjvBKQEOzOK4UwIoKYiIpOpou6wdqbdAV9 OcUKtNKi+C6kcXL4kCSjA1UWj381pNMarwQkavS0KreW2lLB1fTCs1rfYU1Agw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755801925; 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=8SG9z98wt+7v9ykDVUjQ9rAh1lDjh+gwnaKxLmI6P0Y=; b=GWydRqhV7YVFrPRp/UfgGHtnRpos6YNGxF67PiMORf1M7slZaG+9XI8NcHD6ulYVWYPyu6 MJ80kbkX8O0sdu/aqbmpB2bErKdn2AP3YkfPEZTa1nWLDI+f43+FXHiDCUR2W62fT/fOWp v6VLnHxbXRZcB+1rHBCNLaQXQhc+dllymKU7SthRAzo+STBORnsRMPZ84lBFI/iPzkquwS QHnx9LKMv8X60zEKdZ/ZDyMcCY74gnm0mxsi5XGvQgiswMt256suhn2PW1rFMrtVz2n2fx Dnkciyhcx3kcdS3gK+q82b6964xjoozwRKqFVcuYaMFeritEjtkcQ9dz9Tooxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755801925; a=rsa-sha256; cv=none; b=tjjwOkn5r8Tj5Rzcib8XoQvdFXl40PaJ6YB54L9FiaBAAw0Ac+kjQf8oFt5qhgARWyIwAM Ws9MEOUNSuREJo09TTO0Ko2SVOrU5/zeZk5q/7BGKK85xxEEdmdjSFGrgF7DVsadQkqx0y wcikjmOYTHv7G8BkW1Kp4nd27tV1aiFrY4FWVhCEU7s/Zw7RO7AkAshG0sCK72S2A6HSCe wXga6inpTo3GmRHbuUNUAJmUNUjPq5qLlTIqhx4hhowr+U+6+lrfXBk8FjD8XnLKwUWLdc 1qFuEGa89xN4WDLSyM1b6aExO8Nvrr0it7n4WUghaFFnJ7U9T04RrTFlTtjazg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7C1d2mr3z19k4; Thu, 21 Aug 2025 18:45:25 +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 57LIjPtR083030; Thu, 21 Aug 2025 18:45:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LIjP8j083027; Thu, 21 Aug 2025 18:45:25 GMT (envelope-from git) Date: Thu, 21 Aug 2025 18:45:25 GMT Message-Id: <202508211845.57LIjP8j083027@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 3077532b1bb2 - main - vtnet, ptnet: include opt_*.h files early 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3077532b1bb2911d3012ee90bae9d9499c960569 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3077532b1bb2911d3012ee90bae9d9499c960569 commit 3077532b1bb2911d3012ee90bae9d9499c960569 Author: Michael Tuexen AuthorDate: 2025-08-21 15:18:07 +0000 Commit: Michael Tuexen CommitDate: 2025-08-21 15:18:07 +0000 vtnet, ptnet: include opt_*.h files early Include opt_inet.h and opt_inet6.h early in the files including virtio_net.h, since they use INET and/or INET6. While there, remove redundant inclusion of sys/types.h, since it is included already by sys/param.h. There was a discussion to include opt_inet.h and opt_inet6.h also in virtio_net.h. glebius suggested to add a mechanism for files to check, if required opt_*.h files were included. virtio_net.h will be the first consumer of this mechanism. Reviewed by: glebius, Peter Lei MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52046 --- sys/dev/netmap/if_ptnet.c | 6 ++---- sys/dev/virtio/network/if_vtnet.c | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/netmap/if_ptnet.c b/sys/dev/netmap/if_ptnet.c index bf14bfdb73ea..9c06f7fec530 100644 --- a/sys/dev/netmap/if_ptnet.c +++ b/sys/dev/netmap/if_ptnet.c @@ -27,8 +27,9 @@ /* Driver for ptnet paravirtualized network device. */ #include +#include "opt_inet.h" +#include "opt_inet6.h" -#include #include #include #include @@ -75,9 +76,6 @@ #include #include -#include "opt_inet.h" -#include "opt_inet6.h" - #include #include #include diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 2ff9be9680b8..ecb3dbb370e5 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -28,6 +28,9 @@ /* Driver for VirtIO network devices. */ +#include "opt_inet.h" +#include "opt_inet6.h" + #include #include #include @@ -82,9 +85,6 @@ #include #include "virtio_if.h" -#include "opt_inet.h" -#include "opt_inet6.h" - #if defined(INET) || defined(INET6) #include #endif From nobody Thu Aug 21 18:59:46 2025 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 4c7CLD0T96z65X5W; Thu, 21 Aug 2025 18:59:48 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7CLC0FMjz3p32; Thu, 21 Aug 2025 18:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755802788; 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=spr/87Hbqdzidm7L+8bhxhLVBx81lFkxMrYfwojlbN8=; b=MmCD8KfgWLTQ/ytvkVN9+MFgWGafh8gGholgNaEAoKOwyCfzvItR6j3YB0CgC5qNUMtXhr IX9cnOvlTSMLWMbNmjmo/hWTIjzR99B/44tZgZF+WpcJpKWpjmO+mk/YkRWvtYbnR7gNHS jJxknq9NCSNDHgKO0uL7G4FRZBaldsiHdXOLqNVhzTb7bjYU0Egz30n0wanXakVZXCKCYX N5mJjiLFVONgDp0lTKXmbaIcLnOv7Zf0aNFaZxwxvf7PxRDaLJmibWljWu8yMf29hD5xTQ p4hX4fHwAQZnb1rOgYjMwUcISO+w5mEk4CZPYZ93kJeRnjNM6M9Z98xhpaF2tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755802787; 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=spr/87Hbqdzidm7L+8bhxhLVBx81lFkxMrYfwojlbN8=; b=g8ACYTU0ncBfHH4VQxt4jRM8T+nzg+GxLbZFyeW0og2c6vyNijFWcZiyGhZ9m3jad1RTgY h3XeLJUc0fRzIGk1yGi5XQ/Ld5aDIYQiiTFJnIgMnuT4r9YlxwRxxA67bxAzX0HCPtj1J5 D0CxYPHGWBILCEXgE2fM6hJzmrZP/5vASg57SYWv+pXRf07yniFtaD2xsBeRuoH0cGX+Cg RmjFHQyRhqkiS6tA9LrAQFYylPB0sAaR/Sepoj23lH9Soi6VEFk4m2aGq5XdIksNsmi0my PDKlpLOppRHeshNYYT2KM/taSkQbPJZ8aGxLPi7OgUqo5PdbeIak0yNIhmo9Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755802787; a=rsa-sha256; cv=none; b=D5g/DKecuq0YwvQ2H9ceKuBJ8+fc8p/XKDmY5PexRzBT+mMVy/Yaw/HW5vkliwnUrUQnXw FrAZOzs0kkS8/VKGBIVrfKeO6zZ4LhdGNees19QRu3ITZAj71IzIoOMfSCm6FJEahQVmIQ 1XnepEJyCL5HcVmS58C0gkZf6Mo1SzjpD8YfK64xPjSOCz1gvKV86tzTIpaGd0INSzjmu4 cJaONdC32I14MRaqMJnsCCl26Gq7/HAn3+cr6RBC6st23tjcQLh+sfdBe5Pzs89tI9YFC6 iB+S69Updp2+CMe7vOhbMDz3EbBwbjQNXfkwEvUkeBJ9uF+G89UGdPQy4bFsUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7CLB6jQ2z1BCf; Thu, 21 Aug 2025 18:59:46 +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 57LIxkiq003753; Thu, 21 Aug 2025 18:59:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LIxkSl003750; Thu, 21 Aug 2025 18:59:46 GMT (envelope-from git) Date: Thu, 21 Aug 2025 18:59:46 GMT Message-Id: <202508211859.57LIxkSl003750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f5efc804294c - main - tzcode: Reduce diff to upstream 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5efc804294c6bb24bd6d14bf2fb883a7320956c Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f5efc804294c6bb24bd6d14bf2fb883a7320956c commit f5efc804294c6bb24bd6d14bf2fb883a7320956c Author: Dag-Erling Smørgrav AuthorDate: 2025-08-21 16:34:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-21 18:59:37 +0000 tzcode: Reduce diff to upstream Reviewed by: imp, jhb, emaste Differential Revision: https://reviews.freebsd.org/D51997 --- contrib/tzcode/localtime.c | 292 ++++++++++++++++++++++++++------------------- 1 file changed, 169 insertions(+), 123 deletions(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index a6ec3d8e4e21..6eabe0afe570 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -13,37 +13,36 @@ /*LINTLIBRARY*/ #define LOCALTIME_IMPLEMENTATION +#ifdef __FreeBSD__ #include "namespace.h" +#include +#endif /* __FreeBSD__ */ #ifdef DETECT_TZ_CHANGES -#ifndef DETECT_TZ_CHANGES_INTERVAL -#define DETECT_TZ_CHANGES_INTERVAL 61 -#endif +# ifndef DETECT_TZ_CHANGES_INTERVAL +# define DETECT_TZ_CHANGES_INTERVAL 61 +# endif int __tz_change_interval = DETECT_TZ_CHANGES_INTERVAL; -#include -#endif -#include -#if THREAD_SAFE -#include -#endif +# include +#endif /* DETECT_TZ_CHANGES */ #include "private.h" -#include "un-namespace.h" #include "tzdir.h" #include "tzfile.h" - +#include +#ifdef __FreeBSD__ #include "libc_private.h" +#include "un-namespace.h" +#endif /* __FreeBSD__ */ #if defined THREAD_SAFE && THREAD_SAFE +# include +#ifdef __FreeBSD__ +# define pthread_mutex_lock(l) (__isthreaded ? _pthread_mutex_lock(l) : 0) +# define pthread_mutex_unlock(l) (__isthreaded ? _pthread_mutex_unlock(l) : 0) +#endif /* __FreeBSD__ */ static pthread_mutex_t locallock = PTHREAD_MUTEX_INITIALIZER; -static int lock(void) { - if (__isthreaded) - return _pthread_mutex_lock(&locallock); - return 0; -} -static void unlock(void) { - if (__isthreaded) - _pthread_mutex_unlock(&locallock); -} +static int lock(void) { return pthread_mutex_lock(&locallock); } +static void unlock(void) { pthread_mutex_unlock(&locallock); } #else static int lock(void) { return 0; } static void unlock(void) { } @@ -166,6 +165,9 @@ struct rule { int_fast32_t r_time; /* transition time of rule */ }; +#ifdef __FreeBSD__ +static void tzset_unlocked_name(char const *); +#endif /* __FreeBSD__ */ static struct tm *gmtsub(struct state const *, time_t const *, int_fast32_t, struct tm *); static bool increment_overflow(int *, int); @@ -194,7 +196,7 @@ static struct state *const gmtptr = &gmtmem; static char lcl_TZname[TZ_STRLEN_MAX + 1]; static int lcl_is_set; - +#ifdef __FreeBSD__ static pthread_once_t gmt_once = PTHREAD_ONCE_INIT; static pthread_once_t gmtime_once = PTHREAD_ONCE_INIT; static pthread_key_t gmtime_key; @@ -205,6 +207,7 @@ static int offtime_key_error; static pthread_once_t localtime_once = PTHREAD_ONCE_INIT; static pthread_key_t localtime_key; static int localtime_key_error; +#endif /* __FreeBSD__ */ /* ** Section 4.12.3 of X3.159-1989 requires that @@ -398,13 +401,14 @@ scrub_abbrs(struct state *sp) #ifdef DETECT_TZ_CHANGES /* - * Determine if there's a change in the timezone since the last time we checked. + * Check whether either the time zone name or the file it refers to has + * changed since the last time we checked. * Returns: -1 on error - * 0 if the timezone has not changed - * 1 if the timezone has changed + * 0 if the time zone has not changed + * 1 if the time zone has changed */ static int -change_in_tz(const char *name) +tzfile_changed(const char *name) { static char old_name[PATH_MAX]; static struct stat old_sb; @@ -429,9 +433,7 @@ change_in_tz(const char *name) return 0; } -#else /* !DETECT_TZ_CHANGES */ -#define change_in_tz(X) 1 -#endif /* !DETECT_TZ_CHANGES */ +#endif /* DETECT_TZ_CHANGES */ /* Input buffer for data read from a compiled tz file. */ union input_buffer { @@ -478,6 +480,7 @@ tzloadbody(char const *name, struct state *sp, bool doextend, register int fid; register int stored; register ssize_t nread; + register bool doaccess; register union input_buffer *up = &lsp->u.u; register int tzheadsize = sizeof(struct tzhead); @@ -491,7 +494,17 @@ tzloadbody(char const *name, struct state *sp, bool doextend, if (name[0] == ':') ++name; - if (name[0] != '/') { +#ifdef SUPPRESS_TZDIR + /* Do not prepend TZDIR. This is intended for specialized + applications only, due to its security implications. */ + doaccess = true; +#else + doaccess = name[0] == '/'; +#endif + if (!doaccess) { +#ifndef __FreeBSD__ + char const *dot; +#endif /* !__FreeBSD__ */ if (sizeof lsp->fullname - sizeof tzdirslash <= strlen(name)) return ENAMETOOLONG; @@ -501,15 +514,32 @@ tzloadbody(char const *name, struct state *sp, bool doextend, memcpy(lsp->fullname, tzdirslash, sizeof tzdirslash); strcpy(lsp->fullname + sizeof tzdirslash, name); +#ifndef __FreeBSD__ + /* Set doaccess if NAME contains a ".." file name + component, as such a name could read a file outside + the TZDIR virtual subtree. */ + for (dot = name; (dot = strchr(dot, '.')); dot++) + if ((dot == name || dot[-1] == '/') && dot[1] == '.' + && (dot[2] == '/' || !dot[2])) { + doaccess = true; + break; + } +#endif /* !__FreeBSD__ */ + name = lsp->fullname; } +#ifndef __FreeBSD__ + if (doaccess && access(name, R_OK) != 0) + return errno; +#endif /* !__FreeBSD__ */ +#ifdef DETECT_TZ_CHANGES if (doextend) { /* * Detect if the timezone file has changed. Check - * 'doextend' to ignore TZDEFRULES; the change_in_tz() + * 'doextend' to ignore TZDEFRULES; the tzfile_changed() * function can only keep state for a single file. */ - switch (change_in_tz(name)) { + switch (tzfile_changed(name)) { case -1: return errno; case 0: @@ -518,6 +548,7 @@ tzloadbody(char const *name, struct state *sp, bool doextend, break; } } +#endif /* DETECT_TZ_CHANGES */ fid = _open(name, O_RDONLY | O_BINARY); if (fid < 0) return errno; @@ -1370,8 +1401,11 @@ gmtload(struct state *const sp) } #ifdef DETECT_TZ_CHANGES +/* + * Check if the time zone data we have is still fresh. + */ static int -recheck_tzdata() +tzdata_is_fresh(void) { static time_t last_checked; struct timespec now; @@ -1387,9 +1421,7 @@ recheck_tzdata() return 0; } -#else /* !DETECT_TZ_CHANGES */ -#define recheck_tzdata() 0 -#endif /* !DETECT_TZ_CHANGES */ +#endif /* DETECT_TZ_CHANGES */ /* Initialize *SP to a value appropriate for the TZ setting NAME. Return 0 on success, an errno value on failure. */ @@ -1418,16 +1450,27 @@ zoneinit(struct state *sp, char const *name) } } +static void +tzset_unlocked(void) +{ +#ifdef __FreeBSD__ + tzset_unlocked_name(getenv("TZ")); +} static void tzset_unlocked_name(char const *name) { +#else + char const *name = getenv("TZ"); +#endif struct state *sp = lclptr; int lcl = name ? strlen(name) < sizeof lcl_TZname : -1; if (lcl < 0 ? lcl_is_set < 0 : 0 < lcl_is_set && strcmp(lcl_TZname, name) == 0) - if (recheck_tzdata() == 0) - return; +#ifdef DETECT_TZ_CHANGES + if (tzdata_is_fresh() == 0) +#endif /* DETECT_TZ_CHANGES */ + return; #ifdef ALL_STATE if (! sp) lclptr = sp = malloc(sizeof *lclptr); @@ -1442,12 +1485,6 @@ tzset_unlocked_name(char const *name) lcl_is_set = lcl; } -static void -tzset_unlocked(void) -{ - tzset_unlocked_name(getenv("TZ")); -} - void tzset(void) { @@ -1457,6 +1494,7 @@ tzset(void) unlock(); } +#ifdef __FreeBSD__ void freebsd13_tzsetwall(void) { @@ -1468,7 +1506,7 @@ freebsd13_tzsetwall(void) __sym_compat(tzsetwall, freebsd13_tzsetwall, FBSD_1.0); __warn_references(tzsetwall, "warning: tzsetwall() is deprecated, use tzset() instead."); - +#endif /* __FreeBSD__ */ static void gmtcheck(void) { @@ -1485,6 +1523,9 @@ gmtcheck(void) } unlock(); } +#ifdef __FreeBSD__ +#define gmtcheck() _once(&gmt_once, gmtcheck) +#endif #if NETBSD_INSPIRED @@ -1652,45 +1693,47 @@ localtime_tzset(time_t const *timep, struct tm *tmp, bool setname) } #ifndef DETECT_TZ_CHANGES if (setname || !lcl_is_set) -#endif +#endif /* DETECT_TZ_CHANGES */ tzset_unlocked(); tmp = localsub(lclptr, timep, setname, tmp); unlock(); return tmp; } +#ifdef __FreeBSD__ static void localtime_key_init(void) { - - localtime_key_error = _pthread_key_create(&localtime_key, free); + localtime_key_error = _pthread_key_create(&localtime_key, free); } - +#endif /* __FreeBSD__ */ struct tm * localtime(const time_t *timep) { #if !SUPPORT_C89 - static struct tm tm; + static struct tm tm; #endif - struct tm *p_tm = &tm; - - if (__isthreaded != 0) { - _pthread_once(&localtime_once, localtime_key_init); - if (localtime_key_error != 0) { - errno = localtime_key_error; - return (NULL); - } - if ((p_tm = _pthread_getspecific(localtime_key)) == NULL) { - if ((p_tm = malloc(sizeof(*p_tm))) == NULL) { - return (NULL); - } - if (_pthread_setspecific(localtime_key, p_tm) != 0) { - free(p_tm); - return (NULL); - } - } - } - return localtime_tzset(timep, p_tm, true); +#ifdef __FreeBSD__ + struct tm *p_tm = &tm; + + if (__isthreaded != 0) { + _pthread_once(&localtime_once, localtime_key_init); + if (localtime_key_error != 0) { + errno = localtime_key_error; + return (NULL); + } + if ((p_tm = _pthread_getspecific(localtime_key)) == NULL) { + if ((p_tm = malloc(sizeof(*p_tm))) == NULL) { + return (NULL); + } + if (_pthread_setspecific(localtime_key, p_tm) != 0) { + free(p_tm); + return (NULL); + } + } + } +#endif /* __FreeBSD__ */ + return localtime_tzset(timep, p_tm, true); } struct tm * @@ -1729,42 +1772,44 @@ gmtsub(ATTRIBUTE_MAYBE_UNUSED struct state const *sp, time_t const *timep, struct tm * gmtime_r(time_t const *restrict timep, struct tm *restrict tmp) { - _once(&gmt_once, gmtcheck); - return gmtsub(gmtptr, timep, 0, tmp); + gmtcheck(); + return gmtsub(gmtptr, timep, 0, tmp); } +#ifdef __FreeBSD__ static void gmtime_key_init(void) { - - gmtime_key_error = _pthread_key_create(&gmtime_key, free); + gmtime_key_error = _pthread_key_create(&gmtime_key, free); } - +#endif /* __FreeBSD__ */ struct tm * gmtime(const time_t *timep) { #if !SUPPORT_C89 - static struct tm tm; + static struct tm tm; #endif - struct tm *p_tm = &tm; - - if (__isthreaded != 0) { - _pthread_once(&gmtime_once, gmtime_key_init); - if (gmtime_key_error != 0) { - errno = gmtime_key_error; - return (NULL); - } - if ((p_tm = _pthread_getspecific(gmtime_key)) == NULL) { - if ((p_tm = malloc(sizeof(*p_tm))) == NULL) { - return (NULL); - } - if (_pthread_setspecific(gmtime_key, p_tm) != 0) { - free(p_tm); - return (NULL); - } - } - } - return gmtime_r(timep, p_tm); +#ifdef __FreeBSD__ + struct tm *p_tm = &tm; + + if (__isthreaded != 0) { + _pthread_once(&gmtime_once, gmtime_key_init); + if (gmtime_key_error != 0) { + errno = gmtime_key_error; + return (NULL); + } + if ((p_tm = _pthread_getspecific(gmtime_key)) == NULL) { + if ((p_tm = malloc(sizeof(*p_tm))) == NULL) { + return (NULL); + } + if (_pthread_setspecific(gmtime_key, p_tm) != 0) { + free(p_tm); + return (NULL); + } + } + } +#endif /* __FreeBSD__ */ + return gmtime_r(timep, p_tm); } #if STD_INSPIRED @@ -1775,42 +1820,44 @@ gmtime(const time_t *timep) struct tm * offtime_r(time_t const *restrict timep, long offset, struct tm *restrict tmp) { - _once(&gmt_once, gmtcheck); - return gmtsub(gmtptr, timep, offset, tmp); + gmtcheck(); + return gmtsub(gmtptr, timep, offset, tmp); } +#ifdef __FreeBSD__ static void offtime_key_init(void) { - - offtime_key_error = _pthread_key_create(&offtime_key, free); + offtime_key_error = _pthread_key_create(&offtime_key, free); } - +#endif /* __FreeBSD__ */ struct tm * offtime(const time_t *timep, long offset) { #if !SUPPORT_C89 - static struct tm tm; + static struct tm tm; #endif - struct tm *p_tm = &tm; - - if (__isthreaded != 0) { - _pthread_once(&offtime_once, offtime_key_init); - if (offtime_key_error != 0) { - errno = offtime_key_error; - return (NULL); - } - if ((p_tm = _pthread_getspecific(offtime_key)) == NULL) { - if ((p_tm = malloc(sizeof(*p_tm))) == NULL) { - return (NULL); - } - if (_pthread_setspecific(offtime_key, p_tm) != 0) { - free(p_tm); - return (NULL); - } - } - } - return offtime_r(timep, offset, p_tm); +#ifdef __FreeBSD__ + struct tm *p_tm = &tm; + + if (__isthreaded != 0) { + _pthread_once(&offtime_once, offtime_key_init); + if (offtime_key_error != 0) { + errno = offtime_key_error; + return (NULL); + } + if ((p_tm = _pthread_getspecific(offtime_key)) == NULL) { + if ((p_tm = malloc(sizeof(*p_tm))) == NULL) { + return (NULL); + } + if (_pthread_setspecific(offtime_key, p_tm) != 0) { + free(p_tm); + return (NULL); + } + } + } +#endif + return offtime_r(timep, offset, p_tm); } #endif @@ -2323,7 +2370,6 @@ time1(struct tm *const tmp, errno = EINVAL; return WRONG; } - if (tmp->tm_isdst > 1) tmp->tm_isdst = 1; t = time2(tmp, funcp, sp, offset, &okay); @@ -2382,7 +2428,7 @@ mktime_tzname(struct state *sp, struct tm *tmp, bool setname) if (sp) return time1(tmp, localsub, sp, setname); else { - _once(&gmt_once, gmtcheck); + gmtcheck(); return time1(tmp, gmtsub, gmtptr, 0); } } @@ -2438,7 +2484,7 @@ timeoff(struct tm *tmp, long offset) { if (tmp) tmp->tm_isdst = 0; - _once(&gmt_once, gmtcheck); + gmtcheck(); return time1(tmp, gmtsub, gmtptr, offset); } @@ -2508,7 +2554,7 @@ time2posix(time_t t) } #ifndef DETECT_TZ_CHANGES if (!lcl_is_set) -#endif +#endif /* DETECT_TZ_CHANGES */ tzset_unlocked(); if (lclptr) t = time2posix_z(lclptr, t); @@ -2555,7 +2601,7 @@ posix2time(time_t t) } #ifndef DETECT_TZ_CHANGES if (!lcl_is_set) -#endif +#endif /* DETECT_TZ_CHANGES */ tzset_unlocked(); if (lclptr) t = posix2time_z(lclptr, t); From nobody Thu Aug 21 18:59:47 2025 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 4c7CLD2PLSz65X3N; Thu, 21 Aug 2025 18:59:48 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7CLD0p0Jz3p7f; Thu, 21 Aug 2025 18:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755802788; 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=Pg128qPUgfJpo7dcz8tyjVs4MLIiqYmGu964rdDXDrM=; b=if1zkekiJ348klSoEGbuRTvEqb0CoMZdQoQSk9Lm3Jo/JL5Hlr17EKx21mPXa6WV2MwTzD u1PoLF7X7MYN9P4qUiUSaLcSGFbjOLDMg4CVVMZCdrkXhLOvOHgfYnNeNkceG1dbWu6kTj QhoIsLdkf+Pu608SBtqZwRrEp6byCcqrhm0XHAjY1JBk9aHTm3gsb730OyvvZyKZsxaNpn z1zcc+/5nYTK9oA6UIU3qptv8jPNEz9/o6fdxUVZ7jV38KaYTFt0Uj9+Zt7eHrE22RD7O4 KqiGveL/kYWPNmm45re7Rann0V3BVmc9XJpZ/29FcJN6+RN1ozKt6x7gMJIBzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755802788; 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=Pg128qPUgfJpo7dcz8tyjVs4MLIiqYmGu964rdDXDrM=; b=SGl1sPNYBEa4AGfHfRxLOVH3JNVLiImY88OGrLfVDwpHwuVnDVdub+A7tUlI947ERRpXGt 4WJ4hmn45r4JK6odiF5e87JZ9GYoD5ZYctpCwc5qtQDsy3v7e6kwHwsRc3mZvpL+FWYOXv pt2EksDlv9yIjGPT0/TuBMksLeHxcz/SLR35+vTKWNlU1Uurjz1KjMyIvC5jb2uPCJWwLF Ch2ETuz/xI33POVGeIXBVK4zKQ+VBPR4Zb7Y1gySPHeAIwt5bj+U/liTgb/clxVi4rUt5j HCISmn07gdNfKspu11vNzcBfT0HlUU8lZwsrcrF5OBOqshQG1EazKJL04Bi3EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755802788; a=rsa-sha256; cv=none; b=wxM0qEaJtH+YeKPTvZ3BWna20wAvBVBBgOagUACg/16HvYmaKPQce5RFwp4Xt0Tzhe6zs6 ZEYTTho2gdzWR15+cARJ9H84XASenzSGe98WBhIKLtrmCuWnA6VCP3n1HNbvHd+hMi6pwY 94Jd4GK1K40V57QpfbUFh7K+VomUS1WS5M11Rbkw+nTJod0OOdooP2IrA4h4GhwG3C7/T4 F4i30uzmkYER0WMZ41Vcyiihr9ZV+TZKbds0X+mB7vuSG4Ajd2BFM+Z3F4EAwubGVKE3cK j33PbW9TjEFZZQGGzh9x9LcOEXOChIp/AXGm1DAgCYAtJL+Rzaq40z0iA/Y2Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7CLD067hz19kf; Thu, 21 Aug 2025 18:59:48 +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 57LIxlQa003789; Thu, 21 Aug 2025 18:59:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LIxlcm003786; Thu, 21 Aug 2025 18:59:47 GMT (envelope-from git) Date: Thu, 21 Aug 2025 18:59:47 GMT Message-Id: <202508211859.57LIxlcm003786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b6ea2513f776 - main - tzcode: Limit TZ for setugid programs 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6ea2513f7769ea9d9e4d342777111add2c903b0 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b6ea2513f7769ea9d9e4d342777111add2c903b0 commit b6ea2513f7769ea9d9e4d342777111add2c903b0 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-21 16:34:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-21 18:59:37 +0000 tzcode: Limit TZ for setugid programs The zoneinfo parser can be told to read any file the program can access by setting TZ to either an absolute path, or a path relative to the zoneinfo directory. For setugid programs, we previously had a hack from OpenBSD which rejects values of TZ deemed unsafe, but that was rather arbitrary (anything containing a dot, for instance). Leverage openat() with AT_RESOLVE_BENEATH instead. For simplicity, move the TZ change detection code to after we've opened the file, and stat the file descriptor rather than the name. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D52029 --- contrib/tzcode/localtime.c | 70 +++++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 25 deletions(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index 6eabe0afe570..1a01db931cab 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -408,13 +408,13 @@ scrub_abbrs(struct state *sp) * 1 if the time zone has changed */ static int -tzfile_changed(const char *name) +tzfile_changed(const char *name, int fd) { static char old_name[PATH_MAX]; static struct stat old_sb; struct stat sb; - if (stat(name, &sb) != 0) + if (_fstat(fd, &sb) != 0) return -1; if (strcmp(name, old_name) != 0) { @@ -446,8 +446,10 @@ union input_buffer { + 4 * TZ_MAX_TIMES]; }; +#ifndef __FreeBSD__ /* TZDIR with a trailing '/' rather than a trailing '\0'. */ static char const tzdirslash[sizeof TZDIR] = TZDIR "/"; +#endif /* !__FreeBSD__ */ /* Local storage needed for 'tzloadbody'. */ union local_storage { @@ -460,6 +462,7 @@ union local_storage { struct state st; } u; +#ifndef __FreeBSD__ /* The name of the file to be opened. Ideally this would have no size limits, to support arbitrarily long Zone names. Limiting Zone names to 1024 bytes should suffice for practical use. @@ -467,6 +470,7 @@ union local_storage { file_analysis as that struct is allocated anyway, as the other union member. */ char fullname[max(sizeof(struct file_analysis), sizeof tzdirslash + 1024)]; +#endif /* !__FreeBSD__ */ }; /* Load tz data from the file named NAME into *SP. Read extended @@ -480,7 +484,11 @@ tzloadbody(char const *name, struct state *sp, bool doextend, register int fid; register int stored; register ssize_t nread; +#ifdef __FreeBSD__ + int serrno; +#else /* !__FreeBSD__ */ register bool doaccess; +#endif /* !__FreeBSD__ */ register union input_buffer *up = &lsp->u.u; register int tzheadsize = sizeof(struct tzhead); @@ -494,6 +502,7 @@ tzloadbody(char const *name, struct state *sp, bool doextend, if (name[0] == ':') ++name; +#ifndef __FreeBSD__ #ifdef SUPPRESS_TZDIR /* Do not prepend TZDIR. This is intended for specialized applications only, due to its security implications. */ @@ -502,9 +511,7 @@ tzloadbody(char const *name, struct state *sp, bool doextend, doaccess = name[0] == '/'; #endif if (!doaccess) { -#ifndef __FreeBSD__ char const *dot; -#endif /* !__FreeBSD__ */ if (sizeof lsp->fullname - sizeof tzdirslash <= strlen(name)) return ENAMETOOLONG; @@ -514,7 +521,6 @@ tzloadbody(char const *name, struct state *sp, bool doextend, memcpy(lsp->fullname, tzdirslash, sizeof tzdirslash); strcpy(lsp->fullname + sizeof tzdirslash, name); -#ifndef __FreeBSD__ /* Set doaccess if NAME contains a ".." file name component, as such a name could read a file outside the TZDIR virtual subtree. */ @@ -524,35 +530,49 @@ tzloadbody(char const *name, struct state *sp, bool doextend, doaccess = true; break; } -#endif /* !__FreeBSD__ */ name = lsp->fullname; } -#ifndef __FreeBSD__ if (doaccess && access(name, R_OK) != 0) return errno; -#endif /* !__FreeBSD__ */ -#ifdef DETECT_TZ_CHANGES - if (doextend) { - /* - * Detect if the timezone file has changed. Check - * 'doextend' to ignore TZDEFRULES; the tzfile_changed() - * function can only keep state for a single file. - */ - switch (tzfile_changed(name)) { - case -1: - return errno; - case 0: - return 0; - case 1: - break; - } - } -#endif /* DETECT_TZ_CHANGES */ +#else /* __FreeBSD__ */ + if (issetugid()) { + const char *relname = name; + if (strncmp(relname, TZDIR "/", strlen(TZDIR) + 1) == 0) + relname += strlen(TZDIR) + 1; + int dd = _open(TZDIR, O_DIRECTORY | O_RDONLY); + if (dd < 0) + return errno; + fid = _openat(dd, relname, O_RDONLY | O_BINARY, AT_RESOLVE_BENEATH); + serrno = errno; + _close(dd); + errno = serrno; + } else +#endif fid = _open(name, O_RDONLY | O_BINARY); if (fid < 0) return errno; +#ifdef DETECT_TZ_CHANGES + if (doextend) { + /* + * Detect if the timezone file has changed. Check 'doextend' to + * ignore TZDEFRULES; the tzfile_changed() function can only + * keep state for a single file. + */ + switch (tzfile_changed(name, fid)) { + case -1: + serrno = errno; + _close(fid); + return serrno; + case 0: + _close(fid); + return 0; + case 1: + break; + } + } +#endif /* DETECT_TZ_CHANGES */ nread = _read(fid, up->buf, sizeof up->buf); if (nread < tzheadsize) { int err = nread < 0 ? errno : EINVAL; From nobody Thu Aug 21 19:11:51 2025 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 4c7Cc80Yrkz65Xrq; Thu, 21 Aug 2025 19:11:52 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7Cc76L59z3vHs; Thu, 21 Aug 2025 19:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755803511; 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=qdzmmMNPDn+OXYlwUkle4YgYGzRtmBVdRjl5UV6g6jg=; b=AjTcvCGL3RXkbsJHADsmTpTHNjai/0rCs6vEfge3kUsqNuaw1s2i7F9+TIW+QAVlTOnkpz pxAHFcq8thek8+HEl8fWG337QWjJYYdR0Cz7XKDWJo2s9/V5W8Os0LE0TsoNDrKyTcu4pD ZJle+Og6fxlI7gh3CvxwBH1Wh+AKOHjAFVNhqQuKHmUOH+/YJ3wye6iuN8qVUv26TbCxNt Xn54KuTyJKSEd4quJX6PbusZ7PuyDABYkvcBqDSjQF5uZaEi89uGmTphaeLlb9QXRq5Opp zZDthQtu9h+J1lyXPJLT1R4oWhEvG6fN+69s9p2h8MWHLC4BC+tSUQIHMUJ9Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755803511; 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=qdzmmMNPDn+OXYlwUkle4YgYGzRtmBVdRjl5UV6g6jg=; b=Bq6WH20acDeyJT/r65POZOz+weYJlBbMUjiP7+TKdchP6cgoBTgHSciSRaOiqi15wQjXfU Wk9mnp94q2t6c+u/zsJKyKzkFdSiWxgHoTiLyTs+lAypePMOnAhipfwpdlhCay+Ijks317 5Wpa/Rzxn1wb48vXywIRGP+BzU7M0qqeh0BNx9YmSanvezyqrh2NUCtAxnancakiee7FjJ xLgAaUp9KApYKzurZi2yMlO0z1u8oxr4c1IlygirunXSATrJDvZYQ9SyuigKz+RFAjnNYN AP3M9qNBnxsnEInZx+BRskDvWCftfWCczcrao0dJY9jbYPveqfL0m3YuaW5bFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755803511; a=rsa-sha256; cv=none; b=WX3Qmi1vApKTJY7HbagO1cdKhtmoEpVNt/59ndkZOjE7Mh58rfmnYNPfpbG8fg0Xc/uf+D I6InbEF/noDSD73Iv7CD+yp7PQEwS/VUZxUIxyDfsGf4cp8KANp9XYhByexVWXvblDKF3Q yWIQ14R5SuOv5GvVoyFEvFhruAKE5kkARRncRO9jyKPOoUGMXxxAN7GYwFB38M40N32SZj dZIjijzNqFNqoWDz0mStOwPQ4gA3PFsZVzpRsrb3SM9piAdzljxIrQGheVa5ldM+Ew1ND9 TSlUbrPA6QDukKhMTSsHA5N6oP5DfAdoKfDU50bE8+ckujkyCYq7SJV+NIcOHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7Cc75d8yz1Bfs; Thu, 21 Aug 2025 19:11:51 +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 57LJBpiu037369; Thu, 21 Aug 2025 19:11:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LJBp6V037366; Thu, 21 Aug 2025 19:11:51 GMT (envelope-from git) Date: Thu, 21 Aug 2025 19:11:51 GMT Message-Id: <202508211911.57LJBp6V037366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: c7263f873ee9 - main - vtnet.4: use transmit checksum offloading 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7263f873ee9abb772f67b5536e2380a046e1b94 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c7263f873ee9abb772f67b5536e2380a046e1b94 commit c7263f873ee9abb772f67b5536e2380a046e1b94 Author: Michael Tuexen AuthorDate: 2025-08-21 15:33:09 +0000 Commit: Michael Tuexen CommitDate: 2025-08-21 15:41:16 +0000 vtnet.4: use transmit checksum offloading Use transmit checksum offloading instead transmission checksum offloading to be consistent with other man pages. Reported by: Peter Lei MFC after: 3 days Sponsored by: Netflix, Inc. --- share/man/man4/vtnet.4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index 43c10afa8561..b6f10ddd87cb 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -68,7 +68,7 @@ prompt before booting the kernel or stored in .Bl -tag -width "xxxxxx" .It Va hw.vtnet.csum_disable .It Va hw.vtnet. Ns Ar X Ns Va .csum_disable -This tunable disables receive and transmission checksum offloading for TCP and +This tunable disables receive and transmit checksum offloading for TCP and UDP. This also implies that TCP segmentation offloading and large receive offload are disabled. @@ -136,7 +136,7 @@ The number of times the transmit interrupt handler was rescheduled. .It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .tso The number of times TCP segment offloading was performed. .It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .csum -The number of times transmission checksum offloading for UDP or TCP was +The number of times transmit checksum offloading for UDP or TCP was performed. .It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .omcasts The number of multicast packets that were transmitted. @@ -187,15 +187,15 @@ transmit operation. .It Va dev.vtnet. Ns Ar X Ns Va .tx_defragged The number of times an mbuf chain was defragmented during a transmit operation. .It Va dev.vtnet. Ns Ar X Ns Va .tx_tso_without_csum -The number of times TCP segment offloading was attempted without transmission +The number of times TCP segment offloading was attempted without transmit checksum offloading. .It Va dev.vtnet. Ns Ar X Ns Va .tx_tso_not_tcp The number of times TCP segment offloading was attempted for a non-TCP packet. .It Va dev.vtnet. Ns Ar X Ns Va .tx_csum_proto_mismatch -The number of times the IP protocol version of the transmission checksum +The number of times the IP protocol version of the transmit checksum offloading request did not match the IP protocol version of the packet. .It Va dev.vtnet. Ns Ar X Ns Va .tx_csum_unknown_ethtype -The number of times a transmission offload operation was requested for an +The number of times a transmit offload operation was requested for an ethernet frame for which the EtherType was neither IPv4 nor IPv6 (considering simple VLAN tagging). .El From nobody Thu Aug 21 19:22:36 2025 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 4c7CrX4gwXz65YPS for ; Thu, 21 Aug 2025 19:22:36 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7CrX2xVCz3x6r; Thu, 21 Aug 2025 19:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755804156; 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=fwFCXx6jO9OwggPTx7tqOu5EfjdGEZsicmxg81nUWXw=; b=vQknR0ktFUHs1i2NwhKCJiTe8p/aANwywWBQTow1FPbXD7jAk4EaMiPbK2n1bwkuSa9EYW ka7LsC4WeU7k4GLGhQYurvydnnsYMzunHyGYOXCB+rXHlEJ92+gPZNRLb6uIDYCegonC6d bUppSGVFbrwaVfP8wecAaq+MVBCEWsr34LSWxO6etrKG92jAeezy1S/GaOtSgESPhgDuFn ousMk45ZET8Depe2o9Q4ucaEf025B5wRsfhwz/V/U+kd20ABhgb7MCk9VV5AmA0CcDioM8 m4X9rH93uaCv+cCMScr8YhQZ+YqyI8PrVD21WwHVihIfyBOfVcSyiBCbzg5BAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755804156; 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=fwFCXx6jO9OwggPTx7tqOu5EfjdGEZsicmxg81nUWXw=; b=ZXIZ10gxMrSiduPcAfk43hXwScgBUkkMp1CR0/4vN8Vttji0t1pzWMgNjuD76cslxYK2w4 lFQymg/ETsPvEBILHXfxUHE9MxPh7uLOwslDlbLnZew3PZj7e1M5G1s/oqhNEYLBExEpqD gkP6czELxVXNYfMAjvcbgepoWIDVdVk4iWHDQ33C8ZDlB11RKUxhjAOlKdIWSGxx8Tsujt u7MBHWy/HUAYYFkUqeYfptbVUQ2DKq2eb9wmi4/CEpL3Nvc1JxixtvCdKsDxkZhoyXkXWH RQPKmfB5OpZjSl4lWoRrfg0kHJxFwrp07Oz8U8L7jAEKH40Jaw5YpLQ7BOsHIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755804156; a=rsa-sha256; cv=none; b=kIArEI6PFCYdlHaPzARNgj26OtL7ZO9RAGcNschClv5wvmgkUVNmtOBzO0bRDRX7Fp8Dev uptxqL7jzsEuxJkCK1OXcO7ND17JAnMJIef2lh/EgCXmV0lgv+X3kRBmj1wUBN4BuANsXC TMRpeASgYvmuDkaiOTMrx+nRnvqVvEAhSLIjvcQEPiQpj1GLjIshHzNmNV+BFM5SSOV8lY QF4f+AtHQVjWCqts1MDQvh2TuyiFewPNZhIYLajMfrp8G+T43771/A2gp404J1RT8WCeXY NfDZz6tR+IeXwDi1/kwOhkhOU53KpVxKxDws6K0p8Go8AxCfM6zXG1nPvKeLVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7CrX2HCQz1CBX; Thu, 21 Aug 2025 19:22:36 +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 57LJMaDC058664; Thu, 21 Aug 2025 19:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LJMaDg058663; Thu, 21 Aug 2025 19:22:36 GMT (envelope-from git) Date: Thu, 21 Aug 2025 19:22:36 GMT Message-Id: <202508211922.57LJMaDg058663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: =?utf-8?Q?Dag-Erling Sm=C3=B8rgrav?= Subject: git: b22cf0bcbe59 - Create tag vendor/tzcode/tzcode2025b 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: des X-Git-Repository: src X-Git-Refname: refs/tags/vendor/tzcode/tzcode2025b X-Git-Reftype: annotated tag X-Git-Commit: b22cf0bcbe592e17e816cfb52f7766f2065c8912 Auto-Submitted: auto-generated The annotated tag vendor/tzcode/tzcode2025b has been created by des: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/tzcode/tzcode2025b tag vendor/tzcode/tzcode2025b Tagger: Dag-Erling Smørgrav TaggerDate: 2025-08-21 19:21:47 +0000 Release 2025b - 2025-03-22 13:40:46 -0700 commit 76d3e9d6b36023210e896d00ecef2d19f0acd2d8 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-21 19:21:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-21 19:21:17 +0000 Import tzcode 2025b From nobody Thu Aug 21 19:22:36 2025 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 4c7CrX4f5gz65YdK for ; Thu, 21 Aug 2025 19:22:36 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7CrX2WSKz3x6q; Thu, 21 Aug 2025 19:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755804156; 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=eglwnNRr5WyWQyMZGFg6F5DNvOsm/KFPNsZfFC0d7Vw=; b=iRn3wFumjmlRQ2u9845JzSD+RW6RtrBUcWWu2v7Sib4inbVQx8AbKGM9pe4oLwoAz663jk GdPDTLVTBno4ViwY3s+xBv3Vhz9YOYRNoUFvMOKIrRaSLxqK3CawFee7zM8jd+Spi2AnvQ gtHCdZBvHm3x7zYiMu6so3TVD5+WgPaJhM3sn0H0S1WcKl3I7Dly4PfeMIUhoz6MCkSirL y7AMNE+LxqlpUEgsVPjEcbtF/8F9vMSxRKEASVrpazkj9TTJjVnzGp3Ak25QoMvOXyJlur t6rIwtzpROjIiVsBj/s39kp5ceu62CWIKXoiGZ9W7BeVvS0PlA1eBe6FJTeWFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755804156; 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=eglwnNRr5WyWQyMZGFg6F5DNvOsm/KFPNsZfFC0d7Vw=; b=Yf2uMcUAOQD8sZTl2OMsnJkp/IGqXkC5cRj6TIeBhQPcDily5J7rrquFNwXJDdzto9XkrU sH6fTgUuHbMfVqspWShBMhfYzMxiVHee9uYMRuHJzo3QRGcJsBFtRafmZpGXNyfh4WKQnP TnUVIV3RJ/NbR0NRPCbBFqjMFFi2GLiAhpcIzQRpYBzhQTuyC8908qt1GMRAsvRs8fZc4W Qi+1U3ypw/9PnVYVkxBsni0C/yfOxqke75Y/CiDAw1ohgutkEuOXNPHjLbnYyQBcXFbjf8 LoZYAj4ICSfqoUOe9C/AXQS/l9x0i7FxcNan2KWldzLPbh2HTSUgb3D7IqEBJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755804156; a=rsa-sha256; cv=none; b=GhLp6bZXuF/Kz1dQuYhgKrEP1R23vmmjRrLyvXsAsghymfdZCLo1V7wpnIvaT/ooBU8TJF fJCV3ER0j4GdbifkdwR+BGnGpvUrmMltbVTbcR6veIdDvqj8nEVEEifrR/EnbOT1E4IUcl bd6SqkZwxjge9FWaGZNsAjTwvdLowhmdPgbuOr24n/ucBaYV3lU9o72e2atqzIivyU/D/m MKbN0kNGh6SDB3ZPKw9Km2PrHtVNa3t3GUW7OqVcDGjIA5RKFOr1zDfpvJc92hPna8mpcx hSn/PyaqsXjOVrw7UIXl1u3jtFMegIS4fjH7MxihnAQowuT+1Fc5Jd6XIaIAjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7CrX262Mz1BwT; Thu, 21 Aug 2025 19:22:36 +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 57LJMapb058636; Thu, 21 Aug 2025 19:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LJMa9t058635; Thu, 21 Aug 2025 19:22:36 GMT (envelope-from git) Date: Thu, 21 Aug 2025 19:22:36 GMT Message-Id: <202508211922.57LJMa9t058635@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: =?utf-8?Q?Dag-Erling Sm=C3=B8rgrav?= Subject: git: 5c5144235d5b - Create tag vendor/tzcode/tzcode2025a 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: des X-Git-Repository: src X-Git-Refname: refs/tags/vendor/tzcode/tzcode2025a X-Git-Reftype: annotated tag X-Git-Commit: 5c5144235d5bfe057f77b0278279f74e4cd660fa Auto-Submitted: auto-generated The annotated tag vendor/tzcode/tzcode2025a has been created by des: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/tzcode/tzcode2025a tag vendor/tzcode/tzcode2025a Tagger: Dag-Erling Smørgrav TaggerDate: 2025-08-21 19:20:28 +0000 Release 2025a - 2025-01-15 10:47:24 -0800 commit cc325dd8c469265cf9c40616c8087b0ee98a6005 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-21 19:20:02 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-21 19:20:02 +0000 Import tzcode 2025a From nobody Thu Aug 21 19:22:36 2025 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 4c7CrX4yc8z65YPT for ; Thu, 21 Aug 2025 19:22:36 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7CrX2Sy5z3wyd; Thu, 21 Aug 2025 19:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755804156; 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=pY5+HbXOPNZsNKYiAgkcYZOv+EqmPhDVUoI10neGafk=; b=VhhKmszvbURZNzlM6lwkjWbzOQDmkfXlIic/100dDLLY4zlKkrxL4qwzJ0vmkgzVwKBVL6 HTAahJJ3d//YlwlMU8c/GNqe74RPB2zD63Q1SoTZIJequ4BoJOXzCgGHy1lHERt0r/M3LE 4U9r5aDANnbAvJoW4KECR5aRns3mclKkbXiYs9aQ/SqW/g3PEmSewN8X95bi19/EfKFWuK u4m586ExnbRb3msgsRlK2KVBqoPA8QJxBPihjTTRToGpkOzyxcn9jB2kMH2FKMH982QA8t Mz4dm4QgOAGamH5y+9jMp2h+vpjnX3+vGCxD2SFs+6HEbI9pjNu9VQ8CfZqJ2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755804156; 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=pY5+HbXOPNZsNKYiAgkcYZOv+EqmPhDVUoI10neGafk=; b=mxgxVi/taeDRoCTGnd9rx4xMWZsRxfGo7+2OL6t8nR1VL1lr6ZDBTFN83i9ilAZdwb/xfQ tyUW8B1V95shFFqG1ooLiddlUaZzGT3DrcEzqP8YEOmSU33EaoNXmCx+njHwPkvyHFWkS3 qkl+6EY4Nx+UIvMyFX1maKv8xZtsOJIAkOXCoUmICXcyNyAVgYJv+bsNsyyV1Dr7bBSwQJ Usm1tqPDXMdDsmMlzQKiLqVWUwS5Llx/OCCxmFGn6xrkd45WmQQ10gcFfudvfn0WjmYF5s MByRhACIxwRKnHrfmLfOWgthdHpC1WeJge2i+N0GgGJIoNBPTw92gp3/dpBWHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755804156; a=rsa-sha256; cv=none; b=Y9CZgD2zczC+nW9qVS1cil3+3MfSZZDvvmY1iSrNO1IpJDLMWO0E9niasL3d4HL61ZdhMf 5h0ndS0DlfB51yDg8NbEnEIpnHnJrdTzCBmHo+K7YkQFFDYaBVoeaTR1J2WnOsSPyVEDwy YJfZ95TPD7YDrUrb9QIGYSN8C2aTuGFDdd5/7GiWW+YxClsooN8LWiqb3fjJYnlnGIIRXs 8nNAi2yJyitCI5SQMPIC2hYodzUZC2ECNsIN0av+l98uH4HVHIiIxqDZhO1oVhdD3Glezf 5pDoJ5uJWDxlUwQckM+Y3CJEt4SBYhbtRSR629YX4CD01QoWqt14kUr1bBFxEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7CrX1dbZz1CBW; Thu, 21 Aug 2025 19:22:36 +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 57LJMaDk058608; Thu, 21 Aug 2025 19:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LJMarX058607; Thu, 21 Aug 2025 19:22:36 GMT (envelope-from git) Date: Thu, 21 Aug 2025 19:22:36 GMT Message-Id: <202508211922.57LJMarX058607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: =?utf-8?Q?Dag-Erling Sm=C3=B8rgrav?= Subject: git: e66ca70de4da..76d3e9d6b360 - vendor/tzcode - vendor branch updated 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: des X-Git-Repository: src X-Git-Refname: refs/heads/vendor/tzcode X-Git-Reftype: branch X-Git-Commit: 76d3e9d6b36023210e896d00ecef2d19f0acd2d8 X-Git-Oldrev: e66ca70de4daf76472887efffa74a91e32b98382 X-Git-Newrev: 76d3e9d6b36023210e896d00ecef2d19f0acd2d8 Auto-Submitted: auto-generated The branch vendor/tzcode has been updated by des: URL: https://cgit.FreeBSD.org/src/log/?id=e66ca70de4da..76d3e9d6b360 cc325dd8c469 Import tzcode 2025a 76d3e9d6b360 Import tzcode 2025b From nobody Thu Aug 21 20:27:38 2025 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 4c7FHZ3Wh4z65dFg; Thu, 21 Aug 2025 20:27:38 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7FHZ2nhnz46sF; Thu, 21 Aug 2025 20:27:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755808058; 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=+b4atrHXuX2KDCsDk4gKEsgHm6WmySng92Qb04ycl0c=; b=n9c35uG7mmDF7iAk7A7W2gkW40u5BJNqPd+yFNpl7NyLjUNsz8HyI/FC6P8K2V7lD2dt8G uWxPwE8xL8xToemtMj9pYZU7FlxrCI2mDnOAG7y7oQXBQ9r2nGgcGaqYH5y3O5i/UFDDdI 1IW6sTGBIPz0Xg7ozXrQRm27hlcSDwZGGAdkz7FPOY9zSFhOlrYY/IGFD2c88HndJqGNMO k49wKeJQix/i3Byr+S8PclVyduH1hYa/h7QFHDQGADDQrhYhdDJZ+Y1tv5JNfuZWUej7Bi hl/ccyOrYC0gxLu2SnnqAIdY9Wdq3K4QBRu2VUzb30OfsZEP2oxcQ2HbSqOFSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755808058; 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=+b4atrHXuX2KDCsDk4gKEsgHm6WmySng92Qb04ycl0c=; b=hvdIjbCqwYZfmkm+6LdqKmbCDTZj3olnFdL2tr+RRIYULK4SkSO7SgPns4Zlz9eL21e7c5 iRYJeu2Wl5EegadzIeEOOQrOJErkcmSJdKJvCwU4MNT8qoITYDqu4tWUHlBkOu6mPxRy4Z TYw5wI2ySH55YOWY26DuSBoF3Ug/4Tw5MBkAlQ5lsxJGYuWKF0ogPfU61fmYTnOTJgaT0A oyDo8iIGhA2Tv1awUJGx4GgK1Jn+7hfchDb1MGAH7bLN8EAlxAAFltkklvBnzePk72guux mChJ9FL/IsNEE/nqmOgmq6h8vdEDQBRESJ8/kWvK+wtw+4+JP3yGYmgtGzlukw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755808058; a=rsa-sha256; cv=none; b=eGkiqIuT3/jth+VXG3lWR01/6uUeh0zm0Twh658sYQ1eIDyRlGMeHliC2ydDYEPbQfMnFD veEHAV31etGIKpKg5NC4OgghP06EYwtjr2R0mkvGkmtz0K8zs5ucgEQU8uMlFWqAkrJBV5 lOPjOSD9ut6aBw9IzZKfK6VNv+JtomVhuyKzrSTKMKcCCHEcJU7ch2M0Cup/3saah1F+2u E6WEjpV9odqV+j7mgAZRAvpn9E5Fmc5wg4ZqNmPlSip4QdJpeKZAvssWLglNXm8rCEVZXv gEKmvrF1I7LVlDL3glQN08kGx1a7pbD4PH2JiYRvxBEo+xOFuKmJ9Ax6CUE5zQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7FHZ2Mx1z1CyC; Thu, 21 Aug 2025 20:27:38 +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 57LKRcxg073796; Thu, 21 Aug 2025 20:27:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LKRcQe073793; Thu, 21 Aug 2025 20:27:38 GMT (envelope-from git) Date: Thu, 21 Aug 2025 20:27:38 GMT Message-Id: <202508212027.57LKRcQe073793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: b03f765f076c - main - ata.4: Cleanup HARDWARE for HW Relnotes 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b03f765f076c6b6170f01681bfcc4dbc3df846c3 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=b03f765f076c6b6170f01681bfcc4dbc3df846c3 commit b03f765f076c6b6170f01681bfcc4dbc3df846c3 Author: Alexander Ziaee AuthorDate: 2025-05-26 01:23:38 +0000 Commit: Alexander Ziaee CommitDate: 2025-08-21 20:26:59 +0000 ata.4: Cleanup HARDWARE for HW Relnotes MFC after: 3 days Reported by: ivy (ata is for ide interface) --- share/man/man4/ata.4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4 index feea1dd3cc85..29b6bbef6838 100644 --- a/share/man/man4/ata.4 +++ b/share/man/man4/ata.4 @@ -155,7 +155,9 @@ The .Va hw.ata.ata_dma_check_80pin tunable can be set to 0 to disable this check. .Sh HARDWARE -The currently supported ATA/SATA controller chips are: +The +.Nm +driver supports the IDE interface on the following ATA/SATA controllers: .Pp .Bl -tag -width "Silicon Image:" -compact .It Acard: From nobody Thu Aug 21 20:40:17 2025 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 4c7FZ93pnMz65dtl for ; Thu, 21 Aug 2025 20:40:17 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7FZ932qfz49X6; Thu, 21 Aug 2025 20:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755808817; 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=cKvlekKZxq8WKXlAI+Nllh4ALjgTG4KHpO34HFWGwTE=; b=BmT6UgF2CiimEWHBAf+mQF+0jFBirpb2/tmqoAHROLfOuRaypiQh9ZERBoutv2Ux0QFWYe b9YRZfnN3dOIP6PRRV5GSvskVomTpNBlSNu7CezgW0Ki3LE+C3v9OJ8z2GktEr8k4XaoAT buwQ5Bz+LM7n91QKjWqSKeDO7qwXrKYJA7nlOW0dd4fuO2ILT87flQHC4RpwQhecDfWXal EnN5s7HLkAzd21gB+4eur4YjXgiysEEHWqf2pjGKCjSO2F04ztYbis6kTUuiYbrXeees4V 9PMvPnVjS5FZVx2Pp9b0XWPmefFhPpDe69EflFrJZPokmxcng6FdD5VzJn6DOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755808817; 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=cKvlekKZxq8WKXlAI+Nllh4ALjgTG4KHpO34HFWGwTE=; b=NqkLgMQTKRlPvI0FzhCFAYVBC1XFqGi/acZ0WjY/ZVx46UhEK/UmGea5GgB5Q0nFNKoGGE xE+6u3sSTXTOBgtLo3qgxocLhW6z9Dvarn3rmzjZE5+/isSf7BZIC08BQTKRvqzq5te0HT L9Hsc5jgE0T6uHmQCJvR29DcgDGKnontGSFB0Yb3SNAwybSsbBTkDOm/YR+gwOJfT1yfH0 ER2XEBbFkFQRZlkxVkviMUHMXMM1akuJvwN1IdzIQLtMxfWx4UFV13/hsLwspYHmBUaVnP in9RmZ4E+Q6WREhUgTS9WB2tEvJXiwvB+4O7pcmM1p5wQn2tPj+Z2gplmD3mEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755808817; a=rsa-sha256; cv=none; b=AP3PgWq+cYZIG1CYsTVIGsWa7NBg4dj3PtVo3pqxyldmbsHz5wY2gT6mg+nBp2emjpv5Oa DeZeblCgxPRyh92vF/E6XfagncxuUBI3ibdAzHUDBAbAiU14Vg36j8+vWSQdyau1FLjh9n uvmwcSl8d4625A8/Ozi1yWtpEJyd4rhUskQ2307SVCvoyy90LxZlYvpoYW/IXpDbekeBTe 2oQBzqEeYHbHKawWwHYZoP3WDnVTtMdjlv44TYch+PMzRl2m2t8L3ZLjpSBPzWJxdx3fry NiHOTZnVVASaLewS527MfB1gsOGbC/cgsUwQKgaFammSQJqX7k/ikYxobrFjkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7FZ92MsrzWG; Thu, 21 Aug 2025 20:40:17 +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 57LKeHDc001775; Thu, 21 Aug 2025 20:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LKeHoG001772; Thu, 21 Aug 2025 20:40:17 GMT (envelope-from git) Date: Thu, 21 Aug 2025 20:40:17 GMT Message-Id: <202508212040.57LKeHoG001772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Jung-uk Kim Subject: git: 314a38e76ee2 - Create tag vendor/acpica/20250807 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: jkim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/acpica/20250807 X-Git-Reftype: annotated tag X-Git-Commit: 314a38e76ee2d64de57a88f041a35a8d59899d2d Auto-Submitted: auto-generated The annotated tag vendor/acpica/20250807 has been created by jkim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/acpica/20250807 tag vendor/acpica/20250807 Tagger: Jung-uk Kim TaggerDate: 2025-08-21 20:39:03 +0000 Tag ACPICA 20250807 commit 5bb60d44e94172a567412968545c82065695d871 Author: Jung-uk Kim AuthorDate: 2025-08-21 20:38:34 +0000 Commit: Jung-uk Kim CommitDate: 2025-08-21 20:38:34 +0000 Import ACPICA 20250807 From nobody Thu Aug 21 20:40:17 2025 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 4c7FZ966Ltz65drF for ; Thu, 21 Aug 2025 20:40:17 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7FZ93g45z49X7; Thu, 21 Aug 2025 20:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755808817; 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=ICozCd5ZQUjOOvqKshvpLHgu7Y5hFSSrBzflbvq2fdM=; b=iHbEgf/mowajO7u4bpKoza2Sjk/eBdaRm6kZwnxvrwYxvBELEym7lwdKG4HDd72V2zR0Qm 6QWtilS4WbB4waapGYch2BTm4IMUomvBqX/HVu2hs8qUBlSilxKz8B7+Helj0osmANmzfI OV7fygOS6grBUIsJX5EKr9+fnaENPIxw2sCSQqtG9DopunS+cJCuukra30squDwRpZtcXr Vae5eikZsEGrUhb/N3g7Rewvpnjka9InjuUftpkNZEMYUeYkBO9K4UPba/Dkfokfa15rhG AZebcdFeR3ffPFZF93UgTSScF2SwfQxISFU6ogYqdx6kkf/8v+Va2+NUAmKSEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755808817; 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=ICozCd5ZQUjOOvqKshvpLHgu7Y5hFSSrBzflbvq2fdM=; b=i4Kt5dw3buJBaK2xPQMT7y85EfLX7D5wAXXmQgV1zpcuN6AqRsMnYD2oQHyXNJo6/yWs0z gfhqwCNXe8GlMtlrMRICNYs7rc9GtqlvhzZJgbVHblYxMJngJ2GRrC3NYJqO3z6A5ZuqXA 0cPTsNt/tN+91ecQa06RppuqMke4oWJvQygao+uWl/hkKXk2JSrvRublzRksQkAV0X4MTu jP5nfk5e4ijcnEMhtntZyZZxPxX35W/D8Yna94Nc8GYT4C+z8SKK3XO5l0LeRpr6hxotBV OhLWHeq7b3xUqgjJN5i2xlgqhgz22/Y1nLt1DYgR1JNBE9OuOEX7tPa8rWp6+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755808817; a=rsa-sha256; cv=none; b=lK99w9g31RQPOHOLMYEjf4l1zjRvvAw8Dp07M08vrRdhjcRBFMnWnYcyEtfjM9KzaO0olW ZRYfRbxmWgZ7X30StM9AbnGgkGvfaMw7dHRA/J+TZ3boXJLzcZAI2HWCt0o3oPekDlowWk ImEFlpZM78KlPC7UYwPvVvDIQC6NXTU1JHNXa+WwGCG0m83GB04LGVmxXoAhT8rdyUnVi1 u6kwbFuF9d2baL9P3CWH7SWaz3V/cv3djWB4+foyZchPv2sFaqt6xUKl4e/kWfZylXZ59i NqCncD3fe1K/AzjcexOsfcjonSIUL0BBtOaGWV3TcwQbOy2WxziacA3vaGH77w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7FZ91ysHzqQ; Thu, 21 Aug 2025 20:40:17 +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 57LKeHiO001727; Thu, 21 Aug 2025 20:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LKeHwc001721; Thu, 21 Aug 2025 20:40:17 GMT (envelope-from git) Date: Thu, 21 Aug 2025 20:40:17 GMT Message-Id: <202508212040.57LKeHwc001721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Jung-uk Kim Subject: git: 97a7606d897e..5bb60d44e941 - vendor/acpica - vendor branch updated 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: jkim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/acpica X-Git-Reftype: branch X-Git-Commit: 5bb60d44e94172a567412968545c82065695d871 X-Git-Oldrev: 97a7606d897edfa3089cb04eea70096a1f9cf734 X-Git-Newrev: 5bb60d44e94172a567412968545c82065695d871 Auto-Submitted: auto-generated The branch vendor/acpica has been updated by jkim: URL: https://cgit.FreeBSD.org/src/log/?id=97a7606d897e..5bb60d44e941 5bb60d44e941 Import ACPICA 20250807 From nobody Thu Aug 21 21:07:05 2025 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 4c7G9M0qWTz65gh5 for ; Thu, 21 Aug 2025 21:07:19 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 4c7G9L5vw1z4DTf for ; Thu, 21 Aug 2025 21:07:18 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-45a1b05d252so10780705e9.1 for ; Thu, 21 Aug 2025 14:07:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755810437; x=1756415237; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kmoDhK2D50jQ5IptKaBqeFkVXkx99uz4Z6klc2JHDdE=; b=RK4RhOGRWWJVQCl7WZFvg1dvRbhH46kC5rgMLZBvAA1+VNcv8k7TnlZvAUliLxyKv2 wI3BJFcXRTkVbKoCxJfvISD3qBPcgWny6l6kN81b3mracaWIHimO+sxX6n1x9bS2rnde NMf8qDlh+lI22ieuG9o0CRN4ZyWYC5AdB4zuJ+QnEsyP1NWiveDrZCuowEytjzrzMh1B YZr//fEaKkOoj1BEMST8e4sJNCoEvRHrZ+c8mRv21ENxTh7avfzK3lM+NBndg7UZ/GB6 3lVhTkhQ1tmJomja0v111yrYRK/3ovtgmTmDy1u0Tpi8yRVx2lDBFlzVyu/MdYLvQEsJ K/Iw== X-Forwarded-Encrypted: i=1; AJvYcCVyzor1mpX5Z45S3RvnKUajFq8coGlFNraqffcuoFE2hfn2ea8doiF3abAVGG4ThjLB2JDMQUIkLspJ1jYnaZjrNsNC@freebsd.org X-Gm-Message-State: AOJu0YwLNsY5l7Xwbe7Gl5Z+Sw9pazhMTr8DFCNEzcaHvu5dlH+PQ62Y XvAKiBH5y5jLgaVWiBQpQWdXwFaAcK7IOTcuIUIOWJQONtgEnEWDxRchxDrP7XhxEzA= X-Gm-Gg: ASbGnctsAcOt/Y6KpdwaLM3ySFiDIftbCM/STksTEXJy22WKL/uqSIngEB4eT4K3Tii CQNlmmoUImF8rMOoRq+FnGQ5Xg8jXhrOElvpmzfmuF1iDE++a32xQEbDi+ZSKb+cZ1JJQx1VjdY eRTkCAFrKhEL+ruys2rsV4cuelRYZqUxvQ/eepfvUkko0B5v3L1Xm6GPkgJW8r+Odoi9AspiNAJ 0FKcy7Pw23aGD+9BSQZPASui5wTQH5Mr+HGiuTvc+z4pxrfR9My0s4CJEUq/RoqgIvalaCb8ymo 6MBV1PxV/oqt2BjSs+uanzvyZjOKFaY4fBRHUZ5h/nGjmG7OF6jigQdVekqSwmRYHLjTfBQ2JLN pw1ugCnEiZnR533eGWXOYqMvU8gZlIk8lvPVudXGIw1dbY7UHe+dx8ljO+/I= X-Google-Smtp-Source: AGHT+IG/GRuUpbqeRtUGJT195mQNfOTnz22DzmgnKb8fUWNOPVkW7FKgo9B3GcIUNkOZQ8cbWqJ42A== X-Received: by 2002:a05:600c:1d01:b0:458:bfe1:4a81 with SMTP id 5b1f17b1804b1-45b517d3b07mr4714295e9.17.1755810437083; Thu, 21 Aug 2025 14:07:17 -0700 (PDT) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b50de89b1sm11600795e9.13.2025.08.21.14.07.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Aug 2025 14:07:16 -0700 (PDT) Content-Type: text/plain; charset=us-ascii 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 (Mac OS X Mail 16.0 \(3826.600.51.1.1\)) Subject: Re: git: 267f8c1f4b09 - main - crypto/openssl: make vendor imports easier/less error prone From: Jessica Clarke In-Reply-To: <202508211705.57LH50gR095150@gitrepo.freebsd.org> Date: Thu, 21 Aug 2025 22:07:05 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <39A8B2D8-49D9-4303-A74A-23FB38B867CC@freebsd.org> References: <202508211705.57LH50gR095150@gitrepo.freebsd.org> To: Enji Cooper X-Mailer: Apple Mail (2.3826.600.51.1.1) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c7G9L5vw1z4DTf On 21 Aug 2025, at 18:05, Enji Cooper wrote: >=20 > The branch main has been updated by ngie: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D267f8c1f4b09431b335d5f48d8458604= 7471f978 >=20 > commit 267f8c1f4b09431b335d5f48d84586047471f978 > Author: Enji Cooper > AuthorDate: 2025-08-01 04:03:33 +0000 > Commit: Enji Cooper > CommitDate: 2025-08-21 17:02:46 +0000 >=20 > crypto/openssl: make vendor imports easier/less error prone >=20 > This change adds a custom BSD makefile containing multiple = high-level PHONY > targets, similar to targets provided by the ports framework. >=20 > The Makefile does the following: > - Reruns Configure with a deterministic set of arguments to ensure = that > all appropriate features have been enabled/disabled in OpenSSL. > - Preens the pkgconfig files to remove duplicate paths in their > `CFLAGS` and `includedir` variables. > - Rebuilds all ASM files to ensure that the content contained is = fresh. > - Rebuilds all manpages to ensure that the content contained in the > manpages is fresh. >=20 > Some additional work needs to be done to make the manpage = regeneration > "operation" reproducible (the date the manpages were generated is > embedded in the files). >=20 > All dynamic configuration previously captured in > `include/openssl/configuration.h` and `include/crypto/bn_conf.h` = has been > moved to `freebsd/include/dynamic_freebsd_configuration.h` and > `freebsd/include/crypto/bn_conf.h`, respectively. This helps > ensure that future updates don't wipe out FreeBSD customizations to > these files, which tune behavior on a per-target architecture = basis, e.g., > ARM vs x86, 32-bit vs 64-bit, etc. >=20 > MFC after: 1 month > Differential Revision: https://reviews.freebsd.org/D51663 Something in this breaks building on macOS (where, as of recently, we build libcrypto as a bootstrap library for use by the certctl bootstrap tool): = /Users/runner/work/freebsd-src/freebsd-src/crypto/openssl/crypto/bio/bio_s= ock2.c:64:9: error: call to undeclared function 'ktls_enable'; ISO C99 = and later do not support implicit function declarations = [-Wimplicit-function-declaration]=20 ktls_enable(sock);=20 ^=20 = /Users/runner/work/freebsd-src/freebsd-src/crypto/openssl/crypto/bio/bio_s= ock2.c:202:5: error: call to undeclared function 'ktls_enable'; ISO C99 = and later do not support implicit function declarations = [-Wimplicit-function-declaration]=20 ktls_enable(sock);=20 ^=20 2 errors generated.=20 --- bio_sock2.o ---=20 *** [bio_sock2.o] Error code 1 Presumably you need a BOOTSTRAPPING check somewhere. Jessica From nobody Thu Aug 21 21:46:27 2025 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 4c7H2X0Mnhz65jNg; Thu, 21 Aug 2025 21:46:28 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7H2W74pNz4LYK; Thu, 21 Aug 2025 21:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755812788; 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=QT4vzkkj+KRQ6y/10GhGTTqzx/9PcoRxE4ch63zGD4I=; b=rJTasrKSQx28oopr0skVCM4UdrwnU37FPPC/EG7uh6ybweVzuNAkplqn2UNcVHeQRjE3CH m0U/4DVvctTBI0H+6EdxqnnDJ3bW4ajqEdIgT+ck/QGYJy+2W7sOKUIkz5pOzQSb7dyngv RdTsdTiuBhhsV3crSpLJo98XDMPI0y1zm8qLl3kvVbfIEZGOwyFnYC4+VkefyYYOTOUnZX smIg0v57BrTBmdappjwVadLWKGbxilw5c1tAmFqgnYwBVQCEKH7+BwFgssJvAunOAc5CI5 k87MIKA5/FoTJqYiKmz3XCkSWhwaWCjBQxe2/JZDhXsj+hF+m+eDb/2a/ehOAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755812788; 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=QT4vzkkj+KRQ6y/10GhGTTqzx/9PcoRxE4ch63zGD4I=; b=tKGT4Xt6BOF11l85X59jcgdHGFRdxUXABM9hnS8yEfOKcMi+dfrZGyOXvNfpOj/0BsU72N TBC7mYcERARFomDOp4RryhVTvedGRFhfiz0aqk//kD5QI3QuGhbLsHqKUcmohkNGW1deot 5/Wgk/fSdYyGH/e5ByUPTvwk7AJ1xasRO/OHvt7sHXrH73z19C8NBOZtui+TPOuSF+xb7p Y8EufHoNcxvTb+G2JJA1fg6X5ZiKpJuxojE8OH/AB5VeJaWksj2dVvjm/wZ5riFb9guh4T 5AY6Olg6FotUCeWch5EVgWp6hlEbF8It7D5ZdYH3YzF8XVlBITVi991bCb5kLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755812788; a=rsa-sha256; cv=none; b=dM+SUYI/AwsxhxhwkTYvpTakm0E8MoDLLlO6ZiLud4bTo1PRWDg0iHf8Og6kZvovk0Fn0V Of6Zumd6gAx/l5aRUzYxHUZBlaj1TwAWUrONQ/sXyevABMvnawuufb999Lp8FBQSO0bK0J DuEnZc9KMZnW/2b6QPdSXCRRJXjDYW71W5mEylI+IMbJK8rv59zs1hcv1mIrVCmVrVyObi IxEY+RCY452vAZUveXGwKDOu8744zLSPPICm5od/e1rlaN4FBxnPqqrgV3eU1Jc5oGl9YF c5dx5dgPIEROoVjkqw+uA9NpnG7BQdqRNDLJ3FbhuU4IQHmD7GlUsH3vcZPgYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7H2W65Xzz2gQ; Thu, 21 Aug 2025 21:46:27 +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 57LLkRgE026363; Thu, 21 Aug 2025 21:46:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LLkRKP026360; Thu, 21 Aug 2025 21:46:27 GMT (envelope-from git) Date: Thu, 21 Aug 2025 21:46:27 GMT Message-Id: <202508212146.57LLkRKP026360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: b5daf675efc7 - main - acpica: Merge ACPICA 20250807 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: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5daf675efc746611c7cfcd1fa474b8905064c4b Auto-Submitted: auto-generated The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=b5daf675efc746611c7cfcd1fa474b8905064c4b commit b5daf675efc746611c7cfcd1fa474b8905064c4b Merge: b03f765f076c 5bb60d44e941 Author: Jung-uk Kim AuthorDate: 2025-08-21 21:45:33 +0000 Commit: Jung-uk Kim CommitDate: 2025-08-21 21:45:33 +0000 acpica: Merge ACPICA 20250807 Merge commit '5bb60d44e94172a567412968545c82065695d871' sys/contrib/dev/acpica/changes.txt | 28 ++++++-- sys/contrib/dev/acpica/common/adisasm.c | 12 ++-- sys/contrib/dev/acpica/common/ahtable.c | 1 + sys/contrib/dev/acpica/common/dmtable.c | 1 + sys/contrib/dev/acpica/common/dmtbdump2.c | 2 +- sys/contrib/dev/acpica/common/dmtbinfo2.c | 2 +- sys/contrib/dev/acpica/common/dmtbinfo3.c | 2 +- sys/contrib/dev/acpica/compiler/aslanalyze.c | 16 ++++- sys/contrib/dev/acpica/compiler/aslrestype2s.c | 2 +- sys/contrib/dev/acpica/compiler/dttable2.c | 77 +++++++++++++++------- sys/contrib/dev/acpica/compiler/dttemplate.c | 24 +++++-- sys/contrib/dev/acpica/compiler/dttemplate.h | 24 +++---- sys/contrib/dev/acpica/compiler/dtutils.c | 1 + .../dev/acpica/components/disassembler/dmresrcl2.c | 2 +- .../dev/acpica/components/dispatcher/dsmethod.c | 29 ++++---- .../dev/acpica/components/dispatcher/dsmthdat.c | 1 + sys/contrib/dev/acpica/components/events/evglock.c | 5 ++ .../dev/acpica/components/executer/extrace.c | 66 ++++++++++++++++++- .../dev/acpica/components/parser/psopinfo.c | 8 +-- sys/contrib/dev/acpica/components/tables/tbprint.c | 8 +++ .../dev/acpica/components/utilities/utnonansi.c | 2 +- sys/contrib/dev/acpica/include/acdebug.h | 2 +- sys/contrib/dev/acpica/include/acexcep.h | 9 ++- sys/contrib/dev/acpica/include/acinterp.h | 4 ++ sys/contrib/dev/acpica/include/acpixf.h | 8 ++- sys/contrib/dev/acpica/include/actbl.h | 2 +- sys/contrib/dev/acpica/include/actbl1.h | 2 +- sys/contrib/dev/acpica/include/actbl2.h | 25 +++++++ 28 files changed, 280 insertions(+), 85 deletions(-) diff --cc sys/contrib/dev/acpica/components/parser/psopinfo.c index 21c2b831ef24,dcc426ff1c7b..1db32f4e8246 --- a/sys/contrib/dev/acpica/components/parser/psopinfo.c +++ b/sys/contrib/dev/acpica/components/parser/psopinfo.c @@@ -206,8 -206,8 +206,8 @@@ AcpiPsGetOpcodeInfo } #if defined ACPI_ASL_COMPILER && defined ACPI_DEBUG_OUTPUT -#include "asldefine.h" +#include - + switch (Opcode) { case AML_RAW_DATA_BYTE: diff --cc sys/contrib/dev/acpica/include/acpixf.h index 193b0e6a70dc,8f7047cda920..b5961e21bb9b --- a/sys/contrib/dev/acpica/include/acpixf.h +++ b/sys/contrib/dev/acpica/include/acpixf.h @@@ -154,12 -154,12 +154,12 @@@ /* Current ACPICA subsystem version in YYYYMMDD format */ - #define ACPI_CA_VERSION 0x20250404 + #define ACPI_CA_VERSION 0x20250807 -#include "acconfig.h" -#include "actypes.h" -#include "actbl.h" -#include "acbuffer.h" +#include +#include +#include +#include /***************************************************************************** diff --cc sys/contrib/dev/acpica/include/actbl.h index eafd5d8a0f8b,000000000000..ae52bd452c90 mode 100644,000000..100644 --- a/sys/contrib/dev/acpica/include/actbl.h +++ b/sys/contrib/dev/acpica/include/actbl.h @@@ -1,579 -1,0 +1,579 @@@ +/****************************************************************************** + * + * Name: actbl.h - Basic ACPI Table Definitions + * + *****************************************************************************/ + +/****************************************************************************** + * + * 1. Copyright Notice + * + * Some or all of this work - Copyright (c) 1999 - 2025, Intel Corp. + * All rights reserved. + * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ + +#ifndef __ACTBL_H__ +#define __ACTBL_H__ + + +/******************************************************************************* + * + * Fundamental ACPI tables + * + * This file contains definitions for the ACPI tables that are directly consumed + * by ACPICA. All other tables are consumed by the OS-dependent ACPI-related + * device drivers and other OS support code. + * + * The RSDP and FACS do not use the common ACPI table header. All other ACPI + * tables use the header. + * + ******************************************************************************/ + + +/* + * Values for description table header signatures for tables defined in this + * file. Useful because they make it more difficult to inadvertently type in + * the wrong signature. + */ +#define ACPI_SIG_DSDT "DSDT" /* Differentiated System Description Table */ +#define ACPI_SIG_FADT "FACP" /* Fixed ACPI Description Table */ +#define ACPI_SIG_FACS "FACS" /* Firmware ACPI Control Structure */ +#define ACPI_SIG_OSDT "OSDT" /* Override System Description Table */ +#define ACPI_SIG_PSDT "PSDT" /* Persistent System Description Table */ +#define ACPI_SIG_RSDP "RSD PTR " /* Root System Description Pointer */ +#define ACPI_SIG_RSDT "RSDT" /* Root System Description Table */ +#define ACPI_SIG_XSDT "XSDT" /* Extended System Description Table */ +#define ACPI_SIG_SSDT "SSDT" /* Secondary System Description Table */ +#define ACPI_RSDP_NAME "RSDP" /* Short name for RSDP, not signature */ +#define ACPI_OEM_NAME "OEM" /* Short name for OEM, not signature */ + + +/* + * All tables and structures must be byte-packed to match the ACPI + * specification, since the tables are provided by the system BIOS + */ +#pragma pack(1) + +/* + * Note: C bitfields are not used for this reason: + * + * "Bitfields are great and easy to read, but unfortunately the C language + * does not specify the layout of bitfields in memory, which means they are + * essentially useless for dealing with packed data in on-disk formats or + * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me, + * this decision was a design error in C. Ritchie could have picked an order + * and stuck with it." Norman Ramsey. + * See http://stackoverflow.com/a/1053662/41661 + */ + + +/******************************************************************************* + * + * Master ACPI Table Header. This common header is used by all ACPI tables + * except the RSDP and FACS. + * + ******************************************************************************/ + +typedef struct acpi_table_header +{ + char Signature[ACPI_NAMESEG_SIZE] ACPI_NONSTRING; /* ASCII table signature */ + UINT32 Length; /* Length of table in bytes, including this header */ + UINT8 Revision; /* ACPI Specification minor version number */ + UINT8 Checksum; /* To make sum of entire table == 0 */ + char OemId[ACPI_OEM_ID_SIZE] ACPI_NONSTRING; /* ASCII OEM identification */ + char OemTableId[ACPI_OEM_TABLE_ID_SIZE] ACPI_NONSTRING; /* ASCII OEM table identification */ + UINT32 OemRevision; /* OEM revision number */ - char AslCompilerId[ACPI_NAMESEG_SIZE]; /* ASCII ASL compiler vendor ID */ ++ char AslCompilerId[ACPI_NAMESEG_SIZE] ACPI_NONSTRING; /* ASCII ASL compiler vendor ID */ + UINT32 AslCompilerRevision; /* ASL compiler version */ + +} ACPI_TABLE_HEADER; + + +/******************************************************************************* + * + * GAS - Generic Address Structure (ACPI 2.0+) + * + * Note: Since this structure is used in the ACPI tables, it is byte aligned. + * If misaligned access is not supported by the hardware, accesses to the + * 64-bit Address field must be performed with care. + * + ******************************************************************************/ + +typedef struct acpi_generic_address +{ + UINT8 SpaceId; /* Address space where struct or register exists */ + UINT8 BitWidth; /* Size in bits of given register */ + UINT8 BitOffset; /* Bit offset within the register */ + UINT8 AccessWidth; /* Minimum Access size (ACPI 3.0) */ + UINT64 Address; /* 64-bit address of struct or register */ + +} ACPI_GENERIC_ADDRESS; + + +/******************************************************************************* + * + * RSDP - Root System Description Pointer (Signature is "RSD PTR ") + * Version 2 + * + ******************************************************************************/ + +typedef struct acpi_table_rsdp +{ + char Signature[8]; /* ACPI signature, contains "RSD PTR " */ + UINT8 Checksum; /* ACPI 1.0 checksum */ + char OemId[ACPI_OEM_ID_SIZE]; /* OEM identification */ + UINT8 Revision; /* Must be (0) for ACPI 1.0 or (2) for ACPI 2.0+ */ + UINT32 RsdtPhysicalAddress; /* 32-bit physical address of the RSDT */ + UINT32 Length; /* Table length in bytes, including header (ACPI 2.0+) */ + UINT64 XsdtPhysicalAddress; /* 64-bit physical address of the XSDT (ACPI 2.0+) */ + UINT8 ExtendedChecksum; /* Checksum of entire table (ACPI 2.0+) */ + UINT8 Reserved[3]; /* Reserved, must be zero */ + +} ACPI_TABLE_RSDP; + +/* Standalone struct for the ACPI 1.0 RSDP */ + +typedef struct acpi_rsdp_common +{ + char Signature[8]; + UINT8 Checksum; + char OemId[ACPI_OEM_ID_SIZE]; + UINT8 Revision; + UINT32 RsdtPhysicalAddress; + +} ACPI_RSDP_COMMON; + +/* Standalone struct for the extended part of the RSDP (ACPI 2.0+) */ + +typedef struct acpi_rsdp_extension +{ + UINT32 Length; + UINT64 XsdtPhysicalAddress; + UINT8 ExtendedChecksum; + UINT8 Reserved[3]; + +} ACPI_RSDP_EXTENSION; + + +/******************************************************************************* + * + * RSDT/XSDT - Root System Description Tables + * Version 1 (both) + * + ******************************************************************************/ + +typedef struct acpi_table_rsdt +{ + ACPI_TABLE_HEADER Header; /* Common ACPI table header */ + UINT32 TableOffsetEntry[1]; /* Array of pointers to ACPI tables */ + +} ACPI_TABLE_RSDT; + +typedef struct acpi_table_xsdt +{ + ACPI_TABLE_HEADER Header; /* Common ACPI table header */ + UINT64 TableOffsetEntry[1]; /* Array of pointers to ACPI tables */ + +} ACPI_TABLE_XSDT; + +#define ACPI_RSDT_ENTRY_SIZE (sizeof (UINT32)) +#define ACPI_XSDT_ENTRY_SIZE (sizeof (UINT64)) + + +/******************************************************************************* + * + * FACS - Firmware ACPI Control Structure (FACS) + * + ******************************************************************************/ + +typedef struct acpi_table_facs +{ + char Signature[4]; /* ASCII table signature */ + UINT32 Length; /* Length of structure, in bytes */ + UINT32 HardwareSignature; /* Hardware configuration signature */ + UINT32 FirmwareWakingVector; /* 32-bit physical address of the Firmware Waking Vector */ + UINT32 GlobalLock; /* Global Lock for shared hardware resources */ + UINT32 Flags; + UINT64 XFirmwareWakingVector; /* 64-bit version of the Firmware Waking Vector (ACPI 2.0+) */ + UINT8 Version; /* Version of this table (ACPI 2.0+) */ + UINT8 Reserved[3]; /* Reserved, must be zero */ + UINT32 OspmFlags; /* Flags to be set by OSPM (ACPI 4.0) */ + UINT8 Reserved1[24]; /* Reserved, must be zero */ + +} ACPI_TABLE_FACS; + +/* Masks for GlobalLock flag field above */ + +#define ACPI_GLOCK_PENDING (1) /* 00: Pending global lock ownership */ +#define ACPI_GLOCK_OWNED (1<<1) /* 01: Global lock is owned */ + +/* Masks for Flags field above */ + +#define ACPI_FACS_S4_BIOS_PRESENT (1) /* 00: S4BIOS support is present */ +#define ACPI_FACS_64BIT_WAKE (1<<1) /* 01: 64-bit wake vector supported (ACPI 4.0) */ + +/* Masks for OspmFlags field above */ + +#define ACPI_FACS_64BIT_ENVIRONMENT (1) /* 00: 64-bit wake environment is required (ACPI 4.0) */ + + +/******************************************************************************* + * + * FADT - Fixed ACPI Description Table (Signature "FACP") + * Version 6 + * + ******************************************************************************/ + +/* Fields common to all versions of the FADT */ + +typedef struct acpi_table_fadt +{ + ACPI_TABLE_HEADER Header; /* Common ACPI table header */ + UINT32 Facs; /* 32-bit physical address of FACS */ + UINT32 Dsdt; /* 32-bit physical address of DSDT */ + UINT8 Model; /* System Interrupt Model (ACPI 1.0) - not used in ACPI 2.0+ */ + UINT8 PreferredProfile; /* Conveys preferred power management profile to OSPM. */ + UINT16 SciInterrupt; /* System vector of SCI interrupt */ + UINT32 SmiCommand; /* 32-bit Port address of SMI command port */ + UINT8 AcpiEnable; /* Value to write to SMI_CMD to enable ACPI */ + UINT8 AcpiDisable; /* Value to write to SMI_CMD to disable ACPI */ + UINT8 S4BiosRequest; /* Value to write to SMI_CMD to enter S4BIOS state */ + UINT8 PstateControl; /* Processor performance state control*/ + UINT32 Pm1aEventBlock; /* 32-bit port address of Power Mgt 1a Event Reg Blk */ + UINT32 Pm1bEventBlock; /* 32-bit port address of Power Mgt 1b Event Reg Blk */ + UINT32 Pm1aControlBlock; /* 32-bit port address of Power Mgt 1a Control Reg Blk */ + UINT32 Pm1bControlBlock; /* 32-bit port address of Power Mgt 1b Control Reg Blk */ + UINT32 Pm2ControlBlock; /* 32-bit port address of Power Mgt 2 Control Reg Blk */ + UINT32 PmTimerBlock; /* 32-bit port address of Power Mgt Timer Ctrl Reg Blk */ + UINT32 Gpe0Block; /* 32-bit port address of General Purpose Event 0 Reg Blk */ + UINT32 Gpe1Block; /* 32-bit port address of General Purpose Event 1 Reg Blk */ + UINT8 Pm1EventLength; /* Byte Length of ports at Pm1xEventBlock */ + UINT8 Pm1ControlLength; /* Byte Length of ports at Pm1xControlBlock */ + UINT8 Pm2ControlLength; /* Byte Length of ports at Pm2ControlBlock */ + UINT8 PmTimerLength; /* Byte Length of ports at PmTimerBlock */ + UINT8 Gpe0BlockLength; /* Byte Length of ports at Gpe0Block */ + UINT8 Gpe1BlockLength; /* Byte Length of ports at Gpe1Block */ + UINT8 Gpe1Base; /* Offset in GPE number space where GPE1 events start */ + UINT8 CstControl; /* Support for the _CST object and C-States change notification */ + UINT16 C2Latency; /* Worst case HW latency to enter/exit C2 state */ + UINT16 C3Latency; /* Worst case HW latency to enter/exit C3 state */ + UINT16 FlushSize; /* Processor memory cache line width, in bytes */ + UINT16 FlushStride; /* Number of flush strides that need to be read */ + UINT8 DutyOffset; /* Processor duty cycle index in processor P_CNT reg */ + UINT8 DutyWidth; /* Processor duty cycle value bit width in P_CNT register */ + UINT8 DayAlarm; /* Index to day-of-month alarm in RTC CMOS RAM */ + UINT8 MonthAlarm; /* Index to month-of-year alarm in RTC CMOS RAM */ + UINT8 Century; /* Index to century in RTC CMOS RAM */ + UINT16 BootFlags; /* IA-PC Boot Architecture Flags (see below for individual flags) */ + UINT8 Reserved; /* Reserved, must be zero */ + UINT32 Flags; /* Miscellaneous flag bits (see below for individual flags) */ + ACPI_GENERIC_ADDRESS ResetRegister; /* 64-bit address of the Reset register */ + UINT8 ResetValue; /* Value to write to the ResetRegister port to reset the system */ + UINT16 ArmBootFlags; /* ARM-Specific Boot Flags (see below for individual flags) (ACPI 5.1) */ + UINT8 MinorRevision; /* FADT Minor Revision (ACPI 5.1) */ + UINT64 XFacs; /* 64-bit physical address of FACS */ + UINT64 XDsdt; /* 64-bit physical address of DSDT */ + ACPI_GENERIC_ADDRESS XPm1aEventBlock; /* 64-bit Extended Power Mgt 1a Event Reg Blk address */ + ACPI_GENERIC_ADDRESS XPm1bEventBlock; /* 64-bit Extended Power Mgt 1b Event Reg Blk address */ + ACPI_GENERIC_ADDRESS XPm1aControlBlock; /* 64-bit Extended Power Mgt 1a Control Reg Blk address */ + ACPI_GENERIC_ADDRESS XPm1bControlBlock; /* 64-bit Extended Power Mgt 1b Control Reg Blk address */ + ACPI_GENERIC_ADDRESS XPm2ControlBlock; /* 64-bit Extended Power Mgt 2 Control Reg Blk address */ + ACPI_GENERIC_ADDRESS XPmTimerBlock; /* 64-bit Extended Power Mgt Timer Ctrl Reg Blk address */ + ACPI_GENERIC_ADDRESS XGpe0Block; /* 64-bit Extended General Purpose Event 0 Reg Blk address */ + ACPI_GENERIC_ADDRESS XGpe1Block; /* 64-bit Extended General Purpose Event 1 Reg Blk address */ + ACPI_GENERIC_ADDRESS SleepControl; /* 64-bit Sleep Control register (ACPI 5.0) */ + ACPI_GENERIC_ADDRESS SleepStatus; /* 64-bit Sleep Status register (ACPI 5.0) */ + UINT64 HypervisorId; /* Hypervisor Vendor ID (ACPI 6.0) */ + +} ACPI_TABLE_FADT; + + +/* Masks for FADT IA-PC Boot Architecture Flags (boot_flags) [Vx]=Introduced in this FADT revision */ + +#define ACPI_FADT_LEGACY_DEVICES (1) /* 00: [V2] System has LPC or ISA bus devices */ +#define ACPI_FADT_8042 (1<<1) /* 01: [V3] System has an 8042 controller on port 60/64 */ +#define ACPI_FADT_NO_VGA (1<<2) /* 02: [V4] It is not safe to probe for VGA hardware */ +#define ACPI_FADT_NO_MSI (1<<3) /* 03: [V4] Message Signaled Interrupts (MSI) must not be enabled */ +#define ACPI_FADT_NO_ASPM (1<<4) /* 04: [V4] PCIe ASPM control must not be enabled */ +#define ACPI_FADT_NO_CMOS_RTC (1<<5) /* 05: [V5] No CMOS real-time clock present */ + +/* Masks for FADT ARM Boot Architecture Flags (arm_boot_flags) ACPI 5.1 */ + +#define ACPI_FADT_PSCI_COMPLIANT (1) /* 00: [V5+] PSCI 0.2+ is implemented */ +#define ACPI_FADT_PSCI_USE_HVC (1<<1) /* 01: [V5+] HVC must be used instead of SMC as the PSCI conduit */ + +/* Masks for FADT flags */ + +#define ACPI_FADT_WBINVD (1) /* 00: [V1] The WBINVD instruction works properly */ +#define ACPI_FADT_WBINVD_FLUSH (1<<1) /* 01: [V1] WBINVD flushes but does not invalidate caches */ +#define ACPI_FADT_C1_SUPPORTED (1<<2) /* 02: [V1] All processors support C1 state */ +#define ACPI_FADT_C2_MP_SUPPORTED (1<<3) /* 03: [V1] C2 state works on MP system */ +#define ACPI_FADT_POWER_BUTTON (1<<4) /* 04: [V1] Power button is handled as a control method device */ +#define ACPI_FADT_SLEEP_BUTTON (1<<5) /* 05: [V1] Sleep button is handled as a control method device */ +#define ACPI_FADT_FIXED_RTC (1<<6) /* 06: [V1] RTC wakeup status is not in fixed register space */ +#define ACPI_FADT_S4_RTC_WAKE (1<<7) /* 07: [V1] RTC alarm can wake system from S4 */ +#define ACPI_FADT_32BIT_TIMER (1<<8) /* 08: [V1] ACPI timer width is 32-bit (0=24-bit) */ +#define ACPI_FADT_DOCKING_SUPPORTED (1<<9) /* 09: [V1] Docking supported */ +#define ACPI_FADT_RESET_REGISTER (1<<10) /* 10: [V2] System reset via the FADT RESET_REG supported */ +#define ACPI_FADT_SEALED_CASE (1<<11) /* 11: [V3] No internal expansion capabilities and case is sealed */ +#define ACPI_FADT_HEADLESS (1<<12) /* 12: [V3] No local video capabilities or local input devices */ +#define ACPI_FADT_SLEEP_TYPE (1<<13) /* 13: [V3] Must execute native instruction after writing SLP_TYPx register */ +#define ACPI_FADT_PCI_EXPRESS_WAKE (1<<14) /* 14: [V4] System supports PCIEXP_WAKE (STS/EN) bits (ACPI 3.0) */ +#define ACPI_FADT_PLATFORM_CLOCK (1<<15) /* 15: [V4] OSPM should use platform-provided timer (ACPI 3.0) */ +#define ACPI_FADT_S4_RTC_VALID (1<<16) /* 16: [V4] Contents of RTC_STS valid after S4 wake (ACPI 3.0) */ +#define ACPI_FADT_REMOTE_POWER_ON (1<<17) /* 17: [V4] System is compatible with remote power on (ACPI 3.0) */ +#define ACPI_FADT_APIC_CLUSTER (1<<18) /* 18: [V4] All local APICs must use cluster model (ACPI 3.0) */ +#define ACPI_FADT_APIC_PHYSICAL (1<<19) /* 19: [V4] All local xAPICs must use physical dest mode (ACPI 3.0) */ +#define ACPI_FADT_HW_REDUCED (1<<20) /* 20: [V5] ACPI hardware is not implemented (ACPI 5.0) */ +#define ACPI_FADT_LOW_POWER_S0 (1<<21) /* 21: [V5] S0 power savings are equal or better than S3 (ACPI 5.0) */ + + +/* Values for PreferredProfile (Preferred Power Management Profiles) */ + +enum AcpiPreferredPmProfiles +{ + PM_UNSPECIFIED = 0, + PM_DESKTOP = 1, + PM_MOBILE = 2, + PM_WORKSTATION = 3, + PM_ENTERPRISE_SERVER = 4, + PM_SOHO_SERVER = 5, + PM_APPLIANCE_PC = 6, + PM_PERFORMANCE_SERVER = 7, + PM_TABLET = 8 +}; + +/* Values for SleepStatus and SleepControl registers (V5+ FADT) */ + +#define ACPI_X_WAKE_STATUS 0x80 +#define ACPI_X_SLEEP_TYPE_MASK 0x1C +#define ACPI_X_SLEEP_TYPE_POSITION 0x02 +#define ACPI_X_SLEEP_ENABLE 0x20 + + +/* Reset to default packing */ + +#pragma pack() + + +/* + * Internal table-related structures + */ +typedef union acpi_name_union +{ + UINT32 Integer; + char Ascii[4]; + +} ACPI_NAME_UNION; + + +/* Internal ACPI Table Descriptor. One per ACPI table. */ + +typedef struct acpi_table_desc +{ + ACPI_PHYSICAL_ADDRESS Address; + ACPI_TABLE_HEADER *Pointer; + UINT32 Length; /* Length fixed at 32 bits (fixed in table header) */ + ACPI_NAME_UNION Signature; + ACPI_OWNER_ID OwnerId; + UINT8 Flags; + UINT16 ValidationCount; + +} ACPI_TABLE_DESC; + +/* + * Maximum value of the ValidationCount field in ACPI_TABLE_DESC. + * When reached, ValidationCount cannot be changed any more and the table will + * be permanently regarded as validated. + * + * This is to prevent situations in which unbalanced table get/put operations + * may cause premature table unmapping in the OS to happen. + * + * The maximum validation count can be defined to any value, but should be + * greater than the maximum number of OS early stage mapping slots to avoid + * leaking early stage table mappings to the late stage. + */ +#define ACPI_MAX_TABLE_VALIDATIONS ACPI_UINT16_MAX + +/* Masks for Flags field above */ + +#define ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL (0) /* Virtual address, external maintained */ +#define ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL (1) /* Physical address, internally mapped */ +#define ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL (2) /* Virtual address, internallly allocated */ +#define ACPI_TABLE_ORIGIN_MASK (3) +#define ACPI_TABLE_IS_VERIFIED (4) +#define ACPI_TABLE_IS_LOADED (8) + + +/* + * Get the remaining ACPI tables + */ +#include +#include +#include + +/* Macros used to generate offsets to specific table fields */ + +#define ACPI_FADT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_FADT, f) + +/* + * Sizes of the various flavors of FADT. We need to look closely + * at the FADT length because the version number essentially tells + * us nothing because of many BIOS bugs where the version does not + * match the expected length. In other words, the length of the + * FADT is the bottom line as to what the version really is. + * + * For reference, the values below are as follows: + * FADT V1 size: 0x074 + * FADT V2 size: 0x084 + * FADT V3 size: 0x0F4 + * FADT V4 size: 0x0F4 + * FADT V5 size: 0x10C + * FADT V6 size: 0x114 + */ +#define ACPI_FADT_V1_SIZE (UINT32) (ACPI_FADT_OFFSET (Flags) + 4) +#define ACPI_FADT_V2_SIZE (UINT32) (ACPI_FADT_OFFSET (MinorRevision) + 1) +#define ACPI_FADT_V3_SIZE (UINT32) (ACPI_FADT_OFFSET (SleepControl)) +#define ACPI_FADT_V5_SIZE (UINT32) (ACPI_FADT_OFFSET (HypervisorId)) +#define ACPI_FADT_V6_SIZE (UINT32) (sizeof (ACPI_TABLE_FADT)) + +#define ACPI_FADT_CONFORMANCE "ACPI 6.1 (FADT version 6)" + +#endif /* __ACTBL_H__ */ From nobody Thu Aug 21 22:09:59 2025 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 4c7HYl72TTz64WM7; Thu, 21 Aug 2025 22:10:03 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7HYk60lTz3Bp2; Thu, 21 Aug 2025 22:10:02 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id pCxpulNvi9JM2pDTtu5W5W; Thu, 21 Aug 2025 22:10:01 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id pDTru46WFJhBPpDTsuZ0TU; Thu, 21 Aug 2025 22:10:01 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=QY3Fvdbv c=1 sm=1 tr=0 ts=68a79939 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=IkcTkHD0fZMA:10 a=2OwXVqhp2XgA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=9p80EfzXezJhSfh2YiIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 4A844E2; Thu, 21 Aug 2025 22:09:59 +0000 (UTC) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 1AD6530; Thu, 21 Aug 2025 22:09:59 +0000 (UTC) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: f5efc804294c - main - tzcode: Reduce diff to upstream In-reply-to: <202508211859.57LIxkSl003750@gitrepo.freebsd.org> References: <202508211859.57LIxkSl003750@gitrepo.freebsd.org> Comments: In-reply-to Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= message dated "Thu, 21 Aug 2025 18:59:46 +0000." 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 Date: Thu, 21 Aug 2025 22:09:59 +0000 Message-Id: <20250821220959.1AD6530@slippy.cwsent.com> X-CMAE-Envelope: MS4xfIoHmLBq2DVcWicbfQxLAZstuCduuuMnqdkkv9UDddhGUqa+tiJGw3Br3lj8UVEWSq1ubzIh43AIY6JesalKtVNfIzzZgz8k2Lri2MgQoDeA24j895NK vzvh/NL9L0JjbNpPplVFH3ruX9F2XkSYFtaQ+/U/i6X2NGH2XreFwLrcG4tdYiwtCuPgc8ErY++Wjl28PfwBFOnAXptYTw6fLd7kzap1LvAbQcpxTJndLDJv EpyxKTyn2FUUYqEwI8CoCt+MOlMnPTI912RgDtK19uc6Cvdsv5EU509ho/pDDaVE+8SdsXqq/iXgroHo3tQvD/lAVwylo7hss0vXxBmMo1A= X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c7HYk60lTz3Bp2 In message <202508211859.57LIxkSl003750@gitrepo.freebsd.org>, Dag-Erling =?utf- 8?Q?Sm=C3=B8rgrav?= writes: > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f5efc804294c6bb24bd6d14bf2fb883a > 7320956c > > commit f5efc804294c6bb24bd6d14bf2fb883a7320956c > Author: Dag-Erling Smørgrav > AuthorDate: 2025-08-21 16:34:27 +0000 > Commit: Dag-Erling Smørgrav > CommitDate: 2025-08-21 18:59:37 +0000 > > tzcode: Reduce diff to upstream > > Reviewed by: imp, jhb, emaste > Differential Revision: https://reviews.freebsd.org/D51997 > --- > contrib/tzcode/localtime.c | 292 ++++++++++++++++++++++++++----------------- > -- > 1 file changed, 169 insertions(+), 123 deletions(-) > > diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c > index a6ec3d8e4e21..6eabe0afe570 100644 One of these TZ commits set my timezone from America/Vancouver to UTC. tzsetup has no effect. Additionally the TZ environment variable is of no effect either. slippy$ date Thu Aug 21 22:06:04 UTC 2025 slippy$ echo $TZ America/Vancouver slippy$ -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Thu Aug 21 22:25:45 2025 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 4c7Hvw4rzlz64X5h; Thu, 21 Aug 2025 22:25:48 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7Hvw43bBz3DHZ; Thu, 21 Aug 2025 22:25:48 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id p6XvukzlT9JM2pDj9u5z7c; Thu, 21 Aug 2025 22:25:47 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id pDj8us3jtWX70pDj9ulDuP; Thu, 21 Aug 2025 22:25:47 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=d71WygjE c=1 sm=1 tr=0 ts=68a79ceb a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=IkcTkHD0fZMA:10 a=2OwXVqhp2XgA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=NynCIDqhjON2MYOQ2PoA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id A48CBED; Thu, 21 Aug 2025 22:25:45 +0000 (UTC) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 9AE66380; Thu, 21 Aug 2025 22:25:45 +0000 (UTC) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b6ea2513f776 - main - tzcode: Limit TZ for setugid programs In-reply-to: <202508211859.57LIxlcm003786@gitrepo.freebsd.org> References: <202508211859.57LIxlcm003786@gitrepo.freebsd.org> Comments: In-reply-to Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= message dated "Thu, 21 Aug 2025 18:59:47 +0000." 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 Date: Thu, 21 Aug 2025 15:25:45 -0700 Message-Id: <20250821222545.9AE66380@slippy.cwsent.com> X-CMAE-Envelope: MS4xfLm/7R/GKTWTTfbuzj4y4qmQyr9rwq78zzua2tyKECyVxIPjrOEa0CMaPj16Fb6kbT+cAp5sPLReoJE328ocrtEApTQf/uIJF/+ecd2Tu/bVoSv6Yz2O ABIb0rbjTlAHtmEjUbaChrkBBjJdhPeHATAGVUwSkfb90XzRwV+9c4GUOoVTqgNF+HUko/RigVyEgWdtpUR5nmJuwuQmrncw41y5KP5/TycSyXKp7eTGe3xL S2bpn+NqJBuDEzcvEcJ3TXPdd+PnKqVepneh+N6Et7xxe5VvUSvGF3qpUSPKmemb34l8uheCk8AlgU93psDNkHWCpjac2c9w10hNjd9imAc= X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c7Hvw43bBz3DHZ In message <202508211859.57LIxlcm003786@gitrepo.freebsd.org>, Dag-Erling =?utf- 8?Q?Sm=C3=B8rgrav?= writes: > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b6ea2513f7769ea9d9e4d342777111ad > d2c903b0 > > commit b6ea2513f7769ea9d9e4d342777111add2c903b0 > Author: Dag-Erling Smørgrav > AuthorDate: 2025-08-21 16:34:32 +0000 > Commit: Dag-Erling Smørgrav > CommitDate: 2025-08-21 18:59:37 +0000 > > tzcode: Limit TZ for setugid programs > > The zoneinfo parser can be told to read any file the program can access > by setting TZ to either an absolute path, or a path relative to the > zoneinfo directory. For setugid programs, we previously had a hack from > OpenBSD which rejects values of TZ deemed unsafe, but that was rather > arbitrary (anything containing a dot, for instance). Leverage openat() > with AT_RESOLVE_BENEATH instead. > > For simplicity, move the TZ change detection code to after we've opened > the file, and stat the file descriptor rather than the name. > > Reviewed by: jhb > Differential Revision: https://reviews.freebsd.org/D52029 > --- > contrib/tzcode/localtime.c | 70 +++++++++++++++++++++++++++++--------------- > -- > 1 file changed, 45 insertions(+), 25 deletions(-) > > diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c > index 6eabe0afe570..1a01db931cab 100644 > --- a/contrib/tzcode/localtime.c > +++ b/contrib/tzcode/localtime.c > @@ -408,13 +408,13 @@ scrub_abbrs(struct state *sp) > * 1 if the time zone has changed > */ > static int > -tzfile_changed(const char *name) > +tzfile_changed(const char *name, int fd) > { > static char old_name[PATH_MAX]; > static struct stat old_sb; > struct stat sb; > > - if (stat(name, &sb) != 0) > + if (_fstat(fd, &sb) != 0) > return -1; > > if (strcmp(name, old_name) != 0) { > @@ -446,8 +446,10 @@ union input_buffer { > + 4 * TZ_MAX_TIMES]; > }; > > +#ifndef __FreeBSD__ > /* TZDIR with a trailing '/' rather than a trailing '\0'. */ > static char const tzdirslash[sizeof TZDIR] = TZDIR "/"; > +#endif /* !__FreeBSD__ */ > > /* Local storage needed for 'tzloadbody'. */ > union local_storage { > @@ -460,6 +462,7 @@ union local_storage { > struct state st; > } u; > > +#ifndef __FreeBSD__ > /* The name of the file to be opened. Ideally this would have no > size limits, to support arbitrarily long Zone names. > Limiting Zone names to 1024 bytes should suffice for practical use. > @@ -467,6 +470,7 @@ union local_storage { > file_analysis as that struct is allocated anyway, as the other > union member. */ > char fullname[max(sizeof(struct file_analysis), sizeof tzdirslash + 1024)] > ; > +#endif /* !__FreeBSD__ */ > }; > > /* Load tz data from the file named NAME into *SP. Read extended > @@ -480,7 +484,11 @@ tzloadbody(char const *name, struct state *sp, bool doex > tend, > register int fid; > register int stored; > register ssize_t nread; > +#ifdef __FreeBSD__ > + int serrno; > +#else /* !__FreeBSD__ */ > register bool doaccess; > +#endif /* !__FreeBSD__ */ > register union input_buffer *up = &lsp->u.u; > register int tzheadsize = sizeof(struct tzhead); > > @@ -494,6 +502,7 @@ tzloadbody(char const *name, struct state *sp, bool doext > end, > > if (name[0] == ':') > ++name; > +#ifndef __FreeBSD__ > #ifdef SUPPRESS_TZDIR > /* Do not prepend TZDIR. This is intended for specialized > applications only, due to its security implications. */ > @@ -502,9 +511,7 @@ tzloadbody(char const *name, struct state *sp, bool doext > end, > doaccess = name[0] == '/'; > #endif > if (!doaccess) { > -#ifndef __FreeBSD__ > char const *dot; > -#endif /* !__FreeBSD__ */ > if (sizeof lsp->fullname - sizeof tzdirslash <= strlen(name)) > return ENAMETOOLONG; > > @@ -514,7 +521,6 @@ tzloadbody(char const *name, struct state *sp, bool doext > end, > memcpy(lsp->fullname, tzdirslash, sizeof tzdirslash); > strcpy(lsp->fullname + sizeof tzdirslash, name); > > -#ifndef __FreeBSD__ > /* Set doaccess if NAME contains a ".." file name > component, as such a name could read a file outside > the TZDIR virtual subtree. */ > @@ -524,35 +530,49 @@ tzloadbody(char const *name, struct state *sp, bool doe > xtend, > doaccess = true; > break; > } > -#endif /* !__FreeBSD__ */ > > name = lsp->fullname; > } > -#ifndef __FreeBSD__ > if (doaccess && access(name, R_OK) != 0) > return errno; > -#endif /* !__FreeBSD__ */ > -#ifdef DETECT_TZ_CHANGES > - if (doextend) { > - /* > - * Detect if the timezone file has changed. Check > - * 'doextend' to ignore TZDEFRULES; the tzfile_changed() > - * function can only keep state for a single file. > - */ > - switch (tzfile_changed(name)) { > - case -1: > - return errno; > - case 0: > - return 0; > - case 1: > - break; > - } > - } > -#endif /* DETECT_TZ_CHANGES */ > +#else /* __FreeBSD__ */ > + if (issetugid()) { > + const char *relname = name; > + if (strncmp(relname, TZDIR "/", strlen(TZDIR) + 1) == 0) > + relname += strlen(TZDIR) + 1; > + int dd = _open(TZDIR, O_DIRECTORY | O_RDONLY); > + if (dd < 0) > + return errno; > + fid = _openat(dd, relname, O_RDONLY | O_BINARY, AT_RESOLVE_BENEATH > ); > + serrno = errno; > + _close(dd); > + errno = serrno; > + } else > +#endif > fid = _open(name, O_RDONLY | O_BINARY); > if (fid < 0) > return errno; > > +#ifdef DETECT_TZ_CHANGES > + if (doextend) { > + /* > + * Detect if the timezone file has changed. Check 'doextend' to > + * ignore TZDEFRULES; the tzfile_changed() function can only > + * keep state for a single file. > + */ > + switch (tzfile_changed(name, fid)) { > + case -1: > + serrno = errno; > + _close(fid); > + return serrno; > + case 0: > + _close(fid); > + return 0; > + case 1: > + break; > + } > + } > +#endif /* DETECT_TZ_CHANGES */ > nread = _read(fid, up->buf, sizeof up->buf); > if (nread < tzheadsize) { > int err = nread < 0 ? errno : EINVAL; > Further testing has shown that this commit has TZ America/Vancouver to UTC. Setting TZ to PST8PDT still works but TZ=America/Vancouver does not. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Fri Aug 22 00:12:45 2025 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 4c7LHN4T37z64fq5; Fri, 22 Aug 2025 00:12:48 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7LHN2mfNz3MmL; Fri, 22 Aug 2025 00:12:48 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755821568; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mUswqk0f4e1xkOkzNh1o6AsssQcf+8HfbtOFCDtOKqE=; b=FL9b17M8IarMQz26xf+lRYfAo1euICrJFq8Czw1wnueq50N82BSZxrn3z//KmMFnXzo3i4 rKW20pB9Mz9uic+F/txcVoJiMHimRpXvo3uuK9mYpPQx+tPQOgbLrfSvuy+TqQwsLDB6uF yoA+0//47aUlBWnASEPvemzfVMHK06/fXuJwZI8sOhIzUb+Yhh5B4Ws305YUB2SetQuCOV TTn4F2FhUoYD2+kb6xb68Gsk1nth0i4u2nvX5rolYK/1nkdrQzRkr3lYDKUrG4gI6NyD9x R6NcLllhbGB1TXhZIo2BpBvCDa1DriX+qDdbAjWFNJgBpAOtGv3OkGj1Jt9QlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755821568; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mUswqk0f4e1xkOkzNh1o6AsssQcf+8HfbtOFCDtOKqE=; b=tikISc9c8KbWBRONLqd3ClIPKvtZFgFYUf9xTfIqYAagu3oa38Iqr503KARgiW3rgtGGpq JiOCmGObZjhN0wMBg3JJjdH4drYpQEiGOWKWZOGhDfbG3Y3OzKWWDqdwu+fRqgT4Z7lnQ4 aImbXupkrfE4abWmpn0hA/EBsDLKAAtNNW0QPqOIr8O5aZZliLZC6aEAUJriYy0BhQ0oZW 2IZ/kwKpBbeGHyTK5M3lJ4l3oJiVkx1XJekiXpRJaB8mGqPbxBqeIeAxH8gJSNl+AX2qBY 22XBAw+cLhHYtgJeKtuANmVzHidnjD9lX0PqVZCarp1T8huPezzO2J5X/EsvHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755821568; a=rsa-sha256; cv=none; b=AIOhhquW/mvNht0ZsuWnsu/wKcRWWQ+nA2RekqKdvBQakJyUNU+8A9cZRz8HxcD9P8/Mnn NDLkSC0kG442wSVI2F370lzT4gPz2lvAvLJFvzBukqyptSiVSy7KgpeBrCGL6UTy9eNRPB 3bWe6vjiKpsKrejq+7oeP0SuzlR3HQGAQu6a0s5sxWN24N43Ku0cXJSPc6pjReq4aB4Tu+ H98IuCL07J7eAteBtpuyub20j3N7i8O67nzajKu+JtUwT2LOFsY+zX/ke+/IpjSsq4hFY2 JU2rMVD4TxHrOYsl7MjGEwWRBni2nfJGDQyknTzIZ5zHFkuJ5r47NYHkrT+MHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.dev (unknown [IPv6:2a01:e0a:c54:bed0:922e:16ff:fef1:acef]) (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: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c7LHN1dpmzHg1; Fri, 22 Aug 2025 00:12:48 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 002D03C394; Fri, 22 Aug 2025 02:12:45 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Cy Schubert Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b6ea2513f776 - main - tzcode: Limit TZ for setugid programs In-Reply-To: <20250821222545.9AE66380@slippy.cwsent.com> (Cy Schubert's message of "Thu, 21 Aug 2025 15:25:45 -0700") References: <202508211859.57LIxlcm003786@gitrepo.freebsd.org> <20250821222545.9AE66380@slippy.cwsent.com> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Fri, 22 Aug 2025 02:12:45 +0200 Message-ID: <86bjo8jjsy.fsf@ltc.des.dev> 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: quoted-printable Cy Schubert writes: > Further testing has shown that this commit has TZ America/Vancouver to UT= C. > > Setting TZ to PST8PDT still works but TZ=3DAmerica/Vancouver does not. Sorry, I was so focused on the special case I lost sight of the common case. I'll have a fix shortly. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Fri Aug 22 00:33:38 2025 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 4c7Lln3n2fz64hPb; Fri, 22 Aug 2025 00:33:57 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) (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 4c7Lln01mzz3Nsn; Fri, 22 Aug 2025 00:33:56 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-b474e8d6d04so1347136a12.0; Thu, 21 Aug 2025 17:33:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755822830; x=1756427630; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=rQ/y6X4hXvdo1ukNxY8K9lWYpchTeBDmheRgX7KqkX8=; b=VsOBhgs8A9u7IlBq7cgtkRPNfuRv9auM7OenPbjwOpsh26a/tUgzxiI6+aNc/Aqp3z JxscIeiJXzEwmAbL6k56AYRT45lo8pwfmA+GhFBXGFwklWlM0mRQEfcIgpHhnVdAbmd2 zhpsL739GtLWi70KvXOBIgdxDj7stxCO/4F86Mv/GximfvvSO42A9fShyWT0TT883KP8 /USDGLS85tNiwIb9l/DdAgZm8Cm+EjuKEWgKYPMxi5VouHSFEY39Al/0MtBbYmbxKglx jbAs7oUdr1nHeYJ6+eiRVdvdkCT18564HsjgA/M+6N1TPCHQDhRBTl1b7ppxeSSCTHiI Tg/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755822830; x=1756427630; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rQ/y6X4hXvdo1ukNxY8K9lWYpchTeBDmheRgX7KqkX8=; b=FGvlKjzBSQGCPbq3aYyv6AChqFpn5DhP85T12hk+I9w03kLmw14ui5XI3hFH7POIC+ Ens+doKjC7bJdKbop8yjx1FL34Hdce7+GqPw3QEgmKaldJWE+Ptkad0CzUaPxNUOiotw HSwnm8TJWZtgeWnSGTI9Z6tZnDMP0Jbn0mjPgqt2NlSt3oaXMcm1F7JmKqjDgBmi5fnJ 1S79OH/SIUXqmBUW8KDSqV2o6l+4QVmsiA658QTCn9IUmpEaYRlLPP+1c5d1eNAOslZQ XLGDdLqAwcTcT8VUorgrTdB8UmyfQqwzbP3P6VgwIyq96nsfsJEywjZ9sRto/wOMxc/w 85pw== X-Forwarded-Encrypted: i=1; AJvYcCVjl3ECqPc2ve01QJ2xqMktYq2Jcq7gejoTsT6UxBAxYSp+PnRQ0HUEaxjflxEOL9drziGidW8Xaa0swzyYGqg=@freebsd.org, AJvYcCVpEiW3WLdPcpKg7qnVUhLgEsDfSTuC/AWwY6xUcvHc9VnPwvRfXQWIrvib+vgeT+f+jBA2VS5CcEguGm99cctCUDZa@freebsd.org, AJvYcCXGxj2b/5bGxLsmZdYN2iUpB7fT377J/D798y51B07h8rQ8wiVf0CFUoiuzhcibRRkNSU6//Jg+RJp/afsTw2Li+hL0d4E=@freebsd.org X-Gm-Message-State: AOJu0YyQeiwRly6MMHYZTQOtILBj5vmTim+JSnfFqPbeQrxyGC1mvNCD LKMBtnmRQa79+KjPCZm90p208hcgcv17ZBiAIgczomZ+Kborcdjb05L7mV4Ung== X-Gm-Gg: ASbGncu4beIcTm5zjlC36b/xuJ2X+veEfeDsx948AjlFGy6ry/sHb7aWQ73Pe3Yj4an X7miyXaj0GZ4H3k8LssiuvuXr/MshI/Y+oscKflQJFLmU4HPiXT4fGniEoPPqS0gkKQK9g5EMPW j5uQqgdI+inmNQAf81cCGJMyFueQNJL1CvXfeRiqOIGUcOj1ep8EvavPCZY5uET3v3VIW8Nrpzq ZjWAEoqYrJvchpeD6WTxDimbYA2G/91tKPPi+sSH7Hssihk8O8bDaENNP03VmHHsY7EpsXcfoE1 WMJg+2PKILuQ0xIsS2ReVdN1NZj6OF2qyBS2eiy2EO+75SzZQOBshcAV+f/R0slGDllzVpPXVee cIxW5TRxsVonQZFmXZIw71LPQz1zqS8GBfBhnjdtr X-Google-Smtp-Source: AGHT+IHKM4cc/1KWdkDfU8AjNDB9cNHNnTu1WT/SQyJiSbrK/xan7kfUHaqaBOsAjqVQZ3aSCE+kMA== X-Received: by 2002:a17:902:db0c:b0:240:483:dc3a with SMTP id d9443c01a7336-2462edee860mr17168775ad.12.1755822830331; Thu, 21 Aug 2025 17:33:50 -0700 (PDT) Received: from smtpclient.apple ([45.90.222.128]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2462b0c0227sm8827925ad.167.2025.08.21.17.33.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Aug 2025 17:33:49 -0700 (PDT) Content-Type: multipart/signed; boundary="Apple-Mail=_11820322-8EBB-4AA7-960D-2DE1F9810512"; protocol="application/pgp-signature"; micalg=pgp-sha256 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 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 267f8c1f4b09 - main - crypto/openssl: make vendor imports easier/less error prone From: "Enji Cooper (yaneurabeya)" In-Reply-To: <39A8B2D8-49D9-4303-A74A-23FB38B867CC@freebsd.org> Date: Thu, 21 Aug 2025 17:33:38 -0700 Cc: Enji Cooper , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: References: <202508211705.57LH50gR095150@gitrepo.freebsd.org> <39A8B2D8-49D9-4303-A74A-23FB38B867CC@freebsd.org> To: Jessica Clarke X-Mailer: Apple Mail (2.3826.700.81) X-Spamd-Bar: ---- 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-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c7Lln01mzz3Nsn --Apple-Mail=_11820322-8EBB-4AA7-960D-2DE1F9810512 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Aug 21, 2025, at 2:07=E2=80=AFPM, Jessica Clarke = wrote: >=20 > On 21 Aug 2025, at 18:05, Enji Cooper wrote: >>=20 >> The branch main has been updated by ngie: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D267f8c1f4b09431b335d5f48d8458604= 7471f978 >>=20 >> commit 267f8c1f4b09431b335d5f48d84586047471f978 >> Author: Enji Cooper >> AuthorDate: 2025-08-01 04:03:33 +0000 >> Commit: Enji Cooper >> CommitDate: 2025-08-21 17:02:46 +0000 >>=20 >> crypto/openssl: make vendor imports easier/less error prone >>=20 >> This change adds a custom BSD makefile containing multiple = high-level PHONY >> targets, similar to targets provided by the ports framework. >>=20 >> The Makefile does the following: >> - Reruns Configure with a deterministic set of arguments to ensure = that >> all appropriate features have been enabled/disabled in OpenSSL. >> - Preens the pkgconfig files to remove duplicate paths in their >> `CFLAGS` and `includedir` variables. >> - Rebuilds all ASM files to ensure that the content contained is = fresh. >> - Rebuilds all manpages to ensure that the content contained in the >> manpages is fresh. >>=20 >> Some additional work needs to be done to make the manpage = regeneration >> "operation" reproducible (the date the manpages were generated is >> embedded in the files). >>=20 >> All dynamic configuration previously captured in >> `include/openssl/configuration.h` and `include/crypto/bn_conf.h` = has been >> moved to `freebsd/include/dynamic_freebsd_configuration.h` and >> `freebsd/include/crypto/bn_conf.h`, respectively. This helps >> ensure that future updates don't wipe out FreeBSD customizations to >> these files, which tune behavior on a per-target architecture = basis, e.g., >> ARM vs x86, 32-bit vs 64-bit, etc. >>=20 >> MFC after: 1 month >> Differential Revision: https://reviews.freebsd.org/D51663 >=20 > Something in this breaks building on macOS (where, as of recently, we > build libcrypto as a bootstrap library for use by the certctl = bootstrap > tool): >=20 > = /Users/runner/work/freebsd-src/freebsd-src/crypto/openssl/crypto/bio/bio_s= ock2.c:64:9: error: call to undeclared function 'ktls_enable'; ISO C99 = and later do not support implicit function declarations = [-Wimplicit-function-declaration]=20 > ktls_enable(sock);=20 > ^=20 > = /Users/runner/work/freebsd-src/freebsd-src/crypto/openssl/crypto/bio/bio_s= ock2.c:202:5: error: call to undeclared function 'ktls_enable'; ISO C99 = and later do not support implicit function declarations = [-Wimplicit-function-declaration]=20 > ktls_enable(sock);=20 > ^=20 > 2 errors generated.=20 > --- bio_sock2.o ---=20 > *** [bio_sock2.o] Error code 1 >=20 > Presumably you need a BOOTSTRAPPING check somewhere. It looks like the problem is MacOS doesn=E2=80=99t support KTLS and now = KTLS has been fixed on FreeBSD. MK_OPENSSL_KTLS needs to be disabled when doing =E2=80=9Cmake = bootstrapping=E2=80=9D on MacOS. Cheers, -Enji= --Apple-Mail=_11820322-8EBB-4AA7-960D-2DE1F9810512 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAminuuIACgkQGpE5DjPs NJjQeg//REkxiPADMgMx2P4IQl4y2+nk8ZNRA2oNg7dlExpP3/8U6UUiht+34+PU W7Gj9HDNDHIeNa8gFJtNG+oe9+ILkgK323bO6csspAMhMXzOuW9v6Br3KuXoZMFE jDbyR9L4Yhje5R8ZJKZhaYT6v474vRykk77CulBBr9+sSgTHGn9Qdbbp8S7fTa2D AZ1466rwmTjNut+VQut6XPj1smncP2bUZFEnwZSGvpy7G2y9zhWAVN1S7n9bzPLE T6rTXEdINbEx6DpmZnngmzz2DmNCbXPfDnOjaLVYG6I3J44H05pLFk+7djuLkiWf gtn8OP3DisGZDPhG82Ql8FeCv7Dobw+WyRipb6SQaMqV7zX5MhiBzM/Hci08Hio2 HAV5MpjHzho4bID3QQkvPT5v271txk6B+BGc7M9750gMXkz54d6LkkKzqvXEX9oM RPtemlbMbfEfjXKnnjwFVObiVfVrj4Il4BfnwehbneKFmYVeE3O3hXNbpQZcoi9n t1Q0Jkb6ZgDi/1nQFFMEYU7xjohqsJ6eRs8FoJejRzVnV/T4gAhRCchIRRtE6KK6 uZNns2gP7cE3BI4i8bp9E5FwO5NPlsf+PZAFTN5rI+whG9bHdaMeJ+jOy6UZ4OB1 tL8MMf/ZehvrRVZsz+XqKZ4lOFLM6hlieit1E7qVpZ/cBaJqVig= =xh3n -----END PGP SIGNATURE----- --Apple-Mail=_11820322-8EBB-4AA7-960D-2DE1F9810512-- From nobody Fri Aug 22 00:38:33 2025 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 4c7Ls64XNGz64hnM; Fri, 22 Aug 2025 00:38:34 +0000 (UTC) (envelope-from des@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7Ls63tZJz3Pf2; Fri, 22 Aug 2025 00:38:34 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755823114; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6nvDeV6GMA9kPXazRJEq1iJlkxJTiCauxo5ssJ/vXK0=; b=QXr2ddff6ni41faaqRxXCaUNIYDPZuiGL7aNUlxP9agqOBAnvmlUQ4JvyFRrWJKu7yM1Bk YvavDbIVxit11ldK609Gj1F61Y9lawUjqCYiOTg4Fm2QuYSu6cWhH/8JtTQjkiCHRs4QEe Ag83i6/qZMV1jPfXGQatpvokF13sBVR70241Jyr+ZWFso+0+US8mzxO8xZEJHPV4VDz2RW J3xVCnKf3n5zYQL6wDprqr8HkEcPcHhvCyE9srU9bBytG3wC58pOZciLu7b3+NRlr4ZMWP fJjGLfWCyhOsTtt+5LuQbUnVcbWxZOpzvkZSZ5ezgxx8B7KmBqeOV29pjvBT7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755823114; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6nvDeV6GMA9kPXazRJEq1iJlkxJTiCauxo5ssJ/vXK0=; b=v1VqmJ6CyGLHfkhrF/b0LCsnjNJhd+IXk+wRbutkw00lYfBQsfI0is07hF7AyS9WByKk43 zQQ5xhHTXKiu3r1wtS6w9jseDHVY1+Htl+ARLOWkerSna5O3NSpTDKQ2vlfV+LzGsAa6Lh 3QOHcCorncUJdmtRA2YrcFLfRqPqcra11+yhEagOOaVTAkmHxAS3wmJZFZ6E43gZmXRMpY 8ayaRHOi4JuFnoqvkT4zdKj/XJFwcz9TBOvHgDx092vI+P9B9891VfiA+3pYOOseNT28Sb DLjFu8tVs63JHjeL14z5dYHRCgfcsG/czv2GIYYA9Tmg7nz5q9oH9rqB62MIlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755823114; a=rsa-sha256; cv=none; b=lL+lUIvSRasoYv/KrIq9rnoaVX438g0bAq9Uy+ibWIxpNf0xbFJ3bwOenjxkATrhZsejm3 QIQlgO8tUOLSf9ClRNfzh+pkpm8M4KHYzyAqpxiNGkMRKYDGv5pKaoWx4G51BqzCy1kuh6 iGcvWBDNhZCyB1p/yDgvMU4YJOafJQClJkVoYv4KENAURD3wgULHRb0Aoacr/D5Swuzk6n pNLPEX/nnxAnEvrbKTktEv/OOzVCtGLFq0v8Gar/HZQvijLrp4hyDk5yeE5ECY1XmELol0 4JRPf4uBVx1fWRpZ/sWqPKvnHS7rSEVeyIjmoNQFOZuhY8cujVhYbMEHCDyW7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.dev (88-177-82-251.subs.proxad.net [88.177.82.251]) (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: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c7Ls62dLGzK2B; Fri, 22 Aug 2025 00:38:34 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 0F2B53BFAA; Fri, 22 Aug 2025 02:38:33 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Cy Schubert Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b6ea2513f776 - main - tzcode: Limit TZ for setugid programs In-Reply-To: <20250821222545.9AE66380@slippy.cwsent.com> (Cy Schubert's message of "Thu, 21 Aug 2025 15:25:45 -0700") References: <202508211859.57LIxlcm003786@gitrepo.freebsd.org> <20250821222545.9AE66380@slippy.cwsent.com> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Fri, 22 Aug 2025 02:38:33 +0200 Message-ID: <867bywjily.fsf@ltc.des.dev> 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: quoted-printable Cy Schubert writes: > Further testing has shown that this commit has TZ America/Vancouver to UT= C. > > Setting TZ to PST8PDT still works but TZ=3DAmerica/Vancouver does not. Please try this: https://reviews.freebsd.org/D52108 DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Fri Aug 22 03:48:55 2025 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 4c7R4m2R4Tz64wc1; Fri, 22 Aug 2025 03:48:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7R4m0bNZz3bwl; Fri, 22 Aug 2025 03:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755834536; 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=8G4ph7UOUNHVTD359n87NuAdEoUvzYroAGl4mokCr5Q=; b=Y/fWu7AlqcO02fETZxkthlH5OTPch2GgvpzEvn5rTrh7b0E+auIAyipYN9cg41s8W2B5xQ BcChTpYzG4AOLpMQOovjzuua5Bw2YG0JTlwoSQp0VwRm1rclG0Z2q+6cbI0uLYiqHMMT3m DhHYxNCjP7XVtU1feWAIS7CAhdzX4BUizteIRF//gYa4ZqAFCgZoEkU3EeKmgohC/n73ia perMlBlBj0QX1rLW7lKF2cXXioJ8IpQ37GuikRK9upHvguTY2WJViSbN9utibNAA1z4y6n RtHTKh0LVb7+Z7Vpso8+YNN+u2s44vfhP1HFU4Me1+gFqoBAHJuKF4r3TBKpvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755834536; 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=8G4ph7UOUNHVTD359n87NuAdEoUvzYroAGl4mokCr5Q=; b=ZE+TFyqbhkgNlFnnPFL0MmgNJfoFdoZ6y6MLxrm2nv9PRAFO1vH9IzfA/UepkgbBD0WPaM 7oh1nQaz3rUxJtpomvja9Cz+hY+PJ3RNJyv2JKnDIR8/1nD4dUVbkR+vSMZ8JyFemSdlLl C/VjkFa5HoYwapt5s0JBPILFxAPKdqA6m5E0pxec9kXMhpjZD9x7wvnBQASoYBZg7vUWhA gbPL8neG/AfNDp3266yYsjmvsbsLMfxwnmMHNAmnydHsPHPBw1QDj+SQSeCmC4QjWU25S5 bVfPzU8zQjmNAWc9fow70qzAQVVikOBm1sDzkmsSJPTqU41PvhIdjf4zHUpOzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755834536; a=rsa-sha256; cv=none; b=Lq/ufBBKzSTqDHoQDV4n3aL2DS+FKBAnUXirvPkUpJ+RjLwhoXgyWpH1cSvne7EVnL+S3L x5p9hv1ZQ02uq1CYF0xGs0/BnV2WI5kUvNzI5vC4KEppGO40qyIfhgsG1mtiNL7bxmxzqW A2ixMmizIcPE6Mncq3LBRjrHC4vHBdOQ2d5KRImZgPVUewvjGr10+/cKDWemfyY7nr4Tjq W0/d63DqHqqKIHxFzi01Dp8zlK+hJg++z3zubXcQi/86uNRN/oQsu3KQtq+fuByvKUZziT RYQZ5rVn49Uq359nDkYCbgF2wR1d6cjBrQwpnyqRdcfokH6a6YGjsoi2V/HoWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7R4m0BdCzDJ2; Fri, 22 Aug 2025 03:48:56 +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 57M3mt6E001027; Fri, 22 Aug 2025 03:48:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57M3mtev001024; Fri, 22 Aug 2025 03:48:55 GMT (envelope-from git) Date: Fri, 22 Aug 2025 03:48:55 GMT Message-Id: <202508220348.57M3mtev001024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: c43de099d013 - main - stand: use a common function in gfx_fb for setting up teken colors 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c43de099d0138b369b705b3af2c3254d3f3afc6e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c43de099d0138b369b705b3af2c3254d3f3afc6e commit c43de099d0138b369b705b3af2c3254d3f3afc6e Author: Kyle Evans AuthorDate: 2025-08-22 03:48:14 +0000 Commit: Kyle Evans CommitDate: 2025-08-22 03:48:28 +0000 stand: use a common function in gfx_fb for setting up teken colors These are basically identical, with exception to the hook installed which is specific to the loader we're building by necessity. Pull these out into common/gfx_fb.c and just parameterize the hooks to make it easier to change the logic. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D50886 --- stand/common/gfx_fb.c | 31 +++++++++++++++++++++++++++++++ stand/common/gfx_fb.h | 1 + stand/efi/libefi/efi_console.c | 23 +---------------------- stand/i386/libi386/vidconsole.c | 21 +-------------------- 4 files changed, 34 insertions(+), 42 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index af72ab1a4c99..1d2f22649955 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -232,6 +232,37 @@ gfx_parse_mode_str(char *str, int *x, int *y, int *depth) return (true); } +void +gfx_fb_setcolors(teken_attr_t *attr, ev_sethook_t sethook, + ev_unsethook_t unsethook) +{ + const char *ptr; + char env[10]; + + /* + * On first run, we setup an environment hook to process any color + * changes. If the env is already set, we pick up fg and bg color + * values from the environment. + */ + ptr = getenv("teken.fg_color"); + if (ptr != NULL) { + attr->ta_fgcolor = strtol(ptr, NULL, 10); + ptr = getenv("teken.bg_color"); + attr->ta_bgcolor = strtol(ptr, NULL, 10); + + teken_set_defattr(&gfx_state.tg_teken, attr); + } else { + snprintf(env, sizeof(env), "%d", + attr->ta_fgcolor); + env_setenv("teken.fg_color", EV_VOLATILE, env, + sethook, unsethook); + snprintf(env, sizeof(env), "%d", + attr->ta_bgcolor); + env_setenv("teken.bg_color", EV_VOLATILE, env, + sethook, unsethook); + } +} + static uint32_t rgb_color_map(uint8_t index, uint32_t rmax, int roffset, uint32_t gmax, int goffset, uint32_t bmax, int boffset) diff --git a/stand/common/gfx_fb.h b/stand/common/gfx_fb.h index 17e419d8ffd3..d12bcd76b7fa 100644 --- a/stand/common/gfx_fb.h +++ b/stand/common/gfx_fb.h @@ -277,6 +277,7 @@ void gfx_fb_bezier(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, int gfx_fb_putimage(png_t *, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t); bool gfx_parse_mode_str(char *, int *, int *, int *); +void gfx_fb_setcolors(teken_attr_t *, ev_sethook_t, ev_unsethook_t); void term_image_display(teken_gfx_t *, const teken_rect_t *); void reset_font_flags(void); diff --git a/stand/efi/libefi/efi_console.c b/stand/efi/libefi/efi_console.c index cbb4dd01d1fb..46a3c957f151 100644 --- a/stand/efi/libefi/efi_console.c +++ b/stand/efi/libefi/efi_console.c @@ -1041,28 +1041,7 @@ cons_update_mode(bool use_gfx_mode) a = teken_get_defattr(&gfx_state.tg_teken); attr = *a; - /* - * On first run, we set up the efi_set_colors() - * callback. If the env is already set, we - * pick up fg and bg color values from the environment. - */ - ptr = getenv("teken.fg_color"); - if (ptr != NULL) { - attr.ta_fgcolor = strtol(ptr, NULL, 10); - ptr = getenv("teken.bg_color"); - attr.ta_bgcolor = strtol(ptr, NULL, 10); - - teken_set_defattr(&gfx_state.tg_teken, &attr); - } else { - snprintf(env, sizeof(env), "%d", - attr.ta_fgcolor); - env_setenv("teken.fg_color", EV_VOLATILE, env, - efi_set_colors, env_nounset); - snprintf(env, sizeof(env), "%d", - attr.ta_bgcolor); - env_setenv("teken.bg_color", EV_VOLATILE, env, - efi_set_colors, env_nounset); - } + gfx_fb_setcolors(&attr, efi_set_colors, env_nounset); } } diff --git a/stand/i386/libi386/vidconsole.c b/stand/i386/libi386/vidconsole.c index 414803e9af3d..3938bd7822ea 100644 --- a/stand/i386/libi386/vidconsole.c +++ b/stand/i386/libi386/vidconsole.c @@ -956,26 +956,7 @@ cons_update_mode(bool use_gfx_mode) a = teken_get_defattr(&gfx_state.tg_teken); attr = *a; - /* - * On first run, we set up the vidc_set_colors() - * callback. If the env is already set, we - * pick up fg and bg color values from the environment. - */ - ptr = getenv("teken.fg_color"); - if (ptr != NULL) { - attr.ta_fgcolor = strtol(ptr, NULL, 10); - ptr = getenv("teken.bg_color"); - attr.ta_bgcolor = strtol(ptr, NULL, 10); - - teken_set_defattr(&gfx_state.tg_teken, &attr); - } else { - snprintf(env, sizeof(env), "%d", attr.ta_fgcolor); - env_setenv("teken.fg_color", EV_VOLATILE, env, - vidc_set_colors, env_nounset); - snprintf(env, sizeof(env), "%d", attr.ta_bgcolor); - env_setenv("teken.bg_color", EV_VOLATILE, env, - vidc_set_colors, env_nounset); - } + gfx_fb_setcolors(&attr, vidc_set_colors, env_nounset); /* Improve visibility */ if (attr.ta_bgcolor == TC_WHITE) From nobody Fri Aug 22 03:48:57 2025 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 4c7R4n4KgWz64wc2; Fri, 22 Aug 2025 03:48:57 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7R4n1Pjjz3bfG; Fri, 22 Aug 2025 03:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755834537; 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=TK8U2u6+255YC+1Vky7mgsNeEuXPnsCV29YebAnF3tw=; b=NHA3Awf5k0FhNJkZvIfOeSu/Q70VeimnEX808l5kYCQw2lL+dq6xjtknjsH0BUfmJBwZ48 nKjj3gyrCo+Otfp/paoCfhgGct4JG/WzjZns7cL+nTU8ZXUKgxAdCZzaUnVv/A1I33e07d cyBa/0IrHY2hzeAyzzDRmIyMx0HM3HQ7+8P8/gdNlyKI5xBtkojmKPISADWFrgaPmqt8ZI O70ii1/h2Lrn7Pb8sZY194JXXaxK5GOYsIS0JdzxEV/oAvDNr+ZuWDmpoEoxlMTTfCoenx 6zs0KZYodTN8CnDUxOvwt9hefxBwkA5fDH7xA55pomCR6LHWcWzS85lzdeLvEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755834537; 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=TK8U2u6+255YC+1Vky7mgsNeEuXPnsCV29YebAnF3tw=; b=c/25FeNrtVjADQfktEHgwSyfUzRJ67/vq44xtiTDD7PMkGiQAA9rfGChKaMaFyOM46vVmb tEQH1A5OkAuU9y2Kat24hBabpuJNP9lpsODuLP4POlVNzzyKZLeL67nCElVlovJ8xPdUQ6 nKq5lR7IA1zT4KNbyLJyWdB8K5ulqqeQBYQ0rlECsHAELMz6JDNIJgs9V4InWATUf/Jt2E oOyWsa+WRNCVFqBwswGY4CB2CUsY7yRLRgYZuvbna0nRGVE0/Z3gD5mZBFLvGIScuspEBf QuDOMFyrEIkNVRodYQlYlcq8IAXcRX4Wvi+G29K+FreTlGMSGtxHHtEcpv51Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755834537; a=rsa-sha256; cv=none; b=En4+CqYdxo6rPRHk2SpYN8KEAP1AxhDnwEJFiCNe3a1FilznMuWuNeAbehv+KLnRO9ZmIQ forKGwYerO0ohT56raVr0MIDtFlgPxLphljcOHF6dSkEgw9s070q7dahrgBlYzoeo87FWf K01NeQUwQWLWHwA4DNFlIieGSJQC3Xuj6fxE0mzBXdHEXVprgcbRoOKQZ5Eki5O2E8+ijF pTVEYRwvN8Wa4ek0Eu6PVbN7qqVIkR/n1L1AVNm6lmf79E7kl+MahkcscpBGHQ6O9i2Yoh Thzki/VOCdXb099WmFuXDoA8UbpZrRC4OdsbqFdo8grtIat50wuDJr/ha4gYvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7R4n0tsFzCkP; Fri, 22 Aug 2025 03:48:57 +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 57M3mvRk001069; Fri, 22 Aug 2025 03:48:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57M3mvhV001066; Fri, 22 Aug 2025 03:48:57 GMT (envelope-from git) Date: Fri, 22 Aug 2025 03:48:57 GMT Message-Id: <202508220348.57M3mvhV001066@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 95e6fd1fd85a - main - stand: split fg/bg handling up a little further 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95e6fd1fd85a448d2c68473b85a61fba24c9bc4f Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=95e6fd1fd85a448d2c68473b85a61fba24c9bc4f commit 95e6fd1fd85a448d2c68473b85a61fba24c9bc4f Author: Kyle Evans AuthorDate: 2025-08-22 03:48:14 +0000 Commit: Kyle Evans CommitDate: 2025-08-22 03:48:28 +0000 stand: split fg/bg handling up a little further These can be setup independently, so we should also check them and initialize each independently. This fixes a pre-existing bug where-in we may not pickup a bg color specified in the environment if a fg color wasn't set. The new version also ensures that we're hooking the color vars properly if we're using a value that was already there, as the console may need to adjust if something wants to switch them up again. Otherwise, a teken.fg_color set in loader could conceivably occur that only changes the color when you get to the kernel, which could be surprising. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D50887 --- stand/common/gfx_fb.c | 59 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index 1d2f22649955..e9a343f2985a 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -232,35 +232,60 @@ gfx_parse_mode_str(char *str, int *x, int *y, int *depth) return (true); } +/* + * Returns true if we set the color from pre-existing environment, false if + * just used existing defaults. + */ +static bool +gfx_fb_evalcolor(const char *envname, teken_color_t *cattr, + ev_sethook_t sethook, ev_unsethook_t unsethook) +{ + const char *ptr; + char env[10]; + bool from_env = false; + + ptr = getenv(envname); + if (ptr != NULL) { + *cattr = strtol(ptr, NULL, 10); + + /* + * If we can't unset the value, then it's probably hooked + * properly and we can just carry on. Otherwise, we want to + * reinitialize it so that we can hook it for the console that + * we're resetting defaults for. + */ + if (unsetenv(envname) != 0) + return (true); + from_env = true; + } + + snprintf(env, sizeof(env), "%d", *cattr); + env_setenv(envname, EV_VOLATILE, env, sethook, unsethook); + + return (from_env); +} + void gfx_fb_setcolors(teken_attr_t *attr, ev_sethook_t sethook, ev_unsethook_t unsethook) { const char *ptr; - char env[10]; + bool need_setattr = false; /* * On first run, we setup an environment hook to process any color * changes. If the env is already set, we pick up fg and bg color * values from the environment. */ - ptr = getenv("teken.fg_color"); - if (ptr != NULL) { - attr->ta_fgcolor = strtol(ptr, NULL, 10); - ptr = getenv("teken.bg_color"); - attr->ta_bgcolor = strtol(ptr, NULL, 10); - + if (gfx_fb_evalcolor("teken.fg_color", &attr->ta_fgcolor, + sethook, unsethook)) + need_setattr = true; + if (gfx_fb_evalcolor("teken.bg_color", &attr->ta_bgcolor, + sethook, unsethook)) + need_setattr = true; + + if (need_setattr) teken_set_defattr(&gfx_state.tg_teken, attr); - } else { - snprintf(env, sizeof(env), "%d", - attr->ta_fgcolor); - env_setenv("teken.fg_color", EV_VOLATILE, env, - sethook, unsethook); - snprintf(env, sizeof(env), "%d", - attr->ta_bgcolor); - env_setenv("teken.bg_color", EV_VOLATILE, env, - sethook, unsethook); - } } static uint32_t From nobody Fri Aug 22 03:48:58 2025 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 4c7R4p4MXnz64wfh; Fri, 22 Aug 2025 03:48:58 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7R4p2Ynhz3c4Y; Fri, 22 Aug 2025 03:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755834538; 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=SoB7zibhbOq53ivQ/dnfBNAbIggnRJXZxVLeQ5Vr98s=; b=rvwCtkI4GJXRJc+Dm/ILTqppV3z8hiH+XWMA5PdpEdi8aDUDF+76xW+Nz7KHlGdYjzIDNB B6IZMaoTbfOU8Z6GAtyska+gBZRN5u88AH1ZD0d9mpSh4yAdBCf23rtYiabxiMjOTVcT2y /Y5fRPosHo1eizGqK4vo3TFfMj/anI3rzQve4lzv8oXw/o1R0y50JRoaEiT/pCIwYGVXHO 7rkCGSv4NQKiXV8dBvNwsk8d6ReqRZGVJax83K+DMq1/WGHVbFpj9YqGWUr3xAuKYdzWTD 3VECVmrWb3ivQcrTt3l8gTpEBLDmrVqyaUwM7IK3Rx2uNmDGzD56T9DDt7fozQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755834538; 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=SoB7zibhbOq53ivQ/dnfBNAbIggnRJXZxVLeQ5Vr98s=; b=PyBxEfixGtssHsW2YNTY050JX0iIP0JOLYNur6sJGa96+V0mAXYKw8sqPDOgIFtEp3psom wCQuT8pwEYBM+18rPO+/Mb3N55R6Nv6VkGgk4UAcIWL+egYgHk0NIfi+A7GB4GpMKwFJER 86uzowCuQJ3gD5NagCbZi+fV5XYxJUKwmihU7iy8Esf/crGIXH7cwEAAUMTDZj8IAyxQWV ybOL9KLyUOtqWwN2h1vy8ZJu6iPj9tCDIxcq3uNAwWLzStmnVqBfdJyLPvXgHNuffp0To2 8Vc/hbZ8J7IZ2BhrfoO3QQrPQNCBpZofzUYLAZj4XDbTVs9g318vw5zZWfDCCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755834538; a=rsa-sha256; cv=none; b=KNODgtAqSv7ok37C9nBRcnP3d9RyWbUZ4pgUaeZ5+/4dDFynrN15wEwXGxHql0Z7WbHKxO mQBbs4Cp9cZBuyWuf7oa4W77vohB1IwsO7Xw4XMIuFy6Eo+y5CpAwmyNtmFmpaXSUDSGy8 9gXukdmZ9X0ucwHunHgo6aczIpSyu+aVOxUNbEvC+tXdS56JzOCxvReXRfFEmMBmkLFwRf e3g7PzU2tEMKIZ9YBsUDrPSNeud+qwQASmSmZFbHfMpLATNIAFw9O3looQE2W6ZeR5ngo2 hyQoj3nwqQUmN2hIAaobn2zZhJXFovYZ47xoEhDYTC/2I+UZzzhAp4xpyYiZDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7R4p27x8zDBt; Fri, 22 Aug 2025 03:48:58 +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 57M3mwGx001103; Fri, 22 Aug 2025 03:48:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57M3mwNk001100; Fri, 22 Aug 2025 03:48:58 GMT (envelope-from git) Date: Fri, 22 Aug 2025 03:48:58 GMT Message-Id: <202508220348.57M3mwNk001100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 510e473ff3a6 - main - stand: add a mechanism to avoid env var propagation to kenv 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 510e473ff3a6d4620c603c1b9ba06fb2bf5745fd Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=510e473ff3a6d4620c603c1b9ba06fb2bf5745fd commit 510e473ff3a6d4620c603c1b9ba06fb2bf5745fd Author: Kyle Evans AuthorDate: 2025-08-22 03:48:14 +0000 Commit: Kyle Evans CommitDate: 2025-08-22 03:48:29 +0000 stand: add a mechanism to avoid env var propagation to kenv Our only user of this at the moment is teken.{fg,bg}_color. These are special because teken is a library common to both the kernel and the loader, and we want to avoid having special vars to control the loader vs. the kernel. Ideally, if a user wants a different set of console colors, then they set the appropriate teken variable and it Just Works(TM) everywhere. We can't just avoid setting the env vars, because we specifically want to install a hook to adjust how loader is drawn. This allows us to avoid breaking a kernel config(5) that has some default teken colors set with our defaults. That's a valid configuration, even if it might seem weird that they don't want to set colors in both loader and the kernel -- they may not anticipate spending any time in loader, and thus prefer to just let it do its default behavior. NOKENV is expected to be unset if the value is overwritten, rather than acting as a persistent marker that we do not want the value to persist under any circumstance. We can always add another flag bit later for persistence if we find a use for that, but most variables are fine to carry over. This is mostly needed for environment variables that we really just want to set a hook for. Future work could expand this to break it out to the scripted interfaces. We have discussed some options like a new built-in command, or adding a flag to the existing `set` command, but haven't really come up with a concrete plan to avoid confusion. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D50888 --- stand/common/gfx_fb.c | 9 ++++++++- stand/common/modinfo.c | 2 ++ stand/libsa/environment.c | 17 ++++++++++++++--- stand/libsa/stand.h | 1 + 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index e9a343f2985a..659bf8540422 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -242,6 +242,7 @@ gfx_fb_evalcolor(const char *envname, teken_color_t *cattr, { const char *ptr; char env[10]; + int eflags = EV_VOLATILE | EV_NOKENV; bool from_env = false; ptr = getenv(envname); @@ -257,10 +258,16 @@ gfx_fb_evalcolor(const char *envname, teken_color_t *cattr, if (unsetenv(envname) != 0) return (true); from_env = true; + + /* + * If we're carrying over an existing value, we *do* want that + * to propagate to the kenv. + */ + eflags &= ~EV_NOKENV; } snprintf(env, sizeof(env), "%d", *cattr); - env_setenv(envname, EV_VOLATILE, env, sethook, unsethook); + env_setenv(envname, eflags, env, sethook, unsethook); return (from_env); } diff --git a/stand/common/modinfo.c b/stand/common/modinfo.c index 313469d32f35..1e39bd858cc2 100644 --- a/stand/common/modinfo.c +++ b/stand/common/modinfo.c @@ -172,6 +172,8 @@ md_copyenv(vm_offset_t start) /* Traverse the environment. */ for (ep = environ; ep != NULL; ep = ep->ev_next) { + if ((ep->ev_flags & EV_NOKENV) != 0) + continue; len = strlen(ep->ev_name); if ((size_t)archsw.arch_copyin(ep->ev_name, addr, len) != len) break; diff --git a/stand/libsa/environment.c b/stand/libsa/environment.c index 95ee1718f8d4..d139249a8e84 100644 --- a/stand/libsa/environment.c +++ b/stand/libsa/environment.c @@ -65,6 +65,17 @@ env_setenv(const char *name, int flags, const void *value, struct env_var *ev, *curr, *last; if ((ev = env_getenv(name)) != NULL) { + /* + * If the new value doesn't have NOKENV set, we'll drop the flag + * if it's set on the entry so that the override propagates + * correctly. We do this *before* sending it to the hook in + * case the hook declines to operate on it (e.g., because the + * value matches what was already set) -- we would still want + * the explicitly set value to propagate. + */ + if (!(flags & EV_NOKENV)) + ev->ev_flags &= ~EV_NOKENV; + /* * If there's a set hook, let it do the work * (unless we are working for one already). @@ -77,7 +88,6 @@ env_setenv(const char *name, int flags, const void *value, free(ev->ev_value); ev->ev_value = NULL; ev->ev_flags &= ~EV_DYNAMIC; - } else { /* @@ -123,12 +133,13 @@ env_setenv(const char *name, int flags, const void *value, /* If we have a new value, use it */ if (flags & EV_VOLATILE) { ev->ev_value = strdup(value); - ev->ev_flags |= EV_DYNAMIC; + flags |= EV_DYNAMIC; } else { ev->ev_value = (char *)value; - ev->ev_flags |= flags & EV_DYNAMIC; } + ev->ev_flags |= flags & (EV_DYNAMIC | EV_NOKENV); + return (0); } diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h index 233d11ab3ecb..aaba0aa7fb39 100644 --- a/stand/libsa/stand.h +++ b/stand/libsa/stand.h @@ -352,6 +352,7 @@ extern int pager_file(const char *fname); #define EV_DYNAMIC (1<<0) /* value was dynamically allocated, free if changed/unset */ #define EV_VOLATILE (1<<1) /* value is volatile, make a copy of it */ #define EV_NOHOOK (1<<2) /* don't call hook when setting */ +#define EV_NOKENV (1<<3) /* don't add to kenv (loader-only) */ struct env_var; typedef char *(ev_format_t)(struct env_var *ev); From nobody Fri Aug 22 05:25:46 2025 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 4c7TDW0Rxpz65JJt; Fri, 22 Aug 2025 05:25:47 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7TDV6MWwz3qMY; Fri, 22 Aug 2025 05:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840346; 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=gIe7NaHaxGz13nzxgq+0LhUk5dCvUQscbPZqqHJ/zko=; b=RMuCZt1jYhnl3zImVCpczMljyGcU1xv9BwjHWuvoYxiZM0fmPEwMOaI0WK8DgqL03esjmP TN+a8Ssq4uMMxg0BllSBpnWuQYqf+4YkmgFTTgUPviWWjtc+r97IRFFrbxc3NHuAfPUagA Qoq8saFlytQBQy4mXDT7PETWPO6ZdN3MeM4sdqN61S80qhD3bot19LabbRtfd+kEbxE8CD 0sSu6tfWWlzf/FZzC0AnI3dFvDpUqB/ABy4N2Jz5yKGB85SU38oU/FirViCr3q9xOl2IUX 6Wr9w1x2F0uwrURao+O4c2oQCPaDRanK13FXAXhjo2sjCIJzpGqV5hl5DVvgzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840346; 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=gIe7NaHaxGz13nzxgq+0LhUk5dCvUQscbPZqqHJ/zko=; b=c6pJJJVzRbeVsu9Hq9vmmkuSvU6iFuhd+XMFsZ8Uv/LRVbaVNjhg+EvqlH6DpcuHwiGC2Y /QCTfVSfSi7x3jJ9s10vamZ+Vl1nsCPCh0eNDdNJKVM1A2dwbuTIRS7YC4mgriy2aryJUx 9x2Ra0f2IVA66RT5LF6VnKz/D87X4iznbp/SSKIDc/XrXPw7crxb0/Ou+bVxKOSnhleelU QhzQkZ820S35wwG5PJrdFqhdiihYanl54eI/08Q/r+yhSRu1POzywEIACqeH9RFDvK7ppH rlM+CmjXnK6M9AalAQSh4DvGR4Biqn2jHnnoIZLJNJunMzOHllFWVQmSz/Ncbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755840346; a=rsa-sha256; cv=none; b=jmCNkzvYx2UvByUb0QMHwYPRuUctQjUnUn9DIPOpsfyo81roIqMsS+230ESimf2iGNWEV3 cbIqJ069pILNkHEUI+w/odwoFLfCDWMUp4HctLNgVAuSJw8sCVvueTucapL8UFIisTnGAr 1DwParSuvgLnGFxo++ZB+jflgy473JbvVov2eJzYwFeKgJT2qORUBE8qZQkoVtOh0HqbKc q307DI+znxZI7ZEjbGwy7ebFfxqsI0qEwm7j5Ug6uOo1DV5rvk8p371Ix8fqDGCdMny7ol 15sLyEtler+R13GBqS080uNvTBGn8At8TB0GfoMjwx0YsPKQ+ciNc8Kqd19XgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7TDV5ZJKzY4t; Fri, 22 Aug 2025 05:25:46 +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 57M5PkT1089061; Fri, 22 Aug 2025 05:25:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57M5PkVD089058; Fri, 22 Aug 2025 05:25:46 GMT (envelope-from git) Date: Fri, 22 Aug 2025 05:25:46 GMT Message-Id: <202508220525.57M5PkVD089058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 4e8ac151bca9 - stable/14 - bnxt(4): Fix typos in a comment and a kernel message 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4e8ac151bca92afbca258718a689d30a87e49d31 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4e8ac151bca92afbca258718a689d30a87e49d31 commit 4e8ac151bca92afbca258718a689d30a87e49d31 Author: Gordon Bergling AuthorDate: 2025-08-17 07:04:49 +0000 Commit: Gordon Bergling CommitDate: 2025-08-22 05:24:14 +0000 bnxt(4): Fix typos in a comment and a kernel message - s/priviledged/privileged/ (cherry picked from commit 74eb496c1019f702a28b4fa757f1139fbcf44895) --- sys/dev/bnxt/bnxt_re/qplib_res.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/bnxt/bnxt_re/qplib_res.c b/sys/dev/bnxt/bnxt_re/qplib_res.c index 69661c67708c..f527af031176 100644 --- a/sys/dev/bnxt/bnxt_re/qplib_res.c +++ b/sys/dev/bnxt/bnxt_re/qplib_res.c @@ -875,7 +875,7 @@ int bnxt_qplib_alloc_dpi(struct bnxt_qplib_res *res, dpi->umdbr = umaddr; switch (type) { case BNXT_QPLIB_DPI_TYPE_KERNEL: - /* priviledged dbr was already mapped just initialize it. */ + /* privileged dbr was already mapped just initialize it. */ dpi->umdbr = dpit->ucreg.bar_base + dpit->ucreg.offset + bit_num * PAGE_SIZE; dpi->dbr = dpit->priv_db; @@ -1150,7 +1150,7 @@ int bnxt_qplib_map_db_bar(struct bnxt_qplib_res *res) } ucreg->bar_reg = ioremap(ucreg->bar_base, ucreg->len); if (!ucreg->bar_reg) { - dev_err(&res->pdev->dev, "priviledged dpi map failed!\n"); + dev_err(&res->pdev->dev, "privileged dpi map failed!\n"); return -ENOMEM; } From nobody Fri Aug 22 05:27:20 2025 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 4c7TGK0SCQz65JK4; Fri, 22 Aug 2025 05:27:21 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7TGJ5L7Sz3qtP; Fri, 22 Aug 2025 05:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840440; 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=2rWip8ng5DPsTgas7vkpPRqwJRmGYtUQUMjuRi9jBuE=; b=tZADV6D7UwZIAtJFr9eOLtZ/94VzaUxWX5gDmUsL+VRCnI9VLvh845PaslMWfhDUtKqVRG 2vlfFU6sjDnYbRKqHI63Relt1pBKcxP5D5EaN7zurChckfjYkdPDS8TIFYoevIpvHUjQxX O/POXMwrbdczjM2VtdKIbKrCh1yVdKTCNX4aZVhJxq3/k186BovO9cOXOuuHBFwXerL0HP Qg9QjMU8R/HVkwU6Gob3+18renXflHikVfIirrwomOg96WHe4RtqU6TtZ51JF8eoViUQSy na3sV8SGO8Oz0vXLsNRWdNTVdrtRcJgsxtNpe2WBt6Xk9wowna8JVDDTuSI3tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840440; 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=2rWip8ng5DPsTgas7vkpPRqwJRmGYtUQUMjuRi9jBuE=; b=SRk/7n9Y+VzpzKY0qNuSe5aJBuoziri9weZ1J1Esc57Jopee5mReLiVa7pl0I4M3shcBQU sEA9NRpcZZIYn6kBCdrz7WJzCGkUuP6n3Qv2mg1qXfXB2GkpbPPRl3sFCiskXsYRz+Dsaa Smy1VLy55RJFHBLC70zWSh6YI1n6oRYPjD2FKAzNTbUzf2qebSZj12BAJEn2YBFmC0f/mL 53552M95EIQsQFIWvaWagb6GFQIGrHRNercnGwzjTxD4FOyPxpOlZZrrPuMpqj+bOrBrMV eBOEQcy+Q84QNdnWbyoESxxOsGGTn6T+di8Edv+HzM7Sj7WXQIAJYqzSo6gyZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755840440; a=rsa-sha256; cv=none; b=FB7cV6DHLEyVTnIeXZ13fWtTfs8obJb8FtWVcf6UZ84rmqSOCTjwnxlK8uBJQ6yQ4SasKP WC9BzCQt7/Y2Q2SFlLWLobQWVtA7uPJ1S3cpk/Z/1xZEqU9s8GspfjAfolkK9FNl0SglY0 yI7EO/poaXydoLqJE5BJs1Nv57ihHh33eS0HuoPK80V7EUiFrMrF+5VF9w9t3654dCxD4p 3moN9JDqBVkdgKSm6t8GGEUGre2y2Ithv3jzdsIgGEhzUQZQINJ2ZqTT8uxAhDIn3ogLkq Rdg2SOTref1gZezh3w5cWpcC3QVj7y0xNFwDGQp8zFKR3bVkAhoD7STsYbPjfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7TGJ4pkVzXgv; Fri, 22 Aug 2025 05:27:20 +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 57M5RKBB089539; Fri, 22 Aug 2025 05:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57M5RKlU089536; Fri, 22 Aug 2025 05:27:20 GMT (envelope-from git) Date: Fri, 22 Aug 2025 05:27:20 GMT Message-Id: <202508220527.57M5RKlU089536@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a4e9f8567708 - stable/14 - arm: Fix two typos in kernel messages of pmu_fdt.c 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a4e9f8567708a6e67bb634b3168c7fdca560e663 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a4e9f8567708a6e67bb634b3168c7fdca560e663 commit a4e9f8567708a6e67bb634b3168c7fdca560e663 Author: Gordon Bergling AuthorDate: 2025-08-17 07:01:13 +0000 Commit: Gordon Bergling CommitDate: 2025-08-22 05:25:56 +0000 arm: Fix two typos in kernel messages of pmu_fdt.c - s/interupt/interrupt/ (cherry picked from commit 9c7a9b3ff1eebbc15ef26bbdaae4f9448450523f) --- sys/arm/arm/pmu_fdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/arm/pmu_fdt.c b/sys/arm/arm/pmu_fdt.c index bb4d7557c176..0c2138581860 100644 --- a/sys/arm/arm/pmu_fdt.c +++ b/sys/arm/arm/pmu_fdt.c @@ -153,7 +153,7 @@ pmu_parse_intr(device_t dev, struct pmu_softc *sc) if (intr_is_per_cpu(sc->irq[0].res)) { if (has_affinity) { device_printf(dev, - "Per CPU interupt have declared affinity\n"); + "Per CPU interrupt have declared affinity\n"); err = ENXIO; goto done; } @@ -180,7 +180,7 @@ pmu_parse_intr(device_t dev, struct pmu_softc *sc) if (intr_is_per_cpu(sc->irq[i].res)) { - device_printf(dev, "Unexpected per CPU interupt\n"); + device_printf(dev, "Unexpected per CPU interrupt\n"); err = ENXIO; goto done; } From nobody Fri Aug 22 05:29:31 2025 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 4c7TJq4dwVz65JVb; Fri, 22 Aug 2025 05:29:31 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7TJq3Y1jz3r1S; Fri, 22 Aug 2025 05:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840571; 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=auxcwFYHPk4iGx5u3fVHHRaeMMqVUdweWI/DenSHiLA=; b=AfeW5brOZMdT/1AWEfjmO/LDDMEPWfm2LLhun8MH+kBwqBvtYTrdEtYlthCh3A4Xp0saXt la1d5oF/6Ohp+5ekLpcHTBSP5qxC/4teyV91zV2OqqNfiX/bPIvJ+dOk+DeZIEhdgKd38o sLbvl+vAa27Hm8Ow5Cy3EQAu7hN6QC/362K/nV32dB4jSY/WyM/i/ajJLEPaxg7iIX9yYG MrQDMEML6beGsXJMV6SfC7PoDGsVIX+cqhgmB/EKHcOW2me+3cce9EXFqYgGMnW+1bYR1S NitFk5yWEB7+/+3c+EPNlzmqHuRBJhil7tdt8tYgvNSTw+nrKxVf5vJt6/6S2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840571; 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=auxcwFYHPk4iGx5u3fVHHRaeMMqVUdweWI/DenSHiLA=; b=HW4n/E+Y1eAewtbcOP+VYsPZmp74vd8e6ZJiSrx3EL9iKZTvOwbg7+u4csFgSJ3sM6cmvI 9hGcQ3oi8csrfojNK0Xc/oE9r2cKZqJWtgQ3c6aLnk1lcrLkde1qO7CKhxg6/SUkjs+Jnn fBDgjxFKzpyy57+fish/9VTM3/jz1KyAPDIov6kUkkZoNJTK3syWEfs0YL1XMbSq12Nxoj tjehPqoeuUcUH8K8K9iqzkwr8M0GzpzKwKP9QiwTVAT4WQkMuIDxtTzQiKSeIvALYA/OSl bbdo4FAgdJADnDz9v42zfEkRpUbYpHyltd+5pPd33/J8MESOpa4jJ/2fbm20OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755840571; a=rsa-sha256; cv=none; b=RHI6b7fUM1BADZmjKxE6fhNhhLqMwiETAU7c1ug+kvEZqkN7r8CVnqWDbFEVi3BDn0hLis Z2NbVhlhudmwet1VWd4Em3GuHQ+e+11KzQv4lPGa0mDU4+Sr8V3Z6Z0Jcy93V8h6ZKiwoJ viY0C8kLD0dbaT9Cl0m5V5x4zairIdKSaixT1LMmd/YScBsgf10g85N+nxduo/J9LVVb+N RmnbZ1LWJjvGS2oiBjnolUr4MtDqdi4jL5n7kuWi7jn/pLGs8ngwTIUL7hU2P6m+p2MdRR p/jkA3I1fYWkh7VK44KB539+G5OcmY0LZoMMcmgapEszMRygSMKahKr/zgwQXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7TJq2zLqzY7G; Fri, 22 Aug 2025 05:29:31 +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 57M5TVRh090219; Fri, 22 Aug 2025 05:29:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57M5TVu0090216; Fri, 22 Aug 2025 05:29:31 GMT (envelope-from git) Date: Fri, 22 Aug 2025 05:29:31 GMT Message-Id: <202508220529.57M5TVu0090216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9418999e0afe - stable/13 - arm: Fix two typos in kernel messages of pmu_fdt.c 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9418999e0afe924167eeda63451051bb7485fe0c Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9418999e0afe924167eeda63451051bb7485fe0c commit 9418999e0afe924167eeda63451051bb7485fe0c Author: Gordon Bergling AuthorDate: 2025-08-17 07:01:13 +0000 Commit: Gordon Bergling CommitDate: 2025-08-22 05:28:04 +0000 arm: Fix two typos in kernel messages of pmu_fdt.c - s/interupt/interrupt/ (cherry picked from commit 9c7a9b3ff1eebbc15ef26bbdaae4f9448450523f) --- sys/arm/arm/pmu_fdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/arm/pmu_fdt.c b/sys/arm/arm/pmu_fdt.c index 598fe51820d9..13ff4057c129 100644 --- a/sys/arm/arm/pmu_fdt.c +++ b/sys/arm/arm/pmu_fdt.c @@ -153,7 +153,7 @@ pmu_parse_intr(device_t dev, struct pmu_softc *sc) if (intr_is_per_cpu(sc->irq[0].res)) { if (has_affinity) { device_printf(dev, - "Per CPU interupt have declared affinity\n"); + "Per CPU interrupt have declared affinity\n"); err = ENXIO; goto done; } @@ -180,7 +180,7 @@ pmu_parse_intr(device_t dev, struct pmu_softc *sc) if (intr_is_per_cpu(sc->irq[i].res)) { - device_printf(dev, "Unexpected per CPU interupt\n"); + device_printf(dev, "Unexpected per CPU interrupt\n"); err = ENXIO; goto done; } From nobody Fri Aug 22 05:35:47 2025 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 4c7TS41jlvz65Jr9; Fri, 22 Aug 2025 05:35:48 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7TS36lXzz3rmk; Fri, 22 Aug 2025 05:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840948; 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=R1Juzxu3kM2DNhIZrbWlkb4t2EUIqfL9JarQCiRU6oU=; b=LQpVP0xhla3Pkdm7pGTlyx4zylnBBgRKGWr3gFbduiWSLMX6HsXEHVdkGUDniMeecx3jSF aMDjDpVos4omuiURvr7yiWgd8TWYpF2AhROCGkoL1KpAPD1OjduwgSrs8IoTzJmi2XmSgk aWrqvnbpbu96gbL2Vv3JKFuKdOC6Wx5T54V81UblaLtG9eHCJDTBcm2phUQ8zWnZ6xQ06P aVxB7A4lNd4Efu4Nm/GqkvQpdQw0ZK4eJ3HAf2vATAFCcRhvm7TwsCE0AFrOgjR9Zvn3wp YukiAOnYP5gCzCv+ZxEXd9kODCsDm/2olP8EJyFgJq6MWzuiWnEwyWy7dgHP9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840947; 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=R1Juzxu3kM2DNhIZrbWlkb4t2EUIqfL9JarQCiRU6oU=; b=WSylhNfjlmOJwwttr0F48/OpQ7k1rm0oKwvou7+3uyUMrfyF4fKlisPXx9w1Lc8xSCUCdW er7VaTV1b9S2JcGOGwEYgegR7suBfsR1IqhRTMxy1ALppgpt/SmlZYJ/hLLcNohI7+9EIS g8iqUSHnbrPwhKQFNj07GXdVmYySC0OgAblwtzKzyMzKrAJpavYyvdAdIGp8iAGVglQF0G bGDmSchzaWKIjgFRv7tflu1ieZ5GUT9SS8Bnj51pOggUqn0LJ6xueZwCyCEzN1jS57tBy5 J6BUwyriYCBhD8NnwkpcPXNTYiKmapxAk12GogIE2yCFEP7ZRckHB/fdEr3lwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755840947; a=rsa-sha256; cv=none; b=M0OUfvBeVNXYIWJs9G9bDvq3cxlbKuVCGU8TOSk7wCemqxcYKYz21cK4woMab9GpfaoGp/ YgAWXw3DLgFV399+zy7UFqh+l6wphJOwHMZzp9DIybhcP8yOWN0fJO4wqe7AQRKxZ+Z6KU VH51blg4u4I9wz+y6z9gsIILWzAMd28p0jpKyFqVakPABpKPA8Jstx4u+9c0I68hQdeU1y rmYA3GHKqiw5UYS6HtIR4KfiMgkqZZfPbmPOA3rQqDcvjtms05m8cHhihIcezsZsu+JQEH 7h5jQQ9pK+V60S+MKb7rfCbY+xZ7uZGjo2PAUHtdviiq5p1sWmeAgndw4XnbDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7TS36FVhzYm3; Fri, 22 Aug 2025 05:35:47 +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 57M5Zlcf007168; Fri, 22 Aug 2025 05:35:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57M5ZloH007165; Fri, 22 Aug 2025 05:35:47 GMT (envelope-from git) Date: Fri, 22 Aug 2025 05:35:47 GMT Message-Id: <202508220535.57M5ZloH007165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 690ae8a2025c - main - Bail out of corrupt directory entries during boot 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 690ae8a2025ca1ce58d08a90a1df1645c81392ea Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=690ae8a2025ca1ce58d08a90a1df1645c81392ea commit 690ae8a2025ca1ce58d08a90a1df1645c81392ea Author: Kirk McKusick AuthorDate: 2025-08-22 05:33:48 +0000 Commit: Kirk McKusick CommitDate: 2025-08-22 05:33:48 +0000 Bail out of corrupt directory entries during boot A directory with a zero-valued d_reclen causes boot to hang, This patch checks for directory entries with value zero and bails out rather than spin forever. The hope is that the user has other options. Sadly this was reported on Jun 16 2015 and is just now attended to as part of a sweep of old unclosed phabricator reports. Reported-by: Daniel O'Connor darius-dons.net.au Differential Revision: https://reviews.freebsd.org/D2844 MFC-after: 1 week Sponsored-by: Netflix --- stand/libsa/ufs.c | 6 ++++++ stand/libsa/ufsread.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c index 86cd3be9a27a..868e8d47dbbd 100644 --- a/stand/libsa/ufs.c +++ b/stand/libsa/ufs.c @@ -891,6 +891,12 @@ ufs_readdir(struct open_file *f, struct dirent *d) if (error) return (error); dp = (struct direct *)buf; + /* + * Check for corrupt directory entry and bail out rather + * than spin forever hoping that the user has other options. + */ + if (dp->d_reclen == 0) + return (0); fp->f_seekp += dp->d_reclen; } while (dp->d_ino == (ino_t)0); diff --git a/stand/libsa/ufsread.c b/stand/libsa/ufsread.c index 0f9b9bb4e2fb..86ac8fbbbab7 100644 --- a/stand/libsa/ufsread.c +++ b/stand/libsa/ufsread.c @@ -108,6 +108,13 @@ fsfind(const char *name, ufs_ino_t * ino) *ino = d.d_ino; return d.d_type; } + /* + * Check for corrupt directory entry and bail out + * rather than spin forever hoping that the user + * has other options. + */ + if (d.d_reclen == 0) + return 0; s += d.d_reclen; } if (n != -1 && ls) From nobody Fri Aug 22 06:03:41 2025 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 4c7V4K6yMyz65LHB; Fri, 22 Aug 2025 06:03:45 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7V4K3R0Rz3tqG; Fri, 22 Aug 2025 06:03:45 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id p6oFuL5aT5MqypKsKuZiul; Fri, 22 Aug 2025 06:03:44 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id pKsIu5RwnJhBPpKsJuZWKr; Fri, 22 Aug 2025 06:03:44 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=QY3Fvdbv c=1 sm=1 tr=0 ts=68a80840 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=2OwXVqhp2XgA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=Wr8feYCpKahvTdRzVcAA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id CAB3625C; Thu, 21 Aug 2025 23:03:41 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id BB726185; Thu, 21 Aug 2025 23:03:41 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= cc: Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b6ea2513f776 - main - tzcode: Limit TZ for setugid programs In-reply-to: <867bywjily.fsf@ltc.des.dev> References: <202508211859.57LIxlcm003786@gitrepo.freebsd.org> <20250821222545.9AE66380@slippy.cwsent.com> <867bywjily.fsf@ltc.des.dev> Comments: In-reply-to =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= message dated "Fri, 22 Aug 2025 02:38:33 +0200." 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 Date: Thu, 21 Aug 2025 23:03:41 -0700 Message-Id: <20250822060341.BB726185@slippy.cwsent.com> X-CMAE-Envelope: MS4xfG8vIYgVq4lBMmIZc09JeqiR/M+wUzGn6IQFqps6upQTl3vBoFwXJjGqRxSmRCyjPxbyBmCoNlvHjCXs7La5WP6SrkU+sfwpkzQhcsgyCRtLskGncBYs 1IQKOT5asGaVY4LqHAqzIBuGE0kRxBKXbi+kWf4qiNC0fT+eI+ZYCxAlY9BYVQIeCPodvJlRUka4Gk1llMdd/V/WE9H4AgZHD5qkzRQHRtzqq8JrLHGpMDRZ 0togFg3xHJQvEfPJjUgbXsGCbXrFQ4wUdE+la6s1RaQsN4gWv0mXlKbewEswTKCZv7EJZiqhP9FpEieMhuvNKfywbg5Lrn9Ovtqisct22GQ= X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c7V4K3R0Rz3tqG In message <867bywjily.fsf@ltc.des.dev>, =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav? = w rites: > Cy Schubert writes: > > Further testing has shown that this commit has TZ America/Vancouver to UT= > C. > > > > Setting TZ to PST8PDT still works but TZ=3DAmerica/Vancouver does not. > > Please try this: https://reviews.freebsd.org/D52108 The problem is fixed. Thanks for the quick update. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Fri Aug 22 07:23:12 2025 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 4c7Wr11mLGz65QcX; Fri, 22 Aug 2025 07:23:13 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7Wr10DTmz42JZ; Fri, 22 Aug 2025 07:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755847393; 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=J2LSm3gyqfghvd78wDzH6zmvIlXXwsRHCKkL9GEaozU=; b=gwWOuE1qIphSi/Uo1jF1W+YgUDnZxDPD7PrGkl+E6qFq88s6n4DlQUiefdZj7yOsDx+7QJ YB8wwRBm63KSgyY2Ah4p/S89cipHA3+N05IJloDubR+WefgskvIcPyRt/swLeVWSURDPj5 Y5br7efzbeNqI6tgKQtLIToIdMiLyfUVe4qeKefOpVA/2av5W4s54LRN2HDpfnNKg7co6V g7YEQX4FhAAxnZAJuOzSxLuLlptST5fNc6QAfErPtEhvwtOfvB3UlYRUY2mPF8h5HWu9xm /OhPz9dyw9HD9SI6Stz4pcFo2VEFzIVABjNc7kNWIqPgFpMWge1b8TbiEwXPzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755847393; 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=J2LSm3gyqfghvd78wDzH6zmvIlXXwsRHCKkL9GEaozU=; b=GmQo+qWWR9rJCakLM34433RXQcpZomGRfWmltuFnaOcTcqs0uKRVd4dRfheSBgveHDqejY grA52liKzxEDZFewyeOpn1o71MyeeaP6z7l+CbAArXOCqTsf/TqrMFMHsChZm/pntsrHjT 76MYgRfTq2UqbDlPS7hz4qAoJQ4tdLPUDPSNUNNQDRm/lmHI50hvRJOFONCDMaoYHrOoFN uoZeM6YHmAzu+RIlwWStFengBKWVNT+cbRQklyiENNQM9Hr382e+e98zBiVaw419u2DY9h k0NyTptT96qHfXx0no0A7qoJ7u7YDtvgBa2my0BTvRzs/bfMAQfGEx9d/J2YUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755847393; a=rsa-sha256; cv=none; b=EfHGcahkbzGCnLdXmsr+CX1WH9mk+quLUEWzoWqB16IzHCKzJ0xAgTKeLVHfOLSrBvBKJw Kw/baD/xb1vByaSYesHpi4PEo3YCqIh9IoUfTVC3a5wKqPEccDk9AE3FyUEQ+q4eeiulKa azoaIe2ajZJi22Wrq6wUTA5QCwvQtVkteF1bRUiXMBeB+lXE2KT/pjz3nQni/lyPYYkzWK ptW5RIukXh7cH+n6TVAG2JdW+tvRdETA54wIPdeXeG0WoasXuf9ogOApXwd8SgHMG1RyQp 6p2nukI8gzJcQs7NMSqXwr1vThCzUcU5+IlpImJOrqABZbGGdK+XKSJ/2xB/9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7Wr06ppGzcWV; Fri, 22 Aug 2025 07:23:12 +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 57M7NCHF012044; Fri, 22 Aug 2025 07:23:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57M7NCS0012041; Fri, 22 Aug 2025 07:23:12 GMT (envelope-from git) Date: Fri, 22 Aug 2025 07:23:12 GMT Message-Id: <202508220723.57M7NCS0012041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a6b19979bf13 - main - tzcode: Fix TZ for non-setugid programs 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6b19979bf13055da5f24d1f240f2acddb35eeac Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a6b19979bf13055da5f24d1f240f2acddb35eeac commit a6b19979bf13055da5f24d1f240f2acddb35eeac Author: Dag-Erling Smørgrav AuthorDate: 2025-08-22 07:22:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-22 07:22:17 +0000 tzcode: Fix TZ for non-setugid programs The previous commit had the desired effect for setugid programs, but broke TZ for everyone else. I didn't notice because my test cases swap out /etc/localtime instead of setting TZ, so add a test case that sets TZ. Fixes: b6ea2513f776 ("tzcode: Limit TZ for setugid programs") Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D52108 --- contrib/tzcode/localtime.c | 11 +++-- lib/libc/tests/stdtime/detect_tz_changes_test.c | 61 +++++++++++++++++-------- 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index 1a01db931cab..0fe7f1ed3f64 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -535,21 +535,22 @@ tzloadbody(char const *name, struct state *sp, bool doextend, } if (doaccess && access(name, R_OK) != 0) return errno; + fid = _open(name, O_RDONLY | O_BINARY); #else /* __FreeBSD__ */ - if (issetugid()) { + { const char *relname = name; if (strncmp(relname, TZDIR "/", strlen(TZDIR) + 1) == 0) relname += strlen(TZDIR) + 1; int dd = _open(TZDIR, O_DIRECTORY | O_RDONLY); if (dd < 0) return errno; - fid = _openat(dd, relname, O_RDONLY | O_BINARY, AT_RESOLVE_BENEATH); + fid = _openat(dd, relname, O_RDONLY | O_BINARY, + issetugid() ? AT_RESOLVE_BENEATH : 0); serrno = errno; _close(dd); errno = serrno; - } else -#endif - fid = _open(name, O_RDONLY | O_BINARY); + } +#endif /* __FreeBSD__ */ if (fid < 0) return errno; diff --git a/lib/libc/tests/stdtime/detect_tz_changes_test.c b/lib/libc/tests/stdtime/detect_tz_changes_test.c index 9722546747fd..75f55bdede04 100644 --- a/lib/libc/tests/stdtime/detect_tz_changes_test.c +++ b/lib/libc/tests/stdtime/detect_tz_changes_test.c @@ -20,6 +20,26 @@ #include +static const struct tzcase { + const char *tzfn; + const char *expect; +} tzcases[] = { + /* + * A handful of time zones and the expected result of + * strftime("%z (%Z)", tm) when that time zone is active + * and tm represents a date in the summer of 2025. + */ + { "America/Vancouver", "-0700 (PDT)" }, + { "America/New_York", "-0400 (EDT)" }, + { "Europe/London", "+0100 (BST)" }, + { "Europe/Paris", "+0200 (CEST)" }, + { "Asia/Kolkata", "+0530 (IST)" }, + { "Asia/Tokyo", "+0900 (JST)" }, + { "Australia/Canberra", "+1000 (AEST)" }, + { "UTC", "+0000 (UTC)" }, + { 0 }, +}; + static const time_t then = 1751328000; /* 2025-07-01 00:00:00 UTC */ static const char *tz_change_interval_sym = "__tz_change_interval"; static int *tz_change_interval_p; @@ -91,25 +111,6 @@ ATF_TC_HEAD(detect_tz_changes, tc) } ATF_TC_BODY(detect_tz_changes, tc) { - static const struct tzcase { - const char *tzfn; - const char *expect; - } tzcases[] = { - /* - * A handful of time zones and the expected result of - * strftime("%z (%Z)", tm) when that time zone is active - * and tm represents a date in the summer of 2025. - */ - { "America/Vancouver", "-0700 (PDT)" }, - { "America/New_York", "-0400 (EDT)" }, - { "Europe/London", "+0100 (BST)" }, - { "Europe/Paris", "+0200 (CEST)" }, - { "Asia/Kolkata", "+0530 (IST)" }, - { "Asia/Tokyo", "+0900 (JST)" }, - { "Australia/Canberra", "+1000 (AEST)" }, - { "UTC", "+0000 (UTC)" }, - { 0 }, - }; char obuf[1024] = ""; char ebuf[1024] = ""; struct pollfd fds[3]; @@ -272,10 +273,32 @@ ATF_TC_BODY(detect_tz_changes, tc) ATF_REQUIRE_EQ(0, WEXITSTATUS(status)); } +ATF_TC(tz_env); +ATF_TC_HEAD(tz_env, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test TZ environment variable"); +} +ATF_TC_BODY(tz_env, tc) +{ + char buf[128]; + const struct tzcase *tzcase = NULL; + struct tm *tm; + size_t len; + + for (tzcase = tzcases; tzcase->tzfn != NULL; tzcase++) { + setenv("TZ", tzcase->tzfn, 1); + ATF_REQUIRE((tm = localtime(&then)) != NULL); + len = strftime(buf, sizeof(buf), "%z (%Z)", tm); + ATF_REQUIRE(len > 0); + ATF_REQUIRE_STREQ(tzcase->expect, buf); + } +} + ATF_TP_ADD_TCS(tp) { debugging = !getenv("__RUNNING_INSIDE_ATF_RUN") && isatty(STDERR_FILENO); ATF_TP_ADD_TC(tp, detect_tz_changes); + ATF_TP_ADD_TC(tp, tz_env); return (atf_no_error()); } From nobody Fri Aug 22 10:30:24 2025 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 4c7c004yfkz65cjf; Fri, 22 Aug 2025 10:30:24 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7c0039fmz3NkL; Fri, 22 Aug 2025 10:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755858624; 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=aig6CYwsS64eedNLZK8iCUbtzgDanDRt7vabmrriBts=; b=CTlJAjVQyS7HUMYk9NmzhbkCM/3RTLWOAAGyS8x/H/uHbZLu2ZaKuFDuKvrUXtNATI2t27 RXYNNvpRe3sdR4tu7Qb1SPKf/5uFH2ZQrI9lD1JxUcjlgIbwYvLrZWKk1zbeFWpSstaMkE pbxuYO8JurDFgOewNev+lX7nRrOfI2VjTew+M8eOvF+5zTwjhmW7ElS7m1hMBc9Chcx/Ai Nw/C4y3HV1izAWAgVJQKh+ijXlDCckiHcsLU2J/VE1ujfacWkpapp1WOPIy0eM+Ga0GB03 qa9DKe7YydLF+3mguBR40UEcRVE6TGZj3rDzbSGDIpCZJw38BrB1ZSfKx2rrqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755858624; 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=aig6CYwsS64eedNLZK8iCUbtzgDanDRt7vabmrriBts=; b=bzqpko7WAh1Jjno5DsPGqZTb8QndNjgWknOSwDCj9LSckwlcGv3ggeEleQpnNvJA0u4OEW at2PwFfZ2w6JbKDTIVcIP9OsMP0YWuOaQHYAC2HFXlKTULfdbHJiumveUwd0qdjVw3W7by sJlcA3cmoML+1FN2WrcozZBPANzW7xZ+d6hl7V9DVRBq79FY4EhR9kOsk11ygQ4km8/zr9 vW/n8qki0z/gD871bYdxDsOMnLnqJKkXNMGbm1/CKn29AfzlKyPg6teZTz71/0IH6CoFyo mzHiUV0I4Ptz3nW4fHplunB52N6PFWCEjUWBsmA+O18H8NqI4JfP476uoS1LTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755858624; a=rsa-sha256; cv=none; b=OTLyzzbKSWgZh6fODJuMDk4h/pdAnmiMygkP3pSvzFTWiM/ZO5pQQCaS0DZDO71J2JnE/x +3lRUgITv5z3ofxWYa7Bp292dVcmeedigXTRjLwkUY8Su2qQKGb86jE1wf59dL7AiKdRjo 9LnkEyNI9Ic0+3hW8Z4AP7LHSAgX8R3ucgvzssUD0LjQ66VXmuZU9+NLokJ7ROtl1u7aXR o7E2DUzXC+0PwC7MrHp0XZpb28zL481ob60R2apQyZ2uy/30Jn5hQPDQcqBpyNWOZpBZWd YyS7FKHtTDVBmLdYzsqE4CSgLyIg9oOSrdsPcHZ8ju5rt2mOVbjp7D1J2Nvu+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7c002DNTzhjs; Fri, 22 Aug 2025 10:30:24 +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 57MAUO9o059374; Fri, 22 Aug 2025 10:30:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MAUOI6059371; Fri, 22 Aug 2025 10:30:24 GMT (envelope-from git) Date: Fri, 22 Aug 2025 10:30:24 GMT Message-Id: <202508221030.57MAUOI6059371@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 308fa72e5f55 - main - options: remove stale comment 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 308fa72e5f553966fc6dc3075450d16459cc5c90 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=308fa72e5f553966fc6dc3075450d16459cc5c90 commit 308fa72e5f553966fc6dc3075450d16459cc5c90 Author: Michael Tuexen AuthorDate: 2025-08-21 16:38:09 +0000 Commit: Michael Tuexen CommitDate: 2025-08-21 16:38:09 +0000 options: remove stale comment Fixes: ea916b64125b ("Remove TCP_SAD optional code now that the sack filter performs this function.") Sponsored by: Netflix, Inc. --- sys/conf/options | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/conf/options b/sys/conf/options index bb3d08e88e21..4009ba2b4843 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -235,11 +235,6 @@ TCP_REQUEST_TRK opt_global.h TCP_ACCOUNTING opt_global.h TCP_BBR opt_inet.h TCP_RACK opt_inet.h -# -# TCP SaD Detection is an experimental Sack attack Detection (SaD) -# algorithm that uses "normal" behaviour with SACK's to detect -# a possible attack. It is strictly experimental at this point. -# TURNSTILE_PROFILING UMTX_PROFILING UMTX_CHAINS opt_global.h From nobody Fri Aug 22 11:29:19 2025 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 4c7dHz4z12z65hKX; Fri, 22 Aug 2025 11:29:19 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7dHz1hzGz3Wqd; Fri, 22 Aug 2025 11:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755862159; 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=FSIcqAWRPBVYUbnXiPjoTqoLwisuzHBeKkiaV+rnihU=; b=FfpgQXjU0/8jzOM7nwaIkaKdZk6sJ+mmhFSRgH0dd59JF64WRqFSP8eMCekbiDBS+Ner+e nThzJ6hSjWQNzNVVbiiN2sP7hkoF6QWz1B+jF/9SL8UkDCiWlpZflb2/LeCPJ8Oi8f8vGg X98p2Uhk92CMlpIb7ixm5Scc3CGb31S4jTP9tWglCZ8U5nU9yir5kyylWrknVtXZmApwLe Yq+c5UHxKcuKytev32aMrfYfmyOP4vwI/zaNqnGBoQdpRtZ+XIqcD6fD++1yHqCVm+jXWo IUe2jzoJ55Qnw7FKbcWW3G9aSTOd7yVqmauhnA2sCxzs0Rs4f6LnxlKqhKpf6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755862159; 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=FSIcqAWRPBVYUbnXiPjoTqoLwisuzHBeKkiaV+rnihU=; b=rl7AtsavxrcKjQrcffDtQu3Rd44pH5Tj+BpYc6UB8cwvVEsT9K9hR5Qifq0FHyxSuM8WzE kaUvBRoT4LPLS4iVzRVikkiITUtus9cd5gGEnQDR6qm9dudKY6ECi+d1lzpzlggNGJ+4bD LuAuU+zVMHzfOP8evsVht8k6hcJymJvPM4vrYoABH3eG5g6DTIjj96PJ//XgJNfFdVC/X1 JOExobVlWf/VWCbW8nKCwkaqqzxWyGwHq/ja5IVcYumXk01yukEQuvcfxIPfewRIpR8AL8 GzBajIYila0dpl5OBevwdoXdL6gG4nhwqUbRvXUMd5UXOfUgCcwF0ZtlZpcQ3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755862159; a=rsa-sha256; cv=none; b=x4LNxIDukRFgUs/5yvPp4fS5JuLGikcIHOsENBvBuPj8rZl2s639k79ocUm5/vp4qpiS/H oiEMjTXDOb/n3G7iwPtFWYXAylE1SoLpZM2VCMC6C3pENCQG5LZXuc53Wf1FtQ7Ln2VWoa N+tfcu92iVYFW/hVYG5vrTS8WW3jwYGBEJ3GGx8IeD0t+QdVePxuTuVnag8CaBWl8E0vWW M0trs+c9TiwstBe4SptwVOBgIxYuW/1KpWjpuZbUmmPFawNEnvuP/EzoBeg1XFsQ5mOV7s x3qYEBeVBe8crNQJxwYOc8uEY859KYR+r2Ah6LHLgU6NgT37DP/2svpo4721NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7dHz17Q5zkvV; Fri, 22 Aug 2025 11:29:19 +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 57MBTJ0n061557; Fri, 22 Aug 2025 11:29:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MBTJ6R061554; Fri, 22 Aug 2025 11:29:19 GMT (envelope-from git) Date: Fri, 22 Aug 2025 11:29:19 GMT Message-Id: <202508221129.57MBTJ6R061554@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fba63c09ed0f - main - cd9660: va_rdev should be NODEV for non-special inodes 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fba63c09ed0fd21865bfd0ec3b9e0c3840a55dd6 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fba63c09ed0fd21865bfd0ec3b9e0c3840a55dd6 commit fba63c09ed0fd21865bfd0ec3b9e0c3840a55dd6 Author: Konstantin Belousov AuthorDate: 2025-08-18 02:45:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-22 11:28:53 +0000 cd9660: va_rdev should be NODEV for non-special inodes Reported and tested by: pho Reviewed by: rmacklem Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D51988 --- sys/fs/cd9660/cd9660_vnops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index a496b41fcf6e..4a2b80a7ccdd 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -191,7 +191,7 @@ cd9660_getattr(struct vop_getattr_args *ap) vap->va_atime = ip->inode.iso_atime; vap->va_mtime = ip->inode.iso_mtime; vap->va_ctime = ip->inode.iso_ctime; - vap->va_rdev = ip->inode.iso_rdev; + vap->va_rdev = VN_ISDEV(vp) ? ip->inode.iso_rdev : NODEV; vap->va_size = (u_quad_t) ip->i_size; if (ip->i_size == 0 && (vap->va_mode & S_IFMT) == S_IFLNK) { From nobody Fri Aug 22 14:35:27 2025 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 4c7jQl2TQqz65vrL; Fri, 22 Aug 2025 14:35:27 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7jQl1ml9z3Grd; Fri, 22 Aug 2025 14:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755873327; 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=E/EqQYWipX9HNAWi0xTfe5b920lts6TwKHoSGBjTk34=; b=YUiUrfnx1QE8cb9ocLUMjzjEx1LUUz1nab6VEiIXuBAjCtVl1Ooe2HAt0w+eCx16MOhmw1 HpMLVItMKr0W4s9/LJaua8ilEvEPy5I+0yisVeq6XGvMGRTtK1R2qnPwp/h21ahchGyxl6 kly/p3rR+U1kD4Y1cK3GWS5xUji1xKiQcu1VzjpVGjD3GUxYEp621YqHbO4obx5FPkGcq4 ZdskrnSlavf/2qVududnhaRG1J8sxe2ujEoBD6YGnFw2459+f6ARKoshaW0eI065lwZ7Ix rhkxLW4zy8iB2k+ObD5pRtoklEaBDAfr35YtbNANw+FmqNHY6fUGtb0Zo26MBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755873327; 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=E/EqQYWipX9HNAWi0xTfe5b920lts6TwKHoSGBjTk34=; b=cBoHYZqJniABgGiUl0TbOWTW2i9rwoqjuJwBYIrvwuNVtKeTpJ4+IIXrQPLkOIldwoBPNN vzecsEZ+P9WGgTG2QU9m/N/PvZe59xEAKd8vbD7IG5y/aGWtCRlzvUDbQ7FwfOn0HP8xw5 0VlJZYjAdhyWboTtpVFq17ag9KWYyh0Hbv4yZVaTQdeLP723kzxu/vigp4XQOVGYuubETD LkhoGqoxgDCFLQtJtJ7mBMScWtMDNRCJyyvZWWEiZqyeq7C6O3po6gt653MFCFak6HOArd OqGprYezWM8lyZ+6Feh36i9qBvAoYRVY/cYujMQwvxHq9HzKNsiKeRR9V2CzRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755873327; a=rsa-sha256; cv=none; b=cDpG8lXFPZmGiCE/6Tiu92/HUVf6dBSWnEeLQ4shTmOQkjP50CX/Jv9Fb+I7nBE3zRtR+B ZKP1RSYythcVIKvAgiOL03/GICN6ZbcAa4Orin9bJANdd1n5ApkX8O/Z9vb5i8BSQ2aybO 7XNRhif9mRXyIU1Kfadp5Iu9uFpdJZNowf35/bvRBy4K4Avimp24deQObtB6TWdtqCZxLU 9i2SQRAn7knkw2Jei62ozEA83DveTHaTqVyqVCmsw+rYhLMrkd2XJHkBGl/BK8sKKB/Jym cqTaxNS9vafHp45vgQWt6IfhkDwb0ybVD5ZHLdsRW6WcMusN91ZG0vZ5v16ojQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7jQl1CfMzqkP; Fri, 22 Aug 2025 14:35:27 +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 57MEZRW0016209; Fri, 22 Aug 2025 14:35:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MEZRr0016206; Fri, 22 Aug 2025 14:35:27 GMT (envelope-from git) Date: Fri, 22 Aug 2025 14:35:27 GMT Message-Id: <202508221435.57MEZRr0016206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0cd42981dc0a - main - imgact_elf: Add helper macros for name of the ELF ABI (elf32 vs elf64) 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cd42981dc0a180ced15265aa1658013a3de4dd4 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0cd42981dc0a180ced15265aa1658013a3de4dd4 commit 0cd42981dc0a180ced15265aa1658013a3de4dd4 Author: John Baldwin AuthorDate: 2025-08-22 13:58:51 +0000 Commit: John Baldwin CommitDate: 2025-08-22 13:58:51 +0000 imgact_elf: Add helper macros for name of the ELF ABI (elf32 vs elf64) Reviewed by: brooks, kib Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D52032 --- sys/kern/imgact_elf.c | 54 +++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 2690ad3b2679..5a53fac50f2c 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -84,6 +84,13 @@ #define ELF_NOTE_ROUNDSIZE 4 #define OLD_EI_BRAND 8 +/* + * ELF_ABI_NAME is a string name of the ELF ABI. ELF_ABI_ID is used + * to build variable names. + */ +#define ELF_ABI_NAME __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) +#define ELF_ABI_ID __CONCAT(elf, __ELF_WORD_SIZE) + static int __elfN(check_header)(const Elf_Ehdr *hdr); static Elf_Brandinfo *__elfN(get_brandinfo)(struct image_params *imgp, const char *interp, int32_t *osrel, uint32_t *fctl0); @@ -104,14 +111,15 @@ static Elf_Word __elfN(untrans_prot)(vm_prot_t); static size_t __elfN(prepare_register_notes)(struct thread *td, struct note_info_list *list, struct thread *target_td); -SYSCTL_NODE(_kern, OID_AUTO, __CONCAT(elf, __ELF_WORD_SIZE), - CTLFLAG_RW | CTLFLAG_MPSAFE, 0, +SYSCTL_NODE(_kern, OID_AUTO, ELF_ABI_ID, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, ""); +#define ELF_NODE_OID __CONCAT(_kern_, ELF_ABI_ID) + int __elfN(fallback_brand) = -1; -SYSCTL_INT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, +SYSCTL_INT(ELF_NODE_OID, OID_AUTO, fallback_brand, CTLFLAG_RWTUN, &__elfN(fallback_brand), 0, - __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) " brand of last resort"); + ELF_ABI_NAME " brand of last resort"); static int elf_legacy_coredump = 0; SYSCTL_INT(_debug, OID_AUTO, __elfN(legacy_coredump), CTLFLAG_RW, @@ -126,22 +134,22 @@ int __elfN(nxstack) = #else 0; #endif -SYSCTL_INT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, +SYSCTL_INT(ELF_NODE_OID, OID_AUTO, nxstack, CTLFLAG_RW, &__elfN(nxstack), 0, - __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": support PT_GNU_STACK for non-executable stack control"); + ELF_ABI_NAME ": support PT_GNU_STACK for non-executable stack control"); #if defined(__amd64__) static int __elfN(vdso) = 1; -SYSCTL_INT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, +SYSCTL_INT(ELF_NODE_OID, OID_AUTO, vdso, CTLFLAG_RWTUN, &__elfN(vdso), 0, - __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": enable vdso preloading"); + ELF_ABI_NAME ": enable vdso preloading"); #else static int __elfN(vdso) = 0; #endif #if __ELF_WORD_SIZE == 32 && (defined(__amd64__) || defined(__i386__)) int i386_read_exec = 0; -SYSCTL_INT(_kern_elf32, OID_AUTO, read_exec, CTLFLAG_RW, &i386_read_exec, 0, +SYSCTL_INT(ELF_NODE_OID, OID_AUTO, read_exec, CTLFLAG_RW, &i386_read_exec, 0, "enable execution from readable segments"); #endif @@ -161,15 +169,15 @@ sysctl_pie_base(SYSCTL_HANDLER_ARGS) __elfN(pie_base) = val; return (0); } -SYSCTL_PROC(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, pie_base, +SYSCTL_PROC(ELF_NODE_OID, OID_AUTO, pie_base, CTLTYPE_ULONG | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, 0, sysctl_pie_base, "LU", "PIE load base without randomization"); -SYSCTL_NODE(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, aslr, +SYSCTL_NODE(ELF_NODE_OID, OID_AUTO, aslr, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, ""); -#define ASLR_NODE_OID __CONCAT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), _aslr) +#define ASLR_NODE_OID __CONCAT(ELF_NODE_OID, _aslr) /* * Enable ASLR by default for 64-bit non-PIE binaries. 32-bit architectures @@ -179,8 +187,7 @@ SYSCTL_NODE(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, aslr, static int __elfN(aslr_enabled) = __ELF_WORD_SIZE == 64; SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, enable, CTLFLAG_RWTUN, &__elfN(aslr_enabled), 0, - __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) - ": enable address map randomization"); + ELF_ABI_NAME ": enable address map randomization"); /* * Enable ASLR by default for 64-bit PIE binaries. @@ -188,8 +195,7 @@ SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, enable, CTLFLAG_RWTUN, static int __elfN(pie_aslr_enabled) = __ELF_WORD_SIZE == 64; SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, pie_enable, CTLFLAG_RWTUN, &__elfN(pie_aslr_enabled), 0, - __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) - ": enable address map randomization for PIE binaries"); + ELF_ABI_NAME ": enable address map randomization for PIE binaries"); /* * Sbrk is deprecated and it can be assumed that in most cases it will not be @@ -199,27 +205,25 @@ SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, pie_enable, CTLFLAG_RWTUN, static int __elfN(aslr_honor_sbrk) = 0; SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, honor_sbrk, CTLFLAG_RW, &__elfN(aslr_honor_sbrk), 0, - __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": assume sbrk is used"); + ELF_ABI_NAME ": assume sbrk is used"); static int __elfN(aslr_stack) = __ELF_WORD_SIZE == 64; SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, stack, CTLFLAG_RWTUN, &__elfN(aslr_stack), 0, - __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) - ": enable stack address randomization"); + ELF_ABI_NAME ": enable stack address randomization"); static int __elfN(aslr_shared_page) = __ELF_WORD_SIZE == 64; SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, shared_page, CTLFLAG_RWTUN, &__elfN(aslr_shared_page), 0, - __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) - ": enable shared page address randomization"); + ELF_ABI_NAME ": enable shared page address randomization"); static int __elfN(sigfastblock) = 1; -SYSCTL_INT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, sigfastblock, +SYSCTL_INT(ELF_NODE_OID, OID_AUTO, sigfastblock, CTLFLAG_RWTUN, &__elfN(sigfastblock), 0, "enable sigfastblock for new processes"); static bool __elfN(allow_wx) = true; -SYSCTL_BOOL(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, allow_wx, +SYSCTL_BOOL(ELF_NODE_OID, OID_AUTO, allow_wx, CTLFLAG_RWTUN, &__elfN(allow_wx), 0, "Allow pages to be mapped simultaneously writable and executable"); @@ -2951,9 +2955,9 @@ __elfN(check_note)(struct image_params *imgp, Elf_Brandnote *brandnote, */ static struct execsw __elfN(execsw) = { .ex_imgact = __CONCAT(exec_, __elfN(imgact)), - .ex_name = __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) + .ex_name = ELF_ABI_NAME }; -EXEC_SET(__CONCAT(elf, __ELF_WORD_SIZE), __elfN(execsw)); +EXEC_SET(ELF_ABI_ID, __elfN(execsw)); static vm_prot_t __elfN(trans_prot)(Elf_Word flags) From nobody Fri Aug 22 14:35:28 2025 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 4c7jQm3lTdz65vWn; Fri, 22 Aug 2025 14:35:28 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7jQm2ZR0z3Gx1; Fri, 22 Aug 2025 14:35:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755873328; 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=m+xTg3PxbeNxcAJ10pzkcuNMc3OIv1p3vMpUoMrY5jQ=; b=xFJTJ/e6yhTmE5BZlZAlJyFYDmWEAjuLlRx8G3LDTgHkgNHviAKx63fzJ48kM9y/lR4iwC haxLnmdoTn9jjmhLdi4ilp3+sCs7TdZNhe4Xr2GgZ6pQ3zltgmm0a7yxVA2D+JGn0gGaqX QINRWJyo9j0SrrDigj343iBWQ+iGvxjijSY10I5KiBXewMuWS1flACfDPB6mEiDtBGMxMx 3VwkDneZvXM0/YlQ1BMn5g+UyXNi/YjXZwus16UxJZNiyO2sH95tlraOJPB4RhlvZQlJ18 O4XFpNoERdWS1ZqDD9vqbm2B9R8Ls0sihzRq5mEmj6xzpPbqylmK6O5lTayIrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755873328; 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=m+xTg3PxbeNxcAJ10pzkcuNMc3OIv1p3vMpUoMrY5jQ=; b=cLfcDAI412xvyU8YFxsRpiHBnZvBFrk5fzMCyVTBHgDok2m5+Xfk4oym1pfk5vSXYpBe6y yBBeRpSxmDBLI8QUVSySUilaedr+3TfESyB2JJs4jzJ2sG8mmJKGKTp3hlu+hqZX7PFb8I k/QzyL73SGcTBFGliCyc+Kp3AeKk+/YnTPq85hXo8zsi1HCjVToygVqz63ko/HUmieoIF5 p/oUk5pdyFwqov4oPxdxf0MRc2trrMhjtTG5Cr3UCaS7Wu+oKKxDwUsQmqm2rJxW6s+are SjOMZ1cr51YZggJeIBFYvgbidwu1kbLi0rQMqqnu52DQ+dKi5RD5CkXfPjhdYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755873328; a=rsa-sha256; cv=none; b=HKfPJci4NZPwaCJlRownJzcRkIO8YtFOHC2RGv0vNe54MgytiRgYjlAp16XLfta0/HmrEU E52hg3YfRoxzvEVdCoMZraYgYzDil8xBPnymFDp+g55u/VT2YcunyDLxPerGNAeGoN+Vok LNIKcmD9ZZxs1CQo6V5/9dD48rUjjMQjtlK7w3ZhXy57G1Z7yKUSDIQ7F/2XgctVjMa6/D fK/2wU+9YjrRkib+F1MH4kbp3HF8kp5USRvJ07xvPnA5PYlz1S3FWPtBg4GFWCQOD282u2 d6YWOIAMh2iQM0U6c6c/m18EkkK89cIBk53SuwabP8af6pMS/+iHRKQcupb85Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7jQm29x7zqgx; Fri, 22 Aug 2025 14:35:28 +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 57MEZSVX016242; Fri, 22 Aug 2025 14:35:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MEZSvG016239; Fri, 22 Aug 2025 14:35:28 GMT (envelope-from git) Date: Fri, 22 Aug 2025 14:35:28 GMT Message-Id: <202508221435.57MEZSvG016239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e679319b840e - main - rtld: Compute obj->maxsize for obj_rtld 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e679319b840e7c3298a0b0c4149113d4bbe63110 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e679319b840e7c3298a0b0c4149113d4bbe63110 commit e679319b840e7c3298a0b0c4149113d4bbe63110 Author: John Baldwin AuthorDate: 2025-08-22 13:59:09 +0000 Commit: John Baldwin CommitDate: 2025-08-22 13:59:09 +0000 rtld: Compute obj->maxsize for obj_rtld Compute this while parsing the program headers in parse_rtld_phdr(). Reviewed by: kib Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D52033 --- libexec/rtld-elf/rtld.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 8977d5947010..a8a2a0fa5a07 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2437,11 +2437,21 @@ parse_rtld_phdr(Obj_Entry *obj) { const Elf_Phdr *ph; Elf_Addr note_start, note_end; + bool first_seg; + first_seg = true; obj->stack_flags = PF_X | PF_R | PF_W; for (ph = obj->phdr; (const char *)ph < (const char *)obj->phdr + obj->phsize; ph++) { switch (ph->p_type) { + case PT_LOAD: + if (first_seg) { + obj->vaddrbase = rtld_trunc_page(ph->p_vaddr); + first_seg = false; + } + obj->mapsize = rtld_round_page(ph->p_vaddr + + ph->p_memsz) - obj->vaddrbase; + break; case PT_GNU_STACK: obj->stack_flags = ph->p_flags; break; From nobody Fri Aug 22 14:35:29 2025 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 4c7jQn6F71z65vjZ; Fri, 22 Aug 2025 14:35:29 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7jQn3Ml8z3GNw; Fri, 22 Aug 2025 14:35:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755873329; 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=k6brm99bH7BEyNlhRJSu5t7il6KLNPL3nU2JoK/Zp2Y=; b=vECTa4KL+JGU/KhalVYcZKumTdQGyrnDZmSFPkXprr7EhDlu9YS4490mpUCkx2dumkkvoL sICgKjNlbGYaYp4iAFtiG9ygD0sYlCjpvTYQ1f4BFs/N/350Oedr4cpDMu0cHkAMz8T4YH 4kTl3VzXnCn7hs6yss+LRU3rD/+SJOz+206vnJM16HcYiMyDXT1B0cYbfwiKXGI98VsvJB tcrYm4AzgvY9r2eZOXmOFmY7XfhJShRezYCSPBzScApwNC+UhCNP8qXq3r2boayrJwWFL/ 0ekGPbGb+DhbAddcmvgl/zUftHQsX+uoCyQZFAp9v+dN18a3YktZbuYrPqvK1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755873329; 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=k6brm99bH7BEyNlhRJSu5t7il6KLNPL3nU2JoK/Zp2Y=; b=mqPxRZ8CqgGhllfhDwhO0tmSCkV22sIJ7qCbu6OiFnkSB5w+zyl2edw8ZD05lrmKgg/AqC SpHPe3C67ndBRqG9Y8MzQyrz/FxNBQvBurYb9gn/GWNlT02blOVjAKxEHd5wBTxD2Z9yhm X1FWhe2aQgpCsZAs6lQzGFIc6+jQfOfluCJgJtn86SJquuwgGVcyJzkCLOKoBTQd7cf9FA 0neIVoy9EJIfcl+keBYoB0H3jrI/Qcl60pVklvbIBF7IT5f/qlE5f/3vCuHZEu0qjoQWi8 73wousueOqnRP+UODDrOtKjOx9NhOx+XTv7+AFrZEmoiWsKjaqFFq0P92v0gKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755873329; a=rsa-sha256; cv=none; b=HRIhJWO6rdbWGkhA5bxsavhXSsUAgf+Ywu8f/8pcsIQ4hvEt6jKRXolh+w/vsIEOG9arcX bHyYJ8lAMLOz5BsqI/dwwiX55yLDgJBVp2rwIqKLFHl6ByLA4U1QQtDu6JDUf9902QABUV U+9DrdjWLWs9hWMMZpmPCDFQOMNB6FE2DyFKwTc0Ymlu+h6SJ9UNQM2+PaNolRPnZnthct v63rLf7wiizGth11E5ho35YjGmhUyEEKPInBVRPCfp3Kw6O34mKJynztcEiTqgI9zbmuPC aKQ9YfqJMectHJKHPw9TjndGw5/xPoP9RpDIYbYthrrezRzJc7DLEGfc9K88uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7jQn2lgJzqRx; Fri, 22 Aug 2025 14:35:29 +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 57MEZTCK016275; Fri, 22 Aug 2025 14:35:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MEZTYM016272; Fri, 22 Aug 2025 14:35:29 GMT (envelope-from git) Date: Fri, 22 Aug 2025 14:35:29 GMT Message-Id: <202508221435.57MEZTYM016272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7d6b5a918a5b - main - rtld: Add UTRACE_LOAD_OBJECT traces for rtld and the main binary 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d6b5a918a5b09ae62a87c331092ffae0fd0fa7b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7d6b5a918a5b09ae62a87c331092ffae0fd0fa7b commit 7d6b5a918a5b09ae62a87c331092ffae0fd0fa7b Author: John Baldwin AuthorDate: 2025-08-22 13:59:22 +0000 Commit: John Baldwin CommitDate: 2025-08-22 13:59:22 +0000 rtld: Add UTRACE_LOAD_OBJECT traces for rtld and the main binary These two objects are loaded by the kernel not rtld, but adding these two traces means that UTRACE_LOAD_OBJECT traces now describe the mappings for all executables and DSOs in a process' address space. Reviewed by: kib Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D52034 --- libexec/rtld-elf/rtld.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index a8a2a0fa5a07..d27af520c21d 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -859,6 +859,10 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) linkmap_add(obj_main); linkmap_add(&obj_rtld); + LD_UTRACE(UTRACE_LOAD_OBJECT, obj_main, obj_main->mapbase, + obj_main->mapsize, 0, obj_main->path); + LD_UTRACE(UTRACE_LOAD_OBJECT, &obj_rtld, obj_rtld.mapbase, + obj_rtld.mapsize, 0, obj_rtld.path); /* Link the main program into the list of objects. */ TAILQ_INSERT_HEAD(&obj_list, obj_main, next); From nobody Fri Aug 22 15:34:53 2025 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 4c7klL1VMwz64VTh; Fri, 22 Aug 2025 15:34:54 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7klK6r9Bz3Td1; Fri, 22 Aug 2025 15:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755876894; 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=O/IC9KwQ/k0x+jL9nd2ZA/iYQgBfyayupFACO1MePTA=; b=oE44jA12o1SWJy/JO4L35XKQLiF9cPfDFQ1rEGgEMMlcgfpKL3BoAWSS17WoJ5MCEOL6VV 4hkLVZG8uWSBDBrMF+KaUVglYNqhX9ltaa9Jiqg6hpVdXM0TJ87FeB6EIvT8RJMAL7YQf9 6GY1/C4B3OriuJzSO2yP7+BVf7c00/fUqNTUVm2KIxHwpvM1RbjaFD+FUd+MOuBARIJHMF Fujow8H8w7ufu3QLyFpqJxCzL3nE65gkg0OCQm9VFoDZXsu7B390SqwQFf5hqreIN1uBuV yaGrRLnob0vxga0j+b4m9hIhofcnD2xJDpZ5WtpyFg4kbXpRDRzdPW0upi9M3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755876894; 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=O/IC9KwQ/k0x+jL9nd2ZA/iYQgBfyayupFACO1MePTA=; b=FXp5TExoT6EHTMakukf3bdtdlCnC7JTGHsDf2EZpq/99u4ZP8hNgvKyOQWfCU0ipF6fKRo JrHCrJjtBR2L6stiG6noYH6hsRh9vWI3cYe5Fh/R9EyR3aXzVJBe80SX3y6vc4j86tSm5B 4ro7XEiYWdTdvCQInUsoESNDaTHVu8W4JTg/xTlC6jpLG3IEigiO1gac2xA4+f1rr5/AM7 5t4YTz+uSC8EQFVeufZ5h+WZ43ZukpfEEB494N2SOvYCljQ+AJqbH6VHwo+oy7/YGJ88tb caM1lbp72z5pUL7HE34BD2ihlu2k1JBgzx/0ZF7A+urIq8lunZ6V3mNFCQA2Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755876894; a=rsa-sha256; cv=none; b=dwzljHcFvghA/T7oXWYp6M7zFNCv82k9+g0Ap1zDBdMrd5IhFUYLCAidV3/WvWin2171YX WVwXk7uPOYEwF9d/la+zzfm0qwMURuSDtrnV0ksrt5JLv/lXNssXgaTxcMCywsIR1T+BUR Q600i84U4TEzn98Y6EDoAdbs2WDuXAbwZZ2YWxvy+WIZgaj6zxt+A4FijNepmAX3bAJNq6 Zx8SUxT1WtGMzVItyOfnbo9s4lhIBstubL+IAgjdnQuNgbf8wrLVjSW+D4MaXlOud/hDk7 FYMLUefxbb4hGO60i9WF1zKNrURH7sK2N/ekwr7qNJnJ/zDW9UUSQqt17SswIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7klK6Ph6zs6t; Fri, 22 Aug 2025 15:34:53 +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 57MFYroZ029096; Fri, 22 Aug 2025 15:34:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MFYrdq029093; Fri, 22 Aug 2025 15:34:53 GMT (envelope-from git) Date: Fri, 22 Aug 2025 15:34:53 GMT Message-Id: <202508221534.57MFYrdq029093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 03221b189a48 - main - certctl: Create output directories 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03221b189a48a509c1bc9adb8331638ae3eac065 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=03221b189a48a509c1bc9adb8331638ae3eac065 commit 03221b189a48a509c1bc9adb8331638ae3eac065 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-22 15:33:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-22 15:33:45 +0000 certctl: Create output directories In a pkgbase world, we cannot assume that these directories exist; we must create them ourselves. Fixes: c340ef28fd38 ("certctl: Reimplement in C") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52121 --- usr.sbin/certctl/certctl.c | 32 ++++++++++++++++++++++++++++---- usr.sbin/certctl/tests/certctl_test.sh | 6 +++--- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/usr.sbin/certctl/certctl.c b/usr.sbin/certctl/certctl.c index ed7f05126ca7..3601f6929fc4 100644 --- a/usr.sbin/certctl/certctl.c +++ b/usr.sbin/certctl/certctl.c @@ -100,6 +100,28 @@ static char *bundle_dest; static FILE *mlf; +/* + * Create a directory and its parents as needed. + */ +static void +mkdirp(const char *dir) +{ + struct stat sb; + const char *sep; + char *parent; + + if (stat(dir, &sb) == 0) + return; + if ((sep = strrchr(dir, '/')) != NULL) { + parent = xasprintf("%.*s", (int)(sep - dir), dir); + mkdirp(parent); + free(parent); + } + info("creating %s", dir); + if (mkdir(dir, 0755) != 0) + err(1, "mkdir %s", dir); +} + /* * Remove duplicate and trailing slashes from a path. */ @@ -685,7 +707,7 @@ save_trusted(void) { int ret; - /* save untrusted certs */ + mkdirp(trusted_dest); ret = write_certs(trusted_dest, &trusted); return (ret); } @@ -700,6 +722,7 @@ save_untrusted(void) { int ret; + mkdirp(untrusted_dest); ret = write_certs(untrusted_dest, &untrusted); return (ret); } @@ -721,6 +744,7 @@ save_bundle(void) } else { dir = xasprintf("%.*s", (int)(sep - bundle_dest), bundle_dest); file = sep + 1; + mkdirp(dir); } ret = write_bundle(dir, file, &trusted); free(dir); @@ -995,17 +1019,17 @@ set_defaults(void) if ((value = getenv("TRUSTDESTDIR")) != NULL || (value = getenv("CERTDESTDIR")) != NULL) - trusted_dest = xstrdup(value); + trusted_dest = normalize_path(value); else trusted_dest = expand_path(TRUSTED_PATH); if ((value = getenv("UNTRUSTDESTDIR")) != NULL) - untrusted_dest = xstrdup(value); + untrusted_dest = normalize_path(value); else untrusted_dest = expand_path(UNTRUSTED_PATH); if ((value = getenv("BUNDLE")) != NULL) - bundle_dest = xstrdup(value); + bundle_dest = normalize_path(value); else bundle_dest = expand_path(BUNDLE_PATH); diff --git a/usr.sbin/certctl/tests/certctl_test.sh b/usr.sbin/certctl/tests/certctl_test.sh index f60bac6ffbb3..74749db0b3f5 100644 --- a/usr.sbin/certctl/tests/certctl_test.sh +++ b/usr.sbin/certctl/tests/certctl_test.sh @@ -76,9 +76,9 @@ certctl_setup() mkdir -p ${DESTDIR}${DISTBASE}/usr/share/certs/untrusted mkdir -p ${DESTDIR}/usr/local/share/certs - # Create output directories - mkdir -p ${DESTDIR}${DISTBASE}/etc/ssl/certs - mkdir -p ${DESTDIR}${DISTBASE}/etc/ssl/untrusted + # Do not create output directories; certctl will take care of it + #mkdir -p ${DESTDIR}${DISTBASE}/etc/ssl/certs + #mkdir -p ${DESTDIR}${DISTBASE}/etc/ssl/untrusted # Generate a random key keyname="testkey" From nobody Fri Aug 22 16:17:43 2025 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 4c7lhl2Ksrz64YlC; Fri, 22 Aug 2025 16:17:43 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7lhl1J6Fz3blb; Fri, 22 Aug 2025 16:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755879463; 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=KNPjbOVa4jVoMMHgdY3yA6zt3LL4hb91BwTVWZAnzJ8=; b=COx6Ckd4967xVHEyIc9QKYElpE/qJT1l2Qo0r9g4Y6JeG8hLPQdotPtaawIPRqpyDSEp+W V75av1eVlMpPqubM7bEPpcB4uMBUgvo5k7lwAkuCuHH1EHNbHt5aCjoOM65IDnvnayhz1G 5ZDJBLhV9H/wUTao1NNjJeiGaaGpjXuJkUcG9SIIM1gk6CHFdjCIfve6oBmIF0uMv4VtpO 6xEhcgwvDKVkGCnwsY4ZUMXCGbpxFo2bR3i3/obICBEpq8B7KWVPQ7sWeKwPz6VypupteG NRsIq2bMvV+JJ/Y1jooNjtzb1O9ikqSzATJXw3WK9HhyXs1tYqc1vNu5FP+org== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755879463; 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=KNPjbOVa4jVoMMHgdY3yA6zt3LL4hb91BwTVWZAnzJ8=; b=mNRiKrWsA6OSSQ66zX8MtA1ALH2H5ElELTKLu+/W2ifM4/pAGZD0Tsny/1f+A3ZHJoGtnr FTv8xtY/kO9lA90aRwtg/6RMZFuXRyO5r8c4zY9I4U8nhg/6y+GG03vxyC5XrHXJhIaVfy KumRAk0hqpwQE7Fq0JrHFx4tBEtFWfqyJowlm0FH3hIeIc0zToSNBCM7JXZxHtYqs7jXki 82yXoDmMpVrwoBmMgSDY77xABKwoz7NgkaIGVC4cMIZMgnSss9Romf/dR/11qvXr6fSQNJ RYr/d/oF6Ut1NguTKhYEUBLhzBRLx/rw0pkhgNrvv+LRBC5jnymVxLrYW06J5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755879463; a=rsa-sha256; cv=none; b=SpXywvPAR7WeDw6AP4tV7vulrZGXfrQnQBF08WEDDLnNScY2+5apgU6znef2RcowePvDvT UgTrmTYcadvXO0dL50/10u8k+uw16JXAjUeKGsy/QSGTRRgGOSkO5pi7okT0CoVNmUZUzx zS5e3f29BHq8aq3btWkR9kOk/p43eOLC6pO1aIKKpsmAgk3lSPoNOEO7JI9LAFXAoaD8Jd B3SZrVI5F5q5NyCbxQ8Fw8r5GM9CncP6YlaLmgSqHT8GZMCTgJMQKpKLG7RULqG/0dZ9Dr YM9j9X4yQesiJeePSbol1HUXwVMSpxTq2NJGNKdbwCn4NeLgXywzILcEKhsCWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7lhl0v7xzsRr; Fri, 22 Aug 2025 16:17:43 +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 57MGHhhY005290; Fri, 22 Aug 2025 16:17:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MGHhuT005287; Fri, 22 Aug 2025 16:17:43 GMT (envelope-from git) Date: Fri, 22 Aug 2025 16:17:43 GMT Message-Id: <202508221617.57MGHhuT005287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6d95b2023e15 - main - BSD.root.mtree: Tag a few empty directories 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d95b2023e15fb212813389a01ce5c826af33335 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6d95b2023e15fb212813389a01ce5c826af33335 commit 6d95b2023e15fb212813389a01ce5c826af33335 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-22 16:17:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-22 16:17:21 +0000 BSD.root.mtree: Tag a few empty directories * /etc/zfs needs to exist for the zfs cache and exports files * /etc/ssl/certs and /etc/ssl/untrusted need to exist for caroot Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D52123 --- etc/mtree/BSD.root.dist | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 1312251cdd9e..5ea99ccbdb89 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -98,16 +98,16 @@ ssh .. ssl - certs + certs tags=package=caroot .. - untrusted + untrusted tags=package=caroot .. .. sysctl.kld.d .. syslog.d .. - zfs + zfs tags=package=zfs compatibility.d .. .. From nobody Fri Aug 22 16:22:36 2025 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 4c7lpN3d1Vz64Yy8; Fri, 22 Aug 2025 16:22:36 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7lpN2wTTz3cp1; Fri, 22 Aug 2025 16:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755879756; 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=pqJKiPMX8pGWPDd8AMySSblqopagF0+Ur7jHAXMUJc0=; b=PWpKrv7QiH7lzv2V9ZjlOjXce7tTrPsA5A2Ztaejead8OitFPzEfEYQ/4IzjYJIN4r2xnt IPxLxmXZfnc1INY/5vAHPVGGV/ap4RcLpAzHfR+WKUKV6ehG+bi1fvi14AcyulT2XHwPZo 5wi+3zb4WKcDRM0IBjzk4Iko40hPeNtNeGSjtbUWTLiaxJIMfnybPk/rxhI4vFVqzfncYk PFyhI9H8qqC1zBGXhsCrLhWhj4xIsCK7Tq51QnfV0ti7hgy1he05uCb6mpuz1DZ0awUyA6 iDfRzJzARIDxGDv0emJTPyy8bP7Fbz70P2c8nW+YcPcj89fflDthMjhj5goStw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755879756; 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=pqJKiPMX8pGWPDd8AMySSblqopagF0+Ur7jHAXMUJc0=; b=tsLUiYEMe46H+fXf3jfRy3qQB3Fa5Lq36zijslW5v59iJXBNA8yGbDiuoL1pqjFlE2bqwv IiaJ8RPgArAQJPKWAw+jC1KbOZSp4eF//yOuNRlWCEzABsvGtziq3ZThjY5qwhm7BPtlWa 7G34a7wc/hMNsO10VE36ctaaZFcxNNNjyfMAgwVX3B2oYKvYK4FOtpxsEYbIFPuwjg7KYI FzkNoclMEDidhmNBPke6iKTZ3jFQmrTUK3GUeKAE+QTmsyQrbus9hLB5oFSzTwnEmNWEsF Z4KPafeOcvIl5g4zH1CW24fU/OJRcq12txzFKIqUcx/cctFQdimC95Wta3ZdBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755879756; a=rsa-sha256; cv=none; b=aSpJrcDySzH2LsWjBLK8xeJx9KNKna5aBj86yfDCEnSc3nBO2hIUSBSNRya2rGtMRVlQv1 rhjWbfrb28zOOt+xMGjPSuECMcwQx8vYiI5Do1lOi5Wsm3nQGCrxNlZhRsjoN+juaWHkVl EFut/NE/mCHnbuNeUdyTV5YrebvE7jcrqZx8Fx9wYVcuLw1kndStFG8Bs60jWG/GA1VGMx Jk+PEH79ibmX/jPWPrjcCg9qMLvY2Bsyjhzg3qwQoR4UDvujRorjvpUX5SQoKU+PILd9bn wD6gawgEts5hO5UFg66RYejz8iwxEDeBetxcqxgtLOKQEeWoya54ae0UFx50kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7lpN2QyNztb4; Fri, 22 Aug 2025 16:22:36 +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 57MGMaJG021832; Fri, 22 Aug 2025 16:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MGMard021829; Fri, 22 Aug 2025 16:22:36 GMT (envelope-from git) Date: Fri, 22 Aug 2025 16:22:36 GMT Message-Id: <202508221622.57MGMard021829@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 72ddb6de1028 - main - unix: increase net.local.(stream|seqpacket).(recv|send)space to 64 KiB 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72ddb6de1028426305df3ab6c81ff3834d5a69e5 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=72ddb6de1028426305df3ab6c81ff3834d5a69e5 commit 72ddb6de1028426305df3ab6c81ff3834d5a69e5 Author: Gleb Smirnoff AuthorDate: 2025-08-22 16:22:25 +0000 Commit: Gleb Smirnoff CommitDate: 2025-08-22 16:22:25 +0000 unix: increase net.local.(stream|seqpacket).(recv|send)space to 64 KiB The limit of 8 KiB comes straight from the 80-ies, when memory sizes were two orders of magnitude less. Microbenchmarking clearly shows that increased maximum buffer size is needed to improve bulk transfer performance over unix(4). Most operating system have larger default sizes. This brings us another reason for increase. A buggy application, that treats a stream socket as a datagram socket, shall work on Linux as long as its messages are smaller than socket buffer size without any issues 99.99% of time. But on FreeBSD it will instantly fail. In the ports system there are already applications that suggest increase of this sysctls for the application to work. We don't want to be a bug catcher for bad applications in the default configuration. Note that buffer size increase will not increase memory usage even on a system with a million unix(4) sockets at normal runtime, as long as applications are written properly and receivers drain their sockets and system has enough CPU time for them to do that. Reviewed by: peter.lei_ieee.org, rscheff, tuexen Differential Revision: https://reviews.freebsd.org/D51903 --- sys/kern/uipc_usrreq.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 0056dac65c7d..19870e989437 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -154,15 +154,12 @@ static struct task unp_defer_task; * and don't really want to reserve the sendspace. Their recvspace should be * large enough for at least one max-size datagram plus address. */ -#ifndef PIPSIZ -#define PIPSIZ 8192 -#endif -static u_long unpst_sendspace = PIPSIZ; -static u_long unpst_recvspace = PIPSIZ; +static u_long unpst_sendspace = 64*1024; +static u_long unpst_recvspace = 64*1024; static u_long unpdg_maxdgram = 8*1024; /* support 8KB syslog msgs */ static u_long unpdg_recvspace = 16*1024; -static u_long unpsp_sendspace = PIPSIZ; -static u_long unpsp_recvspace = PIPSIZ; +static u_long unpsp_sendspace = 64*1024; +static u_long unpsp_recvspace = 64*1024; static SYSCTL_NODE(_net, PF_LOCAL, local, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Local domain"); From nobody Fri Aug 22 16:24:07 2025 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 4c7lr81GVHz64YyD; Fri, 22 Aug 2025 16:24: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7lr80WXRz3d6D; Fri, 22 Aug 2025 16:24:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755879848; 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=5z4lF01nBklpFpwClCuc9IWIQAPdmN5BqHoBRYy4gSw=; b=Jlv44IeSozxTbvW9bUDw0nL9VRfBQTLWyqYsq2/X6AKTNR0qfx5MzuJtSSIT8D7Tir+C/7 bljrYSudhQUy9Ah+pM+MPWUD3punsbuG/lZ8y1Al3QCM4+ApYEZVibBc6/hRo6C1xSYrCe 32OsIbldjatVTaC1Fab6Cgyyd/qislStHlLtE1reLWpPZyQYtH4GYIs5cuV8vAM6IKqFlM 8RUin1GVHZ20Ur2WKHBaKJbIiXU2OfseRqSzGo3hABRnTHxsLo4DeAcEkgQTsv5l/pmDxg MBffVDbiucuMagmTqcsDmSynnS5yvuLno9nWq/AGFK1iuxHYTxHUxtCZ954xuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755879848; 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=5z4lF01nBklpFpwClCuc9IWIQAPdmN5BqHoBRYy4gSw=; b=qzmGHfmNvRQgyHtXkE7ZkK0s4+13GNVUdberjasINscIZ+29b6b9IGkdkZyiZElKrgobxp hc9FxdEFfN3pEbf3UVvFege1xqZ0pfIPOsmpcCIFpZTXL6vwPBu5H/a/zDEfQC70PIOjlW 2Bvs95FR/8gsWYfUVRypCN1KGo++LwVfFiYQjKwYsjOJm7UTZT/ZfKF6icM8v2f0awZNjO ulIn/GWzpc3GtfnulV43H20vrb0LDgpv+fw+Xs5gNV0l7+65fs1bv0IJxMG/oasqGZE6dX DtkQldwrEUuhH12EBAW/re8TGlMswmE6IIOaYkO1qKnhUvZbF4MVHdanQ8BVFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755879848; a=rsa-sha256; cv=none; b=qmbb6ShSUuEo+27GN+zS2kLNkDdDDRZ3SrKIrnrLJ3h1v3+MC9O6mq+GI73jeozFl6XR4s jKxM2dB8csPb2jl+sweIXArzBTI9gu3kWao1yuRGePGkvdADst6ZGWUfzLVxv/TdPviWT0 tgD9pWUXFKA5pYC+8Y+RwJyVecA+44PbjNtNWkJlt92kfZWjVZgcw/X57z73+k70yiIL48 dswENFZmISLha/rp5ZBWWS78RBs19iWfm2j/GZbyiIxQutAqC8v7SkBKfUENcpW3HZsaPo 6/leIqyeD91OKnuJtVKxrjB09daIC9uXqf04ZSyQq5cfzifCizHSFKJc7Lb45w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7lr76s9qztGg; Fri, 22 Aug 2025 16:24: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 57MGO71U022400; Fri, 22 Aug 2025 16:24:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MGO7qu022397; Fri, 22 Aug 2025 16:24:07 GMT (envelope-from git) Date: Fri, 22 Aug 2025 16:24:07 GMT Message-Id: <202508221624.57MGO7qu022397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 554907bac3b2 - main - linux: fix reporting NL_RTM_DELLINK to Netlink 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 554907bac3b264863a051f75eedc35d180d3e18c Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=554907bac3b264863a051f75eedc35d180d3e18c commit 554907bac3b264863a051f75eedc35d180d3e18c Author: Gleb Smirnoff AuthorDate: 2025-08-22 16:23:28 +0000 Commit: Gleb Smirnoff CommitDate: 2025-08-22 16:23:28 +0000 linux: fix reporting NL_RTM_DELLINK to Netlink sockets The problem is that ifname_bsd_to_linux_name() requires the interface to exist. But when we are in the context of ifnet_departure_event EVENTHANDLER(9), it does not. Instead of silently dropping the message, let's send the FreeBSD name verbatim. At the moment special translation is done for IFT_LOOPBACK and IFT_ETHER only, and these two kinds of interfaces usually don't depart. So, this is not a final fix, but definitely an improvement. While here, simplify the associated code. Differential Revision: https://reviews.freebsd.org/D51927 --- sys/compat/linux/linux_netlink.c | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index f51838ee00d7..d414fad375c0 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -241,25 +241,10 @@ nlmsg_copy_nla(const struct nlattr *nla_orig, struct nl_writer *nw) return (false); } -/* - * Translate a FreeBSD interface name to a Linux interface name. - */ -static bool -nlmsg_translate_ifname_nla(struct nlattr *nla, struct nl_writer *nw) -{ - char ifname[LINUX_IFNAMSIZ]; - - if (ifname_bsd_to_linux_name((char *)(nla + 1), ifname, - sizeof(ifname)) <= 0) - return (false); - return (nlattr_add_string(nw, IFLA_IFNAME, ifname)); -} - -#define LINUX_NLA_UNHANDLED -1 /* * Translate a FreeBSD attribute to a Linux attribute. - * Returns LINUX_NLA_UNHANDLED when the attribute is not processed - * and the caller must take care of it, otherwise the result is returned. + * Returns false when the attribute is not processed and the caller must take + * care of it. */ static int nlmsg_translate_all_nla(struct nlmsghdr *hdr, struct nlattr *nla, @@ -271,22 +256,27 @@ nlmsg_translate_all_nla(struct nlmsghdr *hdr, struct nlattr *nla, case NL_RTM_DELLINK: case NL_RTM_GETLINK: switch (nla->nla_type) { - case IFLA_IFNAME: - return (nlmsg_translate_ifname_nla(nla, nw)); + case IFLA_IFNAME: { + char ifname[LINUX_IFNAMSIZ]; + + if (ifname_bsd_to_linux_name((char *)(nla + 1), ifname, + sizeof(ifname)) > 0) + return (true); + break; + } default: break; } default: break; } - return (LINUX_NLA_UNHANDLED); + return (false); } static bool nlmsg_copy_all_nla(struct nlmsghdr *hdr, int raw_hdrlen, struct nl_writer *nw) { struct nlattr *nla; - int ret; int hdrlen = NETLINK_ALIGN(raw_hdrlen); int attrs_len = hdr->nlmsg_len - sizeof(struct nlmsghdr) - hdrlen; @@ -297,15 +287,12 @@ nlmsg_copy_all_nla(struct nlmsghdr *hdr, int raw_hdrlen, struct nl_writer *nw) if (nla->nla_len < sizeof(struct nlattr)) { return (false); } - ret = nlmsg_translate_all_nla(hdr, nla, nw); - if (ret == LINUX_NLA_UNHANDLED) - ret = nlmsg_copy_nla(nla, nw); - if (!ret) + if (!nlmsg_translate_all_nla(hdr, nla, nw) && + !nlmsg_copy_nla(nla, nw)) return (false); } return (true); } -#undef LINUX_NLA_UNHANDLED static unsigned int rtnl_if_flags_to_linux(unsigned int if_flags) From nobody Fri Aug 22 16:24:08 2025 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 4c7lr93RPvz64Yk8; Fri, 22 Aug 2025 16:24:09 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7lr919w1z3d3l; Fri, 22 Aug 2025 16:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755879849; 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=smAdmSzgwyuGnW+LVS9Q1EHjASjOCvmIVpheTVjlQMM=; b=v9XsBLVvIYGTxqzaVXsMylKDYrIahhg5kXxrkWBoisD3GszxHDaUd0/fk0JC8zeHQYL3Tu TFcZJwa3Ec9DdA6VaLZ9+4mRFXJVZ60kuykN45+gLlwV81WurCzPEkDrMU8XtP//g97U+5 J85CulKncT1a1pGG/8GadFzu4U2qKhVTwAi26Xm4tn/QIM7dywph7bWM3Axb3HI6hdGjKu 7vZAnL5cDP1wB39VxKoCA+bvHQ+R+mSB0eEniH7HqbCBZjiiYNKRsm64xqbDlZRAy/mqb0 eVZpsFVnw1wxLbNir90EHVEzeO9VW9HfATeT3pdYzAzCpocPdEIrQTU80z85xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755879849; 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=smAdmSzgwyuGnW+LVS9Q1EHjASjOCvmIVpheTVjlQMM=; b=VcvjOYr5akxvDv/XhYmf57RcMGvyv3+zB3DYsanbw3LuooNutzNv0+xrcQ8itFBCYkNY4t ago18YmzJ3baeu55K57FjqJ1mqqwDTAugEY2pXevqmoPdZfLSalmFZgkaY7b/HOqyOivhE rTmGi3yIRY9kUS/YR8dLgl9/4DHlj1rmT53Ico5ipSZxu4GzNm9pgbaUG28oNaCnZ4DRQN gcOS329DqOifiqo+YzzTvyG8e9rSYHpPzX5NS3TsBWb567WweDrlCpxH5oHZUpfl4XTKnt v2XoFbEgrFATL+JEBy/MUQQ/Nv/CZGD3+6GtZK2iG5G0kaBacSLgl/0YIQ/eag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755879849; a=rsa-sha256; cv=none; b=HwFYHvd55meWI6R8UpuT2GTxQD3Y1Awd3jshDpTuPEI83VA9zlqbP1B8dsBMkDH4rpOWhv aqG+kcZhvoGUWOpAZbSD0r6ob/7dHte3WoET6E6Z1NTb4aHIP17Z8fMxFiFw5i47ezV6FO 1aYp5k4DJOtI2ziBjjH6eq9IJWW1C+5uLW+xQkS2m0xEePvKzAyhIPauVyvqHih+f959H0 GdAw0RRgKbAIYEQ261QhWwfMuy3jd9PVcOAvglXMi02Hcv+R8UYQMJYju6Yy2KYFp+oUV/ MxLp4rY2v1fq2bn/PyVbl2vN5aeH+6p6Av/y9F0Mh+hM0B4qGAxgS5GdPUsNlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7lr90dS0zstY; Fri, 22 Aug 2025 16:24:09 +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 57MGO8mN022432; Fri, 22 Aug 2025 16:24:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MGO8od022429; Fri, 22 Aug 2025 16:24:08 GMT (envelope-from git) Date: Fri, 22 Aug 2025 16:24:08 GMT Message-Id: <202508221624.57MGO8od022429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 0d9ef08e099f - main - netlink: do not pass writer to the Linux translation layer 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d9ef08e099f6837de5a40fd582d9ffb01fd31a4 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0d9ef08e099f6837de5a40fd582d9ffb01fd31a4 commit 0d9ef08e099f6837de5a40fd582d9ffb01fd31a4 Author: Gleb Smirnoff AuthorDate: 2025-08-22 16:23:38 +0000 Commit: Gleb Smirnoff CommitDate: 2025-08-22 16:23:38 +0000 netlink: do not pass writer to the Linux translation layer Another flaw in the KPI between Netlink and Linuxulator is that we pass the on-stack writer structure. This structure belongs to someone, that we can't even identify inside nl_send() and we shall not tamper it. The Linux translation layer needs a writer, because it actually composes a new message. Instead of reusing someone's writer and trying to repair it in all possible cases where translation process tampers the writer, just let Linuxulator use its own writer. See also b977dd1ea5fb. PR: 288892 Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D51928 --- sys/compat/linux/linux_netlink.c | 37 +++++++++++++------------------------ sys/netlink/netlink_io.c | 13 +++++++------ sys/netlink/netlink_linux.h | 2 +- 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index d414fad375c0..927f3689e2b6 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -550,22 +550,15 @@ nlmsg_to_linux(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_writer *nw) } } -static bool -nlmsgs_to_linux(struct nl_writer *nw, struct nlpcb *nlp) +static struct nl_buf * +nlmsgs_to_linux(struct nl_buf *orig, struct nlpcb *nlp) { - struct nl_buf *nb, *orig; - u_int offset, msglen, orig_messages; - - RT_LOG(LOG_DEBUG3, "%p: in %u bytes %u messages", __func__, - nw->buf->datalen, nw->num_messages); + struct nl_writer nw; + u_int offset, msglen; - orig = nw->buf; - nb = nl_buf_alloc(orig->datalen + SCRATCH_BUFFER_SIZE, M_NOWAIT); - if (__predict_false(nb == NULL)) - return (false); - nw->buf = nb; - orig_messages = nw->num_messages; - nw->num_messages = 0; + if (__predict_false(!nl_writer_unicast(&nw, + orig->datalen + SCRATCH_BUFFER_SIZE, nlp, false))) + return (NULL); /* Assume correct headers. Buffer IS mutable */ for (offset = 0; @@ -574,22 +567,18 @@ nlmsgs_to_linux(struct nl_writer *nw, struct nlpcb *nlp) struct nlmsghdr *hdr = (struct nlmsghdr *)&orig->data[offset]; msglen = NLMSG_ALIGN(hdr->nlmsg_len); - if (!nlmsg_to_linux(hdr, nlp, nw)) { + if (!nlmsg_to_linux(hdr, nlp, &nw)) { RT_LOG(LOG_DEBUG, "failed to process msg type %d", hdr->nlmsg_type); - nl_buf_free(nb); - nw->buf = orig; - nw->num_messages = orig_messages; - return (false); + nl_buf_free(nw.buf); + return (NULL); } } - MPASS(nw->num_messages == orig_messages); - MPASS(nw->buf == nb); - nl_buf_free(orig); - RT_LOG(LOG_DEBUG3, "%p: out %u bytes", __func__, offset); + RT_LOG(LOG_DEBUG3, "%p: in %u bytes %u messages", __func__, + nw.buf->datalen, nw.num_messages); - return (true); + return (nw.buf); } static struct linux_netlink_provider linux_netlink_v1 = { diff --git a/sys/netlink/netlink_io.c b/sys/netlink/netlink_io.c index e7908d6f3a44..2391d8ea752c 100644 --- a/sys/netlink/netlink_io.c +++ b/sys/netlink/netlink_io.c @@ -216,16 +216,17 @@ nl_send(struct nl_writer *nw, struct nlpcb *nlp) hdr->nlmsg_len); } - if (nlp->nl_linux && linux_netlink_p != NULL && - __predict_false(!linux_netlink_p->msgs_to_linux(nw, nlp))) { + if (nlp->nl_linux && linux_netlink_p != NULL) { + nb = linux_netlink_p->msgs_to_linux(nw->buf, nlp); nl_buf_free(nw->buf); nw->buf = NULL; - return (false); + if (nb == NULL) + return (false); + } else { + nb = nw->buf; + nw->buf = NULL; } - nb = nw->buf; - nw->buf = NULL; - SOCK_RECVBUF_LOCK(so); if (!nw->ignore_limit && __predict_false(sb->sb_hiwat <= sb->sb_ccc)) { SOCK_RECVBUF_UNLOCK(so); diff --git a/sys/netlink/netlink_linux.h b/sys/netlink/netlink_linux.h index d4c451d470b2..794065692901 100644 --- a/sys/netlink/netlink_linux.h +++ b/sys/netlink/netlink_linux.h @@ -37,7 +37,7 @@ struct nlpcb; struct nl_pstate; struct nl_writer; -typedef bool msgs_to_linux_cb_t(struct nl_writer *nw, struct nlpcb *nlp); +typedef struct nl_buf * msgs_to_linux_cb_t(struct nl_buf *, struct nlpcb *); typedef int msg_from_linux_cb_t(int netlink_family, struct nlmsghdr **hdr, struct nl_pstate *npt); From nobody Fri Aug 22 17:34:17 2025 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 4c7nPQ0gztz64g1Y; Fri, 22 Aug 2025 17:34:34 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (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 4c7nPP2PNFz3qjb; Fri, 22 Aug 2025 17:34:33 +0000 (UTC) (envelope-from asomers@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of asomers@gmail.com designates 209.85.208.52 as permitted sender) smtp.mailfrom=asomers@gmail.com Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-61c325a4da7so207166a12.0; Fri, 22 Aug 2025 10:34:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755884071; x=1756488871; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9jiRuJCsmB8QZ7kIsLIYLB828L6MW6LX3LksydzDmUo=; b=YodM/A7UckJsXL+3eSs9YRJmKQnguVL04WbbUog55YHZyaagOYVYvYscyIkVtIRnAI m+1x3c7YhjljTOGfmFg23AYFYilhZmBZOsiTunfxmxp2tLEdZ2czop6S3xAybjyv1V1v TTuh9XiKELFqVPp/cILeabCzRJWh4XjXsYjY19BoNydeKaigYIcYphPglkOHuhd/mUSH xxzYxdj7w2ENV+C7IpS3BLlh3Aqx2smKNwa9wThM/GocSv0wnxZRGQaM+5P0r1/sTiig Qhp+yjRO7OJtqfd2VGQxIWsJ9Gl48cea+jxr9hQrVybthbY8aWUyx+qeoKK0dsZjbEyS /YmA== X-Forwarded-Encrypted: i=1; AJvYcCV+5LGo2dA9916o3SOV778SWPsOQg4OzvFcVQpNHOlWmW6xy+lK4Kf+73KcoPh+rLGzxsHZmx8ltwH/Z87us54h9OAg@freebsd.org, AJvYcCXCmCvqOdAMrFj3yNTuR2bUEBpw9ObDKUm0ArIOIhq+OfaVmvNgboKlxrL23/6Q7TYAjYyKNsjBk7lJ3NpI85WE+1l4eY4=@freebsd.org X-Gm-Message-State: AOJu0YwvlnLI14qgdkPQXjGGpF39OZ8ger9mfqTqbR2qDiyb3oLoSbNw BaxNacDk1yoM9ThqvNKrWShb74SMvLo0DqLlSjnwYvEUAQWJH6KgWpQKAHkUIu1P6R/FIae2RJc yfrgodu4FEQCf1Q67jm41fRahPfUzEYKx3A== X-Gm-Gg: ASbGncu+k+fYAW5CysLlPxuUsu9Cu20emzXg7Rhyq7QoTMqUWlfeffFq0CkkoEaMMSY VUFaxJ0MRVZc4fg1hZWkl2e0zEEivlCoHXg91SQhGg9K6C9Q3IzB6cboo0CBgzGv28dBv9+B0+1 nxU/HP18Fc++teVddgwOdIkejekYmhDssNf54QyZA7X2QbX//u8UBnpV+H9CywtOP6AS8Jm4EwP IDEa0M= X-Google-Smtp-Source: AGHT+IGBXfKkWz3X2x6CfNtGz325kusvQxf99ZnDXG9whiajfma7/zz6TG51pqfrpxwlivWoAVlfxvFzZ9z1bDlgtas= X-Received: by 2002:a05:6402:a0d4:b0:61a:927b:a7b7 with SMTP id 4fb4d7f45d1cf-61c1b705419mr3111220a12.29.1755884070589; Fri, 22 Aug 2025 10:34:30 -0700 (PDT) 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 References: <202508211558.57LFwLx3062758@gitrepo.freebsd.org> In-Reply-To: <202508211558.57LFwLx3062758@gitrepo.freebsd.org> From: Alan Somers Date: Fri, 22 Aug 2025 11:34:17 -0600 X-Gm-Features: Ac12FXy_zVm9AjbQ4tdOS5Uu5PAhJIsE1k8jyfRBxxQNiazNIZUj3PsRqZdtRQk Message-ID: Subject: Re: git: 61288a578511 - main - zdb: Fix the 32-bit build To: Mark Johnston Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000004b580b063cf79e31" X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.76 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.96)[-0.964]; NEURAL_HAM_MEDIUM(-0.90)[-0.899]; FORGED_SENDER(0.30)[asomers@freebsd.org,asomers@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[asomers@freebsd.org,asomers@gmail.com]; MISSING_XM_UA(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.52:from]; FREEFALL_USER(0.00)[asomers]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.52:from] X-Rspamd-Queue-Id: 4c7nPP2PNFz3qjb --0000000000004b580b063cf79e31 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Aug 21, 2025 at 9:58=E2=80=AFAM Mark Johnston w= rote: > The branch main has been updated by markj: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D61288a5785115ea15556f60bd04d902= 6f47eb43a > > commit 61288a5785115ea15556f60bd04d9026f47eb43a > Author: Mark Johnston > AuthorDate: 2025-08-21 15:33:25 +0000 > Commit: Mark Johnston > CommitDate: 2025-08-21 15:56:23 +0000 > > zdb: Fix the 32-bit build > Are you planning to submit this upstream, or would you like me to? --0000000000004b580b063cf79e31 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Thu, Aug 21, 2025 at 9:58=E2=80=AFAM Mark = Johnston <markj@freebsd.org>= wrote:
The bran= ch main has been updated by markj:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D61288a5785115ea15556f60bd04d9026f47eb43a
commit 61288a5785115ea15556f60bd04d9026f47eb43a
Author:=C2=A0 =C2=A0 =C2=A0Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-08-21 15:33:25 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-08-21 15:56:23 +0000

=C2=A0 =C2=A0 zdb: Fix the 32-bit build

Are you planning to submit this upstream, or would you like me to?=C2=A0
--0000000000004b580b063cf79e31-- From nobody Fri Aug 22 18:43:52 2025 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 4c7pxN4ZjZz64mFX; Fri, 22 Aug 2025 18:43:52 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7pxN49Qrz41DZ; Fri, 22 Aug 2025 18:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755888232; 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=i1f3nOF3aH5xnroVqQdaBI6eg3VdcJulW1+azrCYQKI=; b=GteIfd93aqpQhH010jRKTeBv/r5gfgmtC7ZCptt634WfnoSv6pxYxS6696PDS+EgFat/aB VsVUAtAMxxuksVbh36KEdmteP7HF25g9OQRmLbyIT8YDO2bhJrOrMKEVmr1EZrCdCo1tbP tARS8iQz2+VyLc1W6jGO3pJBJwqLQ8viD/wIdRWQhchtMqYUkCPquIwoFsQplPMd1M61XC bmJWu77q7Io1GqlJa1c64EUafY8CX7vqES0YnCPMtsXQiNkjOK39zmOusi98vCiz3QE8fF CqCoPBfPeHmfsOPtdlDWIIqq0HXIBjzYC6p+y66lD9VLyRhw0pIm3tiTS3pFdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755888232; 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=i1f3nOF3aH5xnroVqQdaBI6eg3VdcJulW1+azrCYQKI=; b=eRRuLedl4bcaWxB2n6eF9rGZU+rWZcB1zHtCxgrr/bLjbkK9WYCjIsSCMUw68mcGV/L7A1 twwEpBuerAmqpROHUFSJg7yQysibraqHgxDQESaSqWPAT3VrzHsNCTgcKKMGFqPt7LRuUU c5uYTbulLyLMbYCmZWEkz6f/rtwIpD6zex7xOY2Kiu6p/jYm0qlCMhyXEs/DG1XM+qRXbL v67OaD0A4IF1dMNcWmIyD1hAeivspTFXfFAC09mGkZg8DlM79k9gMsBYiCyxG35EUb9xTs HcnNy6rwZb61CudZk8l4phBgIKiMdMYXZbin9XhkXA8Hcs8k1vtKsWYGOd2mFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755888232; a=rsa-sha256; cv=none; b=Vzlg270V9sWQ5HdYMXP7g74neVuDUr2fCXnx2xNZd9X9KqF1GFWPJ1YMZSdyiZESYhZvlo sAsDyxR3mzeNbXdrjQ5e5CtJRMpupjlV9NJYgQV3lfXqhw450wNrGfriTzJ5DqJlAMjOTp cn/tkil7/UXAbFoInaXxK0m2BieXvIf7i5sS3Fs53TicQ7gM3I2fnGRjZq1uSF7/Vny6xe PvN8XrX9MSmLt0Q6xnXN/ZI/ajUdkffgvbBpWKvX2ha8513fvBI6mjlugFn2550sOIigLW HNatYO1IRdItI1x8iB+3tEW07u6x9O4mQGtOAKO7abwzrd+FMkpAlch8rRiqxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7pxN3mJMzxv9; Fri, 22 Aug 2025 18:43:52 +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 57MIhqp1083768; Fri, 22 Aug 2025 18:43:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MIhqdW083765; Fri, 22 Aug 2025 18:43:52 GMT (envelope-from git) Date: Fri, 22 Aug 2025 18:43:52 GMT Message-Id: <202508221843.57MIhqdW083765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jes=C3=BAs?= Daniel Colmenares Oviedo Subject: git: ba5df7a2d03c - main - nuageinit: Improvements for nuageinit 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: dtxdf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba5df7a2d03cd5624b1825ca8d4c39dcaace7796 Auto-Submitted: auto-generated The branch main has been updated by dtxdf: URL: https://cgit.FreeBSD.org/src/commit/?id=ba5df7a2d03cd5624b1825ca8d4c39dcaace7796 commit ba5df7a2d03cd5624b1825ca8d4c39dcaace7796 Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2025-08-22 18:14:18 +0000 Commit: Jesús Daniel Colmenares Oviedo CommitDate: 2025-08-22 18:40:36 +0000 nuageinit: Improvements for nuageinit - Fix 'pkg update' usage: - The function 'nuage:run_pkg_cmd(...)' adds the flag '-y', which does not make sense with some commands such as 'pkg update', causing an error when updating the repository catalogs. - Fix typo 'ssh-authorized-keys -> ssh_authorized_keys' in 'nuageinit(7)' man page. - Document 'ssh_authorized_keys' parameter. - Use device configuration ID when no 'match' rule is specified: - This is the default behavior of cloud-init when no match rule is specified, so the device is configured anyway (even if it does not exist). This greatly simplifies things, since in many cases 'if_vtnet(4)' is used, so there is no need to perform a comparison with the MAC address. - Document 'network' parameter: - Add example to 'EXAMPLES' section. - Set 'gateway[46]' only when 'addresses' is specified: - To comply with the cloud-init specification, 'gateway4' and 'gateway6' must only take effect when 'addresses' (or static configuration) is specified. - Use a separate function to check 'match' rules: - This way, we can easily add new logic to new types of rules. - Implement 'network.ethernets.{id}.match.name' parameter: - But unlike cloud-init, which works with glob expressions (although it depends on the network backend), this implementation takes advantage of Lua pattern-matching expressions. Also note that previously we were only concerned with one interface matching, however, to be cloud-init-compliant, we need to configure the matching interfaces (one or more). - Set default router only once. - Implement 'network.ethernets.{id}.wakeonlan' parameter. - Implement 'network.ethernets.{id}.set-name' parameter. - Implement 'network.ethernets.{id}.match.driver' parameter: - Rename 'get_ifaces(...)' function as 'get_ifaces_by_mac(...)'. - Add get_ifaces_by_driver(...) function. - Implement 'network.ethernets.{id}.mtu' parameter. - Implement 'nameservers' parameter. - Use 'resolvconf(8)' to manipulate 'resolv.conf(5)'. - Use 'tzsetup(8)' to set time zone. Reviewed by: bapt@ Approved by: bapt@ Differential Revision: https://reviews.freebsd.org/D51643 --- libexec/nuageinit/nuage.lua | 20 ++- libexec/nuageinit/nuageinit | 238 ++++++++++++++++++++++++++++---- libexec/nuageinit/nuageinit.7 | 92 +++++++++++- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/nuage.sh | 9 ++ libexec/nuageinit/tests/nuageinit.sh | 4 +- libexec/nuageinit/tests/settimezone.lua | 5 + 7 files changed, 335 insertions(+), 34 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 493ae11d6ca7..48f54b120615 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -451,6 +451,23 @@ local function chpasswd(obj) end end +local function settimezone(timezone) + if timezone == nil then + return + end + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + if not root then + root = "/" + end + + f, _, rc = os.execute("tzsetup -s -C " .. root .. " " .. timezone) + + if not f then + warnmsg("Impossible to configure time zone ( rc = " .. rc .. " )") + return + end +end + local function pkg_bootstrap() if os.getenv("NUAGE_RUN_TESTS") then return true @@ -480,7 +497,7 @@ local function install_package(package) end local function run_pkg_cmd(subcmd) - local cmd = "pkg " .. subcmd .. " -y" + local cmd = "env ASSUME_ALWAYS_YES=yes pkg " .. subcmd if os.getenv("NUAGE_RUN_TESTS") then print(cmd) return true @@ -556,6 +573,7 @@ local n = { dirname = dirname, mkdir_p = mkdir_p, sethostname = sethostname, + settimezone = settimezone, adduser = adduser, addgroup = addgroup, addsshkey = addsshkey, diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 0fcdc7274db3..70b27cb33d87 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -46,7 +46,15 @@ local function open_config(name) return openat("/etc/rc.conf.d", name) end -local function get_ifaces() +local function open_resolv_conf() + return openat("/etc", "resolv.conf") +end + +local function open_resolvconf_conf() + return openat("/etc", "resolvconf.conf") +end + +local function get_ifaces_by_mac() local parser = ucl.parser() -- grab ifaces local ns = io.popen("netstat -i --libxo json") @@ -77,6 +85,10 @@ local function sethostname(obj) end end +local function settimezone(obj) + nuage.settimezone(obj.timezone) +end + local function groups(obj) if obj.groups == nil then return end @@ -171,6 +183,59 @@ local function ssh_authorized_keys(obj) end end +local function nameservers(interface, obj) + local resolvconf_conf_handler = open_resolvconf_conf() + + if obj.search then + local with_space = false + + resolvconf_conf_handler:write('search_domains="') + + for _, d in ipairs(obj.search) do + if with_space then + resolvconf_conf_handler:write(" " .. d) + else + resolvconf_conf_handler:write(d) + with_space = true + end + end + + resolvconf_conf_handler:write('"\n') + end + + if obj.addresses then + local with_space = false + + resolvconf_conf_handler:write('name_servers="') + + for _, a in ipairs(obj.addresses) do + if with_space then + resolvconf_conf_handler:write(" " .. a) + else + resolvconf_conf_handler:write(a) + with_space = true + end + end + + resolvconf_conf_handler:write('"\n') + end + + resolvconf_conf_handler:close() + + local resolv_conf = root .. "/etc/resolv.conf" + + resolv_conf_attr = lfs.attributes(resolv_conf) + + if resolv_conf_attr == nil then + resolv_conf_handler = open_resolv_conf() + resolv_conf_handler:close() + end + + if not os.execute("resolvconf -a " .. interface .. " < " .. resolv_conf) then + nuage.warn("Failed to execute resolvconf(8)") + end +end + local function install_packages(packages) if not nuage.pkg_bootstrap() then nuage.warn("Failed to bootstrap pkg, skip installing packages") @@ -187,6 +252,85 @@ local function install_packages(packages) end end +local function list_ifaces() + local proc = io.popen("ifconfig -l") + local raw_ifaces = proc:read("*a") + proc:close() + local ifaces = {} + for i in raw_ifaces:gmatch("[^%s]+") do + table.insert(ifaces, i) + end + return ifaces +end + +local function get_ifaces_by_driver() + local proc = io.popen("ifconfig -D") + local drivers = {} + local last_interface = nil + for line in proc:lines() do + local interface = line:match("^([%S]+): ") + + if interface then + last_interface = interface + end + + local driver = line:match("^[%s]+drivername: ([%S]+)$") + + if driver then + drivers[driver] = last_interface + end + end + proc:close() + + return drivers +end + +local function match_rules(rules) + -- To comply with the cloud-init specification, all rules must match and a table + -- with the matching interfaces must be returned. This changes the way we initially + -- thought about our implementation, since at first we only needed one interface, + -- but cloud-init performs actions on a group of matching interfaces. + local interfaces = {} + if rules.macaddress then + local ifaces = get_ifaces_by_mac() + local interface = ifaces[rules.macaddress] + if not interface then + nuage.warn("not interface matching by MAC address: " .. rules.macaddress) + return + end + interfaces[interface] = 1 + end + if rules.name then + local match = false + for _, i in pairs(list_ifaces()) do + if i:match(rules.name) then + match = true + interfaces[i] = 1 + end + end + if not match then + nuage.warn("not interface matching by name: " .. rules.name) + return + end + end + if rules.driver then + local match = false + local drivers = get_ifaces_by_driver() + for d in pairs(drivers) do + if d:match(rules.driver) then + match = true + interface = drivers[d] + interfaces[interface] = 1 + end + end + if not match then + nuage.warn("not interface matching by driver: " .. rules.driver) + return + end + end + return interfaces +end + local function write_files(files, defer) if not files then return @@ -210,41 +354,76 @@ end local function network_config(obj) if obj.network == nil then return end - local ifaces = get_ifaces() local network = open_config("network") local routing = open_config("routing") local ipv6 = {} - for _, v in pairs(obj.network.ethernets) do - if not v.match then - goto next + local set_defaultrouter = true + local set_defaultrouter6 = true + local set_nameservers = true + for i, v in pairs(obj.network.ethernets) do + local interfaces = {} + if v.match then + interfaces = match_rules(v.match) + + if next(interfaces) == nil then + goto next + end + else + interfaces[i] = 1 end - if not v.match.macaddress then - goto next + local extra_opts = "" + if v.wakeonlan then + extra_opts = extra_opts .. " wol" end - if not ifaces[v.match.macaddress] then - nuage.warn("not interface matching: " .. v.match.macaddress) - goto next + if v.mtu then + if type(v.mtu) == "number" then + mtu = tostring(v.mtu) + else + mtu = v.mtu + end + if mtu:match("%d") then + extra_opts = extra_opts .. " mtu " .. mtu + else + nuage.warn("MTU is not set because the specified value is invalid: " .. mtu) + end end - local interface = ifaces[v.match.macaddress] - if v.dhcp4 then - network:write("ifconfig_" .. interface .. '="DHCP"\n') - elseif v.addresses then - for _, a in pairs(v.addresses) do - if a:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)") then - network:write("ifconfig_" .. interface .. '="inet ' .. a .. '"\n') - else - network:write("ifconfig_" .. interface .. '_ipv6="inet6 ' .. a .. '"\n') - ipv6[#ipv6 + 1] = interface + for interface in pairs(interfaces) do + if v.match and v.match.macaddress and v["set-name"] then + local ifaces = get_ifaces_by_mac() + local matched = ifaces[v.match.macaddress] + if matched and matched == interface then + network:write("ifconfig_" .. interface .. '_name=' .. v["set-name"] .. '\n') + interface = v["set-name"] + end + end + if v.dhcp4 then + network:write("ifconfig_" .. interface .. '="DHCP"' .. extra_opts .. '\n') + elseif v.addresses then + for _, a in pairs(v.addresses) do + if a:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)") then + network:write("ifconfig_" .. interface .. '="inet ' .. a .. extra_opts .. '"\n') + else + network:write("ifconfig_" .. interface .. '_ipv6="inet6 ' .. a .. extra_opts .. '"\n') + ipv6[#ipv6 + 1] = interface + end + end + if set_nameservers and v.nameservers then + set_nameservers = false + nameservers(interface, v.nameservers) + end + if set_defaultrouter and v.gateway4 then + set_defaultrouter = false + routing:write('defaultrouter="' .. v.gateway4 .. '"\n') + end + if v.gateway6 then + if set_defaultrouter6 then + set_defaultrouter6 = false + routing:write('ipv6_defaultrouter="' .. v.gateway6 .. '"\n') + end + routing:write("ipv6_route_" .. interface .. '="' .. v.gateway6) + routing:write(" -prefixlen 128 -interface " .. interface .. '"\n') end end - end - if v.gateway4 then - routing:write('defaultrouter="' .. v.gateway4 .. '"\n') - end - if v.gateway6 then - routing:write('ipv6_defaultrouter="' .. v.gateway6 .. '"\n') - routing:write("ipv6_route_" .. interface .. '="' .. v.gateway6) - routing:write(" -prefixlen 128 -interface " .. interface .. '"\n') end ::next:: end @@ -316,7 +495,7 @@ local function config2_network(p) end local obj = parser:get_object() - local ifaces = get_ifaces() + local ifaces = get_ifaces_by_mac() if not ifaces then nuage.warn("no network interfaces found") return @@ -468,6 +647,7 @@ f:close() if line == "#cloud-config" then local pre_network_calls = { sethostname, + settimezone, groups, create_default_user, ssh_keys, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 327ce160e151..604d8a2221ca 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -143,6 +143,11 @@ Specify a fully qualified domain name for the instance. Specify the hostname of the instance if .Qq Ic fqdn is not set. +.It Ic timezone +Sets the system timezone based on the value provided. +.Pp +See also +.Xr tzfile 3 Ns . .It Ic groups An array of strings or objects to be created: .Bl -bullet @@ -176,6 +181,81 @@ boolean which determines the value of the configuration in .Pa /etc/ssh/sshd_config .It Ic network +Network configuration parameters. +.Bl -tag -width "ethernets" +.It Ic ethernets +Mapping representing a generic configuration for existing network interfaces. +.Pp +Each key is an interface name that is only used when no +.Sy match +rule is specified. +If +.Sy match +rules are specified, an arbitrary name can be used +.Po e.g.: id0 Pc Ns . +.Bl -tag -width "nameservers" +.It Ic match +This selects a subset of available physical devices by various hardware properties. +The following configuration will then apply to all matching devices, as soon as +they appear. All specified properties must match. The following properties for +creating matches are supported: +.Bl -tag -width "macaddress" +.It Ic macaddress +.No Device's MAC address in the form Sy xx:xx:xx:xx:xx:xx Ns . +Letters should be lowercase. +.It Ic name +Current interface name. Lua pattern-matching expressions are supported. +.It Ic driver +Interface driver name and unit number of the interface. Lua pattern-natching expressions +are supported. +.El +.It Ic set-name +When matching on unique properties such as MAC, match rules can be written so that they +match only one device. Then this property can be used to give that device a more +specific/desirable/nicer name than the default. +.Pp +While multiple properties can be used in a match, +.Sy macaddress +is required for nuageinit to perform the rename. +.It Ic mtu +The MTU key represents a device's Maximum Transmission Unit, the largest size packet +or frame. +.It Ic wakeonlan +Enable wake on LAN. Off by default. +.It Ic dhcp4 +Configure the interface to use DHCP. +.Pp +This takes precedence over +.Sy addresses +when both are specified. +.It Ic addresses +List of strings representing IPv4 or IPv6 addresses. +.It Ic gateway4 +Set default gateway for IPv4, for manual address configuration. This requires setting +.Sy addresses +too. +.Pp +Since only one default router can be configured at a time, this parameter is applied +when processing the first entry, and any others are silently ignored. +.It Ic gateway6 +Set default gateway for IPv6, for manual address configuration. This requires setting +.Sy addresses +too. +.Pp +Since only one default router can be configured at a time, this parameter is applied +when processing the first entry, and any others are silently ignored. +.It Ic nameservers +Set DNS servers and search domains, for manual address configuration. +.Pp +There are two supported fields: +.Bl -tag -width "addresses" +.It Ic search +Search list for host-name lookup. +.It Ic addresses +List of IPv4 or IPv6 name server addresses that the resolver should query. +.El +.El +.El .It Ic runcmd An array of commands to be run at the end of the boot process .It Ic packages @@ -186,7 +266,7 @@ Update the remote package metadata. Upgrade the packages installed to their latest version. .It Ic users Specify a list of users to be created: -.Bl -tag -width "plain_text_passwd" +.Bl -tag -width "ssh_authorized_keys" .It Ic name Name of the user. .It Ic gecos @@ -201,6 +281,8 @@ The list of other groups the user should belong to. A boolean which determines if the home directory should be created or not. .It Ic shell The shell that should be used for the user. +.It Ic ssh_authorized_keys +List of SSH keys for the user. .It Ic passwd The encrypted password for the user. .It Ic plain_text_passwd @@ -287,7 +369,7 @@ users: - name: user gecos: Foo B. Bar sudo: ALL=(ALL) NOPASSWD:ALL - ssh-authorized-keys: + ssh_authorized_keys: - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAr... packages: - neovim @@ -303,6 +385,12 @@ ssh_keys: ... -----END OPENSSH PRIVATE KEY----- ed25519_public: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK+MH4E8KO32N5CXRvXVqvyZVl0+6ue4DobdhU0FqFd+ +network: + ethernets: + vtnet0: + addresses: + - 192.168.8.2/24 + gateway4: 192.168.8.1 .Ed .Sh SEE ALSO .Xr kenv 2 , diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index c69bc28a4c86..dc8997717b59 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -15,6 +15,7 @@ ${PACKAGE}FILES+= adduser_passwd.lua ${PACKAGE}FILES+= dirname.lua ${PACKAGE}FILES+= err.lua ${PACKAGE}FILES+= sethostname.lua +${PACKAGE}FILES+= settimezone.lua ${PACKAGE}FILES+= warn.lua ${PACKAGE}FILES+= addfile.lua diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 56651c8c5bb7..b709d25532ff 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -7,12 +7,21 @@ export NUAGE_FAKE_ROOTDIR="$PWD" atf_test_case sethostname +atf_test_case settimezone atf_test_case addsshkey atf_test_case adduser atf_test_case adduser_passwd atf_test_case addgroup atf_test_case addfile +settimezone_body() +{ + atf_check /usr/libexec/flua $(atf_get_srcdir)/settimezone.lua + if [ ! -f etc/localtime ]; then + atf_fail "localtime not written" + fi +} + sethostname_body() { atf_check /usr/libexec/flua $(atf_get_srcdir)/sethostname.lua diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 849f1c258b62..98593f7d75b0 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -815,7 +815,7 @@ config2_userdata_update_packages_body() package_update: true EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg update -y\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"env ASSUME_ALWAYS_YES=yes pkg update\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } config2_userdata_upgrade_packages_body() @@ -829,7 +829,7 @@ config2_userdata_upgrade_packages_body() package_upgrade: true EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg upgrade -y\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"env ASSUME_ALWAYS_YES=yes pkg upgrade\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } config2_userdata_shebang_body() diff --git a/libexec/nuageinit/tests/settimezone.lua b/libexec/nuageinit/tests/settimezone.lua new file mode 100644 index 000000000000..a8cacf09f4e7 --- /dev/null +++ b/libexec/nuageinit/tests/settimezone.lua @@ -0,0 +1,5 @@ +#!/usr/libexec/flua + +local n = require("nuage") + +n.settimezone("UTC") From nobody Fri Aug 22 18:57:55 2025 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 4c7qFb3Z1Lz64nDT; Fri, 22 Aug 2025 18:57:55 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7qFb2dTNz43kF; Fri, 22 Aug 2025 18:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755889075; 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=8sWXo4U39FHIZSLbAWHeG29S98aBa5wyXlX7JFSu/PQ=; b=LnSEuOIDHJQ3lCFZgs4Ox+ODxacXEUnigur/aXQN4vb2Fuqk3Jgr4jKtbfby8S/8t1LLyA VgPEq0dCVNDtyJ6UcZuzmD8hS6Fb8r7Dak69kw3r25DA0CZv3MkOR9g6vLf/oHC0cxeNi1 FJcpvx1QYSXJEKuRvsDEeuAZG2zauz1TFwO5UTgGn8D6kegTA/nmAQ2fDaR6DUiuEBcE4W j44mCPqbzEVIB6IsATVm+uIi8LhaACf1iNy9MFTv3mEPgcp/+qMasm/LumYJ+SXhyV4q22 ByjKEUk2MpGK7jjRppo2+Xyat3mvsJDx+jlPhcVFL3GMWaBQZntEaM/3lV9wYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755889075; 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=8sWXo4U39FHIZSLbAWHeG29S98aBa5wyXlX7JFSu/PQ=; b=sUNkCl4p1o+qmjNX57MBCOMsA7iuUu4BAmWX6vVNGgnzg2BlqwkzdlTnu7qfOS9Gho9riv NQJCJE8ThpWsJbYeTKmWsvjWn+0ZNlPQ187Xv7nmR81pS2ZfKe0BhS26ykuO5OnIgGBFWv 7hsShF1xl8ay8c/DpckALjxuJSXfoldfPeKDPe/m+BHYo+IzXi/hJJBzZm+49ZNEGlR7Kg xwN5seLWJaqvukKA1m7fPvu48XlAHSVXH7Bulk2F8Ka/xPMkDcYlDtXZ4wY7bUZBOoaxB2 nNd/lN1nNK6CX8469p6dwF46qOvLnhBas6Kw1XwEmMEsUtXpA2M0HEaLdmOG3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755889075; a=rsa-sha256; cv=none; b=bDvT0yey/OvchqU+qFNJJctdVzCTF4Yr2Rial/0xuht8v20JeYHJXaSBu3ZcnmhQKsD5ly lPNEvTpwWCtQiJQdShqzowqwpStzog3T8wjm6l4einCdOVBl5F/WEzuPp1CkK3fs/mE8MZ frRfni8NLiMpaGMQ6/sIeFgeejcckLJOaYZNObfXaRmaJxjUfxeIuIRIbt0G9P4GPx2/Xl gTXWvbTIJklTlvd+2SiWfdk/VvVMJES0CquvIGVP8VZr0rWjWrSdqMS+WqIjdbGtskiV1k 9ovJ1FGkRn/7SuzA6TBQsjFvwM6EiqvOrfJFhI4ROWuwuP0P4Shh/LN3dMqVGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7qFb28dQzxvr; Fri, 22 Aug 2025 18:57:55 +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 57MIvtwm003755; Fri, 22 Aug 2025 18:57:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MIvtUd003752; Fri, 22 Aug 2025 18:57:55 GMT (envelope-from git) Date: Fri, 22 Aug 2025 18:57:55 GMT Message-Id: <202508221857.57MIvtUd003752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 95b0be1118b1 - main - nuageinit.7: grammar fixes 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: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95b0be1118b1a24ceb1b59ecd936aaa155d828bd Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=95b0be1118b1a24ceb1b59ecd936aaa155d828bd commit 95b0be1118b1a24ceb1b59ecd936aaa155d828bd Author: Maxim Konovalov AuthorDate: 2025-08-22 18:57:03 +0000 Commit: Maxim Konovalov CommitDate: 2025-08-22 18:57:03 +0000 nuageinit.7: grammar fixes --- libexec/nuageinit/nuageinit.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 604d8a2221ca..9f91c791c908 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -293,7 +293,7 @@ The list of other groups the user should belong to. .It Ic locked Boolean to determine if the user account should be locked. .It Ic sudo -A string or an array of strings which which should be appended to +A string or an array of strings which should be appended to .Pa /usr/local/etc/sudoers.d/90-nuageinit-users .El .Pp @@ -333,7 +333,7 @@ It accepts the following keys for each objects: The content to be written to the file. If this key is not existing then an empty file will be created. .It Ic encoding -Specifiy the encoding used for content. +Specify the encoding used for content. If not specified, then plain text is considered. Only .Ar b64 From nobody Fri Aug 22 19:09:47 2025 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 4c7qWH6VVjz64ns4; Fri, 22 Aug 2025 19:09:47 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7qWH5YLLz46WP; Fri, 22 Aug 2025 19:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755889787; 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=AERO0A5tKN77YW55KxLpsQ9jOkBiP9Ok9MqBiOoz8+8=; b=AuLotfPO4tk9c9AmTCghgEmdsRF/6788A6W6jAA2SKpLFa3yMyslOYQe+HGK7ZgPmKjz4W kOY9HNh/y8gmCi3veHGxhbHBPrZDOIxtYnBXx+svju15gVgihajxBsVKhdDNMyc4AubcJV d23l1kyKyHEh2yELxI+ghH42RQej38Lc0gFi1P1Dww1ygGziSKxnYPUU8ZdWG2/qHbOeoA +rDgeuOPdOxtJDSc4UJUbtlxWZhLvgfkhKScUsGulQtlFssTVFn6e2A6XohZ6EJU47VVSx yEi/zqxIZ5Hj0iKAXlPU6uCvkY692OpiOVcY1piD6IpMw+62/Ow4uI8tpEV2iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755889787; 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=AERO0A5tKN77YW55KxLpsQ9jOkBiP9Ok9MqBiOoz8+8=; b=BuwzO/XNmLwsSusjOGKHe/qu4ZsA4hi8PdE7Lwl/Ddu5Ng6cEIHkWT+aYl9s8em39I7MOv sewRJRJZiLHP+NA1L4Rb4DO11QVtR5AA9rXBR9CIYg218NLUTSBT8trJ9kVXb26M3uvgPk fTBGZT6FmJ4ekLorWS2bSYPTj2FO/itiGJvDOO/OsAE3NZKiRXCASY61xg0rkGqqH8GlA5 vl7OQgrlE80R91X+3pnAzffCV5Tq7TsfYurWOaXkvhEQDjoZC8YMO/C/6+/s2D1eXu4RXb zb+0NubbZqFfX+yUtnMcrcSV3R/lSKoMCRdpVRv8NQR/uacQmAbbE55Uqv/nBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755889787; a=rsa-sha256; cv=none; b=veu0WLcrG8BqYV7MeXq3gEgSDUv8nGSD6cC1EvOC3jt38lEoLnXrPAlU0G5nHdfZiLibvP uZe4zDYTn4XPWPaNHtT1N85QG4BiVh1g4XemZw0mjyTiolXWhwxXBr4bigXO2SxDZS0KEU CU5fO4Jf6L7QGt6zr4qtEMBpfX8jvF4Z7V+6KAf74pqeMHPxxPZtfTOk+5XqVo1p+SDI9D cdVdeBorSGEefSaHI2OOdKYDLAdEsAtCb/0HnZi0id2Y7cY0JODvuI/GqUbhUKnxIfcwj1 hzC5g3kiB+dlVoSagY4ZJkqg1K6JklwfkdlbATvbf22JvgcBaeeeKyohZAnRwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7qWH595PzyPL; Fri, 22 Aug 2025 19:09:47 +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 57MJ9l9s023435; Fri, 22 Aug 2025 19:09:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MJ9lOG023432; Fri, 22 Aug 2025 19:09:47 GMT (envelope-from git) Date: Fri, 22 Aug 2025 19:09:47 GMT Message-Id: <202508221909.57MJ9lOG023432@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: a7f19968ae5d - main - nuageinit.7: put each sentence on a new line 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: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7f19968ae5d5e7e5feba85d04698050fcaf784f Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=a7f19968ae5d5e7e5feba85d04698050fcaf784f commit a7f19968ae5d5e7e5feba85d04698050fcaf784f Author: Maxim Konovalov AuthorDate: 2025-08-22 19:06:45 +0000 Commit: Maxim Konovalov CommitDate: 2025-08-22 19:06:45 +0000 nuageinit.7: put each sentence on a new line --- libexec/nuageinit/nuageinit.7 | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 9f91c791c908..f27b8bc06042 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -197,21 +197,26 @@ rules are specified, an arbitrary name can be used .It Ic match This selects a subset of available physical devices by various hardware properties. The following configuration will then apply to all matching devices, as soon as -they appear. All specified properties must match. The following properties for +they appear. +All specified properties must match. +The following properties for creating matches are supported: .Bl -tag -width "macaddress" .It Ic macaddress .No Device's MAC address in the form Sy xx:xx:xx:xx:xx:xx Ns . Letters should be lowercase. .It Ic name -Current interface name. Lua pattern-matching expressions are supported. +Current interface name. +Lua pattern-matching expressions are supported. .It Ic driver -Interface driver name and unit number of the interface. Lua pattern-natching expressions +Interface driver name and unit number of the interface. +Lua pattern-natching expressions are supported. .El .It Ic set-name When matching on unique properties such as MAC, match rules can be written so that they -match only one device. Then this property can be used to give that device a more +match only one device. +Then this property can be used to give that device a more specific/desirable/nicer name than the default. .Pp While multiple properties can be used in a match, @@ -221,7 +226,8 @@ is required for nuageinit to perform the rename. The MTU key represents a device's Maximum Transmission Unit, the largest size packet or frame. .It Ic wakeonlan -Enable wake on LAN. Off by default. +Enable wake on LAN. +Off by default. .It Ic dhcp4 Configure the interface to use DHCP. .Pp @@ -231,14 +237,16 @@ when both are specified. .It Ic addresses List of strings representing IPv4 or IPv6 addresses. .It Ic gateway4 -Set default gateway for IPv4, for manual address configuration. This requires setting +Set default gateway for IPv4, for manual address configuration. +This requires setting .Sy addresses too. .Pp Since only one default router can be configured at a time, this parameter is applied when processing the first entry, and any others are silently ignored. .It Ic gateway6 -Set default gateway for IPv6, for manual address configuration. This requires setting +Set default gateway for IPv6, for manual address configuration. +This requires setting .Sy addresses too. .Pp From nobody Fri Aug 22 19:59:51 2025 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 4c7rdF3ms6z64sVN; Fri, 22 Aug 2025 20:00:01 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 4c7rdF1sskz4KNL; Fri, 22 Aug 2025 20:00:01 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qv1-xf2a.google.com with SMTP id 6a1803df08f44-70d9f5bdf63so6258856d6.0; Fri, 22 Aug 2025 13:00:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755892795; x=1756497595; darn=freebsd.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :from:to:cc:subject:date:message-id:reply-to; bh=ghq5sv0wBRpaasD6PGAERXflc4YgoFLcnSgucz1B4V0=; b=AB7gSIH/e+bSRYGFBKLyxL9kZ0G84K2fCdWT2oXoTo1kmkvO8kSwEnWfam2ppNuEpy 676i+3MAhQOIWBlox7uoAKiK9lvtf8RHoyxyZ4cD420HMWl8Fq/l342GRqAfwVFdetWl JBY4c3AjHLMn4ywWTyPi3ilSDRlilp7/JMMWtt7A+TOLDy6iPqFdjQADIg50gb2WVSWM gTtui/89fTD8zAAeWy0dxjitt0FUraJv+g5DCtf6gSXNp9l0lj8oSmzoK+IAM61oM/Xx EPYD6l8DGkS352gMXa4WIEEhmY5/Y516WOLG5i7dIY3F8iGtJPAesu+wZHcyP3wpejm+ MACA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755892795; x=1756497595; h=in-reply-to:content-transfer-encoding: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=ghq5sv0wBRpaasD6PGAERXflc4YgoFLcnSgucz1B4V0=; b=VECz1A/5tKBCbPIjmMEn94IWvsLd/Rq+2yy/hrWKkmMwEqm4MptejREjZ9VNNTXzRj Ua9H1NTOywPTKO8KUs3Grs6OkrlMAXDaH9f0Vv3GCyIe10PxOKYXcQpzqtep07WOdkRX +6pxpeFsKmEClYr+YansYR/qrBTPt8Jrnkxr9fr6PiroTOViZ/5CbaDgD1sOtZt7k/Qm 3RZkl/MKlS+Z2cELZTC6BazdqWucFOVMtFvzMh9J7AfUyXVV16HROL//hE5UVfCTFsnZ 8TCZlFQKS7uNcvwuOUPL/zJpyk4mBXmfCHBCIDoait0MAWsNHmN9bjXNkSTTkNIaqwfB OdMA== X-Forwarded-Encrypted: i=1; AJvYcCU0mwNsoW5aF5sTT3Rjm8IIz98dOYKl/VDrsy/5KWpOEwJrUVBW/O9k53bczRMTUWBNOgg/0hkoS+nOdYnDnxsEsI58@freebsd.org, AJvYcCXTc5PzbfNgBsq+HJCEjMuCGpnSqVRnw35sDVofjOQQesMuh89HPUMSVJd+YTkB7DBd1wLedpEyg22lnxUAfzMmonqsRU0=@freebsd.org X-Gm-Message-State: AOJu0YyhbMVNQyauyNEWK1NbtYlNPQL3dn3mKu4kXrOese4i9GgSrV2s 737NFyK7kVgYJLEx1Xl+1bldLHdEvPTOW6yR7kzLw/v6WgEg4cFf6PuShF7N0nsV X-Gm-Gg: ASbGncsEdKimJ27a5ueHAaZvtyPUqORIR6TQohoeydu0DhLYjtdXn+3IseZd9kzLL8d Vev7F4r2/VdkwZU6FJcU5hEYQpVapGM5nu0MTiCy22lHPePi/2ccA3/cPEuX5F4eqPyid0lQXCr aeOkXBIxl1zlftLWUj/EhaZSdCxFnhIod5+qs2kNnhfP92YgAYSoDoAy8/RGbgFegJ2X9RmbHx7 ABR3ogGhSU5ZBJtss2bkg+KpbLdDkzUv4UilVQZVeUuBJ4TVP7dIPnWyY0poaeR/sFhNw/bdzLr BpSHTS9I8TT/4W/X6DJnnBDzYmAFNhNOxLdmDHUcKRwXfi9A/PfJ0mV1MCkVOWuchAmxvrwBO7o sC0nW3oJT2hgVLo37evGA19NlAvUUh4l562Sv X-Google-Smtp-Source: AGHT+IEEVCcXO281g/fGe0HDbmsNS+CppPY4tnUbh9vSlFLiX6PGOfGaYQNyBvbUIYT79j89I91Log== X-Received: by 2002:ad4:5ecf:0:b0:70b:a280:208e with SMTP id 6a1803df08f44-70d972f8f45mr54174276d6.34.1755892794911; Fri, 22 Aug 2025 12:59:54 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-70da717edf6sm4482986d6.32.2025.08.22.12.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 12:59:54 -0700 (PDT) Date: Fri, 22 Aug 2025 15:59:51 -0400 From: Mark Johnston To: Alan Somers Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 61288a578511 - main - zdb: Fix the 32-bit build Message-ID: References: <202508211558.57LFwLx3062758@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=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spamd-Bar: ---- 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-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c7rdF1sskz4KNL On Fri, Aug 22, 2025 at 11:34:17AM -0600, Alan Somers wrote: > On Thu, Aug 21, 2025 at 9:58 AM Mark Johnston wrote: > > > The branch main has been updated by markj: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=61288a5785115ea15556f60bd04d9026f47eb43a > > > > commit 61288a5785115ea15556f60bd04d9026f47eb43a > > Author: Mark Johnston > > AuthorDate: 2025-08-21 15:33:25 +0000 > > Commit: Mark Johnston > > CommitDate: 2025-08-21 15:56:23 +0000 > > > > zdb: Fix the 32-bit build > > > > Are you planning to submit this upstream, or would you like me to? I've submitted the change: https://github.com/openzfs/zfs/pull/17665 From nobody Fri Aug 22 20:13:46 2025 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 4c7rx7024fz64tPw; Fri, 22 Aug 2025 20:13:47 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7rx66QQ9z4NGw; Fri, 22 Aug 2025 20:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755893626; 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=fdOuIB5P8NxTG0tdi4mA0lZqXF3oLRUuA02TUPVkVfc=; b=F+lwiVK18QIYqdjFbIbOeVv5xhVR4MFiRtHZTiqjlSX8oEVGmdb0x4uAfRWToqImYSIK41 KHdN8QV8wrE4wxTcGFArG2mPgiyJ51TXHmncXyS07L4EGZtH66MIm1Q1vLFV348eSTs5qU NLNTZcgHc51+F3/ilciLeAwOOiA6W0hJmifI3wQYs9KxiQYLSY262GONuKlfDudS0TQmoc ogjqw/Q6tAFurNI/eLLNI8umvynnSbQs4RNYIKC3QS8NEyMrJwmbiJDGM7bEFgbYE2Lnzk HQRZ23IgU2JUi3tOba2m8HJUDwle7jSqV9Fut9l15jzX06whacaxzACbYfOmdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755893626; 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=fdOuIB5P8NxTG0tdi4mA0lZqXF3oLRUuA02TUPVkVfc=; b=ScI6F4fFjKneaIklJiQ9Azbko0vbVi4leJi2AQadrUYfEFXsql/cAbMYfoaKSfCDeZZJCO 8D/y7+KIVgs/6ikvXuCDTqIdR8pwW4mPMioJHa+y3/3Ghss8BpTE3wFDLZLo/cIVa+H99H BNqHoAilRycRsdMGchI2ZC1xN7U7pZrZ5gQDAQbosaWm+95fXheOTufMdLnyLn+ID5m+AM c9G5nLVsEl4oOu0+Oe3I+GdTQ6XK3sScmpfH10FJUp3N2o7TtBgfm+MG6+eRtml12vQEvK HwYZEN//IjfcSheiLx3wT3CU1DYFXy5itwuib/DhCKgGIH8bU29N3aXUpv+JoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755893626; a=rsa-sha256; cv=none; b=ijXp+QKuV3Lgs2IP16VC05LAX5MGw0BiuWpmF+gc10Ln7Ye4Jy1xtwoLlbVg5p/5y53pFe B72HxBKqDPL1xsN8Kwqx5EDYmoY5sgcGCFC6PwVhOKCp1Tu8lq1GYg2ELE7vEVQk1iOHcc nGCcEzKx07uiRfBrFi/TH4C26CERx6acJAF3XsnUzCdUUcrU3ycINNalM4Cg4K/TWbsalu 1sNkkwbnhBi7MZfngYz9Ik5PMXUQ9Zj4aqJy4M91qJGRVlLG2Z/aFgzYEb34EfvaJMhtPo 99TgSoXpnSbWqCVCI25HMGqYwvty7FacNCYjIP4dVkUaF8aW+L7fhSHZjAYPDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7rx65qnCz11Nh; Fri, 22 Aug 2025 20:13:46 +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 57MKDk9U052787; Fri, 22 Aug 2025 20:13:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MKDkNk052784; Fri, 22 Aug 2025 20:13:46 GMT (envelope-from git) Date: Fri, 22 Aug 2025 20:13:46 GMT Message-Id: <202508222013.57MKDkNk052784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 9187f64a7469 - main - watch.8: Align option list 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9187f64a74698736a5686971b3cfbcb226cb098c Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=9187f64a74698736a5686971b3cfbcb226cb098c commit 9187f64a74698736a5686971b3cfbcb226cb098c Author: Alexander Ziaee AuthorDate: 2025-08-22 20:12:43 +0000 Commit: Alexander Ziaee CommitDate: 2025-08-22 20:13:15 +0000 watch.8: Align option list --- usr.sbin/watch/watch.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8 index 7acd79df8710..3cc72267f207 100644 --- a/usr.sbin/watch/watch.8 +++ b/usr.sbin/watch/watch.8 @@ -28,7 +28,7 @@ The utility writes to standard output. .Pp The options are as follows: -.Bl -tag -width indent +.Bl -tag -width "-f snpdev" .It Fl c Reconnect on close. If the tty observed by From nobody Fri Aug 22 20:27:14 2025 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 4c7sDg10HXz64vKm; Fri, 22 Aug 2025 20:27:15 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7sDf5r5xz4PFl; Fri, 22 Aug 2025 20:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755894434; 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=ZpQtE1SPMo9q6PdnhihU02tPmOenZBiH4pd1PpEfAGo=; b=bhoFdju8VxnSZrqyWy9KtyzhLfazKRHjd9UKvfCyGK9M7QFT5oTvgzgNzoz8dqNqUfTKMM 2re6+2hQDr9Riv6mwvgHVXH96l+XzpBFfA9NO8FG/WFDNGy9AvHyB0p67sSPM5eGqe/UI6 VWD+f71wNE6F1ioK7mn2Bsht4Zi7VTdKIASJGRHCI3lqORPzwP++yBafuZjr+MUgYSe0IV U6OOmNhdCEZRvsbQWoxy/iH5bNAbLfBwzunScTefw5rOJWof/4ml5VifUwJpFz5wF0epgX /gWOMLNhJ1lwjBmJLpvNKsPWbqNzu2XSu9XKJYhN4iI62aQ8arr/F8krgi+MIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755894434; 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=ZpQtE1SPMo9q6PdnhihU02tPmOenZBiH4pd1PpEfAGo=; b=pS1XYRIrHv9RwZNASuWGm8OSeneMZ+elSIZVr2AIfvcacTZd//oZg8JgBovJhusoi3ip5a CzBIBTgXN4lN2NSm/ynpIy72FhMWHEDWd8jfhdoLs0WyoH4Ra6eKNzxAm2QTemWAKJaHC1 b8RES4XLEz2cYuoqs/At9ydbQPRTygt9ara+aIWonWPV5lTfCBGXvIjLJSyLZbgy6pHP+H hG03513JPHT3sWn6NB9aB9JOXq6aN5Kv6iT/LCZDzOSoCaYTZAzyGv79E7huPSvCj9REWR NipyZ43dRux9aM5N68pqDtMtkrldbihZ7N9inEbH93GKLxLfzGWRL/vxDqqlxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755894434; a=rsa-sha256; cv=none; b=IRrXEv0XdP1LfashV+BQv0Epcy5TdiJ4MDn77InILNEALD/njCY6wreGsHF9BhlLTc3C0O rkTaYzMv0A/d0JwbWWl1aErFkoOuXvwFrEqIS9ZnGCG7kDNHJ531GPzJLd/Ho6zbBmr49O WoZfYqOOy+L+RuKbeHLu1gN9QD5h/HQENoIVupz91QEkcVbP3GXa1vmWNxTnkvXtNNJI55 2LrJi4MpL19+2DJUjCM0b7dry8MKpBW5hLfJgMHKkEi1YqrKetlqp24l4PAGqzbcbNzFyg 5cI/45DbUyRqSGrXqtY1b//qbcybo2W/mWGxF/KnBAFbzhF0zeTaeCtkiIe9/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7sDf4pcLz11ks; Fri, 22 Aug 2025 20:27:14 +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 57MKREnr072300; Fri, 22 Aug 2025 20:27:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MKREI5072297; Fri, 22 Aug 2025 20:27:14 GMT (envelope-from git) Date: Fri, 22 Aug 2025 20:27:14 GMT Message-Id: <202508222027.57MKREI5072297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: b5a18ea27f7a - main - vfs_vnops.c: Change the error return from ENOSYS to EOPNOTSUPP 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5a18ea27f7a440eeebcca5795cf69a2805b1a5c Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b5a18ea27f7a440eeebcca5795cf69a2805b1a5c commit b5a18ea27f7a440eeebcca5795cf69a2805b1a5c Author: Rick Macklem AuthorDate: 2025-08-22 20:24:25 +0000 Commit: Rick Macklem CommitDate: 2025-08-22 20:24:25 +0000 vfs_vnops.c: Change the error return from ENOSYS to EOPNOTSUPP When the COPY_FILE_RANGE_CLONE flag argument is provided to copy_file_range(2), it will return failure if block cloning is not supported by the underlying file system. This patch changes the errno returned for this failure from ENOSYS to EOPNOTSUPP. Suggested by: kib Fixes: 37b2cb5ecb0f ("vfs: Add support for file cloning to VOP_COPY_FILE_RANGE") --- sys/kern/vfs_vnops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 93f87ddae4de..a4f41192f684 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3444,7 +3444,7 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp, dat = NULL; if ((flags & COPY_FILE_RANGE_CLONE) != 0) { - error = ENOSYS; + error = EOPNOTSUPP; goto out; } From nobody Fri Aug 22 20:43:13 2025 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 4c7sb568kSz64vl9; Fri, 22 Aug 2025 20:43:13 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7sb55fKlz4Qcy; Fri, 22 Aug 2025 20:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895393; 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=FNXDya5yO1VhQUrhVABV/EwS6YUkiTbIHFl4mNKmb84=; b=Nq70V5AKBdX8Bw7VSQwB4gH7FNWN0pw/D3gQgHSWXRBDrG36VIr7CWnD+S2J0Oa3q0CiWP SLJQQdaMs5dJ8Xk0HxJAg/56PgiIkAP1z/gCkXY1HeH9p6BXS17Rh5cQbJQ5aBRIaxdnYj pAaWx/FTTrvKVV+h8nY6LvQLvyIAAD2hXSxtSl2jBvSKTyrYkl4P4q8+y6/JIJHt90XzLs ORsITAkYaHWc039D9bLBQh7RPljo/Huqenu//xY6NxM2dvneCTaVKetJ2SbCKNeU5EcjtP m8C0+GdF8jXp3iUnqRzYw1GA3CRJg/DGu/61XWkGrHXUOjYN8hIi+tuU+DnBfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895393; 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=FNXDya5yO1VhQUrhVABV/EwS6YUkiTbIHFl4mNKmb84=; b=KOcMMXOn6O5eNrGRV1FpTHfXPNFkULIY1q8M4cQYe4RehG4UO1yXtMGhDvRMgxO4IkV9R0 r9aywTAO/Wos0bcRZJ4+dZWHG3mEczAAr43nov35+3BwQWJ8Gs9G5l89aItGyKOxHwAM6h yn2cGxt2LI2RtDau/JLNK0hDgh+iYbkn6cHnT2ty0eMeq+YzMje4oH4IW4y0G0XM2HbFu8 Ly5Qra5GLIx/iQjmw54KvpbtimgHbfxnnAQMfzSxACIb3114v4Aw8X6lNWKcljha/xPG/w nOzQcmTPcVfCE6GcKOR2gLLKP3zyn9Pvb1uc4BKoWg6Tyyj81ypCr+Z6Eyb/xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755895393; a=rsa-sha256; cv=none; b=aMs/62p74xdgGQ4F6dNtnYfhm+JtK6SHSh5sxdVRPz649jrukmXZLpk8gj05scmPlGwMhB YiIK1AGGlvlM/CXDbetMiHNbzG0xon7qw9Czo8KVZSapwKuDBd/havffhTIMxk+C01MswZ +QQuMWkTO8Fai8HNoJ00uQuO8VG8bPnBbeX2KC2aLogB3wxlHiPHSZ49zPkbJmSNt0WtKE BgV0Kp9pcGaYoQcaUHV6Wh3tgRLJi/kYsmU7TQHmRmHoaLZR+GY8cYpO0z5ufBli/5DXRF wUwmaNnC4yuLp2x7VkOHONVcHQj7XDbV8P5vWTEmiJzwjA0fRZnYIdYhtSUX7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7sb555Hfz1239; Fri, 22 Aug 2025 20:43:13 +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 57MKhDx2007716; Fri, 22 Aug 2025 20:43:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MKhD1F007713; Fri, 22 Aug 2025 20:43:13 GMT (envelope-from git) Date: Fri, 22 Aug 2025 20:43:13 GMT Message-Id: <202508222043.57MKhD1F007713@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: b3b5781c1c0b - main - Revert "netlink: Fix IFF_UP flag handling in RTM_NEWLINK's modify_link handler" 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3b5781c1c0b730f9430983ce241c46dc50504f3 Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=b3b5781c1c0b730f9430983ce241c46dc50504f3 commit b3b5781c1c0b730f9430983ce241c46dc50504f3 Author: Aymeric Wibo AuthorDate: 2025-08-22 11:03:10 +0000 Commit: Aymeric Wibo CommitDate: 2025-08-22 20:43:09 +0000 Revert "netlink: Fix IFF_UP flag handling in RTM_NEWLINK's modify_link handler" This reverts commit 39dbadb7a410f3955540041848d669264266e552. This broke the `sys/netlink/test_rtnl_iface.py:TestRtNlIface::test_create_iface_attrs` testcase. PR: 288967 Reported by: guest-svmhdvn Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51871 --- sys/netlink/route/iface_drivers.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c index 5f605b05f7b8..4bf913d9c978 100644 --- a/sys/netlink/route/iface_drivers.c +++ b/sys/netlink/route/iface_drivers.c @@ -82,12 +82,9 @@ _nl_modify_ifp_generic(struct ifnet *ifp, struct nl_parsed_link *lattrs, } } - if ((lattrs->ifi_change & IFF_UP) != 0 || lattrs->ifi_change == 0) { - /* Request to up or down the interface */ - if (lattrs->ifi_flags & IFF_UP) - if_up(ifp); - else - if_down(ifp); + if ((lattrs->ifi_change & IFF_UP) && (lattrs->ifi_flags & IFF_UP) == 0) { + /* Request to down the interface */ + if_down(ifp); } if (lattrs->ifla_mtu > 0) { @@ -100,8 +97,7 @@ _nl_modify_ifp_generic(struct ifnet *ifp, struct nl_parsed_link *lattrs, } } - if ((lattrs->ifi_change & IFF_PROMISC) != 0 || - lattrs->ifi_change == 0) { + if (lattrs->ifi_change & IFF_PROMISC) { error = ifpromisc(ifp, lattrs->ifi_flags & IFF_PROMISC); if (error != 0) { nlmsg_report_err_msg(npt, "unable to set promisc"); From nobody Fri Aug 22 20:46:32 2025 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 4c7sfw2fldz64wRs; Fri, 22 Aug 2025 20:46:32 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7sfw23v6z3D41; Fri, 22 Aug 2025 20:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895592; 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=IpcXFd3A7B837A9CDF9D3fbG39SN2w3YGLacmXp9lKM=; b=BIiCAJ4Ot6rxwo8UjTBEG+Z3gDabNMCQ/1V/2nWhphZJ2wNrH98RVh9f8mNVyVco2nte1N QTtRxub58cN5Qexl2+Vrq/1116P5A73Xwde5dxunZWSBq6CBTpAOSTT/7cWQrXja8iIfCF jxfJOvsRaSfpBvLTGyA0EMx9aBaxzdigMWTTs/W5ixGi2vwg4Q96TJQu3u4gJJHoiX2mwL eta47e59FU6MwY2r2neBb3NLqxzD9ysptzKXVsq4y7NGJGcNrOZMgCqD7AVDieFVklPYcE mdyspiG0ys9uRtWHT63yPP5evjodj/Q3KjvnnlYEFuE7pJLt7OfzjQriWiDMrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895592; 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=IpcXFd3A7B837A9CDF9D3fbG39SN2w3YGLacmXp9lKM=; b=OnkwkP3AVLIReQsc2tylfaYDWHIJtq/YyFbIknJghFqkfZIZR+sbaNys4g1G6P9bRh2acB N9v7UQEnFd26anvOoj/v7IJBgPbwRJv4wH+/i7u6K0iAb5zR5reH408EfrZ+CjrypDePnE ldRhtqkHaYO1F59++0SDviINhUH+3UPrLmopxaNP1d6mKS9N/PX7c0tzv1y8IMci12Stok WYjWWuBDwVBfv6/G/ifXLZIZB/S3Q6MQtMV+V7k37+oqkp1VWrV86f1NEQWjagkZqhS7zA pYPefNh1+ypYawrVypPG7VX4yHiinsNjJjNn92jiQJGwdNYPNqk+UbDjf6Gvww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755895592; a=rsa-sha256; cv=none; b=x1FchbZvYe8D5xy6IbAml/S4wtdX0Bso5BZF90mh8k2t7KmSkuuyDrS/JM5KvzYnLm8kF/ dEGMjnsRiTlEjo1V46O56jpJGoRxbgRFMb/vb+wD2266ftEAWSWcHuptiqIQUcl+DrIaVK i4zv5CFHfpgdAywt+x376SgyH6Cch2XMN5V9Gp2cIsOsXe0x6uFLCUynbqOKIIWCykBBay cBAmt5ckpW2ES3k1KHrLXgqG0TajLkQVp7pSATZgA3C/8iqYRnSbofzisox/5VqY09f9oW XZ4SPA/g2xZ2KZvKcfl+n810dSGfXUykbET1Tb0gAx8sMVJR7pc3ClwLuPk8sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7sfw1N4kz12HD; Fri, 22 Aug 2025 20:46:32 +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 57MKkWDl008757; Fri, 22 Aug 2025 20:46:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MKkWQW008754; Fri, 22 Aug 2025 20:46:32 GMT (envelope-from git) Date: Fri, 22 Aug 2025 20:46:32 GMT Message-Id: <202508222046.57MKkWQW008754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: e84374d38bc1 - main - Makefile.libcompat: Use same PATH for _lc_build-tools as _build-tools 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e84374d38bc1690eb62de75874348b1cfa21ea93 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e84374d38bc1690eb62de75874348b1cfa21ea93 commit e84374d38bc1690eb62de75874348b1cfa21ea93 Author: Jessica Clarke AuthorDate: 2025-08-22 20:46:15 +0000 Commit: Jessica Clarke CommitDate: 2025-08-22 20:46:15 +0000 Makefile.libcompat: Use same PATH for _lc_build-tools as _build-tools Without this, we end up with just the host's tools in PATH during _lc_build-tools. In particular, sed on GNU/Linux systems will be GNU sed, whose -i option has different semantics, and this causes the lib32 build of ncurses to fail trying to create curses.h with: sed: can't read s|...|...|g: No such file or directory This has always been a bug in Makefile.libcompat but previously it didn't end up mattering; this is the first known case. Fixes: 1cc020eba69e ("ncurses: Provide reproducible paths") MFC after: 1 week --- Makefile.libcompat | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.libcompat b/Makefile.libcompat index d165bba341c8..e132a9f8442f 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -56,6 +56,7 @@ build${libcompat}: .PHONY -p ${WORLDTMP}/usr/lib/debug/usr >/dev/null .endif ${_+_}cd ${.CURDIR}; \ + PATH=${BPATH:Q}:${PATH:Q} \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ ${MAKE} -f Makefile.inc1 \ From nobody Fri Aug 22 20:46:33 2025 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 4c7sfx3x1sz64wDd; Fri, 22 Aug 2025 20:46: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7sfx2Swvz3D6g; Fri, 22 Aug 2025 20:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895593; 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=fJZiI7DHBE0EYEvb6vlWSFttGYTteShQWd4cYlA/2pA=; b=hI3pZDs9BPUUvWHBEI+7RQxQGWNGU848OL4lDIeLKjike1CEFsDqan5iIogqr8eRAec7Kt 4NxC64bvqJUag1RJ/IbA48H2DDfOrAjSWP7Rz8VS4nHDhSUZM0262IBa2InLl7dYwGtx+0 QQVfmwx9DFqGx3Ev5GZfm/0D7BfN5s8lYO2F9bv+uftsPBB5OMcUx1KSlUc5/07/U+4id5 qcxyBmQQDIFd8uBXcfxfjsRia5jFMvs6GDrqWH2Gfql4gJBDF9tgz/k3qpQ1oJWSJwK69o 5MioZ4W9/FdMv/bIb+EKqAXw5DDowpv0L++4STEptKQGLfRbMVCK2s4HXFqzUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895593; 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=fJZiI7DHBE0EYEvb6vlWSFttGYTteShQWd4cYlA/2pA=; b=sJk1COfcD7Gf7qBojvSs+Cpuqiah+1+UdiZOhGOAI2Gy26FYKqLtWHa5a1bMmNXZFigm+3 IeSsC86ZHnmMTBC7tOZHoNTq622O4n9X4wWemhzBkD5+qTnJSx/T7paA0hU7HGGnlB8l6L +XpT0DXnh0ZNDufH5lf/+jq92fodxVsZh2+LnNz45Zkomlr5BhHG0yhgSNZsYnbOTnZtkq y9I8bs1vBdt+L+5esB+SAWeRmzAR2FUbemJjVeYcHtimpnARl/Trkb1w0Hb9KYOVyUzx5r gT98GVrQaQNwHbFf0JwQFrZAy2SmYuF7/dUIbMclfBxfqORa7yhTUdo8rxuszw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755895593; a=rsa-sha256; cv=none; b=ayRvsFrij+2qClYvSO57BlhzS1z5iUBr892zWV6Zqp8hwaYbASD1swv+6X+M/awUP/jVTY KHMVb4mrGjbT/7qyWZmjaWDK7o+j2b6JO7nujgr3BgVHnb1PZxskDM0a8dJXnLoJrKEKp7 eU3fknANnejA/LHivopxUVbQveHPtYh2ww0FUL1DYInFxcSsARmjSpNu5oa2C5IkTojceb B8yscXMMCIfmPZVaXdTOGdqcwABoMCRK64rR9y+why/Ez8+DencN4DAzGlyOI0Bpt3utbk pDdbIV0LsxbuYxU/HKBIzr7TOMOkxGdm1Vg5OSsAIrrUNp6ZBRXZgs+GPSP8vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7sfx1mNYz129G; Fri, 22 Aug 2025 20:46: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 57MKkXKD008795; Fri, 22 Aug 2025 20:46:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MKkX24008792; Fri, 22 Aug 2025 20:46:33 GMT (envelope-from git) Date: Fri, 22 Aug 2025 20:46:33 GMT Message-Id: <202508222046.57MKkX24008792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: ad13dc1ece2f - main - bsd.compat.mk: Honour XSTRIPBIN for lib32 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad13dc1ece2fe4a6192bceffea4a868ba6a2e0e2 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ad13dc1ece2fe4a6192bceffea4a868ba6a2e0e2 commit ad13dc1ece2fe4a6192bceffea4a868ba6a2e0e2 Author: Jessica Clarke AuthorDate: 2025-08-22 20:46:16 +0000 Commit: Jessica Clarke CommitDate: 2025-08-22 20:46:16 +0000 bsd.compat.mk: Honour XSTRIPBIN for lib32 Currently we only honour XNM and XOBJCOPY, but XSTRIPBIN is important during install. Otherwise we end up using STRIPBIN for the host, not the target, which is normally the same, but may not be, especially on non-FreeBSD systems. In particular, cheribuild will build FreeBSD with STRIPBIN=/usr/bin/strip XSTRIPBIN=strip (with the latter referring to the bootstrap strip in PATH), which breaks for WITH_LIB32 when the host's /usr/bin/strip is unable to process the lib32 binaries (e.g. building arm64 FreeBSD's lib32 on an amd64 GNU/Linux system). MFC after: 1 week --- share/mk/bsd.compat.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 6fa732fd730b..bad68d1ebd8e 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -74,6 +74,7 @@ LIB32WMAKEFLAGS= \ LIB32WMAKEFLAGS+= NM="${XNM}" LIB32WMAKEFLAGS+= OBJCOPY="${XOBJCOPY}" +LIB32WMAKEFLAGS+= STRIPBIN="${XSTRIPBIN}" LIB32DTRACE= ${DTRACE} -32 LIB32_MACHINE_ABI= ${MACHINE_ABI:N*64} long32 ptr32 From nobody Fri Aug 22 20:50:34 2025 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 4c7slb1szBz64wZp; Fri, 22 Aug 2025 20:50:35 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7slb07Xxz3Dkm; Fri, 22 Aug 2025 20:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895835; 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=ch68f0WpCaGQP6StzEFU++23I2Hwe05zc4UKSe7T9Js=; b=q74jzoyJv5Qi0JxphjfiH5Gb8lm+V3C9yIx8j2/3fKcWCiTkySMvTqZii1MZWYD8UhPd3M rX6JmvOQmV+X60Xz9vpRp3IECWffnLeFz9waX9W+6zT2j29J6t6LnW3bG/TxlJMvljXDDu sLl50JCjpGOYiQIbNUF8IfUDM+5OYRmnDV/aXKbKNoRJ59T45BYQEpCXwi4gu+4kRJlvD2 1lFEelSCEoyMCvNqW3ppvzjgvD55v4yzBZk/JevHvNufK+7ZhfB4tNZVFt/07LV2F5GWTc ZK43qgnMBXZqfS66/QyAT5IciGh5PXOGczb5CU7YuZmc989RZZNFll9DHET/YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895835; 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=ch68f0WpCaGQP6StzEFU++23I2Hwe05zc4UKSe7T9Js=; b=HpuwzEJgZCo3GBNpnWNRQLRiEXXTTY10pyDFiCXQgmckjmA18vVaJJdYJgvGTJbFvlEUNN cVd6xBHrsiam/v28eaI2FWxiZXGqLaKDWaQQUlbAp3UNG/4H8RXeCptVNN6Z1MA3vtviFc 5DErGfAOVKDU3HV9DIo7NrKrQBUflb/ISYrWANkSlJM9O4Rxboz6QZXiEo6jTKv9ikbaGT up3M2nu5/b7r/g4o0AFm1Zi1aM4b9CvPaoUOr92EBlhyI5/lEMQOotSk1r5XsFu5utlOOE gMqKe6DDk7FB4jhxwcaynJU/54WcNR40rfRVLm5jnbhKFniHsEm+4xJf4tFXkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755895835; a=rsa-sha256; cv=none; b=K9/VyWtyFENvfWypCm7rJ4S4+nmARD/APAM7vsp1V64MsV5Ysx9yVnsdJB1WLRnAX79VoD OLafaIdg5+BZsbDkuaR8z47xdlgt940/IFTVQai+JPMhh561CimM7JzW5RBDgoPK2+AnyF TjAdZBYGTOgyYQBo5GS/giSy7ipgzlYQrP4x3dCtzO1yo2DV4maCe/ygpgiWNgA2I5993r 4mQYh0l0HaIlEwQ/gf9qZlUBRm5yHLKRhvdO3fpXjr/lBTChdIv9zJt7jeJe5OXiEIqPgb iR2FyNLBvZhU9PzJfR++/w4tk8/9GYhpR6tEYqEzEwKcm535RKJwTxxMA4UQXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7slZ6Jd2z11p9; Fri, 22 Aug 2025 20:50:34 +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 57MKoYa8018612; Fri, 22 Aug 2025 20:50:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MKoYTO018609; Fri, 22 Aug 2025 20:50:34 GMT (envelope-from git) Date: Fri, 22 Aug 2025 20:50:34 GMT Message-Id: <202508222050.57MKoYTO018609@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: b7e0373acb1d - main - vdso: Build without debug info 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: b7e0373acb1d022e9e5acb5be9727def5f941194 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b7e0373acb1d022e9e5acb5be9727def5f941194 commit b7e0373acb1d022e9e5acb5be9727def5f941194 Author: Mark Johnston AuthorDate: 2025-08-22 20:47:43 +0000 Commit: Mark Johnston CommitDate: 2025-08-22 20:50:26 +0000 vdso: Build without debug info The debug info is not very useful and embeds build paths because elf-vdso.so.o is built without CFLAGS, breaking reproducibility of elf-vdso.so.o and thus the kernel. Just stop passing debug flags to amd64_vdso.sh. Reviewed by: kib MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52129 --- sys/conf/files.amd64 | 4 ++-- sys/tools/amd64_ia32_vdso.sh | 2 +- sys/tools/amd64_vdso.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 9b6ba03b78df..c12ab9db030a 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -13,14 +13,14 @@ include "conf/files.x86" # elf-vdso.so.o standard \ dependency "$S/amd64/amd64/sigtramp.S assym.inc $S/conf/vdso_amd64.ldscript $S/tools/amd64_vdso.sh" \ - compile-with "env AWK='${AWK}' NM='${NM}' LD='${LD}' CC='${CC}' DEBUG='${DEBUG}' OBJCOPY='${OBJCOPY}' ELFDUMP='${ELFDUMP}' S='${S}' sh $S/tools/amd64_vdso.sh" \ + compile-with "env AWK='${AWK}' NM='${NM}' LD='${LD}' CC='${CC}' OBJCOPY='${OBJCOPY}' ELFDUMP='${ELFDUMP}' S='${S}' sh $S/tools/amd64_vdso.sh" \ no-ctfconvert \ no-implicit-rule before-depend \ clean "elf-vdso.so.o elf-vdso.so.1 vdso_offsets.h sigtramp.pico" # elf-vdso32.so.o optional compat_freebsd32 \ dependency "$S/amd64/ia32/ia32_sigtramp.S ia32_assym.h $S/conf/vdso_amd64_ia32.ldscript $S/tools/amd64_ia32_vdso.sh" \ - compile-with "env AWK='${AWK}' NM='${NM}' LD='${LD}' CC='${CC}' DEBUG='${DEBUG}' OBJCOPY='${OBJCOPY}' ELFDUMP='${ELFDUMP}' S='${S}' sh $S/tools/amd64_ia32_vdso.sh" \ + compile-with "env AWK='${AWK}' NM='${NM}' LD='${LD}' CC='${CC}' OBJCOPY='${OBJCOPY}' ELFDUMP='${ELFDUMP}' S='${S}' sh $S/tools/amd64_ia32_vdso.sh" \ no-ctfconvert \ no-implicit-rule before-depend \ clean "elf-vdso32.so.o elf-vdso32.so.1 vdso_ia32_offsets.h ia32_sigtramp.pico" diff --git a/sys/tools/amd64_ia32_vdso.sh b/sys/tools/amd64_ia32_vdso.sh index 85d2299b45d0..e5865639d398 100644 --- a/sys/tools/amd64_ia32_vdso.sh +++ b/sys/tools/amd64_ia32_vdso.sh @@ -58,7 +58,7 @@ then exit 1 fi -${CC} ${DEBUG} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ +${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ -o elf-vdso32.so.o -I. -I"${S}" -include opt_global.h \ -DVDSO_NAME=elf_vdso32_so_1 -DVDSO_FILE=\"elf-vdso32.so.1\" \ "${S}"/tools/vdso_wrap.S diff --git a/sys/tools/amd64_vdso.sh b/sys/tools/amd64_vdso.sh index 2a83ae874ab7..ed91ddc8abb5 100644 --- a/sys/tools/amd64_vdso.sh +++ b/sys/tools/amd64_vdso.sh @@ -67,7 +67,7 @@ then exit 1 fi -${CC} ${DEBUG} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ +${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ -o elf-vdso.so.o -I. -I"${S}" -include opt_global.h \ -DVDSO_NAME=elf_vdso_so_1 -DVDSO_FILE=\"elf-vdso.so.1\" \ "${S}"/tools/vdso_wrap.S From nobody Fri Aug 22 22:05:00 2025 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 4c7vPS42qvz65JtH; Fri, 22 Aug 2025 22:05:00 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7vPS3Ssxz3QF6; Fri, 22 Aug 2025 22:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755900300; 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=FMHYpywFH9NAsOOIeftpPX/rEfFK4TOuaJm5kOguPxU=; b=rehoCEacIA0IJkmtc/Q3zO/uXw/fnnQ6T5aM//VXOBin4ChG07iIr0H4QFO/W+J612krw0 tmAnOx4ZOuZe7PqggfXFg3RJxOlAQca6SeOg4Iax/jHMxKHYT/WDsVt+lSoUhW5oTE75Je BJuM5q4vFbLMr9LVPh9VCXxEUHTc3kSjC6X7F8Xfax856W+udjtLRqCNlQKHOnkXMyLwnD Gf6fROXI5zC0HZawEJEZLXWk4Gkl+1Y4KYhWAoOFdqQIPs7QSd74beBV+K8nMIKZMsfqy1 okoOC6Bog1RR6UetJRIEoGfc/iBF7CWBuandyFhLLewaVgITqBWVxXa0PdT0ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755900300; 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=FMHYpywFH9NAsOOIeftpPX/rEfFK4TOuaJm5kOguPxU=; b=dDqClJcW/rzMQxCoRG7e9oiEbsyT2LDeqIE2ziUmVBUWK2Qd33lztwjcSzLxJpoBFEL2xZ Pn+FXRIFEz8XpSOuFMJAfjEIjf+PTYh1R8xJYlkPaMfpRzUS9DkmKdjpVywtIM4bOIPP+/ /UL+6HjC6qF1nf8B9s4ME1KcmQ46+nGIR+uHxnx+S4HeUOgz3WieuN1UkkUl0+C9nvkh7s mYT9957QqY83ZSOE9FDng98k2GpxaOjb4nyQN1k3zmSLbR0L7iZF6RVrosxaIjyhngQxAP y+kIIjfaLpvFywGgt+vlFF+4R3baHgyF1BgJU0iQ2BdvzDECwvWlOGCLQ5cjKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755900300; a=rsa-sha256; cv=none; b=PWRdLmXvVmF9MlFAGvidopEm+ZRBynf8F0s0vLLP78jPPBgBEmCqSsjIiBfEWS0lugo+4n RPCWr1Vqd635xjGrBIj+xLQtWG4RqB8Mm/DZBrV3RrjqpvVMkpggWEMffxdLkcCdSbXha1 VB2i265TsJildGJlofX+atKgqfgGdHVJTGQsqnwba+KtPZp7YCr7tHBaD1twyZWR4sncdW j784f2I1czuqtTXk+lGdIMFq5IoNo978ZeEpQYpnE30cOUYGalagmJqiWgGnHmsQeCVSgn EFM95hrkB+TPigL1qbbj5uivCHuUlBmO8MMxJHWo+zW4VvdBrCaXddIcDmO0lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7vPS2p1vz14Fs; Fri, 22 Aug 2025 22:05:00 +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 57MM50ex059207; Fri, 22 Aug 2025 22:05:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MM50ml059204; Fri, 22 Aug 2025 22:05:00 GMT (envelope-from git) Date: Fri, 22 Aug 2025 22:05:00 GMT Message-Id: <202508222205.57MM50ml059204@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: e39c9ac21358 - main - copy_file_range.2: Document the COPY_FILE_RANGE_CLONE flag 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e39c9ac213584b5398d9c1c045af5ca07c11f210 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=e39c9ac213584b5398d9c1c045af5ca07c11f210 commit e39c9ac213584b5398d9c1c045af5ca07c11f210 Author: Rick Macklem AuthorDate: 2025-08-22 22:01:59 +0000 Commit: Rick Macklem CommitDate: 2025-08-22 22:01:59 +0000 copy_file_range.2: Document the COPY_FILE_RANGE_CLONE flag Commit 37b2cb5ecb0f added support for the COPY_FILE_RANGE_CLONE flags argument to copy_file_range(2). This patch documents this flags argument. This is a content change. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D51938 Fixes: 37b2cb5ecb0f ("vfs: Add support for file cloning to VOP_COPY_FILE_RANGE") --- lib/libsys/copy_file_range.2 | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/lib/libsys/copy_file_range.2 b/lib/libsys/copy_file_range.2 index bcd9170842d5..829a5a5d3c13 100644 --- a/lib/libsys/copy_file_range.2 +++ b/lib/libsys/copy_file_range.2 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 28, 2023 +.Dd August 16, 2025 .Dt COPY_FILE_RANGE 2 .Os .Sh NAME @@ -74,6 +74,7 @@ argument must be opened for reading and the .Fa outfd argument must be opened for writing, but not .Dv O_APPEND . +.Pp If .Fa inoffp or @@ -101,9 +102,29 @@ respectively will be used/updated and the file offset for or .Fa outfd respectively will not be affected. -The +.Pp +The only +.Fa flags +argument currently defined is +.Dv COPY_FILE_RANGE_CLONE . +When this flag is set, +.Fn copy_file_range +will return +.Er EOPNOTSUPP +if the copy cannot be done via +block cloning. +When .Fa flags -argument must be 0. +is 0, a file system may do the copy via block cloning +or by data copying. +Block cloning is only possible when the offsets (plus +.Fa len +if not to EOF on the input file) are block +aligned. +The correct block alignment can normally be acquired via the +.Dv _PC_CLONE_BLKSIZE +query for +.Xr pathconf 2 . .Pp This system call attempts to maintain holes in the output file for the byte range being copied. @@ -203,9 +224,15 @@ refers to a directory. File system that stores .Fa outfd is full. +.It Bq Er EOPNOTSUPP +Cannot do the copy via block cloning and the +.Dv COPY_FILE_RANGE_CLONE +.Fa flags +argument is specified. .El .Sh SEE ALSO -.Xr lseek 2 +.Xr lseek 2 , +.Xr pathconf 2 .Sh STANDARDS The .Fn copy_file_range From nobody Sat Aug 23 00:11:19 2025 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 4c7yCC75nVz65Rq6; Sat, 23 Aug 2025 00:11:19 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCC6Ms8z3ZdL; Sat, 23 Aug 2025 00:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907879; 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=7mcMOd3bmOO2cDNHdHpwP8lg0tBP9ryr/ErVf/2z+Xk=; b=Tllsu1+wCrZjWA5ge/hzzUSy5JiW4DjWxOM0syDJjr91NlIT7VgJMWfSILDgKOS6lfUlAM PjtnJKZUSnSTH1wMi8h/KDG97/v33IUwxxstCISXYfFfKtvGinp0VpUes3FCBL0jTDeQiO FSu7S5xYNVzijltfgyGsh0Wbjc781UEm4XPzIRURxoJGjw+U1bAn2Wp2UAFYRfQM6feGKn Cb0heCuRU1oYkS3uiXnA5BqJd30wmBrz3ucqfEO7cccFKnL7QqlDnih+zZJiXzupbk+66T Y6h4RzJ6TWjPX2ooyOLE9FrRHdpVHS8oPaM8uWmC+5WxPJpWkIeBGVgd3lLikw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907879; 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=7mcMOd3bmOO2cDNHdHpwP8lg0tBP9ryr/ErVf/2z+Xk=; b=yp53bco2KRe3JBqgyZ+Q/JKk2GQve7vo8d0rW0GjR5oWxIaZEJmSqE2bnLp+bzJyqQHZdp 7em6EZ1qAkvS5u4LwJiI71pnKRai2RHpkviHjMcgs7ImO03q1cw3/XCLwWrjA80Lk8xQXT 4U9Pff7V7PAqTOGXxDJOCeOARxaFl1LQHJMse2oIQITB1/kYi3jAGKtuuce1X8P33w95Xz EW3v0zrJTPx1mNQ2TdL+eLeg8Z/FtXt0M4obJq72j0zAKooLsBXxC+FvG4Msd4wHums2ob qC0T7egfhOcnRWNYzVoOy2TUmuoyquuvLd5UFzqEN3P6vKFazEX22nL7oX0RlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907879; a=rsa-sha256; cv=none; b=D8cJylicHv/IISxaFF+N2aH0i3VUbojTFKYP40cxL7dtsqifD1ozAxeJxDRQa9LuO5RTSN t4VBk6JGsd+pq8y8LinAE1lUhAKmInBVCbaVfJba0BDSZoIcW6qggf6jvk9XvZd57eWUlv +F6n2FweUM8XbIK8bTBFnIaP6opMSe/0Fljbu/MbP0Lwn3WPwsKI6uBU2NwCtcugyAaMeI Xo7Irbkjrg3rneoVETnGG99lG7PYj3oelx7XpwrA7qX7hLCPhRfugeHKJ0gLPJlV6+dOm3 QgaMXNJCbxrsOCXbywWlMz0Je9uurYkiUCt/oBzM3+jU0hNKUfCALoFHmsgVIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7yCC5yV4z174R; Sat, 23 Aug 2025 00:11:19 +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 57N0BJp5097016; Sat, 23 Aug 2025 00:11:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BJZZ097013; Sat, 23 Aug 2025 00:11:19 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:19 GMT Message-Id: <202508230011.57N0BJZZ097013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 7b4ef8bcaf8c - stable/14 - syslogd.8: Remove incorrect .Aq 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b4ef8bcaf8c38c056b83a690ea214a4c0c028c6 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=7b4ef8bcaf8c38c056b83a690ea214a4c0c028c6 commit 7b4ef8bcaf8c38c056b83a690ea214a4c0c028c6 Author: Lexi Winter AuthorDate: 2025-08-15 02:24:23 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 21:44:42 +0000 syslogd.8: Remove incorrect .Aq Using .Aq is wrong here, because the protocol says the prefix must use ASCII <>. MFC after: 3 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D51880 (cherry picked from commit c75550e499971549b31d514ab139b80297c14792) --- usr.sbin/syslogd/syslogd.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8 index 8e595245c594..6f0224759310 100644 --- a/usr.sbin/syslogd/syslogd.8 +++ b/usr.sbin/syslogd/syslogd.8 @@ -398,7 +398,7 @@ The message can contain a priority code, which should be a preceding decimal number in angle braces, for example, -.Sq Aq 5 . +.Sq <5> . This priority code should map into the priorities defined in the include file .In sys/syslog.h . From nobody Sat Aug 23 00:11:20 2025 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 4c7yCF20q0z65Rq7; Sat, 23 Aug 2025 00:11:21 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCF0FM6z3Zm8; Sat, 23 Aug 2025 00:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907881; 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=AVxyAIYqQheSAflRnYZSpLTI3xa0mmuS+jVXcnYGxoA=; b=GxknCthVgE9FZAoM7WATR/1HhX9QhhVlAuBA4mSveaLwqpfM46aaUa6T5BJG3QtrC3qElo cdRCEEC5MZL9YuWE5mYk7CkUpHpHUAsXtq11x/E3Wc6DpOFMU5HxOdbWdRQHifsuum3UV5 CM2Ol2e5sqc9UlB1xSkW6hDQbnVDlC8JAMNdrp2VWg5EaY5SHxjeESsETV089GMSbw26X3 k2O+TtFw7B1HkUhh21/2SnmSmBGWrn0mcwLWILERClup3ZC6B6yL1CESsMMA1VArUpZRFw XV7hQrblYsPlxdd3O5qpvveOaeRx0nmDfmEVGPirAuATYk2YpZrh8rtFoW9HWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907881; 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=AVxyAIYqQheSAflRnYZSpLTI3xa0mmuS+jVXcnYGxoA=; b=CDdn03gMzxTp5C5TQbQnB1UT4T6O7rRPN/NV50YqG8YfsoY3ervomiv3E8b0hMi6ZZ8CIn XKs9KpBRxaISuiL6ynd7QtPyquczoN9gNvXrCmfae6XNvcJCuDvYb79ZxbnhKWA8ZoyNAJ uIVHJWJg3zwrOz/BXl3pDr34JJJ3S8tzcJkVWA8orjpjZDxhkISLbW2ns6oPr20nEGNQa7 Ppm5ABbHIKh6R1U2eP48zsf7sUOH/hLM5FKxpIIzKzCB97gVCny5TlVXGbwfzutvmFcCdH 1NbuAGh9ZwdWbfHy1PAPPQ2uAKSmA9xJdw+8I3o48K5YHTuR6Xi+fjFWvSjTTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907881; a=rsa-sha256; cv=none; b=cmnRvCaZe1H3Dmf4cQeYGSSNh37uY6vcnPLPHq/ZY5uR/47XoKnx1ym9z4Y4YplYe/IOdq yD+uGGC/ZYTmbc+Bo5aq9wJaqanSn2E/M/6POFupKFiPkbvisXRPREO0JtSrBL/RogeZvo 6sMU8FYoTiiZ4XXx89A4UxbPeZr41EnpQtiGMygn78d9wrYgQIECenaTeAmyJ+AG9wK2UW a4BQ95fYVtG5BKQT8GkBLtJ2gbNcJSTpNDet5Kzs8QrfOdpxLPOWMtfv4Q4wZDvE9Tfz5E tqcObmQEoROBIWUPN+TmFZAK64Ge2719KnVjZQ3hJplL33bSS43uhA7PsmBYOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7yCD6x7mz174T; Sat, 23 Aug 2025 00:11:20 +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 57N0BKRP097052; Sat, 23 Aug 2025 00:11:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BK8o097049; Sat, 23 Aug 2025 00:11:20 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:20 GMT Message-Id: <202508230011.57N0BK8o097049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: d0fe99e288dc - stable/14 - tests/sys/net: if_bridge_test does not require python 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d0fe99e288dceed9c4d87e6ca837a8079b128df3 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=d0fe99e288dceed9c4d87e6ca837a8079b128df3 commit d0fe99e288dceed9c4d87e6ca837a8079b128df3 Author: Lexi Winter AuthorDate: 2025-08-10 15:27:08 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 21:46:16 +0000 tests/sys/net: if_bridge_test does not require python This was originally added for if_bridge_test:span which uses scapy, but that requirement is now annotated in the test itself. Remove the requirement so the remaining bridge tests can run without Python installed. (cherry picked from commit bc9867173f6af243929129b7050af6c64966c7d6) --- tests/sys/net/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/sys/net/Makefile b/tests/sys/net/Makefile index 95ab86156a0a..a29a8207ee33 100644 --- a/tests/sys/net/Makefile +++ b/tests/sys/net/Makefile @@ -6,7 +6,6 @@ BINDIR= ${TESTSDIR} ATF_TESTS_C+= if_epair ATF_TESTS_SH+= if_epair_test ATF_TESTS_SH+= if_bridge_test -TEST_METADATA.if_bridge_test+= required_programs="python" ATF_TESTS_SH+= if_clone_test ATF_TESTS_SH+= if_gif ATF_TESTS_SH+= if_lagg_test From nobody Sat Aug 23 00:11:21 2025 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 4c7yCG3H95z65RbX; Sat, 23 Aug 2025 00:11:22 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCG0t62z3ZdN; Sat, 23 Aug 2025 00:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907882; 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=kNVXOhW5dMYaNIwLmuto9FxmWBahI8GA0TJZ9dL3oj4=; b=HPnOnTYJmkyXWVM/J5ZK5hn3i+eiqZy4u+1+vtlJjHYLJu/ZFtD5wo6MKXP5+3uotIj9FC m00jJ1Q83PQnmMUdssqbAeFECBYhS9dqfgYwI5cVpzXwiDVePI5NgO6arF5D669OwouDkr 8K0zz5P/9lh7TKxYTLme9je1U3ptbM48Q3l6b5J1X/BHsf1XG/SUE7/jmLKW0kovTLDOXj 2UZL7YMpV4D3bdUB0UMELGkrTg7hCsXtfsChoiwlkCSuBJ6Ex2Ms3TeS57ED1DDZ7gXdIY G/cTzrnJR27j48W4Eo6xYdBuzeIVmeiF73o2J1sIJ66LF8O86iTutYD5yqXiJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907882; 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=kNVXOhW5dMYaNIwLmuto9FxmWBahI8GA0TJZ9dL3oj4=; b=Ynf9yt22I/rI189BuY/oGseHklYOapBLbKl7NdCN1fmEviQQMd3G5Bb2F4GjuBa0tzcfbA WmiiCluuO2et1cTCgjeVqBiRkPg2b7PJ+hGSAWaEolqenD0BZTpe5e1xFiIIUfvepKXz+a Bie5Hkm7cHNDzB1bbsa89J/pvOnBM1l+pPHPCYN4qt8u8cxoFDCci1xxorCSIUS9aObvR/ Ss6EX+qp3gzDp5i6q3iBWVf//0TUtiak9FLupBCUNGPi1kYNFtUAEIdx+yBaDL/rcW5zpC nRHji4fqS8qW8zsHpOotinx6Crf1AhFvRyV73qJhQmxGA1e1xcVsJ/xPrjn1RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907882; a=rsa-sha256; cv=none; b=Cb/X8Ccyd7i1nWu8IDjVY9NIEcCc0hJqz/s7zFCzbRKojnAuKvVphj2VNnw9G49Uewl1G7 l2jvSQQ51MZ8n9hu7YcdnzQDluGm3MeWqAuIXzGRqWyeU/Y9rIiUHgktjh9emWzIMfgZqE QgsvxJAwSkw3Mu4mFl6wwzynTxQamTnFyuWjwyzz5TZXhDO38NhNS6M0N2wE4rCmvzoPED tNLC/Qn4GqTE5uK9XfFXplbv5KUy8VAprG5Tc007oVlXWB8I5mCSA8ZyXlyk72T7HdyZyK v1bR8xOMgAvnWwcPhiw0F89FKiswtSJ+Bmrl1F6PbXa+LeWpl2sn/ylZ2SD4iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7yCG0LmXz17Ms; Sat, 23 Aug 2025 00:11:22 +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 57N0BL2G098288; Sat, 23 Aug 2025 00:11:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BLh5098274; Sat, 23 Aug 2025 00:11:21 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:21 GMT Message-Id: <202508230011.57N0BLh5098274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 1eb29a37f26b - stable/14 - rc.conf: Use user.localbase to determine _localbase 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1eb29a37f26b1a3671f38037dd61975e1b1105cf Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1eb29a37f26b1a3671f38037dd61975e1b1105cf commit 1eb29a37f26b1a3671f38037dd61975e1b1105cf Author: Lexi Winter AuthorDate: 2025-08-10 12:24:03 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 21:47:24 +0000 rc.conf: Use user.localbase to determine _localbase When running an rc.d script outside of boot, ${_localbase} isn't set, and rc.conf hardcodes the default value to /usr/local. Instead, try to get the localbase from the user.localbase sysctl, and only fall back to /usr/local if we can't for some reason. This fixes e.g. /etc/rc.d/ldconfig when localbase has a non-default value. Reviewed by: imp, des Differential Revision: https://reviews.freebsd.org/D51852 (cherry picked from commit 5467020a540d92a39dcabc149a264f3c0d0c084c) --- libexec/rc/rc.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index b3c54c3cb0f0..a8a8ae01b488 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -21,6 +21,7 @@ ############################################################## # Set default value of _localbase if not previously set +: ${_localbase:="$(/sbin/sysctl -n user.localbase 2> /dev/null)"} : ${_localbase:="/usr/local"} # rc_debug can't be set here without interferring with rc.subr's setting it From nobody Sat Aug 23 00:11:23 2025 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 4c7yCH3NSRz65Rdb; Sat, 23 Aug 2025 00:11:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCH1hd2z3ZmH; Sat, 23 Aug 2025 00:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907883; 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=mwABlM09PqVbGaqgsngyHfXwhofEGrAX2rKj5CYQWLc=; b=NnulDcpoQH3q8PfiJf+ly4ZS2EHfmICnPm5mSxToHombhD22XeyVDSLSuFk9YwAMTtKmsa IS803uskKDHz52YowneJUtyvKV8mnQNJsOkYcdP8DuiBMrXlzbaGPOu3NXja14YqXfx4NV 8TmQj0ebx9Mn53DkiYt5vAqIeucuCMKT7FU09GmLJWY/DlI3rLqhCf5TVwKjr1mBEbHo2B Ut4+oZcFFEYHNZ2ptXeElEYEG3b0F0Mn5+KNAUPhdMV/B7HevI9Z7Kxc9CVjMER7/woEXG DrhD76mH58Yn+/MVKHxTKWQd4pfjXXELVtuWfY6iJcpkOyNMuFd2BRrFwS+jNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907883; 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=mwABlM09PqVbGaqgsngyHfXwhofEGrAX2rKj5CYQWLc=; b=QuB359pEYEeHRE7a0q/iTY6hMk5TGb+7cbeqCV4YXYbskcUhZoa3FGDG4LD3hxGF44LhDo VLy+/1b+vYi3iFT7Vavy9S5nsD5OsZQPSFXji9Y1FGCiXUDgpmAnZ1J6LrYNhuExlmodW+ MrwDl3fwTmy46zNpPMDwjOC4dy+SUkP8qjCP8auBFEW2GJ0ya39FbQKu96afz7GO1G/Mhy 8X/hBBfzehVJF6gqOCTqgEG8alwpS7P90nBDDb9ueSdjeFlyIxEdYhrl4IsoBBXcQYApGp 2FAR4wCYTPNx5GIf5guboNkrX9JvxUw6JypDRrNx+WJycroLZ+7asIWbqCEclA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907883; a=rsa-sha256; cv=none; b=Vq0sepawmR9/OS9yDKCKrvoVxQJ++l4J0g6aE1g5HOS33g8wk9aaCTdsJ93lSXU09OH72u bBURnpZ8OFk8hUnsUIeH47C8oObL3B3Fc4xhN4FUupWitXA6JxIK5qzsD2zVmc/DuIUh9s CSqlY7xbfbA4R5S4rUGP8eNGGdLLyhMhDUgNh9oKdIPdARIkKiIWjJyWpelHIjY+hrVnR9 tgI3FO9W+fH0tcqARYu46hEVvnrTdESmF+cCazWaXXsqsJEoj1NEwNjSuOtgJXdkO0j1vf XvYpW3r7nnxQnL1/owCfKqUgqVJRDn5HNq12eLgUAF8pXBiWf/kotZZVJH1wZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7yCH1G0Fz174V; Sat, 23 Aug 2025 00:11:23 +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 57N0BNNv099626; Sat, 23 Aug 2025 00:11:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BNQb099602; Sat, 23 Aug 2025 00:11:23 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:23 GMT Message-Id: <202508230011.57N0BNQb099602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 5c4e9a10334b - stable/14 - share/misc: Move init.ee to the correct package 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5c4e9a10334b3c59f5d9f9d262ad3fa1a746b00d Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=5c4e9a10334b3c59f5d9f9d262ad3fa1a746b00d commit 5c4e9a10334b3c59f5d9f9d262ad3fa1a746b00d Author: Lexi Winter AuthorDate: 2025-08-07 11:44:38 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 22:12:19 +0000 share/misc: Move init.ee to the correct package Also, only install it if MK_EE is enabled. Reviewed by: manu (previous version) Differential Revision: https://reviews.freebsd.org/D51787 (cherry picked from commit 3958a0eb7efdea1e76137a0b8da55af7af4d4738) --- share/misc/Makefile | 10 +++++++++- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/share/misc/Makefile b/share/misc/Makefile index dc0d5f619240..5f43b616f2f2 100644 --- a/share/misc/Makefile +++ b/share/misc/Makefile @@ -4,8 +4,9 @@ .PATH: ${.CURDIR}/../../sys/dev/usb +FILESGROUPS= FILES FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ - committers-src.dot flowers init.ee \ + committers-src.dot flowers \ iso3166 iso639 latin1 mdoc.template operator pci_vendors \ scsi_modes usb_vendors \ organization.dot @@ -17,4 +18,11 @@ FILES+= usb_hid_usages FILES+= usbdevs .endif +.if ${MK_EE} != "no" +FILESGROUPS+= EE +EE= init.ee +EEDIR= ${FILESDIR} +EEPACKAGE= ee +.endif + .include diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 3e78ca88d75e..5ee0f64e4129 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1649,6 +1649,7 @@ OLD_FILES+=usr/bin/ree OLD_FILES+=usr/share/man/man1/edit.1.gz OLD_FILES+=usr/share/man/man1/ee.1.gz OLD_FILES+=usr/share/man/man1/ree.1.gz +OLD_FILES+=usr/share/misc/init.ee OLD_FILES+=usr/share/nls/C/ee.cat OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat From nobody Sat Aug 23 00:11:24 2025 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 4c7yCJ73t7z65Rdf; Sat, 23 Aug 2025 00:11:24 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCJ2pLxz3ZmX; Sat, 23 Aug 2025 00:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907884; 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=zZ9Tdy6al0yMLMSGzuIYijJclAmQXmnOt7nr18UqlLo=; b=TvwRyTH4wPCO05h8pk3lJ2Ayd6TvSvRhDZYsKZA/pMGjRYdE8J8Es0Jp/DhMUfPinZhtZS 7DlnZ6Rk3yn07TKICpdeA7S0RrYMd/YRVL+DWCzFA4975D/r4VKbT/pLeTwhFFkIayQP6b huVnPOwg87OKygCTZ+W5PasgsTXIYtZy5kc6McbtQyJeQ8tvQRp8D9ylFAlqWrGd9anGmj r3g8okw037OJaX2MHQ3DzULQDii2lKeVPsyUmk+zgaH36XuOPdOFDihPMBqiGjNzfXUmW0 uoRC4jzsGsSIYPuyVE7XdSzJNl7EAJtOwc7k0Q8q0b5mAHGzxPu4sy4200hMwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907884; 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=zZ9Tdy6al0yMLMSGzuIYijJclAmQXmnOt7nr18UqlLo=; b=f6YDPnuayyXh6ZlGanFZcFH4iXblwuzzzj/E43ucSGlAW1NDGOQq22YxiurGMHK3dIl2+n 2p4Hc2tPCs4kBBg8qq9FvA2+4TiXyNNDHg50uIH9k0KDyuzUxkOo0dGRNV+IphT/tVHhAY IKA6/2Ox+YrpY65jpbYL0XaUnfaBkvaZmE8kC7b9noEpdS5Qlwi5fXDqsWaYIAdzsPWrgC pumuuVw/EJyEwDzlmmeH4nH3gVY1y1gFg9SDTkrEHhlDMZfeNNzy4UDXpe98U2x7K+C9Cd MBT+3rD+27avGvV1+MZIWmkXJ+p8bwep+XcYNV105OkeyTP1Eb6x+YfxUWIXkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907884; a=rsa-sha256; cv=none; b=S8/JBu76uj3hvJrx5hooL9QCOVruhiC0QU0P21AbBrwBo39T7XIyAnpM83m6XcyNYy2i5t WfmQf/Qb6r3rkZhhJ8K9HOkvoo8JX3bELN5v9u7iGBl+ULt37kTbfXQ/ynZxFQ1TvwtC7D uuZERI00gvB2CaG/SXf7cM5FY2ea9Lgx7X560mH3y0Au9VEQn7wiNtXzWnTVoRDsfyoi+I xXen72b+ChmvTCKx2qkIHy7jo9nQU8gQh+D3Z/1fblyltfNg3qo5e7mGtGjB4yxbbGeg2c PZdCmqlxzgPfG6zgADhkE7f3lYjPfRzPJRvGY/VMT1VeERejdJhYvVA0jiUhmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7yCJ2Bbyz17PS; Sat, 23 Aug 2025 00:11:24 +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 57N0BOeG099791; Sat, 23 Aug 2025 00:11:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BOnt099788; Sat, 23 Aug 2025 00:11:24 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:24 GMT Message-Id: <202508230011.57N0BOnt099788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 394f7ebf10bd - stable/14 - share/mk: Use :ts,:[*] to stringify TAG_ARGS 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 394f7ebf10bdb398d31f9115dd26b2d900fe1f6d Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=394f7ebf10bdb398d31f9115dd26b2d900fe1f6d commit 394f7ebf10bdb398d31f9115dd26b2d900fe1f6d Author: Lexi Winter AuthorDate: 2025-08-07 11:44:01 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 22:12:43 +0000 share/mk: Use :ts,:[*] to stringify TAG_ARGS This avoids a situation where we sometimes prepend an empty tag, leading to arguments like "-T ,package=foo". Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D51785 (cherry picked from commit 399faa7d3ae8938d73d58c9224123a71a2096947) --- share/mk/bsd.confs.mk | 2 +- share/mk/bsd.dirs.mk | 2 +- share/mk/bsd.doc.mk | 2 +- share/mk/bsd.incs.mk | 2 +- share/mk/bsd.lib.mk | 2 +- share/mk/bsd.links.mk | 2 +- share/mk/bsd.prog.mk | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk index c4fb62782b75..6b67273aa1ea 100644 --- a/share/mk/bsd.confs.mk +++ b/share/mk/bsd.confs.mk @@ -49,7 +49,7 @@ ${group}TAGS+= package=${PACKAGE:Uutilities} . endif . endif ${group}TAGS+= config -${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g} +${group}TAG_ARGS= -T ${${group}TAGS:ts,:[*]} . endif diff --git a/share/mk/bsd.dirs.mk b/share/mk/bsd.dirs.mk index 8e090d3f2cbd..6a7f2ed83f64 100644 --- a/share/mk/bsd.dirs.mk +++ b/share/mk/bsd.dirs.mk @@ -22,7 +22,7 @@ ${dir}_FLAG= -f ${${dir}_FLAGS} . if !defined(${dir}TAGS) || ! ${${dir}TAGS:Mpackage=*} ${dir}TAGS+= package=${${dir}PACKAGE:Uutilities} . endif -${dir}TAG_ARGS= -T ${${dir}TAGS:[*]:S/ /,/g} +${dir}TAG_ARGS= -T ${${dir}TAGS:ts,:[*]} . endif installdirs: installdirs-${dir} diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk index 59025a1cee05..9633b89f95c2 100644 --- a/share/mk/bsd.doc.mk +++ b/share/mk/bsd.doc.mk @@ -84,7 +84,7 @@ TRFLAGS+= -t .if !defined(TAGS) || ! ${TAGS:Mpackage=*} TAGS+= package=${PACKAGE:Uutilities} .endif -TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} +TAG_ARGS= -T ${TAGS:ts,:[*]} .endif DCOMPRESS_EXT?= ${COMPRESS_EXT} diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk index df4cf4641141..848ee0aa2ea9 100644 --- a/share/mk/bsd.incs.mk +++ b/share/mk/bsd.incs.mk @@ -37,7 +37,7 @@ ${group}TAGS+= package=${${group}PACKAGE:Uutilities},dev ${group}TAGS+= package=${PACKAGE:Uutilities},dev .endif .endif -${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g} +${group}TAG_ARGS= -T ${${group}TAGS:ts,:[*]} .endif _${group}INCS= diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index c9f92cc57000..d6a7786e17fd 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -74,7 +74,7 @@ TAGS+= lib${_libcompat} .if !defined(TAGS) || ! ${TAGS:Mpackage=*} TAGS+= package=${PACKAGE:Uutilities} .endif -TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} +TAG_ARGS= -T ${TAGS:ts,:[*]} .endif # ELF hardening knobs diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk index 437ffd0d3b34..509520a24a3a 100644 --- a/share/mk/bsd.links.mk +++ b/share/mk/bsd.links.mk @@ -7,7 +7,7 @@ .if !defined(TAGS) || ! ${TAGS:Mpackage=*} TAGS+= package=${PACKAGE} .endif -TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} +TAG_ARGS= -T ${TAGS:ts,:[*]} .endif afterinstall: _installlinks diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 3895ff67a787..0d3bac406e23 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -121,7 +121,7 @@ STRIP?= -s .if !defined(TAGS) || ! ${TAGS:Mpackage=*} TAGS+= package=${PACKAGE:Uutilities} .endif -TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} +TAG_ARGS= -T ${TAGS:ts,:[*]} .endif .if defined(NO_SHARED) && ${NO_SHARED:tl} != "no" From nobody Sat Aug 23 00:11:25 2025 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 4c7yCK4Vrwz65Rmj; Sat, 23 Aug 2025 00:11:25 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCK3Kgnz3ZkM; Sat, 23 Aug 2025 00:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907885; 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=SThkL2utKgmLx82bkiN7uWQoykWWX+8Ddx5hLeiSSes=; b=PtbPQC0tG5EQ7yVBvc3WqYotG+gpUuXtNuZT1veuW8NgXZ/e4XX3BBjxTml1KxX2Q2zl79 jl/Npetz+PCdb4Uvvo9I0Sog6dFIdZ1JKMYIpf3X5kHPTDD94yRhnn3jdubhHp0mVd2rp4 JnT55kSpQJZ5x4WqKRp7TkUBggT2rmFsbSAukYUpiF2BduFL8VvVtjMG/1i3s4vsNa1gxx YAsCnnDU7I059qijkcYfUzj2+lGmeHL5aYsP7vz4JAPtIEr9eKNxKS5/0t+7gFyvXBB2ZY jr7M3UfXT975tXbGj3Gfvyens3ey07lqqtDzRT81fxalz6x93ea0ePWnkFJvFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907885; 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=SThkL2utKgmLx82bkiN7uWQoykWWX+8Ddx5hLeiSSes=; b=bK5bKZJLxilPkUF1+aFBTDp3HXx9hQg0F2WgL57NhfUvLlNG0nX7irNR1opno43RDBdcYp nD5B5ZDyyzK47jRMOEefC+6V03FGC90RN/UfVoD02kvNEf984ZDbJuR4AR1LPmZa+dRNyO Vt217x5WTYbdh85LLOnKsuV3l1UeRxmmB+kIQiT/WF9lCuA7euASeX+RUmOgGtHIn6/6B+ Xz82qkEcgR5+haN+Fq28VW8B9uCCpDfU+Ciy838Iovl3BPC8TJslhM9Lk2PMklDEm1rBLA QbXFWBx7njm9SlelLvsNazz05iokfg1Cfl9M3fpkJhRsT/vP3lqSXg00c5MlbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907885; a=rsa-sha256; cv=none; b=GBxmOyW1vBQedDmVsu+UOXmsie/qNW++khZUugpeFfVghz9KQv+TdtXG1LShueeaKUHlO/ IBWO23+yGmFryau0enrL/QSyFQeTrLiHcuRVtOTEt/PMw8Q5n856DoenXZt2Zb99M2s00N U+jGdeajew/ivUwpJ/3J5mfB5PCZl+4y0DIo3AB4qq5Su1hh4PmD+0hEuqREQrNuh1dn1I GmBR6nMfJXi/8TF3H4QzAC8kCXI/Mdb60m/9ghCBVHNCd/Wv/JHEBUmgjMII1PKNXkccYu UvsRSIOV5spVYAvV79Da8pYkk0uV6lUO0Zj97+8dD8aH7vAI4OcUT+A07ikvkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7yCK2rBJz16tC; Sat, 23 Aug 2025 00:11:25 +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 57N0BPom099825; Sat, 23 Aug 2025 00:11:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BPef099822; Sat, 23 Aug 2025 00:11:25 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:25 GMT Message-Id: <202508230011.57N0BPef099822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 4f295cd38b0a - stable/14 - bsd.files.mk: Fix FILESPACKAGE 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f295cd38b0a59d56bfdebb10346e2e91ebf7c19 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=4f295cd38b0a59d56bfdebb10346e2e91ebf7c19 commit 4f295cd38b0a59d56bfdebb10346e2e91ebf7c19 Author: Lexi Winter AuthorDate: 2025-08-07 11:43:25 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:12 +0000 bsd.files.mk: Fix FILESPACKAGE Because TAGS may already have a package tag, assigning TAGS to FILESTAGS causes the value of FILESPACKAGE to be ignored. Only assign tags other than package, and take the default package from ${PACKAGE}, which matches the behaviour of bsd.confs.mk and bsd.man.mk. This fixes several files that were wrongly installed in utilities, including /usr/share/examples/sendmail/mailer.conf and some files in /usr/share/nls. The fix trips a bug in share/syscons where Makefile.inc was setting FILESPACKAGE to the wrong package, but the problem was hidden because the subdirectories set PACKAGE explicitly. Fix this by setting the correct FILESPACKAGE in Makefile.inc and removing the PACKAGEs. In stable/14, this creates a new FreeBSD-examples package, so add an entry to Makefile.packages. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D51784 (cherry picked from commit 1e629ebb15db9ee0cb11a3654d7bcd3046a0df54) --- release/packages/Makefile.package | 2 ++ share/mk/bsd.files.mk | 6 +++--- share/syscons/Makefile.inc | 3 +-- share/syscons/fonts/Makefile | 3 --- share/syscons/keymaps/Makefile | 3 --- share/syscons/scrnmaps/Makefile | 3 --- 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index 0f7cec0fb5a1..b1b735c61c84 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -61,6 +61,8 @@ efi-tools_COMMENT= UEFI Utilities efi-tools_DESC= UEFI Utilities elftoolchain_COMMENT= ElfToolchain programs and libraries elftoolchain_DESC= ElfToolchain programs and libraries +examples_COMMENT= Examples in /usr/share/examples +examples_DESC= Examples in /usr/share/examples fetch_COMMENT= Fetch Utility fetch_DESC= Fetch Utility ftp_COMMENT= FTP Utilities diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index a330a8dddbbd..c074362ae7f4 100644 --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -39,14 +39,14 @@ STAGE_SETS+= ${group:C,[/*],_,g} .if ${group} == "FILES" FILESPACKAGE?= ${PACKAGE:Uutilities} -FILESTAGS+= ${TAGS} +FILESTAGS+= ${TAGS:Npackage=*} .endif .if defined(NO_ROOT) .if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*} -${group}TAGS+= package=${${group}PACKAGE:Uutilities} +${group}TAGS+= package=${${group}PACKAGE:U${PACKAGE:Uutilities}} .endif -${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g} +${group}TAG_ARGS= -T ${${group}TAGS:ts,:[*]} .endif diff --git a/share/syscons/Makefile.inc b/share/syscons/Makefile.inc index 0b22547cec2f..d4635b273f40 100644 --- a/share/syscons/Makefile.inc +++ b/share/syscons/Makefile.inc @@ -1,2 +1 @@ - -FILESPACKAGE= syscons +FILESPACKAGE= syscons-data diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile index 8dfd012c9103..ba3341da87e3 100644 --- a/share/syscons/fonts/Makefile +++ b/share/syscons/fonts/Makefile @@ -1,6 +1,3 @@ - -PACKAGE= syscons-data - FILES= armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \ cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \ cp437-thin-8x8.fnt cp437-thin-8x16.fnt \ diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile index a8aaa08c47d3..bf0099288a19 100644 --- a/share/syscons/keymaps/Makefile +++ b/share/syscons/keymaps/Makefile @@ -1,6 +1,3 @@ - -PACKAGE= syscons-data - FILES= INDEX.keymaps \ be.iso.kbd be.iso.acc.kbd \ bg.bds.ctrlcaps.kbd bg.phonetic.ctrlcaps.kbd \ diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile index b7e94fd16293..ffbd6be3df4d 100644 --- a/share/syscons/scrnmaps/Makefile +++ b/share/syscons/scrnmaps/Makefile @@ -1,6 +1,3 @@ - -PACKAGE= syscons-data - SCRMAPS = armscii8-2haik8.scm \ iso-8859-1_to_cp437.scm iso-8859-4_for_vga9.scm \ iso-8859-7_to_cp437.scm \ From nobody Sat Aug 23 00:11:26 2025 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 4c7yCM1T2lz65RW5; Sat, 23 Aug 2025 00:11:27 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCL47Kfz3Zv1; Sat, 23 Aug 2025 00:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907886; 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=eQOE39yxFRY0BjxsSuC0xNu0m356YDMVRMh9+i+Zcfk=; b=uWgbhYz67+xMAeIbgBe3MP+tUeVSCiYXhPfrmtfabwyMJ4eBPxZg622MDSGI5tsc/JC52U tTAuGloySYahcITUmHC2NngMsSxg6cCE0e14rGZ3Wn7MYf/ygLBjQbayPAOTM/DH4U3L0O czuvjDp4eZJtSWGJbxkRPzTKFaa9vSNMFLXn8KkYQSJP7VG1EDRAkya6VK8M47tvCGub5f fXAoUR8mdP45f3FKlidsbCLDJsZ/bsrBo7vlhB8GwNYuElUwLl7PHhsiWB5gdI02G652+W +YM6nk2LOI43NuklggMGJuPtIT/kHGpLY99sOqSevCJ5DKGObbpt0/6D9JY56w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907886; 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=eQOE39yxFRY0BjxsSuC0xNu0m356YDMVRMh9+i+Zcfk=; b=FAk5xZNOvFfWLCVNuVBGpSq0OAepzklY1sLQr9A5PQEMNaA4KgT3jpvt6Oc9MOYz/vtwVj cTPiaVJxVli+WKUaM8E1pQoEBWDrzMShPNRWChHSL9H9b6F9fmZ5MVpmhvHgEu5KVBtK1v tgGqpvHO2c1MaMlbb12oPk5/zRtlamg7REZ4vzE3iUnPb1Sj2MBTc/W2jt4cUY62rGMOTD F1qompa4gXn2jYvmVG6sMUMhQHKeAgH9MLtL3iIVYU7TYVeze8J6RvUKfCKen4QYoRs5u6 OFgF3r8fMr2Cx0lUa1LWT8vatU2/SMAAr+Tthqh0Dec1ChAUd8xwo44xKhFdoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907886; a=rsa-sha256; cv=none; b=hXLPw59Wm//f8mPRwzYt8+2av7i8pShwZyi0XTUtoVOLpH370MOE9evPeU4ljb7tNyfJDi ZuOCIPC1cI8qsfQWxYwAIp1SOsFcbGUp1pQjYQIRHp1GSw/tnruSdHXdL2FrR0gVqpRIAq M9hbvFy21MuxN1IOz6CbpwlwJuXzHKM+IXJpuYUsvIKYv6FZTpX8hkCyGTzJdK2mSBg4eF a+u4vS0SJ+76XB6zOGyQI7OeTbBRP4u76HPE7IlTI+wgLgB9SEr8ZF9odULNqYVfz7Kmxs 1pcmWwC4Za1/Mbed08F8XPXp4FgtR/d8A4oXmezW9OkxhF0uVMxPg/a/hLU3eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7yCL3S2hz17Mx; Sat, 23 Aug 2025 00:11:26 +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 57N0BQGD099858; Sat, 23 Aug 2025 00:11:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BQ34099855; Sat, 23 Aug 2025 00:11:26 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:26 GMT Message-Id: <202508230011.57N0BQ34099855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 99f2177b0905 - stable/14 - ifconfig: Support variable-argument commands 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99f2177b0905b9567ee35fd060b0db931e87b542 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=99f2177b0905b9567ee35fd060b0db931e87b542 commit 99f2177b0905b9567ee35fd060b0db931e87b542 Author: Lexi Winter AuthorDate: 2025-07-31 15:54:53 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 ifconfig: Support variable-argument commands Add a new type of command, DEF_CMD_VARG, which takes an (argc, argv) pair instead of a fixed number of arguments. This allows commands to do their own argument parsing and accept a variable number of arguments. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D51243 (cherry picked from commit 7d4a177efc653bc60a496ba0adf5cb4e0560fa07) --- sbin/ifconfig/ifconfig.c | 7 +++++++ sbin/ifconfig/ifconfig.h | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index c1e3e0af83c2..9d7a40b9049a 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1218,6 +1218,13 @@ top: argc -= 2, argv += 2; } else if (p->c_parameter == SPARAM && p->c_u.c_func3) { p->c_u.c_func3(ctx, *argv, p->c_sparameter); + } else if (p->c_parameter == ARGVECTOR && p->c_u.c_funcv) { + int argsdone; + + argsdone = p->c_u.c_funcv(ctx, argc - 1, + (const char *const *)argv + 1); + argc -= argsdone; + argv += argsdone; } else if (p->c_u.c_func) p->c_u.c_func(ctx, *argv, p->c_parameter); argc--, argv++; diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h index 0ae317aca409..be333d0ae02f 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -66,6 +66,7 @@ typedef struct ifconfig_context if_ctx; typedef void c_func(if_ctx *ctx, const char *cmd, int arg); typedef void c_func2(if_ctx *ctx, const char *arg1, const char *arg2); typedef void c_func3(if_ctx *ctx, const char *cmd, const char *arg); +typedef int c_funcv(if_ctx *ctx, int argc, const char *const *argv); struct cmd { const char *c_name; @@ -74,11 +75,13 @@ struct cmd { #define NEXTARG2 0xfffffe /* has 2 following args */ #define OPTARG 0xfffffd /* has optional following arg */ #define SPARAM 0xfffffc /* parameter is string c_sparameter */ +#define ARGVECTOR 0xfffffb /* takes argument vector */ const char *c_sparameter; union { c_func *c_func; c_func2 *c_func2; c_func3 *c_func3; + c_funcv *c_funcv; } c_u; int c_iscloneop; struct cmd *c_next; @@ -120,6 +123,13 @@ void callback_register(callback_func *, void *); .c_iscloneop = 0, \ .c_next = NULL, \ } +#define DEF_CMD_VARG(name, func) { \ + .c_name = (name), \ + .c_parameter = ARGVECTOR, \ + .c_u = { .c_funcv = (func) }, \ + .c_iscloneop = 0, \ + .c_next = NULL, \ +} #define DEF_CMD_SARG(name, sparam, func) { \ .c_name = (name), \ .c_parameter = SPARAM, \ From nobody Sat Aug 23 00:11:27 2025 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 4c7yCN0VXwz65RXj; Sat, 23 Aug 2025 00:11:28 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCM4Tbmz3ZvL; Sat, 23 Aug 2025 00:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907887; 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=De5t2xTkzCzvTOuSdCVVLjMEXH/R6721s6M0YNBps7U=; b=OxQv7hXfE2+n7JHmAUi8oA0qFvR6IewG+Zbo4Z0eGpHINNGdl5kllwCbFGjIr2kBqRbufc +1+dUEEcn1l6BEMTeo+gZ9pYp/cn6tjxfCm4WSDDsWxgxdg4IUcnDUg9aavzRZcUOmTlfn h7gNO6JwBFsDj6L9X2Z87qtIq9wkyY4hTX1IFycisylX9rY9VJHxzA0O3FaN1lvyDgLP5O GROgfg15qK4zkZ4hv0/2edGGmKj/6guoIFiTS19vRJqCNS904Qdjcd48nU+uRTTCKZO468 h18RLR7qScXo27qZQxEyxvDJ1IufcTDYd6kgLRemMR6SMq5tCpfhIz8P5D+kUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907887; 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=De5t2xTkzCzvTOuSdCVVLjMEXH/R6721s6M0YNBps7U=; b=PpL1tyawX0BshQGeKoXYPU70QccjXQ+rugTAGZC5hBzmO1OQ25PmuQBeaMdEp08mSdy1+8 FRt6AWGZuPbao853NOGEVsb2TmMP+La06UcSR74eFV0fygFDRayetM6hx/MPvMqF0k+buL hKa6klWA0LJ8AA+TirWGHqqkeLt1ALhmfGOc3DlArDJbAMQpaubVrMZd7PDW0VyAavzJJz P49MT07PMbR7x8pM92oeKAjLY4C17gTyoSeZTzCCJpMCMWZxSkQd6lpPEpGDlF3k7koDPT cRNRdmvU179V+rzHIb9QxWKTG95m1N78a9DQyjjqLxpVew+adt7DUFFFb5dxBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907887; a=rsa-sha256; cv=none; b=Jw1Rl3GGhIYVHKrMYSGvqyjiygbScKIDUQtbl5LFMcLhT80iQRMYSGNIbYydJsy91wGzVe aHf9z+GrT7N7bs+0h6yqI4eSmijj9qubSoHoHkIeQXpDFgl1TmzNmhMP6ANmQM4xAwTanr ZRism6oAwZ3O/AR4UrRLs0hJSWR+UmFXPTkYc9fPeM7F1kOr9uVeRnhJyxCKSTsTiPvWiF NBXhe92Xq5c90q7Q9G59J4hl6AOtDza8xiNs9f2ww3/aZbvJsJRiUUt4L7E23YGHfqbqNw /6/2UKq/stEvCkIRRY9WNOoHCBfTGBq8ERssfDySkMQ1/ugaOJIsVS1s++uXpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7yCM3n2Wz17FC; Sat, 23 Aug 2025 00:11:27 +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 57N0BRG8099891; Sat, 23 Aug 2025 00:11:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BRnG099888; Sat, 23 Aug 2025 00:11:27 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:27 GMT Message-Id: <202508230011.57N0BRnG099888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 8b728c63f777 - stable/14 - ifconfig/ifbridge.c: add get_vlan_id() 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8b728c63f777f3b2e220fe28fbe24b74f5a7c388 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=8b728c63f777f3b2e220fe28fbe24b74f5a7c388 commit 8b728c63f777f3b2e220fe28fbe24b74f5a7c388 Author: Lexi Winter AuthorDate: 2025-07-28 14:09:29 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 ifconfig/ifbridge.c: add get_vlan_id() This is like get_val() but takes an ether_vlanid_t* and ensures the value is a valid VLAN ID. This avoids redundant comparisons and casting when parsing VLAN IDs. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D51548 (cherry picked from commit 287a5fdcd3c941ce73705c664b5df4932ba3bad4) --- sbin/ifconfig/ifbridge.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c index 2d0af1255a73..973c4f9cfe6e 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -79,6 +79,20 @@ get_val(const char *cp, u_long *valp) return (0); } +static int +get_vlan_id(const char *cp, ether_vlanid_t *valp) +{ + u_long val; + + if (get_val(cp, &val) == -1) + return (-1); + if (val < 0x1 || val > 0xffe) + return (-1); + + *valp = (ether_vlanid_t)val; + return (0); +} + static int do_cmd(if_ctx *ctx, u_long op, void *arg, size_t argsize, int set) { From nobody Sat Aug 23 00:11:28 2025 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 4c7yCP0TgHz65RqL; Sat, 23 Aug 2025 00:11:29 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCN4j5cz3Zqx; Sat, 23 Aug 2025 00:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907888; 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=En2b4M4dD6IUQRJ6gXEqwYhb+mOfqvlMz/2MwjIu9Fk=; b=e0ICf9ALuPEWF9PW+myXiM/gtG0FsCk0PuTuWqrwDcjWYCT/6opbWy+7QiK4p0NoYTgkKr y+Zql2bUJHZuo+oOMyMr/gmhLI2E13XVM3tHdK6XNNWPGhdHmFcjLlUxocqdC6ctRWubWT yRe/kZ1N6YAkgSB9Z4w5TxpgAZQox9ytXuLvDCGOppMjzoJaljOjwzz9GWo17Er4TBPpC0 9OanbnlabqqBt9LPDgxBRrjD5okGBM4dQcPndMxjlj5RSzNo2PIwlI2c/TPGO4+UoJdWCD ycK+7ZSBTO2lkyupB84pQkb2EsKSxd0wcwrIJUwEH12aoxp4PBIwBHlF3i/RUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907888; 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=En2b4M4dD6IUQRJ6gXEqwYhb+mOfqvlMz/2MwjIu9Fk=; b=f30fn4WVdQlBekWengY8jor4aL259+CsQJMcgevVMN82CS36mn5KuvB5bMiqz1BnHFyG1U 3+hwXAa2e/U3EiVpZv+i/IRttk9LcIn1Z7QEuEGjam6hOEi/h4EOAtrh+O0cNd75tT+3z1 MAeLPpFotfksNtzBQMtYcesfQ1iKrCCQrvlvAwz8m9Ua60ljKQlOvIK/VyBbDpqOQu3ntn otTdfjIrmiptTsC6OCZrysmVc2iSq+nlT3qXyh0YolPSS8Bv3n/sb44UZk828Oc2Zj7hGg QysK9/9izmWxUTFH5Gf+lTQCwYVaGLiOz1VNl3JDvumk7Y0re9U1vjRXWgpFQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907888; a=rsa-sha256; cv=none; b=Auxkp5BRYK/4C9LmUiWL4C4pt300fWkmy5u6Yf3WO0vqxlaWTuZ5w2DQiire8KzV5up3df 2VWrMljvLxahh0/YHMYfJk45rgNmp6VE8Xgscg99pCY3CZRhpzGgChzKp7epI+hKMqGUO8 ZwVG2Lsf3Q4FcNplcRfCdmri+MB4MJVGffGoJaba0QtDaGk7+/sBrltl9e4V0zCPIEXSxU D2ik1Y+XcV2xRRukLBs+PcqvWEeDCSwaH9wzx71lY7QrNp3wfH5+UbvEhCYKWSxnw/pLl3 nQnP4Aerow0iMoYiahGhWWVFQpOUV6kN15/zqvAwibbhjaUcu7GgjBNa4lVbaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7yCN4Jjyz17PY; Sat, 23 Aug 2025 00:11:28 +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 57N0BSfI099924; Sat, 23 Aug 2025 00:11:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BSHg099921; Sat, 23 Aug 2025 00:11:28 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:28 GMT Message-Id: <202508230011.57N0BSHg099921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: c064ee9d7d97 - stable/14 - ifconfig: Support VLAN ID in static/deladdr 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c064ee9d7d974d5626e43f7817db940cefe9dead Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=c064ee9d7d974d5626e43f7817db940cefe9dead commit c064ee9d7d974d5626e43f7817db940cefe9dead Author: Lexi Winter AuthorDate: 2025-07-31 15:56:51 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 ifconfig: Support VLAN ID in static/deladdr Add an optional "vlan " argument to the bridge static and deladdr commands to allow addresses to be added to / removed from a particular vlan. No changes to if_bridge are required as the kernel API already supports this, it just wasn't exposed in ifconfig. Add tests for the new functionality, and improve the test for the existing "static" command. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D51243 (cherry picked from commit 3650722abf2922893540361a1369b54abc5ff8d2) --- sbin/ifconfig/ifbridge.c | 71 +++++++++++++++++++++++++++++++---------- sbin/ifconfig/ifconfig.8 | 18 ++++++++--- tests/sys/net/if_bridge_test.sh | 70 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 136 insertions(+), 23 deletions(-) diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c index 973c4f9cfe6e..9d3296ea6a3e 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -401,43 +401,80 @@ setbridge_flushall(if_ctx *ctx, const char *val __unused, int dummy __unused) err(1, "BRDGFLUSH"); } -static void -setbridge_static(if_ctx *ctx, const char *val, const char *mac) +static int +setbridge_static(if_ctx *ctx, int argc, const char *const *argv) { struct ifbareq req; struct ether_addr *ea; + int arg; + + if (argc < 2) + errx(1, "usage: static
[vlan ]"); + arg = 0; memset(&req, 0, sizeof(req)); - strlcpy(req.ifba_ifsname, val, sizeof(req.ifba_ifsname)); + req.ifba_flags = IFBAF_STATIC; - ea = ether_aton(mac); - if (ea == NULL) - errx(1, "%s: invalid address: %s", val, mac); + strlcpy(req.ifba_ifsname, argv[arg], sizeof(req.ifba_ifsname)); + ++arg; + ea = ether_aton(argv[arg]); + if (ea == NULL) + errx(1, "invalid address: %s", argv[arg]); memcpy(req.ifba_dst, ea->octet, sizeof(req.ifba_dst)); - req.ifba_flags = IFBAF_STATIC; - req.ifba_vlan = 0; /* XXX allow user to specify */ + ++arg; + + req.ifba_vlan = 0; + if (argc > 2 && strcmp(argv[arg], "vlan") == 0) { + if (argc < 3) + errx(1, "usage: static
" + "[vlan ]"); + ++arg; + + if (get_vlan_id(argv[arg], &req.ifba_vlan) < 0) + errx(1, "invalid vlan id: %s", argv[arg]); + ++arg; + } if (do_cmd(ctx, BRDGSADDR, &req, sizeof(req), 1) < 0) - err(1, "BRDGSADDR %s", val); + err(1, "BRDGSADDR"); + return arg; } -static void -setbridge_deladdr(if_ctx *ctx, const char *val, int dummy __unused) +static int +setbridge_deladdr(if_ctx *ctx, int argc, const char *const *argv) { struct ifbareq req; struct ether_addr *ea; + int arg; + + if (argc < 1) + errx(1, "usage: deladdr
[vlan ]"); + arg = 0; memset(&req, 0, sizeof(req)); - ea = ether_aton(val); + ea = ether_aton(argv[arg]); if (ea == NULL) - errx(1, "invalid address: %s", val); - + errx(1, "invalid address: %s", argv[arg]); memcpy(req.ifba_dst, ea->octet, sizeof(req.ifba_dst)); + ++arg; + + req.ifba_vlan = 0; + if (argc >= 2 && strcmp(argv[arg], "vlan") == 0) { + if (argc < 3) + errx(1, "usage: deladdr
[vlan ]"); + ++arg; + + if (get_vlan_id(argv[arg], &req.ifba_vlan) < 0) + errx(1, "invalid vlan id: %s", argv[arg]); + ++arg; + } if (do_cmd(ctx, BRDGDADDR, &req, sizeof(req), 1) < 0) - err(1, "BRDGDADDR %s", val); + err(1, "BRDGDADDR"); + + return arg; } static void @@ -660,8 +697,8 @@ static struct cmd bridge_cmds[] = { DEF_CMD_ARG("-autoptp", unsetbridge_autoptp), DEF_CMD("flush", 0, setbridge_flush), DEF_CMD("flushall", 0, setbridge_flushall), - DEF_CMD_ARG2("static", setbridge_static), - DEF_CMD_ARG("deladdr", setbridge_deladdr), + DEF_CMD_VARG("static", setbridge_static), + DEF_CMD_VARG("deladdr", setbridge_deladdr), DEF_CMD("addr", 1, setbridge_addr), DEF_CMD_ARG("maxaddr", setbridge_maxaddr), DEF_CMD_ARG("hellotime", setbridge_hellotime), diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index ce15e3a68abc..85dad643f588 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 11, 2025 +.Dd July 30, 2025 .Dt IFCONFIG 8 .Os .Sh NAME @@ -2521,15 +2521,23 @@ is zero, then address cache entries will not be expired. The default is 1200 seconds. .It Cm addr Display the addresses that have been learned by the bridge. -.It Cm static Ar interface-name Ar address -Add a static entry into the address cache pointing to +.It Cm static Ar interface-name Ar address Op Cm vlan Ar vlan-id +Add a static entry into the address cache for pointing to .Ar interface-name . +If +.Ar vlan-id +is specified, the entry is added for that VLAN, otherwise it is added +for VLAN 0. +.Pp Static entries are never aged out of the cache or re-placed, even if the address is seen on a different interface. -.It Cm deladdr Ar address +.It Cm deladdr Ar address Op Cm vlan Ar vlan-id Delete .Ar address -from the address cache. +from the address cache. If +.Ar vlan-id +is specified, the entry is deleted from that VLAN's address table, +otherwise it is deleted from the VLAN 0 address table. .It Cm flush Delete all dynamically-learned addresses from the address cache. .It Cm flushall diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh index 5438f67cf637..264a8986fcf9 100755 --- a/tests/sys/net/if_bridge_test.sh +++ b/tests/sys/net/if_bridge_test.sh @@ -245,7 +245,8 @@ static_body() jexec one ifconfig ${bridge} static ${epair}a 00:01:02:03:04:05 # List addresses - atf_check -s exit:0 -o ignore \ + atf_check -s exit:0 \ + -o match:"00:01:02:03:04:05 Vlan0 ${epair}a 0 flags=1" \ jexec one ifconfig ${bridge} addr # Delete with bad address format @@ -266,6 +267,72 @@ static_cleanup() vnet_cleanup } +atf_test_case "vstatic" "cleanup" +vstatic_head() +{ + atf_set descr 'Bridge VLAN static address test' + atf_set require.user root +} + +vstatic_body() +{ + vnet_init + vnet_init_bridge + + epair=$(vnet_mkepair) + bridge=$(vnet_mkbridge) + + vnet_mkjail one ${bridge} ${epair}a + + ifconfig ${epair}b up + + jexec one ifconfig ${bridge} up + jexec one ifconfig ${epair}a up + jexec one ifconfig ${bridge} addm ${epair}a + + # Wrong interface + atf_check -s exit:1 -o ignore -e ignore jexec one \ + ifconfig ${bridge} static ${epair}b 00:01:02:03:04:05 vlan 10 + + # Bad address format + atf_check -s exit:1 -o ignore -e ignore jexec one \ + ifconfig ${bridge} static ${epair}a 00:01:02:03:04 vlan 10 + + # Invalid VLAN ID + atf_check -s exit:1 -o ignore -e ignore jexec one \ + ifconfig ${bridge} static ${epair}a 00:01:02:03:04:05 vlan 5000 + + # Correct add + atf_check -s exit:0 -o ignore jexec one \ + ifconfig ${bridge} static ${epair}a 00:01:02:03:04:05 vlan 10 + + # List addresses + atf_check -s exit:0 \ + -o match:"00:01:02:03:04:05 Vlan10 ${epair}a 0 flags=1" \ + jexec one ifconfig ${bridge} addr + + # Delete with bad address format + atf_check -s exit:1 -o ignore -e ignore jexec one \ + ifconfig ${bridge} deladdr 00:01:02:03:04 vlan 10 + + # Delete with unlisted address + atf_check -s exit:1 -o ignore -e ignore jexec one \ + ifconfig ${bridge} deladdr 00:01:02:03:04:06 vlan 10 + + # Delete with wrong vlan id + atf_check -s exit:1 -o ignore -e ignore jexec one \ + ifconfig ${bridge} deladdr 00:01:02:03:04:05 vlan 20 + + # Correct delete + atf_check -s exit:0 -o ignore jexec one \ + ifconfig ${bridge} deladdr 00:01:02:03:04:05 vlan 10 +} + +vstatic_cleanup() +{ + vnet_cleanup +} + atf_test_case "span" "cleanup" span_head() { @@ -835,6 +902,7 @@ atf_init_test_cases() atf_add_test_case "stp" atf_add_test_case "stp_vlan" atf_add_test_case "static" + atf_add_test_case "vstatic" atf_add_test_case "span" atf_add_test_case "inherit_mac" atf_add_test_case "delete_with_members" From nobody Sat Aug 23 00:11:29 2025 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 4c7yCQ56SQz65Rms; Sat, 23 Aug 2025 00:11:30 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCP5flFz3b5m; Sat, 23 Aug 2025 00:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907889; 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=5s7u6QKD6KXDI3JgJ251hz9psUpjnxB0SO3wgS1nekM=; b=MS5pmjGI0azRbXOky6f+Dh7QxUG8JNNqNTQdsynS4Yar8z2DJiHFk9GBtRUKReZjsUBn2T jeUMOaMvFJBMx4Tlk6eS4hJU0DUYf5H/JYgt2wasswn5cBB01SpZJ0wX4CogG6cSq8pXtx FiFwOguKt5RomK+y2ldsFuNa/T48w++GB4ahBSKuvfzIChTUHtXBK5J2cWp7dpJT9PsTwn GgSZIlPqlDgEnmByFM1WNxUCexuROJJtHea+keZ1l0bWP81VUHItZgsWZQgbjqH//Asg50 CPWDCXl0r5HksW38KlhGhdld2ZR/Xep47gL657yptZeeInE0EkykoRtvLimBrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907889; 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=5s7u6QKD6KXDI3JgJ251hz9psUpjnxB0SO3wgS1nekM=; b=QpCwEBjHCO9gFEzOLssvu1eTRsKjZ2AvNs8cs1ZSItCmbrMsPbFJwnIDVa6k0Qhy1V94B1 zJWPGfQS8js39hc0HST1suUbYDldX4w5C9x5TK3ZZpFcncT57g8EUr9QzD+xW4tHwkCwCq hwMUGrwdEYS1H/FoYXmPMGaVaAmxr9MKzt+Wfp1tnanPSUBOBEuHiOd5/V8eKuSGxvNs8L cfCqZto6VREjZmW3N6s78B3Oujl2d16LEBQybk/DFywN3p7rKGdGVjCOINnOerZQPy/nQu NpIsXARqfYcv0N9abRouIwAPle4PRY4WNxrCNzdM/RVXogoJvzd366/2z0x08A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907889; a=rsa-sha256; cv=none; b=JtBdN6otXKFao8E5xbeejpfBm3HnKAgW3M2IBpdUCLQPctzy52tFl7TGevG9EJBLUx2gkN Ojth699v+Op0nNDe/Ms9fsFJC20WUwGVefpHDcN7UDrdXFCELVQR9SXVkq/NEseIMvt1n/ 8k+vZQ3V72TGfQOmDgU3rYT0dpipBuuir5DfUmb938BeI1/wVa9u1K/kxQnZYc3NbOZW6F uPh2CBQ+RMHe7um0vZtCZRUC5keFfVuZkXSUOUsL4DXWlgEBxnvTUy1eglZfpzD1T3Frx9 Aqd5I/XoRUjj6Iuvo48O/DJoExnFF1Jl+wHmlnCp5i/KtdO2FcMal4FKZpx9BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7yCP5FXqz174X; Sat, 23 Aug 2025 00:11:29 +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 57N0BTLj099957; Sat, 23 Aug 2025 00:11:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BTPN099954; Sat, 23 Aug 2025 00:11:29 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:29 GMT Message-Id: <202508230011.57N0BTPN099954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 8174561013b3 - stable/14 - bsdinstall: use the canonical name for compression 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8174561013b3f2a0685819e037934e47f63d917a Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=8174561013b3f2a0685819e037934e47f63d917a commit 8174561013b3f2a0685819e037934e47f63d917a Author: Lexi Winter AuthorDate: 2025-07-28 12:45:26 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 bsdinstall: use the canonical name for compression According to zfsprops(7), the canonical property for the compression algorithm is "compression", with "compress" accepted as an alternate name. Use the canonical name in bsdinstall. While here, change "lz4" to "on" so we pick up any future changes in the default compression algorithm. MFC after: 1 week Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D51572 (cherry picked from commit 16045420e7f83489ecd5e2163aa9bb11236962f5) --- usr.sbin/bsdinstall/bsdinstall.8 | 2 +- usr.sbin/bsdinstall/scripts/zfsboot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index 50c8948a7989..cc8920b11aff 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -429,7 +429,7 @@ Each option must be preceded by the -O flag to be taken into consideration or the pool will not be created due to errors using the command .Cm zpool . Default: -.Dq Li "-O compress=lz4 -O atime=off" +.Dq Li "-O compression=on -O atime=off" .It Ev ZFSBOOT_BEROOT_NAME Name for the boot environment parent dataset. This is a non-mountable dataset meant to be a parent dataset where different diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 59e6359d311e..445e491eb391 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -51,7 +51,7 @@ f_include $BSDCFG_SHARE/variable.subr # # Default options to use when creating zroot pool # -: ${ZFSBOOT_POOL_CREATE_OPTIONS:=-O compress=lz4 -O atime=off} +: ${ZFSBOOT_POOL_CREATE_OPTIONS:=-O compression=on -O atime=off} # # Default name for the boot environment parent dataset From nobody Sat Aug 23 00:11:30 2025 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 4c7yCR2Fq4z65Rbj; Sat, 23 Aug 2025 00:11:31 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCQ6YdBz3Zyg; Sat, 23 Aug 2025 00:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907890; 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=oR1pSKj/X+g3y+0WQy/eFhbOumuo1n2M2oq/N+PqBow=; b=HEQlwIBSFEceaosenCETurzGpXQm6S/tTcYNt6urR2IX3iYB83oUk2HQb6K0BbOaTe/cKd HL0iq0GrEbbBPwIL1SiqySN3rHycDMoJ1JRflqf7bYwq/A2lhFDvVsV+bCecYhNKphQTJY vSvOcdtwEXNZZMTYPG7oVBOxiB8OTWKVvZce6eZD3SKZk3owUM+G0nULLK0TpyLvNAX8Ry 9g6a7Hw+Dlvy++bLnkDT0sOP9YWqwPC2AhEL59HGQS3fLAe6rDUGBAP+8QC56rkr6ob8re aWUj/cwXNEvVOcEBaXhGOYowTQh73Hp6U0zDI/8PtmPVebc3DgECJQc2byt8DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907890; 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=oR1pSKj/X+g3y+0WQy/eFhbOumuo1n2M2oq/N+PqBow=; b=sojuw7fIwK91fvRE6JdQ35sjhswEe3CylaUmXv81qJjcQTi78CgeMklA7+kILzxkyHJnN0 KxKDbr5+/eaMOt3WXeNURhgd3zIoYGFbVEGuZJdaKDDj3IgkdVCdgIA0f05JKnEPgz+rj5 /BT6nd0rwAw/zxiySIXfrBXV6PRiw7vSbDIrUll08t6OjS+oDd/17p2LZkV6PSQalklUs7 5+ynyPEiPAozj+SH6QPeaSYUh5bSZJcI6mYgoK3SunRIQb/LrtOpipjpWp+7lnmXYnUE2X JlvhgDrpmYRX1/ecv5WbzvJgRabG4e9h1hjB8oTifp503dbNUrW1tgVNSfNdbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907890; a=rsa-sha256; cv=none; b=sUytoAuftaR4dBXN6XhbQz5b84TrrWMNdS+iBcTpybUCjp40fLO4ldYYW2LsDLTPQLOk6Y /7n3jNTq1wfdcB/e4Wiaa4oqXGikANsbxOgNnUvXjOvkVxTZynrHOtP9j1Uf5PHb2gmixA xOFLXkRi7OIN8A3l5qBDZMYRhIlgcQwaulcZjnEKX0/Tj3vrlk0TJYDHUcU+Znx4AKctJk QSyylm0N9EgAYSyMifmMxRMpn50CsDL/dpxJVy1tH5NMIN90J5HX36iffZHl0vpy40Cb70 /Ys9uYt0leDB/26UdZuKVzBbynyH00/nK3XdMnlAHwFe91DuGBlbQeTLDDND/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7yCQ69RVz16tD; Sat, 23 Aug 2025 00:11:30 +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 57N0BUp4099996; Sat, 23 Aug 2025 00:11:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BUQM099993; Sat, 23 Aug 2025 00:11:30 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:30 GMT Message-Id: <202508230011.57N0BUQM099993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 637fa8441f0c - stable/14 - packages: fix ownership of /tmp and /dev 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 637fa8441f0c8712b64f7ad95d072fcef5435c11 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=637fa8441f0c8712b64f7ad95d072fcef5435c11 commit 637fa8441f0c8712b64f7ad95d072fcef5435c11 Author: Lexi Winter AuthorDate: 2025-06-04 05:38:48 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 packages: fix ownership of /tmp and /dev release/packages/runtime.ucl manually adds "/tmp" and "/dev" to the "directories" key, which causes them to be included in the manifest with the user/group owner of whoever built the package repository: drwxr-xr-x 7 ivy wheel 512 Jun 1 17:24 /dev drwxrwxrwt 10 ivy wheel 10 Jun 1 17:42 /tmp Remove the manual entries and instead put an explicit package tag in etc/mtree/BSD.root.dist. This also means /tmp gets the right mode by default and we can remove the chmod from the post-install script. PR: 288746 Reviewed by: manu, kevans, emaste Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50636 (cherry picked from commit 6b2993e74ebaacd46bd1e438787c23450cd2752d) --- etc/mtree/BSD.root.dist | 4 ++-- release/packages/runtime.ucl | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index a85ce552589c..33d9b2ffc47c 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -34,7 +34,7 @@ zfs .. .. - dev mode=0555 + dev mode=0555 tags=package=runtime .. etc X11 @@ -132,7 +132,7 @@ .. sbin .. - tmp mode=01777 + tmp mode=01777 tags=package=runtime .. usr .. diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl index 8a337c038fdd..b04bc32f33cc 100644 --- a/release/packages/runtime.ucl +++ b/release/packages/runtime.ucl @@ -3,10 +3,5 @@ scripts: { post-install = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: d149be3a0cbe - stable/14 - UPDATING: Document a pkgbase change 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d149be3a0cbe27599921b0952bd8de18413fceaf Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=d149be3a0cbe27599921b0952bd8de18413fceaf commit d149be3a0cbe27599921b0952bd8de18413fceaf Author: Lexi Winter AuthorDate: 2025-08-22 22:45:01 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 UPDATING: Document a pkgbase change The MFC of 2ade134cc271 ("bsd.files.mk: Fix FILESPACKAGE") means files which were supposed to be installed in /usr/share/examples are now actually installed there. This is a direct commit to stable/14. Relnotes: yes --- UPDATING | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/UPDATING b/UPDATING index be2d8be0ff49..858b24aad471 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20250822: + A build system bug which caused some files to be installed in the wrong + package has been fixed. As a result some files have moved to different + packages; in particular, files under /usr/share/examples are now in the + new FreeBSD-examples package. + + This change only affects pkgbase users. + 20250713: LinuxKPI dma-mapping.h were pulled into the tree from drm-kmod. LinuxKPI acpi changes effecting drivers and drm-kmod. From nobody Sat Aug 23 00:59:10 2025 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 4c7zGR09j7z65V7m; Sat, 23 Aug 2025 00:59:11 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7zGQ6bdQz3hVN; Sat, 23 Aug 2025 00:59:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755910751; 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=7h9st3jxUcGiWgUZBd6eTZ7DffOzM7vJfCNkNMBTNUY=; b=cFQGte4Oe/OoDAXRzbyGUe1nbm63PWZygh3KzxvQXw9nPMZKzJJqFwLOFxF/e4WBWZYqSh rPqqzdznvtWKspQD7hc2ZyGmC0xwSCXAi/jtGNZNi5R6diWw6km3l1JEBDNyhCU9KW8f/Y 0aUMLSyoRLxKE7lSRVDSyvIBJyPTg2DPweJcoWgdcI0KJC2ifjLQ/0RGuygTw76E9lEo5/ lmTPy+YT8qDfcTr5nUTeVYWTQPA3LMrUuTfUHhYZ3YwNeOoPJUTbiLJjXmGe3LvbhiM0vJ g+8rZx0lfTIwaBstBtBB/7FMKtdziHKE5RkAd0tY2MYycI8DIZTo+4ldFQrHaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755910751; 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=7h9st3jxUcGiWgUZBd6eTZ7DffOzM7vJfCNkNMBTNUY=; b=PmtZGiaAa21rKqewif0zGW7Ff98iY3X4788Fp8pA66oCJefq6Q4rC7WzGrqv0zW3JKd3jk iIOmejOF4uYBJ5Pa145/HKAnqoNeXfNmoNd/0+FbOd2VUuSdkLMUb7hW/s91sWldCxpW3Q KI7ZYhkfdwbNQEjP3F0pGSwpCF3vNXcFDmElMD+OFDKGRxNAvlu6EQyc2HmGAteraVMTuA WuxOXYsXGbYfGWOORDaHVJax691CmugpGBKbpKAqMJKJ35kQg2mO1B9mOQvb0qkjqdaQvR PcIf0eOo0/rMzjpZWU7HigbIexAU238raLqF40uviqDH7CZVmBRSZS6gCo15bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755910751; a=rsa-sha256; cv=none; b=yR5K/VNzg+g+U44rcVpqbGwMZ0gYHt0wI6vZke776GSkQ6VwZMPPLunNHRi2QGtDJDlh5w K2vN4N5+pHgFV4uJZdC7yaiExCjj1Ca0GaNMJv72ddrO/R2pju/p1rvD+6oAxhXQ2EBhcv iklZXViTaxDCQ4F0MYVxfXRGzth4nnjVcQ3ajc49V9sxxoO2EkcQ5oETSmwFRB55zBBhbc YuVtVrOG2MXpJlOxErSyHLymrbBXCzVVPRe8gy97/z+jgqMY+A0XqaeNnY8nOjeiAjiZ0G GBNGirkEy/iaIBKGyOK3xol5QPSE8b/GRcGeXPzaX0KeRhjCq44Zy3pskzyW+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7zGQ5MfGz18cl; Sat, 23 Aug 2025 00:59:10 +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 57N0xAfg080285; Sat, 23 Aug 2025 00:59:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0xAWm080282; Sat, 23 Aug 2025 00:59:10 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:59:10 GMT Message-Id: <202508230059.57N0xAWm080282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 110a2fa97d51 - main - bridge: Restore ABI compatibility with 14.x 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 110a2fa97d513c424105cbc113ab0fc36f1f2d36 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=110a2fa97d513c424105cbc113ab0fc36f1f2d36 commit 110a2fa97d513c424105cbc113ab0fc36f1f2d36 Author: Lexi Winter AuthorDate: 2025-08-22 23:43:48 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 23:43:48 +0000 bridge: Restore ABI compatibility with 14.x When new fields were added to struct ifbreq in 15.0, the decision was made to not use the padding to preserve binary compatibility. However this causes some issues, including the inability for 14.x jails to use bridges, and a failure to bring up networking when booting a 15 kernel with a 14.x userland, e.g. during upgrade. Restore the old size of struct ifbreq by eating some of the padding. This only requires 4 bytes of padding; we have 28 bytes left, and in the medium term this problem will be solved with a netlink interface, so running out of padding should not be a concern. Fixes: 65ed1a035ceb ("bridge: allow member interface vlan to be configured") Fixes: f94c370de6e7 ("bridge: Allow VLAN protocol to be configured") Reviewed by: zlei, kevans, flo Differential Revision: https://reviews.freebsd.org/D52028 --- UPDATING | 9 +++++++++ sys/net/if_bridgevar.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 575669b8bc64..da6089ad16d8 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20250823: + To restore bridge(4)'s ABI compatibility with ifconfig from 14.x or + earlier, the size of struct ifbreq has changed, so you must update + the kernel and /sbin/ifconfig at the same time or you will not be + able to add interfaces to bridge. This is particularly important + if you require bridge for network access during boot, in which case + you should install the new kernel and the new /sbin/ifconfig prior + to rebooting. + 20250820: The WITHOUT_GSSAPI src.conf knob has been removed. This was already a no-op for MIT Kerberos, so this only affects builds which set diff --git a/sys/net/if_bridgevar.h b/sys/net/if_bridgevar.h index b0f579f688ac..5ed8c19f3128 100644 --- a/sys/net/if_bridgevar.h +++ b/sys/net/if_bridgevar.h @@ -159,7 +159,7 @@ struct ifbreq { uint32_t ifbr_addrexceeded; /* member if addr violations */ ether_vlanid_t ifbr_pvid; /* member if PVID */ uint16_t ifbr_vlanproto; /* member if VLAN protocol */ - uint8_t pad[32]; + uint8_t pad[28]; }; /* BRDGGIFFLAGS, BRDGSIFFLAGS */ From nobody Sat Aug 23 00:59:11 2025 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 4c7zGS1DDBz65VRM; Sat, 23 Aug 2025 00:59:12 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7zGR60N1z3hDd; Sat, 23 Aug 2025 00:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755910751; 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=+0qOcVCDC4d+5oE99S+BAV2HCUAsIWMx6GA/1Q9fE5E=; b=Qx77tZDA7ga3J0ZwAxZjOpq7hhdgJXqdznqeEkPceTAR4iWlOKiMOhqZ+P6r0HJE0PNPbi /4pDsvfciig29rdSagKzp466u0JWhi4SheZEpcyoPyWlbUMvrCatV3SW01KTBycmAkQwh4 hB9sMemaQ8sZMrUY2jXskw2Y0cjI9LYhWeU8Gx0yemkWsAupwj9GCAtm78Agb1guXN9ykC Fm+v/TE7t9pJmhluGgQP1zLhtyUnP36BcywNuY8SYyja5NABLslQcaY86zoeYf4vgyaGzp +kzVLR/SzM77YrEyj3qedyhgvNWtr6U8xKfC79gJ1lOgcR28tTyVwZfRNzCttQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755910751; 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=+0qOcVCDC4d+5oE99S+BAV2HCUAsIWMx6GA/1Q9fE5E=; b=Odk1I2263KFYvU4pIO8KCD7lywDqM40vKWqz5MhM4I2h6YJH87b54G5sLUu7zV8scMXMDA K05+NdrUcApjsfdqjsyxC9cz90m7T/ggsptug0EGpNfOzCCGwwDic9yk+pX6j1c0fyzK71 OZRSXrrVZrv7pOBu3SxfcaY/pa7OEPbXCgaHMeTC/zYZLvHpF7APIwpWY7qJJayA8RCKJ7 trxea04qSF+CcPJxCnqAXEmhoYOoj5Hje4UIXhCVUSBd6rp8gcor6lx7ldNm5MLTS9ogw+ VKIjTxJMFROJ9Gvc9eemPepJL9Gmrb9HADcjuusUURLe4RENgt7IZem6eJKeDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755910751; a=rsa-sha256; cv=none; b=ZXpnjzw3iKknr5oFSs1j7ROELUbV06qryhrsgZJ/5JYIAvKUZ9y4svxCGAa7cfqkt+CLLt PzHkknGWy14XxKuKm1RkWoNiT75WxqtlCCyO0Ih5o9eaG0Ky0h7PNWIeYKcz3Rzr65MN3D /0lP70KB5HTsedj3kPYxVviO+ZbhLzL9P0kSBFARwBBSLyKOcHcBwbwKp32e1CVrbrH9jg i0XVXt9vyfQ6LmYoT2FgR9mFFM1kl84HbefbFHLogWdvlY9qZ3jQMeWAlWjjEriihP/x6T fFPaG4eDWAal1eglTMhopHI2aXOP1oA1E53Q0j9TVzt2x7AkFgrdi+o9klKTMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7zGR5S4Zz18Ns; Sat, 23 Aug 2025 00:59:11 +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 57N0xB89080317; Sat, 23 Aug 2025 00:59:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0xBZO080314; Sat, 23 Aug 2025 00:59:11 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:59:11 GMT Message-Id: <202508230059.57N0xBZO080314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 1fc995f9e204 - main - package: Update description for sendmail and dma 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1fc995f9e2040293351204265900cb45c06f33b7 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1fc995f9e2040293351204265900cb45c06f33b7 commit 1fc995f9e2040293351204265900cb45c06f33b7 Author: Lexi Winter AuthorDate: 2025-08-22 23:46:09 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 23:46:09 +0000 package: Update description for sendmail and dma Provide a more useful package description for sendmail and dma, so users have some idea what they're actually for. For sendmail, follow upstream's convention of spelling the product name in lower case. While here, use the upstream text to describe libmilter. Differential Revision: https://reviews.freebsd.org/D51975 --- release/packages/ucl/dma-all.ucl | 12 ++++++++++-- release/packages/ucl/libmilter-all.ucl | 9 +++++---- release/packages/ucl/sendmail-all.ucl | 15 +++++++++++++-- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/release/packages/ucl/dma-all.ucl b/release/packages/ucl/dma-all.ucl index e8824acf7a36..63d6c86b0be4 100644 --- a/release/packages/ucl/dma-all.ucl +++ b/release/packages/ucl/dma-all.ucl @@ -1,4 +1,12 @@ -comment = "DMA Mail Agent Utilities" +comment = "DragonFly Mail Agent" desc = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 929f5966a9fd - main - packages: Improve handling of -lib packages 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 929f5966a9fd3d050c7b604513c6fb4ac9b5d335 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=929f5966a9fd3d050c7b604513c6fb4ac9b5d335 commit 929f5966a9fd3d050c7b604513c6fb4ac9b5d335 Author: Lexi Winter AuthorDate: 2025-08-22 23:50:20 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:57:23 +0000 packages: Improve handling of -lib packages For some packages (OpenSSL, Kerberos) we want to ship runtime libraries in a separate package, e.g. openssl and openssl-lib. Currently this is done using PACKAGE=openssl-lib, but that creates packages with strange names like openssl-lib-lib32. Instead, add a new LIB_PACKAGE option to bsd.lib.mk that causes runtime libraries to be placed in a new -lib subpackage. This significantly improves the set of packages we create; for example, OpenSSL goes from: FreeBSD-openssl FreeBSD-openssl-dbg FreeBSD-openssl-lib FreeBSD-openssl-lib-dbg FreeBSD-openssl-lib-dbg-lib32 FreeBSD-openssl-lib-dev FreeBSD-openssl-lib-dev-lib32 FreeBSD-openssl-lib-lib32 FreeBSD-openssl-lib-man FreeBSD-openssl-man to: FreeBSD-openssl FreeBSD-openssl-dbg FreeBSD-openssl-dbg-lib32 FreeBSD-openssl-dev FreeBSD-openssl-dev-lib32 FreeBSD-openssl-lib FreeBSD-openssl-lib32 FreeBSD-openssl-man While here, move /usr/bin/krb5-config and /usr/bin/compile_et into the kerberos-dev package. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D51925 --- UPDATING | 7 +++++ krb5/Makefile.inc | 1 + krb5/include/Makefile | 2 -- krb5/include/Makefile.inc | 2 -- krb5/lib/Makefile.inc | 2 +- krb5/libexec/Makefile.inc | 2 +- krb5/usr.bin/Makefile.inc | 1 - krb5/usr.sbin/gss-server/Makefile | 2 -- krb5/usr.sbin/sim_server/Makefile | 2 -- krb5/usr.sbin/sserver/Makefile | 2 -- krb5/util/Makefile.inc | 2 ++ krb5/util/build-tools/Makefile | 3 +- krb5/util/compile_et/Makefile | 3 +- krb5/util/et/Makefile | 3 +- krb5/util/profile/Makefile | 2 -- krb5/util/ss/Makefile | 2 -- krb5/util/support/Makefile | 2 -- krb5/util/verto/Makefile | 2 -- lib/libcrypt/Makefile | 2 +- release/packages/generate-ucl.lua | 7 +++++ release/packages/generate-ucl.sh | 3 ++ release/packages/ucl/kerberos-lib-all.ucl | 4 --- release/packages/ucl/openssl-lib-all.ucl | 4 --- secure/lib/libcrypto/Makefile | 1 - secure/lib/libcrypto/Makefile.inc | 3 ++ secure/lib/libcrypto/engines/Makefile.inc | 3 +- secure/lib/libcrypto/modules/Makefile.inc | 3 +- secure/lib/libssl/Makefile | 1 - share/mk/bsd.lib.mk | 49 ++++++++++++++++++++++--------- 29 files changed, 68 insertions(+), 54 deletions(-) diff --git a/UPDATING b/UPDATING index da6089ad16d8..ddb2e7603b2a 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20250823: + The set of pkgbase packages for Kerberos and OpenSSL has changed. + After updating past 250e77d4f0a5, you should check 'pkg orphans' + and remove any orphaned packages, then examine the output of + 'pkg install -r base -g FreeBSD-openssl\* FreeBSD-kerberos\*' + and install any new packages you need. + 20250823: To restore bridge(4)'s ABI compatibility with ifconfig from 14.x or earlier, the size of struct ifbreq has changed, so you must update diff --git a/krb5/Makefile.inc b/krb5/Makefile.inc index 6db4e8d964aa..512d153126e8 100644 --- a/krb5/Makefile.inc +++ b/krb5/Makefile.inc @@ -9,6 +9,7 @@ .include +PACKAGE?= kerberos KRB5_VERSION= 1.22-final # MIT KRB5 uses KRB5_DIR. Heimdal uses KRB5DIR. diff --git a/krb5/include/Makefile b/krb5/include/Makefile index 759c81685da9..8ce743e95d95 100644 --- a/krb5/include/Makefile +++ b/krb5/include/Makefile @@ -7,8 +7,6 @@ # under sponsorship from the FreeBSD Foundation. # -PACKAGE= kerberos-lib - .include .include "../Makefile.inc" diff --git a/krb5/include/Makefile.inc b/krb5/include/Makefile.inc index 5c21860b6157..8005a7b99e37 100644 --- a/krb5/include/Makefile.inc +++ b/krb5/include/Makefile.inc @@ -7,6 +7,4 @@ # under sponsorship from the FreeBSD Foundation. # -PACKAGE= kerberos-lib - .include "../Makefile.inc" diff --git a/krb5/lib/Makefile.inc b/krb5/lib/Makefile.inc index 50cacb9492ac..7fc36229a864 100644 --- a/krb5/lib/Makefile.inc +++ b/krb5/lib/Makefile.inc @@ -9,7 +9,7 @@ .include "../Makefile.inc" -PACKAGE?= kerberos-lib +LIB_PACKAGE= KRB5_KRB5LIBDIR= ${KRB5_SRCLIBDIR}/krb5 KRB5_K5CRYPTODIR= ${KRB5_SRCLIBDIR}/crypto diff --git a/krb5/libexec/Makefile.inc b/krb5/libexec/Makefile.inc index 9bec75eba9cb..b40d1999f23f 100644 --- a/krb5/libexec/Makefile.inc +++ b/krb5/libexec/Makefile.inc @@ -9,5 +9,5 @@ .include "../Makefile.inc" -PACKAGE?= kerberos-kdc +PACKAGE= kerberos-kdc BINDIR?= /usr/libexec diff --git a/krb5/usr.bin/Makefile.inc b/krb5/usr.bin/Makefile.inc index edd734628950..55e21f80936c 100644 --- a/krb5/usr.bin/Makefile.inc +++ b/krb5/usr.bin/Makefile.inc @@ -9,5 +9,4 @@ .include "../Makefile.inc" -PACKAGE?= kerberos BINDIR?= /usr/bin diff --git a/krb5/usr.sbin/gss-server/Makefile b/krb5/usr.sbin/gss-server/Makefile index 67a51edb45b3..6b56e11f0ac4 100644 --- a/krb5/usr.sbin/gss-server/Makefile +++ b/krb5/usr.sbin/gss-server/Makefile @@ -7,8 +7,6 @@ # under sponsorship from the FreeBSD Foundation. # -PACKAGE= kerberos - PROG= gss-server LIBADD= gssapi_krb5 krb5 k5crypto com_err krb5profile krb5support sys diff --git a/krb5/usr.sbin/sim_server/Makefile b/krb5/usr.sbin/sim_server/Makefile index d46942e0cb91..ddeff682466f 100644 --- a/krb5/usr.sbin/sim_server/Makefile +++ b/krb5/usr.sbin/sim_server/Makefile @@ -7,8 +7,6 @@ # under sponsorship from the FreeBSD Foundation. # -PACKAGE= kerberos - PROG= sim_server LIBADD= krb5 k5crypto com_err krb5profile krb5support sys diff --git a/krb5/usr.sbin/sserver/Makefile b/krb5/usr.sbin/sserver/Makefile index 67cdf9777742..ae5e120848ff 100644 --- a/krb5/usr.sbin/sserver/Makefile +++ b/krb5/usr.sbin/sserver/Makefile @@ -7,8 +7,6 @@ # under sponsorship from the FreeBSD Foundation. # -PACKAGE= kerberos - PROG= sserver LIBADD= krb5 k5crypto com_err krb5profile krb5support sys diff --git a/krb5/util/Makefile.inc b/krb5/util/Makefile.inc index e9357fa4cc66..f1e61f498a4c 100644 --- a/krb5/util/Makefile.inc +++ b/krb5/util/Makefile.inc @@ -9,5 +9,7 @@ .include "../Makefile.inc" +LIB_PACKAGE= + SHLIBDIR?= /usr/lib SHLIB_MAJOR?= 122 diff --git a/krb5/util/build-tools/Makefile b/krb5/util/build-tools/Makefile index 53de0be92fd2..8bafbb777c07 100644 --- a/krb5/util/build-tools/Makefile +++ b/krb5/util/build-tools/Makefile @@ -7,12 +7,11 @@ # under sponsorship from the FreeBSD Foundation. # -PACKAGE= kerberos-lib - .include "../Makefile.inc" SCRIPTS= krb5-config.sh BINDIR?= /usr/bin +TAGS= dev MAN= krb5-config.1 diff --git a/krb5/util/compile_et/Makefile b/krb5/util/compile_et/Makefile index 015ef088d90f..fb87de3dd9c6 100644 --- a/krb5/util/compile_et/Makefile +++ b/krb5/util/compile_et/Makefile @@ -7,8 +7,6 @@ # under sponsorship from the FreeBSD Foundation. # -PACKAGE= kerberos - .include "../Makefile.inc" SRC_ETDIR= ${KRB5_DIR}/util/et @@ -18,6 +16,7 @@ SCRIPTS= compile_et BINDIR?= /usr/bin MAN= compile_et.1 CLEANFILES= compile_et +TAGS+= dev compile_et: compile_et.sh sh ${SRC_ETDIR}/config_script ${SRC_ETDIR}/compile_et.sh \ diff --git a/krb5/util/et/Makefile b/krb5/util/et/Makefile index 0d474efa1e8e..35ac601629d7 100644 --- a/krb5/util/et/Makefile +++ b/krb5/util/et/Makefile @@ -7,8 +7,6 @@ # under sponsorship from the FreeBSD Foundation. # -PACKAGE= kerberos-lib - .include .include "../Makefile.inc" @@ -44,6 +42,7 @@ ETSCRIPTS= et_c.awk \ ETSCRIPTSDIR= ${KRB5_ETDIR} ETSCRIPTSMODE= 0444 +ETSCRIPTSTAGS= dev .include diff --git a/krb5/util/profile/Makefile b/krb5/util/profile/Makefile index 751d648fa58e..e62d66636161 100644 --- a/krb5/util/profile/Makefile +++ b/krb5/util/profile/Makefile @@ -7,8 +7,6 @@ # under sponsorship from the FreeBSD Foundation. # -PACKAGE= kerberos-lib - .include .include "../Makefile.inc" diff --git a/krb5/util/ss/Makefile b/krb5/util/ss/Makefile index ac01f683ff67..2c48ccf56573 100644 --- a/krb5/util/ss/Makefile +++ b/krb5/util/ss/Makefile @@ -7,8 +7,6 @@ # under sponsorship from the FreeBSD Foundation. # -PACKAGE= kerberos-lib - .include .include "../Makefile.inc" diff --git a/krb5/util/support/Makefile b/krb5/util/support/Makefile index f73f5d31990a..e2e677fee89d 100644 --- a/krb5/util/support/Makefile +++ b/krb5/util/support/Makefile @@ -7,8 +7,6 @@ # under sponsorship from the FreeBSD Foundation. # -PACKAGE= kerberos-lib - .include .include "../Makefile.inc" diff --git a/krb5/util/verto/Makefile b/krb5/util/verto/Makefile index 66d9d8ef4e0b..3ae9da9df20b 100644 --- a/krb5/util/verto/Makefile +++ b/krb5/util/verto/Makefile @@ -7,8 +7,6 @@ # under sponsorship from the FreeBSD Foundation. # -PACKAGE= kerberos-lib - .include .include "../Makefile.inc" diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index e939bae1bc25..2580c398155e 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -45,7 +45,7 @@ libcrypt.ald: ${.CURDIR}/${STATIC_LDSCRIPT} all: ${STATIC_LDSCRIPT} libcrypt.ald install-libcrypt.a: libcrypt.ald - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} ${DEV_TAG_ARGS} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} libcrypt.ald ${DESTDIR}${_LIBDIR}/lib${LIB}.a realinstall: install-libcrypt.a diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua index a243c6ea7ad0..5637bbd3ad99 100755 --- a/release/packages/generate-ucl.lua +++ b/release/packages/generate-ucl.lua @@ -38,6 +38,10 @@ pkg_suffixes = { "This package contains 32-bit libraries for running 32-bit ".. "applications on a 64-bit host.", }, + { + "%-lib$", "(libraries)", + "This package contains runtime shared libraries.", + }, { "%-dev$", "(development files)", "This package contains development files for ".. @@ -98,6 +102,9 @@ function add_gen_dep(pkgname, pkggenname) if no_gen_deps[pkgname] ~= nil then return false end + if pkgname:match("%-lib$") ~= nil then + return false + end if pkggenname == "kernel" then return false end diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 3078185a3c4e..a08840d5b321 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -49,6 +49,9 @@ main() { *-lib32) outname="${outname%%-lib32}" ;; + *-lib) + outname="${outname%%-lib}" + ;; *-man) outname="${outname%%-man}" ;; diff --git a/release/packages/ucl/kerberos-lib-all.ucl b/release/packages/ucl/kerberos-lib-all.ucl deleted file mode 100644 index b524563a976d..000000000000 --- a/release/packages/ucl/kerberos-lib-all.ucl +++ /dev/null @@ -1,4 +0,0 @@ -comment = "Kerberos libraries" -desc = < .include -PACKAGE= openssl-lib LIB= crypto SHLIB_MAJOR= 35 VERSION_MAP= ${.CURDIR}/Version.map diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index f0ed4a5f3651..4d5e9c68a1fe 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -1,5 +1,8 @@ .include +PACKAGE= openssl +LIB_PACKAGE= + # OpenSSL version used for manual page generation .include "Makefile.version" diff --git a/secure/lib/libcrypto/engines/Makefile.inc b/secure/lib/libcrypto/engines/Makefile.inc index 777193ba3f9a..146c2f794eb6 100644 --- a/secure/lib/libcrypto/engines/Makefile.inc +++ b/secure/lib/libcrypto/engines/Makefile.inc @@ -1,4 +1,5 @@ -PACKAGE?= openssl-lib +PACKAGE?= openssl +LIB_PACKAGE= SHLIBDIR= ${LIBDIR}/engines-3 diff --git a/secure/lib/libcrypto/modules/Makefile.inc b/secure/lib/libcrypto/modules/Makefile.inc index 363b7f4bc766..4b3d9fc512ce 100644 --- a/secure/lib/libcrypto/modules/Makefile.inc +++ b/secure/lib/libcrypto/modules/Makefile.inc @@ -1,4 +1,5 @@ -PACKAGE?= openssl-lib +PACKAGE?= openssl +LIB_PACKAGE= SHLIBDIR= ${LIBDIR}/ossl-modules LCRYPTO_SRC= ${SRCTOP}/crypto/openssl diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index 682c7bbc2693..acb63549c1c8 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -3,7 +3,6 @@ LIB= ssl SHLIB_MAJOR= 35 VERSION_MAP= ${.CURDIR}/Version.map -PACKAGE= openssl-lib NO_LINT= diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index fa851984df91..6caad8956c14 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -52,11 +52,31 @@ TAGS+= lib${_libcompat} .if defined(NO_ROOT) .if !defined(TAGS) || ! ${TAGS:Mpackage=*} -TAGS+= package=${PACKAGE:Uutilities} +TAGS+= package=${PACKAGE:Uutilities} .endif -TAG_ARGS= -T ${TAGS:ts,:[*]} + +# By default, if PACKAGE=foo, then the native runtime libraries will go into +# the FreeBSD-foo package, and subpackages will be created for -dev, -lib32, +# and so on. If LIB_PACKAGE is set, then we also create a subpackage for +# runtime libraries with a -lib suffix. This is used when a package has +# libraries and some other content (e.g., executables) to allow consumers to +# depend on the libraries. +.if defined(LIB_PACKAGE) && ! ${TAGS:Mlib*} +.if !defined(PACKAGE) +.error LIB_PACKAGE cannot be used without PACKAGE +.endif + +LIB_TAG_ARGS= ${TAG_ARGS},lib +.else +LIB_TAG_ARGS= ${TAG_ARGS} .endif +TAG_ARGS= -T ${TAGS:ts,:[*]} + +DBG_TAG_ARGS= ${TAG_ARGS},dbg +DEV_TAG_ARGS= ${TAG_ARGS},dev +.endif # !defined(NO_ROOT) + # ELF hardening knobs .if ${MK_BIND_NOW} != "no" LDFLAGS+= -Wl,-znow @@ -355,7 +375,7 @@ _SHLINSTALLFLAGS:= ${_SHLINSTALLFLAGS${ie}} installpcfiles: installpcfiles-${pcfile} installpcfiles-${pcfile}: ${pcfile} - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} ${DEV_TAG_ARGS} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} \ ${.ALLSRC} ${DESTDIR}${LIBDATADIR}/pkgconfig/ .endfor @@ -367,37 +387,38 @@ realinstall: _libinstall installpcfiles _debuginstall .ORDER: beforeinstall _libinstall _debuginstall _libinstall: .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} ${DEV_TAG_ARGS} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}${_STATICLIB_SUFFIX}.a ${DESTDIR}${_LIBDIR}/ .endif .if defined(SHLIB_NAME) - ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} ${LIB_TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/ .if defined(SHLIB_LINK) .if commands(${SHLIB_LINK:R}.ld) - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} ${DEV_TAG_ARGS} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${SHLIB_LINK:R}.ld \ ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} .for _SHLIB_LINK_LINK in ${SHLIB_LDSCRIPT_LINKS} - ${INSTALL_LIBSYMLINK} ${_SHLINSTALLSYMLINKFLAGS} ${TAG_ARGS} ${SHLIB_LINK} \ - ${DESTDIR}${_LIBDIR}/${_SHLIB_LINK_LINK} + ${INSTALL_LIBSYMLINK} ${_SHLINSTALLSYMLINKFLAGS} ${LIB_TAG_ARGS} \ + ${SHLIB_LINK} ${DESTDIR}${_LIBDIR}/${_SHLIB_LINK_LINK} .endfor .else .if ${_SHLIBDIR} == ${_LIBDIR} .if ${SHLIB_LINK:Mlib*} - ${INSTALL_RSYMLINK} ${_SHLINSTALLSYMLINKFLAGS} ${TAG_ARGS:D${TAG_ARGS},dev} \ + ${INSTALL_RSYMLINK} ${_SHLINSTALLSYMLINKFLAGS} ${DEV_TAG_ARGS} \ ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} .else - ${INSTALL_RSYMLINK} ${_SHLINSTALLSYMLINKFLAGS} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ + ${INSTALL_RSYMLINK} ${_SHLINSTALLSYMLINKFLAGS} ${LIB_TAG_ARGS} \ + ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} .endif .else .if ${SHLIB_LINK:Mlib*} - ${INSTALL_RSYMLINK} ${_SHLINSTALLSYMLINKFLAGS} ${TAG_ARGS:D${TAG_ARGS},dev} \ + ${INSTALL_RSYMLINK} ${_SHLINSTALLSYMLINKFLAGS} ${DEV_TAG_ARGS} \ ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} .else - ${INSTALL_RSYMLINK} ${_SHLINSTALLSYMLINKFLAGS} ${TAG_ARGS} \ + ${INSTALL_RSYMLINK} ${_SHLINSTALLSYMLINKFLAGS} ${LIB_TAG_ARGS} \ ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} .endif .if exists(${DESTDIR}${_LIBDIR}/${SHLIB_NAME}) @@ -409,7 +430,7 @@ _libinstall: .endif # SHLIB_LINK .endif # SHIB_NAME .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} ${DEV_TAG_ARGS} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}/ .endif .endif # !defined(INTERNALLIB) @@ -429,7 +450,7 @@ LINKGRP?= ${LIBGRP} LINKMODE?= ${LIBMODE} SYMLINKOWN?= ${LIBOWN} SYMLINKGRP?= ${LIBGRP} -LINKTAGS= dev +LINKTAGS= dev${_COMPAT_TAG} .include .if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY) From nobody Sat Aug 23 00:59:13 2025 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 4c7zGV4ZvHz65V7p; Sat, 23 Aug 2025 00:59:14 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7zGV0X3Rz3hPy; Sat, 23 Aug 2025 00:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755910754; 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=Ex59VnEVwezVi7g2rTRe3DJvyeT1G/DTQQ1fnMj48ks=; b=oKcWB259bTdPQu1CCP8YVnCqK6cilQtTPsPOPbzMjGVyMsBcZe4DSocoG0/iCOTwLEB1p3 KW/Fe26WpgmR19YWmz+Ev+5kk/yS829cUoEO124mvIGK3cQYKVXh2MCV0b/VYMBUhwdSsx T7sd4zWDfg4g7r8m5IZ7Nco/Ds4vCcg4JTeX2rSv5RkstLY2KkrObTg8T/zi5roeqsVauW C9wFZUWZ82peOYv8tzbsBcFHdrUUTsoZP5A2uTbnps4+0M8vHOdSJWFFOQiaYbnsWytXbP aiO6aIOYfy+f2MIOypbnotRbhqfwXMBcVD5L8HX788DzGeVugB9pwNYRAkSYIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755910754; 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=Ex59VnEVwezVi7g2rTRe3DJvyeT1G/DTQQ1fnMj48ks=; b=u2kco29eNn7aOMF65eLmZEC5oP9dWCyHwtfCJ6KtxdHQODC3qGdzgu5R8giodZ5Ap21+yQ H+Q/eLcubV/Be4anVfVUxHSBleAuP4vkgqgU4evxk7XN8TgelvhA+k1RSGvsXKwEZI9AuB 1iV8pbs5ZXUV2WW/M3l4gISGf/aWKdb0a6eEexR+qpeH40X+MRcTpt0VarxRdrjlzzfj/C nHBPbR0SqGHnptolw39ABEO0FOpeogh2yu3dGtf9KnPUTJByx/X0sST8kyVNcVz5otgGP+ 4HN60tI3DXK//+LLS65d8LjDA7oL/4/67pcl0DIW3qZu4iffrw6ABu+Kkb88Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755910754; a=rsa-sha256; cv=none; b=njINVrpYrIJVGMzWV9fWfP85k8879Qakg9yHsrza5wzURQhW8dLEN/98eleZz8CC4TzMyA W/y4wEc+ZpTcPdkrqDoMJREGPF8rSvR2N2vYNmc3LxK6uFkh9kP2f6SrtxdbzzFW5h0wlw J5HKTEx2QhiTmQr0Wdc+k6rJkAVQzazfUvJFEmDXhtGvAFJENsWivBUN85aaxMP9MrP9Zs 8qgELoesW0WesPrQ9zIRoytwDUEwx5RnU5rYZ+PRz2S3MSnDcTb9OzkXF2mAbZJHMmZL5z xpoO8eLQb8qFqpAanSiOaa4KCXhkdpORt1TExC5d0atugRTi3Ko9tZTjcb/3Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7zGV010cz17w0; Sat, 23 Aug 2025 00:59:14 +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 57N0xDlT080381; Sat, 23 Aug 2025 00:59:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0xDYY080378; Sat, 23 Aug 2025 00:59:13 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:59:13 GMT Message-Id: <202508230059.57N0xDYY080378@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 1a80bcc5fafa - main - Remove redundant PACKAGE for INTERNALLIB libraries 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a80bcc5fafaa822e281bf963e7c58a8747a610c Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1a80bcc5fafaa822e281bf963e7c58a8747a610c commit 1a80bcc5fafaa822e281bf963e7c58a8747a610c Author: Lexi Winter AuthorDate: 2025-08-22 23:51:13 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:57:23 +0000 Remove redundant PACKAGE for INTERNALLIB libraries These libraries don't install anything, so they shouldn't have a PACKAGE setting. This avoids surprising behaviour in future if e.g. manpages are added to an internal library. Reported by: des Differential Revision: https://reviews.freebsd.org/D51901 --- lib/libifconfig/Makefile | 1 - lib/libiscsiutil/Makefile | 1 - lib/libnetbsd/Makefile | 1 - lib/libnvmf/Makefile | 1 - lib/libopenbsd/Makefile | 1 - lib/libpfctl/Makefile | 1 - lib/libpmcstat/Makefile | 1 - lib/libsm/Makefile | 1 - lib/libsmdb/Makefile | 1 - lib/libsmutil/Makefile | 1 - lib/libtelnet/Makefile | 1 - 11 files changed, 11 deletions(-) diff --git a/lib/libifconfig/Makefile b/lib/libifconfig/Makefile index e8e0651dc0d6..fb7c659e068c 100644 --- a/lib/libifconfig/Makefile +++ b/lib/libifconfig/Makefile @@ -1,4 +1,3 @@ -PACKAGE= lib${LIB} LIB= ifconfig INTERNALLIB= true diff --git a/lib/libiscsiutil/Makefile b/lib/libiscsiutil/Makefile index c99fb6366536..d9762302fd40 100644 --- a/lib/libiscsiutil/Makefile +++ b/lib/libiscsiutil/Makefile @@ -1,6 +1,5 @@ LIB= iscsiutil INTERNALLIB= -PACKAGE= iscsi INCS= libiscsiutil.h diff --git a/lib/libnetbsd/Makefile b/lib/libnetbsd/Makefile index 1639caf20d6b..4088c2b57176 100644 --- a/lib/libnetbsd/Makefile +++ b/lib/libnetbsd/Makefile @@ -1,6 +1,5 @@ .include -PACKAGE=lib${LIB} LIB= netbsd CFLAGS+= -I${.CURDIR} diff --git a/lib/libnvmf/Makefile b/lib/libnvmf/Makefile index b01f5ab82cac..945c31a2986c 100644 --- a/lib/libnvmf/Makefile +++ b/lib/libnvmf/Makefile @@ -3,7 +3,6 @@ LIB= nvmf INTERNALLIB= -PACKAGE= nvmf INCS= libnvmf.h diff --git a/lib/libopenbsd/Makefile b/lib/libopenbsd/Makefile index dca1c08b0aed..53bd0200934f 100644 --- a/lib/libopenbsd/Makefile +++ b/lib/libopenbsd/Makefile @@ -1,4 +1,3 @@ -PACKAGE=lib${LIB} LIB= openbsd SRCS= imsg-buffer.c \ imsg.c \ diff --git a/lib/libpfctl/Makefile b/lib/libpfctl/Makefile index d301d7850b44..4b16d81181a3 100644 --- a/lib/libpfctl/Makefile +++ b/lib/libpfctl/Makefile @@ -1,4 +1,3 @@ -PACKAGE= lib${LIB} LIB= pfctl INTERNALLIB= true diff --git a/lib/libpmcstat/Makefile b/lib/libpmcstat/Makefile index d1d23cdd57c7..7ca93329e20f 100644 --- a/lib/libpmcstat/Makefile +++ b/lib/libpmcstat/Makefile @@ -1,4 +1,3 @@ -PACKAGE=lib${LIB} LIB= pmcstat INTERNALLIB= diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile index 448abad59192..538407754f6a 100644 --- a/lib/libsm/Makefile +++ b/lib/libsm/Makefile @@ -1,6 +1,5 @@ .include -PACKAGE=sendmail SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsm diff --git a/lib/libsmdb/Makefile b/lib/libsmdb/Makefile index 898af78d6101..e82deda57615 100644 --- a/lib/libsmdb/Makefile +++ b/lib/libsmdb/Makefile @@ -1,4 +1,3 @@ -PACKAGE=lib${LIB} SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsmdb diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile index ef526ff8656d..37ad71e84f58 100644 --- a/lib/libsmutil/Makefile +++ b/lib/libsmutil/Makefile @@ -1,6 +1,5 @@ .include -PACKAGE=lib${LIB} SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsmutil diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index 6bc2f5a51de0..2eeac2d44f98 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -1,6 +1,5 @@ .include -PACKAGE=lib${LIB} TELNETDIR= ${SRCTOP}/contrib/telnet .PATH: ${TELNETDIR}/libtelnet From nobody Sat Aug 23 00:59:15 2025 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 4c7zGW6brGz65VM7; Sat, 23 Aug 2025 00:59:15 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7zGW3QFvz3hGp; Sat, 23 Aug 2025 00:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755910755; 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=0d6Gff90QLd3oEd8jGHhhaF3f7hO2jxVjrhoYVhc0lc=; b=ZMgusPVUP1z73pFJ6COpONeQRh6MlX+mzrThNyO7EkE45e6deA/CVHahds3a3jRkkIAKyi tpz+cQQc/KPgFR0Iq7lFTIf43oBJ8rN9Jzie0bMfmWyKBj1Yb5Hi+zMI6eIV/u+Du50mNE USprviLSRQkla46M+wqF0zLAxIci/W6jkOl1NnAaYhqdpx7qcqJJS/ZUD4jNnauR34k4vL /Pqedas7/0Vs3Ujh5LyuQmiJ6VvX+hjMerSxKP4HRTk6ToIxgZNWduL70JDKaSXVwoO5O3 ireLA3IunE9GqWYvUl2Sa8LIORx8Jl9zb1DRoJBiCs0T40PHG2Svaz2GpJS0Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755910755; 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=0d6Gff90QLd3oEd8jGHhhaF3f7hO2jxVjrhoYVhc0lc=; b=Q8IehbON9gbO5iEbCEcDkdkXgyT7uNRrWtz8kSIbxQl1FApUme9DHfi+ybHV+8NROuMPB4 qLC6+uNLJmYVSAlCiSdIIymp/kLGlAh3ZWMNHnwkFuLfPpjwmvr4j5ABdeUPSGpIYWj74I SCAkibCVxaYt0bKyNG7fetMBX/SKriZU0ZeWUE5/fmtCl43OqAsxekmlUtoOmdEIwcdIwQ B5cxDe1vseZvAC3tLI6q9tn0WA8ezBlQNeIDVWlEFLQD248wBfTJ9gZRm8cYXAfJ1C7vhD MpkgivPn1RbPPOIWmpIq+J7iG5OHlfl521bk1ahevgj51G2g2hWG8t8tM8bM6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755910755; a=rsa-sha256; cv=none; b=v/LKPeY4kTkBxhuCsArrBeHvbYZCcDPvvXbphisMYnycU+f3fg3+wcMUzyq4VlcOVyxRrr jUICEYdzDtpiuedkqS6qiLnB/b+M4pue1R8c3S2er5MANTvN0DEwCTto50u9V3nSVnY5bc fVEQYlGbgJODKvU9k8E8MvH5fxhrhpl6sFrCLlYzguGtaJ8xPrnfXia5T21MTDMIVEuGAB KoVbxzsgrQhchdMK4yuKUeE0WUOI6Epy1SawQtlou7eXLczsw9XNANw0wm+Ov06VJ1593n miL8QyTef4U3eOWVM5POPA2sFNfy6q/PWE1iQUBgft1PYqteVwaKSZMQc6pm9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7zGW0wz3z18Rd; Sat, 23 Aug 2025 00:59:15 +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 57N0xFnE080419; Sat, 23 Aug 2025 00:59:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0xFnQ080416; Sat, 23 Aug 2025 00:59:15 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:59:15 GMT Message-Id: <202508230059.57N0xFnQ080416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 649e8a3ea4ca - main - libelftc: Move to toolchain package 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 649e8a3ea4ca16a5f1ebd48cc445dd18f6eee046 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=649e8a3ea4ca16a5f1ebd48cc445dd18f6eee046 commit 649e8a3ea4ca16a5f1ebd48cc445dd18f6eee046 Author: Lexi Winter AuthorDate: 2025-08-22 23:52:19 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:57:23 +0000 libelftc: Move to toolchain package This is where the rest of ElfToolchain lives now. Note that this library only installs manpages. Reported by: des Differential Revision: https://reviews.freebsd.org/D51899 --- lib/libelftc/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libelftc/Makefile b/lib/libelftc/Makefile index a932b0c4b2a4..a6079b817d87 100644 --- a/lib/libelftc/Makefile +++ b/lib/libelftc/Makefile @@ -1,5 +1,6 @@ .include +PACKAGE= toolchain INTERNALLIB= ELFTCDIR= ${SRCTOP}/contrib/elftoolchain From nobody Sat Aug 23 04:50:59 2025 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 4c84Pv4ZPTz65Hc9; Sat, 23 Aug 2025 04:50:59 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c84Pv3sb6z46lW; Sat, 23 Aug 2025 04:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755924659; 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=IavJ2lyYmNgqt5b72yjYi8Jt6N2Vtj3Map19LtC8jtE=; b=ueyPvlT4tvdWPI12wL2hvcaUaKKpaKzpEpWOGgH2t83DTIDmDk3wnIF43+jNqbNoecp0jH PqSu96FmYuwz/rMELYGN6LJflXaUgK7LKQK6xIoUDdA3l47lcZhzm2DZadlvtulIKetwm4 aqHDkkcS0EjuOMbY8LSU3dzsaSHP3Ykw9/Z5MGAn/Q1hKb+1PJtzstSOHo8v07bBzdr6ra b5mucf5QKkhsb5n1brcczwEZSQnIPtTzM73NV6yt40U8EkZZn9GjObYgXne94rwm5epjl8 kwpB+tQHOKbg23IpA8dIxAkglT6UK5kF5mGZAx5/Sx/QvjPlxwtpMSoc3RuiIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755924659; 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=IavJ2lyYmNgqt5b72yjYi8Jt6N2Vtj3Map19LtC8jtE=; b=xrbQU/04eQciqlsUOdG8y/HmNz1Us9vFE1fTZRMHnZPSktjXZAzLhfVaXpxHdYfZKWH7mD RI1PDMH6Bvxhzn3Dkjc+acrh96PiLx+LBshbAbl02YHiT3fFZ/KRlO4IRTglSuBBZzbZjD IoLDdOPsDX7z35Ut9jUYcHwdKWIXEJ+/RabXm4jgGnmtrJZDxnUPDCReBgyK3VXCXfls+G V3s0gsV4GwSZ1Fw+zb/fFOSIzA4Rmwp2H3GiUuOwhtgyMlBJqF4Yw6A7VPX0RExqUXHZ68 KskXiMnBM3H9+9okgAreX6lIp1LhCn8qeCNPU4GArsl01AJQKWjJiIgNtRN9tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755924659; a=rsa-sha256; cv=none; b=C3/6wL9kL2ZXlxkne4kZU8OJc8dX7tNZ4bu+kyUZU4Q9JDPSaanEGKs1WmnZFqOEGb0nnT 8+nNpWgCTLBl6Y7z/MwWMF2H3JKSQWOnZEX5OG4VU8sX0XoN0EzrZcdnBk2w+TDvWwbsKV gl1jbytDwjIcSZZn5GZ5WMAaldE+fqcGwPaicCv644HX+z/gYWcFNt0h/J5tCWDU4Ghs0I DDxbRb9WW3uW8JS1EIaHe+IrFIOjP5qhlFjKCwJ5r/Ww/aM8UM9RCiDjqBgtJdBllLmnDY Ng0D/O2Lg8pmG7NJWt6qT9gammjtU32fEcT34SxZXZ0UWd7Gq7Ws4NjKIDYoLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c84Pv3S4Lz1GLb; Sat, 23 Aug 2025 04:50:59 +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 57N4oxlL023164; Sat, 23 Aug 2025 04:50:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N4oxwG023161; Sat, 23 Aug 2025 04:50:59 GMT (envelope-from git) Date: Sat, 23 Aug 2025 04:50:59 GMT Message-Id: <202508230450.57N4oxwG023161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 1685192ea1fa - main - hkbd: remove erorr detection in KDSKBSTATE ioctl 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1685192ea1faac28f2d4feede53e70b6a380500f Auto-Submitted: auto-generated The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=1685192ea1faac28f2d4feede53e70b6a380500f commit 1685192ea1faac28f2d4feede53e70b6a380500f Author: ShengYi Hung AuthorDate: 2025-08-21 17:59:15 +0000 Commit: ShengYi Hung CommitDate: 2025-08-23 04:50:09 +0000 hkbd: remove erorr detection in KDSKBSTATE ioctl The KDSKBSTATE ioctl brings the LED up. However, some keyboards (like qemu keyboard) may not have LED or failed to set the LED due to unexpected reason. Therefore, removing the error check as ukbd(4) does allow the keyboard works correctly with kbdcontrol(4). Also move hw.hid.hkbd.no_leds sysctl out of HID_BUG thus users can disable setting LEDs PR: 288968 Reviewed by: wulf Tested by: trashcan@ellael.org, marklmi26-fbsd@yahoo.com, trkellers@gmail.coom Approved by: lwsu (mentor), markj (mentor) MFC after 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52101 mvalsmva --- sys/dev/hid/hkbd.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sys/dev/hid/hkbd.c b/sys/dev/hid/hkbd.c index 5eff7557bc42..86a2320092be 100644 --- a/sys/dev/hid/hkbd.c +++ b/sys/dev/hid/hkbd.c @@ -95,14 +95,16 @@ #ifdef HID_DEBUG static int hkbd_debug = 0; +#endif static int hkbd_no_leds = 0; static SYSCTL_NODE(_hw_hid, OID_AUTO, hkbd, CTLFLAG_RW, 0, "USB keyboard"); +#ifdef HID_DEBUG SYSCTL_INT(_hw_hid_hkbd, OID_AUTO, debug, CTLFLAG_RWTUN, &hkbd_debug, 0, "Debug level"); +#endif SYSCTL_INT(_hw_hid_hkbd, OID_AUTO, no_leds, CTLFLAG_RWTUN, &hkbd_no_leds, 0, "Disables setting of keyboard leds"); -#endif #define INPUT_EPOCH global_epoch_preempt @@ -1596,8 +1598,16 @@ hkbd_ioctl_locked(keyboard_t *kbd, u_long cmd, caddr_t arg) sc->sc_state &= ~LOCK_MASK; sc->sc_state |= *(int *)arg; - /* set LEDs and quit */ - return (hkbd_ioctl_locked(kbd, KDSETLED, arg)); + /* + * Attempt to set the keyboard LEDs; ignore the return value + * intentionally. Note: Some hypervisors/emulators (e.g., QEMU, + * Parallels—at least as of the time of writing) may fail when + * setting LEDs. This can prevent kbdmux from attaching the + * keyboard, which in turn may block the console from accessing + * it. + */ + (void)hkbd_ioctl_locked(kbd, KDSETLED, arg); + return (0); case KDSETREPEAT: /* set keyboard repeat rate (new * interface) */ @@ -1766,10 +1776,8 @@ hkbd_set_leds(struct hkbd_softc *sc, uint8_t leds) SYSCONS_LOCK_ASSERT(); DPRINTF("leds=0x%02x\n", leds); -#ifdef HID_DEBUG if (hkbd_no_leds) return (0); -#endif memset(sc->sc_buffer, 0, HKBD_BUFFER_SIZE); @@ -1820,6 +1828,7 @@ hkbd_set_leds(struct hkbd_softc *sc, uint8_t leds) SYSCONS_UNLOCK(); error = hid_write(sc->sc_dev, buf, len); SYSCONS_LOCK(); + DPRINTF(("error %d", error)); return (error); } From nobody Sat Aug 23 04:59:03 2025 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 4c84bC23qcz65J96; Sat, 23 Aug 2025 04:59:03 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c84bC1Rr9z47LH; Sat, 23 Aug 2025 04:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755925143; 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=E0cYPbI7DiRUE7ncnSgl0AUz3QCCCJpiY3eVPQKTFNI=; b=ltwnDqdn4N746LcRqQeqmCRSboFm6wwfFP3xbSelpKiHv4rtAzDTCw7Mf3rMdXs1XYEqfL FLxgrag5KvytjfIe/coluYvoVPCjAWSs9wjW/rUOHSuMSQuZmbNPMrfZDGt6vx7aFbafEt NnTEDw+F06X9ZbUzSNIJnSj+T/bEuzfzCbBTFKC/X1s+K9lmXgQD1f1nKCHxahR5hdyfs+ QXWQouXFbs25WKYuxnAsqGvzZGEbDNSgroYQQFEfy9Nj06nKFPcJ7Adp+n7xDkcNpuGwtS lda9cA6hmbTxW9tws+NthJF6ndOO0gO+ejvk5Tl1p/8pyV8lE2Cz0Z8gNkleiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755925143; 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=E0cYPbI7DiRUE7ncnSgl0AUz3QCCCJpiY3eVPQKTFNI=; b=UpWdReLdZ+qovM/YU47Anws/Dm/b+7GIyQwNtHWbGSkFRApJ9alUdJzl0NOxS1aBVASe48 MYUCyfeqxqpIDOAR3w8/mYWH5f7h1Mue2jJC+czWVRuncAWLsnytKibQqYYCCpJkuFlM+C ylGX9zFxHRWBS+F9D/xa+gRM8Dji9KQmB15zfVhByz8ni2VVWGbfEZ7AOzDmsBedHzkXQZ l56fV5iqyViOn8gRoZJWpXJL7ZjnRimeR7pmKP0/84W6VdS6qWI6KjxDm4aIOnlWV779vu WX8wNre4XgpbHL1LE5il8aQpHZ2V0sNrRB/yLvvnJkOeBLjl7HSZlgOxWXvJoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755925143; a=rsa-sha256; cv=none; b=DcRgnYeQ8Aj6Pxx+QEgVZYVLMNshbKfEqczXa2pn4gUSA1pEHjdZzpKnzJIa7Kdc53v+ZD G4qX+U0ce5nH2UknF7aWSqnTaoWmwjWU0t4v8YxdceEowlbiKa3MrdF7v9P2Bo/cpNMl3G bsu5Au0GWxUvvlPX7cNJW//QgjInI3z4m4b4Xd4Yabiryg4Mk+CogHyVMrgNj5IiJ5zKRe 7aZvScHFn9OZ4Dl76z0+vfPOWehKtANw9+4pn9haPm9OdpbRcXmk9gZGgh0QNzZS/P3d7Z UhbblPOWMRqAf9InqnQQ0DWajOuKczhW0cNnVUuE6kp7IFpFx8FUaDb3peuwDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c84bC13B7z1Gfl; Sat, 23 Aug 2025 04:59:03 +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 57N4x3Qi033380; Sat, 23 Aug 2025 04:59:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N4x34s033377; Sat, 23 Aug 2025 04:59:03 GMT (envelope-from git) Date: Sat, 23 Aug 2025 04:59:03 GMT Message-Id: <202508230459.57N4x34s033377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 8a847947153e - main - sys/modules: fix standalone build for multiple modules 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a847947153e60d812852e5c02de93997b2d3038 Auto-Submitted: auto-generated The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=8a847947153e60d812852e5c02de93997b2d3038 commit 8a847947153e60d812852e5c02de93997b2d3038 Author: ShengYi Hung AuthorDate: 2025-08-21 08:27:06 +0000 Commit: ShengYi Hung CommitDate: 2025-08-23 04:58:40 +0000 sys/modules: fix standalone build for multiple modules Multiple Makefile miss opt_*.h and *_if.h header file. We fix it by running make in sys/modules to build all modules. Approved by: lwhsu (mentor), markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52062 --- sys/modules/e6000sw/Makefile | 2 +- sys/modules/etherswitch/Makefile | 2 +- sys/modules/evdev/Makefile | 2 +- sys/modules/gpio/gpioaei/Makefile | 2 ++ sys/modules/gve/Makefile | 2 +- sys/modules/if_infiniband/Makefile | 3 ++- sys/modules/if_vlan/Makefile | 2 +- sys/modules/linux64/Makefile | 1 + sys/modules/md/Makefile | 2 +- sys/modules/miiproxy/Makefile | 2 +- sys/modules/mlx5/Makefile | 2 +- sys/modules/mlx5en/Makefile | 2 +- sys/modules/netgraph/ksocket/Makefile | 2 ++ sys/modules/nvmf/nvmf/Makefile | 3 +++ sys/modules/qlnx/qlnxev/Makefile | 1 + sys/modules/uinput/Makefile | 2 +- sys/modules/usb/usie/Makefile | 2 +- sys/modules/usb/wmt/Makefile | 2 +- 18 files changed, 23 insertions(+), 13 deletions(-) diff --git a/sys/modules/e6000sw/Makefile b/sys/modules/e6000sw/Makefile index da08f80b0a29..73cbaea801f0 100644 --- a/sys/modules/e6000sw/Makefile +++ b/sys/modules/e6000sw/Makefile @@ -3,6 +3,6 @@ KMOD= e6000sw SRCS= e6000sw.c -SRCS+= bus_if.h etherswitch_if.h mdio_if.h miibus_if.h ofw_bus_if.h opt_platform.h +SRCS+= bus_if.h device_if.h etherswitch_if.h mdio_if.h miibus_if.h ofw_bus_if.h opt_platform.h .include diff --git a/sys/modules/etherswitch/Makefile b/sys/modules/etherswitch/Makefile index 087231545cd4..0b16a19e5117 100644 --- a/sys/modules/etherswitch/Makefile +++ b/sys/modules/etherswitch/Makefile @@ -3,7 +3,7 @@ KMOD = etherswitch SRCS= etherswitch.c -SRCS+= mdio_if.h miibus_if.h etherswitch_if.h etherswitch_if.c +SRCS+= bus_if.h device_if.h mdio_if.h miibus_if.h etherswitch_if.h etherswitch_if.c CFLAGS+= -I${SRCTOP}/sys/dev/etherswitch .include diff --git a/sys/modules/evdev/Makefile b/sys/modules/evdev/Makefile index bd66013885db..20813b73f6dd 100644 --- a/sys/modules/evdev/Makefile +++ b/sys/modules/evdev/Makefile @@ -2,7 +2,7 @@ KMOD= evdev SRCS= cdev.c evdev.c evdev_mt.c evdev_utils.c -SRCS+= opt_evdev.h bus_if.h device_if.h +SRCS+= opt_evdev.h opt_kbd.h bus_if.h device_if.h EXPORT_SYMS= YES diff --git a/sys/modules/gpio/gpioaei/Makefile b/sys/modules/gpio/gpioaei/Makefile index 8f856af48eb7..1f0f1d0e53a6 100644 --- a/sys/modules/gpio/gpioaei/Makefile +++ b/sys/modules/gpio/gpioaei/Makefile @@ -10,6 +10,8 @@ SRCS+= \ gpio_if.h \ gpiobus_if.h +SRCS+= opt_acpi.h opt_platform.h + CFLAGS+= -I. -I${SRCTOP}/sys/dev/gpio/ .include diff --git a/sys/modules/gve/Makefile b/sys/modules/gve/Makefile index 08b26a994e36..ece275485df7 100644 --- a/sys/modules/gve/Makefile +++ b/sys/modules/gve/Makefile @@ -40,5 +40,5 @@ SRCS= gve_main.c \ gve_tx_dqo.c \ gve_sysctl.c SRCS+= device_if.h bus_if.h pci_if.h - +SRCS+= opt_inet6.h .include diff --git a/sys/modules/if_infiniband/Makefile b/sys/modules/if_infiniband/Makefile index 01e3164b1271..7ec343999da1 100644 --- a/sys/modules/if_infiniband/Makefile +++ b/sys/modules/if_infiniband/Makefile @@ -3,7 +3,8 @@ KMOD= if_infiniband SRCS= if_infiniband.c \ opt_inet.h \ - opt_inet6.h + opt_inet6.h \ + opt_kbd.h EXPORT_SYMS= YES diff --git a/sys/modules/if_vlan/Makefile b/sys/modules/if_vlan/Makefile index 3077f4289d5a..0cdab3f7653a 100644 --- a/sys/modules/if_vlan/Makefile +++ b/sys/modules/if_vlan/Makefile @@ -2,6 +2,6 @@ KMOD= if_vlan SRCS= if_vlan.c -SRCS+= opt_inet.h opt_inet6.h opt_kern_tls.h opt_vlan.h opt_ratelimit.h +SRCS+= opt_inet.h opt_inet6.h opt_ipsec.h opt_kern_tls.h opt_vlan.h opt_ratelimit.h .include diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index b23891a65a4f..327da11afdaf 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -31,6 +31,7 @@ SRCS= linux_dummy_machdep.c \ opt_ktrace.h \ opt_inet6.h \ opt_posix.h \ + opt_usb.h \ bus_if.h \ device_if.h \ vnode_if.h \ diff --git a/sys/modules/md/Makefile b/sys/modules/md/Makefile index 2b0586c44717..3f16e04860a1 100644 --- a/sys/modules/md/Makefile +++ b/sys/modules/md/Makefile @@ -1,6 +1,6 @@ .PATH: ${SRCTOP}/sys/dev/md KMOD= geom_md -SRCS= md.c opt_md.h opt_geom.h opt_rootdevname.h vnode_if.h +SRCS= bus_if.h device_if.h md.c opt_md.h opt_geom.h opt_rootdevname.h vnode_if.h .include diff --git a/sys/modules/miiproxy/Makefile b/sys/modules/miiproxy/Makefile index 5173358989da..730bef4220cd 100644 --- a/sys/modules/miiproxy/Makefile +++ b/sys/modules/miiproxy/Makefile @@ -3,7 +3,7 @@ KMOD = miiproxy SRCS= miiproxy.c -SRCS+= mdio_if.h miibus_if.h +SRCS+= bus_if.h mdio_if.h miibus_if.h opt_platform.h CFLAGS+= -I${SRCTOP}/sys/dev/etherswitch .include diff --git a/sys/modules/mlx5/Makefile b/sys/modules/mlx5/Makefile index 506c045ab0ce..65341fdfb8aa 100644 --- a/sys/modules/mlx5/Makefile +++ b/sys/modules/mlx5/Makefile @@ -46,7 +46,7 @@ mlx5_ipsec_offload.c \ mlx5_ipsec.c \ mlx5_ipsec_rxtx.c SRCS+= ${LINUXKPI_GENSRCS} -SRCS+= opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h +SRCS+= opt_inet.h opt_inet6.h opt_ipsec.h opt_rss.h opt_ratelimit.h CFLAGS+= -I${SRCTOP}/sys/ofed/include CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi diff --git a/sys/modules/mlx5en/Makefile b/sys/modules/mlx5en/Makefile index 03bf174e33b0..3697fa65dc83 100644 --- a/sys/modules/mlx5en/Makefile +++ b/sys/modules/mlx5en/Makefile @@ -15,7 +15,7 @@ mlx5_en_rl.c \ mlx5_en_txrx.c \ mlx5_en_port_buffer.c SRCS+= ${LINUXKPI_GENSRCS} -SRCS+= opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h opt_kern_tls.h +SRCS+= opt_inet.h opt_inet6.h opt_ipsec.h opt_rss.h opt_ratelimit.h opt_kern_tls.h .if defined(HAVE_PER_CQ_EVENT_PACKET) CFLAGS+= -DHAVE_PER_CQ_EVENT_PACKET diff --git a/sys/modules/netgraph/ksocket/Makefile b/sys/modules/netgraph/ksocket/Makefile index 395fdbd7b3e3..7099648f6219 100644 --- a/sys/modules/netgraph/ksocket/Makefile +++ b/sys/modules/netgraph/ksocket/Makefile @@ -1,4 +1,6 @@ KMOD= ng_ksocket SRCS= ng_ksocket.c +SRCS+= opt_inet6.h + .include diff --git a/sys/modules/nvmf/nvmf/Makefile b/sys/modules/nvmf/nvmf/Makefile index 7ebe614998bd..21d73d363d2f 100644 --- a/sys/modules/nvmf/nvmf/Makefile +++ b/sys/modules/nvmf/nvmf/Makefile @@ -10,4 +10,7 @@ SRCS= nvmf.c \ nvmf_qpair.c \ nvmf_sim.c +SRCS+= bus_if.h device_if.h +SRCS+= opt_cam.h + .include diff --git a/sys/modules/qlnx/qlnxev/Makefile b/sys/modules/qlnx/qlnxev/Makefile index ed62f1f1dd40..766a5a950032 100644 --- a/sys/modules/qlnx/qlnxev/Makefile +++ b/sys/modules/qlnx/qlnxev/Makefile @@ -49,6 +49,7 @@ SRCS+=ecore_vf.c SRCS+=qlnx_ioctl.c SRCS+=qlnx_os.c +SRCS+=opt_inet.h SRCS+= ${LINUXKPI_GENSRCS} diff --git a/sys/modules/uinput/Makefile b/sys/modules/uinput/Makefile index 66ade2a5bb33..a9e2ec867b91 100644 --- a/sys/modules/uinput/Makefile +++ b/sys/modules/uinput/Makefile @@ -2,6 +2,6 @@ KMOD= uinput SRCS= uinput.c -SRCS+= opt_evdev.h +SRCS+= opt_evdev.h opt_kbd.h .include diff --git a/sys/modules/usb/usie/Makefile b/sys/modules/usb/usie/Makefile index 6a5f79248ff8..9edeed082f8d 100644 --- a/sys/modules/usb/usie/Makefile +++ b/sys/modules/usb/usie/Makefile @@ -29,6 +29,6 @@ KMOD = usie SRCS = if_usie.c SRCS += opt_bus.h opt_usb.h device_if.h bus_if.h \ - usb_if.h usbdevs.h opt_inet.h + usb_if.h usbdevs.h opt_inet.h opt_inet6.h .include diff --git a/sys/modules/usb/wmt/Makefile b/sys/modules/usb/wmt/Makefile index 72cf1d814908..8cb5abd7383e 100644 --- a/sys/modules/usb/wmt/Makefile +++ b/sys/modules/usb/wmt/Makefile @@ -3,6 +3,6 @@ S= ${SRCTOP}/sys .PATH: $S/dev/usb/input KMOD= wmt -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h wmt.c +SRCS= opt_bus.h opt_kbd.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h wmt.c .include From nobody Sat Aug 23 06:59:07 2025 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 4c87Fr0rWcz65RSW; Sat, 23 Aug 2025 06:59:12 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c87Fp3m5Cz3Mpy; Sat, 23 Aug 2025 06:59:10 +0000 (UTC) (envelope-from gbe@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755932350; 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=iiWIs0hacWnJQwhuG09DT06MHhhAwFG0p4n/jYWld9E=; b=Cci+MsamTd15S/MmeonluPk3Doch3bVV56o38W3is8uq6bSVayN5c6BR6lRgGGiiND4/gT 2sBq2gDKff1ow85P4eSOm0Wy65HiYLWKwNhQytw+CuUWNqKIeI4pogfi9EzBuLAI4UH0uO lrPkT9EKTwaH+C4vhX0IdG6VQ4psNKbPofAml+teqGYG8y6qUVcplM1qbiJUctPt8+I1HB Hy6V+ipRAgKeyt90EMRQTmYPvt7myubkdktr4hasatSYWOMhQCjUvSpU0LMHZpNsPNCTH6 h7Ns+T53tnQveEsGDkwvICU7+0PNN0a+c/uwaiphAbeHIUPwv4tNSn9Wt2Z6yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755932350; 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=iiWIs0hacWnJQwhuG09DT06MHhhAwFG0p4n/jYWld9E=; b=A611kSdk3sqltdULVK3EjDgGD3M8HYpqW9VVZ4T+SjM6A08riPZIKOPt4Oi4w/oigCvmvN xfcyuYVEgJwM5PUnD15RGrUiWrJEzktxxZ4m4OLM96v/vpeZRXfRYYWB5hACU2AZkwrINq bisY9MZhWx1wLlLUAosZUBu3qKWFkFipRcFtL1vyWjZcm83pXH2MEcqfvXfjr/JCYK3CYN Bv+bPi1MFJDSsp+EHOAWG7JLzZfAPD55k9frRnSYnY1b0NibA6+SOGS9qKXc9uBzMuxJIK qbCikPDE6NF9Pwe5eyVIqXYotRrDaxySymRGSiUUuAQtSFR9qMfqGAFIdAZ2Hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755932350; a=rsa-sha256; cv=none; b=fisIXcN3c5w7XnjborCzR6zIXtqI8OXRsBkbw3D7BnWCETQLFlY3skXRJKWiTkoUpkwbov u/lxeBA/qJiQCp7mkQvEcqTA85z8GyE3pcuEB9L2KpDIFXzIwaq1NvSo2qxjLueN8aaPJM 0ZXPKxbOqv/JH2j9Grk+1G4FnDuKQfVuFbocQOEZ5HBmbM/KQstbN87a/MVts/TH+xuQAl yA89xIXmDCetsZtuY5t9qWGbqIRyosTuWqVpEsg9YNsucJ6dEdlu51aOA2vrf41oBOyaFq JBf7diH2bSW6e5GXBDFsLn0ciuX4IiW9iDh2ayq5MrdgV4gmcdZgAlFu7YXtjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from localhost (p4fd8b8c9.dip0.t-ipconnect.de [79.216.184.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gbe) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c87Fp0XCRz1ClH; Sat, 23 Aug 2025 06:59:09 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Date: Sat, 23 Aug 2025 08:59:07 +0200 From: Gordon Bergling To: ShengYi Hung Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1685192ea1fa - main - hkbd: remove erorr detection in KDSKBSTATE ioctl Message-ID: References: <202508230450.57N4oxwG023161@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: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="IBVGbubFc4T8ux6L" Content-Disposition: inline In-Reply-To: <202508230450.57N4oxwG023161@gitrepo.freebsd.org> X-Url: X-Operating-System: Darwin 24.6.0 arm64 X-Host-Uptime: 8:54 up 2 days, 11:50, 3 users, load averages: 1.50 2.44 4.63 --IBVGbubFc4T8ux6L Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi ShengYi, On Sat, Aug 23, 2025 at 04:50:59AM +0000, ShengYi Hung wrote: > The branch main has been updated by aokblast: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D1685192ea1faac28f2d4feede5= 3e70b6a380500f >=20 > commit 1685192ea1faac28f2d4feede53e70b6a380500f > Author: ShengYi Hung > AuthorDate: 2025-08-21 17:59:15 +0000 > Commit: ShengYi Hung > CommitDate: 2025-08-23 04:50:09 +0000 >=20 > hkbd: remove erorr detection in KDSKBSTATE ioctl > =20 > The KDSKBSTATE ioctl brings the LED up. However, some keyboards (like= qemu > keyboard) may not have LED or failed to set the LED due to unexpected= reason. > Therefore, removing the error check as ukbd(4) does allow the keyboar= d works > correctly with kbdcontrol(4). > =20 > Also move hw.hid.hkbd.no_leds sysctl out of HID_BUG thus users can > disable setting LEDs > =20 > PR: 288968 > Reviewed by: wulf > Tested by: trashcan@ellael.org, marklmi26-fbsd@yahoo.com, trkell= ers@gmail.coom > Approved by: lwsu (mentor), markj (mentor) > MFC after 1 week > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D52101 > =20 > mvalsmva > --- I am not sure how this is related, but since that commit, buildkernel of GE= NERIC is broken both on amd64 and aarch64. The following error is from an amd64 build, aarch64 i= s the same. ----------------------------- /storage/freebsd/src/current/sys/dev/hid/hkbd.c:1831:10: error: called ob= ject type 'char[5]' is not a function or function pointer 1831 | DPRINTF(("error %d", error)); | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~ /storage/freebsd/src/current/sys/dev/hid/hid.h:212:34: note: expanded fro= m macro 'DPRINTF' 212 | #define DPRINTF(...) DPRINTFN(1, __VA_ARGS__) | ~~~~~~~~~~~~^~~~~~~~~~~~ /storage/freebsd/src/current/sys/dev/hid/hid.h:208:17: note: expanded fro= m macro 'DPRINTFN' 208 | printf("%s: " fmt, \ | ~~~~~~ ^ 1 error generated. --- hkbd.o --- *** [hkbd.o] Error code 1 ----------------------------- --Gordon=20 --IBVGbubFc4T8ux6L Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEYbWI0KY5X7yH/Fy4OQX2V8rP09wFAmipZroACgkQOQX2V8rP 09zNDAgA93aa2y/C3lfrcOjRBRhNVkrIVJUuWmK0aHTXsZO7S8L9b+KlaceJ6DLO Y+/1SbcbsqmxqAV7lRJJ4aZkHCtQO73F2fYULzebJQohoH5Hmgw0RJWXUFCTId36 6Vk4F6OREMOS2fPorlhmZxcrv7fuxZwT4emLtgC+6aZcmnmqgWF/zrs7HGh6fCR7 DW+gPfTrkSCDICduPh2y0z+YEob6SVKQbMQM2YBgXEGq52/NZeZj8DKZGEc8tDjD YB1hFUQt02f43vHCF6UIOBnxtntdXwLHMVsFRHv4T/pQXiI9df4YrAy5OnRBApKN wBnHvMPqEYAcK91hmGI9SktOfYF+gw== =Kl6d -----END PGP SIGNATURE----- --IBVGbubFc4T8ux6L-- From nobody Sat Aug 23 07:35:37 2025 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 4c883s4WWNz65TLm; Sat, 23 Aug 2025 07:35:37 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c883s3tMzz3S0l; Sat, 23 Aug 2025 07:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755934537; 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=5oHOhi5GB3LHoWJ86F/SsAA3qN+UNIJRFNUvitZ4CIg=; b=OMgkIDRtlpzhoPz+kRF3rVqhgGrcHzxz57lT4B6WAIfVawAdC40JK/ZNpKgLmDgakjZTlT C2pEt+QoH2k+vqbaKWtLPm/Iht0h3P1SuOnXTOfZwhLRiGwYZwxhgLnq+KNUBWq8FdPcfI jyWT/JYiviY8INoIpyxyg6i4WrY3Hknp9/hcOqpFD7JC9IuoOMDYEgijSu1Jav/hVEAXgI xWZotGNwPDX1SdNyuv9Vu8WtyiXNw8IJmgpxYGaYFWE249yti8sQPsQs/NuIF7fJkposc/ UBfue5rFxz5eLZdbCHL1687SEIREr/GeGJ3MET7fB2T9/B62ZpfH0NYjjVWcWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755934537; 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=5oHOhi5GB3LHoWJ86F/SsAA3qN+UNIJRFNUvitZ4CIg=; b=boVGjeqavDKnAsz7OgNvgDywro/12O793CH4gi7n989kIGoEXZ5QmNU7UuWzbgMDTGtgL2 Nzja8k42nWfGu76rPs+lSiS7h8TyabdOdlH6M9mIRioNectY6IvcdLz1oBGQ5nUNYsylpK Hw9Y/nK02p1Xf/qfK8++3pwi6TfOclHkF2ZyLkGveP2CAx5ag2dq9YNGwekRURRTpjG9bU tigjqtBSvblNGa88CmKMRf5JI3xp8268ySvfLEATDRGsNnBkky9lvIlW2jXUNERmWrspc0 c+Im5FvaxEmAHxUOYX5MueWYtJxRdl4O9hCZBKMbRG6t3qFjb5GqqbdsTZk87g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755934537; a=rsa-sha256; cv=none; b=qNLeBfD3fZ2hlUS/NUPxb0WH6vfCQqUIYHcPBK4oLPpPnFckopqizOE6imNTAd+uL78Mep hsWiOuW864nBdYMWDg5L4Gs/4vp7lyGtCXYYK/uxzrpPUzDepyDa5761PEfkHbS/emTfj7 pYYNJGDB0e8Jt54DKGJmnIK3vNJ1UcPgvHz7CoARAZMmGDZ2u/PexnwlW1UWF2N98YoQFp KsfyndsETxABxiZBPx++pau+CXsc/Nxcv/CJUFvTDE4co/l0xmraVvmiUZiZEBCeUfOxYo Bd7IaTo7NM4vWioVRsbMbDuq/8TKJgUG9Nns7nTDCVQRgNUjAHn8nLOXZGxEoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c883s3Nrtz1LM2; Sat, 23 Aug 2025 07:35:37 +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 57N7ZbCX032020; Sat, 23 Aug 2025 07:35:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N7Zb04032017; Sat, 23 Aug 2025 07:35:37 GMT (envelope-from git) Date: Sat, 23 Aug 2025 07:35:37 GMT Message-Id: <202508230735.57N7Zb04032017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 6ea7e1f92882 - main - hkbd: fix compliation error for GENERIC 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ea7e1f92882706cc8818a13e8bd55b7d2f48e27 Auto-Submitted: auto-generated The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=6ea7e1f92882706cc8818a13e8bd55b7d2f48e27 commit 6ea7e1f92882706cc8818a13e8bd55b7d2f48e27 Author: ShengYi Hung AuthorDate: 2025-08-23 05:36:39 +0000 Commit: ShengYi Hung CommitDate: 2025-08-23 07:34:57 +0000 hkbd: fix compliation error for GENERIC Reported by: gbe Approved by: lwhsu (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52135 --- sys/dev/hid/hkbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/hid/hkbd.c b/sys/dev/hid/hkbd.c index 86a2320092be..6255c42d3b62 100644 --- a/sys/dev/hid/hkbd.c +++ b/sys/dev/hid/hkbd.c @@ -1828,7 +1828,7 @@ hkbd_set_leds(struct hkbd_softc *sc, uint8_t leds) SYSCONS_UNLOCK(); error = hid_write(sc->sc_dev, buf, len); SYSCONS_LOCK(); - DPRINTF(("error %d", error)); + DPRINTF("error %d", error); return (error); } From nobody Sat Aug 23 07:38:58 2025 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 4c887t6Ff8z65V0j; Sat, 23 Aug 2025 07:39:06 +0000 (UTC) (envelope-from aokblast@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c887t5T0Qz3S2G; Sat, 23 Aug 2025 07:39:06 +0000 (UTC) (envelope-from aokblast@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755934746; 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=Pbd3xFRq/pXKnHwK5bwkNT+KDLf+6mMogtuUXd4OH8A=; b=hrdt+Dbpm/wdSjUfABGGAnqVOLZvFAZZc0Iw2MQVMKOHjvlGisSz5B2aKMGmiD/y1xctMZ rg4UWRG45n6TNVe7uD6+W1xhgWa7KWVFkzNSj84uXsCGYU3IFBShHlyAHOnMGD7BFYSS6Z f8ERHnyFW4xqXX/ChseGP8oapl1tPfOyUYWkuXZmX4zxZ+6IoUcO0tKV1k3WhAkP7R2G1I RAf+PQ3nnfapZTMKzPnMuW7NHy6sOX+s4lsddP471fGr2++GU5h6PSrI/R8wBiufaHhXgw KqBi2OEE9S7iuKuINCh4ZygM66QLJXjdrUdaxAT9l2YeSi7/U8Ce0wwwIMg73A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755934746; 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=Pbd3xFRq/pXKnHwK5bwkNT+KDLf+6mMogtuUXd4OH8A=; b=BDZJ9fq5qmouhHUlLVValw3stjhjtCqtRk4y0Er5UuiblZ8Crl7MOomM3uyMtozA19x/ll z+IyFkOBJSyHqIv0qzFAYv1XwHbnX2Dc9PUMhH8IoMczTphBYvrVq9P1ibT7IOWH4BvQap 0W9KcEfJQCIkBCGLEeHEySueGtZVGHFjI+Jg5t5hEQU85a/il01hhwTPrLOdBF52TW6HEw epm8cnuAw3+JdP6y4Bwejr38uYCkHbBtsPoP+pqH707XuMKRhAGiBfgkzynxdYEQq1IGzE ln9paQMrrZhNr0qQebE++9XpWfeaaZwd8IXD4tI1I1vSZjwmVQ7Sivqf3DTwXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755934746; a=rsa-sha256; cv=none; b=rxheeSHzUZpzwkuv3kNzAjI/9Ae+iPnbibA7Mr2wgzScaIVUQvlQiA5SaJlDZhiSAWejKN OEc0ZOQhiFs4cjVYrdfSetsClf98+UxsY7bCAMQKdBAQfBcEOEcQgE8u+fCqR+vCERDWXn Z2G0aw6qmBxFyhHSvxRv+b6iybh+/j7NryQ3qm2c1c42QGlrIGNUb4pCfzght6Ag7QmgRM TzDd7+F0Xr7ObriS1K3YVR6FsRzetwPRVEJKvRjsQvTrCV+Fk3QlDcOfh5KsUYelHEdmII YDiN6qIioz5jxjsWBFN3+fKFAm7pMJL75p31VrZnApzCLeZLIJJY7phcO931bA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from aokblastdeMacBook-Pro.local (2001-b011-3808-3444-8815-4b72-35c6-0ccc.dynamic-ip6.hinet.net [IPv6:2001:b011:3808:3444:8815:4b72:35c6:ccc]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: aokblast) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c887r6JyNz1Dd; Sat, 23 Aug 2025 07:39:04 +0000 (UTC) (envelope-from aokblast@freebsd.org) From: ShengYi Hung To: Gordon Bergling Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1685192ea1fa - main - hkbd: remove erorr detection in KDSKBSTATE ioctl In-Reply-To: (Gordon Bergling's message of "Sat, 23 Aug 2025 08:59:07 +0200") References: <202508230450.57N4oxwG023161@gitrepo.freebsd.org> User-Agent: mu4e 1.12.12; emacs 30.1 Date: Sat, 23 Aug 2025 15:38:58 +0800 Message-ID: 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 Hello, thanks for the reminder. I compile the standalone module to test so didn't discover that. Fix it right now. Gordon Bergling writes: > Hi ShengYi, > > On Sat, Aug 23, 2025 at 04:50:59AM +0000, ShengYi Hung wrote: >> The branch main has been updated by aokblast: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=1685192ea1faac28f2d4feede53e70b6a380500f >> >> commit 1685192ea1faac28f2d4feede53e70b6a380500f >> Author: ShengYi Hung >> AuthorDate: 2025-08-21 17:59:15 +0000 >> Commit: ShengYi Hung >> CommitDate: 2025-08-23 04:50:09 +0000 >> >> hkbd: remove erorr detection in KDSKBSTATE ioctl >> >> The KDSKBSTATE ioctl brings the LED up. However, some keyboards (like qemu >> keyboard) may not have LED or failed to set the LED due to unexpected reason. >> Therefore, removing the error check as ukbd(4) does allow the keyboard works >> correctly with kbdcontrol(4). >> >> Also move hw.hid.hkbd.no_leds sysctl out of HID_BUG thus users can >> disable setting LEDs >> >> PR: 288968 >> Reviewed by: wulf >> Tested by: trashcan@ellael.org, marklmi26-fbsd@yahoo.com, trkellers@gmail.coom >> Approved by: lwsu (mentor), markj (mentor) >> MFC after 1 week >> Sponsored by: The FreeBSD Foundation >> Differential Revision: https://reviews.freebsd.org/D52101 >> >> mvalsmva >> --- > > I am not sure how this is related, but since that commit, buildkernel of GENERIC is broken both > on amd64 and aarch64. The following error is from an amd64 build, aarch64 is the same. > > ----------------------------- > /storage/freebsd/src/current/sys/dev/hid/hkbd.c:1831:10: error: called object type 'char[5]' is not a function or function pointer > 1831 | DPRINTF(("error %d", error)); > | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~ > /storage/freebsd/src/current/sys/dev/hid/hid.h:212:34: note: expanded from macro 'DPRINTF' > 212 | #define DPRINTF(...) DPRINTFN(1, __VA_ARGS__) > | ~~~~~~~~~~~~^~~~~~~~~~~~ > /storage/freebsd/src/current/sys/dev/hid/hid.h:208:17: note: expanded from macro 'DPRINTFN' > 208 | printf("%s: " fmt, \ > | ~~~~~~ ^ > 1 error generated. > --- hkbd.o --- > *** [hkbd.o] Error code 1 > ----------------------------- > > --Gordon -- Best Regards. ShengYi Hung. From nobody Sat Aug 23 17:10:11 2025 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 4c8Npt6Q5Kz669NC; Sat, 23 Aug 2025 17:10:14 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8Npt40K6z3V7m; Sat, 23 Aug 2025 17:10:14 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id pnaNumwRN9JM2prkrukgqL; Sat, 23 Aug 2025 17:10:13 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id prkquyqPJWX70prkruo6ML; Sat, 23 Aug 2025 17:10:13 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=d71WygjE c=1 sm=1 tr=0 ts=68a9f5f5 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=2OwXVqhp2XgA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=T_YFPyFoAAAA:8 a=CjxXgO3LAAAA:8 a=YxBL1-UpAAAA:8 a=v42OIU9iIEuCMG5iv_8A:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=fKaBkT6cBtmegwcwHIDe:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id C6DA5C60; Sat, 23 Aug 2025 10:10:11 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id BCFFF189; Sat, 23 Aug 2025 10:10:11 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: ShengYi Hung cc: Gordon Bergling , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1685192ea1fa - main - hkbd: remove erorr detection in KDSKBSTATE ioctl In-reply-to: References: <202508230450.57N4oxwG023161@gitrepo.freebsd.org> Comments: In-reply-to ShengYi Hung message dated "Sat, 23 Aug 2025 15:38:58 +0800." 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 Date: Sat, 23 Aug 2025 10:10:11 -0700 Message-Id: <20250823171011.BCFFF189@slippy.cwsent.com> X-CMAE-Envelope: MS4xfF/vvkX7UB73UW4ugdA+8B09WXwHUKErHF0CAnT4nYPqth1a6Etk833uV/Nfw0DWHr/shjh0zN5ACc+g+vIXah5ikvIt+hLE4VrJqqDD44jyFk08OcHu IHnIuCehxoAd5QmMIQDmt23uMca61+FGotbHDF/bLt9/wvBnxSLhdUNh8powh+GeSPdY7qcIGSIDchJdJslPrrIthsn8QFvyMLF5AKnMqebQsmfWpoqe5JT+ t2jw08Lz7kRJPo4jYwIxEJ4tzoPG4jX3VezvFF+R1kZBAveQH7ismcUw/R1glucAize8+bILgnhgDDaEjFtvpjwHnqkFPHVl7OBxz4qQatGLKPQMNLA2CR+p 07R37M38 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c8Npt40K6z3V7m In message , ShengYi Hung writes: > > Hello, thanks for the reminder. I compile the standalone module to test so > didn't discover that. Fix it right now. > Gordon Bergling writes: > > > > Hi ShengYi, > > > > On Sat, Aug 23, 2025 at 04:50:59AM +0000, ShengYi Hung wrote: > >> The branch main has been updated by aokblast: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/?id=1685192ea1faac28f2d4feede53e7 > 0b6a380500f > >> > >> commit 1685192ea1faac28f2d4feede53e70b6a380500f > >> Author: ShengYi Hung > >> AuthorDate: 2025-08-21 17:59:15 +0000 > >> Commit: ShengYi Hung > >> CommitDate: 2025-08-23 04:50:09 +0000 > >> > >> hkbd: remove erorr detection in KDSKBSTATE ioctl > >> > >> The KDSKBSTATE ioctl brings the LED up. However, some keyboards (like > qemu > >> keyboard) may not have LED or failed to set the LED due to unexpected > reason. > >> Therefore, removing the error check as ukbd(4) does allow the keyboard > works > >> correctly with kbdcontrol(4). > >> > >> Also move hw.hid.hkbd.no_leds sysctl out of HID_BUG thus users can > >> disable setting LEDs > >> > >> PR: 288968 > >> Reviewed by: wulf > >> Tested by: trashcan@ellael.org, marklmi26-fbsd@yahoo.com, trkelle > rs@gmail.coom > >> Approved by: lwsu (mentor), markj (mentor) > >> MFC after 1 week > >> Sponsored by: The FreeBSD Foundation > >> Differential Revision: https://reviews.freebsd.org/D52101 > >> > >> mvalsmva > >> --- > > > > I am not sure how this is related, but since that commit, buildkernel of GE > NERIC is broken both > > on amd64 and aarch64. The following error is from an amd64 build, aarch64 i > s the same. > > > > ----------------------------- > > /storage/freebsd/src/current/sys/dev/hid/hkbd.c:1831:10: error: called ob > ject type 'char[5]' is not a function or function pointer > > 1831 | DPRINTF(("error %d", error)); > > | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~ > > /storage/freebsd/src/current/sys/dev/hid/hid.h:212:34: note: expanded fro > m macro 'DPRINTF' > > 212 | #define DPRINTF(...) DPRINTFN(1, __VA_ARGS__) > > | ~~~~~~~~~~~~^~~~~~~~~~~~ > > /storage/freebsd/src/current/sys/dev/hid/hid.h:208:17: note: expanded fro > m macro 'DPRINTFN' > > 208 | printf("%s: " fmt, \ > > | ~~~~~~ ^ > > 1 error generated. > > --- hkbd.o --- > > *** [hkbd.o] Error code 1 > > ----------------------------- > > > > --Gordon > > -- > Best Regards. > ShengYi Hung. > My machines running X (laptops), - the right mouse key no longer works under X, I can no longer use X, - the caps-lock light will not display under X - on the text console works, X does not. The three commits related have bee reverted locally, functionality has returned. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Sat Aug 23 17:27:23 2025 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 4c8PCG5SXSz66BSN; Sat, 23 Aug 2025 17:27:54 +0000 (UTC) (envelope-from aokblast@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8PCG4lWSz3XRv; Sat, 23 Aug 2025 17:27:54 +0000 (UTC) (envelope-from aokblast@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755970074; 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:autocrypt:autocrypt; bh=KQKMiza7xEkOJZz7iAtMznIa7hAIs874B58x2XWRC6Y=; b=kGHviEzQQovGhYAhK/G02Xy6OhVJLcNTPlFA+eDrnea5rsPhi4G5epRE5zDso/zc7FhYjV myUCqp7Mn1CN1AA8WMxNb95blV9oiVYi4qseyct0GVAJMjXfsxhHpnBBzWI25oPOZyP7en XTSv5Qw6ufAHVZ1ktMvLbd77W4ffFyU/E9nVwGfOLB4hW7EhuiQvyxtue5hhQpVyxUB9Rs wox4vZaxcLuIzNnPt+qlC+tDcn2IhG0bsGCgNdICNoFbVGFOpQRCcQMIchiAlCDgWuL4JG rsw9FEZrvqX0ebgzqXL/EZIivEInWg4sKYqY4wC73leYRs9ldklZzfj8g6V7rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755970074; 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:autocrypt:autocrypt; bh=KQKMiza7xEkOJZz7iAtMznIa7hAIs874B58x2XWRC6Y=; b=POhCE6rWK41e4eRCosviqeqsHkdVX1NWsS9EhHSI36GA0wY4fswlxSXfs+NZs2yolc8qKA QaJAssXY/XkT5dw96sUNaS8kFyR16TfkVwCbjdq5yxmJ/yCB2G0rHz/d4gJNsfaO6lWkhE qr5SlR7yDJkEfB6ymi9l+OnMAO0tOJK5raoWAPfwCiJMDPcAaMiVSvabv70JG+tXNbg6j4 mg6T0rIG2iOmGyZu7gzAcxPv7bHnKHD216dW7WeFWrZwwyCDZuQ3xLv9E8zaIIigBSYEJ6 nOwsMXAaEB4eANTPSRO9g62B2d/G2V6yYhjHufU/RxM7gYmnq99pKx8JtP5Ybg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755970074; a=rsa-sha256; cv=none; b=x+M//BE6IKbKbyCXu/9QHuAZqf70cshfqymN0JH6sqV6AiAPSDGXio4cbGP0+RTcIzqeVB IiRzAU7bwo2DK4W7oGOVk69iNoKsF6wPrASRNq43JRcpByo1zQxUvt94sif5BTCtwgckeh ys5xD5eixHtOP4qptuF/xvhqvhRL5YyCKVdrMIQ469gVybQaugPxLaJFAGYGU7rUXyQeDl FZIh6G0MmUCh5jFafcYUPkoB7173ZRfaP81UgzpJe1jFSs+nz1/UvUAWgmaDLRZMP1KZ8o r2DGXTwBpwEj5IUqYlHHmlKNcX31XXbOdeu34r9aBIe/N5dy5XEbZmb8c9AyTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2001:b011:3808:3444:a66b:b6ff:fe3d:469a] (2001-b011-3808-3444-a66b-b6ff-fe3d-469a.dynamic-ip6.hinet.net [IPv6:2001:b011:3808:3444:a66b:b6ff:fe3d:469a]) (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 did not present a certificate) (Authenticated sender: aokblast) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c8PCD5MkvzDj8; Sat, 23 Aug 2025 17:27:52 +0000 (UTC) (envelope-from aokblast@FreeBSD.org) Message-ID: Date: Sat, 23 Aug 2025 13:27:23 -0400 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 1685192ea1fa - main - hkbd: remove erorr detection in KDSKBSTATE ioctl To: Cy Schubert Cc: Gordon Bergling , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202508230450.57N4oxwG023161@gitrepo.freebsd.org> <20250823171011.BCFFF189@slippy.cwsent.com> Content-Language: en-US From: ShengYi Hung Autocrypt: addr=aokblast@FreeBSD.org; keydata= xsDNBGhkuaEBDAD0a1Cu+ntw+v0/ZZnqTewGcd335T5tfktBEt22FsaoBqca7TSp/AvP/bWD 3YtJFlxi7TJQbb2H+ylPzusPaN/R1Sj6wQsRD1Fj+1AjF9EOqxdohXm0SoWs3sRRbMrMGp6q DTQQBMj3TEuSE26gLxmpadtiAsyNDcNCllMSXAZ7xlk+ra9x/pAqOR0TZvObwY8VUncCy6UW UIGmsUF5B7oR2v7i9rFk/3ILkcoIC1k+OlhMbxBpwPLA24Aj8sZX9dzFbwLn2wucqRUzE9Id zrwpQpRHxH0t849VBhLze+zP8s6IUtgKaTUjClmCfZXVVBpFswXJmxgDRo51Ed+X94K2y6FS DRMxwiz18vnJNWlB+aHH5wTbgoTKU+zOckXODBowNEEmYpQNVNYJs1nP6tGRmN4YwW5hcNQY dUmFKR44uYdJomcqxkzJjU4rv4NBOdzrQTw+h5gCUdQ5IvBBGTA1enEP1qMhCpwTOfMd53of 17BC3CMFNTu8rburHceMaU0AEQEAAc0jU2hlbmdZaSBIdW5nIDxhb2tibGFzdEBGcmVlQlNE Lm9yZz7CwRcEEwEIAEEWIQSIP4S1lgaPs34UknRfTtfYEmBsYAUCaGS5oQIbAwUJBaOagAUL CQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRBfTtfYEmBsYJKeDAC/aJjRjMM9k9n6uwUW HemoAUGjv5fxkIpHWYCltnZ9KMs+TZXLsUZrv9DxOV4E3ebEn7iMJbOAvIjjVK//qexo6/er 9EZow4e/EQJLIL/0xRDiF4Jg7l1jziAI26P6dyuMNzeHddFg7ALVfE9wPCFqn3QGbHqDVjI/ E9UcxXiwHktndAo1wJXdEq9F8Ufmtj1t9NasTip8ofNgKfWCGhyyZI0kvhvob5darflQMO8Y G61zmSteO5Es8i9sP+lOhwEgsgHl0L/gQtMrOko9Td1iOSMuaP9t3rx7pOnYLdKt+xw8kWnB IW6GNEzp5QVJxmzr4DiyvvuR4SxnYy2tZjzQV4W8njBvw8SmZs0oS40iP8XNAoc91xLBizDn Lne3BDYOMXgm4csmDnJBM8s7Gaoc+WMY+hDP9SKWSqhyJUg8tauVhmPP3sTEXJbHoD0TuXxO SwG9nEdKoeWQCA0XMXQGfYWHKy1qz3spYCFgXHqmF+WBLljqLaeHQsHmvUhUIuTOwM0EaGS5 oQEMAMiauBmqNndH0AaX9cqOCf660X6fj7iidxwPY9pSUBOgZ3c13pRJLiR6xsYnOWm+Dgf2 BbNOz5iEtwx3Msrjw70/LsTJ4FdByUXZPZwujaPZ2SfowLMXXZbEJrPkJ2HeamaDw/Gf5O/p aDtAS3i8sFkKiOHwBX4doaL5Rxy/oqSpYTYL8tBFUWMHHk4ji12P6Pw1aW2H81XzKTae1Tga 8ViuiWzqibbbk5ddHjr/L+6LfTDM00K7WTZVBnW0qsMZJ9PQpt8636cuJx6D3ITXxtg4IzFN z7HOKbPQazSGhaqsbdxKmtwcP2uZEycsX+hPhtoOS2FuF5nWIYRZSzWBxWiOopHdRLL4YfAL MsGhFdnPH/J3G9gyBroiCiq2moRl2OSgo9W6rMxLCm62657zsvCo8p/KxaGq/ynwCAoQ1wHQ aVerJkGMf0n5tLkbNm2SyAbRy3tA/EfbzT0Yufq5gu9zGN/Uxf5hgFO6UqDHrlPeSSz++6m/ OAj3yLIsl2GpDwARAQABwsD8BBgBCAAmFiEEiD+EtZYGj7N+FJJ0X07X2BJgbGAFAmhkuaEC GwwFCQWjmoAACgkQX07X2BJgbGAJswv/dODZRYTWb/Xx8Y/Ei1OXLZIoNxoUHvBVEqO1xR/F JPwYM8TVcihvhCfM5lLhYdY1pkLjXdlGbTKZtvdHWHLvs62jGVjUXij52z1jOurnX2u0x1vq 1zpklWBx4VQhd3sVtcyLNdDYBFi3epVf1NEctToWyfBys6ijtVkhjem3V/l0PI1WtkECzYfP TOA+guf4dmrGSHPOZpCyFwHPRcVI+4puva4s4tjCAYa5E56GkICUJLuT1x228iqr5OC8YA7F eOTN94L/GqII6joaX2HIrcpGDybRIhGty+BqXvRIpjp0z5PdDeHiFQFTnBAEnjiATAMDKd7S q8y7Pv8OD/ptOl7Fg5iexCGVoLc3idpo/5T5fEXEaEWcGF9HRUeRTrnqQ9yBnALsqoLLVfou eF5Cl7c3p1pwbdR0iSK9p4x6BDcnrnIE52vRCtCdivyxTNa+zKdjlI6gn7oNsRmOnQbkEXML 9WZi4YnrnITSzpkpCzeQCDI0gqUdsxsbt4Vi73Oq In-Reply-To: <20250823171011.BCFFF189@slippy.cwsent.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------YUxC8E7WsG7sTNIKtIUN0OaB" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------YUxC8E7WsG7sTNIKtIUN0OaB Content-Type: multipart/mixed; boundary="------------NdPwyJrGbbpVMHPhyP421xqG"; protected-headers="v1" From: ShengYi Hung To: Cy Schubert Cc: Gordon Bergling , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Message-ID: Subject: Re: git: 1685192ea1fa - main - hkbd: remove erorr detection in KDSKBSTATE ioctl References: <202508230450.57N4oxwG023161@gitrepo.freebsd.org> <20250823171011.BCFFF189@slippy.cwsent.com> In-Reply-To: <20250823171011.BCFFF189@slippy.cwsent.com> --------------NdPwyJrGbbpVMHPhyP421xqG Content-Type: multipart/mixed; boundary="------------T3A2xUu39BLzOXSUSvKmcjjQ" --------------T3A2xUu39BLzOXSUSvKmcjjQ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 SGVsbG86DQoNCkkgb25seSBzdWJtaXQgdHdvIHBhdGNoZXMuIFdoYXQgaXMgdGhlIHRoaXJk IHBhdGNoIHlvdSBoYXZlIG1lbnRpb25lZD8gDQpJcyB0aGUgb25lIHNldHRpbmcgInN5c2N0 bCB1c2JoaWQ9MSI/DQoNCk9uIDgvMjMvMjUgMTM6MTAsIEN5IFNjaHViZXJ0IHdyb3RlOg0K PiBJbiBtZXNzYWdlIDxtMmZyZGljd3J4LmZzZkBGcmVlQlNELm9yZz4sIFNoZW5nWWkgSHVu ZyB3cml0ZXM6DQo+PiBIZWxsbywgdGhhbmtzIGZvciB0aGUgcmVtaW5kZXIuIEkgY29tcGls ZSB0aGUgc3RhbmRhbG9uZSBtb2R1bGUgdG8gdGVzdCBzbw0KPj4gZGlkbid0IGRpc2NvdmVy IHRoYXQuIEZpeCBpdCByaWdodCBub3cuDQo+PiBHb3Jkb24gQmVyZ2xpbmcgPGdiZUBGcmVl QlNELm9yZz4gd3JpdGVzOg0KPj4NCj4+DQo+Pj4gSGkgU2hlbmdZaSwNCj4+Pg0KPj4+IE9u IFNhdCwgQXVnIDIzLCAyMDI1IGF0IDA0OjUwOjU5QU0gKzAwMDAsIFNoZW5nWWkgSHVuZyB3 cm90ZToNCj4+Pj4gVGhlIGJyYW5jaCBtYWluIGhhcyBiZWVuIHVwZGF0ZWQgYnkgYW9rYmxh c3Q6DQo+Pj4+DQo+Pj4+IFVSTDogaHR0cHM6Ly9jZ2l0LkZyZWVCU0Qub3JnL3NyYy9jb21t aXQvP2lkPTE2ODUxOTJlYTFmYWFjMjhmMmQ0ZmVlZGU1M2U3DQo+PiAwYjZhMzgwNTAwZg0K Pj4+PiBjb21taXQgMTY4NTE5MmVhMWZhYWMyOGYyZDRmZWVkZTUzZTcwYjZhMzgwNTAwZg0K Pj4+PiBBdXRob3I6ICAgICBTaGVuZ1lpIEh1bmcgPGFva2JsYXN0QEZyZWVCU0Qub3JnPg0K Pj4+PiBBdXRob3JEYXRlOiAyMDI1LTA4LTIxIDE3OjU5OjE1ICswMDAwDQo+Pj4+IENvbW1p dDogICAgIFNoZW5nWWkgSHVuZyA8YW9rYmxhc3RARnJlZUJTRC5vcmc+DQo+Pj4+IENvbW1p dERhdGU6IDIwMjUtMDgtMjMgMDQ6NTA6MDkgKzAwMDANCj4+Pj4NCj4+Pj4gICAgICBoa2Jk OiByZW1vdmUgZXJvcnIgZGV0ZWN0aW9uIGluIEtEU0tCU1RBVEUgaW9jdGwNCj4+Pj4gICAg ICANCj4+Pj4gICAgICBUaGUgS0RTS0JTVEFURSBpb2N0bCBicmluZ3MgdGhlIExFRCB1cC4g SG93ZXZlciwgc29tZSBrZXlib2FyZHMgKGxpa2UNCj4+IHFlbXUNCj4+Pj4gICAgICBrZXli b2FyZCkgbWF5IG5vdCBoYXZlIExFRCBvciBmYWlsZWQgdG8gc2V0IHRoZSBMRUQgZHVlIHRv IHVuZXhwZWN0ZWQNCj4+IHJlYXNvbi4NCj4+Pj4gICAgICBUaGVyZWZvcmUsIHJlbW92aW5n IHRoZSBlcnJvciBjaGVjayBhcyB1a2JkKDQpIGRvZXMgYWxsb3cgdGhlIGtleWJvYXJkDQo+ PiAgIHdvcmtzDQo+Pj4+ICAgICAgY29ycmVjdGx5IHdpdGgga2JkY29udHJvbCg0KS4NCj4+ Pj4gICAgICANCj4+Pj4gICAgICBBbHNvIG1vdmUgaHcuaGlkLmhrYmQubm9fbGVkcyBzeXNj dGwgb3V0IG9mIEhJRF9CVUcgdGh1cyB1c2VycyBjYW4NCj4+Pj4gICAgICBkaXNhYmxlIHNl dHRpbmcgTEVEcw0KPj4+PiAgICAgIA0KPj4+PiAgICAgIFBSOiAgICAgICAgICAgICAyODg5 NjgNCj4+Pj4gICAgICBSZXZpZXdlZCBieTogICAgd3VsZg0KPj4+PiAgICAgIFRlc3RlZCBi eTogICAgICB0cmFzaGNhbkBlbGxhZWwub3JnLCBtYXJrbG1pMjYtZmJzZEB5YWhvby5jb20s IHRya2VsbGUNCj4+IHJzQGdtYWlsLmNvb20NCj4+Pj4gICAgICBBcHByb3ZlZCBieTogICAg bHdzdSAobWVudG9yKSwgbWFya2ogKG1lbnRvcikNCj4+Pj4gICAgICBNRkMgYWZ0ZXIgICAg ICAgMSB3ZWVrDQo+Pj4+ICAgICAgU3BvbnNvcmVkIGJ5OiAgIFRoZSBGcmVlQlNEIEZvdW5k YXRpb24NCj4+Pj4gICAgICBEaWZmZXJlbnRpYWwgUmV2aXNpb246ICBodHRwczovL3Jldmll d3MuZnJlZWJzZC5vcmcvRDUyMTAxDQo+Pj4+ICAgICAgDQo+Pj4+ICAgICAgbXZhbHNtdmEN Cj4+Pj4gLS0tDQo+Pj4gSSBhbSBub3Qgc3VyZSBob3cgdGhpcyBpcyByZWxhdGVkLCBidXQg c2luY2UgdGhhdCBjb21taXQsIGJ1aWxka2VybmVsIG9mIEdFDQo+PiBORVJJQyBpcyBicm9r ZW4gYm90aA0KPj4+IG9uIGFtZDY0IGFuZCBhYXJjaDY0LiBUaGUgZm9sbG93aW5nIGVycm9y IGlzIGZyb20gYW4gYW1kNjQgYnVpbGQsIGFhcmNoNjQgaQ0KPj4gcyB0aGUgc2FtZS4NCj4+ PiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KPj4+ICAgIC9zdG9yYWdlL2ZyZWVi c2Qvc3JjL2N1cnJlbnQvc3lzL2Rldi9oaWQvaGtiZC5jOjE4MzE6MTA6IGVycm9yOiBjYWxs ZWQgb2INCj4+IGplY3QgdHlwZSAnY2hhcls1XScgaXMgbm90IGEgZnVuY3Rpb24gb3IgZnVu Y3Rpb24gcG9pbnRlcg0KPj4+ICAgICAxODMxIHwgICAgICAgICBEUFJJTlRGKCgiZXJyb3Ig JWQiLCBlcnJvcikpOw0KPj4+ICAgICAgICAgIHwgICAgICAgICB+fn5+fn5+fl5+fn5+fn5+ fn5+fn5+fn5+fn5+DQo+Pj4gICAgL3N0b3JhZ2UvZnJlZWJzZC9zcmMvY3VycmVudC9zeXMv ZGV2L2hpZC9oaWQuaDoyMTI6MzQ6IG5vdGU6IGV4cGFuZGVkIGZybw0KPj4gbSBtYWNybyAn RFBSSU5URicNCj4+PiAgICAgIDIxMiB8ICNkZWZpbmUgRFBSSU5URiguLi4pICAgIERQUklO VEZOKDEsIF9fVkFfQVJHU19fKQ0KPj4+ICAgICAgICAgIHwgICAgICAgICAgICAgICAgICAg ICAgICAgfn5+fn5+fn5+fn5+Xn5+fn5+fn5+fn5+DQo+Pj4gICAgL3N0b3JhZ2UvZnJlZWJz ZC9zcmMvY3VycmVudC9zeXMvZGV2L2hpZC9oaWQuaDoyMDg6MTc6IG5vdGU6IGV4cGFuZGVk IGZybw0KPj4gbSBtYWNybyAnRFBSSU5URk4nDQo+Pj4gICAgICAyMDggfCAgICAgICAgICAg ICAgICAgcHJpbnRmKCIlczogIiBmbXQsICAgICAgICAgICAgICAgICAgICAgIFwNCj4+PiAg ICAgICAgICB8ICAgICAgICAgICAgICAgICAgICAgICAgfn5+fn5+IF4NCj4+PiAgICAxIGVy cm9yIGdlbmVyYXRlZC4NCj4+PiAgICAtLS0gaGtiZC5vIC0tLQ0KPj4+ICAgICoqKiBbaGti ZC5vXSBFcnJvciBjb2RlIDENCj4+PiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0K Pj4+DQo+Pj4gLS1Hb3Jkb24NCj4+IC0tIA0KPj4gQmVzdCBSZWdhcmRzLg0KPj4gU2hlbmdZ aSBIdW5nLg0KPj4NCj4gTXkgbWFjaGluZXMgcnVubmluZyBYIChsYXB0b3BzKSwNCj4NCj4g LSB0aGUgcmlnaHQgbW91c2Uga2V5IG5vIGxvbmdlciB3b3JrcyB1bmRlciBYLCBJIGNhbiBu byBsb25nZXIgdXNlIFgsDQo+IC0gdGhlIGNhcHMtbG9jayBsaWdodCB3aWxsIG5vdCBkaXNw bGF5IHVuZGVyIFgNCj4gLSBvbiB0aGUgdGV4dCBjb25zb2xlIHdvcmtzLCBYIGRvZXMgbm90 Lg0KPg0KPiBUaGUgdGhyZWUgY29tbWl0cyByZWxhdGVkIGhhdmUgYmVlIHJldmVydGVkIGxv Y2FsbHksIGZ1bmN0aW9uYWxpdHkgaGFzDQo+IHJldHVybmVkLg0KPg0KPg0KQmVzdCBSZWdh cmRzLg0KDQpTaGVuZ1lpIEh1bmcuDQoNCg== --------------T3A2xUu39BLzOXSUSvKmcjjQ Content-Type: application/pgp-keys; name="OpenPGP_0x5F4ED7D812606C60.asc" Content-Disposition: attachment; filename="OpenPGP_0x5F4ED7D812606C60.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xsDNBGhkuaEBDAD0a1Cu+ntw+v0/ZZnqTewGcd335T5tfktBEt22FsaoBqca7TSp /AvP/bWD3YtJFlxi7TJQbb2H+ylPzusPaN/R1Sj6wQsRD1Fj+1AjF9EOqxdohXm0 SoWs3sRRbMrMGp6qDTQQBMj3TEuSE26gLxmpadtiAsyNDcNCllMSXAZ7xlk+ra9x /pAqOR0TZvObwY8VUncCy6UWUIGmsUF5B7oR2v7i9rFk/3ILkcoIC1k+OlhMbxBp wPLA24Aj8sZX9dzFbwLn2wucqRUzE9IdzrwpQpRHxH0t849VBhLze+zP8s6IUtgK aTUjClmCfZXVVBpFswXJmxgDRo51Ed+X94K2y6FSDRMxwiz18vnJNWlB+aHH5wTb goTKU+zOckXODBowNEEmYpQNVNYJs1nP6tGRmN4YwW5hcNQYdUmFKR44uYdJomcq xkzJjU4rv4NBOdzrQTw+h5gCUdQ5IvBBGTA1enEP1qMhCpwTOfMd53of17BC3CMF NTu8rburHceMaU0AEQEAAc0jU2hlbmdZaSBIdW5nIDxhb2tibGFzdEBGcmVlQlNE Lm9yZz7CwRcEEwEIAEEWIQSIP4S1lgaPs34UknRfTtfYEmBsYAUCaGS5oQIbAwUJ BaOagAULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRBfTtfYEmBsYJKeDAC/ aJjRjMM9k9n6uwUWHemoAUGjv5fxkIpHWYCltnZ9KMs+TZXLsUZrv9DxOV4E3ebE n7iMJbOAvIjjVK//qexo6/er9EZow4e/EQJLIL/0xRDiF4Jg7l1jziAI26P6dyuM NzeHddFg7ALVfE9wPCFqn3QGbHqDVjI/E9UcxXiwHktndAo1wJXdEq9F8Ufmtj1t 9NasTip8ofNgKfWCGhyyZI0kvhvob5darflQMO8YG61zmSteO5Es8i9sP+lOhwEg sgHl0L/gQtMrOko9Td1iOSMuaP9t3rx7pOnYLdKt+xw8kWnBIW6GNEzp5QVJxmzr 4DiyvvuR4SxnYy2tZjzQV4W8njBvw8SmZs0oS40iP8XNAoc91xLBizDnLne3BDYO MXgm4csmDnJBM8s7Gaoc+WMY+hDP9SKWSqhyJUg8tauVhmPP3sTEXJbHoD0TuXxO SwG9nEdKoeWQCA0XMXQGfYWHKy1qz3spYCFgXHqmF+WBLljqLaeHQsHmvUhUIuTO wM0EaGS5oQEMAMiauBmqNndH0AaX9cqOCf660X6fj7iidxwPY9pSUBOgZ3c13pRJ LiR6xsYnOWm+Dgf2BbNOz5iEtwx3Msrjw70/LsTJ4FdByUXZPZwujaPZ2SfowLMX XZbEJrPkJ2HeamaDw/Gf5O/paDtAS3i8sFkKiOHwBX4doaL5Rxy/oqSpYTYL8tBF UWMHHk4ji12P6Pw1aW2H81XzKTae1Tga8ViuiWzqibbbk5ddHjr/L+6LfTDM00K7 WTZVBnW0qsMZJ9PQpt8636cuJx6D3ITXxtg4IzFNz7HOKbPQazSGhaqsbdxKmtwc P2uZEycsX+hPhtoOS2FuF5nWIYRZSzWBxWiOopHdRLL4YfALMsGhFdnPH/J3G9gy BroiCiq2moRl2OSgo9W6rMxLCm62657zsvCo8p/KxaGq/ynwCAoQ1wHQaVerJkGM f0n5tLkbNm2SyAbRy3tA/EfbzT0Yufq5gu9zGN/Uxf5hgFO6UqDHrlPeSSz++6m/ OAj3yLIsl2GpDwARAQABwsD8BBgBCAAmFiEEiD+EtZYGj7N+FJJ0X07X2BJgbGAF AmhkuaECGwwFCQWjmoAACgkQX07X2BJgbGAJswv/dODZRYTWb/Xx8Y/Ei1OXLZIo NxoUHvBVEqO1xR/FJPwYM8TVcihvhCfM5lLhYdY1pkLjXdlGbTKZtvdHWHLvs62j GVjUXij52z1jOurnX2u0x1vq1zpklWBx4VQhd3sVtcyLNdDYBFi3epVf1NEctToW yfBys6ijtVkhjem3V/l0PI1WtkECzYfPTOA+guf4dmrGSHPOZpCyFwHPRcVI+4pu va4s4tjCAYa5E56GkICUJLuT1x228iqr5OC8YA7FeOTN94L/GqII6joaX2HIrcpG DybRIhGty+BqXvRIpjp0z5PdDeHiFQFTnBAEnjiATAMDKd7Sq8y7Pv8OD/ptOl7F g5iexCGVoLc3idpo/5T5fEXEaEWcGF9HRUeRTrnqQ9yBnALsqoLLVfoueF5Cl7c3 p1pwbdR0iSK9p4x6BDcnrnIE52vRCtCdivyxTNa+zKdjlI6gn7oNsRmOnQbkEXML 9WZi4YnrnITSzpkpCzeQCDI0gqUdsxsbt4Vi73Oq =3DVgUx -----END PGP PUBLIC KEY BLOCK----- --------------T3A2xUu39BLzOXSUSvKmcjjQ-- --------------NdPwyJrGbbpVMHPhyP421xqG-- --------------YUxC8E7WsG7sTNIKtIUN0OaB Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wsD5BAABCAAjFiEEiD+EtZYGj7N+FJJ0X07X2BJgbGAFAmip+fsFAwAAAAAACgkQX07X2BJgbGD3 LwwAoTb0b/StPEI/6jLfaZ4Q+kRiU+ynfzVR5mUBW6Xr3KdTutOqIWsFd1h3wA5hm1VxwAoQ9Dgv QSGDurCPUTjSRvcoNEgS07OZitUVRczrpZ1hicjgFYUYmb+uC5uI/3VPM9MEojLtJRyppZ/KVK2N OGfxic572dV/7akbGFVPsu0QzO8rN8tBlCHEYaZcqBMnMRj/2lE2DZpNAZ+U0seIR7C7C1LLJNRV UDs3YTFRpTtN5zF7qGKi02M6wSnC+BctAklSVHp/rLvXN5MljX/K/k3zgy09f+BzKxNkk11NvQa4 WlNf8iDZCGM8fZM8HUeloZbkvtXoyaMQ5yw0dsCeBAh7h+ukNYuATQGVQRfAIvuR++8d2Adb+gcS 6uRffLFdgKNmgV3vbYDtCUXZaBdojiQFf22jeYrTbsDf8wH4gE9OMpXF6GFrVb5qGhRpZpTZoO9u NYegMKz6LOsmWH7FgHMb8/Wqg/g5+bxH9qTMWKA6X775djOfDBIHm1Tb0ANC =LntQ -----END PGP SIGNATURE----- --------------YUxC8E7WsG7sTNIKtIUN0OaB-- From nobody Sat Aug 23 17:43:54 2025 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 4c8PYk5mVlz66CNb for ; Sat, 23 Aug 2025 17:43:54 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8PYk5HkHz3ZGt; Sat, 23 Aug 2025 17:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755971034; 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=+bXdeMeM3ysuIShtFbUCvne11HGI+41RYS0cClNkQVI=; b=DET8rSFM8+DC00F+MkSQowJSrtn1bHFOjvRB31J0nZgBUVuWZbv0odtR0BReLmHgME9Xr7 jI1VHBTbz8Ks1rjQnrYTQ8xlmyDVT7n2NPPha25nji0FVFwDiPsGPm9Vrn6YLPnmi+x+sF bdEfpL4cQRNBbbQXM0lKZav1cSjhERzHVfZxEiqw0prbpIfufFNgqccCW3zbUHvZxV7jSv z20mtXKte0khFy0+PKnmSkhNqUt2PZOZww8WfYJVS7fX4Xo68T8Fj0L0TAKIM9gCkXcU4/ ukyCeDHXkOpXsYXgh0io4mL9gfi2F6iCNZGQ+NONAx9lBeAYKFuUoAaYAarzYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755971034; 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=+bXdeMeM3ysuIShtFbUCvne11HGI+41RYS0cClNkQVI=; b=LbofroXULUrixmhuTC61JEhdR4VitNDIfedjDCv8kLAGHhkfSrJ33U6rNHyCMXj8h0tbr5 KwaCCpmEXqZcXfp1/4IbKWnifqYLNItiDwQDt75hUHs1HRORcpfUcvO48eF7SlfhvAj5pO p24rIvYPN2YLafDPXfUjPI1Au2gIhfhuNDE4/1ZVXtxl6kh5O0aF22qSRrDdEV45HvrnlT xAmK7jGNURYhDKnsUPjzxDYFfrakDyayq3V7oW5Wims2KB3/C65fNX8xJp738Sb65s0oig HQpt55sgkqpWp8pXLL59SeM8sKxnzLwMnUa25uafBWR+gVknC+/zrzCAeUOFSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755971034; a=rsa-sha256; cv=none; b=mBUqPLDNK008C8iNyLV8sijogd7V/3V970DLfuwEri9T7nbWDFn+6NThK7OqhJzT1Vymz0 MMnC82k/GJ52kF594SSt12Ozfl5MXHjaJ7+R6WwihstIh7CqT+0zmhx7008wysusWTKmhZ /gAQwBv1ZDsUoDBwvQYucDkFQKmD15Tqpd1/8NqBq2m8AwD4WMV5tgAr9SrxZQvhRlfdsS 6FWix1dDvczWLwSiBw42t/T5fotsm1I2ns9wcIF9vBy8snqJi6k2ywsoT6brm9815IusB6 iDck2dTlNj+TTAuB54xjcFBn3Rk3NMpRCxKehDzgXyO5fjyjRnpmMlcn4/mV6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8PYk4RQ7zBGB; Sat, 23 Aug 2025 17:43:54 +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 57NHhsYk081872; Sat, 23 Aug 2025 17:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NHhslx081871; Sat, 23 Aug 2025 17:43:54 GMT (envelope-from git) Date: Sat, 23 Aug 2025 17:43:54 GMT Message-Id: <202508231743.57NHhslx081871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Warner Losh Subject: git: 82a9c706179e..4d63aec3c380 - vendor/lua - vendor branch updated 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/vendor/lua X-Git-Reftype: branch X-Git-Commit: 4d63aec3c3805e2b8d91d2622752c525be755c17 X-Git-Oldrev: 82a9c706179ee449d17fe66787bc27182143ddd5 X-Git-Newrev: 4d63aec3c3805e2b8d91d2622752c525be755c17 Auto-Submitted: auto-generated The branch vendor/lua has been updated by imp: URL: https://cgit.FreeBSD.org/src/log/?id=82a9c706179e..4d63aec3c380 4d63aec3c380 lua: Import Lua 5.4.8 From nobody Sat Aug 23 17:43:54 2025 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 4c8PYl0wqlz66CRm for ; Sat, 23 Aug 2025 17:43:55 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8PYk61Snz3ZLg; Sat, 23 Aug 2025 17:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755971034; 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=LbPlqWSXt911eoM/WmmaOXk1rGKpE9MItY210n0X/PY=; b=PwsK6uMR1p0LcYfqMN+h1MT19+IYxaxLB7FhI1EXdi8G72vY7ZMjz02bS3BxmYBAsE04GQ EUSruHcFwwEzlSQKFHx1HpdNqlsjO6R0EAvqp5DaQTT2StQjv819twDJJ8vz09ocjDLkvb Q8EEaKzxfeiTgr7y8fkQ7Eb00T+zuXLD6/JVxoc6CNlkL1gLY0ClQBgaurN/gExOw7/eiC 0F8MS6MX+6EirzbWWTcZCWrG7A+Bi/qD2nOJaCToOT2U3XuMb7rIQJj3BiJItj9wP9ofGV 7xzvUaDqfvMalyTjhkOK+Tb2CimOsgIdxXADjRVNqKOCYxeKGyz3VPkk60Q/8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755971034; 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=LbPlqWSXt911eoM/WmmaOXk1rGKpE9MItY210n0X/PY=; b=ArRYkjQ5Ifl13ZSGWn7cJn4TQuXfaszVk5qRTNHJzPuy2/ABeWvsEr4+mPPiIxwSVZnyon kpgaks4T4ehrAXJz6CcnEPl4l/ep4NpUIYrqi+n8KIv4P7z2ZgfQLiM/pZpU4nRQ4k6yQa c8bKgVrgIiJpfR3nLU98u+JsDNJtnZG5zepybhUC94GqLHwMQyoRrDmjvjaRbszXPe9VqW lUpsBmXjRgtwNVp2eZmbdHlDWxVmI7Qu+1WSUQUHgFSlPtYzs3Getz7tm4rOBqX8o0XeJj e/vs2u9iSajIpg0rbjm8BFcI1aHsyqThAiiMvnLe/cWUSH17YnI+oD/4gghWKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755971034; a=rsa-sha256; cv=none; b=vBEZYaOkQO2N54CUrNYfdFUcUWBYz/geqkxZq+g0t4cXRMmtP9CrVUryjD8JuqlrmyFu+J 3WeGl34Ts/n5godUI1auhu22/PazUjqkcnJUqzmwaWovPa/ynCU8KAEKvJZQtHeHGpuch4 huWrzXDK0qi2WPkQ3AAAmgHd4zz1V3NV+WJ84yi7HIF9DXX9An3msHCEnxYn29Dn52Gsut 9YY6rqn/9l9iyNncBcn0d45DKCX1IynIbyVla9A5CG37EL5SMh+RN+TuVO6bvIrCinQYyf XViMJxsel9hLF85mo001kz/nVug0210HiaPBQLHbCeGE+ujUDxM10ZrEjLB5ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8PYk5HCkzB2m; Sat, 23 Aug 2025 17:43:54 +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 57NHhseS081895; Sat, 23 Aug 2025 17:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NHhsgp081893; Sat, 23 Aug 2025 17:43:54 GMT (envelope-from git) Date: Sat, 23 Aug 2025 17:43:54 GMT Message-Id: <202508231743.57NHhsgp081893@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Warner Losh Subject: git: 36e64d5511d6 - Create tag vendor/lua/5.4.8 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: imp X-Git-Repository: src X-Git-Refname: refs/tags/vendor/lua/5.4.8 X-Git-Reftype: annotated tag X-Git-Commit: 36e64d5511d6ff2dddc7bb8826811cf807f3566b Auto-Submitted: auto-generated The annotated tag vendor/lua/5.4.8 has been created by imp: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/lua/5.4.8 tag vendor/lua/5.4.8 Tagger: Warner Losh TaggerDate: 2025-08-23 16:56:28 +0000 Import lua 5.4.8 release. commit 4d63aec3c3805e2b8d91d2622752c525be755c17 Author: Warner Losh AuthorDate: 2025-08-23 16:56:08 +0000 Commit: Warner Losh CommitDate: 2025-08-23 16:56:08 +0000 lua: Import Lua 5.4.8 From nobody Sat Aug 23 17:44:33 2025 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 4c8PZd5dsqz66CXf; Sat, 23 Aug 2025 17:44:41 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8PZd4lZPz3ZnD; Sat, 23 Aug 2025 17:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755971081; 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=+1YXsiAJLymTmAAMRRulOSJ/IS7sbvqM2B58F6oO65s=; b=uNk1XNYF44ABkgmSs3dLSYh2PnPLdfXpPgPWytkzf7OjFMHW2IgvfEVvztU82XnKntF4I+ /m4x86arpc0O3uZwRg9Cxm8SwW9tfXQE4iLjvWcSoEy1TVv/cMNf2O9bG51UGh5w+QYfzl +FDhZoFqnKi9qtr5cd6pUNm39rYMwjbEhZE9r4HjXYWx+e/N6a4oriTbDwpkbATJ5Dhlob Hjy7meQirElrmz3yOtlO7IR2FCwd6U3wOiwhQzRI+HyV4cVF/Y13ndn9kgH0aLlZLiwjFG NyS15lslp4vE1wVgGMoSoxB82eGocQocML4AL830IrxJrszAoVbbLfSbe/MdjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755971081; 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=+1YXsiAJLymTmAAMRRulOSJ/IS7sbvqM2B58F6oO65s=; b=G38UHojXel78FvK0WxZfzSBYtdeSY1Sl1fW9EK38Xo1+w1xBBbThHYVPm5GIwKXSseZG+6 LnxSuLbvJHtfoUVPuwp2R4tldqB1UbdiedJ/Z8oGDAjvR/xYAiRiG6PxnH2btv3Rupl22y 18GNN5ad9xZeusjJzUbQkv7f8BwlzaJ/vNJFgQmtOwaA3BLL9u8pov5RFnzhubW0TEFlD1 rzoapaI+yKdYe2Y2k29jAIHnDel3FmXQQEWEOIse1bBWSkPgxz3fIb31aAai7/qfHg1Xzo v8oCnds7hVu6pXeH8zqlyymb8+s9k8gvo5rqD+0LOq/tksob3wkU0hZR8yWgPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755971081; a=rsa-sha256; cv=none; b=xaVr4VrcicKaMS7VLxBX/0i4HOs+DR8PX7ijAj8/DTSbRjS4g2KgeeXrbgbmc0gm63zHQV yoEBVyBdXC390LU/W3BPlfLvzvGvV15F10eMpY8xWTT+suwiOofGSeyNq8crlwJlYeBFZZ 0WanWR3PpAZzD9r6gu/f0m+8nNh6WzXpiWs8XcD52Q3RDj3HgQ3HVJExbMVOVCvU74lkY1 dwwalqsQ9h61oWXDuP3cxnDtpfN3lm6GwyXPw2xU+YGjvKo2tDpGAdoKvpYfssG9z1VcDP CVlFHBiRKMQ9+HXs8plgt5JCXkeiTGeLg7QdIee61KhB69+/0cA7Vi24rkLlXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8PZd4K6zzBGC; Sat, 23 Aug 2025 17:44:41 +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 57NHif6s082256; Sat, 23 Aug 2025 17:44:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NHiXEY082212; Sat, 23 Aug 2025 17:44:33 GMT (envelope-from git) Date: Sat, 23 Aug 2025 17:44:33 GMT Message-Id: <202508231744.57NHiXEY082212@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 3068d706eabe - main - lua: Merge lua 5.4.8 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3068d706eabe99f930fb01d3cbfd74ff1f0eb5a2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3068d706eabe99f930fb01d3cbfd74ff1f0eb5a2 commit 3068d706eabe99f930fb01d3cbfd74ff1f0eb5a2 Merge: 6ea7e1f92882 4d63aec3c380 Author: Warner Losh AuthorDate: 2025-08-23 16:58:09 +0000 Commit: Warner Losh CommitDate: 2025-08-23 16:58:09 +0000 lua: Merge lua 5.4.8 Pick up a few bug fixes from lua 5.4.8: 267ef461 Bug: check for constructor overflow in [exp] fields d1ee2a4d Bug: Bad error message with fields of string _ENV 3fe7be95 Bug: message handler can be overwritten 983bc433 Bug: Use after free in 'luaV_finishset' 25da574f Bug: 'luaD_seterrorobj' should not raise errors f5e55be2 Bug: Missing error status in panic function 9f0c0fe0 Bug: Wrong limit for local variables in 16-bit systems 782ef85b Bug: wrong code gen. for indices with comparisons 30982bec Bug: Bad stack manipulation in 'multiline' (REPL) contrib/lua/Makefile | 2 +- contrib/lua/README | 2 +- contrib/lua/doc/contents.html | 14 +-- contrib/lua/doc/lua.1 | 6 +- contrib/lua/doc/lua.css | 1 + contrib/lua/doc/manual.html | 50 +++++---- contrib/lua/doc/readme.html | 48 ++++----- contrib/lua/src/lapi.c | 6 +- contrib/lua/src/lauxlib.c | 28 +++-- contrib/lua/src/lcode.c | 38 +++---- contrib/lua/src/lcode.h | 3 - contrib/lua/src/ldebug.c | 231 +++++++++++++++++++++++++----------------- contrib/lua/src/ldebug.h | 1 + contrib/lua/src/ldo.c | 27 +++-- contrib/lua/src/ldo.h | 2 +- contrib/lua/src/lgc.c | 20 ++-- contrib/lua/src/liolib.c | 27 +++-- contrib/lua/src/lmathlib.c | 31 ++++-- contrib/lua/src/loadlib.c | 9 -- contrib/lua/src/lobject.c | 2 +- contrib/lua/src/lobject.h | 18 ++-- contrib/lua/src/lopcodes.h | 8 +- contrib/lua/src/loslib.c | 2 + contrib/lua/src/lparser.c | 19 ++-- contrib/lua/src/lstate.c | 11 +- contrib/lua/src/lstate.h | 3 +- contrib/lua/src/lstring.c | 13 +-- contrib/lua/src/ltable.c | 39 ++++--- contrib/lua/src/ltable.h | 2 - contrib/lua/src/ltm.h | 5 +- contrib/lua/src/lua.c | 28 +++-- contrib/lua/src/lua.h | 8 +- contrib/lua/src/luaconf.h | 9 ++ contrib/lua/src/lundump.c | 4 +- contrib/lua/src/lundump.h | 3 +- contrib/lua/src/lvm.c | 81 +++++++-------- 36 files changed, 474 insertions(+), 327 deletions(-) diff --cc contrib/lua/Makefile index 8efa2eb3fdd6,000000000000..6e21588476df mode 100644,000000..100644 --- a/contrib/lua/Makefile +++ b/contrib/lua/Makefile @@@ -1,106 -1,0 +1,106 @@@ +# Makefile for installing Lua +# See doc/readme.html for installation and customization instructions. + +# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= + +# Your platform. See PLATS for possible values. +PLAT= guess + +# Where to install. The installation starts in the src and doc directories, +# so take care if INSTALL_TOP is not an absolute path. See the local target. +# You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with +# LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. +INSTALL_TOP= /usr/local +INSTALL_BIN= $(INSTALL_TOP)/bin +INSTALL_INC= $(INSTALL_TOP)/include +INSTALL_LIB= $(INSTALL_TOP)/lib +INSTALL_MAN= $(INSTALL_TOP)/man/man1 +INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V +INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V + +# How to install. If your install program does not support "-p", then +# you may have to run ranlib on the installed liblua.a. +INSTALL= install -p +INSTALL_EXEC= $(INSTALL) -m 0755 +INSTALL_DATA= $(INSTALL) -m 0644 +# +# If you don't have "install" you can use "cp" instead. +# INSTALL= cp -p +# INSTALL_EXEC= $(INSTALL) +# INSTALL_DATA= $(INSTALL) + +# Other utilities. +MKDIR= mkdir -p +RM= rm -f + +# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + +# Convenience platforms targets. +PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris + +# What to install. +TO_BIN= lua luac +TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp +TO_LIB= liblua.a +TO_MAN= lua.1 luac.1 + +# Lua version and release. +V= 5.4 - R= $V.6 ++R= $V.8 + +# Targets start here. +all: $(PLAT) + +$(PLATS) help test clean: + @cd src && $(MAKE) $@ + +install: dummy + cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) + cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) + cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) + +uninstall: + cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN) + cd src && cd $(INSTALL_INC) && $(RM) $(TO_INC) + cd src && cd $(INSTALL_LIB) && $(RM) $(TO_LIB) + cd doc && cd $(INSTALL_MAN) && $(RM) $(TO_MAN) + +local: + $(MAKE) install INSTALL_TOP=../install + +# make may get confused with install/ if it does not support .PHONY. +dummy: + +# Echo config parameters. +echo: + @cd src && $(MAKE) -s echo + @echo "PLAT= $(PLAT)" + @echo "V= $V" + @echo "R= $R" + @echo "TO_BIN= $(TO_BIN)" + @echo "TO_INC= $(TO_INC)" + @echo "TO_LIB= $(TO_LIB)" + @echo "TO_MAN= $(TO_MAN)" + @echo "INSTALL_TOP= $(INSTALL_TOP)" + @echo "INSTALL_BIN= $(INSTALL_BIN)" + @echo "INSTALL_INC= $(INSTALL_INC)" + @echo "INSTALL_LIB= $(INSTALL_LIB)" + @echo "INSTALL_MAN= $(INSTALL_MAN)" + @echo "INSTALL_LMOD= $(INSTALL_LMOD)" + @echo "INSTALL_CMOD= $(INSTALL_CMOD)" + @echo "INSTALL_EXEC= $(INSTALL_EXEC)" + @echo "INSTALL_DATA= $(INSTALL_DATA)" + +# Echo pkg-config data. +pc: + @echo "version=$R" + @echo "prefix=$(INSTALL_TOP)" + @echo "libdir=$(INSTALL_LIB)" + @echo "includedir=$(INSTALL_INC)" + +# Targets that do not create files (not all makes understand .PHONY). +.PHONY: all $(PLATS) help test clean install uninstall local dummy echo pc + +# (end of Makefile) From nobody Sat Aug 23 19:12:33 2025 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 4c8RX15rNVz66JQY; Sat, 23 Aug 2025 19:12: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8RX15L3Cz3k6b; Sat, 23 Aug 2025 19:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755976353; 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=H/+/Z9J01pqTHkP2Zck8QBRpt1LZGixsppwNSHf0QlQ=; b=Z5ruZr4AlUrPP4+S4CY6F6bDKEKhQ66sAPi1tRy7HkTg6G397TbKc5xfWos/c68Xt3UUlv yxlNX9NcoWAVMvRoIU63IdfvA6KWobV6IeLo7sWvUbvsKdia4pQqHQBST5r5xvUupF5Q42 X5wJjgL3ee7whtZ7b/wv0fWX5DQMtuOFAgbi+rGiZNmSoiVv/F+GA/fEzZ1aKavfBNi4Mg QHX0s19uqlUMi+QC5myqKsAP0L9489t2yPp2qSazyc1UyKXmjQ2oGkjexN/P41eun1/yE+ k4yvq1Qycl9vr4b2P8bVzW11WiCF1jx8LWmvJB29AlKC+SX0Be6q0QJCJZWihA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755976353; 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=H/+/Z9J01pqTHkP2Zck8QBRpt1LZGixsppwNSHf0QlQ=; b=Rw1E0dZ2aGC/ZJTSchvWkIMOWCbEmH/VgSpP3Bj+JsMolOvU8v1RNgBfELXOHUzCZ0kzVn YazS5+QfYikdnuD3/U5DwMbC6SOVIM5VL7Kf2BJ8E/jYJe+dl7YYFBgcbVperQvtju0sNJ W06zwIZ6S1M1Nj+avp0wlnrcjboAfsO3JfmrmZRHFeShc8SVdYehHDvuZHDBnU25lV0Xeu W0oDhXEyCxLnU1xphaha0oAocIea4ewHA4G6FSeWaE6gh2cD6SP4d4OjnCfXrTZAb3eQQn Lm/b0oPp+W2WZ9HbmVeHKxJTFQCmrOfsfl+3HP74CVA5FByi77rJnJ5wl7OouA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755976353; a=rsa-sha256; cv=none; b=erE2OVaoQvY7CxTgvGBUJb5Bh0xUyNq9Rvrvc3EY8tL0UcxtzOIrSRiJun2TKbhdU+y3jS sHrQH335+ATHYBsMY1Hj5xKPym/8b4mGXeAGBLdZPxNEegajBrtEe8zUxKDPr10vXM1KG2 Zzvdm8GcAHJNz17Ec4sCdJ/DlcQGJVZmw49aIc6Ly9pGNs40mlZiW1aCCHNuKLNuMPdXf7 eLZwKsEULTmoaKiIAKfUMLPQUBD/he0oMyWfS8VK9zGTp4azlQ4eKi5KQIcIAO82D3dimO urXk8E7IbptUdcZCkGTyfBf44EVtaNq7RXB01cI4cqX9g00j/9yiTHo21gx31Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8RX14FpWzDPT; Sat, 23 Aug 2025 19:12: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 57NJCX55052872; Sat, 23 Aug 2025 19:12:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NJCXl8052869; Sat, 23 Aug 2025 19:12:33 GMT (envelope-from git) Date: Sat, 23 Aug 2025 19:12:33 GMT Message-Id: <202508231912.57NJCXl8052869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: f13a042a5711 - main - netlink/route: Support modifying IFLA_ADDRESS with RTM_NEWLINK 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f13a042a5711310c0b240338c7bd8d6b58f05478 Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=f13a042a5711310c0b240338c7bd8d6b58f05478 commit f13a042a5711310c0b240338c7bd8d6b58f05478 Author: Muhammad Saheed AuthorDate: 2025-08-23 19:09:35 +0000 Commit: Aymeric Wibo CommitDate: 2025-08-23 19:11:42 +0000 netlink/route: Support modifying IFLA_ADDRESS with RTM_NEWLINK Allows setting link-layer address (MAC) by specifying the IFLA_ADDRESS attribute on RTM_NEWLINK requests. Reviewed by: melifaro, obiwac, mckusick (mentor) Approved by: melifaro, obiwac, mckusick (mentor) Sponsored by: Google LLC (GSoC) Differential Revision: https://reviews.freebsd.org/D51922 --- sys/netlink/route/iface.c | 1 + sys/netlink/route/iface_drivers.c | 18 ++++++++++++++++++ sys/netlink/route/route_var.h | 1 + 3 files changed, 20 insertions(+) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 8b871576d0b2..9beb80792af4 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -403,6 +403,7 @@ static const struct nlattr_parser nla_p_linfo[] = { NL_DECLARE_ATTR_PARSER(linfo_parser, nla_p_linfo); static const struct nlattr_parser nla_p_if[] = { + { .type = IFLA_ADDRESS, .off = _OUT(ifla_address), .cb = nlattr_get_nla }, { .type = IFLA_IFNAME, .off = _OUT(ifla_ifname), .cb = nlattr_get_string }, { .type = IFLA_MTU, .off = _OUT(ifla_mtu), .cb = nlattr_get_uint32 }, { .type = IFLA_LINK, .off = _OUT(ifla_link), .cb = nlattr_get_uint32 }, diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c index 4bf913d9c978..21db3017df18 100644 --- a/sys/netlink/route/iface_drivers.c +++ b/sys/netlink/route/iface_drivers.c @@ -105,6 +105,24 @@ _nl_modify_ifp_generic(struct ifnet *ifp, struct nl_parsed_link *lattrs, } } + if (lattrs->ifla_address != NULL) { + if (nlp_has_priv(npt->nlp, PRIV_NET_SETIFMAC)) { + error = if_setlladdr(ifp, + NLA_DATA(lattrs->ifla_address), + NLA_DATA_LEN(lattrs->ifla_address)); + if (error != 0) { + nlmsg_report_err_msg(npt, + "setting IFLA_ADDRESS failed with error code: %d", + error); + return (error); + } + } else { + nlmsg_report_err_msg(npt, + "Not enough privileges to set IFLA_ADDRESS"); + return (EPERM); + } + } + return (0); } diff --git a/sys/netlink/route/route_var.h b/sys/netlink/route/route_var.h index b84b34461e35..41f110038b54 100644 --- a/sys/netlink/route/route_var.h +++ b/sys/netlink/route/route_var.h @@ -69,6 +69,7 @@ struct nl_parsed_link { char *ifla_cloner; char *ifla_ifalias; struct nlattr *ifla_idata; + struct nlattr *ifla_address; unsigned short ifi_type; int ifi_index; uint32_t ifla_link; From nobody Sat Aug 23 21:20:11 2025 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 4c8VMJ2JFKz66Rdd; Sat, 23 Aug 2025 21:20:12 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8VMJ0DRKz3tfC; Sat, 23 Aug 2025 21:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984012; 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=WE7ljHxWoRk14Od73NJ04Dmb9Yfj76YNWWEJBKv7hI4=; b=Wsas69vj2O1v2Z2CPFlaMg1EwfdmuR7/74MWA36wMQXVvodThDF/D7OuqHZGKOmK7oe2do 7i9rWx+sRaQY1rllpuMt6n9+1GYSSVBRQRx5gadGIkmvwTdA1PxRRdQgfRln6zLnEVL8e5 p33hIPBFBY/rPhcB/ubdNSPfu8XAG9z2xS0zosKcsj+94jagTDX41u2AyGLbl95h1JNg7k KD2P130fxKny6YFynYr54wB/0ys8PRFsnJwsQfWiAZ/oqmrupSaVVeZ7W3/UPV1XB1ImX8 25KHpRNDNDYlVRCf0IHSTTKrDiMhsmIxa1YKvxs74UAH1E8ShdN8/J5zcPeQ1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984012; 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=WE7ljHxWoRk14Od73NJ04Dmb9Yfj76YNWWEJBKv7hI4=; b=vjctP3wIWWsMAhsTkYeVS7ImDqNaOyQfqGl+ux4GTtYpC6/VB1oonD1PM/zEtRYOk0KM01 eyP3kY3ryDKkZNx4CnmrTF9jaezYGZzAc9i2sVXbC6h6gMOAK0utYYipnbHitJbp4hPM7Y 4wdlf6fYPl2n7uKGD8WxYE93pJ2p6iMUyxMh+QRA7Sj+RaqKvOohS/Duj84jQI529RNn3F hQDvalJr8ikVI3lBPLa+YVMKWGXfQLeE68KqdCtmCRcS6iGa73gcL7bEtuZTyWG23N7EXO 0TebpIbH1fTs7CFuhE0zChCnsPJPW7c4PWOFlEI/FnlCIwtJSJyi0P9kCK5Vqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755984012; a=rsa-sha256; cv=none; b=wOE64cEa3iRkJN1QSt8l0tRto0cfvsTGhQGS9mxa4fFxetM2JdusZ/8xeEQ1KPg83Wi7Hb ku07PLPcCdBvI9Dgq+I18OPHFD+m89IATMiEIK34uRqMMKi6b75OVv1bmBdOmM775By4BB GxRQrbo6ZvuspHRz0y2N1ngpwVZC6/QrBIPjzwbuAHXEwUumhqJsHsa9w3DvTH7mj53oe2 9URiARMR30qFQL9NaQWR0M5BKhSTBr0fOgG8yMmluW+V5E6Kqe72/shLWYTw+GDg5xM8Px Ik4jFgrkqxydqkjv3TJ96wA9unWpHfcJQh0Nn7Te6WIROsOkguyc2PQmghH72g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8VMH6qHJzZ72; Sat, 23 Aug 2025 21:20:11 +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 57NLKBL8086554; Sat, 23 Aug 2025 21:20:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NLKB9K086540; Sat, 23 Aug 2025 21:20:11 GMT (envelope-from git) Date: Sat, 23 Aug 2025 21:20:11 GMT Message-Id: <202508232120.57NLKB9K086540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 3f61ececacd8 - stable/14 - nfsd: Avoid relocking vnode for NFSv4 Readdir 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3f61ececacd8d86f7c9dfc73383e0346f66f0784 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3f61ececacd8d86f7c9dfc73383e0346f66f0784 commit 3f61ececacd8d86f7c9dfc73383e0346f66f0784 Author: Rick Macklem AuthorDate: 2025-07-19 22:45:40 +0000 Commit: Rick Macklem CommitDate: 2025-08-23 21:15:18 +0000 nfsd: Avoid relocking vnode for NFSv4 Readdir Without this patch, nfsv4_fillattr() relocks the vnode to test to see if extended attributes are supported. This is inefficient and could cause deadlocks if Readdir ever asks for this attribute. At this time, no extant NFSv4 client asks for this attribute for Readdir, but this patch fixes the problem in case a future client does so, by moving the test for extended attribute support to before the nfsv4_fillattr() call where the vnode is still locked. (cherry picked from commit c00baac0ab46f54951a29b834e064935b749ae9a) --- sys/fs/nfs/nfs_commonsubs.c | 19 +++---------------- sys/fs/nfs/nfs_var.h | 6 +++--- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- sys/fs/nfsclient/nfs_clstate.c | 2 +- sys/fs/nfsserver/nfs_nfsdport.c | 24 ++++++++++++++++++------ sys/fs/nfsserver/nfs_nfsdserv.c | 16 ++++++++++++++-- 6 files changed, 40 insertions(+), 29 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index cb9e32376170..560720911e84 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -640,7 +640,8 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap, NFSATTRBIT_TIMECREATE)) NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMECREATE); (void) nfsv4_fillattr(nd, vp->v_mount, vp, NULL, vap, NULL, 0, - &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL); + &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL, + false); break; } } @@ -2580,7 +2581,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, NFSACL_T *saclp, struct vattr *vap, fhandle_t *fhp, int rderror, nfsattrbit_t *attrbitp, struct ucred *cred, NFSPROC_T *p, int isdgram, int reterr, int supports_nfsv4acls, int at_root, uint64_t mounted_on_fileno, - struct statfs *pnfssf) + struct statfs *pnfssf, bool xattrsupp) { int bitpos, retnum = 0; u_int32_t *tl; @@ -2594,8 +2595,6 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, struct nfsfsinfo fsinf; struct timespec temptime; NFSACL_T *aclp, *naclp = NULL; - size_t atsiz; - bool xattrsupp; #ifdef QUOTA struct dqblk dqb; uid_t savuid; @@ -2679,18 +2678,6 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, } } - /* Check to see if Extended Attributes are supported. */ - xattrsupp = false; - if (NFSISSET_ATTRBIT(retbitp, NFSATTRBIT_XATTRSUPPORT)) { - if (NFSVOPLOCK(vp, LK_SHARED) == 0) { - error = VOP_GETEXTATTR(vp, EXTATTR_NAMESPACE_USER, - "xxx", NULL, &atsiz, cred, p); - NFSVOPUNLOCK(vp); - if (error != EOPNOTSUPP) - xattrsupp = true; - } - } - /* * Put out the attribute bitmap for the ones being filled in * and get the field for the number of attributes returned. diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 8b8b3f5ce961..bcb0588ef012 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -394,8 +394,8 @@ int nfsrv_putopbit(struct nfsrv_descript *, nfsopbit_t *); void nfsrv_wcc(struct nfsrv_descript *, int, struct nfsvattr *, int, struct nfsvattr *); int nfsv4_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, NFSACL_T *, - struct vattr *, fhandle_t *, int, nfsattrbit_t *, - struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t, struct statfs *); + struct vattr *, fhandle_t *, int, nfsattrbit_t *, struct ucred *, + NFSPROC_T *, int, int, int, int, uint64_t, struct statfs *, bool); void nfsrv_fillattr(struct nfsrv_descript *, struct nfsvattr *); struct mbuf *nfsrv_adj(struct mbuf *, int, int); void nfsrv_postopattr(struct nfsrv_descript *, int, struct nfsvattr *); @@ -726,7 +726,7 @@ int nfsvno_updfilerev(vnode_t, struct nfsvattr *, struct nfsrv_descript *, NFSPROC_T *); int nfsvno_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, struct nfsvattr *, fhandle_t *, int, nfsattrbit_t *, - struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t); + struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t, bool); int nfsrv_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *, NFSACL_T *, NFSPROC_T *); int nfsv4_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *, diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 5722810191b4..3c580b90e6b9 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -5319,7 +5319,7 @@ nfsrpc_setaclrpc(vnode_t vp, struct ucred *cred, NFSPROC_T *p, NFSZERO_ATTRBIT(&attrbits); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ACL); (void) nfsv4_fillattr(nd, vp->v_mount, vp, aclp, NULL, NULL, 0, - &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL); + &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL, false); error = nfscl_request(nd, vp, p, cred); if (error) return (error); diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index af8297b68c0e..bbfcd96408c2 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -3702,7 +3702,7 @@ nfscl_docb(struct nfsrv_descript *nd, NFSPROC_T *p) if (!error) (void) nfsv4_fillattr(nd, NULL, NULL, NULL, &va, NULL, 0, &rattrbits, NULL, p, 0, 0, 0, 0, - (uint64_t)0, NULL); + (uint64_t)0, NULL, false); break; case NFSV4OP_CBRECALL: NFSCL_DEBUG(4, "cbrecall\n"); diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index ae3d81926db2..a4a729613038 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -2022,7 +2022,8 @@ int nfsvno_fillattr(struct nfsrv_descript *nd, struct mount *mp, struct vnode *vp, struct nfsvattr *nvap, fhandle_t *fhp, int rderror, nfsattrbit_t *attrbitp, struct ucred *cred, struct thread *p, int isdgram, int reterr, - int supports_nfsv4acls, int at_root, uint64_t mounted_on_fileno) + int supports_nfsv4acls, int at_root, uint64_t mounted_on_fileno, + bool xattrsupp) { struct statfs *sf; int error; @@ -2041,7 +2042,7 @@ nfsvno_fillattr(struct nfsrv_descript *nd, struct mount *mp, struct vnode *vp, } error = nfsv4_fillattr(nd, mp, vp, NULL, &nvap->na_vattr, fhp, rderror, attrbitp, cred, p, isdgram, reterr, supports_nfsv4acls, at_root, - mounted_on_fileno, sf); + mounted_on_fileno, sf, xattrsupp); free(sf, M_TEMP); NFSEXITCODE2(0, nd); return (error); @@ -2341,7 +2342,7 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram, struct nfsvattr nva, at, *nvap = &nva; struct mbuf *mb0, *mb1; struct nfsreferral *refp; - int nlen, r, error = 0, getret = 1, usevget = 1; + int nlen, r, error = 0, getret = 1, ret, usevget = 1; int siz, cnt, fullsiz, eofflag, ncookies, entrycnt; caddr_t bpos0, bpos1; u_int64_t off, toff, verf __unused; @@ -2355,6 +2356,8 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram, uint64_t mounted_on_fileno; struct thread *p = curthread; int bextpg0, bextpg1, bextpgsiz0, bextpgsiz1; + size_t atsiz; + bool xattrsupp; if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &at); @@ -2821,9 +2824,18 @@ again: *tl++ = newnfs_true; txdr_hyper(*cookiep, tl); dirlen += nfsm_strtom(nd, dp->d_name, nlen); + xattrsupp = false; if (nvp != NULL) { supports_nfsv4acls = nfs_supportsnfsv4acls(nvp); + if (NFSISSET_ATTRBIT(&attrbits, + NFSATTRBIT_XATTRSUPPORT)) { + ret = VOP_GETEXTATTR(nvp, + EXTATTR_NAMESPACE_USER, + "xxx", NULL, &atsiz, + nd->nd_cred, p); + xattrsupp = ret != EOPNOTSUPP; + } NFSVOPUNLOCK(nvp); } else supports_nfsv4acls = 0; @@ -2843,13 +2855,13 @@ again: nvp, nvap, &nfh, r, &rderrbits, nd->nd_cred, p, isdgram, 0, supports_nfsv4acls, at_root, - mounted_on_fileno); + mounted_on_fileno, xattrsupp); } else { dirlen += nfsvno_fillattr(nd, new_mp, nvp, nvap, &nfh, r, &attrbits, nd->nd_cred, p, isdgram, 0, supports_nfsv4acls, at_root, - mounted_on_fileno); + mounted_on_fileno, xattrsupp); } if (nvp != NULL) vrele(nvp); @@ -6222,7 +6234,7 @@ nfsrv_setacldsdorpc(fhandle_t *fhp, struct ucred *cred, NFSPROC_T *p, * the same type (VREG). */ nfsv4_fillattr(nd, NULL, vp, aclp, NULL, NULL, 0, &attrbits, NULL, - NULL, 0, 0, 0, 0, 0, NULL); + NULL, 0, 0, 0, 0, 0, NULL, false); error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred, NFS_PROG, NFS_VER4, NULL, 1, NULL, NULL); if (error != 0) { diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 846d4037ef27..88ae643d193e 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -240,7 +240,7 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, { struct nfsvattr nva; fhandle_t fh; - int at_root = 0, error = 0, supports_nfsv4acls; + int at_root = 0, error = 0, ret, supports_nfsv4acls; struct nfsreferral *refp; nfsattrbit_t attrbits, tmpbits; struct mount *mp; @@ -249,6 +249,8 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, uint64_t mounted_on_fileno = 0; accmode_t accmode; struct thread *p = curthread; + size_t atsiz; + bool xattrsupp; if (nd->nd_repstat) goto out; @@ -306,6 +308,15 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, &nva, &attrbits, p); if (nd->nd_repstat == 0) { supports_nfsv4acls = nfs_supportsnfsv4acls(vp); + xattrsupp = false; + if (NFSISSET_ATTRBIT(&attrbits, + NFSATTRBIT_XATTRSUPPORT)) { + ret = VOP_GETEXTATTR(vp, + EXTATTR_NAMESPACE_USER, + "xxx", NULL, &atsiz, nd->nd_cred, + p); + xattrsupp = ret != EOPNOTSUPP; + } mp = vp->v_mount; if (nfsrv_enable_crossmntpt != 0 && vp->v_type == VDIR && @@ -339,7 +350,8 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, (void)nfsvno_fillattr(nd, mp, vp, &nva, &fh, 0, &attrbits, nd->nd_cred, p, isdgram, 1, supports_nfsv4acls, - at_root, mounted_on_fileno); + at_root, mounted_on_fileno, + xattrsupp); vfs_unbusy(mp); } vrele(vp); From nobody Sat Aug 23 21:23:42 2025 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 4c8VRL4DlYz66Rsl; Sat, 23 Aug 2025 21:23:42 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8VRL3P2rz3v4F; Sat, 23 Aug 2025 21:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984222; 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=NCrP+QF7HOuWhHB1T5Tls+8Y/rMR6bixK5HI3C+BZIc=; b=Gqj66vQHu5k4zbwyzKgs71jcIWCCMOVvlz4gLB/1if0nZdNqXKqw3+V+RPM0U55Lm7nE+Y +c4ev5Rqti0Viyc4xlwgyEA8ZNVxYwAo+sqpHBAKQE8NLM/EVlcTDisI1vtEYj5VTp++IV 1pi8k7Y5LoQTDNRIe0MHqsNzla2lHdMKDLqCOMOapny2RxXTA0/EI7H4FhqWo1HpXNh2Fr TnFvceU95osJf+QryMrhFwNnQZv0Dsa/fiZ+js2lRiAzMk4oLkhwgrKNdiV0Dwdk0gEdY2 LVKH35lVx5NtenEuyCIbNso6BchSxoY6mwhuvUOZm6JE1BCNUBAaZdkCjx67bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984222; 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=NCrP+QF7HOuWhHB1T5Tls+8Y/rMR6bixK5HI3C+BZIc=; b=dUnl/JLQXDDlwJFRXPU6N3K7PtRsUcrm+VAYL4EqzxzJ+Dhm6mmUgd7fH+hZgzuAAhRRFn fxdxRk8tIjGEFUangs5eE7SAOLsG8x0KK+Fg+wk5rkJTrMVslbjSCW+hpMFVC3T80KhSzL xo1l0FCnm8S2BD6qoV7ND5mzu1tEWtY1kC5ume5OD6ZVKeJco0NIyuBdqdxDGnHSPgXxYs AwUeXWMpR53+Ypu0NawZC7t7vF/Kb+tXKBvDqJMBi5ZylsSlfcM0nanlIsKm0ES7VD6KxE Xs3JT75alwL+6PSoDbALx9wbhb6VmMJyJOFQ12L5/dbpidwpOUAyBZ5p3GdPAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755984222; a=rsa-sha256; cv=none; b=q4yxpdaygFAKTPPkRG95XOdulAK1kFH9IK5c4dEBQ5pOHDXhfRd6n3WeYgG6GGOXA8SbBO B/bbn0chaDll2wsjdkKn1QOsyV3rJ/82hhaMwRcO5cm5vP1Ze5VT3ZRNx3z3sslumjnIKt 3Sa0Y49zuNp2X26x/6Al4R432t3eyeeIkTAZNdHN4/6hHqiqMbJgF6rKKAdWa8I/+Yxpvn 8AfAI61gaFSJqWMAHFhUgx1HeZeYk/LjL76tL10qfupTFPtJ/+saUhsWYB1eBmbJYmeOwj Uy7WUrTBV3Ef4TiGK4CWh/zs8nZjKLRO/yWmQGd2FT4TrRRdjSSQz44uCONf7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8VRL2wjRzZSP; Sat, 23 Aug 2025 21:23:42 +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 57NLNgfi097854; Sat, 23 Aug 2025 21:23:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NLNg3h097851; Sat, 23 Aug 2025 21:23:42 GMT (envelope-from git) Date: Sat, 23 Aug 2025 21:23:42 GMT Message-Id: <202508232123.57NLNg3h097851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 248daca0b3c3 - stable/14 - nfscl: Fix GetACL so that it does not want a reply cached 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 248daca0b3c3bd411a4629047e21cc03532890c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=248daca0b3c3bd411a4629047e21cc03532890c0 commit 248daca0b3c3bd411a4629047e21cc03532890c0 Author: Rick Macklem AuthorDate: 2025-08-04 23:36:28 +0000 Commit: Rick Macklem CommitDate: 2025-08-23 21:21:02 +0000 nfscl: Fix GetACL so that it does not want a reply cached Without this patch, an NFSv4.1/4.2 GetACL RPC requests that the session cache the reply. In some cases, the reply may be too large to cache, resulting in a NFS4ERR_X error from the server. Since a GetACL is idempotent, disable reply caching for it, by setting that it can generate a large reply. Tested against a Linux server with a large ACL on a file. (cherry picked from commit 51affb7e97161e260f6d99cb0904daf7cc9f51a7) --- sys/fs/nfs/nfs_commonsubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 560720911e84..bde9be0885e0 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -218,7 +218,7 @@ NFSD_VNET_DEFINE_STATIC(u_char *, nfsrv_dnsname) = NULL; */ static int nfs_bigreply[NFSV42_NPROCS] = { 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0 }; /* local functions */ From nobody Sat Aug 23 21:25:20 2025 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 4c8VTD6wkcz66S6H; Sat, 23 Aug 2025 21:25:20 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8VTD5X8sz3vdp; Sat, 23 Aug 2025 21:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984320; 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=Wv/RkPRRIQnVSPQmsQmQubuGdmLgcsfogTvA0XqbKV8=; b=OaRWrgRdvIONj0d8miUj4Io/DFi8TcBakN0oVtPYFvnj50Ix4MveyLLRr/5JrGku8vt5HC /+Ss0ockJRkztaNPGKMiM+br9KfX/SDVNspoHEGcubhJjhqK9gkEMGnYPpiUAXmeLrkvF8 anEhRzgwP0/dzr6iCbDU7uovWGciJHaY2bXT46mph37VtxGSEesn1lJJ4fLNC3wpbhaSrz g9RUor2Y8oYZDK/N41OSnFxW916wzhJnGImk/ZZAkX5OI9IkGVj69BirDNSvATfZEddoil gso9Japo6JWHhJfsvbQYw2dMHkSqrPAGIdRDKAC3WgbG3J82CxN+K9KINSHCOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984320; 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=Wv/RkPRRIQnVSPQmsQmQubuGdmLgcsfogTvA0XqbKV8=; b=PuvAALyqqFshBEDbC5wzfXmrTAxGK68wJ0WwZgPrIp/jozm0o694W8C4fiPt+Bkf5ntujE 8N7RDRQJ2pM8uFL2ArmurVz3zjy6HKjTzOeG0nbifSXp8vtjmi25kn1+hL6AkwtRfQgxxT odICpGSOZ/r65uP67eWRnN7jMPD8/nUe7XARtWvqzFODDwMciFI8KZ3DOOIiMHvw5ApyC/ 0UrP5smn+Y7i3ZYyghQ6e4ngG+OF6y1hJjVm+5jyDxbQu3fm7kh4CIQNYpJ4QGJhZWNUJt 12CuNg4toF/Gh4niBDiGdEzXBX+UGJ7aEaOMCOk5Huofism67uAYTM2Pn/HkUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755984320; a=rsa-sha256; cv=none; b=p5r6RJauqMQCEsodjuHRAT7Hs7kytQ93ts0VJEcaA8//5ACnCbgszd7m0ryHbfBjQwBQZR HgkdeIuuAEr3xTYl+IUHzpa2JMjStc0zvUFgUTz+N/fLKgmipSeavoQRzzwe/KAtU0NfNF dIvylPBkfVx4dycSwk6v5a3640zgzS/oeh2y3uz0eKd2Jjl46ziUjk1hC6mSAL1alCmQt7 LSm5bKKLMW9yjKfj67Vv/YfUFKrhD9BX/mQwqLpMTMaPOUBck7JPEBTxdnKJ9tFcMMe2js kSJx5bxU7CToRrgmmSC5I5m15AMqLRRB7s5RnaQqHhRxwxaBPa+//qqgvUv9/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8VTD51SMzZQ2; Sat, 23 Aug 2025 21:25:20 +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 57NLPKT3098589; Sat, 23 Aug 2025 21:25:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NLPK5i098586; Sat, 23 Aug 2025 21:25:20 GMT (envelope-from git) Date: Sat, 23 Aug 2025 21:25:20 GMT Message-Id: <202508232125.57NLPK5i098586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 2fd0083fcc23 - stable/14 - vfs_syscalls.c: Fix handling of offset args for copy_file_range 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2fd0083fcc23f4c25860b8890292448720a5961c Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2fd0083fcc23f4c25860b8890292448720a5961c commit 2fd0083fcc23f4c25860b8890292448720a5961c Author: Rick Macklem AuthorDate: 2025-08-09 21:15:07 +0000 Commit: Rick Macklem CommitDate: 2025-08-23 21:22:14 +0000 vfs_syscalls.c: Fix handling of offset args for copy_file_range Commit 197997a broke handling of the offset arguments to copy_file_range() when specified non-NULL. The code fails to update the offsets and, as such, a loop like: do { len = copy_file_range(infd, &inpos, outfd, &outpos, SSIZE_MAX, 0); } while (len > 0); becomes an infinite loop, just doing the same copy over and over again. This patch fixes it. The clause "(foffsets_locked || foffsets_set)" in the if is not actually needed for correctness, but I thought it made the code a little more readable and might avoid some static analyzer from throwing a "used before being set" for the savinoff and savoutoff variables. (cherry picked from commit 4046ad6bb0ee542a42d89a48a7d6a56564ed7f33) --- sys/kern/vfs_syscalls.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 37dc48c6a297..ded3a87e7f8b 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -4918,11 +4918,12 @@ kern_copy_file_range(struct thread *td, int infd, off_t *inoffp, int outfd, size_t retlen; void *rl_rcookie, *rl_wcookie; off_t inoff, outoff, savinoff, savoutoff; - bool foffsets_locked; + bool foffsets_locked, foffsets_set; infp = outfp = NULL; rl_rcookie = rl_wcookie = NULL; foffsets_locked = false; + foffsets_set = false; error = 0; retlen = 0; @@ -4990,6 +4991,8 @@ kern_copy_file_range(struct thread *td, int infd, off_t *inoffp, int outfd, } foffset_lock_pair(infp1, &inoff, outfp1, &outoff, 0); foffsets_locked = true; + } else { + foffsets_set = true; } savinoff = inoff; savoutoff = outoff; @@ -5045,11 +5048,12 @@ out: vn_rangelock_unlock(invp, rl_rcookie); if (rl_wcookie != NULL) vn_rangelock_unlock(outvp, rl_wcookie); + if ((foffsets_locked || foffsets_set) && + (error == EINTR || error == ERESTART)) { + inoff = savinoff; + outoff = savoutoff; + } if (foffsets_locked) { - if (error == EINTR || error == ERESTART) { - inoff = savinoff; - outoff = savoutoff; - } if (inoffp == NULL) foffset_unlock(infp, inoff, 0); else @@ -5058,6 +5062,9 @@ out: foffset_unlock(outfp, outoff, 0); else *outoffp = outoff; + } else if (foffsets_set) { + *inoffp = inoff; + *outoffp = outoff; } if (outfp != NULL) fdrop(outfp, td); From nobody Sat Aug 23 21:33:49 2025 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 4c8Vg15HdSz66STb; Sat, 23 Aug 2025 21:33:49 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8Vg14J0Tz3wTb; Sat, 23 Aug 2025 21:33:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984829; 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=cSk3dwSA+7yc/3HNEVwmM8bUp119fELNxZq9zmBhMlk=; b=sOQr4NI6mpOw2RIUEdBEB6eS3ZpvxNpB+Dtx4yleYhYYleI3jiSuuXSG0+esHMwWi2KXVO k3ATR8H1L1GqCL/LjrqzynGE2xYVHtiOilP22Kq/OzpIXlwsf3fkyhznJ6ifzCrznqZ4x6 3IN7WlhM36eHWJgTsmhQpjNY0ICplvXEDTrp6hARNh4uyRXTD/9RtO6ib9Jc/r88z2bFx6 bwDV5cDlcCE7aWBaV0syjxXTo5X4R4nukqTzbY1Vb83fJwCJ1Cc1PZ3DgQ4UsrrW0Km1L2 X5rrNCyUeGfbmN/S5hZlu/etp4/qZzVGwmMo0JqTTksYXYWyhPPZaYwISP2nBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984829; 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=cSk3dwSA+7yc/3HNEVwmM8bUp119fELNxZq9zmBhMlk=; b=svjTFeck+e3qIqBflfF2gHW+fGXYTCDyBMA/uUSMdcEhbcJuot//XXpTEFi+61mx5Me1FP tjPL0eEmQmM7BzXt4nR85mWHLVb0KAPJUCqMw5XMZhf9AQHMkEqWb7+n+GezD/XKFa9bmE HBOyQcslAMAsfmr5wGDnjaL9FaNFVNrjcJKv4M3rkhTFaT/f+DkJml6PQcKo09EF09P+e0 1dtpKTcd8yz2vI8RoX8BkcMKhH36gTNq0IytHfux3PyYKZLKIAR/HuQFyPOkbNedrgZkCU 72F4OFPy0LcgH7HPRhwuvFP+lQGFJXyTdEw2zcBVgnw/amReMY9otk8jeezKqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755984829; a=rsa-sha256; cv=none; b=DtABVxpYWzbUt2f4m19eL9mAhKlbiddraWkO9W2wE/9l6ICJkC6cnKo1vT1IJNtdNIwVn9 PD09A1ZhgCXr6n6rd1DX+d2f1iKzJaAYDOCX994t9l4WuY6azRvRlUgn3/+QFBaJniV6TC sYsMTQTkeandEDnXEUUXhVG9Hk6yfXNfTXAfRhBiuDPBTrwap/JCRdK6xMnhCXbhi7Etir zqP4DlEFXUi8en+bxJInYQTdggJzNokwu6VPwxTW1JFqXnpNROhoMOZRhG2jIJfH/BJZM1 TKqsVIWLRpOsm1u9VKp+JwF0ZDt9BVgNMAI5HzI1DSShjeRkUmy5i7Tj+lBcyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8Vg13q6xzZB2; Sat, 23 Aug 2025 21:33:49 +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 57NLXn3Q017352; Sat, 23 Aug 2025 21:33:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NLXnIE017349; Sat, 23 Aug 2025 21:33:49 GMT (envelope-from git) Date: Sat, 23 Aug 2025 21:33:49 GMT Message-Id: <202508232133.57NLXnIE017349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 4f22d274ab0d - stable/14 - param.h: Bump __FreeBSD_version for 3f61ececacd8 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f22d274ab0d1da23c000e4f7f2ea003c5fa94a7 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4f22d274ab0d1da23c000e4f7f2ea003c5fa94a7 commit 4f22d274ab0d1da23c000e4f7f2ea003c5fa94a7 Author: Rick Macklem AuthorDate: 2025-08-23 21:30:10 +0000 Commit: Rick Macklem CommitDate: 2025-08-23 21:30:10 +0000 param.h: Bump __FreeBSD_version for 3f61ececacd8 Bump __FreeBSD_version to 1403505 for 3f61ececacd8 since this commit changes the internal KAPI between the NFS modules. --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 3c3f4093ee1f..d3863d670431 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -76,7 +76,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1403504 +#define __FreeBSD_version 1403505 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sat Aug 23 21:36:04 2025 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 4c8Vjd0lg8z66S6D; Sat, 23 Aug 2025 21:36:05 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8Vjc6tQpz3wp1; Sat, 23 Aug 2025 21:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984965; 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=3q6dZPynpuBZ5eCNF5f8Biy6zKoGnPI8ztg/jnNOFm8=; b=HqnpGFoAqrzJPtduNeZNM9c9faSoav+aRHoaiyYULWHtpibmXppLaUKaXdTiCUzvjZ0VXZ 5dtKASA9axd92U/WaGYW+61YLI6wOHvBdm0McrRUT1kpPZKFNleluAfZCtnF8VA44WJKhE Qn7ZIVSNmiucnO75REu8YQEl312RTdphmTnPYO1y/H7M09P/nFASSBgZQyAZ43v2zPcEIO Tjj8Q4QdApwDZ9rjJkpHmXJzUfh0BF0JHpUqw6U8+FNDn0wZjhBgxYo8cCYye/lbLELg9y RF58rXagqxGHNedlgarCKN0c81/KpQj2X5sI4b1nhk+ulhks70FmQ8MpDPbbSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984965; 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=3q6dZPynpuBZ5eCNF5f8Biy6zKoGnPI8ztg/jnNOFm8=; b=SVTfcfaFk3WgM+IIDkWkbxpCFAL+lL9Q12iVFs9otP5tYT8kpdjd6J9Qiv7/G3nrCs1QQy v96d1TLD5VIYBSqPJJ+YBSn2wMLOhdjGrl6bRRJZsHCaCEJUb/cU7NNeJCFhBuOJDk0Emk SpSo9gdtLyGkvyFWGV3a1Blig/50HgChubns9nqp0qq7byp0NZgxcKNiqCBs9A5tNDyQMM TkVAkbTBBDINwrOaorilJW0gVtIUTnpuRiiBxI6FmTxzlGwR/oWd8gmISfpa3f5xIFXZTg W3dYeHW3FeCpGBOcHQS85P7yM0nVI2Yd8L1WyX7wi9vLr+7iwH6jHYFPS0BG0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755984965; a=rsa-sha256; cv=none; b=eXBrzgj/cE4ryJ02o3JF9Cr8+XYsSdJF5a0+p+hrUO7Y5FvJmmGTTVHjA89WcQCrft7UU/ cwzm2dSlU2CpwIvuMjq5xsOMhh1i8GJ3dI5tB0yqxssVyVqw1ueu2flzClGwZzVcjXz3cX 70dm+lpdvDfUtahkOKdzblF1C3JWc1j1y9WhWEvL4x1NesIOwkNP6xnmanOiUssLbrH64u 6zspy4PXbSrskuRWBsYJNxc0PQ2EMnECPltCIcTYrjeI0EsqG2Gh7mVbqcUqg0SDd1uAC/ +Zowb3ln+/wIeTDe3TwvqYURgXHXxLUDr/pSH1LJ/IBsNtRcockzFhHb52PYAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8Vjc6RVkzZB3; Sat, 23 Aug 2025 21:36:04 +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 57NLa49E018152; Sat, 23 Aug 2025 21:36:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NLa4S0018149; Sat, 23 Aug 2025 21:36:04 GMT (envelope-from git) Date: Sat, 23 Aug 2025 21:36:04 GMT Message-Id: <202508232136.57NLa4S0018149@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: ea35c5b54fcc - stable/14 - UPDATING: Add an entry for commit 3f61ececacd8 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ea35c5b54fccf7a3f71857a251e610a5090ad154 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=ea35c5b54fccf7a3f71857a251e610a5090ad154 commit ea35c5b54fccf7a3f71857a251e610a5090ad154 Author: Rick Macklem AuthorDate: 2025-08-23 21:33:26 +0000 Commit: Rick Macklem CommitDate: 2025-08-23 21:33:26 +0000 UPDATING: Add an entry for commit 3f61ececacd8 --- UPDATING | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/UPDATING b/UPDATING index 858b24aad471..965ecac80055 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20250823: + Commit 3f61ececacd8 changed the internal KAPI between + the NFS modules. As such, they all need to be rebuilt + from sources. + 20250822: A build system bug which caused some files to be installed in the wrong package has been fixed. As a result some files have moved to different From nobody Sun Aug 24 00:27:20 2025 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 4c8ZWD3jX7z64hpZ; Sun, 24 Aug 2025 00:27:20 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8ZWD32TKz3CGM; Sun, 24 Aug 2025 00:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755995240; 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=Xramz2JLZDlw4DbhA5af/cxpraWi0aeQOJxh64MTbv8=; b=rlNqCPIv9cpQWFQosf8XoUGoZQGQqW4a0A18XFFRdN1lFBjTCB8lvQx3nX+bCRcWwKj8tJ VnwX/Zgc7wEHnz5VxteaLEQWaStSkEJkpwJ3NNEWD9Iuv+agtfWH6XnkN/gjSXaD4NdSgp MPRKBR8HDnYCXdYJ8I5DFdFm3sglVDLo+YbG/iNoZ1lbQemgWr8g3JyIy8nbnd3XPIdE7y KwGVcfDZBijhb/EwMv+pLOD/FjuRreb/mc6c7n3QqZ7spIuDduWJknS7E/msvEO4F65Qcy hsSORgF/FaceuVfJa1pM5Y0FkHYODQOFJerd0D98xjzv5Lsly7mY51Rjr3+izg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755995240; 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=Xramz2JLZDlw4DbhA5af/cxpraWi0aeQOJxh64MTbv8=; b=FMyICyEOE3/4tMQ9V17osS12XvPe9TRMyuqT6JH80oyP9Uzl9804D3Fxs6MNcUS5YX87TW d6W0yr4KsVwwcwXAxXzGJgMu9bbVCETRyo97aDAWwaPCa8o11JF3xp/4DjPTIEbU+I/0kw 8ax/7YMzRiaOA2G4oxbmDfpWJBcsoMVKzAEc9HROVRTLnwLuIj4/m1jXBofEWGMQosEu1k GBO7LWEa/qL/wbH9iwFZlN97Rqey1pi2s3UmoqlTyLoTN+GMQaXdID79NW0TeSity2tTq9 KlNzvBJjlB/mjtFxwLQLiK3Z7LH0RkdTbHmPbOsQyYGSua0xvZ+e80qcH3ga8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755995240; a=rsa-sha256; cv=none; b=cTJcVyf6qMYoRdhq0OUJy+r7EjxfOl+1Myhce6FTKkcpP2bILJcgtGFvbnOzx6bjA+4GoK D9OnIfobrm4DGgKDT8mkptk7qqU4Nv1+M2qYADskuKBDGxOZGjmIRPwQJA+Qjmpd+hTADq wOhQtllOL0nPuJINSIi87bF4RZ/IeO2LqRVQdYjFyZHffmFFUNOpu+2W7viE+cpWTBjEYq N/WtdsaqZBxP9VqnTupVQR5dKiI6c/qCp7I28J/bo8scN/edIvEtsFP78f2963Bfv174dF g0b/hYFUz0rQos/+oKy2NpfwEzqBJcSfhGoavP5kEYEtWbM+HzKUIBhRcSgRTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8ZWD29DNzg1P; Sun, 24 Aug 2025 00:27:20 +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 57O0RKLk038172; Sun, 24 Aug 2025 00:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57O0RKv4038169; Sun, 24 Aug 2025 00:27:20 GMT (envelope-from git) Date: Sun, 24 Aug 2025 00:27:20 GMT Message-Id: <202508240027.57O0RKv4038169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0c3d511959ba - stable/14 - ufs: st_rdev is only meaningful for special nodes 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0c3d511959bac1661cb3891042e380bc480d8266 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0c3d511959bac1661cb3891042e380bc480d8266 commit 0c3d511959bac1661cb3891042e380bc480d8266 Author: Konstantin Belousov AuthorDate: 2025-08-17 13:03:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-24 00:26:56 +0000 ufs: st_rdev is only meaningful for special nodes (cherry picked from commit 6fd60c4887cb08203f654e6aac6b4dbaaf76111b) --- sys/ufs/ufs/ufs_vnops.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 4aed4f7db42c..d9e9397631f4 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -542,7 +542,8 @@ ufs_stat(struct vop_stat_args *ap) sb->st_uid = ip->i_uid; sb->st_gid = ip->i_gid; if (I_IS_UFS1(ip)) { - sb->st_rdev = ip->i_din1->di_rdev; + sb->st_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din1->di_rdev : NODEV; sb->st_size = ip->i_din1->di_size; sb->st_mtim.tv_sec = ip->i_din1->di_mtime; sb->st_mtim.tv_nsec = ip->i_din1->di_mtimensec; @@ -553,7 +554,8 @@ ufs_stat(struct vop_stat_args *ap) sb->st_blocks = dbtob((uint64_t)ip->i_din1->di_blocks) / S_BLKSIZE; sb->st_filerev = ip->i_din1->di_modrev; } else { - sb->st_rdev = ip->i_din2->di_rdev; + sb->st_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din2->di_rdev : NODEV; sb->st_size = ip->i_din2->di_size; sb->st_mtim.tv_sec = ip->i_din2->di_mtime; sb->st_mtim.tv_nsec = ip->i_din2->di_mtimensec; @@ -605,7 +607,8 @@ ufs_getattr( vap->va_uid = ip->i_uid; vap->va_gid = ip->i_gid; if (I_IS_UFS1(ip)) { - vap->va_rdev = ip->i_din1->di_rdev; + vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din1->di_rdev : NODEV; vap->va_size = ip->i_din1->di_size; vap->va_mtime.tv_sec = ip->i_din1->di_mtime; vap->va_mtime.tv_nsec = ip->i_din1->di_mtimensec; @@ -614,7 +617,8 @@ ufs_getattr( vap->va_bytes = dbtob((uint64_t)ip->i_din1->di_blocks); vap->va_filerev = ip->i_din1->di_modrev; } else { - vap->va_rdev = ip->i_din2->di_rdev; + vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din2->di_rdev : NODEV; vap->va_size = ip->i_din2->di_size; vap->va_mtime.tv_sec = ip->i_din2->di_mtime; vap->va_mtime.tv_nsec = ip->i_din2->di_mtimensec; From nobody Sun Aug 24 03:37:34 2025 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 4c8fkn4snqz64yTV; Sun, 24 Aug 2025 03:37:37 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8fkn1YDCz3X2H; Sun, 24 Aug 2025 03:37:37 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id pynLuNXgM5Mqyq1Y0uFtUw; Sun, 24 Aug 2025 03:37:36 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id q1XyuCaCrJhBPq1XzucZlD; Sun, 24 Aug 2025 03:37:36 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=QY3Fvdbv c=1 sm=1 tr=0 ts=68aa8900 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=2OwXVqhp2XgA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=T_YFPyFoAAAA:8 a=CjxXgO3LAAAA:8 a=YxBL1-UpAAAA:8 a=LQb5wrXf6FiGhbvXbx0A:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=fKaBkT6cBtmegwcwHIDe:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 6804088D; Sat, 23 Aug 2025 20:37:34 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (Postfix) with ESMTP id 53E1943D; Sat, 23 Aug 2025 20:37:34 -0700 (PDT) Date: Sat, 23 Aug 2025 20:37:34 -0700 From: Cy Schubert To: ShengYi Hung Cc: Gordon Bergling , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1685192ea1fa - main - hkbd: remove erorr detection in KDSKBSTATE ioctl Message-ID: <20250823203726.55c5a5ec@slippy.cwsent.com> In-Reply-To: References: <202508230450.57N4oxwG023161@gitrepo.freebsd.org> <20250823171011.BCFFF189@slippy.cwsent.com> Organization: KOMQUATS X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) 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-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfPrBzmEbe6lEzDyZ6Q0T9cv4UkqZKDtKJTKjGY3otgBLkjnCzHzL/fZKJxwI2wDlhklzT46UPJJeHicKnxlDPmAXh6tgwoklZvKbejw4Z3Mb9omYkyj4 G0InxMoNgr1Av7kWmVxnFoCPW7jYEXpU+aGV4eZYlfc3JJt2oW/E8E5btYplyYMPM+JKm71jZFAEYSjqoxf0wuN/QMsp+fb1q9PY2+YEH9dKUgf72NNLOT4g D3BMCUdez00O2v5gwdxahAKPwjQR5aBnRqAummNjeJ0Z+iEHFlxYl57NXD64qenqIzpR0yIdeEEeHXOr9gApkEHBTGs9Vpk+2U5BrgF73esj1axpENRGd7jy 3le8/cCe X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c8fkn1YDCz3X2H On Sat, 23 Aug 2025 13:27:23 -0400 ShengYi Hung wrote: > Hello: > > I only submit two patches. What is the third patch you have mentioned? > Is the one setting "sysctl usbhid=1"? > > On 8/23/25 13:10, Cy Schubert wrote: > > In message , ShengYi Hung writes: > >> Hello, thanks for the reminder. I compile the standalone module to test so > >> didn't discover that. Fix it right now. > >> Gordon Bergling writes: > >> > >> > >>> Hi ShengYi, > >>> > >>> On Sat, Aug 23, 2025 at 04:50:59AM +0000, ShengYi Hung wrote: > >>>> The branch main has been updated by aokblast: > >>>> > >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=1685192ea1faac28f2d4feede53e7 > >> 0b6a380500f > >>>> commit 1685192ea1faac28f2d4feede53e70b6a380500f > >>>> Author: ShengYi Hung > >>>> AuthorDate: 2025-08-21 17:59:15 +0000 > >>>> Commit: ShengYi Hung > >>>> CommitDate: 2025-08-23 04:50:09 +0000 > >>>> > >>>> hkbd: remove erorr detection in KDSKBSTATE ioctl > >>>> > >>>> The KDSKBSTATE ioctl brings the LED up. However, some keyboards (like > >> qemu > >>>> keyboard) may not have LED or failed to set the LED due to unexpected > >> reason. > >>>> Therefore, removing the error check as ukbd(4) does allow the keyboard > >> works > >>>> correctly with kbdcontrol(4). > >>>> > >>>> Also move hw.hid.hkbd.no_leds sysctl out of HID_BUG thus users can > >>>> disable setting LEDs > >>>> > >>>> PR: 288968 > >>>> Reviewed by: wulf > >>>> Tested by: trashcan@ellael.org, marklmi26-fbsd@yahoo.com, trkelle > >> rs@gmail.coom > >>>> Approved by: lwsu (mentor), markj (mentor) > >>>> MFC after 1 week > >>>> Sponsored by: The FreeBSD Foundation > >>>> Differential Revision: https://reviews.freebsd.org/D52101 > >>>> > >>>> mvalsmva > >>>> --- > >>> I am not sure how this is related, but since that commit, buildkernel of GE > >> NERIC is broken both > >>> on amd64 and aarch64. The following error is from an amd64 build, aarch64 i > >> s the same. > >>> ----------------------------- > >>> /storage/freebsd/src/current/sys/dev/hid/hkbd.c:1831:10: error: called ob > >> ject type 'char[5]' is not a function or function pointer > >>> 1831 | DPRINTF(("error %d", error)); > >>> | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~ > >>> /storage/freebsd/src/current/sys/dev/hid/hid.h:212:34: note: expanded fro > >> m macro 'DPRINTF' > >>> 212 | #define DPRINTF(...) DPRINTFN(1, __VA_ARGS__) > >>> | ~~~~~~~~~~~~^~~~~~~~~~~~ > >>> /storage/freebsd/src/current/sys/dev/hid/hid.h:208:17: note: expanded fro > >> m macro 'DPRINTFN' > >>> 208 | printf("%s: " fmt, \ > >>> | ~~~~~~ ^ > >>> 1 error generated. > >>> --- hkbd.o --- > >>> *** [hkbd.o] Error code 1 > >>> ----------------------------- > >>> > >>> --Gordon > >> -- > >> Best Regards. > >> ShengYi Hung. > >> > > My machines running X (laptops), > > > > - the right mouse key no longer works under X, I can no longer use X, > > - the caps-lock light will not display under X > > - on the text console works, X does not. > > > > The three commits related have bee reverted locally, functionality has > > returned. > > > > > Best Regards. > > ShengYi Hung. > The hashes are, 1685192ea1fa 8a847947153e 6ea7e1f92882 I don't think 8a847947153e is related. 6ea7e1f92882 must be reverted in order to revert 1685192ea1fa. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Sun Aug 24 03:51:31 2025 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 4c8g2t21XKz65DtN; Sun, 24 Aug 2025 03:51:34 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8g2s4mDqz3ZJR; Sun, 24 Aug 2025 03:51:33 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=permerror reason="p tag has invalid value: quarantine rua=mailto:p[ostmaster@cschubert.com" header.from=cschubert.com (policy=permerror); spf=pass (mx1.freebsd.org: domain of cy.schubert@cschubert.com designates 3.97.99.33 as permitted sender) smtp.mailfrom=cy.schubert@cschubert.com Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTPS id pwBXuNROU5Mqyq1lVuFxaE; Sun, 24 Aug 2025 03:51:33 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id q1lTuAO5rWbOaq1lUuGg6N; Sun, 24 Aug 2025 03:51:33 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=Q5lx4J2a c=1 sm=1 tr=0 ts=68aa8c45 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=2OwXVqhp2XgA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=T_YFPyFoAAAA:8 a=CjxXgO3LAAAA:8 a=WWVxPgZ06bBHUdOfH7oA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=fKaBkT6cBtmegwcwHIDe:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 3C7F6843; Sat, 23 Aug 2025 20:51:31 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (Postfix) with ESMTP id 269AB380; Sat, 23 Aug 2025 20:51:31 -0700 (PDT) Date: Sat, 23 Aug 2025 20:51:31 -0700 From: Cy Schubert To: ShengYi Hung Cc: Gordon Bergling , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1685192ea1fa - main - hkbd: remove erorr detection in KDSKBSTATE ioctl Message-ID: <20250823205131.6c44846c@slippy.cwsent.com> In-Reply-To: <20250823203726.55c5a5ec@slippy.cwsent.com> References: <202508230450.57N4oxwG023161@gitrepo.freebsd.org> <20250823171011.BCFFF189@slippy.cwsent.com> <20250823203726.55c5a5ec@slippy.cwsent.com> Organization: KOMQUATS X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) 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-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfFTVXL4huLq8MXa4yCmYXMWaQQyCoXCQmzb3rrHyZ3ttkKXOBgWBiTXKWHqskrSrDBbVpIdvqRUjzULbZWCw+qQXnFONe/d0xPmQBFrQQ9t1Et24uUB5 THJ+tC3NXEf8eTSFFbPj8ZJo6KQM0EezpW3ji4wMe0g9WXRyGLsvzmY+SZfawa74W720T3GpSSOdn6IqvQWZkOjzsUacsRq0UX610BjyIsYN6zoyQR4HRAGC GoPoxqU7XcO6IUDlX8r3t1N8Nt9XhGrE0kzx+BLnQoYl6fyDlVpcEcQ7Dorh70DqO2aT3xg4h70I6YcuMGZ7n+byK4yWWlkOj+t6MUH8wO84xtq0LnLFTT2e 93DlMGZn X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.72 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_SHORT(-0.92)[-0.917]; RWL_MAILSPIKE_EXCELLENT(-0.40)[3.97.99.33:from]; R_SPF_ALLOW(-0.20)[+ip4:3.97.99.32/31]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[3.97.99.33:from]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; HAS_ORG_HEADER(0.00)[]; DMARC_BAD_POLICY(0.00)[cschubert.com : p tag has invalid value: quarantine rua=mailto:p[ostmaster@cschubert.com]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; R_DKIM_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4c8g2s4mDqz3ZJR On Sat, 23 Aug 2025 20:37:34 -0700 Cy Schubert wrote: > On Sat, 23 Aug 2025 13:27:23 -0400 > ShengYi Hung wrote: > > > Hello: > > > > I only submit two patches. What is the third patch you have mentioned? > > Is the one setting "sysctl usbhid=1"? > > > > On 8/23/25 13:10, Cy Schubert wrote: > > > In message , ShengYi Hung writes: > > >> Hello, thanks for the reminder. I compile the standalone module to test so > > >> didn't discover that. Fix it right now. > > >> Gordon Bergling writes: > > >> > > >> > > >>> Hi ShengYi, > > >>> > > >>> On Sat, Aug 23, 2025 at 04:50:59AM +0000, ShengYi Hung wrote: > > >>>> The branch main has been updated by aokblast: > > >>>> > > >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=1685192ea1faac28f2d4feede53e7 > > >> 0b6a380500f > > >>>> commit 1685192ea1faac28f2d4feede53e70b6a380500f > > >>>> Author: ShengYi Hung > > >>>> AuthorDate: 2025-08-21 17:59:15 +0000 > > >>>> Commit: ShengYi Hung > > >>>> CommitDate: 2025-08-23 04:50:09 +0000 > > >>>> > > >>>> hkbd: remove erorr detection in KDSKBSTATE ioctl > > >>>> > > >>>> The KDSKBSTATE ioctl brings the LED up. However, some keyboards (like > > >> qemu > > >>>> keyboard) may not have LED or failed to set the LED due to unexpected > > >> reason. > > >>>> Therefore, removing the error check as ukbd(4) does allow the keyboard > > >> works > > >>>> correctly with kbdcontrol(4). > > >>>> > > >>>> Also move hw.hid.hkbd.no_leds sysctl out of HID_BUG thus users can > > >>>> disable setting LEDs > > >>>> > > >>>> PR: 288968 > > >>>> Reviewed by: wulf > > >>>> Tested by: trashcan@ellael.org, marklmi26-fbsd@yahoo.com, trkelle > > >> rs@gmail.coom > > >>>> Approved by: lwsu (mentor), markj (mentor) > > >>>> MFC after 1 week > > >>>> Sponsored by: The FreeBSD Foundation > > >>>> Differential Revision: https://reviews.freebsd.org/D52101 > > >>>> > > >>>> mvalsmva > > >>>> --- > > >>> I am not sure how this is related, but since that commit, buildkernel of GE > > >> NERIC is broken both > > >>> on amd64 and aarch64. The following error is from an amd64 build, aarch64 i > > >> s the same. > > >>> ----------------------------- > > >>> /storage/freebsd/src/current/sys/dev/hid/hkbd.c:1831:10: error: called ob > > >> ject type 'char[5]' is not a function or function pointer > > >>> 1831 | DPRINTF(("error %d", error)); > > >>> | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~ > > >>> /storage/freebsd/src/current/sys/dev/hid/hid.h:212:34: note: expanded fro > > >> m macro 'DPRINTF' > > >>> 212 | #define DPRINTF(...) DPRINTFN(1, __VA_ARGS__) > > >>> | ~~~~~~~~~~~~^~~~~~~~~~~~ > > >>> /storage/freebsd/src/current/sys/dev/hid/hid.h:208:17: note: expanded fro > > >> m macro 'DPRINTFN' > > >>> 208 | printf("%s: " fmt, \ > > >>> | ~~~~~~ ^ > > >>> 1 error generated. > > >>> --- hkbd.o --- > > >>> *** [hkbd.o] Error code 1 > > >>> ----------------------------- > > >>> > > >>> --Gordon > > >> -- > > >> Best Regards. > > >> ShengYi Hung. > > >> > > > My machines running X (laptops), > > > > > > - the right mouse key no longer works under X, I can no longer use X, > > > - the caps-lock light will not display under X > > > - on the text console works, X does not. > > > > > > The three commits related have bee reverted locally, functionality has > > > returned. > > > > > > > > Best Regards. > > > > ShengYi Hung. > > > > The hashes are, > > 1685192ea1fa > 8a847947153e > 6ea7e1f92882 > > I don't think 8a847947153e is related. 6ea7e1f92882 must be reverted in > order to revert 1685192ea1fa. > I reapplied the patches. The problem persisted. A clean kernel build also works around the problem. There is still a problem with the caps lock LED. It works on the console while under X it will not light until the first non-shift key is hit. I can live with that. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Sun Aug 24 05:59:01 2025 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 4c8jt847jCz65NSS; Sun, 24 Aug 2025 05:59:12 +0000 (UTC) (envelope-from aokblast@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8jt833Nvz3ltR; Sun, 24 Aug 2025 05:59:12 +0000 (UTC) (envelope-from aokblast@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756015152; 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=MJBDQRjbX8lO6AwmxKD/3g0Q3Oa+Id+P953JsN0/9NQ=; b=JjfemxIWvrrvix6WIkKWB/G+3nEiSYtG+rags6GcrMHbtWyn4HiugO4wOAHx9eqJon9dCu bkqLfPa1BpKpBYLZaYSm+w1eVumxp6Rf23Evldn243HWWqjtVtb0Mv0ci+jVAohqVOzN7P xPaVE0f1q0m0MwdUOhEe4I2CFBFOxuqXd75Zz1wLVuwCR70Zq5t/tQ0HJm+Owqz3RH1OsZ QUE1HBRQ/sgtQxGoY2CysKICSRyacs8veK9VLzJvedk/Rm+v5XsN6S08ke+eWRH9PIDKzx 5ee+yt7ESIQCKxOG0Ne6KwbhOVQeTFz+PGv25MAYD7c5DWVNyEAvXg7vOiDkSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756015152; 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=MJBDQRjbX8lO6AwmxKD/3g0Q3Oa+Id+P953JsN0/9NQ=; b=S/67zzlvJgN78dNOYqVWFf20GYh669voRJ3g60ZVVrWReAm8zCRyAIVmiCQNa49FdZGS9t bR3GpdZkxA8Y8xrY9D2YdvdnMylLpVXJ9wge4Plu/QQTfMCoyP40HTo1/U1JuUBC0A85OP J59dAGd49UDRRFI8ULdr+uponxmWjlqijcKqhK1A+0tneF7xPozr/hNYAG4uQ+CIH6wkIh 8qMff2JkPkybsf/HsWM5OVUC4YSJXyYOJtTW7h53fmSvCpXUpd4TYKvQvu5TkaIiWMuw4Z 2vigBfuV8BnyJmXWJ3ffthwKQJm13qKUIxV66ZQ5pvXxuRsudvKMcZdjdjdk/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756015152; a=rsa-sha256; cv=none; b=J+cjo0YiMI9kh7srlPn4yxLRv7uPxosTFoaynV9xwJ2cuu2FIqu0Nil0LZS8L6wqv0lYKu Kmogs21k+VSSfMSfjProaDTV2KoMXj72zuRfPILPFbCucVbaoEWNcghcLtVsksne4GjtbN IkgClU25qkvgVfZLJ3Xx15YVK5l+jib4rRDc1hM5OAW9ljbn5JIJ+oTZiME6JF5z+5hp7I G/K9neqYbX06nuKp9Jh7nKQ2kdjjd2+b69WVvq7QwThwKzO1omGpGWYxa+edoCLlzrFWVW rYD/i/OLsWON7XnU+yzJ3zZ4hjnKsWrVHpduMwoUSBRarGGjtNG1arvyWzzKHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from aokblastdeMacBook-Pro.local (2001-b011-3808-3444-555d-8966-de6d-8a5b.dynamic-ip6.hinet.net [IPv6:2001:b011:3808:3444:555d:8966:de6d:8a5b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: aokblast) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c8jt61wwHzn2K; Sun, 24 Aug 2025 05:59:09 +0000 (UTC) (envelope-from aokblast@freebsd.org) From: ShengYi Hung To: Cy Schubert Cc: Gordon Bergling , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1685192ea1fa - main - hkbd: remove erorr detection in KDSKBSTATE ioctl In-Reply-To: <20250823205131.6c44846c@slippy.cwsent.com> (Cy Schubert's message of "Sat, 23 Aug 2025 20:51:31 -0700") References: <202508230450.57N4oxwG023161@gitrepo.freebsd.org> <20250823171011.BCFFF189@slippy.cwsent.com> <20250823203726.55c5a5ec@slippy.cwsent.com> <20250823205131.6c44846c@slippy.cwsent.com> User-Agent: mu4e 1.12.12; emacs 30.1 Date: Sun, 24 Aug 2025 13:59:01 +0800 Message-ID: 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 So currently, the remaining problem is only on the keyboard LED? Would you mind to create a PR so that we can move discusion to a more suitable place? I would like to ask you more question over your environment. Cy Schubert writes: > On Sat, 23 Aug 2025 20:37:34 -0700 > Cy Schubert wrote: > >> On Sat, 23 Aug 2025 13:27:23 -0400 >> ShengYi Hung wrote: >> >> > Hello: >> > >> > I only submit two patches. What is the third patch you have mentioned? >> > Is the one setting "sysctl usbhid=1"? >> > >> > On 8/23/25 13:10, Cy Schubert wrote: >> > > In message , ShengYi Hung writes: >> > >> Hello, thanks for the reminder. I compile the standalone module to test so >> > >> didn't discover that. Fix it right now. >> > >> Gordon Bergling writes: >> > >> >> > >> >> > >>> Hi ShengYi, >> > >>> >> > >>> On Sat, Aug 23, 2025 at 04:50:59AM +0000, ShengYi Hung wrote: >> > >>>> The branch main has been updated by aokblast: >> > >>>> >> > >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=1685192ea1faac28f2d4feede53e7 >> > >> 0b6a380500f >> > >>>> commit 1685192ea1faac28f2d4feede53e70b6a380500f >> > >>>> Author: ShengYi Hung >> > >>>> AuthorDate: 2025-08-21 17:59:15 +0000 >> > >>>> Commit: ShengYi Hung >> > >>>> CommitDate: 2025-08-23 04:50:09 +0000 >> > >>>> >> > >>>> hkbd: remove erorr detection in KDSKBSTATE ioctl >> > >>>> >> > >>>> The KDSKBSTATE ioctl brings the LED up. However, some keyboards (like >> > >> qemu >> > >>>> keyboard) may not have LED or failed to set the LED due to unexpected >> > >> reason. >> > >>>> Therefore, removing the error check as ukbd(4) does allow the keyboard >> > >> works >> > >>>> correctly with kbdcontrol(4). >> > >>>> >> > >>>> Also move hw.hid.hkbd.no_leds sysctl out of HID_BUG thus users can >> > >>>> disable setting LEDs >> > >>>> >> > >>>> PR: 288968 >> > >>>> Reviewed by: wulf >> > >>>> Tested by: trashcan@ellael.org, marklmi26-fbsd@yahoo.com, trkelle >> > >> rs@gmail.coom >> > >>>> Approved by: lwsu (mentor), markj (mentor) >> > >>>> MFC after 1 week >> > >>>> Sponsored by: The FreeBSD Foundation >> > >>>> Differential Revision: https://reviews.freebsd.org/D52101 >> > >>>> >> > >>>> mvalsmva >> > >>>> --- >> > >>> I am not sure how this is related, but since that commit, buildkernel of GE >> > >> NERIC is broken both >> > >>> on amd64 and aarch64. The following error is from an amd64 build, aarch64 i >> > >> s the same. >> > >>> ----------------------------- >> > >>> /storage/freebsd/src/current/sys/dev/hid/hkbd.c:1831:10: error: called ob >> > >> ject type 'char[5]' is not a function or function pointer >> > >>> 1831 | DPRINTF(("error %d", error)); >> > >>> | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~ >> > >>> /storage/freebsd/src/current/sys/dev/hid/hid.h:212:34: note: expanded fro >> > >> m macro 'DPRINTF' >> > >>> 212 | #define DPRINTF(...) DPRINTFN(1, __VA_ARGS__) >> > >>> | ~~~~~~~~~~~~^~~~~~~~~~~~ >> > >>> /storage/freebsd/src/current/sys/dev/hid/hid.h:208:17: note: expanded fro >> > >> m macro 'DPRINTFN' >> > >>> 208 | printf("%s: " fmt, \ >> > >>> | ~~~~~~ ^ >> > >>> 1 error generated. >> > >>> --- hkbd.o --- >> > >>> *** [hkbd.o] Error code 1 >> > >>> ----------------------------- >> > >>> >> > >>> --Gordon >> > >> -- >> > >> Best Regards. >> > >> ShengYi Hung. >> > >> >> > > My machines running X (laptops), >> > > >> > > - the right mouse key no longer works under X, I can no longer use X, >> > > - the caps-lock light will not display under X >> > > - on the text console works, X does not. >> > > >> > > The three commits related have bee reverted locally, functionality has >> > > returned. >> > > >> > > >> > Best Regards. >> > >> > ShengYi Hung. >> > >> >> The hashes are, >> >> 1685192ea1fa >> 8a847947153e >> 6ea7e1f92882 >> >> I don't think 8a847947153e is related. 6ea7e1f92882 must be reverted in >> order to revert 1685192ea1fa. >> > > I reapplied the patches. The problem persisted. A clean kernel build > also works around the problem. > > There is still a problem with the caps lock LED. It works on the > console while under X it will not light until the first non-shift key > is hit. I can live with that. -- Best Regards. ShengYi Hung. From nobody Sun Aug 24 11:01:15 2025 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 4c8rZm2xyvz65G03; Sun, 24 Aug 2025 11:01:20 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8rZm2PqSz4HdT; Sun, 24 Aug 2025 11:01:20 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756033280; 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=ueijpMHq+Fl8ApTI/kv8tf5qsEu8VzigUhc6Q3lYono=; b=bkQZZi/lPfXl40N+Jd7dhwg7NcR6qi1tCr8GxC4tTizzsFuEf6jip7HXAvJX17m14YknVk 7Em24DY9SnrLabzjRUinj/aiKtsA6SeyKOAQ5JtZi/qBuvcHMntFkF0K/IHKvAfrBWegAt 6hZfX62JaE8eb0HxpGPHk3spDg9dgBhr05REePhODc8imar0SMExAdXP5CPQ8xkAE6wgfN 8c8V8m14Y+IzJHrwMxM1ZvMb5p3g5kJ5aTVP1/K3j0sQROvoZvxiZxwZRWFgrmLU25sLBl ClQi2vvK4Ndj07L+FG5K2789oWbe54xryoU+oAUYIDil7u0jyHX/s8D6Mh3s1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756033280; 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=ueijpMHq+Fl8ApTI/kv8tf5qsEu8VzigUhc6Q3lYono=; b=vQr3tPf6nnKepmFJgsRzvHdZBFtZo0vGNAQtzqwTjFRWprjfRM1rhyVLyb7cdjpX915+e/ t4jk7aZLwBNYENtEd4foxnYGOKMLCotd346/jIcqy38oKMgi2FtmcfxVg8eE2k0uUTkik5 TVlcscs95lJJ+9lTSKQQl5RVzubt3Wsm5Di1N7xyeWnb65KLiCkNR6xjHelCO9gDHtRnxI Ig7RCPOefp7VXPuDmUeJ317PEuzV+AnUppyXlU1kw2LJcmJmJNJ0YD/WqyXJ7mXnktV6a4 sp8rO7i3ZEQo3Mstet8CJxRRbqe2MmABI1h1SLRJARw+gl3CSsYmlCwr69zGIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756033280; a=rsa-sha256; cv=none; b=uy/QOhOKmf2va+tA6lF/kmGv4RnLzeov4VI0O6x3kayz4OpnIi4vvD742Ud29lqA5KMelh 6eF1LMUfVeyjF1Cn+n/mZQaDHnGaZogZDvkGN1smlkpdq5WBNiMeiAttx+MesmfmFj0nGR aiB4XxM44UNZg3aHBQicfpRZKMQrLDU3hkM7s36aYUsm5SgW4CNVLC37dPxJIKIy90WdCS PoAsiVbnou+iGZsGtDFWqogueEcKIOynkW45Pdh/jHpoheWF+BhcHNDZVSdjrLZXNru90t znZ+gwjI+tW+DzHXmY3ZDR43FvRzEHqRunZYasVv9Y8jfqUe0q0pTR7/PGBXOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E6" (verified OK)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c8rZm0bd4zv1N; Sun, 24 Aug 2025 11:01:20 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id 5D8D0A64805; Sun, 24 Aug 2025 11:01:10 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 1D78B2D029E3; Sun, 24 Aug 2025 11:01:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id OEkcVXIHh-TM; Sun, 24 Aug 2025 11:01:16 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:a66b:b6ff:fe40:39a9]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id F09DA2D029D8; Sun, 24 Aug 2025 11:01:15 +0000 (UTC) Date: Sun, 24 Aug 2025 11:01:15 +0000 (UTC) From: "Bjoern A. Zeeb" To: Krzysztof Galazka , "Bhosale, Yogeshnull" cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: dea5f973d0c8 - main - ix/ixv: Add support for new Intel Ethernet E610 family devices In-Reply-To: <202508191512.57JFC0U7049897@gitrepo.freebsd.org> Message-ID: References: <202508191512.57JFC0U7049897@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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: multipart/mixed; boundary="1098556516-225775166-1756033276=:4619" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1098556516-225775166-1756033276=:4619 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Tue, 19 Aug 2025, Krzysztof Galazka wrote: > The branch main has been updated by kgalazka: > > URL: https://cgit.FreeBSD.org/src/commit/?id=dea5f973d0c8d29a79b433283d0a2de8f4615957 > > commit dea5f973d0c8d29a79b433283d0a2de8f4615957 > Author: Bhosale, Yogeshnull > AuthorDate: 2025-08-19 14:19:07 +0000 > Commit: Krzysztof Galazka > CommitDate: 2025-08-19 15:09:33 +0000 > > ix/ixv: Add support for new Intel Ethernet E610 family devices > > This is part 1 of the support for the new Intel Ethernet E610 family of devices. > > Introduce new PCI device IDs: > • 57AE: Intel(R) E610 (Backplane) > • 57AF: Intel(R) E610 (SFP) > • 57B0: Intel(R) E610 (10 GbE) > • 57B1: Intel(R) E610 (2.5 GbE) > • 57B2: Intel(R) E610 (SGMII) > > Key updates for E610 family: > • Firmware manages Link and PHY > • Implement new CSR-based Admin Command Interface (ACI) for SW-FW interaction > • Tested exclusively for x64 operating systems on E610-XT2/XT4 (10G) and E610-IT4 (2.5G) > • Enable link speeds above 1G: 2.5G, 5G and 10G > • NVM Recovery Mode and Rollback support > > Signed-off-by: Yogesh Bhosale yogesh.bhosale@intel.com > Co-developed-by: Krzysztof Galazka krzysztof.galazka@intel.com > > Approved by: kbowling (mentor), erj (mentor) > Tested by: gowtham.kumar.ks_intel.com > Sponsored by: Intel Corporation > MFC after: 2 weeks > Differential Revision: https://reviews.freebsd.org/D50067 /sys/dev/ixgbe/ixgbe_e610.c:1411:13: warning: unused function 'ixgbe_is_media_cage_present' [-Wunused-function] 1411 | static bool ixgbe_is_media_cage_present(struct ixgbe_hw *hw) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated. Is that function needed or can it be removed/#if 0ed? -- Bjoern A. Zeeb r15:7 --1098556516-225775166-1756033276=:4619-- From nobody Sun Aug 24 14:38:50 2025 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 4c8xPl3BKsz65XLP; Sun, 24 Aug 2025 14:38:51 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8xPl0JyXz3WTK; Sun, 24 Aug 2025 14:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046331; 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=FKhejudao8cLyaE+O+vrjPFRf5WWkLwVbYog8dU3uic=; b=HyLi8gIYoNuX0z5aJ4HlodL2WbrzGzWBJcdLI+DRYmW23rVtHprq2WooIEhnnbWetM09br PfYinXWJYAvzBDElb7IbV45YYM/hzEkiGxjEBLxde7jmeAxIPVz9GwW6jgmvdDupQj6ziQ qHzJmcvBe0KaA2MbAjxLkLeneVzBzwUo9Si03KV0C/Hi4b6nTpFD/ZuCvU9mAz64CcDYM2 qUPk1lBheFE42ngDzvYzsj7HWVCdEB8ozPyMEbi49zrk4XVrjZcVld4dd3tw8RmmVEsCRE 9BditsFjkwgsWsSW2KeYw4TygDgbpLGF/KcOFvnMDnzrpOMLLMp1XCno2012ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046331; 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=FKhejudao8cLyaE+O+vrjPFRf5WWkLwVbYog8dU3uic=; b=W6dHvFDdHgr/T6N29T9jVgHguh9nM3vfAV+q3fEIJLt0kmVkr185wVUoxa66rHUCAiNKL6 Id7OaShOjqUMm78xe1bOF7ZGoEHlOrWTfwwJaBgpFlUAKisCI3nxVpYSSjx+fyMf0X93GC 18i03BXJeNNTUw+WDg9xfFiV803B1wd3XBtZM6If8Ul4Wfc4KV465S7W5sRNoklyTC7LOT qvetyXGvXwYnGd4VI8Cz05uuHMi6ULdkZwMp/rOe9A5kaN5OlwRHh18GORu9vfI15KleRQ HLzM4EvE97k+sUaHFDJ8DnbSz/jpLioVilwUrcNBuhzNluNvaGC2wT40GidDaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756046331; a=rsa-sha256; cv=none; b=pyoX7rTEQNXgaFe76MqMDEllixq6w+pu6F1kci/9ivDSYFrYRZas6MlHtdwpZ2dkbk383N dMUVojhjX1q7dmYGtG3lm3YF9BKs3EcoQpyd1AtaFwpdp+MXOYUEC7IWG3t0XdsDDFpZYK OMXp76ibvZsrv50CA4O/1LHwlzPAQE+nphIYfVBlC+WeRdm4bql2XtCS1b5aAB4soRkDFj HBwteDEBHOdfz/Q8Z4SZdv3b8e9rHwsJoqTsOI5DRGTRyoKZ2frMQHLmFULrL0vN3IxPVt epLiH/9/81wSCb0vOX7gq69KyfuTnr6+7wuDFfPUpmQvUMFOevQ40F6LPCp9og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8xPk6lCYz16Z7; Sun, 24 Aug 2025 14:38:50 +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 57OEcoKa040427; Sun, 24 Aug 2025 14:38:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OEcoL1040424; Sun, 24 Aug 2025 14:38:50 GMT (envelope-from git) Date: Sun, 24 Aug 2025 14:38:50 GMT Message-Id: <202508241438.57OEcoL1040424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 897cf423a394 - main - linuxKPI: 802.11: assert wihpy lock in lkpi_80211_mo_start() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 897cf423a39474096dc699f7b9d173e4a97d3510 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=897cf423a39474096dc699f7b9d173e4a97d3510 commit 897cf423a39474096dc699f7b9d173e4a97d3510 Author: Bjoern A. Zeeb AuthorDate: 2025-08-01 05:28:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-24 10:26:38 +0000 linuxKPI: 802.11: assert wihpy lock in lkpi_80211_mo_start() Newer versions of Linux wifi drivers assert the wiphy lock in the (*start)() path. Make sure we do too and do hold the wiphy lock. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++++ sys/compat/linuxkpi/common/src/linux_80211_macops.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index a7d6003843ba..7ea7622744db 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3826,8 +3826,10 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], IMPROVE(); + wiphy_lock(hw->wiphy); error = lkpi_80211_mo_start(hw); if (error != 0) { + wiphy_unlock(hw->wiphy); ic_printf(ic, "%s: failed to start hw: %d\n", __func__, error); mtx_destroy(&lvif->mtx); free(lvif, M_80211_VAP); @@ -3837,11 +3839,13 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], error = lkpi_80211_mo_add_interface(hw, vif); if (error != 0) { IMPROVE(); /* XXX-BZ mo_stop()? */ + wiphy_unlock(hw->wiphy); ic_printf(ic, "%s: failed to add interface: %d\n", __func__, error); mtx_destroy(&lvif->mtx); free(lvif, M_80211_VAP); return (NULL); } + wiphy_unlock(hw->wiphy); LKPI_80211_LHW_LVIF_LOCK(lhw); TAILQ_INSERT_TAIL(&lhw->lvif_head, lvif, lvif_entry); diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 78b2120f2d8c..1046b753574f 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -53,6 +53,8 @@ lkpi_80211_mo_start(struct ieee80211_hw *hw) struct lkpi_hw *lhw; int error; + lockdep_assert_wiphy(hw->wiphy); + lhw = HW_TO_LHW(hw); if (lhw->ops->start == NULL) { error = EOPNOTSUPP; From nobody Sun Aug 24 14:38:51 2025 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 4c8xPm4Hk3z65XcN; Sun, 24 Aug 2025 14:38:52 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8xPm2Pqbz3Wkw; Sun, 24 Aug 2025 14:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046332; 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=skUG/MVyzRwrwhHLHTPTaZDhM6A869zofQc20jb8sAI=; b=t1irHRF+ZfyfJdQP7OIB3UHoLwwLhWC7rTSUqXEPrl4LYHajFx1pP6eABLZ8FHdW5We5sI 3oqSvUoMUfIgWL72ew8nmdWrC1YNBOgLGQ3dbFZwFSBxm7W5h6SSRa9r0pLOkkDFfgu4U8 7Z56qO58glvvr+AwntEnBNwp0xhbIrD3rDntfPfw8NFFzs4MxYzjPcynLLmbOGq25aCc34 68hzWmSbMw3wnCpxH+g8YQJ60+dFmvVNArjjZZIRGGpOHmzj4yJZbFeKP6Ao4StdcNtQVV 0VVIoW+29TqnXcBRprrb2m65/phh7G20U08U0E7apFbPgoVA+e8KhR9+l/hqKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046332; 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=skUG/MVyzRwrwhHLHTPTaZDhM6A869zofQc20jb8sAI=; b=xiTUYk+FTWlY2IXGuFoNpOXjy6VYewALVmS8OyqgG6aTfMkX8NBCKRy8RQumYXO7jsf26R Ul+JB3dKyDJWTw1ZfaP2CEQGzUNMPUUL78ZJiuKY1cFpl1J0lZoXhHD/pvqyEObyYH/HMt 1WRmQbAt8AYDqFEF3sbCCEObcnqall6yHbyu5XPZpyx2RN5Dd64gTnTluNnZraoq/QlH+k Nly1QbfXhVyy2RBsg0CBil3wxn+FmEH38W82ZnzvRGx3hYG6UyNwnCXHL5qajmSQZjR9RE HV1nMIE+PADizRnkWhbM6lKrTT3sr4ZyUAhikKem1jlchceUG0mw3Rlmoh/nyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756046332; a=rsa-sha256; cv=none; b=SkLCjXaVyh0JW8EQQ08UHQY/l4w8XFrzq6CZz9oiO54Q7mv8UPUHdO0avMPyV8l7HLqFHG NywY05sDbq6g9qwGA7Qb5ClqaOrH8M8zmyX12GRt9WFkARAeWNj7mNh1wNVIw6s4tM5qfA U+PRMniuB72/MvjEMVuzAx0mBzZ9kKeZzLc+Wq5FkLBqX1xjSy35r0Jof8GVhPInqXGWr+ f4jgJFCt0quqPMjkENLX7VJKlcde+M5OiJO5ofFFEeaV6e/AiwxuLHjvJMKGEP+jMsHpHo hHCqS1SXbr7a0IUsTiQDP8SaRgmy6rtckFh2dBlFrOIws7j/V4zePzlq/BPGLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8xPl75S1z16Z8; Sun, 24 Aug 2025 14:38:51 +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 57OEcpa3040470; Sun, 24 Aug 2025 14:38:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OEcprT040465; Sun, 24 Aug 2025 14:38:51 GMT (envelope-from git) Date: Sun, 24 Aug 2025 14:38:51 GMT Message-Id: <202508241438.57OEcprT040465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8475942ca8e8 - main - LinuxKPI: 802.11: add guards to lkpi_ic_ampdu_rx_{start,stop} 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8475942ca8e887287959ec2671266a210f41ed86 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8475942ca8e887287959ec2671266a210f41ed86 commit 8475942ca8e887287959ec2671266a210f41ed86 Author: Bjoern A. Zeeb AuthorDate: 2025-07-20 15:03:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-24 10:26:38 +0000 LinuxKPI: 802.11: add guards to lkpi_ic_ampdu_rx_{start,stop} After updating calls into lkpi_ic_ampdu_rx_stop() were seen along with panics. Working backwards adding checks to each level we lastly ended up fighting a lsta which is NULL. Simply return in any error cases as there is nothing we can do and just leave it to net80211. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 7ea7622744db..7e1430ccdbd1 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -5575,6 +5575,12 @@ lkpi_ic_ampdu_rx_start(struct ieee80211_node *ni, struct ieee80211_rx_ampdu *rap return (-ENXIO); } + if (lsta->state != IEEE80211_STA_AUTHORIZED) { + ic_printf(ic, "%s: lsta %p ni %p vap %p, sta %p state %d not AUTHORIZED\n", + __func__, lsta, ni, vap, sta, lsta->state); + return (-ENXIO); + } + params.sta = sta; params.action = IEEE80211_AMPDU_RX_START; params.buf_size = _IEEE80211_MASKSHIFT(le16toh(baparamset), IEEE80211_BAPS_BUFSIZ); @@ -5651,13 +5657,35 @@ lkpi_ic_ampdu_rx_stop(struct ieee80211_node *ni, struct ieee80211_rx_ampdu *rap) lvif = VAP_TO_LVIF(vap); vif = LVIF_TO_VIF(lvif); lsta = ni->ni_drv_data; + if (lsta == NULL) { + ic_printf(ic, "%s: lsta %p ni %p vap %p, lsta is NULL\n", + __func__, lsta, ni, vap); + goto net80211_only; + } sta = LSTA_TO_STA(lsta); + if (!lsta->added_to_drv) { + ic_printf(ic, "%s: lsta %p ni %p vap %p, sta %p not added to firmware\n", + __func__, lsta, ni, vap, sta); + goto net80211_only; + } + + if (lsta->state != IEEE80211_STA_AUTHORIZED) { + ic_printf(ic, "%s: lsta %p ni %p vap %p, sta %p state %d not AUTHORIZED\n", + __func__, lsta, ni, vap, sta, lsta->state); + goto net80211_only; + } + IMPROVE_HT("This really should be passed from ht_recv_action_ba_delba."); for (tid = 0; tid < WME_NUM_TID; tid++) { if (&ni->ni_rx_ampdu[tid] == rap) break; } + if (tid == WME_NUM_TID) { + ic_printf(ic, "%s: lsta %p ni %p vap %p, sta %p TID not found\n", + __func__, lsta, ni, vap, sta); + goto net80211_only; + } params.sta = sta; params.action = IEEE80211_AMPDU_RX_STOP; From nobody Sun Aug 24 14:38:53 2025 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 4c8xPn6DWfz65Xj3; Sun, 24 Aug 2025 14:38:53 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8xPn1Kj8z3WRJ; Sun, 24 Aug 2025 14:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046333; 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=1aD6HHl07+AMHOYyinns/MdrvPtiR4Yy0KWPUCEDu0g=; b=IikA2jq/UwI0UWjjWDXZEdmtPbNsYQVSq5tS7zRKJBnoSmpf1czlQmQoEYNTpqD/PKlnhp jSvqWBWkJ41orfdbmpsVBNFWc0ekA0klxxGYk410K/aMqZ2uNFSEvpq4otQMBTnA28tLAN Jzh2AvHCPFy5GWBMMbQwRFxfSeoBlAp3nutnGOHRBQtbyRgMoMn9N1DtvaVlPH23TZzKO0 IqR5tN6Ofeuwvv5ZRCVnZ3sbg1PygC29+suiuYEXErWkElepO6kiFQh2rcbjTbcUGA+l9D CPgtv8ZpQ6sdBPomgoq5Oudlz+x/vKTNNGZkcfBR6E28GNut0003T5/eMkAVJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046333; 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=1aD6HHl07+AMHOYyinns/MdrvPtiR4Yy0KWPUCEDu0g=; b=Fqq7WNj/1NHPPqXpt/xI73I5T6Jsg9AUHDAsWC03i/aKGXZVYD9999lWOwWjpCimTKTgU0 5eAADnL4motorRv8Uo/3aaKABN00//57PQlOMHTyIDkW+AdFJy9NJ+VhVzCcl1nrKUiwIG 0+XNAGGrJXjt73SJ8xokqCS2bCvlW1YL563r1/UeJ84KhGZPzHmgYNBKoWoaPk2SJe/Q/B 22HKCBAcQA84NziAFBXPSBmH+yVZ7UeuVdH3/lb0OZYhVxHdrP9tBcAvAsZqsIestB0Azn tXV8NYlL8F/erT2FaB5quag+li6+sUS4l1t+rv+wOwZw+v6KDCPbz1/IOvEBmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756046333; a=rsa-sha256; cv=none; b=qrku4iyffoeAILJDmt+ke4ZdD8tnLj9Kd7oV/3Uou4+uV+cGeGgmUGGXsiX9x8J54bvG9g KFB5X7CQaS1z4FVESpU2FNy4cVofegmROSnKai8K/VUBWeZifZJtOAf0as1MP/obm/o0aa I5hDf1SQPc+gC2QMv9tLs6VA9PnivKPdfSRfuO0bfTwEfwFYQhOyy8oLOlrIPu/wpaiCI/ m1/0VdB4mUu7g+dFphaZL8WDXU9PShJ6CdHlZmEkYhQ3HPOF5R0qEQpQ4vR2sZYTXlNYHg r1M8Z/883G+4qiKSoktU83zbpvD8eb51lp56FvcooncTNdzBijUJRLRwBRglCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8xPn0hVWz16Z9; Sun, 24 Aug 2025 14:38:53 +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 57OEcr3K040509; Sun, 24 Aug 2025 14:38:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OEcrYt040506; Sun, 24 Aug 2025 14:38:53 GMT (envelope-from git) Date: Sun, 24 Aug 2025 14:38:53 GMT Message-Id: <202508241438.57OEcrYt040506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8c1fdcf8c402 - main - LinuxKPI: 802.11: announce netdev features under boot -v 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c1fdcf8c4026290d122f573e1207188ac029bac Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8c1fdcf8c4026290d122f573e1207188ac029bac commit 8c1fdcf8c4026290d122f573e1207188ac029bac Author: Bjoern A. Zeeb AuthorDate: 2025-05-10 01:44:52 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-24 10:26:38 +0000 LinuxKPI: 802.11: announce netdev features under boot -v Under bootverbose print the announced netdev features during ifattach. Helps us to debug problems amongst drivers if needed. Leave a comment where to add checksum offlooading setting on the ifp if we get there (this would be based on netdev features). Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 7e1430ccdbd1..45e4aa1639ab 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3877,10 +3877,12 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], /* Force MC init. */ lkpi_update_mcast_filter(ic, true); - IMPROVE(); - ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid); + /* Now we have a valid vap->iv_ifp. Any checksum offloading goes below. */ + + IMPROVE(); + /* Override with LinuxKPI method so we can drive mac80211/cfg80211. */ lvif->iv_newstate = vap->iv_newstate; vap->iv_newstate = lkpi_iv_newstate; @@ -6364,8 +6366,10 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) hw->wiphy->max_scan_ie_len -= lhw->scan_ie_len; } - if (bootverbose) + if (bootverbose) { + ic_printf(ic, "netdev_features %b\n", hw->netdev_features, NETIF_F_BITS); ieee80211_announce(ic); + } return (0); err: From nobody Sun Aug 24 14:38:54 2025 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 4c8xPp5vDSz65XlC; Sun, 24 Aug 2025 14:38:54 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8xPp2Q08z3WTM; Sun, 24 Aug 2025 14:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046334; 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=bss9HpCeZSMQK1fUs6IPOPHSMi0bAjLZoQamJcQLv88=; b=sEes0UfbXIg928YnErKF6IidlJHaEbmS6tQn5FkzGIA4Iw90GixFNqBMZiFXezNNBujkxc pJjPZ1lf6ffQyLQjRIb5UXJtlmj2AHXeNNV5espADcctuqcmkV+qtR3HkscmzKLDBKsrpP bgPzvDmdRfr12xtjCXrnqq4y3YoJr1WsDtR2muvEWhT820Qv/LC2Xv4aRbNYk0D/iLu60i saqMD1CA5hE6O4mp+6MHp9Z1+YuzYQAR3Q8b7i3DWWQ1y3t+hjUEzpXnDMQdeU6udZSFIH 5HYqFpA3UzFbOo9ZOZ8SzFnrfITwBeQ82wTSJr3wdMQc+JTiDPOnSMtyT1if2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046334; 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=bss9HpCeZSMQK1fUs6IPOPHSMi0bAjLZoQamJcQLv88=; b=oGMlaB/AEeccBx5S4w/yYCd7qn/ZJjleU1mYxAjq2UhBwMQx5E2wO/EglBe5ae4AL1amua HZRrBXx4usn4iOnKHVZeVmLw0J9yFVKJQzZ6D44e3LpvGO0ar24vXqIyxcbQK/WDTSABv6 SJyRrrKjCCi/MAMyTzsL2o2470SWGQFtFFVSsyNjr+CNU0QaRhbiDRC6hZeIlRsEpOPNN1 vXBlaNeeDPMTWEsIQaZXamQ91/9VFbT/p6AGaXy7sG75NO4nz0lr2FHVruxuqVS2mSa+5M GYdnzyv9qTPpohDqW2HpYx+h/+l3Nral72x6mkS/KuTlZAzEXOq4zuSpmRRbIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756046334; a=rsa-sha256; cv=none; b=bVARqUgDNG99enp7AOixn7Sphw37vEPwTsVnsM2udnxC0aazHjEwucBHPNCKDwEYDJUbUX fNZwXK0tlq0kUcWXB+CR2tYUr0u3gMWV3KefDGtVhpuvWjTq6zrN3acel5xQACY7eMgmwa vaEgLaN1jLrY3Y2xINCzH23q/OaffGCIHrhrp/QkEIYGul/pbyIYqJYwi3m8RSxxAFpqUi hgie5606+XkLXHwuzAvjlKXiyM8Au6MxGOsUrIVmu3FqzKRfdN85YjXhvhnrQOAS8jR9m3 N2uWoptIq9dFPpnnYZx5AaEuzYKhkC/sfywJUT32eWsS1ky58fxjvOOZWYUCqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8xPp1y28z16Mf; Sun, 24 Aug 2025 14:38:54 +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 57OEcsFE040547; Sun, 24 Aug 2025 14:38:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OEcsQh040544; Sun, 24 Aug 2025 14:38:54 GMT (envelope-from git) Date: Sun, 24 Aug 2025 14:38:54 GMT Message-Id: <202508241438.57OEcsQh040544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: cd3c9f7afc27 - main - LinuxKPI: 802.11: assign values to WLAN_HT_CAP_SM_PS_* 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd3c9f7afc275c250025bdd1140ce0e821d23f34 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cd3c9f7afc275c250025bdd1140ce0e821d23f34 commit cd3c9f7afc275c250025bdd1140ce0e821d23f34 Author: Bjoern A. Zeeb AuthorDate: 2025-08-21 22:13:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-24 10:26:38 +0000 LinuxKPI: 802.11: assign values to WLAN_HT_CAP_SM_PS_* No functional changes. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 5851ac08f083..b9161c586d07 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -147,9 +147,9 @@ enum ieee80211_vht_max_ampdu_len_exp { enum wlan_ht_cap_sm_ps { WLAN_HT_CAP_SM_PS_STATIC = 0, - WLAN_HT_CAP_SM_PS_DYNAMIC, - WLAN_HT_CAP_SM_PS_INVALID, - WLAN_HT_CAP_SM_PS_DISABLED, + WLAN_HT_CAP_SM_PS_DYNAMIC = 1, + WLAN_HT_CAP_SM_PS_INVALID = 2, + WLAN_HT_CAP_SM_PS_DISABLED = 3 }; #define WLAN_MAX_KEY_LEN 32 From nobody Sun Aug 24 14:38:55 2025 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 4c8xPr4MdYz65XFM; Sun, 24 Aug 2025 14:38:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8xPq4H08z3Wn2; Sun, 24 Aug 2025 14:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046335; 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=8B5HBV/ALzGbOjMz9DPNT2PMDGsBkELNrbQSbXjGXWU=; b=MZ0YupBohs1JgMZDH/yFmKfrtKeU8S4nckPn6/uaNfHxuqaS62vmLyF6lohvrZQ6ilnOKg 5lmMQpR5me+WvYBKK2l5q1yzN/Y7Ivo+pst4YAKLfds9ECIRmI+JginBy/Efkx4HwBxmUv T7q8KgTQAbCC3yeaJRSApcaj98DmXQDJ1LaFdylK++mW5Lhwm6JMDFjjbBRQ4U7J1U3hUg yzTHP6F9Ps653EyDdG/dldoA0EuBCfLBBZaXOHHh6wKkd+z836TKTsvWnuFBlJC7YVZBHt 2hehZjoAqDDSnRQJqpPzp6MSEjeyFxacpaSZZqmXx2zP3Nj+uYIOBVAuDle0cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046335; 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=8B5HBV/ALzGbOjMz9DPNT2PMDGsBkELNrbQSbXjGXWU=; b=x/SEZ+XGGjIcSI7A9woDrBJrJtn9Jvhv363BJhE6M/kP4K2NDaXlKjDiM1Lp4U4UPOU456 AVyCEM/lk/hla0+CoqptKZE+l3wNPUWCBJBvJkFK5AicgMYE/Lmlvg4tgYd9dw18DrLyYR xOUZcxwKh1B9ajhvsSug7lR1Wpl9wtv0+Ur5TFrwkBUc3Sc6l6oGH/Sol4DcdjDnAkHuNt /ugGEs0T1joNglsXBY4MEUzL5y7AEd9yCgcOoYLWxwj5SkzTuVc4iWtxWinfb6wvWaL79S IZM6yojSEwjKFOJv8ho5u/T0jkUTLvXUs/FDskWRDPiPDOR1Ofn2ug09ti0cPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756046335; a=rsa-sha256; cv=none; b=ppJW1bIXKCm6oVdH4Op++a4G39TuDKCYCUS4yt2qleXFW9c7h4U8TOXWKdYAqBM+CwEZoq qQMeQmt2SmmmOK75n5ANS006wlxG2xAv8DjXBRKYaMtWAEVPUbbn3dBeenByftVLMVszjr IJd4RqbZdtuYIlWkfdpNEUGXIKUKqES45fQkFdzlTp0Tym404tqyY3dr27VTTQE1yF7cdg LDdB+ZBc9u3LLfQVitmgrM8jyH84RtYKE6byMMWh1XHQn2PESRVXXfTk0srpIKiZhcTtYE U3cCLkbkjzkcQJId3skzmgAKrBNUPjCMOnCNmHC8hWyVeKxmUeM1sa8PrpHwsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8xPq2n94z16ZB; Sun, 24 Aug 2025 14:38:55 +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 57OEctOe040589; Sun, 24 Aug 2025 14:38:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OEctwt040586; Sun, 24 Aug 2025 14:38:55 GMT (envelope-from git) Date: Sun, 24 Aug 2025 14:38:55 GMT Message-Id: <202508241438.57OEctwt040586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 85eccabc41c9 - main - LinuxKPI: 802.11: improve reg_query_regdb_wmm() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85eccabc41c92d9147cac5c6f5434e2015d7eca8 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=85eccabc41c92d9147cac5c6f5434e2015d7eca8 commit 85eccabc41c92d9147cac5c6f5434e2015d7eca8 Author: Bjoern A. Zeeb AuthorDate: 2025-06-21 14:07:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-24 10:26:38 +0000 LinuxKPI: 802.11: improve reg_query_regdb_wmm() Adjust the IMPROVE macro to also take a format string and use that in reg_query_regdb_wmm() instead of TODO() to avoid spamming the console with something that needs larger reworks. Return -ENODATA instead of -ENXIO as that seems a better fit though the only consumer uses it without checking the return value these days. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 044f348ef08b..b79dd003a677 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -57,8 +57,8 @@ extern int linuxkpi_debug_80211; #endif #define TODO(fmt, ...) if (linuxkpi_debug_80211 & D80211_TODO) \ printf("%s:%d: XXX LKPI80211 TODO " fmt "\n", __func__, __LINE__, ##__VA_ARGS__) -#define IMPROVE(...) if (linuxkpi_debug_80211 & D80211_IMPROVE) \ - printf("%s:%d: XXX LKPI80211 IMPROVE\n", __func__, __LINE__) +#define IMPROVE(fmt, ...) if (linuxkpi_debug_80211 & D80211_IMPROVE) \ + printf("%s:%d: XXX LKPI80211 IMPROVE " fmt "\n", __func__, __LINE__, ##__VA_ARGS__) enum rfkill_hard_block_reasons { RFKILL_HARD_BLOCK_NOT_OWNER = BIT(0), @@ -1299,10 +1299,9 @@ reg_query_regdb_wmm(uint8_t *alpha2, uint32_t center_freq, struct ieee80211_reg_rule *rule) { - /* ETSI has special rules. FreeBSD regdb needs to learn about them. */ - TODO(); + IMPROVE("regdomain.xml needs to grow wmm information for at least ETSI"); - return (-ENXIO); + return (-ENODATA); } static __inline const u8 * From nobody Sun Aug 24 14:38:56 2025 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 4c8xPs67vYz65XJ5; Sun, 24 Aug 2025 14:38:57 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8xPr4h0Dz3Wl7; Sun, 24 Aug 2025 14:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046336; 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=E7Z60HU1oxi+cjR8Hps0S0M2t/YrEKWn2WxSacrwRv4=; b=k8nbhw7demX1bGWdIGyvVbfeBgTttVygmxCpUVlXP/7Zn9DBITwisDwCmhbUREoM2lH8IX sYH86HZyF1KGBB98ZiiWF5Hy1ky0O1W2kUnxkZnYTf5HHaflTQEFekuqRewyTqVYQ9FC4u rsAB4ifVwTi+/Ht3ZFibf/nupAEmQvQ6zE8sJOra3tzAC9by+QM+zxVnbi2R+d4xFEvix2 t2DTyefckVYFSK+97dGfY1/+RA6cocgINQll6f9B4uGOWN7W5W8VO1fj01TfGnn6g+DR2e +Lc0F/vihlsar29WhSG4457Blni5yIOOQHjHwDSlHqfOEYJSNq9QS3SrNTj/7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046336; 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=E7Z60HU1oxi+cjR8Hps0S0M2t/YrEKWn2WxSacrwRv4=; b=lmTQrMT7hPoXneixB++pFtgDaV/GOUiR4yjFd8LQm0ZCA4oompp4ooB+mgXSQf8h5EgeOa sgnkK/+gNCyd4WccwRuXJuX5DpXFZm97cj9oDXIsrfDwe9Kf1+P8SrOeY1Y2HtJ1O83q5U 3tctAvJj4F9c+7/xdC91I8NrFNHxYZ7Muq6H9BVW6mCL2pXE7LUKeFTXAN0Z050DZHhH+u OFUjOKdpnYuIUqk5JwKaIewzC9MiivQ9lk+9WMs64wrLG/4Z6LhFGY/M8T570uW1puatfq Menzx9Rzj0ccLSRRS/Fl9kFnOnrWxHoNk2L7weMiG2e71uaxm8lC27nDB5XigQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756046336; a=rsa-sha256; cv=none; b=gA5+xq4TTdChY+LgvrUz4QjFxAD2pfyiePpxMIGaLHLmQXhfhAh4bKVtVdsy/2RXkITQpk BwLtDzhniO11ZSdmw5OAELC0EB/d+YAWOdWtaQsoXpO0PiIUKrINe+TMj7BvGOvFajV2Iu 7Rjo9gSANiCmnLGj4MMJ71MBNFxy7KvD6O0YnkIVtOEEXqx/CYqW0f85Xek0n/7n6PtWOm DGEtjJNVgVsflEyxxOCj+Q6h0z0SklBBglRji4o2BIBNnxf18BXbVcZyYGSrglUTw1/swy kShK967mgd+TIuoJvLNQyzvPq62p7PRvkiicb+SnXWsPxHOid9QZA/iStiECXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8xPr3kwTz168N; Sun, 24 Aug 2025 14:38:56 +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 57OEcu2K040634; Sun, 24 Aug 2025 14:38:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OEcuUS040631; Sun, 24 Aug 2025 14:38:56 GMT (envelope-from git) Date: Sun, 24 Aug 2025 14:38:56 GMT Message-Id: <202508241438.57OEcuUS040631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a39492485637 - main - LinuxKPI: 802.11: correct struct linuxkpi_ieee80211_channel 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a394924856373b5228f542360618cfed8e334504 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a394924856373b5228f542360618cfed8e334504 commit a394924856373b5228f542360618cfed8e334504 Author: Bjoern A. Zeeb AuthorDate: 2025-06-22 07:31:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-24 10:26:39 +0000 LinuxKPI: 802.11: correct struct linuxkpi_ieee80211_channel Some of the annotations were not quite right. Also various fields had not been typed properly. Correct the types of field members and given the change also re-sort. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 25 ++++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index b79dd003a677..239b4a5ae7b8 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -128,19 +128,24 @@ struct ieee80211_txrx_stypes { uint16_t rx; }; -/* XXX net80211 has an ieee80211_channel as well. */ +/* + * net80211 has an ieee80211_channel as well; we use the linuxkpi_ version + * interally in LinuxKPI and re-define ieee80211_channel for the drivers + * at the end of the file. + */ struct linuxkpi_ieee80211_channel { - /* TODO FIXME */ - uint32_t hw_value; /* ic_ieee */ - uint32_t center_freq; /* ic_freq */ - enum ieee80211_channel_flags flags; /* ic_flags */ + uint32_t center_freq; + uint16_t hw_value; + enum ieee80211_channel_flags flags; enum nl80211_band band; - int8_t max_power; /* ic_maxpower */ bool beacon_found; - int max_antenna_gain, max_reg_power; - int orig_flags; - int dfs_cac_ms, dfs_state; - int orig_mpwr; + enum nl80211_dfs_state dfs_state; + unsigned int dfs_cac_ms; + int max_antenna_gain; + int max_power; + int max_reg_power; + uint32_t orig_flags; + int orig_mpwr; }; struct cfg80211_bitrate_mask { From nobody Sun Aug 24 14:38:57 2025 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 4c8xPt1KFWz65XjF; Sun, 24 Aug 2025 14:38:58 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8xPs5Cn5z3Wnf; Sun, 24 Aug 2025 14:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046337; 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=4JM/Kkx/LcCyQsNPJgKsY8nQ6t98zE2ZVWfqun1Bgsw=; b=sg19SjO1YmsjY69Krly5BRhkqOhwOInVnbhkfyeiTm0ENdM4vGb14gJZPFbC7l3h8s3cky 6mkO9wKmBPM0n//+U3bmNGAseSnaHPHv/H/hhgNBU9xDA0QEe4/TVDgAmWOK61GswYqRbS Uhvu//4mFci3Ti+DsKVOe/IGUoIpYNzRLREZcps+8USfCirfaLsFGi4W2Ui/w1O2mRDCw3 5gK/FTwk82CZesRHsixOgiBCCQBedTZeZ7tzPp1mYZbrJmRcvExu+Nj/dnDg4ZnxEX5+K2 a7e7zwzB1WZH7rnkVQqmlkHc8ll6R3bmnLtMUUExxgjBtv73qmR1ZX5KSkq/zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046337; 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=4JM/Kkx/LcCyQsNPJgKsY8nQ6t98zE2ZVWfqun1Bgsw=; b=gNO7mn+qvddcm7oySX/FKJ8kX6GL+5rmg7Qy1XO08BU+JX+fbJI4OlK1jIh79fIy5tSy7H VKs1kGuLC0pZEvkv/frhrh0gQ6vaKid4iHmVkftBk4dzD8Wd7MzdkLQJ0O9BKybsXuBhaf UtpSFhPiV8t0r3vQH/8C5e/ZYfyCyTPvIfbs4dryDhO7SyPn8BKTh683w/VRqyNOcpQUMj x7NNoJAoiLO264P1TQ5GhjWgMVn0TeVOm7p680w3Cmz2NBfPRjGExTynDogH3GryWzjNn1 VodasZtBuTNIvQ2ReubrzX4L14HLng76cOovn/Kbme6TW96t+LpWnOF0M41YXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756046337; a=rsa-sha256; cv=none; b=Im+FZoLZ27kwudhlimqp3ymU/ht2yjGzm0BMukBpfO6VGh9JidnmfCTSfds2QxdLaV1iLa lYYGZxm78jmHmDFVfMNcqpE72y3DGz1pdePpMfoaCrsTuMhLbzlmekvTC4895EIf/qyS1c 26q/lTPJNprTxMP5p3E9nT44Fqv9JZVu0lj3aovk4WfX5HS0lITvuLa8jYyl/Q76CytRQH h2PkcHly2QzyouwSWVHGOj47JsxoPTyU0RtWa2ield273lsvAAuISYzkEafcGJRsBf9m+m 8+PucKfgH+tT7BuCPYo+uRyE7TseBijwwy6iOfJ+370sDRO+sAErv0EQSdpofQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8xPs4kv6z15j5; Sun, 24 Aug 2025 14:38:57 +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 57OEcvsE040673; Sun, 24 Aug 2025 14:38:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OEcv0F040670; Sun, 24 Aug 2025 14:38:57 GMT (envelope-from git) Date: Sun, 24 Aug 2025 14:38:57 GMT Message-Id: <202508241438.57OEcv0F040670@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 60307068cf64 - main - LinuxKPi: 802.11: adjust linuxkpi_set_ieee80211_dev() to set ic_name 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60307068cf64700f5379c782ad98336d4d0f7390 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=60307068cf64700f5379c782ad98336d4d0f7390 commit 60307068cf64700f5379c782ad98336d4d0f7390 Author: Bjoern A. Zeeb AuthorDate: 2025-07-07 07:02:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-24 10:26:39 +0000 LinuxKPi: 802.11: adjust linuxkpi_set_ieee80211_dev() to set ic_name While we used to pass in the dev_name(), we now use wiphy_dev() inside the implementation to get the dev and the name. This is for two reasons: (1) ath1xk also unset the dev and we need to check once we add support, and (2) in preparation for future work, which needs to hook into that point. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 4 ++-- sys/compat/linuxkpi/common/src/linux_80211.c | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 2ed595095f9e..c667ddea1085 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1135,7 +1135,7 @@ extern const struct cfg80211_ops linuxkpi_mac80211cfgops; struct ieee80211_hw *linuxkpi_ieee80211_alloc_hw(size_t, const struct ieee80211_ops *); void linuxkpi_ieee80211_iffree(struct ieee80211_hw *); -void linuxkpi_set_ieee80211_dev(struct ieee80211_hw *, char *); +void linuxkpi_set_ieee80211_dev(struct ieee80211_hw *); int linuxkpi_ieee80211_ifattach(struct ieee80211_hw *); void linuxkpi_ieee80211_ifdetach(struct ieee80211_hw *); void linuxkpi_ieee80211_unregister_hw(struct ieee80211_hw *); @@ -1255,7 +1255,7 @@ SET_IEEE80211_DEV(struct ieee80211_hw *hw, struct device *dev) { set_wiphy_dev(hw->wiphy, dev); - linuxkpi_set_ieee80211_dev(hw, dev_name(dev)); + linuxkpi_set_ieee80211_dev(hw); IMPROVE(); } diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 45e4aa1639ab..eb270fe7c8f6 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -6048,17 +6048,30 @@ linuxkpi_ieee80211_iffree(struct ieee80211_hw *hw) } void -linuxkpi_set_ieee80211_dev(struct ieee80211_hw *hw, char *name) +linuxkpi_set_ieee80211_dev(struct ieee80211_hw *hw) { struct lkpi_hw *lhw; struct ieee80211com *ic; + struct device *dev; lhw = HW_TO_LHW(hw); ic = lhw->ic; - /* Now set a proper name before ieee80211_ifattach(). */ + /* Save the backpointer from net80211 to LinuxKPI. */ ic->ic_softc = lhw; - ic->ic_name = name; + + /* + * Set a proper name before ieee80211_ifattach() if dev is set. + * ath1xk also unset the dev so we need to check. + */ + dev = wiphy_dev(hw->wiphy); + if (dev != NULL) { + ic->ic_name = dev_name(dev); + } else { + TODO("adjust arguments to still have the old dev or go through " + "the hoops of getting the bsddev from hw and detach; " + "or do in XXX; check ath1kx drivers"); + } /* XXX-BZ do we also need to set wiphy name? */ } From nobody Sun Aug 24 14:38:59 2025 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 4c8xPw3Vnnz65XLp; Sun, 24 Aug 2025 14:39:00 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8xPv751Yz3WgN; Sun, 24 Aug 2025 14:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046340; 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=D8uErg5CuND2ncrhRsSm22AytJEExr+vKN2rKGoD77g=; b=VpOffwv1ctacWUhy7MDS/vLvwDyFII+gzzvr9bGXQJOoThrHuiiIkaOd10+aa8bzyMaHHt q9oEOhbY4bVZfjIAwtILhkXhBaP48ysqtW1UqCJif6C6MhvvQVO2XkhfDz9JfAoryQ02Hj 4RwvO+ZuO/jPGyvCpREzU1LLqlsUa50baLjA0ZluV1uH1swK1wJmHXdOPNVcWMkNRaTeY8 PFzvzgok4S0KfttsUtINBZ7/WmoD41mIrV9wsqeI6N0IX60Y9yCfu58rPFcDZRN9CFnjaa XjOe8GzDrmD7KPZhJEX/2du5DFh+bZ+rBpANthKWM8i8aKlX4Kc1FSC8IibWrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046340; 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=D8uErg5CuND2ncrhRsSm22AytJEExr+vKN2rKGoD77g=; b=aCDsccWssyo/Eepv4Qt/xvu0gEQssUHHcgcL0NgwuYmR+GhvhWBkXb3yFE6qDpGc+dBXh6 c+t0xBCWrUCjUcuWsPFzoIOnbChD1xyc+YvlPeVXZOlCEUr+7hEkilA8R4vd5ofKAuZeMh WJMWSdWlmuytIS7cLmzl0v3Vr9bnw54LKrE47fPSIiFsRm1w+UE/qFvjNebQzHK0k+Pac8 6R4bw3kB21F7Cr8kUQDckKC7hauGXYv/2nrUXV1EalEDMh3J1TmTwaWqnEwC1oB/R9IVrM k8lCj/FRs200eNxt35fSeY8QlcU4lRe6SGTf9T/woM/CTT89+oVhuHMgbgk9ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756046340; a=rsa-sha256; cv=none; b=w64XTH2Uv9pAPDlf8hgy55BuVyBr0qjcLh2S4qBz4qIG9XuCdPppXYCPQJnIDop2cO4qvY v+CBrh93F1SUrcbpfR/Rjr9c5Qv5vuTQ7yvJ3R9dXmqziItexs4rpy6olK05q+8iZ+yuZS +6OAq5CqJMxKdCIugPCWchaUgWbERhN7+0l/9s93CC9aF5IcuwpB8ovoFYDypO9sdqwJCu y9XYD1c8lBdIniEHOaB78QfiydWM9dh1kSI6obanVOKP5mX19b3s7S5IEH+yAxdsVjQ0+o qFfkKFVUfgMnR7hSniys8qVXB/wU3LiGl2boxGQjYDq1ModONgwIiQ0qDpEuRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8xPv6hLhz165N; Sun, 24 Aug 2025 14:38:59 +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 57OEcxp8040748; Sun, 24 Aug 2025 14:38:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OEcxrm040745; Sun, 24 Aug 2025 14:38:59 GMT (envelope-from git) Date: Sun, 24 Aug 2025 14:38:59 GMT Message-Id: <202508241438.57OEcxrm040745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b3b61079ccc2 - main - LinuxKPI: 802.11: fill in sinfo for chains in case driver does not 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3b61079ccc24792f1410840e42c36f71b9cab9f Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b3b61079ccc24792f1410840e42c36f71b9cab9f commit b3b61079ccc24792f1410840e42c36f71b9cab9f Author: Bjoern A. Zeeb AuthorDate: 2025-06-14 00:23:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-24 10:26:44 +0000 LinuxKPI: 802.11: fill in sinfo for chains in case driver does not We are getting per-packet information on the rx chains. Save them locally like we do for rx rate and add them to sinfo for the sysctl in case the driver does not fill in that information. Also note: chain_signal is a bitmask and not a number; treat it accordingly. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index eb270fe7c8f6..91836b857727 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -325,6 +325,14 @@ lkpi_80211_dump_stas(SYSCTL_HANDLER_ARGS) memcpy(&sinfo.rxrate, &lsta->sinfo.rxrate, sizeof(sinfo.rxrate)); sinfo.filled |= BIT_ULL(NL80211_STA_INFO_RX_BITRATE); } + /* If no CHAIN_SIGNAL is reported, try to fill it in from the lsta sinfo. */ + if ((sinfo.filled & BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL)) == 0 && + (lsta->sinfo.filled & BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL)) != 0) { + sinfo.chains = lsta->sinfo.chains; + memcpy(sinfo.chain_signal, lsta->sinfo.chain_signal, + sizeof(sinfo.chain_signal)); + sinfo.filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL); + } lkpi_nl80211_sta_info_to_str(&s, " nl80211_sta_info (valid fields)", sinfo.filled); sbuf_printf(&s, " connected_time %u inactive_time %u\n", @@ -341,11 +349,12 @@ lkpi_80211_dump_stas(SYSCTL_HANDLER_ARGS) sbuf_printf(&s, " signal %d signal_avg %d ack_signal %d avg_ack_signal %d\n", sinfo.signal, sinfo.signal_avg, sinfo.ack_signal, sinfo.avg_ack_signal); - - sbuf_printf(&s, " generation %d assoc_req_ies_len %zu chains %d\n", + sbuf_printf(&s, " generation %d assoc_req_ies_len %zu chains %#04x\n", sinfo.generation, sinfo.assoc_req_ies_len, sinfo.chains); - for (int i = 0; i < sinfo.chains && i < IEEE80211_MAX_CHAINS; i++) { + for (int i = 0; i < nitems(sinfo.chain_signal) && i < IEEE80211_MAX_CHAINS; i++) { + if (!(sinfo.chains & BIT(i))) + continue; sbuf_printf(&s, " chain[%d] signal %d signal_avg %d\n", i, (int8_t)sinfo.chain_signal[i], (int8_t)sinfo.chain_signal_avg[i]); } @@ -6881,9 +6890,17 @@ lkpi_convert_rx_status(struct ieee80211_hw *hw, struct lkpi_sta *lsta, rx_stats->c_pktflags |= IEEE80211_RX_F_FAIL_FCSCRC; #endif + /* Fill in some sinfo bits to fill gaps not reported byt the driver. */ if (lsta != NULL) { memcpy(&lsta->sinfo.rxrate, &rxrate, sizeof(rxrate)); lsta->sinfo.filled |= BIT_ULL(NL80211_STA_INFO_RX_BITRATE); + + if (rx_status->chains != 0) { + lsta->sinfo.chains = rx_status->chains; + memcpy(lsta->sinfo.chain_signal, rx_status->chain_signal, + sizeof(lsta->sinfo.chain_signal)); + lsta->sinfo.filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL); + } } } From nobody Sun Aug 24 14:38:58 2025 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 4c8xPv23PYz65XFr; Sun, 24 Aug 2025 14:38:59 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8xPt68xwz3Wqf; Sun, 24 Aug 2025 14:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046338; 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=9Mw3yIg6+bRtJcx7tJ0GoJeO3+Y4lbfevdkceXTUXg0=; b=ZsD9lgFESVSEAQdD8o5UccMfynQh3H1Un3CC+MU+dvG0KVPuJKXleB7SELDHRGcdv478Qs RQzGwhHEo+EscheWwa3ob+nbHj5SnxQiE/eXYD1baiZ3M8c+H0Va6ptYUoAkxwoOoOoW8z QmwOUobD8ptXmjll5ikxqwYjH0i1LNCBAIWotN1M0Xa53/RJvy+4d5TLrup0y7W75IuqIh D+h2I5olPl29OyQ7cVDoIZqlsT/yRtMaAO/GrQqXx8ALb9js8DhpDQXPGm8xhHfSvyg0TD +Sn0X0zWK+Dzmxnm4urDdpTeJ7vu8rPMfmyUarkZc1QkwsMtdYCB+4mnJtthUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046338; 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=9Mw3yIg6+bRtJcx7tJ0GoJeO3+Y4lbfevdkceXTUXg0=; b=gYNPGiz3weEM2zwR82Vt8Ze2CZUrECuorQHmmmcPeTsdBfJcyj5rmlXgophd8LX7nfzmDk Gz0UoAi01JAB6vQTohmqT8OTpELPefU6tVojWNjmO+iHM8AZ+to+U5ZqAWNDTIc4YXkIZL xLWghhI+s/rkK8HPp575CGT2cIDXOenemX3JUCvGgZeIA156gUXSHFH+MjfbtoIoeqJ6LV Wi1yy3B3cVd4ZGZJs0qNqZUv4GIIMNoDVfgjZVL5jQOuRWAicIRy1C0lYykQ6wB4w99qvC Obn1mAbgZClMLJd8qvpGOzXr8P8oRpUD0fiCd+qDcB3ZS2RKCcvamJmL63j9Zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756046338; a=rsa-sha256; cv=none; b=IZiZAZWPb2XWc1ZOTVzpOVy/JYDhHw0SsQG29E3zWdPPsktTXcnOYgwzuZlmyUiOVCBwE6 vFyxFE7/xJc2X0J3SKvGFmDk9ex5QtSzYQR6kI8KQsOsO0QkVWvF71Os9cU7FgLKA5WPsj ShY+7WcHgJu0xmajOtoTlFVFp2pGmGndq+SN1pc2N2qcVQu6sQpRpa7u49OOe2p+N6j4pg i76JifuMO+TnDp3i+0gy3l9CsykExslA/WTWS63+GtzecVZ/4scPWDbgvgFooAqrgk4y4o V+61wDf2QlSd+KY0LmCFRpr33nWw6gme5t33MT23edrJGO6doD/TckD2ynjKfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8xPt5hPfz1645; Sun, 24 Aug 2025 14:38:58 +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 57OEcwDX040710; Sun, 24 Aug 2025 14:38:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OEcw1v040707; Sun, 24 Aug 2025 14:38:58 GMT (envelope-from git) Date: Sun, 24 Aug 2025 14:38:58 GMT Message-Id: <202508241438.57OEcw1v040707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b1e67b1a74d3 - main - LinuxKPI: 802.11: improve ieee80211_request_smps() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1e67b1a74d33e7a26e53886750a48f070a47226 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b1e67b1a74d33e7a26e53886750a48f070a47226 commit b1e67b1a74d33e7a26e53886750a48f070a47226 Author: Bjoern A. Zeeb AuthorDate: 2025-08-24 08:28:30 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-24 10:26:44 +0000 LinuxKPI: 802.11: improve ieee80211_request_smps() Adjust logging from TODO() to IMPROVE() now that we can use fmt strings there too. Make sure we are not getting unsuported values to print. Also for non-station mode simply return. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index c667ddea1085..19f7bcff29dc 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1741,12 +1741,15 @@ ieee80211_request_smps(struct ieee80211_vif *vif, u_int link_id, "SMPS_STATIC", "SMPS_DYNAMIC", "SMPS_AUTOMATIC", - "SMPS_NUM_MODES" }; - if (linuxkpi_debug_80211 & D80211_TODO) - printf("%s:%d: XXX LKPI80211 TODO smps %d %s\n", - __func__, __LINE__, smps, smps_mode_name[smps]); + if (vif->type != NL80211_IFTYPE_STATION) + return; + + if (smps >= nitems(smps_mode_name)) + panic("%s: unsupported smps value: %d\n", __func__, smps); + + IMPROVE("XXX LKPI80211 TODO smps %d %s\n", smps, smps_mode_name[smps]); } static __inline void From nobody Sun Aug 24 14:39:00 2025 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 4c8xPx4lVWz65Xp3; Sun, 24 Aug 2025 14:39:01 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8xPx1BmXz3X0V; Sun, 24 Aug 2025 14:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046341; 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=k844TtlFwvm7Cp0eIXGssfrdlIljnyt4ckd/UtvtakQ=; b=umSh1UWoBAbuZSc6gySg2RAAYyLsjJid+BEVDTH6KGj2JPuci8YYpDH33rP9tG7C7ICZLU u6Uh3UQ1mqOI7cCryuTIte6vkzWXFlvBoRuXkQB6VaFthKqjCWD7+jPxX7dJDGfL0PiDz7 tcputabZr2CPKhWRRsRgcTXl14Gh+J8G3oFc5VoksMOvL2T/hNQb+eh9ktNnrBjMQtNyA7 bZIwPgascLNjz9gmBO/pK24KHnqnXyhOAO9pTiKsZLLdanRv9v0VoqRJ1sv/BtjjnqOsB/ KmQK8AH0tCEEML8+kW7GXYjrWCGuM807wPS2FmpP3Q27iay7+piPy2DQ6VPOLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046341; 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=k844TtlFwvm7Cp0eIXGssfrdlIljnyt4ckd/UtvtakQ=; b=P8Rbc0Hmp7uwF9aC/+ah2j4rOfGE+NXgtenr9VvL2AFO/B1jZH2EubvqaPnIYVp8W932kC shLaGfobGHuTTQ518BGSC5emhO4dtnZauMKAqlEbnCBdhQsiuWUaO3eQ5zj4u8oOSmPbf+ J1/H6gwEJ+WaOaRNnU0CeLT8lpMKL6ZH+xrOGfrPITaCkXMdYOco/Y7huB0ylQVXqdQCX2 m/+d3ojha9qq/iZrEq0mw/Ld5z4cccEvDYTk5PsjCMCw8Q3cl1Bdt6QqCQr9NBc5u4ShLN pM4zPxs4doYbc8q/ad1Pr1LN8zMGp3KUOIidgjOojpPw3GrKCLc5lYQrgPLJlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756046341; a=rsa-sha256; cv=none; b=ICO9soF0rSOnjf2Im9CWx+7CgHrJVmVKMT6jc/uRmwK+CO8x5CyLFAUR/kkdjHDEcIrUl+ SwZtN3qnNjCG77cDQLYd642bSzxIw9XxLh2k8kuDxmN1OdCqBh0VHxVASvbIuV6WAi2VHX CcnWGiAOzVP+VmrZNYPtjSaGltlv8HwZtoiWeEiy5aS6ymOuLUmeuIrhN/RG/+4G7BgtCs tj7tMJmQuXZe/A1AX8UZgZ/M3aTw++ixXmzVvDGJbDeKEJTxdwfZzcA9DOjJA/Db+hLbTA TRCTpCfMhu82455mxsU1nU59DVbOcQYuE8yKf3cU86xteTsmLZzS+kFfhbzAmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c8xPx0f6Xz16ZC; Sun, 24 Aug 2025 14:39:01 +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 57OEd0QA040791; Sun, 24 Aug 2025 14:39:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OEd0ai040788; Sun, 24 Aug 2025 14:39:00 GMT (envelope-from git) Date: Sun, 24 Aug 2025 14:39:00 GMT Message-Id: <202508241439.57OEd0ai040788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a086478e58bf - main - LinuxKPI: 802.11: factor out sinfo printing 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a086478e58bf398cc9892fba6bc0122a56b87a97 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a086478e58bf398cc9892fba6bc0122a56b87a97 commit a086478e58bf398cc9892fba6bc0122a56b87a97 Author: Bjoern A. Zeeb AuthorDate: 2025-07-10 10:24:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-24 10:26:44 +0000 LinuxKPI: 802.11: factor out sinfo printing Factor out the sinfo printing into an sbuf from the sysctl handler. That allows us to use lkpi_80211_dump_lvif_stas() for printing other debug information as well. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 62 ++++++++++++++++------------ 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 91836b857727..500c1c1d52eb 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -274,48 +274,40 @@ lkpi_nl80211_sta_info_to_str(struct sbuf *s, const char *prefix, sbuf_printf(s, "\n"); } -static int -lkpi_80211_dump_stas(SYSCTL_HANDLER_ARGS) +static void +lkpi_80211_dump_lvif_stas(struct lkpi_vif *lvif, struct sbuf *s) { struct lkpi_hw *lhw; struct ieee80211_hw *hw; struct ieee80211vap *vap; - struct lkpi_vif *lvif; struct ieee80211_vif *vif; struct lkpi_sta *lsta; struct ieee80211_sta *sta; struct station_info sinfo; - struct sbuf s; int error; - if (req->newptr) - return (EPERM); - - lvif = (struct lkpi_vif *)arg1; vif = LVIF_TO_VIF(lvif); vap = LVIF_TO_VAP(lvif); lhw = vap->iv_ic->ic_softc; hw = LHW_TO_HW(lhw); - sbuf_new_for_sysctl(&s, NULL, 1024, req); - wiphy_lock(hw->wiphy); list_for_each_entry(lsta, &lvif->lsta_list, lsta_list) { sta = LSTA_TO_STA(lsta); - sbuf_putc(&s, '\n'); - sbuf_printf(&s, "lsta %p sta %p added_to_drv %d\n", lsta, sta, lsta->added_to_drv); + sbuf_putc(s, '\n'); + sbuf_printf(s, "lsta %p sta %p added_to_drv %d\n", lsta, sta, lsta->added_to_drv); memset(&sinfo, 0, sizeof(sinfo)); error = lkpi_80211_mo_sta_statistics(hw, vif, sta, &sinfo); if (error == EEXIST) /* Not added to driver. */ continue; if (error == ENOTSUPP) { - sbuf_printf(&s, " sta_statistics not supported\n"); + sbuf_printf(s, " sta_statistics not supported\n"); continue; } if (error != 0) { - sbuf_printf(&s, " sta_statistics failed: %d\n", error); + sbuf_printf(s, " sta_statistics failed: %d\n", error); continue; } @@ -334,51 +326,67 @@ lkpi_80211_dump_stas(SYSCTL_HANDLER_ARGS) sinfo.filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL); } - lkpi_nl80211_sta_info_to_str(&s, " nl80211_sta_info (valid fields)", sinfo.filled); - sbuf_printf(&s, " connected_time %u inactive_time %u\n", + lkpi_nl80211_sta_info_to_str(s, " nl80211_sta_info (valid fields)", sinfo.filled); + sbuf_printf(s, " connected_time %u inactive_time %u\n", sinfo.connected_time, sinfo.inactive_time); - sbuf_printf(&s, " rx_bytes %ju rx_packets %u rx_dropped_misc %u\n", + sbuf_printf(s, " rx_bytes %ju rx_packets %u rx_dropped_misc %u\n", (uintmax_t)sinfo.rx_bytes, sinfo.rx_packets, sinfo.rx_dropped_misc); - sbuf_printf(&s, " rx_duration %ju rx_beacon %u rx_beacon_signal_avg %d\n", + sbuf_printf(s, " rx_duration %ju rx_beacon %u rx_beacon_signal_avg %d\n", (uintmax_t)sinfo.rx_duration, sinfo.rx_beacon, (int8_t)sinfo.rx_beacon_signal_avg); - sbuf_printf(&s, " tx_bytes %ju tx_packets %u tx_failed %u\n", + sbuf_printf(s, " tx_bytes %ju tx_packets %u tx_failed %u\n", (uintmax_t)sinfo.tx_bytes, sinfo.tx_packets, sinfo.tx_failed); - sbuf_printf(&s, " tx_duration %ju tx_retries %u\n", + sbuf_printf(s, " tx_duration %ju tx_retries %u\n", (uintmax_t)sinfo.tx_duration, sinfo.tx_retries); - sbuf_printf(&s, " signal %d signal_avg %d ack_signal %d avg_ack_signal %d\n", + sbuf_printf(s, " signal %d signal_avg %d ack_signal %d avg_ack_signal %d\n", sinfo.signal, sinfo.signal_avg, sinfo.ack_signal, sinfo.avg_ack_signal); - sbuf_printf(&s, " generation %d assoc_req_ies_len %zu chains %#04x\n", + sbuf_printf(s, " generation %d assoc_req_ies_len %zu chains %#04x\n", sinfo.generation, sinfo.assoc_req_ies_len, sinfo.chains); for (int i = 0; i < nitems(sinfo.chain_signal) && i < IEEE80211_MAX_CHAINS; i++) { if (!(sinfo.chains & BIT(i))) continue; - sbuf_printf(&s, " chain[%d] signal %d signal_avg %d\n", + sbuf_printf(s, " chain[%d] signal %d signal_avg %d\n", i, (int8_t)sinfo.chain_signal[i], (int8_t)sinfo.chain_signal_avg[i]); } /* assoc_req_ies, bss_param, sta_flags */ - sbuf_printf(&s, " rxrate: flags %b bw %u(%s) legacy %u kbit/s mcs %u nss %u\n", + sbuf_printf(s, " rxrate: flags %b bw %u(%s) legacy %u kbit/s mcs %u nss %u\n", sinfo.rxrate.flags, CFG80211_RATE_INFO_FLAGS_BITS, sinfo.rxrate.bw, lkpi_rate_info_bw_to_str(sinfo.rxrate.bw), sinfo.rxrate.legacy * 100, sinfo.rxrate.mcs, sinfo.rxrate.nss); - sbuf_printf(&s, " he_dcm %u he_gi %u he_ru_alloc %u eht_gi %u\n", + sbuf_printf(s, " he_dcm %u he_gi %u he_ru_alloc %u eht_gi %u\n", sinfo.rxrate.he_dcm, sinfo.rxrate.he_gi, sinfo.rxrate.he_ru_alloc, sinfo.rxrate.eht_gi); - sbuf_printf(&s, " txrate: flags %b bw %u(%s) legacy %u kbit/s mcs %u nss %u\n", + sbuf_printf(s, " txrate: flags %b bw %u(%s) legacy %u kbit/s mcs %u nss %u\n", sinfo.txrate.flags, CFG80211_RATE_INFO_FLAGS_BITS, sinfo.txrate.bw, lkpi_rate_info_bw_to_str(sinfo.txrate.bw), sinfo.txrate.legacy * 100, sinfo.txrate.mcs, sinfo.txrate.nss); - sbuf_printf(&s, " he_dcm %u he_gi %u he_ru_alloc %u eht_gi %u\n", + sbuf_printf(s, " he_dcm %u he_gi %u he_ru_alloc %u eht_gi %u\n", sinfo.txrate.he_dcm, sinfo.txrate.he_gi, sinfo.txrate.he_ru_alloc, sinfo.txrate.eht_gi); } wiphy_unlock(hw->wiphy); +} + +static int +lkpi_80211_dump_stas(SYSCTL_HANDLER_ARGS) +{ + struct lkpi_vif *lvif; + struct sbuf s; + + if (req->newptr) + return (EPERM); + + lvif = (struct lkpi_vif *)arg1; + + sbuf_new_for_sysctl(&s, NULL, 1024, req); + + lkpi_80211_dump_lvif_stas(lvif, &s); sbuf_finish(&s); sbuf_delete(&s); From nobody Sun Aug 24 19:21:10 2025 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 4c93gW3QfSz65tyX; Sun, 24 Aug 2025 19:21:11 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c93gV3V5tz49Mr; Sun, 24 Aug 2025 19:21:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756063270; 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=SawpOdnhqj5UgXi15GZ2sRKnQoJ5+P7QXHL+geGPXeI=; b=yEbPGbhsf3UlFlrJzrdrzq4dhfooFn3mXRdA0pUj0djeWeh43SEHBjNAyf/GmoUQShRDaT Y8EUFmCsPW0Gcg5lii7nAJDZrKezVFHTvll8RCr8mZ77yyggLh0hKEJLtwuUTWS/DZ8pR2 KTv3duYWZr9+5W8C8+68Fbc0gH3SbgGx2QPYODp9Y6qyqHN3hbZ/xQoj+gjjcTsr+Tn8jQ fGF7MOZv3yy1A7n1GaW+BqbNHT/4D6bznDBuckTj5VhyfOabCugBt3h3GT6ZEzwJtYIgXl CadTCFVfV+7dcZyqxCLTNEdjRgC6o6Q1MtHRbivEIZhKsWFP0UO5c+99x6BYFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756063270; 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=SawpOdnhqj5UgXi15GZ2sRKnQoJ5+P7QXHL+geGPXeI=; b=gF3WeRUZmcfYo6cIgIHmjQY9cB2w+T28lfCz8fGHwRGhYBxMjtSnraRCFjMZZSO817fgA7 wQd30PkpvnW0pI1sHxq9uVtbPLQPAmKji3rwYY6gNS406ZkWnH/hzWpJbApgfS+YQEAANr BEfD8GqfLuidBsewyGYSSCKLmMX1Ir9vOSOLP8wFNcwcmyvXgt5cBFVWt/vtB3w6H77CbX xnpX1DS3hVL/Su6Rb7749TlfuqRQO+ZuvL8f9KgZ66SBiirEkBegZQ8yfB2nqooI/51s66 g6zdTUyNfFOMVMDhEAkYaPEmAgu3VENsuogItCLmLsClzJOlJTbUeWKVB0z5jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756063270; a=rsa-sha256; cv=none; b=qR1Xi5GC6LkAvIv3jYt4aC++DyqemyXWHWcK3bN8NiwY+1UAt+XbmJkWYMCPgzPYrH4G0v OQq8BEOPmIoTpfZXo7uW0sZZbSuj4KbEw3JmKFhrsGAO9YmEEm37lj8D87NaYnnXjXgk0f GxasN5X6fXB50OTpLjf4rI2a48Jyu1AJg+PvCGJyj/zlsBNl3loTJuSLXSvd0TEJoQI6wN S2RlpwdkIiKaf9uDPB5y/+rIAlFZBkbzLjirFc409q5SWZZkGQuMb1E13kYFai398zkEmn 8mFTj62B77aRx0/4wgoV9ElO8RNtA72pBWnmgmgRAKw3wJ/TNfCDE7dKBUrPvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c93gV2y2Kz1cP; Sun, 24 Aug 2025 19:21:10 +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 57OJLA5l081707; Sun, 24 Aug 2025 19:21:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OJLAxT081704; Sun, 24 Aug 2025 19:21:10 GMT (envelope-from git) Date: Sun, 24 Aug 2025 19:21:10 GMT Message-Id: <202508241921.57OJLAxT081704@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2b35b717188a - main - amd64 vmx: micro-optimize vmlaunch failure path 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b35b717188adb843de100c4221ec1ded13024f0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2b35b717188adb843de100c4221ec1ded13024f0 commit 2b35b717188adb843de100c4221ec1ded13024f0 Author: Konstantin Belousov AuthorDate: 2025-08-23 12:52:08 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-24 16:28:47 +0000 amd64 vmx: micro-optimize vmlaunch failure path Eliminate two unneeded jumps. One is the jmp to the next instruction, where there is no requrement that vmlaunch is followed by jmp. Another one conditionally sets %r11d value, and can be replaced by cmovcc. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D52136 --- sys/amd64/vmm/intel/vmx_support.S | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/amd64/vmm/intel/vmx_support.S b/sys/amd64/vmm/intel/vmx_support.S index 130130b64541..877e377f892d 100644 --- a/sys/amd64/vmm/intel/vmx_support.S +++ b/sys/amd64/vmm/intel/vmx_support.S @@ -171,13 +171,11 @@ do_launch: */ movq %rsp, %rdi /* point %rdi back to 'vmxctx' */ movl $VMX_VMLAUNCH_ERROR, %eax - jmp decode_inst_error - + /* FALLTHROUGH */ decode_inst_error: movl $VM_FAIL_VALID, %r11d - jz inst_error - movl $VM_FAIL_INVALID, %r11d -inst_error: + movl $VM_FAIL_INVALID, %esi + cmovnzl %esi, %r11d movl %r11d, VMXCTX_INST_FAIL_STATUS(%rdi) /* From nobody Sun Aug 24 19:44:29 2025 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 4c94BP3pBcz65wMp; Sun, 24 Aug 2025 19:44:29 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c94BP3FXPz3FY8; Sun, 24 Aug 2025 19:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756064669; 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=NqzL9qH/Wv8e2j4mD1izpqzuF1WLIL+NgxBz34T3uHo=; b=bJIi3pgGr+DC9iKUL6r15zoAKwxAXcBupkL4o8kBO0s4mP99kX8dRVKo/GTgTNOcponbmj 794AWdSsWB2l5BMaijYkHz0jlyMYMe8WZSuvGXWKKAmP2Rn1wrKWnViRTUs94FFL0kdYm8 XtENPceC3pCfWgYbdlEaF7wrvj4B1DHAjbcwFclMSKigAZocqeh6kd78e6fbgSYEFITA+u axoet4C8Z+SQzSlsc/pjYIosnxRb2XTX53Y51Wkb1SlqieYr3iZiytQ0qs6Hzq+SYPcJit i258Qs30dU8PC/0hS+jedrNYHZx3RbS+rf+x9dKJIyrzD3cP5t9nOeaz5s78Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756064669; 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=NqzL9qH/Wv8e2j4mD1izpqzuF1WLIL+NgxBz34T3uHo=; b=wbq8IlJzpleagyWHSrks82Q6H9uNf9GIZf/aO2DA//niDA2G6d5KIGmen8o2BYhse0T+HT FZ0rjchN8Mt5DJiC+hT0sv5KRQDl2GcktN84pVyq2TCw2d6w3CL/GShkSt/GaMNSeiaWyK G2hMFxeodAC/blecjac0VRrzkj3zzlFneudgn97JZzEqkUsFNBYQo1cEBbHCzv2MFDvoP1 fVxEYN6+iFdSketdbPFN+Sjht+r2E+IwO8e1kOwamsaKmJz7mO2xvNfZ9iqaSuXB1LWsSM EH2qiTJH8Na4amjPtdNICqtc/s3KRZr268KqIBQa183dIH0O4MHQX6lxef4t2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756064669; a=rsa-sha256; cv=none; b=qSvoPTGDSpnhf1+PMbrZyGhZ7ducvGvHy9zC4f4Y+xa5SG4kttdfNkJIf3Ye1Lfg9znfiZ FfimET7IPWBgqM8mW5PjUIEP6NUt5BIfeGBwiKHGzHltIwQlYjESXT8t5Rn7NjpRqQWjQ7 viHWSoSTtZ7KRyPWMNUiuH7o9r5AZWkPPdNb0d6PyeCGxCsScV0ve2/pNZBDPXKrMgpVzw TUG28x7jNFmiCCMsvMx1HUlnAkOjL+/2RE1FYp8NAGE4rD3Q56zRlVh4Gzqxjn9Caq+kRO jQF934STwnmsqKxAjdIrwgy6+BVjEf3UJk3RgWKDd+Jg/CuEHF1UPSvVRi+x2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c94BP2j9Lz2Hw; Sun, 24 Aug 2025 19:44:29 +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 57OJiTIk024931; Sun, 24 Aug 2025 19:44:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OJiTVx024928; Sun, 24 Aug 2025 19:44:29 GMT (envelope-from git) Date: Sun, 24 Aug 2025 19:44:29 GMT Message-Id: <202508241944.57OJiTVx024928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: eabcd1773fa3 - main - net80211: add support for sequence number offloading 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eabcd1773fa3e4bf12ee053540a90fad79a6f81b Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=eabcd1773fa3e4bf12ee053540a90fad79a6f81b commit eabcd1773fa3e4bf12ee053540a90fad79a6f81b Author: Adrian Chadd AuthorDate: 2025-06-05 00:17:45 +0000 Commit: Adrian Chadd CommitDate: 2025-08-24 19:43:27 +0000 net80211: add support for sequence number offloading Add support for sequence number offloading - * Check IEEE80211_CONF_SEQNO_OFFLOAD() before doing TX lock manipulation; * Don't call ieee80211_output_seqno_assign() if IEEE80211_CONF_SEQNO_OFFLOAD() is true. TODO: * this doesn't yet do beacon sequence number allocation offloading; I'll tackle that later. Differential Revision: https://reviews.freebsd.org/D50692 Reviewed by: bz --- sys/net80211/ieee80211_freebsd.h | 22 ++++++++++++++++------ sys/net80211/ieee80211_output.c | 11 ++++++++--- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h index 141b13f9f740..3684fba52c5c 100644 --- a/sys/net80211/ieee80211_freebsd.h +++ b/sys/net80211/ieee80211_freebsd.h @@ -93,12 +93,22 @@ typedef struct { } while (0) #define IEEE80211_TX_LOCK_OBJ(_ic) (&(_ic)->ic_txlock.mtx) #define IEEE80211_TX_LOCK_DESTROY(_ic) mtx_destroy(IEEE80211_TX_LOCK_OBJ(_ic)) -#define IEEE80211_TX_LOCK(_ic) mtx_lock(IEEE80211_TX_LOCK_OBJ(_ic)) -#define IEEE80211_TX_UNLOCK(_ic) mtx_unlock(IEEE80211_TX_LOCK_OBJ(_ic)) -#define IEEE80211_TX_LOCK_ASSERT(_ic) \ - mtx_assert(IEEE80211_TX_LOCK_OBJ(_ic), MA_OWNED) -#define IEEE80211_TX_UNLOCK_ASSERT(_ic) \ - mtx_assert(IEEE80211_TX_LOCK_OBJ(_ic), MA_NOTOWNED) +#define IEEE80211_TX_LOCK(_ic) do { \ + if (!IEEE80211_CONF_SEQNO_OFFLOAD(_ic)) \ + mtx_lock(IEEE80211_TX_LOCK_OBJ(_ic)); \ + } while (0); +#define IEEE80211_TX_UNLOCK(_ic) do { \ + if (!IEEE80211_CONF_SEQNO_OFFLOAD(_ic)) \ + mtx_unlock(IEEE80211_TX_LOCK_OBJ(_ic)); \ + } while (0); +#define IEEE80211_TX_LOCK_ASSERT(_ic) do { \ + if (!IEEE80211_CONF_SEQNO_OFFLOAD(_ic)) \ + mtx_assert(IEEE80211_TX_LOCK_OBJ(_ic), MA_OWNED); \ + } while (0) +#define IEEE80211_TX_UNLOCK_ASSERT(_ic) { \ + if (!IEEE80211_CONF_SEQNO_OFFLOAD(_ic)) \ + mtx_assert(IEEE80211_TX_LOCK_OBJ(_ic), MA_NOTOWNED); \ + } while (0) /* * Stageq / ni_tx_superg lock diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index afe83ea0805c..57fe687adffe 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -974,7 +974,7 @@ ieee80211_send_setup( /* NB: zero out i_seq field (for s/w encryption etc) */ *(uint16_t *)&wh->i_seq[0] = 0; - } else + } else if (!IEEE80211_CONF_SEQNO_OFFLOAD(ni->ni_ic)) ieee80211_output_seqno_assign(ni, tid, m); if (IEEE80211_IS_MULTICAST(wh->i_addr1)) @@ -1810,7 +1810,8 @@ ieee80211_encap(struct ieee80211vap *vap, struct ieee80211_node *ni, * and we don't need the TX lock held. */ if ((m->m_flags & M_AMPDU_MPDU) == 0) { - ieee80211_output_seqno_assign(ni, tid, m); + if (!IEEE80211_CONF_SEQNO_OFFLOAD(ic)) + ieee80211_output_seqno_assign(ni, tid, m); } else { /* * NB: don't assign a sequence # to potential @@ -1828,7 +1829,9 @@ ieee80211_encap(struct ieee80211vap *vap, struct ieee80211_node *ni, *(uint16_t *)wh->i_seq = 0; } } else { - ieee80211_output_seqno_assign(ni, IEEE80211_NONQOS_TID, m); + if (!IEEE80211_CONF_SEQNO_OFFLOAD(ic)) + ieee80211_output_seqno_assign(ni, IEEE80211_NONQOS_TID, + m); /* * XXX TODO: we shouldn't allow EAPOL, etc that would * be forced to be non-QoS traffic to be A-MSDU encapsulated. @@ -3856,6 +3859,8 @@ ieee80211_beacon_update(struct ieee80211_node *ni, struct mbuf *m, int mcast) * If the driver identifies it does its own TX seqno management then * we can skip this (and still not do the TX seqno.) */ + + /* TODO: IEEE80211_CONF_SEQNO_OFFLOAD() */ ieee80211_output_beacon_seqno_assign(ni, m); /* XXX faster to recalculate entirely or just changes? */ From nobody Sun Aug 24 19:44:30 2025 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 4c94BQ6pZ9z65wkl; Sun, 24 Aug 2025 19:44:30 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c94BQ4GQLz3Fn7; Sun, 24 Aug 2025 19:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756064670; 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=o8SzkNCzNUr2TRdfrrYJnQZlIPuhNS838k4db2Z0ZEA=; b=LLZKqFe8DHYOigDHCqADhLM5Yi6VBjNMeMFICl/M7zfJwPODobxR8y9jVAqxybK2nSdPE+ QWfDZJMI5MRaCquuVLsIu/RNoWO/3RfTxrwkL/E0kmAQSqEiZTg5gpQwmIOrpQvmfHwazw sFURsdDzMhQicuZLre1arUxBuRRPiqaX9t2KKaTu6415ruV93Kdvkxhcc296WaPBieJzO4 FOaMuPWaduo2QMXwb8ysS9fzlEtNmobXNEvKTHcL0RVQNA9Sd4KgbkuTRqzPrz+v/FJMYg +8RzvQtYgj7gYbeYtFe3hsmwZIBaTBGTELd0h20QHlyQsQBSzgQQdptPuJGMrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756064670; 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=o8SzkNCzNUr2TRdfrrYJnQZlIPuhNS838k4db2Z0ZEA=; b=sfbpm+efssKx5S6o8+UbaP2lQramPmPi14ISc9cLvfotezQIuqPJ7O67jNuPf+57KTu43N WWuCxqpD/F4qKCHJlOkpwY72zD3EqUvwOGq0+xvE2SS2uWTQWUoUtH+j51bf0oqaX8H+Ul GI4iMoWgY9lL9/OUCPC3zhMF2yQ1++rQPKAIQtTeH20cZ2ZRzaPcH4UjAd3aSGWuREQiKR NoqRyDvdKpEMWGeFZGT1xsLwhXOGu3ATEQGD1dMI0b9CzpF85Yr55PI/kjX1LwISu5MYKI kv0xXXZmab2NGHf7mmBz1ksrZOAg7nz8quUe6kiyTyA4vxQxHEcDbTbuvUN9EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756064670; a=rsa-sha256; cv=none; b=HrjmXhwjX3fS5y7Bb2Qyjm/Hgca8MVw/0AMKR5Vmmnu4bm2tgYjQNr1qq8IEPtMPXOHg8J S7Jxl/yptLh0w1W/SjoLR6Oo2tgnJBNnqGPZ6i3drswZSjIDBhEANGVQu+/p9LHbsTBqZZ aFRHGbwwd6O6kARQlrgDKDINxwkeSz/M1Lhav3EvK9gV3+LYxsenqdGsaxktKq4m5NsFf/ 0W+13K9aHumEUSsD/dahS9p3GjOPmnYzLEQRf7BRjBv2KBUaiPaAhPXmIamI1sZXw/xg0M //sDMw7jGfpSWWKdP/gREax9PfQ13z5UULDs2exhRDZbgRdEBeyXXzHfTGM0oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c94BQ3lrMz1f6; Sun, 24 Aug 2025 19:44:30 +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 57OJiU7x024967; Sun, 24 Aug 2025 19:44:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OJiUhO024963; Sun, 24 Aug 2025 19:44:30 GMT (envelope-from git) Date: Sun, 24 Aug 2025 19:44:30 GMT Message-Id: <202508241944.57OJiUhO024963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 5bf3c5586b5e - main - iwx: enable seqno offload 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bf3c5586b5e8256af0c1a6916fb5fdc6c70b3c9 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=5bf3c5586b5e8256af0c1a6916fb5fdc6c70b3c9 commit 5bf3c5586b5e8256af0c1a6916fb5fdc6c70b3c9 Author: Adrian Chadd AuthorDate: 2025-06-05 03:50:33 +0000 Commit: Adrian Chadd CommitDate: 2025-08-24 19:44:06 +0000 iwx: enable seqno offload Enable sequence number offload. This should both enable the sequence number offloading and disable the net80211 TX lock from being acquired/released/checked. Reviewed by: bz, thj Differential Revision: https://reviews.freebsd.org/D50694 --- sys/dev/iwx/if_iwx.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c index d60ef1874a6c..1fe531d69933 100644 --- a/sys/dev/iwx/if_iwx.c +++ b/sys/dev/iwx/if_iwx.c @@ -5673,6 +5673,10 @@ iwx_tx(struct iwx_softc *sc, struct mbuf *m, struct ieee80211_node *ni) if (rinfo == NULL) return EINVAL; + /* Offloaded sequence number assignment */ + /* Note: Should be done in firmware on all supported devices */ + + /* Radiotap */ if (ieee80211_radiotap_active_vap(vap)) { struct iwx_tx_radiotap_header *tap = &sc->sc_txtap; @@ -5685,6 +5689,7 @@ iwx_tx(struct iwx_softc *sc, struct mbuf *m, struct ieee80211_node *ni) ieee80211_radiotap_tx(vap, m); } + /* Encrypt - CCMP via direct HW path, TKIP/WEP indirected openbsd-style for now */ if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) { k = ieee80211_crypto_get_txkey(ni, m); if (k == NULL) { @@ -10467,6 +10472,8 @@ iwx_attach(device_t dev) IEEE80211_C_BGSCAN /* capable of bg scanning */ ; ic->ic_flags_ext = IEEE80211_FEXT_SCAN_OFFLOAD; + /* Enable seqno offload */ + ic->ic_flags_ext |= IEEE80211_FEXT_SEQNO_OFFLOAD; ic->ic_txstream = 2; ic->ic_rxstream = 2; From nobody Sun Aug 24 19:49:08 2025 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 4c94Hm5GBzz65wtH; Sun, 24 Aug 2025 19:49: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c94Hm4kdRz3HVq; Sun, 24 Aug 2025 19:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756064948; 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=qPHiVafeFwSEbDcKzUoUwY/dHnda/8jqa9mTYrEQxE8=; b=nxHZ5eGbrSgNB3FzUwKKKn7C0W14ZVcjdQD0f7z/UHSvE6Q6oegdy6/QDQBZ3NGbzMd1wu QF7Ha/8fLgFRtRL8d6Z9P+BOQ20vyUpMIoxdvSRF5k8n3LhPwtemFNe4sJKF0aXTgUFsVp USieaMid8g/A4kKq5RPjx88gXbSVabE4Np07zFdSuRJIi2/DvsSWf2WpM6RAuN2gY4eO4w Vn2ezfxPJ7POJMpCgdhxnjITgT4goZq3990vzaYTPwfKaOv2UvYnqZJwLcOl0T4yW68vaZ AouNd15bGc/pUnAz7cg6O6naxq4gMUQ/trGrrNV0jdncMWc6BXDE7IMHVPUV4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756064948; 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=qPHiVafeFwSEbDcKzUoUwY/dHnda/8jqa9mTYrEQxE8=; b=X6mIS9fwxgAmIk0APLIcYYroRpF9Chl+znPtisF8RdpThViwBCPBpA87XSSjRStzLxthaK 6EVYuwPVOwmjDVFVP7dj+jeVz1zWGtA0KLdi/tHeO5uM2zxWG6kIH3zG0gtmiWxZsDoZtL 1EBgdPVx6buDOwKjD+75+uLYsjj10QMrPjvL5U6QeTuxWeYufFeQU3i1V4QleWdaMr0PS6 OvKR4d9Yk/tlf1SODt7JzEbMwrYz+LJkQ+PNZ1b0JLcZ3tHx4e+OEq+bQCaAkrwfrhkxSQ HiKbjiOtqg8x3Uw3IOLyTUDCdPMwjR+9+XsW1KK9OeQxApLbkqSUcH+IBzzuZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756064948; a=rsa-sha256; cv=none; b=B/4kMv+4wB6m6SEQ2H/wY5Kvs4pbcqdsqo8dZvnjQfdMPT8MEbfFjzIg+gy69dpjnLM7gu 60RL8wqnQLtqmQnCPW8e+sB1D77zoieeeQp0XANvZsbAI/rsjzH2egSXhDVSnvU1bdhoGZ t2vpSHQoFrTqQJBkAzRgu8XuMosURXD9d8eGPjuy6erBQHyX80J3JmJJad4oq3cd9KbYkd 8ZRnKIZLoIGAQnuI1png7WLSyDDRPUVqgy6vIks++nCHh7CxrDXl2YjH0bwzM3GaKYREZU GZ2Mt1W1y6QWzU1NyfGVmuCJkswx8DCbMlmuLOnmbtiDvY1MZw6HNjHQP0nYpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c94Hm485Kz2Lt; Sun, 24 Aug 2025 19:49:08 +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 57OJn8mB026453; Sun, 24 Aug 2025 19:49:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OJn8ax026450; Sun, 24 Aug 2025 19:49:08 GMT (envelope-from git) Date: Sun, 24 Aug 2025 19:49:08 GMT Message-Id: <202508241949.57OJn8ax026450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Igor Ostapenko Subject: git: 3eeeaf9cfbc1 - main - pf tests: Improve assertion messaging of mbuf tests 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: igoro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3eeeaf9cfbc102ceaf6614fd20f4fe2457c64b08 Auto-Submitted: auto-generated The branch main has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=3eeeaf9cfbc102ceaf6614fd20f4fe2457c64b08 commit 3eeeaf9cfbc102ceaf6614fd20f4fe2457c64b08 Author: Igor Ostapenko AuthorDate: 2025-08-24 19:47:41 +0000 Commit: Igor Ostapenko CommitDate: 2025-08-24 19:47:41 +0000 pf tests: Improve assertion messaging of mbuf tests Reviewed by: kp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51716 --- tests/sys/netpfil/pf/mbuf.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/sys/netpfil/pf/mbuf.sh b/tests/sys/netpfil/pf/mbuf.sh index e3f138bb73b9..3abae65203cd 100644 --- a/tests/sys/netpfil/pf/mbuf.sh +++ b/tests/sys/netpfil/pf/mbuf.sh @@ -69,22 +69,22 @@ inet_in_mbuf_len_body() # Should still work for m_len=0 jexec alcatraz pfilctl link -i dummymbuf:inet inet jexec alcatraz sysctl net.dummymbuf.rules="inet in ${epair}b pull-head 0;" - atf_check_equal "0" "$(jexec alcatraz sysctl -n net.dummymbuf.hits)" + atf_check_equal '0' '$(jexec alcatraz sysctl -n net.dummymbuf.hits)' atf_check -s exit:0 -o ignore ping -c1 192.0.2.2 - atf_check_equal "1" "$(jexec alcatraz sysctl -n net.dummymbuf.hits)" + atf_check_equal '1' '$(jexec alcatraz sysctl -n net.dummymbuf.hits)' # m_len=1 jexec alcatraz sysctl net.dummymbuf.rules="inet in ${epair}b pull-head 1;" jexec alcatraz sysctl net.dummymbuf.hits=0 atf_check -s exit:0 -o ignore ping -c1 192.0.2.2 - atf_check_equal "1" "$(jexec alcatraz sysctl -n net.dummymbuf.hits)" + atf_check_equal '1' '$(jexec alcatraz sysctl -n net.dummymbuf.hits)' # m_len=19 # provided IPv4 basic header is 20 bytes long, it should impact the dst addr jexec alcatraz sysctl net.dummymbuf.rules="inet in ${epair}b pull-head 19;" jexec alcatraz sysctl net.dummymbuf.hits=0 atf_check -s exit:0 -o ignore ping -c1 192.0.2.2 - atf_check_equal "1" "$(jexec alcatraz sysctl -n net.dummymbuf.hits)" + atf_check_equal '1' '$(jexec alcatraz sysctl -n net.dummymbuf.hits)' } inet_in_mbuf_len_cleanup() { @@ -140,22 +140,22 @@ inet6_in_mbuf_len_body() # Should still work for m_len=0 jexec alcatraz pfilctl link -i dummymbuf:inet6 inet6 jexec alcatraz sysctl net.dummymbuf.rules="inet6 in ${epair}b pull-head 0;" - atf_check_equal "0" "$(jexec alcatraz sysctl -n net.dummymbuf.hits)" + atf_check_equal '0' '$(jexec alcatraz sysctl -n net.dummymbuf.hits)' atf_check -s exit:0 -o ignore ping -c1 2001:db8::2 - atf_check_equal "1" "$(jexec alcatraz sysctl -n net.dummymbuf.hits)" + atf_check_equal '1' '$(jexec alcatraz sysctl -n net.dummymbuf.hits)' # m_len=1 jexec alcatraz sysctl net.dummymbuf.rules="inet6 in ${epair}b pull-head 1;" jexec alcatraz sysctl net.dummymbuf.hits=0 atf_check -s exit:0 -o ignore ping -c1 2001:db8::2 - atf_check_equal "1" "$(jexec alcatraz sysctl -n net.dummymbuf.hits)" + atf_check_equal '1' '$(jexec alcatraz sysctl -n net.dummymbuf.hits)' # m_len=39 # provided IPv6 basic header is 40 bytes long, it should impact the dst addr jexec alcatraz sysctl net.dummymbuf.rules="inet6 in ${epair}b pull-head 39;" jexec alcatraz sysctl net.dummymbuf.hits=0 atf_check -s exit:0 -o ignore ping -c1 2001:db8::2 - atf_check_equal "1" "$(jexec alcatraz sysctl -n net.dummymbuf.hits)" + atf_check_equal '1' '$(jexec alcatraz sysctl -n net.dummymbuf.hits)' } inet6_in_mbuf_len_cleanup() { @@ -205,29 +205,29 @@ ethernet_in_mbuf_len_body() # Should still work for m_len=0 jexec alcatraz pfilctl link -i dummymbuf:ethernet ethernet jexec alcatraz sysctl net.dummymbuf.rules="ethernet in ${epair}b pull-head 0;" - atf_check_equal "0" "$(jexec alcatraz sysctl -n net.dummymbuf.hits)" + atf_check_equal '0' '$(jexec alcatraz sysctl -n net.dummymbuf.hits)' atf_check -s exit:0 -o ignore ping -c1 192.0.2.2 - atf_check_equal "1" "$(jexec alcatraz sysctl -n net.dummymbuf.hits)" + atf_check_equal '1' '$(jexec alcatraz sysctl -n net.dummymbuf.hits)' # m_len=1 jexec alcatraz sysctl net.dummymbuf.rules="ethernet in ${epair}b pull-head 1;" jexec alcatraz sysctl net.dummymbuf.hits=0 atf_check -s exit:0 -o ignore ping -c1 192.0.2.2 - atf_check_equal "1" "$(jexec alcatraz sysctl -n net.dummymbuf.hits)" + atf_check_equal '1' '$(jexec alcatraz sysctl -n net.dummymbuf.hits)' # m_len=11 # for the simplest L2 Ethernet frame it should impact src field jexec alcatraz sysctl net.dummymbuf.rules="ethernet in ${epair}b pull-head 11;" jexec alcatraz sysctl net.dummymbuf.hits=0 atf_check -s exit:0 -o ignore ping -c1 192.0.2.2 - atf_check_equal "1" "$(jexec alcatraz sysctl -n net.dummymbuf.hits)" + atf_check_equal '1' '$(jexec alcatraz sysctl -n net.dummymbuf.hits)' # m_len=13 # provided L2 Ethernet simplest header is 14 bytes long, it should impact ethertype field jexec alcatraz sysctl net.dummymbuf.rules="ethernet in ${epair}b pull-head 13;" jexec alcatraz sysctl net.dummymbuf.hits=0 atf_check -s exit:0 -o ignore ping -c1 192.0.2.2 - atf_check_equal "1" "$(jexec alcatraz sysctl -n net.dummymbuf.hits)" + atf_check_equal '1' '$(jexec alcatraz sysctl -n net.dummymbuf.hits)' } ethernet_in_mbuf_len_cleanup() { From nobody Sun Aug 24 20:30:02 2025 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 4c95By6g9Zz66047 for ; Sun, 24 Aug 2025 20:30:02 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c95By5dP8z3M6D; Sun, 24 Aug 2025 20:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756067402; 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=xaTpYY2e50M1IWLDT1vbHl8eY6ejSh6vWNBoPvrwCLA=; b=n6PgiyGugUd7tej9eEKQUkQQ+2xQRAQ26JkYUW/rjnxoxwGqIdD6mroUS+glAQvJSopjYw KAXh8yCACIY5HMjpchje2AnvNf31g8BM/5OwIMsKwGZITleF6Yar/42ItMkmOEt9LXHE5z 7V0cQUr+ITl3kUhf5hxFoiNRIvRd7JG1ztY5T6IrEFZ89/PqSXxFYokOSrJWXrd4iJG8E/ W27HVIY/gHsfxHoha56cjyTFmmOA/bJje3isaMkU0Hfe60fDSNkIo0STHliRfqcaQsi1Rq FASgkILYZgMyX6LjFP9YX/diFprGa8j+7ixJdYjyEOA+zZuwS9mBtpusQyGXIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756067402; 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=xaTpYY2e50M1IWLDT1vbHl8eY6ejSh6vWNBoPvrwCLA=; b=ZbkxjRMVE9Ni7u9qjjbAHiUQ1ex0e4fqAdEa8Ig3m3kMXkWBCWePB1b2+Ag6TQaxB8+gQQ O4fdcAIEWOMI1QybagyMZK4Rj74SitucsHKx1VT5Ok8s2n9tMTfDfUUsk6iSWp5K1d8vz4 dkk1+m8fj44FL+wcsObU+sJADJrVxbez5xjobYvhDNfQgY2T/HNg/GBxuMN9DZmmEh1jg6 RyBGu1v0R94iNiwGtgTb6eIvzNkolFpy2G8law7Oeta+KU94TO2CuJT0gafg6Ds/WCgjpv HI0kOGrwGV4CNFGjFM4co5H/4ymtMkrHHvQghTNyIHnYF7DABea6rdWPh8bmtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756067402; a=rsa-sha256; cv=none; b=dZP/NaLSj3gtSgrkpU1ITtrf2WcXBUjXputmTVfJFMVDnvdAFA5Z859/Wodl1vGjxpuHHK BRGk7AfvkSYGsaE4UpccMDcmZRq6yym4esVloeyztWqwTilsUSf2mT7W1w+JeeEzpft+/f rJtGhJxODQVMDrSA1r6mo/niliPjCUjDdqDAVwne90Dyw5VmID7KpbfWrBGendP50lkPak +JfFky54VsK7wF0wIda4j5quxWPOAmSbqvfLfVlaEk+0ONNme7HGtsaqCP5s13lwsQ9AUc 1oZkfWfqfOcbLzcxjQ60nHaNUm2/7i60DM9KpVjRCl5jUBYsUzE4j9aMnJnycw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c95By52Wjz3ZM; Sun, 24 Aug 2025 20:30:02 +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 57OKU23t004913; Sun, 24 Aug 2025 20:30:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OKU28j004910; Sun, 24 Aug 2025 20:30:02 GMT (envelope-from git) Date: Sun, 24 Aug 2025 20:30:02 GMT Message-Id: <202508242030.57OKU28j004910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: a9410ccbd9f0..00dfa094ac35 - vendor/openzfs/master - vendor branch updated 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: 00dfa094ac35e240bed33f8bcfea68d805eab6ae X-Git-Oldrev: a9410ccbd9f0375a7eeb6bc35eb55efe9c21493e X-Git-Newrev: 00dfa094ac35e240bed33f8bcfea68d805eab6ae Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=a9410ccbd9f0..00dfa094ac35 2d7928428b22 objtool-wrapper: Update Debian packaging 79a59ae7878f Debian rules: install scripts/objtool-wrapper.in into dkms tree 14d24807081b CI: Add Debian 13 to the FULL_OS runner list 3abf72b25176 dnode: add dn_dirtycnt, count of number of txgs this dnode is dirty on f3e49b0cf5b8 dnode_is_dirty: reimplement in terms of dn_dirtycnt eecff1b4a9e0 dnode: remove dn_dirty_txg and DNODE_IS_DIRTY aa6f0f878bb9 dnode: remove dn_dirtyctx_firstset 574eec29641c dnode: remove dn_dirtyctx and dnode_dirtycontext 94413bc75d3e zdb: Filter log spacemaps by vdev 28ff57505bff FreeBSD: satisfy VFS requirements for readdir() 00dfa094ac35 Tag 2.4.0-rc1 From nobody Sun Aug 24 20:50:28 2025 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 4c95fX4Kyjz661ZJ; Sun, 24 Aug 2025 20:50:28 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c95fX3qlqz3PVf; Sun, 24 Aug 2025 20:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756068628; 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=YJgqun7hb6n7n4VF7z8WmENClxpxi8+qc9DKAr2+R6Q=; b=kjz6GNHypZ5ufMw/+7907zolI0FkXv9kZOtIIGl3TnzqRDjCcRsFaBmxVF4ljmQNMR3+CX NXyONU4EBiaQDNQzQiXhJGyovbRoHAsvyVKvrpECzmWOxxUkA/8noS8sVZb/VFyERo9DEb KGgPLscsVR70l4PFAyaN1jbfShnEOAof0t4waeHQ/y0UUCksTjCjgN5iBWwH6/XcyAQghD +Z2trsyiY7xAVEOIj9P1T3b/eM/pP1DnJBuQtdFJEM3nioTe+KmpuWja875281aJvAZ1Oh wnLnEQHCseiVeYKyAhiAtq4rPtbjUUDNWI4OG5xfwAQbALtE86oiN8HsoyhNrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756068628; 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=YJgqun7hb6n7n4VF7z8WmENClxpxi8+qc9DKAr2+R6Q=; b=heRsCPB91BBU3f90KTfGTX+SrIvmX4tum5UuB9VMeFwKkGgxPD0O/zcCLX4oHaOuQMF98q XE3Uk7fSWwgnm9uK5nnG2FFT+56pRPwHx4yBveS/70zZMPt45TZMDt4Kgj9R+palx5n4wP xB2hNNy+8eKxOMd+dxlgmhtx55vi8B9Q3jt00runoxxqjwREZApofFlUn1phWCFDctlFzh fUOr8+dmtjcqrmKuQBEVTkV/rQ0FrjuS93ZSIwhZqljz8sd1V/VBbu7WuVQdNQhvgTItn/ REigtaB+vgLKuYa+BajtM6rfdJyGdVA99DPKq/HGSEuHrB2VN5CkdoXCraJSQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756068628; a=rsa-sha256; cv=none; b=Mx1EOXUgQtvABTAlYD38DTl5S+GVQ45lGs2MTKVVjfB9bas7cRutOOa5oIocvub5RUoPHq ulkwSr5b2HcVhgkdh8yM5su05DTgn6fGHF6+lI/fH73zSn7lcTRJkQOWcJooc2M7ainUKp SGh5ipAvRzUTrVB0qtI132/8xGqSFEatUEDZP8AjF5YZ7Zaxn3/D199Tr5IywQyEfdE35I fobnjTA9GYUP6hMHTJv64kTqbC/f+ZaB+DYiuT4GrSXjQqOtepI4Suyn5ONeEQO8UE19Yh W/nPCd0IP0ztZnKspRLxsw9ttZGWn0K+Ey1+xteMbPriX5yfUhTkuYvIZxmysA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c95fX3QCFz43k; Sun, 24 Aug 2025 20:50:28 +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 57OKoS2G048312; Sun, 24 Aug 2025 20:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OKoSRr048309; Sun, 24 Aug 2025 20:50:28 GMT (envelope-from git) Date: Sun, 24 Aug 2025 20:50:28 GMT Message-Id: <202508242050.57OKoSRr048309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 53b021680ed9 - stable/14 - bsdinstall: Improve message for existing FreeBSD EFI entry 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 53b021680ed97b7169ffc244894a8f8179867ac6 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=53b021680ed97b7169ffc244894a8f8179867ac6 commit 53b021680ed97b7169ffc244894a8f8179867ac6 Author: Ed Maste AuthorDate: 2025-07-25 14:25:18 +0000 Commit: Ed Maste CommitDate: 2025-08-24 20:49:40 +0000 bsdinstall: Improve message for existing FreeBSD EFI entry When reinstalling FreeBSD bsdinstall reported "There are multiple FreeBSD EFI boot entries." This sounds like something went wrong in the past. Clarify that there may be only one existing entry, which is not surprising for a reinstall. Reviewed by: manu, ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51527 (cherry picked from commit ebc6ff8db17683b566d49fe89a43a668d3d67915) --- usr.sbin/bsdinstall/scripts/bootconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/bootconfig b/usr.sbin/bsdinstall/scripts/bootconfig index 618a1966095e..6438f7ef1fca 100755 --- a/usr.sbin/bsdinstall/scripts/bootconfig +++ b/usr.sbin/bsdinstall/scripts/bootconfig @@ -71,7 +71,7 @@ update_uefi_bootentry() fi $DIALOG --backtitle "$OSNAME Installer" --title 'Boot Configuration' \ - --yesno "There are multiple \"$OSNAME\" EFI boot entries. Would you like to remove them all and add a new one?" 0 0 + --yesno "One or more \"$OSNAME\" EFI boot manager entries already exist. Would you like to remove them all and add a new one?" 0 0 if [ $? -eq $DIALOG_OK ]; then for entry in $(efibootmgr | awk "\$NF == \"$EFI_LABEL_NAME\" { sub(/.*Boot/,\"\", \$1); sub(/\*/,\"\", \$1); print \$1 }"); do efibootmgr -B -b ${entry} From nobody Sun Aug 24 22:48:27 2025 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 4c98Gj1hzGz668KW; Sun, 24 Aug 2025 22:48:29 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c98Gh0D0jz3f2b; Sun, 24 Aug 2025 22:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756075708; 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=Nuy72GYFuNePpJxw+TssDTBKrl7Ph7EbElS7BpBki28=; b=tI4oP1251uylaOOfi0qDAhBE109sTJzSberD3k7J7zDzYbLZl6V2Zn5ozZlYI6rqRIt0Ie JBE57iUI8z1Fv5JT48FvzBpM0OLN7W28InrXmp+F49VO8kK4Lq/QIqHYhAD6iowDyGhQuV CrYrqRIgQUpd/53THUOiePmEJV5/14ntHKGBup3JJ3fyeJ5lh1Sl1dWFUX7f33CfWvFnV3 LX58ie1knAfM5gmprYGizQ1ok1CumN2fTCWeWjUpfh1mOKXSZeUGiJBfP4i/HyrB/zbFyI jJmgu0vQJIh/gr+b+cy+0ZCKoUOP2YXKk0j18wODQKODvq1n2YylavmH7iTVGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756075708; 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=Nuy72GYFuNePpJxw+TssDTBKrl7Ph7EbElS7BpBki28=; b=TieUcvRmJutHP0Ige6qD5VYH+yVopysL7PEgQp1WGbeF2zRpZKfnNCgilE+UgNFPjelwXc yJkWuEX0otSzmCWemkD97Bl+rJJXsaXH6sWAu42sFCYO7abrJ5d/HPAtfoqFl3DRfLy3Lg piJgd7vbfZqBfjl9CvRwj+DqTx5+/TFmyulUw87AZVZxG68EIx6O0AudvEMhFErBispe/r 9pqXSHELL+6iKgQjta1OoWB4O0ROm1ai12F+XpG+WUMqG3K12cbef/VliCcbmW1NZiBG9O 9rzseFHgKIXcwHhWOTUx7079+TSmDhu5Ysok1uqJuk8Vmy/c25xGKJO7CfJYdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756075708; a=rsa-sha256; cv=none; b=IJlQ2gmi5e/zB1hSek1v/xCn6Nb7ix4mKKHDgewffbsfXayiaglmmcqWr4YC3W50aEFhwI Evi1IhNV02e4NrgyggqRf47gbu2gSOKZqlDRPx76dWtLn/V9++xr3XEhixdNLfCwPtq12o zDVJRcuklxMPwupz/xcRE+IXTY9yNiwpNem76FvCQabZS68JpF6O7FBxSYEKDvhNu+GSn6 /AijbsmnBQLARj+nNLa7J+KHol/feSyrIh2VsZcBxUvosiiXfgAiLlAmW+OfjZheZtto2L 0pPrsBfBQRMJhDobW1hLnQa0WBDTDxsfbWOF/y9xBStYqsO5FPsEpBP5mO3jYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c98Gg6j6Hz7Wn; Sun, 24 Aug 2025 22:48:27 +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 57OMmR7Q066053; Sun, 24 Aug 2025 22:48:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OMmR8v066047; Sun, 24 Aug 2025 22:48:27 GMT (envelope-from git) Date: Sun, 24 Aug 2025 22:48:27 GMT Message-Id: <202508242248.57OMmR8v066047@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 5e2fc2c3c594 - main - zfs: merge openzfs/zfs@00dfa094a 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e2fc2c3c59455ddd6354e765ca474182d90ba28 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=5e2fc2c3c59455ddd6354e765ca474182d90ba28 commit 5e2fc2c3c59455ddd6354e765ca474182d90ba28 Merge: 3eeeaf9cfbc1 00dfa094ac35 Author: Martin Matuska AuthorDate: 2025-08-24 21:40:10 +0000 Commit: Martin Matuska CommitDate: 2025-08-24 21:40:48 +0000 zfs: merge openzfs/zfs@00dfa094a OpenZFS 2.4.0 rc1 Notable upstream pull request merges: #17643 94413bc75 zdb: Filter log spacemaps by vdev #17655 28ff57505 FreeBSD: satisfy VFS requirements for readdir() #17658 -multiple dnode: fix how we track and check dirtyness As OpenZFS 2.4 got branched, this is the last merge to main until stable/15 is branched. stable/15 will receive updates from the vendor/openzfs/zfs-2.4-release branch. Obtained from: OpenZFS OpenZFS commit: 00dfa094ac35e240bed33f8bcfea68d805eab6ae OpenZFS tag: zfs-2.4.0-rc1 .../.github/workflows/scripts/qemu-2-start.sh | 14 ++- .../.github/workflows/scripts/qemu-3-deps-vm.sh | 2 +- .../.github/workflows/scripts/qemu-5-setup.sh | 14 ++- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 6 +- sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 37 +++++--- sys/contrib/openzfs/contrib/debian/rules.in | 6 +- sys/contrib/openzfs/include/sys/dmu_impl.h | 4 +- sys/contrib/openzfs/include/sys/dnode.h | 14 +-- sys/contrib/openzfs/module/zfs/dbuf.c | 21 ----- sys/contrib/openzfs/module/zfs/dmu_objset.c | 6 ++ sys/contrib/openzfs/module/zfs/dnode.c | 103 +++++++-------------- sys/modules/zfs/zfs_config.h | 6 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 14 files changed, 100 insertions(+), 139 deletions(-) diff --cc sys/modules/zfs/zfs_config.h index 12274bcceea1,000000000000..72167b752e53 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,879 -1,0 +1,879 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* __assign_str() has one arg */ +/* #undef HAVE_1ARG_ASSIGN_STR */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* backtrace() is available */ +/* #undef HAVE_BACKTRACE */ + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_nr_bytes() is available */ +/* #undef HAVE_BDEV_NR_BYTES */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* struct queue_limits has a features field */ +/* #undef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* backing_dev_info is available through queue gendisk */ +/* #undef HAVE_BLK_QUEUE_DISK_BDI */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* 3-arg dequeue_signal() takes a type argument */ +/* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* dops->d_revalidate() takes 4 args */ +/* #undef HAVE_D_REVALIDATE_4ARGS */ + +/* Define to 1 if you have the 'execvpe' function. */ +#define HAVE_EXECVPE 1 + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* file->f_version exists */ +/* #undef HAVE_FILE_F_VERSION */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* GENHD_FL_EXT_DEVT flag is available */ +/* #undef HAVE_GENHD_FL_EXT_DEVT */ + +/* GENHD_FL_NO_PART flag is available */ +/* #undef HAVE_GENHD_FL_NO_PART */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the 'gettid' function. */ +/* #undef HAVE_GETTID */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* mnt_idmap does not have user_namespace */ +/* #undef HAVE_IDMAP_NO_USERNS */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() returns struct dentry* */ +/* #undef HAVE_IOPS_MKDIR_DENTRY */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_get_pages2() is available */ +/* #undef HAVE_IOV_ITER_GET_PAGES2 */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* Define to 1 if you have the 'issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* iter_is_ubuf() is available */ +/* #undef HAVE_ITER_IS_UBUF */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel defines intptr_t */ +/* #undef HAVE_KERNEL_INTPTR_T */ + +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* strlcpy() exists */ +/* #undef HAVE_KERNEL_STRLCPY */ + +/* kernel has kmap_local_page */ +/* #undef HAVE_KMAP_LOCAL_PAGE */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [unwind] */ +/* #undef HAVE_LIBUNWIND */ + +/* libunwind has unw_get_elf_filename */ +/* #undef HAVE_LIBUNWIND_ELF */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* building against unsupported kernel version */ +/* #undef HAVE_LINUX_EXPERIMENTAL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_STAT_H */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Define to 1 if you have the 'mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* PG_error flag is available */ +/* #undef HAVE_MM_PAGE_FLAG_ERROR */ + +/* page_mapping() is available */ +/* #undef HAVE_MM_PAGE_MAPPING */ + +/* page_size() is available */ +/* #undef HAVE_MM_PAGE_SIZE */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* readahead_page() exists */ +/* #undef HAVE_PAGEMAP_READAHEAD_PAGE */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* pin_user_pages_unlocked() is available */ +/* #undef HAVE_PIN_USER_PAGES_UNLOCKED */ + +/* proc_handler ctl_table arg is const */ +/* #undef HAVE_PROC_HANDLER_CTL_TABLE_CONST */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* If available, contains the Python version number currently in use. */ +/* #undef HAVE_PYTHON */ + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_sz exists */ +/* #undef HAVE_REGISTER_SYSCTL_SZ */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* shrinker_register exists */ +/* #undef HAVE_SHRINKER_REGISTER */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* sops->free_inode() exists */ +/* #undef HAVE_SOPS_FREE_INODE */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* STACK_FRAME_NON_STANDARD asm macro is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD_ASM */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* statx() is available */ +/* #undef HAVE_STATX */ + +/* STATX_MNT_ID is available */ +/* #undef HAVE_STATX_MNT_ID */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the 'strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the 'strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* have super_block s_shrink */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK */ + +/* have super_block s_shrink pointer */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK_PTR */ + +/* have super_block s_wb_err */ +/* #undef HAVE_SUPER_BLOCK_S_WB_ERR */ + +/* sync_blockdev() is declared in include/blkdev.h */ +/* #undef HAVE_SYNC_BLOCKDEV */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* timer_delete_sync is available */ +/* #undef HAVE_TIMER_DELETE_SYNC */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the 'udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +#ifdef __amd64__ +/* Define if host toolchain supports VAES */ +#define HAVE_VAES 1 +#endif + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* migratepage exists */ +/* #undef HAVE_VFS_MIGRATEPAGE */ + +/* migrate_folio exists */ +/* #undef HAVE_VFS_MIGRATE_FOLIO */ + +/* address_space_operations->readpages exists */ +/* #undef HAVE_VFS_READPAGES */ + +/* read_folio exists */ +/* #undef HAVE_VFS_READ_FOLIO */ + +/* fops->remap_file_range() is available */ +/* #undef HAVE_VFS_REMAP_FILE_RANGE */ + +/* __set_page_dirty_nobuffers exists */ +/* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */ + +/* splice_copy_file_range() is available */ +/* #undef HAVE_VFS_SPLICE_COPY_FILE_RANGE */ + +/* address_space_operations->writepage exists */ +/* #undef HAVE_VFS_WRITEPAGE */ + +/* __vmalloc page flags exists */ +/* #undef HAVE_VMALLOC_PAGE_KERNEL */ + +#ifdef __amd64__ +/* Define if host toolchain supports VPCLMULQDQ */ +#define HAVE_VPCLMULQDQ 1 +#endif + +/* int (*writepage_t)() takes struct folio* */ +/* #undef HAVE_WRITEPAGE_T_FOLIO */ + +/* xattr_handler->get() wants dentry and inode and flags */ +/* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */ + +/* xattr_handler->set() wants both dentry and inode */ +/* #undef HAVE_XATTR_SET_DENTRY_INODE */ + +/* xattr_handler->set() takes mnt_idmap */ +/* #undef HAVE_XATTR_SET_IDMAP */ + +/* xattr_handler->set() takes user_namespace */ +/* #undef HAVE_XATTR_SET_USERNS */ + +/* Define if host toolchain supports XSAVE */ +#define HAVE_XSAVE 1 + +/* Define if host toolchain supports XSAVEOPT */ +#define HAVE_XSAVEOPT 1 + +/* Define if host toolchain supports XSAVES */ +#define HAVE_XSAVES 1 + +/* ZERO_PAGE() is GPL-only */ +/* #undef HAVE_ZERO_PAGE_GPL_ONLY */ + +/* Define if you have [z] */ +#define HAVE_ZLIB 1 + +/* libunwind is llvm libunwind */ +/* #undef IS_LIBUNWIND_LLVM */ + +/* kernel exports FPU functions */ +/* #undef KERNEL_EXPORTS_X86_FPU */ + +/* TBD: fetch(3) support */ +#if 0 +/* whether the chosen libfetch is to be loaded at run-time */ +#define LIBFETCH_DYNAMIC 1 + +/* libfetch is fetch(3) */ +#define LIBFETCH_IS_FETCH 1 + +/* libfetch is libcurl */ +#define LIBFETCH_IS_LIBCURL 0 + +/* soname of chosen libfetch */ +#define LIBFETCH_SONAME "libfetch.so.6" +#endif + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* make_request_fn() return type */ +/* #undef MAKE_REQUEST_FN_RET */ + +/* using complete_and_exit() instead */ +/* #undef SPL_KTHREAD_COMPLETE_AND_EXIT */ + +/* Defined for legacy compatibility. */ +#define SPL_META_ALIAS ZFS_META_ALIAS + +/* Defined for legacy compatibility. */ +#define SPL_META_RELEASE ZFS_META_RELEASE + +/* Defined for legacy compatibility. */ +#define SPL_META_VERSION ZFS_META_VERSION + +/* pde_data() is PDE_DATA() */ +/* #undef SPL_PDE_DATA */ + +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define SYSTEM_FREEBSD 1 + +/* True if ZFS is to be compiled for a Linux system */ +/* #undef SYSTEM_LINUX */ + +/* Version number of package */ +/* #undef ZFS_DEBUG */ + +/* /dev/zfs minor */ +/* #undef ZFS_DEVICE_MINOR */ + +/* Define the project alias string. */ - #define ZFS_META_ALIAS "zfs-2.3.99-571-FreeBSD_ga9410ccbd" ++#define ZFS_META_ALIAS "zfs-2.4.0-rc1-FreeBSD_g00dfa094a" + +/* Define the project author. */ +#define ZFS_META_AUTHOR "OpenZFS" + +/* Define the project release date. */ +/* #undef ZFS_META_DATA */ + +/* Define the maximum compatible kernel version. */ +#define ZFS_META_KVER_MAX "6.16" + +/* Define the minimum compatible kernel version. */ +#define ZFS_META_KVER_MIN "4.18" + +/* Define the project license. */ +#define ZFS_META_LICENSE "CDDL" + +/* Define the libtool library 'age' version information. */ +/* #undef ZFS_META_LT_AGE */ + +/* Define the libtool library 'current' version information. */ +/* #undef ZFS_META_LT_CURRENT */ + +/* Define the libtool library 'revision' version information. */ +/* #undef ZFS_META_LT_REVISION */ + +/* Define the project name. */ +#define ZFS_META_NAME "zfs" + +/* Define the project release. */ - #define ZFS_META_RELEASE "571-FreeBSD_ga9410ccbd" ++#define ZFS_META_RELEASE "zfs-2.4.0-rc1-FreeBSD_g00dfa094a" + +/* Define the project version. */ - #define ZFS_META_VERSION "2.3.99" ++#define ZFS_META_VERSION "2.4.0" + +/* count is located in percpu_ref.data */ +/* #undef ZFS_PERCPU_REF_COUNT_IN_DATA */ diff --cc sys/modules/zfs/zfs_gitrev.h index 5c265cf5b08e,000000000000..2b5d717da216 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@@ -1,1 -1,0 +1,1 @@@ - #define ZFS_META_GITREV "zfs-2.3.99-571-ga9410ccbd" ++#define ZFS_META_GITREV "zfs-2.4.0-rc1-0-g00dfa094a" From nobody Sun Aug 24 23:30:09 2025 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 4c99Bn698jz66C6g; Sun, 24 Aug 2025 23:30:09 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c99Bn5RFHz3krJ; Sun, 24 Aug 2025 23:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756078209; 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=KJJpPj0K+ZmaWsbYcEPCycrLsyfeQe9Ljlpw24ImFKA=; b=Dl5/ZnEJBEFiOFpxWSmUHvNOvh08pxjXWCZlvDQkDMy0Awy7ziMHoKuAVV+mJXeefPtrLH dnXAn9iVtUf5DCp/klwVxlKweGL3EhRsS/z1pvE+NYSyIlJ7pW6+meJE1/zHfWgRYUrmUZ hqXl2Eqfcph3HWvbdQ8YVXlAfHg3c/JiV1Rb/cdU9hhz8978On2vi+PhGV81srXbw+5rB9 jlnYjSpxXfB/kKwx0o3wLl/u0yre/LCHZ+UxV4N/DVJTTSPeNJNxdiJjIRlsw2HuVEvMjW 7MA7hAhZ+NTTEGf9EyVUDqi4oc9A6n6aH5NpiGVE7Qij39gxZT37xhP6vxBdSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756078209; 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=KJJpPj0K+ZmaWsbYcEPCycrLsyfeQe9Ljlpw24ImFKA=; b=G1Ou2V8Qba0OdkruhZyMkB5Jvaq0Jbh/TRyMFtvD9srJ6J4msm1rKoT69eu0ZngPJh/h4K cofpDr0c8D7K5NEECgFtwaBgqkX3CkOfy017p7AZbrEjGq81tANTzeaFf5hHbJGlZZ5jYE WWuRC2vjHdItOiCced6i3JC/nCy7I8zRYkvzkA/b/ChVegbD7j8yZSxIujqVE+bM/t3dKV 3xXuwHiylFVYleOxtDJ7oncvDWjldAZrDBHhKjVuH34qqyugOEijaCLGTDKDYbpTMY1tYB CR4VkagMgT0x8N8yCGWvclzYLMN4KuqAnwq9SPkdoF3eDSuLbFspv+AHhkdYLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756078209; a=rsa-sha256; cv=none; b=PAf0HTKcRdbHBEYNLzq/jLbZwNfQIOlaoHzxqRPaQEgiGMltaJ+/eAshECIoQkNwUnKIEe 0Q8ZR7vRgyjyh3Grdb9SRM0BEaJEKI6zbdRl9EiS9ZEwDwFy2vkKq2T547Ku/PmdXhuzER vsSt4ECW5APQ3+HEnzQZfdF9/nSdmHxLvhNuF4EsbWAviK6WuLGUrhEfPvGaDs8NQPmfgS 9OTfK9M927pA6yJ/FALF+RrtYfTb5UcsACEmIYHk0lNwYnmTI3CMH47mrQ0Mfi1XISr8BX c3FyA/Ab2cjyFbD4YEMNksXO6Ci3hGtGzXo+TXO02jDe1wKQB4Oaw8tJdArenQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c99Bn4Xvxz8M7; Sun, 24 Aug 2025 23:30:09 +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 57ONU9Dt045615; Sun, 24 Aug 2025 23:30:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57ONU9rx045604; Sun, 24 Aug 2025 23:30:09 GMT (envelope-from git) Date: Sun, 24 Aug 2025 23:30:09 GMT Message-Id: <202508242330.57ONU9rx045604@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 2b5de4330ee1 - main - tcp: improve the condition for detecting dup ACKs 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b5de4330ee1e99a7b5aacef0ff99febe5d6fc42 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2b5de4330ee1e99a7b5aacef0ff99febe5d6fc42 commit 2b5de4330ee1e99a7b5aacef0ff99febe5d6fc42 Author: Michael Tuexen AuthorDate: 2025-08-24 18:49:18 +0000 Commit: Michael Tuexen CommitDate: 2025-08-24 19:24:17 +0000 tcp: improve the condition for detecting dup ACKs Take the condition of RFC 6675 into account. While there, remove stale comments. PR: 282605 Reviewed by: cc (earlier version) MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51426 --- sys/netinet/tcp_input.c | 499 +++++++++++++++++++++++------------------------- 1 file changed, 236 insertions(+), 263 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 6492495dc583..ec7102223c2d 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2562,299 +2562,272 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, hhook_run_tcp_est_in(tp, th, &to); #endif - if (SEQ_LEQ(th->th_ack, tp->snd_una)) { - maxseg = tcp_maxseg(tp); - if (no_data && - (tiwin == tp->snd_wnd || - (tp->t_flags & TF_SACK_PERMIT))) { + if (SEQ_LT(th->th_ack, tp->snd_una)) { + /* This is old ACK information, don't process it. */ + break; + } + if (th->th_ack == tp->snd_una) { + /* Check if this is a duplicate ACK. */ + if ((tp->t_flags & TF_SACK_PERMIT) && + V_tcp_do_newsack) { /* - * If this is the first time we've seen a - * FIN from the remote, this is not a - * duplicate and it needs to be processed - * normally. This happens during a - * simultaneous close. + * If SEG.ACK == SND.UNA, RFC 6675 requires a + * duplicate ACK to selectively acknowledge + * at least one byte, which was not selectively + * acknowledged before. */ - if ((thflags & TH_FIN) && - (TCPS_HAVERCVDFIN(tp->t_state) == 0)) { - tp->t_dupacks = 0; + if (sack_changed == SACK_NOCHANGE) { break; } - TCPSTAT_INC(tcps_rcvdupack); - /* - * If we have outstanding data (other than - * a window probe), this is a completely - * duplicate ack (ie, window info didn't - * change and FIN isn't set), - * the ack is the biggest we've - * seen and we've seen exactly our rexmt - * threshold of them, assume a packet - * has been dropped and retransmit it. - * Kludge snd_nxt & the congestion - * window so we send only this one - * packet. - * - * We know we're losing at the current - * window size so do congestion avoidance - * (set ssthresh to half the current window - * and pull our congestion window back to - * the new ssthresh). - * - * Dup acks mean that packets have left the - * network (they're now cached at the receiver) - * so bump cwnd by the amount in the receiver - * to keep a constant cwnd packets in the - * network. - * - * When using TCP ECN, notify the peer that - * we reduced the cwnd. - */ + } else { /* - * Following 2 kinds of acks should not affect - * dupack counting: - * 1) Old acks - * 2) Acks with SACK but without any new SACK - * information in them. These could result from - * any anomaly in the network like a switch - * duplicating packets or a possible DoS attack. + * If SEG.ACK == SND.UNA, RFC 5681 requires a + * duplicate ACK to have no data on it and to + * not be a window update. */ - if (th->th_ack != tp->snd_una || - (tcp_is_sack_recovery(tp, &to) && - (sack_changed == SACK_NOCHANGE))) { + if (!no_data || tiwin != tp->snd_wnd) { break; - } else if (!tcp_timer_active(tp, TT_REXMT)) { - tp->t_dupacks = 0; - } else if (++tp->t_dupacks > tcprexmtthresh || - IN_FASTRECOVERY(tp->t_flags)) { - cc_ack_received(tp, th, nsegs, - CC_DUPACK); - if (V_tcp_do_prr && + } + } + /* + * If this is the first time we've seen a + * FIN from the remote, this is not a + * duplicate ACK and it needs to be processed + * normally. + * This happens during a simultaneous close. + */ + if ((thflags & TH_FIN) && + (TCPS_HAVERCVDFIN(tp->t_state) == 0)) { + tp->t_dupacks = 0; + break; + } + /* Perform duplicate ACK processing. */ + TCPSTAT_INC(tcps_rcvdupack); + maxseg = tcp_maxseg(tp); + if (!tcp_timer_active(tp, TT_REXMT)) { + tp->t_dupacks = 0; + } else if (++tp->t_dupacks > tcprexmtthresh || + IN_FASTRECOVERY(tp->t_flags)) { + cc_ack_received(tp, th, nsegs, CC_DUPACK); + if (V_tcp_do_prr && + IN_FASTRECOVERY(tp->t_flags) && + (tp->t_flags & TF_SACK_PERMIT)) { + tcp_do_prr_ack(tp, th, &to, + sack_changed, &maxseg); + } else if (tcp_is_sack_recovery(tp, &to) && IN_FASTRECOVERY(tp->t_flags) && - (tp->t_flags & TF_SACK_PERMIT)) { - tcp_do_prr_ack(tp, th, &to, - sack_changed, &maxseg); - } else if (tcp_is_sack_recovery(tp, &to) && - IN_FASTRECOVERY(tp->t_flags) && - (tp->snd_nxt == tp->snd_max)) { - int awnd; + (tp->snd_nxt == tp->snd_max)) { + int awnd; - /* - * Compute the amount of data in flight first. - * We can inject new data into the pipe iff - * we have less than ssthresh - * worth of data in flight. - */ - awnd = tcp_compute_pipe(tp); - if (awnd < tp->snd_ssthresh) { - tp->snd_cwnd += imax(maxseg, - imin(2 * maxseg, - tp->sackhint.delivered_data)); - if (tp->snd_cwnd > tp->snd_ssthresh) - tp->snd_cwnd = tp->snd_ssthresh; - } - } else if (tcp_is_sack_recovery(tp, &to) && - IN_FASTRECOVERY(tp->t_flags) && - SEQ_LT(tp->snd_nxt, tp->snd_max)) { + /* + * Compute the amount of data in flight first. + * We can inject new data into the pipe iff + * we have less than ssthresh + * worth of data in flight. + */ + awnd = tcp_compute_pipe(tp); + if (awnd < tp->snd_ssthresh) { tp->snd_cwnd += imax(maxseg, imin(2 * maxseg, tp->sackhint.delivered_data)); - } else { - tp->snd_cwnd += maxseg; + if (tp->snd_cwnd > tp->snd_ssthresh) + tp->snd_cwnd = tp->snd_ssthresh; } - (void) tcp_output(tp); - goto drop; - } else if (tp->t_dupacks == tcprexmtthresh || - (tp->t_flags & TF_SACK_PERMIT && - V_tcp_do_newsack && - tp->sackhint.sacked_bytes > - (tcprexmtthresh - 1) * maxseg)) { + } else if (tcp_is_sack_recovery(tp, &to) && + IN_FASTRECOVERY(tp->t_flags) && + SEQ_LT(tp->snd_nxt, tp->snd_max)) { + tp->snd_cwnd += imax(maxseg, + imin(2 * maxseg, + tp->sackhint.delivered_data)); + } else { + tp->snd_cwnd += maxseg; + } + (void) tcp_output(tp); + goto drop; + } else if (tp->t_dupacks == tcprexmtthresh || + (tp->t_flags & TF_SACK_PERMIT && + V_tcp_do_newsack && + tp->sackhint.sacked_bytes > + (tcprexmtthresh - 1) * maxseg)) { enter_recovery: - /* - * Above is the RFC6675 trigger condition of - * more than (dupthresh-1)*maxseg sacked data. - * If the count of holes in the - * scoreboard is >= dupthresh, we could - * also enter loss recovery, but don't - * have that value readily available. - */ - tp->t_dupacks = tcprexmtthresh; - tcp_seq onxt = tp->snd_nxt; + /* + * Above is the RFC6675 trigger condition of + * more than (dupthresh-1)*maxseg sacked data. + * If the count of holes in the + * scoreboard is >= dupthresh, we could + * also enter loss recovery, but don't + * have that value readily available. + */ + tp->t_dupacks = tcprexmtthresh; + tcp_seq onxt = tp->snd_nxt; - /* - * If we're doing sack, check to - * see if we're already in sack - * recovery. If we're not doing sack, - * check to see if we're in newreno - * recovery. - */ - if (tcp_is_sack_recovery(tp, &to)) { - if (IN_FASTRECOVERY(tp->t_flags)) { - tp->t_dupacks = 0; - break; - } - } else { - if (SEQ_LEQ(th->th_ack, - tp->snd_recover)) { - tp->t_dupacks = 0; - break; - } + /* + * If we're doing sack, check to + * see if we're already in sack + * recovery. If we're not doing sack, + * check to see if we're in newreno + * recovery. + */ + if (tcp_is_sack_recovery(tp, &to)) { + if (IN_FASTRECOVERY(tp->t_flags)) { + tp->t_dupacks = 0; + break; } - /* Congestion signal before ack. */ - cc_cong_signal(tp, th, CC_NDUPACK); - cc_ack_received(tp, th, nsegs, - CC_DUPACK); - tcp_timer_activate(tp, TT_REXMT, 0); - tp->t_rtttime = 0; - if (V_tcp_do_prr) { - /* - * snd_ssthresh and snd_recover are - * already updated by cc_cong_signal. - */ - if (tcp_is_sack_recovery(tp, &to)) { - /* - * Include Limited Transmit - * segments here - */ - tp->sackhint.prr_delivered = - imin(tp->snd_max - th->th_ack, - (tp->snd_limited + 1) * maxseg); - } else { - tp->sackhint.prr_delivered = - maxseg; - } - tp->sackhint.recover_fs = max(1, - tp->snd_nxt - tp->snd_una); + } else { + if (SEQ_LEQ(th->th_ack, + tp->snd_recover)) { + tp->t_dupacks = 0; + break; } - tp->snd_limited = 0; + } + /* Congestion signal before ack. */ + cc_cong_signal(tp, th, CC_NDUPACK); + cc_ack_received(tp, th, nsegs, CC_DUPACK); + tcp_timer_activate(tp, TT_REXMT, 0); + tp->t_rtttime = 0; + if (V_tcp_do_prr) { + /* + * snd_ssthresh and snd_recover are + * already updated by cc_cong_signal. + */ if (tcp_is_sack_recovery(tp, &to)) { - TCPSTAT_INC(tcps_sack_recovery_episode); /* - * When entering LR after RTO due to - * Duplicate ACKs, retransmit existing - * holes from the scoreboard. + * Include Limited Transmit + * segments here */ - tcp_resend_sackholes(tp); - /* Avoid inflating cwnd in tcp_output */ - tp->snd_nxt = tp->snd_max; - tp->snd_cwnd = tcp_compute_pipe(tp) + + tp->sackhint.prr_delivered = + imin(tp->snd_max - th->th_ack, + (tp->snd_limited + 1) * maxseg); + } else { + tp->sackhint.prr_delivered = maxseg; - (void) tcp_output(tp); - /* Set cwnd to the expected flightsize */ - tp->snd_cwnd = tp->snd_ssthresh; - if (SEQ_GT(th->th_ack, tp->snd_una)) { - goto resume_partialack; - } - goto drop; } - tp->snd_nxt = th->th_ack; - tp->snd_cwnd = maxseg; - (void) tcp_output(tp); - KASSERT(tp->snd_limited <= 2, - ("%s: tp->snd_limited too big", - __func__)); - tp->snd_cwnd = tp->snd_ssthresh + - maxseg * - (tp->t_dupacks - tp->snd_limited); - if (SEQ_GT(onxt, tp->snd_nxt)) - tp->snd_nxt = onxt; - goto drop; - } else if (V_tcp_do_rfc3042) { - /* - * Process first and second duplicate - * ACKs. Each indicates a segment - * leaving the network, creating room - * for more. Make sure we can send a - * packet on reception of each duplicate - * ACK by increasing snd_cwnd by one - * segment. Restore the original - * snd_cwnd after packet transmission. - */ - cc_ack_received(tp, th, nsegs, CC_DUPACK); - uint32_t oldcwnd = tp->snd_cwnd; - tcp_seq oldsndmax = tp->snd_max; - u_int sent; - int avail; - - KASSERT(tp->t_dupacks == 1 || - tp->t_dupacks == 2, - ("%s: dupacks not 1 or 2", - __func__)); - if (tp->t_dupacks == 1) - tp->snd_limited = 0; - if ((tp->snd_nxt == tp->snd_max) && - (tp->t_rxtshift == 0)) - tp->snd_cwnd = - SEQ_SUB(tp->snd_nxt, - tp->snd_una) - - tcp_sack_adjust(tp); - tp->snd_cwnd += - (tp->t_dupacks - tp->snd_limited) * - maxseg - tcp_sack_adjust(tp); + tp->sackhint.recover_fs = max(1, + tp->snd_nxt - tp->snd_una); + } + tp->snd_limited = 0; + if (tcp_is_sack_recovery(tp, &to)) { + TCPSTAT_INC(tcps_sack_recovery_episode); /* - * Only call tcp_output when there - * is new data available to be sent - * or we need to send an ACK. + * When entering LR after RTO due to + * Duplicate ACKs, retransmit existing + * holes from the scoreboard. */ - SOCK_SENDBUF_LOCK(so); - avail = sbavail(&so->so_snd); - SOCK_SENDBUF_UNLOCK(so); - if (tp->t_flags & TF_ACKNOW || - (avail >= - SEQ_SUB(tp->snd_nxt, tp->snd_una))) { - (void) tcp_output(tp); - } - sent = SEQ_SUB(tp->snd_max, oldsndmax); - if (sent > maxseg) { - KASSERT((tp->t_dupacks == 2 && - tp->snd_limited == 0) || - (sent == maxseg + 1 && - tp->t_flags & TF_SENTFIN) || - (sent < 2 * maxseg && - tp->t_flags & TF_NODELAY), - ("%s: sent too much: %u>%u", - __func__, sent, maxseg)); - tp->snd_limited = 2; - } else if (sent > 0) { - ++tp->snd_limited; - } - tp->snd_cwnd = oldcwnd; + tcp_resend_sackholes(tp); + /* Avoid inflating cwnd in tcp_output */ + tp->snd_nxt = tp->snd_max; + tp->snd_cwnd = tcp_compute_pipe(tp) + + maxseg; + (void) tcp_output(tp); + /* Set cwnd to the expected flightsize */ + tp->snd_cwnd = tp->snd_ssthresh; goto drop; } - } - break; - } else { - /* - * This ack is advancing the left edge, reset the - * counter. - */ - tp->t_dupacks = 0; - /* - * If this ack also has new SACK info, increment the - * counter as per rfc6675. The variable - * sack_changed tracks all changes to the SACK - * scoreboard, including when partial ACKs without - * SACK options are received, and clear the scoreboard - * from the left side. Such partial ACKs should not be - * counted as dupacks here. - */ - if (tcp_is_sack_recovery(tp, &to) && - (((tp->t_rxtshift == 0) && (sack_changed != SACK_NOCHANGE)) || - ((tp->t_rxtshift > 0) && (sack_changed == SACK_NEWLOSS))) && - (tp->snd_nxt == tp->snd_max)) { - tp->t_dupacks++; - /* limit overhead by setting maxseg last */ - if (!IN_FASTRECOVERY(tp->t_flags) && - (tp->sackhint.sacked_bytes > - ((tcprexmtthresh - 1) * - (maxseg = tcp_maxseg(tp))))) { - goto enter_recovery; + tp->snd_nxt = th->th_ack; + tp->snd_cwnd = maxseg; + (void) tcp_output(tp); + KASSERT(tp->snd_limited <= 2, + ("%s: tp->snd_limited too big", + __func__)); + tp->snd_cwnd = tp->snd_ssthresh + + maxseg * + (tp->t_dupacks - tp->snd_limited); + if (SEQ_GT(onxt, tp->snd_nxt)) + tp->snd_nxt = onxt; + goto drop; + } else if (V_tcp_do_rfc3042) { + /* + * Process first and second duplicate + * ACKs. Each indicates a segment + * leaving the network, creating room + * for more. Make sure we can send a + * packet on reception of each duplicate + * ACK by increasing snd_cwnd by one + * segment. Restore the original + * snd_cwnd after packet transmission. + */ + cc_ack_received(tp, th, nsegs, CC_DUPACK); + uint32_t oldcwnd = tp->snd_cwnd; + tcp_seq oldsndmax = tp->snd_max; + u_int sent; + int avail; + + KASSERT(tp->t_dupacks == 1 || + tp->t_dupacks == 2, + ("%s: dupacks not 1 or 2", + __func__)); + if (tp->t_dupacks == 1) + tp->snd_limited = 0; + if ((tp->snd_nxt == tp->snd_max) && + (tp->t_rxtshift == 0)) + tp->snd_cwnd = + SEQ_SUB(tp->snd_nxt, + tp->snd_una) - + tcp_sack_adjust(tp); + tp->snd_cwnd += + (tp->t_dupacks - tp->snd_limited) * + maxseg - tcp_sack_adjust(tp); + /* + * Only call tcp_output when there + * is new data available to be sent + * or we need to send an ACK. + */ + SOCK_SENDBUF_LOCK(so); + avail = sbavail(&so->so_snd); + SOCK_SENDBUF_UNLOCK(so); + if (tp->t_flags & TF_ACKNOW || + (avail >= + SEQ_SUB(tp->snd_nxt, tp->snd_una))) { + (void) tcp_output(tp); + } + sent = SEQ_SUB(tp->snd_max, oldsndmax); + if (sent > maxseg) { + KASSERT((tp->t_dupacks == 2 && + tp->snd_limited == 0) || + (sent == maxseg + 1 && + tp->t_flags & TF_SENTFIN) || + (sent < 2 * maxseg && + tp->t_flags & TF_NODELAY), + ("%s: sent too much: %u>%u", + __func__, sent, maxseg)); + tp->snd_limited = 2; + } else if (sent > 0) { + ++tp->snd_limited; } + tp->snd_cwnd = oldcwnd; + goto drop; } + break; } - -resume_partialack: KASSERT(SEQ_GT(th->th_ack, tp->snd_una), - ("%s: th_ack <= snd_una", __func__)); - + ("%s: SEQ_LEQ(th_ack, snd_una)", __func__)); + /* + * This ack is advancing the left edge, reset the + * counter. + */ + tp->t_dupacks = 0; + /* + * If this ack also has new SACK info, increment the + * t_dupacks as per RFC 6675. The variable + * sack_changed tracks all changes to the SACK + * scoreboard, including when partial ACKs without + * SACK options are received, and clear the scoreboard + * from the left side. Such partial ACKs should not be + * counted as dupacks here. + */ + if (V_tcp_do_newsack && + tcp_is_sack_recovery(tp, &to) && + (((tp->t_rxtshift == 0) && (sack_changed != SACK_NOCHANGE)) || + ((tp->t_rxtshift > 0) && (sack_changed == SACK_NEWLOSS))) && + (tp->snd_nxt == tp->snd_max)) { + tp->t_dupacks++; + /* limit overhead by setting maxseg last */ + if (!IN_FASTRECOVERY(tp->t_flags) && + (tp->sackhint.sacked_bytes > + (tcprexmtthresh - 1) * (maxseg = tcp_maxseg(tp)))) { + goto enter_recovery; + } + } /* * If the congestion window was inflated to account * for the other side's cached packets, retract it.