From nobody Sun Dec 3 07:01:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SjqKq1hvbz52xpn for ; Sun, 3 Dec 2023 14:43:27 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (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 4SjqKp5dLCz4Xvx 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-x536.google.com with SMTP id 4fb4d7f45d1cf-54cae99a48aso810322a12.0 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=HmnR963Xj2rWY3spd29raDCBxReEDgZRiE6LaiuaPCKga7GLyBkaaMoEiNHWfbMuft 2fQEba3zWh0fobsPRaK/0m+JA7lBMzRKONDbtH+snPSvoOcbktn22T/j876fjqV1i0U1 Fqi2QFl8Vd6IEiM5cFLqNQLV5KoXAyvX0b0x25rLjUQm66Bhlr7+xgdQ4VdkuDw0jrQ8 PvuxcYs/dBELAmf1E1/zFb7ifxuHcVIZazAdiejVXWAntuIXuncyhLBEpvAIEEiILQBP 8IEgjmefYxCfnVCEuG50Pse3ZKXyBgPqSXOiLYK3T3OczZbASG3F4X/3Hnm3KSLUEQGj ri+A== X-Gm-Message-State: AOJu0YzES/aOoABwPgHvYrLZhJBjLcpaA56tga13guWQzKb+TBEAI3ck FzIjDrfW8znFrk34LfRZwuKVGo4LwE8/UMQ2MmP6fA== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4SjqKp5dLCz4Xvx --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 20:40:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 22:42:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sk1zB5KpFz51k7d for ; Sun, 3 Dec 2023 22:43:02 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic303-25.consmr.mail.gq1.yahoo.com (sonic303-25.consmr.mail.gq1.yahoo.com [98.137.64.206]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sk1z94ZJkz4JB7 for ; Sun, 3 Dec 2023 22:43:01 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=CcFidJ3L; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.64.206 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1701643379; bh=eOWY8a28uU749KAMIuzbTZLFRDSL4aFh2EI0/R5mD4M=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=CcFidJ3LgI6H85Q+QpnRV0jyxsgZA7hnxVqUkqmxKrY+TZlKO0uu+rqit7Sn2VLngMi7s2yVi5VFTBj+4FddA5IlnrHUEHUZQXjXPYfS7D/p67A1t07NL7LrOQhHN16EOSfIFc/Vr6eFW0H7JSQ0cudVWxFybZ0KBmHVmUsiuXQooEia2BBGpSHSJYVR0Lzs0g5rWxIbrXAGtdjnIc4L1GY90M5jeCKlc12MOzVeHxXSY0mdKEI/8XabkcNOZIh0ciVW87EubOTDdxTXY/qlBH515GXfdNd5tWSy7+9btx6niVzp4fVPLE5ohYyeNTxj++uuCswNMMpjmS+NTv9MCw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1701643379; bh=V02fPikSMf8p7uU1GXhTu7WXCBcrjsR0UAg5KCi6eVw=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=H6VHq65NqWYkbGRRpGKicmDRy4jqEUxf2hHYmNxnMpj5s3SL/yqV1nZWgkXxYgI9/AGzSyfZT+DSjzevj18GYbADJCeqULB2Wxef8KNbq1s+6i/uuryxtYh1mEoHihMAgCh1QBv07328BchPpnYRcUUEPg+tgt04gekXgz99LjLidV8D6QRoKYmxr9NRmi5hjC9PayGoOC/CcsxlKseW+B4k3f0i4SKht6x3HL5MGozBETho/NiWXU3ngizUgiiZeD9WiWnvP48npvN72D5Xj0VoaDiEwbu3oeQAf3gBbXnKdnYnCXtm1GA6gGz+LwBtIWc1ru673+Wdk4Cxzg8eWw== X-YMail-OSG: Wk8Ss4YVM1nhZnUHZ6fgeycbfexLPAxfL8heBA8rXVaEI7Tzsoy1rLuKZ91x_YB QWJ3AcBc7JJV1X9Q1bNIBhOKMQvronKGe2QMA75tCuQWHf7GcBTG1JiFOiaFTeJiSTmsPOUmoTUg wboqDx_EV.yQmIwwIxeFnGhxwYQyHnQ3O3IQ7hqwLLGCAKqnQ4hjWby6sLXCnYIQRYH00W3SjxPc bZPZHjR6I4fwM4dOhILpYC0Nl_5PsPzGGnl6b9TlTFtAtf6SIX9JlG241cLI0eh_ME.xfGllNYmz jw4ICRioAKLv6F0bjyYLXy7AV0CQVPapWS4_mB745kjCE4aehSe2C0RTH4JgZvFBfZjT7f0pCXw6 2Nqr_oOldZx.QNWP0fZ7DwqMO_W7Tpt1yRQiS_sMm1l4vC.wL2TS8u6clGXe6Ye42kFcXe1uWt2n cLL_.BgDwJ7l49QTQSi9FgCnY0f_2iMKO2AWGYvLLI3lHS88LKRMvqATOOSRPMMS8H8Yl61aVMPC nl8xLbB.E4yw0OTloP6g.BJUsJxX6oLfaBc6AC0gunyuoh01dtrm8BBGKWq6Zw_nNWzT4WSh6UNH TBeKcXlYrrJqfnFEnoUBXcqAS.3INsV23S96UVpuWVseagpwn.ULNYkAbgs2Au0aEHuKFJ3O9VaJ mkipxIVkmKuDECX6wWpxOVB9Jf2TFik81F_fmmsu0kAAUiVLczBiAlE2USsNmlpAtZw30tuUk5TA OrnMsN3Gvx28KWCMq6WUdakV9B6xQF.utHOsP_M9K1jn.M1PgPcLCZxqWh3obSXTnKEY.vFRE8k9 n_F8kD_vxupoY9RuBCcI029syQk9W4a4MkI7Q4keL7jC7nmSWsJDXk5tVBcQ6jDKDirZFpgoZgsz zKoKSlAZAz2ThqCO3WheP5zOZa98UvCrbgvyBd6A.iRyZmctjaIWgnyLtu5r4fGOYyt4FlXg5jMA WPirWTZxKmLl7ku29TTrTiVn9teauWGEodJmMNUIMBtY1bjXQVrKKwMEX_nNK5ukwomHSQjg6o4P KWlWZ8XI.0U_dJRPTaMY_kZMbJlJBO6UR9a2SORawBPN5TYNaAg8dS7.aWjMMDgADS7LpTse1zFp 2TmdugnjmWuAMatr5IshGrG4fA8PJlK8gqzcO0xDJb0uOSp5gVLoTZO.q.LcDRsPEJbjYqZ1wi.M o5Aznyboy8bxwDr9uY00YB0.AMl1boh3a_T1Io4flnYJ.vsHYArIVT59M.dksWb837VTFU14b2SE jcEFOXg873Mogcj0pqtiirj5zlAq9lDrmBdbNBZex9GR5qne7rT5QsYMroLNDD_cfbNDuPyuJ_.K 3eFNJbhYWz03Jp7WkOzCG3ZwIkAuTAfYHKgllgKcxwMGo.oqUH77vDF8Nlxwfbyeq.5Futvm9OyI ys9jr_MJE8DokBOp6gq5z0nIwvuC84v8vGUE5O32YCf5Gua4d_psAlbDwGLlag1FOrzf3RqD.TlS 2pTrfymwIU7HfoYjYoeexsl6M.MI664anmw8zU4ansEPSKf8se9saqr4sm6VPcku2dr3XCG1NWBe ljdLl1M0pBCZixBFOtm4uC27XI5gf7ZziQdu3v_918odISU0aD7nin7Ou.oIuEFnaW.O6hgPXl7G 75XLwkU..K0BFwEhm48d7SEwHHl6ZSagjrJnHAprAQTGRhQD4E6ZdKPlLeEo7N5.jdLCADc.SDia 9pezGsyd5xOgoIrrsFTOkPe_cRyMGD6BpnNjXqu6hBe175c8GhIaCDrcIQmVYlRRo6RJ8zSelxd8 QU7JoY2Y0HtrH.L7M2wtRTBb3POQQxLeYuLi2TzrJsr2JCk.XiJVVq9x3TMf2wx_3n55gV8Wr9Ul pxssMMzwuw50hyNiQl03usFIx8nqhkcg29XTXDGyKzmKqkt5tm7DxPaGPkIfkbu.3wkbvjhKrcXF rSAWgRfa9U3OwUR6BiYjTmyM8tM7P6LEuTh.FfzvQKdP7DpmZcQbMpFpjfUmVRBfbEUmPLeKrdmH k8tjKfYaTMMRqbYTyy_ux2oD9Pj2n6a54MBrLxvp_C4PY2m6QIw1wgVLbmksNE2Hd24GGz2OcEsO vgneGROEY_A.lHIiaVgtT3AibbjX3i8Fz99zPQ_P3fqyWD3Lqm7BzoQBEog5DJyoXHTBfng3KMuZ 5hY5.mMz4lyzuq4N9o7DMYT3Gx1of2PM_BVhajfx2GyFNxe2uwR3PqVtMuqBXIsk5NW9YQ4osgop rbZqMxecoW7xy6.S3rgzIDFSjMve9GhsPFIdBTii2etvR.hQz7qaRYPnELeEs5RIM1dc_iPQUahH x X-Sonic-MF: X-Sonic-ID: af484059-3d0c-43d3-924b-74a1f2375a6b Received: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.gq1.yahoo.com with HTTP; Sun, 3 Dec 2023 22:42:59 +0000 Received: by hermes--production-gq1-5cf8f76c44-2v26z (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 1e309b7ecc7a4512e0c6c8587603ba7f; Sun, 03 Dec 2023 22:42:58 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: RE: git: 35a301555bff - main - Increase UFS/FFS maximum link count from 32767 to 65530. [actually 65500] Message-Id: Date: Sun, 3 Dec 2023 14:42:47 -0800 To: Kirk McKusick , dev-commits-src-main@freebsd.org X-Mailer: Apple Mail (2.3774.200.91.1.1) References: X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; MV_CASE(0.50)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[98.137.64.206:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.64.206:from]; DKIM_TRACE(0.00)[yahoo.com:+]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; RCVD_TLS_LAST(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4Sk1z94ZJkz4JB7 X-Spamd-Bar: --- The commit notes reference 65530 twice but the code actually changed UFS_LINK_MAX via: -#define UFS_LINK_MAX 32767 +#define UFS_LINK_MAX 65500 /* leave a few spare for special values */ The 65500 matches the https://reviews.freebsd.org/D42767 patching, which is what I tested UFS-based "bulk -a" behavior with. === Mark Millard marklmi at yahoo.com From nobody Sun Dec 3 23:33:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 = <; Mon, 4 Dec 2023 08:20:29 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic301-21.consmr.mail.gq1.yahoo.com (sonic301-21.consmr.mail.gq1.yahoo.com [98.137.64.147]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkGnS1Wmpz3Yln for ; Mon, 4 Dec 2023 08:20:28 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=Xb+F8fAQ; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.64.147 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1701678025; bh=K1GANFYNZkW4THnndDh5j2WUPZZIbfwk8ZCCYnDOkDc=; h=From:Subject:Date:References:To:In-Reply-To:From:Subject:Reply-To; b=Xb+F8fAQtIAmnwiUrUwNHGtjgl1fstzhMBadPBm/tuEBi911ynSbNZFvqNAhyLlVdL7h0m4AjUADZ10vd2hR/eBxEHv2gQRn+nRunFqnDiui2caOkUaAUa4B60S2fCpWbk6/N6fdm7i07KpMvxACr0IWmDrTGD6QsIphp5FpuDeGzhSSGIzMk/iuuWHH+Q50XJNS1bj8WH24FsFJuYk9Z9hMsncznFsdrrA7FIyzz77ahCEb3eNGL3zdjEXbjMpI4jCYZSf8BKGwVS19hdTRdwqc/PJ0d8MUO0iI8VwuIyTG405EuEonU+I0jX3e9yvgLcBfi1nBXD1Mmx0Laixr5Q== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1701678025; bh=C51FUeFNlmXTajZdIWE229VptcotghceJIaJYmGlhPf=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=t0UPIiHs6+BJX9LkTSHRH76q/+84Zi5mrawWTRnYGOslGcRzkQ7zKqo8KU7cb/FD1l8jB7w1uHSH0zJ4vMe+nQUUnQjF3LroY9mrKP2F9xMs87y5OXpmxjrKQqTNiUR3Z+bqCqTgoV3Jy1PWjiOZIBsD7aDWpzo3hpXjiWWW52/PhgQz+A46J0cvFn3Zyn2Iznpbu6FFkj6u4RQb4nVhUw/KcFNlpjbkfoIr2nXDusIOKP+1Ld2WF0PU0b7daQKNbOV82YYkx5EPDLh64J6EsYbhI9eDRnok9hlzs4Qa9XfhUGM2S9HmtoufjApeqNqOc4opamMWNmJet97eO1N/ew== X-YMail-OSG: tDjoJ5kVM1mgPdG2LjR_l0iKt0UhVqP131j42ZjiFoSJWTYgng2Lu40HXhFMVmf 6V2LBxkvTo88HGE3zIerj6fB8vRmGjBBM6ClTtzwzyTgrazNYHLiGEmAZPUv3dN3H9AMPn.kslED TIB2G0w6q4OJAly6O4OziEIoWlqSCxBaXWXp1ZMhVoR5PGxGrVEf3oltzitTS9dit.vTBTO4aC2s j4Dh5cw8Y5_OGT4JIm7saQhPX6_c787D5Zb.bKHqu.Wou_0kZI2fEAiGJk6eFTjdRZCE2Bb2S_56 yaahINz7hRq0AGG57QMgiEPEmqNtAdHIbCM65dIBws0HAm5oUBsLZ.fGyvaKKdY2mR98JljEdSQq 8ElMifv2eI_0LkYT.xhKj4jJfW0OmkenlLafRiIYM6DOOGuQPvRo3hqyOLmexcvinf4W6C3kHkmC ZTMzx09llfu1y5bvP3ymQGp1aPkMKUCezrac.x28lhXHpw4fBCUyIphbcVeAclxNWWdce8Lfz6QZ r.QmHhYDtNpmI3lzZ5yOdsMM3F3URzi9k.ZUjANOv6bdnzkqyv7e7iplRrF60ucjRxvYwM54w7ZZ gX6CMGXV5atyaPESBzBfkn.wT_5hkuuqL40Dk8i.ArrRq2CXUePK9VBS5DtczNo2EhBKMrradVXP ONWy83REkgW97qss8DVbh1CoEbzB4afAIkjLXqD5RX1cEICrmj.AsNrZTHNFm940ezM8cZb3A604 t725d_tgTUMuqLFr17VSni7SAJznmD2jZFTPTgs5oHByj.xlWGlA7pA8AbOPpbFE.GHkyWARoq8X LNvO82ChNyeWVPuG0St7K4WMYFYmM8psQZDHZfqIWpu9wsWiFkpdvkL1hMvyhb0phdHArflAqLIm aWZxUhSBVgkGV0ZVO73gtctYP.BTGGa8ha7dS8V08lW_I141DaDNixlUYv0MNB.BJ2QH9_MYtGXv RIv2LlXOxTiJ0UPatoinKk_hgB4AkcH4QisNb.MIC9uqbs6pto5JQ8QG5e.qsEHgZsV7UN4JKm2e I.2KuoT8OalUPGO1UBg3ufoX8hAH7HRsgOhKbgd0LJbUP8slYHTSbCGNF49fHi6s0_hDkO.IXhSO wtWi3bBGXZ4tWOjK9n2ayf8YvreXVp_0KvFjJ8DOvFNCO8loLE8VTbkVqHo6886M6PEkSxtfYmll A3Y97h4NWH9O_ssj5AkBVcMaVvXKf0F1rKdUG62l.Ma0S4ebUi4AyMoT5jpWlOjUoURWaOTbi80p rSof_QIVFLrZBMerK.UnvTtV2en314dmrtEyf8SAjqgEkvzhiHcgyb4VlG.XwukaySDskdqqfFUp _c3W1qBw3vzuVHrxbafQIb_y_E3aagdbIdpbfJF6e.TqPWZkI_zkxs.JsXXYXeFJq0JH6kxdNUfd vl.xe_jL_sOQZ.C7.xjFi_KKhNB4OfkI3t15qZT2PzdkmFS.uvQobbJHN3AdQeIDk6AjCL0TJHw5 6D7awEPVDtPtNUnfI.jVZQB3bVcThIQtNoc.sFCPoqItt7C8hJ7Tw7LWEw_x.3v8vKlCb6e54Dpn 0_uuK7DMptfphNtCPVd7d2pqOg0cf.TBH.QpKqsP.zP5FP96tOudpQpd3SOUavCytikOZOGlgu8z UFdaOe1juIL3CO5cKAa9kNhOlNbBHpbPFSue5Fc8.tMkIx.2pjcQvm_LaS6UzD2n6vF6NsPvO1qo ChcTEHLJURxWM6UBXKPApZvcgk_mXDhU25YXI5yCAL1m2jAE3Z1EVrrpZaqTYv3zxFLDB7R9QUCf IExyRHLRPib_qcp_ItnfBJoWPMvolO6O9nGszI4A9hCuKyQpcpFP5nqytC23Rph4C8UJVNjXhvTq PcMcQCas8XZSee5u69sZiSEFqJo7yBhmMpC7_ivrWDM4wBydwvDzIIimc5joriLTCSIFPKtFwdO3 plI8VRKP0gmBnKc2IkAyR6lNJdlUIHgADXglqMv5BnFTU4JgHGg4qCCyX0ABlJVF321pdgZsgjwM T6xMe2lPp2v0M2qSg1TqzDYQ_HWbCGXz1KMrGIw6si25wZa_AmJE2Wc9M0_4aoAKBjgpGzKbLYlX eGbBYWUY5d2JJwEyE2NaSlvFxTdJ9FVcNnFC9Nehi7sQ52H03q8TIr9RceWsVraa5t8YiV1xdbOd k6Vf.wRAexzlA5QfcCxLmGHXb6VRJGZeEkIOWr8SGWLOTH.wn3jg9jtjDRfe.N2YRoFIg_Q4_14h 9VM0xztaB79xUXjIkKxFi3e52uWNqsWTWpJzvm2bkEVAwDyXV0_QZbPYVU5c- X-Sonic-MF: X-Sonic-ID: 43b4a866-6f1a-4e87-aa9d-b289a11e9dfa Received: from sonic.gate.mail.ne1.yahoo.com by sonic301.consmr.mail.gq1.yahoo.com with HTTP; Mon, 4 Dec 2023 08:20:25 +0000 Received: by hermes--production-gq1-5cf8f76c44-gkdjg (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 1423c878277dc7824eee3cdf95d7fe1a; Mon, 04 Dec 2023 08:20:20 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: FWD: git: 35a301555bff - main - Increase UFS/FFS maximum link count from 32767 to 65530. [actually 65500] Date: Mon, 4 Dec 2023 00:20:09 -0800 References: <202312040752.3B47qD5S018602@chez.mckusick.com> To: dev-commits-src-main@freebsd.org In-Reply-To: <202312040752.3B47qD5S018602@chez.mckusick.com> Message-Id: <22229E4E-2AEF-4363-A3C6-5E9B8557A32E@yahoo.com> X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Result: default: False [-3.36 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.86)[-0.857]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; MV_CASE(0.50)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.64.147:from]; RCPT_COUNT_ONE(0.00)[1]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.64.147:from]; DKIM_TRACE(0.00)[yahoo.com:+]; TO_DN_NONE(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4SkGnS1Wmpz3Yln X-Spamd-Bar: --- Forwarding for Kirk: On Dec 3, 2023, at 23:52, Kirk McKusick wrote: > From: Mark Millard > Subject: RE: git: 35a301555bff - main - Increase UFS/FFS maximum link count > from 32767 to 65530. [actually 65500] > Date: Sun, 3 Dec 2023 14:42:47 -0800 > To: Kirk McKusick , dev-commits-src-main@freebsd.org > > The commit notes reference 65530 twice but the code actually changed > UFS_LINK_MAX via: > > -#define UFS_LINK_MAX 32767 > +#define UFS_LINK_MAX 65500 /* leave a few spare for special values */ > > The 65500 matches the https://reviews.freebsd.org/D42767 patching, which > is what I tested UFS-based "bulk -a" behavior with. > > === > Mark Millard > marklmi at yahoo.com The commit message was wrong (or perhaps I should say outdated). I started with UFS_LINK_MAX 65530 but later changed it to 65500 but failed to update my commit message. The actual value in my commit is the one that you and Peter Holm tested, 65500. Note that I did not cc:dev-commits-src-main@freebsd.org as my mckusick.com address is not authorized to submit to it. Feel free to forward my reply to them if you feel it useful. ~Kirk === Mark Millard marklmi at yahoo.com From nobody Mon Dec 4 10:52:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 16:28:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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:28:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 Tue Dec 5 01:43:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 18:24:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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:55:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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:01:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8yz4Bfnz53LGc for ; Tue, 5 Dec 2023 19:01:47 +0000 (UTC) (envelope-from 0100018c3b5b8f69-c1f56a11-d8fe-425e-a277-a3a1335c4e77-000000@amazonses.com) Received: from a48-82.smtp-out.amazonses.com (a48-82.smtp-out.amazonses.com [54.240.48.82]) (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 4Sl8yy35VLz4FR7 for ; Tue, 5 Dec 2023 19:01:46 +0000 (UTC) (envelope-from 0100018c3b5b8f69-c1f56a11-d8fe-425e-a277-a3a1335c4e77-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=lefbooks.org header.s=c6mgomvd6iau6i6odvxmbojhoixwp3fb header.b=IHJokv83; dkim=pass header.d=amazonses.com header.s=224i4yxa5dv7c2xz3womw6peuasteono header.b=QFNaVSkc; spf=pass (mx1.freebsd.org: domain of 0100018c3b5b8f69-c1f56a11-d8fe-425e-a277-a3a1335c4e77-000000@amazonses.com designates 54.240.48.82 as permitted sender) smtp.mailfrom=0100018c3b5b8f69-c1f56a11-d8fe-425e-a277-a3a1335c4e77-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=1701802905; h=From:To:Reply-To:Subject:List-Unsubscribe:Content-ID:MIME-Version:Content-Type:Message-ID:Date; bh=XPC8RCCEOEhAWCaE+WMW2Kh2wZjKqsItlP1QAfT/EvQ=; b=IHJokv83PpqXAE41uMMEdwx0b0Cz8/tcoMSgUA0Pni+G8qQ2ds61T4fDC5iE/Ueg DDDIgnmohgOQCaZnziQIIwO41TVql6Dcx5HaSjoiYdAl5ctIZsooOZbOl88OdNc9ZSu tfwd5PtQQQOC82rzx8aC52EqrWnLqXn1OhNxeC84= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=224i4yxa5dv7c2xz3womw6peuasteono; d=amazonses.com; t=1701802905; h=From:To:Reply-To:Subject:List-Unsubscribe:Content-ID:MIME-Version:Content-Type:Message-ID:Date:Feedback-ID; bh=XPC8RCCEOEhAWCaE+WMW2Kh2wZjKqsItlP1QAfT/EvQ=; b=QFNaVSkcjIkKCeQuczMJPsCGAa21S98ukAqMqhFtes56OgoRDCoGfFtPhEvE2nx1 oOSTCIe5PtEd6qqfTrMFZ97atBmIQj9tScU36gff95my5BCa5Dz5ksdcWc8vzcBCpwS 3EeoshTUq2CvFv/DSwnHleezPz4fjjbsrEO9CoEE= From: Literacy Empowerment To: dev-commits-src-main@freebsd.org Reply-To: info@lefbooks.org Subject: Free Books For Read Across America Day List-Unsubscribe: Content-ID: oJScoTyhMl4mYaqyYaq2qUyfZl53qmWbqTthLzH3$!$ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="Alt_MIME_Boundary" Message-ID: <0100018c3b5b8f69-c1f56a11-d8fe-425e-a277-a3a1335c4e77-000000@email.amazonses.com> Date: Tue, 5 Dec 2023 19:01:45 +0000 Feedback-ID: 1.us-east-1.25p2ovaVlXxrgIROY2BQLqBkO5GIJtjOng/F4UjxTs0=:AmazonSES X-SES-Outgoing: 2023.12.05-54.240.48.82 X-Spamd-Result: default: False [-1.14 / 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(-0.58)[-0.582]; DMARC_POLICY_ALLOW(-0.50)[lefbooks.org,none]; HTTP_TO_HTTPS(0.50)[track.lefbooks.org]; RWL_MAILSPIKE_EXCELLENT(-0.40)[54.240.48.82:from]; FORGED_SENDER(0.30)[info@lefbooks.org,0100018c3b5b8f69-c1f56a11-d8fe-425e-a277-a3a1335c4e77-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,0100018c3b5b8f69-c1f56a11-d8fe-425e-a277-a3a1335c4e77-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.48.0/23, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_IN_DNSWL_NONE(0.00)[54.240.48.82:from]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org] X-Rspamd-Queue-Id: 4Sl8yy35VLz4FR7 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=63vcps4ba4uec0mduv3l60qhjkf6jer5q7a4i23k09l54wbm8zjgzubqivu3fuzkwocnslfe12tyk3ct5dvo2bgzq93v4yhz5b6q2fxzjurx&eih=2r2ggp9zr16cexo26dkd5f0ur2gsd770lui4ff3jn5lzj9tz5s5 LEF 1311 West Chester Pike West Chester, PA 19382 Phone: 610-719-6448 Web site: http://track.lefbooks.org/?xtl=63vcps4ba4uec0mduv3l60qhjkf6jerathqrt8fw2vf7s3ycfa1o7comnmgzuht71hglrbck5ru12p7e4r9lo29lg55tvz7za5rjdpg625vw&eih=2r2ggp9zr16cexo26dkd5f0ur2gsd770lui4ff3jn5lzj9tz5s5 E-mail: info@lefbooks.org In order to unsubscribe from this mailing list, please click here http://track.lefbooks.org/?xul=6gyckg9gvzcg843jd1lwmqibmj9algn4qyqu61okosuawe67jjojpbiaipwhzdes7tblho63lqp9mm78mvl3go2s6r6&eih=2r2ggp9zr16cexo26dkd5f0ur2gsd770lui4ff3jn5lzj9tz5s5 --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 Tue Dec 5 19:04:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlFpD73qRz53YDT for ; Tue, 5 Dec 2023 22:39:32 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 4SlFpC6Fspz4FSM 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.45 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com; dmarc=none Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-40c07ed92fdso34006545e9.3 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=FsnujmLwL5Ok4isuHXNWOXMjr7aT+nDhXCUfF0XaPVosE0YHoZ/Wct5qDu4+chhwFh 2NCUgj8gWnH+EqvK60mXIE6nMN8ZZt7askmNUiH3hDwqY4E129Braf6pbgpywjbCN+E5 F1jhPOpo2vW0Gkq1UCc6/YJU1f3ABhvXqrln87//y8YDKtw2S+/SxzNCnFnPKOqrV7/w +6JfqL28C1SZyOaWIaancQ3mTH4L3nUlO2kiVpDdm3JF5tvKMp3ZSWou8WpPF4+fI6V9 AkDRN0ejVooFUle8A+778clbG5e7MZ4NSq7rPDUQpHoleY/7bED7sQI0cscGUb9J/HvF V/JQ== X-Gm-Message-State: AOJu0Yy5XQQQSnnUOZecxt6/zmce0MxpqWzUGbjdynmQqeM0ZOnmi3z2 ty1ls01uyhg7ogxS0e7xDOfzPw== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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:c]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MIME_TRACE(0.00)[0:+]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.45:from]; FROM_HAS_DN(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.45: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]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4SlFpC6Fspz4FSM 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:52:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 08:46:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlWHB0x6Sz535WC for ; Wed, 6 Dec 2023 08:47:02 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from smtp-190f.mail.infomaniak.ch (smtp-190f.mail.infomaniak.ch [IPv6:2001:1600:3:17::190f]) (using TLSv1.3 with cipher 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 4SlWH958tTz3G85 for ; Wed, 6 Dec 2023 08:47:01 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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:2001:1600::/32, country:CH] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SlWH958tTz3G85 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 15:47:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 16:52:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Slqc40N2Gz52y7F for ; Wed, 6 Dec 2023 21:02:44 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) (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 4Slqc33DBTz3SRQ for ; Wed, 6 Dec 2023 21:02:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2c9fe0b5b28so3075301fa.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=KGbnsXxsxrsqqvL9kcX7RozTuGhek8YSleC99qmJ/hdiMvK0+KspF2qaQHurnpCVjG 9ktxw3dFjeLMDiCuLp+2I88zX9Mx8gi5udPdYwB/l4lsiPSCsn7qzeBx5YS9ZJMCfprt wkAuxQfiv8jh2t/d2Um6cli1WuoXNK9dQ5anf1L2ctDeeINAw1q5+EW3eUVz0z5pEjaf P0VA8SUxj7EDGVrhiXWZB2hqR0Nxpc7P8Zm2a1k0gmr5M0kaRnj/BpgFir+9WSfLLlTA 9iZP39f4FEZufbXhpUzS0JMH19f0LvaTn6X7gyUDzZqoSTxlInRTXE1MMQNcGZ9X3cPy 3YKQ== X-Gm-Message-State: AOJu0Yyhopz7ZZxmFAAebVjPDMq1AfdM/X4NsFNBFdgim6xa8QjlnpHj jOyG79jQH8hihKJorErHc55bj47AK2aGijNL4uAiLA== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4Slqc33DBTz3SRQ --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlrSy1Fbxz532P9 for ; Wed, 6 Dec 2023 21:41:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) (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 4SlrSx6XPmz3WTj 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-x32e.google.com with SMTP id 5b1f17b1804b1-40c0f3a7717so3283715e9.1 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=AU4R9P+bP6Cxl4lTUhPRZ7ygso+0l/bF99TdHEnmM4Ynbs1Br4cBGA27wA3/g1n3il UXJmMI0VCwm0t/qeu7gh5Jp7tKUfA11nNC9i4RmIZrgd/E5hPLrMsEP6SKbFwwkCKlRC F3wMRXd7xtvAhKQ3dRcucRTDp9Zzo7nNHiroYOyAJ3uyFikRjEjk5loxts7wckvRJsxS sgAjTo1295WNBlHeoUEP2HbN4LD9OJi/kDtLXDnf2tWLRqMhILIp1LOVdSWsCvfbsnOC NrGBbIfQNiJr69T0Ro+zk1iHxTRLVkx7vmbq254kbOR4g2QDA942KQOVGA0qTYz1wE4M dgaA== X-Gm-Message-State: AOJu0YzlLJh00gpg2ZU3/COb9yD+fKN7WKN29/cL0q1q84aADoFcDPnh DeOTo4PuAxjLMerj4N2BlgDTvdWJon6zHBQ3oGWdfg== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4SlrSx6XPmz3WTj --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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:46:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Slwyw2bqlz53JRP for ; Thu, 7 Dec 2023 01:04:24 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 4Slwyv268Fz4Slj 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-f48.google.com with SMTP id ffacd0b85a97d-3332ad5b3e3so381577f8f.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=Ei7p2BoHUeV0CHuNivPLO1C8n3nqqupx6duxErTqafD0aPF+bZlLceM0LSXJf9x3/6 mB2B0dJpRQ8jtNHyhPuQ+uz+PB5/AshX+FR/ZvSlSparDR3/iWxAevjnjmG0mwkDwgC3 q4+4NrZqVi0mPM3Xx9apiIuxj9yxNwsJEucsO2akQn3KrzCe8632pAi7hKR0KFhRH7E+ QYy8xCtTtn9u/aDSXAKQq2AArrTuKl/qJ09lfvYJBVTCVhZmQZHVOY3EfJZtRyXUZr3J 2EmysK6n1w6qNHVz9nsfzMna1fXayapEX5nOqq18t7xqPBR+Jit3iL8htZMfJD8JL/kr sNHg== X-Gm-Message-State: AOJu0Yz9p/z3zp9ndBGJpZd87gEwTdSF3gVCk6O5+XqydYa4ESWKNlf9 nDpDqx/PqGs6FqY33os1YtrLNC/rDCd4RAvMRBw= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4Slwyv268Fz4Slj 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlxfY4Jncz53Lp2 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 4SlxfY2gGzz4XYY 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-54ca339ae7aso547638a12.3 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=WYGC7bX2OrG0t1DI0j9GR2ZsSij70wGqTq48FHfWkWrsFDGKsl0OJTPOTQc2Co00sh HYUzumdaiudiKB6S9tvFmOxnorBSpN4VcznsMayiqdmpD/5bu+l+zmR3rFSlBaEucr8E /4ac6b0cfbpq9siQNXZ++9d8NcTtSSVNDvfmaE5Xmere5X3Kb12Rt1EkkSem0v/WnNuR jB6np3X/53Y/SGg8WHGF5DyNFs3BzY6/wmV1q5z0fRT/JTaY37XYPOG5i2F9Kgrb2iqn rb3ZcsIB0Vsp/j/1wSQj8q6otp2VnRNPz9lJMUyq4Ij5uI09T+XMyprYQsLFo4S0nP1T kPOg== X-Gm-Message-State: AOJu0YyDKTLiCGymasMzE9gMxO7WWKHOOjEoLi7aCgLhdYEHYf/77pV4 pDEfuLIYkpmu1rudO+rxGB026hX47ycBBWE9aiOW8g== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4SlxfY2gGzz4XYY --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sm0Fk2JDBz53TQl for ; Thu, 7 Dec 2023 03:32:26 +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 4Sm0Fj5yKZz3F8x for ; Thu, 7 Dec 2023 03:32:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-54ba86ae133so404434a12.2 for ; Wed, 06 Dec 2023 19:32:25 -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=OsE9Moi7HAEFXE84Noq0AMM0e6IRrU93eisAbqqDSAiDl3jpAxa3I/0KoZGWYPyf4f 3WWOx2xwRYObeuKsduyDLil9FwbjGiqsy6aH/tOvpDwRChKcCojKTweNxi9j41Fu9VNb GJlUEqyKn1g3cbXrLrg5Ma2sI0YMRghctq58pNqCsm6Zb9Us8j1GHcq8+ZOiNRtPPW5b NF0inMq4EUqMrUh1Ow8RRGnAmwKim1v0siiO07VJt7Qy069U9slw8BmPKVvvlsAy7OXU wB5o+dkVcNwuv7lmOwN+2+B2iTtSoKAGujldtngH5U3TZ3e99xzAycn4q41MH88qy4Sg NT6A== X-Gm-Message-State: AOJu0Yy0L5XAApQ4vUVnIW95t8lwZ19rTvbv61bS+YHtiFyH3bnmCtYs 06RRWUv+gM2Vg0Zw8wauJL/xkOybS+qMZm04+5vvMA== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4Sm0Fj5yKZz3F8x --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sm0xp5QvTz53WjY for ; Thu, 7 Dec 2023 04:03:42 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 4Sm0xp32Mpz3Jw0 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-f48.google.com with SMTP id ffacd0b85a97d-3332efd75c9so457658f8f.2 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=YVQWGRZmvqw/XhK0NCRyTnx5OChcEYt0UoaRBKq8Vif35sDoVgpW7qLzkAvbIUsiMl gjTzWTZBw1XckGKgnAF8av5+h9R40aOemJvjfY7p36W3/PLulRC94UVV45TOS3T2km1J gpB4CJehdiMGbF6fya0rMK67jwAcUdhJsQZ12/WMZIvDzf7WpOInwrSbIk/13VT36s2t Oh9CPaD74ldpPi1sU8lPxCn2pmGEHtK3901cVj9nrjC43gM64Yd5Hh32em/MJcRka3TG Pojwpxuuq2+TGY/6QjRczxZnHNWcy5wu2fNyc7dXDcrC1+CLKH/5m2elBvGhTpSiQsUj yKuA== X-Gm-Message-State: AOJu0YxLVtWZvOjDWltKbus2///bDmv+Bf6vPNhpidJGEVpIRcu42lCG foFYIAUODp2oifsw6fE6HEHrv//mPai2ZqKs6P0= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4Sm0xp32Mpz3Jw0 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sm3K869G0z53fQm for ; Thu, 7 Dec 2023 05:50:36 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) (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 4Sm3K84KmGz3X6f 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-x62d.google.com with SMTP id a640c23a62f3a-a1e35c2807fso60152466b.3 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=mZv6C4oNYZdSNNOVzzam4rKq4SvUQowq/jweACld7IUAU1pqqNRiZC45DP6WhuiwwD zkHhp7W9uso85P9WXtO8zq7QsCHydfhuRcGDB0euOXHSxMU7XrKS8h7tI6nuK0CW2EkH Imubu4HalZX20CmvUyhA3JJ6xmUHwHX4u7hPwHsjBefDrrl1KeuqLTMcAC3339jxjWnM X/ijf200mEiOoWBowZCFoSLHmCj73sLGmyNkbnHHa+IoeORMsLwGH8rUh8XzDpurLYGV mYusUsBgs/ebEx0RquR6RnOM3ogJRsg6y0M1H7Gwsjwz50uMvW5mLyPmeP4HGSqKrVLy Gv0A== X-Gm-Message-State: AOJu0YzOiJ1RN2JXmRK576F/T/v3leGBbgmcxG6a52/gGrYUOFreQkR7 oKiyFZBmpWsUHNQZYfUmCkhwkCTu4UGa8Hnl8/hG6g== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4Sm3K84KmGz3X6f --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sm3vC5ML1z53h5H for ; Thu, 7 Dec 2023 06:16:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) (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 4Sm3vC1lqJz3ZcC 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-x634.google.com with SMTP id a640c23a62f3a-a00c200782dso62291466b.1 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=ZA2FV5QdAHt1JLJ33CZoyl+8sBixb2Us+W6XhjcSbHJTPXdQ9smS1jGvV/49JFVqeV EmQJ2vGnXB9qz+1/FEJikQjJerooIubxIFZWurUdtiErRif4NV1xMv86biTh8Miuu1Tp W6Aw/gi//iaIR2TlN28Ijcc64UiAp4aW5+tzYHQVMbvu72DXKYcXDubGD62ukQ34v5xz 0oZHYcyAr3srLfP5eKyYSSB513VoeJKiO351wCJAPER79Map/9MEDeQey5Dsl82q3ro8 sei64eQ3h/zIBsw2inansFi2YX4QZkD+gHj+kxZizEeWIRFgI47H0PhM8QzaWAWPkTjN kQlw== X-Gm-Message-State: AOJu0YzVRTXS4i6r5LcjfqlqIF2FVlvMTfT/oFpflCrkmjpeYtE4QF5k p3wgkeTOARMs7ttXjLqMxZybUavwlmZB5bCfaYS5fQ== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4Sm3vC1lqJz3ZcC --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sm46N3wNzz53hmN for ; Thu, 7 Dec 2023 06:26:20 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) (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 4Sm46M2g9Wz3cjM 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-x32e.google.com with SMTP id 5b1f17b1804b1-40c09d0b045so7329375e9.0 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=RTqueDxMdtqqlHFwx+xC5iMYcr9JS4bdfcx5zVlmd3M+DO2EzuubSzpeqPifDImteh 9mJ/VyYlJqffjnzaVEn/01/1fxfpmBBFzzkekBXYDdeQne0NKGGi7JwluoDO2dsB0O/R 5Vz6p9UsZyw41g1Didm230UlAGYNIa/4yOJQwKwy4eS8tH27AjQlQqGzCFWw6Z3Xrj9l LZuv+LKeNOa7ZwlTm1T3SKjYt9rgj8CV+t5353/VljjZfzL/Vl6+1YLHZZv1b+XIg12F YlteUbL5NIh6YwZQZlfDXFqt5CDu9T82vVFT1G9EIlKqFXAd0KNJHcZt6ytv3+Xa2QE5 CnIw== X-Gm-Message-State: AOJu0YxjohPe0Zyl5M/NeF1DR6YZPx+wD7MMYgCGhgoQ/V/0m1ah0bLj tjdCYr77aJ8Q2E/mryilqQcRnzOeqbP/uU7qt+9pRg== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4Sm46M2g9Wz3cjM --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sm51X3fhDz53kxw for ; Thu, 7 Dec 2023 07:07:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (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 4Sm51X0Bfkz4Dd7 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-x52e.google.com with SMTP id 4fb4d7f45d1cf-54dcfca54e0so199687a12.1 for ; Wed, 06 Dec 2023 23:07:11 -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=XHWlieU+p7zsZVL3grkK+gg3ngwOZRXuuJe2/sfriMrmp473G9xM/CdKhsgR5fhDk+ CiaWlzkje3asja1lh0D7O0K3WM6WPpq+ASbUXKDQ7XhhHxL8GfWhc/2vyG3TJYTSD34/ 7UwypGFjkRn2ALdpFNt0s7lTHKMfgUocYhEOIwZJ3Qo4l6fwrTco5mxIIMzxzJq5Qmk/ HSV/hLqq094ggKi33xsbmkv8yuWuqZHMX8lEZko7c4NfmMEuVFYhO1Z5YUWUMF5n/XbY nrrY0S9pQJXZ+1C+7asFAMCWUS5QUTJp5eDLPo5TbEduMuZ/JpIv9uHzLS5RlGbVvhC7 YJWQ== X-Gm-Message-State: AOJu0YzgRLnsnkp3vyJlw1W0rSiES9aZdut4yznYMZYfFnIId0mfcq6C FEhwCgb/A8tsPuyRoKKlTXIl4zAGj9o6bVi3usNufg== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4Sm51X0Bfkz4Dd7 --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 11:33:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SmGlN4yk2z534df for ; Thu, 7 Dec 2023 14:25:36 +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 4SmGlN4W2tz4DtK 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-x52f.google.com with SMTP id 4fb4d7f45d1cf-54d048550dfso1378703a12.0 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=vvog2BmK7Pfw84edxfuETeSR1OJfWIEco+RUjRLKjjmiCcM8V2U5YMmUQm6SIPSo9o H4ImCWxgTRX2KwOGl9pPQin+ZnuFFNn8RsWMgZMpW/SQmMMt+2yM/FMtzj5pvtoZLuzS O9zXrH+x6Uvhry7o4zMlbeDAtquSA6xjTs5SEX1x29ILvwrHZozOkluRVQTHqPQjjQod d/OQyGSrX/ll+LKu0v+DuGuRMK4tL/rwRBodPWF1KZFuvv82hhvJYxKyKGmzznSMO97T VCbrNcUUN4s3nFCnhutui+iuTw8YnCjzGEN4MCrLWWonTOntlziGto2Zkdpn02SjpyYX Fs+A== X-Gm-Message-State: AOJu0Yz+6bcv7hWt/gpeZUMKe13hEUYk9NuyFyabAET26w6SUPb8xOHK zkYewLPMBE3lRRAkyoqGPdgAbnwY5VIfpj+kujKpFw== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4SmGlN4W2tz4DtK --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SmWQb2r4nz53qBf for ; Thu, 7 Dec 2023 23:56:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (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 4SmWQX6r3Qz3f60 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::535) smtp.mailfrom=wlosh@bsdimp.com; dmarc=none Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-54ca43031d1so1428897a12.0 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=CnG/jGiiAWLtJK5NfNw6faVYfVhqBkOxOdNcB1LuX2JdTfTm98rr0Dg+YlM/wFB97U O61WO71+eIV6sRC+gDr+s7YgWPI/QbR+cAvO6N2KXSQatXiqhUnNrdYAR/GFWKs4TzCE pOTrHFLfaPc2nv9RK1hht4QlnvjcbQTvrBmFdBAMipXFRrRFd5nH6NJzxauYLJeJBr+w NC+vkKj3mtoSdsvcJ2dWebCvBeF4NHedyp8cHp1Z8fhmlNjOjOowCW4LTqmnt4WLsowN YSgMmTStsKN6mZud//J3QhfNvY7syS83ViZQwioTVJoRSwPDpP0KF0qZXbBrV2wrxdPd /vnQ== X-Gm-Message-State: AOJu0YyZgliTJS9+te6KVLVWFt9be48InsZO5VkVtiVMHhO0PNSS/vXe HF5xr1Y1lWE+rYd9tnOffFT9YwKKVpO9qZcRFyUybA== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@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::535:from]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; DMARC_NA(0.00)[bsdimp.com] X-Rspamd-Queue-Id: 4SmWQX6r3Qz3f60 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SmfNl6qffz53KDX for ; Fri, 8 Dec 2023 05:10:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) (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 4SmfNl1hMyz3CN5 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::62a) smtp.mailfrom=wlosh@bsdimp.com; dmarc=none Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a1ceae92ab6so223891466b.0 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=gfsZ99h2Pdw5Y9X4JOHRIcFEYAjAWLvkbxFbVPQSUjAODgSB1yt7xiO+xaHro8yKSt cl9qnMdjVsiZ7oEqqU1Yy+G+z/jgOafiJmoEG1N9TrlQ7uzsjz115Q7W8LnN5z0usBP4 fSDVFP0sXjBHloomX6fOncK4Vc35dXj1HGSFcxXLfeT4V9nFrfDafrt/zMi2M9hQdDqX qcNj0s6BjJCipz101pMAmQr9i0D62JyekMXt4A/wMJPVnM4id839uw51oTbJ5m/3yrc5 cnujtI30YQ/ro2TBr2+RSKeqo8swCz6jH1esSSKQhUkorD7PYIZq2o8KPV3KTGBUC9T6 i+zw== X-Gm-Message-State: AOJu0YyQrBX9sfCvivryQJetg10zShsWwsJQN19PFaV2eQfzUQuxHOg2 2wpW2OkHbtHbDur5UxqaoaRAyYbw0VDzOJwC80bLzw== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@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::62a: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-main@freebsd.org]; DMARC_NA(0.00)[bsdimp.com] X-Rspamd-Queue-Id: 4SmfNl1hMyz3CN5 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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:34:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 15:23:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 23:10:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 11:21:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 15:12:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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}/" \ From nobody Sat Dec 9 19:13:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Snd250tjWz53Dqk; Sat, 9 Dec 2023 19:13: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 4Snd250Hxyz4Tm8; Sat, 9 Dec 2023 19:13:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702149181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=THIOIjq24yQxHo2uJAVmRQjmdpPyVtKu9f2Ho0uAS+c=; b=fn+CW4QioObkOmz2cOuV3HEdTRNUQ9zfOyNQuBl0oB4j+kxvyni7/E0gMQKIdBUlQUhxKR IQTW4/1BcvM3Z/DWBfxt/U9E3ozgmvonOeTN6tG9QBAaZjYDc81d6ozb1+qU5TM49RU/Uw DDHLfg3ee/WuCA0ECGg4jIhnnlqOtgCgPWm/AC9FQiOG5s9ngFNFqJJY5TwjKsvKmx8z7R kPDsNkFS66R6jS2AmVHbN9s+LLKk+4PB5DokxDn/PlD0DcJdU4dkMhGyZGtuPzt8bYKTMJ HbbdNgrQwlWSKYRFhX+aa3PlwgR8Hy3lKOLb6ck91LMLcRfc+gBHQeDinHBJBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702149181; a=rsa-sha256; cv=none; b=ueKG5Ofu8v0CSnK1Eao2K6OQ/6qtOKofPKJseXfTMAVkZVFQAMm/Os+4Vg8E5j/TPu7Fn5 QNltjHy0QseIFiYo/ooeqEwe0/QgscLRKUb7vIb5a6AOT+rg9wRJBz0t28P5WX64gKdYFC Iu7jqLjQV6HAKl97vkIZxuQTmsO72Hoei7f73wEOzXahTTC4HuVtwAVQze1kmO604+Xz6i rKVv2B5THVxz27RltcM1I2sLl8SZ6kZEQ0iNrm+nMwjEj7VjqMCaJ2+8NNg0m2nTkxBxyI 5tH/bbWb4U1Y+JGUKhUlPcI5cDT9kd7NWVZvEsPIzj7GY3VoiVZ8ryZfW/l8zg== 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=1702149181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=THIOIjq24yQxHo2uJAVmRQjmdpPyVtKu9f2Ho0uAS+c=; b=G4poROFIuR620ikxRCp1kTT9ErNdexqIEUPVPzIb6jgFkoGj+DblKVDh17bX0eOJIUk9Ss wRlA8bcRGzTKrR4VFniylH25YBFaF/zyGbwyVELiQ3C9RBRnqKTNF0px5H95vnSSXiC9Pw lfwqwVOQPernR3ehw5EWqj0nMdznqpLjzFWrUU2jdcjrLz/z/sxhZLVV0tAy6kow5iHM94 LuthQ34HnLLSwAYBg7VV5s+omUrmEEXxkJHDPRqyYFy8ZRJX2I5hly5ux1qthd4M5uGNof 4K8iU1PoBydFc4OHJC0hMot9RJF3qURleOPguXfOhY8dacxmv4b+cUNGVT9VbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Snd246Sw6z2bR; Sat, 9 Dec 2023 19:13: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 3B9JD0iG050812; Sat, 9 Dec 2023 19:13:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9JD0fT050809; Sat, 9 Dec 2023 19:13:00 GMT (envelope-from git) Date: Sat, 9 Dec 2023 19:13:00 GMT Message-Id: <202312091913.3B9JD0fT050809@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: ae77041e0714 - main - kthread: Set *newtdp earlier in kthread_add1() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: ae77041e0714627f9ec8045ca9ee2b6ea563138e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ae77041e0714627f9ec8045ca9ee2b6ea563138e commit ae77041e0714627f9ec8045ca9ee2b6ea563138e Author: Mark Johnston AuthorDate: 2023-12-09 15:22:06 +0000 Commit: Mark Johnston CommitDate: 2023-12-09 19:11:33 +0000 kthread: Set *newtdp earlier in kthread_add1() syzbot reported a single boot-time crash in g_event_procbody(), a page fault when dereferencing g_event_td. g_event_td is initialized by the kproc_kthread_add() call which creates the GEOM event thread: kproc_kthread_add(g_event_procbody, NULL, &g_proc, &g_event_td, RFHIGHPID, 0, "geom", "g_event"); I believe that the caller of kproc_kthread_add() was preempted after adding the new thread to the scheduler, and before setting *newtdp, which is equal to g_event_td. Thus, since the first action of the GEOM event thread is to lock itself, it ended up dereferencing a NULL pointer. Fix the problem simply by initializing *newtdp earlier. I see no harm in that, and it matches kproc_create1(). The scheduler provides sufficient synchronization to ensure that the store is visible to the new thread, wherever it happens to run. Reported by: syzbot+5397f4d39219b85a9409@syzkaller.appspotmail.com Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42986 --- sys/kern/kern_kthread.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index 3205ced9b9fd..8a84fd70918d 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -286,6 +286,13 @@ kthread_add1(void (*func)(void *), void *arg, struct proc *p, } oldtd = FIRST_THREAD_IN_PROC(p); + /* + * Set the new thread pointer before the thread starts running: *newtdp + * could be a pointer that is referenced by "func". + */ + if (newtdp != NULL) + *newtdp = newtd; + bzero(&newtd->td_startzero, __rangeof(struct thread, td_startzero, td_endzero)); bcopy(&oldtd->td_startcopy, &newtd->td_startcopy, @@ -330,8 +337,6 @@ kthread_add1(void (*func)(void *), void *arg, struct proc *p, thread_lock(newtd); sched_add(newtd, SRQ_BORING); } - if (newtdp) - *newtdp = newtd; return (0); }