From nobody Mon Mar 17 13:01:53 2025 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 4ZGZqj5vKbz5qZgw; Mon, 17 Mar 2025 13:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGZqj4xm5z3Q46; Mon, 17 Mar 2025 13:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742216513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hibCMuaOTE7+h5Rp9PglyHYtTcGVC3nJDESwFLcSFog=; b=ktIZiyTYw79RLc4dKM0ZKbAS59pBC8usxbrnGkfMGvYG68XSUD9hRpNOb5ctVl7tCb3j+l ex6fo4Q1wXU7mTdM1Wokq1ExoPa/tjNRr5wacb+JMFxo1ocJ6GQIpa6CVP5yr1PUoto0qO ehGO4g7GTbFKtrx2eVLcUlXbLqrtSpvqz7WTSFQqeV6y5N1G0CCCdNsXPaF3PEQbUvSe0b tXbtUWnMtmV7yRcSlAOmIyNTkZfaJXfMXIIRHJoj+ZGgRkzOsw1EGyVcFR2lceVoo83nqs QBCsiMviaB4qCZFb/2MpuP/cTIKWpOb+rSsRlTn/RId1N+IPG0sCNXr+FOuraQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742216513; a=rsa-sha256; cv=none; b=dglVKOn5a24ACJdeam/z8N3mtwMOuuXv7CUazSeyY2EGBB6RlNZN/rxNOIy6QSL5EIJRNR u2jkyqDnogA0R8h+Pf5Sq9eDFzxyDojPIKxjCBWcWRzWQ62m1USRG/dU4T7i6h6/6k9NkN m06WilmaA/AXzENkMm3+ntFc/9vHpfc/qfa4eSnmTjyljmuz5GJNVi1oLHBITNDvzbOP7x la60AMbGOg4ArTqKlcsoRadY4nBwsCekYhbyw4aomNoQKSNBjty2omI1n4T5U1ksFVtFml nXDaNV/wnZCeLuPUud9XAXz3GB3b5ZB6O6ycCycmVybkG03TGpybBgsuzuipBQ== 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=1742216513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hibCMuaOTE7+h5Rp9PglyHYtTcGVC3nJDESwFLcSFog=; b=cVmS4uywEzAHhrOhxN0OPnWE+KULkSNK8d/BlEcRPQxqiMQyiqAbKjYe/nbQxHqbDtY++E 3gyItn3BCAa6ngH0SAGpWZtfx7alR0rX9zMHiIlnycufTuXwCPfFgarsf5prdyefCKMf+W IsNAVTWtFueaz7O5CHLy9mPuY+GKSa6d4NoAQPwlGKfK9s1jmuZcPwIAb+t3PznqPtFw2n 843OROxtifPTUzhiSkIKI7jUywfcswdkXCEqjW7M58JwU+TT7Uodxw4P7YfL37n6DbMyo1 3JFMULcL0C24QTKFq4COD1WRp7C7OmOf8ipUXRAN18esXp96EO+OqQ1n44APJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGZqj494dzp9X; Mon, 17 Mar 2025 13:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HD1rwN093491; Mon, 17 Mar 2025 13:01:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HD1rpe093488; Mon, 17 Mar 2025 13:01:53 GMT (envelope-from git) Date: Mon, 17 Mar 2025 13:01:53 GMT Message-Id: <202503171301.52HD1rpe093488@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: a8d2bccb87d0 - main - tcp cc: use tcp_compute_pipe() for pipe in xx_post_recovery() directly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8d2bccb87d0738c91f7e6a080375ae276e4c7d5 Auto-Submitted: auto-generated The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=a8d2bccb87d0738c91f7e6a080375ae276e4c7d5 commit a8d2bccb87d0738c91f7e6a080375ae276e4c7d5 Author: Cheng Cui AuthorDate: 2025-03-05 16:35:20 +0000 Commit: Cheng Cui CommitDate: 2025-03-17 13:00:50 +0000 tcp cc: use tcp_compute_pipe() for pipe in xx_post_recovery() directly This follows up with commit 67787d200488, and obsoletes the non-default pipe calculation from commit 46f584823798 nearly 25 years ago. Reviewed by: rscheff Differential Revision: https://reviews.freebsd.org/D49247 --- sys/netinet/cc/cc.c | 7 +------ sys/netinet/cc/cc_cubic.c | 8 +------- sys/netinet/cc/cc_htcp.c | 8 +------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index a34eefcf0066..d85ad4e9f4fd 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -401,13 +401,8 @@ newreno_cc_post_recovery(struct cc_var *ccv) * approximately snd_ssthresh outstanding data. But in case we * would be inclined to send a burst, better to do it via the * slow start mechanism. - * - * XXXLAS: Find a way to do this without needing curack */ - if (V_tcp_do_newsack) - pipe = tcp_compute_pipe(ccv->tp); - else - pipe = CCV(ccv, snd_max) - ccv->curack; + pipe = tcp_compute_pipe(ccv->tp); if (pipe < CCV(ccv, snd_ssthresh)) /* * Ensure that cwnd does not collapse to 1 MSS under diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index 82b0d9b7fa99..a2e72130fa88 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -530,14 +530,8 @@ cubic_post_recovery(struct cc_var *ccv) * If inflight data is less than ssthresh, set cwnd * conservatively to avoid a burst of data, as suggested in * the NewReno RFC. Otherwise, use the CUBIC method. - * - * XXXLAS: Find a way to do this without needing curack */ - if (V_tcp_do_newsack) - pipe = tcp_compute_pipe(ccv->tp); - else - pipe = CCV(ccv, snd_max) - ccv->curack; - + pipe = tcp_compute_pipe(ccv->tp); if (pipe < CCV(ccv, snd_ssthresh)) /* * Ensure that cwnd does not collapse to 1 MSS under diff --git a/sys/netinet/cc/cc_htcp.c b/sys/netinet/cc/cc_htcp.c index ab6165f2e720..569495144d50 100644 --- a/sys/netinet/cc/cc_htcp.c +++ b/sys/netinet/cc/cc_htcp.c @@ -375,14 +375,8 @@ htcp_post_recovery(struct cc_var *ccv) * If inflight data is less than ssthresh, set cwnd * conservatively to avoid a burst of data, as suggested in the * NewReno RFC. Otherwise, use the HTCP method. - * - * XXXLAS: Find a way to do this without needing curack */ - if (V_tcp_do_newsack) - pipe = tcp_compute_pipe(ccv->tp); - else - pipe = CCV(ccv, snd_max) - ccv->curack; - + pipe = tcp_compute_pipe(ccv->tp); if (pipe < CCV(ccv, snd_ssthresh)) /* * Ensure that cwnd down not collape to 1 MSS under From nobody Mon Mar 17 15:46:57 2025 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 4ZGfV972jFz5qm6b; Mon, 17 Mar 2025 15:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGfV925wHz473v; Mon, 17 Mar 2025 15:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742226417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U7OH3P7d023+9GTazMpscWge/4aOXwjCRAKKwk+z7+g=; b=sOuZyGQZym8irR65tlB0XSIfSBqdkHQHXWmbN4hLHx1ptAewRdp2E61ExaGU4MVAkaaCAH Lfuc5s9E8KskNyzPlNKnlQeph6vl8MIt6EuaqVuk3fumWxtZ75uviCrsQQkWwvsBs4NzEZ ft3iEu0aUVpkWbOrlEA8YoRLgvfSIKFwtqArjRbx9Gk/n6R4bzg5vDn5c/H3lj3WXol06b HklStVxKDuDQEjC6zHoNqVYDkRIaXC1R/6X7kUqD4cjxfZqHAEZV7hxg68/uA5FJ7Pltqw wL134ncurOCTQ80dGLTenqec48qNX50a/b/ecuv5Rn/SZnxrPyqsh28j9D0z9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742226417; a=rsa-sha256; cv=none; b=b/W8cl1RbClJaReXagdMbfQB04j4VDwNPL9hm+gejCLlsxJX/fHMh9uJXqKnUb8RSGr0gS izxomSSZ5dLf2D3q4TqgiKhS7XUsLF+QkzsAt0ls9X3Q4g1ji+PUR83djnFp3sniWN86a0 4HMUV/SXKEUa3qJnt5z0V/BDF4tTHjmquqExNN5WBKmabgRto4/kMCrrhEqAf8Aywupq4Y eDfT1NOgX2iGTNMhARcuwZD51gCwNCSHyXBUmzO8V4fTDPPd1rlbfBDJ6AxzbeM8/IZh0X 2YfUywk+xq/pluY+sruNU9sBgXEBfDt5ScszwFGy3ajIIB+EpHKiWegT7OmjUQ== 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=1742226417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U7OH3P7d023+9GTazMpscWge/4aOXwjCRAKKwk+z7+g=; b=sd8gqndrPwe4eZpvIcV5HZ3w2Xr0EhCIvIvkDR12KHPtoG1kM8AQNIZXPQfR6gTiGeWxIF KGcIE/s/zlPs83Ibuo7YOQounpymwotoFfjgBGqSBuM/iDm90V5sPd41J94xlUQqZQ5nJl thmtqcjrGjJ5Yd0j9ubEi4HMm8/urLXODuWrikGJsrs/gdvDABWQomQCCvRfUYdmsrKCSR Xf9F7l9Yqhv2Zd90j1HUXQT9/5nQ2ofh7tZhVc2CBZtiGUbBmfst+6pFtpU0E6jpp8llkL UxdFks5jw+6cqLArfXml9YyywCmLRzAi8l5ee1kDIT6XT/LftSK8U2dHuChZkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGfV91R93ztJ5; Mon, 17 Mar 2025 15:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HFkvmC093669; Mon, 17 Mar 2025 15:46:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HFkvl0093666; Mon, 17 Mar 2025 15:46:57 GMT (envelope-from git) Date: Mon, 17 Mar 2025 15:46:57 GMT Message-Id: <202503171546.52HFkvl0093666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 5e41194bfcc5 - main - acpi_asus_wmi(4): Add EVDEV support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e41194bfcc54fb506070f7a01d5bc00326cde66 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5e41194bfcc54fb506070f7a01d5bc00326cde66 commit 5e41194bfcc54fb506070f7a01d5bc00326cde66 Author: Vladimir Kondratyev AuthorDate: 2025-03-17 15:45:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-03-17 15:45:14 +0000 acpi_asus_wmi(4): Add EVDEV support Use input event device to export hotkey events. Sponsored by: Future Crew LLC MFC after: 1 month Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D48982 --- sys/dev/acpi_support/acpi_asus_wmi.c | 140 +++++++++++++++++++++++++++++++- sys/modules/acpi/acpi_asus_wmi/Makefile | 1 + 2 files changed, 140 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpi_support/acpi_asus_wmi.c b/sys/dev/acpi_support/acpi_asus_wmi.c index 853696e67f84..80beee2fea7f 100644 --- a/sys/dev/acpi_support/acpi_asus_wmi.c +++ b/sys/dev/acpi_support/acpi_asus_wmi.c @@ -26,6 +26,7 @@ #include #include "opt_acpi.h" +#include "opt_evdev.h" #include #include #include @@ -41,6 +42,12 @@ #include #include "acpi_wmi_if.h" +#ifdef EVDEV_SUPPORT +#include +#include +#define NO_KEY KEY_RESERVED +#endif + #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("ASUS-WMI") @@ -110,6 +117,9 @@ struct acpi_asus_wmi_softc { struct sysctl_oid *sysctl_tree; int dsts_id; int handle_keys; +#ifdef EVDEV_SUPPORT + struct evdev_dev *evdev; +#endif }; static struct { @@ -253,6 +263,82 @@ static struct { { NULL, 0, NULL, 0 } }; +#ifdef EVDEV_SUPPORT +static const struct { + UINT32 notify; + uint16_t key; +} acpi_asus_wmi_evdev_map[] = { + { 0x20, KEY_BRIGHTNESSDOWN }, + { 0x2f, KEY_BRIGHTNESSUP }, + { 0x30, KEY_VOLUMEUP }, + { 0x31, KEY_VOLUMEDOWN }, + { 0x32, KEY_MUTE }, + { 0x35, KEY_SCREENLOCK }, + { 0x38, KEY_PROG3 }, /* Armoury Crate */ + { 0x40, KEY_PREVIOUSSONG }, + { 0x41, KEY_NEXTSONG }, + { 0x43, KEY_STOPCD }, /* Stop/Eject */ + { 0x45, KEY_PLAYPAUSE }, + { 0x4f, KEY_LEFTMETA }, /* Fn-locked "Windows" Key */ + { 0x4c, KEY_MEDIA }, /* WMP Key */ + { 0x50, KEY_EMAIL }, + { 0x51, KEY_WWW }, + { 0x55, KEY_CALC }, + { 0x57, NO_KEY }, /* Battery mode */ + { 0x58, NO_KEY }, /* AC mode */ + { 0x5C, KEY_F15 }, /* Power Gear key */ + { 0x5D, KEY_WLAN }, /* Wireless console Toggle */ + { 0x5E, KEY_WLAN }, /* Wireless console Enable */ + { 0x5F, KEY_WLAN }, /* Wireless console Disable */ + { 0x60, KEY_TOUCHPAD_ON }, + { 0x61, KEY_SWITCHVIDEOMODE }, /* SDSP LCD only */ + { 0x62, KEY_SWITCHVIDEOMODE }, /* SDSP CRT only */ + { 0x63, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + CRT */ + { 0x64, KEY_SWITCHVIDEOMODE }, /* SDSP TV */ + { 0x65, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + TV */ + { 0x66, KEY_SWITCHVIDEOMODE }, /* SDSP CRT + TV */ + { 0x67, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + CRT + TV */ + { 0x6B, KEY_TOUCHPAD_TOGGLE }, + { 0x6E, NO_KEY }, /* Low Battery notification */ + { 0x71, KEY_F13 }, /* General-purpose button */ + { 0x79, NO_KEY }, /* Charger type dectection notification */ + { 0x7a, KEY_ALS_TOGGLE }, /* Ambient Light Sensor Toggle */ + { 0x7c, KEY_MICMUTE }, + { 0x7D, KEY_BLUETOOTH }, /* Bluetooth Enable */ + { 0x7E, KEY_BLUETOOTH }, /* Bluetooth Disable */ + { 0x82, KEY_CAMERA }, + { 0x86, KEY_PROG1 }, /* MyASUS Key */ + { 0x88, KEY_RFKILL }, /* Radio Toggle Key */ + { 0x8A, KEY_PROG1 }, /* Color enhancement mode */ + { 0x8C, KEY_SWITCHVIDEOMODE }, /* SDSP DVI only */ + { 0x8D, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + DVI */ + { 0x8E, KEY_SWITCHVIDEOMODE }, /* SDSP CRT + DVI */ + { 0x8F, KEY_SWITCHVIDEOMODE }, /* SDSP TV + DVI */ + { 0x90, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + CRT + DVI */ + { 0x91, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + TV + DVI */ + { 0x92, KEY_SWITCHVIDEOMODE }, /* SDSP CRT + TV + DVI */ + { 0x93, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + CRT + TV + DVI */ + { 0x95, KEY_MEDIA }, + { 0x99, KEY_PHONE }, /* Conflicts with fan mode switch */ + { 0xA0, KEY_SWITCHVIDEOMODE }, /* SDSP HDMI only */ + { 0xA1, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + HDMI */ + { 0xA2, KEY_SWITCHVIDEOMODE }, /* SDSP CRT + HDMI */ + { 0xA3, KEY_SWITCHVIDEOMODE }, /* SDSP TV + HDMI */ + { 0xA4, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + CRT + HDMI */ + { 0xA5, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + TV + HDMI */ + { 0xA6, KEY_SWITCHVIDEOMODE }, /* SDSP CRT + TV + HDMI */ + { 0xA7, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + CRT + TV + HDMI */ + { 0xAE, KEY_FN_F5 }, /* Fn+F5 fan mode on 2020+ */ + { 0xB3, KEY_PROG4 }, /* AURA */ + { 0xB5, KEY_CALC }, + { 0xC4, KEY_KBDILLUMUP }, + { 0xC5, KEY_KBDILLUMDOWN }, + { 0xC6, NO_KEY }, /* Ambient Light Sensor notification */ + { 0xFA, KEY_PROG2 }, /* Lid flip action */ + { 0xBD, KEY_PROG2 }, /* Lid flip action on ROG xflow laptops */ +}; +#endif + ACPI_SERIAL_DECL(asus_wmi, "ASUS WMI device"); static void acpi_asus_wmi_identify(driver_t *driver, device_t parent); @@ -290,6 +376,9 @@ static driver_t acpi_asus_wmi_driver = { DRIVER_MODULE(acpi_asus_wmi, acpi_wmi, acpi_asus_wmi_driver, 0, 0); MODULE_DEPEND(acpi_asus_wmi, acpi_wmi, 1, 1, 1); MODULE_DEPEND(acpi_asus_wmi, acpi, 1, 1, 1); +#ifdef EVDEV_SUPPORT +MODULE_DEPEND(acpi_asus_wmi, evdev, 1, 1, 1); +#endif static void acpi_asus_wmi_identify(driver_t *driver, device_t parent) @@ -437,6 +526,27 @@ next: } ACPI_SERIAL_END(asus_wmi); +#ifdef EVDEV_SUPPORT + if (sc->notify_guid != NULL) { + sc->evdev = evdev_alloc(); + evdev_set_name(sc->evdev, device_get_desc(dev)); + evdev_set_phys(sc->evdev, device_get_nameunit(dev)); + evdev_set_id(sc->evdev, BUS_HOST, 0, 0, 1); + evdev_support_event(sc->evdev, EV_SYN); + evdev_support_event(sc->evdev, EV_KEY); + for (i = 0; i < nitems(acpi_asus_wmi_evdev_map); i++) { + if (acpi_asus_wmi_evdev_map[i].key != NO_KEY) + evdev_support_key(sc->evdev, + acpi_asus_wmi_evdev_map[i].key); + } + + if (evdev_register(sc->evdev) != 0) { + acpi_asus_wmi_detach(dev); + return (ENXIO); + } + } +#endif + return (0); } @@ -447,8 +557,12 @@ acpi_asus_wmi_detach(device_t dev) ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); - if (sc->notify_guid) + if (sc->notify_guid) { ACPI_WMI_REMOVE_EVENT_HANDLER(dev, sc->notify_guid); +#ifdef EVDEV_SUPPORT + evdev_free(sc->evdev); +#endif + } return (0); } @@ -540,6 +654,27 @@ acpi_asus_wmi_free_buffer(ACPI_BUFFER* buf) { } } +#ifdef EVDEV_SUPPORT +static void +acpi_asus_wmi_push_evdev_event(struct evdev_dev *evdev, UINT32 notify) +{ + int i; + uint16_t key; + + for (i = 0; i < nitems(acpi_asus_wmi_evdev_map); i++) { + if (acpi_asus_wmi_evdev_map[i].notify == notify && + acpi_asus_wmi_evdev_map[i].key != NO_KEY) { + key = acpi_asus_wmi_evdev_map[i].key; + evdev_push_key(evdev, key, 1); + evdev_sync(evdev); + evdev_push_key(evdev, key, 0); + evdev_sync(evdev); + break; + } + } +} +#endif + static void acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) { @@ -557,6 +692,9 @@ acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) code = obj->Integer.Value; acpi_UserNotify("ASUS", ACPI_ROOT_OBJECT, code); +#ifdef EVDEV_SUPPORT + acpi_asus_wmi_push_evdev_event(sc->evdev, code); +#endif } if (code && sc->handle_keys) { /* Keyboard backlight control. */ diff --git a/sys/modules/acpi/acpi_asus_wmi/Makefile b/sys/modules/acpi/acpi_asus_wmi/Makefile index c202ef8f0707..552eef2ac479 100644 --- a/sys/modules/acpi/acpi_asus_wmi/Makefile +++ b/sys/modules/acpi/acpi_asus_wmi/Makefile @@ -3,5 +3,6 @@ KMOD= acpi_asus_wmi CFLAGS+=-I${SRCTOP}/sys/dev/acpi_support SRCS= acpi_asus_wmi.c opt_acpi.h acpi_if.h acpi_wmi_if.h device_if.h bus_if.h +SRCS+= opt_evdev.h .include From nobody Mon Mar 17 15:46:58 2025 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 4ZGfVB4qNGz5qmX7; Mon, 17 Mar 2025 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGfVB305Sz46wY; Mon, 17 Mar 2025 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742226418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bNM3fRDzQjpVMGi/uXOW7+qdcEtQWxXfF0i2S13X8I=; b=Zg4xiEk4GfDRyloWPl4uuTe4S4ZXXFODbCK5+Vw8EihXy9gm/JlSCr36++hHtJy39HtkF/ YrAXvoEH1UKxvNXgXFE5OZOQkMi0uAJW/ywJOVrrEisYSw8bQ7s7uAlJnIKhO3cSzLDkmc C304m410/SIZuMpNi1Uuf8ZiV0R/lRnNY/fs51e3Q0Ntq2UPJGriszUjCB5MrSE1HkXmoQ 4xtW3Cbt4XE8P/7J+6mHaoGVLm2ugEXKoKgMggexuU0zNOQItNvY5GALef2B90z9Kcc84k C4lHYUCPVL8+yZl7MQkrgSjtO3X51SGhoCCbRoZv/mhUqeQawfFW1S0+1ti3FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742226418; a=rsa-sha256; cv=none; b=FZ0JdcjYbzhqLe0HnpR9dv8oVznbol9jMVOzdVUDhBE1lDVx2vCQEQn32DASbbtIP3846j SECRL7I6GC7s50sR4kQHYF01oUQh2Y6687I3l/NByE3c/0ddUuDuMOrZ9Jz/Hd6InzHFYV M/cY1eILcU7UHqdMiMqU86wqSOUD3JwpHKXWUmZOq8fLKFQHkUCf6rIW+d/oIATuoU8dZZ Oc4offEi/m0y1XOtj3ZonUIIE+wYE2+rwfNmS2pfx5Ld30oZ8OM1LFf0wjPF9a4JP+ASkv W4D16eLfHJy7muoQCY8LC5eBo/dPtxRzCwTq0/iJCmwhCNzC8JcsbUqFkQrLEw== 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=1742226418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bNM3fRDzQjpVMGi/uXOW7+qdcEtQWxXfF0i2S13X8I=; b=JQQi9lShh3PA4sCrJjM2GhjVaM72q3t1EQ7pAV3/ymEHx30MUObrxMxKvRwa0m3U315CQn 7EPNcMreeIG06LQNmMxnvDhncn0PNyM1nAh9hD6UIGa5Pb45DRfCI+VFmcvjw+OBqWuQKw Yrdn4nJndTmAx6pUtA8sKEKTIpQ7n6/lgRf/xYFCFqHNQyTV88u8GwUkdsP5e91QbE6uSs lYj1qc5mE5JhABrCQEKOIe937s56qRtNNhQK5oOnd1mDGbwwjzFTLtdoC01SLD9AGoqaTK LyNKzPWYOREA3kdaaKimcs7/+G/dNMFyRv0unxoqVu6xVJ97tPxDhxw+4dsAzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGfVB2QtWzt0N; Mon, 17 Mar 2025 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HFkwZp093706; Mon, 17 Mar 2025 15:46:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HFkwwb093703; Mon, 17 Mar 2025 15:46:58 GMT (envelope-from git) Date: Mon, 17 Mar 2025 15:46:58 GMT Message-Id: <202503171546.52HFkwwb093703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: f134662a1a57 - main - acpi_asus_wmi(4): Improve keyboard backlight support. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f134662a1a5726d78880385002a03b8fe68805f6 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=f134662a1a5726d78880385002a03b8fe68805f6 commit f134662a1a5726d78880385002a03b8fe68805f6 Author: Vladimir Kondratyev AuthorDate: 2025-03-17 15:45:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-03-17 15:45:14 +0000 acpi_asus_wmi(4): Improve keyboard backlight support. - Fix maximal keyboard backlight level, Although Linux source code comment says that backlight level is encoded in 3 bits of data, actual code limits maximum level to 3. - Add backlight(9) support for keyboard - Turn off/on keyboard backlight on suspend/resume Sponsored by: Future Crew LLC MFC after: 1 month Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D48983 --- share/man/man4/acpi_asus_wmi.4 | 10 ++- sys/dev/acpi_support/acpi_asus_wmi.c | 136 +++++++++++++++++++++++++++++++- sys/modules/acpi/acpi_asus_wmi/Makefile | 2 +- 3 files changed, 142 insertions(+), 6 deletions(-) diff --git a/share/man/man4/acpi_asus_wmi.4 b/share/man/man4/acpi_asus_wmi.4 index 7d6aeaca948b..721b73833484 100644 --- a/share/man/man4/acpi_asus_wmi.4 +++ b/share/man/man4/acpi_asus_wmi.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 2, 2012 +.Dd March 25, 2024 .Dt ACPI_ASUS_WMI 4 .Os .Sh NAME @@ -72,11 +72,19 @@ Number of other variables under the same sysctl branch are model-specific. Defaults for these variables can be set in .Xr sysctl.conf 5 , which is parsed at boot-time. +.Sh FILES +.Bl -tag -width "/dev/backlight/acpi_asus_wmi0" -compact +.It Pa /dev/backlight/acpi_asus_wmi0 +Keyboard +.Xr backlight 8 +device node. +.El .Sh SEE ALSO .Xr acpi 4 , .Xr acpi_asus 4 , .Xr acpi_video 4 , .Xr sysctl.conf 5 , +.Xr backlight 8 , .Xr devd 8 , .Xr sysctl 8 .Sh HISTORY diff --git a/sys/dev/acpi_support/acpi_asus_wmi.c b/sys/dev/acpi_support/acpi_asus_wmi.c index 80beee2fea7f..968de5fe5e87 100644 --- a/sys/dev/acpi_support/acpi_asus_wmi.c +++ b/sys/dev/acpi_support/acpi_asus_wmi.c @@ -42,6 +42,9 @@ #include #include "acpi_wmi_if.h" +#include +#include "backlight_if.h" + #ifdef EVDEV_SUPPORT #include #include @@ -117,6 +120,8 @@ struct acpi_asus_wmi_softc { struct sysctl_oid *sysctl_tree; int dsts_id; int handle_keys; + struct cdev *kbd_bkl; + uint32_t kbd_bkl_level; #ifdef EVDEV_SUPPORT struct evdev_dev *evdev; #endif @@ -345,6 +350,8 @@ static void acpi_asus_wmi_identify(driver_t *driver, device_t parent); static int acpi_asus_wmi_probe(device_t dev); static int acpi_asus_wmi_attach(device_t dev); static int acpi_asus_wmi_detach(device_t dev); +static int acpi_asus_wmi_suspend(device_t dev); +static int acpi_asus_wmi_resume(device_t dev); static int acpi_asus_wmi_sysctl(SYSCTL_HANDLER_ARGS); static int acpi_asus_wmi_sysctl_set(struct acpi_asus_wmi_softc *sc, int dev_id, @@ -357,12 +364,26 @@ static int acpi_wpi_asus_get_devstate(struct acpi_asus_wmi_softc *sc, static int acpi_wpi_asus_set_devstate(struct acpi_asus_wmi_softc *sc, UINT32 dev_id, UINT32 ctrl_param, UINT32 *retval); static void acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context); +static int acpi_asus_wmi_backlight_update_status(device_t dev, + struct backlight_props *props); +static int acpi_asus_wmi_backlight_get_status(device_t dev, + struct backlight_props *props); +static int acpi_asus_wmi_backlight_get_info(device_t dev, + struct backlight_info *info); static device_method_t acpi_asus_wmi_methods[] = { + /* Device interface */ DEVMETHOD(device_identify, acpi_asus_wmi_identify), DEVMETHOD(device_probe, acpi_asus_wmi_probe), DEVMETHOD(device_attach, acpi_asus_wmi_attach), DEVMETHOD(device_detach, acpi_asus_wmi_detach), + DEVMETHOD(device_suspend, acpi_asus_wmi_suspend), + DEVMETHOD(device_resume, acpi_asus_wmi_resume), + + /* Backlight interface */ + DEVMETHOD(backlight_update_status, acpi_asus_wmi_backlight_update_status), + DEVMETHOD(backlight_get_status, acpi_asus_wmi_backlight_get_status), + DEVMETHOD(backlight_get_info, acpi_asus_wmi_backlight_get_info), DEVMETHOD_END }; @@ -376,10 +397,35 @@ static driver_t acpi_asus_wmi_driver = { DRIVER_MODULE(acpi_asus_wmi, acpi_wmi, acpi_asus_wmi_driver, 0, 0); MODULE_DEPEND(acpi_asus_wmi, acpi_wmi, 1, 1, 1); MODULE_DEPEND(acpi_asus_wmi, acpi, 1, 1, 1); +MODULE_DEPEND(acpi_asus_wmi, backlight, 1, 1, 1); #ifdef EVDEV_SUPPORT MODULE_DEPEND(acpi_asus_wmi, evdev, 1, 1, 1); #endif +static const uint32_t acpi_asus_wmi_backlight_levels[] = { 0, 33, 66, 100 }; + +static inline uint32_t +devstate_to_kbd_bkl_level(UINT32 val) +{ + return (acpi_asus_wmi_backlight_levels[val & 0x3]); +} + +static inline UINT32 +kbd_bkl_level_to_devstate(uint32_t bkl) +{ + UINT32 val; + int i; + + for (i = 0; i < nitems(acpi_asus_wmi_backlight_levels); i++) { + if (bkl < acpi_asus_wmi_backlight_levels[i]) + break; + } + val = (i - 1) & 0x3; + if (val != 0) + val |= 0x80; + return(val); +} + static void acpi_asus_wmi_identify(driver_t *driver, device_t parent) { @@ -418,6 +464,7 @@ acpi_asus_wmi_attach(device_t dev) struct acpi_asus_wmi_softc *sc; UINT32 val; int dev_id, i; + bool have_kbd_bkl = false; ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); @@ -502,6 +549,10 @@ next: if (val == 0) continue; break; + case ASUS_WMI_DEVID_KBD_BACKLIGHT: + sc->kbd_bkl_level = devstate_to_kbd_bkl_level(val); + have_kbd_bkl = true; + /* FALLTHROUGH */ default: if ((val & ASUS_WMI_DSTS_PRESENCE_BIT) == 0) continue; @@ -541,12 +592,22 @@ next: } if (evdev_register(sc->evdev) != 0) { + device_printf(dev, "Can not register evdev\n"); acpi_asus_wmi_detach(dev); return (ENXIO); } } #endif + if (have_kbd_bkl) { + sc->kbd_bkl = backlight_register("acpi_asus_wmi", dev); + if (sc->kbd_bkl == NULL) { + device_printf(dev, "Can not register backlight\n"); + acpi_asus_wmi_detach(dev); + return (ENXIO); + } + } + return (0); } @@ -557,6 +618,9 @@ acpi_asus_wmi_detach(device_t dev) ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); + if (sc->kbd_bkl != NULL) + backlight_destroy(sc->kbd_bkl); + if (sc->notify_guid) { ACPI_WMI_REMOVE_EVENT_HANDLER(dev, sc->notify_guid); #ifdef EVDEV_SUPPORT @@ -567,6 +631,34 @@ acpi_asus_wmi_detach(device_t dev) return (0); } +static int +acpi_asus_wmi_suspend(device_t dev) +{ + struct acpi_asus_wmi_softc *sc = device_get_softc(dev); + + if (sc->kbd_bkl != NULL) { + ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); + acpi_wpi_asus_set_devstate(sc, + ASUS_WMI_DEVID_KBD_BACKLIGHT, 0, NULL); + } + + return (0); +} + +static int +acpi_asus_wmi_resume(device_t dev) +{ + struct acpi_asus_wmi_softc *sc = device_get_softc(dev); + + if (sc->kbd_bkl != NULL) { + ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); + acpi_wpi_asus_set_devstate(sc, ASUS_WMI_DEVID_KBD_BACKLIGHT, + kbd_bkl_level_to_devstate(sc->kbd_bkl_level), NULL); + } + + return (0); +} + static int acpi_asus_wmi_sysctl(SYSCTL_HANDLER_ARGS) { @@ -615,7 +707,7 @@ acpi_asus_wmi_sysctl_get(struct acpi_asus_wmi_softc *sc, int dev_id) val &= ASUS_WMI_DSTS_BRIGHTNESS_MASK; break; case ASUS_WMI_DEVID_KBD_BACKLIGHT: - val &= 0x7; + val &= 0x3; break; default: if (val & ASUS_WMI_DSTS_UNKNOWN_BIT) @@ -636,7 +728,7 @@ acpi_asus_wmi_sysctl_set(struct acpi_asus_wmi_softc *sc, int dev_id, int arg, in switch(dev_id) { case ASUS_WMI_DEVID_KBD_BACKLIGHT: - arg = min(0x7, arg); + arg = min(0x3, arg); if (arg != 0) arg |= 0x80; break; @@ -701,9 +793,9 @@ acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) if (code == 0xc4 || code == 0xc5) { acpi_wpi_asus_get_devstate(sc, ASUS_WMI_DEVID_KBD_BACKLIGHT, &val); - val &= 0x7; + val &= 0x3; if (code == 0xc4) { - if (val < 0x7) + if (val < 0x3) val++; } else if (val > 0) val--; @@ -711,6 +803,7 @@ acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) val |= 0x80; acpi_wpi_asus_set_devstate(sc, ASUS_WMI_DEVID_KBD_BACKLIGHT, val, NULL); + sc->kbd_bkl_level = devstate_to_kbd_bkl_level(val); } /* Touchpad control. */ if (code == 0x6b) { @@ -767,3 +860,38 @@ acpi_wpi_asus_set_devstate(struct acpi_asus_wmi_softc *sc, return (acpi_asus_wmi_evaluate_method(sc->wmi_dev, ASUS_WMI_METHODID_DEVS, dev_id, ctrl_param, retval)); } + +static int +acpi_asus_wmi_backlight_update_status(device_t dev, struct backlight_props + *props) +{ + struct acpi_asus_wmi_softc *sc = device_get_softc(dev); + + acpi_wpi_asus_set_devstate(sc, ASUS_WMI_DEVID_KBD_BACKLIGHT, + kbd_bkl_level_to_devstate(props->brightness), NULL); + sc->kbd_bkl_level = props->brightness; + + return (0); +} + +static int +acpi_asus_wmi_backlight_get_status(device_t dev, struct backlight_props *props) +{ + struct acpi_asus_wmi_softc *sc = device_get_softc(dev); + + props->brightness = sc->kbd_bkl_level; + props->nlevels = nitems(acpi_asus_wmi_backlight_levels); + memcpy(props->levels, acpi_asus_wmi_backlight_levels, + sizeof(acpi_asus_wmi_backlight_levels)); + + return (0); +} + +static int +acpi_asus_wmi_backlight_get_info(device_t dev, struct backlight_info *info) +{ + info->type = BACKLIGHT_TYPE_KEYBOARD; + strlcpy(info->name, "ASUS Keyboard", BACKLIGHTMAXNAMELENGTH); + + return (0); +} diff --git a/sys/modules/acpi/acpi_asus_wmi/Makefile b/sys/modules/acpi/acpi_asus_wmi/Makefile index 552eef2ac479..3067bec099f5 100644 --- a/sys/modules/acpi/acpi_asus_wmi/Makefile +++ b/sys/modules/acpi/acpi_asus_wmi/Makefile @@ -3,6 +3,6 @@ KMOD= acpi_asus_wmi CFLAGS+=-I${SRCTOP}/sys/dev/acpi_support SRCS= acpi_asus_wmi.c opt_acpi.h acpi_if.h acpi_wmi_if.h device_if.h bus_if.h -SRCS+= opt_evdev.h +SRCS+= opt_evdev.h backlight_if.h .include From nobody Mon Mar 17 15:47:00 2025 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 4ZGfVD70F0z5qmVV; Mon, 17 Mar 2025 15:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGfVD4TRJz46yV; Mon, 17 Mar 2025 15:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742226420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5rsZQf72qkLn9mdzbvJOo1fGFj/eW25C5EDwDYTth0=; b=ozFfaDZ/nc4UjTGnIypHQuZGMA3gfZ1l5fDHVIWvUvy9MTiWW1f8Jg59cJgwmt2y0+7QRm GWU+Y5rgQArf5lAV6TiIvIbJspCYuunpDFrSofIUopPIj7ywJ7VOyYJ2SUVCn9ZmK01vey IBmkZNwyNEphh+DVKYHtqEf3I36WgaI4UTSam9zcNk0aXVqNdQXf2/V6KY6EcqTshk5weI H+dNcCswxAKYGn9VC6t6vWWq3P+wfkapxmW2+dssNdYq1vDxl7vJh2lUDaiB7aZyexel8c ISP0XuzKmndlR6djHPlOyX+YUARzFDYLbOqOCS9JzgQar/bu3C+qLNMvUhHt7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742226420; a=rsa-sha256; cv=none; b=M6ir90k7JEbb3qXEd4SSPlshzH6DNjVq8OuJ2k4kCM0LFuBy6a0p2fFaFN9ohm2W476RBx okMuJpVdDS/lFd9FewPUWMlaEovWKmO+5txLyoszOaD/0Y6w40mEj4EP/YHdgqmQMzi+qS pwT2p1hLsMHfo0c0jVgb8FHT2It+Ouc5yR/aLLelILCpn5RKSRKNNAL0o5RfiwRVdPkL3w 4OZ8j/6TmDlqu/CASluJHmOgtD3XWHMOl98o2sJpNCazr/1FVijnM/4qTRrpRbRr4DiU02 39+VYowe7KXQCdV/k70AD9cvzc3xdV7SzJm6OWpsXNoYShQeDhZeW1luh9z8Dw== 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=1742226420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5rsZQf72qkLn9mdzbvJOo1fGFj/eW25C5EDwDYTth0=; b=xYoahbVsG5GmE3uZ2c7qosizV02UpIRHbCBkQO04eto7FBngLR/2fDcU2Y5ltIiDwyE5Qv GUXikdr9OU2fy6jTM/t84ACbeoTezN114pNvfCo0p6XT/iqOG0W7WrAjyz3J6SwqCCTqyz YTNIExKiUjLkx75mqWwwu/s4kJaX5eFyM1zgZE5asD8HlcbVAw5oyCdxrLaKU9y6IUzImd vQxZg4V18L+K7FCj5Lns2RLhp6g55rTKPUIQUOmfSEr2fkk7NxKJOjSxow1ylehjEwUGpw K/2sBk+7Fal1wm+5QEsn9rdJBqjZ5HXce37gFYKqRqVACPaT9jLWK1nQyZFOMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGfVD3zw7zt1M; Mon, 17 Mar 2025 15:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HFl0lG093781; Mon, 17 Mar 2025 15:47:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HFl0Gf093778; Mon, 17 Mar 2025 15:47:00 GMT (envelope-from git) Date: Mon, 17 Mar 2025 15:47:00 GMT Message-Id: <202503171547.52HFl0Gf093778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 027b93c2f5e1 - main - acpi_asus_wmi(4): Handle TUF-specific hotkeys 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 027b93c2f5e1b84d9e4569f127b632c704c53b73 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=027b93c2f5e1b84d9e4569f127b632c704c53b73 commit 027b93c2f5e1b84d9e4569f127b632c704c53b73 Author: Vladimir Kondratyev AuthorDate: 2025-03-17 15:45:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-03-17 15:45:14 +0000 acpi_asus_wmi(4): Handle TUF-specific hotkeys internally - Cycle TUF laptop RGB mode on AURA key press - Switch TUF 'Throttle Thermal Policy' with 'Fan' key Sponsored by: Future Crew LLC MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D48985 --- sys/dev/acpi_support/acpi_asus_wmi.c | 62 +++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpi_support/acpi_asus_wmi.c b/sys/dev/acpi_support/acpi_asus_wmi.c index e3d16b9345ee..0e9c35d42793 100644 --- a/sys/dev/acpi_support/acpi_asus_wmi.c +++ b/sys/dev/acpi_support/acpi_asus_wmi.c @@ -99,9 +99,11 @@ ACPI_MODULE_NAME("ASUS-WMI") #define ASUS_WMI_DEVID_CARDREADER 0x00080013 #define ASUS_WMI_DEVID_TOUCHPAD 0x00100011 #define ASUS_WMI_DEVID_TOUCHPAD_LED 0x00100012 +#define ASUS_WMI_DEVID_TUF_RGB_MODE 0x00100056 #define ASUS_WMI_DEVID_THERMAL_CTRL 0x00110011 #define ASUS_WMI_DEVID_FAN_CTRL 0x00110012 #define ASUS_WMI_DEVID_PROCESSOR_STATE 0x00120012 +#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x00120075 /* DSTS masks */ #define ASUS_WMI_DSTS_STATUS_BIT 0x00000001 @@ -129,6 +131,8 @@ struct acpi_asus_wmi_softc { bool event_queue; struct cdev *kbd_bkl; uint32_t kbd_bkl_level; + uint32_t tuf_rgb_mode; + uint32_t ttp_mode; #ifdef EVDEV_SUPPORT struct evdev_dev *evdev; #endif @@ -272,6 +276,12 @@ static struct { .dev_id = ASUS_WMI_DEVID_PROCESSOR_STATE, .flag_rdonly = 1 }, + { + .name = "throttle_thermal_policy", + .dev_id = ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, + .description = "Throttle Thermal Policy " + "(0 - default, 1 - overboost, 2 - silent)", + }, { NULL, 0, NULL, 0 } }; @@ -365,7 +375,7 @@ static int acpi_asus_wmi_sysctl_set(struct acpi_asus_wmi_softc *sc, int dev_id, int arg, int oldarg); static int acpi_asus_wmi_sysctl_get(struct acpi_asus_wmi_softc *sc, int dev_id); static int acpi_asus_wmi_evaluate_method(device_t wmi_dev, int method, - UINT32 arg0, UINT32 arg1, UINT32 *retval); + UINT32 arg0, UINT32 arg1, UINT32 arg2, UINT32 *retval); static int acpi_wpi_asus_get_devstate(struct acpi_asus_wmi_softc *sc, UINT32 dev_id, UINT32 *retval); static int acpi_wpi_asus_set_devstate(struct acpi_asus_wmi_softc *sc, @@ -528,14 +538,14 @@ next: /* Initialize. */ if (!acpi_asus_wmi_evaluate_method(sc->wmi_dev, - ASUS_WMI_METHODID_INIT, 0, 0, &val) && bootverbose) + ASUS_WMI_METHODID_INIT, 0, 0, 0, &val) && bootverbose) device_printf(dev, "Initialization: %#x\n", val); if (!acpi_asus_wmi_evaluate_method(sc->wmi_dev, - ASUS_WMI_METHODID_SPEC, 0, 0x9, &val) && bootverbose) + ASUS_WMI_METHODID_SPEC, 0, 0x9, 0, &val) && bootverbose) device_printf(dev, "WMI BIOS version: %d.%d\n", val >> 16, val & 0xFF); if (!acpi_asus_wmi_evaluate_method(sc->wmi_dev, - ASUS_WMI_METHODID_SFUN, 0, 0, &val) && bootverbose) + ASUS_WMI_METHODID_SFUN, 0, 0, 0, &val) && bootverbose) device_printf(dev, "SFUN value: %#x\n", val); ACPI_SERIAL_BEGIN(asus_wmi); @@ -720,6 +730,13 @@ acpi_asus_wmi_sysctl_get(struct acpi_asus_wmi_softc *sc, int dev_id) ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_SERIAL_ASSERT(asus_wmi); + switch(dev_id) { + case ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY: + return (sc->ttp_mode); + default: + break; + } + acpi_wpi_asus_get_devstate(sc, dev_id, &val); switch(dev_id) { @@ -758,6 +775,10 @@ acpi_asus_wmi_sysctl_set(struct acpi_asus_wmi_softc *sc, int dev_id, int arg, in if (arg != 0) arg |= 0x80; break; + case ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY: + arg = min(0x2, arg); + sc->ttp_mode = arg; + break; } acpi_wpi_asus_set_devstate(sc, dev_id, arg, NULL); @@ -848,6 +869,31 @@ acpi_asus_wmi_handle_event(struct acpi_asus_wmi_softc *sc, int code) acpi_wpi_asus_set_devstate(sc, ASUS_WMI_DEVID_TOUCHPAD, val, NULL); } + /* Throttle thermal policy control. */ + if (code == 0xae) { + sc->ttp_mode++; + if (sc->ttp_mode > 2) + sc->ttp_mode = 0; + acpi_wpi_asus_set_devstate(sc, + ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, + sc->ttp_mode, NULL); + } + /* TUF laptop RGB mode control. */ + if (code == 0xb3) { + const uint32_t cmd = 0xb4; /* Save to BIOS */ + const uint32_t r = 0xff, g = 0xff, b = 0xff; + const uint32_t speed = 0xeb; /* Medium */ + if (sc->tuf_rgb_mode < 2) + sc->tuf_rgb_mode++; + else if (sc->tuf_rgb_mode == 2) + sc->tuf_rgb_mode = 10; + else sc->tuf_rgb_mode = 0; + acpi_asus_wmi_evaluate_method(sc->wmi_dev, + ASUS_WMI_METHODID_DEVS, + ASUS_WMI_DEVID_TUF_RGB_MODE, + cmd | (sc->tuf_rgb_mode << 8) | (r << 16) | (g << 24), + b | (speed << 8), NULL); + } } } @@ -882,9 +928,9 @@ acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) static int acpi_asus_wmi_evaluate_method(device_t wmi_dev, int method, - UINT32 arg0, UINT32 arg1, UINT32 *retval) + UINT32 arg0, UINT32 arg1, UINT32 arg2, UINT32 *retval) { - UINT32 params[2] = { arg0, arg1 }; + UINT32 params[3] = { arg0, arg1, arg2 }; UINT32 result; ACPI_OBJECT *obj; ACPI_BUFFER in = { sizeof(params), ¶ms }; @@ -912,7 +958,7 @@ acpi_wpi_asus_get_devstate(struct acpi_asus_wmi_softc *sc, { return (acpi_asus_wmi_evaluate_method(sc->wmi_dev, - sc->dsts_id, dev_id, 0, retval)); + sc->dsts_id, dev_id, 0, 0, retval)); } static int @@ -921,7 +967,7 @@ acpi_wpi_asus_set_devstate(struct acpi_asus_wmi_softc *sc, { return (acpi_asus_wmi_evaluate_method(sc->wmi_dev, - ASUS_WMI_METHODID_DEVS, dev_id, ctrl_param, retval)); + ASUS_WMI_METHODID_DEVS, dev_id, ctrl_param, 0, retval)); } static int From nobody Mon Mar 17 15:46:59 2025 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 4ZGfVD1XwZz5qmG7; Mon, 17 Mar 2025 15:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGfVC3SMsz4742; Mon, 17 Mar 2025 15:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742226419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vBb5c1JOj2DvMBtsc315G+PIl4yB3JgGl21bBLbtDQ0=; b=hdDfEx66uZ9c9NhqGZoOY4Qe/opN09hjKtAOzgRQzlbCCFi0BU11x5nCZJ/vJD9wRpEiv0 qbU2VtIvhanVpfGfKMNPiqoj0a7189N1AzF0ipmQPsIdVTDLY+hffvAL6EjAdww3YuNuGG Fvf7AXILhoeKjqnk4lMbfrXpi0KWi1zwuWiLS94hRbTwN+CDsaLXUq1NgcocJkati1nV33 d7hc9XWGPDGhcBefX6/RgU2WfohoxMpxT4DPPGYEGopq3O9eDzRyOAVB29F2CuGTAM5L0y oAyybAVsfPZln+vWJalv+GLYF6IoysJTFehWALEGuKrVHtQJgcHo6zQIIDmQ8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742226419; a=rsa-sha256; cv=none; b=hsDPzDJtPtoLWFv7sxgfn5VzxxNL6piPiHe31zaUHflashQaPwSex/MMT3qjRX6s+VE3QN 9rz1TakQMUUCscoswEJguyf8TRcDSm9a2kYxnEReNttu3pgp7z0oj/Mnww5hgCqh4N2wMB fBxKw0ro0GB3UlfKJyMS4gtskXoucsAds9/+8kzwZGiMsP/FwPy9iLKpp3Y/EkgXh0TR/f 84ik/Dg/LIjCSkXqvq/3KyC4RO5HO11YtRY5l+0mG1QchJooR3u89YB8152W68uYzzlKkI incnYVFY1qTwYegHeuHBhHr7keNKOANC54dO017bZvT+EA31BGL8S4QEqno8fg== 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=1742226419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vBb5c1JOj2DvMBtsc315G+PIl4yB3JgGl21bBLbtDQ0=; b=euuxhYp27xEaj9oF3KhWAvJCvMDAX8a36u0n4RksesWFfDLQgglTzo/U7BfZQrwhlTQNSe xKvuZuQWHeE2KOwSIKK7dz8n4P0bGECYU2lw0A8PRyWhKxwU47NCXq/K208AL0g4RxFrMn MIYEJQFb88E8bloQz3fxAT1H2kcK1geZ5GE3pb2McETH8KoxQ5GY8il5/981t01r69LqXv +dNR8Mayoi6vla+dK3hM0VV1cJJaDM1cPJAZcUGg+vonffsZv0RG/Nj2hKugSsty/oXrGN J16sZ5pBy44dlmW7uJnPpySNFaYH7zF2MBMod9/UFM9lHaYbuzZdhj+XHS0lpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGfVC33vYztNl; Mon, 17 Mar 2025 15:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HFkxgC093741; Mon, 17 Mar 2025 15:46:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HFkx2d093738; Mon, 17 Mar 2025 15:46:59 GMT (envelope-from git) Date: Mon, 17 Mar 2025 15:46:59 GMT Message-Id: <202503171546.52HFkx2d093738@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: d5bf6a7245cc - main - acpi_asus_wmi(4): Add support for WMI event queue List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5bf6a7245cc7825d17ebb00d1e7f07ae6dc32e6 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d5bf6a7245cc7825d17ebb00d1e7f07ae6dc32e6 commit d5bf6a7245cc7825d17ebb00d1e7f07ae6dc32e6 Author: Vladimir Kondratyev AuthorDate: 2025-03-17 15:45:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-03-17 15:45:14 +0000 acpi_asus_wmi(4): Add support for WMI event queue Event codes are expected to be retrieved from a queue on at least some models. Specifically, very likely the ACPI WMI devices with _UID ATK are queued whereas those with ASUSWMI are not. Sponsored by: Future Crew LLC MFC after: 1 month Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D48984 --- sys/dev/acpi_support/acpi_asus_wmi.c | 89 ++++++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 13 deletions(-) diff --git a/sys/dev/acpi_support/acpi_asus_wmi.c b/sys/dev/acpi_support/acpi_asus_wmi.c index 968de5fe5e87..e3d16b9345ee 100644 --- a/sys/dev/acpi_support/acpi_asus_wmi.c +++ b/sys/dev/acpi_support/acpi_asus_wmi.c @@ -112,6 +112,12 @@ ACPI_MODULE_NAME("ASUS-WMI") #define ASUS_WMI_DSTS_BRIGHTNESS_MASK 0x000000FF #define ASUS_WMI_DSTS_MAX_BRIGTH_MASK 0x0000FF00 +/* Events */ +#define ASUS_WMI_EVENT_QUEUE_SIZE 0x10 +#define ASUS_WMI_EVENT_QUEUE_END 0x1 +#define ASUS_WMI_EVENT_MASK 0xFFFF +#define ASUS_WMI_EVENT_VALUE_ATK 0xFF + struct acpi_asus_wmi_softc { device_t dev; device_t wmi_dev; @@ -120,6 +126,7 @@ struct acpi_asus_wmi_softc { struct sysctl_oid *sysctl_tree; int dsts_id; int handle_keys; + bool event_queue; struct cdev *kbd_bkl; uint32_t kbd_bkl_level; #ifdef EVDEV_SUPPORT @@ -363,6 +370,8 @@ static int acpi_wpi_asus_get_devstate(struct acpi_asus_wmi_softc *sc, UINT32 dev_id, UINT32 *retval); static int acpi_wpi_asus_set_devstate(struct acpi_asus_wmi_softc *sc, UINT32 dev_id, UINT32 ctrl_param, UINT32 *retval); +static int acpi_asus_wmi_get_event_code(device_t wmi_dev, UINT32 notify, + int *code); static void acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context); static int acpi_asus_wmi_backlight_update_status(device_t dev, struct backlight_props *props); @@ -463,7 +472,7 @@ acpi_asus_wmi_attach(device_t dev) { struct acpi_asus_wmi_softc *sc; UINT32 val; - int dev_id, i; + int dev_id, i, code; bool have_kbd_bkl = false; ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); @@ -577,6 +586,23 @@ next: } ACPI_SERIAL_END(asus_wmi); + /* Detect and flush event queue */ + if (sc->dsts_id == ASUS_WMI_METHODID_DSTS2) { + for (i = 0; i <= ASUS_WMI_EVENT_QUEUE_SIZE; i++) { + if (acpi_asus_wmi_get_event_code(sc->wmi_dev, + ASUS_WMI_EVENT_VALUE_ATK, &code) != 0) { + device_printf(dev, + "Can not flush event queue\n"); + break; + } + if (code == ASUS_WMI_EVENT_QUEUE_END || + code == ASUS_WMI_EVENT_MASK) { + sc->event_queue = true; + break; + } + } + } + #ifdef EVDEV_SUPPORT if (sc->notify_guid != NULL) { sc->evdev = evdev_alloc(); @@ -746,6 +772,24 @@ acpi_asus_wmi_free_buffer(ACPI_BUFFER* buf) { } } +static int +acpi_asus_wmi_get_event_code(device_t wmi_dev, UINT32 notify, int *code) +{ + ACPI_BUFFER response = { ACPI_ALLOCATE_BUFFER, NULL }; + ACPI_OBJECT *obj; + int error = 0; + + if (ACPI_FAILURE(ACPI_WMI_GET_EVENT_DATA(wmi_dev, notify, &response))) + return (EIO); + obj = (ACPI_OBJECT*) response.Pointer; + if (obj && obj->Type == ACPI_TYPE_INTEGER) + *code = obj->Integer.Value & ASUS_WMI_EVENT_MASK; + else + error = EINVAL; + acpi_asus_wmi_free_buffer(&response); + return (error); +} + #ifdef EVDEV_SUPPORT static void acpi_asus_wmi_push_evdev_event(struct evdev_dev *evdev, UINT32 notify) @@ -768,20 +812,11 @@ acpi_asus_wmi_push_evdev_event(struct evdev_dev *evdev, UINT32 notify) #endif static void -acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) +acpi_asus_wmi_handle_event(struct acpi_asus_wmi_softc *sc, int code) { - device_t dev = context; - ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, notify); UINT32 val; - int code = 0; - struct acpi_asus_wmi_softc *sc = device_get_softc(dev); - ACPI_BUFFER response = { ACPI_ALLOCATE_BUFFER, NULL }; - ACPI_OBJECT *obj; - ACPI_WMI_GET_EVENT_DATA(sc->wmi_dev, notify, &response); - obj = (ACPI_OBJECT*) response.Pointer; - if (obj && obj->Type == ACPI_TYPE_INTEGER) { - code = obj->Integer.Value; + if (code != 0) { acpi_UserNotify("ASUS", ACPI_ROOT_OBJECT, code); #ifdef EVDEV_SUPPORT @@ -814,7 +849,35 @@ acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) ASUS_WMI_DEVID_TOUCHPAD, val, NULL); } } - acpi_asus_wmi_free_buffer(&response); +} + +static void +acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) +{ + device_t dev = context; + struct acpi_asus_wmi_softc *sc = device_get_softc(dev); + int code = 0, i = 1; + + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, notify); + + if (sc->event_queue) + i += ASUS_WMI_EVENT_QUEUE_SIZE; + do { + if (acpi_asus_wmi_get_event_code(sc->wmi_dev, notify, &code) + != 0) { + device_printf(dev, "Failed to get event code\n"); + return; + } + if (code == ASUS_WMI_EVENT_QUEUE_END || + code == ASUS_WMI_EVENT_MASK) + return; + acpi_asus_wmi_handle_event(sc, code); + if (notify != ASUS_WMI_EVENT_VALUE_ATK) + return; + } while (--i != 0); + if (sc->event_queue) + device_printf(dev, "Can not read event queue, " + "last code: 0x%x\n", code); } static int From nobody Mon Mar 17 19:14:06 2025 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 4ZGl5C0wNnz5qY3m; Mon, 17 Mar 2025 19:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGl5C0C8jz3XQM; Mon, 17 Mar 2025 19:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742238847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=muDiRR6Nop93bWnl+3gsSMkJ19wXIGYT+3s96meBisQ=; b=sDvm+7L8XDj4i+dd2hC12wlv3ZvyIKOqXkLa0Uc3qkI47Vq9hYXFbBwWlasLsuHLbDszKL BsV8zeOIw3SiuphnwZ+IUh39ePsjPwMeqLCgJprtBgJqAQCz5JSgNOkt0pzz8S+CCOBjZJ aMRlf86FEoiZ/NDrXV6Ry6TiMOOKxV95kHwS2QORbj3c7q+RPE6Z/6csRgup3Gl7ZAPaAv SvXuEL7AeOYsRIC2LLehPafuo86LJVCJjn2b6wKRcNahr62nWjw5+XIzcoE02HyaJl++MM 7NMuehhy3wTAw1iQnlXbVpSBjXgO3bIvr8ClniWmF+txxJVAom3/yGBOfIQOdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742238847; a=rsa-sha256; cv=none; b=BVB1WK9D8+W0R7wEG42689dgzoIh2jPRqcZBQyG6CjMfabKp5zaDZVLe2UTdp5ZmydZSHm y8wMybnIq8YPzu7GlIn2XgN/kXmF0MVtKPcEqAt3ER/jDGGofPHMO/BvJ7hGZxDUEPJ9+1 /vTLEChUWpuiEHjulCJYGY1B5li552xJ1A9VudEpdbL25ybWi83rNyyOnWYCjZjPs2Sdva +oV2g9jgliLCdoXKNioZAg2MkONTLPwlRMveM784NM7CwqoUJk5592jBnNovCqY+oZPkfO ipTdMS+lQR9jXyr/66DL7OXB41j4ucNN6ykzF3/jLwaw0YdxyKoIeokhHgq0fg== 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=1742238847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=muDiRR6Nop93bWnl+3gsSMkJ19wXIGYT+3s96meBisQ=; b=j2s02azA26pApQlbvbnIa8mJTqwPzbhuCKOx1wvh6u1PREPhBlKw4gQY0KsnF4flSjeDFD tXvwNdc4vxUAVCYcs2lGa/p8p5xsvzZDBEJG64zLnYEbCe6DLGnftZEIMDFzgemOKcq650 BBgYxsufzNv/UqM4ckYAANvg3aRHoysMdTI5DNdsKtNJuSHUxxbxB3exEgCzBbVvLx57We BPADA56PvWTZTpKFZxTVfi8paBWDSL6Hm1oy+uobMt75qWTNGiQtOzc/0wPhKnWBaXqvPG TmRXfOzoKP0nGRy22HsvaqviEyky46jE6SsXO3vGRMDU76VCLXJDc/lsmfnYWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGl5B6nPhz10T2; Mon, 17 Mar 2025 19:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HJE6nl088375; Mon, 17 Mar 2025 19:14:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HJE69T088372; Mon, 17 Mar 2025 19:14:06 GMT (envelope-from git) Date: Mon, 17 Mar 2025 19:14:06 GMT Message-Id: <202503171914.52HJE69T088372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f506d5af50fc - main - uma: Avoid excessive per-CPU draining List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f506d5af50fccc37f5aa9fe090e9a0d5f05506c8 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f506d5af50fccc37f5aa9fe090e9a0d5f05506c8 commit f506d5af50fccc37f5aa9fe090e9a0d5f05506c8 Author: Mark Johnston AuthorDate: 2025-03-17 19:12:58 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-03-17 19:12:58 +0000 uma: Avoid excessive per-CPU draining After commit 389a3fa693ef, uma_reclaim_domain(UMA_RECLAIM_DRAIN_CPU) calls uma_zone_reclaim_domain(UMA_RECLAIM_DRAIN_CPU) twice on each zone in addition to globally draining per-CPU caches. This was unintended and is unnecessarily slow; in particular, draining per-CPU caches requires binding to each CPU. Stop draining per-CPU caches when visiting each zone, just do it once in pcpu_cache_drain_safe() to minimize the amount of expensive sched_bind() calls. Fixes: 389a3fa693ef ("uma: Add UMA_ZONE_UNMANAGED") MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: gallatin, kib Differential Revision: https://reviews.freebsd.org/D49349 --- sys/vm/uma_core.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 4de850afcb66..35eede04171f 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -5339,6 +5339,13 @@ uma_reclaim_domain(int req, int domain) zone_foreach(uma_reclaim_domain_cb, &args); break; case UMA_RECLAIM_DRAIN_CPU: + /* + * Reclaim globally visible free items from all zones, then drain + * per-CPU buckets, then reclaim items freed while draining. + * This approach minimizes expensive context switching needed to + * drain each zone's per-CPU buckets. + */ + args.req = UMA_RECLAIM_DRAIN; zone_foreach(uma_reclaim_domain_cb, &args); pcpu_cache_drain_safe(NULL); zone_foreach(uma_reclaim_domain_cb, &args); From nobody Mon Mar 17 23:14:32 2025 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 4ZGrQd1cZhz5qrlR; Mon, 17 Mar 2025 23:14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGrQc6rg0z40s6; Mon, 17 Mar 2025 23:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742253273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xpFpkHCy4uJHWz5p09uzGFoq4Oep9CFMHwRl4UtoHzI=; b=jYIze+FqHSsYSSdGcBemM+VFsJ2eL0vVDcbNyv+IxI4djjBTEFByORCO4JT8kW+xGRe9sx TKoN+EE2AUm40Jn8hQlM6muBizRrnbPG8wEZZwvQ6WYBiPw0QKrcG54iTXR4U/+hxhd9sE Q+g1ROOFPl+R9H/1STTawQJLc+rOm5glOPp/IZdKs1agABJb6zTEeUhsTs+i7rC5F0CJEv IujjzkApETKTDlyLqZBo3PbH8KGVXxTnEhzV+0V8cS8cJ08ojUlpPWWybvFb0t8Vv6Dgqb BLZoic5xkquF/JAzQDH4Yq7vDU6mTdafqxXjW2ajiy7/NpN42GxgnBsLo/Dqsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742253273; a=rsa-sha256; cv=none; b=YHkt50QUHWX9WIoQ9076vqjml5rV6+JgStmzOBKj9AmGGAs8H1TyvwTc9HryMoThzMZp0c GQYKyI4732YPtmMugSFK+y1vWDEoFyZK39EwNlti2nomRxZ/Ux9xcSlwLn+763w5UH0V+3 HMNETjPhE8c8UDCqnxVhBzOUx0PhctDj6OMf7VpoxiSoYqh/ojlDgUlV3M+uqNmG1fn7cJ Pg5i9Fyrw1XaYJlFTxvdmtj85cT74PuabtWucuilGibp3lhJhD1RRaywgh7xrJ/gUkkCUU 7ZMQQZbTdxSrxtlqEo8x33ISU3zN8T+G0NCgKntsYSS5IbIATNvk7inUTqKvuw== 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=1742253273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xpFpkHCy4uJHWz5p09uzGFoq4Oep9CFMHwRl4UtoHzI=; b=SxeTg4GGNsiGM/+9gMLq5Qv4W4JOH9aIW5VQJCZ2/yXYXBvWNXJtp/UvVDynL6eSUL6UMy g2ivKLMdvos46Prw9s8gr38P/khCi9snvjdvTq7awEMutnPcQBDDYJ3CcwDrfZncOrwr4r wrI2H0P2fo+IIDi2WBMUkcXSq6/OxfDqIQYvRhr1W0P9O2jT0eS7vKfG8rgA0wqlz002lx NhzmsaCNRAhnORhvdjD3/Vl+reLhRHU5GRoUZ4GldiK5ONHYcFe/bfIJRZYYriwh1/kWKX QdAE8zZSo0TvNLLMg0J21rEQ9aZxT530t6EcxBZrwaxHi1zLFm+lHv86MlGFDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGrQc6SCFz16R4; Mon, 17 Mar 2025 23:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HNEWUw036324; Mon, 17 Mar 2025 23:14:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HNEW8U036321; Mon, 17 Mar 2025 23:14:32 GMT (envelope-from git) Date: Mon, 17 Mar 2025 23:14:32 GMT Message-Id: <202503172314.52HNEW8U036321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 6460c327f6f3 - main - libifconfig: Fix nits in the descriptions of active 100G cables. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6460c327f6f3fdf2d1cd4db648baf6cb7d74828e Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=6460c327f6f3fdf2d1cd4db648baf6cb7d74828e commit 6460c327f6f3fdf2d1cd4db648baf6cb7d74828e Author: Navdeep Parhar AuthorDate: 2025-02-25 20:29:42 +0000 Commit: Navdeep Parhar CommitDate: 2025-03-17 23:05:25 +0000 libifconfig: Fix nits in the descriptions of active 100G cables. This is a cosmetic change affecting the "plugged: ..." line in the output of ifconfig -v. Both the 100G active cables were missing a closing parenthesis. MFC after: 1 week Sponsored by: Chelsio Communications --- lib/libifconfig/sfp.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libifconfig/sfp.lua b/lib/libifconfig/sfp.lua index de738648451a..4a43b2ed780b 100644 --- a/lib/libifconfig/sfp.lua +++ b/lib/libifconfig/sfp.lua @@ -330,7 +330,7 @@ enums = { {0x0A, "RESERVED_0A", "Reserved"}, {0x09, "OBSOLETE", "Obsolete"}, {0x08, "100G_25GAUI_C2M_ACC_1", - "100G ACC (Active Copper Cable"}, + "100G ACC (Active Copper Cable)"}, {0x07, "100G_PSM4_P_SMF", "100G PSM4 Parallel SMF"}, {0x06, "100G_CWDM4", "100G CWDM4"}, {0x05, "100GBASE_SR10", "100GBASE-SR10"}, @@ -338,7 +338,7 @@ enums = { {0x03, "100GBASE_LR4_25GBASE_LR", "100GBASE-LR4 or 25GBASE-LR"}, {0x02, "100GBASE_SR4_25GBASE_SR", "100GBASE-SR4 or 25GBASE-SR"}, {0x01, "100G_25GAUI_C2M_AOC_1", - "100G AOC (Active Optical Cable"}, + "100G AOC (Active Optical Cable)"}, {0x00, "UNSPECIFIED", "Unspecified"}, }, }, From nobody Tue Mar 18 01:35:12 2025 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 4ZGvXw589xz5r30Q; Tue, 18 Mar 2025 01:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGvXw1WTFz3tX4; Tue, 18 Mar 2025 01:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742261712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFsBhdFhv11IDL/fhy5qSc3fqPYO3WiAMHc2O/d3Yyk=; b=eRa5FaJpM7aSBotHmDEo4N1mDgGZkPo5QFuSy2FRiufHEQMGM02OqOJ0FMO5NU4ZXkR5iv d4LFsN4R/vBJSBtb+qOcOXkGD/QGTPhF2giMG+dWcl/69yCc0irdboePOQMo1tAKd45yTB QcmfuMmeFb8dyNoUC1r7AHEgZx2tcqcnTRTuz6ZMMICWrhCAZOuDgweKFsEnGOBqpVXHjN 7llipY9Qnj/hTWa83cuwAdX7plIbzRb+A6osecM1gbSC6sx72hzYHwjx/lil1SdXCQN0mY NJ0ywdV1kE9NwZ1hCoJkiN/b8HdMPb4dXp738lhK951i68lVEFurX41V3dnabA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742261712; a=rsa-sha256; cv=none; b=TewCwHMUGSf/FViKW3V3ySav5maS09JSFZ2bpruyWJ42mIfn5XNZ2did9WaCLwiTvufgVa gvKlT5gaEAaUgbuE1NutXQfFStCh5LSLpdbnc4hnSFZgtf4KqHzeviH2oqs6xOy5q4x5jx xjzz9jis4G0M1Q/ZKHOrRUxsl2H5jGBSKgNDh3w5SQSeParm0sPvpanLo7+Rj9zhxMUBCR c5zV8KfSO9JgBD69gExtbnERw+cEJNa4q25tbXXtr5w5Hpp85wqE/+a566d4MoqMllIPjy 3E6wrp/M1gmUWhTlkTRIdASt9Sy6xOz87U70UH/XKg/SDY8oCvOPDrAmwOqJHQ== 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=1742261712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFsBhdFhv11IDL/fhy5qSc3fqPYO3WiAMHc2O/d3Yyk=; b=mek+JEG//uFuCgxn7l/HKV62p81dk4khuvVZ1gxJw4OEPcTJFPXb+F9L4obTtsNmjHUlUk 9JG1df79MmwDhwGUgftdJh20LiDWWFdONaheNT+BNT50+V9pYeuKBmoNQOe0TW/TDBPz/U TwCws1aawM9G4Oti1W9u+4OfxZphGEK0Y7YYZcc90gajqHUta6JPU3By/Yt0JtJcojD0rt XoDuHz3G4RWDC0qaQNCK09elE38EmiH21lLayuG6T1I8m07aZUF7+nCTEXDRDNzU2nIl5v EcBf0DlKfhvYQmcMA6KIzqt6N2CrSQqwNwb60GHqcvuabo5V6CsIML35bsd9nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGvXw0qHlz19wH; Tue, 18 Mar 2025 01:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I1ZCuA097624; Tue, 18 Mar 2025 01:35:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I1ZCfo097621; Tue, 18 Mar 2025 01:35:12 GMT (envelope-from git) Date: Tue, 18 Mar 2025 01:35:12 GMT Message-Id: <202503180135.52I1ZCfo097621@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: 1c8cdd807a94 - main - rtld: fix several style(9) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 1c8cdd807a9487aac532ef44f78bf53fe8ec4ce2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1c8cdd807a9487aac532ef44f78bf53fe8ec4ce2 commit 1c8cdd807a9487aac532ef44f78bf53fe8ec4ce2 Author: Konstantin Belousov AuthorDate: 2025-03-18 01:05:40 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-18 01:34:03 +0000 rtld: fix several style(9) bugs Sponsored by: The FreeBSD Foundation --- libexec/rtld-elf/rtld.c | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index aab20407b00d..2346c6eae9f6 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -665,15 +665,19 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) aux = auxp = (Elf_Auxinfo *)envp; auxpf = (Elf_Auxinfo *)(envp + rtld_argc); dbg("move aux from %p to %p", auxpf, aux); - /* XXXKIB insert place for AT_EXECPATH if not - * present */ + /* + * XXXKIB insert place for AT_EXECPATH if not + * present + */ for (;; auxp++, auxpf++) { *auxp = *auxpf; if (auxp->a_type == AT_NULL) break; } - /* Since the auxiliary vector has moved, - * redigest it. */ + /* + * Since the auxiliary vector has moved, + * redigest it. + */ for (i = 0; i < AT_COUNT; i++) aux_info[i] = NULL; for (auxp = aux; auxp->a_type != AT_NULL; @@ -682,8 +686,10 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) aux_info[auxp->a_type] = auxp; } - /* Point AT_EXECPATH auxv and aux_info to the - * binary path. */ + /* + * Point AT_EXECPATH auxv and aux_info to the + * binary path. + */ if (binpath == NULL) { aux_info[AT_EXECPATH] = NULL; } else { @@ -1677,7 +1683,7 @@ digest_phdr(const Elf_Phdr *phdr, int phnum, caddr_t entry, const char *path) obj->mapbase = obj->vaddrbase + obj->relocbase; } else { /* Last load segment */ obj->mapsize = rtld_round_page( - ph->p_vaddr + ph->p_memsz) - + ph->p_vaddr + ph->p_memsz) - obj->vaddrbase; } nsegs++; @@ -1877,8 +1883,8 @@ find_library(const char *xname, const Obj_Entry *refobj, int *fdp) if (strchr(name, '/') != NULL) { /* Hard coded pathname */ if (name[0] != '/' && !trust) { - _rtld_error("Absolute pathname required " - "for shared object \"%s\"", + _rtld_error( + "Absolute pathname required for shared object \"%s\"", name); return (NULL); } @@ -1957,8 +1963,8 @@ find_library(const char *xname, const Obj_Entry *refobj, int *fdp) } if (objgiven && refobj->path != NULL) { - _rtld_error("Shared object \"%s\" not found, " - "required by \"%s\"", + _rtld_error( + "Shared object \"%s\" not found, required by \"%s\"", name, basename(refobj->path)); } else { _rtld_error("Shared object \"%s\" not found", name); @@ -2040,8 +2046,10 @@ find_symdef(unsigned long symnum, const Obj_Entry *refobj, if (def != NULL) { *defobj_out = defobj; - /* Record the information in the cache to avoid subsequent - * lookups. */ + /* + * Record the information in the cache to avoid subsequent + * lookups. + */ if (cache != NULL) { cache[symnum].sym = def; cache[symnum].obj = defobj; @@ -2110,7 +2118,7 @@ gethints(bool nostdlib) if (read(fd, &hdr, sizeof hdr) != sizeof hdr) { dbg("failed to read %lu bytes from hints file \"%s\"", (u_long)sizeof hdr, ld_elf_hints_path); - cleanup1: +cleanup1: close(fd); hdr.dirlistlen = 0; return (NULL); @@ -2164,10 +2172,10 @@ gethints(bool nostdlib) } p = xmalloc(dirlistlen + 1); if (pread(fd, p, dirlistlen + 1, strtab + dirlist) != - (ssize_t)dirlistlen + 1 || - p[dirlistlen] != '\0') { + (ssize_t)dirlistlen + 1 || p[dirlistlen] != '\0') { free(p); - dbg("failed to read %d bytes starting at %d from hints file \"%s\"", + dbg( + "failed to read %d bytes starting at %d from hints file \"%s\"", dirlistlen + 1, strtab + dirlist, ld_elf_hints_path); goto cleanup1; @@ -2616,10 +2624,8 @@ load_filtee1(Obj_Entry *obj, Needed_Entry *needed, int flags, { for (; needed != NULL; needed = needed->next) { needed->obj = dlopen_object(obj->strtab + needed->name, -1, obj, - flags, - ((ld_loadfltr || obj->z_loadfltr) ? RTLD_NOW : RTLD_LAZY) | - RTLD_LOCAL, - lockstate); + flags, ((ld_loadfltr || obj->z_loadfltr) ? RTLD_NOW : + RTLD_LAZY) | RTLD_LOCAL, lockstate); } } From nobody Tue Mar 18 01:36:30 2025 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 4ZGvZS33bKz5r3G6; Tue, 18 Mar 2025 01:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGvZQ6QkCz3w68; Tue, 18 Mar 2025 01:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742261790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=usNIUYHEpW8jSn/IwUTxA0535p/ED0g7nK43jL6Ulxs=; b=OrU3Aiv6EiNB/g3I2ySqub7AbFfMCwcHmy386lc+V4DI30aXzp91BkacahimHZD9R4PlYt hb1WbenJ+gsOn68KgPpoiyQ3JM1ESBK+4rMR991hI+cE6Phq7mhT8RohN8ZVrRejDq1zQM YTe+fBm820rOfimKvKqsG8/LS727qeIUWcjTTKg37OZBufvxIozWwP1hgaTMYA4Ij4M3Pv wUyFYZpWj+ZTPn0N4dEyUgx7Ik/9pcJF/rOYh+q5ZkQ9ANwaI2cn0Lvv44MOF+xgRnZdv1 cFgRfCEj3EhRZ467Scf20TG1pkmRsQ2sAELP76OBn17ia2gYwLqAgB3FeXIFWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742261790; a=rsa-sha256; cv=none; b=PIHEqee0apu7PYefvaTFJBPB4M0i0MPuK8VeU0+vyS77YFQ36oQ9y0vSCA/tgjnRTLXwOa i5S3GmSqf2bWEqMoBmXbv0vizX6vBzTXiJqs+Y7YM29uVPmukNb5KiBOzCcM6XVIxMTf31 QcGPnWKN3EqRNDYnH2lrY1WY1hITr402mZ+fBIFCoXgrjjFdolUYzd2l5Pz2XTPUjrXrHW EtDFPDgDlYerEbl1NgCiCDMuWHT0/vucSFjFGIRY2izteYpKjy1p+sutgsEX8Bi4VJGEXT 85sghigAN0s9IzaXV6sIqjq3CapxcVQI/zeUpnOQaOjjbEqGxktQ65p9bpVQAA== 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=1742261790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=usNIUYHEpW8jSn/IwUTxA0535p/ED0g7nK43jL6Ulxs=; b=s0Z2mxKL1e2zoXGsQXbRv8s6mlgMKjlKAbTNhQtuYswdkqc4aZ9n2StKmCkie9MOIQ6Xln gSu7dFAaHuFytgkQOyiueLL1HjGfgQVzb4aY6nW5TPnOEhfniffoH0GUmLac7e6hmf2vvF /S/DNCwDg/q6R5c0mNd0nZLSAtyN+KgEcw3jZ+dSn+Y5Tflrf6oFHVgwYf93CduvgQHI+j zdZN05U1asnJZ2qWvjnr5B/Ud6BXUt1a5/Y3tCezG0U16wgvjnFh/55QyyQqPsGpXOdRGR pObHRAMDdQ68Gl+E/PB3DIRZbcsPzlHeMLjDZE1MT46AR5noAzYHSX6yffNnrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGvZQ50hyz1B8B; Tue, 18 Mar 2025 01:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I1aU6L098089; Tue, 18 Mar 2025 01:36:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I1aUV9098086; Tue, 18 Mar 2025 01:36:30 GMT (envelope-from git) Date: Tue, 18 Mar 2025 01:36:30 GMT Message-Id: <202503180136.52I1aUV9098086@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: 12bff22669cf - main - .git-blame-ignore-revs: one more revision for rtld List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 12bff22669cf24d8e7323aed8b89d61d6dc1e9fb Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=12bff22669cf24d8e7323aed8b89d61d6dc1e9fb commit 12bff22669cf24d8e7323aed8b89d61d6dc1e9fb Author: Konstantin Belousov AuthorDate: 2025-03-18 01:36:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-18 01:36:05 +0000 .git-blame-ignore-revs: one more revision for rtld Sponsored by: The FreeBSD Foundation --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 7a8f6bbe90b7..a2e4845c1e59 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -13,6 +13,7 @@ 986c96b54b9ec1118d285b723f53c7451a4c0772 3a85aa6a1d8916082155867ce0545a07185e8924 78b5dadb58e201e51a3a2eda5cf8cab6d31e0b62 +1c8cdd807a9487aac532ef44f78bf53fe8ec4ce2 # whitespace fixes for sys/sys/kernel.h 5c623697d6011de63bc762560a648c09379e06d2 # style fixes for iflib From nobody Tue Mar 18 09:22:11 2025 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 4ZH5vm2YHwz5qL1m; Tue, 18 Mar 2025 09:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vl6xPbz459W; Tue, 18 Mar 2025 09:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjZgQayx4wLq4JfDnWNsT/2Yjn/DCufEPJWq8gM5LAk=; b=P0JTXlCpE338Er84d3yVF9u6TgQohocdcsYWWrTDDVJPtdRRUFRiK3roDOV0cjdzJa9UlI Ndov8OxvZtyjbYOlVgzDGRxwh7eXJ6N02XmxzPRcY+bMJfGtBD3L/rttoXwAi36OpmhpS7 j4Z3SRDgEqQrJZgIkugFOU0ffbVDZpn1cwlbDlMrB8ZvsxDFf2g6TPoATyjc8hJ5hqsj+/ hqLFDWKMdyoF5ZyhCwBVl4bMmcG5tAzcxyohklV583yH3gyx/QVoCvP1FOXsgDhYHZBgH6 e3MswQG3GNAzQOzvgQZLwT0ek6c7k+EdHlZ7JJjQrsijz7qV4vZi+Sc4V7xccg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289732; a=rsa-sha256; cv=none; b=qU1JRPlyjWXeGbFONoNPyR5KIzmttD+f+6iPnDNuSqXKv9rN4OWxykNaUomk5zM/k3d/Ra DxNHx4OxgCd7bvL8E5Ao/o9K2yAmtr8vRivzyXMGnYj0RINTkfS1SdBYjI+9COxoxSEvHa Xko2HTbxjVapnCx7LtI4XtAsB9sUfaATEGxacbA+l6k5lruInnBPz/yaTKkC5uTSReUh+K zzQCMXBkUU0GRrT9HoJWjwQoZzoSj9gD0h0hhPvFak3uVYoXv/LVr8uL2G8FMwDa5VpYhB V7+Mfjj4G75ruVbM7yfdtJuJNFfnartwilNYoHsr/HIB01HUWdhi1W72aeFdbA== 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=1742289732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjZgQayx4wLq4JfDnWNsT/2Yjn/DCufEPJWq8gM5LAk=; b=ixCmM3SQnf3Qi1I00xJTYV6llZlwi1jOyQbHQGeEaTfAEvoIsp/owJE341phoXL6objR0d 6RMbDVhzErhQRr7SvX+nEZZqoi4ahYxsbNoFOhDr7smdmEHOKpaZTsBn0KkXp0JUcIVZed dogQdYrbbsEUSL34JMAKQzsirwfXP1tprwmQxsq7OAp21KyWxhfAktWy5VHO1GHPCHjFfx XLKciXyAMxBYtQ/H/LN4KW05ug5h8ul1Ax9LkJRPij3i0Oa4gYw2BiDF11jwiPF0Nyt8hq AyEjZKoa6BnuTEKFZPoKhPN0IikzHFf+//6GL+ul2I0laHNwPDPkIUdS01oCbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vl6Wx1zBGD; Tue, 18 Mar 2025 09:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MBX0076184; Tue, 18 Mar 2025 09:22:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MBjV076181; Tue, 18 Mar 2025 09:22:11 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:11 GMT Message-Id: <202503180922.52I9MBjV076181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0461600deaa2 - main - net80211: correct IEEE80211_KEY_BITS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0461600deaa227050fbff60274ba72ab3a407bcc Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0461600deaa227050fbff60274ba72ab3a407bcc commit 0461600deaa227050fbff60274ba72ab3a407bcc Author: Bjoern A. Zeeb AuthorDate: 2025-03-14 23:22:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:21:31 +0000 net80211: correct IEEE80211_KEY_BITS Not only are some of the bits missing, \4 and following were also off-by-one. Correct that so we can use them instead of reading hex numbers. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49366 --- sys/net80211/ieee80211_crypto.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h index b69df0cff3bd..5a365dd37aa3 100644 --- a/sys/net80211/ieee80211_crypto.h +++ b/sys/net80211/ieee80211_crypto.h @@ -118,8 +118,8 @@ struct ieee80211_key { IEEE80211_KEY_NOIVMGT|IEEE80211_KEY_NOMIC|IEEE80211_KEY_NOMICMGT) #define IEEE80211_KEY_BITS \ - "\20\1XMIT\2RECV\3GROUP\4SWENCRYPT\5SWDECRYPT\6SWENMIC\7SWDEMIC" \ - "\10DEVKEY\11CIPHER0\12CIPHER1" + "\20\1XMIT\2RECV\3GROUP\4NOREPLAY\5SWENCRYPT\6SWDECRYPT\7SWENMIC\10SWDEMIC" \ + "\11DEVKEY\12CIPHER0\13CIPHER1\14NOIV\15NOIVMGT\16NOMIC\17NOMICMGT" #define IEEE80211_KEYIX_NONE ((ieee80211_keyix) -1) From nobody Tue Mar 18 09:22:12 2025 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 4ZH5vn3DFgz5qKqT; Tue, 18 Mar 2025 09:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vn0kvdz456v; Tue, 18 Mar 2025 09:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nZX1QzkHVycICQ9qU1qdXkm+3lxvLQEjWHeo+04ixks=; b=OUW/rlnP2Uoe/3s6Eo31ge1+/ml9F7I9wPZ7oixMSVN9Ey6/iRZbGeF40Y/DnjPN6AQISF TvE/YQachXsU6V1tiMo2UJRgFRQt33wNH7KFu9/N49qg530c1bgaIHatlZ565ZNCJQETG1 WsfB4ua9DtLqM98tump/KLBEzphZbxuoRIIavasxDjUEJ2RjS4UQvEFNNhZ6IM/AzebIT7 K1iMl8e/1ezCA+SuFRlKSNYg9iWJVJ/pnZmXJ0hwHxanJhulkFkXmPBTumiTsgr5sQcJLu nSLmxjOyH07Td1hrEimgaAgGJRwhAeNH8BdZ4w5c8D34Mlbp7X0FEpMBx21ZIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289733; a=rsa-sha256; cv=none; b=tzleAfdtJMt9f8zLv0TKlHHqihaL+BO40E40FN4xe+C9k+QPmoHW8kj+QS/ab45M1g1TkS dn4hfEbAwq5Ad7g5lNMpYI4cJAGdF9mXkvcP984fBbn0B9NVk/n89urstRD51M0KIiPRzT 8eYXuyw2qS1NNZQq/3Gzj9uRyMkCB1FAWS7hOjA9d1Ec70cqtp0xWRv3Z2s4RvFkZB+mzf kYL6+z3Vxz+MLPv+Oe9cYYu9hfiOw3afXC+H/1iewkizRICjwBlJKaZDXPLhZqV5mqloyo NOH7dexpxGpZSbPQ+JwkXB0HsHLh1Bqfcq3+lXbA2KAZ3dOiv9XayUJk/ril+g== 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=1742289733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nZX1QzkHVycICQ9qU1qdXkm+3lxvLQEjWHeo+04ixks=; b=lc+Q2WSZEydNqXAyCTrrLzV8nv4CntHPOlXh9FlQMEV2JRrVjz9JaZQAFmiEBZRRmlh1kD nOk9rmF3sPUEW1J8GzidBeDXtHDJwOY2LRlTLkdgWBublaEeLXj7tnp74GS1eCgJnN8vrq QA/WFncgP0fawlu/qKcYmBcXQs6y/+7TBRKxww5b8IyjBQrAUJmBjekZRDQJDvvuHSQsNr lH6ysMQ8UEdIpnajoE163v0HqHXyeeV6tN7SOsTg3f68eH2BOzhccCsxOjxPefLU98j8B+ HYX6p/XKVr6qUVCUV4utIiSxvpIC7TFShvTE0zGHJiKk2/Yd7ulmZGgaT+kCfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vn0LSFzBrg; Tue, 18 Mar 2025 09:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MCr0076219; Tue, 18 Mar 2025 09:22:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MCCJ076216; Tue, 18 Mar 2025 09:22:12 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:12 GMT Message-Id: <202503180922.52I9MCCJ076216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: db8ceb8e5948 - main - net80211: cleanup keyidx argument of ieee80211_notify_michael_failure() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db8ceb8e59487d1d6b2e019efab3eef40688731c Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=db8ceb8e59487d1d6b2e019efab3eef40688731c commit db8ceb8e59487d1d6b2e019efab3eef40688731c Author: Bjoern A. Zeeb AuthorDate: 2025-03-14 23:33:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:21:47 +0000 net80211: cleanup keyidx argument of ieee80211_notify_michael_failure() Instead of passing -1 to the function in ieee80211_crypto_demic(), use the defined IEEE80211_KEYIX_NONE. net80211 uses ieee80211_keyix not u_int as type for the key index internally. Use that. This also helps when printing the -1 unsigned as it stays within the expected numerical scope and makes the debug message more readable. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49368 --- sys/net80211/ieee80211_crypto.c | 3 ++- sys/net80211/ieee80211_crypto.h | 2 +- sys/net80211/ieee80211_freebsd.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index daa2e0c1d6ec..b1c8b750e145 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -800,7 +800,8 @@ ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k, * modules to handle a NULL key and not to dereference * it. */ - ieee80211_notify_michael_failure(vap, wh, -1); + ieee80211_notify_michael_failure(vap, wh, + IEEE80211_KEYIX_NONE); return (0); } diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h index 5a365dd37aa3..a830d89c6dc8 100644 --- a/sys/net80211/ieee80211_crypto.h +++ b/sys/net80211/ieee80211_crypto.h @@ -273,6 +273,6 @@ void ieee80211_notify_replay_failure(struct ieee80211vap *, const struct ieee80211_frame *, const struct ieee80211_key *, uint64_t rsc, int tid); void ieee80211_notify_michael_failure(struct ieee80211vap *, - const struct ieee80211_frame *, u_int keyix); + const struct ieee80211_frame *, ieee80211_keyix keyix); #endif /* defined(__KERNEL__) || defined(_KERNEL) */ #endif /* _NET80211_IEEE80211_CRYPTO_H_ */ diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index db118bc19d16..d3c8352ab411 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -870,7 +870,7 @@ ieee80211_notify_replay_failure(struct ieee80211vap *vap, void ieee80211_notify_michael_failure(struct ieee80211vap *vap, - const struct ieee80211_frame *wh, u_int keyix) + const struct ieee80211_frame *wh, ieee80211_keyix keyix) { struct ifnet *ifp = vap->iv_ifp; From nobody Tue Mar 18 09:22:14 2025 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 4ZH5vp4C5Bz5qL69; Tue, 18 Mar 2025 09:22: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vp20bGz459n; Tue, 18 Mar 2025 09:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GyT9eZeMGP3bflHZn3QqJGe03T2Ns16hmEZgV0XuTnc=; b=fNIEa8kxP9ccplCkAGVPsylvhXLqNgI2WyFR8zt/47n4iiNq9hp9CtBJm143Xs0h/8qwnm umZ5EoGbP9AhtW/SzcAfQz+3g5caMqzGdZgZmIHhYY/5tHSXpwbejIrmYwiWn2TrEHxyy0 GsjhnwiZG2/NkH2KHTmoJYjiW6d5ttksj8G9EiFD3W+7VRTTbSSyTy5Swcre2jhlfOQ9Ei Gw13IThlQGDVMzSMRt9my4r2fMKxdNfZvZT22P6ObxOwzozzCLNhjz+lgMusZM4/aas6JK 9245iMBJCjQsDyMlgUWLLlMFVevI1bnOa0pTNRVzCUM6Yc3nTCjlDXC0OtAVNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289734; a=rsa-sha256; cv=none; b=kXEGitdstqjmWgzQ60FdK2Z6UyxmOjl/mbOSxo//3w8gY0z/XTrDcFRm3mdpxLkE4YM3r8 MjijcwqIYri+Djhkdg9WC4deCALLtorUavSmY7jqCs7SJDbTxP//dl5TeII3MJNa7EO9vW CGCri2cUqHs7nzc7N9VoV9oLC9xej/OrbYnJGVarfmrOgzy0skvqdXUJYHAOF0Vob+UdYd PpazZX5yz6xGupkGLO7qGUeUp20v/01+HWnfR0jUrLcPptUcevLtNB3MHzD47UC87ydTL+ X6dwF5FfUhozXAKpUMf4JNWHkwFRgjVxfazj74N/KKgYJwTWKrMDllF00kFq1Q== 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=1742289734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GyT9eZeMGP3bflHZn3QqJGe03T2Ns16hmEZgV0XuTnc=; b=fzaNV6JBvicAGF9tZW17Gc45hVLH4TbqviZprXT48X/stn1zTimGWjE2b+3SackbTDIAEO zJ3MFptJ+dn021bKNFEiE/o9jP9TMMH6s/toM4xZRFVayO9R4PFFj8AcqpPY41dLpOZTvV XRCVl4e8iTcf5GGWqcLozDYUZLimHPncpvwiWIRuqK4Ol9pbZ3qb87pkeg6SGYr10dJgtC bRzR0Io0GZBxCqCUsi8u4GekokV/rCPjWp3VoY3zKmRkDlgrAr0gY0d1McgKV9CZErGfke Trf1Xx5Yb0pQt7Qx26Opt8d6JX1HWVp6hXCpmeC6QfvPxZZ+RDBb6RfSjlUsFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vp1K0czBGF; Tue, 18 Mar 2025 09:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MEEm076254; Tue, 18 Mar 2025 09:22:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MEJH076251; Tue, 18 Mar 2025 09:22:14 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:14 GMT Message-Id: <202503180922.52I9MEJH076251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7513a0afe5fb - main - net80211: make use of IEEE80211_KEY_BITS for debug messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7513a0afe5fb26d30dbcae0347e43728e3511d3e Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7513a0afe5fb26d30dbcae0347e43728e3511d3e commit 7513a0afe5fb26d30dbcae0347e43728e3511d3e Author: Bjoern A. Zeeb AuthorDate: 2025-03-14 23:43:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:21:57 +0000 net80211: make use of IEEE80211_KEY_BITS for debug messages Use %b with IEEE80211_KEY_BITS for the debug logging in ieee80211_crypto.c rather than just printing the hex value, which makes some of the messages more obvious and avoids having the header file next to one at all times. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49369 --- sys/net80211/ieee80211_crypto.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index b1c8b750e145..600d69d6043b 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -466,14 +466,15 @@ ieee80211_crypto_newkey(struct ieee80211vap *vap, */ IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, "%s: driver override for cipher %s, flags " - "0x%x -> 0x%x\n", __func__, cip->ic_name, - oflags, key->wk_flags); + "%b -> %b\n", __func__, cip->ic_name, + oflags, IEEE80211_KEY_BITS, + key->wk_flags, IEEE80211_KEY_BITS); keyctx = cip->ic_attach(vap, key); if (keyctx == NULL) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, "%s: unable to attach cipher %s with " - "flags 0x%x\n", __func__, cip->ic_name, - key->wk_flags); + "flags %b\n", __func__, cip->ic_name, + key->wk_flags, IEEE80211_KEY_BITS); key->wk_flags = oflags; /* restore old flags */ vap->iv_stats.is_crypto_attachfail++; return 0; @@ -498,9 +499,9 @@ _ieee80211_crypto_delkey(struct ieee80211vap *vap, struct ieee80211_key *key) KASSERT(key->wk_cipher != NULL, ("No cipher!")); IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, - "%s: %s keyix %u flags 0x%x rsc %ju tsc %ju len %u\n", + "%s: %s keyix %u flags %b rsc %ju tsc %ju len %u\n", __func__, key->wk_cipher->ic_name, - key->wk_keyix, key->wk_flags, + key->wk_keyix, key->wk_flags, IEEE80211_KEY_BITS, key->wk_keyrsc[IEEE80211_NONQOS_TID], key->wk_keytsc, key->wk_keylen); @@ -566,9 +567,9 @@ ieee80211_crypto_setkey(struct ieee80211vap *vap, struct ieee80211_key *key) KASSERT(cip != NULL, ("No cipher!")); IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, - "%s: %s keyix %u flags 0x%x mac %s rsc %ju tsc %ju len %u\n", + "%s: %s keyix %u flags %b mac %s rsc %ju tsc %ju len %u\n", __func__, cip->ic_name, key->wk_keyix, - key->wk_flags, ether_sprintf(key->wk_macaddr), + key->wk_flags, IEEE80211_KEY_BITS, ether_sprintf(key->wk_macaddr), key->wk_keyrsc[IEEE80211_NONQOS_TID], key->wk_keytsc, key->wk_keylen); @@ -586,9 +587,9 @@ ieee80211_crypto_setkey(struct ieee80211vap *vap, struct ieee80211_key *key) */ if (!cip->ic_setkey(key)) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, - "%s: cipher %s rejected key index %u len %u flags 0x%x\n", + "%s: cipher %s rejected key index %u len %u flags %b\n", __func__, cip->ic_name, key->wk_keyix, - key->wk_keylen, key->wk_flags); + key->wk_keylen, key->wk_flags, IEEE80211_KEY_BITS); vap->iv_stats.is_crypto_setkey_cipher++; return 0; } From nobody Tue Mar 18 09:22:16 2025 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 4ZH5vs1vWvz5qL6G; Tue, 18 Mar 2025 09:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vr3Zypz45GQ; Tue, 18 Mar 2025 09: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=1742289736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o09jWHKt/V5r1VzV3GD8acFk0q8WPIBlc+TOeROxvyI=; b=BI0LmnEmAnN02os0/SBZ+r2gxVjl7Ht/+GIrM0Y/y4iZY6A5c4ubabeZfkBkpiBxL8U0Ae d/bzwtHiIahd5a8ZfZqlImGHKNXGRSXEC/+GVe49SKoAwvVtgHcR7mKDOR1KdbjbodeTQb RX3n/nK24lk0fhwdGG3SdG+ba8Iy2jYAyah8N1McGagtG5tnwujhzW/Z4qwUH5awKl5bCl cH0X6QD5mHhHGMGwDvA9I60oOfi5ViYaUXeQsK4f6oo06foqADGjUlMnK2r23Zolu9dgJ9 yLNNikU1iXno5FKbQgB+R8lNIAd0k2Ksf4UTu4RkLPf03YY4e+8RNJaCU1m5Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289736; a=rsa-sha256; cv=none; b=RPd76Wia7VK7krlYHJY6t8+gGU7FoEuiS5xgQmHkfzyMqp1stolsdLE5vNvGe/Q2aV88QD pKz/dLgZJVcfw8Jg2DpSAifEDEkDHHQPJQqn/AE7dtFLqJKXQd+jZ90NnyD6Z4sAUx/gJO cP+vrzyUcPrhznMEbIMoaNNrEaTT6LgUdoG5Pc4L3vFUbUwXG4M7Vzxa42b6VYvNIzRTWj 8clUWMhiP9IhFngnG4YoOCL94kOzhrIo3mb2vzXx2XakuK//TD3yQkapoQg4oy7GagPF3a M6/rjek/+UkzUO8rwaPUnQ7U3MT0OQtdGx9oAIvoKaXXDnWLt+09Q/AXRpzpYg== 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=1742289736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o09jWHKt/V5r1VzV3GD8acFk0q8WPIBlc+TOeROxvyI=; b=SOtYhrY8uQBlU9wc9diS0ZwhMd4kClVEJKEMg/vDaaBUV7Ko04iEn5G7Yq6QQg703ezdXe sLHcGCvXdw2MXl12EJwZ/obgUvYJ0coUyecOalURnlucsAgFCKe0HiT4seN1jcrd51qOv0 saTaCfCEG3CvkLS6sp3a98ADpmaUo+Z6uG8V99gs9I2KapynuF2dVdtYAXi/9pjMpSdR38 78d55Ocd2bTxXl5NQipDhSYPPMw+AT0hRNOiSBPFcO8anF9gLZzkk16B3bucWzTrosNFgp 6NemGdWj/zMHH1xqUMgfzZe1gbBeWSx7lxBAr4QH1gLFNKmWL4jAHmpxTzZjhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vr2yxyzBrj; Tue, 18 Mar 2025 09:22:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MGWH076324; Tue, 18 Mar 2025 09:22:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MGNw076321; Tue, 18 Mar 2025 09:22:16 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:16 GMT Message-Id: <202503180922.52I9MGNw076321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 52a43041d2a8 - main - iwlwifi: make mvm/d3.c compile again List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52a43041d2a864961f0a1a109a7a7c4c6ebed918 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=52a43041d2a864961f0a1a109a7a7c4c6ebed918 commit 52a43041d2a864961f0a1a109a7a7c4c6ebed918 Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:08:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:22:01 +0000 iwlwifi: make mvm/d3.c compile again Given we currently do not ompile the file by default make it compile again after the last vendor import. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/iwlwifi/mvm/d3.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mvm/d3.c b/sys/contrib/dev/iwlwifi/mvm/d3.c index 0fbafd5f0dbb..11d9911eabb1 100644 --- a/sys/contrib/dev/iwlwifi/mvm/d3.c +++ b/sys/contrib/dev/iwlwifi/mvm/d3.c @@ -9,6 +9,7 @@ #include #if defined(__FreeBSD__) #include +#include #endif #include #include @@ -3702,7 +3703,11 @@ static ssize_t iwl_mvm_d3_test_read(struct file *file, char __user *user_buf, break; } +#if defined(__linux__) if (msleep_interruptible(100)) +#elif defined(__FreeBSD__) + if (linux_msleep_interruptible(100)) +#endif break; if (time_is_before_jiffies(end)) { @@ -3756,7 +3761,11 @@ static int iwl_mvm_d3_test_release(struct inode *inode, struct file *file) while (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status) && remaining_time > 0) { remaining_time--; +#if defined(__linux__) msleep(1000); +#elif defined(__FreeBSD__) + linux_msleep(1000); +#endif } if (remaining_time == 0) From nobody Tue Mar 18 09:22:15 2025 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 4ZH5vr1FSJz5qKyq; Tue, 18 Mar 2025 09: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vq2g41z4574; Tue, 18 Mar 2025 09:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pIBKJyJsdwr968Dae1vP6uf1q0xOabSdDdpZ409Fkpo=; b=FNwiAZxVaGKm/kyartaVUvhFtLZVBaRYYvQxIcxvmlWcyzWTyuTXRMavdcYddkDr2cayq5 YCi/hcdEVjRhUb0yTs7WpK6pOB+hHcdHyPpjuvrVE9JBW4Iwa2kAAV4V6DclyHf12qsmJ5 vQEWk9/66L5PZBVT8GlWFSYoWRIZEKiS79N+jR0K0PEn824QcFFLlSZBAHiW1MiuEFBl3V vgDVS2+xuy6Tkx170iC9bojEZfgBPILcM144ma7Fiy5rVGy4s6CnKIQAmIw3EKbhCeIFtJ qAg9ioylYLaSGX6OwtmXpz5/VeDltw3axPGv/XcDzgr1dJ4o3k4RkApBAR2K0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289735; a=rsa-sha256; cv=none; b=faKBoXgIjZQY2mMD5xUW8uuQk9YBUd1TtSLWVsY+jfngZpLxoY8wDL7bWl/85591lwdebG 90Hata+WelxswwBLHfcz0tUoxB7C+gEabqEH72Ha242ewFub0Q7gifxUFfNq9kDFJhGgis nb/D/TxGoYPIVV9vmwhiaJXWXFSumczYvIhjzRCMH2LGTQJelXAU4ricwjejrGOPq5X0ns mAJ0lGOxuMSSbxGQdepSSwBmqlkGoA1UmziElpxoqtSNiMxKhPCplYYJ9Xzyt73G/5rev/ Xo74ggIepn/IYn4S1kTL9UK3YyfwaU7ohoer2oIAhs4GFcFdGKlQmRPlf/GKAw== 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=1742289735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pIBKJyJsdwr968Dae1vP6uf1q0xOabSdDdpZ409Fkpo=; b=cQ31wfGilX4PQcZtjejMFgHFZRqGTuHp02sibhvYBSVbYjY8GccVN94g6iYMU/rf6ThmW8 E5L38wTZCQVtemsJS1PhEiINWW5enFZN1zPJvtKYLx0mc3ivA72EMtriLGQUjAam/SAiRd ny/ajNkUZFUaXl27TOl3Fa1x+JsTvdPYU8vL4KCanjN4MfDHlNurLKFweo4gIQUqq7yqv5 UNtmdYXPDJ7XUm2ruypCJznZO4y1BkLCu2RlBw3WgCvSay9JtZKxio91vMXDWqHqXsdtAJ 1PC2V0nadojk4Yih2tRT/Sq3Y4cn1tgk5NNoFv92bwztsTlK8UigEvPPRlqkPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vq23mLzBb8; Tue, 18 Mar 2025 09:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MFS0076289; Tue, 18 Mar 2025 09:22:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MFPg076286; Tue, 18 Mar 2025 09:22:15 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:15 GMT Message-Id: <202503180922.52I9MFPg076286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c8a6676eb652 - main - LinuxKPI: 802.11: crypto pn lengths List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8a6676eb652b59fee545dc3e24ffec21bd0cd8d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c8a6676eb652b59fee545dc3e24ffec21bd0cd8d commit c8a6676eb652b59fee545dc3e24ffec21bd0cd8d Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:01:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:22:00 +0000 LinuxKPI: 802.11: crypto pn lengths Define the last missing PN length and for consistency use them in struct ieee80211_key_seq (even though a 6 is a 6 is a 6). Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 3 ++- sys/compat/linuxkpi/common/include/net/mac80211.h | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index ca1493e666c6..964fd970ecf0 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2024 The FreeBSD Foundation + * Copyright (c) 2020-2025 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -64,6 +64,7 @@ struct ieee80211_mmie_16 { #define IEEE80211_GCMP_MIC_LEN 16 #define IEEE80211_GCMP_PN_LEN 6 #define IEEE80211_GMAC_PN_LEN 6 +#define IEEE80211_CMAC_PN_LEN 6 #define IEEE80211_MAX_PN_LEN 16 diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 9faf58ed6ee5..4dc1aaccb886 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -581,10 +581,13 @@ struct ieee80211_key_seq { uint8_t pn[IEEE80211_CCMP_PN_LEN]; } ccmp; struct { - uint8_t pn[IEEE80211_CCMP_PN_LEN]; + uint8_t pn[IEEE80211_GCMP_PN_LEN]; + } gcmp; + struct { + uint8_t pn[IEEE80211_CMAC_PN_LEN]; } aes_cmac; struct { - uint8_t pn[IEEE80211_CCMP_PN_LEN]; + uint8_t pn[IEEE80211_GMAC_PN_LEN]; } aes_gmac; struct { uint32_t iv32; From nobody Tue Mar 18 09:22:17 2025 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 4ZH5vt3b0Mz5qKwB; Tue, 18 Mar 2025 09:22:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vs44txz45B8; Tue, 18 Mar 2025 09:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t4MYd4nU6ufJkPIsEj56YdjJEtrOopyr93whi/i5ua8=; b=lALmvVh1I1dHy6u9Y4hQfeuPLDTftsG9tv+zzultRlQQA5578j7orhL4SlxFcpfKYwV4vr NnadGc7TXI4jiILx5zOS1odDTmR33+7HHJNsYzKnst+oLAcZmK0Km44vH3L0gvGMhDJdaW rTip0/bydlZbEVqrHwj9OKB7VDTRxpHLyO/WMTwtFTyTAflqmFc4Q4VxYklxiMzDxLJrPp dgDBhqp5EvUmhT3GDVxQ5cTS2q9gQQ8ExHDrzizO+E0JM8wBY9Q/Va0qI0+QOYuRhK76Dw elsFJQmEZBIt0jX4IMTNim3cghADHj+FnsLi0wYvJQnIAwX8oiiaHzZw7m9qDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289737; a=rsa-sha256; cv=none; b=mHOteDLAZIXgnYkM3FSWZ58m5XhEnUW66uvieZUz2E9wjHGYfIZpUtBvxIQUQ2ERZYbRsO G/N5lPiq8fi8xBDG/4RG7qwg/PX1tvAPGkhXQkrmdpMrzGqreVP47nvyV4JeuCRnp1b+dh kMKlAuEsvxHVFb/k6uNBSTmg4SAb5wJ6RWn2pJB3Of3X8ag7Ge/CBU9LRTUHQFIp3D0xBM u519Z59OU5+ANNm6cNsxo2sMdMyNgMKBD92/huHVxjfRSNpA25EEEq8sriU380aYlMyaRo /4byvtBs5bvAFWUY/JzhRIvFZBzftvl5LjnUbeIu9CuVdEeEGQl45tgAIMnmwg== 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=1742289737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t4MYd4nU6ufJkPIsEj56YdjJEtrOopyr93whi/i5ua8=; b=oEhdH6UX3O4PtxGFxiURQJyCPzLNQtmwD4uLIyfzbYyeMzOwpXkEoep4v6LNmggPJHN9Za Si9zdPYeoxKTALOCvMHIGSq0S0VFpZHdqK7t7wtLH1wYxdz+nDmh0fL7xLsOs9dM1aFgLK E927smiVaBxNsfcRXwghCoHvq8lWdPvUrJyqy0LtfZShHdlTkNf3HVegdQIi3Vwkkkmw1r f0MaH+QB30b0NvhzomqPlrflTAMLK2S+DESfR9GZSNCqhTniOfey2x0j7zy+7trVvk8Cox /X307nH2Ep3wMLugXpBcC3Nw/pSdT7WbxZ7zXb8RexPCTugXDgLHUu+g/k+d8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vs3d7HzBGG; Tue, 18 Mar 2025 09:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MHg2076368; Tue, 18 Mar 2025 09:22:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MH9i076364; Tue, 18 Mar 2025 09:22:17 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:17 GMT Message-Id: <202503180922.52I9MH9i076364@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 848fdcae0326 - main - rtw89: make wow.c compile List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 848fdcae0326db5b7c3edd2e8c264d25254abe1d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=848fdcae0326db5b7c3edd2e8c264d25254abe1d commit 848fdcae0326db5b7c3edd2e8c264d25254abe1d Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:14:52 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:22:01 +0000 rtw89: make wow.c compile So far we have not compiled wow.c given we do not enable CONFIG_PM yet. Make the necessary file local adjustments to make the file compile once further changes in LinuxKPI 802.11 code are comitted. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/rtw89/wow.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/sys/contrib/dev/rtw89/wow.c b/sys/contrib/dev/rtw89/wow.c index 9882064ef68d..8322c0763715 100644 --- a/sys/contrib/dev/rtw89/wow.c +++ b/sys/contrib/dev/rtw89/wow.c @@ -17,13 +17,21 @@ void rtw89_wow_parse_akm(struct rtw89_dev *rtwdev, struct sk_buff *skb) struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data; struct rtw89_wow_param *rtw_wow = &rtwdev->wow; const u8 *rsn, *ies = mgmt->u.assoc_req.variable; +#if defined(__linux__) struct rtw89_rsn_ie *rsn_ie; +#elif defined(__FreeBSD__) + const struct rtw89_rsn_ie *rsn_ie; +#endif rsn = cfg80211_find_ie(WLAN_EID_RSN, ies, skb->len); if (!rsn) return; +#if defined(__linux__) rsn_ie = (struct rtw89_rsn_ie *)rsn; +#elif defined(__FreeBSD__) + rsn_ie = (const struct rtw89_rsn_ie *)rsn; +#endif rtw_wow->akm = rsn_ie->akm_cipher_suite.type; } @@ -111,8 +119,13 @@ static int rtw89_rx_pn_to_iv(struct rtw89_dev *rtwdev, if (err) return err; +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%llx to iv-%*ph\n", __func__, key->keyidx, pn, 8, iv); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%jx to iv-%*ph\n", + __func__, key->keyidx, (uintmax_t)pn, 8, iv); +#endif return 0; } @@ -129,8 +142,13 @@ static int rtw89_tx_pn_to_iv(struct rtw89_dev *rtwdev, if (err) return err; +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%llx to iv-%*ph\n", __func__, key->keyidx, pn, 8, iv); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%jx to iv-%*ph\n", + __func__, key->keyidx, (uintmax_t)pn, 8, iv); +#endif return 0; } @@ -204,8 +222,13 @@ static int rtw89_tx_iv_to_pn(struct rtw89_dev *rtwdev, return err; atomic64_set(&key->tx_pn, pn); +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d iv-%*ph to pn-%llx\n", __func__, key->keyidx, 8, iv, pn); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d iv-%*ph to pn-%jx\n", + __func__, key->keyidx, 8, iv, (uintmax_t)pn); +#endif return 0; } @@ -235,8 +258,13 @@ static int rtw89_rx_pn_get_pmf(struct rtw89_dev *rtwdev, u64_encode_bits(seq.ccmp.pn[5], RTW89_KEY_PN_0); gtk_info->ipn = cpu_to_le64(pn); gtk_info->igtk_keyid = cpu_to_le32(key->keyidx); +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%llx\n", __func__, key->keyidx, pn); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%jx\n", + __func__, key->keyidx, (uintmax_t)pn); +#endif return 0; } @@ -472,10 +500,17 @@ static void rtw89_wow_debug_aoac_rpt(struct rtw89_dev *rtwdev) 8, aoac_rpt->gtk_rx_iv[2]); rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] gtk_rx_iv[3] = %*ph\n", 8, aoac_rpt->gtk_rx_iv[3]); +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk_key_id = %llu\n", aoac_rpt->igtk_key_id); rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk_ipn = %llu\n", aoac_rpt->igtk_ipn); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk_key_id = %ju\n", + (uintmax_t)aoac_rpt->igtk_key_id); + rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk_ipn = %ju\n", + (uintmax_t)aoac_rpt->igtk_ipn); +#endif rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk = %*ph\n", 32, aoac_rpt->igtk); } From nobody Tue Mar 18 09:22:18 2025 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 4ZH5vv0s4dz5qKwC; Tue, 18 Mar 2025 09:22:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vt5y6lz45Gr; Tue, 18 Mar 2025 09:22:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7SV/4j6aHbQyv9deVQAiqjCrlMxift0nWF4fvMbMgWw=; b=w9GmPjCXCex35N2Te4dxCRvnYvFWQX5NV7AaxwTdoBeBAJ7qP6sfRlE58ppsr6e/s1pH9Y ynIBhuHJiaHY5qooK3FRwtn6O89e9Wc9ShLqg5JY/yJ+i8DK9S37eH/gecO2txsH1+5lTX E3P3F6NCLq5pj2bEwpJbpFaDM/+W3j40dYdKjbHGGM+kxcs9czz/fLqVrlhtqtw1+wwVRE QHuSzPUsktLYhdnOlJpimJPGGwBmtpL9OFpgxc3W8cUyHFEw//R/lW7ZEkBzLCUKloh6wA Dq7swG4oe816rqB07FXKIUDg1cqhL8oBfbZqCoXqPOSENeoDbmJrU0XBG9TKEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289738; a=rsa-sha256; cv=none; b=I3gwJVJL/CN/2dOoebwnfomuef48F64dma2gGgLK3SLGm7TR9op0hsK+iOyFRw8AT0SR0A Sc15GroLCoXHWkspN+gxMiimzcH5PMQ/Nz3sC2woO43StfZRJQTE/X1cbCG/FiOzTYTr1V 0aKUmGGlxFbvda6CXEf4jc+0/wfYnM7JgTItCfAQ6NmTHBc0FNQHkT2WC9h/94i3D+5XyJ C8CWETdpxqf0yW/Filvn1PcXWhyozXWV4LFMuivLt4MkUnUndKN6ElqoMrcHqaBhpHyq6w F/QmzV93ZsG8vrzE+RmtFhkd7qUOtadN1vLYV1/p4bG4matKSBbcKsSemAAsHw== 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=1742289738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7SV/4j6aHbQyv9deVQAiqjCrlMxift0nWF4fvMbMgWw=; b=qvFImGIq0VIvWZTWbs5Dw3JPxBlK8PwSoG9a1dwtoDLm9B8YYZmNERTGiMGq71Nj+EPCje 1wSisCxmfAgiY/aqZ60N1DZYTDKuGlSlHbozTtd0DuXo8quQ4hMfBtjWfx/2BHJsa+eQQg X3phz+usL5Mpin+8UM6+2CLNkohP0ZzcJS7NCTSvTQwDiNu03qbr9uR4ON1XyjYdEg/0YR 2SZd+6YZoxO+2L2VlPm5zdrUSCzKWz7BnxxnRuDRi/hx3jSWaWH+YgqJtzM+BjAfs51kTh dZLwCz7GMAgIgfM4EM5GOEnbQ+jQxLi9PiU1ff4DlUbb7NHzjQTuv/nFaQa9dA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vt4jGkzBCj; Tue, 18 Mar 2025 09:22:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MIB9076403; Tue, 18 Mar 2025 09:22:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MIWW076400; Tue, 18 Mar 2025 09:22:18 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:18 GMT Message-Id: <202503180922.52I9MIWW076400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b42c339c59fd - main - LinuxKPI: 802.11: CONFIG_PM_SLEEP / WoWLAN header adjustments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b42c339c59fd00f2d97f6854b17b54b340019d0c Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b42c339c59fd00f2d97f6854b17b54b340019d0c commit b42c339c59fd00f2d97f6854b17b54b340019d0c Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:30:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:22:01 +0000 LinuxKPI: 802.11: CONFIG_PM_SLEEP / WoWLAN header adjustments Sort out some (though not yet all) changes needed for CONFIG_PM_SLEEP and respectively WoWLAN support (so we can compile it in). This is just one further step towards proper suspend/resume support. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- .../linuxkpi/common/include/linux/ieee80211.h | 7 ++++++ sys/compat/linuxkpi/common/include/net/cfg80211.h | 26 +++++++++++++++++----- sys/compat/linuxkpi/common/include/net/mac80211.h | 16 +++++++++---- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 964fd970ecf0..efac2a26e27e 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -147,6 +147,7 @@ enum ieee80211_key_len { WLAN_KEY_LEN_WEP104 = 13, WLAN_KEY_LEN_TKIP = 32, WLAN_KEY_LEN_CCMP = 16, + WLAN_KEY_LEN_CCMP_256 = 32, WLAN_KEY_LEN_GCMP = 16, WLAN_KEY_LEN_AES_CMAC = 16, WLAN_KEY_LEN_GCMP_256 = 32, @@ -507,6 +508,12 @@ struct ieee80211_mgmt { uint16_t capab_info; uint8_t variable[0]; } beacon; + /* 9.3.3.5 Association Request frame format */ + struct { + uint16_t capab_info; + uint16_t listen_interval; + uint8_t variable[0]; + } assoc_req; /* 9.3.3.10 Probe Request frame format */ struct { uint8_t variable[0]; diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 3454b58f1db7..2cdb96ffccdf 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -1033,9 +1033,12 @@ struct cfg80211_wowlan_nd_info { enum wiphy_wowlan_support_flags { WIPHY_WOWLAN_DISCONNECT, - WIPHY_WOWLAN_GTK_REKEY_FAILURE, WIPHY_WOWLAN_MAGIC_PKT, WIPHY_WOWLAN_SUPPORTS_GTK_REKEY, + WIPHY_WOWLAN_GTK_REKEY_FAILURE, + WIPHY_WOWLAN_EAP_IDENTITY_REQ, + WIPHY_WOWLAN_4WAY_HANDSHAKE, + WIPHY_WOWLAN_RFKILL_RELEASE, WIPHY_WOWLAN_NET_DETECT, }; @@ -1049,6 +1052,7 @@ struct cfg80211_wowlan_wakeup { /* XXX TODO */ uint16_t pattern_idx; bool disconnect; + bool unprot_deauth_disassoc; bool eap_identity_req; bool four_way_handshake; bool gtk_rekey_failure; @@ -1066,11 +1070,22 @@ struct cfg80211_wowlan_wakeup { struct cfg80211_wowlan { /* XXX TODO */ - int disconnect, gtk_rekey_failure, magic_pkt; - int eap_identity_req, four_way_handshake, rfkill_release, tcp, any; + bool any; + bool disconnect; + bool magic_pkt; + bool gtk_rekey_failure; + bool eap_identity_req; + bool four_way_handshake; + bool rfkill_release; + + /* Magic packet patterns. */ int n_patterns; - struct cfg80211_sched_scan_request *nd_config; struct cfg80211_pkt_pattern *patterns; + + /* netdetect? if not assoc? */ + struct cfg80211_sched_scan_request *nd_config; + + void *tcp; /* XXX ? */ }; struct cfg80211_gtk_rekey_data { @@ -1244,7 +1259,8 @@ struct wiphy { unsigned long ext_features[BITS_TO_LONGS(NUM_NL80211_EXT_FEATURES)]; struct dentry *debugfsdir; - struct cfg80211_wowlan_support *wowlan; + const struct wiphy_wowlan_support *wowlan; + struct cfg80211_wowlan *wowlan_config; /* Lower layer (driver/mac80211) specific data. */ /* Must stay last. */ uint8_t priv[0] __aligned(CACHE_LINE_SIZE); diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 4dc1aaccb886..9830d8f16d05 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -42,6 +42,7 @@ #include #include #include +#include #define ARPHRD_IEEE80211_RADIOTAP __LINE__ /* XXX TODO brcmfmac */ @@ -1089,9 +1090,7 @@ struct ieee80211_ops { int (*set_tim)(struct ieee80211_hw *, struct ieee80211_sta *, bool); int (*set_key)(struct ieee80211_hw *, enum set_key_cmd, struct ieee80211_vif *, struct ieee80211_sta *, struct ieee80211_key_conf *); - void (*set_default_unicast_key)(struct ieee80211_hw *, struct ieee80211_vif *, int); void (*update_tkip_key)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_key_conf *, struct ieee80211_sta *, u32, u16 *); - void (*set_rekey_data)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_gtk_rekey_data *); int (*start_pmsr)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_pmsr_request *); void (*abort_pmsr)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_pmsr_request *); @@ -1135,9 +1134,18 @@ struct ieee80211_ops { void (*link_sta_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_link_sta *, struct dentry *); void (*link_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, struct dentry *); /* #endif */ +/* #ifdef CONFIG_PM_SLEEP */ /* Do not change depending on compile-time option. */ + int (*suspend)(struct ieee80211_hw *, struct cfg80211_wowlan *); + int (*resume)(struct ieee80211_hw *); + void (*set_wakeup)(struct ieee80211_hw *, bool); + void (*set_rekey_data)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_gtk_rekey_data *); + void (*set_default_unicast_key)(struct ieee80211_hw *, struct ieee80211_vif *, int); +/* #if IS_ENABLED(CONFIG_IPV6) */ + void (*ipv6_addr_change)(struct ieee80211_hw *, struct ieee80211_vif *, struct inet6_dev *); +/* #endif */ +/* #endif CONFIG_PM_SLEEP */ }; - /* -------------------------------------------------------------------------- */ /* linux_80211.c */ @@ -2425,7 +2433,7 @@ ieee80211_get_tkip_p1k_iv(struct ieee80211_key_conf *key, static __inline struct ieee80211_key_conf * ieee80211_gtk_rekey_add(struct ieee80211_vif *vif, - struct ieee80211_key_conf *key) + struct ieee80211_key_conf *key, int link_id) { TODO(); return (NULL); From nobody Tue Mar 18 17:00:47 2025 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 4ZHJ4x3w7Bz5qwc7; Tue, 18 Mar 2025 17:00:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZHJ4w1hfLz49tm; Tue, 18 Mar 2025 17:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742317248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UWZc/I7GmaN+DSrGNgC/tSI0GossDGUwJ5JsV/YJyZ8=; b=Ze3U6p+Np0glNMbWXPa9j4dz23E+iCHudOp7l9OS1ZhAQaSXZhPiw7CFMModr3P4wSKlsF D41ohlWok3iYFja4J4ZFNzQh0636JPk9V70zt/osXY38dY7tMrq1IoeGvAwZP9fXAP30ut MNEa/0YDvvhIgaQHLYttcXtnQiC7Hib9dc5jtWxLy4nV5WM6sGk9dZah5/l6g0lp2dPhmi T0gUOYruXjkDExikQxlCzzDDj0SlLygyjI0r+wXH/BqK1d/3DtYKzNRd1rnvM8rOSpRC6K 3NzDoqZZc7U0rxvZepIywBMUV/BL4uhi1sI67HcPAR65NHS47uPYc4dnAhY1MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742317248; a=rsa-sha256; cv=none; b=wDKsWREWR3TdeYbyeBZYdn5C8BUyfWc3l4u/0jwf4/0gHQdt0HI03oNZtvGn33MbEzpwLS exZo7cy6LOc0z0r5wWU5CV15brq069x8c2qzoDysOmMr8JjXqZneAcPn5qqQjUX324QkMd ADtbcTSRKQBPBCBC4BGIqY51ADIlSDhJpuOidPZfri65YEJ/jOJfb1tHC0a25w04QSQz83 amUiZZ4FPRLyP7a0OGZ4PtlCOi52kyLhghD1MIbmG4hb/rpJzIYbM7Zd34E+qfUbR8akhD h+9OTx8rqq1LbYQwwmB6nqVxh7sjYLcbmDTISy8aEwkwik/3eSAq9w60Gklc5g== 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=1742317248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UWZc/I7GmaN+DSrGNgC/tSI0GossDGUwJ5JsV/YJyZ8=; b=nqFI2mGWgOyJr/ekqF0et4vOMtmzHwniToJ12f7THLHvZsI3qIGJZf6rRvJO50vCdyoIeM 0q6yNAknRI6PPVRTwn+e0IRu/2TnynskFN53Ob0lG+/a8mx++TSKo2Nj2Zy/cLoPF3KVae 8d4tOkPYElm4i4bVMwin7FyArzmQiWrhvyt6wGn3KQ8Mq/t/S5H9nXdq9v+X9ao+kBZsKr eoC4LW8bWjDQaxlIfXZ2btH4jlAUQ8v84bFxNNgs8Sg4I9qxlfbrh1c8XN50FJFC+rLbxk 5Ln2QtFo5geSGOV7W8gyza4bgeQkyj5ZFpB5ktVGmawIXUTtlBpJat3RoOPWrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZHJ4w0XlQzhqY; Tue, 18 Mar 2025 17:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52IH0lhO036257; Tue, 18 Mar 2025 17:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52IH0ltn036254; Tue, 18 Mar 2025 17:00:47 GMT (envelope-from git) Date: Tue, 18 Mar 2025 17:00:47 GMT Message-Id: <202503181700.52IH0ltn036254@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stephen Hurd Subject: git: 0832a409c21b - main - Add driver for the RK3328 GPIO_MUTE pin List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: shurd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0832a409c21b45b2a31b90c50a005d9a4b1a5efd Auto-Submitted: auto-generated The branch main has been updated by shurd: URL: https://cgit.FreeBSD.org/src/commit/?id=0832a409c21b45b2a31b90c50a005d9a4b1a5efd commit 0832a409c21b45b2a31b90c50a005d9a4b1a5efd Author: Stephen Hurd AuthorDate: 2025-03-15 19:43:55 +0000 Commit: Stephen Hurd CommitDate: 2025-03-18 17:00:19 +0000 Add driver for the RK3328 GPIO_MUTE pin This is used in in the ROC-RK3328-CC to control a regulator. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D49399 --- share/man/man4/man4.aarch64/Makefile | 1 + share/man/man4/man4.aarch64/rk_grf_gpio.4 | 44 ++++++ sys/arm/rockchip/files.rk32xx | 1 + sys/arm64/rockchip/rk_grf_gpio.c | 236 ++++++++++++++++++++++++++++++ sys/conf/files.arm64 | 1 + 5 files changed, 283 insertions(+) diff --git a/share/man/man4/man4.aarch64/Makefile b/share/man/man4/man4.aarch64/Makefile index aca11eeb583f..0e85aab8b770 100644 --- a/share/man/man4/man4.aarch64/Makefile +++ b/share/man/man4/man4.aarch64/Makefile @@ -6,6 +6,7 @@ MAN= \ felix.4 \ rk_gpio.4 \ rk_grf.4 \ + rk_grf_gpio.4 \ rk_i2c.4 \ rk_pinctrl.4 \ diff --git a/share/man/man4/man4.aarch64/rk_grf_gpio.4 b/share/man/man4/man4.aarch64/rk_grf_gpio.4 new file mode 100644 index 000000000000..1587e708c93b --- /dev/null +++ b/share/man/man4/man4.aarch64/rk_grf_gpio.4 @@ -0,0 +1,44 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 Stephen Hurd +.\" +.Dd Mar 16, 2025 +.Dt RK_GRF_GPIO 4 +.Os +.Sh NAME +.Nm rk_grf_gpio +.Nd +.Xr gpio 3 +driver for RockChip GPIO_MUTE pin +.Sh SYNOPSIS +.Cd "options SOC_ROCKCHIP_rk3328" +.Sh DESCRIPTION +The +.Nm +driver provides a single-pin, output-only +.Xr gpio 3 +unit whose single pin is named GPIO_MUTE. This controls the output +of the GPIO_MUTE pin on the SoC. +.Pp +This gpio is usually used to control another device on the board, +so is not usually available for user software. +.Sh HARDWARE +The +.Nm +driver supports the following GRF GPIO controller: +.Pp +.Bl -bullet -compact +.It +rockchip,rk3328-grf-gpio +.El +.Sh HISTORY +The +.Nm +driver first appeared in +.Fx 15.0 . +.Sh AUTHORS +The +.Nm +driver and manual were written by +.An Stephen Hurd Aq Mt shurd@freebsd.org . diff --git a/sys/arm/rockchip/files.rk32xx b/sys/arm/rockchip/files.rk32xx index 7331b12a06ed..2faee11b0b6a 100644 --- a/sys/arm/rockchip/files.rk32xx +++ b/sys/arm/rockchip/files.rk32xx @@ -6,6 +6,7 @@ dev/iicbus/controller/rockchip/rk_i2c.c standard arm64/rockchip/rk_iodomain.c standard arm64/rockchip/rk_gpio.c standard arm64/rockchip/rk_grf.c standard +arm64/rockchip/rk_grf_gpio.c standard arm64/rockchip/rk_pinctrl.c standard arm64/rockchip/rk_pmu.c standard dev/pwm/controller/rockchip/rk_pwm.c standard diff --git a/sys/arm64/rockchip/rk_grf_gpio.c b/sys/arm64/rockchip/rk_grf_gpio.c new file mode 100644 index 000000000000..6818bd85bb95 --- /dev/null +++ b/sys/arm64/rockchip/rk_grf_gpio.c @@ -0,0 +1,236 @@ +/* + * Copyright (c) 2025 Stephen Hurd + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include "syscon_if.h" + +#define GRF_SOC_CON10 0x0428 +#define SOC_CON10_GPIOMUT (1 << 1) +#define SOC_CON10_GPIOMUT_MASK ((1 << 1) << 16) +#define SOC_CON10_GPIOMUT_EN (1 << 0) +#define SOC_CON10_GPIOMUT_EN_MASK ((1 << 0) << 16) + +struct rk_grf_gpio_softc { + device_t sc_dev; + device_t sc_busdev; + struct syscon *sc_grf; + bool active_high; +}; + +static struct ofw_compat_data compat_data[] = { + {"rockchip,rk3328-grf-gpio", 1}, + {NULL, 0} +}; + +static device_t +rk_grf_gpio_get_bus(device_t dev) +{ + struct rk_grf_gpio_softc *sc; + + sc = device_get_softc(dev); + + return (sc->sc_busdev); +} + +static int +rk_grf_gpio_pin_max(device_t dev, int *maxpin) +{ + *maxpin = 1; + return (0); +} + +static int +rk_grf_gpio_pin_getname(device_t dev, uint32_t pin, char *name) +{ + if (pin) + return (EINVAL); + + snprintf(name, GPIOMAXNAME, "GPIO_MUTE"); + + return (0); +} + +static int +rk_grf_gpio_pin_getflags(device_t dev, uint32_t pin, uint32_t *flags) +{ + if (pin) + return (EINVAL); + *flags = GPIO_PIN_OUTPUT; + return (0); +} + +static int +rk_grf_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags) +{ + if (pin) + return (EINVAL); + if (flags != GPIO_PIN_OUTPUT) + return (EINVAL); + + return (0); +} + +static int +rk_grf_gpio_pin_getcaps(device_t dev, uint32_t pin, uint32_t *caps) +{ + if (pin) + return (EINVAL); + + *caps = GPIO_PIN_OUTPUT; + return (0); +} + +static int +rk_grf_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *val) +{ + struct rk_grf_gpio_softc *sc; + uint32_t reg; + + sc = device_get_softc(dev); + + if (pin) + return (EINVAL); + + reg = SYSCON_READ_4(sc->sc_grf, GRF_SOC_CON10); + if (reg & SOC_CON10_GPIOMUT) + *val = 1; + else + *val = 0; + + return (0); +} + +static int +rk_grf_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value) +{ + struct rk_grf_gpio_softc *sc; + uint32_t val; + + sc = device_get_softc(dev); + + if (pin) + return (EINVAL); + + val = SOC_CON10_GPIOMUT_MASK; + if (value) + val |= SOC_CON10_GPIOMUT; + SYSCON_WRITE_4(sc->sc_grf, GRF_SOC_CON10, val); + + return (0); +} + +static int +rk_grf_gpio_map_gpios(device_t bus, phandle_t dev, phandle_t gparent, int gcells, + pcell_t *gpios, uint32_t *pin, uint32_t *flags) +{ + if (gpios[0]) + return (EINVAL); + + /* The gpios are mapped as */ + *pin = 0; + /* TODO: The only valid flags are active low or active high */ + *flags = GPIO_PIN_OUTPUT; + return (0); +} + +static int +rk_grf_gpio_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + + device_set_desc(dev, "RockChip General Register File GPIO (GPIO_MUTE)"); + return (BUS_PROBE_DEFAULT); +} + +static int +rk_grf_gpio_attach(device_t dev) +{ + struct rk_grf_gpio_softc *sc; + phandle_t parent_node, node; + device_t pdev; + + sc = device_get_softc(dev); + sc->sc_dev = dev; + + node = ofw_bus_get_node(sc->sc_dev); + if (!OF_hasprop(node, "gpio-controller")) + return (ENXIO); + pdev = device_get_parent(dev); + parent_node = ofw_bus_get_node(pdev); + if (syscon_get_by_ofw_node(dev, parent_node, &sc->sc_grf) != 0) { + device_printf(dev, "cannot get parent syscon handle\n"); + return (ENXIO); + } + + sc->sc_busdev = gpiobus_attach_bus(dev); + if (sc->sc_busdev == NULL) { + return (ENXIO); + } + + return (0); +} + +static int +rk_grf_gpio_detach(device_t dev) +{ + struct rk_grf_gpio_softc *sc; + + sc = device_get_softc(dev); + + if (sc->sc_busdev) + gpiobus_detach_bus(dev); + + return(0); +} + +static device_method_t rk_grf_gpio_methods[] = { + DEVMETHOD(device_probe, rk_grf_gpio_probe), + DEVMETHOD(device_attach, rk_grf_gpio_attach), + DEVMETHOD(device_detach, rk_grf_gpio_detach), + + /* GPIO protocol */ + DEVMETHOD(gpio_get_bus, rk_grf_gpio_get_bus), + DEVMETHOD(gpio_pin_max, rk_grf_gpio_pin_max), + DEVMETHOD(gpio_pin_getname, rk_grf_gpio_pin_getname), + DEVMETHOD(gpio_pin_getflags, rk_grf_gpio_pin_getflags), + DEVMETHOD(gpio_pin_setflags, rk_grf_gpio_pin_setflags), + DEVMETHOD(gpio_pin_getcaps, rk_grf_gpio_pin_getcaps), + DEVMETHOD(gpio_pin_get, rk_grf_gpio_pin_get), + DEVMETHOD(gpio_pin_set, rk_grf_gpio_pin_set), + DEVMETHOD(gpio_map_gpios, rk_grf_gpio_map_gpios), + + DEVMETHOD_END +}; + +static driver_t rk_grf_gpio_driver = { + "gpio", + rk_grf_gpio_methods, + sizeof(struct rk_grf_gpio_softc), +}; + +/* + * GPIO driver is always a child of rk_grf driver and should be probed + * and attached within rk_grf function. Due to this, bus pass order + * must be same as bus pass order of rk_grf driver. + */ +EARLY_DRIVER_MODULE(rk_grf_gpio, simplebus, rk_grf_gpio_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index de3134ad9124..480f1ac78905 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -735,6 +735,7 @@ dev/iicbus/pmic/rockchip/rk805.c optional fdt rk805 soc_rockchip_rk3328 dev/iicbus/pmic/rockchip/rk808.c optional fdt rk808 soc_rockchip_rk3399 dev/iicbus/pmic/rockchip/rk817.c optional fdt rk817 soc_rockchip_rk3568 arm64/rockchip/rk_grf.c optional fdt soc_rockchip +arm64/rockchip/rk_grf_gpio.c optional fdt soc_rockchip arm64/rockchip/rk_pinctrl.c optional fdt rk_pinctrl soc_rockchip arm64/rockchip/rk_gpio.c optional fdt rk_gpio soc_rockchip arm64/rockchip/rk_iodomain.c optional fdt rk_iodomain From nobody Tue Mar 18 17:03:56 2025 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 4ZHJ8Y2VSCz5qx1l; Tue, 18 Mar 2025 17:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZHJ8Y11sKz3CZb; Tue, 18 Mar 2025 17:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742317437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=42NbsdnG432ikDASUeXrYnqJ1lZBuipdKbO5CPzFSms=; b=rpq04UtpRfECh8d7+f17URNxf0SkWC68TOfRJGtjlURf1E/r7ZHFRVpsJZZF4bPnih7y3H 2l2Uf8ZVsIIkIPsyimEqglVMs0woyrT31YYLnvUTEj2iifw/ZJEz69ykpQfhSeqjeftdnw ImBGGddynnHBXmeofc2CaFwKe8vBcSf8k1BlgGUpGZBRZCGS5zCHnZl6aAa8+SSYqsb7Um qUBWH/NtTDjO8Ba/FsWQmNLx2wJkCQ1HJIw4Fgm/KSg4jNCkd1PuEfN/BCrj3DfL5llbg7 +8SkHTt0/g7kDvnMSOlxT7AmqyUbezuzDVawlmH+k0LDpWCwyCRaGXbFOlU1cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742317437; a=rsa-sha256; cv=none; b=aY47Rk5ellbYCy7/Rmlxwl6wRgY47Qehdqn1F/KEKI/Vgp2RJrFrofAYhBxJZiGcGyan/n wDTBmd+dLWzQRhWUO/GzvU/Thrx/tH5XuY2083Y846l3TZfNuXVf5rCqMW4jHB5SHjiRXb 05iAMKsEWCMSbI++AYv9z4qNw4QWYfAvO+sQdcB0EUBrZkXf53Fa9jVlrw43uyLCGOoOZG XsWgGgwYGbO9Vwkcae70Pcj485juFnWu0So4qK1XlMxSWBCosRYKnN7fDx4Cz3pC5YvHTG WPzg81Wcoz9xKYDo7vLeZ5uoTg26YZ4554OVDbiFh9R/yTsLtZjQQ01gTgWQew== 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=1742317437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=42NbsdnG432ikDASUeXrYnqJ1lZBuipdKbO5CPzFSms=; b=MU8xBUUip+5dL+nQomwf8sfCe6iQY/tzW7A27rdUrNZJIGgVs53bIsdzq+yHCt5pYpu0rC kemJmCwYPnG6/3y6JNWEoSF+JImnsVqBE+x/l4ojwJhu8lXNULBtFDZg0kNYrE3UhfVk1V izc4Dn0dtJ4GnD4ZtDF70SW7tWMctE0oh8XBITX3PceEGfJGLrMOlZkVUkcZiZ3RYudL1n QLR/NQnp0++NV1j+MxArh/sJXFoYcjzTuz+ejENcG79X9h2vGid2gLtHgF6AuxGl92eO1O fYcnJdHtvmfD/HBAQRcswIu9jQurOXjBxgcSz0be0lBKboe6IqWZzeseyR1zyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZHJ8Y0XbMzj1x; Tue, 18 Mar 2025 17:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52IH3uNL040399; Tue, 18 Mar 2025 17:03:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52IH3uG3040396; Tue, 18 Mar 2025 17:03:56 GMT (envelope-from git) Date: Tue, 18 Mar 2025 17:03:56 GMT Message-Id: <202503181703.52IH3uG3040396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stephen Hurd Subject: git: 0f684b5aec50 - main - Disable HS200 on rockchip_dwmmc in attach List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: shurd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f684b5aec50b4766dc2a8f010fd7b9568af5063 Auto-Submitted: auto-generated The branch main has been updated by shurd: URL: https://cgit.FreeBSD.org/src/commit/?id=0f684b5aec50b4766dc2a8f010fd7b9568af5063 commit 0f684b5aec50b4766dc2a8f010fd7b9568af5063 Author: Stephen Hurd AuthorDate: 2025-03-17 07:16:53 +0000 Commit: Stephen Hurd CommitDate: 2025-03-18 17:01:21 +0000 Disable HS200 on rockchip_dwmmc in attach HS200 mode requires tuning, and there is no code to perform this tuning at present. Until there is, leave HS200 mode disabled. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D49400 --- sys/dev/mmc/host/dwmmc_rockchip.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/dev/mmc/host/dwmmc_rockchip.c b/sys/dev/mmc/host/dwmmc_rockchip.c index c4b07ac3290e..656e9a9cf09d 100644 --- a/sys/dev/mmc/host/dwmmc_rockchip.c +++ b/sys/dev/mmc/host/dwmmc_rockchip.c @@ -78,6 +78,7 @@ rockchip_dwmmc_attach(device_t dev) { struct dwmmc_softc *sc; int type; + int rc; sc = device_get_softc(dev); sc->hwtype = HWTYPE_ROCKCHIP; @@ -90,8 +91,17 @@ rockchip_dwmmc_attach(device_t dev) } sc->update_ios = &dwmmc_rockchip_update_ios; + rc = dwmmc_attach(dev); - return (dwmmc_attach(dev)); + /* + * Note: It's not that the controller doesn't support HS200, + * it's that FreeBSD doesn't support tuning. + * If someone implemented tuning, this could work. + */ + device_printf(dev, "Disabling HS200+ (tuning code not written)\n"); + sc->host.caps &= ~(MMC_CAP_MMC_HS200 | MMC_CAP_MMC_HS400); + + return (rc); } static int From nobody Tue Mar 18 19:23:31 2025 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 4ZHMFb3Cm9z5r6h5; Tue, 18 Mar 2025 19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZHMFb1r1Jz45Mb; Tue, 18 Mar 2025 19: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=1742325811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SjxbcojV5Vv16Lf5lbd0N3PufT37eJHypqeI89xI1zo=; b=rFG5G9/Qjx0+ZQNPJI6Y870BP1gsTCZT2lDPq4VEUtpF0cJu3Iho26zAcz9TDovl2CfjMr Mp5ySdvXG/GvytWN+MB2g5WgSpO7XgCHn4EopYmC2EzK7khuJKtfv8AV+jXLrIl1Ec3lrd Snff3E3MLZFGZmeQiC+Hi0u/IFUiNH7iBflhIIbSJseSQhChlZ+QjSyzEKfvnkM2ll99yv ro5FXHCah2RiTrlM4dnwhkdqaZUHeBHM2DT0I9PE8tMSzr/ZH6ar/umQBhoGze0QKVflFL LC6xCyWD+QfCq3Vbd7z7CAoqZo00WSw8vUX1q0Q9YQyiOq2urhzYFVmn0XslnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742325811; a=rsa-sha256; cv=none; b=rqw26/T30IIz/X6Z3fl/Cb5sYwRBnDJZJs87QPV8wYheyW1QKmyOfzpzcoCSfvpI9HyCdt vJWibtKXWrIFEY2mkfwPwOyWUIq84UqXRs097Bqz7cRgbcqibhNgSJAChddv61yhsZCwgg yIy8HuZPOhnliSUvQAlEhW645XaGtgtCg+TdHv4U2XW2SQc2YkG8w1AABHDZHWlAl7YNtL spYf1bLM+BIJV8Icxj6MZfVXifZICYkUUu15anGlrNjCMa/8nCpjOk4/Oi2QDWzCJAlWdb NhtrmkjVuG/kf31FMhra7lcXQX9XOqSY6nTFxLCxEnDlXTkipmVBijV+PGxHRw== 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=1742325811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SjxbcojV5Vv16Lf5lbd0N3PufT37eJHypqeI89xI1zo=; b=aut7njLfHqT//54sJw74a8jRYgz1mOIN0jZMuMNzlLu6klAE+E9uKkaa1QSK8/QobcX1gP T9HZt0H+twJkOJcNvquuEzqhzjwOdaqM/IxJ6KUmYcmBWAitnJQ/VMIT3RlUcNT7bCdjGs ltJqrSpbCgQGs5y9bq8eP5AbURLpw9KTwPwtLVauAhPVYJWc2eFIShC/eoQWzF29kPvR/B WGGn4mwZaq8Mt6BCM/m5TrtT/R3PZ70Y62wsAKgTdwZHXWTmc+47LPTGY27RrakkILQ61L f6UqwIAdzdCFwr61nLP0wS1Hr22Otu5W9ePR88aOd6mNFTO6oYHsQTWboSJimA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZHMFb0xc3zmj2; Tue, 18 Mar 2025 19:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52IJNVuw002187; Tue, 18 Mar 2025 19:23:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52IJNVxZ002184; Tue, 18 Mar 2025 19:23:31 GMT (envelope-from git) Date: Tue, 18 Mar 2025 19:23:31 GMT Message-Id: <202503181923.52IJNVxZ002184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: c22b297062e1 - main - cxgbe(4): Add two new transceiver types. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c22b297062e1440676973a8aa89cbad1571e22f9 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=c22b297062e1440676973a8aa89cbad1571e22f9 commit c22b297062e1440676973a8aa89cbad1571e22f9 Author: Navdeep Parhar AuthorDate: 2025-03-16 02:26:08 +0000 Commit: Navdeep Parhar CommitDate: 2025-03-18 18:36:00 +0000 cxgbe(4): Add two new transceiver types. Future firmwares will report these types to the driver. These transceivers work already but are misidentified as a different type. MFC after: 1 month Sponsored by: Chelsio Communications --- sys/dev/cxgbe/firmware/t4fw_interface.h | 2 ++ sys/dev/cxgbe/t4_main.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/firmware/t4fw_interface.h b/sys/dev/cxgbe/firmware/t4fw_interface.h index 686bb55d658b..2794bae9474b 100644 --- a/sys/dev/cxgbe/firmware/t4fw_interface.h +++ b/sys/dev/cxgbe/firmware/t4fw_interface.h @@ -7820,6 +7820,8 @@ enum fw_port_module_type { FW_PORT_MOD_TYPE_TWINAX_PASSIVE = 0x4, FW_PORT_MOD_TYPE_TWINAX_ACTIVE = 0x5, FW_PORT_MOD_TYPE_LRM = 0x6, + FW_PORT_MOD_TYPE_LR_SIMPLEX = 0x7, + FW_PORT_MOD_TYPE_DR = 0x8, FW_PORT_MOD_TYPE_ERROR = M_FW_PORT_CMD_MODTYPE - 3, FW_PORT_MOD_TYPE_UNKNOWN = M_FW_PORT_CMD_MODTYPE - 2, FW_PORT_MOD_TYPE_NOTSUPPORTED = M_FW_PORT_CMD_MODTYPE - 1, diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 20df6a97aa87..9e91250cb61c 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -3537,6 +3537,7 @@ port_mword(struct port_info *pi, uint32_t speed) /* Pluggable transceiver */ switch (pi->mod_type) { case FW_PORT_MOD_TYPE_LR: + case FW_PORT_MOD_TYPE_LR_SIMPLEX: switch (speed) { case FW_PORT_CAP32_SPEED_1G: return (IFM_1000_LX); @@ -3593,6 +3594,10 @@ port_mword(struct port_info *pi, uint32_t speed) if (speed == FW_PORT_CAP32_SPEED_10G) return (IFM_10G_LRM); break; + case FW_PORT_MOD_TYPE_DR: + if (speed == FW_PORT_CAP32_SPEED_100G) + return (IFM_100G_DR); + break; case FW_PORT_MOD_TYPE_NA: MPASS(0); /* Not pluggable? */ /* fall throough */ @@ -12210,7 +12215,8 @@ t4_os_portmod_changed(struct port_info *pi) struct vi_info *vi; if_t ifp; static const char *mod_str[] = { - NULL, "LR", "SR", "ER", "TWINAX", "active TWINAX", "LRM" + NULL, "LR", "SR", "ER", "TWINAX", "active TWINAX", "LRM", + "LR_SIMPLEX", "DR" }; KASSERT((pi->flags & FIXED_IFMEDIA) == 0, From nobody Wed Mar 19 18:18:54 2025 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 4ZHxmb0ZdJz5qFm4; Wed, 19 Mar 2025 18:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZHxmZ5MdCz3CdD; Wed, 19 Mar 2025 18:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742408334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rn+VA22q6LW9PD7sOu+LTTcFXDJj7i29srDJSQuSuGo=; b=xajQVu9UUeCzESDVx7qNkP7mD//4gk6Gaojq0i7kvMgShTIwUnp2xqd484CJEN7R5eG0cl XGuIV6ilY9NcpLgdc43EFhnBGQJkNn/f+bjUxH0CsDGTVJHgTMMW2ZCLTSetG6isIlx5HM iQu/Kevmc1VTyI0qO013E+ZfvuEDymcUHu9NQwLlQTt+GJb2xtXGqIXuPANf/+gzvCfNlD b4Kir3BmU7t+RKx2ku9mJrWOeFg2fUGtVJpZH27jaV7nUZP8wJff9WHaxMCleV6xuTrfU7 nOVQMRp8PZB3PzDTBK5R12xGR2+JxEIuIdwesRADD3cVdQDMvYYaHhOny3BlZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742408334; a=rsa-sha256; cv=none; b=jUGcp4R95zelG+nkzFrY57TyWQQGCIc0ob1UhvD5B/CZgFG70ldBA0uJCo8AxYmLZq8jAE roIcgm+JHDmAkwi3FONCPl2Zgjkshv63wCswu8PC3tZi1TSFDfYa0CnDqV+hz6qj6W7jph M6Svh+DgRqKXOjpTdOvzAZ6pnGTILueDdpu/NKfu0J4FRxfJAdz+iXXap1n591umVuQdhJ nlYF5EaifwR9rW8T9jxrVsgdtOLqQ5sYEIGjygjZn3llWD74sqxo4/CsirGDe5ECuC7vjE uPL7wQD0zLmJbJXHVynBZFambX8zUICmeizSgqP1IjO0I98Bc148mSxuzzv7OQ== 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=1742408334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rn+VA22q6LW9PD7sOu+LTTcFXDJj7i29srDJSQuSuGo=; b=yAzN4B2gslOnFeOisVPAMk7Y6H2werKh4ccgdVvc+SK4LniakX0cB8m90k3/k2SaSXiLns xVYFo3LIpiVUjik/fuogu4by4C8IxeZLMwNDyq9/iWX/J7+8+tgMb3kxVMOj4pePf0Xyy4 wPiLsKlEm0jKgfiM0BroWjYzaTBsV5o4Fyh9f+cLj3dvoOxirx9vSKqOq+uGnkf3j5UXvN v6rYb8Dh+gpYuyTw8p0h3LGw4VY+aMBIZKFAD67JIN7fRJ/2zfOWRsFCy/foJxAO++VpaB KuHw21bumEom3XPkQBMltwErlFh8szx5ceJgpAxCm5LwH3M2IU9TD3XZ6tWldA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZHxmZ4lHGzVdF; Wed, 19 Mar 2025 18:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JIIs5R077710; Wed, 19 Mar 2025 18:18:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JIIsrG077707; Wed, 19 Mar 2025 18:18:54 GMT (envelope-from git) Date: Wed, 19 Mar 2025 18:18:54 GMT Message-Id: <202503191818.52JIIsrG077707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: fc40132603f5 - main - snd_hda: Support Intel Raptor Lake 0x7a50 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc40132603f5133037a35e2c14ac1356a0128c50 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=fc40132603f5133037a35e2c14ac1356a0128c50 commit fc40132603f5133037a35e2c14ac1356a0128c50 Author: Christos Margiolis AuthorDate: 2025-03-19 18:18:37 +0000 Commit: Christos Margiolis CommitDate: 2025-03-19 18:18:37 +0000 snd_hda: Support Intel Raptor Lake 0x7a50 PR: 276379 Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste, markj Differential Revision: https://reviews.freebsd.org/D49389 --- sys/dev/sound/pci/hda/hdac.c | 1 + sys/dev/sound/pci/hda/hdac.h | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index 4f9f70d98cb6..a4242d2d1609 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -117,6 +117,7 @@ static const struct { { HDA_INTEL_ALLKPS, "Intel Alder Lake-PS", 0, 0 }, { HDA_INTEL_RPTLK1, "Intel Raptor Lake-P", 0, 0 }, { HDA_INTEL_RPTLK2, "Intel Raptor Lake-P", 0, 0 }, + { HDA_INTEL_RPTLK3, "Intel Raptor Lake-S", 0, 0 }, { HDA_INTEL_MTL, "Intel Meteor Lake-P", 0, 0 }, { HDA_INTEL_ARLS, "Intel Arrow Lake-S", 0, 0 }, { HDA_INTEL_ARL, "Intel Arrow Lake", 0, 0 }, diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 72da5a4a44ac..9b11dcba32a8 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -77,6 +77,7 @@ #define HDA_INTEL_ALLKPS HDA_MODEL_CONSTRUCT(INTEL, 0x51c9) #define HDA_INTEL_RPTLK1 HDA_MODEL_CONSTRUCT(INTEL, 0x51ca) #define HDA_INTEL_RPTLK2 HDA_MODEL_CONSTRUCT(INTEL, 0x51cb) +#define HDA_INTEL_RPTLK3 HDA_MODEL_CONSTRUCT(INTEL, 0x7a50) #define HDA_INTEL_SCH HDA_MODEL_CONSTRUCT(INTEL, 0x811b) #define HDA_INTEL_LPT1 HDA_MODEL_CONSTRUCT(INTEL, 0x8c20) #define HDA_INTEL_LPT2 HDA_MODEL_CONSTRUCT(INTEL, 0x8c21) From nobody Wed Mar 19 20:22:36 2025 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 4ZJ0WK11vCz5qf0F; Wed, 19 Mar 2025 20: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ0WJ3gR1z3mnn; Wed, 19 Mar 2025 20:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742415756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zpd1PRaitGM2vrlBYPVvpSk//0arPW61uzA67xtU8ic=; b=GGitt2iDmFPFvnoBKQZK4n5XEcmrUZOg5LIWX3PkCwSYUNX/CSpvntThPD8ivf18fdoxyH HMHBWtZwdLeBjQMOvxHRALCafKF6F7D81yBs2S9lsYlc6q+LogC0VmtfzuMviqOhjewpFK RnXZUy7E0BOUMhmrFj+7mPtdR6nqpjjK44OB0uBAudsNFNWsnJHufDZduobwNkHynj/EJW Etapf5ygOwShgvfcrl3KMioh8sO2uZHk/raR6I3HYtOriABrY+KK/BxfHM/Ej05T2V62vi Q5sJoiTNLHHwRa7Rzm2M2VFnr5YNlfMmqRo4IvPAFz8hlSkzA4a7Ruf3RYvBbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742415756; a=rsa-sha256; cv=none; b=du1GLltz7+l5cm98xXqD3HGC2MerRljYSouU9EndQUSpdzI6nIv9okEO0OguIjdsWJyVyO HAPSPZrwCxV/ZwDErHWd8gE675ObvYMWv79tqQc51CkGssGYJIBpktJ8WDL3StNeJI4Jy8 LtBf+rVgdpXRmYdezIcXnSfcFO9Y49gKOTUpP+qHlXOgBawC0AyQ0xFj6II1IIuv9P35c1 b89dEaO3ZDxHgnjUxI1ODnXaCJQDvGkY6KxfBdxYGVwZpGkT5LO4f+TTr+t+Da0z582Uys uLDfqL9/z6OcxQAGV5FR6QvZn9Az3CmBxuAxDZSD6QecA4pfQpR+u5dp6HTm0g== 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=1742415756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zpd1PRaitGM2vrlBYPVvpSk//0arPW61uzA67xtU8ic=; b=gfKTf1FeP9qFCDSyEGPdlN6YwoVcca2SBN4JkrO/gFWX35h2tSP/JQFwXYZg3eaKpgUjZ0 XaSbasDwN3GQkjjlvJ3TG9St7V/8X/ZF2/TFXYOynvCz780lbqeqG9IycOle4BI77pt94t fM99ow0q57caapxlucMNQfmLTC2Fab36kbX4lBxV9DroQIU8IDADQiTOacVxyKLX6hFqBP qNTlw47eiZJRBVl89FmvkCJ+MpYXz/B4Gy6hog8f8R+Yk0i3Upy5NTYIFjXEWVMU7Ymiix p/CUm/cWoWYbsGUMTXBbe/LEHyXmjfYDdgPiGOQ22z4jr3CaDhbtz/TVxL9Txw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ0WJ37S4zbmv; Wed, 19 Mar 2025 20:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JKMaAb019134; Wed, 19 Mar 2025 20:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JKMaUG019132; Wed, 19 Mar 2025 20:22:36 GMT (envelope-from git) Date: Wed, 19 Mar 2025 20:22:36 GMT Message-Id: <202503192022.52JKMaUG019132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: 623be660fcc9 - main - beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 commit 623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 Author: Chuck Silvers AuthorDate: 2025-03-19 19:48:10 +0000 Commit: Chuck Silvers CommitDate: 2025-03-19 19:48:10 +0000 beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS Sponsored by: Netflix --- usr.bin/beep/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.bin/beep/Makefile b/usr.bin/beep/Makefile index f252ab64f843..8388ff7ff986 100644 --- a/usr.bin/beep/Makefile +++ b/usr.bin/beep/Makefile @@ -1,6 +1,7 @@ +.include + PROG= beep MAN= beep.1 - -LDFLAGS= -lm +LIBADD= m .include From nobody Wed Mar 19 20:22:38 2025 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 4ZJ0WM0WT1z5qdjF; Wed, 19 Mar 2025 20:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ0WL5S9vz3mtR; Wed, 19 Mar 2025 20:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742415758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1aUFVrRPoVtadsH/dbI7Jr0HRAVeJPuAH0AY+gv0HKo=; b=lsLdFXkWCfDZ1V3w0e0kRYKVXcNpX5Be9lt0TAxLR6JI/0yzSeK0OCJ+m2EkdZuDMBmssi PRij74Mg1Vps1+5cfyoLBIFHDkUqnFQp4VscCyCyWopnegHtrQ9wR43aXuseV4pKAiJaeU 5tmXC9HfhoOA7LC/Zf0WtqvZ8uXMF/i2yGoTCIxxU4sq+Pqdb4bQQI9Dyppoa7P8k0X8X6 bn/7gNsjWb2fjc78MU9Xc5aR04qmUEox8JUgsm0Qy3I0hOo9eaxDQ+zMDJ3Ty034kjC7Sh bnZh9kF6or1IrczvQLPzS3r7uUJlaKaXHn8jv1+b+J8+Bbl7N386IKrY/g55Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742415758; a=rsa-sha256; cv=none; b=rPUzC5GUa/UDMtt/rDZpF/sP2q2tQGBcvGeCB87mJtvk4bdaWSM3UoRZCQjfs0OZO6LAmx CW4Yv/3WjA3Hu5ySPlojY/UoGo8cHQMhoub7SlMzHVgycaeOOTJJ7tkMhPjCeuE/wHHw/p tNLSvTWiylEeiFY2ABWSsgSPYjrjuvXKaSUnyXf5Jz5tXKnLD6eTePl79y5/vbEG8fqR0x 2Rt02h05NMA07pSxoundVSZ4POUouRlrluoG5Kltx3GcRInnDlNPvTanaP7OYeeXp3FTrH YSmwG+ydafqA/fRKW1R+Rxtgh0Xo6lW6XiRo6lkN74i5W4y+9/hIh4Aoiah8SA== 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=1742415758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1aUFVrRPoVtadsH/dbI7Jr0HRAVeJPuAH0AY+gv0HKo=; b=u3Df88l/TzU1VKCgSK5VJ6lk+wU4A8ItmzpLuWop8EGBz2NymHz2Z/pPvGLdGjLZ/XyWEp pLdb807VhjCd0cTUXjifZ4bhFaB+pUu41Xpeld6bqhjXn/hKZWkhn/jIr2P8G2STxRXiNZ rdT24/20mAjymkoYwsipvV+YNytTpcDmVbLJkENR67gDBI3T/U0z5jp5Q2RcZiv04OK6HS qzk2o2uk4riswm7dbYvzC6K8isCGnd6HsEqhcZXOc71WG3Sw8aDUcUZwf42nfY79nciuK7 LbYhr6D/nkBlrMZNoYH80MmmaQmI3jERsiJq+HLDPj0q1TV2K8fO/QrkeAe2cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ0WL53vQzbbC; Wed, 19 Mar 2025 20:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JKMcgf019203; Wed, 19 Mar 2025 20:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JKMcLQ019199; Wed, 19 Mar 2025 20:22:38 GMT (envelope-from git) Date: Wed, 19 Mar 2025 20:22:38 GMT Message-Id: <202503192022.52JKMcLQ019199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: a335a52eedfd - main - bsnmpd: append to LDFLAGS rather than replacing 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a335a52eedfd2225ffd8b11d123d04a9d68a0274 Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=a335a52eedfd2225ffd8b11d123d04a9d68a0274 commit a335a52eedfd2225ffd8b11d123d04a9d68a0274 Author: Chuck Silvers AuthorDate: 2025-03-19 19:50:08 +0000 Commit: Chuck Silvers CommitDate: 2025-03-19 19:50:08 +0000 bsnmpd: append to LDFLAGS rather than replacing it Sponsored by: Netflix --- usr.sbin/bsnmpd/bsnmpd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile index 245ffc51002f..e7c7a87eec7c 100644 --- a/usr.sbin/bsnmpd/bsnmpd/Makefile +++ b/usr.sbin/bsnmpd/bsnmpd/Makefile @@ -131,7 +131,7 @@ CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY LIBADD= begemot bsnmp -LDFLAGS= -Wl,-export-dynamic +LDFLAGS+= -Wl,-export-dynamic .if ${MK_OPENSSL} != "no" CFLAGS+= -DHAVE_LIBCRYPTO From nobody Wed Mar 19 20:22:37 2025 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 4ZJ0WL2B22z5qdj7; Wed, 19 Mar 2025 20:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ0WK4Tbsz3mnq; Wed, 19 Mar 2025 20: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=1742415757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c1Ws7aDiGu0l2n1o+GrU6mjMSgBsjXl0dYj5PAsLQ4M=; b=EZLXkRSz3Sexqk5/kfNMWzsYjAeUFSXx+b5k4EV1u+6AhTlbYRs2W5Qiz0c8JY9LFnomAo q68gRgRSLIzml3NBQJBKJ5M/wq4PFigiwsP5uaf79V/WMZNtcpJI+pZheTkhXNPStXvagB tqfUvFCZf6hQZld1pUzMtNZTAZ0ZpvH14MKRnbb80uyVssu+3RWsWC0n04j1sMopZT4t7F HoBCsaK4INrbTfnzcOnl4mldNAPb3wHbPY30A+f1Lew566diIxouMM1JnJLemBYs5B5HP3 6fphCRmZpGhY1po/0xGlX0gsWEf7n1aMe4kF/sBCWRZKy6oulqExUqiSP1cxIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742415757; a=rsa-sha256; cv=none; b=hZ/YA6ocukpeQM8D0I3zQUVD2u7EyRkWN1qUAU+MbmYxDsttPlDZ6RYRlIanPvHksnyNbN Udpn0OZtG94xrn4aEsVHLelnScbqF+xU5CK50uo/tiqokGTl0DdGUooOy3jRuVL5PFNcMO PVKNTN6a29DeDqDauJARCRQMVTgvTPZXoya6Oa8NzQYxpdG4xXUyxMob5GSCFwEkz7fKnL Wug1Oe5osFcz/48jHckOyLAYJrrvP732I4+jTdP2qcUCQGBgVrriFo8KoKnBr+hIug/Lk6 QCn9IiEMHgizyhyCV/yW2Ybn2MsfnKKF2XI3zAdAKGVJmWeKUIAAqlL+pGMrvA== 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=1742415757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c1Ws7aDiGu0l2n1o+GrU6mjMSgBsjXl0dYj5PAsLQ4M=; b=pTtA1SVWkY7MPa7G/yU8wuhiyOvvYN6lHZ9JnM//dPg3K1mQHZ4lMiT6CyL1kejuj61WIo xDxzhFIymAfOS3bWJclU0H46DTzLSV6S8afkTyrnE19tKTchRJ3p02tl8SCPCwHEXTAgRJ xYp9Mnn+4ORcAkurrtYBsztDKAkxhwSxaiQuK7v9L0nV46vgwjHoSO6YsBKhr9xHd+VqJt Cqf1ekLTTSXpGilbI1STS9jwuISMrD6TDcWlgHIHmIqRxPvY2Wo+gvpTDI7siOjIHlRnId Qk+HfjFsJEwW1+PSy2xc1y8DbiZ5IyjapWI6ooUpwXLf4XGAy6rvY9vZtlOnQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ0WK44x4zbYL; Wed, 19 Mar 2025 20:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JKMbSQ019168; Wed, 19 Mar 2025 20:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JKMbP1019165; Wed, 19 Mar 2025 20:22:37 GMT (envelope-from git) Date: Wed, 19 Mar 2025 20:22:37 GMT Message-Id: <202503192022.52JKMbP1019165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: db466e475446 - main - trim: add missing include of src.opts.mk, remove unneeded LDFLAGS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db466e475446f232bdfde91c8773b0df8a653abd Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=db466e475446f232bdfde91c8773b0df8a653abd commit db466e475446f232bdfde91c8773b0df8a653abd Author: Chuck Silvers AuthorDate: 2025-03-19 19:49:14 +0000 Commit: Chuck Silvers CommitDate: 2025-03-19 19:49:14 +0000 trim: add missing include of src.opts.mk, remove unneeded LDFLAGS Sponsored by: Netflix --- usr.sbin/trim/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/trim/Makefile b/usr.sbin/trim/Makefile index 1263c0c6819e..1329c7f79690 100644 --- a/usr.sbin/trim/Makefile +++ b/usr.sbin/trim/Makefile @@ -1,6 +1,7 @@ +.include + PROG= trim MAN= trim.8 LIBADD= util -LDFLAGS= -lutil .include From nobody Wed Mar 19 20:22:39 2025 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 4ZJ0WN21cTz5qf9g; Wed, 19 Mar 2025 20:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ0WM621Pz3mwc; Wed, 19 Mar 2025 20:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742415759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yoVCCurH74kbQ0SYtwrgCN1JuR1gV2EBopvNErhXUxo=; b=Dpll9PUMkEiZkBv/dsPqLHrsKw5QDT5WW1fU2VDrl71kRapXgZPbHhoT1cRio/7Mwtat9D y6qMP2DjygKxPKZDfjVTreh61OTBV9ocdzh1zIJsV7vs6ceEKCKMGpn3T0cffb9iffy3jz 6pVKw2s5XruikYhMRNoFJzzyUsICiZuEq9llj27jSnXKfY9AnVqIIY7IAA4h6Vpt7PAOPB +RCp+SaCchT2e2t93nEeBWgM3+Do1hLWVlRWLG0J2LunslDEQNW8e1Tg2d6ZwrAHumz/g5 EYkOCYG1SMhfQnxkad8FBO+q21x8/PIQccY8Pi1D4KDSJ9S265dB2KEG0yAvUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742415759; a=rsa-sha256; cv=none; b=BvZu/Hgv5szmV3ai1cKJGQPjeKlQ1ruDye0GKAkQC3CyBP6aoaTd2bFYLrh183Ph2w1Ro5 I+4XM1TnhiR2XL3G7bmfGgp2KwxAkB+SvsZIK1K60mkb7aYqDB4NI5IPCIz/VIoj/vE5eR LZuojFBW/pamgc2DG6qDmnbl7d2okulrILeFBrWKQSCBTkLu1Etnr/wyZtH1H3Xka1l8Cq DNLnUzmz2zUM32scYj0asEz50vTeCYBxzOCCWnOaRM87AOs85q/gqFzHrwoaHXfQeAYBQQ 6SLEkRLQQytsEeqF8q2aankt5H2uNJIWBLayE+oyp9QSlWHSIQdXcC6+ltDL7g== 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=1742415759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yoVCCurH74kbQ0SYtwrgCN1JuR1gV2EBopvNErhXUxo=; b=QeMMvFw+Esc1R3RfZCieVq6pCtvB11PiE7rRHEa77V0XaPkyItQ4AEpj7JBnqxz0uqqGi9 zKDy3h4HS5x2I1AG5CWtOTfMNFwil99LPL8I6caal0/Mc2BUMd15xmkqlzQ6VbFL3CTETh nvdbZuki9JOID+1tTEM7RVU7iWkdf3USDXYlQWWl8akfvcx2StEv+mf5qvtfm7DoNS9B4C rxnTP8jgI9XgPMt8zjkonlDLEmOdM1QCFU/l+DB7COXKN4K2vZtourdXZ/CvE7RtJw140W NCV66ElRvC1irMsk0pb8V0Efwyggq7sd+r8biGHjL3v/7BX2hHHJPQT2ASGf2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ0WM5dJVzbJ7; Wed, 19 Mar 2025 20:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JKMdbR019240; Wed, 19 Mar 2025 20:22:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JKMdp7019237; Wed, 19 Mar 2025 20:22:39 GMT (envelope-from git) Date: Wed, 19 Mar 2025 20:22:39 GMT Message-Id: <202503192022.52JKMdp7019237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: 91d8ee3579ef - main - i386/loader: force 4k linker max page size List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91d8ee3579ef3589b836922b14b79cc10fb99bbc Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=91d8ee3579ef3589b836922b14b79cc10fb99bbc commit 91d8ee3579ef3589b836922b14b79cc10fb99bbc Author: Chuck Silvers AuthorDate: 2025-03-19 19:52:50 +0000 Commit: Chuck Silvers CommitDate: 2025-03-19 19:56:34 +0000 i386/loader: force 4k linker max page size Force the BIOS loaders to use the standard 4k linker max page size so that they fit in the limited space even if someone has set a larger default linker max page size via /etc/src.conf. Reviewed by: imp Sponsored by: Netflix --- stand/i386/loader/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index 857944dcd010..bb9111c3dcce 100644 --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -140,6 +140,10 @@ FILESMODE_${LOADER}= ${BINMODE} -b # files. LDFLAGS+= ${BTXCRT} +# Force the linker max page size to 4k so that we fit in the limited space even +# if someone has set a larger default linker max page size via /etc/src.conf. +LDFLAGS+= -Wl,-z,max-page-size=0x1000 + DPADD= ${LDR_INTERP32} ${LIBI386} ${LIBSA32} LDADD= ${LDR_INTERP32} ${LIBI386} ${LIBSA32} From nobody Wed Mar 19 20:44:13 2025 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 4ZJ10H0gfcz5qfy1; Wed, 19 Mar 2025 20:44:15 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ10G16qLz49yh; Wed, 19 Mar 2025 20:44:14 +0000 (UTC) (envelope-from brooks@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742417054; 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=cbApILZd5CYTyr0m7L1gXktzxk8QoNRX3SGJgkikOqU=; b=b8NtZsW23jNwIdjrVNkLDatsn8gz5DMKNmSZSWgRF3rb2rWWTYMVGNkszJtlReXUrZ84QK /mSHu7ZUGQBytppBqFANxJzkKY/FnUVnx0IcojKyDVjWLlxlzzZkoSRjX936AC9ngcsM3R c3N9DUQeW+8VZKfPFc1a6TcZx67YVPepp5UXrLCUDnNIyUJ9xGLOh4cDOwQGpvqA9nR+9G DHn85Pc9m3au5Jjp31lK3nrlq8wP/MdyXHN19kogWgh14E9U0tF4sK9vwBvNFn43bWLyTX Zetv3Wo2EUR+p4Wy1RC7fuAbvFqPnMhwNmgrqEWS4e+iFECzdlN+OjvfGohw7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742417054; a=rsa-sha256; cv=none; b=Y0z42RpuzB3JWIxNnjFCW24Nhfxd9dXYgCDBlyEThw/F6OHAfUYdX3ECXh9+xGdH7Pz9m2 +05Q/rc83l0Pvj0nXiGKLM5AQ5ddidAFqxrLIX89TJAIon6rhdoxUaOtEfefJbK0CA+jdP ZH84ET5JfjwW/4zRp+9ycoJJM4CNClj4ovCLLHjkKLG3dKY/IQ+CnPBm+zf/2ssbn5N0e1 4jHIEktdsUpZgYojFuTS7uM/J0qu3qrGqp+c7v845SYmfuNo+x2UYhDKQaF5EdLe0ACBbr qJl9rE8+xMk4JQ93//ieoanUxsH6MUMDXQ3+7SXb3aSuVDqtc9YjyOKCcj9qIQ== 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=1742417054; 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=cbApILZd5CYTyr0m7L1gXktzxk8QoNRX3SGJgkikOqU=; b=jS2kQp+qIhyccStUw4M3FDDF/sbFoa/HMTqU4BdPRo80qkGePeEzU/Y8NIUJSYB3HY959B 7BKAagNmfjRZnXbk9izi9d6C8LsD6wEXrf0H7l3u4ESZMCjdhVDYLVltlY8bh4axARnw9D SpDnHZyU63jOQWWENUaOqwu1lYaKuwSKANbMvQutm3AaDc63Wee/DL4QtKFkZDA0L2r1aO F6bq77uURXTe872YTkx5uYvYOaYqByEsg589PHtNpolErQTRrAufSB6yxRhppwpeAtJvaj AcXuZ82hLpFc4/QDznKyfy2LSTvTlxNLLw8u2u1u9KMH43YRcwLBjLuk42Uohw== 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) (Authenticated sender: brooks/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZJ10G0GrtztLM; Wed, 19 Mar 2025 20:44:14 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 843C23C01A0; Wed, 19 Mar 2025 20:44:13 +0000 (UTC) Date: Wed, 19 Mar 2025 20:44:13 +0000 From: Brooks Davis To: Chuck Silvers Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 623be660fcc9 - main - beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS Message-ID: References: <202503192022.52JKMaUG019132@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202503192022.52JKMaUG019132@gitrepo.freebsd.org> On Wed, Mar 19, 2025 at 08:22:36PM +0000, Chuck Silvers wrote: > The branch main has been updated by chs: > > URL: https://cgit.FreeBSD.org/src/commit/?id=623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 > > commit 623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 > Author: Chuck Silvers > AuthorDate: 2025-03-19 19:48:10 +0000 > Commit: Chuck Silvers > CommitDate: 2025-03-19 19:48:10 +0000 > > beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS > > Sponsored by: Netflix > --- > usr.bin/beep/Makefile | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/usr.bin/beep/Makefile b/usr.bin/beep/Makefile > index f252ab64f843..8388ff7ff986 100644 > --- a/usr.bin/beep/Makefile > +++ b/usr.bin/beep/Makefile > @@ -1,6 +1,7 @@ > +.include Why add src.opts.mk? Nothing is using it and bsd.prog.mk will include it. Is there another change coming that will use it? -- Brooks > + > PROG= beep > MAN= beep.1 > - > -LDFLAGS= -lm > +LIBADD= m > > .include > From nobody Wed Mar 19 21:12:01 2025 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 4ZJ1cR4VSjz5qhjl; Wed, 19 Mar 2025 21:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ1cR16cGz3LyQ; Wed, 19 Mar 2025 21:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742418727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OgG7B+4PUj3iTt3evPzWa9Ab6rQ1RGdQ550JE5sqBLM=; b=eKQjWeBxRxw9nq/7zMTymEC7t06f9ERKmnYZNu3oxfr8mhR6XOY/I5OmD6mgJX4h3oLyDc eJmuW8Xls+MET1+5tZ+73AtjsLTHsPWgr34OEvwuMtizDd/bCj7gVcrE4zlSaCQqzsg0JO VQoE5NidcDCTdtRAPPXReE4+fRLrK/mMQ5WDG3OnwrXH/tcKXa1gEg8rin9a/+8shUh1Oi 2FyAfWtwbSRQ5NtD7fjtoB/TnSiIx1LU69xdqo1yFR6STimY29BUs0uXJgaJP3gUx8NITo 4Bwd3Fd2piGcxh0tRm1e7S3CbmLdO0fTLJP1oajDKMZylQ7zdNYWnRan+jTBPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742418727; a=rsa-sha256; cv=none; b=h8EB9bg+4h6Y6FQs+LLXcmvmehJ0WWkKlNrmkDAQJrCV5QAjIwM8LefP1ikaUVuEIPOjyF IkGxIZhw6uxu5jC9VeFqWq9bCoVkUzz75wkWze8tL3rOqDDjb3nwrCy9nPH/D2f/2XJjoS zAAuHYm6a206PhQhfrp4zN1FSHO2bm9PLk//ghrA+wNZG6OCTmWfYYmeabOQFiVwHSioY8 BBluqmoZFvE/X+xx7zhtQemyy+moK77pKz5JFpTTFB9xz5w5+n4qFOuMFImscN5V3IH7bp chCqCM7y6+W8HDEWGBQBGxdICpRGD/+4Kyw4bdN72rhQosPiB3YeNbrVp4B6vg== 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=1742418727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OgG7B+4PUj3iTt3evPzWa9Ab6rQ1RGdQ550JE5sqBLM=; b=iaY+nf6zOtOBjEOVfInQsL6qd4q5QDAnLrHvR3890LEJUKlTzSyqP6ZL2h+WbPG2Y9yHZJ an04c7LB4syUxy97qd+1THDII+dlMFzgVVxNR/Pp6F6PRdE/AW/MqpEPWPEMiK8+bW3xj3 7RU4MJdqi/Uon/+CTSK2cB5bnhwbcidBleCiH4b83omA9++xT/QQ2Qj/0q2aJml2Ay4ueY xlikRbYx06zSYhMWk1GpP0GjQHqsG5lT4c4Z40Vv14AzRsm/CW8c9Z3cbeuzf+xVVsdSUE 6plwFr9w0q7dy3Vip7zihwqjcToBemw3YS2S8+lkRj844L5Fpy79lSxFiVGbmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ1cR0hWpzcXQ; Wed, 19 Mar 2025 21:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JLC7hf012109; Wed, 19 Mar 2025 21:12:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JLC18F012078; Wed, 19 Mar 2025 21:12:01 GMT (envelope-from git) Date: Wed, 19 Mar 2025 21:12:01 GMT Message-Id: <202503192112.52JLC18F012078@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: d9a65c5de1c9 - main - Merge bmake-20250308 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: d9a65c5de1c9f30ae71ce0be8fb88be9d20d216d Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=d9a65c5de1c9f30ae71ce0be8fb88be9d20d216d commit d9a65c5de1c9f30ae71ce0be8fb88be9d20d216d Merge: 91d8ee3579ef 397f57656d61 Author: Simon J. Gerraty AuthorDate: 2025-03-19 21:06:16 +0000 Commit: Simon J. Gerraty CommitDate: 2025-03-19 21:10:44 +0000 Merge bmake-20250308 contrib/bmake/ChangeLog | 17 +++ contrib/bmake/Makefile | 8 +- contrib/bmake/VERSION | 2 +- contrib/bmake/bmake.cat1 | 2 +- contrib/bmake/bsd.after-import.mk | 39 ++++-- contrib/bmake/job.c | 251 +++++++++++++------------------------- contrib/bmake/main.c | 22 +--- contrib/bmake/make.h | 3 +- contrib/bmake/mk/ChangeLog | 13 ++ contrib/bmake/mk/install-mk | 6 +- contrib/bmake/mk/jobs.mk | 6 +- contrib/bmake/mk/meta.autodep.mk | 20 ++- contrib/bmake/mk/meta.stage.mk | 29 ++++- contrib/bmake/mk/sys.vars.mk | 7 +- contrib/bmake/os.sh | 10 +- usr.bin/bmake/Makefile | 104 ++++++++-------- usr.bin/bmake/Makefile.config | 4 +- usr.bin/bmake/unit-tests/Makefile | 2 +- 18 files changed, 265 insertions(+), 280 deletions(-) diff --cc contrib/bmake/Makefile index 939b71c5e12c,000000000000..ba2b2e742d35 mode 100644,000000..100644 --- a/contrib/bmake/Makefile +++ b/contrib/bmake/Makefile @@@ -1,266 -1,0 +1,266 @@@ - # $Id: Makefile,v 1.132 2024/09/22 19:56:26 sjg Exp $ ++# $Id: Makefile,v 1.133 2025/03/08 20:12:56 sjg Exp $ + +PROG = bmake + +SRCS = \ + arch.c \ + buf.c \ + compat.c \ + cond.c \ + dir.c \ + for.c \ + hash.c \ + job.c \ + lst.c \ + main.c \ + make.c \ + make_malloc.c \ + meta.c \ + metachar.c \ + parse.c \ + str.c \ + suff.c \ + targ.c \ + trace.c \ + util.c \ + var.c + +.MAIN: all + +MAN = ${PROG}.1 +SRCS.${MAN} = ${srcdir}/make.1 + +.-include "VERSION" +.-include "Makefile.inc" + +# this file gets generated by configure +.-include "Makefile.config" + +.if !empty(LIBOBJS) +SRCS += ${LIBOBJS:T:.o=.c} +.endif + +# just in case +prefix ?= /usr +srcdir ?= ${.PARSEDIR} +srcdir := ${srcdir} + +DEFAULT_SYS_PATH ?= ${prefix}/share/mk + +CPPFLAGS += -DUSE_META +CFLAGS += ${CPPFLAGS} +CFLAGS += -D_PATH_DEFSYSPATH=\"${DEFAULT_SYS_PATH}\" +CFLAGS += -I. -I${srcdir} ${XDEFS} -DMAKE_NATIVE +CFLAGS += ${COPTS.${.ALLSRC:M*.c:T:u}} +COPTS.main.c += "-DMAKE_VERSION=\"${_MAKE_VERSION}\"" + +.for x in FORCE_MAKE_OS FORCE_MACHINE FORCE_MACHINE_ARCH +.ifdef $x +COPTS.main.c += "-D$x=\"${$x}\"" +.endif +.endfor + +# meta mode can be useful even without filemon +# should be set by now +USE_FILEMON ?= no +.if ${USE_FILEMON:tl} != "no" +.PATH: ${srcdir}/filemon - SRCS+= filemon_${USE_FILEMON}.c ++SRCS += filemon_${USE_FILEMON}.c +COPTS.meta.c += -DUSE_FILEMON -DUSE_FILEMON_${USE_FILEMON:tu} +COPTS.job.c += ${COPTS.meta.c} + +.if ${USE_FILEMON} == "dev" +FILEMON_H ?= /usr/include/dev/filemon/filemon.h +.if exists(${FILEMON_H}) && ${FILEMON_H:T} == "filemon.h" +COPTS.filemon_dev.c += -DHAVE_FILEMON_H -I${FILEMON_H:H} +.endif +.elif ${USE_FILEMON} == "ktrace" +COPTS.filemon_ktrace.c += -Wno-error=unused-parameter +.endif + +.endif # USE_FILEMON + +.PATH: ${srcdir} + +# start-delete1 for bsd.after-import.mk +# we skip a lot of this when building as part of FreeBSD etc. + +# list of OS's which are derrived from BSD4.4 +BSD44_LIST = NetBSD FreeBSD OpenBSD DragonFly MirBSD Bitrig +# we are... +OS := ${.MAKE.OS:U${uname -s:L:sh}} +# are we 4.4BSD ? +isBSD44 := ${BSD44_LIST:M${OS}} + +.if ${isBSD44} == "" && ${OS:NCygwin:NDarwin:NLinux} != "" +MANTARGET ?= cat +.if ${MACHINE} == "sun386" +# even I don't have one of these anymore :-) +CFLAGS += -DPORTAR +.elif ${OS} != "SunOS" +# assume the worst +SRCS += sigcompat.c +CFLAGS += -DSIGNAL_FLAGS=SA_RESTART +.endif +.else +MANTARGET ?= man +.endif + +# turn this on by default - ignored if we are root +WITH_INSTALL_AS_USER = + +# suppress with -DWITHOUT_* +OPTIONS_DEFAULT_YES += \ + AUTOCONF_MK \ + INSTALL_MK \ + PROG_LINK \ + TESTS \ + +OPTIONS_DEFAULT_NO += \ + GEN_MAN \ + PROG_VERSION \ + +.if ${PROG} != "make" || ${srcdir} != ${.CURDIR} || !exists(${srcdir}/${MAN}) +WITH_GEN_MAN = 1 +.endif + +# process options now +.include + +.if ${MK_PROG_VERSION} == "yes" +PROG_NAME = ${PROG}-${_MAKE_VERSION} +.if ${MK_PROG_LINK} == "yes" +SYMLINKS += ${PROG_NAME} ${BINDIR}/${PROG} +.endif +.endif + - EXTRACT_MAN=no ++EXTRACT_MAN = no +# end-delete1 + +.if make(obj) || make(clean) +SUBDIR.${MK_TESTS} += unit-tests +.endif + +MAN1 = ${MAN} + +.if ${MK_GEN_MAN:Uno} == "yes" + +# we use this to generate ${MAN} +.include <${srcdir}/mk/genfiles.mk> + +.if ${PROG} != "make" +CLEANFILES += my.history +SED_CMDS.${MAN} += \ + -e '/^.Dt/s/MAKE/${PROG:tu}/' \ + -e '/^.Nm/s/make/${PROG}/' \ + +.endif + +.if ${CLEANFILES:U:Mmy.history} != "" +${MAN}: my.history +my.history: + @(echo ".Nm"; \ + echo "is derived from NetBSD"; \ + echo ".Xr make 1 ."; \ + echo "It uses autoconf to facilitate portability to other platforms."; \ + echo ".Pp") > $@ + +SED_CMDS.${MAN} += \ + -e '/^.Sh HISTORY/rmy.history' \ + -e '/^.Sh HISTORY/,/BUGS/s,^.Nm,make,' \ + +.endif + +.if ${.MAKE.OS:N*BSD} != "" +# assume .Nx is not supported +SED_CMDS.${MAN} += -e 's/^\.Nx/NetBSD/' +.endif + +# watch out for a late change of PROG +.if !empty(SRCS.${MAN}) +.NOPATH: ${MAN} +${MAN}: ${SRCS.${MAN}} _GENFILES_USE + +all man beforeinstall: ${MAN} - _mfromdir=. ++_mfromdir = . +.endif +.endif # MK_GEN_MAN + +MANTARGET ?= cat +MANDEST ?= ${MANDIR}/${MANTARGET}1 + +.if ${MANTARGET} == "cat" +_mfromdir = ${srcdir} +.endif + +.include + +CPPFLAGS += -DMAKE_NATIVE -DHAVE_CONFIG_H +COPTS.var.c += -Wno-cast-qual +COPTS.job.c += -Wno-format-nonliteral +COPTS.parse.c += -Wno-format-nonliteral +COPTS.var.c += -Wno-format-nonliteral + +# Force these +SHAREDIR = ${SHAREDIR.bmake:U${prefix}/share} +BINDIR = ${BINDIR.bmake:U${prefix}/bin} +MANDIR = ${MANDIR.bmake:U${SHAREDIR}/man} + +${OBJS}: config.h + +# start-delete2 for bsd.after-import.mk + +# make sure that MAKE_VERSION gets updated. +main.o: ${srcdir}/VERSION + +.if ${MK_AUTOCONF_MK} == "yes" +CONFIGURE_DEPS += ${.CURDIR}/VERSION +# we do not need or want the generated makefile +CONFIGURE_ARGS += --without-makefile +AUTOCONF_GENERATED_MAKEFILE = Makefile.config +.include +.endif +SHARE_MK ?= ${SHAREDIR}/mk +MKSRC = ${srcdir}/mk +INSTALL ?= ${srcdir}/install-sh + +.if ${MK_INSTALL_MK} == "yes" +install: install-mk +.endif + +beforeinstall: + test -d ${DESTDIR}${BINDIR} || ${INSTALL} -m ${DIRMODE} -d ${DESTDIR}${BINDIR} + test -d ${DESTDIR}${MANDEST} || ${INSTALL} -m ${DIRMODE} -d ${DESTDIR}${MANDEST} + +install-mk: +.if exists(${MKSRC}/install-mk) + test -d ${DESTDIR}${SHARE_MK} || ${INSTALL} -m ${DIRMODE} -d ${DESTDIR}${SHARE_MK} + sh ${MKSRC}/install-mk -v -m ${NONBINMODE} ${DESTDIR}${SHARE_MK} +.else + @echo need to unpack mk.tar.gz under ${srcdir} or set MKSRC; false +.endif +# end-delete2 + +# A simple unit-test driver to help catch regressions +TEST_MAKE ?= ${.OBJDIR}/${PROG:T} +accept test: .NOMETA + cd ${.CURDIR}/unit-tests && \ + MAKEFLAGS= ${TEST_MAKE} -r -m / ${.TARGET} ${TESTS:DTESTS=${TESTS:Q}} + + +.if make(test) && ${MK_AUTO_OBJ} == "yes" +# The test target above visits unit-tests with -r -m / +# which prevents MK_AUTO_OBJ doing its job +# so do it here +.if defined(MAKEOBJDIRPREFIX) || ${MAKEOBJDIR:U:M*/*} != "" +_utobj = ${.OBJDIR}/unit-tests +.else +_utobj = ${.CURDIR}/unit-tests/${MAKEOBJDIR:Uobj} +.endif +utobj: .NOMETA + @test -d ${_utobj} && exit 0; \ + echo "[Creating ${_utobj}...]"; \ + umask ${OBJDIR_UMASK:U002}; \ + mkdir -p ${_utobj} +test: utobj +.endif diff --cc contrib/bmake/job.c index bd85e6d95fb8,775c8197ea19..d06b1570ba85 --- a/contrib/bmake/job.c +++ b/contrib/bmake/job.c @@@ -2207,15 -2169,9 +2186,15 @@@ Job_Init(void aborting = ABORT_NONE; job_errors = 0; + Always_pass_job_queue = GetBooleanExpr(MAKE_ALWAYS_PASS_JOB_QUEUE, + Always_pass_job_queue); + + Job_error_token = GetBooleanExpr(MAKE_JOB_ERROR_TOKEN, Job_error_token); + + /* - * There is a non-zero chance that we already have children. - * eg after 'make -f- < + +.if ${PROG} != "make" - CLEANFILES += my.history - SED_CMDS.${MAN} += \ ++CLEANFILES+= my.history ++SED_CMDS.${MAN}+= \ + -e '/^.Dt/s/MAKE/${PROG:tu}/' \ + -e '/^.Nm/s/make/${PROG}/' \ + +.endif + +.if ${CLEANFILES:U:Mmy.history} != "" +${MAN}: my.history +my.history: + @(echo ".Nm"; \ + echo "is derived from NetBSD"; \ + echo ".Xr make 1 ."; \ + echo "It uses autoconf to facilitate portability to other platforms."; \ + echo ".Pp") > $@ + - SED_CMDS.${MAN} += \ ++SED_CMDS.${MAN}+= \ + -e '/^.Sh HISTORY/rmy.history' \ + -e '/^.Sh HISTORY/,/BUGS/s,^.Nm,make,' \ + +.endif + +.if ${.MAKE.OS:N*BSD} != "" +# assume .Nx is not supported - SED_CMDS.${MAN} += -e 's/^\.Nx/NetBSD/' ++SED_CMDS.${MAN}+= -e 's/^\.Nx/NetBSD/' +.endif + +# watch out for a late change of PROG +.if !empty(SRCS.${MAN}) +.NOPATH: ${MAN} +${MAN}: ${SRCS.${MAN}} _GENFILES_USE + +all man beforeinstall: ${MAN} - _mfromdir = . ++_mfromdir= . +.endif +.endif # MK_GEN_MAN + - MANTARGET ?= cat - MANDEST ?= ${MANDIR}/${MANTARGET}1 ++MANTARGET?= cat ++MANDEST?= ${MANDIR}/${MANTARGET}1 + +.if ${MANTARGET} == "cat" - _mfromdir = ${srcdir} ++_mfromdir= ${srcdir} +.endif + +.include + - CPPFLAGS += -DMAKE_NATIVE -DHAVE_CONFIG_H - COPTS.var.c += -Wno-cast-qual - COPTS.job.c += -Wno-format-nonliteral - COPTS.parse.c += -Wno-format-nonliteral - COPTS.var.c += -Wno-format-nonliteral ++CPPFLAGS+= -DMAKE_NATIVE -DHAVE_CONFIG_H ++COPTS.var.c+= -Wno-cast-qual ++COPTS.job.c+= -Wno-format-nonliteral ++COPTS.parse.c+= -Wno-format-nonliteral ++COPTS.var.c+= -Wno-format-nonliteral + +# Force these - SHAREDIR = ${SHAREDIR.bmake:U${prefix}/share} - BINDIR = ${BINDIR.bmake:U${prefix}/bin} - MANDIR = ${MANDIR.bmake:U${SHAREDIR}/man} ++SHAREDIR= ${SHAREDIR.bmake:U${prefix}/share} ++BINDIR= ${BINDIR.bmake:U${prefix}/bin} ++MANDIR= ${MANDIR.bmake:U${SHAREDIR}/man} + +${OBJS}: config.h + + +# A simple unit-test driver to help catch regressions - TEST_MAKE ?= ${.OBJDIR}/${PROG:T} ++TEST_MAKE?= ${.OBJDIR}/${PROG:T} +accept test: .NOMETA + cd ${.CURDIR}/unit-tests && \ + MAKEFLAGS= ${TEST_MAKE} -r -m / ${.TARGET} ${TESTS:DTESTS=${TESTS:Q}} + + +.if make(test) && ${MK_AUTO_OBJ} == "yes" +# The test target above visits unit-tests with -r -m / +# which prevents MK_AUTO_OBJ doing its job +# so do it here +.if defined(MAKEOBJDIRPREFIX) || ${MAKEOBJDIR:U:M*/*} != "" - _utobj = ${.OBJDIR}/unit-tests ++_utobj= ${.OBJDIR}/unit-tests +.else - _utobj = ${.CURDIR}/unit-tests/${MAKEOBJDIR:Uobj} ++_utobj= ${.CURDIR}/unit-tests/${MAKEOBJDIR:Uobj} +.endif +utobj: .NOMETA + @test -d ${_utobj} && exit 0; \ + echo "[Creating ${_utobj}...]"; \ + umask ${OBJDIR_UMASK:U002}; \ + mkdir -p ${_utobj} +test: utobj +.endif + +# override some simple things - BINDIR = /usr/bin - MANDIR = /usr/share/man/man ++BINDIR= /usr/bin ++MANDIR= /usr/share/man/man + +# make sure we get this - CFLAGS += ${COPTS.${.IMPSRC:T}} ++CFLAGS+= ${COPTS.${.IMPSRC:T}} + +after-import: ${SRCTOP}/contrib/bmake/bsd.after-import.mk + cd ${.CURDIR} && ${.MAKE} -f ${SRCTOP}/contrib/bmake/bsd.after-import.mk + diff --cc usr.bin/bmake/Makefile.config index 9ca3691cbb2a,000000000000..a5e81a13cd0a mode 100644,000000..100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@@ -1,28 -1,0 +1,28 @@@ +# This is a generated file, do NOT edit! +# See contrib/bmake/bsd.after-import.mk +# + +SRCTOP?= ${.CURDIR:H:H} + +# things set by configure + - _MAKE_VERSION?=20250125 ++_MAKE_VERSION?=20250308 + +prefix?= /usr +srcdir= ${SRCTOP}/contrib/bmake +CC?= cc +MAKE_OS?= +DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk + - EGREP = egrep ++EGREP= egrep +CPPFLAGS+= +CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H +LDFLAGS+= +LIBOBJS+= ${LIBOBJDIR}stresep$U.o +LDADD+= +USE_META?= yes +USE_FILEMON?= dev +FILEMON_H?= /usr/include/dev/filemon/filemon.h +BMAKE_PATH_MAX?= 1024 +# used if MAXPATHLEN not defined +CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX} diff --cc usr.bin/bmake/unit-tests/Makefile index 7011ab754b9e,000000000000..cdf252d5e474 mode 100644,000000..100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@@ -1,918 -1,0 +1,918 @@@ +# This is a generated file, do NOT edit! +# See contrib/bmake/bsd.after-import.mk +# +# $Id: Makefile,v 1.230 2025/01/30 18:04:20 sjg Exp $ +# +# $NetBSD: Makefile,v 1.355 2025/01/25 22:46:30 sjg Exp $ +# +# Unit tests for make(1) +# +# The main targets are: +# +# all: +# run all the tests +# test: +# run 'all', and compare to expected results +# accept: +# move generated output to expected results +# +# Settable variables +# +# TEST_MAKE +# The make program to be tested. +# +# +# Adding a test case +# +# Each feature should get its own set of tests in its own suitably +# named makefile (*.mk), with its own set of expected results (*.exp), +# and it should be added to the TESTS list. +# + +.MAIN: all + +# we use these below but we might be an older make +.MAKE.OS?= ${uname -s:L:sh} +.MAKE.UID?= ${id -u:L:sh} + +# for many tests we need a TMPDIR that will not collide +# with other users. +.if ${.OBJDIR} != ${.CURDIR} +# easy +TMPDIR:= ${.OBJDIR}/tmp +.elif defined(TMPDIR) +TMPDIR:= ${TMPDIR}/uid${.MAKE.UID} +.else +TMPDIR:= /tmp/uid${.MAKE.UID} +.endif +# make sure it exists +.if !exist(${TMPDIR}) +_!= mkdir -p ${TMPDIR} +.endif +# and clean it up - outside the context of +# any target that might be using it. +.END: rm-tmpdir +rm-tmpdir: .NOMETA + @rm -rf ${TMPDIR} + +# Each test is in a sub-makefile. +# Keep the list sorted. +# Any test that is commented out must be ignored in +# src/tests/usr.bin/make/t_make.sh as well. +#TESTS+= archive +#TESTS+= archive-suffix +TESTS+= cmd-errors +TESTS+= cmd-errors-jobs +TESTS+= cmd-errors-lint +TESTS+= cmd-interrupt +TESTS+= cmdline +TESTS+= cmdline-redirect-stdin +TESTS+= cmdline-undefined +TESTS+= comment +TESTS+= compat-error +TESTS+= cond-cmp-numeric +TESTS+= cond-cmp-numeric-eq +TESTS+= cond-cmp-numeric-ge +TESTS+= cond-cmp-numeric-gt +TESTS+= cond-cmp-numeric-le +TESTS+= cond-cmp-numeric-lt +TESTS+= cond-cmp-numeric-ne +TESTS+= cond-cmp-string +TESTS+= cond-cmp-unary +TESTS+= cond-eof +TESTS+= cond-func +TESTS+= cond-func-commands +TESTS+= cond-func-defined +TESTS+= cond-func-empty +TESTS+= cond-func-exists +TESTS+= cond-func-make +TESTS+= cond-func-make-main +TESTS+= cond-func-target +TESTS+= cond-late +TESTS+= cond-op +TESTS+= cond-op-and +TESTS+= cond-op-and-lint +TESTS+= cond-op-not +TESTS+= cond-op-or +TESTS+= cond-op-or-lint +TESTS+= cond-op-parentheses +TESTS+= cond-short +TESTS+= cond-token-number +TESTS+= cond-token-plain +TESTS+= cond-token-string +TESTS+= cond-token-var +TESTS+= cond-undef-lint +TESTS+= counter +TESTS+= counter-append +TESTS+= dep +TESTS+= dep-colon +TESTS+= dep-colon-bug-cross-file +TESTS+= dep-double-colon +TESTS+= dep-double-colon-indep +TESTS+= dep-duplicate +TESTS+= dep-exclam +TESTS+= dep-none +TESTS+= dep-op-missing +TESTS+= dep-percent +TESTS+= dep-var +TESTS+= dep-wildcards +TESTS+= depsrc +TESTS+= depsrc-end +TESTS+= depsrc-exec +TESTS+= depsrc-ignore +TESTS+= depsrc-made +TESTS+= depsrc-make +TESTS+= depsrc-meta +TESTS+= depsrc-nometa +TESTS+= depsrc-nometa_cmp +TESTS+= depsrc-nopath +TESTS+= depsrc-notmain +TESTS+= depsrc-optional +TESTS+= depsrc-phony +TESTS+= depsrc-precious +TESTS+= depsrc-recursive +TESTS+= depsrc-silent +TESTS+= depsrc-use +TESTS+= depsrc-usebefore +TESTS+= depsrc-usebefore-double-colon +TESTS+= depsrc-wait +TESTS+= deptgt +TESTS+= deptgt-begin +TESTS+= deptgt-begin-fail +TESTS+= deptgt-begin-fail-indirect +TESTS+= deptgt-default +TESTS+= deptgt-delete_on_error +TESTS+= deptgt-end +TESTS+= deptgt-end-fail +TESTS+= deptgt-end-fail-all +TESTS+= deptgt-end-fail-indirect +TESTS+= deptgt-end-jobs +TESTS+= deptgt-error +TESTS+= deptgt-ignore +TESTS+= deptgt-interrupt +TESTS+= deptgt-main +TESTS+= deptgt-makeflags +TESTS+= deptgt-no_parallel +TESTS+= deptgt-nopath +TESTS+= deptgt-notparallel +TESTS+= deptgt-objdir +TESTS+= deptgt-order +TESTS+= deptgt-path +TESTS+= deptgt-path-suffix +TESTS+= deptgt-phony +TESTS+= deptgt-posix +TESTS+= deptgt-precious +TESTS+= deptgt-shell +TESTS+= deptgt-silent +TESTS+= deptgt-silent-jobs +TESTS+= deptgt-stale +TESTS+= deptgt-suffixes +TESTS+= dir +TESTS+= dir-expand-path +TESTS+= directive +TESTS+= directive-dinclude +TESTS+= directive-elif +TESTS+= directive-elifdef +TESTS+= directive-elifmake +TESTS+= directive-elifndef +TESTS+= directive-elifnmake +TESTS+= directive-else +TESTS+= directive-endfor +TESTS+= directive-endif +TESTS+= directive-error +TESTS+= directive-export +TESTS+= directive-export-env +TESTS+= directive-export-impl +TESTS+= directive-export-gmake +TESTS+= directive-export-literal +TESTS+= directive-for +TESTS+= directive-for-break +TESTS+= directive-for-empty +TESTS+= directive-for-errors +TESTS+= directive-for-escape +TESTS+= directive-for-generating-endif +TESTS+= directive-for-if +TESTS+= directive-for-lines +TESTS+= directive-for-null +TESTS+= directive-hyphen-include +TESTS+= directive-if +TESTS+= directive-if-nested +TESTS+= directive-ifdef +TESTS+= directive-ifmake +TESTS+= directive-ifndef +TESTS+= directive-ifnmake +TESTS+= directive-include +TESTS+= directive-include-fatal +TESTS+= directive-include-guard +TESTS+= directive-info +TESTS+= directive-misspellings +TESTS+= directive-sinclude +TESTS+= directive-undef +TESTS+= directive-unexport +TESTS+= directive-unexport-env +TESTS+= directive-warning +TESTS+= dollar +TESTS+= doterror +TESTS+= dotwait +TESTS+= error +TESTS+= # escape # broken by reverting POSIX changes +TESTS+= export +TESTS+= export-all +TESTS+= export-env +TESTS+= export-variants +TESTS+= gnode-submake +TESTS+= hanoi-include +TESTS+= impsrc +TESTS+= include-main +TESTS+= job-flags +TESTS+= job-output-long-lines +TESTS+= job-output-null +TESTS+= jobs-empty-commands +TESTS+= jobs-empty-commands-error +TESTS+= jobs-error-indirect +TESTS+= jobs-error-nested +TESTS+= jobs-error-nested-make +TESTS+= lint +TESTS+= make-exported +TESTS+= meta-cmd-cmp +TESTS+= moderrs +TESTS+= modmisc +.if ${.MAKE.UID} > 0 +TESTS+= objdir-writable +.endif +TESTS+= opt +TESTS+= opt-backwards +TESTS+= opt-chdir +TESTS+= opt-debug +TESTS+= opt-debug-all +TESTS+= opt-debug-archive +TESTS+= opt-debug-curdir +TESTS+= opt-debug-cond +TESTS+= opt-debug-dir +TESTS+= opt-debug-errors +TESTS+= opt-debug-errors-jobs +TESTS+= opt-debug-file +TESTS+= opt-debug-for +TESTS+= opt-debug-graph1 +TESTS+= opt-debug-graph2 +TESTS+= opt-debug-graph3 +TESTS+= opt-debug-hash +TESTS+= opt-debug-jobs +TESTS+= opt-debug-lint +TESTS+= opt-debug-loud +TESTS+= opt-debug-meta +TESTS+= opt-debug-making +TESTS+= opt-debug-no-rm +TESTS+= opt-debug-parse +TESTS+= opt-debug-suff +TESTS+= opt-debug-targets +TESTS+= opt-debug-varraw +TESTS+= opt-debug-var +TESTS+= opt-debug-x-trace +TESTS+= opt-define +TESTS+= opt-env +TESTS+= opt-file +TESTS+= opt-ignore +TESTS+= opt-include-dir +TESTS+= opt-jobs +TESTS+= opt-jobs-internal +TESTS+= opt-jobs-no-action +TESTS+= opt-keep-going +TESTS+= opt-keep-going-indirect +TESTS+= opt-keep-going-multiple +TESTS+= opt-m-include-dir +TESTS+= opt-no-action +TESTS+= opt-no-action-at-all +TESTS+= opt-no-action-runflags +TESTS+= opt-no-action-touch +TESTS+= opt-query +TESTS+= opt-raw +TESTS+= opt-silent +TESTS+= opt-touch +TESTS+= opt-touch-jobs +TESTS+= opt-tracefile +TESTS+= opt-var-expanded +TESTS+= opt-var-literal +TESTS+= opt-version +TESTS+= opt-warnings-as-errors +TESTS+= opt-where-am-i +TESTS+= opt-x-reduce-exported +TESTS+= order +TESTS+= parse +TESTS+= parse-var +TESTS+= phony-end +TESTS+= posix +TESTS+= # posix1 # broken by reverting POSIX changes +TESTS+= recursive +TESTS+= sh +TESTS+= sh-dots +TESTS+= sh-errctl +TESTS+= sh-flags +TESTS+= sh-jobs +TESTS+= sh-jobs-error +TESTS+= sh-leading-at +TESTS+= sh-leading-hyphen +TESTS+= sh-leading-plus +TESTS+= sh-meta-chars +TESTS+= sh-multi-line +TESTS+= sh-single-line +TESTS+= shell-csh +TESTS+= shell-custom +.if exists(/bin/ksh) +TESTS+= shell-ksh +.endif +TESTS+= shell-sh +TESTS+= suff +TESTS+= suff-add-later +TESTS+= suff-clear-regular +TESTS+= suff-clear-single +TESTS+= suff-incomplete +TESTS+= suff-lookup +TESTS+= suff-main +TESTS+= suff-main-several +TESTS+= suff-phony *** 586 LINES SKIPPED *** From nobody Wed Mar 19 21:23:39 2025 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 4ZJ1sv4SNKz5qjSb; Wed, 19 Mar 2025 21:23:47 +0000 (UTC) (envelope-from chuq@chuq.com) Received: from mail.vc.panix.com (mail.vc.panix.com [166.84.1.92]) (using TLSv1.3 with cipher TLS_AES_256_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 4ZJ1sv2Nz6z3Y0R; Wed, 19 Mar 2025 21:23:47 +0000 (UTC) (envelope-from chuq@chuq.com) Authentication-Results: mx1.freebsd.org; none Received: from vc.chuq.com (vc.chuq.com [166.84.7.169]) by mail.vc.panix.com (Postfix) with ESMTPS id 4ZJ1sm6rLRz4P0d; Wed, 19 Mar 2025 17:23:40 -0400 (EDT) Received: from spathi.chuq.com (spathi.chuq.com [24.6.146.244]) by vc169.vc.panix.com (Postfix) with ESMTPS id 810933B5D7F; Wed, 19 Mar 2025 14:23:40 -0700 (PDT) (envelope-from chuq@chuq.com) Received: by spathi.chuq.com (Postfix, from userid 1022) id AE4F83CFFA25; Wed, 19 Mar 2025 14:23:39 -0700 (PDT) Date: Wed, 19 Mar 2025 14:23:39 -0700 From: Chuck Silvers To: Brooks Davis Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 623be660fcc9 - main - beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS Message-ID: References: <202503192022.52JKMaUG019132@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:2033, ipnet:166.84.0.0/16, country:US] X-Rspamd-Queue-Id: 4ZJ1sv2Nz6z3Y0R X-Spamd-Bar: ---- On Wed, Mar 19, 2025 at 08:44:13PM +0000, Brooks Davis wrote: > On Wed, Mar 19, 2025 at 08:22:36PM +0000, Chuck Silvers wrote: > > The branch main has been updated by chs: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 > > > > commit 623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 > > Author: Chuck Silvers > > AuthorDate: 2025-03-19 19:48:10 +0000 > > Commit: Chuck Silvers > > CommitDate: 2025-03-19 19:48:10 +0000 > > > > beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS > > > > Sponsored by: Netflix > > --- > > usr.bin/beep/Makefile | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/usr.bin/beep/Makefile b/usr.bin/beep/Makefile > > index f252ab64f843..8388ff7ff986 100644 > > --- a/usr.bin/beep/Makefile > > +++ b/usr.bin/beep/Makefile > > @@ -1,6 +1,7 @@ > > +.include > > Why add src.opts.mk? Nothing is using it and bsd.prog.mk will include > it. Is there another change coming that will use it? > > -- Brooks > > > + > > PROG= beep > > MAN= beep.1 > > - > > -LDFLAGS= -lm > > +LIBADD= m > > > > .include > > the motivation for these changes is that I want to be able to add something to LDFLAGS in /etc/src.conf and have that actually affect every executable and shared library that is built. we don't actually care about beep or trim, I just noticed that they were not getting the LDFLAGS from src.conf and thought I would fix them for completeness. adding the include of src.opts.mk seemed to fix that. also, a great many makefiles include src.opts.mk as the first thing and I thought that was just some boilerplate that was expected to be done everywhere and had been overlooked in these two. at that point I had not changed the usage of LDFLAGS in these two makefiles. then as I was arranging this stuff to commit, I grep'ed for other makefiles that assign rather than append to LDFLAGS (like I had found in bsnmpd) and found that these same two makefiles also incorrectly assigned to LDFLAGS, so then I added the other changes you see in those two commits. I'm not sure why I thought that including src.opts.mk without changing the LDFLAGS usage made things work initially. I tried that again just now and indeed it doesn't help, and the parts that remove the assignment to LDFLAGS are enough. maybe I had something stale in my obj dir before? anyway, I'd be happy to remove the include of src.opts.mk from these again if you'd like. -Chuck From nobody Wed Mar 19 22:35:18 2025 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 4ZJ3SR1CJvz5qprC; Wed, 19 Mar 2025 22:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ3SQ50c3z3kSJ; Wed, 19 Mar 2025 22:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O9iY+5JmU3RGaBQfnwTz7ZZNEluCWZrpJde3Sdg8r/s=; b=iqYln4sgleBFJ3BxmG7GpYVOJOzFnj+ilqPJ2xIlf3BkrGM3zFFzHwQHbubwILT+POiqFB qeWm7gRDxqlHi6gZEd6GOrovZU/QXw1MnvE95fK5XQv+VJBDs5BxKmEuTAgYJ0NaA9HgHm NA17On+O280Qp8MpPcrPcjC7xC+g+lg+Ak4DiIghfFSMuL0ZS+T7avohY/ZOq8dW3EkEGP hEeKBWcGd2CzJDCyqHHEt+YcVd9Ou93FUmU9l1e/P7QoTVoTAZi3mu762AyCD+rkJ+a3a0 PVsIgLJr8YZPmz6CDK4RUfM3RJFUF3lnbiHFRsVnqAFtt2A/l8dlrGy0ci4N0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742423718; a=rsa-sha256; cv=none; b=Al98te3f3Qwq5RKNlo9solMhuzLzFD422849gB5mEsVO9P9yPRqz0tYDNr3TVaXYmgzc40 u6J03dLnqKEjKF5XwfQXZ8e5XA3UyfUhxUvqHU7Hd0D/82e2sy7R0bCtobcsgeWhyEhyDu +BcHzXd+z7fC0xePmdXuCxSB2QJTPmd0g54fiTopyIRNouhvOLxrrYq9wExfGBbsROw1Cz dP0dbXufiQ+c63G5qeu9HFTMUT8y/ULW6jWe5VAmvSj4NtIwRJmfWRz2i6x8hmJ+t3rdZt k9A6GhOy5hVrxaY/A/ptBtkIcU87Q7cfPUqE4dBUTlo0XIeT2I/4vrHXCdWMAg== 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=1742423718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O9iY+5JmU3RGaBQfnwTz7ZZNEluCWZrpJde3Sdg8r/s=; b=mq3qPK8QBo0xsxGt5vFQ3t4BOQs4L+xeOtkSqJSWujM+2Jfg0+oAAYmQTgKWN6Qhv7uFWT SyXdYQCbyvzgMI8N8f5kPAYSMMkFhoWO/ZywKTWsiIQk1EBgise6q/B3BjHVjBhR24TCOQ NDMX7tkHYFGF/SJN2aRHviaja859HnVOINv+QX4gWXa3ceKN9jMVONm27d0UKrEkdht/U+ r+afNOekJGYfsJg/Lj0k1xlZWpT4JxvG5BbDADgXnrkab+kygveLwJVZsoLxRoXyCDgsT2 W2BSCS2hyyGCp+hxmPNfgYdmoG3OaGagvZ3kSYnCz+9SS2YF3b3ljePDDCjryw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ3SQ4cgszfxx; Wed, 19 Mar 2025 22:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JMZIFx062598; Wed, 19 Mar 2025 22:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JMZIKs062595; Wed, 19 Mar 2025 22:35:18 GMT (envelope-from git) Date: Wed, 19 Mar 2025 22:35:18 GMT Message-Id: <202503192235.52JMZIKs062595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 0b663e0cee89 - main - powerpc: Add Hypervisor Facility Unavailable handling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b663e0cee89dedf5b070ff4e839d5ad95061535 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=0b663e0cee89dedf5b070ff4e839d5ad95061535 commit 0b663e0cee89dedf5b070ff4e839d5ad95061535 Author: Justin Hibbits AuthorDate: 2025-03-19 22:22:32 +0000 Commit: Justin Hibbits CommitDate: 2025-03-19 22:22:32 +0000 powerpc: Add Hypervisor Facility Unavailable handling Treat Hypervisor Facility Unavailable as an illegal instruction in user space. This way programs that use facilities like transactional memory, which will never be supported as it has been removed from the ISA, will not crash the kernel. Tested by: pkubaj MFC after: 1 week --- sys/powerpc/aim/aim_machdep.c | 1 + sys/powerpc/powerpc/trap.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/sys/powerpc/aim/aim_machdep.c b/sys/powerpc/aim/aim_machdep.c index b439905441d3..814c679ff47e 100644 --- a/sys/powerpc/aim/aim_machdep.c +++ b/sys/powerpc/aim/aim_machdep.c @@ -417,6 +417,7 @@ aim_cpu_init(vm_offset_t toc) bcopy(&hypertrapcode, (void *)(EXC_HEA + trap_offset), trapsize); bcopy(&hypertrapcode, (void *)(EXC_HMI + trap_offset), trapsize); bcopy(&hypertrapcode, (void *)(EXC_HVI + trap_offset), trapsize); + bcopy(&hypertrapcode, (void *)(EXC_HFAC + trap_offset), trapsize); bcopy(&hypertrapcode, (void *)(EXC_SOFT_PATCH + trap_offset), trapsize); #endif diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c index ab3e56875169..d919b7715664 100644 --- a/sys/powerpc/powerpc/trap.c +++ b/sys/powerpc/powerpc/trap.c @@ -138,6 +138,7 @@ static struct powerpc_exception powerpc_exceptions[] = { { EXC_VEC, "altivec unavailable" }, { EXC_VSX, "vsx unavailable" }, { EXC_FAC, "facility unavailable" }, + { EXC_HFAC, "hypervisor facility unavailable" }, { EXC_ITMISS, "instruction tlb miss" }, { EXC_DLMISS, "data load tlb miss" }, { EXC_DSMISS, "data store tlb miss" }, @@ -147,6 +148,7 @@ static struct powerpc_exception powerpc_exceptions[] = { { EXC_THRM, "thermal management" }, { EXC_RUNMODETRC, "run mode/trace" }, { EXC_SOFT_PATCH, "soft patch exception" }, + { EXC_HVI, "hypervisor virtualization" }, { EXC_LAST, NULL } }; @@ -351,6 +353,7 @@ trap(struct trapframe *frame) mtspr(SPR_FSCR, fscr & ~FSCR_IC_MASK); break; case EXC_HEA: + case EXC_HFAC: sig = SIGILL; ucode = ILL_ILLOPC; break; From nobody Wed Mar 19 22:35:19 2025 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 4ZJ3SS4qrFz5qppL; Wed, 19 Mar 2025 22:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ3SR68szz3kd1; Wed, 19 Mar 2025 22:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9DTXmlLmjJ3rk2y+Ar3htoDvWDgO6VBfXogcwEIfUs=; b=FcrawY82fCInIx6HaJn02xlEFLOvgyFl8+c6GoABGmk7fKXJYAPXgq4C8amxNoDS/2tmZd N3qJDz1Gp/NbWF0Y+3e5MgeHAYHw98ijS7/rrRHZteKgUQQqCWcbtNTQsX90oVkSU3hskL VJTDV35CoRu1ak/eE+8dwu76eAHlDG2x2ggk0tY2LHDqM6tyRj+2aJrRmhS06Ji+IC8Pc6 atuZ0abOsRPYjbVHwZxJwag982EUsWIJLZ36988hGGuSFL01aMuVD+oJy/kk1ot/PlEA/9 fJYwQZ8R00AcF77oj+eJByqHs4Lnj+aX3qGJxxnS16fMbrYOHDWWBWFGkLDvVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742423719; a=rsa-sha256; cv=none; b=ReminteWT6pPVSTkAxRuob+F+TwFYr66Rs/aFFLlaT67tNVk5QQhszbjS37wwYrJSmK6ML tYVBwG7VVLD7YPoDcZOgoxkVWJIsP6a8rGkHuyJhr4jTqmDVNIas4XICN+xn+lISPTJkqQ g7o42EBX2e+H8t6ASCxoqfYOZVstela+BiGp7LyXaxwEA0V0SA/tBvF4iI1oRupybwZxeU R05nLGg7Ij7wtbndUvwTFMxMqwGBD/zx3y1OHI8lB4YtchXTR6BlugAXnpyornCogkyL03 4fvIGNfFH/F4WKyuzQ3+b4HBsUoV2ExzZQ3HFKdbgGHWXeMUIv+1RebkbUbwqQ== 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=1742423719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9DTXmlLmjJ3rk2y+Ar3htoDvWDgO6VBfXogcwEIfUs=; b=Fq9hj5U2YQY8U6s/U4vIhI73w7mVorzjar86plHYVgFXOm9QFO8TBg68yasC7sRy0vMqvT dklUyg+jnbeWIUDUyterBo7R/+a5SVpGfcJBcBKHuv/kJxoimh3knYTU/ERkbnSqx6BeMJ 2p4PSPfXaSkGlg7o4GlyhK/gOU18nTEWujD3g18I4zDXOl5b/rPlbaUApj8rc2URznPHLd prkLTSPSaG3XY2V6qS2O2NMQzC9FZ7p/vYAvJqsSePwHwLANVLk5CYL/2RefpDmUmeVORB orej3ZDZP1WSW/Ml2wB9wjSpOu5o8DF1KfHCt9xhpyNIhmvkznNRBW6MRFO+8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ3SR5Ybpzfxy; Wed, 19 Mar 2025 22:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JMZJ81062631; Wed, 19 Mar 2025 22:35:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JMZJGt062628; Wed, 19 Mar 2025 22:35:19 GMT (envelope-from git) Date: Wed, 19 Mar 2025 22:35:19 GMT Message-Id: <202503192235.52JMZJGt062628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: fe73eb441f1c - main - powernv: Explicitly enable the facilities we support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe73eb441f1c98fe350f4822c7d2abfeef046bf8 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=fe73eb441f1c98fe350f4822c7d2abfeef046bf8 commit fe73eb441f1c98fe350f4822c7d2abfeef046bf8 Author: Justin Hibbits AuthorDate: 2025-03-19 22:25:40 +0000 Commit: Justin Hibbits CommitDate: 2025-03-19 22:35:17 +0000 powernv: Explicitly enable the facilities we support Thus far we've relied on the firmware setting HFSCR correctly, enabling all facilities. However, it appears some recent firmwares do not. Linux explicitly enables all facilities it supports (including transactional memory, which new firmwares apparently do not enable), so do the same here, explicitly enable all the facilities FreeBSD supports. MFC after: 1 week --- sys/powerpc/include/spr.h | 5 +++++ sys/powerpc/powernv/platform_powernv.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/sys/powerpc/include/spr.h b/sys/powerpc/include/spr.h index 5bb3858b0fb5..605b1be194d9 100644 --- a/sys/powerpc/include/spr.h +++ b/sys/powerpc/include/spr.h @@ -162,6 +162,11 @@ #define FSCR_DSCR 0x0000000000000004 /* DSCR available in PR state */ #define SPR_UAMOR 0x09d /* User Authority Mask Override Register */ #define SPR_DPDES 0x0b0 /* .6. Directed Privileged Doorbell Exception State Register */ +#define SPR_HFSCR 0xbe /* Hypervisor Facility Status and Control Register */ +#define HFSCR_BHRB 0x0000000000000010 /* BHRB instructions */ +#define HFSCR_PM 0x0000000000000008 /* Performance monitor SPRs */ +#define HFSCR_VECVSX 0x0000000000000002 /* Vector and VSX facilities */ +#define HFSCR_FP 0x0000000000000001 /* Floating Point facility */ #define SPR_USPRG0 0x100 /* 4.8 User SPR General 0 */ #define SPR_VRSAVE 0x100 /* .6. AltiVec VRSAVE */ #define SPR_SPRG0 0x110 /* 468 SPR General 0 */ diff --git a/sys/powerpc/powernv/platform_powernv.c b/sys/powerpc/powernv/platform_powernv.c index 50af24794e69..678631322173 100644 --- a/sys/powerpc/powernv/platform_powernv.c +++ b/sys/powerpc/powernv/platform_powernv.c @@ -138,6 +138,7 @@ powernv_attach(platform_t plat) phandle_t opal; int res, len, idx; register_t msr; + register_t fscr; bool has_lp; /* Ping OPAL again just to make sure */ @@ -179,6 +180,11 @@ powernv_attach(platform_t plat) mtspr(SPR_LPCR, lpcr); isync(); + fscr = mfspr(SPR_HFSCR); + fscr |= FSCR_TAR | FSCR_EBB | HFSCR_BHRB | HFSCR_PM | + HFSCR_VECVSX | HFSCR_FP | FSCR_MSGP | FSCR_DSCR; + mtspr(SPR_HFSCR, fscr); + mtmsr(msr); powernv_cpuref_init(); From nobody Wed Mar 19 23:34:31 2025 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 4ZJ4ml67jXz5qsym; Wed, 19 Mar 2025 23:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ4ml4Py0z3kJZ; Wed, 19 Mar 2025 23:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742427271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0R0ZwhjNH4MQ0sXjN/XYNK95I61yrDolMdkh0ndegBs=; b=hKz5LHIj9sTrovivVyhNf3qAzzgSM8MqoPqDNdvyh6pqqX4pL9qDhuIRBOrotQfjRRjI51 dSX5/EcEAo+xJopQxZtkyf7Am8PcMokyKGHQjgW+lPo779e1PTI26tJTwFCosITObeuQtM 42QVhjX2TqcbVvbIyzATL0jQrBVfWT2wpp5EnCWBB6CeUYdxHl2yMF8jgybbDgsMqS+F9m 4nw33JaNVY/8mMhVDU1tawyq+GDbmzSkZMcAJMqpIZ0fJ+q1MgZDyir85eWQoeNXUyGzrW HNghuiYmAiNK0LSvOY1PrX8X7zM4b36jC+BzIDh4M3ESW6mgxrrvnenbhP9/sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742427271; a=rsa-sha256; cv=none; b=UgqIkqG7QDS2iV1xMieTJw7aqiPi5hwFn42tvhllD4fDMe7Nm5vo9gUigORl/Oo3r8eMiD V53wgiviD3HpRZoj01QAGJrg4uBcu4XC2wb2QxtedqBs6hUsFCevR3cBeRnIPxk+LBvR6m aDqUlkoFa9QwaO6JAduUEdHDDUqQJ/AZHsp8XCz+8ZTDZUN+q5pfV/WTv7bpk+V+wTB8Wx 7TmfGGAvuKU/iKGl92z8aIaoOvXxbyAc2uZiRd2bBb8Zj5xZWUf+mqphz764j8BCaEmy0P dtVynkfk+2q7j4U45t5ka8H6vIR1DYhsy3hHQPRpSjqvau/5JM4dBEcHJLvVOA== 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=1742427271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0R0ZwhjNH4MQ0sXjN/XYNK95I61yrDolMdkh0ndegBs=; b=kvvjTPeAta5jnzPTG9pnUX1i3hp02xA6F23TzIIEcHGwaOj4MK8b4dqrirR3J2cSuXfpaJ J8CIl7CsShyH6FEm9b2BtVNTA+ksEwycbA/B6VzbYuhvwxyxvcC9ZTxmD4kAsXTGgM335/ dZCJULvlbC7I70OWKS+k1FmuX9WRWHAsYZkcHLz9rj4UceLjFJopMAIH4f1CkkKUaXu9zA b4MaXhjWhzzWYehmLk9f0su1VkaV0Up3M2kF3grI27AQoqsMbHSeLieqHZnNhccLOyNrNT dnUgZbsc7X0F3xcohJqZ0+mS6DSFhKnrBZn6a2u+0yVySBWPvVf/wmSPR9aPtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ4ml31Cxzgnd; Wed, 19 Mar 2025 23:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JNYVT2074082; Wed, 19 Mar 2025 23:34:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JNYV6O074079; Wed, 19 Mar 2025 23:34:31 GMT (envelope-from git) Date: Wed, 19 Mar 2025 23:34:31 GMT Message-Id: <202503192334.52JNYV6O074079@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: c2cd605e8c8a - main - Get consistent updates for UFS superblocks. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: c2cd605e8c8a15e545dfd3e50aef2f660d460b30 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=c2cd605e8c8a15e545dfd3e50aef2f660d460b30 commit c2cd605e8c8a15e545dfd3e50aef2f660d460b30 Author: Kirk McKusick AuthorDate: 2025-03-19 23:32:39 +0000 Commit: Kirk McKusick CommitDate: 2025-03-19 23:33:59 +0000 Get consistent updates for UFS superblocks. Superblocks are written by Freebsd clients using the ffs_sbput() routine (exported from the kernel in sys/ufs/ffs/ffs_subr.c). These clients include the kernel, some geom modules, and system utilities using libufs. Currently backward compatible updates of UFS superblocks are done only when the kernel writes them. These updates should be done whenever any call to ffs_sbput() is done. This commit moves these UFS superblock compatibility updates from the kernel-specific superblock update to ffs_sbput() so that all clients make these compatibility updates when they write superblocks. Reviewed-by: kib Tested-by: Peter Holm MFC-after: 1 week Differential Revision: https://reviews.freebsd.org/D49276 Sponsored-by: Netflix --- sys/ufs/ffs/ffs_subr.c | 62 +++++++++++++++++++++++++++++++++--------------- sys/ufs/ffs/ffs_vfsops.c | 42 +++++++++++++------------------- 2 files changed, 59 insertions(+), 45 deletions(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index c293cbbcbfb0..67c423d3127c 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -384,16 +384,35 @@ void ffs_oldfscompat_write(struct fs *fs) { - /* - * Copy back UFS2 updated fields that UFS1 inspects. - */ - if (fs->fs_magic == FS_UFS1_MAGIC) { + switch (fs->fs_magic) { + case FS_UFS1_MAGIC: + if (fs->fs_sblockloc != SBLOCK_UFS1 && + (fs->fs_old_flags & FS_FLAGS_UPDATED) == 0) { + printf( + "WARNING: %s: correcting fs_sblockloc from %jd to %d\n", + fs->fs_fsmnt, fs->fs_sblockloc, SBLOCK_UFS1); + fs->fs_sblockloc = SBLOCK_UFS1; + } + /* + * Copy back UFS2 updated fields that UFS1 inspects. + */ fs->fs_old_time = fs->fs_time; fs->fs_old_cstotal.cs_ndir = fs->fs_cstotal.cs_ndir; fs->fs_old_cstotal.cs_nbfree = fs->fs_cstotal.cs_nbfree; fs->fs_old_cstotal.cs_nifree = fs->fs_cstotal.cs_nifree; fs->fs_old_cstotal.cs_nffree = fs->fs_cstotal.cs_nffree; - fs->fs_maxfilesize = fs->fs_save_maxfilesize; + if (fs->fs_save_maxfilesize != 0) + fs->fs_maxfilesize = fs->fs_save_maxfilesize; + break; + case FS_UFS2_MAGIC: + if (fs->fs_sblockloc != SBLOCK_UFS2 && + (fs->fs_old_flags & FS_FLAGS_UPDATED) == 0) { + printf( + "WARNING: %s: correcting fs_sblockloc from %jd to %d\n", + fs->fs_fsmnt, fs->fs_sblockloc, SBLOCK_UFS2); + fs->fs_sblockloc = SBLOCK_UFS2; + } + break; } } @@ -931,6 +950,7 @@ int ffs_sbput(void *devfd, struct fs *fs, off_t loc, int (*writefunc)(void *devfd, off_t loc, void *buf, int size)) { + struct fs_summary_info *fs_si; int i, error, blks, size; uint8_t *space; @@ -953,23 +973,27 @@ ffs_sbput(void *devfd, struct fs *fs, off_t loc, } } fs->fs_fmod = 0; -#ifndef _KERNEL - { - struct fs_summary_info *fs_si; - - fs->fs_time = time(NULL); - /* Clear the pointers for the duration of writing. */ - fs_si = fs->fs_si; - fs->fs_si = NULL; - fs->fs_ckhash = ffs_calc_sbhash(fs); - error = (*writefunc)(devfd, loc, fs, fs->fs_sbsize); - fs->fs_si = fs_si; - } -#else /* _KERNEL */ + ffs_oldfscompat_write(fs); +#ifdef _KERNEL fs->fs_time = time_second; +#else /* User Code */ + fs->fs_time = time(NULL); +#endif + /* Clear the pointers for the duration of writing. */ + fs_si = fs->fs_si; + fs->fs_si = NULL; fs->fs_ckhash = ffs_calc_sbhash(fs); error = (*writefunc)(devfd, loc, fs, fs->fs_sbsize); -#endif /* _KERNEL */ + /* + * A negative error code is returned when a copy of the + * superblock has been made which is discarded when the I/O + * is done. So the fs_si field does not and indeed cannot be + * restored after the write is done. Convert the error code + * back to its usual positive value when returning it. + */ + if (error < 0) + return (-error - 1); + fs->fs_si = fs_si; return (error); } diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 498ef61d7cf1..891e490a7031 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -2032,9 +2032,15 @@ ffs_sbupdate(struct ufsmount *ump, int waitfor, int suspended) panic("ffs_sbupdate: write read-only filesystem"); /* * We use the superblock's buf to serialize calls to ffs_sbupdate(). + * Copy superblock to this buffer and have it written out. */ sbbp = getblk(ump->um_devvp, btodb(fs->fs_sblockloc), (int)fs->fs_sbsize, 0, 0, 0); + UFS_LOCK(ump); + fs->fs_fmod = 0; + bcopy((caddr_t)fs, sbbp->b_data, (uint64_t)fs->fs_sbsize); + UFS_UNLOCK(ump); + fs = (struct fs *)sbbp->b_data; /* * Initialize info needed for write function. */ @@ -2060,7 +2066,8 @@ ffs_use_bwrite(void *devfd, off_t loc, void *buf, int size) devfdp = devfd; ump = devfdp->ump; - fs = ump->um_fs; + bp = devfdp->sbbp; + fs = (struct fs *)bp->b_data; /* * Writing the superblock summary information. */ @@ -2077,44 +2084,27 @@ ffs_use_bwrite(void *devfd, off_t loc, void *buf, int size) } /* * Writing the superblock itself. We need to do special checks for it. + * A negative error code is returned to indicate that a copy of the + * superblock has been made and that the copy is discarded when the + * I/O is done. So the the caller should not attempt to restore the + * fs_si field after the write is done. The caller will convert the + * error code back to its usual positive value when returning it. */ - bp = devfdp->sbbp; if (ffs_fsfail_cleanup(ump, devfdp->error)) devfdp->error = 0; if (devfdp->error != 0) { brelse(bp); - return (devfdp->error); - } - if (fs->fs_magic == FS_UFS1_MAGIC && fs->fs_sblockloc != SBLOCK_UFS1 && - (fs->fs_old_flags & FS_FLAGS_UPDATED) == 0) { - printf("WARNING: %s: correcting fs_sblockloc from %jd to %d\n", - fs->fs_fsmnt, fs->fs_sblockloc, SBLOCK_UFS1); - fs->fs_sblockloc = SBLOCK_UFS1; - } - if (fs->fs_magic == FS_UFS2_MAGIC && fs->fs_sblockloc != SBLOCK_UFS2 && - (fs->fs_old_flags & FS_FLAGS_UPDATED) == 0) { - printf("WARNING: %s: correcting fs_sblockloc from %jd to %d\n", - fs->fs_fsmnt, fs->fs_sblockloc, SBLOCK_UFS2); - fs->fs_sblockloc = SBLOCK_UFS2; + return (-devfdp->error - 1); } if (MOUNTEDSOFTDEP(ump->um_mountp)) - softdep_setup_sbupdate(ump, (struct fs *)bp->b_data, bp); - UFS_LOCK(ump); - bcopy((caddr_t)fs, bp->b_data, (uint64_t)fs->fs_sbsize); - UFS_UNLOCK(ump); - fs = (struct fs *)bp->b_data; - fs->fs_fmod = 0; - ffs_oldfscompat_write(fs); - fs->fs_si = NULL; - /* Recalculate the superblock hash */ - fs->fs_ckhash = ffs_calc_sbhash(fs); + softdep_setup_sbupdate(ump, fs, bp); if (devfdp->suspended) bp->b_flags |= B_VALIDSUSPWRT; if (devfdp->waitfor != MNT_WAIT) bawrite(bp); else if ((error = bwrite(bp)) != 0) devfdp->error = error; - return (devfdp->error); + return (-devfdp->error - 1); } static int From nobody Wed Mar 19 23:45:15 2025 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 4ZJ51742pzz5qv1p; Wed, 19 Mar 2025 23:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ5173CbGz3wFy; Wed, 19 Mar 2025 23:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742427915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wZUjlyKNdCrN/UkUNW+Bfv4BIrPWB9GyBZgkdEs7KvU=; b=eJhwTjD982d2y0FE0B+JElRo6LDBWzIuDAFs/l/3sBqVZdSpdZUCTFdZ7Q+2FrEWoY3SLc PN1AYd+31/ySgqv4bGI3e+x6RMiikwdSGC6UwOBeIZ540891amdtmu/VM5549OGKQ1GXZ4 0qEIMgL9wTVHDBCYzCgJIqh0ToXnBdkA7bqnpEBIVEyq+iiTKM4x+8/4A2CGqK34IMhip2 xWxVBdNK23tqj/71ZLfRo6itgaJdPHY1ciYWUdAadh2IcZhXp6WStvS6rNmqbnhpCxAjFV k8gwIW/F3ZeH/U7GBofZAlx4u1C0a54KaRQ0oaFzRyJfKNftb5xIX1roTAdYfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742427915; a=rsa-sha256; cv=none; b=Y1GcANDkpmGiavslqdTtXGFvxGkZ5oaFLiSwm7otjDCAfeN66yTPQhxSdh+uxn6aRq3u1u rDPPpAtgYAsFmY+QH8ioA47POzn0V5u3NujDQC/UZxVHudFH5LQDdI6mj1ew+4OGmHMSiw JkQ2YlqhEOS0NeVjPniZC1qYnqTx4T2jP3eSzTU2sQw/WCgGzw2YehN9edTpNaSexcs0Rd 1WYgqpSi94TPleEv5zjgTv8+ZJ2iQzrf5zY19t0QQZVGYNR5LaU2cx/dJiMIXU35CMkAYV hmPa0/1U35c4RNbolmz4L8u3LeL6putlEohTeMatpiIGovEDJ6bIC7sp5NqwLA== 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=1742427915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wZUjlyKNdCrN/UkUNW+Bfv4BIrPWB9GyBZgkdEs7KvU=; b=TibhVDuMbhGMtQJbBT/hO6cVwD9EcfiR3t/Red5S1bEWnOrq1hXqa/nKpy7nam1gWOn4yD qR+Msx4ZqncTs5yAZUo1DfDnMkWXQ00g/Zrr4ApAq8I9dPL3KKO9D0KSsfKBNkVqSiA5g4 2CtrF+sinrMOs7TwMZrbCXBL8M+7oWloMnZSiWzb9waJIkuHgecyQFvGpM/n0CwKQUYe7P H2DS1TjvxTCHpIrR15WFV93UDqrTkyKUQEj8OhHZbILRjRvzmo2HNr+Ot0TpYm/wiNEJ/e SzUjtcVYX8zz8ngEIkfEjE41V2gzJKbutEyGbaDPtkX04+LOkrVmZHAxHZ0y1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ5172b7nzhk6; Wed, 19 Mar 2025 23:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JNjFgY093049; Wed, 19 Mar 2025 23:45:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JNjFxt093046; Wed, 19 Mar 2025 23:45:15 GMT (envelope-from git) Date: Wed, 19 Mar 2025 23:45:15 GMT Message-Id: <202503192345.52JNjFxt093046@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stephen Hurd Subject: git: 9d0eea9422d0 - main - Make newly POSIX functions visible List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: shurd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d0eea9422d075c8a6924b33161d2d5abfb4072a Auto-Submitted: auto-generated The branch main has been updated by shurd: URL: https://cgit.FreeBSD.org/src/commit/?id=9d0eea9422d075c8a6924b33161d2d5abfb4072a commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a Author: Stephen Hurd AuthorDate: 2025-03-19 23:45:06 +0000 Commit: Stephen Hurd CommitDate: 2025-03-19 23:45:06 +0000 Make newly POSIX functions visible Some of the POSIX 202405L functions are already in the system, make them visible when appropriate. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47859 --- include/dlfcn.h | 8 +++++++- include/stdlib.h | 13 ++++++++----- include/string.h | 6 +++--- include/time.h | 8 +++++--- include/unistd.h | 16 ++++++++++------ include/wchar.h | 7 +++++-- 6 files changed, 38 insertions(+), 20 deletions(-) diff --git a/include/dlfcn.h b/include/dlfcn.h index 89ec43b332e9..ec4ad14b5091 100644 --- a/include/dlfcn.h +++ b/include/dlfcn.h @@ -80,6 +80,9 @@ typedef struct dl_info { const char *dli_sname; /* Name of nearest symbol. */ void *dli_saddr; /* Address of nearest symbol. */ } Dl_info; +#if __POSIX_VISIBLE >= 202405 +typedef struct dl_info Dl_info_t; +#endif /*- * The actual type declared by this typedef is immaterial, provided that @@ -119,9 +122,12 @@ char *dlerror(void); void *dlopen(const char *, int); void *dlsym(void * __restrict, const char * __restrict); +#if __POSIX_VISIBLE >= 202405 +int dladdr(const void * __restrict, Dl_info * __restrict); +#endif + #if __BSD_VISIBLE void *fdlopen(int, int); -int dladdr(const void * __restrict, Dl_info * __restrict); dlfunc_t dlfunc(void * __restrict, const char * __restrict); int dlinfo(void * __restrict, int, void * __restrict); void dllockinit(void *_context, diff --git a/include/stdlib.h b/include/stdlib.h index 162031ab393d..449b17fefff5 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -157,7 +157,7 @@ _Noreturn void _Exit(int) __noexcept; /* * If we're in a mode greater than C99, expose C11 functions. */ -#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L +#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L || __POSIX_VISIBLE >= 202405 void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1) __alloc_size(2); int at_quick_exit(void (*)(void)) __noexcept; @@ -236,6 +236,13 @@ int unlockpt(int); int ptsname_r(int, char *, size_t); #endif +#if __POSIX_VISIBLE >= 202405 +void qsort_r(void *, size_t, size_t, + int (*)(const void *, const void *, void *), void *); +void *reallocarray(void *, size_t, size_t) __result_use_check + __alloc_size2(2, 3); +#endif + #if __BSD_VISIBLE extern const char *malloc_conf; extern void (*malloc_message)(void *, const char *); @@ -305,12 +312,8 @@ int mergesort_b(void *, size_t, size_t, int (^)(const void *, const void *)); int mkostemp(char *, int); int mkostemps(char *, int, int); int mkostempsat(int, char *, int, int); -void qsort_r(void *, size_t, size_t, - int (*)(const void *, const void *, void *), void *); int radixsort(const unsigned char **, int, const unsigned char *, unsigned); -void *reallocarray(void *, size_t, size_t) __result_use_check - __alloc_size2(2, 3); void *reallocf(void *, size_t) __result_use_check __alloc_size(2); int rpmatch(const char *); char *secure_getenv(const char *); diff --git a/include/string.h b/include/string.h index a3fa96ebb449..3deca63bd71a 100644 --- a/include/string.h +++ b/include/string.h @@ -63,8 +63,8 @@ void *memrchr(const void *, int, size_t) __pure; #endif int memcmp(const void *, const void *, size_t) __pure; void *(memcpy)(void * __restrict, const void * __restrict, size_t); -#if __BSD_VISIBLE -void *memmem(const void *, size_t, const void *, size_t) __pure; +#if __POSIX_VISIBLE >= 202405 +void *(memmem)(const void *, size_t, const void *, size_t) __pure; #endif void *(memmove)(void *, const void *, size_t); #if __BSD_VISIBLE @@ -98,7 +98,7 @@ char *strerror(int); #if __POSIX_VISIBLE >= 200112 int strerror_r(int, char *, size_t); #endif -#if __BSD_VISIBLE +#if __POSIX_VISIBLE >= 202405 size_t (strlcat)(char * __restrict, const char * __restrict, size_t); size_t (strlcpy)(char * __restrict, const char * __restrict, size_t); #endif diff --git a/include/time.h b/include/time.h index 89a76ca5fd93..f85d9c40715a 100644 --- a/include/time.h +++ b/include/time.h @@ -180,15 +180,17 @@ time_t posix2time(time_t t); #include #endif -#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2011 || \ +#if __ISO_C_VISIBLE >= 2011 || __POSIX_VISIBLE >= 202405 \ (defined(__cplusplus) && __cplusplus >= 201703) #include /* ISO/IEC 9899:2011 7.27.2.5 The timespec_get function */ #define TIME_UTC 1 /* time elapsed since epoch */ -int timespec_get(struct timespec *ts, int base); -#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2023 +#if __ISO_C_VISIBLE >= 2023 || __POSIX_VISIBLE >= 202405 /* ISO/IEC 9899:2024 7.29.1 Components of time */ #define TIME_MONOTONIC 2 /* monotonic time */ +#endif +int timespec_get(struct timespec *ts, int base); +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2023 /* ISO/IEC 9899:2024 7.29.2.7 The timespec_getres function */ int timespec_getres(struct timespec *, int); #endif diff --git a/include/unistd.h b/include/unistd.h index 8574b2ba9915..3a4e1be192d9 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -483,6 +483,16 @@ int usleep(useconds_t); pid_t vfork(void) __returns_twice; #endif +/* 1003.1-2024 */ +#if __POSIX_VISIBLE >= 202405 +pid_t _Fork(void); +int getentropy(void *, size_t); +int getresgid(gid_t *, gid_t *, gid_t *); +int getresuid(uid_t *, uid_t *, uid_t *); +int setresgid(gid_t, gid_t, gid_t); +int setresuid(uid_t, uid_t, uid_t); +#endif + #if __BSD_VISIBLE struct timeval; /* select(2) */ @@ -510,14 +520,11 @@ int feature_present(const char *); int fchroot(int); char *fflagstostr(u_long); int getdomainname(char *, int); -int getentropy(void *, size_t); int getgrouplist(const char *, gid_t, gid_t *, int *); int getloginclass(char *, size_t); mode_t getmode(const void *, mode_t); int getosreldate(void); int getpeereid(int, uid_t *, gid_t *); -int getresgid(gid_t *, gid_t *, gid_t *); -int getresuid(uid_t *, uid_t *, uid_t *); char *getusershell(void); int initgroups(const char *, gid_t); int iruserok(unsigned long, int, const char *, const char *); @@ -575,8 +582,6 @@ void *setmode(const char *); int setpgrp(pid_t, pid_t); /* obsoleted by setpgid() */ void setproctitle(const char *_fmt, ...) __printf0like(1, 2); void setproctitle_fast(const char *_fmt, ...) __printf0like(1, 2); -int setresgid(gid_t, gid_t, gid_t); -int setresuid(uid_t, uid_t, uid_t); int setrgid(gid_t); int setruid(uid_t); void setusershell(void); @@ -589,7 +594,6 @@ int undelete(const char *); int unwhiteout(const char *); void *valloc(size_t); /* obsoleted by malloc() */ int funlinkat(int, const char *, int, int); -pid_t _Fork(void); #ifndef _OPTRESET_DECLARED #define _OPTRESET_DECLARED diff --git a/include/wchar.h b/include/wchar.h index e4b037c9b16f..a8c016c42faf 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -235,12 +235,15 @@ size_t wcsnrtombs(char * __restrict, const wchar_t ** __restrict, size_t, size_t, mbstate_t * __restrict); #endif -#if __BSD_VISIBLE -wchar_t *fgetwln(FILE * __restrict, size_t * __restrict); +#if __POSIX_VISIBLE >= 202405 size_t wcslcat(wchar_t *, const wchar_t *, size_t); size_t wcslcpy(wchar_t *, const wchar_t *, size_t); #endif +#if __BSD_VISIBLE +wchar_t *fgetwln(FILE * __restrict, size_t * __restrict); +#endif + #if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_) #include #endif From nobody Thu Mar 20 00:55:25 2025 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 4ZJ6Z60whRz5r0cd; Thu, 20 Mar 2025 00:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ6Z56CPkz42Bk; Thu, 20 Mar 2025 00:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742432126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVqSijMVGTkh8b/BwOy/1atLU71fGg5oemiyZh+VmKQ=; b=sXDHSXsaSNk3pBHijL4HmZXg6Uj5zlXCy3vN/hWFpJDA9EdzIODmvQhGeYdKAMetIu+mNm gvNWAAJ4Z/WUL0kithNwS3C60PDX58He2wsBW/nR9An1SRVFilbb+NPoJ7DWfbO9q+5E0q GSS7DKBhSHTk8V2SH0b11fAGHJZsyipShGrPj2Tw4f2y5gnJRJaOlH23s4Gsdkn5KJM/xk tKJ5cb/53jNvZFja7PdY76FjFU74a7b7C/b50FFtEmIQ1l85t6Uh0pOv+98XXQECAfoSnf 9x4tzETg29nUt9qs68TyNysOxBovDm+98ugmL7VksCH5FZIPZI/LzllP65JChA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742432126; a=rsa-sha256; cv=none; b=w+K/jTQPnzWk+jJNnq12/F2RWOYkkevUJHFAmCreYT+c76XWxPJOrs8paNM6Vx3y6YlFus mBkQSsvqOxx5tkSYPmWh4q8da9cwOVlzvPw5zs7OX9Z8Hmrlgo3DSNg1hXX/JLWZMmDjaM 6wHj5bnkS9dFo4FOOB5ZaCw3z6e1zOYMk9S057Q84GyxUQ4Y+9UxF0wxGx8qyCMJ8GI9HY lTpzR0sW/u6GVi7UyXkilKJ69Hc2jU+POqcbwm3zAg6XMoLfkFzma7J8fcK39sBG6lPOyq 4XNyZtEHkMRWk9PekQMnOtxokfGvanhFFrp7zoqP/xgp9AcRejcPTGX5dcPDCQ== 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=1742432126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVqSijMVGTkh8b/BwOy/1atLU71fGg5oemiyZh+VmKQ=; b=yz8iGcV616V42DMHP/mIICX6UAKDpZELWUwi50du5FKW6ZlsCcrvKPm6dX7tfy2RACj2FI +ORfo185KaKIqsSzQ48R/QQogaxfIX/P+9WYqhQYxGEGTzKPiuB7btfZF5M63KXdPk8khu RTHq3e0xgCvYQ+ENKSMPAfPhwt8yFhjFu9MHCwBsan4v99J28c6rIGF+4GBYkGr3ewUtAu eOW3b9IDSIAx9AXXhcyHvAjEKwbHFlTViJ5dJ4qVNhChntl/HfCJo+G25Lm4xylMecPJGu vvvq7whwCMzJnBbTFYw+kgiMv0Zrqu9Gi4MJMdvDIpPU5gQZi/kqzutnqN5ZJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ6Z55XchzkYg; Thu, 20 Mar 2025 00:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K0tP7R023593; Thu, 20 Mar 2025 00:55:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K0tP4u023590; Thu, 20 Mar 2025 00:55:25 GMT (envelope-from git) Date: Thu, 20 Mar 2025 00:55:25 GMT Message-Id: <202503200055.52K0tP4u023590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stephen Hurd Subject: git: d7efac1be144 - main - Add missing || List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: shurd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7efac1be1441c122f7fb9de51a409172f21326c Auto-Submitted: auto-generated The branch main has been updated by shurd: URL: https://cgit.FreeBSD.org/src/commit/?id=d7efac1be1441c122f7fb9de51a409172f21326c commit d7efac1be1441c122f7fb9de51a409172f21326c Author: Stephen Hurd AuthorDate: 2025-03-20 00:54:46 +0000 Commit: Stephen Hurd CommitDate: 2025-03-20 00:55:13 +0000 Add missing || Fixes: 9d0eea9422 --- include/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/time.h b/include/time.h index f85d9c40715a..e011792aaaeb 100644 --- a/include/time.h +++ b/include/time.h @@ -180,7 +180,7 @@ time_t posix2time(time_t t); #include #endif -#if __ISO_C_VISIBLE >= 2011 || __POSIX_VISIBLE >= 202405 \ +#if __ISO_C_VISIBLE >= 2011 || __POSIX_VISIBLE >= 202405 || \ (defined(__cplusplus) && __cplusplus >= 201703) #include /* ISO/IEC 9899:2011 7.27.2.5 The timespec_get function */ From nobody Thu Mar 20 02:53:15 2025 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 4ZJ9B44txtz5r8X1; Thu, 20 Mar 2025 02:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9B32MQKz3c6B; Thu, 20 Mar 2025 02:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+m9gniq2EKnXfQV6o9yRlGzto18DAUsNwu1pkYl5Co=; b=OW3jsp+1E679z04wXGFvGGlWcfHAY18mbN/4r/reUF4heKGhyeWg4nPFwZ7PDip5uuTGOE V1UdEKtzmcHWQsOSFWoZTUOBRWq6tbQesMFGKyVT+fhLcBxQj6slmM8jGqWFG+NY/uewYM FQg4D6ZaxPMWYeLIpjuz/LUx5M3J4l5CsgFpoZj2ddreL3B7Xclr4GMnSjzjgawpJsGCRt XHzX8SqLUbtCT3ZgyGxE+/M5NAfkFsGTeLLMjRk0JRKMd7sCP9mc4cpTzqyGwg8dTRkLpS ++Eadm6o0VMYZVhkj25IeHuR9ak0hbXAJJDjEwxcOGb6fRX+bc78lF6OMhf5Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742439195; a=rsa-sha256; cv=none; b=KPreUfRNkhLnNrQ4Xv25OwoNLzGhHgcQQxGSI/EP2DBJZaKGDg+Tg9IUcqSPW0QKNXCdTY ZcMz9xaLgC7PuoNiuY58MtamZ7p+7DsvVjhSD8q+is1tun2joq1pgPwIdcMI2af7VgbXN0 kSsN37GNdFEjuvirdjVEHMgktagEBb0f3jSATw+SY4OSogjw/l8/xbYCDObWnwI0A95WsL +k1UszAizO/DBTPs45zHdeJetU26Yov6yTmlpRCNbWZJrwN2ayiq64hDG8HlyYbJ0FkNSX lHdGmGxUEwE5tChT4LPOTa9lqehJgwBbWU9vz1c/4+nSx4x9xcweTuRcdFD7dA== 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=1742439195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+m9gniq2EKnXfQV6o9yRlGzto18DAUsNwu1pkYl5Co=; b=J+rqivzMt2+yybA/SNN8CbDzRTUAdgLALDFvtMr5FTPqk6xZiAd6mIcyr+i6pbu9MWGnMs vr4XEI20iodst/h8nr/BPsiutW1mM1kXczQfiHliP+pNT5Pm1mdPlKC0TZvSzrmaPBTdAb iXDt1x61s+YFgiroDNEHPC3biZ1lVvkM+xHwEgCfl/+kYWY7tp/nCl9l+9p+0bTYjQ+UCA gY1VESvq+gg/bH7CoFO35WAFijEt6iuMySvzpWsr6oGhNLSmaeP2TW0S6Dotwoflk1EoBh iQt9R3GvEL2vgEW8Mfb3JRbqHkPJAyf/0szWkuECa2cI4ZBCujbNLdaZ7TikdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9B31kvMzng6; Thu, 20 Mar 2025 02:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K2rFMl046470; Thu, 20 Mar 2025 02:53:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K2rFOK046467; Thu, 20 Mar 2025 02:53:15 GMT (envelope-from git) Date: Thu, 20 Mar 2025 02:53:15 GMT Message-Id: <202503200253.52K2rFOK046467@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: 3ff865c6a794 - main - netinet: Fix getcred sysctl handlers to do nothing if no input is given List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 3ff865c6a7948b2cfc01d7056c619145b696700a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3ff865c6a7948b2cfc01d7056c619145b696700a commit 3ff865c6a7948b2cfc01d7056c619145b696700a Author: Mark Johnston AuthorDate: 2025-03-20 01:33:44 +0000 Commit: Mark Johnston CommitDate: 2025-03-20 01:33:44 +0000 netinet: Fix getcred sysctl handlers to do nothing if no input is given These routines were all assuming that the sysctl handler has some new value, but this is not the case. SYSCTL_IN() returns 0 in this scenario, so they were all operating on an uninitialized address. This is mostly harmless, but trips KMSAN checks, so let's fix them. Reviewed by: zlei, rrs, glebius MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49348 --- sys/netinet/sctp_usrreq.c | 3 ++- sys/netinet/tcp_subr.c | 4 ++++ sys/netinet/udp_usrreq.c | 2 ++ sys/netinet6/sctp6_usrreq.c | 2 ++ sys/netinet6/udp6_usrreq.c | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 7fb7ab3418cf..94d57225c20b 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -361,8 +361,9 @@ sctp_getcred(SYSCTL_HANDLER_ARGS) /* FIX, for non-bsd is this right? */ vrf_id = SCTP_DEFAULT_VRFID; + if (req->newptr == NULL) + return (EINVAL); error = priv_check(req->td, PRIV_NETINET_GETCRED); - if (error) return (error); diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 03efc759092d..f6317815521d 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2698,6 +2698,8 @@ tcp_getcred(SYSCTL_HANDLER_ARGS) struct inpcb *inp; int error; + if (req->newptr == NULL) + return (EINVAL); error = priv_check(req->td, PRIV_NETINET_GETCRED); if (error) return (error); @@ -2740,6 +2742,8 @@ tcp6_getcred(SYSCTL_HANDLER_ARGS) int mapped = 0; #endif + if (req->newptr == NULL) + return (EINVAL); error = priv_check(req->td, PRIV_NETINET_GETCRED); if (error) return (error); diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index b3d980956b66..dafbaf6dc672 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -844,6 +844,8 @@ udp_getcred(SYSCTL_HANDLER_ARGS) struct inpcb *inp; int error; + if (req->newptr == NULL) + return (EINVAL); error = priv_check(req->td, PRIV_NETINET_GETCRED); if (error) return (error); diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index c0e758e9e12b..8964ccf54c54 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -375,6 +375,8 @@ sctp6_getcred(SYSCTL_HANDLER_ARGS) vrf_id = SCTP_DEFAULT_VRFID; + if (req->newptr == NULL) + return (EINVAL); error = priv_check(req->td, PRIV_NETINET_GETCRED); if (error) return (error); diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 40216ad4c420..c44510e3b65f 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -617,6 +617,8 @@ udp6_getcred(SYSCTL_HANDLER_ARGS) struct inpcb *inp; int error; + if (req->newptr == NULL) + return (EINVAL); error = priv_check(req->td, PRIV_NETINET_GETCRED); if (error) return (error); From nobody Thu Mar 20 02:53:17 2025 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 4ZJ9B64CC8z5r8j9; Thu, 20 Mar 2025 02:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9B546vxz3cFL; Thu, 20 Mar 2025 02:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nFWKmVapJjNeerERzjJQa1Vjjmu2VnT+zTPiYMpQaB4=; b=yZn7mzOb0bYdrCeiVKqr7npE9zVM0lpEipWAxIgjQfbtqAr5RTXFh3taE6gE+23qJcVC5+ YozbMiTI6J7vguGcVlClBfPWfjPzygpbzXoIzIfH3IMClrimem17x610qBNnPwawFMyKZx /3vgSgFSf5EyC0oRKyUPGUWiHe6coMMFwxc+diwVz69f9+FSdmp9NKNE+gczM3M9xg64eh jgEEXjfDeFXMXYs/KnxMFzhuBxV6L2GuLcCZ6XP26e9Kr3u5zhk14mru0pZ0V7lgiZ4Asa aP6gG/m3Zk7ceThus063Fy7MhywUPYCTvDQA7Y+4qWj0fJd/p5g2CMRokbg1ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742439197; a=rsa-sha256; cv=none; b=UrI7MPoroGOlzqKLd7EhFJsKndhDY8pBKbV49/Bp6N0Zqg/8zIL2xgOSk5iGouVdxu81Nt ynuy7hteeMst4W/o6+UWmTr9jW2Xzh9tHYx1o5leV66SAdaPHkV/a7rQ8iqsioTbyHTAcK lJIgjA7Tkv9pPxPbKfW/34es1diPKA1nnmpxpBbjimPIaRzV8yOgiAARHTTj/GVr1C2XdH tZ/1OCRymo4USsy2qdBi0+yxfNIu4ek4/MCRKdsJyaMlopdQ0JSjO8BazFjlGhrUieZzJC 88+IyZXGOLGSxbcyHc/IvcNezwjkrkBrDjwt/1Kd5o1vU0+8dMOxJa8VXMWIuw== 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=1742439197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nFWKmVapJjNeerERzjJQa1Vjjmu2VnT+zTPiYMpQaB4=; b=BLSTwhi8xiMH+S5fnOF6faFx7rCWpnBPZwDzRKj0qll0JEsfGj6aZhdQVjDZLkeeUJ2BJ4 TVA7WL8BoLL2e39+b7HGXe+fU+shzdN5HyneCdrFxzpGXNv91lbyevDqH8hW/Eul6ACQAi B/luIguOSGKpNNva5lwIpVi6pijHhnJF/UvVegExxDvKLH69sHq/HXv+srVDdI/EnfDhe6 EbJX2V9/G6wWNkB7LzOmg1BcxOr6955hMkY3/j/Hxg9WFlb57hPX0xYJOOU3Onvd2/1xES x+4EKhcGZt+lNo2HYtIRMEwlNM0X4TQUUgwrqg4rJtONukcSSx1XAe/hEk+zAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9B53fTgznFR; Thu, 20 Mar 2025 02:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K2rHGh046540; Thu, 20 Mar 2025 02:53:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K2rHJM046537; Thu, 20 Mar 2025 02:53:17 GMT (envelope-from git) Date: Thu, 20 Mar 2025 02:53:17 GMT Message-Id: <202503200253.52K2rHJM046537@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: d8703cd80247 - main - vfs: Return early from sysctl_vfs_ctl() if no input was given List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: d8703cd80247ca203b817305753bda2b7dbfb5ef Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d8703cd80247ca203b817305753bda2b7dbfb5ef commit d8703cd80247ca203b817305753bda2b7dbfb5ef Author: Mark Johnston AuthorDate: 2025-03-20 01:34:18 +0000 Commit: Mark Johnston CommitDate: 2025-03-20 01:34:18 +0000 vfs: Return early from sysctl_vfs_ctl() if no input was given Otherwise we end up searching for a mountpoint using an uninitialized key, and likely failing the version test. This violates KMSAN's invariants, so simply return immediately instead. MFC after: 2 weeks --- sys/kern/vfs_subr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 95ed98d3217d..96e8bb765972 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6519,6 +6519,8 @@ sysctl_vfs_ctl(SYSCTL_HANDLER_ARGS) int error; struct mount *mp; + if (req->newptr == NULL) + return (EINVAL); error = SYSCTL_IN(req, &vc, sizeof(vc)); if (error) return (error); From nobody Thu Mar 20 02:53:19 2025 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 4ZJ9B84b31z5r8Jy; Thu, 20 Mar 2025 02:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9B767C8z3cBd; Thu, 20 Mar 2025 02:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i18HfQoJ4oym2B5hsKJ17oCaXiBGMdw7oiD098uIRxM=; b=bKW16X95qliVn57K166IwQqGPQTbUgMcBucBibXK9g0/qOVbb32hq0dpsdE7fMKUCSuK2B upjhoh4Cgshq7Ivk66kWooRUmmmbDqcs2KFZTXYA4mR+6F3oXyjFVRJHPQNBye5m5z428d 8IofK9rEiuK+WGm3zCIZuTATG9k63kMxnybgzyvNKpwDD9CzbeAq2YmbJcT7P4I5DBvokU SxKe4arTlkD10GgGdlSB+RkEut9mFpmfU3EylGRMXXPisNUt2vcXkTewo9OROwEZw7N8bk G2VD6FQietTrEQxdo596n/ymNRRqyI0ZtU758TsTFlJbgoRUbc2W5GM0J8skPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742439199; a=rsa-sha256; cv=none; b=gJA8droSGVm5yxJDY/9R3YoG+mrDTTs7rdw0W0J403QtHK8s5CqsdfmFdBGV5dn7e5Nbd5 CRitIU9zTEaCZNXcVMaRjrtVlw4jPlc60w7Jn0szOpY3U41aM/3CxaukFzOdBDqgDpCf1Z 5cjRxdOqpOOF4smKLLBNlhv8CwCvPIR8oHrwIGjjLTWuymDwQBqHPtKgjtdfv3Hs+D28Z/ X5Cd2+eCmYLotJ47XThE2Ip6Gcs9jUMP0VV9qS8IA/VegB58WdWt4cpdG5MS3/tanBXMYM enF8j52fJInEtL5Svub9ev+7nKCs+Lb6eQ0Q33kiOQWbvbbIngdje8CVwAzhFg== 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=1742439199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i18HfQoJ4oym2B5hsKJ17oCaXiBGMdw7oiD098uIRxM=; b=lE6VtZ6MDKKjDoU73O+8tlZ+LuOERotMeVZDJgU4BDGkyQH6+BH97Rxc2YqpnnirpqrmZf CS5G65SzMcJ6vZF/U5INnlU0FAZZBe/3+7zB7+wqLvw77et2A8po2wQDexbpskUBc4bw15 Z9ZTV7OFjrJoxTccm92YV9FpV0PIXiMaprQ4byowzn7aGABH5UwGbAxf2uhHMijXaSp2jD d9KKVMCFWuUKZmGPVzUbNopRO4YMeHuhsgMA1ZKLahHghO4K/ZokkA4k0Z9iUuiXSBkBPb ZjBcrFvY7ty2oNq8H9M1+LuwXgsOb1K7ZlGS3eDk0MfHSPZ0zcVL/wwgi9AmJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9B75ZsLzn8H; Thu, 20 Mar 2025 02:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K2rJ32046606; Thu, 20 Mar 2025 02:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K2rJrA046603; Thu, 20 Mar 2025 02:53:19 GMT (envelope-from git) Date: Thu, 20 Mar 2025 02:53:19 GMT Message-Id: <202503200253.52K2rJrA046603@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: 57b09e470dbd - main - pkill tests: Fix pkill usage in the pkill -x test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 57b09e470dbd84d1491a8972cf504b25e788a6c3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=57b09e470dbd84d1491a8972cf504b25e788a6c3 commit 57b09e470dbd84d1491a8972cf504b25e788a6c3 Author: Mark Johnston AuthorDate: 2025-03-15 11:12:45 +0000 Commit: Mark Johnston CommitDate: 2025-03-20 02:52:49 +0000 pkill tests: Fix pkill usage in the pkill -x test The target process name(s) mark the beginning of the command's positional parameters, so the -P filter wasn't getting applied as intended. As a result, the second "pkill -x sleep -P $$" would kill all sleep(1) processes in the system, which can cause problems when running tests in parallel. MFC after: 2 weeks --- bin/pkill/tests/pkill-x_test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/pkill/tests/pkill-x_test.sh b/bin/pkill/tests/pkill-x_test.sh index 9247a85863c0..5fe751f9ec72 100644 --- a/bin/pkill/tests/pkill-x_test.sh +++ b/bin/pkill/tests/pkill-x_test.sh @@ -9,13 +9,13 @@ sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep $sleep 5 & sleep 0.3 -pkill -x slee -P $$ +pkill -P $$ -x slee if [ $? -ne 0 ]; then echo "ok 1 - $name" else echo "not ok 1 - $name" fi -pkill -x sleep -P $$ +pkill -P $$ -x sleep if [ $? -eq 0 ]; then echo "ok 2 - $name" else @@ -28,13 +28,13 @@ sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep $sleep 5 & sleep 0.3 -pkill -x -f "$sleep " -P $$ +pkill -P $$ -x -f "$sleep " if [ $? -ne 0 ]; then echo "ok 3 - $name" else echo "not ok 3 - $name" fi -pkill -x -f "$sleep 5" -P $$ +pkill -P $$ -x -f "$sleep 5" if [ $? -eq 0 ]; then echo "ok 4 - $name" else From nobody Thu Mar 20 02:53:18 2025 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 4ZJ9B740T8z5r8X6; Thu, 20 Mar 2025 02:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9B64kVYz3c8X; Thu, 20 Mar 2025 02:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NaFn5vTJDW8//6i2TUhoGMIvDUZo3U1nKv2xzKQo7ME=; b=ikWz/kfraJlIW/7Q2ifuWxSJcYqSobW0DzRNqgcauftSDV0AI49b7btfKSva8VHJQYguyq 4WL+UvcFDbKsiNSJ6S8EP3eJspV1vUmgGAZCzvPIzPBs/CRoKq/k9dPZoKv7QWrcdBMhkg rzUgdRMCy0l6uAPfD8ILty23nsKaHSg1XzOQt/98srx6LbJhlwF+6+bByNtlAxkSIG51d9 +fnYMp5/N44M14tB+W/VW9gs9H5/WbHoB+49o80LGGtRf+4YADEAqe4MmP1JEz04R1J4O4 6ezuDSKYZ66kgkq1kFw3AGdV+V+871o0rU0bDT8QLydvZLXhq0nGVzyZVOCOHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742439198; a=rsa-sha256; cv=none; b=HhYePln3vbW8LiQALDobdyVbOXRoq97jGinr7M9018z/ILLontSedG93iSEcXGAj0fxf5F PSu5jy4WoegDJVmrmOwBJh7GoX9Akpk8Xr6DmgSQ2KRpBdQcy/G52Q3CKVpZQHNYbsgMKJ QZJOz0WfNBypWoxSHC8Kzl/vQb7r+LQxAeMPrLL1S/9ArLKMHrprFziU6jvBxleC1p8Drs vgpKplIpIre/BZpW0LU56LG0n/bnJ6/iya3+S9y34Xj45bGD7UanICwUzgOQ8mTZpQlrBJ aRl1a6sSSrrQPt9iVXPtxtb3Ef49Ln61HVSvvjE+j1GqjrwzBnXt3ucTc1jD3g== 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=1742439198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NaFn5vTJDW8//6i2TUhoGMIvDUZo3U1nKv2xzKQo7ME=; b=yUYQy83wSxP3L8etCZnqlhp9jUQsukhiICm7EVAQ/UQzOdsNlMS6UvHZEuYvTocGJQq/xC lsXLG1wPLk85tudece/3o4KaHaSrrEJEXxs5lqM+mJN8avnCOKLwgr9sn0aF9AuuXzZSEC fu1V26D4T11NRi6Q+ccRnKM86VYFQPKTjeRTW025915I+9FDArmLGU3yYW0S8aZjKpYw7f BAvyn1vcnoHok45HKJuy3n1+vza+o075cfcsCaKdqB91gST1Mg+0K6sRQEr0csk+opR5K8 0qbhss6lO7wRWjI/o4EB4cgyIrl/M3fjqKbKDfxUP2DiVMiCTI8jFYsj45YEKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9B64L3vznCR; Thu, 20 Mar 2025 02:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K2rI06046573; Thu, 20 Mar 2025 02:53:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K2rIOb046570; Thu, 20 Mar 2025 02:53:18 GMT (envelope-from git) Date: Thu, 20 Mar 2025 02:53:18 GMT Message-Id: <202503200253.52K2rIOb046570@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: cf6a7804699f - main - pf: Update a dummy TCP checksum field in pf_test_state_icmp() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: cf6a7804699fee8931af7d5c36b1fddb19d700eb Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cf6a7804699fee8931af7d5c36b1fddb19d700eb commit cf6a7804699fee8931af7d5c36b1fddb19d700eb Author: Mark Johnston AuthorDate: 2025-03-20 01:34:38 +0000 Commit: Mark Johnston CommitDate: 2025-03-20 02:52:42 +0000 pf: Update a dummy TCP checksum field in pf_test_state_icmp() Otherwise the parameter &th.th_sum passed to pf_change_ap() points to uninitialized memory, since the portion of the TCP header that we copy from the embedded packet doesn't include the initial checksum. This is harmless but triggers a KMSAN violation. Use a dummy variable instead, initialized to zero, to fix the violation and make it clear to the reader that the value isn't used. Reviewed by: kp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49347 --- sys/netpfil/pf/pf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 3bf7e0e2077c..dadb3299ff99 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7905,6 +7905,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, struct tcphdr th; u_int32_t seq; struct pf_state_peer *src, *dst; + u_int16_t dummy_cksum = 0; u_int8_t dws; int copyback = 0; @@ -8026,10 +8027,10 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, nk->af)) return (PF_DROP); pf_change_ap(pd->m, pd2.src, &th.th_sport, - pd->ip_sum, &th.th_sum, &nk->addr[pd2.sidx], + pd->ip_sum, &dummy_cksum, &nk->addr[pd2.sidx], nk->port[sidx], 1, pd->af, nk->af); pf_change_ap(pd->m, pd2.dst, &th.th_dport, - pd->ip_sum, &th.th_sum, &nk->addr[pd2.didx], + pd->ip_sum, &dummy_cksum, &nk->addr[pd2.didx], nk->port[didx], 1, pd->af, nk->af); m_copyback(pd2.m, pd2.off, 8, (c_caddr_t)&th); PF_ACPY(&pd->nsaddr, &nk->addr[pd2.sidx], From nobody Thu Mar 20 04:31:03 2025 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 4ZJCLw6Pxyz5rGRM; Thu, 20 Mar 2025 04:31: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCLv6rCHz41YV; Thu, 20 Mar 2025 04:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIytv22n+zODQRgmTnrXf0hF4CSH73cKb9DwKAjGwIM=; b=b3BtrLDHvMH01IMIvk0SyCBFe9KJv5qfz6WeSBCS/XQbYlWZcvoqfLtznwko1QPEhXgKlu PHb/byKlMFM+Zt5JnM47uPIVUvNKF4Qjbj1uf0Ez+Q/wb1Xct8f4cVBHR17dyxYbJhkc28 nYiYsmPLVWjA9TsxjU9L33NlRGg4QA8F8O7oN6ZXxOTSeXmuwGgMrWv3NiylgzRikVH3iy dmsnACvZGdC+YUTzQtDEMCMypOk+JsPOJpTqtbOhQ6EG1kBVK6Afk6Wv/zs7s8tORu5Duh WE7rfTwtROvnIt9SSOFsChm364c6jKNyi08EoiIpUHCDErWolONusEXGXJielA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445064; a=rsa-sha256; cv=none; b=EEkpbV8+UOjno8iQgeMtCUE6/HY2jkTjqttdfYq9aM/RyCtwThcZGsBerhg3Fnml8wnbIr ky48w8Xh06lUlUiSmJMdTdZR6jSurS/aXfAtmruvAnvqYJ6x4jhsaOnwSWPf1xKpm/nhTX U5ZekLU2uFylKtM2xIQAoHhcqcu1+NLGP1NnMjrZpOCzmHfMGu0R+oJ1pU4S8MY/dcdP30 FY9EXDN+1y17tf4zhcPmPuMod6qJuUSjvplqao21S+rDU229NqSgX8nNqRt+DwRs3Xlvrr PZ//Xqx70GATOf9v2asCqesRCBplzKXqa9nuluKpGU6Y3JwRmTa0nUbVGJIj0g== 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=1742445063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIytv22n+zODQRgmTnrXf0hF4CSH73cKb9DwKAjGwIM=; b=UJJXkCo07NZzNfW9xUrrIq37Pfh8ANZDTrV5nhJSXyrGzw0nEXauxK5kuFX1QvAqmmajIn jSO7gckVgOnzNUwRQ6SJqA2vhTWEv/fOqZthLXwP31vdw96JvKhQyvx6LTwWSZntkqo9sN W1+G4vH63aPIOBPsmzEcQ9eClUJV342FP26dAw7lpA9tnfdt0rCm+ZGP7N1yXGnldrjTwn DkDrALzbpsHEa7Huw8Etx7+3sDioUncg5PqznBxFhNzGdoWjy1h3R4VbZlWwNLh7vwVL5Z /WmUwp6j9M3CB/fHJVASer9xVcrxC4csz1Zov5YMhbDF0vbX9daBA2OVqEhK7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCLv47LPzr2j; Thu, 20 Mar 2025 04:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4V3o2030870; Thu, 20 Mar 2025 04:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4V38C030867; Thu, 20 Mar 2025 04:31:03 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:31:03 GMT Message-Id: <202503200431.52K4V38C030867@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: 9e8d2962aad3 - main - pf: convert DIOCRGETTSTATS to netlink List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 9e8d2962aad3af9bf1acd328a047f4745bb31086 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9e8d2962aad3af9bf1acd328a047f4745bb31086 commit 9e8d2962aad3af9bf1acd328a047f4745bb31086 Author: Kristof Provost AuthorDate: 2025-03-06 15:57:06 +0000 Commit: Kristof Provost CommitDate: 2025-03-20 04:29:53 +0000 pf: convert DIOCRGETTSTATS to netlink Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 91 ++++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 4 ++ sbin/pfctl/pfctl_radix.c | 25 ------- sbin/pfctl/pfctl_table.c | 49 +++++++------- sys/netpfil/pf/pf_nl.c | 105 ++++++++++++++++++++++++++++++ sys/netpfil/pf/pf_nl.h | 13 ++++ usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c | 60 +++++++---------- 7 files changed, 264 insertions(+), 83 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index e93c79758428..e1cae22e2f3e 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3188,3 +3188,94 @@ pfctl_del_table(struct pfctl_handle *h, struct pfr_table *table, return (e.error); } +static bool +snl_attr_get_uint64_into_int_array(struct snl_state *ss, struct nlattr *nla, + const void *arg, void *target) +{ + uint64_t *u64target; + struct snl_uint64_array a = { + .count = 0, + .max = (size_t)arg, + }; + bool error; + + u64target = malloc(a.max * sizeof(uint64_t)); + a.array = u64target; + + error = snl_parse_header(ss, NLA_DATA(nla), NLA_DATA_LEN(nla), &array_parser, &a); + if (! error) + return (error); + + for (size_t i = 0; i < a.count; i++) + ((int *)target)[i] = (int)u64target[i]; + + free(u64target); + + return (true); +} + +#define _OUT(_field) offsetof(struct pfr_table, _field) +static const struct snl_attr_parser ap_table[] = { + { .type = PF_T_ANCHOR, .off = _OUT(pfrt_anchor), .arg = (void *)MAXPATHLEN, .cb = snl_attr_copy_string }, + { .type = PF_T_NAME, .off = _OUT(pfrt_name), .arg = (void *)PF_TABLE_NAME_SIZE, .cb =snl_attr_copy_string }, + { .type = PF_T_TABLE_FLAGS, .off = _OUT(pfrt_flags), .cb = snl_attr_get_uint32 }, +}; +#undef _OUT +SNL_DECLARE_ATTR_PARSER(table_parser, ap_table); +#define _OUT(_field) offsetof(struct pfr_tstats, _field) +static struct snl_attr_parser ap_tstats[] = { + { .type = PF_TS_TABLE, .off = _OUT(pfrts_t), .arg = &table_parser, .cb = snl_attr_get_nested }, + { .type = PF_TS_PACKETS, .off = _OUT(pfrts_packets), .arg = (void *)(PFR_DIR_MAX * PFR_OP_TABLE_MAX), .cb = snl_attr_get_uint64_array}, + { .type = PF_TS_BYTES, .off = _OUT(pfrts_bytes), .arg = (void *)(PFR_DIR_MAX * PFR_OP_TABLE_MAX), .cb = snl_attr_get_uint64_array }, + { .type = PF_TS_MATCH, .off = _OUT(pfrts_match), .cb = snl_attr_get_uint64 }, + {. type = PF_TS_NOMATCH, .off = _OUT(pfrts_nomatch), .cb = snl_attr_get_uint64 }, + { .type = PF_TS_TZERO, .off = _OUT(pfrts_tzero), .cb = snl_attr_get_uint64 }, + { .type = PF_TS_REFCNT, .off = _OUT(pfrts_cnt), . arg = (void *)PFR_REFCNT_MAX, .cb = snl_attr_get_uint64_into_int_array }, +}; +#undef _OUT +SNL_DECLARE_PARSER(tstats_parser, struct genlmsghdr, snl_f_p_empty, ap_tstats); + +int +pfctl_get_tstats(struct pfctl_handle *h, const struct pfr_table *filter, + pfctl_get_tstats_fn fn, void *arg) +{ + struct snl_writer nw; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + uint32_t seq_id; + int family_id; + int ret; + + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); + + snl_init_writer(&h->ss, &nw); + hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GET_TSTATS); + + snl_add_msg_attr_string(&nw, PF_T_ANCHOR, filter->pfrt_anchor); + snl_add_msg_attr_string(&nw, PF_T_NAME, filter->pfrt_name); + snl_add_msg_attr_u32(&nw, PF_T_TABLE_FLAGS, filter->pfrt_flags); + + if ((hdr = snl_finalize_msg(&nw)) == NULL) + return (ENXIO); + + seq_id = hdr->nlmsg_seq; + + if (!snl_send_message(&h->ss, hdr)) + return (ENXIO); + + while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { + struct pfr_tstats tstats = {}; + + if (!snl_parse_nlmsg(&h->ss, hdr, &tstats_parser, &tstats)) + continue; + + ret = fn(&tstats, arg); + if (ret != 0) + break; + } + + return (e.error); +} + diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 1108b0ffc693..c1c1da66746b 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -551,4 +551,8 @@ int pfctl_add_table(struct pfctl_handle *h, struct pfr_table *table, int pfctl_del_table(struct pfctl_handle *h, struct pfr_table *table, int *ndel, int flags); +typedef int (*pfctl_get_tstats_fn)(const struct pfr_tstats *t, void *arg); +int pfctl_get_tstats(struct pfctl_handle *h, const struct pfr_table *filter, + pfctl_get_tstats_fn fn, void *arg); + #endif diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 3bb2469a9bfb..3b0cc615e5a2 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -110,31 +110,6 @@ pfr_get_tables(struct pfr_table *filter, struct pfr_table *tbl, int *size, return (0); } -int -pfr_get_tstats(struct pfr_table *filter, struct pfr_tstats *tbl, int *size, - int flags) -{ - struct pfioc_table io; - - if (size == NULL || *size < 0 || (*size && tbl == NULL)) { - errno = EINVAL; - return (-1); - } - bzero(&io, sizeof io); - io.pfrio_flags = flags; - if (filter != NULL) - io.pfrio_table = *filter; - io.pfrio_buffer = tbl; - io.pfrio_esize = sizeof(*tbl); - io.pfrio_size = *size; - if (ioctl(dev, DIOCRGETTSTATS, &io)) { - pfr_report_error(filter, &io, "get tstats for"); - return (-1); - } - *size = io.pfrio_size; - return (0); -} - int pfr_clr_addrs(struct pfr_table *tbl, int *ndel, int flags) { diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index 90e87adadb0f..57f7354b0172 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -57,8 +57,8 @@ extern void usage(void); static int pfctl_table(int, char *[], char *, const char *, char *, const char *, int); -static void print_table(struct pfr_table *, int, int); -static void print_tstats(struct pfr_tstats *, int); +static void print_table(const struct pfr_table *, int, int); +static int print_tstats(const struct pfr_tstats *, int); static int load_addr(struct pfr_buffer *, int, char *[], char *, int); static void print_addrx(struct pfr_addr *, struct pfr_addr *, int); static int nonzero_astats(struct pfr_astats *); @@ -165,28 +165,31 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, PFRB_TSTATS : PFRB_TABLES; if (argc || file != NULL) usage(); - for (;;) { - pfr_buf_grow(&b, b.pfrb_size); - b.pfrb_size = b.pfrb_msize; - if (opts & PF_OPT_VERBOSE2) - RVTEST(pfr_get_tstats(&table, - b.pfrb_caddr, &b.pfrb_size, flags)); - else - RVTEST(pfr_get_tables(&table, - b.pfrb_caddr, &b.pfrb_size, flags)); - if (b.pfrb_size <= b.pfrb_msize) - break; - } if ((opts & PF_OPT_SHOWALL) && b.pfrb_size > 0) pfctl_print_title("TABLES:"); - PFRB_FOREACH(p, &b) - if (opts & PF_OPT_VERBOSE2) - print_tstats(p, opts & PF_OPT_DEBUG); - else + if (opts & PF_OPT_VERBOSE2) { + uintptr_t arg = opts & PF_OPT_DEBUG; + pfctl_get_tstats(pfh, &table, + (pfctl_get_tstats_fn)print_tstats, (void *)arg); + } else { + for (;;) { + pfr_buf_grow(&b, b.pfrb_size); + b.pfrb_size = b.pfrb_msize; + RVTEST(pfr_get_tables(&table, + b.pfrb_caddr, &b.pfrb_size, flags)); + if (b.pfrb_size <= b.pfrb_msize) + break; + } + + if ((opts & PF_OPT_SHOWALL) && b.pfrb_size > 0) + pfctl_print_title("TABLES:"); + + PFRB_FOREACH(p, &b) print_table(p, opts & PF_OPT_VERBOSE, opts & PF_OPT_DEBUG); + } } else if (!strcmp(command, "kill")) { if (argc || file != NULL) usage(); @@ -408,7 +411,7 @@ _cleanup: } void -print_table(struct pfr_table *ta, int verbose, int debug) +print_table(const struct pfr_table *ta, int verbose, int debug) { if (!debug && !(ta->pfrt_flags & PFR_TFLAG_ACTIVE)) return; @@ -429,14 +432,14 @@ print_table(struct pfr_table *ta, int verbose, int debug) puts(ta->pfrt_name); } -void -print_tstats(struct pfr_tstats *ts, int debug) +int +print_tstats(const struct pfr_tstats *ts, int debug) { time_t time = ts->pfrts_tzero; int dir, op; if (!debug && !(ts->pfrts_flags & PFR_TFLAG_ACTIVE)) - return; + return (0); print_table(&ts->pfrts_t, 1, debug); printf("\tAddresses: %d\n", ts->pfrts_cnt); printf("\tCleared: %s", ctime(&time)); @@ -452,6 +455,8 @@ print_tstats(struct pfr_tstats *ts, int debug) stats_text[dir][op], (unsigned long long)ts->pfrts_packets[dir][op], (unsigned long long)ts->pfrts_bytes[dir][op]); + + return (0); } int diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 73c39e1f7471..f34bb71839b3 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -1937,6 +1937,104 @@ pf_handle_del_table(struct nlmsghdr *hdr, struct nl_pstate *npt) return (0); } +static bool +nlattr_add_pfr_table(struct nl_writer *nw, int attrtype, + struct pfr_table *t) +{ + int off = nlattr_add_nested(nw, attrtype); + + nlattr_add_string(nw, PF_T_ANCHOR, t->pfrt_anchor); + nlattr_add_string(nw, PF_T_NAME, t->pfrt_name); + nlattr_add_u32(nw, PF_T_TABLE_FLAGS, t->pfrt_flags); + + nlattr_set_len(nw, off); + + return (true); +} + +static int +pf_handle_get_tstats(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + struct pfioc_table attrs = { 0 }; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + struct pfr_tstats *pfrtstats; + int error; + int n; + + PF_RULES_RLOCK_TRACKER; + + error = nl_parse_nlmsg(hdr, &table_parser, npt, &attrs); + if (error != 0) + return (error); + + PF_TABLE_STATS_LOCK(); + PF_RULES_RLOCK(); + + n = pfr_table_count(&attrs.pfrio_table, attrs.pfrio_flags); + pfrtstats = mallocarray(n, + sizeof(struct pfr_tstats), M_TEMP, M_NOWAIT | M_ZERO); + + error = pfr_get_tstats(&attrs.pfrio_table, pfrtstats, + &n, attrs.pfrio_flags | PFR_FLAG_USERIOCTL); + + PF_RULES_RUNLOCK(); + PF_TABLE_STATS_UNLOCK(); + + if (error == 0) { + hdr->nlmsg_flags |= NLM_F_MULTI; + + for (int i = 0; i < n; i++) { + uint64_t refcnt[PFR_REFCNT_MAX]; + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) { + error = ENOMEM; + break; + } + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_GET_TSTATS; + ghdr_new->version = 0; + ghdr_new->reserved = 0; + + nlattr_add_pfr_table(nw, PF_TS_TABLE, + &pfrtstats[i].pfrts_t); + nlattr_add_u64_array(nw, PF_TS_PACKETS, + PFR_DIR_MAX * PFR_OP_TABLE_MAX, + (uint64_t *)pfrtstats[i].pfrts_packets); + nlattr_add_u64_array(nw, PF_TS_BYTES, + PFR_DIR_MAX * PFR_OP_TABLE_MAX, + (uint64_t *)pfrtstats[i].pfrts_bytes); + nlattr_add_u64(nw, PF_TS_MATCH, + pfrtstats[i].pfrts_match); + nlattr_add_u64(nw, PF_TS_NOMATCH, + pfrtstats[i].pfrts_nomatch); + nlattr_add_u64(nw, PF_TS_TZERO, + pfrtstats[i].pfrts_tzero); + nlattr_add_u64(nw, PF_TS_CNT, pfrtstats[i].pfrts_cnt); + + for (int j = 0; j < PFR_REFCNT_MAX; j++) + refcnt[j] = pfrtstats[i].pfrts_refcnt[j]; + + nlattr_add_u64_array(nw, PF_TS_REFCNT, PFR_REFCNT_MAX, + refcnt); + + if (! nlmsg_end(nw)) { + error = ENOMEM; + break; + } + } + } + free(pfrtstats, M_TEMP); + + if (!nlmsg_end_dump(npt->nw, error, hdr)) { + NL_LOG(LOG_DEBUG, "Unable to finalize the dump"); + return (ENOMEM); + } + + return (error); +} + static const struct nlhdr_parser *all_parsers[] = { &state_parser, &addrule_parser, @@ -2152,6 +2250,13 @@ static const struct genl_cmd pf_cmds[] = { .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL, .cmd_priv = PRIV_NETINET_PF, }, + { + .cmd_num = PFNL_CMD_GET_TSTATS, + .cmd_name = "GET_TSTATS", + .cmd_cb = pf_handle_get_tstats, + .cmd_flags = GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, + .cmd_priv = PRIV_NETINET_PF, + }, }; void diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index dd68f452d7f1..ed01d3427fc4 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -64,6 +64,7 @@ enum { PFNL_CMD_CLEAR_TABLES = 26, PFNL_CMD_ADD_TABLE = 27, PFNL_CMD_DEL_TABLE = 28, + PFNL_CMD_GET_TSTATS = 29, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1) @@ -442,6 +443,18 @@ enum pf_tables_t { PF_T_NBR_ADDED = 6, /* u32 */ }; +enum pf_tstats_t { + PF_TS_UNSPEC, + PF_TS_TABLE = 1, /* nested, pfr_table */ + PF_TS_PACKETS = 2, /* u64 array */ + PF_TS_BYTES = 3, /* u64 array */ + PF_TS_MATCH = 4, /* u64 */ + PF_TS_NOMATCH = 5, /* u64 */ + PF_TS_TZERO = 6, /* u64 */ + PF_TS_CNT = 7, /* u64 */ + PF_TS_REFCNT = 8, /* u64 array */ +}; + #ifdef _KERNEL void pf_nl_register(void); diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c index 0e40bcfb843e..f0f9e0f0e149 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -1297,11 +1297,28 @@ pfs_refresh(void) return (0); } +static int +pft_add_tstats(const struct pfr_tstats *t, void *arg) +{ + struct pft_entry *e; + int *index = arg; + + e = malloc(sizeof(struct pft_entry)); + if (e == NULL) + return (ENOMEM); + + e->index = (*index) + 1; + (*index)++; + memcpy(&e->pft, t, sizeof(struct pfr_tstats)); + TAILQ_INSERT_TAIL(&pft_table, e, link); + + return (0); +} + static int pft_refresh(void) { - struct pfioc_table io; - struct pfr_tstats *t = NULL; + struct pfr_table filter; struct pft_entry *e; int i, numtbls = 1; @@ -1314,45 +1331,18 @@ pft_refresh(void) free(e); } - bzero(&io, sizeof(io)); - io.pfrio_esize = sizeof(struct pfr_tstats); - - for (;;) { - t = reallocf(t, numtbls * sizeof(struct pfr_tstats)); - if (t == NULL) { - syslog(LOG_ERR, "pft_refresh(): reallocf() numtbls=%d: %s", - numtbls, strerror(errno)); - goto err2; - } - io.pfrio_size = numtbls; - io.pfrio_buffer = t; + bzero(&filter, sizeof(filter)); - if (ioctl(pfctl_fd(pfh), DIOCRGETTSTATS, &io)) { - syslog(LOG_ERR, "pft_refresh(): ioctl(): %s", - strerror(errno)); - goto err2; - } - - if (numtbls >= io.pfrio_size) - break; - - numtbls = io.pfrio_size; - } - - for (i = 0; i < numtbls; i++) { - e = malloc(sizeof(struct pft_entry)); - if (e == NULL) - goto err1; - e->index = i + 1; - memcpy(&e->pft, t+i, sizeof(struct pfr_tstats)); - TAILQ_INSERT_TAIL(&pft_table, e, link); + if (pfctl_get_tstats(pfh, &filter, pft_add_tstats, &i)) { + syslog(LOG_ERR, "pft_refresh(): pfctl_get_tstats(): %s", + strerror(errno)); + goto err1; } pft_table_age = time(NULL); pft_table_count = numtbls; pf_tick = this_tick; - free(t); return (0); err1: while (!TAILQ_EMPTY(&pft_table)) { @@ -1360,8 +1350,6 @@ err1: TAILQ_REMOVE(&pft_table, e, link); free(e); } -err2: - free(t); return(-1); } From nobody Thu Mar 20 04:31:04 2025 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 4ZJCLx6YHsz5rGCk; Thu, 20 Mar 2025 04:31: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCLw6T9Gz41hJ; Thu, 20 Mar 2025 04:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nji1qr+BURCs7wVeRlJh+F4uDrAX942U9wIwn25DCis=; b=b+Uys80AX/C+N/yAXf3li7JqGwjp/04QalsBvSKdW5HUcy865VpZ5kbxg1oFf0pJBr4aYK wILtGSmws5gphOYTBNbI2HwNUHEgZZozPnJABZPzaD3oMRSKvhFGrOTpfscYMVutubcNOT 2LnU0vkwF5J1sN5wT5zhiqvOobMsAbOaYCBdKT2WZnMjMSJTQbUirVNXykHrLnM5Qe+aHc oz69qcB0frggeQfjWiul8DF+kpegJYVd0Sa9cKFAMvu2LPHt9Wyv1/744eN6AOY85OqYAc +Lw3Xf9j+M+W3F8qeCfvKyeptBdODXDo6kKqcf2Nj9sNcsLevJuTaetYfBFuLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445065; a=rsa-sha256; cv=none; b=obaE3S8jkr9bNmlmpszUKGkvR5wY4z4V0SGcPfbIsjWso4S3pCsZJHT5PjjPCbrEKM39Ma sn+C+u6DvxzvhwFHCG9AjUupcq4wt5v78w+j88WtDVOe0aaRQ0WQdJOxD3t3mkwlp1aleg D9I2mVLT/VHEX403T3M/tMP1gooHycJ8HToY2+bNvHdk2lOmpYqDn6y5r+oOPDn/zxgBO4 t3D83280XtJWTkUOXzMDGH3T7tGcR8tk2+a7OnPjVwLfQzBUVI0/UCVI56pFt1/5+Jv8Vl oj53J4BZ8bdXBVutYL4yCKOQnh9qDeLt4P6R6XdwaOuaLsgdY9DRw9kz3yZjTw== 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=1742445065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nji1qr+BURCs7wVeRlJh+F4uDrAX942U9wIwn25DCis=; b=XDYTdRlgniroO704euRiY/dzU1L5DKvbgycpdJ/51PLoDaKNngoFXtkRCDCc9G3OUC72/J bsnLSP6UPVr04hioRVwj9XBHaLzthgDgix8kE9Fd2OioDNM55B5zRBhfD5+5fipXaMW0up 44PYueMB8Hb8NJnRnaFCINwyPXVAwhZQcyoDR8vuHzYWRIv6LiWJPFaaXHOGCBHqVF16vo eawVwVf3GeNEvBX8tWo8HElksz6oVZXI0xLoTg8QjKkguRnqoXaYF8gM5MsFunx6j54RqN yKmyrzix3rewPg/at1XN+WAl+9G9X2XB4z4sFIOpX6UmYbAyQ8Rp/MA3KRNLLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCLw4qJdzr4s; Thu, 20 Mar 2025 04:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4V4nH030908; Thu, 20 Mar 2025 04:31:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4V4KK030905; Thu, 20 Mar 2025 04:31:04 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:31:04 GMT Message-Id: <202503200431.52K4V4KK030905@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: 712309a64512 - main - snmp_pf: fix pfInterfacesIfRefsState List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 712309a64512c7e4ebf0e10de8a5c59d5a185ae8 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=712309a64512c7e4ebf0e10de8a5c59d5a185ae8 commit 712309a64512c7e4ebf0e10de8a5c59d5a185ae8 Author: Kristof Provost AuthorDate: 2025-03-19 06:08:55 +0000 Commit: Kristof Provost CommitDate: 2025-03-20 04:29:53 +0000 snmp_pf: fix pfInterfacesIfRefsState pfInterfacesIfRefsState was described as 'Null', which upset bsnmpwalk's attempt to resolve OIDs to symbolic names: > bsnmpwalk: Error adding leaf pfInterfacesIfRefsState to list This was done back in d6d3f01e0a339, because we don't return this value any more. Return it to 'Unsigned32', which fixes things, even if we still don't actually return this value. While here update the ORGANIZATION to reflect current ownership. Reviewed by: philip MFC after: 2 weeks Event: Tokyo Hackathon 202503 Differential Revision: https://reviews.freebsd.org/D49413 --- usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt | 14 ++++++-------- usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt index 13a4a646a669..8127eb92601f 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt @@ -21,19 +21,17 @@ IMPORTS FROM BEGEMOT-MIB; begemotPf MODULE-IDENTITY - LAST-UPDATED "201003180000Z" - ORGANIZATION "NixSys BVBA" + LAST-UPDATED "202503190000Z" + ORGANIZATION "Alternative Enterprises (HK) Limited" CONTACT-INFO " Philip Paeps - Postal: NixSys BVBA - Louizastraat 14 - BE-2800 Mechelen - Belgium - E-Mail: philip@FreeBSD.org" DESCRIPTION "The Begemot MIB for the pf packet filter." + REVISION "202503190000Z" + DESCRIPTION + "Reverted pfInterfacesIfRefsState to Unsigned32" REVISION "201003180000Z" DESCRIPTION "Modified pfTablesAddrEntry to support IPv6 @@ -583,7 +581,7 @@ PfInterfacesIfEntry ::= SEQUENCE { pfInterfacesIfDescr OCTET STRING, pfInterfacesIfType INTEGER, pfInterfacesIfTZero TimeTicks, - pfInterfacesIfRefsState Null, + pfInterfacesIfRefsState Unsigned32, pfInterfacesIfRefsRule Unsigned32, pfInterfacesIf4BytesInPass Counter64, pfInterfacesIf4BytesInBlock Counter64, diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def b/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def index dcdf676aa752..7a517a876fab 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def @@ -107,7 +107,7 @@ (2 pfInterfacesIfDescr OCTETSTRING GET) (3 pfInterfacesIfType ENUM ( 0 group 1 instance 2 detached ) GET) (4 pfInterfacesIfTZero TIMETICKS GET) - (5 pfInterfacesIfRefsState NULL GET) + (5 pfInterfacesIfRefsState UNSIGNED32 GET) (6 pfInterfacesIfRefsRule UNSIGNED32 GET) (7 pfInterfacesIf4BytesInPass COUNTER64 GET) (8 pfInterfacesIf4BytesInBlock COUNTER64 GET) From nobody Thu Mar 20 04:31:05 2025 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 4ZJCLz1gYYz5rG9p; Thu, 20 Mar 2025 04:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCLy0B9Mz41TX; Thu, 20 Mar 2025 04:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ll1e3eTGqwAmjfP5/46QCUtS7L/aZ1l4fnCGipgxnTY=; b=QVLgB2ySASkInyiqH9f2rVCrhIKi3vKVYRcECIez35qscvXHrjpL3rvnUT27k65rs5wPdF NhaxvMFSMEs0JW41Ep/T5UvSXkD3L93G/psX00mcGIDlEGBgKrXgUKXJeyKf1+0UNVLlIo 0KtpWn6Vk7E7TBhSvrJmoPRPZNsdHaL0hA2YIKyUxZ3OtR/3+tsUvQ1f71pVKGjekNU7ia 2J2FcfKkT4/rnLdUz/abYXOk2B1Nd18yMJYDU+m804WoLHvsowtATRfF97/nMlTqlWfoqr qjBdWn7S2i1Firm7yoUhJI96K5HaCEPVaMZTWrTtSB21VDr2APIqA0252x8WFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445066; a=rsa-sha256; cv=none; b=tkSYFvfybc5DheCI/nReZDE0ZJzykh9yJ3kVm0pI6uLT/kTFUIr1zwb0QgikhDK4YsUWfL U5BCsRwj3K4gZ+tIbg/nepsztJaSfFA/I3uLZ/7QnQ2X1/SQ38A8ABvw719ydp7l/3CzHy EzFgah+3/ftC1gwu1D0AeGTkBQkNtXN5xhZ7YMiauV+T7h6cpA1gqQJlmdrPNM7Ut3E8lc 7H/9Ih+MtYR+uhz0U18R8jDjZeF6VmPsU7F3Idud3DG0l69XCLOwmiYkr0zfv1XRNT2/iY LY+JL5UJVbo2nTzk1jlA7tGYmXdwf1OIKXTlrcttxjM4E0bZk/MOxtUgIMFh3A== 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=1742445066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ll1e3eTGqwAmjfP5/46QCUtS7L/aZ1l4fnCGipgxnTY=; b=e2JGwjYcG37iEGGv7tN9FkgtoTdFbSzAFWVlroCp1W4MBK/ijV1rzTIrnxLjn2Xxgyek2l sQ/CFVO6TrRMvmEsRIc+XnW6m5J3UgPA0BXC4XffrvRE/IrBNVbBgZPVoohPxSKQPQSFAE 4gmRjOIZuhmD6P+mF1N1Q11yP1zlpHPfoR6C9YHKNELNJ+6so16TZG0sES0gptkoj1JWA3 d2fBClzrS5E9gY6nGgt9/vG+e/0QA+6SzSwHq6E0IB58t9T3ZCU7mk45NAixePX1fPD6XS D1Xv4B2EGI5hn2+dZTB8ouOTb1HHFeSqSwStZGxYp/vFije6sW6eNjzTjfMnFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCLx634Dzqr7; Thu, 20 Mar 2025 04:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4V5TS030948; Thu, 20 Mar 2025 04:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4V5N7030945; Thu, 20 Mar 2025 04:31:05 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:31:05 GMT Message-Id: <202503200431.52K4V5N7030945@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: c849f5333260 - main - pf tests: add a basic snmp_pf test 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: c849f533326026501c28cb2c344b16723862551a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c849f533326026501c28cb2c344b16723862551a commit c849f533326026501c28cb2c344b16723862551a Author: Kristof Provost AuthorDate: 2025-03-19 06:42:42 +0000 Commit: Kristof Provost CommitDate: 2025-03-20 04:29:54 +0000 pf tests: add a basic snmp_pf test case Event: Tokyo Hackathon 202503 --- tests/sys/netpfil/pf/Makefile | 6 +++- tests/sys/netpfil/pf/bsnmpd.conf | 47 ++++++++++++++++++++++++++ tests/sys/netpfil/pf/snmp.sh | 71 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 123 insertions(+), 1 deletion(-) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 8a24fae47dcb..3b1ba2085f43 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -45,6 +45,7 @@ ATF_TESTS_SH+= altq \ sctp \ set_skip \ set_tos \ + snmp \ src_track \ status \ syncookie \ @@ -63,7 +64,9 @@ ATF_TESTS_PYTEST+= sctp.py TEST_METADATA+= execenv="jail" TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets" -${PACKAGE}FILES+= CVE-2019-5597.py \ +${PACKAGE}FILES+= \ + bsnmpd.conf \ + CVE-2019-5597.py \ CVE-2019-5598.py \ daytime_inetd.conf \ echo_inetd.conf \ @@ -79,6 +82,7 @@ ${PACKAGE}FILES+= CVE-2019-5597.py \ rdr-srcport.py \ utils.subr +${PACKAGE}FILESMODE_bsnmpd.conf= 0555 ${PACKAGE}FILESMODE_CVE-2019-5597.py= 0555 ${PACKAGE}FILESMODE_CVE-2019-5598.py= 0555 ${PACKAGE}FILESMODE_fragcommon.py= 0555 diff --git a/tests/sys/netpfil/pf/bsnmpd.conf b/tests/sys/netpfil/pf/bsnmpd.conf new file mode 100644 index 000000000000..27abdda6cbd3 --- /dev/null +++ b/tests/sys/netpfil/pf/bsnmpd.conf @@ -0,0 +1,47 @@ +location := "A galaxy far, far away" +contact := "skywalker@Tatooine" +system := 1 + +read := "public" +write := "geheim" +trap := "mytrap" + +NoAuthProtocol := 1.3.6.1.6.3.10.1.1.1 +HMACMD5AuthProtocol := 1.3.6.1.6.3.10.1.1.2 +HMACSHAAuthProtocol := 1.3.6.1.6.3.10.1.1.3 +NoPrivProtocol := 1.3.6.1.6.3.10.1.2.1 +DESPrivProtocol := 1.3.6.1.6.3.10.1.2.2 +AesCfb128Protocol := 1.3.6.1.6.3.10.1.2.4 + +securityModelAny := 0 +securityModelSNMPv1 := 1 +securityModelSNMPv2c := 2 +securityModelUSM := 3 + +MPmodelSNMPv1 := 0 +MPmodelSNMPv2c := 1 +MPmodelSNMPv3 := 3 + +noAuthNoPriv := 1 +authNoPriv := 2 +authPriv := 3 + +%snmpd +begemotSnmpdDebugDumpPdus = 2 +begemotSnmpdDebugSyslogPri = 7 + +begemotSnmpdCommunityString.0.1 = $(read) +begemotSnmpdCommunityDisable = 1 + +begemotSnmpdTransInetStatus.1.4.0.0.0.0.161.1 = 4 +begemotSnmpdTransInetStatus.2.16.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.161.1 = 4 + +begemotSnmpdLocalPortStatus."/var/run/snmpd.sock" = 1 +begemotSnmpdLocalPortType."/var/run/snmpd.sock" = 4 + +sysContact = $(contact) +sysLocation = $(location) +sysObjectId = 1.3.6.1.4.1.12325.1.1.2.1.$(system) + +begemotSnmpdModulePath."mibII" = "/usr/lib/snmp_mibII.so" +begemotSnmpdModulePath."pf" = "/usr/lib/snmp_pf.so" diff --git a/tests/sys/netpfil/pf/snmp.sh b/tests/sys/netpfil/pf/snmp.sh new file mode 100644 index 000000000000..0d6b2eb10ec7 --- /dev/null +++ b/tests/sys/netpfil/pf/snmp.sh @@ -0,0 +1,71 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2025 Kristof Provost +# +# 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 + +atf_test_case "basic" "cleanup" +basic_head() +{ + atf_set descr 'Basic pf_snmp test' + atf_set require.user root +} + +basic_body() +{ + pft_init + + epair=$(vnet_mkepair) + + ifconfig ${epair}b 192.0.2.2/24 up + + vnet_mkjail alcatraz ${epair}a + jexec alcatraz ifconfig ${epair}a 192.0.2.1/24 up + + # Start bsnmpd + jexec alcatraz bsnmpd -c $(atf_get_srcdir)/bsnmpd.conf + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "pass" + + # Sanity check, and create state + atf_check -s exit:0 -o ignore \ + ping -c 1 192.0.2.1 + + # pf should be enabled + atf_check -s exit:0 -o match:'pfStatusRunning.0 = true' \ + bsnmpwalk -s public@192.0.2.1 -i pf_tree.def begemot +} + +basic_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "basic" +} From nobody Thu Mar 20 04:31:06 2025 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 4ZJCM06j3kz5rG7W; Thu, 20 Mar 2025 04:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCLz39p5z41hQ; Thu, 20 Mar 2025 04:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtiU/1wd7GRXxE8AmzHRHSc7ewqIiI/KNEmXHnGQBd0=; b=NxcGYFcEX+3ARVw+haX3eymEAKRogJVM1hiULM6haAKaS+AAzkRKY6yTxmwGHHxQN0HWTb 9rrdBYW/18uRdjOwBcCHNU2rrzyosmfvxos8qqdKKdMAzv0A9QQqd27IaYdpPDasxB9gOa V5JG4DRHv25HHSF82jwskClHtXIvFvx23zmlBXs1Wp3YRgf9Xsg4w2fLhzYvqaCVS81mWd ojUekLquouJCxW/iD19Ng8nb5vZfubIUAlH1CbnCQ0qIIQDgBnnwl3+6nLvPkGMuzihYap tVyzdlPxwu4mhdKQqB9OTXPSlkfzkr+u1cAgQQ2TGt34Iu+b9emlgSDRPPtfeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445067; a=rsa-sha256; cv=none; b=oeI9tOT8AeinKpNz04RJPKMhm9hpdJp6atb8ACb+Ts94EHJxouADbeHQF2A8u9RH5gF7fH XSOZtZ9Dn7/3E2DJ1ofnQ9uStfIaAe2aahGsCfofgp2tCGyZy7niH6NsH7YpdwY/qpu76z df3MdcPgbJkolVMP3ga1d6FDBVCIA/7hNSpZ2Fi8dQAKUD7MXO/amkJBOvsLKfPl5cz+aq DkxeoADOfkmMxh0QJOZOqhJQujaZdAuf5PWUmP7GCOL0+wteOOWbj7xj6Sx+F1sq21X1Bd qVY4qR5Vc/tq8QDY87cO639MpBP7LwNgBTeCnYIt0L8COACOum5Y8/OVsdYDsw== 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=1742445067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtiU/1wd7GRXxE8AmzHRHSc7ewqIiI/KNEmXHnGQBd0=; b=E0AjQ5g1r5LW1Zf2BiWwwtTDNBCUELuFwvjzTGqoWyTZuUU2LOkyQYatvZmw/xYbw5vv0P NeJeeeF/FVkh47DB9XL17gJMqkLhx42kLSOJlAWD8Guj9NGM467AF9RcMU1zujVufHGI1n Kr7+iCP4cYoV61c6GXJU+QM1OgJf8m5gJHHmmse3flyH/gcpq2so7SDt+qcYoTqMlfr7KK E36ym0RPprr93TmR+JJi6e7R944Iw/XEA0Qqz8hbnIicx4iqhT8Zr1YASM/ih/UtFuyQhm vb1kUdJjiwE2xfqZq3/EYhTnmH0datiRGY59XkzhfCJgnVJDAOEGHBN4YnQkjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCLz0fhZzr2l; Thu, 20 Mar 2025 04:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4V6VT030981; Thu, 20 Mar 2025 04:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4V6Sw030978; Thu, 20 Mar 2025 04:31:06 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:31:06 GMT Message-Id: <202503200431.52K4V6Sw030978@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: 36586800803d - main - pf tests: test table information export via snmp_pf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 36586800803d24f1137d861bbaf487a6bde16a09 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=36586800803d24f1137d861bbaf487a6bde16a09 commit 36586800803d24f1137d861bbaf487a6bde16a09 Author: Kristof Provost AuthorDate: 2025-03-20 01:27:52 +0000 Commit: Kristof Provost CommitDate: 2025-03-20 04:29:54 +0000 pf tests: test table information export via snmp_pf Event: Tokyo Hackathon 202503 --- tests/sys/netpfil/pf/snmp.sh | 52 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/tests/sys/netpfil/pf/snmp.sh b/tests/sys/netpfil/pf/snmp.sh index 0d6b2eb10ec7..37cc4b75cf92 100644 --- a/tests/sys/netpfil/pf/snmp.sh +++ b/tests/sys/netpfil/pf/snmp.sh @@ -65,7 +65,59 @@ basic_cleanup() pft_cleanup } +atf_test_case "table" "cleanup" +table_head() +{ + atf_set descr 'Test tables and pf_snmp' + atf_set require.user root +} + +table_body() +{ + pft_init + + epair=$(vnet_mkepair) + + ifconfig ${epair}b 192.0.2.2/24 up + + vnet_mkjail alcatraz ${epair}a + jexec alcatraz ifconfig ${epair}a 192.0.2.1/24 up + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "table counters { 192.0.2.0/24 }" \ + "pass in from " + + # Start bsnmpd after creating the table so we don't have to wait for + # a refresh timeout + jexec alcatraz bsnmpd -c $(atf_get_srcdir)/bsnmpd.conf + + # Sanity check, and create state + atf_check -s exit:0 -o ignore \ + ping -c 1 192.0.2.1 + + # We should have one table + atf_check -s exit:0 -o match:'pfTablesTblNumber.0 = 1' \ + bsnmpwalk -s public@192.0.2.1 -i pf_tree.def begemot + + # We have the 'foo' table + atf_check -s exit:0 -o match:'pfTablesTblDescr.* = foo' \ + bsnmpwalk -s public@192.0.2.1 -i pf_tree.def pfTables + + # Which contains address 192.0.2.0/24 + atf_check -s exit:0 -o match:'pfTablesAddrNet.* = 192.0.2.0' \ + bsnmpwalk -s public@192.0.2.1 -i pf_tree.def pfTables + atf_check -s exit:0 -o match:'pfTablesAddrPrefix.* = 24' \ + bsnmpwalk -s public@192.0.2.1 -i pf_tree.def pfTables +} + +table_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic" + atf_add_test_case "table" } From nobody Thu Mar 20 04:34:19 2025 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 4ZJCQj1LzLz5rGZC; Thu, 20 Mar 2025 04:34: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCQh34Srz44SR; Thu, 20 Mar 2025 04:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wLX4FfCD/JBnqOlnKlQgsl7ChcQeEv75+b34om3o1Q8=; b=DidBdafixPmIhbhpr//zjcn+q5b8rZIYSKiCRX2RytVvIwGpRf4F8kiPVaCPDo4sCGUjVy XdG5TSmlvTc9peyj2D9iewt3hD6BjdEFAjWIoNsZjrWceCC+WuyQnUKMz3lsoaXDRZNBon miybnKn/WoxIEJW4mXX0GQoLjoZOLUV/q3S8YTkE8ZtbDF5VJ+OOKrfpYDMjk33MT9JHzY Pz4DOv/57e4xJzseSJLkvuKCvyEldfGy8rBlNy3tin8QmoRCM4i4ZLM41VdKbuwD2WKdcy 22Mdu9KKi6taQ5LGH80jAFcqB8hne5zWrGcmq3uAgGKiHZ27jlJNzsFzRI2RSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445260; a=rsa-sha256; cv=none; b=AbI/5OFDtdcV8RFQnIvHw1UUHJ/u5Da6CWStvLrJIH4U8Y7jiIrPIGoY4pir3wGQw0JIcI RYc8NXv8XhM6WeIYB/iLFqeWzEZQD+Lw2/n47o0EznVy42uatnhodNYsmUU09T/GrDiVjK 5qFpvvOIRr6XLe26llb5ZnI09eKqN2TaAzvbD7gMBBlKxcNfB7zZoKceIx9+RqRoWj2oCl sKf27fuU8/x9mQiedzYCXA0KeKc0Jz7S0AEe8LkOEaUp1EszCl5y90vuuwwd7q2uFG/5fy szGFAOmtxd4sg/+pF22e++PwFoROxu7FwDyD7fU85+4ukYR0Yb24Xoqrtz96mw== 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=1742445260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wLX4FfCD/JBnqOlnKlQgsl7ChcQeEv75+b34om3o1Q8=; b=NYOyGCtQBmuhSqXMPNV7R/PnOV3XowJpRiLZgRi/3ttPRhULp9gCBtlpQYcEyWxzHzJjQ4 vZEpQQL3B/f9iRqS8hmu9s/kP44B8oeiFlYEfjxx1h2w9x73GJQm7E1ZGk6EUG6tua6Ku0 IruY+nv/lwm0VCiaKwb9lEw7Bcbfv6vJsogaCHwcr0lRB79md4+x4BvOsvDfBfuHDtuKqG 5Q+N5pZ3Mwj9KNtR9+w5jZSG1DvsfBGO8gJ73dAxsjsfyelaxMcdVrK732v0v21QtORnu/ qBHp1eqwZydSwQYBBiH7h1Eoprs3bGM2Pkc6WTyI3nl9+UDSkVXHMolbPPyR5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCQg5BRkzrGY; Thu, 20 Mar 2025 04:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4YJaJ037142; Thu, 20 Mar 2025 04:34:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4YJGA037139; Thu, 20 Mar 2025 04:34:19 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:34:19 GMT Message-Id: <202503200434.52K4YJGA037139@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: 4c9ffb13dd74 - main - grep: avoid duplicated lines when we're coloring output List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 4c9ffb13dd74159bd3ed7e1c4c706dbd15a70df2 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4c9ffb13dd74159bd3ed7e1c4c706dbd15a70df2 commit 4c9ffb13dd74159bd3ed7e1c4c706dbd15a70df2 Author: Kyle Evans AuthorDate: 2025-03-20 04:34:13 +0000 Commit: Kyle Evans CommitDate: 2025-03-20 04:34:13 +0000 grep: avoid duplicated lines when we're coloring output For the default uncolored output, we'll just output a line once and then move on. For colored output, we'll output multiple matches per line with context from the line interspersed and may end up writing out some match context multiple times as we don't persist which part of the lines have already been printed. Fix it by tracking the length of line printed thus far in printline() and retaining it across successive calls to printline() in the same line. printline() should indicate whether it terminated the line or not to avoid tracking the logic for that in multiple places: -o lines are always terminated, so it's generally only some --color contexts where we wouldn't have terminated. Add a test to make sure that we're only printing one line going forward. Reported and tested by: Jamie Landeg-Jones Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D49324 --- usr.bin/grep/tests/grep_freebsd_test.sh | 15 +++++++ usr.bin/grep/util.c | 72 +++++++++++++++++++++++++++------ 2 files changed, 74 insertions(+), 13 deletions(-) diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh index 77017529843e..906b70645151 100755 --- a/usr.bin/grep/tests/grep_freebsd_test.sh +++ b/usr.bin/grep/tests/grep_freebsd_test.sh @@ -103,10 +103,25 @@ zflag_body() atf_check grep -qz "foo.*bar" in } +atf_test_case color_dupe +color_dupe_body() +{ + + # This assumes a MAX_MATCHES of exactly 32. Previously buggy procline() + # calls would terminate the line premature every MAX_MATCHES matches, + # meaning we'd see the line be output again for the next MAX_MATCHES + # number of matches. + jot -nb 'A' -s '' 33 > in + + atf_check -o save:color.out grep --color=always . in + atf_check -o match:"^ +1 color.out" wc -l color.out +} + atf_init_test_cases() { atf_add_test_case grep_r_implied atf_add_test_case rgrep atf_add_test_case gnuext atf_add_test_case zflag + atf_add_test_case color_dupe } diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c index 4e1c44b442f2..ed87e56956f6 100644 --- a/usr.bin/grep/util.c +++ b/usr.bin/grep/util.c @@ -72,7 +72,7 @@ static int litexec(const struct pat *pat, const char *string, size_t nmatch, regmatch_t pmatch[]); #endif static bool procline(struct parsec *pc); -static void printline(struct parsec *pc, int sep); +static bool printline(struct parsec *pc, int sep, size_t *last_out); static void printline_metadata(struct str *line, int sep); bool @@ -214,15 +214,29 @@ procmatch_match(struct mprintc *mc, struct parsec *pc) /* Print the matching line, but only if not quiet/binary */ if (mc->printmatch) { - printline(pc, ':'); + size_t last_out; + bool terminated; + + last_out = 0; + terminated = printline(pc, ':', &last_out); while (pc->matchidx >= MAX_MATCHES) { /* Reset matchidx and try again */ pc->matchidx = 0; if (procline(pc) == !vflag) - printline(pc, ':'); + terminated = printline(pc, ':', &last_out); else break; } + + /* + * The above loop processes the entire line as long as we keep + * hitting the maximum match count. At this point, we know + * that there's nothing left to be printed and can terminate the + * line. + */ + if (!terminated) + printline(pc, ':', &last_out); + first_match = false; mc->same_file = true; mc->last_outed = 0; @@ -748,26 +762,39 @@ printline_metadata(struct str *line, int sep) } /* - * Prints a matching line according to the command line options. + * Prints a matching line according to the command line options. We need + * *last_out to be populated on entry in case this is just a continuation of + * matches within the same line. + * + * Returns true if the line was terminated, false if it was not. */ -static void -printline(struct parsec *pc, int sep) +static bool +printline(struct parsec *pc, int sep, size_t *last_out) { - size_t a = 0; + size_t a = *last_out; size_t i, matchidx; regmatch_t match; + bool terminated; + + /* + * Nearly all paths below will terminate the line by default, but it is + * avoided in some circumstances in case we don't have the full context + * available here. + */ + terminated = true; /* If matchall, everything matches but don't actually print for -o */ if (oflag && matchall) - return; + return (terminated); matchidx = pc->matchidx; /* --color and -o */ - if ((oflag || color) && matchidx > 0) { + if ((oflag || color) && (pc->printed > 0 || matchidx > 0)) { /* Only print metadata once per line if --color */ - if (!oflag && pc->printed == 0) + if (!oflag && pc->printed == 0) { printline_metadata(&pc->ln, sep); + } for (i = 0; i < matchidx; i++) { match = pc->matches[i]; /* Don't output zero length matches */ @@ -780,9 +807,10 @@ printline(struct parsec *pc, int sep) if (oflag) { pc->ln.boff = match.rm_so; printline_metadata(&pc->ln, sep); - } else + } else { fwrite(pc->ln.dat + a, match.rm_so - a, 1, stdout); + } if (color) fprintf(stdout, "\33[%sm\33[K", color); fwrite(pc->ln.dat + match.rm_so, @@ -793,13 +821,31 @@ printline(struct parsec *pc, int sep) if (oflag) putchar('\n'); } - if (!oflag) { - if (pc->ln.len - a > 0) + + /* + * Don't terminate if we reached the match limit; we may have + * other matches on this line to process. + */ + *last_out = a; + if (!oflag && matchidx != MAX_MATCHES) { + if (pc->ln.len - a > 0) { fwrite(pc->ln.dat + a, pc->ln.len - a, 1, stdout); + *last_out = pc->ln.len; + } putchar('\n'); + } else if (!oflag) { + /* + * -o is terminated on every match output, so this + * branch is only designed to capture MAX_MATCHES in a + * line which may be a signal to us for a lack of + * context. The caller will know more and call us again + * to terminate if it needs to. + */ + terminated = false; } } else grep_printline(&pc->ln, sep); pc->printed++; + return (terminated); } From nobody Thu Mar 20 04:44:32 2025 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 4ZJCfT4tCvz5rGv0; Thu, 20 Mar 2025 04:44: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCfT2pQ1z4Dt4; Thu, 20 Mar 2025 04:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57gRk0JZ+Q9q0ICm4qIL+Rh7listEuRY0/F4F7FtEJc=; b=i0xDyHNRkctJ8YKOrhDcTdRbeAP0tmUOcdG7fd2RdpkOf3AQ0QlDax5vHN9/pF4kzpsSUS mRQQx7+HjK/KcH75QvSVKndCXjEfuuY9WPaX3v3hCiV2mNaC6VDOMIqpt9ydIrofXrSlL7 O1lJhEkBArU0Ycng3rwe/xN4puqmQBgDD837qGPCzyyvfN/ed5f1Xj55bLCXTHnMM/ijT2 cgn3Qw2buwuhJ6iViCcDREoQ8k8WaeGUySthHEz6YCy8oMYBQ96oOM6GWC0f/gmJiDFZWK W+K1gc+tH0NB9SRSg60pmRDv0sUHJlTCZYlj47+dSPmvWQ98RDyDnEZ3Qi+8bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445873; a=rsa-sha256; cv=none; b=eH5W2ibClJzCr++ZdHEb6ag6cXCGkjgxZnBHSgGNWV+vU2bAXRHStQRKDPbAlct63c3d5F GTuMBjeQPU0nrELUKyay3cOrRTE4guFWaybhu19s+Azs4NOwjJDiE5KLjHMVWj4rS4H+r/ 2Z3qLFnid89ZPIQ33S/oKMNMcUYkhtY5dlDhZ6ZMYMejombFCTA3gsol58S6UVxUAmbrOG PJH2CFRglr/xoysokNVJtehlEvkzOqMoYA0EeKQHsuZ6XNPgs48cP4jCpFyQwaGgFPrLMN aDhblSnmD1NE9slDGG0Q/qpTQaThO4Ng6McpRbtgqALEUE7/NmwCx3qJ8CuI1w== 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=1742445873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57gRk0JZ+Q9q0ICm4qIL+Rh7listEuRY0/F4F7FtEJc=; b=UtGHM6PMyLLZBcx+FzSGeE8vrfbnvA1RlaoN09inR+exEWPotaOijQjb97fXin7FgWte2B zJjV2cgj3FBAETRNgXOhVFg3j8GhZ7LB5tU0lxDoFJQ992hKaTMGJn781N/XenmhagRgFe Hhyu+obz/VR1kCUhtKBuicT5ak9OanU7rQK4OHxBVATUYVTUzM3BkNhydXjLL61NH3GKrt 2wYQvqTP2gIbAJVGH8ccXBki23nsx9PUV/mIrm1Y2w44uSrcqDqa+lbp3/ncFVhQJhs/Ul 762mQ94EsUm4ZPgA0oPy5f/l8qpq6HxR0Rem6WRiOPKqEouK0vouG0pJuK6NnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCfT0HtCzr3w; Thu, 20 Mar 2025 04:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4iWO1055464; Thu, 20 Mar 2025 04:44:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4iWFa055461; Thu, 20 Mar 2025 04:44:32 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:44:32 GMT Message-Id: <202503200444.52K4iWFa055461@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: 85242b59d17d - main - libc: tests: fix luacheck warnings in the fortification test generator List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 85242b59d17dcbfbc82afea9d4232006df074210 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=85242b59d17dcbfbc82afea9d4232006df074210 commit 85242b59d17dcbfbc82afea9d4232006df074210 Author: Kyle Evans AuthorDate: 2025-03-20 04:42:57 +0000 Commit: Kyle Evans CommitDate: 2025-03-20 04:44:25 +0000 libc: tests: fix luacheck warnings in the fortification test generator All of these are simple shadowing that don't need to happen; we're passing the shadowed value through in every case anyways, just use it in the closure in a more lua-natural fashion. While we're here, lint the generator every time we generate tests to ensure that we don't regress without having to remember to manually run luacheck. Reported by: jlduran Reviewed by: jlduran, markj Differential Revision: https://reviews.freebsd.org/D49235 --- lib/libc/tests/secure/Makefile | 10 +++++++++- lib/libc/tests/secure/generate-fortify-tests.lua | 12 ++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/libc/tests/secure/Makefile b/lib/libc/tests/secure/Makefile index ccf89afb1ad5..beaa01457cfe 100644 --- a/lib/libc/tests/secure/Makefile +++ b/lib/libc/tests/secure/Makefile @@ -18,10 +18,18 @@ FORTIFY_TCATS+= unistd FORTIFY_TCATS+= wchar # Manually run after updating the test generator. -generate-tests: .PHONY +lint-generator: .PHONY + @if ! which luacheck>/dev/null; then \ + 1>&2 echo "devel/lua-luacheck is required to regenerate and lint these tests"; \ + exit 1; \ + fi + luacheck ${.CURDIR}/generate-fortify-tests.lua + +generate-tests: .PHONY lint-generator .for tcat in ${FORTIFY_TCATS} ATF_TESTS_C+= fortify_${tcat}_test +.ORDER: lint-generator generate-tests-${tcat} generate-tests: generate-tests-${tcat} generate-tests-${tcat}: .PHONY ${.CURDIR}/generate-fortify-tests.lua ${tcat} > ${.CURDIR}/fortify_${tcat}_test.c diff --git a/lib/libc/tests/secure/generate-fortify-tests.lua b/lib/libc/tests/secure/generate-fortify-tests.lua index 0e46b8867862..ef9e0299dd48 100755 --- a/lib/libc/tests/secure/generate-fortify-tests.lua +++ b/lib/libc/tests/secure/generate-fortify-tests.lua @@ -1113,7 +1113,7 @@ local function configurable(def, idx) end local function generate_stackframe(buftype, bufsize, disposition, heap, def) - local function len_offset(inverted, disposition) + local function len_offset(inverted) -- Tests that don't use __len in their arguments may use an -- inverted sense because we can't just specify a length that -- would induce an access just after the end. Instead, we have @@ -1128,7 +1128,7 @@ local function generate_stackframe(buftype, bufsize, disposition, heap, def) end end - local function test_uses_len(def) + local function test_uses_len() if def.uses_len then return true end @@ -1151,8 +1151,8 @@ local function generate_stackframe(buftype, bufsize, disposition, heap, def) local vars = "\tstruct {\n" vars = vars .. "\t\tuint8_t padding_l;\n" - local uses_len = test_uses_len(def) - local bufsize_offset = len_offset(not uses_len, disposition) + local uses_len = test_uses_len() + local bufsize_offset = len_offset(not uses_len) local buftype_elem = array_type(buftype) local size_expr = bufsize @@ -1230,7 +1230,7 @@ local function write_test(fh, func, disposition, heap, def) return end - local function need_addr(buftype) + local function need_addr() return not (buftype:match("%[%]") or buftype:match("%*")) end @@ -1292,7 +1292,7 @@ local function write_test(fh, func, disposition, heap, def) end if arg == "__buf" then - if not heap and need_addr(buftype) then + if not heap and need_addr() then body = body .. "&" end From nobody Thu Mar 20 04:44:34 2025 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 4ZJCfV5K7Sz5rGv3; Thu, 20 Mar 2025 04:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCfV2tRVz4Dyh; Thu, 20 Mar 2025 04:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FY9HXw6v9Z2THM3sqBX7TLw8w8jvlRhT001yCrZvU0s=; b=oBlhrsO6YGcGIs6UTspzNIXNsZPMY3Dub12zZEtgrgNeCYIM2N7QWFrskJ0CkticsimY9X 2t4oQ7SLRD5t0yuGCqHKOr0GRRGM73niqVEC+EL82NrXxzZYXf2jx3jYXdF8c6rAcgfQhC 5QuJiAchwsEUFWmmWcTLyVoF0ubzhC1MldcTIYYt9luHo4qSW2eBGxN1p+YLHJiTPOrNTX JxymidZY5EiM2TsY2Q4pHB94lJQ5w4+hcoCcgL9qO6SJyV9uUQd4yExfGS1Z3JPU2Ri+Jv 4VEkLnIIoYVRPF7LuEB8AvhZ0YIR5QZbDC71yVrqFr4LsZk4RklyUXptefcSbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445874; a=rsa-sha256; cv=none; b=JhkKPzf3dK4ZwZJNMgl5sjXfmRYHe63fzwgV0YicrCs2G0fyHFK/+ww+le5OEbQfszCHNk BYaMWatRYLeYZmTM+d0tkGmGikW+n1QHwpC17LIpcrlUseiLjy3FbojJt2P+otKW3JV5rG nKABR2lHg+nVDowEo/uEyBosoXB0K0rAA82RoZDOvHkm6Q/Ll4qk7lMXnnpjdZTQRl9MFY VEtnyoNjjT/8BvxBRKMl/G8+o6aqEpcvgNFys7ZRAYyM+HkmZ3gyUy9O6vUqX1rFi9T1z5 c/LlSilYgQoC+5D3kEDe1Phx8dfM3O+oe8zS5WnlCO2UHnI3H4fixfsb4wwCRg== 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=1742445874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FY9HXw6v9Z2THM3sqBX7TLw8w8jvlRhT001yCrZvU0s=; b=ZL8h1DSjKvx8nqKrhgdpWynnZUcY4fu2GgbQnG4ZkRk5Y43gcVLdx9FCi97Vo571mmIbX0 kyP3gC36HaAaDdt+ZjxCEVu8Kc3CvQEmAzDcMtRO+NLCKX6wz024uNLTpv05hCLUyuuTS0 BB6uQQ+2PPoEQ9vZsjxrwQbioHAEp8pmvlEG+68MUGR8KfFsabBqel8I6UUTLbnfD0bpMY yaGknWA/a5p1UbhG3Xl9TmQ0JT4I4KCF9qRbm/QtnC2CRZUyLAF3SHjbCUuNsEyxXN4nL5 KpfM5aLJjJirpCZB+uxKO1yQ9M+kxDC8Lrp1H437tBs5YemDCF98hRfqMjoNIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCfV15K9zrSY; Thu, 20 Mar 2025 04:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4iYxg055505; Thu, 20 Mar 2025 04:44:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4iYUW055502; Thu, 20 Mar 2025 04:44:34 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:44:34 GMT Message-Id: <202503200444.52K4iYUW055502@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: 09cdbf042f82 - main - libc: tests: allow fortified test cases to require root List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 09cdbf042f825fc41762b5d5365ad930fec18b99 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=09cdbf042f825fc41762b5d5365ad930fec18b99 commit 09cdbf042f825fc41762b5d5365ad930fec18b99 Author: Kyle Evans AuthorDate: 2025-03-20 04:43:14 +0000 Commit: Kyle Evans CommitDate: 2025-03-20 04:44:25 +0000 libc: tests: allow fortified test cases to require root An upcoming test will require root to create a jail with its own domainname/hostname to avoid external requirements on the test runner as we want to fetch them with valid and plausible sizes. Generate test headers for all cases to reduce churn in future diffs as metadata is added to individual tests, or in case other test options are added to correspond to different metadata to set. Reviewed by: jlduran, markj Differential Revision: https://reviews.freebsd.org/D49236 --- lib/libc/tests/secure/fortify_poll_test.c | 60 ++++- lib/libc/tests/secure/fortify_random_test.c | 25 +- lib/libc/tests/secure/fortify_select_test.c | 90 +++++-- lib/libc/tests/secure/fortify_socket_test.c | 255 ++++++++++++++---- lib/libc/tests/secure/fortify_stdio_test.c | 225 ++++++++++++---- lib/libc/tests/secure/fortify_stdlib_test.c | 50 +++- lib/libc/tests/secure/fortify_string_test.c | 325 ++++++++++++++++++----- lib/libc/tests/secure/fortify_strings_test.c | 75 ++++-- lib/libc/tests/secure/fortify_uio_test.c | 110 ++++++-- lib/libc/tests/secure/fortify_unistd_test.c | 325 ++++++++++++++++++----- lib/libc/tests/secure/fortify_wchar_test.c | 300 ++++++++++++++++----- lib/libc/tests/secure/generate-fortify-tests.lua | 13 +- 12 files changed, 1482 insertions(+), 371 deletions(-) diff --git a/lib/libc/tests/secure/fortify_poll_test.c b/lib/libc/tests/secure/fortify_poll_test.c index dce0b0bb65ea..9a5610cc3f0d 100644 --- a/lib/libc/tests/secure/fortify_poll_test.c +++ b/lib/libc/tests/secure/fortify_poll_test.c @@ -162,7 +162,10 @@ replace_stdin(void) close(fd); } -ATF_TC_WITHOUT_HEAD(poll_before_end); +ATF_TC(poll_before_end); +ATF_TC_HEAD(poll_before_end, tc) +{ +} ATF_TC_BODY(poll_before_end, tc) { #define BUF &__stack.__buf @@ -184,7 +187,10 @@ ATF_TC_BODY(poll_before_end, tc) } -ATF_TC_WITHOUT_HEAD(poll_end); +ATF_TC(poll_end); +ATF_TC_HEAD(poll_end, tc) +{ +} ATF_TC_BODY(poll_end, tc) { #define BUF &__stack.__buf @@ -206,7 +212,10 @@ ATF_TC_BODY(poll_end, tc) } -ATF_TC_WITHOUT_HEAD(poll_after_end); +ATF_TC(poll_after_end); +ATF_TC_HEAD(poll_after_end, tc) +{ +} ATF_TC_BODY(poll_after_end, tc) { #define BUF &__stack.__buf @@ -259,7 +268,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(poll_heap_before_end); +ATF_TC(poll_heap_before_end); +ATF_TC_HEAD(poll_heap_before_end, tc) +{ +} ATF_TC_BODY(poll_heap_before_end, tc) { #define BUF __stack.__buf @@ -282,7 +294,10 @@ ATF_TC_BODY(poll_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(poll_heap_end); +ATF_TC(poll_heap_end); +ATF_TC_HEAD(poll_heap_end, tc) +{ +} ATF_TC_BODY(poll_heap_end, tc) { #define BUF __stack.__buf @@ -305,7 +320,10 @@ ATF_TC_BODY(poll_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(poll_heap_after_end); +ATF_TC(poll_heap_after_end); +ATF_TC_HEAD(poll_heap_after_end, tc) +{ +} ATF_TC_BODY(poll_heap_after_end, tc) { #define BUF __stack.__buf @@ -359,7 +377,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(ppoll_before_end); +ATF_TC(ppoll_before_end); +ATF_TC_HEAD(ppoll_before_end, tc) +{ +} ATF_TC_BODY(ppoll_before_end, tc) { #define BUF &__stack.__buf @@ -382,7 +403,10 @@ ATF_TC_BODY(ppoll_before_end, tc) } -ATF_TC_WITHOUT_HEAD(ppoll_end); +ATF_TC(ppoll_end); +ATF_TC_HEAD(ppoll_end, tc) +{ +} ATF_TC_BODY(ppoll_end, tc) { #define BUF &__stack.__buf @@ -405,7 +429,10 @@ ATF_TC_BODY(ppoll_end, tc) } -ATF_TC_WITHOUT_HEAD(ppoll_after_end); +ATF_TC(ppoll_after_end); +ATF_TC_HEAD(ppoll_after_end, tc) +{ +} ATF_TC_BODY(ppoll_after_end, tc) { #define BUF &__stack.__buf @@ -459,7 +486,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(ppoll_heap_before_end); +ATF_TC(ppoll_heap_before_end); +ATF_TC_HEAD(ppoll_heap_before_end, tc) +{ +} ATF_TC_BODY(ppoll_heap_before_end, tc) { #define BUF __stack.__buf @@ -483,7 +513,10 @@ ATF_TC_BODY(ppoll_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(ppoll_heap_end); +ATF_TC(ppoll_heap_end); +ATF_TC_HEAD(ppoll_heap_end, tc) +{ +} ATF_TC_BODY(ppoll_heap_end, tc) { #define BUF __stack.__buf @@ -507,7 +540,10 @@ ATF_TC_BODY(ppoll_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(ppoll_heap_after_end); +ATF_TC(ppoll_heap_after_end); +ATF_TC_HEAD(ppoll_heap_after_end, tc) +{ +} ATF_TC_BODY(ppoll_heap_after_end, tc) { #define BUF __stack.__buf diff --git a/lib/libc/tests/secure/fortify_random_test.c b/lib/libc/tests/secure/fortify_random_test.c index 7763607dd2ed..41100fe5a5e2 100644 --- a/lib/libc/tests/secure/fortify_random_test.c +++ b/lib/libc/tests/secure/fortify_random_test.c @@ -162,7 +162,10 @@ replace_stdin(void) close(fd); } -ATF_TC_WITHOUT_HEAD(getrandom_before_end); +ATF_TC(getrandom_before_end); +ATF_TC_HEAD(getrandom_before_end, tc) +{ +} ATF_TC_BODY(getrandom_before_end, tc) { #define BUF &__stack.__buf @@ -180,7 +183,10 @@ ATF_TC_BODY(getrandom_before_end, tc) } -ATF_TC_WITHOUT_HEAD(getrandom_end); +ATF_TC(getrandom_end); +ATF_TC_HEAD(getrandom_end, tc) +{ +} ATF_TC_BODY(getrandom_end, tc) { #define BUF &__stack.__buf @@ -198,7 +204,10 @@ ATF_TC_BODY(getrandom_end, tc) } -ATF_TC_WITHOUT_HEAD(getrandom_heap_before_end); +ATF_TC(getrandom_heap_before_end); +ATF_TC_HEAD(getrandom_heap_before_end, tc) +{ +} ATF_TC_BODY(getrandom_heap_before_end, tc) { #define BUF __stack.__buf @@ -218,7 +227,10 @@ ATF_TC_BODY(getrandom_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(getrandom_heap_end); +ATF_TC(getrandom_heap_end); +ATF_TC_HEAD(getrandom_heap_end, tc) +{ +} ATF_TC_BODY(getrandom_heap_end, tc) { #define BUF __stack.__buf @@ -238,7 +250,10 @@ ATF_TC_BODY(getrandom_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(getrandom_heap_after_end); +ATF_TC(getrandom_heap_after_end); +ATF_TC_HEAD(getrandom_heap_after_end, tc) +{ +} ATF_TC_BODY(getrandom_heap_after_end, tc) { #define BUF __stack.__buf diff --git a/lib/libc/tests/secure/fortify_select_test.c b/lib/libc/tests/secure/fortify_select_test.c index dfafac7e4d6d..aff13ccf58d2 100644 --- a/lib/libc/tests/secure/fortify_select_test.c +++ b/lib/libc/tests/secure/fortify_select_test.c @@ -162,7 +162,10 @@ replace_stdin(void) close(fd); } -ATF_TC_WITHOUT_HEAD(FD_SET_before_end); +ATF_TC(FD_SET_before_end); +ATF_TC_HEAD(FD_SET_before_end, tc) +{ +} ATF_TC_BODY(FD_SET_before_end, tc) { #define BUF &__stack.__buf @@ -180,7 +183,10 @@ ATF_TC_BODY(FD_SET_before_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_SET_end); +ATF_TC(FD_SET_end); +ATF_TC_HEAD(FD_SET_end, tc) +{ +} ATF_TC_BODY(FD_SET_end, tc) { #define BUF &__stack.__buf @@ -198,7 +204,10 @@ ATF_TC_BODY(FD_SET_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_SET_after_end); +ATF_TC(FD_SET_after_end); +ATF_TC_HEAD(FD_SET_after_end, tc) +{ +} ATF_TC_BODY(FD_SET_after_end, tc) { #define BUF &__stack.__buf @@ -247,7 +256,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(FD_SET_heap_before_end); +ATF_TC(FD_SET_heap_before_end); +ATF_TC_HEAD(FD_SET_heap_before_end, tc) +{ +} ATF_TC_BODY(FD_SET_heap_before_end, tc) { #define BUF __stack.__buf @@ -267,7 +279,10 @@ ATF_TC_BODY(FD_SET_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_SET_heap_end); +ATF_TC(FD_SET_heap_end); +ATF_TC_HEAD(FD_SET_heap_end, tc) +{ +} ATF_TC_BODY(FD_SET_heap_end, tc) { #define BUF __stack.__buf @@ -287,7 +302,10 @@ ATF_TC_BODY(FD_SET_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_SET_heap_after_end); +ATF_TC(FD_SET_heap_after_end); +ATF_TC_HEAD(FD_SET_heap_after_end, tc) +{ +} ATF_TC_BODY(FD_SET_heap_after_end, tc) { #define BUF __stack.__buf @@ -338,7 +356,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(FD_CLR_before_end); +ATF_TC(FD_CLR_before_end); +ATF_TC_HEAD(FD_CLR_before_end, tc) +{ +} ATF_TC_BODY(FD_CLR_before_end, tc) { #define BUF &__stack.__buf @@ -356,7 +377,10 @@ ATF_TC_BODY(FD_CLR_before_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_CLR_end); +ATF_TC(FD_CLR_end); +ATF_TC_HEAD(FD_CLR_end, tc) +{ +} ATF_TC_BODY(FD_CLR_end, tc) { #define BUF &__stack.__buf @@ -374,7 +398,10 @@ ATF_TC_BODY(FD_CLR_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_CLR_after_end); +ATF_TC(FD_CLR_after_end); +ATF_TC_HEAD(FD_CLR_after_end, tc) +{ +} ATF_TC_BODY(FD_CLR_after_end, tc) { #define BUF &__stack.__buf @@ -423,7 +450,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(FD_CLR_heap_before_end); +ATF_TC(FD_CLR_heap_before_end); +ATF_TC_HEAD(FD_CLR_heap_before_end, tc) +{ +} ATF_TC_BODY(FD_CLR_heap_before_end, tc) { #define BUF __stack.__buf @@ -443,7 +473,10 @@ ATF_TC_BODY(FD_CLR_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_CLR_heap_end); +ATF_TC(FD_CLR_heap_end); +ATF_TC_HEAD(FD_CLR_heap_end, tc) +{ +} ATF_TC_BODY(FD_CLR_heap_end, tc) { #define BUF __stack.__buf @@ -463,7 +496,10 @@ ATF_TC_BODY(FD_CLR_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_CLR_heap_after_end); +ATF_TC(FD_CLR_heap_after_end); +ATF_TC_HEAD(FD_CLR_heap_after_end, tc) +{ +} ATF_TC_BODY(FD_CLR_heap_after_end, tc) { #define BUF __stack.__buf @@ -514,7 +550,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(FD_ISSET_before_end); +ATF_TC(FD_ISSET_before_end); +ATF_TC_HEAD(FD_ISSET_before_end, tc) +{ +} ATF_TC_BODY(FD_ISSET_before_end, tc) { #define BUF &__stack.__buf @@ -532,7 +571,10 @@ ATF_TC_BODY(FD_ISSET_before_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_ISSET_end); +ATF_TC(FD_ISSET_end); +ATF_TC_HEAD(FD_ISSET_end, tc) +{ +} ATF_TC_BODY(FD_ISSET_end, tc) { #define BUF &__stack.__buf @@ -550,7 +592,10 @@ ATF_TC_BODY(FD_ISSET_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_ISSET_after_end); +ATF_TC(FD_ISSET_after_end); +ATF_TC_HEAD(FD_ISSET_after_end, tc) +{ +} ATF_TC_BODY(FD_ISSET_after_end, tc) { #define BUF &__stack.__buf @@ -599,7 +644,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(FD_ISSET_heap_before_end); +ATF_TC(FD_ISSET_heap_before_end); +ATF_TC_HEAD(FD_ISSET_heap_before_end, tc) +{ +} ATF_TC_BODY(FD_ISSET_heap_before_end, tc) { #define BUF __stack.__buf @@ -619,7 +667,10 @@ ATF_TC_BODY(FD_ISSET_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_ISSET_heap_end); +ATF_TC(FD_ISSET_heap_end); +ATF_TC_HEAD(FD_ISSET_heap_end, tc) +{ +} ATF_TC_BODY(FD_ISSET_heap_end, tc) { #define BUF __stack.__buf @@ -639,7 +690,10 @@ ATF_TC_BODY(FD_ISSET_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_ISSET_heap_after_end); +ATF_TC(FD_ISSET_heap_after_end); +ATF_TC_HEAD(FD_ISSET_heap_after_end, tc) +{ +} ATF_TC_BODY(FD_ISSET_heap_after_end, tc) { #define BUF __stack.__buf diff --git a/lib/libc/tests/secure/fortify_socket_test.c b/lib/libc/tests/secure/fortify_socket_test.c index a2125d60fc2d..1f0b0f144f40 100644 --- a/lib/libc/tests/secure/fortify_socket_test.c +++ b/lib/libc/tests/secure/fortify_socket_test.c @@ -162,7 +162,10 @@ replace_stdin(void) close(fd); } -ATF_TC_WITHOUT_HEAD(getpeername_before_end); +ATF_TC(getpeername_before_end); +ATF_TC_HEAD(getpeername_before_end, tc) +{ +} ATF_TC_BODY(getpeername_before_end, tc) { #define BUF &__stack.__buf @@ -184,7 +187,10 @@ ATF_TC_BODY(getpeername_before_end, tc) } -ATF_TC_WITHOUT_HEAD(getpeername_end); +ATF_TC(getpeername_end); +ATF_TC_HEAD(getpeername_end, tc) +{ +} ATF_TC_BODY(getpeername_end, tc) { #define BUF &__stack.__buf @@ -206,7 +212,10 @@ ATF_TC_BODY(getpeername_end, tc) } -ATF_TC_WITHOUT_HEAD(getpeername_heap_before_end); +ATF_TC(getpeername_heap_before_end); +ATF_TC_HEAD(getpeername_heap_before_end, tc) +{ +} ATF_TC_BODY(getpeername_heap_before_end, tc) { #define BUF __stack.__buf @@ -229,7 +238,10 @@ ATF_TC_BODY(getpeername_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(getpeername_heap_end); +ATF_TC(getpeername_heap_end); +ATF_TC_HEAD(getpeername_heap_end, tc) +{ +} ATF_TC_BODY(getpeername_heap_end, tc) { #define BUF __stack.__buf @@ -252,7 +264,10 @@ ATF_TC_BODY(getpeername_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(getpeername_heap_after_end); +ATF_TC(getpeername_heap_after_end); +ATF_TC_HEAD(getpeername_heap_after_end, tc) +{ +} ATF_TC_BODY(getpeername_heap_after_end, tc) { #define BUF __stack.__buf @@ -306,7 +321,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(getsockname_before_end); +ATF_TC(getsockname_before_end); +ATF_TC_HEAD(getsockname_before_end, tc) +{ +} ATF_TC_BODY(getsockname_before_end, tc) { #define BUF &__stack.__buf @@ -328,7 +346,10 @@ ATF_TC_BODY(getsockname_before_end, tc) } -ATF_TC_WITHOUT_HEAD(getsockname_end); +ATF_TC(getsockname_end); +ATF_TC_HEAD(getsockname_end, tc) +{ +} ATF_TC_BODY(getsockname_end, tc) { #define BUF &__stack.__buf @@ -350,7 +371,10 @@ ATF_TC_BODY(getsockname_end, tc) } -ATF_TC_WITHOUT_HEAD(getsockname_heap_before_end); +ATF_TC(getsockname_heap_before_end); +ATF_TC_HEAD(getsockname_heap_before_end, tc) +{ +} ATF_TC_BODY(getsockname_heap_before_end, tc) { #define BUF __stack.__buf @@ -373,7 +397,10 @@ ATF_TC_BODY(getsockname_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(getsockname_heap_end); +ATF_TC(getsockname_heap_end); +ATF_TC_HEAD(getsockname_heap_end, tc) +{ +} ATF_TC_BODY(getsockname_heap_end, tc) { #define BUF __stack.__buf @@ -396,7 +423,10 @@ ATF_TC_BODY(getsockname_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(getsockname_heap_after_end); +ATF_TC(getsockname_heap_after_end); +ATF_TC_HEAD(getsockname_heap_after_end, tc) +{ +} ATF_TC_BODY(getsockname_heap_after_end, tc) { #define BUF __stack.__buf @@ -450,7 +480,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recv_before_end); +ATF_TC(recv_before_end); +ATF_TC_HEAD(recv_before_end, tc) +{ +} ATF_TC_BODY(recv_before_end, tc) { #define BUF &__stack.__buf @@ -471,7 +504,10 @@ ATF_TC_BODY(recv_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recv_end); +ATF_TC(recv_end); +ATF_TC_HEAD(recv_end, tc) +{ +} ATF_TC_BODY(recv_end, tc) { #define BUF &__stack.__buf @@ -492,7 +528,10 @@ ATF_TC_BODY(recv_end, tc) } -ATF_TC_WITHOUT_HEAD(recv_heap_before_end); +ATF_TC(recv_heap_before_end); +ATF_TC_HEAD(recv_heap_before_end, tc) +{ +} ATF_TC_BODY(recv_heap_before_end, tc) { #define BUF __stack.__buf @@ -514,7 +553,10 @@ ATF_TC_BODY(recv_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recv_heap_end); +ATF_TC(recv_heap_end); +ATF_TC_HEAD(recv_heap_end, tc) +{ +} ATF_TC_BODY(recv_heap_end, tc) { #define BUF __stack.__buf @@ -536,7 +578,10 @@ ATF_TC_BODY(recv_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(recv_heap_after_end); +ATF_TC(recv_heap_after_end); +ATF_TC_HEAD(recv_heap_after_end, tc) +{ +} ATF_TC_BODY(recv_heap_after_end, tc) { #define BUF __stack.__buf @@ -589,7 +634,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recvfrom_before_end); +ATF_TC(recvfrom_before_end); +ATF_TC_HEAD(recvfrom_before_end, tc) +{ +} ATF_TC_BODY(recvfrom_before_end, tc) { #define BUF &__stack.__buf @@ -610,7 +658,10 @@ ATF_TC_BODY(recvfrom_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_end); +ATF_TC(recvfrom_end); +ATF_TC_HEAD(recvfrom_end, tc) +{ +} ATF_TC_BODY(recvfrom_end, tc) { #define BUF &__stack.__buf @@ -631,7 +682,10 @@ ATF_TC_BODY(recvfrom_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_heap_before_end); +ATF_TC(recvfrom_heap_before_end); +ATF_TC_HEAD(recvfrom_heap_before_end, tc) +{ +} ATF_TC_BODY(recvfrom_heap_before_end, tc) { #define BUF __stack.__buf @@ -653,7 +707,10 @@ ATF_TC_BODY(recvfrom_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_heap_end); +ATF_TC(recvfrom_heap_end); +ATF_TC_HEAD(recvfrom_heap_end, tc) +{ +} ATF_TC_BODY(recvfrom_heap_end, tc) { #define BUF __stack.__buf @@ -675,7 +732,10 @@ ATF_TC_BODY(recvfrom_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_heap_after_end); +ATF_TC(recvfrom_heap_after_end); +ATF_TC_HEAD(recvfrom_heap_after_end, tc) +{ +} ATF_TC_BODY(recvfrom_heap_after_end, tc) { #define BUF __stack.__buf @@ -728,7 +788,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_before_end); +ATF_TC(recvfrom_sockaddr_before_end); +ATF_TC_HEAD(recvfrom_sockaddr_before_end, tc) +{ +} ATF_TC_BODY(recvfrom_sockaddr_before_end, tc) { #define BUF &__stack.__buf @@ -752,7 +815,10 @@ ATF_TC_BODY(recvfrom_sockaddr_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_end); +ATF_TC(recvfrom_sockaddr_end); +ATF_TC_HEAD(recvfrom_sockaddr_end, tc) +{ +} ATF_TC_BODY(recvfrom_sockaddr_end, tc) { #define BUF &__stack.__buf @@ -776,7 +842,10 @@ ATF_TC_BODY(recvfrom_sockaddr_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_heap_before_end); +ATF_TC(recvfrom_sockaddr_heap_before_end); +ATF_TC_HEAD(recvfrom_sockaddr_heap_before_end, tc) +{ +} ATF_TC_BODY(recvfrom_sockaddr_heap_before_end, tc) { #define BUF __stack.__buf @@ -801,7 +870,10 @@ ATF_TC_BODY(recvfrom_sockaddr_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_heap_end); +ATF_TC(recvfrom_sockaddr_heap_end); +ATF_TC_HEAD(recvfrom_sockaddr_heap_end, tc) +{ +} ATF_TC_BODY(recvfrom_sockaddr_heap_end, tc) { #define BUF __stack.__buf @@ -826,7 +898,10 @@ ATF_TC_BODY(recvfrom_sockaddr_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_heap_after_end); +ATF_TC(recvfrom_sockaddr_heap_after_end); +ATF_TC_HEAD(recvfrom_sockaddr_heap_after_end, tc) +{ +} ATF_TC_BODY(recvfrom_sockaddr_heap_after_end, tc) { #define BUF __stack.__buf @@ -882,7 +957,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_before_end); +ATF_TC(recvmsg_msg_name_before_end); +ATF_TC_HEAD(recvmsg_msg_name_before_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_name_before_end, tc) { #define BUF &__stack.__buf @@ -906,7 +984,10 @@ ATF_TC_BODY(recvmsg_msg_name_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_end); +ATF_TC(recvmsg_msg_name_end); +ATF_TC_HEAD(recvmsg_msg_name_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_name_end, tc) { #define BUF &__stack.__buf @@ -930,7 +1011,10 @@ ATF_TC_BODY(recvmsg_msg_name_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_heap_before_end); +ATF_TC(recvmsg_msg_name_heap_before_end); +ATF_TC_HEAD(recvmsg_msg_name_heap_before_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_name_heap_before_end, tc) { #define BUF __stack.__buf @@ -955,7 +1039,10 @@ ATF_TC_BODY(recvmsg_msg_name_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_heap_end); +ATF_TC(recvmsg_msg_name_heap_end); +ATF_TC_HEAD(recvmsg_msg_name_heap_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_name_heap_end, tc) { #define BUF __stack.__buf @@ -980,7 +1067,10 @@ ATF_TC_BODY(recvmsg_msg_name_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_heap_after_end); +ATF_TC(recvmsg_msg_name_heap_after_end); +ATF_TC_HEAD(recvmsg_msg_name_heap_after_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_name_heap_after_end, tc) { #define BUF __stack.__buf @@ -1036,7 +1126,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_before_end); +ATF_TC(recvmsg_msg_iov_before_end); +ATF_TC_HEAD(recvmsg_msg_iov_before_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_iov_before_end, tc) { #define BUF &__stack.__buf @@ -1070,7 +1163,10 @@ ATF_TC_BODY(recvmsg_msg_iov_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_end); +ATF_TC(recvmsg_msg_iov_end); +ATF_TC_HEAD(recvmsg_msg_iov_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_iov_end, tc) { #define BUF &__stack.__buf @@ -1104,7 +1200,10 @@ ATF_TC_BODY(recvmsg_msg_iov_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_heap_before_end); +ATF_TC(recvmsg_msg_iov_heap_before_end); +ATF_TC_HEAD(recvmsg_msg_iov_heap_before_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_iov_heap_before_end, tc) { #define BUF __stack.__buf @@ -1139,7 +1238,10 @@ ATF_TC_BODY(recvmsg_msg_iov_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_heap_end); +ATF_TC(recvmsg_msg_iov_heap_end); +ATF_TC_HEAD(recvmsg_msg_iov_heap_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_iov_heap_end, tc) { #define BUF __stack.__buf @@ -1174,7 +1276,10 @@ ATF_TC_BODY(recvmsg_msg_iov_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_heap_after_end); +ATF_TC(recvmsg_msg_iov_heap_after_end); +ATF_TC_HEAD(recvmsg_msg_iov_heap_after_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_iov_heap_after_end, tc) { #define BUF __stack.__buf @@ -1240,7 +1345,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_before_end); +ATF_TC(recvmsg_msg_control_before_end); +ATF_TC_HEAD(recvmsg_msg_control_before_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_control_before_end, tc) { #define BUF &__stack.__buf @@ -1265,7 +1373,10 @@ ATF_TC_BODY(recvmsg_msg_control_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_end); +ATF_TC(recvmsg_msg_control_end); +ATF_TC_HEAD(recvmsg_msg_control_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_control_end, tc) { #define BUF &__stack.__buf @@ -1290,7 +1401,10 @@ ATF_TC_BODY(recvmsg_msg_control_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_heap_before_end); +ATF_TC(recvmsg_msg_control_heap_before_end); +ATF_TC_HEAD(recvmsg_msg_control_heap_before_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_control_heap_before_end, tc) { #define BUF __stack.__buf @@ -1316,7 +1430,10 @@ ATF_TC_BODY(recvmsg_msg_control_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_heap_end); +ATF_TC(recvmsg_msg_control_heap_end); +ATF_TC_HEAD(recvmsg_msg_control_heap_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_control_heap_end, tc) { #define BUF __stack.__buf @@ -1342,7 +1459,10 @@ ATF_TC_BODY(recvmsg_msg_control_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_heap_after_end); +ATF_TC(recvmsg_msg_control_heap_after_end); +ATF_TC_HEAD(recvmsg_msg_control_heap_after_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_control_heap_after_end, tc) { #define BUF __stack.__buf @@ -1399,7 +1519,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recvmmsg_msgvec_before_end); +ATF_TC(recvmmsg_msgvec_before_end); +ATF_TC_HEAD(recvmmsg_msgvec_before_end, tc) +{ +} ATF_TC_BODY(recvmmsg_msgvec_before_end, tc) { #define BUF &__stack.__buf @@ -1418,7 +1541,10 @@ ATF_TC_BODY(recvmmsg_msgvec_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmmsg_msgvec_end); +ATF_TC(recvmmsg_msgvec_end); +ATF_TC_HEAD(recvmmsg_msgvec_end, tc) +{ +} ATF_TC_BODY(recvmmsg_msgvec_end, tc) { #define BUF &__stack.__buf @@ -1437,7 +1563,10 @@ ATF_TC_BODY(recvmmsg_msgvec_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmmsg_msgvec_after_end); +ATF_TC(recvmmsg_msgvec_after_end); +ATF_TC_HEAD(recvmmsg_msgvec_after_end, tc) +{ +} *** 3542 LINES SKIPPED *** From nobody Thu Mar 20 04:44:35 2025 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 4ZJCfX4G87z5rHD4; Thu, 20 Mar 2025 04:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCfW3bDQz4Dhq; Thu, 20 Mar 2025 04:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a1tg867hpKZ+0uer384HxbkDTfhAM8mmLbohPrlzzGY=; b=hJpeO7J/sz8XmXd02lF02Ym8595bsaVNJzL27xk0numNHTEn37D2wC+etVxbSDxoPeakVG hYlOquK0CbMgoyur9mux3s0Lm8yuprZeI+buucuYBPoIib5eUsTJdjYGQi8I/n4MLWK6zJ tuma2WVh3nXkeku7JHQehzbMgZtN1c1eEk0fPYOE7aq9kQIpZzeFYmBUQho2RdukXfaSQ/ 8LbEn4skQule9HYgWdM+I/6eNxzutKAsDbMava0hIrj0CjRjIitq12as+UEJmFdfpz0pDA +tORXGlULd0pU0N7XWS6kkM6xPWgsdvCxR/NTlBEPQZ/mNqaAgzv1CwQYO/E8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445875; a=rsa-sha256; cv=none; b=jl8wJatwWzHHHxNshwOyuvmesGO+cdY681EvymD8JTsVJSHViadJiFNvO+TN0ydrVjE1Rc Bjttf/pgsHFGq9x3pSxxmDHq9V257Hp+rzSjaHfH4TtM/oxRPebSQaPlvNLeLajuRmVOsQ jLQpu0NvYQQyhW12Bpl4p9hE/oOeTcIe65M/xzljhxxfkxFgv7vbNu9qQPragj7atNTgUc nT8YeYAvQO5aF0ULXeTmDn7IBUmRO9t8bVEbJx9F2W3tM7dD/NpjEolsBIzuAoLDBpxwlE MB0r5UMs5P/fNb7bjomEgcJhi/YQ2i5lDMzHPWhPnO82X6Sy3L1zlN5qhNTUDw== 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=1742445875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a1tg867hpKZ+0uer384HxbkDTfhAM8mmLbohPrlzzGY=; b=Kms4ZY7uuakWEu9tdZp1Hx876qxhU1L9zagNNCjAcRPw9yNDzOKdZC0THFMftmSChUaZ12 E0Voxkw9FY015pjUSingnK1YTF5CAX+FrEyR83ZUDvozQ0qEMTTynUyhVprBkaUX4V41ne +/kU+J3vZCR6zaTaOCtK7j8UU/pLVOdj3k+u0hbRe3dNP97pspLK9rc5HH65gUhyI8qyPI d4gCJjsWQ5vXJ85G1UwpPyV+KWbMwQTPuFL4oWnJchNo2ooz0FabALYFQlR9xNTlvTILYs c9WNpK8zavqENfzqTp4XkMfXSiXSapk4aZ9xPFF5yAgyvUTP5RRdvcF+zCw2cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCfW2lSwzrSZ; Thu, 20 Mar 2025 04:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4iZOB055539; Thu, 20 Mar 2025 04:44:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4iZuR055536; Thu, 20 Mar 2025 04:44:35 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:44:35 GMT Message-Id: <202503200444.52K4iZuR055536@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: 22178cb29f03 - main - libc: tests: fix the gethostname() and getdomainname() tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 22178cb29f03a3b7bf919f3605e0cd5d6b18fa0a Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=22178cb29f03a3b7bf919f3605e0cd5d6b18fa0a commit 22178cb29f03a3b7bf919f3605e0cd5d6b18fa0a Author: Kyle Evans AuthorDate: 2025-03-20 04:43:23 +0000 Commit: Kyle Evans CommitDate: 2025-03-20 04:44:26 +0000 libc: tests: fix the gethostname() and getdomainname() tests Instead of relying on any particular domainname and hostname to succeed, spin up a jail before we execute the test with them set to some known, fixed values. This allows them to be meaningfully tested -- previously, they were skipped much more often than not. Reported by: jlduran Reviewed by: jlduran, markj Differential Revision: https://reviews.freebsd.org/D49237 --- lib/libc/tests/secure/fortify_poll_test.c | 1 + lib/libc/tests/secure/fortify_random_test.c | 1 + lib/libc/tests/secure/fortify_select_test.c | 1 + lib/libc/tests/secure/fortify_socket_test.c | 1 + lib/libc/tests/secure/fortify_stdio_test.c | 1 + lib/libc/tests/secure/fortify_stdlib_test.c | 1 + lib/libc/tests/secure/fortify_string_test.c | 1 + lib/libc/tests/secure/fortify_strings_test.c | 1 + lib/libc/tests/secure/fortify_uio_test.c | 1 + lib/libc/tests/secure/fortify_unistd_test.c | 137 ++++++++++------------- lib/libc/tests/secure/fortify_wchar_test.c | 1 + lib/libc/tests/secure/generate-fortify-tests.lua | 54 ++++++--- 12 files changed, 109 insertions(+), 92 deletions(-) diff --git a/lib/libc/tests/secure/fortify_poll_test.c b/lib/libc/tests/secure/fortify_poll_test.c index 9a5610cc3f0d..3810c16c122f 100644 --- a/lib/libc/tests/secure/fortify_poll_test.c +++ b/lib/libc/tests/secure/fortify_poll_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_random_test.c b/lib/libc/tests/secure/fortify_random_test.c index 41100fe5a5e2..2f47c981b5ae 100644 --- a/lib/libc/tests/secure/fortify_random_test.c +++ b/lib/libc/tests/secure/fortify_random_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_select_test.c b/lib/libc/tests/secure/fortify_select_test.c index aff13ccf58d2..5ee97a352e2e 100644 --- a/lib/libc/tests/secure/fortify_select_test.c +++ b/lib/libc/tests/secure/fortify_select_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_socket_test.c b/lib/libc/tests/secure/fortify_socket_test.c index 1f0b0f144f40..3d2dc86f4e1c 100644 --- a/lib/libc/tests/secure/fortify_socket_test.c +++ b/lib/libc/tests/secure/fortify_socket_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_stdio_test.c b/lib/libc/tests/secure/fortify_stdio_test.c index 82f45b827411..17842393a740 100644 --- a/lib/libc/tests/secure/fortify_stdio_test.c +++ b/lib/libc/tests/secure/fortify_stdio_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_stdlib_test.c b/lib/libc/tests/secure/fortify_stdlib_test.c index 01ed3e72172a..ae021e8418f7 100644 --- a/lib/libc/tests/secure/fortify_stdlib_test.c +++ b/lib/libc/tests/secure/fortify_stdlib_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_string_test.c b/lib/libc/tests/secure/fortify_string_test.c index 17dec871b32c..cfea261ff66f 100644 --- a/lib/libc/tests/secure/fortify_string_test.c +++ b/lib/libc/tests/secure/fortify_string_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_strings_test.c b/lib/libc/tests/secure/fortify_strings_test.c index 4ad5d58c5300..9f7d37a2480e 100644 --- a/lib/libc/tests/secure/fortify_strings_test.c +++ b/lib/libc/tests/secure/fortify_strings_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_uio_test.c b/lib/libc/tests/secure/fortify_uio_test.c index 5f12ffc08e1d..46b46ed2f7df 100644 --- a/lib/libc/tests/secure/fortify_uio_test.c +++ b/lib/libc/tests/secure/fortify_uio_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_unistd_test.c b/lib/libc/tests/secure/fortify_unistd_test.c index b3880dc4f369..b12ef2bbb8ea 100644 --- a/lib/libc/tests/secure/fortify_unistd_test.c +++ b/lib/libc/tests/secure/fortify_unistd_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include @@ -162,6 +163,27 @@ replace_stdin(void) close(fd); } +#define JAIL_HOSTNAME "host.example.com" +#define JAIL_DOMAINNAME "example.com" +static void +dhost_jail(void) +{ + struct iovec iov[4]; + int jid; + + iov[0].iov_base = __DECONST(char *, "host.hostname"); + iov[0].iov_len = sizeof("host.hostname"); + iov[1].iov_base = __DECONST(char *, JAIL_HOSTNAME); + iov[1].iov_len = sizeof(JAIL_HOSTNAME); + iov[2].iov_base = __DECONST(char *, "host.domainname"); + iov[2].iov_len = sizeof("host.domainname"); + iov[3].iov_base = __DECONST(char *, JAIL_DOMAINNAME); + iov[3].iov_len = sizeof(JAIL_DOMAINNAME); + + jid = jail_set(iov, nitems(iov), JAIL_CREATE | JAIL_ATTACH); + ATF_REQUIRE_MSG(jid > 0, "Jail creation failed: %s", strerror(errno)); +} + ATF_TC(getcwd_before_end); ATF_TC_HEAD(getcwd_before_end, tc) { @@ -1354,24 +1376,21 @@ monitor: ATF_TC(getdomainname_before_end); ATF_TC_HEAD(getdomainname_before_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(getdomainname_before_end, tc) { #define BUF &__stack.__buf struct { uint8_t padding_l; - unsigned char __buf[4]; + unsigned char __buf[12]; uint8_t padding_r; } __stack; const size_t __bufsz __unused = sizeof(__stack.__buf); - const size_t __len = 4 - 1; + const size_t __len = 12 - 1; const size_t __idx __unused = __len - 1; - char sysdomain[256]; - - (void)getdomainname(sysdomain, __len); - if (strlen(sysdomain) <= __len) - atf_tc_skip("domain name too short for testing"); + dhost_jail(); getdomainname(__stack.__buf, __len); #undef BUF @@ -1380,24 +1399,21 @@ ATF_TC_BODY(getdomainname_before_end, tc) ATF_TC(getdomainname_end); ATF_TC_HEAD(getdomainname_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(getdomainname_end, tc) { #define BUF &__stack.__buf struct { uint8_t padding_l; - unsigned char __buf[4]; + unsigned char __buf[12]; uint8_t padding_r; } __stack; const size_t __bufsz __unused = sizeof(__stack.__buf); - const size_t __len = 4; + const size_t __len = 12; const size_t __idx __unused = __len - 1; - char sysdomain[256]; - - (void)getdomainname(sysdomain, __len); - if (strlen(sysdomain) <= __len) - atf_tc_skip("domain name too short for testing"); + dhost_jail(); getdomainname(__stack.__buf, __len); #undef BUF @@ -1406,6 +1422,7 @@ ATF_TC_BODY(getdomainname_end, tc) ATF_TC(getdomainname_heap_before_end); ATF_TC_HEAD(getdomainname_heap_before_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(getdomainname_heap_before_end, tc) { @@ -1415,15 +1432,11 @@ ATF_TC_BODY(getdomainname_heap_before_end, tc) unsigned char * __buf; uint8_t padding_r; } __stack; - const size_t __bufsz __unused = sizeof(*__stack.__buf) * (4); - const size_t __len = 4 - 1; + const size_t __bufsz __unused = sizeof(*__stack.__buf) * (12); + const size_t __len = 12 - 1; const size_t __idx __unused = __len - 1; - char sysdomain[256]; - - (void)getdomainname(sysdomain, __len); - if (strlen(sysdomain) <= __len) - atf_tc_skip("domain name too short for testing"); + dhost_jail(); __stack.__buf = malloc(__bufsz); getdomainname(__stack.__buf, __len); @@ -1434,6 +1447,7 @@ ATF_TC_BODY(getdomainname_heap_before_end, tc) ATF_TC(getdomainname_heap_end); ATF_TC_HEAD(getdomainname_heap_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(getdomainname_heap_end, tc) { @@ -1443,15 +1457,11 @@ ATF_TC_BODY(getdomainname_heap_end, tc) unsigned char * __buf; uint8_t padding_r; } __stack; - const size_t __bufsz __unused = sizeof(*__stack.__buf) * (4); - const size_t __len = 4; + const size_t __bufsz __unused = sizeof(*__stack.__buf) * (12); + const size_t __len = 12; const size_t __idx __unused = __len - 1; - char sysdomain[256]; - - (void)getdomainname(sysdomain, __len); - if (strlen(sysdomain) <= __len) - atf_tc_skip("domain name too short for testing"); + dhost_jail(); __stack.__buf = malloc(__bufsz); getdomainname(__stack.__buf, __len); @@ -1462,6 +1472,7 @@ ATF_TC_BODY(getdomainname_heap_end, tc) ATF_TC(getdomainname_heap_after_end); ATF_TC_HEAD(getdomainname_heap_after_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(getdomainname_heap_after_end, tc) { @@ -1471,17 +1482,13 @@ ATF_TC_BODY(getdomainname_heap_after_end, tc) unsigned char * __buf; uint8_t padding_r; } __stack; - const size_t __bufsz __unused = sizeof(*__stack.__buf) * (4); - const size_t __len = 4 + 1; + const size_t __bufsz __unused = sizeof(*__stack.__buf) * (12); + const size_t __len = 12 + 1; const size_t __idx __unused = __len - 1; pid_t __child; int __status; - char sysdomain[256]; - - (void)getdomainname(sysdomain, __len); - if (strlen(sysdomain) <= __len) - atf_tc_skip("domain name too short for testing"); + dhost_jail(); __child = fork(); ATF_REQUIRE(__child >= 0); if (__child > 0) @@ -1663,25 +1670,21 @@ monitor: ATF_TC(gethostname_before_end); ATF_TC_HEAD(gethostname_before_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(gethostname_before_end, tc) { #define BUF &__stack.__buf struct { uint8_t padding_l; - unsigned char __buf[4]; + unsigned char __buf[17]; uint8_t padding_r; } __stack; const size_t __bufsz __unused = sizeof(__stack.__buf); - const size_t __len = 4 - 1; + const size_t __len = 17 - 1; const size_t __idx __unused = __len - 1; - char syshost[256]; - int error; - - error = gethostname(syshost, __len); - if (error != 0 || strlen(syshost) <= __len) - atf_tc_skip("hostname too short for testing"); + dhost_jail(); gethostname(__stack.__buf, __len); #undef BUF @@ -1690,25 +1693,21 @@ ATF_TC_BODY(gethostname_before_end, tc) ATF_TC(gethostname_end); ATF_TC_HEAD(gethostname_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(gethostname_end, tc) { #define BUF &__stack.__buf struct { uint8_t padding_l; - unsigned char __buf[4]; + unsigned char __buf[17]; uint8_t padding_r; } __stack; const size_t __bufsz __unused = sizeof(__stack.__buf); - const size_t __len = 4; + const size_t __len = 17; const size_t __idx __unused = __len - 1; - char syshost[256]; - int error; - - error = gethostname(syshost, __len); - if (error != 0 || strlen(syshost) <= __len) - atf_tc_skip("hostname too short for testing"); + dhost_jail(); gethostname(__stack.__buf, __len); #undef BUF @@ -1717,6 +1716,7 @@ ATF_TC_BODY(gethostname_end, tc) ATF_TC(gethostname_heap_before_end); ATF_TC_HEAD(gethostname_heap_before_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(gethostname_heap_before_end, tc) { @@ -1726,16 +1726,11 @@ ATF_TC_BODY(gethostname_heap_before_end, tc) unsigned char * __buf; uint8_t padding_r; } __stack; - const size_t __bufsz __unused = sizeof(*__stack.__buf) * (4); - const size_t __len = 4 - 1; + const size_t __bufsz __unused = sizeof(*__stack.__buf) * (17); + const size_t __len = 17 - 1; const size_t __idx __unused = __len - 1; - char syshost[256]; - int error; - - error = gethostname(syshost, __len); - if (error != 0 || strlen(syshost) <= __len) - atf_tc_skip("hostname too short for testing"); + dhost_jail(); __stack.__buf = malloc(__bufsz); gethostname(__stack.__buf, __len); @@ -1746,6 +1741,7 @@ ATF_TC_BODY(gethostname_heap_before_end, tc) ATF_TC(gethostname_heap_end); ATF_TC_HEAD(gethostname_heap_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(gethostname_heap_end, tc) { @@ -1755,16 +1751,11 @@ ATF_TC_BODY(gethostname_heap_end, tc) unsigned char * __buf; uint8_t padding_r; } __stack; - const size_t __bufsz __unused = sizeof(*__stack.__buf) * (4); - const size_t __len = 4; + const size_t __bufsz __unused = sizeof(*__stack.__buf) * (17); + const size_t __len = 17; const size_t __idx __unused = __len - 1; - char syshost[256]; - int error; - - error = gethostname(syshost, __len); - if (error != 0 || strlen(syshost) <= __len) - atf_tc_skip("hostname too short for testing"); + dhost_jail(); __stack.__buf = malloc(__bufsz); gethostname(__stack.__buf, __len); @@ -1775,6 +1766,7 @@ ATF_TC_BODY(gethostname_heap_end, tc) ATF_TC(gethostname_heap_after_end); ATF_TC_HEAD(gethostname_heap_after_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(gethostname_heap_after_end, tc) { @@ -1784,18 +1776,13 @@ ATF_TC_BODY(gethostname_heap_after_end, tc) unsigned char * __buf; uint8_t padding_r; } __stack; - const size_t __bufsz __unused = sizeof(*__stack.__buf) * (4); - const size_t __len = 4 + 1; + const size_t __bufsz __unused = sizeof(*__stack.__buf) * (17); + const size_t __len = 17 + 1; const size_t __idx __unused = __len - 1; pid_t __child; int __status; - char syshost[256]; - int error; - - error = gethostname(syshost, __len); - if (error != 0 || strlen(syshost) <= __len) - atf_tc_skip("hostname too short for testing"); + dhost_jail(); __child = fork(); ATF_REQUIRE(__child >= 0); if (__child > 0) diff --git a/lib/libc/tests/secure/fortify_wchar_test.c b/lib/libc/tests/secure/fortify_wchar_test.c index 9ac5d93ac078..43c7997bc6a3 100644 --- a/lib/libc/tests/secure/fortify_wchar_test.c +++ b/lib/libc/tests/secure/fortify_wchar_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/generate-fortify-tests.lua b/lib/libc/tests/secure/generate-fortify-tests.lua index 3cb3278f017c..36ff01af7a17 100755 --- a/lib/libc/tests/secure/generate-fortify-tests.lua +++ b/lib/libc/tests/secure/generate-fortify-tests.lua @@ -62,6 +62,7 @@ local includes = { "sys/param.h", + "sys/jail.h", "sys/random.h", "sys/resource.h", "sys/select.h", @@ -87,6 +88,10 @@ local includes = { local tests_added = {} +-- Configuration for tests that want the host/domainname +local hostname = "host.example.com" +local domainname = "example.com" + -- Some of these will need to be excluded because clang sees the wrong size when -- an array is embedded inside a struct, we'll get something that looks more -- like __builtin_object_size(ptr, 0) than it does the correct @@ -858,18 +863,14 @@ local all_tests = { }, { func = "getdomainname", - bufsize = "4", + bufsize = #domainname + 1, arguments = { "__buf", "__len", }, + need_root = true, exclude = excludes_stack_overflow, - stackvars = "\tchar sysdomain[256];\n", - early_init = [[ - (void)getdomainname(sysdomain, __len); - if (strlen(sysdomain) <= __len) - atf_tc_skip("domain name too short for testing"); -]] + early_init = " dhost_jail();", }, { func = "getentropy", @@ -881,21 +882,14 @@ local all_tests = { }, { func = "gethostname", - bufsize = "4", + bufsize = #hostname + 1, arguments = { "__buf", "__len", }, + need_root = true, exclude = excludes_stack_overflow, - stackvars = [[ - char syshost[256]; - int error; -]], - early_init = [[ - error = gethostname(syshost, __len); - if (error != 0 || strlen(syshost) <= __len) - atf_tc_skip("hostname too short for testing"); -]] + early_init = " dhost_jail();", }, { func = "getlogin_r", @@ -1515,6 +1509,32 @@ replace_stdin(void) ]]) +if tcat == "unistd" then + fh:write("#define JAIL_HOSTNAME \"" .. hostname .. "\"\n") + fh:write("#define JAIL_DOMAINNAME \"" .. domainname .. "\"\n") + fh:write([[ +static void +dhost_jail(void) +{ + struct iovec iov[4]; + int jid; + + iov[0].iov_base = __DECONST(char *, "host.hostname"); + iov[0].iov_len = sizeof("host.hostname"); + iov[1].iov_base = __DECONST(char *, JAIL_HOSTNAME); + iov[1].iov_len = sizeof(JAIL_HOSTNAME); + iov[2].iov_base = __DECONST(char *, "host.domainname"); + iov[2].iov_len = sizeof("host.domainname"); + iov[3].iov_base = __DECONST(char *, JAIL_DOMAINNAME); + iov[3].iov_len = sizeof(JAIL_DOMAINNAME); + + jid = jail_set(iov, nitems(iov), JAIL_CREATE | JAIL_ATTACH); + ATF_REQUIRE_MSG(jid > 0, "Jail creation failed: %s", strerror(errno)); +} + +]]) +end + for _, def in pairs(tests) do local func = def.func local function write_tests(heap) From nobody Thu Mar 20 06:16:05 2025 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 4ZJFh75cV5z5rMqh for ; Thu, 20 Mar 2025 06:16:07 +0000 (UTC) (envelope-from 01000195b231d607-260ae5cd-6a59-4187-b9c9-9029bf20f91a-000000@amazonses.com) Received: from a8-13.smtp-out.amazonses.com (a8-13.smtp-out.amazonses.com [54.240.8.13]) (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 4ZJFh65sR5z3C7l for ; Thu, 20 Mar 2025 06:16:06 +0000 (UTC) (envelope-from 01000195b231d607-260ae5cd-6a59-4187-b9c9-9029bf20f91a-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=vnqrkfnvu6csdl6mwgk5t6ix3nnepx57; d=tarsnap.com; t=1742451365; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=kYXirL6T5SMEuGYUdunqxwrHTUFx7O+Ivnu0IG9v0AM=; b=DvZ4cRt65CXxFjfFqSxq88PE2Ou4wbZbNMbOnhJNKMCEWUuWj7kReB7YXHG3RL8d 9cCALhnoLHGqVfkLLwwOGnxU/ZMSfQBdL8QyqYrSv8fmR16eNQXEevnxP0kVim4PpSj Dg4oNJUe2QNqMKu91VQ2vvDDm7LJQgkyYmD6vELE= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw; d=amazonses.com; t=1742451365; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=kYXirL6T5SMEuGYUdunqxwrHTUFx7O+Ivnu0IG9v0AM=; b=hkMRomqrxr1e+6gOxmfEU2POInScdLWEe8p6WyU80C6mulOUVgLT11FJEts7flFT QfVkSbhArMv4QvQ7Cc2jLPMYdLKnzmA8Q5Mk54v0blrm1skCbrOIPev4N5RS8D+LoZF lhSr3xej0FAbLgof1UzDw93dlCphoEhJ7zh+ObzM= Message-ID: <01000195b231d607-260ae5cd-6a59-4187-b9c9-9029bf20f91a-000000@email.amazonses.com> Date: Thu, 20 Mar 2025 06:16:05 +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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 9d0eea9422d0 - main - Make newly POSIX functions visible To: Stephen Hurd , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202503192345.52JNjFxt093046@gitrepo.freebsd.org> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <202503192345.52JNjFxt093046@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: ::1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2025.03.20-54.240.8.13 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:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Queue-Id: 4ZJFh65sR5z3C7l X-Spamd-Bar: ---- On 3/19/25 16:45, Stephen Hurd wrote: > commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a > Author: Stephen Hurd > AuthorDate: 2025-03-19 23:45:06 +0000 > Commit: Stephen Hurd > CommitDate: 2025-03-19 23:45:06 +0000 > > Make newly POSIX functions visible > > Some of the POSIX 202405L functions are already in the system, make > them visible when appropriate. > > Reviewed by: imp > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D47859 This broke lang/python311: > --- Modules/posixmodule.o --- > ./Modules/posixmodule.c:12907:9: error: call to undeclared function 'setresuid'; ISO C99 and later do not support implicit function decla > rations [-Werror,-Wimplicit-function-declaration] > 12907 | if (setresuid(ruid, euid, suid) < 0) > | ^ > ./Modules/posixmodule.c:12907:9: note: did you mean 'setreuid'? > /usr/include/unistd.h:458:6: note: 'setreuid' declared here > 458 | int setreuid(uid_t, uid_t); > | ^ > ./Modules/posixmodule.c:12930:9: error: call to undeclared function 'setresgid'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] > 12930 | if (setresgid(rgid, egid, sgid) < 0) > | ^ > ./Modules/posixmodule.c:12930:9: note: did you mean 'setregid'? > /usr/include/unistd.h:457:6: note: 'setregid' declared here > 457 | int setregid(gid_t, gid_t); > | ^ > ./Modules/posixmodule.c:12949:9: error: call to undeclared function 'getresuid'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] > 12949 | if (getresuid(&ruid, &euid, &suid) < 0) > | ^ > ./Modules/posixmodule.c:12970:9: error: call to undeclared function 'getresgid'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] > 12970 | if (getresgid(&rgid, &egid, &sgid) < 0) > | ^ > 4 errors generated. > *** [Modules/posixmodule.o] Error code 1 > > make: stopped making "all" in /tmp/ports/usr/ports/lang/python311/work/Python-3.11.11 I realize this is almost certainly a bug in Python (assuming that these functions are available without setting the right POSIX level) but if Python has this bug I'm sure other ports will also be affected. Please back out this commit and talk to portmgr@ about doing an exp-run to find out what needs to be fixed in the ports tree before re-committing this. -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Thu Mar 20 07:11:46 2025 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 4ZJGwR12fFz5rQpN; Thu, 20 Mar 2025 07:11:51 +0000 (UTC) (envelope-from noreply@sjh.sh) Received: from sjh.sh (sjh.sh [IPv6:2001:19f0:5c00:286a:5400:5ff:fe26:bbcc]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "*.sjh.sh", Issuer "E6" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJGwQ0Hh9z3nZy; Thu, 20 Mar 2025 07:11:50 +0000 (UTC) (envelope-from noreply@sjh.sh) Authentication-Results: mx1.freebsd.org; none Received: from [IPV6:2601:404:ce00:7c90:ec4:7aff:fec4:ac4a] (unknown [IPv6:2601:404:ce00:7c90:ec4:7aff:fec4:ac4a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.sjh.sh (Postfix) with ESMTPSA id EA08675600; Thu, 20 Mar 2025 07:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=sjh.sh; s=default; t=1742454707; bh=q487n6np+Nl+lSjqQGXiHx4pTSEKAxzjK1KRW9fqE74=; h=Date:Subject:To:References:From:In-Reply-To; b=KbNLm5FXXF1Jn2GuuWGjgDi1f/euGDQ/DB0n3ezg6xdqu9TOpM9pbu6lqSG4TrHaA 5CKpw+yg/n272jP+RladHiRSRfxihkHQOXaYxH3izPSAI0HMdRxC+eCyR3Xc3/UG2S 98SIsdpefBRbDFhmE463LnN80Ugq6K50RpqYcgmcdBlqA/W8r0b2gemrcpsgmjxP36 75GjyAEteYqk7D3WCMO+Xq2/waBPxf240oojJ7+xRtDHQx77lt77HIbac1t2OyJ3Bw D9cDLJMxVP7jpjE729DZYK+mXZmTsr2795wOg+xcYGWlIiT0CbTddJSBqgGXfeGf5+ d3xM0DFxhLK0g== Message-ID: <1c4b2e3e-aabc-4fd4-a115-56a9133e9bff@sjh.sh> Date: Thu, 20 Mar 2025 03:11:46 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 9d0eea9422d0 - main - Make newly POSIX functions visible To: Colin Percival , Stephen Hurd , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202503192345.52JNjFxt093046@gitrepo.freebsd.org> <01000195b231d604-edc6ae17-e5d4-4dc6-afd3-995223ecde17-000000@email.amazonses.com> Content-Language: en-US From: Stephen Hurd In-Reply-To: <01000195b231d604-edc6ae17-e5d4-4dc6-afd3-995223ecde17-000000@email.amazonses.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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:20473, ipnet:2001:19f0:5c00::/38, country:US] X-Rspamd-Queue-Id: 4ZJGwQ0Hh9z3nZy X-Spamd-Bar: ---- On 2025-03-20 02:16, Colin Percival wrote: > On 3/19/25 16:45, Stephen Hurd wrote: >> commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a >> Author:     Stephen Hurd >> AuthorDate: 2025-03-19 23:45:06 +0000 >> Commit:     Stephen Hurd >> CommitDate: 2025-03-19 23:45:06 +0000 >> >>      Make newly POSIX functions visible >>           Some of the POSIX 202405L functions are already in the >> system, make >>      them visible when appropriate. >>           Reviewed by:    imp >>      MFC after:      1 week >>      Differential Revision: https://reviews.freebsd.org/D47859 > > This broke lang/python311: >> --- Modules/posixmodule.o --- >> ./Modules/posixmodule.c:12907:9: error: call to undeclared function >> 'setresuid'; ISO C99 and later do not support implicit function decla >> rations [-Werror,-Wimplicit-function-declaration] >>  12907 |     if (setresuid(ruid, euid, suid) < 0) >>        |         ^ > I realize this is almost certainly a bug in Python (assuming that these > functions are available without setting the right POSIX level) but if > Python has this bug I'm sure other ports will also be affected. Please > back out this commit and talk to portmgr@ about doing an exp-run to find > out what needs to be fixed in the ports tree before re-committing this. I could also make it #if __POSIX_VISIBLE >= 202405 || __BSD_VISIBLE Should fix the problem, but still make them visible for POSIX. From nobody Thu Mar 20 07:13:28 2025 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 4ZJGyK6GJHz5rQh2; Thu, 20 Mar 2025 07:13:29 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJGyK3bCdz3qMb; Thu, 20 Mar 2025 07:13:29 +0000 (UTC) (envelope-from shurd@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742454809; h=from:from:reply-to:subject: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=wEgZOzgRTtBXaerBNL+XHUEBCzjPOiqkzR6rE+5zD9o=; b=opw0WMrbpVrIx9R7YCb0Ifh30OCI9H4HaaptYRelGMQa7PEEJbqX0XhQeq3oWJCtiYhSuO iCM97RE4Zh5nHhiCRtyqVpIGoji0tIdZpGMva3ADrXDs2TXtQ5WFu+59vP5oB778YX84Wj qwovh8rmF9Fud8x817WwULz7fTBvmpHnISPilPXjgmkUyJvc+P2j0m8zbpM+Qv9+yIDRwP ETxTcmkVLK4gCsQ/G8FHlk7MdOfWVdS6thU2XVnuQkXM2UsJ+yvqEsp7YbpMC5R98+qg7e B7MSdJ4KMZj12inavkuOraM1X4xCHrJNdfwbGT1WPtwAKHpfF9qHU95AeaBwog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742454809; a=rsa-sha256; cv=none; b=V/vAbyY3sD6lDul8PC4B0KAP91u42Oz4EpDKeXTntsLsUtpMxwY7gXDu+dq1WByMV2t6EA JiheudibmICKB8RvXP2yBRDNuloW0mrvF1bfP/IQ78yN/uwd+U18/0eAV/tqcyU/qXoUQR SL3ult4JNXZBDJxVbHYWzZKXW5KhdJBfxTh8ZX3DVQOARUj843/Doko54F21uHsHdvLkpE OedM49Z/3QXaq0NxFbPentw9RupjxPbWrcIP+QQS/znO/tSNnpaclKi/z2J8jo7WwTPAzy ePpL2vLwZtKHxVM+noM7/+qFx0Lat7CNSUruJiNYD2EsSxuSL0dw33rvZHvrWw== 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=1742454809; h=from:from:reply-to:subject: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=wEgZOzgRTtBXaerBNL+XHUEBCzjPOiqkzR6rE+5zD9o=; b=FtQPlKCv1WqgnCXHb2T9VbiOwdVe98wb9ZvbyxQwyfKuFd9vfTteMVp46k05bgu340u/gZ T4x7m+ZbHk9VFW43ZImdJXjNnki55eNdWMWSOHC5kszuRfCBci+gXb1MhEmyF5UhGLOZFk /dw+q3vQyZbM6OvePFQDN7YVZBn+HoYGDGjv5uBUKEKlOYIc0aUriZYgvK+VAEXRH/4Oyh EPgPrWCFBmHzSM50H3LFH76+GWwNTDwxm+LUq/5QHeX0s0qKhVsJh0Jwi7aNFc9TVJWnXD fllvJ2kE++cIQM/x7pLEvcpka6pAI2yEQJJtrW65Jhpp3Z4P1mkgVkKD3EqOfw== Received: from [IPV6:2601:404:ce00:7c90:ec4:7aff:fec4:ac4a] (unknown [IPv6:2601:404:ce00:7c90:ec4:7aff:fec4:ac4a]) (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: shurd) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZJGyK11C8z16T9; Thu, 20 Mar 2025 07:13:29 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Message-ID: <8cc8ee54-d6ea-47dc-a22d-57b6b03bda4e@FreeBSD.org> Date: Thu, 20 Mar 2025 03:13:28 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 9d0eea9422d0 - main - Make newly POSIX functions visible To: Colin Percival , Stephen Hurd , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202503192345.52JNjFxt093046@gitrepo.freebsd.org> <01000195b231d604-edc6ae17-e5d4-4dc6-afd3-995223ecde17-000000@email.amazonses.com> <1c4b2e3e-aabc-4fd4-a115-56a9133e9bff@sjh.sh> Content-Language: en-US From: shurd@FreeBSD.org In-Reply-To: <1c4b2e3e-aabc-4fd4-a115-56a9133e9bff@sjh.sh> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2025-03-20 03:11, Stephen Hurd wrote: > On 2025-03-20 02:16, Colin Percival wrote: >> On 3/19/25 16:45, Stephen Hurd wrote: >>> commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a >>> Author:     Stephen Hurd >>> AuthorDate: 2025-03-19 23:45:06 +0000 >>> Commit:     Stephen Hurd >>> CommitDate: 2025-03-19 23:45:06 +0000 >>> >>>      Make newly POSIX functions visible >>>           Some of the POSIX 202405L functions are already in the >>> system, make >>>      them visible when appropriate. >>>           Reviewed by:    imp >>>      MFC after:      1 week >>>      Differential Revision: https://reviews.freebsd.org/D47859 >> >> This broke lang/python311: >>> --- Modules/posixmodule.o --- >>> ./Modules/posixmodule.c:12907:9: error: call to undeclared function >>> 'setresuid'; ISO C99 and later do not support implicit function decla >>> rations [-Werror,-Wimplicit-function-declaration] >>>  12907 |     if (setresuid(ruid, euid, suid) < 0) >>>        |         ^ >> I realize this is almost certainly a bug in Python (assuming that these >> functions are available without setting the right POSIX level) but if >> Python has this bug I'm sure other ports will also be affected. Please >> back out this commit and talk to portmgr@ about doing an exp-run to find >> out what needs to be fixed in the ports tree before re-committing this. > > I could also make it #if __POSIX_VISIBLE >= 202405 || __BSD_VISIBLE > > Should fix the problem, but still make them visible for POSIX. https://reviews.freebsd.org/D49421 From nobody Thu Mar 20 07:41:53 2025 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 4ZJHb600bCz5rSNs; Thu, 20 Mar 2025 07:41:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJHb55Hmsz47gL; Thu, 20 Mar 2025 07:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742456513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xWKFb+8/USbHkBuWmYPxch318ue4yhhOpJgGvD+HwZI=; b=Mf+fgYX4Pkyuui902kV3sN1XUuuNheFHwMPIqOiJEDF5v5hQQaik/4uW7Af9gBlveW2sqJ l/KYEWACxC6G4eRS5V72CsZTp0r23UjVFIxM+TbzIf6jRNA0ZdbvvR14B1M0jdO9Fmojvw pRzHCxoZECAEaoG18YfWhu1+KYSJwKqD9UrvN2VfC5K6NsPhMJJGRw1jJXI46xmroyHLO0 7RnVbMvpP7Qg6gx9JdQGNAJJabdWgSqv+/v27kJjK6FuFUmAHmsvwAjw8FGd/Empfb2KtO mL4y9DZgjNSARJivpGwhMwLtgYaYWNsIR27Dy7w5ZMOH9TTGHx7RnEcz1Qxxqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742456513; a=rsa-sha256; cv=none; b=HyDSvp39g2AE2ejDJC4A/PzYCmu7DSz3Jf7RsoAFG7o4YFIKHgMdy/vovNdww3rFfi6y9o 1coYnxxfhKfzvKlstSEf5RJ0eYcX7n93r5xHSENiBL85fMgLOqpdXunMTFxRsXhkXMWoSy JDewrU5xd9ScVvAEwLMF6Ed67OEYaM3rldaKqoMyWD7Tncgxrj43PxQAiIt3TPI6KbAtiN IiD/mi6cWe+StxPqinPJdcpeNtg3RxjtiOm+0HI7cm1lVgI/sie1PziZjHNJpETqTlG+Rn 8FKH3xhVAxEoIlXCmfoUbR4fVlQFFTQ+8Aqm/bRECwLOIwczfqA+lSwjiiC4WQ== 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=1742456513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xWKFb+8/USbHkBuWmYPxch318ue4yhhOpJgGvD+HwZI=; b=DvlDham5ghwQosWhoYGjHXuz5nL3p0736kQsYcbjJWNzTYNdNtcIXfCvAKMj3ff/hYfR0Q RNtipkPIj2ZLA5mNO6iTz22shthwiPyAsl2wYRfBmV6ABBYnYT08I5+MG2itPd8aCmGey2 Nz+8CtyV9dP8dqlObLo2Pi6s3dNWlAbmYWV52QGYncUp22glDnZkadlv+H1g9Q3ZGGaj/q DhuJN+vOcL/7aYenyP19oYA9mMNGmmTYls9aK8PXXHg/Xnm4VKI3BkWYbXC/uLQ87nDS1M s6baioT/trORZu3SD5OdBEzs5j4Vs6A+xdZHQKMOMrfP9H6DPPfMh38K8Kz2vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJHb54vbFzwgp; Thu, 20 Mar 2025 07:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K7frKr088366; Thu, 20 Mar 2025 07:41:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K7frms088363; Thu, 20 Mar 2025 07:41:53 GMT (envelope-from git) Date: Thu, 20 Mar 2025 07:41:53 GMT Message-Id: <202503200741.52K7frms088363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stephen Hurd Subject: git: 415a0ce02c9e - main - Revert Make newly POSIX functions visible List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: shurd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 415a0ce02c9ee2c15c7973b2dfbddda71f6344a2 Auto-Submitted: auto-generated The branch main has been updated by shurd: URL: https://cgit.FreeBSD.org/src/commit/?id=415a0ce02c9ee2c15c7973b2dfbddda71f6344a2 commit 415a0ce02c9ee2c15c7973b2dfbddda71f6344a2 Author: Stephen Hurd AuthorDate: 2025-03-20 07:15:15 +0000 Commit: Stephen Hurd CommitDate: 2025-03-20 07:41:27 +0000 Revert Make newly POSIX functions visible Summary: This reverts commit d7efac1be1441c122f7fb9de51a409172f21326c. This reverts commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a. Some ports (specifically Python) define __BSD_VISIBLE themselves, so the change from __BSD_VISIBLE to __POSIX_VISIBLE >= 202405 makes them fail. Reported by: jrtc27, cperciva --- include/dlfcn.h | 8 +------- include/stdlib.h | 13 +++++-------- include/string.h | 6 +++--- include/time.h | 8 +++----- include/unistd.h | 16 ++++++---------- include/wchar.h | 7 ++----- 6 files changed, 20 insertions(+), 38 deletions(-) diff --git a/include/dlfcn.h b/include/dlfcn.h index ec4ad14b5091..89ec43b332e9 100644 --- a/include/dlfcn.h +++ b/include/dlfcn.h @@ -80,9 +80,6 @@ typedef struct dl_info { const char *dli_sname; /* Name of nearest symbol. */ void *dli_saddr; /* Address of nearest symbol. */ } Dl_info; -#if __POSIX_VISIBLE >= 202405 -typedef struct dl_info Dl_info_t; -#endif /*- * The actual type declared by this typedef is immaterial, provided that @@ -122,12 +119,9 @@ char *dlerror(void); void *dlopen(const char *, int); void *dlsym(void * __restrict, const char * __restrict); -#if __POSIX_VISIBLE >= 202405 -int dladdr(const void * __restrict, Dl_info * __restrict); -#endif - #if __BSD_VISIBLE void *fdlopen(int, int); +int dladdr(const void * __restrict, Dl_info * __restrict); dlfunc_t dlfunc(void * __restrict, const char * __restrict); int dlinfo(void * __restrict, int, void * __restrict); void dllockinit(void *_context, diff --git a/include/stdlib.h b/include/stdlib.h index 449b17fefff5..162031ab393d 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -157,7 +157,7 @@ _Noreturn void _Exit(int) __noexcept; /* * If we're in a mode greater than C99, expose C11 functions. */ -#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L || __POSIX_VISIBLE >= 202405 +#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1) __alloc_size(2); int at_quick_exit(void (*)(void)) __noexcept; @@ -236,13 +236,6 @@ int unlockpt(int); int ptsname_r(int, char *, size_t); #endif -#if __POSIX_VISIBLE >= 202405 -void qsort_r(void *, size_t, size_t, - int (*)(const void *, const void *, void *), void *); -void *reallocarray(void *, size_t, size_t) __result_use_check - __alloc_size2(2, 3); -#endif - #if __BSD_VISIBLE extern const char *malloc_conf; extern void (*malloc_message)(void *, const char *); @@ -312,8 +305,12 @@ int mergesort_b(void *, size_t, size_t, int (^)(const void *, const void *)); int mkostemp(char *, int); int mkostemps(char *, int, int); int mkostempsat(int, char *, int, int); +void qsort_r(void *, size_t, size_t, + int (*)(const void *, const void *, void *), void *); int radixsort(const unsigned char **, int, const unsigned char *, unsigned); +void *reallocarray(void *, size_t, size_t) __result_use_check + __alloc_size2(2, 3); void *reallocf(void *, size_t) __result_use_check __alloc_size(2); int rpmatch(const char *); char *secure_getenv(const char *); diff --git a/include/string.h b/include/string.h index 3deca63bd71a..a3fa96ebb449 100644 --- a/include/string.h +++ b/include/string.h @@ -63,8 +63,8 @@ void *memrchr(const void *, int, size_t) __pure; #endif int memcmp(const void *, const void *, size_t) __pure; void *(memcpy)(void * __restrict, const void * __restrict, size_t); -#if __POSIX_VISIBLE >= 202405 -void *(memmem)(const void *, size_t, const void *, size_t) __pure; +#if __BSD_VISIBLE +void *memmem(const void *, size_t, const void *, size_t) __pure; #endif void *(memmove)(void *, const void *, size_t); #if __BSD_VISIBLE @@ -98,7 +98,7 @@ char *strerror(int); #if __POSIX_VISIBLE >= 200112 int strerror_r(int, char *, size_t); #endif -#if __POSIX_VISIBLE >= 202405 +#if __BSD_VISIBLE size_t (strlcat)(char * __restrict, const char * __restrict, size_t); size_t (strlcpy)(char * __restrict, const char * __restrict, size_t); #endif diff --git a/include/time.h b/include/time.h index e011792aaaeb..89a76ca5fd93 100644 --- a/include/time.h +++ b/include/time.h @@ -180,17 +180,15 @@ time_t posix2time(time_t t); #include #endif -#if __ISO_C_VISIBLE >= 2011 || __POSIX_VISIBLE >= 202405 || \ +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2011 || \ (defined(__cplusplus) && __cplusplus >= 201703) #include /* ISO/IEC 9899:2011 7.27.2.5 The timespec_get function */ #define TIME_UTC 1 /* time elapsed since epoch */ -#if __ISO_C_VISIBLE >= 2023 || __POSIX_VISIBLE >= 202405 -/* ISO/IEC 9899:2024 7.29.1 Components of time */ -#define TIME_MONOTONIC 2 /* monotonic time */ -#endif int timespec_get(struct timespec *ts, int base); #if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2023 +/* ISO/IEC 9899:2024 7.29.1 Components of time */ +#define TIME_MONOTONIC 2 /* monotonic time */ /* ISO/IEC 9899:2024 7.29.2.7 The timespec_getres function */ int timespec_getres(struct timespec *, int); #endif diff --git a/include/unistd.h b/include/unistd.h index 3a4e1be192d9..8574b2ba9915 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -483,16 +483,6 @@ int usleep(useconds_t); pid_t vfork(void) __returns_twice; #endif -/* 1003.1-2024 */ -#if __POSIX_VISIBLE >= 202405 -pid_t _Fork(void); -int getentropy(void *, size_t); -int getresgid(gid_t *, gid_t *, gid_t *); -int getresuid(uid_t *, uid_t *, uid_t *); -int setresgid(gid_t, gid_t, gid_t); -int setresuid(uid_t, uid_t, uid_t); -#endif - #if __BSD_VISIBLE struct timeval; /* select(2) */ @@ -520,11 +510,14 @@ int feature_present(const char *); int fchroot(int); char *fflagstostr(u_long); int getdomainname(char *, int); +int getentropy(void *, size_t); int getgrouplist(const char *, gid_t, gid_t *, int *); int getloginclass(char *, size_t); mode_t getmode(const void *, mode_t); int getosreldate(void); int getpeereid(int, uid_t *, gid_t *); +int getresgid(gid_t *, gid_t *, gid_t *); +int getresuid(uid_t *, uid_t *, uid_t *); char *getusershell(void); int initgroups(const char *, gid_t); int iruserok(unsigned long, int, const char *, const char *); @@ -582,6 +575,8 @@ void *setmode(const char *); int setpgrp(pid_t, pid_t); /* obsoleted by setpgid() */ void setproctitle(const char *_fmt, ...) __printf0like(1, 2); void setproctitle_fast(const char *_fmt, ...) __printf0like(1, 2); +int setresgid(gid_t, gid_t, gid_t); +int setresuid(uid_t, uid_t, uid_t); int setrgid(gid_t); int setruid(uid_t); void setusershell(void); @@ -594,6 +589,7 @@ int undelete(const char *); int unwhiteout(const char *); void *valloc(size_t); /* obsoleted by malloc() */ int funlinkat(int, const char *, int, int); +pid_t _Fork(void); #ifndef _OPTRESET_DECLARED #define _OPTRESET_DECLARED diff --git a/include/wchar.h b/include/wchar.h index a8c016c42faf..e4b037c9b16f 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -235,13 +235,10 @@ size_t wcsnrtombs(char * __restrict, const wchar_t ** __restrict, size_t, size_t, mbstate_t * __restrict); #endif -#if __POSIX_VISIBLE >= 202405 -size_t wcslcat(wchar_t *, const wchar_t *, size_t); -size_t wcslcpy(wchar_t *, const wchar_t *, size_t); -#endif - #if __BSD_VISIBLE wchar_t *fgetwln(FILE * __restrict, size_t * __restrict); +size_t wcslcat(wchar_t *, const wchar_t *, size_t); +size_t wcslcpy(wchar_t *, const wchar_t *, size_t); #endif #if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_) From nobody Thu Mar 20 09:01:36 2025 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 4ZJKM46MFbz5rXPS; Thu, 20 Mar 2025 09:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJKM452Tyz3KBJ; Thu, 20 Mar 2025 09:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742461296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jBGxinHG7JYYGDj4vyVIgrMpN5Sh9Zt6jdEKsFFfWDY=; b=iGsyldr6Plrfw+6av//ZI9JD1kGBZ9nGfYSkZj3D6ZaXgZZGX/gk0fDKoKGZuzq0r3ed5M eemr3sPobTgdWTzYbrpXe2gp3jiM27aWH0yJH/FnWSjKADXNWtDURBqCcBi73m4YUY4EED GqhlqsASSmL6HOkEFWhzGuQtTzJWRS1wVjSiDmGCH5Opjel9ArUox2b0ulmXkf+55IHxPt krTgzBwQW+RNBg+GM6cAHEMZoDadAeMwlPgijcGSUtW40Sk9lGd6D4Y7Y6CY5ivUSHHqcC A5BBo2PD9flpw5b6MMg5KhjkZfw+sYsEhAXCGUlCS5yPHqQFohWaRF3s9vlT3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742461296; a=rsa-sha256; cv=none; b=UNfCMur7SVjAg7BloufxmevCOG2G/1mbSt9OpWcGs+TaiRNqid0J2BU+OoVpVOvHOwHFKz MNfH14/D3x6h3K7LBUcZ5DgFsxAlNtL4wOyfPgmbVlFRIjtzb7bWhvhdApAq1S9H2yTRDF YE7mtjYB87VnwGcv0zNFDN75En+lB7zJetun2n1Z+qwBkDwqlcsWeI7Bcg0XZy4DCuzQRo J4SReX7V+0Tt2HqGTYqoeYWqJau/UHw5KXfu2wztArLQsOWC/eR3wzeTaRlXNgjD2b4Se2 00+javMxXywdGpHFg6o6S3GG9y67+7JFbb0Y+E5WJHFV3uJv7wNdcII6MGc8yA== 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=1742461296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jBGxinHG7JYYGDj4vyVIgrMpN5Sh9Zt6jdEKsFFfWDY=; b=P6RCfC7+q0viutgig849D/51S8dYWaQgFK4iXO2naPmp3qdyZP6Zansdqe1SelthGgrvG/ JQ692xJ/JyXyXMpPdtyJqVWB2W64MqiNxZRu3UQLvW3TcCjemLJa27YkLD0LyXZHuYrWN/ xZhBxfOWUoKt9T+MPKO6qMhBvEMiZ/oiplRzwXCJxgjhR9A8okt42aOeRMTGRvO7TgwZ9O OK5KhNpBDjaHB3EAYoYzam5sPYTr7mHve5FO0pcuRRpYrQn6V5BwO+Xn52z4BOV6U6F7nI 0X0a5FFKO2tKmZPP/sR3H2Nms5vN9LTYRCsBxensPPEYOH4zN8U2MiGDvVQ3wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJKM432j2zyPP; Thu, 20 Mar 2025 09:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K91aKA045134; Thu, 20 Mar 2025 09:01:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K91aO8045129; Thu, 20 Mar 2025 09:01:36 GMT (envelope-from git) Date: Thu, 20 Mar 2025 09:01:36 GMT Message-Id: <202503200901.52K91aO8045129@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: 5682eee1efd3 - main - devd: raise the maximum allowed client to 50 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 5682eee1efd35fb65751641181ae2a50d86efaab Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5682eee1efd35fb65751641181ae2a50d86efaab commit 5682eee1efd35fb65751641181ae2a50d86efaab Author: Baptiste Daroussin AuthorDate: 2025-03-20 08:53:16 +0000 Commit: Baptiste Daroussin CommitDate: 2025-03-20 08:56:51 +0000 devd: raise the maximum allowed client to 50 since the creation of libudev-devd, but also with powerd, recent libusb changes etc. 10 client is not enough anymore to cover the desktop needs and end users often ends up with: sonewconn: pcb 0xfffff8004dd43780 (local:/var/run/devd.seqpacket.pipe)... raise the maximum allowed client to 50, which should be enough to cover user requirements. MFC After: 1 week --- sbin/devd/devd.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index 8d621e42a232..d7a3fee57870 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -938,7 +938,7 @@ create_socket(const char *name, int socktype) return (fd); } -static unsigned int max_clients = 10; /* Default, can be overridden on cmdline. */ +static unsigned int max_clients = 50; /* Default, can be overridden on cmdline. */ static unsigned int num_clients; static list clients; From nobody Thu Mar 20 09:55:56 2025 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 4ZJLZ06cV2z5rbKL for ; Thu, 20 Mar 2025 09:56:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJLZ04Vxzz3PKD for ; Thu, 20 Mar 2025 09:56:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-2ff6e91cff5so879254a91.2 for ; Thu, 20 Mar 2025 02:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1742464567; x=1743069367; 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=BMP1EK4BkXr+Bk5fYSxK3nZfYMy8o7sC8sFutHAVDQo=; b=g19/RC5zgz305DUtpQRiDrNf1NN48rc1LBWaUZ+TD7e9h7FfHMzM8f2ekO87MGGt6m PTvxhOKeirND7TQ9IpAHgZeAwl4FIso2t+sgOiuiaUX+qDE4ryOQRgyBL9EF9DnOXi02 qmwySSLBz297jtMSq2UtbbdVFXeUxdp/lizUdrIJhq511NwcebhfgaegO4zEZca5rjnh F7SBTDnhrFUn19qbKcUCOW4B3GQI76mgPsjmF02hJukR+HbBCFIp1jWeTn77v3LsmnLJ Gh7Ooq+yq1XaulXToANTbzq403ythSykP0uPTjFBg2nwFh9DTH4nu9FnLv2VbSfpsbrQ vcQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742464567; x=1743069367; 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=BMP1EK4BkXr+Bk5fYSxK3nZfYMy8o7sC8sFutHAVDQo=; b=it8wRzNX+Xzr2ePXQprIIwu7WWVkRHj5kp0Cq/3UHmiXYb67PDSVt5iKMVsFSMFZuL ReZUcU3PF8d/1+QCqnepBetQ/ijBN3bRESPVoPPI4SaboNLBc36euRXb9niSkIDfQ4/D 4xLU/PFuBimbNoxUhDTuIkpEE/KkCFdu4BoPpPIHY8hAr0+dPBg7NR5A4o8RRIfNicKZ 6BaFXstcn0xZQ3QYtjW8bfR2BvNL9NAiKOHusts7sJ/wheCl0RU4GFleV2G6MTX34ZOO +ZvWhA0Icjzcri2vAmu/M60XngNtl5yg0LOe7pO1Bvebd/dyDVg0uTSwwCTRF2HdTCiE sR+Q== X-Forwarded-Encrypted: i=1; AJvYcCUhqGXCzsVXsg40i5rrdvpCnmgtogAalXROg0e6rLQD96fdL4Na1Og1zjTdWckYBEQOsUuYXfYB3sLNIc23EmtAIuH4gg==@freebsd.org X-Gm-Message-State: AOJu0YyBFDwpAhXnVv40YdoeQ8i+MxMGl/jt1aUJMzTqgVuRqxFGJb4R W0ywnovq9vpZELhYSpVmxyL15IF1TsZRuhh4p/mlsXFCJbO5qI8untgcHVF6uiAYZULOBm3kmzv oxvSigbeHhc+lI4qAmKgWWMbtope752G7sV7QeQ== X-Gm-Gg: ASbGncuA7Ta3Hfw2XnOubzHlxeeMeMkvILtDOiAOEtqDvoRyn6fHsC2IAsk7ruqdCra ByMohVcCl2Dvm45ZzWDm1ruhIM+kv/KfELMIHQNSafS2UXURFSLxNKD1sFEKP5xxgUv/ZBLgicv xU1msvPyphrQ1IRb9fhm6Ro9yoPC8576I/0zS6SoNQE06Gzkpl4cI2HZpq X-Google-Smtp-Source: AGHT+IF59zSGhTurwvrr5+ibsjM6wPDwQRI5qvP46inzmwsit30mWVZFY043+Ydf17f64PxoNysFFxri2f76v81ahkU= X-Received: by 2002:a17:90b:28cd:b0:2ee:e317:69ab with SMTP id 98e67ed59e1d1-301d4e83d83mr5327965a91.0.1742464567137; Thu, 20 Mar 2025 02:56:07 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202503200741.52K7frms088363@gitrepo.freebsd.org> In-Reply-To: <202503200741.52K7frms088363@gitrepo.freebsd.org> From: Warner Losh Date: Thu, 20 Mar 2025 03:55:56 -0600 X-Gm-Features: AQ5f1JpJ8mxfhXtXrlOeAO69-tl7wyGPN5BaPEP-v1cbywJ-jtDJYTUHFboigqM Message-ID: Subject: Re: git: 415a0ce02c9e - main - Revert Make newly POSIX functions visible To: Stephen Hurd Cc: src-committers , "" , "" Content-Type: multipart/alternative; boundary="0000000000008eff690630c32596" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4ZJLZ04Vxzz3PKD X-Spamd-Bar: ---- --0000000000008eff690630c32596 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 20, 2025, 1:42=E2=80=AFAM Stephen Hurd wrot= e: > The branch main has been updated by shurd: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D415a0ce02c9ee2c15c7973b2dfbddda= 71f6344a2 > > commit 415a0ce02c9ee2c15c7973b2dfbddda71f6344a2 > Author: Stephen Hurd > AuthorDate: 2025-03-20 07:15:15 +0000 > Commit: Stephen Hurd > CommitDate: 2025-03-20 07:41:27 +0000 > > Revert Make newly POSIX functions visible > > Summary: > This reverts commit d7efac1be1441c122f7fb9de51a409172f21326c. > This reverts commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a. > > Some ports (specifically Python) define __BSD_VISIBLE themselves, so > the change from __BSD_VISIBLE to __POSIX_VISIBLE >=3D 202405 makes th= em > fail. > That's not legal. Defining __BSD_VISIBLE directly is illegal and won't work right. Can't work right and should likely be a compile time error. With am exp run to fix. Warner > Reported by: jrtc27, cperciva > --- > include/dlfcn.h | 8 +------- > include/stdlib.h | 13 +++++-------- > include/string.h | 6 +++--- > include/time.h | 8 +++----- > include/unistd.h | 16 ++++++---------- > include/wchar.h | 7 ++----- > 6 files changed, 20 insertions(+), 38 deletions(-) > > diff --git a/include/dlfcn.h b/include/dlfcn.h > index ec4ad14b5091..89ec43b332e9 100644 > --- a/include/dlfcn.h > +++ b/include/dlfcn.h > @@ -80,9 +80,6 @@ typedef struct dl_info { > const char *dli_sname; /* Name of nearest symbol. */ > void *dli_saddr; /* Address of nearest symbol. */ > } Dl_info; > -#if __POSIX_VISIBLE >=3D 202405 > -typedef struct dl_info Dl_info_t; > -#endif > > /*- > * The actual type declared by this typedef is immaterial, provided that > @@ -122,12 +119,9 @@ char *dlerror(void); > void *dlopen(const char *, int); > void *dlsym(void * __restrict, const char * __restrict); > > -#if __POSIX_VISIBLE >=3D 202405 > -int dladdr(const void * __restrict, Dl_info * __restrict); > -#endif > - > #if __BSD_VISIBLE > void *fdlopen(int, int); > +int dladdr(const void * __restrict, Dl_info * __restrict); > dlfunc_t dlfunc(void * __restrict, const char * __restrict); > int dlinfo(void * __restrict, int, void * __restrict); > void dllockinit(void *_context, > diff --git a/include/stdlib.h b/include/stdlib.h > index 449b17fefff5..162031ab393d 100644 > --- a/include/stdlib.h > +++ b/include/stdlib.h > @@ -157,7 +157,7 @@ _Noreturn void _Exit(int) __noexcept; > /* > * If we're in a mode greater than C99, expose C11 functions. > */ > -#if __ISO_C_VISIBLE >=3D 2011 || __cplusplus >=3D 201103L || __POSIX_VIS= IBLE > >=3D 202405 > +#if __ISO_C_VISIBLE >=3D 2011 || __cplusplus >=3D 201103L > void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1) > __alloc_size(2); > int at_quick_exit(void (*)(void)) __noexcept; > @@ -236,13 +236,6 @@ int unlockpt(int); > int ptsname_r(int, char *, size_t); > #endif > > -#if __POSIX_VISIBLE >=3D 202405 > -void qsort_r(void *, size_t, size_t, > - int (*)(const void *, const void *, void *), void *); > -void *reallocarray(void *, size_t, size_t) __result_use_check > - __alloc_size2(2, 3); > -#endif > - > #if __BSD_VISIBLE > extern const char *malloc_conf; > extern void (*malloc_message)(void *, const char *); > @@ -312,8 +305,12 @@ int mergesort_b(void *, size_t, size_t, int > (^)(const void *, const void *)); > int mkostemp(char *, int); > int mkostemps(char *, int, int); > int mkostempsat(int, char *, int, int); > +void qsort_r(void *, size_t, size_t, > + int (*)(const void *, const void *, void *), void *); > int radixsort(const unsigned char **, int, const unsigned char *, > unsigned); > +void *reallocarray(void *, size_t, size_t) __result_use_check > + __alloc_size2(2, 3); > void *reallocf(void *, size_t) __result_use_check __alloc_size(2); > int rpmatch(const char *); > char *secure_getenv(const char *); > diff --git a/include/string.h b/include/string.h > index 3deca63bd71a..a3fa96ebb449 100644 > --- a/include/string.h > +++ b/include/string.h > @@ -63,8 +63,8 @@ void *memrchr(const void *, int, size_t) __pure; > #endif > int memcmp(const void *, const void *, size_t) __pure; > void *(memcpy)(void * __restrict, const void * __restrict, size_t); > -#if __POSIX_VISIBLE >=3D 202405 > -void *(memmem)(const void *, size_t, const void *, size_t) __pure; > +#if __BSD_VISIBLE > +void *memmem(const void *, size_t, const void *, size_t) __pure; > #endif > void *(memmove)(void *, const void *, size_t); > #if __BSD_VISIBLE > @@ -98,7 +98,7 @@ char *strerror(int); > #if __POSIX_VISIBLE >=3D 200112 > int strerror_r(int, char *, size_t); > #endif > -#if __POSIX_VISIBLE >=3D 202405 > +#if __BSD_VISIBLE > size_t (strlcat)(char * __restrict, const char * __restrict, size_t); > size_t (strlcpy)(char * __restrict, const char * __restrict, size_t); > #endif > diff --git a/include/time.h b/include/time.h > index e011792aaaeb..89a76ca5fd93 100644 > --- a/include/time.h > +++ b/include/time.h > @@ -180,17 +180,15 @@ time_t posix2time(time_t t); > #include > #endif > > -#if __ISO_C_VISIBLE >=3D 2011 || __POSIX_VISIBLE >=3D 202405 || \ > +#if __BSD_VISIBLE || __ISO_C_VISIBLE >=3D 2011 || \ > (defined(__cplusplus) && __cplusplus >=3D 201703) > #include > /* ISO/IEC 9899:2011 7.27.2.5 The timespec_get function */ > #define TIME_UTC 1 /* time elapsed since epoch */ > -#if __ISO_C_VISIBLE >=3D 2023 || __POSIX_VISIBLE >=3D 202405 > -/* ISO/IEC 9899:2024 7.29.1 Components of time */ > -#define TIME_MONOTONIC 2 /* monotonic time */ > -#endif > int timespec_get(struct timespec *ts, int base); > #if __BSD_VISIBLE || __ISO_C_VISIBLE >=3D 2023 > +/* ISO/IEC 9899:2024 7.29.1 Components of time */ > +#define TIME_MONOTONIC 2 /* monotonic time */ > /* ISO/IEC 9899:2024 7.29.2.7 The timespec_getres function */ > int timespec_getres(struct timespec *, int); > #endif > diff --git a/include/unistd.h b/include/unistd.h > index 3a4e1be192d9..8574b2ba9915 100644 > --- a/include/unistd.h > +++ b/include/unistd.h > @@ -483,16 +483,6 @@ int usleep(useconds_t); > pid_t vfork(void) __returns_twice; > #endif > > -/* 1003.1-2024 */ > -#if __POSIX_VISIBLE >=3D 202405 > -pid_t _Fork(void); > -int getentropy(void *, size_t); > -int getresgid(gid_t *, gid_t *, gid_t *); > -int getresuid(uid_t *, uid_t *, uid_t *); > -int setresgid(gid_t, gid_t, gid_t); > -int setresuid(uid_t, uid_t, uid_t); > -#endif > - > #if __BSD_VISIBLE > struct timeval; /* select(2) */ > > @@ -520,11 +510,14 @@ int feature_present(const char *); > int fchroot(int); > char *fflagstostr(u_long); > int getdomainname(char *, int); > +int getentropy(void *, size_t); > int getgrouplist(const char *, gid_t, gid_t *, int *); > int getloginclass(char *, size_t); > mode_t getmode(const void *, mode_t); > int getosreldate(void); > int getpeereid(int, uid_t *, gid_t *); > +int getresgid(gid_t *, gid_t *, gid_t *); > +int getresuid(uid_t *, uid_t *, uid_t *); > char *getusershell(void); > int initgroups(const char *, gid_t); > int iruserok(unsigned long, int, const char *, const char *); > @@ -582,6 +575,8 @@ void *setmode(const char *); > int setpgrp(pid_t, pid_t); /* obsoleted by setpgid() > */ > void setproctitle(const char *_fmt, ...) __printf0like(1, 2); > void setproctitle_fast(const char *_fmt, ...) __printf0like(1, 2); > +int setresgid(gid_t, gid_t, gid_t); > +int setresuid(uid_t, uid_t, uid_t); > int setrgid(gid_t); > int setruid(uid_t); > void setusershell(void); > @@ -594,6 +589,7 @@ int undelete(const char *); > int unwhiteout(const char *); > void *valloc(size_t); /* obsoleted by malloc() = */ > int funlinkat(int, const char *, int, int); > +pid_t _Fork(void); > > #ifndef _OPTRESET_DECLARED > #define _OPTRESET_DECLARED > diff --git a/include/wchar.h b/include/wchar.h > index a8c016c42faf..e4b037c9b16f 100644 > --- a/include/wchar.h > +++ b/include/wchar.h > @@ -235,13 +235,10 @@ size_t wcsnrtombs(char * __restrict, const > wchar_t ** __restrict, size_t, > size_t, mbstate_t * __restrict); > #endif > > -#if __POSIX_VISIBLE >=3D 202405 > -size_t wcslcat(wchar_t *, const wchar_t *, size_t); > -size_t wcslcpy(wchar_t *, const wchar_t *, size_t); > -#endif > - > #if __BSD_VISIBLE > wchar_t *fgetwln(FILE * __restrict, size_t * __restrict); > +size_t wcslcat(wchar_t *, const wchar_t *, size_t); > +size_t wcslcpy(wchar_t *, const wchar_t *, size_t); > #endif > > #if __POSIX_VISIBLE >=3D 200809 || defined(_XLOCALE_H_) > --0000000000008eff690630c32596 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Mar 20, 2025, 1:42=E2=80= =AFAM Stephen Hurd <shurd@freebsd.o= rg> wrote:
The branch main h= as been updated by shurd:

URL: ht= tps://cgit.FreeBSD.org/src/commit/?id=3D415a0ce02c9ee2c15c7973b2dfbddda71f6= 344a2

commit 415a0ce02c9ee2c15c7973b2dfbddda71f6344a2
Author:=C2=A0 =C2=A0 =C2=A0Stephen Hurd <shurd@FreeBSD.org>
AuthorDate: 2025-03-20 07:15:15 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Stephen Hurd <shurd@FreeBSD.org>
CommitDate: 2025-03-20 07:41:27 +0000

=C2=A0 =C2=A0 Revert Make newly POSIX functions visible

=C2=A0 =C2=A0 Summary:
=C2=A0 =C2=A0 This reverts commit d7efac1be1441c122f7fb9de51a409172f21326c.=
=C2=A0 =C2=A0 This reverts commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a.=

=C2=A0 =C2=A0 Some ports (specifically Python) define __BSD_VISIBLE themsel= ves, so
=C2=A0 =C2=A0 the change from __BSD_VISIBLE to __POSIX_VISIBLE >=3D 2024= 05 makes them
=C2=A0 =C2=A0 fail.

That's not legal. Defining __BSD_VISIBLE directly is= illegal and won't work right. Can't work right and should likely b= e a compile time error. With am exp run to fix.

=
Warner


=C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 jrtc27, cperciva
---
=C2=A0include/dlfcn.h=C2=A0 |=C2=A0 8 +-------
=C2=A0include/stdlib.h | 13 +++++--------
=C2=A0include/string.h |=C2=A0 6 +++---
=C2=A0include/time.h=C2=A0 =C2=A0|=C2=A0 8 +++-----
=C2=A0include/unistd.h | 16 ++++++----------
=C2=A0include/wchar.h=C2=A0 |=C2=A0 7 ++-----
=C2=A06 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/include/dlfcn.h b/include/dlfcn.h
index ec4ad14b5091..89ec43b332e9 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -80,9 +80,6 @@ typedef=C2=A0 =C2=A0 =C2=A0 =C2=A0struct dl_info {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 const char=C2=A0 =C2=A0 =C2=A0 *dli_sname;=C2= =A0 =C2=A0 =C2=A0/* Name of nearest symbol. */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 void=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *= dli_saddr;=C2=A0 =C2=A0 =C2=A0/* Address of nearest symbol. */
=C2=A0} Dl_info;
-#if __POSIX_VISIBLE >=3D 202405
-typedef struct dl_info Dl_info_t;
-#endif

=C2=A0/*-
=C2=A0 * The actual type declared by this typedef is immaterial, provided t= hat
@@ -122,12 +119,9 @@ char=C2=A0 =C2=A0 =C2=A0 =C2=A0*dlerror(void);
=C2=A0void=C2=A0 =C2=A0*dlopen(const char *, int);
=C2=A0void=C2=A0 =C2=A0*dlsym(void * __restrict, const char * __restrict);<= br>
-#if __POSIX_VISIBLE >=3D 202405
-int=C2=A0 =C2=A0 =C2=A0dladdr(const void * __restrict, Dl_info * __restric= t);
-#endif
-
=C2=A0#if __BSD_VISIBLE
=C2=A0void=C2=A0 =C2=A0*fdlopen(int, int);
+int=C2=A0 =C2=A0 =C2=A0dladdr(const void * __restrict, Dl_info * __restric= t);
=C2=A0dlfunc_t dlfunc(void * __restrict, const char * __restrict);
=C2=A0int=C2=A0 =C2=A0 =C2=A0dlinfo(void * __restrict, int, void * __restri= ct);
=C2=A0void=C2=A0 =C2=A0 dllockinit(void *_context,
diff --git a/include/stdlib.h b/include/stdlib.h
index 449b17fefff5..162031ab393d 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -157,7 +157,7 @@ _Noreturn void=C2=A0 =C2=A0 =C2=A0 =C2=A0_Exit(int) __n= oexcept;
=C2=A0/*
=C2=A0 * If we're in a mode greater than C99, expose C11 functions.
=C2=A0 */
-#if __ISO_C_VISIBLE >=3D 2011 || __cplusplus >=3D 201103L || __POSIX= _VISIBLE >=3D 202405
+#if __ISO_C_VISIBLE >=3D 2011 || __cplusplus >=3D 201103L
=C2=A0void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1) =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 __alloc_size(2);
=C2=A0int=C2=A0 =C2=A0 at_quick_exit(void (*)(void)) __noexcept;
@@ -236,13 +236,6 @@ int=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unlockpt(int); =C2=A0int=C2=A0 =C2=A0 =C2=A0ptsname_r(int, char *, size_t);
=C2=A0#endif

-#if __POSIX_VISIBLE >=3D 202405
-void=C2=A0 =C2=A0 qsort_r(void *, size_t, size_t,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int (*)(const void *, const void = *, void *), void *);
-void=C2=A0 =C2=A0*reallocarray(void *, size_t, size_t) __result_use_check<= br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0__alloc_size2(2, 3);
-#endif
-
=C2=A0#if __BSD_VISIBLE
=C2=A0extern const char *malloc_conf;
=C2=A0extern void (*malloc_message)(void *, const char *);
@@ -312,8 +305,12 @@ int=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mergesort_b(void = *, size_t, size_t, int (^)(const void *, const void *));
=C2=A0int=C2=A0 =C2=A0 =C2=A0mkostemp(char *, int);
=C2=A0int=C2=A0 =C2=A0 =C2=A0mkostemps(char *, int, int);
=C2=A0int=C2=A0 =C2=A0 =C2=A0mkostempsat(int, char *, int, int);
+void=C2=A0 =C2=A0 qsort_r(void *, size_t, size_t,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int (*)(const void *, const void = *, void *), void *);
=C2=A0int=C2=A0 =C2=A0 =C2=A0radixsort(const unsigned char **, int, const u= nsigned char *,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 unsigned);
+void=C2=A0 =C2=A0*reallocarray(void *, size_t, size_t) __result_use_check<= br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0__alloc_size2(2, 3);
=C2=A0void=C2=A0 =C2=A0*reallocf(void *, size_t) __result_use_check __alloc= _size(2);
=C2=A0int=C2=A0 =C2=A0 =C2=A0rpmatch(const char *);
=C2=A0char=C2=A0 =C2=A0*secure_getenv(const char *);
diff --git a/include/string.h b/include/string.h
index 3deca63bd71a..a3fa96ebb449 100644
--- a/include/string.h
+++ b/include/string.h
@@ -63,8 +63,8 @@ void=C2=A0 *memrchr(const void *, int, size_t) __pure; =C2=A0#endif
=C2=A0int=C2=A0 =C2=A0 =C2=A0memcmp(const void *, const void *, size_t) __p= ure;
=C2=A0void=C2=A0 =C2=A0*(memcpy)(void * __restrict, const void * __restrict= , size_t);
-#if __POSIX_VISIBLE >=3D 202405
-void=C2=A0 =C2=A0*(memmem)(const void *, size_t, const void *, size_t) __p= ure;
+#if __BSD_VISIBLE
+void=C2=A0 =C2=A0*memmem(const void *, size_t, const void *, size_t) __pur= e;
=C2=A0#endif
=C2=A0void=C2=A0 =C2=A0*(memmove)(void *, const void *, size_t);
=C2=A0#if __BSD_VISIBLE
@@ -98,7 +98,7 @@ char=C2=A0 *strerror(int);
=C2=A0#if __POSIX_VISIBLE >=3D 200112
=C2=A0int=C2=A0 =C2=A0 =C2=A0strerror_r(int, char *, size_t);
=C2=A0#endif
-#if __POSIX_VISIBLE >=3D 202405
+#if __BSD_VISIBLE
=C2=A0size_t=C2=A0 (strlcat)(char * __restrict, const char * __restrict, si= ze_t);
=C2=A0size_t=C2=A0 (strlcpy)(char * __restrict, const char * __restrict, si= ze_t);
=C2=A0#endif
diff --git a/include/time.h b/include/time.h
index e011792aaaeb..89a76ca5fd93 100644
--- a/include/time.h
+++ b/include/time.h
@@ -180,17 +180,15 @@ time_t posix2time(time_t t);
=C2=A0#include <xlocale/_time.h>
=C2=A0#endif

-#if __ISO_C_VISIBLE >=3D 2011 || __POSIX_VISIBLE >=3D 202405 || \ +#if __BSD_VISIBLE || __ISO_C_VISIBLE >=3D 2011 || \
=C2=A0 =C2=A0 =C2=A0(defined(__cplusplus) && __cplusplus >=3D 20= 1703)
=C2=A0#include <sys/_timespec.h>
=C2=A0/* ISO/IEC 9899:2011 7.27.2.5 The timespec_get function */
=C2=A0#define TIME_UTC=C2=A0 =C2=A0 =C2=A0 =C2=A01=C2=A0 =C2=A0 =C2=A0 =C2= =A0/* time elapsed since epoch */
-#if __ISO_C_VISIBLE >=3D 2023 || __POSIX_VISIBLE >=3D 202405
-/* ISO/IEC 9899:2024 7.29.1 Components of time */
-#define TIME_MONOTONIC 2=C2=A0 =C2=A0 =C2=A0 =C2=A0/* monotonic time */ -#endif
=C2=A0int timespec_get(struct timespec *ts, int base);
=C2=A0#if __BSD_VISIBLE || __ISO_C_VISIBLE >=3D 2023
+/* ISO/IEC 9899:2024 7.29.1 Components of time */
+#define TIME_MONOTONIC 2=C2=A0 =C2=A0 =C2=A0 =C2=A0/* monotonic time */ =C2=A0/* ISO/IEC 9899:2024 7.29.2.7 The timespec_getres function */
=C2=A0int timespec_getres(struct timespec *, int);
=C2=A0#endif
diff --git a/include/unistd.h b/include/unistd.h
index 3a4e1be192d9..8574b2ba9915 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -483,16 +483,6 @@ int=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0usleep(useconds_t= );
=C2=A0pid_t=C2=A0 =C2=A0vfork(void) __returns_twice;
=C2=A0#endif

-/* 1003.1-2024 */
-#if __POSIX_VISIBLE >=3D 202405
-pid_t=C2=A0 =C2=A0_Fork(void);
-int=C2=A0 =C2=A0 =C2=A0getentropy(void *, size_t);
-int=C2=A0 =C2=A0 =C2=A0getresgid(gid_t *, gid_t *, gid_t *);
-int=C2=A0 =C2=A0 =C2=A0getresuid(uid_t *, uid_t *, uid_t *);
-int=C2=A0 =C2=A0 =C2=A0setresgid(gid_t, gid_t, gid_t);
-int=C2=A0 =C2=A0 =C2=A0setresuid(uid_t, uid_t, uid_t);
-#endif
-
=C2=A0#if __BSD_VISIBLE
=C2=A0struct timeval;=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 /* select(2) */=

@@ -520,11 +510,14 @@ int=C2=A0 =C2=A0 =C2=A0 =C2=A0 feature_present(const = char *);
=C2=A0int=C2=A0 =C2=A0 =C2=A0fchroot(int);
=C2=A0char=C2=A0 =C2=A0*fflagstostr(u_long);
=C2=A0int=C2=A0 =C2=A0 =C2=A0getdomainname(char *, int);
+int=C2=A0 =C2=A0 =C2=A0getentropy(void *, size_t);
=C2=A0int=C2=A0 =C2=A0 =C2=A0getgrouplist(const char *, gid_t, gid_t *, int= *);
=C2=A0int=C2=A0 =C2=A0 =C2=A0getloginclass(char *, size_t);
=C2=A0mode_t=C2=A0 getmode(const void *, mode_t);
=C2=A0int=C2=A0 =C2=A0 =C2=A0getosreldate(void);
=C2=A0int=C2=A0 =C2=A0 =C2=A0getpeereid(int, uid_t *, gid_t *);
+int=C2=A0 =C2=A0 =C2=A0getresgid(gid_t *, gid_t *, gid_t *);
+int=C2=A0 =C2=A0 =C2=A0getresuid(uid_t *, uid_t *, uid_t *);
=C2=A0char=C2=A0 =C2=A0*getusershell(void);
=C2=A0int=C2=A0 =C2=A0 =C2=A0initgroups(const char *, gid_t);
=C2=A0int=C2=A0 =C2=A0 =C2=A0iruserok(unsigned long, int, const char *, con= st char *);
@@ -582,6 +575,8 @@ void=C2=A0 =C2=A0 =C2=A0 =C2=A0 *setmode(const char *);=
=C2=A0int=C2=A0 =C2=A0 =C2=A0setpgrp(pid_t, pid_t);=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* obsoleted by setpgid() */
=C2=A0void=C2=A0 =C2=A0 setproctitle(const char *_fmt, ...) __printf0like(1= , 2);
=C2=A0void=C2=A0 =C2=A0 setproctitle_fast(const char *_fmt, ...) __printf0l= ike(1, 2);
+int=C2=A0 =C2=A0 =C2=A0setresgid(gid_t, gid_t, gid_t);
+int=C2=A0 =C2=A0 =C2=A0setresuid(uid_t, uid_t, uid_t);
=C2=A0int=C2=A0 =C2=A0 =C2=A0setrgid(gid_t);
=C2=A0int=C2=A0 =C2=A0 =C2=A0setruid(uid_t);
=C2=A0void=C2=A0 =C2=A0 setusershell(void);
@@ -594,6 +589,7 @@ int=C2=A0 undelete(const char *);
=C2=A0int=C2=A0 =C2=A0 =C2=A0unwhiteout(const char *);
=C2=A0void=C2=A0 =C2=A0*valloc(size_t);=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* obsoleted by malloc() *= /
=C2=A0int=C2=A0 =C2=A0 =C2=A0funlinkat(int, const char *, int, int);
+pid_t=C2=A0 =C2=A0_Fork(void);

=C2=A0#ifndef _OPTRESET_DECLARED
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 _OPTRESET_DECLARED
diff --git a/include/wchar.h b/include/wchar.h
index a8c016c42faf..e4b037c9b16f 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -235,13 +235,10 @@ size_t=C2=A0 =C2=A0 wcsnrtombs(char * __restrict, con= st wchar_t ** __restrict, size_t,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 size_t, mbstate_t * __restrict);<= br> =C2=A0#endif

-#if __POSIX_VISIBLE >=3D 202405
-size_t wcslcat(wchar_t *, const wchar_t *, size_t);
-size_t wcslcpy(wchar_t *, const wchar_t *, size_t);
-#endif
-
=C2=A0#if __BSD_VISIBLE
=C2=A0wchar_t=C2=A0 =C2=A0 =C2=A0 =C2=A0 *fgetwln(FILE * __restrict, size_t= * __restrict);
+size_t wcslcat(wchar_t *, const wchar_t *, size_t);
+size_t wcslcpy(wchar_t *, const wchar_t *, size_t);
=C2=A0#endif

=C2=A0#if __POSIX_VISIBLE >=3D 200809 || defined(_XLOCALE_H_)
--0000000000008eff690630c32596-- From nobody Thu Mar 20 11:14:31 2025 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 4ZJNJT6JJvz5qhLg; Thu, 20 Mar 2025 11:14:33 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJNJT4YFvz3Xjs; Thu, 20 Mar 2025 11:14:33 +0000 (UTC) (envelope-from shurd@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742469273; 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=iSD0hp37UIYBjYa3T3RG2267FTMli8LEhEng5ACGALc=; b=Nz2oE0FkSUex7mcLfLHVMEmt6lSKdPPsDvKvoYfEeN6x7g2G2hhe7a4sNs5Tw1tVGdioZx O52B4YsM4ygQqMCTsnwcOHgVPStpV1ZDa9ZW6XrVideJFYg01/1u0TWmMDZg8JJj5YUrof St8vJCiwCizHtsWvYBin9QfrZrYBWz39P06NAJ7Y5Jy5rJS1EIp88utmTjQfL84LTkWUq+ /5Uooi0lT9plORlXndHapPZIgcBE5clx8SaEVwP2eHqLbEvc2L70fVU3HqlJi3snme3SFV LdmZ8Sq8rjK6VJoflXcfPt0yFAqcB1ilr0aEita33McDCAiR+Oglzfy5xA53JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742469273; a=rsa-sha256; cv=none; b=ci4zrSqPgOPFfMdo9MsfzerdT1zorx/Q8DAphOQoHzc8fS2eOQKa1A94J2pnj7n9f+e2ml JO4ZvY2AEQhnbCSsoCNUj55yHEQzRWe30vPHGb3EkTd+mWmrsRuq+htTSKgRf1hug755Kn 2xlZol1m0lLa6Q8JlyATBX2snV+tKF3ISTbk+Fv9M3XEPPDt7ggFvO50MPCmHzrntFJ8h1 5p5SpPPTVosFAA3kmJe5rKgKc6+xj0fK2wJHM8HlpVm4cObtJuyM9uXIN6CO2FYzBzY7j0 v+FYILVoH4y8YDnMRI/edFNZjgzkR2U4N6Bjk+5KWOLWh36uuMAR10DIuskXYw== 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=1742469273; 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=iSD0hp37UIYBjYa3T3RG2267FTMli8LEhEng5ACGALc=; b=WwU7eBCQB4Kvn56IwAqbi45HtKc2lmn41CLlKi06kDSwFUJ3GpQYbVAvEGNamTPJ91tQRn c8xfA3zpNnW1g0sj4b9Ub1zruwG6jCDv0mlUT03STLnhnyLA9xLJfc8HfjDwi6qTEcUjdf pkp+F+sKGbx9Tj3QXks4p1Thq4J9Oi8wGMlzJO5fYggq3OV7Fqty0sOQ459unuuo5yu260 liC6UCwtoFh4fc0l6KGie8d0inXGhhOkkuhfXmmw+ZuwCyvWltR5Sr2nzP/701fb9PX/Yk ndO3LzXrsN9v9/lS33QswT8HENX0dpWvHHfRy2UbVdi0eMZEJRnh0pDTFs6qbg== Received: from [IPV6:2601:404:ce00:7c90:ec4:7aff:fec4:ac4a] (unknown [IPv6:2601:404:ce00:7c90:ec4:7aff:fec4:ac4a]) (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: shurd) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZJNJT0rqzz1Bqh; Thu, 20 Mar 2025 11:14:32 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Content-Type: multipart/alternative; boundary="------------WF10o1c7MsMLihyxeV7pRg8T" Message-ID: <8521154a-def4-4da4-97b1-d1d8df65e564@FreeBSD.org> Date: Thu, 20 Mar 2025 07:14:31 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 415a0ce02c9e - main - Revert Make newly POSIX functions visible To: Warner Losh , Stephen Hurd Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202503200741.52K7frms088363@gitrepo.freebsd.org> Content-Language: en-US From: shurd@FreeBSD.org In-Reply-To: This is a multi-part message in MIME format. --------------WF10o1c7MsMLihyxeV7pRg8T Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2025-03-20 05:55, Warner Losh wrote: > > > On Thu, Mar 20, 2025, 1:42 AM Stephen Hurd wrote: > > The branch main has been updated by shurd: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=415a0ce02c9ee2c15c7973b2dfbddda71f6344a2 > > > commit 415a0ce02c9ee2c15c7973b2dfbddda71f6344a2 > Author:     Stephen Hurd > AuthorDate: 2025-03-20 07:15:15 +0000 > Commit:     Stephen Hurd > CommitDate: 2025-03-20 07:41:27 +0000 > >     Revert Make newly POSIX functions visible > >     Summary: >     This reverts commit d7efac1be1441c122f7fb9de51a409172f21326c. >     This reverts commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a. > >     Some ports (specifically Python) define __BSD_VISIBLE > themselves, so >     the change from __BSD_VISIBLE to __POSIX_VISIBLE >= 202405 > makes them >     fail. > > > That's not legal. Defining __BSD_VISIBLE directly is illegal and won't > work right. Can't work right and should likely be a compile time > error. With am exp run to fix. The Python commit that added it for the curious: https://github.com/python/cpython/commit/abccf41a7d616cc950510ad4a3526b11e012ee24 22 years ago for 5.x The root of their usage appears to be the use of _XOPEN_SOURCE 700 with the following comment: # Some systems cannot stand _XOPEN_SOURCE being defined at all; they # disable features if it is defined, without any means to access these # features as extensions. For these systems, we skip the definition of # _XOPEN_SOURCE. Before adding a system to the list to gain access to # some feature, make sure there is no alternative way to access this # feature. Also, when using wildcards, make sure you have verified the # need for not defining _XOPEN_SOURCE on all systems matching the # wildcard, and that the wildcard does not include future systems # (which may remove their limitations). They mention _GNU_SOURCE to "re-enable" Linux extensions, so apparently went looking for the same thing on BSDs and found _NETBSD_SOURCE for NetBSD, _DARWIN_C_SOURCE for macOS... and __BSD_VISIBLE for FreeBSD I assume they started using _XOPEN_SOURCE for the wchar.h stuff and just followed the path of least resistance. I do note that the (new for 15?) cdefs(9) makes it clear that _BSD_SOURCE is the correct way to explicitly ask for everything now, though there doesn't seem to be any explicit support for that yet (basically, it's assumed unless one of the other mutually exclusive macros are defined). --------------WF10o1c7MsMLihyxeV7pRg8T Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit
On 2025-03-20 05:55, Warner Losh wrote:


On Thu, Mar 20, 2025, 1:42 AM Stephen Hurd <shurd@freebsd.org> wrote:
The branch main has been updated by shurd:

URL: https://cgit.FreeBSD.org/src/commit/?id=415a0ce02c9ee2c15c7973b2dfbddda71f6344a2

commit 415a0ce02c9ee2c15c7973b2dfbddda71f6344a2
Author:     Stephen Hurd <shurd@FreeBSD.org>
AuthorDate: 2025-03-20 07:15:15 +0000
Commit:     Stephen Hurd <shurd@FreeBSD.org>
CommitDate: 2025-03-20 07:41:27 +0000

    Revert Make newly POSIX functions visible

    Summary:
    This reverts commit d7efac1be1441c122f7fb9de51a409172f21326c.
    This reverts commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a.

    Some ports (specifically Python) define __BSD_VISIBLE themselves, so
    the change from __BSD_VISIBLE to __POSIX_VISIBLE >= 202405 makes them
    fail.

That's not legal. Defining __BSD_VISIBLE directly is illegal and won't work right. Can't work right and should likely be a compile time error. With am exp run to fix.

The Python commit that added it for the curious:

https://github.com/python/cpython/commit/abccf41a7d616cc950510ad4a3526b11e012ee24

22 years ago for 5.x

The root of their usage appears to be the use of _XOPEN_SOURCE 700 with the following comment:

# Some systems cannot stand _XOPEN_SOURCE being defined at all; they
# disable features if it is defined, without any means to access these
# features as extensions. For these systems, we skip the definition of
# _XOPEN_SOURCE. Before adding a system to the list to gain access to
# some feature, make sure there is no alternative way to access this
# feature. Also, when using wildcards, make sure you have verified the
# need for not defining _XOPEN_SOURCE on all systems matching the
# wildcard, and that the wildcard does not include future systems
# (which may remove their limitations).

They mention _GNU_SOURCE to "re-enable" Linux extensions, so apparently went looking for the same thing on BSDs and found _NETBSD_SOURCE for NetBSD, _DARWIN_C_SOURCE for macOS... and __BSD_VISIBLE for FreeBSD

I assume they started using _XOPEN_SOURCE for the wchar.h stuff and just followed the path of least resistance.

I do note that the (new for 15?) cdefs(9) makes it clear that _BSD_SOURCE is the correct way to explicitly ask for everything now, though there doesn't seem to be any explicit support for that yet (basically, it's assumed unless one of the other mutually exclusive macros are defined).

--------------WF10o1c7MsMLihyxeV7pRg8T-- From nobody Thu Mar 20 17:59:41 2025 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 4ZJYHz3hpqz5r9nR; Thu, 20 Mar 2025 17:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJYHy2f0xz4LTD; Thu, 20 Mar 2025 17:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742493582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpmZTRJwucFIA0+s6sOP64vOmrZ3leZB4BlYksziE80=; b=Ik5WcEqr2dNC05UB/DSpi/zvHvYO4ZkkPlkgEmK0uYUTn5seQYuHHSgh7WCJX8nvTALbff gyhe+XIfzwKWO33JldZwDj5XiWXZk9hmJmFbIMV4ctrVFijtB2Oj7q6LP5fJqiI2qRxE2o 6UPYEswa9Ohr/KsGj6GFSc/cPKrN2cpXZM1iPP691+AuDck152tQtNEQKYKGXboY+kwUnH 3O+VmGEGaA7sbrFE9bjt6Z67pyGJ7TG51uF8MYsvk1+hqk59tMRQ8n2GPIScRMzFgKJxpK gDXTxhXFIrQRQV5/1QJ9jQNJyjw/gRuK88qVPZ7CsCo/LW3Xfc/WbKSys7f4EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742493582; a=rsa-sha256; cv=none; b=wVh5eJp5r2st3TKynfb927sq/CKZEAFx4VK3aYdBWAEF7RLSs5/w6uaNRjsttC0sla6u6u yT8IdBoxT2bkJ7SvC7XfF4Hzd2A2nyMrxcPii5J6RUdc5Ze9/Mh+cQQn7T9DOp3gJcQEnw arkyXfBIeq+6psYZxnGRyrZRbU19Hr4TVbg61VOa4j3PkObdOJfes7RB0pr5cJO7f+ZTqI QWh1a6g7G18lHEwqDN/T5GN5/ljSzNYPA1KsdR92/yAEZ1W/DlnWDi2e8gXJTfgqzEJt4D W4JoFHwSblj3P6FKYehDOwdxz5XqTe24XnfNDO7g7GPT6SE6WfFtXq9Q6z675g== 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=1742493582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpmZTRJwucFIA0+s6sOP64vOmrZ3leZB4BlYksziE80=; b=pwOORuqebu8AFP0KKK2rD/1+36jFOL0rknwb3i4o+w1vEdwb1H6pdZiSbGoFclx70NHNg0 Kbf61ErXUTRVA/GSnKm47uTN9WQjf2vdtQaEyhH2rVD3a9cu+R0OVX9sL2Adawd9USJPKQ /aPU66N5jmPf7+jUYRAb5c6Z4vT32ifpe75+puFYI7rnZy7/gcOFBvUwvPJsFQj9QofENg DMx/dejmJnl2sfZEyN1fPP79CE4+LN6T1tWPy02zvLCTDncZUwS5I480xM2VYL86/ITs/8 D0wN2bSAUfW13skK3KOZkIuE8Z/k6btEVyHsVQLyOBZq/TDllrG8ChT1eIcmCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJYHy0Nqrz1Dqh; Thu, 20 Mar 2025 17:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KHxfEW040558; Thu, 20 Mar 2025 17:59:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KHxfF2040555; Thu, 20 Mar 2025 17:59:41 GMT (envelope-from git) Date: Thu, 20 Mar 2025 17:59:41 GMT Message-Id: <202503201759.52KHxfF2040555@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: fdc4db57224c - main - usr.bin/Makefile: always build ELF Tool Chain strings(1) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: fdc4db57224ce19b867c60fce4c410068be40c27 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fdc4db57224ce19b867c60fce4c410068be40c27 commit fdc4db57224ce19b867c60fce4c410068be40c27 Author: Ed Maste AuthorDate: 2025-03-20 17:47:29 +0000 Commit: Ed Maste CommitDate: 2025-03-20 17:59:32 +0000 usr.bin/Makefile: always build ELF Tool Chain strings(1) strings(1) is not conditional on WITH_/WITHOUT_TOOLCHAIN, as it is a small utility that is also useful outside of the toolchain context. As of commit 1cae7121c667 we switched to WITH_LLVM_BINUTILS by default. After this change building world with default options but installing WITHOUT_TOOLCHAIN failed, because we would build LLVM's strings but attempt to install ELF Tool Chain's version, which did not exist. Address this by always including ELF Tool Chain strings in non-install make targets, so that it will be available if options are changed at install time. PR: 285556 Reported by: Michael Butler Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49425 --- usr.bin/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index bca7896e5a17..15fcdeb479f7 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -250,6 +250,12 @@ SUBDIR.${MK_TOOLCHAIN}+= nm SUBDIR.${MK_TOOLCHAIN}+= objcopy SUBDIR.${MK_TOOLCHAIN}+= readelf SUBDIR.${MK_TOOLCHAIN}+= size +.endif +# Include elftoolchain's strings in build targets even if using LLVM_BINUTILS, +# as we may later install with different options. In particular, the release +# artifact builds use default options for buildworld but install with +# MK_TOOLCHAIN=no which implies MK_LLVM_BINUTILS=no. +.if ${MK_LLVM_BINUTILS} == "no" || !make(install) SUBDIR+= strings .endif SUBDIR.${MK_TOOLCHAIN}+= c89 From nobody Thu Mar 20 19:35:34 2025 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 4ZJbQb114Cz5rHQk; Thu, 20 Mar 2025 19:35:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJbQb0Vdlz46Wf; Thu, 20 Mar 2025 19:35:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742499335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZw13nzikHsugiypvgVo1MlpGFdNM00A7UwX9MAzmJo=; b=RfCG2c5O0l20BgdrpdYrcKS3QCZKDt1IqkciBOl8dRXIxG8xBh1mlD7+n5TlmoQgTB5XxQ 3Byqw67JNkF2auLieyfTDBxjL3+HTWHzHx0wNJ5loqbfy6+mkOQzIPhenR7sqOitYFCX4E qFg2nFAHsoDo17mL7Nwhod6XSLuodOx0MGHt+p2BFHWA09ocXh+lb3riZ9tkxSFXwIJxxG VonI7vt6+zvXFa1kvZL9sNGlEgzDffjKWXfifTn0Q9KzMVLd2M4blYjlgRexGr1P8fsy/u 5yp+8KIKJDRZAapIUyBVGPe2PCSUk6ha0KvnSh7sP+kvqECT3hHGrkwA0/fk4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742499335; a=rsa-sha256; cv=none; b=xpNdQmnV7aZ7WNhMRS5poJqY0k0FMQgO20r3rUJmuwYL+dIGvqqoCHJlvHfhjGhkOuDEsG Onz1THPLXxHZ0QsOf0eDSm7++G915du/t81gnSxcGjB0mF310sFJOjgcWlCLgGlER/LI8n XIHm6MRjMXzcIUlLwj6kDl9qrwhUr0SW/5lULsGznhwIQadgljrJmaupUeaIisHzyGRNaL Y9kelwSYt34KDOb4y82naLZb+PhA2TgU7NJeIY7DmcOdJ78Fjmzt8qspPVzOFbiQbiJI9m 03APj11n92ycgvfj4UykuL7+rAKP940hN3bnJ5C2QmOYlEuAfmKL4v9LAWy1FA== 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=1742499335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZw13nzikHsugiypvgVo1MlpGFdNM00A7UwX9MAzmJo=; b=KjGI0YAGigcBHbhnNRcUs8BrMoj1K3f9eU11dWvkJ1yaKqd8HfxTNALAkNlwyTXTG6rYaJ h/ACmNBzPTWXJBYDWVMRt59T1eaogLudhqEcNS2kQcAQNQwCLwLwZH7FM3tSfWoTABvLli 4PT9tnHtHxM6stV7+q37ot32Iog+n/aN9LI74+7rT34Fzwspah4i+fpoY3PWi9A8YrRWLO Vs7o7CrIJseDgbKJ7cT9ZwmRbNAF+U550pNF1hTQDmOO614L1PvZzOYSLqTiHaYOoZMKXY guCdlNVV+ZTpc2dFtXaIvi9z1QMdcjuNTKQ3DlHQgQrjg/g7vdU7t+i1Qd4h2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJbQZ74J5z1HRZ; Thu, 20 Mar 2025 19:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KJZYD1026829; Thu, 20 Mar 2025 19:35:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KJZYpG026826; Thu, 20 Mar 2025 19:35:34 GMT (envelope-from git) Date: Thu, 20 Mar 2025 19:35:34 GMT Message-Id: <202503201935.52KJZYpG026826@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: fbcf3b74e8f2 - main - tcp: fix detection of bad RTOs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: fbcf3b74e8f2c0c5ba37f1839bfe9395eb2fd0b1 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fbcf3b74e8f2c0c5ba37f1839bfe9395eb2fd0b1 commit fbcf3b74e8f2c0c5ba37f1839bfe9395eb2fd0b1 Author: Michael Tuexen AuthorDate: 2025-03-20 15:17:40 +0000 Commit: Michael Tuexen CommitDate: 2025-03-20 15:17:40 +0000 tcp: fix detection of bad RTOs If timestamps are enabled, the actions performed by a retransmission timeout were rolled back, when they should not. It is needed to make sure the incoming segment advances SND.UNA. To do this, remove the incorrect upfront check and extend the check in the fast path to handle also the case of timestamps. PR: 282605 Reviewed by: cc, rscheff, Peter Lei MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D49414 --- sys/netinet/tcp_input.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index cf480ccf9772..8f50843d940d 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1635,11 +1635,6 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, to.to_tsecr -= tp->ts_offset; if (TSTMP_GT(to.to_tsecr, tcp_ts_getticks())) { to.to_tsecr = 0; - } else if (tp->t_rxtshift == 1 && - tp->t_flags & TF_PREVVALID && - tp->t_badrxtwin != 0 && - TSTMP_LT(to.to_tsecr, tp->t_badrxtwin)) { - cc_cong_signal(tp, th, CC_RTO_ERR); } } /* @@ -1792,15 +1787,17 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, TCPSTAT_INC(tcps_predack); /* - * "bad retransmit" recovery without timestamps. + * "bad retransmit" recovery. */ - if ((to.to_flags & TOF_TS) == 0 && - tp->t_rxtshift == 1 && + if (tp->t_rxtshift == 1 && tp->t_flags & TF_PREVVALID && tp->t_badrxtwin != 0 && - TSTMP_LT(ticks, tp->t_badrxtwin)) { + (((to.to_flags & TOF_TS) != 0 && + to.to_tsecr != 0 && + TSTMP_LT(to.to_tsecr, tp->t_badrxtwin)) || + ((to.to_flags & TOF_TS) == 0 && + TSTMP_LT(ticks, tp->t_badrxtwin)))) cc_cong_signal(tp, th, CC_RTO_ERR); - } /* * Recalculate the transmit timer / rtt. From nobody Thu Mar 20 19:53:55 2025 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 4ZJbql5LyCz5rJHn; Thu, 20 Mar 2025 19:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJbql2x7jz3MkL; Thu, 20 Mar 2025 19:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742500435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gpz2qvgCC/bOHu8lDoUXrhyTni7qhDxxpwDMrk9KEN4=; b=HfFVwCwSrsEhfM4+/5GEopvcbXrbN3brA+xNFA0qnEf/zFhTOAWG7rS6o1uQi3JbAOGV9l /G0HcSXxMGsMx8+PmJvVAdi4oNFLz93UjytRuRQSMUbi0fMPHRtoFEPCdh3i8yh1zv472i GtSn0qWr7SOfNe+NZQqXQ3MPV3aiZWtKajbMSmdkCKbueB1hUTWr9Yvlors5pZKLu0VHLp jqKUycE8KMZCaK6vpmf9F5m6EABGZ9HgAJRH1c0651+chG2LV1tBWVihehsgJ+qTtbDsSo PGXJ8+twkw9ZTIhmwQ2yzZcWsx5PVRu0AlAEyRkDr/XecNonxNOnIQRWAE02HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742500435; a=rsa-sha256; cv=none; b=CpomRIBehIuDQwEfn1p4ji5XikH1EFy6aFW3gYkA3JdLWvfP7IejwUvVWFUNIc/0nNjv/Q bts6VhxAwWvEFQr301JcxjhwUpz+0jiaoDQoL9DMMc7K9dxHKVtAnfzLXXiFSuVxIb91yI rZbHGPGHdwwoWkTA/Z4BA3gZ7T9TSbvJZrJgOPB5Sl/ExtH+h8eEVAhVi/mFuw4bSCPjSV S8a8A26n4pgIIyrTWQ6+i3j+eN3DH9RhNT4TqcDzDrw9ajowCx7ALknyP4LNCzk0HVsnjh ZZiSK7LId28NRiuSf5uG6RiKEi9xn/O/T0XT1zsHMlNW384OUBvcfUxaKWZDkQ== 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=1742500435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gpz2qvgCC/bOHu8lDoUXrhyTni7qhDxxpwDMrk9KEN4=; b=BEiPWtfC5NLrlToHQrFdOXzGfvgQ5xwadiMSOcEbpLgpVwqVin0dM7zVZb+eXWtSjgkv0f 6Ao2z4FwRVVE0WNfpIAvOP9i2Bus5maDBl/senMr3h0uunQKV63f55owVn/01QTGFyeRiL TpiSQfjoFDLlVZJ+RCvP4yegF5qVeCIT8yE5LoEIAcfENhz9MVWJ7KgjXiikXYbC6q/6Dx QBaGzcMTgky4FjHh26Jb2iSnRWjTarAJvuMkWyrO5yMxKGnCiYwdP8UyQzNTSej9kLwXSH iXsEJlmZFCZAd6unqYXh7cEufkPYh5TJ2llE+csa4ur1vnUe1YEz9zQ6cvVDkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJbql2HHYz1JHY; Thu, 20 Mar 2025 19:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KJrtiD063914; Thu, 20 Mar 2025 19:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KJrtMZ063911; Thu, 20 Mar 2025 19:53:55 GMT (envelope-from git) Date: Thu, 20 Mar 2025 19:53:55 GMT Message-Id: <202503201953.52KJrtMZ063911@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: 039eac2463d7 - main - linuxkpi: Add `strim()` List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 039eac2463d7b0b1b863a57c78cb2e054c210197 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=039eac2463d7b0b1b863a57c78cb2e054c210197 commit 039eac2463d7b0b1b863a57c78cb2e054c210197 Author: Jean-Sébastien Pédron AuthorDate: 2025-02-24 23:30:11 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-03-20 19:43:44 +0000 linuxkpi: Add `strim()` This function trims whitespaces at the end of a string and returns a pointer to the first non-whitespace character. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49374 --- sys/compat/linuxkpi/common/include/linux/string.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/string.h b/sys/compat/linuxkpi/common/include/linux/string.h index 32470312b78b..f7b64560d254 100644 --- a/sys/compat/linuxkpi/common/include/linux/string.h +++ b/sys/compat/linuxkpi/common/include/linux/string.h @@ -161,6 +161,24 @@ skip_spaces(const char *str) return (__DECONST(char *, str)); } +/* + * This function trims whitespaces at the end of a string and returns a pointer + * to the first non-whitespace character. + */ +static inline char * +strim(char *str) +{ + char *end; + + end = str + strlen(str); + while (end >= str && (*end == '\0' || isspace(*end))) { + *end = '\0'; + end--; + } + + return (skip_spaces(str)); +} + static inline void * memchr_inv(const void *start, int c, size_t length) { From nobody Thu Mar 20 19:53:56 2025 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 4ZJbqn2rNMz5rJHr; Thu, 20 Mar 2025 19:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJbqm5yR3z3MkV; Thu, 20 Mar 2025 19:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742500436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MafCZCL/vd1SsFGUigngnYJDmt2lYOlmOJ88HFsam+M=; b=m4Yl+Md8Shk2y9ivycA0vTBtDR7UepkPFPaLwk2jJgPQOJ73GFjHZDnrRNRvzkzBixiYBh x3nWnXF7uCHNOFI835niFTaizBP5+up1VndjkgKtSb2oGeLin6BsF7caWjaYF37NWg2JXf v9/jjWGydIZRstyb/RQVPxFM95J7dPmM5izw6t9EbazQKTuPMIpZzjmxxzyJt/Mdlsq7Mo rK0FLQM5gjp5g5ifXTCNK2piJvX8OGeM8TroTDkyJ4Zbx74i/djm2NMj/O8v4ZaVnp15yq xKwn327QWS2hapeZaDCQNB+IHSRdiGX/IAD5xl3kKHVaN9j0HF1sn6X1Yvf1IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742500436; a=rsa-sha256; cv=none; b=q22pQUE4GhVX7ehVnYvcnWx2cz81yofvQHCVTyDoe+m6C42A6cAib9cCvb1DMfan8HxTKJ 48q0+i5hY5Zi3wRpzM4k6a2bT7BBGpefhVzx6C6PAfx00hhcEXx/hnyZkJcPEdyTeuiTNd k8ZLfkuWkre6VjvMLGBAqR0bYpYZb2ZmT3fyB77FlGiEMJ4cHqQY+1zB0wBe74+U//G8gH 7Y+TUHZK+hGw2G7LFB7qauP/TKApK75KOvyxev67TYhmIPJnvfbQD5SZYUgS9flhvj7u2f 8s7uK5UiQu7UiPYMN7gDDyYRgK6Hi9/uqdD9yYDoK7W8efzOAAyPTgthythNsw== 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=1742500436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MafCZCL/vd1SsFGUigngnYJDmt2lYOlmOJ88HFsam+M=; b=PApb5BOfRTpuaZbUMIGBaSg0K9uYNbDzMmChqxcWy1Cftos0zNxBbU+SJK4SZhRgFxGzoK p863qKarLXD46xB8rhk5aksJc/foWqyAd0az59BFJAaqAbiJ4AYFnUFVStML7Nq666kLmk bYtq4yaYhM16yl7j2JOORWBiirfu1lgL8Zt/mvQ+EVt75LRM4rSwZQ6jzqzsJr0VQgomWr KTad8uH9zaLxpkGgvuoJuco8bnkT+uAfq+mlzN9/C7Tl+m7M63i7MejdildaLod53evG2G ExIE22ZinxssNM1R0LpnP5hWrkKuBEY3Xu/jhH8IuKZFoZ581Wd1tAh495kYfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJbqm2xScz1JZ5; Thu, 20 Mar 2025 19:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KJruKl063955; Thu, 20 Mar 2025 19:53:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KJruFv063952; Thu, 20 Mar 2025 19:53:56 GMT (envelope-from git) Date: Thu, 20 Mar 2025 19:53:56 GMT Message-Id: <202503201953.52KJruFv063952@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: 09ba3ece1817 - main - linuxkpi: Add `list_for_each_rcu()` List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 09ba3ece18177c6ed96f8be75c6d648e9d20acdf Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=09ba3ece18177c6ed96f8be75c6d648e9d20acdf commit 09ba3ece18177c6ed96f8be75c6d648e9d20acdf Author: Jean-Sébastien Pédron AuthorDate: 2025-02-22 18:25:51 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-03-20 19:43:44 +0000 linuxkpi: Add `list_for_each_rcu()` This is a variant of `list_for_each()` where the next item in the list is read using `rcu_dereference()`. This is used by the i915 DRM driver starting with Linux 6.8. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49375 --- sys/compat/linuxkpi/common/include/linux/list.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/list.h b/sys/compat/linuxkpi/common/include/linux/list.h index eecb517d780e..a6c74a324dac 100644 --- a/sys/compat/linuxkpi/common/include/linux/list.h +++ b/sys/compat/linuxkpi/common/include/linux/list.h @@ -234,6 +234,11 @@ list_del_init(struct list_head *entry) for (; &p->field != (h); \ p = list_prev_entry(p, field)) +#define list_for_each_rcu(p, head) \ + for (p = rcu_dereference((head)->next); \ + p != (head); \ + p = rcu_dereference((p)->next)) + static inline void list_add(struct list_head *new, struct list_head *head) { From nobody Thu Mar 20 19:53:57 2025 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 4ZJbqp2DYFz5rJSZ; Thu, 20 Mar 2025 19:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJbqn6C0dz3Mn2; Thu, 20 Mar 2025 19:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742500438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zFckBS4bPTzE8x3G7pRWgk7oHyXSrq+GWfZ2QZY5W5Y=; b=xjiFgFFjeZV3Z73pTy2ef1JUQ8qwKUCJREss8rvwKWmubWYfoDd5Fn2IoaPy7ZPzl52xs0 3TKpGkJL/tpXweRZyuYU83phVXkWiZ3z+U2+gPkXMMx3fw2xlKZcgEGxuprdoRK+LQDufF T9JRCzH6pHXmyatUaTZeyj1cuPjIp6QsrKgFrjjt7aCzsUEUt+IfnigR+2OMLuoHUs7xbs aasXvGqt/8J/7eT0F0yfJuaRaxTz4Mv7d/7iQrLMC996cne27PnS1KEEXxRFieSM3zCp2+ fsoPQYVPxSXHgabsb9t9bmteB1/8YcVyQ7NVxDBDKPLgt3J6I1HYlqVD9Hoa6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742500438; a=rsa-sha256; cv=none; b=bXoaUh95vA4Gfaf1hYYCl/9dzrBkTgWYJSPDsFEWGzCTa63zB9wbBCOGOfsm1S4MQ+iP9L wxEopSkheYDRC1aMBcppwNRNco+TB5DqOC3kKtgYQgQmw9Gc0ehF27yqnBOsLDOf2q8nHK Vuc4+7r+b7gOrvzweGWzib5YuYkelyYl94sjkx+m7PybsEsFrv9Iv2bxg8ltLfAT/qIvnM 1rO6qJrjDT9M2EkfAE1Kd60GmTVSsfjnqRsTr1zz8F1kRpLLHXQS2JLui3fQtHBNfvbJfa w0o0wAhi68+ouEnAVUjQQ+dijbDFfOF/VTWDnkqeKmt5eJ9nbPMoLKAiLRr11g== 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=1742500438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zFckBS4bPTzE8x3G7pRWgk7oHyXSrq+GWfZ2QZY5W5Y=; b=A362hPwLneuxJ7n0HDfZvNVoqFRtx5KP7gK7Czc9jrFMx8TzZyG3vpNVIYsTdpVY1eIRUx bRPDXLSewr8tF2D6AyXOKai1NNsTqSa2D8By2AOZwxv5dag5fQVpFGkYXrG4bm9mfAkKKv elNWy2wMbreiRtH116/G9mk08psgr6cv4X6RTVgi+z7oP7HB9uXdWe6bMvy6eQiF04HFph InzJa7ro55WDtrpkTxZeoIqeExIDQTLrs3PzUlLAzd82hRBll5yeXQdQo43q6kqso2tzUR e3+5CaCGeaE9GDlmnr/jcCh5o8LhFGz+DqubLwwHh0AwaKiYUjQruA12yqHCcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJbqn3vwsz1Jbl; Thu, 20 Mar 2025 19:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KJrv6i063995; Thu, 20 Mar 2025 19:53:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KJrvQ9063992; Thu, 20 Mar 2025 19:53:57 GMT (envelope-from git) Date: Thu, 20 Mar 2025 19:53:57 GMT Message-Id: <202503201953.52KJrvQ9063992@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: 3f847ccfd51e - main - linuxkpi: Define a few more `PCI_*` constants List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 3f847ccfd51edd0640cc892424a76a7460c353e8 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=3f847ccfd51edd0640cc892424a76a7460c353e8 commit 3f847ccfd51edd0640cc892424a76a7460c353e8 Author: Jean-Sébastien Pédron AuthorDate: 2025-02-25 23:27:02 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-03-20 19:43:44 +0000 linuxkpi: Define a few more `PCI_*` constants They are synonymous to existing FreeBSD constants. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49379 --- sys/compat/linuxkpi/common/include/linux/pci.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 31475d6dc7c3..afd6c827b3b4 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -116,6 +116,10 @@ MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ #define PCI_COMMAND PCIR_COMMAND #define PCI_COMMAND_INTX_DISABLE PCIM_CMD_INTxDIS #define PCI_COMMAND_MEMORY PCIM_CMD_MEMEN +#define PCI_PRIMARY_BUS PCIR_PRIBUS_1 +#define PCI_SECONDARY_BUS PCIR_SECBUS_1 +#define PCI_SUBORDINATE_BUS PCIR_SUBBUS_1 +#define PCI_SEC_LATENCY_TIMER PCIR_SECLAT_1 #define PCI_EXP_DEVCTL PCIER_DEVICE_CTL /* Device Control */ #define PCI_EXP_LNKCTL PCIER_LINK_CTL /* Link Control */ #define PCI_EXP_LNKCTL_ASPM_L0S PCIEM_LINK_CTL_ASPMC_L0S @@ -226,6 +230,8 @@ typedef int pci_power_t; extern const char *pci_power_names[6]; +#define PCI_ERR_UNCOR_STATUS PCIR_AER_UC_STATUS +#define PCI_ERR_COR_STATUS PCIR_AER_COR_STATUS #define PCI_ERR_ROOT_COMMAND PCIR_AER_ROOTERR_CMD #define PCI_ERR_ROOT_ERR_SRC PCIR_AER_COR_SOURCE_ID From nobody Thu Mar 20 19:53:59 2025 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 4ZJbqr1wDrz5rJc7; Thu, 20 Mar 2025 19:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJbqq6bgVz3Mw6; Thu, 20 Mar 2025 19:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742500440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gCNuhyzgvBfFBo1u00SDzXtUqOrTmOlUkXjqB2tEnAw=; b=SRktWjwLiB9pKQ0Tg+x8NssZAKNSY1v1rQ04/wzq2BReotI19LJMrJr32/hyzfdDWG/4ET Tng/T4CoSIhMlxD5821WI6YW5JaJPcWUW9aeo6ZAgjucppZd22RO8sYVRj2i/EZ/jBZm+l zTZWyP5WKIXMSElr3nEE+Td/kZkBcj/92ElEV5vMoVXwn98ncrzqFCGE0saenzZp2F20ZY 6PRQohpsGr/0OTAcnDueodnQaCoJePlSY7P7RidBEnmUkPPIbINOfXf/R9ulfBZTVDo00o +95hEo5npzQ1MBCCv3smEdjzKH0MltFRYDqTXpiDsbBiOE8/kKKhUDMbaRuIaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742500440; a=rsa-sha256; cv=none; b=sTrZMYsMWFdph9w474cgBHfp3doFWSsxAkvQ7SpdIbNX0nyi7O0T6MfyDDlv1Hs93aUu7h m0y9nEgn12cMSpDpCS9S2vYu6E7hm4fcmicucLHmsXsx5kQNoFSgkHNmbsgdgOC56WimLP 90579umz4ADw+P1EZD8/4q0m/kH/fNhuTGxTXPGrd9rByi1pFfqvyWOMPtKaEeaXT/aZfL gXskIH/EIDJglc/zWDrFE0g2l4/GQyAyDmgDT8gTIwLmtFlxQaiQMXMj/5vFNAi3len9sa niTJy/iEQpXuIF1WcQYgBK7VxAdZwUS909fl4ZDSzKOf2mqZ09RAP6W5yqiRSA== 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=1742500439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gCNuhyzgvBfFBo1u00SDzXtUqOrTmOlUkXjqB2tEnAw=; b=CxjSPF1XgFlJeLCMpEFJ+jAdd+zsGNhCJo53JTyHfC9sHFb9uoHtNcH1sfBIKjvsO/5tcC b09yG5/nzLGk/GQcj3qvRRdbzape2T2Ztac5t8ugg9sfpB2YIge2pRZ8AH5IZHRhvNv6aZ YC/yufDw5qE9VTrccAp9mfQbQwo1kvzfhPiJHgUBPBGEPaIEanbaur68ao+X3feo93V+dD hMLiVazbWZarzC11AiYwipqfaDRdK+F0xfE8uVEHeM6/DDrsBRsv1N+imR3FFqifaGSOjo 7ds69Lvm01+5qkWVsRHsj+F1nB3X+r3CXtC72dWHouek0McmvhzvcJqr0CtBbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJbqq69Lwz1JHZ; Thu, 20 Mar 2025 19:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KJrxJ0064083; Thu, 20 Mar 2025 19:53:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KJrxf8064080; Thu, 20 Mar 2025 19:53:59 GMT (envelope-from git) Date: Thu, 20 Mar 2025 19:53:59 GMT Message-Id: <202503201953.52KJrxf8064080@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: cd8c2e012761 - main - linuxkpi: Add List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: cd8c2e012761bf672074798be64d5ce16af7aff8 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=cd8c2e012761bf672074798be64d5ce16af7aff8 commit cd8c2e012761bf672074798be64d5ce16af7aff8 Author: Jean-Sébastien Pédron AuthorDate: 2025-03-03 19:32:20 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-03-20 19:43:44 +0000 linuxkpi: Add Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49385 --- .../linuxkpi/common/include/linux/cpufeature.h | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/cpufeature.h b/sys/compat/linuxkpi/common/include/linux/cpufeature.h new file mode 100644 index 000000000000..046fab53d521 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/cpufeature.h @@ -0,0 +1,37 @@ +/*- + * Copyright (c) 2025 The FreeBSD Foundation + * Copyright (c) 2025 Jean-Sébastien Pédron + * + * This software was developed by Jean-Sébastien Pédron under sponsorship + * from the FreeBSD Foundation. + * + * 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. + */ + +#ifndef _LINUXKPI_LINUX_CPUFEATURE_H_ +#define _LINUXKPI_LINUX_CPUFEATURE_H_ + +// #include +#include +#include + +#endif /* _LINUXKPI_LINUX_CPUFEATURE_H_ */ From nobody Thu Mar 20 19:53:58 2025 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 4ZJbqq6kT7z5rJQM; Thu, 20 Mar 2025 19:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJbqp5pZLz3Myg; Thu, 20 Mar 2025 19:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742500438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B1yfZnXN/UqVNTNqdnqScANVWWoCfSSXq4TZKNGkeBM=; b=rVwZTb7k5EcrkC/QFXCiaGWFcJY4TQfCb6+HuFCIjUu4e5Czd40V+2NmG9+H9IGX14sOC2 bIQGNyp1voDMIdB0uJAO/Gu5E3pCzJdO9TEgHa/tr+j5j/htAF/zoRHEaajqx2kN4mUpZ0 LqSu+YRh4DBFbGhwzhYoCC33E9ny79asyql4HTmlabqBR2ubtxPTvx/HvJPPpz6ac4dEbg sG4WIc5GJyOEymYJ3Npm4qMsNkpi3fSwJIhh/6aa5uUiPOfYnU21OidkEIwLGfS0FH33FY AoNOJhYd1Dqh/immBneRPK5xVynsQkXH+vVFkLLKfkeCp25Y/lA+gy0qoEgogw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742500438; a=rsa-sha256; cv=none; b=bDAn1x9xcnWzs1vCKFdsjVqgRAa9xl2sJ82KCdO/c81UVKNtndTcIvmGNpguyvBUS/p5uJ vPm77a9FMfyT4IFrHU0BTMM1UMYiZC5o1KCMqf7y6GKrGW/zkcNMqz7qblks2IBAMaPTiT JLhvS387D2Lk+6A+2HFXlYx7BFbOPf0eNr6JrbtrM6CKEa4tirNoDWz07n2wl2kka+t4tR C8gQVEpnajsT9Z2yxt+SrbR+KszqP5U1NKvnBDFO4OqdGQ+WMqZUrCgEl14f0/rBJsRfa8 a8PvGbHiD7XtPJbAdGWQQAe3AKa7WpxNhXFnjJok5naWo0H+yS7fWxo1cgVuCQ== 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=1742500438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B1yfZnXN/UqVNTNqdnqScANVWWoCfSSXq4TZKNGkeBM=; b=KuNDTKXJL8TYQMG+DPzbrRcIPAiAj9iB7HcZbOOJb4CeZkPUaWJ6efksmRU9TUPJzDahuE MQNVCucoEAOJ83YIGd9dV63YKApUDAPvCSZG0B86JwPJFgZlHlucNUMqs3dVEo3qYuz4D9 aE4eV3210u6fFcf5LPDH/LPsplqpEbkDgcy8fV23wybVnCeDEpZjlmR5DvfCWylf4xRW8a 9/xd8XqTvpkmWDv6abX09H3GDcn31P6F4qzxonNoh22hjl08678rA73DKn8U3+6FHBKDca O8Z5hQsrUKYdmZ6OqTXtLzbkWRi3dp1LIw+hZ0Fjw/nBQhMx6TOjWVusWBGGwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJbqp58QXz1J1G; Thu, 20 Mar 2025 19:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KJrw4Q064042; Thu, 20 Mar 2025 19:53:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KJrwv2064039; Thu, 20 Mar 2025 19:53:58 GMT (envelope-from git) Date: Thu, 20 Mar 2025 19:53:58 GMT Message-Id: <202503201953.52KJrwv2064039@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: 62f2367e2aac - main - linuxkpi: Add List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 62f2367e2aac46194e4f97ff64ab32b82e4b8649 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=62f2367e2aac46194e4f97ff64ab32b82e4b8649 commit 62f2367e2aac46194e4f97ff64ab32b82e4b8649 Author: Jean-Sébastien Pédron AuthorDate: 2025-02-28 22:50:54 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-03-20 19:43:44 +0000 linuxkpi: Add The amdgpu DRM driver started to use it in Linux 6.8. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49383 --- sys/compat/linuxkpi/common/include/linux/units.h | 40 ++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/units.h b/sys/compat/linuxkpi/common/include/linux/units.h new file mode 100644 index 000000000000..304b5c27d87f --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/units.h @@ -0,0 +1,40 @@ +/*- + * Copyright (c) 2025 The FreeBSD Foundation + * Copyright (c) 2025 Jean-Sébastien Pédron + * + * This software was developed by Jean-Sébastien Pédron under sponsorship + * from the FreeBSD Foundation. + * + * 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. + */ + +#ifndef _LINUXKPI_LINUX_UNITS_H_ +#define _LINUXKPI_LINUX_UNITS_H_ + +#define NANOHZ_PER_HZ 1000000000UL +#define MICROHZ_PER_HZ 1000000UL +#define MILLIHZ_PER_HZ 1000UL +#define HZ_PER_KHZ 1000UL +#define KHZ_PER_MHZ 1000UL +#define HZ_PER_MHZ 1000000UL + +#endif /* _LINUXKPI_LINUX_UNITS_H_ */ From nobody Thu Mar 20 19:59:40 2025 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 4ZJbyh6RVGz5rJFF for ; Thu, 20 Mar 2025 19:59:56 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJbyf6VFGz3Sw0 for ; Thu, 20 Mar 2025 19:59:54 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-3913d45a148so1002065f8f.3 for ; Thu, 20 Mar 2025 12:59:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742500793; x=1743105593; 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=Gxq90aT+g8xLUHIV0sY4u/KM+aEqxh8XLc0rYmJmgss=; b=oMl8YnUaqLyvIjmf/6T4oJVy933ZZx3Uozh5d7I4QY1DZ7C+YN1I1+D6XCX6UHGwAs W9QWNWFboTiL3jlyHgEvuh8VXKX4eunPwVQIshO9Z1rYyBAOW4M3kVW64uq+qa2crx7u 1sG2W693bT2c0Gs60i1PQMh6epLyXu3mnyvLwJiudeWWAfLdPK2q7HY1UA4o8nh2zbiy Q6qLxp3FM+rQ8kziWcm3MjppLeaFi5VyBOEufggXSDobRdN1vIFqfnwR2bi2m+GBSOoh AfUJkT+2559KOOn8JdraMM43f35HTpnr0ooBYsXIyt4FBGwDa7r+ZRWZU1YLGBVmJZUf DkIA== X-Forwarded-Encrypted: i=1; AJvYcCVBt/ozbgnSpg45Vag3hwqPX1UFaRuZZGiczMZJWUVCahVGAFOE6LOQq556MbofNMrE+UamjwMvhGtetJ9f7fEFG+Q7ow==@freebsd.org X-Gm-Message-State: AOJu0YzOzffTpgKNUvT0XN4sPKQIYKk5LGqOKNqJ9uuC7+qF1sX83OMR zbZ68215XSGYwzWrgQZN+oHJZjiKz4/IWPPnyhE7FebtTtOQNb8gtLjPe3iVoGo= X-Gm-Gg: ASbGnctkV5NXMm2pQsskV/RNwwzw5CLN7r8wLImpoS9cZWFDyxJl+I2Iqo/5dNjWDze SoGUrwyn+Xr7+rM7i/fwoFj7ahYFYClIXqokoHXMlEu1CLm1Fnb6SqwWYZfuhydq1ALd22D3uHC InYlpfF4P/d2tfhS8kDR11pMdxrGPLFsJiFEYVejlsgL0ITUk5hVin7Os2PfT4i8WJFqkP6xgYm cAB5LknDzTlFV1ilWXw3J6BQN4SsAv1Ppkz7jeXWbNNIHXAisJTrxT+nBlRhODhtpmL2CMJQRp8 3g24sOAIMCQ2k1QDcTwUcw4/XqA5km7wfYBCl1Xs50L5vqZ5PoXJWfZ06Vw= X-Google-Smtp-Source: AGHT+IE3tdKLdnr9F4v1FQ0wmLd7M8fu7VV3nHkV8sHfJi9MB2CJbxHHNhrbielE8rfqxmbjo42ILA== X-Received: by 2002:a05:6000:1a8a:b0:390:f6aa:4e7c with SMTP id ffacd0b85a97d-3997f911525mr922490f8f.28.1742500791770; Thu, 20 Mar 2025 12:59:51 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d4fdb06b9sm6417425e9.36.2025.03.20.12.59.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Mar 2025 12:59:50 -0700 (PDT) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.300.87.4.3\)) Subject: Re: git: cd8c2e012761 - main - linuxkpi: Add From: Jessica Clarke In-Reply-To: <202503201953.52KJrxf8064080@gitrepo.freebsd.org> Date: Thu, 20 Mar 2025 19:59:40 +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: <8BF17BC0-0D89-4136-A1E8-81D584415DA2@freebsd.org> References: <202503201953.52KJrxf8064080@gitrepo.freebsd.org> To: =?utf-8?Q?Jean-S=C3=A9bastienP=C3=A9dron?= X-Mailer: Apple Mail (2.3826.300.87.4.3) 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-Rspamd-Queue-Id: 4ZJbyf6VFGz3Sw0 X-Spamd-Bar: ---- On 20 Mar 2025, at 19:53, Jean-S=C3=A9bastienP=C3=A9dron = wrote: >=20 > The branch main has been updated by dumbbell: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dcd8c2e012761bf672074798be64d5ce1= 6af7aff8 >=20 > commit cd8c2e012761bf672074798be64d5ce16af7aff8 > Author: Jean-S=C3=A9bastien P=C3=A9dron > AuthorDate: 2025-03-03 19:32:20 +0000 > Commit: Jean-S=C3=A9bastien P=C3=A9dron > CommitDate: 2025-03-20 19:43:44 +0000 >=20 > linuxkpi: Add >=20 > Reviewed by: emaste > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D49385 > --- > .../linuxkpi/common/include/linux/cpufeature.h | 37 = ++++++++++++++++++++++ > 1 file changed, 37 insertions(+) >=20 > diff --git a/sys/compat/linuxkpi/common/include/linux/cpufeature.h = b/sys/compat/linuxkpi/common/include/linux/cpufeature.h > new file mode 100644 > index 000000000000..046fab53d521 > --- /dev/null > +++ b/sys/compat/linuxkpi/common/include/linux/cpufeature.h > @@ -0,0 +1,37 @@ > +/*- > + * Copyright (c) 2025 The FreeBSD Foundation > + * Copyright (c) 2025 Jean-S=C3=A9bastien P=C3=A9dron > + * > + * This software was developed by Jean-S=C3=A9bastien P=C3=A9dron = under sponsorship > + * from the FreeBSD Foundation. > + * > + * 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. > + */ > + > +#ifndef _LINUXKPI_LINUX_CPUFEATURE_H_ > +#define _LINUXKPI_LINUX_CPUFEATURE_H_ > + > +// #include What=E2=80=99s up with this? Is this a header that should be included = but can=E2=80=99t yet be (if so, why?), one that should be included and was left commented locally for some reason, or one that shouldn=E2=80=99t be = included but was left over from something? If it needs to stay, please document why it=E2=80=99s not uncommented, and also conform to style(9) as this = is a C++-style comment. Jess > +#include > +#include > + > +#endif /* _LINUXKPI_LINUX_CPUFEATURE_H_ */ From nobody Thu Mar 20 20:37:42 2025 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 4ZJcpH183Tz5rLmy; Thu, 20 Mar 2025 20:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJcpH0B20z3v13; Thu, 20 Mar 2025 20:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742503063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=smXDMqGWDm+xAxV2kjFVH0CsXgNQPGrfPC+X+CyB2po=; b=ZiwNhIfFLT2+ty2NLTNTnzolNo0xM+yWNeyZppjctV06CkCnlBT1zIzNDcHFiqd9yJYjs0 I2DlY5cei4u9sjyIe2aJjvgc2ei0DT/gyk89ImlYB0OypmRCgjPJZRJZXLE39h7tH4s1FF F2Ie2kRLzz3n+5OlA6935yOqOUNu1s0T17ALzKHFa1Lz0Y3VDNQz/5keQ4rxjfOmeRNVuF qHd/hfWpOLk/NS6yNXg+pRaH64k4QQO7dudq8qV+phJDRFnp9MU0tFykd71qICRUOcBxoA wgZpFKrvmt6RF6Eg8G+7vaJyEokjUStkgqvbs6YPcohE3otEyIO5qPN/uEuUbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742503063; a=rsa-sha256; cv=none; b=vl419+UqmnMih5NZSWKbNIJQue/MB0OWXmtY1PxxHdoPOl76qH3LvylmgpI5Jadz/WzMW/ zatNFnBpkyzTUNknY86UY8Hi/zweea0vZVuhSfQfGz7mhbKV9iWi/wRGQx16SQGI/gYUZ8 mDUQbXY4uLrWeEFuDG/d7Easo8DCavI4p1LbPv10E0a30BjqSnVHSnYXe3ntvY64jrWadW GtGfIR4lo34tqmVryto5g2/tRC4FpW6JMcIRUELY9ow61x6GKC8Tb6W4MW9/DzM4S0CBZP ZvoOtMXYKpXgGAKa7sSdNOaSqndW4tMjOb/KkqCk4A5DhZut9g7woSNrAgSTRw== 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=1742503063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=smXDMqGWDm+xAxV2kjFVH0CsXgNQPGrfPC+X+CyB2po=; b=YkoUdE6tohh8j74RKvimJqysqteKPCqVcbqCcGx8gR7+MRKedaC3d/nZ40E1MvJOw9kVuE tLesltYjY00KmhB9mHnFUfzAt4YKPBeRTLjOfuGAS0zOOW2DpCP4PFpQmHrQeNht8rvTUG ypGUMGz+hvX3t2D/hZgtIEY+mTNw+9LtyeUfte/9u4QwuYubzNR0jcIv7OBbyBvLAexEzn kWEs2r7PEkp9xhiRx0h8BXKuR/lyN6sXumAO+Px4aA9mGvtjUoRmKQdHwp5bxO6NBrUWyu a2m6CS/GqYNvVSqopNjMw9Jy7TQHdEtrg/ywi7CNSsT6uO47jHmri/iCbvPJXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJcpG6nmMz1KPQ; Thu, 20 Mar 2025 20:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KKbgB7040252; Thu, 20 Mar 2025 20:37:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KKbgCa040249; Thu, 20 Mar 2025 20:37:42 GMT (envelope-from git) Date: Thu, 20 Mar 2025 20:37:42 GMT Message-Id: <202503202037.52KKbgCa040249@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: 16649530b7be - main - Formatting and style cleanups. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 16649530b7be02a61a32b34d56e6e937734cd247 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=16649530b7be02a61a32b34d56e6e937734cd247 commit 16649530b7be02a61a32b34d56e6e937734cd247 Author: Kirk McKusick AuthorDate: 2025-03-20 20:36:48 +0000 Commit: Kirk McKusick CommitDate: 2025-03-20 20:37:23 +0000 Formatting and style cleanups. No functional change intended. MFC-after: 1 week Sponsored-by: Netflix --- sys/ufs/ffs/ffs_subr.c | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 67c423d3127c..682dd60ebd44 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -340,31 +340,36 @@ ffs_oldfscompat_read(struct fs *fs, ufs2_daddr_t sblockloc) fs->fs_old_flags |= FS_FLAGS_UPDATED; fs->fs_sblockloc = sblockloc; } - /* - * If not yet done, update UFS1 superblock with new wider fields. - */ - if (fs->fs_magic == FS_UFS1_MAGIC && fs->fs_maxbsize != fs->fs_bsize) { - fs->fs_maxbsize = fs->fs_bsize; - fs->fs_time = fs->fs_old_time; - fs->fs_size = fs->fs_old_size; - fs->fs_dsize = fs->fs_old_dsize; - fs->fs_csaddr = fs->fs_old_csaddr; - fs->fs_cstotal.cs_ndir = fs->fs_old_cstotal.cs_ndir; - fs->fs_cstotal.cs_nbfree = fs->fs_old_cstotal.cs_nbfree; - fs->fs_cstotal.cs_nifree = fs->fs_old_cstotal.cs_nifree; - fs->fs_cstotal.cs_nffree = fs->fs_old_cstotal.cs_nffree; - } - if (fs->fs_magic == FS_UFS1_MAGIC && - fs->fs_old_inodefmt < FS_44INODEFMT) { - fs->fs_maxfilesize = ((uint64_t)1 << 31) - 1; - fs->fs_qbmask = ~fs->fs_bmask; - fs->fs_qfmask = ~fs->fs_fmask; - } - if (fs->fs_magic == FS_UFS1_MAGIC) { + switch (fs->fs_magic) { + case FS_UFS2_MAGIC: + /* No changes for now */ + break; + + case FS_UFS1_MAGIC: + /* + * If not yet done, update UFS1 superblock with new wider fields + */ + if (fs->fs_maxbsize != fs->fs_bsize) { + fs->fs_maxbsize = fs->fs_bsize; + fs->fs_time = fs->fs_old_time; + fs->fs_size = fs->fs_old_size; + fs->fs_dsize = fs->fs_old_dsize; + fs->fs_csaddr = fs->fs_old_csaddr; + fs->fs_cstotal.cs_ndir = fs->fs_old_cstotal.cs_ndir; + fs->fs_cstotal.cs_nbfree = fs->fs_old_cstotal.cs_nbfree; + fs->fs_cstotal.cs_nifree = fs->fs_old_cstotal.cs_nifree; + fs->fs_cstotal.cs_nffree = fs->fs_old_cstotal.cs_nffree; + } + if (fs->fs_old_inodefmt < FS_44INODEFMT) { + fs->fs_maxfilesize = ((uint64_t)1 << 31) - 1; + fs->fs_qbmask = ~fs->fs_bmask; + fs->fs_qfmask = ~fs->fs_fmask; + } fs->fs_save_maxfilesize = fs->fs_maxfilesize; maxfilesize = (uint64_t)0x80000000 * fs->fs_bsize - 1; if (fs->fs_maxfilesize > maxfilesize) fs->fs_maxfilesize = maxfilesize; + break; } /* Compatibility for old filesystems */ if (fs->fs_avgfilesize <= 0) @@ -426,9 +431,8 @@ static int prttimechgs = 0; #ifdef _KERNEL SYSCTL_NODE(_vfs, OID_AUTO, ffs, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "FFS filesystem"); - SYSCTL_INT(_vfs_ffs, OID_AUTO, prttimechgs, CTLFLAG_RWTUN, &prttimechgs, 0, - "print UFS1 time changes made to inodes"); + "print UFS1 time changes made to inodes"); #endif /* _KERNEL */ bool ffs_oldfscompat_inode_read(struct fs *fs, union dinodep dp, time_t now) From nobody Fri Mar 21 01:39:26 2025 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 4ZJlVQ6wzyz5rcwQ; Fri, 21 Mar 2025 01: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJlVQ61Vsz46jy; Fri, 21 Mar 2025 01: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=1742521166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R8o7auH/p1MmHC3JrDA/wjjoWmGf4vyk7eWpbGp5Do8=; b=nmCfb1qwTM+U4TiLzJ0kcAUSSdBuFYANlWe3tP2P5cFAOMyW3ZRMzwGGBbswi6bSHCfVsG +ygsP84sSUzhDDwFRdpV4FS63Opg32TEXDa7qdm4C0ppusW4Ioen/iEWUBztheZn+z9Kxm nEeSCmIIbiwh9nOmfr50OMKM7wyZ7+fwzrPu457sqv3DZQZ3pCsxS5mgg1wTeyfpzXTVBf 9A4EkpBvt/6RQT8eMV5VFwtS4A3zha1M5JPjpAHyGExG/+AXWKBmOV144d+3sL1NAg/KDx tlMOm3thBou+GijFfS0JpiTrnctX3hx8L77KHjecyGrIe50ziY+N/BeyyMTBBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742521166; a=rsa-sha256; cv=none; b=qK9MsHIDhtRNWeuvIpPYnd5Ql901F3nLK24OWEDV1MOSJIsjOspvvrlPvNBFz32yq/sjcH NR2GgaNj7o7iNwJPRn4KbcXcjy+I6bRWq+TqXPF4mTep6db3g+fiCwrpX4UuKMI80/Niko s9k7I3SNH/8Ycey2ecd0ONHuJJGa0tDZOehRFm7BAauTxfsSIna3lVDy6dOig17iGN9zdi EUTNJx3ioPC33Y7mlDoEzr69CZANqU+540Du8UvE3VnN+Q74ihy6Ujc2W76sTdyf5mLl6c vztlwQQ1XoLvw9St5i82HrRdSKCVRy45Aacs4AVxtBrhxk8c4IgZIzFDradfJA== 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=1742521166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R8o7auH/p1MmHC3JrDA/wjjoWmGf4vyk7eWpbGp5Do8=; b=XAGNSLvMS5ExOzzVsktFAbHNYKYkpAsDgQ0i7nhASC/VIr4zlwVTIZFKs3PEUi8oPgPEqt N5GDDrgGLHUDNi9M7gkIs0M3kt8heFa8d+MrfaZl5BxgWfQEUeefoHxcvjjp7n4AHMM6b8 aCwBMfldeYuwi99d7W5WHUfSJKy//CqrgTSYa2zBCWAAMf1J5/3hmEaObuR1CtjsvxKCg7 bSXRtZ4S+28o/VGWgxNpMfzjwxPbag4yMJYhkPmDNSlY82EzX0eGtfFQR45bovaGLNvQ78 HBd/m7M9fGJJhgjKQIOm6MEK6XbT354QE9TuEvHq2LTIT8jUCsk+YfLpeCkC+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 4ZJlVQ5HyVz6c; Fri, 21 Mar 2025 01:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52L1dQx8001013; Fri, 21 Mar 2025 01:39:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52L1dQAf001010; Fri, 21 Mar 2025 01:39:26 GMT (envelope-from git) Date: Fri, 21 Mar 2025 01:39:26 GMT Message-Id: <202503210139.52L1dQAf001010@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: d3a892ce142f - main - pf: Increment rule counters only after successful state insertion List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: d3a892ce142fb127b6b4663e61db0fd687782383 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d3a892ce142fb127b6b4663e61db0fd687782383 commit d3a892ce142fb127b6b4663e61db0fd687782383 Author: Kristof Provost AuthorDate: 2025-03-04 08:33:42 +0000 Commit: Kristof Provost CommitDate: 2025-03-21 01:29:04 +0000 pf: Increment rule counters only after successful state insertion Do rule counter increments after state has been successfully installed. This has an additional benefit of making error handling a bit simpler. OK mpi, bluhm Obtained from: OpenBSD, mikeb , e44d8797e7 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index dadb3299ff99..bfff339a66f5 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6103,7 +6103,6 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, memcpy(&s->match_rules, match_rules, sizeof(s->match_rules)); memcpy(&s->act, &pd->act, sizeof(struct pf_rule_actions)); - STATE_INC_COUNTERS(s); if (r->allow_opts) s->state_flags |= PFSTATE_ALLOWOPTS; if (r->rule_flag & PFRULE_STATESLOPPY) @@ -6227,6 +6226,8 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, } else *sm = s; + STATE_INC_COUNTERS(s); + /* * Lock order is important: first state, then source node. */ @@ -6302,7 +6303,6 @@ drop: if (s != NULL) { pf_src_tree_remove_state(s); s->timeout = PFTM_UNLINKED; - STATE_DEC_COUNTERS(s); pf_free_state(s); } From nobody Fri Mar 21 01:39:27 2025 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 4ZJlVS3YCBz5rdK1; Fri, 21 Mar 2025 01:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJlVR5lQPz46sH; Fri, 21 Mar 2025 01:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742521167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M0Q6IisXk+h2uPbW+iy0m/jReIbh95HF6u65EDzIxTY=; b=DbsN2Akgir3kYKJfJOK9E9oTajUDjiUSkEZg13ynipARE53J1xEnIhL065DW9m/gORUPvw zvM5U7tegf+cqqk18gA4pdgxXplHqFPmCg73BFIf6Us4a2AvUPiyzaYyL2ZvtiOEDVF+4L RSaB7yHllv1ViL2R+IjJ/Aa2HwoSCSZjIOP27J/+DpwLZT7zaXn5gbfTjbRYLCCAXeC01Z QzDBsnRvdUWptbQaOyR5C881XD36zncKLRTG/TEbf8ycSPIIYfLdwEYCF6vr0Dw3q8gTBR mLqlrcwVAk73v4Ai9e9pAFkNKcle0OUc2dE2LCGbxAMQab4SKxc3Sjl9wp9thQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742521167; a=rsa-sha256; cv=none; b=XvLpY5J13qcxO+eCtfHBFXx6Tvo38a3J+Fr51KVVSuGmkTi2JQyYCbum3iti1ztoci0sVh LLDUVHxGs2oLm/VJz7tBt3CkiaSQ9W7NeTn8VvV2hqp634R6P79LQiBnUnFZot+hWQ/Ogn FrLQ21GnhkA3r+CcyRk3lecx2mGtGAUgZtLDDqJ/cqc6mREhrRLFNgGD8GPfdD2y/PDCmZ 0RNZike2WWwF8ss3U42JVOspVjYsW3c4Sustv5QV1biDh0Y6EuznULULEUIw5KybICt7Fd +Xs02XEIATMp6ntr8MiwmtbdtsvLRYpTZ8NnMW8Q4im0HJiCiRjrT/EMVvamMw== 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=1742521167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M0Q6IisXk+h2uPbW+iy0m/jReIbh95HF6u65EDzIxTY=; b=oNdIs71fd+ga9BCsUqgMeADecZAmt6o3fVmPck9LCFveSLLTBaP1N4/ESiLHQkSMa/ZhXz /NW9doIlkOOo1layapQa0MBxX7XHZrNZuRC0mRkOR1K6t9KckiBtSMv8QK9P5H2ijO4c+I KEx20cYuwSt3xQOhH/c3hmC9JyORzM7NyD+ut9+XF1fuOgKaKoMY3QcexCuz+HtuBpYq1s U+XG7JtNjq86KO0fjw5xbSy97iDx+9TjvC0ZR+ejinbwEAwm6hdl7gszVTlNgnJAPquDdf d3M72uuCToT1BQLhSr4/EYsSKAU4e7MsKYrmqTnsktEziALeKTPKGwi8cLRx/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJlVR5KKMz1SYG; Fri, 21 Mar 2025 01:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52L1dRG1001046; Fri, 21 Mar 2025 01:39:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52L1dRBR001043; Fri, 21 Mar 2025 01:39:27 GMT (envelope-from git) Date: Fri, 21 Mar 2025 01:39:27 GMT Message-Id: <202503210139.52L1dRBR001043@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: 4cdcdf0e5f18 - main - pf: Expand ancient NTOHL/NTOHS/HTONS/HTONL macros. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 4cdcdf0e5f1833e2ca7ce3bbf099b32c67064523 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4cdcdf0e5f1833e2ca7ce3bbf099b32c67064523 commit 4cdcdf0e5f1833e2ca7ce3bbf099b32c67064523 Author: Kristof Provost AuthorDate: 2025-03-04 08:44:41 +0000 Commit: Kristof Provost CommitDate: 2025-03-21 01:29:04 +0000 pf: Expand ancient NTOHL/NTOHS/HTONS/HTONL macros. ok guenther@, henning@ Obtained from: OpenBSD, mpi , faf7e06f4d Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 15 ++++++--------- sys/netpfil/pf/pf_lb.c | 8 ++++---- sys/netpfil/pf/pf_osfp.c | 4 ++-- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index bfff339a66f5..2c06c0253d4b 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -2266,7 +2266,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, *icmp_dir = PF_IN; *virtual_type = type; *virtual_id = 0; - HTONS(*virtual_type); + *virtual_type = htons(*virtual_type); return (1); /* These types match to another state */ /* @@ -2333,7 +2333,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, *icmp_dir = PF_IN; *virtual_type = type; *virtual_id = 0; - HTONS(*virtual_type); + *virtual_type = htons(*virtual_type); return (1); /* These types match to another state */ /* * All remaining ICMP6 types get their own states, @@ -2350,7 +2350,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, default: unhandled_af(pd->af); } - HTONS(*virtual_type); + *virtual_type = htons(*virtual_type); return (0); /* These types match to their own state */ } @@ -4101,7 +4101,7 @@ pf_build_tcp(const struct pf_krule *r, sa_family_t af, opt = (char *)(th + 1); opt[0] = TCPOPT_MAXSEG; opt[1] = 4; - HTONS(mss); + mss = htons(mss); memcpy((opt + 2), &mss, 2); } @@ -4527,10 +4527,7 @@ pf_match(u_int8_t op, u_int32_t a1, u_int32_t a2, u_int32_t p) int pf_match_port(u_int8_t op, u_int16_t a1, u_int16_t a2, u_int16_t p) { - NTOHS(a1); - NTOHS(a2); - NTOHS(p); - return (pf_match(op, a1, a2, p)); + return (pf_match(op, ntohs(a1), ntohs(a2), ntohs(p))); } static int @@ -5034,7 +5031,7 @@ pf_get_mss(struct pf_pdesc *pd) break; case TCPOPT_MAXSEG: memcpy(&mss, (opt + 2), 2); - NTOHS(mss); + mss = ntohs(mss); /* FALLTHROUGH */ default: optlen = opt[1]; diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index ea9fbc46af63..f0cad4bb43c2 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -1065,19 +1065,19 @@ pf_get_transaddr_af(struct pf_krule *r, struct pf_pdesc *pd) } if (pd->proto == IPPROTO_ICMPV6 && pd->naf == AF_INET) { - NTOHS(pd->ndport); + pd->ndport = ntohs(pd->ndport); if (pd->ndport == ICMP6_ECHO_REQUEST) pd->ndport = ICMP_ECHO; else if (pd->ndport == ICMP6_ECHO_REPLY) pd->ndport = ICMP_ECHOREPLY; - HTONS(pd->ndport); + pd->ndport = htons(pd->ndport); } else if (pd->proto == IPPROTO_ICMP && pd->naf == AF_INET6) { - NTOHS(pd->ndport); + pd->nsport = ntohs(pd->nsport); if (pd->ndport == ICMP_ECHO) pd->ndport = ICMP6_ECHO_REQUEST; else if (pd->ndport == ICMP_ECHOREPLY) pd->ndport = ICMP6_ECHO_REPLY; - HTONS(pd->ndport); + pd->nsport = htons(pd->nsport); } /* get the destination address and port */ diff --git a/sys/netpfil/pf/pf_osfp.c b/sys/netpfil/pf/pf_osfp.c index de60619bdc18..3e00cc7c80a2 100644 --- a/sys/netpfil/pf/pf_osfp.c +++ b/sys/netpfil/pf/pf_osfp.c @@ -157,13 +157,13 @@ pf_osfp_fingerprint_hdr(const struct ip *ip, const struct ip6_hdr *ip6, const st sizeof(fp.fp_mss)); fp.fp_tcpopts = (fp.fp_tcpopts << PF_OSFP_TCPOPT_BITS) | PF_OSFP_TCPOPT_MSS; - NTOHS(fp.fp_mss); + fp.fp_mss = ntohs(fp.fp_mss); break; case TCPOPT_WINDOW: if (optlen >= TCPOLEN_WINDOW) memcpy(&fp.fp_wscale, &optp[2], sizeof(fp.fp_wscale)); - NTOHS(fp.fp_wscale); + fp.fp_wscale = ntohs(fp.fp_wscale); fp.fp_tcpopts = (fp.fp_tcpopts << PF_OSFP_TCPOPT_BITS) | PF_OSFP_TCPOPT_WSCALE; From nobody Fri Mar 21 01:39:28 2025 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 4ZJlVT49Qmz5rdDB; Fri, 21 Mar 2025 01:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJlVS6dnJz46vW; Fri, 21 Mar 2025 01:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742521169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJB4bhi/inB541vGfGfQqX+PeoF4rESt02/IPEcvW04=; b=ktZWAiYDRBjDPhzCYP2J/JmuUB4POfu6bwrGAUeEEeeB79uqVGAo3vMNmoFp6M2UilBagd EB8wZDFs7TZyQ9FQTKhiOzoQTnN4RZ1x2ag2piHoM4XpOO95xMn2fe5f1MloUxWlyubb1C rBpgMoWO/68RmqqtK27E3mgQz7mm6Djw+ICB9UjbcpxOOIfGc4gAIwfkPjWYLNacbe95d1 3M0U3Ygnw1x7vReZRI0Z0q65jgxFRFR2zVO3166stJxdeC7GaVvi1irjAa9nI89Fk1Kr43 8sOOTZ3tRHkF2mbvx2Xe+1ST+Q4gJvl4c78jXP+UDCI/JmqEDZ/07b1cZgozxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742521169; a=rsa-sha256; cv=none; b=WzbS2KqhTl1sxI08akujidx1ocNeXQ6ohAu5Tc5uqLjHw8shLQyih11YlZET7OQbgCEgoS iPS8aR4lg4ANVzzVnqupFSmnIUG5bfvv8jfCH1/oQNpZsYbL14vOnH7GwTZ8DdNoDAYyBT 0jE8qNPm8z0mJzAqNys5Ax8g/c8ctbKkwkrBT6xmWHBdkKdPLY9BSgSNNubHtKRONaK3ON eXQBsNZ6ax9xZqj9QIW3EJIn6e9AsNj4VhoLOY7EEGPf7ANfYKwDu1apMb8rkSWv2ToDo9 TaQxspnUlERo7vdNsJusxFqbLMAegdyXDu426NGTodxygaZCwyIGwFuNdUnyQw== 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=1742521169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJB4bhi/inB541vGfGfQqX+PeoF4rESt02/IPEcvW04=; b=Fpw4pQeHXEcHBder7mYXXLZVA1sqBIPszkXqvSshuWIC+D0+G6bIeDtZnwd9z8ZwonNYtq hKsWAb/DSf71z8kXFmZ+VYhLWE9gdbWJYTPyy93t7GcdsJn9MmVuBTVVSgT+X/wiGBI9mO NRRNHGhmTNlF9M0blhIHWMQ8GEfdhJU8oNeTN+Uy20uMrTTygENtguFQpYvFugzggPe3/u 9fsxGXN9hKYNQ3PfBnPyhhX5qFYw7gwY4vFQvxxw4D/kAbKFWlDe/Oullyl91ItVXAPBP2 BZwX3SyYRd+E3c78/hpvkn3hfY91En47lRX32mJJrqsN1N8j6pfUJbQvuVTeVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJlVS66H9zLc; Fri, 21 Mar 2025 01:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52L1dS7r001079; Fri, 21 Mar 2025 01:39:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52L1dSwu001076; Fri, 21 Mar 2025 01:39:28 GMT (envelope-from git) Date: Fri, 21 Mar 2025 01:39:28 GMT Message-Id: <202503210139.52L1dSwu001076@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: 5d02f17e8253 - main - pf: fix LINT-NOINET / LINT-NOINET6 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 5d02f17e8253f330434dd3160403be284487b5bb Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5d02f17e8253f330434dd3160403be284487b5bb commit 5d02f17e8253f330434dd3160403be284487b5bb Author: Kristof Provost AuthorDate: 2025-03-21 01:18:19 +0000 Commit: Kristof Provost CommitDate: 2025-03-21 01:29:04 +0000 pf: fix LINT-NOINET / LINT-NOINET6 build --- sys/netpfil/pf/pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 2c06c0253d4b..002fff9b81be 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7902,7 +7902,6 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, struct tcphdr th; u_int32_t seq; struct pf_state_peer *src, *dst; - u_int16_t dummy_cksum = 0; u_int8_t dws; int copyback = 0; @@ -7999,7 +7998,8 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, nk = (*state)->key[pd->didx]; #if defined(INET) && defined(INET6) - int afto, sidx, didx; + int afto, sidx, didx; + u_int16_t dummy_cksum = 0; afto = pd->af != nk->af; From nobody Fri Mar 21 05:25:28 2025 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 4ZJrWD6s3cz5rrwJ; Fri, 21 Mar 2025 05:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJrWD5pgXz3n5n; Fri, 21 Mar 2025 05:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742534728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AM5qx0lVfxD7GhVNUwsPk+1mXT8v+NuD/m0BHoeU/NQ=; b=Y+8vwewsG71B7bD6ljmOVo2OZrF0rJzAnzW8oXRspsV916V1O58We5N1JnYf/cnEl6nHdu RNmwoDzRFTnXQRKSzZwQim7Ds0/uRMv8oRW2BS9qO/L8JsW6w4/ZbWYUZXBfruSiYQU1Pz T27aK9NjTQyRxtWkVWOEbBpaACN33cIncwsbf9CNDkNWilQMnKBZMl6quEtN64l5/SE94E WlOJLT6E4qAnxMGGa6pYeTILYYdvTqn32n0BYXAjcYam9uKZNZeP0OjH1Jw5wD6HzxqJua 6fYdXbuCS/bALIJ2uh3fHPYjNGwo0GAC1uwPOFahu0NAjQDSp75DlG+kVGBGxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742534728; a=rsa-sha256; cv=none; b=hajaPvzB9u002SpxzTimspRPkdp2Ij+MApWUvV49DHTty0EEVrhTnoB3txQ03kXV6K1l7+ PQEz2h9xn1rqJeBB+tKBAmYI7hVn12wPVm5/3VdUcs9aC34lOfEz/bGo/Wzl4E15LZqFS1 h6l31UHpagUtybAYmzfUeimcVzcgk67vFjiSbvxtq2lPBER+jjFgEEERAmGE+Loe698RjV hDt1zZmf6uuK3yRbjpkBoP7r2DfEvMSNzb54gmv+x5KrAOgpAXJoAAl5PytsGX8kQCcZ9Q ZMh2EWBROOLEqQf4N3Cv0lttA0AHqFCh17Qghpptii5S5T07XVkaSYUhVK8IFQ== 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=1742534728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AM5qx0lVfxD7GhVNUwsPk+1mXT8v+NuD/m0BHoeU/NQ=; b=Q6wPBqMmIrTPxptxF/L7GOlfP1SyBs87whTGlfdIZMJQygN5b8w+RKaqngfhwqNOKcMIGL pLUUfKagkJWytnpq3mpv49qh98nwGMN2pgiaiIuQNZr9w82misjkXCcahIxsqY0TNh8ljC nhQmxAFzWfiQ83Sz4uu94C/2+TwLdkE0w5FSXdoAyTkkIe/CtWOgTAhG68YoVKS7KfwKGs HP2gicafI7RIn04uWn6CM2Bp/qXaf4BuAzxmJ2hyArQU7OAor2cY0ycDvCrqNdoPD7Cjfh PWlByyiplgE/MyQT3zlyYJ/0daSN6zHbr8G+0XNn13Yw41/U0Ga/Jcda49ep/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJrWD4xdrz6QW; Fri, 21 Mar 2025 05:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52L5PS0A032621; Fri, 21 Mar 2025 05:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52L5PSj7032618; Fri, 21 Mar 2025 05:25:28 GMT (envelope-from git) Date: Fri, 21 Mar 2025 05:25:28 GMT Message-Id: <202503210525.52L5PSj7032618@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: 6f6c07813b38 - main - tcp: fix reverting of spurious timeouts (RTO) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 6f6c07813b38ab04d8b1b2bb87c0291dbae25a25 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=6f6c07813b38ab04d8b1b2bb87c0291dbae25a25 commit 6f6c07813b38ab04d8b1b2bb87c0291dbae25a25 Author: Richard Scheffenegger AuthorDate: 2025-03-21 04:23:30 +0000 Commit: Richard Scheffenegger CommitDate: 2025-03-21 04:28:31 +0000 tcp: fix reverting of spurious timeouts (RTO) One variable that became critical to correctly calculate the cwnd during limited transmit was not properly reverted on detection of spurious timeouts. PR: 282605 Reviewed By: cc, tuexen, #transport MFC after: 3 days Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D48652 --- sys/netinet/tcp_input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 8f50843d940d..2fc1e0deea16 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -465,6 +465,7 @@ cc_cong_signal(struct tcpcb *tp, struct tcphdr *th, uint32_t type) ENTER_CONGRECOVERY(tp->t_flags); tp->snd_nxt = tp->snd_max; tp->t_flags &= ~TF_PREVVALID; + tp->t_rxtshift = 0; tp->t_badrxtwin = 0; break; } From nobody Fri Mar 21 18:47:14 2025 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 4ZKBJL48xgz5rXlN; Fri, 21 Mar 2025 18:47: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKBJL3NlQz3XKr; Fri, 21 Mar 2025 18:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742582834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UlPFRxv1UXPVUWIC0i09DrfkNNSh2ZSV1rMh+E8ig7s=; b=sr7mxNctfL7fireejDRE+qT47jeeBOG2JrCky+oR0CG/8nPIsS+JsI7egpEgGslzZBFSJL CQdbVf7JfsFI4kCvNmThNVMUOSeFgZwB6588reLmodoe4oWh6tF3LFRmaRBPF4MzNoHA5s LJohQSYmFaXxpbZB38VllCT1LK+smD+er3GN/14NDjyJUAdAh3JNrRRWSWSGop/f+U+jVZ fc6mLKs8Vqx2KrH/HEwW4PN3o0H6VwfrcL6U/aP5+R8lG/IfrPu9+FWFnCmj8iUVm4yk4X bSns5uMFL7F6QjlFlfVznJqJNcYFYQunzclBMUBXs4SHscI+mk/t0VNObuV99g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742582834; a=rsa-sha256; cv=none; b=sA8QSfC+qcS8XjWdC0VNS+z0i2DmI9+sUym/khIHgc+OI3F/QyxfULWLIRpbggRld+phdz cmIQTMMc2ukcgYQaPf1BrCL8hM/rcRpkGkbdSpB4WimaPHL+Cxpah8SQHwJQ9zMXqAbW2X mYqPqQNbBt+/scpSb7dAQu50RIW6vVKGmd1TV1i3lCnHt4E3tKa/Or9qOCliJZ5l/FarkM MrYK62ruUtpX1uWq0Qt+yY9gwXPAkQaOXOGd6xIkt+JpbZZs3Pv3sTnJJ8PusDpO0OXs78 4uDOHjbfAWEuJ0F3RVs7qxbB0EZ7eIT7K/yRwLZX5gejitOMAvsBzCIx03QHcg== 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=1742582834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UlPFRxv1UXPVUWIC0i09DrfkNNSh2ZSV1rMh+E8ig7s=; b=jaR3UFN80+I6wCnfkB6/aoW/bL12YD+OWiONjhvtkdo45xZrKNAfJ120zn6up1rBjfs5k+ ox5pgLTjifhzlbq/nZ6bPZrRvqcakUrshUY0fJ9aMLSEKmLBDPtWNXMZYiLfDPpCdmY3Pd Ky9C8jZ/8SSkaydqlkOVhMtA9l32BAyWdiHG/HSHXJFdz1rHQckbKsDXkCXxjQEj6MTX8H l6dVS4QDULAKvkpGLLNyLJ8Jf+VhHj5pDpXYzH+9eTd+QyXmFKh+hISxLgqygnVbtZmWL7 /K/nP86kIZv7c3GnSBSrxIA/ScM/gVdSKahn9/qmJnFbhcvRUcCrMy0E/f8OYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKBJL2vNFznv6; Fri, 21 Mar 2025 18:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52LIlEo9027111; Fri, 21 Mar 2025 18:47:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52LIlEpt027108; Fri, 21 Mar 2025 18:47:14 GMT (envelope-from git) Date: Fri, 21 Mar 2025 18:47:14 GMT Message-Id: <202503211847.52LIlEpt027108@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: c8c32d3e336d - main - linuxkpi: Document why has an include commentted out List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: c8c32d3e336df2bdad254ed8019f8ef976ec9bf4 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=c8c32d3e336df2bdad254ed8019f8ef976ec9bf4 commit c8c32d3e336df2bdad254ed8019f8ef976ec9bf4 Author: Jean-Sébastien Pédron AuthorDate: 2025-03-21 18:33:52 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-03-21 18:46:35 +0000 linuxkpi: Document why has an include commentted out on Linux includes . We don't have the latter on FreeBSD yet, so let's comment this include for now. It is still referenced because sometimes, consumers of headers rely voluntarily or not on the namespace pollution. Reported by: jrtc27 Approved by: jrtc27 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49448 --- sys/compat/linuxkpi/common/include/linux/cpufeature.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/cpufeature.h b/sys/compat/linuxkpi/common/include/linux/cpufeature.h index 046fab53d521..746d1a7164a8 100644 --- a/sys/compat/linuxkpi/common/include/linux/cpufeature.h +++ b/sys/compat/linuxkpi/common/include/linux/cpufeature.h @@ -30,7 +30,13 @@ #ifndef _LINUXKPI_LINUX_CPUFEATURE_H_ #define _LINUXKPI_LINUX_CPUFEATURE_H_ -// #include +/* + * Linux includes the following header. We don't have it on FreeBSD yet, so + * let's comment this include for now. It is still referenced here because + * sometimes, consumers of headers rely voluntarily or not on the namespace + * pollution. + */ +/* #include */ #include #include From nobody Fri Mar 21 19:29:44 2025 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 4ZKCFN39P3z5rZdN; Fri, 21 Mar 2025 19:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKCFN2Yhgz3byv; Fri, 21 Mar 2025 19:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742585384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y37KF65MOsjJLX+1orR1cL6KY32eM/QvDhAdK7m7anU=; b=qt3yEjVF8Ud4ducq5XyYVcUV3F+8uOpBQOmcK1OzCXDj7Vx5h4VP8UCgazgEVCV3p8waa3 Ifs4dUAg+DlCifsQ+PFNP6dDtVSGPD4eVTxxGsmdRHygegorsOcC4soTStZfWZw4z/sO8H 6funLBfhR02eXFjlLBaWUAUlbfmwYB8hjrcxmHxMus9bYaAjr7JiznbZupdgI6hN8EarkA /rQRt6uGKBLJrZdar71n2uc8NvyqqVArp205uLOGIIQa+itUMM8BprD5E5u++B3idxugCr Ox801PT0j5YiG+3K3UUwLVDoLt91YIvA08mD3XJt8kqAuOQcLO3hMWjG4Ioutw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742585384; a=rsa-sha256; cv=none; b=sx0YHqOhEmk6BEyeaK0O5zAclRvHBqDzgMgSUeRuToGdBjbIVA7dtLeZDd3Km2EmVxKCg/ sCfiIQCKx2b92NXiCIOucn8yruwwQV7aYKpFH5MniwhsisjcsTzwKROUYUE6qssm12M7Xr /u9adLJRpRwB48I7hyUiJDltA0U3VJKI94pDhOoNLpt8WVio0VdwkToOIEhWoBxOx0DRCU JDhQJpSOs2ujkmgebdRPUenn04AypaA9i62sLZQnRAEEDF92rgo8EMzQzJkkpRu+rLRjkf kV8LP5bKdofRyFmCs1fqMJLmtRGmcAETu97ZZ0hYaPWhVoqPaNF/Ucs5EnWnBA== 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=1742585384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y37KF65MOsjJLX+1orR1cL6KY32eM/QvDhAdK7m7anU=; b=J9LKk5EqBed1zRyvh8WdQ3CGc4TEiSMMSR05BUj/sjT4qxnGo0xcrR9VDbyYkoqLn2vreg dJPrGqCWwTXu4acCX7a47BkpKmA6s8N+A3sZ4Wex+6M1cIXRuCdeotSVsPlNPo1P96imc+ z6aiyGFlNXc+KES11J0Cv70WHf609zumms/ot71M2cMgbF/WsgHMoCKFe9d9zMjLx+TmLm zV7GnC3ZhS/UO85AwmDU3BxPAl/oXym+uQgYhoR8humZSCF3RxD/EEhqK+eoyn0NAqJEA7 YZYXtrTJvt/BB8wpXCYrB+l2lNCQc91RVDT+J0i6hydLNVEgog3NjE9AkwLNYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKCFN24wRzpgn; Fri, 21 Mar 2025 19:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52LJTirV003198; Fri, 21 Mar 2025 19:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52LJTicY003195; Fri, 21 Mar 2025 19:29:44 GMT (envelope-from git) Date: Fri, 21 Mar 2025 19:29:44 GMT Message-Id: <202503211929.52LJTicY003195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 3bf433f141a5 - main - ports.7: Update dialog4ports to portconfig List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bf433f141a5c8987f347c6618bab0482063a66c Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=3bf433f141a5c8987f347c6618bab0482063a66c commit 3bf433f141a5c8987f347c6618bab0482063a66c Author: Alexander Ziaee AuthorDate: 2025-03-21 16:31:26 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-21 19:29:11 +0000 ports.7: Update dialog4ports to portconfig dialog4ports has been replaced with portconfig for several years. It was marked as deprecated and broken in ports:61e4a788ecab. While here, tag SPDX. MFC after: 3 days Reported by: Community Discord Reviewed by: bapt (previous version), mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D49204 --- share/man/man7/ports.7 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7 index 1e924b291608..b681a326f407 100644 --- a/share/man/man7/ports.7 +++ b/share/man/man7/ports.7 @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 1997 David E. O'Brien .\" .\" All rights reserved. @@ -23,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 24, 2023 +.Dd March 21, 2025 .Dt PORTS 7 .Os .Sh NAME @@ -163,7 +165,7 @@ target. Configure .Va OPTIONS for this port using -.Xr dialog4ports 1 . +.Xr portconfig 1 Pq Pa ports/ports-mgmt/portconfig . .It Cm fetch Fetch all of the files needed to build this port from the sites listed in @@ -245,7 +247,7 @@ configured. Configure .Va OPTIONS for this port and all its dependencies using -.Xr dialog4ports 1 . +.Xr portconfig 1 Pq Pa ports/ports-mgmt/portconfig . .It Cm fetch-list Show the list of files to fetch in order to build the port (but not its dependencies). From nobody Fri Mar 21 20:22:08 2025 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 4ZKDPr5kjPz5qdYm; Fri, 21 Mar 2025 20:22:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKDPr4gM0z3gMd; Fri, 21 Mar 2025 20:22:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742588528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cSCJXgZ9177Zcfyucbibr3NuhhNFMc94CppRLldnDMo=; b=wK+cR5zmAFDneJeMHAcZLbwncvJBdz6hsbEciFXcmek6N5NwM6CXV2sifh7fvBwKTAb924 O3veVTID/J/yPKsHOINsRA96hw079z4tyVL8IqZxfF9szXDJBq403KB9L/Xj3yWTe+3vq2 5Uub4l6+8Nebn4cQq1849AhaGEtU2MzbUpauVOlUmIB5LsXwCQmeangvNaLkOZ5skzmgAw kgC6s/0SqoJQE4M3WIZuQ+LO/60dYdwmwZPA3yTrHEb5woEt/32qSkFj5cprpnNpYog9mI Sftg91vk5CJ8OXndUrhaR7YVhz/W4P+LbCkPiiWWxdIKcUMk1rptknrxff1IpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742588528; a=rsa-sha256; cv=none; b=ZJhsOexv9KtIVR77r5GnL2VA+zFC7bkZyP0zqVkjyXOeolDKmadyTPSBpZYbBi8osk2bt1 L7iGY1iwB/YtjSHaTWXNuZkeLXb909985XzQpgM1p82Nty9vfLrxMhYTyBLOR2e9yrDuEl I5pkQsC9ZMG07yTOsG03NlDrlfEzXDgOw6vml59rkl01nrSRblEgiBxTOdGfM4yAf8BcQV zNuY9Q998Jh+eHvFtHY6ODKlYq04J4GkbStnPEkMg8dVNLuax1DJtB3UwdU3RNA7zIiRJX R1uL0Q7h0/eKFq45eaM24aYgBoS1Lzu7PkB0w5KKDLUuQCTUBHI72QC0eIcogg== 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=1742588528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cSCJXgZ9177Zcfyucbibr3NuhhNFMc94CppRLldnDMo=; b=xP2w186djgYt9jHiVuZxY/avtdCC6tiyHAJyVbwTGW/zX2ZEaD3dbxnWVUeyubdBa/R+jg TuLxkTzu8W3AJN3qhNe+gBYfRKifOsOBaGQzAqaYismhdLlMOYukpRi1MkWWFGIWlrjd2m tNlDVHzChx7X4JSC1jgWcy5Im4MukKHP6Je8dOohyqRXGgvR/KVzgbrL5PfTMSc7Sr9W7D zYi/bM0WNOkel85pR5dCNYD5xV1lsoie3NTbZ/XAjk3X2Ly3/tOra0tpqj2lnBAlriHzrh QSh2l67QnfLTwSw3dOIv386cZmjKwDKzSfeskzzyl9b4+Il04P4dPWTr65Gphw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKDPr41WRzrJ6; Fri, 21 Mar 2025 20:22:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52LKM8wB011555; Fri, 21 Mar 2025 20:22:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52LKM8PP011552; Fri, 21 Mar 2025 20:22:08 GMT (envelope-from git) Date: Fri, 21 Mar 2025 20:22:08 GMT Message-Id: <202503212022.52LKM8PP011552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 283be95ea29a - main - etdump.1: Polish + xref cd9660(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 283be95ea29abd7f867e4084bafe368c47f6c038 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=283be95ea29abd7f867e4084bafe368c47f6c038 commit 283be95ea29abd7f867e4084bafe368c47f6c038 Author: Alexander Ziaee AuthorDate: 2025-01-19 02:04:36 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-21 20:20:21 +0000 etdump.1: Polish + xref cd9660(4) + correct misfile in section 8 + rewrite the document descirption to include -9660 + markup command modifiers as such instead of bold + markup variables as defined variables, enabling apropos + correct option syntax in description section + unwrap list offsets for legibility + fix line wrapping for standard BSD console + crossreference cd9660(4) and vis versa + tag SPDX for both manuals MFC after: 3 days Reviewed by: mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D48513 --- share/man/man4/cd9660.4 | 5 ++++- usr.bin/etdump/etdump.1 | 52 ++++++++++++++++++++++++++++--------------------- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/share/man/man4/cd9660.4 b/share/man/man4/cd9660.4 index 0e4fd33637cb..a684df37bab9 100644 --- a/share/man/man4/cd9660.4 +++ b/share/man/man4/cd9660.4 @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 2017 Enji Cooper .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 25, 2023 +.Dd January 18, 2025 .Dt CD9660 4 .Os .Sh NAME @@ -57,6 +59,7 @@ volume located on .Pp .Dl "mount -t cd9660 /dev/cd0 /mnt" .Sh SEE ALSO +.Xr etdump 1 , .Xr nmount 2 , .Xr unmount 2 , .Xr cd 4 , diff --git a/usr.bin/etdump/etdump.1 b/usr.bin/etdump/etdump.1 index bec8d201eb4f..a86a5e24742c 100644 --- a/usr.bin/etdump/etdump.1 +++ b/usr.bin/etdump/etdump.1 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2018 iXsystems, Inc .\" All rights reserved. .\" @@ -22,51 +25,54 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 25, 2018 -.Dt ETDUMP 8 +.Dd January 18, 2025 +.Dt ETDUMP 1 .Os .Sh NAME .Nm etdump -.Nd Dump El Torito boot catalog information from ISO images +.Nd dump ISO-9660 El Torito boot catalog information .Sh SYNOPSIS .Nm .Op Fl f Ar format .Op Fl o Ar file .Ar .Sh DESCRIPTION -This program reads El Torito boot catalog information from an ISO image and -outputs it in various formats. -It can be used to check the catalog in an image or to output catalog data in -a format that can be used by other tools such as shell scripts. +This program reads El Torito boot catalog information +from an ISO-9660 image and outputs it in various formats. +It can be used to check the catalog in an image or +to output catalog data in a format that can be used by other tools +such as shell scripts. .Pp Supported options are: .Bl -tag -width flag -.It Fl f Ar format Fl -format Ar format +.It Fl f Ar format | Fl -format Ar format Select the output format. Supported output formats are: -.Bl -tag -width shell -offset indent -.It Sy text +.Bl -tag -width indent +.It Cm text Human-readable text (default) -.It Sy shell -Each boot entry is emitted as a string suitable for passing to a sh-compatible -eval command. +.It Cm shell +Each boot entry is emitted as a string +suitable for passing to a sh-compatible eval command. The variables emitted are: -.Bl -tag -width et_platform -offset indent -.It et_platform +.Bl -tag -width "et_platform" +.It Dv et_platform The platform ID from the section header. Set to 'default' for the initial (default) entry. -.It et_system +.It Dv et_system The system ID from the boot entry. -.It et_lba +.It Dv et_lba The starting LBA (2048-byte blocks) of the boot image. -.It et_sectors +.It Dv et_sectors The number of sectors (512-byte sectors) that comprise the boot image. .El .El -.It Fl o Ar file Fl -output Ar file +.It Fl o Ar file | Fl -output Ar file Write output to .Ar file . -If '-' is specified then standard out is used. +If +.Ql - +is specified then standard out is used. .El .Sh EXAMPLES To see what entries are in a given boot catalog run @@ -87,14 +93,16 @@ Section header: efi, final Media type: no emulation .Ed .Pp -To use the output in a shell script a for loop can be used to iterate over the -entries returned using eval: +To use the output in a shell script a for loop can be used +to iterate over the entries returned using eval: .Bd -literal -offset indent for entry in `etdump --format shell bootonly.iso`; do eval $entry echo $et_platform $et_system $et_lba $et_sectors done .Ed +.Sh SEE ALSO +.Xr cd9660 4 .Sh HISTORY The .Nm From nobody Fri Mar 21 23:40:38 2025 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 4ZKJpt3JtCz5qsSy; Fri, 21 Mar 2025 23:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKJpt2ZcJz3vbR; Fri, 21 Mar 2025 23:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742600438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XLCyKZyPDm0lRWYKnWWBDjjv2007JFdD6IPPikQCH14=; b=vqNFohG30d9g0jguaxd1Xq7T7nZk/2YHmyLXji72Rn2D7XnzSfLU7WdenRb0ijeQ3LNu1o FJRYvjG+rEsTM1CJavuGaWuNkpkvpOAD++YPrKs5KdLJAMxVrXXKBrUwexWfwjTFYQteBs 8OnKsFayTg02YeaL2wJ9W7vlLaIsS6hwvcEkNtyHh7/3ukh738FBf5Vpf18FoDthjOD18n EZdgal4Y5rYZbF+PZ2x8kWA8keFPayv2xRR6k5YUda6J76Qio74H6f9nw8pc23Iol0Pub2 BzrosHlIAH5tKQOhPNQTaP7Rpx4BcdRfeJFmDdADYzy2+KNHkwP/zryoQ2FM9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742600438; a=rsa-sha256; cv=none; b=eA7XC+mbsIoeLqaHetZ27ERSRntXktHTHwLDUpP/HPm+HbMsAFH2lzHCGTJjurJXeJG1mj CIw/sqUn6tUcFiZ2d/8N/aDEnC4iLdctjb5IE4RRHGf6C6JyvV3d/QH4yIZEeAqrn4gwBY UFrBa/xY8GSGJ2Y++pZeLBR0Eg+lzWjinsFCzsZADAzcsXdfXaABDrKuRfVhvN9oMMKCGz 1dhyr0x7IQ42OdLH7UHRW+m6hd7kR3XwuOI2imvYRokVuTT+d7ZTuLCA+K/6Cxg+Q7IyH0 NlFrZKRbzMFBB04ZIWox8gRNai4p+JgAMRTMQUxM6GwbrYj+gHwKhxwvnlxj6g== 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=1742600438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XLCyKZyPDm0lRWYKnWWBDjjv2007JFdD6IPPikQCH14=; b=Cd+M3VVKCzIay/IwY2MxDVjoZQ7be+wIlMFvYs3Vc+FPsmHR1WNv7OlZ8uXwqysz92ppUb SuxhWhPUeOW7Uxk4tyd1pOL6c5XgSaqxY9kEdsuNJY13nzuoTKHEb3E6dRtofVDU4/z7a0 zHUcxR/0mzhkYgYE5ieyYlb8FN6jzdAEbFUG9lhxIzHoZM4G/b//NwJ6GgxrRLVF6g47AQ waIgR5nk6SfEF/Mii/ZkDJXHhZLC+d/7AJrPoBbaVhkjz56DVYPnAJ/p0FU8QtjqZXVpCD wGuO7TqUBSequLKweI0GXbwHdhM7dvUItpO8aEyiQcG+7Wh8r2jugSBHXTn7yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKJpt1wmPzxLk; Fri, 21 Mar 2025 23:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52LNectq079203; Fri, 21 Mar 2025 23:40:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52LNechu079200; Fri, 21 Mar 2025 23:40:38 GMT (envelope-from git) Date: Fri, 21 Mar 2025 23:40:38 GMT Message-Id: <202503212340.52LNechu079200@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: 7fad17a3e634 - main - kern___acl_aclcheck_path: vrele the vnode after namei() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 7fad17a3e63481ef71b731b0059cb918aec14f17 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7fad17a3e63481ef71b731b0059cb918aec14f17 commit 7fad17a3e63481ef71b731b0059cb918aec14f17 Author: Konstantin Belousov AuthorDate: 2025-03-20 17:56:47 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-21 23:39:51 +0000 kern___acl_aclcheck_path: vrele the vnode after namei() Reported and tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/vfs_acl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c index fde05478d41c..3106218abce6 100644 --- a/sys/kern/vfs_acl.c +++ b/sys/kern/vfs_acl.c @@ -551,6 +551,7 @@ kern___acl_aclcheck_path(struct thread *td, const char *path, acl_type_t type, error = namei(&nd); if (error == 0) { error = vacl_aclcheck(td, nd.ni_vp, type, aclp); + vrele(nd.ni_vp); NDFREE_PNBUF(&nd); } return (error); From nobody Fri Mar 21 23:40:39 2025 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 4ZKJpw0skYz5qsZM; Fri, 21 Mar 2025 23:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKJpv2rHrz3vkF; Fri, 21 Mar 2025 23:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742600439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XYN67uLp6XJ++4VOPAf84dFUuSuNBASJ+CYugTi1fyA=; b=gHUMQ3qkD7sBDAUTzfOXZKArd8mUkGr/Junllu9wik6ScwJmPQqaeTD+Kuc5OMvtXhB/JP FrFUOBux7XeGj3I2OeVDqhxql7R4b3kMg2v0NsdBvXRJd9qttpoWT3wIT31F0u6xvExPlQ 2l0dnfbOReQswkofcLl8U+PJAkXB4iJgVUnQEP4nagBJdRztFchCPD/LAZHxMFIbBE7OnF 2QZaI79zCD5jlatGR0v8A4Af7fyYG12xZFYaf6EF1FebAKBbztRXGITCHkgrv2uIYHamcA dciHd2OopqkFCTltoDRhj+MvV54ImtQQdtBKzRFkn2Kmam+td3CzgqySuJZycA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742600439; a=rsa-sha256; cv=none; b=yxxr4k2CPYzF0Ks3ok2hMuPq/Up3W4FdRuorgyMewnstbbpH6P7n91zKyLEX+Xfi9qv708 4m3dAMBcPyDChWmODrOABP+hCg12asHgw9y8bREWYsKgcsAIOQIDS8yViBt0cmegiXFP08 Ezij9K/tLSl0sOgzNSauT4w7U1DsZILpE5Ei63zSFdesNIbwD3cB42rldYSedqn4FUMCrW 7WVo5nnKlIlDqHUzjGWu3J5XR5A7HPQFC6qLVRqNb53OHtWau1hJv2V+9Q9kdGruD487LZ 1PQc3vvnWVUWTSOWr+PST7lJjA3eB78oBxNW4kU10edGP6387V78ZiWvJeEG9w== 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=1742600439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XYN67uLp6XJ++4VOPAf84dFUuSuNBASJ+CYugTi1fyA=; b=eTtIYzGscyJzVqouflCDenxfxwmq/4AvqnwPZD/JF7gI+vZYFHKFOeZRlY30rZzEvi4stj WaBh4tfuYFPdS5Tpwt0L/PYDc9vJteSlBr8iUlotWrScNubqmdeZEyXw2jxdFvv9D4pWhG hxAmUlZxXHmBF9rYS5LHW2W+JXu9TVoAYSGdmyNsDAGI/yYQUUdb6NB6XyNB4DLhkaCjKj 7MKMudRQ7xLFUqFDIUDVNSVL+BX/tf1YYxE6apQpysmVCzRNGggpA+k3b4yRuh/8j7jgix hrM8/8zxJuSX2khsWaDt7AKoeINM4Z8kZ7H2T1+MLlmf1mWSxSkdb2nwiqYY2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKJpv2RyJzwLv; Fri, 21 Mar 2025 23:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52LNedtc079237; Fri, 21 Mar 2025 23:40:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52LNed8Z079234; Fri, 21 Mar 2025 23:40:39 GMT (envelope-from git) Date: Fri, 21 Mar 2025 23:40:39 GMT Message-Id: <202503212340.52LNed8Z079234@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: d7352b2d57e9 - main - ufs_acl.c: style List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: d7352b2d57e9fe4b9cfb6ae61fd7cdd18851cdd3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d7352b2d57e9fe4b9cfb6ae61fd7cdd18851cdd3 commit d7352b2d57e9fe4b9cfb6ae61fd7cdd18851cdd3 Author: Konstantin Belousov AuthorDate: 2025-03-20 18:09:09 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-21 23:39:57 +0000 ufs_acl.c: style Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/ufs/ufs/ufs_acl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ufs/ufs/ufs_acl.c b/sys/ufs/ufs/ufs_acl.c index 6fad085daea1..49bd686a0d96 100644 --- a/sys/ufs/ufs/ufs_acl.c +++ b/sys/ufs/ufs/ufs_acl.c @@ -642,7 +642,7 @@ ufs_aclcheck_posix1e(struct vop_aclcheck_args *ap) * to this kind of object. * Rely on the acl_posix1e_check() routine to verify the contents. */ - switch(ap->a_type) { + switch (ap->a_type) { case ACL_TYPE_ACCESS: break; From nobody Fri Mar 21 23:40:40 2025 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 4ZKJpx6P8bz5qslS; Fri, 21 Mar 2025 23:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKJpw69hyz3vVw; Fri, 21 Mar 2025 23:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742600440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gTRufVHCex0ZUM3ET9K4LvynEb95qRTlp6sX2py5js=; b=bKLqaetFs5R+esKoJWtrBaHD8nWOy0v5OyKenTi9AI3EiJmThfRml7KEAxnKcNlh0oaVm/ Lsy7MsJUSgyZI3J8cmbY6dIBSnmPnYuz8EeAnVep5W5m9MtSSvcDFa5IMaHz0YxaBQhAQf Xcrv0ZAGqQts8+ttoDZ3pgfoxlilXmocebW3cNRxDB4RsVjBReqVoWUukeC9E1Y2bKZ92M za77GoVEXUGmMaQ93/+0JfxsdTxs1Wth7ExOhTD9UfZHBpab89ZuyUMPoP/lsBemP+Zh8R 7vE5vL4AghZImfM+f02+zhKo9RYRBIJK/B06J3WP/DHz8+KPHa5JxptoXycBNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742600440; a=rsa-sha256; cv=none; b=h0M0ELWc2Y0mrPBxah7/HnZ8vcYZTXmU7jvh631JC04mEUkZRt6Jeauk+zreWLC8ntImUS Y91s912gad/OkMsGY+G1GtOPE3FRPAVQcvxEH6Itk4rOfSCfGdgxcDLd/SSescAdEGZfBC KUNJ1ueo76lCmbvKsVQ0dlb4BlaBlTA/PnuVvQTog3eejad7AIZoFVy97rZO27+ajG5IAv 2t9VRnLSkn8J9wpFkxH/Ij9QSICg6S4S9f0BoPP6nS5i8lHwZh56QBFkUNxXeeqjoIRJjp TDVMyZ4lFG19hVNVtI1iC4tcJv1GpVKJJXbtipsGKoQuEpLRaRIcFSZxPPaitQ== 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=1742600440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gTRufVHCex0ZUM3ET9K4LvynEb95qRTlp6sX2py5js=; b=Hi8n4hk01cVNsBFPPJuUamBJZaL5ANxv6LjeVY/n7RaQjuDvS0ZBHMdhM0RHG8fD8Gfnl5 O3dkv4rGvgwDR+j6jxUzxba7/o2Iz8aGoxpF+gN6lGASV/3V3YSXeGumehahqEs8Ta2g5O iCmyem+Fwi1+CkxMkTMy6etI3HwZh8remydtXxWxJREP6FnhAzkcNUYpgZeKgc/5DHTUDM 1A1LfwcOFvFJzM/gbJgY6dCYPFO74aFYoZ6RUh6D4LW24nHddYIFEdufDQGbIQ6pFAmt66 v6gJIVDAUdDK72jbOJVBj2+Tk1wK75LDdsj+yvKZMaP/uSt+Wcu6velTxWZBcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKJpw2xn4zwLw; Fri, 21 Mar 2025 23:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52LNeeNO079271; Fri, 21 Mar 2025 23:40:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52LNeeia079269; Fri, 21 Mar 2025 23:40:40 GMT (envelope-from git) Date: Fri, 21 Mar 2025 23:40:40 GMT Message-Id: <202503212340.52LNeeia079269@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: 5648c1d6f3b0 - main - ufs_aclcheck(): accurately dereference vp->v_mount List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 5648c1d6f3b0d8f4d67d2e6ec56dd2abcbd8fff5 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5648c1d6f3b0d8f4d67d2e6ec56dd2abcbd8fff5 commit 5648c1d6f3b0d8f4d67d2e6ec56dd2abcbd8fff5 Author: Konstantin Belousov AuthorDate: 2025-03-20 18:10:56 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-21 23:40:00 +0000 ufs_aclcheck(): accurately dereference vp->v_mount The argument vnode passed to VOP_ACLCHECK() is not locked, it is not safe to deref a_vp->v_mount without ensuring that the pointer is non-null and stable. Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/ufs/ufs/ufs_acl.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/ufs/ufs/ufs_acl.c b/sys/ufs/ufs/ufs_acl.c index 49bd686a0d96..4b6cabc2ab30 100644 --- a/sys/ufs/ufs/ufs_acl.c +++ b/sys/ufs/ufs/ufs_acl.c @@ -609,11 +609,11 @@ ufs_setacl(struct vop_setacl_args *ap) } static int -ufs_aclcheck_nfs4(struct vop_aclcheck_args *ap) +ufs_aclcheck_nfs4(struct vop_aclcheck_args *ap, struct mount *mp) { int is_directory = 0; - if ((ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS) == 0) + if ((mp->mnt_flag & MNT_NFS4ACLS) == 0) return (EINVAL); /* @@ -631,10 +631,9 @@ ufs_aclcheck_nfs4(struct vop_aclcheck_args *ap) } static int -ufs_aclcheck_posix1e(struct vop_aclcheck_args *ap) +ufs_aclcheck_posix1e(struct vop_aclcheck_args *ap, struct mount *mp) { - - if ((ap->a_vp->v_mount->mnt_flag & MNT_ACLS) == 0) + if ((mp->mnt_flag & MNT_ACLS) == 0) return (EINVAL); /* @@ -667,14 +666,18 @@ ufs_aclcheck_posix1e(struct vop_aclcheck_args *ap) int ufs_aclcheck(struct vop_aclcheck_args *ap) { + struct mount *mp; - if ((ap->a_vp->v_mount->mnt_flag & (MNT_ACLS | MNT_NFS4ACLS)) == 0) + mp = atomic_load_ptr(&ap->a_vp->v_mount); + if (mp == NULL) + return (EBADF); + if ((mp->mnt_flag & (MNT_ACLS | MNT_NFS4ACLS)) == 0) return (EOPNOTSUPP); if (ap->a_type == ACL_TYPE_NFS4) - return (ufs_aclcheck_nfs4(ap)); + return (ufs_aclcheck_nfs4(ap, mp)); - return (ufs_aclcheck_posix1e(ap)); + return (ufs_aclcheck_posix1e(ap, mp)); } #endif /* !UFS_ACL */ From nobody Sat Mar 22 15:57:22 2025 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 4ZKkTv4tnxz5qfCH; Sat, 22 Mar 2025 15:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKkTt4N3cz3smJ; Sat, 22 Mar 2025 15:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742659042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=koL6p+TKKZ36AjA86xLsNSPPaMmixDJt5+RD90+2XlQ=; b=HXWpaKQ/XgWlwcjc9Mo1nhdQnhkgRYcudnZul9U1IyqS0dacqMbwvRffkldAsWEQOdBQXb CWbDnrulnc29or4tVEPJNfEZwYxj+LH7yB38gp2MQeWA8PbNJsT9JRPLPOIw7RyW8MXf4W lN9kgav74OHCtQJoptVa+Yk5CSaYcJnDd7Hc56zTn2xJ4dn5XpkTo/NdT7cNLrgMGdaN3i IQ8hoWENnB4YiRDTNrFqHhXdyExedisxwSygR7i0Z2U3G32RkeS/Go6JCDMbNh7q6EJc0Q cm11llPGMtWttSRhvx25eUQqHvPbGhSu2RgnAle43qhCpvrEB0JDeh6b9ZD0NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742659042; a=rsa-sha256; cv=none; b=WCLTWT15RcVLx6lkYk57JYNv25TU3Dv23RqzwKn58mrVa8aOxFRsgqLSe+AIFphYveyXev sv1b63QN+Xoz6fw4n9U4wuYrx7cgQBoahyuJmt4PTd8jZ3f9dyiyCj2rqolvAYTiFMTWRa Vq3ZewRheFWpbtAr0BCAifm60ZfWKEDA97bYaclGD/aDFJRhHUqvaLw61CuIBzBQ6JaD4T 7QfSbUjJ0/cC/Rt88F0F+sLL5Haf+3TMk0N/M5HQYZkThO/689wkMIa4uCMrjLjgdjC+aF z5IPJhMqTwDYmqDXtZEbNhoAmpmMJaNVBqWzjOsvHeODTDBM/y27D891YsVqng== 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=1742659042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=koL6p+TKKZ36AjA86xLsNSPPaMmixDJt5+RD90+2XlQ=; b=Yrn2Hy85149cKStUN2OIYfynvOjwUiEVlsneyYhSDY1pfOJybF6nGasceRHDEwIQBxAbIE vfGHnymSZDsFvrMdv+AbqA6Qno5swyeZJAm9/wkiT9CnURQ3G3rLXCMqejrBtM4w5A+Z7d XWPhTt5jH7T4Xsa5L9kF/8rIkKjfZWPckgHmW1uQ8lxGNnfSrlc/1t218Y0kSTr03r77AS h5Phi1x3zX/mtUMlq0HpoVQthWbe3aTPWFjY0nVi0TBNYfQK0n0Zsr6b0r512KoMPSX8qM I8mZZXqqPXH5/hIx2liz8iXs8dt+4NCRvTCigsxtYTHxlG+qEJasteTt5hkSGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKkTt3x62zCBB; Sat, 22 Mar 2025 15:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52MFvMjp003202; Sat, 22 Mar 2025 15:57:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52MFvMn9003199; Sat, 22 Mar 2025 15:57:22 GMT (envelope-from git) Date: Sat, 22 Mar 2025 15:57:22 GMT Message-Id: <202503221557.52MFvMn9003199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 23db5fccb60a - main - hda: add macbook air 6,1 and 6,2 GPIO to enable amplifier List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23db5fccb60a1b008c7cbd3a6b88f9a6b1bac167 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=23db5fccb60a1b008c7cbd3a6b88f9a6b1bac167 commit 23db5fccb60a1b008c7cbd3a6b88f9a6b1bac167 Author: Adrian Chadd AuthorDate: 2023-01-24 07:37:14 +0000 Commit: Adrian Chadd CommitDate: 2025-03-22 15:56:34 +0000 hda: add macbook air 6,1 and 6,2 GPIO to enable amplifier GPIO0 needs to be flipped on to enable the amplifier. The CS4208 looks /sort/ of like previous cirrus logic codecs, enough for audio to work. This actually provides working audio on my mbair 6,2 but it doesn't yet detect the jack. That requires patches to the pin configs, which is going to need some further work. Differential Revision: https://reviews.freebsd.org/D49350 Reviewed by: christos --- sys/dev/sound/pci/hda/hdaa.c | 2 +- sys/dev/sound/pci/hda/hdaa_patches.c | 6 ++++++ sys/dev/sound/pci/hda/hdac.h | 3 +++ sys/dev/sound/pci/hda/hdacc.c | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index ac62c04b5374..1e486b01b168 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -2912,7 +2912,7 @@ hdaa_dump_gpo(struct hdaa_devinfo *devinfo) data = hda_command(dev, HDA_CMD_GET_GPO_DATA(0, devinfo->nid)); for (i = 0; i < HDA_PARAM_GPIO_COUNT_NUM_GPO(devinfo->gpio_cap); i++) { - device_printf(dev, " GPO%d: state=%d", i, + device_printf(dev, " GPO%d: state=%d\n", i, (data >> i) & 1); } } diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 8ad1c845c254..0e88a63e2423 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -113,6 +113,12 @@ static const struct { { APPLE_MACBOOKAIR31, HDA_CODEC_CS4206, HDA_MATCH_ALL, 0, 0, HDAA_GPIO_SET(1) | HDAA_GPIO_SET(3) }, + { HDA_MATCH_ALL, HDA_CODEC_CS4208, APPLE_MACBOOKAIR61, + 0, 0, + HDAA_GPIO_SET(0) }, + { HDA_MATCH_ALL, HDA_CODEC_CS4208, APPLE_MACBOOKAIR62, + 0, 0, + HDAA_GPIO_SET(0) }, { APPLE_MACBOOKPRO55, HDA_CODEC_CS4206, HDA_MATCH_ALL, 0, 0, HDAA_GPIO_SET(1) | HDAA_GPIO_SET(3) }, diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 9b11dcba32a8..231839327530 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -426,6 +426,8 @@ */ #define APPLE_INTEL_MAC 0x76808384 #define APPLE_MACBOOKAIR31 0x0d9410de +#define APPLE_MACBOOKAIR61 0x106b7100 +#define APPLE_MACBOOKAIR62 0x106b7200 #define APPLE_MACBOOKPRO55 0xcb7910de #define APPLE_MACBOOKPRO71 0xcb8910de @@ -540,6 +542,7 @@ #define CIRRUSLOGIC_VENDORID 0x1013 #define HDA_CODEC_CS4206 HDA_CODEC_CONSTRUCT(CIRRUSLOGIC, 0x4206) #define HDA_CODEC_CS4207 HDA_CODEC_CONSTRUCT(CIRRUSLOGIC, 0x4207) +#define HDA_CODEC_CS4208 HDA_CODEC_CONSTRUCT(CIRRUSLOGIC, 0x4208) #define HDA_CODEC_CS4210 HDA_CODEC_CONSTRUCT(CIRRUSLOGIC, 0x4210) #define HDA_CODEC_CSXXXX HDA_CODEC_CONSTRUCT(CIRRUSLOGIC, 0xffff) diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index b4321a5bf998..4198982c9c2a 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -74,6 +74,7 @@ static const struct { } hdacc_codecs[] = { { HDA_CODEC_CS4206, 0, "Cirrus Logic CS4206" }, { HDA_CODEC_CS4207, 0, "Cirrus Logic CS4207" }, + { HDA_CODEC_CS4208, 0, "Cirrus Logic CS4208" }, { HDA_CODEC_CS4210, 0, "Cirrus Logic CS4210" }, { HDA_CODEC_ALC215, 0, "Realtek ALC215" }, { HDA_CODEC_ALC221, 0, "Realtek ALC221" }, From nobody Sat Mar 22 23:40:45 2025 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 4ZKwmZ2v9pz5rQ3Q; Sat, 22 Mar 2025 23: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKwmY5smjz3lT8; Sat, 22 Mar 2025 23:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742686845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6hEHBRTAXsudeSi9BT3yi8qNbO1T9Z4GwLoLZJ87XrI=; b=JVXql3nzbv9q03GzfMAd3jx0PxhFhf+I+zjCPQAebfSzho2S59DoeI6qK/U80ahfwWZArj dnk0vPxMb57NTmPJKCC+fQZbP6t4OMOpfC3RBmVhQKse3kZoIWh56YD68H7qqwc+FOvAnX 95V5/BwQOuiiq9O2ALBiU5dQGmucBNwVRze7yaj8lc92JseIBQ8GLya2Zm1tGBhq6ptRBM IM5Pkh6dksylGrHrNiRnqLa4NT0/DlmiXC/HPHtb5pAP0mWni8l/4D97l2Is8i6HyrmszK ySONUZBwdfnVkba08ob0y20VChdfPHLOhE3370dgGIGdtPzmt9AXiT0C1fEhCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742686845; a=rsa-sha256; cv=none; b=xZrIglnhKgr2/x+R2IQcRJvSiZbL+qYDPAp7/LwTAGjgCR5qaUhXWjiSmkJkhbwsjNwg/T 2JVzzOQip8Avy07ktOY9DEFLEmnFOizikdaBm1+QEyEx5w4a9KiUnOA/tn7tkwc8YM0wo7 f56TuAY6DGMli8UiW8ydJd74pFnlmP0Lqwl6yq5TRjGOhcUyPzN/nqL16NGTyKlO7UHjyr bxuE/la7EzGIjvpB5jMixKMGhs/TAISIVtHalVmRBG6q1K/qjmeaCr7RsUv8EzyyXDqpYb Nn2cG31TJxg8K0igwBGXt/6tIrT9+9J0oS+P0DAUnwMynhvBUcpkxKnnJO+mCw== 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=1742686845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6hEHBRTAXsudeSi9BT3yi8qNbO1T9Z4GwLoLZJ87XrI=; b=nTFvJWH2mzvG+LZM5Gbm1BHftInh8z/7UduoolBwgLUifpB9if4IRoDuZnUwehphtibqay iPbXny8pkv4fctLcn61ExHzGW2xTA9u7IMyaq0wGc58MTCkdf/YjYpPfZD95x7rBiniKJX 8hYWZexQts+GS5OsyXYLMxX1UeZOE/mecOK774IXShTHRgwg7nlSYWvOnuMP7BmkvPiH2o lzc7+NSu9gqZv0uPe56OD8aw7luMVLueS87YNu9E96rAlNe+lTAgM5R7Hp5TNHi3gE+Ixl x1yw8FkCMVC4GU1ifeQ3I32BrnMVaVA9it7Ce4Xshm64Mp0Zgq/3Qw2s5h1CjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKwmY5Gsvzk2V; Sat, 22 Mar 2025 23:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52MNejvF071184; Sat, 22 Mar 2025 23:40:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52MNejaK071181; Sat, 22 Mar 2025 23:40:45 GMT (envelope-from git) Date: Sat, 22 Mar 2025 23:40:45 GMT Message-Id: <202503222340.52MNejaK071181@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: baad45c9c120 - main - inpcb: push multicast case local address selection logic into in_pcbladdr() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: baad45c9c12028964acd0b58096f3aaa0fb22859 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=baad45c9c12028964acd0b58096f3aaa0fb22859 commit baad45c9c12028964acd0b58096f3aaa0fb22859 Author: Gleb Smirnoff AuthorDate: 2025-03-22 23:37:37 +0000 Commit: Gleb Smirnoff CommitDate: 2025-03-22 23:37:37 +0000 inpcb: push multicast case local address selection logic into in_pcbladdr() When destination is multicast and inpcb has multicast options configured, we use completely different logic than in a normal case. Before this change, in in_pcbconnect() we would run in_pcbladdr() and then just ignore its results and run the multicast case block, that would override any earlier selection or failure. Let's embed the case in in_pcbladdr() and also check it earlier. Also, 69c05f428714 switched UDP unconnected sendto(2) to use in_pcbladdr() instead of in_pcbconnect_setup() and due to that lost the multicast case. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D49435 Fixes: 69c05f42871406b4b2b2dac00a268d1da0cacd3e --- sys/netinet/in_pcb.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 9a49353f1538..3774f73a7a8f 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1127,29 +1127,6 @@ in_pcbconnect(struct inpcb *inp, struct sockaddr_in *sin, struct ucred *cred) if (in_nullhost(inp->inp_laddr)) { error = in_pcbladdr(inp, &faddr, &laddr, cred); - /* - * If the destination address is multicast and an outgoing - * interface has been set as a multicast option, prefer the - * address of that interface as our source address. - */ - if (IN_MULTICAST(ntohl(sin->sin_addr.s_addr)) && - inp->inp_moptions != NULL && - inp->inp_moptions->imo_multicast_ifp != NULL) { - struct ifnet *ifp = - inp->inp_moptions->imo_multicast_ifp; - struct in_ifaddr *ia; - - CK_STAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { - if (ia->ia_ifp == ifp && - prison_check_ip4(cred, - &ia->ia_addr.sin_addr) == 0) - break; - } - if (ia == NULL) - return (EADDRNOTAVAIL); - laddr = ia->ia_addr.sin_addr; - error = 0; - } if (error) return (error); } else @@ -1231,6 +1208,27 @@ in_pcbladdr(const struct inpcb *inp, struct in_addr *faddr, if (!prison_saddrsel_ip4(cred, laddr)) return (0); + /* + * If the destination address is multicast and an outgoing + * interface has been set as a multicast option, prefer the + * address of that interface as our source address. + */ + if (IN_MULTICAST(ntohl(faddr->s_addr)) && inp->inp_moptions != NULL && + inp->inp_moptions->imo_multicast_ifp != NULL) { + struct ifnet *ifp = inp->inp_moptions->imo_multicast_ifp; + struct in_ifaddr *ia; + + CK_STAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { + if (ia->ia_ifp == ifp && + prison_check_ip4(cred, &ia->ia_addr.sin_addr) == 0) + break; + } + if (ia == NULL) + return (EADDRNOTAVAIL); + *laddr = ia->ia_addr.sin_addr; + return (0); + } + error = 0; nh = NULL; From nobody Sat Mar 22 23:40:46 2025 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 4ZKwmb5lN5z5rQ3V; Sat, 22 Mar 2025 23:40: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKwmZ6kxVz3lhT; Sat, 22 Mar 2025 23: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=1742686847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bD2tGDpvQ4nXdNUd7TUFUajgpENAGveSjvtJQXQA6ZE=; b=LP6DPWKC2Mwxna4qpJ6qbunCrdEvKJ12KF/V5ku431MUdgDV8rWTK+Q5Jw2QV8ptQErD06 MxjUByIaQUaEp2huzPIqnHcldnm3r74JUjjQpswxaxEACGVz5vVac2AKRfwRBKNRSXHRGS /DOPThkn+mRnYBtIe+xd/FlcNrb0G3588Y9E3o3IFAqUu74RGP9HoeCTAMn5/+jDCHttYV rcWFS33Wq8TIDaQOmVWb6q6YH/nthq3wrktJd9GDp30XbZDtNOlTFAFoaxm8MUAWcuxMZP S8eRJSLALQRhk9gXfHFrbsfJjA7k8lwwGCrm6GvbYUPYGvqnsxMHtXpheLQ7yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742686847; a=rsa-sha256; cv=none; b=jVh7i10UuCS0wMmPLVlHI29uh+jeJ+UxVO7sW8014pK+lruJ4DPmpfWOWBK7UZtmcPznhu Pq1+z/rtmw63HQ0GmUzNQ0HATAiWKwmHltZStUqgl8TDJI2IkAVbHSz/EXMv/Nj9Zr6FPk vQVrw67GwFEYZksvWqkMI931Z6MzkysDvMVWLl1FsyBlLRZ5xmhx4rqsvee0RJUguEbYwd WQP9MpvcYVL/s73rGqcWF6i9EQpw9g7+qvaVHlZV3mMDNOev+8mukNID7bAoUOQsFicZk2 +ahm+y/KyaHvGvbB86IMJFKfmloy+t2zxnuOzudsE6Nba9gk0TovrfDtZ8q5nQ== 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=1742686847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bD2tGDpvQ4nXdNUd7TUFUajgpENAGveSjvtJQXQA6ZE=; b=O+ikYbY6OH/g2AwkH9yxPt2Krtn0s4SRgDy19D4XCW6ruen8rFOFPw72dT8/vvscM7KakF M27P+1nszTHnXIoPU3y/1KIEJbVTJf2sVyz6wuJ22FSZP+qD3hPPKNKDLGARwtvXN36DAV yV+iuDRYQ30eqktmOGKIiKRWrpZuo2TOpjA7a5K7lxTLWtfHgESaVFvV1p/v+KYrnwB/IO hRU8bjzGdR/UsVgnuGwetJTsQs7jewznBGGIR00UUg/no8K9DLivKSSfFFzjAFWN88Sw3Q 5/SXq/99oUJ09ObPDl9E0zPo6RnKEBXsZX+Pv++wX3095+K6hy8MtqmxJXPnEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKwmZ698Gzk0Y; Sat, 22 Mar 2025 23:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52MNek7i071222; Sat, 22 Mar 2025 23:40:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52MNekCX071219; Sat, 22 Mar 2025 23:40:46 GMT (envelope-from git) Date: Sat, 22 Mar 2025 23:40:46 GMT Message-Id: <202503222340.52MNekCX071219@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: 0849f1634a70 - main - tests/netinet: add test for IP_MULTICAST_IF List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 0849f1634a70099b90256ceece52a598eeb3280e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0849f1634a70099b90256ceece52a598eeb3280e commit 0849f1634a70099b90256ceece52a598eeb3280e Author: Gleb Smirnoff AuthorDate: 2025-03-22 22:44:20 +0000 Commit: Gleb Smirnoff CommitDate: 2025-03-22 23:39:50 +0000 tests/netinet: add test for IP_MULTICAST_IF --- tests/sys/netinet/Makefile | 3 +- tests/sys/netinet/multicast.sh | 61 +++++++++++++++++++++++++++++ tests/sys/netinet/sendto-IP_MULTICAST_IF.c | 63 ++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 1 deletion(-) diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index bd972bc3b2a0..cc525bf24480 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -24,6 +24,7 @@ ATF_TESTS_SH= arp \ fibs_test \ forward \ lpm \ + multicast \ output \ redirect @@ -47,7 +48,7 @@ TEST_METADATA.forward+= required_programs="python" \ TEST_METADATA.output+= required_programs="python" TEST_METADATA.redirect+= required_programs="python" -PROGS= udp_dontroute tcp_user_cookie +PROGS= udp_dontroute tcp_user_cookie sendto-IP_MULTICAST_IF ${PACKAGE}FILES+= redirect.py diff --git a/tests/sys/netinet/multicast.sh b/tests/sys/netinet/multicast.sh new file mode 100644 index 000000000000..eb2b962dac70 --- /dev/null +++ b/tests/sys/netinet/multicast.sh @@ -0,0 +1,61 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2025 Gleb Smirnoff +# +# 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)/../common/vnet.subr + +# See regression fixed in baad45c9c12028964acd0b58096f3aaa0fb22859 +atf_test_case "IP_MULTICAST_IF" "cleanup" +IP_MULTICAST_IF_head() +{ + atf_set descr \ + 'sendto() for IP_MULTICAST_IF socket does not do routing lookup' + atf_set require.user root + +} + +IP_MULTICAST_IF_body() +{ + local epair mjail + + vnet_init + # The test doesn't use our half of epair + epair=$(vnet_mkepair) + vnet_mkjail mjail ${epair}a + jexec mjail ifconfig ${epair}a up + jexec mjail ifconfig ${epair}a 192.0.2.1/24 + atf_check -s exit:0 -o empty \ + jexec mjail $(atf_get_srcdir)/sendto-IP_MULTICAST_IF 192.0.2.1 +} + +IP_MULTICAST_IF_cleanup() +{ + vnet_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "IP_MULTICAST_IF" +} diff --git a/tests/sys/netinet/sendto-IP_MULTICAST_IF.c b/tests/sys/netinet/sendto-IP_MULTICAST_IF.c new file mode 100644 index 000000000000..d478e4da0b3b --- /dev/null +++ b/tests/sys/netinet/sendto-IP_MULTICAST_IF.c @@ -0,0 +1,63 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Gleb Smirnoff + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include + +int +main(int argc, char *argv[]) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(struct sockaddr_in), + }; + struct in_addr in; + int s, rv; + + if (argc < 2) + errx(1, "Usage: %s IPv4-address", argv[0]); + + if (inet_pton(AF_INET, argv[1], &in) != 1) + err(1, "inet_pton(%s) failed", argv[1]); + + assert((s = socket(PF_INET, SOCK_DGRAM, 0)) > 0); + assert(bind(s, (struct sockaddr *)&sin, sizeof(sin)) == 0); + assert(setsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, &in, sizeof(in)) + == 0); + /* RFC 6676 */ + assert(inet_pton(AF_INET, "233.252.0.1", &sin.sin_addr) == 1); + sin.sin_port = htons(6676); + rv = sendto(s, &sin, sizeof(sin), 0, + (struct sockaddr *)&sin, sizeof(sin)); + if (rv != sizeof(sin)) + err(1, "sendto failed"); + + return (0); +} From nobody Sun Mar 23 01:30:45 2025 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 4ZKzCZ0vyVz5rWd5; Sun, 23 Mar 2025 01:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKzCX3vRDz3JMw; Sun, 23 Mar 2025 01: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=1742693448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gwJ6+nZL6oFKm6kl3ajc3irYkGFZePpVLNem/pnGdj8=; b=k8ziJN/j/5zKeDaWsuouDcYvcGmfOX9fH3xJqe/Khzmxb7/xf5pMDzQKzYvaBvgKe1OJOa 6o92PsBPiAeR5S3AM/coTZC6TpVJWi2prewFC3FVsJeMKBhPoTPfsafui9QZogzc4RV3rj RBFUDMFWixF86Z0U/EXrPd9Jk9L/bwDwsnRB5ORavnZzdpFOJChAWbiUFUgtjcItrI4Qr5 I/8cl1ggcn3o7Kj97fdJv/Ik/ajqcP9cOZ3yDz1BGmfFINMhkAAvko3aEH3YlIJG8ASksy zHWs12esbOd/IId6WcidLptLCE2YtW4B2Oo7fD/DrO4O5NB0Vg46srHhJf4UAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742693448; a=rsa-sha256; cv=none; b=Zsx1rx6Sr+Yc3Iz/2ll333VgIHpUCQecY/7AoxDlfDB4UKStrI4NXg4c7t+cg8ek3edECv Kc4+Q9I1rF8jwoWzWGkQCZVCg3hOW4dfvoQg38fq88zEa3M6qWs/C4gZm6hUiTFbtdiGHG OYb613VA78J14WkdYwqoxpp+caF/+KY4777aEjXCxEa3FMRN2LROQHYupL0yGhVO8aHVYl SnuRw3FMn/Mu8UPt1cgfsJheWbA7JyHEMUIFheFc+cVHZe+3ajPZPJkd2CrI//0c5iLpXV i2p3fU5prdzk2kKDFa3LMc30v6FwIu0rYx94mtZD2cJR9N47PNbi3Q+IsnKc/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=1742693448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gwJ6+nZL6oFKm6kl3ajc3irYkGFZePpVLNem/pnGdj8=; b=Keygf3XSMhHf65KCz28dtxsSKTxJT2r+wMSkpLFvD/zvstEp5BwgjqfZaRNa+7kWiuzq38 2Hna2yaoJeszHNccqompgFspEpZI9lC5G4hT9WuXiqqoL07wQA5+yx4poUW/SBK+9BcDeZ SplNv5uVOltWz67ALPEP+G2tg+APfL6lAfIHr8npc5stczXvOK2u6A4JBWpghW1wWcKD3x CDd+FyPdoYO91X/NqFK6at9jV+Z50ZSECFINWiBzEJlPnMGHc8Rh0HXY2AGgHhFHzrhlmN 3a6sv5yzXfr3DWdrBNUDZw+yz64hc4ZUahkrzUeQegXbLom4CU8o2pG+VbBuzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKzCX3PmVzmkx; Sun, 23 Mar 2025 01:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52N1Umvi076344; Sun, 23 Mar 2025 01:30:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52N1Ujms076331; Sun, 23 Mar 2025 01:30:45 GMT (envelope-from git) Date: Sun, 23 Mar 2025 01:30:45 GMT Message-Id: <202503230130.52N1Ujms076331@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: d2cccdef3037 - main - contrib/tzdata: import tzdata 2025b List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: d2cccdef30376b7de5643caae1ef035f8e6932f0 Auto-Submitted: auto-generated The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=d2cccdef30376b7de5643caae1ef035f8e6932f0 commit d2cccdef30376b7de5643caae1ef035f8e6932f0 Merge: 0849f1634a70 09f889d4a3f4 Author: Philip Paeps AuthorDate: 2025-03-23 01:28:44 +0000 Commit: Philip Paeps CommitDate: 2025-03-23 01:28:44 +0000 contrib/tzdata: import tzdata 2025b Changes: https://github.com/eggert/tz/blob/2025b/NEWS MFC after: 3 days contrib/tzdata/NEWS | 29 +++++++++++++-- contrib/tzdata/asia | 12 ++++++- contrib/tzdata/northamerica | 9 +++++ contrib/tzdata/southamerica | 86 ++++++++++++++++++++++++++++++++++++--------- contrib/tzdata/version | 2 +- contrib/tzdata/zone.tab | 3 +- contrib/tzdata/zone1970.tab | 3 +- contrib/tzdata/zonenow.tab | 2 +- 8 files changed, 123 insertions(+), 23 deletions(-) From nobody Sun Mar 23 04:38:06 2025 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 4ZL3Mf6JbCz5rjGL; Sun, 23 Mar 2025 04:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZL3Mf497Rz3rkF; Sun, 23 Mar 2025 04:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742704686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MaNF1IFqBX2GHIpxOwOii7ph0yT9l/fgL3jtnndXx2o=; b=yRrlIGguaCHsuG6f+MXPvulkynv6mZ7ZvZuAfySEYo4Q/FL0fCyGBUevg8hY6xsRlbyQs0 wCVKDYuS7fRmNPSuw4xEwgMAQ3+Cisw5kfgs/5iZyfK9BZsPWP8NkC5YfWTQkunAqk12wy c9MykcSFlXvvgRFx0fdnD+VkN2DFVafoF1Jgivw/byhhtMZb+r2qMKaY81tbMK71ASU5Ub I+t5O1o58lRcIacJKtrVg4Oh0a2rBULFX39daVHsTkbB7N4aRNx1IK8upy1uNwtQyy9MVs XltAPRjm3obMObHpFQA71WtIBniQzSo1hFvLT/6f/+GWsQseyzl7qB+53Kneqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742704686; a=rsa-sha256; cv=none; b=FLyR8kgzJoq+nGBw08T8H82XfugL7Tv0GQKG23QGk48NrCfCx8y0p/8oSAje+fc75OD67j tjbE+YESukYq7Qp2L5sZszOblKr6Unc+p3KRSK1YD1dFkMkGQufu48KypeVyhtva6Jd06+ tYq89bJWuy56NS/bkJngGBSlr/K8M5l26MPHZJFmwWfxqy6rsNEYCbI8TcoLJld/sjv38O NlFfU4U0tgVY87k3j2Bre8UBSpLDuX68YfQumgoVLDaU4VMgly6AHFZx3Ka4jCywa1UoQR QPOqjYvwOXoW4iwEkTgsd/jZte/4eUeFe52qtv5sgtqr9gDnzNlHHXkyedtpOA== 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=1742704686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MaNF1IFqBX2GHIpxOwOii7ph0yT9l/fgL3jtnndXx2o=; b=Kj2gOTYSRRHPA3BVwndUQBjrQtPYoIAAhYlNp3GgcIbWMH+DT40ooAptis0dt/goNJK+H2 NM/xkgtGTcpLMsLzY9OdzpoUJ8tcJIULKxfZn8hBPxbukiV5UBkTxmOUL0fqo+etkPPqRP kwg1Iqt38ujDcOWkfnfQHNcC6oNTNKkwBH0PdqMoRjghgDwByeMyf+dgU5THntmwLEUc16 LUggt1Tu6b+yltKBS9YwAw/MZg8qGo26VpOOrWRU9PPBkRPK8ySEA8i7tnIfGSPeDs/rPz YrK2v5lgOrW1lj8J3+8Nl48iURJT83uOwY1tzLDTIJLXONFZYZnOEruq2J15qQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZL3Mf3D59zt5r; Sun, 23 Mar 2025 04:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52N4c6o3022270; Sun, 23 Mar 2025 04:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52N4c6fs022267; Sun, 23 Mar 2025 04:38:06 GMT (envelope-from git) Date: Sun, 23 Mar 2025 04:38:06 GMT Message-Id: <202503230438.52N4c6fs022267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 220ce523e976 - main - rk_grf_gpio.4: Polish List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 220ce523e9762b961d41d3d7797f6606c4ad1b0f Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=220ce523e9762b961d41d3d7797f6606c4ad1b0f commit 220ce523e9762b961d41d3d7797f6606c4ad1b0f Author: Alexander Ziaee AuthorDate: 2025-03-18 22:04:02 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-23 04:35:01 +0000 rk_grf_gpio.4: Polish Normalize copyright, date, wrapping, and document description. Fixes: 0832a409c (add driver for the RK3328 GPIO_MUTE) Reviewed by: mhorne, shurd Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D49408 --- share/man/man4/man4.aarch64/rk_grf_gpio.4 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/share/man/man4/man4.aarch64/rk_grf_gpio.4 b/share/man/man4/man4.aarch64/rk_grf_gpio.4 index 1587e708c93b..6a5ebbe19e3b 100644 --- a/share/man/man4/man4.aarch64/rk_grf_gpio.4 +++ b/share/man/man4/man4.aarch64/rk_grf_gpio.4 @@ -1,16 +1,14 @@ .\" -.\" SPDX-License-Identifier: BSD-2-Clause -.\" .\" Copyright (c) 2025 Stephen Hurd .\" -.Dd Mar 16, 2025 +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd March 18, 2025 .Dt RK_GRF_GPIO 4 .Os .Sh NAME .Nm rk_grf_gpio -.Nd -.Xr gpio 3 -driver for RockChip GPIO_MUTE pin +.Nd RockChip GPIO_MUTE pin driver .Sh SYNOPSIS .Cd "options SOC_ROCKCHIP_rk3328" .Sh DESCRIPTION @@ -18,8 +16,8 @@ The .Nm driver provides a single-pin, output-only .Xr gpio 3 -unit whose single pin is named GPIO_MUTE. This controls the output -of the GPIO_MUTE pin on the SoC. +unit whose single pin is named GPIO_MUTE. +This controls the output of the GPIO_MUTE pin on the SoC. .Pp This gpio is usually used to control another device on the board, so is not usually available for user software. From nobody Sun Mar 23 04:46:26 2025 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 4ZL3YH0ryMz5rjb9; Sun, 23 Mar 2025 04:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZL3YG5sQCz41ZM; Sun, 23 Mar 2025 04:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742705186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HUrXH5C06f5lTxvp9oXJRaKti/bCzso6Q2AOdkAaJJg=; b=BARbAivoFWhnQRd+X9zZmYZMR6kAA1w48xvbScCk64l/tVoRMprs3IDoBoQKkbBMMjGZ28 SV30raUeiNgxZ+/C6Km2bDbuIcIE+PrxKnB6Bhoa+aDinygHoOG+YNPQSToveO47imJDxU LEyDtHuxM4bYyFxAsDyC2tShnp50Tk4k50GUaZn/+2FE/URPk8eIJFAARs9FijcCN9CVGU cozDnLy0BrAZ5pfmpdfr9TKuWlm9STVfEqxQ3Fl/6hWeLNFqw69ElCEmh9KLTcCzPmulAs XGs7NTOAvqL/o3Avfy0Ej2UbkRIxqc8qTXfUE+NufCNrTFFcqgD4W1UoanA2Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742705186; a=rsa-sha256; cv=none; b=QNYMN8ZMwPtc4w4SAawmqkiglOqhen0jnBcVs0qApR4yRmQhJZYFu5zPIjxJdBT+9LTk7w u7FFIyCqFliJ2lJeH69lNKCA+7KaNHjf0NERGjRJGsf/mpzogatHZ8skcD8H05TPnrWIT0 PyLdlnAl7OqWEzuZJ/PzvckkGiY1mewyb83ZrARpZLvhuc5SO9bTdePCwSAkmBB/Vmayer y4v3i9l8Ms9ler3mBYP5SyEYHjvfp2BjoOV0keVpm7FCyYZdJuEw/A/UxxKueo+8LgtTty N6+AoYlRx5/WYujEHtfETHon4VEnMgMxmPa4P23Wb+AxccrASUh+qNF0eRMzwA== 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=1742705186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HUrXH5C06f5lTxvp9oXJRaKti/bCzso6Q2AOdkAaJJg=; b=XAqr9PWkYl3Fquoqq4Vz/KRLQczQSBW9oEiR8ut6S/wJnLMClUTIsGEHzpRLGLaJB8ZCiI Rh710orRKWdCRKze2rAXfwuRHzGEmupapfJkmm5i1Xq7aMCi86JsOrNImmpdgZEywK79Sh JSwzl6p5CiuIRGEOugvPFa8nQQzAGmQ6dwyRzUzjUncCizmO3d05z+DuyCs33usOefvRM3 yLOYKG5F0r6rrJjwg0p0D4asHIb85Xc7Wry9gjdEcPvlysqXWVV9yr6uVd8IC4xnrTmYrx 2dIX4QbtO6u9s52Yc5C1XR6xmSPxLiXGHJ2wePgtxc2KeWuyluAaXZet8Yv2WQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZL3YG59t1zt3r; Sun, 23 Mar 2025 04:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52N4kQto040488; Sun, 23 Mar 2025 04:46:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52N4kQgM040485; Sun, 23 Mar 2025 04:46:26 GMT (envelope-from git) Date: Sun, 23 Mar 2025 04:46:26 GMT Message-Id: <202503230446.52N4kQgM040485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: dcef6ce862cd - main - UPDATING: Show plural syntax for PORTS_MODULES List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcef6ce862cd19b3496486469cc631bb1b71fcbf Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=dcef6ce862cd19b3496486469cc631bb1b71fcbf commit dcef6ce862cd19b3496486469cc631bb1b71fcbf Author: Alexander Ziaee AuthorDate: 2025-03-23 04:40:34 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-23 04:43:06 +0000 UPDATING: Show plural syntax for PORTS_MODULES Show two examples in PORTS_MODULES to demonstrate space separation. This also shows off our working PRIME dual-gpu support. Switching to this doubled my laptop's battery life! MFC after: 3 days Reviewed by: mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D48342 --- UPDATING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 6989bb7c7f99..56b5e2dc16b7 100644 --- a/UPDATING +++ b/UPDATING @@ -2188,7 +2188,7 @@ FOOTNOTES: happens automatically. If all your modules come from ports, then adding the port origin directories to PORTS_MODULES instead is also automatic and effective, eg: - PORTS_MODULES+=x11/nvidia-driver + PORTS_MODULES+=graphics/drm-kmod graphics/nvidia-drm-kmod [3] From the bootblocks, boot -s, and then do fsck -p From nobody Sun Mar 23 04:58:16 2025 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 4ZL3pw5nVhz5rk6T; Sun, 23 Mar 2025 04:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZL3pw4sL2z4FCq; Sun, 23 Mar 2025 04:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742705896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5Maiercck5zoYGOTEz/pWcCMTPCRSZmqkvqrFDpHqM=; b=FLmh1zGLh1EY4A9RmuWQTsETBDN8zCOVNqRIfzgx819FgV6bjl+Hobj9dfRwlgs8trrldF j6JBlB4GfqyjQ+qz3DXNancl5a1KEWpgqRCAo/yVXhaqWWtcauHx8ZZp3+03ymWi5wlAem BSVYPSeZ2pOd2TTai4SbEeXyE60sU6YhRDSD4ZzzwVP7nBBS4msqiK7n5Nv749yLtjv1fS AoUU/90pjtStXnocw8sxZt1sb3kOx2BsjsfgRg5TnkWUPu28skAI9nkb0Fi7kHnWElwNbd nvbNedlvj5/9LZ+jCSD7k0dQyBD8aLHS+IeOR8Bknz+xd9coE3+wPEd6xGMT1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742705896; a=rsa-sha256; cv=none; b=mhpWWhvRuhq+pVd+PomiKugTiEAzgpG1gTCqgYYIrjnL0TiBY2hzmdfkyVv+cyf514eRCv i2hnbWJDpXfT6BLWpmmmGBBi2i1/FWXNG4CB8SlahM1yuWEs5D2Oopuu7Y5f/3X1uttRX7 ybHNQpVtCCAZQ57/ndk2UrktlIQVG6xK8hkWjVZW3iyWmoCi41z9RoA6csHJRZBSduaxVu RG/j6k2BFtKnr/NL7QbhMJbhrzypI4R1baCNE/BPPA+lKk6+OP6aLVWlxtYvC4v5l3Whcg TvSUhZo3pWe7ArXgCWA5xsT6XSMoqPn9bee/QFDZQzb7OLuTzPu70annOigMpg== 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=1742705896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5Maiercck5zoYGOTEz/pWcCMTPCRSZmqkvqrFDpHqM=; b=ro3gb3vnu5bx9VrISv8essiX7F9jnrnPV35/vYt/tWa25pObt96aB/ISbzxkt843is0A9f r+5aSadi+Ca50v+D3wnFXzDOoZBPkl7n6H/wJDDt0PsruI7XmsxcMhKwgUqeFXpndG/bdW yhM3MKgRQdFizzYLW4txfHizZQD7PsO4NL2dDrRqj8TYWmLvAk4aRGcGnSjKsftqfv9ZP0 nvjtTa6/PnLswUvSAsmrgY9aM0yuXMgFGlcddG7Pnk1qYP5x0k1I9jkgvTll7uzZnt4f/V ZzVfzINFXvxx3uOGQD95k3Vyv3jwbaBLdTXv0dzfyGoEZpxgV70/VuIQ3VlWGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZL3pw3FdNztH5; Sun, 23 Mar 2025 04:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52N4wGjt059374; Sun, 23 Mar 2025 04:58:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52N4wGDD059371; Sun, 23 Mar 2025 04:58:16 GMT (envelope-from git) Date: Sun, 23 Mar 2025 04:58:16 GMT Message-Id: <202503230458.52N4wGDD059371@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 29eb4de61a4c - main - style.mdoc: HARDWARE generates Release Notes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29eb4de61a4c2ab1d940e10f3816db79e74d46b1 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=29eb4de61a4c2ab1d940e10f3816db79e74d46b1 commit 29eb4de61a4c2ab1d940e10f3816db79e74d46b1 Author: Alexander Ziaee AuthorDate: 2024-10-06 22:44:15 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-23 04:54:21 +0000 style.mdoc: HARDWARE generates Release Notes FreeBSD Release Infrastructure has been building the Hardware Release Notes from these subsections in the Kernel Interfaces Manual. Standardize this behavior in the FreeBSD Manual page style guide with everything we learned in the 14.2-RELEASE. To me, this is an enormously exciting discovery, and I believe that over the next 5 years, this can transform the supported hardware UX, without reinventing the wheel, by doubling down on our ways instead of reinventing them. MFC after: 3 days Reported by: bz (special thanks) Reviewed by: imp, mhorne, pauamma, rpolaka Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D48343 --- share/man/man5/style.mdoc.5 | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/share/man/man5/style.mdoc.5 b/share/man/man5/style.mdoc.5 index dd4d8a1f5fdf..d96c9ff08bbb 100644 --- a/share/man/man5/style.mdoc.5 +++ b/share/man/man5/style.mdoc.5 @@ -1,4 +1,4 @@ -.\"- +.\" .\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2018-2022 Mateusz Piotrowski <0mp@FreeBSD.org> @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 12, 2024 +.Dd December 21, 2024 .Dt STYLE.MDOC 5 .Os .Sh NAME @@ -74,6 +74,33 @@ Historically, was the preferred way before the deprecation of .Sy \&Li . .El +.Ss HARDWARE Section +Driver manuals in section four should have a +.Sx HARDWARE +section describing hardware known to work with the driver. +This section is drawn verbatim into the Release Hardware Notes, +therefore there are several things to note: +.Bl -dash -width "" +.It +The introductory sentence should be in the form: +.Bd -literal -offset indent +The +\&.Nm +driver supports the following $device_class: +.Ed +.Pp +Followed by the list of supported hardware. +.Pp +This defines what driver the subsection is referring to, +and allows the reader to search through the Hardware Notes +not only for the device models they have, +but also for the device type they are looking to acquire. +.It +The supported hardware should be listed as a bullet list, +or if complexity requires, a column list. +These two list types create very neat subsections +with clean starting and stopping points. +.El .Ss EXAMPLES Section .Bl -dash -width "" .It From nobody Sun Mar 23 11:59:54 2025 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 4ZLF9R2Ch0z5rCF6; Sun, 23 Mar 2025 11:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLF9R1bzKz3R4g; Sun, 23 Mar 2025 11:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742731195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dIq8wkCawVs4lUiSy4gQsVQbSuFTe7xELLr99B9sGOg=; b=q7kn1tWYttYevP6EbqVgPyUkW7yZFbmj/GBvse48OVe8aMFDR12LL/PL9O8vuFI547Dad5 nHrDnf8AsAgnZ9kN6SVh6LFH0JfnylTfjJZxHHsqoh6+AyfjH5jYu9mltZiy//aW84thui 0Szvxfg4fmIkZNaVtGvnOE8dy8ow4rRwuRuI+z63DT6Sa5NnMWreZ1lUoSEv+L2xj84ala r/pZ+7486QjUczZB2WZWHqMHNC3lR6rIUpwLSFeMBJVr7RrPuAz0Ez9556Uq4O6hYlgmaR VCWlKCRBIRxvrYFX4UJ4Vi51d0vYHXq3bYFwd5O6+BQGmywdEaqcNq4ZD9q6Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742731195; a=rsa-sha256; cv=none; b=ujH2RLlvY8Q+kEDq0a+okaoTGuERBsFCZWNHiMRY6g2ucl1ELw5A+83/VBwgineaV9rNua PBj6UMMQv3/O5Getle0qcDWgBXGyHa8Aud8p43z1wG1iLGALrfF5om9+j2HjKpK6fJO5JY 4sDnO+qrO7GSk04TRinPq10zh7zFQOfGVydOy2jCTEQQsZDu/+R78CEmLVe3HMfUeEJhWT tlNVwdrsU2L0MzXcCg1QjprDzDMfO+/Mn/xd3uz1bpDBft7bm/vljQLHARfmnfHC42Cp4a yqlR0owl3RWHJ0YabpyqjZbNrMSRCJGq/sIkTTsiCYn0JoOHoF4GgMuNU/Ttng== 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=1742731195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dIq8wkCawVs4lUiSy4gQsVQbSuFTe7xELLr99B9sGOg=; b=tC8sQzhtlOXlf0pWBJ674q79oRKH55cvEZAWm6EXWzNmEZZpe/5kKUvsgVBjT1nPNEjsYn ERZl59UW+1t3qRyIjYUf73BLIe1m5fc2BGaXo3N3qxiVCu0df7aiUkPfLo8sQk3YVxST3p lhC6lhaIGM6OAReucihrFCqjQhNVy8ZjjvOChPPhizZrFV7l6s1m6P87w93PJ9nt8MxaUE maqxoDlHT3eKjWR5ot5IpGx2M2kc+ePBRQ8h3KWmHnRhMfaJDNKYTMrODuW4N2/H8vZLFo 4zJRTfYblURZfNgfBZpmqHg170y+RApj5u5FHfF4s67FFiM9rW6ln4r7fnNtSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZLF9R0nZkz1661; Sun, 23 Mar 2025 11:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52NBxsQp044875; Sun, 23 Mar 2025 11:59:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52NBxsMX044872; Sun, 23 Mar 2025 11:59:54 GMT (envelope-from git) Date: Sun, 23 Mar 2025 11:59:54 GMT Message-Id: <202503231159.52NBxsMX044872@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: e9a846468acf - main - ktrace: Use STAILQ_EMPTY_ATOMIC when checking for records 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: e9a846468acfbba35ca40b888670559aaff7228d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e9a846468acfbba35ca40b888670559aaff7228d commit e9a846468acfbba35ca40b888670559aaff7228d Author: Mark Johnston AuthorDate: 2025-03-23 11:54:59 +0000 Commit: Mark Johnston CommitDate: 2025-03-23 11:54:59 +0000 ktrace: Use STAILQ_EMPTY_ATOMIC when checking for records in userret() As in commit 36631977d8c9, this check is unlocked and may trigger spurious assertion failures. Use STAILQ_EMPTY_ATOMIC() here as well. Fix nearby whitespace. Reported by: syzkaller Reviewed by: olce Fixes: 34740937f7a4 ("queue: New debug macros for STAILQ") MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49441 --- sys/sys/ktrace.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h index 9d06cd33d5d2..6608b9250da4 100644 --- a/sys/sys/ktrace.h +++ b/sys/sys/ktrace.h @@ -87,10 +87,9 @@ struct ktr_header { * is the public interface. */ #define KTRCHECK(td, type) ((td)->td_proc->p_traceflag & (1 << type)) -#define KTRPOINT(td, type) (__predict_false(KTRCHECK((td), (type)))) -#define KTRCHECKDRAIN(td) (!(STAILQ_EMPTY(&(td)->td_proc->p_ktr))) +#define KTRPOINT(td, type) (__predict_false(KTRCHECK((td), (type)))) #define KTRUSERRET(td) do { \ - if (__predict_false(KTRCHECKDRAIN(td))) \ + if (__predict_false(!STAILQ_EMPTY_ATOMIC(&(td)->td_proc->p_ktr))) \ ktruserret(td); \ } while (0) From nobody Sun Mar 23 11:59:56 2025 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 4ZLF9S3kzjz5rC1G; Sun, 23 Mar 2025 11:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLF9S1bRxz3R3s; Sun, 23 Mar 2025 11:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742731196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lgKmsxqQhZA9q1r3qZIWUTJm4VWRUkny44e3hYYEl0k=; b=fKL0f1/AbaQeU5UvGfWB3DM1WYXaHSR4tqHWF1dNhJZY/aEO6/ZgSAHzUmiBYn+xstndsl iAarimOuJAfL5bCjuo21eEin20KECVo7cyjMk4Yb3rkY9+HVDt1gN0DcA5PC+2/8Fege2x mUajnIGMrEpzcjlqd8FQZEJF33ibeKmmGYfn/B+fnLBBHBZy3jxfeUwjMxGWCDAXKSNDbW /GZl3obljuSbgEGT+vs5Ia/iieFBXq6gJcjjBpMLjFIG9wp4azq84cIQGdbEelN58DOV6K frOFTPYi8plvBQtokI0eDfV/DNehzmXlVRQ1HvZPh/ZCk1brO8lU5Sj4PQBenA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742731196; a=rsa-sha256; cv=none; b=uY/6xJYyLVRsdPwNj0+1J+UFOWUrI61exR3bIP6OSFrn/ThEXO+6mKOG8XWlbTQVfIRcdU bU1nnj7VfMTOej4VhKTeTZrMSNvTVPAVF+vAX8GFASqZlSFYOqjdnVl5hRXa45U0bO26qJ P4tYk2q9clnxHJqBp7/jmUPdThLTX7ffm7YXH817F5s9HFZKBI6iFI9wWxBxoU1B7E5aWi BtW75fsVzxjFVFrzYnLH0iqza5Ki7yz/yBLeSmCXmOhZW0o+72DDkowZ/RBQ8XKg+SdGET zCg/a4P6cuA+d7kA2rWOAMb72lTI+QXnC+go94RRgo/3UFTBgwMA0z3Qr96RBQ== 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=1742731196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lgKmsxqQhZA9q1r3qZIWUTJm4VWRUkny44e3hYYEl0k=; b=pTfcCrik1sJrxUzgWCRhC1ntZZp7LYJDcN+YP9lPMOXXDMh4+4YCqalq5kaKLu9T9sLmII yCsJhp2jgUS7Nh+ww06doPd0foI+7yRSgFcYmztFLbmt3TGZAgZjmEXpPh22WLknH1JEy/ Oc+r5E2uV8GNu1789T+TEAmdbF43XsYpCKdQ/okdxa7rtZow5jEnsxnKFwUuGEaQKyLHKr tNgz2h12mWsyulkw3HETTcgZs6JUchmQaBRl+c8vOBogKXLtyA4hz7ikmYisz19AMU3ILT L6HOAGugy+n6zpSNwy1Sn82nt4l/cfaZlvEULdHrKGCEl2REI5NN6PBEBgowzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZLF9S0tCMz16Ct; Sun, 23 Mar 2025 11:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52NBxusP044910; Sun, 23 Mar 2025 11:59:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52NBxuOa044907; Sun, 23 Mar 2025 11:59:56 GMT (envelope-from git) Date: Sun, 23 Mar 2025 11:59:56 GMT Message-Id: <202503231159.52NBxuOa044907@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: 574816356834 - main - socket: Fix a race in the SO_SPLICE state machine List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 574816356834cb99295b124be0ec34bd9e0b9c72 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=574816356834cb99295b124be0ec34bd9e0b9c72 commit 574816356834cb99295b124be0ec34bd9e0b9c72 Author: Mark Johnston AuthorDate: 2025-03-23 11:55:56 +0000 Commit: Mark Johnston CommitDate: 2025-03-23 11:55:56 +0000 socket: Fix a race in the SO_SPLICE state machine When so_splice() links two sockets together, it first attaches the splice control structure to the source socket; at that point, the splice is in the idle state. After that point, a socket wakeup will queue up work for a splice worker thread: in particular, so_splice_dispatch() only queues work if the splice is idle. Meanwhile, so_splice() continues initializing the splice, and finally calls so_splice_xfer() to transfer any already buffered data. This assumes that the splice is still idle, but that's not true if some async work was already dispatched. Solve the problem by introducing an initial "under construction" state for the splice control structure, such that wakeups won't queue any work until so_splice() has finished. While here, remove an outdated comment from the beginning of so_splice_xfer(). Reported by: syzkaller Reviewed by: gallatin Fixes: a1da7dc1cdad ("socket: Implement SO_SPLICE") MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49437 --- sys/kern/uipc_socket.c | 7 +------ sys/sys/socketvar.h | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 03bfea721dd2..c27b007cafc6 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -592,11 +592,6 @@ so_splice_xfer_data(struct socket *so_src, struct socket *so_dst, off_t max, /* * Transfer data from the source to the sink. - * - * If "direct" is true, the transfer is done in the context of whichever thread - * is operating on one of the socket buffers. We do not know which locks are - * held, so we can only trylock the socket buffers; if this fails, we fall back - * to the worker thread, which invokes this routine with "direct" set to false. */ static void so_splice_xfer(struct so_splice *sp) @@ -1638,7 +1633,7 @@ so_splice_alloc(off_t max) sp->wq_index = atomic_fetchadd_32(&splice_index, 1) % (mp_maxid + 1); } while (CPU_ABSENT(sp->wq_index)); - sp->state = SPLICE_IDLE; + sp->state = SPLICE_INIT; TIMEOUT_TASK_INIT(taskqueue_thread, &sp->timeout, 0, so_splice_timeout, sp); return (sp); diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 735ff49062de..02d0ca139fa4 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -80,6 +80,7 @@ struct so_splice { struct mtx mtx; unsigned int wq_index; enum so_splice_state { + SPLICE_INIT, /* embryonic state, don't queue work yet */ SPLICE_IDLE, /* waiting for work to arrive */ SPLICE_QUEUED, /* a wakeup has queued some work */ SPLICE_RUNNING, /* currently transferring data */ From nobody Sun Mar 23 21:06:04 2025 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 4ZLTHd0t2Hz5rpdb; Sun, 23 Mar 2025 21:06: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLTHc6kzkz3TfQ; Sun, 23 Mar 2025 21:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742763965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FclhPRhhQxXocLejqIwJ7LgOlgZMY/DCWeA59eIPvGk=; b=cii9+jnf1IK0d9A72KyFHVl+kPyyJdtoEcsxDs3kgRj6w6GIFg8kAR0M/XyIMozwNSK2mQ yW0zuGbBUKycbZBJ8P3L96T0BtpCkoc03X2IC8VMhhK1P/ayL9miJD+CowQZ5kuK3CT6un f4Spvl7d3WQuCOPvGQsVx4YUjEYPwvE/LtHMhoMSoAI7Qkn4d4BUyQ5Pr3+uVnjrz/JnEI cq4IKWY/9+OI6vNTBxmlGADfeDCIT66rPJaNobunHFTXgjjrcu+6Hr5pbQxNQWnewrVlUR uT/yPY/yArD0tze5F7cAIDMjoN7J/16Lxzu2YJus5CKkimMgprCXXXFVC0KkQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742763965; a=rsa-sha256; cv=none; b=AWYWjFvXiYfDKGqf09qD/oyCLrjLYiF2TFcyOGUT3+HxNO7REku9PBMOrXsQxAfh1IEU1N 6FHO+eLb8waJgaLOAmDSZyLkmMqTKciZKH+pLtjTHL6NeyUHDz41AOnhy4E9HpE6VOEU45 qeItgGzuI7048mvayBqA51POsmaoYyld4vPbjVpg3c4ZRtrgdjxBiqqcKbg4JnbLR3mxeL pK2whsw+IkmzIWVWGSyOMfSdX8lpaGHOXI3q11m1fATebuxCRw+8691juog0jwpKH2yTua Nc/51M4Iftdu6Y5wGTmioPZttUp6XB55kVlu/2tSYt5qZizYZg9Tde7qyoa++g== 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=1742763965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FclhPRhhQxXocLejqIwJ7LgOlgZMY/DCWeA59eIPvGk=; b=TfAL1fC0vVbtA+EtIJQBFa8tnppbCQf0cqh+sP5vRDl9vZLFv0F65cdBQRxWoajOkAC2+p o8yynPzEr65Qqc9x0eKijNBxrD9rpARcbwuaivmuMj8C50QO1jCUoW4Teeowhl8wFlZcna IhZtaGBUGUbDPcc/vA0sbqJsik+zLHN7S4KFn7CW/aAPn6V1TVrl5h/VmcIOShyiJKgZuI MW61kL0uR1geV/Bt8sH8hwmUcg/+Ub6VaZNftQQOe9GUp1h8cvstpt9IWSgt/nqwMLTArI 3cGUzdcYVCJtlgj8jk0vM4DF1ow6wqSFZClAf4jqyxe5SEeZ5MRME6oygtJzkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZLTHc6CtCz8fl; Sun, 23 Mar 2025 21:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52NL64bA071899; Sun, 23 Mar 2025 21:06:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52NL64MG071896; Sun, 23 Mar 2025 21:06:04 GMT (envelope-from git) Date: Sun, 23 Mar 2025 21:06:04 GMT Message-Id: <202503232106.52NL64MG071896@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: 74361d693aec - main - malloc: Fix DEBUG_REDZONE for contigmalloc() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: 74361d693aec892b01c1553bda7176f8d341b2ff Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=74361d693aec892b01c1553bda7176f8d341b2ff commit 74361d693aec892b01c1553bda7176f8d341b2ff Author: Mark Johnston AuthorDate: 2025-03-23 13:42:40 +0000 Commit: Mark Johnston CommitDate: 2025-03-23 13:50:41 +0000 malloc: Fix DEBUG_REDZONE for contigmalloc() When free() was adapted to support allocations originating from contigmalloc(), redzone(9) support was not included. redzone(9) involves adjusting the pointer to freed memory before looking up the slab cookie, so it's not straightforward to make contigmalloc() opt out of redzone support. Thus, augment contigmalloc() to support redzone. Reported by: glebius Tested by: dhw MFC after: 2 weeks Fixes: 9e6544dd6e02 ("malloc(9): extend contigmalloc(9) by a "slab cookie"") --- sys/kern/kern_malloc.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index b1347b15e651..0b76e633b04a 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -477,11 +477,18 @@ contigmalloc_size(uma_slab_t slab) } void * -contigmalloc(unsigned long size, struct malloc_type *type, int flags, +contigmalloc(unsigned long osize, struct malloc_type *type, int flags, vm_paddr_t low, vm_paddr_t high, unsigned long alignment, vm_paddr_t boundary) { void *ret; + unsigned long size; + +#ifdef DEBUG_REDZONE + size = redzone_size_ntor(osize); +#else + size = osize; +#endif ret = (void *)kmem_alloc_contig(size, flags, low, high, alignment, boundary, VM_MEMATTR_DEFAULT); @@ -489,16 +496,26 @@ contigmalloc(unsigned long size, struct malloc_type *type, int flags, /* Use low bits unused for slab pointers. */ vsetzoneslab((uintptr_t)ret, NULL, CONTIG_MALLOC_SLAB(size)); malloc_type_allocated(type, round_page(size)); +#ifdef DEBUG_REDZONE + ret = redzone_setup(ret, osize); +#endif } return (ret); } void * -contigmalloc_domainset(unsigned long size, struct malloc_type *type, +contigmalloc_domainset(unsigned long osize, struct malloc_type *type, struct domainset *ds, int flags, vm_paddr_t low, vm_paddr_t high, unsigned long alignment, vm_paddr_t boundary) { void *ret; + unsigned long size; + +#ifdef DEBUG_REDZONE + size = redzone_size_ntor(osize); +#else + size = osize; +#endif ret = (void *)kmem_alloc_contig_domainset(ds, size, flags, low, high, alignment, boundary, VM_MEMATTR_DEFAULT); @@ -506,6 +523,9 @@ contigmalloc_domainset(unsigned long size, struct malloc_type *type, /* Use low bits unused for slab pointers. */ vsetzoneslab((uintptr_t)ret, NULL, CONTIG_MALLOC_SLAB(size)); malloc_type_allocated(type, round_page(size)); +#ifdef DEBUG_REDZONE + ret = redzone_setup(ret, osize); +#endif } return (ret); } From nobody Sun Mar 23 22:17:36 2025 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 4ZLVt91XdLz5rtPd; Sun, 23 Mar 2025 22:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLVt84QP0z3NP2; Sun, 23 Mar 2025 22:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742768256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E+B2Vjv0p/kmif1z6yruJdgSRRUG5ZpGRZXRwWzcJJ0=; b=mpGRUdyvlXMIFNHE58K5Kfg5xWclr4IGJhcJrKJxrF6p4wh9Pd0/+zmtnTDaL4Jsf8qRc1 EJ1t4KCInFy8JFY4+rMX8X147WoOiCmoyrSo/Qvp3oZWFR5Zl7laIt8xiZ0Nyx2JcXZqZL odlo0RcMyuv8NbiCTMzWhhftRlabZ9ceufKf/jAN3QIU1Xh6Fr7EaGIV1jbg4mFkchTRtC 0WQn+zZ+kTArmjN4LzvORsQj0KmWrK7EGaNzvlsRN18IEeN65KUZ2yvixTEh4bnua4kuDr owKkXHT2E5Vvq+IjRO2fm2PZMgf+pFdILcs7d3TbR8JMBN4BFGtAFW1uatLRFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742768256; a=rsa-sha256; cv=none; b=tTiGX8rBtelf6hzo+tp91vOp6dzyr9zxF02Qt1JwAByM1BlU4382QCQaS8ysbZtn2mz5su whX8cCIsiOGXwcV1YOdtoBO/z9octkd17qJez/yXpyZgNmJqgfQy7qj60YqjBmNJI0gCn8 D2qlgGopEvwG3QS0/tpSsVLT/hjcQcfn+WFH8GXTvi8DC6bIcY7lyYhUoybRbiLNTrSU9y 0TXW0f3UoOSPiQ3eJai/uBJwtmrOJFKWPZgcQ58Jjc4n36A9z+hN3C4L1gj50H7FL45/77 8mJUyNnu8RjyA+xBB0Gj/t4Hki1PAosHTHARJXjl3zSeGmu+yLONIp0xOPGY6g== 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=1742768256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E+B2Vjv0p/kmif1z6yruJdgSRRUG5ZpGRZXRwWzcJJ0=; b=KUpmOQ1WKvoPTLkFar6AmHnxUAeKqD78Ed3oRUhA1rKddYNXGAdDpk/hhkx+oZWIrkDUrv flOeU7T6yfwXvqXAzI0gBejSUM9KzTcPgTceQM7C4S0345q/eo5RZ2FrD6q+glpefsNw3b a6yiekY2CIw9aVN12J+y8VVtYmjFDCOv1GwsZ2KK72AJujCHBZqaIYOLDlN/C5tCG+VSW/ aGSgC0tZn0fjtlKfvjTcaeKFBWsBw6r6V2x4ihViNKX9qyHH3/P7N0uDeo9ZdvEjCMJJKt xDxypPe8PnSCmQBeRe7cn0IMmY/1iGdkROTl5dtdoJUdoA+4lGy1uKTGNlJvHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZLVt82hRPzBQL; Sun, 23 Mar 2025 22:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52NMHa01003332; Sun, 23 Mar 2025 22:17:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52NMHaYA003329; Sun, 23 Mar 2025 22:17:36 GMT (envelope-from git) Date: Sun, 23 Mar 2025 22:17:36 GMT Message-Id: <202503232217.52NMHaYA003329@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: b885643b63e4 - main - boot: Always use ELF Tool Chain elfcopy for EFI builds List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=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: b885643b63e4df51cc6c74c4ddd4d0b640075678 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b885643b63e4df51cc6c74c4ddd4d0b640075678 commit b885643b63e4df51cc6c74c4ddd4d0b640075678 Author: Ed Maste AuthorDate: 2025-03-14 16:42:15 +0000 Commit: Ed Maste CommitDate: 2025-03-23 22:17:03 +0000 boot: Always use ELF Tool Chain elfcopy for EFI builds We now use llvm-objcopy by default (as of commit 1cae7121c667), but it does not support efi-app-x86_64 and similar ouptut formats (for more detail see LLVM issue 108609[1]). Go back to installing ELF Tool Chain's version of objcopy as elfcopy (the standard upstream name) and use it for EFI builds. [1] https://github.com/llvm/llvm-project/issues/108609). PR: 280771 Reviewed by: andrew Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49362 --- ObsoleteFiles.inc | 3 --- stand/efi/Makefile.inc | 1 + stand/efi/boot1/Makefile | 2 +- stand/efi/loader/Makefile | 2 +- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ usr.bin/Makefile | 3 ++- usr.bin/objcopy/Makefile | 14 +++++++++++--- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index f56ad74294f9..850133db608a 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -13587,9 +13587,6 @@ OLD_FILES+=usr/share/man/man1/rlog.1.gz OLD_FILES+=usr/share/man/man5/rcsfile.5.gz # 20161010: remove link to removed m_getclr(9) macro OLD_FILES+=usr/share/man/man9/m_getclr.9.gz -# 20161003: MK_ELFCOPY_AS_OBJCOPY option retired -OLD_FILES+=usr/bin/elfcopy -OLD_FILES+=usr/share/man/man1/elfcopy.1.gz # 20160906: libkqueue tests moved to /usr/tests/sys/kqueue/libkqueue OLD_FILES+=usr/tests/sys/kqueue/kqtest OLD_FILES+=usr/tests/sys/kqueue/kqueue_test diff --git a/stand/efi/Makefile.inc b/stand/efi/Makefile.inc index b5bd341d1b78..f91ac9102ca8 100644 --- a/stand/efi/Makefile.inc +++ b/stand/efi/Makefile.inc @@ -26,6 +26,7 @@ EFI_TARGET= efi-app-x86_64 .else EFI_TARGET= binary .endif +EFI_OBJCOPY?= elfcopy # Arbitrarily set the PE/COFF header timestamps to 1 Jan 2024 00:00:00 # for build reproducibility. diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index 8641ecf457ab..e2966e813504 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -96,7 +96,7 @@ ${BOOT1}.efi: ${PROG} exit 1; \ fi SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ - ${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ + ${EFI_OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ -j .dynamic -j .dynsym -j .rel.dyn \ -j .rela.dyn -j .reloc -j .eh_frame \ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index e9d29e5a219e..2dae035f04a8 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -128,7 +128,7 @@ ${LOADER}.efi: ${PROG} exit 1; \ fi SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ - ${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ + ${EFI_OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ -j .dynamic -j .dynsym -j .rel.dyn \ -j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \ -j set_X${LOADER_INTERP}_compile_set \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 864057692566..b25f551d069b 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8125,6 +8125,7 @@ OLD_FILES+=usr/bin/cc OLD_FILES+=usr/bin/c88 OLD_FILES+=usr/bin/c++ OLD_FILES+=usr/bin/c++filt +OLD_FILES+=usr/bin/elfcopy OLD_FILES+=usr/bin/ld OLD_FILES+=usr/bin/ld.bfd OLD_FILES+=usr/bin/nm @@ -8135,6 +8136,7 @@ OLD_FILES+=usr/bin/strip OLD_FILES+=usr/bin/yacc OLD_FILES+=usr/share/man/man1/addr2line.1.gz OLD_FILES+=usr/share/man/man1/c++filt.1.gz +OLD_FILES+=usr/share/man/man1/elfcopy.1.gz OLD_FILES+=usr/share/man/man1/nm.1.gz OLD_FILES+=usr/share/man/man1/readelf.1.gz OLD_FILES+=usr/share/man/man1/size.1.gz diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 15fcdeb479f7..b9e4d6c1153a 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -247,7 +247,6 @@ SUBDIR.${MK_TFTP}+= tftp SUBDIR.${MK_TOOLCHAIN}+= addr2line SUBDIR.${MK_TOOLCHAIN}+= ar SUBDIR.${MK_TOOLCHAIN}+= nm -SUBDIR.${MK_TOOLCHAIN}+= objcopy SUBDIR.${MK_TOOLCHAIN}+= readelf SUBDIR.${MK_TOOLCHAIN}+= size .endif @@ -270,6 +269,8 @@ SUBDIR.${MK_TOOLCHAIN}+= indent SUBDIR.${MK_TOOLCHAIN}+= lex SUBDIR.${MK_TOOLCHAIN}+= lorder SUBDIR.${MK_TOOLCHAIN}+= mkstr +# ELF Tool Chain elfcopy required for EFI objects (PR280771) +SUBDIR.${MK_TOOLCHAIN}+= objcopy SUBDIR.${MK_TOOLCHAIN}+= rpcgen SUBDIR.${MK_TOOLCHAIN}+= unifdef SUBDIR.${MK_TOOLCHAIN}+= xstr diff --git a/usr.bin/objcopy/Makefile b/usr.bin/objcopy/Makefile index 101c84cc5206..2f3386d95ebe 100644 --- a/usr.bin/objcopy/Makefile +++ b/usr.bin/objcopy/Makefile @@ -7,12 +7,22 @@ ELFCOPYDIR= ${ELFTCDIR}/elfcopy .PATH: ${ELFCOPYDIR} -PROG= objcopy +PROG= elfcopy +MAN= elfcopy.1 + +.if ${MK_LLVM_BINUTILS} == "no" + +LINKS+= ${BINDIR}/${PROG} ${BINDIR}/objcopy +LINKS+= ${BINDIR}/${PROG} ${BINDIR}/strip +MAN+= objcopy.1 strip.1 + objcopy.1: elfcopy.1 sed -e 's/\.Dt ELFCOPY 1/.Dt OBJCOPY 1/' \ -e '/\.Nm elfcopy ,/d' < ${.ALLSRC} > ${.TARGET} CLEANFILES+= objcopy.1 +.endif + SRCS= archive.c ascii.c binary.c main.c pe.c sections.c segments.c symbols.c WARNS?= 5 @@ -22,9 +32,7 @@ LIBADD= archive elftc elf pe CFLAGS+=-I${ELFTCDIR}/libelftc -I${ELFTCDIR}/libpe -I${ELFTCDIR}/common CFLAGS+=-DWITH_PE=1 -MAN= ${PROG}.1 strip.1 -LINKS= ${BINDIR}/${PROG} ${BINDIR}/strip # This same hack is in lib/libelf/Makefile and usr.bin/readelf/Makefile # We need to link against the correct version of these files. One