From nobody Sun Dec 3 07:01:22 2023 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 4Sjd4f2mgtz51lMt; Sun, 3 Dec 2023 07:01: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sjd4f2MWgz3C2l; Sun, 3 Dec 2023 07:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701586882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9eUkwoV7+zvtDBhzHguI8fYCb5IDo+fjicaVuNMJ4Y=; b=I6xnCaV+vaYNyQRa87o81ghEpoa8+VIp96qdvrphxfDn/O4XK2X6XQT8PFlGwGkvZg8epH BFyEtJlr51RoJXGee8gx9GyOffhXAT/iT19WGGv06Ae8Qv2h8mL34GAXyqxWF85QEZ7EW7 EAPGpV2bMVd8w4EXx6bsU9VFwjum/x8Ks9G/RMtQ/mH/caFlTC4Yi6da0uW0Bnz/ONal9/ 4QA0xL+dgdUHn5LnPJ0FH+rLRF7+ZWK4cUBcPX3crM05McwI6lKGTz5DgenmK2pKAJtsYg Bz2jfCplYcWA1ZvG6c88Cxjm4eBKTaXRO3T4H18HDbZ/N2HcEdIiRD6mw21Csg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701586882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9eUkwoV7+zvtDBhzHguI8fYCb5IDo+fjicaVuNMJ4Y=; b=F4NBVPhTMBYw7eUuVQbxtt3fWXcs04bi4Jj95pBpHol2gW/b+0bPVD1jcOsduvglRIL9W9 ikWwaCbHIglxln/qQ+0sLR0FTVRWOdYdA1hEsHfykUNZvsmmXmcTJBkTZZ4jQ+j4KjD/eD 9WxXJ0VyNlI5cZm3V7tvyt/VGo8M1XEKk0SPAR9yUbacFj3e+LX7Wdj5s8AV2xwITWNnL/ pfJYI1HhHD2bihyK1vQlaR70U3iD/aPnMYrlbgVeBek3YU3NipnJ6/lkPGVeodPUMalObZ 9KfyTf9bwhvEAdj+I8kMVU7j4Ddg/0Ggjdchw3dnoZBx9tdWBJ5alAzbO7lOBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701586882; a=rsa-sha256; cv=none; b=SFn61Haa61WQgbj2eUI4SzRtWPxBrL2dJazxCDVCmU50nEss9rt9x8qdGSHwEDvMSp+uyN jG5IGrT/vbRKHgXMu0Yvrn6EGcXQmoh32n8R27wpGlJqQGzN1HFw+MoQNlKdjlnZpV2ZH5 wG6C1BPf+cHplrgeLFBNVplLxTLSUooucXurt3m2rifopc/x6+QAloRcoRXxZFboySShQB +N5VXF7hPUFjyjNPs4NGZ5Z9sUTNW1vL4vK33woCSwY/ER1Adqu2XckVV2qVWwz3TQJric iLo5f0sspvhyPSpuulZccwzjZNpnKTapTv9Gs2LeN5Q5RZyGM/xsQzKaTzj11w== 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 4Sjd4f1StNzq44; Sun, 3 Dec 2023 07:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B371MNo049556; Sun, 3 Dec 2023 07:01:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B371MA6049553; Sun, 3 Dec 2023 07:01:22 GMT (envelope-from git) Date: Sun, 3 Dec 2023 07:01:22 GMT Message-Id: <202312030701.3B371MA6049553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 3b3195f6767b - main - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b3195f6767b39eb33b3523134ef988931c9c86d Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=3b3195f6767b39eb33b3523134ef988931c9c86d commit 3b3195f6767b39eb33b3523134ef988931c9c86d Author: Xin LI AuthorDate: 2023-12-03 07:00:32 +0000 Commit: Xin LI CommitDate: 2023-12-03 07:00:32 +0000 periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. The leap-seconds.list is used exclusively by ntpd, therefore, do not bother to perform the fetch when ntpd is not enabled. PR: conf/275419 Reviewed by: cy, michaelo, imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42875 --- usr.sbin/periodic/etc/daily/480.leapfile-ntpd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd index 17db53e625f8..c7de845ea87d 100755 --- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd +++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd @@ -12,9 +12,9 @@ fi case "$daily_ntpd_leapfile_enable" in [Yy][Ee][Ss]) - if service ntpd oneneedfetch; then + if service ntpd enabled && service ntpd needfetch; then anticongestion - service ntpd onefetch + service ntpd fetch fi ;; esac From nobody Sun Dec 3 08:22:37 2023 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 4SjftP4F96z52XGb; Sun, 3 Dec 2023 08:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SjftP3QxNz3Pnh; Sun, 3 Dec 2023 08:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701591757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1mbebAKQ/9Pc/iH87GuXwHZXtqwi9foGUDAXzFGPLHk=; b=rXJGSH7UycVTg/ElsMaUjjD0fkmoc8TtOo856Fub8Ykgja7VQOT2z9qRb8jn7eC8CRbali 0PysEprVJ8EX4U5mRqzzohV23RiJJLef08fGzxmMWqd5vP48lHLyVjzCqpji653RcCd6O5 rpZko71geqy10PoBrDb6Um/4PJT9bLCVb1pbgRZBp6H0UX19XskucDuF4Rd1uHLsI9RsLd uReMoc31Y9wWdb3acDPDgV8L9+TbRD1YQmJvZ4VarPZKD77O4qhT1UBWCpdvCxPcwW+RDX vps9Ox6MfX8B605hbllBCUCQ7LD2yDxpOp1rshITFMpl8GeGwdFZyKFK7iktww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701591757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1mbebAKQ/9Pc/iH87GuXwHZXtqwi9foGUDAXzFGPLHk=; b=CgzU7u7rKaSZszIAkwBMKH/r55hdWfadhHqPA6qWzNk107m5ZiWP/ngmsNLAt0b85rsaf+ UsIMJXimocNTKrK4aiBhHdYhJzS7TEL7R9LojOWcNUjcBjVKDzzmStIoP8ah4b8ZZCehCm 9FUWA/k0hvdZG7AqWtNoxhIjB0AtFBnoQqwfq48MeDeMdrpvkNRhhbFhD+1LAXmf0zj0xy w6uJfZB5M+SJp9NZioOe1LzrYeKO3Qhih+MdShs5d7uCdjfB0Y7rHtOppbZLfjBC2oSZLT n6rPZw+uTdh0RApanog6IQOMddcfqEdIdLpsp7KWpEnyxcwPipDJv+E8g8iGnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701591757; a=rsa-sha256; cv=none; b=CVNtbEvkDrzKwIbirJ5EUvdstu5GLSu1eJayaTG9n4bvlabzkYvyH+gZWiT489bP4LRUUu be+Furl0p6GzhoClI5raEnq3PNqSjYzZtV0rQvwAN3IXlXiVoGmhKCsY3nulszYPQroJvv yf5pb6wFmqlxi+40+GXV753teHI8EpxRdSnIrM2e0IxO6nZdeymBXLNRjxsHlJgxOKbb5B 1vPw/gv+BJCHNoWtfGcwawbQpqYsBZGt0x3wwbD2wf0FGQft8hUqnztdqgqL5VBwOrn6ry h7GamXBak81pQ9xGA/5/WIdfXuxUXp9VCH4lQE+KKatZ3+FQHz7TfKkbWWzYEA== 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 4SjftP2TvvzrYY; Sun, 3 Dec 2023 08:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B38MboU085783; Sun, 3 Dec 2023 08:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B38MbDQ085780; Sun, 3 Dec 2023 08:22:37 GMT (envelope-from git) Date: Sun, 3 Dec 2023 08:22:37 GMT Message-Id: <202312030822.3B38MbDQ085780@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: 0cd90ee598ce - main - mlx5: Fix HCA cap 2 query List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0cd90ee598cef68cef72db8b912241868d1067d0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0cd90ee598cef68cef72db8b912241868d1067d0 commit 0cd90ee598cef68cef72db8b912241868d1067d0 Author: Patrisious Haddad AuthorDate: 2023-05-11 09:48:26 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-03 08:21:44 +0000 mlx5: Fix HCA cap 2 query Previously we were trying to set hca_cap_2 without checking if sw_vhca_id_valid max value, which is the only settable value inside hca_cap_2, and seeing that we dont have driver support for sw_vhca_id yet there is no need to set hca_cap_2 at all, it is enough to query it. Fixes: 7b959396ca6fae5635260131eedb9bc19f2726a3 ("mlx5: Introduce new destination type TABLE_TYPE") MFC after: 3 days --- sys/dev/mlx5/mlx5_core/mlx5_main.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c index efaf726e19e5..f6dc1158f085 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_main.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c @@ -561,39 +561,15 @@ static int handle_hca_cap_atomic(struct mlx5_core_dev *dev) static int handle_hca_cap_2(struct mlx5_core_dev *dev) { - void *set_ctx; - void *set_hca_cap; - int set_sz = MLX5_ST_SZ_BYTES(set_hca_cap_in); int err; if (MLX5_CAP_GEN_MAX(dev, hca_cap_2)) { err = mlx5_core_get_caps(dev, MLX5_CAP_GENERAL_2); if (err) return err; - } else { - return 0; } - /* To be added if sw_vhca support was added */ - /*if (!MLX5_CAP_GEN_2_MAX(dev, sw_vhca_id_valid) || - !(dev->priv.sw_vhca_id > 0)) - return 0;*/ - - set_ctx = kzalloc(set_sz, GFP_KERNEL); - if (!set_ctx) - return -ENOMEM; - - MLX5_SET(set_hca_cap_in, set_ctx, op_mod, - MLX5_CAP_GENERAL_2 << 1); - set_hca_cap = MLX5_ADDR_OF(set_hca_cap_in, set_ctx, capability); - memcpy(set_hca_cap, dev->hca_caps_cur[MLX5_CAP_GENERAL_2], - MLX5_ST_SZ_BYTES(cmd_hca_cap_2)); - //MLX5_SET(cmd_hca_cap_2, set_hca_cap, sw_vhca_id_valid, 1); - - err = set_caps(dev, set_ctx, set_sz); - - kfree(set_ctx); - return err; + return 0; } static int set_hca_ctrl(struct mlx5_core_dev *dev) From nobody Sun Dec 3 13:43:55 2023 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 4Sjp1G73b6z52tNY; Sun, 3 Dec 2023 13:44:02 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.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 (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sjp1G4cS9z4TRq; Sun, 3 Dec 2023 13:44:02 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 3B3DhuKl063272; Sun, 3 Dec 2023 07:43:56 -0600 (CST) (envelope-from mike@karels.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karels.net; s=mail2; t=1701611036; bh=ZswKm/dr3ds6Lr1+hClgd261wUo8XyeysJUrFyZsubg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oP+hp2YMbaAOO1OpUhsfFKIjhbOKdDQSbKSO3t/mmv1obV/iZg/eoa2LAmP5sqy3B e4whpfnLCdlmqcRppfJ0ilCYgoiGc55EWpxrQR6cvbnTv37fTyE0BclWCn4vkXL793 sy9HiaU8dBiIQ5zvsNUTd79liKX9n6VGvauKgtxMhySio1Tn/Lhy1eMKj7TUaykRL0 Wb96ET6f01jj5uoJksRBfcklTDW62W1EizpBH/dYowt9MSTblyf1Y9ZZQMcfYHMF3N mbiD7KGVYs8858TTpI0pol1VYADZimM/+i56Uh2RkFzDdGXqWuSMoY70Lv0+9tSLTM CyYU7zpedPgvA== Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id D+TVBxyGbGUm9wAAs/W3XQ (envelope-from ); Sun, 03 Dec 2023 07:43:56 -0600 From: Mike Karels To: Xin LI Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 3b3195f6767b - main - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. Date: Sun, 03 Dec 2023 07:43:55 -0600 X-Mailer: MailMate (1.14r5964) Message-ID: <56101076-F237-4B1E-B6E0-A08921370B75@karels.net> In-Reply-To: <202312030701.3B371MA6049553@gitrepo.freebsd.org> References: <202312030701.3B371MA6049553@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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Rspamd-Queue-Id: 4Sjp1G4cS9z4TRq On 3 Dec 2023, at 1:01, Xin LI wrote: > The branch main has been updated by delphij: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D3b3195f6767b39eb33b35231= 34ef988931c9c86d > > commit 3b3195f6767b39eb33b3523134ef988931c9c86d > Author: Xin LI > AuthorDate: 2023-12-03 07:00:32 +0000 > Commit: Xin LI > CommitDate: 2023-12-03 07:00:32 +0000 > > periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seco= nds.list > when ntpd is enabled. > > The leap-seconds.list is used exclusively by ntpd, therefore, do no= t bother > to perform the fetch when ntpd is not enabled. Wouldn't we want an up-to-date leapsecond file for ntpdate as well? The = daily script can't know if ntpdate is being used. Also, it seems wrong to igno= re daily_ntpd_leapfile_enable if ntpd is not enabled. Mike > PR: conf/275419 > Reviewed by: cy, michaelo, imp > MFC after: 3 days > Differential Revision: https://reviews.freebsd.org/D42875 > --- > usr.sbin/periodic/etc/daily/480.leapfile-ntpd | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd b/usr.sbin/p= eriodic/etc/daily/480.leapfile-ntpd > index 17db53e625f8..c7de845ea87d 100755 > --- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd > +++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd > @@ -12,9 +12,9 @@ fi > > case "$daily_ntpd_leapfile_enable" in > [Yy][Ee][Ss]) > - if service ntpd oneneedfetch; then > + if service ntpd enabled && service ntpd needfetch; then > anticongestion > - service ntpd onefetch > + service ntpd fetch > fi > ;; > esac From nobody Sun Dec 3 14:43:12 2023 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 4SjqKq3lvBz52xnb for ; Sun, 3 Dec 2023 14:43:27 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SjqKp5dH0z4Y24 for ; Sun, 3 Dec 2023 14:43:26 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-54c74b3cd4cso2856211a12.1 for ; Sun, 03 Dec 2023 06:43:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701614604; x=1702219404; 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=A/ZpGPNz5YzbqLeEqtc6hdBOYoRsMD2MZG9hoIW67X4=; b=XCG8TFI9yHbWsK7XG4NP1f27quj/zlEI20+ni9C/5Q3euaLW1JWRPcpixVwwVCNhTf ckn44OF1UYUcYkcbIZhFF+bLmbDEtnV+lSLojfuVc2s+Tg3qh204OH9UHsQcd1r9sIE9 NIEkOYT4CoIe8twQCZPCYHch7l1V4cW8SO0bSP+CEJBmwzFi4wJJ/w9lLt4EHPqbP7/E rSFZG06RDdAlBsdXI6h9iMSPHlOph6Qp172L9dzm8q0mCwynfeqqcN5VD45sdx9/YLTx kdNJ/DugfUz1VXzMwzsp5d7iRdVs+X6OUFcHJBr7+yTJjxdfwHun01mAOudEwHpYaTXz gEBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701614604; x=1702219404; 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=A/ZpGPNz5YzbqLeEqtc6hdBOYoRsMD2MZG9hoIW67X4=; b=sP3Hl+t722K2PMivym9ZYjd9Lc//h3bKRkmWhOAPsUJw5tnjVJKIyzyO2twvwJ3bPw GhS3YHBQsP5Q4tvm5SaK2MkBoBryyGr5O0sHkSJr7Q6b6HlVcuZTftmtAouYXvh0zUnF bJr0uf8hK9kWkW4S9pQoKxPX5gbWOBCc0FAFQkG75+kGnADQXmOkRet0D9PoWs6gzEds XGMCDU8AJVpAcuTazkFd93fB/O943hCYo3V9V62amuCK0g0UraVBCRnPH/NmO7R+whTm QUGTDG3tjx7kH7zpARPZMczhxXseLm0mwZeHRAAJlyNDLE+nnekygK6FFtDkthkoFgQi 6ZrA== X-Gm-Message-State: AOJu0YxwkIAnN6FvBMJ5iKlXfjBFgAwXepY2tvkbEY06wuHE/XqodwJL igMk1r9WSEDqfz0f9OPRx+qJcac/zyR4/2scbv81wQ== X-Google-Smtp-Source: AGHT+IGrXAzI8DJM+d7PVsvavdMdJrvVC7WktFu8Wjn0HGbOpBVnWbhV/U3cv9MFg8wSq7fPA5qtdNai5QfJKsBzBkk= X-Received: by 2002:a50:9313:0:b0:54c:553e:67f5 with SMTP id m19-20020a509313000000b0054c553e67f5mr4609684eda.8.1701614603744; Sun, 03 Dec 2023 06:43:23 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202312030701.3B371MA6049553@gitrepo.freebsd.org> <56101076-F237-4B1E-B6E0-A08921370B75@karels.net> In-Reply-To: <56101076-F237-4B1E-B6E0-A08921370B75@karels.net> From: Warner Losh Date: Sun, 3 Dec 2023 07:43:12 -0700 Message-ID: Subject: Re: git: 3b3195f6767b - main - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. To: Mike Karels Cc: Xin LI , src-committers , "" , "" Content-Type: multipart/alternative; boundary="0000000000000047eb060b9c068e" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4SjqKp5dH0z4Y24 --0000000000000047eb060b9c068e Content-Type: text/plain; charset="UTF-8" On Sun, Dec 3, 2023, 6:44 AM Mike Karels wrote: > On 3 Dec 2023, at 1:01, Xin LI wrote: > > > The branch main has been updated by delphij: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3b3195f6767b39eb33b3523134ef988931c9c86d > > > > commit 3b3195f6767b39eb33b3523134ef988931c9c86d > > Author: Xin LI > > AuthorDate: 2023-12-03 07:00:32 +0000 > > Commit: Xin LI > > CommitDate: 2023-12-03 07:00:32 +0000 > > > > periodic/daily/480.leapfile-ntpd: only attempt to refresh > leap-seconds.list > > when ntpd is enabled. > > > > The leap-seconds.list is used exclusively by ntpd, therefore, do not > bother > > to perform the fetch when ntpd is not enabled. > > Wouldn't we want an up-to-date leapsecond file for ntpdate as well? The > daily > script can't know if ntpdate is being used. Also, it seems wrong to ignore > daily_ntpd_leapfile_enable if ntpd is not enabled. > No. It doesn't need it to do the time exchange. Nor will it be steering a local clock, so it can't insert one Iin real time. Nor is it serving time to others that need to know. And even it today were a leap second day, the remote server would tell it a second is pending. The file is only used as a backup for ntpd turning on its leap indicator on the day of the leap second. Warner Mike > > > PR: conf/275419 > > Reviewed by: cy, michaelo, imp > > MFC after: 3 days > > Differential Revision: https://reviews.freebsd.org/D42875 > > --- > > usr.sbin/periodic/etc/daily/480.leapfile-ntpd | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd > b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd > > index 17db53e625f8..c7de845ea87d 100755 > > --- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd > > +++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd > > @@ -12,9 +12,9 @@ fi > > > > case "$daily_ntpd_leapfile_enable" in > > [Yy][Ee][Ss]) > > - if service ntpd oneneedfetch; then > > + if service ntpd enabled && service ntpd needfetch; then > > anticongestion > > - service ntpd onefetch > > + service ntpd fetch > > fi > > ;; > > esac > --0000000000000047eb060b9c068e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Sun, Dec 3, 2023, 6:44 AM Mike Karels <mike@karels.net> wrote:
On 3 Dec 2023, at 1:01, Xin LI wrote:

> The branch main has been updated by delphij:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3D3b3195f6767b39eb33b3523134ef98= 8931c9c86d
>
> commit 3b3195f6767b39eb33b3523134ef988931c9c86d
> Author:=C2=A0 =C2=A0 =C2=A0Xin LI <delphij@FreeBSD.org>
> AuthorDate: 2023-12-03 07:00:32 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Xin LI <delphij@FreeBSD.org>
> CommitDate: 2023-12-03 07:00:32 +0000
>
>=C2=A0 =C2=A0 =C2=A0periodic/daily/480.leapfile-ntpd: only attempt to r= efresh leap-seconds.list
>=C2=A0 =C2=A0 =C2=A0when ntpd is enabled.
>
>=C2=A0 =C2=A0 =C2=A0The leap-seconds.list is used exclusively by ntpd, = therefore, do not bother
>=C2=A0 =C2=A0 =C2=A0to perform the fetch when ntpd is not enabled.

Wouldn't we want an up-to-date leapsecond file for ntpdate as well?=C2= =A0 The daily
script can't know if ntpdate is being used.=C2=A0 Also, it seems wrong = to ignore
daily_ntpd_leapfile_enable if ntpd is not enabled.

=C2=A0No. It doesn't = need it to do the time exchange. Nor will it be steering a local clock, so = it can't insert one Iin real time. Nor is it serving time to others tha= t need to know. And even it today were a leap second day, the remote server= would tell it a second is pending.

The file is only used as a backup for ntpd turning on its leap = indicator on the day of the leap second.=C2=A0

<= /div>
Warner

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Mike

>=C2=A0 =C2=A0 =C2=A0PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= conf/275419
>=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 cy, michaelo, imp
>=C2=A0 =C2=A0 =C2=A0MFC after:=C2=A0 =C2=A0 =C2=A0 3 days
>=C2=A0 =C2=A0 =C2=A0Differential Revision: https://= reviews.freebsd.org/D42875
> ---
>=C2=A0 usr.sbin/periodic/etc/daily/480.leapfile-ntpd | 4 ++--
>=C2=A0 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd b/usr.sbin/= periodic/etc/daily/480.leapfile-ntpd
> index 17db53e625f8..c7de845ea87d 100755
> --- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd
> +++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd
> @@ -12,9 +12,9 @@ fi
>
>=C2=A0 case "$daily_ntpd_leapfile_enable" in
>=C2=A0 =C2=A0 =C2=A0 [Yy][Ee][Ss])
> -=C2=A0 =C2=A0 =C2=A0if service ntpd oneneedfetch; then
> +=C2=A0 =C2=A0 =C2=A0if service ntpd enabled && service ntpd n= eedfetch; then
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0anticongestion
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0service ntpd onefetch
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0service ntpd fetch
>=C2=A0 =C2=A0 =C2=A0 =C2=A0fi
>=C2=A0 =C2=A0 =C2=A0 =C2=A0;;
>=C2=A0 esac
--0000000000000047eb060b9c068e-- From nobody Sun Dec 3 16:50:44 2023 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 4Sjt8h3wNzz535Lg; Sun, 3 Dec 2023 16:50: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sjt8h3Qysz3GwD; Sun, 3 Dec 2023 16:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701622244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ILv3EIbv7fA3wy35GupCXRLyu3M/O0U9jHTgx7dAoo=; b=iNLVShclYxZzfUeaPjfAkdgeq1fe44r7ZcjM8ju5MCm4O1FsItzdop11Mk7nVK9DxfwkQh q79euR536hl3hRnx9cZ0SVBnTgC/qYz9tAO6/kQgcg8kTdh3oVeaxy53vPlsS0z81xSJeQ 3VmtAt32cws3oZxZBMdNwWQXpRelTyGJYgvt8NVzZ124xNa85og8zZF7dXizi7bZtwuD5C 8/6Zm39TOEytatvKRdKzFEPhLjCrMUg3NdVxc6t8BdwSZ2MfE5HezMhUjHmSq4dMga2nND Yi2G9vrEIeXtBCpAwB0jAk4pOfEFbYjsvKJq7aVNOOPR+JGwLWxeCOT9CSOEpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701622244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ILv3EIbv7fA3wy35GupCXRLyu3M/O0U9jHTgx7dAoo=; b=cZjInus859L23HaT+ljn6Nl6XBL1L30OHdoN14ndL5Y7iaz7dTaz/Lo2D26m0iKSj9Z5ys +Tno6ML+Z6q/c7Ueya2M15aQ52V09uCxvx5QNaH32siAWaCYRDD7V7lDbwsz8KSTY34npA yTyLLkqPsFtxUB6L6OKWY66hnirW9NzbbjfFzpJehsbRSFfLQwwOjeQs0a/aGwmXSblwcU PmB5Fayi4azGXj9utVQoJVu3Rn8kjZzZlUZzV2KxWz86tRHiElDFfA+6L/5jO4T4x96N8p ySPNdPAY8oH45vVshukpjiSPrVsddv5HFzJPRKQ+/BeWPTQVLGQLDwsaLrgw7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701622244; a=rsa-sha256; cv=none; b=hw09hWayoDjBN/kguOg2/W+gMWG8v709bl7YnjzrjQ+qPjImOqfXwGP4f2cMfr7k1hNtc/ k4x/IYAC0FK2NVKQFoA2MAjNILGMUtILmSoJK3CjFG9nEn2REzqGHhqc5Hbmcxt0aw09nu 5oyBRE5qns836oiXyTzIY01SduN1+QbH8ye47OqJUYbRsB3ajOW4ftiHT3yzH72iMTwo3A aOXrqgmqWbuXda+CULkwR+KUbtiMsR2wjmvra1Y9c7VqbTQmKcM6iswr6rnK1Uoq3BFjcl weeE+CNlvIYvZYuIW4OXO3IGdzQ4DLnqtKSfMEZTqB+rpA0+oSGYEyiHYUJBMw== 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 4Sjt8h2TT1z16Jm; Sun, 3 Dec 2023 16:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B3GoiGU031931; Sun, 3 Dec 2023 16:50:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B3Goii4031928; Sun, 3 Dec 2023 16:50:44 GMT (envelope-from git) Date: Sun, 3 Dec 2023 16:50:44 GMT Message-Id: <202312031650.3B3Goii4031928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 970d73856b62 - main - usbdevs: add quirk for WD MyPassport Ultra External HDD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 970d73856b626a68597de19d37b68c376e2c0491 Auto-Submitted: auto-generated The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=970d73856b626a68597de19d37b68c376e2c0491 commit 970d73856b626a68597de19d37b68c376e2c0491 Author: Eugene Grosbein AuthorDate: 2023-12-03 16:48:34 +0000 Commit: Eugene Grosbein CommitDate: 2023-12-03 16:50:40 +0000 usbdevs: add quirk for WD MyPassport Ultra External HDD WD MyPassport Ultra External HDD needs quirk UQ_MSC_NO_TEST_UNIT_READY to attach. MFC after: 3 days --- sys/dev/usb/quirk/usb_quirk.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 98515be2a06d..a0a7b3fc75a5 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -558,6 +558,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(WESTERN, MYPASSPORTES_07, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_08, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_09, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(WESTERN, MYPASSPORTUL_00, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY), USB_QUIRK(WINMAXGROUP, FLASH64MC, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(YANO, FW800HD, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 6543f0cbaa29..221761af4fe7 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4944,6 +4944,7 @@ product WESTERN MYPASSPORTES_06 0x0750 MyPassport Essential External HDD product WESTERN MYPASSPORTES_07 0x0752 MyPassport Essential External HDD product WESTERN MYPASSPORTES_08 0x07A0 MyPassport Essential External HDD product WESTERN MYPASSPORTES_09 0x07A2 MyPassport Essential External HDD +product WESTERN MYPASSPORTUL_00 0x0743 MyPassport Ultra External HDD /* WeTelecom products */ product WETELECOM WM_D200 0x6801 WM-D200 From nobody Sun Dec 3 17:35:03 2023 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 4Sjv7r0tm6z5383t; Sun, 3 Dec 2023 17:35:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sjv7r0NvYz3KRm; Sun, 3 Dec 2023 17:35:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701624904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M07aUcBIDBHt/0URJfcXjezd4QasaDE00iEMgGorS4U=; b=h5r3r53q8efwhR+uL9BskUEGLG6KjVuLJZxVhnkgtthUrVBFG5l+U5lLJe5GmtYHcqQ6cn 1uKSg05m3Fl/6xyCMC4gczJMaRCzEcowzZnxtp9HJxHV2gqM1ReBvFKaVguJ6L7OWMAJ9/ LcEseu4jkLABGSX0BhPX5lFMf5s8CmhVRKDovGTAG7GevDb7F7Co5y61lYOzXU8Xa/tDvM fmG5AlhuVrlI4CyQ9EwFpYyOdi5Vd19aSQmRUJV2jArv5YIzILKusMHwar7O49Ju2UixZX xko0zHDVkFcz6UmrU5ZamLTCIwCXPFhhD2O2a9JCda+2/xLHxYgjUeiAwG0xag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701624904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M07aUcBIDBHt/0URJfcXjezd4QasaDE00iEMgGorS4U=; b=MsYxGSyQ7QeiXaamsROuF7wdy73sINE07aYht66d4Cf9xx7NdBg0NEERSl4XaR6fKrf6ZX OOksO7ScIl0tdEdx74/stWKYbi7kftkPrMiDhO9uH/yz9p9EU3OfE+8ENq0zyXZXOWAZd1 89gFeKWhJTogd2D+eIIja83fH5qNYGatYKHHmlrP5N8zF9rEGQbgp9xi0/KmGKEGF51Kzw Y+xlgTi8w7UwwOiFvDpoibhz3liPG6Z9F7e6e7a3FZBJB2HEzEpXS5Ax8G1E3sLUjJXwWo OiwbrNIi9FAOSpEAh6cBdO5imJv592ujUbNkrD1K0QCtGi3wmrkZQOM/bzSUhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701624904; a=rsa-sha256; cv=none; b=xqLilwfwyAaLZc0SG77vveYFuNtxGnJSPLHKVc1CirvV9FKMycBltMx+6U8o7wPkDGcTo+ qaR4ai85qTb71tSojO/fpX9MnyNBiRM4qyTTdYA7OhyjjiKuddEn7lbtG0HsAPu3SOuKkI 6VabBJ+h1upOu3s+xQPQHxz4V6ZojHKv+R1zVdlhghfaKyPs4K0Q0uK762GyHoF9VsUbHk If1ItIbka7NtWLhtOEVvDCrscKIAY0ASTOBSktLU2E4p3MobxctdUX6UgRXFjYW2+gZ+0D 8PAv35yqzJ0cFiEE+4vwfcgpONEqfr5mWIkYMOwizmsDpAfNIhOHVb1Fhsbr1g== 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 4Sjv7q6Y7dz17GK; Sun, 3 Dec 2023 17:35:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B3HZ3hN004779; Sun, 3 Dec 2023 17:35:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B3HZ3rh004776; Sun, 3 Dec 2023 17:35:03 GMT (envelope-from git) Date: Sun, 3 Dec 2023 17:35:03 GMT Message-Id: <202312031735.3B3HZ3rh004776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Pedro F. Giffuni" Subject: git: 7e8afbb6d605 - main - patch: fix locate_hunk in empty files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pfg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e8afbb6d605006d7cb867362b225d21c4f5ae57 Auto-Submitted: auto-generated The branch main has been updated by pfg: URL: https://cgit.FreeBSD.org/src/commit/?id=7e8afbb6d605006d7cb867362b225d21c4f5ae57 commit 7e8afbb6d605006d7cb867362b225d21c4f5ae57 Author: Pedro F. Giffuni AuthorDate: 2023-12-03 17:33:03 +0000 Commit: Pedro F. Giffuni CommitDate: 2023-12-03 17:33:03 +0000 patch: fix locate_hunk in empty files if `first_guess' is zero then main() assumes that locate_hunk has failed and aborts the patch operation. Instead, make sure to return 1 (the line number) so that the patch operation can continue. Issue originally found by Neels Hofmeyr in the regress suite of the diff implementation for got, where the tests assume that applying a diff with `patch' and then again with `patch -R' yields back the original file. Obtained from: OpenBSD (CVS patch.c,v 1.71) --- usr.bin/patch/patch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c index ecaf799fe9b6..403189bc92b1 100644 --- a/usr.bin/patch/patch.c +++ b/usr.bin/patch/patch.c @@ -717,6 +717,8 @@ locate_hunk(LINENUM fuzz) || diff_type == UNI_DIFF)) { say("Empty context always matches.\n"); } + if (first_guess == 0) /* empty file */ + return 1; return (first_guess); } if (max_neg_offset >= first_guess) /* do not try lines < 0 */ From nobody Sun Dec 3 17:48:18 2023 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 4SjvR72LKwz538dJ; Sun, 3 Dec 2023 17:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SjvR71b4cz3Lm9; Sun, 3 Dec 2023 17:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701625699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kKn7RQ1HraZ/j4V9xfwdsKkCCJSuMs/1piv2Bxoj/qw=; b=DHYjSbFu7vIMfuh4dYq+emY58xGlPxGSt6OF8KCl0My6dp6LcccSxycnDUUe40mV+WQqNY 9uFxq5EG8UC/Z0yLkSbOVBXa+3THK3snhN8h3IVYW9ywdVcbkbbTxl4PXho87+SqD/LIVL ita5qH13bexvUffJqJ5bDA4/p2+jaTPtVkyHdh6HWr5H4iSm5DAieBPVugHYKr/ICnJ6u1 olEOaIZVElh3Kg9CvNRXtRaFZ5Okky4bplVi1mCch0IZusTP+WTLwXLzw0NYx1gvaiyQ+D fkkA9pFvL155Q208BsJTOhdYutDOvgeEiDHuzhsRhSwVI/ltRdMt6cn0zOgNSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701625699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kKn7RQ1HraZ/j4V9xfwdsKkCCJSuMs/1piv2Bxoj/qw=; b=fJu20kC8+r5SlAO1oUnB0dL3X5vh0HeNssPMGHOWEx9Lv88eCLWmRV7vlFQ+HLQ1qVGS64 oiRHFLLHDyk0h2InQr7eCQnRlKAO8L4fxb1j65ltPzk8VpEIqQAFukwahBTYgmfgiS7WVM rbEfWMzvqkVUvfLpnEXP+2Y4TmvDtrpJFfzVtG3xhgFIy/qMMEjQsf/HMGDoQhyLlmmhy1 754K7l7bFYTD3JYlvKb185BmpzqLS3WsTHXuvNe+mCT92OhenU9o59LlrDPV4pH8zuHQpG 8sjvAt5LxN0I6jrEhMwNotc70TkuTnioCmT1ACdOyHDLDBr2teiPN2fDNli7+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701625699; a=rsa-sha256; cv=none; b=um7epVjebVn/Nmz8nWjxuFKk0xH1iTrDahXA7M8aMPhgOB9usnnh6C1a+jM4+ucs6fsC73 3W6fUtPtcOkkGoQ3ZCf7E8X1WPR3kHzr9Y8SQnykVRNMSLkGOa/mkTisRBDGeCTj9z98ii PLitUb1ueVx/iojnjVHD0mGRRcxt8cWZ0mcc1Qp8YGeBHLzY2Ws0mxTDokBg6AtX7y1UVl Gd/QbtPpQnFbUmZ6jeoBVRxJTvVDLaXIvjVobg07DfD9eYFb+xl7J9d+TTMAgtPiB2Stsl 5jLVDjLHEqADAXlShJGAl3y3Lipx8b0tEV4sRALZghZHE5ohac+sjEBBZ1y0lg== 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 4SjvR70D9kz17Ps; Sun, 3 Dec 2023 17:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B3HmIml022333; Sun, 3 Dec 2023 17:48:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B3HmIp5022330; Sun, 3 Dec 2023 17:48:18 GMT (envelope-from git) Date: Sun, 3 Dec 2023 17:48:18 GMT Message-Id: <202312031748.3B3HmIp5022330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 118b866d9c39 - stable/14 - ossl: Fix some bugs in the fallback AES-GCM implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 118b866d9c39da1f5a17680e2034b3eff7337988 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=118b866d9c39da1f5a17680e2034b3eff7337988 commit 118b866d9c39da1f5a17680e2034b3eff7337988 Author: Mark Johnston AuthorDate: 2023-11-29 20:08:12 +0000 Commit: Mark Johnston CommitDate: 2023-12-03 17:48:09 +0000 ossl: Fix some bugs in the fallback AES-GCM implementation gcm_*_aesni() are used when the AVX512 implementation is not available. Fix two bugs which manifest when handling operations spanning multiple segments: - Avoid underflow when the length of the input is smaller than the residual. - In gcm_decrypt_aesni(), ensure that we begin the operation at the right offset into the input and output buffers. Reviewed by: jhb Fixes: 9b1d87286c78 ("ossl: Add a fallback AES-GCM implementation using AES-NI") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42838 (cherry picked from commit 47d767dab54895f3ba8abac6ab2295797394659e) --- sys/crypto/openssl/amd64/ossl_aes_gcm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/crypto/openssl/amd64/ossl_aes_gcm.c b/sys/crypto/openssl/amd64/ossl_aes_gcm.c index 0d205ec3ff90..d08b2ac8a759 100644 --- a/sys/crypto/openssl/amd64/ossl_aes_gcm.c +++ b/sys/crypto/openssl/amd64/ossl_aes_gcm.c @@ -459,7 +459,7 @@ gcm_encrypt_aesni(struct ossl_gcm_context *ctx, const unsigned char *in, size_t bulk = 0, res; int error; - res = (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN; + res = MIN(len, (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN); if ((error = gcm_encrypt(ctx, in, out, res)) != 0) return error; @@ -621,12 +621,12 @@ gcm_decrypt_aesni(struct ossl_gcm_context *ctx, const unsigned char *in, size_t bulk = 0, res; int error; - res = (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN; + res = MIN(len, (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN); if ((error = gcm_decrypt(ctx, in, out, res)) != 0) return error; - bulk = aesni_gcm_decrypt(in, out, len, &ctx->aes_ks, ctx->gcm.Yi.c, - ctx->gcm.Xi.u); + bulk = aesni_gcm_decrypt(in + res, out + res, len - res, &ctx->aes_ks, + ctx->gcm.Yi.c, ctx->gcm.Xi.u); ctx->gcm.len.u[1] += bulk; bulk += res; From nobody Sun Dec 3 20:40:33 2023 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 4SjzFt0P99z53K9B; Sun, 3 Dec 2023 20:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SjzFs6xWPz3b67; Sun, 3 Dec 2023 20:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701636034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=37RAP4RG79S3G28DxZqWL4vVhvhn73v2T2JPzLPD+ho=; b=EGdYA/cIdvSIPmfKzQJEiOceG+flhZh/KJxx2RXgb0chfxbx/6ED+PDgYuXSR7sU0HFDF/ tNk5Sgmf7q9Kj2zfgcmMkOvZRZTiKCPOHKgvGauDdFzhvZuVguJ1wMNtnnmjF9SOzaBXAW eS+JXmFTQhJ95WPejQXcAfZWdp2KeJI//wBZq7LsRTeInSqkq86XzPBJqgke8z/nU6BmyJ 0gbX7RdO4POHi60TG2MwRPWvkhrd7X9b8yDGYeaAWETC4adyrbk9lyBzgw5zbADN7ETRLT VNX26Uqzuc+cR3EfI7J2kzLhdeaV8/mKMGJUIbMSJhmH+JlB1Nm7ORqTFjaKzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701636034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=37RAP4RG79S3G28DxZqWL4vVhvhn73v2T2JPzLPD+ho=; b=t/q0b7ywsko1OWsxG3WCfknGnTb9Fpqf+AH92A3lIZaUnEb4jPT+WaRlHyVl7vNsY6ctIr H9xD420wGJIxoFaYArO9+blQQ4b4rikkPCd1J+3H/dQ/jM68VpgUxa+7FOoSkUcnQaG6T9 sExvNhchtalfSQ6+PlVrR6SVnoPMXqCboFDr3pZij1ymGV3HXXiuxFGVQ3bmN97cfxqsc8 xBXJGDR6HrEvZMsLoCFO/VNYf3RjXwPdj8m6YGFkrMEBvR0SBrDxccEXzNlwdUo95WRn9q fY443Ddc7uqJNmHeDn5nSY1L7kB/17LhAGzP6ORIbZFkEcp0AmOLBtwhiKJO+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701636034; a=rsa-sha256; cv=none; b=xBBG8X1P9LXtZNBN6nI1bAY/vO0jRr4E6b8tWuJDfTNCi6ah1VtXXAsm7tUfluBWlMgSPC HQk4aQFGY6Lq65TrEHbesd9GTB3YDfyE6MBCcn7i8vb2VYOI2dBUU9Iz3uiPw1eLpvIg40 l41RZ7rVi8bCATH2oSzlxh58KzhhhTkYhSBfYGV4ZYO9N0s7iBFyxycXdnyRAZyHn37Uop XMJR2KnWVXVuKGj0lVdSWBopbzNBLw3UXAZXgITwANnfVyOmRIJTwGpvA+HP3AcTGvmCa7 383PmxCaELZMmTmpV3rADSFEMk9JppyCUL814YCbFp+iocWigROf4rUXxKTqdQ== 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 4SjzFs6083z1CSl; Sun, 3 Dec 2023 20:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B3KeXdM015650; Sun, 3 Dec 2023 20:40:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B3KeXuR015647; Sun, 3 Dec 2023 20:40:33 GMT (envelope-from git) Date: Sun, 3 Dec 2023 20:40:33 GMT Message-Id: <202312032040.3B3KeXuR015647@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: 35a301555bff - main - Increase UFS/FFS maximum link count from 32767 to 65530. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 35a301555bff2ac27a727c10641b7efb3f162988 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=35a301555bff2ac27a727c10641b7efb3f162988 commit 35a301555bff2ac27a727c10641b7efb3f162988 Author: Kirk McKusick AuthorDate: 2023-12-03 20:36:42 +0000 Commit: Kirk McKusick CommitDate: 2023-12-03 20:40:29 +0000 Increase UFS/FFS maximum link count from 32767 to 65530. The link count for a UFS/FFS inode is stored in a signed 16-bit integer. Thus the maximum link count has been 32767. This limit has been recently hit by the poudriere build system when doing a ports build as it needs one directory per port and the number of ports recently passed 32767. A long-term solution would be to use one of the spare 32-bit fields in the inode to store the link count. However, the UFS1 format does not have a spare and adding the spare in UFS2 would make it hard to make it compatible when running on older kernels that use the original link count field. So this patch uses the much simpler approach of changing the existing link count field from a signed 16-bit value to an unsigned 16-bit value. It has the fewest lines of code changes. The only thing that changes is the type in the dinode and inode structures and the definition of UFS_LINK_MAX. It has the added benefit that it works with both UFS1 and UFS2. It allows easy backward compatibility. Indeed it is backward compatibility that is the primary reason to go with this approach. If a filesystem with the new organization is mounted on an older kernel, it still needs to work. Thus if we move the new link count to a new field, we still need to maintain the old link count as best as possible even when running on a kernel that knows about the larger link counts. And we would have to carry this overhead for the indefinite future. If we have a new link-count field, we will have to add a new filesystem flag to indicate that we are running with larger link counts. We will also need to add of one of the new-feature flags to say that we have larger link counts. Older kernels clear the new-feature flags that they do not know about, so when a filesystem is used on an older kernel and then moved back to a newer one, the newer one will know that the new link counts have not been maintained and that it will be necessary to run a full fsck on the filesystem to correct the link counts before it can be mounted. With this change, older kernels will generally work with the bigger counts. While it will not itself allow the link count to exceed 32767, it will have no problem working with inodes that have a link count greater than 32767. Since it tests that i_nlink <= UFS_LINK_MAX, counts that are bigger than 32767 will appear negative, so will still pass the test. Of course, if they ever drop below 32767, they will no longer be able to exceed 32767. The one issue is if the link count ever exceeds 65535 then it will wrap to zero and the older kernel will be none the wiser. But this corner case is likely to be very rare since these kernels and the applications running on them do not expect to be able to get link counts over 32767. And over time, the use of new filesystems on older kernels will become rarer and rarer. Reported-by: Mark Millard running poudriere on the ports tree Reviewed-by: kib, olce.freebsd_certner.fr Tested-by: Peter Holm, Mark Millard MFC-after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42767 --- sys/ufs/ffs/ffs_alloc.c | 2 +- sys/ufs/ffs/ffs_softdep.c | 4 ++-- sys/ufs/ufs/dinode.h | 6 +++--- sys/ufs/ufs/inode.h | 10 ++++++++-- sys/ufs/ufs/ufs_lookup.c | 8 ++++---- sys/ufs/ufs/ufs_vnops.c | 32 ++++++++++++++++---------------- 6 files changed, 34 insertions(+), 28 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 38e6d6a41ec0..713dcf1ca97a 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -3330,7 +3330,7 @@ sysctl_ffs_fsck(SYSCTL_HANDLER_ARGS) break; ip = VTOI(vp); ip->i_nlink += cmd.size; - DIP_SET(ip, i_nlink, ip->i_nlink); + DIP_SET_NLINK(ip, ip->i_nlink); ip->i_effnlink += cmd.size; UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_MODIFIED); error = ffs_update(vp, 1); diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 2afafb9380ba..5c8e2b6cde81 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -10046,7 +10046,7 @@ handle_workitem_remove(struct dirrem *dirrem, int flags) KASSERT(ip->i_nlink >= 0, ("handle_workitem_remove: file ino " "%ju negative i_nlink %d", (intmax_t)ip->i_number, ip->i_nlink)); - DIP_SET(ip, i_nlink, ip->i_nlink); + DIP_SET_NLINK(ip, ip->i_nlink); UFS_INODE_SET_FLAG(ip, IN_CHANGE); if (ip->i_nlink < ip->i_effnlink) panic("handle_workitem_remove: bad file delta"); @@ -10069,7 +10069,7 @@ handle_workitem_remove(struct dirrem *dirrem, int flags) ip->i_nlink -= 2; KASSERT(ip->i_nlink >= 0, ("handle_workitem_remove: directory ino " "%ju negative i_nlink %d", (intmax_t)ip->i_number, ip->i_nlink)); - DIP_SET(ip, i_nlink, ip->i_nlink); + DIP_SET_NLINK(ip, ip->i_nlink); UFS_INODE_SET_FLAG(ip, IN_CHANGE); if (ip->i_nlink < ip->i_effnlink) panic("handle_workitem_remove: bad dir delta"); diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h index 0819362b1def..673e6f2555f1 100644 --- a/sys/ufs/ufs/dinode.h +++ b/sys/ufs/ufs/dinode.h @@ -123,7 +123,7 @@ typedef int64_t ufs_time_t; struct ufs2_dinode { uint16_t di_mode; /* 0: IFMT, permissions; see below. */ - int16_t di_nlink; /* 2: File link count. */ + uint16_t di_nlink; /* 2: File link count. */ uint32_t di_uid; /* 4: File owner. */ uint32_t di_gid; /* 8: File group. */ uint32_t di_blksize; /* 12: Inode blocksize. */ @@ -178,7 +178,7 @@ struct ufs2_dinode { */ struct ufs1_dinode { uint16_t di_mode; /* 0: IFMT, permissions; see below. */ - int16_t di_nlink; /* 2: File link count. */ + uint16_t di_nlink; /* 2: File link count. */ union { uint32_t di_freelink; /* 4: SUJ: Next unlinked inode. */ uint32_t di_dirdepth; /* 4: IFDIR: depth from root dir */ @@ -208,6 +208,6 @@ struct ufs1_dinode { uint64_t di_modrev; /* 120: i_modrev for NFSv4 */ }; -#define UFS_LINK_MAX 32767 +#define UFS_LINK_MAX 65500 /* leave a few spare for special values */ #endif /* _UFS_UFS_DINODE_H_ */ diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h index 4f456d319ad0..85d3c4898318 100644 --- a/sys/ufs/ufs/inode.h +++ b/sys/ufs/ufs/inode.h @@ -95,7 +95,7 @@ struct inode { ino_t i_number; /* The identity of the inode. */ uint32_t i_flag; /* flags, see below */ - int i_effnlink; /* i_nlink when I/O completes */ + int32_t i_effnlink; /* i_nlink when I/O completes */ /* * Side effects; used during directory lookup. @@ -131,7 +131,7 @@ struct inode { uint32_t i_flags; /* Status flags (chflags). */ uint32_t i_uid; /* File owner. */ uint32_t i_gid; /* File group. */ - int16_t i_nlink; /* File link count. */ + int32_t i_nlink; /* File link count. */ uint16_t i_mode; /* IFMT, permissions; see below. */ }; /* @@ -242,6 +242,12 @@ I_IS_UFS2(const struct inode *ip) else \ (ip)->i_din2->d##field = (val); \ } while (0) +#define DIP_SET_NLINK(ip, val) do { \ + KASSERT(ip->i_nlink >= 0, ("%s:%d %s(): setting negative " \ + "nlink value %d for inode %jd\n", __FILE__, __LINE__, \ + __FUNCTION__, (ip)->i_nlink, (ip)->i_number)); \ + DIP_SET(ip, i_nlink, val); \ + } while (0) #define IS_SNAPSHOT(ip) ((ip)->i_flags & SF_SNAPSHOT) #define IS_UFS(vp) ((vp)->v_data != NULL) diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index 68955488ff0e..2d6c79970c96 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -1121,7 +1121,7 @@ ufs_dirremove(struct vnode *dvp, struct inode *ip, int flags, int isrmdir) softdep_setup_unlink(dp, ip); } else { ip->i_nlink--; - DIP_SET(ip, i_nlink, ip->i_nlink); + DIP_SET_NLINK(ip, ip->i_nlink); UFS_INODE_SET_FLAG(ip, IN_CHANGE); } } @@ -1137,7 +1137,7 @@ ufs_dirremove(struct vnode *dvp, struct inode *ip, int flags, int isrmdir) softdep_change_linkcnt(ip); } else { ip->i_nlink++; - DIP_SET(ip, i_nlink, ip->i_nlink); + DIP_SET_NLINK(ip, ip->i_nlink); UFS_INODE_SET_FLAG(ip, IN_CHANGE); } } @@ -1241,7 +1241,7 @@ ufs_dirrewrite(struct inode *dp, struct inode *oip, ino_t newinum, int newtype, softdep_setup_unlink(dp, oip); } else { oip->i_nlink--; - DIP_SET(oip, i_nlink, oip->i_nlink); + DIP_SET_NLINK(oip, oip->i_nlink); UFS_INODE_SET_FLAG(oip, IN_CHANGE); } @@ -1258,7 +1258,7 @@ ufs_dirrewrite(struct inode *dp, struct inode *oip, ino_t newinum, int newtype, softdep_change_linkcnt(oip); } else { oip->i_nlink++; - DIP_SET(oip, i_nlink, oip->i_nlink); + DIP_SET_NLINK(oip, oip->i_nlink); UFS_INODE_SET_FLAG(oip, IN_CHANGE); } return (error); diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 88772131a0ab..3bfa2019739a 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1131,7 +1131,7 @@ ufs_link( ip->i_effnlink++; ip->i_nlink++; - DIP_SET(ip, i_nlink, ip->i_nlink); + DIP_SET_NLINK(ip, ip->i_nlink); UFS_INODE_SET_FLAG(ip, IN_CHANGE); if (DOINGSOFTDEP(vp)) softdep_setup_link(VTOI(tdvp), ip); @@ -1144,7 +1144,7 @@ ufs_link( if (error) { ip->i_effnlink--; ip->i_nlink--; - DIP_SET(ip, i_nlink, ip->i_nlink); + DIP_SET_NLINK(ip, ip->i_nlink); UFS_INODE_SET_FLAG(ip, IN_CHANGE); if (DOINGSOFTDEP(vp)) softdep_revert_link(VTOI(tdvp), ip); @@ -1526,7 +1526,7 @@ relock: */ fip->i_effnlink++; fip->i_nlink++; - DIP_SET(fip, i_nlink, fip->i_nlink); + DIP_SET_NLINK(fip, fip->i_nlink); UFS_INODE_SET_FLAG(fip, IN_CHANGE); if (DOINGSOFTDEP(fvp)) softdep_setup_link(tdp, fip); @@ -1555,7 +1555,7 @@ relock: if (tdp->i_nlink >= UFS_LINK_MAX) { fip->i_effnlink--; fip->i_nlink--; - DIP_SET(fip, i_nlink, fip->i_nlink); + DIP_SET_NLINK(fip, fip->i_nlink); UFS_INODE_SET_FLAG(fip, IN_CHANGE); if (DOINGSOFTDEP(fvp)) softdep_revert_link(tdp, fip); @@ -1678,11 +1678,11 @@ relock: */ if (!newparent) { tdp->i_nlink--; - DIP_SET(tdp, i_nlink, tdp->i_nlink); + DIP_SET_NLINK(tdp, tdp->i_nlink); UFS_INODE_SET_FLAG(tdp, IN_CHANGE); } tip->i_nlink--; - DIP_SET(tip, i_nlink, tip->i_nlink); + DIP_SET_NLINK(tip, tip->i_nlink); UFS_INODE_SET_FLAG(tip, IN_CHANGE); } } @@ -1717,7 +1717,7 @@ relock: if (tip == NULL) { tdp->i_effnlink++; tdp->i_nlink++; - DIP_SET(tdp, i_nlink, tdp->i_nlink); + DIP_SET_NLINK(tdp, tdp->i_nlink); UFS_INODE_SET_FLAG(tdp, IN_CHANGE); if (DOINGSOFTDEP(tdvp)) softdep_setup_dotdot_link(tdp, fip); @@ -1780,7 +1780,7 @@ unlockout: bad: fip->i_effnlink--; fip->i_nlink--; - DIP_SET(fip, i_nlink, fip->i_nlink); + DIP_SET_NLINK(fip, fip->i_nlink); UFS_INODE_SET_FLAG(fip, IN_CHANGE); if (DOINGSOFTDEP(fvp)) softdep_revert_link(tdp, fip); @@ -2120,7 +2120,7 @@ ufs_mkdir( tvp->v_type = VDIR; /* Rest init'd in getnewvnode(). */ ip->i_effnlink = 2; ip->i_nlink = 2; - DIP_SET(ip, i_nlink, 2); + DIP_SET_NLINK(ip, 2); DIP_SET(ip, i_dirdepth, DIP(dp,i_dirdepth) + 1); if (cnp->cn_flags & ISWHITEOUT) { @@ -2135,7 +2135,7 @@ ufs_mkdir( */ dp->i_effnlink++; dp->i_nlink++; - DIP_SET(dp, i_nlink, dp->i_nlink); + DIP_SET_NLINK(dp, dp->i_nlink); UFS_INODE_SET_FLAG(dp, IN_CHANGE); if (DOINGSOFTDEP(dvp)) softdep_setup_mkdir(dp, ip); @@ -2226,7 +2226,7 @@ bad: } else { dp->i_effnlink--; dp->i_nlink--; - DIP_SET(dp, i_nlink, dp->i_nlink); + DIP_SET_NLINK(dp, dp->i_nlink); UFS_INODE_SET_FLAG(dp, IN_CHANGE); /* * No need to do an explicit VOP_TRUNCATE here, vrele will @@ -2234,7 +2234,7 @@ bad: */ ip->i_effnlink = 0; ip->i_nlink = 0; - DIP_SET(ip, i_nlink, 0); + DIP_SET_NLINK(ip, 0); UFS_INODE_SET_FLAG(ip, IN_CHANGE); if (DOINGSOFTDEP(tvp)) softdep_revert_mkdir(dp, ip); @@ -2331,11 +2331,11 @@ ufs_rmdir( */ if (!DOINGSOFTDEP(vp)) { dp->i_nlink--; - DIP_SET(dp, i_nlink, dp->i_nlink); + DIP_SET_NLINK(dp, dp->i_nlink); UFS_INODE_SET_FLAG(dp, IN_CHANGE); error = UFS_UPDATE(dvp, 0); ip->i_nlink--; - DIP_SET(ip, i_nlink, ip->i_nlink); + DIP_SET_NLINK(ip, ip->i_nlink); UFS_INODE_SET_FLAG(ip, IN_CHANGE); } cache_vop_rmdir(dvp, vp); @@ -2872,7 +2872,7 @@ ufs_makeinode(int mode, struct vnode *dvp, struct vnode **vpp, tvp->v_type = IFTOVT(mode); /* Rest init'd in getnewvnode(). */ ip->i_effnlink = 1; ip->i_nlink = 1; - DIP_SET(ip, i_nlink, 1); + DIP_SET_NLINK(ip, 1); if (DOINGSOFTDEP(tvp)) softdep_setup_create(VTOI(dvp), ip); if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, cnp->cn_cred) && @@ -2928,7 +2928,7 @@ bad: */ ip->i_effnlink = 0; ip->i_nlink = 0; - DIP_SET(ip, i_nlink, 0); + DIP_SET_NLINK(ip, 0); UFS_INODE_SET_FLAG(ip, IN_CHANGE); if (DOINGSOFTDEP(tvp)) softdep_revert_create(VTOI(dvp), ip); From nobody Sun Dec 3 22:04:58 2023 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 4Sk17H1Kwzz51grf; Sun, 3 Dec 2023 22:04: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sk17H0WD7z4Dch; Sun, 3 Dec 2023 22:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701641099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6e+1wTRj298e69OWboDQ2aLJvDANoVbBvZ45iHRq+8M=; b=tY/DjxUFkY0d8nr9DxboQrJ+ZUpL0IdgGxVPrSvEkG3Bk3QlPHPRTXNresqcBkMPPQ0t7S aCL9acY29fNY3C59AkrH74OLcOQxw0PlqmAwp9CsAYgLk3VOUpSrEXDiT00S9aacqOFoU0 eF50UDTLfluj/6a9SEVnde83PIeaU6hv1hgSQfdXvj++svnbdStjmMsXjyugajQJZvRa9X d9HJ0ce9xXY73gN15sW8ln9gMxxETEpwNUPfDJ4rILeVngB2pJqUFFrHU5FtJyksOsjDOh A8pSL8v8CrPbIVhSvpA6lmVQiqJLJD/4p1F62YjYd/P5mzrIdbdc6//JdKVDKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701641099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6e+1wTRj298e69OWboDQ2aLJvDANoVbBvZ45iHRq+8M=; b=K3oIwDkg/dA+yXJqWYBMGpE+xOpzw0O8HmjYl47Zv2L7csegC6bWoFW/w6qYuoJEdpdcIw SBIBQLX5OUNO+QF8kxFsoxv+GU6pROZGuSyXUHNNT75oJ3tQv8r3TfTkrtXeA84HzVuZZm PihiTeOWk4g2Kl/MtSoYAQbKkWT8QBDT7lcd9WrBWKNzYLq7Fr87zfVu7bJKbUUoCv2anb vQmSNa7aTWPjjz0yaz3eMI2qAyzopzXcLvLOFcLV7yimSGzAZnq+f3mcbwtcMrW7V1VOt3 3LjVZdg1Ki5V2voPCNEJ4cpGiStmRuGGaJJ+OvOo9UIwt4gtLJ69hYuhW+bIjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701641099; a=rsa-sha256; cv=none; b=qo6XzLo2yrCCoTqPWwVpY4Jje0Eyvzz5fLvB4jzCh9mmb1k3GG7WkdLyG82E67hS4GvBEj 3Oz3vL+9ewcgyV6DDO69srLc58+usk38BR4y5qd5IO4ZTsWKnyxAo23KBHwGXHGXC7WRsP Rmd2lNbtlz6ti4TEOspDznAAHfwaXLICOQwGa9nf8M8BL5VzUl1mfKZ3XfCa4Q2EjgHf1M /C/qPuRo3RSiQhmzpY1LSOIZFJGLpY3KI1/1PP32CrkeiZoJXi7BG4XtB1ZqF4IF1SP/91 8iUPrsK9K96mhGQ/lcP3KvDDT9+hmyUMX5c4cjzWwkk4ZgjGUW6Mavne77mvjQ== 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 4Sk17G6g9Yz1FrT; Sun, 3 Dec 2023 22:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B3M4wXd056896; Sun, 3 Dec 2023 22:04:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B3M4wvv056893; Sun, 3 Dec 2023 22:04:58 GMT (envelope-from git) Date: Sun, 3 Dec 2023 22:04:58 GMT Message-Id: <202312032204.3B3M4wvv056893@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 7d0ee5ebd052 - main - release/Makefile.vm: Rework emulator-portinstall List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d0ee5ebd052d35e323f2d303e467c2cf305ca39 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7d0ee5ebd052d35e323f2d303e467c2cf305ca39 commit 7d0ee5ebd052d35e323f2d303e467c2cf305ca39 Author: Colin Percival AuthorDate: 2023-12-03 21:39:30 +0000 Commit: Colin Percival CommitDate: 2023-12-03 21:39:30 +0000 release/Makefile.vm: Rework emulator-portinstall The emulator-portinstall target now unconditionally ensures that qemu is installed; but is only invoked if needed (aka. when cross building VM images). MFC After: 3 days MFC With: 97bd53ef4d20 ("Fix duplicate rc.conf files") --- release/Makefile.vm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index a7624775d48c..58703de16cf3 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -69,8 +69,6 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo .endfor emulator-portinstall: -.if ${TARGET_ARCH} != ${MACHINE_ARCH} -.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) .if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean @@ -83,9 +81,13 @@ emulator-portinstall: .endif touch ${.TARGET} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static +QEMUTGT=emulator-portinstall .endif .endif +QEMUTGT?= .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) . for _CW in ${CLOUDWARE} @@ -100,7 +102,7 @@ CLEANFILES+= ${_CW:tl}.${_FS}.img \ ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT}.raw ${_CW:tu}${_FS:tu}IMAGE= ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT} -cw-${_CW:tl}-${_FS}: emulator-portinstall +cw-${_CW:tl}-${_FS}: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ From nobody Sun Dec 3 23:33:00 2023 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 4Sk34s4F4Jz51mXm; Sun, 3 Dec 2023 23:33: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sk34r52sNz4MTM; Sun, 3 Dec 2023 23:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701646380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7dle6ujod53zCyCuhtjgv0tBUVOcBwCribTztmg/130=; b=IkpwiFqv8lPJU20VVHJeOU26iOsRuKQq1nAUi3JiJkhVXSMQE4bi279FB0X9K5UCiSPNnA /MZu7vbe602urUJDRYIsbAzd1ZGTMU1zt4SYzBT0vuDSr63IfG19pOpWlifLn97pNgcCbi mPNuZUHOnLnPAWihntxmBMi6rXpgMhhawgslrtS61QQ8376+PiA257o/vfqsSywak+Gc5S /JdUjH78lBc9qL6L9eTiJ0eSbeoXxmbebeDwFtm3RWexzGYUINJNdni87rC0RH/RCSwzz3 1dl2qvND317hCB8XALTYrw6DPiW4l6yMI5LP2Ic5umD6G5hOWv/xXsh9LF1JtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701646380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7dle6ujod53zCyCuhtjgv0tBUVOcBwCribTztmg/130=; b=ptJvz1oZHSVlUCyNyw5rPsX3mJAC/HLCoqzYS0lEa+NjTpSAYF5QXhNEp48tJmPJMqV3cO zxizAAJ06Rr9UjYLijqXVU39gZhFo9RiME/8NT5tz/uhOn3prNiUkoHugnbZe9xLsghywb peTZQgqCENsphOGe6fu9H72zkGx7gSC6VNlznIDDr+Wauwbd/6TNzsIFQe+3KwfbmQgBGq k5mW9rZWoXPS0QTT8rDa3R6lRmVJ6Ge3/ABtQXwjHWEpb5Wvh2OA3viExZ6T7jV6hBmRRF YP5FelavdjAKmmbVZumLOXMyv/8zhrcKdoDNN5irkPmE3J9q8rPDHQ6IiyBUNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701646380; a=rsa-sha256; cv=none; b=Tnh/xaBbIRAO+WmCyCPlOtaY0035Xh6NsZ3UDX+dvFtlmALlf0iqzLX0Nx3+WYulHqJzbj NCho3iRK291TwsLKYke0xbyz6UMr2/5SnIua9gmV5/VysH15eRa5CaPLImGKidcqHgXT7s 8X2Oke0LLbigLYMOTGb3Hsl+hMpgqRzGQadYPBuB9puVR6bSD5Zdw6Lh3ANKYVmDLzF125 rsEIghVn8y1RYLS7uxxTsYzU/4HD8tjNiWIBvz9Wh9ssG4Up794C1OJhm/zrkG+nPZ/RrO 1S5YxmBydym53bsIaW7ik+UCmDIKNu6cVL1EF+VnC+8dx653oHtZMeGnKp+usA== 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 4Sk34r45d3z1JCl; Sun, 3 Dec 2023 23:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B3NX0kP006234; Sun, 3 Dec 2023 23:33:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B3NX0X5006231; Sun, 3 Dec 2023 23:33:00 GMT (envelope-from git) Date: Sun, 3 Dec 2023 23:33:00 GMT Message-Id: <202312032333.3B3NX0X5006231@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: 6aded1e6b2e5 - main - nfscl: Fix processing of a rare Rename reply case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6aded1e6b2e5549120031032e1c7f8b002882327 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6aded1e6b2e5549120031032e1c7f8b002882327 commit 6aded1e6b2e5549120031032e1c7f8b002882327 Author: Rick Macklem AuthorDate: 2023-12-03 23:31:01 +0000 Commit: Rick Macklem CommitDate: 2023-12-03 23:31:01 +0000 nfscl: Fix processing of a rare Rename reply case When delegations are enabled (they are not by default in the FreeBSD NFSv4 server), rename will check for and return delegations. If the second of these DelegReturn operations were to fail (they rarely do), then the code would not retry the rename with returning delegations, as it is intended to do. The patch fixes the problem, since the DelegReturn reply status is the second iteration of the loop and not the first iteration. As noted, this bug would have rarely manifested a problem, since DelegReturn operations do not normally fail. MFC after: 2 weeks --- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 1b0011760d10..81871dc885cd 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -3001,7 +3001,7 @@ tryagain: ND_NFSV4) { NFSM_DISSECT(tl, u_int32_t *, 2 * NFSX_UNSIGNED); if (*(tl + 1)) { - if (i == 0 && ret > 1) { + if (i == 1 && ret > 1) { /* * If the Delegreturn failed, try again * without it. The server will Recall, as From nobody Mon Dec 4 00:14:00 2023 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 4Sk40907jhz51pP4; Mon, 4 Dec 2023 00:14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sk4086hhRz4Q6d; Mon, 4 Dec 2023 00:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701648840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5NLx8gTUjPB7GPgbhItgQMR6D+uE11++fG4ciO/0shk=; b=BAMpRh1xX1LZjCoz3VRNOS40kqIXXoTpc3oI8+F+eW8j5NTD6F7sMaydOFYvhny59DunSI gvXHijYN1kQ5kV9/NLpd5ILIOak6mOUIIOq80WsVKGadh05tr7xSih70Grlxb1B6I8xrHW wc8oeQ22FwnuxNwOnhVEsHz2Uc9m5n4SIwEAdZSuPWRemA29Rr9YG5AIVph1cYbmujMT3w 93+GFoY9SPuhYI27BxDygFPG0+oxBGaZdYKRIkEoj0LEzWr7huyXqvE2Gbh/H+RbwDatD4 nVwmNWShcJcxaAalfJgnLytlte4RNc0SZY+oOzrUX5WpsD/lIc7J602EO7Ob5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701648840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5NLx8gTUjPB7GPgbhItgQMR6D+uE11++fG4ciO/0shk=; b=kpSWG8tds8hNKiAvSg5cyfoU4m0Vp5T/BnRI8/UFWlFKtQzQVKFLUhjDLDKOIthXtIuJ17 gT+nU7KYy6KjFScqHgDG79X+QHrzxwCGeoKy45Fm3IIWNOs6iNQLcEw7yjcXLneZSt5RX1 i/1Uex5L2MZ+27hFOumfNDF3IxDseBM9gV1jaAJ9kvPDW83QoOGk60JM3tmZKJedN+PTXM es8p6hW9+JR8VsDxqZod5gC4pUX20Bz/ZiHcfdOk1ZW4csF2tqyKbtizWIWEgxF0HEJFPJ H8H73k8sbJJl/3venRjSzHnej86OAAgq+tX8B4gdYXK6i2tELbwPJYs3Lr4PBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701648840; a=rsa-sha256; cv=none; b=o8dn3NbJQIz4AsHetrO2Q36gY7VmkQjz+rSEUIxLl1tnE2gZ24OQLLevEWHoTUaOH2atvG V92OlzifdK3Y3fN6aJ71/xRrZSpDYTaDE2h+qJU6uV+/HlJsCnLe+hpIDZrUGomvdIlmTC eJ+TLuFj2rPTvz13GHXSKCprPTigYsCTXDzXgOuZjDpWdgWk6vx4WfbUydHS+orSsBtc/+ A6EwvS6o7y/LDZerTpox5veL6goXGqGLYqGJEmrRgDAHD++UShlZYYlI8NRp4EjUhzcFeB 6xXajPN1TesaE+2UklvCc9lyGuCJ95795XA60cO01tI6nVnNpnfxH/2GfwL4ww== 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 4Sk4085lQBz1Jgw; Mon, 4 Dec 2023 00:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B40E04R073555; Mon, 4 Dec 2023 00:14:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B40E0cm073552; Mon, 4 Dec 2023 00:14:00 GMT (envelope-from git) Date: Mon, 4 Dec 2023 00:14:00 GMT Message-Id: <202312040014.3B40E0cm073552@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: 0a958aa16fed - main - nfscl: Fix comment for commit 6aded1e6b2e5 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0a958aa16fed1978879d64e3b225f1d232cc5a98 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=0a958aa16fed1978879d64e3b225f1d232cc5a98 commit 0a958aa16fed1978879d64e3b225f1d232cc5a98 Author: Rick Macklem AuthorDate: 2023-12-04 00:12:14 +0000 Commit: Rick Macklem CommitDate: 2023-12-04 00:12:14 +0000 nfscl: Fix comment for commit 6aded1e6b2e5 Commit 6aded1e6b2e5 fixed a rare case when handling an NFSv4 Rename reply when delegations are in use. This patch fixes the associated comment. MFC after: 2 weeks --- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 81871dc885cd..86c2959b1209 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -3006,7 +3006,7 @@ tryagain: * If the Delegreturn failed, try again * without it. The server will Recall, as * required. - * If ret > 1, the first iteration of this + * If ret > 1, the second iteration of this * loop is the second DelegReturn result. */ m_freem(nd->nd_mrep); From nobody Mon Dec 4 06:51:47 2023 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 4SkDq73tGVz530bZ; Mon, 4 Dec 2023 06:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkDq73SXnz3MqQ; Mon, 4 Dec 2023 06:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701672707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F73m7R1zlSMoa91IamvaK3ni/EerSy0czi9x7nknFzA=; b=uXyM7h5PiTEWl6vWHDVDPxeS3UF37xfFo82XO+D+ukHUIFoBS3WVpWRJdhJlPmyvTVrIK8 Ou1t1iFAPEH78BmX0Cls4V2QQ6ZI7h2aLZHwCagJ0geSaKXkDzBuLlEwvwD5i1PVpv4UhI k6CGRXsEUKSCHGVgXoJ70yrN7+vbyYSwaUOcKiO9VlOYhCvIonE7bjf+yLJR+5Dt/rZDay 7ZYfHGuddl2ATkEHm1qPkCcCWmPsz5gmql6KlBZELLlhUTsl6bDuRHiJCphZ7z+HCTudLA fZvoMp2rA2cvgJ50tmdOgiAZWPO2Z9eyBbg62ZXTLnDy7FiKhovbF9cQ6Mg/tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701672707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F73m7R1zlSMoa91IamvaK3ni/EerSy0czi9x7nknFzA=; b=ApSCPXqbQ8Be8zpnMu4nuw+EOobY9M7Cvqnd8Hm9JzTs43lQn4mCU1E+G6II4hX/MWTiY3 o4NodaPuOeimO8sbDyNpTM1MrweBuc08xOzv/MsTNWK7kBAUOEWpFWOr2dkh40OmPmChyq wluorRgqqlgugCdeAm2OHUC5r5rbqke5iWv+l+aKJiXEqLd0vRQt6gnvlDHOUhIcEFQuSv qsMlVADZc9b2H45BpsI7U5mx/xGHhx8vBG8JVIziGzbM49V/0wJIylkWLGYps9rP4xBZTz UZi3ISwhMOS1JgnymrufRDVN90H5rVJwCIYEhe93INqdGpctvJGB93MMlbpcfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701672707; a=rsa-sha256; cv=none; b=D+/OnXhUAzSuH4HHso/kWgvZ/1XeqpgnZRZ89ys1lhP96VDiOATrAyC8uSNGNUBIZb3cbA Fku8yNWOXSozG08njZdjKjlv+UFQF0HbxrOCN+ghxaoH2hu6mKVh3rqVboPoJOCWcFY2bW WEvXL4ugNbOW7RpkSJQjjSC1zAoeDVv7oUVKyBDcaHV/oUu3tvlk8iUr4FpnDcm+cQXht4 aIRyZpZaSo+jr2DmG87iEqupxdqemucHl6PfdGgRF+6Cg2zSJRyVdkhWt28jK5K0HJP5/f 8d2In6q79pFq5nk7ZAgVWhzlBF8Sf2YS51B/0JLT1TK8u9/ByMyAPIIPSykOPA== 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 4SkDq72YtFz1dh; Mon, 4 Dec 2023 06:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B46plMj039601; Mon, 4 Dec 2023 06:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B46plqI039598; Mon, 4 Dec 2023 06:51:47 GMT (envelope-from git) Date: Mon, 4 Dec 2023 06:51:47 GMT Message-Id: <202312040651.3B46plqI039598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 094abb6fb41c - main - autofs: media: Always use sync option for fat* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 094abb6fb41c07c0266a5cae84a7439289a978e9 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=094abb6fb41c07c0266a5cae84a7439289a978e9 commit 094abb6fb41c07c0266a5cae84a7439289a978e9 Author: Emmanuel Vadot AuthorDate: 2023-12-01 09:27:59 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-04 06:51:33 +0000 autofs: media: Always use sync option for fat* Users of autofs for removable media expect to be able to copy files and directly remove the media without having the need to call sync(8) or umount(8). Only do that for fat/ntfs filesystems. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D42494 Reviewed by: rew (older version) --- usr.sbin/autofs/autofs/special_media | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.sbin/autofs/autofs/special_media b/usr.sbin/autofs/autofs/special_media index 33fa4544d028..b397a8889623 100755 --- a/usr.sbin/autofs/autofs/special_media +++ b/usr.sbin/autofs/autofs/special_media @@ -40,7 +40,7 @@ print_map_entry() { case "${_fstype}" in "exfat") if [ -f "/usr/local/sbin/mount.exfat" ]; then - echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype} :/dev/${_p}" + echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype},sync :/dev/${_p}" else /usr/bin/logger -p info -t "special_media[$$]" \ "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-exfat first" @@ -49,14 +49,17 @@ print_map_entry() { ;; "ntfs") if [ -f "/usr/local/bin/ntfs-3g" ]; then - echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype} :/dev/${_p}" + echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},sync :/dev/${_p}" else /usr/bin/logger -p info -t "special_media[$$]" \ "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-ntfs first" exit 1 fi ;; - "ext2fs" | "msdosfs") + "msdosfs") + echo "-fstype=${_fstype},sync :/dev/${_p}" + ;; + "ext2fs") echo "-fstype=${_fstype},async :/dev/${_p}" ;; *) From nobody Mon Dec 4 08:05:21 2023 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 4SkGS15zgkz534k2; Mon, 4 Dec 2023 08:05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkGS15NC3z3WKh; Mon, 4 Dec 2023 08:05:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701677121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GdNSk4Eugkk6zlgIt+KcUeEyj6Kng6SOPPWb9m+3vps=; b=pXwK4kSP3UJJhpEU5csJKZaN/GM0FT4s97CyVVvVOdFwJzKca8bujjYQpSXCUxXaki+A/I UbpbWrIVnWelGkuB6P9vAbR5R5G/z35C/QrTcYY95ZQXmPsFXUsKISyTHVHrQDUgn+mcrF euWqxjyfDR4E8k8ni2UEA9VEMyFjjAM0bt2i1qxifb3vMzj3DxKbzrdsTzdeBmxGXTnMUd nIES8vsB0jDYKGIlvWvHY1bgXeIUMWdqwaRqbCcikRny3/ZBXrDjAA3Jgr05026eC74y8D VYYROzHsItMXzpfRLC++sZyuIQA6V6AOjH1dZC2dogbmrpbxd3rW5GAbYSj1Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701677121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GdNSk4Eugkk6zlgIt+KcUeEyj6Kng6SOPPWb9m+3vps=; b=WzaiROnYgnxjZ0kdVHopqqCeX/xICz3Lt+CaeEaeGiOn7Dx21+4UC1LvbCkvGurw3Dqgmq HDDDkuLwDHEGnwf4gNPLRay1/fikHRN/MemIB3p8qcC0Bu3wHVzAlYifRe7sCPNZcWR8HM g0u8IeDmRrfWqqsn5p08BtnrLNd04S037DeXCg1ZY7Kn8ErkVKaMu6KA9vaY43HXnW63eI 3EjotX/K6Z/C05U+cwmwiyN00iFuxDrk31CthHBxlZzzrigI4vS5fgdiU23b22WlqR5P83 5f4TgScuLRNpL6bPapg8LREMEIgYHUdQOJ/jklAMPVLOV8WX0Nokbo+saGKhAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701677121; a=rsa-sha256; cv=none; b=xy3TuSECjkEu4I5lfb74kITeARuI5sL6Bv9pe1P+g+CUVYgPFC+ytgCu+LTSS4k/hBJnui KkhRDJwKfmzHEkDuhpIhYcNiYGaew0PnrgCba6f0kmw2xLPkUAUcc4lm+jBo4kalsTYuJ0 nm9xiAxrM9Yp9RycgshtUBOVM6dd2nRkporTLdPzWrmUh9/QIN6x5ly/avBr1zIN1MIH1+ gmjd0QqzSPN3NlwYt6KK7Yifbdj7OyLvzuQHD4uEh13mlMmHekVh3rVGggZUigo9FKhUW8 hLJHbkFfmxKuvOOfLJxYUwtJ7QhCSFOd7h7XhtdzQkXayESSkU4di5fQTi1B8Q== 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 4SkGS14KWSz3YJ; Mon, 4 Dec 2023 08:05:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B485LxL058562; Mon, 4 Dec 2023 08:05:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B485LdN058559; Mon, 4 Dec 2023 08:05:21 GMT (envelope-from git) Date: Mon, 4 Dec 2023 08:05:21 GMT Message-Id: <202312040805.3B485LdN058559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 99b8c0c35b0f - main - pkgbase: create source 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99b8c0c35b0fcc633649209621243d678a13542a Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=99b8c0c35b0fcc633649209621243d678a13542a commit 99b8c0c35b0fcc633649209621243d678a13542a Author: Baptiste Daroussin AuthorDate: 2023-11-17 16:19:39 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 08:05:03 +0000 pkgbase: create source package FreeBSD-src for all the sources but the kernel FreeBSD-src-sys just for the kernel MFC After: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42651 --- Makefile | 4 ++-- Makefile.inc1 | 54 +++++++++++++++++++++++++++++++++++++++++--- release/packages/src-sys.ucl | 17 ++++++++++++++ release/packages/src.ucl | 17 ++++++++++++++ 4 files changed, 87 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b36e27e7f294..4a6f4bfd425e 100644 --- a/Makefile +++ b/Makefile @@ -175,8 +175,8 @@ TGTS= all all-man buildenv buildenvvars buildetc buildkernel buildworld \ _build-tools _build-metadata _cross-tools _includes _libraries \ builddtb xdev xdev-build xdev-install \ xdev-links native-xtools native-xtools-install stageworld stagekernel \ - stage-packages stage-packages-kernel stage-packages-world \ - create-packages-world create-packages-kernel create-packages \ + stage-packages stage-packages-kernel stage-packages-world stage-packages-source \ + create-packages-world create-packages-kernel create-packages-source create-packages \ update-packages packages installconfig real-packages real-update-packages \ sign-packages package-pkg print-dir test-system-compiler test-system-linker \ test-includes diff --git a/Makefile.inc1 b/Makefile.inc1 index 82f3ef061d98..0698a5d79a0a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1956,6 +1956,7 @@ stagekernel: .PHONY PORTSDIR?= /usr/ports WSTAGEDIR?= ${OBJTOP}/worldstage KSTAGEDIR?= ${OBJTOP}/kernelstage +SSTAGEDIR?= ${OBJTOP}/sourcestage REPODIR?= ${OBJROOT}repo PKG_FORMAT?= tzst PKG_REPO_SIGNING_KEY?= # empty @@ -1963,6 +1964,7 @@ PKG_OUTPUT_DIR?= ${PKG_VERSION} .ORDER: stage-packages create-packages .ORDER: create-packages create-world-packages +.ORDER: create-packages create-source-packages .ORDER: create-packages create-kernel-packages .ORDER: create-packages sign-packages @@ -1974,7 +1976,7 @@ _pkgbootstrap: .PHONY # # Determine PKG_ABI from newvers.sh if not already set. # -.if !defined(PKG_ABI) && (make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages) || make(sign-packages)) +.if !defined(PKG_ABI) && (make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages) || make (create-source-packages) || make(sign-packages)) PKG_ABI=${_TYPE}:${MAJOR_REVISION}:${TARGET_ARCH} .endif PKG_BIN_VERSION!=${PKG_CMD} --version /dev/null |\ @@ -2051,7 +2053,10 @@ stage-packages-kernel: .PHONY ${_+_}@cd ${.CURDIR}; \ ${MAKE} DESTDIR=${KSTAGEDIR} -DNO_ROOT stagekernel -stage-packages: .PHONY stage-packages-world stage-packages-kernel +stage-packages-source: .PHONY + @mkdir -p ${SSTAGEDIR}; + +stage-packages: .PHONY stage-packages-world stage-packages-kernel stage-packages-source _repodir: .PHONY @mkdir -p ${REPODIR} @@ -2070,7 +2075,50 @@ create-packages-kernel: _pkgbootstrap _repodir .PHONY SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ create-kernel-packages -create-packages: .PHONY create-packages-world create-packages-kernel +create-packages-source: _pkgbootstrap _repodir .PHONY + ${_+_}@cd ${.CURDIR}; \ + ${MAKE} -f Makefile.inc1 \ + DESTDIR=${SSTAGEDIR} \ + PKG_VERSION=${PKG_VERSION} create-source-packages + +create-packages: .PHONY create-packages-world create-packages-kernel create-packages-source + +create-source-packages: _pkgbootstrap .PHONY + rm -f ${SSTAGEDIR}/*.plist 2>/dev/null || : +.if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git) + @cd ${SRCDIR}; \ + ( echo "@override_prefix /usr/src" ; \ + ${GIT_CMD} ls-files ":!:sys/" ) > ${SSTAGEDIR}/src.plist + @cd ${SRCDIR}; \ + ( echo "@override_prefix /usr/src" ; \ + ${GIT_CMD} ls-files "sys/" ) > ${SSTAGEDIR}/src-sys.plist + sed -e "s/%VERSION%/${PKG_VERSION}/" \ + -e "s/%DESC%/FreeBSD sources/" \ + -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ + -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ + -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ + -e "s|%PKG_WWW%|${PKG_WWW}|" \ + ${SRCDIR}/release/packages/src.ucl \ + > ${SSTAGEDIR}/src.ucl + sed -e "s/%VERSION%/${PKG_VERSION}/" \ + -e "s/%DESC%/FreeBSD Kernel sources/" \ + -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ + -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ + -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ + -e "s|%PKG_WWW%|${PKG_WWW}|" \ + ${SRCDIR}/release/packages/src-sys.ucl \ + > ${SSTAGEDIR}/src-sys.ucl + ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + -M ${SSTAGEDIR}/src.ucl \ + -p ${SSTAGEDIR}/src.plist \ + -r ${SRCDIR} \ + -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} + ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + -M ${SSTAGEDIR}/src-sys.ucl \ + -p ${SSTAGEDIR}/src-sys.plist \ + -r ${SRCDIR} \ + -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} +.endif create-world-packages: _pkgbootstrap .PHONY @rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || : diff --git a/release/packages/src-sys.ucl b/release/packages/src-sys.ucl new file mode 100644 index 000000000000..ad37f5c5a5f1 --- /dev/null +++ b/release/packages/src-sys.ucl @@ -0,0 +1,17 @@ +# +# + +name = "%PKG_NAME_PREFIX%-src-sys" +origin = "base" +version = "%VERSION%" +comment = "FreeBSD Kernel Sources" +categories = [ base ] +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 8b2cfd9d19b9 - stable/14 - nvi: import version 2.2.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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8b2cfd9d19b98e0a6bae8a8a86e13f4a0108027c Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8b2cfd9d19b98e0a6bae8a8a86e13f4a0108027c commit 8b2cfd9d19b98e0a6bae8a8a86e13f4a0108027c Author: Baptiste Daroussin AuthorDate: 2023-09-27 16:01:58 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:20:00 +0000 nvi: import version 2.2.1 (cherry picked from commit 0fcececbac9880b092aeb56a41a16f1ec8ac1ae6) --- contrib/nvi/CMakeLists.txt | 4 + contrib/nvi/INSTALL.md | 47 ++++++++++++ contrib/nvi/README | 26 ++++++- contrib/nvi/common/key.c | 95 ++++++++++++++++++++++- contrib/nvi/common/main.c | 3 +- contrib/nvi/common/options.c | 2 + contrib/nvi/common/options_f.c | 2 +- contrib/nvi/common/search.c | 11 ++- contrib/nvi/ex/ex.c | 13 +++- contrib/nvi/ex/ex_argv.c | 6 +- contrib/nvi/ex/ex_subst.c | 7 +- contrib/nvi/man/vi.1 | 4 + contrib/nvi/vi/v_paragraph.c | 11 ++- contrib/nvi/vi/v_redraw.c | 1 + usr.bin/vi/ex/version.h | 3 +- usr.bin/vi/options_def.h | 169 +++++++++++++++++++++-------------------- 16 files changed, 298 insertions(+), 106 deletions(-) diff --git a/contrib/nvi/CMakeLists.txt b/contrib/nvi/CMakeLists.txt index 66d3ca2aafb0..0c935b3c2a19 100644 --- a/contrib/nvi/CMakeLists.txt +++ b/contrib/nvi/CMakeLists.txt @@ -37,6 +37,7 @@ if (NOT APPLE) endif() add_compile_options($<$:-Wuninitialized>) add_compile_options($<$:-Wno-dangling-else>) +add_compile_options(-Wno-string-compare) add_compile_options(-Wstack-protector -fstack-protector) add_compile_options(-Wstrict-aliasing -fstrict-aliasing) @@ -148,6 +149,9 @@ if(USE_WIDECHAR) target_sources(regex PRIVATE ${REGEX_SRCS}) target_include_directories(regex PUBLIC regex) target_compile_definitions(regex PUBLIC __REGEX_PRIVATE) + # The macro _XOPEN_SOURCE_EXTENDED is needed to get the waddnwstr() + # definition on at least FreeBSD and recent macOS. + target_compile_definitions(nvi PRIVATE _XOPEN_SOURCE_EXTENDED) target_link_libraries(nvi PRIVATE regex) else() find_library(CURSES_LIBRARY NAMES ncurses curses HINTS /usr/lib) diff --git a/contrib/nvi/INSTALL.md b/contrib/nvi/INSTALL.md new file mode 100644 index 000000000000..7b2fd35b7c60 --- /dev/null +++ b/contrib/nvi/INSTALL.md @@ -0,0 +1,47 @@ +# Install from source + +For instructions to bring nvi2 as a part of your operating system's base system, see [Porting](https://github.com/lichray/nvi2/wiki/Porting) in the Wiki. This document is an overview of the build process that allows you to give nvi2 a try. + +## Prerequisites + +- CMake >= 3.17; +- Ninja build system; +- libiconv (for `USE_ICONV`); +- libncursesw (for `USE_WIDECHAR`); + +Anything required by a minimal nvi, notably: + +- Berkeley DB1 in libc; +- /var/tmp/vi.recover/ with mode 41777. + +## Building + +Nvi2 uses CMake build system generator. By specifying "Ninja Multi-Config" as the build system to generate, you can compile the project in both Debug and Release modes without re-running CMake. Under the project root directory, run + +```sh +cmake -G "Ninja Multi-Config" -B build +``` + +Now `build` becomes your build directory to hold the artifacts. To build nvi2 in Debug mode, run + +```sh +ninja -C build +``` + +Upon finishing, the nvi2 executable will be available as `build/Debug/nvi`. To launch it in `ex` mode, you can create a symlink + +```sh +ln -s nvi build/Debug/ex +``` + +and run `./build/Debug/ex` rather than `./build/Debug/nvi`. + +To build nvi2 in Release mode, use the following command instead: + +```sh +ninja -C build -f build-Release.ninja +``` + +Upon finishing, you will be able to edit files with `./build/Release/nvi`. + +To change configure-time options, such as disabling wide character support, use `ccmake build`. diff --git a/contrib/nvi/README b/contrib/nvi/README index 8f61a97144be..9e638d952444 100644 --- a/contrib/nvi/README +++ b/contrib/nvi/README @@ -1,4 +1,4 @@ -This is version 2.2.0 (2020-08-01) of nex/nvi, a reimplementation of the ex/vi +This is version 2.2.1 (2023-09-25) of nex/nvi, a reimplementation of the ex/vi text editors originally distributed as part of the Fourth Berkeley Software Distribution (4BSD), by the University of California, Berkeley. @@ -24,6 +24,30 @@ o Nvi was written by Keith Bostic, and the last version is 1.79. After that, Jun-ichiro itojun Hagino developed the file encoding detection techniques in his nvi-m17n. +o In nvi2, Zhihao Yuan incorporated the multibyte encoding support onto DB1. + + It was not possible without great support from Alexander Leidinger, + Peter Wemm, and the FreeBSD community. + + Last but not least, money from Google Summer of Code. + +o Since then, + + Todd C. Miller and Craig Leres adopted and refined the NetBSD-style + expandtab option. + + Yamamoto Takashi, Matija Skala, and Jessica Clarke ported the + software to macOS and Linux. + + Anthony J. Bentley made heroic efforts to modernize the code base + and documentation, leveraging experience from OpenBSD to improve the + quality of the project. + + ...and many others, including Michael McConville, Marc Simpson, + Jeffrey H. Johnson, Bosco García, Anton Konyahin, Walter Alejandro + Iglesias, and those who tried hard to keep anonymous on GitHub :) + Their insights render the software usable, secure, and sustainable. + The following acknowledgments were written by Keith Bostic: =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff --git a/contrib/nvi/common/key.c b/contrib/nvi/common/key.c index e71396893fd4..1ccfb61ee0a1 100644 --- a/contrib/nvi/common/key.c +++ b/contrib/nvi/common/key.c @@ -31,6 +31,7 @@ static int v_event_grow(SCR *, int); static int v_key_cmp(const void *, const void *); static void v_keyval(SCR *, int, scr_keyval_t); static void v_sync(SCR *, int); +static const char *alt_key_notation(int ch); /* * !!! @@ -252,6 +253,10 @@ v_key_name(SCR *sp, ARG_CHAR_T ach) * followed by the character offset from the '@' character in the ASCII * character set. Del (0x7f) is represented as '^' followed by '?'. * + * If set O_ALTNOTATION, control characters less than 0x20 are + * represented in notations. Carriage feed, escape, and + * delete are marked as , , and , respectively. + * * XXX * The following code depends on the current locale being identical to * the ASCII map from 0x40 to 0x5f (since 0x1f + 0x40 == 0x5f). I'm @@ -264,9 +269,14 @@ v_key_name(SCR *sp, ARG_CHAR_T ach) if (CAN_PRINT(sp, ach)) goto done; nopr: if (iscntrl(ch) && (ch < 0x20 || ch == 0x7f)) { - sp->cname[0] = '^'; - sp->cname[1] = ch == 0x7f ? '?' : '@' + ch; - len = 2; + if (O_ISSET(sp, O_ALTNOTATION)) { + const char *notation = alt_key_notation(ch); + len = strlcpy(sp->cname, notation, sizeof(sp->cname)); + } else { + sp->cname[0] = '^'; + sp->cname[1] = ch == 0x7f ? '?' : '@' + ch; + len = 2; + } goto done; } #ifdef USE_WIDECHAR @@ -745,6 +755,85 @@ v_sync(SCR *sp, int flags) rcv_sync(sp, flags); } +/* + * alt_key_notation -- + * Lookup for alternative notations of control characters. + */ +static const char* +alt_key_notation(int ch) +{ + switch (ch) { + case 0x00: + return ""; + case 0x01: + return ""; + case 0x02: + return ""; + case 0x03: + return ""; + case 0x04: + return ""; + case 0x05: + return ""; + case 0x06: + return ""; + case 0x07: + return ""; + case 0x08: + return ""; + case 0x09: + return ""; + case 0x0A: + return ""; + case 0x0B: + return ""; + case 0x0C: + return ""; + case 0x0D: + return ""; + case 0x0E: + return ""; + case 0x0F: + return ""; + case 0x10: + return ""; + case 0x11: + return ""; + case 0x12: + return ""; + case 0x13: + return ""; + case 0x14: + return ""; + case 0x15: + return ""; + case 0x16: + return ""; + case 0x17: + return ""; + case 0x18: + return ""; + case 0x19: + return ""; + case 0x1A: + return ""; + case 0x1B: + return ""; + case 0x1C: + return ""; + case 0x1D: + return ""; + case 0x1E: + return ""; + case 0x1F: + return ""; + case 0x7f: + return ""; + default: + __builtin_unreachable(); + } +} + /* * v_event_err -- * Unexpected event. diff --git a/contrib/nvi/common/main.c b/contrib/nvi/common/main.c index a7e60f1af806..807dbde3895c 100644 --- a/contrib/nvi/common/main.c +++ b/contrib/nvi/common/main.c @@ -419,8 +419,7 @@ err: rval = 1; * PUBLIC: void v_end(GS *); */ void -v_end(gp) - GS *gp; +v_end(GS *gp) { MSGS *mp; SCR *sp; diff --git a/contrib/nvi/common/options.c b/contrib/nvi/common/options.c index d5c039f97228..c3d1f7343f9a 100644 --- a/contrib/nvi/common/options.c +++ b/contrib/nvi/common/options.c @@ -46,6 +46,8 @@ static int opts_print(SCR *, OPTLIST const *); * VI and EX Text Editors", 1990. */ OPTLIST const optlist[] = { +/* O_ALTNOTATION */ + {L("altnotation"), f_print, OPT_0BOOL, 0}, /* O_ALTWERASE 4.4BSD */ {L("altwerase"), f_altwerase, OPT_0BOOL, 0}, /* O_AUTOINDENT 4BSD */ diff --git a/contrib/nvi/common/options_f.c b/contrib/nvi/common/options_f.c index 45ab913c55ab..fe07e4989f05 100644 --- a/contrib/nvi/common/options_f.c +++ b/contrib/nvi/common/options_f.c @@ -147,7 +147,7 @@ f_print(SCR *sp, OPTION *op, char *str, u_long *valp) int offset = op - sp->opts; /* Preset the value, needed for reinitialization of lookup table. */ - if (offset == O_OCTAL) { + if (offset == O_OCTAL || offset == O_ALTNOTATION) { if (*valp) O_SET(sp, offset); else diff --git a/contrib/nvi/common/search.c b/contrib/nvi/common/search.c index e8dcac431f51..c3f7291437ff 100644 --- a/contrib/nvi/common/search.c +++ b/contrib/nvi/common/search.c @@ -103,9 +103,14 @@ prev: if (sp->re == NULL) { ++p; break; } - if (plen > 1 && p[0] == '\\' && p[1] == delim) { - ++p; - --plen; + if (plen > 1 && p[0] == '\\') { + if (p[1] == delim) { + ++p; + --plen; + } else if ( p[1] == '\\') { + *t++ = *p++; + --plen; + } } } if (epp != NULL) diff --git a/contrib/nvi/ex/ex.c b/contrib/nvi/ex/ex.c index fd920a8df9a1..900678e942eb 100644 --- a/contrib/nvi/ex/ex.c +++ b/contrib/nvi/ex/ex.c @@ -154,6 +154,10 @@ ex(SCR **spp) if (file_end(sp, NULL, F_ISSET(sp, SC_EXIT_FORCE))) return (1); *spp = screen_next(sp); + if (*spp) { + F_CLR(*spp, SC_SCR_VI); + F_SET(*spp, SC_SCR_EX); + } return (screen_end(sp)); } } @@ -1463,8 +1467,13 @@ addr_verify: LF_INIT(FL_ISSET(ecp->iflags, E_C_HASH | E_C_LIST | E_C_PRINT)); if (!LF_ISSET(E_C_HASH | E_C_LIST | E_C_PRINT | E_NOAUTO) && !F_ISSET(sp, SC_EX_GLOBAL) && - O_ISSET(sp, O_AUTOPRINT) && F_ISSET(ecp, E_AUTOPRINT)) - LF_INIT(E_C_PRINT); + O_ISSET(sp, O_AUTOPRINT) && F_ISSET(ecp, E_AUTOPRINT)) { + /* Honor the number option if autoprint is set. */ + if (F_ISSET(ecp, E_OPTNUM)) + LF_INIT(E_C_HASH); + else + LF_INIT(E_C_PRINT); + } if (LF_ISSET(E_C_HASH | E_C_LIST | E_C_PRINT)) { cur.lno = sp->lno; diff --git a/contrib/nvi/ex/ex_argv.c b/contrib/nvi/ex/ex_argv.c index 8b1fd7858fb1..dd37fe1f69e2 100644 --- a/contrib/nvi/ex/ex_argv.c +++ b/contrib/nvi/ex/ex_argv.c @@ -764,11 +764,11 @@ err: if (ifp != NULL) * shell that does that is broken. */ for (p = bp, len = 0, ch = EOF; - (ch = GETC(ifp)) != EOF; *p++ = ch, blen-=sizeof(CHAR_T), ++len) + (ch = GETC(ifp)) != EOF; *p++ = ch, blen -= sizeof(CHAR_T), ++len) if (blen < 5) { - ADD_SPACE_GOTOW(sp, bp, *blenp, *blenp * 2); + ADD_SPACE_GOTO(sp, CHAR_T, bp, *blenp, *blenp * 2); p = bp + len; - blen = *blenp - len; + blen = *blenp - len * sizeof(CHAR_T); } /* Delete the final newline, nul terminate the string. */ diff --git a/contrib/nvi/ex/ex_subst.c b/contrib/nvi/ex/ex_subst.c index bf03e4417e91..3113ac5ca360 100644 --- a/contrib/nvi/ex/ex_subst.c +++ b/contrib/nvi/ex/ex_subst.c @@ -643,7 +643,9 @@ nextmatch: match[0].rm_so = 0; goto lquit; } } else { - if (ex_print(sp, cmdp, &from, &to, 0) || + const int flags = + O_ISSET(sp, O_NUMBER) ? E_C_HASH : 0; + if (ex_print(sp, cmdp, &from, &to, flags) || ex_scprint(sp, &from, &to)) goto lquit; if (ex_txt(sp, tiq, 0, TXT_CR)) @@ -1195,7 +1197,8 @@ re_tag_conv(SCR *sp, CHAR_T **ptrnp, size_t *plenp, int *replacedp) for (; len > 0; --len) { if (p[0] == '\\' && (p[1] == '/' || p[1] == '?')) { ++p; - --len; + if (len > 1) + --len; } else if (STRCHR(L("^.[]$*"), p[0])) *t++ = '\\'; *t++ = *p++; diff --git a/contrib/nvi/man/vi.1 b/contrib/nvi/man/vi.1 index b6eaf6964bbd..f1893040ceb7 100644 --- a/contrib/nvi/man/vi.1 +++ b/contrib/nvi/man/vi.1 @@ -2282,6 +2282,10 @@ and .Nm vi modes, unless otherwise specified. .Bl -tag -width Ds +.It Cm altnotation Bq off +Display control characters less than 0x20 in notations. +Carriage feed, escape, and delete are marked as , , and , +respectively. .It Cm altwerase Bq off .Nm vi only. diff --git a/contrib/nvi/vi/v_paragraph.c b/contrib/nvi/vi/v_paragraph.c index abe8d9cf50e0..2d7f07569b79 100644 --- a/contrib/nvi/vi/v_paragraph.c +++ b/contrib/nvi/vi/v_paragraph.c @@ -39,15 +39,20 @@ if (p[0] == '\014') { \ if (!--cnt) \ goto found; \ + if (pstate == P_INTEXT && !--cnt) \ + goto found; \ continue; \ } \ if (p[0] != '.' || len < 2) \ continue; \ for (lp = VIP(sp)->ps; *lp != '\0'; lp += 2) \ if (lp[0] == p[1] && \ - (lp[1] == ' ' && len == 2 || lp[1] == p[2]) && \ - !--cnt) \ - goto found; \ + (lp[1] == ' ' && len == 2 || lp[1] == p[2])) { \ + if (!--cnt) \ + goto found; \ + if (pstate == P_INTEXT && !--cnt) \ + goto found; \ + } \ } while (0) /* diff --git a/contrib/nvi/vi/v_redraw.c b/contrib/nvi/vi/v_redraw.c index de6ed0079701..046fcf15c1b4 100644 --- a/contrib/nvi/vi/v_redraw.c +++ b/contrib/nvi/vi/v_redraw.c @@ -29,5 +29,6 @@ int v_redraw(SCR *sp, VICMD *vp) { + F_SET(sp, SC_SCR_REFORMAT); return (sp->gp->scr_refresh(sp, 1)); } diff --git a/usr.bin/vi/ex/version.h b/usr.bin/vi/ex/version.h index 657da969e721..1c18911cc593 100644 --- a/usr.bin/vi/ex/version.h +++ b/usr.bin/vi/ex/version.h @@ -1,2 +1 @@ - -#define VI_VERSION "2.2.0 (2020-08-01)" +#define VI_VERSION "2.2.1 (2023-09-25)" diff --git a/usr.bin/vi/options_def.h b/usr.bin/vi/options_def.h index 54dd6c20c891..cd6f5ba3eb26 100644 --- a/usr.bin/vi/options_def.h +++ b/usr.bin/vi/options_def.h @@ -1,84 +1,85 @@ -#define O_ALTWERASE 0 -#define O_AUTOINDENT 1 -#define O_AUTOPRINT 2 -#define O_AUTOWRITE 3 -#define O_BACKUP 4 -#define O_BEAUTIFY 5 -#define O_CDPATH 6 -#define O_CEDIT 7 -#define O_COLUMNS 8 -#define O_COMBINED 9 -#define O_COMMENT 10 -#define O_TMPDIR 11 -#define O_EDCOMPATIBLE 12 -#define O_ERRORBELLS 13 -#define O_ESCAPETIME 14 -#define O_EXPANDTAB 15 -#define O_EXRC 16 -#define O_EXTENDED 17 -#define O_FILEC 18 -#define O_FILEENCODING 19 -#define O_FLASH 20 -#define O_HARDTABS 21 -#define O_ICLOWER 22 -#define O_IGNORECASE 23 -#define O_INPUTENCODING 24 -#define O_KEYTIME 25 -#define O_LEFTRIGHT 26 -#define O_LINES 27 -#define O_LISP 28 -#define O_LIST 29 -#define O_LOCKFILES 30 -#define O_MAGIC 31 -#define O_MATCHCHARS 32 -#define O_MATCHTIME 33 -#define O_MESG 34 -#define O_MODELINE 35 -#define O_MSGCAT 36 -#define O_NOPRINT 37 -#define O_NUMBER 38 -#define O_OCTAL 39 -#define O_OPEN 40 -#define O_OPTIMIZE 41 -#define O_PARAGRAPHS 42 -#define O_PATH 43 -#define O_PRINT 44 -#define O_PROMPT 45 -#define O_READONLY 46 -#define O_RECDIR 47 -#define O_REDRAW 48 -#define O_REMAP 49 -#define O_REPORT 50 -#define O_RULER 51 -#define O_SCROLL 52 -#define O_SEARCHINCR 53 -#define O_SECTIONS 54 -#define O_SECURE 55 -#define O_SHELL 56 -#define O_SHELLMETA 57 -#define O_SHIFTWIDTH 58 -#define O_SHOWMATCH 59 -#define O_SHOWMODE 60 -#define O_SIDESCROLL 61 -#define O_SLOWOPEN 62 -#define O_SOURCEANY 63 -#define O_TABSTOP 64 -#define O_TAGLENGTH 65 -#define O_TAGS 66 -#define O_TERM 67 -#define O_TERSE 68 -#define O_TILDEOP 69 -#define O_TIMEOUT 70 -#define O_TTYWERASE 71 -#define O_VERBOSE 72 -#define O_W1200 73 -#define O_W300 74 -#define O_W9600 75 -#define O_WARN 76 -#define O_WINDOW 77 -#define O_WINDOWNAME 78 -#define O_WRAPLEN 79 -#define O_WRAPMARGIN 80 -#define O_WRAPSCAN 81 -#define O_WRITEANY 82 -#define O_OPTIONCOUNT 83 +#define O_ALTNOTATION 0 +#define O_ALTWERASE 1 +#define O_AUTOINDENT 2 +#define O_AUTOPRINT 3 +#define O_AUTOWRITE 4 +#define O_BACKUP 5 +#define O_BEAUTIFY 6 +#define O_CDPATH 7 +#define O_CEDIT 8 +#define O_COLUMNS 9 +#define O_COMBINED 10 +#define O_COMMENT 11 +#define O_TMPDIR 12 +#define O_EDCOMPATIBLE 13 +#define O_ERRORBELLS 14 +#define O_ESCAPETIME 15 +#define O_EXPANDTAB 16 +#define O_EXRC 17 +#define O_EXTENDED 18 +#define O_FILEC 19 +#define O_FILEENCODING 20 +#define O_FLASH 21 +#define O_HARDTABS 22 +#define O_ICLOWER 23 +#define O_IGNORECASE 24 +#define O_INPUTENCODING 25 +#define O_KEYTIME 26 +#define O_LEFTRIGHT 27 +#define O_LINES 28 +#define O_LISP 29 +#define O_LIST 30 +#define O_LOCKFILES 31 +#define O_MAGIC 32 +#define O_MATCHCHARS 33 +#define O_MATCHTIME 34 +#define O_MESG 35 +#define O_MODELINE 36 +#define O_MSGCAT 37 +#define O_NOPRINT 38 +#define O_NUMBER 39 +#define O_OCTAL 40 +#define O_OPEN 41 +#define O_OPTIMIZE 42 +#define O_PARAGRAPHS 43 +#define O_PATH 44 +#define O_PRINT 45 +#define O_PROMPT 46 +#define O_READONLY 47 +#define O_RECDIR 48 +#define O_REDRAW 49 +#define O_REMAP 50 +#define O_REPORT 51 +#define O_RULER 52 +#define O_SCROLL 53 +#define O_SEARCHINCR 54 +#define O_SECTIONS 55 +#define O_SECURE 56 +#define O_SHELL 57 +#define O_SHELLMETA 58 +#define O_SHIFTWIDTH 59 +#define O_SHOWMATCH 60 +#define O_SHOWMODE 61 +#define O_SIDESCROLL 62 +#define O_SLOWOPEN 63 +#define O_SOURCEANY 64 +#define O_TABSTOP 65 +#define O_TAGLENGTH 66 +#define O_TAGS 67 +#define O_TERM 68 +#define O_TERSE 69 +#define O_TILDEOP 70 +#define O_TIMEOUT 71 +#define O_TTYWERASE 72 +#define O_VERBOSE 73 +#define O_W1200 74 +#define O_W300 75 +#define O_W9600 76 +#define O_WARN 77 +#define O_WINDOW 78 +#define O_WINDOWNAME 79 +#define O_WRAPLEN 80 +#define O_WRAPMARGIN 81 +#define O_WRAPSCAN 82 +#define O_WRITEANY 83 +#define O_OPTIONCOUNT 84 From nobody Mon Dec 4 10:24:28 2023 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 4SkKXX31Sjz53By1; Mon, 4 Dec 2023 10:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKXX1lQJz4MkS; Mon, 4 Dec 2023 10:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KEaMFj6qKbtgXJsHQD7dgZmEGxLlUErP0JeEmLEsIGs=; b=A9VX1qRSh+K41QqYNORbF/NvdCPHW+sSqBecVTVoHSVDeSc0ukJlcL8m3VXVH8suPwk40r uagt1jisfxpXKm+NwHhthSGzsOG80ytsCw/69moD2v0byDYXm8stN5ULFSteHqoK1393B+ tGz00tApAEzgH1xRAJXBHVA3XeM19jzLQ35SVeXreCuOWicFb+4pGs41vPH/TrCjPjpnEh J/DiCTFM8x57kxh9onixAWuov2c0YS17kEmf0tegmb/uhZ1vh3wzAJXkSOyrr1ZzOgxMp9 J9rgRMZtLiawSxCMrX3T9ILZpZIcmLoUY/bDjH+cP8ENZlwWQWLSV0Ssxpm6bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KEaMFj6qKbtgXJsHQD7dgZmEGxLlUErP0JeEmLEsIGs=; b=UjmBBAwHwqSa4LHsBvE7f2tyZjxm5IZZ7h/KqXsAdrQMhCyhItq+MghkTUZQpZviaRg+T/ ODFLRrumjuXaRoAKadctmPBv+YMq/2fEK6M23n4CzZ/WML/sp3tOIN82rpEnnQGeL7OcFX /kncMWobM3ZPbT9i2CbhaiYN5KPebTrzwNVnpr5bTfjtN7uz0dXytoCHzuO3kA3uow4Qnt 1wuILrTRnGczREBCsMNkOim7reD4cncPDP2KrVBpCJhjmxIUsuRGWq7AFpVY/GgmLDRSrX On3Yn8HrypnCyt6NOFS2b4204fwiAahA1AuXWa8ZLH2lpzPEFZZUrtKtk4k7ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701685468; a=rsa-sha256; cv=none; b=IcPsMAyxVt0oBTxH11ZDrGzwlNXM6vTJvbdNYZchWb5U9rNGEIW8H6mWE5Cpp2HUgnnTEN ibmmb4y0Ay3rN/zqqKBxcng5JKvDeBc/O/wTW8aqMJ0XSoE01T5PvYBIJmjgO69z5cqRdy Gwl5eU82uQamUbY7FBj3cQh3P4u1qH/n8OnMiFcBNLOQqDCTbTdD7WoAtBbjK7P4Eus1D3 iZgugKUvNRJzOyUL24dgqg9YossECqw/CcRcIdfeafoSsoFYLVbjxd5ohb+CLJ0ypPuM0h ncLT0FjbdE9B/oDJpXnfnSigoMr5kCE5kybkBIOQuLGPQRjaxQzrjQZ64Udquw== 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 4SkKXX0pYLz7V0; Mon, 4 Dec 2023 10:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AOSXc092446; Mon, 4 Dec 2023 10:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AOSEA092443; Mon, 4 Dec 2023 10:24:28 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:24:28 GMT Message-Id: <202312041024.3B4AOSEA092443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c01ee3f8592b - stable/14 - pkg: use https by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c01ee3f8592bb62146774d912d2a0d7798ed9904 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c01ee3f8592bb62146774d912d2a0d7798ed9904 commit c01ee3f8592bb62146774d912d2a0d7798ed9904 Author: Baptiste Daroussin AuthorDate: 2023-06-08 21:37:58 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:20:56 +0000 pkg: use https by default Switch the repository to use https by default, base is providing a CA root bundle suitable to validate the certificates used by the project. This can now be activated without requiring another packages to be installed Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40473 (cherry picked from commit d557a86c879a8515d59e8380b083b2265e9a3547) --- usr.sbin/pkg/FreeBSD.conf.latest | 2 +- usr.sbin/pkg/FreeBSD.conf.quarterly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index 3f0c4a6243cb..a75b0703386f 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -7,7 +7,7 @@ # FreeBSD: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/latest", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index 31dc1bde8c2a..645053820dda 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -7,7 +7,7 @@ # FreeBSD: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", From nobody Mon Dec 4 10:24:29 2023 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 4SkKXY4J2Sz53CKP; Mon, 4 Dec 2023 10:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKXY2tWKz4MhN; Mon, 4 Dec 2023 10:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iMh3bkADqA3eu/TplmaM1QWKEHnU6TJXFBTDtpOuAq4=; b=avdsw9JT+2+lWZgRiCGn6mxUfe6wHnLeUILG0yAk5fSedMg62Z6FjSLq9+VHMLtxr1kgQM M2H5yodTz6vcn8N4HrShqRg18rwDKd6GxGnSL0EKqDVyK3nZRbQOFunqHvpdULV5lus2Ne DOF0omGagLlt8uBY2UCWg1/DhLSFQDBA7Wz4MPTzL7/gaB3zDkJDR1x7Bep1FDvsiLLId+ I2ezbi9B4SqJpzh6OAvb4s9/v4lXmHnvFID19ZzYTfnh3gGEk+PpRQoGuH/htPVB/Z6gEh jqZdic5bzIy6f0n4Fr8dmF4730ZFVAT1n2LoYHyKefWxqC8p509EFyJ7XrUSYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iMh3bkADqA3eu/TplmaM1QWKEHnU6TJXFBTDtpOuAq4=; b=rRoewqlJx6X1YGBE77HrsN6HDZaLx8IalBdWGMlsx5oZA6J3IEGSCs1w+e841C5t16TUMZ Om5YfDPI5XcYTWsa/4jWc7LMd94b2h23vSumL+s+f9ZR9ykK2b53sbevLTMr4eTXZU+BKl 6oMgSv/RkQE2rui8gWBxbfS9MUp0IQO9bRTdL4WDU/i4vcPfbGvlBl0sw0YrqIJP3MZn4P zZpIdapRlr+2sXpjGs6QHSHLIZZ9j9+F9xZWJOhBkS8LPLH2ggLtDJVfyQWsObeH8TXM2S ULwdd3nZHCXgw//OSTu2K5g2+o+6q3dtmubaoOHb9QHcHzPJfyskONxrFZbYmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701685469; a=rsa-sha256; cv=none; b=vrP/JD8yF3aldhtqzprCzaJEYDizbredaBaBa83hSIRSyt/pWjQsLFSc/9wUkj3jWzS2V7 BylMaUL+766L14IUr9WhDVJDG9/HIIQdGrgL6is4C58UuJQhT2ha5X4a1Q57nIFu9p5xTB FzSCctmmrGkhn5uKifoBDLbwveHvF9hKuGkUlcjQyVrgJjUH7eoW01iq/BEo39D8s9TkS+ 74BaoxCAChGWJ68wFDVbOxVlx0JqMcFH37dGf8v+HoVeBeM0WDS8m6f5PYgkymTZfQN5VS +RwFcEREOKDV0BIu4FKxKFcE741Zd6sY5T4XLMa1xGglwI3yodDk1eqBQtcp0g== 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 4SkKXY1p6Kz7Dl; Mon, 4 Dec 2023 10:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AOTF4092488; Mon, 4 Dec 2023 10:24:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AOTX6092485; Mon, 4 Dec 2023 10:24:29 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:24:29 GMT Message-Id: <202312041024.3B4AOTX6092485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: a501d357eb45 - stable/14 - genl: add a monitor subcommand List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a501d357eb45e6b66057fa78a6447ddb1cc1de65 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a501d357eb45e6b66057fa78a6447ddb1cc1de65 commit a501d357eb45e6b66057fa78a6447ddb1cc1de65 Author: Baptiste Daroussin AuthorDate: 2023-10-05 10:51:02 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:21:33 +0000 genl: add a monitor subcommand usage: $ genl monitor this subcommand allows to monitor the message from a multicast group of a given family when received. If it knows how to parse the messages received it will dump the decoded version, otherwise it will just inform a new message has been received So far it only knows how to parse nlctrl notify messages, but the plan to allow to make the parsing extensible via lua scripts Differential Revision: https://reviews.freebsd.org/D40372 (cherry picked from commit e19b2ef976d326d34b17331c5071d9e687d0d5d5) --- usr.bin/genl/genl.1 | 27 ++++++++-- usr.bin/genl/genl.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 158 insertions(+), 10 deletions(-) diff --git a/usr.bin/genl/genl.1 b/usr.bin/genl/genl.1 index 44ce4feaea48..b3d66298eb00 100644 --- a/usr.bin/genl/genl.1 +++ b/usr.bin/genl/genl.1 @@ -24,23 +24,44 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 20, 2023 +.Dd Oct 5, 2023 .Dt GENL 1 .Os .Sh NAME .Nm genl -.Nd "generic netlink list" +.Nd "generic netlink" .Sh SYNOPSIS .Nm +.Pp +.Nm Cm list +.Pp +.Nm Cm monitor Ao family Ac Ao multicast group Ac .Sh DESCRIPTION +The .Nm -lists all available generic netlink protocols, and presents its details: +utility is design to provide access to the user to generic netlink +protocols. +.Pp +The following commands are available: +.Bl -tag -ident +.It Cm list Po default Pc +Lists all available generic netlink protocols, and presents its details: .Bl -tag -width "multicast groups" .It operations Id of the operation if any and associated capabilities .It multicast groups If of the available multicast group if any and it associated name .El +.It Cm monitor Ao family Ac Ao multicast group Ac +Connect to the +.Ar family +protocol and subscribe to the +.Ar mulicast group +then print the received messages in a readable format if the protocol is known. +So far only +.Qq nlctrl +is known. +.El .Sh SEE ALSO .Xr genetlink 4 , .Xr netlink 4 diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c index 8e8e18a7f8e2..e3acb872a39e 100644 --- a/usr.bin/genl/genl.c +++ b/usr.bin/genl/genl.c @@ -27,18 +27,41 @@ #include #include +#include #include #include #include #include #include +#include #include #include #include #include +static int monitor_mcast(int argc, char **argv); +static int list_families(int argc, char **argv); +static void parser_nlctrl_notify(struct snl_state *ss, struct nlmsghdr *hdr); +static void parser_fallback(struct snl_state *ss, struct nlmsghdr *hdr); + +static struct commands { + const char *name; + const char *usage; + int (*cmd)(int argc, char **argv); +} cmds[] = { + { "monitor", "monitor ", monitor_mcast }, + { "list", "list", list_families }, +}; + +static struct mcast_parsers { + const char *family; + void (*parser)(struct snl_state *ss, struct nlmsghdr *hdr); +} mcast_parsers [] = { + { "nlctrl", parser_nlctrl_notify }, +}; + struct genl_ctrl_op { uint32_t id; uint32_t flags; @@ -131,6 +154,13 @@ dump_mcast_groups( struct snl_genl_ctrl_mcast_groups *mcast_groups) mcast_groups->groups[i]->mcast_grp_name); } +static void +usage(void) +{ + fprintf(stderr, "Usage: %s\n", getprogname()); + for (size_t i = 0; i < nitems(cmds); i++) + fprintf(stderr, " %s %s\n", getprogname(), cmds[i].usage); +} static void dump_family(struct genl_family *family) @@ -143,8 +173,87 @@ dump_family(struct genl_family *family) dump_mcast_groups(&family->mcast_groups); } +void +parser_nlctrl_notify(struct snl_state *ss, struct nlmsghdr *hdr) +{ + struct genl_family family = {}; + + if (snl_parse_nlmsg(ss, hdr, &genl_family_parser, + &family)) + dump_family(&family); +} + +void +parser_fallback(struct snl_state *ss __unused, struct nlmsghdr *hdr __unused) +{ + printf("New unknown message\n"); +} + +int +monitor_mcast(int argc __unused, char **argv) +{ + struct snl_state ss; + struct nlmsghdr *hdr; + struct _getfamily_attrs attrs; + struct pollfd pfd; + bool found = false; + void (*parser)(struct snl_state *ss, struct nlmsghdr *hdr); + + parser = parser_fallback; + + if (!snl_init(&ss, NETLINK_GENERIC)) + err(EXIT_FAILURE, "snl_init()"); + + if (argc != 2) { + usage(); + return (EXIT_FAILURE); + } + if (!snl_get_genl_family_info(&ss, argv[0], &attrs)) + errx(EXIT_FAILURE, "Unknown family '%s'", argv[0]); + for (uint32_t i = 0; i < attrs.mcast_groups.num_groups; i++) { + if (strcmp(attrs.mcast_groups.groups[i]->mcast_grp_name, + argv[1]) == 0) { + found = true; + if (setsockopt(ss.fd, SOL_NETLINK, + NETLINK_ADD_MEMBERSHIP, + (void *)&attrs.mcast_groups.groups[i]->mcast_grp_id, + sizeof(attrs.mcast_groups.groups[i]->mcast_grp_id)) + == -1) + err(EXIT_FAILURE, "Cannot subscribe to command " + "notify"); + break; + } + } + if (!found) + errx(EXIT_FAILURE, "No such multicat group '%s'" + " in family '%s'", argv[1], argv[0]); + for (size_t i= 0; i < nitems(mcast_parsers); i++) { + if (strcmp(mcast_parsers[i].family, argv[0]) == 0) { + parser = mcast_parsers[i].parser; + break; + } + } + memset(&pfd, 0, sizeof(pfd)); + pfd.fd = ss.fd; + pfd.events = POLLIN | POLLERR; + while (true) { + pfd.revents = 0; + if (poll(&pfd, 1, -1) == -1) { + if (errno == EINTR) + continue; + err(EXIT_FAILURE, "poll()"); + } + hdr = snl_read_message(&ss); + if (hdr != NULL && hdr->nlmsg_type != NLMSG_ERROR) + parser(&ss, hdr); + + } + + return (EXIT_SUCCESS); +} + int -main(int argc, char **argv __unused) +list_families(int argc, char **argv __unused) { struct snl_state ss; struct snl_writer nw; @@ -152,16 +261,16 @@ main(int argc, char **argv __unused) struct snl_errmsg_data e = {}; uint32_t seq_id; - if (argc > 1) - errx(EXIT_FAILURE, "usage: genl does not accept any argument"); - if (modfind("netlink") == -1) - err(EXIT_FAILURE, "require netlink module to be loaded"); - + if (argc != 0) { + usage(); + return (EXIT_FAILURE); + } if (!snl_init(&ss, NETLINK_GENERIC)) err(EXIT_FAILURE, "snl_init()"); snl_init_writer(&ss, &nw); - hdr = snl_create_genl_msg_request(&nw, GENL_ID_CTRL, CTRL_CMD_GETFAMILY); + hdr = snl_create_genl_msg_request(&nw, GENL_ID_CTRL, + CTRL_CMD_GETFAMILY); if ((hdr = snl_finalize_msg(&nw)) == NULL) err(EXIT_FAILURE, "snl_finalize_msg"); seq_id = hdr->nlmsg_seq; @@ -179,3 +288,21 @@ main(int argc, char **argv __unused) return (EXIT_SUCCESS); } + +int +main(int argc, char **argv) +{ + if (modfind("netlink") == -1) + err(EXIT_FAILURE, "require netlink module to be loaded"); + + if (argc == 1) + return (list_families(0, NULL)); + + for (size_t i = 0; i < nitems(cmds); i++) { + if (strcmp(argv[1], cmds[i].name) == 0) + return (cmds[i].cmd(argc - 2, argv + 2)); + } + usage(); + + return (EXIT_FAILURE); +} From nobody Mon Dec 4 10:24:30 2023 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 4SkKXZ6DNXz53CDm; Mon, 4 Dec 2023 10:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKXZ3bKBz4N11; Mon, 4 Dec 2023 10:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZPFYtTdLlhOJAa7WnezLSEERbnAxrg0cFAGsTVDNpzg=; b=KqOwqRKT3N9YSuTfYcKUvZe5np0Ewn7pRPdhgCM32o5pvdNTK9LePBRvq5cBtCds3nCMFa KVYsdARUNsVSBemiwv3HMObo2LQpnaYun77exQn0ZWWTI/9iBF5DqyOGXe4bwQGLzLs6RA 8sk4CbShLKaUCf8t3gYs/b0j6Z7GYlmYzztZL9Uww0jRP+KVYnlj8PFmoegDAx0ffuDHtf qXvtjfTPWVq8ZmGVe7cK2bifG3zSrS8oyYQvrWjpobkYAYyy8J6ilclBpGvoh6imNnpKcp STcrAA6Wob63TONFtyWFtyDqltF+LFU0exX3zq4LfxxLO294y5ur3C6pfBhzUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZPFYtTdLlhOJAa7WnezLSEERbnAxrg0cFAGsTVDNpzg=; b=Hq5itTM+FQxZFZ2JYRkXN7Ad07vcT4MPUAeu86sANBMMbAAGYNSlZ9Nj2cDpkjv1quvi0K ufxmseYVBwGj/SiwDzG33XpXgEsUkkdtsle2NwTiqOOM7DLLE3FutgPQAT+B6TKzISp0kS 0X59DJENPAATxqEmESOJ72sIhUdHC8uNRqVCIMX1zl26Riv4RAupRRh43Z7cHSPN1F4dcS yaoAd8yfoJ9h0DDLdw2lIN31cSoBUYmo6o5NbrZ8ehRKcSiCd8ssR78WBsaHee+B604ps9 NWEAfyeb+DJuQz7lSulvYWxm7TL2BasLh9Onx0w5gbhPAMQPgAwI//inTxvWdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701685470; a=rsa-sha256; cv=none; b=WjvjYlGKa6SjtwtLC1JkNeVZUTfppPWUQByVnH5o0T3R5K9pmaIBGHZtkzu1wt0/mj9WIk ho2mZ1f7eJOUY7SOV35nfEVAh32qFqI2pk1SgpafY4eRc0Xlbb/vMmb5ddNgww9/s+6fBe wHtVMwTnq0lZGaI7Y1tfsBlfoU1bms3vGMU7kw6cbnkfN/ecFr1E954R3uIE/C55xAJZmq M2l0heXjeh9KLjkrqHPQZ0auVovwZ8iJ7GQgVrLuJtK8r57EDWkWpYIzQrjMFVhNm9OpdJ AjxhY9PaZE4FFIpPXIv/f/FZx5h2JPebTwJrdcvBtGw/xf+0C0+abTKbXa8Gyg== 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 4SkKXZ2cCfz7V1; Mon, 4 Dec 2023 10:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AOUxl092548; Mon, 4 Dec 2023 10:24:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AOUsN092545; Mon, 4 Dec 2023 10:24:30 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:24:30 GMT Message-Id: <202312041024.3B4AOUsN092545@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 693ea5a3b1e4 - stable/14 - sendmail: remove all m4 files with WITHOUT_SENDMAIL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 693ea5a3b1e42b1fc2354bd173131856bb8f781c Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=693ea5a3b1e42b1fc2354bd173131856bb8f781c commit 693ea5a3b1e42b1fc2354bd173131856bb8f781c Author: Baptiste Daroussin AuthorDate: 2023-08-04 11:57:12 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:22:22 +0000 sendmail: remove all m4 files with WITHOUT_SENDMAIL (cherry picked from commit 358f8a7add3c83f5f5a37b4c295e116ec511936b) --- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 11e7f9cbb868..c62c5cb6fc4c 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -7156,6 +7156,7 @@ OLD_FILES+=usr/share/sendmail/cf/feature/bestmx_is_local.m4 OLD_FILES+=usr/share/sendmail/cf/feature/bitdomain.m4 OLD_FILES+=usr/share/sendmail/cf/feature/blacklist_recipients.m4 OLD_FILES+=usr/share/sendmail/cf/feature/block_bad_helo.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/check_other.m4 OLD_FILES+=usr/share/sendmail/cf/feature/check_cert_altnames.m4 OLD_FILES+=usr/share/sendmail/cf/feature/check_other.m4 OLD_FILES+=usr/share/sendmail/cf/feature/compat_check.m4 From nobody Mon Dec 4 10:24:31 2023 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 4SkKXb59ZBz53C2p; Mon, 4 Dec 2023 10:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKXb4Dnyz4N63; Mon, 4 Dec 2023 10:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8SatJeTDayS1EroYv8JohIiUCLjgsuptVx/BINTibY=; b=dtGyf1m8FIS7RV5ZBapp4nZTCHo05uMTLfn9AQZPwr65Jqd7ycp0eGg1lFv/0DLv0ABR/O kSpBGfyAMF/G4ZWLLj7YHzKZCbJrZvcRWuL4Z8kwIAQGx9TA3a++QpXjci6/fJWUI/nkX6 gyIuiSwCbNakxo8DJWtnupfAXvV5K3DL6s3FGyhwv3dx0G8oGVrjfZNZHOIujUQX6QY9aj 9Xsx+BbvvEuD2MC4j/NoO9bDHpvrqoneDnTIe1xDhFUhHeEFNR+zZikTEIdvxDf5OGisqZ TxnmkTAZfJK+m39rUsNdsgDaBiHGC6AgCwck2t88IU3KxPok3eVu5em67guvNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8SatJeTDayS1EroYv8JohIiUCLjgsuptVx/BINTibY=; b=IknVTCUI39saW6/QDyRWUVeG1XVG4CQLtQeP5sZPszbTK6zVNMKL2HyuupeFGtgKo+1aAs o3IKZ/gFEaLbpSmZRiORwv3nxhxogZ3bMZh6khDwbV7WpvYdXsbjhDeucOFqXZufyaM/Ok gTvjreNMifTPxEMYMEvvmuHeHRpoKaa2yxhU9eX08VRYjAaEptt9Ko5cuxHuWjn4wWC+kh dmx/1fABHJI5Ct+PIbvfLPP7JhKy2SQtwZL+TFmeWEN8TA32Ji4roO4/He8C150SkEh+XF ptIH1bYJ94m3vSMdZXlut5pzWnd26L3byT9s1LlndXcCPYVqS6gdjcpR3GiXsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701685471; a=rsa-sha256; cv=none; b=PbE8TiUJZ9GsjHgGN/ckiHqXQpUdDI/Z6dqYYR2XWB0YlnXdcakHP777HoK+FyHCI+iS9b F2ga6K9Vdjkyu/pttVJ5S4/XTdgI4JxLVfjN4zp38zVui2iMzpBoQ7IdO6IF1umQpJNv2n l8Nk44O5e7YjyNq2OwkgnbviAa2zNfvAkQY3fTd+MB8O12uA7qFzPcTdIEYRW8CmjGCq12 awQF9BTBUVsdkgEcnhaIVlzTxTBHeRIZWDFRxIqf7jGRX87M0K8ECaqohN9p+f+Sf3UC9l BTMuyqo7xvUTw7sQsOgwzdOtZG6WylrILpKfCOyZJ2u+UBEaA6LH8tbUVWKAbg== 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 4SkKXb3HL2z7kC; Mon, 4 Dec 2023 10:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AOVCq092587; Mon, 4 Dec 2023 10:24:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AOVI7092584; Mon, 4 Dec 2023 10:24:31 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:24:31 GMT Message-Id: <202312041024.3B4AOVI7092584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 629c764f0a6d - stable/14 - pci_vendors: update to 2023-08-12 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 629c764f0a6dad4fc1fdd4596f2f07db62ab3f45 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=629c764f0a6dad4fc1fdd4596f2f07db62ab3f45 commit 629c764f0a6dad4fc1fdd4596f2f07db62ab3f45 Author: Baptiste Daroussin AuthorDate: 2023-09-06 12:22:11 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:23:56 +0000 pci_vendors: update to 2023-08-12 (cherry picked from commit bf986d52458aaefa4d3a1d4668449cbb5c991afe) --- share/misc/pci_vendors | 342 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 295 insertions(+), 47 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index 29f7a824bbaf..d3988731c30a 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.06.19 -# Date: 2023-06-19 03:15:02 +# Version: 2023.08.12 +# Date: 2023-08-12 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -90,6 +90,8 @@ 025e d819 NVMe DC SSD E3.S 7.5mm [D5-P5336] 025e d81d NVMe DC SSD E1.L 9.5mm [D5-P5336] 0b70 NVMe DC SSD [Yorktown controller] + f1ab P41 Plus NVMe SSD (DRAM-less) + f1ac P44 Pro NVMe SSD 0270 Hauppauge computer works Inc. (Wrong ID) 0291 Davicom Semiconductor, Inc. (Wrong ID) # SpeedStream is Efficient Networks, Inc, a Siemens Company @@ -1037,8 +1039,8 @@ 15d9 1c6e AOC-SLG4-2H8M2 Storage Adapter 1d49 0505 ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter 1d49 0506 ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter - 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay RAID Enablement Kit - 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay RAID Enablement Kit + 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay Non-Hot-Swap RAID Enablement Kit + 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay Rear Hot-Swap RAID Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1375,6 +1377,7 @@ 1043 841b M5A88-V EVO 1043 8445 M5A78L LE 105b 0e13 N15235/A74MX mainboard / AMD SB700 + 1179 ff1e Satellite C660D-113 1179 ff50 Satellite P305D-S8995E 1458 a022 GA-770/78-series motherboard 1458 a102 GA-880GMA-USB3 @@ -2178,7 +2181,7 @@ 6640 Saturn XT [FirePro M6100] 106b 014b Tropo XT [Radeon R9 M380 Mac Edition] 6641 Saturn PRO [Radeon HD 8930M] - 6646 Bonaire XT [Radeon R9 M280X] + 6646 Bonaire XT [Radeon R9 M280X / FirePro W6150M] 6647 Saturn PRO/XT [Radeon R9 M270X/M280X] 1043 223d N551ZU laptop Radeon R9 M280X 6649 Bonaire [FirePro W5100] @@ -2240,7 +2243,7 @@ 17aa 368f Radeon R5 A230 6667 Jet ULT [Radeon R5 M230] 666f Sun LE [Radeon HD 8550M / R5 M230] - 66a0 Vega 20 [Radeon Instinct] + 66a0 Vega 20 [Radeon Pro/Radeon Instinct] 66a1 Vega 20 [Radeon Pro VII/Radeon Instinct MI50 32GB] 66a2 Vega 20 66a3 Vega 20 [Radeon Pro Vega II/Radeon Pro Vega II Duo] @@ -2898,6 +2901,7 @@ 1787 a480 Radeon RX 480 1849 5001 Phantom Gaming X RX 580 OC 1849 5030 Phantom Gaming D Radeon RX580 8G OC + 1da2 e343 Radeon RX 570 Pulse ITX 4GB 1da2 e353 Radeon RX 570 Pulse 4GB 1da2 e366 Nitro+ Radeon RX 570/580/590 1da2 e387 Radeon RX 580 Pulse 4GB @@ -3168,7 +3172,7 @@ 686e Vega 10 GLXLA 687f Vega 10 XL/XT [Radeon RX Vega 56/64] 1002 0b36 RX Vega64 - 1002 6b76 RX Vega64 + 1002 6b76 AMD Radeon RX Vega 56 8GB # ROG-STRIX-RXVEGA64-O8G-GAMING 1043 04c4 Radeon RX Vega 64 1458 230c Radeon RX VEGA 56 GAMING OC 8G @@ -3906,13 +3910,14 @@ 1eae 6901 Speedster MERC 319 AMD Radeon RX 6900 XT Black 73c3 Navi 22 73c4 Navi 22 USB - 73ce Navi22-XL SRIOV MxGPU + 73ce Navi 22-XL SRIOV MxGPU 73df Navi 22 [Radeon RX 6700/6700 XT/6750 XT / 6800M/6850M XT] 1043 16c2 Radeon RX 6800M 1458 2408 Radeon RX 6750 XT GAMING OC 12G 1462 3980 Radeon RX 6700 XT Mech 2X 12G [MSI] 1849 5219 Radeon RX 6700 XT Challenger D 1849 5222 RX 6700 XT Challenger D OC + 1da2 465e Radeon RX 6750 XT PULSE OC 1da2 e445 Sapphire Radeon RX 6700 1eae 6601 Speedster QICK 319 RX 6700 XT 73e0 Navi 23 @@ -3936,16 +3941,17 @@ 7424 Navi 24 [Radeon RX 6300] 743f Navi 24 [Radeon RX 6400/6500 XT/6500M] 1da2 e457 PULSE AMD Radeon RX 6500 XT - 7448 Navi31 [Radeon Pro W7900] + 7446 Navi 31 USB + 7448 Navi 31 [Radeon Pro W7900] 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] - 745e Navi31 [Radeon Pro W7800] - 7480 Navi 33 [Radeon RX 7700S/7600S/7600M XT] + 745e Navi 31 [Radeon Pro W7800] + 7480 Navi 33 [Radeon RX 7700S/7600/7600S/7600M XT/PRO W7600] 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] - 7489 Navi 33 + 7489 Navi 33 [Radeon Pro W7500] 7833 RS350 Host Bridge 7834 RS350 [Radeon 9100 PRO/XT IGP] 7835 RS350M [Mobility Radeon 9000 IGP] @@ -4348,6 +4354,7 @@ ab18 Vega 12 HDMI Audio ab20 Vega 20 HDMI Audio [Radeon VII] ab28 Navi 21/23 HDMI/DP Audio Controller + ab30 Navi 31 HDMI/DP Audio ab38 Navi 10 HDMI Audio ac00 Theater 506 World-Wide Analog Decoder ac01 Theater 506 World-Wide Analog Decoder @@ -5032,7 +5039,11 @@ 14b7 Family 17h-19h PCIe Dummy Host Bridge 14b9 Family 17h-19h Internal PCIe GPP Bridge 14ba Family 17h-19h PCIe GPP Bridge +# Server device + 14ca Genoa CCP/PSP 4.0 Device 14cd Family 19h USB4/Thunderbolt PCIe tunnel + 14de Phoenix PCIe Dummy Function + 14ef Family 19h USB4/Thunderbolt PCIe tunnel 1510 Family 14h Processor Root Complex 174b 1001 PURE Fusion Mini 1512 Family 14h Processor Root Port @@ -5116,6 +5127,9 @@ 15b5 Stoney NB Performance Monitor 15bc Stoney PCIe [GFX,GPP] Bridge [4:0] 15be Stoney Audio Processor + 15c4 Phoenix USB4/Thunderbolt NHI controller #1 + 15c5 Phoenix USB4/Thunderbolt NHI controller #2 + 15c7 Family 19h (Model 74h) CCP/PSP 3.0 Device 15d0 Raven/Raven2 Root Complex 103c 8615 Pavilion Laptop 15-cw1xxx 1043 876b PRIME B450M-A Motherboard @@ -5264,6 +5278,8 @@ 1665 VanGogh Data Fabric; Function 5 1666 VanGogh Data Fabric; Function 6 1667 VanGogh Data Fabric; Function 7 + 1668 Pink Sardine USB4/Thunderbolt NHI controller #1 + 1669 Pink Sardine USB4/Thunderbolt NHI controller #2 166a Cezanne Data Fabric; Function 0 166b Cezanne Data Fabric; Function 1 166c Cezanne Data Fabric; Function 2 @@ -5707,6 +5723,7 @@ 1028 215f ENT NVMe RT1 RI 7.68TB 1028 2160 ENT NVMe RT1 FIPS RI 3.84TB 1028 2161 ENT NVMe RT1 FIPS RI 7.68TB + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 1029 Siemens Nixdorf IS 102a LSI Logic 0000 HYDRA @@ -6971,6 +6988,7 @@ 90dc Baikal DMA Controller 90dd Baikal Memory (DDR3/SPM) 90de Baikal USB 3.0 xHCI Host Controller + 9121 Nextorage NEM-PA NVMe SSD for PlayStation 104e Oak Technology, Inc 0017 OTI-64017 0107 OTI-107 [Spitfire] @@ -7201,6 +7219,7 @@ c350 80333 [SuperTrak EX12350] e350 80333 [SuperTrak EX24350] 105b Foxconn International, Inc. + e0c3 T99W175 5G Modem [Snapdragon X55] 105c Wipro Infotech Limited 105d Number 9 Computer Company 2309 Imagine 128 @@ -12732,8 +12751,13 @@ 2330 GH100 [H100 SXM5 80GB] 2331 GH100 [H100 PCIe] 2336 GH100 [H100] - 2339 GH100 [H100] + 2337 GH100 [H100 SXM5 64GB] + 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] + 233d GH100 [H100 96GB] + 2342 GH100 [GH200 120GB] + 2343 GH100 + 2345 GH100 [GH200 480GB] 2414 GA103 [GeForce RTX 3060 Ti] 2420 GA103M [GeForce RTX 3080 Ti Mobile] 2438 GA103GLM [RTX A5500 Laptop GPU] @@ -12829,6 +12853,7 @@ 26b2 AD102GL [RTX 5000 Ada Generation] 26b5 AD102GL [L40] 26b8 AD102GL [L40G] + 26b9 AD102GL [L40S] 26f5 AD102GL [L40 CNX] 2704 AD103 [GeForce RTX 4080] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] @@ -12839,15 +12864,18 @@ 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] + 27b2 AD104GL [RTX 4000 Ada Generation] 27b7 AD104GL [L16] 27b8 AD104GL [L4] 27ba AD104GLM [RTX 4000 Ada Generation Laptop GPU] 27bb AD104GLM [RTX 3500 Ada Generation Laptop GPU] 27e0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 2803 AD106 [GeForce RTX 4060 Ti] + 2805 AD106 [GeForce RTX 4060 Ti 16GB] 2820 AD106M [GeForce RTX 4070 Max-Q / Mobile] 2838 AD106GLM [RTX 3000 Ada Generation Laptop GPU] 2860 AD106M [GeForce RTX 4070 Max-Q / Mobile] + 2882 AD107 [GeForce RTX 4060] 28a0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28a1 AD107M [GeForce RTX 4050 Max-Q / Mobile] 28b8 AD107GLM [RTX 2000 Ada Generation Laptop GPU] @@ -13097,7 +13125,10 @@ 5288 RTS5288 PCI Express Card Reader 5289 RTL8411 PCI Express Card Reader 1043 1457 K55A Laptop + 5760 RTS5763DL x2 NVMe SSD Controller 5762 RTS5763DL NVMe SSD Controller + 5763 RTS5763DL NVMe SSD Controller (DRAM-less) + 5765 RTS5765DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) 10ec 8029 RTL-8029(AS) @@ -15293,8 +15324,8 @@ 0102 Extended IDE Controller 0103 EX-IDE Type-B 010e PXP04 NVMe SSD - 010f NVMe Controller - 0110 NVMe SSD Controller Cx5 + 010f XG3 NVMe SSD Controller + 0110 Cx5 NVMe SSD Controller 1028 1ffb Express Flash NVMe 960G (RI) U.2 (CD5) 1028 1ffc Express Flash NVMe 1.92T (RI) U.2 (CD5) 1028 1ffd Express Flash NVMe 3.84T (RI) U.2 (CD5) @@ -16410,6 +16441,7 @@ 8331 O2 Flash Memory Card 8520 SD/MMC Card Reader Controller 8621 SD/MMC Card Reader Controller + 8760 FORESEE E2M2 NVMe SSD 1218 Hybricon Corp. 1219 First Virtual Corporation 121a 3Dfx Interactive, Inc. @@ -16767,8 +16799,9 @@ 0811 SM811 LynxE 0820 SM820 Lynx3D 0910 SM910 + 2260 SM2260 NVMe SSD Controller 2262 SM2262/SM2262EN SSD Controller - 2263 SM2263EN/SM2263XT SSD Controller + 2263 SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers 1270 Olympus Optical Co., Ltd. 1271 GW Instruments 1272 Telematics International @@ -17556,6 +17589,8 @@ 5190 9200 ECO NVMe SSD 5191 9200 PRO NVMe SSD 5192 9200 MAX NVMe SSD + 5196 9400 PRO NVMe SSD + 5197 9400 MAX NVMe SSD 51a2 7300 PRO NVMe SSD 1344 2000 960GB U.2 1344 3000 1920GB U.2 @@ -17615,8 +17650,12 @@ 51c3 7450 PRO NVMe SSD 51c4 7450 MAX NVMe SSD 1344 3000 U.3 1600GB [MTFDKCB1T6TFS/MTFDKCC1T6TFS] - 5410 2200S NVMe SSD - 5411 2450 NVMe SSD (DRAM-less) + 5404 2210 NVMe SSD [Cobain] + 5405 2300 NVMe SSD [Santana] + 5407 3400 NVMe SSD [Hendrix] + 5410 2200S NVMe SSD [Cassandra] + 5411 2450 NVMe SSD [HendrixV] (DRAM-less) + 5413 2400 NVMe SSD (DRAM-less) 5414 3460 NVMe SSD 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc @@ -19307,15 +19346,18 @@ 144b Verint Systems Inc. 144c Catalina Research Inc 144d Samsung Electronics Co Ltd - 1600 Apple PCIe SSD + 1600 S4LN053X01 AHCI SSD Controller(Apple slot) + 9602 RS780/RS880 PCI to PCI bridge (int gfx) a544 Exynos 8890 PCIe Root Complex a575 Exynos 7420 PCIe Root Complex a5e3 Exynos 5433 PCIe Root Complex a800 XP941 PCIe SSD + a801 S4LN058A01[SSUBX] AHCI SSD Controller (Apple slot) a802 NVMe SSD Controller SM951/PM951 144d a801 PM963 2.5" NVMe PCIe SSD a804 NVMe SSD Controller SM961/PM961/SM963 144d a801 SM963 2.5" NVMe PCIe SSD + a806 NVMe SSD SM0032L a808 NVMe SSD Controller SM981/PM981/PM983 144d a801 SSD 970 EVO 1d49 403b Thinksystem U.2 PM983 NVMe SSD @@ -19341,6 +19383,7 @@ 1028 512d DC NVMe PM9A3 RI U.2 7.68TB 144d a813 General DC NVMe PM9A3 a80b NVMe SSD Controller PM9B1 + a80c NVMe SSD Controller S4LV008[Pascal] a820 NVMe SSD Controller 171X 1028 1f95 Express Flash NVMe XS1715 SSD 400GB 1028 1f96 Express Flash NVMe XS1715 SSD 800GB @@ -20469,6 +20512,7 @@ 43aa BCM43131 802.11b/g/n 43ae BCM43162 802.11ac Wireless Network Adapter 43b1 BCM4352 802.11ac Wireless Network Adapter + 1043 85ba PCE-AC56 Dual-Band Wireless PCI-E Adapter 43ba BCM43602 802.11ac Wireless LAN SoC 43bb BCM43602 802.11ac Wireless LAN SoC 43bc BCM43602 802.11ac Wireless LAN SoC @@ -20594,7 +20638,8 @@ d804 BCM58804 Stingray 100Gb Ethernet SoC f800 BCM78800 Switch ASIC [Trident5-X12] f900 BCM78900 Switch ASIC [Tomahawk5] - f903 BCM78903 Switch ASIC [Tomahawk6] + f902 BCM78902 Switch ASIC [Tomahawk5T] + f903 BCM78903 Switch ASIC [Tomahawk5] f905 BCM78905 Switch ASIC [Tomahawk5+] f910 BCM78910 Switch ASIC [Tomahawk6] f914 BCM78914 Switch ASIC [Tomahawk6] @@ -21410,6 +21455,7 @@ 101d MT2892 Family [ConnectX-6 Dx] 101e ConnectX Family mlx5Gen Virtual Function 101f MT2894 Family [ConnectX-6 Lx] + 193d 1035 NIC-ETH641F-LP-2P SFP28 2x25GbE PCIe Network Adapter 1020 MT28860 1021 MT2910 Family [ConnectX-7] 1023 CX8 Family [ConnectX-8] @@ -21542,18 +21588,25 @@ 5004 PC SN520 NVMe SSD 5005 PC SN520 NVMe SSD 5006 WD Black SN750 / PC SN730 NVMe SSD - 5007 PC SN530 NVMe SSD (DRAM-less) - 5008 PC SN530 NVMe SSD + 5007 IX SN530 NVMe SSD (DRAM-less) + 5008 PC SN530 NVMe SSD (DRAM-less) 5009 WD Blue SN550 NVMe SSD 15b7 5009 WD Blue SN550 NVMe SSD 500b PC SN530 NVMe SSD 1414 500b Xbox Series X 500d WD Ultrastar DC SN340 NVMe SSD 5011 WD PC SN810 / Black SN850 NVMe SSD - 5015 PC SN740 NVMe SSD - 5017 WD Black SN770 NVMe SSD + 5014 WD Green SN350 NVMe SSD 1 TB (DRAM-less) + 5015 PC SN740 NVMe SSD (DRAM-less) + 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) + 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD + 5019 WD Green SN350 NVMe SSD 240GB (DRAM-less) 501a WD Blue SN570 NVMe SSD 1TB + 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) + 501e PC SN735 NVMe SSD (DRAM-less) + 501f WD PC SN735 NVMe SSD 512GB (DRAM-less) 5025 WD Blue SN570 NVMe SSD 2TB + 5026 WD PC SN735 NVMe SSD 1TB (DRAM-less) 5030 Western Digital WD Black SN850X NVMe SSD 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) @@ -22637,8 +22690,11 @@ 9755 GL9755 SD Host Controller e763 GL9763E eMMC Controller 17aa Lenovo + 0003 LENSE20256GMSP34MEAT2TA + 0004 LENSE20512GMSP34MEAT2TA # 250GB nvme ssd from lenovo, can be found in Thinkpad x380 yoga 0005 LENSE30256GMSP34MEAT3TA + 0006 LENSE30512GMSP34MEAT3TA 3181 ThinkCentre M75n IoT 402b Intel 82599ES 10Gb 2-port Server Adapter X520-2 17ab Phillips Components @@ -22665,6 +22721,7 @@ 0105 MSM8998 PCIe Root Complex 0108 SM8150 PCIe Root Complex 0109 SA8195P PCIe Root Complex + 010e SC8280XP PCI Express Root Port 0300 MDM9x35 LTE Modem [Snapdragon X7] 0301 MDM9x45 LTE Modem [Snapdragon X12] 0302 MDM9x55 LTE Modem [Snapdragon X16] @@ -22674,6 +22731,8 @@ 1101 QCA6390 Wireless Network Adapter 1103 QCNFA765 Wireless Network Adapter 1104 QCN6024/9024/9074 Wireless Network Adapter + 1108 IPQ95xx/97xx PCI Express Root Port + 1109 QCN62xx/92xx Wireless Network Adapter 17cc NetChip Technology, Inc 2280 USB 2.0 17cd Cadence Design Systems, Inc. @@ -23604,6 +23663,7 @@ 16ff OX16C954 HOST-B 1987 Phison Electronics Corporation 5007 E7 NVMe Controller + 5008 E8 PCIe3 NVMe Controller 5012 E12 NVMe Controller 5013 PS5013 E13 NVMe Controller 5016 E16 PCIe4 NVMe Controller @@ -23661,6 +23721,7 @@ 103c 3315 NC553i 10Gb 2-port FlexFabric Converged Network Adapter 103c 337b NC554FLB 10Gb 2-port FlexFabric Converged Network Adapter 0800 ServerView iRMC HTI +19a4 Owl Cyber Defense Solutions 19a8 DAQDATA GmbH 19ac Kasten Chase Applied Research 0001 ACA2400 Crypto Accelerator @@ -23893,7 +23954,8 @@ 0050 FlashMAX III 1a84 Commex Technologies 0001 Vulcan SP HT6210 10-Gigabit Ethernet (rev 02) -1a88 MEN Mikro Elektronik +# nee MEN Mikro Elektronik +1a88 Duagon AG 4d45 Multifunction IP core 1a8a StarBridge, Inc. 1a8c Verigy Pte. Ltd. @@ -24128,6 +24190,7 @@ 000c QEMU PCIe Root port 000d QEMU XHCI Host Controller 0010 QEMU NVM Express Controller + 0013 QEMU UFS Host Controller 0100 QXL paravirtual graphic card 1af4 1100 QEMU Virtual Machine 1b37 Signal Processing Devices Sweden AB @@ -24170,7 +24233,7 @@ 1028 2112 BOSS-N1 Monolithic 1028 2113 BOSS-N1 Modular 1028 2151 BOSS-N1 Modular ET - 1028 2196 ROR-N100 + 1028 2196 ROR-N1 1b4b 2241 Santa Cruz NVMe Host Adapter 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit @@ -24241,7 +24304,9 @@ d430 D410/430 Quad-port E1/T1 card 1b79 Absolute Analysis 1b85 OCZ Technology Group, Inc. - 1041 RevoDrive 3 X2 PCI-Express SSD 240 GB (Marvell Controller) + 1021 RevoDrive 3 X2 PCIe SSD 240 GB (Marvell SAS Controller) + 1041 RevoDrive 3 X2 PCIe SSD 240 GB (Marvell SAS Controller) + 4018 Z Drive 6000/6300 NVME SSD 6018 RD400/400A SSD 8788 RevoDrive Hybrid 1b94 Signatec / Dynamic Signals Corp @@ -24371,7 +24436,8 @@ # Nytro 5360S (Rocinante Single Port) TCG - E3.S 1bb1 0180 Nytro 5360S TCG - E3.S 1bb1 01a1 Nytro XP7102 - 5012 FireCuda 510 SSD + 5012 FireCuda/IronWolf 510 SSD + 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520 SSD 5018 FireCuda 530 SSD 1bb3 Bluecherry @@ -24390,7 +24456,7 @@ 0004 MAX4 1bc0 Innodisk Corporation 1001 PCIe 3TG6-P Controller - 1002 PCIe 3TE6 Controller + 1002 PCIe 3TE6 Controller (DRAM-less) 1160 PCIe 3TE2 Controller 1321 PCIe 4TG-P Controller 1322 PCIe 4TE Controller @@ -24398,6 +24464,8 @@ 5208 PCIe 3TE7 Controller 5216 PCIe 3TE8 Controller 5236 PCIe 4TG2-P Controller +1bcd Apacer Technology + 0120 NVMe SSD Drive 960GB 1bcf NEC Corporation 001c Vector Engine 1.0 1bd0 Astronics Corporation @@ -24420,6 +24488,16 @@ 1203 NG3 Series Avionics Discrete Interface 1bd4 Inspur Electronic Information Industry Co., Ltd. 0911 Arria10_PCIe_F10A1150 + 1000 NS8600G1U160 NVME SSD + 1001 NS8600G1U320 NVME SSD + 1002 NS8600G1U640 NVME SSD + 1003 NS8500G1U192 NVME SSD + 1004 NS8500G1U384 NVME SSD + 1005 NS8500G1U768 NVME SSD + 1006 NS6610G1U160, NS6510G1U192 NVME SSD + 1007 NS6610G1U320, NS6510G1U384 NVME SSD + 100c NS8510G1Uxxx, NS8610G1Uxxx NVME SSD + 100e NS8500G2Uxxxx, NS8600G2Uxxxx NVME SSD 1bee IXXAT Automation GmbH 0003 CAN-IB200/PCIe 1bef Lantiq @@ -24427,6 +24505,7 @@ 1bf4 VTI Instruments Corporation 0001 SentinelEX 7011 RX0xxx +1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. 3252 CH382 PCIe Dual Port Serial Adapter @@ -24507,6 +24586,7 @@ # http://www.accensusllc.com/accensustelas2.html 0300 Telas 2.V 1c44 Enmotus Inc + 1100 Fuzedrive NVMe SSD 8000 8000 Storage IO Controller # A Western Digital Subsidiary 1c58 HGST, Inc. @@ -24517,6 +24597,7 @@ 0023 Ultrastar SN200 Series NVMe SSD 1c58 8823 Ultrastar Memory (ME200) 1c5c SK hynix + 1282 PC300 NVMe Solid State Drive 128GB 1283 PC300 NVMe Solid State Drive 256GB 1284 PC300 NVMe Solid State Drive 512GB 1285 PC300 NVMe Solid State Drive 1TB @@ -24524,11 +24605,15 @@ 1339 BC511 NVMe SSD 1504 PC400 NVMe SSD 1527 PC401 NVMe Solid State Drive 256GB + 1627 PC601 NVMe Solid State Drive 1639 PC611 NVMe Solid State Drive + 1739 BC701 NVMe Solid State Drive 174a Gold P31/BC711/PC711 NVMe Solid State Drive 1959 Platinum P41/PC801 NVMe Solid State Drive 1d59 BC901 NVMe Solid State Drive (DRAM-less) 2204 960GB TLC PCIe Gen3 x4 NVMe M.2 22110 + 2427 PE6010 NVMe Solid State Drive + 2429 PE6011 NVMe Solid State Drive 243b PE6110 NVMe Solid State Drive 1c5c 0100 PE6110 NVMe Solid State Drive 2839 PE8000 Series NVMe Solid State Drive @@ -24551,6 +24636,8 @@ 1028 2268 DC NVMe ISE PE8110 RI U.2 3840GB 1028 2269 DC NVMe ISE PE8110 RI U.2 7680GB 1c5c 0101 PE81x0 U.2/3 NVMe Solid State Drive + 284a PE8110 Series NVMe Solid State Drive + 2a49 PE9110 Series NVMe Solid State Drive 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 1c5f 0220 NVMe SSD PBlaze5 520 1920G AIC @@ -24656,10 +24743,19 @@ 0002 Clarett 1cb8 Dawning Information Industry Co., Ltd. 1cc1 ADATA Technology Co., Ltd. +# SX6000LNP + 2263 XPG SX6000 Lite NVMe SSD (DRAM-less) + 33f3 IM2P33F3 NVMe SSD (DRAM-less) 33f8 IM2P33F8ABR1 NVMe SSD 5350 XPG GAMMIX S50 NVMe SSD -# 256GB NVMe SSD - 5766 ADATA XPG GAMMIXS1 1L Media + 5762 FALCON NVMe SSD + 5766 ADATA XPG GAMMIXS1 1L Media (256 GB SSD) + 612a LEGEND 750 NVMe SSD (DRAM-less) + 613a LEGEND 840 NVMe SSD (DRAM-less) + 621a LEGEND 850 NVMe SSD (DRAM-less) + 622a LEGEND 960 NVMe SSD + 624a LEGEND 700 NVMe SSD (DRAM-less) + 627a LEGEND 800 NVMe SSD 8201 XPG SX8200 Pro PCIe Gen3x4 M.2 2280 Solid State Drive 1cc4 Shenzhen Unionmemory Information System Ltd. 1203 NVMe SSD Controller UHXXXa series @@ -24675,8 +24771,21 @@ 1cc4 e122 NVMe SSD UH711a series U.2 1920GB 1cc4 e123 NVMe SSD UH711a series U.2 3840GB 1cc4 e124 NVMe SSD UH711a series U.2 7680GB - 17ab NVMe 256G SSD device + 17a9 RPITJ1TBVME2HWD NVMe SSD 1024GB + 17aa AH631 PCIe 3.0 NVMe SSD 512GB + 17ab AH631 PCIe 3.0 NVMe SSD 256GB + 2263 AM611 PCIe 3.0 NVMe SSD 256GB + 5008 AM610 PCIe 3.0 NVMe SSD 128GB + 5012 RPITJ512PED2OWX NVMe SSD 512GB + 6201 AM620 PCIe 3.0 NVMe SSD 128GB + 6202 AM620 PCIe 3.0 NVMe SSD 256GB + 6203 AM620 PCIe 3.0 NVMe SSD 512GB + 6204 AM620 PCIe 3.0 NVMe SSD 1024GB + 6302 AM630 PCIe 4.0 NVMe SSD 256GB 6303 AM630 PCIe 4.0 x4 NVMe SSD Controller + 6304 AM630 PCIe 4.0 NVMe SSD 1024GB + 6a03 RPETJ512MKP1QDQ PCIe 4.0 NVMe SSD 512GB (DRAM-less) + 6a14 RPEYJ1T24MKN2QWY PCIe 4.0 NVMe SSD 1024GB (DRAM-less) 1cc5 Embedded Intelligence, Inc. 0100 PCIe-CAN-02 Dual CAN bus (9-pin male). PCI Express x1. 0101 PCIe-CAN-01 Single CAN bus (9-pin male). PCI Express x1. @@ -24720,6 +24829,8 @@ 1cf0 Akitio 1cf7 Subspace Dynamics 1cfa Corsair Memory, Inc +1cfd Mangstor + 6300 MX6300 series PCIe x8 NVMe SSD 1d00 Pure Storage 1d05 Tongfang Hongkong Limited 1d0f Amazon.com, Inc. @@ -24827,6 +24938,9 @@ 0015 PM4edge 0016 PM4edge User Device 1d40 Techman Electronics (Changshu) Co., Ltd. + 5501 XC100C55-xxxx NVME SSD + 5c01 XC100C5C-xxxx, XC100E5C-xxxx NVME SSD + b100 PV100C55-xxxx NVME SSD 1d44 DPT a400 PM2x24/PM3224 1d49 Lenovo @@ -24960,6 +25074,10 @@ 1d78 7204 Aliflash V2 U.2 15mm 3.84TB NVMe SSD 1d78 7208 Aliflash V2 U.2 15mm 7.68TB NVMe SSD 1d79 Transcend Information, Inc. + 2262 NVMe PCIe SSD 220S + 2263 NVMe PCIe SSD 120S/112S (DRAM-less) + 2264 NVMe PCIe SSD 250H + 5766 NVMe PCIe SSD 110Q (DRAM-less) 1d7c Aerotech, Inc. # Fiber-optic HyperWire motion control bus from Aerotech. 0001 HyperWire Adapter @@ -25015,9 +25133,12 @@ 0001 Colossus GC2 [C2] 0002 Colossus GC1 [S1] 1d97 Shenzhen Longsys Electronics Co., Ltd. + 1062 Lexar NM710 NVME SSD 1d97 Lexar NM620 NVME SSD (DRAM-less) 2263 SM2263EN/SM2263XT-based OEM SSD 2269 Lexar NM760 NVME SSD (DRAM-less) + 5216 Lexar NM620 NVME SSD (DRAM-less) + 5236 Lexar NM800 PRO NVME SSD # nee Facebook, Inc. 1d9b Meta Platforms, Inc. 0010 Networking DOM Engine @@ -25037,6 +25158,8 @@ # PCIe accelerator card for Deep Learning training tasks 1020 Gaudi2 AI Training Accelerator 1da8 Corigine, Inc. + 3800 Network Flow Processor 3800 + 3803 Network Flow Processor 3800 Virtual Function 1dad Fungible 1db2 ATP ELECTRONICS INC 1db7 Phytium Technology Co., Ltd. @@ -25064,6 +25187,9 @@ dc3c GPU_DMA Controller [X100 Series] 1dbb NGD Systems, Inc. 1dbe INNOGRIT Corporation + 5216 NVMe SSD Controller IG5216 (DRAM-less) + 5220 NVMe SSD Controller IG5220 (DRAM-less) + 5236 NVMe SSD Controller IG5236 5636 NVMe DC SSD IG5636 1dbe 0001 DONGTING-N1 DC SSD U.2 1dbe 1001 DONGHU-Z1 DC ZNS SSD U.2 @@ -25078,6 +25204,7 @@ 1dcf Beijing Sinead Technology Co., Ltd. 1dd3 Sage Microelectronics Corp. 1dd4 Swissbit AG + 0010 N-10m2 NVMe SSD 1dd8 AMD Pensando Systems 0002 DSC2 Elba Upstream Port 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card @@ -25231,6 +25358,8 @@ 8003 RCEC PF 8004 RCEC VF 1dee Biwin Storage Technology Co., Ltd. + 2262 HP EX950 NVMe SSD + 2263 HP EX900 NVMe SSD (DRAM-less) 1def Ampere Computing, LLC e005 eMAG PCI Express Root Port 0 e006 eMAG PCI Express Root Port 1 @@ -25305,6 +25434,8 @@ 0208 ACE-NIC100RN Programmable Network Accelerator 1df3 0000 Maintenance Mode 1df3 0001 ENA2100RN +1df5 Shenzhen TIGO Semiconductor + 1202 kimtigo NVMe SSD (DRAM-less) 1df7 opencpi.org 0001 ml605 0002 alst4 @@ -25321,7 +25452,7 @@ 1dfc JSC NT-COM 1181 TDM 8 Port E1/T1/J1 Adapter 1e0f KIOXIA Corporation - 0001 NVMe SSD Controller BG4 + 0001 NVMe SSD Controller BG4 (DRAM-less) 0007 NVMe SSD Controller Cx6 1028 2078 DC NVMe CD6 RI 960GB 1028 2079 DC NVMe CD6 RI 1.92TB @@ -25343,9 +25474,13 @@ 1028 210f Dell Ent NVMe FIPS CM6 MU 3.2TB 1028 2110 Dell Ent NVMe FIPS CM6 MU 6.4TB 1e0f 0001 Generic NVMe CM6 + 0008 RD500/Exceria Plus/Exceria Plus G2 NVMe SSD 0009 NVMe SSD 1e0f 0001 Toshiba RC500 Series NVMe SSD 1e0f 0032 KIOXIA EXCERIA RC10 Series NVMe SSD + 000c NVMe SSD Controller BG5 (DRAM-less) + 000d NVMe SSD Controller XG7 + 0010 NVMe SSD Controller XG8 0011 NVMe SSD Controller CD7 1028 2189 DC NVMe SED CD7 RI 960GB 1028 218a DC NVMe CD7 RI 960GB @@ -25392,6 +25527,7 @@ 1028 2247 Ent NVMe CM7 E3.S MU 6.4TB 1028 2248 Ent NVMe CM7 E3.S MU 3.2TB 1028 2249 Ent NVMe CM7 E3.S MU 1.6TB + 0018 Exceria Pro NVMe SSD 001f NVMe SSD Controller CD8 1028 2223 DC NVMe CD8 U.2 SED 15.36TB 1028 2224 DC NVMe CD8 U.2 SED 7.68TB @@ -25428,6 +25564,16 @@ 8001 I20 [CloudBlazer] 8011 I10 [CloudBlazer] 8012 I10L [CloudBlazer] +# HHHL PCIe card, single slot, 3rd generation from Enflame + 8031 S6 [Enflame] +# HHHL PCIe card, single slot, 3rd generation from Enflame, 24GB device memory + 8032 S6 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame + c031 S30 [Enflame] +# HHHL PCIe card, dual slot, 3rd generation from Enflame + c032 S60 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory + c033 S30 [Enflame] # nee Thinci, Inc 1e38 Blaize, Inc 0102 Xplorer X1600 @@ -25506,11 +25652,20 @@ 1e3b 008b Enterprise NVMe SSD HHHL 1.6TB (H3900) 1e3b 0091 Enterprise NVMe SSD HHHL 0.75TB (H3900) 1333 Haishen5 NVMe SSD + 1e3b 0081 Enterprise NVMe SSD U.2 3.84TB (H5100) + 1e3b 0082 Enterprise NVMe SSD U.2 7.68TB (H5100) + 1e3b 0084 Enterprise NVMe SSD U.2 3.2TB (H5300) + 1e3b 0085 Enterprise NVMe SSD U.2 6.4TB (H5300) 1e3d Burlywood, Inc 1e44 Valve Software 1e49 Yangtze Memory Technologies Co.,Ltd + 0001 ZHITAI PC005 NVMe SSD 0021 ZHITAI TiPro5000 NVMe SSD 0041 ZHITAI TiPro7000 + 0071 ZHITAI TiPlus7100 +# YMTC + 1001 PC005 NVMe SSD + 1011 PC210 NVMe SSD # YMTC PCIe/NVMe SSD 1013 PC210 1e4b MAXIO Technology (Hangzhou) Ltd. @@ -25561,6 +25716,7 @@ 1e81 a213 NVMe SSD UHXXXa series U.2 3200GB 1e81 a214 NVMe SSD UHXXXa series U.2 6400GB 1e81 f123 NVMe SSD TP6500 series U.2 3840GB + 6206 AM620 NVMe SSD 1e83 Huaqin Technology Co.Ltd 1e85 Heitec AG 1e89 ID Quantique SA @@ -25573,6 +25729,8 @@ 1002 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1e95 1101 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1ea0 5636 TP1500 Series U.2 NVMe Datacenter SSD + 1003 CLR-8W512 NVMe SSD M.2 (DRAM-less) + 1007 CL4-8D512 NVMe SSD M.2 (DRAM-less) 9100 CL1-3D256-Q11 NVMe SSD M.2 1e96 Drut Technologies Inc. 1e9f Lynxi Technologies Co., Ltd. @@ -25585,7 +25743,7 @@ 224a IPA-PE224A CXL to Gen-Z Bridge [Sphinx] 1eab Hefei DATANG Storage Technology Co.,LTD. 300a NVMe SSD Controller 300A - 300b NVMe SSD Controller 300B + 300b NVMe SSD Controller 300B (DRAM-less) 1eac Quectel Wireless Solutions Co., Ltd. 1001 EM120R-GL LTE Modem 1002 EM160R-GL LTE Modem @@ -25652,12 +25810,16 @@ 0201 MTT S80 0202 MTT S70 0203 MTT S60 - 0211 G2D40 + 0211 MTT X200 0221 G2S80 0222 MTT S3000 0223 G2S4 0251 G2N10 02ff MTT HDMI/DP Audio + 0300 MTT S90 Engineering Sample + 0301 MTT S90 + 0323 MTT S4000 + 03ff MTT HDMI/DP Audio 1ed8 Digiteq Automotive 0101 FG4 PCIe Frame Grabber 1ed9 Myrtle.ai @@ -25714,6 +25876,8 @@ 5220 IG5220-Based NVMe SSD 5236 IG5236-Based NVMe SSD 5636 IG5636-Based NVMe SSD +1f0a Motorcomm Microelectronics. + 6801 YT6801 Gigabit Ethernet Controller 1f0f NebulaMatrix Technology 1041 D1055AS vDPA Ethernet Controller 1f0f 0001 D1055AS vDPA Ethernet Controller @@ -25744,6 +25908,8 @@ 1f2f 6115 KM660 U.2 3.2TB NVMe SSD 1f2f 6116 KM560 U.2 3.84TB NVMe SSD 1f2f 6118 KM560 U.2 7.68TB NVMe SSD +1f31 Nextorage + 4512 Nextorage NE1N NVMe SSD 1f3f 3SNIC Ltd 2100 SSSHBA SAS/SATA HBA 1f3f 0120 HBA 32 Ports @@ -25783,6 +25949,7 @@ 9032 SSSNIC SDI5.1 1f3f 00a1 Dual Port 100GE SDI5.1 1f40 Netac Technology Co.,Ltd + 2263 NVMe SSD (DRAM-less) 1f44 VVDN Technologies Private Limited 1f4b Axera Semiconductor Co., Ltd 1f52 MangoBoost Inc. @@ -25890,6 +26057,14 @@ 1fd4 SUNIX Co., Ltd. 0001 Matrix multiport serial adapter 1999 Multiport serial controller +1fde Kratos Defense & Security Solutions, Inc. + 1125 OpenEdge 1125P + 2500 OpenEdge 2500P +1fe0 Allwinmeta Co., Ltd. + 1010 AWM 1 + 2000 AWM 2 + 2010 AWM 2-M +1fe4 HippStor Technology 2000 Smart Link Ltd. 2800 SmartPCI2800 V.92 PCI Soft DFT 2001 Temporal Research Ltd @@ -25909,13 +26084,24 @@ 2010 8142 100VG/AnyLAN 2646 Kingston Technology Company, Inc. 0010 HyperX Predator PCIe AHCI SSD - 2262 KC2000 NVMe SSD +# KC2000 and KC2500 share the same DID + 2262 KC2000/KC2500 NVMe SSD 2263 A2000 NVMe SSD 5008 U-SNS8154P3 NVMe SSD + 500b DC1000M NVMe SSD + 500c OM8PCP Design-In PCIe 3 NVMe SSD (DRAM-less) 500d OM3PDP3 NVMe SSD - 500e SNVS2000G [NV1 NVMe PCIe SSD 2TB] - 5012 DC1500M U.2 Enterprise SSD - 5013 FURY Renegade NVMe SSD + 500e NV1 NVMe SSD + 5010 OM8SBP NVMe PCIe SSD (DRAM-less) + 5012 DC1500M NVMe SSD +# KC3000 and Renegade share the same DID + 5013 KC3000/Renegade NVMe SSD + 5014 Design-In PCIe 4 NVMe SSD (TLC) + 5016 OM3PGP4 NVMe SSD + 501b OM8PGP4 NVMe PCIe SSD (DRAM-less) + 501d NV2 NVMe PCIe 4 SSD 500GB (DRAM-less) + 501f FURY Renegade NVMe SSD with heatsink + 5021 Design-In PCIe 4 NVMe SSD (QLC) 270b Xantel Corporation 270f Chaintech Computer Co. Ltd 2711 AVID Technology Inc. @@ -27193,6 +27379,7 @@ 0960 80960RP (i960RP) Microprocessor/Bridge 0962 80960RM (i960RM) Bridge 0964 80960RP (i960RP) Microprocessor/Bridge + 0975 Optane NVME SSD H10 with Solid State Storage [Teton Glacier] 0998 Ice Lake IEH 09a2 Ice Lake Memory Map/VT-d 09a3 Ice Lake RAS @@ -27200,6 +27387,7 @@ 09a6 Ice Lake MSM 09a7 Ice Lake PMON MSM 09ab RST VMD Managed Controller + 09ad Optane NVME SSD H20 with Solid State Storage [Pyramid Glacier] 09c4 PAC with Intel Arria 10 GX FPGA 0a03 Haswell-ULT Thermal Subsystem 0a04 Haswell-ULT DRAM Controller @@ -28923,6 +29111,7 @@ 15fb Ethernet Connection (13) I219-LM 15fc Ethernet Connection (13) I219-V 15ff Ethernet Controller X710 for 10GBASE-T + 1014 0000 PCIe3 4-port 10GbE Base-T Adapter 1137 0000 X710TLG GbE RJ45 PCIe NIC 1137 02c1 X710T2LG 2x10 GbE RJ45 PCIe NIC 1137 02c2 X710T4LG 4x10 GbE RJ45 PCIe NIC @@ -30436,6 +30625,7 @@ 2522 NVMe Optane Memory Series 8086 3806 Optane Memory 16GB 8086 3810 Optane Memory M10 16GB + 2525 Optane NVME SSD P1600X Series 2526 Wireless-AC 9260 2530 82850 850 (Tehama) Chipset Host Bridge (MCH) 1028 00c7 Dimension 8100 @@ -32555,9 +32745,17 @@ 34aa Ice Lake-LP Serial IO SPI Controller #0 34ab Ice Lake-LP Serial IO SPI Controller #1 34b0 Ice Lake-LP PCI Express Root Port #9 + 34b1 Ice Lake-LP PCIe Port #10 + 34b4 Ice Lake-LP PCIe Port #13 + 34b5 Ice Lake-LP PCIe Port #14 34b7 Ice Lake-LP PCI Express Root Port #16 + 34b8 Ice Lake-LP PCIe Port #1 34ba Ice Lake-LP PCI Express Root Port #3 + 34bb Ice Lake-LP PCIe Port #4 34bc Ice Lake-LP PCI Express Root Port #5 + 34bd Ice Lake-LP PCIe Port #6 + 34be Ice Lake-LP PCIe Port #7 + 34bf Ice Lake-LP PCIe Port #8 34c4 Ice Lake-LP SD Host Controller 34c5 Ice Lake-LP Serial IO I2c Controller #4 34c6 Ice Lake-LP Serial IO I2c Controller #5 @@ -33348,13 +33546,29 @@ 8086 1216 WiMAX/WiFi Link 5150 ABG 8086 1311 WiMAX/WiFi Link 5150 AGN 8086 1316 WiMAX/WiFi Link 5150 ABG - 4389 WM590 Chipset LPC Controller - 438b Tiger Lake-H LPC/eSPI Controller + 4384 Q570 LPC/eSPI Controller + 4385 Z590 LPC/eSPI Controller + 4386 H570 LPC/eSPI Controller + 4387 B560 LPC/eSPI Controller + 4388 H510 LPC/eSPI Controller + 4389 WM590 LPC/eSPI Controller + 438a QM580 LPC/eSPI Controller + 438b HM570 LPC/eSPI Controller + 438c C252 LPC/eSPI Controller + 438d C256 LPC/eSPI Controller + 438e H310D LPC/eSPI Controller + 438f W580 LPC/eSPI Controller + 4390 RM590E LPC/eSPI Controller + 4391 R580E LPC/eSPI Controller 43a3 Tiger Lake-H SMBus Controller 43a4 Tiger Lake-H SPI Controller 43b0 Tiger Lake-H PCI Express Root Port #9 + 43b8 Tiger Lake-H PCIe Root Port #1 43ba Tiger Lake-H PCIe Root Port #3 + 43bb Tiger Lake-H PCIe Root Port #4 43bc Tiger Lake-H PCI Express Root Port #5 + 43c0 Tiger Lake-H PCIe Root Port #17 + 43c7 Tiger Lake-H PCIe Root Port #24 43c8 Tiger Lake-H HD Audio Controller 43d3 Tiger Lake SATA AHCI Controller 43e0 Tiger Lake-H Management Engine Interface @@ -33436,6 +33650,9 @@ 193d 4000 UN-GPU-XG310-32GB-FHFL 4908 DG1 [Iris Xe Graphics] 4909 DG1 [Iris Xe MAX 100] + 4940 4xxx Series QAT + 4942 4xxx Series QAT + 4944 4xxx Series QAT 4b00 Elkhart Lake eSPI Controller 4b23 Elkhart Lake SMBus Controller 4b24 Elkhart Lake SPI (Flash) Controller @@ -33524,6 +33741,7 @@ 5182 Alder Lake PCH eSPI Controller 1028 0b10 Precision 3571 5187 Alder Lake LPC Controller + 519d Raptor Lake LPC/eSPI Controller 51a3 Alder Lake PCH-P SMBus Host Controller 1028 0b10 Precision 3571 51a4 Alder Lake-P PCH SPI Controller @@ -33538,6 +33756,7 @@ 51c6 Alder Lake-P Serial IO I2C Controller #1 51c8 Alder Lake PCH-P High Definition Audio Controller 1028 0b10 Precision 3571 + 51ca Raptor Lake-P/U/H cAVS 51cc Alder Lake Smart Sound Technology Audio Controller *** 178 LINES SKIPPED *** From nobody Mon Dec 4 10:24:32 2023 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 4SkKXc6NfYz53C0f; Mon, 4 Dec 2023 10:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKXc62xkz4MtF; Mon, 4 Dec 2023 10:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0svjSq9/o0d2VjwxVYKbtig1vLYTyLLZnbggAKdljJE=; b=eLlfXrzlbWdQLvFuD17TLqU2IuaY4mpQ6364MI2wAlseHjxdIrodSCOdww4H/15G5iUUFA ZmhUjIh5StDPbpWdPxRwpI719lRpwhtGDxWnAAqLjy3ecFL1f/GBgoNcchH5Hr1oqDH2Nl ViVoyWJanVr6+de65fQH5M8ZQLKzpp9+OFsVRslaEmY6hNBiruriaouHoryNbNV/mCZCL2 b53BSQy0nuLmV9sV9DaHWJvnzRLTRI93GaJf3UWQ6S7Ept/mMmBB7flj3AemQLm4Qk5Dx4 hG/v5Yeobha3qMIqK/sD8CycS0xGO44sxx+/m2tkalO3n9rgVq2EQcXwAoqJZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0svjSq9/o0d2VjwxVYKbtig1vLYTyLLZnbggAKdljJE=; b=DHeqtAF0MXvUziiUkvSZ4F3PEH4PVx9nQFha9+tK50fyKquDylC9mjFIhHE8MvO6W/sjvh KyOVNwgmLuv/6xKRy1F6ieoBPDFkDa17kD3qVkdBkqLDy9BmSnWB/NpXZjtvgiPCs9jZxU zKFxYsjuRfyExgX8Rd1TwrBCDKosdHdB3J4Y4k7+JKwe89BqiFUTyGAjBBT1GnwT/2zqjJ p42SffAYYzZsY1VIBpwmKFJUgKlho9DsPYu/kfwshWA3o9LJVjsoMJ80XkPpdqzexD+s3o p/xA5WsjLp336gMwQv2wmKvzf6pOcJmOBvCDo+fxiuVegSnhHCCWZJcXGsBWQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701685472; a=rsa-sha256; cv=none; b=Ggnu3ULyc2N7u19Yb44+JJg3wsYECugQMMerODnWSZoMqpQ5CAJU6EkPl8Yui5G/vpfOLa uvh32oiRmb6K0WdvUrPDdYNIn6ky9kn/GZggybY5VTxZHSBZtGi5niKOtOsXik7euRo5e7 cpf4t+EZTQnd6v0GNdbRoPEFs+bPvlkuouzfgUILmyoeJkShUun0mGQhsd2C8srhroPPft IkFhhjpH3WorR3DtztbIfJx7oV0XOrQS5UWTekDEh9MaUIqcGV8Oi/IIF1Zfq+exdPDjli SdWnRmj9R3lRPnzmF1vSs7G/2RtVzLK+Jkn3yUr9tYInsWj9GDU3DQWbL+iyXw== 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 4SkKXc4SbFz7V2; Mon, 4 Dec 2023 10:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AOWHo092626; Mon, 4 Dec 2023 10:24:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AOW9a092623; Mon, 4 Dec 2023 10:24:32 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:24:32 GMT Message-Id: <202312041024.3B4AOW9a092623@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 728de4f0c8e2 - stable/14 - pci_vendors: update to 2023-09-22 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 728de4f0c8e20a7cf657c528616894f2d9689c1c Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=728de4f0c8e20a7cf657c528616894f2d9689c1c commit 728de4f0c8e20a7cf657c528616894f2d9689c1c Author: Baptiste Daroussin AuthorDate: 2023-11-03 16:32:35 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:24:07 +0000 pci_vendors: update to 2023-09-22 (cherry picked from commit dbffadd8c28e3ab7dc8b5d38e3c5d7f96a5ad62d) --- share/misc/pci_vendors | 390 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 318 insertions(+), 72 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index d3988731c30a..50115d979327 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.08.12 -# Date: 2023-08-12 03:15:02 +# Version: 2023.09.22 +# Date: 2023-09-22 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -773,7 +773,6 @@ 1028 2142 HBA465e Adapter 1028 2209 HBA465i Adapter 1028 220a HBA465i Front - 1028 228a HBA465e-s Adapter 15d9 1d03 AOC-S4116L-H16IR (16DD/96DD) RAID Adapter 15d9 1d07 AOC-S4016L-L16IT Storage Adapter 15d9 1d08 AOC-S4016L-L16IR Storage Adapter @@ -803,6 +802,20 @@ 1d49 0204 ThinkSystem 430-8i SAS/SATA 12Gb Dense HBA 00b2 PCIe Switch management endpoint 1d49 0003 ThinkSystem 1611-8P PCIe Gen4 NVMe Switch Adapter +# 24G SAS/PCIe storage adapter chip + 00b3 Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx +# 9760W 32 internal port RAID controller + 1000 5000 MegaRAID 9760W-32i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal port RAID controller + 1000 5001 MegaRAID 9760W-16i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal and 16 external port RAID controller + 1000 5010 MegaRAID 9760W-16i16e 24G SAS/PCIe Storage Adapter +# 9700W 32 internal port Storage controller + 1000 5020 eHBA 9700W-32i 24G SAS/PCIe Storage Adapter +# 9700W 16 internal port Storage controller + 1000 5021 eHBA 9700W-16i 24G SAS/PCIe Storage Adapter +# 9700 16 external port Storage controller + 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00bf SAS3404 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) 00c0 SAS3324 PCI-Express Fusion-MPT SAS-3 @@ -1039,8 +1052,9 @@ 15d9 1c6e AOC-SLG4-2H8M2 Storage Adapter 1d49 0505 ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter 1d49 0506 ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter - 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay Non-Hot-Swap RAID Enablement Kit - 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay Rear Hot-Swap RAID Enablement Kit + 1d49 0700 ThinkSystem M.2 RAID B540i-2i SATA/NVMe Enablement Kit + 1d49 0701 ThinkSystem 7mm RAID B540p-2HS SATA/NVMe Enablement Kit + 1d49 0702 ThinkSystem M.2 RAID B540p-2HS SATA/NVMe Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1152,6 +1166,7 @@ 13e9 Ariel/Navi10Lite 13f9 Oberon/Navi12Lite 13fe Cyan Skillfish [BC-250] + 145a Dummy Function (absent graphics controller) 1478 Navi 10 XL Upstream Port of PCI Express Switch 1479 Navi 10 XL Downstream Port of PCI Express Switch 1506 Mendocino @@ -3932,6 +3947,7 @@ 1462 5022 RX 6600 MECH 2X 148c 2412 PowerColor Red Devil RX 6600 XT 1849 5218 Radeon RX 6600 Challenger ITX 8GB + 1da2 448e Radeon RX 6600 XT Pulse 7408 Aldebaran/MI200 [Instinct MI250X] 740c Aldebaran/MI200 [Instinct MI250X/MI250] 740f Aldebaran/MI200 [Instinct MI210] @@ -3948,6 +3964,7 @@ 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] 745e Navi 31 [Radeon Pro W7800] + 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] 7480 Navi 33 [Radeon RX 7700S/7600/7600S/7600M XT/PRO W7600] 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] @@ -4981,6 +4998,8 @@ 1455 Zeppelin/Renoir PCIe Dummy Function 1456 Family 17h (Models 00h-0fh) Platform Security Processor (PSP) 3.0 Device 1457 Family 17h (Models 00h-0fh) HD Audio Controller + 1458 XGMAC 10GbE Controller + 1459 XGMAC 10GbE Controller 145a Zeppelin/Raven/Raven2 PCIe Dummy Function 145b Zeppelin Non-Transparent Bridge 145c Family 17h (Models 00h-0fh) USB 3.0 Host Controller @@ -5037,6 +5056,7 @@ 14b5 Family 17h-19h PCIe Root Complex 14b6 Family 17h-19h IOMMU 14b7 Family 17h-19h PCIe Dummy Host Bridge + 14b8 Family 17h-19h PCIe GPP Bridge 14b9 Family 17h-19h Internal PCIe GPP Bridge 14ba Family 17h-19h PCIe GPP Bridge # Server device @@ -5044,6 +5064,7 @@ 14cd Family 19h USB4/Thunderbolt PCIe tunnel 14de Phoenix PCIe Dummy Function 14ef Family 19h USB4/Thunderbolt PCIe tunnel + 1502 AMD IPU Device 1510 Family 14h Processor Root Complex 174b 1001 PURE Fusion Mini 1512 Family 14h Processor Root Port @@ -12492,7 +12513,7 @@ 1c2d GP106M 1c30 GP106GL [Quadro P2000] 1c31 GP106GL [Quadro P2200] - 1c35 GP106M [Quadro P2000 Mobile] + 1c35 GP106M [Quadro P2000 Mobile / DRIVE PX 2 AutoChauffeur] 1c36 GP106 [P106M] 1c60 GP106BM [GeForce GTX 1060 Mobile 6GB] 103c 8390 GeForce GTX 1060 Max-Q 6GB @@ -12548,6 +12569,8 @@ 1d52 GP108BM [GeForce MX250] 1d56 GP108BM [GeForce MX330] 1d81 GV100 [TITAN V] + 1d83 GV100 [CMP 100-200] + 1d84 GV100 [CMP 100-210] 1db1 GV100GL [Tesla V100 SXM2 16GB] 1db2 GV100GL [Tesla V100 DGXS 16GB] 1db3 GV100GL [Tesla V100 FHHL 16GB] @@ -12560,6 +12583,7 @@ 1dba GV100GL [Quadro GV100] 10de 12eb TITAN V CEO Edition 1dbe GV100 Engineering Sample + 1dc1 GV100 [CMP 100-200] 1df0 GV100GL [Tesla PG500-216] 1df2 GV100GL [Tesla PG503-216] 1df5 GV100GL [Tesla V100 SXM2 16GB] @@ -12649,7 +12673,7 @@ 1f96 TU117M [GeForce GTX 1650 Mobile / Max-Q] 1f97 TU117M [GeForce MX450] 1f98 TU117M [GeForce MX450] - 1f99 TU117M + 1f99 TU117M [GeForce GTX 1650 Mobile / Max-Q] 1f9c TU117M [GeForce MX450] 1f9d TU117M [GeForce GTX 1650 Mobile / Max-Q] # via Lenovo 496.90 @@ -12688,9 +12712,10 @@ 20b8 GA100 [A100X] 20b9 GA100 [A30X] 20bb GA100 [DRIVE A100 PROD] + 20bd GA100 [A800 SXM4 40GB] 20be GA100 [GRID A100A] 20bf GA100 [GRID A100B] - 20c0 GA100 + 20c0 GA100 [Initial DevID] 20c2 GA100 [CMP 170HX] 20f0 GA100 [A100-PG506-207] 20f1 GA100 [A100 PCIe 40GB] @@ -12699,7 +12724,7 @@ 20f5 GA100 [A800 80GB PCIe] 20f6 GA100 [A800 40GB PCIe] 20fd GA100 [AX800 Converged Accelerator] - 20fe GA100 + 20fe GA100 [INT SKU] 20ff GA100 2182 TU116 [GeForce GTX 1660 Ti] 2183 TU116 @@ -12742,6 +12767,7 @@ 228b GA104 High Definition Audio Controller 228e GA106 High Definition Audio Controller 2296 Tegra PCIe Endpoint Virtual Network + 22a3 GH100 [H100 NVSwitch] 22ba AD102 High Definition Audio Controller 2302 GH100 2313 GH100 [H100 CNX] @@ -12859,6 +12885,7 @@ 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] 2757 GN21-X11 + 2770 AD103GLM [RTX 5000 Ada Generation Embedded GPU] 2782 AD104 [GeForce RTX 4070 Ti] 2785 AD104 [AC AD104 20GB] 2786 AD104 [GeForce RTX 4070] @@ -12870,17 +12897,21 @@ 27ba AD104GLM [RTX 4000 Ada Generation Laptop GPU] 27bb AD104GLM [RTX 3500 Ada Generation Laptop GPU] 27e0 AD104M [GeForce RTX 4080 Max-Q / Mobile] + 27fa AD104GLM [RTX 4000 Ada Generation Embedded GPU] + 27fb AD104GLM [RTX 3500 Ada Generation Embedded GPU] 2803 AD106 [GeForce RTX 4060 Ti] 2805 AD106 [GeForce RTX 4060 Ti 16GB] 2820 AD106M [GeForce RTX 4070 Max-Q / Mobile] 2838 AD106GLM [RTX 3000 Ada Generation Laptop GPU] 2860 AD106M [GeForce RTX 4070 Max-Q / Mobile] + 2878 AD106GLM [RTX 3000 Ada Generation Embedded GPU] 2882 AD107 [GeForce RTX 4060] 28a0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28a1 AD107M [GeForce RTX 4050 Max-Q / Mobile] 28b8 AD107GLM [RTX 2000 Ada Generation Laptop GPU] 28e0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28e1 AD107M [GeForce RTX 4050 Max-Q / Mobile] + 28f8 AD107GLM [RTX 2000 Ada Generation Embedded GPU] 10df Emulex Corporation 0720 OneConnect NIC (Skyhawk) 103c 1934 FlexFabric 20Gb 2-port 650M Adapter @@ -13126,7 +13157,7 @@ 5289 RTL8411 PCI Express Card Reader 1043 1457 K55A Laptop 5760 RTS5763DL x2 NVMe SSD Controller - 5762 RTS5763DL NVMe SSD Controller + 5762 RTS5762 NVMe SSD Controller 5763 RTS5763DL NVMe SSD Controller (DRAM-less) 5765 RTS5765DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) @@ -14093,6 +14124,7 @@ 5409 VX855/VX875 APIC and Central Traffic Control 5410 VX900 Series APIC and Central Traffic Control 6100 VT85C100A [Rhine II] + 6122 VN1000 Graphics [Chrome 520 IGP] 6287 SATA RAID Controller 6290 K8M890CE Host Bridge 6327 P4M890 Security Device @@ -17094,7 +17126,7 @@ 12a2 Newgen Systems Corporation 12a3 Lucent Technologies 8105 T8105 H100 Digital Switch -12a4 NTT Electronics Corporation +12a4 NTT Innovative Devices Corporation 12a5 Vision Dynamics Ltd. 12a6 Scalable Networks, Inc. 12a7 AMO GmbH @@ -19948,6 +19980,8 @@ 103c 3383 Ethernet 1Gb 4-port 331T Adapter 14e4 1904 4-port 1Gb Ethernet Adapter 14e4 1909 Broadcom NetXtreme 5719 Quad Port Gigabit NIC + 14e4 d146 BCM95719-P41 4x1GBT Ethernet NIC + 14e4 d346 BCM95719-N41 4x1GBT Ethernet NIC 193d 1025 NIC-ETH330T-LP-4P 1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express 1014 02c6 eServer xSeries server mainboard @@ -20251,6 +20285,8 @@ 117c 00ce FastFrame N4T2 Dual-port 10GBASE-T Ethernet Adapter 14e4 4163 NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 2.0 Adapter (BCM957416M4163C) 14e4 4166 NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 3.0 Adapter (BCM957416N4160C) + 14e4 d140 BCM957416-P410 4x10GBT Ethernet NIC + 14e4 d340 BCM957416-N410 4x10GBT Ethernet NIC 1590 020c Ethernet 10Gb 2-port 535T Adapter 1590 0212 Ethernet 10Gb 2-port 535FLR-T Adapter 16d9 BCM57417 NetXtreme-E 10GBASE-T RDMA Ethernet Controller @@ -20303,15 +20339,19 @@ 117c 00cf FastFrame N412 Dual-port 100Gb Ethernet Adapter 14e4 2100 NetXtreme-E Dual-port 100G QSFP56 Ethernet PCIe4.0 x16 Adapter (BCM957508-P2100G) 14e4 5208 NetXtreme-E Dual-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957508-N2100G) + 14e4 520a NetXtreme-E Dual-port 100G DSFP Ethernet OCP 3.0 Adapter (BCM957508-N2100GD) 14e4 d124 NetXtreme-E P2100D BCM57508 2x100G QSFP PCIE + 14e4 d324 NetXtreme-E N2100D BCM57508 2x100G QSFP OCP3.0 Ethernet 14e4 df24 NetXtreme-E NGM2100D BCM57508 2x100G KR Mezz Ethernet 1751 BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet 1028 09d4 PowerEdge XR11/XR12 LOM 1028 0b1b PowerEdge XR5610 LOM + 14e4 4250 NetXtreme-E Quad-port 25G SFP28 Ethernet PCIe4.0 x16 Adapter (BCM957504-P425G) 14e4 5045 NetXtreme-E BCM57504 4x25G OCP3.0 14e4 5100 NetXtreme-E Single-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957504-N1100G) 14e4 5105 NetXtreme-E Single-port 100G DSFP Ethernet OCP 3.0 Adapter (BCM957504-N1100GD) 14e4 5250 NetXtreme-E BCM57504 4x25G KR Mezz + 14e4 5425 NetXtreme-E Quad-port 25G SFP28 Ethernet OCP 3.0 Adapter (BCM957504-N425G) 14e4 d142 NetXtreme-E P425D BCM57504 4x25G SFP28 PCIE 1752 BCM57502 NetXtreme-E 10Gb/25Gb/40Gb/50Gb Ethernet 1800 BCM57502 NetXtreme-E Ethernet Partition @@ -21447,8 +21487,11 @@ 193d 1051 NIC-IB1040i-Mb-2P 1018 MT27800 Family [ConnectX-5 Virtual Function] 1019 MT28800 Family [ConnectX-5 Ex] + 1014 0617 PCIe4 x16 2-Port EDR IB-only ConnectX-5 CAPI Capable Adapter [IBM EC64] + 1014 0635 PCIe4 2-port 100 GbE RoCE x16 adapter [IBM EC66] 15b3 0008 ConnectX-5 Ex EN network interface card, 100GbE dual-port QSFP28, PCIe4.0 x16, tall bracket; MCX516A-CDAT 15b3 0125 Tencent ConnectX-5 EN Ex network interface card for OCP 3.0, with host management, 50GbE Dual-port QSFP28, PCIe4.0 x16, Thumbscrew (pull-tab) bracket + 15b3 0126 PCIe4 x16 2-port EDR 100GbE ConnectX-5 CAPI Capable adapter [IBM AJP1] 101a MT28800 Family [ConnectX-5 Ex Virtual Function] 101b MT28908 Family [ConnectX-6] 101c MT28908 Family [ConnectX-6 Virtual Function] @@ -21583,14 +21626,14 @@ 15b7 Sandisk Corp 2001 Skyhawk Series NVME SSD 5001 WD Black NVMe SSD - 5002 WD Black 2018/SN750 / PC SN720 NVMe SSD + 5002 SanDisk Extreme Pro / WD Black 2018/SN750/PC SN720 NVMe SSD 5003 WD Blue SN500 / PC SN520 NVMe SSD 5004 PC SN520 NVMe SSD 5005 PC SN520 NVMe SSD - 5006 WD Black SN750 / PC SN730 NVMe SSD + 5006 WD Black SN750 / PC SN730 / Red SN700 NVMe SSD 5007 IX SN530 NVMe SSD (DRAM-less) 5008 PC SN530 NVMe SSD (DRAM-less) - 5009 WD Blue SN550 NVMe SSD + 5009 SanDisk Ultra 3D / WD Blue SN550 NVMe SSD 15b7 5009 WD Blue SN550 NVMe SSD 500b PC SN530 NVMe SSD 1414 500b Xbox Series X @@ -21601,13 +21644,14 @@ 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD 5019 WD Green SN350 NVMe SSD 240GB (DRAM-less) - 501a WD Blue SN570 NVMe SSD 1TB + 501a WD Blue SN570 NVMe SSD 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) 501e PC SN735 NVMe SSD (DRAM-less) 501f WD PC SN735 NVMe SSD 512GB (DRAM-less) 5025 WD Blue SN570 NVMe SSD 2TB 5026 WD PC SN735 NVMe SSD 1TB (DRAM-less) - 5030 Western Digital WD Black SN850X NVMe SSD + 5030 WD Black SN850X NVMe SSD + 5041 WD Blue SN580 NVMe SSD (DRAM-less) 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) 1003 APCI1032 SP controller (32 digi inputs w/ opto coupler) @@ -22781,7 +22825,8 @@ 188a ARC-1886 series PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller 17d3 1217 ARC-1217 4-Port PCIe 4.0 to SAS/SATA 12/6Gb RAID Controller 17d3 1227 ARC-1227 8-Port PCIe 4.0 to SAS/SATA 12/6Gb RAID Controller - 17d3 1686 ARC-1686 PCIe 4.0 to SAS/SATA 12/6Gb Tape drive Controller + 17d3 1686 ARC-1686 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller + 17d3 1688 ARC-1688 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller 17d3 1886 ARC-1886 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller # nee Neterion Inc., previously S2io Inc. 17d5 Exar Corp. @@ -23865,6 +23910,14 @@ 1a0d SEAKR Engineering 1a0e DekTec Digital Video B.V. 083f DTA-2111 VHF/UHF Modulator + 0860 DTA-2144(B) Quad ASI/SDI in+out + 0861 DTA-2145 ASI/SDI in+out with bypass relay + 087c DTA-2172 Dual 3G-SDI/ASI ports + 087e DTA-2174 Quad 3G-SDI/ASI in+out + 087f DTA-2175 3G-SDI/ASI input+output with bypass relay + 0882 DTA-2178 Octal 12G-SDI/ASI ports with genlock + a882 DTA-2178-ASI Octal ASI Ports + b87e DTA-2174B Quad 3G-SDI/ASI ports (1x12G) with genlock 1a17 Force10 Networks, Inc. 8002 PB-10GE-2P 10GbE Security Card 1a1d GFaI e.V. @@ -23974,6 +24027,8 @@ 0017 SEL-3350 GPIO Expansion Board 0018 SEL-3390E4 Ethernet Adapter 001c SEL-3390E4 Ethernet Adapter +1aab Silver Creations AG + 7750 Sceye 10L 1aae Global Velocity, Inc. 1ab4 Distributed Management Task Force, Inc. (DMTF) 1ab6 CalDigit, Inc. @@ -24158,6 +24213,7 @@ 2142 ASM2142/ASM3142 USB 3.1 Host Controller 1462 7a72 H270 PC MATE 2824 ASM2824 PCIe Gen3 Packet Switch + 3042 ASM3042 USB 3.2 Gen 1 xHCI Controller 3242 ASM3242 USB 3.2 Host Controller 1b26 Netcope Technologies, a.s. c132 COMBO-LXT155 @@ -24237,6 +24293,9 @@ 1b4b 2241 Santa Cruz NVMe Host Adapter 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit + 2b43 NXP 88W9098 Wi-Fi 6 (ax) MAC #1 + 2b44 NXP 88W9098 Wi-Fi 6 (ax) MAC #2 + 2b45 NXP 88W9098 Bluetooth 5.3 9120 88SE9120 SATA 6Gb/s Controller 9123 88SE9123 PCIe SATA 6.0 Gb/s controller dc93 600e DC-6xxe series SATA 6G controller @@ -24321,6 +24380,7 @@ 2404 Ultrastar DC SN640 NVMe SSD 2500 Ultrastar DC SN840 NVMe SSD 2600 Ultrastar DC ZN540 ZNS NVMe SSD + 3001 RapidFlex C2000 NVMe Initiator 3714 PC SN730 NVMe SSD 3734 PC SN730 NVMe SSD 1b9a XAVi Technologies Corp. @@ -24438,7 +24498,7 @@ 1bb1 01a1 Nytro XP7102 5012 FireCuda/IronWolf 510 SSD 5013 BarraCuda Q5 NVMe SSD (DRAM-less) - 5016 FireCuda 520 SSD + 5016 FireCuda 520/IronWolf 525 SSD 5018 FireCuda 530 SSD 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder @@ -24505,6 +24565,7 @@ 1bf4 VTI Instruments Corporation 0001 SentinelEX 7011 RX0xxx +1bf5 Greenliant 1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. @@ -24703,6 +24764,12 @@ 1c5f 4b51 NVMe SSD PBlaze6 6936 12800GB 2.5" U.3 1c5f 4b61 NVMe SSD PBlaze6 6936 25600GB 2.5" U.3 003f PBlaze7 7940/7946 NVMe SSD + 1c5f 1431 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 1441 NVMe SSD PBlaze7 7940 7680G 2.5" U.2 + 1c5f 1451 NVMe SSD PBlaze7 7940 15360G 2.5" U.2 + 1c5f 5431 NVMe SSD PBlaze7 7946 3200G 2.5" U.2 + 1c5f 5441 NVMe SSD PBlaze7 7946 6400G 2.5" U.2 + 1c5f 5451 NVMe SSD PBlaze7 7946 12800G 2.5" U.2 0540 PBlaze4 NVMe SSD 0550 PBlaze5 700/900 0555 PBlaze5 510/516 @@ -24853,47 +24920,55 @@ 0714 ZX-100/ZX-200 PCI Express Root Port 0715 ZX-100/ZX-200 PCI Express Root Port 0716 ZX-D PCI Express Root Port - 0717 KX-5000/KX-6000/KX-6000G Express Root Port - 0718 KX-5000/KX-6000/KX-6000G Express Root Port - 0719 KX-5000/KX-6000/KX-6000G Express Root Port - 071a KX-5000/KX-6000/KX-6000G Express Root Port - 071b KX-5000/KX-6000/KX-6000G Express Root Port - 071c KX-5000/KX-6000/KX-6000G Express Root Port - 071d KX-5000/KX-6000/KX-6000G Express Root Port - 071e KX-5000/KX-6000/KX-6000G Express Root Port + 0717 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 0718 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 0719 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071a KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071b KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071c KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071d KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071e KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port 071f ZX-200 Upstream Port of PCI Express Switch 0720 ZX-200 PCIE RC6 controller 0721 ZX-200 Downstream Port of PCI Express Switch 0722 ZX-200 PCIE P2C bridge + 0731 KH-40000 Express Root Port + 0732 KH-40000 Express Root Port 1000 ZX-D Standard Host Bridge - 1001 ZX-D/ZX-E Miscellaneous Bus + 1001 ZX-D/ZX-E/KH-40000 Miscellaneous Bus 1003 ZX-E Standard Host Bridge + 1005 KH-40000 Standard Host Bridge 1006 KX-6000G Standard Host Bridge 3001 ZX-100 Standard Host Bridge 300a ZX-100 Miscellaneous Bus - 3038 ZX-100/ZX-200/KX-6000/KX-6000G Standard Universal PCI to USB Host Controller - 3104 ZX-100/ZX-200/KX-6000/KX-6000G Standard Enhanced PCI to USB Host Controller - 31b0 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge - 31b1 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge - 31b2 ZX-100/KX-5000/KX-6000/KX-6000G DRAM Controller - 31b3 ZX-100/KX-5000/KX-6000/KX-6000G Power Management Controller - 31b4 ZX-100/KX-5000/KX-6000/KX-6000G I/O APIC - 31b5 ZX-100/KX-5000/KX-6000/KX-6000G Scratch Device - 31b7 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge + 3038 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Universal PCI to USB Host Controller + 3104 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Enhanced PCI to USB Host Controller + 31b0 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge + 31b1 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge + 31b2 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 DRAM Controller + 31b3 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Power Management Controller + 31b4 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 I/O APIC + 31b5 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Scratch Device + 31b7 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge 31b8 ZX-100/ZX-D PCI to PCI Bridge - 3288 ZX-100/KX-5000/KX-6000/KX-6000G High Definition Audio Controller - 345b ZX-100/KX-5000/KX-6000/KX-6000G Miscellaneous Bus + 3288 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 High Definition Audio Controller + 345b ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Miscellaneous Bus 3a02 ZX-100 C-320 GPU 3a03 ZX-D C-860 GPU 3a04 ZX-E C-960 GPU + 3b01 KH-40000 OPI Controller + 3b02 KH-40000 OPI Controller + 3b03 KH-40000 OPI Controller + 3b04 KH-40000 OPI Controller + 3c00 KH-40000 DRAM Controller 3c02 KX-6000G DRAM Controller 3d01 KX-6000G C-1080 GPU - 9002 ZX-100/ZX-200 EIDE Controller + 9002 ZX-100/ZX-200/KH-40000 EIDE Controller 9003 ZX-100/KX-6000/KX-6000G EIDE Controller - 9043 KX-6000G RAID Controller + 9043 KX-6000G/KH-40000 RAID Controller 9045 ZX-100/ZX-D/ZX-E RAID Accelerator 0 9046 ZX-D/ZX-E RAID Accelerator 1 - 9083 ZX-100/ZX-200/KX-6000/KX-6000G StorX AHCI Controller + 9083 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 StorX AHCI Controller 9084 ZX-100 StorX AHCI Controller 9100 ZX-200 Cross bus 9101 ZX-200 Traffic Controller @@ -24902,11 +24977,14 @@ 9144 ZX-E High Definition Audio Controller 9145 KX-6000G High Definition Audio Controller 9180 ZX-200 Networking Gigabit Ethernet Adapter + 91c1 KH-40000 ZPI Controller + 91c2 KH-40000 ZPI Controller 9202 ZX-100 USB eXtensible Host Controller 9203 ZX-200 USB eXtensible Host Controller 9204 KX-6000/KX-6000G USB eXtensible Host Controller + 9205 KH-40000 USB eXtensible Host Controller 9286 ZX-D eMMC Host Controller - 9300 ZX-100/KX-5000/KX-6000/KX-6000G eSPI Host Controller + 9300 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 eSPI Host Controller 95d0 ZX-100 Universal SD Host Controller f410 ZX-100/KX-5000/KX-6000/KX-6000G PCI Com Port 1d18 RME @@ -24944,6 +25022,7 @@ 1d44 DPT a400 PM2x24/PM3224 1d49 Lenovo + 0522 ThinkSystem RAID 5350-8i PCIe 12Gb Internal Adapter 1d4c Diamanti, Inc. 1d5c Fantasia Trading LLC 1d61 Technobox, Inc. @@ -25075,8 +25154,9 @@ 1d78 7208 Aliflash V2 U.2 15mm 7.68TB NVMe SSD 1d79 Transcend Information, Inc. 2262 NVMe PCIe SSD 220S - 2263 NVMe PCIe SSD 120S/112S (DRAM-less) + 2263 NVMe PCIe SSD 110S/112S/120S/MTE652T2 (DRAM-less) 2264 NVMe PCIe SSD 250H + 2267 NVMe PCIe SSD 240S/MTE710T 5766 NVMe PCIe SSD 110Q (DRAM-less) 1d7c Aerotech, Inc. # Fiber-optic HyperWire motion control bus from Aerotech. @@ -25207,10 +25287,17 @@ 0010 N-10m2 NVMe SSD 1dd8 AMD Pensando Systems 0002 DSC2 Elba Upstream Port + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1000 DSC Capri Upstream Port 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB @@ -25223,6 +25310,7 @@ 1dd8 400e DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1001 DSC Virtual Downstream Port + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25235,9 +25323,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1002 DSC Ethernet Controller + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25250,9 +25345,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1003 DSC Ethernet Controller VF + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25265,9 +25367,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1004 DSC Management Controller + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25280,19 +25389,40 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1005 DSC NVMe Controller + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1006 DSC NVMe Controller VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1007 DSC Storage Accelerator + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25305,33 +25435,74 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1009 DSC Ethernet Controller UPT + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100a DSC Serial Port Controller + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100b DSC vDPA Network Device VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100c DSC PDS Core Management + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100d DSC Virtio Network Device VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1ddd Thorlabs 1de0 Groq 0000 TSP [GroqChip] @@ -25495,26 +25666,6 @@ 1028 2193 NVMe CD7 E3.S 1.92TB 1028 2194 NVMe CD7 E3.S 3.84TB 1028 2195 NVMe CD7 E3.S 7.68TB - 0013 NVMe SSD Controller CM7 2.5" - 1028 222d Ent NVMe CM7 FIPS U.2 RI 30.72TB - 1028 222e Ent NVMe CM7 FIPS U.2 RI 15.36TB - 1028 222f Ent NVMe CM7 FIPS U.2 RI 7.68TB - 1028 2230 Ent NVMe CM7 FIPS U.2 RI 3.84TB - 1028 2231 Ent NVMe CM7 FIPS U.2 RI 1.92TB - 1028 2232 Ent NVMe CM7 U.2 RI 30.72TB - 1028 2233 Ent NVMe CM7 U.2 RI 15.36TB - 1028 2234 Ent NVMe CM7 U.2 RI 7.68TB - 1028 2235 Ent NVMe CM7 U.2 RI 3.84TB - 1028 2236 Ent NVMe CM7 U.2 RI 1.92TB - 1028 2237 Ent NVMe CM7 FIPS U.2 MU 12.8TB - 1028 2238 Ent NVMe CM7 FIPS U.2 MU 6.4TB - 1028 2239 Ent NVMe CM7 FIPS U.2 MU 3.2TB - 1028 223a Ent NVMe CM7 FIPS U.2 MU 1.6TB - 1028 223b Ent NVMe CM7 U.2 MU 12.8TB - 1028 223c Ent NVMe CM7 U.2 MU 6.4TB - 1028 223d Ent NVMe CM7 U.2 MU 3.2TB - 1028 223e Ent NVMe CM7 U.2 MU 1.6TB - 1028 228c Ent NVMe CM7 U.2 MU 6.4TB 0014 NVMe SSD Controller CM7 EDSFF 1028 223f Ent NVMe CM7 FIPS E3.S RI 15.36TB 1028 2240 Ent NVMe CM7 FIPS E3.S RI 7.68TB @@ -25527,6 +25678,10 @@ 1028 2247 Ent NVMe CM7 E3.S MU 6.4TB 1028 2248 Ent NVMe CM7 E3.S MU 3.2TB 1028 2249 Ent NVMe CM7 E3.S MU 1.6TB + 1028 22b7 Ent NVMe CM7 FIPS E3.S MU 1.6TB + 1028 22b8 Ent NVMe CM7 FIPS E3.S MU 3.2TB + 1028 22b9 Ent NVMe CM7 FIPS E3.S MU 6.4TB + 1028 22ba Ent NVMe CM7 FIPS E3.S MU 12.8TB 0018 Exceria Pro NVMe SSD 001f NVMe SSD Controller CD8 1028 2223 DC NVMe CD8 U.2 SED 15.36TB @@ -25539,6 +25694,25 @@ 1028 222a DC NVMe CD8 U.2 3.84TB 1028 222b DC NVMe CD8 U.2 1.92TB 1028 222c DC NVMe CD8 U.2 960GB + 0025 NVMe SSD Controller CM7 2.5" + 1028 222d Ent NVMe CM7 FIPS U.2 RI 30.72TB + 1028 222e Ent NVMe CM7 FIPS U.2 RI 15.36TB + 1028 222f Ent NVMe CM7 FIPS U.2 RI 7.68TB + 1028 2230 Ent NVMe CM7 FIPS U.2 RI 3.84TB + 1028 2231 Ent NVMe CM7 FIPS U.2 RI 1.92TB + 1028 2232 Ent NVMe CM7 U.2 RI 30.72TB + 1028 2233 Ent NVMe CM7 U.2 RI 15.36TB + 1028 2234 Ent NVMe CM7 U.2 RI 7.68TB + 1028 2235 Ent NVMe CM7 U.2 RI 3.84TB + 1028 2236 Ent NVMe CM7 U.2 RI 1.92TB + 1028 2237 Ent NVMe CM7 FIPS U.2 MU 12.8TB + 1028 2238 Ent NVMe CM7 FIPS U.2 MU 6.4TB + 1028 2239 Ent NVMe CM7 FIPS U.2 MU 3.2TB + 1028 223a Ent NVMe CM7 FIPS U.2 MU 1.6TB + 1028 223b Ent NVMe CM7 U.2 MU 12.8TB + 1028 223c Ent NVMe CM7 U.2 MU 6.4TB + 1028 223d Ent NVMe CM7 U.2 MU 3.2TB + 1028 223e Ent NVMe CM7 U.2 MU 1.6TB 1e17 Arnold & Richter Cine Technik GmbH & Co. Betriebs KG 1e18 Beijing GuangRunTong Technology Development Co.,Ltd 1e24 Squirrels Research Labs @@ -25570,10 +25744,10 @@ 8032 S6 [Enflame] # FHFL PCIe card, single slot, 3rd generation from Enflame c031 S30 [Enflame] -# HHHL PCIe card, dual slot, 3rd generation from Enflame - c032 S60 [Enflame] # FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory - c033 S30 [Enflame] + c032 S90 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory + c033 S60 [Enflame] # nee Thinci, Inc 1e38 Blaize, Inc 0102 Xplorer X1600 @@ -25657,6 +25831,10 @@ 1e3b 0084 Enterprise NVMe SSD U.2 3.2TB (H5300) 1e3b 0085 Enterprise NVMe SSD U.2 6.4TB (H5300) 1e3d Burlywood, Inc +1e43 MaxLinear Inc + 8904 MxL8904 + 8906 MxL8906 + 8908 MxL8908 1e44 Valve Software 1e49 Yangtze Memory Technologies Co.,Ltd 0001 ZHITAI PC005 NVMe SSD @@ -25957,6 +26135,7 @@ 1f60 Accelecom 0001 XELE-NIC 25K5 0054 XELE-NIC 25K5 +1f67 Yunsilicon Technology Co,. Ltd. 1faa Hexaflake (Shanghai) Information Technology Co., Ltd. 0c10 Compass C10 PF 0c11 Compass C10 VF @@ -26065,6 +26244,14 @@ 2000 AWM 2 2010 AWM 2-M 1fe4 HippStor Technology + 1600 HP600 Series NVMe SSD + 1fe4 0075 Enterprise NVMe SSD U.2 3.84TB(HP610) + 1fe4 0076 Enterprise NVMe SSD U.2 7.68TB(HP610) + 1fe4 0077 Enterprise NVMe SSD U.2 6.40TB(HP630) + 1fe4 0078 Enterprise NVMe SSD U.2 3.20TB(HP630) +1ff4 DEEPX Co., Ltd. + 0000 DX_M1 + 0001 DX_M1A 2000 Smart Link Ltd. 2800 SmartPCI2800 V.92 PCI Soft DFT 2001 Temporal Research Ltd @@ -26088,6 +26275,7 @@ 2262 KC2000/KC2500 NVMe SSD 2263 A2000 NVMe SSD 5008 U-SNS8154P3 NVMe SSD + 500a DC1000B NVMe SSD 500b DC1000M NVMe SSD 500c OM8PCP Design-In PCIe 3 NVMe SSD (DRAM-less) 500d OM3PDP3 NVMe SSD @@ -26533,6 +26721,8 @@ 5053 Voyetra Technologies 2010 Daytona Audio Adapter 50b2 TerraTec Electronic GmbH +50ce System-on-Chip Engineering S.L. + 0001 RELY-MIL-XMC-TSN-SWITCH 5136 S S Technologies 5143 Qualcomm Inc 5145 Ensoniq (Old) @@ -26696,6 +26886,17 @@ 544d 6905 TBS6905 DVB-S2 Quad Tuner PCIe Card 6205 0001 TBS6205 DVB-T2/T/C Quad TV Tuner PCIe Card 6209 0001 TBS6209 DVB-T2/C2/T/C/ISDB-T OctaTV Tuner + 6590 0001 TBS6590 DVB-S/S2/S2X/T/T2/C/C2/ISDB-T + 2xCI + 6590 0002 TBS6590SE DVB-S/S2/S2X/T/T2/C/C2 + 2xCI + 6704 ffff TBS6704 (Quad ATSC/QAMB) + 6903 0020 TBS6903x (Dual DVB-S/S2/S2X) + 6903 0021 TBS6903x (Dual DVB-S/S2/S2X) + 6903 8888 TBS6903x (Dual DVB-S/S2/S2X) + 6909 0009 TBS6909x (Octa DVB-S/S2/S2X) + 6909 0010 TBS6909x (Octa DVB-S/S2/S2X) + 6909 0019 TBS6909x (Octa DVB-S/S2/S2X) + 6910 0001 TBS6910 DVB-S/S2 + 2xCI + 6910 0002 TBS6910SE DVB-S/S2/S2x + 2xCI 5452 SCANLAB AG 3443 RTC4 5455 Technische Universitaet Berlin @@ -26737,6 +26938,7 @@ 6409 Logitec Corp. 6549 Teradici Corp. 1200 TERA1200 PC-over-IP Host +6590 TBS Technologies (wrong ID) 6666 Decision Computer International Co. 0001 PCCOM4 0002 PCCOM8 @@ -26754,16 +26956,24 @@ 1400 CooVOX TDM GSM Module 1600 CooVOX TDM E1/T1 Module 1800 CooVOX TDM BRI Module +6704 TBS Technologies (wrong ID) 6766 Glenfly Tech Co., Ltd. 3d00 Arise-GT-10C0 3d02 Arise1020 3d03 Arise-GT-1040 3d04 Arise1010 - 3d40 Arise-GT-10C0 High Definition Audio Controller - 3d41 Arise1020 High Definition Audio Controller + 3d06 Arise-GT-10C0t + 3d07 Arise2030 + 3d08 Arise2020 + 3d40 GLF HDMI/DP Audio + 3d41 GLF HDMI/DP Audio + 3d43 GLF HDMI/DP Audio 6899 ZT Systems # nee Qumranet 6900 Red Hat, Inc. +6903 TBS Technologies (wrong ID) +6909 TBS Technologies (wrong ID) +6910 TBS Technologies (wrong ID) 7063 pcHDTV 2000 HD-2000 3000 HD-3000 @@ -29010,6 +29220,7 @@ 1bd4 0058 Ethernet Network Adapter E810-XXVAM2 for OCP 3.0 1bd4 006e Ethernet Network Adapter E810-XXVAM2 for BD 1bd4 0083 Ethernet Network Adapter E810-XXVAM2 for lldp + 1bd4 00a0 S252IE810 1eec 0102 VSE-225-41E Dual-port 10Gb/25Gb Etherent PCIe 8086 0001 Ethernet 25G 2P E810-XXV OCP 8086 0002 Ethernet 25G 2P E810-XXV Adapter @@ -29181,8 +29392,10 @@ 188b Ethernet Connection E823-C for QSFP 188c Ethernet Connection E823-C for SFP 1028 0abd Ethernet Connection 25G 4P E823-C LOM + 17aa 405e E823 25G/10G Ethernet LOM Controller 188d Ethernet Connection E823-C/X557-AT 10GBASE-T 188e Ethernet Connection E823-C 1GbE + 17aa 405f E823 1G Ethernet LOM Controller 1890 Ethernet Connection E822-C for backplane 1891 Ethernet Connection E822-C for QSFP 1892 Ethernet Connection E822-C for SFP @@ -33629,7 +33842,7 @@ 46a0 AlderLake-P GT2 46a1 UHD Graphics 46a3 Alder Lake-P GT1 [UHD Graphics] - 46a6 Alder Lake-P Integrated Graphics Controller + 46a6 Alder Lake-P GT2 [Iris Xe Graphics] 46a8 Alder Lake-UP3 GT2 [Iris Xe Graphics] 46aa Alder Lake-UP4 GT2 [Iris Xe Graphics] 46b0 AlderLake-P [Iris Xe Graphics] @@ -33750,7 +33963,9 @@ 51a9 Alder Lake PCH UART #1 51aa Alder Lake SPI Controller 51ab Alder Lake SPI Controller + 51b0 Alder Lake PCI Express Root Port #9 51b1 Alder Lake PCI Express x1 Root Port #10 + 51bb Alder Lake-P PCH PCIe Root Port #4 51bf Alder Lake PCH-P PCI Express Root Port #9 51c5 Alder Lake-P Serial IO I2C Controller #0 51c6 Alder Lake-P Serial IO I2C Controller #1 @@ -34229,7 +34444,7 @@ 7d0b Volume Management Device NVMe RAID Controller Intel Corporation 7d40 Meteor Lake-M [Intel Graphics] 7d45 Meteor Lake-P [Intel Graphics] - 7d55 Meteor Lake-P [Intel Graphics] + 7d55 Meteor Lake-P [Intel Arc Graphics] 7d60 Meteor Lake-M [Intel Graphics] 7dd5 Meteor Lake-P [Intel Graphics] 7e01 Meteor Lake-P LPC/eSPI Controller @@ -35294,12 +35509,18 @@ a3eb Comet Lake PCI Express Root Port #21 a3f0 Comet Lake PCH-V cAVS a620 6400/6402 Advanced Memory Buffer (AMB) + a707 Raptor Lake-P/U 4p+8e cores Host Bridge/DRAM Controller a708 Raptor Lake-P/U 2p+8e cores Host Bridge/DRAM Controller a71d Raptor Lake Dynamic Platform and Thermal Framework Processor Participant + a71e Raptor Lake-P Thunderbolt 4 USB Controller a720 Raptor Lake-P [UHD Graphics] a721 Raptor Lake-P [UHD Graphics] + a72f Raptor Lake-P Thunderbolt 4 PCI Express Root Port #2 + a73e Raptor Lake-P Thunderbolt 4 NHI #0 a74d Raptor Lake PCIe 4.0 Graphics Port a74f GNA Scoring Accelerator module + a76d Raptor Lake-P Thunderbolt 4 NHI #1 + a76e Raptor Lake-P Thunderbolt 4 PCI Express Root Port #0 a77d Raptor Lake Crashlog and Telemetry a77f Volume Management Device NVMe RAID Controller Intel Corporation a780 Raptor Lake-S GT1 [UHD Graphics 770] @@ -35314,6 +35535,10 @@ a7a1 Raptor Lake-P [Iris Xe Graphics] a7a8 Raptor Lake-P [UHD Graphics] a7a9 Raptor Lake-P [UHD Graphics] + a7aa Raptor Lake-P [Intel Graphics] + a7ab Raptor Lake-P [Intel Graphics] + a7ac Raptor Lake-U [Intel Graphics] + a7ad Raptor Lake-U [Intel Graphics] abc0 Omni-Path Fabric Switch Silicon 100 Series ad0b Volume Management Device NVMe RAID Controller Intel Corporation b152 21152 PCI-to-PCI Bridge @@ -35439,12 +35664,16 @@ # Wuxi Micro Innovation Integrated Circuit Design Co.,Ltd. 8848 MUCSE *** 42 LINES SKIPPED *** From nobody Mon Dec 4 10:34:12 2023 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 4SkKlm6n3Tz53CRb; Mon, 4 Dec 2023 10:34: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKlm5xyNz4QYl; Mon, 4 Dec 2023 10:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q6MgmSYnwppJbn0wMoiRHcKP9wVJDDlnDAAjYnBemBg=; b=oN7edB5q+ji3Oo/vt+COZdX37c5ZAVyZEQppA05OcyFiCKXKV7snlhVbQN/8pDkXNzDpqW 3ssnr1Tw/PuA0EZy67LcYTdcoj+JxYFXH9fWabx/ciXG+flo68KTxqCvCXebt3WtU/HYmi SU19vg9YWX8KC9UzoepXETcQRcdZR7Q4/ICKUxrQ0RHtlynZ1piUpWEzM19VLc+0qgtGgw lBjwGGq8smJzJ6oQfe7URQUOnP4ZlzIWRqS8mToXoZC8sqs73WphpQjPgmO63pFj5N46uR fcX/wx4ZnkjqGWwnRHgPDd471bVtxzWb19VWWRPVylSZ/vsbxYFuhhrsEAoyhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q6MgmSYnwppJbn0wMoiRHcKP9wVJDDlnDAAjYnBemBg=; b=uwIyXCZrZmAiUli8rFymaWNr+4wb+7V675kigawLNeTQBNj9pzyJojXUt8qyqsRG94Bw7k K48mx72TVZJ4Pz3tmI74dCqvub732K1YE2yYgzk7FWL+A2w3JShSMNb9TvoFzhAzs17GTp dB5W4X084nFfoAybU3zfd9NwNHhfkmgqFcsd7808XUV/vYZIije+M76MngsWoKAfzpyXMX CwRv1RewrWxBHWLZMCNu/QR1e6mvzFbIQ7LUu4OP5EDRpZIRQpNc8Vsfkd72IJSEA+6tWE 7IbijbnYS2yoawqBDk4OIZGtWRHdffVhm5R6o06HlIqUd9j3EqbXjwIYvZD50w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686052; a=rsa-sha256; cv=none; b=ACk7pZEGfE0Kll3BW4Oec4wT2zOwTQkXIoAM3xd50YM0kIp1zcERdSvdw42atvFnNDDYv2 I794Uu5+0BNfGeIVzJw6Y4YHODPivYmuQexeq40ndF6VM2X+VviNiCuv1LGSBfmkYltKAD 2AXHfFdZdGFzVF08WfyJWNEgVs6xRFpmegWDkyy2T80EJCiosGgTD6UW7Opryh2CLTqLi7 xbPZbJfkj8CbNGKXwOOqrctACa0eWQGfe4/GsSfL9UI1ydj0GdhqH6KOhk0xy8+7XfLoqr g36pOWznAqWKxk4Hc+6tc5Lp9kLeOuECVGAnlxTKqn1exhjyLEcuW7RgHFf6YQ== 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 4SkKlm505Cz7kl; Mon, 4 Dec 2023 10:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AYCcH009140; Mon, 4 Dec 2023 10:34:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AYCfU009137; Mon, 4 Dec 2023 10:34:12 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:34:12 GMT Message-Id: <202312041034.3B4AYCfU009137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ef922c733a00 - stable/13 - nvi: import version 2.2.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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ef922c733a00991fba7805b2fac50403759a102c Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ef922c733a00991fba7805b2fac50403759a102c commit ef922c733a00991fba7805b2fac50403759a102c Author: Baptiste Daroussin AuthorDate: 2023-09-27 16:01:58 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:34:07 +0000 nvi: import version 2.2.1 (cherry picked from commit 0fcececbac9880b092aeb56a41a16f1ec8ac1ae6) --- contrib/nvi/CMakeLists.txt | 4 + contrib/nvi/INSTALL.md | 47 ++++++++++++ contrib/nvi/README | 26 ++++++- contrib/nvi/common/key.c | 95 ++++++++++++++++++++++- contrib/nvi/common/main.c | 3 +- contrib/nvi/common/options.c | 2 + contrib/nvi/common/options_f.c | 2 +- contrib/nvi/common/search.c | 11 ++- contrib/nvi/ex/ex.c | 13 +++- contrib/nvi/ex/ex_argv.c | 6 +- contrib/nvi/ex/ex_subst.c | 7 +- contrib/nvi/man/vi.1 | 4 + contrib/nvi/vi/v_paragraph.c | 11 ++- contrib/nvi/vi/v_redraw.c | 1 + usr.bin/vi/ex/version.h | 3 +- usr.bin/vi/options_def.h | 169 +++++++++++++++++++++-------------------- 16 files changed, 298 insertions(+), 106 deletions(-) diff --git a/contrib/nvi/CMakeLists.txt b/contrib/nvi/CMakeLists.txt index 66d3ca2aafb0..0c935b3c2a19 100644 --- a/contrib/nvi/CMakeLists.txt +++ b/contrib/nvi/CMakeLists.txt @@ -37,6 +37,7 @@ if (NOT APPLE) endif() add_compile_options($<$:-Wuninitialized>) add_compile_options($<$:-Wno-dangling-else>) +add_compile_options(-Wno-string-compare) add_compile_options(-Wstack-protector -fstack-protector) add_compile_options(-Wstrict-aliasing -fstrict-aliasing) @@ -148,6 +149,9 @@ if(USE_WIDECHAR) target_sources(regex PRIVATE ${REGEX_SRCS}) target_include_directories(regex PUBLIC regex) target_compile_definitions(regex PUBLIC __REGEX_PRIVATE) + # The macro _XOPEN_SOURCE_EXTENDED is needed to get the waddnwstr() + # definition on at least FreeBSD and recent macOS. + target_compile_definitions(nvi PRIVATE _XOPEN_SOURCE_EXTENDED) target_link_libraries(nvi PRIVATE regex) else() find_library(CURSES_LIBRARY NAMES ncurses curses HINTS /usr/lib) diff --git a/contrib/nvi/INSTALL.md b/contrib/nvi/INSTALL.md new file mode 100644 index 000000000000..7b2fd35b7c60 --- /dev/null +++ b/contrib/nvi/INSTALL.md @@ -0,0 +1,47 @@ +# Install from source + +For instructions to bring nvi2 as a part of your operating system's base system, see [Porting](https://github.com/lichray/nvi2/wiki/Porting) in the Wiki. This document is an overview of the build process that allows you to give nvi2 a try. + +## Prerequisites + +- CMake >= 3.17; +- Ninja build system; +- libiconv (for `USE_ICONV`); +- libncursesw (for `USE_WIDECHAR`); + +Anything required by a minimal nvi, notably: + +- Berkeley DB1 in libc; +- /var/tmp/vi.recover/ with mode 41777. + +## Building + +Nvi2 uses CMake build system generator. By specifying "Ninja Multi-Config" as the build system to generate, you can compile the project in both Debug and Release modes without re-running CMake. Under the project root directory, run + +```sh +cmake -G "Ninja Multi-Config" -B build +``` + +Now `build` becomes your build directory to hold the artifacts. To build nvi2 in Debug mode, run + +```sh +ninja -C build +``` + +Upon finishing, the nvi2 executable will be available as `build/Debug/nvi`. To launch it in `ex` mode, you can create a symlink + +```sh +ln -s nvi build/Debug/ex +``` + +and run `./build/Debug/ex` rather than `./build/Debug/nvi`. + +To build nvi2 in Release mode, use the following command instead: + +```sh +ninja -C build -f build-Release.ninja +``` + +Upon finishing, you will be able to edit files with `./build/Release/nvi`. + +To change configure-time options, such as disabling wide character support, use `ccmake build`. diff --git a/contrib/nvi/README b/contrib/nvi/README index 8f61a97144be..9e638d952444 100644 --- a/contrib/nvi/README +++ b/contrib/nvi/README @@ -1,4 +1,4 @@ -This is version 2.2.0 (2020-08-01) of nex/nvi, a reimplementation of the ex/vi +This is version 2.2.1 (2023-09-25) of nex/nvi, a reimplementation of the ex/vi text editors originally distributed as part of the Fourth Berkeley Software Distribution (4BSD), by the University of California, Berkeley. @@ -24,6 +24,30 @@ o Nvi was written by Keith Bostic, and the last version is 1.79. After that, Jun-ichiro itojun Hagino developed the file encoding detection techniques in his nvi-m17n. +o In nvi2, Zhihao Yuan incorporated the multibyte encoding support onto DB1. + + It was not possible without great support from Alexander Leidinger, + Peter Wemm, and the FreeBSD community. + + Last but not least, money from Google Summer of Code. + +o Since then, + + Todd C. Miller and Craig Leres adopted and refined the NetBSD-style + expandtab option. + + Yamamoto Takashi, Matija Skala, and Jessica Clarke ported the + software to macOS and Linux. + + Anthony J. Bentley made heroic efforts to modernize the code base + and documentation, leveraging experience from OpenBSD to improve the + quality of the project. + + ...and many others, including Michael McConville, Marc Simpson, + Jeffrey H. Johnson, Bosco García, Anton Konyahin, Walter Alejandro + Iglesias, and those who tried hard to keep anonymous on GitHub :) + Their insights render the software usable, secure, and sustainable. + The following acknowledgments were written by Keith Bostic: =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff --git a/contrib/nvi/common/key.c b/contrib/nvi/common/key.c index e71396893fd4..1ccfb61ee0a1 100644 --- a/contrib/nvi/common/key.c +++ b/contrib/nvi/common/key.c @@ -31,6 +31,7 @@ static int v_event_grow(SCR *, int); static int v_key_cmp(const void *, const void *); static void v_keyval(SCR *, int, scr_keyval_t); static void v_sync(SCR *, int); +static const char *alt_key_notation(int ch); /* * !!! @@ -252,6 +253,10 @@ v_key_name(SCR *sp, ARG_CHAR_T ach) * followed by the character offset from the '@' character in the ASCII * character set. Del (0x7f) is represented as '^' followed by '?'. * + * If set O_ALTNOTATION, control characters less than 0x20 are + * represented in notations. Carriage feed, escape, and + * delete are marked as , , and , respectively. + * * XXX * The following code depends on the current locale being identical to * the ASCII map from 0x40 to 0x5f (since 0x1f + 0x40 == 0x5f). I'm @@ -264,9 +269,14 @@ v_key_name(SCR *sp, ARG_CHAR_T ach) if (CAN_PRINT(sp, ach)) goto done; nopr: if (iscntrl(ch) && (ch < 0x20 || ch == 0x7f)) { - sp->cname[0] = '^'; - sp->cname[1] = ch == 0x7f ? '?' : '@' + ch; - len = 2; + if (O_ISSET(sp, O_ALTNOTATION)) { + const char *notation = alt_key_notation(ch); + len = strlcpy(sp->cname, notation, sizeof(sp->cname)); + } else { + sp->cname[0] = '^'; + sp->cname[1] = ch == 0x7f ? '?' : '@' + ch; + len = 2; + } goto done; } #ifdef USE_WIDECHAR @@ -745,6 +755,85 @@ v_sync(SCR *sp, int flags) rcv_sync(sp, flags); } +/* + * alt_key_notation -- + * Lookup for alternative notations of control characters. + */ +static const char* +alt_key_notation(int ch) +{ + switch (ch) { + case 0x00: + return ""; + case 0x01: + return ""; + case 0x02: + return ""; + case 0x03: + return ""; + case 0x04: + return ""; + case 0x05: + return ""; + case 0x06: + return ""; + case 0x07: + return ""; + case 0x08: + return ""; + case 0x09: + return ""; + case 0x0A: + return ""; + case 0x0B: + return ""; + case 0x0C: + return ""; + case 0x0D: + return ""; + case 0x0E: + return ""; + case 0x0F: + return ""; + case 0x10: + return ""; + case 0x11: + return ""; + case 0x12: + return ""; + case 0x13: + return ""; + case 0x14: + return ""; + case 0x15: + return ""; + case 0x16: + return ""; + case 0x17: + return ""; + case 0x18: + return ""; + case 0x19: + return ""; + case 0x1A: + return ""; + case 0x1B: + return ""; + case 0x1C: + return ""; + case 0x1D: + return ""; + case 0x1E: + return ""; + case 0x1F: + return ""; + case 0x7f: + return ""; + default: + __builtin_unreachable(); + } +} + /* * v_event_err -- * Unexpected event. diff --git a/contrib/nvi/common/main.c b/contrib/nvi/common/main.c index a7e60f1af806..807dbde3895c 100644 --- a/contrib/nvi/common/main.c +++ b/contrib/nvi/common/main.c @@ -419,8 +419,7 @@ err: rval = 1; * PUBLIC: void v_end(GS *); */ void -v_end(gp) - GS *gp; +v_end(GS *gp) { MSGS *mp; SCR *sp; diff --git a/contrib/nvi/common/options.c b/contrib/nvi/common/options.c index d5c039f97228..c3d1f7343f9a 100644 --- a/contrib/nvi/common/options.c +++ b/contrib/nvi/common/options.c @@ -46,6 +46,8 @@ static int opts_print(SCR *, OPTLIST const *); * VI and EX Text Editors", 1990. */ OPTLIST const optlist[] = { +/* O_ALTNOTATION */ + {L("altnotation"), f_print, OPT_0BOOL, 0}, /* O_ALTWERASE 4.4BSD */ {L("altwerase"), f_altwerase, OPT_0BOOL, 0}, /* O_AUTOINDENT 4BSD */ diff --git a/contrib/nvi/common/options_f.c b/contrib/nvi/common/options_f.c index 45ab913c55ab..fe07e4989f05 100644 --- a/contrib/nvi/common/options_f.c +++ b/contrib/nvi/common/options_f.c @@ -147,7 +147,7 @@ f_print(SCR *sp, OPTION *op, char *str, u_long *valp) int offset = op - sp->opts; /* Preset the value, needed for reinitialization of lookup table. */ - if (offset == O_OCTAL) { + if (offset == O_OCTAL || offset == O_ALTNOTATION) { if (*valp) O_SET(sp, offset); else diff --git a/contrib/nvi/common/search.c b/contrib/nvi/common/search.c index e8dcac431f51..c3f7291437ff 100644 --- a/contrib/nvi/common/search.c +++ b/contrib/nvi/common/search.c @@ -103,9 +103,14 @@ prev: if (sp->re == NULL) { ++p; break; } - if (plen > 1 && p[0] == '\\' && p[1] == delim) { - ++p; - --plen; + if (plen > 1 && p[0] == '\\') { + if (p[1] == delim) { + ++p; + --plen; + } else if ( p[1] == '\\') { + *t++ = *p++; + --plen; + } } } if (epp != NULL) diff --git a/contrib/nvi/ex/ex.c b/contrib/nvi/ex/ex.c index fd920a8df9a1..900678e942eb 100644 --- a/contrib/nvi/ex/ex.c +++ b/contrib/nvi/ex/ex.c @@ -154,6 +154,10 @@ ex(SCR **spp) if (file_end(sp, NULL, F_ISSET(sp, SC_EXIT_FORCE))) return (1); *spp = screen_next(sp); + if (*spp) { + F_CLR(*spp, SC_SCR_VI); + F_SET(*spp, SC_SCR_EX); + } return (screen_end(sp)); } } @@ -1463,8 +1467,13 @@ addr_verify: LF_INIT(FL_ISSET(ecp->iflags, E_C_HASH | E_C_LIST | E_C_PRINT)); if (!LF_ISSET(E_C_HASH | E_C_LIST | E_C_PRINT | E_NOAUTO) && !F_ISSET(sp, SC_EX_GLOBAL) && - O_ISSET(sp, O_AUTOPRINT) && F_ISSET(ecp, E_AUTOPRINT)) - LF_INIT(E_C_PRINT); + O_ISSET(sp, O_AUTOPRINT) && F_ISSET(ecp, E_AUTOPRINT)) { + /* Honor the number option if autoprint is set. */ + if (F_ISSET(ecp, E_OPTNUM)) + LF_INIT(E_C_HASH); + else + LF_INIT(E_C_PRINT); + } if (LF_ISSET(E_C_HASH | E_C_LIST | E_C_PRINT)) { cur.lno = sp->lno; diff --git a/contrib/nvi/ex/ex_argv.c b/contrib/nvi/ex/ex_argv.c index 8b1fd7858fb1..dd37fe1f69e2 100644 --- a/contrib/nvi/ex/ex_argv.c +++ b/contrib/nvi/ex/ex_argv.c @@ -764,11 +764,11 @@ err: if (ifp != NULL) * shell that does that is broken. */ for (p = bp, len = 0, ch = EOF; - (ch = GETC(ifp)) != EOF; *p++ = ch, blen-=sizeof(CHAR_T), ++len) + (ch = GETC(ifp)) != EOF; *p++ = ch, blen -= sizeof(CHAR_T), ++len) if (blen < 5) { - ADD_SPACE_GOTOW(sp, bp, *blenp, *blenp * 2); + ADD_SPACE_GOTO(sp, CHAR_T, bp, *blenp, *blenp * 2); p = bp + len; - blen = *blenp - len; + blen = *blenp - len * sizeof(CHAR_T); } /* Delete the final newline, nul terminate the string. */ diff --git a/contrib/nvi/ex/ex_subst.c b/contrib/nvi/ex/ex_subst.c index bf03e4417e91..3113ac5ca360 100644 --- a/contrib/nvi/ex/ex_subst.c +++ b/contrib/nvi/ex/ex_subst.c @@ -643,7 +643,9 @@ nextmatch: match[0].rm_so = 0; goto lquit; } } else { - if (ex_print(sp, cmdp, &from, &to, 0) || + const int flags = + O_ISSET(sp, O_NUMBER) ? E_C_HASH : 0; + if (ex_print(sp, cmdp, &from, &to, flags) || ex_scprint(sp, &from, &to)) goto lquit; if (ex_txt(sp, tiq, 0, TXT_CR)) @@ -1195,7 +1197,8 @@ re_tag_conv(SCR *sp, CHAR_T **ptrnp, size_t *plenp, int *replacedp) for (; len > 0; --len) { if (p[0] == '\\' && (p[1] == '/' || p[1] == '?')) { ++p; - --len; + if (len > 1) + --len; } else if (STRCHR(L("^.[]$*"), p[0])) *t++ = '\\'; *t++ = *p++; diff --git a/contrib/nvi/man/vi.1 b/contrib/nvi/man/vi.1 index b6eaf6964bbd..f1893040ceb7 100644 --- a/contrib/nvi/man/vi.1 +++ b/contrib/nvi/man/vi.1 @@ -2282,6 +2282,10 @@ and .Nm vi modes, unless otherwise specified. .Bl -tag -width Ds +.It Cm altnotation Bq off +Display control characters less than 0x20 in notations. +Carriage feed, escape, and delete are marked as , , and , +respectively. .It Cm altwerase Bq off .Nm vi only. diff --git a/contrib/nvi/vi/v_paragraph.c b/contrib/nvi/vi/v_paragraph.c index abe8d9cf50e0..2d7f07569b79 100644 --- a/contrib/nvi/vi/v_paragraph.c +++ b/contrib/nvi/vi/v_paragraph.c @@ -39,15 +39,20 @@ if (p[0] == '\014') { \ if (!--cnt) \ goto found; \ + if (pstate == P_INTEXT && !--cnt) \ + goto found; \ continue; \ } \ if (p[0] != '.' || len < 2) \ continue; \ for (lp = VIP(sp)->ps; *lp != '\0'; lp += 2) \ if (lp[0] == p[1] && \ - (lp[1] == ' ' && len == 2 || lp[1] == p[2]) && \ - !--cnt) \ - goto found; \ + (lp[1] == ' ' && len == 2 || lp[1] == p[2])) { \ + if (!--cnt) \ + goto found; \ + if (pstate == P_INTEXT && !--cnt) \ + goto found; \ + } \ } while (0) /* diff --git a/contrib/nvi/vi/v_redraw.c b/contrib/nvi/vi/v_redraw.c index de6ed0079701..046fcf15c1b4 100644 --- a/contrib/nvi/vi/v_redraw.c +++ b/contrib/nvi/vi/v_redraw.c @@ -29,5 +29,6 @@ int v_redraw(SCR *sp, VICMD *vp) { + F_SET(sp, SC_SCR_REFORMAT); return (sp->gp->scr_refresh(sp, 1)); } diff --git a/usr.bin/vi/ex/version.h b/usr.bin/vi/ex/version.h index 657da969e721..1c18911cc593 100644 --- a/usr.bin/vi/ex/version.h +++ b/usr.bin/vi/ex/version.h @@ -1,2 +1 @@ - -#define VI_VERSION "2.2.0 (2020-08-01)" +#define VI_VERSION "2.2.1 (2023-09-25)" diff --git a/usr.bin/vi/options_def.h b/usr.bin/vi/options_def.h index 54dd6c20c891..cd6f5ba3eb26 100644 --- a/usr.bin/vi/options_def.h +++ b/usr.bin/vi/options_def.h @@ -1,84 +1,85 @@ -#define O_ALTWERASE 0 -#define O_AUTOINDENT 1 -#define O_AUTOPRINT 2 -#define O_AUTOWRITE 3 -#define O_BACKUP 4 -#define O_BEAUTIFY 5 -#define O_CDPATH 6 -#define O_CEDIT 7 -#define O_COLUMNS 8 -#define O_COMBINED 9 -#define O_COMMENT 10 -#define O_TMPDIR 11 -#define O_EDCOMPATIBLE 12 -#define O_ERRORBELLS 13 -#define O_ESCAPETIME 14 -#define O_EXPANDTAB 15 -#define O_EXRC 16 -#define O_EXTENDED 17 -#define O_FILEC 18 -#define O_FILEENCODING 19 -#define O_FLASH 20 -#define O_HARDTABS 21 -#define O_ICLOWER 22 -#define O_IGNORECASE 23 -#define O_INPUTENCODING 24 -#define O_KEYTIME 25 -#define O_LEFTRIGHT 26 -#define O_LINES 27 -#define O_LISP 28 -#define O_LIST 29 -#define O_LOCKFILES 30 -#define O_MAGIC 31 -#define O_MATCHCHARS 32 -#define O_MATCHTIME 33 -#define O_MESG 34 -#define O_MODELINE 35 -#define O_MSGCAT 36 -#define O_NOPRINT 37 -#define O_NUMBER 38 -#define O_OCTAL 39 -#define O_OPEN 40 -#define O_OPTIMIZE 41 -#define O_PARAGRAPHS 42 -#define O_PATH 43 -#define O_PRINT 44 -#define O_PROMPT 45 -#define O_READONLY 46 -#define O_RECDIR 47 -#define O_REDRAW 48 -#define O_REMAP 49 -#define O_REPORT 50 -#define O_RULER 51 -#define O_SCROLL 52 -#define O_SEARCHINCR 53 -#define O_SECTIONS 54 -#define O_SECURE 55 -#define O_SHELL 56 -#define O_SHELLMETA 57 -#define O_SHIFTWIDTH 58 -#define O_SHOWMATCH 59 -#define O_SHOWMODE 60 -#define O_SIDESCROLL 61 -#define O_SLOWOPEN 62 -#define O_SOURCEANY 63 -#define O_TABSTOP 64 -#define O_TAGLENGTH 65 -#define O_TAGS 66 -#define O_TERM 67 -#define O_TERSE 68 -#define O_TILDEOP 69 -#define O_TIMEOUT 70 -#define O_TTYWERASE 71 -#define O_VERBOSE 72 -#define O_W1200 73 -#define O_W300 74 -#define O_W9600 75 -#define O_WARN 76 -#define O_WINDOW 77 -#define O_WINDOWNAME 78 -#define O_WRAPLEN 79 -#define O_WRAPMARGIN 80 -#define O_WRAPSCAN 81 -#define O_WRITEANY 82 -#define O_OPTIONCOUNT 83 +#define O_ALTNOTATION 0 +#define O_ALTWERASE 1 +#define O_AUTOINDENT 2 +#define O_AUTOPRINT 3 +#define O_AUTOWRITE 4 +#define O_BACKUP 5 +#define O_BEAUTIFY 6 +#define O_CDPATH 7 +#define O_CEDIT 8 +#define O_COLUMNS 9 +#define O_COMBINED 10 +#define O_COMMENT 11 +#define O_TMPDIR 12 +#define O_EDCOMPATIBLE 13 +#define O_ERRORBELLS 14 +#define O_ESCAPETIME 15 +#define O_EXPANDTAB 16 +#define O_EXRC 17 +#define O_EXTENDED 18 +#define O_FILEC 19 +#define O_FILEENCODING 20 +#define O_FLASH 21 +#define O_HARDTABS 22 +#define O_ICLOWER 23 +#define O_IGNORECASE 24 +#define O_INPUTENCODING 25 +#define O_KEYTIME 26 +#define O_LEFTRIGHT 27 +#define O_LINES 28 +#define O_LISP 29 +#define O_LIST 30 +#define O_LOCKFILES 31 +#define O_MAGIC 32 +#define O_MATCHCHARS 33 +#define O_MATCHTIME 34 +#define O_MESG 35 +#define O_MODELINE 36 +#define O_MSGCAT 37 +#define O_NOPRINT 38 +#define O_NUMBER 39 +#define O_OCTAL 40 +#define O_OPEN 41 +#define O_OPTIMIZE 42 +#define O_PARAGRAPHS 43 +#define O_PATH 44 +#define O_PRINT 45 +#define O_PROMPT 46 +#define O_READONLY 47 +#define O_RECDIR 48 +#define O_REDRAW 49 +#define O_REMAP 50 +#define O_REPORT 51 +#define O_RULER 52 +#define O_SCROLL 53 +#define O_SEARCHINCR 54 +#define O_SECTIONS 55 +#define O_SECURE 56 +#define O_SHELL 57 +#define O_SHELLMETA 58 +#define O_SHIFTWIDTH 59 +#define O_SHOWMATCH 60 +#define O_SHOWMODE 61 +#define O_SIDESCROLL 62 +#define O_SLOWOPEN 63 +#define O_SOURCEANY 64 +#define O_TABSTOP 65 +#define O_TAGLENGTH 66 +#define O_TAGS 67 +#define O_TERM 68 +#define O_TERSE 69 +#define O_TILDEOP 70 +#define O_TIMEOUT 71 +#define O_TTYWERASE 72 +#define O_VERBOSE 73 +#define O_W1200 74 +#define O_W300 75 +#define O_W9600 76 +#define O_WARN 77 +#define O_WINDOW 78 +#define O_WINDOWNAME 79 +#define O_WRAPLEN 80 +#define O_WRAPMARGIN 81 +#define O_WRAPSCAN 82 +#define O_WRITEANY 83 +#define O_OPTIONCOUNT 84 From nobody Mon Dec 4 10:34:13 2023 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 4SkKlp2CBsz53ChB; Mon, 4 Dec 2023 10:34: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKln6lQCz4QYv; Mon, 4 Dec 2023 10:34:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttIQ95EhFecpXEk3tIAAdN46bRfsVo9/Nh/3X3eCLas=; b=V/NDOkw2fqsZlx8DVSE+p/9I6DebD6/blWTHGNumVNJN8wEXhpruAfEhuI3IFfq1CvVHtp IVtXekMWGbwxrrZJAO7x3j1UR3qfV+cb8F+ZfOJ1PxjzJR0nsDc/yIqF+7bqFC3xWNvMbG WiFt3/koAWM87J0YYvUIO3JV9CyIoj7LbGt935rbUUevzg/T7YUTnsbdZkZCPRDB+qI6s/ DT4zANoxkQlcw/VjFb5zf3OpUPjGQzb9nrgCUyCz+o5R0kwdmOf/4Kk83H0TGZ8lfrvCyQ wX56Zl9VyHJq720I9Bc8LxY09qiCcPGF0EId5xNGgeyrmML76MOnis+ex8RMvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttIQ95EhFecpXEk3tIAAdN46bRfsVo9/Nh/3X3eCLas=; b=G6N+7WMTru2KT91EdAiaOn0O6PUS7RxzvKZ7AC+b6oM3JdCFAaLZ7Zr4q9CxlzqFg+Nt+r U20CkvjHmu4IQ53oEaV0pJ0xA6hr9zpwLseXnHZX8+sm1mWufNE5featnKNujVcnuYoT/V Tnlp/uafQJSLpIvVTbgyrbSYXWY8DtAhTbWIOSPRG+skjGyBO1PbXg93urMVFtaU1KHM/3 sDaARXreZFOiDgaxvqA4+GJSAZVGh8lQrgN6VzXtFHKepBaSHSdRnQtF0htmgwLmhATAIc YBv7L+ez8nALwye07DosFDqrwQUUs0VcUiGvXiPA3oRNAQc2ZKP7TCq61BNcag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686053; a=rsa-sha256; cv=none; b=leSkknSJkhv9l5SxY7+sORqvFV0ASTagy7sYOapzV25NdPPwDr8fKkQ6Rb9vtxqFzREWQn uW6j5QzSQTLsCdIJt/FUhHgsjlr+QGUXE72BQXhJOlhh1bZAUviUFArFElMZspHLOWA8w2 +OWBu8bBM3soicQenom2VlltUHK3ufYnpymSUkD0VgbHuw/2XbhSlHRJdrf7HW7fnigExN XNJr5Ch6K3Bxfyv1JArsiXbNT2A6WF1VeF9Vhbx97UoPeYMthrBW590jMGfXPkF8p5iMG4 LKgRGcT7yiaa7T2PCiyHz1rHKzii+6Z1e5RGZvregnw6gxHLCG2kXyP4fPm35w== 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 4SkKln5dBmz78n; Mon, 4 Dec 2023 10:34:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AYDZ6009184; Mon, 4 Dec 2023 10:34:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AYDlx009180; Mon, 4 Dec 2023 10:34:13 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:34:13 GMT Message-Id: <202312041034.3B4AYDlx009180@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 041e69abf10b - stable/13 - pci_vendors: update to 2023-06-19 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 041e69abf10bfec014032e85d7dc7e5e7649bee1 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=041e69abf10bfec014032e85d7dc7e5e7649bee1 commit 041e69abf10bfec014032e85d7dc7e5e7649bee1 Author: Baptiste Daroussin AuthorDate: 2023-07-05 06:30:42 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:34:07 +0000 pci_vendors: update to 2023-06-19 (cherry picked from commit 3743f3d020bbb8899af68fc5e01086113468fd2c) --- share/misc/pci_vendors | 150 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 130 insertions(+), 20 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index fb0a22837428..29f7a824bbaf 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.05.15 -# Date: 2023-05-15 03:15:02 +# Version: 2023.06.19 +# Date: 2023-06-19 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -768,7 +768,6 @@ 1028 213e PERC H765i MX 1028 213f PERC H365i Adapter 1028 2140 PERC H365i Front - 1028 2141 PERC H365i MX 1028 2142 HBA465e Adapter 1028 2209 HBA465i Adapter 1028 220a HBA465i Front @@ -2876,7 +2875,7 @@ 1462 3411 Radeon RX 470 1462 3413 Radeon RX 480 Gaming X 8GB 1462 3416 Radeon RX 570 - 1462 3418 Radeon RX 580 Armor 4G OC + 1462 3418 Radeon RX 580 ARMOR 8G OC 1462 341b Radeon RX 570 Armor 8G OC 1462 341e Radeon RX 570 Armor 4G OC 1462 809e Radeon RX 480 4GB @@ -3566,6 +3565,8 @@ 103c 3580 Radeon HD 5450 1043 0386 Radeon HD 5450 1043 03c2 EAH5450 SILENT/DI/512MD2 (LP) +# GV-R545SC-1GI + 1458 21d8 Radeon HD 5450 1GB DDR3 Silent 1462 2130 Radeon HD 5450 1462 2131 Radeon HD 5450 1462 2133 Radeon HD 6350 @@ -3909,7 +3910,9 @@ 73df Navi 22 [Radeon RX 6700/6700 XT/6750 XT / 6800M/6850M XT] 1043 16c2 Radeon RX 6800M 1458 2408 Radeon RX 6750 XT GAMING OC 12G + 1462 3980 Radeon RX 6700 XT Mech 2X 12G [MSI] 1849 5219 Radeon RX 6700 XT Challenger D + 1849 5222 RX 6700 XT Challenger D OC 1da2 e445 Sapphire Radeon RX 6700 1eae 6601 Speedster QICK 319 RX 6700 XT 73e0 Navi 23 @@ -3935,10 +3938,12 @@ 1da2 e457 PULSE AMD Radeon RX 6500 XT 7448 Navi31 [Radeon Pro W7900] 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] + 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] - 745e Navi 31 + 745e Navi31 [Radeon Pro W7800] 7480 Navi 33 [Radeon RX 7700S/7600S/7600M XT] + 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] 7489 Navi 33 7833 RS350 Host Bridge @@ -9437,8 +9442,10 @@ 103c 0024 Pavilion ze4400 builtin USB 103c 0025 XE4500 Notebook 104d 810f VAIO PCG-U1 USB/OHCI Revision 1.0 + 10b9 5237 M5273 USB OHCI PCI adapter 1849 5237 ASRock 939Dual-SATA2 Motherboard 5239 USB 2.0 Controller + 10b9 5239 M5273 USB PCI adapter 1849 5239 ASRock 939Dual-SATA2 Motherboard 5243 M1541 PCI to AGP Controller 5246 AGP8X Controller @@ -12672,7 +12679,7 @@ 20f3 GA100 [A800-SXM4-80GB] 20f5 GA100 [A800 80GB PCIe] 20f6 GA100 [A800 40GB PCIe] - 20fd GA100 [A100T] + 20fd GA100 [AX800 Converged Accelerator] 20fe GA100 20ff GA100 2182 TU116 [GeForce GTX 1660 Ti] @@ -12719,13 +12726,14 @@ 22ba AD102 High Definition Audio Controller 2302 GH100 2313 GH100 [H100 CNX] - 2321 GH100 + 2321 GH100 [H100L 94GB] 2322 GH100 [H800 PCIe] 2324 GH100 [H800] - 2330 GH100[H100 SXM5 80GB] + 2330 GH100 [H100 SXM5 80GB] 2331 GH100 [H100 PCIe] 2336 GH100 [H100] 2339 GH100 [H100] + 233a GH100 [H800L 94GB] 2414 GA103 [GeForce RTX 3060 Ti] 2420 GA103M [GeForce RTX 3080 Ti Mobile] 2438 GA103GLM [RTX A5500 Laptop GPU] @@ -12827,7 +12835,7 @@ 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] 2757 GN21-X11 2782 AD104 [GeForce RTX 4070 Ti] - 2785 AD104 + 2785 AD104 [AC AD104 20GB] 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] @@ -16754,6 +16762,7 @@ 0720 SM720 Lynx3DM 0730 SM731 Cougar3DR 0750 SM750 + 0768 SM768 0810 SM810 LynxE 0811 SM811 LynxE 0820 SM820 Lynx3D @@ -17542,6 +17551,8 @@ 5163 RealSSD P425m 5180 9100 PRO NVMe SSD 5181 9100 MAX NVMe SSD + 5188 7100 ECO NVMe SSD + 5189 7100 MAX NVMe SSD 5190 9200 ECO NVMe SSD 5191 9200 PRO NVMe SSD 5192 9200 MAX NVMe SSD @@ -17604,6 +17615,10 @@ 51c3 7450 PRO NVMe SSD 51c4 7450 MAX NVMe SSD 1344 3000 U.3 1600GB [MTFDKCB1T6TFS/MTFDKCC1T6TFS] + 5410 2200S NVMe SSD + 5411 2450 NVMe SSD (DRAM-less) + 5414 3460 NVMe SSD + 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc 1347 Odetics 1349 Sumitomo Electric Industries, Ltd. @@ -19642,6 +19657,7 @@ # MT7612E too? 7662 MT7662E 802.11ac PCI Express Wireless Network Adapter 7915 MT7915E 802.11ax PCI Express Wireless Network Adapter + 7916 MT7905D/MT7975 # WiFi 6E capable 7922 MT7922 802.11ax PCI Express Wireless Network Adapter 7961 MT7921 802.11ax PCI Express Wireless Network Adapter @@ -20248,6 +20264,7 @@ 14e4 df24 NetXtreme-E NGM2100D BCM57508 2x100G KR Mezz Ethernet 1751 BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet 1028 09d4 PowerEdge XR11/XR12 LOM + 1028 0b1b PowerEdge XR5610 LOM 14e4 5045 NetXtreme-E BCM57504 4x25G OCP3.0 14e4 5100 NetXtreme-E Single-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957504-N1100G) 14e4 5105 NetXtreme-E Single-port 100G DSFP Ethernet OCP 3.0 Adapter (BCM957504-N1100GD) @@ -20578,7 +20595,7 @@ f800 BCM78800 Switch ASIC [Trident5-X12] f900 BCM78900 Switch ASIC [Tomahawk5] f903 BCM78903 Switch ASIC [Tomahawk6] - f905 BCM78905 Switch ASIC [Tomahawk5] + f905 BCM78905 Switch ASIC [Tomahawk5+] f910 BCM78910 Switch ASIC [Tomahawk6] f914 BCM78914 Switch ASIC [Tomahawk6] f917 BCM78917 Switch ASIC [Tomahawk6] @@ -21525,12 +21542,15 @@ 5004 PC SN520 NVMe SSD 5005 PC SN520 NVMe SSD 5006 WD Black SN750 / PC SN730 NVMe SSD + 5007 PC SN530 NVMe SSD (DRAM-less) + 5008 PC SN530 NVMe SSD 5009 WD Blue SN550 NVMe SSD 15b7 5009 WD Blue SN550 NVMe SSD 500b PC SN530 NVMe SSD 1414 500b Xbox Series X 500d WD Ultrastar DC SN340 NVMe SSD 5011 WD PC SN810 / Black SN850 NVMe SSD + 5015 PC SN740 NVMe SSD 5017 WD Black SN770 NVMe SSD 501a WD Blue SN570 NVMe SSD 1TB 5025 WD Blue SN570 NVMe SSD 2TB @@ -23588,6 +23608,8 @@ 5013 PS5013 E13 NVMe Controller 5016 E16 PCIe4 NVMe Controller 5018 E18 PCIe4 NVMe Controller + 5019 PS5019-E19 PCIe4 NVMe Controller (DRAM-less) + 5021 PS5021-E21 PCIe4 NVMe Controller (DRAM-less) 1989 Montilio Inc. 0001 RapidFile Bridge 8001 RapidFile @@ -24499,11 +24521,13 @@ 1284 PC300 NVMe Solid State Drive 512GB 1285 PC300 NVMe Solid State Drive 1TB 1327 BC501 NVMe Solid State Drive - 1339 BC511 + 1339 BC511 NVMe SSD 1504 PC400 NVMe SSD 1527 PC401 NVMe Solid State Drive 256GB - 174a Gold P31/PC711 NVMe Solid State Drive - 1959 Platinum P41 NVMe Solid State Drive 2TB + 1639 PC611 NVMe Solid State Drive + 174a Gold P31/BC711/PC711 NVMe Solid State Drive + 1959 Platinum P41/PC801 NVMe Solid State Drive + 1d59 BC901 NVMe Solid State Drive (DRAM-less) 2204 960GB TLC PCIe Gen3 x4 NVMe M.2 22110 243b PE6110 NVMe Solid State Drive 1c5c 0100 PE6110 NVMe Solid State Drive @@ -24518,6 +24542,14 @@ 1028 214a DC NVMe PE8010 RI U.2 7.68TB 1c5c 0100 PE8000 Series NVMe Solid State Drive 2849 PE81x0 U.2/3 NVMe Solid State Drive + 1028 2262 DC NVMe OPAL PE8110 RI U.2 960GB + 1028 2263 DC NVMe OPAL PE8110 RI U.2 1920GB + 1028 2264 DC NVMe OPAL PE8110 RI U.2 3840GB + 1028 2265 DC NVMe OPAL PE8110 RI U.2 7680GB + 1028 2266 DC NVMe ISE PE8110 RI U.2 960GB + 1028 2267 DC NVMe ISE PE8110 RI U.2 1920GB + 1028 2268 DC NVMe ISE PE8110 RI U.2 3840GB + 1028 2269 DC NVMe ISE PE8110 RI U.2 7680GB 1c5c 0101 PE81x0 U.2/3 NVMe Solid State Drive 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 @@ -24583,7 +24615,7 @@ 1c5f 4b41 NVMe SSD PBlaze6 6936 6400GB 2.5" U.3 1c5f 4b51 NVMe SSD PBlaze6 6936 12800GB 2.5" U.3 1c5f 4b61 NVMe SSD PBlaze6 6936 25600GB 2.5" U.3 - 003f PBlaze7 7940/7946 Gen5 NVMe SSD + 003f PBlaze7 7940/7946 NVMe SSD 0540 PBlaze4 NVMe SSD 0550 PBlaze5 700/900 0555 PBlaze5 510/516 @@ -24818,6 +24850,7 @@ 08b1 AQC108 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] 11b1 AQC111 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] 12b1 AQC112 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] + 14c0 AQC113C NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] 87b1 AQC107 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] 94c0 AQC113CS NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] 1043 87f5 ProArt X570-CREATOR WIFI @@ -24982,7 +25015,9 @@ 0001 Colossus GC2 [C2] 0002 Colossus GC1 [S1] 1d97 Shenzhen Longsys Electronics Co., Ltd. + 1d97 Lexar NM620 NVME SSD (DRAM-less) 2263 SM2263EN/SM2263XT-based OEM SSD + 2269 Lexar NM760 NVME SSD (DRAM-less) # nee Facebook, Inc. 1d9b Meta Platforms, Inc. 0010 Networking DOM Engine @@ -25485,6 +25520,7 @@ 1201 NVMe SSD Controller MAP1201 1202 NVMe SSD Controller MAP1202 1601 NVMe SSD Controller MAP1601 + 1602 NVMe SSD Controller MAP1602 1e4c GSI Technology 0010 Associative Processing Unit [Leda] 1e4c 0120 SE120 @@ -25537,6 +25573,8 @@ 1002 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1e95 1101 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1ea0 5636 TP1500 Series U.2 NVMe Datacenter SSD + 9100 CL1-3D256-Q11 NVMe SSD M.2 +1e96 Drut Technologies Inc. 1e9f Lynxi Technologies Co., Ltd. 1ea0 Tencent Technology (Shenzhen) Company Limited 2a16 Cloud Intelligent Inference Controller @@ -25558,19 +25596,40 @@ 3401 SSD Contoller 1ebd EMERGETECH Company Ltd. 0101 Seirios 2063 Video Codec -1ec6 Vastai Technologies (Shanghai) Inc. +1ec6 Vastai Technologies 0100 SV100 + 1ec6 0010 VA1V + 1ec6 0011 VA1A + 1ec6 0012 VA1 + 1ec6 0013 VA1E + 1ec6 0020 VA10V + 1ec6 0021 VA10A + 1ec6 0022 VA10 + 1ec6 0030 VE1P + 1ec6 0031 VE1S + 1ec6 0032 VE1V + 1ec6 0033 VE1M + 1ec6 0034 VE1E + 1ec6 0040 VV1U + 1ec6 0041 VA1U + 0200 SG100 + 1ec6 0060 VG1200 + 1ec6 0061 VG1600 + 1ec6 0062 VG1800 + 1ec6 0063 VG1000 + 020f SG100 vGPU 1ec8 Innosilicon Co Ltd 8800 Fantasy I 1ec8 12a2 Fantasy I Device 8810 Fantasy I + 1ec8 12a2 Fantasy I Device 9800 Fantasy II 1ec8 12a2 Fantasy II Device 9802 Fantasy II 1ec8 12a2 Fantasy II Device 9804 Fantasy II 1ec8 12a2 Fantasy II Device - 9810 Fantasy II + 9810 Fantasy II-M 1ec8 12a2 Fantasy II Device 1ec9 Wingtech Group(HongKong)Limited 1eca Lightmatter @@ -25607,6 +25666,7 @@ 1ee1 0009 Airglow A430 NVMe SSD U.2 1.6TB 1ee1 000a Airglow A430 NVMe SSD U.2 3.2TB 1ee1 000b Airglow A430 NVMe SSD U.2 4.8TB + 1ee1 0012 Airglow Z400 NVMe ZNS SSD U.2 5.76TB 1ee4 PETAIO INC 1180 P8118 U.2 Single Port SSD 1ee9 SUSE LLC @@ -25855,6 +25915,7 @@ 500d OM3PDP3 NVMe SSD 500e SNVS2000G [NV1 NVMe PCIe SSD 2TB] 5012 DC1500M U.2 Enterprise SSD + 5013 FURY Renegade NVMe SSD 270b Xantel Corporation 270f Chaintech Computer Co. Ltd 2711 AVID Technology Inc. @@ -26720,13 +26781,16 @@ 02b4 Comet Lake PCI Express Root Port #13 02b8 Comet Lake PCI Express Root Port #1 02bc Comet Lake PCI Express Root Port #5 + 02bf Comet Lake PCI Express Root Port #8 02c5 Comet Lake Serial IO I2C Host Controller 1028 09be Latitude 7410 02c8 Comet Lake PCH-LP cAVS 1028 09be Latitude 7410 02d3 Comet Lake SATA AHCI Controller + 02d7 Comet Lake RAID Controller 02e0 Comet Lake Management Engine Interface 1028 09be Latitude 7410 + 02e3 Comet Lake AMT SOL Redirection 02e8 Serial IO I2C Host Controller 1028 09be Latitude 7410 02e9 Comet Lake Serial IO I2C Host Controller @@ -27346,7 +27410,7 @@ 0d58 Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking 8086 0000 Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking 8086 0001 Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking - 0d9f Ethernet Controller (2) I225-IT + 0d9f Ethernet Controller I225-IT 0dcd Ethernet Connection C825-X 0dd2 Ethernet Network Adapter I710 1137 0000 I710T4LG 4x1 GbE RJ45 PCIe NIC @@ -28301,6 +28365,7 @@ 1250 430HX - 82439HX TXC [Triton II] 125b Ethernet Controller I226-LM 125c Ethernet Controller I226-V + 125d Ethernet Controller I226-IT 1360 82806AA PCI64 Hub PCI Bridge 1361 82806AA PCI64 Hub Controller (HRes) 8086 1361 82806AA PCI64 Hub Controller (HRes) @@ -29105,6 +29170,8 @@ 1b48 82597EX 10GbE Ethernet Controller 8086 a01f PRO/10GbE LR Server Adapter 8086 a11f PRO/10GbE LR Server Adapter + 1bd2 Sapphire Rapids SATA AHCI Controller + 1bf2 Sapphire Rapids SATA AHCI Controller 1c00 6 Series/C200 Series Chipset Family Desktop SATA Controller (IDE mode, ports 0-3) 1c01 6 Series/C200 Series Chipset Family Mobile SATA Controller (IDE mode, ports 0-3) 1c02 6 Series/C200 Series Chipset Family 6 port Desktop SATA AHCI Controller @@ -33281,12 +33348,15 @@ 8086 1216 WiMAX/WiFi Link 5150 ABG 8086 1311 WiMAX/WiFi Link 5150 AGN 8086 1316 WiMAX/WiFi Link 5150 ABG + 4389 WM590 Chipset LPC Controller 438b Tiger Lake-H LPC/eSPI Controller 43a3 Tiger Lake-H SMBus Controller 43a4 Tiger Lake-H SPI Controller 43b0 Tiger Lake-H PCI Express Root Port #9 + 43ba Tiger Lake-H PCIe Root Port #3 43bc Tiger Lake-H PCI Express Root Port #5 43c8 Tiger Lake-H HD Audio Controller + 43d3 Tiger Lake SATA AHCI Controller 43e0 Tiger Lake-H Management Engine Interface 43e8 Tiger Lake-H Serial IO I2C Controller #0 43e9 Tiger Lake-H Serial IO I2C Controller #1 @@ -33303,6 +33373,7 @@ 4538 Elkhart Lake PCI-e Root Complex 4555 Elkhart Lake [UHD Graphics Gen11 16EU] 4571 Elkhart Lake [UHD Graphics Gen11 32EU] + 4602 Alder Lake Host and DRAM Controller 460d 12th Gen Core Processor PCI Express x16 Controller #1 461d Alder Lake Innovation Platform Framework Processor Participant 1028 0b10 Precision 3571 @@ -33326,6 +33397,7 @@ 464d 12th Gen Core Processor PCI Express x4 Controller #0 464f 12th Gen Core Processor Gaussian & Neural Accelerator 1028 0b10 Precision 3571 + 465d Alder Lake Imaging Signal Processor 4660 12th Gen Core Processor Host Bridge/DRAM Registers 4668 12th Gen Core Processor Host Bridge/DRAM Registers 466d Alder Lake-P Thunderbolt 4 NHI #1 @@ -33369,7 +33441,10 @@ 4b24 Elkhart Lake SPI (Flash) Controller 4b38 Elkhart Lake PCH PCI Express Root Port #0 4b39 Elkhart Lake PCH PCI Express Root Port #1 + 4b3c Elkhart Lake PCIe Root Port #4 4b3e Elkhart Lake PCH PCI Express Root Port #6 + 4b4b Elkhart Lake Serial IO I2C Controller #4 + 4b4d Elkhart Lake Serial IO UART Controller #2 4b58 Elkhart Lake High Density Audio bus interface 4b63 Elkhart Lake SATA AHCI 4b70 Elkhart Lake Management Engine Interface @@ -33448,18 +33523,22 @@ 5181 Alder Lake PCH-P LPC/eSPI Controller 5182 Alder Lake PCH eSPI Controller 1028 0b10 Precision 3571 + 5187 Alder Lake LPC Controller 51a3 Alder Lake PCH-P SMBus Host Controller 1028 0b10 Precision 3571 51a4 Alder Lake-P PCH SPI Controller 1028 0b10 Precision 3571 51a8 Alder Lake PCH UART #0 51a9 Alder Lake PCH UART #1 + 51aa Alder Lake SPI Controller + 51ab Alder Lake SPI Controller 51b1 Alder Lake PCI Express x1 Root Port #10 51bf Alder Lake PCH-P PCI Express Root Port #9 51c5 Alder Lake-P Serial IO I2C Controller #0 51c6 Alder Lake-P Serial IO I2C Controller #1 51c8 Alder Lake PCH-P High Definition Audio Controller 1028 0b10 Precision 3571 + 51cc Alder Lake Smart Sound Technology Audio Controller 51d3 Alder Lake-P SATA AHCI Controller 1028 0b10 Precision 3571 51d8 Alder Lake-P Serial IO I2C Controller #2 @@ -33499,18 +33578,38 @@ 5693 DG2 [Arc A370M] 5694 DG2 [Arc A350M] 5695 DG2 [Iris Xe MAX A200M] + 5696 DG2 [Arc A570M] + 5697 DG2 [Arc A530M] + 5698 DG2 [Arc Xe Graphics] 56a0 DG2 [Arc A770] 56a1 DG2 [Arc A750] 56a2 DG2 [Arc A580] + 56a3 DG2 [Arc Xe Graphics] + 56a4 DG2 [Arc Xe Graphics] 56a5 DG2 [Arc A380] 56a6 DG2 [Arc A310] + 56a7 DG2 [Arc Xe Graphics] + 56a8 DG2 [Arc Xe Graphics] + 56a9 DG2 [Arc Xe Graphics] 56b0 DG2 [Arc Pro A30M] 56b1 DG2 [Arc Pro A40/A50] - 56c0 Data Center GPU Flex 170 - 56c1 Data Center GPU Flex 140 + 56b2 DG2 [Arc Pro A60M] + 56b3 DG2 [Arc Pro A60] + 56c0 ATS-M [Data Center GPU Flex 170] + 56c1 ATS-M [Data Center GPU Flex 140] + 5780 Thunderbolt 80/120G Bridge [Barlow Ridge Host 80G 2023] + 5781 Thunderbolt 80/120G NHI [Barlow Ridge Host 80G 2023] + 5782 Thunderbolt 80/120G USB Controller [Barlow Ridge Host 80G 2023] + 5783 Thunderbolt Bridge [Barlow Ridge Host 40G 2023] + 5784 Thunderbolt NHI [Barlow Ridge Host 40G 2023] + 5785 Thunderbolt USB Controller [Barlow Ridge Host 40G 2023] + 5786 Thunderbolt 80/120G Bridge [Barlow Ridge Hub 80G 2023] + 5787 Thunderbolt 80/120G USB Controller [Barlow Ridge Hub 80G 2023] 579c Ethernet Connection E825-C for backplane 579d Ethernet Connection E825-C for QSFP 579e Ethernet Connection E825-C for SFP + 57a4 Thunderbolt Bridge [Barlow Ridge Hub 40G 2023] + 57a5 Thunderbolt USB Controller [Barlow Ridge Hub 40G 2023] 57b1 Ethernet Controller E610 1GBASE T 8086 0000 Ethernet Converged Network Adapter E610 5845 QEMU NVM Express Controller @@ -33907,6 +34006,11 @@ 7afc Alder Lake-S PCH Serial IO I2C Controller #4 7afd Alder Lake-S PCH Serial IO I2C Controller #5 7d0b Volume Management Device NVMe RAID Controller Intel Corporation + 7d40 Meteor Lake-M [Intel Graphics] + 7d45 Meteor Lake-P [Intel Graphics] + 7d55 Meteor Lake-P [Intel Graphics] + 7d60 Meteor Lake-M [Intel Graphics] + 7dd5 Meteor Lake-P [Intel Graphics] 7e01 Meteor Lake-P LPC/eSPI Controller 7e22 Meteor Lake-P SMBus Controller 7e23 Meteor Lake-P SPI Controller @@ -35076,9 +35180,13 @@ 1bd4 0084 Ethernet Controller RP1000 for 10GbE SFP+(lldp) 1bd4 0085 Ethernet Controller SP1000A for 10GBASE-T 8088 0000 Ethernet Network Adaptor RP1000 for 10GbE SFP+ + 8088 0300 Ethernet Network Adaptor RP1000-A03 for 10GbE SFP+ + 8088 0400 Ethernet Network Adaptor RP1000-A04 for 10GbE SFP+ 2000 Ethernet Controller RP2000 Virtual Function for 10GbE SFP+ 2001 Ethernet Controller RP2000 for 10GbE SFP+ 8088 2000 Ethernet Network Adaptor RP2000 for 10GbE SFP+ + 8088 2300 Ethernet Network Adaptor RP2000-A03 for 10GbE SFP+ + 8088 2400 Ethernet Network Adaptor RP2000-A04 for 10GbE SFP+ 80ee InnoTek Systemberatung GmbH beef VirtualBox Graphics Adapter cafe VirtualBox Guest Service @@ -35101,7 +35209,7 @@ 1001 Ethernet Controller N400 Series for 1GbE (Dual-port) 1020 Ethernet Controller N10 Series for 10GbE (Quad-port) 1021 Ethernet Controller N400 Series for 1GbE (Quad-port) - 1060 Ethernet Controller N10 Series for 10GbE (8-port) + 1060 Ethernet Controller N10 Series for 1GbE or 10GbE (8-port) 1080 Ethernet Controller N10 Series Virtual Function 1081 Ethernet Controller N400 Series Virtual Function 8308 Ethernet Controller N500 Series for 1GbE (Quad-port, Copper RJ45) @@ -35673,9 +35781,11 @@ 1500 STAR1500 PCIe NVMe SSD Controller 1501 STAR1500C NVMe SSD 1502 STAR1500E NVMe SSD + 1504 STAR1500L NVMe SSD 2000 STAR2000 NVMe Controller 2001 STAR2000E NVMe SSD 2002 STAR2000C NVMe SSD + 2003 STAR2000L NVMe SSD a000 Asix Electronics Corporation (Wrong ID) a0a0 AOPEN Inc. a0f1 UNISYS Corporation From nobody Mon Dec 4 10:34:14 2023 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 4SkKlq1M2Rz53Clp; Mon, 4 Dec 2023 10:34: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKlq0M9wz4QVB; Mon, 4 Dec 2023 10:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ScmPy+n9dd8zIx2Z2DpHEIOZ0LdnahkuXHmW7TzTIuQ=; b=TtMxCPd+FN4zAxKX4Ucpb4P+7WEXBQp8dL0pdgVdClZJn7MIcDqOHD+gIIL2ndemN5YllB HNL0C/TqPqt8LgUWpHCjaxnR9EdRgIu887xEqMcuJbSelTWST1kmIewWvGVeSFhPGkRHgS 6McCnBEXiKMy3Kwf/5dPZd9Z0U7HhviXQKoDCZ4YQMeWUek9GJE4XfWSupFdFR9IGc316/ guB/3QrXbTbRVAJYzOP4fLYXLHozeKY+BHTJ2OWrQFQ9EhVl3GoZFsRshDbypo22hUJpsu 2dLIND83WOVNZbY8/q8zI55EbqHZVa8zRqOVsbSumpuY6x8CrCwQ14M2+rmUew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ScmPy+n9dd8zIx2Z2DpHEIOZ0LdnahkuXHmW7TzTIuQ=; b=xMNb8bXrHAbGfbED4lipDxoAvohktii96H3FZq3z/kvA9hkslfLMwj4fDGpwn9tNqZgX2Z yhgYUwNe5RK/e0r5CuEDl9UD+17UU604Rs2eJ7xC5q+wj1SGOBvZIHXahJrTkFv49vgIIr AFvmta/NVmFr/5qEqhiGyCuvof9wOhJeCYUUafbgpd+Ih6t+hEVROao5pIKlRmkIK/r5c0 Bt3ncZ8EHbLzfl3FOMyfLmc3Wrz+l/uw4z3sblB8uo8ahzWn2q5D9wS/3mjDg38BWP9aaF M9v1CtuoTpTv/UbI+ItyfTtm+aZPV+hg5cRIvkTf10snKSefJufdMju45x1dJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686055; a=rsa-sha256; cv=none; b=ckSOLx96KxyjO/BjVc4hWKcgRBHDUolY/llfrVWl25IoA+IXX67TwiMxcdui3B13JNnbnX xJfgniQm8mh8VgkyK795MzhhuB7su+cNzbO1Gw9L9bg4r18gzUmO2D+HJzx3+MqouNnTAv 7PYHPCM9OH+IkqBS9g+ikRp7JimKoOVh11GPLrco9DLN6ihT//hAfVAEldUbyj0qjSFjTk M6F+mY7Fs1FsZygtqzpJvuYOGTkHCddsoohtM61AU5AkN7XJil5z54Iu9jcO8VcP398kl9 bAxLBLrjnvIEsYWSjnj/vApPTzLIkHrNAqmdaI/cg8uPc+4aX1WsCKCpZ2AJEQ== 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 4SkKlp6Y0gz7X3; Mon, 4 Dec 2023 10:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AYEZd009225; Mon, 4 Dec 2023 10:34:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AYENE009222; Mon, 4 Dec 2023 10:34:14 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:34:14 GMT Message-Id: <202312041034.3B4AYENE009222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 0b56acfaf127 - stable/13 - pci_vendors: update to 2023-08-12 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0b56acfaf12773000c77cba6f9fe65db8aa8e5b2 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0b56acfaf12773000c77cba6f9fe65db8aa8e5b2 commit 0b56acfaf12773000c77cba6f9fe65db8aa8e5b2 Author: Baptiste Daroussin AuthorDate: 2023-09-06 12:22:11 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:34:08 +0000 pci_vendors: update to 2023-08-12 (cherry picked from commit bf986d52458aaefa4d3a1d4668449cbb5c991afe) --- share/misc/pci_vendors | 342 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 295 insertions(+), 47 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index 29f7a824bbaf..d3988731c30a 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.06.19 -# Date: 2023-06-19 03:15:02 +# Version: 2023.08.12 +# Date: 2023-08-12 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -90,6 +90,8 @@ 025e d819 NVMe DC SSD E3.S 7.5mm [D5-P5336] 025e d81d NVMe DC SSD E1.L 9.5mm [D5-P5336] 0b70 NVMe DC SSD [Yorktown controller] + f1ab P41 Plus NVMe SSD (DRAM-less) + f1ac P44 Pro NVMe SSD 0270 Hauppauge computer works Inc. (Wrong ID) 0291 Davicom Semiconductor, Inc. (Wrong ID) # SpeedStream is Efficient Networks, Inc, a Siemens Company @@ -1037,8 +1039,8 @@ 15d9 1c6e AOC-SLG4-2H8M2 Storage Adapter 1d49 0505 ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter 1d49 0506 ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter - 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay RAID Enablement Kit - 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay RAID Enablement Kit + 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay Non-Hot-Swap RAID Enablement Kit + 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay Rear Hot-Swap RAID Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1375,6 +1377,7 @@ 1043 841b M5A88-V EVO 1043 8445 M5A78L LE 105b 0e13 N15235/A74MX mainboard / AMD SB700 + 1179 ff1e Satellite C660D-113 1179 ff50 Satellite P305D-S8995E 1458 a022 GA-770/78-series motherboard 1458 a102 GA-880GMA-USB3 @@ -2178,7 +2181,7 @@ 6640 Saturn XT [FirePro M6100] 106b 014b Tropo XT [Radeon R9 M380 Mac Edition] 6641 Saturn PRO [Radeon HD 8930M] - 6646 Bonaire XT [Radeon R9 M280X] + 6646 Bonaire XT [Radeon R9 M280X / FirePro W6150M] 6647 Saturn PRO/XT [Radeon R9 M270X/M280X] 1043 223d N551ZU laptop Radeon R9 M280X 6649 Bonaire [FirePro W5100] @@ -2240,7 +2243,7 @@ 17aa 368f Radeon R5 A230 6667 Jet ULT [Radeon R5 M230] 666f Sun LE [Radeon HD 8550M / R5 M230] - 66a0 Vega 20 [Radeon Instinct] + 66a0 Vega 20 [Radeon Pro/Radeon Instinct] 66a1 Vega 20 [Radeon Pro VII/Radeon Instinct MI50 32GB] 66a2 Vega 20 66a3 Vega 20 [Radeon Pro Vega II/Radeon Pro Vega II Duo] @@ -2898,6 +2901,7 @@ 1787 a480 Radeon RX 480 1849 5001 Phantom Gaming X RX 580 OC 1849 5030 Phantom Gaming D Radeon RX580 8G OC + 1da2 e343 Radeon RX 570 Pulse ITX 4GB 1da2 e353 Radeon RX 570 Pulse 4GB 1da2 e366 Nitro+ Radeon RX 570/580/590 1da2 e387 Radeon RX 580 Pulse 4GB @@ -3168,7 +3172,7 @@ 686e Vega 10 GLXLA 687f Vega 10 XL/XT [Radeon RX Vega 56/64] 1002 0b36 RX Vega64 - 1002 6b76 RX Vega64 + 1002 6b76 AMD Radeon RX Vega 56 8GB # ROG-STRIX-RXVEGA64-O8G-GAMING 1043 04c4 Radeon RX Vega 64 1458 230c Radeon RX VEGA 56 GAMING OC 8G @@ -3906,13 +3910,14 @@ 1eae 6901 Speedster MERC 319 AMD Radeon RX 6900 XT Black 73c3 Navi 22 73c4 Navi 22 USB - 73ce Navi22-XL SRIOV MxGPU + 73ce Navi 22-XL SRIOV MxGPU 73df Navi 22 [Radeon RX 6700/6700 XT/6750 XT / 6800M/6850M XT] 1043 16c2 Radeon RX 6800M 1458 2408 Radeon RX 6750 XT GAMING OC 12G 1462 3980 Radeon RX 6700 XT Mech 2X 12G [MSI] 1849 5219 Radeon RX 6700 XT Challenger D 1849 5222 RX 6700 XT Challenger D OC + 1da2 465e Radeon RX 6750 XT PULSE OC 1da2 e445 Sapphire Radeon RX 6700 1eae 6601 Speedster QICK 319 RX 6700 XT 73e0 Navi 23 @@ -3936,16 +3941,17 @@ 7424 Navi 24 [Radeon RX 6300] 743f Navi 24 [Radeon RX 6400/6500 XT/6500M] 1da2 e457 PULSE AMD Radeon RX 6500 XT - 7448 Navi31 [Radeon Pro W7900] + 7446 Navi 31 USB + 7448 Navi 31 [Radeon Pro W7900] 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] - 745e Navi31 [Radeon Pro W7800] - 7480 Navi 33 [Radeon RX 7700S/7600S/7600M XT] + 745e Navi 31 [Radeon Pro W7800] + 7480 Navi 33 [Radeon RX 7700S/7600/7600S/7600M XT/PRO W7600] 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] - 7489 Navi 33 + 7489 Navi 33 [Radeon Pro W7500] 7833 RS350 Host Bridge 7834 RS350 [Radeon 9100 PRO/XT IGP] 7835 RS350M [Mobility Radeon 9000 IGP] @@ -4348,6 +4354,7 @@ ab18 Vega 12 HDMI Audio ab20 Vega 20 HDMI Audio [Radeon VII] ab28 Navi 21/23 HDMI/DP Audio Controller + ab30 Navi 31 HDMI/DP Audio ab38 Navi 10 HDMI Audio ac00 Theater 506 World-Wide Analog Decoder ac01 Theater 506 World-Wide Analog Decoder @@ -5032,7 +5039,11 @@ 14b7 Family 17h-19h PCIe Dummy Host Bridge 14b9 Family 17h-19h Internal PCIe GPP Bridge 14ba Family 17h-19h PCIe GPP Bridge +# Server device + 14ca Genoa CCP/PSP 4.0 Device 14cd Family 19h USB4/Thunderbolt PCIe tunnel + 14de Phoenix PCIe Dummy Function + 14ef Family 19h USB4/Thunderbolt PCIe tunnel 1510 Family 14h Processor Root Complex 174b 1001 PURE Fusion Mini 1512 Family 14h Processor Root Port @@ -5116,6 +5127,9 @@ 15b5 Stoney NB Performance Monitor 15bc Stoney PCIe [GFX,GPP] Bridge [4:0] 15be Stoney Audio Processor + 15c4 Phoenix USB4/Thunderbolt NHI controller #1 + 15c5 Phoenix USB4/Thunderbolt NHI controller #2 + 15c7 Family 19h (Model 74h) CCP/PSP 3.0 Device 15d0 Raven/Raven2 Root Complex 103c 8615 Pavilion Laptop 15-cw1xxx 1043 876b PRIME B450M-A Motherboard @@ -5264,6 +5278,8 @@ 1665 VanGogh Data Fabric; Function 5 1666 VanGogh Data Fabric; Function 6 1667 VanGogh Data Fabric; Function 7 + 1668 Pink Sardine USB4/Thunderbolt NHI controller #1 + 1669 Pink Sardine USB4/Thunderbolt NHI controller #2 166a Cezanne Data Fabric; Function 0 166b Cezanne Data Fabric; Function 1 166c Cezanne Data Fabric; Function 2 @@ -5707,6 +5723,7 @@ 1028 215f ENT NVMe RT1 RI 7.68TB 1028 2160 ENT NVMe RT1 FIPS RI 3.84TB 1028 2161 ENT NVMe RT1 FIPS RI 7.68TB + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 1029 Siemens Nixdorf IS 102a LSI Logic 0000 HYDRA @@ -6971,6 +6988,7 @@ 90dc Baikal DMA Controller 90dd Baikal Memory (DDR3/SPM) 90de Baikal USB 3.0 xHCI Host Controller + 9121 Nextorage NEM-PA NVMe SSD for PlayStation 104e Oak Technology, Inc 0017 OTI-64017 0107 OTI-107 [Spitfire] @@ -7201,6 +7219,7 @@ c350 80333 [SuperTrak EX12350] e350 80333 [SuperTrak EX24350] 105b Foxconn International, Inc. + e0c3 T99W175 5G Modem [Snapdragon X55] 105c Wipro Infotech Limited 105d Number 9 Computer Company 2309 Imagine 128 @@ -12732,8 +12751,13 @@ 2330 GH100 [H100 SXM5 80GB] 2331 GH100 [H100 PCIe] 2336 GH100 [H100] - 2339 GH100 [H100] + 2337 GH100 [H100 SXM5 64GB] + 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] + 233d GH100 [H100 96GB] + 2342 GH100 [GH200 120GB] + 2343 GH100 + 2345 GH100 [GH200 480GB] 2414 GA103 [GeForce RTX 3060 Ti] 2420 GA103M [GeForce RTX 3080 Ti Mobile] 2438 GA103GLM [RTX A5500 Laptop GPU] @@ -12829,6 +12853,7 @@ 26b2 AD102GL [RTX 5000 Ada Generation] 26b5 AD102GL [L40] 26b8 AD102GL [L40G] + 26b9 AD102GL [L40S] 26f5 AD102GL [L40 CNX] 2704 AD103 [GeForce RTX 4080] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] @@ -12839,15 +12864,18 @@ 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] + 27b2 AD104GL [RTX 4000 Ada Generation] 27b7 AD104GL [L16] 27b8 AD104GL [L4] 27ba AD104GLM [RTX 4000 Ada Generation Laptop GPU] 27bb AD104GLM [RTX 3500 Ada Generation Laptop GPU] 27e0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 2803 AD106 [GeForce RTX 4060 Ti] + 2805 AD106 [GeForce RTX 4060 Ti 16GB] 2820 AD106M [GeForce RTX 4070 Max-Q / Mobile] 2838 AD106GLM [RTX 3000 Ada Generation Laptop GPU] 2860 AD106M [GeForce RTX 4070 Max-Q / Mobile] + 2882 AD107 [GeForce RTX 4060] 28a0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28a1 AD107M [GeForce RTX 4050 Max-Q / Mobile] 28b8 AD107GLM [RTX 2000 Ada Generation Laptop GPU] @@ -13097,7 +13125,10 @@ 5288 RTS5288 PCI Express Card Reader 5289 RTL8411 PCI Express Card Reader 1043 1457 K55A Laptop + 5760 RTS5763DL x2 NVMe SSD Controller 5762 RTS5763DL NVMe SSD Controller + 5763 RTS5763DL NVMe SSD Controller (DRAM-less) + 5765 RTS5765DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) 10ec 8029 RTL-8029(AS) @@ -15293,8 +15324,8 @@ 0102 Extended IDE Controller 0103 EX-IDE Type-B 010e PXP04 NVMe SSD - 010f NVMe Controller - 0110 NVMe SSD Controller Cx5 + 010f XG3 NVMe SSD Controller + 0110 Cx5 NVMe SSD Controller 1028 1ffb Express Flash NVMe 960G (RI) U.2 (CD5) 1028 1ffc Express Flash NVMe 1.92T (RI) U.2 (CD5) 1028 1ffd Express Flash NVMe 3.84T (RI) U.2 (CD5) @@ -16410,6 +16441,7 @@ 8331 O2 Flash Memory Card 8520 SD/MMC Card Reader Controller 8621 SD/MMC Card Reader Controller + 8760 FORESEE E2M2 NVMe SSD 1218 Hybricon Corp. 1219 First Virtual Corporation 121a 3Dfx Interactive, Inc. @@ -16767,8 +16799,9 @@ 0811 SM811 LynxE 0820 SM820 Lynx3D 0910 SM910 + 2260 SM2260 NVMe SSD Controller 2262 SM2262/SM2262EN SSD Controller - 2263 SM2263EN/SM2263XT SSD Controller + 2263 SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers 1270 Olympus Optical Co., Ltd. 1271 GW Instruments 1272 Telematics International @@ -17556,6 +17589,8 @@ 5190 9200 ECO NVMe SSD 5191 9200 PRO NVMe SSD 5192 9200 MAX NVMe SSD + 5196 9400 PRO NVMe SSD + 5197 9400 MAX NVMe SSD 51a2 7300 PRO NVMe SSD 1344 2000 960GB U.2 1344 3000 1920GB U.2 @@ -17615,8 +17650,12 @@ 51c3 7450 PRO NVMe SSD 51c4 7450 MAX NVMe SSD 1344 3000 U.3 1600GB [MTFDKCB1T6TFS/MTFDKCC1T6TFS] - 5410 2200S NVMe SSD - 5411 2450 NVMe SSD (DRAM-less) + 5404 2210 NVMe SSD [Cobain] + 5405 2300 NVMe SSD [Santana] + 5407 3400 NVMe SSD [Hendrix] + 5410 2200S NVMe SSD [Cassandra] + 5411 2450 NVMe SSD [HendrixV] (DRAM-less) + 5413 2400 NVMe SSD (DRAM-less) 5414 3460 NVMe SSD 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc @@ -19307,15 +19346,18 @@ 144b Verint Systems Inc. 144c Catalina Research Inc 144d Samsung Electronics Co Ltd - 1600 Apple PCIe SSD + 1600 S4LN053X01 AHCI SSD Controller(Apple slot) + 9602 RS780/RS880 PCI to PCI bridge (int gfx) a544 Exynos 8890 PCIe Root Complex a575 Exynos 7420 PCIe Root Complex a5e3 Exynos 5433 PCIe Root Complex a800 XP941 PCIe SSD + a801 S4LN058A01[SSUBX] AHCI SSD Controller (Apple slot) a802 NVMe SSD Controller SM951/PM951 144d a801 PM963 2.5" NVMe PCIe SSD a804 NVMe SSD Controller SM961/PM961/SM963 144d a801 SM963 2.5" NVMe PCIe SSD + a806 NVMe SSD SM0032L a808 NVMe SSD Controller SM981/PM981/PM983 144d a801 SSD 970 EVO 1d49 403b Thinksystem U.2 PM983 NVMe SSD @@ -19341,6 +19383,7 @@ 1028 512d DC NVMe PM9A3 RI U.2 7.68TB 144d a813 General DC NVMe PM9A3 a80b NVMe SSD Controller PM9B1 + a80c NVMe SSD Controller S4LV008[Pascal] a820 NVMe SSD Controller 171X 1028 1f95 Express Flash NVMe XS1715 SSD 400GB 1028 1f96 Express Flash NVMe XS1715 SSD 800GB @@ -20469,6 +20512,7 @@ 43aa BCM43131 802.11b/g/n 43ae BCM43162 802.11ac Wireless Network Adapter 43b1 BCM4352 802.11ac Wireless Network Adapter + 1043 85ba PCE-AC56 Dual-Band Wireless PCI-E Adapter 43ba BCM43602 802.11ac Wireless LAN SoC 43bb BCM43602 802.11ac Wireless LAN SoC 43bc BCM43602 802.11ac Wireless LAN SoC @@ -20594,7 +20638,8 @@ d804 BCM58804 Stingray 100Gb Ethernet SoC f800 BCM78800 Switch ASIC [Trident5-X12] f900 BCM78900 Switch ASIC [Tomahawk5] - f903 BCM78903 Switch ASIC [Tomahawk6] + f902 BCM78902 Switch ASIC [Tomahawk5T] + f903 BCM78903 Switch ASIC [Tomahawk5] f905 BCM78905 Switch ASIC [Tomahawk5+] f910 BCM78910 Switch ASIC [Tomahawk6] f914 BCM78914 Switch ASIC [Tomahawk6] @@ -21410,6 +21455,7 @@ 101d MT2892 Family [ConnectX-6 Dx] 101e ConnectX Family mlx5Gen Virtual Function 101f MT2894 Family [ConnectX-6 Lx] + 193d 1035 NIC-ETH641F-LP-2P SFP28 2x25GbE PCIe Network Adapter 1020 MT28860 1021 MT2910 Family [ConnectX-7] 1023 CX8 Family [ConnectX-8] @@ -21542,18 +21588,25 @@ 5004 PC SN520 NVMe SSD 5005 PC SN520 NVMe SSD 5006 WD Black SN750 / PC SN730 NVMe SSD - 5007 PC SN530 NVMe SSD (DRAM-less) - 5008 PC SN530 NVMe SSD + 5007 IX SN530 NVMe SSD (DRAM-less) + 5008 PC SN530 NVMe SSD (DRAM-less) 5009 WD Blue SN550 NVMe SSD 15b7 5009 WD Blue SN550 NVMe SSD 500b PC SN530 NVMe SSD 1414 500b Xbox Series X 500d WD Ultrastar DC SN340 NVMe SSD 5011 WD PC SN810 / Black SN850 NVMe SSD - 5015 PC SN740 NVMe SSD - 5017 WD Black SN770 NVMe SSD + 5014 WD Green SN350 NVMe SSD 1 TB (DRAM-less) + 5015 PC SN740 NVMe SSD (DRAM-less) + 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) + 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD + 5019 WD Green SN350 NVMe SSD 240GB (DRAM-less) 501a WD Blue SN570 NVMe SSD 1TB + 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) + 501e PC SN735 NVMe SSD (DRAM-less) + 501f WD PC SN735 NVMe SSD 512GB (DRAM-less) 5025 WD Blue SN570 NVMe SSD 2TB + 5026 WD PC SN735 NVMe SSD 1TB (DRAM-less) 5030 Western Digital WD Black SN850X NVMe SSD 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) @@ -22637,8 +22690,11 @@ 9755 GL9755 SD Host Controller e763 GL9763E eMMC Controller 17aa Lenovo + 0003 LENSE20256GMSP34MEAT2TA + 0004 LENSE20512GMSP34MEAT2TA # 250GB nvme ssd from lenovo, can be found in Thinkpad x380 yoga 0005 LENSE30256GMSP34MEAT3TA + 0006 LENSE30512GMSP34MEAT3TA 3181 ThinkCentre M75n IoT 402b Intel 82599ES 10Gb 2-port Server Adapter X520-2 17ab Phillips Components @@ -22665,6 +22721,7 @@ 0105 MSM8998 PCIe Root Complex 0108 SM8150 PCIe Root Complex 0109 SA8195P PCIe Root Complex + 010e SC8280XP PCI Express Root Port 0300 MDM9x35 LTE Modem [Snapdragon X7] 0301 MDM9x45 LTE Modem [Snapdragon X12] 0302 MDM9x55 LTE Modem [Snapdragon X16] @@ -22674,6 +22731,8 @@ 1101 QCA6390 Wireless Network Adapter 1103 QCNFA765 Wireless Network Adapter 1104 QCN6024/9024/9074 Wireless Network Adapter + 1108 IPQ95xx/97xx PCI Express Root Port + 1109 QCN62xx/92xx Wireless Network Adapter 17cc NetChip Technology, Inc 2280 USB 2.0 17cd Cadence Design Systems, Inc. @@ -23604,6 +23663,7 @@ 16ff OX16C954 HOST-B 1987 Phison Electronics Corporation 5007 E7 NVMe Controller + 5008 E8 PCIe3 NVMe Controller 5012 E12 NVMe Controller 5013 PS5013 E13 NVMe Controller 5016 E16 PCIe4 NVMe Controller @@ -23661,6 +23721,7 @@ 103c 3315 NC553i 10Gb 2-port FlexFabric Converged Network Adapter 103c 337b NC554FLB 10Gb 2-port FlexFabric Converged Network Adapter 0800 ServerView iRMC HTI +19a4 Owl Cyber Defense Solutions 19a8 DAQDATA GmbH 19ac Kasten Chase Applied Research 0001 ACA2400 Crypto Accelerator @@ -23893,7 +23954,8 @@ 0050 FlashMAX III 1a84 Commex Technologies 0001 Vulcan SP HT6210 10-Gigabit Ethernet (rev 02) -1a88 MEN Mikro Elektronik +# nee MEN Mikro Elektronik +1a88 Duagon AG 4d45 Multifunction IP core 1a8a StarBridge, Inc. 1a8c Verigy Pte. Ltd. @@ -24128,6 +24190,7 @@ 000c QEMU PCIe Root port 000d QEMU XHCI Host Controller 0010 QEMU NVM Express Controller + 0013 QEMU UFS Host Controller 0100 QXL paravirtual graphic card 1af4 1100 QEMU Virtual Machine 1b37 Signal Processing Devices Sweden AB @@ -24170,7 +24233,7 @@ 1028 2112 BOSS-N1 Monolithic 1028 2113 BOSS-N1 Modular 1028 2151 BOSS-N1 Modular ET - 1028 2196 ROR-N100 + 1028 2196 ROR-N1 1b4b 2241 Santa Cruz NVMe Host Adapter 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit @@ -24241,7 +24304,9 @@ d430 D410/430 Quad-port E1/T1 card 1b79 Absolute Analysis 1b85 OCZ Technology Group, Inc. - 1041 RevoDrive 3 X2 PCI-Express SSD 240 GB (Marvell Controller) + 1021 RevoDrive 3 X2 PCIe SSD 240 GB (Marvell SAS Controller) + 1041 RevoDrive 3 X2 PCIe SSD 240 GB (Marvell SAS Controller) + 4018 Z Drive 6000/6300 NVME SSD 6018 RD400/400A SSD 8788 RevoDrive Hybrid 1b94 Signatec / Dynamic Signals Corp @@ -24371,7 +24436,8 @@ # Nytro 5360S (Rocinante Single Port) TCG - E3.S 1bb1 0180 Nytro 5360S TCG - E3.S 1bb1 01a1 Nytro XP7102 - 5012 FireCuda 510 SSD + 5012 FireCuda/IronWolf 510 SSD + 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520 SSD 5018 FireCuda 530 SSD 1bb3 Bluecherry @@ -24390,7 +24456,7 @@ 0004 MAX4 1bc0 Innodisk Corporation 1001 PCIe 3TG6-P Controller - 1002 PCIe 3TE6 Controller + 1002 PCIe 3TE6 Controller (DRAM-less) 1160 PCIe 3TE2 Controller 1321 PCIe 4TG-P Controller 1322 PCIe 4TE Controller @@ -24398,6 +24464,8 @@ 5208 PCIe 3TE7 Controller 5216 PCIe 3TE8 Controller 5236 PCIe 4TG2-P Controller +1bcd Apacer Technology + 0120 NVMe SSD Drive 960GB 1bcf NEC Corporation 001c Vector Engine 1.0 1bd0 Astronics Corporation @@ -24420,6 +24488,16 @@ 1203 NG3 Series Avionics Discrete Interface 1bd4 Inspur Electronic Information Industry Co., Ltd. 0911 Arria10_PCIe_F10A1150 + 1000 NS8600G1U160 NVME SSD + 1001 NS8600G1U320 NVME SSD + 1002 NS8600G1U640 NVME SSD + 1003 NS8500G1U192 NVME SSD + 1004 NS8500G1U384 NVME SSD + 1005 NS8500G1U768 NVME SSD + 1006 NS6610G1U160, NS6510G1U192 NVME SSD + 1007 NS6610G1U320, NS6510G1U384 NVME SSD + 100c NS8510G1Uxxx, NS8610G1Uxxx NVME SSD + 100e NS8500G2Uxxxx, NS8600G2Uxxxx NVME SSD 1bee IXXAT Automation GmbH 0003 CAN-IB200/PCIe 1bef Lantiq @@ -24427,6 +24505,7 @@ 1bf4 VTI Instruments Corporation 0001 SentinelEX 7011 RX0xxx +1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. 3252 CH382 PCIe Dual Port Serial Adapter @@ -24507,6 +24586,7 @@ # http://www.accensusllc.com/accensustelas2.html 0300 Telas 2.V 1c44 Enmotus Inc + 1100 Fuzedrive NVMe SSD 8000 8000 Storage IO Controller # A Western Digital Subsidiary 1c58 HGST, Inc. @@ -24517,6 +24597,7 @@ 0023 Ultrastar SN200 Series NVMe SSD 1c58 8823 Ultrastar Memory (ME200) 1c5c SK hynix + 1282 PC300 NVMe Solid State Drive 128GB 1283 PC300 NVMe Solid State Drive 256GB 1284 PC300 NVMe Solid State Drive 512GB 1285 PC300 NVMe Solid State Drive 1TB @@ -24524,11 +24605,15 @@ 1339 BC511 NVMe SSD 1504 PC400 NVMe SSD 1527 PC401 NVMe Solid State Drive 256GB + 1627 PC601 NVMe Solid State Drive 1639 PC611 NVMe Solid State Drive + 1739 BC701 NVMe Solid State Drive 174a Gold P31/BC711/PC711 NVMe Solid State Drive 1959 Platinum P41/PC801 NVMe Solid State Drive 1d59 BC901 NVMe Solid State Drive (DRAM-less) 2204 960GB TLC PCIe Gen3 x4 NVMe M.2 22110 + 2427 PE6010 NVMe Solid State Drive + 2429 PE6011 NVMe Solid State Drive 243b PE6110 NVMe Solid State Drive 1c5c 0100 PE6110 NVMe Solid State Drive 2839 PE8000 Series NVMe Solid State Drive @@ -24551,6 +24636,8 @@ 1028 2268 DC NVMe ISE PE8110 RI U.2 3840GB 1028 2269 DC NVMe ISE PE8110 RI U.2 7680GB 1c5c 0101 PE81x0 U.2/3 NVMe Solid State Drive + 284a PE8110 Series NVMe Solid State Drive + 2a49 PE9110 Series NVMe Solid State Drive 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 1c5f 0220 NVMe SSD PBlaze5 520 1920G AIC @@ -24656,10 +24743,19 @@ 0002 Clarett 1cb8 Dawning Information Industry Co., Ltd. 1cc1 ADATA Technology Co., Ltd. +# SX6000LNP + 2263 XPG SX6000 Lite NVMe SSD (DRAM-less) + 33f3 IM2P33F3 NVMe SSD (DRAM-less) 33f8 IM2P33F8ABR1 NVMe SSD 5350 XPG GAMMIX S50 NVMe SSD -# 256GB NVMe SSD - 5766 ADATA XPG GAMMIXS1 1L Media + 5762 FALCON NVMe SSD + 5766 ADATA XPG GAMMIXS1 1L Media (256 GB SSD) + 612a LEGEND 750 NVMe SSD (DRAM-less) + 613a LEGEND 840 NVMe SSD (DRAM-less) + 621a LEGEND 850 NVMe SSD (DRAM-less) + 622a LEGEND 960 NVMe SSD + 624a LEGEND 700 NVMe SSD (DRAM-less) + 627a LEGEND 800 NVMe SSD 8201 XPG SX8200 Pro PCIe Gen3x4 M.2 2280 Solid State Drive 1cc4 Shenzhen Unionmemory Information System Ltd. 1203 NVMe SSD Controller UHXXXa series @@ -24675,8 +24771,21 @@ 1cc4 e122 NVMe SSD UH711a series U.2 1920GB 1cc4 e123 NVMe SSD UH711a series U.2 3840GB 1cc4 e124 NVMe SSD UH711a series U.2 7680GB - 17ab NVMe 256G SSD device + 17a9 RPITJ1TBVME2HWD NVMe SSD 1024GB + 17aa AH631 PCIe 3.0 NVMe SSD 512GB + 17ab AH631 PCIe 3.0 NVMe SSD 256GB + 2263 AM611 PCIe 3.0 NVMe SSD 256GB + 5008 AM610 PCIe 3.0 NVMe SSD 128GB + 5012 RPITJ512PED2OWX NVMe SSD 512GB + 6201 AM620 PCIe 3.0 NVMe SSD 128GB + 6202 AM620 PCIe 3.0 NVMe SSD 256GB + 6203 AM620 PCIe 3.0 NVMe SSD 512GB + 6204 AM620 PCIe 3.0 NVMe SSD 1024GB + 6302 AM630 PCIe 4.0 NVMe SSD 256GB 6303 AM630 PCIe 4.0 x4 NVMe SSD Controller + 6304 AM630 PCIe 4.0 NVMe SSD 1024GB + 6a03 RPETJ512MKP1QDQ PCIe 4.0 NVMe SSD 512GB (DRAM-less) + 6a14 RPEYJ1T24MKN2QWY PCIe 4.0 NVMe SSD 1024GB (DRAM-less) 1cc5 Embedded Intelligence, Inc. 0100 PCIe-CAN-02 Dual CAN bus (9-pin male). PCI Express x1. 0101 PCIe-CAN-01 Single CAN bus (9-pin male). PCI Express x1. @@ -24720,6 +24829,8 @@ 1cf0 Akitio 1cf7 Subspace Dynamics 1cfa Corsair Memory, Inc +1cfd Mangstor + 6300 MX6300 series PCIe x8 NVMe SSD 1d00 Pure Storage 1d05 Tongfang Hongkong Limited 1d0f Amazon.com, Inc. @@ -24827,6 +24938,9 @@ 0015 PM4edge 0016 PM4edge User Device 1d40 Techman Electronics (Changshu) Co., Ltd. + 5501 XC100C55-xxxx NVME SSD + 5c01 XC100C5C-xxxx, XC100E5C-xxxx NVME SSD + b100 PV100C55-xxxx NVME SSD 1d44 DPT a400 PM2x24/PM3224 1d49 Lenovo @@ -24960,6 +25074,10 @@ 1d78 7204 Aliflash V2 U.2 15mm 3.84TB NVMe SSD 1d78 7208 Aliflash V2 U.2 15mm 7.68TB NVMe SSD 1d79 Transcend Information, Inc. + 2262 NVMe PCIe SSD 220S + 2263 NVMe PCIe SSD 120S/112S (DRAM-less) + 2264 NVMe PCIe SSD 250H + 5766 NVMe PCIe SSD 110Q (DRAM-less) 1d7c Aerotech, Inc. # Fiber-optic HyperWire motion control bus from Aerotech. 0001 HyperWire Adapter @@ -25015,9 +25133,12 @@ 0001 Colossus GC2 [C2] 0002 Colossus GC1 [S1] 1d97 Shenzhen Longsys Electronics Co., Ltd. + 1062 Lexar NM710 NVME SSD 1d97 Lexar NM620 NVME SSD (DRAM-less) 2263 SM2263EN/SM2263XT-based OEM SSD 2269 Lexar NM760 NVME SSD (DRAM-less) + 5216 Lexar NM620 NVME SSD (DRAM-less) + 5236 Lexar NM800 PRO NVME SSD # nee Facebook, Inc. 1d9b Meta Platforms, Inc. 0010 Networking DOM Engine @@ -25037,6 +25158,8 @@ # PCIe accelerator card for Deep Learning training tasks 1020 Gaudi2 AI Training Accelerator 1da8 Corigine, Inc. + 3800 Network Flow Processor 3800 + 3803 Network Flow Processor 3800 Virtual Function 1dad Fungible 1db2 ATP ELECTRONICS INC 1db7 Phytium Technology Co., Ltd. @@ -25064,6 +25187,9 @@ dc3c GPU_DMA Controller [X100 Series] 1dbb NGD Systems, Inc. 1dbe INNOGRIT Corporation + 5216 NVMe SSD Controller IG5216 (DRAM-less) + 5220 NVMe SSD Controller IG5220 (DRAM-less) + 5236 NVMe SSD Controller IG5236 5636 NVMe DC SSD IG5636 1dbe 0001 DONGTING-N1 DC SSD U.2 1dbe 1001 DONGHU-Z1 DC ZNS SSD U.2 @@ -25078,6 +25204,7 @@ 1dcf Beijing Sinead Technology Co., Ltd. 1dd3 Sage Microelectronics Corp. 1dd4 Swissbit AG + 0010 N-10m2 NVMe SSD 1dd8 AMD Pensando Systems 0002 DSC2 Elba Upstream Port 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card @@ -25231,6 +25358,8 @@ 8003 RCEC PF 8004 RCEC VF 1dee Biwin Storage Technology Co., Ltd. + 2262 HP EX950 NVMe SSD + 2263 HP EX900 NVMe SSD (DRAM-less) 1def Ampere Computing, LLC e005 eMAG PCI Express Root Port 0 e006 eMAG PCI Express Root Port 1 @@ -25305,6 +25434,8 @@ 0208 ACE-NIC100RN Programmable Network Accelerator 1df3 0000 Maintenance Mode 1df3 0001 ENA2100RN +1df5 Shenzhen TIGO Semiconductor + 1202 kimtigo NVMe SSD (DRAM-less) 1df7 opencpi.org 0001 ml605 0002 alst4 @@ -25321,7 +25452,7 @@ 1dfc JSC NT-COM 1181 TDM 8 Port E1/T1/J1 Adapter 1e0f KIOXIA Corporation - 0001 NVMe SSD Controller BG4 + 0001 NVMe SSD Controller BG4 (DRAM-less) 0007 NVMe SSD Controller Cx6 1028 2078 DC NVMe CD6 RI 960GB 1028 2079 DC NVMe CD6 RI 1.92TB @@ -25343,9 +25474,13 @@ 1028 210f Dell Ent NVMe FIPS CM6 MU 3.2TB 1028 2110 Dell Ent NVMe FIPS CM6 MU 6.4TB 1e0f 0001 Generic NVMe CM6 + 0008 RD500/Exceria Plus/Exceria Plus G2 NVMe SSD 0009 NVMe SSD 1e0f 0001 Toshiba RC500 Series NVMe SSD 1e0f 0032 KIOXIA EXCERIA RC10 Series NVMe SSD + 000c NVMe SSD Controller BG5 (DRAM-less) + 000d NVMe SSD Controller XG7 + 0010 NVMe SSD Controller XG8 0011 NVMe SSD Controller CD7 1028 2189 DC NVMe SED CD7 RI 960GB 1028 218a DC NVMe CD7 RI 960GB @@ -25392,6 +25527,7 @@ 1028 2247 Ent NVMe CM7 E3.S MU 6.4TB 1028 2248 Ent NVMe CM7 E3.S MU 3.2TB 1028 2249 Ent NVMe CM7 E3.S MU 1.6TB + 0018 Exceria Pro NVMe SSD 001f NVMe SSD Controller CD8 1028 2223 DC NVMe CD8 U.2 SED 15.36TB 1028 2224 DC NVMe CD8 U.2 SED 7.68TB @@ -25428,6 +25564,16 @@ 8001 I20 [CloudBlazer] 8011 I10 [CloudBlazer] 8012 I10L [CloudBlazer] +# HHHL PCIe card, single slot, 3rd generation from Enflame + 8031 S6 [Enflame] +# HHHL PCIe card, single slot, 3rd generation from Enflame, 24GB device memory + 8032 S6 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame + c031 S30 [Enflame] +# HHHL PCIe card, dual slot, 3rd generation from Enflame + c032 S60 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory + c033 S30 [Enflame] # nee Thinci, Inc 1e38 Blaize, Inc 0102 Xplorer X1600 @@ -25506,11 +25652,20 @@ 1e3b 008b Enterprise NVMe SSD HHHL 1.6TB (H3900) 1e3b 0091 Enterprise NVMe SSD HHHL 0.75TB (H3900) 1333 Haishen5 NVMe SSD + 1e3b 0081 Enterprise NVMe SSD U.2 3.84TB (H5100) + 1e3b 0082 Enterprise NVMe SSD U.2 7.68TB (H5100) + 1e3b 0084 Enterprise NVMe SSD U.2 3.2TB (H5300) + 1e3b 0085 Enterprise NVMe SSD U.2 6.4TB (H5300) 1e3d Burlywood, Inc 1e44 Valve Software 1e49 Yangtze Memory Technologies Co.,Ltd + 0001 ZHITAI PC005 NVMe SSD 0021 ZHITAI TiPro5000 NVMe SSD 0041 ZHITAI TiPro7000 + 0071 ZHITAI TiPlus7100 +# YMTC + 1001 PC005 NVMe SSD + 1011 PC210 NVMe SSD # YMTC PCIe/NVMe SSD 1013 PC210 1e4b MAXIO Technology (Hangzhou) Ltd. @@ -25561,6 +25716,7 @@ 1e81 a213 NVMe SSD UHXXXa series U.2 3200GB 1e81 a214 NVMe SSD UHXXXa series U.2 6400GB 1e81 f123 NVMe SSD TP6500 series U.2 3840GB + 6206 AM620 NVMe SSD 1e83 Huaqin Technology Co.Ltd 1e85 Heitec AG 1e89 ID Quantique SA @@ -25573,6 +25729,8 @@ 1002 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1e95 1101 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1ea0 5636 TP1500 Series U.2 NVMe Datacenter SSD + 1003 CLR-8W512 NVMe SSD M.2 (DRAM-less) + 1007 CL4-8D512 NVMe SSD M.2 (DRAM-less) 9100 CL1-3D256-Q11 NVMe SSD M.2 1e96 Drut Technologies Inc. 1e9f Lynxi Technologies Co., Ltd. @@ -25585,7 +25743,7 @@ 224a IPA-PE224A CXL to Gen-Z Bridge [Sphinx] 1eab Hefei DATANG Storage Technology Co.,LTD. 300a NVMe SSD Controller 300A - 300b NVMe SSD Controller 300B + 300b NVMe SSD Controller 300B (DRAM-less) 1eac Quectel Wireless Solutions Co., Ltd. 1001 EM120R-GL LTE Modem 1002 EM160R-GL LTE Modem @@ -25652,12 +25810,16 @@ 0201 MTT S80 0202 MTT S70 0203 MTT S60 - 0211 G2D40 + 0211 MTT X200 0221 G2S80 0222 MTT S3000 0223 G2S4 0251 G2N10 02ff MTT HDMI/DP Audio + 0300 MTT S90 Engineering Sample + 0301 MTT S90 + 0323 MTT S4000 + 03ff MTT HDMI/DP Audio 1ed8 Digiteq Automotive 0101 FG4 PCIe Frame Grabber 1ed9 Myrtle.ai @@ -25714,6 +25876,8 @@ 5220 IG5220-Based NVMe SSD 5236 IG5236-Based NVMe SSD 5636 IG5636-Based NVMe SSD +1f0a Motorcomm Microelectronics. + 6801 YT6801 Gigabit Ethernet Controller 1f0f NebulaMatrix Technology 1041 D1055AS vDPA Ethernet Controller 1f0f 0001 D1055AS vDPA Ethernet Controller @@ -25744,6 +25908,8 @@ 1f2f 6115 KM660 U.2 3.2TB NVMe SSD 1f2f 6116 KM560 U.2 3.84TB NVMe SSD 1f2f 6118 KM560 U.2 7.68TB NVMe SSD +1f31 Nextorage + 4512 Nextorage NE1N NVMe SSD 1f3f 3SNIC Ltd 2100 SSSHBA SAS/SATA HBA 1f3f 0120 HBA 32 Ports @@ -25783,6 +25949,7 @@ 9032 SSSNIC SDI5.1 1f3f 00a1 Dual Port 100GE SDI5.1 1f40 Netac Technology Co.,Ltd + 2263 NVMe SSD (DRAM-less) 1f44 VVDN Technologies Private Limited 1f4b Axera Semiconductor Co., Ltd 1f52 MangoBoost Inc. @@ -25890,6 +26057,14 @@ 1fd4 SUNIX Co., Ltd. 0001 Matrix multiport serial adapter 1999 Multiport serial controller +1fde Kratos Defense & Security Solutions, Inc. + 1125 OpenEdge 1125P + 2500 OpenEdge 2500P +1fe0 Allwinmeta Co., Ltd. + 1010 AWM 1 + 2000 AWM 2 + 2010 AWM 2-M +1fe4 HippStor Technology 2000 Smart Link Ltd. 2800 SmartPCI2800 V.92 PCI Soft DFT 2001 Temporal Research Ltd @@ -25909,13 +26084,24 @@ 2010 8142 100VG/AnyLAN 2646 Kingston Technology Company, Inc. 0010 HyperX Predator PCIe AHCI SSD - 2262 KC2000 NVMe SSD +# KC2000 and KC2500 share the same DID + 2262 KC2000/KC2500 NVMe SSD 2263 A2000 NVMe SSD 5008 U-SNS8154P3 NVMe SSD + 500b DC1000M NVMe SSD + 500c OM8PCP Design-In PCIe 3 NVMe SSD (DRAM-less) 500d OM3PDP3 NVMe SSD - 500e SNVS2000G [NV1 NVMe PCIe SSD 2TB] - 5012 DC1500M U.2 Enterprise SSD - 5013 FURY Renegade NVMe SSD + 500e NV1 NVMe SSD + 5010 OM8SBP NVMe PCIe SSD (DRAM-less) + 5012 DC1500M NVMe SSD +# KC3000 and Renegade share the same DID + 5013 KC3000/Renegade NVMe SSD + 5014 Design-In PCIe 4 NVMe SSD (TLC) + 5016 OM3PGP4 NVMe SSD + 501b OM8PGP4 NVMe PCIe SSD (DRAM-less) + 501d NV2 NVMe PCIe 4 SSD 500GB (DRAM-less) + 501f FURY Renegade NVMe SSD with heatsink + 5021 Design-In PCIe 4 NVMe SSD (QLC) 270b Xantel Corporation 270f Chaintech Computer Co. Ltd 2711 AVID Technology Inc. @@ -27193,6 +27379,7 @@ 0960 80960RP (i960RP) Microprocessor/Bridge 0962 80960RM (i960RM) Bridge 0964 80960RP (i960RP) Microprocessor/Bridge + 0975 Optane NVME SSD H10 with Solid State Storage [Teton Glacier] 0998 Ice Lake IEH 09a2 Ice Lake Memory Map/VT-d 09a3 Ice Lake RAS @@ -27200,6 +27387,7 @@ 09a6 Ice Lake MSM 09a7 Ice Lake PMON MSM 09ab RST VMD Managed Controller + 09ad Optane NVME SSD H20 with Solid State Storage [Pyramid Glacier] 09c4 PAC with Intel Arria 10 GX FPGA 0a03 Haswell-ULT Thermal Subsystem 0a04 Haswell-ULT DRAM Controller @@ -28923,6 +29111,7 @@ 15fb Ethernet Connection (13) I219-LM 15fc Ethernet Connection (13) I219-V 15ff Ethernet Controller X710 for 10GBASE-T + 1014 0000 PCIe3 4-port 10GbE Base-T Adapter 1137 0000 X710TLG GbE RJ45 PCIe NIC 1137 02c1 X710T2LG 2x10 GbE RJ45 PCIe NIC 1137 02c2 X710T4LG 4x10 GbE RJ45 PCIe NIC @@ -30436,6 +30625,7 @@ 2522 NVMe Optane Memory Series 8086 3806 Optane Memory 16GB 8086 3810 Optane Memory M10 16GB + 2525 Optane NVME SSD P1600X Series 2526 Wireless-AC 9260 2530 82850 850 (Tehama) Chipset Host Bridge (MCH) 1028 00c7 Dimension 8100 @@ -32555,9 +32745,17 @@ 34aa Ice Lake-LP Serial IO SPI Controller #0 34ab Ice Lake-LP Serial IO SPI Controller #1 34b0 Ice Lake-LP PCI Express Root Port #9 + 34b1 Ice Lake-LP PCIe Port #10 + 34b4 Ice Lake-LP PCIe Port #13 + 34b5 Ice Lake-LP PCIe Port #14 34b7 Ice Lake-LP PCI Express Root Port #16 + 34b8 Ice Lake-LP PCIe Port #1 34ba Ice Lake-LP PCI Express Root Port #3 + 34bb Ice Lake-LP PCIe Port #4 34bc Ice Lake-LP PCI Express Root Port #5 + 34bd Ice Lake-LP PCIe Port #6 + 34be Ice Lake-LP PCIe Port #7 + 34bf Ice Lake-LP PCIe Port #8 34c4 Ice Lake-LP SD Host Controller 34c5 Ice Lake-LP Serial IO I2c Controller #4 34c6 Ice Lake-LP Serial IO I2c Controller #5 @@ -33348,13 +33546,29 @@ 8086 1216 WiMAX/WiFi Link 5150 ABG 8086 1311 WiMAX/WiFi Link 5150 AGN 8086 1316 WiMAX/WiFi Link 5150 ABG - 4389 WM590 Chipset LPC Controller - 438b Tiger Lake-H LPC/eSPI Controller + 4384 Q570 LPC/eSPI Controller + 4385 Z590 LPC/eSPI Controller + 4386 H570 LPC/eSPI Controller + 4387 B560 LPC/eSPI Controller + 4388 H510 LPC/eSPI Controller + 4389 WM590 LPC/eSPI Controller + 438a QM580 LPC/eSPI Controller + 438b HM570 LPC/eSPI Controller + 438c C252 LPC/eSPI Controller + 438d C256 LPC/eSPI Controller + 438e H310D LPC/eSPI Controller + 438f W580 LPC/eSPI Controller + 4390 RM590E LPC/eSPI Controller + 4391 R580E LPC/eSPI Controller 43a3 Tiger Lake-H SMBus Controller 43a4 Tiger Lake-H SPI Controller 43b0 Tiger Lake-H PCI Express Root Port #9 + 43b8 Tiger Lake-H PCIe Root Port #1 43ba Tiger Lake-H PCIe Root Port #3 + 43bb Tiger Lake-H PCIe Root Port #4 43bc Tiger Lake-H PCI Express Root Port #5 + 43c0 Tiger Lake-H PCIe Root Port #17 + 43c7 Tiger Lake-H PCIe Root Port #24 43c8 Tiger Lake-H HD Audio Controller 43d3 Tiger Lake SATA AHCI Controller 43e0 Tiger Lake-H Management Engine Interface @@ -33436,6 +33650,9 @@ 193d 4000 UN-GPU-XG310-32GB-FHFL 4908 DG1 [Iris Xe Graphics] 4909 DG1 [Iris Xe MAX 100] + 4940 4xxx Series QAT + 4942 4xxx Series QAT + 4944 4xxx Series QAT 4b00 Elkhart Lake eSPI Controller 4b23 Elkhart Lake SMBus Controller 4b24 Elkhart Lake SPI (Flash) Controller @@ -33524,6 +33741,7 @@ 5182 Alder Lake PCH eSPI Controller 1028 0b10 Precision 3571 5187 Alder Lake LPC Controller + 519d Raptor Lake LPC/eSPI Controller 51a3 Alder Lake PCH-P SMBus Host Controller 1028 0b10 Precision 3571 51a4 Alder Lake-P PCH SPI Controller @@ -33538,6 +33756,7 @@ 51c6 Alder Lake-P Serial IO I2C Controller #1 51c8 Alder Lake PCH-P High Definition Audio Controller 1028 0b10 Precision 3571 + 51ca Raptor Lake-P/U/H cAVS 51cc Alder Lake Smart Sound Technology Audio Controller *** 178 LINES SKIPPED *** From nobody Mon Dec 4 10:34:15 2023 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 4SkKlr24XSz53CpF; Mon, 4 Dec 2023 10:34: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKlr1bWhz4QpR; Mon, 4 Dec 2023 10:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DoolnQAKGXcUy3s2MtMeEMQHf3DwKDQC3eh7TpVABAs=; b=ePld/ZdlAEc6TMLCZvUsFdG+vJLmHs9IepEb/QfIKfWN+DfXZGi/+qja7LPuGk3ZoLqSWy 2eaQlujTUwttTLj/549nygvMyVd90J708NmDq7MxGXH47w+/iKRGVjI2Pyx/YoPdXUHTPy zWT2kJgqae3lSTWhqzVMJFzE0RfuSJXCbz84e0RoCdszG8PhU+n9kcwfMXOQVoYJ+CN+NW SI1q1JX68t/3mjBEVdai3VPIieOTdKd5p1C8uCgnKuXIgGStcSfhbAc51QBsjmnvA0ztdR HaTiKDaV6vCzhoaUbvT/hoPtvHhiv1FbtoZrCOqo49rd1kc8yYtHIUN0jx0szA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DoolnQAKGXcUy3s2MtMeEMQHf3DwKDQC3eh7TpVABAs=; b=PPxpQaiTsaPoKnnO/6rsk7Of5sVMo6LUmBJgo5m5kKXoK90AhMBxgS1w04NVJbP8U0rW88 SU9U5b+SCrfvLNWSufgGkh6J7sbjDrNUuot8NcCwEkxYLuusHwY3IjORkPswANfZPlZSZD CWGnKqHxYlMqSEukah2x8BO3AR+qAZKRd2bYxlaQD6AKPG8O/bDhlVaEgARzaszVD+dlOz truZHTd/2cjOSUCwX0yXe35E6ATEby1D6GYehdhFgVNdxGj9Dozpwt2BHoTUlGz8gaUy+x hW8tJZPm28xSa16q4v3IGgFt8+FReWV/4d34ACm1zMLjiwMb4SR1F33kM8WvMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686056; a=rsa-sha256; cv=none; b=R2N5ewAQb7S9jM4ZBAbTRqhI5Od5SagmqwkEqdx2CecezQsSA++BNk/bSNCLASiDbdqkYj XWqfpOqR4NUovkWlbmhNDvFQ+bNmLJuWigpv3WmIx40UQ7Rycdis4SH5eg1dcOtH8XvyEE Nghtr6oQEIb8W1Imc/bY7VwsoxKuMG9Px4dVHUqoPAdf6CZCv4b6TiChuS2dbCiEy09LQA PbvzvC4U4DntTEWy1576YUuWSvzVMls5TPFewx5UGCVbTkIFnl8wVIchOmkPE7fli6f1jO gli0xDe4UZ06+vqz+FRE3nGmqn0RWDQeWsAWyImhMHnQ+mhr2TtQ2gQq55g8Rw== 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 4SkKlr07V9z80C; Mon, 4 Dec 2023 10:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AYG3L009264; Mon, 4 Dec 2023 10:34:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AYF5t009261; Mon, 4 Dec 2023 10:34:15 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:34:15 GMT Message-Id: <202312041034.3B4AYF5t009261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 146471559803 - stable/13 - pci_vendors: update to 2023-09-22 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 14647155980320c1bfc29d841ad1860870b1ee56 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=14647155980320c1bfc29d841ad1860870b1ee56 commit 14647155980320c1bfc29d841ad1860870b1ee56 Author: Baptiste Daroussin AuthorDate: 2023-11-03 16:32:35 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:34:08 +0000 pci_vendors: update to 2023-09-22 (cherry picked from commit dbffadd8c28e3ab7dc8b5d38e3c5d7f96a5ad62d) --- share/misc/pci_vendors | 390 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 318 insertions(+), 72 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index d3988731c30a..50115d979327 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.08.12 -# Date: 2023-08-12 03:15:02 +# Version: 2023.09.22 +# Date: 2023-09-22 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -773,7 +773,6 @@ 1028 2142 HBA465e Adapter 1028 2209 HBA465i Adapter 1028 220a HBA465i Front - 1028 228a HBA465e-s Adapter 15d9 1d03 AOC-S4116L-H16IR (16DD/96DD) RAID Adapter 15d9 1d07 AOC-S4016L-L16IT Storage Adapter 15d9 1d08 AOC-S4016L-L16IR Storage Adapter @@ -803,6 +802,20 @@ 1d49 0204 ThinkSystem 430-8i SAS/SATA 12Gb Dense HBA 00b2 PCIe Switch management endpoint 1d49 0003 ThinkSystem 1611-8P PCIe Gen4 NVMe Switch Adapter +# 24G SAS/PCIe storage adapter chip + 00b3 Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx +# 9760W 32 internal port RAID controller + 1000 5000 MegaRAID 9760W-32i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal port RAID controller + 1000 5001 MegaRAID 9760W-16i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal and 16 external port RAID controller + 1000 5010 MegaRAID 9760W-16i16e 24G SAS/PCIe Storage Adapter +# 9700W 32 internal port Storage controller + 1000 5020 eHBA 9700W-32i 24G SAS/PCIe Storage Adapter +# 9700W 16 internal port Storage controller + 1000 5021 eHBA 9700W-16i 24G SAS/PCIe Storage Adapter +# 9700 16 external port Storage controller + 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00bf SAS3404 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) 00c0 SAS3324 PCI-Express Fusion-MPT SAS-3 @@ -1039,8 +1052,9 @@ 15d9 1c6e AOC-SLG4-2H8M2 Storage Adapter 1d49 0505 ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter 1d49 0506 ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter - 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay Non-Hot-Swap RAID Enablement Kit - 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay Rear Hot-Swap RAID Enablement Kit + 1d49 0700 ThinkSystem M.2 RAID B540i-2i SATA/NVMe Enablement Kit + 1d49 0701 ThinkSystem 7mm RAID B540p-2HS SATA/NVMe Enablement Kit + 1d49 0702 ThinkSystem M.2 RAID B540p-2HS SATA/NVMe Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1152,6 +1166,7 @@ 13e9 Ariel/Navi10Lite 13f9 Oberon/Navi12Lite 13fe Cyan Skillfish [BC-250] + 145a Dummy Function (absent graphics controller) 1478 Navi 10 XL Upstream Port of PCI Express Switch 1479 Navi 10 XL Downstream Port of PCI Express Switch 1506 Mendocino @@ -3932,6 +3947,7 @@ 1462 5022 RX 6600 MECH 2X 148c 2412 PowerColor Red Devil RX 6600 XT 1849 5218 Radeon RX 6600 Challenger ITX 8GB + 1da2 448e Radeon RX 6600 XT Pulse 7408 Aldebaran/MI200 [Instinct MI250X] 740c Aldebaran/MI200 [Instinct MI250X/MI250] 740f Aldebaran/MI200 [Instinct MI210] @@ -3948,6 +3964,7 @@ 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] 745e Navi 31 [Radeon Pro W7800] + 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] 7480 Navi 33 [Radeon RX 7700S/7600/7600S/7600M XT/PRO W7600] 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] @@ -4981,6 +4998,8 @@ 1455 Zeppelin/Renoir PCIe Dummy Function 1456 Family 17h (Models 00h-0fh) Platform Security Processor (PSP) 3.0 Device 1457 Family 17h (Models 00h-0fh) HD Audio Controller + 1458 XGMAC 10GbE Controller + 1459 XGMAC 10GbE Controller 145a Zeppelin/Raven/Raven2 PCIe Dummy Function 145b Zeppelin Non-Transparent Bridge 145c Family 17h (Models 00h-0fh) USB 3.0 Host Controller @@ -5037,6 +5056,7 @@ 14b5 Family 17h-19h PCIe Root Complex 14b6 Family 17h-19h IOMMU 14b7 Family 17h-19h PCIe Dummy Host Bridge + 14b8 Family 17h-19h PCIe GPP Bridge 14b9 Family 17h-19h Internal PCIe GPP Bridge 14ba Family 17h-19h PCIe GPP Bridge # Server device @@ -5044,6 +5064,7 @@ 14cd Family 19h USB4/Thunderbolt PCIe tunnel 14de Phoenix PCIe Dummy Function 14ef Family 19h USB4/Thunderbolt PCIe tunnel + 1502 AMD IPU Device 1510 Family 14h Processor Root Complex 174b 1001 PURE Fusion Mini 1512 Family 14h Processor Root Port @@ -12492,7 +12513,7 @@ 1c2d GP106M 1c30 GP106GL [Quadro P2000] 1c31 GP106GL [Quadro P2200] - 1c35 GP106M [Quadro P2000 Mobile] + 1c35 GP106M [Quadro P2000 Mobile / DRIVE PX 2 AutoChauffeur] 1c36 GP106 [P106M] 1c60 GP106BM [GeForce GTX 1060 Mobile 6GB] 103c 8390 GeForce GTX 1060 Max-Q 6GB @@ -12548,6 +12569,8 @@ 1d52 GP108BM [GeForce MX250] 1d56 GP108BM [GeForce MX330] 1d81 GV100 [TITAN V] + 1d83 GV100 [CMP 100-200] + 1d84 GV100 [CMP 100-210] 1db1 GV100GL [Tesla V100 SXM2 16GB] 1db2 GV100GL [Tesla V100 DGXS 16GB] 1db3 GV100GL [Tesla V100 FHHL 16GB] @@ -12560,6 +12583,7 @@ 1dba GV100GL [Quadro GV100] 10de 12eb TITAN V CEO Edition 1dbe GV100 Engineering Sample + 1dc1 GV100 [CMP 100-200] 1df0 GV100GL [Tesla PG500-216] 1df2 GV100GL [Tesla PG503-216] 1df5 GV100GL [Tesla V100 SXM2 16GB] @@ -12649,7 +12673,7 @@ 1f96 TU117M [GeForce GTX 1650 Mobile / Max-Q] 1f97 TU117M [GeForce MX450] 1f98 TU117M [GeForce MX450] - 1f99 TU117M + 1f99 TU117M [GeForce GTX 1650 Mobile / Max-Q] 1f9c TU117M [GeForce MX450] 1f9d TU117M [GeForce GTX 1650 Mobile / Max-Q] # via Lenovo 496.90 @@ -12688,9 +12712,10 @@ 20b8 GA100 [A100X] 20b9 GA100 [A30X] 20bb GA100 [DRIVE A100 PROD] + 20bd GA100 [A800 SXM4 40GB] 20be GA100 [GRID A100A] 20bf GA100 [GRID A100B] - 20c0 GA100 + 20c0 GA100 [Initial DevID] 20c2 GA100 [CMP 170HX] 20f0 GA100 [A100-PG506-207] 20f1 GA100 [A100 PCIe 40GB] @@ -12699,7 +12724,7 @@ 20f5 GA100 [A800 80GB PCIe] 20f6 GA100 [A800 40GB PCIe] 20fd GA100 [AX800 Converged Accelerator] - 20fe GA100 + 20fe GA100 [INT SKU] 20ff GA100 2182 TU116 [GeForce GTX 1660 Ti] 2183 TU116 @@ -12742,6 +12767,7 @@ 228b GA104 High Definition Audio Controller 228e GA106 High Definition Audio Controller 2296 Tegra PCIe Endpoint Virtual Network + 22a3 GH100 [H100 NVSwitch] 22ba AD102 High Definition Audio Controller 2302 GH100 2313 GH100 [H100 CNX] @@ -12859,6 +12885,7 @@ 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] 2757 GN21-X11 + 2770 AD103GLM [RTX 5000 Ada Generation Embedded GPU] 2782 AD104 [GeForce RTX 4070 Ti] 2785 AD104 [AC AD104 20GB] 2786 AD104 [GeForce RTX 4070] @@ -12870,17 +12897,21 @@ 27ba AD104GLM [RTX 4000 Ada Generation Laptop GPU] 27bb AD104GLM [RTX 3500 Ada Generation Laptop GPU] 27e0 AD104M [GeForce RTX 4080 Max-Q / Mobile] + 27fa AD104GLM [RTX 4000 Ada Generation Embedded GPU] + 27fb AD104GLM [RTX 3500 Ada Generation Embedded GPU] 2803 AD106 [GeForce RTX 4060 Ti] 2805 AD106 [GeForce RTX 4060 Ti 16GB] 2820 AD106M [GeForce RTX 4070 Max-Q / Mobile] 2838 AD106GLM [RTX 3000 Ada Generation Laptop GPU] 2860 AD106M [GeForce RTX 4070 Max-Q / Mobile] + 2878 AD106GLM [RTX 3000 Ada Generation Embedded GPU] 2882 AD107 [GeForce RTX 4060] 28a0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28a1 AD107M [GeForce RTX 4050 Max-Q / Mobile] 28b8 AD107GLM [RTX 2000 Ada Generation Laptop GPU] 28e0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28e1 AD107M [GeForce RTX 4050 Max-Q / Mobile] + 28f8 AD107GLM [RTX 2000 Ada Generation Embedded GPU] 10df Emulex Corporation 0720 OneConnect NIC (Skyhawk) 103c 1934 FlexFabric 20Gb 2-port 650M Adapter @@ -13126,7 +13157,7 @@ 5289 RTL8411 PCI Express Card Reader 1043 1457 K55A Laptop 5760 RTS5763DL x2 NVMe SSD Controller - 5762 RTS5763DL NVMe SSD Controller + 5762 RTS5762 NVMe SSD Controller 5763 RTS5763DL NVMe SSD Controller (DRAM-less) 5765 RTS5765DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) @@ -14093,6 +14124,7 @@ 5409 VX855/VX875 APIC and Central Traffic Control 5410 VX900 Series APIC and Central Traffic Control 6100 VT85C100A [Rhine II] + 6122 VN1000 Graphics [Chrome 520 IGP] 6287 SATA RAID Controller 6290 K8M890CE Host Bridge 6327 P4M890 Security Device @@ -17094,7 +17126,7 @@ 12a2 Newgen Systems Corporation 12a3 Lucent Technologies 8105 T8105 H100 Digital Switch -12a4 NTT Electronics Corporation +12a4 NTT Innovative Devices Corporation 12a5 Vision Dynamics Ltd. 12a6 Scalable Networks, Inc. 12a7 AMO GmbH @@ -19948,6 +19980,8 @@ 103c 3383 Ethernet 1Gb 4-port 331T Adapter 14e4 1904 4-port 1Gb Ethernet Adapter 14e4 1909 Broadcom NetXtreme 5719 Quad Port Gigabit NIC + 14e4 d146 BCM95719-P41 4x1GBT Ethernet NIC + 14e4 d346 BCM95719-N41 4x1GBT Ethernet NIC 193d 1025 NIC-ETH330T-LP-4P 1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express 1014 02c6 eServer xSeries server mainboard @@ -20251,6 +20285,8 @@ 117c 00ce FastFrame N4T2 Dual-port 10GBASE-T Ethernet Adapter 14e4 4163 NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 2.0 Adapter (BCM957416M4163C) 14e4 4166 NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 3.0 Adapter (BCM957416N4160C) + 14e4 d140 BCM957416-P410 4x10GBT Ethernet NIC + 14e4 d340 BCM957416-N410 4x10GBT Ethernet NIC 1590 020c Ethernet 10Gb 2-port 535T Adapter 1590 0212 Ethernet 10Gb 2-port 535FLR-T Adapter 16d9 BCM57417 NetXtreme-E 10GBASE-T RDMA Ethernet Controller @@ -20303,15 +20339,19 @@ 117c 00cf FastFrame N412 Dual-port 100Gb Ethernet Adapter 14e4 2100 NetXtreme-E Dual-port 100G QSFP56 Ethernet PCIe4.0 x16 Adapter (BCM957508-P2100G) 14e4 5208 NetXtreme-E Dual-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957508-N2100G) + 14e4 520a NetXtreme-E Dual-port 100G DSFP Ethernet OCP 3.0 Adapter (BCM957508-N2100GD) 14e4 d124 NetXtreme-E P2100D BCM57508 2x100G QSFP PCIE + 14e4 d324 NetXtreme-E N2100D BCM57508 2x100G QSFP OCP3.0 Ethernet 14e4 df24 NetXtreme-E NGM2100D BCM57508 2x100G KR Mezz Ethernet 1751 BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet 1028 09d4 PowerEdge XR11/XR12 LOM 1028 0b1b PowerEdge XR5610 LOM + 14e4 4250 NetXtreme-E Quad-port 25G SFP28 Ethernet PCIe4.0 x16 Adapter (BCM957504-P425G) 14e4 5045 NetXtreme-E BCM57504 4x25G OCP3.0 14e4 5100 NetXtreme-E Single-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957504-N1100G) 14e4 5105 NetXtreme-E Single-port 100G DSFP Ethernet OCP 3.0 Adapter (BCM957504-N1100GD) 14e4 5250 NetXtreme-E BCM57504 4x25G KR Mezz + 14e4 5425 NetXtreme-E Quad-port 25G SFP28 Ethernet OCP 3.0 Adapter (BCM957504-N425G) 14e4 d142 NetXtreme-E P425D BCM57504 4x25G SFP28 PCIE 1752 BCM57502 NetXtreme-E 10Gb/25Gb/40Gb/50Gb Ethernet 1800 BCM57502 NetXtreme-E Ethernet Partition @@ -21447,8 +21487,11 @@ 193d 1051 NIC-IB1040i-Mb-2P 1018 MT27800 Family [ConnectX-5 Virtual Function] 1019 MT28800 Family [ConnectX-5 Ex] + 1014 0617 PCIe4 x16 2-Port EDR IB-only ConnectX-5 CAPI Capable Adapter [IBM EC64] + 1014 0635 PCIe4 2-port 100 GbE RoCE x16 adapter [IBM EC66] 15b3 0008 ConnectX-5 Ex EN network interface card, 100GbE dual-port QSFP28, PCIe4.0 x16, tall bracket; MCX516A-CDAT 15b3 0125 Tencent ConnectX-5 EN Ex network interface card for OCP 3.0, with host management, 50GbE Dual-port QSFP28, PCIe4.0 x16, Thumbscrew (pull-tab) bracket + 15b3 0126 PCIe4 x16 2-port EDR 100GbE ConnectX-5 CAPI Capable adapter [IBM AJP1] 101a MT28800 Family [ConnectX-5 Ex Virtual Function] 101b MT28908 Family [ConnectX-6] 101c MT28908 Family [ConnectX-6 Virtual Function] @@ -21583,14 +21626,14 @@ 15b7 Sandisk Corp 2001 Skyhawk Series NVME SSD 5001 WD Black NVMe SSD - 5002 WD Black 2018/SN750 / PC SN720 NVMe SSD + 5002 SanDisk Extreme Pro / WD Black 2018/SN750/PC SN720 NVMe SSD 5003 WD Blue SN500 / PC SN520 NVMe SSD 5004 PC SN520 NVMe SSD 5005 PC SN520 NVMe SSD - 5006 WD Black SN750 / PC SN730 NVMe SSD + 5006 WD Black SN750 / PC SN730 / Red SN700 NVMe SSD 5007 IX SN530 NVMe SSD (DRAM-less) 5008 PC SN530 NVMe SSD (DRAM-less) - 5009 WD Blue SN550 NVMe SSD + 5009 SanDisk Ultra 3D / WD Blue SN550 NVMe SSD 15b7 5009 WD Blue SN550 NVMe SSD 500b PC SN530 NVMe SSD 1414 500b Xbox Series X @@ -21601,13 +21644,14 @@ 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD 5019 WD Green SN350 NVMe SSD 240GB (DRAM-less) - 501a WD Blue SN570 NVMe SSD 1TB + 501a WD Blue SN570 NVMe SSD 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) 501e PC SN735 NVMe SSD (DRAM-less) 501f WD PC SN735 NVMe SSD 512GB (DRAM-less) 5025 WD Blue SN570 NVMe SSD 2TB 5026 WD PC SN735 NVMe SSD 1TB (DRAM-less) - 5030 Western Digital WD Black SN850X NVMe SSD + 5030 WD Black SN850X NVMe SSD + 5041 WD Blue SN580 NVMe SSD (DRAM-less) 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) 1003 APCI1032 SP controller (32 digi inputs w/ opto coupler) @@ -22781,7 +22825,8 @@ 188a ARC-1886 series PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller 17d3 1217 ARC-1217 4-Port PCIe 4.0 to SAS/SATA 12/6Gb RAID Controller 17d3 1227 ARC-1227 8-Port PCIe 4.0 to SAS/SATA 12/6Gb RAID Controller - 17d3 1686 ARC-1686 PCIe 4.0 to SAS/SATA 12/6Gb Tape drive Controller + 17d3 1686 ARC-1686 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller + 17d3 1688 ARC-1688 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller 17d3 1886 ARC-1886 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller # nee Neterion Inc., previously S2io Inc. 17d5 Exar Corp. @@ -23865,6 +23910,14 @@ 1a0d SEAKR Engineering 1a0e DekTec Digital Video B.V. 083f DTA-2111 VHF/UHF Modulator + 0860 DTA-2144(B) Quad ASI/SDI in+out + 0861 DTA-2145 ASI/SDI in+out with bypass relay + 087c DTA-2172 Dual 3G-SDI/ASI ports + 087e DTA-2174 Quad 3G-SDI/ASI in+out + 087f DTA-2175 3G-SDI/ASI input+output with bypass relay + 0882 DTA-2178 Octal 12G-SDI/ASI ports with genlock + a882 DTA-2178-ASI Octal ASI Ports + b87e DTA-2174B Quad 3G-SDI/ASI ports (1x12G) with genlock 1a17 Force10 Networks, Inc. 8002 PB-10GE-2P 10GbE Security Card 1a1d GFaI e.V. @@ -23974,6 +24027,8 @@ 0017 SEL-3350 GPIO Expansion Board 0018 SEL-3390E4 Ethernet Adapter 001c SEL-3390E4 Ethernet Adapter +1aab Silver Creations AG + 7750 Sceye 10L 1aae Global Velocity, Inc. 1ab4 Distributed Management Task Force, Inc. (DMTF) 1ab6 CalDigit, Inc. @@ -24158,6 +24213,7 @@ 2142 ASM2142/ASM3142 USB 3.1 Host Controller 1462 7a72 H270 PC MATE 2824 ASM2824 PCIe Gen3 Packet Switch + 3042 ASM3042 USB 3.2 Gen 1 xHCI Controller 3242 ASM3242 USB 3.2 Host Controller 1b26 Netcope Technologies, a.s. c132 COMBO-LXT155 @@ -24237,6 +24293,9 @@ 1b4b 2241 Santa Cruz NVMe Host Adapter 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit + 2b43 NXP 88W9098 Wi-Fi 6 (ax) MAC #1 + 2b44 NXP 88W9098 Wi-Fi 6 (ax) MAC #2 + 2b45 NXP 88W9098 Bluetooth 5.3 9120 88SE9120 SATA 6Gb/s Controller 9123 88SE9123 PCIe SATA 6.0 Gb/s controller dc93 600e DC-6xxe series SATA 6G controller @@ -24321,6 +24380,7 @@ 2404 Ultrastar DC SN640 NVMe SSD 2500 Ultrastar DC SN840 NVMe SSD 2600 Ultrastar DC ZN540 ZNS NVMe SSD + 3001 RapidFlex C2000 NVMe Initiator 3714 PC SN730 NVMe SSD 3734 PC SN730 NVMe SSD 1b9a XAVi Technologies Corp. @@ -24438,7 +24498,7 @@ 1bb1 01a1 Nytro XP7102 5012 FireCuda/IronWolf 510 SSD 5013 BarraCuda Q5 NVMe SSD (DRAM-less) - 5016 FireCuda 520 SSD + 5016 FireCuda 520/IronWolf 525 SSD 5018 FireCuda 530 SSD 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder @@ -24505,6 +24565,7 @@ 1bf4 VTI Instruments Corporation 0001 SentinelEX 7011 RX0xxx +1bf5 Greenliant 1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. @@ -24703,6 +24764,12 @@ 1c5f 4b51 NVMe SSD PBlaze6 6936 12800GB 2.5" U.3 1c5f 4b61 NVMe SSD PBlaze6 6936 25600GB 2.5" U.3 003f PBlaze7 7940/7946 NVMe SSD + 1c5f 1431 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 1441 NVMe SSD PBlaze7 7940 7680G 2.5" U.2 + 1c5f 1451 NVMe SSD PBlaze7 7940 15360G 2.5" U.2 + 1c5f 5431 NVMe SSD PBlaze7 7946 3200G 2.5" U.2 + 1c5f 5441 NVMe SSD PBlaze7 7946 6400G 2.5" U.2 + 1c5f 5451 NVMe SSD PBlaze7 7946 12800G 2.5" U.2 0540 PBlaze4 NVMe SSD 0550 PBlaze5 700/900 0555 PBlaze5 510/516 @@ -24853,47 +24920,55 @@ 0714 ZX-100/ZX-200 PCI Express Root Port 0715 ZX-100/ZX-200 PCI Express Root Port 0716 ZX-D PCI Express Root Port - 0717 KX-5000/KX-6000/KX-6000G Express Root Port - 0718 KX-5000/KX-6000/KX-6000G Express Root Port - 0719 KX-5000/KX-6000/KX-6000G Express Root Port - 071a KX-5000/KX-6000/KX-6000G Express Root Port - 071b KX-5000/KX-6000/KX-6000G Express Root Port - 071c KX-5000/KX-6000/KX-6000G Express Root Port - 071d KX-5000/KX-6000/KX-6000G Express Root Port - 071e KX-5000/KX-6000/KX-6000G Express Root Port + 0717 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 0718 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 0719 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071a KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071b KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071c KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071d KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071e KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port 071f ZX-200 Upstream Port of PCI Express Switch 0720 ZX-200 PCIE RC6 controller 0721 ZX-200 Downstream Port of PCI Express Switch 0722 ZX-200 PCIE P2C bridge + 0731 KH-40000 Express Root Port + 0732 KH-40000 Express Root Port 1000 ZX-D Standard Host Bridge - 1001 ZX-D/ZX-E Miscellaneous Bus + 1001 ZX-D/ZX-E/KH-40000 Miscellaneous Bus 1003 ZX-E Standard Host Bridge + 1005 KH-40000 Standard Host Bridge 1006 KX-6000G Standard Host Bridge 3001 ZX-100 Standard Host Bridge 300a ZX-100 Miscellaneous Bus - 3038 ZX-100/ZX-200/KX-6000/KX-6000G Standard Universal PCI to USB Host Controller - 3104 ZX-100/ZX-200/KX-6000/KX-6000G Standard Enhanced PCI to USB Host Controller - 31b0 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge - 31b1 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge - 31b2 ZX-100/KX-5000/KX-6000/KX-6000G DRAM Controller - 31b3 ZX-100/KX-5000/KX-6000/KX-6000G Power Management Controller - 31b4 ZX-100/KX-5000/KX-6000/KX-6000G I/O APIC - 31b5 ZX-100/KX-5000/KX-6000/KX-6000G Scratch Device - 31b7 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge + 3038 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Universal PCI to USB Host Controller + 3104 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Enhanced PCI to USB Host Controller + 31b0 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge + 31b1 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge + 31b2 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 DRAM Controller + 31b3 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Power Management Controller + 31b4 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 I/O APIC + 31b5 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Scratch Device + 31b7 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge 31b8 ZX-100/ZX-D PCI to PCI Bridge - 3288 ZX-100/KX-5000/KX-6000/KX-6000G High Definition Audio Controller - 345b ZX-100/KX-5000/KX-6000/KX-6000G Miscellaneous Bus + 3288 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 High Definition Audio Controller + 345b ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Miscellaneous Bus 3a02 ZX-100 C-320 GPU 3a03 ZX-D C-860 GPU 3a04 ZX-E C-960 GPU + 3b01 KH-40000 OPI Controller + 3b02 KH-40000 OPI Controller + 3b03 KH-40000 OPI Controller + 3b04 KH-40000 OPI Controller + 3c00 KH-40000 DRAM Controller 3c02 KX-6000G DRAM Controller 3d01 KX-6000G C-1080 GPU - 9002 ZX-100/ZX-200 EIDE Controller + 9002 ZX-100/ZX-200/KH-40000 EIDE Controller 9003 ZX-100/KX-6000/KX-6000G EIDE Controller - 9043 KX-6000G RAID Controller + 9043 KX-6000G/KH-40000 RAID Controller 9045 ZX-100/ZX-D/ZX-E RAID Accelerator 0 9046 ZX-D/ZX-E RAID Accelerator 1 - 9083 ZX-100/ZX-200/KX-6000/KX-6000G StorX AHCI Controller + 9083 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 StorX AHCI Controller 9084 ZX-100 StorX AHCI Controller 9100 ZX-200 Cross bus 9101 ZX-200 Traffic Controller @@ -24902,11 +24977,14 @@ 9144 ZX-E High Definition Audio Controller 9145 KX-6000G High Definition Audio Controller 9180 ZX-200 Networking Gigabit Ethernet Adapter + 91c1 KH-40000 ZPI Controller + 91c2 KH-40000 ZPI Controller 9202 ZX-100 USB eXtensible Host Controller 9203 ZX-200 USB eXtensible Host Controller 9204 KX-6000/KX-6000G USB eXtensible Host Controller + 9205 KH-40000 USB eXtensible Host Controller 9286 ZX-D eMMC Host Controller - 9300 ZX-100/KX-5000/KX-6000/KX-6000G eSPI Host Controller + 9300 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 eSPI Host Controller 95d0 ZX-100 Universal SD Host Controller f410 ZX-100/KX-5000/KX-6000/KX-6000G PCI Com Port 1d18 RME @@ -24944,6 +25022,7 @@ 1d44 DPT a400 PM2x24/PM3224 1d49 Lenovo + 0522 ThinkSystem RAID 5350-8i PCIe 12Gb Internal Adapter 1d4c Diamanti, Inc. 1d5c Fantasia Trading LLC 1d61 Technobox, Inc. @@ -25075,8 +25154,9 @@ 1d78 7208 Aliflash V2 U.2 15mm 7.68TB NVMe SSD 1d79 Transcend Information, Inc. 2262 NVMe PCIe SSD 220S - 2263 NVMe PCIe SSD 120S/112S (DRAM-less) + 2263 NVMe PCIe SSD 110S/112S/120S/MTE652T2 (DRAM-less) 2264 NVMe PCIe SSD 250H + 2267 NVMe PCIe SSD 240S/MTE710T 5766 NVMe PCIe SSD 110Q (DRAM-less) 1d7c Aerotech, Inc. # Fiber-optic HyperWire motion control bus from Aerotech. @@ -25207,10 +25287,17 @@ 0010 N-10m2 NVMe SSD 1dd8 AMD Pensando Systems 0002 DSC2 Elba Upstream Port + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1000 DSC Capri Upstream Port 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB @@ -25223,6 +25310,7 @@ 1dd8 400e DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1001 DSC Virtual Downstream Port + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25235,9 +25323,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1002 DSC Ethernet Controller + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25250,9 +25345,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1003 DSC Ethernet Controller VF + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25265,9 +25367,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1004 DSC Management Controller + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25280,19 +25389,40 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1005 DSC NVMe Controller + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1006 DSC NVMe Controller VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1007 DSC Storage Accelerator + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25305,33 +25435,74 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1009 DSC Ethernet Controller UPT + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100a DSC Serial Port Controller + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100b DSC vDPA Network Device VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100c DSC PDS Core Management + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100d DSC Virtio Network Device VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1ddd Thorlabs 1de0 Groq 0000 TSP [GroqChip] @@ -25495,26 +25666,6 @@ 1028 2193 NVMe CD7 E3.S 1.92TB 1028 2194 NVMe CD7 E3.S 3.84TB 1028 2195 NVMe CD7 E3.S 7.68TB - 0013 NVMe SSD Controller CM7 2.5" - 1028 222d Ent NVMe CM7 FIPS U.2 RI 30.72TB - 1028 222e Ent NVMe CM7 FIPS U.2 RI 15.36TB - 1028 222f Ent NVMe CM7 FIPS U.2 RI 7.68TB - 1028 2230 Ent NVMe CM7 FIPS U.2 RI 3.84TB - 1028 2231 Ent NVMe CM7 FIPS U.2 RI 1.92TB - 1028 2232 Ent NVMe CM7 U.2 RI 30.72TB - 1028 2233 Ent NVMe CM7 U.2 RI 15.36TB - 1028 2234 Ent NVMe CM7 U.2 RI 7.68TB - 1028 2235 Ent NVMe CM7 U.2 RI 3.84TB - 1028 2236 Ent NVMe CM7 U.2 RI 1.92TB - 1028 2237 Ent NVMe CM7 FIPS U.2 MU 12.8TB - 1028 2238 Ent NVMe CM7 FIPS U.2 MU 6.4TB - 1028 2239 Ent NVMe CM7 FIPS U.2 MU 3.2TB - 1028 223a Ent NVMe CM7 FIPS U.2 MU 1.6TB - 1028 223b Ent NVMe CM7 U.2 MU 12.8TB - 1028 223c Ent NVMe CM7 U.2 MU 6.4TB - 1028 223d Ent NVMe CM7 U.2 MU 3.2TB - 1028 223e Ent NVMe CM7 U.2 MU 1.6TB - 1028 228c Ent NVMe CM7 U.2 MU 6.4TB 0014 NVMe SSD Controller CM7 EDSFF 1028 223f Ent NVMe CM7 FIPS E3.S RI 15.36TB 1028 2240 Ent NVMe CM7 FIPS E3.S RI 7.68TB @@ -25527,6 +25678,10 @@ 1028 2247 Ent NVMe CM7 E3.S MU 6.4TB 1028 2248 Ent NVMe CM7 E3.S MU 3.2TB 1028 2249 Ent NVMe CM7 E3.S MU 1.6TB + 1028 22b7 Ent NVMe CM7 FIPS E3.S MU 1.6TB + 1028 22b8 Ent NVMe CM7 FIPS E3.S MU 3.2TB + 1028 22b9 Ent NVMe CM7 FIPS E3.S MU 6.4TB + 1028 22ba Ent NVMe CM7 FIPS E3.S MU 12.8TB 0018 Exceria Pro NVMe SSD 001f NVMe SSD Controller CD8 1028 2223 DC NVMe CD8 U.2 SED 15.36TB @@ -25539,6 +25694,25 @@ 1028 222a DC NVMe CD8 U.2 3.84TB 1028 222b DC NVMe CD8 U.2 1.92TB 1028 222c DC NVMe CD8 U.2 960GB + 0025 NVMe SSD Controller CM7 2.5" + 1028 222d Ent NVMe CM7 FIPS U.2 RI 30.72TB + 1028 222e Ent NVMe CM7 FIPS U.2 RI 15.36TB + 1028 222f Ent NVMe CM7 FIPS U.2 RI 7.68TB + 1028 2230 Ent NVMe CM7 FIPS U.2 RI 3.84TB + 1028 2231 Ent NVMe CM7 FIPS U.2 RI 1.92TB + 1028 2232 Ent NVMe CM7 U.2 RI 30.72TB + 1028 2233 Ent NVMe CM7 U.2 RI 15.36TB + 1028 2234 Ent NVMe CM7 U.2 RI 7.68TB + 1028 2235 Ent NVMe CM7 U.2 RI 3.84TB + 1028 2236 Ent NVMe CM7 U.2 RI 1.92TB + 1028 2237 Ent NVMe CM7 FIPS U.2 MU 12.8TB + 1028 2238 Ent NVMe CM7 FIPS U.2 MU 6.4TB + 1028 2239 Ent NVMe CM7 FIPS U.2 MU 3.2TB + 1028 223a Ent NVMe CM7 FIPS U.2 MU 1.6TB + 1028 223b Ent NVMe CM7 U.2 MU 12.8TB + 1028 223c Ent NVMe CM7 U.2 MU 6.4TB + 1028 223d Ent NVMe CM7 U.2 MU 3.2TB + 1028 223e Ent NVMe CM7 U.2 MU 1.6TB 1e17 Arnold & Richter Cine Technik GmbH & Co. Betriebs KG 1e18 Beijing GuangRunTong Technology Development Co.,Ltd 1e24 Squirrels Research Labs @@ -25570,10 +25744,10 @@ 8032 S6 [Enflame] # FHFL PCIe card, single slot, 3rd generation from Enflame c031 S30 [Enflame] -# HHHL PCIe card, dual slot, 3rd generation from Enflame - c032 S60 [Enflame] # FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory - c033 S30 [Enflame] + c032 S90 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory + c033 S60 [Enflame] # nee Thinci, Inc 1e38 Blaize, Inc 0102 Xplorer X1600 @@ -25657,6 +25831,10 @@ 1e3b 0084 Enterprise NVMe SSD U.2 3.2TB (H5300) 1e3b 0085 Enterprise NVMe SSD U.2 6.4TB (H5300) 1e3d Burlywood, Inc +1e43 MaxLinear Inc + 8904 MxL8904 + 8906 MxL8906 + 8908 MxL8908 1e44 Valve Software 1e49 Yangtze Memory Technologies Co.,Ltd 0001 ZHITAI PC005 NVMe SSD @@ -25957,6 +26135,7 @@ 1f60 Accelecom 0001 XELE-NIC 25K5 0054 XELE-NIC 25K5 +1f67 Yunsilicon Technology Co,. Ltd. 1faa Hexaflake (Shanghai) Information Technology Co., Ltd. 0c10 Compass C10 PF 0c11 Compass C10 VF @@ -26065,6 +26244,14 @@ 2000 AWM 2 2010 AWM 2-M 1fe4 HippStor Technology + 1600 HP600 Series NVMe SSD + 1fe4 0075 Enterprise NVMe SSD U.2 3.84TB(HP610) + 1fe4 0076 Enterprise NVMe SSD U.2 7.68TB(HP610) + 1fe4 0077 Enterprise NVMe SSD U.2 6.40TB(HP630) + 1fe4 0078 Enterprise NVMe SSD U.2 3.20TB(HP630) +1ff4 DEEPX Co., Ltd. + 0000 DX_M1 + 0001 DX_M1A 2000 Smart Link Ltd. 2800 SmartPCI2800 V.92 PCI Soft DFT 2001 Temporal Research Ltd @@ -26088,6 +26275,7 @@ 2262 KC2000/KC2500 NVMe SSD 2263 A2000 NVMe SSD 5008 U-SNS8154P3 NVMe SSD + 500a DC1000B NVMe SSD 500b DC1000M NVMe SSD 500c OM8PCP Design-In PCIe 3 NVMe SSD (DRAM-less) 500d OM3PDP3 NVMe SSD @@ -26533,6 +26721,8 @@ 5053 Voyetra Technologies 2010 Daytona Audio Adapter 50b2 TerraTec Electronic GmbH +50ce System-on-Chip Engineering S.L. + 0001 RELY-MIL-XMC-TSN-SWITCH 5136 S S Technologies 5143 Qualcomm Inc 5145 Ensoniq (Old) @@ -26696,6 +26886,17 @@ 544d 6905 TBS6905 DVB-S2 Quad Tuner PCIe Card 6205 0001 TBS6205 DVB-T2/T/C Quad TV Tuner PCIe Card 6209 0001 TBS6209 DVB-T2/C2/T/C/ISDB-T OctaTV Tuner + 6590 0001 TBS6590 DVB-S/S2/S2X/T/T2/C/C2/ISDB-T + 2xCI + 6590 0002 TBS6590SE DVB-S/S2/S2X/T/T2/C/C2 + 2xCI + 6704 ffff TBS6704 (Quad ATSC/QAMB) + 6903 0020 TBS6903x (Dual DVB-S/S2/S2X) + 6903 0021 TBS6903x (Dual DVB-S/S2/S2X) + 6903 8888 TBS6903x (Dual DVB-S/S2/S2X) + 6909 0009 TBS6909x (Octa DVB-S/S2/S2X) + 6909 0010 TBS6909x (Octa DVB-S/S2/S2X) + 6909 0019 TBS6909x (Octa DVB-S/S2/S2X) + 6910 0001 TBS6910 DVB-S/S2 + 2xCI + 6910 0002 TBS6910SE DVB-S/S2/S2x + 2xCI 5452 SCANLAB AG 3443 RTC4 5455 Technische Universitaet Berlin @@ -26737,6 +26938,7 @@ 6409 Logitec Corp. 6549 Teradici Corp. 1200 TERA1200 PC-over-IP Host +6590 TBS Technologies (wrong ID) 6666 Decision Computer International Co. 0001 PCCOM4 0002 PCCOM8 @@ -26754,16 +26956,24 @@ 1400 CooVOX TDM GSM Module 1600 CooVOX TDM E1/T1 Module 1800 CooVOX TDM BRI Module +6704 TBS Technologies (wrong ID) 6766 Glenfly Tech Co., Ltd. 3d00 Arise-GT-10C0 3d02 Arise1020 3d03 Arise-GT-1040 3d04 Arise1010 - 3d40 Arise-GT-10C0 High Definition Audio Controller - 3d41 Arise1020 High Definition Audio Controller + 3d06 Arise-GT-10C0t + 3d07 Arise2030 + 3d08 Arise2020 + 3d40 GLF HDMI/DP Audio + 3d41 GLF HDMI/DP Audio + 3d43 GLF HDMI/DP Audio 6899 ZT Systems # nee Qumranet 6900 Red Hat, Inc. +6903 TBS Technologies (wrong ID) +6909 TBS Technologies (wrong ID) +6910 TBS Technologies (wrong ID) 7063 pcHDTV 2000 HD-2000 3000 HD-3000 @@ -29010,6 +29220,7 @@ 1bd4 0058 Ethernet Network Adapter E810-XXVAM2 for OCP 3.0 1bd4 006e Ethernet Network Adapter E810-XXVAM2 for BD 1bd4 0083 Ethernet Network Adapter E810-XXVAM2 for lldp + 1bd4 00a0 S252IE810 1eec 0102 VSE-225-41E Dual-port 10Gb/25Gb Etherent PCIe 8086 0001 Ethernet 25G 2P E810-XXV OCP 8086 0002 Ethernet 25G 2P E810-XXV Adapter @@ -29181,8 +29392,10 @@ 188b Ethernet Connection E823-C for QSFP 188c Ethernet Connection E823-C for SFP 1028 0abd Ethernet Connection 25G 4P E823-C LOM + 17aa 405e E823 25G/10G Ethernet LOM Controller 188d Ethernet Connection E823-C/X557-AT 10GBASE-T 188e Ethernet Connection E823-C 1GbE + 17aa 405f E823 1G Ethernet LOM Controller 1890 Ethernet Connection E822-C for backplane 1891 Ethernet Connection E822-C for QSFP 1892 Ethernet Connection E822-C for SFP @@ -33629,7 +33842,7 @@ 46a0 AlderLake-P GT2 46a1 UHD Graphics 46a3 Alder Lake-P GT1 [UHD Graphics] - 46a6 Alder Lake-P Integrated Graphics Controller + 46a6 Alder Lake-P GT2 [Iris Xe Graphics] 46a8 Alder Lake-UP3 GT2 [Iris Xe Graphics] 46aa Alder Lake-UP4 GT2 [Iris Xe Graphics] 46b0 AlderLake-P [Iris Xe Graphics] @@ -33750,7 +33963,9 @@ 51a9 Alder Lake PCH UART #1 51aa Alder Lake SPI Controller 51ab Alder Lake SPI Controller + 51b0 Alder Lake PCI Express Root Port #9 51b1 Alder Lake PCI Express x1 Root Port #10 + 51bb Alder Lake-P PCH PCIe Root Port #4 51bf Alder Lake PCH-P PCI Express Root Port #9 51c5 Alder Lake-P Serial IO I2C Controller #0 51c6 Alder Lake-P Serial IO I2C Controller #1 @@ -34229,7 +34444,7 @@ 7d0b Volume Management Device NVMe RAID Controller Intel Corporation 7d40 Meteor Lake-M [Intel Graphics] 7d45 Meteor Lake-P [Intel Graphics] - 7d55 Meteor Lake-P [Intel Graphics] + 7d55 Meteor Lake-P [Intel Arc Graphics] 7d60 Meteor Lake-M [Intel Graphics] 7dd5 Meteor Lake-P [Intel Graphics] 7e01 Meteor Lake-P LPC/eSPI Controller @@ -35294,12 +35509,18 @@ a3eb Comet Lake PCI Express Root Port #21 a3f0 Comet Lake PCH-V cAVS a620 6400/6402 Advanced Memory Buffer (AMB) + a707 Raptor Lake-P/U 4p+8e cores Host Bridge/DRAM Controller a708 Raptor Lake-P/U 2p+8e cores Host Bridge/DRAM Controller a71d Raptor Lake Dynamic Platform and Thermal Framework Processor Participant + a71e Raptor Lake-P Thunderbolt 4 USB Controller a720 Raptor Lake-P [UHD Graphics] a721 Raptor Lake-P [UHD Graphics] + a72f Raptor Lake-P Thunderbolt 4 PCI Express Root Port #2 + a73e Raptor Lake-P Thunderbolt 4 NHI #0 a74d Raptor Lake PCIe 4.0 Graphics Port a74f GNA Scoring Accelerator module + a76d Raptor Lake-P Thunderbolt 4 NHI #1 + a76e Raptor Lake-P Thunderbolt 4 PCI Express Root Port #0 a77d Raptor Lake Crashlog and Telemetry a77f Volume Management Device NVMe RAID Controller Intel Corporation a780 Raptor Lake-S GT1 [UHD Graphics 770] @@ -35314,6 +35535,10 @@ a7a1 Raptor Lake-P [Iris Xe Graphics] a7a8 Raptor Lake-P [UHD Graphics] a7a9 Raptor Lake-P [UHD Graphics] + a7aa Raptor Lake-P [Intel Graphics] + a7ab Raptor Lake-P [Intel Graphics] + a7ac Raptor Lake-U [Intel Graphics] + a7ad Raptor Lake-U [Intel Graphics] abc0 Omni-Path Fabric Switch Silicon 100 Series ad0b Volume Management Device NVMe RAID Controller Intel Corporation b152 21152 PCI-to-PCI Bridge @@ -35439,12 +35664,16 @@ # Wuxi Micro Innovation Integrated Circuit Design Co.,Ltd. 8848 MUCSE *** 42 LINES SKIPPED *** From nobody Mon Dec 4 10:39:34 2023 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 4SkKsy6b1Mz53CvV; Mon, 4 Dec 2023 10:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKsy5pzcz4RgF; Mon, 4 Dec 2023 10:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0Zvw0eDTVWHYj4RIQrEs/QDqyIuEDBd4IRfd6xFrGY=; b=QobtVoMcwq6b0Uf4r6WwDPy+knQ9BxT70i0asQ49YTOkk7EsrwvYdEW8bwT+ArszMdXcyS zQmBtjgDzBlDY9R1luh2bWyEZ/IdeB6fQFOmGRLN/+0ogO7Tupf4H6QM8+l1mVADDz5Ng/ cG9OEMCdxOUh890nsf7pTyFa74FmK4g99tZMg0qX/cF2mDgVdnU14kgcrqr5KkiY7jIj2D vYgj69aZPV1B6NnREndZRK2JGKW7u4zqajJ42cswUynI6EFfptGEzIQg/emJsIRIy5c+v9 vvULzeMJFqQu5yY2ns7HzX9FzFFFYp6aU8rNxWcYvL+y4mQVzrB88kvZ7GRS4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0Zvw0eDTVWHYj4RIQrEs/QDqyIuEDBd4IRfd6xFrGY=; b=PlIuUnBPQlvaMNyp91EJWy41MxomHpoGn7Q/ZlcLzBo0g4hnuib9N71E+5jubMSSVCvM6i peujiQjulmc83CnhkkzAYr9Un7otwPQLoWRmxoUs71KBhkK+EpO5ui5NDa0VpFjT3+V0R6 rYy44zDJncqbCgSVV7XbYPu7WZ0YzFHWMDwHcCrxuXCC8kufQC2xiVSbQM0b8GRKaBUixU 3F8W+hKL1XTle/3GoeHctaqePDduWrW2UUqpjeLjHXSqI+/w00CwKXsIdMlABVV9nOtw3r t91+d0COyOuChmp8fxlNgJ1tbr9Q3waCAwSL6piG+YLIsXtUJoHX19eUsL/mmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686374; a=rsa-sha256; cv=none; b=eZDhfFL0Dwa/X5NigLtAQ9QP9UNUCTPoMI0JHGqO2nPCRAy7ekhH4o3wM7K2OtNwaKHdnF uajIpIMKxEaJbNtJfmGOTrbnJZ89wrNk3dJyTU1HqaFyzj1Tp6KPXxYnWjtIPDAJT9h+dY PqTky9fgPj+VuJvzaded3FzaRDcoX4J0YpwHD7YF68q1XeU+qAoUlpF3dZsMty4FXVAPIW l8OmeT8l0Hi0WCTmd9s7aEdcBfj7vHpFXRZ4ImbSB9bS5sdv/K2JwO33QcEPsIVF1RmVdt X4FjGNwM8lZQ09iYJA+ksOnsgpNBTBfIk5DcB3Dc08SMqK0g45sx2BYP9avEwg== 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 4SkKsy4mVbz7ps; Mon, 4 Dec 2023 10:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AdYTb010095; Mon, 4 Dec 2023 10:39:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AdYpi010092; Mon, 4 Dec 2023 10:39:34 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:34 GMT Message-Id: <202312041039.3B4AdYpi010092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 0a586dc5ed04 - stable/13 - pkgbase: compress packages with zstandard List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0a586dc5ed04acb51d9ec4fd89544335737f16c0 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0a586dc5ed04acb51d9ec4fd89544335737f16c0 commit 0a586dc5ed04acb51d9ec4fd89544335737f16c0 Author: Baptiste Daroussin AuthorDate: 2023-10-26 20:34:00 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:37:51 +0000 pkgbase: compress packages with zstandard MFC After: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42375 (cherry picked from commit 820fbcf25bb2c7f1c570c0d408b2ab7d05bd771c) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d648be2f3064..5b2876ea2b45 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1893,7 +1893,7 @@ PORTSDIR?= /usr/ports WSTAGEDIR?= ${OBJTOP}/worldstage KSTAGEDIR?= ${OBJTOP}/kernelstage REPODIR?= ${OBJROOT}repo -PKG_FORMAT?= txz +PKG_FORMAT?= tzst PKG_REPO_SIGNING_KEY?= # empty PKG_OUTPUT_DIR?= ${PKG_VERSION} From nobody Mon Dec 4 10:39:35 2023 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 4SkKt036lrz53CvW; Mon, 4 Dec 2023 10:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKsz6T9Wz4Rtl; Mon, 4 Dec 2023 10:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/9O0+gDy8FntjiZtTUPWBMKu8FERNGPWnRJwFcpKuYM=; b=v3OpcGN3j1EEZeKrMTh16u29RpSzNjYLiCzevXA2KzTEgWj3Bztj43/s/6+8oZUirCSJne 9a3+btvtfKoXZem+9sYcn0i+h49cbqxRzfaD6AzsilQhzMLR08PqaFdfhmakPZEOY+/RGm agqTyQV33A0FYDzAq1bWd7zPGjauhxuya4Now7wLLPH05y4ETTJimS2hMWGXemMKAls7LU rqfCMiQNQfueHT6mNtDm0e6RT6LYwX99evQLCMIN3cV96qV6vduzSkaNHi28DFsBMZwUTC fZGh+MTW/H4uIr4N9WEhYf74+/HXN2hVTy+/cewIovebtjJ5+xJRU9uFswbvXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/9O0+gDy8FntjiZtTUPWBMKu8FERNGPWnRJwFcpKuYM=; b=MCXeXN/Qh4u/1PYdvnCFRO9dF2sGDE6XBv1YjcFf44cmJj1I8msCjxpSosxaMG4InNrorv QCX3ufkWpkChZzQuBVdNSswST+U9HLNDpWZ7hEUK2B77E+SBeEQcFCbzvdv0rtmBSclYYo VV3g75EpAduThb3oUDOdjMN65CxPX5Xo8VwVBieQqm1F5fin9PnNSYjllGpBaijtVYpUBu 6acfgW15ZP8NtTdD4zQzZjl0IVfUZvqNfeBzHvpXqUxMmYf//YRiuYAkNsyl6ggh9jesbW REw9xZc9Iiz29wK89Z5z/ukK5+kqG2Uv0eWDDT7PXw1pISgdtCfyDm201YSL3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686375; a=rsa-sha256; cv=none; b=OAUMcrjPvuXf0Kl/pVb3wJKFk99UlnivM7A10o+tGfF1NA3sOL+VozPJ5Qo0ERbEdVbOCr QrdVb/nNa8nsaz+RD7tECbxpPkbw/aRZLjOv+sXS1Q4iWU41GZFqD58luS3OsY8n/4Z1LX MHvTYiqhQtGNPJmvO4LuU/T+nPjiGbnlKine6PWeCSOwoqYKqc0QQrjjFmcChI+wuR88R4 bntxiTmXYIySnaUtY0PGxjxTyv2szUYn0Bim0W9c27X/FDfkmlXf6OpiLZbSy8NxY5aRXH qTAeqJfTiWLAgL+Zxz4Rx0JXu1jT9ISy0mLuwMV9rUQICoUMhQXP5L3iomy7Zg== 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 4SkKsz5YkCz7b7; Mon, 4 Dec 2023 10:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AdZOD010155; Mon, 4 Dec 2023 10:39:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AdZbo010152; Mon, 4 Dec 2023 10:39:35 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:35 GMT Message-Id: <202312041039.3B4AdZbo010152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 8bc5e4f54b40 - stable/13 - pkgbase: set a default set of kernel for when PACKAGE_BUILDING=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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8bc5e4f54b40d2be2900bb1a6c3640b803882ab1 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8bc5e4f54b40d2be2900bb1a6c3640b803882ab1 commit 8bc5e4f54b40d2be2900bb1a6c3640b803882ab1 Author: Baptiste Daroussin AuthorDate: 2023-11-02 13:20:11 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:38:05 +0000 pkgbase: set a default set of kernel for when PACKAGE_BUILDING=1 PACKAGE_BUILDING is already known in the ports tree as a variable use to defined when the packages is being actually built in an automation process, reuse that variable to define the default set of kernel we plan to build for the default pkgbase. Reviewed by: manu, jrtc27 Accepted by: manu MFC After: 1 week Differential Revision: https://reviews.freebsd.org/D42444 (cherry picked from commit df6e7e11c5f660cbd5381819718e3c947325fa2e) --- Makefile.inc1 | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 5b2876ea2b45..ccd65be4402f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1628,15 +1628,10 @@ NO_KERNELOBJ= t KERNCONF=${KERNFAST} .endif .endif -.if ${TARGET_ARCH} == "powerpc64" -KERNCONF?= GENERIC64 -.elif ${TARGET_ARCH} == "powerpc64le" -KERNCONF?= GENERIC64LE -.elif ${TARGET_ARCH} == "powerpcspe" -KERNCONF?= MPC85XXSPE -.else -KERNCONF?= GENERIC -.endif +GENERIC_KERNCONF_SUFX_powerpc64= 64 +GENERIC_KERNCONF_SUFX_powerpc64le= 64LE +GENERIC_KERNCONF_powerpcspe= MPC85XXSPE +GENERIC_KERNCONF?= ${GENERIC_KERNCONF_${TARGET_ARCH}:UGENERIC${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}}} INSTKERNNAME?= kernel KERNSRCDIR?= ${.CURDIR}/sys @@ -1644,6 +1639,23 @@ KRNLCONFDIR= ${KERNSRCDIR}/${TARGET}/conf KRNLOBJDIR= ${OBJTOP}${KERNSRCDIR:C,^${.CURDIR},,} KERNCONFDIR?= ${KRNLCONFDIR} +.for _k in ${GENERIC_KERNCONF} MINIMAL${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}} ${GENERIC_KERNCONF}-MMCCAM +.if exists(${KERNCONFDIR}/${_k}) +PKG_KERNCONF+= ${_k} +.for _dbg in NODEBUG DEBUG +.if exists(${KERNCONFDIR}/${_k}-${_dbg}) +PKG_KERNCONF+= ${_k}-${_dbg} +.endif +.endfor +.endif +.endfor + +.if defined(PACKAGE_BUILDING) +KERNCONF?= ${PKG_KERNCONF} +.else +KERNCONF?= ${GENERIC_KERNCONF} +.endif + BUILDKERNELS= INSTALLKERNEL= .if defined(NO_INSTALLKERNEL) From nobody Mon Dec 4 10:39:36 2023 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 4SkKt10VT9z53CjQ; Mon, 4 Dec 2023 10:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKt073Jlz4S5B; Mon, 4 Dec 2023 10:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dkM3MaMJWPCSPiGAkr5P7dDQk5J7cO3wGFE9NJCVFmI=; b=tXvnZSYWYhMNofTwlbv/VUawdtYq0AI0xDzpb5wMUZbaQNO/nnn5we7rQOzcv67dVAMK8O pMGalCwazlTM9Fx1Z3HDfGtquAnxM6OuTVglnegzTX+V1UfybLYCXkuIhyYIlN6Ar9z8/X gM9VlTXBD9BC3DNpN96APcQyZJJpqiz86S90XQCCItD6WVrPNT5al7FjSt5wSNO/Gczg/S X2YmsHCMx3+UTCmc57JoTov2vG2nc33j68FHK/N3S4tyt9Iefe8prHPvEqNcw3LmbIUyTy U0PqzNiJ/8P+XnBir2le/qBfl3ISxm0+fOv8mljhIte8rithgotiwtOkEwBMew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dkM3MaMJWPCSPiGAkr5P7dDQk5J7cO3wGFE9NJCVFmI=; b=bso6EstSuyt1F3U+y7ThnmahkslU9EYnn2VsVG7WtelQkmBw3Evf6RZzpoCs1UpUwXRI5O MB/I7hSu/w64J0f3iPfCGFfG6nAcabBIY+3R65xpJA87m5m34+/3t48THWXLFcwCPaBzbi Aal5xOxYw4FvhaHTdoUYuSK9o7rlGVQgh8zBBEce4M1QlnbdKy38C5ND+DRYF7nfCjdVck Ze1BtK+wiUI9jHAwaETsIxaJ/d2NbYSBzTp6krYLUSEf76SLbGzgCYSJIK9aBoJtJdNpSg 7Y5Y63T8FlWibKkrfj/StcZlleu4qtjMfPEFQ5ItERa26d0saJU0WOZuutRlMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686377; a=rsa-sha256; cv=none; b=KZNqaPgWApMgnHrI0fhxuYJUI5VkTei8w5bGbA77iLM4KhnBrw7A1AdkZkP2DeGOmtlM7H Pl4WSwod2nC+hN8vys7mAKfT9c6Uk//O+tcah0oML0HKHU7wtigJzXEkXvPy3W8CaXjmmx daRVULe3d3jazlyrp/Fy42vLSqQuxOEzb02NX/dES6WcPT28OQL2Xs+uvggX/6mxmxiXzb DQMBYY+bs9G2u5kMcgLQkWFULuSvQlqk21Ezr0doqWGnY4F2SbQE5EIKLi9hRmhTfrdsBi hH+4iXrW+vNcmFgpT1fZDGmf7bKpFN5V7J/w+9EiUmZe7AV09JGZosoALGSIkg== 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 4SkKt068LWz7mk; Mon, 4 Dec 2023 10:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4Adafh010198; Mon, 4 Dec 2023 10:39:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AdaU2010195; Mon, 4 Dec 2023 10:39:36 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:36 GMT Message-Id: <202312041039.3B4AdaU2010195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ee89da102bf0 - stable/13 - pkgbase: force OSVERSION List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ee89da102bf020a2289d5b5e618c421098cba1b9 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ee89da102bf020a2289d5b5e618c421098cba1b9 commit ee89da102bf020a2289d5b5e618c421098cba1b9 Author: Baptiste Daroussin AuthorDate: 2023-11-03 08:29:23 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:38:33 +0000 pkgbase: force OSVERSION This is used to the package annotation helping pkg to know about backward compatibility is set to the version of the packages not the version of the host building the packages (cherry picked from commit 188fe88ec50eac7c10e1d8350bf1180f8c16e463) --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index ccd65be4402f..ba842b7769a6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2139,6 +2139,7 @@ sign-packages: _pkgbootstrap .PHONY @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest" ] && \ unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest ; \ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname repo \ + -o OSVERSION="${OSRELDATE}" \ -m ${WSTAGEDIR}/meta \ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ From nobody Mon Dec 4 10:39:37 2023 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 4SkKt21NkNz53CrT; Mon, 4 Dec 2023 10:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKt20pd2z4RvX; Mon, 4 Dec 2023 10:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UHka3IO3K5gRXJMJ42LoXhn5bOBGeB3LsmXuQFJnLGU=; b=jeoePDLVr6HfMMuh7qXned//m5oZrfaqveYq9aFLMTDDBRx8Jb1QGgO9NbDw5gVg3sAFMe yEw2MCBUdk1+skxFErsNVVf9dCIapv8N1RL1lnGzuCvzu1M9RKzx8xGio3KpxBDdBCslt3 L3jBqXgr7sb/wvrkxhyT6QPFPFutFgPr1ahOch3N5Sh6j0A5uM7PSbjERX2IgiwNClfb3y rfhl51HmjVHtaHJBmKA2hvigYvTqhH0+Y4KK0mr7KlYUWyKKyDrMvmUsx+Ig9iFl3rGQt+ z6J0w/dIeC2FUHf/P3RUIm3z+R1Zv6BAaPhiW0zs1ioeWZQcD9NGBwm2Q9zutQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UHka3IO3K5gRXJMJ42LoXhn5bOBGeB3LsmXuQFJnLGU=; b=dGcDnZ6rqV6EgGIWIeqIU7vieOKS7DUJYsh6VCv5NnBiGk+70IMcTedo3Wd863TQOivVZC lUgehOYcieCcTBt3E9iV5k8GvehLn/aMkWp4YmfH0nVIjyNcSKweFy9/Jysx6S7p1+tTis NbxQMWelPzf9FaHouRMwo3dSgUTUOOTckK8iLLZFRxfc0DURU9Q6DjLkj10Tdb2w9hdx7t aC9aKX+uPK3uvX3Hj9k/LxjWl6P7XMngEDvBbUpTIcvhiLKh0fH+Scog3PxueXLfmU//iB r8+eHjmhACq6hMhz8KHmG8bPuHE9oUwP7OXHL8xTcbiSGFjzrx4Vzv9T3dBOiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686378; a=rsa-sha256; cv=none; b=t/3gVCFMB3lQk2BcJ63gPgtSxKQ5esND/0Xmqz/9cw0uq03GutEn0EqsZ1QGliumM3EcI4 Iuja+fIWULweb5b1+kDVgK1lcCyo7Jp6IaUBQrtbivyaqeOBqnMK80TTliTeIvY2PGFw5F QNDTiXjBV7+/U3G1q9FQSP80yAoAbuMLaIsk1aIvxHK+sTM1vxk1N5k1/ytXUeU/aF/jZ5 3B8nCHvBtTZudbLbyAXN46CtUzmrMaEyJJ5nd6Z/OA9d8niWq41mkEpUIOya/SaHEfnssy AsMlkJuwDXrGGt/LQQ3ulc5t6nXe1zZBYKPs4+qGRfdM9e3/JQ0gAdcmIjo2TA== 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 4SkKt1703Xz7pt; Mon, 4 Dec 2023 10:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AdbWe010255; Mon, 4 Dec 2023 10:39:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AdbAj010252; Mon, 4 Dec 2023 10:39:37 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:37 GMT Message-Id: <202312041039.3B4AdbAj010252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ff38a8c780d0 - stable/13 - pkgbase: create package with SRCRELDATE not OSRELDATE as OSVERSION List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ff38a8c780d0fb16d1973f80211b268c5e2d2751 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ff38a8c780d0fb16d1973f80211b268c5e2d2751 commit ff38a8c780d0fb16d1973f80211b268c5e2d2751 Author: Baptiste Daroussin AuthorDate: 2023-11-14 07:41:47 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:38:33 +0000 pkgbase: create package with SRCRELDATE not OSRELDATE as OSVERSION In 188fe88ec50eac7c10e1d8350bf1180f8c16e463 OSVERSION has been set to OSRELDATE which is the RELDATE of the building OS while we wanted to use SRCRELDATE which is the RELDATE of the target system (cherry picked from commit 051d69d6f8b51dc1d7bba58af99be76185312222) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ba842b7769a6..423c5924d39c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2139,7 +2139,7 @@ sign-packages: _pkgbootstrap .PHONY @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest" ] && \ unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest ; \ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname repo \ - -o OSVERSION="${OSRELDATE}" \ + -o OSVERSION="${SRCRELDATE}" \ -m ${WSTAGEDIR}/meta \ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ From nobody Mon Dec 4 10:39:39 2023 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 4SkKt33PmGz53CrX; Mon, 4 Dec 2023 10:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKt32fM7z4S2J; Mon, 4 Dec 2023 10:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MwKcHwlQ7lCMioJyp/vGstBigVg0BTZFd5c2JAsqngc=; b=dG9FdJGiuHUmda4uwmvXmG+XSEeZU8KQPjZOjwgeLH3FAuWI/1P/E99cuGy2eO39rMBzEL QPZayb4KaVHpH1JOB12z8CcHe3tzGqKQ7gmszLcWUvsdPbmXocGuo0g01Uf8CyKhbrqL6M 22c8JJK2H7ROrW4AGmSHkV3vTRh9RDLbLAFpSRLrmHOXLqWSFn9Ohg7OGuCQEnWZrX7scD NtPzz5ajyRyNzTZfRO2qQAZ4uaxMAK4zjlMrl/pZ36gWO9Yhxt9X9nLAXerTz1NwADjxvW nUgu63bN0ZvhvWHXQ2kDjDVWJbFaklExICxGGo3zMdMeR2TguWa8zJxV44lWBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MwKcHwlQ7lCMioJyp/vGstBigVg0BTZFd5c2JAsqngc=; b=yKg8yg+iqYub4yCMVMdJhMabthZNDpZmaZmywdktH5TorVzEcLr50uYeOeDVOAhdyF46X6 VXvfCgP5D4FeKvDCQsIvo4EO2br5ueUBaTLWw2kHt5r8H0+BDyC8phvBlGnOSahEzsh80m 6iuaeGqvH3JUGsaXW7c13de2XarfSsAlYVyEs8K3ag9LnbXiALN1c0vvrHDjt/5o6Sdwc6 MkADl2gU9IlV3+mh6xkRS0e9mqyAlULjicAOm8vCtRsEUX+BtsXAeWcHjFL/qWICwHcvGs 2WRtHvsil2Yc+RqWr1pBhYX8WbkFDtPTVTcMOLSRcLdh89c06UyZr12rcO7ueg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686379; a=rsa-sha256; cv=none; b=S+58FoQwEDp5QwZS8jBJ0nfG0+pF8/B/ErLpIwIMOHo0bgpyLpwBrxP94ExlaF6Cwy8bsi jBBcit+qSJOCEIoc1j29aI3H0CxPzzDG3tDwTeROlKcOF62kJUJc4QWnlnEBPTUEjmoYfV yssn63LEjxtRMsW6dHJJf+lPhLRG2LOIvfWkL7RKwqUM9rdzSOo34bV8u/gDdWGjFufwHz q1M1U+arfHrYDNLrJEAbLg3iLuIKk2xipTvdaaKMJWOJk8sKvpLzx1WuFFuqt91F81ClZT 7qRDO72fLOB69JAz6uqvDROzkxPnQHewUBdr2Q95hNfIW0tRhby1ASqj6HOREA== 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 4SkKt318ypz80G; Mon, 4 Dec 2023 10:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AddBS010315; Mon, 4 Dec 2023 10:39:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4Addwm010312; Mon, 4 Dec 2023 10:39:39 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:39 GMT Message-Id: <202312041039.3B4Addwm010312@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 7b68016c7678 - stable/13 - pkgbase: set the prefix of debug files and macros to /usr/src List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7b68016c7678db478cb8ac7a15fa821c0231fccc Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7b68016c7678db478cb8ac7a15fa821c0231fccc commit 7b68016c7678db478cb8ac7a15fa821c0231fccc Author: Baptiste Daroussin AuthorDate: 2023-11-13 17:18:58 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:39:16 +0000 pkgbase: set the prefix of debug files and macros to /usr/src When the macro PACKAGE_BUILDING is set, then consider we are building package for pkgbase, this has already been used in Makefile.inc1 and reuse the PACKAGE_BUILDING macros already used for that purpose in the ports tree In the future this should be tied to REPRODUCIBLE_BUILD MFC After: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42569 (cherry picked from commit 030af1b62d7b9a86f5ecdceff5a1fa23e9570be1) --- share/mk/src.sys.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index edf369638d9d..d5c2af0c559d 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -38,6 +38,9 @@ __postrcconf_${var}:= ${MK_${var}:U-}${WITHOUT_${var}:Uno:Dyes}${WITH_${var}:Uno # default over to -fno-common, making this redundant. CFCOMMONFLAG?= -fno-common CFLAGS+= ${CFCOMMONFLAG} +.if defined(PACKAGE_BUILDING) +CFLAGS+= -fmacro-prefix-map=${SRCTOP}=/usr/src -fdebug-prefix-map=${SRCTOP}=/usr/src +.endif DEFAULTWARNS= 6 From nobody Mon Dec 4 10:52:04 2023 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 4SkL8P1t7Dz53DhQ; Mon, 4 Dec 2023 10:52: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkL8P1fNbz4Tr3; Mon, 4 Dec 2023 10:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701687125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WMEnRbh7G8FjyvneC4jfchkScJ94YnXaRGPc0+nlU74=; b=XQYmu8U4nl2C/5MmXOUMzG1wNyUMLuH4viW8CIpg1DslbUzbOtqlvGvbDtEtoOgJmdeQYA 88We1lemQP3ZTt2wFfUGIFtkTzDhrMLp+9i5LEZ4ZrjSi5zsyGLY/Os6ucaZMqJ2IDgoFk 4yazXl0Sez12cSL1gxUoj9LxUUHmkIp2SuZKDqhx/phdvPmkptNz9YcCcX78SzArfmCH7s /v4jHnF55h6FpnArRgxlO9NyJIlVdFwEkmP0BmMvc523h9stu9LBu6+OsRX9Zn/H6ZFlfB T7WFed7yX0JLOCavIQr42m816z3mvcPuEe96z2BOWZ1+Z5K4Byz4a3F0Qk6jxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701687125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WMEnRbh7G8FjyvneC4jfchkScJ94YnXaRGPc0+nlU74=; b=U6JQrkT5n9WYkEdXEU8zY2jRkQGwkyxx9oM6IbxdQ9kXcja7FQMQ3Vn1mAlB9PVk+bmABu Y6LJmBwGZNUkngDw4rEkx2NSbu3zvh6RYHRw8EQN9xFNeUKfJkXk0O7irhcYRMGx4kqabG XzW5y4wGauqraD/16fot2w+CTogZsv1OilNLaoGNADmIaRRhPGuiV3AiN1XdXZ/3JAo6VB Q76Nj8M4oii8bRBU5k2jIWqZHnxUAS+VGOqdhOQHu+WQF23Kvk97OsZ5Rd9uls9lhJHXj/ 8PQJgiLHRHR+nINx63OOPKnxxi99xG5E8kjcbCFGktkB6ph9DwAxG7OMaBnPbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701687125; a=rsa-sha256; cv=none; b=C1zUl8L9cJLpzWGBlz8MwmqIJ5wKny20RCVHrOxH28sx/4Z1/2aKLCJ3sPoj3U+U9bK0dc rnKaK2/BTcQb1aWGdHk64sW6cA4d+FiL566ZNLhSpIPq3AKsLo0JrOVuG+8Hm0+IU6C2R+ gpEb7PsVtyw+ZjQAE/GH2NHZNJSabp0lqjLruu3CUBd1zvObWCPYUEbbGoZ8rNiBzuuBi4 jDO1zAQyv19TeoPn6cnYKGtKijYOF7PLbWv1+KF6KgjkHuV/O6dbx4ykKEhVxOsiI4EG1e nwNoNiqkVFGxe9v6eXFdP79oYRe4Ut2HkNg3z/VLhGt4O0+ayVtlXqrab2/lSw== 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 4SkL8P0jgxz8Fr; Mon, 4 Dec 2023 10:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4Aq5w5042548; Mon, 4 Dec 2023 10:52:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4Aq4ZE042545; Mon, 4 Dec 2023 10:52:04 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:52:04 GMT Message-Id: <202312041052.3B4Aq4ZE042545@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 01e286b54190 - main - pci_vendors: update to 2023-11-11 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01e286b54190620ceec85ef865a51eb79b5d81c0 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=01e286b54190620ceec85ef865a51eb79b5d81c0 commit 01e286b54190620ceec85ef865a51eb79b5d81c0 Author: Baptiste Daroussin AuthorDate: 2023-12-04 10:51:59 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:51:59 +0000 pci_vendors: update to 2023-11-11 --- share/misc/pci_vendors | 580 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 500 insertions(+), 80 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index 50115d979327..bad1d0bd066b 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.09.22 -# Date: 2023-09-22 03:15:02 +# Version: 2023.11.11 +# Date: 2023-11-11 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -90,8 +90,8 @@ 025e d819 NVMe DC SSD E3.S 7.5mm [D5-P5336] 025e d81d NVMe DC SSD E1.L 9.5mm [D5-P5336] 0b70 NVMe DC SSD [Yorktown controller] - f1ab P41 Plus NVMe SSD (DRAM-less) - f1ac P44 Pro NVMe SSD + f1ab P41 Plus NVMe SSD (DRAM-less) [Echo Harbor] + f1ac P44 Pro NVMe SSD [Hollywood Beach] 0270 Hauppauge computer works Inc. (Wrong ID) 0291 Davicom Semiconductor, Inc. (Wrong ID) # SpeedStream is Efficient Networks, Inc, a Siemens Company @@ -773,6 +773,9 @@ 1028 2142 HBA465e Adapter 1028 2209 HBA465i Adapter 1028 220a HBA465i Front + 1028 22cb PERC H365i Front + 1028 22cc PERC H965i Front + 1028 22cd HBA465i Front 15d9 1d03 AOC-S4116L-H16IR (16DD/96DD) RAID Adapter 15d9 1d07 AOC-S4016L-L16IT Storage Adapter 15d9 1d08 AOC-S4016L-L16IR Storage Adapter @@ -816,6 +819,8 @@ 1000 5021 eHBA 9700W-16i 24G SAS/PCIe Storage Adapter # 9700 16 external port Storage controller 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter + 1028 22d2 PERC H975i Front + 1028 22d3 PERC H975i Adapter 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00bf SAS3404 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) 00c0 SAS3324 PCI-Express Fusion-MPT SAS-3 @@ -1055,6 +1060,7 @@ 1d49 0700 ThinkSystem M.2 RAID B540i-2i SATA/NVMe Enablement Kit 1d49 0701 ThinkSystem 7mm RAID B540p-2HS SATA/NVMe Enablement Kit 1d49 0702 ThinkSystem M.2 RAID B540p-2HS SATA/NVMe Enablement Kit + 1d49 0703 ThinkSystem M.2 RAID B540d-2HS SATA/NVMe Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1201,7 +1207,7 @@ 103c 8b17 ProBook 445 G9/455 G9 [Ryzen 7 Integrated Radeon GPU] 15ff Fenghuang [Zhongshan Subor Z+] 1607 Arden - 1636 Renoir + 1636 Renoir [Radeon RX Vega 6 (Ryzen 4000/5000 Mobile Series)] 1637 Renoir Radeon High Definition Audio Controller 1638 Cezanne [Radeon Vega Series / Radeon Vega Mobile Series] 1043 16c2 Radeon Vega 8 @@ -1215,6 +1221,8 @@ 1681 Rembrandt [Radeon 680M] 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] 103c 168b ProBook 4535s + 1900 Phoenix3 + 1901 Phoenix4 3150 RV380/M24 [Mobility Radeon X600] 103c 0934 nx8220 3151 RV380 GL [FireMV 2400] @@ -3944,6 +3952,7 @@ 1849 5236 RX 6650 XT Challenger D OC 73f0 Navi 33 [Radeon RX 7600M XT] 73ff Navi 23 [Radeon RX 6600/6600 XT/6600M] + 1462 5021 MSI RX 6600XT MECH 2X 1462 5022 RX 6600 MECH 2X 148c 2412 PowerColor Red Devil RX 6600 XT 1849 5218 Radeon RX 6600 Challenger ITX 8GB @@ -3960,6 +3969,7 @@ 7446 Navi 31 USB 7448 Navi 31 [Radeon Pro W7900] 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] + 1002 0e3b RX 7900 GRE [XFX] 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] @@ -4815,6 +4825,7 @@ 1014 04fb PCIe3 x16 20GB Cache 12Gb Quad SAS RAID+ Adapter(580B) 1014 04fc PCIe3 x8 12Gb Quad SAS RAID+ Adapter(580A) 04ed Internal Shared Memory (ISM) virtual PCI device + 0611 4769 Cryptographic Adapter 3022 QLA3022 Network Adapter 4022 QLA3022 Network Adapter ffff MPIC-2 interrupt controller @@ -5281,7 +5292,7 @@ 1646 VanGogh IOMMU 1647 VanGogh PCIe GPP Bridge 1648 VanGogh Internal PCIe GPP Bridge to Bus - 1649 VanGogh PSP/CCP + 1649 Family 19h PSP/CCP 164f Milan IOMMU 1650 Milan Data Fabric; Function 0 1651 Milan Data Fabric; Function 1 @@ -8439,6 +8450,7 @@ 764d PXI-2521 764e PXI-2522 764f PXI-2523 + 7652 PXIe-4080 7654 PXI-2796 7655 PXI-2797 7656 PXI-2798 @@ -8453,7 +8465,14 @@ 76a3 PXIe-6535B 76a4 PXIe-6536B 76a5 PXIe-6537B + 76d8 PXIe-4081 + 76d9 PXIe-4082 + 77a8 PXIe-6375 783e PXI-8368 + 7882 PXIe-6376 + 7883 PXIe-6378 + 799e PXIe-6386 + 799f PXIe-6396 9020 PXI-2501 9030 PXI-2503 9040 PXI-2527 @@ -8748,6 +8767,8 @@ 13e9 0070 Win/TV (Video Section) 036e Bt878 Video Capture 0000 0001 Euresys Picolo PCIe + 0000 0002 Euresys PICOLO Pro 2 + 0000 0004 Euresys PICOLO Pro 3E 0070 13eb WinTV Series 0070 ff01 Viewcast Osprey 200 0071 0101 DigiTV PCI @@ -8768,6 +8789,23 @@ 14f1 0002 Bt878 Mediastream Controller PAL BG 14f1 0003 Bt878a Mediastream Controller PAL BG 14f1 0048 Bt878/832 Mediastream Controller + 1805 0101 Euresys PICOLO Tetra + 1805 0102 Euresys PICOLO Tetra + 1805 0103 Euresys PICOLO Tetra + 1805 0104 Euresys PICOLO Tetra + 1805 0105 Euresys PICOLO Tetra + 1805 0106 Euresys PICOLO Tetra + 1805 0107 Euresys PICOLO Tetra + 1805 0108 Euresys PICOLO Tetra + 1805 0201 Euresys PICOLO Tetra-X + 1805 0202 Euresys PICOLO Tetra-X + 1805 0203 Euresys PICOLO Tetra-X + 1805 0204 Euresys PICOLO Tetra-X + 1805 0401 Euresys PICOLO Tymo + 1805 0402 Euresys PICOLO Tymo + 1805 0403 Euresys PICOLO Tymo + 1805 0404 Euresys PICOLO Tymo + 1805 1001 Euresys PICOLO Junior 4 1822 0001 VisionPlus DVB card 1851 1850 FlyVideo'98 - Video 1851 1851 FlyVideo II @@ -8843,6 +8881,8 @@ 1852 1852 FlyVideo'98 (with FM Tuner) 0878 Bt878 Audio Capture 0000 0001 Euresys Picolo PCIe + 0000 0002 Euresys PICOLO Pro 2 (Audio Section) + 0000 0004 Euresys PICOLO Pro 3E (Audio Section) 0070 13eb WinTV Series 0070 ff01 Viewcast Osprey 200 0071 0101 DigiTV PCI @@ -8865,6 +8905,23 @@ 14f1 0002 Bt878 Video Capture (Audio Section) 14f1 0003 Bt878 Video Capture (Audio Section) 14f1 0048 Bt878 Video Capture (Audio Section) + 1805 0101 Euresys PICOLO Tetra (Audio Section) + 1805 0102 Euresys PICOLO Tetra (Audio Section) + 1805 0103 Euresys PICOLO Tetra (Audio Section) + 1805 0104 Euresys PICOLO Tetra (Audio Section) + 1805 0105 Euresys PICOLO Tetra (Audio Section) + 1805 0106 Euresys PICOLO Tetra (Audio Section) + 1805 0107 Euresys PICOLO Tetra (Audio Section) + 1805 0108 Euresys PICOLO Tetra (Audio Section) + 1805 0201 Euresys PICOLO Tetra-X (Audio Section) + 1805 0202 Euresys PICOLO Tetra-X (Audio Section) + 1805 0203 Euresys PICOLO Tetra-X (Audio Section) + 1805 0204 Euresys PICOLO Tetra-X (Audio Section) + 1805 0401 Euresys PICOLO Tymo (Audio Section) + 1805 0402 Euresys PICOLO Tymo (Audio Section) + 1805 0403 Euresys PICOLO Tymo (Audio Section) + 1805 0404 Euresys PICOLO Tymo (Audio Section) + 1805 1001 Euresys PICOLO Junior 4 (Audio Section) 1822 0001 VisionPlus DVB Card 18ac d500 DViCO FusionHDTV5 Lite 270f fc00 Digitop DTT-1000 @@ -8991,6 +9048,10 @@ 1147 VScom 020 2 port parallel adaptor 2000 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge 10b5 9030 ATCOM AE400P Quad E1 PCI card + 2300 Euresys DOMINO Gamma + 2374 Euresys DOMINO Alpha + 2491 Euresys GRABLINK Value + 2493 Euresys GRABLINK Expert 2540 IXXAT CAN-Interface PC-I 04/PCI 2724 Thales PCSM Security Card 3376 Cosateq 4 Port CAN Card @@ -9106,6 +9167,7 @@ e1c5 0006 TA1-PCI4 9036 9036 9050 PCI <-> IOBus Bridge + 103c 10b0 82350 PCI GPIB 10b5 1067 IXXAT CAN i165 10b5 114e Wasco WITIO PCI168extended 10b5 1169 Wasco OPTOIO32standard 32 digital in, 32 digital out @@ -9117,6 +9179,7 @@ 10b5 2905 Alpermann+Velte PCI TS: Time Synchronisation Board 10b5 3196 Goramo PLX200SYN sync serial card 10b5 9050 PCI-I04 PCI Passive PC/CAN Interface + 11a9 5334 PDS4 12fe 0001 CAN-PCI/331 CAN bus controller 1369 8901 PCX11+ PCI 1369 8f01 VX222 @@ -9542,6 +9605,7 @@ 10be Tseng Labs International Co. 10bf Most Inc 10c0 Boca Research Inc. + 9135 iX3D Ultimate Rez 10c1 ICM Co., Ltd. 10c2 Auspex Systems Inc. 10c3 Samsung Semiconductors, Inc. @@ -12778,16 +12842,20 @@ 2331 GH100 [H100 PCIe] 2336 GH100 [H100] 2337 GH100 [H100 SXM5 64GB] + 2338 GH100 [H100 SXM5 96GB] 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] 233d GH100 [H100 96GB] 2342 GH100 [GH200 120GB] 2343 GH100 2345 GH100 [GH200 480GB] + 23b0 GH100 + 23f0 GH100 2414 GA103 [GeForce RTX 3060 Ti] 2420 GA103M [GeForce RTX 3080 Ti Mobile] 2438 GA103GLM [RTX A5500 Laptop GPU] 2460 GA103M [GeForce RTX 3080 Ti Laptop GPU] + 2480 GA104 [Reserved Dev ID A] 2482 GA104 [GeForce RTX 3070 Ti] 2483 GA104 2484 GA104 [GeForce RTX 3070] @@ -12816,6 +12884,7 @@ 24ba GA104GLM [RTX A4500 Laptop GPU] 24bb GA104GLM [RTX A3000 Laptop GPU] 24bf GA104 [GeForce RTX 3070 Engineering Sample] + 24c0 GA104 [Initial Dev ID B] 24c7 GA104 [GeForce RTX 3060 8GB] 24c8 GA104 [GeForce RTX 3070 GDDR6X] 24c9 GA104 [GeForce RTX 3060 Ti GDDR6X] @@ -12843,6 +12912,7 @@ 2571 GA106 [RTX A2000 12GB] 2582 GA107 [GeForce RTX 3050 8GB] 2583 GA107 [GeForce RTX 3050 4GB] + 2584 GA107 [GeForce RTX 3050 6GB] 25a0 GA107M [GeForce RTX 3050 Ti Mobile] 25a2 GA107M [GeForce RTX 3050 Mobile] 25a3 GA107 @@ -12881,6 +12951,7 @@ 26b8 AD102GL [L40G] 26b9 AD102GL [L40S] 26f5 AD102GL [L40 CNX] + 2703 AD103 [GeForce RTX 4080 SUPER] 2704 AD103 [GeForce RTX 4080] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] @@ -12891,6 +12962,7 @@ 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] + 27b1 AD104GL [RTX 4500 Ada Generation] 27b2 AD104GL [RTX 4000 Ada Generation] 27b7 AD104GL [L16] 27b8 AD104GL [L4] @@ -13074,6 +13146,7 @@ 2011 Q-Motion Video Capture/Edit board 4750 S5930 [Matchmaker] 5920 S5920 + 801d Roper Scientific PCI TAXI interface 8043 LANai4.x [Myrinet LANai interface chip] 8062 S5933_PARASTATION 807d S5933 [Matchmaker] @@ -13147,6 +13220,7 @@ 1028 06e6 Latitude 11 5175 2-in-1 1028 09be Latitude 7410 1028 0b10 Precision 3571 + 1028 0c06 Precision 3580 17aa 224f ThinkPad X1 Carbon 5th Gen 5260 RTS5260 PCI Express Card Reader 5261 RTS5261 PCI Express Card Reader @@ -13160,6 +13234,7 @@ 5762 RTS5762 NVMe SSD Controller 5763 RTS5763DL NVMe SSD Controller (DRAM-less) 5765 RTS5765DL NVMe SSD Controller (DRAM-less) + 5772 RTS5772DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) 10ec 8029 RTL-8029(AS) @@ -13342,13 +13417,17 @@ 8813 RTL8813AE 802.11ac PCIe Wireless Network Adapter 8821 RTL8821AE 802.11ac PCIe Wireless Network Adapter 8852 RTL8852AE 802.11ax PCIe Wireless Network Adapter + a85a RTL8852AE WiFi 6 802.11ax PCIe Adapter b723 RTL8723BE PCIe Wireless Network Adapter 10ec 8739 Dell Wireless 1801 17aa b736 Z50-75 + b821 RTL8821CE PCIe 802.11ac Wireless Network Controller b822 RTL8822BE 802.11a/b/g/n/ac WiFi adapter 103c 831b Realtek RTL8822BE 802.11ac 2x2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported) 17aa 5124 ThinkPad E595 17aa b023 ThinkPad E595 + b852 RTL8852BE PCIe 802.11ax Wireless Network Controller + b85b RTL8852BE PCIe 802.11ax Wireless Network Controller [1T1R] c821 RTL8821CE 802.11ac PCIe Wireless Network Adapter c822 RTL8822CE 802.11ac PCIe Wireless Network Adapter c82f RTL8822CE 802.11ac PCIe Wireless Network Adapter @@ -13379,6 +13458,8 @@ 500c Alveo U280 XDMA Platform 5020 Alveo U50 XMDA Platform 505c Alveo U55C + 5074 Alveo X3522, Quad Port, 10/25GbE Adaptable Accelerator Card + 5084 Alveo X3522, Quad Port, 10/25GbE Low Latency Network Adapter 6987 SmartSSD 6988 SmartSSD 7011 7-Series FPGA Hard PCIe block (AXI/debug) @@ -15366,7 +15447,7 @@ 1179 0021 KIOXIA CD5 series SSD 1d49 4039 Thinksystem U.2 CM5 NVMe SSD 1d49 403a Thinksystem AIC CM5 NVMe SSD - 0113 BG3 NVMe SSD Controller + 0113 BG3 x2 NVMe SSD Controller (DRAM-less) 1179 0001 Toshiba KBG30ZMS128G 128GB NVMe SSD 0115 XG4 NVMe SSD Controller 0116 XG5 NVMe SSD Controller @@ -15686,6 +15767,8 @@ 000b ATP867-B 000d ATP8620 000e ATP8620 + 0011 ATP865-B + 1191 0011 ACARD AEC-6280 8002 AEC6710 SCSI-2 Host Adapter 8010 AEC6712UW SCSI 8020 AEC6712U SCSI @@ -15949,7 +16032,7 @@ 6281 88F6281 [Kirkwood] ARM SoC # This device ID was used for earlier chips. 6381 MV78xx0 [Discovery Innovation] ARM SoC - 6440 88SE6440 SAS/SATA PCIe controller + 6440 88SE63x0 x1, 88SE6440 x4 PCIe SAS/SATA 3Gb/s RAID controller 6450 64560 System Controller 6460 MV64360/64361/64362 System Controller 6480 MV64460/64461/64462 System Controller @@ -15960,7 +16043,7 @@ 6820 88F6820 [Armada 385] ARM SoC 6828 88F6828 [Armada 388] ARM SoC 6920 88F6920 [Armada 390] ARM SoC - 7042 88SX7042 PCI-e 4-port SATA-II + 7042 88SX7042 PCIe 4-port SATA-II controller 16b8 434b Tempo SATA E4P 7810 MV78100 [Discovery Innovation] ARM SoC 7820 MV78200 [Discovery Innovation] ARM SoC @@ -16426,9 +16509,9 @@ 13f7 1394 OHCI Compliant Host Controller 6729 OZ6729 673a OZ6730 - 6832 OZ6832/6833 CardBus Controller - 6836 OZ6836/6860 CardBus Controller - 6872 OZ6812 CardBus Controller + 6832 OZ6832/6833 CardBus Controller [Saturn] + 6836 OZ6836/6860 CardBus Controller [Mercury] + 6872 OZ6812 CardBus Controller [Challenger] 6925 OZ6922 CardBus Controller 6933 OZ6933/711E1 CardBus/SmartCardBus Controller 1025 1016 Travelmate 612 TX @@ -16602,6 +16685,7 @@ 00a3 VisionLink F4 00a9 VisionLink CLS 00ab PCIe8g3 A5 10G + 00b5 PCIe8 RFx SDR 123e Simutech, Inc. # nee C-Cube Microsystems / acquired by Magnum Semiconductor 123f LSI Logic @@ -16834,6 +16918,8 @@ 2260 SM2260 NVMe SSD Controller 2262 SM2262/SM2262EN SSD Controller 2263 SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers + 2269 SM2269XT (DRAM-less) NVMe SSD Controller + 8366 SM8366 NVMe SSD Controller [MonTitan] 1270 Olympus Optical Co., Ltd. 1271 GW Instruments 1272 Telematics International @@ -17461,11 +17547,18 @@ 0035 PCI-DAS64/M1/16 0036 PCI-DAS64/M2/16 0037 PCI-DAS64/M3/16 + 004b PCI-MDB64 004c PCI-DAS1000 004d PCI-QUAD04 0052 PCI-DAS4020/12 0053 PCIM-DDA06/16 0054 PCI-DIO96 + 0055 CPCI-DIO24H + 0056 PCIM-DAS1602/16 + 0057 PCI-DAS3202/16 + 0059 PCI-QUAD-AC5 + 005a CPCI-DIO96H + 005b CPCI-DIO48H 005d PCI-DAS6023 005e PCI-DAS6025 005f PCI-DAS6030 @@ -17478,10 +17571,23 @@ 0066 PCI-DAS6052 0067 PCI-DAS6070 0068 PCI-DAS6071 + 006e PCI-CTR10 006f PCI-DAS6036 0070 PCI-DAC6702 + 0071 PCI-DAC6703 + 0074 PCI-CTR20HD + 0077 PCI-DIO24/LP 0078 PCI-DAS6013 0079 PCI-DAS6014 + 007b PCIM-DAS16JR/16 + 007e PCI-DIO24/S + 00a5 PCI-2511 + 00a6 PCI-2513 + 00a7 PCI-2515 + 00a8 PCI-2517 + 00be PCI-QUAD05 + 00da PCIe-DIO96H + 00db PCIe-DIO24 0115 PCIe-DAS1602/16 1308 Jato Technologies Inc. 0001 NetCelerator Adapter @@ -17643,6 +17749,9 @@ 1344 4000 3.2TB U.2 1344 5000 6.4 TB U.2 1344 6000 12.8TB U.2 + 51b7 7500 PRO NVMe SSD + 51b8 7500 MAX NVMe SSD + 51b9 6500 ION NVMe SSD 51c0 7400 PRO NVMe SSD 1028 2162 EC NVMe OPAL 7400 RI M.2 480GB 1028 2163 EC NVMe OPAL 7400 RI M.2 960GB @@ -17689,6 +17798,7 @@ 5411 2450 NVMe SSD [HendrixV] (DRAM-less) 5413 2400 NVMe SSD (DRAM-less) 5414 3460 NVMe SSD + 5416 2550 NVMe SSD (DRAM-less) 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc 1347 Odetics @@ -17727,8 +17837,97 @@ 1355 Kratos Analytical Ltd 1356 The Logical Co 1359 Prisa Networks -135a Brain Boxes - 0a61 UC-324 [VELOCITY RS422/485] +135a Brainboxes Ltd + 0841 UC-268 4 port RS-232 card + 0861 UC-257 2 port RS-232 + LPT card + 0862 UC-257 2 port RS-232 + LPT card + 0863 UC-257 2 port RS-232 + LPT card + 0881 UC-279 8 port RS-232 card + 08a1 UC-313 2 port RS-422/485 card + 08a2 UC-313 2 port RS-422/485 card + 08a3 UC-313 2 port RS-422/485 card + 08c1 UC-310 2 port RS-422/485 Opto Isolated card + 08e1 UC-302 2 port RS-232 card + 08e2 UC-302 2 port RS-232 card + 08e3 UC-302 2 port RS-232 card + 0901 UC-431 3 port RS-232 card + 0921 UC-420 3 + 1 port RS-232 card + 0981 UC-475 1 + 1 port RS-232 + LPT card + 0982 UC-475 1 + 1 port RS-232 + LPT card + 09a1 UC-607 2 port RS-232 card + 09a2 UC-607 2 port RS-232 card + 09a3 UC-607 2 port RS-232 card + 0a61 UC-324 1 port RS-422/485 card + 0a81 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0a82 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0a83 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0aa1 UC-246 1 port RS-232 card + 0aa2 UC-246 1 port RS-232 card + 0ac1 UP-189 Powered 2 port RS-232 card + 0ac2 UP-189 Powered 2 port RS-232 card + 0ac3 UP-189 Powered 2 port RS-232 card + 0b01 UC-346 4 port RS-422/485 card + 0b02 UC-346 4 port RS-422/485 card + 0b21 UP-200 Powered 2 port RS-232 card + 0b22 UP-200 Powered 2 port RS-232 card + 0b23 UP-200 Powered 2 port RS-232 card + 0ba1 UC-101 1 + 1 port RS-232 card + 0bc1 UC-203 1 + 1 port RS-232 + LPT card + 0bc2 UC-203 1 + 1 port RS-232 + LPT card + 0be1 UC-146 LPT card + 0be2 UC-146 LPT card + 0c01 UP-869 Powered 2 port RS-232 card + 0c02 UP-869 Powered 2 port RS-232 card + 0c03 UP-869 Powered 2 port RS-232 card + 0c21 UP-880 Powered 2 port RS-232 card + 0c22 UP-880 Powered 2 port RS-232 card + 0c23 UP-880 Powered 2 port RS-232 card + 0c41 UC-368 4 port RS-422/485 Opto Isolated card + 0ca1 UC-253 2 port RS-232 card + 0d21 UC-260 4 port RS-232 card + 0d41 UC-836 4 port RS-232 card + 0d60 IS-100 1 port RS-232 card + 0d80 IS-200 2 port RS-232 card + 0da0 IS-300 1 port RS-232 + LPT card + 0dc0 IS-400 4 port RS-232 card + 0de0 IS-500 LPT card + 0e41 PX-279 8 port RS-232 card + 0e61 UC-414 3 + 1 port RS-232 + LPT card + 4000 PX-420 3 + 1 port RS-232 card + 4001 PX-431 3 port RS-232 card + 4002 PX-820 Powered 3 + 1 port RS-232 card + 4003 PX-831 Powered 3 port RS-232 card + 4004 PX-235 1 port RS-232 card + 4005 PX-101 1 + 1 port RS-232 card + 4006 PX-257 1 + 1 port RS-232 + LPT card (Serial port) + 4007 PX-257 1 + 1 port RS-232 + LPT card (LPT port) + 4008 PX-835 Powered 1 port RS-232 card + 4009 PX-857 Powered 2 port RS-232 card + 400a PX-260 4 port RS-232 card + 400b PX-320 1 port RS-422/485 card + 400c PX-313 2 port RS-422/485 card + 400e PX-310 2 port RS-422/485 Opto Isolated card + 400f PX-346 4 port RS-422/485 card + 4010 PX-368 4 port RS-422/485 Opto Isolated card + 4011 PX-420 3 + 1 port RS-232 card + 4012 PX-431 3 port RS-232 card + 4013 PX-820 Powered 3 + 1 port RS-232 card + 4014 PX-831 Powered 3 port RS-232 card + 4015 PX-257 2 port RS-232 card + 4016 PX-235 1 port RS-232 card + 4017 PX-835 Powered 1 port RS-232 card + 4018 PX-857 Powered 2 port RS-232 card + 4019 PX-101 1 + 1 port RS-232 card + 401c PX-146 LPT card + 401d PX-475 1 port RS-232 + LPT card (Serial port) + 401e PX-803 Powered 1 + 1 port RS-232 card + 401f PX-475 1 port RS-232 + LPT card (LPT port) + 4027 IX-100 1 port RS-232 card + 4028 IX-200 2 port RS-232 card + 4029 IX-400 4 port RS-232 card + 402a IX-500 LPT card + 402c PX-263 4 port RS-232 + LPT card + 4100 PX-272 4 + 1 port RS-232 + LPT card 135b Giganet Inc 135c Quatech Inc 0010 QSC-100 @@ -17738,12 +17937,19 @@ 0050 ESC-100D 0060 ESC-100M 00f0 MPAC-100 Synchronous Serial Card (Zilog 85230) + 0120 QSCP-100 + 0130 DSCP-100 + 0140 QSCP-200/300 + 0150 DSCP-200/300 0170 QSCLP-100 0180 DSCLP-100 + 0181 DSC-100 0190 SSCLP-100 01a0 QSCLP-200/300 01b0 DSCLP-200/300 + 01b1 DSC-200/300 01c0 SSCLP-200/300 + 01e0 ESC(LP)-100 0258 DSPSX-200/300 135d ABB Network Partner AB 135e Sealevel Systems Inc @@ -18233,6 +18439,7 @@ 13fc Computer Peripherals International 13fd Micro Science Inc 13fe Advantech Co. Ltd + 0071 PCIE-1761H, 8-ch Relay and 8-ch Isolated Digital Input Card 1240 PCI-1240 4-channel stepper motor controller card 1600 PCI-16xx series PCI multiport serial board (function 0) # This board has two PCI functions, appears as two PCI devices @@ -19391,9 +19598,9 @@ 144d a801 SM963 2.5" NVMe PCIe SSD a806 NVMe SSD SM0032L a808 NVMe SSD Controller SM981/PM981/PM983 - 144d a801 SSD 970 EVO + 144d a801 SSD 970 EVO/PRO 1d49 403b Thinksystem U.2 PM983 NVMe SSD - a809 NVMe SSD Controller 980 + a809 NVMe SSD Controller 980 (DRAM-less) a80a NVMe SSD Controller PM9A1/PM9A3/980PRO 0128 215a DC NVMe PM9A3 RI U.2 960GB 0128 215b DC NVMe PM9A3 RI U.2 1.92TB @@ -19413,9 +19620,12 @@ 1028 2276 DC NVMe PM9A3 RI 110M.2 960GB 1028 2277 DC NVMe PM9A3 RI 110M.2 1.92TB 1028 512d DC NVMe PM9A3 RI U.2 7.68TB + 144d a801 SSD 980 PRO 144d a813 General DC NVMe PM9A3 - a80b NVMe SSD Controller PM9B1 +# Actually 88SS1322 according to techpowerup + a80b NVMe SSD Controller PM9B1 (DRAM-less) a80c NVMe SSD Controller S4LV008[Pascal] + a80d NVMe SSD Controller PM9C1a a820 NVMe SSD Controller 171X 1028 1f95 Express Flash NVMe XS1715 SSD 400GB 1028 1f96 Express Flash NVMe XS1715 SSD 800GB @@ -19658,9 +19868,18 @@ 14a2 Millennium Engineering Inc 14a3 Maverick Networks 14a4 Lite-On Technology Corporation + 2100 CA1-8D128 NVMe SSD + 2200 CX2-8B256, CX2-8B512 NVMe SSD + 22a0 EP2-KB960 NVMe SSD 22f1 M8Pe Series NVMe SSD + 2300 CA3-8D256, CA3-8D512 NVMe SSD + 23f1 M9PeG, M9PeGN, M9PeY NVMe SSD + 2f00 CAZ-82512 NVMe SSD + 3500 CA5-8D512 NVMe SSD # Wrong vendor ID used 4318 Broadcom BCM4318 [AirForce One 54g] 802.11g WLAN Controller + 5100 CB1-SD256, CB1-SD512 NVMe SSD + 9100 CL1-3D256, CL1-8D512 NVMe SSD (DRAM-less) 14a5 XIONICS Document Technologies Inc 14a6 INOVA Computers GmBH & Co KG 14a7 MYTHOS Systems Inc @@ -19729,12 +19948,14 @@ 7612 MT7612E 802.11acbgn PCI Express Wireless Network Adapter 7615 MT7615E 802.11ac PCI Express Wireless Network Adapter 7630 MT7630e 802.11bgn Wireless Network Adapter + 7650 MT7650 802.11ac # MT7612E too? 7662 MT7662E 802.11ac PCI Express Wireless Network Adapter 7915 MT7915E 802.11ax PCI Express Wireless Network Adapter 7916 MT7905D/MT7975 # WiFi 6E capable 7922 MT7922 802.11ax PCI Express Wireless Network Adapter + 1a3b 5300 ASUS PCE-AXE59BT 7961 MT7921 802.11ax PCI Express Wireless Network Adapter 14c4 IWASAKI Information Systems Co Ltd 14c5 Automation Products AB @@ -19980,8 +20201,8 @@ 103c 3383 Ethernet 1Gb 4-port 331T Adapter 14e4 1904 4-port 1Gb Ethernet Adapter 14e4 1909 Broadcom NetXtreme 5719 Quad Port Gigabit NIC - 14e4 d146 BCM95719-P41 4x1GBT Ethernet NIC - 14e4 d346 BCM95719-N41 4x1GBT Ethernet NIC + 14e4 d166 BCM95719-P41 4x1GBT Ethernet NIC + 14e4 d366 BCM95719-N41 4x1GBT Ethernet NIC 193d 1025 NIC-ETH330T-LP-4P 1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express 1014 02c6 eServer xSeries server mainboard @@ -20542,16 +20763,16 @@ 4360 BCM4360 802.11ac Wireless Network Adapter 4365 BCM43142 802.11b/g/n 1028 0016 Wireless 1704 802.11n + BT 4.0 - 43a0 BCM4360 802.11ac Wireless Network Adapter - 43a1 BCM4360 802.11ac Wireless Network Adapter - 43a2 BCM4360 802.11ac Wireless Network Adapter + 43a0 BCM4360 802.11ac Dual Band Wireless Network Adapter + 43a1 BCM4360 802.11ac 2,4G Wireless Network Adapter + 43a2 BCM4360 802.11ac 5G Wireless Network Adapter 43a3 BCM4350 802.11ac Wireless Network Adapter # Manufactured by Foxconn for Lenovo 17aa 075a 00JT494 43a9 BCM43217 802.11b/g/n 43aa BCM43131 802.11b/g/n 43ae BCM43162 802.11ac Wireless Network Adapter - 43b1 BCM4352 802.11ac Wireless Network Adapter + 43b1 BCM4352 802.11ac Dual Band Wireless Network Adapter 1043 85ba PCE-AC56 Dual-Band Wireless PCI-E Adapter 43ba BCM43602 802.11ac Wireless LAN SoC 43bb BCM43602 802.11ac Wireless LAN SoC @@ -20577,12 +20798,14 @@ 441f BCM4361 802.11ac Dual-Band Wireless Network Controller 4420 BCM4361 802.11ac 2.4 GHz Wireless Network Controller 4421 BCM4361 802.11ac 5 GHz Wireless Network Controller - 4425 BRCM4378 Wireless Network Adapter + 4425 BCM4378 802.11ax Dual Band Wireless Network Adapter 4430 BCM44xx CardBus iLine32 HomePNA 2.0 4432 BCM4432 CardBus 10/100BaseT + 4433 BCM4387 802.11ax Dual Band Wireless LAN Controller 4464 BCM4364 802.11ac Wireless Network Adapter # brcmfmac reports it as BCM4377/4 but macOS drivers call it BCM4377b 4488 BCM4377b Wireless Network Adapter + 449d BCM43752 802.11ax Dual Band Wireless LAN Controller 4610 BCM4610 Sentry5 PCI to SB Bridge 4611 BCM4610 Sentry5 iLine32 HomePNA 1.0 4612 BCM4610 Sentry5 V.90 56k Modem @@ -20900,6 +21123,10 @@ 17de 08a6 KWorld/VStream XPert DVB-T 17de 08b2 KWorld DVB-S 100 17de a8a6 digitalnow DNTV Live! DVB-T + 1805 0111 PICOLO Jet-X Video + 1805 0112 PICOLO Jet-X Video + 1805 0113 PICOLO Jet-X Video + 1805 0114 PICOLO Jet-X Video 1822 0025 digitalnow DNTV Live! DVB-T Pro 185b e000 VideoMate X500 18ac d500 FusionHDTV 5 Gold @@ -20928,6 +21155,10 @@ 14f1 0187 Conexant DVB-T reference design 17de 08a1 XPert DVB-T PCI BDA DVBT 23880 Transport Stream Capture 17de 08a6 KWorld/VStream XPert DVB-T + 1805 0111 PICOLO Jet-X Jpeg + 1805 0112 PICOLO Jet-X Jpeg + 1805 0113 PICOLO Jet-X Jpeg + 1805 0114 PICOLO Jet-X Jpeg 18ac d500 DViCO FusionHDTV5 Gold 18ac d810 DViCO FusionHDTV3 Gold-Q 18ac d820 DViCO FusionHDTV3 Gold-T @@ -20940,6 +21171,10 @@ 0070 6902 WinTV HVR-4000-HD 0070 9002 Nova-T DVB-T Model 909 0070 9402 WinTV-HVR1100 DVB-T/Hybrid + 1805 0111 PICOLO Jet-X Control + 1805 0112 PICOLO Jet-X Control + 1805 0113 PICOLO Jet-X Control + 1805 0114 PICOLO Jet-X Control 7063 5500 pcHDTV HD-5500 8811 CX23880/1/2/3 PCI Video and Audio Decoder [Audio Port] 0070 3400 WinTV 34604 @@ -21283,6 +21518,8 @@ 0001 Eagle Cluster Manager 0002 Osprey Cluster Manager 0003 Harrier Cluster Manager + 0371 Cassini 2 [Slingshot 400Gb] + 0372 Cassini 2 [Slingshot 400Gb] SR-IOV VF a01d FC044X Fibre Channel HBA 1591 ARN 1592 Syba Tech Ltd @@ -21627,10 +21864,10 @@ 2001 Skyhawk Series NVME SSD 5001 WD Black NVMe SSD 5002 SanDisk Extreme Pro / WD Black 2018/SN750/PC SN720 NVMe SSD - 5003 WD Blue SN500 / PC SN520 NVMe SSD - 5004 PC SN520 NVMe SSD - 5005 PC SN520 NVMe SSD - 5006 WD Black SN750 / PC SN730 / Red SN700 NVMe SSD + 5003 WD Blue SN500 / PC SN520 x2 M.2 2280 NVMe SSD + 5004 PC SN520 x2 M.2 2230 NVMe SSD + 5005 PC SN520 x2 M.2 2242 NVMe SSD + 5006 SanDisk Extreme Pro / WD Black SN750 / PC SN730 / Red SN700 NVMe SSD 5007 IX SN530 NVMe SSD (DRAM-less) 5008 PC SN530 NVMe SSD (DRAM-less) 5009 SanDisk Ultra 3D / WD Blue SN550 NVMe SSD @@ -21639,17 +21876,18 @@ 1414 500b Xbox Series X 500d WD Ultrastar DC SN340 NVMe SSD 5011 WD PC SN810 / Black SN850 NVMe SSD - 5014 WD Green SN350 NVMe SSD 1 TB (DRAM-less) + 5014 WD PC SN540 / Green SN350 NVMe SSD 1 TB (DRAM-less) 5015 PC SN740 NVMe SSD (DRAM-less) 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD - 5019 WD Green SN350 NVMe SSD 240GB (DRAM-less) - 501a WD Blue SN570 NVMe SSD + 5019 WD Green SN350 240GB (DRAM-less) / SN560E NVMe SSD + 501a SanDisk Ultra 3D / WD Blue SN570 NVMe SSD (DRAM-less) 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) 501e PC SN735 NVMe SSD (DRAM-less) 501f WD PC SN735 NVMe SSD 512GB (DRAM-less) 5025 WD Blue SN570 NVMe SSD 2TB 5026 WD PC SN735 NVMe SSD 1TB (DRAM-less) + 5028 WD CH SN560 NVMe SSD 5030 WD Black SN850X NVMe SSD 5041 WD Blue SN580 NVMe SSD (DRAM-less) 15b8 ADDI-DATA GmbH @@ -21673,7 +21911,11 @@ 117c 0022 Celerity FC-42XS Fibre Channel Adapter 117c 0025 Celerity FC-44ES Fibre Channel Adapter 117c 0026 Celerity FC-42ES Fibre Channel Adapter + 0b01 82350B PCI GPIB 1100 E8001-66442 PCI Express CIC + 1218 82351A PCI Express GPIB + 12d6 82350C PCI GPIB + 12d7 82351B PCI Express GPIB 2922 64 Bit, 133MHz PCI-X Exerciser & Protocol Checker 2928 64 Bit, 66MHz PCI Exerciser & Analyzer 2929 64 Bit, 133MHz PCI-X Analyzer & Exerciser @@ -21927,6 +22169,11 @@ 165f Linux Media Labs, LLC 1020 LMLM4 MPEG-4 encoder 1661 Worldspace Corp. +1665 EDAX Inc +# P/N 4035.006.19720 + 1973 DPP-II FR2 Board +# P/N 4035.065.20000 + 2000 SG-IIP Board 1668 Actiontec Electronics Inc 0100 Mini-PCI bridge # Formerly SiByte, Inc. @@ -22861,6 +23108,7 @@ 17d5 7831 X3120 Dual Port 10GBase-CR 17db Cray Inc 0101 XT Series [Seastar] 3D Toroidal Router + 0501 Cassini 1 [Slingshot 200Gb] 17de KWorld Computer Co. Ltd. 17df Dini Group 1864 Virtex4 PCI Board w/ QL5064 Bridge [DN7000K10PCI/DN8000K10PCI/DN8000K10PSX/NOTUS] @@ -22978,6 +23226,35 @@ 1804 Ralink corp. (wrong ID) 3060 RT3060 Wireless 802.11n 1T/1R 1805 Euresys S.A. + 0201 PICOLO Alert PCI + 0202 PICOLO Diligent + 0204 PICOLO Alert-RC + 0205 PICOLO Alert PCIe + 0206 PICOLO Diligent Plus PCIe + 0207 PICOLO Alert-RC PCIe + 0300 GRABLINK Expert 2 + 0301 GRABLINK Quickpack ColorScan + 0302 GRABLINK Value cPCI + 0303 GRABLINK Expert 2 cPCI + 0305 GRABLINK Avenue + 0306 GRABLINK Quickpack CFA + 0307 GRABLINK Express + 0308 GRABLINK Quickpack CFA PCIe + 0309 GRABLINK Quickpack CFA PCIe (Recovery) + 030a GRABLINK Full + 030b GRABLINK Full (Recovery) + 030c GRABLINK DualBase + 030d GRABLINK DualBase (Recovery) + 030e GRABLINK Base + 030f GRABLINK Base (Recovery) + 0310 GRABLINK Full XR + 0311 GRABLINK Full XR (Recovery) + 0401 DOMINO Iota + 0402 DOMINO Alpha 2 + 0403 DOMINO Harmony + 0404 DOMINO Melody + 0407 DOMINO Symphony + 0408 DOMINO Symphony PCIe 1809 Lumanate, Inc. 180c IEI Integration Corp 1813 Ambient Technologies Inc @@ -23710,11 +23987,13 @@ 5007 E7 NVMe Controller 5008 E8 PCIe3 NVMe Controller 5012 E12 NVMe Controller - 5013 PS5013 E13 NVMe Controller + 5013 PS5013-E13 PCIe3 NVMe Controller (DRAM-less) + 5015 PS5015-E15 PCIe3 NVMe Controller (DRAM-less) 5016 E16 PCIe4 NVMe Controller 5018 E18 PCIe4 NVMe Controller 5019 PS5019-E19 PCIe4 NVMe Controller (DRAM-less) 5021 PS5021-E21 PCIe4 NVMe Controller (DRAM-less) + 5026 PS5026-E26 PCIe5 NVMe Controller 1989 Montilio Inc. 0001 RapidFile Bridge 8001 RapidFile @@ -24246,6 +24525,7 @@ 000c QEMU PCIe Root port 000d QEMU XHCI Host Controller 0010 QEMU NVM Express Controller + 0011 QEMU PVPanic device 0013 QEMU UFS Host Controller 0100 QXL paravirtual graphic card 1af4 1100 QEMU Virtual Machine @@ -24291,6 +24571,7 @@ 1028 2151 BOSS-N1 Modular ET 1028 2196 ROR-N1 1b4b 2241 Santa Cruz NVMe Host Adapter + 1b96 4000 WD_BLACK AN1500 NVMe SSD 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit 2b43 NXP 88W9098 Wi-Fi 6 (ax) MAC #1 @@ -24380,6 +24661,12 @@ 2404 Ultrastar DC SN640 NVMe SSD 2500 Ultrastar DC SN840 NVMe SSD 2600 Ultrastar DC ZN540 ZNS NVMe SSD + 2700 Ultrastar DC SN650 NVMe SSD + 2701 Ultrastar DC SN650 NVMe SSD + 2702 Ultrastar DC SN650 NVMe SSD + 2720 Ultrastar DC SN650 NVMe SSD + 2721 Ultrastar DC SN650 NVMe SSD + 2722 Ultrastar DC SN655 NVMe SSD 3001 RapidFlex C2000 NVMe Initiator 3714 PC SN730 NVMe SSD 3734 PC SN730 NVMe SSD @@ -24500,6 +24787,10 @@ 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520/IronWolf 525 SSD 5018 FireCuda 530 SSD +# 2TB + 5021 FireCuda 520 SSD +# 1TB + 5026 FireCuda 540 SSD 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder 4309 BC-08240A MPEG4 4 port video encoder / decoder @@ -24559,6 +24850,7 @@ 100c NS8510G1Uxxx, NS8610G1Uxxx NVME SSD 100e NS8500G2Uxxxx, NS8600G2Uxxxx NVME SSD 1bee IXXAT Automation GmbH + 0002 CAN-IB100/PCIe 0003 CAN-IB200/PCIe 1bef Lantiq 0011 MIPS SoC PCI Express Port @@ -24566,6 +24858,7 @@ 0001 SentinelEX 7011 RX0xxx 1bf5 Greenliant + 1000 G7200 series U.2 NVMe SSD 1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. @@ -24699,6 +24992,8 @@ 1c5c 0101 PE81x0 U.2/3 NVMe Solid State Drive 284a PE8110 Series NVMe Solid State Drive 2a49 PE9110 Series NVMe Solid State Drive + 2a59 PE9010 Series NVMe Solid State Drives + 2b59 PS10x0 Series NVMe Solid State Drives 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 1c5f 0220 NVMe SSD PBlaze5 520 1920G AIC @@ -24721,11 +25016,18 @@ 1c5f 0b40 NVMe SSD PBlaze6 6530 7680G AIC 1c5f 0b41 NVMe SSD PBlaze6 6530 7680G 2.5" U.2 1c5f 0b47 NVMe SSD PBlaze6 6630 7680G 2.5" U.2 + 1c5f 1320 NVMe SSD PBlaze6 6531 1920G AIC 1c5f 1321 NVMe SSD PBlaze6 6531 1920G 2.5" U.2 + 1c5f 1330 NVMe SSD PBlaze6 6531 3840G AIC 1c5f 1331 NVMe SSD PBlaze6 6531 3840G 2.5" U.2 + 1c5f 1340 NVMe SSD PBlaze6 6531 7680G AIC 1c5f 1341 NVMe SSD PBlaze6 6531 7680G 2.5" U.2 + 1c5f 1421 NVMe SSD PBlaze6 6541 1920G 2.5" U.2 + 1c5f 1427 NVMe SSD PBlaze6 6641 1920G 2.5" U.2(dual port) 1c5f 1431 NVMe SSD PBlaze6 6541 3840G 2.5" U.2 + 1c5f 1437 NVMe SSD PBlaze6 6641 3840G 2.5" U.2(dual port) 1c5f 1441 NVMe SSD PBlaze6 6541 7680G 2.5" U.2 + 1c5f 1447 NVMe SSD PBlaze6 6641 7680G 2.5" U.2(dual port) 1c5f 4b20 NVMe SSD PBlaze6 6536 1600G AIC 1c5f 4b21 NVMe SSD PBlaze6 6536 1600G 2.5" U.2 1c5f 4b25 NVMe SSD PBlaze6 6536 1600G E1.S @@ -24737,11 +25039,18 @@ 1c5f 4b40 NVMe SSD PBlaze6 6536 6400G AIC 1c5f 4b41 NVMe SSD PBlaze6 6536 6400G 2.5" U.2 1c5f 4b47 NVMe SSD PBlaze6 6636 6400G 2.5" U.2 + 1c5f 5320 NVMe SSD PBlaze6 6537 1600G AIC 1c5f 5321 NVMe SSD PBlaze6 6537 1600G 2.5" U.2 + 1c5f 5330 NVMe SSD PBlaze6 6537 3200G AIC 1c5f 5331 NVMe SSD PBlaze6 6537 3200G 2.5" U.2 + 1c5f 5340 NVMe SSD PBlaze6 6537 6400G AIC 1c5f 5341 NVMe SSD PBlaze6 6537 6400G 2.5" U.2 + 1c5f 5421 NVMe SSD PBlaze6 6547 1600G 2.5" U.2 + 1c5f 5427 NVMe SSD PBlaze6 6647 1600G 2.5" U.2(dual port) 1c5f 5431 NVMe SSD PBlaze6 6547 3200G 2.5" U.2 + 1c5f 5437 NVMe SSD PBlaze6 6647 3200G 2.5" U.2(dual port) 1c5f 5441 NVMe SSD PBlaze6 6547 6400G 2.5" U.2 + 1c5f 5447 NVMe SSD PBlaze6 6647 6400G 2.5" U.2(dual port) 003d PBlaze5 920/926 1c5f 0a30 NVMe SSD PBlaze5 920 3840G AIC 1c5f 0a31 NVMe SSD PBlaze5 920 3840G 2.5" U.2 @@ -24764,11 +25073,28 @@ 1c5f 4b51 NVMe SSD PBlaze6 6936 12800GB 2.5" U.3 1c5f 4b61 NVMe SSD PBlaze6 6936 25600GB 2.5" U.3 003f PBlaze7 7940/7946 NVMe SSD + 1c5f 0431 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 0c31 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 0c41 NVMe SSD PBlaze7 7940 7680G 2.5" U.2 + 1c5f 0c51 NVMe SSD PBlaze7 7940 15360G 2.5" U.2 + 1c5f 1430 NVMe SSD PBlaze7 7940 3840G AIC 1c5f 1431 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 1435 NVMe SSD PBlaze7 7940 3840G E1.S + 1c5f 1440 NVMe SSD PBlaze7 7940 7680G AIC *** 476 LINES SKIPPED *** From nobody Mon Dec 4 15:21:30 2023 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 4SkS7H1W9Xz53StV; Mon, 4 Dec 2023 15:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkS7H13rHz4rnN; Mon, 4 Dec 2023 15:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701703291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zoQJrjsgyVnsDLxY/gIqA78jiyfhTCRwRR8EG6RfpvQ=; b=hpgAqoeoZCwZrrduhHnewScCwp1NFmLWXkXUPDHM2MEpJEr8sSp0qH3yaw7trkk7Ow756P JeGaWauGBeEv9euqXOukebxCm0rvivjepnzgX4nBSXWdtTAPQoxEmYL4mDWAsKLQ2MGcxw EfmOx2NWplS033qog8Qt4vmj4EVklP7LQIn6sPk7D3rmFuZyu8eWccGPaX2pzGzTQvKEXC rZMvpHevr1XaBd6LN4k+iRcCFs0GCP3SiGO51nCPKLO5NpK4jh4ZdZTsFz+ZAP43CLYRZl vPF6NKBEamskgY/RfPMzAbjISVxIbh7FmjY98OqC2hBxhxwMe3IfclxIcXxfUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701703291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zoQJrjsgyVnsDLxY/gIqA78jiyfhTCRwRR8EG6RfpvQ=; b=lQEs57vHd3XwEA3q3vZ4Lh5p4ua/w1Z8LeRRS8r5NSpEzYGdTOT3LinUchcPfZxhxWYwF6 +jwdisI6U2Q1ta0znMa30U1+0EfOoQ2PSC8KvxI3MMA5Rnqacw7qmtV5r8comZsyjrbs1H WgHKKZnJCdAWXpWkq+F1QLjO4/ZB8Uat8fNlkAP063QRweZ4jsNteJldPZe/OXztuzvMnW 92c7mxreyn7e/SnXWwWIYO2uitq9So4Pt9oBDE5GxlW6FjB7Jk3mZ484g3Y9rEJnUDGhnq VKgoI0XiObUxI1iHsNOX3lp5BYyGZQmuh1LpXKOx9TVQRP21XFiHs/PMI/vMSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701703291; a=rsa-sha256; cv=none; b=B/6J0Fq2q04lN5yKhAySn61Mepn9OikQc88n6JPGVCcA4LJpDLHzWC0plSnd3wCcekKdx/ lmcWCLvECSjGfDAdyS3hofPNu86WXo11ng6y+APX1lt459fintcIF0rPP0yhNFwfgjz49g H1InIoQT5u1BrXNyE3EozGkb94HMxe4PEHZHy8C3GPox0gXSdMny/k8+Dd0jEIGybMGK0I mvaFhwRwrWfAyEtkWTqhWt3zQmmaTPEGmY1Cd26otVt27uOEJ3EgnbITlGqnIphuZhnPdY IgWabGoxyYzcbcsp7tmAhlKx7BFJEQpInPMxD0xoEtcArH2v/H+anIaj43ayiA== 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 4SkS7H077YzXFB; Mon, 4 Dec 2023 15:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4FLUC3087772; Mon, 4 Dec 2023 15:21:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4FLUwY087769; Mon, 4 Dec 2023 15:21:30 GMT (envelope-from git) Date: Mon, 4 Dec 2023 15:21:30 GMT Message-Id: <202312041521.3B4FLUwY087769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: ec990152c655 - stable/14 - pfctl: use libpfctl instead of DIOCGETRULES directly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: ec990152c6553a658c40e78a94b0032af901397e Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ec990152c6553a658c40e78a94b0032af901397e commit ec990152c6553a658c40e78a94b0032af901397e Author: Kristof Provost AuthorDate: 2023-11-24 23:43:48 +0000 Commit: Kristof Provost CommitDate: 2023-12-04 15:20:57 +0000 pfctl: use libpfctl instead of DIOCGETRULES directly MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 47a0b59379c3bec547e7c829eb12de8276227dff) --- sbin/pfctl/pfctl_optimize.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index a377f9eb04dc..98da986b0aeb 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -878,24 +878,23 @@ block_feedback(struct pfctl *pf, struct superblock *block) int load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) { + char anchor_call[MAXPATHLEN] = ""; struct superblock *block, *blockcur; struct superblocks prof_superblocks; struct pf_opt_rule *por; struct pf_opt_queue queue; - struct pfioc_rule pr; + struct pfctl_rules_info rules; struct pfctl_rule a, b, rule; int nr, mnr; TAILQ_INIT(&queue); TAILQ_INIT(&prof_superblocks); - memset(&pr, 0, sizeof(pr)); - pr.rule.action = PF_PASS; - if (ioctl(pf->dev, DIOCGETRULES, &pr)) { + if (pfctl_get_rules_info(pf->dev, &rules, PF_PASS, "")) { warn("DIOCGETRULES"); return (1); } - mnr = pr.nr; + mnr = rules.nr; DEBUG("Loading %d active rules for a feedback profile", mnr); for (nr = 0; nr < mnr; ++nr) { @@ -904,15 +903,14 @@ load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) warn("calloc"); return (1); } - pr.nr = nr; - if (pfctl_get_rule(pf->dev, nr, pr.ticket, "", PF_PASS, - &rule, pr.anchor_call)) { + if (pfctl_get_rule(pf->dev, nr, rules.ticket, "", PF_PASS, + &rule, anchor_call)) { warn("DIOCGETRULENV"); return (1); } memcpy(&por->por_rule, &rule, sizeof(por->por_rule)); - rs = pf_find_or_create_ruleset(pr.anchor_call); + rs = pf_find_or_create_ruleset(anchor_call); por->por_rule.anchor = rs->anchor; if (TAILQ_EMPTY(&por->por_rule.rpool.list)) memset(&por->por_rule.rpool, 0, From nobody Mon Dec 4 15:21:38 2023 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 4SkS7Q4FYHz53Sqm; Mon, 4 Dec 2023 15:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkS7Q3npfz4sRD; Mon, 4 Dec 2023 15:21:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701703298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D+A5mTWPeFE5jnbPXeIfhrrmJQb4Nk0WHTgUkeUzBLY=; b=I3mWQyl7Oe7ucKtWsGSEQ5yZxxsURo9SUc43xyHN9hWF/W0Q2wgDMYMsBCqezk0pIhhdBc JA8E2ndFrVi7r5F0cv1aq37vDA5fE+DlWabUlwtqkXkDGqaBnsqmjfsRiOAucgUTbX/O3I Sq3Voh5DonPtXu5kgWPoht882itWb6bHA7xG1A9EjGmmrNjD4cqb3wnSABWxCoJpcNLpan KW9bam7YYYAnp4OGgUIs8bmu7RvY6RIFiNWy+YbF88D2qYKkCajCddqhzoOAw/hxgaQp33 QoKpO31NWeQpO0kTEqCoGuWmV49siocruy0szjllYyJAMBuRmOsx1oka1663rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701703298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D+A5mTWPeFE5jnbPXeIfhrrmJQb4Nk0WHTgUkeUzBLY=; b=Pf7uPJsAjk/q+etini7bA8MaiTVOiGpNNPWjfEpz4MfqJ/t/HA326zKY91D4lXwtK6M7zX pRQlwrsD/4zztyXA63g2vJ6mSD2lZMSA7RGZV2kHa5UUtctLqJVfRDYPjHqI4VvJL5833c KebsXcBW+bfuPKAaDTqb1695ZGgcohf3WfC1mEaPv7qlRVnSIcR1Jx4oKpF9ywDryFf/oI BT/ie8wBVcSiJxxm2uA8lxBBL8E5cyGUMMlgUQgXzWv/Znq8g9fXy7QJ+JijMvV2opd2SB cAFfrwmKXGu2NKcvTZEb9TbAvFH1S59CDocCRJayEaynMBizCf9uLw3tdkMepA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701703298; a=rsa-sha256; cv=none; b=Wl2daS+s8dts00ST4eUXx7zH3rbclfRr59fsq13OoJBecBcymLQvDok7YxvfzHtWwq7UsQ krTLH0VtW1/FxsxP1sjaG0ykYDqHEs8PQHhxgMVljOZZBYuDyEBeyXDldRJ5/uHeJpTaOL 2JrQJWMxlIxwzRai85tAcmQ65alVeG2Po+2S0OSYoSBF5O/hVF8xm4yiWDB6M8ip6jWdMy N13VcxxzHI+f2G56pN0aXLZzVupY+Nj/qbGkkHJ/R/Ps+kvNrA697ht6grB89ylXQ9D7Sc wbeJ48GXv0pqVlmVc0/iZPbbh4EpKmbo6R9f7coqD6xMRdrBAXL/wozCMzgJfw== 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 4SkS7Q2tvWzX1m; Mon, 4 Dec 2023 15:21:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4FLcM1087920; Mon, 4 Dec 2023 15:21:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4FLc8Q087917; Mon, 4 Dec 2023 15:21:38 GMT (envelope-from git) Date: Mon, 4 Dec 2023 15:21:38 GMT Message-Id: <202312041521.3B4FLc8Q087917@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9b2326333e88 - stable/13 - pfctl: use libpfctl instead of DIOCGETRULES directly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9b2326333e884bc239d06be7cbd8a4eef571c5eb Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9b2326333e884bc239d06be7cbd8a4eef571c5eb commit 9b2326333e884bc239d06be7cbd8a4eef571c5eb Author: Kristof Provost AuthorDate: 2023-11-24 23:43:48 +0000 Commit: Kristof Provost CommitDate: 2023-12-04 15:21:05 +0000 pfctl: use libpfctl instead of DIOCGETRULES directly MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 47a0b59379c3bec547e7c829eb12de8276227dff) --- sbin/pfctl/pfctl_optimize.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index 8aadccbb2178..00e1cf86e6fe 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -878,24 +878,23 @@ block_feedback(struct pfctl *pf, struct superblock *block) int load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) { + char anchor_call[MAXPATHLEN] = ""; struct superblock *block, *blockcur; struct superblocks prof_superblocks; struct pf_opt_rule *por; struct pf_opt_queue queue; - struct pfioc_rule pr; + struct pfctl_rules_info rules; struct pfctl_rule a, b, rule; int nr, mnr; TAILQ_INIT(&queue); TAILQ_INIT(&prof_superblocks); - memset(&pr, 0, sizeof(pr)); - pr.rule.action = PF_PASS; - if (ioctl(pf->dev, DIOCGETRULES, &pr)) { + if (pfctl_get_rules_info(pf->dev, &rules, PF_PASS, "")) { warn("DIOCGETRULES"); return (1); } - mnr = pr.nr; + mnr = rules.nr; DEBUG("Loading %d active rules for a feedback profile", mnr); for (nr = 0; nr < mnr; ++nr) { @@ -904,15 +903,14 @@ load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) warn("calloc"); return (1); } - pr.nr = nr; - if (pfctl_get_rule(pf->dev, nr, pr.ticket, "", PF_PASS, - &rule, pr.anchor_call)) { + if (pfctl_get_rule(pf->dev, nr, rules.ticket, "", PF_PASS, + &rule, anchor_call)) { warn("DIOCGETRULENV"); return (1); } memcpy(&por->por_rule, &rule, sizeof(por->por_rule)); - rs = pf_find_or_create_ruleset(pr.anchor_call); + rs = pf_find_or_create_ruleset(anchor_call); por->por_rule.anchor = rs->anchor; if (TAILQ_EMPTY(&por->por_rule.rpool.list)) memset(&por->por_rule.rpool, 0, From nobody Mon Dec 4 16:28:46 2023 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 4SkTct39gDz53WvN; Mon, 4 Dec 2023 16:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkTct2glwz3D7p; Mon, 4 Dec 2023 16:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701707326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qTN2He2W/Cx50/xw0oJdyhFPWKM6M52yf14cGuVqqVo=; b=rycKbeZkZvXXvrUw6nS/drIUxb690oDhrVs1NJkgfDw3uPO/OcWx1IO9Y+X7sZ5m16mW2k zuEa1ZDiYon9SSKNNoeSKBo7dd1ID4o1Iot/PdIrcs/v6A7DW1acq1X902asE6l2li3cog iqfNwJhJrmpEOOBoF20lTNuofnBs0zxVuNCcq+MDmycQX3mZUheKhlitqkhD2h/QMd/7At cjBeFbXTMTEWxXwGuK+ghCtVN66MAQeaIIe/ZLlr2gDK8vfAKUW6MM9WEKmwkj7ThZjge/ WeM9/27MoEh9b6vA29CAZjhGPfTNSYx5jQjnYezT1Zu3K/MHc/BVacpcqRgb5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701707326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qTN2He2W/Cx50/xw0oJdyhFPWKM6M52yf14cGuVqqVo=; b=hA1gtKdRKiQsmAZGkvx+85ATtLjvYIIVXRAV5eGWIimstWLQM+Rdy9v6aCyVDoB/qIJUrF XeZFQFyibwCMqogBTCGmgLzEC7xWTu+chYRlCziNcvgPnhzWoY6VgWLybUxHZMr0rVoM7n JcEuNDxKyEA8hXtpMArld2kd/0BClLQj2LgzSI9iUWp2S4mftUjratV7+0aNsZONJd5sxo Ls8GoyoBNJ51YQU3OtVxAcWEh2kTAuneLuSXtDm/D0rHvood1mYsXr6gC2jA6msKrUHDZ4 Erz/2BZc3pXNRLaxLcbk/d0sHxTClfVUMbWf9WUsxHnEa/Wbbc/mnF36J1y0KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701707326; a=rsa-sha256; cv=none; b=uIsz3VglpNpdrR3ugD7sPZYoNjQx33UXMMkL+NTF0/ni8tIzK+k7M3Lv7oc2Aw5TA/bcAZ uJGTnOLFZCv9RcPyM3ih4UfprdDYIHMOsp73CkUDa9Eq6lvWaZwaw3m4QQBtRe6pF+nr8m Qzud1qoJoK7CTokLUwrW44qGNciqsgI85uCGWJjSNJ2T3fqILj+6nNJY1HFzCCvoLTeCLh XiW8agc2KQGPkUNqd7JGbwgErJhy+ZED9EYzHWA6rFyC9hnNxHiTA25C8d40b9fGDFcxUK WNSEe4m0RO19Yit5MT3RhGZNnT6y/UYffTp9qFsGJZAS5iTxtKTnddjaIyERWg== 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 4SkTct1kHkzZ1K; Mon, 4 Dec 2023 16:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4GSknt094342; Mon, 4 Dec 2023 16:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4GSkoE094339; Mon, 4 Dec 2023 16:28:46 GMT (envelope-from git) Date: Mon, 4 Dec 2023 16:28:46 GMT Message-Id: <202312041628.3B4GSkoE094339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 6084d9894970 - main - pkgbase: kill circular dependency List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6084d989497087dc4c7db8621a1b5a8e4d0559e1 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=6084d989497087dc4c7db8621a1b5a8e4d0559e1 commit 6084d989497087dc4c7db8621a1b5a8e4d0559e1 Author: Baptiste Daroussin AuthorDate: 2023-12-04 16:27:51 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 16:27:51 +0000 pkgbase: kill circular dependency clang was set to depend on clang-dev, but clang-dev already depends on clang by design MFC After: 3 days --- release/packages/generate-ucl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 9e9680559428..e5563c51a4cd 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -45,7 +45,7 @@ main() { pkgdeps="caroot openssl" ;; clang) - pkgdeps="lld clang-dev libcompiler_rt-dev" + pkgdeps="lld libcompiler_rt-dev" ;; # -dev packages that have no corresponding non-dev package From nobody Mon Dec 4 17:48:45 2023 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 4SkWPB0dsMz53c5M; Mon, 4 Dec 2023 17:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkWP96lzDz3Kqk; Mon, 4 Dec 2023 17:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701712126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AZwmsZZYM80fhJWuTo2357QMsYJ/nTK0JA5zw+AtnQI=; b=UVW6ZyR8Y3E5lBzzoyBz2a1HT9RQZQSN6yYj8E29mu/rxgunycG6mOwIgx99z0kgvC2259 BXQnLNSrTbPpR2/H0x5+koNGCXsVbLV32H7Nsyl9rMkqD8kU4I1FQ+x89tqxynmA7yTHGm lQTus66SBPrM9yW322LckmPgxgT5qhW7OsVnj9fC1D4fWqto70D7z/hIPPSxVhFLw1oidI CxS+kk/++qrtGVYdfMqQWRqwu+bRwR6Uh9+cL8g7HmTonhRr5JWAGyPz4IdshcPKwJgwbV 9bEIn6s/WKIqwB3HUi/qA3pbjTwuGP1eWFH4p4tvKFLyqspjGISGdWkqh6VP0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701712125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AZwmsZZYM80fhJWuTo2357QMsYJ/nTK0JA5zw+AtnQI=; b=XNWkUuFxrNfnME4T9C2zlB4CkS08ttpoKgvJKRnZYFx9NpkliNkhUrREw+eEjbo1plAVtB NmpOo2x0vG7mW8saq7ecrTM9oR1DS591dBdCvpEbuHPBfpc/J6n/m9bGOhEk9EvQL4uiA7 vEL1q+V1VU/lHlTrmQPqwGJPle7Ap0bYelzvz72Tb1wdCYv9coGCpct517LSGc0d/zvuX0 c/Tg3i9ppSmSTpcEcSOZJ6vaPRn9qwQ1SN1vyZgl1r0LZwMS64LuCeobOxwzjYtfsR+F5k yfCPfJCpg6gsczBh51JE0wlnaeEsh56RGIRWogWt3Yyz9lufc6QbtCpCf2AhCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701712126; a=rsa-sha256; cv=none; b=ENqoJAfzK0czeH7D7hbCcrO3AVhm1M4zZu7VRHPpp7XVvQHti3eTUf/4fc7onBqdyX1ver 49KA8nm15nNrZF5GSm07GNp1Eu2rPYGdFcT25sykCJMreMqae6aMVsRVhbBMvnZMDxqpq8 OcsXUcv++k7hYrDYU/kCiOCZ6Wht7pNOG6WX+RnMRGAJmGTOUUWdut3qaBi2lT8pX2fxRZ vsFteePIDHEYdLn3bkVje8Q+NDbhtp2VrkueAK/IlwJeUAuUT0Nn5LNqinMSblxKYm+kx2 NwFYEG8PQwBzjiyqJUUusihprV1Bd3bbz+w91+9vtMH390Frawsi53PAzAzPkA== 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 4SkWP95ny2zc1s; Mon, 4 Dec 2023 17:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4Hmj1P026693; Mon, 4 Dec 2023 17:48:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4HmjDk026690; Mon, 4 Dec 2023 17:48:45 GMT (envelope-from git) Date: Mon, 4 Dec 2023 17:48:45 GMT Message-Id: <202312041748.3B4HmjDk026690@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: 5b36076d28ad - main - zfs tests: Silence clang warning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5b36076d28ad1920b178da93d667dcfeae426494 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5b36076d28ad1920b178da93d667dcfeae426494 commit 5b36076d28ad1920b178da93d667dcfeae426494 Author: Jose Luis Duran AuthorDate: 2023-11-07 15:05:15 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 17:22:14 +0000 zfs tests: Silence clang warning "assigning to 'pattern_t *' from 'const pattern_t *' discards qualifiers" Reviewed by: asomers Reported by: clang MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42791 --- tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c b/tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c index 17c6b63d45d8..5aba7a83225f 100644 --- a/tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c +++ b/tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c @@ -106,7 +106,7 @@ typedef struct { typedef struct { int thread_num; - pattern_t* pat; + const pattern_t* pat; } thread_data_t; @@ -354,7 +354,7 @@ verify_file(int fd, const pattern_t* p_pat){ /* Writes a special marker to every byte within the chunk */ static void -write_chunk(pattern_t* p_pat, int chunk_idx, int thread_num) +write_chunk(const pattern_t* p_pat, int chunk_idx, int thread_num) { uint32_t chunk_start, chunk_end; get_chunk_range(p_pat, chunk_idx, &chunk_start, &chunk_end); From nobody Mon Dec 4 17:48:46 2023 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 4SkWPC2fLJz53c7r; Mon, 4 Dec 2023 17:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkWPC0x8rz3L8j; Mon, 4 Dec 2023 17:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701712127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jrZXjOtcsUDRJcb5GixBWm+HJfhJOOjJ2OLbpckqjLg=; b=Z+Qc69CRQQ/fcMTJx9A+JJOsl6uQSGldencpMnM6YuUzfQDtfWJqzKM3jlOzYy/PwgDxCt oUvL7uHCWZdgXlx+IgZcOkr06SLtm98lWqjq/ImDtxpmL1TCZyPS/h96H/zIVeDFUrvSsE vR/am7J+NwKNYz4413gHCvZIXh1YchWTZZmmhzjLCb/9ZOW10r7VcW6ckV05odmmebQiJs Y6z0ZjXZ0iG0QG+Z1+wKb96CziVlE2QVThD9zKYDlvnGu2gviXplrRZKMPnwQnJG15DgC5 U0JBJygBCY3gPDMTwFVT1rWvRNFRv0Q8zocM3LFU1Bl6xukrItex56cpWVmiIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701712127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jrZXjOtcsUDRJcb5GixBWm+HJfhJOOjJ2OLbpckqjLg=; b=Qgqk4oyZLQaWbmhR7hNBlxM7wfm5k2xTvUvkYmKCOITANL0R7SD5JzP8B34mpWwuOlE67a yCz09r1LnXDpTDisv3Y+aAp6o1h0sR3QuPhnXau984Sf6Y9tgsdGj61qcw9HITQNCKzYY0 rEE+pRfz/qayxBJC3QvSg+gnhiBwucT/Y534nuOeXpPjHoZEPf3CR0yANQPZE1d+rVSX2U O2tU5HqmhZjWernZMucQmn67OaxaJu3S7OYBhETHhY+RCNtUleXF6UdiXvQGkOq+Fe+IB1 UzUt25FoFf85JmzzAx7amvHYF4o2ZFwSxiLZE/uxX+2wyh2TGWHHZvmmPdlC2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701712127; a=rsa-sha256; cv=none; b=GPnTKV1QW7noSPiMiag+YCp2P+DEE/dLJONrnYKA+CwkkATVokzlXIj9UpoF31RpakZ7zt i+8HNbr3lbUPPVzZJ7UM13EfpHa5i/LDwtG6JY1fzkbbrrzONkq9ORSaoMTIHfIGMZ/SPY hw757flrtp51qpWt3UVyPC+2uQA9TipgC544C0YxiZu5VMMnEdQw7T22JH14ptmoPiHDzt H1cxgAh+vI63pWJ8Y1vy0LLi7rw9JS0Tc6CZKtwrqNNdmDW/DfLeOqafsXa9LG2x1e2bZ/ WS54MIt867+l7vBsANeASFPddzwMbWPRBaHB5zEju5wIs81yBRReAOLJAOVxIA== 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 4SkWPB6TByzbcD; Mon, 4 Dec 2023 17:48:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4Hmkpr026742; Mon, 4 Dec 2023 17:48:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4HmkEk026739; Mon, 4 Dec 2023 17:48:46 GMT (envelope-from git) Date: Mon, 4 Dec 2023 17:48:46 GMT Message-Id: <202312041748.3B4HmkEk026739@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: e655cc70dfcd - main - ossl: Move arm_arch.h to a common subdirectory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e655cc70dfcda5cfedb5a1d9bef1e87d55519f64 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e655cc70dfcda5cfedb5a1d9bef1e87d55519f64 commit e655cc70dfcda5cfedb5a1d9bef1e87d55519f64 Author: Mark Johnston AuthorDate: 2023-12-04 17:29:11 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 17:29:11 +0000 ossl: Move arm_arch.h to a common subdirectory OpenSSL itself keeps only a single copy of this header. Do the same in sys/crypto/openssl to avoid the extra maintenance burden. This requires adjusting the include paths for generated asm files. No functional change intended. Reported by: jrtc27 Reviewed by: jhb MFC after: 3 months Differential Revision: https://reviews.freebsd.org/D42866 --- secure/lib/libcrypto/Makefile.asm | 3 +- sys/conf/files.arm | 23 +++++--- sys/conf/files.arm64 | 6 +-- sys/crypto/openssl/arm/arm_arch.h | 84 ----------------------------- sys/crypto/openssl/arm/ossl_aes_gcm.c | 2 +- sys/crypto/openssl/{aarch64 => }/arm_arch.h | 0 sys/crypto/openssl/ossl_aarch64.c | 2 +- sys/crypto/openssl/ossl_aarch64.h | 2 +- sys/crypto/openssl/ossl_arm.c | 2 +- sys/modules/armv8crypto/Makefile | 3 +- sys/modules/ossl/Makefile | 2 + 11 files changed, 28 insertions(+), 101 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm index 644965c1ac1c..d4f7269aa500 100644 --- a/secure/lib/libcrypto/Makefile.asm +++ b/secure/lib/libcrypto/Makefile.asm @@ -46,7 +46,7 @@ ASM= ${SRCS:R:S/$/.S/} sha256-armv8.S all: ${ASM} rm -f ${ASM:R:S/$/.s/} - ${CP} ${LCRYPTO_SRC}/crypto/arm_arch.h arm_arch.h + ${CP} ${LCRYPTO_SRC}/crypto/arm_arch.h ../arm_arch.h CLEANFILES= ${ASM} .SUFFIXES: .pl @@ -186,6 +186,7 @@ ASM= ${SRCS:R:S/$/.S/} all: ${ASM} rm -f ${ASM:R:S/$/.s/} + ${CP} ${LCRYPTO_SRC}/crypto/arm_arch.h ../arm_arch.h CLEANFILES= ${ASM} .SUFFIXES: .pl diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 4dcbd18bdeb9..8b5674b839df 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -137,15 +137,22 @@ libkern/umoddi3.c standard crypto/openssl/ossl_arm.c optional ossl crypto/openssl/arm/ossl_aes_gcm.c optional ossl -crypto/openssl/arm/aes-armv4.S optional ossl +crypto/openssl/arm/aes-armv4.S optional ossl \ + compile-with "${NORMAL_C} -I${SRCTOP}/sys/crypto/openssl" crypto/openssl/arm/bsaes-armv7.S optional ossl \ - compile-with "${CC} -D__KERNEL__ -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" -crypto/openssl/arm/chacha-armv4.S optional ossl -crypto/openssl/arm/ghash-armv4.S optional ossl -crypto/openssl/arm/poly1305-armv4.S optional ossl -crypto/openssl/arm/sha1-armv4-large.S optional ossl -crypto/openssl/arm/sha256-armv4.S optional ossl -crypto/openssl/arm/sha512-armv4.S optional ossl + compile-with "${CC} -D__KERNEL__ -c ${CFLAGS:N-mgeneral-regs-only} -I${SRCTOP}/sys/crypto/openssl ${WERROR} ${.IMPSRC}" +crypto/openssl/arm/chacha-armv4.S optional ossl \ + compile-with "${NORMAL_C} -I${SRCTOP}/sys/crypto/openssl" +crypto/openssl/arm/ghash-armv4.S optional ossl \ + compile-with "${NORMAL_C} -I${SRCTOP}/sys/crypto/openssl" +crypto/openssl/arm/poly1305-armv4.S optional ossl \ + compile-with "${NORMAL_C} -I${SRCTOP}/sys/crypto/openssl" +crypto/openssl/arm/sha1-armv4-large.S optional ossl \ + compile-with "${NORMAL_C} -I${SRCTOP}/sys/crypto/openssl" +crypto/openssl/arm/sha256-armv4.S optional ossl \ + compile-with "${NORMAL_C} -I${SRCTOP}/sys/crypto/openssl" +crypto/openssl/arm/sha512-armv4.S optional ossl \ + compile-with "${NORMAL_C} -I${SRCTOP}/sys/crypto/openssl" # Annapurna support arm/annapurna/alpine/alpine_ccu.c optional al_ccu fdt diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 9ccead6a98e1..5d9464bade9c 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -119,17 +119,17 @@ dev/iommu/iommu_gas.c optional iommu crypto/armv8/armv8_crypto.c optional armv8crypto armv8_crypto_wrap.o optional armv8crypto \ dependency "$S/crypto/armv8/armv8_crypto_wrap.c" \ - compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ ${WERROR} ${NO_WCAST_QUAL} ${CFLAGS:M-march=*:S/^$/-march=armv8-a/}+crypto ${.IMPSRC}" \ + compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8 ${WERROR} ${NO_WCAST_QUAL} ${CFLAGS:M-march=*:S/^$/-march=armv8-a/}+crypto ${.IMPSRC}" \ no-implicit-rule \ clean "armv8_crypto_wrap.o" aesv8-armx.o optional armv8crypto | ossl \ dependency "$S/crypto/openssl/aarch64/aesv8-armx.S" \ - compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ ${WERROR} ${NO_WCAST_QUAL} ${CFLAGS:M-march=*:S/^$/-march=armv8-a/}+crypto ${.IMPSRC}" \ + compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8 -I$S/crypto/openssl ${WERROR} ${NO_WCAST_QUAL} ${CFLAGS:M-march=*:S/^$/-march=armv8-a/}+crypto ${.IMPSRC}" \ no-implicit-rule \ clean "aesv8-armx.o" ghashv8-armx.o optional armv8crypto \ dependency "$S/crypto/openssl/aarch64/ghashv8-armx.S" \ - compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ ${WERROR} ${NO_WCAST_QUAL} ${CFLAGS:M-march=*:S/^$/-march=armv8-a/}+crypto ${.IMPSRC}" \ + compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8 -I$S/crypto/openssl ${WERROR} ${NO_WCAST_QUAL} ${CFLAGS:M-march=*:S/^$/-march=armv8-a/}+crypto ${.IMPSRC}" \ no-implicit-rule \ clean "ghashv8-armx.o" diff --git a/sys/crypto/openssl/arm/arm_arch.h b/sys/crypto/openssl/arm/arm_arch.h deleted file mode 100644 index 8b7105571d78..000000000000 --- a/sys/crypto/openssl/arm/arm_arch.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the OpenSSL license (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -#ifndef OSSL_CRYPTO_ARM_ARCH_H -# define OSSL_CRYPTO_ARM_ARCH_H - -# if !defined(__ARM_ARCH__) -# if defined(__CC_ARM) -# define __ARM_ARCH__ __TARGET_ARCH_ARM -# if defined(__BIG_ENDIAN) -# define __ARMEB__ -# else -# define __ARMEL__ -# endif -# elif defined(__GNUC__) -# if defined(__aarch64__) -# define __ARM_ARCH__ 8 -# if __BYTE_ORDER__==__ORDER_BIG_ENDIAN__ -# define __ARMEB__ -# else -# define __ARMEL__ -# endif - /* - * Why doesn't gcc define __ARM_ARCH__? Instead it defines - * bunch of below macros. See all_architectures[] table in - * gcc/config/arm/arm.c. On a side note it defines - * __ARMEL__/__ARMEB__ for little-/big-endian. - */ -# elif defined(__ARM_ARCH) -# define __ARM_ARCH__ __ARM_ARCH -# elif defined(__ARM_ARCH_8A__) -# define __ARM_ARCH__ 8 -# elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || \ - defined(__ARM_ARCH_7R__)|| defined(__ARM_ARCH_7M__) || \ - defined(__ARM_ARCH_7EM__) -# define __ARM_ARCH__ 7 -# elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ - defined(__ARM_ARCH_6K__)|| defined(__ARM_ARCH_6M__) || \ - defined(__ARM_ARCH_6Z__)|| defined(__ARM_ARCH_6ZK__) || \ - defined(__ARM_ARCH_6T2__) -# define __ARM_ARCH__ 6 -# elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \ - defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__) || \ - defined(__ARM_ARCH_5TEJ__) -# define __ARM_ARCH__ 5 -# elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) -# define __ARM_ARCH__ 4 -# else -# error "unsupported ARM architecture" -# endif -# endif -# endif - -# if !defined(__ARM_MAX_ARCH__) -# define __ARM_MAX_ARCH__ __ARM_ARCH__ -# endif - -# if __ARM_MAX_ARCH__<__ARM_ARCH__ -# error "__ARM_MAX_ARCH__ can't be less than __ARM_ARCH__" -# elif __ARM_MAX_ARCH__!=__ARM_ARCH__ -# if __ARM_ARCH__<7 && __ARM_MAX_ARCH__>=7 && defined(__ARMEB__) -# error "can't build universal big-endian binary" -# endif -# endif - -# ifndef __ASSEMBLER__ -extern unsigned int OPENSSL_armcap_P; -# endif - -# define ARMV7_NEON (1<<0) -# define ARMV7_TICK (1<<1) -# define ARMV8_AES (1<<2) -# define ARMV8_SHA1 (1<<3) -# define ARMV8_SHA256 (1<<4) -# define ARMV8_PMULL (1<<5) -# define ARMV8_SHA512 (1<<6) - -#endif diff --git a/sys/crypto/openssl/arm/ossl_aes_gcm.c b/sys/crypto/openssl/arm/ossl_aes_gcm.c index 71a977c446ae..e51b7b4fbc04 100644 --- a/sys/crypto/openssl/arm/ossl_aes_gcm.c +++ b/sys/crypto/openssl/arm/ossl_aes_gcm.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include diff --git a/sys/crypto/openssl/aarch64/arm_arch.h b/sys/crypto/openssl/arm_arch.h similarity index 100% rename from sys/crypto/openssl/aarch64/arm_arch.h rename to sys/crypto/openssl/arm_arch.h diff --git a/sys/crypto/openssl/ossl_aarch64.c b/sys/crypto/openssl/ossl_aarch64.c index b53abd905f6d..a9d0b0bbe211 100644 --- a/sys/crypto/openssl/ossl_aarch64.c +++ b/sys/crypto/openssl/ossl_aarch64.c @@ -35,7 +35,7 @@ #include #include -#include +#include /* * Feature bits defined in arm_arch.h diff --git a/sys/crypto/openssl/ossl_aarch64.h b/sys/crypto/openssl/ossl_aarch64.h index f933f862d009..57183aa9ed69 100644 --- a/sys/crypto/openssl/ossl_aarch64.h +++ b/sys/crypto/openssl/ossl_aarch64.h @@ -12,7 +12,7 @@ #include #include -#include +#include /* aesv8-armx.S */ ossl_cipher_encrypt_t aes_v8_cbc_encrypt; diff --git a/sys/crypto/openssl/ossl_arm.c b/sys/crypto/openssl/ossl_arm.c index 74dc25586464..97215007c663 100644 --- a/sys/crypto/openssl/ossl_arm.c +++ b/sys/crypto/openssl/ossl_arm.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include ossl_cipher_setkey_t AES_set_encrypt_key; ossl_cipher_setkey_t AES_set_decrypt_key; diff --git a/sys/modules/armv8crypto/Makefile b/sys/modules/armv8crypto/Makefile index da8e962c0307..74ea77fbb761 100644 --- a/sys/modules/armv8crypto/Makefile +++ b/sys/modules/armv8crypto/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/crypto/armv8 .PATH: ${SRCTOP}/sys/crypto/openssl/aarch64 @@ -8,6 +7,8 @@ SRCS+= device_if.h bus_if.h opt_bus.h cryptodev_if.h OBJS+= armv8_crypto_wrap.o aesv8-armx.o ghashv8-armx.o +CFLAGS+=-I${SRCTOP}/sys/crypto/openssl + # Remove -nostdinc so we can get the intrinsics. armv8_crypto_wrap.o: armv8_crypto_wrap.c ${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} \ diff --git a/sys/modules/ossl/Makefile b/sys/modules/ossl/Makefile index 804ffb5e1b70..9777e0bcfacc 100644 --- a/sys/modules/ossl/Makefile +++ b/sys/modules/ossl/Makefile @@ -61,6 +61,8 @@ SRCS.i386= \ CFLAGS.bsaes-armv7.S+= -D__KERNEL__ +CFLAGS+= -I${SRCTOP}/sys/crypto/openssl + # For arm64, we are forced to rewrite the compiler invocation for the assembly # files, to remove -mgeneral-regs-only. ${SRCS.aarch64:M*.S:S/S/o/}: ${.TARGET:R}.S From nobody Mon Dec 4 17:48:47 2023 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 4SkWPD1htCz53c39; Mon, 4 Dec 2023 17:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkWPD0vkMz3LBs; Mon, 4 Dec 2023 17:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701712128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pKcyT6JGz3yZ8pm/ETYBWRaarM9EzaCy55ZQs74ADLU=; b=xw3pjwz6bT5g2NWvATzyOXPenYpxV1QO9PaACQ85O3LUdxFwRi4hAWEhkV8BAEP/rFZyVm UgAIHaQ2zNljz6RgV7QO1G9O5ewcNx+QyEMfQGHp8ISnc2hMAdfwwpJOUBu704mi2g4GmC OSzrEOyNGKb68MmIRrBDk0fV1BHZ+hEhSIKAZdoPKJOYaZ9qJ9rSOiKxP9DJuz57XHh4oS 0ImjR3iGiUH3M0d+tJz+E0LTaRwMp0Libp4t7SQqQMbo9buzP4F6WT/qK+YjwWvHljGriq Wx/rL03x7fuFQiqkuvqrhhZH8f4QSYWovejSdmY7BK4fQ9yRk4rtp9Gjkyz6BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701712128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pKcyT6JGz3yZ8pm/ETYBWRaarM9EzaCy55ZQs74ADLU=; b=Wthp3Ia75SdFHaAVbSsRjVz9a5H0Vkuwgh/p/D1Cu4LznpKIWgGnGyWwCpcvj99AzTgMx4 jDHh7ShqedDdWaqBkoMCvdtjoz9xFi5EpLgaQSgGF/64kp78jdNhcxIN27jhMWvCOPInCV djl75K1Af5FCuIXyd2zM9Xo7H/rYI7xYvlQQr7VAS/k6ahHzVczdpzmkyqXNOmjiiv/HWs cRkZdpqvrNKCwWsXOwar1lUn34h3XArl9HnWo13HaMK6V9OgU4138DiiNylJda1r/bqUmO B4zwWC55vEbADvow61qXxd5o81VKslLQn75S5x+H073dDRiQU2fOhsvQ9Ip3fQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701712128; a=rsa-sha256; cv=none; b=nKgenoJx2NKR8imp8vWC4usqOupjd/hNaZYakixmlYYeIIYiPxXUoWvTdsvNBf77P8vE/s qOjIyc1iTBLvBpx/iQziFUz08JkVyHoWwzmoV4tYmDKjAL6tgiRyGFYcxEEFqpsqKTjo+o zKkX/3I2RWehKprT5auVDID0wIi734zPuBXhkf68iDZM6lj8eYLUMXkZd/d+QHRN+8hOPI iuabtoxm6XD3pF66jOUNjMY4JqquT/k8TFBIADTDs4i/KLmbOtbrzVT/0bvmwa6ASsf1Ag KgqC6P+vEv2f8RW9I0yYzgitkqLlQbLWFhrlNks4+UVgvN5XxAjWhqtevwZvEQ== 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 4SkWPD002bzbsg; Mon, 4 Dec 2023 17:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4Hml5m026791; Mon, 4 Dec 2023 17:48:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4HmliR026788; Mon, 4 Dec 2023 17:48:47 GMT (envelope-from git) Date: Mon, 4 Dec 2023 17:48:47 GMT Message-Id: <202312041748.3B4HmliR026788@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: 0eea265a58f9 - main - ossl: Remove a stray __FBSDID("$FreeBSD$") List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0eea265a58f942f7f189ba758f4cac4355d42221 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0eea265a58f942f7f189ba758f4cac4355d42221 commit 0eea265a58f942f7f189ba758f4cac4355d42221 Author: Mark Johnston AuthorDate: 2023-12-04 17:29:30 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 17:29:30 +0000 ossl: Remove a stray __FBSDID("$FreeBSD$") Fixes: 44f8e1e8530e ("ossl: Add support for armv7") --- sys/crypto/openssl/ossl_arm.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/crypto/openssl/ossl_arm.c b/sys/crypto/openssl/ossl_arm.c index 97215007c663..206bf908ce76 100644 --- a/sys/crypto/openssl/ossl_arm.c +++ b/sys/crypto/openssl/ossl_arm.c @@ -29,9 +29,6 @@ * THE POSSIBILITY OF SUCH DAMAGES. */ -#include -__FBSDID("$FreeBSD$"); - #include #include From nobody Mon Dec 4 17:59:32 2023 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 4SkWdc38Rjz52d72; Mon, 4 Dec 2023 17:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkWdc2cxBz3NJ9; Mon, 4 Dec 2023 17:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701712772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JY2SdVeaikFtMOwbNuLZXxyxE2o66IT3zYeYbw6Hbfs=; b=MI/UoYeGsf+hgNuaMmYx2oXxgY2erIbyvmq033tiLm5+sS4Rqf1uhD7dnjVyk1a8y5TyiZ 7jq7lwG+LaWGxJ8vOIXZGJIUPeraVDRDuMjkOF9UdOMLeesdcsFEPloALPRmE+w4xiyOzj 5O/Xeym17AjRNhago9t2NruMch4puBWROW6CZSKudmv/wkmH8blH1Ik7FKGrKj+vF8uUzn dEG0JN9pWVDSB9DYKeMH3qyHA8pxFlt9TgGlRHwrTApxtyDO+7pm0ws3jAlQ4HtPEUkxWN lEZu6dct2SJUls4nkOLKA+HfoMQ9g4bX4+jHgSGvJAAbcTsyHfdphrwUiD9/EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701712772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JY2SdVeaikFtMOwbNuLZXxyxE2o66IT3zYeYbw6Hbfs=; b=Gv04TRIUUVjDPSE/vfQGBiLZ7XlHtlQKHyPXriSd0rzwrw+0mEFl1UDUrChhcxPKvasPrw fHbZZqkva5kxamcAQKRkaSRpqCeib3QlpOHiM9DQkiByAZwZmk8e0r2XfiO6xHchydoEO1 NR95dgKGQYQYEDqQ27orGJxPEvQoirjAgXe+4qUWUnrPbDB2uoocfkSwqNpa8RUcZVQrld DI/39rprIn43qHFUGv3jsJjWsjMZGxhRQgohVWJo6/nBoIbo9uqwhjh9ejEsr91/bhNYsh jjRsXKbuMFwTLHbSwYCYQnl8UbU9WW8JLVqJJBCl6RBaVPHcfQuTC7ObssR9Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701712772; a=rsa-sha256; cv=none; b=IdbHz4z3BUdL2kBqhcvl+z58CdDb47QU7LTfPavx07jE0CQjdAIJORsup7Wv+095tuLCUP 1cc13Z8iPA6J5ZYSk5vYai3+w6vLNiseFIJ+Scc+gBH4pPStSAdK6yNvKRObUI4LBtI8ko 6butyD131ElGjPFHTfVvCe7UPsvC4nyTEoB/1Pzeod25vP8FujChShi5upJ2S0uabCJ8SQ d0CA6fhlsr8a1DwDImltUWosZRfTyUe+ae9BbCGP1563ZM+DptAXaGw8tl4U00pPYnxaHM WuSQPmfZchU7IF0J2wQMEGmbQcM6JM04+vtp8a9CFBsnQ3J2zPEcpPv3OV0T1A== 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 4SkWdc1hbDzc7K; Mon, 4 Dec 2023 17:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4HxWDo044045; Mon, 4 Dec 2023 17:59:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4HxWZc044042; Mon, 4 Dec 2023 17:59:32 GMT (envelope-from git) Date: Mon, 4 Dec 2023 17:59:32 GMT Message-Id: <202312041759.3B4HxWZc044042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 641efdd10cc3 - main - Merge commit 989879f8fded from llvm git (by Paul Walker): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 641efdd10cc3ad05fb7eaeeae20b15c5ad4128c8 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=641efdd10cc3ad05fb7eaeeae20b15c5ad4128c8 commit 641efdd10cc3ad05fb7eaeeae20b15c5ad4128c8 Author: Dimitry Andric AuthorDate: 2023-12-04 17:59:02 +0000 Commit: Dimitry Andric CommitDate: 2023-12-04 17:59:11 +0000 Merge commit 989879f8fded from llvm git (by Paul Walker): [Clang] Allow C++11 style initialisation of SVE types. Fixes https://github.com/llvm/llvm-project/issues/63223 Differential Revision: https://reviews.llvm.org/D153560 Requested by: andrew MFC after: 3 days --- contrib/llvm-project/clang/lib/CodeGen/CGExprScalar.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/contrib/llvm-project/clang/lib/CodeGen/CGExprScalar.cpp b/contrib/llvm-project/clang/lib/CodeGen/CGExprScalar.cpp index a0dcb978b1ac..ba8b5ab502d2 100644 --- a/contrib/llvm-project/clang/lib/CodeGen/CGExprScalar.cpp +++ b/contrib/llvm-project/clang/lib/CodeGen/CGExprScalar.cpp @@ -1861,6 +1861,23 @@ Value *ScalarExprEmitter::VisitInitListExpr(InitListExpr *E) { return Visit(E->getInit(0)); } + if (isa(VType)) { + if (NumInitElements == 0) { + // C++11 value-initialization for the vector. + return EmitNullValue(E->getType()); + } + + if (NumInitElements == 1) { + Expr *InitVector = E->getInit(0); + + // Initialize from another scalable vector of the same type. + if (InitVector->getType() == E->getType()) + return Visit(InitVector); + } + + llvm_unreachable("Unexpected initialization of a scalable vector!"); + } + unsigned ResElts = cast(VType)->getNumElements(); // Loop over initializers collecting the Value for each, and remembering From nobody Mon Dec 4 18:19:13 2023 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 4SkX4K6YB7z52f8W; Mon, 4 Dec 2023 18:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkX4K62B7z3R53; Mon, 4 Dec 2023 18:19:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701713953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z+KFy1WRYlPhDXIREcNKHYPE0kPSolJBNoDkFHF2xxo=; b=AvJ4o+OaxiBH8Kry7lHcuV5KYop81SiigQpUw4B8MARVwnggBdQ/PzF1eZJAeTeO9DPa9l Jl310ZjoYBxsSnAEDmD0NzMNabuvWElqli7prFLROJYinjCYIyk+6PQsdws2bAijbuhVtf g9Iq9mtlZE40Im8LwP4p9qIGPP+/P3elwOwOCTOltmISvR4cseF0Ga8H5dgl+PJexkrHBI 2BI8x3XqLHh904vOpu7pex5Wh7NCeichJMUetSf01ikohciCN4YE3RQsHsK1L02ojDJnMG 3RDHk4cQCPKU3j+cGIXOGvyciEY5fozSDs4hlEOoaGzHcOOmZe2oQl8eugU45Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701713953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z+KFy1WRYlPhDXIREcNKHYPE0kPSolJBNoDkFHF2xxo=; b=be+kqVPkhURvin9CFNAnSX2TSoQw8YDe1NslQMce3KIj6EnNDbGmqubPnIycefKXLNEVLV WA0QzqTK9ON51ZG46QgYJVrOYpKp5soa077sTkxq9w2BfXY50Oc/0D/E9xbn51PlWhguu6 Fz9DNH8YUS2mlYHZtLYumIF3H2VsEFJct7+uBJfu4Qw4uIpLee108e9c5OE5as+dyR8CMv vkX0sJ4E9JrKxZSsKxQy1/uL2foBlk12vtZ77s8Vhvui7/s/OCkyumPiHGZokNbxxcWQpk IxibHi/3H4zHGhsaevQ0as6tfzEQUs6Lq073m1Fr/VFjBbrpNcEtycWyd/IDmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701713953; a=rsa-sha256; cv=none; b=QCa0sFGV1p6AXhI6RfoBl10DJS2f3c4kj+s6HEjtVAvpq6fk/KOBy0eap25kDnonZl+3Uc PDboDOZzieQbTiSj8WBd5ZdzgeWFHCbmEozfe7p+joBAMGIDKy0+tRUJCuHhCKqe0r4T1g erKaRy+XYqqBUkG3ebJkDz68xPD0etvnb83OYAeMDtxtHS62g++/nWm1viNbaQ/zwPjKHO nZJIUwM40ddULgA7iXDM8/Z5mV9dPQDeydXHoatrXDRd4Y7cKeUpbrjgnpvzWM9FAVMvIG Z0x91nsmPjgZP4b65/sD+QdkV4M4tdmkp5Beg4kAu/ZVa3ItH/IDMrbr2CkucA== 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 4SkX4K54vSzcCg; Mon, 4 Dec 2023 18:19:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4IJDuK077661; Mon, 4 Dec 2023 18:19:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4IJD5i077658; Mon, 4 Dec 2023 18:19:13 GMT (envelope-from git) Date: Mon, 4 Dec 2023 18:19:13 GMT Message-Id: <202312041819.3B4IJD5i077658@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: 5b0010b4678d - main - if_tuntap: fix NOIP 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5b0010b4678d778967a5a82fb38507e46a071e38 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=5b0010b4678d778967a5a82fb38507e46a071e38 commit 5b0010b4678d778967a5a82fb38507e46a071e38 Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:18:56 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-04 18:18:56 +0000 if_tuntap: fix NOIP build Note: this removes one TUNDEBUG() for the sake of not having one more ifdefed variable declaration and for the overall code brevity. The call from tuntap into LRO can be so easily traced with dtrace(1) that an 80-ish printf(9)-based debugging can be omitted. Fixes: 99c79cab422705f92f05a2924a29bdf823372ebf --- sys/net/if_tuntap.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index 5a4231604f5a..fccc666e2a00 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -1178,13 +1178,13 @@ tundtor(void *data) if ((tp->tun_flags & TUN_VMNET) != 0 || (l2tun && (ifp->if_flags & IFF_LINK0) != 0)) goto out; - +#if defined(INET) || defined(INET6) if (l2tun && tp->tun_lro_ready) { TUNDEBUG (ifp, "LRO disabled\n"); tcp_lro_free(&tp->tun_lro); tp->tun_lro_ready = false; } - +#endif if (ifp->if_flags & IFF_UP) { TUN_UNLOCK(tp); if_down(ifp); @@ -1229,6 +1229,7 @@ tuninit(struct ifnet *ifp) getmicrotime(&ifp->if_lastchange); TUN_UNLOCK(tp); } else { +#if defined(INET) || defined(INET6) if (tcp_lro_init(&tp->tun_lro) == 0) { TUNDEBUG(ifp, "LRO enabled\n"); tp->tun_lro.ifp = ifp; @@ -1237,6 +1238,7 @@ tuninit(struct ifnet *ifp) TUNDEBUG(ifp, "Could not enable LRO\n"); tp->tun_lro_ready = false; } +#endif ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; TUN_UNLOCK(tp); /* attempt to start output */ @@ -1783,7 +1785,6 @@ tunwrite_l2(struct tuntap_softc *tp, struct mbuf *m, struct epoch_tracker et; struct ether_header *eh; struct ifnet *ifp; - int result; ifp = TUN2IFP(tp); @@ -1839,14 +1840,12 @@ tunwrite_l2(struct tuntap_softc *tp, struct mbuf *m, /* Pass packet up to parent. */ CURVNET_SET(ifp->if_vnet); NET_EPOCH_ENTER(et); - if (tp->tun_lro_ready && ifp->if_capenable & IFCAP_LRO) { - result = tcp_lro_rx(&tp->tun_lro, m, 0); - TUNDEBUG(ifp, "tcp_lro_rx() returned %d\n", result); - } else - result = TCP_LRO_CANNOT; - if (result == 0) +#if defined(INET) || defined(INET6) + if (tp->tun_lro_ready && ifp->if_capenable & IFCAP_LRO && + tcp_lro_rx(&tp->tun_lro, m, 0) == 0) tcp_lro_flush_all(&tp->tun_lro); else +#endif (*ifp->if_input)(ifp, m); NET_EPOCH_EXIT(et); CURVNET_RESTORE(); From nobody Mon Dec 4 18:59:26 2023 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 4SkXyk2MvSz52hBb; Mon, 4 Dec 2023 18:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkXyk27mhz3TWc; Mon, 4 Dec 2023 18:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JnLl2Y8zD6wgBeWXDAmObz61tHOVlh0Z0gxvKwSuXKY=; b=O23TffF7zFa5ITwahxpn5KXVsneNXbGpouYUcgLuLPUYL+G6HTYSo2Ud8Gx3lwFhiqJNW/ tedxc2wUXzFMQhJWsDVtU1VTLE8tPfNnY57I6a97D2hqNUBCsIJbkgOLL6+UACK1qhBVpp 5yplK2yKUM+a6fKtIUeaAwH4A96I3SMax+HuvEyxHv5Qa+SEkkX6w3bKCABlzdCBgMHgIV yj48oykW9nAipEjUvXZn1Nv5O7mWVJRpLOmGW6H7/FwLCau6VGTf31l5m1uU69BkW2dNMP C/vokxPCaqZBOPknVE/30OUJAXigyjyczGklew8gEYIvSo/TFkuU5ZslgLHuAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JnLl2Y8zD6wgBeWXDAmObz61tHOVlh0Z0gxvKwSuXKY=; b=AAl2aNT4DV+MApX0SXawaoEhRa96pQShZn30g0rCtR56+Az+5+mvUiPJfT7ImunlLa7Yn6 x9/wHKex6XguDf+gAuh0KSwf/GKGbn9Npbuu6RxozuZ3xrV8mQ4OpoNw9W25TblhaTmQll OP70sw32aMlaKWTUS3o34B+U2JY/xi8SGCbkKd48VQWv1azeZNPG6OBoC4kjjqmNoxxHmh bR8R29cDo4CcE7iIrxfT4JX+bMXAqB71h/aIAw4ruOfO72xl4oG7XZBzbFfb4T5NOuTTWm VqjYqciLjO7lO9VU8bY2sBR4kYJQ4uMEjhXCkcLZ5wmgnWdbMoLqTtLj2dEK5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701716366; a=rsa-sha256; cv=none; b=mgrgl+Dpo5M9EKYV59q7YbxRvkC3JMKrMz+vW8b6tB/fJnS9XH0ssSveeCmEvWFUGabej+ I/wA0DpQkmPR568DjCBKVKq5tEKNbHI9egUNfk8cyWjiuCUuj7X+Rj0r95i7YKweknG52f knGncQ/bsPDIMy/Q6uZ5fx0FrkwIp2kMA7jTCZp3uOnDBj6a7163AHRo71U6DsMjFNpQyx b6DEwo4jwaAN4qCC46ZcCcSZiB89thTkNULRjEgoBjD8O61OxkmCez56YDYBk3FcNanDsu E78tGlf4rHj3rfMWcBJIZlwg70NRFx00LB8EMnfUh2pYYtRHyHpMQhHl7XZ8lQ== 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 4SkXyk19s2zdYk; Mon, 4 Dec 2023 18:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4IxQV0043503; Mon, 4 Dec 2023 18:59:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4IxQj1043500; Mon, 4 Dec 2023 18:59:26 GMT (envelope-from git) Date: Mon, 4 Dec 2023 18:59:26 GMT Message-Id: <202312041859.3B4IxQj1043500@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: 4f9c93f16c30 - main - lro: separate HPTS specific code into tcp_lro_hpts.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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4f9c93f16c30d553613def0442d8ddbee859e76b Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4f9c93f16c30d553613def0442d8ddbee859e76b commit 4f9c93f16c30d553613def0442d8ddbee859e76b Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:19:46 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-04 18:19:46 +0000 lro: separate HPTS specific code into tcp_lro_hpts.c Put same copyright header as tcp_hpts.c has, since all this code was developed by Randall Stewart as a part of the HPTS work. Also copy Mellanox copyright from tcp_lro.c as Hans Petter Selasky also participated in restructuring the code. Reviewed by: imp, tuexen, rrs Differential Revision: https://reviews.freebsd.org/D42854 --- sys/conf/files | 1 + sys/modules/tcp/hpts/Makefile | 3 +- sys/netinet/tcp_lro.c | 540 +-------------------------------------- sys/netinet/tcp_lro.h | 15 +- sys/netinet/tcp_lro_hpts.c | 577 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 595 insertions(+), 541 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 7ffcbe6e0dda..e37764d3dc6f 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4354,6 +4354,7 @@ netinet/tcp_hostcache.c optional inet | inet6 netinet/tcp_input.c optional inet | inet6 netinet/tcp_log_buf.c optional tcp_blackbox inet | tcp_blackbox inet6 netinet/tcp_lro.c optional inet | inet6 +netinet/tcp_lro_hpts.c optional tcphpts inet | tcphpts inet6 netinet/tcp_output.c optional inet | inet6 netinet/tcp_offload.c optional tcp_offload inet | tcp_offload inet6 netinet/tcp_hpts.c optional tcphpts inet | tcphpts inet6 diff --git a/sys/modules/tcp/hpts/Makefile b/sys/modules/tcp/hpts/Makefile index 4ca462d7f612..2d664c048cdd 100644 --- a/sys/modules/tcp/hpts/Makefile +++ b/sys/modules/tcp/hpts/Makefile @@ -1,6 +1,7 @@ .PATH: ${SRCTOP}/sys/netinet KMOD= tcphpts -SRCS= tcp_hpts.c opt_inet.h opt_inet6.h opt_rss.h device_if.h bus_if.h +SRCS= tcp_hpts.c tcp_lro_hpts.c \ + opt_inet.h opt_inet6.h opt_rss.h device_if.h bus_if.h .include diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c index e87b32b55b47..6cf0411b5f65 100644 --- a/sys/netinet/tcp_lro.c +++ b/sys/netinet/tcp_lro.c @@ -80,25 +80,14 @@ static MALLOC_DEFINE(M_LRO, "LRO", "LRO control structures"); -#define TCP_LRO_TS_OPTION \ - ntohl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) | \ - (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP) - static void tcp_lro_rx_done(struct lro_ctrl *lc); static int tcp_lro_rx_common(struct lro_ctrl *lc, struct mbuf *m, uint32_t csum, bool use_hash); -#ifdef TCPHPTS -static bool do_bpf_strip_and_compress(struct tcpcb *, struct lro_ctrl *, - struct lro_entry *, struct mbuf **, struct mbuf **, struct mbuf **, - bool *, bool, bool, struct ifnet *, bool); - -#endif - SYSCTL_NODE(_net_inet_tcp, OID_AUTO, lro, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "TCP LRO"); -static long tcplro_stacks_wanting_mbufq; +long tcplro_stacks_wanting_mbufq; counter_u64_t tcp_inp_lro_direct_queue; counter_u64_t tcp_inp_lro_wokeup_queue; counter_u64_t tcp_inp_lro_compressed; @@ -487,12 +476,6 @@ tcp_lro_trim_mbuf_chain(struct mbuf *m, const struct lro_parser *po) return (TCP_LRO_CANNOT); } -static struct tcphdr * -tcp_lro_get_th(struct mbuf *m) -{ - return ((struct tcphdr *)((uint8_t *)m->m_data + m->m_pkthdr.lro_tcp_h_off)); -} - static void lro_free_mbuf_chain(struct mbuf *m) { @@ -680,58 +663,6 @@ tcp_lro_rx_ipv4(struct lro_ctrl *lc, struct mbuf *m, struct ip *ip4) } #endif -#ifdef TCPHPTS -static void -tcp_lro_log(struct tcpcb *tp, const struct lro_ctrl *lc, - const struct lro_entry *le, const struct mbuf *m, - int frm, int32_t tcp_data_len, uint32_t th_seq, - uint32_t th_ack, uint16_t th_win) -{ - if (tcp_bblogging_on(tp)) { - union tcp_log_stackspecific log; - struct timeval tv, btv; - uint32_t cts; - - cts = tcp_get_usecs(&tv); - memset(&log, 0, sizeof(union tcp_log_stackspecific)); - log.u_bbr.flex8 = frm; - log.u_bbr.flex1 = tcp_data_len; - if (m) - log.u_bbr.flex2 = m->m_pkthdr.len; - else - log.u_bbr.flex2 = 0; - if (le->m_head) { - log.u_bbr.flex3 = le->m_head->m_pkthdr.lro_nsegs; - log.u_bbr.flex4 = le->m_head->m_pkthdr.lro_tcp_d_len; - log.u_bbr.flex5 = le->m_head->m_pkthdr.len; - log.u_bbr.delRate = le->m_head->m_flags; - log.u_bbr.rttProp = le->m_head->m_pkthdr.rcv_tstmp; - } - log.u_bbr.inflight = th_seq; - log.u_bbr.delivered = th_ack; - log.u_bbr.timeStamp = cts; - log.u_bbr.epoch = le->next_seq; - log.u_bbr.lt_epoch = le->ack_seq; - log.u_bbr.pacing_gain = th_win; - log.u_bbr.cwnd_gain = le->window; - log.u_bbr.lost = curcpu; - log.u_bbr.cur_del_rate = (uintptr_t)m; - log.u_bbr.bw_inuse = (uintptr_t)le->m_head; - bintime2timeval(&lc->lro_last_queue_time, &btv); - log.u_bbr.flex6 = tcp_tv_to_usectick(&btv); - log.u_bbr.flex7 = le->compressed; - log.u_bbr.pacing_gain = le->uncompressed; - if (in_epoch(net_epoch_preempt)) - log.u_bbr.inhpts = 1; - else - log.u_bbr.inhpts = 0; - TCP_LOG_EVENTP(tp, NULL, &tptosocket(tp)->so_rcv, - &tptosocket(tp)->so_snd, - TCP_LOG_LRO, 0, 0, &log, false, &tv); - } -} -#endif - static inline void tcp_lro_assign_and_checksum_16(uint16_t *ptr, uint16_t value, uint16_t *psum) { @@ -1175,276 +1106,6 @@ again: } } -#ifdef TCPHPTS -static void -tcp_queue_pkts(struct tcpcb *tp, struct lro_entry *le) -{ - - INP_WLOCK_ASSERT(tptoinpcb(tp)); - - STAILQ_HEAD(, mbuf) q = { le->m_head, - &STAILQ_NEXT(le->m_last_mbuf, m_stailqpkt) }; - STAILQ_CONCAT(&tp->t_inqueue, &q); - le->m_head = NULL; - le->m_last_mbuf = NULL; -} - -static bool -tcp_lro_check_wake_status(struct tcpcb *tp) -{ - - if (tp->t_fb->tfb_early_wake_check != NULL) - return ((tp->t_fb->tfb_early_wake_check)(tp)); - return (false); -} - -static struct mbuf * -tcp_lro_get_last_if_ackcmp(struct lro_ctrl *lc, struct lro_entry *le, - struct tcpcb *tp, int32_t *new_m, bool can_append_old_cmp) -{ - struct mbuf *m; - - /* Look at the last mbuf if any in queue */ - if (can_append_old_cmp) { - m = STAILQ_LAST(&tp->t_inqueue, mbuf, m_stailqpkt); - if (m != NULL && (m->m_flags & M_ACKCMP) != 0) { - if (M_TRAILINGSPACE(m) >= sizeof(struct tcp_ackent)) { - tcp_lro_log(tp, lc, le, NULL, 23, 0, 0, 0, 0); - *new_m = 0; - counter_u64_add(tcp_extra_mbuf, 1); - return (m); - } else { - /* Mark we ran out of space */ - tp->t_flags2 |= TF2_MBUF_L_ACKS; - } - } - } - /* Decide mbuf size. */ - tcp_lro_log(tp, lc, le, NULL, 21, 0, 0, 0, 0); - if (tp->t_flags2 & TF2_MBUF_L_ACKS) - m = m_getcl(M_NOWAIT, MT_DATA, M_ACKCMP | M_PKTHDR); - else - m = m_gethdr(M_NOWAIT, MT_DATA); - - if (__predict_false(m == NULL)) { - counter_u64_add(tcp_would_have_but, 1); - return (NULL); - } - counter_u64_add(tcp_comp_total, 1); - m->m_pkthdr.rcvif = lc->ifp; - m->m_flags |= M_ACKCMP; - *new_m = 1; - return (m); -} - -static struct tcpcb * -tcp_lro_lookup(struct ifnet *ifp, struct lro_parser *pa) -{ - struct inpcb *inp; - - switch (pa->data.lro_type) { -#ifdef INET6 - case LRO_TYPE_IPV6_TCP: - inp = in6_pcblookup(&V_tcbinfo, - &pa->data.s_addr.v6, - pa->data.s_port, - &pa->data.d_addr.v6, - pa->data.d_port, - INPLOOKUP_WLOCKPCB, - ifp); - break; -#endif -#ifdef INET - case LRO_TYPE_IPV4_TCP: - inp = in_pcblookup(&V_tcbinfo, - pa->data.s_addr.v4, - pa->data.s_port, - pa->data.d_addr.v4, - pa->data.d_port, - INPLOOKUP_WLOCKPCB, - ifp); - break; -#endif - default: - return (NULL); - } - - return (intotcpcb(inp)); -} - -static inline bool -tcp_lro_ack_valid(struct mbuf *m, struct tcphdr *th, uint32_t **ppts, bool *other_opts) -{ - /* - * This function returns two bits of valuable information. - * a) Is what is present capable of being ack-compressed, - * we can ack-compress if there is no options or just - * a timestamp option, and of course the th_flags must - * be correct as well. - * b) Our other options present such as SACK. This is - * used to determine if we want to wakeup or not. - */ - bool ret = true; - - switch (th->th_off << 2) { - case (sizeof(*th) + TCPOLEN_TSTAMP_APPA): - *ppts = (uint32_t *)(th + 1); - /* Check if we have only one timestamp option. */ - if (**ppts == TCP_LRO_TS_OPTION) - *other_opts = false; - else { - *other_opts = true; - ret = false; - } - break; - case (sizeof(*th)): - /* No options. */ - *ppts = NULL; - *other_opts = false; - break; - default: - *ppts = NULL; - *other_opts = true; - ret = false; - break; - } - /* For ACKCMP we only accept ACK, PUSH, ECE and CWR. */ - if ((tcp_get_flags(th) & ~(TH_ACK | TH_PUSH | TH_ECE | TH_CWR)) != 0) - ret = false; - /* If it has data on it we cannot compress it */ - if (m->m_pkthdr.lro_tcp_d_len) - ret = false; - - /* ACK flag must be set. */ - if (!(tcp_get_flags(th) & TH_ACK)) - ret = false; - return (ret); -} - -static int -tcp_lro_flush_tcphpts(struct lro_ctrl *lc, struct lro_entry *le) -{ - struct tcpcb *tp; - struct mbuf **pp, *cmp, *mv_to; - struct ifnet *lagg_ifp; - bool bpf_req, lagg_bpf_req, should_wake, can_append_old_cmp; - - /* Check if packet doesn't belongs to our network interface. */ - if ((tcplro_stacks_wanting_mbufq == 0) || - (le->outer.data.vlan_id != 0) || - (le->inner.data.lro_type != LRO_TYPE_NONE)) - return (TCP_LRO_CANNOT); - -#ifdef INET6 - /* - * Be proactive about unspecified IPv6 address in source. As - * we use all-zero to indicate unbounded/unconnected pcb, - * unspecified IPv6 address can be used to confuse us. - * - * Note that packets with unspecified IPv6 destination is - * already dropped in ip6_input. - */ - if (__predict_false(le->outer.data.lro_type == LRO_TYPE_IPV6_TCP && - IN6_IS_ADDR_UNSPECIFIED(&le->outer.data.s_addr.v6))) - return (TCP_LRO_CANNOT); - - if (__predict_false(le->inner.data.lro_type == LRO_TYPE_IPV6_TCP && - IN6_IS_ADDR_UNSPECIFIED(&le->inner.data.s_addr.v6))) - return (TCP_LRO_CANNOT); -#endif - /* Lookup inp, if any. Returns locked TCP inpcb. */ - tp = tcp_lro_lookup(lc->ifp, - (le->inner.data.lro_type == LRO_TYPE_NONE) ? &le->outer : &le->inner); - if (tp == NULL) - return (TCP_LRO_CANNOT); - - counter_u64_add(tcp_inp_lro_locks_taken, 1); - - /* Check if the inp is dead, Jim. */ - if (tp->t_state == TCPS_TIME_WAIT) { - INP_WUNLOCK(tptoinpcb(tp)); - return (TCP_LRO_CANNOT); - } - if (tp->t_lro_cpu == HPTS_CPU_NONE && lc->lro_cpu_is_set == 1) - tp->t_lro_cpu = lc->lro_last_cpu; - /* Check if the transport doesn't support the needed optimizations. */ - if ((tp->t_flags2 & (TF2_SUPPORTS_MBUFQ | TF2_MBUF_ACKCMP)) == 0) { - INP_WUNLOCK(tptoinpcb(tp)); - return (TCP_LRO_CANNOT); - } - - if (tp->t_flags2 & TF2_MBUF_QUEUE_READY) - should_wake = false; - else - should_wake = true; - /* Check if packets should be tapped to BPF. */ - bpf_req = bpf_peers_present(lc->ifp->if_bpf); - lagg_bpf_req = false; - lagg_ifp = NULL; - if (lc->ifp->if_type == IFT_IEEE8023ADLAG || - lc->ifp->if_type == IFT_INFINIBANDLAG) { - struct lagg_port *lp = lc->ifp->if_lagg; - struct lagg_softc *sc = lp->lp_softc; - - lagg_ifp = sc->sc_ifp; - if (lagg_ifp != NULL) - lagg_bpf_req = bpf_peers_present(lagg_ifp->if_bpf); - } - - /* Strip and compress all the incoming packets. */ - can_append_old_cmp = true; - cmp = NULL; - for (pp = &le->m_head; *pp != NULL; ) { - mv_to = NULL; - if (do_bpf_strip_and_compress(tp, lc, le, pp, - &cmp, &mv_to, &should_wake, bpf_req, - lagg_bpf_req, lagg_ifp, can_append_old_cmp) == false) { - /* Advance to next mbuf. */ - pp = &(*pp)->m_nextpkt; - /* - * Once we have appended we can't look in the pending - * inbound packets for a compressed ack to append to. - */ - can_append_old_cmp = false; - /* - * Once we append we also need to stop adding to any - * compressed ack we were remembering. A new cmp - * ack will be required. - */ - cmp = NULL; - tcp_lro_log(tp, lc, le, NULL, 25, 0, 0, 0, 0); - } else if (mv_to != NULL) { - /* We are asked to move pp up */ - pp = &mv_to->m_nextpkt; - tcp_lro_log(tp, lc, le, NULL, 24, 0, 0, 0, 0); - } else - tcp_lro_log(tp, lc, le, NULL, 26, 0, 0, 0, 0); - } - /* Update "m_last_mbuf", if any. */ - if (pp == &le->m_head) - le->m_last_mbuf = *pp; - else - le->m_last_mbuf = __containerof(pp, struct mbuf, m_nextpkt); - - /* Check if any data mbufs left. */ - if (le->m_head != NULL) { - counter_u64_add(tcp_inp_lro_direct_queue, 1); - tcp_lro_log(tp, lc, le, NULL, 22, 1, tp->t_flags2, 0, 1); - tcp_queue_pkts(tp, le); - } - if (should_wake) { - /* Wakeup */ - counter_u64_add(tcp_inp_lro_wokeup_queue, 1); - if ((*tp->t_fb->tfb_do_queued_segments)(tp, 0)) - /* TCP cb gone and unlocked. */ - return (0); - } - INP_WUNLOCK(tptoinpcb(tp)); - - return (0); /* Success. */ -} -#endif - void tcp_lro_flush(struct lro_ctrl *lc, struct lro_entry *le) { @@ -1614,205 +1275,6 @@ done: lc->lro_mbuf_count = 0; } -#ifdef TCPHPTS -static void -build_ack_entry(struct tcp_ackent *ae, struct tcphdr *th, struct mbuf *m, - uint32_t *ts_ptr, uint16_t iptos) -{ - /* - * Given a TCP ACK, summarize it down into the small TCP ACK - * entry. - */ - ae->timestamp = m->m_pkthdr.rcv_tstmp; - ae->flags = 0; - if (m->m_flags & M_TSTMP_LRO) - ae->flags |= TSTMP_LRO; - else if (m->m_flags & M_TSTMP) - ae->flags |= TSTMP_HDWR; - ae->seq = ntohl(th->th_seq); - ae->ack = ntohl(th->th_ack); - ae->flags |= tcp_get_flags(th); - if (ts_ptr != NULL) { - ae->ts_value = ntohl(ts_ptr[1]); - ae->ts_echo = ntohl(ts_ptr[2]); - ae->flags |= HAS_TSTMP; - } - ae->win = ntohs(th->th_win); - ae->codepoint = iptos; -} - -/* - * Do BPF tap for either ACK_CMP packets or MBUF QUEUE type packets - * and strip all, but the IPv4/IPv6 header. - */ -static bool -do_bpf_strip_and_compress(struct tcpcb *tp, struct lro_ctrl *lc, - struct lro_entry *le, struct mbuf **pp, struct mbuf **cmp, struct mbuf **mv_to, - bool *should_wake, bool bpf_req, bool lagg_bpf_req, struct ifnet *lagg_ifp, bool can_append_old_cmp) -{ - union { - void *ptr; - struct ip *ip4; - struct ip6_hdr *ip6; - } l3; - struct mbuf *m; - struct mbuf *nm; - struct tcphdr *th; - struct tcp_ackent *ack_ent; - uint32_t *ts_ptr; - int32_t n_mbuf; - bool other_opts, can_compress; - uint8_t lro_type; - uint16_t iptos; - int tcp_hdr_offset; - int idx; - - /* Get current mbuf. */ - m = *pp; - - /* Let the BPF see the packet */ - if (__predict_false(bpf_req)) - ETHER_BPF_MTAP(lc->ifp, m); - - if (__predict_false(lagg_bpf_req)) - ETHER_BPF_MTAP(lagg_ifp, m); - - tcp_hdr_offset = m->m_pkthdr.lro_tcp_h_off; - lro_type = le->inner.data.lro_type; - switch (lro_type) { - case LRO_TYPE_NONE: - lro_type = le->outer.data.lro_type; - switch (lro_type) { - case LRO_TYPE_IPV4_TCP: - tcp_hdr_offset -= sizeof(*le->outer.ip4); - m->m_pkthdr.lro_etype = ETHERTYPE_IP; - break; - case LRO_TYPE_IPV6_TCP: - tcp_hdr_offset -= sizeof(*le->outer.ip6); - m->m_pkthdr.lro_etype = ETHERTYPE_IPV6; - break; - default: - goto compressed; - } - break; - case LRO_TYPE_IPV4_TCP: - tcp_hdr_offset -= sizeof(*le->outer.ip4); - m->m_pkthdr.lro_etype = ETHERTYPE_IP; - break; - case LRO_TYPE_IPV6_TCP: - tcp_hdr_offset -= sizeof(*le->outer.ip6); - m->m_pkthdr.lro_etype = ETHERTYPE_IPV6; - break; - default: - goto compressed; - } - - MPASS(tcp_hdr_offset >= 0); - - m_adj(m, tcp_hdr_offset); - m->m_flags |= M_LRO_EHDRSTRP; - m->m_flags &= ~M_ACKCMP; - m->m_pkthdr.lro_tcp_h_off -= tcp_hdr_offset; - - th = tcp_lro_get_th(m); - - th->th_sum = 0; /* TCP checksum is valid. */ - - /* Check if ACK can be compressed */ - can_compress = tcp_lro_ack_valid(m, th, &ts_ptr, &other_opts); - - /* Now lets look at the should wake states */ - if ((other_opts == true) && - ((tp->t_flags2 & TF2_DONT_SACK_QUEUE) == 0)) { - /* - * If there are other options (SACK?) and the - * tcp endpoint has not expressly told us it does - * not care about SACKS, then we should wake up. - */ - *should_wake = true; - } else if (*should_wake == false) { - /* Wakeup override check if we are false here */ - *should_wake = tcp_lro_check_wake_status(tp); - } - /* Is the ack compressable? */ - if (can_compress == false) - goto done; - /* Does the TCP endpoint support ACK compression? */ - if ((tp->t_flags2 & TF2_MBUF_ACKCMP) == 0) - goto done; - - /* Lets get the TOS/traffic class field */ - l3.ptr = mtod(m, void *); - switch (lro_type) { - case LRO_TYPE_IPV4_TCP: - iptos = l3.ip4->ip_tos; - break; - case LRO_TYPE_IPV6_TCP: - iptos = IPV6_TRAFFIC_CLASS(l3.ip6); - break; - default: - iptos = 0; /* Keep compiler happy. */ - break; - } - /* Now lets get space if we don't have some already */ - if (*cmp == NULL) { -new_one: - nm = tcp_lro_get_last_if_ackcmp(lc, le, tp, &n_mbuf, - can_append_old_cmp); - if (__predict_false(nm == NULL)) - goto done; - *cmp = nm; - if (n_mbuf) { - /* - * Link in the new cmp ack to our in-order place, - * first set our cmp ack's next to where we are. - */ - nm->m_nextpkt = m; - (*pp) = nm; - /* - * Set it up so mv_to is advanced to our - * compressed ack. This way the caller can - * advance pp to the right place. - */ - *mv_to = nm; - /* - * Advance it here locally as well. - */ - pp = &nm->m_nextpkt; - } - } else { - /* We have one already we are working on */ - nm = *cmp; - if (M_TRAILINGSPACE(nm) < sizeof(struct tcp_ackent)) { - /* We ran out of space */ - tp->t_flags2 |= TF2_MBUF_L_ACKS; - goto new_one; - } - } - MPASS(M_TRAILINGSPACE(nm) >= sizeof(struct tcp_ackent)); - counter_u64_add(tcp_inp_lro_compressed, 1); - le->compressed++; - /* We can add in to the one on the tail */ - ack_ent = mtod(nm, struct tcp_ackent *); - idx = (nm->m_len / sizeof(struct tcp_ackent)); - build_ack_entry(&ack_ent[idx], th, m, ts_ptr, iptos); - - /* Bump the size of both pkt-hdr and len */ - nm->m_len += sizeof(struct tcp_ackent); - nm->m_pkthdr.len += sizeof(struct tcp_ackent); -compressed: - /* Advance to next mbuf before freeing. */ - *pp = m->m_nextpkt; - m->m_nextpkt = NULL; - m_freem(m); - return (true); -done: - counter_u64_add(tcp_uncomp_total, 1); - le->uncompressed++; - return (false); -} -#endif - static struct lro_head * tcp_lro_rx_get_bucket(struct lro_ctrl *lc, struct mbuf *m, struct lro_parser *parser) { diff --git a/sys/netinet/tcp_lro.h b/sys/netinet/tcp_lro.h index 3e8c33a68b6d..d981c940e7eb 100644 --- a/sys/netinet/tcp_lro.h +++ b/sys/netinet/tcp_lro.h @@ -33,7 +33,7 @@ #include #include - +#include #include #ifndef TCP_LRO_ENTRIES @@ -200,12 +200,25 @@ struct tcp_ackent { #define TCP_LRO_LENGTH_MAX (65535 - 255) /* safe value with room for outer headers */ #define TCP_LRO_ACKCNT_MAX 65535 /* unlimited */ +#define TCP_LRO_TS_OPTION ntohl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |\ + (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP) + +static inline struct tcphdr * +tcp_lro_get_th(struct mbuf *m) +{ + return ((struct tcphdr *)((char *)m->m_data + + m->m_pkthdr.lro_tcp_h_off)); +} + +extern long tcplro_stacks_wanting_mbufq; + int tcp_lro_init(struct lro_ctrl *); int tcp_lro_init_args(struct lro_ctrl *, struct ifnet *, unsigned, unsigned); void tcp_lro_free(struct lro_ctrl *); void tcp_lro_flush_inactive(struct lro_ctrl *, const struct timeval *); void tcp_lro_flush(struct lro_ctrl *, struct lro_entry *); void tcp_lro_flush_all(struct lro_ctrl *); +int tcp_lro_flush_tcphpts(struct lro_ctrl *, struct lro_entry *); int tcp_lro_rx(struct lro_ctrl *, struct mbuf *, uint32_t); void tcp_lro_queue_mbuf(struct lro_ctrl *, struct mbuf *); void tcp_lro_reg_mbufq(void); diff --git a/sys/netinet/tcp_lro_hpts.c b/sys/netinet/tcp_lro_hpts.c new file mode 100644 index 000000000000..497da9cba40e --- /dev/null +++ b/sys/netinet/tcp_lro_hpts.c @@ -0,0 +1,577 @@ +/*- + * Copyright (c) 2016-2018 Netflix, Inc. + * Copyright (c) 2016-2021 Mellanox Technologies. + * + * 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 REGENTS 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 REGENTS 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 +#include "opt_inet.h" +#include "opt_inet6.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void +build_ack_entry(struct tcp_ackent *ae, struct tcphdr *th, struct mbuf *m, + uint32_t *ts_ptr, uint16_t iptos) +{ + /* + * Given a TCP ACK, summarize it down into the small TCP ACK + * entry. + */ + ae->timestamp = m->m_pkthdr.rcv_tstmp; + ae->flags = 0; + if (m->m_flags & M_TSTMP_LRO) + ae->flags |= TSTMP_LRO; + else if (m->m_flags & M_TSTMP) + ae->flags |= TSTMP_HDWR; + ae->seq = ntohl(th->th_seq); + ae->ack = ntohl(th->th_ack); + ae->flags |= tcp_get_flags(th); + if (ts_ptr != NULL) { + ae->ts_value = ntohl(ts_ptr[1]); + ae->ts_echo = ntohl(ts_ptr[2]); + ae->flags |= HAS_TSTMP; + } + ae->win = ntohs(th->th_win); + ae->codepoint = iptos; +} + +static inline bool +tcp_lro_ack_valid(struct mbuf *m, struct tcphdr *th, uint32_t **ppts, bool *other_opts) +{ + /* + * This function returns two bits of valuable information. + * a) Is what is present capable of being ack-compressed, + * we can ack-compress if there is no options or just + * a timestamp option, and of course the th_flags must + * be correct as well. + * b) Our other options present such as SACK. This is + * used to determine if we want to wakeup or not. + */ + bool ret = true; + + switch (th->th_off << 2) { + case (sizeof(*th) + TCPOLEN_TSTAMP_APPA): + *ppts = (uint32_t *)(th + 1); + /* Check if we have only one timestamp option. */ + if (**ppts == TCP_LRO_TS_OPTION) + *other_opts = false; + else { + *other_opts = true; + ret = false; + } + break; + case (sizeof(*th)): + /* No options. */ + *ppts = NULL; + *other_opts = false; + break; + default: + *ppts = NULL; + *other_opts = true; + ret = false; + break; + } + /* For ACKCMP we only accept ACK, PUSH, ECE and CWR. */ + if ((tcp_get_flags(th) & ~(TH_ACK | TH_PUSH | TH_ECE | TH_CWR)) != 0) + ret = false; + /* If it has data on it we cannot compress it */ + if (m->m_pkthdr.lro_tcp_d_len) + ret = false; + + /* ACK flag must be set. */ + if (!(tcp_get_flags(th) & TH_ACK)) + ret = false; + return (ret); +} + +static bool +tcp_lro_check_wake_status(struct tcpcb *tp) +{ + + if (tp->t_fb->tfb_early_wake_check != NULL) + return ((tp->t_fb->tfb_early_wake_check)(tp)); + return (false); +} + +static void +tcp_lro_log(struct tcpcb *tp, const struct lro_ctrl *lc, + const struct lro_entry *le, const struct mbuf *m, + int frm, int32_t tcp_data_len, uint32_t th_seq, + uint32_t th_ack, uint16_t th_win) +{ + if (tcp_bblogging_on(tp)) { + union tcp_log_stackspecific log; + struct timeval tv, btv; + uint32_t cts; + + cts = tcp_get_usecs(&tv); + memset(&log, 0, sizeof(union tcp_log_stackspecific)); + log.u_bbr.flex8 = frm; + log.u_bbr.flex1 = tcp_data_len; + if (m) + log.u_bbr.flex2 = m->m_pkthdr.len; + else + log.u_bbr.flex2 = 0; + if (le->m_head) { + log.u_bbr.flex3 = le->m_head->m_pkthdr.lro_nsegs; + log.u_bbr.flex4 = le->m_head->m_pkthdr.lro_tcp_d_len; + log.u_bbr.flex5 = le->m_head->m_pkthdr.len; + log.u_bbr.delRate = le->m_head->m_flags; + log.u_bbr.rttProp = le->m_head->m_pkthdr.rcv_tstmp; + } + log.u_bbr.inflight = th_seq; + log.u_bbr.delivered = th_ack; + log.u_bbr.timeStamp = cts; + log.u_bbr.epoch = le->next_seq; + log.u_bbr.lt_epoch = le->ack_seq; + log.u_bbr.pacing_gain = th_win; + log.u_bbr.cwnd_gain = le->window; + log.u_bbr.lost = curcpu; + log.u_bbr.cur_del_rate = (uintptr_t)m; + log.u_bbr.bw_inuse = (uintptr_t)le->m_head; + bintime2timeval(&lc->lro_last_queue_time, &btv); + log.u_bbr.flex6 = tcp_tv_to_usectick(&btv); + log.u_bbr.flex7 = le->compressed; + log.u_bbr.pacing_gain = le->uncompressed; + if (in_epoch(net_epoch_preempt)) + log.u_bbr.inhpts = 1; + else + log.u_bbr.inhpts = 0; + TCP_LOG_EVENTP(tp, NULL, &tptosocket(tp)->so_rcv, + &tptosocket(tp)->so_snd, + TCP_LOG_LRO, 0, 0, &log, false, &tv); + } +} + +static struct mbuf * +tcp_lro_get_last_if_ackcmp(struct lro_ctrl *lc, struct lro_entry *le, + struct tcpcb *tp, int32_t *new_m, bool can_append_old_cmp) +{ + struct mbuf *m; + + /* Look at the last mbuf if any in queue */ + if (can_append_old_cmp) { + m = STAILQ_LAST(&tp->t_inqueue, mbuf, m_stailqpkt); + if (m != NULL && (m->m_flags & M_ACKCMP) != 0) { + if (M_TRAILINGSPACE(m) >= sizeof(struct tcp_ackent)) { + tcp_lro_log(tp, lc, le, NULL, 23, 0, 0, 0, 0); + *new_m = 0; + counter_u64_add(tcp_extra_mbuf, 1); + return (m); + } else { + /* Mark we ran out of space */ + tp->t_flags2 |= TF2_MBUF_L_ACKS; + } + } + } + /* Decide mbuf size. */ + tcp_lro_log(tp, lc, le, NULL, 21, 0, 0, 0, 0); + if (tp->t_flags2 & TF2_MBUF_L_ACKS) + m = m_getcl(M_NOWAIT, MT_DATA, M_ACKCMP | M_PKTHDR); + else + m = m_gethdr(M_NOWAIT, MT_DATA); + + if (__predict_false(m == NULL)) { + counter_u64_add(tcp_would_have_but, 1); + return (NULL); + } + counter_u64_add(tcp_comp_total, 1); + m->m_pkthdr.rcvif = lc->ifp; + m->m_flags |= M_ACKCMP; + *new_m = 1; + return (m); +} + +/* + * Do BPF tap for either ACK_CMP packets or MBUF QUEUE type packets + * and strip all, but the IPv4/IPv6 header. + */ +static bool +do_bpf_strip_and_compress(struct tcpcb *tp, struct lro_ctrl *lc, + struct lro_entry *le, struct mbuf **pp, struct mbuf **cmp, + struct mbuf **mv_to, bool *should_wake, bool bpf_req, bool lagg_bpf_req, + struct ifnet *lagg_ifp, bool can_append_old_cmp) +{ + union { + void *ptr; + struct ip *ip4; + struct ip6_hdr *ip6; + } l3; + struct mbuf *m; + struct mbuf *nm; + struct tcphdr *th; + struct tcp_ackent *ack_ent; + uint32_t *ts_ptr; + int32_t n_mbuf; + bool other_opts, can_compress; + uint8_t lro_type; + uint16_t iptos; + int tcp_hdr_offset; + int idx; + + /* Get current mbuf. */ + m = *pp; + + /* Let the BPF see the packet */ + if (__predict_false(bpf_req)) + ETHER_BPF_MTAP(lc->ifp, m); + + if (__predict_false(lagg_bpf_req)) + ETHER_BPF_MTAP(lagg_ifp, m); + + tcp_hdr_offset = m->m_pkthdr.lro_tcp_h_off; + lro_type = le->inner.data.lro_type; + switch (lro_type) { + case LRO_TYPE_NONE: + lro_type = le->outer.data.lro_type; + switch (lro_type) { + case LRO_TYPE_IPV4_TCP: + tcp_hdr_offset -= sizeof(*le->outer.ip4); + m->m_pkthdr.lro_etype = ETHERTYPE_IP; + break; + case LRO_TYPE_IPV6_TCP: + tcp_hdr_offset -= sizeof(*le->outer.ip6); + m->m_pkthdr.lro_etype = ETHERTYPE_IPV6; + break; + default: + goto compressed; + } + break; + case LRO_TYPE_IPV4_TCP: + tcp_hdr_offset -= sizeof(*le->outer.ip4); + m->m_pkthdr.lro_etype = ETHERTYPE_IP; + break; + case LRO_TYPE_IPV6_TCP: + tcp_hdr_offset -= sizeof(*le->outer.ip6); + m->m_pkthdr.lro_etype = ETHERTYPE_IPV6; + break; + default: + goto compressed; + } + + MPASS(tcp_hdr_offset >= 0); *** 274 LINES SKIPPED *** From nobody Mon Dec 4 18:59:27 2023 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 4SkXyl4HhZz52h4T; Mon, 4 Dec 2023 18:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkXyl3WTXz3TZF; Mon, 4 Dec 2023 18:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkV1087FFcZvaD+yvmy8Mm3Rtt74kT0WXda511EyuXA=; b=n4e7mTJ3WtE3I4yj9GaTXTYirwV034wumh6mVXVq/OMzD50zRuBonITg8ZbwTYvD4n2eCi lPyreliLAJVZoizw8I0W8q4xELi3ZxWRp/AM/dU8Xz19M58GGGJor8AJimIAFAs6VA/hyb aJDT3ttUZLiMqKsKnhSudn6bycyjht8HTlGDUKKVHCkwEh1GBZ8w8C8Ft3CoBWJZ/w6Olz hm/pBEi5YKJ5ZxJDRNh9Jrc7RblkGe8sqU/pjI/x56VnrmtlYC3e1UCH6c/lg9SyUKoNVK QUUl/3s+rlqFU8gUWqZn0xfaj/nNw2RU98GcZ+1mEdswRhTdEn5dKFLnopvFtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkV1087FFcZvaD+yvmy8Mm3Rtt74kT0WXda511EyuXA=; b=Mg00bZu3yHOqJ+oErzDxWhJ/hHAUwtOpZgnFH36hrAgTPC1zTilJSTWA7lavq5E8/1zwUI C7VQpT3YGGlxr0mUq9Q4PFrdm40o4tzQ6k6jF2gvpQG/tyCorw6R0boyGlhTq8FMNMvx7i aFpA+6nPYu6/s7R308qzFZhfFZj80Ko91vJmJx1Y6FUVh/0aPtXv0JOAH1Q6Wy2//sx23k qKh6ci+ezDEUM336mzCcgDOYelL8YdRSZDOj2OUIr3gADsDNEqzWv5kB594OIzZImlA2NW YmYjCYZzsVGXyzPhfwcQbY91JqPbkDsV6CCPHTJrwdevK47aoz5X7yni3oTfgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701716367; a=rsa-sha256; cv=none; b=ikHuL0hzFxNqvuUjOqZpWK20FeTYlWGqQHybPJXgzYV1PCB+ri40PcL09v2UOR6YT+c5X3 1HNx7eD+1gNWwA86jZz/jjhhccY3nL9t/01RV7J2u4hn2qrjajXHkcp87o9nzlHqSLEiy9 u9SwRouTpTfmZb39Xxhn/Y31RCX04YkmlAAzYdgoVblYKreD0pXw7L1dmBP/iTrsLTvCrg Kcjq6IXc/rULFbAIRgOXRGVCCYyS8uhiVFxUQJP+7Sg+R0mqoSnvVYFWHQLFSF4q2Wj23D k+Xbu78sdCE34DGrjia1yAc/xUFqvtZW2B9VMICtOUYolrwCmgl7EjI95w7NJQ== 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 4SkXyl293czdnS; Mon, 4 Dec 2023 18:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4IxRmc043542; Mon, 4 Dec 2023 18:59:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4IxRBN043539; Mon, 4 Dec 2023 18:59:27 GMT (envelope-from git) Date: Mon, 4 Dec 2023 18:59:27 GMT Message-Id: <202312041859.3B4IxRBN043539@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: 8e907391b74c - main - hpts: don't ifdef tcp_in_hpts() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 8e907391b74c6ccb6a6925638383e7b82fc9371a Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8e907391b74c6ccb6a6925638383e7b82fc9371a commit 8e907391b74c6ccb6a6925638383e7b82fc9371a Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:19:46 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-04 18:19:46 +0000 hpts: don't ifdef tcp_in_hpts() This small inline function is always available. Reviewed by: imp, tuexen, rrs Differential Revision: https://reviews.freebsd.org/D42855 --- sys/netinet/tcp_subr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 3354a0bcca39..cfbf32a40d86 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -4314,9 +4314,7 @@ tcp_req_log_req_info(struct tcpcb *tp, struct tcp_sendfile_track *req, struct timeval tv; memset(&log.u_bbr, 0, sizeof(log.u_bbr)); -#ifdef TCPHPTS log.u_bbr.inhpts = tcp_in_hpts(tp); -#endif log.u_bbr.flex8 = val; log.u_bbr.rttProp = req->timestamp; log.u_bbr.delRate = req->start; From nobody Mon Dec 4 18:59:28 2023 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 4SkXym5JrWz52h95; Mon, 4 Dec 2023 18:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkXym3cMKz3TX7; Mon, 4 Dec 2023 18:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mGZX0sGL03oLdWHXDCAQqJcMc9Ap9fctWP96w/qaJks=; b=IA+VdT0zToGhDJEeV1AGTou3HMJGOHhrdSI61Fm26LWaWCNIg35VBwbvzzHM8LGLNjDR6W jbUwA3RM0rWqK3tKGnCIVN7Pp8wnPJGDV5i9EbyCn37XAGKSfVMOARjUeZE3/MBHcTG7hL sVDQbb1TpUxj0C/YWshpy3VgXx0JYLjUPFGpNKFlF6FAczSOfDP4W7XpDZJsUChyh8aJgJ 9Q1ifX/BvupMcVdi1MEUre9JGxqLukITfXDpQvs1N/B7U7WlT59mW0tyaiiYTvNVrhY1in oFx07bCW5gt5ReJ0dg7d3VL00XDkqhVfDnrUkJKoPrcl8Vo65eT/FGeTua3R8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mGZX0sGL03oLdWHXDCAQqJcMc9Ap9fctWP96w/qaJks=; b=BXkXm2mVeXMOiqdvSfX+x2pxttmq/5a076ZwOrToDsAAfUP0ZHkKTUSCwAZAaCAol3wyHQ idUqqdaR51FKQ09q5GtX24JmtHTo3kgAjMgDg2ILXxHYlqN2UQwh28JpVUmqs0MeZ3jgpN GHz3foNXaFgyZ4UBTptnTE7W407urxeLcaXfXRs4NTYnYC5PyUb7z1ahphdDC8WQj8CffE YtXwmdecIi7PiL8Ay7Au7TcIw2GBNBsus8aO4a+emNq64wy7Wz45j6KD9WrmDdiR4bSiYQ CY4xv4Ij/H+2FAwCsJQ6dGlEqFb/aYpvQNV5LY2oCMiW6+f1lC/s4GDBjXyY3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701716368; a=rsa-sha256; cv=none; b=ALVQrzTGKEWrzrF96HydD5NolHxFj7upkA6k17YAPW3x4vsniR7UBC7GsJRv4ztkCcgxpp VuS4taQDkRTASFFXPf+T8LYCsRd8BEgOwYLMQdVg6dteunH3tfwiE7IjLln8ECR4dV8enJ eEYap8CJcq8WxWwpYnF73Gkql7Jqrw5dLkSnrZbq3Fn9jmkPfu2TsE4X+Wdkk0U2cg5BBE KE8p6WFDM8Yu8EqePTnEKAGcKfM9nsw2scxVCSpqAFSrOe7bt/OiDBqEL9hDHPlrre/x/u uqLQ5erlEFLv+7zmO/Kmu+nGydPTYLh4COcYMwU1I+/tKlicxxyepipiXt0Bmw== 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 4SkXym2hgwzdnT; Mon, 4 Dec 2023 18:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4IxS3J043593; Mon, 4 Dec 2023 18:59:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4IxS5Y043590; Mon, 4 Dec 2023 18:59:28 GMT (envelope-from git) Date: Mon, 4 Dec 2023 18:59:28 GMT Message-Id: <202312041859.3B4IxS5Y043590@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: 2b3a77467dd3 - main - hpts: make stacks responsible for tcp_hpts_init() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2b3a77467dd3d74a7170f279fb25f9736b46ef8a Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=2b3a77467dd3d74a7170f279fb25f9736b46ef8a commit 2b3a77467dd3d74a7170f279fb25f9736b46ef8a Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:19:46 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-04 18:19:46 +0000 hpts: make stacks responsible for tcp_hpts_init() Those stacks that use HPTS should care about init, not generic code. Reviewed by: imp, tuexen, rrs Differential Revision: https://reviews.freebsd.org/D42856 --- sys/netinet/tcp_stacks/bbr.c | 2 ++ sys/netinet/tcp_stacks/rack.c | 2 ++ sys/netinet/tcp_subr.c | 3 --- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 013bd0982fd3..aa78e02e39d9 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -9926,6 +9926,8 @@ bbr_init(struct tcpcb *tp, void **ptr) struct tcp_bbr *bbr = NULL; uint32_t cts; + tcp_hpts_init(tp); + *ptr = uma_zalloc(bbr_pcb_zone, (M_NOWAIT | M_ZERO)); if (*ptr == NULL) { /* diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 5df188aae52c..e7027dd1b2dd 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -14973,6 +14973,8 @@ rack_init(struct tcpcb *tp, void **ptr) uint32_t iwin, snt, us_cts; int err, no_query; + tcp_hpts_init(tp); + /* * First are we the initial or are we a switched stack? * If we are initing via tcp_newtcppcb the ptr passed diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index cfbf32a40d86..b3f5375cb8cf 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2313,9 +2313,6 @@ tcp_newtcpcb(struct inpcb *inp) * which may match an IPv4-mapped IPv6 address. */ inp->inp_ip_ttl = V_ip_defttl; -#ifdef TCPHPTS - tcp_hpts_init(tp); -#endif #ifdef TCPPCAP /* * Init the TCP PCAP queues. From nobody Mon Dec 4 18:59:29 2023 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 4SkXyn6lbcz52h5k; Mon, 4 Dec 2023 18:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkXyn5sSzz3TPd; Mon, 4 Dec 2023 18:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=50L2BYVyjoUpsYhKovrrrQWG0oKe1p8zfbO6viUWj2I=; b=WscfGjbWMjjWS8VLBImBFqvnXyZNVWt1Lv7imo8ul8X0IILi9D9LrzvJ+p2qhtk2rqBadK osEHLJ+JTRhGAAu7bOB7+sFjboWCjqG8DzY3rmb2AON5bdC9KybMYEXHWtkbreQKmtvhlC 6L+68eSVwfI4WzJhM8J6VLCu7q8cK395G1KYyNMDJReXdnD2v1i5nW1gYg9SQNMlMdD2XW bdOdmyP+sx+gZVNdRNOr0b/9JXKcqHfhN2wtaQpbddg08K2bUzDgJLwz4zcV+5wcYVXh8c 9pTgPRwwPRcnptJM8YMTCzmsROsHyh0VVnrlHh/jKP745kRPpb7Xe+7N/wvYHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=50L2BYVyjoUpsYhKovrrrQWG0oKe1p8zfbO6viUWj2I=; b=oM1onOmk9VmrvJW865mwIRIWzi6V0MbsQF7kiP4/lM98biT1EPDTZ1iqF0Kx28trYhZRx8 AKVwB4/iF24r/Iub7ojM7qFHl0ezTF2JC9FbHx2G9VEknhbgEAnSacLCS/NitKFHviNEnZ lSHCpYCaCegHJeVI67MeSE2H/twx859y3t7w01obdkhGLPdm5AyEJ4Uz0Oveb8JF0GtNkj 07T8xKSEh7Z9+Hi8VmAzxWND2cUgLenqLXc+oe3I2ckbtrfVsgOkxWdIicmzK5wwTsXydV Gh41dQH7vaB/ZeiBMH3OMKs8DhHXybNV1SUBHEyLxvAZFqLUPQxNcl84GKVv4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701716369; a=rsa-sha256; cv=none; b=ffF56OiLhcsU9EiuXEyFlBptx/uvMLvTPPi4ZGamwNB7LnZOFB4sa3LOnCUnpsOyCjfgxm SDyINTc+0zgxea58aZkQmNoYyPDp1FIm2kkxmHYo0vlAoqLBEecEmUbIe5wTf2uVwQ9PcW TYo6R8/DABkNVKJ3ZVEkMTIjOXwggAuNEhjsVO6oMV7sP3WjZrW1EjvR4T49qC3tyDmEMy qH+OPbG55EiXfWY6FXU7dkwUU0ot0/OVrf5OYfarSIswgzXw8wLThqlzhTHwkv5QRbHPap kPOrIEpnihEPV85dRSWYHJTD4s6/lp68qGM+Twvm9Ssy8wuvFQLDJM6yQTcUwg== 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 4SkXyn4G4XzdWb; Mon, 4 Dec 2023 18:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4IxTgb043648; Mon, 4 Dec 2023 18:59:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4IxTRE043645; Mon, 4 Dec 2023 18:59:29 GMT (envelope-from git) Date: Mon, 4 Dec 2023 18:59:29 GMT Message-Id: <202312041859.3B4IxTRE043645@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: d2ef52ef3dee - main - tcp/hpts: make stacks responsible for clearing themselves out HPTS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d2ef52ef3dee38cccb7f54d33ecc2a4b944dad9d Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d2ef52ef3dee38cccb7f54d33ecc2a4b944dad9d commit d2ef52ef3dee38cccb7f54d33ecc2a4b944dad9d Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:19:46 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-04 18:19:46 +0000 tcp/hpts: make stacks responsible for clearing themselves out HPTS There already is the tfb_tcp_timer_stop_all method that is supposed to stop all time events associated with a given tcpcb by given stack. Some time ago it was doing actual callout_stop(). Today bbr/rack just mark their internal state as inactive in their tfb_tcp_timer_stop_all methods, but tcpcb stays in HPTS wheel and potentially called in from HPTS. Change the methods to also call tcp_hpts_remove(). Note: I'm not sure if internal flag is still relevant once we are out of HPTS wheel. Call the method when connection goes into TCP_CLOSED state, instead of calling it later when tcpcb is freed. Also call it when we switch between stacks. Reviewed by: tuexen, rrs Differential Revision: https://reviews.freebsd.org/D42857 --- sys/netinet/tcp_stacks/bbr.c | 3 +++ sys/netinet/tcp_stacks/rack.c | 4 ++++ sys/netinet/tcp_subr.c | 8 ++------ sys/netinet/tcp_usrreq.c | 6 ++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index aa78e02e39d9..5f7c6125c1f0 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -5278,6 +5278,9 @@ bbr_stopall(struct tcpcb *tp) bbr = (struct tcp_bbr *)tp->t_fb_ptr; bbr->rc_all_timers_stopped = 1; + + tcp_hpts_remove(tp); + return (0); } diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index e7027dd1b2dd..229f36008a6a 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -8213,8 +8213,12 @@ static int rack_stopall(struct tcpcb *tp) { struct tcp_rack *rack; + rack = (struct tcp_rack *)tp->t_fb_ptr; rack->t_timers_stopped = 1; + + tcp_hpts_remove(tp); + return (0); } diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index b3f5375cb8cf..d951b5df938e 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2379,9 +2379,6 @@ tcp_discardcb(struct tcpcb *tp) INP_WLOCK_ASSERT(inp); tcp_timer_stop(tp); - if (tp->t_fb->tfb_tcp_timer_stop_all) { - tp->t_fb->tfb_tcp_timer_stop_all(tp); - } /* free the reassembly queue, if any */ tcp_reass_flush(tp); @@ -2521,9 +2518,8 @@ tcp_close(struct tcpcb *tp) tcp_fastopen_decrement_counter(tp->t_tfo_pending); tp->t_tfo_pending = NULL; } -#ifdef TCPHPTS - tcp_hpts_remove(tp); -#endif + if (tp->t_fb->tfb_tcp_timer_stop_all != NULL) + tp->t_fb->tfb_tcp_timer_stop_all(tp); in_pcbdrop(inp); TCPSTAT_INC(tcps_closed); if (tp->t_state != TCPS_CLOSED) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 93fdedc03c7b..d3ba42fd9d06 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1743,10 +1743,8 @@ tcp_ctloutput_set(struct inpcb *inp, struct sockopt *sopt) * Ensure the new stack takes ownership with a * clean slate on peak rate threshold. */ -#ifdef TCPHPTS - /* Assure that we are not on any hpts */ - tcp_hpts_remove(tp); -#endif + if (tp->t_fb->tfb_tcp_timer_stop_all != NULL) + tp->t_fb->tfb_tcp_timer_stop_all(tp); if (blk->tfb_tcp_fb_init) { error = (*blk->tfb_tcp_fb_init)(tp, &ptr); if (error) { From nobody Mon Dec 4 18:59:30 2023 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 4SkXyq0ctCz52h23; Mon, 4 Dec 2023 18:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkXyp6x06z3TKN; Mon, 4 Dec 2023 18:59:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBnqRaW8QOcrztKgb4y233Z8Qd/hafc0BXJ6DjeTLCw=; b=vfVGdZSoguPcQIFl6DmPncleEW3VtdQQ5UpjUw8enpFkQvUU5BbqwL0Dos3AHWmkZK3+8O Mg3jFQSk3bLFQjbrOZM5g4EbUqJM7yx7OMjPJcSVYSkhp0fHHFfDKPGDVeMHk/wVr6XHGc oAVMecpRE5X3FEkVotDYkLkFL4WUwe0EJCX/z44KaOy3Ufdl3zdt+8k9w4opkqKnUPBly6 kEI2O8VcgP4Zwe1XfxxiwhRgdrOl27TTNb3CLBZ7QVLOh9nLZTIDy1a2aylNblmIdkd0+p CC7nkUnEjTJlKo+rzuf0B7Qx4fQvG/UkaRpu7dQRKludoObOLaU2acncy0bS2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBnqRaW8QOcrztKgb4y233Z8Qd/hafc0BXJ6DjeTLCw=; b=AOiZ4LnEtEAoi9wm3q8l5oj6yBkUm6e/WHJdKGXopXUJuC7xK5kFfHicvWP+5Nf+ZzGLiX 3syyRUIigd58P6aCRtcwSvmRXlumvPv/2b4urQMjPF6qBLMegtLVF0exKXmLxRXoDTJwov c0OA81+orqWoKxUtIjZXgrhdzVYP6mzwYjRMalp7Opqa31b3uCbykS6HgmTWjMU82jlGfr K3MOVgxDC+mscZ3Exk5mx7pMzopDzvq4zZr15qRH66vIqHqmWs7C+bzKcf8C9ZBS+QdT5C IkHXPqE/ibwlxu76d6eIsDgrHr+9fN4Hm0K3eZzRh5ikgFpMJmDOkQgmqhFBlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701716371; a=rsa-sha256; cv=none; b=Dtma430ilt/TQ4d6HR1me38dJ4hcJ8wPszfqPe+OC1L66PgPk13T18RMS81gJf8pMwBBzB wDVxzKW6oP3mJz5PzROcPdkbcvsaJdTj24jTC8mcdCNtfT2tpS3nPAkgPgYIfz70evpXD5 V3QOhisIK7Xhu+4UHzLx33/FH7iiciNLnIvPPBmH0qfip8+5K6B1Hv4rdpuERrRMYlgb7m YSdwKxiXSaaJHrIBG8kar+vl8eEBz4N8WHKUX7aOYKgxej+CmzC4UQb3C2aYeZqFQQrIug gTu0G90oa6tAt0E3KHaBOpfeWLUMmWD64OpZBizRN81RMV8+gtJz2+vkkKmMHw== 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 4SkXyp5HZGzdWc; Mon, 4 Dec 2023 18:59:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4IxULt043700; Mon, 4 Dec 2023 18:59:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4IxUCg043697; Mon, 4 Dec 2023 18:59:30 GMT (envelope-from git) Date: Mon, 4 Dec 2023 18:59:30 GMT Message-Id: <202312041859.3B4IxUCg043697@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: 2c6fc36a0ddd - main - hpts/lro: make tcp_lro_flush_tcphpts() and tcp_run_hpts() pointers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2c6fc36a0ddd4d741e2c206855d2dff9b008005a Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=2c6fc36a0ddd4d741e2c206855d2dff9b008005a commit 2c6fc36a0ddd4d741e2c206855d2dff9b008005a Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:19:46 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-04 18:19:46 +0000 hpts/lro: make tcp_lro_flush_tcphpts() and tcp_run_hpts() pointers Rename tcp_run_hpts() to tcp_hpts_softlock() to better describe its function. This makes loadable hpts.ko working correctly with LRO. Reviewed by: tuexen, rrs Differential Revision: https://reviews.freebsd.org/D42858 --- sys/netinet/tcp_hpts.c | 104 +++++++++++++++++++++------------------------ sys/netinet/tcp_hpts.h | 3 +- sys/netinet/tcp_lro.c | 24 ++++------- sys/netinet/tcp_lro.h | 2 +- sys/netinet/tcp_lro_hpts.c | 13 +++++- 5 files changed, 71 insertions(+), 75 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index d673ccbe4a73..e88a3f24dfcc 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -1489,11 +1489,56 @@ __tcp_set_hpts(struct tcpcb *tp, int32_t line) mtx_unlock(&hpts->p_mtx); } +static struct tcp_hpts_entry * +tcp_choose_hpts_to_run(void) +{ + int i, oldest_idx, start, end; + uint32_t cts, time_since_ran, calc; + + cts = tcp_get_usecs(NULL); + time_since_ran = 0; + /* Default is all one group */ + start = 0; + end = tcp_pace.rp_num_hptss; + /* + * If we have more than one L3 group figure out which one + * this CPU is in. + */ + if (tcp_pace.grp_cnt > 1) { + for (i = 0; i < tcp_pace.grp_cnt; i++) { + if (CPU_ISSET(curcpu, &tcp_pace.grps[i]->cg_mask)) { + start = tcp_pace.grps[i]->cg_first; + end = (tcp_pace.grps[i]->cg_last + 1); + break; + } + } + } + oldest_idx = -1; + for (i = start; i < end; i++) { + if (TSTMP_GT(cts, cts_last_ran[i])) + calc = cts - cts_last_ran[i]; + else + calc = 0; + if (calc > time_since_ran) { + oldest_idx = i; + time_since_ran = calc; + } + } + if (oldest_idx >= 0) + return(tcp_pace.rp_ent[oldest_idx]); + else + return(tcp_pace.rp_ent[(curcpu % tcp_pace.rp_num_hptss)]); +} + static void -__tcp_run_hpts(struct tcp_hpts_entry *hpts) +__tcp_run_hpts(void) { + struct epoch_tracker et; + struct tcp_hpts_entry *hpts; int ticks_ran; + hpts = tcp_choose_hpts_to_run(); + if (hpts->p_hpts_active) { /* Already active */ return; @@ -1502,6 +1547,7 @@ __tcp_run_hpts(struct tcp_hpts_entry *hpts) /* Someone else got the lock */ return; } + NET_EPOCH_ENTER(et); if (hpts->p_hpts_active) goto out_with_mtx; hpts->syscall_cnt++; @@ -1554,63 +1600,9 @@ __tcp_run_hpts(struct tcp_hpts_entry *hpts) out_with_mtx: HPTS_MTX_ASSERT(hpts); mtx_unlock(&hpts->p_mtx); -} - -static struct tcp_hpts_entry * -tcp_choose_hpts_to_run(void) -{ - int i, oldest_idx, start, end; - uint32_t cts, time_since_ran, calc; - - cts = tcp_get_usecs(NULL); - time_since_ran = 0; - /* Default is all one group */ - start = 0; - end = tcp_pace.rp_num_hptss; - /* - * If we have more than one L3 group figure out which one - * this CPU is in. - */ - if (tcp_pace.grp_cnt > 1) { - for (i = 0; i < tcp_pace.grp_cnt; i++) { - if (CPU_ISSET(curcpu, &tcp_pace.grps[i]->cg_mask)) { - start = tcp_pace.grps[i]->cg_first; - end = (tcp_pace.grps[i]->cg_last + 1); - break; - } - } - } - oldest_idx = -1; - for (i = start; i < end; i++) { - if (TSTMP_GT(cts, cts_last_ran[i])) - calc = cts - cts_last_ran[i]; - else - calc = 0; - if (calc > time_since_ran) { - oldest_idx = i; - time_since_ran = calc; - } - } - if (oldest_idx >= 0) - return(tcp_pace.rp_ent[oldest_idx]); - else - return(tcp_pace.rp_ent[(curcpu % tcp_pace.rp_num_hptss)]); -} - - -void -tcp_run_hpts(void) -{ - struct tcp_hpts_entry *hpts; - struct epoch_tracker et; - - NET_EPOCH_ENTER(et); - hpts = tcp_choose_hpts_to_run(); - __tcp_run_hpts(hpts); NET_EPOCH_EXIT(et); } - static void tcp_hpts_thread(void *ctx) { @@ -2001,6 +1993,8 @@ tcp_init_hptsi(void *st) break; } } + tcp_hpts_softclock = __tcp_run_hpts; + tcp_lro_hpts_init(); printf("TCP Hpts created %d swi interrupt threads and bound %d to %s\n", created, bound, tcp_bind_threads == 2 ? "NUMA domains" : "cpus"); diff --git a/sys/netinet/tcp_hpts.h b/sys/netinet/tcp_hpts.h index 514ab84227b5..8ca21daf60de 100644 --- a/sys/netinet/tcp_hpts.h +++ b/sys/netinet/tcp_hpts.h @@ -152,7 +152,8 @@ void __tcp_set_hpts(struct tcpcb *tp, int32_t line); void tcp_set_inp_to_drop(struct inpcb *inp, uint16_t reason); -void tcp_run_hpts(void); +extern void (*tcp_hpts_softclock)(void); +void tcp_lro_hpts_init(void); extern int32_t tcp_min_hptsi_time; diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c index 6cf0411b5f65..255e543ae21d 100644 --- a/sys/netinet/tcp_lro.c +++ b/sys/netinet/tcp_lro.c @@ -88,6 +88,9 @@ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, lro, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "TCP LRO"); long tcplro_stacks_wanting_mbufq; +int (*tcp_lro_flush_tcphpts)(struct lro_ctrl *lc, struct lro_entry *le); +void (*tcp_hpts_softclock)(void); + counter_u64_t tcp_inp_lro_direct_queue; counter_u64_t tcp_inp_lro_wokeup_queue; counter_u64_t tcp_inp_lro_compressed; @@ -1109,23 +1112,14 @@ again: void tcp_lro_flush(struct lro_ctrl *lc, struct lro_entry *le) { - /* Only optimise if there are multiple packets waiting. */ -#ifdef TCPHPTS - int error; -#endif + /* Only optimise if there are multiple packets waiting. */ NET_EPOCH_ASSERT(); -#ifdef TCPHPTS - CURVNET_SET(lc->ifp->if_vnet); - error = tcp_lro_flush_tcphpts(lc, le); - CURVNET_RESTORE(); - if (error != 0) { -#endif + if (tcp_lro_flush_tcphpts == NULL || + tcp_lro_flush_tcphpts(lc, le) != 0) { tcp_lro_condense(lc, le); tcp_flush_out_entry(lc, le); -#ifdef TCPHPTS } -#endif lc->lro_flushed++; bzero(le, sizeof(*le)); LIST_INSERT_HEAD(&lc->lro_free, le, next); @@ -1268,10 +1262,8 @@ tcp_lro_flush_all(struct lro_ctrl *lc) done: /* flush active streams */ tcp_lro_rx_done(lc); - -#ifdef TCPHPTS - tcp_run_hpts(); -#endif + if (tcp_hpts_softclock != NULL) + tcp_hpts_softclock(); lc->lro_mbuf_count = 0; } diff --git a/sys/netinet/tcp_lro.h b/sys/netinet/tcp_lro.h index d981c940e7eb..b4b5e3f811e4 100644 --- a/sys/netinet/tcp_lro.h +++ b/sys/netinet/tcp_lro.h @@ -218,7 +218,7 @@ void tcp_lro_free(struct lro_ctrl *); void tcp_lro_flush_inactive(struct lro_ctrl *, const struct timeval *); void tcp_lro_flush(struct lro_ctrl *, struct lro_entry *); void tcp_lro_flush_all(struct lro_ctrl *); -int tcp_lro_flush_tcphpts(struct lro_ctrl *, struct lro_entry *); +extern int (*tcp_lro_flush_tcphpts)(struct lro_ctrl *, struct lro_entry *); int tcp_lro_rx(struct lro_ctrl *, struct mbuf *, uint32_t); void tcp_lro_queue_mbuf(struct lro_ctrl *, struct mbuf *); void tcp_lro_reg_mbufq(void); diff --git a/sys/netinet/tcp_lro_hpts.c b/sys/netinet/tcp_lro_hpts.c index 497da9cba40e..769c82a32391 100644 --- a/sys/netinet/tcp_lro_hpts.c +++ b/sys/netinet/tcp_lro_hpts.c @@ -423,6 +423,7 @@ tcp_lro_lookup(struct ifnet *ifp, struct lro_parser *pa) { struct inpcb *inp; + CURVNET_SET(ifp->if_vnet); switch (pa->data.lro_type) { #ifdef INET6 case LRO_TYPE_IPV6_TCP: @@ -447,14 +448,16 @@ tcp_lro_lookup(struct ifnet *ifp, struct lro_parser *pa) break; #endif default: + CURVNET_RESTORE(); return (NULL); } + CURVNET_RESTORE(); return (intotcpcb(inp)); } -int -tcp_lro_flush_tcphpts(struct lro_ctrl *lc, struct lro_entry *le) +static int +_tcp_lro_flush_tcphpts(struct lro_ctrl *lc, struct lro_entry *le) { struct tcpcb *tp; struct mbuf **pp, *cmp, *mv_to; @@ -575,3 +578,9 @@ tcp_lro_flush_tcphpts(struct lro_ctrl *lc, struct lro_entry *le) return (0); /* Success. */ } + +void +tcp_lro_hpts_init(void) +{ + tcp_lro_flush_tcphpts = _tcp_lro_flush_tcphpts; +} From nobody Mon Dec 4 18:59:31 2023 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 4SkXyr26Gbz52h4l; Mon, 4 Dec 2023 18:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkXyr0yDTz3TbF; Mon, 4 Dec 2023 18:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+1ChECq2wpTYnzPE6jTmavId3FdwhdiHKJP/IM5U4YY=; b=qulhZNbof+bhGbXXVRQ1RdRIvG1FzbhdwD0H+IjnD7XI4I6sto4z8l6AC8hknNNHeyi/gy vt9vUEnvLoebkUOqy4yz5IT0xTMPshOcpsZvqCsCD1YMWtmgCPmJhSvpMP44o47ESdau86 brPFfZgOeqUuIv07VGrW+z7gwq0RFSTDiTAUC54GxJODrXis/zhhGnO0qBl6nj/x+IhSDL VsWhuNiZrdAkXtTssZY1p1coJuMXbUaNLtUwRCy0iWjhaB5cYKlT6oU7sllFCRHEiOs4WP q+zq0tCvpbJ0JwMhXGt+vRfky2eMP8kEfEEmYrPYAcgyf3qdSGd53CPTMb93Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+1ChECq2wpTYnzPE6jTmavId3FdwhdiHKJP/IM5U4YY=; b=r59NwWGnROG244YXv5PN+xBhqs6vXTTsfu1VNvVBR+QjWuTteS0GeHrYTWoSlRRKxo8Dmt hOiMPelVCh+Lrp/C7THAW4W3H3NI4xEueSPx5WXQ/8+Slb6ilE1HwzodNRevqtLfGm11hz HZJht0/iN8wWi4v+UNcfb/YsD2rrHCJAx6028GXwp0IaJWsOsQTf2c7nJOjGLyuCZJgcp6 SoVUBDRRiQfTyf14uE4UnDtCdFhiCI6+G0YZw92ajbYlHBxd682owSfLH6866G9wCXnIgG VWS8YUTJ8zaKZTj5aE4I+oBJlWIA6BZqmtA0WNBVYEFNQ9tLanO4KSM2lmB/Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701716372; a=rsa-sha256; cv=none; b=Bw8HLOhfvU5N44EmU8H5XTZwdsY34ht/0SwKq4VTI3Ob5b0FMQJ5zzdRdiSxBwKqhEsKaj hKYoOAjScTAKYINOgaXQA0F5Ah4ZrTE/6vk/tXu5Ux/zhUQgvSzQLCH+bPiAeqpNrdRBI6 8RabuvM3PJ8PAyOpZK0tVl+RhGhdjvHU+q1yKTgSWfrKKv/zWIC/bCM6xA9VYG3iyrkp3J YyBtlGm5Y9TymjoQEE1l707xaq/gvPRKMQprljfn8c4Z7BrwVpZszdnAIfvjguVYSk63eP hwdZepy0OcqQvv3blEqBKs/Eth+wcmQ38bSElcLuG7FaGkqTaJNfI9xEXZIR6A== 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 4SkXyq6M5szdnV; Mon, 4 Dec 2023 18:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4IxVvC043752; Mon, 4 Dec 2023 18:59:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4IxVcB043749; Mon, 4 Dec 2023 18:59:31 GMT (envelope-from git) Date: Mon, 4 Dec 2023 18:59:31 GMT Message-Id: <202312041859.3B4IxVcB043749@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: e3cbc572f154 - main - kern/subr_trap.c: repair the HPTS performance hack in userret() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e3cbc572f1541fdc18be9971d23e210d5018e662 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e3cbc572f1541fdc18be9971d23e210d5018e662 commit e3cbc572f1541fdc18be9971d23e210d5018e662 Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:19:46 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-04 18:19:46 +0000 kern/subr_trap.c: repair the HPTS performance hack in userret() It wasn't functional as subr_trap.c doesn't include opt_inet.h. Put a better comment provided by gallatin@ in place of the old one. The idea is to use userret() as a cheap place to call a soft clock. This approach saves CPU on busy machines and saves power on idle machines. An alternative would be to constantly schedule callouts. Running with neither callouts nor the soft clock ruins HPTS precision. Reviewed by: tuexen, rrs Differential Revision: https://reviews.freebsd.org/D42860 --- sys/kern/subr_trap.c | 20 ++++++++++++-------- sys/netinet/tcp_hpts.h | 1 - sys/netinet/tcp_lro.c | 4 +--- sys/sys/systm.h | 6 ++++++ 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 8720d9f71c1c..e9a16cd0b36e 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -74,6 +74,8 @@ #include #endif +void (*tcp_hpts_softclock)(void); + /* * Define the code needed before returning to user mode, for trap and * syscall. @@ -125,16 +127,18 @@ userret(struct thread *td, struct trapframe *frame) if (PMC_THREAD_HAS_SAMPLES(td)) PMC_CALL_HOOK(td, PMC_FN_THR_USERRET, NULL); #endif -#ifdef TCPHPTS /* - * @gallatin is adament that this needs to go here, I - * am not so sure. Running hpts is a lot like - * a lro_flush() that happens while a user process - * is running. But he may know best so I will go - * with his view of accounting. :-) + * Calling tcp_hpts_softclock() here allows us to avoid frequent, + * expensive callouts that trash the cache and lead to a much higher + * number of interrupts and context switches. Testing on busy web + * servers at Netflix has shown that this improves CPU use by 7% over + * relying only on callouts to drive HPTS, and also results in idle + * power savings on mostly idle servers. + * This was inspired by the paper "Soft Timers: Efficient Microsecond + * Software Timer Support for Network Processing" + * by Mohit Aron and Peter Druschel. */ - tcp_run_hpts(); -#endif + tcp_hpts_softclock(); /* * Let the scheduler adjust our priority etc. */ diff --git a/sys/netinet/tcp_hpts.h b/sys/netinet/tcp_hpts.h index 8ca21daf60de..7eb1b2e08cb4 100644 --- a/sys/netinet/tcp_hpts.h +++ b/sys/netinet/tcp_hpts.h @@ -152,7 +152,6 @@ void __tcp_set_hpts(struct tcpcb *tp, int32_t line); void tcp_set_inp_to_drop(struct inpcb *inp, uint16_t reason); -extern void (*tcp_hpts_softclock)(void); void tcp_lro_hpts_init(void); extern int32_t tcp_min_hptsi_time; diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c index 255e543ae21d..921d28f82517 100644 --- a/sys/netinet/tcp_lro.c +++ b/sys/netinet/tcp_lro.c @@ -89,7 +89,6 @@ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, lro, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, long tcplro_stacks_wanting_mbufq; int (*tcp_lro_flush_tcphpts)(struct lro_ctrl *lc, struct lro_entry *le); -void (*tcp_hpts_softclock)(void); counter_u64_t tcp_inp_lro_direct_queue; counter_u64_t tcp_inp_lro_wokeup_queue; @@ -1262,8 +1261,7 @@ tcp_lro_flush_all(struct lro_ctrl *lc) done: /* flush active streams */ tcp_lro_rx_done(lc); - if (tcp_hpts_softclock != NULL) - tcp_hpts_softclock(); + tcp_hpts_softclock(); lc->lro_mbuf_count = 0; } diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 2532bc3d9926..06d40481375f 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -378,6 +378,12 @@ void cpu_et_frequency(struct eventtimer *et, uint64_t newfreq); extern int cpu_disable_c2_sleep; extern int cpu_disable_c3_sleep; +extern void (*tcp_hpts_softclock)(void); +#define tcp_hpts_softclock() do { \ + if (tcp_hpts_softclock != NULL) \ + tcp_hpts_softclock(); \ +} while (0) + char *kern_getenv(const char *name); void freeenv(char *env); int getenv_int(const char *name, int *data); From nobody Mon Dec 4 18:59:32 2023 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 4SkXys3Jjjz52h2J; Mon, 4 Dec 2023 18:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkXys1Fbpz3Tjm; Mon, 4 Dec 2023 18:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=15Arj3NLHN6jtcYczv5d/IUShdhLQgMiO1z0edGUngs=; b=Jvyr1yBszwyM00GZCSvBgURe6bhtUgiXbwMyyeJYtkdS5tdrRZgtmimSGfEpKdvTeCJhMa fKTOrt8PO4PHZ5LrWkMLass8CtnoGOJqvRi6ZP0Jh/ywGX0IAYNIiCqV+hi16ACnfpRTYR xpc8V+Eoy7JeoaWet+9RxOnyzDw/2Q6Jcj5udz5bJRPhqgA5n7H9XYRS+oOzJC6rsjPtF8 MQPf12tp3SG+QrFXwllpprR6bOmoITjAb7tMCcJ28lFVn9k/4T9WZQB7GYZEWSvQiihK75 X3NmYPPmUPRBOZsxWKgnJ7qLU9M81McSMyx3RCZuxmzauWzptLxKw9e4IfGiKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=15Arj3NLHN6jtcYczv5d/IUShdhLQgMiO1z0edGUngs=; b=AQxT8RrAHMn0SpqWub2oKhB3pN7ZmALRxKXOX+UyMG8Z0vTRJWlrNU3qCt6G/3GcI66Q1e YIN190LF6UYe9mbzsmThCPmxChwHmKOd1Taz+GUhjBTP/FL5rs2W80CTnkJ17wrjBx/9lv EZRLpx3Pskf97mkCRzwTYJ7mescFWOWl85y5mC0rPWMoMuhkSGXJcUbE6wYIu8cJ8T72ep BI8ky1YWqYHofzmtFivA4njHb0xtSkcNFckfjXEN2E4OAKu8yzPdZkiW6YOH9jKf10HQW5 tEZ/uNI8BBIV0VEbahOEhd3SQSCvR5a9u/ebRjBsHo4Ra/im2B8LOLk8V3ItvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701716373; a=rsa-sha256; cv=none; b=HApIY3RyKBZ1eOTmM4oKenzBIVOMmNpMJZR1mXCNG59wJpEuAN1sUuFU5cp7bJeXeUU/t0 Pa3TDqqmd8oslgcuAf5LT3UOM0UPicwD1+unVpv2/QtFlQ347hTcKVHZNsGLG67IE8dC5E +bTyK3Ofkotxp+PYXAE1QYH3QKaSNZ66uvXavyKKMsqj2tsqJj0BNIG2AEtxmsvyeAuJne gAtl9pt8tz/a8cNZRPN7txPhJUooUNDJSiAExTcu5vaM4rhykC8aPOBcsruuICB6QZKoFP teXS+eVXCYmjo3U4c/NWJhgTkyOxMSZIF3cv+1BwJ/v9Il7XKgAXeahnn+Mllg== 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 4SkXyr6xVYzdYl; Mon, 4 Dec 2023 18:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4IxWSN043793; Mon, 4 Dec 2023 18:59:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4IxWAC043790; Mon, 4 Dec 2023 18:59:32 GMT (envelope-from git) Date: Mon, 4 Dec 2023 18:59:32 GMT Message-Id: <202312041859.3B4IxWAC043790@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: 4b92c7721dee - main - hpts: remove from opt_inet.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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4b92c7721deecdc2117490ce3bc74f9cafc186d8 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4b92c7721deecdc2117490ce3bc74f9cafc186d8 commit 4b92c7721deecdc2117490ce3bc74f9cafc186d8 Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:19:47 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-04 18:19:47 +0000 hpts: remove from opt_inet.h No conditionally compilable code left. The hpts.ko is fully functional. Reviewed by: imp, tuexen, rrs Differential Revision: https://reviews.freebsd.org/D42859 --- sys/conf/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/options b/sys/conf/options index d2f31272d189..f20e43aad962 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -228,7 +228,7 @@ SYSVMSG opt_sysvipc.h SYSVSEM opt_sysvipc.h SYSVSHM opt_sysvipc.h SW_WATCHDOG opt_watchdog.h -TCPHPTS opt_inet.h +TCPHPTS TCP_REQUEST_TRK opt_global.h TCP_ACCOUNTING opt_global.h TCP_BBR opt_inet.h From nobody Mon Dec 4 20:27:00 2023 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 4SkZw25nhgz52mj0; Mon, 4 Dec 2023 20:27:14 +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 4SkZw221LFz3gYN; Mon, 4 Dec 2023 20:27:14 +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.17.1/8.17.1) with ESMTP id 3B4KR0cQ033054; Mon, 4 Dec 2023 22:27:03 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 3B4KR0cQ033054 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 3B4KR0Dj033053; Mon, 4 Dec 2023 22:27:00 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 4 Dec 2023 22:27:00 +0200 From: Konstantin Belousov To: Gleb Smirnoff Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e3cbc572f154 - main - kern/subr_trap.c: repair the HPTS performance hack in userret() Message-ID: References: <202312041859.3B4IxVcB043749@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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202312041859.3B4IxVcB043749@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.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4SkZw221LFz3gYN On Mon, Dec 04, 2023 at 06:59:31PM +0000, Gleb Smirnoff wrote: > The branch main has been updated by glebius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=e3cbc572f1541fdc18be9971d23e210d5018e662 > > commit e3cbc572f1541fdc18be9971d23e210d5018e662 > Author: Gleb Smirnoff > AuthorDate: 2023-12-04 18:19:46 +0000 > Commit: Gleb Smirnoff > CommitDate: 2023-12-04 18:19:46 +0000 > > kern/subr_trap.c: repair the HPTS performance hack in userret() > > It wasn't functional as subr_trap.c doesn't include opt_inet.h. Put a > better comment provided by gallatin@ in place of the old one. The idea > is to use userret() as a cheap place to call a soft clock. This approach > saves CPU on busy machines and saves power on idle machines. > An alternative would be to constantly schedule callouts. Running with > neither callouts nor the soft clock ruins HPTS precision. Can this be converted to AST, and scheduled as needed, instead of current ugliness? From nobody Mon Dec 4 21:02:32 2023 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 4Skbhn0SHGz52pqK; Mon, 4 Dec 2023 21:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skbhn0GgPz4GRX; Mon, 4 Dec 2023 21:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701723753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ODaUzFYAWsKlo0NRaYJO+pokppBZ+Jz7cbgFqMJjP6A=; b=r/uLfYDwQecvEyH5nCne4YTaddcrgFbk1ZErIQXRMAYwtWFqNnmyaxyJY/KDU85kSpSFfP HSUFJejlOJ098aWzAl3wRReRiKPri9iOCaK5I99afHNkAHN7a5U9ymLhcyMzQXxWWvQBl7 Y52xTddXMNilZQAMpRO0c/AwzijqedMaJZJpuNW9cS94aX5kIvcGMePgtVFSp59D/+lz/u GnhDRwC0nG1vQ3p6Xb7ka7g0if5S/iJlMN5dyFhWvXMM3/Uhf8UWOUHrmtXP1bpzLuNjeL bHOk9wb/2nuRPiPATQYv/MgmEsGxm/JGzvgak198ffKwCxx7Yof1gafBqpKiwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701723753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ODaUzFYAWsKlo0NRaYJO+pokppBZ+Jz7cbgFqMJjP6A=; b=MHpU0oqS8KRkmbmpTR3JhRRLPWKjN2iGXMhvCR7ioKHfn2NTrQ0ilwm8SkQCbChiIEAVWE 65mxOmayWve07XeYo4VPktsB75SdAjUTqhzieEfLS/kdHIhJvkR0Cvo9jUS09jfhPGFoov /e5i2UmahwzGgYzWsPmmYhHC9SMlHkInNLPX+9lChvfqxqlWdfHuRwlMkLt3uvlUFKw8jd ZNKUv9nT7IORs1wJDmjqhtIL2qdd5f0ZM2TjqSKUJWvVfzdTJjPO5jUM/lZU/hwdOza6XA YpHcpX9O7G2eYCBYe6hOejLgo2h4orUhG1exjmEJO8hSMGwQtdkvO/xyHYLW2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701723753; a=rsa-sha256; cv=none; b=aagyiOnbCvxpIV/r/3O6q/RFs6vGh7rpWhsdmlPg8DaYb2Qxnm38XXxi1IuB+lRk3rOnuh e1z5gGXJM3qweoCtDYdYewrQpaDgIcesyQ1rH9yK/gk3h09alBA3CYcrffQMd523U4tqp2 z1P3nDd8h2h6EEyVFLjBhkq4ulONxgbQQNSILAZFJo8lCTrAIE+eE7ng2QDNl5wD02EhmC Wgqw6xVjM1TFoKwWfbHKHNYrEpWTPPt20Fc86Jc3eyPpj1VdzLu01bPuvFslQxHxoKrh2p seuvQ3qrOEnFPjonGePMN2NsGF79vNueQdu2DPIZwSo6Slqae/oKS8x5jpuNQg== 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 4Skbhm67yYzj5V; Mon, 4 Dec 2023 21:02:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4L2Wvi061626; Mon, 4 Dec 2023 21:02:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4L2WqK061623; Mon, 4 Dec 2023 21:02:32 GMT (envelope-from git) Date: Mon, 4 Dec 2023 21:02:32 GMT Message-Id: <202312042102.3B4L2WqK061623@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 7893419d492c - main - Remove never implemented sbrk and sstk syscalls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7893419d492c40ca82b68fca3dcc0f5f7047d39b Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7893419d492c40ca82b68fca3dcc0f5f7047d39b commit 7893419d492c40ca82b68fca3dcc0f5f7047d39b Author: Brooks Davis AuthorDate: 2023-12-04 20:36:08 +0000 Commit: Brooks Davis CommitDate: 2023-12-04 20:36:08 +0000 Remove never implemented sbrk and sstk syscalls Both system calls were stubs returning EOPNOTSUPP and libc did not provide _ or __sys_ prefixed symbols. The actual implementation of sbrk(2) is on top of the undocumented break(2) system call. Technically this is a change in ABI, but no non-contrived program ever called these syscalls. Reviewed by: kib, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42872 --- lib/libc/aarch64/sys/Makefile.inc | 3 +- lib/libc/amd64/sys/Makefile.inc | 2 +- lib/libc/arm/sys/Makefile.inc | 2 +- lib/libc/i386/sys/Makefile.inc | 2 +- lib/libc/riscv/sys/Makefile.inc | 2 +- lib/libc/sys/Makefile.inc | 1 - sys/compat/freebsd32/freebsd32_syscall.h | 4 +-- sys/compat/freebsd32/freebsd32_syscalls.c | 4 +-- sys/compat/freebsd32/freebsd32_sysent.c | 4 +-- sys/compat/freebsd32/freebsd32_systrace_args.c | 44 -------------------------- sys/kern/init_sysent.c | 4 +-- sys/kern/syscalls.c | 4 +-- sys/kern/syscalls.master | 12 ++----- sys/kern/systrace_args.c | 44 -------------------------- sys/sys/syscall.h | 4 +-- sys/sys/syscall.mk | 2 -- sys/sys/sysproto.h | 10 ------ sys/vm/vm_mmap.c | 26 --------------- 18 files changed, 19 insertions(+), 155 deletions(-) diff --git a/lib/libc/aarch64/sys/Makefile.inc b/lib/libc/aarch64/sys/Makefile.inc index 7cb0544a2997..ae48fd739477 100644 --- a/lib/libc/aarch64/sys/Makefile.inc +++ b/lib/libc/aarch64/sys/Makefile.inc @@ -8,5 +8,4 @@ MDASM= cerror.S \ vfork.S # Don't generate default code for these syscalls: -NOASM+= sbrk.o \ - vfork.o +NOASM+= vfork.o diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libc/amd64/sys/Makefile.inc index 32c03ccf2963..658fbd2add50 100644 --- a/lib/libc/amd64/sys/Makefile.inc +++ b/lib/libc/amd64/sys/Makefile.inc @@ -7,4 +7,4 @@ SRCS+= \ MDASM= vfork.S cerror.S getcontext.S # Don't generate default code for these syscalls: -NOASM+= sbrk.o vfork.o +NOASM+= vfork.o diff --git a/lib/libc/arm/sys/Makefile.inc b/lib/libc/arm/sys/Makefile.inc index 398ac494f2bc..3a86936a7b23 100644 --- a/lib/libc/arm/sys/Makefile.inc +++ b/lib/libc/arm/sys/Makefile.inc @@ -4,4 +4,4 @@ SRCS+= __vdso_gettc.c \ MDASM= Ovfork.S cerror.S syscall.S # Don't generate default code for these syscalls: -NOASM+= sbrk.o vfork.o +NOASM+= vfork.o diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc index accdc3367ac8..57a8af428aca 100644 --- a/lib/libc/i386/sys/Makefile.inc +++ b/lib/libc/i386/sys/Makefile.inc @@ -4,7 +4,7 @@ SRCS+= i386_get_fsbase.c i386_get_gsbase.c i386_get_ioperm.c i386_get_ldt.c \ MDASM= Ovfork.S cerror.S getcontext.S syscall.S -NOASM+= sbrk.o vfork.o +NOASM+= vfork.o MAN+= i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2 MAN+= i386_set_watch.3 diff --git a/lib/libc/riscv/sys/Makefile.inc b/lib/libc/riscv/sys/Makefile.inc index f1cc8d489553..cd8ba4f11557 100644 --- a/lib/libc/riscv/sys/Makefile.inc +++ b/lib/libc/riscv/sys/Makefile.inc @@ -6,4 +6,4 @@ MDASM= cerror.S \ vfork.S # Don't generate default code for these syscalls: -NOASM+= sbrk.o vfork.o +NOASM+= vfork.o diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 0491f8227de6..b9ac43bac077 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -17,7 +17,6 @@ # NOASM= exit.o \ getlogin.o \ - sstk.o \ yield.o PSEUDO= _exit.o \ _getlogin.o diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 3123c3b1f74c..bc824b8e04be 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -73,8 +73,8 @@ #define FREEBSD32_SYS_vfork 66 /* 67 is obsolete vread */ /* 68 is obsolete vwrite */ -#define FREEBSD32_SYS_sbrk 69 -#define FREEBSD32_SYS_sstk 70 + /* 69 is obsolete sbrk */ + /* 70 is obsolete sstk */ /* 71 is old freebsd32_mmap */ #define FREEBSD32_SYS_freebsd11_vadvise 72 #define FREEBSD32_SYS_munmap 73 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index e64c36b32d00..3e7656cace72 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -74,8 +74,8 @@ const char *freebsd32_syscallnames[] = { "vfork", /* 66 = vfork */ "obs_vread", /* 67 = obsolete vread */ "obs_vwrite", /* 68 = obsolete vwrite */ - "sbrk", /* 69 = sbrk */ - "sstk", /* 70 = sstk */ + "obs_sbrk", /* 69 = obsolete sbrk */ + "obs_sstk", /* 70 = obsolete sstk */ "compat.freebsd32_mmap", /* 71 = old freebsd32_mmap */ "compat11.vadvise", /* 72 = freebsd11 vadvise */ "munmap", /* 73 = munmap */ diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 2bb45fc3d2e2..179d83186b41 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -130,8 +130,8 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)sys_vfork, .sy_auevent = AUE_VFORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 66 = vfork */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 67 = obsolete vread */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 68 = obsolete vwrite */ - { .sy_narg = AS(sbrk_args), .sy_call = (sy_call_t *)sys_sbrk, .sy_auevent = AUE_SBRK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 69 = sbrk */ - { .sy_narg = AS(sstk_args), .sy_call = (sy_call_t *)sys_sstk, .sy_auevent = AUE_SSTK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 70 = sstk */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 69 = obsolete sbrk */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 70 = obsolete sstk */ { compat(AS(ofreebsd32_mmap_args),freebsd32_mmap), .sy_auevent = AUE_MMAP, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 71 = old freebsd32_mmap */ { compat11(AS(freebsd11_vadvise_args),vadvise), .sy_auevent = AUE_O_VADVISE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 72 = freebsd11 vadvise */ { .sy_narg = AS(munmap_args), .sy_call = (sy_call_t *)sys_munmap, .sy_auevent = AUE_MUNMAP, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 73 = munmap */ diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index fb1fddc6ae5e..0d263b57bf0f 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -421,20 +421,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 0; break; } - /* sbrk */ - case 69: { - struct sbrk_args *p = params; - iarg[a++] = p->incr; /* int */ - *n_args = 1; - break; - } - /* sstk */ - case 70: { - struct sstk_args *p = params; - iarg[a++] = p->incr; /* int */ - *n_args = 1; - break; - } /* munmap */ case 73: { struct munmap_args *p = params; @@ -4009,26 +3995,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* vfork */ case 66: break; - /* sbrk */ - case 69: - switch (ndx) { - case 0: - p = "int"; - break; - default: - break; - }; - break; - /* sstk */ - case 70: - switch (ndx) { - case 0: - p = "int"; - break; - default: - break; - }; - break; /* munmap */ case 73: switch (ndx) { @@ -9347,16 +9313,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* vfork */ case 66: - /* sbrk */ - case 69: - if (ndx == 0 || ndx == 1) - p = "int"; - break; - /* sstk */ - case 70: - if (ndx == 0 || ndx == 1) - p = "int"; - break; /* munmap */ case 73: if (ndx == 0 || ndx == 1) diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index d44fec54fcd7..74b96a27b3fa 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -129,8 +129,8 @@ struct sysent sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)sys_vfork, .sy_auevent = AUE_VFORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 66 = vfork */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 67 = obsolete vread */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 68 = obsolete vwrite */ - { .sy_narg = AS(sbrk_args), .sy_call = (sy_call_t *)sys_sbrk, .sy_auevent = AUE_SBRK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 69 = sbrk */ - { .sy_narg = AS(sstk_args), .sy_call = (sy_call_t *)sys_sstk, .sy_auevent = AUE_SSTK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 70 = sstk */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 69 = obsolete sbrk */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 70 = obsolete sstk */ { compat(AS(ommap_args),mmap), .sy_auevent = AUE_MMAP, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 71 = old mmap */ { compat11(AS(freebsd11_vadvise_args),vadvise), .sy_auevent = AUE_O_VADVISE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 72 = freebsd11 vadvise */ { .sy_narg = AS(munmap_args), .sy_call = (sy_call_t *)sys_munmap, .sy_auevent = AUE_MUNMAP, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 73 = munmap */ diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 8f13ccb186ee..323669158ac4 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -74,8 +74,8 @@ const char *syscallnames[] = { "vfork", /* 66 = vfork */ "obs_vread", /* 67 = obsolete vread */ "obs_vwrite", /* 68 = obsolete vwrite */ - "sbrk", /* 69 = sbrk */ - "sstk", /* 70 = sstk */ + "obs_sbrk", /* 69 = obsolete sbrk */ + "obs_sstk", /* 70 = obsolete sstk */ "compat.mmap", /* 71 = old mmap */ "compat11.vadvise", /* 72 = freebsd11 vadvise */ "munmap", /* 73 = munmap */ diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 63aa8c2a5d7e..709b01f0abbe 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -502,16 +502,8 @@ } 67 AUE_NULL OBSOL vread 68 AUE_NULL OBSOL vwrite -69 AUE_SBRK STD|CAPENABLED { - int sbrk( - int incr - ); - } -70 AUE_SSTK STD|CAPENABLED { - int sstk( - int incr - ); - } +69 AUE_NULL OBSOL sbrk +70 AUE_NULL OBSOL sstk 71 AUE_MMAP COMPAT|CAPENABLED { void *mmap( _In_ void *addr, diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 1b14b68c84d1..5166223fe8c6 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -418,20 +418,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 0; break; } - /* sbrk */ - case 69: { - struct sbrk_args *p = params; - iarg[a++] = p->incr; /* int */ - *n_args = 1; - break; - } - /* sstk */ - case 70: { - struct sstk_args *p = params; - iarg[a++] = p->incr; /* int */ - *n_args = 1; - break; - } /* munmap */ case 73: { struct munmap_args *p = params; @@ -4096,26 +4082,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* vfork */ case 66: break; - /* sbrk */ - case 69: - switch (ndx) { - case 0: - p = "int"; - break; - default: - break; - }; - break; - /* sstk */ - case 70: - switch (ndx) { - case 0: - p = "int"; - break; - default: - break; - }; - break; /* munmap */ case 73: switch (ndx) { @@ -9492,16 +9458,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* vfork */ case 66: - /* sbrk */ - case 69: - if (ndx == 0 || ndx == 1) - p = "int"; - break; - /* sstk */ - case 70: - if (ndx == 0 || ndx == 1) - p = "int"; - break; /* munmap */ case 73: if (ndx == 0 || ndx == 1) diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 724ca454dbf7..cdc09a0edc29 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -73,8 +73,8 @@ #define SYS_vfork 66 /* 67 is obsolete vread */ /* 68 is obsolete vwrite */ -#define SYS_sbrk 69 -#define SYS_sstk 70 + /* 69 is obsolete sbrk */ + /* 70 is obsolete sstk */ /* 71 is old mmap */ #define SYS_freebsd11_vadvise 72 #define SYS_munmap 73 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index ef58619ea6d4..8c85dc4c349c 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -56,8 +56,6 @@ MIASM = \ chroot.o \ msync.o \ vfork.o \ - sbrk.o \ - sstk.o \ freebsd11_vadvise.o \ munmap.o \ mprotect.o \ diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 374f5c7d6065..803144745a76 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -254,12 +254,6 @@ struct msync_args { struct vfork_args { syscallarg_t dummy; }; -struct sbrk_args { - char incr_l_[PADL_(int)]; int incr; char incr_r_[PADR_(int)]; -}; -struct sstk_args { - char incr_l_[PADL_(int)]; int incr; char incr_r_[PADR_(int)]; -}; struct munmap_args { char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; @@ -1928,8 +1922,6 @@ int sys_umask(struct thread *, struct umask_args *); int sys_chroot(struct thread *, struct chroot_args *); int sys_msync(struct thread *, struct msync_args *); int sys_vfork(struct thread *, struct vfork_args *); -int sys_sbrk(struct thread *, struct sbrk_args *); -int sys_sstk(struct thread *, struct sstk_args *); int sys_munmap(struct thread *, struct munmap_args *); int sys_mprotect(struct thread *, struct mprotect_args *); int sys_madvise(struct thread *, struct madvise_args *); @@ -2838,8 +2830,6 @@ int freebsd13_swapoff(struct thread *, struct freebsd13_swapoff_args *); #define SYS_AUE_ogetpagesize AUE_NULL #define SYS_AUE_msync AUE_MSYNC #define SYS_AUE_vfork AUE_VFORK -#define SYS_AUE_sbrk AUE_SBRK -#define SYS_AUE_sstk AUE_SSTK #define SYS_AUE_ommap AUE_MMAP #define SYS_AUE_freebsd11_vadvise AUE_O_VADVISE #define SYS_AUE_munmap AUE_MUNMAP diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index b95f611ef758..4f709b1b74e1 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -106,32 +106,6 @@ SYSCTL_INT(_vm, OID_AUTO, imply_prot_max, CTLFLAG_RWTUN, &imply_prot_max, 0, _Static_assert(MAXPAGESIZES <= 4, "MINCORE_SUPER too narrow"); -#ifndef _SYS_SYSPROTO_H_ -struct sbrk_args { - int incr; -}; -#endif - -int -sys_sbrk(struct thread *td, struct sbrk_args *uap) -{ - /* Not yet implemented */ - return (EOPNOTSUPP); -} - -#ifndef _SYS_SYSPROTO_H_ -struct sstk_args { - int incr; -}; -#endif - -int -sys_sstk(struct thread *td, struct sstk_args *uap) -{ - /* Not yet implemented */ - return (EOPNOTSUPP); -} - #if defined(COMPAT_43) int ogetpagesize(struct thread *td, struct ogetpagesize_args *uap) From nobody Mon Dec 4 21:03:42 2023 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 4Skbk70wB5z52pTC; Mon, 4 Dec 2023 21:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skbk70RTpz4Gsg; Mon, 4 Dec 2023 21:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701723823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vElxVXgw5O9XcA6MEP4+5/Broa6PoITK/mqjeJtA5hM=; b=F3F5vooSqdkPZUN7LjIQSaQcfhT8bl3uFXgQWYJ4E+IAHM1Wi8r9+dXPr1rB/Chwk3ym/5 OroUiGb7jOjktj9n+KDnmJObSFdI1gbH/gQBKMpSkTHRHq3iPET9taQaQR1CLcqc++PJdN hg9ofdP33tHUNSEjUHLHAwc8YaEt/4BDDibmvJCGd0kFMnGV7C9ZAvYvm6+vkSOdxiny1L gWaJqFHMexHoVoZCiEI8+146QMkoi5KSBhRWn+YLBxSzjUOvPaXrvRejqFL+ejgk19Mo8K C9eWcWGj2hCJg5b1v2FSWRLFpjd+0syjdlbvo8l6j5D9Lxj8uso38BkYZwPCHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701723823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vElxVXgw5O9XcA6MEP4+5/Broa6PoITK/mqjeJtA5hM=; b=X2vMg+3nB1DkKcrHIWsJ3yvMuB3uJ1JLfxFz8p54+qIF5YtY15La9bWrvJdwzWal06DbuR 3X/Et+wOBjCBBZ4d1M6ZADaEbBxwumhPpVW9SsmGvQo4rfL0xdX3zgamkC1kv9QAQ1DyHR xH2nXzGiFWPJjJeK8ME2xXxHTXGSSrR795PLWncrryTU7+HUIN6BktPi7xNcvGzDv4Tff1 q+Nh3Pgqe9KvrlmNeb9EkKGK9yWg/iIX49hvJB7xaj8T4lxWw+N5omMEEDYR5+zzKOv4ee aMcvGQR0DfRmXwR5OcLblUkmZYP365YNMxFCz6mHqlfHMDCjOotPfp/KI0K7xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701723823; a=rsa-sha256; cv=none; b=TFzWlVsIcH+0oYynDoSvUBg11Xt3hZmRlbP9zVhYz4uRTD+8pJZuP1cIgaIyL6nG9A+ame klF6hQraJu4G4OW8upWIQRpWNy2bq4eLn3n1+6CKeih9zwjLj0mNZfUe5YDVoftEBNOyp9 zcwkVEck+eyHknmFPf0SpTI2b890nTYkBLXCBH3jO5qBnTsCJeh+izuyPu/GhcwcwTuBXE xT8meDsFfhZYHHGSXcFpd4pEZoU/giKNyC9uUXEQsBQlxTFqu9LoMBOE/MDOcSO8aUaZo3 JvlxSx7YifUONKeHwoHY51fbd8Vs3KWV0qbT67Lhku/GI2jtyMXaxaDqG7kJlg== 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 4Skbk66fYpzj0c; Mon, 4 Dec 2023 21:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4L3gAU061963; Mon, 4 Dec 2023 21:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4L3g1x061960; Mon, 4 Dec 2023 21:03:42 GMT (envelope-from git) Date: Mon, 4 Dec 2023 21:03:42 GMT Message-Id: <202312042103.3B4L3g1x061960@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: 00f0b99e63c3 - stable/13 - OpenZFS: Fix ZFS so that snapshots under .zfs/snapshot are NFS visible List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 00f0b99e63c3b27174b89dae426a2d87435d991a Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=00f0b99e63c3b27174b89dae426a2d87435d991a commit 00f0b99e63c3b27174b89dae426a2d87435d991a Author: rmacklem <64620010+rmacklem@users.noreply.github.com> AuthorDate: 2023-11-28 00:31:03 +0000 Commit: Ed Maste CommitDate: 2023-12-04 21:03:30 +0000 OpenZFS: Fix ZFS so that snapshots under .zfs/snapshot are NFS visible Call vfs_exjail_clone() for mounts created under .zfs/snapshot to fill in the mnt_exjail field for the mount. If this is not done, the snapshots under .zfs/snapshot with not be accessible over NFS. This version has the argument name in vfs.h fixed to match that of the name in spl_vfs.c, although it really does not matter. External-issue: https://reviews.freebsd.org/D42672 Reviewed-by: Alexander Motin Signed-off-by: Rick Macklem Closes #15563 (cherry picked from commit 522414da3b283dada175161e49ea7f3fe46436ff) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h | 2 +- sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c | 9 ++++++++- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h index a432f6c56739..62986b7fc525 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h @@ -103,7 +103,7 @@ void vfs_setmntopt(vfs_t *vfsp, const char *name, const char *arg, void vfs_clearmntopt(vfs_t *vfsp, const char *name); int vfs_optionisset(const vfs_t *vfsp, const char *opt, char **argp); int mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, - char *fspath, char *fspec, int fsflags); + char *fspath, char *fspec, int fsflags, vfs_t *parent_vfsp); typedef uint64_t vfs_feature_t; diff --git a/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c b/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c index 53ef46fb8ce5..177a059e88a1 100644 --- a/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c +++ b/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c @@ -120,7 +120,7 @@ vfs_optionisset(const vfs_t *vfsp, const char *opt, char **argp) int mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, char *fspath, - char *fspec, int fsflags) + char *fspec, int fsflags, vfs_t *parent_vfsp) { struct vfsconf *vfsp; struct mount *mp; @@ -220,6 +220,13 @@ mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, char *fspath, mp->mnt_opt = mp->mnt_optnew; (void) VFS_STATFS(mp, &mp->mnt_stat); +#ifdef VFS_SUPPORTS_EXJAIL_CLONE + /* + * Clone the mnt_exjail credentials of the parent, as required. + */ + vfs_exjail_clone(parent_vfsp, mp); +#endif + /* * Prevent external consumers of mount options from reading * mnt_optnew. 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 cfc4bab2fa96..3c9311098696 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -1025,7 +1025,8 @@ zfsctl_snapdir_lookup(struct vop_lookup_args *ap) "%s/" ZFS_CTLDIR_NAME "/snapshot/%s", dvp->v_vfsp->mnt_stat.f_mntonname, name); - err = mount_snapshot(curthread, vpp, "zfs", mountpoint, fullname, 0); + err = mount_snapshot(curthread, vpp, "zfs", mountpoint, fullname, 0, + dvp->v_vfsp); kmem_free(mountpoint, mountpoint_len); if (err == 0) { /* From nobody Mon Dec 4 21:28:47 2023 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 4SkcH36wyvz52qpB; Mon, 4 Dec 2023 21:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkcH36McVz4Hx2; Mon, 4 Dec 2023 21:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701725327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RRFcjxS3rT0pT7ToRaLMpQZOUrMGQHJljjqWuzZ9jZs=; b=M7XuxytfWrfNNtYe7xER+Nak/rqnqx4nQU/T+Bu8Fxe3RomdPckxqLLOI/7BfzxCz2CRjl kGHEeHa6v9pjkiR8OgHjGMWJ+J/v75W0VOiPOS/YicwZ88yC+5FvCzqvy04Xlcao5XPGRo vheFu6kAkCqwqa3SDm1Xway/bS7BNN/GY7YNk5Osk52Xg/mGwkWuntHg8S/+uGbMsnA1sr AfN7qyOxLBE10syR9EXfivT/XWqpHkM9dAEee/OBNpwpPgtYDCwMU5+z8yxh9twnj+N8lE 1F6UESDP7T4hbzq/ovkwxLhT7BKyjhv8hLDssMNX7DhD0EZsT9y+mPwgLsXIqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701725327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RRFcjxS3rT0pT7ToRaLMpQZOUrMGQHJljjqWuzZ9jZs=; b=TXUsgNv0k+AuqzquIvLkp+54/wxMWz711E4t2yNXgHNZTmpp83s1GkmoH7oLI26jx43soJ vkKFD+PRtfOouVRoGJlE3RgodjeXBv/95MyNt/a/RCivdqCNGYCyRo10z4CbR5qwzlyS10 5oejPWGB9j/Oyfu75ygOJmMmGukg7pbuA56DzfP16HvxczH/w2hEWflRZGEl0rBA195vdA 6r3o+bO9nG8OWjVyi/xfCxV2i5mkjLs9D988L+sdxsDYSIBOWfy7v+D6hPUraHFISe2Mrz CLl+4qL1h9NBkn56poF22cQaIyzw4ZMouslkz4xQfZ0JBgzg3mtXP25d8LwZJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701725327; a=rsa-sha256; cv=none; b=E0891L248sInzbdGMA6KBPvbdGeIz7XVOwEmpUlf9364XJJ4PUUWocqXNJ9o5+G8mFv6d4 GIOl1qQCa8p/oR8MjPGRw3TUrRatoWbdXmr24VUz59m/MoN5w6vc4j2M+nLIgPLbUdPVLA FsE3kxIqMeMeKaEM2MbUPnLT0M0zEOfjgDvSzZ3VIjTqnB60uJ/YJk6mLqBAnfxoSqqABw OfhsXSV2eau7K7tM4KFSnRbaYNCUe+b56kY/foslHROUqFftKLcy6LBG3WDVllniAKhhSQ +Ejjm+bBtkU8tXvYvtkBkFgh3tGW1F2RG3HhEloqXysY3M0/GPFl0zokqHC2DQ== 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 4SkcH35RY3zjHx; Mon, 4 Dec 2023 21:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4LSlQX095623; Mon, 4 Dec 2023 21:28:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4LSlm5095620; Mon, 4 Dec 2023 21:28:47 GMT (envelope-from git) Date: Mon, 4 Dec 2023 21:28:47 GMT Message-Id: <202312042128.3B4LSlm5095620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 5faaa602cee0 - main - pkgbase: propagate SRCRELDATE to the packages correctly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5faaa602cee093269b1a73156c95c6892b4f098d Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5faaa602cee093269b1a73156c95c6892b4f098d commit 5faaa602cee093269b1a73156c95c6892b4f098d Author: Baptiste Daroussin AuthorDate: 2023-12-04 08:22:02 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 21:27:57 +0000 pkgbase: propagate SRCRELDATE to the packages correctly MFC After: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42892 --- Makefile.inc1 | 12 ++++++++++-- release/scripts/make-pkg-package.sh | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 0698a5d79a0a..d85e6fd8f15b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2013,6 +2013,7 @@ package-pkg: .PHONY env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \ PKG_CMD=${PKG_CMD} PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} \ WSTAGEDIR=${WSTAGEDIR} \ + OSVERSION="${SRCRELDATE}" \ sh ${.CURDIR}/release/scripts/make-pkg-package.sh real-packages: stage-packages create-packages sign-packages .PHONY @@ -2108,12 +2109,16 @@ create-source-packages: _pkgbootstrap .PHONY -e "s|%PKG_WWW%|${PKG_WWW}|" \ ${SRCDIR}/release/packages/src-sys.ucl \ > ${SSTAGEDIR}/src-sys.ucl - ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + ${PKG_CMD} -o ABI=${PKG_ABI} \ + -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} \ -M ${SSTAGEDIR}/src.ucl \ -p ${SSTAGEDIR}/src.plist \ -r ${SRCDIR} \ -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} - ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + ${PKG_CMD} -o ABI=${PKG_ABI} \ + -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} \ -M ${SSTAGEDIR}/src-sys.ucl \ -p ${SSTAGEDIR}/src-sys.plist \ -r ${SRCDIR} \ @@ -2153,6 +2158,7 @@ create-world-package-${pkgname}: .PHONY sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" ${WSTAGEDIR}/${pkgname}.ucl ; \ fi ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} -M ${WSTAGEDIR}/${pkgname}.ucl \ -p ${WSTAGEDIR}/${pkgname}.plist \ -r ${WSTAGEDIR} \ @@ -2188,6 +2194,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap /version/ {print $$2; next } ' \ ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} \ -M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \ -p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \ @@ -2224,6 +2231,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne /version/ {print $$2; next } ' \ ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} \ -M ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \ -p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \ diff --git a/release/scripts/make-pkg-package.sh b/release/scripts/make-pkg-package.sh index 25ec08f71fe6..68172c47f326 100755 --- a/release/scripts/make-pkg-package.sh +++ b/release/scripts/make-pkg-package.sh @@ -9,6 +9,7 @@ export WSTAGEDIR=${WSTAGEDIR} export REPODIR=${REPODIR} export PKG_CMD=${PKG_CMD} export PKG_VERSION=${PKG_VERSION} +export OSVERSION=${OSVERSION} export WRKDIR=$(make -C ${PORTSDIR}/ports-mgmt/pkg -V WRKDIR) make -C ${PORTSDIR}/ports-mgmt/pkg TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ From nobody Mon Dec 4 23:26:41 2023 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 4Skfv61h8Bz52xY7; Mon, 4 Dec 2023 23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skfv60sGfz4XLb; Mon, 4 Dec 2023 23: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=1701732402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mIL7QPcK7FrFlpkyAHqkwdLNvLraEvuFa+E7U1J5kUQ=; b=YlOwLyaB41llbtgPWVNkt7ePPqpKKVv3JG7sDevU4NUVi9ON9c7cfxm4r6JvBwuPd1XhvL f7cDnGJZoNUXGFnEuElzAx4VGrVuN/Q++CmQPF50oXnlIJlOlHJJlLHjHDY90imZ/7aMow HJxJVZW+B29Yi55NUFUDNlOg+FsCG4dtb0YKYDkTNcLWMWT3khtUyp6VZH+oxaPVz3DMgd ovnWycHfna3KRXwQ1hPxDNOm67kXFM3Ngz+pYo8HM7bmTqsCH5LFMbp64wvUQPDNIKBUff zsFvuT5kXZZLOEhf4gYt5eCJZiVZED5WfMwgqHJR/bhl/Je4HrlHHEnCjyEl/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701732402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mIL7QPcK7FrFlpkyAHqkwdLNvLraEvuFa+E7U1J5kUQ=; b=AXlyVqlzVkaLp7ozyAFcyRnLb/B0WeuwgmWPLoWo48YJ+MbRADQyboNuBMAd/1EYbNELrn 4Y2goFd9eBqa950WkIyTiILBgVG5oNuOm4R9ctOXaruxRk44m8qwMyiB+Wclcck1uvWNDO PAZ6JwDIKw2AFPNeD2pRJmCSkwTBtPAeYbPjLjtbLF9bqXY0q6PJxnF6K9PKyUrpdI7eXR nul8IY9C78zMJKJE8QQ1HFPB/D6MZWEFARlPpkVhCEpyuz03txnNQI8+RN/yx+LnunkjPe y1ld66FL+uMMn4XvPW4Z+tEmUSTZrjO68H6Qk9+j3442IP+6NHUn+C+vP/FUaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701732402; a=rsa-sha256; cv=none; b=BG1UmFDMCPRvJMBVs4V71vgIVFgJwqAs5f6YNWvymCIMtqvLsJQhF5MjVw2Zp9SGIdjqxZ amj5hHgewA1AWEzyTlv2wJcNt8SjO+0xGZCoWfYCbaMF4nW/+XEFnG3SedEsSgPj7dV6RY u90S2jkJU9PZR9YnPzbQ3F8u0NRPaOOvy1Kcc0ujb0E/TBkFIKWnlRxkrJp+Hii+8DDPXK CWyMjmkmxnKohqdsWodAUWDPQRD5HKvHCjmWsdafBW9L3WeqaYEW3Wlnuwf4etuafBtVOS s9V5cHB8dgGh1kfhtlOHc1YBf5hfXb23xHQk34yCQf93HQLmXX521EteKzQd8w== 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 4Skfv56xhKzm6y; Mon, 4 Dec 2023 23:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4NQfPB096122; Mon, 4 Dec 2023 23:26:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4NQf5U096119; Mon, 4 Dec 2023 23:26:41 GMT (envelope-from git) Date: Mon, 4 Dec 2023 23:26:41 GMT Message-Id: <202312042326.3B4NQf5U096119@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 468605fd3c38 - stable/14 - Spacing and alignment 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 468605fd3c389545645ed4d9e5ed889752cf8a0e Auto-Submitted: auto-generated The branch stable/14 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=468605fd3c389545645ed4d9e5ed889752cf8a0e commit 468605fd3c389545645ed4d9e5ed889752cf8a0e Author: Kirk McKusick AuthorDate: 2023-11-17 22:39:13 +0000 Commit: Kirk McKusick CommitDate: 2023-12-04 23:26:09 +0000 Spacing and alignment cleanups. No functional change. (cherry picked from commit bde3cdf18d9881abfbe45337020e996dbeabca76) --- sys/ufs/ufs/inode.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h index 454dc725386b..81500e10ebb1 100644 --- a/sys/ufs/ufs/inode.h +++ b/sys/ufs/ufs/inode.h @@ -79,10 +79,10 @@ struct iown_tracker { * exclusive. */ struct inode { - TAILQ_ENTRY(inode) i_nextsnap; /* snapshot file list. */ - struct vnode *i_vnode;/* Vnode associated with this inode. */ - struct ufsmount *i_ump;/* Ufsmount point associated with this inode. */ - struct dquot *i_dquot[MAXQUOTAS]; /* Dquot structures. */ + TAILQ_ENTRY(inode) i_nextsnap; /* Snapshot file list. */ + struct vnode *i_vnode; /* Vnode associated with this inode. */ + struct ufsmount *i_ump; /* Ufsmount point associated with this inode. */ + struct dquot *i_dquot[MAXQUOTAS]; /* Dquot structures. */ union { struct dirhash *dirhash; /* Hashing for large directories. */ daddr_t *snapblklist; /* Collect expunged snapshot blocks. */ @@ -96,7 +96,7 @@ struct inode { } dinode_u; ino_t i_number; /* The identity of the inode. */ - uint32_t i_flag; /* flags, see below */ + uint32_t i_flag; /* flags, see below */ int i_effnlink; /* i_nlink when I/O completes */ /* @@ -129,12 +129,12 @@ struct inode { * Copies from the on-disk dinode itself. */ uint64_t i_size; /* File byte count. */ - uint64_t i_gen; /* Generation number. */ + uint64_t i_gen; /* Generation number. */ uint32_t i_flags; /* Status flags (chflags). */ - uint32_t i_uid; /* File owner. */ - uint32_t i_gid; /* File group. */ + uint32_t i_uid; /* File owner. */ + uint32_t i_gid; /* File group. */ + int16_t i_nlink; /* File link count. */ uint16_t i_mode; /* IFMT, permissions; see below. */ - int16_t i_nlink; /* File link count. */ }; /* * These flags are kept in i_flag. From nobody Mon Dec 4 23:29:50 2023 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 4Skfyk360gz52y3f; Mon, 4 Dec 2023 23:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skfyk2dglz4XmC; Mon, 4 Dec 2023 23:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701732590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kDTWZDULz655Dh9ajP7huz4d7vny7uqMe9U5jTtQYIY=; b=awrEvUrBjXNiLxTMaswegXTjzKlmIzBhz5Ju9QatHtjMgAvOi5ihutWQzD86qOXBt7Ia6N KyLFBj2NkIY2yj68iuSafjNvpZucvorMEZAajF2c+qvEbopsEYERHb105ue6Q7Xrp3JxxH MV8qunPZmyoBQ0ucfMCDVDZUx0H6CGkWB8oOTPYHiXyK1Jnmgxi/Y/8ICFn/xl2ljRAASB fwQ1KtJ8wcLnqjHSuZRNZ4XjGiO3mYePkds4TlCDIKY8v8DKDPsSZq6zg8GMt8wAdkcLTf CO26X4O5kHvcJG7W54uwdFg6crhRXxF95MZ/IoGbhCwGKf+7/k6dDh0yEFNWpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701732590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kDTWZDULz655Dh9ajP7huz4d7vny7uqMe9U5jTtQYIY=; b=QDueB0ytq3FS8zOzvBQ4ZsjskytWujT4sJHqacivw4oZ/+OaJs9WE0vdNtpv+N/L3lqFzj qPQQti1DN6IwLvtMPqrM19C3dHd4yzQm784dTg+DMXOQ0BNjGmsfnek0rPIFz0YRyE5Mua xbo64oxl0dADE4PAlzRaOxf//79eQeBXdwf3utiA9hjv0naq8NsyU7IrphlNigDcydAjw7 gjc0Ly88vg2gL1C5PQeAofy/0CNkxxJmAyK5IAK9izo1TOt3g7Ji1HMEHSrgjZg38+7L8d xUDuStzvHlyW7R51jwSrHCrfEpxpSwVLm1x5+O0rfYEcmwF8UXEcOj49LJsd8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701732590; a=rsa-sha256; cv=none; b=OTK5qxqJxbM3Fuy4yOStw/BSPPS3v0eoyUtF4j6oKyej7ua6N5RzzccXYprpHn+NMcQoOy xZpNVF0jpiZZbrZei8SPlqeYzuwOQN19mG/8xwaeLHLPtwJ9YJFsfaAX95wZvO5pvV/ZL/ 7sJYpN3XaXbDi+NUYkFv8eB3rZ4chRQu+AO5ErZQgetNz4YhrWYCng1GkQ70BoKok9uIxh u2D1MysnevkkT0ipJdFBwmXbc6ThSKCs4NzUGjf7Fbl9aoe2xMn+EsWt4Y77eWHOCtlP5/ oPR0EtsbAzqJ4G5FzPCqoqe2w3nvMdLb65Y+j3mEIZeWvaSSLwk9JdoqJfHAtg== 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 4Skfyk1Zmmzm8c; Mon, 4 Dec 2023 23:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4NTo9f096628; Mon, 4 Dec 2023 23:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4NTo6g096625; Mon, 4 Dec 2023 23:29:50 GMT (envelope-from git) Date: Mon, 4 Dec 2023 23:29:50 GMT Message-Id: <202312042329.3B4NTo6g096625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 42bcec08a25f - stable/13 - Spacing and alignment 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 42bcec08a25fad52ed1f83de2f3216a816e9a2d1 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=42bcec08a25fad52ed1f83de2f3216a816e9a2d1 commit 42bcec08a25fad52ed1f83de2f3216a816e9a2d1 Author: Kirk McKusick AuthorDate: 2023-11-17 22:39:13 +0000 Commit: Kirk McKusick CommitDate: 2023-12-04 23:29:33 +0000 Spacing and alignment cleanups. No functional change. (cherry picked from commit bde3cdf18d9881abfbe45337020e996dbeabca76) --- sys/ufs/ufs/inode.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h index eb66aaae1f10..898f30204b00 100644 --- a/sys/ufs/ufs/inode.h +++ b/sys/ufs/ufs/inode.h @@ -78,10 +78,10 @@ struct iown_tracker { * exclusive. */ struct inode { - TAILQ_ENTRY(inode) i_nextsnap; /* snapshot file list. */ - struct vnode *i_vnode;/* Vnode associated with this inode. */ - struct ufsmount *i_ump;/* Ufsmount point associated with this inode. */ - struct dquot *i_dquot[MAXQUOTAS]; /* Dquot structures. */ + TAILQ_ENTRY(inode) i_nextsnap; /* Snapshot file list. */ + struct vnode *i_vnode; /* Vnode associated with this inode. */ + struct ufsmount *i_ump; /* Ufsmount point associated with this inode. */ + struct dquot *i_dquot[MAXQUOTAS]; /* Dquot structures. */ union { struct dirhash *dirhash; /* Hashing for large directories. */ daddr_t *snapblklist; /* Collect expunged snapshot blocks. */ @@ -95,7 +95,7 @@ struct inode { } dinode_u; ino_t i_number; /* The identity of the inode. */ - uint32_t i_flag; /* flags, see below */ + uint32_t i_flag; /* flags, see below */ int i_effnlink; /* i_nlink when I/O completes */ /* @@ -126,12 +126,12 @@ struct inode { * Copies from the on-disk dinode itself. */ uint64_t i_size; /* File byte count. */ - uint64_t i_gen; /* Generation number. */ + uint64_t i_gen; /* Generation number. */ uint32_t i_flags; /* Status flags (chflags). */ - uint32_t i_uid; /* File owner. */ - uint32_t i_gid; /* File group. */ + uint32_t i_uid; /* File owner. */ + uint32_t i_gid; /* File group. */ + int16_t i_nlink; /* File link count. */ uint16_t i_mode; /* IFMT, permissions; see below. */ - int16_t i_nlink; /* File link count. */ }; /* * These flags are kept in i_flag. From nobody Tue Dec 5 00:43:56 2023 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 4SkhcD2hr9z532MD; Tue, 5 Dec 2023 00:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkhcD2C1Nz4cPt; Tue, 5 Dec 2023 00:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNKZ/NCQPb5lkHtg1j/i3scFugaeqmrA9RJa1C73fB8=; b=AlIxnNl0aelmXJfnoq+feST6YRTLFw7dCOESqXGaH/DUNldFmlHGt6PaqgZUFPx/rZGwQn jTJ9vq0AT3WCizy63KmZRNY/UIrR2miBMrW5No0T42lL+U7U8quQrNiBCz3bu76U9iieNv qSeAkkby/B67g3ZJhsXIZ3Q9vo+yZIe8dTfJl/ZbCSEPoculpeQhfDbyiKqq8YgZMsl6rM oQMimJWJTjp3u+vCoWN2wetahtpCwUpvzLRZ8XrAcs0M6v18eDk/MNUpwEkTOqon9lf100 6rnY3lAGXNuTGjen6ZDeZj4+xqOvhU4ad1W8hLmXTXtdoHwdK6WBKRc1CstAvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNKZ/NCQPb5lkHtg1j/i3scFugaeqmrA9RJa1C73fB8=; b=ddeBIB7NyI6PHM0PrnnI5wN1VfTUo9TebSfpnAwwajt/9ZdzX0pU96KVVmXzzN85m4d6hS dmQ95XYuszxklROB9LsKwcxH5b823t1GhQ1R3FB7qXzIz/boXpdiFwsIVZ2/C3sKLCKP6l htPB3j1n6DlIq0BFQyaKAmLP8Z/1vpw6+oHi8yee3N30MQl93vA6IJpVPTEK2GnI00Njof SSPbSo0UdhrwYxWGcCxov04oa3sSl8gM8hnliPp6VcT60tziEG1S5Z+pBcg1IfNe3XiiR7 G2u0RnVLB4TNri1/1KalsnKi9xTO8+hOytoHhiu4OxI4nYvlsjfnpTK6wIwF0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737036; a=rsa-sha256; cv=none; b=JS536rZleX0FSx9M3jb9zEHcoUpIBnaCHeCDy29njziXwqAIISdgGIoSFh//7cVWHfMQ5A JPFUhB+gk+Bm7rCQPj+v3Tks3nhx1f7nj+HBMW8LdvFbG5uz7sLcM8qr/aHqmdcnQVy5Em X5cdqBTVoprye+KxKywox50Kv+MMneunHpY/ghwOAw9cuzXbwUMdYj0nA3h9cX+L4rtVh/ cpRVXjN0Mr4rXd27gkIyZ+9sFYtQ4mqPURjQPqblC8AgnpUOSqEPmfnZPnghIhFfAVxE6d LRwuWSAEKJaxzsLxmx9/WPxZTVAMho+cda1IPn4wCUFJhInV0o+MQpMQNE4UTQ== 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 4SkhcD1Gf3zpM7; Tue, 5 Dec 2023 00:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50huj7029723; Tue, 5 Dec 2023 00:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50hukj029720; Tue, 5 Dec 2023 00:43:56 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:43:56 GMT Message-Id: <202312050043.3B50hukj029720@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: 24346a2f7775 - stable/14 - EVFILT_SIGNAL: do not use target process pointer on detach List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 24346a2f777598272caffbd7e4fb6d85cafe64ed Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=24346a2f777598272caffbd7e4fb6d85cafe64ed commit 24346a2f777598272caffbd7e4fb6d85cafe64ed Author: Konstantin Belousov AuthorDate: 2023-11-28 12:51:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:43:27 +0000 EVFILT_SIGNAL: do not use target process pointer on detach PR: 275286 (cherry picked from commit ed410b78edc53e17b5a3e93ace2adbeb3a734ae9) --- sys/kern/kern_sig.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index c847783cd3da..d35c35a534f9 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -4298,9 +4298,7 @@ filt_sigattach(struct knote *kn) static void filt_sigdetach(struct knote *kn) { - struct proc *p = kn->kn_ptr.p_proc; - - knlist_remove(p->p_klist, kn, 0); + knlist_remove(kn->kn_knlist, kn, 0); } /* From nobody Tue Dec 5 00:43:57 2023 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 4SkhcF3fcBz532FX; Tue, 5 Dec 2023 00:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkhcF3GNrz4cbh; Tue, 5 Dec 2023 00:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XYhrMssC8MoA4Y8F+4yDEGbCRJcf/xZtMnDi1BjwtDg=; b=Ggbx2J5tMwnrPwrgR5dQq/b9XODfn6yAVVn5q8M6NE2LuhuWnX81lsdGjRlKeiZ6qZDVar fFfplLa+JwsZiy0ry6u1nPO4Rhq9A8u/9yFJJxV4hywT1kfspbTCvja8/hDDodfhUwkfr5 W1AKtm7zz5nfYD8sUpA7G2tG6jgoRWA+3x5pLTb9v3qSZNQNfjBMl/elCdgnsX1xk77rst I2FHHc520OU8lo3jGJw/C4FbSbNippHkIjApTOc88Ycq3SC6cDxCnWIX/P2xYlkxVQaCtp D/iB1Gqe9GynqA8j/HF/IX+ciHOHpNlJDUnYpzY0SiN9zP/tbXGVbXgO2+xHFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XYhrMssC8MoA4Y8F+4yDEGbCRJcf/xZtMnDi1BjwtDg=; b=cAMWE84pwmaDFvU7N/lbfqcff+lJSisTKed9AQyM6sM8EWA/jyFhQ1lK1adtxaEjixXS+J SfcTda+K9H1M4Z4tmcv8tvVT01y37DgS7ROBo4tdab85pHTlX+OZaWocGaTQpXq3oPZuer uwq3fe6y/A7PSbtX7CVGPEyvULfj5YMuZNE4Qdxonm9z9xeizrcMAPLxJXc+a1/6+kl2tZ bdQqpEGXNJzS8mybkx+JvJZ0UIBa7qHI7gGsFTJdtH3C4X16aw9h+sgPw0pU94DEEF7GW5 wTAJd7wGuFmhV0t129Tc9ogWX+evPZeuPRWE6rFM5UUmZws+Erk4J8MPpxOufQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737037; a=rsa-sha256; cv=none; b=vlcrpQY3Ykvp26NmUtrb8UD0p0SmlLc/3AbVmHJgM9P3mmhyws3zLTLxzPycXvwV0CO+KQ r5tZG7TpWSrdy8f7qgfshyAmE5N7oj3QWEsVcthKc3Rmh3ItrWTIOuVD2she7xQDAxfsPa KT8DKbrYOA9zltj2hG2rBEAXePvVz37xRisptStrkim+t5mc4hh0VDDiH2/FjKpxXqqNTE L5BPM03G9nf6f/Eu2p5Pccuax8HKcOyobSo08Ihz3JwmosgQv7HduG24o+fpN+NZTmWr/R xGYNhgTT9AFsgvtlXxpAo7FKamMV7hjJrD6OMIUgUy/8CGFhPrHvdPnisRgMIA== 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 4SkhcF25Qtznx7; Tue, 5 Dec 2023 00:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50hvql029794; Tue, 5 Dec 2023 00:43:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50hv3m029791; Tue, 5 Dec 2023 00:43:57 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:43:57 GMT Message-Id: <202312050043.3B50hv3m029791@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: 71f01edb5459 - stable/14 - EVFILT_TIMER: intialize stop timer list in type-stable proc init, instead of fork List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 71f01edb545968ae42967fa989cb818a3991f0cb Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=71f01edb545968ae42967fa989cb818a3991f0cb commit 71f01edb545968ae42967fa989cb818a3991f0cb Author: Konstantin Belousov AuthorDate: 2023-11-28 15:42:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:43:27 +0000 EVFILT_TIMER: intialize stop timer list in type-stable proc init, instead of fork (cherry picked from commit 171f0832c5b15f2f66d2fe59967348a42814b0c1) --- sys/kern/kern_fork.c | 1 - sys/kern/kern_proc.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index aaa46a64ef9f..edcd8a1f2139 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -624,7 +624,6 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread * LIST_INIT(&p2->p_orphans); callout_init_mtx(&p2->p_itcallout, &p2->p_mtx, 0); - TAILQ_INIT(&p2->p_kqtim_stop); /* * This begins the section where we must prevent the parent diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 2daf39b398b5..936d410133eb 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -277,6 +277,7 @@ proc_init(void *mem, int size, int flags) EVENTHANDLER_DIRECT_INVOKE(process_init, p); p->p_stats = pstats_alloc(); p->p_pgrp = NULL; + TAILQ_INIT(&p->p_kqtim_stop); return (0); } From nobody Tue Dec 5 00:43:58 2023 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 4SkhcG6LJ3z532pP; Tue, 5 Dec 2023 00:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkhcG4G41z4cZf; Tue, 5 Dec 2023 00:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8t3lDZmLrl79nc7+1ztE+2KJ3pGXB8U1D38FbPkdCI=; b=usxbY0NiZ4WZ7nhhOGvh9IO3vBkg+RG2osUfvTACdGHPvVcyOiZrVH731o4J+5EWNWvwak vcCOzYVR4B8tgM69yvSzZZ8lYVo2tzwpp8wCVMEGaPED2excLqTXvbq7JzeKuQWELpgLvg 83LXR2XdXSYHHvNyAMOV4FyanjNndF5rnJL0gNx6Ln0tt8OpKs+hwA1J+v6NJEY9W9yQQy Darx3Gr7dCgnJIoILze8oa9/5WL3dRxeNtTiPyQlTgXs5ajt+2+JDvw73CGi9swqaqQPDi R1LIwb9hRFoLxLTD9Q9NxJxGvcbtN4pqUDGrL9rHIglzpcaggw8gj4KVOpsyfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8t3lDZmLrl79nc7+1ztE+2KJ3pGXB8U1D38FbPkdCI=; b=ujN6siZhbUB4FdDS9EFI3Wtfut/vqIf9TY0Um9jtLA+dqB0rpg9kybwHC4u63L2ph7vYTn v3URwYvZyY1RE85FKL4dmMboU4w6qXeNqd7zfjQ0nBkNOma2S8MVBHBLhhDH/oUA7LXkS8 ym5AWAWBOSuH9IG6LKZR5P0txeG9wQGsOvwS+AZDQLoDLQdEBkKhT8+gDOACg59CeJZM70 fk9Pbar55qAFB6zV10oTmjQvc3bsulbhkDQfIuIhaFqUbA9buj1uYRjIJUTQnJLU0SvqTf hF0zgX65CV7nowcD3eokj8oykdKGKg+lQJEtyjCOpEzQgejSk2ZNQRDH1wlDyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737038; a=rsa-sha256; cv=none; b=YpJlGcszhUuq2NHprN3JE9HriX0IxkIigADahqwORewyifHo5bEBleypjH+T6RspvIrG+X 29YcLrPyuFtTpAz2wMIN7Gq18w25e1FSj7cfoVov1O5ng/HkO0TAOp66zyshymZuG7pxcS IgrlmLqZLtAWdNEutPBS2SOvk4LkeRh1DTXi3kad/1ewF+9yOychW644utTizEb2p8rxH9 bJ3rzDC0rlc+bvYUpUlcubtMfVZR5/Qfcp0xziOVOrFHGibYsEJ08OQPq/TovJ3MlT7S+G uVQpmLzC8iQfscCY+B2akvV6RYJBdkAkPXDXCE+Q3BPDdbhaI97sr3wWUlF9jQ== 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 4SkhcG3LJNzpM8; Tue, 5 Dec 2023 00:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50hwKX029830; Tue, 5 Dec 2023 00:43:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50hwN6029827; Tue, 5 Dec 2023 00:43:58 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:43:58 GMT Message-Id: <202312050043.3B50hwN6029827@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: 6bed0f65fb68 - stable/14 - VFS: add VOP_GETLOWVNODE() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6bed0f65fb68f0f96bfbf5dcdbab26babdafc655 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6bed0f65fb68f0f96bfbf5dcdbab26babdafc655 commit 6bed0f65fb68f0f96bfbf5dcdbab26babdafc655 Author: Konstantin Belousov AuthorDate: 2023-11-18 08:55:48 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:43:27 +0000 VFS: add VOP_GETLOWVNODE() (cherry picked from commit 4cbe4c48a7e574ec1bb919351d7a57d252b00b62) --- sys/fs/nullfs/null_vnops.c | 18 ++++++++++++++++++ sys/kern/vfs_default.c | 10 ++++++++++ sys/kern/vnode_if.src | 7 +++++++ 3 files changed, 35 insertions(+) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 9898bf010a21..7db7a352f176 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -1131,6 +1131,23 @@ null_vput_pair(struct vop_vput_pair_args *ap) return (res); } +static int +null_getlowvnode(struct vop_getlowvnode_args *ap) +{ + struct vnode *vp, *vpl; + + vp = ap->a_vp; + if (vn_lock(vp, LK_SHARED) != 0) + return (EBADF); + + vpl = NULLVPTOLOWERVP(vp); + vhold(vpl); + VOP_UNLOCK(vp); + VOP_GETLOWVNODE(vpl, ap->a_vplp, ap->a_flags); + vdrop(vpl); + return (0); +} + /* * Global vfs data structures */ @@ -1143,6 +1160,7 @@ struct vop_vector null_vnodeops = { .vop_bmap = VOP_EOPNOTSUPP, .vop_stat = null_stat, .vop_getattr = null_getattr, + .vop_getlowvnode = null_getlowvnode, .vop_getwritemount = null_getwritemount, .vop_inactive = null_inactive, .vop_need_inactive = null_need_inactive, diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index c28478f0973d..82076c84279d 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -85,6 +85,7 @@ static int vop_stdgetpages_async(struct vop_getpages_async_args *ap); static int vop_stdread_pgcache(struct vop_read_pgcache_args *ap); static int vop_stdstat(struct vop_stat_args *ap); static int vop_stdvput_pair(struct vop_vput_pair_args *ap); +static int vop_stdgetlowvnode(struct vop_getlowvnode_args *ap); /* * This vnode table stores what we want to do if the filesystem doesn't @@ -115,6 +116,7 @@ struct vop_vector default_vnodeops = { .vop_fsync = VOP_NULL, .vop_stat = vop_stdstat, .vop_fdatasync = vop_stdfdatasync, + .vop_getlowvnode = vop_stdgetlowvnode, .vop_getpages = vop_stdgetpages, .vop_getpages_async = vop_stdgetpages_async, .vop_getwritemount = vop_stdgetwritemount, @@ -1610,3 +1612,11 @@ vop_stdvput_pair(struct vop_vput_pair_args *ap) vput(vp); return (0); } + +static int +vop_stdgetlowvnode(struct vop_getlowvnode_args *ap) +{ + vref(ap->a_vp); + *ap->a_vplp = ap->a_vp; + return (0); +} diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index 3b16d4c0ada8..d13e7efb4bb5 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -471,6 +471,13 @@ vop_getwritemount { OUT struct mount **mpp; }; +%% getwritevnode vp = = = + +vop_getlowvnode { + IN struct vnode *vp; + OUT struct vnode **vplp; + IN int flags; +}; %% print vp - - - From nobody Tue Dec 5 00:43:59 2023 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 4SkhcJ0XXmz532Td; Tue, 5 Dec 2023 00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkhcH5gM2z4crq; Tue, 5 Dec 2023 00:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0+Kw8UFadf7dKWDj9blN4QNCXTUOqVNX6otwF/zFvuI=; b=J27p7pOYSaG9ndaEy494ZklLilxNGIg1QqyvLAH2U9LFyuE65flVmAGiuSDWGvZ5P0MAU0 Xw+swO3YBJZJ+I//dWsh34C/jgTMf5mrptR/SvSSScTYUxK87Xd8noc8Rfsxt5Z0dgfjuV WAvnKU48BWoFylF536Uc8u+XcNcxH7ufDoTuYzhdQE3hzv9tosmSkvIjGMd33elz601WzY nbhqOF8IF22dUL4CeFtkP/Oa0EStCUHCKYAL8WIvnruVDLriIhObEUWWHdB/+bKXS8m9uh Ul4t4cy5TO1eVZ9XOGUthBaEVUJufbMSZnbRvrYxWjlwu+jPc+lw3OcvD2MExw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0+Kw8UFadf7dKWDj9blN4QNCXTUOqVNX6otwF/zFvuI=; b=PG4iMBTSqpi01W0GelmJc+AZLDdDygBOTf1ydq4J/7cwJQgnluLpTH6WixNAR6H/Awt3Rj +7tjpSMsV7jw7iHf4p5+IgW0rm3S9LhpknAeknH1ADiPUCYq4gr9MwldUoBTzSKrRXLgMh GisD/xgnZSPQF6tcqrrjJpg5W1+jXLTo3C72Zb9PTyABkRCefAE/NzAQurQqcWP2xg8AW4 x0PKzFGV5Rd5i6OBZwQ1V6C6TZ/8cDqjKjs4hpOX+XFaoSMLEBWOKCEbxkCpXcBbzECVm3 MYk0CwtYh5WzhfzLvbePs3s4aQN66H20VuLmabWseyW/KVEZR0mxkvGmY4Ffug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737039; a=rsa-sha256; cv=none; b=WEfVWePjP28wqpYmkkANPoGbDhw4STL4XOoybsctSb+tQ8Dni7CSh8+xArx/dupD2pBIiY ljQkufM7xehsSUli2yZCE36MK3Cuy5WX7Mv1Z/BiQmwzTEItzdRK3WAyWiNn54Psl0v4mC iG9ATk5RALi4+3KARCURB+8SQ8akcx8j8qguNXLbZIBRb2mJtsxeAP+Jnw7tCY2VTQVx3t eoO3WZxBKjafHuaGQ7+4pNojCPhNebiNACPuU4RE1JnsWRt1mGei052i35ZAUYVVzKB1s/ DbNSQXpdKEeF6DeXkqqocqqKK79XDctTG9EMm6p67I3grSzg+2ZwoclWhf1bvQ== 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 4SkhcH46jZzp06; Tue, 5 Dec 2023 00:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50hxd6029895; Tue, 5 Dec 2023 00:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50hx5Z029892; Tue, 5 Dec 2023 00:43:59 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:43:59 GMT Message-Id: <202312050043.3B50hx5Z029892@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: 7dc643fe15f9 - stable/14 - vn_copy_file_range(): find write vnodes on which to call the VOP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 7dc643fe15f9b18e6821fa17402a0a2005095742 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7dc643fe15f9b18e6821fa17402a0a2005095742 commit 7dc643fe15f9b18e6821fa17402a0a2005095742 Author: Konstantin Belousov AuthorDate: 2023-11-18 08:57:44 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:43:27 +0000 vn_copy_file_range(): find write vnodes on which to call the VOP (cherry picked from commit a9bc8637690ce29496650a41d3c25e225ed22e3d) --- sys/kern/vfs_vnops.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 4669296750e4..6e8a6b23eec6 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3072,10 +3072,12 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, struct ucred *outcred, struct thread *fsize_td) { struct mount *inmp, *outmp; + struct vnode *invpl, *outvpl; int error; size_t len; uint64_t uval; + invpl = outvpl = NULL; len = *lenp; *lenp = 0; /* For error returns. */ error = 0; @@ -3101,17 +3103,22 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, if (len == 0) goto out; - inmp = invp->v_mount; - outmp = outvp->v_mount; - if (inmp == NULL || outmp == NULL) { - error = EBADF; + error = VOP_GETLOWVNODE(invp, &invpl, FREAD); + if (error != 0) goto out; - } + error = VOP_GETLOWVNODE(outvp, &outvpl, FWRITE); + if (error != 0) + goto out1; + + inmp = invpl->v_mount; + outmp = outvpl->v_mount; + if (inmp == NULL || outmp == NULL) + goto out2; for (;;) { error = vfs_busy(inmp, 0); if (error != 0) - goto out; + goto out2; if (inmp == outmp) break; error = vfs_busy(outmp, MBF_NOWAIT); @@ -3122,7 +3129,7 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, vfs_unbusy(outmp); continue; } - goto out; + goto out2; } break; } @@ -3133,16 +3140,21 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, * which can handle copies across multiple file system types. */ *lenp = len; - if (inmp == outmp || strcmp(inmp->mnt_vfc->vfc_name, - outmp->mnt_vfc->vfc_name) == 0) - error = VOP_COPY_FILE_RANGE(invp, inoffp, outvp, outoffp, + if (inmp == outmp || inmp->mnt_vfc == outmp->mnt_vfc) + error = VOP_COPY_FILE_RANGE(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); else - error = vn_generic_copy_file_range(invp, inoffp, outvp, + error = vn_generic_copy_file_range(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); vfs_unbusy(outmp); if (inmp != outmp) vfs_unbusy(inmp); +out2: + if (outvpl != NULL) + vrele(outvpl); +out1: + if (invpl != NULL) + vrele(invpl); out: return (error); } From nobody Tue Dec 5 00:44:00 2023 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 4SkhcJ71K5z532pS; Tue, 5 Dec 2023 00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkhcJ6Nj4z4csm; Tue, 5 Dec 2023 00: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=1701737040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UXgSFZu2YfDUqiuITjvWBY5d8R4XcndiHzHkaS4xWeI=; b=KzlEPq/4QQnk2LD0EJMwIhCjPBa/8O9TrG5sSl6LmoADG2J6a5bIDLTqjw7dWRYRutn9iN jra44nVmlDHouZfC97tC3SnQzeRnYOFIwmNtKdvcpNQMoOgc27aNNz0EcjtL5lNpQfBHwZ D1r3Ed3GGXf+5IYcSTykezzwf5rHbvGlaozmVwE+H5UPPiN7pNU10irTn/tS7JLhxUJX6B J0iwq562/ipQprcMksdlpoCv3c04yrTEPDqX2wbvXz/vBXZzisDgDMOm0ZHQiJrgZzG5CD 5Kxv5jQzIVENHD9oUb4Dnrgs7OBb7lnP54B0C+3htZVMH3wQIG29kjUQQlTNEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UXgSFZu2YfDUqiuITjvWBY5d8R4XcndiHzHkaS4xWeI=; b=t9FqFcudfLS0IHJgPx5Wf9Pfe1hLv0kXEEMAkihJQXPHwKVwATlThH2rtujvB7WpbAUPrO 2632hCdVzsbRPdygiVn5ye+SpKf1Ol1+O/npOHmnWxEdV2oJ+OSSdBxV+iVFh3GFHLJjbJ qNF4NeqHY4qBJBHOERG2fgXXLk7nIS4y50ALgafQ0hclGABHXxyDGMjMUEUrdQMUss/O87 tO9SES7kQ4aQBR68m2Pbnq9VWGcxw8CFGrm7BfIVAWtjz48KMcoa3WLd8XC7NPequ2ZT1U 8PV7+VkKz0UZbEmPKjGC8dmFfjGqslICX6SzngWpsMK1rb9GqaZW2rsv2vXKFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737040; a=rsa-sha256; cv=none; b=frsrB72OwoaKndQODl9D+M4y6OS4GHXbqXvcqD9Rafh7sRl5cKiq100H6tuJLhZiAzwyNJ xU7TNKLgcC5RbGmU6fWuAHZjxxlWyuavkBfv1d0qNtcCte7jdcLipeK0G2U93m90BHq/dL UNcgItSP8fxmfDAvkK7dcag9YHVPpwrCb/PkCVySwTxMnUMpCxzX9d9gxrTY8cWaENaRjU d2vPomuU9YeP2F1mNUM864bcCrnDo7oZditcDGF7gm6E7FxINSJQpZ33YCBynqUUkvhXY5 hIaKLdDlaWQH1zZ5GlpJaMuOKv4uUwsSSG5MiXH/xpKyyks6JfEP1Yo/ZEUdqg== 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 4SkhcJ5PgGzpLK; Tue, 5 Dec 2023 00:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50i04i029965; Tue, 5 Dec 2023 00:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50i0m4029962; Tue, 5 Dec 2023 00:44:00 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:44:00 GMT Message-Id: <202312050044.3B50i0m4029962@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: c99f50351c73 - stable/14 - vn_copy_file_range(): provide ENOSYS fallback to vn_generic_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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c99f50351c7390dbd370f836361dfce0d738f566 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c99f50351c7390dbd370f836361dfce0d738f566 commit c99f50351c7390dbd370f836361dfce0d738f566 Author: Konstantin Belousov AuthorDate: 2023-11-18 08:59:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:43:27 +0000 vn_copy_file_range(): provide ENOSYS fallback to vn_generic_copy_file_range() (cherry picked from commit c5405d1c850765d04f74067ebb71f57e9a26b8ea) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 +--- sys/fs/fuse/fuse_vnops.c | 7 ++----- sys/fs/nfsclient/nfs_clvnops.c | 4 +--- sys/kern/vfs_vnops.c | 2 ++ 4 files changed, 6 insertions(+), 11 deletions(-) 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 05f28033be6a..3302f043620a 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 @@ -6315,9 +6315,7 @@ bad_locked_fallback: bad_write_fallback: if (mp != NULL) vn_finished_write(mp); - error = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, - ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd); + error = ENOSYS; return (error); } #endif diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index b9e4e48e6dbd..9728afb66654 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -861,6 +861,7 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) pid_t pid; int err; + err = ENOSYS; if (mp == NULL || mp != vnode_mount(outvp)) goto fallback; @@ -943,13 +944,9 @@ unlock: VOP_UNLOCK(invp); VOP_UNLOCK(outvp); - if (err == ENOSYS) { + if (err == ENOSYS) fsess_set_notimpl(mp, FUSE_COPY_FILE_RANGE); fallback: - err = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, - ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd); - } /* * No need to call vn_rlimit_fsizex_res before return, since the uio is diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 63cb9eaec7b7..cfb5e90739a4 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3888,9 +3888,7 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap) */ if (invp == outvp || invp->v_mount != outvp->v_mount) { generic_copy: - return (vn_generic_copy_file_range(invp, ap->a_inoffp, - outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd)); + return (ENOSYS); } /* Lock both vnodes, avoiding risk of deadlock. */ diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 6e8a6b23eec6..e6a4b074b4e5 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3144,6 +3144,8 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, error = VOP_COPY_FILE_RANGE(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); else + error = ENOSYS; + if (error == ENOSYS) error = vn_generic_copy_file_range(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); vfs_unbusy(outmp); From nobody Tue Dec 5 00:44:01 2023 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 4SkhcL12ZJz532Fq; Tue, 5 Dec 2023 00:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkhcL0F5Bz4cxk; Tue, 5 Dec 2023 00: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=1701737042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3V2Ie9/4zA7LfyIN1fhyih3UOriYL94uj2WkMeba03U=; b=mLiqJPi3K8sPzOBF/pb5IjM8m6aorVgBQuhxGJB1VlFB3SLR8okbcdATT7J9VS8E1Sp+1I ek+NWWpS6DKN4G4TCDmJIEdyNb/thcfMu8RmN3r30Wrd1q8e+NefjvUgCfXYchkubUT4y7 47GofmGM+xxm64dVWGCij8tp9cSzi1D+/Wp5oAu+9+8r29nyWZ/Mn1j2ykQFRoC/RjHfmK jWLq/HNuydm8B/6MsEQPUpdoSpvA/vUBKuh7yjHkUuf4dBDEtPDtRtpF+gZ/qX5r1NkQxS PGWRquN4PPqykN1QbikBXawIj4uWhXVe9CsNPDOMbWw5mt+vFtbNgqRt6Kcr6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3V2Ie9/4zA7LfyIN1fhyih3UOriYL94uj2WkMeba03U=; b=bFeYsgeoNISv7uuNzL29QCbhxRlpksBPNme4MmYf+Aj50Ek1SH51NdzhUtKrxEz0fF3Q+J btJDYmIwr8qnWY+7bISmRZkyMvCIWwS+OzSxTjlpiZTkY+jqvC+jJggXTOGBLP/5t86Zdf HJ4WUsUTb6+qe5MjE5JBp3ovtyUPHY00WOikD4IbP2sxE/G2BUVDx9aXduklv2zDSJ91yE wheTNpZEzkcNyGF05ScI82KBceOTjq2DfVfa+M0nfh5FAQLg2HuGoTUDT/b4Js1jyHjKbJ 1I8kE0kKxohQAzoZhpV0SPXQH0QkYbAgi8pKfBfcsQfgfizoZW5dzdlyZEz/uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737042; a=rsa-sha256; cv=none; b=c9wDfKkn3FmWcO7aDtMu4xqkCgSaTTPWinnzrIk0Yvc3lK6X8FS0rW20IWcDseM13KV5cg UJrvR6qGxlvamcOjmoo2Yr7oKt+fNr4ikmHMNnB3uAtvk1XJJwaOPnqDuF1t9I0+V1opWy v1njz3OHYVrz1rlfGhzagPwF28pTHcky8bGkEPJZ2HDj0lM7fCIcXltIDCeP4GKL450z3n 3qXXlMbSgajDOJ/nAw6ZsyJjXL+tW35KKHirU4JDjKx/Isu0lAUJxERnN6fbkPHBWsoh5x TaupBk+VGmWO/XtMbxXH6pzwUOANFumkRkF0/9UMWWdh6L4mAg1eWftSwnUt9w== 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 4SkhcK6RZMzpLL; Tue, 5 Dec 2023 00:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50i1Ot030015; Tue, 5 Dec 2023 00:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50i14U030012; Tue, 5 Dec 2023 00:44:01 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:44:01 GMT Message-Id: <202312050044.3B50i14U030012@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: 6dec97eeaf14 - stable/14 - nullfs: do not allow bypass on 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6dec97eeaf146484da880d996a5bc98b4a7516d8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6dec97eeaf146484da880d996a5bc98b4a7516d8 commit 6dec97eeaf146484da880d996a5bc98b4a7516d8 Author: Konstantin Belousov AuthorDate: 2023-11-18 09:23:22 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:43:27 +0000 nullfs: do not allow bypass on copy_file_range() (cherry picked from commit 326836a1ebc6ce9b28c8f2bc1d177a444fba8ea6) --- sys/fs/nullfs/null_vnops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 7db7a352f176..5daa302bedd1 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -1181,5 +1181,6 @@ struct vop_vector null_vnodeops = { .vop_vptofh = null_vptofh, .vop_add_writecount = null_add_writecount, .vop_vput_pair = null_vput_pair, + .vop_copy_file_range = VOP_PANIC, }; VFS_VOP_VECTOR_REGISTER(null_vnodeops); From nobody Tue Dec 5 00:54:53 2023 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 4Skhrt1Bnzz532yb; Tue, 5 Dec 2023 00:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skhrt0hCxz4fjp; Tue, 5 Dec 2023 00:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ex5qlqbe8WlaiiPFVKDtF0/D0WBloEf2a4G0vNBbIAQ=; b=rOxq6mi7Dw+Q9SRHllKelyWqGwNxL/haqjLIWWbqRZTThCXjnZnB8XPtOD0QA0JEERECm6 Gzv/n9bXIGXB6SIIztQH49eCwHRJWnEY/9SgMlbrVC+LCghXtO72A/gNQ5YHMGc+R+++SY UU5oYmWvp/iUIK+/JL1HLzHFM+gpWrlmO0deyghnPmjSEC3JWDyL8nxqamEz4nTYQ1SAdy zyAG2qLzNZmT8HFksPS3bwNCVA6CBb+Ox/4GqVvlphrqCvs9Bs9CIEUgeMFgZ3vCAodtDJ U3CasAFGPCoRqI5aENuH/bUv56qd5n5SHsdTrnwOebvWNjoGT9o0FupO/OSP/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ex5qlqbe8WlaiiPFVKDtF0/D0WBloEf2a4G0vNBbIAQ=; b=IyvmzWBGZnF6/WjxvmxkXCsZEJXALtd5ZtlzOioWGYqr4NOcbXKTedmK78xRzzaSfXlrVo r5DrHWBQQ6CoIXBk1wPoOjs9MWtPxvnIrTadVXDxPMx66Cq4XCZgviiTt3EfnhQZ6FyctT lY1ClRddzA2J+Y2ESFTjdn2Lj3pFIFsBIB/HgcJd3a2Os2rJLS6Tm6xd3Tnfnv8o5LA9bN xyaX7y+q4DArftBdCnP9Nsw33VYXgmSckIYNW7d8Ea/wLKPL6WLCjDtBR2Gr6bkCMXutcX 6qjxjpN6yDyiUZyKG7YggBkzLmYBIJ2+tPLVBh2cAWq7uSXvyjFbrjxg0vkQJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737694; a=rsa-sha256; cv=none; b=q3NJshpdhWrPt2joSxICbH5v6DZtlKkCbrH58TNhPrIFjJbQ/1c4lk2Ls2XD/dL+ICnKdn jJ8b5vUS+zrc8tkiFBkG8NLs/DpH7IF0C5fdl+l6TJb24/V7ivXbsqOT+IxOIIdiC02Pzn 2eoLKSlqMUsadj1Smd+uZaBUYo3zNhk+vCAiTCz4JRCBoUPoPKreU+Y72rs1eF47O8sd/J yfGo7AifsrmMNrfQMzzzfuxgc5S/gDj/dAzbC46bV6pVOKhSvWjtOJMAN9MS/TxupDfZrz Iqgen5eRawpwwXSX8d+ncRuhtIMhEka9q6C+8h5GYHOyKW3DoN5PP7gbRoVNJA== 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 4Skhrs6rc3zpB8; Tue, 5 Dec 2023 00:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50sraH046621; Tue, 5 Dec 2023 00:54:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50srut046618; Tue, 5 Dec 2023 00:54:53 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:54:53 GMT Message-Id: <202312050054.3B50srut046618@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: 55e91944998c - stable/13 - EVFILT_SIGNAL: do not use target process pointer on detach List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 55e91944998c128d74b94b9b48a04ef41ff5e9d0 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=55e91944998c128d74b94b9b48a04ef41ff5e9d0 commit 55e91944998c128d74b94b9b48a04ef41ff5e9d0 Author: Konstantin Belousov AuthorDate: 2023-11-28 12:51:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:44:13 +0000 EVFILT_SIGNAL: do not use target process pointer on detach PR: 275286 (cherry picked from commit ed410b78edc53e17b5a3e93ace2adbeb3a734ae9) --- sys/kern/kern_sig.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index f25ff1ed55a6..6b9ea8d110c3 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -4207,9 +4207,7 @@ filt_sigattach(struct knote *kn) static void filt_sigdetach(struct knote *kn) { - struct proc *p = kn->kn_ptr.p_proc; - - knlist_remove(p->p_klist, kn, 0); + knlist_remove(kn->kn_knlist, kn, 0); } /* From nobody Tue Dec 5 00:54:55 2023 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 4Skhrv2Gscz533M0; Tue, 5 Dec 2023 00:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skhrv1pxgz4fvG; Tue, 5 Dec 2023 00:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NiJpuim5x4kC0NJrzRO5jgcYNV/NAnBbaMlwfDa3M/0=; b=phO8nUyxbFyFge90SbPYYXdQv8HiVXCtFy6ELn6+UN86li1OUVYo8ciAdl9wm8kxONaGRw pPhWohpaUwFjmDlBs/smxQg0mOr2EewVfnFgTJlj12lSCkB4YQiriNAqndoBIFgwz28t/R or4qPszhdOL9OL1ZEnZkwu/khBYtO8s/y1+d9kSBVSeI5fFCh37gBFi/b8zENa95TdvdKf OMC1vZp+JSl9CNv/iUNKomM/dI7wnRlpRUcyGhLKMGP/NKDnQpYT5Uhsae19WzzbQ3wBiJ T5EOlOnMCb3LLv7TyCB9ifbYaopiwY9zkJdTjGWIV5fcJQLdQAoGpLqBwa2msA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NiJpuim5x4kC0NJrzRO5jgcYNV/NAnBbaMlwfDa3M/0=; b=oP0nowHjrjFEYjwMbhKtkxWq2sANwKnU45s1fFJtJcAggEUXIiNHzWkROT3PKxdlqagCIG abnnqCM5I7d2630DyVspCVxyn7BKjPG5/IivFmAIuQ3gCXaVFxdA2NTNppe6putxg+EWLI vj69dxfhhW549YekSsOMW2NAdLVoIjHTUkXPMCyPQITskrlmV6Y9cFhurCR/bFz19SvCDQ 5vMBlraxnMCkgUkGBpyTcsNf+iSHmcM1elF9KcHPD1z/NNYiPAeT7HhYlCeryziswuT0EE WQCqFQw7Suf57M+vWsXAr3as5OBy2cIan10UnEH49PKwfW+egzcdTyZntiaacg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737695; a=rsa-sha256; cv=none; b=V2HYNhTYhzpjmDdkhi7Ezq+FEkmlw6Oz4hPdKDdNyLOtJbKC4p2xBgR/es5at6qyjv9hQR 8boga9fFNescTXcDqyYs82Svbdd6yvGS8hxF2jLnoxweLhS5GlHhzbkm4JZmoqOZcGVEGa PY8xCq46rP7ISGzr5avkFyT+8CO1MS746k50auLhKjIDqhy68LN7BN6igkxp7qQujxKTYl svOIe6lzuTn9dd8LHyG9C9mcfddaKETDO07/CzVzRe+LP/DPs0dsWxPUC++fguH9KhoYzR GWuy1DFtgUMMit0x6RipPze3SSUbAoAAMiyO+I5j2z7tUFMlmG+5dS5nCIvN7w== 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 4Skhrv0bLtzpSX; Tue, 5 Dec 2023 00:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50stTa046692; Tue, 5 Dec 2023 00:54:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50stgs046689; Tue, 5 Dec 2023 00:54:55 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:54:55 GMT Message-Id: <202312050054.3B50stgs046689@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: ca50304272a6 - stable/13 - EVFILT_TIMER: intialize stop timer list in type-stable proc init, instead of fork List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: ca50304272a673f4bacce824261dfa4999182c1c Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ca50304272a673f4bacce824261dfa4999182c1c commit ca50304272a673f4bacce824261dfa4999182c1c Author: Konstantin Belousov AuthorDate: 2023-11-28 15:42:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:44:13 +0000 EVFILT_TIMER: intialize stop timer list in type-stable proc init, instead of fork (cherry picked from commit 171f0832c5b15f2f66d2fe59967348a42814b0c1) --- sys/kern/kern_fork.c | 1 - sys/kern/kern_proc.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index e3148763b460..59ffcce70966 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -619,7 +619,6 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread * LIST_INIT(&p2->p_orphans); callout_init_mtx(&p2->p_itcallout, &p2->p_mtx, 0); - TAILQ_INIT(&p2->p_kqtim_stop); /* * This begins the section where we must prevent the parent diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 2a6c9bb977a3..61c389f0b345 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -277,6 +277,7 @@ proc_init(void *mem, int size, int flags) EVENTHANDLER_DIRECT_INVOKE(process_init, p); p->p_stats = pstats_alloc(); p->p_pgrp = NULL; + TAILQ_INIT(&p->p_kqtim_stop); return (0); } From nobody Tue Dec 5 00:54:56 2023 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 4Skhrw3vGYz532yf; Tue, 5 Dec 2023 00:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skhrw316cz4fsp; Tue, 5 Dec 2023 00:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LweAo2zK31yX5wlQwcNJzCjI0UCJJSu40kMmXBm8JcU=; b=LUKEp2rl4F3fJuT/YbQ4HzfmihHD/gWNuLSHM3R5rtdf7e6CnmQ/l0DIJ9EXonQt8zZaBp y8RxFhLwPn2gewPM+xvB6bhbuPmcFcnDEaW7uU/1v1++ha97RPZTNZTb3se4Mlt7ZrjG9E dtyfHgAEfA7Ssltbt6SWuLikjA5jVJ9q9cH0CabJ73wQ2mKyKo5126paUk6GKSi5lNexgC LFM6+2N+5fovGEXlXG2uUOw2xcrtWVWC/AfHjRApggKQqtrrgD5vxKfmGL/v1Zyum22wWi X+chjuo4x7LuqkaI2BH8j//olthhHz+bGovNJI+mPM+EyHhEblCFX6Im8t5IYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LweAo2zK31yX5wlQwcNJzCjI0UCJJSu40kMmXBm8JcU=; b=IVmxH3Oppjrwqak6DjVrMj+5Sg2OxHpqcoaX01I6hGaJNZMhbtWrvvrZmj8wWFi9ycwnoQ /LFS+5WRgD1togNBfD3yZQDT0oTOlcMUn98Ht74FI2doXS0bx19seeHw9bl4A03iEewTrE GQ4YehqSouLBss2Zs3xYH+jX60YJU/CjQv4mUSvc8kmb+9youYdEobgwwKYQGvvP1uutvd BoucBI/MfNzRERR/BhtNz4hn+npfjnyMWUnszaVTcUelpNvQKJBz2NGOI7okziva+Y50x9 dqD/aPuf23HWx50TOn8M7JrOwS9XAhsIpcBlXigzoLBIqSRXC5uZXLfn+K6lCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737696; a=rsa-sha256; cv=none; b=jwqaUm/fADuKcWTICicU69qMtnnmTawIowEk2VAJSvt1DkwOZ1KeIs9JZSmLZCeB+XM2OV NST/UMM/AWSikbV47J/fYq2Vg4kxBwqFM9q2xkHtbXrge4M5NqAiEnRAFes8LKFu33XgSS r5iaXtdj8r7neMz2RmKjFlRSKNGp1TbIEuz9jtDI3wCf3vjimC7+7C/fWcV43dLNAfQojB U0qBgn7S017M719Nz6pNBXOINUCIAsTyao5Z0SlrgFbyTmRiLASKZC6Lr0NOJUjN9fF/IL bwFDFiBVqhHB32cRZbpXXLC/cQU648F+gmBrS4XxVCvfbw0i4k0b9vZYoRHbAg== 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 4Skhrw1mtvzpdR; Tue, 5 Dec 2023 00:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50suTe046730; Tue, 5 Dec 2023 00:54:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50suAq046727; Tue, 5 Dec 2023 00:54:56 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:54:56 GMT Message-Id: <202312050054.3B50suAq046727@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: 62ed7f98a2db - stable/13 - VFS: add VOP_GETLOWVNODE() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 62ed7f98a2db5018a5336398df37f60cb157ec6d Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=62ed7f98a2db5018a5336398df37f60cb157ec6d commit 62ed7f98a2db5018a5336398df37f60cb157ec6d Author: Konstantin Belousov AuthorDate: 2023-11-18 08:55:48 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:44:13 +0000 VFS: add VOP_GETLOWVNODE() (cherry picked from commit 4cbe4c48a7e574ec1bb919351d7a57d252b00b62) --- sys/fs/nullfs/null_vnops.c | 18 ++++++++++++++++++ sys/kern/vfs_default.c | 10 ++++++++++ sys/kern/vnode_if.src | 7 +++++++ 3 files changed, 35 insertions(+) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 9898bf010a21..7db7a352f176 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -1131,6 +1131,23 @@ null_vput_pair(struct vop_vput_pair_args *ap) return (res); } +static int +null_getlowvnode(struct vop_getlowvnode_args *ap) +{ + struct vnode *vp, *vpl; + + vp = ap->a_vp; + if (vn_lock(vp, LK_SHARED) != 0) + return (EBADF); + + vpl = NULLVPTOLOWERVP(vp); + vhold(vpl); + VOP_UNLOCK(vp); + VOP_GETLOWVNODE(vpl, ap->a_vplp, ap->a_flags); + vdrop(vpl); + return (0); +} + /* * Global vfs data structures */ @@ -1143,6 +1160,7 @@ struct vop_vector null_vnodeops = { .vop_bmap = VOP_EOPNOTSUPP, .vop_stat = null_stat, .vop_getattr = null_getattr, + .vop_getlowvnode = null_getlowvnode, .vop_getwritemount = null_getwritemount, .vop_inactive = null_inactive, .vop_need_inactive = null_need_inactive, diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 966f0c7ab497..c378d05e449f 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -85,6 +85,7 @@ static int vop_stdgetpages_async(struct vop_getpages_async_args *ap); static int vop_stdread_pgcache(struct vop_read_pgcache_args *ap); static int vop_stdstat(struct vop_stat_args *ap); static int vop_stdvput_pair(struct vop_vput_pair_args *ap); +static int vop_stdgetlowvnode(struct vop_getlowvnode_args *ap); /* * This vnode table stores what we want to do if the filesystem doesn't @@ -114,6 +115,7 @@ struct vop_vector default_vnodeops = { .vop_fsync = VOP_NULL, .vop_stat = vop_stdstat, .vop_fdatasync = vop_stdfdatasync, + .vop_getlowvnode = vop_stdgetlowvnode, .vop_getpages = vop_stdgetpages, .vop_getpages_async = vop_stdgetpages_async, .vop_getwritemount = vop_stdgetwritemount, @@ -1463,3 +1465,11 @@ vop_stdvput_pair(struct vop_vput_pair_args *ap) vput(vp); return (0); } + +static int +vop_stdgetlowvnode(struct vop_getlowvnode_args *ap) +{ + vref(ap->a_vp); + *ap->a_vplp = ap->a_vp; + return (0); +} diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index 8f9a8503f22a..dd4a3a738089 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -472,6 +472,13 @@ vop_getwritemount { OUT struct mount **mpp; }; +%% getwritevnode vp = = = + +vop_getlowvnode { + IN struct vnode *vp; + OUT struct vnode **vplp; + IN int flags; +}; %% print vp - - - From nobody Tue Dec 5 00:54:57 2023 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 4Skhrx4V3Hz533GD; Tue, 5 Dec 2023 00:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skhrx3jyVz4fr6; Tue, 5 Dec 2023 00:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ufdyKhAUDXvQNVjC/1ummreqrILzKuNC2COtazkR9Pg=; b=w0TRjMPrcvZTbTGiIYx8XJ5Ya13P0eb3EkyA8wTgKgks2fm9xmj7/we3cZTGMY7xWTKjkp 8ntBkec4wImUq4eg9XdrkPEI/ytuhJUc7TPJALSTe16VZ9F2WKxHIMj8AUqG+eoV8PEkxI EpCPuWGJyXHCM+AT1JjFv7QRgdP5BQ8dA62q8pA2feUVpOiJDlS8Oov2TXmprTqVbZzKLc uikwzOxbwPT46XoDatBRwyXH720pM/iEEmEMuWY9FHub31e22izhNels2OsXmY/ZV0aRva 7H42KHxnR3lZmBgM3wGKozBHOASF4bP4RDAEMUH3/OGT0i7K12XpnKC82ftzrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ufdyKhAUDXvQNVjC/1ummreqrILzKuNC2COtazkR9Pg=; b=Ltt9DU7c+rUGma1iziMtKWJ/fSgAISbZZeR6SRCYI/8bnu1j9GUuwD4Uq5080LptsqcZhu rn1hT5uoo7kl3yH/g8yZL+Qk9aZKvuywVNu/fje+KuCcDFpc2urkgXf7yo5rGt/YtIAn9w JqveJWQN9dmeq0IJ5Eml5C5h5NS5t65UYUz6LOcYzBpnOAP75FrWE6SNgJcr3eqI2TO1p/ gq25gwrppNJnV3xL3TsZBD/JzyBT7uUoz5wPZ79TLM1Kf4PTB8sv/Xi0sD3xsBG0rNDVOo Wl6RcPUVPCJPA0TrZFlO3AfnINu7s9YFT7/92nS6E7zuGLJvyyR92SHaVpLilA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737697; a=rsa-sha256; cv=none; b=Q5SrLd3j5WWnRYrYXeRemUTVMfevhDrEHRjjLKVe4VOnlwTCYWVf42/94EXofj74c2UCVX TsBrlmjW0TXDEojRr9tHs/Rwd54P/Cb7L3bydX60EDgxd+ZPCeyqEyGrbci/hDK8UwPf/f qiK47sr6l1wDRVkI3jW3oHEFmx9dX9bTQqlQesY5sGXHHL/MdofDc1XkxfhOrI2jHpo1TL jMdpqRxm4KO4alFN26k12dNWGm9jabeFpPB36VW3AIi5ScFFwzcQ2Si+caFtg0/yfemHO4 qLIUTl3lojvwkrJfGGy93PQiPUW0l3PHQkncKdouPEQQnbWqB3DF9RNx8KdoPA== 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 4Skhrx2pm2zpdS; Tue, 5 Dec 2023 00:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50svOb046787; Tue, 5 Dec 2023 00:54:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50sv8u046785; Tue, 5 Dec 2023 00:54:57 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:54:57 GMT Message-Id: <202312050054.3B50sv8u046785@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: 045d603aa158 - stable/13 - vn_copy_file_range(): find write vnodes on which to call the VOP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 045d603aa1580752d5c7a9a8c6021e4dddd7d8b2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=045d603aa1580752d5c7a9a8c6021e4dddd7d8b2 commit 045d603aa1580752d5c7a9a8c6021e4dddd7d8b2 Author: Konstantin Belousov AuthorDate: 2023-11-18 08:57:44 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:44:13 +0000 vn_copy_file_range(): find write vnodes on which to call the VOP (cherry picked from commit a9bc8637690ce29496650a41d3c25e225ed22e3d) --- sys/kern/vfs_vnops.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 48737be64beb..e37518ebaaa1 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3027,10 +3027,12 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, struct ucred *outcred, struct thread *fsize_td) { struct mount *inmp, *outmp; + struct vnode *invpl, *outvpl; int error; size_t len; uint64_t uval; + invpl = outvpl = NULL; len = *lenp; *lenp = 0; /* For error returns. */ error = 0; @@ -3056,17 +3058,22 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, if (len == 0) goto out; - inmp = invp->v_mount; - outmp = outvp->v_mount; - if (inmp == NULL || outmp == NULL) { - error = EBADF; + error = VOP_GETLOWVNODE(invp, &invpl, FREAD); + if (error != 0) goto out; - } + error = VOP_GETLOWVNODE(outvp, &outvpl, FWRITE); + if (error != 0) + goto out1; + + inmp = invpl->v_mount; + outmp = outvpl->v_mount; + if (inmp == NULL || outmp == NULL) + goto out2; for (;;) { error = vfs_busy(inmp, 0); if (error != 0) - goto out; + goto out2; if (inmp == outmp) break; error = vfs_busy(outmp, MBF_NOWAIT); @@ -3077,7 +3084,7 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, vfs_unbusy(outmp); continue; } - goto out; + goto out2; } break; } @@ -3089,14 +3096,20 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, */ *lenp = len; if (inmp == outmp) - error = VOP_COPY_FILE_RANGE(invp, inoffp, outvp, outoffp, + error = VOP_COPY_FILE_RANGE(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); else - error = vn_generic_copy_file_range(invp, inoffp, outvp, + error = vn_generic_copy_file_range(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); vfs_unbusy(outmp); if (inmp != outmp) vfs_unbusy(inmp); +out2: + if (outvpl != NULL) + vrele(outvpl); +out1: + if (invpl != NULL) + vrele(invpl); out: return (error); } From nobody Tue Dec 5 00:54:58 2023 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 4Skhry5Hf4z533MB; Tue, 5 Dec 2023 00:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skhry4n2mz4g6N; Tue, 5 Dec 2023 00:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5BDOnJjWqWBvwzWkSXIMmsTRmtLN35CAiH8bsDT/AOw=; b=SisVe5SAbw6NxOF3EFXoo5k0edvLTkWjykeO9CJt9wHyuDL84PE7WKZrfVVLvFtPBJ3YNG PW0fQys5NktymRn4rsdvX7J6YRXRyZHZBIH/n9B+D6WOm2ucCsvq+hAzeF5PipiFBlDzOD jjWD7Nw2arwYlcGlTnsBsNql/W30otfhf1wGZdM2FiApJCzFyy2dYHKX2JB90mU52pULRI epdqdm64WwfflFiIydsrQNiwDPDNMGSNR16em82ic27SiV4W4fGjyTx89QwYaKI5YH+nsa RGxyjN96q3040sftEHzpMch/1akDD0lRVUljmm2zWz75MlJg20PSNYwowWph6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5BDOnJjWqWBvwzWkSXIMmsTRmtLN35CAiH8bsDT/AOw=; b=vOmO4rFNbZYGj2OD8bYZfIlIqy3UOBiDipx4w1m/Jt1Gg9lz/0u3HD7WQDtjWPIF9uuz7Z B1YKA1fTAS56WyKeMnttDDR0ttmg0lEXiQcVMmanNMOWQBZ874Y/XO2PZIPWg9L2qv/8WQ 6Af7DFDV30ovpLlgMrdH8248FbIi4RNHsvkZF2gaeaxPsVuOkjaVs7es2TP3IsqoIWMXJR +FRTpX4Je6W21D8/El9V6D9qPJ8QULMkypmh7owp+CG7BFSI/dHM0+KeCYkSlufoWpIucY PgI9V8/QhJefydgTLc42U4EL64gpv4WtQAE8OxJ46j5EI9SouXqZxrhGSCb1vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737698; a=rsa-sha256; cv=none; b=Sgx/7+Ebl2cpgpmBFrbWWZ1iAcU8dXyuTOgkTrAdE7LYgHINqVSxku4P+5li8LeWrbSXVp 5eh/7sO8XJijVix5/PzYReU1b/RxG3yUhTIFBkZzDiUMx1162ILgtlCns+J6aRAox2gXUI k7MiqruTsR6D9xu71JeCeAn54NS1qbQ/pCrWqrnlaQLQvyireRRjt+lYqP48fd+3D6w9im Z9Ud/7pGT+BqKTZ/N8udwv0Veqd0HXbMIhThNEsmTfpdHwiYqbIfxd3OxDwzMLbYfP1TSW rd2cFt7OcvTKyCV+0gWjADQQ7UXFBaMKHAB7/pEU63S3VH5GgdzjBtOnXCJaBg== 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 4Skhry3tQPzpQB; Tue, 5 Dec 2023 00:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50swAm046846; Tue, 5 Dec 2023 00:54:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50swn5046843; Tue, 5 Dec 2023 00:54:58 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:54:58 GMT Message-Id: <202312050054.3B50swn5046843@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: 6c23d1fbeaa4 - stable/13 - vn_copy_file_range(): provide ENOSYS fallback to vn_generic_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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 6c23d1fbeaa44f1cc4695d0a53f31b3734446730 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6c23d1fbeaa44f1cc4695d0a53f31b3734446730 commit 6c23d1fbeaa44f1cc4695d0a53f31b3734446730 Author: Konstantin Belousov AuthorDate: 2023-11-18 08:59:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:44:13 +0000 vn_copy_file_range(): provide ENOSYS fallback to vn_generic_copy_file_range() (cherry picked from commit c5405d1c850765d04f74067ebb71f57e9a26b8ea) --- sys/fs/fuse/fuse_vnops.c | 7 ++----- sys/fs/nfsclient/nfs_clvnops.c | 4 +--- sys/kern/vfs_vnops.c | 2 ++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 6871461d26f1..6de23cf71cf3 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -862,6 +862,7 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) pid_t pid; int err; + err = ENOSYS; if (mp == NULL || mp != vnode_mount(outvp)) goto fallback; @@ -944,13 +945,9 @@ unlock: VOP_UNLOCK(invp); VOP_UNLOCK(outvp); - if (err == ENOSYS) { + if (err == ENOSYS) fsess_set_notimpl(mp, FUSE_COPY_FILE_RANGE); fallback: - err = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, - ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd); - } /* * No need to call vn_rlimit_fsizex_res before return, since the uio is diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 3e9daad09706..02449e64e508 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3813,9 +3813,7 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap) /* NFSv4.2 Copy is not permitted for infile == outfile. */ if (invp == outvp) { generic_copy: - return (vn_generic_copy_file_range(invp, ap->a_inoffp, - outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd)); + return (ENOSYS); } /* Lock both vnodes, avoiding risk of deadlock. */ diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index e37518ebaaa1..e720ef151c9e 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3099,6 +3099,8 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, error = VOP_COPY_FILE_RANGE(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); else + error = ENOSYS; + if (error == ENOSYS) error = vn_generic_copy_file_range(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); vfs_unbusy(outmp); From nobody Tue Dec 5 00:54:59 2023 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 4Skhs01J76z533GK; Tue, 5 Dec 2023 00:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skhrz5nwkz4fp2; Tue, 5 Dec 2023 00:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OBhco8qbIZV2qyubI1uBUBDFE2YsecAfFyWgAq08Rjs=; b=RVFz8wN2Tti9M1VVcx83yv07M4M6h3IKCNs681agMK7RMIOh1LuXyF4vgXk3nEVXRg/RXU 3RbXOp2GboxGaJqVT7/TjybVn4gozX49Ds1A34dnxdhCTmBfVjk42cSYe5/f++cm8b/Fc/ dALnZloCWp89s1/Ojicf7t+mWlhetIZjlrW4e25FsEwWKoDWHRqsAveWC3dLeitn4yBLt9 9RhQssa/rq+YtbF/kko+jVtgCoHZDt3+VJnaLEdFU6FN8bkXOU+mABwNvdia3HuLjj7bV8 +t7v69Y2cHQSnNyVmjln0RbYpIwoA4P2RoM+kfsxg/1zqOv6tUuwFR5Y15z43A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OBhco8qbIZV2qyubI1uBUBDFE2YsecAfFyWgAq08Rjs=; b=eO65FuzXGfxb8owJP4oyIqDI0abG5cDxD7B3UYVIZpZRgmvfbbWQlK8HZ83U2gHhDgqP1E MFV1SUshc9N5Km4DQTwjgpkmwItrgjAgDunb/+4yZMbhc0C/s8XWJG+s5DDxJLPRO+TM2F XZ9I0aUM76Bsn9MNoGyFWgok9549UbLg44TfxICsasgvgeTOG4n0HAgNkG8NKjiPjyCDRH KHC3SGjw6hK9O5cX8VjCsu0+lwKid6W8RoVlDRF9BXUVd5LweShlt6VYZpq5dDBoJcdCo7 DlMt+5Xh+V/DKY+gB8X+7MdatQ5mBp+oBTFaRR291vWXG3wNwUPWLgihmWnrYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737699; a=rsa-sha256; cv=none; b=Q8E5ADbfRoHtuil3nStsUZPzhyBnXb/5/X0elYbg31fn224+5be/2ASoXFVhYzjRgS78Lv hOV15AqWsP4eRPNZ2D3a96FCZXMRYGl8s4Rc1S/X9BYKWFDX3VfxlPwCslcvnycRik7NjO AFCL/3/qW/MgVEmrmsNdYa4WdNe5pAtcoBWOgUKgYBV0yCiwCac0/UepDNmvRbi6QD0HAN S/v78cISivdYKyot2pRkTv+CRPs7iDpdH85Z/TU6c8xfpmVuwqUtJp3jE1+Rw1OwfAqUZG MQdT+ULms4/2TgEF8IYmBjo+uN7VPqZbZrFrkPf0456EuVnPNC93zW8z+lwogA== 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 4Skhrz4v0kzp0b; Tue, 5 Dec 2023 00:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50sxLI046895; Tue, 5 Dec 2023 00:54:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50sxmR046892; Tue, 5 Dec 2023 00:54:59 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:54:59 GMT Message-Id: <202312050054.3B50sxmR046892@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: 6c5e70a22c41 - stable/13 - nullfs: do not allow bypass on 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 6c5e70a22c41bf3ebe3e9a68f1c9ac29775809fb Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6c5e70a22c41bf3ebe3e9a68f1c9ac29775809fb commit 6c5e70a22c41bf3ebe3e9a68f1c9ac29775809fb Author: Konstantin Belousov AuthorDate: 2023-11-18 09:23:22 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:44:13 +0000 nullfs: do not allow bypass on copy_file_range() (cherry picked from commit 326836a1ebc6ce9b28c8f2bc1d177a444fba8ea6) --- sys/fs/nullfs/null_vnops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 7db7a352f176..5daa302bedd1 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -1181,5 +1181,6 @@ struct vop_vector null_vnodeops = { .vop_vptofh = null_vptofh, .vop_add_writecount = null_add_writecount, .vop_vput_pair = null_vput_pair, + .vop_copy_file_range = VOP_PANIC, }; VFS_VOP_VECTOR_REGISTER(null_vnodeops); From nobody Tue Dec 5 01:43:51 2023 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 4SkjxM6nHPz535px; Tue, 5 Dec 2023 01:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkjxM60z4z3HMt; Tue, 5 Dec 2023 01:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701740631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=37ZGqmzmaVK1UHF/rU/SZIGpNLxNP5tcUI3m0BEsSik=; b=MCk/sfhKQvoRu+x5vPhA2FsU0mVA8sXV5clNZnHydXWg/llqtkr/RfXmC3JVaCVzJ7cMB/ faP0/lYwp7FbutLs7tACLwl8TI8/9iC3kdHHBCqVd3N1y7LzNUgkdvtnp4KYkq+4dxfqdO Eys2ZDfQT7m0MeCjKhl+BaRbkf5rqIanaWzLwDwj5c2KxApEMvXMzI5+x5rao4QC8fOq0y IO9r2MshVTmMMEbzdfajiGyAPVQxhWZtd/tFLGtCbjew2iC0vp1U8wmuctrawrg7KyrIy0 iA4FwbpXQ3+VMIPzhXCCzW9ljggD5a75lFTOdDB9XlvEmIgTurdALzYXidIMjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701740631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=37ZGqmzmaVK1UHF/rU/SZIGpNLxNP5tcUI3m0BEsSik=; b=JQCdpopTceykIyoDAvNW7D/D2cgIfoQpP3WA/nxOeibKkbPwRPhaoXkhulWlZtV1Bh8ZWv SsHAc2cQICU+Inbczin8kPQGZ+JPUsorL6wzt2rd5Y4caXKnL3/iNCFui+jPKNZOJsMg6N VF4/msPy6dBgbB6GWkzAG1/O/J0zVlL+3z+2tTXImtbik28Pr+QP39m+LUji/lHSltgLwR Q+qUM4I96tuv8ZsRKtlhjAm72XOUX6+iLdajc/PgRNXHAT8AA1Nb8Ayp46/XmU+EiO6Bfp LuiHrgAFdIOHmLXcgpF/BTf3/cNWYxPwnLJtrFwAtNbJzRp211B4jHQJIsPu9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701740631; a=rsa-sha256; cv=none; b=imgW7N3BUT4vUpKcD1qdV4K3R3uMY0Xd2Wz/SYEOe95mGdmpSuLCA0s3nb19vt1xBlPaZ7 iKP2Ok39Belaqe9lJqgNLo+l/PJzmo27bbV7xZr47HnBQbcjYp6YWAUG2/xYKx84xsBhhG MWcv9lkBJuQ8TN3YVMNWfgjMT4GvRhSOCOJQLEHDOi+YVucLV2cxgAuHf6Mx7K00/vyLEv Im0bi766kzUKKQyoalRFZzG5MGU5vgZOs8SvdTtuXOsCyaQ9UYOO90SSoHYqL2Hs0vH429 u+d28uUYVP0uholdFgwFl3k8tgBNQcB9Rov8WR/GP/BcdVIheijI+tJDOGCdEA== 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 4SkjxM56Yhzqs6; Tue, 5 Dec 2023 01:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B51hpVg030655; Tue, 5 Dec 2023 01:43:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B51hpsZ030651; Tue, 5 Dec 2023 01:43:51 GMT (envelope-from git) Date: Tue, 5 Dec 2023 01:43:51 GMT Message-Id: <202312050143.3B51hpsZ030651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Sobolev Subject: git: 62d47a4db457 - main - vmstat: fix column names broken in c168508655720 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62d47a4db4579315d7b89002d7de696b44ae1415 Auto-Submitted: auto-generated The branch main has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=62d47a4db4579315d7b89002d7de696b44ae1415 commit 62d47a4db4579315d7b89002d7de696b44ae1415 Author: Maxim Sobolev AuthorDate: 2023-12-05 01:39:21 +0000 Commit: Maxim Sobolev CommitDate: 2023-12-05 01:39:21 +0000 vmstat: fix column names broken in c168508655720 Loss of the trailing space in the multi-line format string has resulted in column name being emitted as "FAILSLEEP", instead of two columns "FAIL" and "SLEEP". --- usr.bin/vmstat/vmstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index f0da9044c204..6476df06fe39 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1481,7 +1481,7 @@ domemstat_zone(void) } } xo_open_container("memory-zone-statistics"); - xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s}" + xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s} " "{T:/%4s} {T:/%4s}\n", "ITEM", "SIZE", "LIMIT", "USED", "FREE", "REQ", "FAIL", "SLEEP", "XDOMAIN"); xo_open_list("zone"); From nobody Tue Dec 5 01:47:25 2023 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 4Skk1T3kktz535yR; Tue, 5 Dec 2023 01:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skk1T38ktz3Hlp; Tue, 5 Dec 2023 01:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701740845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=henwYUPudXg/5ZPSepqdcP67wYC4pIilUnLCNxCFY9g=; b=LoY1ZZodOsrLKXtS2zPEOWnhSx+/5vYJnaXVHkFE3D/ZVK68BtOJwhErQHyqm/Va4hiBB4 lvTTQWNyAR6exLzzW7QW69ujOge9OqEWQy48b8+T4NFqWDvhcAD29PvRyE25sUYZubwlqg IN+OFXFf7poV/UunxH+VHkaVEh5zziABywxwT/aAEOtPNSMFRks8vtuGE2VSoBj6Xa/Q0j 8qjkfAM7Ac2VcMAQiZxCiMv/czRE1ayleMf6JMaBGoEIiEkU8YvjiaFnjd1zeI8YhmrXzw S35LItmdrWhwNMlHYIz4B4ZBMBvqrvI/fUs0TO2u/a2KbtkdN5yoBgp/YszwYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701740845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=henwYUPudXg/5ZPSepqdcP67wYC4pIilUnLCNxCFY9g=; b=Ltm96xnzJqa0MNYlLfgENUC4DmOT6CfL8vl+/wxcpwxon4sJFh+VSOHM5Zj180D/ZY2tVZ HllqCBQie+LUIjVKwqSzGJM35Jczy6/FK4tEudUuzW+qAq4Cu0zVVlIqIcElXWx6Q1uDgR xPU0xQRuONBXlzptDWgwOXQt6kwOHNSSF8ljJGhwbKXtPZ+8mT1nohFNL1z6RJKytwBwo1 ZMPRp/wWmJCH5WlbW/Ve4uut+3T/sVvD3BIGNBqtbeW6cqnTSdQshQc8oXjZO8h44mkJDr zjHi++5IdifZ9Yb2S92RihMWVYPhM42z/5Vjuf036WbdXpC5n2PKm4stVMQyHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701740845; a=rsa-sha256; cv=none; b=PNca+FCiCfE++j3rPzZyLPJS3l5QoyXpH2tmpLeKNhqU92FmcDqE//Pj0r9x42M0HCm85f Ic7sLO/guudXrvZ0nQJh7NLNZq4MC/bEvOXqcn/72dyLn5cGVrtI6/jsxoADb7HzSgZWXj Voje8/4Gry4QkcLWkhaEGzjvCm/AuVYW8MyLbSqpZNrrJnbq3kvYCChN2EErbeL7KsX3SN jY35JHqXa9Hi/R4AdWdFiVTIvih/9YcsVrtNkohHYNHusv8yPdGRYIpA22uTSaUowgiHzg 73DiPMosiMMknD1Un7CBZNN3E8W6HK8tlHmJUm+J4C8yHVS2di65wVTM30at2A== 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 4Skk1T2668zqPt; Tue, 5 Dec 2023 01:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B51lP8t031364; Tue, 5 Dec 2023 01:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B51lPrD031361; Tue, 5 Dec 2023 01:47:25 GMT (envelope-from git) Date: Tue, 5 Dec 2023 01:47:25 GMT Message-Id: <202312050147.3B51lPrD031361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Sobolev Subject: git: 020432848ee5 - stable/14 - vmstat: fix column names broken in c168508655720 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 020432848ee52adf37e5b073b1bdadb84be4dddb Auto-Submitted: auto-generated The branch stable/14 has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=020432848ee52adf37e5b073b1bdadb84be4dddb commit 020432848ee52adf37e5b073b1bdadb84be4dddb Author: Maxim Sobolev AuthorDate: 2023-12-05 01:39:21 +0000 Commit: Maxim Sobolev CommitDate: 2023-12-05 01:46:57 +0000 vmstat: fix column names broken in c168508655720 Loss of the trailing space in the multi-line format string has resulted in column name being emitted as "FAILSLEEP", instead of two columns "FAIL" and "SLEEP". (cherry picked from commit 62d47a4db4579315d7b89002d7de696b44ae1415) --- usr.bin/vmstat/vmstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index a03c28f19d00..fd161a3f93ee 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1488,7 +1488,7 @@ domemstat_zone(void) } } xo_open_container("memory-zone-statistics"); - xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s}" + xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s} " "{T:/%4s} {T:/%4s}\n", "ITEM", "SIZE", "LIMIT", "USED", "FREE", "REQ", "FAIL", "SLEEP", "XDOMAIN"); xo_open_list("zone"); From nobody Tue Dec 5 01:48:38 2023 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 4Skk2t73BSz5368w; Tue, 5 Dec 2023 01: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skk2t6Vz8z3JDj; Tue, 5 Dec 2023 01: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=1701740918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8UOx8taW1PZIxLYeVZRlYbCjDXNrk66kNzh7ZXiQb9o=; b=WWEENVDp6Exgki+vTyDvS8TkCHxR5yBHxuuIGHi7pxRHUjNLc1kO0CdJodiumxPTvGO5ZY hBDhxQ/7RSHK/WTL7YADAG1tTfJV1kk6RTbKwTY9qu6JrsVzI6gxYTW8az9eeCk//EYJXQ hX6wCXYhwt1TuyW0r1sVYKglcpsBKrWNQcg6zbqDRnb6UfP0lMSgResDq8oXdDpbv4agNo ieqwXegBsJuADCC48zqEIjH4JkEBJoWL+baQU2ZjfcGEj7d6EyLCzx4HN7hu2qlR1Bvh/5 YHyZv1MwDlfSdQ4FSZLfFZEvxKskbo7+I5NlQlpEBnxi/OmaYuydxfNblurtRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701740918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8UOx8taW1PZIxLYeVZRlYbCjDXNrk66kNzh7ZXiQb9o=; b=u3AOWuQrVKUi5LKp9m38lfSFkzBdNPpyM4PS8pZ+Gg429tojkjlskucegF3raxHbY5xT6N kX4wcInB5mg9xwkI1Zxei1RDS8I/d8S/xcMQEo16WMmlK+Dz/UIu3pA0nIwY16dsyvY21p HM7KjHypfPtv6HQB9hJ5AxwHjkuyVg8CF1IeB6DIbxYzpMfhXqsx10EXTZK3CCRBcJrx1z 6ZEITdN/mROv6ocsv/17wuzxAiO5gugTX/kBVpCJnHAy1Kmw0Bvsr3gW5FrNq+lShrj0IT Uv1XN/b4EUbS/ojQtzaaOSMtDwJo9hioYjAk+p++wKIY7VoVKUj2HniOEPiNWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701740918; a=rsa-sha256; cv=none; b=b/B4YaT8vMiGIc7Z/YPMW7kSA0K5TWafQPvATz/+rDra+RkqJHzBsVqG2v7a5gqgQUHZPL DkNhaC0oGBLdVbrBywxS1BiBYE/YivfAY8PBXuUp5d3Xi5hF6fbXdtPwdLXqFncrxZr51b Axd5DBEMwxT/Oo+aHL7U7EzOCHuyBIEPSX8gBYrLgKPY/UkJVNDJVG51Afy6KlpsBFEx8O dJm7uMeyidhkfCM1meWvDgKvoOwUgirFs6btStCMllo9MieRlQ3WWD3jAo7O0k4SSiZuNj yJMXJ+zp3WdrWWFn06p+isLGjf+gtpPq6tJ6ggsXc1SFLVFbT/R46Y45ndAjBg== 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 4Skk2t5Yznzqt7; Tue, 5 Dec 2023 01:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B51mc2w031675; Tue, 5 Dec 2023 01:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B51mc6s031672; Tue, 5 Dec 2023 01:48:38 GMT (envelope-from git) Date: Tue, 5 Dec 2023 01:48:38 GMT Message-Id: <202312050148.3B51mc6s031672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Sobolev Subject: git: 4d4b3a342677 - stable/13 - vmstat: fix column names broken in c168508655720 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4d4b3a34267787a03f03125fc01532ff2f8539d1 Auto-Submitted: auto-generated The branch stable/13 has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=4d4b3a34267787a03f03125fc01532ff2f8539d1 commit 4d4b3a34267787a03f03125fc01532ff2f8539d1 Author: Maxim Sobolev AuthorDate: 2023-12-05 01:39:21 +0000 Commit: Maxim Sobolev CommitDate: 2023-12-05 01:48:21 +0000 vmstat: fix column names broken in c168508655720 Loss of the trailing space in the multi-line format string has resulted in column name being emitted as "FAILSLEEP", instead of two columns "FAIL" and "SLEEP". (cherry picked from commit 62d47a4db4579315d7b89002d7de696b44ae1415) --- usr.bin/vmstat/vmstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 50a31dc287f7..bb465eda4966 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1488,7 +1488,7 @@ domemstat_zone(void) } } xo_open_container("memory-zone-statistics"); - xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s}" + xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s} " "{T:/%4s} {T:/%4s}\n", "ITEM", "SIZE", "LIMIT", "USED", "FREE", "REQ", "FAIL", "SLEEP", "XDOMAIN"); xo_open_list("zone"); From nobody Tue Dec 5 16:18:01 2023 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 4Sl5L14jJJz539Zl; Tue, 5 Dec 2023 16:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl5L14CjQz3L7p; Tue, 5 Dec 2023 16:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701793081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J+nAJOaviU8TTRXoiFPhNtEiU8aWdAIJFoohyjVw5Hc=; b=aiZxcecuGKY927byC+2CBu/vtyRzCImtX6Mz46iQy50kvtIvzQm3SLf1hBQsXaOgiaor1/ LmxPUmlsgROlo1qxkcj576mvdfOX8Mzr8aCLwlkDfISxYJ0f/ZxoI/MdYuC4oXwmiyI8Fa jsT52dvtrKeCprGmlBFVUPQtaHHrl95W5BXwpRc8t1IoJQKh9SGPopPnVvqWbCX9h0zQxd 9IMR8atMokeNKGKH0Ddyso/x0Nxd+206yySbgB80iXbYbKffUUQh9YkXNIXhA7s4YdkOpb Ch2V0FaVSon4z9mFdcI1XtxbZVDb40E25OqYWoq3Z1uR+HWOMiI/7Wew7P51iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701793081; a=rsa-sha256; cv=none; b=PTXZYsUVksSJ3ZPcwbRWcVuiMcmpKERX6U/fJ0pWr5uhixjv3eNxKEvJPxC4iGRKxXT/pq h+I+EEpG1AZcL7Fhl/wIKen0P4hYvq8+haT/CmjJSeS5IjJE7OfoppNONbv/PY8GE5zWLr icLNbRbvN444Hc8qnKscwDhsx3N8bx6ct+lYAHnFaHe161JVaWirhiHRcftkwo81eM+iV4 N+Gf8S44AM6C7pwt93mdeZHQyU7LlywIX8chJd9f9TPH/fQcLhHxfrRrfDGdiZFcI/+6Vz OLD6/jnFCZrDSUOXWMkPA4i4cmivBDHuNAckYfwXG1NlQKvyTyi85K09EWxdcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701793081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J+nAJOaviU8TTRXoiFPhNtEiU8aWdAIJFoohyjVw5Hc=; b=KPsVaDHIQGO5P3eTT39dXUD2V8ogQx0kVp4exWJlyjqgajOm24arMSstZCOZ3MGvlYMNHr wATVmJzdOzSIQgU0LkuBiHCeAW9mDrIdKpksvmjHPox47dOhAGFcahe+83wyjwj9Sowwsh ettnHwn2kXCwwLGS/g4yzK09YsccG1C+CZISQTu0nYuP8gDJ2o2SxkDavmq0Z2ZILq9bLi om+4R1PQVuP0hec8baFXgUq6qycirv8/jLaN+uGHJ+pOxlfwrMuNskXmCyD/aMkgtOT65A pdDeVzKKUpo1Th0Jjb7QR3PIxx7zKy9qAB6F+VCbRakp8bYvmGgDeKHuwPU4Ag== 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 4Sl5L13Gzvz1Xv; Tue, 5 Dec 2023 16:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5GI1sT089587; Tue, 5 Dec 2023 16:18:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5GI1aR089584; Tue, 5 Dec 2023 16:18:01 GMT (envelope-from git) Date: Tue, 5 Dec 2023 16:18:01 GMT Message-Id: <202312051618.3B5GI1aR089584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 9b8515f71bd4 - stable/14 - ifconfig: add -D option to print driver name for interface List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9b8515f71bd413520ba7d8e2b92a60deb2c7a528 Auto-Submitted: auto-generated The branch stable/14 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=9b8515f71bd413520ba7d8e2b92a60deb2c7a528 commit 9b8515f71bd413520ba7d8e2b92a60deb2c7a528 Author: Mike Karels AuthorDate: 2023-11-28 19:47:37 +0000 Commit: Mike Karels CommitDate: 2023-12-05 16:17:47 +0000 ifconfig: add -D option to print driver name for interface Add -D option to add the drivername and unit number to ifconfig output for normal display, including -a. Use ifconfig_get_orig_name() from libifconfig to fetch the name. Note that this is the original name for many drivers, but not for some exceptions like epair (which appends 'a' or 'b' to the unit number). epair interface pairs both display as "epair0", etc. Make -v imply -D; might as well be fully verbose. Reviewed by: zlei, kp Differential Revision: https://reviews.freebsd.org/D42721 (cherry picked from commit cd201c090858e5cfae3be005453ec634c1fca36a) --- sbin/ifconfig/ifconfig.8 | 10 ++++++++-- sbin/ifconfig/ifconfig.c | 5 ++++- sbin/ifconfig/ifconfig.h | 1 + sbin/ifconfig/ifconfig_netlink.c | 17 +++++++++++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 3b1774606b21..a538981608cd 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -36,7 +36,7 @@ .Sh SYNOPSIS .Nm .Op Fl j Ar jail -.Op Fl kLmn +.Op Fl DkLmn .Op Fl f Ar type Ns Cm \&: Ns Ar format .Ar interface .Op Cm create @@ -55,7 +55,7 @@ .Nm .Op Fl j Ar jail .Fl a -.Op Fl dkLmuv +.Op Fl dDkLmuv .Op Fl f Ar type Ns Cm \&: Ns Ar format .Op Fl G Ar groupname .Op Fl g Ar groupname @@ -104,6 +104,12 @@ with no additional information. Use of this flag is mutually exclusive with all other flags and commands. .It Fl d Display only the interfaces that are down. +.It Fl D +Include the driver name and unit number of the interface in the output. +This is normally the original name of the interface, +even if it has been renamed; it may differ from the original name +in some cases, such as +.Xr epair 4 . .It Fl f Xo .Ar type Ns Cm \&: Ns Ar format Ns .Op Cm \&, Ns Ar type Ns Cm \&: Ns Ar format Ar ... diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 1a7823fedd67..7a78e9a934f7 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -465,7 +465,7 @@ args_parse(struct ifconfig_args *args, int argc, char *argv[]) int c; /* Parse leading line options */ - strlcpy(options, "G:adf:j:klmnuv", sizeof(options)); + strlcpy(options, "G:adDf:j:klmnuv", sizeof(options)); for (p = opts; p != NULL; p = p->next) strlcat(options, p->opt, sizeof(options)); while ((c = getopt(argc, argv, options)) != -1) { @@ -476,6 +476,9 @@ args_parse(struct ifconfig_args *args, int argc, char *argv[]) case 'd': /* restrict scan to "down" interfaces */ args->downonly = true; break; + case 'D': /* Print driver name */ + args->drivername = true; + break; case 'f': if (optarg == NULL) usage(); diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h index 80e6b9bc2289..0ae317aca409 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -230,6 +230,7 @@ struct ifconfig_args { bool supmedia; /* Supported media */ bool printkeys; /* Print security keys */ bool allfamilies; /* Print all families */ + bool drivername; /* Print driver name */ int verbose; /* verbosity level */ int argc; char **argv; diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c index 7be340e18ab5..bb0d242f21f6 100644 --- a/sbin/ifconfig/ifconfig_netlink.c +++ b/sbin/ifconfig/ifconfig_netlink.c @@ -369,6 +369,7 @@ status_nl(if_ctx *ctx, struct iface *iface) { if_link_t *link = &iface->link; struct ifconfig_args *args = ctx->args; + char *drivername = NULL; printf("%s: ", link->ifla_ifname); @@ -413,6 +414,22 @@ status_nl(if_ctx *ctx, struct iface *iface) args->afp->af_other_status(ctx); print_ifstatus(ctx); + if (args->drivername || args->verbose) { + if (ifconfig_get_orig_name(lifh, link->ifla_ifname, + &drivername) != 0) { + if (ifconfig_err_errtype(lifh) == OTHER) + fprintf(stderr, "get original name: %s\n", + strerror(ifconfig_err_errno(lifh))); + else + fprintf(stderr, + "get original name: error type %d\n", + ifconfig_err_errtype(lifh)); + exit_code = 1; + } + if (drivername != NULL) + printf("\tdrivername: %s\n", drivername); + free(drivername); + } if (args->verbose > 0) sfp_status(ctx); } From nobody Tue Dec 5 18:22:03 2023 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 4Sl8573RM4z53HqN; Tue, 5 Dec 2023 18:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8572wlHz3XT4; Tue, 5 Dec 2023 18:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ebgot7seZQKahHfOGha6AIcc8304Da2PKgbWJ+dhCPo=; b=VorqWLXFG8H3esC7FVcA9vHUPwzfn9D4vTyGxdsPiyIBKJnqBG3jK5Az+k1n1C8BE+Z8n9 38f7WaNBdXfSHpH7yHfLS5LVljmZYROqAUmI3QglwA/UGQ485mxcTBtlbc95raaTfceEUX XmXvGpkxDcLPyPfhvljU7zduz62BtvBBloa/GOaGQI+qu3JoWe5gZUfDI0jmP51YoT97vD g9penrp0Q/vAZkh77IDIF902jUNqyy+VfzUIi0mocYpOHMaNr+A5TgvMtWjNzYUgWLCHHa kb/wJXOPJYZTzD9v14/5Y9TmjLe3BgKxl4v4wtSNU8GDuNMgVv76xLvg1Fd9ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800523; a=rsa-sha256; cv=none; b=EwzKjRJzeil7Eu+HvZn7YGAagChEnR66e/7oXbpMMgdTKojha63LKum7IZWxnJMovxWPdd O7RQPB/fj4ccJvJjXRtyPV6hHBIfN9jwq2XabbMMKlcfzA9JedY6/5KbMz9oGapS4dWlwY FUtLpMpUFYqaV2i+7nh2ZOlt81OpCjMDdBIM2+bdqMXjKOnuWwLhSo4kH1RqjQr6nRFbAW CEVJvLVh/j7jVI3FmIb6CnZWDLtCxpT0NEsjKPPdP2Cj0TjU+gsoiLcbStrRJb69NREXeU wAsDYg3F1T6nVCTCiCP3/9LYAqPoERPG80XxlpST7FZDIzTSRgaib+SmNGFF6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ebgot7seZQKahHfOGha6AIcc8304Da2PKgbWJ+dhCPo=; b=KNrpwX/eBOE7b8yoXYxptrFOuJeowTf39EKm8kZZs9T7w8eBSslCzVxOdzGsXtraAVmfQN D7T1sMuGC6ILZIu3QKRVy7EbfXc+T5+qm3cZfUsnhzqixlu+KTkM6wGLtk5hjnuAXsfpLd AzKAmrMt69VMrMFtbWTltjCPGfWjYe75N7w9ZNfNZ7niejp9EWCpPsHcAgKnIZheC6+S+o sf9uyhGpUsrUF+sSWzrf1VO91iFtg3DhwQEMrl3MayFCggLHxeTWwzkmyU//1dFsLYBY42 ZCXderm56a485EwdMzqeYZQkWCvYVXDhIKVA2dPmA22iZpnewdkRDyX9Q9wu+Q== 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 4Sl85720nWz5Y7; Tue, 5 Dec 2023 18:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IM3al003803; Tue, 5 Dec 2023 18:22:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IM32m003800; Tue, 5 Dec 2023 18:22:03 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:22:03 GMT Message-Id: <202312051822.3B5IM32m003800@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: 6d94fc2b0db9 - releng/13.2 - compiler-rt: avoid segfaults when re-exec'ing with ASLR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 6d94fc2b0db9c2f0b0d5b116513d745122bc37c4 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6d94fc2b0db9c2f0b0d5b116513d745122bc37c4 commit 6d94fc2b0db9c2f0b0d5b116513d745122bc37c4 Author: Dimitry Andric AuthorDate: 2023-11-22 18:23:06 +0000 Commit: Ed Maste CommitDate: 2023-12-05 18:20:00 +0000 compiler-rt: avoid segfaults when re-exec'ing with ASLR The ReExec() function that re-executes the binary after turning off ASLR should not call elf_aux_info(3) and realpath(3), since these will also be intercepted. Instead, loop directly over the elf aux info vector to find the executable path, and avoid calling realpath(3) since it is actually unwanted for this use case. Fixes: 930a7c2ac67e, 96fe7c8ab0f6 (cherry picked from commit 4c9a0adad18263ec8725d9bfc5f560c6ad1da8bd) (cherry picked from commit 7c25a53a2cb975e516cfea78898bfb850db88524) Note: This is a partial cherry-pick, as only the ReExec change from the original applies to FreeBSD 13.2. Security: EN-23:15.sanitizer Approved by: so --- .../lib/sanitizer_common/sanitizer_linux_libcdep.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp index 15a6a4998bd0..6e2c51ea3e8d 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp @@ -55,6 +55,7 @@ // that, it was never implemented. So just define it to zero. #undef MAP_NORESERVE #define MAP_NORESERVE 0 +extern const Elf_Auxinfo *__elf_aux_vector; #endif #if SANITIZER_NETBSD @@ -905,11 +906,11 @@ void ReExec() { const char *pathname = "/proc/self/exe"; #if SANITIZER_FREEBSD - char exe_path[PATH_MAX]; - if (elf_aux_info(AT_EXECPATH, exe_path, sizeof(exe_path)) == 0) { - char link_path[PATH_MAX]; - if (realpath(exe_path, link_path)) - pathname = link_path; + for (const auto *aux = __elf_aux_vector; aux->a_type != AT_NULL; aux++) { + if (aux->a_type == AT_EXECPATH) { + pathname = static_cast(aux->a_un.a_ptr); + break; + } } #elif SANITIZER_NETBSD static const int name[] = { From nobody Tue Dec 5 18:24:18 2023 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 4Sl87k5VcBz53JLJ; Tue, 5 Dec 2023 18:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl87k37Bnz3Xrf; Tue, 5 Dec 2023 18:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2uqwMxJASVX9Sv2h9B6tWiC60sYT/UEWD17jO0EB/C0=; b=VzZ3H7jg3hmry0C7m+KWxSzZsUKTanEmUd7vUlRnFBxngVExKz7KSFlkWsWiGTBbMpj9yx ZKMMQzdGLR/FUFstJ3bJxtqjynYPGnQIadPotbtV3MAQYLY+V2FpzqlL0Yj7gzIQuDiSgu w4nkJwNtIPtgtPtY6GN6RGUHnFHNcX/oq0qdrnDW3B0mvndhFCHyqU615okDWXk7hq70L9 IaUqErSltOsooeyGKoV1Sp0dzBLPM+ypqrr2/UfirfC7TUBAuvKpCp29/kc1idXUQHfUl8 llzWOxTOdPmefGqNkL3HsptAlkdwQVB2zXIPT5ysmmItj1KbtBulBiwCIcllhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800658; a=rsa-sha256; cv=none; b=ukwmJMzKXGjJKEmqidTgiDZLDWXfVUzZlyJHrMS8JG33MkqSyDi6ugQxE35h1txouC1znb 2VBJ5SY5vQNycMtIgPJUIwLBzabGNZkvXTGd/hzfW7ifJBLXQikelezxURwham0x2sZprl AZ0Px3hgt2ehNlVh7G10gIeH1JbpjVXpBS1CN41XJHqzvmSYFH8uKIREkfrOwavdrpy752 kUkTMC8xnwVb3Pcrj8yQc8drBHKv5f2EtSIma+PuVgU9+VFBEm1R69282qm9cD4/ifvfU/ 4SB0bPJKio8DoICS8xZg4L29hajoirsMZ6ObWZY3Touu5mVxmVFCV5DlYpnnSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2uqwMxJASVX9Sv2h9B6tWiC60sYT/UEWD17jO0EB/C0=; b=naMWb69UZmpL0o1m5T9c5cGvIRtd9tfaUw/joCeIVoc/9h161I4YxHmF8qFyJPDpMLPTY0 3l+Z1eXPBVU0SRVZ2cHvYdpaZBSb8i5Os6qyRma6YWPgPG19JUlxk7ZD2S5wGI7Z0gjM1z aLIe737yI3tdaVeaPOWLs2+NcPPkLU2R5VmGJanPRLa8juQH551NDQ/4vFbTcXtYurz0CT FiyUd7eDIImis8uFirSWJkrCQeA3dQ0Br5MvqVp87wbOCo8j2EwZzdCrpfdf3aicOTza2x A2YwLOiUiCEM5P00nOWWyEdQ/X3OqNWuszK7qbxDT4Y2Iy4wUHVPuXpOZLdG5g== 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 4Sl87k2B7Mz5WF; Tue, 5 Dec 2023 18:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IOIr0008270; Tue, 5 Dec 2023 18:24:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IOIpJ008267; Tue, 5 Dec 2023 18:24:18 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:24:18 GMT Message-Id: <202312051824.3B5IOIpJ008267@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: 6284d5f76d6b - main - pf: remove incorrect fragmentation check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6284d5f76d6bd2d97fe287c5adabf59c79688eda Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6284d5f76d6bd2d97fe287c5adabf59c79688eda commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:19:20 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 84bd75276af7..e19370cc7333 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5367,8 +5367,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:26:11 2023 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 4Sl89w2LjLz53JJr; Tue, 5 Dec 2023 18:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl89w1Vx4z3YQ6; Tue, 5 Dec 2023 18:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0AYsK3r47Dylsqe6Yx4pXJfhnXrIPoHC4kdbEvebKzY=; b=yV+P0KBrHTxs2hQJauG7dd5iDCeFU4ce8iBpey+DN08+S3rJph8d5PQTHp4K0loXlo1VfB symbw0Ko/18S2PeQyeWSu6PozbU6rg/dK1iBuZRPWBuG5fO37zWPLvPJ+rruGva5eNdyco 8zCNvE5PojddCT77Qh2jdWtSuxf2VGzjvz+UA4dqtUoKIfOoHzqjwVWdjl8ZX0HXKZ77qi 58mcmRTKbHCQsEK/GiQ78xxjXexiOGpVLJxuKSNpEnM2KRvbJLuvl0PlmAodOXhEwrsZRj iThkml/qsa04yrg1wxhIXSNn7hPlLPlKmI3nqpyS6rGcidjSC6gR1xlhDHfIFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800772; a=rsa-sha256; cv=none; b=prmTfY4cC2frkBbxgglU6XWLe+4EbFgasCM6TLR4r+aaJWwKreDyI3ErMc0hOkON190UVZ Kn/BwzGoXoy1WmZzRtDM4rs55b3T6ZPGhJJtIP4ptTW+qPLUTriDP/7GR4y/fJlOUTniNe X6cxT1vq8SOR4RNKsvzHhuSodisnpM9o+0l358Dh681tK39AsrG0xSFkUjJazjzSD26VzR hlwgNbRJDVIHWPkniatNGwtKLo95lN+TvSiMVUUrDJBfrGuBIKvwsCOxhQ3Dstl1yn8FxU CjDgcX7u8UOrugNY3YE31nrr2ZCn/6Mibtcsj439qe0q0m70YhHb9Iw/5RVaGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0AYsK3r47Dylsqe6Yx4pXJfhnXrIPoHC4kdbEvebKzY=; b=WQGY0Sn+fJyjoTNbof29ncL0l4Z9HHCIFLezhpksxFUZgt+RTiVrNn3nAsoBSJcC85UYr5 jhkfHUxSVwyhHqojMnwwKMG+5bP/UIAj9o6ltBZcZ8iqBuyDVao3kRwUZLllxD9LnrBpdj pOw48vP23Yaz+DKBwQSdbs0GTJinmuJz2cvZbUs1imTfaZ93wJWAB+9lbKMe1Hc6jLIULZ 5umUP3DFhgO3qNhDMcNObt7CLK/iptcfttxhs5k7RONCznAXgIFCD/FMrXYuwoGlwxr7/E NRaOCIPO2/NFFxg8FxjSaxz+8a/DVxsRm2WPxc4Cjx5jy1NIPmj5nOTN9Jj+uA== 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 4Sl89w0Zltz59t; Tue, 5 Dec 2023 18:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IQBQb008671; Tue, 5 Dec 2023 18:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IQBin008668; Tue, 5 Dec 2023 18:26:11 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:26:11 GMT Message-Id: <202312051826.3B5IQBin008668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a47a44c0d69c - stable/14 - pf: remove incorrect fragmentation check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: a47a44c0d69ce82f302b02da940538a99b47037f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a47a44c0d69ce82f302b02da940538a99b47037f commit a47a44c0d69ce82f302b02da940538a99b47037f Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:24:35 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 84bd75276af7..e19370cc7333 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5367,8 +5367,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:27:10 2023 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 4Sl8C30kVcz53JV9; Tue, 5 Dec 2023 18:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8C30DpPz3YRk; Tue, 5 Dec 2023 18:27:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ptipanaAwOrC0RySEtGyiK9hhh4eRuOATM+i37tmYhU=; b=u5RhPDByMjzj4LhLkY98UfwYhkJs6tviff04VOK19ZInaUhXBFTUSMz46xezkGzZHc8lPX d1OuJu8tUctjUAiu5SQQt4dMwl/EFfPBrqKCic1nieIAmU3F8s2PmhJfo4m1SvFHRhvxAX IZKGTEVm3TGatTjWqVVQphsfh2mka8+NI9LYn5lsFzzBOtBs/CMxoDuauckev+BovEE7ch Jpjy08v4pEWzLuUqzu9XJsyyAoe1bNBhkMqznpp8hCCh7JN1lOXZZeJ5qQVnTLCqSZ3Kma 7C0Va2U+3yoyI6Fxf7QxyMUUaP07qoz3niPEYNO8RhqIhxnbzBHqD1J6bv8+LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800831; a=rsa-sha256; cv=none; b=FH/xeLYcNB8ePHxaDkYNwSbmnxJZM4gC8p8vjhYXZ4f0NkkYTteRYjcmzRC8eBlE5woWBF 2H8UC68DMH+hQlCrFACj/DmucF4rx6ttz9DGSi06g9V0ddvmCw4gyGKOQurfHe8pbKvd2+ 6FhdDuRKcWhX9oFrHRaCOo1qkaSyNM4PDrznQYl6XvFYR0NgO+GOO0PThaD3GdpuPGwfYs YSYer2i8NWZW/WVthGZ6H2D7R2SyN8HPj9RSlg2I9RLhrhxf6mjTYMVgEo54TMyh9fi7/5 Lfwt7l0qAXWi5wPYU9wBZ7AegGnAkLSHUkevzyf6rUUaFnOdKiDBMVSk51Gt/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ptipanaAwOrC0RySEtGyiK9hhh4eRuOATM+i37tmYhU=; b=vGXaGQFECNALwFEE99tWwhlzOueVC+dk5uEGtPId9wFwO7Hn10Jq6sPzW6sK4Dz/jt/z0f wXBqgAqZ2zaX/tqhW0HFk4uxNsFXW0dubmBHpzJ1SYeDHkpUiZBk7TO0vjkm9GAx623rdq DeJj+DdPWzlqD8WbPW4gCzM3v1KIbUgw4M/DiU+/mcHDSXrzlVqKNmzvhd7pYXYTMHWSnk ZVv8JXKR2PSGBM0ELVOyibJdsTWMwz2zrrjX5x7U/5i+4OmGdhfJBNRT5w5TsZb805AuTu vpQOs/v9w0vAGPPtFv4xtVpBxQNgxyFFkRU1gUOR4JQrj7P1jL0f6N7OSxY+cg== 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 4Sl8C26NSNz5R1; Tue, 5 Dec 2023 18:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRAun008924; Tue, 5 Dec 2023 18:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRArV008921; Tue, 5 Dec 2023 18:27:10 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:10 GMT Message-Id: <202312051827.3B5IRArV008921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ee1d1e38fae6 - stable/13 - pf: remove incorrect fragmentation check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: ee1d1e38fae65d045b113a7053651bbd7b780e1d Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ee1d1e38fae65d045b113a7053651bbd7b780e1d commit ee1d1e38fae65d045b113a7053651bbd7b780e1d Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:25:22 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index c09f80d2f82b..e03fcbbe37a9 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4780,8 +4780,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:27:31 2023 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 4Sl8CS0dqfz53J4g; Tue, 5 Dec 2023 18:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CS073zz3Yvh; Tue, 5 Dec 2023 18:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IqIq1SDqK58FTcBGdtiMaq8pipmUvrSLiHQfU7XPYfA=; b=cnpbtyzDeD53KzfVC4vZbzDienzCvuQc3xxnMbB3JtPEtxsoElq7kmnU9lYrsDN9Uxxzd+ 9lk9/xFh8fdV7SBXY8oHUQGtYu20zo9THz0QS6dO2bVfPdlKjQIzv4xzE482k1v9g9YQoj Hg3LkxB+0qflc9CKcMi4CidYts5/B4zr/jP7/ZeUS49qYNjKhCDaEbyIbZTkU+NDCMkrNh Hqx6sA08MHov5mC68YLO9wc8igatAH/aUVl22Tx64YJHQU0ySLpQQf4+VpqkJG3+rnvxQ7 aSOeFwJF5LHWihyzXnIdEM4bbEDXr6f9gmjX4hvkpDCGLORPlbacOScxvHkrGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800852; a=rsa-sha256; cv=none; b=YtbpDmHxvcNNTcvwkQQ1nCoECSY2xwsUpmwFY9k9A2u+rKEtKjJAPUFIHDaBzI4SjLNsBW lRVrmZKQQ6CyYsk3zwB/FYvR7wOid5+OnfzkXhXhFnVMleHzJ7GvPmZErtvCjeuFi83ygv 2vwpkTOBSYnp44ILc7dn1NHA3HKPf7ldVySzGp9OWRYRnIX2HIe3dHO5pmX1Rv0ev90VoG 3Mz0JguZtg0qTf1fM3988tlVrqGPDPzNGtaiDaZzci5N/9+D/NK96kLfwNayt+wwexk9fF c0FmKZyh0EKd9XnIrshmO5PK2oWTZ4tfsV0vC9PAa+xQARFeUCnOJQcPFzxk7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IqIq1SDqK58FTcBGdtiMaq8pipmUvrSLiHQfU7XPYfA=; b=nI7gEMeffwRx40PJLi2wDqBYaBy9UZYL9klNwMnpiyqSpkhA9F6h7QLwDKYZDiBMaXElw6 7723S2BA/41kz77FRBA696ZymMBK88SOkrpFLyXf/WCRjwbLxdqYaZ8hIH0BF+xaDlKWb7 I2ivf6N6QM0zPkPg7Dz6T5fzzdem1+MoDmmY4p7VqCtwEQCHUT3fwotU5OFB4DD6NAti79 kxfi+Z+5uKVaASPxYiKlbZWY2lifS3eHPsqgjQZDWbWzoLbUUuKdOgx5TDbUd1dnAui/Gw bmrFyJNAdARjBGoK4fdXogm+sMBdv8KWW8ozHnPV2Advdlf/H1W/ZKuQn5jkaw== 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 4Sl8CR6LKzz59v; Tue, 5 Dec 2023 18:27:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRVSX009140; Tue, 5 Dec 2023 18:27:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRVOf009137; Tue, 5 Dec 2023 18:27:31 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:31 GMT Message-Id: <202312051827.3B5IRVOf009137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7e9e6d5d491c - releng/14.0 - ossl: Fix handling of separate AAD buffers in ossl_aes_gcm() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 7e9e6d5d491cd844677331980cc2ea92b9130ed1 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7e9e6d5d491cd844677331980cc2ea92b9130ed1 commit 7e9e6d5d491cd844677331980cc2ea92b9130ed1 Author: Mark Johnston AuthorDate: 2023-11-28 19:35:49 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:01:24 +0000 ossl: Fix handling of separate AAD buffers in ossl_aes_gcm() Consumers may optionally provide a reference to a separate buffer containing AAD, but ossl_aes_gcm() didn't handle this and would thus compute an incorrect digest. Fixes: 9a3444d91c70 ("ossl: Add a VAES-based AES-GCM implementation for amd64") Reviewed by: jhb MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D42736 Approved by: so Security: FreeBSD-EN-23:17.ossl (cherry picked from commit 87826c87c63b2995cb69e9c1a624c7e20dd70fcd) (cherry picked from commit 24cd42aeb6232b4678f45dc6d242e8982dbea8e6) --- sys/crypto/openssl/ossl_aes.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/crypto/openssl/ossl_aes.c b/sys/crypto/openssl/ossl_aes.c index 84d694a7199f..40162b6943df 100644 --- a/sys/crypto/openssl/ossl_aes.c +++ b/sys/crypto/openssl/ossl_aes.c @@ -199,14 +199,20 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, crypto_read_iv(crp, iv); ctx->ops->setiv(ctx, iv, csp->csp_ivlen); - crypto_cursor_init(&cc_in, &crp->crp_buf); - crypto_cursor_advance(&cc_in, crp->crp_aad_start); - for (size_t alen = crp->crp_aad_length; alen > 0; alen -= seglen) { - inseg = crypto_cursor_segment(&cc_in, &inlen); - seglen = MIN(alen, inlen); - if (ctx->ops->aad(ctx, inseg, seglen) != 0) + if (crp->crp_aad != NULL) { + if (ctx->ops->aad(ctx, crp->crp_aad, crp->crp_aad_length) != 0) return (EINVAL); - crypto_cursor_advance(&cc_in, seglen); + } else { + crypto_cursor_init(&cc_in, &crp->crp_buf); + crypto_cursor_advance(&cc_in, crp->crp_aad_start); + for (size_t alen = crp->crp_aad_length; alen > 0; + alen -= seglen) { + inseg = crypto_cursor_segment(&cc_in, &inlen); + seglen = MIN(alen, inlen); + if (ctx->ops->aad(ctx, inseg, seglen) != 0) + return (EINVAL); + crypto_cursor_advance(&cc_in, seglen); + } } crypto_cursor_init(&cc_in, &crp->crp_buf); From nobody Tue Dec 5 18:27:32 2023 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 4Sl8CT1XQcz53JPR; Tue, 5 Dec 2023 18:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CT0pG1z3Ysx; Tue, 5 Dec 2023 18:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GlOdJTsAg0ZIS8hhjNpGZ5iJCtigRia3LhBpGxue9ag=; b=rllcIFYvZ7pBrL5tCGyN6YQDY2xet1EBYqNuQxRtHl6Gu98SQ6oOPZp5wEuNxy7NLkbRxU UcEuHwULnXAuwolwTNkSYPGgnbHBUnAUdOFAzB+TbxWWqzqFaYanfbq4hBAOcjb+w2bAc8 Ui0hAnWuxkyqAgLJKF5oYG01ydrXZztXiJfhgiUbJFcw3pN1zRDe4jwFf7ocAZL6ssD7iP KP59ttz4ii91lxemSp0/jjrKoHYO72vxcW16Ey4xQVR42CIML7+hYdpuBR0ckpjo/E6wno Bgh/UN3QgAWl0MsbPNDcryF8XTT8YXUzCU/2Dg+vFoyReuc1K8ZUx/OKaAy60g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800853; a=rsa-sha256; cv=none; b=ZnJJvGhmDrgsZwLqnPJwsELWi8j+4TnBPtaXnfBkCfeeJXsyVT1Tp6wcmq6lMKcLR7CQvf uVrZfbjSDOJ8ibDHu+utmOzcbLL59DzJzLjX2cMAKPBXa/wMPllqQ3iqYF40hxKDDtkp+T v0HWUZn1b696uAWBV8qKdmV3NeMdkMrk4Cr2jTDmP2wqdyBnilpjec6Qr77y30tGDJCRmJ NA8rlOZl0Nwto28PFMqsR4HlLQEJks7u/vG/aRKOj/gPJtJyWRQCEs1A1AAaKn5MvM6vlU C2+fmJBksYx+4Wkmi2cEKBFFRWR3uHne6IoqwK1JxmciJ5IiF+Et0lSvV4MKLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GlOdJTsAg0ZIS8hhjNpGZ5iJCtigRia3LhBpGxue9ag=; b=wlRMuC9kq/axHxmXDHm+X4cm7OE5fwIKECcM5neKFXF6yVybMRtk7Dku56ufSmPh3k7pqH Wx5Y0ooRtiIze8hYY6HOt1Ht05soXyMqvKfNtjoM9VYX8ItyOV+z2Sw04c4MUR54jQnTsy Tn6HlLhFloG3z8GB4PRpVyE3YgM9qY6rrYTOaY1PyL9HkM4Q6NOSHOwmAYKy37DvW9SdTN ZNiC8FGvUYWUcE8zyUB9kelRFNhvMuuuo0e49WlHN1M5aBaYlf91e9YGe5OeK3aBIFIVH3 lsugqZzPY4ROzNX5/cGW1wWSBmJ9CuNkTlqHt9hsXgCLxHXyZdQwcTUR1aoa/Q== 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 4Sl8CS70CWz5St; Tue, 5 Dec 2023 18:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRWHm009195; Tue, 5 Dec 2023 18:27:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRWpL009192; Tue, 5 Dec 2023 18:27:32 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:32 GMT Message-Id: <202312051827.3B5IRWpL009192@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9fd62386ad6e - releng/14.0 - ossl: Keep mutable AES-GCM state on the stack List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 9fd62386ad6e6f5c5298cda66c5c1894373e4379 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9fd62386ad6e6f5c5298cda66c5c1894373e4379 commit 9fd62386ad6e6f5c5298cda66c5c1894373e4379 Author: Mark Johnston AuthorDate: 2023-11-29 17:51:55 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:02:05 +0000 ossl: Keep mutable AES-GCM state on the stack ossl(4)'s AES-GCM implementation keeps mutable state in the session structure, together with the key schedule. This was done for convenience, as both are initialized together. However, some OCF consumers, particularly ZFS, assume that requests may be dispatched to the same session in parallel. Without serialization, this results in incorrect output. Fix the problem by explicitly copying per-session state onto the stack at the beginning of each operation. PR: 275306 Reviewed by: jhb Fixes: 9a3444d91c70 ("ossl: Add a VAES-based AES-GCM implementation for amd64") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42783 Approved by: so Security: FreeBSD-EN-23:17.ossl (cherry picked from commit 5c0dac0b7a012f326edab06ad85aee5ad68ff120) (cherry picked from commit 84ef0a84ecaa4f5d9bcfed3ce10c288953491e7e) --- sys/crypto/openssl/ossl_aes.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sys/crypto/openssl/ossl_aes.c b/sys/crypto/openssl/ossl_aes.c index 40162b6943df..800518e51205 100644 --- a/sys/crypto/openssl/ossl_aes.c +++ b/sys/crypto/openssl/ossl_aes.c @@ -168,10 +168,9 @@ static int ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, const struct crypto_session_params *csp) { - struct ossl_cipher_context key; + struct ossl_gcm_context ctx; struct crypto_buffer_cursor cc_in, cc_out; unsigned char iv[AES_BLOCK_LEN], tag[AES_BLOCK_LEN]; - struct ossl_gcm_context *ctx; const unsigned char *inseg; unsigned char *outseg; size_t inlen, outlen, seglen; @@ -183,24 +182,25 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, if (crp->crp_cipher_key != NULL) { if (encrypt) error = s->cipher->set_encrypt_key(crp->crp_cipher_key, - 8 * csp->csp_cipher_klen, &key); + 8 * csp->csp_cipher_klen, + (struct ossl_cipher_context *)&ctx); else error = s->cipher->set_decrypt_key(crp->crp_cipher_key, - 8 * csp->csp_cipher_klen, &key); + 8 * csp->csp_cipher_klen, + (struct ossl_cipher_context *)&ctx); if (error) return (error); - ctx = (struct ossl_gcm_context *)&key; } else if (encrypt) { - ctx = (struct ossl_gcm_context *)&s->enc_ctx; + memcpy(&ctx, &s->enc_ctx, sizeof(struct ossl_gcm_context)); } else { - ctx = (struct ossl_gcm_context *)&s->dec_ctx; + memcpy(&ctx, &s->dec_ctx, sizeof(struct ossl_gcm_context)); } crypto_read_iv(crp, iv); - ctx->ops->setiv(ctx, iv, csp->csp_ivlen); + ctx.ops->setiv(&ctx, iv, csp->csp_ivlen); if (crp->crp_aad != NULL) { - if (ctx->ops->aad(ctx, crp->crp_aad, crp->crp_aad_length) != 0) + if (ctx.ops->aad(&ctx, crp->crp_aad, crp->crp_aad_length) != 0) return (EINVAL); } else { crypto_cursor_init(&cc_in, &crp->crp_buf); @@ -209,7 +209,7 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, alen -= seglen) { inseg = crypto_cursor_segment(&cc_in, &inlen); seglen = MIN(alen, inlen); - if (ctx->ops->aad(ctx, inseg, seglen) != 0) + if (ctx.ops->aad(&ctx, inseg, seglen) != 0) return (EINVAL); crypto_cursor_advance(&cc_in, seglen); } @@ -230,10 +230,10 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, seglen = MIN(plen, MIN(inlen, outlen)); if (encrypt) { - if (ctx->ops->encrypt(ctx, inseg, outseg, seglen) != 0) + if (ctx.ops->encrypt(&ctx, inseg, outseg, seglen) != 0) return (EINVAL); } else { - if (ctx->ops->decrypt(ctx, inseg, outseg, seglen) != 0) + if (ctx.ops->decrypt(&ctx, inseg, outseg, seglen) != 0) return (EINVAL); } @@ -243,18 +243,19 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, error = 0; if (encrypt) { - ctx->ops->tag(ctx, tag, GMAC_DIGEST_LEN); + ctx.ops->tag(&ctx, tag, GMAC_DIGEST_LEN); crypto_copyback(crp, crp->crp_digest_start, GMAC_DIGEST_LEN, tag); } else { crypto_copydata(crp, crp->crp_digest_start, GMAC_DIGEST_LEN, tag); - if (ctx->ops->finish(ctx, tag, GMAC_DIGEST_LEN) != 0) + if (ctx.ops->finish(&ctx, tag, GMAC_DIGEST_LEN) != 0) error = EBADMSG; } explicit_bzero(iv, sizeof(iv)); explicit_bzero(tag, sizeof(tag)); + explicit_bzero(&ctx, sizeof(ctx)); return (error); } From nobody Tue Dec 5 18:27:34 2023 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 4Sl8CV4z9Dz53JML; Tue, 5 Dec 2023 18:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CV1fwyz3Ywl; Tue, 5 Dec 2023 18:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wKPKruljpt9WBpEtB4V8Db9TwVNv7ekdRdPJUX1zDg8=; b=TiTIuHGUTPcCXmf1O8XVqlYF+JuX674IDaNnbo+XkLNAKZuBPu6UnVrKY+8qMLe7/oC1iP uvhNmTejPZcvT0a9OZmC93zehHRI1+R4q6YS5guutrm0sc/hLUb2n4BNoB2R3aHC0Dp0C7 FI+P4ISBqeLzSfytDxqQR2V8Kt4ZkM7OGHfSJb/EINYGBI+VaNP3OYIy4jmlmSbjkBIC4O 1jnTPP+5e2f+AVXhLSqKr06UpscxhraQFnZLx4DuL33vqRlKXlivPGs/0B+YEG3mwXATdl OCu3R6RD5rQ+sAwWX+0fFOB8+K/fAgmfSYIBCVmw9aaYKxZ6J2cPLQJyhXPe0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800854; a=rsa-sha256; cv=none; b=eVW+h4i4V2qfSKIfHk7dwgYBSqHvf9Cs2ZCiYWhyI/CoGSZf17r8Aury0OZjp59w7uN6QD VA5YboLw22cNoFkMFBb5odpDnSmwyvsMamTOJDdtl14Oi6/gvMzQelLvOUdLUDai4whzk8 CE53jd3SrdM1mUg0HsnYw63uVGr3477JT1We68PjDhJdlKMqXujmSoNaUei4HRRIXHAjg6 gcw7CkJaQHd/vRdf7550ajlk3mOAm5Y9cLvPoFCTaKIRcFZa6ETlXRALazh9dUuQzMTDa3 ZiNA/ug2Ujp/PAI4OaCkKLDw/rDcIa9ha2xPUciWstIu1c8BnSw1KA0/7J45uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wKPKruljpt9WBpEtB4V8Db9TwVNv7ekdRdPJUX1zDg8=; b=JBA+hrHkakiKm+qIaYG5IA5mHXe5djIOQ9BYQs2HIGGK5j5tuh9rgYsxj1D7zxcL8MyG7H cJQC1xVAXBE1pwdOh6vDKIUPElLfKBxbyzMES1UicBcKyk4JI7Gs08VgLjSFVKwA43UMho h8IW864eEbSkQhGY2JfaDOyzDOr8Sp7ugA0HEH9D4L+gDv3IahsOnaV+Ul6CDzJu69pKh/ x7HeVWCQhY1mXSpK88mZG6L7WaC+5PZcpZxZbhGEguKPlNU8HMH6zCx3NPnd1tbmjkkjUA IgCU/PJt076e6cQNlxIHnBeq0aopSxdhna0rjAiBmZ9DVklDL9QF+6yFTsf14A== 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 4Sl8CV0ftxz59w; Tue, 5 Dec 2023 18:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRY5M009249; Tue, 5 Dec 2023 18:27:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRYfn009246; Tue, 5 Dec 2023 18:27:34 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:34 GMT Message-Id: <202312051827.3B5IRYfn009246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 433fe061fc59 - releng/14.0 - ossl: Fix some bugs in the fallback AES-GCM implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 433fe061fc5954fe00b33ed9d850a655920f0a2d Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=433fe061fc5954fe00b33ed9d850a655920f0a2d commit 433fe061fc5954fe00b33ed9d850a655920f0a2d Author: Mark Johnston AuthorDate: 2023-11-29 20:08:12 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:02:28 +0000 ossl: Fix some bugs in the fallback AES-GCM implementation gcm_*_aesni() are used when the AVX512 implementation is not available. Fix two bugs which manifest when handling operations spanning multiple segments: - Avoid underflow when the length of the input is smaller than the residual. - In gcm_decrypt_aesni(), ensure that we begin the operation at the right offset into the input and output buffers. Reviewed by: jhb Fixes: 9b1d87286c78 ("ossl: Add a fallback AES-GCM implementation using AES-NI") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42838 Approved by: so Security: FreeBSD-EN-23:17.ossl (cherry picked from commit 47d767dab54895f3ba8abac6ab2295797394659e) (cherry picked from commit 118b866d9c39da1f5a17680e2034b3eff7337988) --- sys/crypto/openssl/amd64/ossl_aes_gcm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/crypto/openssl/amd64/ossl_aes_gcm.c b/sys/crypto/openssl/amd64/ossl_aes_gcm.c index 0d205ec3ff90..d08b2ac8a759 100644 --- a/sys/crypto/openssl/amd64/ossl_aes_gcm.c +++ b/sys/crypto/openssl/amd64/ossl_aes_gcm.c @@ -459,7 +459,7 @@ gcm_encrypt_aesni(struct ossl_gcm_context *ctx, const unsigned char *in, size_t bulk = 0, res; int error; - res = (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN; + res = MIN(len, (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN); if ((error = gcm_encrypt(ctx, in, out, res)) != 0) return error; @@ -621,12 +621,12 @@ gcm_decrypt_aesni(struct ossl_gcm_context *ctx, const unsigned char *in, size_t bulk = 0, res; int error; - res = (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN; + res = MIN(len, (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN); if ((error = gcm_decrypt(ctx, in, out, res)) != 0) return error; - bulk = aesni_gcm_decrypt(in, out, len, &ctx->aes_ks, ctx->gcm.Yi.c, - ctx->gcm.Xi.u); + bulk = aesni_gcm_decrypt(in + res, out + res, len - res, &ctx->aes_ks, + ctx->gcm.Yi.c, ctx->gcm.Xi.u); ctx->gcm.len.u[1] += bulk; bulk += res; From nobody Tue Dec 5 18:27:35 2023 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 4Sl8CW5RvBz53JJy; Tue, 5 Dec 2023 18:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CW3gxXz3Yx0; Tue, 5 Dec 2023 18:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YPbHI8056nllrlOZNi6HsDXMIg1SRfBeHO2CRb08Ko0=; b=wMaOu3rBQat/Ov0AuX4IHIzT91K9qXwGhDt//ygv6DJVJQKa9U1QkrxSdueVb02CyGL0PR t/fXZ1+w7pHg0KGB2VhOHNJOBh65Bwsiwwvkdx+0bZ1mw3Koi3Rxb+LejrKe1yp//NxpDc XYNDFU2r9VZR2BrqJAYNQfWSUOGohebRDrByDBA2vc7tTLBlLu1uCJYIbpA9QxXm3IXbd6 HnzUs49BO90/54L/S12z43B1SsgP/eKLfdBdYvJlEMQQ12zvlpf9luimfdVziuNlLWyLWn HFZQgIt3fXOVWQ1v/pYV7VPhJcqRlL7pSAyXQv/CHlrrMPnrPkzOAMBsmCXcpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800855; a=rsa-sha256; cv=none; b=R51y6YexhhJGOLJlSJsemXAX418Hv+178C/jZ55NA7OSh4+gMnXO5QQPvG2cTz/z4daTnu qjW77kpIbPnzuHVxPeb3Tr7J3tZrnafChnzHkidIo+5kM/QW2zwYWofKhWAFZ3Jzl6UkZ0 R3YaTuvz2yFBqrp7SA4GclUCLA8wRsiH2vGXG6KQN8e0lheG7u11aBq+LjIpsyUJIhGm89 AZRVJvArHB7t6BjPTXOjoLE2TuCDWx83afFf8P/GGjUNjlD1ZWSNFDZOIINmRDOxArhHSf hOWEIIoN/ecacN0VN+CCpvnELCps/w86XKDzP520MVFeVyeLczsuYsPyjeUfpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YPbHI8056nllrlOZNi6HsDXMIg1SRfBeHO2CRb08Ko0=; b=LA2CnZYFtRdD5TpjtIYEh3NV4GrVhd32yGUge8TBryXInr/FZrFKKbgo1sfi3KShOxoSux o+AuvSXrf9ORpmEIz6yKX/G6eN7mFULEx9Zq4PYWSm3X1CJO1eQ2n4Bu9WPHYzrYpNWiaa Tf2J5HUCUj438sX11L8bVPgJmHPPZpSE0UCG1s2yR3eOss73Iu2E1ier8LXw4bo0VPT/ng hI74oeWHS5G3D6NjDjbkZOgMct6hOn2fSQlGsI45wGey6vNg9GxgLm9jLhP9Rwu8yg0DzI JmV5MaJ1LXiCkdSgKMs0cvs9tH6mHQn4mBxdqspseKqNEvK43WX7C4oDGXxrVg== 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 4Sl8CW2253z5YP; Tue, 5 Dec 2023 18:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRZ5L009291; Tue, 5 Dec 2023 18:27:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRZ3T009288; Tue, 5 Dec 2023 18:27:35 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:35 GMT Message-Id: <202312051827.3B5IRZ3T009288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 64c5eaab835b - releng/14.0 - zfs: cherry-pick commit from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 64c5eaab835bed5d8a64ac73883457c35f3e2157 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=64c5eaab835bed5d8a64ac73883457c35f3e2157 commit 64c5eaab835bed5d8a64ac73883457c35f3e2157 Author: Alexander Motin AuthorDate: 2023-10-30 23:56:04 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:03:22 +0000 zfs: cherry-pick commit from master #15456 3ec4ea68d4 Unify arc_prune_async() code Obtained from: OpenZFS Approved by: so Security: FreeBSD-EN-23:18.openzfs --- sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 2 +- sys/contrib/openzfs/include/sys/arc.h | 2 +- sys/contrib/openzfs/include/sys/arc_impl.h | 1 - sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 62 ---------------------- .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 32 +++++++++++ sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 51 ------------------ .../openzfs/module/os/linux/zfs/zpl_super.c | 2 +- sys/contrib/openzfs/module/zfs/arc.c | 52 ++++++++++++++++++ 8 files changed, 87 insertions(+), 117 deletions(-) diff --git a/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h b/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h index 0bd20f64897d..a0483dfa39f2 100644 --- a/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h +++ b/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h @@ -60,7 +60,7 @@ extern const struct file_operations zpl_file_operations; extern const struct file_operations zpl_dir_file_operations; /* zpl_super.c */ -extern void zpl_prune_sb(int64_t nr_to_scan, void *arg); +extern void zpl_prune_sb(uint64_t nr_to_scan, void *arg); extern const struct super_operations zpl_super_operations; extern const struct export_operations zpl_export_operations; diff --git a/sys/contrib/openzfs/include/sys/arc.h b/sys/contrib/openzfs/include/sys/arc.h index 9d67dab06ca3..05307aab99e3 100644 --- a/sys/contrib/openzfs/include/sys/arc.h +++ b/sys/contrib/openzfs/include/sys/arc.h @@ -81,7 +81,7 @@ typedef struct arc_prune arc_prune_t; typedef void arc_read_done_func_t(zio_t *zio, const zbookmark_phys_t *zb, const blkptr_t *bp, arc_buf_t *buf, void *priv); typedef void arc_write_done_func_t(zio_t *zio, arc_buf_t *buf, void *priv); -typedef void arc_prune_func_t(int64_t bytes, void *priv); +typedef void arc_prune_func_t(uint64_t bytes, void *priv); /* Shared module parameters */ extern uint_t zfs_arc_average_blocksize; diff --git a/sys/contrib/openzfs/include/sys/arc_impl.h b/sys/contrib/openzfs/include/sys/arc_impl.h index adff42c55d05..defebe3b2fbb 100644 --- a/sys/contrib/openzfs/include/sys/arc_impl.h +++ b/sys/contrib/openzfs/include/sys/arc_impl.h @@ -1065,7 +1065,6 @@ extern void arc_wait_for_eviction(uint64_t, boolean_t); extern void arc_lowmem_init(void); extern void arc_lowmem_fini(void); -extern void arc_prune_async(uint64_t); extern int arc_memory_throttle(spa_t *spa, uint64_t reserve, uint64_t txg); extern uint64_t arc_free_memory(void); extern int64_t arc_available_memory(void); diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c index 12f16edb1e2b..92696c0bf1ae 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c @@ -52,11 +52,6 @@ #include #include -#if __FreeBSD_version >= 1300139 -static struct sx arc_vnlru_lock; -static struct vnode *arc_vnlru_marker; -#endif - extern struct vfsops zfs_vfsops; uint_t zfs_arc_free_target = 0; @@ -131,53 +126,6 @@ arc_default_max(uint64_t min, uint64_t allmem) return (MAX(allmem * 5 / 8, size)); } -/* - * Helper function for arc_prune_async() it is responsible for safely - * handling the execution of a registered arc_prune_func_t. - */ -static void -arc_prune_task(void *arg) -{ - uint64_t nr_scan = (uintptr_t)arg; - -#ifndef __ILP32__ - if (nr_scan > INT_MAX) - nr_scan = INT_MAX; -#endif - -#if __FreeBSD_version >= 1300139 - sx_xlock(&arc_vnlru_lock); - vnlru_free_vfsops(nr_scan, &zfs_vfsops, arc_vnlru_marker); - sx_xunlock(&arc_vnlru_lock); -#else - vnlru_free(nr_scan, &zfs_vfsops); -#endif -} - -/* - * Notify registered consumers they must drop holds on a portion of the ARC - * buffered they reference. This provides a mechanism to ensure the ARC can - * honor the metadata limit and reclaim otherwise pinned ARC buffers. This - * is analogous to dnlc_reduce_cache() but more generic. - * - * This operation is performed asynchronously so it may be safely called - * in the context of the arc_reclaim_thread(). A reference is taken here - * for each registered arc_prune_t and the arc_prune_task() is responsible - * for releasing it once the registered arc_prune_func_t has completed. - */ -void -arc_prune_async(uint64_t adjust) -{ - -#ifndef __LP64__ - if (adjust > UINTPTR_MAX) - adjust = UINTPTR_MAX; -#endif - taskq_dispatch(arc_prune_taskq, arc_prune_task, - (void *)(intptr_t)adjust, TQ_SLEEP); - ARCSTAT_BUMP(arcstat_prune); -} - uint64_t arc_all_memory(void) { @@ -228,10 +176,6 @@ arc_lowmem_init(void) { arc_event_lowmem = EVENTHANDLER_REGISTER(vm_lowmem, arc_lowmem, NULL, EVENTHANDLER_PRI_FIRST); -#if __FreeBSD_version >= 1300139 - arc_vnlru_marker = vnlru_alloc_marker(); - sx_init(&arc_vnlru_lock, "arc vnlru lock"); -#endif } void @@ -239,12 +183,6 @@ arc_lowmem_fini(void) { if (arc_event_lowmem != NULL) EVENTHANDLER_DEREGISTER(vm_lowmem, arc_event_lowmem); -#if __FreeBSD_version >= 1300139 - if (arc_vnlru_marker != NULL) { - vnlru_free_marker(arc_vnlru_marker); - sx_destroy(&arc_vnlru_lock); - } -#endif } void diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c index 8969fd6a54bd..74f18f40c612 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c @@ -2074,6 +2074,26 @@ zfs_vnodes_adjust_back(void) #endif } +#if __FreeBSD_version >= 1300139 +static struct sx zfs_vnlru_lock; +static struct vnode *zfs_vnlru_marker; +#endif +static arc_prune_t *zfs_prune; + +static void +zfs_prune_task(uint64_t nr_to_scan, void *arg __unused) +{ + if (nr_to_scan > INT_MAX) + nr_to_scan = INT_MAX; +#if __FreeBSD_version >= 1300139 + sx_xlock(&zfs_vnlru_lock); + vnlru_free_vfsops(nr_to_scan, &zfs_vfsops, zfs_vnlru_marker); + sx_xunlock(&zfs_vnlru_lock); +#else + vnlru_free(nr_to_scan, &zfs_vfsops); +#endif +} + void zfs_init(void) { @@ -2100,11 +2120,23 @@ zfs_init(void) dmu_objset_register_type(DMU_OST_ZFS, zpl_get_file_info); zfsvfs_taskq = taskq_create("zfsvfs", 1, minclsyspri, 0, 0, 0); + +#if __FreeBSD_version >= 1300139 + zfs_vnlru_marker = vnlru_alloc_marker(); + sx_init(&zfs_vnlru_lock, "zfs vnlru lock"); +#endif + zfs_prune = arc_add_prune_callback(zfs_prune_task, NULL); } void zfs_fini(void) { + arc_remove_prune_callback(zfs_prune); +#if __FreeBSD_version >= 1300139 + vnlru_free_marker(zfs_vnlru_marker); + sx_destroy(&zfs_vnlru_lock); +#endif + taskq_destroy(zfsvfs_taskq); zfsctl_fini(); zfs_znode_fini(); diff --git a/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c b/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c index 29a8802b8367..43ed087e2dbb 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c @@ -489,56 +489,5 @@ arc_unregister_hotplug(void) } #endif /* _KERNEL */ -/* - * Helper function for arc_prune_async() it is responsible for safely - * handling the execution of a registered arc_prune_func_t. - */ -static void -arc_prune_task(void *ptr) -{ - arc_prune_t *ap = (arc_prune_t *)ptr; - arc_prune_func_t *func = ap->p_pfunc; - - if (func != NULL) - func(ap->p_adjust, ap->p_private); - - zfs_refcount_remove(&ap->p_refcnt, func); -} - -/* - * Notify registered consumers they must drop holds on a portion of the ARC - * buffered they reference. This provides a mechanism to ensure the ARC can - * honor the metadata limit and reclaim otherwise pinned ARC buffers. This - * is analogous to dnlc_reduce_cache() but more generic. - * - * This operation is performed asynchronously so it may be safely called - * in the context of the arc_reclaim_thread(). A reference is taken here - * for each registered arc_prune_t and the arc_prune_task() is responsible - * for releasing it once the registered arc_prune_func_t has completed. - */ -void -arc_prune_async(uint64_t adjust) -{ - arc_prune_t *ap; - - mutex_enter(&arc_prune_mtx); - for (ap = list_head(&arc_prune_list); ap != NULL; - ap = list_next(&arc_prune_list, ap)) { - - if (zfs_refcount_count(&ap->p_refcnt) >= 2) - continue; - - zfs_refcount_add(&ap->p_refcnt, ap->p_pfunc); - ap->p_adjust = adjust; - if (taskq_dispatch(arc_prune_taskq, arc_prune_task, - ap, TQ_SLEEP) == TASKQID_INVALID) { - zfs_refcount_remove(&ap->p_refcnt, ap->p_pfunc); - continue; - } - ARCSTAT_BUMP(arcstat_prune); - } - mutex_exit(&arc_prune_mtx); -} - ZFS_MODULE_PARAM(zfs_arc, zfs_arc_, shrinker_limit, INT, ZMOD_RW, "Limit on number of pages that ARC shrinker can reclaim at once"); diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c b/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c index ad52a11aada0..d98d32c1f9fb 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c @@ -375,7 +375,7 @@ zpl_kill_sb(struct super_block *sb) } void -zpl_prune_sb(int64_t nr_to_scan, void *arg) +zpl_prune_sb(uint64_t nr_to_scan, void *arg) { struct super_block *sb = (struct super_block *)arg; int objects = 0; diff --git a/sys/contrib/openzfs/module/zfs/arc.c b/sys/contrib/openzfs/module/zfs/arc.c index b5946e7604c0..d4a946b9a43a 100644 --- a/sys/contrib/openzfs/module/zfs/arc.c +++ b/sys/contrib/openzfs/module/zfs/arc.c @@ -886,6 +886,8 @@ static void l2arc_do_free_on_write(void); static void l2arc_hdr_arcstats_update(arc_buf_hdr_t *hdr, boolean_t incr, boolean_t state_only); +static void arc_prune_async(uint64_t adjust); + #define l2arc_hdr_arcstats_increment(hdr) \ l2arc_hdr_arcstats_update((hdr), B_TRUE, B_FALSE) #define l2arc_hdr_arcstats_decrement(hdr) \ @@ -6048,6 +6050,56 @@ arc_remove_prune_callback(arc_prune_t *p) kmem_free(p, sizeof (*p)); } +/* + * Helper function for arc_prune_async() it is responsible for safely + * handling the execution of a registered arc_prune_func_t. + */ +static void +arc_prune_task(void *ptr) +{ + arc_prune_t *ap = (arc_prune_t *)ptr; + arc_prune_func_t *func = ap->p_pfunc; + + if (func != NULL) + func(ap->p_adjust, ap->p_private); + + zfs_refcount_remove(&ap->p_refcnt, func); +} + +/* + * Notify registered consumers they must drop holds on a portion of the ARC + * buffers they reference. This provides a mechanism to ensure the ARC can + * honor the metadata limit and reclaim otherwise pinned ARC buffers. + * + * This operation is performed asynchronously so it may be safely called + * in the context of the arc_reclaim_thread(). A reference is taken here + * for each registered arc_prune_t and the arc_prune_task() is responsible + * for releasing it once the registered arc_prune_func_t has completed. + */ +static void +arc_prune_async(uint64_t adjust) +{ + arc_prune_t *ap; + + mutex_enter(&arc_prune_mtx); + for (ap = list_head(&arc_prune_list); ap != NULL; + ap = list_next(&arc_prune_list, ap)) { + + if (zfs_refcount_count(&ap->p_refcnt) >= 2) + continue; + + zfs_refcount_add(&ap->p_refcnt, ap->p_pfunc); + ap->p_adjust = adjust; + if (taskq_dispatch(arc_prune_taskq, arc_prune_task, + ap, TQ_SLEEP) == TASKQID_INVALID) { + zfs_refcount_remove(&ap->p_refcnt, ap->p_pfunc); + continue; + } + ARCSTAT_BUMP(arcstat_prune); + } + mutex_exit(&arc_prune_mtx); +} + /* * Notify the arc that a block was freed, and thus will never be used again. */ From nobody Tue Dec 5 18:27:36 2023 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 4Sl8CX4KDZz53JPY; Tue, 5 Dec 2023 18:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CX3qPgz3Z8s; Tue, 5 Dec 2023 18:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBo0r4Ox4YRdhsjs/I3FMcRyb9ig8PzTYM7e68RwkKM=; b=S6qlHayXZ+QdmK04rRJsJKtoGa0LUOH4YyIXxwrrEAD/iI+A/21zSFHclSR2Agi8TbSRIq WP2EEXBXgs9QZ7EY6r6iIkRE/cmFu4xHUaG4C6u6EW7R1aVsEvE1lmUbWPKJAb21482VDo a3dGn/HzqZ35rVmtTuAWvsSNxvJcYE47//E7MqqZWuaOVQJ2az9RXmOQSW+4XQa6bw5weA FSVPnJjOvA5sZ73lYKEpYo+kKIiBk3tSzpDXknBZQjuiydy7oplIrwqD7JE195pSNqjKwp cklIyU0DuhH+HzKpwXdT29iUjxtrKdaxtUleliRFxn49pUOPjUmf71hcEQdUtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800856; a=rsa-sha256; cv=none; b=FhxHkxxE5NVzhxEVu8/ph1cQ3AcF0Cyaq4A9uDQzfpHDjQKDnKbZDNyQxdi83avOXWYz+E 4ROB8ViGQHkTkBFNeV8St4g5YIBekpjwu1/KsvUiNmq8O843cHz8YLDwhbySdecO4iMZ5j ya6VLk2wI47FMI3FAhvUbjSrVXgOyJDL5ZR2pNm9NFih4sR+gwXrWYug33qv06geCFjpek UiOkkfiv5G3E0LtxVD2SLJtCz9gLRaFF7tn7zkfoDgmu5uwXWTzZhRkNUu1hKmjYnIKRI+ E1GjQ7EpWyjQ/p3RmzGXqzB+yfVPZaHobamKe11F1m63wWY0fXAj744HkWuKZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBo0r4Ox4YRdhsjs/I3FMcRyb9ig8PzTYM7e68RwkKM=; b=pbPoEDB8MDPo18/hl8XLBZd4w4csC7Pc0U8VVsNQ1oPiZJGktvR7Tptcv64zUD2P4atYLp wQcnISK4LBJa5BbQyo/sJaQ9gnKd/8n7RcPnP0PWLiXq0DbIeAnBvlAPOiqWma7nP8FBVg xt4S8WHdOBTc19e+pCHqwK49P1AGgfsi4DBmQCPySvqrsmZhyAh0vY2A47gGrlqMWeJNhm Z775dx+/e78qdXMjES+pNVVDoiQ6F6RSgJmFIG5wpO+YQBrrjXENClualt4DqBNeDygnpe K/C6hcvxIiMqd6ZaERPA/d8O8apZ0nnfkOzXu+nBp/SQERPBjLZXsHhE5kU4jQ== 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 4Sl8CX2vsRz55C; Tue, 5 Dec 2023 18:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRaO9009357; Tue, 5 Dec 2023 18:27:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRaLA009354; Tue, 5 Dec 2023 18:27:36 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:36 GMT Message-Id: <202312051827.3B5IRaLA009354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ad3edd66d15e - releng/14.0 - pkgbase: use . format for alpha, beta and release package versions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: ad3edd66d15e6af1bf7e393a01f1a126dfa55fff Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ad3edd66d15e6af1bf7e393a01f1a126dfa55fff commit ad3edd66d15e6af1bf7e393a01f1a126dfa55fff Author: Doug Rabson AuthorDate: 2023-11-13 13:04:26 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:05:27 +0000 pkgbase: use . format for alpha, beta and release package versions This is consistent with version numbers used in releng/13.2. PR: 275051 Reviewed by: bapt MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42562 Approved by: so Security: FreeBSD-EN-23:19.pkgbase (cherry picked from commit 21e9018ae19662db643a21064150da866bc7beb4) (cherry picked from commit da7e9601a99afd3f8777f6ae62fd51e601e15085) --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 01d3328726bd..12397abeedb2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -547,9 +547,11 @@ VERSION= FreeBSD ${_REVISION}-${_BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDA MAJOR_REVISION= ${_REVISION:R} .if !defined(PKG_VERSION) +_PKG_REVISION= ${_REVISION} _STRTIMENOW= %Y%m%d%H%M%S _TIMENOW= ${_STRTIMENOW:gmtime} .if ${_BRANCH:MCURRENT*} || ${_BRANCH:MSTABLE*} || ${_BRANCH:MPRERELEASE*} +_PKG_REVISION= ${MAJOR_REVISION} EXTRA_REVISION= .snap${_TIMENOW} .elif ${_BRANCH:MALPHA*} EXTRA_REVISION= .a${_BRANCH:C/ALPHA([0-9]+).*/\1/}.${_TIMENOW} @@ -560,7 +562,7 @@ EXTRA_REVISION= .rc${_BRANCH:C/RC([0-9]+).*/\1/}.${_TIMENOW} .elif ${_BRANCH:M*-p*} EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/} .endif -PKG_VERSION:= ${MAJOR_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} +PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif .endif # !defined(PKG_VERSION) From nobody Tue Dec 5 18:27:37 2023 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 4Sl8CY5dYGz53JVL; Tue, 5 Dec 2023 18:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CY57Pxz3ZLp; Tue, 5 Dec 2023 18:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8brK5tSS0DDuJZMkcyuSZTxto0y6G2h5BBsZUus9Yg=; b=ToL+FOqGywLz2GmnldCoZNEB1xu9j5ej0vq0pty2T5GUZ6JvB7cWvt0wzylgQWPApAnldD r12rMFm5YgMHrw16wJ5qmJgAtAtUVGayVe18drB0cHxISdcSnumizqHzK6CyAN30+Pj9aW TvsGoqxC1v6DPyDcJUNoIx+hJpRoxwgyBKimJdkZS+WuwCPZcCuRH5nqLK+NnyuNAdMi8F mM1deiXrMnPUdq0+g0ehB6ECKUUuFUiX6R4bAc1uPRQyko7D9JDu+Wz2zruBar5PochTSm 3CxoKK7YA6wDhjLEGjVaKVu/oWQK34PzGOaVm/1FwZ8JecPlydhdllDtH4NEKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800857; a=rsa-sha256; cv=none; b=CMRLTx8ZVvZcDP30kjdeEC1MXeXx9bSVC0NEvvia+cMpVeE/dCVBJeSxm6UxtF3ZNqON0a q6tUQmmEgvbJ8odTyf0/0OiFwQzLCXaZ53iJ1Cb2uHSAypFXZTo9HKP3GL4U1kHsDnpk/r rvcJhgeBJ0a/NXIT5ugLsT8AI0DjqF0nDQrPLAFo699JSJxuXcHI8WRtNtWi30IO1aRWu6 4mcZP8kPX1WatZwztPrcIFY+Tw2/n+VpUx2dRPVvckfjwqyBhCOQ2nCcqjgol6H3TQGnqe +kUuMYTPBD6eco/CyVm+TR4rc8etqELTqjxQsF/tF6thiDT/dtQg/8g2hfyy7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8brK5tSS0DDuJZMkcyuSZTxto0y6G2h5BBsZUus9Yg=; b=AI0PUVnbFdanZAal+PGrHYwe+8JAuOidetyJWlCJRZQABBTEWJJewdvcd8yiFx+vU6UHTB yVwm7CukcoPnmOdQgxGnhpY6spLWVGeCIdzhRc+ebkkHbJnU/81r0Btwu6cR2xXq1P3Mrh px4dCyAWqm24M4X8wZ4oP15llCwDHjLppqHYYALy5f9VhjcrTdBIPPYG+dBy1T1ARA6Fji iSVTmjFFmFn4/zwthgtCFOf7RWZrZLwLcz7gtG45/xNyNGSnn+GNoFMm5Xsb7r7om6KIlX KONndjWKYuiSr1wEazkIuPBNS0jiMwDtgpdyGQ4dhi9uirXqN6uk+bJoZESgog== 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 4Sl8CY3v1pz59x; Tue, 5 Dec 2023 18:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRbQr009398; Tue, 5 Dec 2023 18:27:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRb4g009395; Tue, 5 Dec 2023 18:27:37 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:37 GMT Message-Id: <202312051827.3B5IRb4g009395@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4be96902ba82 - releng/14.0 - vm_phys: fix freelist_contig List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 4be96902ba82364810b86a6a0b3c58065e45e4cd Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4be96902ba82364810b86a6a0b3c58065e45e4cd commit 4be96902ba82364810b86a6a0b3c58065e45e4cd Author: Doug Moore AuthorDate: 2023-11-15 09:25:45 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:05:55 +0000 vm_phys: fix freelist_contig vm_phys_find_freelist_contig is called to search a list of max-sized free page blocks and find one that, when joined with adjacent blocks in memory, can satisfy a request for a memory allocation bigger than any single max-sized free page block. In commit fa8a6585c7522b7de6d29802967bd5eba2f2dcf1, I defined this function in order to offer two improvements: 1) reduce the worst-case search time, and 2) allow solutions that include less-than max-sized free page blocks at the front or back of the giant allocation. However, it turns out that this change introduced an error, reported in In Bug 274592. That error concerns failing to check segment boundaries. This change fixes an error in vm_phys_find_freelist_config that resolves that bug. It also abandons improvement 2), because the value of that improvement is small and because preserving it would require more testing than I am able to do. PR: 274592 Reported by: shafaisal.us@gmail.com Reviewed by: alc, markj Tested by: shafaisal.us@gmail.com Fixes: fa8a6585c752 vm_phys: avoid waste in multipage allocation MFC after: 10 days Differential Revision: https://reviews.freebsd.org/D42509 Approved by: so Security: FreeBSD-EN-23:20.vm (cherry picked from commit 2a4897bd4e1bd8430d955abd3cf6675956bb9d61) (cherry picked from commit 210fce73ae0e4106a3aeb1970ffbeb30d0baa6ba) --- sys/vm/vm_phys.c | 146 +++++++++++++++++++++++-------------------------------- 1 file changed, 62 insertions(+), 84 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index bc992bdfc58b..cd75ed092691 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -1360,108 +1360,75 @@ vm_phys_unfree_page(vm_page_t m) } /* - * Find a run of contiguous physical pages from the specified page list. + * Find a run of contiguous physical pages, meeting alignment requirements, from + * a list of max-sized page blocks, where we need at least two consecutive + * blocks to satisfy the (large) page request. */ static vm_page_t -vm_phys_find_freelist_contig(struct vm_freelist *fl, int oind, u_long npages, +vm_phys_find_freelist_contig(struct vm_freelist *fl, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary) { struct vm_phys_seg *seg; - vm_paddr_t frag, lbound, pa, page_size, pa_end, pa_pre, size; - vm_page_t m, m_listed, m_ret; - int order; + vm_page_t m, m_iter, m_ret; + vm_paddr_t max_size, size; + int max_order; - KASSERT(npages > 0, ("npages is 0")); - KASSERT(powerof2(alignment), ("alignment is not a power of 2")); - KASSERT(powerof2(boundary), ("boundary is not a power of 2")); - /* Search for a run satisfying the specified conditions. */ - page_size = PAGE_SIZE; + max_order = VM_NFREEORDER - 1; size = npages << PAGE_SHIFT; - frag = (npages & ~(~0UL << oind)) << PAGE_SHIFT; - TAILQ_FOREACH(m_listed, &fl[oind].pl, listq) { - /* - * Determine if the address range starting at pa is - * too low. - */ - pa = VM_PAGE_TO_PHYS(m_listed); - if (pa < low) - continue; + max_size = (vm_paddr_t)1 << (PAGE_SHIFT + max_order); + KASSERT(size > max_size, ("size is too small")); + /* + * In order to avoid examining any free max-sized page block more than + * twice, identify the ones that are first in a physically-contiguous + * sequence of such blocks, and only for those walk the sequence to + * check if there are enough free blocks starting at a properly aligned + * block. Thus, no block is checked for free-ness more than twice. + */ + TAILQ_FOREACH(m, &fl[max_order].pl, listq) { /* - * If this is not the first free oind-block in this range, bail - * out. We have seen the first free block already, or will see - * it before failing to find an appropriate range. + * Skip m unless it is first in a sequence of free max page + * blocks >= low in its segment. */ - seg = &vm_phys_segs[m_listed->segind]; - lbound = low > seg->start ? low : seg->start; - pa_pre = pa - (page_size << oind); - m = &seg->first_page[atop(pa_pre - seg->start)]; - if (pa != 0 && pa_pre >= lbound && m->order == oind) + seg = &vm_phys_segs[m->segind]; + if (VM_PAGE_TO_PHYS(m) < MAX(low, seg->start)) + continue; + if (VM_PAGE_TO_PHYS(m) >= max_size && + VM_PAGE_TO_PHYS(m) - max_size >= MAX(low, seg->start) && + max_order == m[-1 << max_order].order) continue; - - if (!vm_addr_align_ok(pa, alignment)) - /* Advance to satisfy alignment condition. */ - pa = roundup2(pa, alignment); - else if (frag != 0 && lbound + frag <= pa) { - /* - * Back up to the first aligned free block in this - * range, without moving below lbound. - */ - pa_end = pa; - for (order = oind - 1; order >= 0; order--) { - pa_pre = pa_end - (page_size << order); - if (!vm_addr_align_ok(pa_pre, alignment)) - break; - m = &seg->first_page[atop(pa_pre - seg->start)]; - if (pa_pre >= lbound && m->order == order) - pa_end = pa_pre; - } - /* - * If the extra small blocks are enough to complete the - * fragment, use them. Otherwise, look to allocate the - * fragment at the other end. - */ - if (pa_end + frag <= pa) - pa = pa_end; - } - - /* Advance as necessary to satisfy boundary conditions. */ - if (!vm_addr_bound_ok(pa, size, boundary)) - pa = roundup2(pa + 1, boundary); - pa_end = pa + size; /* - * Determine if the address range is valid (without overflow in - * pa_end calculation), and fits within the segment. + * Advance m_ret from m to the first of the sequence, if any, + * that satisfies alignment conditions and might leave enough + * space. */ - if (pa_end < pa || seg->end < pa_end) - continue; - - m_ret = &seg->first_page[atop(pa - seg->start)]; + m_ret = m; + while (!vm_addr_ok(VM_PAGE_TO_PHYS(m_ret), + size, alignment, boundary) && + VM_PAGE_TO_PHYS(m_ret) + size <= MIN(high, seg->end) && + max_order == m_ret[1 << max_order].order) + m_ret += 1 << max_order; /* - * Determine whether there are enough free oind-blocks here to - * satisfy the allocation request. + * Skip m unless some block m_ret in the sequence is properly + * aligned, and begins a sequence of enough pages less than + * high, and in the same segment. */ - pa = VM_PAGE_TO_PHYS(m_listed); - do { - pa += page_size << oind; - if (pa >= pa_end) - return (m_ret); - m = &seg->first_page[atop(pa - seg->start)]; - } while (oind == m->order); + if (VM_PAGE_TO_PHYS(m_ret) + size > MIN(high, seg->end)) + continue; /* - * Determine if an additional series of free blocks of - * diminishing size can help to satisfy the allocation request. + * Skip m unless the blocks to allocate starting at m_ret are + * all free. */ - while (m->order < oind && - pa + 2 * (page_size << m->order) > pa_end) { - pa += page_size << m->order; - if (pa >= pa_end) - return (m_ret); - m = &seg->first_page[atop(pa - seg->start)]; + for (m_iter = m_ret; + m_iter < m_ret + npages && max_order == m_iter->order; + m_iter += 1 << max_order) { } + if (m_iter < m_ret + npages) + continue; + return (m_ret); } return (NULL); } @@ -1508,11 +1475,10 @@ vm_phys_find_queues_contig( } if (order < VM_NFREEORDER) return (NULL); - /* Search for a long-enough sequence of small blocks. */ - oind = VM_NFREEORDER - 1; + /* Search for a long-enough sequence of max-order blocks. */ for (pind = 0; pind < VM_NFREEPOOL; pind++) { fl = (*queues)[pind]; - m_ret = vm_phys_find_freelist_contig(fl, oind, npages, + m_ret = vm_phys_find_freelist_contig(fl, npages, low, high, alignment, boundary); if (m_ret != NULL) return (m_ret); @@ -1593,6 +1559,18 @@ vm_phys_alloc_contig(int domain, u_long npages, vm_paddr_t low, vm_paddr_t high, /* Return excess pages to the free lists. */ fl = (*queues)[VM_FREEPOOL_DEFAULT]; vm_phys_enq_range(&m_run[npages], m - &m_run[npages], fl, 0); + + /* Return page verified to satisfy conditions of request. */ + pa_start = VM_PAGE_TO_PHYS(m_run); + KASSERT(low <= pa_start, + ("memory allocated below minimum requested range")); + KASSERT(pa_start + ptoa(npages) <= high, + ("memory allocated above maximum requested range")); + seg = &vm_phys_segs[m_run->segind]; + KASSERT(seg->domain == domain, + ("memory not allocated from specified domain")); + KASSERT(vm_addr_ok(pa_start, ptoa(npages), alignment, boundary), + ("memory alignment/boundary constraints not satisfied")); return (m_run); } From nobody Tue Dec 5 18:27:38 2023 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 4Sl8Cb1b6Gz53JVR; Tue, 5 Dec 2023 18:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CZ5z4Kz3ZMH; Tue, 5 Dec 2023 18: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=1701800858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hjWd/iZOTmXXhJjrSl51Lwu89WMjz7RIRrf9uvWkdAk=; b=DnP0ipKiCCUvCkVIOCO0fsN7/h3Sbc8ccyEvXRWerenyp1r+KpsExwlTniuE0RAwwulHPy AVKlufaJ0BIplG1yoQneGFPK5Gj6TuzzdMZxsx76xgOx9uh/TTVL3rvh7HNeV53h7WuFuh yH0C6GWgIt4axz6Arlrx4KnDFRVudeeU0YKAorZtcGh2ErbopzLkjAJ2dE03+UyV6dBEG+ zZMc6I+MbEmcCuzvFmCrnThnAbHwbDO0kfUpXiVxmTzbEALHNRV/UVJCucrGwiXdZCRenb mQQUEj1PhLQwiL+LXyO7HLPWx+mBy48f1s+a3a0VXxpwJrZWYNGe8HONO1nb/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800858; a=rsa-sha256; cv=none; b=LWeQ4YxwksG/jpthWD5857PCWiEy9OFb04KuqAWgGcoXyafKgSZoCCzcXBfKtm4zb8nnqV rJtF2a15WZfwWU2ryMSmDpAv0LYpPlkBwNCRTj19NpnCyOErwXtYzKkWc+zhRSVjMfMQ9F Apy3vKfr+4GK4RsA8pyWAYYTccWc7dli4F+yxhfURLrpelR7pbMFzj4PASA5YBXDIRMF1f dC+tQ1x361KwiKRd7jwMYp48KS9PCwUD9L6xrd7WH/oTGyJdXf+iaUU0M2kWLrafVphW9R HQM/QaxPcPidamiSp0stAcVHyGkJyDRF72doUTYj2eeLBz/sq+t8ToJgGV63sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hjWd/iZOTmXXhJjrSl51Lwu89WMjz7RIRrf9uvWkdAk=; b=j0A8OtrZtoBZRbFJK5aRLiKZM2qw9zoYMNOc2mrAe0ANAcrmGF6OcvF6LvwFSFtY3rfy7a EauWgG03g7/vzEzu7HS5OXaVPPcSANoDQs3DaKlqd/4BVyo9AdLtBaP4HvQ7LJAmqJYxG1 iyZIa4sEutAKKUDYlVvLPCUBW8Zh7p17XS62mSlJ2j7W8DpIgNRasC2MmYFqIEyhPv7Szb kwEuSl4iGpmiiMhPoXgGbhdu5pqWkfpcPA7fOExm8sJGMlzOmbWgabliXb8iXet+uunlP2 xJ1UDe56vQmWoB4KZyDbMWZ4B8NjoycnX/11Wic7CjfZNtGLkxvDNmk3LLB+0Q== 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 4Sl8CZ4xRDz59y; Tue, 5 Dec 2023 18:27:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRcuL009453; Tue, 5 Dec 2023 18:27:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRcmC009450; Tue, 5 Dec 2023 18:27:38 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:38 GMT Message-Id: <202312051827.3B5IRcmC009450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 31f6cfca851f - releng/14.0 - tty: properly check character position when handling IUTF8 backspaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 31f6cfca851f20099162352dac8d044857b2e1f9 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=31f6cfca851f20099162352dac8d044857b2e1f9 commit 31f6cfca851f20099162352dac8d044857b2e1f9 Author: Bojan Novković AuthorDate: 2023-11-13 18:02:30 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:06:29 +0000 tty: properly check character position when handling IUTF8 backspaces The tty_rubchar() code handling backspaces for UTF-8 characters didn't properly check whether the beginning of the current line was reached. This resulted in a kernel panic in ttyinq_unputchar() when prodded with certain malformed UTF-8 sequences. PR: 275009 Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D42564 Approved by: so Security: FreeBSD-EN-23:21.tty (cherry picked from commit c6d7be214811c315d234d64c6cbaa92d4f55d2c1) (cherry picked from commit ae8387cc818a0d6a2229ee049b671482e1549519) --- sys/kern/tty_ttydisc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c index c46579cefbb1..cb5bf672d040 100644 --- a/sys/kern/tty_ttydisc.c +++ b/sys/kern/tty_ttydisc.c @@ -822,7 +822,13 @@ ttydisc_rubchar(struct tty *tp) /* Loop back through inq until we hit the * leading byte. */ while (CTL_UTF8_CONT(c) && nb < UTF8_STACKBUF) { - ttyinq_peekchar(&tp->t_inq, &c, "e); + /* + * Check if we've reached the beginning + * of the line. + */ + if (ttyinq_peekchar(&tp->t_inq, &c, + "e) != 0) + break; ttyinq_unputchar(&tp->t_inq); bytes[curidx] = c; curidx--; From nobody Tue Dec 5 18:27:39 2023 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 4Sl8Cc2vyZz53JVS; Tue, 5 Dec 2023 18:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8Cc06KNz3ZMY; Tue, 5 Dec 2023 18:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7m2mu4bd274o5cMXYMdo1T/ooSwpXb7+tJ8EntoJRQ=; b=u2xAco1XXlGkJvdXAOC+sUUr7Lj9OPjpd0wgQdiEBGy6MNkhupB8GVlzv/XxaE7loAnMyJ v47SlgPJkyv0rzjXFdTj6WQvvwcVZPyBG3mU3t2NDbQNdBrnjt5hEYYYXBiuirHGsg9PSK i9zZpa39cjAElj5uD777TuI58JyJu02bDEDjjbgI2/3ZDuMFSmFCSZ6r9cb2zmBqHiUsCL R7jx9S12ky7iSd1++XcTD9gfP4YgnHHth6NYvUY2a8U2MNOAa5xSL/j3SFnybQ5vrUkgVF 9kAmLvMd7LD9uINiulwdmsRe8Cz+V4YD+n/PVwvgL2pGVjblhwl/YrWKfcg8iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800860; a=rsa-sha256; cv=none; b=lqPHfOUc/K7+yFCRmtzp4fWQjC29r8qcyiJspLisqvqjq39R+zXEOsC2rugGcXBhpao7km Fqm/+0mZ5bqP2Q/VDGirovbm4QtrIMMiXrV9jDFlrPhWwmUh5v18BKfKMG5ulm6oik2zaO joOrD3Gg1LyS5sR22WPY+x1bmFM/4N1YUs3DO5MIfC4MfcXE3i3zHsVT9GCM6CDF/6DIW6 GnB6mteauVccmBQP+b/Hzzjap8qwPk7evYNa/mm/k/OiokotIuhLU9kdhEPQ8AbX7OrJ2+ QB8FkvwcLOIa31wIg8IBYdagq5Vea+nZI0Be1WKbenLkaEii1rQy6Qu55HNVuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7m2mu4bd274o5cMXYMdo1T/ooSwpXb7+tJ8EntoJRQ=; b=GnmXPz5N9GAJyotYjptsY/l6WTTo9XVVCHckTb2WvKKDJjjFdROqNtbzgxn9vhFtH/OsTc +oX0Sb8Y6ct44eNdBYfLMeBKUq5ajMvSCtHTfKMId90Ie+xGwV9S9bYRgdVfceicZVuY5V mOJAvRWd9VVBh7B1csGkV1QmJLFfesc15yNnFOpwpsYHDk0D+bS3TpFNUqcLqFypn0Gy54 uWuH5avUxTI22viIrydWBD+nHoap0r+wOmRFG7BhRbBA8/QWqvZpdEAAjdmtN16/rYBqhK 2ZZ8ZpVO2yc1jH+S1wSXLkRYYQODpFfqNXweIRMJGwhSZ9x1+BySfR0V3S0GdQ== 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 4Sl8Cb5p0rz5B0; Tue, 5 Dec 2023 18:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRdr3009501; Tue, 5 Dec 2023 18:27:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRdRd009498; Tue, 5 Dec 2023 18:27:39 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:39 GMT Message-Id: <202312051827.3B5IRdRd009498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4fd0162652a2 - releng/14.0 - nfsd: Fix NFS access to .zfs/snapshot snapshots List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 4fd0162652a2e0f51aad99055ec837049febaee2 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4fd0162652a2e0f51aad99055ec837049febaee2 commit 4fd0162652a2e0f51aad99055ec837049febaee2 Author: Rick Macklem AuthorDate: 2023-11-23 15:23:33 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 15:45:11 +0000 nfsd: Fix NFS access to .zfs/snapshot snapshots When a process attempts to access a snapshot under //.zfs/snapshot, the snapshot is automounted. However, without this patch, the automount does not set mnt_exjail, which results in the snapshot not being accessible over NFS. This patch defines a new function called vfs_exjail_clone() which sets mnt_exjail from another mount point and then uses that function to set mnt_exjail in the snapshot automount. A separate patch that is currently a pull request for OpenZFS, calls this function to fix the problem. PR: 275200 Approved by: so Security: FreeBSD-EN-23:22.vfs (cherry picked from commit f5f277728adec4c5b3e840a1fb16bd16f8cc956d) (cherry picked from commit a7c25f0d064425bc7a3b170aa441fecf0ae38600) --- sys/kern/vfs_mount.c | 35 +++++++++++++++++++++++++++++++++++ sys/sys/mount.h | 4 ++++ 2 files changed, 39 insertions(+) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 45ab9cfc93cc..25757356f86a 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -3119,6 +3119,41 @@ suspend_all_fs(void) mtx_unlock(&mountlist_mtx); } +/* + * Clone the mnt_exjail field to a new mount point. + */ +void +vfs_exjail_clone(struct mount *inmp, struct mount *outmp) +{ + struct ucred *cr; + struct prison *pr; + + MNT_ILOCK(inmp); + cr = inmp->mnt_exjail; + if (cr != NULL) { + crhold(cr); + MNT_IUNLOCK(inmp); + pr = cr->cr_prison; + sx_slock(&allprison_lock); + if (!prison_isalive(pr)) { + sx_sunlock(&allprison_lock); + crfree(cr); + return; + } + MNT_ILOCK(outmp); + if (outmp->mnt_exjail == NULL) { + outmp->mnt_exjail = cr; + atomic_add_int(&pr->pr_exportcnt, 1); + cr = NULL; + } + MNT_IUNLOCK(outmp); + sx_sunlock(&allprison_lock); + if (cr != NULL) + crfree(cr); + } else + MNT_IUNLOCK(inmp); +} + void resume_all_fs(void) { diff --git a/sys/sys/mount.h b/sys/sys/mount.h index c4e1f83e9683..70f4bc2b834e 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -980,6 +980,9 @@ enum vfs_notify_upper_type { * exported vnode operations */ +/* Define this to indicate that vfs_exjail_clone() exists for ZFS to use. */ +#define VFS_SUPPORTS_EXJAIL_CLONE 1 + int dounmount(struct mount *, uint64_t, struct thread *); int kernel_mount(struct mntarg *ma, uint64_t flags); @@ -1016,6 +1019,7 @@ int vfs_setpublicfs /* set publicly exported fs */ (struct mount *, struct netexport *, struct export_args *); void vfs_periodic(struct mount *, int); int vfs_busy(struct mount *, int); +void vfs_exjail_clone(struct mount *, struct mount *); void vfs_exjail_delete(struct prison *); int vfs_export /* process mount export info */ (struct mount *, struct export_args *, bool); From nobody Tue Dec 5 18:27:40 2023 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 4Sl8Cd1Yxgz53JRq; Tue, 5 Dec 2023 18:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8Cd0g7gz3ZMw; Tue, 5 Dec 2023 18:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C0KXcY9jN6DK2AluvOvC7kNxjxlCUnOztF/AXFEODyU=; b=O9HivpOHaiEFGaQ0Jp6cvyJf/EI60XWig9c48EX8wtMawX2pQGBy7Hkf6Ky9mGkzbbgYwg zdzEMcdiLIXZMhJaEqbzRTdbB6OvDsHRnM8rFiSasl27+J3tl2TsNU3w0G01ibSj4O39XL v/a7sz0m4WaTpWussNB2xz11IaiGm4ok9asqOJdhjGTt7r8dxXAsQaHdR3cejQXrDdPpYY DKJfVw8qHfmTf9O28cbv/M2SrUGvDJHx/Y1RTH1dICegQ1hEKNOYLY//4286bDJnbr1kzp dOaz2zsdIvTAeirURYEKe00AL0YdnBTInZs+X90g2ROZ6X6yBsxmpWW81TF2kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800861; a=rsa-sha256; cv=none; b=uyufS8CM5q2K872o6wg37AehCmRkAfZYGs3tGvAHOoKcKh95Nwug+1PxydJ39QEwxAvA+i oj3klLqmFQVPV7WAqBBOS7KHI4xfh95BpUrWRRlMcfivCyzm1cvmlVWGVpgK4QsBmVC5jN R8dQMrUVpVTCChgNJK56n8SyWk4qThqp+ePOoFbBl9yKLG2n2RLs09/TEx4Xz772TNQ2Ui CtBEAH5Z9P5xs8hrEgCBp/eEKkmAhZuq8RggR4FsUlfCylIpKKJ02cVG9NteWo4R2+gmo5 XR2wiQki3+JFEhQWHu6ahfmPTly+UAc7OOLkUwbviGfkpIZJca8wzHt9V+0GsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C0KXcY9jN6DK2AluvOvC7kNxjxlCUnOztF/AXFEODyU=; b=Pw8GL9FxHD8fGC+9jeubEqbJed6CvJJQoY+3erjSKQVf8/W2QLY6SWgkZ/3qhaVtj7Tf2w 02FTve7smr6A+cb046DmrHc4qxKQoLy5Wl/xfanmABSleVAwDQlMdNBHwI13ZDV2Uh/ikl /B/AlUrrrwstNAJmerPGNLRXxTY/BiGKPaV7zmRcsqSVVlmrcJ46fKmeH3Kl5pjNBwv2/H iNSN+wdoWXamOSZJ6JM11ay0dBL/wIt2DAReZfpygvmyJEIi5FQ/J1lQ2gbosNYN9iCf4I gheCd99YCZ9x/p8PrPl4+cEwKfaW08+XQQX2JV3QW1ldDKZ33ehhJxTrT0zG6Q== 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 4Sl8Cc6h45z5B1; Tue, 5 Dec 2023 18:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IResQ009544; Tue, 5 Dec 2023 18:27:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IReBI009541; Tue, 5 Dec 2023 18:27:40 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:40 GMT Message-Id: <202312051827.3B5IReBI009541@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 889ecd8fd178 - releng/14.0 - zfs: cherry-pick commit from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 889ecd8fd178c4779e10e208f4845c9bb7f4d616 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=889ecd8fd178c4779e10e208f4845c9bb7f4d616 commit 889ecd8fd178c4779e10e208f4845c9bb7f4d616 Author: rmacklem <64620010+rmacklem@users.noreply.github.com> AuthorDate: 2023-11-28 00:31:03 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 15:45:56 +0000 zfs: cherry-pick commit from master #15563 522414da3b FreeBSD: Fix ZFS so that snapshots under .zfs/snapshot are NFS visible Obtained from: OpenZFS Approved by: so Security: FreeBSD-EN-23:22.vfs --- sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h | 2 +- sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c | 9 ++++++++- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h index 7f163fcfdb1e..f2196da56bc8 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h @@ -101,7 +101,7 @@ void vfs_setmntopt(vfs_t *vfsp, const char *name, const char *arg, void vfs_clearmntopt(vfs_t *vfsp, const char *name); int vfs_optionisset(const vfs_t *vfsp, const char *opt, char **argp); int mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, - char *fspath, char *fspec, int fsflags); + char *fspath, char *fspec, int fsflags, vfs_t *parent_vfsp); typedef uint64_t vfs_feature_t; diff --git a/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c b/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c index a07098afc5b4..3f33547216eb 100644 --- a/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c +++ b/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c @@ -120,7 +120,7 @@ vfs_optionisset(const vfs_t *vfsp, const char *opt, char **argp) int mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, char *fspath, - char *fspec, int fsflags) + char *fspec, int fsflags, vfs_t *parent_vfsp) { struct vfsconf *vfsp; struct mount *mp; @@ -220,6 +220,13 @@ mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, char *fspath, mp->mnt_opt = mp->mnt_optnew; (void) VFS_STATFS(mp, &mp->mnt_stat); +#ifdef VFS_SUPPORTS_EXJAIL_CLONE + /* + * Clone the mnt_exjail credentials of the parent, as required. + */ + vfs_exjail_clone(parent_vfsp, mp); +#endif + /* * Prevent external consumers of mount options from reading * mnt_optnew. 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 420d887b661e..79909415178a 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -1026,7 +1026,8 @@ zfsctl_snapdir_lookup(struct vop_lookup_args *ap) "%s/" ZFS_CTLDIR_NAME "/snapshot/%s", dvp->v_vfsp->mnt_stat.f_mntonname, name); - err = mount_snapshot(curthread, vpp, "zfs", mountpoint, fullname, 0); + err = mount_snapshot(curthread, vpp, "zfs", mountpoint, fullname, 0, + dvp->v_vfsp); kmem_free(mountpoint, mountpoint_len); if (err == 0) { /* From nobody Tue Dec 5 18:27:42 2023 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 4Sl8Cf2ldwz53JMW; Tue, 5 Dec 2023 18:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8Cf1tPRz3ZSm; Tue, 5 Dec 2023 18:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uEHmnYtTGLcjMZBAF0Wsb8U5ysSdtbqpJi0QUnh1VJg=; b=nuU9zQdUKfa98wEX8maXDvXSQTGjTEXNudwKGQQFcBuUeJB09BCIaQSTzMJ/TSlXsEBFuG TdZcS/epdXGxoBtZvFMg+im8+zuGyC1aGNaGKd8+OS4VB7ovmdzuB/OFYVAgf/Nyc5wxz4 jccyzAokRRSPUHAEG2PB+GlfM+MuWdEi/4kt97p3xSnQ6X5aQG06Z9elckqA8Vk1hy8muz NVyMA2EsxuVnXUX421mxWznK4Klvjvpr0BxMnKbUQhU031Z2eJxVlmvLJRZ1pNoyxeHlXU 1ymmd7j9w+rjfINyRP5wtXg2RjuvGU+LqJyGGPpYaLzuEskLG89NR+CaRnXwpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800862; a=rsa-sha256; cv=none; b=CB7G1M1Ycw5pKRp6LXoJh6z2K8Z1hyJ1A6R+vYUgfH2e0YtDTj3lUJXsdpmJR14fK4ZpeY l3oKBYU9QNYHPM8WzdkAkDAF/mSZJ84dLY9NZl7H4O3IIicPTw1SVr/QkrI+woTrcJBWuB oDJIkC16rEk1B+K6J27+8DW5SzJmItpAi0F5J4KAw/gpFIxNDO87vV7Yk7YMmhNhsJojZu 7tPFIfPSsk85P+zALCHSYz+brkqd6150s1r7dkSpFSV4cxA5KPj/jKUqSSJGk86AJtR0QW f0QY+L1BK4OkrsLswGUYrfYpe46a53gSv/H6T9jt8omk8uvt4cQC2W4LvuyPRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uEHmnYtTGLcjMZBAF0Wsb8U5ysSdtbqpJi0QUnh1VJg=; b=mHVGH8+o03r57WMm/nrg1A7dAEE9tWBjDxAhHCbU5chOZA0IREplraLxnlBh78W/YKdJwG 3rFqmvMWPA5K6weY3D9YOQ24Y5fs+aCf/+s9MmZvIIzm6/owx0EuP1ub1cLQ99IF7/ZE7z mNVTs8Fixx/Ldy2ie+Af66oYwMPV5HEN6RCPuZaX9IgYzx2oHlJJaTw63LG5jy36h2EAkW P4DSBNmniSQZbDD2kBsPfF3OghNTFSzwERdTynl+7IIbmp6wI2cT0jsd+130W1N8Z2Nc0j 9JTnEsyvt04iqKhtJK8QIqTEtMFycpy+SFkThYXaNERvM8LSCcBLN0JpkqLNZQ== 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 4Sl8Cf0n9Nz5R2; Tue, 5 Dec 2023 18:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRgxq009586; Tue, 5 Dec 2023 18:27:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRgUY009583; Tue, 5 Dec 2023 18:27:42 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:42 GMT Message-Id: <202312051827.3B5IRgUY009583@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0019b7058a7a - releng/14.0 - pf: remove incorrect fragmentation check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 0019b7058a7acbea72da214cb393dd3c933e4748 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0019b7058a7acbea72da214cb393dd3c933e4748 commit 0019b7058a7acbea72da214cb393dd3c933e4748 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:26:28 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) (cherry picked from commit a47a44c0d69ce82f302b02da940538a99b47037f) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 0973c829644a..eab79387e867 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5316,8 +5316,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:27:43 2023 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 4Sl8Cg3bMRz53JPp; Tue, 5 Dec 2023 18:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8Cg2mHPz3ZbW; Tue, 5 Dec 2023 18:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RlItZYbnHtgS9Zg6ybA0Nn3JK14MdgWjP2+X+y8wQIU=; b=cPvvWTe0YWXuG8SGIQ7MYDrsnmuKdMVx01crNUQPR8063W/0c7g/owXbjUSKDf/CQt0GPy McXwLPQCUZJJILbDMn35YXmXi2mEkltvZ43DcoHnkfDlV8S6d33OKCICdQ5dCHMi6brHIS HRnM4tObiA40MmqeU3DsedND+JT10nSQZB1TC4hQH7BZSOQOq5ZoDS1RTKdW+EBHvBuMjL M46ZFKqISiGShBN5QLTYMrt6EwYxzikeCDiwhXkfpebFJk0Jp+Eh1thqkq02V+nh44ejRP pje+wAYRYzQ4V13W8xaiwyjRv8Zlcz+ROswILiXEKe0qlccxDjKselG9bCwjFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800863; a=rsa-sha256; cv=none; b=a1LbCIxFRniYvp0Dd8okjW+JYtZSpWoasjHwgwgDdfy/uFmfwrqcJMjYWXv+dNIejw1TpE NArxfcnk1N2TAgDlZfpU7jkOKxSKexnM9QT2jEaqo2FtbzkaRdRxTyMYDgOWFQObn6RP0Y 4JTtZXN+ruBCvo2rCpArFEQ+SSLeM4H033wXDH4sd7CDiJg6ovChUZtodFhUSRI5uEv5VL Ma/hunxU+A3K65DVTbOdCS4jajBU3/6axw+JhbePTq+aR2DPA/Uu4Ep3Ucb9et6h6bZosn MDXTk+nz6HcuGzIzAKA4ttVmjyQJejXgf4yx0awuAYK0rYa/mh4sUSh+mC9UaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RlItZYbnHtgS9Zg6ybA0Nn3JK14MdgWjP2+X+y8wQIU=; b=PBmdPyojGmzStgnyaN5I9HjlTDzaeIPWMDhlp70EV2hy4Y9zJizu4IWJ/Tno79UeWF350j 6a159HFAwqtIRQ3egLUjMiE55UuDquGibKKghRSxfv0So3ive7jOqaB3/6K5wWGcMdrzAj mDw+1hNaIzaOjRI55fY7ReVcpJHBowY3ClUaq/dk8RsHr/eAQsJc98VzbQ+t8AViUukFQT Fi17eB1NAcXpDEJJpu+wivBGhyIbUtVs9C2ZK/BdSePagosEhmiM7I9AerPFzo9KGjZGY2 QVhwpkomvhD2QTghPeoHPmYGSwgxV87RU5dDu9pKougC/08ISy5IK19LE65Acw== 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 4Sl8Cg1jY1z5WG; Tue, 5 Dec 2023 18:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRhDQ009640; Tue, 5 Dec 2023 18:27:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRhWA009637; Tue, 5 Dec 2023 18:27:43 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:43 GMT Message-Id: <202312051827.3B5IRhWA009637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 06497fbd52e2 - releng/14.0 - Add UPDATING entries and bump 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 06497fbd52e2f138b7d590c8499d9cebad182850 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=06497fbd52e2f138b7d590c8499d9cebad182850 commit 06497fbd52e2f138b7d590c8499d9cebad182850 Author: Mark Johnston AuthorDate: 2023-12-05 18:16:40 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:26:28 +0000 Add UPDATING entries and bump version Approved by: so --- UPDATING | 23 +++++++++++++++++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 996c5744405d..0af118a3f624 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,29 @@ 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. +20231205: + 14.0-RELEASE-p2 SA-23:17.pf + EN-23:17.ossl + EN-23:18.openzfs + EN-23:19.pkgbase + EN-23:20.vm + EN-23:21.tty + EN-23:22.vfs + + TCP spoofing vulnerability in pf(4) [SA-23:17.pf] + + ossl(4)'s AES-GCM implementation may give incorrect results [EN-23:17.ossl] + + High CPU usage by ZFS kernel threads [EN-23:18.openzfs] + + Incorrect pkgbase version number for FreeBSD 14.0 [EN-23:19.pkgbase] + + Incorrect results from the kernel physical memory allocator [EN-23:20.vm] + + tty(4) IUTF8 causes a kernel panic [EN-23:21.tty] + + ZFS snapshot directories not accessible over NFS [EN-23:22.vfs] + 20231130: 14.0-RELEASE-p1 EN-23:15.sanitizer EN-23:16.openzfs diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 3ba43dc02fe4..d78502b8c4a5 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="RELEASE-p1" +BRANCH="RELEASE-p2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Dec 5 18:30:11 2023 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 4Sl8GW6sHlz53Jgs; Tue, 5 Dec 2023 18:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8GW6Ng3z3d0k; Tue, 5 Dec 2023 18:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aK4oRH7SpZ8cbrxdhSQ7EN4CqfYmTUyEPWwkwgtWdGk=; b=DWgRsaezd0FjZ84+jehEGXUsnNSf11tD1xxP+g3FSUR+Jqji1HxwYsPswtJLdMnu1pdVXv 5CZUeqbuRyQjIZEnz3QL1qbsIJDI7jeWNEpoSobYK61D+r7NOBqJOwP1YPed6TMK4sNLgK Im7siNFqy1txldlEJoVpizYDBgNvkqw5JeTkYV0D0dI6kfOLf6f+UCyYUARM+km7ihfH1g n4zFKNA1guUEs+4aOsJxILZ73ujyFJQ/QOQmV/RhPAYl2IGYKy5I8FYj7piZrQ/QWQFU/f dItlP04METSAAc3lAp3uYxBLcSwKury0xIHJq/JmrZDAmjNOqwIpsrwDoRO6XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801011; a=rsa-sha256; cv=none; b=TgwhnPXbtKBpAsBFs60yLjhkKIRYYmUamo8bOwo/xXG1BTr5Lkr5mU2aDfgcB7U6TvCC+1 f9HIGojDLVzsMYDT3jngmnAnocB6JbU9pY4gFmmWfGvut3e5xucti5s0KoyW5+RcpOjUcH dkUJrjOXXi9cmp6QkClK2yfv7870a48tByHINeQSdxlvoCKJfLwePXTyNSuFtRp1dX3WTX YwuNlYz80rDfl7lljznB4AXkRNSOxOo76k/YhGVEJwEc0FbYNoWcWoS7osdkIr0kYfOTCK 2DwjDkVIa5fbhtwis6/kogzgg1E1ey7hn74No6ggjtakoVX+A3TuDabKnftecw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aK4oRH7SpZ8cbrxdhSQ7EN4CqfYmTUyEPWwkwgtWdGk=; b=klAfVYOFrHsv7jDrshc6Bnpb7/i8UaA9o5ZBP9cR8kuDI0RpUmU+gBWCr42/SIsvB0u6PE nhZONzIzKbvG7lti3TB8w7qZBOrko5GAkL7W7Pg6WauPtPHTDpzfEzMmoNFqgJUtKmCspL 3aWOH7SW+XO2uJLAAtAkxBebUJBc8N3NOeAAHYj//BiKp9wKKRdikjKTf9eFhxY9eV0iOS u37SKEao/XggxWv2WCHPttAeGwiROaX7Y2svBOMzVvGoaQ2vcDKjiFOhRzio4rVdm8ZUpx o++xqLg4spzocYYisoiPI7ojiFJFvA/P9wXJCw+ztaY8x4ZH72+LZ5P5oCqDVg== 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 4Sl8GW5NDhz5BB; Tue, 5 Dec 2023 18:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IUB6l015156; Tue, 5 Dec 2023 18:30:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IUBn6015147; Tue, 5 Dec 2023 18:30:11 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:30:11 GMT Message-Id: <202312051830.3B5IUBn6015147@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 45e256e24c97 - releng/13.2 - pf: remove incorrect fragmentation check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 45e256e24c976a55dc856907a57564cbc30cfb60 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=45e256e24c976a55dc856907a57564cbc30cfb60 commit 45e256e24c976a55dc856907a57564cbc30cfb60 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:28:12 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) (cherry picked from commit ee1d1e38fae65d045b113a7053651bbd7b780e1d) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index c9c0995cc4e7..a52e29bf3e58 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4563,8 +4563,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:30:12 2023 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 4Sl8GY4lvxz53JSW; Tue, 5 Dec 2023 18:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8GY09sMz3dG6; Tue, 5 Dec 2023 18:30:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztRWt9XBZX991oDkDnMOpkl5taCyBR37ltHgqjAVOo8=; b=cf1utNDZiNiCOJvBh5GiiYlvWu3n1AeFi/Zh6Ju2K6IiWIr72vVL3jQelKY7Zu+r+A0S/X MdY1C86PD3sv6lQ+rjQWORNl5tn+oj4dXww1ESdKVOAtb4dPAASVoksgeTvXcDnamqIqgp O8Gy33Q4X8ZxUXFKhse4fLEMvtbl5CEMXaxODhH0gcLD3DaF2cWWcomn026L1IuuVOpNUj DVAFFZqfSkE+Ud72Lh4gcHhhYJX2LP1O9V0P0jCd1bdoEz/HponcqIJLqJ2T7LmO9MsXZJ uW7bSa327vVos5xnr9ZQS0cghWNhKNlIfK/V8GJhc2wp+Xk3YacIXbb1tbE7Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801013; a=rsa-sha256; cv=none; b=YxM5OuNLotpb0hS6d2PT1AbVOiyNJrfD7dhaRkxmj3yH01+dq5M/fty0LkfQqZ97eL5pE0 uVHUBDtpCIoV5Jz6X/29qvfEMw3xMt0zNNN+EpQ4j8i98ydpnyAh8RKRAHk0lZzbBa7TW/ gSSdwVKms9Ussk50my1j3GY8o5aOW/kOUqdgcEQhWfqkad8urRKlbZ0iM+Xiz5ib95eGJZ hj3htBYNHFmPr5Ooxmdk/RyY/3i7JJo4IFGfCGIx1iBTdmnh75k1hLSQo8ZBIrbMNapyrk KHY/E+P9ZN9Tp2OBxL9mTKxeKUwClZNXkDO9OMRTEreF508zPdmeksvoU+uLYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztRWt9XBZX991oDkDnMOpkl5taCyBR37ltHgqjAVOo8=; b=MiY/Cq5mGYsMr8nMYoofid8Xk4idsORBKqlfzPen04UwmkcDwFRHAwcYNm1rmLqltGXsS3 9MTXyWDAhBWLCOrePhvv8JhsYoUjXUPefd0TaTcA7yngA1gtRlOmOe2KK4twot+SY47sgh IMwq9OtIbznR+kj7T5BJIc8DsYxt+RPi8O/754hwl+UqE1sGGuuHRZsyr2fnXGllNYGYPo da4kgnpJK7gtYuxFti2fspmdOCaHqFzu2lewmfbWPbyipY/Sb0rBpNHDqsy6qGahY/eUQH 3kCo6ms8dpyS0reAG/HRNw4sF6sU0pCBEMQw4Tbem4MzlM5qBl861o8HeACeaA== 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 4Sl8GX5zDjz55M; Tue, 5 Dec 2023 18:30:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IUClx015827; Tue, 5 Dec 2023 18:30:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IUCxT015817; Tue, 5 Dec 2023 18:30:12 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:30:12 GMT Message-Id: <202312051830.3B5IUCxT015817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e8439726cfa5 - releng/13.2 - Add UPDATING entries and bump 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: e8439726cfa5bd0059a65117447d8c4160bfed43 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e8439726cfa5bd0059a65117447d8c4160bfed43 commit e8439726cfa5bd0059a65117447d8c4160bfed43 Author: Mark Johnston AuthorDate: 2023-12-05 18:29:45 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:29:45 +0000 Add UPDATING entries and bump version Approved by: so --- UPDATING | 8 ++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 9e997c89f59b..d03d434a87d8 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. +20231205: + 13.2-RELEASE-p7 SA-23:17.pf + EN-23:15.sanitizer + + TCP spoofing vulnerability in pf(4) [SA-23:17.pf] + + Fix clang sanitizer failure with ASLR enabled [EN-23:15.sanitizer] + 20231130: 13.2-RELEASE-p6 EN-23:16.openzfs diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 9e399bc19d20..627c99e8b973 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.2" -BRANCH="RELEASE-p6" +BRANCH="RELEASE-p7" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Dec 5 18:30:41 2023 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 4Sl8H61MsJz53JkP; Tue, 5 Dec 2023 18:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8H54KS8z3dj3; Tue, 5 Dec 2023 18:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xF4dOphHBfITMG7bAtvmYjxx1Rbs7j6FEV67JP1VZKc=; b=j3n/t+OPMeGa0HfERtMja+iP1D3WH0q5BnIHb+Jsm88ZRvCO3Lq+2cHBi1DPs+K885YBh/ lwnuIyhn+zFQOdj+TVLtlqE2RblDYSQZkl92znhkcP9sBd1rg3V2VCLIrlmGmGxWpZ6j1N guRy6LRwnh1sXkpR09QR0RbC0YoMUhP4T2qF6g6aE8NCtGQwGYsQs2GPKE8f/E3UTjskaj 0t2H19ECQqQnZVQRLv4yKLZ1k2yqdc3r7sGdiyKzYraDdzxlP/fbPS9rgaUSstq51CujOy +/znjr2QX9fIubCzMcov5vUREccag7Wcf0Jn/VvTgXaqVvsdBaNkDEhuCjiCNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801041; a=rsa-sha256; cv=none; b=e53Q5fFjkXirA8VPT/glhG62mFedI08Ymcf9kfYCPhOt/12K2Kx6UdsTiMIaowMyojkuIG 85VkmB3LZQTRutXydyRfTpPHyn586uu7eaxhMEM6LbYluJAbIrQKxat+f0VBAvrb+8TY6k KGq4f82fYZ+M2lEaan4uavQdXXWErhgYDIQa6dFfX4SMl05Gv8noe0bbeNtIfIJL9DDy2G V6Xd/f7gyDbR/9nJVBXf+fZoWgXIBTBpMn6lcTIGb956MrUDrd+gECK/5lQp0/Us7btKNZ dOGhRvMKllrtlxCdeITKxlR0KPZTQaAhadw1aurAA+XPNzUZMrWSvBsFibUHqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xF4dOphHBfITMG7bAtvmYjxx1Rbs7j6FEV67JP1VZKc=; b=RA0lTfiOagLhlHTFbPyN7hQAd8mcSZFv2+OiibiqhADWAqaR+b2h3oj+/f5iCboCa7oeCe 4x6DRRWvb//gu0Yogb9fzBV+NXgJa/TYxsfTDkKfsHCkODxz8gZAuO19uN7X5yP4nyQuGp i4BoaAvaPhMIhZcO6L+sT8ywmGB0uP/c3hLq8DnWjW70mP2uMT1y2z3ONOaRKGYKipM76E Bm3n7YPuMK3OmQhWN7cwzrI0nmfzRT3uESjBYSL3F6uwDR9tGrTK8ANIl3cMj/A9031bL+ kAbLgk0QeM/XOlZ0i3wZfZUFvHQwqafTUEvyFmPiogRojgJfpCrT5/i/YHgcig== 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 4Sl8H52jHHz5RC; Tue, 5 Dec 2023 18:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IUfeS019077; Tue, 5 Dec 2023 18:30:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IUfk5019074; Tue, 5 Dec 2023 18:30:41 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:30:41 GMT Message-Id: <202312051830.3B5IUfk5019074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0415f0554b72 - stable/12 - pf: remove incorrect fragmentation check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 0415f0554b72b93a1986292d28f679594f6ce6a6 Auto-Submitted: auto-generated The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0415f0554b72b93a1986292d28f679594f6ce6a6 commit 0415f0554b72b93a1986292d28f679594f6ce6a6 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:25:58 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index fbc6c9640f43..b9fb9ce7b1e4 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4601,8 +4601,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:34:02 2023 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 4Sl8Ly2qZMz53Jbt; Tue, 5 Dec 2023 18:34: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8Ly2FVkz3dt6; Tue, 5 Dec 2023 18:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=djOApggBRE/l9ozMCW63pWItVvjAFDeHKKrdAZK1sBY=; b=ZdcnN+V4//AjUv6bjuuK0TuKoXCKw9oj0ZsIyk3NnEIXcWDav3IEyAAc7rQncrQgDxLc+s +92yuSR5e2EjxrQThLB5k5idUNVP7GH/xqQqjts2pxuqjfJwhqJ5ZPB/TkK9te/8eD3ghG IxpWMovV/wafUbESogJliHHY27wLKxLcbTWRer/77yHv3/NgutYuevpR22sVK3J8kdgaVI TYv0mVmhZNYhlOl0XC84FulX/8MnTyLef89RAuiwdB72DjIDndHC1HCJThHqffRR2s7TiH c+fbiDRPYB4L3hSIN8OW/BRexog1P64FRnqPdm60rI+xl/YO5RHrUqRBZVlfVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801242; a=rsa-sha256; cv=none; b=IxySFXAfDtN/mlDSkeui+X0XOMc6kgp56WvmwTpfVuKUquFJeiocV/VmuOIXp1pmk/dVEz zQHVPp7fZjuZHzu/yzKS2FPp0r6k6s65QT1AZekm90h1zDXf9eN1JcJq3l53XBB7EtcqYb CY/VN8QqdHfvmsb5nEMrpOcVqSAhtPQme5TyrkDQxlePsPF3HZB535i9BavtfZdoep6H95 KWehqS4ifrCD3S3vyfkUYfsIz+i1xZsMYEW/rXSMzOzCF5+TB2F7ZU8zdGvZdTg8iK9ahq EMFbsTmgdfDZvSGXHxrwWlxK8KzGfpcH6bh050rp1PCKevMKGNHnNBPQkC6BYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=djOApggBRE/l9ozMCW63pWItVvjAFDeHKKrdAZK1sBY=; b=ytRn7WcsBLS1HlIzwPKMffvVGM8+Cvj0IWoX4iqANP/LhkXmPwEph14OoVbRT93rA7R6gw FXGq1HOEcaCTwoOZ3FFPWjx0nFJNxZArXFpvdMwRqetAz41Z4xjFxO3RbEQB1TkbLWG8AD k07gGpWCfcNx6TQ/isLVVKIZ9YYoQf0Y+TMTihcMdfUsX3UiaAno3Mb62ndaCI/IpqXlkn 2ZLQc6sxTfDKciRcho1QMrCm+UsYBwRSux95jnFc63W8IIDHBSHZa+K+h0ivijx2FfqaDb VdNK2nWpOw75shDVxedqolyIxQ5oH8RmMze3muzUMy8Q9jpV0L27wZ8FKnYRLg== 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 4Sl8Ly1JMLz5XL; Tue, 5 Dec 2023 18:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IY2sh026080; Tue, 5 Dec 2023 18:34:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IY2h2026077; Tue, 5 Dec 2023 18:34:02 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:34:02 GMT Message-Id: <202312051834.3B5IY2h2026077@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1f8724dd18b0 - releng/12.3 - pf: remove incorrect fragmentation check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/12.3 X-Git-Reftype: branch X-Git-Commit: 1f8724dd18b0d57ccc74086040411bb1f0059be0 Auto-Submitted: auto-generated The branch releng/12.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f8724dd18b0d57ccc74086040411bb1f0059be0 commit 1f8724dd18b0d57ccc74086040411bb1f0059be0 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:31:14 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) (cherry picked from commit 0415f0554b72b93a1986292d28f679594f6ce6a6) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index dd4c49959a60..cd3403b1bd22 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4477,8 +4477,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:34:03 2023 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 4Sl8Lz4WHvz53Jkn; Tue, 5 Dec 2023 18:34: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8Lz3sgGz3f4f; Tue, 5 Dec 2023 18:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KsoWGZofMQF//9VKJ0mPzHfNpvou+pnIzAI9Y3ncuNw=; b=fOPE9P6CeXAHVhmLpVVmZrJhO94xFmBFkNaBij+plc68uG3AGMLapQArzw7HB68ke+BPf3 Sgv1uHyHjTxR5HfFXgLkSNy9wLWzW2ydAoyIN/TasCngpjS1Apa1HNkw8sXt/CUy2hPCH1 IPpBiSj/14PVmnMBGDCnegZtcKHo0BKye3QPeLe+9hpM9k4E6Ufrjg6AgxQ+oyx1X4QBbW 9luGKcScW0X6U67vIAUA612X/dxzfyP+h9QZq2pRJ+r3B+dWQhxtPsaJ0hB37Yv593uUGD qFCmGhUWiIr7CRX6qMpzPSKm1Ek6BY9fB0lSaMoE8VZszka9xouOZzZDtfTBTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801243; a=rsa-sha256; cv=none; b=pEquFwxiX09zlorLZietxq6tChEOok2pdoXZjdCVPzJKaqT2/PC1IIzVItMEb1spD2SLMh Sm8q6EZAoSZcbj1OZYFVw9EF1BLjXVe+bpS4xfeb285vsS5kPasbzxmGT3qdzAQYkEfCdJ nKddoZaLQZQMvE92tDlFzNHQz7SahYT0JfpwGGJ7zQKCdXaKbuMonTMkNMCA9IoZfgBiwo hHTQHPQSimwUHnbu4Uensdoa5tmDBPkEqRJtlREiVPLMA19Ldbw2bV0h1ZaEd6VrTRdP6J zHaZEqwNzE5/gRmytFMgmO12Wb+BR6le3xZEJSJSoIMGX/ox4FnB+qxebWM57A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KsoWGZofMQF//9VKJ0mPzHfNpvou+pnIzAI9Y3ncuNw=; b=IChbwNEYfPzoTaiU/isQJHZsKG8PvQkTTKF/HT68vEv3CR4BrgwiKqGU8PLKevy327k2tD +OUyIG5Q3O/rlCj8h6rZNN/OLHdjoY59F2A+zTKYWsGbf2cWZLgLePsMonoruuyE4EeS9F 3TVWw/czhhmsufK+g++lP8ZyzAk5ctVsSVR6yYydAEJ8hM7sh3kTbLJBi6QEkQMCMpgTyY 2D531mW3UAz/QtgyU77sZq2wvuScFbjeGFhaVo0loz7NO9N0OfMzOrCvNnxFG03/QnEbQK oc2j5h+teIi3uvvKcb4NXgdrYPun457x7qtkytlh0JbH0rJFgUFIa3rGDdoV2g== 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 4Sl8Lz2rm5z5XM; Tue, 5 Dec 2023 18:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IY3pM026131; Tue, 5 Dec 2023 18:34:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IY3Zh026129; Tue, 5 Dec 2023 18:34:03 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:34:03 GMT Message-Id: <202312051834.3B5IY3Zh026129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: da6997b05390 - releng/12.3 - Add UPDATING entries and bump 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/12.3 X-Git-Reftype: branch X-Git-Commit: da6997b05390d57773aa1bd66993942438aa8258 Auto-Submitted: auto-generated The branch releng/12.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da6997b05390d57773aa1bd66993942438aa8258 commit da6997b05390d57773aa1bd66993942438aa8258 Author: Mark Johnston AuthorDate: 2023-12-05 18:32:16 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:32:16 +0000 Add UPDATING entries and bump version Approved by: so --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 77598db595c6..5d0c2cfadb43 100644 --- a/UPDATING +++ b/UPDATING @@ -17,6 +17,11 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20231205: + 12.3-RELEASE-p13 FreeBSD-SA-23:17.pf + + TCP spoofing vulnerability in pf(4) [SA-23:17.pf] + 20230216: 12.3-RELEASE-p12 FreeBSD-SA-23:03.openssl diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 6170c6c193ed..f4b1406ebd45 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -49,7 +49,7 @@ TYPE="FreeBSD" REVISION="12.3" -BRANCH="RELEASE-p12" +BRANCH="RELEASE-p13" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Dec 5 18:37:51 2023 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 4Sl8RN0SmPz53K5G; Tue, 5 Dec 2023 18:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8RM6zLQz3fw8; Tue, 5 Dec 2023 18:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RMTa6ynPMyhCcM+PKmfzvaV+bki8mrHWrJB2NdN/ugg=; b=PYlRz0VXffXN/J2Wd/IReo9PG70CjSoDyXkZI7J/ZWHSUwK93D7u9BcmIu711pQqM1wjq1 CPvwbdNuJeU6f88mN1RPQ0PgnaSc9Q/DZ+15mhctbTmTGUnHYGYiTHXSfmvPc/hzKByUAE b2z6VdEW6Q+8QTvEbPC1F3MvEyXLuX+6TFkE8FlpwfdatQAGAubbjUvjF7EGolYd5a2ooO EVYTO3pGl5EO1w+XWZ6SSuwkUAOqHww872oYLpK8GSTR5s+qhGbSeVEJjE9JNOx3BNpyAT 32t15vdXAN3zOYl5vwTx8DtxSdOpvWR7MAR8YcecwCB4ZJbTp5O27TwpzBTldw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801472; a=rsa-sha256; cv=none; b=Xt6ZoLRw51/BgFzez3+TZDZDzatQTFuF79Jrn6kJOtkjTUgFbTqnHZ3AS/ddtfEN3YIFZo wRhyV5CEHACxxbXE29TPM5jefDkr3Uq5D3wCgvs9izZHMtj00/j0JHAe3dlyF3SqLI743f WYeap+XwJjJe27+LfyFdqdmwCVbSGtsqwYGURP7q1f7XlnDC2NU1egiPVBabVR1X8OahIm 5t9Zvdte+JCihkHdp33RyziEAgsHRozkCVJQHN301ucRO8cNW9nAuqDeS4cEgVuCQ/+Lhk qb0BjNbaU5K8NTUp4vro/qUUSyUzxIoJ/47zbGbtVbvt30bFlJ3bKDXCHn6DDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RMTa6ynPMyhCcM+PKmfzvaV+bki8mrHWrJB2NdN/ugg=; b=P3RH9QmeN6Y17E/KE2ywr0nwj4nZiJ/OiT3TeRqSU45CnIRGUmnIkNKxg3VZGu0ohU6JZZ XGxxJUHm1DYMMeTgARg7X785+owfH/HBSALnuF3/U5m7enSN8zSPuXulhS4yUZ01ihwk8z UJ/8XKWn6vuMb1dZeRinbuD0o9CsPSOSXcF1f8jPctALFj2cNI7vOyKKWYQV8xGs14jEjz SkSwNl+zTimFjynpT++xkYavNjA2zH9Smyjzm/2KS0bd8MIfXu/CCVaSqE/afPA+KiLJVM N6KmiFtN7p4tw57FNZ+nen3grbY20zUIyviNjf9VmkUK1Znef7VgsE1zQx+tRA== 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 4Sl8RM62Gmz5Tw; Tue, 5 Dec 2023 18:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IbpFp026746; Tue, 5 Dec 2023 18:37:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5Ibpww026743; Tue, 5 Dec 2023 18:37:51 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:37:51 GMT Message-Id: <202312051837.3B5Ibpww026743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f0327f9d86aa - releng/12.4 - pf: remove incorrect fragmentation check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/12.4 X-Git-Reftype: branch X-Git-Commit: f0327f9d86aa54ab6de42ca7694899b97064bde7 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f0327f9d86aa54ab6de42ca7694899b97064bde7 commit f0327f9d86aa54ab6de42ca7694899b97064bde7 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:36:44 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) (cherry picked from commit 0415f0554b72b93a1986292d28f679594f6ce6a6) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 0a6928e3d4eb..eeb4a2c1cc78 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4601,8 +4601,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:37:52 2023 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 4Sl8RP1ljMz53Jcm; Tue, 5 Dec 2023 18:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8RP14Jxz3fwc; Tue, 5 Dec 2023 18:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tfbDdfIh7C0Al7pSl54v1onSt29zKPx8yaX16q4fnoc=; b=Ft4DyVsUUushv79th/FG7rnT6u9QxwV2+EHcQFwm5ql37K7i3bJZSDniyBX5yNDcCRN9gS npB5+s3F+omJrI6m3HT+8T/HQRrgvgawNIY6WCGTSJxVa2d1NkCU1jVFynBG6y537egjlN n0AAsc8p65tTwwbPEYWifnfzM/y1Wtg1+/BKYoDs2kZpSVcwFWb1RChUmxuZQJxR2fMDTN zomKU67BLpPMNZivLgXaepCeif3tReJ6Bj5HWcZtLh2t5t8xQW5Ne6o9MvZK3gTHauxGOH 3bq3CG0VHhoLWlAw9IEzlkQaje+6Iri4saXGpb6rNaqsz2NkzaPqtAMQNiuFQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801473; a=rsa-sha256; cv=none; b=g8Km7I/vl+MfzouVDMqOucMMLNYrxdarCKBa+lfY/HgOmv7IEMmtuowihh2NTG7mRD2mfG mWd2CGcE/GqQaEwsi3Mm+2nsdvfBxbv6MggagQKk18U+1VQHNyXrG4Rd+4NKZm0jOrtPww LoK+b8Hh/cy3OwWFeKjwNwWAk0tOoDbOJ+20+HJw8IpoPSFV3slrnddA0JP7NHh4u2UhB8 3SGAawd1C076V9lm8BEP/uItSz11dOeDOfyGZBs6m4kbMlcx+yXgbpYjpzCE52GSk0OI3Q rTNNrTJSGvLLi8WHP80eWerbe92cOrWnvXh9OSON8mQEs+xyXqpVSpYwSgV5gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tfbDdfIh7C0Al7pSl54v1onSt29zKPx8yaX16q4fnoc=; b=LZv120FGmG7Ym/++221TnuoP95xChwEvjSrdUjo86r4zp0L4XymqiO3726CDJlKjh2UvgM ZRwJJ0/cmtKD1vjGNaZbsvnXTS2sEDHZrTe5BXApiFGHYRSAsc9bDfZxpyTEuHaM12E8Xj Db9IX2zeIc4Wfo7QVsciYIP8iYs3uL3o0vCGPnrNjUyUfOl8hPveR4jTgcHDpYSCjxWNfy QhY3UqAMDn5ByIEHvSr+OxWxqBEmHAAlmOWOs6IzouUd5gJWKEoE8IW6VHWvPnDD7zxLdd VThLBbBG6xXehg+lsHZS+8Iqawafp04yMq2MU8mdWzci6ZUEqJ5pv5x3YH9UDw== 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 4Sl8RN71gTz61J; Tue, 5 Dec 2023 18:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5Ibq61026792; Tue, 5 Dec 2023 18:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IbqZc026789; Tue, 5 Dec 2023 18:37:52 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:37:52 GMT Message-Id: <202312051837.3B5IbqZc026789@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b5ad6b488d9e - releng/12.4 - Add UPDATING entries and bump 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/12.4 X-Git-Reftype: branch X-Git-Commit: b5ad6b488d9e62d820fe90fdce4aee4f4d3d7162 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b5ad6b488d9e62d820fe90fdce4aee4f4d3d7162 commit b5ad6b488d9e62d820fe90fdce4aee4f4d3d7162 Author: Mark Johnston AuthorDate: 2023-12-05 18:37:34 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:37:34 +0000 Add UPDATING entries and bump version Approved by: so --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index b951bf259ed6..bc54cc1cab16 100644 --- a/UPDATING +++ b/UPDATING @@ -17,6 +17,11 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20231205: + 12.4-RELEASE-p9 FreeBSD-SA-23:17.pf + + TCP spoofing vulnerability in pf(4) [SA-23:17.pf] + 20231130: 12.4-RELEASE-p8 EN-23:16.openzfs diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index a264cb661e72..2abe405f83b7 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -49,7 +49,7 @@ TYPE="FreeBSD" REVISION="12.4" -BRANCH="RELEASE-p8" +BRANCH="RELEASE-p9" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Dec 5 18:55:17 2023 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 4Sl8qT4JjLz53Kyr; Tue, 5 Dec 2023 18:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8qT3nGBz4DLw; Tue, 5 Dec 2023 18:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701802517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ei7fyV7ExhekVk9cDOTBrsCp87c2QwGBuOTzdBgwNP4=; b=CVLwTHfRTwZcgqCD9E62qC+W/VuBi7YjNnFv8zx21wSsNYEt0yKhDjPd8NR5ytjnV9cAjD I8O3Aa+NduwERhYSNpUe0RVCF6UOdOFfY/lGsHyT4bLGNMRTv3OxpgNSb/C/78c0a/YGQ6 klgImrOgao60e6MLdUiHSczHtjVZB1/CcNSZ/bGU2A1jzq4Yt1Amay8wOmw6QGa1loVT93 CX4nmjkqpmbm0CuWt5tZehDAJTcaEAKMIRg/O//vVi2naYzESYYRO8sXnQK47QBV55X+Hy VwDOV2MFZDv71n0jSbmaKpKuhqyTTLh1YCKIMGPCjGq3jDZkwckKSVU8KmZhaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701802517; a=rsa-sha256; cv=none; b=KD/9+MjfdIsqvML3WtdPe4i5r+ZsV3FELhCGww46+b7e+ZsQvN5N92n/IXhRrQagpNOqxS hwbKO5VQCBSJnbOUCMIMq4mdCmaLBd13QoFbIJzhb4WSZ3dgLfY6qnsO23nBxiDBILgNNY KmlJB2w4N1APJT4LEobHCgHVqfQRPE876OZi994O/5+7BLhAEjZ8WWCAXf6C9smI4I6VQn JuGXN8Z0b1e9EQlIZhJ8hQyqlvhjZ8w1oFJ1L0kGcFqG25Yq8Pdi+CJpHyIkxyWvArifJH LK1TeTWP+XBfQw56CNGXQ4dOwmkClEHkwa1GUZMrADUcRriqwSqqs49qcg8ZMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701802517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ei7fyV7ExhekVk9cDOTBrsCp87c2QwGBuOTzdBgwNP4=; b=xMjK7HQE7YP1BhOhZlwQAgW3KzZiorpo0avh6xKMwJ0jJ3iYkijga9StQFuKNJSwURnmsR YTRXYTompJXI/GwGZOPyKYRK+rLI+RqVW4Ped9jATxoAYCzzhAgMCHnv904uldnwUhi/x/ XBBA+IsQJ3MRg3lXCem2arAu30c4FjK+l745tnLq5iwv8m+nct+xXYHC+GfUHdCUaqI96N kIvpzxnqqmGpOg0ThIxx5ZXR7oZpBN2buUV3znif0SU+HgzROPrjlXysU4n5VfVPECozBl lJG+14WTWCCgmvaYtH1j5eVMg9UTAfsETl8eFKmY7VA1+BsvZMCt4FbnERTObA== 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 4Sl8qT2lbBz6cp; Tue, 5 Dec 2023 18:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5ItHjS060091; Tue, 5 Dec 2023 18:55:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5ItHrs060088; Tue, 5 Dec 2023 18:55:17 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:55:17 GMT Message-Id: <202312051855.3B5ItHrs060088@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: 4c3aa00c0a00 - main - bhnd: Correct the softc size in the siba_bhndb_driver 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4c3aa00c0a0093c78f42d138bb9eef9b1a7cbb39 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4c3aa00c0a0093c78f42d138bb9eef9b1a7cbb39 commit 4c3aa00c0a0093c78f42d138bb9eef9b1a7cbb39 Author: Mark Johnston AuthorDate: 2023-12-05 18:47:03 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:47:03 +0000 bhnd: Correct the softc size in the siba_bhndb_driver definition struct siba_bhndb_softc embeds struct siba_softc and adds an extra field, "quirks". In practice, this bug was harmless since "quirks" is unconditionally initialized during driver attach and would have lived in the redzone of the softc allocation, but KASAN catches the out-of-bounds access. PR: 275515 Reported by: Frank Hilgendorf MFC after: 1 week --- sys/dev/bhnd/siba/siba_bhndb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bhnd/siba/siba_bhndb.c b/sys/dev/bhnd/siba/siba_bhndb.c index 5def2aad847a..57589537a921 100644 --- a/sys/dev/bhnd/siba/siba_bhndb.c +++ b/sys/dev/bhnd/siba/siba_bhndb.c @@ -285,7 +285,7 @@ static device_method_t siba_bhndb_methods[] = { }; DEFINE_CLASS_2(bhnd, siba_bhndb_driver, siba_bhndb_methods, - sizeof(struct siba_softc), bhnd_bhndb_driver, siba_driver); + sizeof(struct siba_bhndb_softc), bhnd_bhndb_driver, siba_driver); DRIVER_MODULE(siba_bhndb, bhndb, siba_bhndb_driver, NULL, NULL); From nobody Tue Dec 5 19:04:46 2023 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 4Sl92Q5WsBz53LH6; Tue, 5 Dec 2023 19:04: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl92Q54vCz4FpX; Tue, 5 Dec 2023 19:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701803086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oPGuwb8dUTF1IvumOiCRVy6NUfHAkl02b72dI18vkbo=; b=XyTvvh+NJxFk3fLA/IXN5RHUSS+LaaXAsXnpehsEafIQqorJQ7BwjyxNQ2xYVwiQ3HUoTi ksdgEF409/S1iHi4of55p7h3x5E/Yf9Q2vHqgOwyoT5p0JWz7XZZah22oQDoDX8pZAq6aj lUgHZpG4274kPxNJOH2gnVaXte+HGUYS0t2y9venIpm6uI2aK4Bkd4ZZvJtEcczaOptcJp 9MLKlUa0jU+3e7kcSzA84Hq+EZmHJ7oOwiMBcdF4hgCWOVkhUy5v9Nz8G3TBqHp+ibGFQd h4hryvQ4HvM+Ae3F1gOWHYAKNKd5lznfY/bFFq80mkVdWGaApPlGkiwCZCQStg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701803086; a=rsa-sha256; cv=none; b=PlAC/Ajl8owRnaGy7wwfqmlWYKx0+ae6faF4EFFucQ6MWqpFNkAJn0+jT483Gg7zjXPkoM Z/n6lHVnkxZedXnlE0FpA/pqmDLP6y/tmDWvo5dOHgJAfX5aNbJFr8QFl27xTDuZHarQDc eAPWtFfNbOVb2zx+Z+4TcW8YNhMd26OgkadsASeyX2lYy3lOG9nQgrxihRlhO0RKeyo4EO 7UhPiWYwJww7XfOP/+nYU+9DzVgtpPVprhk41btWoG//T/MN1cUAVEo6kx/vLB6Z/AaNxU cM0g3JOLIMxA0v2nZrWONW4hYpB2SlR9IIMEdNY5ppHrabGbjh7moh0122dc6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701803086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oPGuwb8dUTF1IvumOiCRVy6NUfHAkl02b72dI18vkbo=; b=ydbfXo4p8WCKaT2D0P6va8dgXr/kQsVjAb43b9g+XCRFiGdM0oI2bdtrJHYjSa7FiT5vp1 u4CnauoE1r+FFll+QEt7c4AXukcWvcj0/0vhmbRF2ONG/GAQOmi7koVtU70wkaSHMjbmJv arYq+n2HVF6kdpBWOCjt0XlhFU7rjfIu4Bdn++0MjfBczAhOLj2BMxHuYRWkwVaTgM4sQQ 0xgTBYDxEU2IRPPlyevyHL0UcUejnVYcKCcCiVRqRCzPTZJgeS1Vskw1A0Hkot/v83yogs Iin7ueLyOSBbeUokhAX9T/vARLokBEYIOKFyZR3zo90jjKqgF7cdS/+2c5MZjA== 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 4Sl92Q47w4z6yR; Tue, 5 Dec 2023 19:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5J4kS9077245; Tue, 5 Dec 2023 19:04:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5J4kbQ077243; Tue, 5 Dec 2023 19:04:46 GMT (envelope-from git) Date: Tue, 5 Dec 2023 19:04:46 GMT Message-Id: <202312051904.3B5J4kbQ077243@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 663e4fa38fe8 - main - Cirrus-CI: fix git usage by build user List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 663e4fa38fe835056b24058acc6e43e4a15a84c5 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=663e4fa38fe835056b24058acc6e43e4a15a84c5 commit 663e4fa38fe835056b24058acc6e43e4a15a84c5 Author: Brooks Davis AuthorDate: 2023-12-05 19:03:35 +0000 Commit: Brooks Davis CommitDate: 2023-12-05 19:03:35 +0000 Cirrus-CI: fix git usage by build user The git checkout it owned by root, but builds are run as "user". git refuses to operate in such an environment unless the directory is trusted so make "user" trust it. Fixes CI after 99b8c0c35b0fcc633649209621243d678a13542a. Sponsored by: DARPA Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42903 --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 18417b52e6c9..8e14dc9c0305 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -80,9 +80,10 @@ task: - gpart show - df -m - pkg --version - - pw useradd user + - pw useradd -n user -m - mkdir -p /usr/obj/$(pwd -P) - chown user:user /usr/obj/$(pwd -P) + - su user -c "git config --global --add safe.directory $(pwd -P)" build_world_script: - su user -c "make -j$(sysctl -n hw.ncpu) ${EXTRA_MAKE_FLAGS} CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildworld" From nobody Tue Dec 5 19:04:47 2023 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 4Sl92S2fVtz53LF9; Tue, 5 Dec 2023 19:04: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl92R5qTZz4G2m; Tue, 5 Dec 2023 19:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701803087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cVwK9C6+wTjetB0WeST4UWLRjumM6Gjv3JXV/WVlo18=; b=CpymNlvW49Ey7h/hyvYXyXlWZ54DM2x7ZCoRBc1QsuZ1B1R3+2SrrcYBlU4FgNdKZbgJHA KrGjjMIOIAgtw/1duQ7nHjfkKCIfREAkkaO6bJwtf3Xvjawv77Gw0EwLf0turDHbFJPtj+ dVFXBX0gQIcGlY4UdI7DCPCSmD1RpY2psGRveRvcjI/9b5s6iPXPJey+Mc87p+5PWm7ACJ BifVU+xoognZda0GLYjV/bz0NpXqkJwuCe/2eB9Rx2pcb2bfJUr6zFGX/FK0ACN2Fwi8S1 q/7ChXnzD42ASgPCQRq2fqrwinIGYPMaXxF7dR6pz35QA3n/R4Zvq+7hiODlZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701803087; a=rsa-sha256; cv=none; b=F6FKISAHID7Li/pMeI0N6TA4TmRhW9ET9dptpyn2oP7VWI9VEB+DLFcD3my2lS/ZpAfbkB 9M97UYpkHYWfjC+mcg2Ws8vb9asY9/aI2fn/y6XxP9HBgX4iR/uBiqupnBvsNSDLX7HiYA x2s9B71UI9dzml5Tmbh/NbHGkhqob0sC06ZsBOrBeTu8qEgf+Hi54uIejqRhjAlHeNR7UF aTU46+tzJ5azom+R9aY8ON5/5sSTp0ZOKshyZ5rp0NzzE5EiUNOMDthzG8tHOCUooF/+in GEzwD4cuE0kvR5ZqwbwWfqbM1mSVC2vUoFXnQ3SlivOKBTTi+B4KWNWPIUOllw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701803087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cVwK9C6+wTjetB0WeST4UWLRjumM6Gjv3JXV/WVlo18=; b=UOXxjANcfhZbagHbeTVb+AQFnNF+glzfNqqjcGq2z6/daCL/RdgLPbt8MFhuN2VjUyLmFn dtX8+ZvgjpIruyjzB2V5//GrVONxdNZrcleZAIFq8fUawVLbDctYW7NtiUZXxpNwZj5d7e wJmZ+6MU8UKHUvwVaalSwM6gu2Q5Ue7sN5y5XS7lECJS76GgrXPtrZCPC8zl7q1+uc1qL6 RQ+mZtbSjlj+YI88yfUWsrdLA+ocQ4jDVIKjRARKk/a/SHiyoQl0fjxOCAgY4EIIW7pLK/ SNKH5eA8EIPfUkpR+rkf3AV/AYqTEB+Oyn6LEcis6NxhrP4hNLdw9ybLNEmewA== 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 4Sl92R4tCDz6yS; Tue, 5 Dec 2023 19:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5J4lVf077290; Tue, 5 Dec 2023 19:04:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5J4lNg077287; Tue, 5 Dec 2023 19:04:47 GMT (envelope-from git) Date: Tue, 5 Dec 2023 19:04:47 GMT Message-Id: <202312051904.3B5J4lNg077287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 3c097b06a717 - main - Cirrus-CI: forcably upgrade pkg to latest List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c097b06a71715ec9ae86430ee94e25e954a1e36 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3c097b06a71715ec9ae86430ee94e25e954a1e36 commit 3c097b06a71715ec9ae86430ee94e25e954a1e36 Author: Jose Luis Duran AuthorDate: 2023-12-05 19:04:04 +0000 Commit: Brooks Davis CommitDate: 2023-12-05 19:04:04 +0000 Cirrus-CI: forcably upgrade pkg to latest make packages requires the latest pkg for now so force that. Differential Revision: https://reviews.freebsd.org/D42908 --- .cirrus.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 8e14dc9c0305..3abf6898a66d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -75,6 +75,11 @@ task: install_script: - sh .cirrus-ci/pkg-install.sh ${TOOLCHAIN_PKG} git-lite + xxx_upgrade_pkg_script: + - fetch http://pkg.freebsd.org/FreeBSD:13:amd64/latest/All/pkg-1.20.9.pkg + - pkg install -y ./pkg-1.20.9.pkg + - rm -f pkg-1.20.9.pkg + setup_script: - uname -a - gpart show From nobody Tue Dec 5 19:30:48 2023 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 4Sl9cS2VkCz53Mdx; Tue, 5 Dec 2023 19:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl9cS238hz4HsP; Tue, 5 Dec 2023 19:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701804648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dmernacJYMASDCi+cayC+hccwCZtkV3UWGGKu8fbosQ=; b=Z/aHxPekXxOlrXuTcayoam46DT5TxR21KIXaHv1ScWiqI5wMLSaVVCXr376CGWChVTiUHK ozk1baay5NCXkKghLzOLtUGTruPUjnqusvA9/pzcUlfP04r1Xcrnz0KK33OP3av3+6YjS0 DoyvlsPRWyC+cieV9c1dZ//ZGMHWkaan+c7zZ5wUFdu2mnh5FfUQKHeaGAPNGSvebSH0cc E13P8M+glWznoFa6hogEZGWPRsVz+dYP8Fj73GhbPdeTP0MIknH0GLeTr0tyHEBSS1Q6oj wxevDrDt50/OBom5thbTu0iFbfX5VLuB1xJ9ZrUZau/wPkvAwhQAWpzdBmzJ/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701804648; a=rsa-sha256; cv=none; b=K7ZJvSwOoGIfW60i9JXtgF22IeVlyZ1VwRQEMLiQySCcRvVzHFY1mFTHbuTJA3Zi4aIgHn 93slct7N6t6z21pp8k4JRHmqYkh6vVSqbujDc/LxAUPUA05Ad1om3ZkHKOYF+swXltQ27Y ieI2U+e5TMX35tzm/OQk6Lmt9KNzS9K4apInmniTsT2Es3GsdqOYufKDScwFRaJZzcrlEe ElioAERPH+nxdRYi0tX9/5eIaabs8K3UUNA84MkMbJU+eiujZBz4ZTx9Buy95z7EofGnLi ARZaj4jgtT8lHE7IhJRHVmdj9BmMYTuJphnLkuRYnvLAdzAfghQ4gEaW1BMMmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701804648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dmernacJYMASDCi+cayC+hccwCZtkV3UWGGKu8fbosQ=; b=U0iHZiir1UGOuni23nazhAEWfNd6gzCm7pASMIsExFUpH05D9SpTkMW9XqkHJlS+Gm6My2 dWzhmEaUOxjWht/5/SL7SGCgUldSwi5b5ODUj+DpNW0hBA6FXZhRNdOkB96B1mI71GpiE6 9z01uVolTQf1UkC6sXKMnqUm1ETf2oq/n8cSnh60j9sSuM/gBxWZs5qIYxUPj3Gaviylnh JGCDBfpjxLQLlHuUTl8/JrUS4eORHhSZYEXb6bjI8/DARWJ9yNOrHQpIdomtA3uYqT0LL7 LIdGD6aswSm9hQ7RoOPWlZUJjxGI3CFONND6iwOmNLsVr03qn+k4Fz0wkxipyQ== 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 4Sl9cS17Fyz7fb; Tue, 5 Dec 2023 19:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5JUml5020439; Tue, 5 Dec 2023 19:30:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5JUml5020436; Tue, 5 Dec 2023 19:30:48 GMT (envelope-from git) Date: Tue, 5 Dec 2023 19:30:48 GMT Message-Id: <202312051930.3B5JUml5020436@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: bd79cafe70c8 - main - riscv: tweak SoC-specific conf organization List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bd79cafe70c8ce510110ba6488b0705bfddfdd33 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=bd79cafe70c8ce510110ba6488b0705bfddfdd33 commit bd79cafe70c8ce510110ba6488b0705bfddfdd33 Author: Mitchell Horne AuthorDate: 2023-12-05 19:28:59 +0000 Commit: Mitchell Horne CommitDate: 2023-12-05 19:30:18 +0000 riscv: tweak SoC-specific conf organization Hide some lines from the main GENERIC files by mimicking arm64's model. I do not have any intention of creating a std.riscv or SIFIVE configuration file at this time. Reviewed by: jrtc27 MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42910 --- sys/riscv/conf/GENERIC | 18 +++--------------- sys/riscv/conf/std.allwinner | 7 +++++++ sys/riscv/conf/std.sifive | 15 +++++++++++++++ sys/riscv/sifive/std.sifive | 2 -- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index fd871315b27e..6fcb3f1a78b7 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -142,11 +142,9 @@ device vt device kbdmux # RTC -device da9063_rtc # Dialog Semiconductor DA9063 RTC device goldfish_rtc # QEMU RTC # Ethernet drivers -device cgem # Cadence GEM Gigabit Ethernet device device miibus # MII bus support device xae # Xilinx AXI Ethernet MAC @@ -161,9 +159,6 @@ device gpio device spibus device spigen -# Power management controllers -device da9063_pmic # Dialog Semiconductor DA9063 PMIC - # Uncomment for memory disk # options MD_ROOT # options MD_ROOT_SIZE=32768 # 32MB ram disk @@ -209,18 +204,11 @@ device bpf # Berkeley packet filter # Flattened Device Tree options FDT -makeoptions MODULES_EXTRA+="dtb/sifive" # I2C support device iicbus # Bus support, required for iicoc below. device iicoc # OpenCores I2C controller support -# Allwinner device drivers -device aw_wdog # Allwinner Watchdog -files "../allwinner/files.allwinner" - -# SiFive device drivers -device fu740_pci_dw -device sifive_gpio -device sifive_spi -include "../sifive/std.sifive" +# Include SoC specific configuration +include "std.allwinner" +include "std.sifive" diff --git a/sys/riscv/conf/std.allwinner b/sys/riscv/conf/std.allwinner new file mode 100644 index 000000000000..a781164d0632 --- /dev/null +++ b/sys/riscv/conf/std.allwinner @@ -0,0 +1,7 @@ +# +# Allwinner SoC support +# + +device aw_wdog # Allwinner Watchdog + +files "../allwinner/files.allwinner" diff --git a/sys/riscv/conf/std.sifive b/sys/riscv/conf/std.sifive new file mode 100644 index 000000000000..ab20b235c44c --- /dev/null +++ b/sys/riscv/conf/std.sifive @@ -0,0 +1,15 @@ +# +# SiFive SoC support +# + +device cgem # Cadence GEM Gigabit Ethernet device +device da9063_pmic # Dialog Semiconductor DA9063 PMIC +device da9063_rtc # Dialog Semiconductor DA9063 RTC +device fu740_pci_dw +device sifive_gpio +device sifive_spi + +# DTBs +makeoptions MODULES_EXTRA+="dtb/sifive" + +files "../sifive/files.sifive" diff --git a/sys/riscv/sifive/std.sifive b/sys/riscv/sifive/std.sifive deleted file mode 100644 index 261085d98cff..000000000000 --- a/sys/riscv/sifive/std.sifive +++ /dev/null @@ -1,2 +0,0 @@ - -files "../sifive/files.sifive" From nobody Tue Dec 5 19:30:49 2023 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 4Sl9cT3j08z53Mf1; Tue, 5 Dec 2023 19:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl9cT33mfz4HVl; Tue, 5 Dec 2023 19:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701804649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JIr5Tv6FkHq7zzK8D7zYK4sTA5oN5/849aOEYzG6iV0=; b=EKdBH9rEvxNz4uh9Z82asb1S+3nxXExLmYZvC7OF6bJSZ2zxlRZdTnoncikDqeTCofE7v9 0Dqlfy9d2VJLwsZVDxs+nVfJgJi+UbLqIRyn6zx3EEX1laFI7MAKDNSkVQReCe6OzwNBYi QZGee6Xb3N4OnAaFCTjIenIrfc87ttJCHckfluu6EYkHur3qgPuHCwLiaIUEPa7AuiuZXL bGnwapz7o41BAr94vJPY9PmJ5RWyBv51zneT9w//4kum6L7Enx2dJiH0VZfCk1HfS/V7fG KEzfcYXXTk7zd4yKjKkZDf6zQzHe1xSWK5KEHrk8bBxpDAZUFR+NYAj2UPwWqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701804649; a=rsa-sha256; cv=none; b=Atpb4enD3izuvRXfyQLSBHQRMI+RhzgbbnnJIpVX0ux4YK7ZGFfcDo8dXJNx5c/YpvfBT0 ke8x/2as0Y4YS7Y8fdCctz0V5qxMPPaWeYQsYCa8+hp8rK713xSYtdySKhYB65nnEqvQ8P RFF5WE5QZHQjhgktoZxZzU2W8e8XW3ebBCFM4r43eQEKw9O5ePzu8uBFrLUcqYwMejiec+ C2L+HTwj75dC5yroth0/7vXTtmXy1K58N49ALQcEv3ealEYiXj38lCeXZw620MfVtUtvAA GERc40gtptV48Hy7PTEYkjlRsqdmhP74Ddmvp8NX1x3wHvfjMZeIeniIXGSJUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701804649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JIr5Tv6FkHq7zzK8D7zYK4sTA5oN5/849aOEYzG6iV0=; b=cohFjWCdZJdL2gbPmmA/Vyrkotz5Zv6lX/13/lYn5dAN0WtOS2OR3jBQJJuvc/RVM+L8G0 SfCVsVZLWUs06yzgx0DxfxA8F0iZy+B4AufFWqH77CYycewL1ELG0JhLeeO2oaLI0E/V4w 7zTl850TGQpfM4+lbBQy6mkbqI55kO0VCi7Js9a/zUpBLAvbImsqmQqmqh/3qf5oz7Wvty sUrTBvge1iRqiWi6CGAkKfgtg61XIGI3ZkdGzwlH4qVAb+NgSks/0szMM9ooQmQ4ECr/eF z6n6r2NlnVmvxleZ7xR3tPbgLJjmn6tE2n6CdxguWxzmCgYrVqgVaNa/SMAF3g== 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 4Sl9cT26PFz7c8; Tue, 5 Dec 2023 19:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5JUnkH020490; Tue, 5 Dec 2023 19:30:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5JUnrA020487; Tue, 5 Dec 2023 19:30:49 GMT (envelope-from git) Date: Tue, 5 Dec 2023 19:30:49 GMT Message-Id: <202312051930.3B5JUnrA020487@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: a779fd0658d4 - main - riscv: add more dump features to 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: a779fd0658d4a4f032a2ec81354f3367ffb8b86a Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a779fd0658d4a4f032a2ec81354f3367ffb8b86a commit a779fd0658d4a4f032a2ec81354f3367ffb8b86a Author: Mitchell Horne AuthorDate: 2023-12-05 19:29:31 +0000 Commit: Mitchell Horne CommitDate: 2023-12-05 19:30:18 +0000 riscv: add more dump features to GENERIC Match what is provided by default on other architectures. Reviewed by: jrtc27 MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42911 --- sys/riscv/conf/GENERIC | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 6fcb3f1a78b7..fe067f62c585 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -185,7 +185,11 @@ options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default # Kernel dump features. +options EKCD # Support for encrypted kernel dumps +options GZIO # gzip-compressed kernel and user dumps options ZSTDIO # zstd-compressed kernel and user dumps +options DEBUGNET # debugnet networking +options NETDUMP # netdump(4) client support # Pseudo devices. device crypto # core crypto support From nobody Tue Dec 5 19:30:50 2023 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 4Sl9cW0WMZz53MlB; Tue, 5 Dec 2023 19:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl9cV419Wz4HVr; Tue, 5 Dec 2023 19:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701804650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K5IWo9vEFfBLY6g1ZuyvNwIPZEptnd388hKyyxbQfEw=; b=kyRavGV6IYBv/vbG8UxW9jbcTZZwSWyN29IGYi3NWC5633biTgdF73FqSs9qFPmnabOPQA YZpU0uEz1v1CNANTV35jQif2AGYPEgW5uaFr68HRT0STmSxYufJuGisZS8WU24vT4l7sj5 UOKupYr6kjSd+oDjFtQVR2DHwzmRaXb9FAwk48NrdnnQ2wgSMtkzrmbsSbAGWKvLQuCw8q fIy7LU/DlezZd46aczkIoXgsU4X8SykyEIowPMEG94q3f9EV1VEhV1q92ADn3n2S0a7ERq 3wDEilhjZiguPrtv/TfPwqpVHxEmOFRcg0hSzVwabj0OQjZ48YWneH/n27DfHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701804650; a=rsa-sha256; cv=none; b=J9m+lpoRx0J8PGM4lzXwo5EOcMiXgryF/MSI1VnFWnIpP+wcPxhgCbvye/a/WjZ1so59TV i4E1504xSOGAdloZoW441Wni7zIKH6DTojbly7Xlf+OvkVfNGVpQSJ5ntjt+vNLU81cUs1 IYKIEdYrfFAdl/fcD1BnafTqj5puj22mRxc9COt3/aXjr/xFMy+WhMGKWJ8bDbPp6AB1pX 3TkTtfud3OYU+yJVAohxL03CX6ug8wbKJWb4MSGv0Vy3Kx/s9x5AH5uW5HHnFi11GNeXjz UTXvksyi83lk4L0C+z9Np06evCpwCdYcNGYM4H09odktjAo3tmYIzIrgQSPpdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701804650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K5IWo9vEFfBLY6g1ZuyvNwIPZEptnd388hKyyxbQfEw=; b=uZXAosW7njOBD5VRARrhCbYuTQfUwEHOr1LQYjs14FdoAIX7btYY6VUQ3dOgQNHgSRSQb7 SPDyhUmRCETu+bH4iZ8z+kgZB1M0/WCVHf0mbYyAS5wQZOfRwluPYJB3DdiX/aoTXWRXlB DdSwpU4L6a5nOHxALj+/lzp9kLaB/bJhwivOVL1MDou+MkH3CwhGqSVSQexKfKLgcTz2yp U8OfJmR4m7q7GUVTafXs+3EeorpXrA8O8ymsYgKf9RTvgqxPrbSUfRAiwo5hLa3pS58e3p BVtd1KR90z9qnP4mZwp214E38MXJ6Dj+eX9Pb+l8iaGkx0qaetS4e3Xb2v6Odg== 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 4Sl9cV36TKz7Rp; Tue, 5 Dec 2023 19:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5JUoJF020540; Tue, 5 Dec 2023 19:30:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5JUoMR020537; Tue, 5 Dec 2023 19:30:50 GMT (envelope-from git) Date: Tue, 5 Dec 2023 19:30:50 GMT Message-Id: <202312051930.3B5JUoMR020537@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: e08331333fef - main - riscv: remove commented lines from 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e08331333fefc44461681db9ff239b7972c05744 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e08331333fefc44461681db9ff239b7972c05744 commit e08331333fefc44461681db9ff239b7972c05744 Author: Mitchell Horne AuthorDate: 2023-12-05 19:29:42 +0000 Commit: Mitchell Horne CommitDate: 2023-12-05 19:30:18 +0000 riscv: remove commented lines from GENERIC These are relics of development, when static compilation of certain functionality/parameters was necessary. Today we have full module and loader(8) support. Reviewed by: jrtc27 MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42912 --- sys/riscv/conf/GENERIC | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index fe067f62c585..992b0c927766 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -123,15 +123,6 @@ device umass # Disks/Mass storage - Requires scbus and da options HID_DEBUG # enable debug msgs device hid # Generic HID support -# DTrace support -# device dtrace -# device dtrace_profile -# device dtrace_sdt -# device dtrace_fbt -# device dtrace_systrace -# device dtrace_prototype -# device dtraceall - # Serial (COM) ports device uart # Generic UART driver device uart_lowrisc # lowRISC UART driver @@ -159,15 +150,6 @@ device gpio device spibus device spigen -# Uncomment for memory disk -# options MD_ROOT -# options MD_ROOT_SIZE=32768 # 32MB ram disk -# makeoptions MFS_IMAGE=/path/to/img -# options ROOTDEVNAME=\"ufs:/dev/md0\" - -# Uncomment for virtio block device -# options ROOTDEVNAME=\"ufs:/dev/vtbd0\" - # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. From nobody Tue Dec 5 19:30:51 2023 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 4Sl9cW5h76z53MfC; Tue, 5 Dec 2023 19:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl9cW50h0z4Hr0; Tue, 5 Dec 2023 19:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701804651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9pGZb02LB/VyluxMovtjPV0NcDJZPJQWZ2VdNApye7s=; b=fVEu1FG4+qKhu/qlETU3d1gHXJTEDNcvHAy+KoFw2SrYh1maR0vHhf64Ag0m6ryN/YNr/N cxs8T5MwO1v2GMIOCxspNPvL3V53w74Y115U5TdHhXu1pbOoNikVGGg9keJV5hXvF61/R9 +TQBMML5pSd3EWj6EuzIGcWUJJTW52tiIpskM1Ef+gzyakMQf4bLKghSMw9BzMRLc/6+jj Y1C58Dfk2mAk6EdmetuPtUddVjyg9vjdzE5bzVJbNHRg9bl2pqNu9Sb0uXfufB9qRPlfTH 38N0cX3UnF8Y9apVC8UU7FW+tmL9RfdcLvJzAvZeGhK8mHd+s+FQVqnpSxyZBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701804651; a=rsa-sha256; cv=none; b=XwLwKHyk6xSfiEVGjwHIuAD3mTvUF1c2SuGSLD47vemSTklVvL2B2Ph9QRQMFNn/DvjhMq rrWJHykDPPh4qnF7Ufa75VQSXSIZ3tEgDIucbwQ3zfD+MM4iQb1B+uTK2mwgdYvAC0DiB7 5WqDJ2btAwwHweH+mWmPOjcGXyzFo9SF4XcpYyRzjOPQKCnVImR/G3oauopr7VhgVYrAkG sPphAHdQ6poVjP2+XMehx3YWaIDO352ZgSiH0Yzw1m3N5nwdFajIgycFh+dIhrGYldxiZ3 oY+9wQYXf2Trw2aQcx5l4eptJTzOU5ZTckyXjV1U77AfheV72Sr7kJNZ2KqB0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701804651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9pGZb02LB/VyluxMovtjPV0NcDJZPJQWZ2VdNApye7s=; b=bJNyDUIMN1TP/v5ChraI0/raX7gnnK/n0Tso1cp2fhdGO5nzTjrItv4TtezWGr+9MC4hXN nTeFQboKZq6/0TCQ+ftXqyXbJ9pqBtCpDREnf0owkt87DY/2Md/vgZuE7YBCiNwp7MzsF4 Q0LbQwbYqs8VKae+k2XK/ezUIGbHkvGlnn1MpqpM96rRY3aHLRt+OiMG2gtVYMpZvMX7Ka 5u9WL7on+tnGcg19XSHXvWSo4aPi5qUqgXBEXLrZTxKTxmszMfVcgyZrrnDC1Mp8mfxOP9 TKEXrUCcDPPfY819snxy7z64qIo1OJQMrVf1FhooAI/8Dztr0kx5MtuX9rWxWg== 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 4Sl9cW45s8z7Ry; Tue, 5 Dec 2023 19:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5JUpe8020588; Tue, 5 Dec 2023 19:30:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5JUprq020585; Tue, 5 Dec 2023 19:30:51 GMT (envelope-from git) Date: Tue, 5 Dec 2023 19:30:51 GMT Message-Id: <202312051930.3B5JUprq020585@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: 4a7639100eb6 - main - riscv: add some more drivers to 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4a7639100eb650cbdf53b95aa85b25273d92f1a8 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4a7639100eb650cbdf53b95aa85b25273d92f1a8 commit 4a7639100eb650cbdf53b95aa85b25273d92f1a8 Author: Mitchell Horne AuthorDate: 2023-12-05 19:29:55 +0000 Commit: Mitchell Horne CommitDate: 2023-12-05 19:30:18 +0000 riscv: add some more drivers to GENERIC Enable phy and regulator extres devices. These aren't needed for existing SoC support, but are of general utility to FDT platforms and enable out-of-tree work. Similarly, enable sdhci and mmc. Reviewed by: jrtc27 MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42913 --- sys/riscv/conf/GENERIC | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 992b0c927766..b6c7bb54050f 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -83,6 +83,8 @@ device rcons # pseudo devices device clk device hwreset +device phy +device regulator device syscon device syscon_power device riscv_syscon @@ -183,6 +185,11 @@ device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device firmware # firmware assist module +# MMC/SD/SDIO Card slot support +device sdhci +device mmc # MMC/SD bus +device mmcsd # MMC/SD flash cards + # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! # Note that 'bpf' is required for DHCP. From nobody Tue Dec 5 22:39:18 2023 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 4SlFpD4MMBz53YmR for ; Tue, 5 Dec 2023 22:39:32 +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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlFpC6Fnwz4F3j for ; Tue, 5 Dec 2023 22:39:31 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com; dmarc=none Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-40c18e9d7c0so1073665e9.0 for ; Tue, 05 Dec 2023 14:39:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701815970; x=1702420770; 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=pmgGZa3EG2OQWvvVjHMd9yR/8mzuHO/8XLBzbVl6T24=; b=Sfm1HQmSijPshaiae6J730KeXN8zpWnyEY9a+CfPHvOLgrJ7Gt5BujGLwxlnN46VXe QhTihs6UDAdTIKnNJyvMAUkDbsVfFupfjAMgcl7/BXO4Bb8r0vfLuofxYH/NG8Izc1wh b5Hn5AYNjzj9cipLsuauUX1XSmeDC1a7CmUZYv+xAswj3BnWDrxY2UDGGM9LopZ8qjR6 DvjclZUZNs1htD5+JHclgtmjfSdaI+Ay1jIEu/PPRdKZ45DTwnfkJP3odOvUHJoEHlAx ZyAk40/oGEzX3CY78UY+7srwxARaZFxSmedoopAEkeHxOx5Yl0J0OGryyDlVY/Wuixwq 4DuA== X-Gm-Message-State: AOJu0YyYg4YVHgSFdHws0xBuD3+8hABnCT3uAChBfAHSQoSj8knhtYo8 6Rf+j4gVwt1VUYKs80q6s49Pkw== X-Google-Smtp-Source: AGHT+IEH+gNGXKwo+8mia1GwEa4qnfuq1q9eW1DOK+JCSqlAuzUGTPEtlgwdxWQPGN8vduj6R3CHOA== X-Received: by 2002:a05:600c:2983:b0:40c:c1a:b3cb with SMTP id r3-20020a05600c298300b0040c0c1ab3cbmr25719wmd.73.1701815969744; Tue, 05 Dec 2023 14:39:29 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id m40-20020a05600c3b2800b004042dbb8925sm23936409wms.38.2023.12.05.14.39.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2023 14:39:29 -0800 (PST) Content-Type: text/plain; charset=utf-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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 0c3627f44d49 - main - bsdinstall avoid subdir depending on parent From: Jessica Clarke In-Reply-To: <09DDC25F-63F8-440A-A674-31F190C087B4@freebsd.org> Date: Tue, 5 Dec 2023 22:39:18 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <107720F5-1196-4E6C-AABE-48285D7B18B2@freebsd.org> References: <202304210501.33L51PBT011707@gitrepo.freebsd.org> <09DDC25F-63F8-440A-A674-31F190C087B4@freebsd.org> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.3774.200.91.1.1) 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(-1.00)[-0.999]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; TO_DN_EQ_ADDR_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DMARC_NA(0.00)[freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.44:from]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.44:from]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; R_DKIM_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MIME_TRACE(0.00)[0:+]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4SlFpC6Fnwz4F3j X-Spamd-Bar: -- On 21 Apr 2023, at 06:14, Jessica Clarke wrote: >=20 > On 21 Apr 2023, at 06:01, Simon J. Gerraty wrote: >>=20 >> The branch main has been updated by sjg: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D0c3627f44d49b460d5b9156145dec9d4= a91beb2c >>=20 >> commit 0c3627f44d49b460d5b9156145dec9d4a91beb2c >> Author: Simon J. Gerraty >> AuthorDate: 2023-04-21 05:00:40 +0000 >> Commit: Simon J. Gerraty >> CommitDate: 2023-04-21 05:00:40 +0000 >>=20 >> bsdinstall avoid subdir depending on parent >>=20 >> When not doing tree walks, it is bad for sub-dirs to depend on >> parents. Move the generation of opt_osname.h to distextract >> and have others that need that depend on it. >>=20 >> In usr.sbin/bsdinstall use SUBDIR_DEPEND_ so tree walking still = works. >>=20 >> Reviewed by: obrien >> Differential Revision: https://reviews.freebsd.org/D39742 >> --- >> usr.sbin/bsdinstall/Makefile | 9 ++------- >> usr.sbin/bsdinstall/distextract/Makefile | 11 ++++++++++- >> usr.sbin/bsdinstall/distfetch/Makefile | 2 +- >> usr.sbin/bsdinstall/partedit/Makefile | 2 +- >> 4 files changed, 14 insertions(+), 10 deletions(-) >>=20 >> diff --git a/usr.sbin/bsdinstall/Makefile = b/usr.sbin/bsdinstall/Makefile >> index e71cae726536..aaa006694222 100644 >> --- a/usr.sbin/bsdinstall/Makefile >> +++ b/usr.sbin/bsdinstall/Makefile >> @@ -3,19 +3,14 @@ >> OSNAME?=3D FreeBSD >> SUBDIR=3D distextract distfetch partedit runconsoles scripts >> SUBDIR_PARALLEL=3D >> +SUBDIR_DEPEND_distfetch =3D distextract >> +SUBDIR_DEPEND_partedit =3D distextract >> SCRIPTS=3D bsdinstall >> MAN=3D bsdinstall.8 >> PACKAGE=3D bsdinstall >> -GENHDRS=3D opt_osname.h >> -SRCS+=3D ${GENHDRS} >> -CLEANFILES+=3D ${GENHDRS} >>=20 >> SCRIPTS+=3D startbsdinstall >> SCRIPTSDIR_startbsdinstall=3D ${LIBEXECDIR}/bsdinstall >>=20 >> -opt_osname.h: .PHONY >> - if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \ >> - echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ >> - fi >>=20 >> .include >> diff --git a/usr.sbin/bsdinstall/distextract/Makefile = b/usr.sbin/bsdinstall/distextract/Makefile >> index 6ae9bb65e8fb..0292c01e78f4 100644 >> --- a/usr.sbin/bsdinstall/distextract/Makefile >> +++ b/usr.sbin/bsdinstall/distextract/Makefile >> @@ -2,9 +2,18 @@ >>=20 >> BINDIR=3D ${LIBEXECDIR}/bsdinstall >> PROG=3D distextract >> -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. >> +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I. >> LIBADD=3D archive bsddialog m >> +SRCS=3D distextract.c >>=20 >> MAN=3D >> +GENHDRS=3D opt_osname.h >> +SRCS+=3D ${GENHDRS} >> +CLEANFILES+=3D ${GENHDRS} >> + >> +opt_osname.h: .PHONY >> + if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \ >> + echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ >> + fi >>=20 >> .include >> diff --git a/usr.sbin/bsdinstall/distfetch/Makefile = b/usr.sbin/bsdinstall/distfetch/Makefile >> index 0104df0e3aec..1555719dd15d 100644 >> --- a/usr.sbin/bsdinstall/distfetch/Makefile >> +++ b/usr.sbin/bsdinstall/distfetch/Makefile >> @@ -2,7 +2,7 @@ >>=20 >> BINDIR=3D ${LIBEXECDIR}/bsdinstall >> PROG=3D distfetch >> -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. >> +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib = -I${.OBJDIR}/../distextract >> LIBADD=3D fetch bsddialog >>=20 >> MAN=3D >> diff --git a/usr.sbin/bsdinstall/partedit/Makefile = b/usr.sbin/bsdinstall/partedit/Makefile >> index 96c4ddb53961..df17028eab2a 100644 >> --- a/usr.sbin/bsdinstall/partedit/Makefile >> +++ b/usr.sbin/bsdinstall/partedit/Makefile >> @@ -5,7 +5,7 @@ PROG=3D partedit >> LINKS=3D ${BINDIR}/partedit ${BINDIR}/autopart \ >> ${BINDIR}/partedit ${BINDIR}/scriptedpart >> SYMLINKS=3D ../libexec/bsdinstall/partedit /usr/sbin/sade >> -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. >> +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib = -I${.OBJDIR}/../distextract >=20 > Surely this is a sign that this is a worse solution? The header = isn=E2=80=99t a > part of distextract any more than partedit, so this is entirely > arbitrary. It also blocks the ability to do the subdirectories in > parallel with each other. >=20 > I would much rather this reverted; this feels like a regression to me, > with the only justification being that it =E2=80=9Cis bad=E2=80=9D, = according to your > commit message, but so is this, and I would argue it=E2=80=99s worse. >=20 > Or go put it in its own common directory. This was never addressed. Moreover, the current code is in fact broken; OSNAME is not defined within distextract=E2=80=99s Makefile, only the = parent=E2=80=99s, so opt_osname.h ends up with #define OSNAME "" in it. I guess I=E2=80=99m = the first to notice that the top left of the screen says " Installer" during 14.0=E2=80=99s distextract. I am therefore once again asking for this commit to be reverted, but this time because it doesn=E2=80=99t work, not just because I disagree = with the design. Jess From nobody Tue Dec 5 23:40:17 2023 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 4SlH8L1cv1z53d43; Tue, 5 Dec 2023 23:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlH8L153dz4JJK; Tue, 5 Dec 2023 23:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zGkAv4Hht4Ssqg6FFLzLQvPkmOqsdLQdHybqw1u13M0=; b=MCxBTqt2YZ5kOQCM3vEBy2CFO29IqM0b6XOJSebvzQ7ozFXMW66ObyNzwk8WsnYYGOGWNn pft65MoWEjfJg4xrdOYNaMJCXFjnJog8Xlplkg/+ozVfq6hNeYrooHDsAFChTkmXkQf+9w B+BjWzb4tT+UIS6QqrABEFJO0nA3NX2c+uEWdfoyXkmV3x4wM+5OhqljrC7knteIDYB4nn n2Jx29LgrokhrmBIaTQy8XcNobSErMwMHzZClC/7bddA2ISR9qCJMexUEhLdy0lprQN2dW DWUXUcoGkC8egNHTKTmG+HAFLnsYe/Iu70IjNDVuOY9s8r2x0+/0dyHQOlrxyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701819618; a=rsa-sha256; cv=none; b=DItxd+AD9lE0+elFGv4TCd+6llXcU3XAzxzehKSRwtIORdzxIAkCZKwMNPVadvOHdh6aLM DgESAvi8QHBLcKrzNZ1eeCwZ/KnQ3I0bQqRbC+FIn1RCmxT2vrPsZNmgESU+PSCHJX6yfU IDoZHpIXBlNAVqnmqMNISGVI9YDtll8tEoewTH1hZyN4TXXCtm8000C41fkCIR9ExcVjD2 fW+YoJ5IISdO9+fPUcpBbPnB2TLundL3EMxf7/b2KeONk7yiOZEAVvdqvaRYJHUBtP6etP wb2KrsQ3XJp4XJaGnsZlNhvWNaKVmt5FGM+CEq0fc10/VHe2OeIcbYNdtg0aBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zGkAv4Hht4Ssqg6FFLzLQvPkmOqsdLQdHybqw1u13M0=; b=MJENBVblRlyrVnz88cVXEJ1bGxlbaUB+X70z59anDGBq81EmswnaFcrncaN2N4mR5jVLgM Re2qJm10kVlzCztrWAEUAsaQEJ9WSSkUY6IF0l/bUhJYgpoQCd0ntDNx9NL0auwhy3GHsx hd0zy5lJh5euoCUvaUvT/BhPTslCYqWz22GWTQhvebQvtgX/8I7Gcg79u8sy3sVe8x4XlL 7lm9mGHd40l8oqDUZ6TGS7y1ZCVA95dF67pD4R55hgogZ5SzscnYFZheYPiu6L74QHbHXP TatUK0wNFTBS5ZGKsGQysrZv7be6arl2m5ZR/BpE/wf26osgkWdOxGUa5yCpHg== 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 4SlH8K6xWmzWJF; Tue, 5 Dec 2023 23:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5NeHBX037947; Tue, 5 Dec 2023 23:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5NeHG2037929; Tue, 5 Dec 2023 23:40:17 GMT (envelope-from git) Date: Tue, 5 Dec 2023 23:40:17 GMT Message-Id: <202312052340.3B5NeHG2037929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 9b92ce7bd3a3 - stable/14 - Makefile.vm: Fix duplicate rc.conf files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9b92ce7bd3a3cd4f127628a09bd4a9e9fdffe18a Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9b92ce7bd3a3cd4f127628a09bd4a9e9fdffe18a commit 9b92ce7bd3a3cd4f127628a09bd4a9e9fdffe18a Author: Colin Percival AuthorDate: 2023-11-27 21:29:05 +0000 Commit: Colin Percival CommitDate: 2023-12-05 23:40:05 +0000 Makefile.vm: Fix duplicate rc.conf files Two bugs in Makefile.vm resulted in disk images being "built" multiple times, resulting in lines added to /etc/rc.conf being duplicated: 1. The vm-image target reused the same "staging tree" directory for all of its builds (multiple disk image types and multiple filesystem types). 2. The cw-type-flavour-fs target depends on emulator-portinstall, which did not have a 'touch ${.TARGET}' and thus re-ran every time -- and caused the cw-type-flavour-fs target to be re-run. This was triggered by release builds running `make cloudware-release` (creating the disk images) followed by `make ec2amis` (which re-created the disk images prior to uploading them). MFC After: 1 week Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit 97bd53ef4d20b7d15e0b0976e885af9438f5637e) --- release/Makefile.vm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 1a58a548b9f4..a7624775d48c 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -81,6 +81,7 @@ emulator-portinstall: env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static .endif .endif + touch ${.TARGET} QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static .endif @@ -137,10 +138,11 @@ vm-image: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . for FORMAT in ${VMFORMATS} . for FS in ${VMFSLIST} - mkdir -p ${.OBJDIR}/${.TARGET} + mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ ${.CURDIR}/scripts/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F ${FS} \ + -C ${.CURDIR}/tools/vmimage.subr \ + -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \ -i ${.OBJDIR}/${FORMAT}.${FS}.img -s ${VMSIZE} -f ${FORMAT} \ -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FS}.${FORMAT} . endfor From nobody Tue Dec 5 23:40:19 2023 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 4SlH8M2lDcz53d5w; Tue, 5 Dec 2023 23:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlH8M2Gbpz4JtZ; Tue, 5 Dec 2023 23:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6K2Zr0bcqNLzEnduvEJ5CmLHksjtcid+Do6v2a8sWp8=; b=ZyRabkGq2AzWrGyA/TaoAQchgxnHkTebH0L90bCw9olzBbirCk40nDTGFxUDZE5t00WI2w zlCHilLqYEzvpUu4HOl3wzwZhHu17nNwWf1hyRw6DrAiAnPhvY4IeJcUk5gMQ7krfV7e6X JIySjYYE/knGhkDwnKTU8hpkJMRodKXdAF3Juw22ZHzEIwT2KGBpkhjbo4cjn4OUVHiMFF dERULe6UhpJjpNMlx436ucxkv8jjP6cY21ighrIODCEiGw3eWRF4ZZwLbNWvEY8GJSTART LwuhMB6v0KFu0vumHpmLeijKrOk7Zf6Jj/PyHzZz0CpUIuRan0R8cmWz/5qTlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701819619; a=rsa-sha256; cv=none; b=kZ1JYOXuVkB816kBUTPnigeXv5odmotYtTko1e0kj+SgTYPjUyQbSeO1J12J0XqkyQ87ah QYrkvrf7t7oQX7WI3M4hmXHAZXyapSxj9O2GQAUxSqNRYNBy11jOWK9/ubslUiMxA/3i6M yM0FSywh45gZAaKkI1v+84Aof9oZAQGZVLL47Fb1PjVtvmFMfViD9f1Mg9tPegYdUV7OOc FcxobDybp2T+WUZ7OyMM2iHQ0oj0XXhsBk1v50r1nBXcDesBdr4MCh19oZRUVoZGuhf821 xOLFX5nYGg+27Bf7pJ6udKH5mLw9I2jgA2nkwRRuch/ROC4bHXhHTItOA4fhQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6K2Zr0bcqNLzEnduvEJ5CmLHksjtcid+Do6v2a8sWp8=; b=xXCA3vIBoIJPmThWL/pThiTtMNzCd3cyYAhBnYSeO8asBDvK5BXIcQlSvInsu1IpMdWHT8 FV+ygbnkRc+4Y0sTWdlx5jg9XPNTmY+xOoB0f611+FHAzGPkadgo02ZlZIacK3YfXmqSCu 2A9nMcG+0a4lu554jB0tw/Sn2vWmadiqfxcyZWgZt5wii+GxxpnHTvLWWk7Xh3sB9NrPkY E3XL6HkcfxZwfFuEO6N00GZ+xc8eQL5LBTGHKVX7AVnOsB+JFva1n2R9f8jhCnOkjujh0L d7rKDp6+ZG3aIrOlImSFC+H5Dwv0jeo/bRiM7DmKEz08/Qs7k8nRIpCo4plu/A== 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 4SlH8M11cQzVsl; Tue, 5 Dec 2023 23:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5NeJFL038011; Tue, 5 Dec 2023 23:40:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5NeJw2038008; Tue, 5 Dec 2023 23:40:19 GMT (envelope-from git) Date: Tue, 5 Dec 2023 23:40:19 GMT Message-Id: <202312052340.3B5NeJw2038008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 9fc78b60eda4 - stable/14 - release/Makefile.vm: Rework emulator-portinstall List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9fc78b60eda4d3912b8277405eff8dbb6bba5ad9 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9fc78b60eda4d3912b8277405eff8dbb6bba5ad9 commit 9fc78b60eda4d3912b8277405eff8dbb6bba5ad9 Author: Colin Percival AuthorDate: 2023-12-03 21:39:30 +0000 Commit: Colin Percival CommitDate: 2023-12-05 23:40:06 +0000 release/Makefile.vm: Rework emulator-portinstall The emulator-portinstall target now unconditionally ensures that qemu is installed; but is only invoked if needed (aka. when cross building VM images). MFC After: 3 days MFC With: 97bd53ef4d20 ("Fix duplicate rc.conf files") (cherry picked from commit 7d0ee5ebd052d35e323f2d303e467c2cf305ca39) --- release/Makefile.vm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index a7624775d48c..58703de16cf3 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -69,8 +69,6 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo .endfor emulator-portinstall: -.if ${TARGET_ARCH} != ${MACHINE_ARCH} -.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) .if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean @@ -83,9 +81,13 @@ emulator-portinstall: .endif touch ${.TARGET} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static +QEMUTGT=emulator-portinstall .endif .endif +QEMUTGT?= .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) . for _CW in ${CLOUDWARE} @@ -100,7 +102,7 @@ CLEANFILES+= ${_CW:tl}.${_FS}.img \ ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT}.raw ${_CW:tu}${_FS:tu}IMAGE= ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT} -cw-${_CW:tl}-${_FS}: emulator-portinstall +cw-${_CW:tl}-${_FS}: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ From nobody Tue Dec 5 23:42:58 2023 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 4SlHCR1F20z53dVL; Tue, 5 Dec 2023 23:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlHCR01pnz4KHS; Tue, 5 Dec 2023 23:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C7o5sgF1zYFWv5Ghhz5eAoNcHSy8GLpJsxzXkaEzbxU=; b=YYjEMoGoy+XNM8lE/vEb9CqTsTKTLhJQALSD8v7tbrVhLz7LyAwdBi5RPNh8M3gRLcsJZ4 tq/UV+43mqE1ZweJEDsaLEkTbH6q7kvkRKkaBhBPNuD7i8zp3G6witdc6olONbFood36VB VdyderGCUTc8raXkyknL/wbn0S7sUIAmgDbKU5giwrVv8h+/TIB8UZwM9bd4o17SeUwaOI FMem491fmBupggfnAUyMMXrFbPDenxSO+gcmRtG64aSRa2N5stUsjeuho7jhW/MHLKbq3A cMI+8HaRJBGnh5e+DwUmvIEOPhY8Y0Qwnye6vm1t0fWr/YAQ4KufV9zHZaS1vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701819779; a=rsa-sha256; cv=none; b=h/wBGy1jpKNrmJ8+1ZaJRdidK6SWrXy6QEWEjo13FYYLCBiIanWiRXVvW5/cZWB8gtq3+O G9qmQJfzxZ4LGH/T3HNuqawJoNj828TXBSthqsFFSzHuBX9v6RuJx5prWJ5VqemZhmMxRZ GMeDITTWRO9z1rayPuItVL26tv2FLrXeFfNzKCe9KX9gMPqogcZrJAo8oWEEV7Gpec4uvC +BpV8McpVpv64Ljpm/eDif0D3IBZCGvcy0Pl9ASC3wh1DE9wJVID+HfxDKtBh8LiImE27H XY30Qm3PpF875Ukl+RTNgFEWsrmQHJEedA/V395ui3jh9q7bpCW/G/K36v6QAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C7o5sgF1zYFWv5Ghhz5eAoNcHSy8GLpJsxzXkaEzbxU=; b=sX4ZGtWL2n7CjPdX3rMcLHiVscgmSCZdclEIrrGGLfFp3sDpWsRSv1RNdBxjI8gJLOAEpE DnDIxhgV1uq6yqX/OXTI2InhBJ8ROWbMccX3nBWCQCbZEaIq39qBylfiWitvNipUHtVF59 9jc7XT3zx6ODX99RqnzbBSGDKtxOzql44wjBj2crpQg0AK2cRRpYYyov8vXfjQcrV6SaBv o3MM90GFRMF52O8mxzHo/itbZw4cbQ78h1i6psq5pIc0xJZNBlCHWux9tRHwpr4Wwf0wcS 2FptNEfhuvltYy4B6kb4stM2pDZC3C9/DA2At/ECBTTjKXRqjOrONAu/XD7sJg== 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 4SlHCQ6BNwzWJh; Tue, 5 Dec 2023 23:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5NgwZn045202; Tue, 5 Dec 2023 23:42:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5NgwLt045199; Tue, 5 Dec 2023 23:42:58 GMT (envelope-from git) Date: Tue, 5 Dec 2023 23:42:58 GMT Message-Id: <202312052342.3B5NgwLt045199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 91cb6905e927 - stable/13 - Makefile.vm: Fix duplicate rc.conf files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 91cb6905e927e034ad14fe698879e5043f2bd329 Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=91cb6905e927e034ad14fe698879e5043f2bd329 commit 91cb6905e927e034ad14fe698879e5043f2bd329 Author: Colin Percival AuthorDate: 2023-11-27 21:29:05 +0000 Commit: Colin Percival CommitDate: 2023-12-05 23:40:59 +0000 Makefile.vm: Fix duplicate rc.conf files Two bugs in Makefile.vm resulted in disk images being "built" multiple times, resulting in lines added to /etc/rc.conf being duplicated: 1. The vm-image target reused the same "staging tree" directory for all of its builds (multiple disk image types and multiple filesystem types). 2. The cw-type-flavour-fs target depends on emulator-portinstall, which did not have a 'touch ${.TARGET}' and thus re-ran every time -- and caused the cw-type-flavour-fs target to be re-run. This was triggered by release builds running `make cloudware-release` (creating the disk images) followed by `make ec2amis` (which re-created the disk images prior to uploading them). MFC After: 1 week Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit 97bd53ef4d20b7d15e0b0976e885af9438f5637e) --- release/Makefile.vm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 5c47ff9367a8..171ef227a7f0 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -65,6 +65,7 @@ emulator-portinstall: env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static .endif .endif + touch ${.TARGET} QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static .endif @@ -120,10 +121,11 @@ vm-base: vm-image vm-image: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . for FORMAT in ${VMFORMATS} - mkdir -p ${.OBJDIR}/${.TARGET} + mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ ${.CURDIR}/scripts/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ + -C ${.CURDIR}/tools/vmimage.subr \ + -d ${.OBJDIR}/${.TARGET}-${FORMAT} \ -i ${.OBJDIR}/${FORMAT}.img -s ${VMSIZE} -f ${FORMAT} \ -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FORMAT} . endfor From nobody Tue Dec 5 23:42:59 2023 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 4SlHCS1lBZz53ddS; Tue, 5 Dec 2023 23:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlHCS18Wwz4Kkb; Tue, 5 Dec 2023 23:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8ufzVJNEt5cHzuo8pVq23lK4L5gQkBOesINpojKQ3E=; b=vTHIvYGk7ranT0hMuqdrGSrFiYKcXInwrqC7ZedioIEgYzaYI3i6CXwpcai5sPVlQAEAzU kl7/ZIW/GONI7GJBuaYMnU+esDIM1qG3UubbmrKAWl6XWim21aGM2ujoXUEM1aebhs0RWU XI733HClUs68KZOUGJGJ1XqcHS+yKLz5MmUp+eZNCkJejPLRCd8n7WWsDcqlevkNpYu/TU Rs0AaIQDPDwFF3hZraH4Wmo058CVGQa0nahOC1QQ86dfRLff2AsRGuvwNBUtziEh3vGRT0 kV8+MRHiCkkwcr1UQuRD+CA4yi+8Qsb+kQ1pMEYyG7Kw5qurgOyd75r3SW6WXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701819780; a=rsa-sha256; cv=none; b=NWK8MesC8fhkgNLF32pXEMxmp2XibGpPo/PsTsLbV4vuUuRnq8dyjumDaz3H3rx2oqty0K tyzBh9sW0o8UwqyULM6cxiyBHEfxDClQ+aH0GUaCKQ0kaivBDoryrmhE7JGGsTDdr2sodK 16CbKcAyfaz1qgq+bWsEwCKS2JbGGICYDBCF4BWlKHyep4sKM67pNox8b/OH+tN5jhvvLw iMl/SrcaweI7I9dAgaBeuwyFX/7uwH/kLZDmuLt5hGuiwFlS14c0zYQoSH+rrd5XzqgW78 dZ2WLqLj1tDtuDkcP3d0zeK2IlEIjz/eU0yPv0BE7EyYOV4MHfGFEpx0QWW8qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8ufzVJNEt5cHzuo8pVq23lK4L5gQkBOesINpojKQ3E=; b=i5nXwMl29cZkuUFbHWlFRetWkZ6CMRbF5NlrHh7mLC5SGwe4IL9HkrRf8bbWDfhzJUwYV7 eoCam+6ojb1BbEmQFhsoaL93P5AuWjrDdhlznxInp4xPnUySQ0QnSXCYx1G+No9A1OkvDQ 8vIXw0ylK4BC0YrDWVeKPwdg4dXRg06CSl2/Y5LRW/A/ePEFmioPUo7M95X/Y7s5DY61TY +f5kXVADvSgAv0DOl6Nf1bVe+goYW4XLQECFQzK/NX9JkgcDz3YzHAkkHq4u4VQZmkFDUd q5ClTnw9Wx3ZdS3t235JIVx6VSIWB29OYuy6AuQR1KWZo743dAep3xUHh7hXeA== 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 4SlHCS058PzVLJ; Tue, 5 Dec 2023 23:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5Ngxg0045239; Tue, 5 Dec 2023 23:42:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5NgxE0045236; Tue, 5 Dec 2023 23:42:59 GMT (envelope-from git) Date: Tue, 5 Dec 2023 23:42:59 GMT Message-Id: <202312052342.3B5NgxE0045236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c2c7340fefe9 - stable/13 - release/Makefile.vm: Rework emulator-portinstall List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c2c7340fefe98db6917af02616c21b53db1d0d56 Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c2c7340fefe98db6917af02616c21b53db1d0d56 commit c2c7340fefe98db6917af02616c21b53db1d0d56 Author: Colin Percival AuthorDate: 2023-12-03 21:39:30 +0000 Commit: Colin Percival CommitDate: 2023-12-05 23:40:59 +0000 release/Makefile.vm: Rework emulator-portinstall The emulator-portinstall target now unconditionally ensures that qemu is installed; but is only invoked if needed (aka. when cross building VM images). MFC After: 3 days MFC With: 97bd53ef4d20 ("Fix duplicate rc.conf files") (cherry picked from commit 7d0ee5ebd052d35e323f2d303e467c2cf305ca39) --- release/Makefile.vm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 171ef227a7f0..27053208c689 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -53,8 +53,6 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo .endfor emulator-portinstall: -.if ${TARGET_ARCH} != ${MACHINE_ARCH} -.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) .if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean @@ -67,9 +65,13 @@ emulator-portinstall: .endif touch ${.TARGET} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static +QEMUTGT=emulator-portinstall .endif .endif +QEMUTGT?= .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) . for _CW in ${CLOUDWARE} @@ -85,7 +87,7 @@ ${_CW:tu}IMAGE= ${_CW:tl}.${${_CW:tu}_FORMAT} ${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf . endif -cw-${_CW:tl}: emulator-portinstall +cw-${_CW:tl}: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ From nobody Tue Dec 5 23:52:15 2023 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 4SlHQQ3WF1z53f7B; Tue, 5 Dec 2023 23:52:30 +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 4SlHQP36LKz4LLG; Tue, 5 Dec 2023 23:52:29 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 2001:470:d5e7:1::1 is neither permitted nor denied by domain of kostikbel@gmail.com) smtp.mailfrom=kostikbel@gmail.com; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none) Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.17.1/8.17.1) with ESMTP id 3B5NqFF0042636; Wed, 6 Dec 2023 01:52:18 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 3B5NqFF0042636 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 3B5NqFNB042635; Wed, 6 Dec 2023 01:52:15 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 6 Dec 2023 01:52:15 +0200 From: Konstantin Belousov To: =?utf-8?Q?Jean-S=C3=A9bastienP=C3=A9dron?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 14dcd4098374 - main - linuxkpi: `GFP_KERNEL` equals `M_NOWAIT` now Message-ID: References: <202311241731.3AOHVsEJ061730@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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: <202311241731.3AOHVsEJ061730@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.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Result: default: False [-2.27 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-0.86)[-0.861]; NEURAL_HAM_SHORT(-0.41)[-0.413]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; RCPT_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FREEMAIL_FROM(0.00)[gmail.com]; HAS_XAW(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[] X-Rspamd-Queue-Id: 4SlHQP36LKz4LLG X-Spamd-Bar: -- On Fri, Nov 24, 2023 at 05:31:54PM +0000, Jean-SébastienPédron wrote: > The branch main has been updated by dumbbell: > > URL: https://cgit.FreeBSD.org/src/commit/?id=14dcd40983748596d116d91acb934a8a95ac76bc > > commit 14dcd40983748596d116d91acb934a8a95ac76bc > Author: Jean-Sébastien Pédron > AuthorDate: 2023-11-24 17:30:33 +0000 > Commit: Jean-Sébastien Pédron > CommitDate: 2023-11-24 17:31:32 +0000 > > linuxkpi: `GFP_KERNEL` equals `M_NOWAIT` now > > ... instead of `M_WAITOK`. > > [Why] > The reason is that in some places in the DRM drivers (in particular, the > framebuffer management code), kmalloc() is called from a non-sleepable > context, such as after a call to mtx_lock(8) with an MTX_DEF mutex. > > If `GFP_KERNEL` is defined as `M_WAITOK`, we hit an assertion from > witness(4). > > [How] > The definition of `GFP_KERNEL` is changed to `M_NOWAIT`. This means that > callers should verify the return value of kmalloc(). Fortunately, this > is always the case in Linux. > > Reviewed by: bz, emaste, manu > Approved by: manu > Differential Revision: https://reviews.freebsd.org/D42054 Unfortunately this broke even attach of the mlx5(4) driver. According to the 'official' Linux kernel documentation, the GFP_KERNEL flag implies sleepable context. mlx5_core uses the passed GFP flag to determine if it is called in the sleepable context, and now even initial load assumes that it cannot perform sleeping ops. See, for instance, second if() statement in the mlx5_fwp_alloc() function. I think that it is more likely that use of (FreeBSD) mutex should be replaced by sx somewhere in DRM than to try to push all possible fixes for this change. From nobody Wed Dec 6 00:28:24 2023 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 4SlJCr4QgGz53grq; Wed, 6 Dec 2023 00:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlJCr3jQbz4NNn; Wed, 6 Dec 2023 00:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701822504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=roFt87bEtczL2T5gHGwBxhIqwGl6io6ijzBD0Ow3vMQ=; b=aa01putXEHqD2fsbhTDIgfCSRoPQNhQCw6d0HT8RlngNwQZEygJ3aYbzcdiTaaY52Jt7+d jHBU2/LdifisIq8oyMaWv2oPczedzwOE6MF9zvncSNDqktTCXPGU/sesXS3p/j9OzDc0HM vNJ0+JfLHveLvl+i/IZPbuysHuwUazvH1gzacfWCoCA7P+6/kYFrduiXb5QOboTGRaJwz+ CtyGf2wNOFy7UDo6ou8vbggI70KKvsbpJt6Iy5DWhotaa0iMHXQ46WLk2YXd/ZIqUqsYLZ CZVgpxjnPyin+5MuUpiDybEQ1H38c97cA1Oo9wa3C8k8SHhrL1a9IYfu6PfQTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701822504; a=rsa-sha256; cv=none; b=Fyjt2Yg9BDGfgQthJqxisbl1d6C7MSdT/5gCaESWmHMIbTld4+i6VbT5Dc7wBCzrLoAnqX kqVh8O7FOhQk00P6k5yWIy2u7jaFc9nRae35KYJMYLFxGj9pCPBMwNOf1qVFFCpndaSTsi k88oJhgSVC9QFiyFqi/kBISviU415Ah1Hp2Mz/FwYTvV5cq3oKRYpqTWZMsr0ua5/v+3t4 Pj3OLQ0PkOUokbixgwBbfMwVR0GgChqFqy6XYNIoAX7JqXiNB8RegnQXfMYKSsr/io7Db+ x/53z/erea4SCc1B0wywOwWOwp0rP+G8Y6ngvUUp+eLaeAY6Uyoj9xNwPO/b/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701822504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=roFt87bEtczL2T5gHGwBxhIqwGl6io6ijzBD0Ow3vMQ=; b=dyWc0jEH2ObiID2KVaSm7P8Sg5MIe67ESMpTNFyz3aHjv2OIeLu1oBO875ptooGk7G16GN UkAl6ywArUOO+jvvSXkUbQvnvx6YCOCvdRQwjze4KwtU4RzwcnIEDs5x2NQTrpyhCKJTe+ mZ5JfnBdQDjaUgRbUi9F1vAFpI82SmdsmOlAtWCGY/RxFzxsi+k5wjmYpaS/IpGwyXuwT2 BQYReI8oXBPdv2ioKFNKmGC+T+nYCEh0uiA4EZEOA1UZp3p8kvxEfmgCu3qqPgYf0Ffy6e Y8iMRq5mpG+B/ajuVdrG4fk5xzVwIPc7tRF/IYIR4M+JX8ZIN/g4ke8fURophw== 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 4SlJCr2n5mzXZg; Wed, 6 Dec 2023 00:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B60SO8N012796; Wed, 6 Dec 2023 00:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B60SOHr012792; Wed, 6 Dec 2023 00:28:24 GMT (envelope-from git) Date: Wed, 6 Dec 2023 00:28:24 GMT Message-Id: <202312060028.3B60SOHr012792@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: 0312449c67a8 - stable/14 - mlx5: Fix HCA cap 2 query List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0312449c67a841ca73f0b54307112724ce5b9875 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0312449c67a841ca73f0b54307112724ce5b9875 commit 0312449c67a841ca73f0b54307112724ce5b9875 Author: Patrisious Haddad AuthorDate: 2023-05-11 09:48:26 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-06 00:27:14 +0000 mlx5: Fix HCA cap 2 query (cherry picked from commit 0cd90ee598cef68cef72db8b912241868d1067d0) --- sys/dev/mlx5/mlx5_core/mlx5_main.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c index efaf726e19e5..f6dc1158f085 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_main.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c @@ -561,39 +561,15 @@ static int handle_hca_cap_atomic(struct mlx5_core_dev *dev) static int handle_hca_cap_2(struct mlx5_core_dev *dev) { - void *set_ctx; - void *set_hca_cap; - int set_sz = MLX5_ST_SZ_BYTES(set_hca_cap_in); int err; if (MLX5_CAP_GEN_MAX(dev, hca_cap_2)) { err = mlx5_core_get_caps(dev, MLX5_CAP_GENERAL_2); if (err) return err; - } else { - return 0; } - /* To be added if sw_vhca support was added */ - /*if (!MLX5_CAP_GEN_2_MAX(dev, sw_vhca_id_valid) || - !(dev->priv.sw_vhca_id > 0)) - return 0;*/ - - set_ctx = kzalloc(set_sz, GFP_KERNEL); - if (!set_ctx) - return -ENOMEM; - - MLX5_SET(set_hca_cap_in, set_ctx, op_mod, - MLX5_CAP_GENERAL_2 << 1); - set_hca_cap = MLX5_ADDR_OF(set_hca_cap_in, set_ctx, capability); - memcpy(set_hca_cap, dev->hca_caps_cur[MLX5_CAP_GENERAL_2], - MLX5_ST_SZ_BYTES(cmd_hca_cap_2)); - //MLX5_SET(cmd_hca_cap_2, set_hca_cap, sw_vhca_id_valid, 1); - - err = set_caps(dev, set_ctx, set_sz); - - kfree(set_ctx); - return err; + return 0; } static int set_hca_ctrl(struct mlx5_core_dev *dev) From nobody Wed Dec 6 04:22:51 2023 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 4SlPQM4680z540HP; Wed, 6 Dec 2023 04:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlPQM3HxGz4fm5; Wed, 6 Dec 2023 04:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701836571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RdZcQ4w56fq7MicA7HRrXcV9qoaxCgB9Q7DZP5p0M1U=; b=ifEr/8a8bJbqFzmGdaISKkDBaGeebP7DFJPkb5CIcjJdbuaDZBElQETeyyfSJ9y+FQNkH3 CXsKsWnVbVv8zz2vopc3ltedLJx19YgelefGv4o+dun0qUizZsZ4vOGIUfWyLnh7i2xzXG R6deFBf1fTS6c8likRwzi3muqrLClqbc7SzOSXTDyuMmaieLCn4YkGPaIjuCFJ435EKtpc wEwV3/MFeXrdWQemrtkmTgF5RDZQwnaXIy7lV5+O6uO4soAl8CA3YzqaxOPwqCO2SOAMfM xKmUIyECsR7vKf3C/1z2kuGogTZPA+vcfLlKMPjWqAyCq4f5p0Um96IRkFINtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701836571; a=rsa-sha256; cv=none; b=K92QbY8WLWV/xWaNY+x+dqCKfOVTd+4cklgyxAJctZODH8xqo6Xj9wy3S4UGuUpjsZbCE1 y2LlF8xBiDspOw9xTI+ORkA+CUy1vateNTfd4Jl508eAJtNqPkRh2YWAqH1Rt8krkZi9Go 4QZI4abLowMdOnlX01DXyFysjYLZyqOB56e27EsVPir1qFUjHOr3lzcY2sjKH5anBG3rk8 B2lMWAyPOIRZLTxZA3uQgMj5rfb2MsOE5qiIsRTiZr63IzE/+2RftArQtLrbV6SBxSW2AV G6OKqilTqo7K7CFCpVYK5QVhZg/J0+OAgww3Cw+k+ZJYnRD8uHfBRmrpb38+Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701836571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RdZcQ4w56fq7MicA7HRrXcV9qoaxCgB9Q7DZP5p0M1U=; b=YDLiYZmmin4jjyJoUIIywou6xHtiudGWauIBvCG7VAZSjr5mvNLnsN7PHkRKIWfccFCm4I yP2n7Xl7aO3bWdG20e474uazw18inJ5b+e0nnLXwV2TomRkDgKj8I9hotI3GjXYrH87C+y gIrXEdRv/wIb8DkBGHP0bntDetLnL3+6o4D535er6lmhm6OCA61McFZa4wEZqMEpF8KGZ5 dEI85eMSdCrIIjgMQkNnNBXO15mACRnMBr/d7LRBKaRKQWmnXBUKLauwQaXVqibZI+wYlU sGw4ntnPr3c5ylha5R/bcwFtV2dA5Lbz+SNfp6Jx3FJ/L0Ld6gWkIF6iy3BmMQ== 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 4SlPQM2MqHzfCS; Wed, 6 Dec 2023 04:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B64MpMg013470; Wed, 6 Dec 2023 04:22:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B64Mp4t013467; Wed, 6 Dec 2023 04:22:51 GMT (envelope-from git) Date: Wed, 6 Dec 2023 04:22:51 GMT Message-Id: <202312060422.3B64Mp4t013467@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 8c165cbaf02d - stable/14 - usbdevs: add quirk for WD MyPassport Ultra External HDD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8c165cbaf02dabb3fa446d1ad355dc5c0167e978 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=8c165cbaf02dabb3fa446d1ad355dc5c0167e978 commit 8c165cbaf02dabb3fa446d1ad355dc5c0167e978 Author: Eugene Grosbein AuthorDate: 2023-12-03 16:48:34 +0000 Commit: Eugene Grosbein CommitDate: 2023-12-06 04:21:42 +0000 usbdevs: add quirk for WD MyPassport Ultra External HDD WD MyPassport Ultra External HDD needs quirk UQ_MSC_NO_TEST_UNIT_READY to attach. (cherry picked from commit 970d73856b626a68597de19d37b68c376e2c0491) --- sys/dev/usb/quirk/usb_quirk.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index bf2de35a149e..eaf3851bbbca 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -558,6 +558,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(WESTERN, MYPASSPORTES_07, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_08, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_09, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(WESTERN, MYPASSPORTUL_00, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY), USB_QUIRK(WINMAXGROUP, FLASH64MC, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(YANO, FW800HD, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 6543f0cbaa29..221761af4fe7 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4944,6 +4944,7 @@ product WESTERN MYPASSPORTES_06 0x0750 MyPassport Essential External HDD product WESTERN MYPASSPORTES_07 0x0752 MyPassport Essential External HDD product WESTERN MYPASSPORTES_08 0x07A0 MyPassport Essential External HDD product WESTERN MYPASSPORTES_09 0x07A2 MyPassport Essential External HDD +product WESTERN MYPASSPORTUL_00 0x0743 MyPassport Ultra External HDD /* WeTelecom products */ product WETELECOM WM_D200 0x6801 WM-D200 From nobody Wed Dec 6 04:26:53 2023 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 4SlPW13HC9z5409K; Wed, 6 Dec 2023 04:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlPW12fMbz4fkr; Wed, 6 Dec 2023 04:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701836813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5HTzi2+PLUp+wG93DjJCntNPOlgb7E65GJAUuxdMNak=; b=R3jC7iWAQx6IZmaEu5SG4ntNrTJO/S+cX0vu8A9u7NF3Pl8kE1CGLiLRghSYtnYiRB/aDm 26krEoTU4hg7EjkA2C4N701e6sUytltnL4Rw9Uc6VAxN52UW9SB2TNKur21qfdQSe4dIqD DCv0/rmlwZ+nLMDtxPOSpuDBl1poLbGt2mRuMxwDO47kiaNEu+G8VxLG+mGtulIqWR9Q7H deUBbog7u71HwjCiZCil7YFYKuvjxfZSNvv8wbk3L9RzmCcHPsgly34iDLs9LV9+J7uYYj 0501fYVpKWdGNu7cJ6QG7g19ZoN7aVPBLbrpKU2xG9nNHaPwVQPhG0IRnbqT5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701836813; a=rsa-sha256; cv=none; b=fnDW298Rg5TChg5HqBerpeWC+nY9JcEXCIviUbfRnqlQkfVD32NnKMxGNrPlHFmeW/eRb8 WBEpfKNaELewEcxWn3AlxA4inwwentcKPACv+b79w++SEgaE9z3c2rT/GchGqa9bwwE3C0 Q85JS2GBzypTeJtHW9z/GDUMMo7n1lBmx2mImU3qFaZi++Bf608/gXmAKu0q41fmh3JyEs l/fogz57gPEDWMFV3KJhSYnHrtGzF4PO+q6/fHRgmojZ1oR7EQIXo9Lw2XuPs/0bir/bj2 3M1iZYiiG5JP+2jAF2nHqdxafN+AEqB7GdD2WnxDvWNEj8Qs4B5bY6KL2tosIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701836813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5HTzi2+PLUp+wG93DjJCntNPOlgb7E65GJAUuxdMNak=; b=UVCbWqG8YJ0zQmxWFcjk0nRHCeAUwttoTyRkQEf6Kb8IrbDprkYnOYhKAKHZEGw45hLQAl dd3XMMQgHNQQGHQxjJX48JlBjTGGEGDvUa2zMIUY5tm+oFIovMGfrbs/9Ukoboqh4u1b9U i9FuUFJotdI5n0D+Jwg4r1PRzfg3/XHM85Wlx5mvfYb1ixMBDfuGfnhvgRGHJWMEZNc4Gy CfrfEfiYnMwHf5rQCBFQvToGDQQRmsBt7fUPB7KZ1WFE7St9o9jeR8vCcldTrot3qY9WRZ WDf+Aw5U3jfModHIYu0xh55sSUj9gMEhEPtxdhFC8NOLNOVyyrqfVD3mi6fnkg== 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 4SlPW11bMWzfLB; Wed, 6 Dec 2023 04:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B64Qrxo014157; Wed, 6 Dec 2023 04:26:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B64QruK014154; Wed, 6 Dec 2023 04:26:53 GMT (envelope-from git) Date: Wed, 6 Dec 2023 04:26:53 GMT Message-Id: <202312060426.3B64QruK014154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: e8c442442de2 - stable/13 - usbdevs: add quirk for WD MyPassport Ultra External HDD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e8c442442de21fb9d683690672f12dd237f983d0 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=e8c442442de21fb9d683690672f12dd237f983d0 commit e8c442442de21fb9d683690672f12dd237f983d0 Author: Eugene Grosbein AuthorDate: 2023-12-03 16:48:34 +0000 Commit: Eugene Grosbein CommitDate: 2023-12-06 04:25:53 +0000 usbdevs: add quirk for WD MyPassport Ultra External HDD WD MyPassport Ultra External HDD needs quirk UQ_MSC_NO_TEST_UNIT_READY to attach. (cherry picked from commit 970d73856b626a68597de19d37b68c376e2c0491) --- sys/dev/usb/quirk/usb_quirk.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 284f5add72c1..91d47935221f 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -556,6 +556,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(WESTERN, MYPASSPORTES_07, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_08, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_09, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(WESTERN, MYPASSPORTUL_00, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY), USB_QUIRK(WINMAXGROUP, FLASH64MC, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(YANO, FW800HD, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 0f817109367f..a54b0b0956b8 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4923,6 +4923,7 @@ product WESTERN MYPASSPORTES_06 0x0750 MyPassport Essential External HDD product WESTERN MYPASSPORTES_07 0x0752 MyPassport Essential External HDD product WESTERN MYPASSPORTES_08 0x07A0 MyPassport Essential External HDD product WESTERN MYPASSPORTES_09 0x07A2 MyPassport Essential External HDD +product WESTERN MYPASSPORTUL_00 0x0743 MyPassport Ultra External HDD /* WeTelecom products */ product WETELECOM WM_D200 0x6801 WM-D200 From nobody Wed Dec 6 04:37:00 2023 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 4SlPkh2R1tz540c5; Wed, 6 Dec 2023 04:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlPkh1w9Qz4ggc; Wed, 6 Dec 2023 04:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701837420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BU1sh8IqjMFtMc5ZFu9yiyLS1wiU5OccvxWBrUBncZs=; b=B2JiE9PDOiFGkfj18Xjagd3WK3chcYDDzm2k4x0YN1RJVo56ZeIQFFhp1gUELf4YV07QpW JC0xrSNtO+zP+fGgZkxZzpFV1bU0ACSlorEa9mijL9XrLaIGzRk/7C9xEgtM1LLrm4PcZl +9XVpbYZ/xJTVmiT5b3EGJFmf2hjkWKHqIPPji7mtoSlEgdi2JH/FUTmZ1ahjaxl9D15N1 SBqcA/1AxPgTOEY9QCnc77HAm0IjTTjrBnJsYeZDuuZ1muUiDoBv6Al+dj4DCU6HEttQ78 38+LUEkNDFowzE87Z93tjcb7hgN5Z8vEuJKPcD9Lj6mSs9QMsT1vAqLPzGGslQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701837420; a=rsa-sha256; cv=none; b=gYTr/wjH95dkDgGXm6FDEn6KU0zeVIgT2AZw41vCF8BGFjoVd/JKHbPBt4gxP9N1lUxHi2 PH1jE1ce1UPx3dq9cd8a0hpLqjXjqEctUEo+FMDMBVEJJO01oyiZ8nfPV6ZP/1U7ZFY2cL Bfb4Z5ax1z1NtWG6JHerMVUX5BRs23BZCweFWcc1OjAUBWoad3owr06kfdJv/9FSbQewiD TBp9obccvtVZE1u+6LH8D7QQiY4LgDG4lsbmm5yr36PtYWUcjq+YIekXSJ975ycRgVFkrn HCR+7E1EuPwRpEoUojApvbLbk8VO8auDXrWsFAnGeR4wGks+4q0383VBISRj6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701837420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BU1sh8IqjMFtMc5ZFu9yiyLS1wiU5OccvxWBrUBncZs=; b=uCk6RtuEm0yyHMKhF3+bVUx5Vno9a5hCid1R2zNeYcyA3ROY+n0oYhSR8CZHmQ/K9gUnyI 5SIm+xXQ0v514FMMDGTzJ9fp1KuhmtKy1f92l4YjUIPe+zi5H5vmQXrKNnaw7Zr6u6Isr5 j87GGOcAE7Hc/Ks/w+wFxxuZV/P56dNAmofCl7Vqus9i2eQfNaX0dfesEDS6ZmCOTDrRuQ snHngLvhVpmvRGNCKMVXht21G5pjn6AMFLGFEYTx4dQzS8kUDL5oRdPbFyC1b+hMPll4Br KWndhwLnB3gkU+K9Fq8eI9TlP854bbMPJjjFwQ/FvEWzJRdI5K0oe2yUhYHbAA== 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 4SlPkh0zprzfkN; Wed, 6 Dec 2023 04:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B64b0aD031073; Wed, 6 Dec 2023 04:37:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B64b07Q031070; Wed, 6 Dec 2023 04:37:00 GMT (envelope-from git) Date: Wed, 6 Dec 2023 04:37:00 GMT Message-Id: <202312060437.3B64b07Q031070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: b743fda10257 - stable/12 - usbdevs: add quirk for WD MyPassport Ultra External HDD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b743fda10257b8381cc5461207da720dc305d20e Auto-Submitted: auto-generated The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=b743fda10257b8381cc5461207da720dc305d20e commit b743fda10257b8381cc5461207da720dc305d20e Author: Eugene Grosbein AuthorDate: 2023-12-03 16:48:34 +0000 Commit: Eugene Grosbein CommitDate: 2023-12-06 04:32:41 +0000 usbdevs: add quirk for WD MyPassport Ultra External HDD WD MyPassport Ultra External HDD needs quirk UQ_MSC_NO_TEST_UNIT_READY to attach. (cherry picked from commit 970d73856b626a68597de19d37b68c376e2c0491) --- sys/dev/usb/quirk/usb_quirk.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 0a23eb29c177..a7cde883014d 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -511,6 +511,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(WESTERN, MYPASSPORTES_07, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_08, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_09, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(WESTERN, MYPASSPORTUL_00, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY), USB_QUIRK(WINMAXGROUP, FLASH64MC, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(YANO, FW800HD, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 5ec3a33d0b1f..4e7a0d934fe3 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4871,6 +4871,7 @@ product WESTERN MYPASSPORTES_06 0x0750 MyPassport Essential External HDD product WESTERN MYPASSPORTES_07 0x0752 MyPassport Essential External HDD product WESTERN MYPASSPORTES_08 0x07A0 MyPassport Essential External HDD product WESTERN MYPASSPORTES_09 0x07A2 MyPassport Essential External HDD +product WESTERN MYPASSPORTUL_00 0x0743 MyPassport Ultra External HDD /* WeTelecom products */ product WETELECOM WM_D200 0x6801 WM-D200 From nobody Wed Dec 6 06:34:04 2023 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 4SlSKn1VBTz52tvy; Wed, 6 Dec 2023 06:34: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlSKn100bz4nk9; Wed, 6 Dec 2023 06:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701844445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIZNNCdXpa8NFAu/3flQQKoXNxUO8TuKg2hOKPIGhIg=; b=C9HZDnecMxwGgPhLsFFI0xyMrU42Hsxyho84Gs3QYGPrMjd+vZRTIf6eSIwGrEVJuq5+SF TPNvhvTa3v/Ab9KpeN4bJj88YejZqxuDDsDeN1ui/705acD86hOuNlsuiWycd3xl6F0lqm FSoFafXKKKt2Hzn0Fu4zJ3ybUj3JnYF+oB+PjdvJ2BmRXeftcG5V/Z/D7+k8nNep7UDLaM i/z7BIpVJjyTkJZn0vdsIqlPwd1YooSTZ0bnceRWQVAr4Zbg4TUkFiDPmR99kmN4yYNA2t xUheRkK0UoMCCfwGsedTERMlBu5w1QyLVtvgI2HZhP21vrnN0/S93w1+TqUutw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701844445; a=rsa-sha256; cv=none; b=TkZWYrQy7FVdn/Xo3MrUhZjJNezQONvliImuvmwe78ZGQVfVqCVCs3CJwXCtdVyoBRGXeG LqHFoIqPX2LyvZyc2gbucqZ30JF1Cc084Za2K6EVHijTW0WL1ZxwhZrMjgh+mSxwXP5Muq 4XRc+M2BmS89zhf15rfIyh/zSO1jhQAGlaCD58yfM6uEBo2iqIolrm/xik5gj+E8bvRZyQ wNCJTTlGPUdxuyEpCM40HeesYIMjFB9322SNewvqYtOfFTZAY+4PhWTL+wFS6X7FLr6zYQ FIiU2p2LvUiIoGu7HVkwJNGXO2f3J1qspdwqLDVcLO2R2k7tWIdH+yO35a0Zgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701844445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIZNNCdXpa8NFAu/3flQQKoXNxUO8TuKg2hOKPIGhIg=; b=DZZPTmdJ9oCpIkeh753BpS32OBFnLR1EiVkybMhemmfI2Kze5fQSNhIduzva+M2kGGk9hd ve3Csq9I8F4aQmSY+fPEZdPh45Maai4r8UOcb+7tHeE6RtLyt9Ba6Uswui8j1yoEn8t7CZ WdxjUhDUgx2ysMRFfMQih7bLVfqALJ8dWAXrtSpqpW1cEv1CvvIsBKCuosh+RM+8JJ9TLq Idzu5D7yrAYMojS16JuN2QtOY7tyyCsxjneawSwFOXX52nyOpzdJLGXwgV/KaK9Pyk9cVJ HfAEYA8QSL5nbC4sJsuaZLSm+IjD5ge81ecrAdEnjDmwylZ65otAqntJL40K4A== 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 4SlSKn01wgzjJ7; Wed, 6 Dec 2023 06:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B66Y4ib031325; Wed, 6 Dec 2023 06:34:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B66Y4rv031322; Wed, 6 Dec 2023 06:34:04 GMT (envelope-from git) Date: Wed, 6 Dec 2023 06:34:04 GMT Message-Id: <202312060634.3B66Y4rv031322@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 52369c5d29f5 - stable/14 - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 52369c5d29f5f291bfc98270cf13768633abe322 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=52369c5d29f5f291bfc98270cf13768633abe322 commit 52369c5d29f5f291bfc98270cf13768633abe322 Author: Xin LI AuthorDate: 2023-12-03 07:00:32 +0000 Commit: Xin LI CommitDate: 2023-12-06 06:33:48 +0000 periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. The leap-seconds.list is used exclusively by ntpd, therefore, do not bother to perform the fetch when ntpd is not enabled. PR: conf/275419 Reviewed by: cy, michaelo, imp Differential Revision: https://reviews.freebsd.org/D42875 (cherry picked from commit 3b3195f6767b39eb33b3523134ef988931c9c86d) --- usr.sbin/periodic/etc/daily/480.leapfile-ntpd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd index 17db53e625f8..c7de845ea87d 100755 --- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd +++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd @@ -12,9 +12,9 @@ fi case "$daily_ntpd_leapfile_enable" in [Yy][Ee][Ss]) - if service ntpd oneneedfetch; then + if service ntpd enabled && service ntpd needfetch; then anticongestion - service ntpd onefetch + service ntpd fetch fi ;; esac From nobody Wed Dec 6 06:34:39 2023 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 4SlSLR6msyz52twC; Wed, 6 Dec 2023 06:34: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlSLR5pHNz4pNf; Wed, 6 Dec 2023 06:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701844479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eir9kCYEi86+plNbHZyHaXgNDQ3aYDer88gN/h2Qdb8=; b=CMy9KarTAgKTmGMQk7/k9ZnLbzhFvqOK+Ce3kJ8cbanDb6JI8U2HzYDKMfiNpC1rPdhtTU reeaMZ6R2UT1cEn8xYEGiQ2X8PlZYHXRKhvIXq/I69glfiV1MOP9zUlDDPQi3fbGPxPojI 1ax+L/13vEjtXeiG/r65x1nsaxRJDFx9NNK31JIaTQH1f1Pvgkx8JUl2PVWsGhV4CaR/SX cCZwRtvT4F2M32FdorUi+Yx8r/OIO8V7OgS6HAEB4K15iYVD+Apxn1+eVdlR1CprTyBKVh kW/+c8L2E52QjeAHa0eqIXvBXV9kDdHXIGWF7X93453XHGc82D0zOo3cYu0ETQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701844479; a=rsa-sha256; cv=none; b=g5X9n2hpCJPKDcpp5L7MPLn6MtxMOrnXDNBQGybMmSwtA3G5wsduetzailtvM0a2MLmSiN iulRU3wHv16F9tbH0gSgblrlrQjZQTfZrE9dc4p45iVmCAFQq7auh6mSyS9RG/CaLfzI8k 3dOcbXvIpsupAaEEWqNd4V9jbdTwLsjufcXEyewLFuKhDGddML/yUsuLL19MKVVkhqY9cV 7n9TLj55wjLEIkdupNq2krzQTTHzKYeS0vrQdjI4ZyhYi6RqyRNdXTdHOGCF6lKJel/Wkp kEUiZ12zFoF0dDuIpmJxIbn5eedy+K2ejAd6TnxitG9O1lL6zgDpEQ1xAZL0mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701844479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eir9kCYEi86+plNbHZyHaXgNDQ3aYDer88gN/h2Qdb8=; b=I8aCLrCKZb++fTGvFUYSVCA4HHhy7VLiFm+VdHXqXWTGcpfDQMAb4ELZoOUd69n26N2934 4dLL1BGI6BwIPVWX1SOedtWPE+mgBisLwUfRn/LepDar9fMzprmf+xWR9E4cBGjmHuO5cJ M3viTVmbagd5YCqGVkKfWlVwHGJfgNwPvY+3c5nkujfssB14qBAYsyV3I87BrGBxdXPMZf sQBY6yatWsM+GDYOVFVOkzr0szWw7sw1kxiSvRKefoGvznmrfz66RF5oNHq2Osa8gW5fGg k3MCW6Feun+f06t7xjmssyo2/Di8j6O4xAxGXTqaBiRIf47CPuQVcHPqwkyltg== 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 4SlSLR4rpNzjgf; Wed, 6 Dec 2023 06:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B66Yd1f031538; Wed, 6 Dec 2023 06:34:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B66Yd27031535; Wed, 6 Dec 2023 06:34:39 GMT (envelope-from git) Date: Wed, 6 Dec 2023 06:34:39 GMT Message-Id: <202312060634.3B66Yd27031535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 3ef596c6e805 - stable/13 - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3ef596c6e80562710da09c16558d7351749ea143 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=3ef596c6e80562710da09c16558d7351749ea143 commit 3ef596c6e80562710da09c16558d7351749ea143 Author: Xin LI AuthorDate: 2023-12-03 07:00:32 +0000 Commit: Xin LI CommitDate: 2023-12-06 06:34:26 +0000 periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. The leap-seconds.list is used exclusively by ntpd, therefore, do not bother to perform the fetch when ntpd is not enabled. PR: conf/275419 Reviewed by: cy, michaelo, imp Differential Revision: https://reviews.freebsd.org/D42875 (cherry picked from commit 3b3195f6767b39eb33b3523134ef988931c9c86d) --- usr.sbin/periodic/etc/daily/480.leapfile-ntpd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd index 17db53e625f8..c7de845ea87d 100755 --- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd +++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd @@ -12,9 +12,9 @@ fi case "$daily_ntpd_leapfile_enable" in [Yy][Ee][Ss]) - if service ntpd oneneedfetch; then + if service ntpd enabled && service ntpd needfetch; then anticongestion - service ntpd onefetch + service ntpd fetch fi ;; esac From nobody Wed Dec 6 07:55:21 2023 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 4SlV7Y4pfjz531hR; Wed, 6 Dec 2023 07:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlV7Y4GN0z4vR2; Wed, 6 Dec 2023 07:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701849321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OxmJCsdR6UG65HjFnvSqvZVBBtjD3aAENSlcQSCFj1U=; b=W5oxRXjvKWu5g6VslYmqMqr08BU4o5M5EraZKNY+1FOj8V10UNibQE27KGqQARI+pcDdOU vEFfMD271bv9C10jrYtrSmw6mg82Lbzo00LVwUp8qGK3FXlp84i9VvyLQ77w8Ns/tYHHSn GAy3+0Q6FBYRzwZTgAC2+VJpq7LsPNAyIZQpoWNLexF38c/EUt7QfRgSvz2DMH/4aQMbr9 alOJ1UmOQmxVNZyAkqylK7cuv1CXn4ZGTHTahqvfMjZEEtKH7NsfnQpymt8wakwpSZojiB eqkaF+JkiPcsjMNzu6PI9f7hpR/ZlzUP4SNjG1fwSLTDOS56NN0UMowJ9DChTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701849321; a=rsa-sha256; cv=none; b=DpR/DYROU9noT21wvmd/3YDcT+o9DGKiPxvRKKOapVhLVI33kGnIeAXHIJG2/h9gi545xA cJVHFhPZvnMNCKbt/hef+ynwDPNwwm67HsiEZH2u4RRimivzht4b0AjebV9DbnriAe7F0d 1geLWDONw42DT0XeA0E3KxudQ5B6oTvZLDRpSCHR14yd0EIXguBrVdYBov4jHerL63GZK/ RpHCyZmTyxReZ9CQIusi/VHO8oA+KhY9aDYh47YEqLBG/y6gRmnZxEOa4Cq6334aVSKCLP /d0OAx7nehwTZ2C5GKs2VS+QuEncSxV1LCHwFVzYTvCtzzXwTo52Zsv5IFahTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701849321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OxmJCsdR6UG65HjFnvSqvZVBBtjD3aAENSlcQSCFj1U=; b=Bwu/k1765471A7bdgaE88L2fM4pd/uF2UWtAPBgigKNu5ql2t07/edBdrelH4RLU/1C33x 0uiznQMglAb3Kyzei4ZjrmCM2TMYnWwUK/yVha8dXXP4UNeZ0HyfzoMpLgOx1EnGeUP+Ck SS9SsGdHFiB24WJDyf9F4U0A1SsjQ1sLPrF4fhZ9T9obcDnB5ignYWj6L5bNh3Nu5x87Dg jvinkdSwxKVa+u9ZkkTZmAA4LcbizL8u7PoAVLbawphiYyXYzqMzfshrIrYJS9bsJEBN7R ulJvzEFIKJerphLgkvDGIMhjYYfLcQVJxIE8+B7qSD6c7yxU8B95dp8uSgbFaw== 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 4SlV7Y3CRVzl7Y; Wed, 6 Dec 2023 07:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B67tLQp064646; Wed, 6 Dec 2023 07:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B67tLh6064643; Wed, 6 Dec 2023 07:55:21 GMT (envelope-from git) Date: Wed, 6 Dec 2023 07:55:21 GMT Message-Id: <202312060755.3B67tLh6064643@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 80560eec655a - stable/12 - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 80560eec655ac6cd3b7d7fd0f9fe37f309b78d64 Auto-Submitted: auto-generated The branch stable/12 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=80560eec655ac6cd3b7d7fd0f9fe37f309b78d64 commit 80560eec655ac6cd3b7d7fd0f9fe37f309b78d64 Author: Xin LI AuthorDate: 2023-12-03 07:00:32 +0000 Commit: Xin LI CommitDate: 2023-12-06 07:55:17 +0000 periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. The leap-seconds.list is used exclusively by ntpd, therefore, do not bother to perform the fetch when ntpd is not enabled. PR: conf/275419 Reviewed by: cy, michaelo, imp Differential Revision: https://reviews.freebsd.org/D42875 (cherry picked from commit 3b3195f6767b39eb33b3523134ef988931c9c86d) --- usr.sbin/periodic/etc/daily/480.leapfile-ntpd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd index a693986e0dd1..f4a1edb8d5a2 100755 --- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd +++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd @@ -13,9 +13,9 @@ fi case "$daily_ntpd_leapfile_enable" in [Yy][Ee][Ss]) - if service ntpd oneneedfetch; then + if service ntpd enabled && service ntpd needfetch; then anticongestion - service ntpd onefetch + service ntpd fetch fi ;; esac From nobody Wed Dec 6 08:46:53 2023 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 4SlWH62rYGz535JD for ; Wed, 6 Dec 2023 08:46:58 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from smtp-8fab.mail.infomaniak.ch (smtp-8fab.mail.infomaniak.ch [83.166.143.171]) (using TLSv1.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 (2048 bits) client-digest SHA256) (Client CN "relay.mail.infomaniak.ch", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlWH56rwsz3FbL for ; Wed, 6 Dec 2023 08:46:57 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: from smtp-2-0001.mail.infomaniak.ch (unknown [10.5.36.108]) by smtp-2-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4SlWH32hxWzMq3cT; Wed, 6 Dec 2023 08:46:55 +0000 (UTC) Received: from unknown by smtp-2-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4SlWH26tpvzMpnyw; Wed, 6 Dec 2023 09:46:54 +0100 (CET) Message-ID: Date: Wed, 6 Dec 2023 09:46:53 +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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 14dcd4098374 - main - linuxkpi: `GFP_KERNEL` equals `M_NOWAIT` now Content-Language: fr, en-US To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202311241731.3AOHVsEJ061730@gitrepo.freebsd.org> From: =?UTF-8?Q?Jean-S=C3=A9bastien_P=C3=A9dron?= Organization: The FreeBSD Project In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Infomaniak-Routing: alpha X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29222, ipnet:83.166.128.0/19, country:CH] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SlWH56rwsz3FbL On 06/12/2023 00:52, Konstantin Belousov wrote: > Unfortunately this broke even attach of the mlx5(4) driver. > According to the 'official' Linux kernel documentation, the GFP_KERNEL > flag implies sleepable context. mlx5_core uses the passed GFP flag to > determine if it is called in the sleepable context, and now even initial > load assumes that it cannot perform sleeping ops. See, for instance, > second if() statement in the mlx5_fwp_alloc() function. Oh sorry... Thank you for reporting the issue. I will revisit this change then. Should I revert it in main until there is a solution? -- Jean-Sébastien Pédron The FreeBSD Project From nobody Wed Dec 6 09:56:29 2023 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 4SlXqK66XJz539fx; Wed, 6 Dec 2023 09:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlXqK5TVLz3M8F; Wed, 6 Dec 2023 09:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701856589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Oqg04izip/pmQJHyXzOyWjuqH/8PaasuESAIY38lB4=; b=tPVHyAo79otFSiO7eWjl4/oFSqyGizfksKqMpAqqhR3uqdPGnlrAYGnBbxXJMVKT25iw2q 9wd5tj4IQV7EE50TEEO0hCvpLMm40MSBF8clpgfsv1yAIMT5kZB58Am/a0+83BwCh1oXlP /m8EyT4TJXNh8X+IL//byu6LRO/L8cGT4G6D6b/3Nuz/nM34rVPMzwOR6L8Hn5UGqoekut Ov/gXgCo93i2MeHK3fZLbrsfJI0LvzBkJJT1BAFRQl7r4JlXHV7IYXqsG5yx1a6HSJubac 53d+ESNYG37o6sQ2DAEUPZ8EjnczbSnwkT0H7CCA7UbX0avJBw/oFIlLh3Cchg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701856589; a=rsa-sha256; cv=none; b=FRNZElyru5/k5NMCt3JyS7KGIRNflANaMl6+QzkYCWRIb1ROkja4eqtho4qx48YuFkohiw XMc9y7CBxhRW/wXe5O1MU9yA+1y7SXSdwuN0Xl3hWgHoJS2YOqCxBfN9PC7//xIfA+lqrg ME0HKhIk6bJ59na+4nu+yqQ0su4GR/BsU3AEZ+vIN9+LOxdScuTiYzQ9DVnxnf4FnBmC5s AbzCtnmWQLDRIvzhpkdkIygPNIT1EThW4RIcC2G+s5DWKzQBymWDNt8HZ29Co4wO9Fxk4H VsJADesUXgwIvpXcYIHh3DpMxbR/zE3DEKStInYeUDcMkD8dKoW65sJo8ITYow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701856589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Oqg04izip/pmQJHyXzOyWjuqH/8PaasuESAIY38lB4=; b=jfZaKZJ7gjWNg9yZBFQFsk2WhfgtS0Jf7gvicA1+yRaboV1vuBMvTRpYAFoIrnbRZAo4AL PTebPn23a7myVD6hPlDzqLQkorc+XA2S115PiIotEYA7A6V6QJDNHuk9DfLRMDqILzXuel 4nF5gbZXaAqHBfGRKwPyJy0NG8CHI1tmulf7bOyvN0WK8FxgXwIAPu0RQ7szR9H1mbPhAc pcHYyvz71lYl117Jnm1giQoGJOURrd2t+dSkHFxuFYTfgAs2hIYNTTOOzmuZ41rAHyUUoB zEI6cPHA1QeIT52n22lFo0XVwo4Sj2gsYzzTg6kJSjq5iYaWFTBbVnF9RVUiHw== 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 4SlXqK4Sy5zpYh; Wed, 6 Dec 2023 09:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B69uTvO065192; Wed, 6 Dec 2023 09:56:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B69uT6l065189; Wed, 6 Dec 2023 09:56:29 GMT (envelope-from git) Date: Wed, 6 Dec 2023 09:56:29 GMT Message-Id: <202312060956.3B69uT6l065189@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: 4c84c69ba308 - main - pf tests: test that we validate sequence numbers on TCP RST List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4c84c69ba308b7758d07dc8845b13922ed667e02 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4c84c69ba308b7758d07dc8845b13922ed667e02 commit 4c84c69ba308b7758d07dc8845b13922ed667e02 Author: Kristof Provost AuthorDate: 2023-11-29 12:51:39 +0000 Commit: Kristof Provost CommitDate: 2023-12-05 20:03:49 +0000 pf tests: test that we validate sequence numbers on TCP RST MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/common/Makefile | 2 + tests/sys/netpfil/common/pft_rst.py | 39 +++++++++++++ tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/tcp.sh | 109 ++++++++++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+) diff --git a/tests/sys/netpfil/common/Makefile b/tests/sys/netpfil/common/Makefile index f51b89d5eab4..0003aac28779 100644 --- a/tests/sys/netpfil/common/Makefile +++ b/tests/sys/netpfil/common/Makefile @@ -21,11 +21,13 @@ ${PACKAGE}FILES+= \ runner.subr \ pft_icmp_check.py \ pft_ping.py \ + pft_rst.py \ pft_synflood.py \ sniffer.py ${PACKAGE}FILESMODE_pft_icmp_check.py= 0555 ${PACKAGE}FILESMODE_pft_ping.py= 0555 +${PACKAGE}FILESMODE_pft_rst.py= 0555 ${PACKAGE}FILESMODE_pft_synflood.py= 0555 .include diff --git a/tests/sys/netpfil/common/pft_rst.py b/tests/sys/netpfil/common/pft_rst.py new file mode 100644 index 000000000000..28d951e8a047 --- /dev/null +++ b/tests/sys/netpfil/common/pft_rst.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Rubicon Communications, LLC (Netgate) +# +# 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. +# + +import logging +logging.getLogger("scapy").setLevel(logging.CRITICAL) +import math +import scapy.all as sp +import sys + +def send_rst(src_ip, src_port, dst_ip, dst_port): + sp.send(sp.IP(src=src_ip, dst=dst_ip) / + sp.TCP(sport=src_port, dport=dst_port, seq=1, flags="R")) + +send_rst(sys.argv[1], int(sys.argv[2]), sys.argv[3], int(sys.argv[4])) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 9337b95baf4e..1083f89a5502 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -40,6 +40,7 @@ ATF_TESTS_SH+= altq \ syncookie \ synproxy \ table \ + tcp \ tos ATF_TESTS_PYTEST+= frag6.py diff --git a/tests/sys/netpfil/pf/tcp.sh b/tests/sys/netpfil/pf/tcp.sh new file mode 100644 index 000000000000..84536480b44e --- /dev/null +++ b/tests/sys/netpfil/pf/tcp.sh @@ -0,0 +1,109 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Rubicon Communications, LLC (Netgate) +# +# 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. + +. $(atf_get_srcdir)/utils.subr + +common_dir=$(atf_get_srcdir)/../common + +atf_test_case "rst" "cleanup" +rst_head() +{ + atf_set descr 'Check sequence number validation in RST packets' + atf_set require.user root + atf_set require.progs scapy +} + +rst_body() +{ + pft_init + + epair_srv=$(vnet_mkepair) + epair_cl=$(vnet_mkepair) + epair_attack=$(vnet_mkepair) + + br=$(vnet_mkbridge) + ifconfig ${br} addm ${epair_srv}a + ifconfig ${epair_srv}a up + ifconfig ${br} addm ${epair_cl}a + ifconfig ${epair_cl}a up + ifconfig ${br} addm ${epair_attack}a + ifconfig ${epair_attack}a up + ifconfig ${br} up + + vnet_mkjail srv ${epair_srv}b + jexec srv ifconfig ${epair_srv}b 192.0.2.1/24 up + jexec srv ifconfig lo0 inet 127.0.0.1/8 up + + vnet_mkjail cl ${epair_cl}b + jexec cl ifconfig ${epair_cl}b 192.0.2.2/24 up + jexec cl ifconfig lo0 inet 127.0.0.1/8 up + + jexec cl pfctl -e + pft_set_rules cl \ + "pass keep state" + + # Not required, but pf should log the bad RST packet with this set. + jexec cl pfctl -x loud + + vnet_mkjail attack ${epair_attack}b + jexec attack ifconfig ${epair_attack}b 192.0.2.3/24 up + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec cl ping -c 1 192.0.2.1 + + echo "bar" | jexec srv nc -l 1234 & + # Allow server time to start + sleep 1 + + echo "foo" | jexec cl nc -p 4321 192.0.2.1 1234 & + # Allow connection time to set up + sleep 1 + + # Connection should be established now + atf_check -s exit:0 -e ignore \ + -o match:"ESTABLISHED:ESTABLISHED" \ + jexec cl pfctl -ss -v + + # Now insert a fake RST + atf_check -s exit:0 -o ignore \ + jexec attack ${common_dir}/pft_rst.py 192.0.2.1 1234 192.0.2.2 4321 + + # Connection should remain established + atf_check -s exit:0 -e ignore \ + -o match:"ESTABLISHED:ESTABLISHED" \ + jexec cl pfctl -ss -v +} + +rst_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "rst" +} From nobody Wed Dec 6 09:57:58 2023 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 4SlXsB2zxxz539g5; Wed, 6 Dec 2023 09:58:06 +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 4SlXsB04WPz3MWX; Wed, 6 Dec 2023 09:58:05 +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.17.1/8.17.1) with ESMTP id 3B69vwgP093433; Wed, 6 Dec 2023 11:58:01 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 3B69vwgP093433 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 3B69vwsk093432; Wed, 6 Dec 2023 11:57:58 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 6 Dec 2023 11:57:58 +0200 From: Konstantin Belousov To: =?utf-8?Q?Jean-S=C3=A9bastien_P=C3=A9dron?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 14dcd4098374 - main - linuxkpi: `GFP_KERNEL` equals `M_NOWAIT` now Message-ID: References: <202311241731.3AOHVsEJ061730@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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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-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.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SlXsB04WPz3MWX On Wed, Dec 06, 2023 at 09:46:53AM +0100, Jean-Sébastien Pédron wrote: > On 06/12/2023 00:52, Konstantin Belousov wrote: > > Unfortunately this broke even attach of the mlx5(4) driver. > > According to the 'official' Linux kernel documentation, the GFP_KERNEL > > flag implies sleepable context. mlx5_core uses the passed GFP flag to > > determine if it is called in the sleepable context, and now even initial > > load assumes that it cannot perform sleeping ops. See, for instance, > > second if() statement in the mlx5_fwp_alloc() function. > > Oh sorry... Thank you for reporting the issue. I will revisit this change > then. Should I revert it in main until there is a solution? Up to you. I do not see a need in churn if the fix would come in several days. Thank you. From nobody Wed Dec 6 13:38:50 2023 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 4Sldlx2MTJz53SbS; Wed, 6 Dec 2023 13:38:53 +0000 (UTC) (envelope-from SRS0=udCQ=HR=klop.ws=ronald-lists@realworks.nl) Received: from smtp-relay-int.realworks.nl (smtp-relay-int.realworks.nl [194.109.157.24]) (using TLSv1.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 4Sldlw1PxQz3gk5; Wed, 6 Dec 2023 13:38:52 +0000 (UTC) (envelope-from SRS0=udCQ=HR=klop.ws=ronald-lists@realworks.nl) Authentication-Results: mx1.freebsd.org; none Date: Wed, 6 Dec 2023 14:38:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=klop.ws; s=rw2; t=1701869930; 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=1UMd9PfTVgRBpy/vBRiDKPZaH5gM4Z4p7p8Y49bt4pQ=; b=UmL0U/GM+DgkYa9EFikBg0vChNaL+rENj6dH351twXIPj9buslTTUeG3//xHBJdj4MAlCz Ps1ajgXHftsn9nfUrAwda59k1vIucmDuCMhcoYOWBuuxScWQEugYxljjd7NIdeKF5DviQL it2l2ecSDLW3ShHAZubpUfB8cugSWrABE32rybnar3lYiuliBUK4fi2M4wopLTIoGqfnp2 VHlIZr6sWxCc4dDE4Dp7lZaUppFFrPNYwfa4MA88+x/HOOdkEmwok/MrdKm2bsX8sczxY1 qJN9P0MzxNCH4wKebInsLTuRmKOrJHNT8YvtA3eg2RBFfJcDRj3pOlrxDcwtZw== From: Ronald Klop To: Brooks Davis Cc: dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-main@FreeBSD.org Message-ID: <1420873807.1802.1701869930070@localhost> In-Reply-To: <202312051904.3B5J4lNg077287@gitrepo.freebsd.org> References: <202312051904.3B5J4lNg077287@gitrepo.freebsd.org> Subject: Re: git: 3c097b06a717 - main - Cirrus-CI: forcably upgrade pkg to latest List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_1801_2140617763.1701869930064" X-Mailer: Realworks (682.17) Importance: Normal X-Priority: 3 (Normal) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:3265, ipnet:194.109.0.0/16, country:NL] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Sldlw1PxQz3gk5 ------=_Part_1801_2140617763.1701869930064 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Wouldn't "pkg bootstrap -f" do what you want without hardcoding versions? Regards, Ronald. Van: Brooks Davis Datum: dinsdag, 5 december 2023 20:04 Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Onderwerp: git: 3c097b06a717 - main - Cirrus-CI: forcably upgrade pkg to latest > > The branch main has been updated by brooks: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3c097b06a71715ec9ae86430ee94e25e954a1e36 > > commit 3c097b06a71715ec9ae86430ee94e25e954a1e36 > Author: Jose Luis Duran > AuthorDate: 2023-12-05 19:04:04 +0000 > Commit: Brooks Davis > CommitDate: 2023-12-05 19:04:04 +0000 > > Cirrus-CI: forcably upgrade pkg to latest > > make packages requires the latest pkg for now so force that. > > Differential Revision: https://reviews.freebsd.org/D42908 > --- > .cirrus.yml | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/.cirrus.yml b/.cirrus.yml > index 8e14dc9c0305..3abf6898a66d 100644 > --- a/.cirrus.yml > +++ b/.cirrus.yml > @@ -75,6 +75,11 @@ task: > install_script: > - sh .cirrus-ci/pkg-install.sh ${TOOLCHAIN_PKG} git-lite > > + xxx_upgrade_pkg_script: > + - fetch http://pkg.freebsd.org/FreeBSD:13:amd64/latest/All/pkg-1.20.9.pkg > + - pkg install -y ./pkg-1.20.9.pkg > + - rm -f pkg-1.20.9.pkg > + > setup_script: > - uname -a > - gpart show > > > > ------=_Part_1801_2140617763.1701869930064 Content-Type: text/html; charset=us-ascii Content-Transfer-Encoding: 7bit Wouldn't "pkg bootstrap -f" do what you want without hardcoding versions?

Regards,
Ronald.

 

Van: Brooks Davis <brooks@FreeBSD.org>
Datum: dinsdag, 5 december 2023 20:04
Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Onderwerp: git: 3c097b06a717 - main - Cirrus-CI: forcably upgrade pkg to latest

The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=3c097b06a71715ec9ae86430ee94e25e954a1e36

commit 3c097b06a71715ec9ae86430ee94e25e954a1e36
Author:     Jose Luis Duran <jlduran@gmail.com>
AuthorDate: 2023-12-05 19:04:04 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-12-05 19:04:04 +0000

    Cirrus-CI: forcably upgrade pkg to latest
    
    make packages requires the latest pkg for now so force that.
    
    Differential Revision:  https://reviews.freebsd.org/D42908
---
 .cirrus.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8e14dc9c0305..3abf6898a66d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -75,6 +75,11 @@ task:
   install_script:
   - sh .cirrus-ci/pkg-install.sh ${TOOLCHAIN_PKG} git-lite
 
+  xxx_upgrade_pkg_script:
+  - fetch http://pkg.freebsd.org/FreeBSD:13:amd64/latest/All/pkg-1.20.9.pkg
+  - pkg install -y ./pkg-1.20.9.pkg
+  - rm -f pkg-1.20.9.pkg
+
   setup_script:
   - uname -a
   - gpart show
 

  ------=_Part_1801_2140617763.1701869930064-- From nobody Wed Dec 6 14:41:32 2023 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 4Slg8D3nfVz53XBB; Wed, 6 Dec 2023 14:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slg8D3J7Fz4JMm; Wed, 6 Dec 2023 14:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701873692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUuWrVTFgTzRP5U3seyr6LbvHObzPO40T/zkqnx1w6U=; b=k+zvxIbatPDkFTwvBRUZ6r5XDDtfZniD2gByLOz8h0xKDLzzHD2XC3I5N+r8ZJ7UQrmhWB 8k6WA7+sO1Uir1TZ4AXJXth45NgNhNu5ZVaZwUCy92DSqgze6Hg0yUOwDICP7CMLuSL3zp mg5J3ubWzEwd0y7Quzrf4J7Eq6jr5xyLPhSVyCTtHqGVtxNwT7DN8dzki9jNHe3BjiOMN2 peDncQJ7f4MP/S1VKvpaM1td5N7zd3ihuLlNBVFXetzKTxfjEVfk4sfaDGTIzv6X55yutT bkaYOcxN9Zw6pbQgVMGHH53Cu9Uj7wmZmmWtO1V+Eozxdiui1DMp5k6NTTNeEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701873692; a=rsa-sha256; cv=none; b=cSkCqHbUTpkz8M07PnTlFKAbwDrndsUlDNlyT70E3SAlv7c41KlSyKVEd7STBHDi11mS0Y h0vLZ/f/kkHq7ECXoz3U6nntCsHqWlla1LUjixV5sJqLksPCqo1C4Byn+w+Q0MTouJKy/X 6Teqo9FEo5gB64uH6xWjxaHDf3tQG537OyeynEX79EujtW+RNY+dWLvj0qUYALOlPcZlAa vMsGdkWkVuGDQ+C2urBU1QPWohsi4a/vt4w0cuqApeS94cN7ASgCtH3mPLcO1V4xSF2loB HftoOKxuEtAKhKhfVi8fXmihuf//MmiucnQ/7mfA35Tdp1rzIkwHmIyjitwPGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701873692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUuWrVTFgTzRP5U3seyr6LbvHObzPO40T/zkqnx1w6U=; b=Xzqvh5MniePjjivBufYGs1aLKIUa5PoXej097GsrkOZiNM+mOhOKq/VEOKxUrKeVwtUh7G dYcC/A1FXhrnK/Vc2SWecNSrf5ZAewXD3LLWeb/jutFrilKHtIGbIky9IvyKFeFmG5sqsW 2zUNm3bAkdl+6MeRo+Kgw1WTLGOs4YnNvBDa+rFsPNn/ybPQWd+dNP3IddgREQp1DZdy20 N30RAY8IAuZ+Hpd1wZomqVBylI/2Jho0MAQNNf+spppJrbEWany+KSlORb0I6tN6LPS/Sx vH6AtXqy8YB/j2xsDfkIedr7JpC01FHqz5TcuM+mntAeSVztE5KYFspTBEbwJA== 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 4Slg8D2NHHzx02; Wed, 6 Dec 2023 14:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6EfWMS045733; Wed, 6 Dec 2023 14:41:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6EfW1P045730; Wed, 6 Dec 2023 14:41:32 GMT (envelope-from git) Date: Wed, 6 Dec 2023 14:41:32 GMT Message-Id: <202312061441.3B6EfW1P045730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 05c55eed44e5 - stable/13 - pf: fix mem leaks upon vnet destroy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 05c55eed44e53a3a5473451d105f81ce36ef375a Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=05c55eed44e53a3a5473451d105f81ce36ef375a commit 05c55eed44e53a3a5473451d105f81ce36ef375a Author: Igor Ostapenko AuthorDate: 2023-11-29 12:35:41 +0000 Commit: Kristof Provost CommitDate: 2023-12-06 13:23:33 +0000 pf: fix mem leaks upon vnet destroy Add missing cleanup actions: - remove user defined anchor rulesets - remove user defined ether anchor rulesets - remove tables linked to user defined anchors - deal with wildcard anchor peculiarities to get them removed correctly PR: 274310 Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42747 (cherry picked from commit 0626d30e41cba64b41667314c3a4f7611f0eb685) --- sys/netpfil/pf/pf_ioctl.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 639c2462fe75..81b766cb7f6a 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -5089,6 +5089,7 @@ pf_clear_tables(void) int error; bzero(&io, sizeof(io)); + io.pfrio_flags |= PFR_FLAG_ALLRSETS; error = pfr_clr_tables(&io.pfrio_table, &io.pfrio_ndel, io.pfrio_flags); @@ -5499,8 +5500,34 @@ shutdown_pf(void) int error = 0; u_int32_t t[5]; char nn = '\0'; + struct pf_kanchor *anchor; + int rs_num; do { + /* Unlink rules of all user defined anchors */ + RB_FOREACH(anchor, pf_kanchor_global, &V_pf_anchors) { + /* Wildcard based anchors may not have a respective + * explicit anchor rule or they may be left empty + * without rules. It leads to anchor.refcnt=0, and the + * rest of the logic does not expect it. */ + if (anchor->refcnt == 0) + anchor->refcnt = 1; + for (rs_num = 0; rs_num < PF_RULESET_MAX; ++rs_num) { + if ((error = pf_begin_rules(&t[rs_num], rs_num, + anchor->path)) != 0) { + DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: " + "anchor.path=%s rs_num=%d\n", + anchor->path, rs_num)); + goto error; /* XXX: rollback? */ + } + } + for (rs_num = 0; rs_num < PF_RULESET_MAX; ++rs_num) { + error = pf_commit_rules(t[rs_num], rs_num, + anchor->path); + MPASS(error == 0); + } + } + if ((error = pf_begin_rules(&t[0], PF_RULESET_SCRUB, &nn)) != 0) { DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: SCRUB\n")); @@ -5527,12 +5554,16 @@ shutdown_pf(void) break; /* XXX: rollback? */ } - /* XXX: these should always succeed here */ - pf_commit_rules(t[0], PF_RULESET_SCRUB, &nn); - pf_commit_rules(t[1], PF_RULESET_FILTER, &nn); - pf_commit_rules(t[2], PF_RULESET_NAT, &nn); - pf_commit_rules(t[3], PF_RULESET_BINAT, &nn); - pf_commit_rules(t[4], PF_RULESET_RDR, &nn); + error = pf_commit_rules(t[0], PF_RULESET_SCRUB, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[1], PF_RULESET_FILTER, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[2], PF_RULESET_NAT, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[3], PF_RULESET_BINAT, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[4], PF_RULESET_RDR, &nn); + MPASS(error == 0); if ((error = pf_clear_tables()) != 0) break; @@ -5553,6 +5584,7 @@ shutdown_pf(void) /* fingerprints and interfaces have their own cleanup code */ } while(0); +error: return (error); } From nobody Wed Dec 6 14:41:33 2023 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 4Slg8F5P29z53XBD; Wed, 6 Dec 2023 14:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slg8F4XnSz4JQd; Wed, 6 Dec 2023 14:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701873693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3KrYorFUj8Yww/2YaTfZJ1a/Zs4NLjMSJqcEgufMbaM=; b=KEh38+M2bhov27IVxPICzGmKfrbImlAzqpm7NhBExuqFF3EIeh8EFfseXHqyv2E4GD/VGd KYXzEA8dcsAWRhX6pI+T6bJdBJ2gDVqnajjdUi+UK7c6NTntNA0JVrfMC+EpTTo9iBQewR eu+pnjF91/mVcOdyLDXSvF0RUgvLRzHbYNL+wbF/umxxAC0QlKw2V143x99XQX/U8U7AL7 p0lvfcEKlj8txDxlvq/s9w+i8wgXzx6mWFVBpeHMrDyNa+NLZ3nCIjULOoP4Xhi/T6d0y5 ZSZffs9XNyeMkeNjULIP74K6O3aHjj8mg/ZmKG9dFD2w49HaNU+Xby50L16MJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701873693; a=rsa-sha256; cv=none; b=SGcS5sDLugEzP6Q3/eWS4oGA1tMYrDqb39PFGTHq9RfpwVAsdVafufOUqoFkxInqcODyDb iyKbCXW3gkjjoZpQAA76W11m9nSvCyRWk0G2d3eqjsJ6cflj6I/GS/7FZ5WrhEqq0gGSCz 9SLqSjLuoDVzl36yGqtx0TXVQoJkNjodazm3GL+iyV02KREwTLv76+Bw8zwEiw4YGHQxea ateoAQ4PcG+WSxzNFXrjJ0nQnpqmqv3AqzkUlif/ik9OujU4tETtBgUoARJNUDPbfzNqL5 +4aB1sipksHPEq3iP3KH91V/ODrvYgm3648XBz0UDeEYlWTXciFGyrU4Y6iEow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701873693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3KrYorFUj8Yww/2YaTfZJ1a/Zs4NLjMSJqcEgufMbaM=; b=PtUrq1nSbZJARApGEscGVXbwsX9h9l9ArixBHe/54FVGI+8uOGMkfLK4Ezv5ostWYA6gJn ySpgjH4lqZQDi8Zh6PTWK5r6ZN9ZjhWn80rNvJ9i+P/pbkpJXY0jLJ0+LuJA5ombS4/IX6 Ji/cEPdk3QcVifNusy0MnKH1oeUkeH+R4G49Q5KOGKtL+talZAbPZZIN7Mi3Z3/oJQkC/g upBwZcBVN8+fROeARAgRWbVw/cEMj4KQxFsqnxXPKfGiZDCraqeAbqJNo9sRtz0c3Wntyt +FUpf7Cc05+GD6Lmu5mB4HzuUhRi/mDan2+TyUZq83ocpkR5NzrFapEayohOgQ== 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 4Slg8F3d6tzwx9; Wed, 6 Dec 2023 14:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6EfXCL045863; Wed, 6 Dec 2023 14:41:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6EfXEf045860; Wed, 6 Dec 2023 14:41:33 GMT (envelope-from git) Date: Wed, 6 Dec 2023 14:41:33 GMT Message-Id: <202312061441.3B6EfXEf045860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 285b505a4ee0 - stable/14 - pf: fix mem leaks upon vnet destroy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 285b505a4ee0ab2fdc8f970e7d23a6d3091dc686 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=285b505a4ee0ab2fdc8f970e7d23a6d3091dc686 commit 285b505a4ee0ab2fdc8f970e7d23a6d3091dc686 Author: Igor Ostapenko AuthorDate: 2023-11-29 12:35:41 +0000 Commit: Kristof Provost CommitDate: 2023-12-06 09:08:25 +0000 pf: fix mem leaks upon vnet destroy Add missing cleanup actions: - remove user defined anchor rulesets - remove user defined ether anchor rulesets - remove tables linked to user defined anchors - deal with wildcard anchor peculiarities to get them removed correctly PR: 274310 Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42747 (cherry picked from commit 0626d30e41cba64b41667314c3a4f7611f0eb685) --- sys/netpfil/pf/pf_ioctl.c | 67 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index de43570176cb..a397b9e99261 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -6028,6 +6028,7 @@ pf_clear_tables(void) int error; bzero(&io, sizeof(io)); + io.pfrio_flags |= PFR_FLAG_ALLRSETS; error = pfr_clr_tables(&io.pfrio_table, &io.pfrio_ndel, io.pfrio_flags); @@ -6438,8 +6439,54 @@ shutdown_pf(void) int error = 0; u_int32_t t[5]; char nn = '\0'; + struct pf_kanchor *anchor; + struct pf_keth_anchor *eth_anchor; + int rs_num; do { + /* Unlink rules of all user defined anchors */ + RB_FOREACH(anchor, pf_kanchor_global, &V_pf_anchors) { + /* Wildcard based anchors may not have a respective + * explicit anchor rule or they may be left empty + * without rules. It leads to anchor.refcnt=0, and the + * rest of the logic does not expect it. */ + if (anchor->refcnt == 0) + anchor->refcnt = 1; + for (rs_num = 0; rs_num < PF_RULESET_MAX; ++rs_num) { + if ((error = pf_begin_rules(&t[rs_num], rs_num, + anchor->path)) != 0) { + DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: " + "anchor.path=%s rs_num=%d\n", + anchor->path, rs_num)); + goto error; /* XXX: rollback? */ + } + } + for (rs_num = 0; rs_num < PF_RULESET_MAX; ++rs_num) { + error = pf_commit_rules(t[rs_num], rs_num, + anchor->path); + MPASS(error == 0); + } + } + + /* Unlink rules of all user defined ether anchors */ + RB_FOREACH(eth_anchor, pf_keth_anchor_global, + &V_pf_keth_anchors) { + /* Wildcard based anchors may not have a respective + * explicit anchor rule or they may be left empty + * without rules. It leads to anchor.refcnt=0, and the + * rest of the logic does not expect it. */ + if (eth_anchor->refcnt == 0) + eth_anchor->refcnt = 1; + if ((error = pf_begin_eth(&t[0], eth_anchor->path)) + != 0) { + DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: eth " + "anchor.path=%s\n", eth_anchor->path)); + goto error; + } + error = pf_commit_eth(t[0], eth_anchor->path); + MPASS(error == 0); + } + if ((error = pf_begin_rules(&t[0], PF_RULESET_SCRUB, &nn)) != 0) { DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: SCRUB\n")); @@ -6466,12 +6513,16 @@ shutdown_pf(void) break; /* XXX: rollback? */ } - /* XXX: these should always succeed here */ - pf_commit_rules(t[0], PF_RULESET_SCRUB, &nn); - pf_commit_rules(t[1], PF_RULESET_FILTER, &nn); - pf_commit_rules(t[2], PF_RULESET_NAT, &nn); - pf_commit_rules(t[3], PF_RULESET_BINAT, &nn); - pf_commit_rules(t[4], PF_RULESET_RDR, &nn); + error = pf_commit_rules(t[0], PF_RULESET_SCRUB, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[1], PF_RULESET_FILTER, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[2], PF_RULESET_NAT, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[3], PF_RULESET_BINAT, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[4], PF_RULESET_RDR, &nn); + MPASS(error == 0); if ((error = pf_clear_tables()) != 0) break; @@ -6480,7 +6531,8 @@ shutdown_pf(void) DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: eth\n")); break; } - pf_commit_eth(t[0], &nn); + error = pf_commit_eth(t[0], &nn); + MPASS(error == 0); #ifdef ALTQ if ((error = pf_begin_altq(&t[0])) != 0) { @@ -6498,6 +6550,7 @@ shutdown_pf(void) /* fingerprints and interfaces have their own cleanup code */ } while(0); +error: return (error); } From nobody Wed Dec 6 15:36:38 2023 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 4SlhMp301nz53bB6; Wed, 6 Dec 2023 15:36: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlhMp2QxRz4NtS; Wed, 6 Dec 2023 15:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701876998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iDNXhjR8n7y6umJ5hymb6vuJ54j/PjO12cI2TJdTbus=; b=gTi0g5TqkOODA9hwNlC0o26PaECRFJX9Kk0//RnLVZTnvvn+CvvbNBnYD8Y8eirDTS2nY6 MLAgbwf0Dxihw2cr9xsMMo5mg1L2oR8lj3p18aHoKBe2x6U6zuHH77cuAR2774GUo55Wzv Wx8SmtNFqEq21fZMvaPEYwjZWihcs5NhMrNQlbLdAODcLqODPAx1SRIxTqoLqIaoN2vYvA Ub1/tyLIMPChqfP2KIutwici8CaJzXJ6EiapUQ4PKju0adQInq/u4uH2A5bHpuqMqW7kqc wE39U7DYvP8auK3NujL0XhZ1YjKFVGPSgaLNmcrBBLD9ILtEdVhPx4YxIJRmFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701876998; a=rsa-sha256; cv=none; b=yn1ydFWC6OdunpvCw8AFpyv09uZ/k9ALFJ3uLO2S1KLekFnMFkh9lJXxe9O+wOclP3qVvQ c/LB1+4FnOADpHp/edO5surjFq+6co5vm36qf6wXGKFJ4zO5t5oxIcDp7Pyh4rIjnE9u1y 11iRYNOyrA+9mACfwecKvSLyXJ5V1rt3iNa4O/zt5u716+vhufyfFvEsV1m4FW3+uPK4O6 uhbw4jcH7n0B7kfAEMz/fUk/apeylL0Cj/0cjq/jDR9JhExnHG5788jFbfKzSDfHysLq8e PvaV/v/TvTO2SdqjnOT8d5e5PSsmTl7Tq+YnaGNOYR2D4rUpJW0LyAEAJmE42Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701876998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iDNXhjR8n7y6umJ5hymb6vuJ54j/PjO12cI2TJdTbus=; b=gaq7eyybp/ekRUha4S8VKTptgzW9/CZxFsc9nJ+qzmaZy5fp7m+/wNTyuIWKjOtZvACQIE ziDVn/tnJQkcAZuHmj2H3wD7fFVvWJJq5nhHIriziDxy4t/wthNeqyXpjet5+1gQbPxCmw zN0KYH0KXeCOpZ9EwyEa87Wk3b+SgRFPS5BwlbZ8qc5/yGl0hnmrknPphKeyq3Z3EgalZL AUFuHjX8PMsaqfgQFF3BxEG755fa9blHVTHKcZwtfW5x8W57q9GD85OksO5zz2GGwV1p0j IUWQkm33Y08SuCISePcWTaahw/Fd1zrzmxYzUzpGMeM1pFHsSrfMHOclQEAVtw== 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 4SlhMp1VpYzysM; Wed, 6 Dec 2023 15:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6FacrW035882; Wed, 6 Dec 2023 15:36:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6Fac6g035879; Wed, 6 Dec 2023 15:36:38 GMT (envelope-from git) Date: Wed, 6 Dec 2023 15:36:38 GMT Message-Id: <202312061536.3B6Fac6g035879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 3a8271dc1d77 - stable/14 - CAM: Remove return value from xpt_path_sbuf() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3a8271dc1d77990861d30eaac0aa626de1c53053 Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=3a8271dc1d77990861d30eaac0aa626de1c53053 commit 3a8271dc1d77990861d30eaac0aa626de1c53053 Author: Alexander Motin AuthorDate: 2023-11-22 20:10:57 +0000 Commit: Alexander Motin CommitDate: 2023-12-06 15:34:38 +0000 CAM: Remove return value from xpt_path_sbuf() It is wrong to call sbuf_len() on third-party sbuf. If that sbuf has a drain function, it ends up in assertion. But even would it work, it would return not newly written length, but the full one. Searching through the sources I don't see this value used. (cherry picked from commit 6332e0f1a4b34707654d6ae2cd3c1e8799970d0b) --- sys/cam/cam_xpt.c | 11 ++++------- sys/cam/cam_xpt.h | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index c32cad2433b1..26e656fc5ff2 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -3746,19 +3746,18 @@ xpt_print(struct cam_path *path, const char *fmt, ...) sbuf_delete(&sb); } -int +char * xpt_path_string(struct cam_path *path, char *str, size_t str_len) { struct sbuf sb; - int len; sbuf_new(&sb, str, str_len, 0); - len = xpt_path_sbuf(path, &sb); + xpt_path_sbuf(path, &sb); sbuf_finish(&sb); - return (len); + return (str); } -int +void xpt_path_sbuf(struct cam_path *path, struct sbuf *sb) { @@ -3789,8 +3788,6 @@ xpt_path_sbuf(struct cam_path *path, struct sbuf *sb) else sbuf_printf(sb, "X): "); } - - return(sbuf_len(sb)); } path_id_t diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h index 1276dd7b9b2e..dfedc1157e51 100644 --- a/sys/cam/cam_xpt.h +++ b/sys/cam/cam_xpt.h @@ -103,9 +103,9 @@ int xpt_path_comp(struct cam_path *path1, struct cam_path *path2); int xpt_path_comp_dev(struct cam_path *path, struct cam_ed *dev); -int xpt_path_string(struct cam_path *path, char *str, +char * xpt_path_string(struct cam_path *path, char *str, size_t str_len); -int xpt_path_sbuf(struct cam_path *path, struct sbuf *sb); +void xpt_path_sbuf(struct cam_path *path, struct sbuf *sb); path_id_t xpt_path_path_id(struct cam_path *path); target_id_t xpt_path_target_id(struct cam_path *path); lun_id_t xpt_path_lun_id(struct cam_path *path); From nobody Wed Dec 6 15:36:39 2023 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 4SlhMq50V4z53b3G; Wed, 6 Dec 2023 15:36: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlhMq44k7z4NgG; Wed, 6 Dec 2023 15:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701876999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r8gcK6xMfdU7wF+41wIrCtTPkHunslmWJanBcv9L0SM=; b=OCKai0DKL8Te80jlMaqrqAqzmUQ2EkQGe7jowpfAJHW2J3ZXLByImkoCeHFJm7E22cIjgp L1b2v8v/LXwadZp3SHGL9T77217VyPAdt6FTmb8fcrrTOunKW0MJijEW+wIocPJSkZvwZd HguwDk13nABIjPcKSm2ZeQapWEBv4QklwYkpQ53vX9BMenUfknyGwNskNLIgs5OsgtBSVY y9o9i3wCZ7Y7sVQRRISIXaF35IIDTDWASJuUN5hjYIaWABRlW3OmRyZmI0LFR0kNfiQvfS d0YrdXfIJ8T5pBNIA7pJiKzfETbprKX1ImifiZ6BaHkpwfzl59gZLPNWOBFucA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701876999; a=rsa-sha256; cv=none; b=L8pLdNzPNtn8W0WO8+tDPVGGXHTKZKcZgRkwihK84hOG5trgkPcwsIUktH1QAGkosHPxwd 3eVEMB2U68D+Xs8kSKrpxqHwXmJfeD+/yElpaAt7ch48eGYkZAw6jWn8j517uVcRERwrFZ 5Q5u8KbRTCfEKICaw205LPR+fHF+bTtRXSqYeFwQ8PAC3qLco9qaPYs5bmn/M/r/hlr51d ClEXbtX9AwB0SW/ArrD+9CcIhM/qmENWtOVO/Gafj1ncm2zBCw1Rn4Y5hKn20iQ7A3NkeN PnA5tS5JKO6rK/9zNxbsAouBGP+cWxq9aTrQN+4lva5nwdKu8TrqbDUVCnWfBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701876999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r8gcK6xMfdU7wF+41wIrCtTPkHunslmWJanBcv9L0SM=; b=Dz5fkLRfXEzBIpPNP5hh5fqr/uXg2EYuvE9Xt+FwG+xJNXu8CVRqZwDUGmloVXbpC63Qf1 Tyy2l2pfKouovHI1LT6aN8AiFup13VXlrT5/uZ1eDeIBzxyaShIQ1dJ4jQZNIGnxbbI5c8 /bWPRBAGnGHMFVxhbkq10RlE8BaTyjcFvEwhAKU7bbhQGgDq8MCdGRt/Y81JGA0JTpWtXP iddaYu95P1Snzl+/Y+NGtu+UlyotWJOlgutS6PRNzzKoDCQQqDOlrDbBaHITlyR30Fam7z m/I6ylM90se8MlFhIRGrBrZ0TvX2MtL7RayxIRbGzuAYompjOKReMo1QgUJGIQ== 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 4SlhMq2mv7z101r; Wed, 6 Dec 2023 15:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6Fadb2035927; Wed, 6 Dec 2023 15:36:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6FadTZ035924; Wed, 6 Dec 2023 15:36:39 GMT (envelope-from git) Date: Wed, 6 Dec 2023 15:36:39 GMT Message-Id: <202312061536.3B6FadTZ035924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: f035d56e711d - stable/14 - CAM: Use sbuf_new_for_sysctl() in more places List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f035d56e711d1de9e4cfd924e9a8db42e842a53b Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f035d56e711d1de9e4cfd924e9a8db42e842a53b commit f035d56e711d1de9e4cfd924e9a8db42e842a53b Author: Alexander Motin AuthorDate: 2023-11-22 20:32:16 +0000 Commit: Alexander Motin CommitDate: 2023-12-06 15:35:02 +0000 CAM: Use sbuf_new_for_sysctl() in more places There is no need to allocate buffer, worry about overflows, etc. MFC after: 2 weeks (cherry picked from commit 1b44079584dc317230cf810c0fe0a8c401a5c791) --- sys/cam/ata/ata_da.c | 12 ++++-------- sys/cam/scsi/scsi_da.c | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index d1ef28300666..e9a1c175f333 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -1426,7 +1426,6 @@ adazonemodesysctl(SYSCTL_HANDLER_ARGS) static int adazonesupsysctl(SYSCTL_HANDLER_ARGS) { - char tmpbuf[180]; struct ada_softc *softc; struct sbuf sb; int error, first; @@ -1434,15 +1433,14 @@ adazonesupsysctl(SYSCTL_HANDLER_ARGS) softc = (struct ada_softc *)arg1; - error = 0; first = 1; - sbuf_new(&sb, tmpbuf, sizeof(tmpbuf), 0); + sbuf_new_for_sysctl(&sb, NULL, 0, req); for (i = 0; i < sizeof(ada_zone_desc_table) / sizeof(ada_zone_desc_table[0]); i++) { if (softc->zone_flags & ada_zone_desc_table[i].value) { if (first == 0) - sbuf_printf(&sb, ", "); + sbuf_cat(&sb, ", "); else first = 0; sbuf_cat(&sb, ada_zone_desc_table[i].desc); @@ -1452,10 +1450,8 @@ adazonesupsysctl(SYSCTL_HANDLER_ARGS) if (first == 1) sbuf_printf(&sb, "None"); - sbuf_finish(&sb); - - error = sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req); - + error = sbuf_finish(&sb); + sbuf_delete(&sb); return (error); } diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 7a063fce128b..df44d2279fbe 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -2735,7 +2735,6 @@ dazonemodesysctl(SYSCTL_HANDLER_ARGS) static int dazonesupsysctl(SYSCTL_HANDLER_ARGS) { - char tmpbuf[180]; struct da_softc *softc; struct sbuf sb; int error, first; @@ -2743,15 +2742,14 @@ dazonesupsysctl(SYSCTL_HANDLER_ARGS) softc = (struct da_softc *)arg1; - error = 0; first = 1; - sbuf_new(&sb, tmpbuf, sizeof(tmpbuf), 0); + sbuf_new_for_sysctl(&sb, NULL, 0, req); for (i = 0; i < sizeof(da_zone_desc_table) / sizeof(da_zone_desc_table[0]); i++) { if (softc->zone_flags & da_zone_desc_table[i].value) { if (first == 0) - sbuf_printf(&sb, ", "); + sbuf_cat(&sb, ", "); else first = 0; sbuf_cat(&sb, da_zone_desc_table[i].desc); @@ -2761,10 +2759,8 @@ dazonesupsysctl(SYSCTL_HANDLER_ARGS) if (first == 1) sbuf_printf(&sb, "None"); - sbuf_finish(&sb); - - error = sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req); - + error = sbuf_finish(&sb); + sbuf_delete(&sb); return (error); } From nobody Wed Dec 6 15:47:40 2023 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 4SlhcZ2lr7z53bgP; Wed, 6 Dec 2023 15:47:42 +0000 (UTC) (envelope-from bapt@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlhcZ1sFjz4Pf0; Wed, 6 Dec 2023 15:47:42 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701877662; 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=Vf3dJfZakSoutPpHrQjsCQiI32wCsuKHV50BgVWU3Q0=; b=AgQ37SYVnTr5DQIJq3sBvT9v4Xxxq4DDdEw1I6nWTN1tF7qDAucWIdPjv7i9QeeYwYXxTP Nof4kg6QD2OWTFCoLcPUySzQSk7oFoV31dyovkdninjUxEy0BI0nJxw24P/3ZsBkx/iOp1 tp6guAgMg89Ygxz9ByCBG7lCaiDnTchTqrFSo0+z3W+w9t33xCAVEedyvHM9FGslZKM8SL 1ulwJNu9MLE5mZ5vnx8cME/jdqWFKZIEOFWvblMgmuz3vb2g7KARlrxicXqK+yUbYWsze6 B+uLMKxyVnXGRK3MQMh6Ty2tDEe5Pow0pK7MERQ6NZWT2evLtrMOH0BoXsxqrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701877662; a=rsa-sha256; cv=none; b=IRKWMgzHTrEhSnWo+j3CgP9Eew6htSfEAKYXBbjqlVN2WsA/2EQ6yvEycaKjE7GZSP5uCG 8FmEyGV3RPVvp9DzDeG488Zr7z04DefYzavgENRctQi1lO0d5daO43D60AoKIPCSi81sdE IpI8hy6CdB/ski9iV+qtSC9vzZ8XKORRAUd+K4z7PKJSNHyOImBKOL9HLjT5CaEXc/YNsz au0TGCSMENwBE5UfdDLMryEtfLr0fH1IEZ4vpmjuXF5NH+YkOCdmUbqvSIemhctSO2WQ4V m5EZYhc83au+BB895WDeJUSjPac9HfaVJEb35c34ezYLnuHDxUsFCYiPMKTdVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701877662; 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=Vf3dJfZakSoutPpHrQjsCQiI32wCsuKHV50BgVWU3Q0=; b=xeSwO3FOIUKJ2V527IxEhQKgNsd/faDfUCNAC7HPMscAG74Xt1bXmXJDrko3KsBVjmfinl 2CP627V9WqqmIsE3ToV+Or5JP+19cEfJzMDyJIcAFanrfXrCiR76ym8n6b+nHtwkT26wGY qDxRk6DqNpVaIQZia4iY06HdX6RtDM361GIebFQtVT6uDByYmWvACWnBoxwUZZmgECKf1v /wiltYMSVNLGKBHahR1vJDUQ5TT/Mmu1TVYNOl4WDjtU1MHqu0KMcIxP5n5yOrOihVqCS2 SlYHrx+qJDi5E+hz1TUtgzyuYgWuY8OQh/OjnTxO6BGmwSvyuD4vWDnoeYRjVg== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SlhcZ0Dp5z184t; Wed, 6 Dec 2023 15:47:42 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 5B154F8CA9; Wed, 6 Dec 2023 16:47:40 +0100 (CET) Date: Wed, 6 Dec 2023 16:47:40 +0100 From: Baptiste Daroussin To: Ronald Klop Cc: Brooks Davis , dev-commits-src-all@freebsd.org, src-committers@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 3c097b06a717 - main - Cirrus-CI: forcably upgrade pkg to latest Message-ID: References: <202312051904.3B5J4lNg077287@gitrepo.freebsd.org> <1420873807.1802.1701869930070@localhost> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1420873807.1802.1701869930070@localhost> On Wed, Dec 06, 2023 at 02:38:50PM +0100, Ronald Klop wrote: > Wouldn't "pkg bootstrap -f" do what you want without hardcoding versions? > > Regards, > Ronald. > No it won't they were trying to workaround the fact that the quarterly did not have 1.20.9 available, which is now fixed. Bapt From nobody Wed Dec 6 15:49:46 2023 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 4Slhg048ykz53c25 for ; Wed, 6 Dec 2023 15:49:48 +0000 (UTC) (envelope-from 0100018c3fd2272c-e7ec0349-971a-4893-b4d5-0accf4b82d1c-000000@amazonses.com) Received: from a11-1.smtp-out.amazonses.com (a11-1.smtp-out.amazonses.com [54.240.11.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slhg01Sbkz4Q9p for ; Wed, 6 Dec 2023 15:49:48 +0000 (UTC) (envelope-from 0100018c3fd2272c-e7ec0349-971a-4893-b4d5-0accf4b82d1c-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=lefbooks.org header.s=c6mgomvd6iau6i6odvxmbojhoixwp3fb header.b=HaSKBGdM; dkim=pass header.d=amazonses.com header.s=224i4yxa5dv7c2xz3womw6peuasteono header.b=LTbymphU; spf=pass (mx1.freebsd.org: domain of 0100018c3fd2272c-e7ec0349-971a-4893-b4d5-0accf4b82d1c-000000@amazonses.com designates 54.240.11.1 as permitted sender) smtp.mailfrom=0100018c3fd2272c-e7ec0349-971a-4893-b4d5-0accf4b82d1c-000000@amazonses.com; dmarc=pass (policy=none) header.from=lefbooks.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=c6mgomvd6iau6i6odvxmbojhoixwp3fb; d=lefbooks.org; t=1701877786; h=From:To:Reply-To:Subject:List-Unsubscribe:Content-ID:MIME-Version:Content-Type:Message-ID:Date; bh=ZQZMU+zK6duTwx1+lA9E27CBf6DHv6fN081htOSOUKQ=; b=HaSKBGdMXnCuBePTRa+sWxPJYqkn//Lg02vgybClAUcxpECLMoKAsdKXHx2GdFSN 4za27g7JtzH5aV9FXfbRuMfDPOHuT76FQ1TnZ080GBJLbWVGjUdt+6w45lqab2K1LMr 1DFhevmO/rxjyIvs6mbI1sDgyQUYd+Qhzdf/4eGk= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=224i4yxa5dv7c2xz3womw6peuasteono; d=amazonses.com; t=1701877786; h=From:To:Reply-To:Subject:List-Unsubscribe:Content-ID:MIME-Version:Content-Type:Message-ID:Date:Feedback-ID; bh=ZQZMU+zK6duTwx1+lA9E27CBf6DHv6fN081htOSOUKQ=; b=LTbymphUboCH2No4mStsWkZBpfZbT6w4R4Qz8abbNBm0PxRlKSKHiI5KOfqpIEOu TLGRddjwntHXOHyMcyJtSog7u4q3fju9cwAJS6ohpA4aDjs8VwvBnWCUGc4kRNNnWDG 3XXV3eLLzPLg2Y2wPU7MJPYwU4+KY21/Alyt+8sI= From: Literacy Empowerment To: dev-commits-src-all@freebsd.org Reply-To: info@lefbooks.org Subject: Free Books For Read Across America Day List-Unsubscribe: Content-ID: oJScoTyhMl4mYaqyYaq3MGyuMP53q2IuBGphLzH3$!$ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="Alt_MIME_Boundary" Message-ID: <0100018c3fd2272c-e7ec0349-971a-4893-b4d5-0accf4b82d1c-000000@email.amazonses.com> Date: Wed, 6 Dec 2023 15:49:46 +0000 Feedback-ID: 1.us-east-1.25p2ovaVlXxrgIROY2BQLqBkO5GIJtjOng/F4UjxTs0=:AmazonSES X-SES-Outgoing: 2023.12.06-54.240.11.1 X-Spamd-Result: default: False [-1.56 / 15.00]; R_BAD_CTE_7BIT(1.05)[7bit,utf8]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; URI_COUNT_ODD(1.00)[7]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[lefbooks.org,none]; HTTP_TO_HTTPS(0.50)[track.lefbooks.org]; RWL_MAILSPIKE_EXCELLENT(-0.40)[54.240.11.1:from]; FORGED_SENDER(0.30)[info@lefbooks.org,0100018c3fd2272c-e7ec0349-971a-4893-b4d5-0accf4b82d1c-000000@amazonses.com]; R_SPF_ALLOW(-0.20)[+ip4:54.240.0.0/18:c]; R_DKIM_ALLOW(-0.20)[lefbooks.org:s=c6mgomvd6iau6i6odvxmbojhoixwp3fb,amazonses.com:s=224i4yxa5dv7c2xz3womw6peuasteono]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; HAS_LIST_UNSUB(-0.01)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; HAS_REPLYTO(0.00)[info@lefbooks.org]; FROM_NEQ_ENVFROM(0.00)[info@lefbooks.org,0100018c3fd2272c-e7ec0349-971a-4893-b4d5-0accf4b82d1c-000000@amazonses.com]; DWL_DNSWL_NONE(0.00)[amazonses.com:dkim]; DKIM_TRACE(0.00)[lefbooks.org:+,amazonses.com:+]; TO_DN_NONE(0.00)[]; REPLYTO_ADDR_EQ_FROM(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_IN_DNSWL_NONE(0.00)[54.240.11.1:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org] X-Rspamd-Queue-Id: 4Slhg01Sbkz4Q9p X-Spamd-Bar: - --Alt_MIME_Boundary Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Deadline For Free Books For Read Across America Day is February 12th, 2024. The Literacy Empowerment Foundation, a 501(c)3 nonprofit organization, invites your school or other literacy project to apply for FREE books for Read Across America Day. During the past 5 years LEF has distributed over 5,000,000 books to schools all across the country for Read Across America Day and other literacy projects. Resources are allocated on a first-come, first-served basis. Books are free. Educators only pay shipping, handling, and administrative fees totaling $0.88 cents per book. Orders must be received by February 11th, 2024. Please share this information with your fellow educators! Free Books for Read Across America Day: Order Form at http://track.lefbooks.org/?xtl=63vcps4ba5zg0k5jok5sebrs037wnqk8bkaq5m6bsgwjqsvehpecim8pkvyk7xia9e74b8ibgannecwyk35vhn23qkpbi5asyka91utu4j32&eih=lx1n9uvjnbrcavm8d51opkl0dxal9u6dtkeohm8uvywt4kl75 LEF 1311 West Chester Pike West Chester, PA 19382 Phone: 610-719-6448 Web site: http://track.lefbooks.org/?xtl=63vcps4ba5zg0k5jok5sebrs037wnqkdfyqacsinv4qlblt9spi8sth9pmltikbidnnezkfhl1nbj01jici74ztrggran60t5qjec2c09w73&eih=lx1n9uvjnbrcavm8d51opkl0dxal9u6dtkeohm8uvywt4kl75 E-mail: info@lefbooks.org In order to unsubscribe from this mailing list, please click here http://track.lefbooks.org/?xul=6gyckg9gvzcg843jd1lwoomh43n9f2oyxx4nrdyf1x7as2wfxcoacldbd5q2zu0o5hb7ps4l6xy968rypsk1mh46ez6&eih=lx1n9uvjnbrcavm8d51opkl0dxal9u6dtkeohm8uvywt4kl75 --Alt_MIME_Boundary Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit

Deadline For Free Books For Read Across America Day is February 12th, 2024.

The Literacy Empowerment Foundation, a 501(c)3 nonprofit organization, invites your school or other literacy project to apply for FREE books for Read Across America Day. During the past year, LEF has distributed over 3,000,000 books to schools all across the country for Read Across America Day and other literacy projects.

Resources are allocated on a first-come, first-served basis.

Books are free. Educators only pay shipping, handling, and administrative fees totaling $0.88 cents per book.

Orders must be received by February 11th, 2024.

Please share this information with your fellow educators!

Free Books for Read Across America Day: Order Form at https://www.lefbooks.org

LEF
1311 West Chester Pike
West Chester, PA 19382
Phone: 610-719-6448
Web site: https://www.lefbooks.org
E-mail: info@lefbooks.org

In order to unsubscribe from this mailing list, please click here --Alt_MIME_Boundary-- From nobody Wed Dec 6 16:04:23 2023 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 4Slhzq72J3z53cpR; Wed, 6 Dec 2023 16:04: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slhzq6Wxqz4RbW; Wed, 6 Dec 2023 16:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701878663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FTvRPdHwLB9f7zCrbxdPKlQAMQIKhDEUT9FeunEA4g0=; b=qjHH+21t3oElPPzxEp8zTyE6hD9oJGnWg52PAsCuQ2DyNi6YHmI0qmXmH2JDp1CKtujnaX MBFWEUnArtAr1fYsdWohakbndrzWFdz3EmQ0ayZ/57C1ZxElaKfovK2JHZmPoMuGl340QJ +zab5qFh2ZgX0KUP+fs9jDce3bzifVh4QRTpudLoZBMV8+16u6SFVE3zAoaVl2xaQ9rnuo xVjAE7WcYtdGa/tq/9h6yOCIRPE5gtTfkgvyBWEvYjTUon3XIe9XL7KbTUf5fz3EflzJjG zTNEk5/rhOM0ja9PDyA+cDvCVYHdgHQs258OaAtP8ppZaeARjt5l14yMO6gjow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701878663; a=rsa-sha256; cv=none; b=jOZZeleIOaCESuUUuV9Fv2Blxlzy9a1K7ePa55ozgQUMJ/BJ+EvR2SIttPBBXpLs2exPoP NTfRV4OKATdpM4pGHX2SjsXyADwEyoenS0ucTGdminqOvt4y5dQtLmEJLLBz2IP4galh7W IIeT4HYUi2tjsh8VJATgqkTGNfmVLceHrEs0XlqG1rfM3NpKB047782AeWuTiEuHwx0wCQ pBbvy61aRHojdZptln92N8bUTT3ZlgA5OhmUf4bd4jrGJe9lVOmG/fFn7EgEQI/Z9LPS17 B4VB5WRSezYSZWwGl/+WraXXOkm3ubQEr9+AI6pJAFkiq04xNFGvx2i3NFRzlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701878663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FTvRPdHwLB9f7zCrbxdPKlQAMQIKhDEUT9FeunEA4g0=; b=X2aUzR2Edmun/9wI7WH+6MBpxUjyBlZNR4Ul5Rb1KNdQOt276Hrxkn6+8qkOb9+f9kU328 FUiiybdBJLANce8sNYlzauxQfHvriZ93z9q35xq3FDLI0aO0NBOSnA+W8HoFhl9Rl46d6W eyVH/UrYM0ya5z5Bik+RwKZ505Kx61ceuzssI2eurUv5G9rWlIGdAJTJhbnlWZqBAvwypT HFTuz6X3w5ZoZvGkEQs0nnUt51/zKNRAFzIXReoQVXeFYfo1Abeq6N3OUTOL9veQGTl5gG 2HGLLIFcSnQx+uCU4UGZUS4NJamRtL9iY2o4akCOKeYkRblnlTpDEiKQQZm1mw== 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 4Slhzq5Zc4z10dT; Wed, 6 Dec 2023 16:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6G4NYT086144; Wed, 6 Dec 2023 16:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6G4Nrt086141; Wed, 6 Dec 2023 16:04:23 GMT (envelope-from git) Date: Wed, 6 Dec 2023 16:04:23 GMT Message-Id: <202312061604.3B6G4Nrt086141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e64d827d3a58 - stable/14 - makesyscall: Simplify a bit emitting syscall declarations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: e64d827d3a582af994288fcdbc5a701828fc66d6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e64d827d3a582af994288fcdbc5a701828fc66d6 commit e64d827d3a582af994288fcdbc5a701828fc66d6 Author: Olivier Certner AuthorDate: 2023-10-12 13:47:03 +0000 Commit: Mark Johnston CommitDate: 2023-12-06 16:04:05 +0000 makesyscall: Simplify a bit emitting syscall declarations Reviewed by: kevans, imp MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42168 (cherry picked from commit 2f68ae6150aa51d724e22c7e6748adfe2bc932d7) --- sys/tools/makesyscalls.lua | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index f2d8f1a609b6..a800de26a282 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -865,18 +865,15 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, local protoflags = get_mask({"NOPROTO", "NODEF"}) if flags & protoflags == 0 then + local sys_prefix = "sys_" if funcname == "nosys" or funcname == "lkmnosys" or funcname == "sysarch" or funcname:find("^freebsd") or funcname:find("^linux") then - write_line("sysdcl", string.format( - "%s\t%s(struct thread *, struct %s *)", - rettype, funcname, argalias)) - else - write_line("sysdcl", string.format( - "%s\tsys_%s(struct thread *, struct %s *)", - rettype, funcname, argalias)) + sys_prefix = "" end - write_line("sysdcl", ";\n") + write_line("sysdcl", string.format( + "%s\t%s%s(struct thread *, struct %s *);\n", + rettype, sys_prefix, funcname, argalias)) write_line("sysaue", string.format("#define\t%sAUE_%s\t%s\n", config.syscallprefix, funcalias, auditev)) end From nobody Wed Dec 6 16:52:24 2023 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 4Slk3D46nyz53gKS; Wed, 6 Dec 2023 16:52: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slk3D3ZlMz4WRx; Wed, 6 Dec 2023 16:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701881544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fvd5OJCZ3wvZ9OaUWbJC0HZn7ZwLKCjBuS/kjBuX64M=; b=wAPaf+yAzUH3kdpE1jJyZhmoeSp39fw0elRQudQ+DDAbIuXw5bNYDV7zJ8k48e59HSFY/y J4XkHaFLEj8Ngd6w8l+p4KHZK6x+d0c/K3j4R9bdH385rhyvrJ4xS3GYOJrKH/qAVsPUGI Bx82UwwBHpELA+1iSqz7MmuRju8zjGWXFbyc5IjMbgAVQXtC5/pCwEHi5GHGvxlDSBia6+ steSXabftoGE9+mePr6t0LUbidYo0/YbDAXw0hOgMgTTnWpW4/mCy9NbVn+YeFikc98yzW X6WHqBGMOg5BTzjn9zHT6Nj6/fydeSdoyhX0ctV637lBU2wkueD7ZoRm93mqcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701881544; a=rsa-sha256; cv=none; b=Bh25QIO9vIqpfML5lbPp99Nk4T4+/dqhiTM0Z70C0Z/cb7QwmK2tRhjr0GyiXi6Fxdy3xA qB3F5nTtxX1JS/qnnHUpCaAMdGEPyu6PLE3SJ+9Vpu9n70OgMsp9xJu1na9HmawSEDWdAv QQjOZhu+BftHgsFAqOroQX2UFvCbgyNxoB39pHx512jN7Dj6F4HVeyMr3HfH8faw4519Cs R5yLb01B30/3htlqKDXsTKFQGDr9kp5jR/zcOwmtqDDitFyWgVzd4LsU3svEdigCuoDQdF DKAZbb5PVNXZM3gonYTajZ0psAMbQ/nKSSjWbX88sMGTcFb6S48Oy8UHHWpfuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701881544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fvd5OJCZ3wvZ9OaUWbJC0HZn7ZwLKCjBuS/kjBuX64M=; b=HpOZ7/aNeW8Xj4zXwGCaPWMYc1RJAD+5GCHv+8xjjmUYnbGByurC8bYXjGEmiVhUfo0p/Z URjico6Wp7X4sFMmXMr8/cUqBEtbEt2tYJDZwqD2vV14hVXSjpYOGPf/7Z08FvZiDyfJYj GCYozeCBEMJc5lmxawf6ltUHdW0W4HxvpOT+JDaIvXcmMh37d2LlHFQeqOs9bXU07IUSl3 OGqdAWjA8mfUv1MRPyfySBjkb3lOrlvz8DaT2ErnfH6/okw6WK5ZZgzuDUtRxDeNrEfNLe 7C7lIuSxwKGZHCC1crfEqrIZr+WAQJOt2ZTDq/hlzM5uwNHLzArSAwR5icjxbA== 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 4Slk3D2g63z11TN; Wed, 6 Dec 2023 16:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6GqOSD068352; Wed, 6 Dec 2023 16:52:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6GqOuf068349; Wed, 6 Dec 2023 16:52:24 GMT (envelope-from git) Date: Wed, 6 Dec 2023 16:52:24 GMT Message-Id: <202312061652.3B6GqOuf068349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 6b96125afdf2 - main - cap_net.3: remove a copypasta List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b96125afdf245ae61dd82b59891ad0d6aab0066 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=6b96125afdf245ae61dd82b59891ad0d6aab0066 commit 6b96125afdf245ae61dd82b59891ad0d6aab0066 Author: Alan Somers AuthorDate: 2023-12-05 23:23:29 +0000 Commit: Alan Somers CommitDate: 2023-12-06 16:51:37 +0000 cap_net.3: remove a copypasta This line appears to have been copied from cap_sysctl.3. While I'm here, reorder and reword the description of cap_net_limit a bit. [skip ci] MFC after: 2 weeks Sponsored by: Axcient Reviewed by: oshogbo Differential Revision: https://reviews.freebsd.org/D42919 --- lib/libcasper/services/cap_net/cap_net.3 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/libcasper/services/cap_net/cap_net.3 b/lib/libcasper/services/cap_net/cap_net.3 index 97a044e3f950..534d28c2ef7c 100644 --- a/lib/libcasper/services/cap_net/cap_net.3 +++ b/lib/libcasper/services/cap_net/cap_net.3 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 15, 2021 +.Dd December 5, 2023 .Dt CAP_NET 3 .Os .Sh NAME @@ -188,17 +188,14 @@ any port will be accepted in the .Fn cap_connect function. .Pp +The .Fn cap_net_limit -applies a set of sysctl limits to the capability, denying access to sysctl -variables not belonging to the set. +will consume and apply the limits. .Pp Once a set of limits is applied, subsequent calls to .Fn cap_net_limit will fail unless the new set is a subset of the current set. .Pp -The -.Fn cap_net_limit -will consume the limits. If the .Fn cap_net_limit was not called the rights may be freed using From nobody Wed Dec 6 18:55:26 2023 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 4SlmnC1FVhz53p1P; Wed, 6 Dec 2023 18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlmnC0hYWz3Fxn; Wed, 6 Dec 2023 18: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=1701888927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bsBX/rEB8UzFsdW7VQnPK8Y7O5NvyopWIwWxyZXgXM4=; b=AqcRMdTaTlRCRoaqwv+uc5v+ep0gp5r/Ve5LEBEOCgJWvF2sPccSsf77qyanGu7HUo2ST6 257i3UCm/2F1+jchmnNzQoTEVrey4p4C6e4U2Qjw1nWszItdXeZIek+qzpFNJMDTdVqTEB mg+woRqcOWSwUGM5c9teMU+P9ZikioM+qTKTS1mj5B5mxOCFA61sx5RPgCEuPxN1A3TyJe Dp/mP3Qz5FN8HVdJIm0ePuKwlaEeonFEYUL1Dg9q6zT2cO5fDm3xIfuniA46yqO1Zqh7Ky VYBSo1tWCv21DGDMdh6LrHoNTgIdkQxbgIrFhzeM68Q0VmIZ1GENEX2zCwT6gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701888927; a=rsa-sha256; cv=none; b=KiRiVGX7Gng97pfKrfENjSMTf5Xr7H4lcR0X3EcHw0qMfbA8PT2M8IOMkP0Qik1Gl3M6eO Cz4wtaJLBZug5Mu3h2ulSRapgb414JTcswh/Bb3xRHr/5HYBnNy1DPWzpgBCvuYWTod5kF hsKCCRapH/u2Mxpuw1+joJ1F9u5I1xIWrlvPKwWwnoa6/Yjapiuyd9D4FyCONNjvMEgDXf SKTC62bDyWJEwI/eHTxdDLyrxyZdDFNwmYc9Qtl8pSakd6C66JA6Bks6TLeq/bIIfBCshW XLNZiCtywtDocx0Q8VsHFXcuQhoMIrm6OHqUpEyVZE3LBFWGFqQtTWLzB9yySA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701888927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bsBX/rEB8UzFsdW7VQnPK8Y7O5NvyopWIwWxyZXgXM4=; b=Z9pdsAhqzjExTHnecX/2/RwakVsh1JaWPTO3QPEzWCkBd1jKel0aMqwDamhUvMBO5cETwv 1oNHuViYDetkUxPPhpQro2JIbqc7Kmf+KdS0fsjfgsnbe4D6KqZhX0AhxyOKV5k1wFkQUn kCvh2BE1hmQqyymbY0M6lpthe4E4mzEBJSK5lULBjhzdcJ3fjKYNQRpO5YqP4Nhfg5pabV seoXnrQg52hlqoxthtlfyEiT4gmHLfukjbDC6cU1s6gZUYdeBYVzLTo9SCUUp8XC0aRqrN SoyemR2GgdbsNe305H4xi3cFrv8EDAB/K23QjY3TmFYMAWkXjSGruaW899+ULA== 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 4SlmnB6cqYz14nb; Wed, 6 Dec 2023 18:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6ItQcB070130; Wed, 6 Dec 2023 18:55:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6ItQH0070127; Wed, 6 Dec 2023 18:55:26 GMT (envelope-from git) Date: Wed, 6 Dec 2023 18:55:26 GMT Message-Id: <202312061855.3B6ItQH0070127@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: be5464ae233a - main - kmsan: Add kmsan_check_uio() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: be5464ae233ada46a778cc82f7107a10a7d5343b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=be5464ae233ada46a778cc82f7107a10a7d5343b commit be5464ae233ada46a778cc82f7107a10a7d5343b Author: Mark Johnston AuthorDate: 2023-12-06 16:31:15 +0000 Commit: Mark Johnston CommitDate: 2023-12-06 17:46:25 +0000 kmsan: Add kmsan_check_uio() This was handy for some ad-hoc debugging and fits in with other kmsan_check_*() routines which operate on some kind of data container. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- share/man/man9/Makefile | 1 + share/man/man9/kmsan.9 | 5 ++++- sys/kern/subr_msan.c | 9 +++++++++ sys/sys/msan.h | 3 +++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 6768f52a38d6..81de035defb9 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1370,6 +1370,7 @@ MLINKS+=kmsan.9 KMSAN.9 \ kmsan.9 kmsan_check_bio.9 \ kmsan.9 kmsan_check_ccb.9 \ kmsan.9 kmsan_check_mbuf.9 \ + kmsan.9 kmsan_check_uio.9 \ kmsan.9 kmsan_mark.9 \ kmsan.9 kmsan_oirg.9 MLINKS+=kobj.9 DEFINE_CLASS.9 \ diff --git a/share/man/man9/kmsan.9 b/share/man/man9/kmsan.9 index 714442e4d9fe..90faf8f82e5e 100644 --- a/share/man/man9/kmsan.9 +++ b/share/man/man9/kmsan.9 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 13, 2023 +.Dd December 6, 2023 .Dt KMSAN 9 .Os .Sh NAME @@ -56,6 +56,8 @@ kernel configuration file: .Fn kmsan_check_ccb "const union ccb *" "const char *descr" .Ft void .Fn kmsan_check_mbuf "const struct mbuf *" "const char *descr" +.Ft void +.Fn kmsan_check_uio "const struct uio *" "const char *descr" .Sh DESCRIPTION .Nm is a subsystem which leverages compiler instrumentation to detect uses of @@ -306,6 +308,7 @@ f(size_t osz) .Xr busdma 9 , .Xr copyout 9 , .Xr KASAN 9 , +.Xr uio 9 , .Xr uma 9 .Rs .%A Evgeniy Stepanov diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index abac71da6d64..ef3c6c10b0ba 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -587,6 +587,15 @@ kmsan_check_mbuf(const struct mbuf *m, const char *descr) } while ((m = m->m_next) != NULL); } +void +kmsan_check_uio(const struct uio *uio, const char *descr) +{ + for (int i = 0; i < uio->uio_iovcnt; i++) { + kmsan_check(uio->uio_iov[i].iov_base, uio->uio_iov[i].iov_len, + descr); + } +} + void kmsan_init(void) { diff --git a/sys/sys/msan.h b/sys/sys/msan.h index 4baa71ec8113..58110d7306e6 100644 --- a/sys/sys/msan.h +++ b/sys/sys/msan.h @@ -50,6 +50,7 @@ union ccb; struct bio; struct mbuf; struct memdesc; +struct uio; void kmsan_init(void); @@ -69,6 +70,7 @@ void kmsan_check(const void *, size_t, const char *); void kmsan_check_bio(const struct bio *, const char *); void kmsan_check_ccb(const union ccb *, const char *); void kmsan_check_mbuf(const struct mbuf *, const char *); +void kmsan_check_uio(const struct uio *, const char *); #else #define kmsan_init(u) @@ -85,6 +87,7 @@ void kmsan_check_mbuf(const struct mbuf *, const char *); #define kmsan_check_bio(b, d) #define kmsan_check_ccb(c, d) #define kmsan_check_mbuf(m, d) +#define kmsan_check_uio(u, d) #define kmsan_bus_dmamap_sync(d, op) #endif From nobody Wed Dec 6 18:55:27 2023 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 4SlmnD1Nk4z53pH8; Wed, 6 Dec 2023 18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlmnD0YBpz3FsH; Wed, 6 Dec 2023 18: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=1701888928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=865fjcWSHe/l3oSVOLSigS7w7oN/FB9DYtZA7tVRfJE=; b=RG4DXaIqJrHaGd28PJ0l7ULfp2nKhOV47ixq+ptU3XHsCyOnZH6cgUHYP4o3gHAZdauWoB 2+8z3ZaZb435Co4F654SztlALrqmT4VLorSCaHNglt/Hz0hgKCFxhGotR7x0b1zq8AqIq2 c5Ex/HP4k645l0PB4aEet4VBPxpWsFQHfqAJacrIHFmEtzF384HMLn92htzW/Hh0khKCy/ 45S6Bi7n73YlbO83WlNdFxZlawAvEXgDzAmWwH5bHR14BU+9Z6xkw83pVy/YUz5yE00614 wBdibnmi0mOCOywpOrOYFDq7z4zt5pvP7ALURSL66K9uE7gV4rJfvWt5iUtR1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701888928; a=rsa-sha256; cv=none; b=SKzS/GVt9+DJXRMEUkDdh4dTnTglaa/FPBy8IL6p67BRnvaphEl+95uTUGOPBGumCJRMSc yCQM8Q+edUx3yFaUIMoLhAu4qwBMPeu4O4jfWf6NZc0RJgo8YgjFWSZ+3aMeWwviQiEORx juvCQjNuT4qoA/YCHBpQvI1D+TW5AcX7atZX/RvswpkKWNzVNKiEyV4IaUhCuabApda0cE g/Nc9dWYQjEMb7aN79mdWn0QcXUHNLVYx2gmYA8zXk5/zNtGssxw1wyfSUo7uZ0245/NXl uPL3z1IVukC2aLZnXFy3SOGDDspkQOU92krATcSkwi9wKVhu4hoZZ1bPnGwIlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701888928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=865fjcWSHe/l3oSVOLSigS7w7oN/FB9DYtZA7tVRfJE=; b=kiQoJEftSZSfcF/hqwPjk0pg/sWD63zuKOZDZ2jJOwru4BThmtsE8JS2Q094sLKLqBfzTs lMQXMdS4UJRB8W1aGinJzXBkq0omZ7CFmt+4Jf6k8YfFBw4JV/erljymzb0DghTFQ2AGC7 T+GoQAJtcEd6gzSHziyUGfRcRslkB+VG7NH15GKcBrGvSqvQsLRZFjEwxTR8d0298S4m9h R3dzy2PtEz+Yt907awGbA7HKAYy32wXGVY4gRBZ5pSTUjFRdINcxcNbdjnQRbc4P4uKPBK iVN9LxfZ2uKHKbpFuSHE7Hqzx358A3PopMsLODBA2RJsuSL0oq5/P8YhLu8SMQ== 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 4SlmnC6jbQz14QP; Wed, 6 Dec 2023 18:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6ItR41070184; Wed, 6 Dec 2023 18:55:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6ItRXx070181; Wed, 6 Dec 2023 18:55:27 GMT (envelope-from git) Date: Wed, 6 Dec 2023 18:55:27 GMT Message-Id: <202312061855.3B6ItRXx070181@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: d2ce3d89e93c - main - conf: Expand the include path for more openssl files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d2ce3d89e93cab3942b771ccd64e7c83532c090a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d2ce3d89e93cab3942b771ccd64e7c83532c090a commit d2ce3d89e93cab3942b771ccd64e7c83532c090a Author: Mark Johnston AuthorDate: 2023-12-06 18:39:48 +0000 Commit: Mark Johnston CommitDate: 2023-12-06 18:41:34 +0000 conf: Expand the include path for more openssl files Fixes: e655cc70dfcd ("ossl: Move arm_arch.h to a common subdirectory") Reported by: Jenkins --- sys/conf/files.arm64 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 5d9464bade9c..e6f525e63e64 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -136,17 +136,17 @@ ghashv8-armx.o optional armv8crypto \ crypto/des/des_enc.c optional netsmb crypto/openssl/ossl_aarch64.c optional ossl crypto/openssl/aarch64/chacha-armv8.S optional ossl \ - compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" + compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} -I$S/crypto/openssl ${WERROR} ${.IMPSRC}" crypto/openssl/aarch64/poly1305-armv8.S optional ossl \ - compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" + compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} -I$S/crypto/openssl ${WERROR} ${.IMPSRC}" crypto/openssl/aarch64/sha1-armv8.S optional ossl \ - compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" + compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} -I$S/crypto/openssl ${WERROR} ${.IMPSRC}" crypto/openssl/aarch64/sha256-armv8.S optional ossl \ - compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" + compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} -I$S/crypto/openssl ${WERROR} ${.IMPSRC}" crypto/openssl/aarch64/sha512-armv8.S optional ossl \ - compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" + compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} -I$S/crypto/openssl ${WERROR} ${.IMPSRC}" crypto/openssl/aarch64/vpaes-armv8.S optional ossl \ - compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" + compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} -I$S/crypto/openssl ${WERROR} ${.IMPSRC}" dev/acpica/acpi_bus_if.m optional acpi dev/acpica/acpi_if.m optional acpi From nobody Wed Dec 6 20:01:25 2023 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 4SlpFK671fz52tPP; Wed, 6 Dec 2023 20:01: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlpFK5hbdz3M5v; Wed, 6 Dec 2023 20:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701892885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=He/94OuuqRbhfGRkygt2MIoT6vvZD842ZQDzuVuGZ20=; b=U5p1fX21oOMhf6QC9TxVM5ygz8vF4M7frvjz7Rrkq6Gi2MYArxy/u+w2DjR8i/pao1ogua j9dm6bVZt0Pj1jxzTPOZCmbxHate+sWaYL7olP4Lk75S7dyGGoCR1MeJ4N5V2jQf2ls5o5 biEeryMNyPMqW1yAnAZQv8Pgoyfeb7Ti+5JKDyfziYcyoLdT3N+RBxVVv35XXjUG7BldPT 6yTA3MJTtvMZyTwgxLu/Vm4YeTsOFHzFG/4M9O+zceRF5ye+erFSWpFnpjcUPCu0MP35rj vT7UYUZwfVhVJdSzna5UNSH88CbKAgAGrwKsYpelghjLovWQy+z/jsqu2GUV+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701892885; a=rsa-sha256; cv=none; b=R1h2s/+PvhguID95RzSKSwXIoGz3Hv0q4+God8yIwZrpHlYTSqaMRhBCHkNqv8BJd4pvG+ +Wwr+a404gYcwNhd2rCZEOFsvDPyfj6zZWCiYk8EM2KY9KkVUgFqGqFnv0/RY2W9NQm+TC wfZ2MuG/Sup4Lys2jC8Nfsd75LdytXIeCwf0I4YTMLeRuE9UaemHwVxcG18raRrUT6I1Dt K6t/4GfQSDXTsIsyyVRayE43DICYl74u0iLrMaUYYKNCVU4LG3NkRp1HwCneYSruButYtk x7eSjS29RzaIC9j21rRegGgY+I+Nrac3De83mLRuuStDb8MabjVisZ/sVOU7cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701892885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=He/94OuuqRbhfGRkygt2MIoT6vvZD842ZQDzuVuGZ20=; b=F3ulg8jtSr9ixuMRJ0HZJGWji4rReeSb5z2cFXYhPXVzBy8d9aU21SXRxeQ2NPiN54ATQe TJc5DjVvPPN1aNlz8b59kSz2+yd/BvszIt6SqorY9jtw9BSXCf1M3qe5ihMbaQT8DFMYts 9vABdsrbOWBbjTQZlBCTqOV8T6kq0X5M5DySv6o8oCmE/nUKZP1amLf9SU1GEpLttCy5+W ZsGknxHdL4lke+72pRGGJAjF5yP5RHjye1q6xFEfv34OFYYQ/YZ4PpM0YdEsPe8ran1CTg zGwwUAPlinJs5+uaUQ89Dp3DePwb5IluiPGfpthHDqO2+fUQyQRFQm+zT6W7PA== 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 4SlpFK4mcnz16Db; Wed, 6 Dec 2023 20:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6K1P13086289; Wed, 6 Dec 2023 20:01:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6K1PKp086286; Wed, 6 Dec 2023 20:01:25 GMT (envelope-from git) Date: Wed, 6 Dec 2023 20:01:25 GMT Message-Id: <202312062001.3B6K1PKp086286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 6f048e713043 - main - vmstat: Improve -z formatting for large names/values List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f048e71304310db80a210d07cb3768de18589c8 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=6f048e71304310db80a210d07cb3768de18589c8 commit 6f048e71304310db80a210d07cb3768de18589c8 Author: Alexander Motin AuthorDate: 2023-12-06 19:55:58 +0000 Commit: Alexander Motin CommitDate: 2023-12-06 20:00:19 +0000 vmstat: Improve -z formatting for large names/values MFC after: 2 weeks --- usr.bin/vmstat/vmstat.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 6476df06fe39..6d5f000f46a3 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1455,8 +1455,7 @@ domemstat_zone(void) { struct memory_type_list *mtlp; struct memory_type *mtp; - int error; - char name[MEMTYPE_MAXNAME + 1]; + int error, len; mtlp = memstat_mtl_alloc(); if (mtlp == NULL) { @@ -1481,20 +1480,20 @@ domemstat_zone(void) } } xo_open_container("memory-zone-statistics"); - xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s} " - "{T:/%4s} {T:/%4s}\n", "ITEM", "SIZE", - "LIMIT", "USED", "FREE", "REQ", "FAIL", "SLEEP", "XDOMAIN"); + xo_emit("{T:/%-19s} {T:/%7s} {T:/%7s} {T:/%8s} {T:/%8s} {T:/%8s} " + "{T:/%4s} {T:/%4s} {T:/%4s}\n", "ITEM", "SIZE", + "LIMIT", "USED", "FREE", "REQ", "FAIL", "SLEEP", "XDOM"); xo_open_list("zone"); for (mtp = memstat_mtl_first(mtlp); mtp != NULL; mtp = memstat_mtl_next(mtp)) { - strlcpy(name, memstat_get_name(mtp), MEMTYPE_MAXNAME); - strcat(name, ":"); + len = strlen(memstat_get_name(mtp)); xo_open_instance("zone"); - xo_emit("{d:name/%-20s}{ke:name/%s} {:size/%6ju}, " - "{:limit/%6ju},{:used/%8ju}," + xo_emit("{k:name/%s}:{d:size/%*ju}{e:size/%ju}," + "{:limit/%7ju},{:used/%8ju}," "{:free/%8ju},{:requests/%8ju}," - "{:fail/%4ju},{:sleep/%4ju},{:xdomain/%4ju}\n", name, - memstat_get_name(mtp), + "{:fail/%4ju},{:sleep/%4ju},{:xdomain/%4ju}\n", + memstat_get_name(mtp), MAX(1, 26 - len), + (uintmax_t)memstat_get_size(mtp), (uintmax_t)memstat_get_size(mtp), (uintmax_t)memstat_get_countlimit(mtp), (uintmax_t)memstat_get_count(mtp), From nobody Wed Dec 6 20:04:10 2023 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 4SlpJY1Dffz52tLx; Wed, 6 Dec 2023 20:04:13 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlpJY0fq7z3Mjm; Wed, 6 Dec 2023 20:04:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701893053; h=from:from:reply-to:subject: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=M3l/VsmIJQRbS0fr9Poow9BDpS1//fulTsgMBob7XEE=; b=js3eJy/gEr8qnBqhlDyCr2zX6UUhWzC3NpKz1QlZOrdQ9/f6EOEi2l2spRihLOjbltEcIv G8YyUSczsHep3RHlNSjhpkW1N44MJczeQ45jjdg9hFVYZQoSoXQ5J5YtZowvWRqs8U3ca+ VCVH4m0pHKNTKtodAot0KTA4jNHZBYSgTWU/E2UcjRRh9uaI9rphvCVRoCTmFCxCV36XlY vblwpOrCToRa/MTYb/V/XL1tRBqz7wadl9+DC5MGN2agNEoiUxNuB34rnnhmP2opplLuul Q6SRMXSeG10Luh1GJfP2iUlelU5vH/aFfR3A6ILDfNQr0a5YRuU5cq98SmaaZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701893053; a=rsa-sha256; cv=none; b=Gd84H5XanL8xG+pSS66KB0UUkpKbEUlm0ARJJ5bJtNiaCZMzL+T+ZwdK7iHykd3QcxoSEF 2sEITSdPMrMcpgBoDvERqtbQYx2eQ9XUuFLnC7obdJt/cRIoOhSrrljmln/gc/BMv1iIEq XwbEKc7fBqEJZVMN3OACuH7UH1/T4dKpL66G9sWQJ3GGkWp7Lccb4LYRAz3rk16Cwcs4qY /vt6FPwQNFYvgGY6h3cOELYrPVHaBwoaSckU9H2I7ukBlhA7VAgEvwX9ULAOBWxnHGZEfq gcVh/v2i82CsVax0/Jx+9XxloYiqdbuTTvQ+IHcn6vG2AL3D9DEcj46NK2bEpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701893053; h=from:from:reply-to:subject: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=M3l/VsmIJQRbS0fr9Poow9BDpS1//fulTsgMBob7XEE=; b=P6+Rn8fZn1/cymw7VFmCFLbpkFgp1KeLPiXc+Mq9nyZPcvu7ZYF8c7sUREGZ0yL3B2OFSD +EbcNJNit0mi3RFfPVZ3gMA6fiQ2qJjbNqJ/UOzmexbDmNXT0C3ZFNjRy3EL9/vRXg49N1 aZNzUaTGdOrBB3VjSZbicdDhyaxDCni9wOSJn6T7aABjs5HKm7CI3iI8txi5cWBm4CVw7C ghwoxEOPiJQ4uKh9+8QBoWsjY6TN6VFd/N4FSAp8oAZamaOPUE+PcKw09vxQgQlvMGx0dq bfourgX7zvcG22dw4DBuMQlOShJ3PGi5lVRnohjm8r9Lo+Ogwuoj5Vy5+T7VeA== Received: from [IPV6:2601:648:8384:fd00:8d37:e6e8:747c:72de] (unknown [IPv6:2601:648:8384:fd00:8d37:e6e8:747c:72de]) (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 4SlpJX3rhXz1GCb; Wed, 6 Dec 2023 20:04:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Wed, 6 Dec 2023 12:04:10 -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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 773c13c686e4 - main - kldxref: skip .pkgsave files Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202302251737.31PHb2R8072300@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202302251737.31PHb2R8072300@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2/25/23 9:37 AM, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=773c13c686e4b6ae9dbbc150b342b82c3f47d73a > > commit 773c13c686e4b6ae9dbbc150b342b82c3f47d73a > Author: Mina Galić > AuthorDate: 2023-02-25 17:31:58 +0000 > Commit: Warner Losh > CommitDate: 2023-02-25 17:35:43 +0000 > > kldxref: skip .pkgsave files > > This should help people transitioning from traditional setups to pkgbase > experience a lot less friction. > > We do this by skipping all files containing two dots. > > Reviewed by: imp > Pull Request: https://github.com/freebsd/freebsd-src/pull/661 > Differential Revision: https://reviews.freebsd.org/D27959 This restriction is too broad and omits all of the modern wifi firmware klds from linker.hints, e.g. /boot/kernel/iwlwifi-3160-17.ucode.ko /boot/kernel/iwlwifi-3168-29.ucode.ko /boot/kernel/iwlwifi-7260-17.ucode.ko /boot/kernel/iwlwifi-7265-17.ucode.ko /boot/kernel/iwlwifi-7265D-29.ucode.ko /boot/kernel/iwlwifi-8000C-36.ucode.ko /boot/kernel/iwlwifi-8265-36.ucode.ko /boot/kernel/iwlwifi-9000-pu-b0-jf-b0-46.ucode.ko /boot/kernel/iwlwifi-9260-th-b0-jf-b0-46.ucode.ko /boot/kernel/iwlwifi-Qu-b0-hr-b0-77.ucode.ko /boot/kernel/iwlwifi-Qu-b0-jf-b0-77.ucode.ko /boot/kernel/iwlwifi-Qu-c0-hr-b0-77.ucode.ko /boot/kernel/iwlwifi-Qu-c0-jf-b0-77.ucode.ko /boot/kernel/iwlwifi-QuZ-a0-hr-b0-77.ucode.ko /boot/kernel/iwlwifi-QuZ-a0-jf-b0-77.ucode.ko /boot/kernel/iwlwifi-cc-a0-77.ucode.ko /boot/kernel/iwlwifi-so-a0-gf-a0-83.ucode.ko /boot/kernel/iwlwifi-so-a0-gf-a0.pnvm.ko /boot/kernel/iwlwifi-so-a0-gf4-a0-83.ucode.ko /boot/kernel/iwlwifi-so-a0-gf4-a0.pnvm.ko /boot/kernel/iwlwifi-so-a0-hr-b0-81.ucode.ko /boot/kernel/iwlwifi-so-a0-jf-b0-77.ucode.ko /boot/kernel/iwlwifi-ty-a0-gf-a0-83.ucode.ko /boot/kernel/iwlwifi-ty-a0-gf-a0.pnvm.ko /boot/kernel/rtw8723d_fw.bin.ko /boot/kernel/rtw8821c_fw.bin.ko /boot/kernel/rtw8822b_fw.bin.ko /boot/kernel/rtw8822c_fw.bin.ko /boot/kernel/rtw8822c_wow_fw.bin.ko all match this pattern and are skipped. I'm busy rewriting a bunch of kldxref to be a cross tool using libelf, but I think here you want to probably revert this and just add pkgsave to the list of "known bad" suffixes. -- John Baldwin From nobody Wed Dec 6 20:49:16 2023 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 4SlqJY1xJwz52x72; Wed, 6 Dec 2023 20:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlqJY1LZHz3QgN; Wed, 6 Dec 2023 20:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701895757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sRoMuIZidUdjDIBAU7TNXbkHaN5Bi2KJrHgIMa8HUQA=; b=I9JTWUaJsMYYyxGWKDn4YFXskaY9QuGvuc8sf48NQZ36EXAkl85ZGV7xrY4XRwqVI9e1Sf vJP3KcuvCTkidfocmH0H2wOF6i1D34iD+/dDBShHoE9WLOU5u1Kf/POsnqOYMMHpXkldIn wL9QNg8yiShXb5sdSaLTZiPls7XcbGQmw6Iz7Xygs5b8O1zrZaxbtKcfhxsEG+s1nn62OT KUSsZRAKxq7YB9NakToduS/c/ok7Fa9GhBItMlQ+Tormqhit8yxF3kb/zVaJU2P/e2ZVld K62WF7GjGHic6Zo4AyKUXdSPOCTbS8kdd5rKjGBe9gm4ClSEfnVpWT7KXB3Sqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701895757; a=rsa-sha256; cv=none; b=dfi4YvJ1F8nWlTIG3cPtrQml+Onn0Ew3LKnsCiTDasr1+kvJaxun+c/3hPYMqY/IBQ4WSt WlX1+3a+Skl/MZi+Jge3MAWvYEjEzi7ypu+p+iyTqS0PuNxmns0iKhac1OgV5X2dH1EC/P I+azsYCQrUDdg9mCQMCHS0CmdTRAwEGbjwnZxeGiSg9CkJFoCwu6w7HOslpEFXMOh9Tojm vtt855dKTC8u5eQu85odZXh32oQNKu8B0ycg2YxcUBDEie7Cv6X3P1EjfbtnKFUWjjCjKg vf5r8tEeGJptK/Q7dmIcCgFFIK3EdiqeJ00SW40tgnVLqUQo+JlTmx9IdE13Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701895757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sRoMuIZidUdjDIBAU7TNXbkHaN5Bi2KJrHgIMa8HUQA=; b=ALZDhU2ilC2xlDLg1bYHHMcEiq2qoa4Z05H99dXbI5jm0VFXKWNBEdLsat3A3nlRx1PPPA rJ/1bXn4VNtrd/jH9qENOt3x9o1iSvYNyCU9g51asfOQ+rarjitSnNzf70/UBajUGIopKR R1hz1qZHUMcaTCR+PaPvivbPCYLzrZt8Kn6ZP3QmEI7PNB+X8n5tcL+G4XZOMyxnj6Pd6C MaGuZ5Ghrr274ENboAV3Tzz0SRAsxyYS85BKZmBJ1xQiwuEImuvw6MIlbVBo+l4GZPKI+0 1EePhwcU6nZU0kXxTHpoGitTHfHJjc486Kg7af0VXYEluQtJmeeO+1nMmlXAaA== 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 4SlqJY0QgPz177Z; Wed, 6 Dec 2023 20:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6KnGEF054994; Wed, 6 Dec 2023 20:49:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6KnGq2054991; Wed, 6 Dec 2023 20:49:16 GMT (envelope-from git) Date: Wed, 6 Dec 2023 20:49:16 GMT Message-Id: <202312062049.3B6KnGq2054991@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0ea469bcd548 - main - libc: rename arm and i386 Ovfork.S to vfork.S List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ea469bcd548d29bbbc970325e4fa851d0e4c022 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0ea469bcd548d29bbbc970325e4fa851d0e4c022 commit 0ea469bcd548d29bbbc970325e4fa851d0e4c022 Author: Brooks Davis AuthorDate: 2023-12-06 20:47:50 +0000 Commit: Brooks Davis CommitDate: 2023-12-06 20:49:08 +0000 libc: rename arm and i386 Ovfork.S to vfork.S While this has been Ovfork.S forever on i386 it differs from other syscalls that require wrappers for no obvious reason so fix that. Reviewed by: kib Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42909 --- lib/libc/arm/sys/Makefile.inc | 5 +---- lib/libc/arm/sys/{Ovfork.S => vfork.S} | 0 lib/libc/i386/sys/Makefile.inc | 4 +--- lib/libc/i386/sys/{Ovfork.S => vfork.S} | 0 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/libc/arm/sys/Makefile.inc b/lib/libc/arm/sys/Makefile.inc index 3a86936a7b23..d5b62d61c90d 100644 --- a/lib/libc/arm/sys/Makefile.inc +++ b/lib/libc/arm/sys/Makefile.inc @@ -1,7 +1,4 @@ SRCS+= __vdso_gettc.c \ sched_getcpu_gen.c -MDASM= Ovfork.S cerror.S syscall.S - -# Don't generate default code for these syscalls: -NOASM+= vfork.o +MDASM= vfork.S cerror.S syscall.S diff --git a/lib/libc/arm/sys/Ovfork.S b/lib/libc/arm/sys/vfork.S similarity index 100% rename from lib/libc/arm/sys/Ovfork.S rename to lib/libc/arm/sys/vfork.S diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc index 57a8af428aca..bbc3497aa5a5 100644 --- a/lib/libc/i386/sys/Makefile.inc +++ b/lib/libc/i386/sys/Makefile.inc @@ -2,9 +2,7 @@ SRCS+= i386_get_fsbase.c i386_get_gsbase.c i386_get_ioperm.c i386_get_ldt.c \ i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c \ i386_clr_watch.c i386_set_watch.c i386_vm86.c -MDASM= Ovfork.S cerror.S getcontext.S syscall.S - -NOASM+= vfork.o +MDASM= vfork.S cerror.S getcontext.S syscall.S MAN+= i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2 MAN+= i386_set_watch.3 diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/vfork.S similarity index 100% rename from lib/libc/i386/sys/Ovfork.S rename to lib/libc/i386/sys/vfork.S From nobody Wed Dec 6 20:49:18 2023 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 4SlqJZ2vh9z52xg3; Wed, 6 Dec 2023 20:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlqJZ2HmKz3Qgc; Wed, 6 Dec 2023 20:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701895758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qdSOEDcvdfdGME1U8IMTxoflgRcy/REZzGhYOUKXekM=; b=xffgriD+Hs4dmw9ZnHfhFi02uLpTqHO+k+kGZRuelae8y5GMRIjSjdSFqv4mUa+xL1f834 4XrLxYLNOP26yLi5VqVBKxsafmpV6ICKtWAwjet7hAgY1YVZSXomKnVEUkPrmCBKHwFkYM C2hHrepK+77FrpDorYrQdQDiwEaLj6cKX+h4oMoZgU6xbwNWGTaaL5loRFAF2qr1wkLDhW /46EQP8UUvWjpDUJUCrz2Mx8MQ8X2JGQu3OeRdUHzopc4CPRMdj3+eW75qvkry/3gZLPxI Ixb+Ok5/4rg3i7jMmZQvIBirGyalk6HEiakCOpe1OADQ9Ueib3CMQmGmvQ4NCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701895758; a=rsa-sha256; cv=none; b=xPuPHBVJGhaJ8L2fFY+VoojTKQHUP+IPbOCs9l45tufEq0R5kk5QQhTi1N8T0tsHNHeTv9 av0577L04s5W+9A0lT+3twYpl1qFDbCMSp44aMlze48jGSGEIGNi7Avus4MXjFW4YH9znB btsLOGTL0+gXJQTlSI4JCOAkfDfpPcCmAH2ysSPoO9d/HHLaY1q2AghkuAlEdi2qvgzWHu sHVizCZmE6aR6oHhglel7IhbDEfX3E7sE7Toak5Ec0BFIwJA/xIpeikr9I3fVuK5K1b1mh hwSRYYjWWhgz9ZXJsTy/YtV2SpsrdSGkg5zQeaZhsN2qoAcYjGGVyOrwg7HU/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701895758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qdSOEDcvdfdGME1U8IMTxoflgRcy/REZzGhYOUKXekM=; b=sF4bzt6XF9skp2FIdyM3d13lueAtJeKZDR7spLhLXLbpFWdLcybZLEKuU0a+bU3tzjGUAU JJI43boZwwUU89/i+r5GJpAg+quin2fUtqInb+PKtKCuYK7LFIjs+gwqkw1/XIjzRzUtBJ a/Vf5Rk+gm3p/0v4ghSWlvS1BGD/1h7dE9ZSsQRSHBycCviTxa+WEg1lOWvnWCnWfpEMO6 ZDNMFHTmXqYY1sQFQGFGtyUMVBxQcLN6jRnUGHMY3+tBAs1PwrfbcEBmv0rqRi1fyj+XV/ 0U5BQGGGdBp5akhxAvCUWVoXKAK8miOJDH1nxN2PIaWNTNBeIlVHDP8uuxEYcw== 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 4SlqJZ1LVyz17MV; Wed, 6 Dec 2023 20:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6KnIuF055042; Wed, 6 Dec 2023 20:49:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6KnI1c055039; Wed, 6 Dec 2023 20:49:18 GMT (envelope-from git) Date: Wed, 6 Dec 2023 20:49:18 GMT Message-Id: <202312062049.3B6KnI1c055039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: ec27c0bb3eea - main - libc: don't needlessly add vfork.o to NOASM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec27c0bb3eea73be4db6cd2f275db6c516e12d00 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ec27c0bb3eea73be4db6cd2f275db6c516e12d00 commit ec27c0bb3eea73be4db6cd2f275db6c516e12d00 Author: Brooks Davis AuthorDate: 2023-12-06 20:48:39 +0000 Commit: Brooks Davis CommitDate: 2023-12-06 20:49:08 +0000 libc: don't needlessly add vfork.o to NOASM For architectures where vfork.S was named Ovfork.S this was needed, but it was always pointless here as an entry in either MDASM or NOASM is equivalent. Reviewed by: kib Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42914 --- lib/libc/aarch64/sys/Makefile.inc | 3 --- lib/libc/amd64/sys/Makefile.inc | 3 --- lib/libc/riscv/sys/Makefile.inc | 3 --- 3 files changed, 9 deletions(-) diff --git a/lib/libc/aarch64/sys/Makefile.inc b/lib/libc/aarch64/sys/Makefile.inc index ae48fd739477..38eb13fb89be 100644 --- a/lib/libc/aarch64/sys/Makefile.inc +++ b/lib/libc/aarch64/sys/Makefile.inc @@ -6,6 +6,3 @@ SRCS+= __vdso_gettc.c \ MDASM= cerror.S \ syscall.S \ vfork.S - -# Don't generate default code for these syscalls: -NOASM+= vfork.o diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libc/amd64/sys/Makefile.inc index 658fbd2add50..d4a767c90a5f 100644 --- a/lib/libc/amd64/sys/Makefile.inc +++ b/lib/libc/amd64/sys/Makefile.inc @@ -5,6 +5,3 @@ SRCS+= \ amd64_set_gsbase.c MDASM= vfork.S cerror.S getcontext.S - -# Don't generate default code for these syscalls: -NOASM+= vfork.o diff --git a/lib/libc/riscv/sys/Makefile.inc b/lib/libc/riscv/sys/Makefile.inc index cd8ba4f11557..e4e66ba19bd6 100644 --- a/lib/libc/riscv/sys/Makefile.inc +++ b/lib/libc/riscv/sys/Makefile.inc @@ -4,6 +4,3 @@ SRCS+= __vdso_gettc.c \ MDASM= cerror.S \ syscall.S \ vfork.S - -# Don't generate default code for these syscalls: -NOASM+= vfork.o From nobody Wed Dec 6 20:49:19 2023 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 4SlqJb4MCrz52xg7; Wed, 6 Dec 2023 20:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlqJb3HPlz3Qc0; Wed, 6 Dec 2023 20:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701895759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QkvDmzzPfQEA5ZARDPxiDms4D6Y4DhuD+bTsxJluVqs=; b=ye/e1qa2j5Z/Y16zVveG/AxsylDIzwqVf7PqlqPL+CP8TiHBbzX/Rtrpl9fP9FymKUPQv3 xZzOFHjvJxsY8fyiEKS6cD7Su+gYCSqI4zpVXgw/J1qQuMOPhnqV8Vysn8m/ycxf75FZNJ 7p4PcS7q7If6xr00dNnyKnS4+0zBog/Bt+1TuPsrXAIrvkKKT4n9m6dlKIvSfpqvJjsPWZ RCv3sZGVrTN9FnOkOdmYP7FqXJY8JZE2HZF5fSq30bfdfIGgLAQQfHuH50/jbCdp6BYHLs pfi7TX2X89Qw7sYNLR6ZGCVW45MHcOSzJw0uJRgsbhtZkXCwnNTLO1FXcqzGKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701895759; a=rsa-sha256; cv=none; b=fLNE5aVxasg30qSdROLnpMJdLbjzoIgV7DxgI2yTW3VWM68eeBSAjzA8DAUP08pdjOvYft 4nqMDAge5Emj+T9dg4jawsiRY2uER+u/7Z7XwB+t6TuK3aCXvq/B4spJxJoywuD2cfQ5J0 LMIPgmofJ/oDSod7ZF8vPNweVY+81sGAlUmHCSrxxabUHJWDxXI5QTNPmAIl168gIS73de rYMbH0pv+IDwObyILqKnYUKHtSX6ui45tVKQAmpSY4ZH48f9/8pjtXOpPYvNYzGOfghax+ jI0lxg97byCLRaw/+F6qImczh31igp3uFHrOe+kd7BqAMwlr/66jWIGJ1PN+ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701895759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QkvDmzzPfQEA5ZARDPxiDms4D6Y4DhuD+bTsxJluVqs=; b=Ip5xUqc8GJT8o4bJV3RHpgvRyxdvBc1Zy0CMMg9kdbNey2DAHlBbxzDtKxuvZVH7Fcsfp9 B2to9STNz/6NNyAOaFKffvYFbkFgWVcOV+3rSffxrlpVjyEWBN4J9KPXyE0OlJfW3txnvU OYvqb3sKdoutREBT/OtdFu3YBizTe3Ed04qdqO/UEQdvB/RI7KPcU200jf/UrIqhXBzyfr MQRzG3flF37CQ7Diqmyu5tGTXW+hxlJkSlO7CKAXM3rCHr4GzyQZXFMppDF8Uof8DUUYVY 0nT1K2PpxwOiZo8Ckz+hs8POov51a5i/BHKv0QK/jMKE1WB38u5WXkBjhKdfSA== 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 4SlqJb2Kw6z177b; Wed, 6 Dec 2023 20:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6KnJno055085; Wed, 6 Dec 2023 20:49:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6KnJbZ055082; Wed, 6 Dec 2023 20:49:19 GMT (envelope-from git) Date: Wed, 6 Dec 2023 20:49:19 GMT Message-Id: <202312062049.3B6KnJbZ055082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: fc0288993cda - main - libc: simplify MDASM/NOASM checks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc0288993cdad8a559fcd2c2166cf95f1fa43745 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=fc0288993cdad8a559fcd2c2166cf95f1fa43745 commit fc0288993cdad8a559fcd2c2166cf95f1fa43745 Author: Brooks Davis AuthorDate: 2023-12-06 20:48:46 +0000 Commit: Brooks Davis CommitDate: 2023-12-06 20:49:08 +0000 libc: simplify MDASM/NOASM checks Use boolean evaluation of :M matches and a single if statement. Reviewed by: imp, kib Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42915 --- lib/libc/sys/Makefile.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index b9ac43bac077..4137699bb741 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -98,11 +98,9 @@ SRCS+=${MDASM} # not declared for no generation of default code (NOASM). Add each # syscall that satisfies these conditions to the ASM list. .for _asm in ${MIASM} -.if (${MDASM:R:M${_asm:R}} == "") -.if (${NOASM:R:M${_asm:R}} == "") +.if !${MDASM:R:M${_asm:R}} && !${NOASM:R:M${_asm:R}} ASM+=$(_asm) .endif -.endif .endfor SASM= ${ASM:S/.o/.S/} From nobody Wed Dec 6 21:02:28 2023 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 4Slqc358XZz52yHm for ; Wed, 6 Dec 2023 21:02:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slqc30mJbz3SCm for ; Wed, 6 Dec 2023 21:02:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-50bf4f97752so314249e87.1 for ; Wed, 06 Dec 2023 13:02:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701896561; x=1702501361; 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=6+tjlI4P6PVjiWXPVroz9V6jxusFAbfC+h3Cjg+DpIQ=; b=cJe9v8gOzJAgETRCZknJXdInaaBDWccoVzOVYSVIuIIsd/qMK5uter8l/HeNo7HiuU uklvHuvXTWD5Mu7xErby9H8rKQc/uWjgxheTd53gwUA1qaJsepbGWjBwwjsTfk0KYOXL bjJ17yXs4vHVbPu7EJihVNVQk1Ph+uqIul7oqhrd/wiISIQoMQL1prejQxuW/KFRtw7k ICQ2NNjdb5rGqgIiXWWTqq0U6xW7oXTnvBYzFilQBpM2zI7px+PcKiJDlNFeVdEhyw+y JQjnE6acHhSkv7k5QfXb+tILCyPpRx+sUsKxMVaWhfVRJLOhttiZnuy/LrYlaHaNM8Qi wFWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701896561; x=1702501361; 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=6+tjlI4P6PVjiWXPVroz9V6jxusFAbfC+h3Cjg+DpIQ=; b=HZ03ZVJ4JEWd6Slb9E+qIMT3siNBgIyd/P1v4DLnjMNXEIo7XA/jcsezXjPVsyiGlL DpWqZlJSXLbZk8+gVepSoU+KJ9tsEUWBDf4G1rzbkiLWv8JesXbXPq+4O+1enReBgDeK dDL1cQGwtcKR+tDlN4Fy/7Slx59/DREBwVIHb+rolNfl1yURY0HcyQZA5QowddGnFGvl /cn6f8H68sfTk8v3PkI+enkVZWNnCPuD03SJ4gPKmDYYUCa87SfpkloL9jSBZEUHjmAY 8Mc2n3zwqo0wG2E0o2zhhoEKbDr9ULaKG+UzoQ352O+fJRkzO5+/aSv1OykbjKD5DCvo IQfg== X-Gm-Message-State: AOJu0YzSOD45imIv51lQhoVzEQXYoppf18zujxW6lIgOHe7KgW0+lbw2 tMb/d4BIAznfhvbF8eL4zlq0WRigB797nxr4hqhCTg== X-Google-Smtp-Source: AGHT+IHRtV8poiovlfzd3jJj7S6xga05W/Vv6ItdUlwL3lWZGcUjt4kE88mkelP9AzdslMfz/lEkRuiwdNzM+I8z4mo= X-Received: by 2002:a2e:3c16:0:b0:2ca:68:acf7 with SMTP id j22-20020a2e3c16000000b002ca0068acf7mr1148140lja.4.1701896560870; Wed, 06 Dec 2023 13:02:40 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202302251737.31PHb2R8072300@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 6 Dec 2023 14:02:28 -0700 Message-ID: Subject: Re: git: 773c13c686e4 - main - kldxref: skip .pkgsave files To: John Baldwin Cc: Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000f4a696060bddab28" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Slqc30mJbz3SCm --000000000000f4a696060bddab28 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Dec 6, 2023, 1:04 PM John Baldwin wrote: > On 2/25/23 9:37 AM, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D773c13c686e4b6ae9dbbc150b342b82= c3f47d73a > > > > commit 773c13c686e4b6ae9dbbc150b342b82c3f47d73a > > Author: Mina Gali=C4=87 > > AuthorDate: 2023-02-25 17:31:58 +0000 > > Commit: Warner Losh > > CommitDate: 2023-02-25 17:35:43 +0000 > > > > kldxref: skip .pkgsave files > > > > This should help people transitioning from traditional setups to > pkgbase > > experience a lot less friction. > > > > We do this by skipping all files containing two dots. > > > > Reviewed by: imp > > Pull Request: https://github.com/freebsd/freebsd-src/pull/661 > > Differential Revision: https://reviews.freebsd.org/D27959 > > This restriction is too broad and omits all of the modern wifi firmware > klds from linker.hints, e.g. > > /boot/kernel/iwlwifi-3160-17.ucode.ko > /boot/kernel/iwlwifi-3168-29.ucode.ko > /boot/kernel/iwlwifi-7260-17.ucode.ko > /boot/kernel/iwlwifi-7265-17.ucode.ko > /boot/kernel/iwlwifi-7265D-29.ucode.ko > /boot/kernel/iwlwifi-8000C-36.ucode.ko > /boot/kernel/iwlwifi-8265-36.ucode.ko > /boot/kernel/iwlwifi-9000-pu-b0-jf-b0-46.ucode.ko > /boot/kernel/iwlwifi-9260-th-b0-jf-b0-46.ucode.ko > /boot/kernel/iwlwifi-Qu-b0-hr-b0-77.ucode.ko > /boot/kernel/iwlwifi-Qu-b0-jf-b0-77.ucode.ko > /boot/kernel/iwlwifi-Qu-c0-hr-b0-77.ucode.ko > /boot/kernel/iwlwifi-Qu-c0-jf-b0-77.ucode.ko > /boot/kernel/iwlwifi-QuZ-a0-hr-b0-77.ucode.ko > /boot/kernel/iwlwifi-QuZ-a0-jf-b0-77.ucode.ko > /boot/kernel/iwlwifi-cc-a0-77.ucode.ko > /boot/kernel/iwlwifi-so-a0-gf-a0-83.ucode.ko > /boot/kernel/iwlwifi-so-a0-gf-a0.pnvm.ko > /boot/kernel/iwlwifi-so-a0-gf4-a0-83.ucode.ko > /boot/kernel/iwlwifi-so-a0-gf4-a0.pnvm.ko > /boot/kernel/iwlwifi-so-a0-hr-b0-81.ucode.ko > /boot/kernel/iwlwifi-so-a0-jf-b0-77.ucode.ko > /boot/kernel/iwlwifi-ty-a0-gf-a0-83.ucode.ko > /boot/kernel/iwlwifi-ty-a0-gf-a0.pnvm.ko > /boot/kernel/rtw8723d_fw.bin.ko > /boot/kernel/rtw8821c_fw.bin.ko > /boot/kernel/rtw8822b_fw.bin.ko > /boot/kernel/rtw8822c_fw.bin.ko > /boot/kernel/rtw8822c_wow_fw.bin.ko > > all match this pattern and are skipped. > > I'm busy rewriting a bunch of kldxref to be a cross tool using libelf, > but I think here you want to probably revert this and just add pkgsave > to the list of "known bad" suffixes. > Sure. Any reason to not just require .ko? Or do we have to index the kernel too? Warner --=20 > John Baldwin > > --000000000000f4a696060bddab28 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Wed, Dec 6, 2023, 1:04 PM John Baldwin <jhb@freebsd.org> wrote:
On 2/25/23 9:37 AM, Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3D773c13c686e4b6ae9dbbc150b342b8= 2c3f47d73a
>
> commit 773c13c686e4b6ae9dbbc150b342b82c3f47d73a
> Author:=C2=A0 =C2=A0 =C2=A0Mina Gali=C4=87 <freebsd@igalic.co>= ;
> AuthorDate: 2023-02-25 17:31:58 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2023-02-25 17:35:43 +0000
>
>=C2=A0 =C2=A0 =C2=A0 kldxref: skip .pkgsave files
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 This should help people transitioning from traditi= onal setups to pkgbase
>=C2=A0 =C2=A0 =C2=A0 experience a lot less friction.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 We do this by skipping all files containing two do= ts.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Reviewed by: imp
>=C2=A0 =C2=A0 =C2=A0 Pull Request: htt= ps://github.com/freebsd/freebsd-src/pull/661
>=C2=A0 =C2=A0 =C2=A0 Differential Revision: https:/= /reviews.freebsd.org/D27959

This restriction is too broad and omits all of the modern wifi firmware
klds from linker.hints, e.g.

/boot/kernel/iwlwifi-3160-17.ucode.ko
/boot/kernel/iwlwifi-3168-29.ucode.ko
/boot/kernel/iwlwifi-7260-17.ucode.ko
/boot/kernel/iwlwifi-7265-17.ucode.ko
/boot/kernel/iwlwifi-7265D-29.ucode.ko
/boot/kernel/iwlwifi-8000C-36.ucode.ko
/boot/kernel/iwlwifi-8265-36.ucode.ko
/boot/kernel/iwlwifi-9000-pu-b0-jf-b0-46.ucode.ko
/boot/kernel/iwlwifi-9260-th-b0-jf-b0-46.ucode.ko
/boot/kernel/iwlwifi-Qu-b0-hr-b0-77.ucode.ko
/boot/kernel/iwlwifi-Qu-b0-jf-b0-77.ucode.ko
/boot/kernel/iwlwifi-Qu-c0-hr-b0-77.ucode.ko
/boot/kernel/iwlwifi-Qu-c0-jf-b0-77.ucode.ko
/boot/kernel/iwlwifi-QuZ-a0-hr-b0-77.ucode.ko
/boot/kernel/iwlwifi-QuZ-a0-jf-b0-77.ucode.ko
/boot/kernel/iwlwifi-cc-a0-77.ucode.ko
/boot/kernel/iwlwifi-so-a0-gf-a0-83.ucode.ko
/boot/kernel/iwlwifi-so-a0-gf-a0.pnvm.ko
/boot/kernel/iwlwifi-so-a0-gf4-a0-83.ucode.ko
/boot/kernel/iwlwifi-so-a0-gf4-a0.pnvm.ko
/boot/kernel/iwlwifi-so-a0-hr-b0-81.ucode.ko
/boot/kernel/iwlwifi-so-a0-jf-b0-77.ucode.ko
/boot/kernel/iwlwifi-ty-a0-gf-a0-83.ucode.ko
/boot/kernel/iwlwifi-ty-a0-gf-a0.pnvm.ko
/boot/kernel/rtw8723d_fw.bin.ko
/boot/kernel/rtw8821c_fw.bin.ko
/boot/kernel/rtw8822b_fw.bin.ko
/boot/kernel/rtw8822c_fw.bin.ko
/boot/kernel/rtw8822c_wow_fw.bin.ko

all match this pattern and are skipped.

I'm busy rewriting a bunch of kldxref to be a cross tool using libelf,<= br> but I think here you want to probably revert this and just add pkgsave
to the list of "known bad" suffixes.
=

Sure. Any reason to not just = require .ko? Or do we have to index the kernel too?
=
Warner=C2=A0

<= div dir=3D"auto">
--
John Baldwin

--000000000000f4a696060bddab28-- From nobody Wed Dec 6 21:13:23 2023 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 4SlqrP64hTz53105; Wed, 6 Dec 2023 21:13:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlqrP5Yq7z3Tb2; Wed, 6 Dec 2023 21:13:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701897205; 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=3PbWF0wdLtnIDMTpc+NokPGv3dF/lZtfMsCroWepwwE=; b=IHq5CDOb5K2qPVejke9GH4xXtOrsOX9uWssniVWR3djH/M33cZ9aeR8K3DPqLSDQ1nj5Op wrkth5cGO5iZuEwEaIzxWpaozau/Q3Kik+zf4mkdMeCK1pSp7FoBC74q+lVW5Mt4aHp6pT OG4AVDGHe5V83E3y+jndH/cluAlZ7e+h7oq0BufXllxX6YDCE0rXo6eUbRtQObd77znRI/ dbRMVGVb8/AF+ZGP9HF+ck0aQQs/XN6QmjnhZ+0FafpyNj9/RAmFRbOshF+c47sPtPIEnq +n/TixPJFrI0J76akEq9KiZfDLsJqV4waNIFeThm41aM0OtMDBDXmZ8TFkj//Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701897205; a=rsa-sha256; cv=none; b=j8ubpdryGZFf8kKpM7lr2fQsmVQ1LrH3vBukBTQjNfUhDOvx2e6tS0TkZGG1Il7l6Gc4Ji +vMsbzGxvxZQtvFBfglnbP7Gxn9jrPtmo61LRR8WK9PyWMvu2wEZZ4u+c3kEas8U5aPMVv xVFw1XmEIISJoL2OZlRmBsNE1IDwwPzzGRGwGV4Mtu58S4gR5T3Tm3honq4Q1mIRH1NM34 F47FjkyTDbl3QobsL4fnuzx4fzcyjroZ/uCkL4AAu3JbTJaFo7YC05ujjlSUTDj95NZNwl VESTkldb+wVkSbBa0gw1ZeyNLr1qXhOWdLoJ29bsatEJZGekowwcv4BYydHfPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701897205; 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=3PbWF0wdLtnIDMTpc+NokPGv3dF/lZtfMsCroWepwwE=; b=tXmtBEotPSak1L8HcD0iUHkMsDbEEnAUZWimw3ugjy9w4jVdRc6EIxNRTPmc1TSILpAZzC 0R18h/bcLXnicbkSeAy2H2Lj5qEIuIN0GZFGwe7N8dXUL0dc28f6HTt6+rZD1+VIi8DfcL P7P9KdmfP7sjuDBzybCD8s233n1Rs3O6okvIqPVmhn6J1KY48klkpf0Iw/f7W/1shMqWhU nDybzoIHqUuSdDzOTWLzsrYJInFnCBb7TFCJuRVRZ0Dcx4AIHQToY4dojHUbfJnsUMj0qt gAsXRfqNI1uMGnzrVjKWp2t77WT5B1axYy4CNQjhauOlYSdTNLU/qPY1nXkpGA== Received: from [IPV6:2601:648:8384:fd00:8d37:e6e8:747c:72de] (unknown [IPv6:2601:648:8384:fd00:8d37:e6e8:747c:72de]) (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 4SlqrP1J7Fz1FZc; Wed, 6 Dec 2023 21:13:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Wed, 6 Dec 2023 13:13:23 -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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 773c13c686e4 - main - kldxref: skip .pkgsave files Content-Language: en-US To: Warner Losh Cc: Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202302251737.31PHb2R8072300@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 12/6/23 1:02 PM, Warner Losh wrote: > On Wed, Dec 6, 2023, 1:04 PM John Baldwin wrote: > >> On 2/25/23 9:37 AM, Warner Losh wrote: >>> The branch main has been updated by imp: >>> >>> URL: >> https://cgit.FreeBSD.org/src/commit/?id=773c13c686e4b6ae9dbbc150b342b82c3f47d73a >>> >>> commit 773c13c686e4b6ae9dbbc150b342b82c3f47d73a >>> Author: Mina Galić >>> AuthorDate: 2023-02-25 17:31:58 +0000 >>> Commit: Warner Losh >>> CommitDate: 2023-02-25 17:35:43 +0000 >>> >>> kldxref: skip .pkgsave files >>> >>> This should help people transitioning from traditional setups to >> pkgbase >>> experience a lot less friction. >>> >>> We do this by skipping all files containing two dots. >>> >>> Reviewed by: imp >>> Pull Request: https://github.com/freebsd/freebsd-src/pull/661 >>> Differential Revision: https://reviews.freebsd.org/D27959 >> >> This restriction is too broad and omits all of the modern wifi firmware >> klds from linker.hints, e.g. >> >> /boot/kernel/iwlwifi-3160-17.ucode.ko >> /boot/kernel/iwlwifi-3168-29.ucode.ko >> /boot/kernel/iwlwifi-7260-17.ucode.ko >> /boot/kernel/iwlwifi-7265-17.ucode.ko >> /boot/kernel/iwlwifi-7265D-29.ucode.ko >> /boot/kernel/iwlwifi-8000C-36.ucode.ko >> /boot/kernel/iwlwifi-8265-36.ucode.ko >> /boot/kernel/iwlwifi-9000-pu-b0-jf-b0-46.ucode.ko >> /boot/kernel/iwlwifi-9260-th-b0-jf-b0-46.ucode.ko >> /boot/kernel/iwlwifi-Qu-b0-hr-b0-77.ucode.ko >> /boot/kernel/iwlwifi-Qu-b0-jf-b0-77.ucode.ko >> /boot/kernel/iwlwifi-Qu-c0-hr-b0-77.ucode.ko >> /boot/kernel/iwlwifi-Qu-c0-jf-b0-77.ucode.ko >> /boot/kernel/iwlwifi-QuZ-a0-hr-b0-77.ucode.ko >> /boot/kernel/iwlwifi-QuZ-a0-jf-b0-77.ucode.ko >> /boot/kernel/iwlwifi-cc-a0-77.ucode.ko >> /boot/kernel/iwlwifi-so-a0-gf-a0-83.ucode.ko >> /boot/kernel/iwlwifi-so-a0-gf-a0.pnvm.ko >> /boot/kernel/iwlwifi-so-a0-gf4-a0-83.ucode.ko >> /boot/kernel/iwlwifi-so-a0-gf4-a0.pnvm.ko >> /boot/kernel/iwlwifi-so-a0-hr-b0-81.ucode.ko >> /boot/kernel/iwlwifi-so-a0-jf-b0-77.ucode.ko >> /boot/kernel/iwlwifi-ty-a0-gf-a0-83.ucode.ko >> /boot/kernel/iwlwifi-ty-a0-gf-a0.pnvm.ko >> /boot/kernel/rtw8723d_fw.bin.ko >> /boot/kernel/rtw8821c_fw.bin.ko >> /boot/kernel/rtw8822b_fw.bin.ko >> /boot/kernel/rtw8822c_fw.bin.ko >> /boot/kernel/rtw8822c_wow_fw.bin.ko >> >> all match this pattern and are skipped. >> >> I'm busy rewriting a bunch of kldxref to be a cross tool using libelf, >> but I think here you want to probably revert this and just add pkgsave >> to the list of "known bad" suffixes. >> > > Sure. Any reason to not just require .ko? Or do we have to index the kernel > too? We do index the kernel as well, yes. However, we could probably get by with "kernel" and ends in ".ko" as a valid set of files. This would also avoid bogusly warning about linker.hints not being a valid ELF file on re-runs if you use -v. -- John Baldwin From nobody Wed Dec 6 21:40:46 2023 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 4SlrRy4LJZz532JT; Wed, 6 Dec 2023 21:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlrRy2GYPz3WLr; Wed, 6 Dec 2023 21:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701898846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RlVYoOOUs3wpcFkDHWVzWCzrUSlOPxUZ56tsi24Z2vY=; b=Ej8h/OWrV2h0eiM+3Pn6m98KlKxnX579CDNjuKyD3rLz2zu/kpjdIzHAUa5GmNk3/lE/XV 0Kf4PO1FPX3L+s5JTx5sYI1ORfKMFfVISLG7R0wclIEt5qTKRfVu8un0xFQWZ0Z9mKC/2u 7HLSypx8lxxOhKdCcHU/COtC6RRe4gAjyloo+YcPbW9XsIu1uQk4hCIMQMg14IsjRiPF98 EBeLG+D1lnGzvm4SpEQklMgde+0iedCQfhj9bfPZtr+DHC7btPjNGfRr7k5I7Bb/EvZfcb cJuatm7DusVUylxRo9fVG8bpcqBaVuCKbYMUZcC7vmWHv33AFKEvNrzdp01jvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701898846; a=rsa-sha256; cv=none; b=yG4u/HR4w0LDIIbiMFbXK34Fl/+ax7mvhXW8LSrG86VBMNAGBmAHV97g/aD+CGn15c2pAg EQ+y74cyBuxfBAdeRTGmupyUBhAOOsP8kVsCb7uc4+EWe61T+5C0tvsYrc64532qrqejjl ypO3SumFppq9P3W7nRvbdvXnGeZHD08xuOVqV+Zz62+BJW9Q8RudSguIA9snvyE2B4YRNV XifLomjH5ZN0oNyC0nqLLvPzdel6AOTv79Yz3v6NS2+IIPptgu+ZnGoVxiLfGf5Tt08Tev U6J1cOtAi/D3Ucxf+l5VoAudAEG9hGVBwdvx5mmkYrWkunL8Ss5mu3HEa5gmvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701898846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RlVYoOOUs3wpcFkDHWVzWCzrUSlOPxUZ56tsi24Z2vY=; b=ffGsYfqThatWHl7AcuIqF9aCitxqGwjAM2cDNNOPd1ltdOHrYheT8hsJki0Gf6xsRyNIEy lSOvcccu4owvGZNk6ZSOmZCkwKZMeCki7jCDS1q16qBzPoSWHXGuksNRtL2u6Um2/A32SN BMcXDpXB72yZzamfrHIfF1+RW8PBOhSloWJ6jRqDpqWv3qxaHNNvix7sys3RT7TJbApY/P dgAgtgg5kcoH5DeJEKr0ehFDsTf6z2nA0AQ94/y2o+GnhFpUCkTlRHmm1pMnqzmc+NAPlr P/hpP1jqTC5nnXV1vMpXOec22Rh6yqlWiyLtmm+DmUnlgyLAZFd5oAGKEgirNg== 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 4SlrRy1LSvz18q9; Wed, 6 Dec 2023 21:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6LekAb047813; Wed, 6 Dec 2023 21:40:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6LekVq047810; Wed, 6 Dec 2023 21:40:46 GMT (envelope-from git) Date: Wed, 6 Dec 2023 21:40:46 GMT Message-Id: <202312062140.3B6LekVq047810@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: 47d669f10ea3 - main - bsdinstall: Encode dists to valid variable names in checksum script List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 47d669f10ea3eb92a3783376549728b42c9e22b9 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=47d669f10ea3eb92a3783376549728b42c9e22b9 commit 47d669f10ea3eb92a3783376549728b42c9e22b9 Author: Jessica Clarke AuthorDate: 2023-12-06 21:37:32 +0000 Commit: Jessica Clarke CommitDate: 2023-12-06 21:37:32 +0000 bsdinstall: Encode dists to valid variable names in checksum script Currently we just strip the .txz of the dist name (and add a status_ prefix) to get the shell variable name for its status, but this doesn't give a valid result for dists like base-dbg, kernel-dbg and lib32-dbg, or even kernel.KERNCONF (or, combining the two, kernel.KERNCONF-dbg). As a result, four things go wrong for such dists: 1. If there is a dot and/or a dash in the name, writing to the variable fails and spits an error out on stderr to the log 3. If there is a dot in the name before any dash, the syntax is always invalid, reading the variable fails, spits an error out on stderr to the log, the result is the empty string and that is interpreted as being 0% 2. If there is a dash in the name before any dot, and there is a dist whose name is the substring up to that first dash, and it has already had its status written to, reading the variable instead reads that dist's variable and so the status of that dist is displayed instead 3. If there is a dash in the name before any dot, and either there is not a dist whose name is the substring up to that first dash or there is such a dist but it has not already had its status written to, reading the varaible instead results in the substring after the first dash, including any additional string expansion syntax that follows (i.e. ${status_kernel-dbg:--11}, the expression used to read the variable, is interpreted as reading status_kernel with a default value of "dbg:--11") For example, in a default install with base, kernel, kernel-dbg and lib32, the following sequence of displays happens: 1. base is In Progress, kernel is Pending, kernel-dbg is 0% (what shows for the garbage input "dbg:--11") and lib32 is Pending 2. base is Passed, kernel is In Progress, kernel-dbg is In Progress (since kernel has now had its status written to) and lib32 is Pending 3. base is Passed, kernel is Passed, kernel-dbg is Passed (again, since that is the status of kernel, despite that kernel-dbg is being verified at this point) and lib32 is Pending 4. base is Passed, kernel is Passed, kernel-dbg is Passed and lib32 is In Progress Fix this with a crude encoding scheme. More special characters can easily be added if needed in future. Note that, prior to bsddialog being used (and thus for branches this is MFC'ed to where dialog is still used), the same problem existed but displayed slightly differently due to a combination of different default values and different behaviour for unintended inputs. Fixes: b70047d41362 ("Add generation of an installation manifest containing SHA256 checksums as ...") MFC after: 1 week --- usr.sbin/bsdinstall/scripts/checksum | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/checksum b/usr.sbin/bsdinstall/scripts/checksum index 376ba4261496..ee93cb342f25 100755 --- a/usr.sbin/bsdinstall/scripts/checksum +++ b/usr.sbin/bsdinstall/scripts/checksum @@ -30,14 +30,20 @@ test -f $BSDINSTALL_DISTDIR/MANIFEST || exit 0 BSDCFG_SHARE="/usr/share/bsdconfig" . $BSDCFG_SHARE/common.subr || exit 1 +dist_to_statusvar() +{ + printf 'status_' + echo "$1" | sed 's/_/__/g;s/\./_dot_/g;s/-/_dash_/g' +} + percentage=0 for dist in $DISTRIBUTIONS; do - distname=$(basename $dist .txz) - eval "status_$distname=-8" + statusvar=$(dist_to_statusvar $dist) + eval "$statusvar=-8" items="" for i in $DISTRIBUTIONS; do - items="$items $i `eval echo \\\${status_$(basename $i .txz):--11}`" + items="$items $i `eval echo \\\${$(dist_to_statusvar $i):--11}`" done bsddialog --backtitle "$OSNAME Installer" --title "Checksum Verification" \ --mixedgauge "\nVerifying checksums of selected distributions.\n" \ @@ -57,13 +63,13 @@ for dist in $DISTRIBUTIONS; do CK_VALID=$? if [ $CK_VALID -le 1 ]; then if [ $CK_VALID -eq 0 ]; then - eval "status_$distname=-3" + eval "$statusvar=-3" else - eval "status_$distname=-7" + eval "$statusvar=-7" fi percentage=$(echo $percentage + 100/`echo $DISTRIBUTIONS | wc -w` | bc) else - eval "status_$distname=-2" + eval "$statusvar=-2" case $(/bin/freebsd-version -u) in *-ALPHA*|*-CURRENT|*-STABLE|*-PRERELEASE) bsddialog --backtitle "$OSNAME Installer" --title "Error" \ From nobody Wed Dec 6 21:41:24 2023 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 4SlrSy0gpCz532h2 for ; Wed, 6 Dec 2023 21:41:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlrSx6RQ2z3WfN for ; Wed, 6 Dec 2023 21:41:37 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40c09fcfa9fso3203925e9.2 for ; Wed, 06 Dec 2023 13:41:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701898896; x=1702503696; 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=3gJeFonGvMYNeKzsV6Oy/XnXlI6wbESGNu0OauOKf+Y=; b=G2ZE5hr5Jxb9D+OozrcTsWPy09lZ8KdtBNLwoHm/x+ztx7yL5mYTcI/U6TIdP7DKQx skuoEhkZLwFahcCJVCR2071XnieT+Hjy/zb4j1zPwn4mf/XvYlbEnPW6ISdg0+zkfwft 6i/fGSgA5AGFyQyFBhufO+v+9w8Pg6jv1Z1nYkEI/xvJz/27aFvoCHGupdNF4E/nfWYE MYE4SN2GW+/ZpQUOJDDT+Rg5f6fR6TZQzyr4BfSItm5Hb1BhgxXt65URUvjHCi3/l9Jj 4N5HPSgAZ0dqSAz8gJJ4tSGJfJ19pU4YkMV/zjsIGZA07MGEBsu5m0Oz/MCMqkZIKAUX sxUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701898896; x=1702503696; 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=3gJeFonGvMYNeKzsV6Oy/XnXlI6wbESGNu0OauOKf+Y=; b=d7R/gsjOMg0YmPSln3Eo3/XfqexBRMxPRx8+sDZiEaFAD2KJe9MsqdrQnLKlGMUic6 tmpd5efXlAgGu/ROU4GepeTRUwM2qcKsicMkU2hkcDWUA4fR8awxxp/X4SXQ8g35++cF 6HEd1jKrSc51X8EnQdxi2TG2mWluNmVvG5v2BuJi2/zmvOqAzLUoiClELwASR3fBOaVb dzkuYm+qtVgXfxFUSuq3C3f2EI2NA3tHSnfgl5WOhByS/WnBpAgwkgADihl9AQD1Sch8 bXT2Q5xSQG8oZK3TVh4mmDGI3Zniq+K4Q7TcvOl43DhUX29hjJ+eyHpg/o5LhCOCH1vh 66BA== X-Gm-Message-State: AOJu0YyhCA3j6Al1S795sTGoZd7KIMKIyem/GqtETHRRa7EP7wiGdmxw P/N6X7HzPQgsdRVVO5edfrM3udkQdMVDYIOcstm4dg== X-Google-Smtp-Source: AGHT+IF1BAaWnlrh5WqF/ya+nuEDfx6aYPnrVjqaCejA8BrvfovJI+eelraigtBR5kxGPehDymbRr61vGQnCv6irXXU= X-Received: by 2002:a05:600c:3d8b:b0:40b:5e22:30c with SMTP id bi11-20020a05600c3d8b00b0040b5e22030cmr476664wmb.120.1701898895900; Wed, 06 Dec 2023 13:41:35 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202302251737.31PHb2R8072300@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 6 Dec 2023 14:41:24 -0700 Message-ID: Subject: Re: git: 773c13c686e4 - main - kldxref: skip .pkgsave files To: John Baldwin Cc: Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000002259b4060bde3711" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SlrSx6RQ2z3WfN --0000000000002259b4060bde3711 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hey John, On Wed, Dec 6, 2023 at 2:13=E2=80=AFPM John Baldwin wrote= : > On 12/6/23 1:02 PM, Warner Losh wrote: > > On Wed, Dec 6, 2023, 1:04 PM John Baldwin wrote: > > > >> On 2/25/23 9:37 AM, Warner Losh wrote: > >>> The branch main has been updated by imp: > >>> > >>> URL: > >> > https://cgit.FreeBSD.org/src/commit/?id=3D773c13c686e4b6ae9dbbc150b342b82= c3f47d73a > >>> > >>> commit 773c13c686e4b6ae9dbbc150b342b82c3f47d73a > >>> Author: Mina Gali=C4=87 > >>> AuthorDate: 2023-02-25 17:31:58 +0000 > >>> Commit: Warner Losh > >>> CommitDate: 2023-02-25 17:35:43 +0000 > >>> > >>> kldxref: skip .pkgsave files > >>> > >>> This should help people transitioning from traditional setups t= o > >> pkgbase > >>> experience a lot less friction. > >>> > >>> We do this by skipping all files containing two dots. > >>> > >>> Reviewed by: imp > >>> Pull Request: https://github.com/freebsd/freebsd-src/pull/661 > >>> Differential Revision: https://reviews.freebsd.org/D27959 > >> > >> This restriction is too broad and omits all of the modern wifi firmwar= e > >> klds from linker.hints, e.g. > >> > >> /boot/kernel/iwlwifi-3160-17.ucode.ko > >> /boot/kernel/iwlwifi-3168-29.ucode.ko > >> /boot/kernel/iwlwifi-7260-17.ucode.ko > >> /boot/kernel/iwlwifi-7265-17.ucode.ko > >> /boot/kernel/iwlwifi-7265D-29.ucode.ko > >> /boot/kernel/iwlwifi-8000C-36.ucode.ko > >> /boot/kernel/iwlwifi-8265-36.ucode.ko > >> /boot/kernel/iwlwifi-9000-pu-b0-jf-b0-46.ucode.ko > >> /boot/kernel/iwlwifi-9260-th-b0-jf-b0-46.ucode.ko > >> /boot/kernel/iwlwifi-Qu-b0-hr-b0-77.ucode.ko > >> /boot/kernel/iwlwifi-Qu-b0-jf-b0-77.ucode.ko > >> /boot/kernel/iwlwifi-Qu-c0-hr-b0-77.ucode.ko > >> /boot/kernel/iwlwifi-Qu-c0-jf-b0-77.ucode.ko > >> /boot/kernel/iwlwifi-QuZ-a0-hr-b0-77.ucode.ko > >> /boot/kernel/iwlwifi-QuZ-a0-jf-b0-77.ucode.ko > >> /boot/kernel/iwlwifi-cc-a0-77.ucode.ko > >> /boot/kernel/iwlwifi-so-a0-gf-a0-83.ucode.ko > >> /boot/kernel/iwlwifi-so-a0-gf-a0.pnvm.ko > >> /boot/kernel/iwlwifi-so-a0-gf4-a0-83.ucode.ko > >> /boot/kernel/iwlwifi-so-a0-gf4-a0.pnvm.ko > >> /boot/kernel/iwlwifi-so-a0-hr-b0-81.ucode.ko > >> /boot/kernel/iwlwifi-so-a0-jf-b0-77.ucode.ko > >> /boot/kernel/iwlwifi-ty-a0-gf-a0-83.ucode.ko > >> /boot/kernel/iwlwifi-ty-a0-gf-a0.pnvm.ko > >> /boot/kernel/rtw8723d_fw.bin.ko > >> /boot/kernel/rtw8821c_fw.bin.ko > >> /boot/kernel/rtw8822b_fw.bin.ko > >> /boot/kernel/rtw8822c_fw.bin.ko > >> /boot/kernel/rtw8822c_wow_fw.bin.ko > >> > >> all match this pattern and are skipped. > >> > >> I'm busy rewriting a bunch of kldxref to be a cross tool using libelf, > >> but I think here you want to probably revert this and just add pkgsave > >> to the list of "known bad" suffixes. > >> > > > > Sure. Any reason to not just require .ko? Or do we have to index the > kernel > > too? > > We do index the kernel as well, yes. However, we could probably get by > with "kernel" and ends in ".ko" as a valid set of files. This would also > avoid bogusly warning about linker.hints not being a valid ELF file on > re-runs if you use -v. > Yea, that sounds good. I'll code it up and add you to the review. But why does it matter for these? Firmware is usually loaded by filename and need not be elf... or are these wrapped in elf sections... I haven't noticed it breaking my linuxkpi wifi driver that have autoloaded firmware... Warner --0000000000002259b4060bde3711 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hey John,

On Wed, Dec 6, 2023 at 2:13= =E2=80=AFPM John Baldwin <jhb@freebsd= .org> wrote:
On 12/6/23 1:02 PM, Warner Losh wrote:
> On Wed, Dec 6, 2023, 1:04 PM John Baldwin <jhb@freebsd.org> wrote:
>
>> On 2/25/23 9:37 AM, Warner Losh wrote:
>>> The branch main has been updated by imp:
>>>
>>> URL:
>> https://c= git.FreeBSD.org/src/commit/?id=3D773c13c686e4b6ae9dbbc150b342b82c3f47d73a
>>>
>>> commit 773c13c686e4b6ae9dbbc150b342b82c3f47d73a
>>> Author:=C2=A0 =C2=A0 =C2=A0Mina Gali=C4=87 <freebsd@igalic.co>
>>> AuthorDate: 2023-02-25 17:31:58 +0000
>>> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>=
>>> CommitDate: 2023-02-25 17:35:43 +0000
>>>
>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0kldxref: skip .pkgsave files
>>>
>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0This should help people transitionin= g from traditional setups to
>> pkgbase
>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0experience a lot less friction.
>>>
>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0We do this by skipping all files con= taining two dots.
>>>
>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0Reviewed by: imp
>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0Pull Request: = https://github.com/freebsd/freebsd-src/pull/661
>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0Differential Revision: http= s://reviews.freebsd.org/D27959
>>
>> This restriction is too broad and omits all of the modern wifi fir= mware
>> klds from linker.hints, e.g.
>>
>> /boot/kernel/iwlwifi-3160-17.ucode.ko
>> /boot/kernel/iwlwifi-3168-29.ucode.ko
>> /boot/kernel/iwlwifi-7260-17.ucode.ko
>> /boot/kernel/iwlwifi-7265-17.ucode.ko
>> /boot/kernel/iwlwifi-7265D-29.ucode.ko
>> /boot/kernel/iwlwifi-8000C-36.ucode.ko
>> /boot/kernel/iwlwifi-8265-36.ucode.ko
>> /boot/kernel/iwlwifi-9000-pu-b0-jf-b0-46.ucode.ko
>> /boot/kernel/iwlwifi-9260-th-b0-jf-b0-46.ucode.ko
>> /boot/kernel/iwlwifi-Qu-b0-hr-b0-77.ucode.ko
>> /boot/kernel/iwlwifi-Qu-b0-jf-b0-77.ucode.ko
>> /boot/kernel/iwlwifi-Qu-c0-hr-b0-77.ucode.ko
>> /boot/kernel/iwlwifi-Qu-c0-jf-b0-77.ucode.ko
>> /boot/kernel/iwlwifi-QuZ-a0-hr-b0-77.ucode.ko
>> /boot/kernel/iwlwifi-QuZ-a0-jf-b0-77.ucode.ko
>> /boot/kernel/iwlwifi-cc-a0-77.ucode.ko
>> /boot/kernel/iwlwifi-so-a0-gf-a0-83.ucode.ko
>> /boot/kernel/iwlwifi-so-a0-gf-a0.pnvm.ko
>> /boot/kernel/iwlwifi-so-a0-gf4-a0-83.ucode.ko
>> /boot/kernel/iwlwifi-so-a0-gf4-a0.pnvm.ko
>> /boot/kernel/iwlwifi-so-a0-hr-b0-81.ucode.ko
>> /boot/kernel/iwlwifi-so-a0-jf-b0-77.ucode.ko
>> /boot/kernel/iwlwifi-ty-a0-gf-a0-83.ucode.ko
>> /boot/kernel/iwlwifi-ty-a0-gf-a0.pnvm.ko
>> /boot/kernel/rtw8723d_fw.bin.ko
>> /boot/kernel/rtw8821c_fw.bin.ko
>> /boot/kernel/rtw8822b_fw.bin.ko
>> /boot/kernel/rtw8822c_fw.bin.ko
>> /boot/kernel/rtw8822c_wow_fw.bin.ko
>>
>> all match this pattern and are skipped.
>>
>> I'm busy rewriting a bunch of kldxref to be a cross tool using= libelf,
>> but I think here you want to probably revert this and just add pkg= save
>> to the list of "known bad" suffixes.
>>
>
> Sure. Any reason to not just require .ko? Or do we have to index the k= ernel
> too?

We do index the kernel as well, yes.=C2=A0 However, we could probably get b= y
with "kernel" and ends in ".ko" as a valid set of files= .=C2=A0 This would also
avoid bogusly warning about linker.hints not being a valid ELF file on
re-runs if you use -v.

Yea, that sounds= good. I'll code it up and add you to the review.

<= div>But why does it matter for these? Firmware is usually loaded by filenam= e and need not be elf... or are these wrapped in elf sections...
=
I haven't noticed it breaking my linuxkpi wifi driver th= at have autoloaded firmware...

Warner=C2=A0
<= /div>
--0000000000002259b4060bde3711-- From nobody Wed Dec 6 21:53:03 2023 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 4Slrk92qkWz533xV; Wed, 6 Dec 2023 21:53:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slrk92Gx0z3XWP; Wed, 6 Dec 2023 21:53:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701899585; 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=24+YK1NzRwtovKmVnnVatT7bftsBJU4lmlJlWTVHo7U=; b=EGG21HcuwFesyA8FbJ01gpGBRCaD5h8VbuiwG4qYyOPvTENvOwar7321q6rahhuRc4wKpw 8i0fXIOgyX0d7KI5NemB7zwCiMoGYQdZlotvztcPfbFyHlNR6ivZTNU/tR62wVxm7ff7T8 B+5EKA/1LgOX4T6TU1bjlsnqFc+OfZtvK+9B2NPXXx2wucINIXL8x+Da3yLkXHmvXzYY3v su3LFdWWCKwcq4hUlZLk9p3m9KeJ3oH4nuCJSic0fZofJmJ7CR74w4sl343o0WT0nWONDO XkpxbnjX0eIuyEae0nnoXy0pzcne7iBJrO82/cIpck8zr2u7UXxQCfVAzRPlww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701899585; a=rsa-sha256; cv=none; b=h6zeNwd8K9nlRmLsiM/g4vUZ62oiDYQj+iGK0KgYo2gIDzf4zuyzXJaM+s9Zt8fRPfQN2b gv6pBKr6UhIdRe6Y2C1wD8uy8oExnC6ivKeZ/4fPuYtCGe5DBevCgXwjITXassVd6Gargi +JQ+TPVXNVvEI3L7tHiqIi8zv26AXIVRZsEIS9QcvJhwoWqk/meSh5dOPd12SpeZvpOTAp gHzj6mmoQzplqjpppn/vTjyTctuSTrO4mrPXM4UgEXbV17dmc/IN6CsLuLf7zqGAN/SrBv EoEnLb/nyKnsiu0LzR0r/O+hIGvB5Ny9uaIpDblPNCODi0MIk28N1fIpJd5pCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701899585; 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=24+YK1NzRwtovKmVnnVatT7bftsBJU4lmlJlWTVHo7U=; b=w3xYRHaD8OEbDIMTc0JAQe34DdDxjiivyh7Mq+LLK1ytuO4X0H1QUmckTtFsWV8WIxcJtP VfYZF6G2sx/TK+iHjPsNH8zurfFUTmt1KijNdtSUpr79uJIHw+xGkazBa/MZIYaZPF5qqh YdbJQJLt6YXDVET7XvGvc88aqN84u1r5ucboehKWBgW+PYzvwCPw5diKiT1ztbUu2FYuUp 0Ga0NtOmvxPUae/Z46RDtJ4vcR0jBPDG9x6QCA3oQXV655p3yjn8SMVq3yFQP4wlanvM1X zM5bKqhk4bQm8T+tDttZTVCPm4hw+qMQTcnhejCEDqmg1JJR1TxAkWknSwZ7OA== Received: from [IPV6:2601:648:8384:fd00:8d37:e6e8:747c:72de] (unknown [IPv6:2601:648:8384:fd00:8d37:e6e8:747c:72de]) (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 4Slrk84qMBz1JGW; Wed, 6 Dec 2023 21:53:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Wed, 6 Dec 2023 13:53:03 -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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 773c13c686e4 - main - kldxref: skip .pkgsave files Content-Language: en-US To: Warner Losh Cc: Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202302251737.31PHb2R8072300@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 12/6/23 1:41 PM, Warner Losh wrote: > Hey John, > > On Wed, Dec 6, 2023 at 2:13 PM John Baldwin wrote: > >> On 12/6/23 1:02 PM, Warner Losh wrote: >>> On Wed, Dec 6, 2023, 1:04 PM John Baldwin wrote: >>> >>>> On 2/25/23 9:37 AM, Warner Losh wrote: >>>>> The branch main has been updated by imp: >>>>> >>>>> URL: >>>> >> https://cgit.FreeBSD.org/src/commit/?id=773c13c686e4b6ae9dbbc150b342b82c3f47d73a >>>>> >>>>> commit 773c13c686e4b6ae9dbbc150b342b82c3f47d73a >>>>> Author: Mina Galić >>>>> AuthorDate: 2023-02-25 17:31:58 +0000 >>>>> Commit: Warner Losh >>>>> CommitDate: 2023-02-25 17:35:43 +0000 >>>>> >>>>> kldxref: skip .pkgsave files >>>>> >>>>> This should help people transitioning from traditional setups to >>>> pkgbase >>>>> experience a lot less friction. >>>>> >>>>> We do this by skipping all files containing two dots. >>>>> >>>>> Reviewed by: imp >>>>> Pull Request: https://github.com/freebsd/freebsd-src/pull/661 >>>>> Differential Revision: https://reviews.freebsd.org/D27959 >>>> >>>> This restriction is too broad and omits all of the modern wifi firmware >>>> klds from linker.hints, e.g. >>>> >>>> /boot/kernel/iwlwifi-3160-17.ucode.ko >>>> /boot/kernel/iwlwifi-3168-29.ucode.ko >>>> /boot/kernel/iwlwifi-7260-17.ucode.ko >>>> /boot/kernel/iwlwifi-7265-17.ucode.ko >>>> /boot/kernel/iwlwifi-7265D-29.ucode.ko >>>> /boot/kernel/iwlwifi-8000C-36.ucode.ko >>>> /boot/kernel/iwlwifi-8265-36.ucode.ko >>>> /boot/kernel/iwlwifi-9000-pu-b0-jf-b0-46.ucode.ko >>>> /boot/kernel/iwlwifi-9260-th-b0-jf-b0-46.ucode.ko >>>> /boot/kernel/iwlwifi-Qu-b0-hr-b0-77.ucode.ko >>>> /boot/kernel/iwlwifi-Qu-b0-jf-b0-77.ucode.ko >>>> /boot/kernel/iwlwifi-Qu-c0-hr-b0-77.ucode.ko >>>> /boot/kernel/iwlwifi-Qu-c0-jf-b0-77.ucode.ko >>>> /boot/kernel/iwlwifi-QuZ-a0-hr-b0-77.ucode.ko >>>> /boot/kernel/iwlwifi-QuZ-a0-jf-b0-77.ucode.ko >>>> /boot/kernel/iwlwifi-cc-a0-77.ucode.ko >>>> /boot/kernel/iwlwifi-so-a0-gf-a0-83.ucode.ko >>>> /boot/kernel/iwlwifi-so-a0-gf-a0.pnvm.ko >>>> /boot/kernel/iwlwifi-so-a0-gf4-a0-83.ucode.ko >>>> /boot/kernel/iwlwifi-so-a0-gf4-a0.pnvm.ko >>>> /boot/kernel/iwlwifi-so-a0-hr-b0-81.ucode.ko >>>> /boot/kernel/iwlwifi-so-a0-jf-b0-77.ucode.ko >>>> /boot/kernel/iwlwifi-ty-a0-gf-a0-83.ucode.ko >>>> /boot/kernel/iwlwifi-ty-a0-gf-a0.pnvm.ko >>>> /boot/kernel/rtw8723d_fw.bin.ko >>>> /boot/kernel/rtw8821c_fw.bin.ko >>>> /boot/kernel/rtw8822b_fw.bin.ko >>>> /boot/kernel/rtw8822c_fw.bin.ko >>>> /boot/kernel/rtw8822c_wow_fw.bin.ko >>>> >>>> all match this pattern and are skipped. >>>> >>>> I'm busy rewriting a bunch of kldxref to be a cross tool using libelf, >>>> but I think here you want to probably revert this and just add pkgsave >>>> to the list of "known bad" suffixes. >>>> >>> >>> Sure. Any reason to not just require .ko? Or do we have to index the >> kernel >>> too? >> >> We do index the kernel as well, yes. However, we could probably get by >> with "kernel" and ends in ".ko" as a valid set of files. This would also >> avoid bogusly warning about linker.hints not being a valid ELF file on >> re-runs if you use -v. >> > > Yea, that sounds good. I'll code it up and add you to the review. > > But why does it matter for these? Firmware is usually loaded by filename > and need not be elf... or are these wrapped in elf sections... > > I haven't noticed it breaking my linuxkpi wifi driver that have autoloaded > firmware... Hmm, afaik firmwares are loaded by "module name" where a firmware .ko contains one or more of the firmware modules. We happen today to generally only store one module in a single .ko (and with the same name), and in that case kern_linker.c may fallback to just trying to load "foo".ko if it doesn't find an entry in linker.hints, but if that is why it is working that is certainly by happy accident. I only found this by comparing klxref output btw on a stale i386 VM between the native kldxref in the VM (before this change) and my cross-arch version of kldxref. -- John Baldwin From nobody Wed Dec 6 23:21:40 2023 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 4SlthP1hRBz539Bn; Wed, 6 Dec 2023 23:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlthP1F6Nz4FLH; Wed, 6 Dec 2023 23:21:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701904901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WVxfsnHDoAock5yZqu/h5iAlA/o9krE6Xd+q25pzDnE=; b=HvhJj5puGxNn0AFQhbOt8cQ4tujJfL2PZAWMgOY9MbMfb+5Kno3VrQ1IOYIQ414Dic8z1O DFLLAfdEKvX2yUxKc7OEOOTulv0/RcuHAEwC6aGK0u6fDO8HUxtajRltcxTBfU29ceemfR n8fRSTFMFKxdxAT1x62iDT78fconBDgX0i90FekCcJjUBHvr6GEtDnon5sySMd27aUG5hf jr9oi3h7fyScVdg8ERNZroJKtu7murdvBHmfHWxPSp2aaAwQvumV3elxMMwMK4eYNTxPJE zPFo2wz3Sprr6V6JsL8zDbb/5UsmG51n2HKDQGbLHux3oTlyicKMXc7mbnvqCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701904901; a=rsa-sha256; cv=none; b=RVgN+KJPeT6BUH/txCVuFp25wZtAmxKns74gehQmBbzLvbAYb2ojVg4/NLjYwGM2EJ9iXV 9qFNmJQ7S7hY/ByjlrYb1jWzHOvH19Gpyln2eOWR03xlTyPu+0DEb+T3YHkw5lVlcQ/nwV VNYcI+w96NXFK5M0r1RayxfL/eXBHqHKy+wxWsvYWL/P7K4oNNGUm2UOEN5CYd9w1dS3dl IhFhvobg9oyFDFVKoM4vuNSsIGwTa0b1OcU8lIZETbziHU2d4JLeSVVEYeOBjCZ/H7B+8X USBAiQEZ7jTQDuw1nUdtwez8JtnfO+/oqTCmXZpmHSvI92lLL3qmwya6ho3+Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701904901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WVxfsnHDoAock5yZqu/h5iAlA/o9krE6Xd+q25pzDnE=; b=EnpgwDv1NxrrBnA3phhau/U1wMSaczQptZCM/0YZ/u7/ICa6Ua6xjGhnb9eUqYcMFNoWQg VuNbfD2ICyMiRrEebc41o8FcIk5j0LiF6a0WdP09CAF7Fj1puDalj6REZw4GCHOMyuGGab qddaOtANY1e7eKH6Wc36kPGt6MGXKDhVdrIsXoSnYKAX0LQHlWBIoQ53jYIuWGp2wnOKjj vjsrW5CoPNTCtuKal1H0XpE6q6pXC04LGFGSxZIRUxggLuJFVdd/fXX73EK6Jg6+xJQmoN lr7+RgswuApEc84EXeb8QSD2doBKpu6d+QRSlbrfE3gMkXk910DtfiHkKomgkA== 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 4SlthP0Jvrz1CFw; Wed, 6 Dec 2023 23:21:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6NLeH4017919; Wed, 6 Dec 2023 23:21:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6NLesY017916; Wed, 6 Dec 2023 23:21:40 GMT (envelope-from git) Date: Wed, 6 Dec 2023 23:21:40 GMT Message-Id: <202312062321.3B6NLesY017916@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: 7cb028deff6f - main - busdma: Prevent the use of filters with bus_dma_tag_create() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 7cb028deff6f46fbefa99f4f19882c69fd7cb883 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7cb028deff6f46fbefa99f4f19882c69fd7cb883 commit 7cb028deff6f46fbefa99f4f19882c69fd7cb883 Author: Mitchell Horne AuthorDate: 2023-12-06 23:07:31 +0000 Commit: Mitchell Horne CommitDate: 2023-12-06 23:10:25 +0000 busdma: Prevent the use of filters with bus_dma_tag_create() A deprecation notice was added to the bus_dma(9) man page by scottl@ in September 2020 discouraging the use of filter functions. I've performed an attentive check of all callers in the tree and everything that exists today passes NULL for both filtfunc and filtarg. Thus, we should start returning EINVAL if these arguments are non-NULL to prevent new usages from popping up. Update the man page to be more clear about this. The deprecation notice is present since at least 13.0-RELEASE, so this is the appropriate step for the lifetime of 15, without actually breaking the driver API. Stable branches will emit a warning instead. This change enables the removal of a fair amount of unused complexity across the various busdma implementations. Reviewed by: jhb MFC after: never Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42852 --- share/man/man9/bus_dma.9 | 32 ++++++++++++-------------------- sys/arm/arm/busdma_machdep.c | 4 ++++ sys/arm64/arm64/busdma_machdep.c | 4 ++++ sys/powerpc/powerpc/busdma_machdep.c | 4 ++++ sys/riscv/riscv/busdma_machdep.c | 4 ++++ sys/x86/x86/busdma_machdep.c | 4 ++++ 6 files changed, 32 insertions(+), 20 deletions(-) diff --git a/share/man/man9/bus_dma.9 b/share/man/man9/bus_dma.9 index 832ddb4daa22..b644eeb2a476 100644 --- a/share/man/man9/bus_dma.9 +++ b/share/man/man9/bus_dma.9 @@ -373,7 +373,7 @@ inclusive. The filter function should return zero if any mapping in this range can be accommodated by the device and non-zero otherwise. .Pp -.Em Note: The use of filters is deprecated. Proper operation is not guaranteed. +.Em Note: The use of filters is no longer supported and will result in an error. .It Vt bus_dma_segment_t A machine-dependent type that describes individual DMA segments. @@ -611,26 +611,10 @@ This area of is used to bounce requests that would otherwise conflict with the exclusion window. .It Fa filtfunc -Optional filter function (may be -.Dv NULL ) -to be called for any attempt to -map memory into the window described by -.Fa lowaddr -and -.Fa highaddr . -A filter function is only required when the single window described -by -.Fa lowaddr -and -.Fa highaddr -cannot adequately describe the constraints of the device. -The filter function will be called for every machine page -that overlaps the exclusion window. -.Pp -.Em Note: The use of filters is deprecated. Proper operation is not guaranteed. +Formerly the optional filter function; must be +.Dv NULL . .It Fa filtfuncarg -Argument passed to all calls to the filter function for this tag. -May be +Must be .Dv NULL . .It Fa maxsize Maximum size, in bytes, of the sum of all segment lengths in a given @@ -689,6 +673,14 @@ Returns .Er ENOMEM if sufficient memory is not available for tag creation or allocating mapping resources. +Returns +.Er EINVAL +if either +.Fa filtfunc +or +.Fa filtarg +arguments are not +.Dv NULL . .It Fn bus_dma_tag_destroy "dmat" Deallocate the DMA tag .Fa dmat diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c index aa6aa76234cb..282a8ccea690 100644 --- a/sys/arm/arm/busdma_machdep.c +++ b/sys/arm/arm/busdma_machdep.c @@ -398,6 +398,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, /* Return a NULL tag on failure */ *dmat = NULL; + /* Filters are no longer supported. */ + if (filter != NULL || filterarg != NULL) + return (EINVAL); + newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_BUSDMA, M_ZERO | M_NOWAIT); if (newtag == NULL) { diff --git a/sys/arm64/arm64/busdma_machdep.c b/sys/arm64/arm64/busdma_machdep.c index 9f1137636ca7..0c1550267ae6 100644 --- a/sys/arm64/arm64/busdma_machdep.c +++ b/sys/arm64/arm64/busdma_machdep.c @@ -164,6 +164,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are no longer supported. */ + if (filter != NULL || filterarg != NULL) + return (EINVAL); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index 21828e422d50..c1717140181e 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -168,6 +168,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, return (EINVAL); } + /* Filters are no longer supported. */ + if (filter != NULL || filterarg != NULL) + return (EINVAL); + /* Return a NULL tag on failure */ *dmat = NULL; diff --git a/sys/riscv/riscv/busdma_machdep.c b/sys/riscv/riscv/busdma_machdep.c index 711717661908..712aad4cb5c4 100644 --- a/sys/riscv/riscv/busdma_machdep.c +++ b/sys/riscv/riscv/busdma_machdep.c @@ -161,6 +161,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are no longer supported. */ + if (filter != NULL || filterarg != NULL) + return (EINVAL); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, diff --git a/sys/x86/x86/busdma_machdep.c b/sys/x86/x86/busdma_machdep.c index 0e72b09684cc..40afcee0651e 100644 --- a/sys/x86/x86/busdma_machdep.c +++ b/sys/x86/x86/busdma_machdep.c @@ -184,6 +184,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are no longer supported. */ + if (filter != NULL || filterarg != NULL) + return (EINVAL); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, From nobody Wed Dec 6 23:21:42 2023 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 4SlthQ2wnGz539fY; Wed, 6 Dec 2023 23:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlthQ2ZVVz4F0x; Wed, 6 Dec 2023 23:21:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701904902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rapBmK7tu6gEtUnIw3/NVWWbYLk6BGMtRE0tNrU3OIU=; b=tYDxVxBdIdRFixy4hLlugMbcOATlv8qZpa0hG+x3TPZ/GPOWFePhGSpJZbfiZRW0OLOm/K RbyQy0/5FuVVJ+qviBL/QtBKaGAPndQsM/wge7p2JLQy2tghqMdAEaQFLWcj8mODXiHG7y mqbNsasiLsSLx7RmBEAB/knZYfSsIFROwLNKWX/5Ylf7FYLSJUigRbCp7rvne4OV9jDRzY 9oJyDXIwfc62HJhgKuuemasgQepIMXWKAGNkRG7rzVjzwfrt6ezjQKoWQ1vp7ykud+zYV2 jSh0+JBE6XdecFCgdxac6FEufrsRnOMzQTTPpPEuNXZSGdw5aLYF8imi6k6FuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701904902; a=rsa-sha256; cv=none; b=SrbZvGMGzxIVCWaccjVfp5gxUx2w2S1IOUu2AfR6Xp/sFq1YEEXXDly++ihJ5Gt0/Q7/+J amhMPogVrUjAwWVInc1UVSKDHVlk/0WmkV91xsIEFWiEqoVI1Ly0HEMduCqbQLIGdcNj5V 37TXWtFjrLBMglOI01UcPY/KxXDYi9+MSzfpyN23stZ0FSsGJitPoxL6yAq+hO5EWTG5H8 rrhhUJPiReBmCEeJa8P2pl0UKze/vXZhALhPB4aEIS9WWeq6h3IsM9EDKoWCKlbmCmzPoc rBVgXBNA8m9VtbTFu7VHHMdowbKrL8u/NRwYKmDB+yOq08SKCRGEH8+s15evfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701904902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rapBmK7tu6gEtUnIw3/NVWWbYLk6BGMtRE0tNrU3OIU=; b=eFAOWHnv+gm/0hBSGmmuS50N/bA0CgWDtVsZDx/7iq4PI3Oheu1R8pKWpzbunrkcZdVCIY 9ZuzTa4Prl5mRA2j8MItCqwb25PIhU3ghfzf6uOYOFnKCCcFCKDd+JaztN8IFlchW3ruuM jAHNPo2Jr7g6ba4s903NNWg6RHVt8iGXkifNVzqC7mXzoLh7Ct5cJnn026FNeZ+KjGBtj/ 4FLzQVmK+I+7zv1rMdxeTLjYn28rDcUWt8IW6Z0375B50dpsrnrdHBeAy2OGuwe2rxQ5sa GgsYkbAKBCQEovqaMigL2Gu8NZC5t7oR5TtPUNhkEnZK8MnC9+74zErCzh7qQQ== 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 4SlthQ1LLJz1CFx; Wed, 6 Dec 2023 23:21:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6NLgw8017961; Wed, 6 Dec 2023 23:21:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6NLgEb017958; Wed, 6 Dec 2023 23:21:42 GMT (envelope-from git) Date: Wed, 6 Dec 2023 23:21:42 GMT Message-Id: <202312062321.3B6NLgEb017958@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: 900907f4399f - main - busdma: kill filter functionality internally List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 900907f4399f40f1088ea5f353b54c868daf630e Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=900907f4399f40f1088ea5f353b54c868daf630e commit 900907f4399f40f1088ea5f353b54c868daf630e Author: Mitchell Horne AuthorDate: 2023-12-06 23:08:13 +0000 Commit: Mitchell Horne CommitDate: 2023-12-06 23:11:39 +0000 busdma: kill filter functionality internally Address filter functions are unused, unsupported, and now rejected. Simplify some busdma code by removing filter functionality completely. Note that the chains of parent tags become useless, and will be cleaned up in the next commit. No functional change intended. Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42894 --- sys/arm/arm/busdma_machdep.c | 26 ++++++++---------------- sys/arm64/arm64/busdma_bounce.c | 12 +++++------ sys/arm64/arm64/busdma_machdep.c | 37 ++++++++++++++-------------------- sys/arm64/include/bus_dma_impl.h | 12 ++++------- sys/dev/iommu/busdma_iommu.c | 11 +++++----- sys/powerpc/powerpc/busdma_machdep.c | 27 ++++++++----------------- sys/riscv/include/bus_dma_impl.h | 10 +++------ sys/riscv/riscv/busdma_bounce.c | 12 +++++------ sys/riscv/riscv/busdma_machdep.c | 37 ++++++++++++++-------------------- sys/sys/bus_dma.h | 7 ++----- sys/x86/include/busdma_impl.h | 10 +++------ sys/x86/x86/busdma_bounce.c | 15 +++++++------- sys/x86/x86/busdma_machdep.c | 39 +++++++++++++++--------------------- 13 files changed, 96 insertions(+), 159 deletions(-) diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c index 282a8ccea690..cf1fd0209734 100644 --- a/sys/arm/arm/busdma_machdep.c +++ b/sys/arm/arm/busdma_machdep.c @@ -82,8 +82,6 @@ struct bus_dma_tag { bus_addr_t boundary; bus_addr_t lowaddr; bus_addr_t highaddr; - bus_dma_filter_t *filter; - void *filterarg; bus_size_t maxsize; u_int nsegments; bus_size_t maxsegsz; @@ -337,8 +335,7 @@ might_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t addr, * exclusion zone of any tag in the ancestry chain. * * For exclusions, walk the chain of tags comparing paddr to the exclusion zone - * within each tag. If the tag has a filter function, use it to decide whether - * the DMA needs to bounce, otherwise any DMA within the zone bounces. + * within each tag. */ static int must_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr, @@ -363,9 +360,7 @@ must_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr, * within the low-highaddr range of the tag that filterfunc belongs to. */ while (dmat != NULL && exclusion_bounce(dmat)) { - if ((paddr >= dmat->lowaddr && paddr <= dmat->highaddr) && - (dmat->filter == NULL || - dmat->filter(dmat->filterarg, paddr) != 0)) + if (paddr >= dmat->lowaddr && paddr <= dmat->highaddr) return (1); dmat = dmat->parent; } @@ -416,8 +411,6 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, newtag->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1); newtag->highaddr = trunc_page((vm_paddr_t)highaddr) + (PAGE_SIZE - 1); - newtag->filter = filter; - newtag->filterarg = filterarg; newtag->maxsize = maxsize; newtag->nsegments = nsegments; newtag->maxsegsz = maxsegsz; @@ -444,15 +437,12 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, else if (parent->boundary != 0) newtag->boundary = MIN(parent->boundary, newtag->boundary); - if (newtag->filter == NULL) { - /* - * Short circuit to looking at our parent directly - * since we have encapsulated all of its information - */ - newtag->filter = parent->filter; - newtag->filterarg = parent->filterarg; - newtag->parent = parent->parent; - } + + /* + * Short circuit to looking at our parent directly since we + * have encapsulated all of its information. + */ + newtag->parent = parent->parent; if (newtag->parent != NULL) atomic_add_int(&parent->ref_count, 1); } diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c index 16de0286060b..7585d950fcbb 100644 --- a/sys/arm64/arm64/busdma_bounce.c +++ b/sys/arm64/arm64/busdma_bounce.c @@ -241,17 +241,16 @@ must_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr, static int bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, - bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize, - int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, - void *lockfuncarg, bus_dma_tag_t *dmat) + bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags, + bus_dma_lock_t *lockfunc, void *lockfuncarg, bus_dma_tag_t *dmat) { bus_dma_tag_t newtag; int error; *dmat = NULL; error = common_bus_dma_tag_create(parent != NULL ? &parent->common : - NULL, alignment, boundary, lowaddr, highaddr, filter, filterarg, - maxsize, nsegments, maxsegsz, flags, lockfunc, lockfuncarg, + NULL, alignment, boundary, lowaddr, highaddr, maxsize, nsegments, + maxsegsz, flags, lockfunc, lockfuncarg, sizeof (struct bus_dma_tag), (void **)&newtag); if (error != 0) return (error); @@ -265,8 +264,7 @@ bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, } if (parent != NULL) { - if ((newtag->common.filter != NULL || - (parent->bounce_flags & BF_COULD_BOUNCE) != 0)) + if ((parent->bounce_flags & BF_COULD_BOUNCE) != 0) newtag->bounce_flags |= BF_COULD_BOUNCE; /* Copy some flags from the parent */ diff --git a/sys/arm64/arm64/busdma_machdep.c b/sys/arm64/arm64/busdma_machdep.c index 0c1550267ae6..aa5359b4552a 100644 --- a/sys/arm64/arm64/busdma_machdep.c +++ b/sys/arm64/arm64/busdma_machdep.c @@ -62,12 +62,10 @@ bus_dma_run_filter(struct bus_dma_tag_common *tc, bus_addr_t paddr) { while (tc != NULL) { - if ((paddr > tc->lowaddr && paddr <= tc->highaddr) && - (tc->filter == NULL || - (*tc->filter)(tc->filterarg, paddr) != 0)) + if (paddr > tc->lowaddr && paddr <= tc->highaddr) return (1); - tc = tc->parent; + tc = tc->parent; } return (0); @@ -76,9 +74,9 @@ bus_dma_run_filter(struct bus_dma_tag_common *tc, bus_addr_t paddr) int common_bus_dma_tag_create(struct bus_dma_tag_common *parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, - bus_addr_t highaddr, bus_dma_filter_t *filter, void *filterarg, - bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags, - bus_dma_lock_t *lockfunc, void *lockfuncarg, size_t sz, void **dmat) + bus_addr_t highaddr, bus_size_t maxsize, int nsegments, + bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, + void *lockfuncarg, size_t sz, void **dmat) { void *newtag; struct bus_dma_tag_common *common; @@ -106,8 +104,6 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common->boundary = boundary; common->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1); common->highaddr = trunc_page((vm_paddr_t)highaddr) + (PAGE_SIZE - 1); - common->filter = filter; - common->filterarg = filterarg; common->maxsize = maxsize; common->nsegments = nsegments; common->maxsegsz = maxsegsz; @@ -133,15 +129,12 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common->boundary = MIN(parent->boundary, common->boundary); } - if (common->filter == NULL) { - /* - * Short circuit looking at our parent directly - * since we have encapsulated all of its information - */ - common->filter = parent->filter; - common->filterarg = parent->filterarg; - common->parent = parent->parent; - } + + /* + * Short circuit looking at our parent directly since we have + * encapsulated all of its information. + */ + common->parent = parent->parent; common->domain = parent->domain; atomic_add_int(&parent->ref_count, 1); } @@ -170,13 +163,13 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, - boundary, lowaddr, highaddr, filter, filterarg, maxsize, - nsegments, maxsegsz, flags, lockfunc, lockfuncarg, dmat); + boundary, lowaddr, highaddr, maxsize, nsegments, maxsegsz, + flags, lockfunc, lockfuncarg, dmat); } else { tc = (struct bus_dma_tag_common *)parent; error = tc->impl->tag_create(parent, alignment, - boundary, lowaddr, highaddr, filter, filterarg, maxsize, - nsegments, maxsegsz, flags, lockfunc, lockfuncarg, dmat); + boundary, lowaddr, highaddr, maxsize, nsegments, maxsegsz, + flags, lockfunc, lockfuncarg, dmat); } return (error); } diff --git a/sys/arm64/include/bus_dma_impl.h b/sys/arm64/include/bus_dma_impl.h index 11e74ede87bf..1abce30b5b4c 100644 --- a/sys/arm64/include/bus_dma_impl.h +++ b/sys/arm64/include/bus_dma_impl.h @@ -36,8 +36,6 @@ struct bus_dma_tag_common { bus_addr_t boundary; bus_addr_t lowaddr; bus_addr_t highaddr; - bus_dma_filter_t *filter; - void *filterarg; bus_size_t maxsize; u_int nsegments; bus_size_t maxsegsz; @@ -51,8 +49,7 @@ struct bus_dma_tag_common { struct bus_dma_impl { int (*tag_create)(bus_dma_tag_t parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, - bus_addr_t highaddr, bus_dma_filter_t *filter, - void *filterarg, bus_size_t maxsize, int nsegments, + bus_addr_t highaddr, bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, void *lockfuncarg, bus_dma_tag_t *dmat); int (*tag_destroy)(bus_dma_tag_t dmat); @@ -84,10 +81,9 @@ struct bus_dma_impl { int bus_dma_run_filter(struct bus_dma_tag_common *dmat, bus_addr_t paddr); int common_bus_dma_tag_create(struct bus_dma_tag_common *parent, - bus_size_t alignment, - bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, - bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize, - int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, + bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, + bus_addr_t highaddr, bus_size_t maxsize, int nsegments, + bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, void *lockfuncarg, size_t sz, void **dmat); extern struct bus_dma_impl bus_dma_bounce_impl; diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c index b872016a78bf..f041838eac39 100644 --- a/sys/dev/iommu/busdma_iommu.c +++ b/sys/dev/iommu/busdma_iommu.c @@ -356,9 +356,8 @@ static void iommu_bus_schedule_dmamap(struct iommu_unit *unit, static int iommu_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, - bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize, - int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, - void *lockfuncarg, bus_dma_tag_t *dmat) + bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags, + bus_dma_lock_t *lockfunc, void *lockfuncarg, bus_dma_tag_t *dmat) { struct bus_dma_tag_iommu *newtag, *oldtag; int error; @@ -366,9 +365,9 @@ iommu_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, *dmat = NULL; error = common_bus_dma_tag_create(parent != NULL ? &((struct bus_dma_tag_iommu *)parent)->common : NULL, alignment, - boundary, lowaddr, highaddr, filter, filterarg, maxsize, - nsegments, maxsegsz, flags, lockfunc, lockfuncarg, - sizeof(struct bus_dma_tag_iommu), (void **)&newtag); + boundary, lowaddr, highaddr, maxsize, nsegments, maxsegsz, flags, + lockfunc, lockfuncarg, sizeof(struct bus_dma_tag_iommu), + (void **)&newtag); if (error != 0) goto out; diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index c1717140181e..3065526427e2 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -68,8 +68,6 @@ struct bus_dma_tag { bus_addr_t boundary; bus_addr_t lowaddr; bus_addr_t highaddr; - bus_dma_filter_t *filter; - void *filterarg; bus_size_t maxsize; bus_size_t maxsegsz; u_int nsegments; @@ -129,14 +127,10 @@ run_filter(bus_dma_tag_t dmat, bus_addr_t paddr) retval = 0; do { - if (dmat->filter == NULL && dmat->iommu == NULL && + if (dmat->iommu == NULL && paddr > dmat->lowaddr && paddr <= dmat->highaddr) retval = 1; - if (dmat->filter == NULL && - !vm_addr_align_ok(paddr, dmat->alignment)) - retval = 1; - if (dmat->filter != NULL && - (*dmat->filter)(dmat->filterarg, paddr) != 0) + if (!vm_addr_align_ok(paddr, dmat->alignment)) retval = 1; dmat = dmat->parent; @@ -188,8 +182,6 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, newtag->boundary = boundary; newtag->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1); newtag->highaddr = trunc_page((vm_paddr_t)highaddr) + (PAGE_SIZE - 1); - newtag->filter = filter; - newtag->filterarg = filterarg; newtag->maxsize = maxsize; newtag->nsegments = nsegments; newtag->maxsegsz = maxsegsz; @@ -213,15 +205,12 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, else if (parent->boundary != 0) newtag->boundary = MIN(parent->boundary, newtag->boundary); - if (newtag->filter == NULL) { - /* - * Short circuit looking at our parent directly - * since we have encapsulated all of its information - */ - newtag->filter = parent->filter; - newtag->filterarg = parent->filterarg; - newtag->parent = parent->parent; - } + + /* + * Short circuit looking at our parent directly since we have + * encapsulated all of its information. + */ + newtag->parent = parent->parent; if (newtag->parent != NULL) atomic_add_int(&parent->ref_count, 1); newtag->iommu = parent->iommu; diff --git a/sys/riscv/include/bus_dma_impl.h b/sys/riscv/include/bus_dma_impl.h index 6df8ef6a6a20..d6e1d4ed632e 100644 --- a/sys/riscv/include/bus_dma_impl.h +++ b/sys/riscv/include/bus_dma_impl.h @@ -36,8 +36,6 @@ struct bus_dma_tag_common { bus_addr_t boundary; bus_addr_t lowaddr; bus_addr_t highaddr; - bus_dma_filter_t *filter; - void *filterarg; bus_size_t maxsize; u_int nsegments; bus_size_t maxsegsz; @@ -50,8 +48,7 @@ struct bus_dma_tag_common { struct bus_dma_impl { int (*tag_create)(bus_dma_tag_t parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, - bus_addr_t highaddr, bus_dma_filter_t *filter, - void *filterarg, bus_size_t maxsize, int nsegments, + bus_addr_t highaddr, bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, void *lockfuncarg, bus_dma_tag_t *dmat); int (*tag_destroy)(bus_dma_tag_t dmat); @@ -83,9 +80,8 @@ int bus_dma_run_filter(struct bus_dma_tag_common *dmat, bus_addr_t paddr); int common_bus_dma_tag_create(struct bus_dma_tag_common *parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, - bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize, - int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, - void *lockfuncarg, size_t sz, void **dmat); + bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags, + bus_dma_lock_t *lockfunc, void *lockfuncarg, size_t sz, void **dmat); extern struct bus_dma_impl bus_dma_bounce_impl; diff --git a/sys/riscv/riscv/busdma_bounce.c b/sys/riscv/riscv/busdma_bounce.c index 83ea92219e10..6ac9a9cd678a 100644 --- a/sys/riscv/riscv/busdma_bounce.c +++ b/sys/riscv/riscv/busdma_bounce.c @@ -125,17 +125,16 @@ static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata"); static int bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, - bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize, - int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, - void *lockfuncarg, bus_dma_tag_t *dmat) + bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags, + bus_dma_lock_t *lockfunc, void *lockfuncarg, bus_dma_tag_t *dmat) { bus_dma_tag_t newtag; int error; *dmat = NULL; error = common_bus_dma_tag_create(parent != NULL ? &parent->common : - NULL, alignment, boundary, lowaddr, highaddr, filter, filterarg, - maxsize, nsegments, maxsegsz, flags, lockfunc, lockfuncarg, + NULL, alignment, boundary, lowaddr, highaddr, maxsize, nsegments, + maxsegsz, flags, lockfunc, lockfuncarg, sizeof (struct bus_dma_tag), (void **)&newtag); if (error != 0) return (error); @@ -148,8 +147,7 @@ bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, newtag->bounce_flags |= BF_COHERENT; if (parent != NULL) { - if ((newtag->common.filter != NULL || - (parent->bounce_flags & BF_COULD_BOUNCE) != 0)) + if ((parent->bounce_flags & BF_COULD_BOUNCE) != 0) newtag->bounce_flags |= BF_COULD_BOUNCE; /* Copy some flags from the parent */ diff --git a/sys/riscv/riscv/busdma_machdep.c b/sys/riscv/riscv/busdma_machdep.c index 712aad4cb5c4..e992803f3ff2 100644 --- a/sys/riscv/riscv/busdma_machdep.c +++ b/sys/riscv/riscv/busdma_machdep.c @@ -63,10 +63,8 @@ bus_dma_run_filter(struct bus_dma_tag_common *tc, bus_addr_t paddr) retval = 0; do { - if (((paddr > tc->lowaddr && paddr <= tc->highaddr) || - !vm_addr_align_ok(paddr, tc->alignment)) && - (tc->filter == NULL || - (*tc->filter)(tc->filterarg, paddr) != 0)) + if ((paddr > tc->lowaddr && paddr <= tc->highaddr) || + !vm_addr_align_ok(paddr, tc->alignment)) retval = 1; tc = tc->parent; @@ -77,9 +75,9 @@ bus_dma_run_filter(struct bus_dma_tag_common *tc, bus_addr_t paddr) int common_bus_dma_tag_create(struct bus_dma_tag_common *parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, - bus_addr_t highaddr, bus_dma_filter_t *filter, void *filterarg, - bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags, - bus_dma_lock_t *lockfunc, void *lockfuncarg, size_t sz, void **dmat) + bus_addr_t highaddr, bus_size_t maxsize, int nsegments, + bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, + void *lockfuncarg, size_t sz, void **dmat) { void *newtag; struct bus_dma_tag_common *common; @@ -107,8 +105,6 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common->boundary = boundary; common->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1); common->highaddr = trunc_page((vm_paddr_t)highaddr) + (PAGE_SIZE - 1); - common->filter = filter; - common->filterarg = filterarg; common->maxsize = maxsize; common->nsegments = nsegments; common->maxsegsz = maxsegsz; @@ -133,15 +129,12 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common->boundary = MIN(parent->boundary, common->boundary); } - if (common->filter == NULL) { - /* - * Short circuit looking at our parent directly - * since we have encapsulated all of its information - */ - common->filter = parent->filter; - common->filterarg = parent->filterarg; - common->parent = parent->parent; - } + + /* + * Short circuit looking at our parent directly since we have + * encapsulated all of its information. + */ + common->parent = parent->parent; atomic_add_int(&parent->ref_count, 1); } *dmat = common; @@ -167,13 +160,13 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, - boundary, lowaddr, highaddr, filter, filterarg, maxsize, - nsegments, maxsegsz, flags, lockfunc, lockfuncarg, dmat); + boundary, lowaddr, highaddr, maxsize, nsegments, maxsegsz, + flags, lockfunc, lockfuncarg, dmat); } else { tc = (struct bus_dma_tag_common *)parent; error = tc->impl->tag_create(parent, alignment, - boundary, lowaddr, highaddr, filter, filterarg, maxsize, - nsegments, maxsegsz, flags, lockfunc, lockfuncarg, dmat); + boundary, lowaddr, highaddr, maxsize, nsegments, maxsegsz, + flags, lockfunc, lockfuncarg, dmat); } return (error); } diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h index 530816f0532c..c7c1419b2998 100644 --- a/sys/sys/bus_dma.h +++ b/sys/sys/bus_dma.h @@ -161,11 +161,8 @@ void _busdma_dflt_lock(void *arg, bus_dma_lock_op_t op); * boundary: Boundary that segments cannot cross. * lowaddr: Low restricted address that cannot appear in a mapping. * highaddr: High restricted address that cannot appear in a mapping. - * filtfunc: An optional function to further test if an address - * within the range of lowaddr and highaddr cannot appear - * in a mapping. - * filtfuncarg: An argument that will be passed to filtfunc in addition - * to the address to test. + * filtfunc: (deprecated, must be NULL) + * filtfuncarg: (deprecated, must be NULL) * maxsize: Maximum mapping size supported by this tag. * nsegments: Number of discontinuities allowed in maps. * maxsegsz: Maximum size of a segment in the map. diff --git a/sys/x86/include/busdma_impl.h b/sys/x86/include/busdma_impl.h index 4cc4b288c88a..4718c67dacc1 100644 --- a/sys/x86/include/busdma_impl.h +++ b/sys/x86/include/busdma_impl.h @@ -38,8 +38,6 @@ struct bus_dma_tag_common { bus_addr_t boundary; bus_addr_t lowaddr; bus_addr_t highaddr; - bus_dma_filter_t *filter; - void *filterarg; bus_size_t maxsize; u_int nsegments; bus_size_t maxsegsz; @@ -53,8 +51,7 @@ struct bus_dma_tag_common { struct bus_dma_impl { int (*tag_create)(bus_dma_tag_t parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, - bus_addr_t highaddr, bus_dma_filter_t *filter, - void *filterarg, bus_size_t maxsize, int nsegments, + bus_addr_t highaddr, bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, void *lockfuncarg, bus_dma_tag_t *dmat); int (*tag_destroy)(bus_dma_tag_t dmat); @@ -91,9 +88,8 @@ int bus_dma_run_filter(struct bus_dma_tag_common *dmat, vm_paddr_t paddr); int common_bus_dma_tag_create(struct bus_dma_tag_common *parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, - bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize, - int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, - void *lockfuncarg, size_t sz, void **dmat); + bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags, + bus_dma_lock_t *lockfunc, void *lockfuncarg, size_t sz, void **dmat); extern struct bus_dma_impl bus_dma_bounce_impl; diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c index ac8d2d639732..01e799a1133d 100644 --- a/sys/x86/x86/busdma_bounce.c +++ b/sys/x86/x86/busdma_bounce.c @@ -148,18 +148,17 @@ bounce_bus_dma_zone_setup(bus_dma_tag_t dmat) static int bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, - bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize, - int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, - void *lockfuncarg, bus_dma_tag_t *dmat) + bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags, + bus_dma_lock_t *lockfunc, void *lockfuncarg, bus_dma_tag_t *dmat) { bus_dma_tag_t newtag; int error; *dmat = NULL; error = common_bus_dma_tag_create(parent != NULL ? &parent->common : - NULL, alignment, boundary, lowaddr, highaddr, filter, filterarg, - maxsize, nsegments, maxsegsz, flags, lockfunc, lockfuncarg, - sizeof (struct bus_dma_tag), (void **)&newtag); + NULL, alignment, boundary, lowaddr, highaddr, maxsize, nsegments, + maxsegsz, flags, lockfunc, lockfuncarg, sizeof(struct bus_dma_tag), + (void **)&newtag); if (error != 0) return (error); @@ -175,8 +174,8 @@ bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, newtag->bounce_flags |= BUS_DMA_FORCE_MAP; #endif - if (parent != NULL && (newtag->common.filter != NULL || - (parent->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0)) + if (parent != NULL && + (parent->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0) newtag->bounce_flags |= BUS_DMA_COULD_BOUNCE; if (newtag->common.lowaddr < ptoa((vm_paddr_t)Maxmem) || diff --git a/sys/x86/x86/busdma_machdep.c b/sys/x86/x86/busdma_machdep.c index 40afcee0651e..bb1b6a393fb0 100644 --- a/sys/x86/x86/busdma_machdep.c +++ b/sys/x86/x86/busdma_machdep.c @@ -68,14 +68,12 @@ bus_dma_run_filter(struct bus_dma_tag_common *tc, vm_paddr_t paddr) retval = 0; do { - if ((paddr >= BUS_SPACE_MAXADDR || + if (paddr >= BUS_SPACE_MAXADDR || (paddr > tc->lowaddr && paddr <= tc->highaddr) || - !vm_addr_align_ok(paddr, tc->alignment)) && - (tc->filter == NULL || - (*tc->filter)(tc->filterarg, paddr) != 0)) + !vm_addr_align_ok(paddr, tc->alignment)) retval = 1; - tc = tc->parent; + tc = tc->parent; } while (retval == 0 && tc != NULL); return (retval); } @@ -83,9 +81,9 @@ bus_dma_run_filter(struct bus_dma_tag_common *tc, vm_paddr_t paddr) int common_bus_dma_tag_create(struct bus_dma_tag_common *parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, - bus_addr_t highaddr, bus_dma_filter_t *filter, void *filterarg, - bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags, - bus_dma_lock_t *lockfunc, void *lockfuncarg, size_t sz, void **dmat) + bus_addr_t highaddr, bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, + int flags, bus_dma_lock_t *lockfunc, void *lockfuncarg, size_t sz, + void **dmat) { void *newtag; struct bus_dma_tag_common *common; @@ -113,8 +111,6 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common->boundary = boundary; common->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1); common->highaddr = trunc_page((vm_paddr_t)highaddr) + (PAGE_SIZE - 1); - common->filter = filter; - common->filterarg = filterarg; common->maxsize = maxsize; common->nsegments = nsegments; common->maxsegsz = maxsegsz; @@ -139,15 +135,12 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common->boundary = MIN(parent->boundary, common->boundary); } - if (common->filter == NULL) { - /* - * Short circuit looking at our parent directly - * since we have encapsulated all of its information - */ - common->filter = parent->filter; - common->filterarg = parent->filterarg; - common->parent = parent->parent; - } + + /* + * Short circuit looking at our parent directly since we have + * encapsulated all of its information. + */ + common->parent = parent->parent; common->domain = parent->domain; atomic_add_int(&parent->ref_count, 1); } @@ -190,13 +183,13 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, - boundary, lowaddr, highaddr, filter, filterarg, maxsize, - nsegments, maxsegsz, flags, lockfunc, lockfuncarg, dmat); + boundary, lowaddr, highaddr, maxsize, nsegments, maxsegsz, + flags, lockfunc, lockfuncarg, dmat); } else { tc = (struct bus_dma_tag_common *)parent; error = tc->impl->tag_create(parent, alignment, - boundary, lowaddr, highaddr, filter, filterarg, maxsize, - nsegments, maxsegsz, flags, lockfunc, lockfuncarg, dmat); + boundary, lowaddr, highaddr, maxsize, nsegments, maxsegsz, + flags, lockfunc, lockfuncarg, dmat); } return (error); } From nobody Wed Dec 6 23:21:43 2023 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 4SlthR3cBVz538v1; Wed, 6 Dec 2023 23:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlthR35r1z4FBn; Wed, 6 Dec 2023 23:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701904903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pahnn88B631617buOddU2yJ0mh3pF0Yr3mSXQxXa5TY=; b=JioAKqQcLenVmtjYNOVcsxPP7mqwJxjJdNGNB5uerhY60ehWIeGY7ojPbd5FN9SzCTwZwo /PrkvMECB+LQVLWTqZFcbIRLPh85G2Lh7+7RZhA4Y30C/Xhb9eferfqVLNIoF3GJyMBHPf Sp/8ep42o/ExQF3hBHBJdZRgFIZzfjFHpncF067NqINRKyzoNkto172L9eTO4A9Fb/eswY mW8MlRxxG2B719oNvNA+G6LoTudq6QdfwxNLO4OucZqORx1dXSC75KF2KtqPCCdRwEEWvh /jVKJPWzGTVNiRtn9Bkw55AxqCCFmp+6s6GW2EZ2RSIO4Kbk2vm2frRzugivSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701904903; a=rsa-sha256; cv=none; b=Nl8W/UKv9rFsupEciNP9MpWk/aDo+V7le1he3yZEhM7TNgBu8NR1BJWBo3bRQJ1VfzHG8Q wDD3FE1O88aiQImHyXlkIMmWqheg8UKTYMW2k4piTXW3zW+hVppoeblew4olouhf9LHVV+ GLrqZB5qd1UTQKcAKuYZRzTc8WGzhWQhUTW07Baknj88dJzP2C6a0TjKRFdNLB5ihXIBEP C1GJEUzsNas4yHWMGZtQ2vGFBXaBgzJZqkaGpC/N67oPRIDLA2EQqJ/NHD4n+ldpG+s6Ze 3Xa0M4d/gMzlMVHY4+uUhN5jyItae/Py9B2/aZf5LZczIJSAz3bXfjw9xfgNCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701904903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pahnn88B631617buOddU2yJ0mh3pF0Yr3mSXQxXa5TY=; b=soCXQ8yMlXa+f526rFdEpnngoxQsw/QEkCFYPOhRWuF5gmbQetSog9PQhcSAYmPAKBQrPN VcIJSospFA0xiQf2hQOQ9Bk1PZWJE2Pmr26Ee8l9FirhF12n9xwrXWOX9JbpbdpE8+4uuG mQ8lANjRwRxPPfh4r+a4ClLOiDezPaBY5CB4qiswZBbPUEDktmKrH+bVGjH3hamXVuE0yn b+NrlD3bFZ3qaN6JQpym4TWrB3gFr3nes04vhy/AM0kW2jw/3wCxfalfGMb+OChD9aZhks 2I7N3MtTHGUou+wDLg0m5PY/GuJ5307mDlD2Rh8tCGeYi2+Nf8//uutqIzXhqg== 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 4SlthR1v39z1CJd; Wed, 6 Dec 2023 23:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6NLhPI018003; Wed, 6 Dec 2023 23:21:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6NLhv3018000; Wed, 6 Dec 2023 23:21:43 GMT (envelope-from git) Date: Wed, 6 Dec 2023 23:21:43 GMT Message-Id: <202312062321.3B6NLhv3018000@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: 1228b93b410a - main - busdma: remove parent tag tracking List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1228b93b410a299cc2a730fe4b065bcffeb162c2 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=1228b93b410a299cc2a730fe4b065bcffeb162c2 commit 1228b93b410a299cc2a730fe4b065bcffeb162c2 Author: Mitchell Horne AuthorDate: 2023-12-06 23:08:51 +0000 Commit: Mitchell Horne CommitDate: 2023-12-06 23:11:39 +0000 busdma: remove parent tag tracking Without filter functions, we do not need to keep track of tag ancestry. All inheritance of the parent tag's parameters occurs when creating the new child tag. Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42895 --- sys/arm/arm/busdma_machdep.c | 60 +++++------------------------------- sys/arm64/arm64/busdma_bounce.c | 33 +++----------------- sys/arm64/arm64/busdma_machdep.c | 17 ++-------- sys/arm64/include/bus_dma_impl.h | 2 -- sys/dev/iommu/busdma_iommu.c | 23 +++++--------- sys/powerpc/powerpc/busdma_machdep.c | 50 +++++------------------------- sys/riscv/include/bus_dma_impl.h | 2 -- sys/riscv/riscv/busdma_bounce.c | 29 +++-------------- sys/riscv/riscv/busdma_machdep.c | 19 ++---------- sys/x86/include/busdma_impl.h | 2 -- sys/x86/iommu/intel_ctx.c | 1 - sys/x86/x86/busdma_bounce.c | 29 +++-------------- sys/x86/x86/busdma_machdep.c | 22 +++---------- 13 files changed, 48 insertions(+), 241 deletions(-) diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c index cf1fd0209734..dd31f7779b21 100644 --- a/sys/arm/arm/busdma_machdep.c +++ b/sys/arm/arm/busdma_machdep.c @@ -77,7 +77,6 @@ struct bounce_page; struct bounce_zone; struct bus_dma_tag { - bus_dma_tag_t parent; bus_size_t alignment; bus_addr_t boundary; bus_addr_t lowaddr; @@ -86,7 +85,6 @@ struct bus_dma_tag { u_int nsegments; bus_size_t maxsegsz; int flags; - int ref_count; int map_count; bus_dma_lock_t *lockfunc; void *lockfuncarg; @@ -332,10 +330,7 @@ might_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t addr, * * Bouncing can be triggered by DMA that doesn't begin and end on cacheline * boundaries, or doesn't begin on an alignment boundary, or falls within the - * exclusion zone of any tag in the ancestry chain. - * - * For exclusions, walk the chain of tags comparing paddr to the exclusion zone - * within each tag. + * exclusion zone of the tag. */ static int must_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr, @@ -353,17 +348,11 @@ must_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr, return (1); /* - * Even though each tag has an exclusion zone that is a superset of its - * own and all its ancestors' exclusions, the exclusion zone of each tag - * up the chain must be checked within the loop, because the busdma - * rules say the filter function is called only when the address lies - * within the low-highaddr range of the tag that filterfunc belongs to. + * Check the tag's exclusion zone. */ - while (dmat != NULL && exclusion_bounce(dmat)) { - if (paddr >= dmat->lowaddr && paddr <= dmat->highaddr) - return (1); - dmat = dmat->parent; - } + if (exclusion_bounce(dmat) && + paddr >= dmat->lowaddr && paddr <= dmat->highaddr) + return (1); return (0); } @@ -405,7 +394,6 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, return (ENOMEM); } - newtag->parent = parent; newtag->alignment = alignment; newtag->boundary = boundary; newtag->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1); @@ -415,7 +403,6 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, newtag->nsegments = nsegments; newtag->maxsegsz = maxsegsz; newtag->flags = flags; - newtag->ref_count = 1; /* Count ourself */ newtag->map_count = 0; if (lockfunc != NULL) { newtag->lockfunc = lockfunc; @@ -437,14 +424,6 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, else if (parent->boundary != 0) newtag->boundary = MIN(parent->boundary, newtag->boundary); - - /* - * Short circuit to looking at our parent directly since we - * have encapsulated all of its information. - */ - newtag->parent = parent->parent; - if (newtag->parent != NULL) - atomic_add_int(&parent->ref_count, 1); } if (exclusion_bounce_check(newtag->lowaddr, newtag->highaddr)) @@ -504,7 +483,6 @@ bus_dma_template_clone(bus_dma_template_t *t, bus_dma_tag_t dmat) if (t == NULL || dmat == NULL) return; - t->parent = dmat->parent; t->alignment = dmat->alignment; t->boundary = dmat->boundary; t->lowaddr = dmat->lowaddr; @@ -527,39 +505,17 @@ bus_dma_tag_set_domain(bus_dma_tag_t dmat, int domain) int bus_dma_tag_destroy(bus_dma_tag_t dmat) { -#ifdef KTR - bus_dma_tag_t dmat_copy = dmat; -#endif - int error; - - error = 0; + int error = 0; if (dmat != NULL) { if (dmat->map_count != 0) { error = EBUSY; goto out; } - - while (dmat != NULL) { - bus_dma_tag_t parent; - - parent = dmat->parent; - atomic_subtract_int(&dmat->ref_count, 1); - if (dmat->ref_count == 0) { - atomic_subtract_32(&tags_total, 1); - free(dmat, M_BUSDMA); - /* - * Last reference count, so - * release our reference - * count on our parent. - */ - dmat = parent; - } else - dmat = NULL; - } + free(dmat, M_BUSDMA); } out: - CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat_copy, error); + CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat, error); return (error); } diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c index 7585d950fcbb..3b5521a31b92 100644 --- a/sys/arm64/arm64/busdma_bounce.c +++ b/sys/arm64/arm64/busdma_bounce.c @@ -309,42 +309,19 @@ bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, static int bounce_bus_dma_tag_destroy(bus_dma_tag_t dmat) { -#ifdef KTR - bus_dma_tag_t dmat_copy; -#endif - bus_dma_tag_t parent; - int error; - - error = 0; -#ifdef KTR - dmat_copy = dmat; -#endif - + int error = 0; if (dmat != NULL) { if (dmat->map_count != 0) { error = EBUSY; goto out; } - while (dmat != NULL) { - parent = (bus_dma_tag_t)dmat->common.parent; - atomic_subtract_int(&dmat->common.ref_count, 1); - if (dmat->common.ref_count == 0) { - if (dmat->segments != NULL) - free(dmat->segments, M_DEVBUF); - free(dmat, M_DEVBUF); - /* - * Last reference count, so - * release our reference - * count on our parent. - */ - dmat = parent; - } else - dmat = NULL; - } + if (dmat->segments != NULL) + free(dmat->segments, M_DEVBUF); + free(dmat, M_DEVBUF); } out: - CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat_copy, error); + CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat, error); return (error); } diff --git a/sys/arm64/arm64/busdma_machdep.c b/sys/arm64/arm64/busdma_machdep.c index aa5359b4552a..c88b28aa3e22 100644 --- a/sys/arm64/arm64/busdma_machdep.c +++ b/sys/arm64/arm64/busdma_machdep.c @@ -61,12 +61,8 @@ int bus_dma_run_filter(struct bus_dma_tag_common *tc, bus_addr_t paddr) { - while (tc != NULL) { - if (paddr > tc->lowaddr && paddr <= tc->highaddr) - return (1); - - tc = tc->parent; - } + if (paddr > tc->lowaddr && paddr <= tc->highaddr) + return (1); return (0); } @@ -99,7 +95,6 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common = newtag; common->impl = &bus_dma_bounce_impl; - common->parent = parent; common->alignment = alignment; common->boundary = boundary; common->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1); @@ -108,7 +103,6 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common->nsegments = nsegments; common->maxsegsz = maxsegsz; common->flags = flags; - common->ref_count = 1; /* Count ourself */ if (lockfunc != NULL) { common->lockfunc = lockfunc; common->lockfuncarg = lockfuncarg; @@ -130,13 +124,7 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common->boundary); } - /* - * Short circuit looking at our parent directly since we have - * encapsulated all of its information. - */ - common->parent = parent->parent; common->domain = parent->domain; - atomic_add_int(&parent->ref_count, 1); } common->domain = vm_phys_domain_match(common->domain, 0ul, common->lowaddr); @@ -184,7 +172,6 @@ bus_dma_template_clone(bus_dma_template_t *t, bus_dma_tag_t dmat) common = (struct bus_dma_tag_common *)dmat; - t->parent = (bus_dma_tag_t)common->parent; t->alignment = common->alignment; t->boundary = common->boundary; t->lowaddr = common->lowaddr; diff --git a/sys/arm64/include/bus_dma_impl.h b/sys/arm64/include/bus_dma_impl.h index 1abce30b5b4c..55af1b477979 100644 --- a/sys/arm64/include/bus_dma_impl.h +++ b/sys/arm64/include/bus_dma_impl.h @@ -31,7 +31,6 @@ struct bus_dma_tag_common { struct bus_dma_impl *impl; - struct bus_dma_tag_common *parent; bus_size_t alignment; bus_addr_t boundary; bus_addr_t lowaddr; @@ -42,7 +41,6 @@ struct bus_dma_tag_common { int flags; bus_dma_lock_t *lockfunc; void *lockfuncarg; - int ref_count; int domain; }; diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c index f041838eac39..d870e2af3984 100644 --- a/sys/dev/iommu/busdma_iommu.c +++ b/sys/dev/iommu/busdma_iommu.c @@ -394,33 +394,24 @@ iommu_bus_dma_tag_set_domain(bus_dma_tag_t dmat) static int iommu_bus_dma_tag_destroy(bus_dma_tag_t dmat1) { - struct bus_dma_tag_iommu *dmat, *parent; - struct bus_dma_tag_iommu *dmat_copy __unused; + struct bus_dma_tag_iommu *dmat; int error; error = 0; - dmat_copy = dmat = (struct bus_dma_tag_iommu *)dmat1; + dmat = (struct bus_dma_tag_iommu *)dmat1; if (dmat != NULL) { if (dmat->map_count != 0) { error = EBUSY; goto out; } - while (dmat != NULL) { - parent = (struct bus_dma_tag_iommu *)dmat->common.parent; - if (atomic_fetchadd_int(&dmat->common.ref_count, -1) == - 1) { - if (dmat == dmat->ctx->tag) - iommu_free_ctx(dmat->ctx); - free(dmat->segments, M_IOMMU_DMAMAP); - free(dmat, M_DEVBUF); - dmat = parent; - } else - dmat = NULL; - } + if (dmat == dmat->ctx->tag) + iommu_free_ctx(dmat->ctx); + free(dmat->segments, M_IOMMU_DMAMAP); + free(dmat, M_DEVBUF); } out: - CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat_copy, error); + CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat, error); return (error); } diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index 3065526427e2..a4c30ee9470c 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -63,7 +63,6 @@ struct bounce_page; struct bounce_zone; struct bus_dma_tag { - bus_dma_tag_t parent; bus_size_t alignment; bus_addr_t boundary; bus_addr_t lowaddr; @@ -72,7 +71,6 @@ struct bus_dma_tag { bus_size_t maxsegsz; u_int nsegments; int flags; - int ref_count; int map_count; bus_dma_lock_t *lockfunc; void *lockfuncarg; @@ -126,15 +124,12 @@ run_filter(bus_dma_tag_t dmat, bus_addr_t paddr) retval = 0; - do { - if (dmat->iommu == NULL && - paddr > dmat->lowaddr && paddr <= dmat->highaddr) - retval = 1; - if (!vm_addr_align_ok(paddr, dmat->alignment)) - retval = 1; + if (dmat->iommu == NULL && + paddr > dmat->lowaddr && paddr <= dmat->highaddr) + retval = 1; + if (!vm_addr_align_ok(paddr, dmat->alignment)) + retval = 1; - dmat = dmat->parent; - } while (retval == 0 && dmat != NULL); return (retval); } @@ -177,7 +172,6 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, return (ENOMEM); } - newtag->parent = parent; newtag->alignment = alignment; newtag->boundary = boundary; newtag->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1); @@ -186,7 +180,6 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, newtag->nsegments = nsegments; newtag->maxsegsz = maxsegsz; newtag->flags = flags; - newtag->ref_count = 1; /* Count ourself */ newtag->map_count = 0; if (lockfunc != NULL) { newtag->lockfunc = lockfunc; @@ -206,13 +199,6 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, newtag->boundary = MIN(parent->boundary, newtag->boundary); - /* - * Short circuit looking at our parent directly since we have - * encapsulated all of its information. - */ - newtag->parent = parent->parent; - if (newtag->parent != NULL) - atomic_add_int(&parent->ref_count, 1); newtag->iommu = parent->iommu; newtag->iommu_cookie = parent->iommu_cookie; } @@ -265,7 +251,6 @@ bus_dma_template_clone(bus_dma_template_t *t, bus_dma_tag_t dmat) if (t == NULL || dmat == NULL) return; - t->parent = dmat->parent; t->alignment = dmat->alignment; t->boundary = dmat->boundary; t->lowaddr = dmat->lowaddr; @@ -288,11 +273,7 @@ bus_dma_tag_set_domain(bus_dma_tag_t dmat, int domain) int bus_dma_tag_destroy(bus_dma_tag_t dmat) { - bus_dma_tag_t dmat_copy __unused; - int error; - - error = 0; - dmat_copy = dmat; + int error = 0; if (dmat != NULL) { if (dmat->map_count != 0) { @@ -300,25 +281,10 @@ bus_dma_tag_destroy(bus_dma_tag_t dmat) goto out; } - while (dmat != NULL) { - bus_dma_tag_t parent; - - parent = dmat->parent; - atomic_subtract_int(&dmat->ref_count, 1); - if (dmat->ref_count == 0) { - free(dmat, M_DEVBUF); - /* - * Last reference count, so - * release our reference - * count on our parent. - */ - dmat = parent; - } else - dmat = NULL; - } + free(dmat, M_DEVBUF); } out: - CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat_copy, error); + CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat, error); return (error); } diff --git a/sys/riscv/include/bus_dma_impl.h b/sys/riscv/include/bus_dma_impl.h index d6e1d4ed632e..550ba648615c 100644 --- a/sys/riscv/include/bus_dma_impl.h +++ b/sys/riscv/include/bus_dma_impl.h @@ -31,7 +31,6 @@ struct bus_dma_tag_common { struct bus_dma_impl *impl; - struct bus_dma_tag_common *parent; bus_size_t alignment; bus_addr_t boundary; bus_addr_t lowaddr; @@ -42,7 +41,6 @@ struct bus_dma_tag_common { int flags; bus_dma_lock_t *lockfunc; void *lockfuncarg; - int ref_count; }; struct bus_dma_impl { diff --git a/sys/riscv/riscv/busdma_bounce.c b/sys/riscv/riscv/busdma_bounce.c index 6ac9a9cd678a..e9801a8a732e 100644 --- a/sys/riscv/riscv/busdma_bounce.c +++ b/sys/riscv/riscv/busdma_bounce.c @@ -196,38 +196,19 @@ bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, static int bounce_bus_dma_tag_destroy(bus_dma_tag_t dmat) { -#ifdef KTR - bus_dma_tag_t dmat_copy = dmat; -#endif - bus_dma_tag_t parent; - int error; - - error = 0; + int error = 0; if (dmat != NULL) { if (dmat->map_count != 0) { error = EBUSY; goto out; } - while (dmat != NULL) { - parent = (bus_dma_tag_t)dmat->common.parent; - atomic_subtract_int(&dmat->common.ref_count, 1); - if (dmat->common.ref_count == 0) { - if (dmat->segments != NULL) - free(dmat->segments, M_DEVBUF); - free(dmat, M_DEVBUF); - /* - * Last reference count, so - * release our reference - * count on our parent. - */ - dmat = parent; - } else - dmat = NULL; - } + if (dmat->segments != NULL) + free(dmat->segments, M_DEVBUF); + free(dmat, M_DEVBUF); } out: - CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat_copy, error); + CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat, error); return (error); } diff --git a/sys/riscv/riscv/busdma_machdep.c b/sys/riscv/riscv/busdma_machdep.c index e992803f3ff2..630938a394e1 100644 --- a/sys/riscv/riscv/busdma_machdep.c +++ b/sys/riscv/riscv/busdma_machdep.c @@ -62,13 +62,10 @@ bus_dma_run_filter(struct bus_dma_tag_common *tc, bus_addr_t paddr) int retval; retval = 0; - do { - if ((paddr > tc->lowaddr && paddr <= tc->highaddr) || - !vm_addr_align_ok(paddr, tc->alignment)) - retval = 1; + if ((paddr > tc->lowaddr && paddr <= tc->highaddr) || + !vm_addr_align_ok(paddr, tc->alignment)) + retval = 1; - tc = tc->parent; - } while (retval == 0 && tc != NULL); return (retval); } @@ -100,7 +97,6 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common = newtag; common->impl = &bus_dma_bounce_impl; - common->parent = parent; common->alignment = alignment; common->boundary = boundary; common->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1); @@ -109,7 +105,6 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common->nsegments = nsegments; common->maxsegsz = maxsegsz; common->flags = flags; - common->ref_count = 1; /* Count ourself */ if (lockfunc != NULL) { common->lockfunc = lockfunc; common->lockfuncarg = lockfuncarg; @@ -129,13 +124,6 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common->boundary = MIN(parent->boundary, common->boundary); } - - /* - * Short circuit looking at our parent directly since we have - * encapsulated all of its information. - */ - common->parent = parent->parent; - atomic_add_int(&parent->ref_count, 1); } *dmat = common; return (0); @@ -181,7 +169,6 @@ bus_dma_template_clone(bus_dma_template_t *t, bus_dma_tag_t dmat) common = (struct bus_dma_tag_common *)dmat; - t->parent = (bus_dma_tag_t)common->parent; t->alignment = common->alignment; t->boundary = common->boundary; t->lowaddr = common->lowaddr; diff --git a/sys/x86/include/busdma_impl.h b/sys/x86/include/busdma_impl.h index 4718c67dacc1..2e4c83b04d72 100644 --- a/sys/x86/include/busdma_impl.h +++ b/sys/x86/include/busdma_impl.h @@ -33,7 +33,6 @@ struct bus_dma_tag_common { struct bus_dma_impl *impl; - struct bus_dma_tag_common *parent; bus_size_t alignment; bus_addr_t boundary; bus_addr_t lowaddr; @@ -44,7 +43,6 @@ struct bus_dma_tag_common { int flags; bus_dma_lock_t *lockfunc; void *lockfuncarg; - int ref_count; int domain; }; diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index 30771e061ec9..76a53f6bbd1a 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -128,7 +128,6 @@ device_tag_init(struct dmar_ctx *ctx, device_t dev) domain = CTX2DOM(ctx); maxaddr = MIN(domain->iodom.end, BUS_SPACE_MAXADDR); - ctx->context.tag->common.ref_count = 1; /* Prevent free */ ctx->context.tag->common.impl = &bus_dma_iommu_impl; ctx->context.tag->common.boundary = 0; ctx->context.tag->common.lowaddr = maxaddr; diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c index 01e799a1133d..992f455ceb96 100644 --- a/sys/x86/x86/busdma_bounce.c +++ b/sys/x86/x86/busdma_bounce.c @@ -227,38 +227,19 @@ bounce_bus_dma_tag_set_domain(bus_dma_tag_t dmat) static int bounce_bus_dma_tag_destroy(bus_dma_tag_t dmat) { -#ifdef KTR - bus_dma_tag_t dmat_copy = dmat; -#endif - bus_dma_tag_t parent; - int error; - - error = 0; + int error = 0; if (dmat != NULL) { if (dmat->map_count != 0) { error = EBUSY; goto out; } - while (dmat != NULL) { - parent = (bus_dma_tag_t)dmat->common.parent; - atomic_subtract_int(&dmat->common.ref_count, 1); - if (dmat->common.ref_count == 0) { - if (dmat->segments != NULL) - free(dmat->segments, M_DEVBUF); - free(dmat, M_DEVBUF); - /* - * Last reference count, so - * release our reference - * count on our parent. - */ - dmat = parent; - } else - dmat = NULL; - } + if (dmat->segments != NULL) + free(dmat->segments, M_DEVBUF); + free(dmat, M_DEVBUF); } out: - CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat_copy, error); + CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat, error); return (error); } diff --git a/sys/x86/x86/busdma_machdep.c b/sys/x86/x86/busdma_machdep.c index bb1b6a393fb0..6fe49367f7d8 100644 --- a/sys/x86/x86/busdma_machdep.c +++ b/sys/x86/x86/busdma_machdep.c @@ -67,14 +67,11 @@ bus_dma_run_filter(struct bus_dma_tag_common *tc, vm_paddr_t paddr) int retval; retval = 0; - do { - if (paddr >= BUS_SPACE_MAXADDR || - (paddr > tc->lowaddr && paddr <= tc->highaddr) || - !vm_addr_align_ok(paddr, tc->alignment)) - retval = 1; - - tc = tc->parent; - } while (retval == 0 && tc != NULL); + if (paddr >= BUS_SPACE_MAXADDR || + (paddr > tc->lowaddr && paddr <= tc->highaddr) || + !vm_addr_align_ok(paddr, tc->alignment)) + retval = 1; + return (retval); } @@ -106,7 +103,6 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common = newtag; common->impl = &bus_dma_bounce_impl; - common->parent = parent; common->alignment = alignment; common->boundary = boundary; common->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1); @@ -115,7 +111,6 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common->nsegments = nsegments; common->maxsegsz = maxsegsz; common->flags = flags; - common->ref_count = 1; /* Count ourself */ if (lockfunc != NULL) { common->lockfunc = lockfunc; common->lockfuncarg = lockfuncarg; @@ -136,13 +131,7 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common->boundary); } - /* - * Short circuit looking at our parent directly since we have - * encapsulated all of its information. - */ - common->parent = parent->parent; common->domain = parent->domain; - atomic_add_int(&parent->ref_count, 1); } common->domain = vm_phys_domain_match(common->domain, 0ul, common->lowaddr); @@ -204,7 +193,6 @@ bus_dma_template_clone(bus_dma_template_t *t, bus_dma_tag_t dmat) common = (struct bus_dma_tag_common *)dmat; - t->parent = (bus_dma_tag_t)common->parent; t->alignment = common->alignment; t->boundary = common->boundary; t->lowaddr = common->lowaddr; From nobody Wed Dec 6 23:21:44 2023 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 4SlthS6dVcz539FS; Wed, 6 Dec 2023 23:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlthS42nTz4FVg; Wed, 6 Dec 2023 23:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701904904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kvCclF/VYbckm+ugyzWBGYmX9f8/6GQaFGDc5a7RruI=; b=vX2c0/1tBZRzDLgtn+3XsN3flgNaPGdZq1WrrvcPUhI56FE8/y38ZWKXv714iwqPMUkzy5 U5QrUTiv5xprP/zBVPTTN/6EKOMS3Xu1mN+su0IJsgbuXV/uK5b5cHhsHGC1drBfmJbP3q qD5lvCsCgdOwjw5ZreCr51sSFWHT6xvyEfjCAb3U8gEu07UHHugJd5EwIQlHAMICNgT4JP El9aj92O9MoU1apGH2OxDIHb2B+aRvEqzkO3I67+z8gzm0oYQ1xBHIItg9Ck2beenqqdJy qhDxUHdhVI0KqroEEtKYfhjNaDDBlcxBE8nMbg8Bk5KqxsGhyre5xO4fTXjXLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701904904; a=rsa-sha256; cv=none; b=oJcFB2aELbpX+Isn/MoM+BB+SXdOl1cNTfqIfincvIqtKAZDklOf1o6fTnLs6VFFkSTXa4 cD5b99dqbOwgFicDyoMDviHTpp5G87ibPtXVuTYi8TpQeLRseIqC7jMidbrgoiY0kYCxGD VMXwY8CA2HZgPe2jnEarG9gvJZjA6M/rpVtv8BSEb60ZWn9W3Qk/5yg0J81cGnUhBC9LYi QMws4nHukuMeqb6C3Rw5xLL6VRMY8kyjfXrVu0Dlu2BfjXXnBlsvVBRPygYzW+Ts2Zyv9q 31e9qRSmvdjb4c+d+LQlEZLUduXOqmLJESI3dbg3ulraZ1mW8EO6y1GFJ3p5sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701904904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kvCclF/VYbckm+ugyzWBGYmX9f8/6GQaFGDc5a7RruI=; b=RzHRwXmkDUsCblv+dp43LNnABhwHCCpHgjn6DiLz6SryuboMVlQLCJ1SWYMd3mLZuJR8g2 PHw9GkuB2TmwkSkx5AaTo2vC0hDfNOSPB9jWx0VzSyZkvkbIKCReiVjm9nXRSjkOtgtUi9 GCQgdJziJslA1OJeqQSL5Lesl5g7NaTgt+YhShoWwgqkkBw1fjznoJ5nXqDtlVK7xxfrmc gQpcBdUKBxqh9xoP0YFvleBx4LZ2T+MvWce73MgeP3YdLepf/XY9gJ6GhAzuUHP0zL4FZe V+uuzO8gIvK3nvY7FpOtXJpMljYbuqlRIzc9W2WUYw/ZMpuuwVzW1gb3BIQq+w== 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 4SlthS2qzDz1C1K; Wed, 6 Dec 2023 23:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6NLi1Z018048; Wed, 6 Dec 2023 23:21:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6NLiVH018044; Wed, 6 Dec 2023 23:21:44 GMT (envelope-from git) Date: Wed, 6 Dec 2023 23:21:44 GMT Message-Id: <202312062321.3B6NLiVH018044@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: 3933ff56f9b6 - main - busdma: tidy bus_dma_run_filter() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3933ff56f9b6ee844105916b9002b46ba9536ea5 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3933ff56f9b6ee844105916b9002b46ba9536ea5 commit 3933ff56f9b6ee844105916b9002b46ba9536ea5 Author: Mitchell Horne AuthorDate: 2023-12-06 23:09:27 +0000 Commit: Mitchell Horne CommitDate: 2023-12-06 23:11:39 +0000 busdma: tidy bus_dma_run_filter() functions After removing filter functionality, the naming doesn't clearly represent what the function does, so try to address this. Include some code clarity and style improvements. Create a common version in subr_busdma_bounce.c, used by most implementations. powerpc still needs its own version of the function, due to its dmat->iommu == NULL check. No functional change intended. Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42896 --- sys/arm/arm/busdma_machdep.c | 11 ++--------- sys/arm64/arm64/busdma_bounce.c | 7 ++----- sys/arm64/arm64/busdma_machdep.c | 18 ------------------ sys/arm64/include/bus_dma_impl.h | 1 - sys/kern/subr_busdma_bounce.c | 16 ++++++++++++++++ sys/powerpc/powerpc/busdma_machdep.c | 36 ++++++++++++++---------------------- sys/riscv/include/bus_dma_impl.h | 1 - sys/riscv/riscv/busdma_bounce.c | 10 +++++----- sys/riscv/riscv/busdma_machdep.c | 21 --------------------- sys/x86/include/busdma_impl.h | 1 - sys/x86/x86/busdma_bounce.c | 13 +++++++------ sys/x86/x86/busdma_machdep.c | 22 ---------------------- 12 files changed, 46 insertions(+), 111 deletions(-) diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c index dd31f7779b21..9f4c6e561bbc 100644 --- a/sys/arm/arm/busdma_machdep.c +++ b/sys/arm/arm/busdma_machdep.c @@ -169,6 +169,7 @@ MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata"); #define dmat_alignment(dmat) ((dmat)->alignment) #define dmat_flags(dmat) ((dmat)->flags) +#define dmat_highaddr(dmat) ((dmat)->highaddr) #define dmat_lowaddr(dmat) ((dmat)->lowaddr) #define dmat_lockfunc(dmat) ((dmat)->lockfunc) #define dmat_lockfuncarg(dmat) ((dmat)->lockfuncarg) @@ -340,18 +341,10 @@ must_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr, if (cacheline_bounce(map, paddr, size)) return (1); - /* - * The tag already contains ancestors' alignment restrictions so this - * check doesn't need to be inside the loop. - */ - if (alignment_bounce(dmat, paddr)) - return (1); - /* * Check the tag's exclusion zone. */ - if (exclusion_bounce(dmat) && - paddr >= dmat->lowaddr && paddr <= dmat->highaddr) + if (exclusion_bounce(dmat) && addr_needs_bounce(dmat, paddr)) return (1); return (0); diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c index 3b5521a31b92..a117e1041658 100644 --- a/sys/arm64/arm64/busdma_bounce.c +++ b/sys/arm64/arm64/busdma_bounce.c @@ -107,7 +107,6 @@ struct bus_dmamap { struct sync_list slist[]; }; -int run_filter(bus_dma_tag_t dmat, bus_addr_t paddr); static bool _bus_dmamap_pagesneeded(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf, bus_size_t buflen, int *pagesneeded); static void _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, @@ -120,6 +119,7 @@ static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata"); #define dmat_alignment(dmat) ((dmat)->common.alignment) #define dmat_domain(dmat) ((dmat)->common.domain) #define dmat_flags(dmat) ((dmat)->common.flags) +#define dmat_highaddr(dmat) ((dmat)->common.highaddr) #define dmat_lowaddr(dmat) ((dmat)->common.lowaddr) #define dmat_lockfunc(dmat) ((dmat)->common.lockfunc) #define dmat_lockfuncarg(dmat) ((dmat)->common.lockfuncarg) @@ -225,11 +225,8 @@ must_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr, if (cacheline_bounce(dmat, map, paddr, size)) return (true); - if (alignment_bounce(dmat, paddr)) - return (true); - if ((dmat->bounce_flags & BF_COULD_BOUNCE) != 0 && - bus_dma_run_filter(&dmat->common, paddr)) + addr_needs_bounce(dmat, paddr)) return (true); return (false); diff --git a/sys/arm64/arm64/busdma_machdep.c b/sys/arm64/arm64/busdma_machdep.c index c88b28aa3e22..08dfb67abeab 100644 --- a/sys/arm64/arm64/busdma_machdep.c +++ b/sys/arm64/arm64/busdma_machdep.c @@ -49,24 +49,6 @@ #include #include -/* - * Return true if a match is made. - * - * To find a match walk the chain of bus_dma_tag_t's looking for 'paddr'. - * - * If paddr is within the bounds of the dma tag then call the filter callback - * to check for a match, if there is no filter callback then assume a match. - */ -int -bus_dma_run_filter(struct bus_dma_tag_common *tc, bus_addr_t paddr) -{ - - if (paddr > tc->lowaddr && paddr <= tc->highaddr) - return (1); - - return (0); -} - int common_bus_dma_tag_create(struct bus_dma_tag_common *parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, diff --git a/sys/arm64/include/bus_dma_impl.h b/sys/arm64/include/bus_dma_impl.h index 55af1b477979..9e5741758ef5 100644 --- a/sys/arm64/include/bus_dma_impl.h +++ b/sys/arm64/include/bus_dma_impl.h @@ -77,7 +77,6 @@ struct bus_dma_impl { bus_dmasync_op_t op); }; -int bus_dma_run_filter(struct bus_dma_tag_common *dmat, bus_addr_t paddr); int common_bus_dma_tag_create(struct bus_dma_tag_common *parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, bus_size_t maxsize, int nsegments, diff --git a/sys/kern/subr_busdma_bounce.c b/sys/kern/subr_busdma_bounce.c index 76f50b2abf38..77b1b358758f 100644 --- a/sys/kern/subr_busdma_bounce.c +++ b/sys/kern/subr_busdma_bounce.c @@ -155,6 +155,22 @@ busdma_sysctl_tree_top(struct bounce_zone *bz) return (bz->sysctl_tree_top); } +/* + * Returns true if the address falls within the tag's exclusion window, or + * fails to meet its alignment requirements. + */ +static bool +addr_needs_bounce(bus_dma_tag_t dmat, bus_addr_t paddr) +{ + + if (paddr > dmat_lowaddr(dmat) && paddr <= dmat_highaddr(dmat)) + return (true); + if (!vm_addr_align_ok(paddr, dmat_alignment(dmat))) + return (true); + + return (false); +} + static int alloc_bounce_zone(bus_dma_tag_t dmat) { diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index a4c30ee9470c..aa1a29e1f1ce 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -99,10 +99,9 @@ struct bus_dmamap { static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata"); -static __inline int run_filter(bus_dma_tag_t dmat, bus_addr_t paddr); - #define dmat_alignment(dmat) ((dmat)->alignment) #define dmat_flags(dmat) ((dmat)->flags) +#define dmat_highaddr(dmat) ((dmat)->highaddr) #define dmat_lowaddr(dmat) ((dmat)->lowaddr) #define dmat_lockfunc(dmat) ((dmat)->lockfunc) #define dmat_lockfuncarg(dmat) ((dmat)->lockfuncarg) @@ -110,27 +109,20 @@ static __inline int run_filter(bus_dma_tag_t dmat, bus_addr_t paddr); #include "../../kern/subr_busdma_bounce.c" /* - * Return true if a match is made. - * - * To find a match walk the chain of bus_dma_tag_t's looking for 'paddr'. - * - * If paddr is within the bounds of the dma tag then call the filter callback - * to check for a match, if there is no filter callback then assume a match. + * Returns true if the address falls within the tag's exclusion window, or + * fails to meet its alignment requirements. */ -static __inline int -run_filter(bus_dma_tag_t dmat, bus_addr_t paddr) +static __inline bool +must_bounce(bus_dma_tag_t dmat, bus_addr_t paddr) { - int retval; - - retval = 0; - if (dmat->iommu == NULL && - paddr > dmat->lowaddr && paddr <= dmat->highaddr) - retval = 1; + if (dmat->iommu == NULL && paddr > dmat->lowaddr && + paddr <= dmat->highaddr) + return (true); if (!vm_addr_align_ok(paddr, dmat->alignment)) - retval = 1; + return (true); - return (retval); + return (false); } #define BUS_DMA_COULD_BOUNCE BUS_DMA_BUS3 @@ -492,7 +484,7 @@ _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf, curaddr = buf; while (buflen != 0) { sgsize = MIN(buflen, dmat->maxsegsz); - if (run_filter(dmat, curaddr) != 0) { + if (must_bounce(dmat, curaddr)) { sgsize = MIN(sgsize, PAGE_SIZE - (curaddr & PAGE_MASK)); map->pagesneeded++; @@ -532,7 +524,7 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap, paddr = pmap_kextract(vaddr); else paddr = pmap_extract(pmap, vaddr); - if (run_filter(dmat, paddr) != 0) { + if (must_bounce(dmat, paddr)) { sg_len = roundup2(sg_len, dmat->alignment); map->pagesneeded++; } @@ -614,7 +606,7 @@ _bus_dmamap_load_phys(bus_dma_tag_t dmat, while (buflen > 0) { curaddr = buf; sgsize = MIN(buflen, dmat->maxsegsz); - if (map->pagesneeded != 0 && run_filter(dmat, curaddr)) { + if (map->pagesneeded != 0 && must_bounce(dmat, curaddr)) { sgsize = MIN(sgsize, PAGE_SIZE - (curaddr & PAGE_MASK)); curaddr = add_bounce_page(dmat, map, 0, curaddr, sgsize); @@ -694,7 +686,7 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dmat, */ max_sgsize = MIN(buflen, dmat->maxsegsz); sgsize = PAGE_SIZE - (curaddr & PAGE_MASK); - if (map->pagesneeded != 0 && run_filter(dmat, curaddr)) { + if (map->pagesneeded != 0 && must_bounce(dmat, curaddr)) { sgsize = roundup2(sgsize, dmat->alignment); sgsize = MIN(sgsize, max_sgsize); curaddr = add_bounce_page(dmat, map, kvaddr, curaddr, diff --git a/sys/riscv/include/bus_dma_impl.h b/sys/riscv/include/bus_dma_impl.h index 550ba648615c..09fd29b74f8e 100644 --- a/sys/riscv/include/bus_dma_impl.h +++ b/sys/riscv/include/bus_dma_impl.h @@ -74,7 +74,6 @@ struct bus_dma_impl { bus_dmasync_op_t op); }; -int bus_dma_run_filter(struct bus_dma_tag_common *dmat, bus_addr_t paddr); int common_bus_dma_tag_create(struct bus_dma_tag_common *parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, diff --git a/sys/riscv/riscv/busdma_bounce.c b/sys/riscv/riscv/busdma_bounce.c index e9801a8a732e..c9fdb0e38e40 100644 --- a/sys/riscv/riscv/busdma_bounce.c +++ b/sys/riscv/riscv/busdma_bounce.c @@ -103,7 +103,6 @@ struct bus_dmamap { struct sync_list slist[]; }; -int run_filter(bus_dma_tag_t dmat, bus_addr_t paddr); static void _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap, void *buf, bus_size_t buflen, int flags); static void _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, @@ -113,6 +112,7 @@ static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata"); #define dmat_alignment(dmat) ((dmat)->common.alignment) #define dmat_flags(dmat) ((dmat)->common.flags) +#define dmat_highaddr(dmat) ((dmat)->common.highaddr) #define dmat_lowaddr(dmat) ((dmat)->common.lowaddr) #define dmat_lockfunc(dmat) ((dmat)->common.lockfunc) #define dmat_lockfuncarg(dmat) ((dmat)->common.lockfuncarg) @@ -494,7 +494,7 @@ _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf, curaddr = buf; while (buflen != 0) { sgsize = MIN(buflen, dmat->common.maxsegsz); - if (bus_dma_run_filter(&dmat->common, curaddr)) { + if (addr_needs_bounce(dmat, curaddr)) { sgsize = MIN(sgsize, PAGE_SIZE - (curaddr & PAGE_MASK)); map->pagesneeded++; @@ -535,7 +535,7 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap, paddr = pmap_kextract(vaddr); else paddr = pmap_extract(pmap, vaddr); - if (bus_dma_run_filter(&dmat->common, paddr) != 0) { + if (addr_needs_bounce(dmat, paddr)) { sg_len = roundup2(sg_len, dmat->common.alignment); map->pagesneeded++; @@ -621,7 +621,7 @@ bounce_bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map, sgsize = MIN(buflen, dmat->common.maxsegsz); if (((dmat->bounce_flags & BF_COULD_BOUNCE) != 0) && map->pagesneeded != 0 && - bus_dma_run_filter(&dmat->common, curaddr)) { + addr_needs_bounce(dmat, curaddr)) { sgsize = MIN(sgsize, PAGE_SIZE - (curaddr & PAGE_MASK)); curaddr = add_bounce_page(dmat, map, 0, curaddr, sgsize); @@ -708,7 +708,7 @@ bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, sgsize = PAGE_SIZE - (curaddr & PAGE_MASK); if (((dmat->bounce_flags & BF_COULD_BOUNCE) != 0) && map->pagesneeded != 0 && - bus_dma_run_filter(&dmat->common, curaddr)) { + addr_needs_bounce(dmat, curaddr)) { sgsize = roundup2(sgsize, dmat->common.alignment); sgsize = MIN(sgsize, max_sgsize); curaddr = add_bounce_page(dmat, map, kvaddr, curaddr, diff --git a/sys/riscv/riscv/busdma_machdep.c b/sys/riscv/riscv/busdma_machdep.c index 630938a394e1..4a736f874d16 100644 --- a/sys/riscv/riscv/busdma_machdep.c +++ b/sys/riscv/riscv/busdma_machdep.c @@ -48,27 +48,6 @@ #include #include -/* - * Return true if a match is made. - * - * To find a match walk the chain of bus_dma_tag_t's looking for 'paddr'. - * - * If paddr is within the bounds of the dma tag then call the filter callback - * to check for a match, if there is no filter callback then assume a match. - */ -int -bus_dma_run_filter(struct bus_dma_tag_common *tc, bus_addr_t paddr) -{ - int retval; - - retval = 0; - if ((paddr > tc->lowaddr && paddr <= tc->highaddr) || - !vm_addr_align_ok(paddr, tc->alignment)) - retval = 1; - - return (retval); -} - int common_bus_dma_tag_create(struct bus_dma_tag_common *parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, diff --git a/sys/x86/include/busdma_impl.h b/sys/x86/include/busdma_impl.h index 2e4c83b04d72..86c8bb9ca972 100644 --- a/sys/x86/include/busdma_impl.h +++ b/sys/x86/include/busdma_impl.h @@ -82,7 +82,6 @@ struct bus_dma_impl { #endif }; -int bus_dma_run_filter(struct bus_dma_tag_common *dmat, vm_paddr_t paddr); int common_bus_dma_tag_create(struct bus_dma_tag_common *parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c index 992f455ceb96..10e9e0b36602 100644 --- a/sys/x86/x86/busdma_bounce.c +++ b/sys/x86/x86/busdma_bounce.c @@ -110,6 +110,7 @@ static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata"); #define dmat_alignment(dmat) ((dmat)->common.alignment) #define dmat_domain(dmat) ((dmat)->common.domain) #define dmat_flags(dmat) ((dmat)->common.flags) +#define dmat_highaddr(dmat) ((dmat)->common.highaddr) #define dmat_lowaddr(dmat) ((dmat)->common.lowaddr) #define dmat_lockfunc(dmat) ((dmat)->common.lockfunc) #define dmat_lockfuncarg(dmat) ((dmat)->common.lockfuncarg) @@ -490,7 +491,7 @@ _bus_dmamap_pagesneeded(bus_dma_tag_t dmat, vm_paddr_t buf, bus_size_t buflen, curaddr = buf; while (buflen != 0) { sgsize = MIN(buflen, dmat->common.maxsegsz); - if (bus_dma_run_filter(&dmat->common, curaddr)) { + if (addr_needs_bounce(dmat, curaddr)) { sgsize = MIN(sgsize, PAGE_SIZE - (curaddr & PAGE_MASK)); if (pagesneeded == NULL) @@ -546,7 +547,7 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap, paddr = pmap_kextract(vaddr); else paddr = pmap_extract(pmap, vaddr); - if (bus_dma_run_filter(&dmat->common, paddr) != 0) { + if (addr_needs_bounce(dmat, paddr)) { sg_len = roundup2(sg_len, dmat->common.alignment); map->pagesneeded++; @@ -583,7 +584,7 @@ _bus_dmamap_count_ma(bus_dma_tag_t dmat, bus_dmamap_t map, struct vm_page **ma, sg_len = PAGE_SIZE - ma_offs; max_sgsize = MIN(buflen, dmat->common.maxsegsz); sg_len = MIN(sg_len, max_sgsize); - if (bus_dma_run_filter(&dmat->common, paddr) != 0) { + if (addr_needs_bounce(dmat, paddr)) { sg_len = roundup2(sg_len, dmat->common.alignment); sg_len = MIN(sg_len, max_sgsize); @@ -684,7 +685,7 @@ bounce_bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map, sgsize = MIN(buflen, dmat->common.maxsegsz); if ((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0 && map->pagesneeded != 0 && - bus_dma_run_filter(&dmat->common, curaddr)) { + addr_needs_bounce(dmat, curaddr)) { sgsize = MIN(sgsize, PAGE_SIZE - (curaddr & PAGE_MASK)); curaddr = add_bounce_page(dmat, map, 0, curaddr, 0, sgsize); @@ -752,7 +753,7 @@ bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, sgsize = PAGE_SIZE - (curaddr & PAGE_MASK); if ((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0 && map->pagesneeded != 0 && - bus_dma_run_filter(&dmat->common, curaddr)) { + addr_needs_bounce(dmat, curaddr)) { sgsize = roundup2(sgsize, dmat->common.alignment); sgsize = MIN(sgsize, max_sgsize); curaddr = add_bounce_page(dmat, map, kvaddr, curaddr, 0, @@ -819,7 +820,7 @@ bounce_bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map, sgsize = PAGE_SIZE - ma_offs; if ((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0 && map->pagesneeded != 0 && - bus_dma_run_filter(&dmat->common, paddr)) { + addr_needs_bounce(dmat, paddr)) { sgsize = roundup2(sgsize, dmat->common.alignment); sgsize = MIN(sgsize, max_sgsize); KASSERT(vm_addr_align_ok(sgsize, diff --git a/sys/x86/x86/busdma_machdep.c b/sys/x86/x86/busdma_machdep.c index 6fe49367f7d8..efba01ea5988 100644 --- a/sys/x86/x86/busdma_machdep.c +++ b/sys/x86/x86/busdma_machdep.c @@ -53,28 +53,6 @@ #include #include -/* - * Return true if a match is made. - * - * To find a match walk the chain of bus_dma_tag_t's looking for 'paddr'. - * - * If paddr is within the bounds of the dma tag then call the filter callback - * to check for a match, if there is no filter callback then assume a match. - */ -int -bus_dma_run_filter(struct bus_dma_tag_common *tc, vm_paddr_t paddr) -{ - int retval; - - retval = 0; - if (paddr >= BUS_SPACE_MAXADDR || - (paddr > tc->lowaddr && paddr <= tc->highaddr) || - !vm_addr_align_ok(paddr, tc->alignment)) - retval = 1; - - return (retval); -} - int common_bus_dma_tag_create(struct bus_dma_tag_common *parent, bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr, From nobody Thu Dec 7 00:20:24 2023 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 4Slw083VjRz53F22; Thu, 7 Dec 2023 00:20: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slw082dDZz4Kk5; Thu, 7 Dec 2023 00:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wllG4PovNhpDrOA9PNK4bD7+GS9nqsIpAYK6bQuWccc=; b=Xb0ipAaQ3Z2M3gxVEH5yZOoczxgLmya06QnIYfZhr3xnKDL7rrKttQVM5RDIeUXS9COPvz 6c4HLALjVikHZUeURhOF9zKNdFBxH31omonhXhhtWtH7z/gFePSCfDfQL8oh+k/gOD5WaE rB1TQeQntgsRx2Bh+l27ZTqf7oXRTwoffvmiuk9EJwgvY29m3s+3TW9a39Pg4rpZNSZTV9 5OIblBvFfjOgMIIPrpEcGQ65kxpx7IbFHlYg5jmJF9xtA/LGF4mLYRUx+zOeZoMbWiTJaK gcKGlgTbLuRsc1FLZRfntjre2XVQALxwD+w+/pLZFviHg9AAY4N26ISTeJ03pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701908424; a=rsa-sha256; cv=none; b=opInJGjUgP/Soz7619ownkFRvujShwLfVJwKGIalhIVV6MNJR3WcBFdro2rRmioWQAU+AK 2HAL9HQOmJzKI1cQq75cfgwtcn09oqXFl50XfjDHtDXtMh5bWAqEy8BN/BRPrNHgH/596z O21EcMCub+t6D83idSoaFCJiXj+uwSlecEqyw4qFMedkDqxb/q1Zywl7sOJH/DjwYHmlqo BfLxVkhnn23dz5/9id1zn2VzPjeJo5av+ej9vJ2zdgNPR1P8kbjiv6ZTJe51zmNNZdQhRU xMn6GzWC+r/jexw943hOLcfBSC7hj5Rmg7phD6lEG7YpW6KEWMgE9qZCLtNPow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wllG4PovNhpDrOA9PNK4bD7+GS9nqsIpAYK6bQuWccc=; b=xVe48YGas/29LeOHcHMY2mNOj9ftr2iyjJTMJMZN4PA2toWm0mejSYGtJV/dZmB9d+jzmp mh2bJr1EgRX3wUTyR6lEnKr5uToSnHxtZW+FB6FYwe7gb95IdLRM51jiDmEevjkfQej5jV aD21Jkto4rQgenr/xmcoF/XlhyZD58ju5gkfyMzySfnoCPdv7iNsQIlvuC8DfVpAcNOVEe Jkp7ltnDN43maSXea82TDCFfNErk7ue/sATK/Y3jgqMWE0wBel1AokVhb/DpV9XzvE6a1w s4zel6OIGLqlejBJ7QLnSPJEg4ZZizoGGNmSJzmx6Mp19oMlmWpOhWDfNsXt2A== 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 4Slw081Z9KzkV; Thu, 7 Dec 2023 00:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B70KOtH015829; Thu, 7 Dec 2023 00:20:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B70KOpT015826; Thu, 7 Dec 2023 00:20:24 GMT (envelope-from git) Date: Thu, 7 Dec 2023 00:20:24 GMT Message-Id: <202312070020.3B70KOpT015826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 165cc0eea9d1 - stable/14 - busdma: emit a warning for use of 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 165cc0eea9d1e35bc448e8b329ed1919fba6bcd3 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=165cc0eea9d1e35bc448e8b329ed1919fba6bcd3 commit 165cc0eea9d1e35bc448e8b329ed1919fba6bcd3 Author: Mitchell Horne AuthorDate: 2023-12-04 15:46:48 +0000 Commit: Mitchell Horne CommitDate: 2023-12-06 23:23:14 +0000 busdma: emit a warning for use of filters Filter functions are deprecated, and unused in the tree. If either of the filter or filterarg arguments to bus_dma_tag_create() are non-NULL, print a warning. This is a direct commit to stable/14. Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42897 --- sys/arm/arm/busdma_machdep.c | 4 ++++ sys/arm64/arm64/busdma_machdep.c | 4 ++++ sys/powerpc/powerpc/busdma_machdep.c | 4 ++++ sys/riscv/riscv/busdma_machdep.c | 4 ++++ sys/x86/x86/busdma_machdep.c | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c index 07a3da114441..8dd4f3bff23d 100644 --- a/sys/arm/arm/busdma_machdep.c +++ b/sys/arm/arm/busdma_machdep.c @@ -398,6 +398,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, /* Return a NULL tag on failure */ *dmat = NULL; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_BUSDMA, M_ZERO | M_NOWAIT); if (newtag == NULL) { diff --git a/sys/arm64/arm64/busdma_machdep.c b/sys/arm64/arm64/busdma_machdep.c index 14fd96ac919c..c1b710e3538d 100644 --- a/sys/arm64/arm64/busdma_machdep.c +++ b/sys/arm64/arm64/busdma_machdep.c @@ -161,6 +161,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index bffbfa94acac..873a67458dfc 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -168,6 +168,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, return (EINVAL); } + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + /* Return a NULL tag on failure */ *dmat = NULL; diff --git a/sys/riscv/riscv/busdma_machdep.c b/sys/riscv/riscv/busdma_machdep.c index 19cfd21edc6e..e8aca33a86c0 100644 --- a/sys/riscv/riscv/busdma_machdep.c +++ b/sys/riscv/riscv/busdma_machdep.c @@ -162,6 +162,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, diff --git a/sys/x86/x86/busdma_machdep.c b/sys/x86/x86/busdma_machdep.c index 0e72b09684cc..ee614548aea7 100644 --- a/sys/x86/x86/busdma_machdep.c +++ b/sys/x86/x86/busdma_machdep.c @@ -184,6 +184,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, From nobody Thu Dec 7 00:24:41 2023 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 4Slw556whjz53FQZ; Thu, 7 Dec 2023 00:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slw556Mplz4Lpf; Thu, 7 Dec 2023 00:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDjvHvWTpLg7sZX3cUGVkPy1sGpXWfWx32om4LN2pi4=; b=E1Yhzzhqp0fdVnEhJkLIdgNKUP2YpVoN2vPZ5hwTQrohBwxNd6TRZU//IOUbblqzwQWB0n ujRLEod3zUBEp/gRJ9yOXyQFlg6rZ7VVs4vidJMLhQ/WovMgVnUNG9zlr2sHER9rYQmT4e TycOVXLeZnXn3BY4l8VanOeuSLBsj/+VxYKghMJdmhrODBZUzfwoLcp16j2/ji32R3MeVL dzOG5K5vwJSZ2k4VBJGdMfGJtzuadrFpzTtoIzJU1ql8QepvdPhDGIIV9Xx3mhw51EOaNz ip42zdoIdfkWX+AScL7uerXDSdDW0Ii5mP6xOnCbYZOmxe7G37jg3+TZj8Fj1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701908681; a=rsa-sha256; cv=none; b=QVOnpmKHcl6hVJZ1r3jOyro0yl5Ro+8rkZbkv7vJtTbP9Y4GKfqVTPJbAsE0kNpV61gwM/ +6DWub0k5sNhfDV7VlEMmRiycI6n86joymBUJSZC0QWy6BGSVmSigKrA0hNfM/fJKuIo7/ UlXFeB11j7FciYwNi03FQylUfs3RQ//uYdixaWS+Ld/A+nZUKpE2tMZ7P9gL0kc8QcEJoP Ml4r6U1T++uemElVxNztx5doy6YOXpGivQ6G6yXFflAzQzkUgQMRpN38qul8c3ygu4drMx PKGfDq4iOctGucymKFGH443IA8uPjrVEk6vdu0UeVgjOgWL1TyMuK/ZHoGa3MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDjvHvWTpLg7sZX3cUGVkPy1sGpXWfWx32om4LN2pi4=; b=uQug7P3/L8Sb/bDIrGTYaFnA3B5Ci3bltfAb3TzCagIkrDjbtTd23MSYJZT0dia57kpFsD kGEAN8ZfbBiGeVtCprUPCdrLI6Y67X4/8tNv5hTiAVLiNdvj038G7BhaZd8V9W9q1uJxln flwW8e9bkCqfMLjlcQfWQdT6HITaD6TwZQVUm6b7P89ZtNLZlU67xtw2gId4QYnaME71eI lsyjQuiSPzILqf+DQhcZ0XMVHqEwTTzqE30iBpVFwQ3UNQr+yP8ILREdI/ihYIVHneHBcN Ub+8wo2df2N9bdqbWzN8nijYKJGZ8y2/KcDLFVUMAw4fR3DnsHMH00TLmz8fPw== 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 4Slw555QdqzcV; Thu, 7 Dec 2023 00:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B70Of26022749; Thu, 7 Dec 2023 00:24:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B70Ofmx022746; Thu, 7 Dec 2023 00:24:41 GMT (envelope-from git) Date: Thu, 7 Dec 2023 00:24:41 GMT Message-Id: <202312070024.3B70Ofmx022746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 7fd0973775aa - stable/13 - busdma: emit a warning for use of 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 7fd0973775aa9a293739afa0c5068f77ba88cb17 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7fd0973775aa9a293739afa0c5068f77ba88cb17 commit 7fd0973775aa9a293739afa0c5068f77ba88cb17 Author: Mitchell Horne AuthorDate: 2023-12-04 15:46:48 +0000 Commit: Mitchell Horne CommitDate: 2023-12-07 00:22:19 +0000 busdma: emit a warning for use of filters Filter functions are deprecated, and unused in the tree. If either of the filter or filterarg arguments to bus_dma_tag_create() are non-NULL, print a warning. This is a direct commit to stable/13. Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42897 --- sys/arm/arm/busdma_machdep.c | 4 ++++ sys/arm64/arm64/busdma_machdep.c | 4 ++++ sys/powerpc/powerpc/busdma_machdep.c | 4 ++++ sys/riscv/riscv/busdma_machdep.c | 4 ++++ sys/x86/x86/busdma_machdep.c | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c index 747bf4e7b5bd..9a3378141207 100644 --- a/sys/arm/arm/busdma_machdep.c +++ b/sys/arm/arm/busdma_machdep.c @@ -474,6 +474,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, /* Return a NULL tag on failure */ *dmat = NULL; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_BUSDMA, M_ZERO | M_NOWAIT); if (newtag == NULL) { diff --git a/sys/arm64/arm64/busdma_machdep.c b/sys/arm64/arm64/busdma_machdep.c index 44f186adb014..cd3864bf5d18 100644 --- a/sys/arm64/arm64/busdma_machdep.c +++ b/sys/arm64/arm64/busdma_machdep.c @@ -196,6 +196,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index 6b7463ad5aa0..710a90f1f1d8 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -239,6 +239,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, return (EINVAL); } + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + /* Return a NULL tag on failure */ *dmat = NULL; diff --git a/sys/riscv/riscv/busdma_machdep.c b/sys/riscv/riscv/busdma_machdep.c index 433f55f082a7..509a000d655d 100644 --- a/sys/riscv/riscv/busdma_machdep.c +++ b/sys/riscv/riscv/busdma_machdep.c @@ -197,6 +197,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, diff --git a/sys/x86/x86/busdma_machdep.c b/sys/x86/x86/busdma_machdep.c index 62e57022acf8..36b1894b9615 100644 --- a/sys/x86/x86/busdma_machdep.c +++ b/sys/x86/x86/busdma_machdep.c @@ -219,6 +219,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, From nobody Thu Dec 7 00:27:25 2023 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 4Slw8G20rVz53Fs9; Thu, 7 Dec 2023 00:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slw8G0vsfz4LpF; Thu, 7 Dec 2023 00:27:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kXQHZZRZL3+To3lBLvhdb9BVz5sSdGA1Yi3z7mJKzwY=; b=QTI7cAj47lhcW9GT6vSSstc9zAB0nt+y/xC0y31k/t0QM2MUDEKGzHrkT4nNGs6hbcV6e9 UaVS7PPcKbwYWIt//O94S50gagjIU3qQqi1Uwy4k7cWooWFy0G2roquPvVagyoVhZ8cDNP rvQbucK9Wx5KkVjO69NyNi2/acED2T2eLIL6D5rA9ANDMVQ9U0oXvCWzedWPCnzE41TPXq mH5BlecPEb2IaOhDH93rT9mBvraFn2PfrsL/d7frTMA5zOrLElA7YP3g6BKLaJ0x/omAf6 g22Lc+mJI6U2oLCIDdIQesZUeszGOGbFnpm7Oehod2dWApbZnwHsE77ON3lL/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701908846; a=rsa-sha256; cv=none; b=nRERygFUc0HFhCAtSqbNb0Fn+keWEvyO7Uf93NrV9u/9sW3QG93/cfZbDrZaeutebI2tv8 4P9UzL+0V9SlKTCyPDQJ34uBeu7AiBuwJXft7N1+zc8yCqsgRzMLJFxdVpEGCSSc0CfelH 04Njs11mbmk4+RJubzAs54RVUUQttg8T4JqGIraagCGLHHqjnIYHvV7taCe72OZc1ebCoW J68lvlHun1mLZPAs32EWCXIZDKfBnQt7xiA0LUCgM+xfLO8gC1wGrjvkrwytjmQVhBtH/U WGIVMwIa4/SFTnZPC5LZJcBLeiPa1HFJGey/DKRhbR4CbQyWpvuPGNNUXn1NoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kXQHZZRZL3+To3lBLvhdb9BVz5sSdGA1Yi3z7mJKzwY=; b=YFMNnXWezhc6vtKBX/WwLx0i/erxL9PnL06U/sBwo8fiwBBAWtiGU7Ko9dnhpUtSGPQY4H uipWmt/3LZfYDH6d7LX7W/aQ2eE8VMGbDxsIfJYPhz0LLC5BJccmK7GbLYuCj3L0FQ2UrW 48YmrWaU7lfLlEY58O+7yoTLLo61jT3REdeL6e+BkCvVVLr7e52DioWOlS4ZBaXo7y+/w0 VVjNHAUlvlKVcEZSvCyVzlB74HaP5V1hGnNdWWA4lmHPJvH5FXHmmW4BVvUBX8TRz6tzm+ FsWaGEHB42wrmqsPkUmUbvru9UnCA6B2iVVIAluBn1sd4ebBLOl5WqNtYJb7Nw== 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 4Slw8F6v5pz19F; Thu, 7 Dec 2023 00:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B70RPAw023299; Thu, 7 Dec 2023 00:27:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B70RPCc023297; Thu, 7 Dec 2023 00:27:25 GMT (envelope-from git) Date: Thu, 7 Dec 2023 00:27:25 GMT Message-Id: <202312070027.3B70RPCc023297@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: 8d0740e8b9dd - stable/14 - RTLD_DEEPBIND: make lookup not just symbolic, but walk all refobj' DAGs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 8d0740e8b9dd05513ef23e2dee7194f32551df13 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8d0740e8b9dd05513ef23e2dee7194f32551df13 commit 8d0740e8b9dd05513ef23e2dee7194f32551df13 Author: Konstantin Belousov AuthorDate: 2023-11-29 18:30:59 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-07 00:27:19 +0000 RTLD_DEEPBIND: make lookup not just symbolic, but walk all refobj' DAGs PR: 275393 (cherry picked from commit 9daf6cd0f46416d9c6eb0411ea6042cd42b8a9bc) --- libexec/rtld-elf/rtld.c | 8 ++++++-- libexec/rtld-elf/rtld.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index f8c4c18b5d5e..0bbd8104e11b 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3745,7 +3745,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, if (!obj->init_done) { /* We loaded something new and have to init something. */ if ((lo_flags & RTLD_LO_DEEPBIND) != 0) - obj->symbolic = true; + obj->deepbind = true; result = 0; if ((lo_flags & (RTLD_LO_EARLY | RTLD_LO_IGNSTLS)) == 0 && obj->static_tls && !allocate_tls_offset(obj)) { @@ -4571,7 +4571,8 @@ symlook_default(SymLook *req, const Obj_Entry *refobj) if (refobj->symbolic || req->defobj_out != NULL) donelist_check(&donelist, refobj); - symlook_global(req, &donelist); + if (!refobj->deepbind) + symlook_global(req, &donelist); /* Search all dlopened DAGs containing the referencing object. */ STAILQ_FOREACH(elm, &refobj->dldags, link) { @@ -4587,6 +4588,9 @@ symlook_default(SymLook *req, const Obj_Entry *refobj) } } + if (refobj->deepbind) + symlook_global(req, &donelist); + /* * Search the dynamic linker itself, and possibly resolve the * symbol from there. This is how the application links to diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 7fe9d837d6f1..c2676f59f32d 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -239,6 +239,7 @@ typedef struct Struct_Obj_Entry { bool ver_checked : 1; /* True if processed by rtld_verify_object_versions */ bool textrel : 1; /* True if there are relocations to text seg */ bool symbolic : 1; /* True if generated with "-Bsymbolic" */ + bool deepbind : 1; /* True if loaded with RTLD_DEEPBIND" */ bool bind_now : 1; /* True if all relocations should be made first */ bool traced : 1; /* Already printed in ldd trace output */ bool jmpslots_done : 1; /* Already have relocated the jump slots */ From nobody Thu Dec 7 00:28:00 2023 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 4Slw8w2cvlz53FgV; Thu, 7 Dec 2023 00:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slw8w24RBz4MDd; Thu, 7 Dec 2023 00:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1AMPLY95OHHkFZtOw7njGFJXxgV0Rl511tQt9vcaQn4=; b=RqprenHftpZTkY66D4yzt7/NZ9tUYATJtUAELJirmraZj/25vaUAdA2FLFljUo56QZjtzV y1L83cpSTzK3Oa0E5GJqsEIiSMHt3irX6iDBkWiYOwz8tglWIrIgnwPoad4DW+W7BG4yA9 pK32ZTPYZWY0SJVc60fs7mH2WYdv4XGm97CHhvflyLkeJgkFJ2BaKkAQrGBLim0rJnN1QU C16LpX0zkoNKGf5rZVKY8Gxxl2h6YjvbH9LF6CI0vynO9IkdhqU+3LuEa0uOlIaAOS1ca6 tQ3IvpLc0wlwvW6rtPl5oO1yLGLAaz8obrtiW8aYoDr3stays1+h+qVxFWpuhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701908880; a=rsa-sha256; cv=none; b=cYCBP+qAUyIiLqkuK7O5LmEOpiaQLmGuZOVm6t4/+ZvC/LGK0GAstlx0QuX8PQ1Mnh5/KV S3EMY20V/w5JYeUT8itRxUpqgT6cwOl6gwQtCLlf3WwzHqBw+mmuihuhaxsniBQNrQxv4J O4KJVEVWM0mNmy4PgcHXHqpo9taHEEerGEjcDGdYe3uHn3rAIDKd1zDsKn1hkBbh06Z+2v VAhhJJOTKf/QdsfIADrU9ixdAT7rM8MDLdr517vUfxiOIqwA0/dToPfzm7Lmh5laBrTIgD aos+Y3yS7BQ/6F6jXSTSWqASju4lnA7CjEDR9u1baVTgSTQkA5MAiGOC9fIXRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1AMPLY95OHHkFZtOw7njGFJXxgV0Rl511tQt9vcaQn4=; b=p9eOlLOPOsj+V3HJqz6Z4AOyq/Kt/2cGhuWnxAwvUKsYsCmAMyopeGZrimQScXLiWGlugA xYEMM88TtD+Sl05D/4gXx0fOGJIYsFv/V53ktpnqDY/dhBaLEP3hqEz8roVKiabUwuFK6X ToXcX2wMdFmNDVFpnyxXr9knakI62g9LiscaCZJoFMSwJeK/Sd2SgBAkvUWbh5ve12KpRo B8ZOIeY/ke+qnrnwz7Ju36KoXX691c2awnPPzODYQ9VM1nufIqzstvFEGvlXO6m5axySnF 6bBgIsegclGDodJXzPI0Yvn60Y9OzofuAzbn32/rLGfb+oTTI8hT7t6dEXbf2Q== 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 4Slw8w17LszlL; Thu, 7 Dec 2023 00:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B70S0B7023515; Thu, 7 Dec 2023 00:28:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B70S0Ut023512; Thu, 7 Dec 2023 00:28:00 GMT (envelope-from git) Date: Thu, 7 Dec 2023 00:28:00 GMT Message-Id: <202312070028.3B70S0Ut023512@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: 07fa8d431c0e - stable/13 - RTLD_DEEPBIND: make lookup not just symbolic, but walk all refobj' DAGs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 07fa8d431c0ea291a0e4b79a0bb81707d0b119e6 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=07fa8d431c0ea291a0e4b79a0bb81707d0b119e6 commit 07fa8d431c0ea291a0e4b79a0bb81707d0b119e6 Author: Konstantin Belousov AuthorDate: 2023-11-29 18:30:59 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-07 00:27:34 +0000 RTLD_DEEPBIND: make lookup not just symbolic, but walk all refobj' DAGs PR: 275393 (cherry picked from commit 9daf6cd0f46416d9c6eb0411ea6042cd42b8a9bc) --- libexec/rtld-elf/rtld.c | 8 ++++++-- libexec/rtld-elf/rtld.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index ac492b1071f0..218e984bdd88 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3789,7 +3789,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, if (!obj->init_done) { /* We loaded something new and have to init something. */ if ((lo_flags & RTLD_LO_DEEPBIND) != 0) - obj->symbolic = true; + obj->deepbind = true; result = 0; if ((lo_flags & (RTLD_LO_EARLY | RTLD_LO_IGNSTLS)) == 0 && obj->static_tls && !allocate_tls_offset(obj)) { @@ -4615,7 +4615,8 @@ symlook_default(SymLook *req, const Obj_Entry *refobj) if (refobj->symbolic || req->defobj_out != NULL) donelist_check(&donelist, refobj); - symlook_global(req, &donelist); + if (!refobj->deepbind) + symlook_global(req, &donelist); /* Search all dlopened DAGs containing the referencing object. */ STAILQ_FOREACH(elm, &refobj->dldags, link) { @@ -4631,6 +4632,9 @@ symlook_default(SymLook *req, const Obj_Entry *refobj) } } + if (refobj->deepbind) + symlook_global(req, &donelist); + /* * Search the dynamic linker itself, and possibly resolve the * symbol from there. This is how the application links to diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index e2fb3de470c3..3111e54a2e08 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -245,6 +245,7 @@ typedef struct Struct_Obj_Entry { bool ver_checked : 1; /* True if processed by rtld_verify_object_versions */ bool textrel : 1; /* True if there are relocations to text seg */ bool symbolic : 1; /* True if generated with "-Bsymbolic" */ + bool deepbind : 1; /* True if loaded with RTLD_DEEPBIND" */ bool bind_now : 1; /* True if all relocations should be made first */ bool traced : 1; /* Already printed in ldd trace output */ bool jmpslots_done : 1; /* Already have relocated the jump slots */ From nobody Thu Dec 7 00:46:40 2023 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 4SlwbB3Jr4z53Gtc; Thu, 7 Dec 2023 00:47:18 +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 4Slwb913cDz4Ngc; Thu, 7 Dec 2023 00:47:17 +0000 (UTC) (envelope-from sjg@juniper.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=juniper.net header.s=PPS1017 header.b=W9oDFjo7; dkim=pass header.d=juniper.net header.s=selector1 header.b=j7jscoX2; spf=pass (mx1.freebsd.org: domain of sjg@juniper.net designates 67.231.152.164 as permitted sender) smtp.mailfrom=sjg@juniper.net; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=reject) header.from=juniper.net Received: from pps.filterd (m0108162.ppops.net [127.0.0.1]) by mx0b-00273201.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3B6KX8qt028612; Wed, 6 Dec 2023 16:47:15 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h=to : cc : subject : in-reply-to : references : from : mime-version : content-type : content-transfer-encoding : date : message-id; s=PPS1017; bh=Ku+1KZue9H2UvyWyE5PGwKkSZ5WGVVsqrAId8XjeBjM=; b=W9oDFjo7urTb1e1a8+2+dm1B/JUav96dVaieHXEGTJfswFt0Zb+sViTtPStsJmu/n39F X94GpCt2KQSpc44KnRWq5i5+QTLCGTjDL8W6wTL0ACUw2NXUYB1R4zG7EYWdZ6MS8SVv 8RGUP3faHAZjeRzTo4hH3oG+WTYb548j0ae6V91XtLx0KStXr8i613JGXnR7scmpOwQZ cjdJjJvdqSj75hMvm0E3BK8r+SYEWVBd4dNbBShCXgwjMVhTpY47n963BoZ3mUpY/tur E9NjubzWS0OwHRIPJmWuxUZAXnGL07GyOOAvS/gmSy590Fc42i1YpFmr7rKpFFz3a/7s Ug== Received: from co1pr02cu001.outbound.protection.outlook.com (mail-westus2azlp17011017.outbound.protection.outlook.com [40.93.10.17]) by mx0b-00273201.pphosted.com (PPS) with ESMTPS id 3uu039gn5d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Dec 2023 16:47:15 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BpTraGiBWNWnbBSZZ687ZQU1KAWywJq0gXNGJbotBEH8/c9RVyDqdkVAyvb/f1HqXOgXrPVv+XOg0PLOsLr7fBJe2yvdgLhxql0MrdG/pYqpe5dpXEzEOZ6UFRdASYnZhkYQ8j//RGOWuq5XFEtFwUGBpXUOSsafvnpzmjYVXMFONiwQ+he1LYpGQm1aZdbESvsltX40Oveo8xynrmO/tkRvHC4PQ8uOlFofrGEmFwcqKb8vISuNbmMrwNFnEswjJIRGgbP+B11pvhX2CT9k5DzqgcH9OlKVzD0JAxJ7uzQGkeF7t+K5G7H8u1GgEFHg0/X+qne9vnJ8RbNnQRx2gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=Ku+1KZue9H2UvyWyE5PGwKkSZ5WGVVsqrAId8XjeBjM=; b=SY2AbFkkppYePvgUD4XC/TgNKo+XoRnhkI6dhfKiZngd0UyUfkpO1BcpCIZojzk/vjg2dQpEzRva20xDeLa/QdL373iscE8sOiqhgyTUpGqKtKG6rInhZgMbQfUP5GeuToBu085brYa2AukuD9FOWCC5bWPTAFkvUZyRF7u/lM0xl9xi0BbFrDcoYkZ/p+081uQo0kSrSQfO62TiQYCq6D2Ftdf88FG9a0ggvjG3RfVinIpCbsb3vnhJkl8IXgQYH0TRJhv4TogpcsoeRW5D2iGa3V70MTaCup8D8Glqm0nV/XeOrfNmHQ1/7quppIQcuzGT1ycVuihLzwW7cCorYg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 66.129.242.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=Ku+1KZue9H2UvyWyE5PGwKkSZ5WGVVsqrAId8XjeBjM=; b=j7jscoX2av6uonNxylSumbzvg1jmX1MaaW7JHLmRvrQYUylZM16AwcRkXvJZct1N6WnxyjqQ2Fp4tgbnFjKiZKM8BQs4weImfkFz1pieOy87SjQnLwCDIhC+4vkvyD/lOfWL+OPPecOhE0dmEq3zyZNIK7Ow2MTuD4QbxoxSvL0= Received: from DM6PR02CA0064.namprd02.prod.outlook.com (2603:10b6:5:177::41) by SA1PR05MB8178.namprd05.prod.outlook.com (2603:10b6:806:1b5::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.25; Thu, 7 Dec 2023 00:47:10 +0000 Received: from DM6NAM12FT042.eop-nam12.prod.protection.outlook.com (2603:10b6:5:177:cafe::b) by DM6PR02CA0064.outlook.office365.com (2603:10b6:5:177::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.32 via Frontend Transport; Thu, 7 Dec 2023 00:47:09 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 66.129.242.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.242.14 as permitted sender) Received: from p-exchfe-eqx-01.jnpr.net (66.129.242.14) by DM6NAM12FT042.mail.protection.outlook.com (10.13.178.129) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.13 via Frontend Transport; Thu, 7 Dec 2023 00:47:09 +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.1118.39; Wed, 6 Dec 2023 18:47:09 -0600 Received: from p-mailhub01.juniper.net (10.104.20.6) by p-exchbe-eqx-02.jnpr.net (10.104.9.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39 via Frontend Transport; Wed, 6 Dec 2023 18:47:09 -0600 Received: from kaos.jnpr.net (kaos.jnpr.net [172.23.255.201]) by p-mailhub01.juniper.net (8.14.4/8.11.3) with ESMTP id 3B70l8kZ025461; Wed, 6 Dec 2023 16:47:08 -0800 (envelope-from sjg@juniper.net) Received: by kaos.jnpr.net (Postfix, from userid 1377) id 1BEE54D2F8; Wed, 6 Dec 2023 16:46:40 -0800 (PST) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id 1B60B4D4D0; Wed, 6 Dec 2023 16:46:40 -0800 (PST) To: Jessica Clarke CC: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Subject: Re: git: 0c3627f44d49 - main - bsdinstall avoid subdir depending on parent In-Reply-To: <107720F5-1196-4E6C-AABE-48285D7B18B2@freebsd.org> References: <202304210501.33L51PBT011707@gitrepo.freebsd.org> <09DDC25F-63F8-440A-A674-31F190C087B4@freebsd.org> <107720F5-1196-4E6C-AABE-48285D7B18B2@freebsd.org> Comments: In-reply-to: Jessica Clarke message dated "Tue, 05 Dec 2023 22:39:18 +0000." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.8; GNU Emacs 28.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Date: Wed, 6 Dec 2023 16:46:40 -0800 Message-ID: <69192.1701910000@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM12FT042:EE_|SA1PR05MB8178:EE_ X-MS-Office365-Filtering-Correlation-Id: dfbfeb87-14b1-49d1-5c10-08dbf6be0b59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QCS74Ysvd1HHjQ9E16f+yIPDn65uLCpzVzypTZ+m5QgxbZZBg/R3dw6FBTAx8KyrirRrBK1PI5L6RfY3ougoGnI2hqBbfc2WGBWcZR8VueMhOldbAqRURjPBWNIGgFD7ltgiIBrkaRalWHrs2r0e/c/tjIMhxMo9DUvP6OxeawQKblddQZ+2lrlx5kjhtj567cSHCjzZBzGbZ/zwuQk5JZwkAycVkiNYEkVYYBQ0TlRP1cFMF9jfjdHQQPC2nQWSqd5LPFNC5iMVZT0P0EGQDNjqhcziwkrOauDqhfT6jYGJAVUHVFtoiH+IOTl8P1VYtqoyimBmlIkG5CMFfiaSEWSJ0DY+US27otgtXMbSFQSsMPQa01iZ/DUuIhid0EXXpbFq77nqt3I/Mq6dXZfk1gInCnqmUbHKlyBkrPR74Qca+y83SmDB28z4bCPyUD5lZmCgl2AB5C3zwYhAcNPsTDsLe3J1pPyK5hFU96On/C9a4/ZxSWWchp/ZlpFnYeUiqFyuBod0xQUl6eeAvHARQZRfd+DHhizwiOef89e7tjmrnI17wazdcviELYR4H1+kWddQJfmHC+j6XRcn3x5n8t7u33B+1NE/tAPEhmu4MUccpHpxKPsf/A/gwA1Kdm96tBf2iPgrP/hzE/8cBOfd816Ohi8d5QkF5kRr5z8ysZRGtDeHL4uCU4zUIip3vtsMK6mEZkSQKV82+SGqvzQDOPjFZkfi+mDkKzSj9pHaM7vPkIsXUy5H91TIB00mc4GCdy59k1Bkykho89Lsm5EGL36L3y3gZewNOTFlvnMy0ippPFnnn2HnIlANyWvEc/u3 X-Forefront-Antispam-Report: CIP:66.129.242.14;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:p-exchfe-eqx-01.jnpr.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(136003)(376002)(39860400002)(346002)(396003)(230922051799003)(186009)(451199024)(1800799012)(82310400011)(64100799003)(36840700001)(40470700004)(46966006)(40460700003)(316002)(54906003)(450100002)(86362001)(8936002)(8676002)(6916009)(4326008)(966005)(478600001)(70586007)(70206006)(41300700001)(2906002)(47076005)(81166007)(36860700001)(356005)(9686003)(26005)(7126003)(107886003)(53546011)(83380400001)(7696005)(82740400003)(5660300002)(336012)(6266002)(40480700001)(84970400001)(55016003)(36900700001);DIR:OUT;SFP:1102; X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2023 00:47:09.6744 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dfbfeb87-14b1-49d1-5c10-08dbf6be0b59 X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.242.14];Helo=[p-exchfe-eqx-01.jnpr.net] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM12FT042.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR05MB8178 X-Proofpoint-GUID: 9n1o-Kb1WxvPqfhV2G8vH20ui-voFqhn X-Proofpoint-ORIG-GUID: 9n1o-Kb1WxvPqfhV2G8vH20ui-voFqhn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-06_22,2023-12-06_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 malwarescore=0 priorityscore=1501 suspectscore=0 spamscore=0 mlxlogscore=999 clxscore=1011 impostorscore=0 phishscore=0 lowpriorityscore=0 mlxscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312070005 X-Spamd-Result: default: False [-5.10 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[juniper.net,reject]; R_DKIM_ALLOW(-0.20)[juniper.net:s=PPS1017,juniper.net:s=selector1]; R_SPF_ALLOW(-0.20)[+ip4:67.231.152.164]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[67.231.152.164:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:22843, ipnet:67.231.152.0/24, country:US]; RCVD_IN_DNSWL_NONE(0.00)[40.93.10.17:received]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; REDIRECTOR_URL(0.00)[urldefense.com]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[sjg]; DKIM_TRACE(0.00)[juniper.net:+]; TO_DN_SOME(0.00)[]; RCVD_COUNT_SEVEN(0.00)[10]; RCPT_COUNT_FIVE(0.00)[5]; TO_DN_EQ_ADDR_SOME(0.00)[] X-Rspamd-Queue-Id: 4Slwb913cDz4Ngc X-Spamd-Bar: ----- Jessica Clarke wrote: > On 21 Apr 2023, at 06:14, Jessica Clarke wrote: Sorry, I didn't your mail back in April. I can move the generation of the header to its own subdir. Does usr.sbin/bsdinstall/osname sound reasonable? other common options would include gen/ include/ inc/ ? > > On 21 Apr 2023, at 06:01, Simon J. Gerraty wrote: > >> > >> The branch main has been updated by sjg: > >> > >> URL: https://urldefense.com/v3/__https://cgit.FreeBSD.org/src/commit/?= id=3D0c3627f44d49b460d5b9156145dec9d4a91beb2c__;!!NEt6yMaO-gk!CduM38y2LXW3s= nhYZYZdtUNWv4VGMwaMwEOIOUMDYGZMRJwin7i46yHWwp5pG_pq3GGTzT-7Czg7AA$ > >> > >> commit 0c3627f44d49b460d5b9156145dec9d4a91beb2c > >> Author: Simon J. Gerraty > >> AuthorDate: 2023-04-21 05:00:40 +0000 > >> Commit: Simon J. Gerraty > >> CommitDate: 2023-04-21 05:00:40 +0000 > >> > >> bsdinstall avoid subdir depending on parent > >> > >> When not doing tree walks, it is bad for sub-dirs to depend on > >> parents. Move the generation of opt_osname.h to distextract > >> and have others that need that depend on it. > >> > >> In usr.sbin/bsdinstall use SUBDIR_DEPEND_ so tree walking still work= s. > >> > >> Reviewed by: obrien > >> Differential Revision: https://urldefense.com/v3/__https://reviews.= freebsd.org/D39742__;!!NEt6yMaO-gk!CduM38y2LXW3snhYZYZdtUNWv4VGMwaMwEOIOUMD= YGZMRJwin7i46yHWwp5pG_pq3GGTzT_oIs2qhw$ > >> --- > >> usr.sbin/bsdinstall/Makefile | 9 ++------- > >> usr.sbin/bsdinstall/distextract/Makefile | 11 ++++++++++- > >> usr.sbin/bsdinstall/distfetch/Makefile | 2 +- > >> usr.sbin/bsdinstall/partedit/Makefile | 2 +- > >> 4 files changed, 14 insertions(+), 10 deletions(-) > >> > >> diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefi= le > >> index e71cae726536..aaa006694222 100644 > >> --- a/usr.sbin/bsdinstall/Makefile > >> +++ b/usr.sbin/bsdinstall/Makefile > >> @@ -3,19 +3,14 @@ > >> OSNAME?=3D FreeBSD > >> SUBDIR=3D distextract distfetch partedit runconsoles scripts > >> SUBDIR_PARALLEL=3D > >> +SUBDIR_DEPEND_distfetch =3D distextract > >> +SUBDIR_DEPEND_partedit =3D distextract > >> SCRIPTS=3D bsdinstall > >> MAN=3D bsdinstall.8 > >> PACKAGE=3D bsdinstall > >> -GENHDRS=3D opt_osname.h > >> -SRCS+=3D ${GENHDRS} > >> -CLEANFILES+=3D ${GENHDRS} > >> > >> SCRIPTS+=3D startbsdinstall > >> SCRIPTSDIR_startbsdinstall=3D ${LIBEXECDIR}/bsdinstall > >> > >> -opt_osname.h: .PHONY > >> - if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \ > >> - echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ > >> - fi > >> > >> .include > >> diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdin= stall/distextract/Makefile > >> index 6ae9bb65e8fb..0292c01e78f4 100644 > >> --- a/usr.sbin/bsdinstall/distextract/Makefile > >> +++ b/usr.sbin/bsdinstall/distextract/Makefile > >> @@ -2,9 +2,18 @@ > >> > >> BINDIR=3D ${LIBEXECDIR}/bsdinstall > >> PROG=3D distextract > >> -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. > >> +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I. > >> LIBADD=3D archive bsddialog m > >> +SRCS=3D distextract.c > >> > >> MAN=3D > >> +GENHDRS=3D opt_osname.h > >> +SRCS+=3D ${GENHDRS} > >> +CLEANFILES+=3D ${GENHDRS} > >> + > >> +opt_osname.h: .PHONY > >> + if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \ > >> + echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ > >> + fi > >> > >> .include > >> diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinst= all/distfetch/Makefile > >> index 0104df0e3aec..1555719dd15d 100644 > >> --- a/usr.sbin/bsdinstall/distfetch/Makefile > >> +++ b/usr.sbin/bsdinstall/distfetch/Makefile > >> @@ -2,7 +2,7 @@ > >> > >> BINDIR=3D ${LIBEXECDIR}/bsdinstall > >> PROG=3D distfetch > >> -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. > >> +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextr= act > >> LIBADD=3D fetch bsddialog > >> > >> MAN=3D > >> diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinsta= ll/partedit/Makefile > >> index 96c4ddb53961..df17028eab2a 100644 > >> --- a/usr.sbin/bsdinstall/partedit/Makefile > >> +++ b/usr.sbin/bsdinstall/partedit/Makefile > >> @@ -5,7 +5,7 @@ PROG=3D partedit > >> LINKS=3D ${BINDIR}/partedit ${BINDIR}/autopart \ > >> ${BINDIR}/partedit ${BINDIR}/scriptedpart > >> SYMLINKS=3D ../libexec/bsdinstall/partedit /usr/sbin/sade > >> -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. > >> +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextr= act > > > > Surely this is a sign that this is a worse solution? The header isn=E2= =80=99t a > > part of distextract any more than partedit, so this is entirely > > arbitrary. It also blocks the ability to do the subdirectories in > > parallel with each other. > > > > I would much rather this reverted; this feels like a regression to me, > > with the only justification being that it =E2=80=9Cis bad=E2=80=9D, acc= ording to your > > commit message, but so is this, and I would argue it=E2=80=99s worse. > > > > Or go put it in its own common directory. >=20 > This was never addressed. Moreover, the current code is in fact broken; > OSNAME is not defined within distextract=E2=80=99s Makefile, only the par= ent=E2=80=99s, > so opt_osname.h ends up with #define OSNAME "" in it. I guess I=E2=80=99m= the > first to notice that the top left of the screen says " Installer" > during 14.0=E2=80=99s distextract. >=20 > I am therefore once again asking for this commit to be reverted, but > this time because it doesn=E2=80=99t work, not just because I disagree wi= th the > design. From nobody Thu Dec 7 01:04:10 2023 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 4Slwyx1fvqz53JCX for ; Thu, 7 Dec 2023 01:04:25 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slwyv6fY2z4Swg for ; Thu, 7 Dec 2023 01:04:23 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3332ad5b3e3so381578f8f.2 for ; Wed, 06 Dec 2023 17:04:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701911062; x=1702515862; 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=c8loRZwMEjJLiPdBj0fp4nf2weHJgOfaIoz27tyZDKg=; b=VmhikZ9sLFJ0Aymxd8LoEH/9yFoCc4D99GvaMr6pah+YDY5qy7l3mYmA6hPvC6LcYS 8DFFPCCXfG977kSy8wcl8W/fh25r8OMS7WhDje64oac0R/DDXKEherIesHtSpVMHe9wt M4uk7+mDpAoasnIKEGi5cih5cY6CXHGhbv6ba6xBDjZFqamkOVhzBirpsKfKmxUE+lV4 daT883bCsATbYpNg78n5qrI8rjGXmEAA5Xyl0xr4+zVT0c1METf+Jzxhfo2SH0owcbfY 3KATmArFdY584IqMBDp/l7wIapVQrUBBAmHWOKIC9MSbX4RIoS8Tnrcup7KDlFxYAtWV Q7vg== X-Gm-Message-State: AOJu0Yzek/FGS77HZhbfEEbziIuS40JIetiSaXe8/O4ZBzHoaQgpVDaB ZmJ4CZqr8wzXe85xKHQkM+LNOQ== X-Google-Smtp-Source: AGHT+IE6o1RfG4Bn6aOytM4ejmzlqrEjEp8Y0nxu1QR2GcdUNpHV+l2kONvueJVtbWWQB1XNUHhZng== X-Received: by 2002:a5d:570f:0:b0:333:533d:9ce2 with SMTP id a15-20020a5d570f000000b00333533d9ce2mr1192586wrv.82.1701911061283; Wed, 06 Dec 2023 17:04:21 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id dd15-20020a0560001e8f00b00333590f3bf9sm93191wrb.19.2023.12.06.17.04.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Dec 2023 17:04:20 -0800 (PST) Content-Type: text/plain; charset=utf-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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 0c3627f44d49 - main - bsdinstall avoid subdir depending on parent From: Jessica Clarke In-Reply-To: <69192.1701910000@kaos.jnpr.net> Date: Thu, 7 Dec 2023 01:04:10 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <86F10ECA-6011-4F3C-A287-3DB076B9C935@freebsd.org> References: <202304210501.33L51PBT011707@gitrepo.freebsd.org> <09DDC25F-63F8-440A-A674-31F190C087B4@freebsd.org> <107720F5-1196-4E6C-AABE-48285D7B18B2@freebsd.org> <69192.1701910000@kaos.jnpr.net> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Slwyv6fY2z4Swg On 7 Dec 2023, at 00:46, Simon J. Gerraty wrote: >=20 > Jessica Clarke wrote: >> On 21 Apr 2023, at 06:14, Jessica Clarke wrote: >=20 > Sorry, I didn't your mail back in April. >=20 > I can move the generation of the header to its own subdir. > Does usr.sbin/bsdinstall/osname sound reasonable? > other common options would include gen/ include/ inc/ ? include sounds ok to me. osname seems a bit too specific. Thanks, Jess >>> On 21 Apr 2023, at 06:01, Simon J. Gerraty wrote: >>>>=20 >>>> The branch main has been updated by sjg: >>>>=20 >>>> URL: = https://urldefense.com/v3/__https://cgit.FreeBSD.org/src/commit/?id=3D0c36= 27f44d49b460d5b9156145dec9d4a91beb2c__;!!NEt6yMaO-gk!CduM38y2LXW3snhYZYZdt= UNWv4VGMwaMwEOIOUMDYGZMRJwin7i46yHWwp5pG_pq3GGTzT-7Czg7AA$ >>>>=20 >>>> commit 0c3627f44d49b460d5b9156145dec9d4a91beb2c >>>> Author: Simon J. Gerraty >>>> AuthorDate: 2023-04-21 05:00:40 +0000 >>>> Commit: Simon J. Gerraty >>>> CommitDate: 2023-04-21 05:00:40 +0000 >>>>=20 >>>> bsdinstall avoid subdir depending on parent >>>>=20 >>>> When not doing tree walks, it is bad for sub-dirs to depend on >>>> parents. Move the generation of opt_osname.h to distextract >>>> and have others that need that depend on it. >>>>=20 >>>> In usr.sbin/bsdinstall use SUBDIR_DEPEND_ so tree walking still = works. >>>>=20 >>>> Reviewed by: obrien >>>> Differential Revision: = https://urldefense.com/v3/__https://reviews.freebsd.org/D39742__;!!NEt6yMa= O-gk!CduM38y2LXW3snhYZYZdtUNWv4VGMwaMwEOIOUMDYGZMRJwin7i46yHWwp5pG_pq3GGTz= T_oIs2qhw$ >>>> --- >>>> usr.sbin/bsdinstall/Makefile | 9 ++------- >>>> usr.sbin/bsdinstall/distextract/Makefile | 11 ++++++++++- >>>> usr.sbin/bsdinstall/distfetch/Makefile | 2 +- >>>> usr.sbin/bsdinstall/partedit/Makefile | 2 +- >>>> 4 files changed, 14 insertions(+), 10 deletions(-) >>>>=20 >>>> diff --git a/usr.sbin/bsdinstall/Makefile = b/usr.sbin/bsdinstall/Makefile >>>> index e71cae726536..aaa006694222 100644 >>>> --- a/usr.sbin/bsdinstall/Makefile >>>> +++ b/usr.sbin/bsdinstall/Makefile >>>> @@ -3,19 +3,14 @@ >>>> OSNAME?=3D FreeBSD >>>> SUBDIR=3D distextract distfetch partedit runconsoles scripts >>>> SUBDIR_PARALLEL=3D >>>> +SUBDIR_DEPEND_distfetch =3D distextract >>>> +SUBDIR_DEPEND_partedit =3D distextract >>>> SCRIPTS=3D bsdinstall >>>> MAN=3D bsdinstall.8 >>>> PACKAGE=3D bsdinstall >>>> -GENHDRS=3D opt_osname.h >>>> -SRCS+=3D ${GENHDRS} >>>> -CLEANFILES+=3D ${GENHDRS} >>>>=20 >>>> SCRIPTS+=3D startbsdinstall >>>> SCRIPTSDIR_startbsdinstall=3D ${LIBEXECDIR}/bsdinstall >>>>=20 >>>> -opt_osname.h: .PHONY >>>> - if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \ >>>> - echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ >>>> - fi >>>>=20 >>>> .include >>>> diff --git a/usr.sbin/bsdinstall/distextract/Makefile = b/usr.sbin/bsdinstall/distextract/Makefile >>>> index 6ae9bb65e8fb..0292c01e78f4 100644 >>>> --- a/usr.sbin/bsdinstall/distextract/Makefile >>>> +++ b/usr.sbin/bsdinstall/distextract/Makefile >>>> @@ -2,9 +2,18 @@ >>>>=20 >>>> BINDIR=3D ${LIBEXECDIR}/bsdinstall >>>> PROG=3D distextract >>>> -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. >>>> +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I. >>>> LIBADD=3D archive bsddialog m >>>> +SRCS=3D distextract.c >>>>=20 >>>> MAN=3D >>>> +GENHDRS=3D opt_osname.h >>>> +SRCS+=3D ${GENHDRS} >>>> +CLEANFILES+=3D ${GENHDRS} >>>> + >>>> +opt_osname.h: .PHONY >>>> + if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \ >>>> + echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ >>>> + fi >>>>=20 >>>> .include >>>> diff --git a/usr.sbin/bsdinstall/distfetch/Makefile = b/usr.sbin/bsdinstall/distfetch/Makefile >>>> index 0104df0e3aec..1555719dd15d 100644 >>>> --- a/usr.sbin/bsdinstall/distfetch/Makefile >>>> +++ b/usr.sbin/bsdinstall/distfetch/Makefile >>>> @@ -2,7 +2,7 @@ >>>>=20 >>>> BINDIR=3D ${LIBEXECDIR}/bsdinstall >>>> PROG=3D distfetch >>>> -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. >>>> +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib = -I${.OBJDIR}/../distextract >>>> LIBADD=3D fetch bsddialog >>>>=20 >>>> MAN=3D >>>> diff --git a/usr.sbin/bsdinstall/partedit/Makefile = b/usr.sbin/bsdinstall/partedit/Makefile >>>> index 96c4ddb53961..df17028eab2a 100644 >>>> --- a/usr.sbin/bsdinstall/partedit/Makefile >>>> +++ b/usr.sbin/bsdinstall/partedit/Makefile >>>> @@ -5,7 +5,7 @@ PROG=3D partedit >>>> LINKS=3D ${BINDIR}/partedit ${BINDIR}/autopart \ >>>> ${BINDIR}/partedit ${BINDIR}/scriptedpart >>>> SYMLINKS=3D ../libexec/bsdinstall/partedit /usr/sbin/sade >>>> -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. >>>> +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib = -I${.OBJDIR}/../distextract >>>=20 >>> Surely this is a sign that this is a worse solution? The header = isn=E2=80=99t a >>> part of distextract any more than partedit, so this is entirely >>> arbitrary. It also blocks the ability to do the subdirectories in >>> parallel with each other. >=20 >>>=20 >>> I would much rather this reverted; this feels like a regression to = me, >>> with the only justification being that it =E2=80=9Cis bad=E2=80=9D, = according to your >>> commit message, but so is this, and I would argue it=E2=80=99s = worse. >>>=20 >>> Or go put it in its own common directory. >>=20 >> This was never addressed. Moreover, the current code is in fact = broken; >> OSNAME is not defined within distextract=E2=80=99s Makefile, only the = parent=E2=80=99s, >> so opt_osname.h ends up with #define OSNAME "" in it. I guess I=E2=80=99= m the >> first to notice that the top left of the screen says " Installer" >> during 14.0=E2=80=99s distextract. >>=20 >> I am therefore once again asking for this commit to be reverted, but >> this time because it doesn=E2=80=99t work, not just because I = disagree with the >> design. From nobody Thu Dec 7 01:20:50 2023 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 4SlxLX2Bnpz53KbK; Thu, 7 Dec 2023 01:21:24 +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 4SlxLX1nSGz4VLx; Thu, 7 Dec 2023 01:21:24 +0000 (UTC) (envelope-from sjg@juniper.net) Authentication-Results: mx1.freebsd.org; none Received: from pps.filterd (m0108160.ppops.net [127.0.0.1]) by mx0b-00273201.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3B6GcwE2017588; Wed, 6 Dec 2023 17:21:23 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h=to : cc : subject : in-reply-to : references : from : mime-version : content-type : content-id : date : message-id; s=PPS1017; bh=jQFFpow6ZuqO63OIAPYNlGbigrn06ZMuVJZr7el1m8o=; b=MME+TBTp69divGujji9jnkUZKdlzd+tPuXGUNc3JPq13dXuRPZ284bDSpnlJkNyZzTw2 HGXAPjg8MlJYF/higskKv9u5iskAFoa9qgkaRj77FbLpc3fXYVw3eDKlq1AJ2YTrRm3+ L7WyDTm7duQBwmltFDxHNT/Uo5bfInfP6d6mbhmHLaoKy6DsD+LJgwS5XeTZSoFb8Nsc KDS5BOPJkA1cWbwsj+1PT/EPiLp5C+fyfaRSQFTuYgNaZ6dDxhGzkvHYt9ZQFyDnxfhk v5QEcBlguw5/7fVqeIUhxC68p2IQp7UQMflfVmULuo3HHlvO9/rQgqYajpba+mUzyEGm kw== Received: from dm4pr02cu002.outbound.protection.outlook.com (mail-centralusazlp17013023.outbound.protection.outlook.com [40.93.13.23]) by mx0b-00273201.pphosted.com (PPS) with ESMTPS id 3utvnghetc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Dec 2023 17:21:23 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JBU6qC56RKb8v0GmVuLuj6JM0u2m1T8fB9FTkBWZQR92PWNiyGdyIG6LSBlezZYJyCoMH8iCRFcqwAgzAEQ29x/Vkl6g/75fyq1YqRyXI1yphGpfwlGW20y+un2QZ3y8Jheo8pb7Kzot+g24MCEeaqqrLbxg2WJCODPfi9W83aXvw38v+mE4cuqy24aiWtBzbwq50Vfcdb2EOPoFlwyxles2vlCz0WBMuzfqDQ6W8whUBSJdsDVrJxHGPkXhdmcHxgpQidVJ8ATQIHJjDg2pR+kWfX2sCsUthmxgxaIaxkji/tqaW0P0h8bAzcC+jJaLVk9n/YP9foAA70Y1XN7alg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=jQFFpow6ZuqO63OIAPYNlGbigrn06ZMuVJZr7el1m8o=; b=KFPybYurOcptSllBWC5RsQgAWOGtnxoSTsqvwiCzj/Lz1RkLK9XtwxRfMKcEYcEO3PqSbLyZu5wF+UoA4mT1LJcrysM3cQhYz7jLd58t26ZxYdcHmLPYg3OMo0x6dqt0DwxzBHwb+WxbEh3Ztai+Z4BqjnMwk3BbkkX/SzdVAhzTy12EWXDZ8C6Mawb5QkKD2ZzQ9tdsgmH5ezVnMsq45T0YHKs1roFDcV63wnFts7ltfj48uvotnxaRswf8S/VzOCjta6KVZXO/uYU+QaQY72URJ/i9/3vifq6hrD+f4Yod3sJf6kFUS4E7810ZN2VTIDq8yNmA+nsvGkpOcMQYDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 66.129.242.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=jQFFpow6ZuqO63OIAPYNlGbigrn06ZMuVJZr7el1m8o=; b=iYX6mUPx87Cgl/0XMfbksTZGjvchFl9SaQGWKZ4jB3fs0xFzzBcNsTBELOz6cVdwgDoygAJMoFfPnfgwjHu180RcLwLEOVikeHLil0Jrgj4Kw5omccbP50qXNLnKYYIAznxh4/OC+242J5qOtVsJUHIQQyxUGVlJtG5h5L98HW8= Received: from BN8PR03CA0016.namprd03.prod.outlook.com (2603:10b6:408:94::29) by SA0PR05MB7836.namprd05.prod.outlook.com (2603:10b6:806:132::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.36; Thu, 7 Dec 2023 01:21:21 +0000 Received: from BN8NAM12FT061.eop-nam12.prod.protection.outlook.com (2603:10b6:408:94:cafe::d) by BN8PR03CA0016.outlook.office365.com (2603:10b6:408:94::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34 via Frontend Transport; Thu, 7 Dec 2023 01:21:21 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 66.129.242.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.242.14 as permitted sender) Received: from p-exchfe-eqx-01.jnpr.net (66.129.242.14) by BN8NAM12FT061.mail.protection.outlook.com (10.13.182.175) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.6 via Frontend Transport; Thu, 7 Dec 2023 01:21:20 +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.1118.39; Wed, 6 Dec 2023 19:21:19 -0600 Received: from p-exchbe-eqx-02.jnpr.net (10.104.9.15) by p-exchbe-eqx-02.jnpr.net (10.104.9.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Wed, 6 Dec 2023 19:21:19 -0600 Received: from p-mailhub01.juniper.net (10.104.20.6) by p-exchbe-eqx-02.jnpr.net (10.104.9.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39 via Frontend Transport; Wed, 6 Dec 2023 19:21:19 -0600 Received: from kaos.jnpr.net (kaos.jnpr.net [172.23.255.201]) by p-mailhub01.juniper.net (8.14.4/8.11.3) with ESMTP id 3B71LJ0K002447; Wed, 6 Dec 2023 17:21:19 -0800 (envelope-from sjg@juniper.net) Received: by kaos.jnpr.net (Postfix, from userid 1377) id AAF074D681; Wed, 6 Dec 2023 17:20:50 -0800 (PST) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id AA6A94D27B; Wed, 6 Dec 2023 17:20:50 -0800 (PST) To: Jessica Clarke CC: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Subject: Re: git: 0c3627f44d49 - main - bsdinstall avoid subdir depending on parent In-Reply-To: <86F10ECA-6011-4F3C-A287-3DB076B9C935@freebsd.org> References: <202304210501.33L51PBT011707@gitrepo.freebsd.org> <09DDC25F-63F8-440A-A674-31F190C087B4@freebsd.org> <107720F5-1196-4E6C-AABE-48285D7B18B2@freebsd.org> <69192.1701910000@kaos.jnpr.net> <86F10ECA-6011-4F3C-A287-3DB076B9C935@freebsd.org> Comments: In-reply-to: Jessica Clarke message dated "Thu, 07 Dec 2023 01:04:10 +0000." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.8; GNU Emacs 28.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <44425.1701912050.1@kaos.jnpr.net> Date: Wed, 6 Dec 2023 17:20:50 -0800 Message-ID: <49363.1701912050@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM12FT061:EE_|SA0PR05MB7836:EE_ X-MS-Office365-Filtering-Correlation-Id: b2308708-89d5-48b9-1af7-08dbf6c2d20b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8BXMPNXxQMAk8Sl18YTI8KqvlZwpq63c2aMxbxlY8/7ykEsuc0SWfC9iu0+gbCj1GTMUEYt8QhgCTPM4IQopvJPtOO+B9dJBfb1ooAq15DEhNDfrwOkVrjBV1ViXuGC7bI0ECuHtmz9yKcfU2URLOCvnE0DVtEEWln0vuSodth24AxdT2GGcVAhZezLl9bEqTAkX2BBN5KUMhNYqPYv9BKN4C2l1mZrekTThNWdZ36qYQSx3P9wYdQLOY/npfIMcJs5RJp1qYw5/UMtlMhVmdYAE8jH/BPwVrkNPLdsCCz6KqNcfzWml16PXzG2eCIp3MXhclzAJWUd5wz+DhhfaaOkbl6uiXMZMKSon/epCVTGhlgLNOW9IONGzefghRt+D9KTfNzKA9dVmHIfDHObQ7yHVf3ac0lEGH4farH5Br3lhG9DX7BWmKWdoOgtc+FHc19PRZUcUHpwHTReJF/dSCOtR++Q0eA7TE/O5ooOuVKt8ADlVFihQKPWWECZ7028TuXGKJV111DizCaUIkAMbDsX10B3yQkzPf0dayqRBwoizBTHFFzfMlisupJr1KYfilJG1UJVbGIQ5SYziWFC4/MHCmedmh0gQmaJvGBcQTESKztJ3XvsV/IWci70b+uO7Qjqr5zArfizAfrrO6MRKz/sTKJ/xj6BVPCSUsz6Pf/Cq9y5tlpDWChMyh6RNiKHMTeY9azwDNA7YqklyYPVTZq4K3eY/qvZfNSPTA80LKMHybfUSEVcV2oRHfGjtOp7PFga2rElio0vNcgwn8NReEB7AHkc/Qi+HcNVQfao97HU78FYklm8BiNOIB4JR9r8WhTBKw4bJQZ08OhAkxO5lb8v4zK4xRvMEVlygeT4NgBk= X-Forefront-Antispam-Report: CIP:66.129.242.14;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:p-exchfe-eqx-01.jnpr.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(376002)(39860400002)(396003)(346002)(136003)(230173577357003)(230922051799003)(230273577357003)(82310400011)(1800799012)(186009)(451199024)(64100799003)(40470700004)(36840700001)(46966006)(4744005)(2906002)(5660300002)(41300700001)(450100002)(86362001)(4326008)(8676002)(8936002)(316002)(70206006)(6916009)(54906003)(70586007)(55016003)(40480700001)(84970400001)(36860700001)(47076005)(356005)(966005)(81166007)(82740400003)(478600001)(107886003)(40460700003)(7696005)(53546011)(26005)(6266002)(336012)(9686003)(7126003)(36900700001);DIR:OUT;SFP:1102; X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2023 01:21:20.9682 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b2308708-89d5-48b9-1af7-08dbf6c2d20b X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.242.14];Helo=[p-exchfe-eqx-01.jnpr.net] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM12FT061.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR05MB7836 X-Proofpoint-GUID: S3Y9xhxaiug6_grc2ziC_0-pDdwHfbLL X-Proofpoint-ORIG-GUID: S3Y9xhxaiug6_grc2ziC_0-pDdwHfbLL X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-06_22,2023-12-06_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 bulkscore=0 spamscore=0 adultscore=0 mlxlogscore=672 impostorscore=0 mlxscore=0 suspectscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312070009 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:22843, ipnet:67.231.152.0/24, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SlxLX1nSGz4VLx Jessica Clarke wrote: > [External Email. Be cautious of content] > > > On 7 Dec 2023, at 00:46, Simon J. Gerraty wrote: > > > > Jessica Clarke wrote: > >> On 21 Apr 2023, at 06:14, Jessica Clarke wrote: > > > > Sorry, I didn't your mail back in April. > > > > I can move the generation of the header to its own subdir. > > Does usr.sbin/bsdinstall/osname sound reasonable? > > other common options would include gen/ include/ inc/ ? > > include sounds ok to me. osname seems a bit too specific. Ok I can rename it - opt/ was another possibilty. See https://reviews.freebsd.org/D42947 and imagine osname replaced with include From nobody Thu Dec 7 01:35:04 2023 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 4SlxfY4Jkgz53Lrt for ; Thu, 7 Dec 2023 01:35:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlxfY2SMrz4XKd for ; Thu, 7 Dec 2023 01:35:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-54cde11d0f4so549410a12.2 for ; Wed, 06 Dec 2023 17:35:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701912916; x=1702517716; 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=fW4fp4PKnRufGZpdvbTs9AmQs/xS5639PEJF6E8CfOo=; b=EddC7IVGScJ2Ar+DMrx34MQIni6s2iaqzdjoM4/IFY3ZwbK/LjBwz8lwpM1KkQdZFJ y+VFpzvjv0BgzIvGlkwu/wWYgoR/1ma/1F+Xwecnzd3+qAs2ElGSSZd+OQ1qbMHzUP3k C2FLBACUQz45lsY/mFCKFg5N+AMEvTiXc4qLVb8YGCXA7ieMAv+9zstsgaRpHad5siRe EuBRbtY0B9lW+chFnzDbjjwMPNU6uGEbBa5tfjGqZ4ks4Gp1SCWUGmoT/O7irwRJxcat aBHCKlBwgTDsnZcUkomM7UXPpjcuQ3QZABVjiysIKHcjmvgLgCoDVhuua/c3Xx07njTf IyGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701912916; x=1702517716; 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=fW4fp4PKnRufGZpdvbTs9AmQs/xS5639PEJF6E8CfOo=; b=NG2bhsOlTezC515eCJbcQzN5iVYxIS2N9zsLHWZ83UYSUv0ktkxoNA7gego69movQ5 K1gdlpw3BKlN+tZ7WCt4aKrdUhfC7PDWDK6heF4QWM4DZQEUMU3x6RGAijliRb/IAUhu /PDEIuHQfrZg1qLrTAOAGM79+zP+gqSgvZF46uvpFHBBABCQjqISI/Os/VPU1j2ARyI6 dUECPq7M5VZDKX8Bg3HjGgbhGRNjW14FOaRryn9da7IC/ei4I/QPRKoj0GpwQVqjvk3k MXo9w3Ph1ljwGD8GzES3253WJVM3kvJHMsptqng0Dg8e3TV35pFQp0WXXQsc3Ol49Zea RnuQ== X-Gm-Message-State: AOJu0YxmtGOpIAGK543MWh7XfFeL9GX6bHyFp2LnsQ7HyhOWuPRUpa1v PIcLJlK27hs4QsqK3dVrFrEmtw3CVUx2MhgKGM68Nw== X-Google-Smtp-Source: AGHT+IFv0v8q8M/5qopI9zkLvMB7BqKxKoLoXeK4jMNr4vJK9WIy2ot46Xx7pg1nFKH483/7ZQX+OJH1mlzV4kMDB/8= X-Received: by 2002:a50:96c4:0:b0:54c:75eb:f8b1 with SMTP id z4-20020a5096c4000000b0054c75ebf8b1mr1219071eda.7.1701912915699; Wed, 06 Dec 2023 17:35:15 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202302251737.31PHb2R8072300@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 6 Dec 2023 18:35:04 -0700 Message-ID: Subject: Re: git: 773c13c686e4 - main - kldxref: skip .pkgsave files To: John Baldwin Cc: Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000c77e88060be17a5b" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SlxfY2SMrz4XKd --000000000000c77e88060be17a5b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Dec 6, 2023, 2:53 PM John Baldwin wrote: > On 12/6/23 1:41 PM, Warner Losh wrote: > > Hey John, > > > > On Wed, Dec 6, 2023 at 2:13=E2=80=AFPM John Baldwin w= rote: > > > >> On 12/6/23 1:02 PM, Warner Losh wrote: > >>> On Wed, Dec 6, 2023, 1:04 PM John Baldwin wrote: > >>> > >>>> On 2/25/23 9:37 AM, Warner Losh wrote: > >>>>> The branch main has been updated by imp: > >>>>> > >>>>> URL: > >>>> > >> > https://cgit.FreeBSD.org/src/commit/?id=3D773c13c686e4b6ae9dbbc150b342b82= c3f47d73a > >>>>> > >>>>> commit 773c13c686e4b6ae9dbbc150b342b82c3f47d73a > >>>>> Author: Mina Gali=C4=87 > >>>>> AuthorDate: 2023-02-25 17:31:58 +0000 > >>>>> Commit: Warner Losh > >>>>> CommitDate: 2023-02-25 17:35:43 +0000 > >>>>> > >>>>> kldxref: skip .pkgsave files > >>>>> > >>>>> This should help people transitioning from traditional setup= s > to > >>>> pkgbase > >>>>> experience a lot less friction. > >>>>> > >>>>> We do this by skipping all files containing two dots. > >>>>> > >>>>> Reviewed by: imp > >>>>> Pull Request: https://github.com/freebsd/freebsd-src/pull/66= 1 > >>>>> Differential Revision: https://reviews.freebsd.org/D27959 > >>>> > >>>> This restriction is too broad and omits all of the modern wifi > firmware > >>>> klds from linker.hints, e.g. > >>>> > >>>> /boot/kernel/iwlwifi-3160-17.ucode.ko > >>>> /boot/kernel/iwlwifi-3168-29.ucode.ko > >>>> /boot/kernel/iwlwifi-7260-17.ucode.ko > >>>> /boot/kernel/iwlwifi-7265-17.ucode.ko > >>>> /boot/kernel/iwlwifi-7265D-29.ucode.ko > >>>> /boot/kernel/iwlwifi-8000C-36.ucode.ko > >>>> /boot/kernel/iwlwifi-8265-36.ucode.ko > >>>> /boot/kernel/iwlwifi-9000-pu-b0-jf-b0-46.ucode.ko > >>>> /boot/kernel/iwlwifi-9260-th-b0-jf-b0-46.ucode.ko > >>>> /boot/kernel/iwlwifi-Qu-b0-hr-b0-77.ucode.ko > >>>> /boot/kernel/iwlwifi-Qu-b0-jf-b0-77.ucode.ko > >>>> /boot/kernel/iwlwifi-Qu-c0-hr-b0-77.ucode.ko > >>>> /boot/kernel/iwlwifi-Qu-c0-jf-b0-77.ucode.ko > >>>> /boot/kernel/iwlwifi-QuZ-a0-hr-b0-77.ucode.ko > >>>> /boot/kernel/iwlwifi-QuZ-a0-jf-b0-77.ucode.ko > >>>> /boot/kernel/iwlwifi-cc-a0-77.ucode.ko > >>>> /boot/kernel/iwlwifi-so-a0-gf-a0-83.ucode.ko > >>>> /boot/kernel/iwlwifi-so-a0-gf-a0.pnvm.ko > >>>> /boot/kernel/iwlwifi-so-a0-gf4-a0-83.ucode.ko > >>>> /boot/kernel/iwlwifi-so-a0-gf4-a0.pnvm.ko > >>>> /boot/kernel/iwlwifi-so-a0-hr-b0-81.ucode.ko > >>>> /boot/kernel/iwlwifi-so-a0-jf-b0-77.ucode.ko > >>>> /boot/kernel/iwlwifi-ty-a0-gf-a0-83.ucode.ko > >>>> /boot/kernel/iwlwifi-ty-a0-gf-a0.pnvm.ko > >>>> /boot/kernel/rtw8723d_fw.bin.ko > >>>> /boot/kernel/rtw8821c_fw.bin.ko > >>>> /boot/kernel/rtw8822b_fw.bin.ko > >>>> /boot/kernel/rtw8822c_fw.bin.ko > >>>> /boot/kernel/rtw8822c_wow_fw.bin.ko > >>>> > >>>> all match this pattern and are skipped. > >>>> > >>>> I'm busy rewriting a bunch of kldxref to be a cross tool using libel= f, > >>>> but I think here you want to probably revert this and just add pkgsa= ve > >>>> to the list of "known bad" suffixes. > >>>> > >>> > >>> Sure. Any reason to not just require .ko? Or do we have to index the > >> kernel > >>> too? > >> > >> We do index the kernel as well, yes. However, we could probably get b= y > >> with "kernel" and ends in ".ko" as a valid set of files. This would > also > >> avoid bogusly warning about linker.hints not being a valid ELF file on > >> re-runs if you use -v. > >> > > > > Yea, that sounds good. I'll code it up and add you to the review. > > > > But why does it matter for these? Firmware is usually loaded by filenam= e > > and need not be elf... or are these wrapped in elf sections... > > > > I haven't noticed it breaking my linuxkpi wifi driver that have > autoloaded > > firmware... > > Hmm, afaik firmwares are loaded by "module name" where a firmware .ko > contains > one or more of the firmware modules. We happen today to generally only > store one module in a single .ko (and with the same name), and in that ca= se > kern_linker.c may fallback to just trying to load "foo".ko if it doesn't > find > an entry in linker.hints, but if that is why it is working that is > certainly > by happy accident. > > I only found this by comparing klxref output btw on a stale i386 VM betwe= en > the native kldxref in the VM (before this change) and my cross-arch versi= on > of kldxref. > Ok. That all makes sense. I'll update my working tree tomorrow with the revert and the replacement. Since it "works" today, I'll push the revert and the fix at the same time unless the review takes too long. Warner --=20 > John Baldwin > > --000000000000c77e88060be17a5b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Wed, Dec 6, 2023, 2:53 PM John Baldwin <jhb@freebsd.org> wrote:
On 12/6/23 1:41 PM, Warner Losh wrote:
> Hey John,
>
> On Wed, Dec 6, 2023 at 2:13=E2=80=AFPM John Baldwin <jhb@freebsd.org> wrote:
>
>> On 12/6/23 1:02 PM, Warner Losh wrote:
>>> On Wed, Dec 6, 2023, 1:04 PM John Baldwin <jhb@freebsd.org= > wrote:
>>>
>>>> On 2/25/23 9:37 AM, Warner Losh wrote:
>>>>> The branch main has been updated by imp:
>>>>>
>>>>> URL:
>>>>
>> https://cgit.FreeBSD.org/src/commit/?id=3D773c13c686e4b6ae9dbbc150b342b82= c3f47d73a
>>>>>
>>>>> commit 773c13c686e4b6ae9dbbc150b342b82c3f47d73a
>>>>> Author:=C2=A0 =C2=A0 =C2=A0Mina Gali=C4=87 <freebsd@= igalic.co>
>>>>> AuthorDate: 2023-02-25 17:31:58 +0000
>>>>> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD= .org>
>>>>> CommitDate: 2023-02-25 17:35:43 +0000
>>>>>
>>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 kldxref: skip .pkgsave file= s
>>>>>
>>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 This should help people tra= nsitioning from traditional setups to
>>>> pkgbase
>>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 experience a lot less frict= ion.
>>>>>
>>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 We do this by skipping all = files containing two dots.
>>>>>
>>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 Reviewed by: imp
>>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 Pull Request: https://github.com/freebsd/freebsd-src/pull/661
>>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 Differential Revision: https://reviews.freebsd.org/D27959
>>>>
>>>> This restriction is too broad and omits all of the modern = wifi firmware
>>>> klds from linker.hints, e.g.
>>>>
>>>> /boot/kernel/iwlwifi-3160-17.ucode.ko
>>>> /boot/kernel/iwlwifi-3168-29.ucode.ko
>>>> /boot/kernel/iwlwifi-7260-17.ucode.ko
>>>> /boot/kernel/iwlwifi-7265-17.ucode.ko
>>>> /boot/kernel/iwlwifi-7265D-29.ucode.ko
>>>> /boot/kernel/iwlwifi-8000C-36.ucode.ko
>>>> /boot/kernel/iwlwifi-8265-36.ucode.ko
>>>> /boot/kernel/iwlwifi-9000-pu-b0-jf-b0-46.ucode.ko
>>>> /boot/kernel/iwlwifi-9260-th-b0-jf-b0-46.ucode.ko
>>>> /boot/kernel/iwlwifi-Qu-b0-hr-b0-77.ucode.ko
>>>> /boot/kernel/iwlwifi-Qu-b0-jf-b0-77.ucode.ko
>>>> /boot/kernel/iwlwifi-Qu-c0-hr-b0-77.ucode.ko
>>>> /boot/kernel/iwlwifi-Qu-c0-jf-b0-77.ucode.ko
>>>> /boot/kernel/iwlwifi-QuZ-a0-hr-b0-77.ucode.ko
>>>> /boot/kernel/iwlwifi-QuZ-a0-jf-b0-77.ucode.ko
>>>> /boot/kernel/iwlwifi-cc-a0-77.ucode.ko
>>>> /boot/kernel/iwlwifi-so-a0-gf-a0-83.ucode.ko
>>>> /boot/kernel/iwlwifi-so-a0-gf-a0.pnvm.ko
>>>> /boot/kernel/iwlwifi-so-a0-gf4-a0-83.ucode.ko
>>>> /boot/kernel/iwlwifi-so-a0-gf4-a0.pnvm.ko
>>>> /boot/kernel/iwlwifi-so-a0-hr-b0-81.ucode.ko
>>>> /boot/kernel/iwlwifi-so-a0-jf-b0-77.ucode.ko
>>>> /boot/kernel/iwlwifi-ty-a0-gf-a0-83.ucode.ko
>>>> /boot/kernel/iwlwifi-ty-a0-gf-a0.pnvm.ko
>>>> /boot/kernel/rtw8723d_fw.bin.ko
>>>> /boot/kernel/rtw8821c_fw.bin.ko
>>>> /boot/kernel/rtw8822b_fw.bin.ko
>>>> /boot/kernel/rtw8822c_fw.bin.ko
>>>> /boot/kernel/rtw8822c_wow_fw.bin.ko
>>>>
>>>> all match this pattern and are skipped.
>>>>
>>>> I'm busy rewriting a bunch of kldxref to be a cross to= ol using libelf,
>>>> but I think here you want to probably revert this and just= add pkgsave
>>>> to the list of "known bad" suffixes.
>>>>
>>>
>>> Sure. Any reason to not just require .ko? Or do we have to ind= ex the
>> kernel
>>> too?
>>
>> We do index the kernel as well, yes.=C2=A0 However, we could proba= bly get by
>> with "kernel" and ends in ".ko" as a valid set= of files.=C2=A0 This would also
>> avoid bogusly warning about linker.hints not being a valid ELF fil= e on
>> re-runs if you use -v.
>>
>
> Yea, that sounds good. I'll code it up and add you to the review.<= br> >
> But why does it matter for these? Firmware is usually loaded by filena= me
> and need not be elf... or are these wrapped in elf sections...
>
> I haven't noticed it breaking my linuxkpi wifi driver that have au= toloaded
> firmware...

Hmm, afaik firmwares are loaded by "module name" where a firmware= .ko contains
one or more of the firmware modules.=C2=A0 We happen today to generally onl= y
store one module in a single .ko (and with the same name), and in that case=
kern_linker.c may fallback to just trying to load "foo".ko if it = doesn't find
an entry in linker.hints, but if that is why it is working that is certainl= y
by happy accident.

I only found this by comparing klxref output btw on a stale i386 VM between=
the native kldxref in the VM (before this change) and my cross-arch version=
of kldxref.

Ok. That all makes sense. I'll update my working tree tomorr= ow with the revert and the replacement. Since it "works" today, I= 'll push the revert and the fix at the same time unless the review take= s too long.

Warner=C2=A0=

--
John Baldwin

--000000000000c77e88060be17a5b-- From nobody Thu Dec 7 01:55:28 2023 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 4Sly6325d6z53N5Z; Thu, 7 Dec 2023 01:55:39 +0000 (UTC) (envelope-from zlei@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sly631ZjPz4YcQ; Thu, 7 Dec 2023 01:55:39 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701914139; 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=opgnACh7pk8LdzDRjEz+XnF703M1S58CB3MkPr19/Ks=; b=oGg80Axf9y2ahOyIoi/Ut31qD6cLp+bQcs5yPqRIkGnLr8tWVW33dS7EWA/lSu5JIkEPWw gG5S/+Yj+z8TMVqtfdg3slCQb+e2msgfTE1M8b/wwsfnqiFb78px8GK9ASSxIUazvQmEjt nsMR+aqwOIXQ0hWs9CG1/RMtrR2+06jljP3UMGjhy2rh8TmmV3ph9pck3Al0RRvltzmnnB X9lrRJmyRvgcBljFcgr2Cz+Hk9/sE3Mer6uUC/V9YPC6PzFCWHDRHZfeuNatuWJkbtEd+q znASmTpjcMKcAxqTXKW5bAbeuuiZfB1xwE0Q3ZdguoFw6fQR7beCVPfzuEYRVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701914139; a=rsa-sha256; cv=none; b=ha3+WXNBwD5apO/k92mdxNaNUP62Biigd+FujfrmTaDN+3y1cFSPQpKaHXvJuxVYwF1izh YCF92XNrDAvKEV4zxUuPsBWSIIH4KDQBwTY/1hE+7q8L1lKcNbqKAqCxsK8ScPxvuLcoM/ zj7L96n+ZSfaAkelC/NkWDy1bcKgV4m+1mD3zNQrcXiNFfB5Mp48cSuPw2w49neKc4GQHZ 6+OiL9eo3hlfol13lMgs405eIty63V+gJG2j2Vyq6ODAyB2yVmZ8Y58uUqttXU4B6r6F3O ne/9qanifjxkWGyuN/v4hA6lovu+1VY2Kv0BoTmTpOCmaI+8veR5B9zlzEjI4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701914139; 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=opgnACh7pk8LdzDRjEz+XnF703M1S58CB3MkPr19/Ks=; b=J8l2xS/KjIeWUCHSIzk3rtkakJq70hVvAC3Bx+eZ8cehWncoWRNaW7rPtRqVRZ1hPARIX8 A731Gkf6RJoAoe33BVJyJsBIolm9XAYlk8ryH2YS7GKwSsoQqamLUOAi7LHJLFU0YMrlDH 79Gp9eYsE3za4vXrKYV1pB3EBdmLFjAbuxGJtOecZ/R3caylIL8DKRE2350r0wounJN5gw l2wuGnMFM+faQJZaTKXKdSXrs+cdiOszC97PppdErh+WMnUJB7+ptWHeF5yVLfwCIMv80h 3kHN9DaINS+vf8gsQHMYZjb+1svHoZfa/V1fD1efJlodvBABdZ3x+8M7mzrFTQ== 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 4Sly606914z1NCW; Thu, 7 Dec 2023 01:55:36 +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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 6b96125afdf2 - main - cap_net.3: remove a copypasta From: Zhenlei Huang In-Reply-To: <202312061652.3B6GqOuf068349@gitrepo.freebsd.org> Date: Thu, 7 Dec 2023 09:55:28 +0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , li-Wen Hsu Content-Transfer-Encoding: quoted-printable Message-Id: <44E8C9F3-84DD-4E51-B2A4-FB56E2A08F30@FreeBSD.org> References: <202312061652.3B6GqOuf068349@gitrepo.freebsd.org> To: Alan Somers X-Mailer: Apple Mail (2.3696.120.41.1.4) > On Dec 7, 2023, at 12:52 AM, Alan Somers wrote: >=20 > The branch main has been updated by asomers: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D6b96125afdf245ae61dd82b59891ad0d= 6aab0066 >=20 > commit 6b96125afdf245ae61dd82b59891ad0d6aab0066 > Author: Alan Somers > AuthorDate: 2023-12-05 23:23:29 +0000 > Commit: Alan Somers > CommitDate: 2023-12-06 16:51:37 +0000 >=20 > cap_net.3: remove a copypasta >=20 > This line appears to have been copied from cap_sysctl.3. While I'm > here, reorder and reword the description of cap_net_limit a bit. >=20 > [skip ci] I guess we can 'skip ci' implicitly for document or typo changes. >=20 > MFC after: 2 weeks > Sponsored by: Axcient > Reviewed by: oshogbo > Differential Revision: https://reviews.freebsd.org/D42919 > --- > lib/libcasper/services/cap_net/cap_net.3 | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) >=20 > diff --git a/lib/libcasper/services/cap_net/cap_net.3 = b/lib/libcasper/services/cap_net/cap_net.3 > index 97a044e3f950..534d28c2ef7c 100644 > --- a/lib/libcasper/services/cap_net/cap_net.3 > +++ b/lib/libcasper/services/cap_net/cap_net.3 > @@ -21,7 +21,7 @@ > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE = POSSIBILITY OF > .\" SUCH DAMAGE. > .\" > -.Dd November 15, 2021 > +.Dd December 5, 2023 > .Dt CAP_NET 3 > .Os > .Sh NAME > @@ -188,17 +188,14 @@ any port will be accepted in the > .Fn cap_connect > function. > .Pp > +The > .Fn cap_net_limit > -applies a set of sysctl limits to the capability, denying access to = sysctl > -variables not belonging to the set. > +will consume and apply the limits. > .Pp > Once a set of limits is applied, subsequent calls to > .Fn cap_net_limit > will fail unless the new set is a subset of the current set. > .Pp > -The > -.Fn cap_net_limit > -will consume the limits. > If the > .Fn cap_net_limit > was not called the rights may be freed using From nobody Thu Dec 7 02:35:50 2023 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 4Slz0R06v0z53QdV; Thu, 7 Dec 2023 02:35: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slz0Q6Y9Zz4dG4; Thu, 7 Dec 2023 02:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701916550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PG2cv+bxcAgn3xF8EK96gsEPeIOuiKiDuSl7AqTXTeU=; b=CiQKzzuIwx5e3FdB77QFJBPYdyUzWEtinQWnvz2LELpYkZ+JzwAUsHSRyCGPY6VyNUwQQ6 GYCY4zddWdfo22VRrSr0SXxgnaiZaHsewzFhCzZCkWCjU3KIM+nl8fc7zt7fyl/9b0koJ8 S1GRWX7541k1Xwb9JVJL0xLJhIgzrMhS7Z83gHHNDQtuq0kB8pCpVkbr8K14tQabMIh/95 Rd6SmS7yNWbM666E15gTw/izu2yxY/6VD9hxBNh3pzCeNB6sMZBhONIeix1SvYdX7WL7er OFpBtBaiP8t3rF9Vdoq5gFKXC33AAphDfa2cPPswix8LnqUX/R3zyUlvkZXPtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701916550; a=rsa-sha256; cv=none; b=G7naGCPZZj5NjtqG6/cC8tX2Ybfrbd6Bx4SPQOcrZXvcXPDqBELAKrLZFvaefv1T6u7o9E g7GVSobcNdaEkMiSpvf5cTz3npJxo0Tez91t4IR0Q9C/7TOxilVN/KKRICd0as5C49CZfe dcNGQbRluI7Mvu/MpR09HlxPhnkl9qo+PQhqPCoJuwRJEbnu2Xva/e2bJlm6x+PTI4RpRc yvPrW4rhICcAjLJPx7MfZeCHNvIeLWuoLRrKwK6GhD8bU2E8CYxMw81aSSulerbzaKvjVK 3Z0RVLF9uNSHhnDHTjSj5Kl8p/zOoBJJKIJqxSp5xcFiHixCqjiX+4IJTtr3Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701916550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PG2cv+bxcAgn3xF8EK96gsEPeIOuiKiDuSl7AqTXTeU=; b=Q9XaS9xQQdNpZJeubPCZ7hd408RODJCTNipKOjK5IbsAjkRzm/DZlYbxmH+8ngvrzhHy8B inVCAdL1FjvsDFau8XZTS/VfcTzEJ36bgPGMU9p1oxRAsA4dJEU22VelMNwqAxPO/6iWON u8s+B72UoL60EHdMH0aJN86Or4hb60wRBWkASkFfe0fL8JvRbuJNCDfTIW5ib15srDJDRl 9/THiT9+vze8lfLw0lQ3wOgzNJudRqSJso1A4iqqd6GehGzCCWYVDoRIuA0EtQb7Ursc+6 Sp7bD6H6Q5KA2indFKc6OmiaUgMQb4nNS8D0HxoMz25ZAIBrG/1QQajBUmFLIg== 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 4Slz0Q5bN4z45N; Thu, 7 Dec 2023 02:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B72Zojv043064; Thu, 7 Dec 2023 02:35:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B72ZoZp043061; Thu, 7 Dec 2023 02:35:50 GMT (envelope-from git) Date: Thu, 7 Dec 2023 02:35:50 GMT Message-Id: <202312070235.3B72ZoZp043061@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: 83d0b8c089d8 - main - bsdinstall generate opt_osname.h in include List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 83d0b8c089d807d6d4c50cba40ae2d0fedb3bf1b Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=83d0b8c089d807d6d4c50cba40ae2d0fedb3bf1b commit 83d0b8c089d807d6d4c50cba40ae2d0fedb3bf1b Author: Simon J. Gerraty AuthorDate: 2023-12-07 02:34:52 +0000 Commit: Simon J. Gerraty CommitDate: 2023-12-07 02:34:52 +0000 bsdinstall generate opt_osname.h in include This allows the subdirs that do more work to run in parallel Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D42947 --- usr.sbin/bsdinstall/Makefile | 7 ++++--- usr.sbin/bsdinstall/Makefile.depend | 12 +++++++----- usr.sbin/bsdinstall/Makefile.inc | 3 +++ usr.sbin/bsdinstall/distextract/Makefile | 9 --------- usr.sbin/bsdinstall/distextract/Makefile.depend | 1 + usr.sbin/bsdinstall/distfetch/Makefile | 1 - usr.sbin/bsdinstall/distfetch/Makefile.depend | 2 +- usr.sbin/bsdinstall/include/Makefile | 13 +++++++++++++ usr.sbin/bsdinstall/include/Makefile.depend | 10 ++++++++++ usr.sbin/bsdinstall/partedit/Makefile | 1 - usr.sbin/bsdinstall/partedit/Makefile.depend | 2 +- 11 files changed, 40 insertions(+), 21 deletions(-) diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index bbf8071a91c3..422bdcaaa77a 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -1,9 +1,9 @@ -OSNAME?= FreeBSD SUBDIR= distextract distfetch partedit runconsoles scripts SUBDIR_PARALLEL= -SUBDIR_DEPEND_distfetch = distextract -SUBDIR_DEPEND_partedit = distextract +SUBDIR_DEPEND_distextract = include +SUBDIR_DEPEND_distfetch = include +SUBDIR_DEPEND_partedit = include SCRIPTS= bsdinstall MAN= bsdinstall.8 PACKAGE= bsdinstall @@ -11,5 +11,6 @@ PACKAGE= bsdinstall SCRIPTS+= startbsdinstall SCRIPTSDIR_startbsdinstall= ${LIBEXECDIR}/bsdinstall +UPDATE_DEPENDFILE= no .include diff --git a/usr.sbin/bsdinstall/Makefile.depend b/usr.sbin/bsdinstall/Makefile.depend index 11aba52f82cf..6ce3965b1642 100644 --- a/usr.sbin/bsdinstall/Makefile.depend +++ b/usr.sbin/bsdinstall/Makefile.depend @@ -1,10 +1,12 @@ -# Autogenerated - do NOT edit! +# Not autogenerated - take care DIRDEPS = \ + usr.sbin/bsdinstall/distextract \ + usr.sbin/bsdinstall/distfetch \ + usr.sbin/bsdinstall/include \ + usr.sbin/bsdinstall/partedit \ + usr.sbin/bsdinstall/runconsoles \ + usr.sbin/bsdinstall/scripts \ .include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/usr.sbin/bsdinstall/Makefile.inc b/usr.sbin/bsdinstall/Makefile.inc index dc4e35b73799..c0907ffac469 100644 --- a/usr.sbin/bsdinstall/Makefile.inc +++ b/usr.sbin/bsdinstall/Makefile.inc @@ -1 +1,4 @@ PACKAGE=bsdinstall + +CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../include + diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile index 368e1b1378ab..6813c9a79391 100644 --- a/usr.sbin/bsdinstall/distextract/Makefile +++ b/usr.sbin/bsdinstall/distextract/Makefile @@ -1,18 +1,9 @@ BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distextract -CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I. LIBADD= archive bsddialog m SRCS= distextract.c MAN= -GENHDRS= opt_osname.h -SRCS+= ${GENHDRS} -CLEANFILES+= ${GENHDRS} - -opt_osname.h: .PHONY - if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \ - echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ - fi .include diff --git a/usr.sbin/bsdinstall/distextract/Makefile.depend b/usr.sbin/bsdinstall/distextract/Makefile.depend index 10731d6ccb01..dd87c979eb80 100644 --- a/usr.sbin/bsdinstall/distextract/Makefile.depend +++ b/usr.sbin/bsdinstall/distextract/Makefile.depend @@ -9,6 +9,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/msun \ + usr.sbin/bsdinstall/include \ .include diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile index 325f5c55cfd5..8a9011734592 100644 --- a/usr.sbin/bsdinstall/distfetch/Makefile +++ b/usr.sbin/bsdinstall/distfetch/Makefile @@ -1,7 +1,6 @@ BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distfetch -CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextract LIBADD= fetch bsddialog MAN= diff --git a/usr.sbin/bsdinstall/distfetch/Makefile.depend b/usr.sbin/bsdinstall/distfetch/Makefile.depend index 16e54d9b2a6e..9e9ac6d1bae8 100644 --- a/usr.sbin/bsdinstall/distfetch/Makefile.depend +++ b/usr.sbin/bsdinstall/distfetch/Makefile.depend @@ -8,7 +8,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libfetch \ - usr.sbin/bsdinstall/distextract \ + usr.sbin/bsdinstall/include \ .include diff --git a/usr.sbin/bsdinstall/include/Makefile b/usr.sbin/bsdinstall/include/Makefile new file mode 100644 index 000000000000..15f947defa9b --- /dev/null +++ b/usr.sbin/bsdinstall/include/Makefile @@ -0,0 +1,13 @@ +OSNAME?= FreeBSD +GENHDRS= opt_osname.h +SRCS+= ${GENHDRS} +CLEANFILES+= ${GENHDRS} + +opt_osname.h: ${META_NOPHONY} + @if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET} 2> /dev/null; then \ + echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ + fi + +MK_STAGING= no + +.include diff --git a/usr.sbin/bsdinstall/include/Makefile.depend b/usr.sbin/bsdinstall/include/Makefile.depend new file mode 100644 index 000000000000..11aba52f82cf --- /dev/null +++ b/usr.sbin/bsdinstall/include/Makefile.depend @@ -0,0 +1,10 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile index 8d7156fd16d2..397e404a126f 100644 --- a/usr.sbin/bsdinstall/partedit/Makefile +++ b/usr.sbin/bsdinstall/partedit/Makefile @@ -4,7 +4,6 @@ PROG= partedit LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ ${BINDIR}/partedit ${BINDIR}/scriptedpart SYMLINKS= ../libexec/bsdinstall/partedit /usr/sbin/sade -CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextract LIBADD+= geom util bsddialog PARTEDIT_ARCH= ${MACHINE} diff --git a/usr.sbin/bsdinstall/partedit/Makefile.depend b/usr.sbin/bsdinstall/partedit/Makefile.depend index 4d5ca3e13299..68a44a4d87a7 100644 --- a/usr.sbin/bsdinstall/partedit/Makefile.depend +++ b/usr.sbin/bsdinstall/partedit/Makefile.depend @@ -9,7 +9,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libgeom \ lib/libutil \ - usr.sbin/bsdinstall/distextract \ + usr.sbin/bsdinstall/include \ .include From nobody Thu Dec 7 03:32:10 2023 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 4Sm0Fh72Fcz53TWp for ; Thu, 7 Dec 2023 03:32:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm0Fh47c4z3FJv for ; Thu, 7 Dec 2023 03:32:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-54c4f95e27fso411538a12.1 for ; Wed, 06 Dec 2023 19:32:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701919943; x=1702524743; 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=TtZSB3x72zNzJKoQnbvqoRQjmeZvjFs3ykBWz6OhP4M=; b=mHAoZJach0/KMpp0ft2V76w14enovTMG3Y8XOPSA97pKgc+NGNroJYG/VzfYkCPwqu ueKGKFcG4qQ7ONYOnMJCdhriEhgo5vHBA6h8yf5OIDsDsPWImx5q24SpdTbxj7jron6y UpxGyGUA4rtnUOCgTZgeIU0rKIat8cTaIdZU3s1y6XC1SpBUzAkPWPAPrccbTeOd0v8f kAqMpzXpwmagqtpj4U/g9WO70PRe2E44+/ixxZomPCniUdzLbe8QpYIr8nS0FFFSfJiT fidTDZa0OcXUCc1nv1N4G59ETtEhYPp39tY8i7x5oupB62ziOmOCnzpxrM+hjbDcG9La lPGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701919943; x=1702524743; 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=TtZSB3x72zNzJKoQnbvqoRQjmeZvjFs3ykBWz6OhP4M=; b=kg9EF+ljzjsGFY0vt/ydpUVYXKT9gy4ov7Ofl8P7oaEXq5vCYiHXJyMI0Ry7r3yzAT iQRr+sSxSyJ6NEb8bt67cUKAbrKBArffV1fHV8u7dxYIEhRzyuUqqVwhTAxRH+X9u31w oQpBxKlVYiWstmBR2LMCtiguHZBjekMuaiIbROhHI9JPZpmamCHInYN5AxnpNUQLajeN TBjz1BIYr+xw8dDQsiok6N582yRD3EJCHX51LgxcCh/SKLUZLW6NFVsJhs/tp15JhoUF zEO3lZmiNq1MQOoWCwuiFBZKE7iQ7Bo2Eo+EAhos+GIFNAlXSzGeGFchbCN5rS6H+Muj jY3A== X-Gm-Message-State: AOJu0YwldZPIviM7xwmvLDrd4kS4L3dbXKnyUN/cvt5xmf2wPT6xd4oo WvyLslSy0YkP5tg7On01D00VLcXVR8NhgcdBROijkw== X-Google-Smtp-Source: AGHT+IGJaOZ7m0hTAzj1++QvUZ4o95bqOZ/guPTL+E2XCaru4MVA7NiMXm46BlDoPSiIy+0YPPlKyrtF9vhIxAknfBQ= X-Received: by 2002:a50:a6d7:0:b0:54c:e59e:aa69 with SMTP id f23-20020a50a6d7000000b0054ce59eaa69mr1315603edc.12.1701919942677; Wed, 06 Dec 2023 19:32:22 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202312070235.3B72ZoZp043061@gitrepo.freebsd.org> In-Reply-To: <202312070235.3B72ZoZp043061@gitrepo.freebsd.org> From: Warner Losh Date: Wed, 6 Dec 2023 20:32:10 -0700 Message-ID: Subject: Re: git: 83d0b8c089d8 - main - bsdinstall generate opt_osname.h in include To: "Simon J. Gerraty" Cc: src-committers , "" , "" Content-Type: multipart/alternative; boundary="0000000000009ea9a9060be31df0" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Sm0Fh47c4z3FJv --0000000000009ea9a9060be31df0 Content-Type: text/plain; charset="UTF-8" Silly question: why not just add it to CFLAGS with -DOSNAME=\"${OSNAME}\" rather than generating this file? Warner On Wed, Dec 6, 2023, 7:35 PM Simon J. Gerraty wrote: > The branch main has been updated by sjg: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=83d0b8c089d807d6d4c50cba40ae2d0fedb3bf1b > > commit 83d0b8c089d807d6d4c50cba40ae2d0fedb3bf1b > Author: Simon J. Gerraty > AuthorDate: 2023-12-07 02:34:52 +0000 > Commit: Simon J. Gerraty > CommitDate: 2023-12-07 02:34:52 +0000 > > bsdinstall generate opt_osname.h in include > > This allows the subdirs that do more work to run in parallel > > Reviewed by: jrtc27 > Differential Revision: https://reviews.freebsd.org/D42947 > --- > usr.sbin/bsdinstall/Makefile | 7 ++++--- > usr.sbin/bsdinstall/Makefile.depend | 12 +++++++----- > usr.sbin/bsdinstall/Makefile.inc | 3 +++ > usr.sbin/bsdinstall/distextract/Makefile | 9 --------- > usr.sbin/bsdinstall/distextract/Makefile.depend | 1 + > usr.sbin/bsdinstall/distfetch/Makefile | 1 - > usr.sbin/bsdinstall/distfetch/Makefile.depend | 2 +- > usr.sbin/bsdinstall/include/Makefile | 13 +++++++++++++ > usr.sbin/bsdinstall/include/Makefile.depend | 10 ++++++++++ > usr.sbin/bsdinstall/partedit/Makefile | 1 - > usr.sbin/bsdinstall/partedit/Makefile.depend | 2 +- > 11 files changed, 40 insertions(+), 21 deletions(-) > > diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile > index bbf8071a91c3..422bdcaaa77a 100644 > --- a/usr.sbin/bsdinstall/Makefile > +++ b/usr.sbin/bsdinstall/Makefile > @@ -1,9 +1,9 @@ > > -OSNAME?= FreeBSD > SUBDIR= distextract distfetch partedit runconsoles scripts > SUBDIR_PARALLEL= > -SUBDIR_DEPEND_distfetch = distextract > -SUBDIR_DEPEND_partedit = distextract > +SUBDIR_DEPEND_distextract = include > +SUBDIR_DEPEND_distfetch = include > +SUBDIR_DEPEND_partedit = include > SCRIPTS= bsdinstall > MAN= bsdinstall.8 > PACKAGE= bsdinstall > @@ -11,5 +11,6 @@ PACKAGE= bsdinstall > SCRIPTS+= startbsdinstall > SCRIPTSDIR_startbsdinstall= ${LIBEXECDIR}/bsdinstall > > +UPDATE_DEPENDFILE= no > > .include > diff --git a/usr.sbin/bsdinstall/Makefile.depend > b/usr.sbin/bsdinstall/Makefile.depend > index 11aba52f82cf..6ce3965b1642 100644 > --- a/usr.sbin/bsdinstall/Makefile.depend > +++ b/usr.sbin/bsdinstall/Makefile.depend > @@ -1,10 +1,12 @@ > -# Autogenerated - do NOT edit! > +# Not autogenerated - take care > > DIRDEPS = \ > + usr.sbin/bsdinstall/distextract \ > + usr.sbin/bsdinstall/distfetch \ > + usr.sbin/bsdinstall/include \ > + usr.sbin/bsdinstall/partedit \ > + usr.sbin/bsdinstall/runconsoles \ > + usr.sbin/bsdinstall/scripts \ > > > .include > - > -.if ${DEP_RELDIR} == ${_DEP_RELDIR} > -# local dependencies - needed for -jN in clean tree > -.endif > diff --git a/usr.sbin/bsdinstall/Makefile.inc > b/usr.sbin/bsdinstall/Makefile.inc > index dc4e35b73799..c0907ffac469 100644 > --- a/usr.sbin/bsdinstall/Makefile.inc > +++ b/usr.sbin/bsdinstall/Makefile.inc > @@ -1 +1,4 @@ > PACKAGE=bsdinstall > + > +CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../include > + > diff --git a/usr.sbin/bsdinstall/distextract/Makefile > b/usr.sbin/bsdinstall/distextract/Makefile > index 368e1b1378ab..6813c9a79391 100644 > --- a/usr.sbin/bsdinstall/distextract/Makefile > +++ b/usr.sbin/bsdinstall/distextract/Makefile > @@ -1,18 +1,9 @@ > > BINDIR= ${LIBEXECDIR}/bsdinstall > PROG= distextract > -CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I. > LIBADD= archive bsddialog m > SRCS= distextract.c > > MAN= > -GENHDRS= opt_osname.h > -SRCS+= ${GENHDRS} > -CLEANFILES+= ${GENHDRS} > - > -opt_osname.h: .PHONY > - if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \ > - echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ > - fi > > .include > diff --git a/usr.sbin/bsdinstall/distextract/Makefile.depend > b/usr.sbin/bsdinstall/distextract/Makefile.depend > index 10731d6ccb01..dd87c979eb80 100644 > --- a/usr.sbin/bsdinstall/distextract/Makefile.depend > +++ b/usr.sbin/bsdinstall/distextract/Makefile.depend > @@ -9,6 +9,7 @@ DIRDEPS = \ > lib/libc \ > lib/libcompiler_rt \ > lib/msun \ > + usr.sbin/bsdinstall/include \ > > > .include > diff --git a/usr.sbin/bsdinstall/distfetch/Makefile > b/usr.sbin/bsdinstall/distfetch/Makefile > index 325f5c55cfd5..8a9011734592 100644 > --- a/usr.sbin/bsdinstall/distfetch/Makefile > +++ b/usr.sbin/bsdinstall/distfetch/Makefile > @@ -1,7 +1,6 @@ > > BINDIR= ${LIBEXECDIR}/bsdinstall > PROG= distfetch > -CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib > -I${.OBJDIR}/../distextract > LIBADD= fetch bsddialog > > MAN= > diff --git a/usr.sbin/bsdinstall/distfetch/Makefile.depend > b/usr.sbin/bsdinstall/distfetch/Makefile.depend > index 16e54d9b2a6e..9e9ac6d1bae8 100644 > --- a/usr.sbin/bsdinstall/distfetch/Makefile.depend > +++ b/usr.sbin/bsdinstall/distfetch/Makefile.depend > @@ -8,7 +8,7 @@ DIRDEPS = \ > lib/libc \ > lib/libcompiler_rt \ > lib/libfetch \ > - usr.sbin/bsdinstall/distextract \ > + usr.sbin/bsdinstall/include \ > > > .include > diff --git a/usr.sbin/bsdinstall/include/Makefile > b/usr.sbin/bsdinstall/include/Makefile > new file mode 100644 > index 000000000000..15f947defa9b > --- /dev/null > +++ b/usr.sbin/bsdinstall/include/Makefile > @@ -0,0 +1,13 @@ > +OSNAME?= FreeBSD > +GENHDRS= opt_osname.h > +SRCS+= ${GENHDRS} > +CLEANFILES+= ${GENHDRS} > + > +opt_osname.h: ${META_NOPHONY} > + @if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET} 2> > /dev/null; then \ > + echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ > + fi > + > +MK_STAGING= no > + > +.include > diff --git a/usr.sbin/bsdinstall/include/Makefile.depend > b/usr.sbin/bsdinstall/include/Makefile.depend > new file mode 100644 > index 000000000000..11aba52f82cf > --- /dev/null > +++ b/usr.sbin/bsdinstall/include/Makefile.depend > @@ -0,0 +1,10 @@ > +# Autogenerated - do NOT edit! > + > +DIRDEPS = \ > + > + > +.include > + > +.if ${DEP_RELDIR} == ${_DEP_RELDIR} > +# local dependencies - needed for -jN in clean tree > +.endif > diff --git a/usr.sbin/bsdinstall/partedit/Makefile > b/usr.sbin/bsdinstall/partedit/Makefile > index 8d7156fd16d2..397e404a126f 100644 > --- a/usr.sbin/bsdinstall/partedit/Makefile > +++ b/usr.sbin/bsdinstall/partedit/Makefile > @@ -4,7 +4,6 @@ PROG= partedit > LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ > ${BINDIR}/partedit ${BINDIR}/scriptedpart > SYMLINKS= ../libexec/bsdinstall/partedit /usr/sbin/sade > -CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib > -I${.OBJDIR}/../distextract > LIBADD+= geom util bsddialog > > PARTEDIT_ARCH= ${MACHINE} > diff --git a/usr.sbin/bsdinstall/partedit/Makefile.depend > b/usr.sbin/bsdinstall/partedit/Makefile.depend > index 4d5ca3e13299..68a44a4d87a7 100644 > --- a/usr.sbin/bsdinstall/partedit/Makefile.depend > +++ b/usr.sbin/bsdinstall/partedit/Makefile.depend > @@ -9,7 +9,7 @@ DIRDEPS = \ > lib/libcompiler_rt \ > lib/libgeom \ > lib/libutil \ > - usr.sbin/bsdinstall/distextract \ > + usr.sbin/bsdinstall/include \ > > > .include > --0000000000009ea9a9060be31df0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Silly=C2=A0question: why not just add it to CFLAGS with -= DOSNAME=3D\"${OSNAME}\" rather than generating this file?

Warner

On Wed, Dec 6, 2023, 7:35= PM Simon J. Gerraty <sjg@freebsd.org= > wrote:
The branch main has= been updated by sjg:

URL: ht= tps://cgit.FreeBSD.org/src/commit/?id=3D83d0b8c089d807d6d4c50cba40ae2d0fedb= 3bf1b

commit 83d0b8c089d807d6d4c50cba40ae2d0fedb3bf1b
Author:=C2=A0 =C2=A0 =C2=A0Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2023-12-07 02:34:52 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Simon J. Gerraty <sjg@FreeBSD.org>
CommitDate: 2023-12-07 02:34:52 +0000

=C2=A0 =C2=A0 bsdinstall generate opt_osname.h in include

=C2=A0 =C2=A0 This allows the subdirs that do more work to run in parallel<= br>
=C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 jrtc27
=C2=A0 =C2=A0 Differential Revision:=C2=A0 https://revi= ews.freebsd.org/D42947
---
=C2=A0usr.sbin/bsdinstall/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 7 ++++---
=C2=A0usr.sbin/bsdinstall/Makefile.depend=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0| 12 +++++++-----
=C2=A0usr.sbin/bsdinstall/Makefile.inc=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 |=C2=A0 3 +++
=C2=A0usr.sbin/bsdinstall/distextract/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 |= =C2=A0 9 ---------
=C2=A0usr.sbin/bsdinstall/distextract/Makefile.depend |=C2=A0 1 +
=C2=A0usr.sbin/bsdinstall/distfetch/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 1 -
=C2=A0usr.sbin/bsdinstall/distfetch/Makefile.depend=C2=A0 =C2=A0|=C2=A0 2 += -
=C2=A0usr.sbin/bsdinstall/include/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 | 13 +++++++++++++
=C2=A0usr.sbin/bsdinstall/include/Makefile.depend=C2=A0 =C2=A0 =C2=A0| 10 += +++++++++
=C2=A0usr.sbin/bsdinstall/partedit/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0|=C2=A0 1 -
=C2=A0usr.sbin/bsdinstall/partedit/Makefile.depend=C2=A0 =C2=A0 |=C2=A0 2 += -
=C2=A011 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index bbf8071a91c3..422bdcaaa77a 100644
--- a/usr.sbin/bsdinstall/Makefile
+++ b/usr.sbin/bsdinstall/Makefile
@@ -1,9 +1,9 @@

-OSNAME?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0FreeBSD
=C2=A0SUBDIR=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 distextract distfetch partedit r= unconsoles scripts
=C2=A0SUBDIR_PARALLEL=3D
-SUBDIR_DEPEND_distfetch =3D distextract
-SUBDIR_DEPEND_partedit =3D distextract
+SUBDIR_DEPEND_distextract =3D include
+SUBDIR_DEPEND_distfetch =3D include
+SUBDIR_DEPEND_partedit =3D include
=C2=A0SCRIPTS=3D bsdinstall
=C2=A0MAN=3D bsdinstall.8
=C2=A0PACKAGE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0bsdinstall
@@ -11,5 +11,6 @@ PACKAGE=3D=C2=A0 =C2=A0 =C2=A0 bsdinstall
=C2=A0SCRIPTS+=3D=C2=A0 =C2=A0 =C2=A0 startbsdinstall
=C2=A0SCRIPTSDIR_startbsdinstall=3D=C2=A0 =C2=A0 ${LIBEXECDIR}/bsdinstall
+UPDATE_DEPENDFILE=3D no

=C2=A0.include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/Makefile.depend b/usr.sbin/bsdinstall/Make= file.depend
index 11aba52f82cf..6ce3965b1642 100644
--- a/usr.sbin/bsdinstall/Makefile.depend
+++ b/usr.sbin/bsdinstall/Makefile.depend
@@ -1,10 +1,12 @@
-# Autogenerated - do NOT edit!
+# Not autogenerated - take care

=C2=A0DIRDEPS =3D \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0usr.sbin/bsdinstall/distextract \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0usr.sbin/bsdinstall/distfetch \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0usr.sbin/bsdinstall/include \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0usr.sbin/bsdinstall/partedit \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0usr.sbin/bsdinstall/runconsoles \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0usr.sbin/bsdinstall/scripts \


=C2=A0.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} =3D=3D ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.sbin/bsdinstall/Makefile.inc b/usr.sbin/bsdinstall/Makefil= e.inc
index dc4e35b73799..c0907ffac469 100644
--- a/usr.sbin/bsdinstall/Makefile.inc
+++ b/usr.sbin/bsdinstall/Makefile.inc
@@ -1 +1,4 @@
=C2=A0PACKAGE=3Dbsdinstall
+
+CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../include
+
diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall= /distextract/Makefile
index 368e1b1378ab..6813c9a79391 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile
+++ b/usr.sbin/bsdinstall/distextract/Makefile
@@ -1,18 +1,9 @@

=C2=A0BINDIR=3D ${LIBEXECDIR}/bsdinstall
=C2=A0PROG=3D=C2=A0 distextract
-CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I.
=C2=A0LIBADD=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 archive bsddialog m
=C2=A0SRCS=3D=C2=A0 distextract.c

=C2=A0MAN=3D
-GENHDRS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0opt_osname.h
-SRCS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${GENHDRS}
-CLEANFILES+=3D=C2=A0 =C2=A0${GENHDRS}
-
-opt_osname.h: .PHONY
-=C2=A0 =C2=A0 =C2=A0 =C2=A0if ! grep -q "^#define OSNAME \"${OSN= AME}\"$"" ${.TARGET}; then \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0echo "#define = OSNAME \"${OSNAME}\"" > ${.TARGET}; \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0fi

=C2=A0.include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/distextract/Makefile.depend b/usr.sbin/bsd= install/distextract/Makefile.depend
index 10731d6ccb01..dd87c979eb80 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile.depend
+++ b/usr.sbin/bsdinstall/distextract/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS =3D \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 lib/libc \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 lib/libcompiler_rt \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 lib/msun \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0usr.sbin/bsdinstall/include \


=C2=A0.include <dirdeps.mk>
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/d= istfetch/Makefile
index 325f5c55cfd5..8a9011734592 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile
+++ b/usr.sbin/bsdinstall/distfetch/Makefile
@@ -1,7 +1,6 @@

=C2=A0BINDIR=3D ${LIBEXECDIR}/bsdinstall
=C2=A0PROG=3D=C2=A0 distfetch
-CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0-I${SRCTOP}/contrib/bsddialog/lib -I$= {.OBJDIR}/../distextract
=C2=A0LIBADD=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 fetch bsddialog

=C2=A0MAN=3D
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile.depend b/usr.sbin/bsdin= stall/distfetch/Makefile.depend
index 16e54d9b2a6e..9e9ac6d1bae8 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile.depend
+++ b/usr.sbin/bsdinstall/distfetch/Makefile.depend
@@ -8,7 +8,7 @@ DIRDEPS =3D \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 lib/libc \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 lib/libcompiler_rt \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 lib/libfetch \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0usr.sbin/bsdinstall/distextract \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0usr.sbin/bsdinstall/include \


=C2=A0.include <dirdeps.mk>
diff --git a/usr.sbin/bsdinstall/include/Makefile b/usr.sbin/bsdinstall/inc= lude/Makefile
new file mode 100644
index 000000000000..15f947defa9b
--- /dev/null
+++ b/usr.sbin/bsdinstall/include/Makefile
@@ -0,0 +1,13 @@
+OSNAME?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0FreeBSD
+GENHDRS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0opt_osname.h
+SRCS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${GENHDRS}
+CLEANFILES+=3D=C2=A0 =C2=A0${GENHDRS}
+
+opt_osname.h: ${META_NOPHONY}
+=C2=A0 =C2=A0 =C2=A0 =C2=A0@if ! grep -q "^#define OSNAME \"${OS= NAME}\"$"" ${.TARGET} 2> /dev/null; then \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0echo "#define = OSNAME \"${OSNAME}\"" > ${.TARGET}; \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0fi
+
+MK_STAGING=3D no
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/include/Makefile.depend b/usr.sbin/bsdinst= all/include/Makefile.depend
new file mode 100644
index 000000000000..11aba52f82cf
--- /dev/null
+++ b/usr.sbin/bsdinstall/include/Makefile.depend
@@ -0,0 +1,10 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS =3D \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} =3D=3D ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/pa= rtedit/Makefile
index 8d7156fd16d2..397e404a126f 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile
+++ b/usr.sbin/bsdinstall/partedit/Makefile
@@ -4,7 +4,6 @@ PROG=3D=C2=A0 =C2=A0partedit
=C2=A0LINKS=3D ${BINDIR}/partedit ${BINDIR}/autopart \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${BINDIR}/partedit ${BINDIR}/scriptedpart
=C2=A0SYMLINKS=3D ../libexec/bsdinstall/partedit /usr/sbin/sade
-CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0-I${SRCTOP}/contrib/bsddialog/lib -I$= {.OBJDIR}/../distextract
=C2=A0LIBADD+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0geom util bsddialog

=C2=A0PARTEDIT_ARCH=3D ${MACHINE}
diff --git a/usr.sbin/bsdinstall/partedit/Makefile.depend b/usr.sbin/bsdins= tall/partedit/Makefile.depend
index 4d5ca3e13299..68a44a4d87a7 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile.depend
+++ b/usr.sbin/bsdinstall/partedit/Makefile.depend
@@ -9,7 +9,7 @@ DIRDEPS =3D \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 lib/libcompiler_rt \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 lib/libgeom \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 lib/libutil \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0usr.sbin/bsdinstall/distextract \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0usr.sbin/bsdinstall/include \


=C2=A0.include <dirdeps.mk>
--0000000000009ea9a9060be31df0-- From nobody Thu Dec 7 03:59:06 2023 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 4Sm0rm6kkyz53WFd; Thu, 7 Dec 2023 03:59:20 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-vk1-f182.google.com (mail-vk1-f182.google.com [209.85.221.182]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm0rm42hqz3HQD; Thu, 7 Dec 2023 03:59:20 +0000 (UTC) (envelope-from asomers@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-vk1-f182.google.com with SMTP id 71dfb90a1353d-4b2cdf382d9so77209e0c.0; Wed, 06 Dec 2023 19:59:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701921559; x=1702526359; h=content-transfer-encoding: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=+dqTLsXxyE+xm3Qh7Mo2yYWmT/iLuhYEcL2qAoRg8eg=; b=GRrpGn+6zc7oYenBiXsqabyyYKCtgs2dNtLkMMNhs33tl6Dq2GaWiVYvHw7Qh9bVTA hA+H8mbwJbVrtHSscQFW0hnK/6MLI1A1l9rY/VoiL8j9ONEdUv6c713xbC1cQgJtxkJ2 PbvempzFvegkWqiDzapqDocbUVjHQOvGD1Ajnh+fXZK5fBFogXrhf+AhXTu1/Oz/X2QV opTISnc6yBoEB9Nz6xNSZyZvyh2m67vqX6tvPNfbklQDq7PT3mAuI8za5UkZYhbEYuu1 yuZgk9afoDjABvd76NNe+5FC2/CbZNIKDBmqtvPnx/Po6wHvgPVzi8Ul8V9qY1UCJG7v 8mlw== X-Gm-Message-State: AOJu0Yx6WVui72xR41jInxeBdSejU9g1EFYVPPwvg18vK8LDx7/hgJ+B 55vvHhVv1luGAs6wcmfyFkGSYJszDm1Eghmob8zHCMtisg8= X-Google-Smtp-Source: AGHT+IG9863nNx6cdTm9Fppf0pT4lM545sP4L8O9Yw2mh74N3gQJObYT5x4dB6q+Hxt7dJU2usMe+Dge69X2Pr1xMvQ= X-Received: by 2002:a1f:c383:0:b0:4b2:dbb5:bc82 with SMTP id t125-20020a1fc383000000b004b2dbb5bc82mr1652419vkf.24.1701921558880; Wed, 06 Dec 2023 19:59:18 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202312061652.3B6GqOuf068349@gitrepo.freebsd.org> <44E8C9F3-84DD-4E51-B2A4-FB56E2A08F30@FreeBSD.org> In-Reply-To: <44E8C9F3-84DD-4E51-B2A4-FB56E2A08F30@FreeBSD.org> From: Alan Somers Date: Wed, 6 Dec 2023 20:59:06 -0700 Message-ID: Subject: Re: git: 6b96125afdf2 - main - cap_net.3: remove a copypasta To: Zhenlei Huang Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , li-Wen Hsu Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Sm0rm42hqz3HQD On Wed, Dec 6, 2023 at 6:55=E2=80=AFPM Zhenlei Huang wro= te: > > > > > On Dec 7, 2023, at 12:52 AM, Alan Somers wrote: > > > > The branch main has been updated by asomers: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D6b96125afdf245ae61dd82b5= 9891ad0d6aab0066 > > > > commit 6b96125afdf245ae61dd82b59891ad0d6aab0066 > > Author: Alan Somers > > AuthorDate: 2023-12-05 23:23:29 +0000 > > Commit: Alan Somers > > CommitDate: 2023-12-06 16:51:37 +0000 > > > > cap_net.3: remove a copypasta > > > > This line appears to have been copied from cap_sysctl.3. While I'm > > here, reorder and reword the description of cap_net_limit a bit. > > > > [skip ci] > > I guess we can 'skip ci' implicitly for document or typo changes. Can we? The skipping logic is builtin to Jenkins, Github Workflows, and Cirrus. I don't think it would be easy to program any of those to detect which changes can be safely skipped. -Alan From nobody Thu Dec 7 03:59:22 2023 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 4Sm0sT2lDBz53WKy; Thu, 7 Dec 2023 03:59:57 +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 4Sm0sS6bNtz3J9x; Thu, 7 Dec 2023 03:59:56 +0000 (UTC) (envelope-from sjg@juniper.net) Authentication-Results: mx1.freebsd.org; none Received: from pps.filterd (m0108163.ppops.net [127.0.0.1]) by mx0b-00273201.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3B73XY8q003830; Wed, 6 Dec 2023 19:59:55 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h=to : cc : subject : in-reply-to : references : from : mime-version : content-type : content-id : date : message-id; s=PPS1017; bh=rVX8y1kjoTybLiQ/3Y56KEMMiU/p7xKMlJ5PtRTudoE=; b=zxAlKrclFyv6C+Q6Xei6i1o4ggaVhBvgyy3xpObfFGmEBf9YheqKsfYC6nQqzwv0NiwL MvBOEX84lMrXBrmMeZ8KLXc6e5EO58wQLGGYwXl7Qvl8Ka3WGpzRQh183Eg71chQurh0 TQMB/cu5/MDdWZifWssa9LwdRFYhtM8QKXg2El0IuSWVZBXtsuucoaNaIfRXUDcaYENg k3vYsOWo6fOsD9zsKg53+fLCXkDDtuH2wVdRG8K1rkzM8Bx+ZHZugTGv9JbH1LA2FfVa R099g8HDA+gSLU+oUTfUgtqXBzS75wFE67KCaiKuHnrzmEMBgibDixCgJJoPh3LXlm/N QQ== Received: from cy4pr02cu008.outbound.protection.outlook.com (mail-westcentralusazlp17012028.outbound.protection.outlook.com [40.93.6.28]) by mx0b-00273201.pphosted.com (PPS) with ESMTPS id 3utvh6hvu2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Dec 2023 19:59:55 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ty5lBZQ8HFWL3iiVXGBZtODhNoMqsmBpyAhVXef3sd7MUfoBLPVmDCT5KE1bXjPdfMJKsWgTggpHSPTApHVIHWPQP/rNRKqk0AAGhA0KKJ0y85hkEz0gTMQUiKLoxF3/u4IcQd/oBg058WZ8oUHpenVxl0gLmd186t3fAf4cpcbHaaMnRp/eQ/FcP6N7PhebhP1nZInyRDgsgWiUkdw3RGV2LonRiWsJ+w7KgOw/Bwxlt3JpmiXgx9q7hfI9Tlzq/WTMVvn+0SY8HMlJEDuzfj6GivWCtyv0ml5pLX45a5JzdseuCO75BF+VpRIfwsG6eTIcFMgCCmmZSAP5ejmHYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=rVX8y1kjoTybLiQ/3Y56KEMMiU/p7xKMlJ5PtRTudoE=; b=c85TDXFNFfqQq0WCEQsfSlNP0ClCUqz7I5AXOAaWIfcPn4mj8cAi4mebIOiko4ZmT4I7JTiO3JFdJ/owFUPbA7E1TTkMLxztbf34WawZweJhmLQwBJe4FzsRC97u4ZznK/rIygorrM4mZJ/O4r1aRPe1/1xe6MBemEu9JnRPDF09JEji1eDu7M70ZKq7cXIY9rGPdzHAh8mFPXB2svytEQ4haGOPfIFJ4eaFNO08MzfjS0rQxKBdMe9pVitnWplHDogXRNQO39VXdqEpR9Q2G6PjT0xtXkY8J1iYAruDYqYq4pSUzypEZJDYRrmBRO3rQMTQTvLyL39EErZH5DfrRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 66.129.242.15) 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=rVX8y1kjoTybLiQ/3Y56KEMMiU/p7xKMlJ5PtRTudoE=; b=YU8QBTIbeJu8E/8p6I8K9jTM2gJ2XGQ9S48DyJC3v+s/Kc4H8UkVUX7vqKPMF061JvbI5qumg5jwSbMp2/cQHo7bbQcBNZki3MS5ZwOIsU3629qQ+IErkYcuBHKNGg6S0uC3cf+SNCOtvU6aWHASTLwH5fLfIx5UU+C9l16ni20= Received: from BN6PR17CA0038.namprd17.prod.outlook.com (2603:10b6:405:75::27) by CH3PR05MB9387.namprd05.prod.outlook.com (2603:10b6:610:142::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.25; Thu, 7 Dec 2023 03:59:53 +0000 Received: from BN8NAM12FT079.eop-nam12.prod.protection.outlook.com (2603:10b6:405:75:cafe::f4) by BN6PR17CA0038.outlook.office365.com (2603:10b6:405:75::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34 via Frontend Transport; Thu, 7 Dec 2023 03:59:53 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 66.129.242.15) 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.242.15 as permitted sender) Received: from p-exchfe-eqx-02.jnpr.net (66.129.242.15) by BN8NAM12FT079.mail.protection.outlook.com (10.13.182.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.6 via Frontend Transport; Thu, 7 Dec 2023 03:59:52 +0000 Received: from p-exchbe-eqx-02.jnpr.net (10.104.9.15) by p-exchfe-eqx-02.jnpr.net (10.104.9.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Wed, 6 Dec 2023 21:59:52 -0600 Received: from p-exchbe-eqx-01.jnpr.net (10.104.9.14) by p-exchbe-eqx-02.jnpr.net (10.104.9.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Wed, 6 Dec 2023 21:59:51 -0600 Received: from p-mailhub01.juniper.net (10.104.20.6) by p-exchbe-eqx-01.jnpr.net (10.104.9.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39 via Frontend Transport; Wed, 6 Dec 2023 21:59:51 -0600 Received: from kaos.jnpr.net (kaos.jnpr.net [172.23.255.201]) by p-mailhub01.juniper.net (8.14.4/8.11.3) with ESMTP id 3B73xp37008330; Wed, 6 Dec 2023 19:59:51 -0800 (envelope-from sjg@juniper.net) Received: by kaos.jnpr.net (Postfix, from userid 1377) id BFA224D68C; Wed, 6 Dec 2023 19:59:22 -0800 (PST) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id BF0EA4D376; Wed, 6 Dec 2023 19:59:22 -0800 (PST) To: Warner Losh CC: src-committers , "" , "" , Subject: Re: git: 83d0b8c089d8 - main - bsdinstall generate opt_osname.h in include In-Reply-To: References: <202312070235.3B72ZoZp043061@gitrepo.freebsd.org> Comments: In-reply-to: Warner Losh message dated "Wed, 06 Dec 2023 20:32:10 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.8; GNU Emacs 28.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <68563.1701921562.1@kaos.jnpr.net> Date: Wed, 6 Dec 2023 19:59:22 -0800 Message-ID: <71239.1701921562@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM12FT079:EE_|CH3PR05MB9387:EE_ X-MS-Office365-Filtering-Correlation-Id: e6853ae3-8936-4d0b-2e4a-08dbf6d8f788 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DMqlR4IUNuMTDdXqgRtiu4lSU5vl0gRyZut7M4uoodisigLccZAilQIpYDEvQ1nbih954vK0Z0cq3v10I0N8j4iZOYIakAfoBGc35/UJJCT3+W5QW7kGTnJVcXs+DNj4m5VM/Is4WuB04SSs//cLS/bgE0emWG4JGFNtZo3/2i5vWyT7emREKJFPpWXkl7sVhHJarbXXE0ic5g8uZJHM6ieYdSiQWZ1h/UFUcGCarf8WXr1GonvvTjsFf/qfQlJzt1qHncn7KAbPRfkUhr5kIeYLvTnfUEisksqzjG38Y+gZ2rqdzOyyF1K45GJ6SXfAiPvFDwHo4DCB0oTg4A2BXWEUQqrRN5vOJ0cw1ZTdDKhYAJtqxcnKaKH9mh8HF5forL2t16g/R+xslu0nNXIhCYyQePZkzVFNiRX1SVSnUyUOKIXzXGjy16/vySi7ge+TFVLgE7i+e9ez8SGLx3kPJX7T9977Tt4sVK7bNGngucKcffp0Iu9hpQojsRJ9Nj3PDc3AL+Md8QIrvk0x0OdAG+aoL6h4OeLdmNF5fVyTxKt5Wsy8TlyW6XwkO6p5Y6FH1TeX9VNwcDLa84Prjy2e8mC2bTABpKiWN/NzTmPyn5rhROnOY/m4DykbzMrhVPL9LjM0Y6OesmWpjCUAHSHCDD60PYycErGZjHBN//7PUgtwvE7zZmpUKKmQotGPXgON3fF5qVX6wHNfPKwXYzsr+tu1nFYMGZa7jcTEfwq0CyHAa6+eL/e6BS0P7UXi5XudxIo+tuaz2N4rNnrcuVdX4wKdgWoKuMrOS1OLCI+C3pYl9egiNCLZ8+/PA9b0/R7/ X-Forefront-Antispam-Report: CIP:66.129.242.15;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:p-exchfe-eqx-02.jnpr.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(39860400002)(346002)(376002)(396003)(136003)(230922051799003)(82310400011)(186009)(1800799012)(64100799003)(451199024)(46966006)(40470700004)(36840700001)(9686003)(107886003)(7126003)(40460700003)(336012)(6266002)(26005)(86362001)(41300700001)(8676002)(8936002)(2906002)(558084003)(4326008)(5660300002)(54906003)(70206006)(70586007)(316002)(6916009)(7696005)(478600001)(47076005)(81166007)(356005)(82740400003)(55016003)(36860700001)(40480700001)(36900700001);DIR:OUT;SFP:1102; X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2023 03:59:52.7916 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e6853ae3-8936-4d0b-2e4a-08dbf6d8f788 X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.242.15];Helo=[p-exchfe-eqx-02.jnpr.net] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM12FT079.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR05MB9387 X-Proofpoint-GUID: NDQZT-6LvRzzLwGXdeYJepx9eIinXP0O X-Proofpoint-ORIG-GUID: NDQZT-6LvRzzLwGXdeYJepx9eIinXP0O X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-07_01,2023-12-06_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 clxscore=1015 suspectscore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=429 phishscore=0 spamscore=0 priorityscore=1501 mlxscore=0 bulkscore=0 impostorscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312070031 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:22843, ipnet:67.231.152.0/24, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Sm0sS6bNtz3J9x Warner Losh wrote: > Silly question: why not just add it to CFLAGS with > -DOSNAME=\"${OSNAME}\" rather than generating this file? Actually it is an excellent question - I've no idea why opt_osname.h is needed. From nobody Thu Dec 7 04:03:29 2023 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 4Sm0xp4C6Nz53WPj for ; Thu, 7 Dec 2023 04:03:42 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm0xp2Q1Rz3Jvy for ; Thu, 7 Dec 2023 04:03:42 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3332fc9b9b2so466573f8f.1 for ; Wed, 06 Dec 2023 20:03:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701921820; x=1702526620; 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=1hHJ4TkJrkAADi30knhFunzanv/pRO/dC6KKyWtp8hA=; b=G9D/V2GjKEmCLnBa9xKyNCwH1Iv7ApAjXRi2w5nYACI+d7yAIwzK/vqLYLLguPnDBw L8cArk6TYQ+qb4USdgxklaSoQTxzCYZRqnU8AKTyOneMaFilTGzu2TNarUQFJskH+Wt3 ruj+c4eQX7uSFJAr2qe17a3s0zhXEtbpq0p71C5r2ioKn3EwtMswu6gZiCPNUJBzJrie z4dJRqMvSpD5FeKv2j7gaJI3jqqAJETHBy+Aa3jcw9frOOLIChY/LjAMwN6iibgo8Pgq Pnij/CvLzzWCPw3w4Yy5FXNgPKxKsfQgRUHj9KcaMekeY1zt/rE7gvqEawd+H33sdtVr rgXg== X-Gm-Message-State: AOJu0YwcamFM56cY5Tw6iqlcgsRUDv7q3CAYPGWu6SEAgdcuXQTHozQ/ zVIz7uCmnKCSKLT98nt/Dt1RXQ== X-Google-Smtp-Source: AGHT+IFrmPhw/JniJnGv5hmamQUqSptNeEpcDheefaxaR9DhhWTr7hIGHFk0wN6W1qVo8hETNwkyTA== X-Received: by 2002:adf:e903:0:b0:332:f566:c2 with SMTP id f3-20020adfe903000000b00332f56600c2mr570966wrm.39.1701921820470; Wed, 06 Dec 2023 20:03:40 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id t11-20020adfe10b000000b0033363342041sm317363wrz.23.2023.12.06.20.03.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Dec 2023 20:03:39 -0800 (PST) Content-Type: text/plain; charset=utf-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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 83d0b8c089d8 - main - bsdinstall generate opt_osname.h in include From: Jessica Clarke In-Reply-To: <71239.1701921562@kaos.jnpr.net> Date: Thu, 7 Dec 2023 04:03:29 +0000 Cc: Warner Losh , src-committers , "" , "" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202312070235.3B72ZoZp043061@gitrepo.freebsd.org> <71239.1701921562@kaos.jnpr.net> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Sm0xp2Q1Rz3Jvy On 7 Dec 2023, at 03:59, Simon J. Gerraty wrote: > Warner Losh wrote: >> Silly question: why not just add it to CFLAGS with >> -DOSNAME=3D\"${OSNAME}\" rather than generating this file? >=20 > Actually it is an excellent question - I've no idea why opt_osname.h = is > needed. To quote the motivation from brd@=E2=80=99s original review: > The reason I did it using a file is so that make(1) would detect a > change a rebuild if you change the value and do another build. -- https://reviews.freebsd.org/D34878#791429 Jess From nobody Thu Dec 7 04:12:40 2023 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 4Sm1885Jtdz53X6r; Thu, 7 Dec 2023 04:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm1884LgDz3KLj; Thu, 7 Dec 2023 04:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701922360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CTNZaeVbMBcfczIfXCRVTOkDsAslkS0m+7XAI5S1juc=; b=hnChhpRYB37tiOgsXE1YrhSIOdpXb8HuIY9bLz/OAa9mDXhxMdk36Ir6HTIzQOgQSejPop +4KBAnQfpXr+vD8Z9znfchJwJy29ZZLpksQA3kglYJXYA8gvOEgvzovAwvzJViXogW8/XB 0Ify+eILXRwO0vicvrRx8QtW2En/6mAc6gBi+5Ps/Dir9HcpmjsVFNnmBhKZ/ZLb7Zzd4R xC/ShV7VnrmNRAcF1dE+WpFMUHuuBSOVOS+leyK6FDbgNK5S8bnKlf1ZxvmOTDLI55pRQf QOp6jke3d16W+m8n+CCm9AH6B4jmOM1p3cUSyjwI/epHiyx4BbH0FwI3Gx05EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701922360; a=rsa-sha256; cv=none; b=XBQeGQ1ykHyGds2P7ytq+ENoPAhBBBvPPQPC8z194qeKfbCQJ3f/8mhE+sz1PKO/8pftZj eenJsnLr42JXE7n6ohNPFsuBfhHhDoz5KeSo0oc3Ts6Oyyzm5wW5vkgB0hPHS+FN178CM4 ifcAA6xLrr1lRqzHvvADwtzqp+yGEaUGAWNdaoGNE++w7r0I1QmqmvubOtGk7XmPYa7WCx nDyk6Qotn2X81wVTRMWbifFTPqFTdL1ZY3qZEg4egJODHwNfaZncmRNzIzVBdMs+VPkxQ6 Y3DCaMCLcFBqtfKUHYt4bldqP91EJQ9/kl8W3pHBQlyYwtXQVOxqj8EtWPxePw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701922360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CTNZaeVbMBcfczIfXCRVTOkDsAslkS0m+7XAI5S1juc=; b=pVz7kt31PTlU63HVynDEyYoyAlzE3Jsavimu2r1wetmQ1dlM0O23jTEbLTSuzHGI7aMC19 cfH6JzmolRLFb15yaNr/eIgicgwyvFPBknfN3x+0upCXxkrR2Zn4sdptA4rV7Hn3ig4y1r 18Efzs1WZ7EGqXkh+2WC82waOOnxq0PWjCwp1uAX92TGWfChYxP/nZ8K47P5vKJO4JqGVZ kYvcfie+OpktlpRXRr0trOSpB7i0iPC/k7uSqSY7Ohlo6ON8obiNPgWbF30XuN4VbjaiGA eAZoVk6q/LKP3iqoEI8UGDSvKud6mOZd4IYK1swrGo8ap1rHBcqSHclnFi0yKA== 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 4Sm1883QCMz6df; Thu, 7 Dec 2023 04:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B74CeOe011511; Thu, 7 Dec 2023 04:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B74CeXw011508; Thu, 7 Dec 2023 04:12:40 GMT (envelope-from git) Date: Thu, 7 Dec 2023 04:12:40 GMT Message-Id: <202312070412.3B74CeXw011508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 598d1ac85e87 - main - vmstat: Let libxo properly humanize -m numbers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 598d1ac85e87d9312b9fd3266908ab6a6768edc6 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=598d1ac85e87d9312b9fd3266908ab6a6768edc6 commit 598d1ac85e87d9312b9fd3266908ab6a6768edc6 Author: Alexander Motin AuthorDate: 2023-12-07 04:08:45 +0000 Commit: Alexander Motin CommitDate: 2023-12-07 04:12:30 +0000 vmstat: Let libxo properly humanize -m numbers Raw numbers can be seen in json/xml or with --libxo=no-humanize. MFC after: 2 weeks --- usr.bin/vmstat/vmstat.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 6d5f000f46a3..2aa58d77a1f0 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1416,8 +1416,8 @@ domemstat_malloc(void) } } xo_open_container("malloc-statistics"); - xo_emit("{T:/%13s} {T:/%5s} {T:/%6s} {T:/%8s} {T:Size(s)}\n", - "Type", "InUse", "MemUse", "Requests"); + xo_emit("{T:/%16s} {T:/%4s} {T:/%5s} {T:/%3s} {T:Size(s)}\n", + "Type", "Use", "Memory", "Req"); xo_open_list("memory"); zones = memstat_malloc_zone_get_count(); for (mtp = memstat_mtl_first(mtlp); mtp != NULL; @@ -1426,10 +1426,12 @@ domemstat_malloc(void) memstat_get_count(mtp) == 0) continue; xo_open_instance("memory"); - xo_emit("{k:type/%13s/%s} {:in-use/%5ju} " - "{:memory-use/%5ju}{U:K} {:requests/%8ju} ", + xo_emit("{k:type/%16s/%s} " + "{[:4}{h,hn-decimal,hn-1000:in-use/%ju}{]:} " + "{[:5}{h,hn-decimal:memory-use/%ju}{]:} " + "{[:4}{h,hn-decimal,hn-1000:requests/%ju}{]:} ", memstat_get_name(mtp), (uintmax_t)memstat_get_count(mtp), - ((uintmax_t)memstat_get_bytes(mtp) + 1023) / 1024, + (uintmax_t)memstat_get_bytes(mtp), (uintmax_t)memstat_get_numallocs(mtp)); first = 1; xo_open_list("size"); @@ -1437,7 +1439,7 @@ domemstat_malloc(void) if (memstat_malloc_zone_used(mtp, i)) { if (!first) xo_emit(","); - xo_emit("{l:size/%d}", memstat_malloc_zone_get_size(i)); + xo_emit("{lh:size/%d}", memstat_malloc_zone_get_size(i)); first = 0; } } From nobody Thu Dec 7 04:54:25 2023 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 4Sm2526tNDz53b5k; Thu, 7 Dec 2023 04:55:02 +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 4Sm2524qznz3RVB; Thu, 7 Dec 2023 04:55:02 +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.17.1.19/8.17.1.19) with ESMTP id 3B6NoS4g007253; Wed, 6 Dec 2023 20:55:00 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h=to : cc : subject : in-reply-to : references : from : mime-version : content-type : content-transfer-encoding : date : message-id; s=PPS1017; bh=g9z6D6P4WnqqSq6bwwzDrkrspCbZ3r0euZHKuVGT2jc=; b=nlsuCWtvD+Wm9A69d4eWzC8l+eF8ZihgnaYgP/TRE0/ma+9s5qPzHGIrPaG63tj51r7x HuCM33P7njEuJS3GaD62pBFE2WDLUHcgt1wKs2hl1jMi9rNyJ5SaoQTRO5Dtq+K0yudz bTVrWlMZ37x4waCxd3KSerm2gjbP9Sidob2v2So3pDzzLXSYrYkagHaTkm3DqbhPg4wx 3X05jJs2mgXDa9q/Tue+61hyydFiL6J54oWInQdV+Vecz3mv3Jt2+KnkeOSN2/jgoJCI gHKpb7deHnyyZRNW5c2QVpwO+wNYcZIeU5cEXe6U9SeYYss9KVccEvTCbwv3obIQuhUi 0w== Received: from co1pr02cu001.outbound.protection.outlook.com (mail-westus2azlp17011018.outbound.protection.outlook.com [40.93.10.18]) by mx0b-00273201.pphosted.com (PPS) with ESMTPS id 3utps2u7js-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Dec 2023 20:55:00 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ISSmRd+4t/01YhrY2acZiYE7EtZPAaB88wB82WjXxTuzu5FOT7NZQT4UtLEzr0JjEn7574MM89DlJ53k2iH9ZFFbwlYWRqPwLMc5FTo1id8LkZbjPDvN0gRmUkV9ODfgXgPq9uSkENmpT1ngF3o5IHKGRnuP3WOVE9NkjPPcNR22huVm9KnWLVXLc+YVOFmDapLIw+e3xF5kKJamIXhhl0PumTNB8e2uRJ3o6YCgIKeOimXOR3MHzrR2kRWlmrhGwu/PC5ZB7z6f6t+5z9pUxNzEVcMyjbZZCWN2bTAlKx+GpZ7StQPMCouAllcLP6M8xG6ISLQc6SiDdtPXJqhUng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=g9z6D6P4WnqqSq6bwwzDrkrspCbZ3r0euZHKuVGT2jc=; b=WjoTuhkaRuykKim/xQCYzPqIDzTE2dgj9HWPKlOduQ57wGHrMo9qQed8bwbhqUa9IgFMPvn35DLr90ZehgvbQUuxrLR/NLYCHSfmngq9PejEdZWo8PV2rnCFzVGYxMHu7mWj0UxPvAVlQYcH0V26HZ3XAX7vHb7983tjfSpLOPy/7sCZRdCGdrynFDmxqpkwvP5g7DdfX5HxMDhVdi6lyMWJjbrNu4bhm/mFZdyJqxvcuSzgirh7EOMpfjf0wHBv/x57ExLBJyFBtkoZPgX4Og32BRQh6qjvOTMzryAzFVtBNcoAilx4VfGU71hiZ+uhUgBoTk6HCQjQEWUl45mxJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 66.129.242.15) 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=g9z6D6P4WnqqSq6bwwzDrkrspCbZ3r0euZHKuVGT2jc=; b=P+gyuUUQ9u8ZffbrqEhlpnBW4VSHbG0qeU0RxLZFyGz9V+SQxq/cyXkQ12S2ayZwzFsHwt94CmqQaPwsiYpzRMPnJtSFycpitXJrOOgL2V24zc8aTS4uq3ItEO6941bI5IzgOlnWOHy2U2KW+PRm9LWhmL6iIZVXH8SMuXIidA4= Received: from BN0PR07CA0026.namprd07.prod.outlook.com (2603:10b6:408:141::26) by DM4PR05MB10309.namprd05.prod.outlook.com (2603:10b6:8:b6::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.27; Thu, 7 Dec 2023 04:54:55 +0000 Received: from BN8NAM12FT019.eop-nam12.prod.protection.outlook.com (2603:10b6:408:141:cafe::ed) by BN0PR07CA0026.outlook.office365.com (2603:10b6:408:141::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34 via Frontend Transport; Thu, 7 Dec 2023 04:54:55 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 66.129.242.15) 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.242.15 as permitted sender) Received: from p-exchfe-eqx-02.jnpr.net (66.129.242.15) by BN8NAM12FT019.mail.protection.outlook.com (10.13.183.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.14 via Frontend Transport; Thu, 7 Dec 2023 04:54:55 +0000 Received: from p-exchbe-eqx-01.jnpr.net (10.104.9.14) by p-exchfe-eqx-02.jnpr.net (10.104.9.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Wed, 6 Dec 2023 22:54:54 -0600 Received: from p-exchbe-eqx-01.jnpr.net (10.104.9.14) by p-exchbe-eqx-01.jnpr.net (10.104.9.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Wed, 6 Dec 2023 22:54:54 -0600 Received: from p-mailhub01.juniper.net (10.104.20.6) by p-exchbe-eqx-01.jnpr.net (10.104.9.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39 via Frontend Transport; Wed, 6 Dec 2023 22:54:54 -0600 Received: from kaos.jnpr.net (kaos.jnpr.net [172.23.255.201]) by p-mailhub01.juniper.net (8.14.4/8.11.3) with ESMTP id 3B74ssST031174; Wed, 6 Dec 2023 20:54:54 -0800 (envelope-from sjg@juniper.net) Received: by kaos.jnpr.net (Postfix, from userid 1377) id 463D94D623; Wed, 6 Dec 2023 20:54:25 -0800 (PST) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id 44A164D4E9; Wed, 6 Dec 2023 20:54:25 -0800 (PST) To: Jessica Clarke CC: Warner Losh , src-committers , "" , "" , Subject: Re: git: 83d0b8c089d8 - main - bsdinstall generate opt_osname.h in include In-Reply-To: References: <202312070235.3B72ZoZp043061@gitrepo.freebsd.org> <71239.1701921562@kaos.jnpr.net> Comments: In-reply-to: Jessica Clarke message dated "Thu, 07 Dec 2023 04:03:29 +0000." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.8; GNU Emacs 28.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Date: Wed, 6 Dec 2023 20:54:25 -0800 Message-ID: <58331.1701924865@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM12FT019:EE_|DM4PR05MB10309:EE_ X-MS-Office365-Filtering-Correlation-Id: ce148393-c8fe-4847-c47d-08dbf6e0a809 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aPx5I9PY4VtYbKyKgDXPMudI8riyz01APcvMsiV7ZXK+/R2JznZ0M36WdBuljJ69NRJmrfsKwxyYC/wCKbrJb2TdDnIrRr9WlIcZCTnk6tsYHIp8n1mhHJMqXlxQ+7fecoY3rbvUsOPYCyukwSnMz6fILaNqwrfvIAtCLL9RBG480TE2Evp83yB7EV8auKnxiO8vqOVfpXPkD2UNtB0OMe0PuzXtIGJdffL+fLiYKFtg7H5XPzq1gVZJNEFWiuM31eV3r2QRmUP0AH6m93DsIda9C2p015zLr0hnuN/fUzsWVC/snraaj/t2kahx69Qkq3lD7g9Lnuw5dOb4B7Ievf3lMZtesIxbjpE+DjiMptnA4lcAS0T926o+pI0M1WFEzLQS+XDrSg/xZJPGv2AA8HonpcBlwdbkVchYTYkLdzHrmjmEG2BERjyjieotScIz0n6tkuX6J6v8zBXsRUrVNnFXnM2HzNryBbjc0eHgWQcBb2AygX1Tov+fc0XVFVaIVHwAgLausJ5uc7DkfNQ37pYLnA1lWQZoe9rB3OEQ+0YoJdS1WcWUtztB4CbQiZp1yWDaonHdli2Y9HLcaeVqJMdXUR7PlrQUmqYl9//M2Hie8O+vO2iEwGpP7hsQ2xPjmeS4SbziV9eZN0dt5MPZMO3ZVb2jKupKlD6/LEEITA1aitHBlGpoIJBHyNgCUDy7eARFu+7QwduLcY3k7Y978jWFXb2vT+dASZ1c99o/wyUKHbhsb7Flg0c/MDNl3te5cV5BqiXBle1IaKmAG89tbbG7xV8L4+TYg/8jauKKSlHTLt+m9AN8+mLoYl3qL/Dv X-Forefront-Antispam-Report: CIP:66.129.242.15;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:p-exchfe-eqx-02.jnpr.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(346002)(39860400002)(136003)(396003)(376002)(230922051799003)(451199024)(82310400011)(64100799003)(1800799012)(186009)(40470700004)(46966006)(36840700001)(86362001)(41300700001)(5660300002)(4744005)(2906002)(40460700003)(6266002)(40480700001)(26005)(83380400001)(82740400003)(55016003)(54906003)(70206006)(6916009)(70586007)(7696005)(478600001)(336012)(7126003)(107886003)(9686003)(316002)(8676002)(4326008)(47076005)(356005)(81166007)(8936002)(36860700001)(36900700001);DIR:OUT;SFP:1102; X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2023 04:54:55.3970 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ce148393-c8fe-4847-c47d-08dbf6e0a809 X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.242.15];Helo=[p-exchfe-eqx-02.jnpr.net] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM12FT019.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR05MB10309 X-Proofpoint-GUID: w9qv_WxLNv3vSZUFnAG7TYUuvNKSFre7 X-Proofpoint-ORIG-GUID: w9qv_WxLNv3vSZUFnAG7TYUuvNKSFre7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-07_02,2023-12-06_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 suspectscore=0 clxscore=1015 impostorscore=0 spamscore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 mlxscore=0 phishscore=0 mlxlogscore=410 priorityscore=1501 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312070037 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:22843, ipnet:67.231.152.0/24, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Sm2524qznz3RVB Jessica Clarke wrote: > > Warner Losh wrote: > >> Silly question: why not just add it to CFLAGS with > >> -DOSNAME=3D\"${OSNAME}\" rather than generating this file? > > > > Actually it is an excellent question - I've no idea why opt_osname.h is > > needed. >=20 > To quote the motivation from brd@=E2=80=99s original review: >=20 > > The reason I did it using a file is so that make(1) would detect a > > change a rebuild if you change the value and do another build. A fair point. Of course moot if using META_MODE. The other benefit of the header is only the files that include it will be rebuilt when the value changes whereas (with META_MODE) everything will be rebuilt if value is in CFLAGS. That can be mitigated by using per object CFLAGS, but all in all the header is a simpler solution. --sjg From nobody Thu Dec 7 05:50:08 2023 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 4Sm3Jc2bYZz53f57; Thu, 7 Dec 2023 05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm3Jc1wtSz3WjM; Thu, 7 Dec 2023 05: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=1701928208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B9gM0MtAlp6qv1Pkis7W3mxKv/x9m6EHPI+0ZdChLp4=; b=Sq9YHHutkTahOUbrMFKzL7timw9A5UkFeoroMhvffIczdr2XckGI56uzBfmDAJBu13CBIF mT2/9yxhOdmRZLHX9CjgDFAjUud4Zk391/8kkXbqz5hXfMjgB8lzl6I3k+ou7Xr9RyEt+9 tYU9fmeWhpDwEoXkPAqYOFKs4cY+utwLSP8oA1W2lSgXYv2+LxCbuzB2X92Nst57zUuf+F pDflhYGdxgG2ynhjP9USqm3Z6YfF/iEpALISIycs2zrFat64OS3zdt2aYlunKEHDi+iVwa 7219i4bmk9Lz7Hq2+l3rnuxSTo5uSX59U8ju/lp4YifgUKovXTNsBNx89TFbWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701928208; a=rsa-sha256; cv=none; b=Idfpp5Sl5a1DV9Y7IAxTFlCfn+c+SXaG6wBpgP4CP+d24U9ddpls4A5775OM6rjB0hdkVp xDsrZAddcMao6SqxO1aVtX/O/jNBo0ED8/JgVBbI95WNsNa2m2Rp6Jm4oMDbG4rxHMl4/1 7bnia3XeHdwf58s6XVSUN/1DSSV3z0Zo1xgUPMQmqrtMWZZOAky6i7IVYWVnOoo+AiRtaQ 827WL6iROGQVDeax6SkYj6exAr0qeLFhurAPhCW2pow47WFr/iFKBqB3qx+VVZkBSbuKHo t4Usfd6KAnJrIcg1UAJtqyQRnJl5+07mNVoNGNLVIb2d/SJryTDBIxQ8Gi7FWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701928208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B9gM0MtAlp6qv1Pkis7W3mxKv/x9m6EHPI+0ZdChLp4=; b=HAStJyiZR0+Wj1zH1lXW0YKN7V99E/3C//VxDIEgWBkTyyFJpOdnNxPAnG4pBg9ZaYWBLX 1XzKSwd3SS41uPB0+SgDndxblQrf80dvxfsN+KSlDJr4wNEjH6SSVJicLXmPNa72cbHqSC FB1n9Bc62g4Ql5l0tWYNjOZYogexELQKYvoptnoN0nLJXO6lgGVGQNFnVgxFCROH7LthYg /MI9XiFcFo7lM5HXpfz6UtkdFLlp78wFiGxktDukQOTS6zIrIf8pTzulB1uJJEIbIe1ofw lA9YccvjZTeFNAfUSVbt7qtt04aKNPWOiyk/Rv3hzSdLucBJZT1J/yI00kfwug== 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 4Sm3Jc0zMkz91Y; Thu, 7 Dec 2023 05:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B75o8OV066390; Thu, 7 Dec 2023 05:50:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B75o8WV066387; Thu, 7 Dec 2023 05:50:08 GMT (envelope-from git) Date: Thu, 7 Dec 2023 05:50:08 GMT Message-Id: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1c95af45488bef649e9a84890e2414ff80b3a00 Auto-Submitted: auto-generated The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=b1c95af45488bef649e9a84890e2414ff80b3a00 commit b1c95af45488bef649e9a84890e2414ff80b3a00 Author: Philip Paeps AuthorDate: 2023-12-07 05:48:13 +0000 Commit: Philip Paeps CommitDate: 2023-12-07 05:48:13 +0000 rc.conf: correct $ntp_leapfile_sources IETF is no longer serving leap-seconds.list. Point at IANA instead. This fixes "service ntpd fetch". MFC after: 1 day --- libexec/rc/rc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 3269288728b6..145e0b70ca3b 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -424,7 +424,7 @@ ntp_src_leapfile="/etc/ntp/leap-seconds" # Initial source for ntpd leapfile ntp_db_leapfile="/var/db/ntpd.leap-seconds.list" # Working copy (updated weekly) leapfile -ntp_leapfile_sources="https://www.ietf.org/timezones/data/leap-seconds.list" +ntp_leapfile_sources="https://data.iana.org/time-zones/tzdb/leap-seconds.list" # Source from which to fetch leapfile ntp_leapfile_fetch_opts="-mq" # Options to use for ntp leapfile fetch, # e.g. --no-verify-peer From nobody Thu Dec 7 05:50:21 2023 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 4Sm3K85sq0z53fLG for ; Thu, 7 Dec 2023 05:50:36 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm3K84Cskz3XDd for ; Thu, 7 Dec 2023 05:50:36 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-a1ceae92ab6so63201866b.0 for ; Wed, 06 Dec 2023 21:50:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701928234; x=1702533034; 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=2qTQn8b9WWDeO3SRmqtZb4vq5fWyGavLR7gZE9zVegg=; b=MjeJ4R5aaK3dn8lj8U2ARIOxLsfjBND+Gza7e6TBP3x4xg2Hopeb8TP6WgTqrlFHJZ MClh0qLSOWUog2zQ2RHFjWpe2uI2u6Z6SZOvhIAbvQdY1YVnFH8Zq0AZghGZ2Ul2suUE onHqc3Q250npD/p2VK86jg7t3rKSp8qHMZZUL8ntRaTXZz+1bHKJGYtO1OfqrWYcMPao QdJYzBObRqGBzMcKaIjoDmmHxYO/AbjEZacECP0KfpNtIQG8qr3vdHjkyApzv+0/IoTn 1CqeB6dQuF8/fvGUeRbZJ7XLRD01PJAoXnk2sCKg59Y7gGNFHqCMSx4Skmx3YknW6MAh P7Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701928234; x=1702533034; 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=2qTQn8b9WWDeO3SRmqtZb4vq5fWyGavLR7gZE9zVegg=; b=XpWQVeYObb+FdMD7Ck/jYOiXtuTuQgUKzpvE3g035aA6VDqjmLInYgmSmKYIqnYO7+ 3J72/Ezmj6HR5x/QBVumXF+faQd8W7LvTOJusm9bzPJ9GJsnrMnoNcuu5lSBX7KaMLHx aJRJjHSO0f0A46dQkjDI0opFI9P+NwTBkN9edsloJByoJVypBzPh7FWUKrKRkLGXN0tw GtNIRiN6uDXczJAyYZzTWvqNJxQIQ7G0MT80iM+o1e4KPqd9YYfSAQ5F6tx+DLhC7gqi Bar8jLzLRg2DRCP66qgu8WQ41J8SuOxn15f7GTTk3PYTMYc+WyvIq+5r5SDV0AEBCjNK ptsg== X-Gm-Message-State: AOJu0Yx/Pd6NmsOB54fH/sWLoMMjW/vpORYW55teDL0um04ukLOFJqFw Ma1TacLa0Ow5t4Mv2ulrEVgC43QVDt3D8MIa5qSnjw== X-Google-Smtp-Source: AGHT+IHO6qgNkVsrRnfQ94XYvrIqJY1qlkqHT3uLhF+JBu/BfoIeW3TkjqUnlk7WEZAxT6cxAMrs0nt5nme6b6jCj6Q= X-Received: by 2002:a17:906:10ce:b0:a1e:cb47:3785 with SMTP id v14-20020a17090610ce00b00a1ecb473785mr203607ejv.68.1701928233877; Wed, 06 Dec 2023 21:50:33 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202312061652.3B6GqOuf068349@gitrepo.freebsd.org> <44E8C9F3-84DD-4E51-B2A4-FB56E2A08F30@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Wed, 6 Dec 2023 22:50:21 -0700 Message-ID: Subject: Re: git: 6b96125afdf2 - main - cap_net.3: remove a copypasta To: Alan Somers Cc: Zhenlei Huang , src-committers , "" , "" , li-Wen Hsu Content-Type: multipart/alternative; boundary="000000000000d05322060be50b48" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Sm3K84Cskz3XDd --000000000000d05322060be50b48 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Dec 6, 2023, 8:59 PM Alan Somers wrote: > On Wed, Dec 6, 2023 at 6:55=E2=80=AFPM Zhenlei Huang w= rote: > > > > > > > > > On Dec 7, 2023, at 12:52 AM, Alan Somers wrote: > > > > > > The branch main has been updated by asomers: > > > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D6b96125afdf245ae61dd82b59891ad0= d6aab0066 > > > > > > commit 6b96125afdf245ae61dd82b59891ad0d6aab0066 > > > Author: Alan Somers > > > AuthorDate: 2023-12-05 23:23:29 +0000 > > > Commit: Alan Somers > > > CommitDate: 2023-12-06 16:51:37 +0000 > > > > > > cap_net.3: remove a copypasta > > > > > > This line appears to have been copied from cap_sysctl.3. While I'= m > > > here, reorder and reword the description of cap_net_limit a bit. > > > > > > [skip ci] > > > > I guess we can 'skip ci' implicitly for document or typo changes. > > Can we? The skipping logic is builtin to Jenkins, Github Workflows, > and Cirrus. I don't think it would be easy to program any of those to > detect which changes can be safely skipped. > The message currently is a nearly nop for our setup. Jenkins runs arent triggered by a commit. Cirrus CI already can't maje it more than a few days into the month. Commits aren't gated into main by CI. So IMHO, it just adds noise. Let's drop it until it has an actual beneficial effect. Metadata like that doesn't really belong in the git log. As this situation changes, we can reevaluate... Again just my opinion... Warner -Alan > --000000000000d05322060be50b48 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Wed, Dec 6, 2023, 8:59 PM Alan Somers <asomers@freebsd.org> wrote:
On Wed, Dec 6, 2023 at 6:55=E2=80=AFPM Zhen= lei Huang <zlei@freebsd.org> wrote:
>
>
>
> > On Dec 7, 2023, at 12:52 AM, Alan Somers <asomers@freebsd.org= > wrote:
> >
> > The branch main has been updated by asomers:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D6b96125afdf245ae61dd82b59= 891ad0d6aab0066
> >
> > commit 6b96125afdf245ae61dd82b59891ad0d6aab0066
> > Author:=C2=A0 =C2=A0 =C2=A0Alan Somers <asomers@FreeBSD.org>= ;
> > AuthorDate: 2023-12-05 23:23:29 +0000
> > Commit:=C2=A0 =C2=A0 =C2=A0Alan Somers <asomers@FreeBSD.org>= ;
> > CommitDate: 2023-12-06 16:51:37 +0000
> >
> >=C2=A0 =C2=A0 cap_net.3: remove a copypasta
> >
> >=C2=A0 =C2=A0 This line appears to have been copied from cap_sysct= l.3.=C2=A0 While I'm
> >=C2=A0 =C2=A0 here, reorder and reword the description of cap_net_= limit a bit.
> >
> >=C2=A0 =C2=A0 [skip ci]
>
> I guess we can 'skip ci' implicitly for document or typo chang= es.

Can we?=C2=A0 =C2=A0The skipping logic is builtin to Jenkins, Github Workfl= ows,
and Cirrus.=C2=A0 I don't think it would be easy to program any of thos= e to
detect which changes can be safely skipped.

The message currently is a nearl= y nop for our setup. Jenkins runs arent triggered by a commit. Cirrus CI al= ready can't maje it more than a few days into the month. Commits aren&#= 39;t gated into main by CI. So IMHO, it just adds noise. Let's drop it = until it has an actual beneficial effect. Metadata like that doesn't re= ally belong in the git log.

As this situation changes, we can reevaluate...
=
Again just my opinion...

Warner

-Alan
--000000000000d05322060be50b48-- From nobody Thu Dec 7 06:16:24 2023 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 4Sm3vC2kDvz53h5F for ; Thu, 7 Dec 2023 06:16:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm3vC0yJLz3ZcB for ; Thu, 7 Dec 2023 06:16:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-a1b75f59a12so60851766b.3 for ; Wed, 06 Dec 2023 22:16:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701929796; x=1702534596; 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=T5sL+go+dGUKMTcM40caYKAD13BJJcft3wrFe2BU11Y=; b=UJb847H/MxwtWh1q544/mfXzurt+teWR7em2fLjHmQR4zrjUoEwGD1LX/ZKEOGj9m0 E2Z+tO3N6AilinUZ7ScHvCxswlh2Mk9CMwrF1QpdPlh2gvTOcjOzd49ImiB14tJDEphV aYxQQGgd4ekQm+O6t2YUiDGo2YpgzcwnAMlPMq9EPkz5stAbxds+fGZMyLmnoxIjkOS3 E3Cfp2oDDvdfkCjBx74Xze0rmDUINBis/QKF5jCXL0RtkV8KeXwcW/gSyWtdeUvR9c1V GtccFYY0Cdjl3GCIEk8TRT2EfMZXr8xLGNJtoqOzgw4Q+MjlonIJjOONcD29Hbcv5co8 GCHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701929796; x=1702534596; 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=T5sL+go+dGUKMTcM40caYKAD13BJJcft3wrFe2BU11Y=; b=sRsGOLwtvQcQDj8E0JB3FUpew/7nVZmmAoEmPx0vm44rFHq5FKjwfnz4S4H+HCWmo0 kSpUv8SzbX2XhkTunjOeWdWtbSESLnM1n9cAc+p7QSG2/mwjPr0Iexfokff6muWbKp2p 1AHr6HBFHesirSwU7EKdz8MCl/JTVGSjbYyTr03HOD/XG5DKlvOuKeHxMSTOf9JBLh+K 7RhWsCcp0EY1/FKJ+IrFpl/YBqNruw+qEYgACscpf6tRqlHifU2wHcWyE4fvqiWT6Rpl llr7hdiBaLmjPImgEgxfN5nfpQV1DoQfwITPK1lRsB/zAXezNCEQF+5h+0RRruaez2bQ HwcA== X-Gm-Message-State: AOJu0Yyoz2yX9eTwasHKJbLXojSJn9hvAl0r+BFvYXCTq42VDM+P5Jqh l8WzX2WbOsP4IGz5KQXTsdAnSydqGp/bTkFN96S3CA== X-Google-Smtp-Source: AGHT+IFUgLCjBEGCW3HAv/v3BUBBT9wgbfQZuOYoNbLJP9Li44sXh3b5bemKfrrIggwWsEazO4UVFUB7m6v2PAAl/i8= X-Received: by 2002:a17:906:1311:b0:a1d:157d:efce with SMTP id w17-20020a170906131100b00a1d157defcemr539472ejb.106.1701929796111; Wed, 06 Dec 2023 22:16:36 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202312070235.3B72ZoZp043061@gitrepo.freebsd.org> <71239.1701921562@kaos.jnpr.net> <58331.1701924865@kaos.jnpr.net> In-Reply-To: <58331.1701924865@kaos.jnpr.net> From: Warner Losh Date: Wed, 6 Dec 2023 23:16:24 -0700 Message-ID: Subject: Re: git: 83d0b8c089d8 - main - bsdinstall generate opt_osname.h in include To: "Simon J. Gerraty" Cc: Jessica Clarke , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000ee225b060be56852" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Sm3vC0yJLz3ZcB --000000000000ee225b060be56852 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Dec 6, 2023, 9:55 PM Simon J. Gerraty wrote: > Jessica Clarke wrote: > > > Warner Losh wrote: > > >> Silly question: why not just add it to CFLAGS with > > >> -DOSNAME=3D\"${OSNAME}\" rather than generating this file? > > > > > > Actually it is an excellent question - I've no idea why opt_osname.h = is > > > needed. > > > > To quote the motivation from brd@=E2=80=99s original review: > > > > > The reason I did it using a file is so that make(1) would detect a > > > change a rebuild if you change the value and do another build. > > A fair point. Of course moot if using META_MODE. > The other benefit of the header is only the files that include it will > be rebuilt when the value changes whereas (with META_MODE) everything > will be rebuilt if value is in CFLAGS. > > That can be mitigated by using per object CFLAGS, but all in all the > header is a simpler solution. > This name never changes on practice. We shouldn't optimize for a rare case that causes build races. Who would ever change it in the same tree? Warner --sjg > --000000000000ee225b060be56852 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Wed, Dec 6, 2023, 9:55 PM Simon J. Gerraty <sjg@juniper.net> wrote:
Jessica Clarke <jrtc27@freebsd.org> wr= ote:
> > Warner Losh <imp@bsdimp.com> wrote:
> >> Silly question: why not just add it to CFLAGS with
> >> -DOSNAME=3D\"${OSNAME}\" rather than generating thi= s file?
> >
> > Actually it is an excellent question - I've no idea why opt_o= sname.h is
> > needed.
>
> To quote the motivation from brd@=E2=80=99s original review:
>
> > The reason I did it using a file is so that make(1) would detect = a
> > change a rebuild if you change the value and do another build.
A fair point.=C2=A0 Of course moot if using META_MODE.
The other benefit of the header is only the files that include it will
be rebuilt when the value changes whereas (with META_MODE) everything
will be rebuilt if value is in CFLAGS.

That can be mitigated by using per object CFLAGS, but all in all the
header is a simpler solution.

This name never changes on practice.=C2=A0 We = shouldn't optimize for a rare case that causes build races. Who would e= ver change it in the same tree?

Warner=C2=A0

<= div class=3D"gmail_quote">
--sjg
--000000000000ee225b060be56852-- From nobody Thu Dec 7 06:17:49 2023 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 4Sm3wY4kJLz53hB0; Thu, 7 Dec 2023 06:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm3wY4DDrz3ZvK; Thu, 7 Dec 2023 06:17:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701929869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k0Jie6/2Evl5PFY0pivUeSPvtON+xewqZz3CgVk1ip0=; b=ZSHpqXPGMHvVXTmykPipA7XWCec60T4KThAfYGOrpyaYGIvhrf5WKPA7/vC4fGsdbyayLE 53nzmieolGNsHcqO7iNOGz+rLVGdqXWYNxpUZZ0PyjJTSFvFRE+HNWLMNAxH9bOuyvces2 CoG171vs855ZLe8xedwKgSh/QyhxQ9EeHtCZdU476bSJPMNVsXGb011n9i4503pR+Zy+s5 VDqTMNedt8U0wV6LqVpoQrbmrzurarCcCOvFdrbGxlleemK9uzeB48t88we980q2wNDseV UHjmzZRGD/WM0fN46RfMHCpX9pQXucUGb0LEj4uEI4eB4waRH3KMCGqhub4a8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701929869; a=rsa-sha256; cv=none; b=pPEyEVruFCXWsaUxdwHz1l+u+68rFFDDberJB96WuGmnqOzJuWwus89qTl1r5pVEi0jz9C ZDP5KP7dvh1j1zxbqh7n4KxYe7savCwQCK3fS+t/9jRF3Ol+Zmk8lJgtTQKZGi/Ux5gHtr 0okWQe9fD97IhQpAHlt8nCNlO8FUApJ29AAOaavC9eLFCEBAmuS96cJWFZsyWVw/2n8oZk BL72vzV5CdqJZQkXTiNOi4dTvf40xHqiFG1jbQI8m4z5Q8jGgUhkMmjYIdv2ET23NDfrsQ NTNtcvFY74ecOJl8NRyVBqBTR/T7YXb28a5z8gYqJzxpHukL1Xhu9Wi33m0O4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701929869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k0Jie6/2Evl5PFY0pivUeSPvtON+xewqZz3CgVk1ip0=; b=LrgaiQv6lutb+7mFwC7WKqWJVxW9ymxN3v1P7xihS2pafOkaWH7Iu+xrZzOtSlWbJeL+2O ZvLLFLxDi9LDCN0/AxqhNrSr9k1MfZ8U3lsfsXsLCIAIJVH4VZjryazimfvE9OBJ0rP8LI 7trZLRToz7wbfPpE2SpRzPp4E1u4imHdk+vCzQoRG0u7RpWcM+ksb7GsnbiRCZLp//6e1R BbG/Vm4bTeFmZPkK/QIZmhJps0Qnk6i9WcyvyJsBcaFGvgB8Zpx2C5zVdKHj4dQ2oC8QS/ X5kc1KD+D8PeiviNFJSr82DrGALnVzx4PjU/kQx+L2mec7pQwBfwpwiNMr4g2w== 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 4Sm3wY3GzKz9sC; Thu, 7 Dec 2023 06:17:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B76HnYI013740; Thu, 7 Dec 2023 06:17:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B76Hn6A013737; Thu, 7 Dec 2023 06:17:49 GMT (envelope-from git) Date: Thu, 7 Dec 2023 06:17:49 GMT Message-Id: <202312070617.3B76Hn6A013737@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: 5c8b07fe8449 - main - bsdinstall: add include to SUBDIR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5c8b07fe844984be1d4acc039bde28fae0638d06 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5c8b07fe844984be1d4acc039bde28fae0638d06 commit 5c8b07fe844984be1d4acc039bde28fae0638d06 Author: Simon J. Gerraty AuthorDate: 2023-12-07 06:17:14 +0000 Commit: Simon J. Gerraty CommitDate: 2023-12-07 06:17:14 +0000 bsdinstall: add include to SUBDIR --- usr.sbin/bsdinstall/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index 422bdcaaa77a..ec7ff2aebafa 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -1,5 +1,5 @@ -SUBDIR= distextract distfetch partedit runconsoles scripts +SUBDIR= distextract distfetch include partedit runconsoles scripts SUBDIR_PARALLEL= SUBDIR_DEPEND_distextract = include SUBDIR_DEPEND_distfetch = include From nobody Thu Dec 7 06:26:05 2023 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 4Sm46M6s2Xz53hdS for ; Thu, 7 Dec 2023 06:26:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm46M5CM1z3cSC for ; Thu, 7 Dec 2023 06:26:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40b595bf5d2so7101825e9.2 for ; Wed, 06 Dec 2023 22:26:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701930378; x=1702535178; 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=31NqvO3xbsoZ4P95WNEJngzE3ewHXQUF0Ai4VaZ+L28=; b=nNZYzy/xgL1uaxLdewGwj0HRc7uEy21qImuDJmuEC+wrtSqd4SjKYNsbWReHnZ+eZz tudC8CjBKuFmbi6yQ1MsG+grAfVyiY6JyFm1m9EN8Apugce8u0eILsXWn9mAoGTcfyVj O6cUHWKQCF25junU9j4u/fZnQmsztPo9nseu0vUZu0tNIiLSyB6fKDZzGU8KH9ATjFP/ hB8tWwGgvO38MNLJdyXl7/VJI4D7QWI6gGKjUkhsoBxUrD+VJabXXTtUTzQ82iu1LjUc ombCrtu6/t6Wj0w/PaRNBB/vGzqd5PNiNULciBZSSgaksNuzRO3DZiqdySH5+pNo2njb USGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701930378; x=1702535178; 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=31NqvO3xbsoZ4P95WNEJngzE3ewHXQUF0Ai4VaZ+L28=; b=HzMXQul6RhlaY9mPrICfIgVdHN0B2DZnHaKhTmnK0W7RNk+lsXKjCJ6jKkA1luiTmQ 4GPFgCejXTyihvi2dciQzSufVezBA9s+arCtTkJewihzqrmSJ8DdaePzy5UEiCIhaDEE CUgwNyrnSDf+ZHA3rv7mh+LKiATlYYF2pzlOrPHTO3QQBqO9hxoVK5UStTwf1Go+cwRK mqAGVwdFcC5vfAJP+uXkoE+sBznvH+ZAwoblAmOfFVdGUyMrheBx5Od5rHK+85UyV7O/ 2kYZUKlAbfWHopq6YlwoOBW60s+QXLvvTw+P3ES7W5K4HK+SHWKPM1fbXepVkDKxcQF0 Eo8Q== X-Gm-Message-State: AOJu0YxPdKKUpbrQMbdEMSgCs7xIhvEl7oJ5FKrgJ2yDb9yzD0uPX/kG Ho1W4VaMsuu3UN+8Ofl36Ri17mROHPi+rZK4/Lp28Q== X-Google-Smtp-Source: AGHT+IGLFyyCLFjx87h1qn18hQfaJb5gOvRNtKN4AiuBgBmKz99+tKk9B8RtLehyxEuRIb2LHhWnnRfHyrwzLNiPPu0= X-Received: by 2002:a05:600c:4fd4:b0:40b:5e21:c5d7 with SMTP id o20-20020a05600c4fd400b0040b5e21c5d7mr706710wmq.165.1701930377998; Wed, 06 Dec 2023 22:26:17 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> In-Reply-To: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> From: Warner Losh Date: Wed, 6 Dec 2023 23:26:05 -0700 Message-ID: Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources To: Philip Paeps Cc: src-committers , "" , "" Content-Type: multipart/alternative; boundary="0000000000009d08f0060be58b36" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Sm46M5CM1z3cSC --0000000000009d08f0060be58b36 Content-Type: text/plain; charset="UTF-8" We should point to bipm https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list since they are the source of truth, no? Warner On Wed, Dec 6, 2023, 10:50 PM Philip Paeps wrote: > The branch main has been updated by philip: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=b1c95af45488bef649e9a84890e2414ff80b3a00 > > commit b1c95af45488bef649e9a84890e2414ff80b3a00 > Author: Philip Paeps > AuthorDate: 2023-12-07 05:48:13 +0000 > Commit: Philip Paeps > CommitDate: 2023-12-07 05:48:13 +0000 > > rc.conf: correct $ntp_leapfile_sources > > IETF is no longer serving leap-seconds.list. Point at IANA instead. > > This fixes "service ntpd fetch". > > MFC after: 1 day > --- > libexec/rc/rc.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf > index 3269288728b6..145e0b70ca3b 100644 > --- a/libexec/rc/rc.conf > +++ b/libexec/rc/rc.conf > @@ -424,7 +424,7 @@ ntp_src_leapfile="/etc/ntp/leap-seconds" > # Initial source for ntpd leapfile > ntp_db_leapfile="/var/db/ntpd.leap-seconds.list" > # Working copy (updated weekly) leapfile > -ntp_leapfile_sources=" > https://www.ietf.org/timezones/data/leap-seconds.list" > +ntp_leapfile_sources=" > https://data.iana.org/time-zones/tzdb/leap-seconds.list" > # Source from which to fetch leapfile > ntp_leapfile_fetch_opts="-mq" # Options to use for ntp leapfile fetch, > # e.g. --no-verify-peer > --0000000000009d08f0060be58b36 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
We should point to bipm https://hpiers.obspm.fr/iers/bul/bul= c/ntp/leap-seconds.list since they are the source of truth, no?

Warner=C2=A0

On Wed, Dec 6, 2023= , 10:50 PM Philip Paeps <philip@fr= eebsd.org> wrote:
The bran= ch main has been updated by philip:

URL: ht= tps://cgit.FreeBSD.org/src/commit/?id=3Db1c95af45488bef649e9a84890e2414ff80= b3a00

commit b1c95af45488bef649e9a84890e2414ff80b3a00
Author:=C2=A0 =C2=A0 =C2=A0Philip Paeps <philip@FreeBSD.org>
AuthorDate: 2023-12-07 05:48:13 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Philip Paeps <philip@FreeBSD.org>
CommitDate: 2023-12-07 05:48:13 +0000

=C2=A0 =C2=A0 rc.conf: correct $ntp_leapfile_sources

=C2=A0 =C2=A0 IETF is no longer serving leap-seconds.list.=C2=A0 Point at I= ANA instead.

=C2=A0 =C2=A0 This fixes "service ntpd fetch".

=C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 1 day
---
=C2=A0libexec/rc/rc.conf | 2 +-
=C2=A01 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf
index 3269288728b6..145e0b70ca3b 100644
--- a/libexec/rc/rc.conf
+++ b/libexec/rc/rc.conf
@@ -424,7 +424,7 @@ ntp_src_leapfile=3D"/etc/ntp/leap-seconds" =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # Initial source for ntpd leapfile =C2=A0ntp_db_leapfile=3D"/var/db/ntpd.leap-seconds.list"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # Working copy (updated weekly) leap= file
-ntp_leapfile_sources=3D"https:= //www.ietf.org/timezones/data/leap-seconds.list"
+ntp_leapfile_sources=3D"http= s://data.iana.org/time-zones/tzdb/leap-seconds.list"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # Source from which to fetch leapfil= e
=C2=A0ntp_leapfile_fetch_opts=3D"-mq"=C2=A0 # Options to use for = ntp leapfile fetch,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # e.g. --no-verify-peer
--0000000000009d08f0060be58b36-- From nobody Thu Dec 7 06:34:47 2023 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 4Sm4JF3Sg7z53jCW; Thu, 7 Dec 2023 06:34:53 +0000 (UTC) (envelope-from philip@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm4JF2rsSz3d7g; Thu, 7 Dec 2023 06:34:53 +0000 (UTC) (envelope-from philip@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701930893; 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=Iswt8Oagi/VH9pumVlyGQXiY2yiBfLq6s+aGUZnhEnk=; b=hnmrQOD24DcxbfPVe+/a47Tt4eMWQ/V3eZ6LKc907cCBj0onzI4XLQF1JFkWolkw+zsWUi d4+BS72zZsY7MqFIlXmSeMYCHrYbWsC+Qnr3t9nU5VNsCk3afp1LJJr58+RPHZtBZucm4J TLuwo9AQi+6rn6KAC1lgXGC/qkzexAJFXjj+OAEjs7CfpwmfolIGQ2TocSGJNzXIcb9W9w RMdihmvWh2JkGXd5P4w5wY/hOG3BHyzpk+Af0vWjAZBG9ClFyMYon/QldpPvVC/HgmQERl y+PbSNC6vzj4auJAxnvH7h1q3vXSlOUAEz6DyTkMREz50ykTgktGxrltNB2zPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701930893; a=rsa-sha256; cv=none; b=OUD3PtPJVK6hq4ZB89B6tLwCilbIZCxKEL1JRODyz0E70S0rHApigouXvwHTPTHZrBUSJV LhpuPSFc7is+u2HOa3QTgFQodMi5QdbFoxO5tdbucJy+36XMvA8Nf9mIduB1kb4TDLttoZ pyn6lTMkUQrfVd0ECGQGYRcmtGZcdivvSoOvcLcN40dLwO8qjYbbf8mMVtUAt8PdHnufEo WlS4RLWVO7XUon9Zf5Mxavl+hQZPFhvyMRknalEt5tfsvxCFRWQNZd/wvZi39GTCav9lcm GIu7Y1SGEu+LCgRWatLWestkPD08aTgNNkJO5rIIyDX0e4D+NUcvnn9Ys+IHxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701930893; 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=Iswt8Oagi/VH9pumVlyGQXiY2yiBfLq6s+aGUZnhEnk=; b=vRtx+0PGe8GCzaFYUrcmjjaZt+n+g1rLYxHFSVPrtDp+Ubxv6RQhCXrTePr8tGqMJK3+ku 9jgL6Woq7MIqYan962Bk65xXanNHPJkWdLXD/LapZuEiQUzY3WgRnRhwcEXW1DpcQkUvas /6vZLEv6fx7v6mrK4BhlUqIAd9G8nNZAA3P4z4IjSpkAxJtcoxCyh4bYpb05vCmUJbg7y+ aFPtP/YuPILDDcCLW8Im8smFzDcWGJeBSdwY7PDrUwy6fltU5QP+qvPX4wdLZTTnwgOZRz x6DhIpXha3jEFZoNKmwZz/bqOHmnU3hVPfy1YgnWZTYFDEHIfyCo8uumyKVJbw== Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (using TLSv1.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: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Sm4JF1ffVzqt; Thu, 7 Dec 2023 06:34:53 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailauth.nyi.internal (Postfix) with ESMTP id 16AD027C0054; Thu, 7 Dec 2023 01:34:53 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 07 Dec 2023 01:34:53 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudekuddgleejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffoffkjghfgggtsehttd hmtdertddtnecuhfhrohhmpefrhhhilhhiphcurfgrvghpshcuoehphhhilhhiphesfhhr vggvsghsugdrohhrgheqnecuggftrfgrthhtvghrnhepieefleefuedtvdehueekffegud dutedtkeffteduffehffeigfetteeggeevgfeunecuffhomhgrihhnpehosghsphhmrdhf rhdpihgrnhgrrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhhihhlihhpodhmvghsmhhtphgruhhthhhpvghrshhonhgrlhhithih qdduudeiiedviedvgeekqddvfeehudektddtkedqphhhihhlihhppeepfhhrvggvsghsug drohhrghesthhrohhusghlvgdrihhs X-ME-Proxy: Feedback-ID: ia691475d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 7 Dec 2023 01:34:51 -0500 (EST) From: Philip Paeps To: Warner Losh Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources Date: Thu, 07 Dec 2023 14:34:47 +0800 X-Mailer: MailMate (1.14r6005) Message-ID: <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> In-Reply-To: References: <202312070550.3B75o8WV066387@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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; format=flowed On 2023-12-07 14:26:05 (+0800), Warner Losh wrote: > We should point to bipm > https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list since they > are > the source of truth, no? I went for the IANA copy because data.iana.org is a much shorter and trustworthy looking URL. And it's also where other operating systems get their copies. (There's a thread on the IANA tz mailing list about how up to date the IANA copy is.) Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From nobody Thu Dec 7 07:06:58 2023 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 4Sm51X5qx1z53kfg for ; Thu, 7 Dec 2023 07:07:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm51X3yNSz4Djl for ; Thu, 7 Dec 2023 07:07:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-54cde11d0f4so804852a12.2 for ; Wed, 06 Dec 2023 23:07:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701932830; x=1702537630; 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=un4i7VgRUgWFWRQIykd4tI7u78woIt/EIErwo95Nclw=; b=vRs0FsvY5eYHD8KRrPMTkYLeMUsdTCTTeCcl+5XjLok1OQ4PtIR5aqt4N5ohSxAmqj +7cfpe30JeJYhP2UWZN+eUfjCrrK5nh7EItMbIZpyc6hDA/jWm9GMzid0x+KSJbqkp8p oIAcQ7KnlGzZlwoFwB3Wvh4ZwR5RaeE2h8cEqgXOAWbN7wQCR9kjVadTvfwibBMlaRAe JNjLF6DNik5e7kzPaGk6Ex7i2dezjSiraFK4XLo3X9TgOLYqXog7sZnsR5I113sDAJ+W j2mdOVV4wqIFHia7ZulxygxVn5YaQTq/BOEYH6naMjmNQlsK/MTZw7Ps8wqKNFrfDWla B4jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701932830; x=1702537630; 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=un4i7VgRUgWFWRQIykd4tI7u78woIt/EIErwo95Nclw=; b=jrsbtfdh1eQkRUK2Y8ESTNCXN+gI75UmuchT7s37qiEwC9dsA/8Jlykf692EaPOABS 2Isx4z8l6ykW3uqKarj5Te8/btbrOaBgUHc3XsoiZayuSBGwFQcmJXHTnVknvhBlhzVh 0IbQj5UFya5ZYNhF50IJHWY1rXkNWdak1aBsEgISTs/msQMiA6DLl6GBVHdVB6HxomoL Kby01KxqiaJLuT4X6HYH4itGPf6XkPlMOe5+wTFKN9ULR67I3McFBCQQ0wGYH4PEl7t6 EJifRGHtxS9Lh1O0wNJaolvQiM3todA+J79K5OaV4W7BDdXrEU5zSj5sFPZ1EmdTqjBy nskQ== X-Gm-Message-State: AOJu0YxU2wocwy4IvStcxLNcaSum5bs+ZiNPomSzRinR3Tn8vBW4QE2A y6nLKbLoPvbbCrYAGHGSa2+sUMs+ymwQFIhjhDX9Hg== X-Google-Smtp-Source: AGHT+IErdngnqvhj6d6101JNKlIx+eEl0m8UOfkwniQs0bAquEEkc58PE81f+bikfdqffmG9o/tRcmHjjPa6+ebfmPU= X-Received: by 2002:a17:906:ae51:b0:a1c:f8db:c6a5 with SMTP id lf17-20020a170906ae5100b00a1cf8dbc6a5mr1482912ejb.46.1701932830268; Wed, 06 Dec 2023 23:07:10 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> In-Reply-To: <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> From: Warner Losh Date: Thu, 7 Dec 2023 00:06:58 -0700 Message-ID: Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources To: Philip Paeps Cc: src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000c7af09060be61d1b" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Sm51X3yNSz4Djl --000000000000c7af09060be61d1b Content-Type: text/plain; charset="UTF-8" On Wed, Dec 6, 2023, 11:34 PM Philip Paeps wrote: > On 2023-12-07 14:26:05 (+0800), Warner Losh wrote: > > We should point to bipm > > https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list since they > > are > > the source of truth, no? > > I went for the IANA copy because data.iana.org is a much shorter and > trustworthy looking URL. And it's also where other operating systems > get their copies. > > (There's a thread on the IANA tz mailing list about how up to date the > IANA copy is.) > Shorter URLs aren't necessarily better.. we should have this be a list though... Warner Philip > > -- > Philip Paeps > Senior Reality Engineer > Alternative Enterprises > --000000000000c7af09060be61d1b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Wed, Dec 6, 2023, 11:34 PM Philip Paeps <philip@freebsd.org> wrote:
<= blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px= #ccc solid;padding-left:1ex">On 2023-12-07 14:26:05 (+0800), Warner Losh w= rote:
> We should point to bipm
> https://hpiers.obspm.fr/i= ers/bul/bulc/ntp/leap-seconds.list since they
> are
> the source of truth, no?

I went for the IANA copy because data.iana.org is a much shorter = and
trustworthy looking URL.=C2=A0 And it's also where other operating syst= ems
get their copies.

(There's a thread on the IANA tz mailing list about how up to date the =
IANA copy is.)

Shorter URLs aren't necessarily better..=C2=A0 we should = have this be a list though...

Warner

Philip

--
Philip Paeps
Senior Reality Engineer
Alternative Enterprises
--000000000000c7af09060be61d1b-- From nobody Thu Dec 7 07:17:55 2023 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 4Sm5G150x0z53lMS; Thu, 7 Dec 2023 07:18:01 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) (using TLSv1.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 "anubis.delphij.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm5G03lHmz4FbX; Thu, 7 Dec 2023 07:18:00 +0000 (UTC) (envelope-from delphij@delphij.net) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=delphij.net; i=@delphij.net; q=dns/txt; s=y07n; t=1701933477; h=message-id : date : mime-version : reply-to : subject : to : cc : references : from : in-reply-to : content-type : from; bh=e/vpXJhYt2n8Msi4nCVzasjg2/bGIItx/fTRwhN7tm4=; b=hOmMfQVyRbsir/1OGl0pIr7k5jum70YYIxZD8+ccPQIiwPb6APy+c2QsYW707jnfOjrdM n9ubPRRJPmWbJ5xDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=delphij.net; i=@delphij.net; q=dns/txt; s=w44o; t=1701933477; h=message-id : date : mime-version : reply-to : subject : to : cc : references : from : in-reply-to : content-type : from; bh=e/vpXJhYt2n8Msi4nCVzasjg2/bGIItx/fTRwhN7tm4=; b=dMzqEY9gQbsP9a2NkqYe1aqMboNHxmq/2CB538DHNEAkGSwtWNrdTBCwb4HrCMN1kWqg/ mSvXSIlq4vuXN/Gy6p3bw3uaJLBLReARymVTisvariKehqtiNp3vIpglJDfKcRKBbd7NjBp 4QrSbaRgYgu4ycgYr+3U2NDxurjSnKoJ76PQyAagZPrRe8JDv5et4ErfkVV9UxhYtXyTgsQ Egcr/hPemjgwwbVUVg7U4ygPpzIye2FqxCLLNvr2c6soRuTGLAYkKNs1xRi7qddigJsstbG j3qJ1yMvzyVrHnOr4RXiYaZQH9JoGZO9aFgg9qyydrAhSM1nqiQ/Lec8gC0Q== Received: from xins-laptop (c-24-23-186-137.hsd1.ca.comcast.net [24.23.186.137]) by anubis.delphij.net (Postfix) with ESMTPSA id 537BD30299; Wed, 6 Dec 2023 23:17:57 -0800 (PST) Message-ID: Date: Wed, 6 Dec 2023 23:17:55 -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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Reply-To: d@delphij.net Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources Content-Language: en-US To: Philip Paeps , Warner Losh Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> From: Xin Li Autocrypt: addr=delphij@delphij.net; keydata= xjMEZPbDoRYJKwYBBAHaRw8BAQdAsUNmxEWz6QiGdFbBrVVEpjNpgQV9FXjDWsLsY0UwRPvN HFhpbiBMSSA8ZGVscGhpakBkZWxwaGlqLm5ldD7ClgQTFgoAPhYhBLskk2pXNatsapeNzxED 4uuXWeTFBQJk9sRMAhsDBQkKBDXmBQsJCAcDBRUKCQgLBRYCAwEAAh4FAheAAAoJEBED4uuX WeTF6yIA/2Ls3Rb/qC8mQZ6D2S0UO5vblPghJfboFJLNJFw3i4GYAQCsTmQg3ahgbNEJu/vU xgtro2kTxa6kKnZ35IbqPqPcCc44BGT2w6ESCisGAQQBl1UBBQEBB0Cxji+sQgVPajLNA/Lw yHx0ogSalPQszdkfVgeg3iR3FAMBCAfCeAQYFgoAIBYhBLskk2pXNatsapeNzxED4uuXWeTF BQJk9sOhAhsMAAoJEBED4uuXWeTF3BQBAIx/gPCTFN2DPBrKLkE3oC/+j9EkmNLMUCGidlP/ Zb6HAP4nL1kStTsOldIGhi/3m1LvU7r3Kel3MnlIK8/9BlLPAg== In-Reply-To: <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------cihkyhQs4G9fZE7hVwQm0xxm" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:64.62.128.0/18, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Sm5G03lHmz4FbX This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------cihkyhQs4G9fZE7hVwQm0xxm Content-Type: multipart/mixed; boundary="------------C3jtBl0f9XpsmbgIhPL0u0Si"; protected-headers="v1" From: Xin Li Reply-To: d@delphij.net To: Philip Paeps , Warner Losh Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> In-Reply-To: <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> --------------C3jtBl0f9XpsmbgIhPL0u0Si Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 T24gMjAyMy0xMi0wNiAyMjozNCwgUGhpbGlwIFBhZXBzIHdyb3RlOg0KPiBPbiAyMDIzLTEy LTA3IDE0OjI2OjA1ICgrMDgwMCksIFdhcm5lciBMb3NoIHdyb3RlOg0KPj4gV2Ugc2hvdWxk IHBvaW50IHRvIGJpcG0NCj4+IGh0dHBzOi8vaHBpZXJzLm9ic3BtLmZyL2llcnMvYnVsL2J1 bGMvbnRwL2xlYXAtc2Vjb25kcy5saXN0IHNpbmNlIHRoZXkgDQo+PiBhcmUNCj4+IHRoZSBz b3VyY2Ugb2YgdHJ1dGgsIG5vPw0KPiANCj4gSSB3ZW50IGZvciB0aGUgSUFOQSBjb3B5IGJl Y2F1c2UgZGF0YS5pYW5hLm9yZyBpcyBhIG11Y2ggc2hvcnRlciBhbmQgDQo+IHRydXN0d29y dGh5IGxvb2tpbmcgVVJMLsKgIEFuZCBpdCdzIGFsc28gd2hlcmUgb3RoZXIgb3BlcmF0aW5n IHN5c3RlbXMgDQo+IGdldCB0aGVpciBjb3BpZXMuDQoNCk15IHVuZGVyc3RhbmRpbmcgaXMg dGhhdCBJQU5BJ3MgY29weSBpcyBwYXJ0IG9mIHR6ZGF0YSBhbmQgaXQncyBvbmx5IA0KdXBk YXRlZCB3aGVuIGEgbmV3IHNldCBvZiB6b25lIGRhdGEgaXMgcmVsZWFzZWQsIHNvIGl0J3Mg c29tZXRpbWVzIA0Kb3V0ZGF0ZWQuICBJdCBpcyBhY3R1YWxseSBnb2luZyB0byBiZSBvdXRk YXRlZCByZWFsbHkgc29vbiBieSB0aGUgd2F5Lg0KDQpUaGUgSUVSUyBvbmUgaXMgbW9yZSB1 cC10by1kYXRlIGJlY2F1c2UgdGhleSBwdWJsaXNoIHRoZSBidWxsZXRpbi4NCg0KVGhlIGJ1 bmRsZWQgdmVyc2lvbiB3YXMgZnJvbSBOSVNUIGZ0cCwgYnV0IGZldGNoaW5nIGZyb20gZnRw IGZvciBldmVyeSANCkZyZWVCU0Qgc3lzdGVtIG91dCB0aGVyZSB3YXMgdG9vIHNjYXJ5IGZv ciBtZS4NCg0KVGhlcmUgbWF5IGJlIHNvbWUgc2VjdXJpdHkgLyBwcml2YWN5IGNvbmNlcm5z IGlmIHdlIGRpcmVjdCB1c2VycyB0byBhIA0KcGxhY2UgdGhhdCB3ZSBkbyBub3QgaGF2ZSBj b250cm9sLCBieSB0aGUgd2F5Lg0KDQpDaGVlcnMsDQo= --------------C3jtBl0f9XpsmbgIhPL0u0Si-- --------------cihkyhQs4G9fZE7hVwQm0xxm Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQS7JJNqVzWrbGqXjc8RA+Lrl1nkxQUCZXFxowUDAAAAAAAKCRARA+Lrl1nkxeQu AP9C2eVb7/g5UzVZlWzq1mFtnq80P85J3XjoO9XxR1lc1AD9EHynJVPM2WU65NzhMFo1hcDk7Efx LFaHt3zjFRb1vgY= =NF7+ -----END PGP SIGNATURE----- --------------cihkyhQs4G9fZE7hVwQm0xxm-- From nobody Thu Dec 7 07:26:45 2023 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 4Sm5S950B8z53mMY; Thu, 7 Dec 2023 07:26:49 +0000 (UTC) (envelope-from philip@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm5S94T80z4G43; Thu, 7 Dec 2023 07:26:49 +0000 (UTC) (envelope-from philip@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701934009; 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=wB17VGTeIZMZWt6KzipbWVjNI9WKEO7ZYEzSv6fYN8I=; b=RG65rKALnW8PZZYzwbyBGTdxURnd0DeYWAAFVSmuQZMaaps2ezdZ2ZAluH8bLFHaigOInh YafQzHmJx+IRz4YqALI5DH6NV1VcbJkTr4inSNHurip0syNiiaUS4jgMb9R4IWLtKTWr+U rX0Ay4kmfOzBH+cOMuGRS1QUhQPpv9Q8oRB7Q9btTPlsPIQIHJnBWhFQY6liZThkMUBJmO xl1kbaS4j9lFtRhtr9qKu3yrDwVKELPfyl+nVihZneh7cIzBbwuP72h9GV4m/RbxtfrVUL kSJXjBTvIRSDqn5ah3gT4HAfAByscCHU1gQQp9rH37O3g6hIx1hckNUIRsiZMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701934009; a=rsa-sha256; cv=none; b=Yp7qTxLKDQdlVOCQnFtAZwShkFyn8mUyzf7poWx6QiyVlRyqCdjJPoGkKewxLP5qcdLJpc 05GUkmPEVB9aXEHQdzgdYzSp39mLwwEM/u1hooifExZDuox0YMPY9f0mTR+hPmuuBN1kFt 3Pjw+Es3G/Hi0QTigrVQQIqIH//+c5oWs/rrf0mf94jWGSI1JXdfgEDPQaJX/uoNGokCxy KY8Dxek7XFsXLzAyQcF2SVixDP8yhke8pMU2tNoYEI9yR5prbIqUZRbuQSHTdoLRppkuRO enQeqtBUyaesTd9zZ7PFkUBeJtSPFLH/j9UESXZB+amDmiBf/fYUskddjvzcfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701934009; 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=wB17VGTeIZMZWt6KzipbWVjNI9WKEO7ZYEzSv6fYN8I=; b=vcX+qfY+xg0kHJ8pd0jgnBskaui7IuQ0YRGg1qWleald4gaBnV1MHCC5nCiTXWGC9lLVQk Oi6AOTuQZklu7p+3B96zv4UBFWPvOidcluHCU8ldr27fMvJZcZBZ3bXoOPmDOHubSzQtOj MUjvpWgwjudGzhFj+t57nNQo2G4p1c0IODZxcQYo4p4yEWoxQp6At3YJXMxCzULYmXUb/q iXVes+pQx5J3YmPOM10lOsNCIqmOmiE3nWhOsqdZXdi9dNCpV4t9YHjOt3JiPwXuOLRsxr PCmaCzMEDE/ABCUq0MCnH6IC8/AZ9mw1jNcD3Uzj3Wn3ASLx/Tw3q9uWl39i2A== Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (using TLSv1.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: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Sm5S93B9Dz1ll; Thu, 7 Dec 2023 07:26:49 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailauth.nyi.internal (Postfix) with ESMTP id 2D19D27C0054; Thu, 7 Dec 2023 02:26:49 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 07 Dec 2023 02:26:49 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudekuddguddtjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffokfgjfhggtgesth dtmhdtredttdenucfhrhhomheprfhhihhlihhpucfrrggvphhsuceophhhihhlihhpsehf rhgvvggsshgurdhorhhgqeenucggtffrrghtthgvrhhnpeevjefhhfefieeuieeukedvge evheeiffdtheefteekteduuefhfefgveekgfevgeenucffohhmrghinhepohgsshhpmhdr fhhrpdhirghnrgdrohhrghdpfhhrvggvsghsugdrohhrghenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphdomhgvshhmthhprghu thhhphgvrhhsohhnrghlihhthidqudduieeivdeivdegkedqvdefhedukedttdekqdhphh hilhhipheppehfrhgvvggsshgurdhorhhgsehtrhhouhgslhgvrdhish X-ME-Proxy: Feedback-ID: ia691475d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 7 Dec 2023 02:26:47 -0500 (EST) From: Philip Paeps To: Warner Losh Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources Date: Thu, 07 Dec 2023 15:26:45 +0800 X-Mailer: MailMate (1.14r6003) Message-ID: In-Reply-To: References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; format=flowed On 2023-12-07 15:06:58 (+0800), Warner Losh wrote: > On Wed, Dec 6, 2023, 11:34 PM Philip Paeps wrote: >> On 2023-12-07 14:26:05 (+0800), Warner Losh wrote: >>> We should point to bipm >>> https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list since >>> they >>> are >>> the source of truth, no? >> >> I went for the IANA copy because data.iana.org is a much shorter and >> trustworthy looking URL. And it's also where other operating systems >> get their copies. >> >> (There's a thread on the IANA tz mailing list about how up to date >> the >> IANA copy is.) >> > > Shorter URLs aren't necessarily better.. we should have this be a > list > though... We could also mirror our own copy on freebsd.org, but then we have to keep it up to date. That's probably the best solution. Let me ponder this for a bit. Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From nobody Thu Dec 7 07:48:10 2023 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 4Sm5wp6HQtz53nPS; Thu, 7 Dec 2023 07:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm5wp5mSDz4JDr; Thu, 7 Dec 2023 07:48:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701935290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YksOiwxkTl7mJY79xBmPz898gbIjktgHhFyZBNNx2PI=; b=C3XQxn+yyGpdApSruTeVdTY/P5cL95XqmCZnx0PognCuVHfJVVIFcXV9/3KK5S31w1Hafl un/N7l3rtUfGglTaGsiV3jbdDuJv1Rnpckzdx/Qjixxm4rzUaqSlys8LYMKBqXCvYNai30 +AUJzy8+7oEgm9hnB/tjA3gGQ1TTVgLdTRvPKnGEXhyfHyfCss0ncI8kTTXbzzSLlK6Pdz UO7EHX+lsv5V3CxGwJD5zy2oiXThV6ZdQPgqxwIC6Xzq6aHuv7SF6rk+0trrfsBHJ2sPVk /rBuYjSPSSfi4kfXONLYxeuWcJLWr4RBReb32m/SA98Om+lBP0tkMeuMsg2E0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701935290; a=rsa-sha256; cv=none; b=bVRgBDGfQjRaXZ9vq6A2ekw0sZZ2cKKJkpI7EOU5BRhjrLqYM24PW1BKzp+f7/G9TZAYDu 0zzhx4Osy7KyQNyYpfZmD6sIixaPbPCCDHYkrlD6fk0qXbq8JREIKorQy/cETVqJUWPjde m9Yn0bDBe2ZmpTxpTkI6orEAMWlIEBQKFFKbDVWKvwtlHWHvFlBGuTrzXNsqztGDqqyvON gJ1DFkssqhirZcsnZy1cS+apJdauNijm27ivav2BO6mwwok4iVK2MX7M8Y13O86UEDzBbX dypxR1ztoZ7idKqQdhoQqkCd6mIFCbw4xwq1QDJSHGxekN6WVnSfOtWamBhZ8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701935290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YksOiwxkTl7mJY79xBmPz898gbIjktgHhFyZBNNx2PI=; b=YI/CJ/2qi/ZQoywN80Kt7vXQNWMSh4QH81bfB2v90m8We+7A0H77WS6tNZNNRVl17idlwV IPXR8WdIyg/1hRsB83PA+3C3FNG1QLaANH/UUEVgxxU+TKypo+13E0oMmvV8TPsKGQULVs DeVD2uuepgxB2EfZ/1s+m0UvzOAsRpG4IWv54eyiblk6/23TbgqZDy9/ctug9vrJ5igSBb jcEOTpInDcLKgh4myF91t/h04uVdwRhwlbYwXwysQdGQksJdN4AIBIwMOhz0sLy4YF0VmT UWQdxSGILb8i9x/5khJXmNDGKI3owtbhyqe3GXmqU1HcbZG0QdlVLgYFpbJqwg== 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 4Sm5wp4ZDWzDGF; Thu, 7 Dec 2023 07:48:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B77mA2o063671; Thu, 7 Dec 2023 07:48:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B77mAjx063668; Thu, 7 Dec 2023 07:48:10 GMT (envelope-from git) Date: Thu, 7 Dec 2023 07:48:10 GMT Message-Id: <202312070748.3B77mAjx063668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 1aa0345b86c7 - stable/14 - pkgbase: create source 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1aa0345b86c76dfd674d779fd7bcb2e95d2b895b Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=1aa0345b86c76dfd674d779fd7bcb2e95d2b895b commit 1aa0345b86c76dfd674d779fd7bcb2e95d2b895b Author: Baptiste Daroussin AuthorDate: 2023-11-17 16:19:39 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-07 07:47:16 +0000 pkgbase: create source package FreeBSD-src for all the sources but the kernel FreeBSD-src-sys just for the kernel MFC After: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42651 (cherry picked from commit 99b8c0c35b0fcc633649209621243d678a13542a) --- Makefile | 4 ++-- Makefile.inc1 | 54 +++++++++++++++++++++++++++++++++++++++++--- release/packages/src-sys.ucl | 17 ++++++++++++++ release/packages/src.ucl | 17 ++++++++++++++ 4 files changed, 87 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b36e27e7f294..4a6f4bfd425e 100644 --- a/Makefile +++ b/Makefile @@ -175,8 +175,8 @@ TGTS= all all-man buildenv buildenvvars buildetc buildkernel buildworld \ _build-tools _build-metadata _cross-tools _includes _libraries \ builddtb xdev xdev-build xdev-install \ xdev-links native-xtools native-xtools-install stageworld stagekernel \ - stage-packages stage-packages-kernel stage-packages-world \ - create-packages-world create-packages-kernel create-packages \ + stage-packages stage-packages-kernel stage-packages-world stage-packages-source \ + create-packages-world create-packages-kernel create-packages-source create-packages \ update-packages packages installconfig real-packages real-update-packages \ sign-packages package-pkg print-dir test-system-compiler test-system-linker \ test-includes diff --git a/Makefile.inc1 b/Makefile.inc1 index b73b464be2a9..199a0f2ef0ee 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1955,6 +1955,7 @@ stagekernel: .PHONY PORTSDIR?= /usr/ports WSTAGEDIR?= ${OBJTOP}/worldstage KSTAGEDIR?= ${OBJTOP}/kernelstage +SSTAGEDIR?= ${OBJTOP}/sourcestage REPODIR?= ${OBJROOT}repo PKG_FORMAT?= tzst PKG_REPO_SIGNING_KEY?= # empty @@ -1962,6 +1963,7 @@ PKG_OUTPUT_DIR?= ${PKG_VERSION} .ORDER: stage-packages create-packages .ORDER: create-packages create-world-packages +.ORDER: create-packages create-source-packages .ORDER: create-packages create-kernel-packages .ORDER: create-packages sign-packages @@ -1973,7 +1975,7 @@ _pkgbootstrap: .PHONY # # Determine PKG_ABI from newvers.sh if not already set. # -.if !defined(PKG_ABI) && (make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages) || make(sign-packages)) +.if !defined(PKG_ABI) && (make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages) || make (create-source-packages) || make(sign-packages)) PKG_ABI=${_TYPE}:${MAJOR_REVISION}:${TARGET_ARCH} .endif PKG_BIN_VERSION!=${PKG_CMD} --version /dev/null |\ @@ -2050,7 +2052,10 @@ stage-packages-kernel: .PHONY ${_+_}@cd ${.CURDIR}; \ ${MAKE} DESTDIR=${KSTAGEDIR} -DNO_ROOT stagekernel -stage-packages: .PHONY stage-packages-world stage-packages-kernel +stage-packages-source: .PHONY + @mkdir -p ${SSTAGEDIR}; + +stage-packages: .PHONY stage-packages-world stage-packages-kernel stage-packages-source _repodir: .PHONY @mkdir -p ${REPODIR} @@ -2069,7 +2074,50 @@ create-packages-kernel: _pkgbootstrap _repodir .PHONY SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ create-kernel-packages -create-packages: .PHONY create-packages-world create-packages-kernel +create-packages-source: _pkgbootstrap _repodir .PHONY + ${_+_}@cd ${.CURDIR}; \ + ${MAKE} -f Makefile.inc1 \ + DESTDIR=${SSTAGEDIR} \ + PKG_VERSION=${PKG_VERSION} create-source-packages + +create-packages: .PHONY create-packages-world create-packages-kernel create-packages-source + +create-source-packages: _pkgbootstrap .PHONY + rm -f ${SSTAGEDIR}/*.plist 2>/dev/null || : +.if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git) + @cd ${SRCDIR}; \ + ( echo "@override_prefix /usr/src" ; \ + ${GIT_CMD} ls-files ":!:sys/" ) > ${SSTAGEDIR}/src.plist + @cd ${SRCDIR}; \ + ( echo "@override_prefix /usr/src" ; \ + ${GIT_CMD} ls-files "sys/" ) > ${SSTAGEDIR}/src-sys.plist + sed -e "s/%VERSION%/${PKG_VERSION}/" \ + -e "s/%DESC%/FreeBSD sources/" \ + -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ + -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ + -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ + -e "s|%PKG_WWW%|${PKG_WWW}|" \ + ${SRCDIR}/release/packages/src.ucl \ + > ${SSTAGEDIR}/src.ucl + sed -e "s/%VERSION%/${PKG_VERSION}/" \ + -e "s/%DESC%/FreeBSD Kernel sources/" \ + -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ + -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ + -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ + -e "s|%PKG_WWW%|${PKG_WWW}|" \ + ${SRCDIR}/release/packages/src-sys.ucl \ + > ${SSTAGEDIR}/src-sys.ucl + ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + -M ${SSTAGEDIR}/src.ucl \ + -p ${SSTAGEDIR}/src.plist \ + -r ${SRCDIR} \ + -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} + ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + -M ${SSTAGEDIR}/src-sys.ucl \ + -p ${SSTAGEDIR}/src-sys.plist \ + -r ${SRCDIR} \ + -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} +.endif create-world-packages: _pkgbootstrap .PHONY @rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || : diff --git a/release/packages/src-sys.ucl b/release/packages/src-sys.ucl new file mode 100644 index 000000000000..ad37f5c5a5f1 --- /dev/null +++ b/release/packages/src-sys.ucl @@ -0,0 +1,17 @@ +# +# + +name = "%PKG_NAME_PREFIX%-src-sys" +origin = "base" +version = "%VERSION%" +comment = "FreeBSD Kernel Sources" +categories = [ base ] +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 696527e90ac0 - stable/14 - pkgbase: kill circular dependency List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 696527e90ac0324a59dfa13768bf6fc35a7c0a03 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=696527e90ac0324a59dfa13768bf6fc35a7c0a03 commit 696527e90ac0324a59dfa13768bf6fc35a7c0a03 Author: Baptiste Daroussin AuthorDate: 2023-12-04 16:27:51 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-07 07:47:41 +0000 pkgbase: kill circular dependency clang was set to depend on clang-dev, but clang-dev already depends on clang by design MFC After: 3 days (cherry picked from commit 6084d989497087dc4c7db8621a1b5a8e4d0559e1) --- release/packages/generate-ucl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 9e9680559428..e5563c51a4cd 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -45,7 +45,7 @@ main() { pkgdeps="caroot openssl" ;; clang) - pkgdeps="lld clang-dev libcompiler_rt-dev" + pkgdeps="lld libcompiler_rt-dev" ;; # -dev packages that have no corresponding non-dev package From nobody Thu Dec 7 07:48:12 2023 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 4Sm5ws0hjVz53nXp; Thu, 7 Dec 2023 07:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm5ws09Xpz4JR0; Thu, 7 Dec 2023 07:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701935293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=riq+e//OQXkHxcXRfb3P9Rx4SFfmVs8Wq4/Exp/JKDc=; b=p1Gv3TcRpvqmkZXu8Oawga31pFl3MuzzDcHCLomANmKqNgKCzprX0e6cmYt1k3g7uqhXJj tUycmIccrJbuVPp5MUa6+lRRUiRwiHQJ95pmakjnomMjsK0mo0QVK6r7MZW5cPVUhvMe2k 3l6C/jgHYIAK+ONcj3ZiepKkElcr/dnxnDkjX1EKPqe2aBRxb/VNxgSv7KCuvBZs1Kjzsa tL8hQegoV1d1EvFKyUN3Vq9s+N4U4+5L6rfQXupGly4UPqJxDW1dRhbbqxAX5h1acTdqNh DsaA3HmcH+NFyZm3orJI7510MvFF6Eu/4uqNIz4fIgrh/IWEBImcACo7wizvbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701935293; a=rsa-sha256; cv=none; b=w5Zxy9BoLff+hySugtX89JnEz4CQafXVeL9NsfFoSc6cxojidJVOrusMFmzT3uHlz/kTlH DwZU8CYMIVp2mD9NZ4XDNkhoH6BarCD/ySbmwI3cM6MFJbK0JKn1IE91udDF3VhpTPV5qB xU16glrXB4Cfi3zCA7TsYgx4J9aaAVdq4ZzzT69E9BUteJKppKJtZGiHU4lAeymtvPeBP8 ire+eS/SEE3lkuepCch/TLzJWpjJRuoROgk65acK4HayQftmjDh3nxJiYcEw1jtAAV+NYd G2O45MH5EiEOxFBqHYZVK6CL0RxnkOL/4NQI7UPMcTxdQ6tH8NyNdfdkgoFI6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701935293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=riq+e//OQXkHxcXRfb3P9Rx4SFfmVs8Wq4/Exp/JKDc=; b=YrNpUSOPRf7Suge1DxWbWB/B8H0XSXY8Qh4Ba9nRGq7OQt12R20zsmddHZ2BhxL4zR8Hgv GiSrC1fIvhQsm2jkTCbhZgJmeASLLR/y8ORPmvedqCh9vvCMR52LfMv2H6BHAf+foMzui6 YLnvve/w3tMlioyX39RqmcHS4KdIhxnDMCtdZL+lx2l2mQ0r7FWDboIxGEJaDT78eR123K B520OJjLxwf13mxyE98m8DCX34bQGWQdDl9G2b7Pwf1IX4CH3lBWaElCGRTXoaF7O6BDSB AaZQk4CDYfqb2yTNzmmaX53ZwZfNzxkUOsJqjzPNSyDoUw6AYKcMRmRWP1ZLPQ== 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 4Sm5wr5zVHzDGG; Thu, 7 Dec 2023 07:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B77mC8V063766; Thu, 7 Dec 2023 07:48:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B77mCkB063764; Thu, 7 Dec 2023 07:48:12 GMT (envelope-from git) Date: Thu, 7 Dec 2023 07:48:12 GMT Message-Id: <202312070748.3B77mCkB063764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 44600eb7e231 - stable/14 - pkgbase: propagate SRCRELDATE to the packages correctly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 44600eb7e231b0cc6c36d10031d983051cd683ee Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=44600eb7e231b0cc6c36d10031d983051cd683ee commit 44600eb7e231b0cc6c36d10031d983051cd683ee Author: Baptiste Daroussin AuthorDate: 2023-12-04 08:22:02 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-07 07:48:00 +0000 pkgbase: propagate SRCRELDATE to the packages correctly MFC After: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42892 (cherry picked from commit 5faaa602cee093269b1a73156c95c6892b4f098d) --- Makefile.inc1 | 12 ++++++++++-- release/scripts/make-pkg-package.sh | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 199a0f2ef0ee..ffd0b14ce87d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2012,6 +2012,7 @@ package-pkg: .PHONY env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \ PKG_CMD=${PKG_CMD} PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} \ WSTAGEDIR=${WSTAGEDIR} \ + OSVERSION="${SRCRELDATE}" \ sh ${.CURDIR}/release/scripts/make-pkg-package.sh real-packages: stage-packages create-packages sign-packages .PHONY @@ -2107,12 +2108,16 @@ create-source-packages: _pkgbootstrap .PHONY -e "s|%PKG_WWW%|${PKG_WWW}|" \ ${SRCDIR}/release/packages/src-sys.ucl \ > ${SSTAGEDIR}/src-sys.ucl - ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + ${PKG_CMD} -o ABI=${PKG_ABI} \ + -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} \ -M ${SSTAGEDIR}/src.ucl \ -p ${SSTAGEDIR}/src.plist \ -r ${SRCDIR} \ -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} - ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + ${PKG_CMD} -o ABI=${PKG_ABI} \ + -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} \ -M ${SSTAGEDIR}/src-sys.ucl \ -p ${SSTAGEDIR}/src-sys.plist \ -r ${SRCDIR} \ @@ -2152,6 +2157,7 @@ create-world-package-${pkgname}: .PHONY sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" ${WSTAGEDIR}/${pkgname}.ucl ; \ fi ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} -M ${WSTAGEDIR}/${pkgname}.ucl \ -p ${WSTAGEDIR}/${pkgname}.plist \ -r ${WSTAGEDIR} \ @@ -2187,6 +2193,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap /version/ {print $$2; next } ' \ ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} \ -M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \ -p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \ @@ -2223,6 +2230,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne /version/ {print $$2; next } ' \ ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} \ -M ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \ -p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \ diff --git a/release/scripts/make-pkg-package.sh b/release/scripts/make-pkg-package.sh index 25ec08f71fe6..68172c47f326 100755 --- a/release/scripts/make-pkg-package.sh +++ b/release/scripts/make-pkg-package.sh @@ -9,6 +9,7 @@ export WSTAGEDIR=${WSTAGEDIR} export REPODIR=${REPODIR} export PKG_CMD=${PKG_CMD} export PKG_VERSION=${PKG_VERSION} +export OSVERSION=${OSVERSION} export WRKDIR=$(make -C ${PORTSDIR}/ports-mgmt/pkg -V WRKDIR) make -C ${PORTSDIR}/ports-mgmt/pkg TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ From nobody Thu Dec 7 11:33:05 2023 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 4SmBwL1bJSz544Vs; Thu, 7 Dec 2023 11:33: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmBwL15hxz3KbC; Thu, 7 Dec 2023 11:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701948786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zSfABy4pTNJ82hrzxwJI6i005eAVr6jc3VKlqB//5FU=; b=yX2TC5hfldCXVXlhfjbdVGJHIBqsLOWFXn6HkQXlPlhQmHygffn46MyGdr/gpiF3FqX9NY fa9abxyzj4mQJNhdCADsaHeOWLuX50DrQG4bYz4bokJEXG0jCSHAAQHdE2RVRT0h8p2o5Q fjIChos/D1cZqQ+jiyYfp3lcUC/P1o9aplJNhBAJUsKbfzY2py7h2/0oQ7ji8AiZy37iJw 6IJqNw1FcByOPZEtV/1YPS5ilEOsluqKWSAAmny1g0pyu+dYfJZj2BkW7UPCo4gd/rLVwf hlTGXGHwTc+L8xqiq1IzdNwN70J6gVJDe9sP3baDBU5xoGLRDhiHjoh4N98xfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701948786; a=rsa-sha256; cv=none; b=sqyAnkFmMD0BQZmTss6lCQBMZ1zOg5ZaiMRHSjska3k2vfaKoczkbYjsCI2hDNCxd/5Tt5 mGPtXPeKtX3tv5phctUxBWPKPLqI/CFq9t84Y7CcjMLZGw0TPTIhIUTLeMmSnNnu9nUi2g 2fNLpnYEKi9sSW058PhtpbWQqG7EjmJaS6cY4/5xg77eEhIv1aX2ZvrZB4mrfFGEBi+34N JLpTmdRHMqDc11fL10KoVDo+h0KxCQ0kNQOEI/U9k3VkcUzH2KDlcgdXo2MunF3rd5II16 pnf4K/7tLeSK0WG4jqlql5yCsfNzDLMuKG0VjXuNJqjh8kE/4HkrqeH8d/vbyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701948786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zSfABy4pTNJ82hrzxwJI6i005eAVr6jc3VKlqB//5FU=; b=Han+xYrDp9nu3/SrwgGdhXtYZKfWUuuI5yrQRD1WAka1erle25aJ3wB2bSCrgx7H+FAnoT crHEjQQTRB0urf0fI/J7n8883skpZB+k6tWerc4sRF4sKUe1A4k/5xXLgZLLkSmBPRxVBV fWRL0ZIOMUtNWbK8vfeG9SNH8Fi4kdfapWHfxLXDBa/EJmU3Qw+rnaNNv1TzB/IMqYRLQ6 cK8pcgG4atemj1kD+lUQ/sK9J6XIVhvxSxtUer/9Am+dYTJiMKaraNrD+nJvLzMsq0NeCV xNDhYeWDFxlkR5AAFPhBasUe5O8LCs3862UQ1vs2KG1UmpyhIOb8TMKGQavg0Q== 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 4SmBwL08P3zb8Y; Thu, 7 Dec 2023 11:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7BX5xl047658; Thu, 7 Dec 2023 11:33:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7BX5iQ047655; Thu, 7 Dec 2023 11:33:05 GMT (envelope-from git) Date: Thu, 7 Dec 2023 11:33:05 GMT Message-Id: <202312071133.3B7BX5iQ047655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ronald Klop Subject: git: 3878bbf1bb9e - main - Teach if_smsc to get MAC from bootargs. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3878bbf1bb9e68f8579b57cde7d4e5c77de93320 Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/src/commit/?id=3878bbf1bb9e68f8579b57cde7d4e5c77de93320 commit 3878bbf1bb9e68f8579b57cde7d4e5c77de93320 Author: Ronald Klop AuthorDate: 2023-11-04 14:14:00 +0000 Commit: Ronald Klop CommitDate: 2023-12-07 11:32:01 +0000 Teach if_smsc to get MAC from bootargs. Some Raspberry Pi pass smsc95xx.macaddr=XX:XX:XX:XX:XX:XX as bootargs. Use this if no ethernet address is found in an EEPROM. As last resort fall back to ether_gen_addr() instead of random MAC. PR: 274092 Reported by: Patrick M. Hausen (via ML) Reviewed by: imp, karels, zlei Tested by: Patrick M. Hausen Approved by: karels MFC after: 1 month Relnotes: yes Differential Revision: https://reviews.freebsd.org/D42463 --- sys/dev/usb/net/if_smsc.c | 86 +++++++++++++++++++++++++++++++++++++++++++++-- sys/net/ethernet.h | 1 + sys/net/if_ethersubr.c | 10 ++++-- 3 files changed, 92 insertions(+), 5 deletions(-) diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c index ec8197229f17..54b18e0a67c9 100644 --- a/sys/dev/usb/net/if_smsc.c +++ b/sys/dev/usb/net/if_smsc.c @@ -179,6 +179,8 @@ static const struct usb_device_id smsc_devs[] = { #define ETHER_IS_VALID(addr) \ (!ETHER_IS_MULTICAST(addr) && !ETHER_IS_ZERO(addr)) +#define BOOTARGS_SMSC95XX "smsc95xx.macaddr" + static device_probe_t smsc_probe; static device_attach_t smsc_attach; static device_detach_t smsc_detach; @@ -1538,6 +1540,76 @@ smsc_ioctl(if_t ifp, u_long cmd, caddr_t data) return (rc); } +#ifdef FDT +static bool +smsc_get_smsc95xx_macaddr(char* bootargs, size_t len, struct usb_ether *ue) +{ + int values[6]; + int i; + char* p; + + p = strnstr(bootargs, BOOTARGS_SMSC95XX, len); + if (p == NULL) + return (false); + + if (sscanf(p, BOOTARGS_SMSC95XX "=%x:%x:%x:%x:%x:%x%*c", + &values[0], &values[1], &values[2], + &values[3], &values[4], &values[5]) != 6) { + smsc_warn_printf((struct smsc_softc *)ue->ue_sc, + "invalid mac from bootargs '%s'.\n", p); + return (false); + } + + for (i = 0; i < ETHER_ADDR_LEN; ++i) + ue->ue_eaddr[i] = values[i]; + + smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, + "bootargs mac=%6D.\n", ue->ue_eaddr, ":"); + return (true); +} + +/** + * Raspberry Pi is known to pass smsc95xx.macaddr=XX:XX:XX:XX:XX:XX via + * bootargs. + */ +static bool +smsc_bootargs_get_mac_addr(device_t dev, struct usb_ether *ue) +{ + char *bootargs; + ssize_t len; + phandle_t node; + + /* only use bootargs for the first device + * to prevent duplicate mac addresses */ + if (device_get_unit(dev) != 0) + return (false); + node = OF_finddevice("/chosen"); + if (node == -1) + return (false); + if (OF_hasprop(node, "bootargs") == 0) { + smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, + "bootargs not found"); + return (false); + } + len = OF_getprop_alloc(node, "bootargs", (void **)&bootargs); + if (len == -1 || bootargs == NULL) { + smsc_warn_printf((struct smsc_softc *)ue->ue_sc, + "failed alloc for bootargs (%lu)", len); + return (false); + } + smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, "bootargs: %s.\n", + bootargs); + if (!smsc_get_smsc95xx_macaddr(bootargs, len, ue)) { + OF_prop_free(bootargs); + return (false); + } + OF_prop_free(bootargs); + device_printf(dev, "MAC address found in bootargs %6D.\n", + ue->ue_eaddr, ":"); + return (true); +} +#endif + /** * smsc_attach_post - Called after the driver attached to the USB interface * @ue: the USB ethernet device @@ -1552,8 +1624,10 @@ static void smsc_attach_post(struct usb_ether *ue) { struct smsc_softc *sc = uether_getsc(ue); + struct ether_addr eaddr; uint32_t mac_h, mac_l; int err; + int i; smsc_dbg_printf(sc, "smsc_attach_post\n"); @@ -1585,11 +1659,17 @@ smsc_attach_post(struct usb_ether *ue) #ifdef FDT if ((err != 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr))) err = usb_fdt_get_mac_addr(sc->sc_ue.ue_dev, &sc->sc_ue); + if ((err != 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr))) + err = smsc_bootargs_get_mac_addr(sc->sc_ue.ue_dev, + &sc->sc_ue) ? (0) : (1); #endif if ((err != 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr))) { - read_random(sc->sc_ue.ue_eaddr, ETHER_ADDR_LEN); - sc->sc_ue.ue_eaddr[0] &= ~0x01; /* unicast */ - sc->sc_ue.ue_eaddr[0] |= 0x02; /* locally administered */ + smsc_dbg_printf(sc, "No MAC address found." + " Using ether_gen_addr().\n"); + ether_gen_addr_byname(device_get_nameunit(ue->ue_dev), + &eaddr); + for (i = 0; i < ETHER_ADDR_LEN; i++) + sc->sc_ue.ue_eaddr[i] = eaddr.octet[i]; } } diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h index fca6748a0da7..e7313e78c5bb 100644 --- a/sys/net/ethernet.h +++ b/sys/net/ethernet.h @@ -448,6 +448,7 @@ struct mbuf *ether_vlanencap_proto(struct mbuf *, uint16_t, uint16_t); bool ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p, const struct ether_8021q_tag *); void ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr); +void ether_gen_addr_byname(const char *nameunit, struct ether_addr *hwaddr); static __inline struct mbuf *ether_vlanencap(struct mbuf *m, uint16_t tag) { diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 7a32d0091260..ef0b1f705260 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1487,7 +1487,7 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p, * allocate non-locally-administered addresses. */ void -ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr) +ether_gen_addr_byname(const char *nameunit, struct ether_addr *hwaddr) { SHA1_CTX ctx; char *buf; @@ -1506,7 +1506,7 @@ ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr) /* If each (vnet) jail would also have a unique hostuuid this would not * be necessary. */ getjailname(curthread->td_ucred, jailname, sizeof(jailname)); - sz = asprintf(&buf, M_TEMP, "%s-%s-%s", uuid, if_name(ifp), + sz = asprintf(&buf, M_TEMP, "%s-%s-%s", uuid, nameunit, jailname); if (sz < 0) { /* Fall back to a random mac address. */ @@ -1535,5 +1535,11 @@ rando: hwaddr->octet[0] |= 0x02; } +void +ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr) +{ + ether_gen_addr_byname(if_name(ifp), hwaddr); +} + DECLARE_MODULE(ether, ether_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); MODULE_VERSION(ether, 1); From nobody Thu Dec 7 12:39:25 2023 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 4SmDNt1hGjz52w3J; Thu, 7 Dec 2023 12:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmDNt0x9rz3TTw; Thu, 7 Dec 2023 12:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701952766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BA/+CUkFKhF4+ZlPFa8mh0CJu9Gqzfk5uT4dR6nU2Y=; b=FIdIwYFilVr3kF/IU3t0yvyvBrKKfyfPhk4pqWTt/Gxb1fOx6FhUji/BCl17tVLUBB0DQZ 8R1VrnQwqxyLllM5dtTdagqbI0NYqEG4cX5mefXrdqNRnKy9NX11Cq34KI6Lu8TwaaonOv cNnG+Rexks7fInNdWzmF4t4ehdBUsy4euof45hai0kQtxyeehCyAUC5n8d/yHVuWLM5D8l a8ciBoy5Kh5OFusd5Jpr2LX1BWqBOgDQXHorcJ3EXi0DFmsyCUpUdBpsev9XFRCnWVESnX nY6Oy2fmT9ZkMUNlAMCbNw6p+l+/yWmD/aH2+taL+1Vv1lZ4dDxL9IVnY7/1Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701952766; a=rsa-sha256; cv=none; b=en+eRUTFMe09wz/kqor1RpuWUdxEOQOHb3mlDJovmv4FDK7LEJ0nQjtb6UL2mzA8vtt4JV udIa/UKvkhclAR/U8EpcnOm+4137h6pHWOMpGIvoLMyZ0Z6WH5+8p1h2YJrOK4W/tvpQWq uL+0ZX19oMdn9cKWkbPVuNbgSDOI4Psw7txfX4+12WMxjo6M70PSn3V701zfSc4LYPdD2A K2UKxc0O0lzbySGkfREU8op1r7U3qiNvUt79XQ5SdyMU3M04qupH3SDdE4AdCcCPzgma7g 1QCcyTGwyQQsietRR3m9+WqVYXV3FuKcL7P+Sx0Pfe3hHL+aYZ57vF/y4ToTRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701952766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BA/+CUkFKhF4+ZlPFa8mh0CJu9Gqzfk5uT4dR6nU2Y=; b=RYLcsVeCN9mncbgytBryEp7IyA7T3ZWAJ0aaSx56Plcz8VAQNJudAzEN0ryx2/6TzTNl9p YhL2/XihKLFa5vTaOP5spDL7s6OaqRVrfsFWTKaUh3aynfPBI2BSiBio5spex85W75Va+D /vEp8IttoWcnzWOyO+FE7mo8WwSA50PVVIbCsHcDQDN2mnIBkPc9l4KXJqxwEpUuf4BZvm 9QtHDQA4mwA4GCSS0qY9Hehv9FWWSsb872F8Py66tvzWOiN91GQi5PGq0GC9PwGNe6t4DF 5whvXCINDPM/AaCJHzv76D6E3oyInBouw8fE/GizgzJoeMCKz2VCaw9ZQMZC1w== 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 4SmDNt00WQzcf0; Thu, 7 Dec 2023 12:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7CdP8n049144; Thu, 7 Dec 2023 12:39:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7CdPfq049141; Thu, 7 Dec 2023 12:39:25 GMT (envelope-from git) Date: Thu, 7 Dec 2023 12:39:25 GMT Message-Id: <202312071239.3B7CdPfq049141@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: bd7b2f95019e - main - vnet: (read) lock the vnet list while iterating it List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bd7b2f95019e9715150c34736279805de0818d09 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=bd7b2f95019e9715150c34736279805de0818d09 commit bd7b2f95019e9715150c34736279805de0818d09 Author: Kristof Provost AuthorDate: 2023-12-05 19:08:11 +0000 Commit: Kristof Provost CommitDate: 2023-12-07 12:34:47 +0000 vnet: (read) lock the vnet list while iterating it Ensure that the vnet list cannot be modified while we're running through it. Reviewed by: mjg (previous version), zlei (previous version) MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42927 --- sys/net/vnet.c | 4 ++++ sys/netinet/ip_reass.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/sys/net/vnet.c b/sys/net/vnet.c index ac937125a19d..9668471633f4 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -536,11 +536,13 @@ vnet_register_sysinit(void *arg) * Invoke the constructor on all the existing vnets when it is * registered. */ + VNET_LIST_RLOCK(); VNET_FOREACH(vnet) { CURVNET_SET_QUIET(vnet); vs->func(vs->arg); CURVNET_RESTORE(); } + VNET_LIST_RUNLOCK(); VNET_SYSINIT_WUNLOCK(); } @@ -592,6 +594,7 @@ vnet_deregister_sysuninit(void *arg) * deregistered. */ VNET_SYSINIT_WLOCK(); + VNET_LIST_RLOCK(); VNET_FOREACH(vnet) { CURVNET_SET_QUIET(vnet); vs->func(vs->arg); @@ -601,6 +604,7 @@ vnet_deregister_sysuninit(void *arg) /* Remove the destructor from the global list of vnet destructors. */ TAILQ_REMOVE(&vnet_destructors, vs, link); VNET_SYSINIT_WUNLOCK(); + VNET_LIST_RUNLOCK(); } /* diff --git a/sys/netinet/ip_reass.c b/sys/netinet/ip_reass.c index 219a869c5139..a95780aa2f27 100644 --- a/sys/netinet/ip_reass.c +++ b/sys/netinet/ip_reass.c @@ -661,11 +661,13 @@ ipreass_drain(void) { VNET_ITERATOR_DECL(vnet_iter); + VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); ipreass_drain_vnet(); CURVNET_RESTORE(); } + VNET_LIST_RUNLOCK(); } From nobody Thu Dec 7 13:35:43 2023 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 4SmFdw0HsCz53138; Thu, 7 Dec 2023 13:35:48 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.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 4SmFdv1xfZz3bGX; Thu, 7 Dec 2023 13:35:47 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1701956143; 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=o/wAXDHPhqZCCDfG+2++yXxPhTcOdJGBXko3Yao19bM=; b=EItBvXpdT4HFkzxKhNMq96gSPWlah3wEzabnG7/2cIt8HcjQxSLrrnXWW4KDPFtogvno1M W6+EQdOG+Q0thrVo3rQ45g+Kgct8UPhn2AvsC5sEgkVKxR0ah/1R+DFr2hFIpzzifsCAh+ 9GrA7P0vS/9OzM8Y37E1d/zf39d5S0U= Received: from skull.home.blih.net (lfbn-lyo-1-2174-135.w90-66.abo.wanadoo.fr [90.66.97.135]) by mx.blih.net (OpenSMTPD) with ESMTPSA id c6e9421e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 7 Dec 2023 13:35:43 +0000 (UTC) Date: Thu, 7 Dec 2023 14:35:43 +0100 From: Emmanuel Vadot To: Ronald Klop Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 3878bbf1bb9e - main - Teach if_smsc to get MAC from bootargs. Message-Id: <20231207143543.7b29c0584bd0c12a1832553a@bidouilliste.com> In-Reply-To: <202312071133.3B7BX5iQ047655@gitrepo.freebsd.org> References: <202312071133.3B7BX5iQ047655@gitrepo.freebsd.org> X-Mailer: Sylpheed 3.7.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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SmFdv1xfZz3bGX On Thu, 7 Dec 2023 11:33:05 GMT Ronald Klop wrote: > The branch main has been updated by ronald: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3878bbf1bb9e68f8579b57cde7d4e5c77de93320 > > commit 3878bbf1bb9e68f8579b57cde7d4e5c77de93320 > Author: Ronald Klop > AuthorDate: 2023-11-04 14:14:00 +0000 > Commit: Ronald Klop > CommitDate: 2023-12-07 11:32:01 +0000 > > Teach if_smsc to get MAC from bootargs. > > Some Raspberry Pi pass smsc95xx.macaddr=XX:XX:XX:XX:XX:XX as bootargs. > Use this if no ethernet address is found in an EEPROM. > As last resort fall back to ether_gen_addr() instead of random MAC. > > PR: 274092 > Reported by: Patrick M. Hausen (via ML) > Reviewed by: imp, karels, zlei > Tested by: Patrick M. Hausen > Approved by: karels > MFC after: 1 month > Relnotes: yes > Differential Revision: https://reviews.freebsd.org/D42463 > --- > sys/dev/usb/net/if_smsc.c | 86 +++++++++++++++++++++++++++++++++++++++++++++-- > sys/net/ethernet.h | 1 + > sys/net/if_ethersubr.c | 10 ++++-- > 3 files changed, 92 insertions(+), 5 deletions(-) > > diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c > index ec8197229f17..54b18e0a67c9 100644 > --- a/sys/dev/usb/net/if_smsc.c > +++ b/sys/dev/usb/net/if_smsc.c > @@ -179,6 +179,8 @@ static const struct usb_device_id smsc_devs[] = { > #define ETHER_IS_VALID(addr) \ > (!ETHER_IS_MULTICAST(addr) && !ETHER_IS_ZERO(addr)) > > +#define BOOTARGS_SMSC95XX "smsc95xx.macaddr" > + > static device_probe_t smsc_probe; > static device_attach_t smsc_attach; > static device_detach_t smsc_detach; > @@ -1538,6 +1540,76 @@ smsc_ioctl(if_t ifp, u_long cmd, caddr_t data) > return (rc); > } > > +#ifdef FDT > +static bool > +smsc_get_smsc95xx_macaddr(char* bootargs, size_t len, struct usb_ether *ue) > +{ > + int values[6]; > + int i; > + char* p; > + > + p = strnstr(bootargs, BOOTARGS_SMSC95XX, len); > + if (p == NULL) > + return (false); > + > + if (sscanf(p, BOOTARGS_SMSC95XX "=%x:%x:%x:%x:%x:%x%*c", > + &values[0], &values[1], &values[2], > + &values[3], &values[4], &values[5]) != 6) { > + smsc_warn_printf((struct smsc_softc *)ue->ue_sc, > + "invalid mac from bootargs '%s'.\n", p); > + return (false); > + } > + > + for (i = 0; i < ETHER_ADDR_LEN; ++i) > + ue->ue_eaddr[i] = values[i]; > + > + smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, > + "bootargs mac=%6D.\n", ue->ue_eaddr, ":"); > + return (true); > +} > + > +/** > + * Raspberry Pi is known to pass smsc95xx.macaddr=XX:XX:XX:XX:XX:XX via > + * bootargs. > + */ > +static bool > +smsc_bootargs_get_mac_addr(device_t dev, struct usb_ether *ue) > +{ > + char *bootargs; > + ssize_t len; > + phandle_t node; > + > + /* only use bootargs for the first device > + * to prevent duplicate mac addresses */ > + if (device_get_unit(dev) != 0) > + return (false); > + node = OF_finddevice("/chosen"); > + if (node == -1) > + return (false); > + if (OF_hasprop(node, "bootargs") == 0) { > + smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, > + "bootargs not found"); > + return (false); > + } > + len = OF_getprop_alloc(node, "bootargs", (void **)&bootargs); > + if (len == -1 || bootargs == NULL) { > + smsc_warn_printf((struct smsc_softc *)ue->ue_sc, > + "failed alloc for bootargs (%lu)", len); > + return (false); > + } All this can be replaced with a call to fdt_get_chosen_bootargs. Also we already do this for arm and arm64 in machdep_boot.c and store the linux boot args in a static var called linux_command_line, maybe make it not static and get it from this driver. While you're at it make bcm2835_fbd.c and bcm2835_fb.c use this as they also get and parse the bootargs. Cheers, > + smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, "bootargs: %s.\n", > + bootargs); > + if (!smsc_get_smsc95xx_macaddr(bootargs, len, ue)) { > + OF_prop_free(bootargs); > + return (false); > + } > + OF_prop_free(bootargs); > + device_printf(dev, "MAC address found in bootargs %6D.\n", > + ue->ue_eaddr, ":"); > + return (true); > +} > +#endif > + > /** > * smsc_attach_post - Called after the driver attached to the USB interface > * @ue: the USB ethernet device > @@ -1552,8 +1624,10 @@ static void > smsc_attach_post(struct usb_ether *ue) > { > struct smsc_softc *sc = uether_getsc(ue); > + struct ether_addr eaddr; > uint32_t mac_h, mac_l; > int err; > + int i; > > smsc_dbg_printf(sc, "smsc_attach_post\n"); > > @@ -1585,11 +1659,17 @@ smsc_attach_post(struct usb_ether *ue) > #ifdef FDT > if ((err != 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr))) > err = usb_fdt_get_mac_addr(sc->sc_ue.ue_dev, &sc->sc_ue); > + if ((err != 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr))) > + err = smsc_bootargs_get_mac_addr(sc->sc_ue.ue_dev, > + &sc->sc_ue) ? (0) : (1); > #endif > if ((err != 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr))) { > - read_random(sc->sc_ue.ue_eaddr, ETHER_ADDR_LEN); > - sc->sc_ue.ue_eaddr[0] &= ~0x01; /* unicast */ > - sc->sc_ue.ue_eaddr[0] |= 0x02; /* locally administered */ > + smsc_dbg_printf(sc, "No MAC address found." > + " Using ether_gen_addr().\n"); > + ether_gen_addr_byname(device_get_nameunit(ue->ue_dev), > + &eaddr); > + for (i = 0; i < ETHER_ADDR_LEN; i++) > + sc->sc_ue.ue_eaddr[i] = eaddr.octet[i]; > } > } > > diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h > index fca6748a0da7..e7313e78c5bb 100644 > --- a/sys/net/ethernet.h > +++ b/sys/net/ethernet.h > @@ -448,6 +448,7 @@ struct mbuf *ether_vlanencap_proto(struct mbuf *, uint16_t, uint16_t); > bool ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, > struct ifnet *p, const struct ether_8021q_tag *); > void ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr); > +void ether_gen_addr_byname(const char *nameunit, struct ether_addr *hwaddr); > > static __inline struct mbuf *ether_vlanencap(struct mbuf *m, uint16_t tag) > { > diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c > index 7a32d0091260..ef0b1f705260 100644 > --- a/sys/net/if_ethersubr.c > +++ b/sys/net/if_ethersubr.c > @@ -1487,7 +1487,7 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p, > * allocate non-locally-administered addresses. > */ > void > -ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr) > +ether_gen_addr_byname(const char *nameunit, struct ether_addr *hwaddr) > { > SHA1_CTX ctx; > char *buf; > @@ -1506,7 +1506,7 @@ ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr) > /* If each (vnet) jail would also have a unique hostuuid this would not > * be necessary. */ > getjailname(curthread->td_ucred, jailname, sizeof(jailname)); > - sz = asprintf(&buf, M_TEMP, "%s-%s-%s", uuid, if_name(ifp), > + sz = asprintf(&buf, M_TEMP, "%s-%s-%s", uuid, nameunit, > jailname); > if (sz < 0) { > /* Fall back to a random mac address. */ > @@ -1535,5 +1535,11 @@ rando: > hwaddr->octet[0] |= 0x02; > } > > +void > +ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr) > +{ > + ether_gen_addr_byname(if_name(ifp), hwaddr); > +} > + > DECLARE_MODULE(ether, ether_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); > MODULE_VERSION(ether, 1); -- Emmanuel Vadot From nobody Thu Dec 7 14:12:26 2023 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 4SmGSB5SQ0z533HY; Thu, 7 Dec 2023 14:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmGSB4zr6z3gNG; Thu, 7 Dec 2023 14:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701958346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8hIvIXsbg+qhXeYq7stU24cUq4ngIqyOpDU5AtWkdzM=; b=c28O4tRYvJe+TTlTiZR6J/xmNwvTYsMFQZT6QTOZ4UpT69GtkWgMeKsyneu7wbZ1wpu7LH v+k2dpHGCQtYaSRxqmxF/oQRLCbU1u6W7jeqco+TcffhfOdZ1Mu6ykvfVdbqhzjllnvdKD fi7VY5yWxKR83Zo5gX1m2afBKF3mZykKhmf8EHoyInanNeLScKBPJ8F2lyjrrs6rIAho56 iQghcnSd6LUXKf7bjK+mewTFfUhW606BTGng5XMtxBhWNBTqgpHkOamGRlTPo5fPzG6urn Qc3EGr0dHsf7VCi9LZDaDFQYXcuh2y06bEOlRJkW/pFO1oLfj4nWrjRTgkpJCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701958346; a=rsa-sha256; cv=none; b=KxyJBbD8VnLxPMKJdA1n+ry1l4ll1P5DZ1Cz7KEIIKiXjeWa8tyw5kHpFjuvb2U2cRLcVM R2XyxtBdVsSSLYDv6kdCkVPdkPpuGd5QX3nIUQLDGVaZ11JpA/ucdviscVBeVz+zib78Hl bjDulEvtihth7pWyrLCWV0AbgKnvt/Pti0SsqxSbO8Ex8dIthCYOyMifGPHWfZkrsurltL /FveiNpWbFoN5oCgGd2QFHAl8Y2NluLDK0kyZdnCPlBMtB8P3cr/C2j7Q7rtXqSLLWHukq qHr2o0bKv5dfm4w0dRMUJpXQALyaP2AIXJAVRqjOJVdb4WrANQvkKD0PTXXCLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701958346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8hIvIXsbg+qhXeYq7stU24cUq4ngIqyOpDU5AtWkdzM=; b=rjkky19axtiz1TpDOajL+lM0hDP8UFjkZWHxFqhfMW8e7fPu1vQ8wOuoH5dFC8SX/TQV6+ G5uRYdR4EZwlcQ0lGRPunudRhXr/+Dqr4jiAnM7J7a2LnIwgw8hmXUvkQxB/9bPFvNRJIu P954M6a6S37FCIVjHfDsuBXtPEstDsj9fH0gVTLYBgiAJ74c8mpYUCykJ498hvzWpI4T5v P2QFgk7HVdbarmkFjT/vZDpmGlQZfYPcHozfZiHCjeqjvG07dvSYPuBTyiBElCZCUAQdAC Sv5z/NGbZ72h+qmCy/Yvu/w9Cdd1EmE9R0SclBobCw2HJiO733SUQEhLhFzmDg== 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 4SmGSB42mPzgYm; Thu, 7 Dec 2023 14:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7ECQQb016172; Thu, 7 Dec 2023 14:12:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7ECQq9016169; Thu, 7 Dec 2023 14:12:26 GMT (envelope-from git) Date: Thu, 7 Dec 2023 14:12:26 GMT Message-Id: <202312071412.3B7ECQq9016169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: a95cd6e4870b - main - siftr: refactor batch log processing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a95cd6e4870b79178860e03366c4327e533ecf1e Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=a95cd6e4870b79178860e03366c4327e533ecf1e commit a95cd6e4870b79178860e03366c4327e533ecf1e Author: Richard Scheffenegger AuthorDate: 2023-12-07 13:43:03 +0000 Commit: Richard Scheffenegger CommitDate: 2023-12-07 13:48:44 +0000 siftr: refactor batch log processing Refactoring to perform the batch processing of log messaged in two phases. First cycling through a limited number of collected packets, and only thereafter freeing the processed packets. This prevents any chance of calling free while in a critical / spinlocked section. Reviewed By: tuexen Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D42949 --- sys/netinet/siftr.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c index 216d0fb6920e..bf0cdc2ac4cc 100644 --- a/sys/netinet/siftr.c +++ b/sys/netinet/siftr.c @@ -134,6 +134,7 @@ * data fields such that the line length could exceed the below value. */ #define MAX_LOG_MSG_LEN 300 +#define MAX_LOG_BATCH_SIZE 3 /* XXX: Make this a sysctl tunable. */ #define SIFTR_ALQ_BUFLEN (1000*MAX_LOG_MSG_LEN) @@ -445,10 +446,10 @@ siftr_pkt_manager_thread(void *arg) { STAILQ_HEAD(pkthead, pkt_node) tmp_pkt_queue = STAILQ_HEAD_INITIALIZER(tmp_pkt_queue); - struct pkt_node *pkt_node, *pkt_node_temp; + struct pkt_node *pkt_node; uint8_t draining; struct ale *log_buf; - int ret_sz, cnt; + int ret_sz, cnt = 0; char *bufp; draining = 2; @@ -485,17 +486,12 @@ siftr_pkt_manager_thread(void *arg) */ mtx_unlock(&siftr_pkt_mgr_mtx); -try_again: - pkt_node = STAILQ_FIRST(&tmp_pkt_queue); - if (pkt_node != NULL) { - if (STAILQ_NEXT(pkt_node, nodes) != NULL) { - cnt = 3; - } else { - cnt = 1; - } + while ((pkt_node = STAILQ_FIRST(&tmp_pkt_queue)) != NULL) { - log_buf = alq_getn(siftr_alq, MAX_LOG_MSG_LEN * cnt, - ALQ_WAITOK); + log_buf = alq_getn(siftr_alq, MAX_LOG_MSG_LEN * + ((STAILQ_NEXT(pkt_node, nodes) != NULL) ? + MAX_LOG_BATCH_SIZE : 1), + ALQ_WAITOK); if (log_buf != NULL) { log_buf->ae_bytesused = 0; @@ -509,27 +505,24 @@ try_again: } /* Flush all pkt_nodes to the log file. */ - STAILQ_FOREACH_SAFE(pkt_node, &tmp_pkt_queue, nodes, - pkt_node_temp) { + STAILQ_FOREACH(pkt_node, &tmp_pkt_queue, nodes) { if (log_buf != NULL) { ret_sz = siftr_process_pkt(pkt_node, bufp); bufp += ret_sz; log_buf->ae_bytesused += ret_sz; - cnt--; - } - - STAILQ_REMOVE_HEAD(&tmp_pkt_queue, nodes); - free(pkt_node, M_SIFTR_PKTNODE); - - if (cnt <= 0 && !STAILQ_EMPTY(&tmp_pkt_queue)) { - alq_post_flags(siftr_alq, log_buf, 0); - goto try_again; } + if (++cnt >= MAX_LOG_BATCH_SIZE) + break; } if (log_buf != NULL) { alq_post_flags(siftr_alq, log_buf, 0); } + for (;cnt > 0; cnt--) { + pkt_node = STAILQ_FIRST(&tmp_pkt_queue); + STAILQ_REMOVE_HEAD(&tmp_pkt_queue, nodes); + free(pkt_node, M_SIFTR_PKTNODE); + } } KASSERT(STAILQ_EMPTY(&tmp_pkt_queue), From nobody Thu Dec 7 14:25:23 2023 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 4SmGlN4ymTz534lC for ; Thu, 7 Dec 2023 14:25:36 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmGlN4W6Mz4F2Y for ; Thu, 7 Dec 2023 14:25:36 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-548ce39b101so1352848a12.2 for ; Thu, 07 Dec 2023 06:25:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701959135; x=1702563935; 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=sdft3pSqIz5/XRGYMPYbqUArLqqLT/jRDAPUxaXWUKM=; b=sfs23T8SORGciWmq5LpSHfZ6Bpc/Wx7RanrQPPGPgiE8S9M6u7RsqI/4fnUfixNTn+ YIG8elMmEleQmPCJGcNhsXwdXizFniAMlU5cV91ajeURgNinv2J065ElAzGTtg565uEQ cXGjBL+fCDzB1sBUOdzBytHuMgkh3hBnzyT1SR4zpmoynirAUM8QmhWACNulSI/EN5eW NH3fA3LI3ctdeSrHksXFrLIRSK9L+rDB8+0VFBH+43LX3z1Ja1CN/AZmgHfvxVq5L5pN V2Ok9wXShpX2cwM7PNAH9uDAMIsrs1xJ0LxM1uOFT7CR4g42taP9dmxOLLy5VWvHY8+v ED1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701959135; x=1702563935; 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=sdft3pSqIz5/XRGYMPYbqUArLqqLT/jRDAPUxaXWUKM=; b=AsjRmE9JRV6yrSk/xKJphEN+6H11T/dJ2hN14CdU7D8TiOpKuyfEZ4CLHCpvAIOvrP sHEfwOfG8AbekRQe2lVgrisYjykXE3u5kRELX4aGfpvoPzTmwBTqpHzyqtSvytVxRp6e U3vC5ry5RfIXCLMm5ZOIW/tJGuXNNUO7bfqYAZOeLBvvp9UdEYbNhcBXOszXsI05irmv 6a758B6VtM0KQn3RTo8QViQnu7srhTpym3wfKFM5Z+6SAxP45toZ6Kg1kYL+DsHP5hmh CzWIXLCsniI0ae42FmyK1cnaxTJoPJ5r2nkahv0kbd3KwnTVTAdPMir2NyP1FyO/7rxI WJug== X-Gm-Message-State: AOJu0YzKKdddC6KR28twdk2ZW8FmyZzxCJ2jguN8arS7izWDjr+obMDr M9ZQ3RJbymEtIMJBol9GMWfki8jcAVWjQu2uyi4RZQ== X-Google-Smtp-Source: AGHT+IFhCbVaRikjVxMNQ1oE88g4BVeVD5l4wFzY/cNzw4l7UxN/Oh2DpInp+KD7ErJ++LoP/k3nNqFYGO4zR1uxmgI= X-Received: by 2002:a05:6402:2691:b0:54d:8e3a:5b2 with SMTP id w17-20020a056402269100b0054d8e3a05b2mr1254363edd.74.1701959135178; Thu, 07 Dec 2023 06:25:35 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> In-Reply-To: From: Warner Losh Date: Thu, 7 Dec 2023 07:25:23 -0700 Message-ID: Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources To: Philip Paeps Cc: src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000acc7a7060bec3d76" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SmGlN4W6Mz4F2Y --000000000000acc7a7060bec3d76 Content-Type: text/plain; charset="UTF-8" On Thu, Dec 7, 2023, 12:26 AM Philip Paeps wrote: > On 2023-12-07 15:06:58 (+0800), Warner Losh wrote: > > On Wed, Dec 6, 2023, 11:34 PM Philip Paeps wrote: > >> On 2023-12-07 14:26:05 (+0800), Warner Losh wrote: > >>> We should point to bipm > >>> https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list since > >>> they > >>> are > >>> the source of truth, no? > >> > >> I went for the IANA copy because data.iana.org is a much shorter and > >> trustworthy looking URL. And it's also where other operating systems > >> get their copies. > >> > >> (There's a thread on the IANA tz mailing list about how up to date > >> the > >> IANA copy is.) > >> > > > > Shorter URLs aren't necessarily better.. we should have this be a > > list > > though... > > We could also mirror our own copy on freebsd.org, but then we have to > keep it up to date. > > That's probably the best solution. Let me ponder this for a bit. > No. That's a terrible idea. We have better things to do with our infrastructure. Just make a list of two: nist and bipm. Warner Philip > > -- > Philip Paeps > Senior Reality Engineer > Alternative Enterprises > --000000000000acc7a7060bec3d76 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Dec 7, 2023, 12:26 AM Philip Paeps <philip@freebsd.org> wrote:
<= blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px= #ccc solid;padding-left:1ex">On 2023-12-07 15:06:58 (+0800), Warner Losh w= rote:
> On Wed, Dec 6, 2023, 11:34 PM Philip Paeps <philip@freebsd.org&= gt; wrote:
>> On 2023-12-07 14:26:05 (+0800), Warner Losh wrote:
>>> We should point to bipm
>>> https://hpiers.ob= spm.fr/iers/bul/bulc/ntp/leap-seconds.list since
>>> they
>>> are
>>> the source of truth, no?
>>
>> I went for the IANA copy because data.iana.org is a much= shorter and
>> trustworthy looking URL.=C2=A0 And it's also where other opera= ting systems
>> get their copies.
>>
>> (There's a thread on the IANA tz mailing list about how up to = date
>> the
>> IANA copy is.)
>>
>
> Shorter URLs aren't necessarily better..=C2=A0 we should have this= be a
> list
> though...

We could also mirror our own copy on freebsd.org, but then we have = to
keep it up to date.

That's probably the best solution.=C2=A0 Let me ponder this for a bit.<= br>

N= o. That's a terrible idea. We have better things to do with our infrast= ructure.=C2=A0 Just make a list of two: nist and bipm.

Warner

Philip

--
Philip Paeps
Senior Reality Engineer
Alternative Enterprises
--000000000000acc7a7060bec3d76-- From nobody Thu Dec 7 14:26:51 2023 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 4SmGmq48JWz534nn; Thu, 7 Dec 2023 14:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmGmq3fbKz4FMh; Thu, 7 Dec 2023 14:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701959211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GWdT6nuvS/v/6wDacLKNlLKQSNAU1nJ8mW1iNCKkrrU=; b=Y7RPYfAQ8bk1hS1bY01D8VuUIEmNb5COjX8+OWBMSgIvj057zMhTDaTGiSbcXBnBJeqvra CFk0ajv6qEc5v8YPSj6Ay5gSboGV7PkV1FzYSp63QRmN2bs3GWaGJIPCRunmvzmZCrkpqx 9eo4HzVuDAkxYNNLb1MJ1syBugdIz784Kfxkm9rTrYA2WdDea80XfOk+zrtdhBniD99Ov9 A9BbXpBEs4b2kEQnmcuu9soAkMR7tNTLeMpbS3gkqvfrz/EKe/Ouzi/ophN4nRBxeHE8mr XbHoi233KUgxzvgiZyVP+A/4+S4Xq01pQp15LI0O7b/6guxJVvLHr8yTGRzX/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701959211; a=rsa-sha256; cv=none; b=BUTSAY9Y1cZ9kcUtUPTz6U4ixlpggVRdR3fht0WrCCoE0h2Tel7e2TKTfX5D+Br6/oO7sC U2rsrY+v/jHhlMnN/RCN6FeI0glGjf0tTOfkB2NWfuM7Jp95LkLcj92HFKZs6N4eo6UPTF zb6F++XUQP6L4kyWJ/1kceaA3wLWRvtIREFWr6xdtgp2plkirZwK17y5TwPQo2ndpO2xVS wFaJ+M2i7q2q414//v5aIArObEIR9wpSiwjPnb2QHMOvoyTf67d4KJz1iNrW4/kSoREWBi inkSTgYntFPFfN8Lp7/w/a9gBkvxx1JexaoKLlZcV39w1sxP3nXOX4dkUN9umQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701959211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GWdT6nuvS/v/6wDacLKNlLKQSNAU1nJ8mW1iNCKkrrU=; b=H7cPmjLBqNMX4f5/ApBCJuvV05k9dkV2yHZFeP5hwqSO3CpVLsa3jVCI1JRvR/LrgNv8O/ zOH2zRZWhQlJDUPPIqSShycoZZDoN1UWoQ8VmJVQI/MuPOfnpa1eTf0QfVKnxd9bCuxole TrAhYogxPbXy+zO9G1i1aaaQRVsuac/XXYO8XthSKb0K00xURaWLK754fGw7hCe9rqW8fa U6nzx9c8zmefQvNdjoQ6I7lvC8CuSRcCNlzHiL0zXtpSU21hLsa/D+m9CuAvIYcSEDOnuJ udZE0nl3DeK6f5tOm960QvQlKY+J3b2xSMUTbhsuyYaBXh5XRMWiGQ3EuhJ8JQ== 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 4SmGmq2jPrzgcc; Thu, 7 Dec 2023 14:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7EQpcd034026; Thu, 7 Dec 2023 14:26:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7EQpD3034023; Thu, 7 Dec 2023 14:26:51 GMT (envelope-from git) Date: Thu, 7 Dec 2023 14:26:51 GMT Message-Id: <202312071426.3B7EQpD3034023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 25f37779bdeb - main - bsd-family-tree: add FreeBSD 14 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25f37779bdeba6856f92d0bc94f74582566fcb0f Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=25f37779bdeba6856f92d0bc94f74582566fcb0f commit 25f37779bdeba6856f92d0bc94f74582566fcb0f Author: Sergey A. Osokin AuthorDate: 2023-12-07 14:26:12 +0000 Commit: Sergey A. Osokin CommitDate: 2023-12-07 14:26:12 +0000 bsd-family-tree: add FreeBSD 14 MFC after: 3 days --- share/misc/bsd-family-tree | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 65719513e49b..9386229341ad 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -449,8 +449,10 @@ FreeBSD 5.2 | | | | | macOS | | | | 14 | | | | | | OpenBSD 7.4 | + *--FreeBSD | | | | + | 14.0 | | | | | | | | | -FreeBSD 14 -current | NetBSD -current OpenBSD -current DragonFly -current +FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | v v v v v @@ -877,6 +879,7 @@ OpenBSD 7.3 2023-04-10 [OBD] FreeBSD 13.2 2023-04-11 [FBD] macOS 14 2023-09-26 [APL] OpenBSD 7.4 2023-10-16 [OBD] +FreeBSD 14.0 2023-11-20 [FBD] Bibliography ------------------------ From nobody Thu Dec 7 14:40:21 2023 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 4SmH4P6s0tz535Xv; Thu, 7 Dec 2023 14:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmH4P6Ng7z4GL4; Thu, 7 Dec 2023 14:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701960021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WWkwOsGndDiSJS6yXH99Nwl3wuPJbkr3v4Q51D5/yK8=; b=H3dEEnkSE+DDbtrbJaXFv8zgWfc4oSd9HphjCOt1AxBVz+jOrXIMeSapOvi673g8VCq87H f4o0aaSlX6BNOzKx7Q3VuJafgnlMMaE2DZmL8D6n0dFoV+eD6tQsCQOwY2akPzpr2anAf5 ueoMqbv1mGB70+nUoNcLoXCsX7g1qTwfP2QuB9h7BlbUJVfOJ14dvURvhCEdUwxnumqf15 oLR9MwwOUa0toUpfI9KXPKBlKHeqA8Gtx1kMk+g+Gv1txNGmAHmymdN8gr5X99XvN5KnRR VTiZvOo1wzxHsnapZ0V+YsYH1gsu+/yfCEjK6Y1u3Fc8O5M+lhXXVCYUHl32hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701960021; a=rsa-sha256; cv=none; b=WnDd31+uG8wUjCWjWkpC8oOz8/XUuNsGPSEHq5UtAWlxgtsfspHZPBe6hZlBEZAb82y9Kb jZSjXzg/MHr/C7UDiQx5Yj3e+OPhvnqWULtUciQrU5waS3N1RRHShSkXbCCd25AxfWuWGQ W66dN5edKpUhnQ+LxCY7i3TkCzZtjfSlY1NaCMV/xgzuX6saEiqHTqca5xjl6Me5bcYAm+ SEKwxVtPefCDQEvSSGMgNYaJ4XILOm6WjtXFe0GX3Z8WCcOaKfyCJSsdmSc8KE8twa7Db6 n4a+oPWVDmugMoT4Sn1ne1T2Whqct+NvrsNBFBvpHPpYIHCcCjn6e2ob/QuybQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701960021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WWkwOsGndDiSJS6yXH99Nwl3wuPJbkr3v4Q51D5/yK8=; b=go3eyRld22F56kIeBlrwn3n4awXkC8xgxWIatbTo0gqT4/Q2+rcdDmecDFVN91+Hc30w1O kRnUMr60M8FN5xsl92pg9UUr7KV006FDeCE3V7vmiBPEbBHuT75Wahkkic4RIpEIE27kYG 7Y8ma3FepuLuknDQ2fp4AxMcNQl6R07jlmaURvTBh/FtW0yJiCZlvvi5ITMWIAPz+fzRKb WhyBDsJdu026v07Arsm9tocRsqoxaqr19AotlRU9wI6AbNWVnXBaOqXcXGPd3LkV6yi1wk 40TNP5gFRCoqvBZSsUQi/j6wT9Gt8vnlQgGYwoB7Zrgy/iYDHApgW5E/68faqg== 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 4SmH4P5LWSzgd5; Thu, 7 Dec 2023 14:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7EeLNi059293; Thu, 7 Dec 2023 14:40:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7EeLfG059290; Thu, 7 Dec 2023 14:40:21 GMT (envelope-from git) Date: Thu, 7 Dec 2023 14:40:21 GMT Message-Id: <202312071440.3B7EeLfG059290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 9276ad23b872 - main - tcp: shift PRR sending cadence slightly left List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9276ad23b872eddc42e05304acb10bf5421b043c Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=9276ad23b872eddc42e05304acb10bf5421b043c commit 9276ad23b872eddc42e05304acb10bf5421b043c Author: Richard Scheffenegger AuthorDate: 2023-12-07 14:13:05 +0000 Commit: Richard Scheffenegger CommitDate: 2023-12-07 14:37:45 +0000 tcp: shift PRR sending cadence slightly left Don't let PRR pass up on the opportunity of clocking out packets on arrival of ACKs - by pulling sends forward by about half a packet. Prevents unexpectedly long runs of incoming ACKs without eliciting a packet transmission. MFC after: 1 week Reviewed By: #transport, tuexen Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D42918 --- sys/netinet/tcp_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index b26ae92a767e..05f9a4a9726a 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -3970,7 +3970,7 @@ tcp_do_prr_ack(struct tcpcb *tp, struct tcphdr *th, struct tcpopt *to, sackstatu imax(1, tp->snd_nxt - tp->snd_una); snd_cnt = howmany((long)tp->sackhint.prr_delivered * tp->snd_ssthresh, tp->sackhint.recover_fs) - - tp->sackhint.prr_out; + tp->sackhint.prr_out + maxseg - 1; } else { /* * PRR 6937bis heuristic: From nobody Thu Dec 7 15:02:09 2023 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 4SmHYm66d2z537CF; Thu, 7 Dec 2023 15:02:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmHYm5cdyz4JDf; Thu, 7 Dec 2023 15:02:20 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701961340; 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=jQcDETLvcBLM10VUEi1DS0g0k+CygBnfkt9V01XOEVM=; b=AxpJAs16xSte2iXS8DgQBTn4D+KIJyXMVcUeG9aTKx5t7PovwsLxp/CY9WIM3wKl6VY4c/ snWFex0NufdXQxiPHUmWhQ2U3cgKAblsNl2c3j/VrgOBdHFtZTlnNWKhvoYGntbuVECLzd BA2tYNDDy0zmS5/6qfeKU07K5d9+GxR4haXTJOl3TDAcOy0m3KCNMIGePXq4BAot/GPNu5 ayAzvpCxy178QTXCjER/TaC1pbA3sXlIwLp15bTiBoSbyP569kVyd9uYfLd32G3TUq+awD Yx2kNNLrfM5uCVGqzkswK14hJOnJqZZ2bPtKBBArDSCe8PK2JoJOqZIBfDsKzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701961340; a=rsa-sha256; cv=none; b=KSpAzJA9EeVF6sGzzG7RTznmhTYWbVfYVD4p54iVfme/AccnVvMJRU/8LQECqL1hxuH45Z XnyhpygJJVXgdYOaYE47yWMPoKcURm2P2jWC/Rtik2dbjv1MEY7f+5CAHd3hPtQY2mUDBj sxwyKjs5fKHeQZWN9ISzHPOjCd8Ocn4EN2jhxIvqsYcquK0ThL85V/sB0AUkk+u88c/sMG THfGW2dwa78HdtcepU8lGrk9Cx/Kq28D4K/TrCG+zVM9bjFTFZnGaedEIFBiRJTBytUCBA h1qeOz4MK2r74rT9Z0LwcBLvgfbMHbHPAuY49PqIUcLZWC4brB2yPwwk8DmXvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701961340; 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=jQcDETLvcBLM10VUEi1DS0g0k+CygBnfkt9V01XOEVM=; b=XqhjIJhKMRPdcBjznGvb5RCcbfOD9rThG1rhi0v5kRQGVkgG+R4gB1Vf7UL9V7dlAlKIF4 RmuZb2XkTjcMNAPxGECkb9JBmrDUQFxTMvOwLNdz2x43xSWacs7xByu6RDqPnbqSDz4DlK ogXaaj/D4IKCLx4st3XZJvv/haVm/durepzvHRbQuswQiI8OqzCNVYqKcMQ77wQu0+vBBH GUO7Uys31vMzxYsSL0vZcmB5TvsLVF8HAmU43evuffvT5MXG/rgZjX+3mYPe5NBJWgQpBz SRfcj4wcRxtF4mr9zp2Qwe2P9uGH9N/rmS2mt+N7Wnhd/UMCOsELF+il+/f4rg== Received: from smtpclient.apple (unknown [111.29.165.35]) (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 4SmHYk6RM8zB9W; Thu, 7 Dec 2023 15:02:18 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: <5DC76457-C348-49C6-8EDE-763EB014D9DC@FreeBSD.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_75CB8794-64FC-46C6-A8B3-8588880C3BE4" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 6b96125afdf2 - main - cap_net.3: remove a copypasta Date: Thu, 7 Dec 2023 23:02:09 +0800 In-Reply-To: Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , li-Wen Hsu To: Alan Somers References: <202312061652.3B6GqOuf068349@gitrepo.freebsd.org> <44E8C9F3-84DD-4E51-B2A4-FB56E2A08F30@FreeBSD.org> X-Mailer: Apple Mail (2.3696.120.41.1.4) --Apple-Mail=_75CB8794-64FC-46C6-A8B3-8588880C3BE4 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Dec 7, 2023, at 11:59 AM, Alan Somers wrote: >=20 > On Wed, Dec 6, 2023 at 6:55=E2=80=AFPM Zhenlei Huang > wrote: >>=20 >>=20 >>=20 >>> On Dec 7, 2023, at 12:52 AM, Alan Somers = wrote: >>>=20 >>> The branch main has been updated by asomers: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D6b96125afdf245ae61dd82b59891ad0d= 6aab0066 >>>=20 >>> commit 6b96125afdf245ae61dd82b59891ad0d6aab0066 >>> Author: Alan Somers >>> AuthorDate: 2023-12-05 23:23:29 +0000 >>> Commit: Alan Somers >>> CommitDate: 2023-12-06 16:51:37 +0000 >>>=20 >>> cap_net.3: remove a copypasta >>>=20 >>> This line appears to have been copied from cap_sysctl.3. While = I'm >>> here, reorder and reword the description of cap_net_limit a bit. >>>=20 >>> [skip ci] >>=20 >> I guess we can 'skip ci' implicitly for document or typo changes. >=20 > Can we? The skipping logic is builtin to Jenkins, Github Workflows, > and Cirrus. I don't think it would be easy to program any of those to > detect which changes can be safely skipped. Sorry for the misleading word 'can', I think it is accurate to reword it = to 'want to'. 1. To detect document changes, I think checking the names of changed = files is sufficient. 2. As for the typo change, we can check the commit log. A false detecting (if the change is SKIP CI candidate) does not hurt = much, as it will be queued up to next running of CI. So I think the simple logic above is practical. > -Alan --Apple-Mail=_75CB8794-64FC-46C6-A8B3-8588880C3BE4 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

On Dec 7, 2023, at 11:59 AM, Alan Somers <asomers@freebsd.org>= wrote:

On Wed, Dec 6, 2023 at 6:55=E2=80=AFPM Zhenlei Huang = <zlei@freebsd.org> = wrote:



On Dec 7, 2023, at 12:52 AM, Alan Somers <asomers@freebsd.org>= wrote:

The branch main has been updated by = asomers:

URL: https://cgit.FreeBSD.org/src/commit/?id=3D6b96125afdf245ae61dd8= 2b59891ad0d6aab0066

commit = 6b96125afdf245ae61dd82b59891ad0d6aab0066
Author: =     Alan Somers <asomers@FreeBSD.org>
AuthorDate: = 2023-12-05 23:23:29 +0000
Commit: =     Alan Somers <asomers@FreeBSD.org>
CommitDate: = 2023-12-06 16:51:37 +0000

  cap_net.3: remove a copypasta

  This line appears to have been copied from = cap_sysctl.3.  While I'm
  here, reorder = and reword the description of cap_net_limit a bit.

  [skip ci]

I guess we can 'skip ci' implicitly for document or typo = changes.

Can we?   The skipping logic is builtin to Jenkins, = Github Workflows,
and Cirrus.  I don't think it would be easy to program = any of those to
detect which changes can be safely skipped.

Sorry = for the misleading word 'can', I think it is accurate to reword it to 'want to'.

1. To detect document changes, I think checking = the names of changed files is sufficient.
2. As for the typo = change, we can check the commit log.

A= false detecting (if the change is SKIP CI candidate) does not hurt = much, as it will be queued up
to next running of CI. So I = think the simple logic above is = practical.

-Alan



= --Apple-Mail=_75CB8794-64FC-46C6-A8B3-8588880C3BE4-- From nobody Thu Dec 7 15:18:21 2023 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 4SmHwQ0QHjz537vQ; Thu, 7 Dec 2023 15:18:30 +0000 (UTC) (envelope-from SRS0=aNgP=HS=klop.ws=ronald-lists@realworks.nl) Received: from smtp-relay-int.realworks.nl (smtp-relay-int.realworks.nl [194.109.157.24]) (using TLSv1.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 4SmHwP3mxcz4LRn; Thu, 7 Dec 2023 15:18:29 +0000 (UTC) (envelope-from SRS0=aNgP=HS=klop.ws=ronald-lists@realworks.nl) Authentication-Results: mx1.freebsd.org; none Date: Thu, 7 Dec 2023 16:18:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=klop.ws; s=rw2; t=1701962301; 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=esk4jL0wRV+Ps6u6KwjpcGqafssBlw1ln9Q/jfMWdWk=; b=tW+QC7zA0x1lHIYTTgKMOOBhylJ0CLJlhgRpmKEKSLjEQhyo77pu6Zwjp2cBFBJkPuPFJE pLmpjd5PoTSn8fuAoTatisD4CSUPBVoc9c+6KvJkBW9QtSKUpABD84OVoC6mJ68i0Rg9Q9 oh010YcqhHJQu55/IVDmbfSe1+BbQlqy/bH9ExTecTyV2ukGuvGM8soVrtW/JBFxMk63rJ wzXlp6HG0JgFYnXp1+/+Vd8I/Ym8sp4VwYml6cpL/X+BTjpRXrigmk1UBfhuXtxxK9PJJ6 477Wdo7B3PYQYLLgwygHHeSsVpkOZYlFY2HHMMs38nKu5qFc/3UnDfNJ8z4STQ== From: Ronald Klop To: Ronald Klop Cc: dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-main@FreeBSD.org Message-ID: <271104654.206755.1701962301276@localhost> In-Reply-To: <202312071133.3B7BX5iQ047655@gitrepo.freebsd.org> References: <202312071133.3B7BX5iQ047655@gitrepo.freebsd.org> Subject: Re: git: 3878bbf1bb9e - main - Teach if_smsc to get MAC from bootargs. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_206754_566537090.1701962301262" X-Mailer: Realworks (681.40) Importance: Normal X-Priority: 3 (Normal) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:3265, ipnet:194.109.0.0/16, country:NL] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SmHwP3mxcz4LRn ------=_Part_206754_566537090.1701962301262 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hi, My commit broke the build on armv6 and armv7 according to Jenkins. Printf(3) says %zd will be a better format specifier for ssize_t than %lu. diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c index 54b18e0a67c..a59501b6bbf 100644 --- a/sys/dev/usb/net/if_smsc.c +++ b/sys/dev/usb/net/if_smsc.c @@ -1594,7 +1594,7 @@ smsc_bootargs_get_mac_addr(device_t dev, struct usb_ether *ue) len = OF_getprop_alloc(node, "bootargs", (void **)&bootargs); if (len == -1 || bootargs == NULL) { smsc_warn_printf((struct smsc_softc *)ue->ue_sc, - "failed alloc for bootargs (%lu)", len); + "failed alloc for bootargs (%zd)", len); return (false); } smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, "bootargs: %s.\n", Ok to commit this? Regards, Ronald. Van: Ronald Klop Datum: donderdag, 7 december 2023 12:33 Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Onderwerp: git: 3878bbf1bb9e - main - Teach if_smsc to get MAC from bootargs. > > The branch main has been updated by ronald: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3878bbf1bb9e68f8579b57cde7d4e5c77de93320 > > commit 3878bbf1bb9e68f8579b57cde7d4e5c77de93320 > Author: Ronald Klop > AuthorDate: 2023-11-04 14:14:00 +0000 > Commit: Ronald Klop > CommitDate: 2023-12-07 11:32:01 +0000 > > Teach if_smsc to get MAC from bootargs. > > Some Raspberry Pi pass smsc95xx.macaddr=XX:XX:XX:XX:XX:XX as bootargs. > Use this if no ethernet address is found in an EEPROM. > As last resort fall back to ether_gen_addr() instead of random MAC. > > PR: 274092 > Reported by: Patrick M. Hausen (via ML) > Reviewed by: imp, karels, zlei > Tested by: Patrick M. Hausen > Approved by: karels > MFC after: 1 month > Relnotes: yes > Differential Revision: https://reviews.freebsd.org/D42463 > --- > sys/dev/usb/net/if_smsc.c | 86 +++++++++++++++++++++++++++++++++++++++++++++-- > sys/net/ethernet.h | 1 + > sys/net/if_ethersubr.c | 10 ++++-- > 3 files changed, 92 insertions(+), 5 deletions(-) > > diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c > index ec8197229f17..54b18e0a67c9 100644 > --- a/sys/dev/usb/net/if_smsc.c > +++ b/sys/dev/usb/net/if_smsc.c > @@ -179,6 +179,8 @@ static const struct usb_device_id smsc_devs[] = { > #define ETHER_IS_VALID(addr) \ > (!ETHER_IS_MULTICAST(addr) && !ETHER_IS_ZERO(addr)) > > +#define BOOTARGS_SMSC95XX "smsc95xx.macaddr" > + > static device_probe_t smsc_probe; > static device_attach_t smsc_attach; > static device_detach_t smsc_detach; > @@ -1538,6 +1540,76 @@ smsc_ioctl(if_t ifp, u_long cmd, caddr_t data) > return (rc); > } > > +#ifdef FDT > +static bool > +smsc_get_smsc95xx_macaddr(char* bootargs, size_t len, struct usb_ether *ue) > +{ > + int values[6]; > + int i; > + char* p; > + > + p = strnstr(bootargs, BOOTARGS_SMSC95XX, len); > + if (p == NULL) > + return (false); > + > + if (sscanf(p, BOOTARGS_SMSC95XX "=%x:%x:%x:%x:%x:%x%*c", > + &values[0], &values[1], &values[2], > + &values[3], &values[4], &values[5]) != 6) { > + smsc_warn_printf((struct smsc_softc *)ue->ue_sc, > + "invalid mac from bootargs '%s'.\n", p); > + return (false); > + } > + > + for (i = 0; i < ETHER_ADDR_LEN; ++i) > + ue->ue_eaddr[i] = values[i]; > + > + smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, > + "bootargs mac=%6D.\n", ue->ue_eaddr, ":"); > + return (true); > +} > + > +/** > + * Raspberry Pi is known to pass smsc95xx.macaddr=XX:XX:XX:XX:XX:XX via > + * bootargs. > + */ > +static bool > +smsc_bootargs_get_mac_addr(device_t dev, struct usb_ether *ue) > +{ > + char *bootargs; > + ssize_t len; > + phandle_t node; > + > + /* only use bootargs for the first device > + * to prevent duplicate mac addresses */ > + if (device_get_unit(dev) != 0) > + return (false); > + node = OF_finddevice("/chosen"); > + if (node == -1) > + return (false); > + if (OF_hasprop(node, "bootargs") == 0) { > + smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, > + "bootargs not found"); > + return (false); > + } > + len = OF_getprop_alloc(node, "bootargs", (void **)&bootargs); > + if (len == -1 || bootargs == NULL) { > + smsc_warn_printf((struct smsc_softc *)ue->ue_sc, > + "failed alloc for bootargs (%lu)", len); > + return (false); > + } > + smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, "bootargs: %s.\n", > + bootargs); > + if (!smsc_get_smsc95xx_macaddr(bootargs, len, ue)) { > + OF_prop_free(bootargs); > + return (false); > + } > + OF_prop_free(bootargs); > + device_printf(dev, "MAC address found in bootargs %6D.\n", > + ue->ue_eaddr, ":"); > + return (true); > +} > +#endif > + > /** > * smsc_attach_post - Called after the driver attached to the USB interface > * @ue: the USB ethernet device > @@ -1552,8 +1624,10 @@ static void > smsc_attach_post(struct usb_ether *ue) > { > struct smsc_softc *sc = uether_getsc(ue); > + struct ether_addr eaddr; > uint32_t mac_h, mac_l; > int err; > + int i; > > smsc_dbg_printf(sc, "smsc_attach_post\n"); > > @@ -1585,11 +1659,17 @@ smsc_attach_post(struct usb_ether *ue) > #ifdef FDT > if ((err != 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr))) > err = usb_fdt_get_mac_addr(sc->sc_ue.ue_dev, &sc->sc_ue); > + if ((err != 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr))) > + err = smsc_bootargs_get_mac_addr(sc->sc_ue.ue_dev, > + &sc->sc_ue) ? (0) : (1); > #endif > if ((err != 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr))) { > - read_random(sc->sc_ue.ue_eaddr, ETHER_ADDR_LEN); > - sc->sc_ue.ue_eaddr[0] &= ~0x01; /* unicast */ > - sc->sc_ue.ue_eaddr[0] |= 0x02; /* locally administered */ > + smsc_dbg_printf(sc, "No MAC address found." > + " Using ether_gen_addr().\n"); > + ether_gen_addr_byname(device_get_nameunit(ue->ue_dev), > + &eaddr); > + for (i = 0; i < ETHER_ADDR_LEN; i++) > + sc->sc_ue.ue_eaddr[i] = eaddr.octet[i]; > } > } > > diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h > index fca6748a0da7..e7313e78c5bb 100644 > --- a/sys/net/ethernet.h > +++ b/sys/net/ethernet.h > @@ -448,6 +448,7 @@ struct mbuf *ether_vlanencap_proto(struct mbuf *, uint16_t, uint16_t); > bool ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, > struct ifnet *p, const struct ether_8021q_tag *); > void ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr); > +void ether_gen_addr_byname(const char *nameunit, struct ether_addr *hwaddr); > > static __inline struct mbuf *ether_vlanencap(struct mbuf *m, uint16_t tag) > { > diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c > index 7a32d0091260..ef0b1f705260 100644 > --- a/sys/net/if_ethersubr.c > +++ b/sys/net/if_ethersubr.c > @@ -1487,7 +1487,7 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p, > * allocate non-locally-administered addresses. > */ > void > -ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr) > +ether_gen_addr_byname(const char *nameunit, struct ether_addr *hwaddr) > { > SHA1_CTX ctx; > char *buf; > @@ -1506,7 +1506,7 @@ ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr) > /* If each (vnet) jail would also have a unique hostuuid this would not > * be necessary. */ > getjailname(curthread->td_ucred, jailname, sizeof(jailname)); > - sz = asprintf(&buf, M_TEMP, "%s-%s-%s", uuid, if_name(ifp), > + sz = asprintf(&buf, M_TEMP, "%s-%s-%s", uuid, nameunit, > jailname); > if (sz < 0) { > /* Fall back to a random mac address. */ > @@ -1535,5 +1535,11 @@ rando: > hwaddr->octet[0] |= 0x02; > } > > +void > +ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr) > +{ > + ether_gen_addr_byname(if_name(ifp), hwaddr); > +} > + > DECLARE_MODULE(ether, ether_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); > MODULE_VERSION(ether, 1); > > > > ------=_Part_206754_566537090.1701962301262 Content-Type: text/html; charset=us-ascii Content-Transfer-Encoding: 7bit Hi,

My commit broke the build on armv6 and armv7 according to Jenkins.

Printf(3) says %zd will be a better format specifier for ssize_t than %lu.

diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c
index 54b18e0a67c..a59501b6bbf 100644
--- a/sys/dev/usb/net/if_smsc.c
+++ b/sys/dev/usb/net/if_smsc.c
@@ -1594,7 +1594,7 @@ smsc_bootargs_get_mac_addr(device_t dev, struct usb_ether *ue)
        len = OF_getprop_alloc(node, "bootargs", (void **)&bootargs);
        if (len == -1 || bootargs == NULL) {
                smsc_warn_printf((struct smsc_softc *)ue->ue_sc,
-                               "failed alloc for bootargs (%lu)", len);
+                               "failed alloc for bootargs (%zd)", len);
                return (false);
        }
        smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, "bootargs: %s.\n",


Ok to commit this?


Regards,
Ronald.

 

Van: Ronald Klop <ronald@FreeBSD.org>
Datum: donderdag, 7 december 2023 12:33
Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Onderwerp: git: 3878bbf1bb9e - main - Teach if_smsc to get MAC from bootargs.

The branch main has been updated by ronald:

URL: https://cgit.FreeBSD.org/src/commit/?id=3878bbf1bb9e68f8579b57cde7d4e5c77de93320

commit 3878bbf1bb9e68f8579b57cde7d4e5c77de93320
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2023-11-04 14:14:00 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2023-12-07 11:32:01 +0000

    Teach if_smsc to get MAC from bootargs.
    
    Some Raspberry Pi pass smsc95xx.macaddr=XX:XX:XX:XX:XX:XX as bootargs.
    Use this if no ethernet address is found in an EEPROM.
    As last resort fall back to ether_gen_addr() instead of random MAC.
    
    PR:     274092
    Reported by:    Patrick M. Hausen (via ML)
    Reviewed by:    imp, karels, zlei
    Tested by:      Patrick M. Hausen
    Approved by:    karels
    MFC after:      1 month
    Relnotes:       yes
    Differential Revision: https://reviews.freebsd.org/D42463
---
 sys/dev/usb/net/if_smsc.c | 86 +++++++++++++++++++++++++++++++++++++++++++++--
 sys/net/ethernet.h        |  1 +
 sys/net/if_ethersubr.c    | 10 ++++--
 3 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c
index ec8197229f17..54b18e0a67c9 100644
--- a/sys/dev/usb/net/if_smsc.c
+++ b/sys/dev/usb/net/if_smsc.c
@@ -179,6 +179,8 @@ static const struct usb_device_id smsc_devs[] = {
 #define ETHER_IS_VALID(addr) \
    (!ETHER_IS_MULTICAST(addr) && !ETHER_IS_ZERO(addr))
 
+#define BOOTARGS_SMSC95XX  "smsc95xx.macaddr"
+
 static device_probe_t smsc_probe;
 static device_attach_t smsc_attach;
 static device_detach_t smsc_detach;
@@ -1538,6 +1540,76 @@ smsc_ioctl(if_t ifp, u_long cmd, caddr_t data)
    return (rc);
 }
 
+#ifdef FDT
+static bool
+smsc_get_smsc95xx_macaddr(char* bootargs, size_t len, struct usb_ether *ue)
+{
+   int values[6];
+   int i;
+   char* p;
+
+   p = strnstr(bootargs, BOOTARGS_SMSC95XX, len);
+   if (p == NULL)
+       return (false);
+
+   if (sscanf(p, BOOTARGS_SMSC95XX "=%x:%x:%x:%x:%x:%x%*c",
+           &values[0], &values[1], &values[2],
+           &values[3], &values[4], &values[5]) != 6) {
+       smsc_warn_printf((struct smsc_softc *)ue->ue_sc,
+               "invalid mac from bootargs '%s'.\n", p);
+       return (false);
+   }
+
+   for (i = 0; i < ETHER_ADDR_LEN; ++i)
+       ue->ue_eaddr[i] = values[i];
+
+   smsc_dbg_printf((struct smsc_softc *)ue->ue_sc,
+           "bootargs mac=%6D.\n", ue->ue_eaddr, ":");
+   return (true);
+}
+
+/**
+ * Raspberry Pi is known to pass smsc95xx.macaddr=XX:XX:XX:XX:XX:XX via
+ * bootargs.
+ */
+static bool
+smsc_bootargs_get_mac_addr(device_t dev, struct usb_ether *ue)
+{
+   char *bootargs;
+   ssize_t len;
+   phandle_t node;
+
+   /* only use bootargs for the first device
+    * to prevent duplicate mac addresses */
+   if (device_get_unit(dev) != 0)
+       return (false);
+   node = OF_finddevice("/chosen");
+   if (node == -1)
+       return (false);
+   if (OF_hasprop(node, "bootargs") == 0) {
+       smsc_dbg_printf((struct smsc_softc *)ue->ue_sc,
+               "bootargs not found");
+       return (false);
+   }
+   len = OF_getprop_alloc(node, "bootargs", (void **)&bootargs);
+   if (len == -1 || bootargs == NULL) {
+       smsc_warn_printf((struct smsc_softc *)ue->ue_sc,
+               "failed alloc for bootargs (%lu)", len);
+       return (false);
+   }
+   smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, "bootargs: %s.\n",
+           bootargs);
+   if (!smsc_get_smsc95xx_macaddr(bootargs, len, ue)) {
+       OF_prop_free(bootargs);
+       return (false);
+   }
+   OF_prop_free(bootargs);
+   device_printf(dev, "MAC address found in bootargs %6D.\n",
+           ue->ue_eaddr, ":");
+   return (true);
+}
+#endif
+
 /**
  * smsc_attach_post - Called after the driver attached to the USB interface
  * @ue: the USB ethernet device
@@ -1552,8 +1624,10 @@ static void
 smsc_attach_post(struct usb_ether *ue)
 {
    struct smsc_softc *sc = uether_getsc(ue);
+   struct ether_addr eaddr;
    uint32_t mac_h, mac_l;
    int err;
+   int i;
 
    smsc_dbg_printf(sc, "smsc_attach_post\n");
 
@@ -1585,11 +1659,17 @@ smsc_attach_post(struct usb_ether *ue)
 #ifdef FDT
        if ((err != 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr)))
            err = usb_fdt_get_mac_addr(sc->sc_ue.ue_dev, &sc->sc_ue);
+       if ((err != 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr)))
+           err = smsc_bootargs_get_mac_addr(sc->sc_ue.ue_dev,
+                   &sc->sc_ue) ? (0) : (1);
 #endif
        if ((err != 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr))) {
-           read_random(sc->sc_ue.ue_eaddr, ETHER_ADDR_LEN);
-           sc->sc_ue.ue_eaddr[0] &= ~0x01;     /* unicast */
-           sc->sc_ue.ue_eaddr[0] |=  0x02;     /* locally administered */
+           smsc_dbg_printf(sc, "No MAC address found."
+                   " Using ether_gen_addr().\n");
+           ether_gen_addr_byname(device_get_nameunit(ue->ue_dev),
+                   &eaddr);
+           for (i = 0; i < ETHER_ADDR_LEN; i++)
+               sc->sc_ue.ue_eaddr[i] = eaddr.octet[i];
        }
    }
 
diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h
index fca6748a0da7..e7313e78c5bb 100644
--- a/sys/net/ethernet.h
+++ b/sys/net/ethernet.h
@@ -448,6 +448,7 @@ struct mbuf  *ether_vlanencap_proto(struct mbuf *, uint16_t, uint16_t);
 bool   ether_8021q_frame(struct mbuf **mp, struct ifnet *ife,
        struct ifnet *p, const struct ether_8021q_tag *);
 void   ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr);
+void   ether_gen_addr_byname(const char *nameunit, struct ether_addr *hwaddr);
 
 static __inline struct mbuf *ether_vlanencap(struct mbuf *m, uint16_t tag)
 {
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 7a32d0091260..ef0b1f705260 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1487,7 +1487,7 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p,
  * allocate non-locally-administered addresses.
  */
 void
-ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr)
+ether_gen_addr_byname(const char *nameunit, struct ether_addr *hwaddr)
 {
    SHA1_CTX ctx;
    char *buf;
@@ -1506,7 +1506,7 @@ ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr)
    /* If each (vnet) jail would also have a unique hostuuid this would not
     * be necessary. */
    getjailname(curthread->td_ucred, jailname, sizeof(jailname));
-   sz = asprintf(&buf, M_TEMP, "%s-%s-%s", uuid, if_name(ifp),
+   sz = asprintf(&buf, M_TEMP, "%s-%s-%s", uuid, nameunit,
        jailname);
    if (sz < 0) {
        /* Fall back to a random mac address. */
@@ -1535,5 +1535,11 @@ rando:
    hwaddr->octet[0] |= 0x02;
 }
 
+void
+ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr)
+{
+   ether_gen_addr_byname(if_name(ifp), hwaddr);
+}
+
 DECLARE_MODULE(ether, ether_mod, SI_SUB_INIT_IF, SI_ORDER_ANY);
 MODULE_VERSION(ether, 1);
 

  ------=_Part_206754_566537090.1701962301262-- From nobody Thu Dec 7 15:36:17 2023 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 4SmJK45wV7z539HW; Thu, 7 Dec 2023 15:36:24 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.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 (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmJK443htz4PPT; Thu, 7 Dec 2023 15:36:24 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 3B7FaIGq087015; Thu, 7 Dec 2023 09:36:18 -0600 (CST) (envelope-from mike@karels.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karels.net; s=mail2; t=1701963378; bh=lKLTG5+wsw2CN0Res1sNFEAJfx59N0GGJjQ+3kqtDWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZhQhBguLpTbzr2E5FAe0MFIfHCiBFogJUM1tJjlwH6lA0XOV0m8oWxbKQnwnOZIZ0 Pd6VHa/wnWhNcvbbt98BokTDdf9ANC2z7spQtcackI5D2s9EsY+PoTaWJJZ0Ltlqq5 kQRMdKHyz1b5eJfoqcntZPlUVxmNr6jnnhZTsude1m1s8H/Lq2r523QVQB/+42ekng pxGVDMZy+BUcCLu+v8gK7Qbfr/UmU0IMJZ8enjlcg4LOn2niKXEnKlw/bKnChqKBDr QomjiG1j1YVldZO4Bnu/oc7xWxrhCmSM5645OVzP/8kIdH2gsNQ3ypWJLx7dNGYois rdjSNoglTmKoA== Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id bA6YCXLmcWXlUwEAs/W3XQ (envelope-from ); Thu, 07 Dec 2023 09:36:18 -0600 From: Mike Karels To: Ronald Klop Cc: Ronald Klop , dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 3878bbf1bb9e - main - Teach if_smsc to get MAC from bootargs. Date: Thu, 07 Dec 2023 09:36:17 -0600 X-Mailer: MailMate (1.14r5964) Message-ID: In-Reply-To: <271104654.206755.1701962301276@localhost> References: <202312071133.3B7BX5iQ047655@gitrepo.freebsd.org> <271104654.206755.1701962301276@localhost> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SmJK443htz4PPT On 7 Dec 2023, at 9:18, Ronald Klop wrote: > Hi, > > My commit broke the build on armv6 and armv7 according to Jenkins. > > Printf(3) says %zd will be a better format specifier for ssize_t than %= lu. > > diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c > index 54b18e0a67c..a59501b6bbf 100644 > --- a/sys/dev/usb/net/if_smsc.c > +++ b/sys/dev/usb/net/if_smsc.c > @@ -1594,7 +1594,7 @@ smsc_bootargs_get_mac_addr(device_t dev, struct u= sb_ether *ue) > len =3D OF_getprop_alloc(node, "bootargs", (void **)&bootargs); > if (len =3D=3D -1 || bootargs =3D=3D NULL) { > smsc_warn_printf((struct smsc_softc *)ue->ue_sc, > - "failed alloc for bootargs (%lu)", len)= ; > + "failed alloc for bootargs (%zd)", len)= ; > return (false); > } > smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, "bootargs: %s.\n= ", > > > Ok to commit this? Yes, please do. Mike > Regards, > Ronald. > > > Van: Ronald Klop > Datum: donderdag, 7 december 2023 12:33 > Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-c= ommits-src-main@FreeBSD.org > Onderwerp: git: 3878bbf1bb9e - main - Teach if_smsc to get MAC from boo= targs. >> >> The branch main has been updated by ronald: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D3878bbf1bb9e68f8579b57c= de7d4e5c77de93320 >> >> commit 3878bbf1bb9e68f8579b57cde7d4e5c77de93320 >> Author: Ronald Klop >> AuthorDate: 2023-11-04 14:14:00 +0000 >> Commit: Ronald Klop >> CommitDate: 2023-12-07 11:32:01 +0000 >> >> Teach if_smsc to get MAC from bootargs. >> Some Raspberry Pi pass smsc95xx.macaddr=3DXX:XX:XX:XX:XX:XX as = bootargs. >> Use this if no ethernet address is found in an EEPROM. >> As last resort fall back to ether_gen_addr() instead of random MAC= =2E >> PR: 274092 >> Reported by: Patrick M. Hausen (via ML) >> Reviewed by: imp, karels, zlei >> Tested by: Patrick M. Hausen >> Approved by: karels >> MFC after: 1 month >> Relnotes: yes >> Differential Revision: https://reviews.freebsd.org/D42463 >> --- >> sys/dev/usb/net/if_smsc.c | 86 ++++++++++++++++++++++++++++++++++++++= +++++++-- >> sys/net/ethernet.h | 1 + >> sys/net/if_ethersubr.c | 10 ++++-- >> 3 files changed, 92 insertions(+), 5 deletions(-) >> >> diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c >> index ec8197229f17..54b18e0a67c9 100644 >> --- a/sys/dev/usb/net/if_smsc.c >> +++ b/sys/dev/usb/net/if_smsc.c >> @@ -179,6 +179,8 @@ static const struct usb_device_id smsc_devs[] =3D = { >> #define ETHER_IS_VALID(addr) \ >> (!ETHER_IS_MULTICAST(addr) && !ETHER_IS_ZERO(addr)) >> +#define BOOTARGS_SMSC95XX "smsc95xx.macaddr" >> + >> static device_probe_t smsc_probe; >> static device_attach_t smsc_attach; >> static device_detach_t smsc_detach; >> @@ -1538,6 +1540,76 @@ smsc_ioctl(if_t ifp, u_long cmd, caddr_t data) >> return (rc); >> } >> +#ifdef FDT >> +static bool >> +smsc_get_smsc95xx_macaddr(char* bootargs, size_t len, struct usb_ethe= r *ue) >> +{ >> + int values[6]; >> + int i; >> + char* p; >> + >> + p =3D strnstr(bootargs, BOOTARGS_SMSC95XX, len); >> + if (p =3D=3D NULL) >> + return (false); >> + >> + if (sscanf(p, BOOTARGS_SMSC95XX "=3D%x:%x:%x:%x:%x:%x%*c", >> + &values[0], &values[1], &values[2], >> + &values[3], &values[4], &values[5]) !=3D 6) { >> + smsc_warn_printf((struct smsc_softc *)ue->ue_sc, >> + "invalid mac from bootargs '%s'.\n", p); >> + return (false); >> + } >> + >> + for (i =3D 0; i < ETHER_ADDR_LEN; ++i) >> + ue->ue_eaddr[i] =3D values[i]; >> + >> + smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, >> + "bootargs mac=3D%6D.\n", ue->ue_eaddr, ":"); >> + return (true); >> +} >> + >> +/** >> + * Raspberry Pi is known to pass smsc95xx.macaddr=3DXX:XX:XX:XX:XX:XX= via >> + * bootargs. >> + */ >> +static bool >> +smsc_bootargs_get_mac_addr(device_t dev, struct usb_ether *ue) >> +{ >> + char *bootargs; >> + ssize_t len; >> + phandle_t node; >> + >> + /* only use bootargs for the first device >> + * to prevent duplicate mac addresses */ >> + if (device_get_unit(dev) !=3D 0) >> + return (false); >> + node =3D OF_finddevice("/chosen"); >> + if (node =3D=3D -1) >> + return (false); >> + if (OF_hasprop(node, "bootargs") =3D=3D 0) { >> + smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, >> + "bootargs not found"); >> + return (false); >> + } >> + len =3D OF_getprop_alloc(node, "bootargs", (void **)&bootargs); >> + if (len =3D=3D -1 || bootargs =3D=3D NULL) { >> + smsc_warn_printf((struct smsc_softc *)ue->ue_sc, >> + "failed alloc for bootargs (%lu)", len); >> + return (false); >> + } >> + smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, "bootargs: %s.\n",= >> + bootargs); >> + if (!smsc_get_smsc95xx_macaddr(bootargs, len, ue)) { >> + OF_prop_free(bootargs); >> + return (false); >> + } >> + OF_prop_free(bootargs); >> + device_printf(dev, "MAC address found in bootargs %6D.\n", >> + ue->ue_eaddr, ":"); >> + return (true); >> +} >> +#endif >> + >> /** >> * smsc_attach_post - Called after the driver attached to the USB int= erface >> * @ue: the USB ethernet device >> @@ -1552,8 +1624,10 @@ static void >> smsc_attach_post(struct usb_ether *ue) >> { >> struct smsc_softc *sc =3D uether_getsc(ue); >> + struct ether_addr eaddr; >> uint32_t mac_h, mac_l; >> int err; >> + int i; >> smsc_dbg_printf(sc, "smsc_attach_post\n"); >> @@ -1585,11 +1659,17 @@ smsc_attach_post(struct usb_ether *ue) >> #ifdef FDT >> if ((err !=3D 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr))) >> err =3D usb_fdt_get_mac_addr(sc->sc_ue.ue_dev, &sc->sc_ue)= ; >> + if ((err !=3D 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr))) >> + err =3D smsc_bootargs_get_mac_addr(sc->sc_ue.ue_dev, >> + &sc->sc_ue) ? (0) : (1); >> #endif >> if ((err !=3D 0) || (!ETHER_IS_VALID(sc->sc_ue.ue_eaddr))) { >> - read_random(sc->sc_ue.ue_eaddr, ETHER_ADDR_LEN); >> - sc->sc_ue.ue_eaddr[0] &=3D ~0x01; /* unicast */ >> - sc->sc_ue.ue_eaddr[0] |=3D 0x02; /* locally administe= red */ >> + smsc_dbg_printf(sc, "No MAC address found." >> + " Using ether_gen_addr().\n"); >> + ether_gen_addr_byname(device_get_nameunit(ue->ue_dev), >> + &eaddr); >> + for (i =3D 0; i < ETHER_ADDR_LEN; i++) >> + sc->sc_ue.ue_eaddr[i] =3D eaddr.octet[i]; >> } >> } >> diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h >> index fca6748a0da7..e7313e78c5bb 100644 >> --- a/sys/net/ethernet.h >> +++ b/sys/net/ethernet.h >> @@ -448,6 +448,7 @@ struct mbuf *ether_vlanencap_proto(struct mbuf *,= uint16_t, uint16_t); >> bool ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, >> struct ifnet *p, const struct ether_8021q_tag *); >> void ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr); >> +void ether_gen_addr_byname(const char *nameunit, struct ether_addr = *hwaddr); >> static __inline struct mbuf *ether_vlanencap(struct mbuf *m, uint16_t= tag) >> { >> diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c >> index 7a32d0091260..ef0b1f705260 100644 >> --- a/sys/net/if_ethersubr.c >> +++ b/sys/net/if_ethersubr.c >> @@ -1487,7 +1487,7 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet= *ife, struct ifnet *p, >> * allocate non-locally-administered addresses. >> */ >> void >> -ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr) >> +ether_gen_addr_byname(const char *nameunit, struct ether_addr *hwaddr= ) >> { >> SHA1_CTX ctx; >> char *buf; >> @@ -1506,7 +1506,7 @@ ether_gen_addr(struct ifnet *ifp, struct ether_a= ddr *hwaddr) >> /* If each (vnet) jail would also have a unique hostuuid this woul= d not >> * be necessary. */ >> getjailname(curthread->td_ucred, jailname, sizeof(jailname)); >> - sz =3D asprintf(&buf, M_TEMP, "%s-%s-%s", uuid, if_name(ifp), >> + sz =3D asprintf(&buf, M_TEMP, "%s-%s-%s", uuid, nameunit, >> jailname); >> if (sz < 0) { >> /* Fall back to a random mac address. */ >> @@ -1535,5 +1535,11 @@ rando: >> hwaddr->octet[0] |=3D 0x02; >> } >> +void >> +ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr) >> +{ >> + ether_gen_addr_byname(if_name(ifp), hwaddr); >> +} >> + >> DECLARE_MODULE(ether, ether_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); >> MODULE_VERSION(ether, 1); >> >> >> From nobody Thu Dec 7 16:50:45 2023 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 4SmKys5Mbyz53Ghq; Thu, 7 Dec 2023 16:50:45 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmKys3VKjz4WpY; Thu, 7 Dec 2023 16:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701967845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r80QidG/MdluHlb1UTw5C5h5PMUz6SOTf/YLs2m663g=; b=n2I8ZT4X7iazlHj38+Hjnd2DnQmSNPmy3irgOXG/uxPNYsBTLN2mjxE5XqTlrUeePjaTId bUOmEVZ1FZ/gJp4FajZ8Oy7kkWQYp8+OL5pMcv2doRcXvX839jrd6EgGREd6J1FdkClLTu jFlw4aFS8dzY/aDSvwxtEprpdf8/vjSj5PbkDBTRfwVlMmWaiANaN2iAcW9B0ogC9buNDc 8JO7XMQ5mM/gIKc6Zsc5iadjgLwjHoUsfti2u4FdCWfZQq503Zq2aRRcOL0AeeDita5dHE /qLh7/d229C6skICbspV4Lk0Lu3lgw0FuQtluzL7J1YmQrWIsqftMTXQJmdhgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701967845; a=rsa-sha256; cv=none; b=t1nOOgcTfAZLIto/XzYofAbLTJw9HmTgcDoyMkTEY8G5+Ar+xVKe4OJLUJJgo3t3pxK4Ed swv1vVQN5XB1wRUy+q409pWE5JdOS3N0LqmVS+5rqwuv6Ez5WB5C/lsvC0abYJreYQSTDg +IG39k/tHc5FlrVxmdtVpxZvQMAnjvQagPh2qkPA1JXzVYlyVPI07lteXN0c64hqdmpMK7 UjhU3OdMPJirujBLsDTS5QqRt2HK55xCIxIz+RZdTzNRN3E3zeKtip+TB3WNXpAqNiLIUY mfapUsYmomujG+yql9XJODGEJMhGylEJ5GKV0jQj41On/uplhUCxEMbTTtj6+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701967845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r80QidG/MdluHlb1UTw5C5h5PMUz6SOTf/YLs2m663g=; b=VTHQ/zd4klfXxTpMo232+VlAA4L0E0n2cimS2kLje0NqVoSZHOfXMNuJ3Hu0MeS6oH8UdW VsQg0gX/jlRYo5sW8kIFtItaP36Y3WOXYFfHLcAvpFHjF93KuZ13TuY74ECVQBp1tBriyq FoMnTwrrOJiDwNEiwUW0HLsSCBdI7fGtgt3PVAVQZG7uGCgxNH7ZsRQCaW/jXR8Euj2RXW jIKWTATHys8Ti/G6Zl4A9sUCfP6eUCa2NkvLlzM/WgANR+RaLhn8qiOXJJD5KaqnfNXGKN 0poAch2TcvmOCYRdByO/xTnzokCicwT7j5+zvvUwGikZZqceKdWjC3N7hdv3dQ== 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 4SmKys2ZxPzl09; Thu, 7 Dec 2023 16:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7Gojpk077942; Thu, 7 Dec 2023 16:50:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7Goj5K077939; Thu, 7 Dec 2023 16:50:45 GMT (envelope-from git) Date: Thu, 7 Dec 2023 16:50:45 GMT Message-Id: <202312071650.3B7Goj5K077939@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ronald Klop Subject: git: 8a0ee306227a - main - if_smsc: fix build on armv6 & armv7 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a0ee306227a17a998bdc7af2275fd94b9164342 Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/src/commit/?id=8a0ee306227a17a998bdc7af2275fd94b9164342 commit 8a0ee306227a17a998bdc7af2275fd94b9164342 Author: Ronald Klop AuthorDate: 2023-12-07 16:46:58 +0000 Commit: Ronald Klop CommitDate: 2023-12-07 16:50:28 +0000 if_smsc: fix build on armv6 & armv7 compile error was: /usr/src/sys/dev/usb/net/if_smsc.c:1597:40: error: format specifies type 'unsigned long' but the argument has type 'ssize_t' (aka 'int') [-Werror,-Wformat] "failed alloc for bootargs (%lu)", len); ~~~ ^~~ %zd PR: 274092 Approved by: karels MFC after: 1 month --- sys/dev/usb/net/if_smsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c index 54b18e0a67c9..a59501b6bbff 100644 --- a/sys/dev/usb/net/if_smsc.c +++ b/sys/dev/usb/net/if_smsc.c @@ -1594,7 +1594,7 @@ smsc_bootargs_get_mac_addr(device_t dev, struct usb_ether *ue) len = OF_getprop_alloc(node, "bootargs", (void **)&bootargs); if (len == -1 || bootargs == NULL) { smsc_warn_printf((struct smsc_softc *)ue->ue_sc, - "failed alloc for bootargs (%lu)", len); + "failed alloc for bootargs (%zd)", len); return (false); } smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, "bootargs: %s.\n", From nobody Thu Dec 7 20:22:16 2023 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 4SmQfw5W98z53YHY; Thu, 7 Dec 2023 20:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmQfw50hmz4rVr; Thu, 7 Dec 2023 20:22:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701980536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=njlTjJa2DvZfh7nePH9DMGQv2Wwd+Vcmk3OliMUeqYo=; b=JOjKty5NF3hJbqJfHGTdeYaTbrrRDVxR+duwhsk+pCWN4fsdw3cx0is65wfYr3BGf+6wKR Hx3otXb+R25XDi927uhCNrRP/6Xcx5r2mGypqv/+wlMoREPwfa5/u3688oI97/+EbgbVJf pBG8oZlleUydY4sC4s++HbzWd7HtmuhK4qbLtlFF+ov4xBuAzMPeM/x9iQo3rvGu1kdcII 8FfqIoZJwsy4NnLS8ja7go6bVb3Si4VgS5Mp8KqlAwEiLNbG+LyzQNDTHP79apt0/dcZrH uCm1QLwptTZNXYM+8AiIAjfVByc7nyJv61wkKVRgxP7U8mRqLvJRn3eXdZSvyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701980536; a=rsa-sha256; cv=none; b=FaeXFFOXZ/3DxVPACRzN5tuo3iPChUt0zFmMkpfcfoWyKVyROC6NYjX9Qu37MB94YBG6KS W3G+GUHfn9R3/vduukuvUAHaV8zqjW3xHPCW9qQ2i3CTWp/3LrFj5VaUFmrKUJTfNy/atv BkuaZIalt89fgTMjD0ReE71uvlQ/xMPKklmYJiFpkr9tPdXanHCkXOZ5T3nKABpUIHEof4 TSe/Vg3Fiwa0vdmcs7c0YL6j4kxxHyxKFIuU7jYtSSoYuoH0+3VRA9etnU5uyy4vx3GCZw bGqcKUWpYCXSUpiB+Hh5QXct/TxpFxDnQRdIBfhZ0nAuJanrLnZ1Ba2Jvi7vGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701980536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=njlTjJa2DvZfh7nePH9DMGQv2Wwd+Vcmk3OliMUeqYo=; b=kAten8Bk8MM9HoTQnVfvFwl77hQSzuQcV2bKsTKhfWKwXO1xUOVZix4RD7cZX3nIDdwjwh adKq1RCIszEOPaSXwFMfDopvJLMPYXXccmLr2okhUBBeJsgaKV9Aqcos9a0GGqz1P2LVyM HeqlAMNtiWsK59gg0ertGdD0Tf9VWJxZRN8KHNeIB9djLQEb+yOD8gKJwQX1ZWE6KaneAM dxHzfI7mwXdeVjhBIHQ+zVSdJCkAkGjomadJ1sZ1gbttpYjHXSPq+g+fdzNJKPEuXHMCvA kGGYXKIL++oO92tp07ExlUYZ/tBMvlLfCILLwv8W51Q8tKqQQlhI/mVZs08uVA== 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 4SmQfw3y1JzrTd; Thu, 7 Dec 2023 20:22:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7KMG5g038644; Thu, 7 Dec 2023 20:22:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7KMGZi038641; Thu, 7 Dec 2023 20:22:16 GMT (envelope-from git) Date: Thu, 7 Dec 2023 20:22:16 GMT Message-Id: <202312072022.3B7KMGZi038641@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: 69ae43a1e6a5 - main - camcontrol: One file per line in Makefile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 69ae43a1e6a53a1b8898a31c6b7140bf52b2c3ad Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=69ae43a1e6a53a1b8898a31c6b7140bf52b2c3ad commit 69ae43a1e6a53a1b8898a31c6b7140bf52b2c3ad Author: Warner Losh AuthorDate: 2023-12-01 03:07:53 +0000 Commit: Warner Losh CommitDate: 2023-12-07 20:21:57 +0000 camcontrol: One file per line in Makefile We have enough files now that moving to one file per line makes sense. Sponsored by: Netflix --- sbin/camcontrol/Makefile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile index d47dbdc43bd7..e0407dd20a56 100644 --- a/sbin/camcontrol/Makefile +++ b/sbin/camcontrol/Makefile @@ -3,12 +3,22 @@ PACKAGE=runtime PROG= camcontrol -SRCS= camcontrol.c util.c -SRCS+= attrib.c depop.c epc.c fwdownload.c modeedit.c persist.c progress.c timestamp.c zone.c +SRCS= camcontrol.c +SRCS+= attrib.c +SRCS+= depop.c +SRCS+= epc.c +SRCS+= fwdownload.c +SRCS+= modeedit.c +SRCS+= persist.c +SRCS+= progress.c +SRCS+= timestamp.c +SRCS+= util.c +SRCS+= zone.c .if ${MK_NVME} != "no" .PATH: ${SRCTOP}/sbin/nvmecontrol CFLAGS+= -I${SRCTOP}/sbin/nvmecontrol -DWITH_NVME -SRCS+= identify_ext.c nc_util.c +SRCS+= identify_ext.c +SRCS+= nc_util.c .PATH: ${SRCTOP}/sys/dev/nvme SRCS+= nvme_util.c .endif From nobody Thu Dec 7 20:38:40 2023 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 4SmR1s1qKvz53ZQb; Thu, 7 Dec 2023 20:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmR1s1HkGz4tCg; Thu, 7 Dec 2023 20:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701981521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5U4hf5772Rx66UuorvgE4Exvlfl35bHOC00fJFenKg=; b=mUATS7BzVQEU0R2MktAy/BuqwD92MC6MLdwI8HVzNyAVo5nVbF+D6XuctlgXcjeVBOKmN2 bEV2OtPL64J4d8G5TCZNHvfmaY2FAWj5XcvX0MPDLlzM4ZJhk1Bh6S3BEocJv9c/2Tj7QS AftbgW8whRGjfwgJv52lAexbyb53kHCglEC/hwJPGuY6zvk/SnrTKfUqAipOydX3r1GCjD 1ASZALCeB2X61VuiQSbA5eJg4E+E6gJMZ6lOajZb7pSRQwHrM/vwVpLvUjwWyQDSkTgW0O vUXLRoFTKkSWqW6Rqd7zNRksf8AxXJtp72PKpoE290WrLAz4pRUyeL+WneAUdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701981521; a=rsa-sha256; cv=none; b=i0B889qJxQDxEDwT3RKWMJNgreWdDW1I3mSJQhIFSfUOXJ6Ke93xpWU8JQF2jLqnkAvDKO kUUHECJL4QFv0vrBAtrOeZDs5Cs/PDRl9QmVJxVJ5iRPPerSXSN1sG2aJqw6cuthsm6cYi +p5sUkdzijnNta8/VdabB6/Y0z5Mq2UI4dxoxKDg8zmET0V8ub4+peGrL6FJ4uo7O3x87m rH2IemOLzeBtXkPTesbjIgcJWcSu3WcD7wJCffcrD7LBxze6MjhZKxdz1Ex5XjRe5f+l+7 FeV6iCRJeJIx3tVYu1dm9VOZ/PCRwJmRFf4Qc0s4IXsr+Hl2bGtHEzs6s5JZYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701981521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5U4hf5772Rx66UuorvgE4Exvlfl35bHOC00fJFenKg=; b=i0vhEvxsiFavrWnpRrtUo4Iq7Zl+cJr4bK+fXqkGzI9+CAfUlskmckx7QPeQiVjEJtoJDS dSSa0IuOA02bJN/Q6g4F1WP1Pc3uYhjY8OsOajwYzTj7/6vSRb6quYvVldsbm9z4HtbFGP 9pTTWVaKYN2m8dh5ffnzyslvV1jChoggDo8OBACZ3CcUkJ5lSRy0TAxxA/lzjXiVelWGc+ 0ht70o3/PcSN23X4u6CEgJp1KlBo4zwBAW366Sj4TgbIU1X9tLdd4Mn2BjFB8XGmm7KQB0 pFU9eSagDRn0JhtHrCsBj9QkEjDvHlWQNWrFnyltH8Ee9cFJaYxpI4n0OOJ4dQ== 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 4SmR1s0LBbzs75; Thu, 7 Dec 2023 20:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7KcePT057845; Thu, 7 Dec 2023 20:38:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7Kceuh057842; Thu, 7 Dec 2023 20:38:40 GMT (envelope-from git) Date: Thu, 7 Dec 2023 20:38:40 GMT Message-Id: <202312072038.3B7Kceuh057842@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: 5a52e3d00dd5 - main - cp: Add -N flag, inspired by NetBSD's similar 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5a52e3d00dd5e0209f6fcb1e41b5985191e6f4e7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5a52e3d00dd5e0209f6fcb1e41b5985191e6f4e7 commit 5a52e3d00dd5e0209f6fcb1e41b5985191e6f4e7 Author: Warner Losh AuthorDate: 2023-12-07 19:32:27 +0000 Commit: Warner Losh CommitDate: 2023-12-07 20:36:44 +0000 cp: Add -N flag, inspired by NetBSD's similar flag Add -N to supress copying of file flags when -p is specified (explicitly or implicitly). Often times we don't care about the flags or wish to be able to copy to NFS, and this comes in handy for that. FreeBSD's and NetBSD's cp are somewhat different, so I had to reimplement all but one of the patch hunks... Obtained from: NetBSD (cp.1 1.25, cp.c 1.37, utils.c 1.28 by elad) Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D42673 --- bin/cp/cp.1 | 14 +++++++++----- bin/cp/cp.c | 7 +++++-- bin/cp/extern.h | 2 +- bin/cp/utils.c | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/bin/cp/cp.1 b/bin/cp/cp.1 index 0bf28937d7fc..32e6fe295b35 100644 --- a/bin/cp/cp.1 +++ b/bin/cp/cp.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 23, 2022 +.Dd December 7, 2023 .Dt CP 1 .Os .Sh NAME @@ -42,7 +42,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl alpsvx +.Op Fl alNpsvx .Ar source_file target_file .Nm .Oo @@ -50,15 +50,15 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl alpsvx +.Op Fl alNpsvx .Ar source_file ... target_directory .Nm .Op Fl f | i | n -.Op Fl alPpsvx +.Op Fl alNPpsvx .Ar source_file target_file .Nm .Op Fl f | i | n -.Op Fl alPpsvx +.Op Fl alNPpsvx .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -88,6 +88,10 @@ option is specified, symbolic links on the command line are followed. If the .Fl R option is specified, all symbolic links are followed. +.It Fl N +When used with +.Fl p , +suppress copying file flags. .It Fl P No symbolic links are followed. This is the default if the diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 1510943ab5f6..78ded7af3d5a 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -72,7 +72,7 @@ static char emptystring[] = ""; PATH_T to = { to.p_path, emptystring, "" }; -int fflag, iflag, lflag, nflag, pflag, sflag, vflag; +int Nflag, fflag, iflag, lflag, nflag, pflag, sflag, vflag; static int Hflag, Lflag, Rflag, rflag; volatile sig_atomic_t info; @@ -91,7 +91,7 @@ main(int argc, char *argv[]) fts_options = FTS_NOCHDIR | FTS_PHYSICAL; Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRafilnprsvx")) != -1) + while ((ch = getopt(argc, argv, "HLNPRafilnprsvx")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -101,6 +101,9 @@ main(int argc, char *argv[]) Lflag = 1; Hflag = Pflag = 0; break; + case 'N': + Nflag = 1; + break; case 'P': Pflag = 1; Hflag = Lflag = 0; diff --git a/bin/cp/extern.h b/bin/cp/extern.h index 742b5676f1d7..272454bb5871 100644 --- a/bin/cp/extern.h +++ b/bin/cp/extern.h @@ -36,7 +36,7 @@ typedef struct { } PATH_T; extern PATH_T to; -extern int fflag, iflag, lflag, nflag, pflag, sflag, vflag; +extern int Nflag, fflag, iflag, lflag, nflag, pflag, sflag, vflag; extern volatile sig_atomic_t info; __BEGIN_DECLS diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 2e1a50635a15..686db13ef0cf 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -349,7 +349,7 @@ setfile(struct stat *fs, int fd) rval = 1; } - if (!gotstat || fs->st_flags != ts.st_flags) + if (!Nflag && (!gotstat || fs->st_flags != ts.st_flags)) if (fdval ? fchflags(fd, fs->st_flags) : (islink ? lchflags(to.p_path, fs->st_flags) : From nobody Thu Dec 7 20:38:42 2023 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 4SmR1t5JtZz53ZP2; Thu, 7 Dec 2023 20:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmR1t1srYz4tGh; Thu, 7 Dec 2023 20:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701981522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UUZ+O56jN27kfP1JbCZlN19ehBgyaQa7WYnhjhvePNY=; b=pKbgm5n/btYP5uHzsv4ODV5iyNyu7LYZouxw0/JKvifpDeIOFx2YksMwO+U/UQ5/jsvc3S DtRhkhYXmk4h8/goWjiI3jgz4ebd7ZVukz90cSrVjs2kNTCdgR/fBzAHz8t5BPg3BiasGr mqGq2nWp5DesODzqHQy/n8WlcePQX8XJLqNhsADy6b7yI0PBXDi68EZmy3I8D9OYfixFEz /YJCyhxSqisX6T+UhEV+inVtnbXvUGK1Ulk26Qs8NGR3P6XU7ZeDm7uFIU0jnn69Hh1cgw MoyUwP/mGqZSh3ljeDwij8ZBOr3Wvw1oW8JVkYB/MaqXMioe7Bt8JOUqhaBU+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701981522; a=rsa-sha256; cv=none; b=iWu3DYhft4Ypj4hpf9UWifduqHYKr5CGPgAZBR5VDnn9g4TkP/7j42Empjws2Mb1Mj5+RU fmgCEmFvWz9Exlsg9O8WWK/t+aGwlSZxIsEsrzE6evBiy2+G8utoLuzXMiHxytE8gmUjDa UueABpVYuJLiwHIcncBv4MHoWLCvrCkLy6md80AehUpLIPjChJ1mGLLCGlUGyJYkCs4e+F E5C0QJPosuaTkYhFTfPq70J8zfu/fVZQ/N+ZBLH759gcYeD2lXa40OIydU5QBUXMccB/1e h3+cQdRgWnuNNm6fzV6WM/3hCC07N0ue5Dk4B0/wsXcCr6ixvSclHS/wnDGseg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701981522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UUZ+O56jN27kfP1JbCZlN19ehBgyaQa7WYnhjhvePNY=; b=Ed1t7YAJnQBwE9IfkWv+gyQ6JedJBxFY0f7qb4e1dfVk7Qn7WFGxQDTVGT4Qat3Smgrpnt ghcFloK0IIYWYDSF/V5WIMUUkvPvvSbn9jOWyvcreW9zB6wmLrKGt+t9zEPWuxMMSVJCIr e2Pg5tZ9gtVojkRUcgCYG3LNMP5RcQ3c1ZZy95QPDcX2yT1WuiEZc6vCHviAFgxdW38FqM dVzbdCH+I5c4/3Oss8JJ7HqTkFg/K/jKLWCtyoPakBmlMrDodVwFbqt7xKi/xiY8i+U9P6 lXF5/TlFgioy1UFT8D97VjGf8orYWhMFb1Rz8iO+xe5NcTZqhxh+emNhsTYZLQ== 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 4SmR1t0zXRzrYY; Thu, 7 Dec 2023 20:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7KcghS057911; Thu, 7 Dec 2023 20:38:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7KcgGg057908; Thu, 7 Dec 2023 20:38:42 GMT (envelope-from git) Date: Thu, 7 Dec 2023 20:38:42 GMT Message-Id: <202312072038.3B7KcgGg057908@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: 3e7e3b5bdf90 - main - cp: Don't warn for chflags() failing with EOPNOTSUPP if flags == 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3e7e3b5bdf902a375decc11b95179fd2fbc0da2a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3e7e3b5bdf902a375decc11b95179fd2fbc0da2a commit 3e7e3b5bdf902a375decc11b95179fd2fbc0da2a Author: Warner Losh AuthorDate: 2023-12-07 19:32:30 +0000 Commit: Warner Losh CommitDate: 2023-12-07 20:36:44 +0000 cp: Don't warn for chflags() failing with EOPNOTSUPP if flags == 0 From NetBSD's utils.c 1.5 importing importing BSDI change, with light formatting changes: Author: cgd Date: Wed Feb 26 14:40:51 1997 +0000 Patch from BSDI (via Keith Bostic): >NFS doesn't support chflags; ignore errors unless there's reason >to believe we're losing bits. (Note, this still won't be right >if the server supports flags and we were trying to *remove* flags >on a file that we copied, i.e., that we didn't create.) CVS Info: utils.c 1.6 Obtained from: NetBSD Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D42674 --- bin/cp/utils.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 686db13ef0cf..3621c89dd2f2 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -354,8 +354,17 @@ setfile(struct stat *fs, int fd) fchflags(fd, fs->st_flags) : (islink ? lchflags(to.p_path, fs->st_flags) : chflags(to.p_path, fs->st_flags))) { - warn("chflags: %s", to.p_path); - rval = 1; + /* + * NFS doesn't support chflags; ignore errors unless + * there's reason to believe we're losing bits. (Note, + * this still won't be right if the server supports + * flags and we were trying to *remove* flags on a file + * that we copied, i.e., that we didn't create.) + */ + if (errno != EOPNOTSUPP || fs->st_flags != 0) { + warn("chflags: %s", to.p_path); + rval = 1; + } } return (rval); From nobody Thu Dec 7 20:43:30 2023 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 4SmR7R05J3z53ZmS; Thu, 7 Dec 2023 20:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmR7Q6jR1z4v5f; Thu, 7 Dec 2023 20:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701981810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sAjZtfTIJkQ2gV1rAtKpgsvLqzbKeUcPmb44Ts0UmLo=; b=JvXbnrvah7oqUVpaeSeapYqIrfrhwXr3Zc5yR17HR3vVVqUzYgDPugH5AAhBmb7CxGNLQg GWma5xFpzyDqUM0S2YTvWUx4sAHc8dy49LXILekOSSJEMF6ImOmygrek6dtcKTI+LIpJsV 1fdvWEFaHJauVTr7DklmnBrVuH3k16xTIEew4mlNwZn+Ul/500I4ED2ergZirl7MoBgJUa 2XwHt1A+7xz6gyERMZbndTJtJTWVSqsg3tvth+gTgrKS5W//KniWG0FerzeL8s1giR3MLA CxOeBYHIUwRvNA95eVkZ0sJUUJgGacrpOULvpFfg9uDovXG/130teLe6lK/c4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701981810; a=rsa-sha256; cv=none; b=YgQ3QdfOYmbeIh/cZws0nYz5zShnkTttnTBAMixZ3NGEp5jm3AHwhmMLhFJn3gEoKUHOsU TgpHRIbjZhUrXOOjzAD398X/VOJTgus5yS2ZljzFM3cA4aOrZH9FK81wW0H5zi8bNEVGMn KzDvXnH6uz/h9EFw6Ai1jkBU7iPhIl8ewumhyO4VVBBc9twIkvNS7W+yLe2jUBaSiOHBrA 1fPSHobvGzGFq7VcZqQYz9WA3S7C+SX/4fANDKeyuyDCq+kURZrOytmR/oTlk7YdSQF4yX Lve5kWeBksdMakn0abIew3YTKQB/CE2jf0h5dzzMmchj/CR2YEG+gCd2ldtTzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701981810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sAjZtfTIJkQ2gV1rAtKpgsvLqzbKeUcPmb44Ts0UmLo=; b=gxfZkQI42msxsQPKMV2XbEwmvk/DFBwDqTprZ9Yg/Qx39Mcn0OfdymjbkzLI5xQItt05WV Vgc6jaXdWfZbYgAeIOIv60X3oyKWxX+WKGueTP+BphcDzeUeIpnrNQX2VYwgpLRhujpaif 7uZSQdQPKxPVK0eWZCGOJ814w/6l6CpwHQeoFaOHT28FOp/E8ShvXAxovZh/bwjIGkZZCw WPak+nEf4skRADeQY9rV1wzjoEt7GuHkbJFpDbJg4qWSUrGAeEQFZ8QnQO9xRJpX9G4FTr hHaFrO4JiXVfAesGPXN9jartUU263MQl47wAEKIZwe8j8M83h6NQTmpDRK3yTw== 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 4SmR7Q5lyzzsMF; Thu, 7 Dec 2023 20:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7KhUN5073428; Thu, 7 Dec 2023 20:43:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7KhUXA073425; Thu, 7 Dec 2023 20:43:30 GMT (envelope-from git) Date: Thu, 7 Dec 2023 20:43:30 GMT Message-Id: <202312072043.3B7KhUXA073425@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: bd234c0d4c82 - main - sort: Only build FreeBSD-specific ALTMON_x stuff when ATLMON_1 is defined List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bd234c0d4c8256db7e5a1fdda9ef311c9e0080e4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bd234c0d4c8256db7e5a1fdda9ef311c9e0080e4 commit bd234c0d4c8256db7e5a1fdda9ef311c9e0080e4 Author: Warner Losh AuthorDate: 2023-12-07 20:27:07 +0000 Commit: Warner Losh CommitDate: 2023-12-07 20:42:52 +0000 sort: Only build FreeBSD-specific ALTMON_x stuff when ATLMON_1 is defined On MacOS, we bootstrap sort. Since ALTMON_* are not defined there, the build blows up. Since we don't need this feature for the FreeBSD build process, and since we won't use it unless we actually install the NL files that have this data in it, just #ifdef it out for now. In the extremely unlikely event that the FreeBSD bootstrap/build process grows this dependency, we can evaluate the best solution then (which most likely is going to be not depend on the local's month names). Fixes: 3d44dce90a69 (MacOS builds and github CI) Sponsored by: Netflix Reviewed by: jrtc27, jlduran@gmail.com, markj Differential Revision: https://reviews.freebsd.org/D42868 --- usr.bin/sort/bwstring.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c index b0c14e996b23..10679fe631ba 100644 --- a/usr.bin/sort/bwstring.c +++ b/usr.bin/sort/bwstring.c @@ -113,9 +113,11 @@ initialise_months(void) const nl_item ab_item[12] = { ABMON_1, ABMON_2, ABMON_3, ABMON_4, ABMON_5, ABMON_6, ABMON_7, ABMON_8, ABMON_9, ABMON_10, ABMON_11, ABMON_12 }; +#ifdef ALTMON_1 const nl_item alt_item[12] = { ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6, ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12 }; +#endif int i; /* @@ -132,9 +134,13 @@ initialise_months(void) if (!populate_cmonth(&cmonths[i].ab, ab_item[i], i)) continue; +#ifdef ALTMON_1 if (!populate_cmonth(&cmonths[i].alt, alt_item[i], i)) continue; +#else + cmonths[i].alt = NULL; +#endif } } @@ -148,9 +154,13 @@ initialise_months(void) if (!populate_wmonth(&wmonths[i].ab, ab_item[i], i)) continue; +#ifdef ALTMON_1 if (!populate_wmonth(&wmonths[i].alt, alt_item[i], i)) continue; +#else + wmonths[i].alt = NULL; +#endif } } } From nobody Thu Dec 7 20:43:31 2023 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 4SmR7S1PZ0z53ZY2; Thu, 7 Dec 2023 20: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmR7S0hn9z4vW0; Thu, 7 Dec 2023 20: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=1701981812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EeySaUITaiqkNdXMJGCIISBbtyzMd4qrA7BOwv8l1bI=; b=Ge/kN9UCNvsB1FxNuNR1iryV0mmdGNWJzaSZ7cDSJ93VOGPXfHvU40yR0vMrVVp/ZoO/YU oE2zyuW7zOGS954TmpdbeO50to0GcnkSnHjfPXF58405DISfX3pMq9OZdh2gu4s5RT62wq Pc4nAwLq8fjXRUUSmKdy69ZAtBN4tOZrxfzcmMKjAz+sOhvKdwsWdKuIE3dOWFWr9OWxlO 19As1XJLhWIdpS3/JflAk0Zt33bS93vy0HemzrUH06ImrROQHiw74bpJ7Ixqh/65Ru70LJ Plz2teBJKNxo12GkBxJqt+dOQVr7oT54ANzKeOd81NC2zIaYX/tJrUFcK7jlRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701981812; a=rsa-sha256; cv=none; b=pPXmxuFotLYbG+E7NHpWDWQASyv2LIS5sexrS6lhCQsK+/Vm8PcaRe1f8bGp8nC9PFhx1R z7a3TkT2eLRBsxLnq/3/gUfx5WVZ7m2qTdAOA3ZtHRUuneGZ3Vblyj7KkgZlqzOEir7Jgj +KM/wbBdwh0UopgZjxc4TD7AT/qNvVroPJmB8tBOgRapyKN+GxGRq3kGlxGSVnONCEl+Ga vCGlLe8c4eHL6tTu7oyoLbz0aO4/0r3jWBvR1nbtKjDSAAXRg8jKjlDYLMcFepvQVmZLJ1 /UNi6iBKiIVTv0AOD5KyjKnHtOrHeycL7tSbei2IYLq9f9GIFhQw9uvdb3v+Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701981812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EeySaUITaiqkNdXMJGCIISBbtyzMd4qrA7BOwv8l1bI=; b=AEvfsSDUjPfRI6vQVvGbTE3r61cREhJMCRGpvSdHZzYWIpghXMOvquL9I8AADeaLO/1h+D cQ0wDqDUunPQQ6WQAsgMjYckbbjr5CvWvlfVBQ2569YUixBXTavsEVnQMvo4xPkDpJWP+P vshbv4xYOBcd9ZpgGHRUfbQe9TUMEKBWv7sRBL7lHL6bmLJ0m2vZHu3CT87ZApsFpHYF0s meTiOqi0EnYaqmNY4V3Y2MjaLyZParWTFhqVCioGTSCoLObhHdIAwbdvYT5SqQhlGULO++ PelX30aJ/uLkvtEWXnnGLCykTLatIV5i4I2f5n536lv9htXg69liiE6utGFSBg== 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 4SmR7R6pPhzsMG; Thu, 7 Dec 2023 20:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7KhVGN073486; Thu, 7 Dec 2023 20:43:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7KhVW9073483; Thu, 7 Dec 2023 20:43:31 GMT (envelope-from git) Date: Thu, 7 Dec 2023 20:43:31 GMT Message-Id: <202312072043.3B7KhVW9073483@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: 7b085f14b73c - main - build: use bare (and portable) echo instead of echo -n List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 7b085f14b73c1ac7168b50a86478a32bbcaab1fa Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7b085f14b73c1ac7168b50a86478a32bbcaab1fa commit 7b085f14b73c1ac7168b50a86478a32bbcaab1fa Author: Warner Losh AuthorDate: 2023-12-07 20:27:27 +0000 Commit: Warner Losh CommitDate: 2023-12-07 20:42:52 +0000 build: use bare (and portable) echo instead of echo -n There's no need to use echo -n here. A single echo will do nicely. This fixes the post-buildworld output on a macos build, where echo -n is implemented like System V instead of BSD (so you get two lines first one starting with -n). Sponsored by: Netflix Reviewed by: jrtc27, emaste Differential Revision: https://reviews.freebsd.org/D42869 --- Makefile.inc1 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d85e6fd8f15b..2a2df2becff2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1231,8 +1231,7 @@ buildworld_epilogue: .PHONY @echo "--------------------------------------------------------------" @echo ">>> World build completed on `LC_ALL=C date`" @seconds=$$(($$(date '+%s') - ${_BUILDWORLD_START})); \ - echo -n ">>> World built in $$seconds seconds, "; \ - echo "ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}" + echo ">>> World built in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}" @echo "--------------------------------------------------------------" # @@ -1808,8 +1807,7 @@ buildkernel: .MAKE .PHONY .endfor @seconds=$$(($$(date '+%s') - ${_BUILDKERNEL_START})); \ - echo -n ">>> Kernel(s) ${BUILDKERNELS} built in $$seconds seconds, "; \ - echo "ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}" + echo ">>> Kernel(s) ${BUILDKERNELS} built in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}" @echo "--------------------------------------------------------------" .if !make(packages) && !make(update-packages) From nobody Thu Dec 7 20:54:43 2023 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 4SmRNM3qTJz53bY4; Thu, 7 Dec 2023 20:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmRNM3K5fz3BxV; Thu, 7 Dec 2023 20:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701982483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FnKd1KhDCjzdFB+yJAeqA2F4ItHkWrQv7vbjFael6V0=; b=KHkYmajvvtF0MJzmmUMVKW+zsaRt3kQeyW6AoOE9Pv0GTd4ACIHL0SoIh/N6mwGldVmt1c 0b9XxPGhs4j9bL55/dwptheayKNrqauHNCGNYgUaz/3uUflHdNCFYoH/WlAF03dQe4q/K5 tmR7equVqHr96dTUzSg+XPBk+7U5yh4mWrHUNTriKgGVvrDri17CVa0k6xVASX1e3z6sqG /KBL0eXB/MEwLIfLTH03ha3cq1rURsnez8/2ZuOSGWfIy168OgQFH7Hl1/zURjojvOOEa/ rfztvBxZVM7BUmdlzsqlDiRWFkarSo+Lno5qEQzDX+Bd4IfhOUF2304CwGzutA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701982483; a=rsa-sha256; cv=none; b=oUbgdPXAUaR6SBcFH9sgrQyQiQKi0LyiOU2hrB4xSL6L5rYLkiBwtzH2eN5rNAbvu7QT/m HJ77FEXXQFhactAs9shBxQqbNYA6FDpt6BNTM7CnV2/A7GBwBrzuRLciKoihv4Q1nCiow9 HPy3cnLTgrINpic8AKMcPJGVPNodZHTEu6vsiCRw0Cfr+NvvYNOwcpeBJc4OEutxVQyaSl RV0sFih2FtZBclrn2YXYe0l4qTATVd+IIWtIsZkqCCn4dUM/vfa5pLT4L61HCluxsZfJ+N 7RShx4poNHReqwtsXAWGAQjbkTcD/eNfvH0hY8E/TJCrS+79ga1ufPALFQEpiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701982483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FnKd1KhDCjzdFB+yJAeqA2F4ItHkWrQv7vbjFael6V0=; b=uP3hk+q7GvW8tygaWYMSbiZanA5tmn+64b9PXr/8mkB1ho2qb9r+M1BPXrE/vE/NqMgxqn 5ndtIGBAkVi88YBqr909lJbclUumeLN9wAOeYzViKiRcqoX904eLQiOa7+UjDy13RDIqu8 nUO7x7PUyW7o4EnZXMUxu+2aGTVyXhBsyg5JgDH5OPA+kqWP5zbieiJaL3nfY2ru18uxqG 8u5sfiPm42Maq4I+NpIV1EZYn4ig7xxwr8E+RHlPaGhgJt77qUiep/D+Uk5SJH0iomN54W uEEFiH2nQBWxTU0gN+DwWnPjTtfed+Ms0fnL979iE34GhvMlFFeXUCMLflNlhg== 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 4SmRNM2NYczsbc; Thu, 7 Dec 2023 20:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7Kshd1089995; Thu, 7 Dec 2023 20:54:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7KshSY089992; Thu, 7 Dec 2023 20:54:43 GMT (envelope-from git) Date: Thu, 7 Dec 2023 20:54:43 GMT Message-Id: <202312072054.3B7KshSY089992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: 8a8e86b819dc - main - Revert "linuxkpi: `GFP_KERNEL` equals `M_NOWAIT` now" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a8e86b819dcaf60ed0858f7b00cb733c9ae3aca Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=8a8e86b819dcaf60ed0858f7b00cb733c9ae3aca commit 8a8e86b819dcaf60ed0858f7b00cb733c9ae3aca Author: Jean-Sébastien Pédron AuthorDate: 2023-12-07 18:45:25 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-12-07 20:53:44 +0000 Revert "linuxkpi: `GFP_KERNEL` equals `M_NOWAIT` now" This change seems to break some drivers such as the mlx5*(4) drivers. As kib@ says: > According to the 'official' Linux kernel documentation, the GFP_KERNEL > flag implies sleepable context. It was introduced while working on the new vt(4)/DRM integration [1]. During this work, doing sleepable allocations broke vt(4) and the DRM drivers. However, I made further improvements and some locking-related fixed to the new integration without revisiting the need for it. After more testing, the improvements to the integration mentionned above seems to make the change to `GFP_KERNEL` unneeded now. I can thus revert it to restore expectations of other drivers. This reverts commit 14dcd40983748596d116d91acb934a8a95ac76bc. [1] https://github.com/freebsd/drm-kmod/pull/243 Reviewed by: kib Approved by: kib Differential Revision: https://reviews.freebsd.org/D42962 --- sys/compat/linuxkpi/common/include/linux/gfp.h | 2 +- sys/compat/linuxkpi/common/include/linux/slab.h | 8 ++++---- sys/compat/linuxkpi/common/src/linux_compat.c | 7 ++----- sys/compat/linuxkpi/common/src/linux_interrupt.c | 3 --- sys/compat/linuxkpi/common/src/linux_pci.c | 4 ++-- sys/compat/linuxkpi/common/src/linux_shmemfs.c | 11 ++--------- 6 files changed, 11 insertions(+), 24 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/gfp.h b/sys/compat/linuxkpi/common/include/linux/gfp.h index 7f59c73851b1..c086fb9effe4 100644 --- a/sys/compat/linuxkpi/common/include/linux/gfp.h +++ b/sys/compat/linuxkpi/common/include/linux/gfp.h @@ -63,7 +63,7 @@ #define GFP_NOWAIT M_NOWAIT #define GFP_ATOMIC (M_NOWAIT | M_USE_RESERVE) -#define GFP_KERNEL M_NOWAIT +#define GFP_KERNEL M_WAITOK #define GFP_USER M_WAITOK #define GFP_HIGHUSER M_WAITOK #define GFP_HIGHUSER_MOVABLE M_WAITOK diff --git a/sys/compat/linuxkpi/common/include/linux/slab.h b/sys/compat/linuxkpi/common/include/linux/slab.h index 3e857a4adc54..8557f831bb60 100644 --- a/sys/compat/linuxkpi/common/include/linux/slab.h +++ b/sys/compat/linuxkpi/common/include/linux/slab.h @@ -47,12 +47,12 @@ MALLOC_DECLARE(M_KMALLOC); #define kzalloc(size, flags) kmalloc(size, (flags) | __GFP_ZERO) #define kzalloc_node(size, flags, node) kmalloc_node(size, (flags) | __GFP_ZERO, node) #define kfree_const(ptr) kfree(ptr) -#define vzalloc(size) __vmalloc(size, M_WAITOK | __GFP_NOWARN | __GFP_ZERO, 0) +#define vzalloc(size) __vmalloc(size, GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO, 0) #define vfree(arg) kfree(arg) #define kvfree(arg) kfree(arg) -#define vmalloc_node(size, node) __vmalloc_node(size, M_WAITOK, node) -#define vmalloc_user(size) __vmalloc(size, M_WAITOK | __GFP_ZERO, 0) -#define vmalloc(size) __vmalloc(size, M_WAITOK, 0) +#define vmalloc_node(size, node) __vmalloc_node(size, GFP_KERNEL, node) +#define vmalloc_user(size) __vmalloc(size, GFP_KERNEL | __GFP_ZERO, 0) +#define vmalloc(size) __vmalloc(size, GFP_KERNEL, 0) #define __kmalloc(...) kmalloc(__VA_ARGS__) /* diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index baa4ff2fee44..b913ae602ab3 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -574,7 +574,7 @@ linux_file_alloc(void) { struct linux_file *filp; - filp = kzalloc(sizeof(*filp), M_WAITOK); + filp = kzalloc(sizeof(*filp), GFP_KERNEL); /* set initial refcount */ filp->f_count = 1; @@ -1412,9 +1412,6 @@ linux_file_mmap_single(struct file *fp, const struct file_operations *fop, return (EINVAL); vmap = kzalloc(sizeof(*vmap), GFP_KERNEL); - if (vmap == NULL) - return (ENOMEM); - vmap->vm_start = 0; vmap->vm_end = size; vmap->vm_pgoff = *offset / PAGE_SIZE; @@ -1944,7 +1941,7 @@ vmmap_add(void *addr, unsigned long size) { struct vmmap *vmmap; - vmmap = kmalloc(sizeof(*vmmap), M_WAITOK); + vmmap = kmalloc(sizeof(*vmmap), GFP_KERNEL); mtx_lock(&vmmaplock); vmmap->vm_size = size; vmmap->vm_addr = addr; diff --git a/sys/compat/linuxkpi/common/src/linux_interrupt.c b/sys/compat/linuxkpi/common/src/linux_interrupt.c index 886a5d5ad014..5602b09c8fb8 100644 --- a/sys/compat/linuxkpi/common/src/linux_interrupt.c +++ b/sys/compat/linuxkpi/common/src/linux_interrupt.c @@ -135,9 +135,6 @@ lkpi_request_irq(struct device *xdev, unsigned int irq, GFP_KERNEL | __GFP_ZERO); else irqe = kzalloc(sizeof(*irqe), GFP_KERNEL); - if (irqe == NULL) - return (-ENOMEM); - irqe->dev = dev; irqe->res = res; irqe->arg = arg; diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index a1cddfdf6a23..99750d5ced26 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -304,7 +304,7 @@ lkpifill_pci_dev(device_t dev, struct pci_dev *pdev) pdev->subsystem_device = pci_get_subdevice(dev); pdev->class = pci_get_class(dev); pdev->revision = pci_get_revid(dev); - pdev->path_name = kasprintf(M_WAITOK, "%04d:%02d:%02d.%d", + pdev->path_name = kasprintf(GFP_KERNEL, "%04d:%02d:%02d.%d", pci_get_domain(dev), pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev)); pdev->bus = malloc(sizeof(*pdev->bus), M_DEVBUF, M_WAITOK | M_ZERO); @@ -1468,7 +1468,7 @@ linux_dma_pool_create(char *name, struct device *dev, size_t size, priv = dev->dma_priv; - pool = kzalloc(sizeof(*pool), M_WAITOK); + pool = kzalloc(sizeof(*pool), GFP_KERNEL); pool->pool_device = dev; pool->pool_entry_size = size; diff --git a/sys/compat/linuxkpi/common/src/linux_shmemfs.c b/sys/compat/linuxkpi/common/src/linux_shmemfs.c index f0ee0e36f8c6..1fb17bc5c0cb 100644 --- a/sys/compat/linuxkpi/common/src/linux_shmemfs.c +++ b/sys/compat/linuxkpi/common/src/linux_shmemfs.c @@ -47,15 +47,8 @@ linux_shmem_read_mapping_page_gfp(vm_object_t obj, int pindex, gfp_t gfp) struct page *page; int rv; - /* - * Historically, GFP_KERNEL was the equivalent of M_WAITOK. But it was - * changed to a synonym of M_NOWAIT to allow allocations in - * non-sleepable code. - * - * However, there was an assertion here to make sure that `gfp` was - * never set to GFP_NOWAIT/M_NOWAIT. Do we need a specific handling of - * M_NOWAIT here? - */ + if ((gfp & GFP_NOWAIT) != 0) + panic("GFP_NOWAIT is unimplemented"); VM_OBJECT_WLOCK(obj); rv = vm_page_grab_valid(&page, obj, pindex, VM_ALLOC_NORMAL | From nobody Thu Dec 7 22:27:16 2023 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 4SmTRM4gZQz53j66; Thu, 7 Dec 2023 22:27:27 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Received: from sdaoden.eu (sdaoden.eu [217.144.132.164]) (using TLSv1.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 4SmTRL57b2z3MCD; Thu, 7 Dec 2023 22:27:26 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of steffen@sdaoden.eu designates 217.144.132.164 as permitted sender) smtp.mailfrom=steffen@sdaoden.eu; dmarc=none Date: Thu, 07 Dec 2023 23:27:16 +0100 Author: Steffen Nurpmeso From: Steffen Nurpmeso To: Xin Li Cc: Philip Paeps , Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources Message-ID: <20231207222716.obSthG6r@steffen%sdaoden.eu> In-Reply-To: References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> Mail-Followup-To: Xin Li , Philip Paeps , Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org User-Agent: s-nail v14.9.24-573-g7d89a8210a OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [1.52 / 15.00]; SUBJECT_HAS_CURRENCY(1.00)[]; NEURAL_SPAM_LONG(1.00)[0.999]; NEURAL_HAM_MEDIUM(-0.91)[-0.908]; NEURAL_SPAM_SHORT(0.73)[0.733]; R_SPF_ALLOW(-0.20)[+a]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; ARC_NA(0.00)[]; DMARC_NA(0.00)[sdaoden.eu]; RCPT_COUNT_FIVE(0.00)[6]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15987, ipnet:217.144.128.0/20, country:DE] X-Rspamd-Queue-Id: 4SmTRL57b2z3MCD X-Spamd-Bar: + Xin Li wrote in : |On 2023-12-06 22:34, Philip Paeps wrote: |> On 2023-12-07 14:26:05 (+0800), Warner Losh wrote: |>> We should point to bipm |>> https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list since they= =20 |>> are |>> the source of truth, no? |>=20 |> I went for the IANA copy because data.iana.org is a much shorter and=20 |> trustworthy looking URL.=C2=A0 And it's also where other operating syst= ems=20 |> get their copies. | |My understanding is that IANA's copy is part of tzdata and it's only=20 |updated when a new set of zone data is released, so it's sometimes=20 |outdated. It is actually going to be outdated really soon by the way. But nothing will change. It is only about the included end-of-life tag why there is discussion at all. The IANA TZ data is always updated as necessary, "early enough". Also the beasts are about to get rid of leap seconds until 2035 (and they have beaten onto the Russians which' GLONASS is capable to deal properly, as far as the discussion was, the fact it is not earlier). Bets can be placed whether it will happen before a possible occurring leap second, or not. (My bet is that they run everything against the wall, and then run away yelling about the evil leap second, after having missed to create an appropriate environment to deal with the reached scientific level to keep us truly within one second of our home planet, and his star. O tempora, o mores. But that is off-topic.) |The IERS one is more up-to-date because they publish the bulletin. In general i think distribution of load is a good thing, and i find it very unfriendly to put all the load onto some jealous institute (if it is one) and its single server. The FreeBSD project has an established set of mirrors, and, the way i see the excessive use of installations on clowds and such, for example for github actions which spawn dozens of OS installations to test a commit (doh!). Btw PHK had a thrilling idea of DNS distributing leap ticks some years ago, and he even started to host it. As it unfortunately did not fly i did not track it further. Would also be an idea for the FreeBSD project: simply download the file ones, then place a DNS record that FreeBSD installations then can query. DNSSEC is in place i think. |The bundled version was from NIST ftp, but fetching from ftp for every=20 |FreeBSD system out there was too scary for me. | |There may be some security / privacy concerns if we direct users to a=20 |place that we do not have control, by the way. Interesting aspect! --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) | | Only in December: lightful Dubai COP28 Narendra Modi quote: | A small part of humanity has ruthlessly exploited nature. | But the entire humanity is bearing the cost of it, | especially the inhabitants of the Global South. | The selfishness of a few will lead the world into darkness, | not just for themselves but for the entire world. From nobody Thu Dec 7 22:32:23 2023 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 4SmTY33pgmz53jV4; Thu, 7 Dec 2023 22:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmTY336N6z3N0k; Thu, 7 Dec 2023 22:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701988343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H4TPzeuAG9f6QfYZuwhriR2nP0rOvfBKZIaJ0DtihNQ=; b=iS2uu9NaVTL1Se4Ng3ADP46gqKX4wsOI2VAB3jU9EJyWEvmZ2S43GHJ3bDPgDHFKqV1903 7P9DRz7ba34qOVr4U6t0wFNBFaPtbpEXk+R0pw6aT1AxSlun+W+j6wjpngkvqNOF5kHMQW 9afsWD/x+XaBzBaXE6xsGoLx+wB7FTGLf7MqDUtntLalgbMWM1qIiRAErSAFhtX+Na7bYl B/sFZG3HrtHw7TEArwQ46Y9nTCpqIFkZCmal8G1bmAoMroJ1lMMtmsvVY+nkGxXEG2kmSU x4Z27ARjf3aJNav33HewGJBFqNopiRv2pDk71FjAw/OZ8GZ62ngPuumiMKsLnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701988343; a=rsa-sha256; cv=none; b=lKiK2XTMNfVhlI2lXEYnl/LDTbkGYmPVMWe2ZVesGLBtMGkTiNjidAaS+x+N9TfPnTlo+E zmm3I9C60y6ZXTJ+BNl1E+9lwy/bspKJrL0RIDjimKoBWR40/gzXfbn/dqkZcEhTiY3h0p 0G+f8w3/OUzkJU4W3QnPy7irpqHQs0V1pRcuXnrIKr0iWyhbZ2IRCDkr7HKGw9Jx4INxQ4 E3CuncHaGp8wKpxs57OAF3nQibhVaIIl/up2Vp9YVL7lJ6/WKv+5YolLuiFbuUpVlMayY5 31UBD982VY0uM3jGC+t0mpOrHbZ4snvpzeDSJnGSfeESYwj1VkGUOsI/zfyi8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701988343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H4TPzeuAG9f6QfYZuwhriR2nP0rOvfBKZIaJ0DtihNQ=; b=HjVrpHcJGT7UPmBwIW3INWp1B/Nd1ghFR/v2gsZedLroZcXkmgv7Fxl+AVQdHmzcZEUHWZ 60/0ihPPs6LomEHmKJGbW32UxKZA/8MIW5Imcb8qI+jTn2i7p0zrkcOR8VMPVZORjH4XGc u/WAFzPrBtmvAn6mAu1wI5V053eVYeZibD3B0llgEynPDYeABqJxk94ca5sM01ypt85H/3 sRWEdC5ZwJ3T5OMxOrjaApn9ezey32+cpxBmQbUigUd02uEXTofhYd+VO9+Jn7t76Lsqwq 4YOm6N+mk8rBjfbZiklM7IkGqDAZT4aTqTJhFp1McMchZSlSkogGXe4R0S6E5Q== 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 4SmTY32BnCzw5W; Thu, 7 Dec 2023 22:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7MWNxM057534; Thu, 7 Dec 2023 22:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7MWNwm057531; Thu, 7 Dec 2023 22:32:23 GMT (envelope-from git) Date: Thu, 7 Dec 2023 22:32:23 GMT Message-Id: <202312072232.3B7MWNwm057531@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: 9101746a6cce - main - Cirrus CI: Add manual jobs for amd64 and aarch64 using GCC 13 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9101746a6cce90314ad03c7ff06398a5f68d0cc7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9101746a6cce90314ad03c7ff06398a5f68d0cc7 commit 9101746a6cce90314ad03c7ff06398a5f68d0cc7 Author: John Baldwin AuthorDate: 2023-12-07 22:32:08 +0000 Commit: John Baldwin CommitDate: 2023-12-07 22:32:08 +0000 Cirrus CI: Add manual jobs for amd64 and aarch64 using GCC 13 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42840 --- .cirrus.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 3abf6898a66d..85853d2a62ea 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -54,6 +54,15 @@ task: TOOLCHAIN: amd64-gcc12 TOOLCHAIN_PKG: ${TOOLCHAIN} EXTRA_MAKE_FLAGS: -s + - name: amd64-gcc13 World and kernel build and boot smoke test (manual) + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: amd64 + TARGET_ARCH: amd64 + TOOLCHAIN: amd64-gcc13 + TOOLCHAIN_PKG: ${TOOLCHAIN} + EXTRA_MAKE_FLAGS: -s - name: aarch64-gcc12 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual @@ -63,6 +72,15 @@ task: TOOLCHAIN: aarch64-gcc12 TOOLCHAIN_PKG: ${TOOLCHAIN} EXTRA_MAKE_FLAGS: -s + - name: aarch64-gcc13 World and kernel build and boot smoke test (manual) + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: arm64 + TARGET_ARCH: aarch64 + TOOLCHAIN: aarch64-gcc13 + TOOLCHAIN_PKG: ${TOOLCHAIN} + EXTRA_MAKE_FLAGS: -s - name: amd64-gcc12 World and kernel build and boot smoke test (FreeBSD repo) only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src' && $CIRRUS_BRANCH =~ 'pull/.*' env: From nobody Thu Dec 7 22:42:13 2023 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 4SmTmP5prRz53kPR; Thu, 7 Dec 2023 22:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmTmP46Bsz3Psh; Thu, 7 Dec 2023 22:42:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701988933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cDYc/Mnc59OgIwxCclbIDxgL14/Pfg9bmIJp1Bk5kHI=; b=yLHSTo+3ISw7uWg1jin2tybn7ipLiCcuusszj5d8zgFkSdkXgJrGgGqRN/M0dc1hbJqhPy VTS49wTkohU6Dd7plBUj2YSvqRdAFoycQWVvWhFybgsHlHrr2y9Iox3YSOqJPQIyRPxmjA eizldlJoC64uPIRQwzqfj4uN6guUYfRrKsRRvFfkg5U6Gzg2zdPg6XCuDAr/4ZNE0Hx4dW ri261J1XIY33HFPPEy/pKgVHbjANliXBjG9RDHuSG8/MWAsfCDOKeeuURbv2juQflYn2+P X8clYHvgh3LM2jE+bB72oA2tVbb96ZlX17ImPwEyDpFzEJX+iG1XQo8asJEgNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701988933; a=rsa-sha256; cv=none; b=h0q6nOdi+obA6jlzj1B+hHUWm8wUWE+MnnLL9FBup/N+nAUrCHtS6m3DyUri7JJq2z6XUE dy7hZdIZlU1X1vcYLq36m1cpftlqhFxn39klIfgcNY/03RqRpiZlXE8QGizzp3iaf3MQpN J6yVtDi0X735cgZs+43fFUNvaNV7zADaSY4P2nKrO1zkCMww9Zop8NuGBkCym9lLw0dvMb tlwtMO6E1D0RrTcwc1O2tcX3uf6TfLBV/SB6BFdfPrtSM+7LYuJokXnyUkrHVZIp6NcXxn sPKnDvwLe9IUStQ73ykAk6M3d1EF0ziOxGlwMEcD/Arxc/lYJGh8H5Rv9k2fuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701988933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cDYc/Mnc59OgIwxCclbIDxgL14/Pfg9bmIJp1Bk5kHI=; b=P3KrxAXuvpmLqmaXbTfxYwU9K3L0bChOR2nkFOMXRIZQPSZPnwfK3sqvnrOM+GtR7zBdaf 0xEffa1hEk8U7VBXfwTOodGdG3vq+nbuDHfMMEilCG2kimSdolGV/Xw3m5/iWQBCPFm007 j/y7jVLo59a/7Tlm1kky1lOtodqd/l6ekZRjYmFWqgb0vo9dYoN68bDW8KwpMogcjI+zwc EjsxBf5eH4OKSdab1TEzfC13tBtJbAQZUq+Z39s62MVT/Xo7YKlTG07JHTdJ7B+rQJDxe7 +2VRT+UcpojD8beq2+kGLcQD1OWQIOhkFfeJdqphZTZz1DMK0AuwPb7q9s92Aw== 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 4SmTmP3DBWzw9F; Thu, 7 Dec 2023 22:42:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7MgDje073751; Thu, 7 Dec 2023 22:42:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7MgDG7073748; Thu, 7 Dec 2023 22:42:13 GMT (envelope-from git) Date: Thu, 7 Dec 2023 22:42:13 GMT Message-Id: <202312072242.3B7MgDG7073748@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: ade05d63b727 - main - tcp: stop stack timers in tcp_switch_back_to_default() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ade05d63b727d5e8d0d833c1d974a9d50d4cb1bb Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ade05d63b727d5e8d0d833c1d974a9d50d4cb1bb commit ade05d63b727d5e8d0d833c1d974a9d50d4cb1bb Author: Gleb Smirnoff AuthorDate: 2023-12-07 22:41:36 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-07 22:41:36 +0000 tcp: stop stack timers in tcp_switch_back_to_default() This funcion is an alternative code path that detaches an alternative TCP stack, missed in d2ef52ef3dee38cccb7f54d33ecc2a4b944dad9d. Reviewed by: rrs, tuexen Differential Revision: https://reviews.freebsd.org/D42917 Reported-by: syzbot+186130be9f0ca5557d4e@syzkaller.appspotmail.com Fixes: d2ef52ef3dee38cccb7f54d33ecc2a4b944dad9d --- sys/netinet/tcp_subr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index d951b5df938e..c79cadd04944 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -542,6 +542,9 @@ tcp_switch_back_to_default(struct tcpcb *tp) KASSERT(tp->t_fb != &tcp_def_funcblk, ("%s: called by the built-in default stack", __func__)); + if (tp->t_fb->tfb_tcp_timer_stop_all != NULL) + tp->t_fb->tfb_tcp_timer_stop_all(tp); + /* * Now, we'll find a new function block to use. * Start by trying the current user-selected From nobody Thu Dec 7 22:42:14 2023 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 4SmTmQ65hxz53kGg; Thu, 7 Dec 2023 22:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmTmQ5Q5Xz3PyJ; Thu, 7 Dec 2023 22:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701988934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MV0coqcPxR864R/0fBHUaTJV9kfVXqz5geHup3p3ewU=; b=gZ2Oyi6esTnhFNotTTpUksF8+vvcL/BCytwYB57xdvrZxnV/tfasQFyIRpNlgfI6l/p6ET Mz3L8adBkV7liUeCeGSeVHpy9a9GsVLZ0t4ucfBr2Yf/RF3NiyhBsCvpgKlMv7lArD69eb e1EeriL3w2f8t2TGaxn+MgBMXY8OFOeZXn0PdxfuZ9T1i683CLlebXrPEsXexOmFtMyEPp xYu0mZLcxyAi/u2YBWlUaNdcXI/doRYliCG3uz1wqzkshiy1mnG8knHRY/6oPF6uOKT2z+ FHOF66l0gJhQ8y3322guJByuMal9hy1JUujWMzxUisS6uObbE3ePytIFzhJ7IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701988934; a=rsa-sha256; cv=none; b=U+YD/MjqDnPRd+F5yxwI/9L43jAJf2EX2XinFnCwfm3qcj0muQrlRsMu8OB0lPgcAZ9sfW 6YO07LWozDyJmyXB5qIR9cAmIb5UV1vFAY9PykoLL3yd6fv6fWvwn0261d/1NH36JcXS+3 7tMmJy9UQ+2hsyOCI7wrEo7YiUJIwhsfJhrsnIzm0pQW7m/coaflY31CPjArnrjnUvPbqz +J95epRy09ynHfnkNsITdsUzSVRI9qcwcpkkZf9t89ipZbab3Z3svMx4wm6+FTBLpl41/A 9lPzTcqXtWKJy7cSKP6iPYQwZLA5okDKFLpbAEMgNde7Kth43nbn13bNn+FkBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701988934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MV0coqcPxR864R/0fBHUaTJV9kfVXqz5geHup3p3ewU=; b=DdV+E6TqqJoxM9nN+1pUCD6Yk0TB+AQKb1/efUuOS29AT+6cHBOBjJWwgnLvjfzh+2SdKp DMG0avT3/Q2P3YcOORLcCywslpz5CTzVMAortFM9Zz5xAJAudWZStSwJbpysi0EYnWTCCr UK39ekgdcFHatquRLjQLi9miTR4fselu8bLDQiZ4Ds1zE2G0mhMTaWItj39UynMiXaRIbM 8j/gWlzU7tmI1WkiGXi25RTEiMOwmVb2pfDvgeAU7bATTefEp62vv0L0tE3YgiDz0+sZrA RSDuFU8pYDb1eO7RFsErtjwcgppH8x/tjX0yuraWha54uIENTcu7a2DpqXJ6vw== 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 4SmTmQ44wXzw9G; Thu, 7 Dec 2023 22:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7MgE6o074708; Thu, 7 Dec 2023 22:42:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7MgEix074697; Thu, 7 Dec 2023 22:42:14 GMT (envelope-from git) Date: Thu, 7 Dec 2023 22:42:14 GMT Message-Id: <202312072242.3B7MgEix074697@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: 3f46be6acadd - main - tcp_hpts: let tcp_hpts_init() set a random CPU only once List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3f46be6acadd5d660acde67d9d4c80137f424b70 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3f46be6acadd5d660acde67d9d4c80137f424b70 commit 3f46be6acadd5d660acde67d9d4c80137f424b70 Author: Gleb Smirnoff AuthorDate: 2023-12-07 22:41:43 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-07 22:41:43 +0000 tcp_hpts: let tcp_hpts_init() set a random CPU only once After d2ef52ef3dee the tcp_hpts_init() function can be called multiple times on a tcpcb if it is switched there and back between two TCP stacks. First, this makes existing assertion in tcp_hpts_init() incorrect. Second, it creates possibility to change a randomly set t_hpts_cpu to a different random value, while a tcpcb is already in the HPTS wheel, triggering other assertions later in tcp_hptsi(). The best approach here would be to work on the stacks to really clear a tcpcb out of HPTS wheel in tfb_tcp_fb_fini, draining the IHPTS_MOVING state. But that's pretty intrusive change, so let's just get back to the old logic (pre d2ef52ef3dee) where t_hpts_cpu was set to a random value only once in a CPU lifetime and a newly switched stack inherits t_hpts_cpu from the previous stack. Reviewed by: rrs, tuexen Differential Revision: https://reviews.freebsd.org/D42946 Reported-by: syzbot+fab29fe1ab089c52998d@syzkaller.appspotmail.com Reported-by: syzbot+ca5f2aa0fda15dcfe6d7@syzkaller.appspotmail.com Fixes: 2b3a77467dd3d74a7170f279fb25f9736b46ef8a --- sys/netinet/tcp_hpts.c | 16 ++++++++++++---- sys/netinet/tcp_subr.c | 3 +++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index e88a3f24dfcc..f1b729c249c6 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -542,15 +542,23 @@ tcp_hpts_release(struct tcpcb *tp) } /* - * Initialize newborn tcpcb to get ready for use with HPTS. + * Initialize tcpcb to get ready for use with HPTS. We will know which CPU + * is preferred on the first incoming packet. Before that avoid crowding + * a single CPU with newborn connections and use a random one. + * This initialization is normally called on a newborn tcpcb, but potentially + * can be called once again if stack is switched. In that case we inherit CPU + * that the previous stack has set, be it random or not. In extreme cases, + * e.g. syzkaller fuzzing, a tcpcb can already be in HPTS in IHPTS_MOVING state + * and has never received a first packet. */ void tcp_hpts_init(struct tcpcb *tp) { - tp->t_hpts_cpu = hpts_random_cpu(); - tp->t_lro_cpu = HPTS_CPU_NONE; - MPASS(!(tp->t_flags2 & TF2_HPTS_CPU_SET)); + if (__predict_true(tp->t_hpts_cpu == HPTS_CPU_NONE)) { + tp->t_hpts_cpu = hpts_random_cpu(); + MPASS(!(tp->t_flags2 & TF2_HPTS_CPU_SET)); + } } /* diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index c79cadd04944..be38280aef0a 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2274,6 +2274,9 @@ tcp_newtcpcb(struct inpcb *inp) /* All mbuf queue/ack compress flags should be off */ tcp_lro_features_off(tp); + tp->t_hpts_cpu = HPTS_CPU_NONE; + tp->t_lro_cpu = HPTS_CPU_NONE; + callout_init_rw(&tp->t_callout, &inp->inp_lock, CALLOUT_RETURNUNLOCKED); for (int i = 0; i < TT_N; i++) tp->t_timers[i] = SBT_MAX; From nobody Thu Dec 7 23:16:31 2023 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 4SmVX14McCz53mck; Thu, 7 Dec 2023 23:16:33 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmVX13l4Gz3VZF; Thu, 7 Dec 2023 23:16:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701990993; h=from:from:reply-to:subject: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=M0YJ2fSkAS4K0X3h/TWmW7iShKc442kj2VmTQjsyUuM=; b=KOQHiAMNBQyEMYQfU6QCPcw0WET9KqkhJUTh9Gfof+s6Mi3MJmwlnOFTFsYixIZmqvHrEb fV8jq74z/cSy7Qcygrn66L2Jksd6UaitoxgtzEnh2Za8xAWlhsoNBfbqfm7nq7YL0r7Qt5 iKI6qLPVyY3yZoi+irHIfnX81+VjhqOIsGxNnS1UxD20WXk4ZES4tUTSbth2Diu9OMB/Od SUXTaU/psZ+4FVatHveoNDNVadJGL6wVFcoQGO7hM9hsCGdZ4xwNfLf+pB6YxJhp2TU57n 69Xu3g/R7/I8tGpte+c75Av824i0i68ziFh+rKZ5gkJWmvJinz2u8yH5RGzq+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701990993; a=rsa-sha256; cv=none; b=PT6U0bP46jq45avpNV5xWlN1s2UMebak2KP0t7rBe9heTpUjXkFhCS7VhRtLnWImVPUfHi 1A8BbpWGO63Se2QR8SQ0xuKcFSUGaCMV6ZI1PYA0/zQ2IVtyywVwve4WkC9u4jpJGU/btm 9Wdm3InlnHoWpXbtACmbEfym0DPUKBJb8kVCAUD0DmIPI/Wqh3mAmbtAt5KZCUApjMvN5Z Fu2wPDFILIoxTB2SK/ODJGYdPCKNUnoa+EyMiZPCq3JdtacWOdYn9pa+K07J52Bx0Sn1g+ VI/+ROapBslirR2xcrbw5BXfF8yhNhf5DvXA5w9mE1G8zYS/X8o9jXchh8OX6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701990993; h=from:from:reply-to:subject: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=M0YJ2fSkAS4K0X3h/TWmW7iShKc442kj2VmTQjsyUuM=; b=yrflpVwmPWMhBSNJGl1N0U/aoDoJ8vCfAug6g0qrdGBMweiAvexZXCy+m5arhLWjiL0wFj gVot69j802r1bWIcOmAtFiYQ+BhRGxuUJKs8LAV8oB8kOA5XsZTL2yI6t6AWRh2aXyiJdj LjHmrfAwVsuq5AxgQKZeNf0jLH6A6SYQfSJPu0KEHsGVOUjcVx7NvxTwWNxTnt2e3RLtIc CUAA8BI2XrCWTcT3fOpo1fBKUqSIGEFAB6LvbLupV612yxRy8ByGcA7SvlPrrid+LZo2x1 1YMLKQIpavwDL5eqld70K+5G8GCKFFpkPuZRtqjUHEft/7bjZc5NVw2TNaiq8A== Received: from [IPV6:2601:648:8384:fd00:1d58:cbd5:15ac:77c] (unknown [IPv6:2601:648:8384:fd00:1d58:cbd5:15ac:77c]) (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 4SmVX10NlKznVC; Thu, 7 Dec 2023 23:16:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <2a76d5da-b1fd-4d47-8e0b-e637c5f0419d@FreeBSD.org> Date: Thu, 7 Dec 2023 15:16:31 -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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 9101746a6cce - main - Cirrus CI: Add manual jobs for amd64 and aarch64 using GCC 13 Content-Language: en-US From: John Baldwin To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202312072232.3B7MWNwm057531@gitrepo.freebsd.org> In-Reply-To: <202312072232.3B7MWNwm057531@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/7/23 2:32 PM, John Baldwin wrote: > The branch main has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=9101746a6cce90314ad03c7ff06398a5f68d0cc7 > > commit 9101746a6cce90314ad03c7ff06398a5f68d0cc7 > Author: John Baldwin > AuthorDate: 2023-12-07 22:32:08 +0000 > Commit: John Baldwin > CommitDate: 2023-12-07 22:32:08 +0000 > > Cirrus CI: Add manual jobs for amd64 and aarch64 using GCC 13 > > Reviewed by: emaste > Differential Revision: https://reviews.freebsd.org/D42840 My test runs of this still fail because the package isn't yet available for 13.2, but it's a manual job anyway so doesn't hurt to add it to main. The package should be available for 13.2 "soon" I believe. -- John Baldwin From nobody Thu Dec 7 23:17:15 2023 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 4SmVXq4TCBz53mcv; Thu, 7 Dec 2023 23:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmVXq41TZz3Wm1; Thu, 7 Dec 2023 23:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701991035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fV54BNeZ4H0+xrLRC0N9+78P/az7J/0LUJgt9zZ9CI=; b=Lfi+768dATA4lyTmywjwxSXz4D2SGQMTELeoGZDSJ/0GaRg8DbyU34mJIcJaza+MhPpWfn WiWbC7F+YTzGK1zpjxtOTK9MsDzlWSNSJrcZIcBwOqjcf04H5b/LiDkyQSdwjTxNlKg/Ka pgiHxvWx1c526R/oWRV6/GAta+cge0tcDtVDYa4FnAYS02mJD7xK6driSlJkq/MFPO5Qxv iWhopuX6t7xHldz6hP/HT52iQ7f7/skylIUqdWC4RZnK2RwbQIUQfjcA4F3b3AyEK2Syym Tgsq7ntwBgebmvcQtKWJ3Hkzv3IG3M5mpCEIbnix4wae13sWzLnKPNCGLkSkdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701991035; a=rsa-sha256; cv=none; b=DIpr/rfsZRVnwybvz6RaA9DI5FoR3PvJTHZ5RureoLwJ2jcehoYNlk67ahUwkUgCS725ok S270c/O/Kz0AE3u7xHptU4J2PgymQCbmGM+vFuGylchujx87HFBPadE4JyABoZ36vuOSfs Qu/iT5SiMrDMfdiqm0phfDXeaSK/WP6aQtVAkakP4hGe8SDzcAnZuGpGQbc3nfwDZ15Tl6 VkTeFKzejrimnAUACJxzYM+Ua4GZDqqcibwBbsrzBipmT5lCuO3hGzksWHmg1SK4pGpPFj +cVeYIigOCigTMDERqKH8Wn/MUW+VP0axeMnkUybqf9KhPY8EvDr20tQlGWMSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701991035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fV54BNeZ4H0+xrLRC0N9+78P/az7J/0LUJgt9zZ9CI=; b=cdHC6PeRk2fpswcDc4OxNboEwuOJ4gFF9tU2ocjVoKyzVJKE05nLRH1tjRwoJqmZ0Y9UGq pZkkRAsLRVOO8PA5MUUPvOfU2nQt0CR8oK3FJYZpOtoy4IAx+22JC+qedAcu0EjhTgy5be hjtor3oP85L+u5cTLna0QK/khoTSI9D+SSNomtkRsUl1fybChClCZIMw9GKxXlYOgCtgKm jNax0EQ+9Zy1Bro4I0fi936+VJCLBzmIrxrtIufHTdlQ1xyQixjUk/ePxY1mlEtu3/2m+O CyLpMnjwnqgyU0ljGkKB5l2/tO84omPljyndGByYeBfIlG/WwGdxFOW53bmmXw== 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 4SmVXq2yq7zxBq; Thu, 7 Dec 2023 23:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7NHFSd026636; Thu, 7 Dec 2023 23:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7NHFKO026633; Thu, 7 Dec 2023 23:17:15 GMT (envelope-from git) Date: Thu, 7 Dec 2023 23:17:15 GMT Message-Id: <202312072317.3B7NHFKO026633@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: 78c1d174a1e1 - main - vmm: refactor event reflection in AMD SVM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 78c1d174a1e13c6522bd4d663225fc9cbabc329d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=78c1d174a1e13c6522bd4d663225fc9cbabc329d commit 78c1d174a1e13c6522bd4d663225fc9cbabc329d Author: Bojan Novković AuthorDate: 2023-12-07 22:40:28 +0000 Commit: John Baldwin CommitDate: 2023-12-07 23:10:53 +0000 vmm: refactor event reflection in AMD SVM This patch refactors AMD SVM event reflection to allow events to be propagated to userland, rather than always reflected into the guest. This is necessary to implement some capabilities that request VMEXITs when a specific exception occurs (e.g. VM_CAP_BPT_EXIT). Reviewed by: jhb Sponsored by: Google, Inc. (GSoC 2022) Differential Revision: https://reviews.freebsd.org/D42405 --- sys/amd64/vmm/amd/svm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c index 33ab2eeaedf4..a502632f6ed6 100644 --- a/sys/amd64/vmm/amd/svm.c +++ b/sys/amd64/vmm/amd/svm.c @@ -1442,11 +1442,12 @@ svm_vmexit(struct svm_softc *svm_sc, struct svm_vcpu *vcpu, info1 = 0; break; } - KASSERT(vmexit->inst_length == 0, ("invalid inst_length (%d) " - "when reflecting exception %d into guest", - vmexit->inst_length, idtvec)); if (reflect) { + KASSERT(vmexit->inst_length == 0, + ("invalid inst_length (%d) " + "when reflecting exception %d into guest", + vmexit->inst_length, idtvec)); /* Reflect the exception back into the guest */ SVM_CTR2(vcpu, "Reflecting exception " "%d/%#x into the guest", idtvec, (int)info1); @@ -1454,8 +1455,8 @@ svm_vmexit(struct svm_softc *svm_sc, struct svm_vcpu *vcpu, errcode_valid, info1, 0); KASSERT(error == 0, ("%s: vm_inject_exception error %d", __func__, error)); + handled = 1; } - handled = 1; break; case VMCB_EXIT_MSR: /* MSR access. */ eax = state->rax; From nobody Thu Dec 7 23:17:16 2023 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 4SmVXr5nGLz53mpx; Thu, 7 Dec 2023 23:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmVXr4lJqz3WpR; Thu, 7 Dec 2023 23:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701991036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fEvYWnoAWCiIw+aeC0AftnjNhiHAebBIKOADLzcUg80=; b=PqRg1lLCcmOfmAg5k5k9ugZz3lgYedlVbtzFVOGLvi7As8+kfq9tlsvBgnECF1Elu3VqLu 4xMTilJtrTiDJoS0oRaPNpMGPy6Qbzlogh8TXmb8RoMJenahR12flK6kVjyGeGBuvD3qC5 21cljBNZZDzKahHL8jZMPJXBtTWX8L9DnEctZBfsT441BcCIRj0jgyOMaGnLiTy2YfzbAm OIEmeAaxMjevFYl6FRFy/KBHh/533VqachRoJT0BqTihnR/eZ9pHhvRa27EtbAKvNa0r2l vqVrbFNsQBKuNH4PK0tlLDaszOIKC+AHHU0IYzUWBMCZldNVP0E50e0+1IV+xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701991036; a=rsa-sha256; cv=none; b=GMFOKZ3BDFgPiiMQZ6T0FKzHDeFVuLeZNQ0QKuz5dahpplB0OD5Hj7ddqWP9KS778/wWZl +xD9AynIx7McgqVBOty+P1+mvaE8Uee6Vy7US6raQ5uIlWFJ4R3OpN/JiKc6DStEnUIvD6 kINMg5Urt83gGfQeFMM4kE5RAsl+MH/t1sRIXXn6ZxsSuarYJdgebg3KbSxBQ2i1eeYUDu NQwQpRZqLENDywoaQ4I+FiKA6orkw9mXP2n0gc7rvge6LmiW78URUtgS9IV2oi1qo6B2Sj zv5kKDWdHEjQmw24BhcZOT/mYyRJEVG1ApBE5bt09mN9/j0bsWabqH6qkoA9oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701991036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fEvYWnoAWCiIw+aeC0AftnjNhiHAebBIKOADLzcUg80=; b=azEFNbcL8B0d2QimlZ1BPxR8T4Yy08sIU70Xj75djdepbUfHVv5BP0/ATAK2HKqNb8UWIm PjkrPGDMijl4Zm1e7Sb0NgKTei3bHfLfBn8siZCTMzV9i4xYjEPu+GFD1QE33DNf5J8GXL gjjgfqLIG6S8CcTIgmsX3kSbG3SP6sBqild5cK74lUnUJg2NEQ6nBny+KirT8d5yIigXRu n2G9K4eI2z0Y0TnvNPS8eNa52wwDrZUNTuxyWJlvkITnKNsM2OarrOswrVR5mj7Eugmh9u s+RksaUbWLqlA9PsORzDCmphMtYVIlZu8Lvtwr+tABXKAKvMkp75mKuNnDDtvg== 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 4SmVXr3jJvzwjq; Thu, 7 Dec 2023 23:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7NHGuu026691; Thu, 7 Dec 2023 23:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7NHGd2026688; Thu, 7 Dec 2023 23:17:16 GMT (envelope-from git) Date: Thu, 7 Dec 2023 23:17:16 GMT Message-Id: <202312072317.3B7NHGd2026688@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: 231eee17d290 - main - vmm: enable software breakpoints for AMD CPUs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 231eee17d2905682014b71d1f01719003b13bd91 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=231eee17d2905682014b71d1f01719003b13bd91 commit 231eee17d2905682014b71d1f01719003b13bd91 Author: Bojan Novković AuthorDate: 2023-12-07 22:46:31 +0000 Commit: John Baldwin CommitDate: 2023-12-07 23:10:56 +0000 vmm: enable software breakpoints for AMD CPUs This patch adds support for software breakpoint vmexits on AMD SVM. It implements the VM_CAP_BPT_EXIT used to enable software breakpoints. When enabled, breakpoint vmexits are passed to userspace where they are handled by the GDB stub. Reviewed by: jhb Sponsored by: Google, Inc. (GSoC 2022) Differential Revision: https://reviews.freebsd.org/D42295 --- sys/amd64/vmm/amd/svm.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c index a502632f6ed6..ec0cde31aaad 100644 --- a/sys/amd64/vmm/amd/svm.c +++ b/sys/amd64/vmm/amd/svm.c @@ -1421,6 +1421,12 @@ svm_vmexit(struct svm_softc *svm_sc, struct svm_vcpu *vcpu, break; case IDT_BP: + vmexit->exitcode = VM_EXITCODE_BPT; + vmexit->u.bpt.inst_length = vmexit->inst_length; + vmexit->inst_length = 0; + + reflect = 0; + break; case IDT_OF: case IDT_BR: /* @@ -2333,6 +2339,9 @@ svm_setcap(void *vcpui, int type, int val) if (val == 0) error = EINVAL; break; + case VM_CAP_BPT_EXIT: + svm_set_intercept(vcpu, VMCB_EXC_INTCPT, BIT(IDT_BP), val); + break; case VM_CAP_IPI_EXIT: vlapic = vm_lapic(vcpu->vcpu); vlapic->ipi_exit = val; @@ -2366,6 +2375,9 @@ svm_getcap(void *vcpui, int type, int *retval) case VM_CAP_UNRESTRICTED_GUEST: *retval = 1; /* unrestricted guest is always enabled */ break; + case VM_CAP_BPT_EXIT: + *retval = svm_get_intercept(vcpu, VMCB_EXC_INTCPT, BIT(IDT_BP)); + break; case VM_CAP_IPI_EXIT: vlapic = vm_lapic(vcpu->vcpu); *retval = vlapic->ipi_exit; From nobody Thu Dec 7 23:17:17 2023 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 4SmVXs622Vz53mlt; Thu, 7 Dec 2023 23:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmVXs5Qjvz3Wrr; Thu, 7 Dec 2023 23:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701991037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbjIS+6/6Z8237tLm2y4aSiso2ayGxv+FPO+4FaaaWM=; b=WlqP2f+vLoCb5cNl7GCPVEzX8UTQ5QqFnr4YFOBYQD8nM3VFWpxsOcsMIT2iY5E1OOLPiq M4SBk/c018xKiRw1BL+yEvvhYErMtCy6nnwcmzR5sJNtjGtXfjeKRoY3MM9VB8+bwLC6zM go6Nlt77O7ElzAU+2izkTzaW23pEo9R13Qj3FwdxdpsnsIiIOcgkwpTu2yBIvQyb/EYkA4 GhBKMQHPJ1SuMW6nit0s64JcXEid2zULASv7uqvBKUwVKHDcWN1iEUoPCKUl6abDzlEMot eDs6w4IxiQdvwgwbJHq0dA8N8rQKyHvpK8A12rhtqC9zeGre7KI0s3tx8ZLIow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701991037; a=rsa-sha256; cv=none; b=mVZ9mpZHOMIBUPO6dAr8yxQ+6k8HQkOSnSJ+6qckbIJD7oKu6kyiUWZ2MTsUoTqjNvkfiD j5TsMVoAOXvUY22KL+R9gYFGUbI6VUkxyJlpug6kzKWfE8FDXT17A0am+UknVVh5xKUEId FNoXzdN2wCQRaLOk3yLysP4Tlg4QYbl7HLY8lMFuqhQnzW1Z/KRqr+wRvL6F6hU8pEH/HC fCdDWo62c4yy3TdtNWTCibCjNbo6WyEK3uAkTudjCgv2bKNxFuE2nm8MB/uONzBieQGc5R j2ivNrFHGapGtjrtNAXEJC2qhKcuwecv2YZdRdsnCTJntK+GiZEVOfsaoaJ85Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701991037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbjIS+6/6Z8237tLm2y4aSiso2ayGxv+FPO+4FaaaWM=; b=CV6WSfE69/X0i4Ou5WSjwC3NFRgG4f4tAK1cfgzjZWAlXoixAGkCdPbVHMklh+opskyySH fDUiNNHH/FWUhHwKSNfPFvFuKbiIJLIWt8qyYDPbKY8yhrnrk4KJrdtRnx+KsobiZGmHaH LI46K2dn9RmJikQFlzKirSy97XqSolebCgPo8HBcmy5ODyF3qIrRdtaEjPEiNBF0v8DMgD PDJEVR1ObpttcgCVMzyzA4z+GmY3oxCfij/AQrX2Vk5HZV5xSCw+DNOAH5BBt66qjl9Mtd j9YCuwa3MJRhtEFN41QvplyHVkqJX1qgzet3WpJg+SXmwHaAbZQBGjftIMuXWg== 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 4SmVXs4WKRzxBr; Thu, 7 Dec 2023 23:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7NHHAk026738; Thu, 7 Dec 2023 23:17:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7NHHp7026735; Thu, 7 Dec 2023 23:17:17 GMT (envelope-from git) Date: Thu, 7 Dec 2023 23:17:17 GMT Message-Id: <202312072317.3B7NHHp7026735@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: e3b4fe645e50 - main - vmm: implement single-stepping for AMD CPUs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e3b4fe645e50bfd06becb74e52ea958315024d5f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e3b4fe645e50bfd06becb74e52ea958315024d5f commit e3b4fe645e50bfd06becb74e52ea958315024d5f Author: Bojan Novković AuthorDate: 2023-12-07 23:00:31 +0000 Commit: John Baldwin CommitDate: 2023-12-07 23:11:04 +0000 vmm: implement single-stepping for AMD CPUs This patch implements single-stepping for AMD CPUs using the RFLAGS.TF single-stepping mechanism. The GDB stub requests single-stepping using the VM_CAP_RFLAGS_TF capability. Setting this capability will set the RFLAGS.TF bit on the selected vCPU, activate DB exception intercepts, and activate POPF/PUSH instruction intercepts. The resulting DB exception is then caught by the IDT_DB vmexit handler and bounced to userland where it is processed by the GDB stub. This patch also makes sure that the value of the TF bit is correctly updated and that it is not erroneously propagated into memory. Stepping over PUSHF will cause the vm_handle_db function to correct the pushed RFLAGS value and stepping over POPF will update the shadowed TF bit copy. Reviewed by: jhb Sponsored by: Google, Inc. (GSoC 2022) Differential Revision: https://reviews.freebsd.org/D42296 --- sys/amd64/include/vmm.h | 8 +++ sys/amd64/vmm/amd/svm.c | 151 +++++++++++++++++++++++++++++++++++++++++- sys/amd64/vmm/amd/svm_softc.h | 8 +++ sys/amd64/vmm/vmm.c | 37 +++++++++++ 4 files changed, 202 insertions(+), 2 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index 0210aeef80fd..abc7571187fa 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -497,6 +497,7 @@ enum vm_cap_type { VM_CAP_RDTSCP, VM_CAP_IPI_EXIT, VM_CAP_MASK_HWINTR, + VM_CAP_RFLAGS_TF, VM_CAP_MAX }; @@ -645,6 +646,7 @@ enum vm_exitcode { VM_EXITCODE_VMINSN, VM_EXITCODE_BPT, VM_EXITCODE_IPI, + VM_EXITCODE_DB, VM_EXITCODE_MAX }; @@ -734,6 +736,12 @@ struct vm_exit { struct { int inst_length; } bpt; + struct { + int trace_trap; + int pushf_intercept; + int tf_shadow_val; + struct vm_guest_paging paging; + } dbg; struct { uint32_t code; /* ecx value */ uint64_t wval; diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c index ec0cde31aaad..1507377a0cfe 100644 --- a/sys/amd64/vmm/amd/svm.c +++ b/sys/amd64/vmm/amd/svm.c @@ -131,7 +131,7 @@ static VMM_STAT_AMD(VMEXIT_VINTR, "VM exits due to interrupt window"); static int svm_getdesc(void *vcpui, int reg, struct seg_desc *desc); static int svm_setreg(void *vcpui, int ident, uint64_t val); - +static int svm_getreg(void *vcpui, int ident, uint64_t *val); static __inline int flush_by_asid(void) { @@ -1282,6 +1282,8 @@ exit_reason_to_str(uint64_t reason) { .reason = VMCB_EXIT_ICEBP, .str = "icebp" }, { .reason = VMCB_EXIT_INVD, .str = "invd" }, { .reason = VMCB_EXIT_INVLPGA, .str = "invlpga" }, + { .reason = VMCB_EXIT_POPF, .str = "popf" }, + { .reason = VMCB_EXIT_PUSHF, .str = "pushf" }, }; for (i = 0; i < nitems(reasons); i++) { @@ -1419,7 +1421,69 @@ svm_vmexit(struct svm_softc *svm_sc, struct svm_vcpu *vcpu, errcode_valid = 1; info1 = 0; break; - + case IDT_DB: { + /* + * Check if we are being stepped (RFLAGS.TF) + * and bounce vmexit to userland. + */ + bool stepped = 0; + uint64_t dr6 = 0; + + svm_getreg(vcpu, VM_REG_GUEST_DR6, &dr6); + stepped = !!(dr6 & DBREG_DR6_BS); + if (stepped && (vcpu->caps & (1 << VM_CAP_RFLAGS_TF))) { + vmexit->exitcode = VM_EXITCODE_DB; + vmexit->u.dbg.trace_trap = 1; + vmexit->u.dbg.pushf_intercept = 0; + + if (vcpu->dbg.popf_sstep) { + /* + * DB# exit was caused by stepping over + * popf. + */ + uint64_t rflags; + + vcpu->dbg.popf_sstep = 0; + + /* + * Update shadowed TF bit so the next + * setcap(..., RFLAGS_SSTEP, 0) restores + * the correct value + */ + svm_getreg(vcpu, VM_REG_GUEST_RFLAGS, + &rflags); + vcpu->dbg.rflags_tf = rflags & PSL_T; + } else if (vcpu->dbg.pushf_sstep) { + /* + * DB# exit was caused by stepping over + * pushf. + */ + vcpu->dbg.pushf_sstep = 0; + + /* + * Adjusting the pushed rflags after a + * restarted pushf instruction must be + * handled outside of svm.c due to the + * critical_enter() lock being held. + */ + vmexit->u.dbg.pushf_intercept = 1; + vmexit->u.dbg.tf_shadow_val = + vcpu->dbg.rflags_tf; + svm_paging_info(svm_get_vmcb(vcpu), + &vmexit->u.dbg.paging); + } + + /* Clear DR6 "single-step" bit. */ + dr6 &= ~DBREG_DR6_BS; + error = svm_setreg(vcpu, VM_REG_GUEST_DR6, dr6); + KASSERT(error == 0, + ("%s: error %d updating DR6\r\n", __func__, + error)); + + reflect = 0; + } + break; + } case IDT_BP: vmexit->exitcode = VM_EXITCODE_BPT; vmexit->u.bpt.inst_length = vmexit->inst_length; @@ -1545,6 +1609,42 @@ svm_vmexit(struct svm_softc *svm_sc, struct svm_vcpu *vcpu, case VMCB_EXIT_MWAIT: vmexit->exitcode = VM_EXITCODE_MWAIT; break; + case VMCB_EXIT_PUSHF: { + if (vcpu->caps & (1 << VM_CAP_RFLAGS_TF)) { + uint64_t rflags; + + svm_getreg(vcpu, VM_REG_GUEST_RFLAGS, &rflags); + /* Restart this instruction. */ + vmexit->inst_length = 0; + /* Disable PUSHF intercepts - avoid a loop. */ + svm_set_intercept(vcpu, VMCB_CTRL1_INTCPT, + VMCB_INTCPT_PUSHF, 0); + /* Trace restarted instruction. */ + svm_setreg(vcpu, VM_REG_GUEST_RFLAGS, (rflags | PSL_T)); + /* Let the IDT_DB handler know that pushf was stepped. + */ + vcpu->dbg.pushf_sstep = 1; + handled = 1; + } + break; + } + case VMCB_EXIT_POPF: { + if (vcpu->caps & (1 << VM_CAP_RFLAGS_TF)) { + uint64_t rflags; + + svm_getreg(vcpu, VM_REG_GUEST_RFLAGS, &rflags); + /* Restart this instruction */ + vmexit->inst_length = 0; + /* Disable POPF intercepts - avoid a loop*/ + svm_set_intercept(vcpu, VMCB_CTRL1_INTCPT, + VMCB_INTCPT_POPF, 0); + /* Trace restarted instruction */ + svm_setreg(vcpu, VM_REG_GUEST_RFLAGS, (rflags | PSL_T)); + vcpu->dbg.popf_sstep = 1; + handled = 1; + } + break; + } case VMCB_EXIT_SHUTDOWN: case VMCB_EXIT_VMRUN: case VMCB_EXIT_VMMCALL: @@ -2346,6 +2446,50 @@ svm_setcap(void *vcpui, int type, int val) vlapic = vm_lapic(vcpu->vcpu); vlapic->ipi_exit = val; break; + case VM_CAP_RFLAGS_TF: { + uint64_t rflags; + + /* Fetch RFLAGS. */ + if (svm_getreg(vcpu, VM_REG_GUEST_RFLAGS, &rflags)) { + error = (EINVAL); + break; + } + if (val) { + /* Save current TF bit. */ + vcpu->dbg.rflags_tf = rflags & PSL_T; + /* Trace next instruction. */ + if (svm_setreg(vcpu, VM_REG_GUEST_RFLAGS, + (rflags | PSL_T))) { + error = (EINVAL); + break; + } + vcpu->caps |= (1 << VM_CAP_RFLAGS_TF); + } else { + /* + * Restore shadowed RFLAGS.TF only if vCPU was + * previously stepped + */ + if (vcpu->caps & (1 << VM_CAP_RFLAGS_TF)) { + rflags &= ~PSL_T; + rflags |= vcpu->dbg.rflags_tf; + vcpu->dbg.rflags_tf = 0; + + if (svm_setreg(vcpu, VM_REG_GUEST_RFLAGS, + rflags)) { + error = (EINVAL); + break; + } + vcpu->caps &= ~(1 << VM_CAP_RFLAGS_TF); + } + } + + svm_set_intercept(vcpu, VMCB_EXC_INTCPT, BIT(IDT_DB), val); + svm_set_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_POPF, + val); + svm_set_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_PUSHF, + val); + break; + } default: error = ENOENT; break; @@ -2382,6 +2526,9 @@ svm_getcap(void *vcpui, int type, int *retval) vlapic = vm_lapic(vcpu->vcpu); *retval = vlapic->ipi_exit; break; + case VM_CAP_RFLAGS_TF: + *retval = !!(vcpu->caps & (1 << VM_CAP_RFLAGS_TF)); + break; default: error = ENOENT; break; diff --git a/sys/amd64/vmm/amd/svm_softc.h b/sys/amd64/vmm/amd/svm_softc.h index e92d3c2e734c..0fd2303a7242 100644 --- a/sys/amd64/vmm/amd/svm_softc.h +++ b/sys/amd64/vmm/amd/svm_softc.h @@ -36,6 +36,12 @@ struct svm_softc; +struct dbg { + uint32_t rflags_tf; /* saved RFLAGS.TF value when single-stepping a vcpu */ + bool popf_sstep; /* indicates that we've stepped over popf */ + bool pushf_sstep; /* indicates that we've stepped over pushf */ +}; + struct asid { uint64_t gen; /* range is [1, ~0UL] */ uint32_t num; /* range is [1, nasid - 1] */ @@ -54,6 +60,8 @@ struct svm_vcpu { struct asid asid; struct vm_mtrr mtrr; int vcpuid; + struct dbg dbg; + int caps; /* optional vm capabilities */ }; /* diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 64ba16cc8969..ae2ed8e6ea0f 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -1746,6 +1746,40 @@ vm_handle_reqidle(struct vcpu *vcpu, bool *retu) return (0); } +static int +vm_handle_db(struct vcpu *vcpu, struct vm_exit *vme, bool *retu) +{ + int error, fault; + uint64_t rsp; + uint64_t rflags; + struct vm_copyinfo copyinfo; + + *retu = true; + if (!vme->u.dbg.pushf_intercept || vme->u.dbg.tf_shadow_val != 0) { + return (0); + } + + vm_get_register(vcpu, VM_REG_GUEST_RSP, &rsp); + error = vm_copy_setup(vcpu, &vme->u.dbg.paging, rsp, sizeof(uint64_t), + VM_PROT_RW, ©info, 1, &fault); + if (error != 0 || fault != 0) { + *retu = false; + return (EINVAL); + } + + /* Read pushed rflags value from top of stack. */ + vm_copyin(©info, &rflags, sizeof(uint64_t)); + + /* Clear TF bit. */ + rflags &= ~(PSL_T); + + /* Write updated value back to memory. */ + vm_copyout(&rflags, ©info, sizeof(uint64_t)); + vm_copy_teardown(©info, 1); + + return (0); +} + int vm_suspend(struct vm *vm, enum vm_suspend_how how) { @@ -1914,6 +1948,9 @@ restart: case VM_EXITCODE_INOUT_STR: error = vm_handle_inout(vcpu, vme, &retu); break; + case VM_EXITCODE_DB: + error = vm_handle_db(vcpu, vme, &retu); + break; case VM_EXITCODE_MONITOR: case VM_EXITCODE_MWAIT: case VM_EXITCODE_VMINSN: From nobody Thu Dec 7 23:17:18 2023 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 4SmVXv20sZz53mrP; Thu, 7 Dec 2023 23:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmVXt6NTxz3WsM; Thu, 7 Dec 2023 23:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701991038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GrKyJtSxqAVrxz7X8FSULqLFqlO8MwuJlm1mM2RP0Uk=; b=UslKgHI/oz/kypIjjvTp9uyhAYXGeQhfyevsBy/gNB4JSyMoR+hwWLrgCsHF9whYWfJwlW M45xEg0qiQ6F4oXaOuMiz4I1ipcJyoxOUjI47dNXyVcGX1aRC4zXJd5SqPsXdS/BqXm4ho dGMXRpmYMZOu6GR6QBXYX+siSpXw+A1KKeKyncxdbPSeml+E/H59ki+PipIwr4ktd8TqO1 J4tGfE+i0VdwqGtBXHNuxMRnjh9ejNIzE9iFW8KRlv/s3QFMGuISGkChnJHNHK06WR5PYk Sw2TJfWgjYu7KLEXAjUZDeMTUoCC0E6YNn8v2rgVfEqiOehNIZEsQsRYGUbbGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701991038; a=rsa-sha256; cv=none; b=Bt4jx9/zGW4sTAiNgeaOVzBRp8NlXtsdlrxF64n/Ak2Y0kDRZdInh6lobaKhhtjnV+w7gC HZ3yPH31x5QZM2uOx8FUezDsDvqdKtoVPUZmH45fscX3qAmMwi3ZrfpyyRUvzJS1IGMKLI agdeE6qpWNrpuzQIKWiv4+NUK6i++2rKeyDCkEtC2Z1seb3qJZPGw1m9gnJZcwmjq6ZASO PbOAN9hJlJ+G4eUcJmQFL5BsbPxreVpR6GE/eAkullOIM69RGFnva2uX0JB10W3GMaSyCL Ur1pOM4rrR3Gr2jUnNoP04tnl+ouG6wNad55b6yNuKMVLOk6x4SpPCY2laPyqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701991038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GrKyJtSxqAVrxz7X8FSULqLFqlO8MwuJlm1mM2RP0Uk=; b=qz0gs4/N/b6rfRr6ORKHaz7jz0T3rPcA19JgOX2qBLXS2J7MH8R/WXVFZDWZvrrKDAh4TV pI/3+xaIWR93PPazGjPID/HfFp1M0MuQKbC6mk4gqo/FJoFr7/Hqg4mBFaP8bvT0pJ4xhq iQt/akFBWWMkhFEmu+5zN909piutPWcLrhGNFPBGktYsLR5qwiN7Kq8aHuvkC7HBGrrDX9 lYJtN2FF43AQDDvuU0ageGFmfS5nBEfvU2W78A9iJdKMvdwrJHpZWdys7Z3pSUbEUNXOYi rRrSpvjeVqSsHt//RvlndvtfJ/JJ6JH5g5VX3VrL2RJsKJCwEA8QAXt/n1tTsQ== 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 4SmVXt5Tj0zx8N; Thu, 7 Dec 2023 23:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7NHIEL026783; Thu, 7 Dec 2023 23:17:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7NHIwC026780; Thu, 7 Dec 2023 23:17:18 GMT (envelope-from git) Date: Thu, 7 Dec 2023 23:17:18 GMT Message-Id: <202312072317.3B7NHIwC026780@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: 181afaaaee00 - main - vmm: implement VM_CAP_MASK_HWINTR on AMD CPUs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 181afaaaee0025f948346fe8b9ec5356a0cdef97 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=181afaaaee0025f948346fe8b9ec5356a0cdef97 commit 181afaaaee0025f948346fe8b9ec5356a0cdef97 Author: Bojan Novković AuthorDate: 2023-12-07 23:08:58 +0000 Commit: John Baldwin CommitDate: 2023-12-07 23:11:04 +0000 vmm: implement VM_CAP_MASK_HWINTR on AMD CPUs This patch implements the interrupt blocking VM capability on AMD CPUs. Implementing this capability allows the GDB stub to single-step a virtual machine without landing inside interrupt handlers. Reviewed by: jhb, corvink Sponsored by: Google, Inc. (GSoC 2022) Differential Revision: https://reviews.freebsd.org/D42299 --- sys/amd64/vmm/amd/svm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c index 1507377a0cfe..3fda9454090b 100644 --- a/sys/amd64/vmm/amd/svm.c +++ b/sys/amd64/vmm/amd/svm.c @@ -1725,6 +1725,10 @@ svm_inj_interrupts(struct svm_softc *sc, struct svm_vcpu *vcpu, int vector, need_intr_window; int extint_pending; + if (vcpu->caps & (1 << VM_CAP_MASK_HWINTR)) { + return; + } + state = svm_get_vmcb_state(vcpu); ctrl = svm_get_vmcb_ctrl(vcpu); @@ -2446,6 +2450,10 @@ svm_setcap(void *vcpui, int type, int val) vlapic = vm_lapic(vcpu->vcpu); vlapic->ipi_exit = val; break; + case VM_CAP_MASK_HWINTR: + vcpu->caps &= ~(1 << VM_CAP_MASK_HWINTR); + vcpu->caps |= (val << VM_CAP_MASK_HWINTR); + break; case VM_CAP_RFLAGS_TF: { uint64_t rflags; @@ -2529,6 +2537,9 @@ svm_getcap(void *vcpui, int type, int *retval) case VM_CAP_RFLAGS_TF: *retval = !!(vcpu->caps & (1 << VM_CAP_RFLAGS_TF)); break; + case VM_CAP_MASK_HWINTR: + *retval = !!(vcpu->caps & (1 << VM_CAP_MASK_HWINTR)); + break; default: error = ENOENT; break; From nobody Thu Dec 7 23:20:10 2023 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 4SmVcD1fNNz53msx; Thu, 7 Dec 2023 23:20:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmVcD1C6Kz3Xy7; Thu, 7 Dec 2023 23:20:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701991212; h=from:from:reply-to:subject: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=WxzzYfyiC6z0T+3IEOWBuOPwKK0ghpcMtSR2Byo1Oqw=; b=NkXZpWUE3bx+XvCWE7Bnpq5VkipJ/jxtDWNhDRkoy0JFuR2RyakHsIcJgsRXqTmjS7bGLu RSB1MuanEqgGrJiZtHmvP5+Lx346jwnL0sKQHxTU1Rwr0//D6noonRPbWvcTJl1TlF7DBN fx9cY8xhpgI9ixLz6EgradUSBtblmZ9QEJavhQgpQN4dEiz5bhyxqf7cQlTMx9nIyBfgcY s13MdIHoUqfsQsh7jY0dD6h6mLT65Qj8Gspe0Je7orikjvrc4yuMR1WWCAPCvqOmzSCNy/ jqmtO/mDkOE5kAKcpbYsT373IJtdmC+TOKf+2IgmzbddfTSAXROFUQXZr0CcUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701991212; a=rsa-sha256; cv=none; b=v9NnDF1aOa77tRC4aOlg4O8xZmkySCn4gopbqHQ+sblw0eP0jock/z+JOBn3+RFXF7kYwW XSzoAbchRPO1AV+VvAPxVVrwlimUYhC+eOYGObdk1Z8ESCZLk4+BeVXLFpg6spYYVzqftx xI+jrsnEElLIdq0DiTzQuQt3WZcddG7P23f9K8wb2K5YNBMK8xp39u0wLnd9dHej3yiQAC pdE/DD+HZr+FljdRM4Fen47zfm40nO0JgYXTDzbFSODYnkI+fV1wJUNJ69MnGlBLHcNSq+ ZKXWoZZMBos0YEhZjSRMtml1TKTmOjDojoeirDl4M8Q6Ho3GMAT6MwpXfBtOFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701991212; h=from:from:reply-to:subject: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=WxzzYfyiC6z0T+3IEOWBuOPwKK0ghpcMtSR2Byo1Oqw=; b=PeuVPrcHC3tZqgaj7pg5/v4P2+QF8Koz1WhLt5eMbYAPWlvbxazY7TfKXehClc7BH8cMHn zBW2BJ+XQm5yoQtrSmgjFtCtZPOItBzXNDUVDDmAenDZI1aZuSRVXE7KWxTSeyCShmIcyc 31LAMbw7Ah9SubMOUlefcHDTkmgcTwHuJrqXMNy8K2GmtjDu54AsWgR0PzK4vDuk7k7XIA gkAKexAazIUOIC1KE8HjI72b2Jfon4+g4q+/MyskoOQvQ3nxffv3OZDcNNsTHQYarMbElg EADO8QypfI+Wv2ojT+E+UTnhXCJ5I5l58FqOhKcNWQlGvtWk+TBEnUOfdTjpwg== Received: from [IPV6:2601:648:8384:fd00:1d58:cbd5:15ac:77c] (unknown [IPv6:2601:648:8384:fd00:1d58:cbd5:15ac:77c]) (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 4SmVcC4qdLzqBX; Thu, 7 Dec 2023 23:20:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <01993f1a-317f-49d9-992c-3a29b37105e5@FreeBSD.org> Date: Thu, 7 Dec 2023 15:20:10 -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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 181afaaaee00 - main - vmm: implement VM_CAP_MASK_HWINTR on AMD CPUs Content-Language: en-US From: John Baldwin To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202312072317.3B7NHIwC026780@gitrepo.freebsd.org> In-Reply-To: <202312072317.3B7NHIwC026780@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 12/7/23 3:17 PM, John Baldwin wrote: > The branch main has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=181afaaaee0025f948346fe8b9ec5356a0cdef97 > > commit 181afaaaee0025f948346fe8b9ec5356a0cdef97 > Author: Bojan Novković > AuthorDate: 2023-12-07 23:08:58 +0000 > Commit: John Baldwin > CommitDate: 2023-12-07 23:11:04 +0000 > > vmm: implement VM_CAP_MASK_HWINTR on AMD CPUs > > This patch implements the interrupt blocking VM capability on AMD > CPUs. Implementing this capability allows the GDB stub to single-step > a virtual machine without landing inside interrupt handlers. > > Reviewed by: jhb, corvink > Sponsored by: Google, Inc. (GSoC 2022) > Differential Revision: https://reviews.freebsd.org/D42299 Bojan has one more change in the userspace hypervisor to make use of these kernel changes. It needs a few more tweaks, but I felt the kernel bits were ready to go. Remaining change: https://reviews.freebsd.org/D42298 -- John Baldwin From nobody Thu Dec 7 23:24:40 2023 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 4SmVjQ08VZz53n9y; Thu, 7 Dec 2023 23:24:42 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.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 4SmVjP4y7Wz3Z3f; Thu, 7 Dec 2023 23:24:41 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Authentication-Results: mx1.freebsd.org; none Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 2BD033C019A; Thu, 7 Dec 2023 23:24:40 +0000 (UTC) Date: Thu, 7 Dec 2023 23:24:40 +0000 From: Brooks Davis To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 9101746a6cce - main - Cirrus CI: Add manual jobs for amd64 and aarch64 using GCC 13 Message-ID: References: <202312072232.3B7MWNwm057531@gitrepo.freebsd.org> <2a76d5da-b1fd-4d47-8e0b-e637c5f0419d@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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2a76d5da-b1fd-4d47-8e0b-e637c5f0419d@FreeBSD.org> X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SmVjP4y7Wz3Z3f On Thu, Dec 07, 2023 at 03:16:31PM -0800, John Baldwin wrote: > On 12/7/23 2:32 PM, John Baldwin wrote: > > The branch main has been updated by jhb: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=9101746a6cce90314ad03c7ff06398a5f68d0cc7 > > > > commit 9101746a6cce90314ad03c7ff06398a5f68d0cc7 > > Author: John Baldwin > > AuthorDate: 2023-12-07 22:32:08 +0000 > > Commit: John Baldwin > > CommitDate: 2023-12-07 22:32:08 +0000 > > > > Cirrus CI: Add manual jobs for amd64 and aarch64 using GCC 13 > > Reviewed by: emaste > > Differential Revision: https://reviews.freebsd.org/D42840 > > My test runs of this still fail because the package isn't yet available for 13.2, > but it's a manual job anyway so doesn't hurt to add it to main. The package should > be available for 13.2 "soon" I believe. Unfortunately CI builds use quarterly packages so it would need to be merged which isn't typical. I've been wondering if we should be switching the CI builds to use "latest" packages in most cases (maybe with a single build that uses "quarterly"). -- Brooks From nobody Thu Dec 7 23:24:35 2023 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 4SmVk23Ccgz53nPR; Thu, 7 Dec 2023 23:25:14 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from mx0b-00273201.pphosted.com (mx0a-00273201.pphosted.com [208.84.65.16]) (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 4SmVk20FSLz3Z9c; Thu, 7 Dec 2023 23:25:13 +0000 (UTC) (envelope-from sjg@juniper.net) Authentication-Results: mx1.freebsd.org; none Received: from pps.filterd (m0108157.ppops.net [127.0.0.1]) by mx0a-00273201.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3B7MoLr9018971; Thu, 7 Dec 2023 15:25:10 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h=to : cc : subject : in-reply-to : references : from : mime-version : content-type : content-id : date : message-id; s=PPS1017; bh=+DNpN9/H8TD2R66pkWF8gbtB5/qpe+IzK/uYPWdsKmE=; b=IX/Q62WV4hRJwNHLZ3BEr1J6n1+bD7FSKLWWlZpfEGV106XvYLrPh1oydEqL9GhKnf1U Yb1Umx+pKP7YT7q9RezBTqfxHuT8VPz+ucST1dfrNpdLhtJHsCOqFnmjxie6g8UzJoGd JIHa5cPLUIOqV79RI4b49dOb9JCx+PQEml/ltkPABVeUxqP7mYE9CqGho7gJB7NBRy29 G/o+aC6v9GhKQVX/NR9HG8tsCOcBNYDsCYRlfVZl4KeRKo3nOmAqCme8oqXrPGlAA8dB JbFL8CWl7eGA7c/8PTRncUIxneSOLZ8o7W9EgVEbetmHbCggrr2NKEoTtMtA/zjKDYhh Eg== Received: from cy4pr02cu008.outbound.protection.outlook.com (mail-westcentralusazlp17012025.outbound.protection.outlook.com [40.93.6.25]) by mx0a-00273201.pphosted.com (PPS) with ESMTPS id 3uuf8hh569-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 07 Dec 2023 15:25:10 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dqJBszYxlHnjBLAtsquXs8EY9p/ERcDbnOh+ecR/O1H2phnNAAnsVms5OsvucFN+P2uLobOMrhvKGJHzid7g9yV57EqKAgoIVcXvPpEq5zFAR7fGyVS2hrB60lXJ0siXfNrFm1IpFSilkO2CawqpdBb7cfn0POsLbsoVt12AM5SO58FxXz+Ck/6YJSnsmoouu0lHwQh+XcOlQLa59hD/Rt3I64QrSGtzFAKvqJcnXc+svev2ZK7dshDkCRkQ5KVfyLx5Xc8tRqeL0ednVbt20a7y5d2+ZaVVkzSvMaOhF/zS6qv9bbNFz8J08HI7TEi9agW3FiixDuCnoYaWKOQmcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=+DNpN9/H8TD2R66pkWF8gbtB5/qpe+IzK/uYPWdsKmE=; b=DoYtDZzFAiC9vUKsF9+zj5Weheh218tDdlPvJhKoDLxg8FcaedH+cTBjfBWfCGsqJXmOvoWNKfkFRpWTld59909gxtW7J+JLcBP8qzMPJTRT+AuzGeY8aXJXX4fI4jbWYGHT0adwOckm1bUiyMSVpRkaVPQc82wSv9dCTpSC/Uils8EGkwT7viEgwFR+UjHLLsdTAO33ZMZdBisVjg6PJTF6Z6R5gaWvCjowGQPkfH9RRv1/k3TWg8Fhmmrd3Jdq9cMF3MbE7KSljiBAB5kDFv4ZQtYlIxwjol9Nck9zh4PalB1K4ZNC0WQEjNfo3MpDrEtywpn8Si3j8u/PGm0UaQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 66.129.242.15) 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=+DNpN9/H8TD2R66pkWF8gbtB5/qpe+IzK/uYPWdsKmE=; b=V3XZJFfk7YLbK9qLmBeMlDy6IEbhLgptAw+4XYlYg2PH1rBodtvaxy3470ghC6VXvl9dtsYMWieIVLVmCpHNttMhkyqNiwW0/PJQ0VCunMRsDoDnNBjhv4OXr+FA+1KLUvTBVX8tg6GRZpBR4hQNWW9roV6WXKP4yk3QQTUW6Qw= Received: from BN9PR03CA0948.namprd03.prod.outlook.com (2603:10b6:408:108::23) by LV3PR05MB10500.namprd05.prod.outlook.com (2603:10b6:408:218::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.27; Thu, 7 Dec 2023 23:25:07 +0000 Received: from BN8NAM12FT073.eop-nam12.prod.protection.outlook.com (2603:10b6:408:108:cafe::b6) by BN9PR03CA0948.outlook.office365.com (2603:10b6:408:108::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.29 via Frontend Transport; Thu, 7 Dec 2023 23:25:07 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 66.129.242.15) 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.242.15 as permitted sender) Received: from p-exchfe-eqx-02.jnpr.net (66.129.242.15) by BN8NAM12FT073.mail.protection.outlook.com (10.13.183.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.17 via Frontend Transport; Thu, 7 Dec 2023 23:25:06 +0000 Received: from p-exchbe-eqx-01.jnpr.net (10.104.9.14) by p-exchfe-eqx-02.jnpr.net (10.104.9.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Thu, 7 Dec 2023 17:25:05 -0600 Received: from p-mailhub01.juniper.net (10.104.20.6) by p-exchbe-eqx-01.jnpr.net (10.104.9.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39 via Frontend Transport; Thu, 7 Dec 2023 17:25:05 -0600 Received: from kaos.jnpr.net (kaos.jnpr.net [172.23.255.201]) by p-mailhub01.juniper.net (8.14.4/8.11.3) with ESMTP id 3B7NP55E032260; Thu, 7 Dec 2023 15:25:05 -0800 (envelope-from sjg@juniper.net) Received: by kaos.jnpr.net (Postfix, from userid 1377) id 643654DA17; Thu, 7 Dec 2023 15:24:35 -0800 (PST) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id 63B534D7EA; Thu, 7 Dec 2023 15:24:35 -0800 (PST) To: Warner Losh CC: Jessica Clarke , src-committers , "" , "" , Subject: Re: git: 83d0b8c089d8 - main - bsdinstall generate opt_osname.h in include In-Reply-To: References: <202312070235.3B72ZoZp043061@gitrepo.freebsd.org> <71239.1701921562@kaos.jnpr.net> <58331.1701924865@kaos.jnpr.net> Comments: In-reply-to: Warner Losh message dated "Wed, 06 Dec 2023 23:16:24 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.8; GNU Emacs 28.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <38758.1701991475.1@kaos.jnpr.net> Date: Thu, 7 Dec 2023 15:24:35 -0800 Message-ID: <43001.1701991475@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM12FT073:EE_|LV3PR05MB10500:EE_ X-MS-Office365-Filtering-Correlation-Id: bf1a46d9-7358-4135-e8b9-08dbf77bbf2c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AylTq2bKvh2E3EVvQFZisTDY5GNXEOQjc4r282MUKJpKqTO9iLc1sZVH6JBsgcURUhdD9E7X994Yh8HvnaPX/wUhl0zrWMepDvn4Q/1WX29noeoc/R0+3SJlcWLC99du8T36UXe39Py7CbLGOBBAihbxWkDiGOcNDlGJIpnbHqNLqw9sQKpAi/hUmEEuCwBxXPMJIsgjn354yOKxWe72E3JoCmvvix+R2r+sPgqgVqlEBaQliL7rv1TXFxVBRkOfSVac6sYtcYOc5HYxVEZc5EYH3QNQ4aaMZWDBDfbpB2pwTd5h2FSc2an8bizmzlHf5XqfHn2veOfShfyr741yCu04GLo2MtFnEM0sF51kZoNQSQDxSjuRf0dMt5b2RKhxEP35cr9nSb+ydx/r0h7J3T2EPbg+pA7S33stJZbQL1d4pb0aKzCpeDjRaZAg8jbMq7R9Nqm/nThQN3Vf/8AOqQM7tYG2Eicc3taA0g276GLMrB/UrbXZvs6xgee44295jr1KVtWJLzqeNj4pseRjtOcnMTQ1hlNW7iBjiYL5KVHyJuLri2wIbAT1VF3v1o4ifO+aaNnsqW98NyYKBl44sbHrxtv6yI0A4rH98/LJtW60vBF8kIaOXsEpvgr7/zURiQFqwZ2b+QnDL4Df94v48qGJrcUJX5Q75dmnnadZDbAkGyiLcMIzyE9uYjr0h1WV4pBx+JJ8I+Uov/HZWUCzQSFwpXyJ+xWC3+x1k9UYSIcxyjELHnsWvQq+SS4fhSDNrVvHPXfmx6FwCj55uQDh0SHFe/+5VTyZGSRBblFTHjLIgKEG1Kmd6uMl8bLxmkAV X-Forefront-Antispam-Report: CIP:66.129.242.15;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:p-exchfe-eqx-02.jnpr.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(136003)(396003)(39860400002)(346002)(376002)(230922051799003)(186009)(64100799003)(82310400011)(1800799012)(451199024)(36840700001)(40470700004)(46966006)(4744005)(5660300002)(2906002)(41300700001)(36860700001)(54906003)(70586007)(86362001)(82740400003)(47076005)(107886003)(26005)(70206006)(356005)(478600001)(81166007)(336012)(7126003)(6266002)(9686003)(7696005)(83380400001)(8936002)(8676002)(6916009)(4326008)(316002)(40480700001)(40460700003)(55016003)(36900700001);DIR:OUT;SFP:1102; X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2023 23:25:06.2080 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bf1a46d9-7358-4135-e8b9-08dbf77bbf2c X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.242.15];Helo=[p-exchfe-eqx-02.jnpr.net] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM12FT073.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR05MB10500 X-Proofpoint-GUID: ElnkUjkj5SrYEVeqZtJLbDagu6cLK27h X-Proofpoint-ORIG-GUID: ElnkUjkj5SrYEVeqZtJLbDagu6cLK27h X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-07_17,2023-12-07_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 phishscore=0 clxscore=1015 priorityscore=1501 mlxlogscore=335 adultscore=0 bulkscore=0 spamscore=0 mlxscore=0 suspectscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312070198 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:26211, ipnet:208.84.65.0/24, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SmVk20FSLz3Z9c Warner Losh wrote: > > > The reason I did it using a file is so that make(1) would detect a > > > change a rebuild if you change the value and do another build. > > A fair point. Of course moot if using META_MODE. > The other benefit of the header is only the files that include it will > be rebuilt when the value changes whereas (with META_MODE) everything > will be rebuilt if value is in CFLAGS. > > That can be mitigated by using per object CFLAGS, but all in all the > header is a simpler solution. > > This name never changes on practice. We shouldn't optimize for a rare > case that causes build races. Who would ever change it in the same > tree? Also a fair point. I'm happy to do it either way - so long as we avoid circular dependencies. From nobody Thu Dec 7 23:56:37 2023 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 4SmWQb2lRJz53qYn for ; Thu, 7 Dec 2023 23:56:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450: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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmWQX6txWz3f8n for ; Thu, 7 Dec 2023 23:56:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20230601.gappssmtp.com header.s=20230601 header.b=SxwLc9Az; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::531) smtp.mailfrom=wlosh@bsdimp.com; dmarc=none Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-54c846da5e9so1408419a12.3 for ; Thu, 07 Dec 2023 15:56:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701993410; x=1702598210; darn=freebsd.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=K3XJnWMiGl7Zc1oj7YbPBc112smZ/4tfDk1mtt6tHS8=; b=SxwLc9AzvmZIWb5+BsCUNBh2asaBBqNPq3w6UvcBUgQCYolg21YXgD1SXgVT/NwO4O g8Tw9CHky2KddVqhb31U3BfuHJ3YnC0ukMX7hgbTcMB3Qh6pQR3ZTaClQM72nlQZ7GT9 ezZMYxugGlvFEmRsk2ITQoUrCaeSmEb0FKk+II33+/I8KF4xzdksZhW/E6LGf4Aaj3Wb I9n1ya2l+kqzKoEYTwpiGOrWCIsji/iCdmyKv+AnMkd3c/e4Xo3DZ3P4rrCUnj9ap16v OLK0ks1LoIdUuzsXE5hg5RT1b5Fb1fqg5oCzMNnfB9Q7tjhTVrpT9CN8DqWMwfRqN4Ki lyTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701993410; x=1702598210; h=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=K3XJnWMiGl7Zc1oj7YbPBc112smZ/4tfDk1mtt6tHS8=; b=EWBxU/61dt9PmvRfhNF4nlvGmlznv90z61BI0sOhc4CaED/ijMI1jUJLqQdZo+EnmV OmiVENp9yiZw1G6qbECbi9e9v2JtfN4fCC4gJOjgFpzdTSQV0VcmncNGIUWuVD4sTwwN L+w+iOSW7/3acHmQQNzP2E/g4eR9so6GN5nwni4ZZqH7GEuFY3jFkNymh+wTgriGQvME 1475Iw/3BnWZpiXeerw0+N/Yp9JhPgPy3Ia35ha7WrLzS/Lda/i4i5BgSuy0niNThZQj FfAkdKlYgy36KopYzzwbDu8xvhQ4i3DloH6YN3PpUFiL2ksJAHXDa5y55jzR9OiDDI30 bjzg== X-Gm-Message-State: AOJu0Yy/R8DeeaAYnTdRKBeo4JxJujgFmMeJr09KrOyeC/0fLnT2Gj93 Zj1WvdYGMpfFksR1MnHQnfAJ5UVlDTBVeYB2+oX4zw== X-Google-Smtp-Source: AGHT+IF+PScJn+5N4Yvb6fG7vozH+zuLq0ngr7bh2tg4okcpqqbHH65LPUJTP4ImuaJYEgP5i1elDE5ikeOozvvTVeo= X-Received: by 2002:aa7:da4d:0:b0:54c:56ae:d4df with SMTP id w13-20020aa7da4d000000b0054c56aed4dfmr2820506eds.32.1701993409290; Thu, 07 Dec 2023 15:56:49 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> <20231207222716.obSthG6r@steffen%sdaoden.eu> In-Reply-To: <20231207222716.obSthG6r@steffen%sdaoden.eu> From: Warner Losh Date: Thu, 7 Dec 2023 16:56:37 -0700 Message-ID: Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources To: Xin Li , Philip Paeps , Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000092355e060bf438c7" X-Spamd-Result: default: False [-2.00 / 15.00]; SUBJECT_HAS_CURRENCY(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; R_SPF_NA(0.00)[no SPF record]; RCVD_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::531:from]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; DMARC_NA(0.00)[bsdimp.com] X-Rspamd-Queue-Id: 4SmWQX6txWz3f8n X-Spamd-Bar: - --00000000000092355e060bf438c7 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Dec 7, 2023 at 3:27=E2=80=AFPM Steffen Nurpmeso wrote: > Xin Li wrote in > : > |On 2023-12-06 22:34, Philip Paeps wrote: > |> On 2023-12-07 14:26:05 (+0800), Warner Losh wrote: > |>> We should point to bipm > |>> https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list since > they > |>> are > |>> the source of truth, no? > |> > |> I went for the IANA copy because data.iana.org is a much shorter and > |> trustworthy looking URL. And it's also where other operating systems > |> get their copies. > | > |My understanding is that IANA's copy is part of tzdata and it's only > |updated when a new set of zone data is released, so it's sometimes > |outdated. It is actually going to be outdated really soon by the way. > > But nothing will change. > It is only about the included end-of-life tag why there is > discussion at all. > The IANA TZ data is always updated as necessary, "early enough". > Yes. TZ data updates multiple times a year. The lead time on NIST/BIPM updating the file usually is within days or weeks after the new leap is announced. But ntpd can't possibly use it for about 5 months. TZ updates are plenty fast. The bigger problem is that we have to do a EN to get a new set of zone files. If we had a way to fetch them, we could just copy this file from the updated zone files. > Also the beasts are about to get rid of leap seconds until 2035 > (and they have beaten onto the Russians which' GLONASS is capable > to deal properly, as far as the discussion was, the fact it is not > earlier). Bets can be placed whether it will happen before > a possible occurring leap second, or not. (My bet is that they > run everything against the wall, and then run away yelling about > the evil leap second, after having missed to create an appropriate > environment to deal with the reached scientific level to keep us > truly within one second of our home planet, and his star. > O tempora, o mores. But that is off-topic.) > Yea, we're years away from the next leap second. And there's still a good chance we'll have at least one more. And there's also rumblings that leaps will stop before 2035 (that's the current absolute last date, and there's several folks that want to pull that in). What will happen for sure isn't well known... ntpv5 discussions have, at times, assumed there will be no more leap seconds and so ntpv5 needn't have anything to accommodate them. > |The IERS one is more up-to-date because they publish the bulletin. > > In general i think distribution of load is a good thing, and > i find it very unfriendly to put all the load onto some jealous > institute (if it is one) and its single server. > The FreeBSD project has an established set of mirrors, and, the > way i see the excessive use of installations on clowds and such, > for example for github actions which spawn dozens of OS > installations to test a commit (doh!). > We can skew the load in time by spreading all our users out over the few months we have if there's a load issue. > Btw PHK had a thrilling idea of DNS distributing leap ticks some > years ago, and he even started to host it. As it unfortunately > did not fly i did not track it further. > Would also be an idea for the FreeBSD project: simply download the > file ones, then place a DNS record that FreeBSD installations then > can query. DNSSEC is in place i think. > Yea, that's not a thing that's happening. It was an interesting idea, but hasn't been standardized and there's little to apetite to distribute this way. > |The bundled version was from NIST ftp, but fetching from ftp for every > |FreeBSD system out there was too scary for me. > | > |There may be some security / privacy concerns if we direct users to a > |place that we do not have control, by the way. > > Interesting aspect! > There might be, but this sounds somewhat speculative. What's the anticipate= d concerns? Warner --00000000000092355e060bf438c7 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Dec 7, 2023 at 3:27=E2=80=AFP= M Steffen Nurpmeso <steffen@sdaode= n.eu> wrote:
Xin Li wrote in
=C2=A0<d75b041f-05f8-44c1-8de6-1fef89b7e537@delphij.net&g= t;:
=C2=A0|On 2023-12-06 22:34, Philip Paeps wrote:
=C2=A0|> On 2023-12-07 14:26:05 (+0800), Warner Losh wrote:
=C2=A0|>> We should point to bipm
=C2=A0|>> https://hpiers.obspm.fr/i= ers/bul/bulc/ntp/leap-seconds.list since they
=C2=A0|>> are
=C2=A0|>> the source of truth, no?
=C2=A0|>
=C2=A0|> I went for the IANA copy because data.iana.org is a much shorter= and
=C2=A0|> trustworthy looking URL.=C2=A0 And it's also where other op= erating systems
=C2=A0|> get their copies.
=C2=A0|
=C2=A0|My understanding is that IANA's copy is part of tzdata and it= 9;s only
=C2=A0|updated when a new set of zone data is released, so it's sometim= es
=C2=A0|outdated.=C2=A0 It is actually going to be outdated really soon by t= he way.

But nothing will change.
It is only about the included end-of-life tag why there is
discussion at all.
The IANA TZ data is always updated as necessary, "early enough".<= br>

Yes. TZ data updates multiple times a y= ear. The lead time on NIST/BIPM
updating the file usually is with= in days or weeks after the new leap is announced.
But ntpd can= 9;t possibly use it for about 5 months. TZ updates are plenty fast.

The bigger problem is that we have to do a EN to get a ne= w set of zone
files. If we had a way to fetch them, we could just= copy this file from the updated
zone files.
=C2=A0
Also the beasts are about to get rid of leap seconds until 2035
(and they have beaten onto the Russians which' GLONASS is capable
to deal properly, as far as the discussion was, the fact it is not
earlier).=C2=A0 Bets can be placed whether it will happen before
a possible occurring leap second, or not.=C2=A0 (My bet is that they
run everything against the wall, and then run away yelling about
the evil leap second, after having missed to create an appropriate
environment to deal with the reached scientific level to keep us
truly within one second of our home planet, and his star.
O tempora, o mores.=C2=A0 But that is off-topic.)

=
Yea, we're years away from the next leap second. And there&#= 39;s still
a good chance we'll have at least one more. And th= ere's also rumblings
that leaps will stop before 2035 (that&#= 39;s the current absolute last date,=C2=A0
and there's severa= l folks that want to pull that in). What will happen
for sure isn= 't well known...

ntpv5 discussions have, at ti= mes, assumed there will be no more leap
seconds and so ntpv5 need= n't have anything to accommodate them.
=C2=A0
=C2=A0|The IERS one is more up-to-date because they publish the bulletin.
In general i think distribution of load is a good thing, and
i find it very unfriendly to put all the load onto some jealous
institute (if it is one) and its single server.
The FreeBSD project has an established set of mirrors, and, the
way i see the excessive use of installations on clowds and such,
for example for github actions which spawn dozens of OS
installations to test a commit (doh!).

= We can skew the load in time by spreading all our users out over
= the few months we have if there's a load issue.
=C2=A0
<= blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-l= eft:1px solid rgb(204,204,204);padding-left:1ex"> Btw PHK had a thrilling idea of DNS distributing leap ticks some
years ago, and he even started to host it.=C2=A0 As it unfortunately
did not fly i did not track it further.
Would also be an idea for the FreeBSD project: simply download the
file ones, then place a DNS record that FreeBSD installations then
can query.=C2=A0 DNSSEC is in place i think.

Yea, that's not a thing that's happening. It was an interesti= ng idea,
but hasn't been standardized and there's little = to apetite to distribute this way.
=C2=A0
=C2=A0|The bundled version was from NIST ftp, but fetching from ftp for eve= ry
=C2=A0|FreeBSD system out there was too scary for me.
=C2=A0|
=C2=A0|There may be some security / privacy concerns if we direct users to = a
=C2=A0|place that we do not have control, by the way.

Interesting aspect!

There might be, but= this sounds somewhat speculative. What's the anticipated
con= cerns?

Warner=C2=A0
--00000000000092355e060bf438c7-- From nobody Fri Dec 8 01:07:31 2023 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 4SmY065ytcz52xkt; Fri, 8 Dec 2023 01:07:34 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Received: from sdaoden.eu (sdaoden.eu [217.144.132.164]) (using TLSv1.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 4SmY063K4Wz4L4d; Fri, 8 Dec 2023 01:07:34 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Authentication-Results: mx1.freebsd.org; none Date: Fri, 08 Dec 2023 02:07:31 +0100 Author: Steffen Nurpmeso From: Steffen Nurpmeso To: Warner Losh Cc: Xin Li , Philip Paeps , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources Message-ID: <20231208010731.3hijmSTL@steffen%sdaoden.eu> In-Reply-To: References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> <20231207222716.obSthG6r@steffen%sdaoden.eu> Mail-Followup-To: Warner Losh , Xin Li , Philip Paeps , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org User-Agent: s-nail v14.9.24-573-g7d89a8210a OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15987, ipnet:217.144.128.0/20, country:DE] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SmY063K4Wz4L4d Warner Losh wrote in : |On Thu, Dec 7, 2023 at 3:27=E2=80=AFPM Steffen Nurpmeso wrote: |> Xin Li wrote in |> : |>|On 2023-12-06 22:34, Philip Paeps wrote: |>|> On 2023-12-07 14:26:05 (+0800), Warner Losh wrote: |>|>> We should point to bipm |>|>> https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list since |> they |>|>> are |>|>> the source of truth, no? |>|> |>|> I went for the IANA copy because data.iana.org is a much shorter and |>|> trustworthy looking URL. And it's also where other operating systems |>|> get their copies. |>| |>|My understanding is that IANA's copy is part of tzdata and it's only |>|updated when a new set of zone data is released, so it's sometimes |>|outdated. It is actually going to be outdated really soon by the way. |> |> But nothing will change. |> It is only about the included end-of-life tag why there is |> discussion at all. |> The IANA TZ data is always updated as necessary, "early enough". | |Yes. TZ data updates multiple times a year. The lead time on NIST/BIPM |updating the file usually is within days or weeks after the new leap is |announced. |But ntpd can't possibly use it for about 5 months. TZ updates are plenty |fast. | |The bigger problem is that we have to do a EN to get a new set of zone |files. If we had a way to fetch them, we could just copy this file from t= he |updated |zone files. I never spoke against fetching the plain file (who is my role in this project in the end?), i only spoke against using the server of the french institute directly. Ie one could poll this once a day or so, and upload it somewhere else. Or ping the github URL of the raw IANA TZ file, which is placed in Eggert's repo quite fast, even without release. (Just in case the FreeBSD project want to lock out all the countries that github blocks, i think Iran, North Korea, Cuba even, who knows which otherwise, i will not look up that political war thing.) |> Also the beasts are about to get rid of leap seconds until 2035 ... |> earlier). Bets can be placed whether it will happen before |> a possible occurring leap second, or not. (My bet is that they |> run everything against the wall, and then run away yelling about |> the evil leap second, after having missed to create an appropriate ... |Yea, we're years away from the next leap second. And there's still |a good chance we'll have at least one more. And there's also rumblings |that leaps will stop before 2035 (that's the current absolute last date, |and there's several folks that want to pull that in). What will happen |for sure isn't well known... | |ntpv5 discussions have, at times, assumed there will be no more leap |seconds and so ntpv5 needn't have anything to accommodate them. I have not looked into current WG outcome (there was just recently some IETF post regarding NTP, i have not looked). I would only wish they distribute TAI and the offset to UTC, but i think, i would hope, they will doing the opposite regulary. I have no time, and i am not the right person to do anything about NTP, let alone in the IETF. All i could ever say i did say, and that was that it was always wrong to go for "civil time" aka UTC, at least without a permanent indication to a constant reliable time scale. And a longer possibility to detect leaps, as i knew secretaries who turn off their computer at Friday afternoon, not to turn it on again until Monday morning. And my impression in the past, before i came a little bit involved in international email etc communication, was that the engineers simply could not imagine such a situation. Or, *at best*, decided that then silence is the best communication on such a switch. |>|The IERS one is more up-to-date because they publish the bulletin. |> |> In general i think distribution of load is a good thing, and |> i find it very unfriendly to put all the load onto some jealous |> institute (if it is one) and its single server. |> The FreeBSD project has an established set of mirrors, and, the ... |We can skew the load in time by spreading all our users out over |the few months we have if there's a load issue. I have recognized even the nice name of this mechanism in the FreeBSD rc system, Warner Losh. |> Btw PHK had a thrilling idea of DNS distributing leap ticks some |> years ago, and he even started to host it. As it unfortunately |> did not fly i did not track it further. |> Would also be an idea for the FreeBSD project: simply download the |> file ones, then place a DNS record that FreeBSD installations then |> can query. DNSSEC is in place i think. | |Yea, that's not a thing that's happening. It was an interesting idea, |but hasn't been standardized and there's little to apetite to distribute |this way. Unfortunately. And then there is the fully blown tzdist protocol that the IETF hammered through with XML and what not formats, unfortunately not CBOR ("later"), this is what Meinberg says on the state of that: https://kb.meinbergglobal.com/kb/time_sync/tzdist |>|The bundled version was from NIST ftp, but fetching from ftp for every |>|FreeBSD system out there was too scary for me. |>| |>|There may be some security / privacy concerns if we direct users to a |>|place that we do not have control, by the way. |> |> Interesting aspect! | |There might be, but this sounds somewhat speculative. What's the anticip\ |ated |concerns? Maybe Xin Li has stumbled over the same thread as i after that publicsuffix CVE of cURL (first sentence of the quoted message): https://lists.gnu.org/archive/html/bug-wget/2014-03/msg00113.html What i mean is, the FreeBSD project and its pkg database, isn't this a natural place for such a thing? With guaranteed / controlled availability. --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) | | Only in December: lightful Dubai COP28 Narendra Modi quote: | A small part of humanity has ruthlessly exploited nature. | But the entire humanity is bearing the cost of it, | especially the inhabitants of the Global South. | The selfishness of a few will lead the world into darkness, | not just for themselves but for the entire world. From nobody Fri Dec 8 02:24:36 2023 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 4SmZj107Vgz534W0; Fri, 8 Dec 2023 02:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmZj06lxnz4R1r; Fri, 8 Dec 2023 02:24:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702002276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q7/n59giOnuDwSkgFfxQP8dlSxWJ1wAzdVffMP1spiY=; b=tRJLd+/bRIR5JHmFZYZkyTDjMvFsTVuKnVv8oHFKDUblJxlEHRE4bPL8QEPHPas8rfeDEN F8LVHfOwT5rwfjifTSSBvKf9SumRM+Dg38Th/J0XxXNTFmNRQC6Kmy0eYUAFxOsS85qd7f MT579QOH3tDVpE4NuUGooFwuhk8Ixwmw45f9NvXrH10CMMBFQS+spS4m+R3KsWHdPvz5Vo fIrPN8N2IilQbi+uzA1GkFzJtwh3+nM8kbeuPNE/joStWGYecUROIFiPEFgOlw2r/bWFrJ 3CAATn/ccjXK9SIYh/qfeiXSeMQR07Fidskxkw6SjI+q90734Usd2fEpMNN2mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702002276; a=rsa-sha256; cv=none; b=RxgiTM7kk8LTOftMCReMEqVqMkvqZw5mAXLiFCe3E0vXwibqaYVkRN7tcNfGP3FT5FjUlV DZtRtBM64MzVtuISlYThXluV4n37oR50gy3Sst12kzxlqzZZTLHMUBVl6/NuMjL24RSQs+ +okWdGAnvdxkUoe0aJ8LrOQC5RZnZJ9NWamsj48geLDY1f0jARwwBW0AYJaJH2kz8WM8Qx nawMrakjjJAcwA5NpuTpk2RfUY2a37U8urYfef7E5wMrI9Crtv6MtiX4mx/sRjsAGwbqV7 CGyCm1DvXdbT/kRRcSTVYHjboo+InmE2BmvLYZ5cB091F/1jg7DD2tEzuuQ7Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702002276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q7/n59giOnuDwSkgFfxQP8dlSxWJ1wAzdVffMP1spiY=; b=vHQkMYV/DsT4Y8vOn+pcbnC2kD0Utvy0qAmwEhOEqX1sWDTILgkqNvfiv1ZkSN1yqPA+jL 2/+2lVWPmTv7tpC4OO4gPYRRdrjrR7LVXhtBBI5E2RsCABFKIJVEZOPMFCEYHLebLPkfea fWItZ8Mx3bdPE2x9WyL4IZ2a1+w1pVjviOGQ8JcCYOG1V/O8QJqHH4cXec+jwi8BPwOJcr byAxCPCuP4uCxA4NpUPu/YG98Dy3DayOZimf9a1W8OZXxRIIsIwIakBHxbcEBU2dJP/zKx luCvC8VxfcCydYJlSNzuUMjcoMDAfTUGcNLMYYqu+Z+5fh81I5Gyk6f6SOAZYQ== 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 4SmZj05p8gz12XG; Fri, 8 Dec 2023 02:24:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B82OaIx042102; Fri, 8 Dec 2023 02:24:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B82OamS042099; Fri, 8 Dec 2023 02:24:36 GMT (envelope-from git) Date: Fri, 8 Dec 2023 02:24:36 GMT Message-Id: <202312080224.3B82OamS042099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 1f36ca5de596 - main - vmstat: Rely on libxo for numbers humanization List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f36ca5de596f7c2eb446df5b8e06877901d727a Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=1f36ca5de596f7c2eb446df5b8e06877901d727a commit 1f36ca5de596f7c2eb446df5b8e06877901d727a Author: Alexander Motin AuthorDate: 2023-12-08 02:21:35 +0000 Commit: Alexander Motin CommitDate: 2023-12-08 02:21:35 +0000 vmstat: Rely on libxo for numbers humanization This makes code cleaner, plus fixes such nonsense as humanized JSON and XML, making all numbers raw without quotes, spaces, suffixes, etc. MFC after: 2 weeks --- usr.bin/vmstat/vmstat.c | 169 +++++++++++++++--------------------------------- 1 file changed, 52 insertions(+), 117 deletions(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 2aa58d77a1f0..21068d632a8c 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -213,7 +213,7 @@ main(int argc, char *argv[]) if (argc < 0) return (argc); - hflag = (xo_get_style(NULL) == XO_STYLE_TEXT) && isatty(1); + hflag = isatty(1); while ((c = getopt(argc, argv, "ac:fhHiM:mN:n:oPp:sw:z")) != -1) { switch (c) { @@ -282,6 +282,8 @@ main(int argc, char *argv[]) argv += optind; xo_set_version(VMSTAT_XO_VERSION); + if (!hflag) + xo_set_options(NULL, "no-humanize"); if (todo == 0) todo = VMSTAT; @@ -626,23 +628,6 @@ getcpuinfo(u_long *maskp, int *maxidp) *maxidp = maxid; } - -static void -prthuman(const char *name, uint64_t val, int size, int flags) -{ - char buf[10]; - char fmt[128]; - - snprintf(fmt, sizeof(fmt), "{:%s/%%*s}", name); - - if (size < 5 || size > 9) - xo_errx(1, "doofus"); - flags |= HN_NOSPACE | HN_DECIMAL; - humanize_number(buf, size, val, "", HN_AUTOSCALE, flags); - xo_attr("value", "%ju", (uintmax_t) val); - xo_emit(fmt, size, buf); -} - static void dovmstat(unsigned int interval, int reps) { @@ -769,27 +754,13 @@ dovmstat(unsigned int interval, int reps) total.t_pw, total.t_sw); xo_close_container("processes"); xo_open_container("memory"); -#define vmstat_pgtok(a) ((uintmax_t)(a) * (sum.v_page_size >> 10)) #define rate(x) (unsigned long)(((x) * rate_adj + halfuptime) / uptime) - if (hflag) { - prthuman("available-memory", - total.t_avm * (uint64_t)sum.v_page_size, 5, HN_B); - prthuman("free-memory", - total.t_free * (uint64_t)sum.v_page_size, 5, HN_B); - prthuman("total-page-faults", - rate(sum.v_vm_faults - osum.v_vm_faults), 5, 0); - xo_emit(" "); - } else { - xo_emit(" "); - xo_emit("{:available-memory/%7ju}", - vmstat_pgtok(total.t_avm)); - xo_emit(" "); - xo_emit("{:free-memory/%7ju}", - vmstat_pgtok(total.t_free)); - xo_emit(" "); - xo_emit("{:total-page-faults/%5lu} ", - rate(sum.v_vm_faults - osum.v_vm_faults)); - } + xo_emit(" {[:4}{h,hn-decimal:available-memory/%ju}{]:}", + (uintmax_t)total.t_avm * sum.v_page_size); + xo_emit(" {[:4}{h,hn-decimal:free-memory/%ju}{]:}", + (uintmax_t)total.t_free * sum.v_page_size); + xo_emit(" {[:4}{h,hn-decimal,hn-1000:total-page-faults/%lu}{]:} ", + rate(sum.v_vm_faults - osum.v_vm_faults)); xo_close_container("memory"); xo_open_container("paging-rates"); @@ -801,38 +772,20 @@ dovmstat(unsigned int interval, int reps) xo_emit("{:paged-out/%3lu}", rate(sum.v_swapout + sum.v_vnodeout - (osum.v_swapout + osum.v_vnodeout))); - if (hflag) { - prthuman("freed", - rate(sum.v_tfree - osum.v_tfree), 5, 0); - prthuman("scanned", - rate(sum.v_pdpages - osum.v_pdpages), 5, 0); - } else { - xo_emit(" "); - xo_emit("{:freed/%5lu} ", - rate(sum.v_tfree - osum.v_tfree)); - xo_emit("{:scanned/%4lu}", - rate(sum.v_pdpages - osum.v_pdpages)); - } + xo_emit(" {[:4}{h,hn-decimal,hn-1000:freed/%lu}{]:}", + rate(sum.v_tfree - osum.v_tfree)); + xo_emit(" {[:4}{h,hn-decimal,hn-1000:scanned/%lu}{]:}", + rate(sum.v_pdpages - osum.v_pdpages)); xo_close_container("paging-rates"); devstats(); xo_open_container("fault-rates"); - if (hflag) { - prthuman("interrupts", - rate(sum.v_intr - osum.v_intr), 5, 0); - prthuman("system-calls", - rate(sum.v_syscall - osum.v_syscall), 5, 0); - prthuman("context-switches", - rate(sum.v_swtch - osum.v_swtch), 5, 0); - } else { - xo_emit(" "); - xo_emit("{:interrupts/%4lu} " - "{:system-calls/%5lu} " - "{:context-switches/%5lu}", - rate(sum.v_intr - osum.v_intr), - rate(sum.v_syscall - osum.v_syscall), - rate(sum.v_swtch - osum.v_swtch)); - } + xo_emit(" {[:4}{h,hn-decimal,hn-1000:interrupts/%lu}{]:}" + " {[:4}{h,hn-decimal,hn-1000:system-calls/%lu}{]:}" + " {[:4}{h,hn-decimal,hn-1000:context-switches/%lu}{]:}", + rate(sum.v_intr - osum.v_intr), + rate(sum.v_syscall - osum.v_syscall), + rate(sum.v_swtch - osum.v_swtch)); xo_close_container("fault-rates"); if (Pflag) pcpustats(cpumask, maxid); @@ -863,10 +816,7 @@ printhdr(int maxid, u_long cpumask) int i, num_shown; num_shown = MIN(num_selected, maxshowdevs); - if (hflag) - xo_emit(" {T:procs} {T:memory} {T:/page%*s}", 19, ""); - else - xo_emit("{T:procs} {T:memory} {T:/page%*s}", 19, ""); + xo_emit(" {T:procs} {T:memory} {T:/page%*s}", 19, ""); if (num_shown > 1) xo_emit(" {T:/disks %*s} ", num_shown * 5 - 7, ""); else if (num_shown == 1) @@ -880,13 +830,8 @@ printhdr(int maxid, u_long cpumask) xo_emit("\n"); } else xo_emit(" {T:cpu}\n"); - if (hflag) { - xo_emit(" {T:r} {T:b} {T:w} {T:avm} {T:fre} {T:flt} {T:re}" - " {T:pi} {T:po} {T:fr} {T:sr} "); - } else { - xo_emit("{T:r} {T:b} {T:w} {T:avm} {T:fre} {T:flt} " - "{T:re} {T:pi} {T:po} {T:fr} {T:sr} "); - } + xo_emit(" {T:r} {T:b} {T:w} {T:avm} {T:fre} {T:flt} {T:re}" + " {T:pi} {T:po} {T:fr} {T:sr} "); for (i = 0; i < num_devices; i++) if ((dev_select[i].selected) && (dev_select[i].selected <= maxshowdevs)) @@ -1146,64 +1091,53 @@ devstats(void) xo_emit("{ekq:name/%s%d}", dev_select[dn].device_name, dev_select[dn].unit_number); - if (hflag) { - prthuman("transfers", (uint64_t)transfers_per_second, - 5, HN_DIVISOR_1000); - } else { - xo_emit("{:transfers/%3.0Lf}", transfers_per_second); - } + xo_emit("{[:5}{h,hn-decimal,hn-1000:transfers/%ju}{]:}", + (uintmax_t)transfers_per_second); xo_close_instance("device"); } xo_close_list("device"); } static void -percent(const char *name, double pctv, int *over) +percent(const char *name, long pctv, int *over) { - int l; - char buf[10]; - char fmt[128]; - - snprintf(fmt, sizeof(fmt), " {:%s/%%*s}", name); - l = snprintf(buf, sizeof(buf), "%.0f", pctv); - if (l == 1 && *over) { - xo_emit(fmt, 1, buf); + char fmt[64]; + + snprintf(fmt, sizeof(fmt), " {:%s/%%%ulld/%%lld}", name, + (*over && pctv <= 9) ? 1 : 2); + xo_emit(fmt, pctv); + if (*over && pctv <= 9) (*over)--; - } else - xo_emit(fmt, 2, buf); - if (l > 2) + else if (pctv >= 100) (*over)++; } static void cpustats(void) { - double lpct, total; + long total; int state, over; total = 0; for (state = 0; state < CPUSTATES; ++state) total += cur.cp_time[state]; - if (total > 0) - lpct = 100.0 / total; - else - lpct = 0.0; + if (total == 0) + total = 1; over = 0; xo_open_container("cpu-statistics"); - percent("user", (cur.cp_time[CP_USER] + cur.cp_time[CP_NICE]) * lpct, - &over); - percent("system", (cur.cp_time[CP_SYS] + cur.cp_time[CP_INTR]) * lpct, - &over); - percent("idle", cur.cp_time[CP_IDLE] * lpct, &over); + percent("user", 100LL * (cur.cp_time[CP_USER] + cur.cp_time[CP_NICE]) / + total, &over); + percent("system", 100LL * (cur.cp_time[CP_SYS] + cur.cp_time[CP_INTR]) / + total, &over); + percent("idle", 100LL * cur.cp_time[CP_IDLE] / total, &over); xo_close_container("cpu-statistics"); } static void pcpustats(u_long cpumask, int maxid) { - double lpct, total; - long tmp; - int i, over, state; + long tmp, total; + int i, state, over; /* devstats does this for cp_time */ for (i = 0; i <= maxid; i++) { @@ -1227,15 +1161,16 @@ pcpustats(u_long cpumask, int maxid) total = 0; for (state = 0; state < CPUSTATES; ++state) total += cur_cp_times[i * CPUSTATES + state]; - if (total) - lpct = 100.0 / total; - else - lpct = 0.0; - percent("user", (cur_cp_times[i * CPUSTATES + CP_USER] + - cur_cp_times[i * CPUSTATES + CP_NICE]) * lpct, &over); - percent("system", (cur_cp_times[i * CPUSTATES + CP_SYS] + - cur_cp_times[i * CPUSTATES + CP_INTR]) * lpct, &over); - percent("idle", cur_cp_times[i * CPUSTATES + CP_IDLE] * lpct, + if (total == 0) + total = 1; + percent("user", + 100LL * (cur_cp_times[i * CPUSTATES + CP_USER] + + cur_cp_times[i * CPUSTATES + CP_NICE]) / total, &over); + percent("system", + 100LL * (cur_cp_times[i * CPUSTATES + CP_SYS] + + cur_cp_times[i * CPUSTATES + CP_INTR]) / total, &over); + percent("idle", + 100LL * cur_cp_times[i * CPUSTATES + CP_IDLE] / total, &over); xo_close_instance("cpu"); } From nobody Fri Dec 8 05:10:35 2023 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 4SmfNl6XZDz53KDW for ; Fri, 8 Dec 2023 05:10:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmfNl1hNcz3CKc for ; Fri, 8 Dec 2023 05:10:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20230601.gappssmtp.com header.s=20230601 header.b=pQyfi1C3; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::52f) smtp.mailfrom=wlosh@bsdimp.com; dmarc=none Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-54cde11d0f4so2500277a12.2 for ; Thu, 07 Dec 2023 21:10:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1702012243; x=1702617043; darn=freebsd.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=iCBBMx96O5Axgd6dc27jv5zfwR7+RTHjThUm8L9MCKU=; b=pQyfi1C3nQHXdaSzveRy+flu8KgEjz+wdcRlGYRRP1a+rZjNF1ftHMXlbFbSklFjDt AamVNhhzZnMjLgpU8cLbYSKC1ofOHFT7sRkFpc4a48wFzOoOymRrvFAtOK1UFOM+n1YJ ydhxQPjJdc/SO50/3m8poawemP7pFhsUDWEB7NHqDE/V8rOTTuneWVXeFzq6DzHccNc5 V9j0woZHCnm9vTlXtB/J1paUfDBTN0ZMoVImcFfnWmPR4dg/rnHbRAgS8JD+lz2qTzIj G4F8DH8R3aD2FtUjZ4u4D6SR78KyOrGZjxbwl8HlfDAADPVQmm+b30+LNf3TdkC11KM3 ZmwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702012243; x=1702617043; h=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=iCBBMx96O5Axgd6dc27jv5zfwR7+RTHjThUm8L9MCKU=; b=W5IvAFZJd3596T7RbM0jCcGKlYUDsT88sQy+S/NkxhCcRT9XwENbNy3fb+Oct9MJI/ cptkp2cL9Z9M7ZVbubFl1kubCbxGG1R8ekeccRb0dt8iFatee/1YvRce8FR8eRuaIkIm +EbVPADXJsJos5ocw0nlWPrmegd3+mm/UEG5WF99CiNB2NzhQ0wKHA1n3ak1OVd2YNxS Gf2m0rJxfV8nQOMHkhlTeoasM7BjYGrGbfUSwiDiUYEJSvvKJS+IpGv5xorqPzmfXxJm 3Gu0cpVNyb+8LpTfzxNk1c5OBfv0ttsVO94drGktm0SRRJXscGWgpGxt3klK4Uzj4dPx AVWw== X-Gm-Message-State: AOJu0YwAn/npiTw69maRay4ggJR4qkocrlTWU9YFcZLQemI5ZXs7kXSX Zibl2tU6f5fWpXN5NM93OPvGqlA1TaI6pV7Tolbk34lWUJxbS89i X-Google-Smtp-Source: AGHT+IFug4GrkVUcJT1/30ZRC+Y3egSSqvNfoVPyrvhXT1htBVxWteOXPfRbo6mCKUfq7baeHvNvp6R3y/M47VSTLrI= X-Received: by 2002:a17:906:101:b0:a1d:9d6c:57d4 with SMTP id 1-20020a170906010100b00a1d9d6c57d4mr2331141eje.55.1702012242982; Thu, 07 Dec 2023 21:10:42 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> <20231207222716.obSthG6r@steffen%sdaoden.eu> <20231208010731.3hijmSTL@steffen%sdaoden.eu> In-Reply-To: <20231208010731.3hijmSTL@steffen%sdaoden.eu> From: Warner Losh Date: Thu, 7 Dec 2023 22:10:35 -0700 Message-ID: Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources To: Warner Losh , Xin Li , Philip Paeps , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000258860060bf89b7f" X-Spamd-Result: default: False [0.00 / 15.00]; INTRODUCTION(2.00)[]; SUBJECT_HAS_CURRENCY(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_COUNT_ONE(0.00)[1]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; R_SPF_NA(0.00)[no SPF record]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::52f:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+]; TO_DN_SOME(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com] X-Rspamd-Queue-Id: 4SmfNl1hNcz3CKc X-Spamd-Bar: / --000000000000258860060bf89b7f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Dec 7, 2023 at 6:07=E2=80=AFPM Steffen Nurpmeso wrote: > Warner Losh wrote in > = : > |On Thu, Dec 7, 2023 at 3:27=E2=80=AFPM Steffen Nurpmeso > wrote: > |> Xin Li wrote in > |> : > |>|On 2023-12-06 22:34, Philip Paeps wrote: > |>|> On 2023-12-07 14:26:05 (+0800), Warner Losh wrote: > |>|>> We should point to bipm > |>|>> https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list since > |> they > |>|>> are > |>|>> the source of truth, no? > |>|> > |>|> I went for the IANA copy because data.iana.org is a much shorter an= d > |>|> trustworthy looking URL. And it's also where other operating syste= ms > |>|> get their copies. > |>| > |>|My understanding is that IANA's copy is part of tzdata and it's only > |>|updated when a new set of zone data is released, so it's sometimes > |>|outdated. It is actually going to be outdated really soon by the way= . > |> > |> But nothing will change. > |> It is only about the included end-of-life tag why there is > |> discussion at all. > |> The IANA TZ data is always updated as necessary, "early enough". > | > |Yes. TZ data updates multiple times a year. The lead time on NIST/BIPM > |updating the file usually is within days or weeks after the new leap is > |announced. > |But ntpd can't possibly use it for about 5 months. TZ updates are plent= y > |fast. > | > |The bigger problem is that we have to do a EN to get a new set of zone > |files. If we had a way to fetch them, we could just copy this file from > the > |updated > |zone files. > > I never spoke against fetching the plain file (who is my role in > this project in the end?), i only spoke against using the server > of the french institute directly. > The French institute is the source of truth. The BIPM defines what UTC is, based on atomic clock measurements from all over the world. A subagency, the IERS, measures the delta between UTC and the earth's orientation and makes the determination of when a leap second is scheduled. There's no cryptographic signature of this file. There is a hash that ensures it's not corrupted, but it can't be verified as authoritative since it's just a SHA hash. By grabbing it from BIPM, the source of truth for time, we at least get their TLS certs to back up the file. Grabbing it from anywhere else means our users have to trust the other places. While the IETF/IANA are trustworthy, it's one level removed. Then again, given this file, in this context, is only used when ntpd can't otherwise determine the leap seconds, so maybe that high level of trust isn't strictly needed. The lack of easy verification of this file has been discussed in the time community on and off for the last 25 or more years. > Ie one could poll this once a day or so, and upload it somewhere > else. Or ping the github URL of the raw IANA TZ file, which is > placed in Eggert's repo quite fast, even without release. > (Just in case the FreeBSD project want to lock out all the > countries that github blocks, i think Iran, North Korea, Cuba > even, who knows which otherwise, i will not look up that political > war thing.) > Polling any more frequently than every other month is overkill. This file is used, at most, twice a year. It changes 6 months before the leap second, give or take. Polling it every 60 days is given how often it is used. Ideally, our scripts would spread out the polling over those 60 days... > |> Also the beasts are about to get rid of leap seconds until 2035 > ... > |> earlier). Bets can be placed whether it will happen before > |> a possible occurring leap second, or not. (My bet is that they > |> run everything against the wall, and then run away yelling about > |> the evil leap second, after having missed to create an appropriate > ... > |Yea, we're years away from the next leap second. And there's still > |a good chance we'll have at least one more. And there's also rumblings > |that leaps will stop before 2035 (that's the current absolute last date= , > |and there's several folks that want to pull that in). What will happen > |for sure isn't well known... > | > |ntpv5 discussions have, at times, assumed there will be no more leap > |seconds and so ntpv5 needn't have anything to accommodate them. > > I have not looked into current WG outcome (there was just recently > some IETF post regarding NTP, i have not looked). > I would only wish they distribute TAI and the offset to UTC, but > i think, i would hope, they will doing the opposite regulary. > I have no time, and i am not the right person to do anything about > NTP, let alone in the IETF. All i could ever say i did say, and > that was that it was always wrong to go for "civil time" aka UTC, > at least without a permanent indication to a constant reliable > time scale. And a longer possibility to detect leaps, as i knew > secretaries who turn off their computer at Friday afternoon, not > to turn it on again until Monday morning. And my impression in > the past, before i came a little bit involved in international > email etc communication, was that the engineers simply could not > imagine such a situation. Or, *at best*, decided that then > silence is the best communication on such a switch. > The need for leap seconds, or its lack, has complicated history. > |>|The IERS one is more up-to-date because they publish the bulletin. > |> > |> In general i think distribution of load is a good thing, and > |> i find it very unfriendly to put all the load onto some jealous > |> institute (if it is one) and its single server. > |> The FreeBSD project has an established set of mirrors, and, the > ... > |We can skew the load in time by spreading all our users out over > |the few months we have if there's a load issue. > > I have recognized even the nice name of this mechanism in the > FreeBSD rc system, Warner Losh. > Yea, I worked for a timing company in the 2000s. I couldn't recall if I'd written this or Ian had. I think my name is on it, but Ian fixed all the mistakes I made. :) > |> Btw PHK had a thrilling idea of DNS distributing leap ticks some > |> years ago, and he even started to host it. As it unfortunately > |> did not fly i did not track it further. > |> Would also be an idea for the FreeBSD project: simply download the > |> file ones, then place a DNS record that FreeBSD installations then > |> can query. DNSSEC is in place i think. > | > |Yea, that's not a thing that's happening. It was an interesting idea, > |but hasn't been standardized and there's little to apetite to distribut= e > |this way. > > Unfortunately. And then there is the fully blown tzdist protocol > that the IETF hammered through with XML and what not formats, > unfortunately not CBOR ("later"), this is what Meinberg says on > the state of that: > > https://kb.meinbergglobal.com/kb/time_sync/tzdist > Yea... > |>|The bundled version was from NIST ftp, but fetching from ftp for ever= y > |>|FreeBSD system out there was too scary for me. > |>| > |>|There may be some security / privacy concerns if we direct users to a > |>|place that we do not have control, by the way. > |> > |> Interesting aspect! > | > |There might be, but this sounds somewhat speculative. What's the antici= p\ > |ated > |concerns? > > Maybe Xin Li has stumbled over the same thread as i after that > publicsuffix CVE of cURL (first sentence of the quoted message): > > https://lists.gnu.org/archive/html/bug-wget/2014-03/msg00113.html > > What i mean is, the FreeBSD project and its pkg database, isn't > this a natural place for such a thing? With guaranteed / > controlled availability. > The ntp leap stuff does pre-date the pkg by a decade. Having a package for it might be a natural evolution, Warner > --steffen > | > |Der Kragenbaer, The moon bear, > |der holt sich munter he cheerfully and one by one > |einen nach dem anderen runter wa.ks himself off > |(By Robert Gernhardt) > | > | Only in December: lightful Dubai COP28 Narendra Modi quote: > | A small part of humanity has ruthlessly exploited nature. > | But the entire humanity is bearing the cost of it, > | especially the inhabitants of the Global South. > | The selfishness of a few will lead the world into darkness, > | not just for themselves but for the entire world. > --000000000000258860060bf89b7f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Dec 7, 2023 at 6:07=E2=80=AFP= M Steffen Nurpmeso <steffen@sdaode= n.eu> wrote:
Warner Losh wrote in
=C2=A0<CANCZdfpHWRECi=3DDyhxJAW4MkA-CyPLK=3DOSdSwBdKQJ57MyPwNA@mail.gmail.co= m>:
=C2=A0|On Thu, Dec 7, 2023 at 3:27=E2=80=AFPM Steffen Nurpmeso <steffen@sdaoden.eu>= wrote:
=C2=A0|> Xin Li wrote in
=C2=A0|>=C2=A0 <d75b041f-05f8-44c1-8de6-1fef89b7e537@delph= ij.net>:
=C2=A0|>|On 2023-12-06 22:34, Philip Paeps wrote:
=C2=A0|>|> On 2023-12-07 14:26:05 (+0800), Warner Losh wrote:
=C2=A0|>|>> We should point to bipm
=C2=A0|>|>> https://hpiers.obspm= .fr/iers/bul/bulc/ntp/leap-seconds.list since
=C2=A0|> they
=C2=A0|>|>> are
=C2=A0|>|>> the source of truth, no?
=C2=A0|>|>
=C2=A0|>|> I went for the IANA copy because data.iana.org is a much sh= orter and
=C2=A0|>|> trustworthy looking URL.=C2=A0 And it's also where oth= er operating systems
=C2=A0|>|> get their copies.
=C2=A0|>|
=C2=A0|>|My understanding is that IANA's copy is part of tzdata and = it's only
=C2=A0|>|updated when a new set of zone data is released, so it's so= metimes
=C2=A0|>|outdated.=C2=A0 It is actually going to be outdated really soon= by the way.
=C2=A0|>
=C2=A0|> But nothing will change.
=C2=A0|> It is only about the included end-of-life tag why there is
=C2=A0|> discussion at all.
=C2=A0|> The IANA TZ data is always updated as necessary, "early en= ough".
=C2=A0|
=C2=A0|Yes. TZ data updates multiple times a year. The lead time on NIST/BI= PM
=C2=A0|updating the file usually is within days or weeks after the new leap= is
=C2=A0|announced.
=C2=A0|But ntpd can't possibly use it for about 5 months. TZ updates ar= e plenty
=C2=A0|fast.
=C2=A0|
=C2=A0|The bigger problem is that we have to do a EN to get a new set of zo= ne
=C2=A0|files. If we had a way to fetch them, we could just copy this file f= rom the
=C2=A0|updated
=C2=A0|zone files.

I never spoke against fetching the plain file (who is my role in
this project in the end?), i only spoke against using the server
of the french institute directly.

The F= rench institute is the source of truth. The BIPM defines what
UTC= is, based on atomic clock measurements from all over the world.
= A subagency, the IERS, measures the delta between UTC and
the ear= th's orientation and makes the determination of when a
leap s= econd is scheduled.

There's no cryptographic s= ignature of this file. There is a hash
that ensures it's not = corrupted, but it can't be verified as authoritative
since it= 's just a SHA hash. By grabbing it from BIPM, the source
of t= ruth for time, we at least get their TLS certs to back up the file.
Grabbing it from anywhere else means our users have to trust the
other places. While the IETF/IANA are trustworthy, it's one level
removed.

Then again, given this file, in t= his context, is only used when ntpd
can't otherwise determine= the leap seconds, so maybe that high
level of trust isn't st= rictly needed. The lack of easy verification
of this file has bee= n discussed in the time community on and off
for the last 25 or m= ore years.
=C2=A0
Ie one could poll this once a day or so, and upload it somewhere
else.=C2=A0 Or ping the github URL of the raw IANA TZ file, which is
placed in Eggert's repo quite fast, even without release.
(Just in case the FreeBSD project want to lock out all the
countries that github blocks, i think Iran, North Korea, Cuba
even, who knows which otherwise, i will not look up that political
war thing.)

Polling any more frequently= than every other month is overkill. This file is used,
at most, = twice a year. It changes 6 months before the leap second,
give or= take. Polling it every 60 days is given how often it is used.
Id= eally, our scripts would spread out the polling over those 60 days...

=C2=A0
=C2=A0|> Also the beasts are about to get rid of leap seconds until 2035=
=C2=A0...
=C2=A0|> earlier).=C2=A0 Bets can be placed whether it will happen befor= e
=C2=A0|> a possible occurring leap second, or not.=C2=A0 (My bet is that= they
=C2=A0|> run everything against the wall, and then run away yelling abou= t
=C2=A0|> the evil leap second, after having missed to create an appropri= ate
=C2=A0...
=C2=A0|Yea, we're years away from the next leap second. And there's= still
=C2=A0|a good chance we'll have at least one more. And there's also= rumblings
=C2=A0|that leaps will stop before 2035 (that's the current absolute la= st date,
=C2=A0|and there's several folks that want to pull that in). What will = happen
=C2=A0|for sure isn't well known...
=C2=A0|
=C2=A0|ntpv5 discussions have, at times, assumed there will be no more leap=
=C2=A0|seconds and so ntpv5 needn't have anything to accommodate them.<= br>
I have not looked into current WG outcome (there was just recently
some IETF post regarding NTP, i have not looked).
I would only wish they distribute TAI and the offset to UTC, but
i think, i would hope, they will doing the opposite regulary.
I have no time, and i am not the right person to do anything about
NTP, let alone in the IETF.=C2=A0 All i could ever say i did say, and
that was that it was always wrong to go for "civil time" aka UTC,=
at least without a permanent indication to a constant reliable
time scale.=C2=A0 And a longer possibility to detect leaps, as i knew
secretaries who turn off their computer at Friday afternoon, not
to turn it on again until Monday morning.=C2=A0 And my impression in
the past, before i came a little bit involved in international
email etc communication, was that the engineers simply could not
imagine such a situation.=C2=A0 Or, *at best*, decided that then
silence is the best communication on such a switch.
The need for leap seconds, or its lack, has complicated histor= y.
=C2=A0
=C2=A0|>|The IERS one is more up-to-date because they publish the bullet= in.
=C2=A0|>
=C2=A0|> In general i think distribution of load is a good thing, and =C2=A0|> i find it very unfriendly to put all the load onto some jealous=
=C2=A0|> institute (if it is one) and its single server.
=C2=A0|> The FreeBSD project has an established set of mirrors, and, the=
=C2=A0...
=C2=A0|We can skew the load in time by spreading all our users out over
=C2=A0|the few months we have if there's a load issue.

I have recognized even the nice name of this mechanism in the
FreeBSD rc system, Warner Losh.

Yea, I = worked for a timing company in the 2000s. I couldn't recall
i= f I'd written this or Ian had. I think my name is on it, but Ian fixed<= /div>
all the mistakes I made. :)
=C2=A0
=C2=A0|> Btw PHK had a thrilling idea of DNS distributing leap ticks som= e
=C2=A0|> years ago, and he even started to host it.=C2=A0 As it unfortun= ately
=C2=A0|> did not fly i did not track it further.
=C2=A0|> Would also be an idea for the FreeBSD project: simply download = the
=C2=A0|> file ones, then place a DNS record that FreeBSD installations t= hen
=C2=A0|> can query.=C2=A0 DNSSEC is in place i think.
=C2=A0|
=C2=A0|Yea, that's not a thing that's happening. It was an interest= ing idea,
=C2=A0|but hasn't been standardized and there's little to apetite t= o distribute
=C2=A0|this way.

Unfortunately.=C2=A0 And then there is the fully blown tzdist protocol
that the IETF hammered through with XML and what not formats,
unfortunately not CBOR ("later"), this is what Meinberg says on the state of that:

=C2=A0 https://kb.meinbergglobal.com/kb/time_sync/t= zdist

Yea...
=C2=A0<= /div>
=C2=A0|>|The bundled version was from NIST ftp, but fetching from ftp fo= r every
=C2=A0|>|FreeBSD system out there was too scary for me.
=C2=A0|>|
=C2=A0|>|There may be some security / privacy concerns if we direct user= s to a
=C2=A0|>|place that we do not have control, by the way.
=C2=A0|>
=C2=A0|> Interesting aspect!
=C2=A0|
=C2=A0|There might be, but this sounds somewhat speculative. What's the= anticip\
=C2=A0|ated
=C2=A0|concerns?

Maybe Xin Li has stumbled over the same thread as i after that
publicsuffix CVE of cURL (first sentence of the quoted message):

=C2=A0 https://lists.gnu.org/archiv= e/html/bug-wget/2014-03/msg00113.html

What i mean is, the FreeBSD project and its pkg database, isn't
this a natural place for such a thing?=C2=A0 With guaranteed /
controlled availability.

The ntp leap stuff = does pre-date the pkg by a decade. Having a package
for it might be a natural evolution,

Warner
=C2=A0
--steffen
|
|Der Kragenbaer,=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 The= moon bear,
|der holt sich munter=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0he cheerfully= and one by one
|einen nach dem anderen runter=C2=A0 wa.ks himself off
|(By Robert Gernhardt)
|
| Only in December: lightful Dubai COP28 Narendra Modi quote:
|=C2=A0 A small part of humanity has ruthlessly exploited nature.
|=C2=A0 But the entire humanity is bearing the cost of it,
|=C2=A0 especially the inhabitants of the Global South.
|=C2=A0 The selfishness of a few will lead the world into darkness,
|=C2=A0 not just for themselves but for the entire world.
--000000000000258860060bf89b7f-- From nobody Fri Dec 8 05:33:08 2023 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 4Smftk1Hrpz53M9H; Fri, 8 Dec 2023 05:33:18 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) (using TLSv1.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 "anubis.delphij.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smftj1lnZz3FcN; Fri, 8 Dec 2023 05:33:17 +0000 (UTC) (envelope-from delphij@delphij.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=delphij.net header.s=y07n header.b=ykeRj4+6; dkim=pass header.d=delphij.net header.s=w44o header.b=pfDnXSh2; spf=pass (mx1.freebsd.org: domain of delphij@delphij.net designates 64.62.153.212 as permitted sender) smtp.mailfrom=delphij@delphij.net; dmarc=pass (policy=reject) header.from=delphij.net DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=delphij.net; i=@delphij.net; q=dns/txt; s=y07n; t=1702013589; h=message-id : date : mime-version : reply-to : subject : to : references : from : in-reply-to : content-type : from; bh=QmeiX98I/jPs56hz+Ctq+g+TsZt61Ulsbw4PWoopYkE=; b=ykeRj4+6NlvpkqKt/GKRVfnFWlnl1v092xn3BoukSe1XRnIdC3sdh4Oe/R/RUBu56KuX8 1DAa8bSNrHsCliHCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=delphij.net; i=@delphij.net; q=dns/txt; s=w44o; t=1702013589; h=message-id : date : mime-version : reply-to : subject : to : references : from : in-reply-to : content-type : from; bh=QmeiX98I/jPs56hz+Ctq+g+TsZt61Ulsbw4PWoopYkE=; b=pfDnXSh2DEWkGZEF4dyK7wqqO3rR/IeMwhEY80ipElk+Ux9bWAk+v9D0AdKKmkCQP/KN4 mcXVxD/kZKRChEwBjWaZE75n9iWKppJ/TWwa89AAuHMg3Ks7cVM/wAmrsMmQPDcv2SqbuoI hrY+7edlMQ2I9yDg1UZktREoqa4B4Crosv4qHBVnqeHagKAaFT80YmAb6NIPmM7YN/+JsVU Qbi62Kp+cddaQHz+k1osl7QmaweKv2/lEYlKdMJMg92e84Orn1aVyX+fu1I3Ue2utG2hfmo QzVdSnr1cYgVFnwSJzMICrkwb8QfYl+jUzpZmCmMJO+Gq1HqCOw4Zd9qhz1Q== Received: from xins-laptop (unknown [IPv6:2601:646:9a00:3b0a:5d17:b76c:55bd:54b3]) by anubis.delphij.net (Postfix) with ESMTPSA id 4BB7E3094E; Thu, 7 Dec 2023 21:33:09 -0800 (PST) Message-ID: Date: Thu, 7 Dec 2023 21:33:08 -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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Reply-To: d@delphij.net Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources Content-Language: en-US To: Warner Losh , Philip Paeps , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> <20231207222716.obSthG6r@steffen%sdaoden.eu> <20231208010731.3hijmSTL@steffen%sdaoden.eu> From: Xin Li Autocrypt: addr=delphij@delphij.net; keydata= xjMEZPbDoRYJKwYBBAHaRw8BAQdAsUNmxEWz6QiGdFbBrVVEpjNpgQV9FXjDWsLsY0UwRPvN HFhpbiBMSSA8ZGVscGhpakBkZWxwaGlqLm5ldD7ClgQTFgoAPhYhBLskk2pXNatsapeNzxED 4uuXWeTFBQJk9sRMAhsDBQkKBDXmBQsJCAcDBRUKCQgLBRYCAwEAAh4FAheAAAoJEBED4uuX WeTF6yIA/2Ls3Rb/qC8mQZ6D2S0UO5vblPghJfboFJLNJFw3i4GYAQCsTmQg3ahgbNEJu/vU xgtro2kTxa6kKnZ35IbqPqPcCc44BGT2w6ESCisGAQQBl1UBBQEBB0Cxji+sQgVPajLNA/Lw yHx0ogSalPQszdkfVgeg3iR3FAMBCAfCeAQYFgoAIBYhBLskk2pXNatsapeNzxED4uuXWeTF BQJk9sOhAhsMAAoJEBED4uuXWeTF3BQBAIx/gPCTFN2DPBrKLkE3oC/+j9EkmNLMUCGidlP/ Zb6HAP4nL1kStTsOldIGhi/3m1LvU7r3Kel3MnlIK8/9BlLPAg== In-Reply-To: <20231208010731.3hijmSTL@steffen%sdaoden.eu> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------cSSSZnAnWoCg8RB2eCGG0xHl" X-Spamd-Result: default: False [-3.89 / 15.00]; SIGNED_PGP(-2.00)[]; MIME_BASE64_TEXT_BOGUS(1.00)[]; SUBJECT_HAS_CURRENCY(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[delphij.net,reject]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; R_DKIM_ALLOW(-0.20)[delphij.net:s=y07n,delphij.net:s=w44o]; R_SPF_ALLOW(-0.20)[+mx]; MIME_BASE64_TEXT(0.10)[]; ONCE_RECEIVED(0.10)[]; XM_UA_NO_VERSION(0.01)[]; FREEFALL_USER(0.00)[delphij]; FROM_HAS_DN(0.00)[]; REPLYTO_DOM_EQ_FROM_DOM(0.00)[]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; HAS_REPLYTO(0.00)[d@delphij.net]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:6939, ipnet:64.62.128.0/18, country:US]; HAS_ATTACHMENT(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_ONE(0.00)[1]; DKIM_TRACE(0.00)[delphij.net:+]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:~]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4Smftj1lnZz3FcN X-Spamd-Bar: --- This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------cSSSZnAnWoCg8RB2eCGG0xHl Content-Type: multipart/mixed; boundary="------------fugITVZ20J1hkVvc3LL5G6KW"; protected-headers="v1" From: Xin Li Reply-To: d@delphij.net To: Warner Losh , Philip Paeps , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> <20231207222716.obSthG6r@steffen%sdaoden.eu> <20231208010731.3hijmSTL@steffen%sdaoden.eu> In-Reply-To: <20231208010731.3hijmSTL@steffen%sdaoden.eu> --------------fugITVZ20J1hkVvc3LL5G6KW Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 T24gMjAyMy0xMi0wNyAxNzowNywgU3RlZmZlbiBOdXJwbWVzbyB3cm90ZToNCj4gV2FybmVy IExvc2ggd3JvdGUgaW4NClsuLi5dDQo+ICAgfD58VGhlIGJ1bmRsZWQgdmVyc2lvbiB3YXMg ZnJvbSBOSVNUIGZ0cCwgYnV0IGZldGNoaW5nIGZyb20gZnRwIGZvciBldmVyeQ0KPiAgIHw+ fEZyZWVCU0Qgc3lzdGVtIG91dCB0aGVyZSB3YXMgdG9vIHNjYXJ5IGZvciBtZS4NCj4gICB8 PnwNCj4gICB8PnxUaGVyZSBtYXkgYmUgc29tZSBzZWN1cml0eSAvIHByaXZhY3kgY29uY2Vy bnMgaWYgd2UgZGlyZWN0IHVzZXJzIHRvIGENCj4gICB8PnxwbGFjZSB0aGF0IHdlIGRvIG5v dCBoYXZlIGNvbnRyb2wsIGJ5IHRoZSB3YXkuDQo+ICAgfD4NCj4gICB8PiBJbnRlcmVzdGlu ZyBhc3BlY3QhDQo+ICAgfA0KPiAgIHxUaGVyZSBtaWdodCBiZSwgYnV0IHRoaXMgc291bmRz IHNvbWV3aGF0IHNwZWN1bGF0aXZlLiBXaGF0J3MgdGhlIGFudGljaXBcDQo+ICAgfGF0ZWQN Cj4gICB8Y29uY2VybnM/DQo+IA0KPiBNYXliZSBYaW4gTGkgaGFzIHN0dW1ibGVkIG92ZXIg dGhlIHNhbWUgdGhyZWFkIGFzIGkgYWZ0ZXIgdGhhdA0KPiBwdWJsaWNzdWZmaXggQ1ZFIG9m IGNVUkwgKGZpcnN0IHNlbnRlbmNlIG9mIHRoZSBxdW90ZWQgbWVzc2FnZSk6DQo+IA0KPiAg ICBodHRwczovL2xpc3RzLmdudS5vcmcvYXJjaGl2ZS9odG1sL2J1Zy13Z2V0LzIwMTQtMDMv bXNnMDAxMTMuaHRtbA0KPiANCj4gV2hhdCBpIG1lYW4gaXMsIHRoZSBGcmVlQlNEIHByb2pl Y3QgYW5kIGl0cyBwa2cgZGF0YWJhc2UsIGlzbid0DQo+IHRoaXMgYSBuYXR1cmFsIHBsYWNl IGZvciBzdWNoIGEgdGhpbmc/ICBXaXRoIGd1YXJhbnRlZWQgLw0KPiBjb250cm9sbGVkIGF2 YWlsYWJpbGl0eS4NCg0KSXQgY291bGQgYmUgbWUgYmVpbmcgdG9vIHBhcmFub2lkLCBqdXN0 IG15ICQwLjAyIC0tDQoNCkZldGNoaW5nIHRoZSBmaWxlIHdvdWxkIG1ha2UgYSBodHRwIHJl cXVlc3Qgd2l0aCAibGliZmV0Y2gvMi4wIiwgYW5kIHRoZSANCnNlcnZlciBrbm93cyB0aGUg SVAgYWRkcmVzcywgZXRjLiwgaWYgdGhleSBsb2cgaXQgc29tZXdoZXJlLg0KDQpPbiB0aGUg b3RoZXIgaGFuZCwgYnkgZmV0Y2hpbmcgdGhlIGZpbGUsIGl0IG1lYW5zIHRoYXQgdGhlIHBl cmlvZGljIA0Kc2NyaXB0IGRldGVjdGVkIHRoYXQgdGhlIGxvY2FsIGxlYXAtc2Vjb25kcyBm aWxlIGlzIG91dGRhdGVkIGFuZCBOVFAgDQpsZWFwLXNlY29uZHMgZmlsZSBpcyBhbHNvIG91 dGRhdGVkLg0KDQpJZiB3ZSBkZWxpdmVyIGxlYXAtc2Vjb25kcyB1c2luZyBmcmVlYnNkLXVw ZGF0ZSwgdGhpcyBjb3VsZCBtZWFuIHRoZSANCnVzZXIgaXMgcnVubmluZyBzb21ldGhpbmcg b2xkOyB3aXRoIG15IHJlY2VudCBjaGFuZ2UgaXQgbWVhbnMgdGhleSBhcmUgDQpydW5uaW5n IG50cGQsIHdoaWNoIGNvdWxkIGJlIHRvbyBtdWNoIG9mIGluZm9ybWF0aW9uLg0KDQpBbm90 aGVyIGNvbmNlcm4gaXMgdGhhdCBpdCdzIHNvbWV3aGF0IHZhZ3VlIGlmIHRoZSBVUkwgd291 bGQgc3RheSB2YWxpZC4gDQogIFNob3VsZCB0aGV5IG1vdmUgKGl0IGhhcHBlbmVkIHRvIHVz IGZvciB0aGUgTklTVCBmaWxlLCBmb3IgZXhhbXBsZSwgDQp0aGF0IGdldHMgbW92ZWQgdG8g YSBkaWZmZXJlbnQgaG9zdCksIGl0IHdvdWxkIGJlIGJvdGggYSBsb3NzIG9mIA0KZnVuY3Rp b25hbGl0eSAoZmlsZSBjYW4ndCBiZSB1cGRhdGVkKSBhbmQgYSBsZWFrIG9mIGluZm9ybWF0 aW9uIChydW5uaW5nIA0KYW4gb2xkZXIgdmVyc2lvbiBvZiBjb25maWd1cmF0aW9uKS4NCg0K VGhlc2UgbWF5IGJlIG5vdCByZWFsbHkgYSBoaWdoIGltcGFjdCBzZWN1cml0eSBjb25jZXJu LCBidXQgc29tZSB1c2VycyANCm1heSBiZSBub3QgdmVyeSBoYXBweSB3aXRoIHRoaXMuICBJ ZiB3ZSBhcmUgaG9zdGluZyBpdCBhdCBlLmcuIA0Kd3d3LmZyZWVic2Qub3JnLCB0aGVuIHdl IGNhbiBtYWtlIHN1cmUgdGhhdCB0aGUgVVJMIGlzIGFsd2F5cyB2YWxpZCBhbmQgDQp3ZSBo YXZlIGNvbnRyb2wgb2YgbG9nZ2luZyAoZS5nLiB3ZSBjb3VsZCBleGNsdWRlIGNlcnRhaW4g cGF0aHMgZnJvbSANCmdldHRpbmcgbG9nZ2VkKS4NCg0KQ2hlZXJzLA0K --------------fugITVZ20J1hkVvc3LL5G6KW-- --------------cSSSZnAnWoCg8RB2eCGG0xHl Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQS7JJNqVzWrbGqXjc8RA+Lrl1nkxQUCZXKqlAUDAAAAAAAKCRARA+Lrl1nkxTSr AP4g3YjUhaH7A3irl0jf9kSF/shy+DszYimXtjXri8chygEAjX+x9BEkZh9LAyfVCA1LAzbW3neD 8X2fBoXYjMMx7wQ= =GNQt -----END PGP SIGNATURE----- --------------cSSSZnAnWoCg8RB2eCGG0xHl-- From nobody Fri Dec 8 08:32:03 2023 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 4Smkrz3jQdz53bJZ for ; Fri, 8 Dec 2023 08:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smkrz3GPXz3VPB; Fri, 8 Dec 2023 08:32:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702024323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bw9QJctzeHJ8XZe3O21ZdQYC3ceYt/wVxSm7Ago53HM=; b=i68cSAWofTEB27vcJyNW3fESafZh3FZMrGGc3W41w7vKOCYvrnkxnmIN+MmmRg4eErumgv eeLVdbLVl3dMiS3hSQSPuV+cDDozHUDWNCDR4WW6Nvbo0IonfeNEWE9tkDiaGyigrOaKuD CHcXI/PF+xayXhJjMPlIa01xMSRhcpzjjivH0IP1BbrvBETg2NoVcayKB+BncxZHxJUqTz NTQNzjGn3/n2bKSMnpFoLqsCcoCGs3S3jVtpK3WXQgBsN1c4KnlPyDgILepxMKwr6Ecn9B CzqhCvvhE01D2yTlQZO8v6eL4Bufcq210KklAgHQLpmCNzJmwZl+SONSVRKbAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702024323; a=rsa-sha256; cv=none; b=OqbwWOGLD/G5Z9NDv0pyCFd+jUuQPYzdd8a7hbDGRbNHM3NmTelbDPwYlyhd0nk7r4sXgn tJlbedTdfV4BLnBspfdAdGxwQ+gkr8Mcb6gGVV/WbSoqG+Tc6ela22Go0VbMrhkydFgDPv IWlst+rJezrP1dRRMoaE7/mHjktrcOeqMbj9laSZr70LOaVEP0utYJSRD8bvfhYb9A4QBN BNXE7H1IAX8dfwrhYNhkzvVGTJdO7MUN8DgpZVsjbgKYawqLKxrd7ulOuti+PVcKZIfq5K XAMmaD+GaCL9xkJcJpC1oBsUdiqFSVKMBr/Zq3AwhwLCMeevsh1YwEnHKvni6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702024323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bw9QJctzeHJ8XZe3O21ZdQYC3ceYt/wVxSm7Ago53HM=; b=w7/vrhjpqRoMZWfaA0pT6+rRxE7yT1UiBPMxKLboL6fvIJroBAn1ARKEdIlKVFryHzLb8A whM/zFqSPiyDUZp0N9u2NQVDrJymXQ24dGBlE72jLGQt8HrxoenDH0tjvf9mDhLqMmWXEg yRrUzHP5X2wPLyPneNP2QomT0KDP66kylPo2zmcEQUQXk4Khm+ZFz4GJSjRS4ep21nHm8F N6EbkazSX9VkxfNfpTxJ5Jdldc+BxVi0kuqpQpKnXb1ghkvX586NHc7vZ2lXn/VIOHyhu4 xgXDsKFlmMk2V7qIRYh9EkHZrHH2E2/okHqueDxgCeOybrnFoO6CpGgU5LCqWA== 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 4Smkrz2L7Gz1Ckj; Fri, 8 Dec 2023 08:32:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B88W3Vn062616; Fri, 8 Dec 2023 08:32:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B88W3cf062615; Fri, 8 Dec 2023 08:32:03 GMT (envelope-from git) Date: Fri, 8 Dec 2023 08:32:03 GMT Message-Id: <202312080832.3B88W3cf062615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: a03ebd9beec6..450f2d0b08e7 - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 450f2d0b08e73cfb057d0e301a813418b70d64b9 X-Git-Oldrev: a03ebd9beec6243682557fa692c12b1061fc58bd X-Git-Newrev: 450f2d0b08e73cfb057d0e301a813418b70d64b9 Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=a03ebd9beec6..450f2d0b08e7 735ba3a7b7b5 Use uint64_t instead of u_int64_t 3e4bef52b084 Only provide execvpe(3) when needed adcea23cb0d1 ZIO: Add overflow checks for linear buffers bcd83ccd2516 ZIL: Remove TX_CLONE_RANGE replay for ZVOLs. 014265f4e6fa Add Ntfy notification support to ZED 55b764e062b1 ZIL: Do not clone blocks from the future c7b6119268b8 Allow block cloning across encrypted datasets 5f2700eee542 zpool: flush output before sleeping 727497ccdfcc module/icp/asm-arm/sha2: enable non-SIMD asm kernels on armv5/6 687e4d7f9cad Extend import_progress kstat with a notes field 86239a5b9c54 compact: workaround for GPL-only symbols on riscv from Linux 6.2 f9765b182eae zdb: Dump encrypted write and clone ZIL records 2aa3a482abe3 ZIL: Remove 128K into 2x68K LWB split optimization 9743d09635c7 BRT: Limit brt_vdev_dump() to only one vdev 11656234b560 FreeBSD: Ensure that zfs_getattr() initializes the va_rdev field 4836d293c050 zfs_refcount_remove: explictly ignore returns f0cb6482e1fe setproctitle: fix ununitialised variable 450f2d0b08e7 import: ignore return on hostid lookups From nobody Fri Dec 8 08:34:36 2023 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 4Smkw25PW5z53blS; Fri, 8 Dec 2023 08:34:42 +0000 (UTC) (envelope-from philip@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smkw24Zwrz3Vyn; Fri, 8 Dec 2023 08:34:42 +0000 (UTC) (envelope-from philip@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702024482; 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=/dp6KtEgC/9miU3XVDFXJASPXJsSIM1jSbeS2hI+yeE=; b=qrcyM0n8+bRekyo08b9gzo+9vrxSNtlN8v+BPBSWwX+WlCegPjnal7MbCqShJHMG4532Ed dTg9J4e6nf0Wed8SW9+fBZT+VipIlZmbmMJ9Xj1ty4SfBk+1jheDaUldmSNUMzDBCD5rHj xrUblMcWcQKNXmWGNgUHgcy2HnH2YEhRFtxVBwZD3rYw07RnrSubzawKMBcoLyPvywl53g IESVGVutcoqyhLaxJHIg2ENxjwU8eCJmgBBdNrSern8QANO+whsrZIcp1QRQzDh6NN+FHJ ysTvCNcmnprPcafwrSVooNAcjx7UlPvEeyMvnX0H39VNSxn9NLD8s0IbEQ1rbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702024482; a=rsa-sha256; cv=none; b=gd6YDHIX27olmZRqGB6+2ISy5dKZ79oPRaCyIanXHB3PmKJuuVL9VUw146jpPWAsgF1QL5 jpY3q8Nkr7bK5uRcZ9xuFnGzHY0/2HKgrg7YLK9rriVoaolS/ghPHJVoTfBDd1RSi83gJh u6MIpZ7+gUVFlMkOvgm+A8Rvdcu5G57iMRQo4rYLpRcYODJHnc15Xo9SvJRh4g6Iq4ZY47 ulUg8jPTQcvZpTfBSJFjqG+YXYOEo9dZsnn7z9nWgZT7/9+6d0rifY/0cXIhxdHqY918r0 6MJ2DR3XB/qqUd8iUDpEThBUAIBbfcCiTNvd0DE/qwRHAdo2+jLZvoG8ZMl21w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702024482; 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=/dp6KtEgC/9miU3XVDFXJASPXJsSIM1jSbeS2hI+yeE=; b=JGWkbdlQsrIhxuaw+C5M3axYQ3H9FjCxi2Jnl+ztFIACcgxjxexw+ftgH6Oyy3ItJ73qtB Yhl9SzNp2LkQNj+wCuPH+PNuIbIGH/LEMDSqyoapIkbTTLq3bFzckHcgWf7J3RTgBzQ616 RAOuPr3Nm9gfCy3xwaZfminW5Toi23qRoHUuIcJj8+u/W5CfbAntfmWWN9ctjRGf9uGxv9 QOp+iXNQTNOs4YxmU8sjftkD7ce9zVd4DVIwse5ADOnimEbQG/1XQqtz1LvBD/DuwxdhcU 6Rv7adGyjUQa1scudv2J9vZ/Ji9sWqJa2W7jKwUIQJFuRPHCZHs6eGMWAa+D4w== Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (using TLSv1.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: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Smkw23LWCz11Dp; Fri, 8 Dec 2023 08:34:42 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailauth.nyi.internal (Postfix) with ESMTP id 51BD327C0054; Fri, 8 Dec 2023 03:34:42 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 08 Dec 2023 03:34:42 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudekhedgieejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffoffkjghfgggtsehttd hmtdertddtnecuhfhrohhmpefrhhhilhhiphcurfgrvghpshcuoehphhhilhhiphesfhhr vggvsghsugdrohhrgheqnecuggftrfgrthhtvghrnhepteehieeigeeuueeigfdtjefgud ekieehueduiedvjeehgfettefhtdegkeehjeeknecuffhomhgrihhnpehgnhhurdhorhhg pdhfrhgvvggsshgurdhorhhgpdhivghtfhdrohhrghdpihgrnhgrrdhorhhgnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpodhm vghsmhhtphgruhhthhhpvghrshhonhgrlhhithihqdduudeiiedviedvgeekqddvfeehud ektddtkedqphhhihhlihhppeepfhhrvggvsghsugdrohhrghesthhrohhusghlvgdrihhs X-ME-Proxy: Feedback-ID: ia691475d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 8 Dec 2023 03:34:39 -0500 (EST) From: Philip Paeps To: d@delphij.net Cc: Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources Date: Fri, 08 Dec 2023 16:34:36 +0800 X-Mailer: MailMate (1.14r6005) Message-ID: In-Reply-To: References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> <20231207222716.obSthG6r@steffen%sdaoden.eu> <20231208010731.3hijmSTL@steffen%sdaoden.eu> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; format=flowed On 2023-12-08 13:33:08 (+0800), Xin Li wrote: > On 2023-12-07 17:07, Steffen Nurpmeso wrote: >> Warner Losh wrote in > [...] >> |>|The bundled version was from NIST ftp, but fetching from ftp for >> every >> |>|FreeBSD system out there was too scary for me. >> |>| >> |>|There may be some security / privacy concerns if we direct users >> to a >> |>|place that we do not have control, by the way. >> |> >> |> Interesting aspect! >> | >> |There might be, but this sounds somewhat speculative. What's the >> anticip\ >> |ated >> |concerns? >> >> Maybe Xin Li has stumbled over the same thread as i after that >> publicsuffix CVE of cURL (first sentence of the quoted message): >> >> https://lists.gnu.org/archive/html/bug-wget/2014-03/msg00113.html >> >> What i mean is, the FreeBSD project and its pkg database, isn't >> this a natural place for such a thing? With guaranteed / >> controlled availability. > > It could be me being too paranoid, just my $0.02 -- > > Fetching the file would make a http request with "libfetch/2.0", and > the server knows the IP address, etc., if they log it somewhere. > > On the other hand, by fetching the file, it means that the periodic > script detected that the local leap-seconds file is outdated and NTP > leap-seconds file is also outdated. > > If we deliver leap-seconds using freebsd-update, this could mean the > user is running something old; with my recent change it means they are > running ntpd, which could be too much of information. > > Another concern is that it's somewhat vague if the URL would stay > valid. Should they move (it happened to us for the NIST file, for > example, that gets moved to a different host), it would be both a loss > of functionality (file can't be updated) and a leak of information > (running an older version of configuration). > > These may be not really a high impact security concern, but some users > may be not very happy with this. If we are hosting it at e.g. > www.freebsd.org, then we can make sure that the URL is always valid > and we have control of logging (e.g. we could exclude certain paths > from getting logged). That was my reasoning for putting it on download.freebsd.org (or creating a data.freebsd.org). I think the bikeshed is pretty liberally coated in paint by now. - The previous implementation hardcoded a single URL: ietf.org - My commit replaced it with another URL: iana.org The only difference between the two URLs is that the previous one returns 404, while the new one is live. Additionally, the new one has a chance of being updated before it expires. Note that there is no polling here. See src/libexec/rc/rc.d/ntpd. When ntpd starts (i.e. when the system boots or the user runs "service ntpd fetch" or similar), the system's best guess at the current time is compared to the expiry date of the file on the filesystem. If we're within the window before expiry or the file has expired, we attempt a fetch. I don't think there's much risk of every FreeBSD system in the world starting at the same time. Nevertheless, I don't like the idea of pointing every FreeBSD installation at a URL that isn't ours. It's bad manners. And we're victims of others doing that to us: a non-trivial fraction of traffic to www.FreeBSD.org is htpdate/1.0. It will never go away. While it feels like over-engineering to put this on our infrastructure, it's the polite thing to do. I can set up a well-behaved cronjob on our infrastructure to poll the authoritative source. I also have interesting opinions and trivia to share about leap seconds, but I don't think they're relevant to this particular discussion. The only problem I want to solve today is the ugly 404 from "service ntpd fetch". Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From nobody Fri Dec 8 09:13:57 2023 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 4SmlnL2TZsz53fhl; Fri, 8 Dec 2023 09:13: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmlnL2Fcgz3Yny; Fri, 8 Dec 2023 09:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702026838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u6pqN0RT8BadagIjU7UyKEVFH2zTZnGf4Q3ZSsO0RTA=; b=J7YeTB/IVP+JT5u5j8ElXr5Orv7hHvt45Gn9mhfQq91S10N9Z1/KNrO1YCqzJqHtd5y42i cbe2zL8lLZdFCh7zJf1KXE7LBihgOdy5RmzdG3EGDHyn02VJzVKm/oKanF+rn8oNLtiyJr JA6dlYbTapy7+XVzGZ6sgJHI1GrzUYpsOpwMNNH4V1Ez+NkREj+hzM92b8MPOLcVmC2a7n Asm6Nozf7PnhkQv2CoiCfRbRuzl7brPbbOApgHrsvf2vdYS8JRUtLw6ToWL51397xquzr4 XU3ck4TEHgvsvZMb5SvcmTNStLqtbUcixXxoV2AUu2iZX6+GdVEpVw+8M9R5tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702026838; a=rsa-sha256; cv=none; b=yNxLUZH53R2w8wiBBFwpVcxh0gJrLNq4+YwKHwHwBs28B1rd7+DDq7ysda1ighepz6MR5a 9lSLBqIvtLvU9Bqv0VPUDh+DbbWFWzN9EXaSSArqlAEwkolLCdO+qolbEORf9x9UesMAFv Ce0IFlU4vKN5b2Uy7xZFnuKM+ThFnyNrXnfFe0PfZ7TLAk5P7CM6h18mClbdxcPDZUG0tC hI63Om8MrHEOIG/lrMcAdfihci5Rt1KGHsPCcI59QrPgISwXSORuYJuDXiTNeQTRLXwcuD qFQVvLAochuDCha95aZRlmF/8L4rFPxae63fUqKoCT+EhaT5VxkxsHksWo9CJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702026838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u6pqN0RT8BadagIjU7UyKEVFH2zTZnGf4Q3ZSsO0RTA=; b=Hvw7/FqYObt6JJV0/qYjVKkAO3iKM+QBdzPnZnQh7xeePIFeyWx9ElEbxwgIdZ2jO0RAFN e8Xy4XMwhv8zO98Y3NscMWt5u6SzXEGjH/zg1EHQo4jwhL6RPMOsZat1I7zzcgEpCFMS2Q 77XxYFIsAeW6+BIIbF3CXxvR5uYbt8rLepQ/roYpbFpgfDiW5OZXZ8jxhj9YCisBro5Z4h DUy9rJ/4OVgIwScfpF+pLLvGrKnzNfJWolUZbE7/KIVrOuIcfwb+YwBPh1bliMhJ36AIUa aURPtMWvq1gsHxsBuGP4suXO3BmTzsLZ4FYb+n4B2FbKtuLB3gk+dh6KS7Ou0Q== 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 4SmlnL1HlMz14k; Fri, 8 Dec 2023 09:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B89DwSx030329; Fri, 8 Dec 2023 09:13:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B89DvpO030325; Fri, 8 Dec 2023 09:13:57 GMT (envelope-from git) Date: Fri, 8 Dec 2023 09:13:57 GMT Message-Id: <202312080913.3B89DvpO030325@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: 3494f7c019fc - main - Notable upstream pull request merges: #15539 687e4d7f9 Extend import_progress kstat with a notes field #15544 c7b611926 Allow block cloning across encrypted datasets #15553 adcea23cb ZIO: Add overflow checks for linear buffers #15593 5f2700eee zpool: flush output before sleeping #15609 3e4bef52b Only provide execvpe(3) when needed #15610 735ba3a7b Use uint64_t instead of u_int64_t #15612 bcd83ccd2 ZIL: Remove TX_CLONE_RANGE replay for ZVOLs #15617 55b764e06 ZIL: Do not clone blocks from the future #15623 727497ccd module/icp/asm-arm/sha2: enable non-SIMD asm kernels on armv5/6 #15625 9743d0963 BRT: Limit brt_vdev_dump() to only one vdev #15629 f9765b182 zdb: Dump encrypted write and clone ZIL records #15634 2aa3a482a ZIL: Remove 128K into 2x68K LWB split optimization #15639 11656234b FreeBSD: Ensure that zfs_getattr() initializes the va_rdev field #15647 4836d293c zfs_refcount_remove: explictly ignore returns #15649 f0cb6482e setproctitle: fix ununitialised variable #15650 450f2d0b0 import: ignore return on hostid lookups List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3494f7c019fc6558a99f63b7f647373b89bcde92 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3494f7c019fc6558a99f63b7f647373b89bcde92 commit 3494f7c019fc6558a99f63b7f647373b89bcde92 Merge: 1f36ca5de596 450f2d0b08e7 Author: Martin Matuska AuthorDate: 2023-12-08 08:32:30 +0000 Commit: Martin Matuska CommitDate: 2023-12-08 09:13:33 +0000 Notable upstream pull request merges: #15539 687e4d7f9 Extend import_progress kstat with a notes field #15544 c7b611926 Allow block cloning across encrypted datasets #15553 adcea23cb ZIO: Add overflow checks for linear buffers #15593 5f2700eee zpool: flush output before sleeping #15609 3e4bef52b Only provide execvpe(3) when needed #15610 735ba3a7b Use uint64_t instead of u_int64_t #15612 bcd83ccd2 ZIL: Remove TX_CLONE_RANGE replay for ZVOLs #15617 55b764e06 ZIL: Do not clone blocks from the future #15623 727497ccd module/icp/asm-arm/sha2: enable non-SIMD asm kernels on armv5/6 #15625 9743d0963 BRT: Limit brt_vdev_dump() to only one vdev #15629 f9765b182 zdb: Dump encrypted write and clone ZIL records #15634 2aa3a482a ZIL: Remove 128K into 2x68K LWB split optimization #15639 11656234b FreeBSD: Ensure that zfs_getattr() initializes the va_rdev field #15647 4836d293c zfs_refcount_remove: explictly ignore returns #15649 f0cb6482e setproctitle: fix ununitialised variable #15650 450f2d0b0 import: ignore return on hostid lookups Obtained from: OpenZFS OpenZFS commit: 450f2d0b08e73cfb057d0e301a813418b70d64b9 sys/contrib/openzfs/cmd/zdb/zdb_il.c | 60 +++++++- sys/contrib/openzfs/cmd/zed/zed.d/zed-functions.sh | 98 ++++++++++++ sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 22 +++ sys/contrib/openzfs/cmd/zpool/zpool_main.c | 14 +- .../openzfs/config/kernel-flush_dcache_page.m4 | 5 +- sys/contrib/openzfs/config/kernel.m4 | 6 + sys/contrib/openzfs/config/user.m4 | 2 +- .../openzfs/include/os/freebsd/spl/sys/time.h | 4 +- .../include/os/linux/kernel/linux/dcache_compat.h | 15 +- sys/contrib/openzfs/include/sys/dsl_crypt.h | 1 + sys/contrib/openzfs/include/sys/spa.h | 4 + sys/contrib/openzfs/lib/libspl/include/assert.h | 3 + .../lib/libspl/include/os/freebsd/sys/param.h | 2 + sys/contrib/openzfs/lib/libspl/include/sys/time.h | 2 +- .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 4 +- .../lib/libzutil/os/linux/zutil_setproctitle.c | 2 +- sys/contrib/openzfs/man/man7/zpool-features.7 | 9 +- .../openzfs/module/icp/algs/sha2/sha256_impl.c | 22 +-- .../openzfs/module/icp/algs/sha2/sha512_impl.c | 19 +-- .../openzfs/module/icp/asm-arm/sha2/sha256-armv7.S | 8 +- .../openzfs/module/icp/asm-arm/sha2/sha512-armv7.S | 4 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 + sys/contrib/openzfs/module/zfs/arc.c | 12 +- sys/contrib/openzfs/module/zfs/brt.c | 86 +++++------ sys/contrib/openzfs/module/zfs/dmu.c | 15 ++ sys/contrib/openzfs/module/zfs/dsl_crypt.c | 34 +++++ sys/contrib/openzfs/module/zfs/spa.c | 41 ++++- sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 12 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 74 ++++++++- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 25 ++- sys/contrib/openzfs/module/zfs/zil.c | 40 +++-- sys/contrib/openzfs/module/zfs/zio.c | 57 ++++++- sys/contrib/openzfs/module/zfs/zvol.c | 60 +------- sys/contrib/openzfs/tests/runfiles/common.run | 3 +- sys/contrib/openzfs/tests/runfiles/linux.run | 1 + .../openzfs/tests/test-runner/bin/zts-report.py.in | 2 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + .../functional/block_cloning/block_cloning.kshlib | 12 +- .../block_cloning_cross_enc_dataset.ksh | 170 +++++++++++++++++++++ .../cli_root/zpool_import/zpool_import_status.ksh | 132 ++++++++++++++++ sys/modules/zfs/zfs_config.h | 7 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 42 files changed, 885 insertions(+), 209 deletions(-) diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_cross_enc_dataset.ksh index 000000000000,fe8f0867b909..fe8f0867b909 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_cross_enc_dataset.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_cross_enc_dataset.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_status.ksh index 000000000000,c96961bf6419..c96961bf6419 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_status.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_status.ksh diff --cc sys/modules/zfs/zfs_config.h index 24fb572f00b0,000000000000..03314cf89e35 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1149 -1,0 +1,1152 @@@ +/* + */ + +/* 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 */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* 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 + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* 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 */ + +/* 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->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* 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() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* 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_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 is available */ +/* #undef HAVE_BLK_MQ */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* 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 CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* 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 */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* 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 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + ++/* Define to 1 if you have the `execvpe' function. */ ++/* #undef HAVE_EXECVPE */ ++ +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* 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() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* 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 */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* 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 */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* 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_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* 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->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* 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 */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* 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 [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* 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 */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the `mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* 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 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* 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_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename2() exists */ +/* #undef HAVE_RENAME2 */ + +/* struct inode_operations_wrapper takes .rename2() */ +/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* 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() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* 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 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* struct shrink_control exists */ +/* #undef HAVE_SHRINK_CONTROL_STRUCT */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* signal_stop() exists */ +/* #undef HAVE_SIGNAL_STOP */ + +/* new shrinker callback wants 2 args */ +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */ + +/* cs->count_objects exists */ +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */ + +#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 */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* 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 */ + +/* super_setup_bdi_name() exits */ +/* #undef HAVE_SUPER_SETUP_BDI_NAME */ + +/* super_block->s_user_ns exists */ +/* #undef HAVE_SUPER_USER_NS */ + +/* 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 + +/* i_op->tmpfile() exists */ +/* #undef HAVE_TMPFILE */ + +/* 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 */ *** 285 LINES SKIPPED *** From nobody Fri Dec 8 14:24:03 2023 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 4Smtg729tPz543Hv; Fri, 8 Dec 2023 14:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smtg71g6rz4Zxw; Fri, 8 Dec 2023 14:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702045443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GMx0yc3RVcP1VexlXsaedkulqX/9CNVwz/zccJICK54=; b=MiXajxLbZFvoEGuKIHvOYwzn2kPesRwSubYMNv6GJ/1/ZmEuQh1e+iODqyxVuhRQcypPG0 FiR0ztdhH5W+MJ0GexlJ1IMpTmkWh4kccioqKguQ8NxNKh5trnqQ/fmrUErNESkBSGiVFw cLaKCxRF7HgoaarUgdcB6IvuP1Q+/uGy2rCG/nmWUtewDqjhnm/HOHFG6wl0FdSGkYto/Y MNVTG6CNPHsZqxlxuaWH5vJTOHy3SH3TyTCLvInd9DAXfidcI4qar8LtYzwTga9ZTXqMms utjdggNtAw7iI1IE46/HQ8QY29faqj+2S/Pf9durQfVdFkTJx2KYHODZ2ktU4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702045443; a=rsa-sha256; cv=none; b=JHAp5C3MZ9gd+CkdAMI4WSdZ47KMrcQYQF8ghTo/178cpfdElLgtU2Ikfm27PuJhKljq9d 6trHmBZQ4apTTAOOpxwC2Ki11/B8/jWKJx1dt72VcZ7NAfF8g4aZlT90kiBY59Gbg2N0Z/ yT1OfXLiPx7XZvH+gm6yhoUZlkZfs62fOw78+JbV3qPEjOUQgi7ox/zf43bcYGsLQ6PnLR +DkWGgdq2XDdaVYl0q8KBoIFBxACX12lsy03lsVfhyrM3Ptc+JcsiYv/TPYCnNWJ4H0Ztk bG280QltspqetT5OMHdEdhtqowfhmtvpArWO76BckDbQXkMCng9mKnOvxCw1bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702045443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GMx0yc3RVcP1VexlXsaedkulqX/9CNVwz/zccJICK54=; b=BwzF3vo58pwubEWeq/2uzSLHfdqVg3tHJo2FaWahpwwXLDXlqQfoOWezUGdwt5dCiPEbSx wwblHbzb99qRi7SvrK/ZhJsE92ZxWQeUWefNUy1ZDLmDymPKQ36o6y/NyO16R+dsM7M9+h OiOP2uftkaJJU+w3jVKdO8Ljvwia8FYTy45eDPVZ01HJuMprj68zn9WG+qm2cnn4fMdoZL vh9yxrOO2c6lj32DH7iwK/osSuWcplmFY3aXovqVRvdZnSBkp4HOJ6f7Y0VPkCfJJDHzE1 Fm7BS3Vnd06wlE4oq4HdGlLNh53vKxOXcHa9TFF4ZDteOi5drEfm0G+d2Cr83g== 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 4Smtg70kBpz8lq; Fri, 8 Dec 2023 14:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8EO3FM049143; Fri, 8 Dec 2023 14:24:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8EO3xS049140; Fri, 8 Dec 2023 14:24:03 GMT (envelope-from git) Date: Fri, 8 Dec 2023 14:24:03 GMT Message-Id: <202312081424.3B8EO3xS049140@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4161f141aa79 - stable/14 - arm64: Add register definitions for MDCR_EL2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4161f141aa798a90da77daacf7c5425a2b99f9b8 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4161f141aa798a90da77daacf7c5425a2b99f9b8 commit 4161f141aa798a90da77daacf7c5425a2b99f9b8 Author: Mark Johnston AuthorDate: 2023-12-01 18:28:58 +0000 Commit: Mark Johnston CommitDate: 2023-12-08 14:23:52 +0000 arm64: Add register definitions for MDCR_EL2 This is needed to support the bhyve gdb stub implementation on arm64. Reviewed by: andrew MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D42867 (cherry picked from commit 4f12883c360dbb03562f11713e711e3a3a330a0f) --- sys/arm64/include/hypervisor.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 109169601c83..589d6e9cbdbe 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -232,4 +232,22 @@ /* Assumed to be 0 by locore.S */ #define VTTBR_HOST 0x0000000000000000 +/* MDCR_EL2 - Hyp Debug Control Register */ +#define MDCR_EL2_HPMN_MASK 0x1f +#define MDCR_EL2_HPMN_SHIFT 0 +#define MDCR_EL2_TPMCR_SHIFT 5 +#define MDCR_EL2_TPMCR (0x1UL << MDCR_EL2_TPMCR_SHIFT) +#define MDCR_EL2_TPM_SHIFT 6 +#define MDCR_EL2_TPM (0x1UL << MDCR_EL2_TPM_SHIFT) +#define MDCR_EL2_HPME_SHIFT 7 +#define MDCR_EL2_HPME (0x1UL << MDCR_EL2_HPME_SHIFT) +#define MDCR_EL2_TDE_SHIFT 8 +#define MDCR_EL2_TDE (0x1UL << MDCR_EL2_TDE_SHIFT) +#define MDCR_EL2_TDA_SHIFT 9 +#define MDCR_EL2_TDA (0x1UL << MDCR_EL2_TDA_SHIFT) +#define MDCR_EL2_TDOSA_SHIFT 10 +#define MDCR_EL2_TDOSA (0x1UL << MDCR_EL2_TDOSA_SHIFT) +#define MDCR_EL2_TDRA_SHIFT 11 +#define MDCR_EL2_TDRA (0x1UL << MDCR_EL2_TDRA_SHIFT) + #endif /* !_MACHINE_HYPERVISOR_H_ */ From nobody Fri Dec 8 15:23:09 2023 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 4Smw0j5bkXz52ssl; Fri, 8 Dec 2023 15:24:21 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Received: from mailgate.Leidinger.net (bastille.leidinger.net [89.238.82.207]) (using TLSv1.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 (P-256) client-digest SHA256) (Client CN "mailgate.leidinger.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smw0j2q90z4g7x; Fri, 8 Dec 2023 15:24:21 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Authentication-Results: mx1.freebsd.org; none List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leidinger.net; s=outgoing-alex; t=1702049045; 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=C8LjSRQF+PTZXu9Dg0/SEtdPTF00ntDUkZlU7kQi2Ys=; b=ta0Wh2h2bva3cBg4U0x5C3CglocJkh+v8VZh348ElZIv7CMZsEeHw0LWr2JgkO997yH/ai Qk12Pdty8iL37GcRZZygytVPTRbKC+ayOn4qNuzbg5l1IDkiM2ia14pzLMcxkOP/o0xIu0 EW22wxQUb6RJ1NPtMbOPL1qc0bAoP3dBQahDjV560s4xCqgrs1yMJ/tdm2V7hGpJ1dvq5t QP3kMv09VYPvGsTuR0HKApGkJENN+WOSRGERj3MMsAofN9uYY+HAaLoKJHbDAXrTPofcku 4QJgW3v2N+y3Ok3sxDgyNkVRRLE2dnAh237fcZsAt/zo8IKrGn8xrflsUAkFuA== Date: Fri, 08 Dec 2023 16:23:09 +0100 From: Alexander Leidinger To: Warner Losh Cc: Xin Li , Philip Paeps , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources In-Reply-To: References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> <20231207222716.obSthG6r@steffen%sdaoden.eu> <20231208010731.3hijmSTL@steffen%sdaoden.eu> Message-ID: <8cd8ef9a5a55deb56849318896acc711@Leidinger.net> Organization: No organization, this is a private message. Content-Type: multipart/signed; protocol="application/pgp-signature"; boundary="=_94ba23622ac2fcea1eee5064a258bc5b"; micalg=pgp-sha256 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:34240, ipnet:89.238.64.0/18, country:DE] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Smw0j2q90z4g7x This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --=_94ba23622ac2fcea1eee5064a258bc5b Content-Type: multipart/alternative; boundary="=_0dbf177338c9cec8fba12e81a5ac9af6" --=_0dbf177338c9cec8fba12e81a5ac9af6 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8; format=flowed Am 2023-12-08 06:10, schrieb Warner Losh: > On Thu, Dec 7, 2023 at 6:07 PM Steffen Nurpmeso > wrote: > >> What i mean is, the FreeBSD project and its pkg database, isn't >> this a natural place for such a thing? With guaranteed / >> controlled availability. > > The ntp leap stuff does pre-date the pkg by a decade. Having a package > for it might be a natural evolution, Quick and dirty: ---snip--- PORTNAME= leapsecondfile DISTVERSION= 20230328 CATEGORIES= sysutils MASTER_SITES= https://data.iana.org/time-zones/tzdb/ DISTFILES= leap-seconds.list MAINTAINER= security-officer@FreeBSD.org COMMENT= Time Zone Database leap seconds file WWW= https://data.iana.org/time-zones/tzdb LICENSE= PD PLIST_FILES= etc/leap-seconds.list NO_ARCH= yes NO_BUILD= yes NO_EXTRACT= yes EXTRACT_CMD= cp EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS=${WRKDIR}/ do-install: ${INSTALL_DATA} ${WRKDIR}/leap-seconds.list ${STAGEDIR}/${PREFIX}/etc/leap-seconds.list .include ---snip--- make makesum echo "NTP leap seconds file" > pkg-descr Bye, Alexander. -- http://www.Leidinger.net Alexander@Leidinger.net: PGP 0x8F31830F9F2772BF http://www.FreeBSD.org netchild@FreeBSD.org : PGP 0x8F31830F9F2772BF --=_0dbf177338c9cec8fba12e81a5ac9af6 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=UTF-8

Am 2023-12-08 06:10, schrieb Warner Losh:

 

On Thu, Dec 7, 2023 at 6:07=E2=80= =AFPM Steffen Nurpmeso <steffen@sdaoden.eu> wrote:
What i mean is, the FreeBS= D project and its pkg database, isn't
this a natural place for such a = thing?  With guaranteed /
controlled availability.
 
The ntp leap stuff does pre-date the pkg by a decade. Having a package
for it might be a natural evolution,
 

Quick and dirty:

---snip---

PORTNAME=3D  = ;     leapsecondfile
DISTVERSION=3D    20230328
CATEGORIES=3D   &n= bsp; sysutils
MASTER_SITES=3D   https://data.iana.org/time-zones/tzdb/<= br />DISTFILES=3D &n= bsp;    leap-seconds.list
 
MAINTAINER=3D     security-officer@Fre= eBSD.org
COMMENT=3D        Time Zone Database leap seconds file=
WWW=3D =            https://data.iana.org/time-zones/t= zdb
&nbs= p;
LICEN= SE=3D        PD
 
PLIST_FILES=3D    etc/leap-seconds.lis= t
 =
NO_ARCH= =3D        yes
NO_BUILD=3D       yes
NO_EXTRACT=3D  = ;   yes
EXTRACT_CMD=3D    cp
EXTRACT_BEFORE_ARGS=3D
EXTRACT_AFTER_ARGS=3D${WRKDIR}/=
 <= /span>
do-insta= ll:
&nbs= p;       ${INSTALL_DATA} ${WRKDIR}/leap-seconds.list ${STAGE= DIR}/${PREFIX}/etc/leap-seconds.list
 
.include <bsd.port.mk>

---snip---

make makesum

echo "NTP leap seconds file" > pkg-descr

Bye,
Alexander.


--
--=_0dbf177338c9cec8fba12e81a5ac9af6-- --=_94ba23622ac2fcea1eee5064a258bc5b Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc; size=833 Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEER9UlYXp1PSd08nWXEg2wmwP42IYFAmVzNO4ACgkQEg2wmwP4 2IbFMg/9EjXNWsdAfG4lXLgKKxdvV93Cn3987JiPtxXZ9/V9DJJOSMPiuTRiwfy1 s4HxXs+GXZGCr5FdWvXcSOExYZU4v19UDU+xm7S9PAjXFd4yjYmI6o+Dzgngr312 /E2AyqtqtA/q1+6XwO1saj3MQHYr49JmoTSdgGxppuhZBMYyysLuqOe8WJhm4HWA WxOgQevBqUq+hQtKFVMBrsbxLzJczXZArBPNXSulgPmwZjRPp7jTxOpiPwkPpMML xi0Xs2TFrv1zQWD5IsTdrQZ9ZI+LL43HaOaR4Ht+LE4PbJkeDYxA0bbawWsaifun PXifScCOsbjRnzzp6cawJqjfK0kL2OyfbBXa/FLPVlOGdUP9AjPVNQBUJipyiC8y wguxSVvjA6Jlk1gasPO3Vv+XM5ERxoWlVG5wXQHnmnXn4I1/7Mo8oJQ3+8VrQ7HP rJm/b7tU1A9wJgGnPLBLv8xub9rZOJac+E8oNeW0jP+ClS8eHyoeW8QuqVBaqnP+ beszeGIwbgaA2NZKbzExEmSLG/fTZBGXP10JHySMxxAHiDd17E8dqPIOFIXuk2d+ DWDxzk+vIvqjViFHwbBB1d9uWeVHEsBsPeReLtWP1NcbijYU5ZCDwRKue+OHPA2c IuvClVCp5+mXLlX9sfI/OdOu1eVFXT5wZdb6oyKxHjrbZ+hZTks= =M0sl -----END PGP SIGNATURE----- --=_94ba23622ac2fcea1eee5064a258bc5b-- From nobody Fri Dec 8 16:23:01 2023 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 4SmxJP604Hz52ysc; Fri, 8 Dec 2023 16:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmxJP5V3Xz3K9W; Fri, 8 Dec 2023 16:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702052581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vTsxoMLaEA5cAECPxll4KYABueWfqD1pJU+ow7rLzQI=; b=wORzOAc31ht2ZjK9rW6ZyTvAUKQnVj98kgZoVZ8SDPqMz0oMmYDVY3HFun6oeFUxq8iElG 3/RMUTsGBrnwXI42xy8iu4HbgLvyz72dyRSVC6K0raHCeuVyoHoK0pMBKPSaq5nXRDHWkg 5jeujEeEHV7ILbjl6Rp4KQk1cdIkVPAI+GC8YC1tzMVO5mJH+5B4IuLIcm0F6coL7k+4vA u/ojDWTTK2ZCicUn7uUxQSeEJJsw/nb6JSq20Jd+pU4ojXTtXBmR/ho+ySuPRezZBJKB1j jBAPO3Y21wL/e7yCUD5rYT2cLxIJt7sCtrJqnxwyGYwhVaq4olvizgW8xIbieg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702052581; a=rsa-sha256; cv=none; b=SY76xE3b2N0dE7vcH7fVZa5SNRs/U4lmSMAmDudWnHC4J9uwr5NEufcQiY1fIGqMV/hkA5 nYtTS+LPUOoNrF7pTgwWvbHXVZa3qoeT0sap9CxWVexh/P/YQkTwHPHzkwqj4hbEKxa6tN wwOSBP3y1JSXKQ34D3FVFAyYKsBFa7ouXicFSKTvFa/XwuG4QiNVhlXOqy5s+3lQI+l2su S5FoK3mQmLPVxvYSG8G6uspRiQNn1Uw/ftz9Solb3YXbSXe5QhMmlcBdeTkBJOJ6JHAvgl Z/MRzYpLHNVzao6Be9IOaY7coY7Qsl8nsm92BjGXCjWH85KuVtMg084zx1gzYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702052581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vTsxoMLaEA5cAECPxll4KYABueWfqD1pJU+ow7rLzQI=; b=AT5BdPUrXhgvM1NB5Tu563zz/l6kc9/Hy0u5HgiEw6RHgf1DWEGWDXJVW0m38n6jpteaEK lF6Z49khJYROtMfs09WtB+fp0GrlXlIFOZWzfE+n3bFE+S0GGjAiBlH7975pexNN/ytOrw vqDMwdYA35eOoT8kjS+K2SQPPgVodtyw6os/bT5lj+x56QzMZXJtMTMVP0HBRK0tvwqLlo nvYJ3/b7L/Xn/MhYEfFLXmPVFa8WREExAqA+7VfVhWj4bkXqKJ/ihM8508lQ2KZBDvnl1m Ep9EQtzL/W+KKw6Q6JbJYNuhelkwnq8C9L/XfqVKU7qyQfqN9oTo1bFo+WlVUw== 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 4SmxJP4YWpzCg8; Fri, 8 Dec 2023 16:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8GN1We050283; Fri, 8 Dec 2023 16:23:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8GN1tA050280; Fri, 8 Dec 2023 16:23:01 GMT (envelope-from git) Date: Fri, 8 Dec 2023 16:23:01 GMT Message-Id: <202312081623.3B8GN1tA050280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: cf037972ea88 - main - libcasper: document that most libcasper functions are not thread-safe List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf037972ea8863e2bab7461d77345367d2c1e054 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=cf037972ea8863e2bab7461d77345367d2c1e054 commit cf037972ea8863e2bab7461d77345367d2c1e054 Author: Alan Somers AuthorDate: 2023-12-05 23:24:28 +0000 Commit: Alan Somers CommitDate: 2023-12-08 16:22:39 +0000 libcasper: document that most libcasper functions are not thread-safe And neither are most libcasper services' functions, because internally they all use cap_xfer_nvlist. cap_xfer_nvlist sends and then receives data over a unix domain socket and associated with the cap_channel_t argument. So absent synchronization, two threads may not use the same cap_channel_t argument or they risk receiving the other's reply. MFC after: 2 weeks Sponsored by: Axcient Reviewed by: oshogbo Differential Revision: https://reviews.freebsd.org/D42928 --- lib/libcasper/libcasper/libcasper.3 | 18 ++++++++++++++++-- lib/libcasper/services/cap_fileargs/cap_fileargs.3 | 14 +++++++++++++- lib/libcasper/services/cap_grp/cap_grp.3 | 7 ++++++- lib/libcasper/services/cap_net/cap_net.3 | 19 ++++++++++++++----- lib/libcasper/services/cap_netdb/cap_netdb.3 | 6 +++++- lib/libcasper/services/cap_pwd/cap_pwd.3 | 7 ++++++- lib/libcasper/services/cap_sysctl/cap_sysctl.3 | 11 ++++++++++- lib/libcasper/services/cap_syslog/cap_syslog.3 | 7 ++++++- 8 files changed, 76 insertions(+), 13 deletions(-) diff --git a/lib/libcasper/libcasper/libcasper.3 b/lib/libcasper/libcasper/libcasper.3 index ccd347232777..15f231d7e366 100644 --- a/lib/libcasper/libcasper/libcasper.3 +++ b/lib/libcasper/libcasper/libcasper.3 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 6, 2023 +.Dd December 6, 2023 .Dt LIBCASPER 3 .Os .Sh NAME @@ -94,7 +94,6 @@ The .Fn cap_init function instantiates a capability to allow a program to access the casper daemon. -It must be called from a single-threaded context. .Pp The .Fn cap_wrap @@ -235,6 +234,21 @@ provides a .Xr syslog 3 compatible API .El +.Pp +.Fn cap_init +must be called from a single-threaded context. +.Fn cap_clone , +.Fn cap_close , +.Fn cap_limit_get , +.Fn cap_limit_set , +.Fn cap_send_nvlist , +.Fn cap_recv_nvlist , +and +.Fn cap_service_open +are reentrant but not thread-safe. +That is, they may be called from separate threads only with different +.Vt cap_channel_t +arguments or with synchronization. .Sh RETURN VALUES The .Fn cap_clone , diff --git a/lib/libcasper/services/cap_fileargs/cap_fileargs.3 b/lib/libcasper/services/cap_fileargs/cap_fileargs.3 index ef43c26cb3ed..c7ce45c518d1 100644 --- a/lib/libcasper/services/cap_fileargs/cap_fileargs.3 +++ b/lib/libcasper/services/cap_fileargs/cap_fileargs.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 10, 2021 +.Dd December 6, 2023 .Dt CAP_FILEARGS 3 .Os .Sh NAME @@ -169,6 +169,18 @@ The function .Fn fileargs_realpath is equivalent to .Xr realpath 3 . +.Pp +.Fn fileargs_open , +.Fn fileargs_lstat , +.Fn fileargs_realpath , +.Fn fileargs_cinitnv , +.Fn fileargs_initnv , +and +.Fn fileargs_fopen +are reentrant but not thread-safe. +That is, they may be called from separate threads only with different +.Vt cap_channel_t +arguments or with synchronization. .Sh LIMITS This section describe which values and types should be used to pass arguments to the .Fa system.fileargs diff --git a/lib/libcasper/services/cap_grp/cap_grp.3 b/lib/libcasper/services/cap_grp/cap_grp.3 index 7c1bf0320e25..9647b1936b0c 100644 --- a/lib/libcasper/services/cap_grp/cap_grp.3 +++ b/lib/libcasper/services/cap_grp/cap_grp.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 5, 2020 +.Dd December 6, 2023 .Dt CAP_GRP 3 .Os .Sh NAME @@ -152,6 +152,11 @@ The and .Fa ngids variables provide numbers of limited names and gids. +.Pp +All of these functions are reentrant but not thread-safe. +That is, they may be called from separate threads only with different +.Vt cap_channel_t +arguments or with synchronization. .Sh EXAMPLES The following example first opens a capability to casper and then uses this capability to create the diff --git a/lib/libcasper/services/cap_net/cap_net.3 b/lib/libcasper/services/cap_net/cap_net.3 index 534d28c2ef7c..6e525508d3c4 100644 --- a/lib/libcasper/services/cap_net/cap_net.3 +++ b/lib/libcasper/services/cap_net/cap_net.3 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 5, 2023 +.Dd December 6, 2023 .Dt CAP_NET 3 .Os .Sh NAME @@ -84,22 +84,31 @@ The functions .Fn cap_bind , .Fn cap_connect , +.Fn cap_getaddrinfo , +.Fn cap_getnameinfo , .Fn cap_gethostbyname , .Fn cap_gethostbyname2 , -.Fn cap_gethostbyaddr and -.Fn cap_getnameinfo +.Fn cap_gethostbyaddr provide a set of APIs equivalent to .Xr bind 2 , .Xr connect 2 , +.Xr getaddrinfo 3 , +.Xr getnameinfo 3 , .Xr gethostbyname 3 , .Xr gethostbyname2 3 , -.Xr gethostbyaddr 3 and -.Xr getnameinfo 3 +.Xr gethostbyaddr 3 except that a connection to the .Nm system.net service needs to be provided. +.Pp +These functions, as well as +.Fn cap_net_limit , +are reentrant but not thread-safe. +That is, they may be called from separate threads only with different +.Vt cap_channel_t +arguments or with synchronization. .Sh LIMITS By default, the cap_net capability provides unrestricted access to the network namespace. diff --git a/lib/libcasper/services/cap_netdb/cap_netdb.3 b/lib/libcasper/services/cap_netdb/cap_netdb.3 index 1f08ff275067..1f587c2057e7 100644 --- a/lib/libcasper/services/cap_netdb/cap_netdb.3 +++ b/lib/libcasper/services/cap_netdb/cap_netdb.3 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 29, 2022 +.Dd December 6, 2023 .Dt CAP_NETDB 3 .Os .Sh NAME @@ -43,6 +43,10 @@ is equivalent to except that the connection to the .Nm system.netdb service needs to be provided. +It is reentrant but not thread-safe. +That is, it may be called from separate threads only with different +.Vt cap_channel_t +arguments or with synchronization. .Sh EXAMPLES The following example first opens a capability to casper and then uses this capability to create the diff --git a/lib/libcasper/services/cap_pwd/cap_pwd.3 b/lib/libcasper/services/cap_pwd/cap_pwd.3 index 7417d177a678..b66a0cd083ba 100644 --- a/lib/libcasper/services/cap_pwd/cap_pwd.3 +++ b/lib/libcasper/services/cap_pwd/cap_pwd.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 5, 2020 +.Dd December 6, 2023 .Dt CAP_PWD 3 .Os .Sh NAME @@ -158,6 +158,11 @@ The and .Fa nuids variables provide numbers of limited names and uids. +.Pp +All of these functions are reentrant but not thread-safe. +That is, they may be called from separate threads only with different +.Vt cap_channel_t +arguments or with synchronization. .Sh EXAMPLES The following example first opens a capability to casper and then uses this capability to create the diff --git a/lib/libcasper/services/cap_sysctl/cap_sysctl.3 b/lib/libcasper/services/cap_sysctl/cap_sysctl.3 index c007c04aa3b7..2c7a491a1f8b 100644 --- a/lib/libcasper/services/cap_sysctl/cap_sysctl.3 +++ b/lib/libcasper/services/cap_sysctl/cap_sysctl.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 1, 2022 +.Dd December 6, 2023 .Dt CAP_SYSCTL 3 .Os .Sh NAME @@ -64,6 +64,15 @@ except that they are implemented by the service and require a corresponding .Xr libcasper 3 capability. +.Pp +All of these functions, with the exceptions of +.Fn cap_sysctl_limit_init +and +.Fn cap_sysctl_limit_mib , +are reentrant but not thread-safe. +That is, they may be called from separate threads only with different +.Vt cap_channel_t +arguments or with synchronization. .Sh LIMITS By default, the .Nm diff --git a/lib/libcasper/services/cap_syslog/cap_syslog.3 b/lib/libcasper/services/cap_syslog/cap_syslog.3 index 7e5376c5ca89..4d6463ef3f81 100644 --- a/lib/libcasper/services/cap_syslog/cap_syslog.3 +++ b/lib/libcasper/services/cap_syslog/cap_syslog.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 5, 2020 +.Dd December 6, 2023 .Dt CAP_SYSLOG 3 .Os .Sh NAME @@ -63,6 +63,11 @@ are respectively equivalent to except that the connection to the .Nm system.syslog service needs to be provided. +.Pp +All of these functions are reentrant but not thread-safe. +That is, they may be called from separate threads only with different +.Vt cap_channel_t +arguments or with synchronization. .Sh EXAMPLES The following example first opens a capability to casper and then uses this capability to create the From nobody Fri Dec 8 17:31:21 2023 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 4SmyqK02lQz5351m; Fri, 8 Dec 2023 17:31:25 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.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 4SmyqJ4cstz3PxT; Fri, 8 Dec 2023 17:31:24 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id BdEErUMydB0n0Beh9ro77M; Fri, 08 Dec 2023 17:31:23 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id Beh7rixw7nCF0Beh8rJQ5H; Fri, 08 Dec 2023 17:31:23 +0000 X-Authority-Analysis: v=2.4 cv=MPFzJeVl c=1 sm=1 tr=0 ts=657352eb a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=42Nyi_-BZy46IMUx:21 a=nYBQqi4ZBl4A:10 a=kj9zAlcOel0A:10 a=e2cXIFwxEfEA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=4JGVTlQXejZ-PPXJwEwA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 91607BCE; Fri, 8 Dec 2023 09:31:21 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 59D6930; Fri, 8 Dec 2023 09:31:21 -0800 (PST) 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: Martin Matuska cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 3494f7c019fc - main - Notable upstream pull request merges: #15539 687e4d7f9 Extend import_progress kstat with a notes field #15544 c7b611926 Allow block cloning across encrypted datasets #15553 adcea23cb ZIO: Add overflow checks for linear buffers #15593 5f2700eee zpool: flush output before sleeping #15609 3e4bef52b Only provide execvpe(3) when needed #15610 735ba3a7b Use uint64_t instead of u_int64_t #15612 bcd83ccd2 ZIL: Remove TX_CLONE_RANGE replay for ZVOLs #15617 55b764e06 ZIL: Do not clone blocks from the future #15623 727497ccd module/icp/asm-arm/sha2: enable non-SIMD asm kernels on armv5/6 #15625 9743d0963 BRT: Limit brt_vdev_dump() to only one vdev #15629 f9765b182 zdb: Dump encrypted write and clone ZIL records #15634 2aa3a482a ZIL: Remove 128K into 2x68K LWB split optimization #15639 11656234b FreeBSD: Ensure that zfs_getattr() initializes the va_rdev field #15647 4836d293c zfs_refcount_remove: explictly ignore returns #15649 f0cb6482e setproctitle: fix ununitialised variable #15650 450f2d0b0 import: ignore return on hostid lookups In-reply-to: <202312080913.3B89DvpO030325@gitrepo.freebsd.org> References: <202312080913.3B89DvpO030325@gitrepo.freebsd.org> Comments: In-reply-to Martin Matuska message dated "Fri, 08 Dec 2023 09:13:57 +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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 08 Dec 2023 09:31:21 -0800 Message-Id: <20231208173121.59D6930@slippy.cwsent.com> X-CMAE-Envelope: MS4xfJTryEIACac2sVVCcIzJiXDz2E9WnCOUbDsitieq6pNV1n7unNP5j/4EoC7O+htG/79k6BhwxO046nS+siPjUEXox91JFBz7DDy+z2GUViE07Ah6u2sA QBdxTFykkFuw8G2p9dBfDAbMDPCPjw8lXCqYO6Eu6qFBy+9x7mbZ/GBz9IZr69DIQfqWCvU9CxvMVGZJJrWUBO/yWRf435QSeAa0hFmRuCt3pTcwyiPZQw7T aWPLjqWg3LBxt6BCBKoIdM5N8ykGTiM7biNSo1J77VebrewwkWSCIGbbHlKeeAyW23IzhT5EOa2eNuuP6gi2VJWf89R8nm4H+qxrqoe1J24= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SmyqJ4cstz3PxT In message <202312080913.3B89DvpO030325@gitrepo.freebsd.org>, Martin Matuska wr ites: > The branch main has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3494f7c019fc6558a99f63b7f647373b > 89bcde92 > > commit 3494f7c019fc6558a99f63b7f647373b89bcde92 > Merge: 1f36ca5de596 450f2d0b08e7 > Author: Martin Matuska > AuthorDate: 2023-12-08 08:32:30 +0000 > Commit: Martin Matuska > CommitDate: 2023-12-08 09:13:33 +0000 > > Notable upstream pull request merges: > #15539 687e4d7f9 Extend import_progress kstat with a notes field > #15544 c7b611926 Allow block cloning across encrypted datasets > #15553 adcea23cb ZIO: Add overflow checks for linear buffers > #15593 5f2700eee zpool: flush output before sleeping > #15609 3e4bef52b Only provide execvpe(3) when needed > #15610 735ba3a7b Use uint64_t instead of u_int64_t > #15612 bcd83ccd2 ZIL: Remove TX_CLONE_RANGE replay for ZVOLs > #15617 55b764e06 ZIL: Do not clone blocks from the future > #15623 727497ccd module/icp/asm-arm/sha2: enable non-SIMD asm kernels > on armv5/6 > #15625 9743d0963 BRT: Limit brt_vdev_dump() to only one vdev > #15629 f9765b182 zdb: Dump encrypted write and clone ZIL records > #15634 2aa3a482a ZIL: Remove 128K into 2x68K LWB split optimization > #15639 11656234b FreeBSD: Ensure that zfs_getattr() initializes the > va_rdev field > #15647 4836d293c zfs_refcount_remove: explictly ignore returns > #15649 f0cb6482e setproctitle: fix ununitialised variable > #15650 450f2d0b0 import: ignore return on hostid lookups > > Obtained from: OpenZFS > OpenZFS commit: 450f2d0b08e73cfb057d0e301a813418b70d64b9 > > sys/contrib/openzfs/cmd/zdb/zdb_il.c | 60 +++++++- > sys/contrib/openzfs/cmd/zed/zed.d/zed-functions.sh | 98 ++++++++++++ > sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 22 +++ > sys/contrib/openzfs/cmd/zpool/zpool_main.c | 14 +- > .../openzfs/config/kernel-flush_dcache_page.m4 | 5 +- > sys/contrib/openzfs/config/kernel.m4 | 6 + > sys/contrib/openzfs/config/user.m4 | 2 +- > .../openzfs/include/os/freebsd/spl/sys/time.h | 4 +- > .../include/os/linux/kernel/linux/dcache_compat.h | 15 +- > sys/contrib/openzfs/include/sys/dsl_crypt.h | 1 + > sys/contrib/openzfs/include/sys/spa.h | 4 + > sys/contrib/openzfs/lib/libspl/include/assert.h | 3 + > .../lib/libspl/include/os/freebsd/sys/param.h | 2 + > sys/contrib/openzfs/lib/libspl/include/sys/time.h | 2 +- > .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 4 +- > .../lib/libzutil/os/linux/zutil_setproctitle.c | 2 +- > sys/contrib/openzfs/man/man7/zpool-features.7 | 9 +- > .../openzfs/module/icp/algs/sha2/sha256_impl.c | 22 +-- > .../openzfs/module/icp/algs/sha2/sha512_impl.c | 19 +-- > .../openzfs/module/icp/asm-arm/sha2/sha256-armv7.S | 8 +- > .../openzfs/module/icp/asm-arm/sha2/sha512-armv7.S | 4 +- > .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 + > sys/contrib/openzfs/module/zfs/arc.c | 12 +- > sys/contrib/openzfs/module/zfs/brt.c | 86 +++++------ > sys/contrib/openzfs/module/zfs/dmu.c | 15 ++ > sys/contrib/openzfs/module/zfs/dsl_crypt.c | 34 +++++ > sys/contrib/openzfs/module/zfs/spa.c | 41 ++++- > sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 12 +- > sys/contrib/openzfs/module/zfs/spa_misc.c | 74 ++++++++- > sys/contrib/openzfs/module/zfs/zfs_vnops.c | 25 ++- > sys/contrib/openzfs/module/zfs/zil.c | 40 +++-- > sys/contrib/openzfs/module/zfs/zio.c | 57 ++++++- > sys/contrib/openzfs/module/zfs/zvol.c | 60 +------- > sys/contrib/openzfs/tests/runfiles/common.run | 3 +- > sys/contrib/openzfs/tests/runfiles/linux.run | 1 + > .../openzfs/tests/test-runner/bin/zts-report.py.in | 2 + > .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + > .../functional/block_cloning/block_cloning.kshlib | 12 +- > .../block_cloning_cross_enc_dataset.ksh | 170 +++++++++++++++++++ > ++ > .../cli_root/zpool_import/zpool_import_status.ksh | 132 ++++++++++++++++ > sys/modules/zfs/zfs_config.h | 7 +- > sys/modules/zfs/zfs_gitrev.h | 2 +- > 42 files changed, 885 insertions(+), 209 deletions(-) > Hmm. This import of ZFS is a little buggy. My outgoing emails have null characters in them again. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Fri Dec 8 17:38:25 2023 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 4SmyzZ4LBSz5368x; Fri, 8 Dec 2023 17:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmyzZ42dtz3QY7; Fri, 8 Dec 2023 17:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gD46JNOJ27dNFYn9DGaHtRDD6LP0fVlRk6f+X0z+VwI=; b=s7YJXbEpJcCHTgGh7BINbRJ+Ti6UPLTFHzVhy5N2ABY3n6vHuByRygvJsriGzhvyYJObdn 4c2+Bl/htEQgRJWx98Tt6gZtQzlcajGb9r4G4Xo/bSdSGM8HeEkh6dj2ZcHpWFnbaU3+yA ldCJY5wLk6B0/9TsEm7QuoU6QWg8eSmQpeMUWqGmQ3M9oV15FGLvVDXaZE/fOiZF9HujXt RPESPiGqHUglGWqVI/Go7TMwaMVKGNAkIb6oRrF6u8NIwIHkqcLBD9XdDaUU1wx2XMLpga C4Kmm7QN8iEATpQzPVx8ZZvpuEh+AZktRAzAlAZQXF3ycBq5oI0eob4tKzLqAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702057114; a=rsa-sha256; cv=none; b=uce4OeoDfnXakXeEI1UCjer36TR/0y0RiElN3pM0DwLfkg46lveQ1exZb1D6NRIEAnSdCX ySTBoqRoqK0xkuY0Ct0RGHAoEjB6+qH8uB3y7VUs8fb/ZBtoq7yfexQZVBuIrQiIX2CLLC mOisKg7i4onx6gmuCXE414vPSJnwJTtICYm/OPDVYmz81Q3YZ1UQHld0goUo/DgZXuPGV2 qB1HgzIdGFdZgsUqA5GyYqPC2CkGAjJbmRbNHBhl7IFZufOpKFlBN0vTVeBmT3s5va7UBJ 9YlWkg8bcVoDi+MjToOPsNW5LuiJxwj72v8MlSCMHXP0Qvwe+nX3uy3+hk5DhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gD46JNOJ27dNFYn9DGaHtRDD6LP0fVlRk6f+X0z+VwI=; b=yYTrRUm0DTqXvWsI09pgyh/ARvc6mM0GBCPoSzgfEplNrlnuWcdaesy8MlKcj1yFkSk2+D TAYSHfRia4ZFWDHd+vQ16QI2mZLYno89VXHSTYN0Op3lBtjQySVw4qmyDiLNhWcVt1sPe6 uRbIbRXh1R76UAAkHIesbGE7E/ZnywHywoSLadjETYXRqFPZyyhDmsQ7Dkk6NGg0E8NIgj YMahM0aD/5vNlIupJ9uwfT1QOLxmXcU9DFoOc8Trdm7Ard4LBLo0wWzBYG5R6GGjegKlt+ wJtJYG5ogabvZ80xWVC8tsb6Btyqrm0biY0k+c5diMtLIW83EI1JAGUiEkILjg== 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 4SmyzZ34wgzVXy; Fri, 8 Dec 2023 17:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8HcYdD067768; Fri, 8 Dec 2023 17:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8HcP0x067754; Fri, 8 Dec 2023 17:38:25 GMT (envelope-from git) Date: Fri, 8 Dec 2023 17:38:25 GMT Message-Id: <202312081738.3B8HcP0x067754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 06c3fb2749bd - main - Merge llvm-project main llvmorg-17-init-19304-gd0b54bb50e51 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 06c3fb2749bda94cb5201f81ffdb8fa6c3161b2e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=06c3fb2749bda94cb5201f81ffdb8fa6c3161b2e commit 06c3fb2749bda94cb5201f81ffdb8fa6c3161b2e Merge: cf037972ea88 7fa27ce4a07f Author: Dimitry Andric AuthorDate: 2023-09-02 21:17:18 +0000 Commit: Dimitry Andric CommitDate: 2023-12-08 17:34:50 +0000 Merge llvm-project main llvmorg-17-init-19304-gd0b54bb50e51 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-17-init-19304-gd0b54bb50e51, the last commit before the upstream release/17.x branch was created. PR: 273753 MFC after: 1 month Makefile.inc1 | 5 +- ObsoleteFiles.inc | 402 + contrib/llvm-project/FREEBSD-Xlist | 46 +- contrib/llvm-project/clang/include/clang-c/Index.h | 382 +- .../clang/include/clang-c/module.modulemap | 4 - .../llvm-project/clang/include/clang/AST/APValue.h | 6 +- .../clang/include/clang/AST/ASTConsumer.h | 4 +- .../clang/include/clang/AST/ASTContext.h | 45 +- .../clang/include/clang/AST/ASTDiagnostic.h | 3 +- .../clang/include/clang/AST/ASTImporter.h | 1 + .../clang/include/clang/AST/ASTNodeTraverser.h | 13 +- .../clang/include/clang/AST/ASTTypeTraits.h | 9 +- .../clang/include/clang/AST/CXXInheritance.h | 2 +- .../clang/include/clang/AST/CommentSema.h | 2 +- .../clang/include/clang/AST/ComparisonCategories.h | 5 +- .../llvm-project/clang/include/clang/AST/Decl.h | 154 +- .../clang/include/clang/AST/DeclBase.h | 58 +- .../llvm-project/clang/include/clang/AST/DeclCXX.h | 96 +- .../clang/include/clang/AST/DeclObjC.h | 2 +- .../clang/include/clang/AST/DeclTemplate.h | 36 +- .../clang/include/clang/AST/DeclarationName.h | 10 +- .../llvm-project/clang/include/clang/AST/Expr.h | 545 +- .../llvm-project/clang/include/clang/AST/ExprCXX.h | 38 +- .../clang/include/clang/AST/ExprConcepts.h | 6 - .../clang/include/clang/AST/ExternalASTSource.h | 10 +- .../clang/include/clang/AST/IgnoreExpr.h | 8 +- .../llvm-project/clang/include/clang/AST/Mangle.h | 6 +- .../include/clang/AST/MangleNumberingContext.h | 8 + .../clang/include/clang/AST/OpenMPClause.h | 126 + .../clang/include/clang/AST/OperationKinds.def | 8 +- .../clang/include/clang/AST/PrettyPrinter.h | 15 +- .../clang/include/clang/AST/PropertiesBase.td | 58 +- .../clang/include/clang/AST/RawCommentList.h | 13 +- .../clang/include/clang/AST/RecursiveASTVisitor.h | 19 +- .../clang/include/clang/AST/Redeclarable.h | 2 +- .../llvm-project/clang/include/clang/AST/Stmt.h | 51 +- .../llvm-project/clang/include/clang/AST/StmtCXX.h | 31 +- .../clang/include/clang/AST/TemplateBase.h | 54 +- .../clang/include/clang/AST/TemplateName.h | 4 +- .../llvm-project/clang/include/clang/AST/Type.h | 93 +- .../llvm-project/clang/include/clang/AST/TypeLoc.h | 7 +- .../clang/include/clang/AST/TypeProperties.td | 10 +- .../clang/include/clang/AST/UnresolvedSet.h | 12 +- .../clang/include/clang/AST/VTableBuilder.h | 2 - .../clang/include/clang/ASTMatchers/ASTMatchers.h | 106 +- .../clang/ASTMatchers/Dynamic/Diagnostics.h | 6 +- .../clang/Analysis/Analyses/CalledOnceCheck.h | 2 +- .../include/clang/Analysis/Analyses/Consumed.h | 8 +- .../clang/Analysis/Analyses/IntervalPartition.h | 50 + .../clang/Analysis/Analyses/ReachableCode.h | 8 +- .../clang/Analysis/Analyses/ThreadSafetyCommon.h | 2 - .../clang/Analysis/Analyses/ThreadSafetyTIL.h | 9 + .../clang/Analysis/Analyses/ThreadSafetyUtil.h | 4 + .../clang/Analysis/Analyses/UnsafeBufferUsage.h | 27 +- .../Analysis/Analyses/UnsafeBufferUsageGadgets.def | 9 + .../include/clang/Analysis/AnalysisDeclContext.h | 2 +- .../clang/include/clang/Analysis/BodyFarm.h | 3 + .../clang/include/clang/Analysis/CFG.h | 47 - .../clang/include/clang/Analysis/CallGraph.h | 2 +- .../include/clang/Analysis/FlowSensitive/Arena.h | 147 + .../Analysis/FlowSensitive/ControlFlowContext.h | 25 +- .../Analysis/FlowSensitive/DataflowAnalysis.h | 34 +- .../FlowSensitive/DataflowAnalysisContext.h | 232 +- .../Analysis/FlowSensitive/DataflowEnvironment.h | 437 +- .../clang/Analysis/FlowSensitive/DebugSupport.h | 52 - .../include/clang/Analysis/FlowSensitive/Formula.h | 138 + .../include/clang/Analysis/FlowSensitive/Logger.h | 89 + .../clang/Analysis/FlowSensitive/MatchSwitch.h | 15 +- .../FlowSensitive/Models/ChromiumCheckModel.h | 3 +- .../Models/UncheckedOptionalAccessModel.h | 2 +- .../clang/Analysis/FlowSensitive/NoopAnalysis.h | 2 +- .../clang/Analysis/FlowSensitive/RecordOps.h | 76 + .../include/clang/Analysis/FlowSensitive/Solver.h | 24 +- .../clang/Analysis/FlowSensitive/StorageLocation.h | 81 +- .../clang/Analysis/FlowSensitive/Transfer.h | 19 +- .../FlowSensitive/TypeErasedDataflowAnalysis.h | 9 +- .../include/clang/Analysis/FlowSensitive/Value.h | 226 +- .../Analysis/FlowSensitive/WatchedLiteralsSolver.h | 27 +- .../clang/include/clang/Analysis/ProgramPoint.h | 68 +- .../include/clang/Analysis/Support/BumpVector.h | 9 + .../include/clang/Basic/AArch64SVEACLETypes.def | 10 + .../clang/include/clang/Basic/AddressSpaces.h | 3 + .../clang/include/clang/Basic/AlignedAllocation.h | 2 +- .../llvm-project/clang/include/clang/Basic/Attr.td | 216 +- .../clang/include/clang/Basic/AttrDocs.td | 268 +- .../include/clang/Basic/AttributeCommonInfo.h | 138 +- .../clang/include/clang/Basic/Builtins.def | 65 +- .../clang/include/clang/Basic/BuiltinsAArch64.def | 20 +- .../clang/include/clang/Basic/BuiltinsAMDGPU.def | 17 +- .../clang/include/clang/Basic/BuiltinsARM.def | 3 + .../clang/include/clang/Basic/BuiltinsNEON.def | 1 + .../clang/include/clang/Basic/BuiltinsNVPTX.def | 174 +- .../clang/include/clang/Basic/BuiltinsPPC.def | 1457 +- .../clang/include/clang/Basic/BuiltinsRISCV.def | 98 +- .../include/clang/Basic/BuiltinsRISCVVector.def | 1 + .../clang/include/clang/Basic/BuiltinsSME.def | 21 + .../include/clang/Basic/BuiltinsWebAssembly.def | 21 +- .../clang/include/clang/Basic/BuiltinsX86.def | 30 + .../clang/include/clang/Basic/BuiltinsX86_64.def | 5 + .../clang/include/clang/Basic/CodeGenOptions.def | 32 +- .../clang/include/clang/Basic/CodeGenOptions.h | 49 +- .../llvm-project/clang/include/clang/Basic/Cuda.h | 10 +- .../clang/include/clang/Basic/DarwinSDKInfo.h | 2 +- .../clang/include/clang/Basic/Diagnostic.h | 2 +- .../clang/include/clang/Basic/Diagnostic.td | 5 +- .../include/clang/Basic/DiagnosticASTKinds.td | 10 +- .../include/clang/Basic/DiagnosticCommonKinds.td | 36 +- .../clang/include/clang/Basic/DiagnosticDocs.td | 6 + .../include/clang/Basic/DiagnosticDriverKinds.td | 60 +- .../clang/include/clang/Basic/DiagnosticError.h | 4 +- .../include/clang/Basic/DiagnosticFrontendKinds.td | 17 +- .../clang/include/clang/Basic/DiagnosticGroups.td | 82 +- .../clang/include/clang/Basic/DiagnosticIDs.h | 9 +- .../include/clang/Basic/DiagnosticLexKinds.td | 60 +- .../include/clang/Basic/DiagnosticOptions.def | 4 + .../clang/include/clang/Basic/DiagnosticOptions.h | 3 +- .../include/clang/Basic/DiagnosticParseKinds.td | 95 +- .../include/clang/Basic/DiagnosticSemaKinds.td | 320 +- .../clang/Basic/DiagnosticSerializationKinds.td | 11 + .../clang/include/clang/Basic/DirectoryEntry.h | 18 +- .../clang/Basic/ExceptionSpecificationType.h | 5 + .../clang/include/clang/Basic/FPOptions.def | 1 + .../clang/include/clang/Basic/Features.def | 6 + .../clang/include/clang/Basic/FileEntry.h | 36 +- .../clang/include/clang/Basic/FileManager.h | 2 +- .../clang/include/clang/Basic/IdentifierTable.h | 54 +- .../llvm-project/clang/include/clang/Basic/LLVM.h | 5 - .../clang/include/clang/Basic/LangOptions.def | 11 +- .../clang/include/clang/Basic/LangOptions.h | 12 +- .../clang/include/clang/Basic/LangStandard.h | 20 +- .../clang/include/clang/Basic/LangStandards.def | 34 +- .../clang/include/clang/Basic/Linkage.h | 7 - .../clang/include/clang/Basic/Module.h | 112 +- .../clang/include/clang/Basic/ObjCRuntime.h | 2 +- .../include/clang/Basic/OpenCLExtensionTypes.def | 8 +- .../clang/include/clang/Basic/OpenCLExtensions.def | 2 +- .../clang/include/clang/Basic/OpenMPKinds.def | 10 + .../clang/include/clang/Basic/OpenMPKinds.h | 7 + .../clang/include/clang/Basic/ParsedAttrInfo.h | 152 + .../clang/include/clang/Basic/RISCVVTypes.def | 290 + .../clang/include/clang/Basic/SourceManager.h | 5 +- .../clang/include/clang/Basic/Specifiers.h | 5 + .../clang/include/clang/Basic/StmtNodes.td | 4 +- .../clang/include/clang/Basic/TargetBuiltins.h | 25 +- .../clang/include/clang/Basic/TargetCXXABI.h | 6 +- .../clang/include/clang/Basic/TargetID.h | 2 +- .../clang/include/clang/Basic/TargetInfo.h | 51 +- .../clang/include/clang/Basic/TargetOptions.h | 17 +- .../llvm-project/clang/include/clang/Basic/Thunk.h | 8 +- .../clang/include/clang/Basic/TokenKinds.def | 35 +- .../clang/include/clang/Basic/TokenKinds.h | 15 + .../clang/include/clang/Basic/TypeNodes.td | 2 +- .../clang/Basic/WebAssemblyReferenceTypes.def | 40 + .../clang/include/clang/Basic/arm_bf16.td | 2 +- .../clang/include/clang/Basic/arm_neon.td | 6 + .../clang/include/clang/Basic/arm_sme.td | 259 + .../clang/include/clang/Basic/arm_sve.td | 412 +- .../clang/include/clang/Basic/arm_sve_sme_incl.td | 281 + .../include/clang/Basic/riscv_sifive_vector.td | 105 + .../clang/include/clang/Basic/riscv_vector.td | 2230 +-- .../include/clang/Basic/riscv_vector_common.td | 246 + .../clang/include/clang/CodeGen/BackendUtil.h | 5 + .../clang/include/clang/CodeGen/CGFunctionInfo.h | 2 +- .../clang/include/clang/CodeGen/CodeGenAction.h | 5 +- .../CodeGen/ObjectFilePCHContainerOperations.h | 2 +- .../clang/include/clang/Driver/Action.h | 14 +- .../clang/include/clang/Driver/Compilation.h | 11 + .../clang/include/clang/Driver/Distro.h | 5 +- .../clang/include/clang/Driver/Driver.h | 43 +- .../llvm-project/clang/include/clang/Driver/Job.h | 26 +- .../clang/include/clang/Driver/Multilib.h | 122 +- .../clang/include/clang/Driver/MultilibBuilder.h | 134 + .../clang/include/clang/Driver/OffloadBundler.h | 2 +- .../clang/include/clang/Driver/Options.h | 1 + .../clang/include/clang/Driver/Options.td | 830 +- .../clang/include/clang/Driver/SanitizerArgs.h | 7 + .../clang/include/clang/Driver/ToolChain.h | 39 +- .../clang/include/clang/Driver/Types.def | 1 + .../clang/include/clang/Driver/XRayArgs.h | 9 +- .../clang/include/clang/ExtractAPI/API.h | 2 +- .../include/clang/ExtractAPI/APIIgnoresList.h | 20 +- .../include/clang/ExtractAPI/AvailabilityInfo.h | 6 +- .../clang/ExtractAPI/DeclarationFragments.h | 29 + .../clang/ExtractAPI/ExtractAPIActionBase.h | 54 + .../include/clang/ExtractAPI/ExtractAPIVisitor.h | 639 +- .../include/clang/ExtractAPI/FrontendActions.h | 62 +- .../ExtractAPI/Serialization/SerializerBase.h | 118 +- .../Serialization/SymbolGraphSerializer.h | 70 +- .../ExtractAPI/TypedefUnderlyingTypeResolver.h | 0 .../clang/include/clang/Format/Format.h | 546 +- .../clang/include/clang/Frontend/ASTUnit.h | 17 +- .../include/clang/Frontend/CompilerInstance.h | 28 + .../include/clang/Frontend/CompilerInvocation.h | 11 + .../clang/Frontend/DependencyOutputOptions.h | 14 +- .../clang/include/clang/Frontend/FrontendActions.h | 6 +- .../clang/include/clang/Frontend/FrontendOptions.h | 18 +- .../include/clang/Frontend/LayoutOverrideSource.h | 6 + .../include/clang/Frontend/PrecompiledPreamble.h | 7 +- .../clang/include/clang/Frontend/TextDiagnostic.h | 3 +- .../clang/include/clang/Frontend/Utils.h | 11 +- .../clang/include/clang/Interpreter/Interpreter.h | 97 +- .../clang/include/clang/Interpreter/Value.h | 208 + .../clang/Lex/DependencyDirectivesScanner.h | 1 + .../clang/include/clang/Lex/HeaderSearch.h | 47 +- .../llvm-project/clang/include/clang/Lex/Lexer.h | 2 +- .../clang/include/clang/Lex/LiteralSupport.h | 31 +- .../clang/include/clang/Lex/MacroInfo.h | 2 +- .../clang/include/clang/Lex/ModuleMap.h | 72 +- .../clang/include/clang/Lex/MultipleIncludeOpt.h | 6 + .../llvm-project/clang/include/clang/Lex/Pragma.h | 7 + .../clang/include/clang/Lex/Preprocessor.h | 63 +- .../clang/include/clang/Lex/PreprocessorOptions.h | 3 + .../llvm-project/clang/include/clang/Lex/Token.h | 9 +- .../clang/include/clang/Parse/LoopHint.h | 12 +- .../clang/include/clang/Parse/Parser.h | 118 +- .../clang/include/clang/Rewrite/Core/RewriteRope.h | 4 + .../include/clang/Sema/AnalysisBasedWarnings.h | 4 + .../include/clang/Sema/CodeCompleteConsumer.h | 5 +- .../clang/include/clang/Sema/DeclSpec.h | 29 +- .../clang/include/clang/Sema/Designator.h | 201 +- .../clang/Sema/EnterExpressionEvaluationContext.h | 69 + .../clang/include/clang/Sema/ExternalSemaSource.h | 5 + .../include/clang/Sema/HLSLExternalSemaSource.h | 2 +- .../clang/include/clang/Sema/IdentifierResolver.h | 11 +- .../clang/include/clang/Sema/Initialization.h | 3 + .../llvm-project/clang/include/clang/Sema/Lookup.h | 9 + .../clang/Sema/MultiplexExternalSemaSource.h | 3 + .../clang/include/clang/Sema/Overload.h | 3 + .../clang/include/clang/Sema/ParsedAttr.h | 233 +- .../include/clang/Sema/RISCVIntrinsicManager.h | 6 + .../llvm-project/clang/include/clang/Sema/Scope.h | 5 + .../clang/include/clang/Sema/ScopeInfo.h | 16 +- .../llvm-project/clang/include/clang/Sema/Sema.h | 600 +- .../clang/include/clang/Sema/Template.h | 35 +- .../clang/include/clang/Sema/TemplateDeduction.h | 7 + .../include/clang/Serialization/ASTBitCodes.h | 18 +- .../clang/include/clang/Serialization/ASTReader.h | 33 +- .../clang/include/clang/Serialization/ASTWriter.h | 1 - .../clang/Serialization/GlobalModuleIndex.h | 6 - .../clang/include/clang/Serialization/ModuleFile.h | 5 +- .../clang/Serialization/PCHContainerOperations.h | 17 +- .../clang/StaticAnalyzer/Checkers/Checkers.td | 54 +- .../include/clang/StaticAnalyzer/Checkers/Taint.h | 54 +- .../clang/StaticAnalyzer/Core/AnalyzerOptions.def | 9 - .../clang/StaticAnalyzer/Core/AnalyzerOptions.h | 20 +- .../StaticAnalyzer/Core/BugReporter/BugReporter.h | 5 +- .../Core/BugReporter/BugReporterVisitors.h | 21 +- .../Core/BugReporter/CommonBugCategories.h | 1 + .../include/clang/StaticAnalyzer/Core/Checker.h | 27 +- .../StaticAnalyzer/Core/PathSensitive/CallEvent.h | 176 +- .../Core/PathSensitive/CheckerContext.h | 4 +- .../StaticAnalyzer/Core/PathSensitive/CoreEngine.h | 22 +- .../Core/PathSensitive/ExplodedGraph.h | 9 +- .../StaticAnalyzer/Core/PathSensitive/ExprEngine.h | 33 +- .../StaticAnalyzer/Core/PathSensitive/MemRegion.h | 72 +- .../StaticAnalyzer/Core/PathSensitive/Regions.def | 1 + .../Core/PathSensitive/SMTConstraintManager.h | 6 +- .../StaticAnalyzer/Core/PathSensitive/SVals.h | 16 +- .../StaticAnalyzer/Core/PathSensitive/SymExpr.h | 6 +- .../Core/PathSensitive/SymbolManager.h | 13 +- .../include/clang/Support/RISCVVIntrinsicUtils.h | 26 +- .../clang/include/clang/Testing/CommandLineArgs.h | 5 + .../clang/include/clang/Testing/TestAST.h | 3 + .../DependencyScanning/DependencyScanningTool.h | 95 +- .../DependencyScanning/DependencyScanningWorker.h | 19 +- .../DependencyScanning/ModuleDepCollector.h | 18 +- .../clang/Tooling/Inclusions/HeaderAnalysis.h | 2 +- .../clang/Tooling/Inclusions/HeaderIncludes.h | 2 + .../clang/Tooling/Inclusions/StandardLibrary.h | 37 +- .../clang/Tooling/Inclusions/StdSymbolMap.inc | 1538 -- .../Tooling/Refactoring/RecursiveSymbolVisitor.h | 9 +- .../clang/include/clang/Tooling/Tooling.h | 12 +- .../clang/include/clang/module.modulemap | 199 - .../llvm-project/clang/include/module.modulemap | 205 + .../clang/lib/APINotes/APINotesFormat.h | 4 +- .../llvm-project/clang/lib/ARCMigrate/ARCMT.cpp | 4 +- .../clang/lib/ARCMigrate/FileRemapper.cpp | 3 +- .../llvm-project/clang/lib/ARCMigrate/ObjCMT.cpp | 3 +- .../clang/lib/ARCMigrate/TransProperties.cpp | 2 +- contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 710 +- .../llvm-project/clang/lib/AST/ASTDiagnostic.cpp | 3 +- contrib/llvm-project/clang/lib/AST/ASTImporter.cpp | 347 +- .../clang/lib/AST/ASTImporterLookupTable.cpp | 14 + .../clang/lib/AST/ASTStructuralEquivalence.cpp | 45 +- .../llvm-project/clang/lib/AST/ASTTypeTraits.cpp | 15 +- contrib/llvm-project/clang/lib/AST/AttrImpl.cpp | 41 +- .../llvm-project/clang/lib/AST/CXXInheritance.cpp | 3 +- .../clang/lib/AST/ComputeDependence.cpp | 43 +- contrib/llvm-project/clang/lib/AST/Decl.cpp | 296 +- contrib/llvm-project/clang/lib/AST/DeclBase.cpp | 35 + contrib/llvm-project/clang/lib/AST/DeclCXX.cpp | 35 +- contrib/llvm-project/clang/lib/AST/DeclPrinter.cpp | 11 +- .../llvm-project/clang/lib/AST/DeclTemplate.cpp | 101 +- .../llvm-project/clang/lib/AST/DeclarationName.cpp | 6 +- contrib/llvm-project/clang/lib/AST/Expr.cpp | 339 +- contrib/llvm-project/clang/lib/AST/ExprCXX.cpp | 61 +- .../llvm-project/clang/lib/AST/ExprConcepts.cpp | 25 +- .../llvm-project/clang/lib/AST/ExprConstant.cpp | 341 +- .../clang/lib/AST/ExternalASTMerger.cpp | 6 +- .../llvm-project/clang/lib/AST/FormatString.cpp | 13 +- .../llvm-project/clang/lib/AST/Interp/Boolean.h | 6 +- .../clang/lib/AST/Interp/ByteCodeEmitter.cpp | 128 +- .../clang/lib/AST/Interp/ByteCodeEmitter.h | 6 +- .../clang/lib/AST/Interp/ByteCodeExprGen.cpp | 1103 +- .../clang/lib/AST/Interp/ByteCodeExprGen.h | 123 +- .../clang/lib/AST/Interp/ByteCodeStmtGen.cpp | 228 +- .../clang/lib/AST/Interp/ByteCodeStmtGen.h | 5 + .../llvm-project/clang/lib/AST/Interp/Context.cpp | 67 +- .../llvm-project/clang/lib/AST/Interp/Context.h | 17 +- .../clang/lib/AST/Interp/Descriptor.cpp | 53 +- .../llvm-project/clang/lib/AST/Interp/Descriptor.h | 23 +- .../llvm-project/clang/lib/AST/Interp/Disasm.cpp | 20 +- .../clang/lib/AST/Interp/EvalEmitter.cpp | 19 +- .../clang/lib/AST/Interp/EvalEmitter.h | 12 +- .../llvm-project/clang/lib/AST/Interp/Floating.cpp | 22 + .../llvm-project/clang/lib/AST/Interp/Floating.h | 158 + contrib/llvm-project/clang/lib/AST/Interp/Frame.h | 2 +- .../llvm-project/clang/lib/AST/Interp/Function.cpp | 7 +- .../llvm-project/clang/lib/AST/Interp/Function.h | 40 +- .../clang/lib/AST/Interp/FunctionPointer.h | 71 + .../llvm-project/clang/lib/AST/Interp/Integral.h | 31 +- .../llvm-project/clang/lib/AST/Interp/Interp.cpp | 186 +- contrib/llvm-project/clang/lib/AST/Interp/Interp.h | 513 +- .../clang/lib/AST/Interp/InterpBlock.cpp | 67 +- .../clang/lib/AST/Interp/InterpBlock.h | 17 +- .../clang/lib/AST/Interp/InterpBuiltin.cpp | 82 + .../clang/lib/AST/Interp/InterpFrame.cpp | 36 +- .../clang/lib/AST/Interp/InterpFrame.h | 11 +- .../clang/lib/AST/Interp/InterpStack.cpp | 39 +- .../clang/lib/AST/Interp/InterpStack.h | 37 +- .../clang/lib/AST/Interp/InterpState.cpp | 25 +- .../clang/lib/AST/Interp/InterpState.h | 9 +- .../llvm-project/clang/lib/AST/Interp/Opcodes.td | 147 +- .../llvm-project/clang/lib/AST/Interp/Pointer.cpp | 57 +- .../llvm-project/clang/lib/AST/Interp/Pointer.h | 23 +- .../llvm-project/clang/lib/AST/Interp/PrimType.cpp | 2 + .../llvm-project/clang/lib/AST/Interp/PrimType.h | 31 +- .../llvm-project/clang/lib/AST/Interp/Primitives.h | 36 + .../llvm-project/clang/lib/AST/Interp/Program.cpp | 31 +- .../llvm-project/clang/lib/AST/Interp/Program.h | 6 +- .../llvm-project/clang/lib/AST/Interp/Record.cpp | 8 + contrib/llvm-project/clang/lib/AST/Interp/Record.h | 8 +- contrib/llvm-project/clang/lib/AST/Interp/Source.h | 9 +- .../llvm-project/clang/lib/AST/Interp/State.cpp | 17 +- contrib/llvm-project/clang/lib/AST/Interp/State.h | 6 +- .../llvm-project/clang/lib/AST/ItaniumMangle.cpp | 228 +- .../llvm-project/clang/lib/AST/JSONNodeDumper.cpp | 13 + .../llvm-project/clang/lib/AST/MicrosoftMangle.cpp | 173 +- contrib/llvm-project/clang/lib/AST/NSAPI.cpp | 2 + .../llvm-project/clang/lib/AST/ODRDiagsEmitter.cpp | 45 +- contrib/llvm-project/clang/lib/AST/ODRHash.cpp | 4 +- .../llvm-project/clang/lib/AST/OpenMPClause.cpp | 72 +- .../clang/lib/AST/PrintfFormatString.cpp | 2 + .../clang/lib/AST/RecordLayoutBuilder.cpp | 40 +- contrib/llvm-project/clang/lib/AST/Stmt.cpp | 5 + contrib/llvm-project/clang/lib/AST/StmtCXX.cpp | 6 +- contrib/llvm-project/clang/lib/AST/StmtOpenMP.cpp | 26 + contrib/llvm-project/clang/lib/AST/StmtPrinter.cpp | 16 +- contrib/llvm-project/clang/lib/AST/StmtProfile.cpp | 88 +- .../llvm-project/clang/lib/AST/TemplateBase.cpp | 7 +- .../llvm-project/clang/lib/AST/TemplateName.cpp | 9 + .../llvm-project/clang/lib/AST/TextNodeDumper.cpp | 12 +- contrib/llvm-project/clang/lib/AST/Type.cpp | 182 +- contrib/llvm-project/clang/lib/AST/TypeLoc.cpp | 2 + contrib/llvm-project/clang/lib/AST/TypePrinter.cpp | 120 +- .../llvm-project/clang/lib/AST/VTableBuilder.cpp | 2 +- .../clang/lib/ASTMatchers/ASTMatchersInternal.cpp | 7 + .../clang/lib/ASTMatchers/Dynamic/Marshallers.h | 2 +- .../clang/lib/ASTMatchers/Dynamic/Registry.cpp | 7 +- .../llvm-project/clang/lib/Analysis/BodyFarm.cpp | 1 + contrib/llvm-project/clang/lib/Analysis/CFG.cpp | 441 +- .../clang/lib/Analysis/ExprMutationAnalyzer.cpp | 4 +- .../clang/lib/Analysis/FlowSensitive/Arena.cpp | 98 + .../Analysis/FlowSensitive/ControlFlowContext.cpp | 60 +- .../FlowSensitive/DataflowAnalysisContext.cpp | 401 +- .../Analysis/FlowSensitive/DataflowEnvironment.cpp | 744 +- .../lib/Analysis/FlowSensitive/DebugSupport.cpp | 208 +- .../clang/lib/Analysis/FlowSensitive/Formula.cpp | 82 + .../lib/Analysis/FlowSensitive/HTMLLogger.cpp | 536 + .../lib/Analysis/FlowSensitive/HTMLLogger.css | 142 + .../lib/Analysis/FlowSensitive/HTMLLogger.html | 107 + .../clang/lib/Analysis/FlowSensitive/HTMLLogger.js | 219 + .../clang/lib/Analysis/FlowSensitive/Logger.cpp | 108 + .../FlowSensitive/Models/ChromiumCheckModel.cpp | 6 +- .../Models/UncheckedOptionalAccessModel.cpp | 535 +- .../clang/lib/Analysis/FlowSensitive/RecordOps.cpp | 117 + .../clang/lib/Analysis/FlowSensitive/Transfer.cpp | 591 +- .../FlowSensitive/TypeErasedDataflowAnalysis.cpp | 307 +- .../FlowSensitive/WatchedLiteralsSolver.cpp | 333 +- .../clang/lib/Analysis/IntervalPartition.cpp | 116 + .../clang/lib/Analysis/ReachableCode.cpp | 12 +- .../clang/lib/Analysis/RetainSummaryManager.cpp | 12 +- .../clang/lib/Analysis/ThreadSafety.cpp | 7 +- .../clang/lib/Analysis/ThreadSafetyCommon.cpp | 7 +- .../clang/lib/Analysis/UninitializedValues.cpp | 53 +- .../clang/lib/Analysis/UnsafeBufferUsage.cpp | 1917 ++- .../llvm-project/clang/lib/Basic/Attributes.cpp | 22 +- contrib/llvm-project/clang/lib/Basic/Builtins.cpp | 2 +- contrib/llvm-project/clang/lib/Basic/Cuda.cpp | 12 +- .../llvm-project/clang/lib/Basic/Diagnostic.cpp | 44 +- .../llvm-project/clang/lib/Basic/DiagnosticIDs.cpp | 21 +- .../llvm-project/clang/lib/Basic/FileManager.cpp | 14 +- .../clang/lib/Basic/IdentifierTable.cpp | 43 +- .../llvm-project/clang/lib/Basic/LangOptions.cpp | 11 +- .../llvm-project/clang/lib/Basic/LangStandards.cpp | 10 +- contrib/llvm-project/clang/lib/Basic/Module.cpp | 65 +- .../llvm-project/clang/lib/Basic/OpenCLOptions.cpp | 2 +- .../llvm-project/clang/lib/Basic/OpenMPKinds.cpp | 31 +- .../clang/lib/Basic/ParsedAttrInfo.cpp | 32 + contrib/llvm-project/clang/lib/Basic/Sarif.cpp | 8 +- .../llvm-project/clang/lib/Basic/SourceManager.cpp | 5 +- contrib/llvm-project/clang/lib/Basic/TargetID.cpp | 6 +- .../llvm-project/clang/lib/Basic/TargetInfo.cpp | 10 +- contrib/llvm-project/clang/lib/Basic/Targets.cpp | 474 +- contrib/llvm-project/clang/lib/Basic/Targets.h | 4 +- .../clang/lib/Basic/Targets/AArch64.cpp | 204 +- .../llvm-project/clang/lib/Basic/Targets/AArch64.h | 38 +- .../clang/lib/Basic/Targets/AMDGPU.cpp | 186 +- .../llvm-project/clang/lib/Basic/Targets/AMDGPU.h | 23 +- contrib/llvm-project/clang/lib/Basic/Targets/ARC.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/ARM.cpp | 20 +- contrib/llvm-project/clang/lib/Basic/Targets/ARM.h | 8 +- .../llvm-project/clang/lib/Basic/Targets/AVR.cpp | 18 +- contrib/llvm-project/clang/lib/Basic/Targets/AVR.h | 5 +- contrib/llvm-project/clang/lib/Basic/Targets/BPF.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/CSKY.cpp | 7 +- .../llvm-project/clang/lib/Basic/Targets/CSKY.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/DirectX.h | 7 +- .../clang/lib/Basic/Targets/Hexagon.cpp | 2 - .../llvm-project/clang/lib/Basic/Targets/Hexagon.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/Lanai.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/Le64.cpp | 1 - .../llvm-project/clang/lib/Basic/Targets/Le64.h | 4 +- .../clang/lib/Basic/Targets/LoongArch.cpp | 101 +- .../clang/lib/Basic/Targets/LoongArch.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/M68k.cpp | 19 +- .../llvm-project/clang/lib/Basic/Targets/M68k.h | 6 +- .../clang/lib/Basic/Targets/MSP430.cpp | 1 - .../llvm-project/clang/lib/Basic/Targets/MSP430.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/Mips.cpp | 24 - .../llvm-project/clang/lib/Basic/Targets/Mips.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/NVPTX.cpp | 10 +- .../llvm-project/clang/lib/Basic/Targets/NVPTX.h | 8 +- .../clang/lib/Basic/Targets/OSTargets.cpp | 14 +- .../clang/lib/Basic/Targets/OSTargets.h | 100 +- .../llvm-project/clang/lib/Basic/Targets/PNaCl.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/PPC.cpp | 15 +- contrib/llvm-project/clang/lib/Basic/Targets/PPC.h | 54 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.cpp | 18 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.h | 9 +- .../llvm-project/clang/lib/Basic/Targets/SPIR.h | 63 +- .../llvm-project/clang/lib/Basic/Targets/Sparc.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/SystemZ.h | 19 +- contrib/llvm-project/clang/lib/Basic/Targets/TCE.h | 7 +- .../llvm-project/clang/lib/Basic/Targets/VE.cpp | 6 - contrib/llvm-project/clang/lib/Basic/Targets/VE.h | 4 +- .../clang/lib/Basic/Targets/WebAssembly.cpp | 1 + .../clang/lib/Basic/Targets/WebAssembly.h | 30 +- .../llvm-project/clang/lib/Basic/Targets/X86.cpp | 89 +- contrib/llvm-project/clang/lib/Basic/Targets/X86.h | 43 +- .../llvm-project/clang/lib/Basic/Targets/XCore.h | 4 +- contrib/llvm-project/clang/lib/CodeGen/ABIInfo.cpp | 231 + contrib/llvm-project/clang/lib/CodeGen/ABIInfo.h | 244 +- .../llvm-project/clang/lib/CodeGen/ABIInfoImpl.cpp | 452 + .../llvm-project/clang/lib/CodeGen/ABIInfoImpl.h | 152 + contrib/llvm-project/clang/lib/CodeGen/Address.h | 108 +- .../llvm-project/clang/lib/CodeGen/BackendUtil.cpp | 186 +- .../llvm-project/clang/lib/CodeGen/CGAtomic.cpp | 146 +- .../llvm-project/clang/lib/CodeGen/CGBlocks.cpp | 37 +- contrib/llvm-project/clang/lib/CodeGen/CGBlocks.h | 6 - contrib/llvm-project/clang/lib/CodeGen/CGBuilder.h | 49 +- .../llvm-project/clang/lib/CodeGen/CGBuiltin.cpp | 1508 +- .../llvm-project/clang/lib/CodeGen/CGCUDANV.cpp | 52 +- contrib/llvm-project/clang/lib/CodeGen/CGCXX.cpp | 19 +- .../llvm-project/clang/lib/CodeGen/CGCXXABI.cpp | 13 +- contrib/llvm-project/clang/lib/CodeGen/CGCXXABI.h | 24 +- contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 401 +- contrib/llvm-project/clang/lib/CodeGen/CGCall.h | 12 +- contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 50 +- .../llvm-project/clang/lib/CodeGen/CGCleanup.cpp | 6 +- .../llvm-project/clang/lib/CodeGen/CGCoroutine.cpp | 146 +- .../llvm-project/clang/lib/CodeGen/CGDebugInfo.cpp | 351 +- .../llvm-project/clang/lib/CodeGen/CGDebugInfo.h | 52 +- contrib/llvm-project/clang/lib/CodeGen/CGDecl.cpp | 147 +- .../llvm-project/clang/lib/CodeGen/CGDeclCXX.cpp | 27 +- .../llvm-project/clang/lib/CodeGen/CGException.cpp | 12 +- contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 346 +- .../llvm-project/clang/lib/CodeGen/CGExprAgg.cpp | 40 +- .../llvm-project/clang/lib/CodeGen/CGExprCXX.cpp | 95 +- .../clang/lib/CodeGen/CGExprComplex.cpp | 7 +- .../clang/lib/CodeGen/CGExprConstant.cpp | 92 +- .../clang/lib/CodeGen/CGExprScalar.cpp | 133 +- .../clang/lib/CodeGen/CGGPUBuiltin.cpp | 9 +- .../clang/lib/CodeGen/CGHLSLRuntime.cpp | 2 +- .../clang/lib/CodeGen/CGNonTrivialStruct.cpp | 50 +- contrib/llvm-project/clang/lib/CodeGen/CGObjC.cpp | 33 +- .../llvm-project/clang/lib/CodeGen/CGObjCGNU.cpp | 14 +- .../llvm-project/clang/lib/CodeGen/CGObjCMac.cpp | 38 +- .../clang/lib/CodeGen/CGObjCRuntime.cpp | 17 +- .../clang/lib/CodeGen/CGOpenCLRuntime.cpp | 43 +- .../clang/lib/CodeGen/CGOpenCLRuntime.h | 6 +- .../clang/lib/CodeGen/CGOpenMPRuntime.cpp | 1677 +-- .../clang/lib/CodeGen/CGOpenMPRuntime.h | 215 +- .../clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp | 227 +- .../clang/lib/CodeGen/CGOpenMPRuntimeGPU.h | 80 +- .../clang/lib/CodeGen/CGRecordLayoutBuilder.cpp | 25 +- contrib/llvm-project/clang/lib/CodeGen/CGStmt.cpp | 238 +- .../clang/lib/CodeGen/CGStmtOpenMP.cpp | 400 +- contrib/llvm-project/clang/lib/CodeGen/CGVTT.cpp | 13 +- .../llvm-project/clang/lib/CodeGen/CGVTables.cpp | 83 +- contrib/llvm-project/clang/lib/CodeGen/CGVTables.h | 10 - contrib/llvm-project/clang/lib/CodeGen/CGValue.h | 39 +- .../clang/lib/CodeGen/CodeGenAction.cpp | 159 +- .../clang/lib/CodeGen/CodeGenFunction.cpp | 103 +- .../clang/lib/CodeGen/CodeGenFunction.h | 92 +- .../clang/lib/CodeGen/CodeGenModule.cpp | 538 +- .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 31 +- .../llvm-project/clang/lib/CodeGen/CodeGenPGO.cpp | 2 +- .../llvm-project/clang/lib/CodeGen/CodeGenPGO.h | 7 +- .../clang/lib/CodeGen/CodeGenTypes.cpp | 227 +- .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 14 - .../clang/lib/CodeGen/ConstantEmitter.h | 2 +- .../clang/lib/CodeGen/CoverageMappingGen.cpp | 91 +- .../clang/lib/CodeGen/CoverageMappingGen.h | 1 - .../llvm-project/clang/lib/CodeGen/EHScopeStack.h | 9 + .../clang/lib/CodeGen/ItaniumCXXABI.cpp | 393 +- .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 101 +- .../clang/lib/CodeGen/ModuleBuilder.cpp | 2 +- .../CodeGen/ObjectFilePCHContainerOperations.cpp | 11 +- .../clang/lib/CodeGen/SanitizerMetadata.cpp | 5 - .../clang/lib/CodeGen/SanitizerMetadata.h | 1 - .../clang/lib/CodeGen/SwiftCallingConv.cpp | 2 +- .../llvm-project/clang/lib/CodeGen/TargetInfo.cpp | 12397 +--------------- .../llvm-project/clang/lib/CodeGen/TargetInfo.h | 176 +- .../clang/lib/CodeGen/Targets/AArch64.cpp | 824 ++ .../clang/lib/CodeGen/Targets/AMDGPU.cpp | 601 + .../llvm-project/clang/lib/CodeGen/Targets/ARC.cpp | 158 + .../llvm-project/clang/lib/CodeGen/Targets/ARM.cpp | 819 ++ .../llvm-project/clang/lib/CodeGen/Targets/AVR.cpp | 154 + .../llvm-project/clang/lib/CodeGen/Targets/BPF.cpp | 100 + .../clang/lib/CodeGen/Targets/CSKY.cpp | 175 + .../clang/lib/CodeGen/Targets/Hexagon.cpp | 423 + .../clang/lib/CodeGen/Targets/Lanai.cpp | 154 + .../clang/lib/CodeGen/Targets/LoongArch.cpp | 449 + .../clang/lib/CodeGen/Targets/M68k.cpp | 55 + .../clang/lib/CodeGen/Targets/MSP430.cpp | 94 + .../clang/lib/CodeGen/Targets/Mips.cpp | 441 + .../clang/lib/CodeGen/Targets/NVPTX.cpp | 309 + .../clang/lib/CodeGen/Targets/PNaCl.cpp | 109 + .../llvm-project/clang/lib/CodeGen/Targets/PPC.cpp | 972 ++ .../clang/lib/CodeGen/Targets/RISCV.cpp | 519 + .../clang/lib/CodeGen/Targets/SPIR.cpp | 218 + .../clang/lib/CodeGen/Targets/Sparc.cpp | 409 + .../clang/lib/CodeGen/Targets/SystemZ.cpp | 538 + .../llvm-project/clang/lib/CodeGen/Targets/TCE.cpp | 82 + .../llvm-project/clang/lib/CodeGen/Targets/VE.cpp | 71 + .../clang/lib/CodeGen/Targets/WebAssembly.cpp | 173 + .../llvm-project/clang/lib/CodeGen/Targets/X86.cpp | 3402 +++++ .../clang/lib/CodeGen/Targets/XCore.cpp | 662 + .../clang/lib/CrossTU/CrossTranslationUnit.cpp | 14 +- contrib/llvm-project/clang/lib/Driver/Action.cpp | 7 + .../llvm-project/clang/lib/Driver/Compilation.cpp | 2 +- contrib/llvm-project/clang/lib/Driver/Distro.cpp | 6 +- contrib/llvm-project/clang/lib/Driver/Driver.cpp | 409 +- contrib/llvm-project/clang/lib/Driver/Job.cpp | 44 +- contrib/llvm-project/clang/lib/Driver/Multilib.cpp | 334 +- .../clang/lib/Driver/MultilibBuilder.cpp | 197 + .../clang/lib/Driver/OffloadBundler.cpp | 28 +- .../clang/lib/Driver/SanitizerArgs.cpp | 106 +- .../llvm-project/clang/lib/Driver/ToolChain.cpp | 157 +- .../clang/lib/Driver/ToolChains/AIX.cpp | 147 +- .../llvm-project/clang/lib/Driver/ToolChains/AIX.h | 4 + .../clang/lib/Driver/ToolChains/AMDGPU.cpp | 103 +- .../clang/lib/Driver/ToolChains/AMDGPU.h | 9 +- .../clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp | 4 +- .../clang/lib/Driver/ToolChains/AVR.cpp | 16 +- .../llvm-project/clang/lib/Driver/ToolChains/AVR.h | 2 + .../clang/lib/Driver/ToolChains/Ananas.cpp | 4 +- .../clang/lib/Driver/ToolChains/Arch/AArch64.cpp | 58 +- .../clang/lib/Driver/ToolChains/Arch/ARM.cpp | 157 +- .../clang/lib/Driver/ToolChains/Arch/ARM.h | 19 +- .../clang/lib/Driver/ToolChains/Arch/CSKY.cpp | 6 +- .../clang/lib/Driver/ToolChains/Arch/LoongArch.cpp | 120 +- .../clang/lib/Driver/ToolChains/Arch/M68k.cpp | 50 +- .../clang/lib/Driver/ToolChains/Arch/M68k.h | 8 - .../clang/lib/Driver/ToolChains/Arch/Mips.cpp | 11 - .../clang/lib/Driver/ToolChains/Arch/Mips.h | 2 +- .../clang/lib/Driver/ToolChains/Arch/PPC.cpp | 11 +- .../clang/lib/Driver/ToolChains/Arch/PPC.h | 2 +- .../clang/lib/Driver/ToolChains/Arch/RISCV.cpp | 38 +- .../clang/lib/Driver/ToolChains/Arch/RISCV.h | 2 +- .../clang/lib/Driver/ToolChains/Arch/Sparc.cpp | 8 +- .../clang/lib/Driver/ToolChains/Arch/SystemZ.cpp | 2 +- .../clang/lib/Driver/ToolChains/Arch/X86.cpp | 11 +- .../clang/lib/Driver/ToolChains/Arch/X86.h | 2 +- .../clang/lib/Driver/ToolChains/BareMetal.cpp | 342 +- .../clang/lib/Driver/ToolChains/BareMetal.h | 21 + .../clang/lib/Driver/ToolChains/CSKYToolChain.cpp | 15 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 803 +- .../clang/lib/Driver/ToolChains/Clang.h | 8 +- .../clang/lib/Driver/ToolChains/CloudABI.cpp | 4 +- .../clang/lib/Driver/ToolChains/CommonArgs.cpp | 360 +- .../clang/lib/Driver/ToolChains/CommonArgs.h | 23 +- .../clang/lib/Driver/ToolChains/CrossWindows.cpp | 3 +- .../clang/lib/Driver/ToolChains/CrossWindows.h | 1 - .../clang/lib/Driver/ToolChains/Cuda.cpp | 49 +- .../clang/lib/Driver/ToolChains/Cuda.h | 14 +- .../clang/lib/Driver/ToolChains/Darwin.cpp | 136 +- .../clang/lib/Driver/ToolChains/Darwin.h | 7 +- .../clang/lib/Driver/ToolChains/Flang.cpp | 213 +- .../clang/lib/Driver/ToolChains/Flang.h | 19 + .../clang/lib/Driver/ToolChains/FreeBSD.cpp | 8 +- .../clang/lib/Driver/ToolChains/Fuchsia.cpp | 148 +- .../clang/lib/Driver/ToolChains/Fuchsia.h | 17 +- .../clang/lib/Driver/ToolChains/Gnu.cpp | 851 +- .../llvm-project/clang/lib/Driver/ToolChains/Gnu.h | 9 +- .../clang/lib/Driver/ToolChains/HIPAMD.cpp | 47 +- .../clang/lib/Driver/ToolChains/HIPSPV.cpp | 4 +- .../clang/lib/Driver/ToolChains/HIPSPV.h | 3 +- .../clang/lib/Driver/ToolChains/HIPUtility.cpp | 2 +- .../clang/lib/Driver/ToolChains/HLSL.cpp | 57 +- .../clang/lib/Driver/ToolChains/HLSL.h | 24 + .../clang/lib/Driver/ToolChains/Hexagon.cpp | 20 +- .../clang/lib/Driver/ToolChains/Hexagon.h | 3 +- .../clang/lib/Driver/ToolChains/Hurd.cpp | 2 +- .../clang/lib/Driver/ToolChains/LazyDetector.h | 45 + .../clang/lib/Driver/ToolChains/Linux.cpp | 87 +- .../clang/lib/Driver/ToolChains/MSP430.cpp | 1 - .../clang/lib/Driver/ToolChains/MSVC.cpp | 65 +- .../clang/lib/Driver/ToolChains/MSVC.h | 10 +- .../clang/lib/Driver/ToolChains/MinGW.cpp | 8 +- .../clang/lib/Driver/ToolChains/MinGW.h | 1 - .../clang/lib/Driver/ToolChains/MipsLinux.cpp | 12 +- .../clang/lib/Driver/ToolChains/MipsLinux.h | 1 - .../clang/lib/Driver/ToolChains/Myriad.cpp | 6 +- .../clang/lib/Driver/ToolChains/NetBSD.cpp | 78 +- .../clang/lib/Driver/ToolChains/OHOS.cpp | 419 + .../clang/lib/Driver/ToolChains/OHOS.h | 95 + .../clang/lib/Driver/ToolChains/OpenBSD.cpp | 41 +- .../clang/lib/Driver/ToolChains/PS4CPU.cpp | 112 +- .../clang/lib/Driver/ToolChains/PS4CPU.h | 9 +- .../clang/lib/Driver/ToolChains/RISCVToolchain.cpp | 12 +- .../clang/lib/Driver/ToolChains/RISCVToolchain.h | 2 +- .../clang/lib/Driver/ToolChains/ROCm.h | 2 +- .../clang/lib/Driver/ToolChains/SPIRV.h | 3 - .../clang/lib/Driver/ToolChains/Solaris.cpp | 7 +- .../clang/lib/Driver/ToolChains/VEToolchain.cpp | 9 +- .../clang/lib/Driver/ToolChains/WebAssembly.cpp | 10 +- .../clang/lib/Driver/ToolChains/WebAssembly.h | 1 - .../clang/lib/Driver/ToolChains/XCore.h | 1 + .../clang/lib/Driver/ToolChains/ZOS.cpp | 310 +- .../llvm-project/clang/lib/Driver/ToolChains/ZOS.h | 56 +- contrib/llvm-project/clang/lib/Driver/Types.cpp | 4 + contrib/llvm-project/clang/lib/Driver/XRayArgs.cpp | 152 +- contrib/llvm-project/clang/lib/ExtractAPI/API.cpp | 5 +- .../clang/lib/ExtractAPI/APIIgnoresList.cpp | 31 +- .../clang/lib/ExtractAPI/AvailabilityInfo.cpp | 4 +- .../clang/lib/ExtractAPI/DeclarationFragments.cpp | 57 +- .../clang/lib/ExtractAPI/ExtractAPIConsumer.cpp | 194 +- .../clang/lib/ExtractAPI/ExtractAPIVisitor.cpp | 560 - .../Serialization/SymbolGraphSerializer.cpp | 107 +- .../ExtractAPI/TypedefUnderlyingTypeResolver.cpp | 2 +- .../clang/lib/Format/AffectedRangeManager.cpp | 2 +- .../clang/lib/Format/BreakableToken.cpp | 10 +- .../clang/lib/Format/ContinuationIndenter.cpp | 89 +- .../clang/lib/Format/DefinitionBlockSeparator.cpp | 10 +- contrib/llvm-project/clang/lib/Format/Format.cpp | 286 +- .../llvm-project/clang/lib/Format/FormatToken.cpp | 17 +- .../llvm-project/clang/lib/Format/FormatToken.h | 295 +- .../clang/lib/Format/FormatTokenLexer.cpp | 49 +- .../clang/lib/Format/FormatTokenLexer.h | 4 + .../clang/lib/Format/FormatTokenSource.h | 267 + .../lib/Format/IntegerLiteralSeparatorFixer.cpp | 4 +- .../clang/lib/Format/MacroExpander.cpp | 34 +- contrib/llvm-project/clang/lib/Format/Macros.h | 21 +- .../clang/lib/Format/NamespaceEndCommentsFixer.cpp | 8 +- .../clang/lib/Format/QualifierAlignmentFixer.cpp | 544 +- .../clang/lib/Format/QualifierAlignmentFixer.h | 41 +- .../clang/lib/Format/SortJavaScriptImports.cpp | 35 +- .../clang/lib/Format/TokenAnalyzer.cpp | 6 +- .../llvm-project/clang/lib/Format/TokenAnalyzer.h | 2 +- .../clang/lib/Format/TokenAnnotator.cpp | 613 +- .../llvm-project/clang/lib/Format/TokenAnnotator.h | 38 +- .../clang/lib/Format/UnwrappedLineFormatter.cpp | 195 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 688 +- .../clang/lib/Format/UnwrappedLineParser.h | 76 +- .../clang/lib/Format/WhitespaceManager.cpp | 195 +- .../clang/lib/Format/WhitespaceManager.h | 7 +- .../clang/lib/Frontend/ASTConsumers.cpp | 25 +- .../llvm-project/clang/lib/Frontend/ASTMerge.cpp | 2 +- .../llvm-project/clang/lib/Frontend/ASTUnit.cpp | 54 +- .../clang/lib/Frontend/CompilerInstance.cpp | 36 +- .../clang/lib/Frontend/CompilerInvocation.cpp | 551 +- .../Frontend/CreateInvocationFromCommandLine.cpp | 2 +- .../clang/lib/Frontend/DependencyFile.cpp | 50 +- .../clang/lib/Frontend/DiagnosticRenderer.cpp | 14 +- .../clang/lib/Frontend/FrontendAction.cpp | 57 +- .../clang/lib/Frontend/FrontendActions.cpp | 28 +- .../clang/lib/Frontend/HeaderIncludeGen.cpp | 49 +- .../clang/lib/Frontend/InitPreprocessor.cpp | 90 +- .../clang/lib/Frontend/LayoutOverrideSource.cpp | 104 +- .../lib/Frontend/ModuleDependencyCollector.cpp | 31 +- .../clang/lib/Frontend/PrecompiledPreamble.cpp | 37 +- .../clang/lib/Frontend/PrintPreprocessedOutput.cpp | 6 +- .../clang/lib/Frontend/Rewrite/FrontendActions.cpp | 9 +- .../lib/Frontend/SerializedDiagnosticPrinter.cpp | 6 +- .../clang/lib/Frontend/TextDiagnostic.cpp | 677 +- .../lib/Frontend/VerifyDiagnosticConsumer.cpp | 4 +- .../lib/FrontendTool/ExecuteCompilerInvocation.cpp | 8 + .../clang/lib/Headers/__clang_cuda_intrinsics.h | 191 + .../clang/lib/Headers/__clang_hip_cmath.h | 2 +- .../lib/Headers/__clang_hip_libdevice_declares.h | 62 +- .../clang/lib/Headers/__clang_hip_math.h | 127 +- .../lib/Headers/__clang_hip_runtime_wrapper.h | 13 + contrib/llvm-project/clang/lib/Headers/adxintrin.h | 203 +- contrib/llvm-project/clang/lib/Headers/altivec.h | 260 +- .../clang/lib/Headers/amxcomplexintrin.h | 169 + contrib/llvm-project/clang/lib/Headers/arm_acle.h | 22 +- .../llvm-project/clang/lib/Headers/avx2intrin.h | 4117 +++++- .../llvm-project/clang/lib/Headers/avx512fintrin.h | 24 +- .../clang/lib/Headers/avx512fp16intrin.h | 20 +- contrib/llvm-project/clang/lib/Headers/avxintrin.h | 27 +- .../clang/lib/Headers/avxvnniint16intrin.h | 473 + .../llvm-project/clang/lib/Headers/bmi2intrin.h | 200 +- .../clang/lib/Headers/clflushoptintrin.h | 9 + .../llvm-project/clang/lib/Headers/clzerointrin.h | 12 +- contrib/llvm-project/clang/lib/Headers/cpuid.h | 10 + .../Headers/cuda_wrappers/bits/shared_ptr_base.h | 9 + contrib/llvm-project/clang/lib/Headers/fmaintrin.h | 564 + .../clang/lib/Headers/hlsl/hlsl_intrinsics.h | 257 + contrib/llvm-project/clang/lib/Headers/immintrin.h | 124 +- contrib/llvm-project/clang/lib/Headers/limits.h | 6 +- .../clang/lib/Headers/llvm_libc_wrappers/ctype.h | 85 + .../lib/Headers/llvm_libc_wrappers/inttypes.h | 34 + .../llvm_libc_wrappers/llvm-libc-decls/README.txt | 6 + .../clang/lib/Headers/llvm_libc_wrappers/stdio.h | 34 + .../clang/lib/Headers/llvm_libc_wrappers/stdlib.h | 42 + .../clang/lib/Headers/llvm_libc_wrappers/string.h | 37 + .../llvm-project/clang/lib/Headers/mwaitxintrin.h | 29 + .../llvm-project/clang/lib/Headers/opencl-c-base.h | 3 + .../__clang_openmp_device_functions.h | 1 - .../clang/lib/Headers/openmp_wrappers/new | 2 +- contrib/llvm-project/clang/lib/Headers/pmmintrin.h | 18 +- .../clang/lib/Headers/ppc_wrappers/emmintrin.h | 3 +- .../clang/lib/Headers/ppc_wrappers/smmintrin.h | 4 +- .../llvm-project/clang/lib/Headers/rdseedintrin.h | 67 +- .../llvm-project/clang/lib/Headers/riscv_ntlh.h | 28 + .../llvm-project/clang/lib/Headers/sha512intrin.h | 200 + contrib/llvm-project/clang/lib/Headers/shaintrin.h | 128 + .../llvm-project/clang/lib/Headers/sifive_vector.h | 16 + contrib/llvm-project/clang/lib/Headers/sm3intrin.h | 238 + contrib/llvm-project/clang/lib/Headers/sm4intrin.h | 269 + contrib/llvm-project/clang/lib/Headers/stdalign.h | 5 + contrib/llvm-project/clang/lib/Headers/stdatomic.h | 11 +- contrib/llvm-project/clang/lib/Headers/stddef.h | 5 + .../llvm-project/clang/lib/Headers/wasm_simd128.h | 144 +- .../llvm-project/clang/lib/Headers/xsavecintrin.h | 50 + contrib/llvm-project/clang/lib/Index/IndexBody.cpp | 20 +- contrib/llvm-project/clang/lib/Index/IndexDecl.cpp | 1 + .../llvm-project/clang/lib/Index/IndexSymbol.cpp | 1 - .../llvm-project/clang/lib/Index/USRGeneration.cpp | 16 + .../clang/lib/Interpreter/DeviceOffload.cpp | 176 + .../clang/lib/Interpreter/DeviceOffload.h | 51 + .../clang/lib/Interpreter/IncrementalExecutor.cpp | 27 +- .../clang/lib/Interpreter/IncrementalExecutor.h | 6 +- .../clang/lib/Interpreter/IncrementalParser.cpp | 149 +- .../clang/lib/Interpreter/IncrementalParser.h | 19 +- .../clang/lib/Interpreter/Interpreter.cpp | 564 +- .../clang/lib/Interpreter/InterpreterUtils.cpp | 111 + .../clang/lib/Interpreter/InterpreterUtils.h | 54 + .../llvm-project/clang/lib/Interpreter/Value.cpp | 266 + .../clang/lib/Lex/DependencyDirectivesScanner.cpp | 131 +- contrib/llvm-project/clang/lib/Lex/HeaderMap.cpp | 6 +- .../llvm-project/clang/lib/Lex/HeaderSearch.cpp | 159 +- .../clang/lib/Lex/InitHeaderSearch.cpp | 33 +- contrib/llvm-project/clang/lib/Lex/Lexer.cpp | 38 +- .../llvm-project/clang/lib/Lex/LiteralSupport.cpp | 148 +- contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp | 281 +- .../llvm-project/clang/lib/Lex/PPDirectives.cpp | 220 +- .../llvm-project/clang/lib/Lex/PPExpressions.cpp | 10 +- .../llvm-project/clang/lib/Lex/PPLexerChange.cpp | 43 +- .../clang/lib/Lex/PPMacroExpansion.cpp | 30 +- contrib/llvm-project/clang/lib/Lex/Pragma.cpp | 134 +- .../clang/lib/Lex/PreprocessingRecord.cpp | 7 +- .../llvm-project/clang/lib/Lex/Preprocessor.cpp | 79 +- contrib/llvm-project/clang/lib/Lex/TokenLexer.cpp | 5 +- contrib/llvm-project/clang/lib/Parse/ParseAST.cpp | 22 +- .../clang/lib/Parse/ParseCXXInlineMethods.cpp | 10 +- contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp | 431 +- .../llvm-project/clang/lib/Parse/ParseDeclCXX.cpp | 139 +- contrib/llvm-project/clang/lib/Parse/ParseExpr.cpp | 77 +- .../llvm-project/clang/lib/Parse/ParseExprCXX.cpp | 190 +- contrib/llvm-project/clang/lib/Parse/ParseHLSL.cpp | 2 +- contrib/llvm-project/clang/lib/Parse/ParseInit.cpp | 27 +- contrib/llvm-project/clang/lib/Parse/ParseObjc.cpp | 7 +- .../llvm-project/clang/lib/Parse/ParseOpenMP.cpp | 104 +- .../llvm-project/clang/lib/Parse/ParsePragma.cpp | 68 +- contrib/llvm-project/clang/lib/Parse/ParseStmt.cpp | 49 +- .../llvm-project/clang/lib/Parse/ParseTemplate.cpp | 47 +- .../clang/lib/Parse/ParseTentative.cpp | 134 +- contrib/llvm-project/clang/lib/Parse/Parser.cpp | 64 +- .../llvm-project/clang/lib/Rewrite/Rewriter.cpp | 77 +- .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 233 +- .../clang/lib/Sema/CodeCompleteConsumer.cpp | 3 + .../clang/lib/Sema/HLSLExternalSemaSource.cpp | 4 +- .../clang/lib/Sema/IdentifierResolver.cpp | 9 +- .../clang/lib/Sema/JumpDiagnostics.cpp | 147 +- .../clang/lib/Sema/MultiplexExternalSemaSource.cpp | 6 + contrib/llvm-project/clang/lib/Sema/ParsedAttr.cpp | 23 +- contrib/llvm-project/clang/lib/Sema/Scope.cpp | 6 +- contrib/llvm-project/clang/lib/Sema/ScopeInfo.cpp | 1 + contrib/llvm-project/clang/lib/Sema/Sema.cpp | 158 +- contrib/llvm-project/clang/lib/Sema/SemaAccess.cpp | 10 + contrib/llvm-project/clang/lib/Sema/SemaAttr.cpp | 6 +- .../clang/lib/Sema/SemaCXXScopeSpec.cpp | 112 +- contrib/llvm-project/clang/lib/Sema/SemaCast.cpp | 70 +- .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 1544 +- .../clang/lib/Sema/SemaCodeComplete.cpp | 56 +- .../llvm-project/clang/lib/Sema/SemaConcept.cpp | 225 +- .../llvm-project/clang/lib/Sema/SemaCoroutine.cpp | 168 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 420 +- .../llvm-project/clang/lib/Sema/SemaDeclAttr.cpp | 410 +- .../llvm-project/clang/lib/Sema/SemaDeclCXX.cpp | 573 +- .../clang/lib/Sema/SemaExceptionSpec.cpp | 6 + contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 1238 +- .../llvm-project/clang/lib/Sema/SemaExprCXX.cpp | 167 +- .../llvm-project/clang/lib/Sema/SemaExprMember.cpp | 9 +- .../llvm-project/clang/lib/Sema/SemaExprObjC.cpp | 4 + contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 648 +- contrib/llvm-project/clang/lib/Sema/SemaLambda.cpp | 796 +- contrib/llvm-project/clang/lib/Sema/SemaLookup.cpp | 251 +- contrib/llvm-project/clang/lib/Sema/SemaModule.cpp | 314 +- .../clang/lib/Sema/SemaObjCProperty.cpp | 13 +- contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp | 804 +- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 391 +- .../clang/lib/Sema/SemaPseudoObject.cpp | 7 +- .../clang/lib/Sema/SemaRISCVVectorLookup.cpp | 114 +- contrib/llvm-project/clang/lib/Sema/SemaSYCL.cpp | 16 - contrib/llvm-project/clang/lib/Sema/SemaStmt.cpp | 108 +- .../llvm-project/clang/lib/Sema/SemaStmtAsm.cpp | 1 + .../llvm-project/clang/lib/Sema/SemaStmtAttr.cpp | 85 +- .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 201 +- .../clang/lib/Sema/SemaTemplateDeduction.cpp | 208 +- .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 140 +- .../clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 143 +- .../clang/lib/Sema/SemaTemplateVariadic.cpp | 5 +- contrib/llvm-project/clang/lib/Sema/SemaType.cpp | 305 +- .../llvm-project/clang/lib/Sema/TreeTransform.h | 448 +- .../clang/lib/Serialization/ASTCommon.cpp | 8 +- .../clang/lib/Serialization/ASTReader.cpp | 371 +- .../clang/lib/Serialization/ASTReaderDecl.cpp | 270 +- .../clang/lib/Serialization/ASTReaderInternals.h | 3 + .../clang/lib/Serialization/ASTReaderStmt.cpp | 58 +- .../clang/lib/Serialization/ASTWriter.cpp | 311 +- .../clang/lib/Serialization/ASTWriterDecl.cpp | 166 +- .../clang/lib/Serialization/ASTWriterStmt.cpp | 34 +- .../clang/lib/Serialization/GlobalModuleIndex.cpp | 20 +- .../clang/lib/Serialization/ModuleManager.cpp | 6 +- .../lib/Serialization/PCHContainerOperations.cpp | 5 + .../Checkers/AnalyzerStatsChecker.cpp | 13 +- .../Checkers/ArrayBoundCheckerV2.cpp | 362 +- .../Checkers/BasicObjCFoundationChecks.cpp | 106 +- .../lib/StaticAnalyzer/Checkers/CStringChecker.cpp | 356 +- .../StaticAnalyzer/Checkers/CheckObjCDealloc.cpp | 10 +- .../StaticAnalyzer/Checkers/ContainerModeling.cpp | 8 +- .../StaticAnalyzer/Checkers/DeadStoresChecker.cpp | 6 +- .../lib/StaticAnalyzer/Checkers/DebugCheckers.cpp | 5 +- .../lib/StaticAnalyzer/Checkers/DivZeroChecker.cpp | 46 +- .../Checkers/DynamicTypePropagation.cpp | 14 +- .../lib/StaticAnalyzer/Checkers/ErrnoModeling.cpp | 17 +- .../lib/StaticAnalyzer/Checkers/ErrnoModeling.h | 8 - .../Checkers/ExprInspectionChecker.cpp | 3 +- .../Checkers/FuchsiaHandleChecker.cpp | 7 +- .../Checkers/GenericTaintChecker.cpp | 188 +- .../clang/lib/StaticAnalyzer/Checkers/Iterator.cpp | 4 +- .../StaticAnalyzer/Checkers/IteratorModeling.cpp | 20 +- .../Checkers/IvarInvalidationChecker.cpp | 37 +- .../Checkers/LocalizationChecker.cpp | 10 +- .../Checkers/MacOSKeychainAPIChecker.cpp | 21 +- .../lib/StaticAnalyzer/Checkers/MallocChecker.cpp | 85 +- .../Checkers/MallocOverflowSecurityChecker.cpp | 10 +- .../Checkers/MallocSizeofChecker.cpp | 32 +- .../lib/StaticAnalyzer/Checkers/MoveChecker.cpp | 23 +- .../Checkers/NSAutoreleasePoolChecker.cpp | 2 +- .../StaticAnalyzer/Checkers/NullabilityChecker.cpp | 97 +- .../Checkers/ObjCMissingSuperCallChecker.cpp | 4 +- .../Checkers/ObjCSelfInitChecker.cpp | 13 +- .../Checkers/ObjCUnusedIVarsChecker.cpp | 21 +- .../lib/StaticAnalyzer/Checkers/PaddingChecker.cpp | 2 +- .../Checkers/PointerArithChecker.cpp | 7 +- .../StaticAnalyzer/Checkers/PthreadLockChecker.cpp | 1 + .../RetainCountChecker/RetainCountChecker.cpp | 10 +- .../RetainCountChecker/RetainCountDiagnostics.cpp | 6 +- .../Checkers/STLAlgorithmModeling.cpp | 2 +- .../Checkers/SimpleStreamChecker.cpp | 12 +- .../StaticAnalyzer/Checkers/SmartPtrModeling.cpp | 8 +- .../Checkers/StackAddrEscapeChecker.cpp | 18 +- .../Checkers/StdLibraryFunctionsChecker.cpp | 1782 ++- .../lib/StaticAnalyzer/Checkers/StreamChecker.cpp | 59 +- .../clang/lib/StaticAnalyzer/Checkers/Taint.cpp | 194 +- .../Checkers/TestAfterDivZeroChecker.cpp | 5 +- .../Checkers/TrustNonnullChecker.cpp | 3 +- .../Checkers/UndefCapturedBlockVarChecker.cpp | 9 +- .../StaticAnalyzer/Checkers/UndefResultChecker.cpp | 2 +- .../Checkers/UnreachableCodeChecker.cpp | 28 +- .../lib/StaticAnalyzer/Checkers/VLASizeChecker.cpp | 59 +- .../WebKit/UncountedLambdaCapturesChecker.cpp | 2 +- .../clang/lib/StaticAnalyzer/Core/APSIntType.cpp | 4 +- .../lib/StaticAnalyzer/Core/AnalysisManager.cpp | 11 +- .../lib/StaticAnalyzer/Core/BasicValueFactory.cpp | 20 +- .../clang/lib/StaticAnalyzer/Core/BugReporter.cpp | 15 +- .../StaticAnalyzer/Core/BugReporterVisitors.cpp | 29 +- .../clang/lib/StaticAnalyzer/Core/CallEvent.cpp | 40 +- .../lib/StaticAnalyzer/Core/CheckerContext.cpp | 1 + .../StaticAnalyzer/Core/CommonBugCategories.cpp | 1 + .../clang/lib/StaticAnalyzer/Core/Environment.cpp | 2 +- .../lib/StaticAnalyzer/Core/ExplodedGraph.cpp | 23 +- .../clang/lib/StaticAnalyzer/Core/ExprEngine.cpp | 67 +- .../clang/lib/StaticAnalyzer/Core/ExprEngineC.cpp | 111 +- .../lib/StaticAnalyzer/Core/ExprEngineCXX.cpp | 124 +- .../Core/ExprEngineCallAndReturn.cpp | 20 +- .../lib/StaticAnalyzer/Core/ExprEngineObjC.cpp | 4 +- .../lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp | 6 +- .../clang/lib/StaticAnalyzer/Core/MemRegion.cpp | 214 +- .../lib/StaticAnalyzer/Core/PlistDiagnostics.cpp | 16 +- .../clang/lib/StaticAnalyzer/Core/ProgramState.cpp | 25 +- .../StaticAnalyzer/Core/RangeConstraintManager.cpp | 2 +- .../clang/lib/StaticAnalyzer/Core/RegionStore.cpp | 113 +- .../clang/lib/StaticAnalyzer/Core/SValBuilder.cpp | 1 - .../clang/lib/StaticAnalyzer/Core/SVals.cpp | 3 + .../clang/lib/StaticAnalyzer/Core/Store.cpp | 7 +- .../lib/StaticAnalyzer/Core/SymbolManager.cpp | 36 +- .../lib/StaticAnalyzer/Core/TextDiagnostics.cpp | 5 +- .../StaticAnalyzer/Frontend/CheckerRegistry.cpp | 3 +- .../lib/StaticAnalyzer/Frontend/ModelConsumer.cpp | 7 +- .../clang/lib/Support/RISCVVIntrinsicUtils.cpp | 150 +- .../clang/lib/Testing/CommandLineArgs.cpp | 15 + contrib/llvm-project/clang/lib/Testing/TestAST.cpp | 5 +- .../clang/lib/Tooling/CompilationDatabase.cpp | 2 +- .../DependencyScanningFilesystem.cpp | 12 +- .../DependencyScanning/DependencyScanningTool.cpp | 145 +- .../DependencyScanningWorker.cpp | 124 +- .../DependencyScanning/ModuleDepCollector.cpp | 59 +- .../clang/lib/Tooling/DumpTool/ClangSrcLocDump.cpp | 2 +- .../ExpandResponseFilesCompilationDatabase.cpp | 30 +- .../lib/Tooling/Inclusions/HeaderAnalysis.cpp | 2 +- .../lib/Tooling/Inclusions/HeaderIncludes.cpp | 9 +- .../Tooling/Inclusions/Stdlib}/CSymbolMap.inc | 0 .../Tooling/Inclusions/Stdlib/StandardLibrary.cpp | 245 +- .../Inclusions/Stdlib/StdSpecialSymbolMap.inc | 722 + .../lib/Tooling/Inclusions/Stdlib/StdSymbolMap.inc | 3819 +++++ .../Tooling/Inclusions/Stdlib/StdTsSymbolMap.inc | 52 + .../clang/lib/Tooling/JSONCompilationDatabase.cpp | 4 +- .../Tooling/Refactoring/Rename/USRLocFinder.cpp | 21 +- .../clang/lib/Tooling/Syntax/Tokens.cpp | 64 +- contrib/llvm-project/clang/lib/Tooling/Tooling.cpp | 46 +- .../clang/lib/Tooling/Transformer/Stencil.cpp | 2 +- .../clang/tools/amdgpu-arch/AMDGPUArch.cpp | 138 +- .../clang/tools/amdgpu-arch/AMDGPUArchByHIP.cpp | 96 + .../clang/tools/amdgpu-arch/AMDGPUArchByHSA.cpp | 122 + .../clang/tools/clang-repl/ClangRepl.cpp | 82 +- .../llvm-project/clang/tools/driver/cc1_main.cpp | 28 +- .../llvm-project/clang/tools/driver/cc1as_main.cpp | 23 +- .../clang/tools/driver/cc1gen_reproducer_main.cpp | 17 +- contrib/llvm-project/clang/tools/driver/driver.cpp | 84 +- .../clang/tools/nvptx-arch/NVPTXArch.cpp | 37 +- *** 142783 LINES SKIPPED *** From nobody Fri Dec 8 17:38:39 2023 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 4Smyzk6Tl0z5366h; Fri, 8 Dec 2023 17:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smyzk5W8vz3Qv3; Fri, 8 Dec 2023 17:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0A4kHZ2Z4qmdkdJQag6d+M1YbL49eGyEGOXatRNUzVc=; b=euuGcooyue4Wbcv0gfyS8p0okPWwJE0M3SSIVdIKjNV8g0w2rANrqk36oL/N8qjJy8pjUU lFPl5o0/ngxquq06383pTVbApvO1FvCXvN6hQOpr2eJcrAUVHLQ+E7h/RDtiG0wa6Y7eCY ouvHL1q0KOQyXb1PWZBKMxhyR7xOSzKAVSwXNhmbHkOl3LJVfywo8qeco9LojoQhw10vT3 nn5jjCGi4878a0j/TxsVgIrUuLU7JMSmK7IuX4SaUPFBLfbHw3OB1bg55qRV7eHUlJZ7Da OVTSGHviihafj1kQtYCHOMU2MeyAaQsjGsCTiGztJFSC7o2QflxHpTibwvPHXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702057122; a=rsa-sha256; cv=none; b=KyV5kbGuXN4w9zgfOMMylmlvO9DQZdmmKkOinZl2SePD1MFMnJFHZxUAlbqFq2ijIipmV0 V+M/IYWoUFTExCvGrKys0utKAVasnqBGy1ncb1tJ+F1TqCAFo15/K/NMD69Z5nsoGVHhe9 o4AR+UFJ46I8D7fpot7bkuz137zgmljh9QdypnG4QbAUbikEMgXe5TkMB/KmM+QjAwmy0F 0iqFnQHCd+xQN+8NO4+4fLzgnJeSG5Bzewa0YdUhHzmJC0md6LEk3WHI1bF82q+58nBXs2 6BGnN+Rcc7LlDTMp8w2v5D1koB30S+qBOWlvdH6ZdvIZRXfgyX2/+QBeagH6TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0A4kHZ2Z4qmdkdJQag6d+M1YbL49eGyEGOXatRNUzVc=; b=sU0TjowZTbmUdPrpMDXe6elFeSWe5kV2nWoRSqQHbm+v5BPeC84kgtVdLyNyijJJOC9qHc gGkemjQM5zzKgnlrQkD2lXsPFVeISSL70GcnYNCnlidLzE5H9tH9kuAy+hbcWQiwaGt4ms brdKMFb1lB+5C66BCP8d2JdahPE03B77M1SgB4Otrofsb3m3SXGIoZv5fBv5sHgKKf2eh2 O+vZCfHOFs1RDARIKID31KUU+WFGV6Hp8+Mj+eL4Olbk8pm2J1aK0J3YRb+xGdEQCpt+w5 /mu6Ueg3RSNG7Vnq7JjigPAJ7j7OBgJqMowxmjxuTErU+secuptJt8U4xy1dPg== 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 4Smyzk4cbCzVb2; Fri, 8 Dec 2023 17:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8Hcgo6067810; Fri, 8 Dec 2023 17:38:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8HcdJO067807; Fri, 8 Dec 2023 17:38:39 GMT (envelope-from git) Date: Fri, 8 Dec 2023 17:38:39 GMT Message-Id: <202312081738.3B8HcdJO067807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 8a4dda33d675 - main - Merge llvm-project release/17.x llvmorg-17.0.0-rc4-10-g0176e8729ea4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 8a4dda33d67586ca2624f2a38417baa03a533a7f Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8a4dda33d67586ca2624f2a38417baa03a533a7f commit 8a4dda33d67586ca2624f2a38417baa03a533a7f Merge: 06c3fb2749bd 8092e001bcd7 Author: Dimitry Andric AuthorDate: 2023-09-11 18:37:24 +0000 Commit: Dimitry Andric CommitDate: 2023-12-08 17:35:11 +0000 Merge llvm-project release/17.x llvmorg-17.0.0-rc4-10-g0176e8729ea4 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-17.0.0-rc4-10-g0176e8729ea4. PR: 273753 MFC after: 1 month .../clang/include/clang/AST/DeclBase.h | 6 +- .../clang/include/clang/AST/ExprConcepts.h | 14 +- .../clang/include/clang/Basic/CodeGenOptions.def | 1 - .../include/clang/Basic/DiagnosticASTKinds.td | 2 + .../clang/include/clang/Basic/DiagnosticGroups.td | 1 + .../include/clang/Basic/DiagnosticLexKinds.td | 4 + .../clang/include/clang/Basic/Sanitizers.h | 4 + .../clang/include/clang/Basic/TargetInfo.h | 4 +- .../clang/include/clang/Basic/riscv_vector.td | 52 +--- .../clang/include/clang/CodeGen/CGFunctionInfo.h | 29 +- .../clang/include/clang/Driver/Options.td | 14 +- .../clang/include/clang/Driver/ToolChain.h | 2 +- .../llvm-project/clang/include/clang/Sema/Sema.h | 2 - contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 5 +- .../llvm-project/clang/lib/AST/ExprConstant.cpp | 27 +- .../clang/lib/Basic/Targets/LoongArch.cpp | 21 +- .../clang/lib/Basic/Targets/LoongArch.h | 13 + .../llvm-project/clang/lib/Basic/Targets/RISCV.cpp | 4 +- .../llvm-project/clang/lib/CodeGen/ABIInfoImpl.cpp | 13 +- .../llvm-project/clang/lib/CodeGen/ABIInfoImpl.h | 14 +- .../llvm-project/clang/lib/CodeGen/BackendUtil.cpp | 23 +- .../llvm-project/clang/lib/CodeGen/CGCXXABI.cpp | 3 +- contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 244 +++++++++------- contrib/llvm-project/clang/lib/CodeGen/CGCall.h | 29 ++ contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 106 ++++++- .../llvm-project/clang/lib/CodeGen/CGCoroutine.cpp | 33 +++ .../llvm-project/clang/lib/CodeGen/CGDebugInfo.cpp | 13 +- .../llvm-project/clang/lib/CodeGen/CGDebugInfo.h | 2 +- contrib/llvm-project/clang/lib/CodeGen/CGDecl.cpp | 2 +- .../llvm-project/clang/lib/CodeGen/CGDeclCXX.cpp | 4 +- contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 9 +- .../clang/lib/CodeGen/CGExprConstant.cpp | 2 +- .../clang/lib/CodeGen/CGOpenMPRuntime.cpp | 11 +- .../clang/lib/CodeGen/CodeGenABITypes.cpp | 5 +- .../clang/lib/CodeGen/CodeGenFunction.cpp | 26 +- .../clang/lib/CodeGen/CodeGenFunction.h | 19 +- .../clang/lib/CodeGen/CodeGenModule.cpp | 34 ++- .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 20 +- .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 12 +- .../clang/lib/CodeGen/ItaniumCXXABI.cpp | 2 +- .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 3 +- .../clang/lib/CodeGen/Targets/LoongArch.cpp | 11 +- .../clang/lib/CodeGen/Targets/RISCV.cpp | 24 +- .../llvm-project/clang/lib/CodeGen/Targets/X86.cpp | 16 +- contrib/llvm-project/clang/lib/Driver/Driver.cpp | 17 +- .../clang/lib/Driver/SanitizerArgs.cpp | 32 +++ .../llvm-project/clang/lib/Driver/ToolChain.cpp | 6 + .../clang/lib/Driver/ToolChains/AIX.cpp | 6 + .../clang/lib/Driver/ToolChains/Arch/LoongArch.cpp | 43 +-- .../clang/lib/Driver/ToolChains/Arch/LoongArch.h | 6 + .../clang/lib/Driver/ToolChains/Arch/X86.cpp | 6 + .../clang/lib/Driver/ToolChains/Clang.cpp | 39 +-- .../clang/lib/Driver/ToolChains/CommonArgs.cpp | 9 +- .../clang/lib/Driver/ToolChains/Gnu.cpp | 22 +- .../clang/lib/Driver/ToolChains/Hexagon.cpp | 5 + .../clang/lib/Driver/ToolChains/Solaris.cpp | 41 ++- .../clang/lib/Format/UnwrappedLineParser.cpp | 5 +- .../clang/lib/Frontend/FrontendAction.cpp | 5 + .../clang/lib/Headers/__clang_cuda_math.h | 2 +- .../lib/Headers/__clang_hip_libdevice_declares.h | 2 +- contrib/llvm-project/clang/lib/Headers/cpuid.h | 10 - .../clang/lib/Interpreter/IncrementalExecutor.cpp | 19 +- .../llvm-project/clang/lib/Lex/LiteralSupport.cpp | 41 ++- .../llvm-project/clang/lib/Parse/ParseDeclCXX.cpp | 19 +- .../clang/lib/Parse/ParseTentative.cpp | 1 + .../clang/lib/Sema/SemaAvailability.cpp | 12 + contrib/llvm-project/clang/lib/Sema/SemaCast.cpp | 8 + contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 3 +- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 95 +++---- .../llvm-project/clang/lib/Sema/SemaExprCXX.cpp | 25 +- contrib/llvm-project/clang/lib/Sema/SemaLookup.cpp | 68 +++-- .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 17 +- .../llvm-project/clang/lib/Sema/TreeTransform.h | 4 + .../clang/lib/Serialization/ASTReaderDecl.cpp | 66 +++-- .../clang/lib/Serialization/ASTWriterDecl.cpp | 4 +- .../lib/Tooling/Inclusions/Stdlib/StdSymbolMap.inc | 54 ++++ .../compiler-rt/lib/asan/asan_interceptors.cpp | 56 ++-- .../compiler-rt/lib/asan/asan_interceptors.h | 2 - .../compiler-rt/lib/asan/asan_win_dll_thunk.cpp | 2 + .../compiler-rt/lib/builtins/aarch64/lse.S | 40 ++- .../compiler-rt/lib/builtins/clear_cache.c | 2 +- .../compiler-rt/lib/builtins/cpu_model.c | 5 +- .../compiler-rt/lib/interception/interception.h | 2 +- .../compiler-rt/lib/msan/msan_interceptors.cpp | 37 +++ .../compiler-rt/lib/profile/InstrProfilingFile.c | 10 +- .../sanitizer_common_interceptors.inc | 73 +++-- .../sanitizer_common_interceptors_format.inc | 16 +- .../sanitizer_stacktrace_sparc.cpp | 6 - .../sanitizer_unwind_linux_libcdep.cpp | 6 - .../symbolizer/scripts/global_symbols.txt | 7 + .../libcxx/include/__algorithm/pstl_sort.h | 1 + contrib/llvm-project/libcxx/include/__config | 36 ++- .../libcxx/include/__format/format_functions.h | 3 + .../__locale_dir/locale_base_api/locale_guard.h | 1 + .../llvm-project/libcxx/include/__mdspan/extents.h | 63 +++-- .../libcxx/include/__mdspan/layout_left.h | 32 ++- .../libcxx/include/__mdspan/layout_right.h | 30 +- .../llvm-project/libcxx/include/__mdspan/mdspan.h | 308 +++++++++++++++++++++ .../llvm-project/libcxx/include/__std_clang_module | 226 +++++++++++++++ .../__type_traits/is_nothrow_constructible.h | 3 +- contrib/llvm-project/libcxx/include/mdspan | 130 +++++++++ .../libcxx/include/module.modulemap.in | 65 ++--- contrib/llvm-project/libcxx/include/sstream | 50 ++-- .../llvm-project/libcxx/modules/std/atomic.cppm | 3 - .../llvm-project/libcxx/modules/std/execution.cppm | 2 +- .../libcxx/modules/std/filesystem.cppm | 4 +- .../llvm-project/libcxx/modules/std/mdspan.cppm | 2 +- contrib/llvm-project/libcxx/src/chrono.cpp | 2 +- .../libcxx/src/filesystem/filesystem_clock.cpp | 2 +- .../llvm-project/libunwind/src/Unwind-EHABI.cpp | 7 +- contrib/llvm-project/lld/ELF/Arch/LoongArch.cpp | 7 + contrib/llvm-project/lld/ELF/Arch/PPC.cpp | 12 +- contrib/llvm-project/lld/ELF/Arch/PPC64.cpp | 86 ++++-- contrib/llvm-project/lld/ELF/Target.h | 1 + contrib/llvm-project/lld/docs/ReleaseNotes.rst | 5 + .../ObjC/GNUstepObjCRuntime/GNUstepObjCRuntime.cpp | 42 ++- .../Process/Utility/RegisterContextPOSIX_arm64.cpp | 4 + .../Process/Utility/RegisterContextPOSIX_arm64.h | 1 + .../Process/Utility/RegisterInfoPOSIX_arm64.h | 1 + .../elf-core/RegisterContextPOSIXCore_arm64.cpp | 14 + .../elf-core/RegisterContextPOSIXCore_arm64.h | 1 + .../Plugins/Process/elf-core/RegisterUtilities.h | 4 + .../llvm/include/llvm/ADT/FunctionExtras.h | 12 +- .../llvm/include/llvm/ADT/SmallVector.h | 4 +- .../llvm/include/llvm/Analysis/LazyValueInfo.h | 3 + .../llvm/include/llvm/Analysis/RegionInfoImpl.h | 4 +- .../llvm/include/llvm/Analysis/ValueTracking.h | 4 - .../llvm/include/llvm/CodeGen/CodeGenPassBuilder.h | 2 +- .../llvm/include/llvm/CodeGen/LowLevelType.h | 7 +- .../llvm/CodeGen/PreISelIntrinsicLowering.h | 4 + .../llvm/include/llvm/CodeGen/TargetInstrInfo.h | 17 -- .../llvm-project/llvm/include/llvm/Object/Wasm.h | 10 +- .../llvm/include/llvm/ObjectYAML/WasmYAML.h | 1 + .../llvm/include/llvm/Option/ArgList.h | 1 + .../llvm/include/llvm/Support/type_traits.h | 38 --- .../llvm/TargetParser/LoongArchTargetParser.h | 5 +- .../AggressiveInstCombine/AggressiveInstCombine.h | 2 +- .../llvm/Transforms/IPO/FunctionSpecialization.h | 15 +- .../llvm/Transforms/Scalar/MemCpyOptimizer.h | 4 - .../llvm/lib/Analysis/LazyValueInfo.cpp | 9 + .../llvm/lib/Analysis/ScalarEvolution.cpp | 2 +- .../llvm/lib/Analysis/ValueTracking.cpp | 7 - .../llvm/lib/CodeGen/CalcSpillWeights.cpp | 15 +- .../llvm/lib/CodeGen/ComplexDeinterleavingPass.cpp | 30 +- .../llvm/lib/CodeGen/InlineSpiller.cpp | 34 ++- .../llvm/lib/CodeGen/LiveRangeEdit.cpp | 3 +- .../llvm/lib/CodeGen/LiveRangeShrink.cpp | 4 +- .../llvm-project/llvm/lib/CodeGen/MachineLICM.cpp | 4 + .../llvm/lib/CodeGen/PreISelIntrinsicLowering.cpp | 54 ++-- .../llvm/lib/CodeGen/RegAllocGreedy.cpp | 21 +- .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 6 +- .../llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 3 + .../CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 99 ++++--- contrib/llvm-project/llvm/lib/CodeGen/SplitKit.cpp | 17 +- contrib/llvm-project/llvm/lib/CodeGen/SplitKit.h | 7 +- .../llvm/lib/CodeGen/TargetInstrInfo.cpp | 7 +- .../llvm/lib/CodeGen/TargetLoweringBase.cpp | 2 +- .../lib/CodeGen/TargetLoweringObjectFileImpl.cpp | 21 +- contrib/llvm-project/llvm/lib/LTO/LTO.cpp | 7 +- .../llvm/lib/ObjCopy/wasm/WasmObject.h | 1 + .../llvm/lib/ObjCopy/wasm/WasmReader.cpp | 4 +- .../llvm/lib/ObjCopy/wasm/WasmWriter.cpp | 13 +- .../llvm-project/llvm/lib/Object/SymbolSize.cpp | 17 +- .../llvm/lib/Object/WasmObjectFile.cpp | 4 + .../llvm/lib/ObjectYAML/WasmEmitter.cpp | 12 +- .../llvm-project/llvm/lib/ObjectYAML/WasmYAML.cpp | 1 + contrib/llvm-project/llvm/lib/Option/ArgList.cpp | 7 + .../llvm-project/llvm/lib/TableGen/TGParser.cpp | 9 +- .../llvm/lib/Target/AArch64/AArch64.td | 6 +- .../lib/Target/AArch64/AArch64FrameLowering.cpp | 13 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 69 +++-- .../llvm/lib/Target/AArch64/AArch64InstrFormats.td | 9 +- .../llvm/lib/Target/AArch64/AArch64InstrInfo.cpp | 11 +- .../llvm/lib/Target/AArch64/AArch64InstrInfo.td | 20 +- .../Target/AArch64/AArch64LoadStoreOptimizer.cpp | 8 +- .../llvm/lib/Target/AArch64/AArch64SVEInstrInfo.td | 49 ++-- .../llvm/lib/Target/AArch64/AArch64Subtarget.h | 2 +- .../Target/AArch64/GISel/AArch64CallLowering.cpp | 5 + .../llvm/lib/Target/AArch64/SVEInstrFormats.td | 7 + .../llvm-project/llvm/lib/Target/AMDGPU/AMDGPU.h | 4 - .../llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp | 37 ++- .../llvm/lib/Target/AMDGPU/AMDGPUISelLowering.h | 2 +- .../llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.cpp | 47 +++- .../llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.h | 2 +- .../llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp | 16 +- .../llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp | 4 - .../llvm/lib/Target/AMDGPU/SIFrameLowering.cpp | 16 +- .../llvm/lib/Target/AMDGPU/SIISelLowering.cpp | 2 +- .../llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp | 7 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.cpp | 45 +-- .../llvm/lib/Target/AMDGPU/SIInstrInfo.h | 19 +- .../llvm/lib/Target/AMDGPU/SIInstructions.td | 7 - .../llvm/lib/Target/AMDGPU/SILowerSGPRSpills.cpp | 136 ++------- .../llvm/lib/Target/AMDGPU/SILowerWWMCopies.cpp | 141 ---------- .../lib/Target/AMDGPU/SIMachineFunctionInfo.cpp | 69 ++--- .../llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h | 39 ++- .../llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp | 23 +- .../llvm/lib/Target/AMDGPU/SIRegisterInfo.h | 17 +- .../llvm/lib/Target/ARM/ARMTargetTransformInfo.cpp | 2 + .../Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp | 6 +- .../llvm/lib/Target/BPF/BPFMISimplifyPatchable.cpp | 26 +- .../llvm-project/llvm/lib/Target/BPF/BTFDebug.cpp | 2 + .../llvm/lib/Target/LoongArch/LoongArch.td | 5 + .../lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp | 50 +++- .../Target/PowerPC/MCTargetDesc/PPCInstPrinter.cpp | 14 +- .../llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp | 37 +-- .../llvm/lib/Target/PowerPC/PPCInstrFormats.td | 6 + .../llvm/lib/Target/PowerPC/PPCInstrInfo.td | 9 + .../llvm/lib/Target/PowerPC/PPCMCInstLower.cpp | 4 - .../llvm/lib/Target/PowerPC/PPCScheduleP9.td | 2 +- .../llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp | 15 +- .../Target/RISCV/RISCVExpandAtomicPseudoInsts.cpp | 9 + .../llvm/lib/Target/RISCV/RISCVFrameLowering.cpp | 39 +-- .../llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp | 13 +- .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 26 +- .../lib/Target/RISCV/RISCVPushPopOptimizer.cpp | 3 +- .../llvm/lib/Target/Sparc/SparcInstrInfo.td | 16 ++ .../Target/SystemZ/SystemZTargetTransformInfo.cpp | 5 + contrib/llvm-project/llvm/lib/Target/X86/X86.td | 7 + .../llvm/lib/Target/X86/X86ISelLowering.cpp | 96 ++++--- .../llvm/lib/Target/X86/X86ISelLowering.h | 2 - .../llvm/lib/Target/X86/X86InstrAVX512.td | 10 + .../llvm/lib/Target/X86/X86InstrSSE.td | 5 + .../llvm/lib/Target/X86/X86TargetTransformInfo.cpp | 14 +- .../llvm/lib/Target/X86/X86TargetTransformInfo.h | 1 + .../llvm-project/llvm/lib/TargetParser/Host.cpp | 10 +- .../lib/TargetParser/LoongArchTargetParser.cpp | 12 + .../AggressiveInstCombine.cpp | 217 ++++----------- .../llvm/lib/Transforms/Coroutines/CoroElide.cpp | 83 ++++-- .../lib/Transforms/IPO/FunctionSpecialization.cpp | 82 +----- .../InstCombine/InstructionCombining.cpp | 2 +- .../Instrumentation/ControlHeightReduction.cpp | 14 + .../Transforms/Instrumentation/GCOVProfiling.cpp | 4 +- .../Transforms/Scalar/ConstraintElimination.cpp | 2 +- .../llvm/lib/Transforms/Scalar/JumpThreading.cpp | 2 + .../llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp | 256 +---------------- .../Transforms/Scalar/TailRecursionElimination.cpp | 6 + .../llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp | 14 +- .../lib/Transforms/Vectorize/LoopVectorize.cpp | 38 ++- .../llvm/tools/llvm-readobj/ELFDumper.cpp | 2 +- .../openmp/runtime/src/ompt-event-specific.h | 13 +- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 4 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 2 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- lib/libc++/__config_site | 1 + lib/libc++/module.modulemap | 65 ++--- 249 files changed, 3393 insertions(+), 2248 deletions(-) diff --cc contrib/llvm-project/libcxx/include/__mdspan/mdspan.h index 000000000000,58f3b9cf1b18..58f3b9cf1b18 mode 000000,100644..100644 --- a/contrib/llvm-project/libcxx/include/__mdspan/mdspan.h +++ b/contrib/llvm-project/libcxx/include/__mdspan/mdspan.h diff --cc contrib/llvm-project/libcxx/include/__std_clang_module index 000000000000,4d02336d30b0..4d02336d30b0 mode 000000,100644..100644 --- a/contrib/llvm-project/libcxx/include/__std_clang_module +++ b/contrib/llvm-project/libcxx/include/__std_clang_module diff --cc lib/clang/include/VCSVersion.inc index 4e304f6496c3,000000000000..c43f3a94a8ee mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-17-init-19304-gd0b54bb50e51" ++#define LLVM_REVISION "llvmorg-17.0.0-rc4-10-g0176e8729ea4" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-17-init-19304-gd0b54bb50e51" ++#define CLANG_REVISION "llvmorg-17.0.0-rc4-10-g0176e8729ea4" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-17-init-19304-gd0b54bb50e51" ++#define LLDB_REVISION "llvmorg-17.0.0-rc4-10-g0176e8729ea4" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/lld/Common/Version.inc index afc9d427f0e2,000000000000..eb48f368dbfc mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "17.0.0 (FreeBSD llvmorg-17-init-19304-gd0b54bb50e51-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "17.0.0 (FreeBSD llvmorg-17.0.0-rc4-10-g0176e8729ea4-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index 5b28e769a00d,000000000000..aa3f6fad22ee mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 17.0.0git - #define LLDB_VERSION_STRING "17.0.0git" ++#define LLDB_VERSION 17.0.0rc ++#define LLDB_VERSION_STRING "17.0.0rc" +#define LLDB_VERSION_MAJOR 17 +#define LLDB_VERSION_MINOR 0 +#define LLDB_VERSION_PATCH 0 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index afe1420ce3bb,000000000000..4c434a179f28 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,378 -1,0 +1,378 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* 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_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 17.0.0git" ++#define PACKAGE_STRING "LLVM 17.0.0rc" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "17.0.0git" ++#define PACKAGE_VERSION "17.0.0rc" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index b809650a0a1c,000000000000..07229dfed518 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,131 -1,0 +1,131 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 17 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 0 + +/* Patch version of the LLVM API */ +#define LLVM_VERSION_PATCH 0 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "17.0.0git" ++#define LLVM_VERSION_STRING "17.0.0rc" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite instead of libtensorflow */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if the xar_open() function is supported on this platform. */ +#if defined(__APPLE__) +#define LLVM_HAVE_LIBXAR 1 +#endif + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 8bcae47e7373,000000000000..3fe424f06278 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-17-init-19304-gd0b54bb50e51" ++#define LLVM_REVISION "llvmorg-17.0.0-rc4-10-g0176e8729ea4" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/libc++/__config_site index 86c6b3a278ca,000000000000..858699c83b3d mode 100644,000000..100644 --- a/lib/libc++/__config_site +++ b/lib/libc++/__config_site @@@ -1,53 -1,0 +1,54 @@@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef _LIBCPP___CONFIG_SITE +#define _LIBCPP___CONFIG_SITE + +#define _LIBCPP_ABI_VERSION 1 +#define _LIBCPP_ABI_NAMESPACE __1 +/* #undef _LIBCPP_ABI_FORCE_ITANIUM */ +/* #undef _LIBCPP_ABI_FORCE_MICROSOFT */ +/* #undef _LIBCPP_HAS_NO_THREADS */ +/* #undef _LIBCPP_HAS_NO_MONOTONIC_CLOCK */ +/* #undef _LIBCPP_HAS_MUSL_LIBC */ +/* #undef _LIBCPP_HAS_THREAD_API_PTHREAD */ +/* #undef _LIBCPP_HAS_THREAD_API_EXTERNAL */ +/* #undef _LIBCPP_HAS_THREAD_API_WIN32 */ +/* #undef _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS */ +#define _LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS +/* #undef _LIBCPP_NO_VCRUNTIME */ +/* #undef _LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION */ +/* #undef _LIBCPP_HAS_NO_FILESYSTEM */ +/* #undef _LIBCPP_HAS_NO_RANDOM_DEVICE */ +/* #undef _LIBCPP_HAS_NO_LOCALIZATION */ +/* #undef _LIBCPP_HAS_NO_WIDE_CHARACTERS */ ++#define _LIBCPP_ENABLE_ASSERTIONS_DEFAULT 0 + +// PSTL backends +/* #undef _LIBCPP_PSTL_CPU_BACKEND_SERIAL */ +#define _LIBCPP_PSTL_CPU_BACKEND_THREAD +/* #undef _LIBCPP_PSTL_CPU_BACKEND_LIBDISPATCH */ + +// Hardening. +#define _LIBCPP_ENABLE_HARDENED_MODE_DEFAULT 0 +#define _LIBCPP_ENABLE_DEBUG_MODE_DEFAULT 0 + +// __USE_MINGW_ANSI_STDIO gets redefined on MinGW +#ifdef __clang__ +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wmacro-redefined" +#endif + + + + +#ifdef __clang__ +# pragma clang diagnostic pop +#endif + +#endif // _LIBCPP___CONFIG_SITE diff --cc lib/libc++/module.modulemap index eaab0af43e6f,000000000000..e3929e56525b mode 100644,000000..100644 --- a/lib/libc++/module.modulemap +++ b/lib/libc++/module.modulemap @@@ -1,2076 -1,0 +1,2061 @@@ +// Main C++ standard library interfaces +module std_algorithm [system] { + header "algorithm" + export * +} +module std_any [system] { + header "any" + export * +} +module std_array [system] { + header "array" + export * +} +module std_atomic [system] { + header "atomic" + export * +} +module std_barrier [system] { - + header "barrier" + export * +} +module std_bit [system] { + header "bit" + export * +} +module std_bitset [system] { + header "bitset" + export * +} +module std_charconv [system] { + header "charconv" + export * +} +module std_chrono [system] { + header "chrono" + export * +} +module std_codecvt [system] { - + header "codecvt" + export * +} +module std_compare [system] { + header "compare" + export * +} +module std_complex [system] { + header "complex" + export * +} +module std_concepts [system] { + header "concepts" + export * +} +module std_condition_variable [system] { + header "condition_variable" + export * +} +module std_coroutine [system] { + header "coroutine" + export * +} +module std_deque [system] { + header "deque" *** 2036 LINES SKIPPED *** From nobody Fri Dec 8 17:38:48 2023 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 4Smyzt45Q6z5369P; Fri, 8 Dec 2023 17:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smyzt38L2z3RHW; Fri, 8 Dec 2023 17:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MRlR/C98XrnEmt6XYIBxTWHBQBGlcaa8wZuRIO2grlA=; b=KeqsFmopOA35wfCWjWXKl+JRNZlMl3QAN5wyo3cEZPrycS4rgtaDhu61bcKTvidI4NWlPs tL4XBUHThwg0ipzSTTGp+MnzVTDthcbM41aIpaV/EYdcnTOecTFjo9VXfWbgl0d1wUWEWa +F8ejZMdO9O4k0ICzzqA7fCLs5Oz/O4fmnEmzh9bz1W4srqwAWv1u1ZR5m58imVdj5Q7K7 19psZfCPi25W8J31rY3uUE3d9okCLKv1UfJU/l98wxa/hgTjjUi1Xynaand09eNcRFwN54 SZI7/c19JWVsENQaW1ZI6/YlC4kKy42AQObNgTf2C2q6JEWB8DmGGKnGW3ubsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702057130; a=rsa-sha256; cv=none; b=wW51RTTfADkuK6bVFdWKOofZfSo2O2l775gDsy4sXLs7LFVG47PEm60TnwhMqXOSN5e3IN UdlI+COB7HeN++7pgexMnAP1H7vRSsWXjttUa2R7ei4g5K3sd6D0q1bXzg4JVAJFQHWrRf HjlxXPqEigzOjaRmpX0LgLdTkgWPrG0zxzDBHywe7nb8LQZJIgJzKMZl6oZhC8Umk4/NN3 ca94Tt2FOfQN7UE/2RIq7KcVXXug5E19p/1Pf9BPBSeeBcL1O8+5SQqTz44FMkPgwCa+FC b7jI+LWyWPSsar9eOrva7iSPAR7/Ps8EJMewJLkM5VTESWBxrpu9AklMj7Ltfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MRlR/C98XrnEmt6XYIBxTWHBQBGlcaa8wZuRIO2grlA=; b=qbKFmxIC//pCd0zniqK/Jfmai82UOzH4MjxBv53SesV/Kjnzjuf9KJKk2QaTXNtAEtPLOr mTUbXgOy/0EipgMAJDFNwbV5Yv+g9fkYV40s2Y00ZSHVoIxmJc9bouBXJ9/HLb4guleAWs IWgd42GQrpmgaHaah80OC2xutFJETXZKqVy12nz//+3iySkdwdY68Tzpjrh0DR6kQyUp74 h1oDFZP7gcEygNQDwF8wruCdgbSlaepHkfL8o9ZuaJWctiUJUOfaBlmeEZ1DRxHE+hs2wo rQyeG1S7mDh3BWQBZGD5ne2bOxfkAYN51qorCYpH7UfsVaCCnM20P8bSCXCM7g== 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 4Smyzt2Ft6zVhL; Fri, 8 Dec 2023 17:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8HcoMD067855; Fri, 8 Dec 2023 17:38:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8HcmQb067852; Fri, 8 Dec 2023 17:38:48 GMT (envelope-from git) Date: Fri, 8 Dec 2023 17:38:48 GMT Message-Id: <202312081738.3B8HcmQb067852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 4542f901cb0c - main - Merge llvm-project release/17.x llvmorg-17.0.1-25-g098e653a5bed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 4542f901cb0c5dd66ab5b541f2fbc659fd46f893 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4542f901cb0c5dd66ab5b541f2fbc659fd46f893 commit 4542f901cb0c5dd66ab5b541f2fbc659fd46f893 Merge: 8a4dda33d675 4bbf1f460eb3 Author: Dimitry Andric AuthorDate: 2023-09-29 18:51:44 +0000 Commit: Dimitry Andric CommitDate: 2023-12-08 17:35:22 +0000 Merge llvm-project release/17.x llvmorg-17.0.1-25-g098e653a5bed This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-17.0.1-25-g098e653a5bed. PR: 273753 MFC after: 1 month .../DependencyScanningFilesystem.h | 18 ++++- .../llvm-project/clang/lib/AST/ExprConstant.cpp | 17 +++-- contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 24 ------- .../llvm-project/clang/lib/CodeGen/CGCoroutine.cpp | 33 --------- .../clang/lib/CodeGen/CodeGenFunction.h | 5 -- .../clang/lib/Frontend/TextDiagnostic.cpp | 3 +- .../lib/Headers/cuda_wrappers/bits/basic_string.h | 9 +++ .../Headers/cuda_wrappers/bits/basic_string.tcc | 9 +++ .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 6 +- .../DependencyScanningFilesystem.cpp | 79 ++++++++++++++++++---- contrib/llvm-project/libcxx/include/__config | 2 +- contrib/llvm-project/lld/COFF/Writer.cpp | 2 +- .../llvm/include/llvm/Transforms/Utils/Local.h | 10 +++ .../llvm-project/llvm/lib/Analysis/InlineCost.cpp | 20 ++---- .../llvm/lib/CodeGen/StackColoring.cpp | 62 ++++------------- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 4 +- .../llvm/lib/Target/ARM/ARMInstrInfo.td | 2 +- .../llvm/lib/Target/ARM/ARMInstrThumb2.td | 2 +- .../llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp | 28 ++++++-- .../llvm/lib/Transforms/Scalar/GVN.cpp | 7 +- .../llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp | 23 ++++--- .../lib/Transforms/Scalar/SimpleLoopUnswitch.cpp | 61 +++++++++-------- .../llvm/lib/Transforms/Utils/Local.cpp | 31 +++++++-- .../llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 12 ++-- contrib/llvm-project/llvm/tools/lli/lli.cpp | 14 ++++ .../llvm/tools/llvm-readobj/COFFDumper.cpp | 30 ++++---- lib/clang/headers/Makefile | 22 ++++-- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 34 files changed, 319 insertions(+), 246 deletions(-) diff --cc contrib/llvm-project/clang/lib/Headers/cuda_wrappers/bits/basic_string.h index 000000000000,64f50d9f6a72..64f50d9f6a72 mode 000000,100644..100644 --- a/contrib/llvm-project/clang/lib/Headers/cuda_wrappers/bits/basic_string.h +++ b/contrib/llvm-project/clang/lib/Headers/cuda_wrappers/bits/basic_string.h diff --cc contrib/llvm-project/clang/lib/Headers/cuda_wrappers/bits/basic_string.tcc index 000000000000,90c7fe34d932..90c7fe34d932 mode 000000,100644..100644 --- a/contrib/llvm-project/clang/lib/Headers/cuda_wrappers/bits/basic_string.tcc +++ b/contrib/llvm-project/clang/lib/Headers/cuda_wrappers/bits/basic_string.tcc diff --cc lib/clang/headers/Makefile index 3090979f5431,000000000000..49f78b0a4d97 mode 100644,000000..100644 --- a/lib/clang/headers/Makefile +++ b/lib/clang/headers/Makefile @@@ -1,243 -1,0 +1,251 @@@ + +.include "../clang.pre.mk" + +.PATH: ${CLANG_SRCS}/lib/Headers + - INCSGROUPS= INCS CUDA HLSL OMP ORC PPC ++INCSGROUPS+= INCS +INCSDIR= ${LIBDIR}/clang/17/include - CUDADIR= ${INCSDIR}/cuda_wrappers - HLSLDIR= ${INCSDIR}/hlsl - OMPDIR= ${INCSDIR}/openmp_wrappers - PPCDIR= ${INCSDIR}/ppc_wrappers - +INCS+= __clang_cuda_builtin_vars.h +INCS+= __clang_cuda_cmath.h +INCS+= __clang_cuda_complex_builtins.h +INCS+= __clang_cuda_device_functions.h +INCS+= __clang_cuda_intrinsics.h +INCS+= __clang_cuda_libdevice_declares.h +INCS+= __clang_cuda_math.h +INCS+= __clang_cuda_math_forward_declares.h +INCS+= __clang_cuda_runtime_wrapper.h +INCS+= __clang_cuda_texture_intrinsics.h +INCS+= __clang_hip_cmath.h +INCS+= __clang_hip_libdevice_declares.h +INCS+= __clang_hip_math.h +INCS+= __clang_hip_runtime_wrapper.h +INCS+= __clang_hip_stdlib.h +INCS+= __stddef_max_align_t.h +INCS+= __wmmintrin_aes.h +INCS+= __wmmintrin_pclmul.h +INCS+= adxintrin.h +INCS+= altivec.h +INCS+= ammintrin.h +INCS+= amxcomplexintrin.h +INCS+= amxfp16intrin.h +INCS+= amxintrin.h +INCS+= arm64intr.h +INCS+= arm_acle.h +INCS+= arm_cmse.h +INCS+= arm_neon_sve_bridge.h +INCS+= armintr.h +INCS+= avx2intrin.h +INCS+= avx512bf16intrin.h +INCS+= avx512bitalgintrin.h +INCS+= avx512bwintrin.h +INCS+= avx512cdintrin.h +INCS+= avx512dqintrin.h +INCS+= avx512erintrin.h +INCS+= avx512fintrin.h +INCS+= avx512fp16intrin.h +INCS+= avx512ifmaintrin.h +INCS+= avx512ifmavlintrin.h +INCS+= avx512pfintrin.h +INCS+= avx512vbmi2intrin.h +INCS+= avx512vbmiintrin.h +INCS+= avx512vbmivlintrin.h +INCS+= avx512vlbf16intrin.h +INCS+= avx512vlbitalgintrin.h +INCS+= avx512vlbwintrin.h +INCS+= avx512vlcdintrin.h +INCS+= avx512vldqintrin.h +INCS+= avx512vlfp16intrin.h +INCS+= avx512vlintrin.h +INCS+= avx512vlvbmi2intrin.h +INCS+= avx512vlvnniintrin.h +INCS+= avx512vlvp2intersectintrin.h +INCS+= avx512vnniintrin.h +INCS+= avx512vp2intersectintrin.h +INCS+= avx512vpopcntdqintrin.h +INCS+= avx512vpopcntdqvlintrin.h +INCS+= avxifmaintrin.h +INCS+= avxintrin.h +INCS+= avxneconvertintrin.h +INCS+= avxvnniint16intrin.h +INCS+= avxvnniint8intrin.h +INCS+= avxvnniintrin.h +INCS+= bmi2intrin.h +INCS+= bmiintrin.h +INCS+= builtins.h +INCS+= cet.h +INCS+= cetintrin.h +INCS+= cldemoteintrin.h +INCS+= clflushoptintrin.h +INCS+= clwbintrin.h +INCS+= clzerointrin.h +INCS+= cmpccxaddintrin.h +INCS+= cpuid.h +INCS+= crc32intrin.h +INCS+= emmintrin.h +INCS+= enqcmdintrin.h +INCS+= f16cintrin.h +INCS+= fma4intrin.h +INCS+= fmaintrin.h +INCS+= fxsrintrin.h +INCS+= gfniintrin.h +INCS+= hexagon_circ_brev_intrinsics.h +INCS+= hexagon_protos.h +INCS+= hexagon_types.h +INCS+= hlsl.h +INCS+= hresetintrin.h +INCS+= htmintrin.h +INCS+= htmxlintrin.h +INCS+= hvx_hexagon_protos.h +INCS+= ia32intrin.h +INCS+= immintrin.h +INCS+= invpcidintrin.h +INCS+= keylockerintrin.h +INCS+= larchintrin.h +INCS+= lwpintrin.h +INCS+= lzcntintrin.h +INCS+= mm3dnow.h +INCS+= mm_malloc.h +INCS+= mmintrin.h +INCS+= module.modulemap +INCS+= movdirintrin.h +INCS+= msa.h +INCS+= mwaitxintrin.h +INCS+= nmmintrin.h +INCS+= opencl-c-base.h +INCS+= opencl-c.h +INCS+= pconfigintrin.h +INCS+= pkuintrin.h +INCS+= pmmintrin.h +INCS+= popcntintrin.h +INCS+= prfchiintrin.h +INCS+= prfchwintrin.h +INCS+= ptwriteintrin.h +INCS+= raointintrin.h +INCS+= rdpruintrin.h +INCS+= rdseedintrin.h +INCS+= riscv_ntlh.h +INCS+= riscv_vector.h +INCS+= rtmintrin.h +INCS+= s390intrin.h +INCS+= serializeintrin.h +INCS+= sgxintrin.h +INCS+= sha512intrin.h +INCS+= shaintrin.h +INCS+= sifive_vector.h +INCS+= sm3intrin.h +INCS+= sm4intrin.h +INCS+= smmintrin.h +INCS+= tbmintrin.h +INCS+= tmmintrin.h +INCS+= tsxldtrkintrin.h +INCS+= uintrintrin.h +INCS+= vadefs.h +INCS+= vaesintrin.h +INCS+= vecintrin.h +INCS+= velintrin.h +INCS+= velintrin_approx.h +INCS+= velintrin_gen.h +INCS+= vpclmulqdqintrin.h +INCS+= waitpkgintrin.h +INCS+= wasm_simd128.h +INCS+= wbnoinvdintrin.h +INCS+= wmmintrin.h +INCS+= x86gprintrin.h +INCS+= x86intrin.h +INCS+= xmmintrin.h +INCS+= xopintrin.h +INCS+= xsavecintrin.h +INCS+= xsaveintrin.h +INCS+= xsaveoptintrin.h +INCS+= xsavesintrin.h +INCS+= xtestintrin.h +INCS+= ${GENINCS} + +# Headers which possibly conflict with our own versions: +.ifdef INSTALL_CONFLICTING_CLANG_HEADERS +INCS+= float.h +INCS+= intrin.h +INCS+= inttypes.h +INCS+= iso646.h +INCS+= limits.h +INCS+= stdalign.h +INCS+= stdarg.h +INCS+= stdatomic.h +INCS+= stdbool.h +INCS+= stddef.h +INCS+= stdint.h +INCS+= stdnoreturn.h +INCS+= tgmath.h +INCS+= unwind.h +INCS+= varargs.h +.endif # INSTALL_CONFLICTING_CLANG_HEADERS + ++INCSGROUPS+= CUDA ++CUDADIR= ${INCSDIR}/cuda_wrappers +CUDA+= cuda_wrappers/algorithm - CUDA+= cuda_wrappers/bits/shared_ptr_base.h +CUDA+= cuda_wrappers/cmath +CUDA+= cuda_wrappers/complex +CUDA+= cuda_wrappers/new + ++INCSGROUPS+= CUDB ++CUDBDIR= ${INCSDIR}/cuda_wrappers/bits ++CUDB+= cuda_wrappers/bits/basic_string.h ++CUDB+= cuda_wrappers/bits/basic_string.tcc ++CUDB+= cuda_wrappers/bits/shared_ptr_base.h ++ ++INCSGROUPS+= HLSL ++HLSLDIR= ${INCSDIR}/hlsl +HLSL+= hlsl/hlsl_basic_types.h +HLSL+= hlsl/hlsl_intrinsics.h + ++INCSGROUPS+= OMP ++OMPDIR= ${INCSDIR}/openmp_wrappers +OMP+= openmp_wrappers/__clang_openmp_device_functions.h +OMP+= openmp_wrappers/cmath +OMP+= openmp_wrappers/complex +OMP+= openmp_wrappers/complex.h +OMP+= openmp_wrappers/complex_cmath.h +OMP+= openmp_wrappers/math.h +OMP+= openmp_wrappers/new + ++INCSGROUPS+= PPC ++PPCDIR= ${INCSDIR}/ppc_wrappers +PPC+= ppc_wrappers/bmi2intrin.h +PPC+= ppc_wrappers/bmiintrin.h +PPC+= ppc_wrappers/emmintrin.h +PPC+= ppc_wrappers/immintrin.h +PPC+= ppc_wrappers/mm_malloc.h +PPC+= ppc_wrappers/mmintrin.h +PPC+= ppc_wrappers/pmmintrin.h +PPC+= ppc_wrappers/smmintrin.h +PPC+= ppc_wrappers/tmmintrin.h +PPC+= ppc_wrappers/x86gprintrin.h +PPC+= ppc_wrappers/x86intrin.h +PPC+= ppc_wrappers/xmmintrin.h + +.for hdr in bf16/bf16 cde/cde-header fp16/fp16 mve/mve-header neon/neon \ + sve/sve-header +arm_${hdr:H}.h: ${CLANG_SRCS}/include/clang/Basic/arm_${hdr:H}.td + ${CLANG_TBLGEN} -gen-arm-${hdr:T} \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_${hdr:H}.td +GENINCS+= arm_${hdr:H}.h +.endfor + +arm_sme_draft_spec_subject_to_change.h: ${CLANG_SRCS}/include/clang/Basic/arm_sme.td + ${CLANG_TBLGEN} -gen-arm-sme-header \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sme.td +GENINCS+= arm_sme_draft_spec_subject_to_change.h + +.for hdr in vector/vector-header +riscv_${hdr:H}.h: ${CLANG_SRCS}/include/clang/Basic/riscv_${hdr:H}.td + ${CLANG_TBLGEN} -gen-riscv-${hdr:T} \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_${hdr:H}.td +GENINCS+= riscv_${hdr:H}.h +.endfor + +CLEANFILES= ${GENINCS} ${GENINCS:C/$/.d/} + +.include diff --cc lib/clang/include/VCSVersion.inc index c43f3a94a8ee,000000000000..c4338e330ee5 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-17.0.0-rc4-10-g0176e8729ea4" ++#define LLVM_REVISION "llvmorg-17.0.1-25-g098e653a5bed" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-17.0.0-rc4-10-g0176e8729ea4" ++#define CLANG_REVISION "llvmorg-17.0.1-25-g098e653a5bed" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-17.0.0-rc4-10-g0176e8729ea4" ++#define LLDB_REVISION "llvmorg-17.0.1-25-g098e653a5bed" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index 7d26ce264705,000000000000..750d9ecbc020 mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,8 -1,0 +1,8 @@@ - #define CLANG_VERSION 17.0.0 - #define CLANG_VERSION_STRING "17.0.0" ++#define CLANG_VERSION 17.0.2 ++#define CLANG_VERSION_STRING "17.0.2" +#define CLANG_VERSION_MAJOR 17 +#define CLANG_VERSION_MAJOR_STRING "17" +#define CLANG_VERSION_MINOR 0 - #define CLANG_VERSION_PATCHLEVEL 0 ++#define CLANG_VERSION_PATCHLEVEL 2 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index eb48f368dbfc,000000000000..9341b11bbc19 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "17.0.0 (FreeBSD llvmorg-17.0.0-rc4-10-g0176e8729ea4-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "17.0.2 (FreeBSD llvmorg-17.0.1-25-g098e653a5bed-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index aa3f6fad22ee,000000000000..b87053e1884d mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 17.0.0rc - #define LLDB_VERSION_STRING "17.0.0rc" ++#define LLDB_VERSION 17.0.2 ++#define LLDB_VERSION_STRING "17.0.2" +#define LLDB_VERSION_MAJOR 17 +#define LLDB_VERSION_MINOR 0 - #define LLDB_VERSION_PATCH 0 ++#define LLDB_VERSION_PATCH 2 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 4c434a179f28,000000000000..56b377d33f9b mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,378 -1,0 +1,378 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* 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_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 17.0.0rc" ++#define PACKAGE_STRING "LLVM 17.0.2" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "17.0.0rc" ++#define PACKAGE_VERSION "17.0.2" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 07229dfed518,000000000000..36bf884d2fdb mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,131 -1,0 +1,131 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 17 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 0 + +/* Patch version of the LLVM API */ - #define LLVM_VERSION_PATCH 0 ++#define LLVM_VERSION_PATCH 2 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "17.0.0rc" ++#define LLVM_VERSION_STRING "17.0.2" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite instead of libtensorflow */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if the xar_open() function is supported on this platform. */ +#if defined(__APPLE__) +#define LLVM_HAVE_LIBXAR 1 +#endif + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 3fe424f06278,000000000000..796a12cb1ea0 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-17.0.0-rc4-10-g0176e8729ea4" ++#define LLVM_REVISION "llvmorg-17.0.1-25-g098e653a5bed" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Fri Dec 8 17:38:55 2023 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 4Smz022ncxz5369S; Fri, 8 Dec 2023 17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smz0220fsz3Rcw; Fri, 8 Dec 2023 17: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=1702057138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ni7iPe4jaPyu3kFMva7OH1h/mS/QLU4UTmKgcVhg4t0=; b=l+LeW6Kuiu7544GwGfqV+lCTrPfCloCiEoQoXSSdajFVaDQ0iRerCCzcbS4859ZugN6UKc qwxSIGLOrA/FJ4TeYFEljeL24pr4T/7PiKkBjAJGJ0sTj94MB/F/6KLtp41TGkjbc/ACQ4 O6t4F3TvwJHAroIYv39NYRVwDf6nkx75NUbTXJFKj3ADYEHV+l5fkQoniuOp1vEQbjOt1u DBVz7NdGJksiVWFJ7RzQhAUS16bVfIOO0K4qiNwDqaMurSeDbAmYBuz4JtYWyG+6qa0cCz GMyZskE3wkFni50EP7p4tzOVEqERJs8mSx0HEITTfHkdUCUVZkGNEdtPtvbMMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702057138; a=rsa-sha256; cv=none; b=SoQWMatyl50staaLSRd5d6epN+X5J+SunCxCP6BA6hlSXc8Qltiyrkfcq24S3YFNh5Zras oL3/fU7h1u/QjfeIxV4291GyKx9RtW8BoWXyRC9dml7mAiOfp0LXRSiH9G0S9dVL0C0hvR hIdNRg0/o48pjBPnnSvxAOKsWZUOaL2x9K7n5Gowe6tMGNNwYLLjI+w+skbOGXhNjzOh8X A85BrN6ZLZk9LmSuD4qkgkCwVRuwlLCEh2t1gLRLLK+45QWOymlHfPjyyUpno7mlN61TYE IFL+VTw+yHy6z4J4/PzFnxiBNf9ve7nicU588gtXmUQyqFgQTnIdASpe3Vcrnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ni7iPe4jaPyu3kFMva7OH1h/mS/QLU4UTmKgcVhg4t0=; b=oejaN9eAn/X0Jjz0ACWS1Fbffcs5qcb4qAuRfPWlaxJhnjDImwXHii7Rb7cxSUxyVQRw5Q fNa8xJ0KmHPq70JA6wGA4AdDfPdEF7zVQEN9enB6EESfT2tXc5hJ1fJweMyzXhmB6IeK1V eGQfTOFfjl4KnOKwGVhM2KozeUeYXatGIOHF4rnuxMK1Cr9wj664QjXO5yQ81jzZVWphjm E6jvuFRk/BASLUbpr42d/NMBTjjBgWgOmq87nf4Uwuo3kBDtZmHZoYmSTHIKkqmgpxzTcL O/xBT5OgFSp2Uzp4ISQ+ICZltpTjD4AwmmBISQx/Whewhn/psm8FB30mwGbhmg== 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 4Smz020bv5zWGY; Fri, 8 Dec 2023 17:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8HcvE4067917; Fri, 8 Dec 2023 17:38:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8Hct8f067909; Fri, 8 Dec 2023 17:38:55 GMT (envelope-from git) Date: Fri, 8 Dec 2023 17:38:55 GMT Message-Id: <202312081738.3B8Hct8f067909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 3bd749dbd90c - main - Merge llvm-project release/17.x llvmorg-17.0.2-0-gb2417f51dbbd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 3bd749dbd90cc3b95719b65393df5ca8a0fe919d Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3bd749dbd90cc3b95719b65393df5ca8a0fe919d commit 3bd749dbd90cc3b95719b65393df5ca8a0fe919d Merge: 4542f901cb0c 7d1b50167725 Author: Dimitry Andric AuthorDate: 2023-10-04 18:24:05 +0000 Commit: Dimitry Andric CommitDate: 2023-12-08 17:35:33 +0000 Merge llvm-project release/17.x llvmorg-17.0.2-0-gb2417f51dbbd This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-17.0.2-0-gb2417f51dbbd. PR: 273753 MFC after: 1 month .../clang/lib/Driver/ToolChains/MinGW.cpp | 7 ++-- .../llvm-project/libcxx/include/__utility/pair.h | 4 +-- contrib/llvm-project/lld/COFF/Driver.cpp | 42 +++++++++++----------- contrib/llvm-project/lld/Common/Filesystem.cpp | 2 +- .../lib/CodeGen/TargetLoweringObjectFileImpl.cpp | 2 +- lib/clang/include/VCSVersion.inc | 6 ++-- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 8 files changed, 36 insertions(+), 31 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index c4338e330ee5,000000000000..09e5bd0806a8 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-17.0.1-25-g098e653a5bed" ++#define LLVM_REVISION "llvmorg-17.0.2-0-gb2417f51dbbd" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-17.0.1-25-g098e653a5bed" ++#define CLANG_REVISION "llvmorg-17.0.2-0-gb2417f51dbbd" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-17.0.1-25-g098e653a5bed" ++#define LLDB_REVISION "llvmorg-17.0.2-0-gb2417f51dbbd" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/lld/Common/Version.inc index 9341b11bbc19,000000000000..dacfc6668edb mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "17.0.2 (FreeBSD llvmorg-17.0.1-25-g098e653a5bed-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "17.0.2 (FreeBSD llvmorg-17.0.2-0-gb2417f51dbbd-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 796a12cb1ea0,000000000000..846d3cb3e014 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-17.0.1-25-g098e653a5bed" ++#define LLVM_REVISION "llvmorg-17.0.2-0-gb2417f51dbbd" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Fri Dec 8 17:39:03 2023 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 4Smz0B0Sgpz535yw; Fri, 8 Dec 2023 17:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smz096xRmz3S9R; Fri, 8 Dec 2023 17:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WH73uizdlKIFAMHVQWpHrctccMbVCyMPNCMve3kNe1I=; b=dFBJDMInQBSPbkjmKJ6WB4P0NaBcg2cGfpx2GbE9GtlMu3DTXLoyQ2jTfTVxPmYEs8H07t 89+dyHQEAi6FgcYsSRglopLBq48TGcghn8BvVeE6GxbopwUL5Oty9x1PSgPg1PG4YOnq5t QWqQMYjeqHWQxK6WrFpfTceWQFDMDWdxJYsVfuXwf9J/Dnou9CtA20Uu4VE47uTeia7pPc mq88wAcVZC+rQ9f/a4MH1DRfrlhITaXBsm6P1dUWtBX98F0zNNkIgBIVAegr7n7c7PVjUP t+I/Ix7Xf65+v3/BqGB6b25h13evL6B5LCbNFJzGOnfb6pDVSY0BWKEas6OrHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702057146; a=rsa-sha256; cv=none; b=oHNl89FsvAyyn5fV5/ormeUCiRnDqtBkTn9MF/FDa/9La9YPzIobTQgRw5ABl3RN0xWBB6 Cmkqf6hQi3Zav6KDWLzxh4Pc/eo0D+rjNAwTH2wFkLmNCTxNfS42nOJJKxv4EHXvbDP0cH 5jZKHiXLq/IVBN0enAiq+EO2KthsS+NJzIDM8cuKOTFsRkTK+bfq40aKxaPlQWRu2STuCg Dl79499LhiOi3sc7v+u286xCOXwJZXF1k/gN9sZkPLsXANap3GCTCbPMJwt3OGuLJloqMc HKME2B3lUe3jW1ztCFZ0BGXwDQlTE6Uue4ls7zFczUq25ZouFnUVLvB7XMgr/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WH73uizdlKIFAMHVQWpHrctccMbVCyMPNCMve3kNe1I=; b=jH0GUBpUHjPDGIF6Pssi/yWvv+qL8lIC5RoG5p+UsupO3HEqvGTTM5Mutfv02w+ejvVq+T ODZ2WJd0Urs4MimeGdFOACt5kF0vFQTAdDcwi7jhXyOlQ880557fBhj/vg1Sn2o8SsxmU1 l4wQoxFhUyAeiozY7idbpBTIOQSgIXkpHzHAbZswD5ImXiAF8fuMVNgDlz6D91AX9Ebh9I cB7FV9bgFNv/3D3TDIxRjZd8cNX/tIg5bVpR37tMRo+M5CWClsTESMRmeh4s5KUYPlsI7A JxlgYb7FfUYGZnnMqavSxizbvfaN1sn0tGAqcNXDpy46sHk6dnfbt2HupvnhEg== 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 4Smz095zj0zWJ2; Fri, 8 Dec 2023 17:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8Hd5bp067971; Fri, 8 Dec 2023 17:39:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8Hd3vC067967; Fri, 8 Dec 2023 17:39:03 GMT (envelope-from git) Date: Fri, 8 Dec 2023 17:39:03 GMT Message-Id: <202312081739.3B8Hd3vC067967@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: bdb86d1a853a - main - Merge llvm-project release/17.x llvmorg-17.0.3-0-g888437e1b600 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: bdb86d1a853a919764f65fdedcea76d76e4d619b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bdb86d1a853a919764f65fdedcea76d76e4d619b commit bdb86d1a853a919764f65fdedcea76d76e4d619b Merge: 3bd749dbd90c cd255c5cf244 Author: Dimitry Andric AuthorDate: 2023-10-21 13:31:11 +0000 Commit: Dimitry Andric CommitDate: 2023-12-08 17:35:41 +0000 Merge llvm-project release/17.x llvmorg-17.0.3-0-g888437e1b600 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-17.0.3-0-g888437e1b600. PR: 273753 MFC after: 1 month .../clang/lib/Driver/ToolChains/MinGW.cpp | 2 + .../clang/lib/Format/UnwrappedLineParser.cpp | 24 +++++++++ .../clang/lib/Format/UnwrappedLineParser.h | 11 ++++ .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 25 +++++---- .../clang/utils/TableGen/ClangAttrEmitter.cpp | 17 +++--- contrib/llvm-project/libcxx/include/__config | 2 +- contrib/llvm-project/lld/COFF/InputFiles.cpp | 2 + .../llvm/lib/Analysis/LazyValueInfo.cpp | 2 +- contrib/llvm-project/llvm/lib/MC/MCWin64EH.cpp | 3 ++ .../lib/Target/AArch64/AArch64ISelLowering.cpp | 7 ++- .../llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 2 +- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 21 ++++++-- .../Instrumentation/AddressSanitizer.cpp | 61 ++++++++++++---------- lib/clang/include/VCSVersion.inc | 6 +-- lib/clang/include/clang/Basic/Version.inc | 6 +-- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +-- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 20 files changed, 139 insertions(+), 70 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index 09e5bd0806a8,000000000000..7f43e4566eeb mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-17.0.2-0-gb2417f51dbbd" ++#define LLVM_REVISION "llvmorg-17.0.3-0-g888437e1b600" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-17.0.2-0-gb2417f51dbbd" ++#define CLANG_REVISION "llvmorg-17.0.3-0-g888437e1b600" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-17.0.2-0-gb2417f51dbbd" ++#define LLDB_REVISION "llvmorg-17.0.3-0-g888437e1b600" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index 750d9ecbc020,000000000000..c364a69c7209 mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,8 -1,0 +1,8 @@@ - #define CLANG_VERSION 17.0.2 - #define CLANG_VERSION_STRING "17.0.2" ++#define CLANG_VERSION 17.0.3 ++#define CLANG_VERSION_STRING "17.0.3" +#define CLANG_VERSION_MAJOR 17 +#define CLANG_VERSION_MAJOR_STRING "17" +#define CLANG_VERSION_MINOR 0 - #define CLANG_VERSION_PATCHLEVEL 2 ++#define CLANG_VERSION_PATCHLEVEL 3 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index dacfc6668edb,000000000000..135feafee438 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "17.0.2 (FreeBSD llvmorg-17.0.2-0-gb2417f51dbbd-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "17.0.3 (FreeBSD llvmorg-17.0.3-0-g888437e1b600-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index b87053e1884d,000000000000..e9dbb0ca765e mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 17.0.2 - #define LLDB_VERSION_STRING "17.0.2" ++#define LLDB_VERSION 17.0.3 ++#define LLDB_VERSION_STRING "17.0.3" +#define LLDB_VERSION_MAJOR 17 +#define LLDB_VERSION_MINOR 0 - #define LLDB_VERSION_PATCH 2 ++#define LLDB_VERSION_PATCH 3 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 56b377d33f9b,000000000000..652cc426aa3c mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,378 -1,0 +1,378 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* 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_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 17.0.2" ++#define PACKAGE_STRING "LLVM 17.0.3" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "17.0.2" ++#define PACKAGE_VERSION "17.0.3" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 36bf884d2fdb,000000000000..6d3ed70bb0fd mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,131 -1,0 +1,131 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 17 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 0 + +/* Patch version of the LLVM API */ - #define LLVM_VERSION_PATCH 2 ++#define LLVM_VERSION_PATCH 3 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "17.0.2" ++#define LLVM_VERSION_STRING "17.0.3" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite instead of libtensorflow */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if the xar_open() function is supported on this platform. */ +#if defined(__APPLE__) +#define LLVM_HAVE_LIBXAR 1 +#endif + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 846d3cb3e014,000000000000..bca8b103a7ba mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-17.0.2-0-gb2417f51dbbd" ++#define LLVM_REVISION "llvmorg-17.0.3-0-g888437e1b600" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Fri Dec 8 17:39:11 2023 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 4Smz0K6Rmbz53678; Fri, 8 Dec 2023 17:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smz0K5QcJz3SPx; Fri, 8 Dec 2023 17:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4gKXn67tpv6DDhu6ED8P5rLZDRx/B4r6NyNl7d0VnI=; b=UJRMissGmm+xSM6P+FmrEfQYckxHxuMjna/tCjVUOBRuRqC/JFtdsuG1JutfWC08bfefsd k5VHoanv9FmUGCNJABILf+wwjmcHeuch5+wCsx9JAR4XtCHwubuEmK8UcJJcpMeuRGjqSq jrqmP3nAlHZR9FTHrMy9xNLYmk3PMG24CI5U1wBLkWMY8I9sAnneguCJC1OSpscp4qMULu Jns38uqv7jieAyF1XOn6onmXEcOnQszV1PviwA4KWINOtlh79K/SxOQFi8n7A4M02jIUcZ RpeBblHNM5VkqDJlOF9IPb0IDaeQ6CMD9Q8sk36PPPlY1y9pd/g/m80LPVsVTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702057153; a=rsa-sha256; cv=none; b=tR9F+MgmelcsMs9qFBTGjz/6tnddLvyyLLV8a2WRBdyMLvAhnsbI5/wcb2bU6HcQOWxBkn pBfWb3xU6yzkSvLNa9uJ9DqDSLaKCZzu9y5rQjD0risdqkgXnfvPBPfXcIhUYWU/OQ5evr PqjIl4ptCLqsVkj9HyN9gHrMEJ1gTfevfcXGDdkDYSIk0BOZXrbPTpd9eieYGXX8Jy4dKi JLnxrTek5LUlbvuWs0FGmPRzGym4vGEpY+6+uvxY6/Nl9s4euY7XiwxrA86QNsh/THlhCy OIt6+L6cDVGjEmOpR8HYkghHLSh5AE1h8iCW42V7Pydv1FixK52UvWIVyo/C0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4gKXn67tpv6DDhu6ED8P5rLZDRx/B4r6NyNl7d0VnI=; b=Z5etqbQYE6LpVf8B66nxyU9iCDPY7l9AaU3QYwrp8K6VF9xroOajx/TD4WibDd4DUoEREh iwWcG7MUvDfZHUPjj5m/g4tLzLTHbWUK0895SKso5sLDu+aMTPhIn/zI/wNWbGTw8973ol FNcLW8z9rkyVahJ5NX//BvdB7VWFcJJBIU89FjJwFYvIhsr6JSdFjHyGrCTJo0Vp8CAqsh Gy9C04lHL5uFb0oZIbPRQlfKwMDkgXyhgyBvrpF3E1wtH4EYBDtXNuvygW+P4KzD6YM/tQ 71ZfLBEeASKibuHyNJ0ITiTNy2XvlT4nvOtayOYT/m+xzxAYqiQU0lpQ5jntTQ== 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 4Smz0K4M6wzWLW; Fri, 8 Dec 2023 17:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8HdDr0068023; Fri, 8 Dec 2023 17:39:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8HdBLn068020; Fri, 8 Dec 2023 17:39:11 GMT (envelope-from git) Date: Fri, 8 Dec 2023 17:39:11 GMT Message-Id: <202312081739.3B8HdBLn068020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: b121cb0095c8 - main - Merge llvm-project release/17.x llvmorg-17.0.5-0-g98bfdac5ce82 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: b121cb0095c8c1a060f66a8c4b118a54ebaa2551 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b121cb0095c8c1a060f66a8c4b118a54ebaa2551 commit b121cb0095c8c1a060f66a8c4b118a54ebaa2551 Merge: bdb86d1a853a fc0a8108a55a Author: Dimitry Andric AuthorDate: 2023-11-16 21:58:12 +0000 Commit: Dimitry Andric CommitDate: 2023-12-08 17:35:50 +0000 Merge llvm-project release/17.x llvmorg-17.0.5-0-g98bfdac5ce82 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-17.0.5-0-g98bfdac5ce82. PR: 273753 MFC after: 1 month .../include/clang/Basic/DiagnosticASTKinds.td | 2 +- .../llvm-project/clang/include/clang/Sema/Sema.h | 7 +- .../llvm-project/clang/lib/AST/ExprConstant.cpp | 13 +- .../llvm-project/clang/lib/AST/Interp/Interp.cpp | 3 +- .../clang/lib/CodeGen/CGExprConstant.cpp | 7 +- .../clang/lib/Driver/ToolChains/Solaris.cpp | 9 +- .../clang/lib/Format/TokenAnnotator.cpp | 6 + .../clang/lib/Format/WhitespaceManager.cpp | 2 +- contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp | 11 +- contrib/llvm-project/libcxx/include/__config | 60 +++++-- .../libcxx/include/__expected/expected.h | 182 ++++++++++----------- .../llvm/lib/CodeGen/BranchFolding.cpp | 6 - .../llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h | 1 + .../CodeGen/SelectionDAG/LegalizeVectorTypes.cpp | 10 ++ .../llvm/lib/Target/AArch64/AArch64InstrInfo.cpp | 2 +- .../Target/AArch64/AArch64TargetTransformInfo.cpp | 24 +++ .../Target/AArch64/AArch64TargetTransformInfo.h | 3 + .../Target/AArch64/GISel/AArch64CallLowering.cpp | 7 +- .../llvm/lib/Target/LoongArch/LoongArch.h | 2 + .../LoongArch/LoongArchExpandPseudoInsts.cpp | 121 ++++++++++++++ .../Target/LoongArch/LoongArchFloat32InstrInfo.td | 17 ++ .../Target/LoongArch/LoongArchFloatInstrFormats.td | 12 ++ .../lib/Target/LoongArch/LoongArchInstrInfo.cpp | 6 + .../lib/Target/LoongArch/LoongArchRegisterInfo.cpp | 7 - .../Target/LoongArch/LoongArchTargetMachine.cpp | 1 + .../llvm/lib/Target/Mips/MipsISelLowering.cpp | 14 +- .../llvm/lib/Target/RISCV/RISCVInstrInfo.cpp | 19 ++- .../llvm/lib/Transforms/IPO/GlobalOpt.cpp | 30 +++- .../Transforms/Scalar/ConstraintElimination.cpp | 16 +- .../Scalar/CorrelatedValuePropagation.cpp | 68 ++++---- .../llvm/lib/Transforms/Scalar/GVN.cpp | 11 +- .../llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp | 1 + .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 3 +- .../openmp/runtime/src/kmp_runtime.cpp | 3 +- .../openmp/runtime/src/kmp_wrapper_getpid.h | 2 +- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 42 files changed, 490 insertions(+), 228 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index 7f43e4566eeb,000000000000..27e6c2753812 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-17.0.3-0-g888437e1b600" ++#define LLVM_REVISION "llvmorg-17.0.5-0-g98bfdac5ce82" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-17.0.3-0-g888437e1b600" ++#define CLANG_REVISION "llvmorg-17.0.5-0-g98bfdac5ce82" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-17.0.3-0-g888437e1b600" ++#define LLDB_REVISION "llvmorg-17.0.5-0-g98bfdac5ce82" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index c364a69c7209,000000000000..567978aefcdf mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,8 -1,0 +1,8 @@@ - #define CLANG_VERSION 17.0.3 - #define CLANG_VERSION_STRING "17.0.3" ++#define CLANG_VERSION 17.0.5 ++#define CLANG_VERSION_STRING "17.0.5" +#define CLANG_VERSION_MAJOR 17 +#define CLANG_VERSION_MAJOR_STRING "17" +#define CLANG_VERSION_MINOR 0 - #define CLANG_VERSION_PATCHLEVEL 3 ++#define CLANG_VERSION_PATCHLEVEL 5 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index 135feafee438,000000000000..ba5a381f1e06 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "17.0.3 (FreeBSD llvmorg-17.0.3-0-g888437e1b600-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "17.0.5 (FreeBSD llvmorg-17.0.5-0-g98bfdac5ce82-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index e9dbb0ca765e,000000000000..b43c5103b8db mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 17.0.3 - #define LLDB_VERSION_STRING "17.0.3" ++#define LLDB_VERSION 17.0.5 ++#define LLDB_VERSION_STRING "17.0.5" +#define LLDB_VERSION_MAJOR 17 +#define LLDB_VERSION_MINOR 0 - #define LLDB_VERSION_PATCH 3 ++#define LLDB_VERSION_PATCH 5 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 652cc426aa3c,000000000000..844599754b4b mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,378 -1,0 +1,378 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* 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_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 17.0.3" ++#define PACKAGE_STRING "LLVM 17.0.5" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "17.0.3" ++#define PACKAGE_VERSION "17.0.5" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 6d3ed70bb0fd,000000000000..9cec41cd05a5 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,131 -1,0 +1,131 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 17 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 0 + +/* Patch version of the LLVM API */ - #define LLVM_VERSION_PATCH 3 ++#define LLVM_VERSION_PATCH 5 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "17.0.3" ++#define LLVM_VERSION_STRING "17.0.5" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite instead of libtensorflow */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if the xar_open() function is supported on this platform. */ +#if defined(__APPLE__) +#define LLVM_HAVE_LIBXAR 1 +#endif + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index bca8b103a7ba,000000000000..309d8d7925fc mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-17.0.3-0-g888437e1b600" ++#define LLVM_REVISION "llvmorg-17.0.5-0-g98bfdac5ce82" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Fri Dec 8 17:39:19 2023 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 4Smz0T42ldz535tr; Fri, 8 Dec 2023 17:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smz0T3Mnfz3Snk; Fri, 8 Dec 2023 17:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdLpcz5FhAm+CKMVmslfwi30BNT9MA0SNkp5FUS0ksw=; b=w0uQI8e4QUtUqcNoH1/c5gIx4U0+YL7tN6uwXJgWK5D6T5iDtBwku7ZgWoP0ZzL5j7t5l5 e/ubC7IfRxqjE4gOqFcM/MLz58q7jc7E171kpYhWFttmrA4euoxMGqwpuMqDZ5RyvDtDFE L4Hd6m7JYO2dTgM1fwZ6VYwKRwN8i0CNk2AIEOuh8JyVYNWiKrzZFND1BeIxABUQbXmG6H pqY8d4M4SlI7cW2tKT0qE5n/ubSvATIBnkRSlqUsvM7e+ochhS5Yer6WDA75b6gQ4yGzCi hoQtivpLFdbY4VmsbZB8d1Hk+uPS5GiDQiRaG0gqDTqnP0dJjzh/thC9359EAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702057161; a=rsa-sha256; cv=none; b=hk7o7AVlrYgIF7d8CBS7ICFRPTd6ItAjUS7qnEz7WPbqoQv5vxj+FgeDuNDkT/kvvOL3Aw mcWB4YS+heDepeYC3dz6N8huFR9JD34dcl5aAzDdgzofT7747O2KP4c5ykW+PQgwzW5TlH kK31X/ZrNsZqOVgq03VxbN/Xwu21R97blupJIsmUhPAfy0/DYr13p3EsPxzxHtkjKHqX9c xzZsbH7Fkv9towY28HXvq9T8Ry0qNJTm/FaSYtQw2zcYD9Pxiw24hHovg+HQE6VleV0m+t S+vmKjdY5H4BnVC2trYrfKB23Uj2iVUHOAJNzTxn0YUJM7mIkDFwhii4/thbVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdLpcz5FhAm+CKMVmslfwi30BNT9MA0SNkp5FUS0ksw=; b=MNOqNtkbBKNnXS0JOER4VjzCb5m0q0QqX1HzXTbVe1yNjTvn0IAJKrnnKXXXfD6oHM2tSv +UmxZ5/ye2ECU275N91NxJC6PeSpITXQpLC4/41Bf1Ixjlk+lZ9+tOpZL8rYyRvJiJOmCA DsRSCQ+yaemExfOG8XMpYsVzZCS7A4f2WylmO+ISmSQF6qzh/KzFRVzK6FaR47lNzit7WR RCZT0WDThaFmNFsr9roNqPCKJQRbLs7+6/86G/HPvuUPeVZwVe56/PsN9lECiI87Qwwxoo R7I4liIKsA8bJw1r/5hn3Ouw71QP5DpTyUbUHXEY523lUH/eGZJPs2UWaMkPpQ== 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 4Smz0T2Rz5zWGb; Fri, 8 Dec 2023 17:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8HdLI2068076; Fri, 8 Dec 2023 17:39:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8HdJYC068067; Fri, 8 Dec 2023 17:39:19 GMT (envelope-from git) Date: Fri, 8 Dec 2023 17:39:19 GMT Message-Id: <202312081739.3B8HdJYC068067@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 5c16e71d30c3 - main - Merge llvm-project release/17.x llvmorg-17.0.6-0-g6009708b4367 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 5c16e71d30c388dd43b217de10a3ccb4b0219d0d Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5c16e71d30c388dd43b217de10a3ccb4b0219d0d commit 5c16e71d30c388dd43b217de10a3ccb4b0219d0d Merge: b121cb0095c8 703029dbba78 Author: Dimitry Andric AuthorDate: 2023-11-30 20:06:52 +0000 Commit: Dimitry Andric CommitDate: 2023-12-08 17:35:59 +0000 Merge llvm-project release/17.x llvmorg-17.0.6-0-g6009708b4367 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-17.0.6-0-g6009708b4367. PR: 273753 MFC after: 1 month .../clang/include/clang/Driver/Options.td | 3 -- .../clang/Frontend/DependencyOutputOptions.h | 11 +++---- .../clang/include/clang/Frontend/Utils.h | 11 +------ .../clang/lib/Basic/Targets/OSTargets.h | 16 ++++++++- .../clang/lib/Driver/ToolChains/Clang.cpp | 3 -- .../clang/lib/Driver/ToolChains/WebAssembly.cpp | 38 ++++++++++++++-------- .../clang/lib/Format/TokenAnnotator.cpp | 4 +-- .../clang/lib/Format/WhitespaceManager.cpp | 4 ++- .../clang/lib/Format/WhitespaceManager.h | 2 +- .../clang/lib/Frontend/DependencyFile.cpp | 32 ++++-------------- contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp | 8 ++--- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 19 ++++------- contrib/llvm-project/libcxx/include/__config | 2 +- .../libcxx/include/__memory/shared_ptr.h | 5 +-- .../llvm/lib/ExecutionEngine/JITLink/aarch32.cpp | 2 +- .../llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp | 10 +++--- lib/clang/include/VCSVersion.inc | 6 ++-- lib/clang/include/clang/Basic/Version.inc | 6 ++-- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 ++-- lib/clang/include/llvm/Config/config.h | 4 +-- lib/clang/include/llvm/Config/llvm-config.h | 4 +-- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 23 files changed, 94 insertions(+), 106 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index 27e6c2753812,000000000000..a52f5acd3b0f mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-17.0.5-0-g98bfdac5ce82" ++#define LLVM_REVISION "llvmorg-17.0.6-0-g6009708b4367" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-17.0.5-0-g98bfdac5ce82" ++#define CLANG_REVISION "llvmorg-17.0.6-0-g6009708b4367" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-17.0.5-0-g98bfdac5ce82" ++#define LLDB_REVISION "llvmorg-17.0.6-0-g6009708b4367" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index 567978aefcdf,000000000000..2218bba3dc03 mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,8 -1,0 +1,8 @@@ - #define CLANG_VERSION 17.0.5 - #define CLANG_VERSION_STRING "17.0.5" ++#define CLANG_VERSION 17.0.6 ++#define CLANG_VERSION_STRING "17.0.6" +#define CLANG_VERSION_MAJOR 17 +#define CLANG_VERSION_MAJOR_STRING "17" +#define CLANG_VERSION_MINOR 0 - #define CLANG_VERSION_PATCHLEVEL 5 ++#define CLANG_VERSION_PATCHLEVEL 6 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index ba5a381f1e06,000000000000..fbb79d4bb936 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "17.0.5 (FreeBSD llvmorg-17.0.5-0-g98bfdac5ce82-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "17.0.6 (FreeBSD llvmorg-17.0.6-0-g6009708b4367-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index b43c5103b8db,000000000000..838643a235ff mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 17.0.5 - #define LLDB_VERSION_STRING "17.0.5" ++#define LLDB_VERSION 17.0.6 ++#define LLDB_VERSION_STRING "17.0.6" +#define LLDB_VERSION_MAJOR 17 +#define LLDB_VERSION_MINOR 0 - #define LLDB_VERSION_PATCH 5 ++#define LLDB_VERSION_PATCH 6 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 844599754b4b,000000000000..9bc4e93a2511 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,378 -1,0 +1,378 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* 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_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 17.0.5" ++#define PACKAGE_STRING "LLVM 17.0.6" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "17.0.5" ++#define PACKAGE_VERSION "17.0.6" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 9cec41cd05a5,000000000000..dfbeb0250027 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,131 -1,0 +1,131 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 17 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 0 + +/* Patch version of the LLVM API */ - #define LLVM_VERSION_PATCH 5 ++#define LLVM_VERSION_PATCH 6 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "17.0.5" ++#define LLVM_VERSION_STRING "17.0.6" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite instead of libtensorflow */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if the xar_open() function is supported on this platform. */ +#if defined(__APPLE__) +#define LLVM_HAVE_LIBXAR 1 +#endif + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 309d8d7925fc,000000000000..8683d5c6aca1 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-17.0.5-0-g98bfdac5ce82" ++#define LLVM_REVISION "llvmorg-17.0.6-0-g6009708b4367" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Fri Dec 8 17:39:22 2023 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 4Smz0W08dxz5360g; Fri, 8 Dec 2023 17:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smz0V4T9sz3StP; Fri, 8 Dec 2023 17:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8RyR78qkpHm6NJEwmPTuPLPEgQzvkr9Qez1FSG6oHfM=; b=F2t+bCZPpjaeMxpc/VJo6/qqCuAPYJLedXyi2C1zkEcsmbyBMa/GKEBw3t7oj8hOaoSk0n v+M5CksJdIkIJfamFvn1ZFwRrF+eiKHCRvDntfxQxlgfn9+otpjYIpORIbRiluyJs7HndP j7rbM5xj4K3Hy5/kLK9n1CMCJ/+ZtdK8rqvJNPIo5mV+IXkzEziRIy1jKdYU83B3BWOiOn iYsNUZQu9AGPPvCABUq7mzVUYHngz3gclZCn7l0N0CQf25ZAEAz08lyXPcdFiR6F5Xl/8m xsaJi4KHacoY5ETgPEUioRR/Er/p/iaKyIwooNfr2xY4v2Cn6uR/seFoZkLv9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702057162; a=rsa-sha256; cv=none; b=f5pBZxVRODAb/23E5QU87jjHSOVa4lP3HiLVuu0zhZjWS3CGUstZllOLvAgSayWiQc4nod snHKZ98JpZRBRUrTjZyD5BrVEGM1ej0fkSbhZ2ofR9S1UMElgJiSdvTi6Os1Z7y5Y9P7BW F6XI7wa4k0IoanlDzvdaAPY2TJY5tKMWYBcDLhwOvuUTZvPenaP/Tt1x6D05VYkCOCNIQy 1hjFmEgmAtxBH6ll4eS8y24ZEmdC6JL17BTF52BJSPBufa0D3+Li8xYwEGaibSTvas9Yu1 L+h0OIu5lZukTcMY+p1WKEuPMW7WSZTOMGyfK/nBEOY4LJClfaxlfhZP6/P2ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8RyR78qkpHm6NJEwmPTuPLPEgQzvkr9Qez1FSG6oHfM=; b=FrSYbKAdvW/D62Ugik9B4r1vaaDtmvoT5LKwOVVl6uvEggnxxV1+fpyWZ6pjp/AoDmzxzZ JLG9Iin5AC1Kz2LMFTirod4DUr4xRAbiYMtnWSCSdZZbKWwidRjkVW1k13cv5tsogL85bG 0qha5P4QDmVStmUBACQ78fEO3Le3fBJt3oWImqXF15MVnnNERrsH7VOrIPB7LFZKDfcbdb odQwFjjWAnbyzUL79j5v65UfklyDLJoMuOK5tvNaiM+QumkeIsq/bsgds3XzSfdqX+mSYn pf+Xj5Myt2j+u1DYghNh36bTqQ18jBei/r8tBDua9yxnSi8cbze+Mf17wzZmXQ== 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 4Smz0V3YzKzWLX; Fri, 8 Dec 2023 17:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8HdMwU068133; Fri, 8 Dec 2023 17:39:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8HdMOd068130; Fri, 8 Dec 2023 17:39:22 GMT (envelope-from git) Date: Fri, 8 Dec 2023 17:39:22 GMT Message-Id: <202312081739.3B8HdMOd068130@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: feb5b0c76f9c - main - Merge commit 158f4f30adb4 from llvm git (by Corentin Jabot): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: feb5b0c76f9c7b510583b0489918300cbf966e0f Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=feb5b0c76f9c7b510583b0489918300cbf966e0f commit feb5b0c76f9c7b510583b0489918300cbf966e0f Author: Dimitry Andric AuthorDate: 2023-12-07 12:47:54 +0000 Commit: Dimitry Andric CommitDate: 2023-12-08 17:36:06 +0000 Merge commit 158f4f30adb4 from llvm git (by Corentin Jabot): [Clang] Do not change the type of captured vars when checking lambda constraints When checking the constraint of a lambda, we need to respect the constness of the call operator when establishing the type of capture variables. In D124351, this was done by adding const to the captured variable... However, that would change the type of the variable outside of the scope of the lambda, which is clearly not the desired outcome. Instead, to ensure const-correctness, we need to populate a LambdaScopeInfo with the capture variables before checking the constraints of a generic lambda. There is no changelog as I'd like to tentatively propose we backport this change to RC3 as it is a regression introduced in the Clang 17 cycle. Fixes #61267 Reviewed By: aaron.ballman, #clang-language-wg Differential Revision: https://reviews.llvm.org/D158433 Merge commit 3ed9e9e3ace6 from llvm git (by Corentin Jabot): [Clang] Add captures to the instantiation scope of lambda call operators Like concepts checking, a trailing return type of a lambda in a dependent context may refer to captures in which case they may need to be rebuilt, so the map of local decl should include captures. This patch reveal a pre-existing issue. `this` is always recomputed by TreeTransform. `*this` (like all captures) only become `const` after the parameter list. However, if try to recompute the value of `this` (in a parameter) during template instantiation while determining the type of the call operator, we will determine it to be const (unless the lambda is mutable). There is no good way to know at that point that we are in a parameter or not, the easiest/best solution is to transform the type of this. Note that doing so break a handful of HLSL tests. So this is a prototype at this point. Fixes #65067 Fixes #63675 Reviewed By: erichkeane Differential Revision: https://reviews.llvm.org/D159126 This fixes 'Assertion failed: (isa(D) && "declaration not instantiated in this scope"), function findInstantiationOf' error when building databases/mongodb44. PR: 273753 MFC after: 1 month --- .../llvm-project/clang/include/clang/Sema/Sema.h | 10 +++++++ .../llvm-project/clang/lib/Sema/SemaConcept.cpp | 29 ++++++-------------- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 16 +++++++---- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 15 +++++----- contrib/llvm-project/clang/lib/Sema/SemaLambda.cpp | 32 ++++++++++++++++++++++ .../clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 3 ++ .../llvm-project/clang/lib/Sema/TreeTransform.h | 11 +++++++- 7 files changed, 82 insertions(+), 34 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang/Sema/Sema.h b/contrib/llvm-project/clang/include/clang/Sema/Sema.h index 3752a23faa85..28a5f17d0dd5 100644 --- a/contrib/llvm-project/clang/include/clang/Sema/Sema.h +++ b/contrib/llvm-project/clang/include/clang/Sema/Sema.h @@ -7315,6 +7315,16 @@ public: CXXConversionDecl *Conv, Expr *Src); + sema::LambdaScopeInfo *RebuildLambdaScopeInfo(CXXMethodDecl *CallOperator); + + class LambdaScopeForCallOperatorInstantiationRAII + : private FunctionScopeRAII { + public: + LambdaScopeForCallOperatorInstantiationRAII( + Sema &SemasRef, FunctionDecl *FD, MultiLevelTemplateArgumentList MLTAL, + LocalInstantiationScope &Scope); + }; + /// Check whether the given expression is a valid constraint expression. /// A diagnostic is emitted if it is not, false is returned, and /// PossibleNonPrimary will be set to true if the failure might be due to a diff --git a/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp b/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp index f24b549dd2ef..d1fa8e783122 100755 --- a/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp @@ -13,12 +13,14 @@ #include "clang/Sema/SemaConcept.h" #include "TreeTransform.h" #include "clang/AST/ASTLambda.h" +#include "clang/AST/DeclCXX.h" #include "clang/AST/ExprConcepts.h" #include "clang/AST/RecursiveASTVisitor.h" #include "clang/Basic/OperatorPrecedence.h" #include "clang/Sema/EnterExpressionEvaluationContext.h" #include "clang/Sema/Initialization.h" #include "clang/Sema/Overload.h" +#include "clang/Sema/ScopeInfo.h" #include "clang/Sema/Sema.h" #include "clang/Sema/SemaDiagnostic.h" #include "clang/Sema/SemaInternal.h" @@ -540,11 +542,6 @@ bool Sema::addInstantiatedCapturesToScope( auto AddSingleCapture = [&](const ValueDecl *CapturedPattern, unsigned Index) { ValueDecl *CapturedVar = LambdaClass->getCapture(Index)->getCapturedVar(); - if (cast(Function)->isConst()) { - QualType T = CapturedVar->getType(); - T.addConst(); - CapturedVar->setType(T); - } if (CapturedVar->isInitCapture()) Scope.InstantiatedLocal(CapturedPattern, CapturedVar); }; @@ -603,11 +600,6 @@ bool Sema::SetupConstraintScope( if (addInstantiatedParametersToScope(FD, FromMemTempl->getTemplatedDecl(), Scope, MLTAL)) return true; - // Make sure the captures are also added to the instantiation scope. - if (isLambdaCallOperator(FD) && - addInstantiatedCapturesToScope(FD, FromMemTempl->getTemplatedDecl(), - Scope, MLTAL)) - return true; } return false; @@ -632,11 +624,6 @@ bool Sema::SetupConstraintScope( // child-function. if (addInstantiatedParametersToScope(FD, InstantiatedFrom, Scope, MLTAL)) return true; - - // Make sure the captures are also added to the instantiation scope. - if (isLambdaCallOperator(FD) && - addInstantiatedCapturesToScope(FD, InstantiatedFrom, Scope, MLTAL)) - return true; } return false; @@ -714,6 +701,10 @@ bool Sema::CheckFunctionConstraints(const FunctionDecl *FD, Record = const_cast(Method->getParent()); } CXXThisScopeRAII ThisScope(*this, Record, ThisQuals, Record != nullptr); + + LambdaScopeForCallOperatorInstantiationRAII LambdaScope( + *this, const_cast(FD), *MLTAL, Scope); + return CheckConstraintSatisfaction( FD, {FD->getTrailingRequiresClause()}, *MLTAL, SourceRange(UsageLoc.isValid() ? UsageLoc : FD->getLocation()), @@ -900,12 +891,10 @@ bool Sema::CheckInstantiatedFunctionTemplateConstraints( ThisQuals = Method->getMethodQualifiers(); Record = Method->getParent(); } + CXXThisScopeRAII ThisScope(*this, Record, ThisQuals, Record != nullptr); - FunctionScopeRAII FuncScope(*this); - if (isLambdaCallOperator(Decl)) - PushLambdaScope(); - else - FuncScope.disable(); + LambdaScopeForCallOperatorInstantiationRAII LambdaScope( + *this, const_cast(Decl), *MLTAL, Scope); llvm::SmallVector Converted; return CheckConstraintSatisfaction(Template, TemplateAC, Converted, *MLTAL, diff --git a/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp b/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp index 21b5781a71cd..fab2865ec5a1 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp @@ -15172,14 +15172,17 @@ Sema::CheckForFunctionRedefinition(FunctionDecl *FD, FD->setInvalidDecl(); } -static void RebuildLambdaScopeInfo(CXXMethodDecl *CallOperator, - Sema &S) { - CXXRecordDecl *const LambdaClass = CallOperator->getParent(); +LambdaScopeInfo *Sema::RebuildLambdaScopeInfo(CXXMethodDecl *CallOperator) { + CXXRecordDecl *LambdaClass = CallOperator->getParent(); - LambdaScopeInfo *LSI = S.PushLambdaScope(); + LambdaScopeInfo *LSI = PushLambdaScope(); LSI->CallOperator = CallOperator; LSI->Lambda = LambdaClass; LSI->ReturnType = CallOperator->getReturnType(); + // This function in calls in situation where the context of the call operator + // is not entered, so we set AfterParameterList to false, so that + // `tryCaptureVariable` finds explicit captures in the appropriate context. + LSI->AfterParameterList = false; const LambdaCaptureDefault LCD = LambdaClass->getLambdaCaptureDefault(); if (LCD == LCD_None) @@ -15200,7 +15203,7 @@ static void RebuildLambdaScopeInfo(CXXMethodDecl *CallOperator, if (C.capturesVariable()) { ValueDecl *VD = C.getCapturedVar(); if (VD->isInitCapture()) - S.CurrentInstantiationScope->InstantiatedLocal(VD, VD); + CurrentInstantiationScope->InstantiatedLocal(VD, VD); const bool ByRef = C.getCaptureKind() == LCK_ByRef; LSI->addCapture(VD, /*IsBlock*/false, ByRef, /*RefersToEnclosingVariableOrCapture*/true, C.getLocation(), @@ -15217,6 +15220,7 @@ static void RebuildLambdaScopeInfo(CXXMethodDecl *CallOperator, } ++I; } + return LSI; } Decl *Sema::ActOnStartOfFunctionDef(Scope *FnBodyScope, Decl *D, @@ -15320,7 +15324,7 @@ Decl *Sema::ActOnStartOfFunctionDef(Scope *FnBodyScope, Decl *D, assert(inTemplateInstantiation() && "There should be an active template instantiation on the stack " "when instantiating a generic lambda!"); - RebuildLambdaScopeInfo(cast(D), *this); + RebuildLambdaScopeInfo(cast(D)); } else { // Enter a new function scope PushFunctionScope(); diff --git a/contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp b/contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp index 3a5e302cc03a..63b00d640a9c 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp @@ -19619,13 +19619,6 @@ bool Sema::tryCaptureVariable( FunctionScopesIndex == MaxFunctionScopesIndex && VarDC == DC) return true; - // When evaluating some attributes (like enable_if) we might refer to a - // function parameter appertaining to the same declaration as that - // attribute. - if (const auto *Parm = dyn_cast(Var); - Parm && Parm->getDeclContext() == DC) - return true; - // Only block literals, captured statements, and lambda expressions can // capture; other scopes don't work. DeclContext *ParentDC = @@ -19653,6 +19646,14 @@ bool Sema::tryCaptureVariable( CSI->getCapture(Var).markUsed(BuildAndDiagnose); break; } + + // When evaluating some attributes (like enable_if) we might refer to a + // function parameter appertaining to the same declaration as that + // attribute. + if (const auto *Parm = dyn_cast(Var); + Parm && Parm->getDeclContext() == DC) + return true; + // If we are instantiating a generic lambda call operator body, // we do not want to capture new variables. What was captured // during either a lambdas transformation or initial parsing diff --git a/contrib/llvm-project/clang/lib/Sema/SemaLambda.cpp b/contrib/llvm-project/clang/lib/Sema/SemaLambda.cpp index 06fc53591a76..ccc5111d1e31 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaLambda.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaLambda.cpp @@ -20,6 +20,7 @@ #include "clang/Sema/ScopeInfo.h" #include "clang/Sema/SemaInternal.h" #include "clang/Sema/SemaLambda.h" +#include "clang/Sema/Template.h" #include "llvm/ADT/STLExtras.h" #include using namespace clang; @@ -2222,3 +2223,34 @@ ExprResult Sema::BuildBlockForLambdaConversion(SourceLocation CurrentLocation, return BuildBlock; } + +Sema::LambdaScopeForCallOperatorInstantiationRAII:: + LambdaScopeForCallOperatorInstantiationRAII( + Sema &SemasRef, FunctionDecl *FD, MultiLevelTemplateArgumentList MLTAL, + LocalInstantiationScope &Scope) + : FunctionScopeRAII(SemasRef) { + if (!isLambdaCallOperator(FD)) { + FunctionScopeRAII::disable(); + return; + } + + if (FD->isTemplateInstantiation() && FD->getPrimaryTemplate()) { + FunctionTemplateDecl *PrimaryTemplate = FD->getPrimaryTemplate(); + if (const auto *FromMemTempl = + PrimaryTemplate->getInstantiatedFromMemberTemplate()) { + SemasRef.addInstantiatedCapturesToScope( + FD, FromMemTempl->getTemplatedDecl(), Scope, MLTAL); + } + } + + else if (FD->getTemplatedKind() == FunctionDecl::TK_MemberSpecialization || + FD->getTemplatedKind() == FunctionDecl::TK_DependentNonTemplate) { + FunctionDecl *InstantiatedFrom = + FD->getTemplatedKind() == FunctionDecl::TK_MemberSpecialization + ? FD->getInstantiatedFromMemberFunction() + : FD->getInstantiatedFromDecl(); + SemasRef.addInstantiatedCapturesToScope(FD, InstantiatedFrom, Scope, MLTAL); + } + + SemasRef.RebuildLambdaScopeInfo(cast(FD)); +} diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index f78d46f59503..332004055b58 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -2426,6 +2426,9 @@ Decl *TemplateDeclInstantiator::VisitCXXMethodDecl( cast(Owner)->isDefinedOutsideFunctionOrMethod()); LocalInstantiationScope Scope(SemaRef, MergeWithParentScope); + Sema::LambdaScopeForCallOperatorInstantiationRAII LambdaScope( + SemaRef, const_cast(D), TemplateArgs, Scope); + // Instantiate enclosing template arguments for friends. SmallVector TempParamLists; unsigned NumTempParamLists = 0; diff --git a/contrib/llvm-project/clang/lib/Sema/TreeTransform.h b/contrib/llvm-project/clang/lib/Sema/TreeTransform.h index 097e81ea7d45..b51741d5e8b2 100644 --- a/contrib/llvm-project/clang/lib/Sema/TreeTransform.h +++ b/contrib/llvm-project/clang/lib/Sema/TreeTransform.h @@ -12285,7 +12285,16 @@ TreeTransform::TransformCXXNullPtrLiteralExpr( template ExprResult TreeTransform::TransformCXXThisExpr(CXXThisExpr *E) { - QualType T = getSema().getCurrentThisType(); + + // In lambdas, the qualifiers of the type depends of where in + // the call operator `this` appear, and we do not have a good way to + // rebuild this information, so we transform the type. + // + // In other contexts, the type of `this` may be overrided + // for type deduction, so we need to recompute it. + QualType T = getSema().getCurLambda() ? + getDerived().TransformType(E->getType()) + : getSema().getCurrentThisType(); if (!getDerived().AlwaysRebuild() && T == E->getType()) { // Mark it referenced in the new context regardless. From nobody Fri Dec 8 17:39:23 2023 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 4Smz0W6HRnz535wC; Fri, 8 Dec 2023 17:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smz0W5SdTz3SlJ; Fri, 8 Dec 2023 17:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8F4svgppYOGZcuq526einV/anHrnijNftRG92Rip6E=; b=owB19Sh1yOTr6a7Rbc9KAJ/0q9Dz0+JnkQtzJneOIqRApXNTJY2XtwAhgg+BEpzgWxJ0lB b5Cz04+bluqa7OgPLCBaIU53FO3yJfnrfvp15wYuCFwZ87YWFSLD8XHAJWFF0gTXdV/pKH v61JxwgzDAuNhZIc+X0PRZ5nbc7KfCdX1GHv6Iy6c+ISUZvM3Zo+iyFZtntQtNq3CjAX1E 4JnBo/Z2gC4Ebsfe+IvXZYS0EytBmHufc5656NNQ3GTd0SVuqJkXJwGjF48Zpvld0eKOuo g9IOypWIs5nqmOvxDuUCogloLkS4mTQDYwwPWAS+OupW0J9ZW9bH04cA1PdxoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702057163; a=rsa-sha256; cv=none; b=QGucEyqcRq2Oh/aTuQVjHgmJIpPpco7fy6UWUQpa2jibHzhfDyquWpn8bLJyXIkSqFDLqV DrY+dotJAAqcMqqFGaW6pt1hJaD+Vckp3I7voWTc8Vf97Yrlb/7wOHZUZFSEkeUaq27qRy TXYgl3VwhjWzurHVjeS9/z4gZdUUKMM4PZUOofyO84nbjCKo9E570hq3JR2qDT13EVsqLD OIBvfPAy9Aavy8DHLNXVuYIEAXMtT2zaVsU4efaQhotOMfjT9NOZ1CORWDVyN10JhX/Xms uU8DTZecxYYsUJYnQ4Y/MCu3rbP/0HyA2m0EXXvgAMkcf/70sQbTMmD0du+u+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702057163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8F4svgppYOGZcuq526einV/anHrnijNftRG92Rip6E=; b=EXx29vEkcSPwYqvBrVHbYFYTswD3nJT6jWPsAG/X36CLHdpo/DhLUGU2NnfUN6AyK45Ysg UpShn0tJ+tNXt7jc0DyElJQFo+zlHW/S2YD8GGB4E6QKUs6uILIxiBgygcQc05FXK9NNrR HpFZXH+5m3GeTt7JfzhvbLOA+LcPIF3UoKxT3rVVgB76aeGw7u5PnHgKSx+xqU/KiccQIC kI5j87HkcLW1ZwDQ8MXqOKuIRrhi+LAUfTnFk9AKjvmMH+i4N0rHsfX07Hs1pLHeVhxLj3 OmaQS1kt/hwCCuEfmX+xJ665gskG9KHcIKTSJO8mqhIWmFTArvGi10/bC5Ts7Q== 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 4Smz0W4Yn4zWGc; Fri, 8 Dec 2023 17:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8HdNKn068178; Fri, 8 Dec 2023 17:39:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8HdNM9068175; Fri, 8 Dec 2023 17:39:23 GMT (envelope-from git) Date: Fri, 8 Dec 2023 17:39:23 GMT Message-Id: <202312081739.3B8HdNM9068175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: c711af772782 - main - Bump __FreeBSD_version for llvm 17.0.6 merge List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: c711af7727824da79d87f375f3d6829feec3799a Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c711af7727824da79d87f375f3d6829feec3799a commit c711af7727824da79d87f375f3d6829feec3799a Author: Dimitry Andric AuthorDate: 2023-12-08 17:36:40 +0000 Commit: Dimitry Andric CommitDate: 2023-12-08 17:36:40 +0000 Bump __FreeBSD_version for llvm 17.0.6 merge PR: 273753 MFC after: 1 month --- 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 107b86707c9e..c79c46ab4342 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500005 +#define __FreeBSD_version 1500006 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Fri Dec 8 17:47:44 2023 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 4SmzBF121sz536pp; Fri, 8 Dec 2023 17:47:49 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.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 4SmzBD75lJz3X84; Fri, 8 Dec 2023 17:47:48 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTPS id BXQ4rU8DMB0n0Bex0roBQo; Fri, 08 Dec 2023 17:47:46 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id BewyrWpgXMsNfBewzrv8pS; Fri, 08 Dec 2023 17:47:46 +0000 X-Authority-Analysis: v=2.4 cv=KJNJsXJo c=1 sm=1 tr=0 ts=657356c2 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=42Nyi_-BZy46IMUx:21 a=nYBQqi4ZBl4A:10 a=8nJEP1OIZ-IA:10 a=e2cXIFwxEfEA:10 a=VxmjJ2MpAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=z0LIvfebFlXCJfM9AH8A:9 a=wPNLvfGTeEIA:10 a=SDRQezh6D3oA:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 9E917C06; Fri, 8 Dec 2023 09:47:44 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 8BB0D2D; Fri, 8 Dec 2023 09:47:44 -0800 (PST) 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 cc: Martin Matuska , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 3494f7c019fc - main - Notable upstream pull request merges: #15539 687e4d7f9 Extend import_progress kstat with a notes field #15544 c7b611926 Allow block cloning across encrypted datasets #15553 adcea23cb ZIO: Add overflow checks for linear buffers #15593 5f2700eee zpool: flush output before sleeping #15609 3e4bef52b Only provide execvpe(3) when needed #15610 735ba3a7b Use uint64_t instead of u_int64_t #15612 bcd83ccd2 ZIL: Remove TX_CLONE_RANGE replay for ZVOLs #15617 55b764e06 ZIL: Do not clone blocks from the future #15623 727497ccd module/icp/asm-arm/sha2: enable non-SIMD asm kernels on armv5/6 #15625 9743d0963 BRT: Limit brt_vdev_dump() to only one vdev #15629 f9765b182 zdb: Dump encrypted write and clone ZIL records #15634 2aa3a482a ZIL: Remove 128K into 2x68K LWB split optimization #15639 11656234b FreeBSD: Ensure that zfs_getattr() initializes the va_rdev field #15647 4836d293c zfs_refcount_remove: explictly ignore returns #15649 f0cb6482e setproctitle: fix ununitialised variable #15650 450f2d0b0 import: ignore return on hostid lookups In-reply-to: <20231208173121.59D6930@slippy.cwsent.com> References: <202312080913.3B89DvpO030325@gitrepo.freebsd.org> <20231208173121.59D6930@slippy.cwsent.com> Comments: In-reply-to Cy Schubert message dated "Fri, 08 Dec 2023 09:31:21 -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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Date: Fri, 08 Dec 2023 09:47:44 -0800 Message-Id: <20231208174744.8BB0D2D@slippy.cwsent.com> X-CMAE-Envelope: MS4xfHkr6GW8C90lCzpkYI6mi0YxGubDJjF60tsCS+6XIv5SZGzZFDnNgF9Znzd4AzNwiX7TvQdiFTda3B5JQyG9SV8HtCI7AonCNQk54Qm+sTFj2f6qiV9r M8IGttbKbppHvdwryhm6tpFcW0+c3mwsboZ0hgu9kUumU3B+1/BNPcySzLD4qYMm9KIQVecH9jcSgcDjus3SpY3cST9JRKaDcqAoZPkspxok4wGnxapI4F+j Gk+Oo/vm6iNIkBB5FbGPitYtXybxFv1ulJG6P/MH0JDde0yOQ1SO41omJlmRccyXUjmam5SfjkyzxS3rr42LggxfeFJpoqvvENqABN0cSAo= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SmzBD75lJz3X84 In message <20231208173121.59D6930@slippy.cwsent.com>, Cy Schubert writes: > In message <202312080913.3B89DvpO030325@gitrepo.freebsd.org>, Martin > Matuska wr > ites: > > The branch main has been updated by mm: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3494f7c019fc6558a99f63b7f64737 > 3b > > 89bcde92 > > > > commit 3494f7c019fc6558a99f63b7f647373b89bcde92 > > Merge: 1f36ca5de596 450f2d0b08e7 > > Author: Martin Matuska > > AuthorDate: 2023-12-08 08:32:30 +0000 > > Commit: Martin Matuska > > CommitDate: 2023-12-08 09:13:33 +0000 > > > > Notable upstream pull request merges: > > #15539 687e4d7f9 Extend import_progress kstat with a notes field > > #15544 c7b611926 Allow block cloning across encrypted datasets > > #15553 adcea23cb ZIO: Add overflow checks for linear buffers > > #15593 5f2700eee zpool: flush output before sleeping > > #15609 3e4bef52b Only provide execvpe(3) when needed > > #15610 735ba3a7b Use uint64_t instead of u_int64_t > > #15612 bcd83ccd2 ZIL: Remove TX_CLONE_RANGE replay for ZVOLs > > #15617 55b764e06 ZIL: Do not clone blocks from the future > > #15623 727497ccd module/icp/asm-arm/sha2: enable non-SIMD asm kernels > > on armv5/6 > > #15625 9743d0963 BRT: Limit brt_vdev_dump() to only one vdev > > #15629 f9765b182 zdb: Dump encrypted write and clone ZIL records > > #15634 2aa3a482a ZIL: Remove 128K into 2x68K LWB split optimization > > #15639 11656234b FreeBSD: Ensure that zfs_getattr() initializes the > > va_rdev field > > #15647 4836d293c zfs_refcount_remove: explictly ignore returns > > #15649 f0cb6482e setproctitle: fix ununitialised variable > > #15650 450f2d0b0 import: ignore return on hostid lookups > > > > Obtained from: OpenZFS > > OpenZFS commit: 450f2d0b08e73cfb057d0e301a813418b70d64b9 > > > > sys/contrib/openzfs/cmd/zdb/zdb_il.c | 60 +++++++- > > sys/contrib/openzfs/cmd/zed/zed.d/zed-functions.sh | 98 ++++++++++++ > > sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 22 +++ > > sys/contrib/openzfs/cmd/zpool/zpool_main.c | 14 +- > > .../openzfs/config/kernel-flush_dcache_page.m4 | 5 +- > > sys/contrib/openzfs/config/kernel.m4 | 6 + > > sys/contrib/openzfs/config/user.m4 | 2 +- > > .../openzfs/include/os/freebsd/spl/sys/time.h | 4 +- > > .../include/os/linux/kernel/linux/dcache_compat.h | 15 +- > > sys/contrib/openzfs/include/sys/dsl_crypt.h | 1 + > > sys/contrib/openzfs/include/sys/spa.h | 4 + > > sys/contrib/openzfs/lib/libspl/include/assert.h | 3 + > > .../lib/libspl/include/os/freebsd/sys/param.h | 2 + > > sys/contrib/openzfs/lib/libspl/include/sys/time.h | 2 +- > > .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 4 +- > > .../lib/libzutil/os/linux/zutil_setproctitle.c | 2 +- > > sys/contrib/openzfs/man/man7/zpool-features.7 | 9 +- > > .../openzfs/module/icp/algs/sha2/sha256_impl.c | 22 +-- > > .../openzfs/module/icp/algs/sha2/sha512_impl.c | 19 +-- > > .../openzfs/module/icp/asm-arm/sha2/sha256-armv7.S | 8 +- > > .../openzfs/module/icp/asm-arm/sha2/sha512-armv7.S | 4 +- > > .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 + > > sys/contrib/openzfs/module/zfs/arc.c | 12 +- > > sys/contrib/openzfs/module/zfs/brt.c | 86 +++++------ > > sys/contrib/openzfs/module/zfs/dmu.c | 15 ++ > > sys/contrib/openzfs/module/zfs/dsl_crypt.c | 34 +++++ > > sys/contrib/openzfs/module/zfs/spa.c | 41 ++++- > > sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 12 +- > > sys/contrib/openzfs/module/zfs/spa_misc.c | 74 ++++++++- > > sys/contrib/openzfs/module/zfs/zfs_vnops.c | 25 ++- > > sys/contrib/openzfs/module/zfs/zil.c | 40 +++-- > > sys/contrib/openzfs/module/zfs/zio.c | 57 ++++++- > > sys/contrib/openzfs/module/zfs/zvol.c | 60 +------- > > sys/contrib/openzfs/tests/runfiles/common.run | 3 +- > > sys/contrib/openzfs/tests/runfiles/linux.run | 1 + > > .../openzfs/tests/test-runner/bin/zts-report.py.in | 2 + > > .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + > > .../functional/block_cloning/block_cloning.kshlib | 12 +- > > .../block_cloning_cross_enc_dataset.ksh | 170 +++++++++++++++++ > ++ > > ++ > > .../cli_root/zpool_import/zpool_import_status.ksh | 132 ++++++++++++++++ > > sys/modules/zfs/zfs_config.h | 7 +- > > sys/modules/zfs/zfs_gitrev.h | 2 +- > > 42 files changed, 885 insertions(+), 209 deletions(-) > > > > Hmm. This import of ZFS is a little buggy. My outgoing emails have null > characters in them again. > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=0 > > I have booted the previous kernel now. But look at the previous email and you will see garbage at the end of it, again. This happens every time ZFS has data corruption issues. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Fri Dec 8 17:53:18 2023 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 4SmzJd17TMz537Gq; Fri, 8 Dec 2023 17:53:21 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.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 4SmzJc5yr6z3XYh; Fri, 8 Dec 2023 17:53:20 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id BMtDr3WP48jpTBf2NrkcIY; Fri, 08 Dec 2023 17:53:19 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id Bf2Mrj4CenCF0Bf2NrJThr; Fri, 08 Dec 2023 17:53:19 +0000 X-Authority-Analysis: v=2.4 cv=MPFzJeVl c=1 sm=1 tr=0 ts=6573580f a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=42Nyi_-BZy46IMUx:21 a=nYBQqi4ZBl4A:10 a=kj9zAlcOel0A:10 a=e2cXIFwxEfEA:10 a=VxmjJ2MpAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=z0LIvfebFlXCJfM9AH8A:9 a=CjuIK1q_8ugA:10 a=SDRQezh6D3oA:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 32627C14; Fri, 8 Dec 2023 09:53:18 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 219DD190; Fri, 8 Dec 2023 09:53:18 -0800 (PST) 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 cc: Martin Matuska , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 3494f7c019fc - main - Notable upstream pull request merges: #15539 687e4d7f9 Extend import_progress kstat with a notes field #15544 c7b611926 Allow block cloning across encrypted datasets #15553 adcea23cb ZIO: Add overflow checks for linear buffers #15593 5f2700eee zpool: flush output before sleeping #15609 3e4bef52b Only provide execvpe(3) when needed #15610 735ba3a7b Use uint64_t instead of u_int64_t #15612 bcd83ccd2 ZIL: Remove TX_CLONE_RANGE replay for ZVOLs #15617 55b764e06 ZIL: Do not clone blocks from the future #15623 727497ccd module/icp/asm-arm/sha2: enable non-SIMD asm kernels on armv5/6 #15625 9743d0963 BRT: Limit brt_vdev_dump() to only one vdev #15629 f9765b182 zdb: Dump encrypted write and clone ZIL records #15634 2aa3a482a ZIL: Remove 128K into 2x68K LWB split optimization #15639 11656234b FreeBSD: Ensure that zfs_getattr() initializes the va_rdev field #15647 4836d293c zfs_refcount_remove: explictly ignore returns #15649 f0cb6482e setproctitle: fix ununitialised variable #15650 450f2d0b0 import: ignore return on hostid lookups In-reply-to: <20231208173121.59D6930@slippy.cwsent.com> References: <202312080913.3B89DvpO030325@gitrepo.freebsd.org> <20231208173121.59D6930@slippy.cwsent.com> Comments: In-reply-to Cy Schubert message dated "Fri, 08 Dec 2023 09:31:21 -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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 08 Dec 2023 09:53:18 -0800 Message-Id: <20231208175318.219DD190@slippy.cwsent.com> X-CMAE-Envelope: MS4xfJSJDWP2FiISrUytqqoxDjWA+Fcq3N7JFggG99zaTlZCBlAT2xdx252+Ltpv9NtamnDg+UTfjnn8e7WV6s8VO42L9WmFrYZskWLzfX8Eo5AsCzN+optG jZZdkKqytBy1rjswmTcSDm4UnhT8lQ++eh71Ga+UtJ0HiHmiQJeVCfKjrCcw074lhiE6kDiVq6F18bcuTKZ3J+JXAsLnpbTAU7dkP3FX37a/rfBZYGIsFN8w +38AkQApbzMjFlSheACQqLRwVMYGkopREVdLiA12JRxIWhr5Y7uI/118fAbZSOk0BIQmPCWntCcEec5sLdPJ9zxWXjIJ7FSr0N3rpO5xQTk= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SmzJc5yr6z3XYh In message <20231208173121.59D6930@slippy.cwsent.com>, Cy Schubert writes: > In message <202312080913.3B89DvpO030325@gitrepo.freebsd.org>, Martin > Matuska wr > ites: > > The branch main has been updated by mm: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3494f7c019fc6558a99f63b7f64737 > 3b > > 89bcde92 > > > > commit 3494f7c019fc6558a99f63b7f647373b89bcde92 > > Merge: 1f36ca5de596 450f2d0b08e7 > > Author: Martin Matuska > > AuthorDate: 2023-12-08 08:32:30 +0000 > > Commit: Martin Matuska > > CommitDate: 2023-12-08 09:13:33 +0000 > > > > Notable upstream pull request merges: > > #15539 687e4d7f9 Extend import_progress kstat with a notes field > > #15544 c7b611926 Allow block cloning across encrypted datasets > > #15553 adcea23cb ZIO: Add overflow checks for linear buffers > > #15593 5f2700eee zpool: flush output before sleeping > > #15609 3e4bef52b Only provide execvpe(3) when needed > > #15610 735ba3a7b Use uint64_t instead of u_int64_t > > #15612 bcd83ccd2 ZIL: Remove TX_CLONE_RANGE replay for ZVOLs > > #15617 55b764e06 ZIL: Do not clone blocks from the future > > #15623 727497ccd module/icp/asm-arm/sha2: enable non-SIMD asm kernels > > on armv5/6 > > #15625 9743d0963 BRT: Limit brt_vdev_dump() to only one vdev > > #15629 f9765b182 zdb: Dump encrypted write and clone ZIL records > > #15634 2aa3a482a ZIL: Remove 128K into 2x68K LWB split optimization > > #15639 11656234b FreeBSD: Ensure that zfs_getattr() initializes the > > va_rdev field > > #15647 4836d293c zfs_refcount_remove: explictly ignore returns > > #15649 f0cb6482e setproctitle: fix ununitialised variable > > #15650 450f2d0b0 import: ignore return on hostid lookups > > > > Obtained from: OpenZFS > > OpenZFS commit: 450f2d0b08e73cfb057d0e301a813418b70d64b9 > > > > sys/contrib/openzfs/cmd/zdb/zdb_il.c | 60 +++++++- > > sys/contrib/openzfs/cmd/zed/zed.d/zed-functions.sh | 98 ++++++++++++ > > sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 22 +++ > > sys/contrib/openzfs/cmd/zpool/zpool_main.c | 14 +- > > .../openzfs/config/kernel-flush_dcache_page.m4 | 5 +- > > sys/contrib/openzfs/config/kernel.m4 | 6 + > > sys/contrib/openzfs/config/user.m4 | 2 +- > > .../openzfs/include/os/freebsd/spl/sys/time.h | 4 +- > > .../include/os/linux/kernel/linux/dcache_compat.h | 15 +- > > sys/contrib/openzfs/include/sys/dsl_crypt.h | 1 + > > sys/contrib/openzfs/include/sys/spa.h | 4 + > > sys/contrib/openzfs/lib/libspl/include/assert.h | 3 + > > .../lib/libspl/include/os/freebsd/sys/param.h | 2 + > > sys/contrib/openzfs/lib/libspl/include/sys/time.h | 2 +- > > .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 4 +- > > .../lib/libzutil/os/linux/zutil_setproctitle.c | 2 +- > > sys/contrib/openzfs/man/man7/zpool-features.7 | 9 +- > > .../openzfs/module/icp/algs/sha2/sha256_impl.c | 22 +-- > > .../openzfs/module/icp/algs/sha2/sha512_impl.c | 19 +-- > > .../openzfs/module/icp/asm-arm/sha2/sha256-armv7.S | 8 +- > > .../openzfs/module/icp/asm-arm/sha2/sha512-armv7.S | 4 +- > > .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 + > > sys/contrib/openzfs/module/zfs/arc.c | 12 +- > > sys/contrib/openzfs/module/zfs/brt.c | 86 +++++------ > > sys/contrib/openzfs/module/zfs/dmu.c | 15 ++ > > sys/contrib/openzfs/module/zfs/dsl_crypt.c | 34 +++++ > > sys/contrib/openzfs/module/zfs/spa.c | 41 ++++- > > sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 12 +- > > sys/contrib/openzfs/module/zfs/spa_misc.c | 74 ++++++++- > > sys/contrib/openzfs/module/zfs/zfs_vnops.c | 25 ++- > > sys/contrib/openzfs/module/zfs/zil.c | 40 +++-- > > sys/contrib/openzfs/module/zfs/zio.c | 57 ++++++- > > sys/contrib/openzfs/module/zfs/zvol.c | 60 +------- > > sys/contrib/openzfs/tests/runfiles/common.run | 3 +- > > sys/contrib/openzfs/tests/runfiles/linux.run | 1 + > > .../openzfs/tests/test-runner/bin/zts-report.py.in | 2 + > > .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + > > .../functional/block_cloning/block_cloning.kshlib | 12 +- > > .../block_cloning_cross_enc_dataset.ksh | 170 +++++++++++++++++ > ++ > > ++ > > .../cli_root/zpool_import/zpool_import_status.ksh | 132 ++++++++++++++++ > > sys/modules/zfs/zfs_config.h | 7 +- > > sys/modules/zfs/zfs_gitrev.h | 2 +- > > 42 files changed, 885 insertions(+), 209 deletions(-) > > > > Hmm. This import of ZFS is a little buggy. My outgoing emails have null > characters in them again. Never mind. This is also occurs with the previous kernel. It's not this commit but something else. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Fri Dec 8 17:17:12 2023 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 4SmzPf6P28z537TF; Fri, 8 Dec 2023 17:57:42 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Received: from sdaoden.eu (sdaoden.eu [217.144.132.164]) (using TLSv1.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 4SmzPf1HCXz3YDL; Fri, 8 Dec 2023 17:57:42 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Authentication-Results: mx1.freebsd.org; none Date: Fri, 08 Dec 2023 18:17:12 +0100 Author: Steffen Nurpmeso From: Steffen Nurpmeso To: Warner Losh Cc: Xin Li , Philip Paeps , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources Message-ID: <20231208171712.nWToJe0v@steffen%sdaoden.eu> In-Reply-To: References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> <389AB29C-D5C0-4091-91ED-219F33351B35@freebsd.org> <20231207222716.obSthG6r@steffen%sdaoden.eu> <20231208010731.3hijmSTL@steffen%sdaoden.eu> Mail-Followup-To: Warner Losh , Xin Li , Philip Paeps , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org User-Agent: s-nail v14.9.24-573-g7d89a8210a OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15987, ipnet:217.144.128.0/20, country:DE] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SmzPf1HCXz3YDL Warner Losh wrote in : |On Thu, Dec 7, 2023 at 6:07=E2=80=AFPM Steffen Nurpmeso wrote: |> Warner Losh wrote in |> : |>|On Thu, Dec 7, 2023 at 3:27=E2=80=AFPM Steffen Nurpmeso |> wrote: |>|> Xin Li wrote in |>|> : |>|>|On 2023-12-06 22:34, Philip Paeps wrote: |>|>|> On 2023-12-07 14:26:05 (+0800), Warner Losh wrote: |>|>|>> We should point to bipm |>|>|>> https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list since |>|> they |>|>|>> are |>|>|>> the source of truth, no? |>|>|> |>|>|> I went for the IANA copy because data.iana.org is a much shorter and |>|>|> trustworthy looking URL. And it's also where other operating syste= ms |>|>|> get their copies. |>|>| |>|>|My understanding is that IANA's copy is part of tzdata and it's only |>|>|updated when a new set of zone data is released, so it's sometimes |>|>|outdated. It is actually going to be outdated really soon by the way. |>|> |>|> But nothing will change. |>|> It is only about the included end-of-life tag why there is |>|> discussion at all. |>|> The IANA TZ data is always updated as necessary, "early enough". |>| |>|Yes. TZ data updates multiple times a year. The lead time on NIST/BIPM |>|updating the file usually is within days or weeks after the new leap is |>|announced. |>|But ntpd can't possibly use it for about 5 months. TZ updates are plenty |>|fast. |>| |>|The bigger problem is that we have to do a EN to get a new set of zone |>|files. If we had a way to fetch them, we could just copy this file from |> the |>|updated |>|zone files. |> |> I never spoke against fetching the plain file (who is my role in |> this project in the end?), i only spoke against using the server |> of the french institute directly. |> | |The French institute is the source of truth. The BIPM defines what |UTC is, based on atomic clock measurements from all over the world. |A subagency, the IERS, measures the delta between UTC and |the earth's orientation and makes the determination of when a |leap second is scheduled. | |There's no cryptographic signature of this file. There is a hash |that ensures it's not corrupted, but it can't be verified as authoritative |since it's just a SHA hash. By grabbing it from BIPM, the source |of truth for time, we at least get their TLS certs to back up the file. |Grabbing it from anywhere else means our users have to trust the |other places. While the IETF/IANA are trustworthy, it's one level |removed. | |Then again, given this file, in this context, is only used when ntpd |can't otherwise determine the leap seconds, so maybe that high |level of trust isn't strictly needed. The lack of easy verification |of this file has been discussed in the time community on and off |for the last 25 or more years. Sorry i do not get your road in the context of this thread. Anyhow, as another point, this is what Paul Eggert of TZ said today on the thread on the IANA list: TZDB uses the NIST version of leap-seconds.list rather than the IERS version, as the NIST version is clearly public domain and so this way we don't have to worry about copyright issues. However, the IERS version should work fine with either NTPsec or with other downstream uses, such as TZDB itself (that is, if you're not worried about copyright). --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) | | Only in December: lightful Dubai COP28 Narendra Modi quote: | A small part of humanity has ruthlessly exploited nature. | But the entire humanity is bearing the cost of it, | especially the inhabitants of the Global South. | The selfishness of a few will lead the world into darkness, | not just for themselves but for the entire world. From nobody Fri Dec 8 21:23:29 2023 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 4Sn3z60L0Sz53RKl; Fri, 8 Dec 2023 21:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn3z56yjfz4NB2; Fri, 8 Dec 2023 21:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702070610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TdITvOhzzWMN37FNzlrNrwtQs2ugIW3jGL6JGMuBY9s=; b=T2pePwBr8txZquAxJVSA1Zy2YeIQ0AZaMOlp21hKy7QGTTFJRjIWYMi8Y7wRvZp3fLnwgY 6hu+7BKPtsjE6qf4+8yNfxV0HGU7UovcDrJkEuvUC510Wvgmsik11oV44A5De9qeSZWIFj 6Q9xEn2ehqePqbJrdUY4YS0U+GwGvJreNQaS23iKzUovuoxOaztmrz0LxyO4yrdcmC/y1B 2kmlq44yDAYbDyxJgd2iqwuLFogz0DdYz0eKVvlRiaSOmYodGclhElA4VKjv5qLXXCBxfT EcTsxNyZHm32W7ZbxolxvCjwbF/9q1SsR8/HSOLfWwu2WjCz27XuRyWsV5EN0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702070610; a=rsa-sha256; cv=none; b=WP1EqTy+GCIgXRZUFIwT2gwTeS9osaZBo7xABTbXY0/CoUy2tPGIY3RHjUf6bNXFwtzk7O e/+xrqrWL9RWERc24ss+8qQEZuy9xwYxMNUl/02PjLJdpWWUBSTf0bo2BL5HUsdLY6O/di zp+Hb7Rd8V/sJHPYsx0YF/WVBaFLVhy8dq9riDEHqnBomXutVgYiYQXGziOst1hKxarrj1 xfYOhEiRT6v1BXp9UEqTmKum3o3ym9p8GIJGATcpD2W7Sfp1aIIQ48j/ozPfkJrVddBr25 98QrVW67SnTiPgTan25e7eP7bkJdChaf9ZjwEwU06Nka2CzH4WAcIxy+YCyVwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702070610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TdITvOhzzWMN37FNzlrNrwtQs2ugIW3jGL6JGMuBY9s=; b=BC9TGkodcihmkm518wnWl49QFt/GXJ5LucHjskxb7/FEwrw6uusru9OAY8LGvxCQRS9Gwm eZQgDFEKLMN0oEyT/Yq9J6brMp6xkFJwu3xAgOr0YVhq7O8EDQF1TCq7GmzBmvnh6qjyHk hJWow51AP0KWia9mHgdaigmw8eSfPxNSRFpgN3Jxepn31ELWaQDUabNe/pd18PuhLbHhk0 T/DrA0roxFP+Wc34BX+4H1d4vGU9ifOkDMI7H/kttgbLsPGLX4mAAE0Tjzz8d0ew7LnJkI 0N2c88c6CSFim6aaQeRI+T5luJp/oYIFHugnznau+0o9ftHMIb2mYm9X9Zeg/A== 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 4Sn3z561KtzcTt; Fri, 8 Dec 2023 21:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8LNTU0052885; Fri, 8 Dec 2023 21:23:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8LNTH7052882; Fri, 8 Dec 2023 21:23:29 GMT (envelope-from git) Date: Fri, 8 Dec 2023 21:23:29 GMT Message-Id: <202312082123.3B8LNTH7052882@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 8e0f41677998 - main - ObsoleteFiles.inc: fix dates after llvm 17.0.6 merge. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 8e0f41677998b304f46c940f14f52abbfd828091 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8e0f41677998b304f46c940f14f52abbfd828091 commit 8e0f41677998b304f46c940f14f52abbfd828091 Author: Dimitry Andric AuthorDate: 2023-12-08 21:20:03 +0000 Commit: Dimitry Andric CommitDate: 2023-12-08 21:22:12 +0000 ObsoleteFiles.inc: fix dates after llvm 17.0.6 merge. PR: 273753 MFC after: 1 month --- ObsoleteFiles.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 815f2a5fc3a1..7c54bec8c633 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,7 +51,7 @@ # xargs -n1 | sort | uniq -d; # done -# 2023mmdd: new clang import which bumps version from 16 to 17 +# 20231208: new clang import which bumps version from 16 to 17 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_builtin_vars.h OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_cmath.h OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_complex_builtins.h @@ -429,7 +429,7 @@ OLD_FILES+=usr/lib/clang/16/share/msan_ignorelist.txt OLD_DIRS+=usr/lib/clang/16/share OLD_DIRS+=usr/lib/clang/16 -# 2023mmdd: new libc++ import which bumps version from 16 to 17 +# 20231208: new libc++ import which bumps version from 16 to 17 OLD_FILES+=usr/include/c++/v1/__bsd_locale_defaults.h OLD_FILES+=usr/include/c++/v1/__bsd_locale_fallbacks.h OLD_FILES+=usr/include/c++/v1/__debug From nobody Fri Dec 8 21:23:30 2023 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 4Sn3z71vHQz53R9J; Fri, 8 Dec 2023 21:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn3z71CMdz4NXg; Fri, 8 Dec 2023 21:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702070611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ljh9QswpKLIw231oQjWc3gPP8cbFXTugAYMpT4PyRvQ=; b=CMvhkjeP7lcMw9KAA3Q7dfNIL2rTn1EI04I8iTHS6ZWeOKxug36blDsgNkuGItMuIPa+y2 3P9lNuQEz5B0UbuYMuYapKvdYWZTDifdqvJANXlzKs7tgHR+mB1KQ/FNbh80hzwukkFjkf RRR0ZKCdRj0J3GibcTT9XARKGqiC5pmUnx5OUahiV2ou8y/Dl5A5FAdoQvUp80KgGhu/Cz 3dSj05tscfGqQEMPCCWoffD7YBJX2tyYDtG66jjEuArBR111Te1R4UHFdK+jWG4FlGc5G0 +lPNPlqyBBKP5e1ZhyiHD0+7L/dgkcrq/eyf2ao4Is3EXL6K29l7Bo73WS8fPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702070611; a=rsa-sha256; cv=none; b=IHD7ceeFaqJFOGwx+wq+MF9jaB2kJy6S7DB++nLAYT5K/SQJRJNzj1RmEyZekJYqJAg15a xJomIkoAHWtEBvwr/DcFC4fSetQgd8M0L5TRMcS7Tcc1uywtilx35LV2WS3jaN42gRT4ZQ H0TDvmO5t0RGKi0OgYTR9ywiTxQ+SWdRIPw/YxoEqvqmvc193EAq5NBz6ME0SyWS+FvaEr 932F7cFrD9ysiQYamfFgMGYGL4SYU+GJU8FoqyQfxD9UEp+RgP/jxhXrzNacvEF8+J0JQK gjHCH7iLOwPUy9+Mqsc79uB77XA+kLbl0FPP9C6qyUiivPMHbnxuESyQMcniPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702070611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ljh9QswpKLIw231oQjWc3gPP8cbFXTugAYMpT4PyRvQ=; b=tSH4h+xt0JWYI5efw5O3uejsNsuuwduyxa/mGIlWOW/ArQdPdGpVfsjphvjmQOJqUhLYGl x43oTbDAsmwmQtypGrVOANefJ+7hbPw93ZMD4d5rB9LJ5jibkFZqsMxdxjX5dLomZMDC9q sFMz0ECg5nletTMXfYBleLTA4/q5DzF+wPAiyalCtgLCcMT0/uTqn262umLSkE+yXgDHM/ 5U7ltBZ0poToj4a71UgX3V2FjIZbWPiXRdaJEKelwiurSfXO41/Bq6xnzkikR2YuxrT1zm ovgv0XWO3o3sUWVioGXY/71edHVPfXWG63bxSklkJQ8SMnfOGUTraQebdUM69A== 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 4Sn3z6750mzcs4; Fri, 8 Dec 2023 21:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8LNU59052937; Fri, 8 Dec 2023 21:23:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8LNUfC052934; Fri, 8 Dec 2023 21:23:30 GMT (envelope-from git) Date: Fri, 8 Dec 2023 21:23:30 GMT Message-Id: <202312082123.3B8LNUfC052934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: f959fcafb506 - main - ObsoleteFiles.inc: remove old libufs.so.7 after bump List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: f959fcafb506225be6b662516992edf8bf22b543 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f959fcafb506225be6b662516992edf8bf22b543 commit f959fcafb506225be6b662516992edf8bf22b543 Author: Dimitry Andric AuthorDate: 2023-12-08 21:21:59 +0000 Commit: Dimitry Andric CommitDate: 2023-12-08 21:23:00 +0000 ObsoleteFiles.inc: remove old libufs.so.7 after bump Fixes: 772430dd6795 --- ObsoleteFiles.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 7c54bec8c633..da7e3d432bfb 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -453,6 +453,9 @@ OLD_FILES+=usr/include/c++/v1/experimental/algorithm OLD_FILES+=usr/include/c++/v1/experimental/coroutine OLD_FILES+=usr/include/c++/v1/experimental/functional +# 20231117: libufs version bumped to 8 +OLD_LIBS+=lib/libufs.so.7 + # 20231018: pmc.k7(3) removed OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz From nobody Fri Dec 8 21:46:46 2023 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 4Sn4Ty4wFKz53Snr; Fri, 8 Dec 2023 21:46: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4Ty4MnLz4QQd; Fri, 8 Dec 2023 21:46:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3evz/mCt1RX66vMrDvINPXoeAgxr+VAWQcrwZc8gdjE=; b=q5il0RIkQbnEcQzuqlDeZmspWaoZphtGAmTsPysJprxOSbtgnwxSKqp+umo7vRra6lGvNv Ji6+UD3m9NX3/OxzYG3JPh+VvSu3Zfn6sIfP7gpjo5YdVkU3FrCtzFEWz4C3tQowv0n9jU xui5p8scOJu9t4TmGZdrOhtprTtl/I/EVR64oHQt2LXdma/RzTxtQUhj3+e8iFTps+Ttrg 0munQ/LkuFlzM+uuMlff1RKRPJTTrOlZKWMu8Rpb1iXGrU44tV4tzoGcoCJ42YZUcbybCa yOw6eT4e7Dm21qyR4Y7pBQDHKhOVm+O8YZ38VqZbHFUGYBQLlRe9pv/ZgzGWrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072006; a=rsa-sha256; cv=none; b=ts4VLWViyEoyqnNs6na44oYzjGrGNZO26jrlE5SzHJCPKjXRHRz2M3YY0+IXVJi8ECjmU6 Xg7IN5Qu6TJbMQNktM2yLuPGPlxkwE/+bugEWzkHr40AdVY/U1tsMEq6wD/stjRxBV1DqV Lzwt5GXOuSmhIX+WgkQQFKuULE4zZSVlo4Z7/u4DDwuQ6w3YSgSqTulsZXRM7VY3U/YbDD 8mY/ZRvpMTai75EoGH56HqjGhjGm4ygfIewQTbqgM6QhPb04oZAH9DglbNlmAgee6V1F+T La0R8+dTpCsIBYoi3LexkvwLB6v5OfluozbIukmXuQWMOoU0Y+UKFotN3AmfDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3evz/mCt1RX66vMrDvINPXoeAgxr+VAWQcrwZc8gdjE=; b=vsfM3o8mHEQghxmd2W2gt85+ft1kJXlWxbDiDRCCHM5tBc8krxv4waE+J/EwnrzGEgafFK G91t2U6a1rlLUjgiG8BBf1gr2XOPnyMetejQX/W5JNjgF5mtv07JNkyroa07dlWDRcxUHj 7AyTeQXypGgAFEWQzBCd6SeHXlfZUMcKTU8Dzf1bpiCGcEPfWJu79XkqUtQ2ufZgmRe+Kf R9rc418nG9Zquf10SxI9uefM1Tx2pIROC4R/+YkZP/tNUWfk6H4QRCqNKDmHkJMiJhEj/b lOgkfox3L3Ez4ujZUY/TI/wx2mbLkuLcO1PcN74HlrnRK/V8XVLF1l4mvPN5Dw== 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 4Sn4Ty3QDmzcVx; Fri, 8 Dec 2023 21:46:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8LkkrB087313; Fri, 8 Dec 2023 21:46:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8LkkKr087310; Fri, 8 Dec 2023 21:46:46 GMT (envelope-from git) Date: Fri, 8 Dec 2023 21:46:46 GMT Message-Id: <202312082146.3B8LkkKr087310@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: 1631382cf282 - main - loader: provide a features table for binary compatibility advertisement List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1631382cf2820245cc72965498ff174bb548dd63 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1631382cf2820245cc72965498ff174bb548dd63 commit 1631382cf2820245cc72965498ff174bb548dd63 Author: Kyle Evans AuthorDate: 2023-12-08 21:36:06 +0000 Commit: Kyle Evans CommitDate: 2023-12-08 21:43:19 +0000 loader: provide a features table for binary compatibility advertisement liblua now provides a loader.has_feature() function to probe the loader binary for features advertised. name => desc mappings are provided in loader.features to get a list of all of the features loader *can* support. core.hasFeature is provided as a shim to loader.has_feature so that individual consumers don't need to think about the logic of the loader module not providing has_feature; we know that means the feature isn't enabled. The first consumer of this will be EARLY_ACPI to advertise that the loader binary probes for ACPI presence before the interpreter has started, so that we know whether we can trust the presence of acpi.rsdp as relatively authoritative. In general, it's intended to be used to avoid breaking new scripts on older loaders within reason. This will be used in lua as `core.hasFeature("EARLY_ACPI")`, while the C bits of loader will `feature_enable(FEATURE_EARLY_ACPI)`. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D42695 --- stand/liblua/lutils.c | 48 ++++++++++++++++++++++++++++++++++++++++ stand/libsa/Makefile | 2 +- stand/libsa/features.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ stand/libsa/libsa.3 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ stand/libsa/stand.h | 15 +++++++++++++ stand/lua/core.lua | 9 ++++++++ stand/lua/core.lua.8 | 9 +++++++- 7 files changed, 197 insertions(+), 2 deletions(-) diff --git a/stand/liblua/lutils.c b/stand/liblua/lutils.c index 1792d0c8c620..274d9a39da21 100644 --- a/stand/liblua/lutils.c +++ b/stand/liblua/lutils.c @@ -75,6 +75,25 @@ lua_has_command(lua_State *L) return 1; } +static int +lua_has_feature(lua_State *L) +{ + const char *feature; + char *msg; + + feature = luaL_checkstring(L, 1); + + if (feature_name_is_enabled(feature)) { + lua_pushboolean(L, 1); + return 1; + } + + lua_pushnil(L); + lua_pushstring(L, "Feature not enabled"); + return 2; +} + + static int lua_perform(lua_State *L) { @@ -552,6 +571,7 @@ static const struct luaL_Reg loaderlib[] = { REG_SIMPLE(parse), REG_SIMPLE(getenv), REG_SIMPLE(has_command), + REG_SIMPLE(has_feature), REG_SIMPLE(perform), REG_SIMPLE(printc), /* Also registered as the global 'printc' */ REG_SIMPLE(setenv), @@ -579,6 +599,33 @@ static const struct luaL_Reg iolib[] = { }; #undef REG_SIMPLE +static void +lua_add_feature(void *cookie, const char *name, const char *desc, bool enabled) +{ + lua_State *L = cookie; + + /* + * The feature table consists solely of features that are enabled, and + * their associated descriptions for debugging purposes. + */ + lua_pushstring(L, desc); + lua_setfield(L, -2, name); +} + +static void +lua_add_features(lua_State *L) +{ + + lua_newtable(L); + feature_iter(&lua_add_feature, L); + + /* + * We should still have just the table on the stack after we're done + * iterating. + */ + lua_setfield(L, -2, "features"); +} + int luaopen_loader(lua_State *L) { @@ -592,6 +639,7 @@ luaopen_loader(lua_State *L) lua_setfield(L, -2, "lua_path"); lua_pushinteger(L, bootprog_rev); lua_setfield(L, -2, "version"); + lua_add_features(L); /* Set global printc to loader.printc */ lua_register(L, "printc", lua_printc); return 1; diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index 57340709873b..a1b9bc32e025 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -13,7 +13,7 @@ LIB?= sa # standalone components and stuff we have modified locally SRCS+= gzguts.h zutil.h __main.c abort.c assert.c bcd.c environment.c \ - getopt.c gets.c globals.c \ + features.c getopt.c gets.c globals.c \ hexdump.c nvstore.c pager.c panic.c printf.c strdup.c strerror.c \ random.c sbrk.c tslog.c twiddle.c zalloc.c zalloc_malloc.c diff --git a/stand/libsa/features.c b/stand/libsa/features.c new file mode 100644 index 000000000000..23dce2b13b60 --- /dev/null +++ b/stand/libsa/features.c @@ -0,0 +1,56 @@ +/*- + * Copyright (c) 2023 Kyle Evans + * + * SPDX-License-Identifier: BSD-2-Clause + * + */ + +#include + +#include "stand.h" + +static uint32_t loader_features; + +#define FEATURE_ENTRY(name, desc) { FEATURE_##name, #name, desc } +static const struct feature_entry { + uint32_t value; + const char *name; + const char *desc; +} feature_map[] = { + FEATURE_ENTRY(EARLY_ACPI, "Loader probes ACPI in early startup"), +}; + +void +feature_enable(uint32_t mask) +{ + + loader_features |= mask; +} + +bool +feature_name_is_enabled(const char *name) +{ + const struct feature_entry *entry; + + for (size_t i = 0; i < nitems(feature_map); i++) { + entry = &feature_map[i]; + + if (strcmp(entry->name, name) == 0) + return ((loader_features & entry->value) != 0); + } + + return (false); +} + +void +feature_iter(feature_iter_fn *iter_fn, void *cookie) +{ + const struct feature_entry *entry; + + for (size_t i = 0; i < nitems(feature_map); i++) { + entry = &feature_map[i]; + + (*iter_fn)(cookie, entry->name, entry->desc, + (loader_features & entry->value) != 0); + } +} diff --git a/stand/libsa/libsa.3 b/stand/libsa/libsa.3 index a6f30051c8df..7643423b342a 100644 --- a/stand/libsa/libsa.3 +++ b/stand/libsa/libsa.3 @@ -497,6 +497,66 @@ Attempts to open and display the file .Fa fname . Returns -1 on error, 0 at EOF, or 1 if the user elects to quit while reading. .El +.Sh FEATURE SUPPORT +A set of functions are provided to communicate support of features from the +loader binary to the interpreter. +These are used to do something sensible if we are still operating with a loader +binary that behaves differently than expected. +.Bl -hang -width 10n +.It Xo +.Ft void +.Fn feature_enable "uint32_t mask" +.Xc +.Pp +Enable the referenced +.Fa mask +feature, which should be one of the +.Li FEATURE_* +macros defined in +.In stand.h . +.It Xo +.Ft bool +.Fn feature_name_is_enabled "const char *name" +.Xc +.Pp +Check if the referenced +.Fa name +feature is enabled. +The +.Fa name +is usually the same name as the +.Li FEATURE_* +macro, but with the FEATURE_ prefix stripped off. +The authoritative source of feature names is the mapping table near the top in +.Pa stand/libsa/features.c . +.It Xo +.Ft void +.Fn "(feature_iter_fn)" "void *cookie" "const char *name" "const char *desc" "bool enabled" +.Xc +.Pp +The +.Fa cookie +argument is passed as-is from the argument of the same name to +.Fn feature_iter . +The +.Fa name +and +.Fa desc +arguments are defined in the mapping table in +.Pa stand/libsa/features.c . +The +.Fa enabled +argument indicates the current status of the feature, though one could +theoretically turn a feature off in later execution. +As such, this should likely not be trusted if it is needed after the iteration +has finished. +.It Xo +.Ft void +.Fn "feature_iter" "feature_iter_fn *iter_fn" "void *cookie" +.Xc +.Pp +Iterate over the current set of features. +.El .Sh MISC .Bl -hang -width 10n .It Xo diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h index b6ddebb82fd7..f500a8f47847 100644 --- a/stand/libsa/stand.h +++ b/stand/libsa/stand.h @@ -496,6 +496,21 @@ extern void *reallocf(void *, size_t); */ caddr_t ptov(uintptr_t); +/* features.c */ +typedef void (feature_iter_fn)(void *, const char *, const char *, bool); + +extern void feature_enable(uint32_t); +extern bool feature_name_is_enabled(const char *); +extern void feature_iter(feature_iter_fn *, void *); + +/* + * Note that these should also be added to the mapping table in features.c, + * which the interpreter may query to provide details from. The name with + * FEATURE_ removed is assumed to be the name we'll provide in the loader + * features table, just to simplify reasoning about these. + */ +#define FEATURE_EARLY_ACPI 0x0001 + /* hexdump.c */ void hexdump(caddr_t region, size_t len); diff --git a/stand/lua/core.lua b/stand/lua/core.lua index 5c3c65463e51..3a80b0822ca6 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -378,6 +378,15 @@ function core.boot(argstr) loader.perform(composeLoaderCmd("boot", argstr)) end +function core.hasFeature(name) + if not loader.has_feature then + -- Loader too old, no feature support + return nil, "No feature support in loaded loader" + end + + return loader.has_feature(name) +end + function core.isSingleUserBoot() local single_user = loader.getenv("boot_single") return single_user ~= nil and single_user:lower() == "yes" diff --git a/stand/lua/core.lua.8 b/stand/lua/core.lua.8 index 5274ba4c2143..84447d7632b9 100644 --- a/stand/lua/core.lua.8 +++ b/stand/lua/core.lua.8 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 20, 2023 +.Dd December 8, 2023 .Dt CORE.LUA 8 .Os .Sh NAME @@ -142,6 +142,13 @@ due to a boot environment change or a potential change in either .Ic kernel or .Ic kernels . +.It Fn core.hasFeature featureName +Checks whether the named +.Fa featureName +is enabled in the current loader. +This is specifically used for detecting capabilities of the loaded loader +binary, so that one can reasonably implement backwards compatibility shims if +needed. .It Fn core.kernelList Returns a table of kernels to display on the boot menu. This will combine From nobody Fri Dec 8 21:46:47 2023 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 4Sn4Tz5h5lz53SkB; Fri, 8 Dec 2023 21:46: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4Tz59NMz4QNN; Fri, 8 Dec 2023 21:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0RUlszetQ8N1KWOESC/7zxtnfiRs6Z5P64J6kwfkfeo=; b=vPxATsP4EQcEo3GW1PFVbYJS9GgQXR87SYNBJ9Vs4w3BN690xhJbmxA/BNn+0JqZOKcbQo jjEvHhKmPt2R06Nl9yRDEmn0HX347/zdoVL97PvoIOo1W5hA5OW6suoKa9LnUeqXqxSWsF SkvDRKd+uAM/R8T/8EaQS9KsdsIMBppU6GcU8q4hcw1VD5R/pjA+ma5Z7rJNyOLYdDT9Jc aL2yhpPiTk1b1JazuzDcAuVAJQb71XMI1o1L+nepKP2GAReOkMcwey6Orsnvc/wGg2RpvK q6hdQa/cscAfQIDNeH9qma7J00eG47adoHf7+Gh9r/DvEMq4Zxcbo7cwNxGSHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072007; a=rsa-sha256; cv=none; b=w6dOivd66yeUzUwL1TPu/2m6LQXJn3iNi2Y4+Faamg0Q8bnl2v77UI/jZFwDjI6RinIb9z w8tH0nTVAi6mdIgMEmZQxD6RWGJKgZP8BJ1xJqyBudCmKkQlUbrBtFXLCeOWWqpDVUuRnA ex+hEXSbSx1vkFOKbKID9duY5VZnne046d9Zh1X+z7SO48QmN/ptnKrC/iyd55uT/zK2qG TwtDk8xp9vjJebNYJDdKiSTpV7VO555BgCp6tA1pi5OifE0h6cUCJ9MFhR0pWSzDsEXswZ /zCybKCtV75oE6L3V1htlqs8JMABqM1EUm5e4USh9w+Hh/Bum3bcEdWMo9ZIiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0RUlszetQ8N1KWOESC/7zxtnfiRs6Z5P64J6kwfkfeo=; b=csszqj4uS3bNIOA0RpiY4ZLz1DL1w6zToUKTHa0ZlwxDyXAoCv+t8EagMo4AGxXgPL19m8 JlnG0TBTgt8xN8f+8tIbais0sSKAyY3H7k9ctZOw9gFqJgJSkfcR2eZOywNE12ms8l2zf3 o8RB1dMDPNMSYzLS/AADBl5VCJl6Zn1iPnmZfxBYzPdwTC8zAlFKUxvBhF1eyrzO4MCZec bMmdABlcvBrBlO2Jc4/qtJHGFIekerH2bsfhyu7OPpbRxjhETj4vAQ5sQ8chbVL/RGqnQb VDys4cIS4GZPBEDp2kzW9HWpRj+xLtOK7DSOLHAEKhczTuEg+p7OvSpbYFeNOw== 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 4Sn4Tz4F0WzctT; Fri, 8 Dec 2023 21:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8LklEU087375; Fri, 8 Dec 2023 21:46:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8Lklan087371; Fri, 8 Dec 2023 21:46:47 GMT (envelope-from git) Date: Fri, 8 Dec 2023 21:46:47 GMT Message-Id: <202312082146.3B8Lklan087371@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: e183039f0882 - main - loader: lua: assume late ACPI detection if the feature isn't 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e183039f0882009c455c3b59fe1ab58a4fd25a5e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e183039f0882009c455c3b59fe1ab58a4fd25a5e commit e183039f0882009c455c3b59fe1ab58a4fd25a5e Author: Kyle Evans AuthorDate: 2023-12-08 21:36:06 +0000 Commit: Kyle Evans CommitDate: 2023-12-08 21:43:59 +0000 loader: lua: assume late ACPI detection if the feature isn't enabled While we're here, enable the feature in the places we detect ACPI. This lets us side-step the existing issues and provide a path forward for folks upgrading from previous releases that haven't updated their ESP yet. Let's also fix core.setACPI: the hint already indicates that the user's disabled it more consistently than loader.acpi_disabled_by_user. Even more, the latter is wrong because we set it by default if we did not detect ACPI. The ACPI hint remains even when we're setting defaults because ACPI loaded into the kernel will make some noise if it's not hinted off, even when we didn't detect it. imp notes that this will result in some relatively harmless noise on platforms that don't support ACPI but aren't using the UEFI loader, as we would enable the ACPI module for loading on them and then loader would not be able to find it. These are non-fatal, but should probably be fixed by just declaring support for EARLY_ACPI in those loaders since we know they won't have ACPI early on -- punting on this for the time being, though, in favor of providing a safer upgrade path sooner. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D42727 --- stand/efi/loader/main.c | 1 + stand/i386/libi386/biosacpi.c | 2 ++ stand/lua/core.lua | 21 +++++++++++---------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index d6ba7ec3da44..23894d832e5e 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -909,6 +909,7 @@ acpi_detect(void) char buf[24]; int revision; + feature_enable(FEATURE_EARLY_ACPI); if ((rsdp = efi_get_table(&acpi20)) == NULL) if ((rsdp = efi_get_table(&acpi)) == NULL) return; diff --git a/stand/i386/libi386/biosacpi.c b/stand/i386/libi386/biosacpi.c index f94e8684c970..fcad64d81549 100644 --- a/stand/i386/libi386/biosacpi.c +++ b/stand/i386/libi386/biosacpi.c @@ -54,6 +54,8 @@ biosacpi_detect(void) char buf[24]; int revision; + feature_enable(FEATURE_EARLY_ACPI); + /* locate and validate the RSDP */ if ((rsdp = biosacpi_find_rsdp()) == NULL) return; diff --git a/stand/lua/core.lua b/stand/lua/core.lua index 3a80b0822ca6..c7581b296b8f 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -133,17 +133,20 @@ function core.setSingleUser(single_user) end function core.hasACPI() - return loader.getenv("acpi.rsdp") ~= nil -end + -- We can't trust acpi.rsdp to be set if the loader binary doesn't do + -- ACPI detection early enough. UEFI loader historically didn't, so + -- we'll fallback to assuming ACPI is enabled if this binary does not + -- declare that it probes for ACPI early enough + if loader.getenv("acpi.rsdp") ~= nil then + return true + end -function core.isX86() - return loader.machine_arch == "i386" or loader.machine_arch == "amd64" + return not core.hasFeature("EARLY_ACPI") end function core.getACPI() if not core.hasACPI() then - -- x86 requires ACPI pretty much - return false or core.isX86() + return false end -- Otherwise, respect disabled if it's set @@ -157,13 +160,11 @@ function core.setACPI(acpi) end if acpi then - loader.setenv("acpi_load", "YES") + config.enableModule("acpi") loader.setenv("hint.acpi.0.disabled", "0") - loader.unsetenv("loader.acpi_disabled_by_user") else - loader.unsetenv("acpi_load") + config.disableModule("acpi") loader.setenv("hint.acpi.0.disabled", "1") - loader.setenv("loader.acpi_disabled_by_user", "1") end core.acpi = acpi end From nobody Fri Dec 8 21:56:49 2023 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 4Sn4jY2zwvz53TVK; Fri, 8 Dec 2023 21:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4jY2W3Nz4RSx; Fri, 8 Dec 2023 21:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k05cf3zE4NABwz0X7pWtCtZT3mbjEpcZs+gUNpVXp/4=; b=eceftnv1BVRN3KgzR/fN9SL7Cq9BEVlXVykas1z0rilTQ+zdy4kI74jHZemXM5xkAtXTj5 ARBrvbigbS5Ww19p4O6WHD5b/jrT0Uawyo0raK3R2G25FCv18sOHzqpEwR3SNVYNc63kkd brkxli3n+SpcY+8/ZhOrcG/qp0ui2LXo2BzcCI9Eo1t8q47fCBTkBKSYjAthCvWlAqSdKB /0KXXk7jhCNbwTZzYVg69BTl+eLmYvtl5Qj+tkpTWfL0KQvWbYWimHdK/i3bfkC5hWBHeF ++jxMZQyqnJwC6vV8P3hhXTBfQHiVwfU741AfkNwS2ss7lR/B4KNNDSLsZRpGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072609; a=rsa-sha256; cv=none; b=qDnlT0MWm3zmnSIXEOSr7mvXcLDiy5U5edS0uJYT7rCWW4BnpWM9+2q7vwJWPcmgakLu44 jm8DPbDF5uZ9DhliXVHgqWyFQcDzqpkSDSkBePGzRKwvvkW75V0ZFsC3ToGqKQTgyFL1+H WOnugff6ObKk3Suh//kaFP54E88F0An37Jj5UkdF6eERVPjV8ex7I6SCXt39eylRmrQihv dc0yZUgIVLwkZldWYCNowdPQt7u42o3l/9Ui40mHhZJSuy0Yw8TcslxJsqBtzK3csgCP8w UwwlLirofrl1zFmlekYDRgBA4JgJ2ad8XDlT67P/5qDurHZPkDBeqAKPjioobw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k05cf3zE4NABwz0X7pWtCtZT3mbjEpcZs+gUNpVXp/4=; b=YDMNPeSFlwIIZ939ryXXalIluA3KdXUMfy3vxt6Hlk+/CncOTFSBhXm6WxBtw6OcPX8rgf hlENdkNuI5PILaWXUMEUgqXTOQIlR9p5s+l5kRc6QTn/wf0TNmIm9skNs3xcj7sI+olpfk qUVfDmA62Ub2bRGNbx4xiokD7l8hml6JOuh2AIdGOxusJ8N5HH7KaiKWU4+Wf+83/I2YK0 kun96MspeRP7ss1MF9rP/bCZCIU1NdNNusM41WZmw3qAflZ1TED4+8Vtn3oW1Pw89XGZAu h4UNm/wv8/waALVsbnahx/mzXSmZquTIk0Z+p/GpMDfnNlFCozvaTUGfAwcDkg== 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 4Sn4jY1ZLjzdnR; Fri, 8 Dec 2023 21:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8LunCQ003635; Fri, 8 Dec 2023 21:56:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8Lun7Y003632; Fri, 8 Dec 2023 21:56:49 GMT (envelope-from git) Date: Fri, 8 Dec 2023 21:56:49 GMT Message-Id: <202312082156.3B8Lun7Y003632@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: e48c3d3a06db - stable/14 - Document library types in the intro(3) 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e48c3d3a06db6a435207f6c08b4d31e9deb242e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e48c3d3a06db6a435207f6c08b4d31e9deb242e7 commit e48c3d3a06db6a435207f6c08b4d31e9deb242e7 Author: Gordon Bergling AuthorDate: 2023-11-16 09:48:09 +0000 Commit: Gordon Bergling CommitDate: 2023-12-08 21:56:25 +0000 Document library types in the intro(3) manual page Add a paragraph about library types to the intro(3) manual page. Document library types, locations and versioning. Reviewed by: emaste, jilles, mhorne, pauamma_gundo.com Obtained from: OpenBSD (partial) Differential Revision: https://reviews.freebsd.org/D36594 (cherry picked from commit 54611b7cc69cee34e7bcdc2324a9159e7543a125) --- share/man/man3/intro.3 | 97 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 94 insertions(+), 3 deletions(-) diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3 index c36ab620bed3..bfae9093af93 100644 --- a/share/man/man3/intro.3 +++ b/share/man/man3/intro.3 @@ -26,8 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)intro.3 8.1 (Berkeley) 6/5/93 -.\" -.Dd November 7, 2022 +.Dd November 16, 2023 .Dt INTRO 3 .Os .Sh NAME @@ -278,13 +277,105 @@ the math library .It Pa /usr/lib/libm_p.a the math library compiled for profiling .El +.Sh LIBRARY TYPES +The system libraries are located in +.Pa /lib +and +.Pa /usr/lib . +A library has the following naming convention: +.Bd -unfilled -offset indent +libc.so.7 +.Ed +.Pp +Libraries with an +.Sq .a +suffix are static. +When a program is linked against a static library, all necessary library code +will be included in the binary. +This means the binary can be run even when the libraries are unavailable. +However, it can be inefficient with both disk space and memory usage +during execution. +The C compiler, +.Xr cc 1 , +can be instructed to link statically by specifying the +.Fl static +flag. +.Pp +Libraries with a +.Sq .so.X +suffix are dynamic libraries. +When code is linked dynamically, the library code that the application needs +is not included in the binary. +Instead, data structures are added containing information about which dynamic +libraries to link with. +When the binary is executed, the run-time linker +.Xr ld.so 1 +reads these data structures and loads them into the +process virtual address space. +.Xr rtld 1 +loads the shared libraries when the program is executed. +.Pp +.Sq X +represents the library version number of the library. +In the example above, a binary linked with +.Pa libc.so.8 +would not be usable on a system where only +.Pa libc.so.7 +is available. +.Pp +The advantages of dynamic libraries are that multiple instances of the same +library can share address space, and the physical size of the binary is +smaller. +A namespace per shared library is available via hidden visibility, +allowing multiple compilation units in a library to share things without +making them available to other libraries. +It is possible to load libraries dynamically via +.Xr dlopen 3 . +The disadvantage is the added complexity that comes with loading the +libraries dynamically, and the extra time taken to load the libraries. +Of course, if the libraries are not available, the binary will be unable +to execute. +Calls across shared libraries are also slightly slower and cannot be +inlined, not even with link time optimization. +The C compiler, +.Xr cc 1 , +can be instructed to link dynamically by specifying the +.Fl shared +flag. +.Pp +Shared libraries, as well as static libraries on architectures which produce +position-independent executables +.Pq PIEs +by default, contain position-independent code +.Pq PIC . +Normally, compilers produce relocatable code. +Relocatable code needs to be modified at run-time, depending on where in +memory it is to be run. +The C compiler, +.Xr cc 1 , +can be instructed to generate PIC code by specifying the +.Fl fPIC +flag. +.Pp +Static libraries are generated using the +.Xr ar 1 +utility. +The libraries contain an index to the contents of the library, +stored within the library itself. +The index lists each symbol defined by a member of a library that is a +relocatable object file. +This speeds up linking to the library, and allows routines in the library +to call each other regardless of their placement within the library. .Sh SEE ALSO +.Xr ar 1 , .Xr cc 1 , .Xr ld 1 , .Xr nm 1 , .Xr intro 2 , .Xr math 3 , -.Xr stdio 3 +.Xr stdio 3 , +.Xr make.conf 5 , +.Xr src.conf 5 .Sh HISTORY An .Nm From nobody Fri Dec 8 21:57:49 2023 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 4Sn4kj6k8Mz53Tb4; Fri, 8 Dec 2023 21:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4kj69CSz4RgB; Fri, 8 Dec 2023 21:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hOHpu31NhzNWHzSzhFHmwccE1vbyc+r30NOk+sDBr7k=; b=et5deDbD13VB9u9x41ht5E3w5iyroAvJXgEaukc3GluMLxW7gD1EHlhT2bwqgKKEppYFwt 2ajN+rfjRK6+q6pWa3SjwDmnO+Ra9iaNDBokxJCnnorKszkPry4eYmWUpdlGAX1MG9Gg8e cqdI1eBZAGD9CLTvntyBtQ2psEXUajcAp+zVWJO1twxqGkCLY2/YtOpu/cekDMcgpnRRmg CaE45/mH6dhph3tdu0n4Vj8LW05v5gDzm+CL/mdpe/3Tn2HQHj/ZY7ymidU/Ae/tI7wtcu 2BA5OBZ4mOh3wfPD5G8fH+Hw/p11ICds+hiIL/e+bXmyOrnG78GugVmCjkQRlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072669; a=rsa-sha256; cv=none; b=vBdKyuzg0DBbQJCHZFhj9mc0cU7KUvnC3gVDgPD2tpBAZ8ZWctL0/xNOmGK78Lh7wkFYKg 8Kb5pGnpLXwVuDtCVptz9jRHxrdjVR/h1SJUL++Kjl2pfrVPjX2WzKQlFAOpW07THP7045 UxY/hL8xSOIUfqc8m0GjkqW1BsXzl/C5J7Dls5rDBsTtAyjN0z/j/+hxoYSJFgCTt0a1g1 WNfmNc9Wdvas04rMSfh8j9Wam2fbpSj52qq4O+uCNuS5sivtFfnzuXLdTpsrAxvpiBLlil l/mSW7MflWW9GFi0VkhmZrsYgLIWryjrAPrBhar7cvH5cafMvUNUrUWZAv3xqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hOHpu31NhzNWHzSzhFHmwccE1vbyc+r30NOk+sDBr7k=; b=Ht76JP/L5YyIDbBcrR91582NWZP9tRjGX0QQcoUgB5nRD2mZVV7cxAV0J1wUy2eDVl2i8o h2mkSQylWU2sfg8IV6kVupDxpRrAzw4MyxXxtVbmCwsmeRzfr5aAxeUpg+22A4eAe5qmV5 ugv5GdYo6nlAGz5Mbtf/XRQXzQdQrNsEw8NCUS5ZsNQ2kb61eVTx5BCAVJDTOlAeLQDcUm 3MXALoctwgSOJvFT6RwKOBzkBe8NIqDdEt1hgkkrlFKoiEbp5LevPKjjovC92gLPqPFiJ5 D35sDzA26QnAa+BupTnYalKsTVJ/TAul9JyhIaQL5pQXAUShnuD6jrFSmHpCBA== 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 4Sn4kj5Drfzdqq; Fri, 8 Dec 2023 21:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8Lvn2Q003902; Fri, 8 Dec 2023 21:57:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8LvnVp003899; Fri, 8 Dec 2023 21:57:49 GMT (envelope-from git) Date: Fri, 8 Dec 2023 21:57:49 GMT Message-Id: <202312082157.3B8LvnVp003899@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: 914cb28ba291 - stable/13 - Document library types in the intro(3) 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 914cb28ba29175552d7afab4a2e0f1af59e21e8f Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=914cb28ba29175552d7afab4a2e0f1af59e21e8f commit 914cb28ba29175552d7afab4a2e0f1af59e21e8f Author: Gordon Bergling AuthorDate: 2023-11-16 09:48:09 +0000 Commit: Gordon Bergling CommitDate: 2023-12-08 21:57:32 +0000 Document library types in the intro(3) manual page Add a paragraph about library types to the intro(3) manual page. Document library types, locations and versioning. Reviewed by: emaste, jilles, mhorne, pauamma_gundo.com Obtained from: OpenBSD (partial) Differential Revision: https://reviews.freebsd.org/D36594 (cherry picked from commit 54611b7cc69cee34e7bcdc2324a9159e7543a125) --- share/man/man3/intro.3 | 97 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 94 insertions(+), 3 deletions(-) diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3 index c36ab620bed3..bfae9093af93 100644 --- a/share/man/man3/intro.3 +++ b/share/man/man3/intro.3 @@ -26,8 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)intro.3 8.1 (Berkeley) 6/5/93 -.\" -.Dd November 7, 2022 +.Dd November 16, 2023 .Dt INTRO 3 .Os .Sh NAME @@ -278,13 +277,105 @@ the math library .It Pa /usr/lib/libm_p.a the math library compiled for profiling .El +.Sh LIBRARY TYPES +The system libraries are located in +.Pa /lib +and +.Pa /usr/lib . +A library has the following naming convention: +.Bd -unfilled -offset indent +libc.so.7 +.Ed +.Pp +Libraries with an +.Sq .a +suffix are static. +When a program is linked against a static library, all necessary library code +will be included in the binary. +This means the binary can be run even when the libraries are unavailable. +However, it can be inefficient with both disk space and memory usage +during execution. +The C compiler, +.Xr cc 1 , +can be instructed to link statically by specifying the +.Fl static +flag. +.Pp +Libraries with a +.Sq .so.X +suffix are dynamic libraries. +When code is linked dynamically, the library code that the application needs +is not included in the binary. +Instead, data structures are added containing information about which dynamic +libraries to link with. +When the binary is executed, the run-time linker +.Xr ld.so 1 +reads these data structures and loads them into the +process virtual address space. +.Xr rtld 1 +loads the shared libraries when the program is executed. +.Pp +.Sq X +represents the library version number of the library. +In the example above, a binary linked with +.Pa libc.so.8 +would not be usable on a system where only +.Pa libc.so.7 +is available. +.Pp +The advantages of dynamic libraries are that multiple instances of the same +library can share address space, and the physical size of the binary is +smaller. +A namespace per shared library is available via hidden visibility, +allowing multiple compilation units in a library to share things without +making them available to other libraries. +It is possible to load libraries dynamically via +.Xr dlopen 3 . +The disadvantage is the added complexity that comes with loading the +libraries dynamically, and the extra time taken to load the libraries. +Of course, if the libraries are not available, the binary will be unable +to execute. +Calls across shared libraries are also slightly slower and cannot be +inlined, not even with link time optimization. +The C compiler, +.Xr cc 1 , +can be instructed to link dynamically by specifying the +.Fl shared +flag. +.Pp +Shared libraries, as well as static libraries on architectures which produce +position-independent executables +.Pq PIEs +by default, contain position-independent code +.Pq PIC . +Normally, compilers produce relocatable code. +Relocatable code needs to be modified at run-time, depending on where in +memory it is to be run. +The C compiler, +.Xr cc 1 , +can be instructed to generate PIC code by specifying the +.Fl fPIC +flag. +.Pp +Static libraries are generated using the +.Xr ar 1 +utility. +The libraries contain an index to the contents of the library, +stored within the library itself. +The index lists each symbol defined by a member of a library that is a +relocatable object file. +This speeds up linking to the library, and allows routines in the library +to call each other regardless of their placement within the library. .Sh SEE ALSO +.Xr ar 1 , .Xr cc 1 , .Xr ld 1 , .Xr nm 1 , .Xr intro 2 , .Xr math 3 , -.Xr stdio 3 +.Xr stdio 3 , +.Xr make.conf 5 , +.Xr src.conf 5 .Sh HISTORY An .Nm From nobody Fri Dec 8 22:02:59 2023 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 4Sn4rg28KXz53Txs; Fri, 8 Dec 2023 22:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rg1YbTz4Scr; Fri, 8 Dec 2023 22:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=06ciFf+OdlFZvbKLLSTaHVZSk4F0cu0CimLy0/tRnU0=; b=k5nLNlKLz4LMcCSVso/ZBlwUZ053M6V5WaWZV6OD6uj+68fSWPdQVL9XFMA8+ft365vXO8 pdNZu8kaW6iJ0qebOcOQ7YWr+2hI0VImlWt/jIKWLr3A6KMFr29yQVpcuN3rKTkI7RsLza D/pkCQ8TTfpGgRSjPy+IIF7pTaJYShntYTtwHUJ+kB5lBktvxMzgcmbuI0hZwqluwqF6DG T6laYMKNJLm2vrbfbpaMokYjTfqv13T2PUbj9sCuqa8urePCUkfz2+bS4rwe1ZZi9Jb8ej 8oeFJgk+YW2hVV5kWeieMmQ2sAtDtzFFtcaQBF0oXznhKRdfZtA7Rgx1qyEvIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072979; a=rsa-sha256; cv=none; b=nAGNk/eGCamPnczvEKf+koBAeqRQdZRscdYfe+fhSssBAzk71WM8lJ0wSV3KFjqpHuTtav wgX5Cm2nJIdsLaFQdfQrO4NGEIsO0MZwl6dvzTlB+JxlcqdRG7rev7Z+y1KuM0VpUkE1nw zQ8FHoKmJE2HoSmpgiNhfbbQkNLU4Pn/Q3uT9s/sQ4DueezljKbGl1EwrwhblwL+uASxQj BWRLgNKNs+1U5oltwXJTvFLz2MWwqtGIKpqcpgF5enWdKph03ipnEyt5GuXNYNeXIncxZ1 RWpyE5MPLZsfe/dIcE7yaZh7NnW9cgEaHt95NX8aqXftryu+54+ZsLwUOVXocg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=06ciFf+OdlFZvbKLLSTaHVZSk4F0cu0CimLy0/tRnU0=; b=d5vFVVxsesTJ10nb7SZrh3fKw7Xjz/pOXBa8R/R8Pm7KQrtIQGfxY7y6hZ2V5nzczDohjN BbKvQbyQWpdGPjJmRMkp6bIxDwD6yMLtqbCR74TlIvNmLLrkWRHaXXHefHW9mg8JpgboCI VzCJSI+Zp/cdfCYEExelHefGsGoArcAY22RcKNziHOT+c7AkEXrZyvQbI/3v61aVN23aRW n5T4eRbrjRXTZIhHTak2b8cGFSbxxzRc7hT1405UThE1jY+N7j/EDdPbb4zTy/uLanxotp YxkXBjbbuh/vc1Rg9xTiGK2ixdh3XYZ4rCkR7mPS0m5NEZcbVa8w4YOsIY/g4Q== 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 4Sn4rg0c8CzdT1; Fri, 8 Dec 2023 22:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M2xeh020584; Fri, 8 Dec 2023 22:02:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M2xKS020581; Fri, 8 Dec 2023 22:02:59 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:02:59 GMT Message-Id: <202312082202.3B8M2xKS020581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: c154cad532e4 - stable/14 - hptmv: remove vestigial EVENTHANDLER_DEREGISTER() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c154cad532e4b786925d4fdda2cd57da7e6c12eb Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c154cad532e4b786925d4fdda2cd57da7e6c12eb commit c154cad532e4b786925d4fdda2cd57da7e6c12eb Author: Mitchell Horne AuthorDate: 2023-11-23 15:22:33 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 hptmv: remove vestigial EVENTHANDLER_DEREGISTER() The registration was removed in favor of DEVICE_SHUTDOWN(). Drop the unused eventhandler tag from the IAL_ADAPTER_T structure. Reviewed by: jhb Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: cd3ef66680a8 ("Use DEVICE_SHUTDOWN(9) mechanism...") Differential Revision: https://reviews.freebsd.org/D42334 (cherry picked from commit a4b19cf5c76ac66d02a3ef8a549115ba865d630c) --- sys/dev/hptmv/entry.c | 1 - sys/dev/hptmv/osbsd.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c index fd3b808e1e73..0157a27c3728 100644 --- a/sys/dev/hptmv/entry.c +++ b/sys/dev/hptmv/entry.c @@ -2155,7 +2155,6 @@ hpt_shutdown(device_t dev) pAdapter = device_get_softc(dev); - EVENTHANDLER_DEREGISTER(shutdown_final, pAdapter->eh); mtx_lock(&pAdapter->lock); FlushAdapter(pAdapter); mtx_unlock(&pAdapter->lock); diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h index a9240af16c89..0e4d94fb4756 100644 --- a/sys/dev/hptmv/osbsd.h +++ b/sys/dev/hptmv/osbsd.h @@ -190,8 +190,6 @@ typedef struct IALAdapter UCHAR status; UCHAR ver_601; UCHAR beeping; - - eventhandler_tag eh; } IAL_ADAPTER_T; From nobody Fri Dec 8 22:03:00 2023 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 4Sn4rh4W7Rz53TnV; Fri, 8 Dec 2023 22:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rh2lzrz4SKB; Fri, 8 Dec 2023 22:03:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xEzxhehjg8y+UCkRz+NWk9Z4Cqbx0XjFFILgZUno6JI=; b=LlOSLSg6cyWZ0o6T55u1vfc0RE74+TZdozoujqO4bCsenyOM5cvULN7ExcXhzXUbhtBYcM yXY5hI9FgH/v8qMfBPLmX2EdE8vwvjOv7H+biFL0Ris5oZYA8bIxgXsvzYwY2OmfOXH8/7 fDjvakBE8a3qToZK4oHtM6B+jgpIg+/nMoctwAhQUNSd7nvm55GG1zuTjdHlHrbfQUJI06 zCx1sIIehxJFYbGnm636XiJrR0Fz8TmiMeim/VhoC58G+UBzwUCjwPfpWBcmcEdLJjY5LP WPi4KaTlh8VFPlYLUG/B7HhHNzhRCkrHmg4TjAb/+JeoE29aWzWxnoZHfhF1Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072980; a=rsa-sha256; cv=none; b=cxgPEISEoY9eyQeCRUc/pUwHpnCpkFeQvAmnO5Obsw+d0zg6/MSV61nXdpiR4PkPCvGRaN uhXM8cR8/5wDvIIUERWZILuWCAHa/Z/YSieJgJo23NJdndAmSHDLaryOG8nDuwrTG4aGuX RX5SiRg8O9Fb51oPTLi1sjfXoEtnbFjhuIdej4qEYNZojocB13Cum4MWPR4JBuP77i+8Tp KpYHRoS9Ew+hta9DA0ONZQbxtk171gDrbVPktf4v/gEzD06crXJqiRdEMCYLO8sOBhoKjJ kDMaBzyXGTkLszIkeoDuy8rcJhxHs8SFqRQk2qiRFeaOCTzbzTUem/GcCA3Fqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xEzxhehjg8y+UCkRz+NWk9Z4Cqbx0XjFFILgZUno6JI=; b=iP02LooKgGv9Ecs6pLLyPR1tF5HsQlYxcib1yLJZAFR2XP4c8am7uzk1ulhfIJRsXVEYNL L6MV359rBRBocGfuy5Wtzbx9SUQ84hWgUPODieOvmDymEueLzbuEKhDB2ZdpKOsgViZ5Qu iEv1TesUyuUdHS9KF1G+o+xbAbIvy1Sn+PZUXds2bbJLoJSWS+BMuD8DbsDr8Hiz1WWEUV w3L2bKBzNO2+xaiWrE6A6dhHKQtWtNHVIL0t9OShxpD/TNUB3m36fNz7Ncdq/yppXb9e8C JtUQSWLxxmPjsvdXrEF6Li1NmbonEiio3RUs09wS1VJIDPFBJBHsPGbZwRcwsQ== 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 4Sn4rh1pvtzdb6; Fri, 8 Dec 2023 22:03:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M30nh020628; Fri, 8 Dec 2023 22:03:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M30tO020625; Fri, 8 Dec 2023 22:03:00 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:00 GMT Message-Id: <202312082203.3B8M30tO020625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9af585120d30 - stable/14 - pst-raid.c: sort #includes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9af585120d305ed51888550ca98872c62d948332 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9af585120d305ed51888550ca98872c62d948332 commit 9af585120d305ed51888550ca98872c62d948332 Author: Mitchell Horne AuthorDate: 2023-11-23 15:23:42 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 pst-raid.c: sort #includes Reviewed by: imp, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42336 (cherry picked from commit 66d9c2f38d2db9e50c0dbf56dca4a2f3e6c3107c) --- sys/dev/pst/pst-raid.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c index 076925b27a6b..4e9c4fb724bc 100644 --- a/sys/dev/pst/pst-raid.c +++ b/sys/dev/pst/pst-raid.c @@ -28,30 +28,32 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include -#include #include -#include #include +#include #include #include -#include +#include #include +#include #include +#include + #include #include + #include #include #include -#include + #include #include -#include - #include "dev/pst/pst-iop.h" +#include + struct pst_softc { struct iop_softc *iop; struct i2o_lct_entry *lct; From nobody Fri Dec 8 22:03:01 2023 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 4Sn4rj4m21z53Tlc; Fri, 8 Dec 2023 22:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rj3LK0z4SmV; Fri, 8 Dec 2023 22:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o6JQNIZpxJuhq2vVRbIBn7p1gg0ZLhVeouSU8/V28vs=; b=VJUXo+OonUhRI3K1BS9AaXJarlGSBjs3qUHN32gRYjAgyHgO4OzxLtRUiAWyx1SyrMTfID 75lAJ2Pt+66PxzVs9GmPTYPCQNdbIEM9s1GMWRAI6YatkrDvpDFcX8bhGyAxMWEJMnLSZa 7AkCGMe+SganVC/bTLo8MhsGrtlU7Om0oIbyRNPQLSZHZ5MsnqXG1d1IL65jFz54qS3Wta EcF17wLhhbUJfUQ7S2dRRtM9VtoGoOBWHYddXgSiL37VvDVJDTPB7fMgyIXJV7408yG3+S KbuFZ+4/C7wTEMWFxxgWq6bgpCOP07+U6sdhVPm1UXkL0pOgIlEgHuxy8TeNrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072981; a=rsa-sha256; cv=none; b=XxVn1AH1SUU4OGKuUrBBEFQCys3Ne7BxG2d3TatPjr3Ojn6PVXEwNNsej/gQe/8HL2wqgm 4VtAOvjmKpZkQa69gBoaHFnThXSJOjkOUlQN/FKspe4G6YfJsZx5AnXoVzrcN4o+Sjy8/m IwRjdc8FJBCazV+WCfGXk1dcjBSnwelv79k0AUm0HnVvvmRz1613K//7tFhsoGY1sGRFAx E93l+9pVMHzGy+xYYV0bkmiyWunNCz4nz5lmo7mSwdp0FgJ82vx5FUsTJvavUajk6nBqh0 NV03CCD+w3F3lGAoxxJrmprOREJi9WH9X1D4Oc0ESA1Grbe06hNIgqphY6QmJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o6JQNIZpxJuhq2vVRbIBn7p1gg0ZLhVeouSU8/V28vs=; b=gTPye6YWbNJ0ufTK5csS7x6CJEEJqWchq+ZTb0bkzAQeB+HPWuqEvUuc+FfMVLZ9icb8pW AonhWuw0v2FHYEwFOHFeoaJ88shCIynCTFIJBwRJblG9dc0EeKz6i4U/uTes/OjTgyH6f4 7+y/XZkMVIib/qlgMPIqUs4wPSQuHa+yYT8dEDLIqPN//bDl/JJDn9aLDJ+FsoSfTlOm7J MNSE/jLi7cfAN+2mXnB1jAjDtxmwk5/kdP1yDeDNWbt5HQTjiUqauT/SROqIYUsbonEH5j o4Gxr3V8rYSmmzTSUIY1dqS3CRygHkgf1ylrZgkzpHKhKPJWIu5fWPTzPq0Kwg== 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 4Sn4rj2R3Lzdc9; Fri, 8 Dec 2023 22:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M31Pq020676; Fri, 8 Dec 2023 22:03:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M31LC020672; Fri, 8 Dec 2023 22:03:01 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:01 GMT Message-Id: <202312082203.3B8M31LC020672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: d997144b5a98 - stable/14 - geom: sort includes for some files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: d997144b5a98f7e63ef29cd3038bbe71e093b9c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d997144b5a98f7e63ef29cd3038bbe71e093b9c4 commit d997144b5a98f7e63ef29cd3038bbe71e093b9c4 Author: Mitchell Horne AuthorDate: 2023-11-23 15:23:07 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 geom: sort includes for some files This is not exhaustive, just done ahead of some upcoming changes to these files. Don't include sys/cdefs.h explicitly. No functional change intended. Reviewed by: imp, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42335 (cherry picked from commit f3dc172763aee039c917fdba03f1e27095f5a7a9) --- sys/geom/journal/g_journal.c | 19 ++++++++++--------- sys/geom/mountver/g_mountver.c | 12 ++++++------ sys/geom/raid/g_raid.c | 17 +++++++++-------- sys/geom/raid3/g_raid3.c | 17 +++++++++-------- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index cfc42c120992..147e83cc7e21 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -26,34 +26,35 @@ * SUCH DAMAGE. */ -#include #include #include +#include +#include #include -#include +#include #include #include -#include -#include -#include +#include #include #include -#include +#include #include -#include +#include #include +#include #include #include -#include + #ifdef GJ_MEMDEBUG #include #include #endif + #include #include + #include #include - #include FEATURE(geom_journal, "GEOM journaling support"); diff --git a/sys/geom/mountver/g_mountver.c b/sys/geom/mountver/g_mountver.c index 00ff9dd9b7cb..de3a298735d4 100644 --- a/sys/geom/mountver/g_mountver.c +++ b/sys/geom/mountver/g_mountver.c @@ -27,20 +27,20 @@ * SUCH DAMAGE. */ -#include #include #include +#include +#include +#include #include -#include #include +#include +#include #include -#include -#include #include #include #include -#include -#include + #include #include #include diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c index 753c9fdbe867..437cef416ca3 100644 --- a/sys/geom/raid/g_raid.c +++ b/sys/geom/raid/g_raid.c @@ -26,25 +26,26 @@ * SUCH DAMAGE. */ -#include #include #include +#include +#include #include -#include +#include #include #include +#include +#include #include -#include +#include #include +#include #include -#include -#include + #include + #include #include -#include -#include -#include #include #include "g_raid_md_if.h" #include "g_raid_tr_if.h" diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 0d4ecb704aa5..8f12f14cf09b 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -26,25 +26,26 @@ * SUCH DAMAGE. */ -#include #include #include +#include +#include #include -#include +#include #include #include +#include +#include #include -#include +#include #include +#include #include -#include -#include + #include + #include #include -#include -#include -#include #include FEATURE(geom_raid3, "GEOM RAID-3 functionality"); From nobody Fri Dec 8 22:03:02 2023 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 4Sn4rk4z0cz53V0c; Fri, 8 Dec 2023 22:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rk4CQhz4SMn; Fri, 8 Dec 2023 22:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzM3pp6kcl9B+5tGT7xUnjmP2IV3BMVsJWDUQDCzmZg=; b=Q4poS+0xGGtiskQY113d4z5lwzpjXFHmruB3zsRlwzt4/D7uHNY4bFY0rrnyuBzgYtA2XP zmP/Wh5NYjqFNNqB2o/vCOV2P5S7ZQRX8ktulWlxl+X19Cr4YkppIg7mXMpH9wuoyD96hs PTVsWnVN9BWeNXH3vKIAdkT4MWboSIsDB1KnMT28/S7VC0gDrHWhooErIOMyQZw0vzNjKL o8cWuUse/75/Te6kJD9FHPq4tujify+15moglhU6YtJX60Job4D9COJYp6hbHE5S2acMOc vhcR0BSiRqTL6NsIwhBqXJm54WbmP0wFc9R8sGoJof2Gpe453Eppwv99D5O/mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072982; a=rsa-sha256; cv=none; b=BXRuPcnFc0OzTaSzZ5mdHV/bN4/l8zEd7NNwwhmpl4btkqIAgtYhwof8XPXCaTZZC6vPGg P6LZd06XrfetVfCfaWpC6Nf+d90HkIvm04xGwjUHcROxuDJ0wio1xZ05jRXHNQzOyIcLKW v0vwU2norjWotPwHa67S8n4QsGa2groQ6Rn+R/GUDOFVhHDl3jAH1ZdyGMiA17bAJ7jTO+ 0JPJAN12ntkAVRS26TYhKnA1Nx4Z8Sn/OzzH6nPIGhUlNQlp96j5zUY1Qx1WDKoys+PuFK Adt+B0m9DYIMPWkaUiCShHqqj2QTfX5yx/qGhpVTLyYGi+tYfKWUY0nM/rfW2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzM3pp6kcl9B+5tGT7xUnjmP2IV3BMVsJWDUQDCzmZg=; b=uFILSUeqmL9gdslbt7MoB7QhslXW7TfPxErz08xIZU5Q2mWJK93LtE0PGbC/VxbwFX3Ipb xOPddatMf+G+jKnSfqBXSTbnoCkV9DHtVpCYLu/wxzXu/Vz7ov8l5JGweXbCa9syPgZH2/ PbH/Yd8iRGmSRDUihEr8VNbO2ZEQsdaXuhDxKwjzvyakO3CpWSLvDZTbIQr6vwcnicaIWZ Ao7aBf+KQnSsSZVXsJce/nsdY3pAS+4dBKud78C5zUcHL4fjM5T49RlbvuAnLo6C1zMJg6 Z3QhXLnHSmcp1IqOBxhPRaVTy7p0LNsuQ7T8LUigC1ENOGFVwd66ZKmUlmCzMw== 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 4Sn4rk3F63zdrr; Fri, 8 Dec 2023 22:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M32eA020733; Fri, 8 Dec 2023 22:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M327u020730; Fri, 8 Dec 2023 22:03:02 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:02 GMT Message-Id: <202312082203.3B8M327u020730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 951d60ee3ada - stable/14 - shutdown: audit shutdown_post_sync event callbacks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 951d60ee3ada170155b98e919d45e872797d88fa Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=951d60ee3ada170155b98e919d45e872797d88fa commit 951d60ee3ada170155b98e919d45e872797d88fa Author: Mitchell Horne AuthorDate: 2023-11-23 15:58:27 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 shutdown: audit shutdown_post_sync event callbacks Ensure they are all panic/debugger safe. Most handlers for this event are for disk drivers/geom modules. There are a mix of checks being used here (or not), so let's standardize on checking the presence of the RB_NOSYNC flag. This flag is set whenever: 1. The kernel has panicked and kern.sync_on_panic=0* 2. We reboot from within the kernel debugger (the "reset" command) 3. Userspace requested it, e.g. by 'reboot -n' Name the functions consistently. *This sysctl is tuned to zero by default, but its existence means that these handlers can be executed after a panic, at the user's discretion. IMO this use-case is implicitly understood to be risky, and we'd be better off eliminating it altogether. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42337 (cherry picked from commit 4eb861d362d6a9493df7f77eab8e28f9c826702a) --- sys/dev/iscsi/iscsi.c | 8 +++++--- sys/geom/journal/g_journal.c | 8 +++++--- sys/geom/mirror/g_mirror.c | 3 ++- sys/geom/raid/g_raid.c | 4 ++++ sys/geom/raid3/g_raid3.c | 4 ++++ 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c index ecf4fe21a165..311b339caf7a 100644 --- a/sys/dev/iscsi/iscsi.c +++ b/sys/dev/iscsi/iscsi.c @@ -44,11 +44,13 @@ #include #include #include +#include #include #include #include #include #include + #include #include @@ -2711,10 +2713,10 @@ iscsi_shutdown_pre(struct iscsi_softc *sc) } static void -iscsi_shutdown_post(struct iscsi_softc *sc) +iscsi_shutdown_post_sync(struct iscsi_softc *sc, int howto) { - if (!KERNEL_PANICKED()) { + if ((howto & RB_NOSYNC) == 0) { ISCSI_DEBUG("removing all sessions due to shutdown"); iscsi_terminate_sessions(sc); } @@ -2751,7 +2753,7 @@ iscsi_load(void) * cam_periph_runccb(). */ sc->sc_shutdown_post_eh = EVENTHANDLER_REGISTER(shutdown_post_sync, - iscsi_shutdown_post, sc, SHUTDOWN_PRI_DEFAULT - 1); + iscsi_shutdown_post_sync, sc, SHUTDOWN_PRI_DEFAULT - 1); return (0); } diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index 147e83cc7e21..11a75e541fda 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -2655,13 +2656,14 @@ static eventhandler_tag g_journal_event_shutdown = NULL; static eventhandler_tag g_journal_event_lowmem = NULL; static void -g_journal_shutdown(void *arg, int howto __unused) +g_journal_shutdown_post_sync(void *arg, int howto) { struct g_class *mp; struct g_geom *gp, *gp2; - if (KERNEL_PANICKED()) + if ((howto & RB_NOSYNC) != 0) return; + mp = arg; g_topology_lock(); LIST_FOREACH_SAFE(gp, &mp->geom, geom, gp2) { @@ -2738,7 +2740,7 @@ g_journal_init(struct g_class *mp) (g_journal_cache_limit / 100) * g_journal_cache_switch; } g_journal_event_shutdown = EVENTHANDLER_REGISTER(shutdown_post_sync, - g_journal_shutdown, mp, EVENTHANDLER_PRI_FIRST); + g_journal_shutdown_post_sync, mp, EVENTHANDLER_PRI_FIRST); if (g_journal_event_shutdown == NULL) GJ_DEBUG(0, "Warning! Cannot register shutdown event."); g_journal_event_lowmem = EVENTHANDLER_REGISTER(vm_lowmem, diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c index b2bcea2f0dbb..c6f95f28ba89 100644 --- a/sys/geom/mirror/g_mirror.c +++ b/sys/geom/mirror/g_mirror.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -3546,7 +3547,7 @@ g_mirror_shutdown_post_sync(void *arg, int howto) struct g_mirror_softc *sc; int error; - if (KERNEL_PANICKED()) + if ((howto & RB_NOSYNC) != 0) return; mp = arg; diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c index 437cef416ca3..6938491d696c 100644 --- a/sys/geom/raid/g_raid.c +++ b/sys/geom/raid/g_raid.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -2457,6 +2458,9 @@ g_raid_shutdown_post_sync(void *arg, int howto) struct g_raid_softc *sc; struct g_raid_volume *vol; + if ((howto & RB_NOSYNC) != 0) + return; + mp = arg; g_topology_lock(); g_raid_shutdown = 1; diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 8f12f14cf09b..721610cefbec 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -3573,6 +3574,9 @@ g_raid3_shutdown_post_sync(void *arg, int howto) struct g_raid3_softc *sc; int error; + if ((howto & RB_NOSYNC) != 0) + return; + mp = arg; g_topology_lock(); g_raid3_shutdown = 1; From nobody Fri Dec 8 22:03:03 2023 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 4Sn4rl68dXz53TkG; Fri, 8 Dec 2023 22:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rl5Rrhz4Svx; Fri, 8 Dec 2023 22:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X7eoRf3mqbGfApxMskoVYItjgbqoTHX/HWiPNwKz95E=; b=ohV4F1rMAFxMviYBuXKJTEemWozgrQEZEP1+rnrCPCWWq8ZgKhQf5l3z5un15ERO3ryctS brA0DZmU6FR6c7iNdS80JDcMSnpVejc+igSMKqvxoaVnTykJmE6Afv9IE/NCvDjrkv85oY QcO78nx0qCboD7c4NSM6kYrzRi1zI4t/jTRQ/p2l0Z5EKqA0sK/Qe4efJRQLABgq/CfoZx EK4k9jVlvCuCVwUYLAbVDWxSW3LWh4izQM5IcAD7qgKQYKUIMnUjjY+FibSt9diNbtR4ay Y5duQIms3dZfY0ba0vo38EWz1KDs0EKwYctq6fPwGx8KayrzFGUjM6hHghyYPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072983; a=rsa-sha256; cv=none; b=Usl0Pyr2lf1SdiF4d4RHnLye7zUpf5fE4P9IUHPqg9xpbsyAAXbav4p1OrLdtva9aSmeF4 o5PjPHD8nyGNP6F+CrRyrmoEHal8UBfKMeq0rmeJsddFymrHgv9PciV6Tm74nxwPNfkkWO 4VTDPk82bvr90Ke5JlhfsVytl3Egagc+SoHyQRw44BYGZFNB0fRIspScfYbpBcvmNQxOSt mJ1OC6EwX7ykB+Ondy2sAF+73ZA8iKVAooNMEQEzIpXpKeT60C9ISmIcPLgqZvnSVbmsU7 mjQOXaEkuufMc6YGY5aZJvHQe1R+j/5oZaEKsSBkTyfniPGMINgIAxa6469Mow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X7eoRf3mqbGfApxMskoVYItjgbqoTHX/HWiPNwKz95E=; b=mVKkyvCF54OG7YoxhofmVsm/YuGE4YDwMkskXnxRo+ljAridWRX63SZR/WWVO9xF2VMjVp uBjnwcxZWpRvLJdRLa0zNR0FcppU46M1ybEDRx+5l1mBfRwNG/qE/QK23dKBKKP9Z/+enq 26+x9y8ZxDRc4uzJaaRg9PUdq2UJGaiZPHIOBkCOYvDcaWTogbVeHmBiIcfoMPwvpccQzu txcIpWuVdfy8uFCfOOk4ypELGftwVTKgw6mCfyTs0RexVT2ChpLYp/3Iqv9UvBSQrLGlkf vOR7rmmiqoa6Fys+ZLsizxu8Jcp4/0a4RduQt7Hqm0NdybB4dsgwjn/eJKl46Q== 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 4Sn4rl4VYqzdp1; Fri, 8 Dec 2023 22:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M333e020786; Fri, 8 Dec 2023 22:03:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M33hf020783; Fri, 8 Dec 2023 22:03:03 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:03 GMT Message-Id: <202312082203.3B8M33hf020783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9732eb8eae72 - stable/14 - ctl_ha: don't shutdown threads if scheduler is stopped List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9732eb8eae7294a47cd64af5f11221792a984f71 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9732eb8eae7294a47cd64af5f11221792a984f71 commit 9732eb8eae7294a47cd64af5f11221792a984f71 Author: Mitchell Horne AuthorDate: 2023-11-23 15:25:54 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 ctl_ha: don't shutdown threads if scheduler is stopped In this case, just return. Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42341 (cherry picked from commit 9d61fd08499609a2c95d1c66f97587932b446f06) --- sys/cam/ctl/ctl_ha.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/cam/ctl/ctl_ha.c b/sys/cam/ctl/ctl_ha.c index 32c83025bb1b..1951f74c45f3 100644 --- a/sys/cam/ctl/ctl_ha.c +++ b/sys/cam/ctl/ctl_ha.c @@ -910,13 +910,16 @@ ctl_ha_msg_shutdown(struct ctl_softc *ctl_softc) { struct ha_softc *softc = &ha_softc; + if (SCHEDULER_STOPPED()) + return; + /* Disconnect and shutdown threads. */ mtx_lock(&softc->ha_lock); if (softc->ha_shutdown < 2) { softc->ha_shutdown = 1; softc->ha_wakeup = 1; wakeup(&softc->ha_wakeup); - while (softc->ha_shutdown < 2 && !SCHEDULER_STOPPED()) { + while (softc->ha_shutdown < 2) { msleep(&softc->ha_wakeup, &softc->ha_lock, 0, "shutdown", hz); } From nobody Fri Dec 8 22:03:04 2023 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 4Sn4rm6fx7z53V0h; Fri, 8 Dec 2023 22:03:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rm63sLz4St1; Fri, 8 Dec 2023 22:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qRhOPP+KNOHiD5lRmv+ZdrSnF21x5jHizfeAz8YoF5s=; b=SrwypSZJsIrh2CzxZqxX2g3Elbmj8s+wLxIMCvm6aTI5cBnVQfQKbplRX0AWnx9aQ0e/J9 uOvL7/rvRCuOGoPoaB5Ai0tWDjmHVRv9KFsr5so5HYoB/gYC3dfxZbDF9qgdLT2+L95nhJ xNQQuzco4tTOvrGMFsZvqIkcR9QAj/NqbitxEhYUeQeKtAI/jZlCchNCU3M88/hAr2qtTy v3jLvLrc+bGXsE7ATobDnvOLBRCYf0tmOIkA4shFtwPVQMjwtMDCSYRAi9HTUQdmhb4bS+ vQ3/1taXoaVU7zmxP85Hpyq3sFIekKllVKx+yCmvhR95QnB4Mz2H97PdxXLAEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072984; a=rsa-sha256; cv=none; b=mtWcvE9gfh05ucI03ftO6gEsrz63JKTSYnyuAgULFrT3yvW2qM62aO1HJjhQLUCl8cjOIP IIXPWPXSNnSffrwjvk8MiAMWYFpSbvHTi5UJYd5S8N16d8tUxb0TTU+bdugV4aDXng6pcI cV+wT4FIzhxH69zDGtvar4CpeIPO2CWRuXr9Vh8oHN/7UlVmuDOOOp6p6pRG7SqlG8tb58 jzBSLsk1R0IVgT8HGMyhvCsrrkgAoL6IKXzJlgtNOKqt82+YTsLvHOWEV01bGa9LGbWBLu 3lGsEgcUmeVBbyqZlyADTyiWtnFYOlEL+rG9mWAcRqWmuf/WGdihjbzOfXrSGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qRhOPP+KNOHiD5lRmv+ZdrSnF21x5jHizfeAz8YoF5s=; b=Wb1vSFBe1QaJU4Sm/Egxf33bNh6tIHLmBPomFDcNZsUvNj8MamUHt/qKbl2T4bHY+Q3KTa XqOxOgOQ8p8GLko0HY9uZET7eU9PkXbOmWnzPolVo9yA9fOz7DQJF8PlXPkQUpY6zYkbnV /v0RHBkGVTbuA3FlIq3VzWMiHlRIQfyL/V/a2Fxa4+UKifYCiTawTwp9mC5U9Z143MMwPs xgD+oKwuTgBcQasTfW/qloqSs+JF82382ZqmAMPv+D/MyZKeWHY82CaWIqhLGrnctWJiOL 50soFNqndn5080Dtj4AENt21eP6CpYgrDUV4D+9FIGdrbKM9gy9iJZ9d270v2g== 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 4Sn4rm57rtzdrs; Fri, 8 Dec 2023 22:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M34xZ020835; Fri, 8 Dec 2023 22:03:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M34oT020832; Fri, 8 Dec 2023 22:03:04 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:04 GMT Message-Id: <202312082203.3B8M34oT020832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: c13f564f9176 - stable/14 - xen: improve shutdown hook List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c13f564f9176c3d946e61519ddbfa0c1e23114ab Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c13f564f9176c3d946e61519ddbfa0c1e23114ab commit c13f564f9176c3d946e61519ddbfa0c1e23114ab Author: Mitchell Horne AuthorDate: 2023-11-23 15:27:20 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 xen: improve shutdown hook Make better use of the shutdown flags. In particular this now handles standard reboot where RB_POWERCYCLE is not set, and indicates a crash when the system has panicked. While here, give the function a prefix. Reviewed by: royger, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42343 (cherry picked from commit 9e0b0f5de67fd46bddf0e12ef7b71d76a7ec1667) --- sys/dev/xen/control/control.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index 9ea0222809a0..37b4bff709c7 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -345,12 +345,18 @@ xctrl_crash(void) } static void -shutdown_final(void *arg, int howto) +xctrl_shutdown_final(void *arg, int howto) { - /* Inform the hypervisor that shutdown is complete. */ - if (howto & RB_POWEROFF) + /* + * Inform the hypervisor that shutdown is complete, and specify the + * nature of the shutdown. RB_HALT is not handled by this function. + */ + if (KERNEL_PANICKED()) + HYPERVISOR_shutdown(SHUTDOWN_crash); + else if ((howto & RB_POWEROFF) != 0) HYPERVISOR_shutdown(SHUTDOWN_poweroff); - else if (howto & RB_POWERCYCLE) + else if ((howto & RB_HALT) == 0) + /* RB_POWERCYCLE or regular reset. */ HYPERVISOR_shutdown(SHUTDOWN_reboot); } @@ -446,7 +452,7 @@ xctrl_attach(device_t dev) xctrl->xctrl_watch.max_pending = 1; xs_register_watch(&xctrl->xctrl_watch); - EVENTHANDLER_REGISTER(shutdown_final, shutdown_final, NULL, + EVENTHANDLER_REGISTER(shutdown_final, xctrl_shutdown_final, NULL, SHUTDOWN_PRI_LAST); return (0); From nobody Fri Dec 8 22:03:05 2023 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 4Sn4rp3YmSz53TZb; Fri, 8 Dec 2023 22:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rn6qZ5z4T57; Fri, 8 Dec 2023 22:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y2aBLsAFkLGDtJY5Y5DnIUrba94hG9QDhkHSQQvXHkQ=; b=bQNU5r63xoNwjWqFqThExNND/asOLhE09hz3MgTAlhupwqC1PqyFiVejuvIj7L2lDM/CzK f6hItRnlKL/oC80YPURCGyufCpf8q0GXA4vhB0dXIuAlO95M7YVuSkAHEJoQxtSQ+TOTCC V9Y7dWNqND+Fy7OtLjhVziWKzO7V2ot/HTdN8CGOUGWyuqKzxEbHtomTcp8mAY2Nl3INDV 1dMbl9n1xymSeMeImttxNeYzkgiiWmGaOHfv6VuCSu5sHxk0UcqUzAxPCTW5r/+NvlM6NN EHUywmxHMUHfxBfBhxru6vZctCURh5s1Zd1vAr1j8zr+Ym8ADSwgnyvYA0Uzhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072986; a=rsa-sha256; cv=none; b=wcsv12K/3U323hqdlk6BnJV9BZHQED9HIgn5T6waHup/TrrVgXq5LBxnSReU5kG9E96G8u KW6VyDG4eFrLSvRDRY65dPKrtUuK3JbDCjQdE89TLoyP2ehQLu1fiZS/IB0zm9mdskW0+n t3Smq4ZpeS7t2Zl4zB64Y/tf02jq62QBdF3Ltu19gxXqNKcFMvrA2K6NuAX9l+bFY9NCHl CqQ7mNWAwIAhLi2y7DKPO4+jwsUVhnkm2FPXTMBGIq/+i+UxLWVU6aEAIdFdNSQ6ctlbOK Wj8m3kQ8/8/o29lKJaPsS4LxiJj14kP2P/VH9FRsyTquGyffreV7/SkaWEFWbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y2aBLsAFkLGDtJY5Y5DnIUrba94hG9QDhkHSQQvXHkQ=; b=M0J3yWY/tCTPcnBR3J6syebFO9nQIX+K4bLUKoszUpn9CNq8hiSAU7xrzP6pSQje0Mvy4f VBvnnmK3lcGIhTD9fZBRoArNRzAX5LGz5/jPibLuaolBMQ6rphzo1/m5pxv6wbUgOjEsIf ik+2MfJD3dK45GPDobB+TVXJJaLsF0gEUffsjfcYW6yBFEouGQSvhaXjEdELVuA44N8k71 gBtm6IT2+x80UOKj4JqR3AWOGahDSqVhzeWzvd0XDsnjlJeNM7GKvqvadUhSLosFh/4rFk ruK1Zk7yDL+gfef/wHK7+l4jAZDE7TaSQoEZrfYVOZoQl43bwH+8RUcOkK8Jjg== 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 4Sn4rn5sF0zdb7; Fri, 8 Dec 2023 22:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M35Ed020887; Fri, 8 Dec 2023 22:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M35d7020884; Fri, 8 Dec 2023 22:03:05 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:05 GMT Message-Id: <202312082203.3B8M35d7020884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: bbfd41d4308b - stable/14 - alq, siftr: add panic/debugger checks to shutdown hooks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: bbfd41d4308be599a374ce8fba73b2d6ec990dcc Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=bbfd41d4308be599a374ce8fba73b2d6ec990dcc commit bbfd41d4308be599a374ce8fba73b2d6ec990dcc Author: Mitchell Horne AuthorDate: 2023-11-23 15:25:30 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 alq, siftr: add panic/debugger checks to shutdown hooks Don't try to gracefully terminate the pkt_manager thread if the scheduler is not running. We should not attempt to shutdown ald if RB_NOSYNC is set, and must not if the scheduler is stopped (the function calls wakeup()). Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42340 (cherry picked from commit d79a9edb5ce162c1ba49e12e5c93b894e6a25ad2) --- sys/kern/kern_alq.c | 14 +++++++++----- sys/netinet/siftr.c | 6 +++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_alq.c b/sys/kern/kern_alq.c index 51fd66f2fe9f..1bcce92509c5 100644 --- a/sys/kern/kern_alq.c +++ b/sys/kern/kern_alq.c @@ -37,19 +37,20 @@ #include #include +#include +#include +#include #include #include #include +#include #include #include #include #include -#include -#include -#include +#include #include -#include -#include +#include #include @@ -228,6 +229,9 @@ ald_shutdown(void *arg, int howto) { struct alq *alq; + if ((howto & RB_NOSYNC) != 0 || SCHEDULER_STOPPED()) + return; + ALD_LOCK(); /* Ensure no new queues can be created. */ diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c index 58603e4aa53c..52e2b8838b0f 100644 --- a/sys/netinet/siftr.c +++ b/sys/netinet/siftr.c @@ -74,6 +74,7 @@ #include #include #include +#include #include #include #include @@ -1263,8 +1264,11 @@ siftr_sysctl_enabled_handler(SYSCTL_HANDLER_ARGS) } static void -siftr_shutdown_handler(void *arg) +siftr_shutdown_handler(void *arg, int howto) { + if ((howto & RB_NOSYNC) != 0 || SCHEDULER_STOPPED()) + return; + if (siftr_enabled == 1) { siftr_manage_ops(SIFTR_DISABLE); } From nobody Fri Dec 8 22:03:06 2023 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 4Sn4rq15cMz53V0m; Fri, 8 Dec 2023 22:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rq0WTSz4Srx; Fri, 8 Dec 2023 22:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9joOvh9nzUZzYS/minJpFtFEJvb7+pO740QSK5vhvsw=; b=vQSuRRtyrZfUHpxy8TpcZ1WnZiLk9X7X/gMnzYcqCQTN8FTYLm59ExS+hHCYQm5pODIc/U 2BAWhMy2h4OEMv5k2zu95zQWWKb63cbKzKFO41PRGraQw+ioXQ0CJg8or9I3xuY5kptjtZ 07wGpJmrNLgIyhoJyI1yoGZI1RN4VCIyN4pJZuhWbQ0UpM8DyAnWbsBP1upsb5yk2gqE29 kCliOxB0V8Nl+Z7+gnVbEIreGuCjLwF1U5698RRSJk8OIq+lOxqhWjEaPuuvOG6riL9DES jipF3HNQmjz4H7ZF785Sx0Qnd+gfq9PDSJTpnQs3sUR57tSoJu/2ZfS09pSXsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072987; a=rsa-sha256; cv=none; b=OiuTzPDD3dFG50IaalrdlGsL0oQ4Zw4EYPXp79uarQ5OD9qWfwu30n/TBK6H3TG/4e6VOf SYyAsB/PO3IT4yQ4+v5fbBO5mdv0anvt/3wjb63i2puruoI5CacX5Eht9G3c2yYDEWwoLU 1HRgGNdvvxDQMJ2grb1kd8H0z3ShzUDVEsGa4FCQjx/vZn9V8cq7ehtnzq5SwB/8OKMP7O CihiIbDwX7ZD/7CHxVX809V6MHnXPjDqmCTiJxeeJcT0R089aOeuMamgwg4/uGAKXVRNOr pWishuOPbkRzpegEX2yu4bT/3OE1wIFgSsFPzE61DaVHBStbrDGkz5lmIdXCxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9joOvh9nzUZzYS/minJpFtFEJvb7+pO740QSK5vhvsw=; b=gFTvn0r8WqbjVDHdl6qIevgn2bibHOtXXkHzCgxfdMG63qkDT6WwDdoO5UJJEbp7fDfru/ yH6ccLi2tR3CyJfII+jLaWJ1ef/5v/CP3ZmCbh4roO9Z1SlHY7QCIkNItaZd1SwKGMoou5 YRM8W1YL7qY5vOweMdk7D/a3XVXP3L7cuoi+36dht3uXaBrGrNXDj882yRW6N/k92N1gBr hqpaivIPV5d4EB8AYK24N0yAEv+dgmzeEU/3JQ0kT8hgACXo7xM7WnLx+4b7WO+5JlQJVp cSm5rwt5MB726EnwqjaQ09X0mMrKWO8cvyYuOxTb+eQqRj3sSyOsqOHx6zDhHA== 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 4Sn4rp6lFhzf2k; Fri, 8 Dec 2023 22:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M3698020932; Fri, 8 Dec 2023 22:03:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M36fv020929; Fri, 8 Dec 2023 22:03:06 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:06 GMT Message-Id: <202312082203.3B8M36fv020929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: aaebd6d069f5 - stable/14 - powerpc: better handling of shutdown flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: aaebd6d069f50d5524157fcac5253280ce3a8156 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=aaebd6d069f50d5524157fcac5253280ce3a8156 commit aaebd6d069f50d5524157fcac5253280ce3a8156 Author: Mitchell Horne AuthorDate: 2023-11-23 15:25:05 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 powerpc: better handling of shutdown flags RB_HALT does not mean poweroff, RB_POWEROFF does. Reviewed by: jhibbits MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42339 (cherry picked from commit 41e26e8288f1743c8584e5f9c461d36dce1cccc6) --- sys/powerpc/powermac/cuda.c | 8 +++++++- sys/powerpc/powermac/pmu.c | 6 ++++-- sys/powerpc/powermac/smu.c | 6 ++++-- sys/powerpc/powernv/opal_dev.c | 6 ++++-- sys/powerpc/pseries/rtas_dev.c | 4 ++-- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/sys/powerpc/powermac/cuda.c b/sys/powerpc/powermac/cuda.c index 974ad585b543..97f60f269559 100644 --- a/sys/powerpc/powermac/cuda.c +++ b/sys/powerpc/powermac/cuda.c @@ -748,7 +748,13 @@ cuda_shutdown(void *xsc, int howto) struct cuda_softc *sc = xsc; uint8_t cmd[] = {CUDA_PSEUDO, 0}; - cmd[1] = (howto & RB_HALT) ? CMD_POWEROFF : CMD_RESET; + if ((howto & RB_POWEROFF) != 0) + cmd[1] = CMD_POWEROFF; + else if ((howto & RB_HALT) == 0) + cmd[1] = CMD_RESET; + else + return; + cuda_poll(sc->sc_dev); cuda_send(sc, 1, 2, cmd); diff --git a/sys/powerpc/powermac/pmu.c b/sys/powerpc/powermac/pmu.c index 67ef57bf6be8..f9d9d4d40c72 100644 --- a/sys/powerpc/powermac/pmu.c +++ b/sys/powerpc/powermac/pmu.c @@ -812,10 +812,12 @@ pmu_shutdown(void *xsc, int howto) struct pmu_softc *sc = xsc; uint8_t cmd[] = {'M', 'A', 'T', 'T'}; - if (howto & RB_HALT) + if ((howto & RB_POWEROFF) != 0) pmu_send(sc, PMU_POWER_OFF, 4, cmd, 0, NULL); - else + else if ((howto & RB_HALT) == 0) pmu_send(sc, PMU_RESET_CPU, 0, NULL, 0, NULL); + else + return; for (;;); } diff --git a/sys/powerpc/powermac/smu.c b/sys/powerpc/powermac/smu.c index 5aed7b87d3c2..af00599e6b54 100644 --- a/sys/powerpc/powermac/smu.c +++ b/sys/powerpc/powermac/smu.c @@ -1317,10 +1317,12 @@ smu_shutdown(void *xdev, int howto) struct smu_cmd cmd; cmd.cmd = SMU_POWER; - if (howto & RB_HALT) + if ((howto & RB_POWEROFF) != 0) strcpy(cmd.data, "SHUTDOWN"); - else + else if ((howto & RB_HALT) == 0) strcpy(cmd.data, "RESTART"); + else + return; cmd.len = strlen(cmd.data); diff --git a/sys/powerpc/powernv/opal_dev.c b/sys/powerpc/powernv/opal_dev.c index edb8f6d435ad..ab1a1fbb731c 100644 --- a/sys/powerpc/powernv/opal_dev.c +++ b/sys/powerpc/powernv/opal_dev.c @@ -344,10 +344,12 @@ static void opal_shutdown(void *arg, int howto) { - if (howto & RB_HALT) + if ((howto & RB_POWEROFF) != 0) opal_call(OPAL_CEC_POWER_DOWN, 0 /* Normal power off */); - else + else if ((howto & RB_HALT) == 0) opal_call(OPAL_CEC_REBOOT); + else + return; opal_call(OPAL_RETURN_CPU); } diff --git a/sys/powerpc/pseries/rtas_dev.c b/sys/powerpc/pseries/rtas_dev.c index ef9522f5495d..f8198ef27417 100644 --- a/sys/powerpc/pseries/rtas_dev.c +++ b/sys/powerpc/pseries/rtas_dev.c @@ -155,13 +155,13 @@ rtas_shutdown(void *arg, int howto) { cell_t token, status; - if (howto & RB_HALT) { + if ((howto & RB_POWEROFF) != 0) { token = rtas_token_lookup("power-off"); if (token == -1) return; rtas_call_method(token, 2, 1, 0, 0, &status); - } else { + } else if ((howto & RB_HALT) == 0) { token = rtas_token_lookup("system-reboot"); if (token == -1) return; From nobody Fri Dec 8 22:03:08 2023 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 4Sn4rr2CMdz53Tlr; Fri, 8 Dec 2023 22:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rr1mtnz4SxM; Fri, 8 Dec 2023 22:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJ32kNf/NgEqj/RyabKcbcKtBFXRsJg9xt7HsnzGwk4=; b=gUOneUMKnfqFVgPMYSpCArQ9tw43VtNt7QKbFDRS5SZxlxRyU4hCBfkrBGTggzaTBiR6cJ sOu7neDP+rXyns6QcDqz+iSXiqjYbxGVJvUOYpBhKbohwdmxGHmlXTceFwkC/WQkgcMf13 /dFVY+G0FGWRzZT/w9o8LTI+xhWFmuhJAxTCcLVx7K3eqdRlz7f8wT58JkhRjsEJOfsgGm u/QwUsdaZEnGBhE0/2kPEq4x4tq5T7zVsD+swoz2vNwsvhmcfLcOfjwwNhjoyKf811lfT+ YnyXpONfNXOn+P3czjIhAkFLFf/Y46MSCFDvY4WfrhOjOL0IwYvWo8F2RCGF/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072988; a=rsa-sha256; cv=none; b=DCcCDHwIrIWRBp3m95QojmF8k8kPYBZjo6/r/x4HS9FkqFyzsJtz6plIMLmK9xpdBectaB JP4sc40M/MKqRxyt9iCs3wxCdAo+gDoRGdpP8TbFosGke//i1I8KeuQVWyRUAMJ8Lh+tWW Ac7pPLSjD+1BRK/K9qngoZOn5kTVY6ko91/oZoKrM35e+bmmK/WdUUVh5kYYHNcWLckh/c TArNXbCwMn5osOCbrTPRXk2sQ578wJFWQzQQICMe919MGSWwc7PkMxw7luqt5wg40pQjWP PA1oe8PtJ4efl+JuoP2HtMn3ZNnC9CHGyCbap4i3B3ySP91QaQVoVo3UdmnQhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJ32kNf/NgEqj/RyabKcbcKtBFXRsJg9xt7HsnzGwk4=; b=XWL8924Em8vXKBwCXcM2YpXJHEjOJkjBE3TOm3gD7/G7I8NBI5DI53Jh5Ir05Q4j7Jgqna cRbvERQCuwKzWoWo3tL16n+baPBuzIGyb04fEH/d0UXFUT+uJ8MW8at4RHdi2McNsQnQq8 wEdNkZHZZtj3MezPdUowesYNnsIQOdD2p+SEgQM0lcSh69rOwe10j25wAdaME/eRbybyOi Rww2Uni9ap6uvG7LghBeJfVPb+OpLVfiAsMwkvwcTeJdYpb6HF6TI3OXJSGOY7VIkRu8oi OZu5KUQm5ZP8KE9CPtzWyXT8oZ2toaFdUiZzD8a+Ah1CCqr+BsImId5SxuV+CQ== 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 4Sn4rr0kH4zdXD; Fri, 8 Dec 2023 22:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M38R9020974; Fri, 8 Dec 2023 22:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M38lR020971; Fri, 8 Dec 2023 22:03:08 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:08 GMT Message-Id: <202312082203.3B8M38lR020971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: a8ba64ca91d4 - stable/14 - iscsi: adjust shutdown_pre_sync 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: a8ba64ca91d479346c9a7f99ef3eeceb1976ac13 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a8ba64ca91d479346c9a7f99ef3eeceb1976ac13 commit a8ba64ca91d479346c9a7f99ef3eeceb1976ac13 Author: Mitchell Horne AuthorDate: 2023-11-23 15:26:12 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 iscsi: adjust shutdown_pre_sync handler Don't attempt to service reconnections if RB_NOSYNC is set. More crucially, don't do it if the scheduler is stopped, as the maintenance thread will never run again. Reviewed by: jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42342 (cherry picked from commit 2ce1c45b3411410a5d0a4d08198a3b0010d493b7) --- sys/dev/iscsi/iscsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c index 311b339caf7a..38973898a9d1 100644 --- a/sys/dev/iscsi/iscsi.c +++ b/sys/dev/iscsi/iscsi.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -2680,11 +2681,12 @@ iscsi_terminate_sessions(struct iscsi_softc *sc) } static void -iscsi_shutdown_pre(struct iscsi_softc *sc) +iscsi_shutdown_pre(struct iscsi_softc *sc, int howto) { struct iscsi_session *is; - if (!fail_on_shutdown) + if (!fail_on_shutdown || (howto & RB_NOSYNC) != 0 || + SCHEDULER_STOPPED()) return; /* From nobody Fri Dec 8 22:03:09 2023 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 4Sn4rs3V7pz53Tlx; Fri, 8 Dec 2023 22:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rs2XWWz4T3y; Fri, 8 Dec 2023 22:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lt1VYf5c1E4pTRI2x2EQm+IOf4eG3tg+V8ToGbeiIKg=; b=tlE4mz2WiLp72ujxvboKGiEu/+YwY5evHIASsH4Z4PrkAKnuJRIiQHdQaZWfd2AiDpmUbD zxsGd7FD2pvWIz+xkfg3e8+rMYHLqoQmwZ71dKRjQg2M9GqHyzCsfDVyKluCKvD2KphoYS 2QhPMXe9B3+9KNGii3lh1cJQkwb+aA0n/n2AorYvSGfonezbBV787ppW07fAzoS2h1u6Vi VhshVRIqRiQy+iCNZsptBYKZ1ItmhYN1d1vwKpa4eBXcNNydVmoSO3uNd33WGSIYcLS2NV FurNhfkdS4SX83qrNggyO/GQoWQez3jAVi6L+hV8FFxpw3vYdVGQ0gsl5jNFjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072989; a=rsa-sha256; cv=none; b=CWLzfBLWsDMEf1KnLWv5dXlqtllYQl8K/qLoqDVt3B1Qa116nlULZwDrn9o8DdBNfRJSf8 b2Oq65iB3ogcWZudMIWIWFIiWeVcU/oCE47wMM0UTQx/O/5kuzum9nkU/PRlj9ILgfNiRq D+kbKBTyHZLGyQA3Qtaxh3hWdtuUg7/X3djz+psBokVUHUvrF4esDkQLqjCjCKGkguYnv+ y2gYL5CC+2Hb4FKnq9NfqmYVddLOHUSpUKxXLp1NJ09pWEltewFHut0cBhj4h6v0tigHfM 0J3i4tMz598DSoetgI5XDRwbr/aVnFrg0ci65BT+yvhd3w1qH2LPuY2swOWk/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lt1VYf5c1E4pTRI2x2EQm+IOf4eG3tg+V8ToGbeiIKg=; b=eB5e38Iw85292g7BaOaEX8KL4112WPm4BiisFzPTewHHe+jvkewNSwayX0JR578p39/XFg XRDsEWHHIAfSFYAPVP5F4/ypBXf9ksWH8NLNUOOxKVRM48g2d8N6ZKJ0O/Am/xd2iq7sil w49EpWcWh9SxcTKpr+kswL/1oKDu3sg0Bl4A26OlJgLfP9bldvK0mi7QvRYGUYpczLRX2x +yN+poliPoG2fHp84/jv5I7u4YQewgB67bysL9RdNvLxJeFpPHIQnZk/hYaHLM/zMymOoy uBJR2aN1WthuLc4Nmpi8DRNS34pabZkrsj4GlUcxkhJ3c9n0Fk4vFDFSrZqNZw== 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 4Sn4rs1R3Tzf2l; Fri, 8 Dec 2023 22:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M391S021017; Fri, 8 Dec 2023 22:03:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M39il021014; Fri, 8 Dec 2023 22:03:09 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:09 GMT Message-Id: <202312082203.3B8M39il021014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 121656c2b12f - stable/14 - pst: improve shutdown_post_sync 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 121656c2b12ffb0a00085a4d320f2b38b7a7bd3d Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=121656c2b12ffb0a00085a4d320f2b38b7a7bd3d commit 121656c2b12ffb0a00085a4d320f2b38b7a7bd3d Author: Mitchell Horne AuthorDate: 2023-11-23 15:59:05 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:45 +0000 pst: improve shutdown_post_sync handler It is desirable to shut down the raid controller even in the face of a panic. In the SCHEDULER_STOPPED() case, set the interrupt mask bits so that we request a polled wait, rather than sleep(), from iop_queue_wait_msg(). Tweak the function name and signature. Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42337 (cherry picked from commit c4dacfa7f4b82f23ec0924d9db772860b2066f9b) (cherry picked from commit f97aab79868cd7d891c52b14bd964523fa56f015) --- sys/dev/pst/pst-iop.c | 2 +- sys/dev/pst/pst-raid.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c index f9921a564333..783507ce0d9e 100644 --- a/sys/dev/pst/pst-iop.c +++ b/sys/dev/pst/pst-iop.c @@ -432,7 +432,7 @@ iop_queue_wait_msg(struct iop_softc *sc, int mfa, struct i2o_basic_message *msg) int status, timeout = 10000; mtx_lock(&sc->mtx); - if (!(sc->reg->oqueue_intr_mask & 0x08)) { + if ((sc->reg->oqueue_intr_mask & I2O_OUT_INTR_QUEUE) == 0) { msg->transaction_context = (u_int32_t)&request; msg->initiator_context = (u_int32_t)iop_done; sc->reg->iqueue = mfa; diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c index 4e9c4fb724bc..de152f611e3a 100644 --- a/sys/dev/pst/pst-raid.c +++ b/sys/dev/pst/pst-raid.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -73,7 +74,7 @@ struct pst_request { static disk_strategy_t pststrategy; static int pst_probe(device_t); static int pst_attach(device_t); -static int pst_shutdown(device_t); +static void pst_shutdown_post_sync(device_t, int); static void pst_start(struct pst_softc *); static void pst_done(struct iop_softc *, u_int32_t, struct i2o_single_reply *); static int pst_rw(struct pst_request *); @@ -170,18 +171,23 @@ pst_attach(device_t dev) name, psc->info->capacity/(512*255*63), 255, 63, device_get_nameunit(psc->iop->dev)); - EVENTHANDLER_REGISTER(shutdown_post_sync, pst_shutdown, + EVENTHANDLER_REGISTER(shutdown_post_sync, pst_shutdown_post_sync, dev, SHUTDOWN_PRI_FIRST); return 0; } -static int -pst_shutdown(device_t dev) +static void +pst_shutdown_post_sync(device_t dev, int howto __unused) { struct pst_softc *psc = device_get_softc(dev); struct i2o_bsa_cache_flush_message *msg; int mfa; + if (SCHEDULER_STOPPED()) { + /* Request polled shutdown. */ + psc->iop->reg->oqueue_intr_mask = 0xffffffff; + } + mfa = iop_get_mfa(psc->iop); msg = (struct i2o_bsa_cache_flush_message *)(psc->iop->ibase + mfa); bzero(msg, sizeof(struct i2o_bsa_cache_flush_message)); @@ -194,7 +200,6 @@ pst_shutdown(device_t dev) msg->control_flags = 0x0; /* 0x80 = post progress reports */ if (iop_queue_wait_msg(psc->iop, mfa, (struct i2o_basic_message *)msg)) printf("pst: shutdown failed!\n"); - return 0; } static void From nobody Fri Dec 8 22:03:10 2023 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 4Sn4rt66W6z53V2Z; Fri, 8 Dec 2023 22:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rt3y2vz4TPy; Fri, 8 Dec 2023 22:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fCty3+dwTfuwXcApOUbBNGsKaNvoK8mjnUu395G66dY=; b=fQbr0KiZfV0RlpsmlvAabN0wrzgMjrop5oTRuLvJkX7cikkLd4rQB/tAkxc7lWSVs2KkPb HuJFHyN0trW070esniBMD27Sawkn3JOBgkBkiQQgF5LIcmI9+uGBXZfISBVLQPAodGwHfM HaSTulJu94WqI1ZYBkLUfNxVoOgdUnyTDMTkFhzsAfm375tXJ9GMk7z8TdS2NAs36ricU8 j/XrE76FETuzw9T0p6/9G26ZTu0mTHTo0x3cEfYsF445ngfm7Tm9ahGtjOvXSqNNBOLmAy Qk7q54iVTt5JHeNzXyib/6b7lwM5Opdx81tIqQxpkxLma5ZXDmFN/8Nl4BS10Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072990; a=rsa-sha256; cv=none; b=h6Wx5zuupgYMqAx2aWcOc8ynA9jHeRBL/qVQOIaPn2hUmtNLlmhRP1yowdy/2PSfdQEY+J kv571Ntf5Jd+g9eC1QrmP29jEfyEFBNQOEWWOMeDwi4rMnETegZK+TU9KpiZ1lf0TsbxSU 3QtheEJXyxLyDEU5MM4bFn6hFnJ/cciAa7JUyqD65fdHYs7oIwcgf8Zmhu+sWAe3HRbD/N LW+lmPhdeNL+g2BSKt7I2D4n7MnAOTcsRbEP5TCCUvtxKGa8DYv48DgHFBQef1Hb789mop zJW5Sv2Z6behdbusoStsOhMBtGyJdZo7p/FalECBNTMby8FREu7pE8NnQvvVWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fCty3+dwTfuwXcApOUbBNGsKaNvoK8mjnUu395G66dY=; b=Y+mnBsGyPcdIvZ/Mvi42GXCwpYhrriLrffKWDXYwNK8ZO/urmI1jDW+NzomI064Qa4huyO nnHMhbIIY300nWhelWKZiPVUCAbUaUUgJOUqxGtmSeYCwPhVn5VcpTy92842VAknK0AAs6 wYomWy8fpOxe7pucvinFDJb/vsnpcl0Y43oFIs3GFJPvcZpP963qUxhjrOUPOM7hp1nyEX Jz7MnlN6xAM/9P4g9MnzH00TGt2INfihRERozRPP5cdnymy4LSqi9aaEeEwUgw0RhTGJW8 Ez8S3Pfc7WPhuYa7AJvufvwbm4iZkIzVK1p6bat5noTdELtYUdJuXbdFBW8WXw== 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 4Sn4rt2qB8zf2m; Fri, 8 Dec 2023 22:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M3Akp021067; Fri, 8 Dec 2023 22:03:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M3ALq021064; Fri, 8 Dec 2023 22:03:10 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:10 GMT Message-Id: <202312082203.3B8M3ALq021064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 08b952c56b5e - stable/14 - shutdown: tweak kproc/kthread shutdown check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 08b952c56b5e69d752a8a4bf42ff16f666c3eb5d Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=08b952c56b5e69d752a8a4bf42ff16f666c3eb5d commit 08b952c56b5e69d752a8a4bf42ff16f666c3eb5d Author: Mitchell Horne AuthorDate: 2023-11-23 15:27:57 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:45 +0000 shutdown: tweak kproc/kthread shutdown check This is to handle the case where the system has not panicked but the debugger is active, where we still can't wait for thread termination. Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42683 (cherry picked from commit 960612a19f009df602a4cb008fa90a45a6e869bb) --- sys/kern/kern_shutdown.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 19920d30357f..b69caebe17d9 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -1011,7 +1011,7 @@ kproc_shutdown(void *arg, int howto) struct proc *p; int error; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return; p = (struct proc *)arg; @@ -1031,7 +1031,7 @@ kthread_shutdown(void *arg, int howto) struct thread *td; int error; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return; td = (struct thread *)arg; From nobody Fri Dec 8 22:03:11 2023 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 4Sn4rv5wcLz53V53; Fri, 8 Dec 2023 22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rv4KYbz4TGv; Fri, 8 Dec 2023 22: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=1702072991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YGF8mwbRk9/Vhi/Tz9PTK1LSk/mEDe4iGLPKFq/al8g=; b=f1DlUY0W/aZuOVffcGi02JuX2xgmh0Dcb6bSX9OsjX7JAbAwtktssrLlrM4J6JaFAywzQi nTpYjyunvj4UW13Z5MEfJMoYYSeLaJjIW+vxA1Coc6oe/ryhajmbiZW2t3+d/PywjQ0Qmi t+ujt/xJic1c3FGNwmrxVyA0TU8vXdeyRnalYg80hev03WLwHi6TpsIU08W/0sox/JLOCA uW/UbxrgCL6h7PgPEn9GP2Lc3/FJXVFS6/yhslrnKL/1W3klpZ9haRruVnICNXnrwAOWR8 BSOGUP5vtfcP1fCFnCoIbEoYd4KHV9261qit/0/E617p60ROdI5WF7LvU0v+6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072991; a=rsa-sha256; cv=none; b=MTJ6osyW1XVLwTTy77YCN3ImovSe3f6UwYVpUh2wgcOprRIv9LJeOEwFuUvBU1RlAAhtbf p72/QKGiuUV4kWGQgmDFdSSr0DxXIwqe49AFVTXOc59VxOxn/0dJrEPMf28Wo7qdPXZ6kc 9nTDKZxUVbuRSyYfPyns/CeqrM5UX+g0CYoAAjsQtvX6Lb0iljMT5fX1WLvqstiQ4xlB7Y rwU958TPNP/LEvEutjgqldXRaLhNt3kXOphIV0CNhq9EhlydRsBYVKDJ2C2/Xi4StjuuwX I747q3cSelt37bxj1OMks7vbDHUJxAAabKgSwdBIbZz2kWMl6dH7Dio4ppXHyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YGF8mwbRk9/Vhi/Tz9PTK1LSk/mEDe4iGLPKFq/al8g=; b=tCGEV8wn7dsUcCw69FDM+KvmqTRtd0Ujmcto3PsGpQSM7BZJzbd/juQM20ViX3z6I6fAm1 JLWNRgL2bzAe3ZHsdZdohlQm3Wca4SGMb8qEeo7NS37Fbtj/kBc6+DpGwQqtRNZT2Jqn5B mqJIQAWt60QsAdXuRldxq3CrYFhEECAMiV5NVDA4S3ns38cQcYtSIf405yxEKcvXsBJq8j aW0oh9lGxcCrfkQfD0Czyg2RElZ+mUyqV0ShPxUUdwMMyEy1FAbNiB7N4VaxB1luKyPsg7 M7Z+yoTM+RuHDs83r6c2lwd2tYN2WCS0dD82FIBExqMK9V03vasz/sWtM/8KfQ== 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 4Sn4rv3Kk4zdXF; Fri, 8 Dec 2023 22:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M3Bq7021106; Fri, 8 Dec 2023 22:03:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M3B51021103; Fri, 8 Dec 2023 22:03:11 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:11 GMT Message-Id: <202312082203.3B8M3B51021103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: c27113379e1e - stable/14 - kern_reboot(): don't clear kdb_active List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c27113379e1e3d2b906c09be1070dcfcf942cdee Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c27113379e1e3d2b906c09be1070dcfcf942cdee commit c27113379e1e3d2b906c09be1070dcfcf942cdee Author: Mitchell Horne AuthorDate: 2023-11-23 15:28:26 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:45 +0000 kern_reboot(): don't clear kdb_active It is possible to reach this function from ddb via the "reset" command. When this happens, we don't actually exit kdb, meaning we never execute the latter steps of kdb_break() to restore the system state (e.g. re-enable scheduler). Therefore, we should not clear the kdb_active flag in this function, as the debugger is still active. Put differently, kern_reboot() is not an authority on kdb state, and should not touch it. The original motivation for this assignment is not clear; I have checked thoroughly and I am convinced it is not required by any reset code. This fixes an edge case where a panic can be triggered during reset from ddb: 1. Enter ddb via keyboard break sequence (KERNEL_PANICKED() == false && td->td_critnest > 0) 2. Execute the "reset" command 3. kern_reboot() sets kdb_active = false 4. A witness_checkorder() call via shutdown handler sees !kdb_active and panics Reviewed by: imp, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42684 (cherry picked from commit 4e78a766f607192698514d970ff4e9fa91d0482d) --- share/man/man9/kern_reboot.9 | 7 ------- sys/kern/kern_shutdown.c | 3 --- 2 files changed, 10 deletions(-) diff --git a/share/man/man9/kern_reboot.9 b/share/man/man9/kern_reboot.9 index f8513c0adf18..c86e9a6cbdb9 100644 --- a/share/man/man9/kern_reboot.9 +++ b/share/man/man9/kern_reboot.9 @@ -96,13 +96,6 @@ variable to .Dv 1 , indicating that the reboot process has begun and cannot be stopped. .It -Set the -.Va kdb_active -variable to -.Dv 0 , -indicating that execution has left the kernel debugger, if it was previously -active. -.It Unless the .Dv RB_NOSYNC flag is set in diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index b69caebe17d9..ea86a7e24d06 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -492,9 +492,6 @@ kern_reboot(int howto) rebooting = 1; reboottrace(howto); - /* We are out of the debugger now. */ - kdb_active = 0; - /* * Do any callouts that should be done BEFORE syncing the filesystems. */ From nobody Fri Dec 8 23:10:05 2023 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 4Sn6L54CHlz53ZVW; Fri, 8 Dec 2023 23:10: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn6L53jFNz4g3l; Fri, 8 Dec 2023 23:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702077005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KXZMbh6T0hc7FOVaHFJ00YbWhrrIZbhH1LkW7aJBe7o=; b=d00H3IwReYld28yhY5JNXAxrB2f4wBLpC/3WIy8NJQYrt7o9YeZva0Zrj3l3TH7CNY83Sw rcZTczWxsS8yX7g1OAuESMjrrw6kui9Z2FUz39Tmxmaw4JzgjdsX+B1fuq6rxxLAgrFU5R sDYKEHCl99hjWZtZ+FzYJhJYg1gsgOQvYwzez2AjblCGgxlOno1uACgDrBiccku3DW0u6E mRMs3opL5BxGDTtGjifNHdDEhRm7LodVnSuAjtrmvKhfW7AKQf+kevcOZX7j2W1bsLL2e6 hXb+4FlA344A8nRLx1gRr6LkY9GvXlxstE8YRMsFtCVn7KHyER5zP4TaT9TbsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702077005; a=rsa-sha256; cv=none; b=DsSBapxlIOrc0LLLfsSTyEKUkhiHNi1NIldYcMMtvCooyQq/qk8IQGScjEW5ubxkjWanMu YRx71ZDfhhrrdJNLXzuqzleHkThvdb4L39MpaqkMgVE9Q8RZNOArfE7c/VdhMjgAgMy1qQ 7OYsR1e47jgw8/Q0y8BcPHrrjWbv1zeHu0CAx0Tv/y+1v+koZ7ERUPV77x5anFFjrKqMru xSoMOXpiZvTgawtbt3i0zbuB1QMxWL77+UGpj3oMrvh+qS6a0pOeO+Xnhk8D5pgnEQrqNH 1UtzhI5M2VdF9mgXxmLogyV2k9wniBhug6RqKvbfqPRBmBsPNJECRCS0/iUNsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702077005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KXZMbh6T0hc7FOVaHFJ00YbWhrrIZbhH1LkW7aJBe7o=; b=GaElOR2T2EmX+r2bBYD0LHl6yy2amDSUDYUiTZwEez+LPmC/nHTG+lixFTiMwvA1GDmslo mkHlJg4I4zJlMdomddtMgfatzda3O1imnMHBmXQbYSS5RSV0AaEblp3vg7F5gVSUNcwAz2 o05nk2tm3CwzqtNjrG5oYdkK8zSbT8j06fRG0Np4BlG2HxXiIFaJAJMBLvlAyzXo0hEH5E KnirHxLGozTh+p8V3jgQGi+MKisQg778O9c654nHzTpI+3sFIb3FxTEgfb83y/9yuXzr+J HmnWIPpI3hE0zYrKOZGfb4g11WjgcRaZssAtXlYFOD+l5xvjRkp3cbzZj26psA== 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 4Sn6L52lg4zg1S; Fri, 8 Dec 2023 23:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8NA5tO026717; Fri, 8 Dec 2023 23:10:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8NA5cI026712; Fri, 8 Dec 2023 23:10:05 GMT (envelope-from git) Date: Fri, 8 Dec 2023 23:10:05 GMT Message-Id: <202312082310.3B8NA5cI026712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: fb17dfa0c83c - main - libicp: unbreak for armv6 after recent OpenZFS import List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: fb17dfa0c83cc213400fe7e1ed7a39253a4fcefa Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=fb17dfa0c83cc213400fe7e1ed7a39253a4fcefa commit fb17dfa0c83cc213400fe7e1ed7a39253a4fcefa Author: Dimitry Andric AuthorDate: 2023-12-08 23:09:36 +0000 Commit: Dimitry Andric CommitDate: 2023-12-08 23:09:50 +0000 libicp: unbreak for armv6 after recent OpenZFS import The following upstream commit: 727497ccdfcc module/icp/asm-arm/sha2: enable non-SIMD asm kernels on armv5/6 does indeed enable sha2 asm for earlier arm CPUs, but since libicp's Makefile was not updated, this leads to: ld: error: undefined reference due to --no-allow-shlib-undefined: zfs_sha256_block_armv7 Fix it by compiling sha256-armv7.S and sha512-armv7.S for armv6 too. Fixes: 3494f7c019fc --- cddl/lib/libicp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index 2d9bb3c67cb4..085818f2371a 100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -21,7 +21,7 @@ ASM_SOURCES_AS = \ asm-x86_64/blake3/blake3_sse41.S CFLAGS+= -D__amd64 -D_SYS_STACK_H -UHAVE_AES -.elif ${MACHINE_ARCH} == "armv7" +.elif ${MACHINE_ARCH} == "armv6" || ${MACHINE_ARCH} == "armv7" ASM_SOURCES_C = ASM_SOURCES_AS = \ asm-arm/sha2/sha256-armv7.S \ From nobody Sat Dec 9 00:38:44 2023 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 4Sn8JR3jV3z53hX4; Sat, 9 Dec 2023 00:38:47 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.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 4Sn8JR1b2Yz3L4C; Sat, 9 Dec 2023 00:38:47 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTPS id Bg04rUZGaB0n0BlMkrpZLe; Sat, 09 Dec 2023 00:38:46 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id BlMirYmdYMsNfBlMjrvzYX; Sat, 09 Dec 2023 00:38:46 +0000 X-Authority-Analysis: v=2.4 cv=KJNJsXJo c=1 sm=1 tr=0 ts=6573b716 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=42Nyi_-BZy46IMUx:21 a=nYBQqi4ZBl4A:10 a=kj9zAlcOel0A:10 a=e2cXIFwxEfEA:10 a=VxmjJ2MpAAAA:8 a=6I5d2MoRAAAA:8 a=69wJf7TsAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=z0LIvfebFlXCJfM9AH8A:9 a=CjuIK1q_8ugA:10 a=SDRQezh6D3oA:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=IjZwj45LgO3ly-622nXo:22 a=Fg1AiH1G6rFz08G2ETeA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 4C0FD1097; Fri, 8 Dec 2023 16:38:44 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 41AC718D; Fri, 8 Dec 2023 16:38:44 -0800 (PST) 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 cc: Martin Matuska , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 3494f7c019fc - main - Notable upstream pull request merges: #15539 687e4d7f9 Extend import_progress kstat with a notes field #15544 c7b611926 Allow block cloning across encrypted datasets #15553 adcea23cb ZIO: Add overflow checks for linear buffers #15593 5f2700eee zpool: flush output before sleeping #15609 3e4bef52b Only provide execvpe(3) when needed #15610 735ba3a7b Use uint64_t instead of u_int64_t #15612 bcd83ccd2 ZIL: Remove TX_CLONE_RANGE replay for ZVOLs #15617 55b764e06 ZIL: Do not clone blocks from the future #15623 727497ccd module/icp/asm-arm/sha2: enable non-SIMD asm kernels on armv5/6 #15625 9743d0963 BRT: Limit brt_vdev_dump() to only one vdev #15629 f9765b182 zdb: Dump encrypted write and clone ZIL records #15634 2aa3a482a ZIL: Remove 128K into 2x68K LWB split optimization #15639 11656234b FreeBSD: Ensure that zfs_getattr() initializes the va_rdev field #15647 4836d293c zfs_refcount_remove: explictly ignore returns #15649 f0cb6482e setproctitle: fix ununitialised variable #15650 450f2d0b0 import: ignore return on hostid lookups In-reply-to: <20231208173121.59D6930@slippy.cwsent.com> References: <202312080913.3B89DvpO030325@gitrepo.freebsd.org> <20231208173121.59D6930@slippy.cwsent.com> Comments: In-reply-to Cy Schubert message dated "Fri, 08 Dec 2023 09:31:21 -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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 08 Dec 2023 16:38:44 -0800 Message-Id: <20231209003844.41AC718D@slippy.cwsent.com> X-CMAE-Envelope: MS4xfD4Ibr0E676/JhuMJLU+XA124IK4D/oNetmOCLqxyrO8wh4rrKYD7jvk5mo9FtwxyTiBZ8zlaqpDzIRt3fYbKZytVXm2CjjrRhe5SA8jOdrJ/1ir/VQ5 njOO7BSjLengzLB+t4fZsEIeWxW6eCfraTLSD4YLY7ngHBT6QgDtDWFX6vHyTfWQw5LuHCWfPJ0nbn8iH722JqqdabeA1iPqFdw3c5b3+OjFMqA1xDqKc4zL dwpQqv8H61i1gkcqJj7fZytKyh5NFyyPdFkVuQpOO1zeoJgBe5iMU12SVnszqYLLiCpcQe4oGy5R7uSQ64fTOclsCLbbrFJ/JfK0UuM/DQc= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Sn8JR1b2Yz3L4C In message <20231208173121.59D6930@slippy.cwsent.com>, Cy Schubert writes: > In message <202312080913.3B89DvpO030325@gitrepo.freebsd.org>, Martin > Matuska wr > ites: > > The branch main has been updated by mm: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3494f7c019fc6558a99f63b7f64737 > 3b > > 89bcde92 > > > > commit 3494f7c019fc6558a99f63b7f647373b89bcde92 > > Merge: 1f36ca5de596 450f2d0b08e7 > > Author: Martin Matuska > > AuthorDate: 2023-12-08 08:32:30 +0000 > > Commit: Martin Matuska > > CommitDate: 2023-12-08 09:13:33 +0000 > > > > Notable upstream pull request merges: > > #15539 687e4d7f9 Extend import_progress kstat with a notes field > > #15544 c7b611926 Allow block cloning across encrypted datasets > > #15553 adcea23cb ZIO: Add overflow checks for linear buffers > > #15593 5f2700eee zpool: flush output before sleeping > > #15609 3e4bef52b Only provide execvpe(3) when needed > > #15610 735ba3a7b Use uint64_t instead of u_int64_t > > #15612 bcd83ccd2 ZIL: Remove TX_CLONE_RANGE replay for ZVOLs > > #15617 55b764e06 ZIL: Do not clone blocks from the future > > #15623 727497ccd module/icp/asm-arm/sha2: enable non-SIMD asm kernels > > on armv5/6 > > #15625 9743d0963 BRT: Limit brt_vdev_dump() to only one vdev > > #15629 f9765b182 zdb: Dump encrypted write and clone ZIL records > > #15634 2aa3a482a ZIL: Remove 128K into 2x68K LWB split optimization > > #15639 11656234b FreeBSD: Ensure that zfs_getattr() initializes the > > va_rdev field > > #15647 4836d293c zfs_refcount_remove: explictly ignore returns > > #15649 f0cb6482e setproctitle: fix ununitialised variable > > #15650 450f2d0b0 import: ignore return on hostid lookups > > > > Obtained from: OpenZFS > > OpenZFS commit: 450f2d0b08e73cfb057d0e301a813418b70d64b9 > > > > sys/contrib/openzfs/cmd/zdb/zdb_il.c | 60 +++++++- > > sys/contrib/openzfs/cmd/zed/zed.d/zed-functions.sh | 98 ++++++++++++ > > sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 22 +++ > > sys/contrib/openzfs/cmd/zpool/zpool_main.c | 14 +- > > .../openzfs/config/kernel-flush_dcache_page.m4 | 5 +- > > sys/contrib/openzfs/config/kernel.m4 | 6 + > > sys/contrib/openzfs/config/user.m4 | 2 +- > > .../openzfs/include/os/freebsd/spl/sys/time.h | 4 +- > > .../include/os/linux/kernel/linux/dcache_compat.h | 15 +- > > sys/contrib/openzfs/include/sys/dsl_crypt.h | 1 + > > sys/contrib/openzfs/include/sys/spa.h | 4 + > > sys/contrib/openzfs/lib/libspl/include/assert.h | 3 + > > .../lib/libspl/include/os/freebsd/sys/param.h | 2 + > > sys/contrib/openzfs/lib/libspl/include/sys/time.h | 2 +- > > .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 4 +- > > .../lib/libzutil/os/linux/zutil_setproctitle.c | 2 +- > > sys/contrib/openzfs/man/man7/zpool-features.7 | 9 +- > > .../openzfs/module/icp/algs/sha2/sha256_impl.c | 22 +-- > > .../openzfs/module/icp/algs/sha2/sha512_impl.c | 19 +-- > > .../openzfs/module/icp/asm-arm/sha2/sha256-armv7.S | 8 +- > > .../openzfs/module/icp/asm-arm/sha2/sha512-armv7.S | 4 +- > > .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 + > > sys/contrib/openzfs/module/zfs/arc.c | 12 +- > > sys/contrib/openzfs/module/zfs/brt.c | 86 +++++------ > > sys/contrib/openzfs/module/zfs/dmu.c | 15 ++ > > sys/contrib/openzfs/module/zfs/dsl_crypt.c | 34 +++++ > > sys/contrib/openzfs/module/zfs/spa.c | 41 ++++- > > sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 12 +- > > sys/contrib/openzfs/module/zfs/spa_misc.c | 74 ++++++++- > > sys/contrib/openzfs/module/zfs/zfs_vnops.c | 25 ++- > > sys/contrib/openzfs/module/zfs/zil.c | 40 +++-- > > sys/contrib/openzfs/module/zfs/zio.c | 57 ++++++- > > sys/contrib/openzfs/module/zfs/zvol.c | 60 +------- > > sys/contrib/openzfs/tests/runfiles/common.run | 3 +- > > sys/contrib/openzfs/tests/runfiles/linux.run | 1 + > > .../openzfs/tests/test-runner/bin/zts-report.py.in | 2 + > > .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + > > .../functional/block_cloning/block_cloning.kshlib | 12 +- > > .../block_cloning_cross_enc_dataset.ksh | 170 +++++++++++++++++ > ++ > > ++ > > .../cli_root/zpool_import/zpool_import_status.ksh | 132 ++++++++++++++++ > > sys/modules/zfs/zfs_config.h | 7 +- > > sys/modules/zfs/zfs_gitrev.h | 2 +- > > 42 files changed, 885 insertions(+), 209 deletions(-) > > > > Hmm. This import of ZFS is a little buggy. My outgoing emails have null > characters in them again. > > Confirmed. ZFS is not the cause of this corruption. It is nmh-devel. I've submitted a bug report to the upstream at https://savannah.nongnu.org/bugs/? 65002, and removed the offending code from the port. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Sat Dec 9 01:13:09 2023 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 4Sn9452HD5z53klP; Sat, 9 Dec 2023 01:13: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn9451nYGz3NFW; Sat, 9 Dec 2023 01:13:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702084389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aIzsSW5EuWZ3M0AuNBsbxkmy9MUCMLr//qhfy6ShgFk=; b=DM445Kmoy1TArYnSnlm/KVRcBuA1iGj14eIT9Eck77IVC8jhNjVW07kYh0QQGQW8XUop0n 77Jf8TaEYpvy+SwSzK+iS8CSYDuyMyl0A779WVSA3CYJI39QBZr4Tnx7MMYS7NdYlYe08J l9PSAnE0XsA5aoymAHM+B8t2Ncjzh/IHDu1cPlZWScXrRY9NcmfF4YSPIcGodZ12iuY6Jf VIzHjZWOrS4LpPmgXxcZLFZ4jF6zljPgxU4VQeufkaoyV5DvzxDsQqsXx4j5EEaYi3Obzi akH7DFujQ7bzcU/VcK6imFBrHjxmiJcgmkZItp05hMuTjaQpkuy6bPKqG9Zovg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702084389; a=rsa-sha256; cv=none; b=KZ2T3IuWBNN7zmq59qGzMO1j0AmhQj3jiJLAX7pzM7rbeyLdJ4cs4SO/wyGDsZAXB41yR1 GwYC0iZVwc0wg3iBkrc1Rut7scxMTe98KZebBLozSRyXj/EE+WOegO+sfVgPDSLW11zBJS SIsJdqe8ZqPPv7zK4JR/P8SHpW5uN/PqxdGMK/PtfK8w+G8+qASpV8ipxEMmDmEOB0bVDY KQoYrOrHdSEV57czOwd9T5Ku8C7e1LPA7YMoNSQmwZBkRjA1fu62mW/BCZ1EcalSuUzxd8 Ld0w3KOOp1GQ/bQoszV1NzOxG1IptDJIWT3wH9r+8zgW0vtsuaO+y5Zj3MKnQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702084389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aIzsSW5EuWZ3M0AuNBsbxkmy9MUCMLr//qhfy6ShgFk=; b=OzuDJgJwre6G7PwmfgPzgUmGMBCvUBey4T2QBbKGmJqYoCxYYyRBJEOhc8c0glqnpjrb2M WFi3hdxkQG3L4OJ480+a8Ux9C9cPEU2bqKOTp3lbbutSSnjSJy715YBU9qh4A0Txzri1Ex amQugC3+854BWbWrK6MryEqx24Pdx7OzCrpRdiFQASm/YjaFMqT5Rd/FIbTh1d4MlM6FAb UfXpOpdxrqgovBeWVzChBInyXKcYeHR2DrXTRuWm+JpmSvPuJNMT+EsaXDTlTkXD06f1dV ImD+w9kL9i5nUNWWIaN0OyxtYu/QnlOHgrA7vWX/K1eiHNBt9CwBfqwsNlA9jg== 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 4Sn9450rtFzkJw; Sat, 9 Dec 2023 01:13:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B91D9tK041312; Sat, 9 Dec 2023 01:13:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B91D9Wo041309; Sat, 9 Dec 2023 01:13:09 GMT (envelope-from git) Date: Sat, 9 Dec 2023 01:13:09 GMT Message-Id: <202312090113.3B91D9Wo041309@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: 2a163c3649e5 - main - strfmon.3: Cleanup example 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2a163c3649e59dd616e057994ec02092362f0ae7 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2a163c3649e59dd616e057994ec02092362f0ae7 commit 2a163c3649e59dd616e057994ec02092362f0ae7 Author: Jose Luis Duran AuthorDate: 2023-12-01 06:50:24 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-09 01:06:13 +0000 strfmon.3: Cleanup example code - xlocale.h would have been required if using strfmon_l(). Here, setlocale() just requires locale.h. - ANSIfy function declaration. - Add a final return(). MFC after: 1 week --- lib/libc/stdlib/strfmon.3 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libc/stdlib/strfmon.3 b/lib/libc/stdlib/strfmon.3 index 7cd283573239..20cc560d401d 100644 --- a/lib/libc/stdlib/strfmon.3 +++ b/lib/libc/stdlib/strfmon.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 25, 2023 +.Dd December 6, 2023 .Dt STRFMON 3 .Os .Sh NAME @@ -154,10 +154,10 @@ to the string .Bd -literal -offset indent #include #include -#include +#include int -main() +main(void) { char string[100]; double money = 1234567.89; @@ -169,6 +169,8 @@ main() strfmon(string, sizeof(string) - 1, "%n", money); printf("%s\\n", string); + + return (0); } .Ed .Sh ERRORS From nobody Sat Dec 9 01:13:10 2023 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 4Sn9463cdfz53l5Y; Sat, 9 Dec 2023 01:13: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn94630Dtz3NHp; Sat, 9 Dec 2023 01:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702084390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+M6o8+6pvyKuIrikb7OT1dSYFEm1OmRXOa+0EMNW6Ec=; b=AMyamZW/f3bamCMkrKPF9uEmGYpCBz28D7KEbNmRc+0l5M2F431d6jVLXtGmWVP4kWJOD6 zzTe3dpPr4qaPWV5UtumRq1WLYiUqGI4NL3hUS8JTuRnJax9fTTJgmlH/yD2ADITV9vjgc YWJzIuwYN4GA+I/ueT7xOLDoRQ6mKuxv749dQEtRQao83hVBhOI84sL3Lrpes1mKNV1BnA T0S3RWmGA0nPVXRCdDPeRK5BllOvMQzyCNf/3PWKRBWa+79A4VXAksSS2c7aGs59U3oOyx olFnomz76F0ofIAWu9xu2ogR4xEkxacSb0x/VIqtLHwWQssNybHvrb8SWia0iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702084390; a=rsa-sha256; cv=none; b=p+hhK2UWaZRtsufhnehLEefl1peg5KclTX3fECy35cCJM40wSmAdfagN+U2rX9UxifKhID JIaggUfPhvlQbonLaj923pbzTbV2263RZcQFPzmk6WRTUdi2AjQgXf2emWi6z+Z5HfhBcQ 4VxjmewtLMj3VDrIJenfWMoTob4UMME1U2hJaSDH9TQ608QNkglp1uFm9N+SzJWKQTPxjK xHiyNj8pK4RrmZGyEzgXrdP0w+GISjaM3WSoUIMQu8OacNoytr6YObPR2CAB8vhKjYg3LP kg/I1Tb/Er5ZIsuzI10bJWvvsp0klibqCzagq4RXK+VeBBkN+RjSovPguZFvaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702084390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+M6o8+6pvyKuIrikb7OT1dSYFEm1OmRXOa+0EMNW6Ec=; b=hJeVPitS0TToIjKidcgCqRMGGQwUD6mwcmbbuWXDV2lhff1gZKu+KcreXXS/dJVAstR/KQ xzJ0JnORsI6NqNkFp37B3tMiw3HV4FSYPG51Pr/exCHAHjxodPzlV2QXtWE+hndTsaRH5H qgCoP39d3kzTYI/QGB6zPWps84eXjqwTb98woOuUdudk2kEzfklz63mv0X54N1GfGFmyRD Iu/PATjavklxAYTT6LAFyVHkNNRk5eJ2dpWKKx77KFjC6+f0cT7ThYwz4G+zUoYfM3fx2X Mr7mJPK6Ia7Zb/G6hOMoCsn6ARoZBEEOwfGH94Z+DuRLQxB3MOLna402ApRC2g== 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 4Sn9461rVXzkJx; Sat, 9 Dec 2023 01:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B91DA4a041351; Sat, 9 Dec 2023 01:13:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B91DAQg041348; Sat, 9 Dec 2023 01:13:10 GMT (envelope-from git) Date: Sat, 9 Dec 2023 01:13:10 GMT Message-Id: <202312090113.3B91DAQg041348@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: 6abee52e0d79 - main - strfmon: Silence scan-build warning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6abee52e0d79f68fd725de748d7027ca8eef2294 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6abee52e0d79f68fd725de748d7027ca8eef2294 commit 6abee52e0d79f68fd725de748d7027ca8eef2294 Author: Jose Luis Duran AuthorDate: 2023-11-30 23:30:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-09 01:06:28 +0000 strfmon: Silence scan-build warning The value stored to 'value' is never read. Reported by: Jenkins (scan-build) MFC after: 1 week --- lib/libc/stdlib/strfmon.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c index b2d76fbed769..ade1deaffca9 100644 --- a/lib/libc/stdlib/strfmon.c +++ b/lib/libc/stdlib/strfmon.c @@ -156,7 +156,6 @@ vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc, left_prec = -1; /* no left precision specified */ right_prec = -1; /* no right precision specified */ width = -1; /* no width specified */ - value = 0; /* we have no value to print now */ /* Flags */ while (1) { From nobody Sat Dec 9 02:33:19 2023 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 4SnBrb3bJmz53r68; Sat, 9 Dec 2023 02:33: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnBrb32WJz3V6K; Sat, 9 Dec 2023 02:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702089199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LPWeHHJEJ6+1COur0/jOpF74AYvxMdzAgvTefa/xdt8=; b=lPPD8za65x4PElPH6+DYF+zGJa6GgZUgig5FXm7oZBU+iesDFHf75IeXCfjGOwAem7zYOg W7zaHGVizoSOvj94oHYl84wP6efD9QXk5V6x/Sg45KfjfnT0L4VAgQmbH8kZ7tQ6fgmqzr YoijCGlxBHKRpyKZDqXl9y4aQtv0kObMcGJpg2vb++/ojma40Y7t2c6A6nJwN2+5+RgAdf YQK+7e/Twwsbx29V01/TWEZWSGBvemmHdSbwSt1d3mpY9Fc+yquBYfdbBjiLfBqhexwGFn eGs0Lxt1258PY3K+P1Bl+HHh7bxYEfhcSCmZMI8LM0yeEvRqXFo34ppl88JGVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702089199; a=rsa-sha256; cv=none; b=By6KaAOrsPlpbxQrj4oh2mu5LeeLaLdHgw4+erAlBIS0wDdzYCk/PoBqbE48+HGhZbswW9 0rUPCcvZsQNZm6sKSUtclSu/eZPHnngy5+t9lxbfUOWkFOIfv8txCv5N+ym7pou8RADMfW Aluho/l2C3dzVV11F/FeZBmH700C9DxhxuUYa/vzdnP8oFvnVbejuvqKJ773njK6ylAc0D G3OU+D+OovGPv4xL2h0hKSQBZuJBwNsVgObtLB7v/h9cbIoJLH+7Rh6thp5+RG2Wto7Ecz vO5GnM2YYFJW/f5JpWnp9kTp9sNiJxXv4h2MyujOdB/xYCrGe0Rqx2Ri0mcPlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702089199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LPWeHHJEJ6+1COur0/jOpF74AYvxMdzAgvTefa/xdt8=; b=EWGzrJ0FRLOw+u3oyQ2y7haYWeNMfANKU5p15O3obvZK30hiUSIhnKO3ps8druGbgViE7d MFGphQAj/e5nukEdakwCB5cgC4egil7gh1qkepuiCI9lPLO76e3jFJcLeli3AUorSGWde0 O59QMM4Qddu6Tv1n9sgkL+GVYvwJdTasJSGQBWOXKqAwoexwkZ282pWcNdrg2rzX9rOKok iZCA5hA0fd8IC8OXJ5HpkAQ5euD0/boCTRnh9/SzXoRLcHKU9iCNJiJu86zZjh/WiA9uqt abzMXM+7Q8OQQhDBIN5TNDksvhUPmQfI2u/PvGwiuBUO9xlKr4QLZEnd7HmdCw== 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 4SnBrb250gzmY3; Sat, 9 Dec 2023 02:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B92XJ36074612; Sat, 9 Dec 2023 02:33:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B92XJe0074610; Sat, 9 Dec 2023 02:33:19 GMT (envelope-from git) Date: Sat, 9 Dec 2023 02:33:19 GMT Message-Id: <202312090233.3B92XJe0074610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 58f5c260a2e6 - stable/14 - uma: Micro-optimize memory trashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 58f5c260a2e65795702225354d71e1f34601db00 Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=58f5c260a2e65795702225354d71e1f34601db00 commit 58f5c260a2e65795702225354d71e1f34601db00 Author: Alexander Motin AuthorDate: 2023-11-09 18:07:46 +0000 Commit: Alexander Motin CommitDate: 2023-12-09 02:32:43 +0000 uma: Micro-optimize memory trashing Use u_long for memory accesses instead of uint32_t. On my tests on amd64 this by ~30% reduces time spent in those functions thanks to bigger 64bit accesses. i386 still uses 32bit accesses. MFC after: 1 month (cherry picked from commit 7c566d6cfc7bfb913bad89d87386fa21dce8c2e6) --- sys/vm/uma_dbg.c | 62 ++++++++++++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 36 deletions(-) diff --git a/sys/vm/uma_dbg.c b/sys/vm/uma_dbg.c index 36567f3b3968..76dd2bfde2fe 100644 --- a/sys/vm/uma_dbg.c +++ b/sys/vm/uma_dbg.c @@ -53,7 +53,7 @@ #include #include -static const uint32_t uma_junk = 0xdeadc0de; +static const u_long uma_junk = (u_long)0xdeadc0dedeadc0de; /* * Checks an item to make sure it hasn't been overwritten since it was freed, @@ -64,27 +64,20 @@ static const uint32_t uma_junk = 0xdeadc0de; int trash_ctor(void *mem, int size, void *arg, int flags) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) return (0); #endif - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) - if (*p != uma_junk) { -#ifdef INVARIANTS - panic("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); -#else - printf("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); -#endif - return (0); - } + e = p + size / sizeof(*p); + for (; p < e; p++) { + if (__predict_true(*p == uma_junk)) + continue; + panic("Memory modified after free %p(%d) val=%lx @ %p\n", + mem, size, *p, p); + } return (0); } @@ -97,17 +90,15 @@ trash_ctor(void *mem, int size, void *arg, int flags) void trash_dtor(void *mem, int size, void *arg) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) return; #endif - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) + e = p + size / sizeof(*p); + for (; p < e; p++) *p = uma_junk; } @@ -140,8 +131,7 @@ int mtrash_ctor(void *mem, int size, void *arg, int flags) { struct malloc_type **ksp; - uint32_t *p = mem; - int cnt; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) @@ -151,15 +141,16 @@ mtrash_ctor(void *mem, int size, void *arg, int flags) size -= sizeof(struct malloc_type *); ksp = (struct malloc_type **)mem; ksp += size / sizeof(struct malloc_type *); - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) - if (*p != uma_junk) { - printf("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); - panic("Most recently used by %s\n", (*ksp == NULL)? - "none" : (*ksp)->ks_shortdesc); - } + + e = p + size / sizeof(*p); + for (; p < e; p++) { + if (__predict_true(*p == uma_junk)) + continue; + printf("Memory modified after free %p(%d) val=%lx @ %p\n", + mem, size, *p, p); + panic("Most recently used by %s\n", (*ksp == NULL)? + "none" : (*ksp)->ks_shortdesc); + } return (0); } @@ -172,8 +163,7 @@ mtrash_ctor(void *mem, int size, void *arg, int flags) void mtrash_dtor(void *mem, int size, void *arg) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) @@ -181,9 +171,9 @@ mtrash_dtor(void *mem, int size, void *arg) #endif size -= sizeof(struct malloc_type *); - cnt = size / sizeof(uma_junk); - for (p = mem; cnt > 0; cnt--, p++) + e = p + size / sizeof(*p); + for (; p < e; p++) *p = uma_junk; } From nobody Sat Dec 9 02:34:04 2023 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 4SnBsS2fdsz53qwW; Sat, 9 Dec 2023 02:34:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnBsS28GQz3VS5; Sat, 9 Dec 2023 02:34:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702089244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=79im2CKpemJiwV5JMfWuiTfEE6yygEQVOVLa5/G3Uqc=; b=MKN326JRtuJZzOW8Jq7e8FwuiazTrcZH0s6rxr103SdLya1nUOtFB/yw4PAcZ7rWQzZpbu nr/BwkYfS6eovDxbTCvhJ5q1FBG7gmTGO4ALvacYplZ81aV0Dq+qefyLi4O3aOBuXqpv1b QMWGou2ntmMPdjq9l8lAIE3BERrKMGyRGmXy8ZZWRejlMgPFYi5azsAeppURvrlafu+DLL D7vTdRjijXKPPHnO5N4OSBr/qxp61DxaK1maGwRIycvZBsMyFQRbGMX0mWZEzkZLfsvdwe G9TlbnhCoJsta2cvVfGobHZpFgQKVRIaFNPhiuAvggoY/ty+DazW2F5+K83MGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702089244; a=rsa-sha256; cv=none; b=K8yW8VOCIVQptmSOtFWcXrju3Tls/0UOIRWc+1PCevUNnrsnOnBXZQvvR+ccKP16ME0caz sTgjp/1LO3EMTypSULSbpUvrycDYUB0/29VhCVrnkYHakOjFo0rnvwny0vGXCi7fs2zE/L 6vwiljsk/1raKA3o8hPIS8ywuAcoI3U+Fgg94VdczAAdur9f7GjSRHFWGdE2N18vYOxzNJ gk0PnB7/rVsIzFirJDDPNe8JYvKb/05VtbGf+dSjIatVCyIzR9R96bFp88MXko9oAprsSD tdRQQYSjusDK5t54hPDAhMcPYhlAzkR50WhR+JZoMepeNGRs4OO0MPXWAkphAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702089244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=79im2CKpemJiwV5JMfWuiTfEE6yygEQVOVLa5/G3Uqc=; b=Zu4Uyj/iHdRYAB5RD1iA5t4qp0aHTED9vm5yjfgvcfDp+EAMt2YMuQpMG5DWZg9lZXOJ1V ylXlqd1jqhywFVKCoMPoz2SxaDT02+RdK0vN5lDCCvHncuOdfDAz9bsxa09lBdCxxppRrv zMbfWIihBrwNcSRar1efcVsk6HWD3Ei6S6JCmac2azoCsXc5poxbyUWh5Z9wYHHSaOcEjB lH0lVSVCNfo/B7YhMPDDwoi+OKBenMfu1Hv9l1KNsK1hnVvElWx4cb/ewk6jXNpGumdkfB r4Bl5vhrD3btwMd60m0nBV/778NJ5Qd9TReV8a+p/iW7ULJIHEqhDTBYxtSFgQ== 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 4SnBsS1Bkxzm0H; Sat, 9 Dec 2023 02:34:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B92Y4no074836; Sat, 9 Dec 2023 02:34:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B92Y4qV074833; Sat, 9 Dec 2023 02:34:04 GMT (envelope-from git) Date: Sat, 9 Dec 2023 02:34:04 GMT Message-Id: <202312090234.3B92Y4qV074833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: b1d30a83af2b - stable/13 - uma: Micro-optimize memory trashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b1d30a83af2b7e2c58dd674490440d3a948ad75c Auto-Submitted: auto-generated The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=b1d30a83af2b7e2c58dd674490440d3a948ad75c commit b1d30a83af2b7e2c58dd674490440d3a948ad75c Author: Alexander Motin AuthorDate: 2023-11-09 18:07:46 +0000 Commit: Alexander Motin CommitDate: 2023-12-09 02:33:45 +0000 uma: Micro-optimize memory trashing Use u_long for memory accesses instead of uint32_t. On my tests on amd64 this by ~30% reduces time spent in those functions thanks to bigger 64bit accesses. i386 still uses 32bit accesses. MFC after: 1 month (cherry picked from commit 7c566d6cfc7bfb913bad89d87386fa21dce8c2e6) --- sys/vm/uma_dbg.c | 62 ++++++++++++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 36 deletions(-) diff --git a/sys/vm/uma_dbg.c b/sys/vm/uma_dbg.c index 36567f3b3968..76dd2bfde2fe 100644 --- a/sys/vm/uma_dbg.c +++ b/sys/vm/uma_dbg.c @@ -53,7 +53,7 @@ #include #include -static const uint32_t uma_junk = 0xdeadc0de; +static const u_long uma_junk = (u_long)0xdeadc0dedeadc0de; /* * Checks an item to make sure it hasn't been overwritten since it was freed, @@ -64,27 +64,20 @@ static const uint32_t uma_junk = 0xdeadc0de; int trash_ctor(void *mem, int size, void *arg, int flags) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) return (0); #endif - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) - if (*p != uma_junk) { -#ifdef INVARIANTS - panic("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); -#else - printf("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); -#endif - return (0); - } + e = p + size / sizeof(*p); + for (; p < e; p++) { + if (__predict_true(*p == uma_junk)) + continue; + panic("Memory modified after free %p(%d) val=%lx @ %p\n", + mem, size, *p, p); + } return (0); } @@ -97,17 +90,15 @@ trash_ctor(void *mem, int size, void *arg, int flags) void trash_dtor(void *mem, int size, void *arg) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) return; #endif - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) + e = p + size / sizeof(*p); + for (; p < e; p++) *p = uma_junk; } @@ -140,8 +131,7 @@ int mtrash_ctor(void *mem, int size, void *arg, int flags) { struct malloc_type **ksp; - uint32_t *p = mem; - int cnt; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) @@ -151,15 +141,16 @@ mtrash_ctor(void *mem, int size, void *arg, int flags) size -= sizeof(struct malloc_type *); ksp = (struct malloc_type **)mem; ksp += size / sizeof(struct malloc_type *); - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) - if (*p != uma_junk) { - printf("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); - panic("Most recently used by %s\n", (*ksp == NULL)? - "none" : (*ksp)->ks_shortdesc); - } + + e = p + size / sizeof(*p); + for (; p < e; p++) { + if (__predict_true(*p == uma_junk)) + continue; + printf("Memory modified after free %p(%d) val=%lx @ %p\n", + mem, size, *p, p); + panic("Most recently used by %s\n", (*ksp == NULL)? + "none" : (*ksp)->ks_shortdesc); + } return (0); } @@ -172,8 +163,7 @@ mtrash_ctor(void *mem, int size, void *arg, int flags) void mtrash_dtor(void *mem, int size, void *arg) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) @@ -181,9 +171,9 @@ mtrash_dtor(void *mem, int size, void *arg) #endif size -= sizeof(struct malloc_type *); - cnt = size / sizeof(uma_junk); - for (p = mem; cnt > 0; cnt--, p++) + e = p + size / sizeof(*p); + for (; p < e; p++) *p = uma_junk; } From nobody Sat Dec 9 10:45:06 2023 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 4SnPm23QBYz53nDB; Sat, 9 Dec 2023 10:45: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnPm22sjhz4Zd3; Sat, 9 Dec 2023 10:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702118706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iK9a0tMp8gG2Vs+udjPOWTT0Hz0Y377UvRQtjUvrVas=; b=jroVcxaufTzg4ATKjg1cU+FmOIdz3WUgHOFxjCp69sz/NsYz2Y25jWWLBiAV1Od8Ps3Ce0 nTyDLFjyEp9Zr0QTvaMWx8c4fly2SAK1RHCmZoU9N4WRGWkzCcuHHaIf2pqQXeFeQ56IZ9 uKPd71PPm1EUyp0xFN+O3MNbRqcrCZ2pXqtMh/uwMmcHt2Dh1jg+n9T1wYALwYw6dPP4Bx RteCopTrbj/MpzA036cLw5Ivb8ME4cN6F8qHqDv9GTn10qvysp7FYQtw3vTGyWpMh5R5x0 UNdHiNCuawvUP0V/NCAx9LDahNTz0TY5lFFmHjJ/2/SXG2aCpXV0qxqSaqLlQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702118706; a=rsa-sha256; cv=none; b=o1eY3FUFNHX+OouLtLnr3G8PnaxK0sxRg1I8hExns3MZwnEXEL4EFZ5qH9d3mcsQd+f8NA olpsxvC7oNcKlYfIeH3AROvKhHATO91IRwkGE+yL3LYRojeSrXRtb4eve29Zc6hxSvM/Ft 7upCgME3Qgi1/of4i/WCEF8DimmPsG3yleiYxoMtL6v0dXpXqqmwdLSuv3JpiAxrRi5zvu GiQ3NT1OxBq8fgl+X3Huqnj9pVwlCMr7UJscH1Sgk1cw8KMPvtfbXGqbY91LqlgB57r2FN wZg6zShH1Mkr7otSsocjikR9XUxkRzGlTMhp2zXjEENb3MFLOvq5M6bJ9yoPVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702118706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iK9a0tMp8gG2Vs+udjPOWTT0Hz0Y377UvRQtjUvrVas=; b=aL265NBWVB73mXG8tF/xVhtoVKuSOiqlp6fCi4MlQZwWC1Z+AEAl3GaICUR5sp82JuaICs rrjVSZ4ZXwTuzCWvfruWk/BzKzqiznpPnhnczVKpnBqYe9d0N3zDuFBFE6Gip2+YmJ+DxP 7QM+vvJrxw3IXQ++8/HGAZMC1ekQFxKIPp4YmlyCeUjPFyJ0O93Et185hgmdkE+JqqU8WC WC7lLpoZqLYed5J9htNlEtn0hzFtDTNqWscq45XQe20NLtPohYc9ZmVNVVh8ZrM4/0Adjm 0152wRuzCc28baSyk3WAfv7Img+cQ10inXmYXsy2Swp5ntzg8cF3ahSdSigT0g== 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 4SnPm21yZ9z11d9; Sat, 9 Dec 2023 10:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B9Aj6r6095345; Sat, 9 Dec 2023 10:45:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9Aj63I095342; Sat, 9 Dec 2023 10:45:06 GMT (envelope-from git) Date: Sat, 9 Dec 2023 10:45:06 GMT Message-Id: <202312091045.3B9Aj63I095342@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 349407acaf52 - stable/13 - pf tests: test that we validate sequence numbers on TCP RST List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 349407acaf52f0e2481da03cfa9b477e2c7ade30 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=349407acaf52f0e2481da03cfa9b477e2c7ade30 commit 349407acaf52f0e2481da03cfa9b477e2c7ade30 Author: Kristof Provost AuthorDate: 2023-11-29 12:51:39 +0000 Commit: Kristof Provost CommitDate: 2023-12-09 10:43:07 +0000 pf tests: test that we validate sequence numbers on TCP RST MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 4c84c69ba308b7758d07dc8845b13922ed667e02) --- tests/sys/netpfil/common/Makefile | 2 + tests/sys/netpfil/common/pft_rst.py | 39 +++++++++++++ tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/tcp.sh | 109 ++++++++++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+) diff --git a/tests/sys/netpfil/common/Makefile b/tests/sys/netpfil/common/Makefile index f51b89d5eab4..0003aac28779 100644 --- a/tests/sys/netpfil/common/Makefile +++ b/tests/sys/netpfil/common/Makefile @@ -21,11 +21,13 @@ ${PACKAGE}FILES+= \ runner.subr \ pft_icmp_check.py \ pft_ping.py \ + pft_rst.py \ pft_synflood.py \ sniffer.py ${PACKAGE}FILESMODE_pft_icmp_check.py= 0555 ${PACKAGE}FILESMODE_pft_ping.py= 0555 +${PACKAGE}FILESMODE_pft_rst.py= 0555 ${PACKAGE}FILESMODE_pft_synflood.py= 0555 .include diff --git a/tests/sys/netpfil/common/pft_rst.py b/tests/sys/netpfil/common/pft_rst.py new file mode 100644 index 000000000000..28d951e8a047 --- /dev/null +++ b/tests/sys/netpfil/common/pft_rst.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Rubicon Communications, LLC (Netgate) +# +# 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. +# + +import logging +logging.getLogger("scapy").setLevel(logging.CRITICAL) +import math +import scapy.all as sp +import sys + +def send_rst(src_ip, src_port, dst_ip, dst_port): + sp.send(sp.IP(src=src_ip, dst=dst_ip) / + sp.TCP(sport=src_port, dport=dst_port, seq=1, flags="R")) + +send_rst(sys.argv[1], int(sys.argv[2]), sys.argv[3], int(sys.argv[4])) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 6b61155ec40a..ea0d5cb151a2 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -30,6 +30,7 @@ ATF_TESTS_SH+= altq \ syncookie \ synproxy \ table \ + tcp \ tos ATF_TESTS_PYTEST+= frag6.py diff --git a/tests/sys/netpfil/pf/tcp.sh b/tests/sys/netpfil/pf/tcp.sh new file mode 100644 index 000000000000..84536480b44e --- /dev/null +++ b/tests/sys/netpfil/pf/tcp.sh @@ -0,0 +1,109 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Rubicon Communications, LLC (Netgate) +# +# 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. + +. $(atf_get_srcdir)/utils.subr + +common_dir=$(atf_get_srcdir)/../common + +atf_test_case "rst" "cleanup" +rst_head() +{ + atf_set descr 'Check sequence number validation in RST packets' + atf_set require.user root + atf_set require.progs scapy +} + +rst_body() +{ + pft_init + + epair_srv=$(vnet_mkepair) + epair_cl=$(vnet_mkepair) + epair_attack=$(vnet_mkepair) + + br=$(vnet_mkbridge) + ifconfig ${br} addm ${epair_srv}a + ifconfig ${epair_srv}a up + ifconfig ${br} addm ${epair_cl}a + ifconfig ${epair_cl}a up + ifconfig ${br} addm ${epair_attack}a + ifconfig ${epair_attack}a up + ifconfig ${br} up + + vnet_mkjail srv ${epair_srv}b + jexec srv ifconfig ${epair_srv}b 192.0.2.1/24 up + jexec srv ifconfig lo0 inet 127.0.0.1/8 up + + vnet_mkjail cl ${epair_cl}b + jexec cl ifconfig ${epair_cl}b 192.0.2.2/24 up + jexec cl ifconfig lo0 inet 127.0.0.1/8 up + + jexec cl pfctl -e + pft_set_rules cl \ + "pass keep state" + + # Not required, but pf should log the bad RST packet with this set. + jexec cl pfctl -x loud + + vnet_mkjail attack ${epair_attack}b + jexec attack ifconfig ${epair_attack}b 192.0.2.3/24 up + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec cl ping -c 1 192.0.2.1 + + echo "bar" | jexec srv nc -l 1234 & + # Allow server time to start + sleep 1 + + echo "foo" | jexec cl nc -p 4321 192.0.2.1 1234 & + # Allow connection time to set up + sleep 1 + + # Connection should be established now + atf_check -s exit:0 -e ignore \ + -o match:"ESTABLISHED:ESTABLISHED" \ + jexec cl pfctl -ss -v + + # Now insert a fake RST + atf_check -s exit:0 -o ignore \ + jexec attack ${common_dir}/pft_rst.py 192.0.2.1 1234 192.0.2.2 4321 + + # Connection should remain established + atf_check -s exit:0 -e ignore \ + -o match:"ESTABLISHED:ESTABLISHED" \ + jexec cl pfctl -ss -v +} + +rst_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "rst" +} From nobody Sat Dec 9 10:45:06 2023 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 4SnPm30Ns4z53n4v; Sat, 9 Dec 2023 10:45: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnPm26VcLz4ZH1; Sat, 9 Dec 2023 10:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702118706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MVzLu1m9o5S8cl747WGnj+FY4QWhtd74UmnBTXQj+N8=; b=HeBTj5l3/4IXiaQvbl1sbo1TAoD6VQdnMUxe0LkbYjmE8/GIseq2jbb1fN5ZYJAHKBZvY3 lJDbXBzRd6MCI8+Tkoj0lkH5Gtgj+MUEdEZtHxXq22AN4j28HmDmmASgVII3RQwBkjPA5x tkNyrBCImu26bgfEl8mTD708vCgN8qvtvqtb/E6Y6JeCbEZwvSumEYYLf8h9yBI/zPm7/v 2lJ0UBzII2XqyP0cFhm0+AFEjGPu52ANhnNFGvBPwQdwBIB3Ibn6+adk3yzMhrevpMU13m SKrMnyVpZ7T/V9pkFZeC9DSFPU1YD993EDf+r2aRRo7EqF1+X/Pq9xHrixZRpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702118706; a=rsa-sha256; cv=none; b=CVGwadAslv44eMKZbg8wZbX6uliJr1bdCjyH/bzLdEEJK+Mh3YrPH6N2wma8T78MRiPZcd RM9qj1SWAlssMDElezF/aRa5tt/aD3fOL5U9oE6ljSpElCZdLb7lpjOTIZ7+N8wAdMYHZ2 IsCxNBezHtIAZT0MNYjQhIvDNwTDJ4jlYWwK6GXOhSkH7A9mdMIBiDXasYj+7UF1HGotwe O61xlhQXVIGvJjep0DyU/DSSTqobAMtIBQgeb+viHFGx3YH+IoEflNyqmCGX/19Dnxje46 eDpRKQ48+wlswx8s4VimHnWUaF9J8cCz2Qw/O8UW4Iv01aUfMXloWMkDsoFTow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702118706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MVzLu1m9o5S8cl747WGnj+FY4QWhtd74UmnBTXQj+N8=; b=P72fwZtqdFlW3hKubLhxvy0zSPdLg2Vzw7HmKsld5sbvQZglNqqEY5p5vckNAnTb3jIWEl zN14SOFvEtgB33QAM13ZmNU21eFhSndB5ELYAVVS+IBrfB/tIQJXesxSiJEz9G6HKEmfls qHrgktJ4PuqXeSGt8H92xIz6BzeuCjpoukMvwr856SL1d0M8NjdFE9INyoqSx7fIbojIdV Tjq5nuOOv8lDGv8ACfd1mRUet7OPrNY3/+VGh864/lmJzj+2KHjhkDPfw7eGoIn/TGm3yq Xb/7OKCGCRVHbJefHNz6+DrpDIG5r7sZORSnJ9rYUkAR+MVBuqj5F9W5Lz6y0g== 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 4SnPm25YQnz114t; Sat, 9 Dec 2023 10:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B9Aj6hk095460; Sat, 9 Dec 2023 10:45:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9Aj6Eh095457; Sat, 9 Dec 2023 10:45:06 GMT (envelope-from git) Date: Sat, 9 Dec 2023 10:45:06 GMT Message-Id: <202312091045.3B9Aj6Eh095457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 2c5e87862c80 - stable/14 - pf tests: test that we validate sequence numbers on TCP RST List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c5e87862c8077ec88f6aaf19453daca5e3278a7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2c5e87862c8077ec88f6aaf19453daca5e3278a7 commit 2c5e87862c8077ec88f6aaf19453daca5e3278a7 Author: Kristof Provost AuthorDate: 2023-11-29 12:51:39 +0000 Commit: Kristof Provost CommitDate: 2023-12-09 10:43:11 +0000 pf tests: test that we validate sequence numbers on TCP RST MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 4c84c69ba308b7758d07dc8845b13922ed667e02) --- tests/sys/netpfil/common/Makefile | 2 + tests/sys/netpfil/common/pft_rst.py | 39 +++++++++++++ tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/tcp.sh | 109 ++++++++++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+) diff --git a/tests/sys/netpfil/common/Makefile b/tests/sys/netpfil/common/Makefile index f51b89d5eab4..0003aac28779 100644 --- a/tests/sys/netpfil/common/Makefile +++ b/tests/sys/netpfil/common/Makefile @@ -21,11 +21,13 @@ ${PACKAGE}FILES+= \ runner.subr \ pft_icmp_check.py \ pft_ping.py \ + pft_rst.py \ pft_synflood.py \ sniffer.py ${PACKAGE}FILESMODE_pft_icmp_check.py= 0555 ${PACKAGE}FILESMODE_pft_ping.py= 0555 +${PACKAGE}FILESMODE_pft_rst.py= 0555 ${PACKAGE}FILESMODE_pft_synflood.py= 0555 .include diff --git a/tests/sys/netpfil/common/pft_rst.py b/tests/sys/netpfil/common/pft_rst.py new file mode 100644 index 000000000000..28d951e8a047 --- /dev/null +++ b/tests/sys/netpfil/common/pft_rst.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Rubicon Communications, LLC (Netgate) +# +# 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. +# + +import logging +logging.getLogger("scapy").setLevel(logging.CRITICAL) +import math +import scapy.all as sp +import sys + +def send_rst(src_ip, src_port, dst_ip, dst_port): + sp.send(sp.IP(src=src_ip, dst=dst_ip) / + sp.TCP(sport=src_port, dport=dst_port, seq=1, flags="R")) + +send_rst(sys.argv[1], int(sys.argv[2]), sys.argv[3], int(sys.argv[4])) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index c9adab5626d4..d3b187789685 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -39,6 +39,7 @@ ATF_TESTS_SH+= altq \ syncookie \ synproxy \ table \ + tcp \ tos ATF_TESTS_PYTEST+= frag6.py diff --git a/tests/sys/netpfil/pf/tcp.sh b/tests/sys/netpfil/pf/tcp.sh new file mode 100644 index 000000000000..84536480b44e --- /dev/null +++ b/tests/sys/netpfil/pf/tcp.sh @@ -0,0 +1,109 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Rubicon Communications, LLC (Netgate) +# +# 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. + +. $(atf_get_srcdir)/utils.subr + +common_dir=$(atf_get_srcdir)/../common + +atf_test_case "rst" "cleanup" +rst_head() +{ + atf_set descr 'Check sequence number validation in RST packets' + atf_set require.user root + atf_set require.progs scapy +} + +rst_body() +{ + pft_init + + epair_srv=$(vnet_mkepair) + epair_cl=$(vnet_mkepair) + epair_attack=$(vnet_mkepair) + + br=$(vnet_mkbridge) + ifconfig ${br} addm ${epair_srv}a + ifconfig ${epair_srv}a up + ifconfig ${br} addm ${epair_cl}a + ifconfig ${epair_cl}a up + ifconfig ${br} addm ${epair_attack}a + ifconfig ${epair_attack}a up + ifconfig ${br} up + + vnet_mkjail srv ${epair_srv}b + jexec srv ifconfig ${epair_srv}b 192.0.2.1/24 up + jexec srv ifconfig lo0 inet 127.0.0.1/8 up + + vnet_mkjail cl ${epair_cl}b + jexec cl ifconfig ${epair_cl}b 192.0.2.2/24 up + jexec cl ifconfig lo0 inet 127.0.0.1/8 up + + jexec cl pfctl -e + pft_set_rules cl \ + "pass keep state" + + # Not required, but pf should log the bad RST packet with this set. + jexec cl pfctl -x loud + + vnet_mkjail attack ${epair_attack}b + jexec attack ifconfig ${epair_attack}b 192.0.2.3/24 up + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec cl ping -c 1 192.0.2.1 + + echo "bar" | jexec srv nc -l 1234 & + # Allow server time to start + sleep 1 + + echo "foo" | jexec cl nc -p 4321 192.0.2.1 1234 & + # Allow connection time to set up + sleep 1 + + # Connection should be established now + atf_check -s exit:0 -e ignore \ + -o match:"ESTABLISHED:ESTABLISHED" \ + jexec cl pfctl -ss -v + + # Now insert a fake RST + atf_check -s exit:0 -o ignore \ + jexec attack ${common_dir}/pft_rst.py 192.0.2.1 1234 192.0.2.2 4321 + + # Connection should remain established + atf_check -s exit:0 -e ignore \ + -o match:"ESTABLISHED:ESTABLISHED" \ + jexec cl pfctl -ss -v +} + +rst_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "rst" +} From nobody Sat Dec 9 11:21:21 2023 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 4SnQYt2T2gz53qtC; Sat, 9 Dec 2023 11:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnQYt1Kg2z4ddG; Sat, 9 Dec 2023 11:21:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702120882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dzh5zQI5kFonZSgJcpaATzjZ4bbzqVL1k/8oHLHez5A=; b=A1/MDNG70nCCbOjSddwe1RMlegBWXEfoY8zDDZOIg5iGaBmFF+WYMns/ex0w+ILR2Wa0T6 pieaWsw2OPgp7F6/222V4/b/aMzXc4KP0rZs/HEQjAmudlQQGRYE3NH53tFhgXuhMua249 Oimus4EvkVEisMaVqZIRqBLWpu3ielESHhGlRxI2TYtWZ/+onxjGIk8c+IcYGTM4e5YATN /VpMniFWHN6txK8mQ9281xsxGT/1mICcyl5AIiEe5Vb9MfBsPf+QWiAe2qPEJEoN+vmkVo ++yJCyWyblMkGrkuKjvRNSqBGtn62TEzg1pfQsp7CGwZgUgMGusp+jK2T8v8Rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702120882; a=rsa-sha256; cv=none; b=LxtdfEqVDURTj3BIQ16F5slwva4lBGKN7oGqjHx15UU+oQrhzRaf8tTZ2CZ49X/dIbwTYa hXWqdOQ/DKvCJPx8nIGr60AJllDSrC+0SGwmczYCzshQomXjfVo+aHUlAyT8CYjGFTjdFc 7GgVFAFPYwkUeYMN/7m4AI7RfhYhxKahpbZ5ucbAHs8n9tbJ7VF58oyERUuzjmlEWp1dVb ELhHyw04TJlrkasq4L1bOu2Ogmc6nhNA8Ue0Ah6w3LTnAk1q+pG+wudfEzO5ikMMpdYkz/ 8H4Gq5ja2wGI7bVqgoomt0PTcByEQCLe/y2pyQzCcXQjlR2oJlDPhpylRmWN2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702120882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dzh5zQI5kFonZSgJcpaATzjZ4bbzqVL1k/8oHLHez5A=; b=lwQnacVG7gc7wglmWMDQ4lFdyJGwyTKaoyblgMr3VKLPegiZ8IJkJuw/lzpqXQHvzjSYkQ Oytw0HICWMZV990DwjczjhfqigAD9/KxzampMYxmn/CopOYy+IVf3BzndemSpgZhlUhxjB c/IERYQ1oXUWbZGhVX0mRNT74H0ON36v8xeFi1szijCfFDtWpmdnL1gfbjSnM0ZwTmEcRA dy4A+NGIRfhIhsPfKTnarG9osjtvzeRdQVIemn84vMzsaK/hgtnkb0CHLHN3kSw9CiBb4q j69zvxxQqWz+crmOjmmxvoBczHVnKNjGYZtzhRHpZz0rJyzhZ79NH+3yc9Lm2Q== 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 4SnQYt0N40z134G; Sat, 9 Dec 2023 11:21:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B9BLLqX060215; Sat, 9 Dec 2023 11:21:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9BLL0K060212; Sat, 9 Dec 2023 11:21:21 GMT (envelope-from git) Date: Sat, 9 Dec 2023 11:21:21 GMT Message-Id: <202312091121.3B9BLL0K060212@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 0fb9d5786bff - main - pkgbase: Move tr(1) to runtime List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fb9d5786bff57a7d5b2056fdbc1baaec9406885 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0fb9d5786bff57a7d5b2056fdbc1baaec9406885 commit 0fb9d5786bff57a7d5b2056fdbc1baaec9406885 Author: Emmanuel Vadot AuthorDate: 2023-11-27 14:35:32 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-09 11:21:02 +0000 pkgbase: Move tr(1) to runtime Since f7d16a627efa ("certctl: Convert line endings before inspecting files.") certctl is using tr(1). Add it to FreeBSD-runtime so we can have certctl working without having the bloated FreeBSD-utilities. Sponsored by: Beckhoff Automation GmbH & Co. KG --- usr.bin/tr/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile index bc220aaae381..17b633a7827b 100644 --- a/usr.bin/tr/Makefile +++ b/usr.bin/tr/Makefile @@ -1,6 +1,7 @@ .include +PACKAGE= runtime PROG= tr SRCS= cmap.c cset.c str.c tr.c From nobody Sat Dec 9 11:52:12 2023 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 4SnRFT0f7gz53sr9; Sat, 9 Dec 2023 11:52: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnRFT09Mgz3DB5; Sat, 9 Dec 2023 11:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702122733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WlQnxmUrUC1QrFCtk4CbVvdEReJblbWZrL5dh/T4hrA=; b=m2ElHEsEKUdOHPw/D+MpjifPnlBNR+BkgpWHkZ3MNNBsnMnCMwIVM7u5Ez2WKSp9jJDttX c1jHCPO9QtOcnH+QIcX+Sr4EG+dWxLfMKPgwA8zzduqSvCd74bublXl0z5C8tMkbIwwF/7 fJHY7TO1XrSMpqbzzaCimkMlxGjLdTl97jZUylox7Zvj4XvbrX1AUjTsh8k8aJPXVfbPmT Vk9xEXtFjWrP7GQw9usZhFWfDlliIIUDVV8b84aEAmJ5gwvHT6+zE7yigb6Vzi7If2FLvb 90E7JoJXX3KhRcskXyfgzP/vwgcsxxEA3tO4kiBn0jzJLsroU8WTYYo/hhAVXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702122733; a=rsa-sha256; cv=none; b=jOCzY04f5kV4ePaCKBk3Zv8veijuTdBSbgvEadmZq7xFCMM1c7E/pKVrakNMSULXGFWXsF 5aaflsHjvTZidP+EJsYtUOfa0PDuWjoL3ZhxbyxAbrl7SO6GhdFrdYvPlh30VTguXhm34W ZMvCb7ruV3p0/POtghr207y6XQB2XvaXkai7WUzucK9olJBEztl0PKKgwesKU0VFBa91EL 1Lou1VNJqo/krBvCg1fkEsZmrCpG8yed+Hkojv8s1qbYbsqpNM5ZbhaHQYZEF/zm9wfJsy Yv/ZydAD7232PKZBOZqFPxIb3HBgFtrRZKMr8vuVZuVvXNIvVY8HvWiKQA7obQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702122733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WlQnxmUrUC1QrFCtk4CbVvdEReJblbWZrL5dh/T4hrA=; b=k4uOHdO3LZGYlj7J47KYN86qw/d4XH2aJhMN6r82Ec/eAdDVH20xoj4vaakje+aF3Qvdu4 9lIiNTX9UlLK657KI9eSbCLzZuN7qzJlgaPTyTT/faBGlZtOm1u7YJxvaoAXF1UkH10ymk sv/8HTnKixqWmE3r58R38qj1jxjgVjIyKEs/32j+QjS2H5O1ggNhkGXoWmBMW0izh8eZB+ 1TJYaR/BvXRRx4af5XA+MRKtHdZG18x8/whzyQ0TzMzqE3dj+JkQaz2z1MMbIb7kZs66S+ mpykvVJ5sP2EVBwuUxVjSa6pWKwrF2EbAXVuOfJ+Ur6arVMuwVtquPihJjffUg== 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 4SnRFS6LVMz13lW; Sat, 9 Dec 2023 11:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B9BqCuI012817; Sat, 9 Dec 2023 11:52:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9BqCjR012814; Sat, 9 Dec 2023 11:52:12 GMT (envelope-from git) Date: Sat, 9 Dec 2023 11:52:12 GMT Message-Id: <202312091152.3B9BqCjR012814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 1a4a9a50574d - main - libicp_rescue: unbreak for armv6 after recent OpenZFS import List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 1a4a9a50574d9b4b4db90a85bc253d340c93a8a0 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1a4a9a50574d9b4b4db90a85bc253d340c93a8a0 commit 1a4a9a50574d9b4b4db90a85bc253d340c93a8a0 Author: Dimitry Andric AuthorDate: 2023-12-09 11:51:50 +0000 Commit: Dimitry Andric CommitDate: 2023-12-09 11:51:50 +0000 libicp_rescue: unbreak for armv6 after recent OpenZFS import Similar to fb17dfa0c83c, fix libicp_rescue to include asm versions of sha2 on armv6, to unbreak the build of rescue. Fixes: 3494f7c019fc --- cddl/lib/libicp_rescue/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile index e129a2f3e0f9..cb2c868e2bc1 100644 --- a/cddl/lib/libicp_rescue/Makefile +++ b/cddl/lib/libicp_rescue/Makefile @@ -20,7 +20,7 @@ ASM_SOURCES_AS = \ asm-x86_64/blake3/blake3_sse41.S CFLAGS+= -D__amd64 -D_SYS_STACK_H -.elif ${MACHINE_ARCH} == "armv7" +.elif ${MACHINE_ARCH} == "armv6" || ${MACHINE_ARCH} == "armv7" ASM_SOURCES_C = ASM_SOURCES_AS = \ asm-arm/sha2/sha256-armv7.S \ From nobody Sat Dec 9 12:03:58 2023 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 4SnRW22sBVz53tb5; Sat, 9 Dec 2023 12:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnRW22FK4z3F7x; Sat, 9 Dec 2023 12:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702123438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZgCPNv/ssM954tE7XWNlOOkNU+xWBpvem6STelGNjYc=; b=M+ud4sss7W5vPqRTMO5BSsB0tz5DF9aQ+4Q/CYikq8OMQwG4u3O/qC1BDQBUA+YfgwDLEm jexO4NrkIgP28km6Z5aFSUpi4oPVSTgl7RaWp/ZN3sRWsZNboDvk514LPO450R4Edo9Zjd fFpBiIXNzTQbgthX60pD5XHj1sSQu6EXacx/N0QhpdDz1w0qIqaUEbzpgxznAAsD8Dqw+c sZR7tAyEaofvpMln1ABlikWNE/hVaMxEjcKmPZSeNViGvfB5BHmUQ1PTair1OmkffzIrct CzTx33g3PYpZcImhRR19STqbZkcuBssWktet1dxUfcmnCHx/hksv/LE1ThtkzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702123438; a=rsa-sha256; cv=none; b=mK6g78NUzMNwpQhp0wQeHstF3kYunHPiJ2xewOA0lxGIbstby2ejDRlSDc1ISwykZNFcst gspBR3emP4jiCJSfkzzbTYGRAOkTCKIfy05h+gR85OzbaI5s3Us6uW+yhvdL/A0M+bekkr 4CR2mSChUDAKvT7EUPnR/srU54hzde0Kuw/TXNzyvi7TrEKCeUmOODGGQS3kCT3FCWfv08 0U7cyF7LusCZsf6fGL1RYYQFidw4+RfuXFxRyKHZ20VB0Lud5nuEFze95f2yIBHwNVKz7C dqQuK/F++OffC2U4yngo8FDw8tNDwiuhUyPJ9QX7dHbloILDQ9l4kBj+RFlFeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702123438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZgCPNv/ssM954tE7XWNlOOkNU+xWBpvem6STelGNjYc=; b=pmqJoPrTUWQ/9DaPgPQImqfXDxPMV4IYPcXnEH9dsnfGgNDzQt18DaE6GDdrMD4ePll8X3 llSvC/tr56zBUoFqXt5utoC/SX7KS1leOq6MWHB5ATOBQwGqEYafUcmnswFjCPHs9Ny47C dC24WkzHWzvMDo/Ip3L2c47AcbZ6mJCzUZQJ8K6obEQggHA/IouNSpSxIhOFVm2CM68/a3 lMCmP8wzMOdGkKBVIjyV+nvfYlJ+idvPG1UqCsOdQsRm53IcdCoLWyakyoTNJymG/hhhzo kuZW3cM3y2EA2+QGHr6gUioi+7MUhoZM20Ii9S4GpugC3VGDOWxtUpgFEopE1Q== 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 4SnRW21HjJz13mP; Sat, 9 Dec 2023 12:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B9C3wal030534; Sat, 9 Dec 2023 12:03:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9C3wxj030531; Sat, 9 Dec 2023 12:03:58 GMT (envelope-from git) Date: Sat, 9 Dec 2023 12:03:58 GMT Message-Id: <202312091203.3B9C3wxj030531@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: bed7633b1089 - main - tcp: tcp: allow SOL_SOCKET-level socket options via sysctl interface List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bed7633b108930e9e9d2478c75556035938d4e88 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bed7633b108930e9e9d2478c75556035938d4e88 commit bed7633b108930e9e9d2478c75556035938d4e88 Author: Michael Tuexen AuthorDate: 2023-12-09 11:57:19 +0000 Commit: Michael Tuexen CommitDate: 2023-12-09 12:03:51 +0000 tcp: tcp: allow SOL_SOCKET-level socket options via sysctl interface When using the sysctl interface for setting a SOL_SOCKET-level socket option, the TCP handler refers to the IP handler, which only handles SO_SETFIB and SO_MAX_PACING_RATE. So call sosetopt(), which handles all SOL_SOCKET-level options. Then you can use tcpsso with SOL_SOCKET-level socket options as expected. Reported by: rscheff Reviewed by: glebius, rscheff MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D42985 --- sys/netinet/in_pcb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 797c0dc445dd..0d763184f68c 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2984,7 +2984,11 @@ sysctl_setsockopt(SYSCTL_HANDLER_ARGS, struct inpcbinfo *pcbinfo, so = inp->inp_socket; KASSERT(so != NULL, ("inp_socket == NULL")); soref(so); - error = (*ctloutput_set)(inp, &sopt); + if (params->sop_level == SOL_SOCKET) { + INP_WUNLOCK(inp); + error = sosetopt(so, &sopt); + } else + error = (*ctloutput_set)(inp, &sopt); sorele(so); break; } From nobody Sat Dec 9 13:37:37 2023 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 4SnTb61Hkpz541vn for ; Sat, 9 Dec 2023 13:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnTb60jJ5z3Qqn; Sat, 9 Dec 2023 13:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702129058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hG5UrXHwwF5AoHhTvgzoyNnGsV+mQxCYjEgwdQNBxD8=; b=tbXI9/hsTIhuIY0XrjYO3VTdTjFXqNZrfQIB9YIUISp5/s4ZM6M8uaUQ9Qo+nWCZa8r8LI CSx5Qp/aoDZqyf4DGVVdtJf5oFB7pHgwh3IOuNEonatvdAn1r+88AStwnavsRstSSCVxwf DeuKcXEbtvaRKdrjETo8o9RY+XvLff3DrvP4MVlXo1LAxI8nBy12rO/e3oF/3COlbIYKWq 0oxU6RvWPoRJgGZr9iX11QHBdYmjbmX5vIF+bXsnxyzIo+GxVuLttXMPKd+tHoElBx+68P j/1s50SPC49jhhE+ii7t9xUQT8p420sRuW5QV9JWv4fau5MhKr9kE89EQEuOkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702129058; a=rsa-sha256; cv=none; b=VtISk/BwV8PtE4BTHgKCkL2o4XF07agjMW057E1fIc+cUZBHOC0EedRZXge7L0jJdij63G 08DS5VOIbWKBpnjtwvw8PSrlZxWM0mfjNffocy15GrIIUEPJG7vDuUsmfwUcrAWG/cO6xh tEmHJsfveliKhMnNWnpaENp3TpWnMqGrYajmiOStAVmZs8hMiLYFYsJa6gKqinU2TEJcb3 dUm6qR0gzjFHQCwCxNQRe5LftjGejl5VanHZfbZ+iFeZT8mRF8znxEkdvEpYdxCJyN0l3D y+gl51RRhxcAQ4NxbIhzqAbncFQVQwnZPI6hXm+Ko1THFdxqjnH4vlowsy2q9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702129058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hG5UrXHwwF5AoHhTvgzoyNnGsV+mQxCYjEgwdQNBxD8=; b=d3q5OmYcFjvT8GO+afWAnAFRXuBDQiQLl3eMqQvqzSkDAkcVzM5T3nNSjg8mQBDR2sEmvw 7rjCNtw+hy3gaXBjNfwB3lnebGH4bxM3CCDB8tzf2jAsl2IrncgD2eu10hRlAsfo1QGuF+ 2XmkIwjjzQkm2x5F4BG9dGYexLHUPwE9vgxtAw3OPuqdqT5pVqdk3oF854EYW7jXVYyilg E3Van00oCJLIQClS27FfkJKT3/wDh4IWV4Ptwsq8BckmitLMLn34BVBShFWT7QeXP3csdj Bw9qJNIFr/XxMWpLBswOT1spSY5+2jpA/hABXr+yFd3bhCSMMUsxso8MJbPGIg== 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 4SnTb56b2wz1659; Sat, 9 Dec 2023 13:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B9DbbMJ081742; Sat, 9 Dec 2023 13:37:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9DbbJE081741; Sat, 9 Dec 2023 13:37:37 GMT (envelope-from git) Date: Sat, 9 Dec 2023 13:37:37 GMT Message-Id: <202312091337.3B9DbbJE081741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: 7fa27ce4a07f..b1c73532ee89 - vendor/llvm-project/main - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/vendor/llvm-project/main X-Git-Reftype: branch X-Git-Commit: b1c73532ee8997fe5dfbeb7d223027bdf99758a0 X-Git-Oldrev: 7fa27ce4a07f19b07799a767fc29416f3b625afb X-Git-Newrev: b1c73532ee8997fe5dfbeb7d223027bdf99758a0 Auto-Submitted: auto-generated The branch vendor/llvm-project/main has been updated by dim: URL: https://cgit.FreeBSD.org/src/log/?id=7fa27ce4a07f..b1c73532ee89 b1c73532ee89 Vendor import of llvm-project main llvmorg-18-init-14265-ga17671084db1. From nobody Sat Dec 9 13:37:37 2023 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 4SnTb61xDcz541yR for ; Sat, 9 Dec 2023 13:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnTb61RL8z3Qwq; Sat, 9 Dec 2023 13:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702129058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xs4OlvgW2ls5+dOUbBvUaMlNiGLSpzue33cuX7Vjm80=; b=OddPLy6lBj05bsS3t/Accam8oHpbZmdFX2t7jHbeNi7IBaKXMYGBbyucwS3pjmP0rz/JV3 vSmOXH422ip3CsaaJPmKrSXLC+PR9L7aUHO3qUgrk/GbBBVrEL/WceQUKQfAJAZnbdb4Xc 7csrJ13nAIsyfJ7jF6WL+JU9h499MWGicM0HRndfraTYrPZdtNpr7KrOD4eIqMytZwuyNf GeeVrS4kkEMg2Fpp3pWstFnmcsMB7zXQvjnZcb/e3Mr3XHBAXELFbqraWqz+XhHw6LJWWC oHLoXduVU0FZzB+eL0xpeEfk7/JX2hK/rap7lEg8ZZa4XxofzZ2yjVxNGxzNkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702129058; a=rsa-sha256; cv=none; b=H98Gb8UP1WcTqZA9BhcSRnLkEO4IZRL4YCcxPVAT1dxOwfJCl+xUQWqdEodSGfEtNEx/HS 84kKqTJr7rU0TBPTC+Duh4SzQ+FEvIWiRo99LZprZPP711fSBtnaEKoyt58+4BlzioiEy+ aWKNFfk7H+o6qtsZl5LVS6hIVxvBy0X3h6Fa/ELltBGqknS49At8ATXphcu/4Iwp778nIp urwWie6FAcvuiQYcByQOs/X7X4eyTtz1xENuJIATi2v1Jg1L/4JxcBIwbIpMhGtsGHbXpI TcrchtxkfArUzIuf20gpcfid43nBRju42fRWBhr9EXvFwOzsjIc08tDl39q4sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702129058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xs4OlvgW2ls5+dOUbBvUaMlNiGLSpzue33cuX7Vjm80=; b=SEhvEY0tWzfGmLOkJFgokABIZW5cGPx9uVZUaUHis3ExPHWJLyB2+D5dmNOP0vZisfOkJ6 mO+REty48OBp87ccPClyu08y2wuBNjPh1BpkcHRqa1aSTsqZbDpttD65a3YCCTTC8nS1fx h8iF3YfdeKqgUecLOr2+yE1NgAjN2DK0DiPpao7OUqlXnGpUbrNz4AZRFEOvyJ4LZB0Bsu dnNIVTgc1k6xPW+B1s8TV880WjKC+wKcaPnfwbODwtyxClJGpc3fRGGBc54y57/JH+TIEV fz5SbTACtm0kksuCQnZ5am2OXa1XHomtNuepvYKdkaHBT+iAkOpDIsRoaVM4EA== 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 4SnTb60TzHz160G; Sat, 9 Dec 2023 13:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B9Dbb1n081761; Sat, 9 Dec 2023 13:37:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9DbbMa081760; Sat, 9 Dec 2023 13:37:37 GMT (envelope-from git) Date: Sat, 9 Dec 2023 13:37:37 GMT Message-Id: <202312091337.3B9DbbMa081760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: 6692f6a21dbc - Create tag vendor/llvm-project/llvmorg-18-init-14265-ga17671084db1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/tags/vendor/llvm-project/llvmorg-18-init-14265-ga17671084db1 X-Git-Reftype: annotated tag X-Git-Commit: 6692f6a21dbc2a0d8f54a4c16e0df68446208739 Auto-Submitted: auto-generated The annotated tag vendor/llvm-project/llvmorg-18-init-14265-ga17671084db1 has been created by dim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/llvm-project/llvmorg-18-init-14265-ga17671084db1 tag vendor/llvm-project/llvmorg-18-init-14265-ga17671084db1 Tagger: Dimitry Andric TaggerDate: 2023-12-09 13:30:43 +0000 Tag llvm-project main llvmorg-18-init-14265-ga17671084db1. commit b1c73532ee8997fe5dfbeb7d223027bdf99758a0 Author: Dimitry Andric AuthorDate: 2023-12-09 13:28:42 +0000 Commit: Dimitry Andric CommitDate: 2023-12-09 13:28:42 +0000 Vendor import of llvm-project main llvmorg-18-init-14265-ga17671084db1. From nobody Sat Dec 9 15:12:24 2023 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 4SnWhS4rRzz547r0; Sat, 9 Dec 2023 15:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnWhS4PsQz3Yq9; Sat, 9 Dec 2023 15:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702134744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nD0bONFtOI67FwY5ILMmESkxXBuQQW1UE4BqvUgpqJc=; b=Ufv1z7DrCfwxvWKFgHIpBEoaeoPmqS0kNg1mnPpwsOjuzRe/m42GNUnj6ZVFb6hMLMWP06 hFZPTK5zI5jOlkRsOlz2Ys97wnUk3D9ZLd0NTFAdF4O4oGeeb6oA16qS0qhmjqoLXlQhKB rVADVfNFS7lpwgO/MdlFlRKFSNr4rnx1fHpaZzMSLri1mlWldpbblzRYbTkUGz43ui9xQI e31BUS0UHindQp6zmZm3CPWlegKRzp0N39xfd7r03PfsCVzukV0BVmQpUKL0glNkSeFUI6 9Rb9kunxSBSI+rxgRqFb/STO1gLUeEC7UhXl4wUfCn1QHqrd/iE8YN9n/j2fsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702134744; a=rsa-sha256; cv=none; b=xbS7JZL+B+T8NHKFMX6VxWQc8FkIa5hDQwW/M7iLa3GKirzkVgaYMY/p0bDlNBQCD7Uje1 PveJ8Oqf++yWPar5/JZCB6PNPlUy1K7jYLk93hmcqaXjkJMP7Mc+U3bP2qUnYmPeG7LNP+ +iBafpLRXZE7WAlXFumAH0mqWT9x64P9RfNz3EoWSGT2zvzZdYKAbX+kqh23CsBx7W42/W JYr5tg1skuKHFrftXZwGgReXRNQQLYJ5/30nYDPvHWttGf+09tEXDoj1ps+psve+ltGeC0 Hj0N9xaieg9quxVpWT57V9s0PwEQHVJ5buPkU4X0mhNwZomvO3OV4UsxDmBoyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702134744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nD0bONFtOI67FwY5ILMmESkxXBuQQW1UE4BqvUgpqJc=; b=BpRBjhaR1xVyValuFWDOWsyboLITxNIzswC1nhhgIGPOn3X/4rFZoV6HjrViXAwIWEbxll dHkieUWWcNu7r3O2qzTOx0C3ZwCc8o7OgxzOu0XVMOCEZXboDKbEfCSlfbtCuHsYv1xLBN tkXBw0BfjG8dzNN7pdgSHkGDuIWTYBRhWuVqJr/826AVsW8hx3lyJMbXIKCty4eeVCVmwh E0A6KpWunBM6pISxLoWjExbvwl1/3zLOQtRmlm1hsgod55uNwGtAV3uzPF4tSiREAhZeBj zxzqy0N9HRoCaDw6IPpMIPPFHm1/UlwPjpxROGJbTzygxJyQtf5h15SNJ5LoDg== 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 4SnWhS3VG8z18PW; Sat, 9 Dec 2023 15:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B9FCOum047450; Sat, 9 Dec 2023 15:12:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9FCOku047447; Sat, 9 Dec 2023 15:12:24 GMT (envelope-from git) Date: Sat, 9 Dec 2023 15:12:24 GMT Message-Id: <202312091512.3B9FCOku047447@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: 1c376684c744 - main - Cirrus-CI: Use HTTPS to fetch pkg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1c376684c7441a90e64f082c19e3da7942716ad1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1c376684c7441a90e64f082c19e3da7942716ad1 commit 1c376684c7441a90e64f082c19e3da7942716ad1 Author: Mark Johnston AuthorDate: 2023-12-08 21:33:01 +0000 Commit: Mark Johnston CommitDate: 2023-12-09 15:12:04 +0000 Cirrus-CI: Use HTTPS to fetch pkg Discussed with: Jose Luis Duran Fixes: 3c097b06a717 ("Cirrus-CI: forcably upgrade pkg to latest") --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 85853d2a62ea..bcb6b411847e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -94,7 +94,7 @@ task: - sh .cirrus-ci/pkg-install.sh ${TOOLCHAIN_PKG} git-lite xxx_upgrade_pkg_script: - - fetch http://pkg.freebsd.org/FreeBSD:13:amd64/latest/All/pkg-1.20.9.pkg + - fetch https://pkg.freebsd.org/FreeBSD:13:amd64/latest/All/pkg-1.20.9.pkg - pkg install -y ./pkg-1.20.9.pkg - rm -f pkg-1.20.9.pkg From nobody Sat Dec 9 16:10:37 2023 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 4SnXzd4tz6z54Ccq; Sat, 9 Dec 2023 16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnXzd4RBcz3fvm; Sat, 9 Dec 2023 16: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=1702138237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XThfI6lEpOVMrho+HG1FfH1uptRQBpj1v0JRtnz6578=; b=QH7WumVoNOhel8xAmhUKoBzD6Op+FpNhG7F1SblLSLsutRam7un+luvvoI95qxIVJJYow8 b/TYaN76IDy3twVv5u1t+1CII0eDSUWR/J6VQs4ViKApBpVqeDYTN3Ld7aRT3bMMHWPQ8W IYtEYJKZO98Dc8qoC5G4DOeKp/n2frCV+q0qcMB6jzvmWTfuUHhCK9NQAY3wbL8sFy6sVb cqAz0WrmqiFDFzFqY7RMmWC1K/5PoNlESdaQenYoZxPZ+wFfE2hPJQMTASHgh4UDGbzvYc QD2xEkpIIrYllwGsXllA6qhRr7WuhcOCczuaItuxghGG7CR3F/vXWrHJt8JfZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702138237; a=rsa-sha256; cv=none; b=hxDuO173Z1mqe7RPNEdkrGHR2GJRaVXvU3cFdVwga7Biino4vUDBwBFIcPxV+/iGUkZ102 FZpq4JUcH7WOueOJFKyEchGBHvSXpoFJ2J7XJW2Mpzi1HnX15CIYjva38J57T5kqGHdoyo wkMxIm3/n99LtgBS6NgeLfs/AuXaKp/NJVwgFLyEZgIOgfeot8KHq1vUzmimGHF8YmEAbD s/IUCZkQwnuH7tOOmvQhNzIFKA76NEnRN1GlJlur1zBUzbjhyKOiMVauPvVmI4IMg6Hzwr KEVlhln59bFL6B++iF6sbCq/12umGfrms6IH8Gry5dBtGLELBq98scbsw8fOlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702138237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XThfI6lEpOVMrho+HG1FfH1uptRQBpj1v0JRtnz6578=; b=GFyfTs9C8Hf2Y7fPUeUWohPuDBR5MoGUV6kG7n1a2QZBySZYoDcMs4OljO92uQ/ULwJHxK ceFFUZ1DEhIZsfabWkYf/aUVKNUAx7wizT/mDC86pAsUpMfZsYct9uJY2YdTsX0a33qSMz whuAaFpwgL2tSRzFQrYA8SpgrX6UzuXFD/a0Td33gvxS6eFMXIKAfqj9LllhWNKSyG/Aav Fx28SsUd0OGhN0xCd5ncUzZjuCij1woLibJqqZ7iOIyNqL2gFIVSl0BpleQprAwT8NLCyE bpCuipy0dgs11+nB2ZZC5zy4K8FU7UekWP48VYRu/rrBMAXv4z6fB8yW1VRiaA== 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 4SnXzd3Tpsz19dV; Sat, 9 Dec 2023 16:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B9GAbxg041530; Sat, 9 Dec 2023 16:10:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9GAb5E041527; Sat, 9 Dec 2023 16:10:37 GMT (envelope-from git) Date: Sat, 9 Dec 2023 16:10:37 GMT Message-Id: <202312091610.3B9GAb5E041527@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: 3b1904d9eb04 - main - pkgbase: pass --recurse-submodules to `git ls-files` List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3b1904d9eb0468a49be3cd1d97de6d7ecaa66a43 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3b1904d9eb0468a49be3cd1d97de6d7ecaa66a43 commit 3b1904d9eb0468a49be3cd1d97de6d7ecaa66a43 Author: Ed Maste AuthorDate: 2023-12-09 00:59:58 +0000 Commit: Ed Maste CommitDate: 2023-12-09 16:10:01 +0000 pkgbase: pass --recurse-submodules to `git ls-files` When generating source packages. Although submodules are not used by FreeBSD itself they may be used by downstream projects. By default for submodules `git ls-files` just emits the submodule directory name, which resulted in: pkg: pkg_checksum_hash_sha256_file(read failed): Is a directory Passing --recurse-submodules lists all of the files in each submodule (which is desired when submodules are in use), and has no effect when submodules are not present. Reviewed by: bapt, manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42983 --- Makefile.inc1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 45d5c5d3876b..b509b603821b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2087,10 +2087,12 @@ create-source-packages: _pkgbootstrap .PHONY .if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git) @cd ${SRCDIR}; \ ( echo "@override_prefix /usr/src" ; \ - ${GIT_CMD} ls-files ":!:sys/" ) > ${SSTAGEDIR}/src.plist + ${GIT_CMD} ls-files --recurse-submodules ":!:sys/" ) \ + > ${SSTAGEDIR}/src.plist @cd ${SRCDIR}; \ ( echo "@override_prefix /usr/src" ; \ - ${GIT_CMD} ls-files "sys/" ) > ${SSTAGEDIR}/src-sys.plist + ${GIT_CMD} ls-files --recurse-submodules "sys/" ) \ + > ${SSTAGEDIR}/src-sys.plist sed -e "s/%VERSION%/${PKG_VERSION}/" \ -e "s/%DESC%/FreeBSD sources/" \ -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \