From nobody Mon Dec 23 10:06:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YGtwW1NzFz5gXlB; Mon, 23 Dec 2024 10:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YGtwW0q0fz4F4C; Mon, 23 Dec 2024 10:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734948411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V2NAoj5EZCHg0x9tzo7mWFOI1pWSKMBQ7mMicBO/ZXc=; b=kEOJ9tsNa0BxVpCL2grj5dmRI19mkHlotPYy7Ty1Af+C53FwT+WOFwr0nLr4dcjSYkec7B +2MFe9xn1VAP8nsSMX6+LM5AlxhagkHiwU221516nJ9YRzK7sJfaOsrZLew6FuXjbxfe6k KRCPbezMPH3F+6REcBhP/KVyxDEjKCusiwQ32t3A0jilmE5FckqTEwHLWFsgXIfXMM+ymI X9qTWOFUWFfQlegOOII5smy3VPGzOjE4sq98f8XwR+ld6ciLgmidLqcteU/zR2jaxuOPDp eVldKvDdFVS/reQctneAKyXBsB7BtQUjU4ZFSOGbSVIeIbTqG1BeJu1d9yZcMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734948411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V2NAoj5EZCHg0x9tzo7mWFOI1pWSKMBQ7mMicBO/ZXc=; b=qiEBZHk9WGY9NJUpWM85LKb19zftL8J7CmC8fppDxzReqZOF2D39TS9KqDbPeSB031Frmr pXy8dCYkG/0LMA985OHW4uhJrG/ETq7RfG3hUCUH+UJaoav7RMrxBK1BKTcYF/rdYEGkTf fFV0EPUEcvYiMkyOUQPHciRE5DIAHufA6iLrAoovYxgZHrvhUKiTYxwmshMWZkfw9zn3OW JKLhiQxRt5Lu/Xry9iOHb8j37ZMJuK5DCUk3uViNgqJXiy3Jc1kaUTj1/HyeEA6LdApwWQ MBrtIHxCRioERyYwlaK2UTqZf4bgKshSottOIrv7L8XFnjV/RRN8Y5UMJuunBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734948411; a=rsa-sha256; cv=none; b=fuWnr7/i23B6NFtXW67UxV60dZMuKvgoE61y5pdItJ4BJFYO63koMvIjqqvuJzxGFQ8Wqq XwtY/G0cGAUudL66qUdPXdkq0zHc7ZN2lCnf84PPIPazpRHxh9uTeM6FQX/l/gd9ydU3us 92ujWWhswZ10yW02oA3eVhwnlRCa7P0nWzCeKfLRuTUhMzG9hSuLXefALTkLgenFCKLY0Q d0RdOzwKCpfhRd9jktFlM4227kZwBIoPdMpPjdwHWfJ19MjuS0u5CeRw0WL1O5F22c/XQ8 N41iXgTk+eGLoC+NLVMXESXdjs6RkZB5pelzlkxY0Ilpp9BS1dEPJBH6Jinejg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YGtwW02Gjzpqk; Mon, 23 Dec 2024 10:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNA6o5n074066; Mon, 23 Dec 2024 10:06:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNA6o0r074063; Mon, 23 Dec 2024 10:06:50 GMT (envelope-from git) Date: Mon, 23 Dec 2024 10:06:50 GMT Message-Id: <202412231006.4BNA6o0r074063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 6e8233df18c8 - main - hwpmc_x86: Fix NULL deref when loading on unsupported hardware List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e8233df18c8008e1a244c8528521a0369f61369 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=6e8233df18c8008e1a244c8528521a0369f61369 commit 6e8233df18c8008e1a244c8528521a0369f61369 Author: Bojan Novković AuthorDate: 2024-12-21 10:55:57 +0000 Commit: Bojan Novković CommitDate: 2024-12-23 10:00:57 +0000 hwpmc_x86: Fix NULL deref when loading on unsupported hardware The pmc_md_{intialize, finalize} routines rely on a machine-dependent structure to register the appropriate PMC interrupt handler. However, the vendor-specific routines that allocate this structure may return NULL for unsupported hardware, leading to a panic when the hwpmc module gets loaded. This patch adds additional checks that fix this issue. Reported by: Michael Butler (imb@protected-networks.net) Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D48168 --- sys/dev/hwpmc/hwpmc_x86.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c index 2c6c4cd148bf..2903c25ef5c9 100644 --- a/sys/dev/hwpmc/hwpmc_x86.c +++ b/sys/dev/hwpmc/hwpmc_x86.c @@ -230,7 +230,7 @@ struct pmc_mdep * pmc_md_initialize(void) { int i; - struct pmc_mdep *md; + struct pmc_mdep *md = NULL; /* determine the CPU kind */ if (cpu_vendor_id == CPU_VENDOR_AMD || @@ -238,17 +238,18 @@ pmc_md_initialize(void) md = pmc_amd_initialize(); else if (cpu_vendor_id == CPU_VENDOR_INTEL) md = pmc_intel_initialize(); - else + + if (md == NULL) return (NULL); + nmi_register_handler(md->pmd_intr); /* disallow sampling if we do not have an LAPIC */ - if (md != NULL && !lapic_enable_pcint()) + if (!lapic_enable_pcint()) for (i = 0; i < md->pmd_nclass; i++) { if (i == PMC_CLASS_INDEX_SOFT) continue; md->pmd_classdep[i].pcd_caps &= ~PMC_CAP_INTERRUPT; } - nmi_register_handler(md->pmd_intr); return (md); } @@ -256,9 +257,10 @@ pmc_md_initialize(void) void pmc_md_finalize(struct pmc_mdep *md) { - - lapic_disable_pcint(); - nmi_remove_handler(md->pmd_intr); + if (md != NULL) { + lapic_disable_pcint(); + nmi_remove_handler(md->pmd_intr); + } if (cpu_vendor_id == CPU_VENDOR_AMD || cpu_vendor_id == CPU_VENDOR_HYGON) pmc_amd_finalize(md); From nobody Mon Dec 23 14:34:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH0sJ3VHJz5h8mY; Mon, 23 Dec 2024 14:34: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 4YH0sJ1St7z4c9c; Mon, 23 Dec 2024 14:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734964468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hYm1fJM8sJIzGnkr0OtjgK/D7k2eB/e7tOVCXYfrW00=; b=m1DE6K+pL0e2cELeEWbFCpg6lYUR5YZc+pbOQ5NogEgYN8K7+yqtMLqLh8i4HbK7qlBXKf 7ooB2YVted8LyuJ2GkM5ys6Zzw0DIsgUK/IYuEtM4S9DWR1rQIKkKRXABRf+goqbEEhfec ARgyVnGULpwk+OVNFtqszrlnEjlVIzLmbh881myFW1J9PJvPd4pbevQPvUmBAlLqvkBGjP q4Yya+TB7olmLoSm7Z5yIhSXcRBJyKkp8VXqBpfQIp6iRbDAES1ChCyacTTfGxmtAQVWan KLmtcm5FdXjFdOxOKS8roMx/keHqojRiDQ6J0uceTXNk7ft5qU6imaZ4cpW6Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734964468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hYm1fJM8sJIzGnkr0OtjgK/D7k2eB/e7tOVCXYfrW00=; b=MHs4g6XK9HddCqqLFBbmXAayz5uBqxh6IZsDR4eWXmU1z9p0CNKpOSZdIF+wqzz3MXWJCS 9XHd8L4xbKQJA7aoMdDnz28QhTQtRHWZoSp9RseuF6vr9PBV0kgp1haT6klSrSRG/GWmud 8ypi9WqMenRUI8UDENA+3KnNtUKjg+TMpmNZihpuh1Owh8KTXBh79BqhN5Kgit33vQsW72 vYRb0kKqe9/1LU8So9dCK3DyYhdDqtEvSx76uPXcFyn+46IkGL8j6OTb79hIx8bkOnTgKR 2sFIk/M8AJKVH4qA2pcM4jdrQ2YgJo80Wc+VuUuwJVpCDO3fxhWMQIn9+ck1cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734964468; a=rsa-sha256; cv=none; b=tvHoWzO0ZKsqKVgtkSFJJv5hWrD2I6oWgmtUcmDgeKZjRBais9fjxxrwqyPKVxE3qIR9c+ vruNiRWKYzQj8GtaD2MFev7WDfNNGHFPQU1bPC9977Jrw8tov2X92HYHKkggjnsduwkfFc JKRYOXIzvnmnqBVqmtXsNPMYedRj/3IJ2Jq7gIwyQTKcVfR9t+SHychbgeKg84zZLEpvF0 D6C0vkO09pQCvS6Apm7VbgxHeaz6fVjWb9834xMtbcDkY4C8FKXaPM+Tpp+/iVqBbtxsos DjpIREHHqkd8+/efpyZ//bagn324ZLCACxCxiKRsp+gAR29JRt1/pJzSSGrY5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH0sJ14Llzwr1; Mon, 23 Dec 2024 14:34: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 4BNEYSB9077962; Mon, 23 Dec 2024 14:34:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNEYS6u077959; Mon, 23 Dec 2024 14:34:28 GMT (envelope-from git) Date: Mon, 23 Dec 2024 14:34:28 GMT Message-Id: <202412231434.4BNEYS6u077959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 1fd197d19221 - stable/14 - isp: Improve task aborts handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1fd197d19221341e29a59351d0cb537d295eb047 Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=1fd197d19221341e29a59351d0cb537d295eb047 commit 1fd197d19221341e29a59351d0cb537d295eb047 Author: Alexander Motin AuthorDate: 2024-12-09 16:52:26 +0000 Commit: Alexander Motin CommitDate: 2024-12-23 14:34:21 +0000 isp: Improve task aborts handling - When handling notify acknowledge from target code for task abort request, not only send abort to the firmware, but also delete the ATIO private data associated with the command. It is required for proper tag reuse, allowing new "conflicting" commands to be passed to the target. CTL was already fixed to handle that right, instead of delaying them in restart queue of the driver. - When target finally aborts the command (which it should have done before the notify ack) we should not send another abort to the firmware. Since we already sent the abort and deleted ATIO private data above, just return successful completion here, doing nothing. Since the tag can be reused by that time, we can not rely on its uniqueness, so when searching to the ATIO private data compare also the aborted CCB pointer in addition to the tag. - Fix BA_RJT sending in isp_acknak_abts(). While it should be rare, teach the code to send error responses for ABTS requests. MFC after: 2 weeks (cherry picked from commit ec3175fc3b2c1b07144a85e6a3e2fe534acc0c87) --- sys/dev/isp/isp_freebsd.c | 142 +++++++++++++++++++++------------------------- sys/dev/isp/isp_freebsd.h | 9 ++- sys/dev/isp/isp_target.c | 11 ++-- 3 files changed, 77 insertions(+), 85 deletions(-) diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index 51c1e3abb6de..d5aa7a54142e 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -626,8 +626,9 @@ isp_free_pcmd(ispsoftc_t *isp, union ccb *ccb) */ #ifdef ISP_TARGET_MODE static ISP_INLINE tstate_t *get_lun_statep(ispsoftc_t *, int, lun_id_t); -static atio_private_data_t *isp_get_atpd(ispsoftc_t *, int, uint32_t); +static atio_private_data_t *isp_get_atpd(ispsoftc_t *, int, uint32_t, void *); static atio_private_data_t *isp_find_atpd(ispsoftc_t *, int, uint32_t); +static atio_private_data_t *isp_find_atpd_ccb(ispsoftc_t *, int, uint32_t, void *); static void isp_put_atpd(ispsoftc_t *, int, atio_private_data_t *); static inot_private_data_t *isp_get_ntpd(ispsoftc_t *, int); static inot_private_data_t *isp_find_ntpd(ispsoftc_t *, int, uint32_t, uint32_t); @@ -715,7 +716,7 @@ isp_tmcmd_restart(ispsoftc_t *isp) } static atio_private_data_t * -isp_get_atpd(ispsoftc_t *isp, int chan, uint32_t tag) +isp_get_atpd(ispsoftc_t *isp, int chan, uint32_t tag, void *ccb) { struct isp_fc *fc = ISP_FC_PC(isp, chan); atio_private_data_t *atp; @@ -723,6 +724,7 @@ isp_get_atpd(ispsoftc_t *isp, int chan, uint32_t tag) atp = LIST_FIRST(&fc->atfree); if (atp) { LIST_REMOVE(atp, next); + atp->ccb = ccb; atp->tag = tag; LIST_INSERT_HEAD(&fc->atused[ATPDPHASH(tag)], atp, next); } @@ -742,6 +744,23 @@ isp_find_atpd(ispsoftc_t *isp, int chan, uint32_t tag) return (NULL); } +/* + * Similar to above, but in addition to tag searches for opaque CCB pointer, + * It can be used in situations when the tag alone may already be reused. + */ +static atio_private_data_t * +isp_find_atpd_ccb(ispsoftc_t *isp, int chan, uint32_t tag, void *ccb) +{ + struct isp_fc *fc = ISP_FC_PC(isp, chan); + atio_private_data_t *atp; + + LIST_FOREACH(atp, &fc->atused[ATPDPHASH(tag)], next) { + if (atp->tag == tag && atp->ccb == ccb) + return (atp); + } + return (NULL); +} + static void isp_put_atpd(ispsoftc_t *isp, int chan, atio_private_data_t *atp) { @@ -967,16 +986,6 @@ isp_target_start_ctio(ispsoftc_t *isp, union ccb *ccb, enum Start_Ctio_How how) continue; } - /* - * Is this command a dead duck? - */ - if (atp->dead) { - isp_prt(isp, ISP_LOGERR, "%s: [0x%x] not sending a CTIO for a dead command", __func__, cso->tag_id); - ccb->ccb_h.status = CAM_REQ_ABORTED; - xpt_done(ccb); - continue; - } - /* * Check to make sure we're still in target mode. */ @@ -1378,7 +1387,7 @@ isp_handle_platform_atio7(ispsoftc_t *isp, at7_entry_t *aep) */ goto noresrc; } - atp = isp_get_atpd(isp, chan, aep->at_rxid); + atp = isp_get_atpd(isp, chan, aep->at_rxid, atiop); if (atp == NULL) { isp_prt(isp, ISP_LOGTDEBUG0, "[0x%x] out of atps", aep->at_rxid); isp_endcmd(isp, aep, nphdl, chan, SCSI_BUSY, 0); @@ -1733,32 +1742,8 @@ isp_handle_platform_target_notify_ack(ispsoftc_t *isp, isp_notify_t *mp, uint32_ /* * This case is for a responding to an ABTS frame */ - if (mp->nt_lreserved && ((isphdr_t *)mp->nt_lreserved)->rqs_entry_type == RQSTYPE_ABTS_RCVD) { - - /* - * Overload nt_need_ack here to mark whether we've terminated the associated command. - */ - if (mp->nt_need_ack) { - abts_t *abts = (abts_t *)mp->nt_lreserved; - - ISP_MEMZERO(cto, sizeof (ct7_entry_t)); - isp_prt(isp, ISP_LOGTDEBUG0, "%s: [%x] terminating after ABTS received", __func__, abts->abts_rxid_task); - cto->ct_header.rqs_entry_type = RQSTYPE_CTIO7; - cto->ct_header.rqs_entry_count = 1; - cto->ct_nphdl = mp->nt_nphdl; - cto->ct_rxid = abts->abts_rxid_task; - cto->ct_iid_lo = mp->nt_sid; - cto->ct_iid_hi = mp->nt_sid >> 16; - cto->ct_oxid = abts->abts_ox_id; - cto->ct_vpidx = mp->nt_channel; - cto->ct_flags = CT7_NOACK|CT7_TERMINATE; - if (isp_send_entry(isp, cto)) { - return (ENOMEM); - } - mp->nt_need_ack = 0; - } - return (isp_acknak_abts(isp, mp->nt_lreserved, 0)); - } + if (mp->nt_lreserved && ((isphdr_t *)mp->nt_lreserved)->rqs_entry_type == RQSTYPE_ABTS_RCVD) + return (isp_acknak_abts(isp, mp->nt_lreserved, (rsp == 0) ? 0 : EINVAL)); /* * General purpose acknowledgement @@ -1890,17 +1875,15 @@ bad: } } +/* + * Clean aborted commands pending restart + */ static void isp_target_mark_aborted_early(ispsoftc_t *isp, int chan, tstate_t *tptr, uint32_t tag_id) { - struct isp_fc *fc = ISP_FC_PC(isp, chan); - atio_private_data_t *atp; inot_private_data_t *ntp, *tmp; uint32_t this_tag_id; - /* - * First, clean any commands pending restart - */ STAILQ_FOREACH_SAFE(ntp, &tptr->restart_queue, next, tmp) { this_tag_id = ((at7_entry_t *)ntp->data)->at_rxid; if ((uint64_t)tag_id == TAG_ANY || tag_id == this_tag_id) { @@ -1911,16 +1894,6 @@ isp_target_mark_aborted_early(ispsoftc_t *isp, int chan, tstate_t *tptr, uint32_ isp_put_ntpd(isp, chan, ntp); } } - - /* - * Now mark other ones dead as well. - */ - for (atp = fc->atpool; atp < &fc->atpool[ATPDPSIZE]; atp++) { - if (atp->lun != tptr->ts_lun) - continue; - if ((uint64_t)tag_id == TAG_ANY || atp->tag == tag_id) - atp->dead = 1; - } } #endif @@ -2283,6 +2256,25 @@ isp_kthread(void *arg) } #ifdef ISP_TARGET_MODE +static int +isp_abort_atpd(ispsoftc_t *isp, int chan, atio_private_data_t *atp) +{ + uint8_t storage[QENTRY_LEN]; + ct7_entry_t *cto = (ct7_entry_t *) storage; + + ISP_MEMZERO(cto, sizeof (ct7_entry_t)); + cto->ct_header.rqs_entry_type = RQSTYPE_CTIO7; + cto->ct_header.rqs_entry_count = 1; + cto->ct_nphdl = atp->nphdl; + cto->ct_vpidx = chan; + cto->ct_iid_lo = atp->sid; + cto->ct_iid_hi = atp->sid >> 16; + cto->ct_rxid = atp->tag; + cto->ct_flags = CT7_NOACK|CT7_TERMINATE; + cto->ct_oxid = atp->oxid; + return (isp_send_entry(isp, cto)); +} + static void isp_abort_atio(ispsoftc_t *isp, union ccb *ccb) { @@ -2308,30 +2300,16 @@ isp_abort_atio(ispsoftc_t *isp, union ccb *ccb) } /* Search for the ATIO among running. */ - atp = isp_find_atpd(isp, XS_CHANNEL(accb), accb->atio.tag_id); + atp = isp_find_atpd_ccb(isp, XS_CHANNEL(accb), accb->atio.tag_id, accb); if (atp != NULL) { - /* Send TERMINATE to firmware. */ - if (!atp->dead) { - uint8_t storage[QENTRY_LEN]; - ct7_entry_t *cto = (ct7_entry_t *) storage; - - ISP_MEMZERO(cto, sizeof (ct7_entry_t)); - cto->ct_header.rqs_entry_type = RQSTYPE_CTIO7; - cto->ct_header.rqs_entry_count = 1; - cto->ct_nphdl = atp->nphdl; - cto->ct_rxid = atp->tag; - cto->ct_iid_lo = atp->sid; - cto->ct_iid_hi = atp->sid >> 16; - cto->ct_oxid = atp->oxid; - cto->ct_vpidx = XS_CHANNEL(accb); - cto->ct_flags = CT7_NOACK|CT7_TERMINATE; - isp_send_entry(isp, cto); + if (isp_abort_atpd(isp, XS_CHANNEL(accb), atp)) { + ccb->ccb_h.status = CAM_UA_ABORT; + return; } isp_put_atpd(isp, XS_CHANNEL(accb), atp); - ccb->ccb_h.status = CAM_REQ_CMP; - } else { - ccb->ccb_h.status = CAM_UA_ABORT; } + + ccb->ccb_h.status = CAM_REQ_CMP; } static void @@ -2504,6 +2482,7 @@ isp_action(struct cam_sim *sim, union ccb *ccb) } case XPT_NOTIFY_ACKNOWLEDGE: /* notify ack */ { + atio_private_data_t *atp; inot_private_data_t *ntp; /* @@ -2522,8 +2501,19 @@ isp_action(struct cam_sim *sim, union ccb *ccb) xpt_done(ccb); break; } - if (isp_handle_platform_target_notify_ack(isp, &ntp->nt, - (ccb->ccb_h.flags & CAM_SEND_STATUS) ? ccb->cna2.arg : 0)) { + + /* + * Target should abort all affected CCBs before ACK-ing INOT, + * but if/since it doesn't, add this hack to allow tag reuse. + */ + uint32_t rsp = (ccb->ccb_h.flags & CAM_SEND_STATUS) ? ccb->cna2.arg : 0; + if (ntp->nt.nt_ncode == NT_ABORT_TASK && (rsp & 0xff) == 0 && + (atp = isp_find_atpd(isp, XS_CHANNEL(ccb), ccb->cna2.seq_id)) != NULL) { + if (isp_abort_atpd(isp, XS_CHANNEL(ccb), atp) == 0) + isp_put_atpd(isp, XS_CHANNEL(ccb), atp); + } + + if (isp_handle_platform_target_notify_ack(isp, &ntp->nt, rsp)) { cam_freeze_devq(ccb->ccb_h.path); cam_release_devq(ccb->ccb_h.path, RELSIM_RELEASE_AFTER_TIMEOUT, 0, 10, 0); ccb->ccb_h.status &= ~CAM_STATUS_MASK; diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index bd5bba92c0a9..5bb3dd43b6de 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -89,10 +89,11 @@ void isp_put_ecmd(struct ispsoftc *, isp_ecmd_t *); #include typedef struct atio_private_data { LIST_ENTRY(atio_private_data) next; + void * ccb; + uint32_t tag; /* typically f/w RX_ID */ uint32_t orig_datalen; uint32_t bytes_xfered; uint32_t bytes_in_transit; - uint32_t tag; /* typically f/w RX_ID */ lun_id_t lun; uint32_t nphdl; uint32_t sid; @@ -102,11 +103,9 @@ typedef struct atio_private_data { uint16_t word3; /* PRLI word3 params */ uint16_t ctcnt; /* number of CTIOs currently active */ uint8_t seqno; /* CTIO sequence number */ - uint32_t - srr_notify_rcvd : 1, - cdb0 : 8, + uint8_t cdb0; + uint8_t srr_notify_rcvd : 1, sendst : 1, - dead : 1, tattr : 3, state : 3; void * ests; diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c index 081524aff53c..9d8f8e2a3766 100644 --- a/sys/dev/isp/isp_target.c +++ b/sys/dev/isp/isp_target.c @@ -481,10 +481,14 @@ isp_acknak_abts(ispsoftc_t *isp, void *arg, int errno) ISP_MEMCPY(rsp, abts, QENTRY_LEN); rsp->abts_rsp_header.rqs_entry_type = RQSTYPE_ABTS_RSP; + isp_prt(isp, ISP_LOGTINFO, "[0x%x] ABTS of 0x%x being %s'd", + rsp->abts_rsp_rxid_abts, rsp->abts_rsp_rxid_task, + (errno == 0) ? "BA_ACC" : "BA_RJT"); + rsp->abts_rsp_r_ctl = (errno == 0) ? BA_ACC : BA_RJT; + /* * Swap destination and source for response. */ - rsp->abts_rsp_r_ctl = BA_ACC; tmpw = rsp->abts_rsp_did_lo; tmpb = rsp->abts_rsp_did_hi; rsp->abts_rsp_did_lo = rsp->abts_rsp_sid_lo; @@ -505,15 +509,14 @@ isp_acknak_abts(ispsoftc_t *isp, void *arg, int errno) rx_id = rsp->abts_rsp_rx_id; ox_id = rsp->abts_rsp_ox_id; ISP_MEMZERO(&rsp->abts_rsp_payload.ba_acc, sizeof (rsp->abts_rsp_payload.ba_acc)); - isp_prt(isp, ISP_LOGTINFO, "[0x%x] ABTS of 0x%x being BA_ACC'd", rsp->abts_rsp_rxid_abts, rsp->abts_rsp_rxid_task); rsp->abts_rsp_payload.ba_acc.aborted_rx_id = rx_id; rsp->abts_rsp_payload.ba_acc.aborted_ox_id = ox_id; rsp->abts_rsp_payload.ba_acc.high_seq_cnt = 0xffff; } else { - ISP_MEMZERO(&rsp->abts_rsp_payload.ba_rjt, sizeof (rsp->abts_rsp_payload.ba_acc)); + ISP_MEMZERO(&rsp->abts_rsp_payload.ba_rjt, sizeof (rsp->abts_rsp_payload.ba_rjt)); switch (errno) { case ENOMEM: - rsp->abts_rsp_payload.ba_rjt.reason = 5; /* Logical Unit Busy */ + rsp->abts_rsp_payload.ba_rjt.reason = 5; /* Logical busy */ break; default: rsp->abts_rsp_payload.ba_rjt.reason = 9; /* Unable to perform command request */ From nobody Mon Dec 23 14:34:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH0st0t44z5h8p6; Mon, 23 Dec 2024 14:34: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 4YH0st0LRBz4cWV; Mon, 23 Dec 2024 14:34:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734964498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FnIjHBS1atx5f+OLX0Qs5bh8N8p1CxIappdczzdvYQg=; b=nR8lklRjgna4VS70CJcJVsKg1ROxeJ71Im9IIw1kBzgJPuekalng0Fj/IGhi6qeOgzde/v LtgfDLbUi4iCnifG8L1iueKL4MjjbTHXpGKHUTiEL7gXUCipaqf/evFxAzP1A8Q1jGdqUt aKjAIgG12WezECoqJoFvkfoqr4wA11Nbn2YGZbg1QhYPjX+1XUtQLmiUnSN756fakPgpZc WMoPHz4q2UsYrtZ4QCMgj5SdV2voQEQt6OQecbjn6qzZWirHFp84JVLqUHsqaIixdidXEy lUvYNq/+BzLh+EUrra8EmF0GGcT16h6EFxLOAYWPWqSJZzoDcIatIHzL1FrLTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734964498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FnIjHBS1atx5f+OLX0Qs5bh8N8p1CxIappdczzdvYQg=; b=tnVB6wBLJJfE9xEd3r7aE3ma5GBMbncX1A8wAxBqg9kAEYpJPG58BIQ6zmAz43Hh/jIycI T9EjQtKFW8xTn8jDSJqpYvCTNZCtaopnSm2ZaYBxR/IZqXdtqxS0xD2fsDzG6x4LU3hP0J Dnr0VP4H07N9+0JooN1xcbIsDYFWCjIuzzetjKIn6SQUYz4fwfPlXVKfmw4n/ACVf94teZ PMpZ3HyKfce/2soNXuOJqiI9mKrfmY48/B8ZJGIMaWfOVxHPqqIVrXrvPwZOX3kL4Rv9Fb xmNNFW+0APl3Sl92aLySU9SPKC+4nY70zxYZ8it3j4NluW9KOUe2wi9VaiBQMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734964498; a=rsa-sha256; cv=none; b=S1WGZgfslpy8+e3vmZ6ZAo8edQvdwr44W4mymfeemgPZ8iWeHPEvq6x4NHz3hEoPqCR6qE TWXnfxSgCN1E+f8e3X+486mKM78ZrPiwo96QmAJq0unZ7tC4eLsGtczQHlDsdVP8imCAjI p7i/Cl2EQJKysmQT8FvgvuXjxiztvTIg3/cN0ZY8IwZ6pJ86s6d73wujOScW9inMkRq+yo pg15GNAnj0VwTaVMtFA5jzWf/+MNriBJeCwP4BlQgx/CDO0l5WnotIYW9KrCMc+doEgOGX 1MhZfraset9vYTYDQIgwM+VmpShiE8onzdaGC6JUaHbUdjRvfK9fn192SXy2vQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH0ss6s06zxkW; Mon, 23 Dec 2024 14:34: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 4BNEYv6Z078262; Mon, 23 Dec 2024 14:34:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNEYvjL078259; Mon, 23 Dec 2024 14:34:57 GMT (envelope-from git) Date: Mon, 23 Dec 2024 14:34:57 GMT Message-Id: <202412231434.4BNEYvjL078259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 36abbfe061df - stable/13 - isp: Fix use after free in aborts handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 36abbfe061dfa56723f2eb3d6942d0407dfcd3a1 Auto-Submitted: auto-generated The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=36abbfe061dfa56723f2eb3d6942d0407dfcd3a1 commit 36abbfe061dfa56723f2eb3d6942d0407dfcd3a1 Author: Alexander Motin AuthorDate: 2024-12-09 16:47:03 +0000 Commit: Alexander Motin CommitDate: 2024-12-23 14:34:50 +0000 isp: Fix use after free in aborts handling When aborting command waiting in restart queue remove it from the queue before freeing it. This should fix NULL dereference panics we saw on some very busy system. MFC after: 2 weeks (cherry picked from commit 40fb1b8bc1cf452d83edc5b25bc1d8bd13c0e72d) --- sys/dev/isp/isp_freebsd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index fdf4c0eb4e1f..51c1e3abb6de 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -1904,11 +1904,11 @@ isp_target_mark_aborted_early(ispsoftc_t *isp, int chan, tstate_t *tptr, uint32_ STAILQ_FOREACH_SAFE(ntp, &tptr->restart_queue, next, tmp) { this_tag_id = ((at7_entry_t *)ntp->data)->at_rxid; if ((uint64_t)tag_id == TAG_ANY || tag_id == this_tag_id) { + STAILQ_REMOVE(&tptr->restart_queue, ntp, + inot_private_data, next); isp_endcmd(isp, ntp->data, NIL_HANDLE, chan, ECMD_TERMINATE, 0); isp_put_ntpd(isp, chan, ntp); - STAILQ_REMOVE(&tptr->restart_queue, ntp, - inot_private_data, next); } } From nobody Mon Dec 23 14:34:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH0sv2Qtbz5h8WZ; Mon, 23 Dec 2024 14:34: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 4YH0sv1PFdz4cWW; Mon, 23 Dec 2024 14:34:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734964499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1WVvjyEx3o8fCjzudKmlRB3HPr9CtW+oSFNqVv/WQtY=; b=ZZG9AZFFfibkopW+OznsK/UW7XN3dMIJtJXa1Sn3RyMQn/XCoTjpC+V2lzi7Z5Z/TMYqPg 3UT/v504d4+FfOdmXNGYdQlZVXHinCun5hl0FTiBwAJA4p4O/8xsp9rbNWzZbHW2K59mQy IxgDAXaakgssoNUcHu7Ao6BfdQRzrWeZC/VXoUPyPGfPGt6tMPzZ/mI/zJznYn3giMH2JP /hHDxtdtEIsfK8N6mrY+xEIycErxkA7jLiSknspCzIjWcV1WsLXseFyEvCQSY9r1jZuADG 66RcZkW239rfRxcyn3wbuOrbBq7VR7FOj5PDPhJI6Av/b7F4wID6q6/k+CmECw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734964499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1WVvjyEx3o8fCjzudKmlRB3HPr9CtW+oSFNqVv/WQtY=; b=UtV8XwBQUBS7Ep2mZaT8pBfoBPbOIMFHg0XKivv9ctHTMk0tcnxBvV+GHvY8ugsrRKMKOK dJ7/IgblSNjewzBPzov9C35bzO3g7yjDX6u9vx+WhcDlt/JDsbx5pRuW5ftqIstH4/4FZ2 NlMQCeFvHNL7+JI06KBi4lE+F5dp0lJbGPvQadmQ4Ewz0CjQz5qvL/+arDOutLS4slLXaj eMlqBAkCVro4QHpRBwmw9Az1A+CuBi+msGSVR4a8WgYX0jItl2XtYeG+F8SNksmKeOoZ0T /1gdghBFHgTpXL9QsnfZt9wnBHh+C1nCccRpfufdEqsFqDR6woo99ylodVnenQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734964499; a=rsa-sha256; cv=none; b=Nz49hXJdfOiXdJs2OzRoD2qNxQY5zAjdcyEk9mmarKMnalHYNEoy4GhRqlvIH04qJZ0tBe rrz/7JPYrEL+FWcrEhWCHgW4OkXZZkATKsIK1M9aKRqCIQ5Y18ZDRNCfCkaSqwKd4VCdmw kfZDB8uK4fWCEUTzyjjgUGWi8hhTT/Y+7ac9eOQ7I9Dqle5O+HGBJd+FxMiZ3F1NYUwWnF SHKWcF5uR9GfW5KrOqJJHyWll/tGdSArplWnnlTCs1dht4OHBqfYBKSDdWzyff1GFJbIRT XD8JSOYFvPOGbP4lgrdstqFdoszKLktFLeqgCxAJtWWHh+9CeUDXnssCFy//MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH0sv0snPzxjh; Mon, 23 Dec 2024 14:34: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 4BNEYxDJ078304; Mon, 23 Dec 2024 14:34:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNEYxb4078301; Mon, 23 Dec 2024 14:34:59 GMT (envelope-from git) Date: Mon, 23 Dec 2024 14:34:59 GMT Message-Id: <202412231434.4BNEYxb4078301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: d353c342a12c - stable/13 - isp: Improve task aborts handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d353c342a12cd346c79c074660709657f7a741ef Auto-Submitted: auto-generated The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=d353c342a12cd346c79c074660709657f7a741ef commit d353c342a12cd346c79c074660709657f7a741ef Author: Alexander Motin AuthorDate: 2024-12-09 16:52:26 +0000 Commit: Alexander Motin CommitDate: 2024-12-23 14:34:50 +0000 isp: Improve task aborts handling - When handling notify acknowledge from target code for task abort request, not only send abort to the firmware, but also delete the ATIO private data associated with the command. It is required for proper tag reuse, allowing new "conflicting" commands to be passed to the target. CTL was already fixed to handle that right, instead of delaying them in restart queue of the driver. - When target finally aborts the command (which it should have done before the notify ack) we should not send another abort to the firmware. Since we already sent the abort and deleted ATIO private data above, just return successful completion here, doing nothing. Since the tag can be reused by that time, we can not rely on its uniqueness, so when searching to the ATIO private data compare also the aborted CCB pointer in addition to the tag. - Fix BA_RJT sending in isp_acknak_abts(). While it should be rare, teach the code to send error responses for ABTS requests. MFC after: 2 weeks (cherry picked from commit ec3175fc3b2c1b07144a85e6a3e2fe534acc0c87) --- sys/dev/isp/isp_freebsd.c | 142 +++++++++++++++++++++------------------------- sys/dev/isp/isp_freebsd.h | 9 ++- sys/dev/isp/isp_target.c | 11 ++-- 3 files changed, 77 insertions(+), 85 deletions(-) diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index 51c1e3abb6de..d5aa7a54142e 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -626,8 +626,9 @@ isp_free_pcmd(ispsoftc_t *isp, union ccb *ccb) */ #ifdef ISP_TARGET_MODE static ISP_INLINE tstate_t *get_lun_statep(ispsoftc_t *, int, lun_id_t); -static atio_private_data_t *isp_get_atpd(ispsoftc_t *, int, uint32_t); +static atio_private_data_t *isp_get_atpd(ispsoftc_t *, int, uint32_t, void *); static atio_private_data_t *isp_find_atpd(ispsoftc_t *, int, uint32_t); +static atio_private_data_t *isp_find_atpd_ccb(ispsoftc_t *, int, uint32_t, void *); static void isp_put_atpd(ispsoftc_t *, int, atio_private_data_t *); static inot_private_data_t *isp_get_ntpd(ispsoftc_t *, int); static inot_private_data_t *isp_find_ntpd(ispsoftc_t *, int, uint32_t, uint32_t); @@ -715,7 +716,7 @@ isp_tmcmd_restart(ispsoftc_t *isp) } static atio_private_data_t * -isp_get_atpd(ispsoftc_t *isp, int chan, uint32_t tag) +isp_get_atpd(ispsoftc_t *isp, int chan, uint32_t tag, void *ccb) { struct isp_fc *fc = ISP_FC_PC(isp, chan); atio_private_data_t *atp; @@ -723,6 +724,7 @@ isp_get_atpd(ispsoftc_t *isp, int chan, uint32_t tag) atp = LIST_FIRST(&fc->atfree); if (atp) { LIST_REMOVE(atp, next); + atp->ccb = ccb; atp->tag = tag; LIST_INSERT_HEAD(&fc->atused[ATPDPHASH(tag)], atp, next); } @@ -742,6 +744,23 @@ isp_find_atpd(ispsoftc_t *isp, int chan, uint32_t tag) return (NULL); } +/* + * Similar to above, but in addition to tag searches for opaque CCB pointer, + * It can be used in situations when the tag alone may already be reused. + */ +static atio_private_data_t * +isp_find_atpd_ccb(ispsoftc_t *isp, int chan, uint32_t tag, void *ccb) +{ + struct isp_fc *fc = ISP_FC_PC(isp, chan); + atio_private_data_t *atp; + + LIST_FOREACH(atp, &fc->atused[ATPDPHASH(tag)], next) { + if (atp->tag == tag && atp->ccb == ccb) + return (atp); + } + return (NULL); +} + static void isp_put_atpd(ispsoftc_t *isp, int chan, atio_private_data_t *atp) { @@ -967,16 +986,6 @@ isp_target_start_ctio(ispsoftc_t *isp, union ccb *ccb, enum Start_Ctio_How how) continue; } - /* - * Is this command a dead duck? - */ - if (atp->dead) { - isp_prt(isp, ISP_LOGERR, "%s: [0x%x] not sending a CTIO for a dead command", __func__, cso->tag_id); - ccb->ccb_h.status = CAM_REQ_ABORTED; - xpt_done(ccb); - continue; - } - /* * Check to make sure we're still in target mode. */ @@ -1378,7 +1387,7 @@ isp_handle_platform_atio7(ispsoftc_t *isp, at7_entry_t *aep) */ goto noresrc; } - atp = isp_get_atpd(isp, chan, aep->at_rxid); + atp = isp_get_atpd(isp, chan, aep->at_rxid, atiop); if (atp == NULL) { isp_prt(isp, ISP_LOGTDEBUG0, "[0x%x] out of atps", aep->at_rxid); isp_endcmd(isp, aep, nphdl, chan, SCSI_BUSY, 0); @@ -1733,32 +1742,8 @@ isp_handle_platform_target_notify_ack(ispsoftc_t *isp, isp_notify_t *mp, uint32_ /* * This case is for a responding to an ABTS frame */ - if (mp->nt_lreserved && ((isphdr_t *)mp->nt_lreserved)->rqs_entry_type == RQSTYPE_ABTS_RCVD) { - - /* - * Overload nt_need_ack here to mark whether we've terminated the associated command. - */ - if (mp->nt_need_ack) { - abts_t *abts = (abts_t *)mp->nt_lreserved; - - ISP_MEMZERO(cto, sizeof (ct7_entry_t)); - isp_prt(isp, ISP_LOGTDEBUG0, "%s: [%x] terminating after ABTS received", __func__, abts->abts_rxid_task); - cto->ct_header.rqs_entry_type = RQSTYPE_CTIO7; - cto->ct_header.rqs_entry_count = 1; - cto->ct_nphdl = mp->nt_nphdl; - cto->ct_rxid = abts->abts_rxid_task; - cto->ct_iid_lo = mp->nt_sid; - cto->ct_iid_hi = mp->nt_sid >> 16; - cto->ct_oxid = abts->abts_ox_id; - cto->ct_vpidx = mp->nt_channel; - cto->ct_flags = CT7_NOACK|CT7_TERMINATE; - if (isp_send_entry(isp, cto)) { - return (ENOMEM); - } - mp->nt_need_ack = 0; - } - return (isp_acknak_abts(isp, mp->nt_lreserved, 0)); - } + if (mp->nt_lreserved && ((isphdr_t *)mp->nt_lreserved)->rqs_entry_type == RQSTYPE_ABTS_RCVD) + return (isp_acknak_abts(isp, mp->nt_lreserved, (rsp == 0) ? 0 : EINVAL)); /* * General purpose acknowledgement @@ -1890,17 +1875,15 @@ bad: } } +/* + * Clean aborted commands pending restart + */ static void isp_target_mark_aborted_early(ispsoftc_t *isp, int chan, tstate_t *tptr, uint32_t tag_id) { - struct isp_fc *fc = ISP_FC_PC(isp, chan); - atio_private_data_t *atp; inot_private_data_t *ntp, *tmp; uint32_t this_tag_id; - /* - * First, clean any commands pending restart - */ STAILQ_FOREACH_SAFE(ntp, &tptr->restart_queue, next, tmp) { this_tag_id = ((at7_entry_t *)ntp->data)->at_rxid; if ((uint64_t)tag_id == TAG_ANY || tag_id == this_tag_id) { @@ -1911,16 +1894,6 @@ isp_target_mark_aborted_early(ispsoftc_t *isp, int chan, tstate_t *tptr, uint32_ isp_put_ntpd(isp, chan, ntp); } } - - /* - * Now mark other ones dead as well. - */ - for (atp = fc->atpool; atp < &fc->atpool[ATPDPSIZE]; atp++) { - if (atp->lun != tptr->ts_lun) - continue; - if ((uint64_t)tag_id == TAG_ANY || atp->tag == tag_id) - atp->dead = 1; - } } #endif @@ -2283,6 +2256,25 @@ isp_kthread(void *arg) } #ifdef ISP_TARGET_MODE +static int +isp_abort_atpd(ispsoftc_t *isp, int chan, atio_private_data_t *atp) +{ + uint8_t storage[QENTRY_LEN]; + ct7_entry_t *cto = (ct7_entry_t *) storage; + + ISP_MEMZERO(cto, sizeof (ct7_entry_t)); + cto->ct_header.rqs_entry_type = RQSTYPE_CTIO7; + cto->ct_header.rqs_entry_count = 1; + cto->ct_nphdl = atp->nphdl; + cto->ct_vpidx = chan; + cto->ct_iid_lo = atp->sid; + cto->ct_iid_hi = atp->sid >> 16; + cto->ct_rxid = atp->tag; + cto->ct_flags = CT7_NOACK|CT7_TERMINATE; + cto->ct_oxid = atp->oxid; + return (isp_send_entry(isp, cto)); +} + static void isp_abort_atio(ispsoftc_t *isp, union ccb *ccb) { @@ -2308,30 +2300,16 @@ isp_abort_atio(ispsoftc_t *isp, union ccb *ccb) } /* Search for the ATIO among running. */ - atp = isp_find_atpd(isp, XS_CHANNEL(accb), accb->atio.tag_id); + atp = isp_find_atpd_ccb(isp, XS_CHANNEL(accb), accb->atio.tag_id, accb); if (atp != NULL) { - /* Send TERMINATE to firmware. */ - if (!atp->dead) { - uint8_t storage[QENTRY_LEN]; - ct7_entry_t *cto = (ct7_entry_t *) storage; - - ISP_MEMZERO(cto, sizeof (ct7_entry_t)); - cto->ct_header.rqs_entry_type = RQSTYPE_CTIO7; - cto->ct_header.rqs_entry_count = 1; - cto->ct_nphdl = atp->nphdl; - cto->ct_rxid = atp->tag; - cto->ct_iid_lo = atp->sid; - cto->ct_iid_hi = atp->sid >> 16; - cto->ct_oxid = atp->oxid; - cto->ct_vpidx = XS_CHANNEL(accb); - cto->ct_flags = CT7_NOACK|CT7_TERMINATE; - isp_send_entry(isp, cto); + if (isp_abort_atpd(isp, XS_CHANNEL(accb), atp)) { + ccb->ccb_h.status = CAM_UA_ABORT; + return; } isp_put_atpd(isp, XS_CHANNEL(accb), atp); - ccb->ccb_h.status = CAM_REQ_CMP; - } else { - ccb->ccb_h.status = CAM_UA_ABORT; } + + ccb->ccb_h.status = CAM_REQ_CMP; } static void @@ -2504,6 +2482,7 @@ isp_action(struct cam_sim *sim, union ccb *ccb) } case XPT_NOTIFY_ACKNOWLEDGE: /* notify ack */ { + atio_private_data_t *atp; inot_private_data_t *ntp; /* @@ -2522,8 +2501,19 @@ isp_action(struct cam_sim *sim, union ccb *ccb) xpt_done(ccb); break; } - if (isp_handle_platform_target_notify_ack(isp, &ntp->nt, - (ccb->ccb_h.flags & CAM_SEND_STATUS) ? ccb->cna2.arg : 0)) { + + /* + * Target should abort all affected CCBs before ACK-ing INOT, + * but if/since it doesn't, add this hack to allow tag reuse. + */ + uint32_t rsp = (ccb->ccb_h.flags & CAM_SEND_STATUS) ? ccb->cna2.arg : 0; + if (ntp->nt.nt_ncode == NT_ABORT_TASK && (rsp & 0xff) == 0 && + (atp = isp_find_atpd(isp, XS_CHANNEL(ccb), ccb->cna2.seq_id)) != NULL) { + if (isp_abort_atpd(isp, XS_CHANNEL(ccb), atp) == 0) + isp_put_atpd(isp, XS_CHANNEL(ccb), atp); + } + + if (isp_handle_platform_target_notify_ack(isp, &ntp->nt, rsp)) { cam_freeze_devq(ccb->ccb_h.path); cam_release_devq(ccb->ccb_h.path, RELSIM_RELEASE_AFTER_TIMEOUT, 0, 10, 0); ccb->ccb_h.status &= ~CAM_STATUS_MASK; diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index bd5bba92c0a9..5bb3dd43b6de 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -89,10 +89,11 @@ void isp_put_ecmd(struct ispsoftc *, isp_ecmd_t *); #include typedef struct atio_private_data { LIST_ENTRY(atio_private_data) next; + void * ccb; + uint32_t tag; /* typically f/w RX_ID */ uint32_t orig_datalen; uint32_t bytes_xfered; uint32_t bytes_in_transit; - uint32_t tag; /* typically f/w RX_ID */ lun_id_t lun; uint32_t nphdl; uint32_t sid; @@ -102,11 +103,9 @@ typedef struct atio_private_data { uint16_t word3; /* PRLI word3 params */ uint16_t ctcnt; /* number of CTIOs currently active */ uint8_t seqno; /* CTIO sequence number */ - uint32_t - srr_notify_rcvd : 1, - cdb0 : 8, + uint8_t cdb0; + uint8_t srr_notify_rcvd : 1, sendst : 1, - dead : 1, tattr : 3, state : 3; void * ests; diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c index 081524aff53c..9d8f8e2a3766 100644 --- a/sys/dev/isp/isp_target.c +++ b/sys/dev/isp/isp_target.c @@ -481,10 +481,14 @@ isp_acknak_abts(ispsoftc_t *isp, void *arg, int errno) ISP_MEMCPY(rsp, abts, QENTRY_LEN); rsp->abts_rsp_header.rqs_entry_type = RQSTYPE_ABTS_RSP; + isp_prt(isp, ISP_LOGTINFO, "[0x%x] ABTS of 0x%x being %s'd", + rsp->abts_rsp_rxid_abts, rsp->abts_rsp_rxid_task, + (errno == 0) ? "BA_ACC" : "BA_RJT"); + rsp->abts_rsp_r_ctl = (errno == 0) ? BA_ACC : BA_RJT; + /* * Swap destination and source for response. */ - rsp->abts_rsp_r_ctl = BA_ACC; tmpw = rsp->abts_rsp_did_lo; tmpb = rsp->abts_rsp_did_hi; rsp->abts_rsp_did_lo = rsp->abts_rsp_sid_lo; @@ -505,15 +509,14 @@ isp_acknak_abts(ispsoftc_t *isp, void *arg, int errno) rx_id = rsp->abts_rsp_rx_id; ox_id = rsp->abts_rsp_ox_id; ISP_MEMZERO(&rsp->abts_rsp_payload.ba_acc, sizeof (rsp->abts_rsp_payload.ba_acc)); - isp_prt(isp, ISP_LOGTINFO, "[0x%x] ABTS of 0x%x being BA_ACC'd", rsp->abts_rsp_rxid_abts, rsp->abts_rsp_rxid_task); rsp->abts_rsp_payload.ba_acc.aborted_rx_id = rx_id; rsp->abts_rsp_payload.ba_acc.aborted_ox_id = ox_id; rsp->abts_rsp_payload.ba_acc.high_seq_cnt = 0xffff; } else { - ISP_MEMZERO(&rsp->abts_rsp_payload.ba_rjt, sizeof (rsp->abts_rsp_payload.ba_acc)); + ISP_MEMZERO(&rsp->abts_rsp_payload.ba_rjt, sizeof (rsp->abts_rsp_payload.ba_rjt)); switch (errno) { case ENOMEM: - rsp->abts_rsp_payload.ba_rjt.reason = 5; /* Logical Unit Busy */ + rsp->abts_rsp_payload.ba_rjt.reason = 5; /* Logical busy */ break; default: rsp->abts_rsp_payload.ba_rjt.reason = 9; /* Unable to perform command request */ From nobody Mon Dec 23 14:39:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH0zX0bhmz5h8rw; Mon, 23 Dec 2024 14:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH0zX0NMNz4d9B; Mon, 23 Dec 2024 14:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734964792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5/Phi1KoqJJqMhj/BTuKdvzhWnxJ0aCkAyP8OR9x+yA=; b=TotvBHGHnq8ZHM1ITnOeR1gkHIICD0ZJwOYdWZCvaTcsESB2YBFslHqcDM3aWVwXslQ+53 97yV+paLkLdMUTAvTcxRNBqrRNGYfFIgm8kMjxzvwT2fARop/oo8e3XRwMPlC9zmK3fTrh LSjUNyA/0Z1TLV8Bxogjai4cfyQthDHoc+ynEcEvtpEaFMZnxZO8OPHkO2uXIYt+Yy9ad9 B7SShWiYxdBfxmKQvhwXoWdgYwmSXutTKuIKCFKN7qdbf7mkSRibnFz/vuJpLqUKghevc4 fm1CfcNC9mBrR3Dbs9tvnj8I4c9a5HtYUs9qv7yt+7GKx5oG8UtrMzdhYuZpsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734964792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5/Phi1KoqJJqMhj/BTuKdvzhWnxJ0aCkAyP8OR9x+yA=; b=NcH6SZINb/S07MQSN9vFUoJ3uA5diVVnDH8AXmIRnZknPW845yC0Fjy/byTgvkJIThWLQM SklF/sacHsdRRtIjSq72sXotZCq9QqfksNsfojN/Sma7V9NCN0eDo4A+h7oYYcZvNuqWkl a9x+VWta+UA2dHKNmtpUV7zmyXfICfPbOiFsLeyKc90blsa1ek1eKzZOZNnGaJz1DnTrFQ AE1eUogacr/56kCnZg6AIqopYTviC6ZXR3FIhAI/Ok6hE5zO//7kum3ooAJIEYtcEIQQUN gCet6hhijq/Aa4KKUWe9bmhntUn1DOr9Z9TgNTZJVkmrhOyQRPU/juRLnR9DMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734964792; a=rsa-sha256; cv=none; b=TPy7PmuRmzax0inpZ0NybhCJLL6usbPIBQYxjm0pX+R08H2avRoycO3kfOAE1GaWkt1CVk ndvOLQDcRCM+HEuVWvbLN5tpQpQJs+TU9XUvPsaMx5OOqKWJaMpQm3TMHSFsuQtgTmBd8v NiTm2NZvCAlKRw7pVHPBMmf83//jPiOyRYjX3H0NW/JZclUIa8WwpFkfhq8089QQ+SYD5o 9G8kR3v496F+B62rzBbCUYi4XDk4WkQqeDQeLnuQP0pgKZ4mjSB5fcQL5cbJr0YeZXZvB1 U4m2uWbkXa81XAzXVIV2bXswvgOQDSqOsagABgKSDpLW28RYpaZHZvTEQFuqdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH0zW6zjQzxKw; Mon, 23 Dec 2024 14:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNEdpaJ079876; Mon, 23 Dec 2024 14:39:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNEdpwp079873; Mon, 23 Dec 2024 14:39:51 GMT (envelope-from git) Date: Mon, 23 Dec 2024 14:39:51 GMT Message-Id: <202412231439.4BNEdpwp079873@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: bc201841d139 - main - mac_do(4): Revamp manual page after MAC/do updates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc201841d13928c2a088fb07ac0a010b36eafa13 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=bc201841d13928c2a088fb07ac0a010b36eafa13 commit bc201841d13928c2a088fb07ac0a010b36eafa13 Author: Olivier Certner AuthorDate: 2024-12-19 21:13:12 +0000 Commit: Olivier Certner CommitDate: 2024-12-23 14:39:35 +0000 mac_do(4): Revamp manual page after MAC/do updates The new manual page in particular describes MAC/do's new rules syntax and the jail support, as well as security considerations explaining the overall design and how to leverage it in the most secure fashion. Reviewed by: bapt, otis, Alexander Ziaee (in part) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48153 --- share/man/man4/mac_do.4 | 460 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 417 insertions(+), 43 deletions(-) diff --git a/share/man/man4/mac_do.4 b/share/man/man4/mac_do.4 index aa84a71b4953..9a9f669cd51c 100644 --- a/share/man/man4/mac_do.4 +++ b/share/man/man4/mac_do.4 @@ -1,38 +1,274 @@ .\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2024 Baptiste Daroussin +.\" Copyright (c) 2024 The FreeBSD Foundation .\" -.\" SPDX-License-Identifier: BSD-2-Clause +.\" Portions of this documentation were written by Olivier Certner +.\" at Kumacom SARL under sponsorship from the FreeBSD +.\" Foundation. .\" -.Dd May 22, 2024 +.Dd December 19, 2024 .Dt MAC_DO 4 .Os .Sh NAME .Nm mac_do -.Nd "policy allowing user to execute program as another user" +.Nd "policy allowing unprivileged users to change process credentials" .Sh SYNOPSIS To compile the -.Nm -policy into your kernel, place the following lines -in your kernel configruation file: +.Sy mac_do +policy into your kernel, place the following lines in your kernel configuration +file: .Bd -ragged -offset indent .Cd "options MAC" .Cd "options MAC_DO" .Ed +.Pp +Alternately, to load this policy module at boot time, place the following line +in your kernel configuration file: +.Bd -ragged -offset indent +.Cd "options MAC" +.Ed +.Pp +and in +.Xr loader.conf 5 : +.Bd -literal -offset indent +mac_do_load="YES" +.Ed .Sh DESCRIPTION The .Nm -policy grants users the ability to run processs as other users -according to predefined rules. +policy module allows unprivileged users to change process credentials according +to rules configured by the administrator. +It supports per-jail configuration. +.Pp +Currently, the +.Nm +policy module only produces effects to processes spwaned from the +.Pa /usr/bin/mdo +executable, please see +.Xr mdo 1 +for more details on this program. +.Sh CREDENTIALS RULES +Rules specify which transitions of process credentials +.Nm +will allow, based on current process credentials and the desired final ones. +They are passed by an administrator in the form of a string having the specific +syntax described below in a top-bottom manner. +They have been designed to be able to finely describe the desired target +credentials in a safe and compact way. +.Ss Top-Level List of Rules +At the top, rules are a possibly empty list of individual rules separated by +a semi-colon +.Pq Ql ";" : +.Dl Ao rules Ac \ ⟶\ Oo Ao rule Ac Oo So ";" Sc Ao rule Ac Oc Ns * Oc +They form a disjunction, i.e., +.Nm +authorizes a credentials transition as soon as at least one rule in the list +matches. .Pp -The exact set of kernel privileges granted are: -.Bl -inset -compact -offset indent -.It Dv PRIV_CRED_SETGROUPS -.It Dv PRIV_CRED_SETUID +One rule is composed of a +.Li Aq from +part +.Pq also called Dq match +and a +.Li Aq to +part +.Pq also called Dq target , +in this order, separated by a colon +.Pq Ql ":" : +.Dl Ao rule Ac \ ⟶\ Ao from Ac So ":" Sc Ao to Ac +.Ss Rule's Ao from Ac Part +The first part of a rule, +.Li Aq from , +is matched against the credentials of the process requesting some credentials +transition. +It has the form: +.Dl Ao from Ac \ ⟶\ Ao type Ac So = Sc Ao id Ac +.Pp +.Li Aq type +must be: +.Dl Ao type Ac \ ⟶\ Op So uid Sc | So gid Sc +i.e., one of the literal strings +.Ql uid +or +.Ql gid . +.Li Aq id +must be the numerical ID of a user or group, and is matched with the current +process real ID of the corresponding type. +.Ss Rule's Ao to Ac Part +The second part of a rule, +.Li Aq to , +is a comma-separated +.Pq Ql "," +non-empty list of target clauses: +.Dl Ao to Ac \ ⟶\ Ao target_clause Ac Oo So "," Sc Ao target_clause Ac Oc Ns * +Target clauses of a given rule also form a disjunction, i.e., the IDs they +specify are alternatives for the target credentials, except in some cases +described below. +.Pp +The next subsections describe the syntax of target clauses, the defaults that +apply and the principle of non-redundancy and non-contradiction in each rule's +.Li Aq to +part. +.Ss Target Clauses +A target clause in a rule's +.Li Aq to +part must be of one of the following forms: +.Dl Ao target_clause Ac \ ⟶\ So any Sc +.Dl Ao target_clause Ac \ ⟶\ Ao flags Ac Ao type Ac So = Sc Ao id Ac +The first form is a compact way to specify that any target credentials are +allowed. +The second form is similar to that of +.Li Aq from +clauses, with the following extensions: +.Bl -bullet -compact +.It +.Li Aq id +may also be a literal +.Ql * +or +.Ql any +or +.Ql "." . +.Ql * +and +.Ql any +both designate any ID for the specified +.Li Aq type , +and are treated identically. +.Ql "." +designates the process' current IDs for the specified +.Li Aq type , +as explained below. +.It +.Li Aq flags +may contain at most one of the +.Ql + , +.Ql - +and +.Ql "!" +characters, and may be non-empty only when +.Li Aq type +is +.Ql gid . +Additionally, if +.Li Aq id +is +.Ql * +or +.Ql any , +only the +.Ql + +flag may appear. +.El +.Pp +For target clauses of +.Ql gid +type, an absence of flag indicates that the specified group ID is allowed as the +real, effective and/or saved group IDs +.Pq the Do primary Dc groups . +Conversely, the presence of any allowed flag indicates that the specification +concerns supplementary groups. +Each flag has a specific meaning: +.Bl -bullet -compact +.It +.Ql + +indicates that the group ID is allowed as a supplementary group. +.It +.Ql "!" +indicates that the group ID is mandatory, i.e., it must be listed in the +supplementary groups. +.It +.Ql - +indicates that the group ID must not be listed in the supplementary groups. .El +A specification with +.Ql - +is only useful in conjunction with a +.Ql + Ns +-tagged specification where only one of them has +.Ql "." +as its +.Li Aq id . +Target clauses having the +.Ql "!" +or +.Ql - +flag are +.Dq forcing +clauses, and as such do not take part in the disjunction of the other +target clauses but rather unconditionally apply in their rule. +.Pp +.Ql "." +is a placeholder for IDs that the calling process already has on privilege +check. +For type +.Ql uid , +it designates any of the process' real, effective or +saved user IDs. +For type +.Ql gid , +its effect depends on whether flags are present. +If none is present, it designates any of the process' real, effective or saved +group IDs. +If one is present, it designates any of the process' supplementary groups. +.Ss Defaults for the Ao to Ac Part +If the +.Li Aq to +part does not list a target clause with type +.Ql uid , +any of the current user IDs of the calling process is accepted. +In other words, in this case, +.Nm +behaves as if a target clause of: +.Dl uid=. +had been listed. .Pp +Similarly, if the +.Li Aq to +part does not list a target clause with type +.Ql gid , +all the groups of the calling process are assumed to be required. +More precisely, each of the desired real, effective and saved group IDs must be +one of the current real, effective or saved group ID, and all supplementary +groups must be the same as those that are current. +It is as if the +.Li Aq to +part had contained the following two clauses: +.Dl gid=.,!gid=. +.Ss Non-Redundancy and Non-Contradiction in a Ao to Ac Part +No two target clauses of a single rule may express the exact same logical intent +nor contradictory ones. +.Pp +In practice, no two clauses may display the same ID except for group IDs but +only if, each time the same ID appears, it does so with a different flag, or no +flags only once. +Additionally, the specified flags in multiple occurences must not be +contradictory. +For example, the same group ID appearing with both +.Ql + +and +.Ql - +will cause rejection of the rule. +.Ss Parsing Specifics +Any amount of whitespace is allowed around tokens of the above grammar, except +that there may be no spaces between +.Li Aq flags +and +.Li Aq id +in target clauses. +.Pp +For convenience, numerical IDs may be specified as negative integers, which are +then converted to unsigned ones as specified in the C standard for the +.Vt uid_t +and +.Vt gid_t +types, which are both 64-bit unsigned integers. +.Sh RUNTIME CONFIGURATION The following .Xr sysctl 8 -MIBs are available: +knobs are available: .Bl -tag -width indent .It Va security.mac.do.enabled Enable the @@ -40,39 +276,177 @@ Enable the policy. (Default: 1). .It Va security.mac.do.rules -The set of rules. +The list of credential rules, whose syntax is described in the +.Sx CREDENTIALS RULES +section above. +This list is specific to each jail. +Please see the +.Sx JAIL SUPPORT +section below for more details on the interaction of +.Nm +with jails. +.It Va security.mac.do.print_parse_error +Logs a message on trying to set incorrect rules via the +.Va security.mac.do.rules +.Xr sysctl 8 +knob. .El +.Sh JAIL SUPPORT +.Nm +supports per-jail configuration of rules. .Pp -The rules consist of a list of elements separated by -.So , Sc . -Each element is of the form -.Sm off -.Do -.Op Cm uid | Cm gid -.Li = -.Ar fid -.Li : -.Ar tid -.Dc -.Sm on . -Where -.Ar fid -is the uid or gid of the user or group the rule applies to, and -.Ar tid -is the uid of the targetted user. -Two special forms are accepted for -.Ar tid : -.Va any -or -.Va * , -which allow to target any user. -.Sh EXAMPLES -The following rule: +By default, at creation, a new jail has no credentials rules, effectively +disabling +.Nm +for its processes. .Pp -.Dl security.mac.do.rules=uid=1001:80,gid=0:any +The following jail parameters are defined: +.Bl -tag -width indent +.It Va mac.do +Possible values are: +.Bl -tag -width "'disable'" -compact +.It Ql enable +.Nm +will enforce specific credential rules in the jail. +The +.Va mac.do.rules +jail parameter must also be set in this case. +.It Ql disable +Disables +.Nm +in the jail. +Strictly equivalent to jail creation's default behavior and to setting the rules +to an empty string. +.It Ql inherit +The jail's credentials rules are inherited from the jail's parent +.Pq which may themselves have been inherited . +Modified rules propagate to all children jails configured for inheritance. +.El +.It Va mac.do.rules +The credentials rules for the jail. +It is always equal to the value that can be retrieved by the +.Xr sysctl 8 +knob +.Va security.mac.do.rules +described in section +.Sx RUNTIME CONFIGURATION . +If set, and the jail parameter +.Va mac.do +is not so explicitly, the value of the latter will default to +.Ql disable +if empty, else to +.Ql enable . +.El .Pp -means the user with the uid 1001 can execute processes as user with uid 80, -all the users which belongs to the group gid 0 can execute processes as any user. +Each jail must have +.Xr mdo 1 +installed at path +.Pa /usr/bin/mdo , +as this path is currently not configurable. +.Sh EXAMPLES +Here are several examples of single rules matching processes having a real user +ID of 10001: +.Bl -tag -width indent +.It Li uid=10001:uid=10002 +Allows the process to switch any of its real, effective or saved user ID to +10002, but keeping the groups it is already in, and with the same +primary/supplementary groups split. +.It Li uid=10001:uid=10002,uid=10003 +Same as the first example, but also allows to switch to UID 10003 instead of +10002. +.It Li uid=10001:uid=10002,gid=10002 +Same as the first example, but the new primary groups must be set to 10002 and +no supplementary groups should be set. +.It Li uid=10001:uid=10002,gid=10002,+gid=.\& +Same as the previous example, but in addition allowing to retain any current +supplementary groups. +.It Li uid=10001:uid=10002,gid=10002,!gid=.\& +Same as the previous example, but with the additional constraint that all +current supplementary groups must be kept. +.It Li uid=10001:uid=10002,gid=10002,+gid=.,-gid=10001 +Same as +.Ql uid=10001:uid=10002,gid=10002,+gid=.\& +above, but 10001 cannot be retained as a supplementary group. +.It Li uid=10001:uid=10002,gid=10002,+gid=.,!gid=10003 +Same as +.Ql uid=10001:uid=10002,gid=10002,+gid=.\& +above, with the additional constraint that 10003 must appear in the +supplementary groups. +.It Li uid=10001:uid=10002,gid=*,+gid=* +Same as the first example, but lifting any constraints on groups, allowing the +process to become part of any groups it sees fit. +.El +.Pp +Here are several examples of single rules matching processes having a real group +ID of 10001: +.Bl -tag -width indent +.It Li gid=10001:uid=0 +Makes 10001 a more powerful +.Ql wheel +group, allowing its members to switch to root without password. +.It Li gid=10001:gid=10002 +Allows the process to enter GID 10002 as a primary group, but only if +giving up all its supplementary groups. +.It Li security.mac.do.rules=gid=10001:gid=10002,+gid=.\& +Same as the previous example, but allows to retain any current supplementary +groups. +.It Li gid=10001:gid=10002,!gid=.\& +Same as the previous example, but with the additional constraint that all +current supplementary groups must be kept. +.El .Sh SEE ALSO .Xr mdo 1 , -.Xr mac 4 +.Xr setcred 2 , +.Xr mac 4 , +.Xr jail 8 , +.Xr sysctl 8 +.Sh AUTHORS +.An Olivier Certner Aq Mt olce@FreeBSD.org +.An Baptiste Daroussin Aq Mt bapt@FreeBSD.org +.Sh BUGS +Currently, +.Nm +considers only credentials transitions requested through the +.Xr setcred 2 +system call. +This system call was in large part created so that +.Nm +can see whole credentials transitions to decide whether to authorize them, which +the traditional UNIX's piecewise approach of successively changing different +parts of them cannot allow. +.Pp +However, calls to traditional or standard credentials-changing functions can be +considered as full transitions on their own, however limited, and as such should +be equally monitored by +.Nm . +Future work will lift this restriction. +.Sh SECURITY CONSIDERATIONS +The threat model for +.Nm +is to consider userland programs as generally untrustable to decide upon which +credentials changes are acceptable. +It is in contrast with the traditional UNIX way to change credentials, in which +specialized programs are installed with the setuid bit, giving them full +administrator privileges so that they are effectively able to establish new +ones. +Vulnerabilities in such credentials-changing programs can have catastrophic +consequences on the integrity of the system. +.Pp +Consequently, +.Nm +does not rely on companion userland programs to decide whether some credentials +transition is acceptable. +Instead, it maintains its own configuration independently from the userland +password and group databases. +Establishing this configuration currently itself relies on userland programs +issuing calls to +.Xr sysctl 3 +or +.Xr jail 2 . +It should thus be established near system boot or jail start, before any +possible attacks could happen on the system, and further measures should be +taken to ensure that potential corruptions does not affect the configuration in +subsequent restarts, such as re-establishing pristine state or ensuring that the +boot procedure up to the configuration of +.Nm +can be trusted. From nobody Mon Dec 23 14:47:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH18m1V6Yz5h9mP; Mon, 23 Dec 2024 14:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH18m0zdSz4f2l; Mon, 23 Dec 2024 14:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734965272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n7AIw521r54ou6rf/MR2nE9BhLWECHVxTEXebH27qdo=; b=OgkI16OVuvvifoHiyVHU4WBdxhqJLxccjJxab8qBG5ZotHKuXCE4crmN/2Sh6pwH9Sf6R0 h+Cos7+JEYYQx3gZ8DnskShb/CatAP+iI/CW5jYKWv5iuxCZJu9c25lXjWTb1AxtBcmQbT uXywokDflkPDP5q3m32FFtcX1Qri5dmJDhKqTfvGaUpMLC+a1r+o9uU+1SDLRA7EXqyAb5 8FGfljv9nb31hQbl3taiA9ifMRO+Qd0EtGe+V5EmgBYd5/NuQTyu4AHJSF8DhimMGm98Jv O4qkHwJ0lD1pUTyDmuQaaKQLuEyv6/UcryZRhZOh4YrfkuZfQofDCxhLCJQJuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734965272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n7AIw521r54ou6rf/MR2nE9BhLWECHVxTEXebH27qdo=; b=ScOuPKUiwvzhLvnKUTODdV02e/cjFjCoQa4h1UIp10lE0SO9r6EvyxIzhwWkkD6hBtEpaP GfUxg/Uf/fHUnRd1W4HDITmy3IJ/+OSFqPru8WXxgR/6but4fExPLKb1ufr6g6mE5kHTVv Og/8fuO/oppi0ySdwsicNsqY1e8NEz4E1ilMcYL1CVCPaQtPzdEWIeB4uQpDxFJkWI7BKK vWXIpoxMVx8llC/DolxxFTmgKSP0uB2QyB1IvzTps20GBe9IJEdyuUBnbU3J0+RLToENpW Mwps4YAR6EhZEu0+TvqdvYKS7iDyA11r+EI9g8r3NAIZsP/YUBe1Y+lc2TNnmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734965272; a=rsa-sha256; cv=none; b=FwNYAcCXBviosOz7RZ0q1qcueE8mpZe6hVvNqCybVmdUB63elltACXUoFELmTbZN3JVyeY rWhSswhCpj9DUtKh5sgaHvQPg87fKb1WJk+9coi+LP/DWlZX8zWyo2Mq/MbjyCnlgTlH4q rcfMXNQ8xxtEikxmE1HlqUQukXh0icC7yTMC76VT/8L1OFFZsDCpWxjr8BOWbPH0Kp6/Kz Y+bBN8dwvVm2iJg0vufHDpYynCpbYQjeUwpHnsXKn9klQrf2/wh15BMkZ7rrz46Ro9Vs7e IU4hr2NGMfZ9vuV2znTw1Hpns98EnfHH9UMK8FARxOwIQiuHsfGu6crZaxupNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH18m0bhnzy6t; Mon, 23 Dec 2024 14:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNElpLr097353; Mon, 23 Dec 2024 14:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNElpeJ097350; Mon, 23 Dec 2024 14:47:51 GMT (envelope-from git) Date: Mon, 23 Dec 2024 14:47:51 GMT Message-Id: <202412231447.4BNElpeJ097350@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 1ccbdf561f41 - main - tmpfs: Rework file handles List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ccbdf561f417f9fe802131d5b1756ac45fd314d Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=1ccbdf561f417f9fe802131d5b1756ac45fd314d commit 1ccbdf561f417f9fe802131d5b1756ac45fd314d Author: Olivier Certner AuthorDate: 2024-12-06 20:23:59 +0000 Commit: Olivier Certner CommitDate: 2024-12-23 14:46:55 +0000 tmpfs: Rework file handles Change 'struct tmpfs_fid_data' to behave consistently with the private structure other FSes use. In a nutshell, make it a full alias of 'struct fid', instead of just using it to fill 'fid_data'. This implies adding a length field at start (aliasing 'fid_len' of 'struct fid'), and filling 'fid_len' with the full size of the aliased structure. To ensure that the new 'struct tmpfs_fid_data' is smaller than 'struct fid', which the compile-time assert introduced in commit 91b5592a1e1af974 ("fs: Add static asserts for the size of fid structures") checks (and thus was not strong enough when added), use '__packed'. A consequence of this change is that copying the 'struct tmpfs_fid_data' into a stack-allocated variable becomes unnecessary, we simply rely on the compiler emitting the proper code on seeing '__packed' (and on the start of 'struct tmpfs_fid_data' being naturally aligned, which is normally guaranteed by kernel's malloc() and/or inclusion in 'struct fhandle'). Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47956 --- sys/fs/tmpfs/tmpfs.h | 5 ++--- sys/fs/tmpfs/tmpfs_vfsops.c | 16 ++++++---------- sys/fs/tmpfs/tmpfs_vnops.c | 16 ++++------------ 3 files changed, 12 insertions(+), 25 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs.h b/sys/fs/tmpfs/tmpfs.h index 58f8720c3f84..52307cc7c7b2 100644 --- a/sys/fs/tmpfs/tmpfs.h +++ b/sys/fs/tmpfs/tmpfs.h @@ -448,11 +448,10 @@ struct tmpfs_mount { * NFS code. */ struct tmpfs_fid_data { + unsigned short tfd_len; ino_t tfd_id; unsigned long tfd_gen; -}; -_Static_assert(sizeof(struct tmpfs_fid_data) <= MAXFIDSZ, - "(struct tmpfs_fid_data) is larger than (struct fid).fid_data"); +} __packed; struct tmpfs_dir_cursor { struct tmpfs_dirent *tdc_current; diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c index dd48a24dab2f..431893b77bb9 100644 --- a/sys/fs/tmpfs/tmpfs_vfsops.c +++ b/sys/fs/tmpfs/tmpfs_vfsops.c @@ -585,29 +585,25 @@ static int tmpfs_fhtovp(struct mount *mp, struct fid *fhp, int flags, struct vnode **vpp) { - struct tmpfs_fid_data tfd; + struct tmpfs_fid_data *tfd; struct tmpfs_mount *tmp; struct tmpfs_node *node; int error; - if (fhp->fid_len != sizeof(tfd)) + if (fhp->fid_len != sizeof(*tfd)) return (EINVAL); - /* - * Copy from fid_data onto the stack to avoid unaligned pointer use. - * See the comment in sys/mount.h on struct fid for details. - */ - memcpy(&tfd, fhp->fid_data, fhp->fid_len); + tfd = (struct tmpfs_fid_data *)fhp; tmp = VFS_TO_TMPFS(mp); - if (tfd.tfd_id >= tmp->tm_nodes_max) + if (tfd->tfd_id >= tmp->tm_nodes_max) return (EINVAL); TMPFS_LOCK(tmp); LIST_FOREACH(node, &tmp->tm_nodes_used, tn_entries) { - if (node->tn_id == tfd.tfd_id && - node->tn_gen == tfd.tfd_gen) { + if (node->tn_id == tfd->tfd_id && + node->tn_gen == tfd->tfd_gen) { tmpfs_ref_node(node); break; } diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index 162977b8abf7..83e43ec7ba13 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -1706,23 +1706,15 @@ vop_vptofh { }; */ { - struct tmpfs_fid_data tfd; + struct tmpfs_fid_data *const tfd = (struct tmpfs_fid_data *)ap->a_fhp; struct tmpfs_node *node; - struct fid *fhp; _Static_assert(sizeof(struct tmpfs_fid_data) <= sizeof(struct fid), "struct tmpfs_fid_data cannot be larger than struct fid"); node = VP_TO_TMPFS_NODE(ap->a_vp); - fhp = ap->a_fhp; - fhp->fid_len = sizeof(tfd); - - /* - * Copy into fid_data from the stack to avoid unaligned pointer use. - * See the comment in sys/mount.h on struct fid for details. - */ - tfd.tfd_id = node->tn_id; - tfd.tfd_gen = node->tn_gen; - memcpy(fhp->fid_data, &tfd, fhp->fid_len); + tfd->tfd_len = sizeof(*tfd); + tfd->tfd_gen = node->tn_gen; + tfd->tfd_id = node->tn_id; return (0); } From nobody Mon Dec 23 15:30:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH26M1zKmz5Wq8w; Mon, 23 Dec 2024 15:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH26M1XHQz4hWl; Mon, 23 Dec 2024 15:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734967851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tz5uG5NfQ+O6QogSOplcpVtHWqPpsBbzgYt0lbr3Als=; b=OFHGGhI7KtwQr6sVzoCJXY4nT4eF5kou3V9hxB0LaTjuAsMAiRov9QsnddEpTbjCsB3l8/ ifww/8j313dblPJuolTxYwmBjwJXEn5Gsp3mO5HNYr/CVafsl2wFfLUEgVD88PJ+uO58mF dNeqp6UspbokB1yABTRfPpAJ194DA/SZojS5GwmYg+ksbnhl9muqEZvMpEooyP7u6e+tS2 WU3O8O0HiEzuaQo4JE3kt90HhbzdC8/N5dcuxMpdkYusOOLGZj/q1LsplYI/Lgyp02HAIH 7beVmbD41dyKmFx2Yui2S5OwRolNxMKLxGy2YuwppbVd34T6gN9CT48MSlP3AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734967851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tz5uG5NfQ+O6QogSOplcpVtHWqPpsBbzgYt0lbr3Als=; b=xLFdTHemXzfYwlpVUyVtSY6DWXdX5EzwiqkW/IUo7X8FmVwM5ALvEpz7OZyqiRwgKwy9HN gEVTVREWLiEnf6CBJu8jBDFVBC4rSSkpUIbg19CASuri30HBJ+ixlK5Hm54zDhj5ab1gJW CKCIbXdI7tGZ7BOP+7ah/9VPl/UwcSRibsO7ixPhYLuaDAQWbrI+7dQl7z+0eN/or+SAh9 FgJMnPsVbNHxG9on631gntM38TqihftqmCwrO4L6mW5kmKcGnLatgnd1pkdfDz7SEXY3Ib PuMCqAgBOwPyi746bA1siB7vs1k4OkaK73Z2OuHkL7QDqJDC/Orc4feXP7Smng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734967851; a=rsa-sha256; cv=none; b=xxo7IEtyQCG6cVKfGT3ebPinSEq0w/+tEIcp5IsczrSwBHt9Kfnu4EWsWvO8w0xnq5htrr 17gRImMpXeYEEL/IGmCLYlO13Pw6mgaNsAYWLC06HfMZmLHlrzmqtsQgGAtnu3Dn8lDCik MA9je9OUTScbS5I6jLmKn8JFkLPD8X8U9EHuWIkuLc7zcQiwEy+DlbaDB3fyW29SVNUIBq XMHnhvCJBODnVVfPclZW4/+v/H2F6a0GhtGki/qfcuqZHYceTUHxy8LdClFeUIGMRjRNvp 6UVc9pVeDlMj/pU75jzpivSew8coFyIFP0FvBvxnTenc7pQ2NI+mAASQon2jrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH26M18XJzycN; Mon, 23 Dec 2024 15:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNFUp33082032; Mon, 23 Dec 2024 15:30:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFUpRp082029; Mon, 23 Dec 2024 15:30:51 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:30:51 GMT Message-Id: <202412231530.4BNFUpRp082029@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: 2069f6ecb1b1 - main - makefs: Crudely fix a sprintf warning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2069f6ecb1b1268deac980176c652ffab264970e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2069f6ecb1b1268deac980176c652ffab264970e commit 2069f6ecb1b1268deac980176c652ffab264970e Author: Ed Maste AuthorDate: 2024-12-22 16:00:49 +0000 Commit: Ed Maste CommitDate: 2024-12-23 15:30:03 +0000 makefs: Crudely fix a sprintf warning Reviewed by: kevans Obtained from: OpenBSD d95291fdb2dc Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48178 --- usr.sbin/makefs/cd9660.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 500e3c08c7af..19bd6e0d21b0 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -140,10 +140,11 @@ static void cd9660_convert_structure(iso9660_disk *, fsnode *, cd9660node *, int static void cd9660_free_structure(cd9660node *); static int cd9660_generate_path_table(iso9660_disk *); static int cd9660_level1_convert_filename(iso9660_disk *, const char *, char *, - int); + size_t, int); static int cd9660_level2_convert_filename(iso9660_disk *, const char *, char *, + size_t, int); +static int cd9660_convert_filename(iso9660_disk *, const char *, char *, size_t, int); -static int cd9660_convert_filename(iso9660_disk *, const char *, char *, int); static void cd9660_populate_dot_records(iso9660_disk *, cd9660node *); static int64_t cd9660_compute_offsets(iso9660_disk *, cd9660node *, int64_t); #if 0 @@ -222,7 +223,8 @@ cd9660_set_defaults(iso9660_disk *diskStructure) memset(diskStructure->primaryDescriptor.abstract_file_id, 0x20,37); memset(diskStructure->primaryDescriptor.bibliographic_file_id, 0x20,37); - strcpy(diskStructure->primaryDescriptor.system_id, "FreeBSD"); + strlcpy(diskStructure->primaryDescriptor.system_id, "FreeBSD", + sizeof(diskStructure->primaryDescriptor.system_id)); /* Boot support: Initially disabled */ diskStructure->has_generic_bootimage = 0; @@ -797,7 +799,7 @@ cd9660_translate_node_common(iso9660_disk *diskStructure, cd9660node *newnode) memset(temp, 0, ISO_FILENAME_MAXLENGTH_WITH_PADDING); (void)cd9660_convert_filename(diskStructure, newnode->node->name, - temp, !(S_ISDIR(newnode->node->type))); + temp, sizeof(temp), !(S_ISDIR(newnode->node->type))); flag = ISO_FLAG_CLEAR; if (S_ISDIR(newnode->node->type)) @@ -1100,7 +1102,9 @@ cd9660_rename_filename(iso9660_disk *diskStructure, cd9660node *iter, int num, while (digits > 0) { digit = (int)(temp / powers); temp = temp - digit * powers; - sprintf(&tmp[numbts] , "%d", digit); + snprintf(&tmp[numbts], + ISO_FILENAME_MAXLENGTH_WITH_PADDING - numbts, + "%d", digit); digits--; numbts++; powers = powers / 10; @@ -1566,7 +1570,7 @@ cd9660_compute_full_filename(cd9660node *node, char *buf) */ static int cd9660_level1_convert_filename(iso9660_disk *diskStructure, const char *oldname, - char *newname, int is_file) + char *newname, size_t newnamelen, int is_file) { /* * ISO 9660 : 10.1 @@ -1577,6 +1581,7 @@ cd9660_level1_convert_filename(iso9660_disk *diskStructure, const char *oldname, int namelen = 0; int extlen = 0; int found_ext = 0; + char *orignewname = newname; while (*oldname != '\0' && extlen < 3) { /* Handle period first, as it is special */ @@ -1613,7 +1618,7 @@ cd9660_level1_convert_filename(iso9660_disk *diskStructure, const char *oldname, if (!found_ext && !diskStructure->omit_trailing_period) *newname++ = '.'; /* Add version */ - sprintf(newname, ";%i", 1); + snprintf(newname, newnamelen - (newname - orignewname), ";%i", 1); } return namelen + extlen + found_ext; } @@ -1621,7 +1626,7 @@ cd9660_level1_convert_filename(iso9660_disk *diskStructure, const char *oldname, /* XXX bounds checking! */ static int cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, - char *newname, int is_file) + char *newname, size_t newnamelen, int is_file) { /* * ISO 9660 : 7.5.1 @@ -1635,6 +1640,7 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, int namelen = 0; int extlen = 0; int found_ext = 0; + char *orignewname = newname; while (*oldname != '\0' && namelen + extlen < 30) { /* Handle period first, as it is special */ @@ -1675,7 +1681,7 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, if (!found_ext && !diskStructure->omit_trailing_period) *newname++ = '.'; /* Add version */ - sprintf(newname, ";%i", 1); + snprintf(newname, newnamelen - (newname - orignewname), ";%i", 1); } return namelen + extlen + found_ext; } @@ -1690,15 +1696,15 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, */ static int cd9660_convert_filename(iso9660_disk *diskStructure, const char *oldname, - char *newname, int is_file) + char *newname, size_t newnamelen, int is_file) { assert(1 <= diskStructure->isoLevel && diskStructure->isoLevel <= 2); if (diskStructure->isoLevel == 1) return(cd9660_level1_convert_filename(diskStructure, - oldname, newname, is_file)); + oldname, newname, newnamelen, is_file)); else if (diskStructure->isoLevel == 2) return (cd9660_level2_convert_filename(diskStructure, - oldname, newname, is_file)); + oldname, newname, newnamelen, is_file)); abort(); } @@ -1910,7 +1916,7 @@ cd9660_create_virtual_entry(iso9660_disk *diskStructure, const char *name, temp->isoDirRecord = emalloc(sizeof(*temp->isoDirRecord)); cd9660_convert_filename(diskStructure, tfsnode->name, - temp->isoDirRecord->name, file); + temp->isoDirRecord->name, sizeof(temp->isoDirRecord->name), file); temp->node = tfsnode; temp->parent = parent; From nobody Mon Dec 23 15:39:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2Jq2rKxz5WqV1; Mon, 23 Dec 2024 15:39: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 4YH2Jq2Gpxz4kS3; Mon, 23 Dec 2024 15:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ziGDldIc+uYFTNcW6VURVG6N8S2DKI+SFzRHyC0pVM8=; b=m8HsdoOxBJuW3O1lyiKjrkubGGpF+tuhMzX2VlbrlmtPjNP3qep1qJM9JjRbV/7MI6URjp ieMfuruHN45+5HgJVYmaeLw463LBw07Vadp3j/9XIGjmJ5H/csdVPQTewFsf47OJYCYDTY h5qXDzT3dndkGGUu3bdtDeKVWK4JLva16CbrdQ+K4vfZw0n1ZTv3rLeNDOs/cw3ZL4f2+E yYvkGmRNBbGYrUVN4RsuSN95jJRp6QbpkoQrq/WGQ0n0tlGTxKzTRR8toBBQKj3u/0n/kA lsJHndnc8/UbZogif+27N1F8SXyoacA11zgqoM+etHQH4KlWO52qcy6uGxJa8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ziGDldIc+uYFTNcW6VURVG6N8S2DKI+SFzRHyC0pVM8=; b=ncKB63mhPgZq65tbiHMe+zfymlJMbfWJ4GW4TOSRbIlRnXLeY8FL+PfmttCKsKNIjFQpSc IK8h50SHBFFR0UgwA8xJR7loh2Gs8XkgYvyPTMLmepeaysEw1FQ2MvQ/yZ9puniwYAUixH ytR225WA/NA56fJSV/wcEboO7/GRF7r26TXImXL4583RvwD4rWPG99tUKo3A344aL9qpdC p5UICVzUNpiyyj6GAZLYfYlVAaSFjDM8w9M3wxlftIQOshGGNGE9HjhtLhfSU7/Jjwnwed qptbHfPrneRuCYLsVO7AzcslmaNpyq++uACcLyMLANMZJaME7u9YWn+ucqr/ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968395; a=rsa-sha256; cv=none; b=cnir90JKmz69eO1eXBNHzcpdOx2WB5nHGiqlGua/mHdmY5WR8MtGBLWAHyh80k+r1cTK/C q7rbsS4bQEMFMuxMR4ON/rEY2axGdmcYd6d34sNJhhkc/H6FGY3H/19OlOTpaygWkrhw+F 0wYSphpkmOReqgWmsaqJt8L9nh1XkuMHgGCX+mUY6SsZlmJYvCaD6/TpG9w9Ek8jH+ODHg IzF+NcIY5eCzmd7nqHxi1bSmsGbRSccofAW6Mbh/IFxP9UyqH1G8ILd6Aln0WuJ+KVtu6L xvfOkWDiohCLuO5nFu3XPyNrcBRthYcDyo2vB92IQJynzaoD2c2NlnPBwxkBnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2Jq1smGzyYF; Mon, 23 Dec 2024 15:39: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 4BNFdtlh092410; Mon, 23 Dec 2024 15:39:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFdtx5092407; Mon, 23 Dec 2024 15:39:55 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:39:55 GMT Message-Id: <202412231539.4BNFdtx5092407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 0f30121d422d - stable/14 - bsd-family-tree: add FreeBSD 14.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0f30121d422d820463d210375dc7c5ebf006ff21 Auto-Submitted: auto-generated The branch stable/14 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=0f30121d422d820463d210375dc7c5ebf006ff21 commit 0f30121d422d820463d210375dc7c5ebf006ff21 Author: Maxim Konovalov AuthorDate: 2024-12-11 19:31:25 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-23 15:38:58 +0000 bsd-family-tree: add FreeBSD 14.2 (cherry picked from commit ac3dedf4e8e08647a2c08e75f1ef69d8bb2831e6) --- share/misc/bsd-family-tree | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index b9d76552db08..eabcc64eef6e 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -465,10 +465,12 @@ FreeBSD 5.2 | | | | | | | | | 8.3 | | | FreeBSD | | | | | | 14.1 | | | | | - | | macOS | | | - | | 15 | | | - | FreeBSD | | | | - | 13.4 | | OpenBSD 7.6 | + | | | macOS | | | + | | | 15 | | | + | | FreeBSD | | | | + | | 13.4 | | OpenBSD 7.6 | + | FreeBSD | | | | + | 14.2 | | | | | | | | | FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -908,6 +910,7 @@ FreeBSD 14.1 2024-06-04 [FBD] macOS 15 2024-09-16 [APL] FreeBSD 13.4 2024-09-17 [FBD] OpenBSD 7.6 2024-10-08 [OBD] +FreeBSD 14.2 2024-12-03 [FBD] Bibliography ------------------------ From nobody Mon Dec 23 15:39:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2Jr3Lm8z5WqV3; Mon, 23 Dec 2024 15:39: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 4YH2Jr2wWQz4kPc; Mon, 23 Dec 2024 15:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A0Uu0/lq2PR/stDwJbDlFwrNPv8JUHNG+cKRnHjpxGs=; b=hcvTJHyZXD2rGINcE4Z0s9DddeTmAKxe9/plMN8cQz6PeA903fKZ+cDBSsaTJYs2P5N6r5 DiY0aGOSktQbKNb6xuPnjT8a8o8Cz2/BtN3RBgSx3FBSWQhS4Cgm+K5W0M5957Xv/TSgpH TK4z4u2LJX0+439OJmt9R8vyP4Cgtm6ayInKGEHOawOb7wx/d7sBM2todzsYuoOoPoExfb OioxbIdAr0NPvil/ljcDNd9qIdqXYXOFAfdRa7XHOiZ9QnrZsN8rmkZeUbwqIoJIdAKbSP e8jjkBlgCXAbKZOfsITyariCIORO/wgehlWuCu9dWgfVpEEwnkRbh6HGjh7aqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A0Uu0/lq2PR/stDwJbDlFwrNPv8JUHNG+cKRnHjpxGs=; b=nW0FMN+2M8e8WTBufxvdVvDSggMD5e7vpfrAFBjhehoncyp8cVE1/C9RwIkdGWOSPcFN64 ScPylHoMQVfJW/rP7KfsT5A0gL3Ls5xwW0WSXURhb4tiPDYMaeLPzpIZNhsP349NxUk4IS VtvPJt2eM8VrmqC+Xh8QrLTdd1O78Y0i41nDUYJVAtFIYu3kSuw5m4toqaG8SYcrmpXOyx Xutb7udGxeORQ1x1nEy8inDlshZcnXDJWWISQltDbV68RWS/R1LX3HqpmZYQca1zvXRb0x 8KWQaqcIYVRhejTySV5gC0krXy1pcI+z8fwXqrWD4+OPxBsGtsrsvjmSeNzS8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968396; a=rsa-sha256; cv=none; b=B2JclsRBq7NM3PKOJ3xIY4325RILLVht4NQbRc/qI3+GmWOvTK895EGH3MagrRsJ6NQdeE jPjdPna782VVsfkISZpyMUnMxkNWq2bH8znqmPCu6Lf99FMg/gu88xZUpX+3o9KS1rW4v4 r6stv1A9QoEiTuIwlsQ8tJY3aiZozihoLm6CgHLmWK8ZtROFcb8AIgF5g3xXmk/xkWaydB G/8lMqfuB1+Fwz9OwWtYXFc5FmN/SK1EYdGEk3UXdT/vg6CCwhcFe2bP73dvu9trJoJtgK Ag1YzoPxRiWIiTZkUb1fsvMwADE7+YqSLO2ZpLSpQeH0DzV1xRbwceZkXE/6mA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2Jr2WrHzyfw; Mon, 23 Dec 2024 15:39: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 4BNFduRD092456; Mon, 23 Dec 2024 15:39:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFdumI092453; Mon, 23 Dec 2024 15:39:56 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:39:56 GMT Message-Id: <202412231539.4BNFdumI092453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 14f2a08b2b4c - stable/14 - bsd-family-tree: add NetBSD 10.1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 14f2a08b2b4c1a20ffee6d0ab1c3ef5030291d61 Auto-Submitted: auto-generated The branch stable/14 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=14f2a08b2b4c1a20ffee6d0ab1c3ef5030291d61 commit 14f2a08b2b4c1a20ffee6d0ab1c3ef5030291d61 Author: Sergey A. Osokin AuthorDate: 2024-12-20 02:10:59 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-23 15:39:22 +0000 bsd-family-tree: add NetBSD 10.1 (cherry picked from commit c4ca1d214f9a3d20e9381233314a57526ac9b515) --- share/misc/bsd-family-tree | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index eabcc64eef6e..7cd4b6fe0d3d 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -459,18 +459,20 @@ FreeBSD 5.2 | | | | | | | | | | | | | | | | *--NetBSD | | | | | | | | 10.0 | | | - | | | | | | | | - | | | | | | OpenBSD 7.5 | - | | | | | NetBSD | | - | | | | | 8.3 | | - | FreeBSD | | | | | - | 14.1 | | | | | - | | | macOS | | | - | | | 15 | | | - | | FreeBSD | | | | - | | 13.4 | | OpenBSD 7.6 | - | FreeBSD | | | | - | 14.2 | | | | + | | | | | | | | | + | | | | | | | OpenBSD 7.5 | + | | | | | | NetBSD | | + | | | | | | 8.3 | | + | FreeBSD | | | | | | + | 14.1 | | | | | | + | | | macOS | | | | + | | | 15 | | | | + | | FreeBSD | | | | | + | | 13.4 | | | OpenBSD 7.6 | + | FreeBSD | | | | | + | 14.2 | | | | | + | | | NetBSD | | + | | | 10.1 | | | | | | | FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -911,6 +913,7 @@ macOS 15 2024-09-16 [APL] FreeBSD 13.4 2024-09-17 [FBD] OpenBSD 7.6 2024-10-08 [OBD] FreeBSD 14.2 2024-12-03 [FBD] +NetBSD 10.1 2024-12-16 [NBD] Bibliography ------------------------ From nobody Mon Dec 23 15:41:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2LK2CJxz5Wqgd; Mon, 23 Dec 2024 15:41: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 4YH2LK1dQDz4kvR; Mon, 23 Dec 2024 15:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3t7AndXF+Ft5zrUn0w4KZU1YreElTciHWhThhJQffRo=; b=OD84sHKhQvVJE7RP5QUa9ZIt/DtE2FQ7pmgeiwDS39bym6nxgRSdhinUf7GDaLv7NOKM6Z sd2XyxRfWqMvNrroL/Wf8DRMT1ydoeCq3lhRQE1rD8yX+rGA0AHpI+3qu9X9oa6GhHyt5B TJMuWxiieZripGTfckc1Yfld7Uir8JpMNdgk4A6Z5vM3nDobubnk8ZyHh41YMH6kRofzW5 U9CMxm6BPWa8BTliYeE3ZrC0yrXWGLg07Y+q2GR1aUHNm2KnHy1XlQInEOzkfE2vm9cTs6 oc6+E7XnT4w8tUXhwQMPAZpRK60p4Lno26mbGDpTynaFG89aJ2xh0RgIsENpLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3t7AndXF+Ft5zrUn0w4KZU1YreElTciHWhThhJQffRo=; b=CsHBQpt6jnkmP1Zep0cZSU/3ByHZQwxyd4Psj5lO3FTz+5TZWlHg+Wah14SBQdytAiBu8L Y0yNtawOBVG4WEwtKm+ZrEBN7xpYt16YB/uioNELkxPhCgtXZhlWIAWfrjDCxir4wIeR0u 6P+h+6L/ndcSK+McOZcU0XdUHgZ3HH7fzwAKJT84MLoVeFggwBoaeebkDwbxrpeNR7hegq AhIdRNUC5En84zrIImlWXrr7GWAsjlP62LpOll8HWHvSaEJoOJmhamIYm+oHKSPmzJhcHH gfY15cZyLpkff7TDQSdRcsgEb+ZG0TRUyyvmG9sr+snLEJmzu+0kJfcwFgfbzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968473; a=rsa-sha256; cv=none; b=oEQjN/ffo6Oa7Vypbo+lhmfJ306+A3CJKXhq+75cVl+PrtdC/mwl3xC4uGoIni66V+Is3z jvX/RdSEMentZjPH0yu1ybs5aRIHZLFqJdDSXGOlyTWtfpIVDqSJ2iLhaIXWVX04cXyODl lQbVRxUCRH/Bvw2JG+p58NptCnkMILjD4OnkK1MVFigayV85cyEBvTNTfSrpTO123p/ZAZ 4opGs9oAkYy0L0NhqMsp357K48oVy1J0ti/V0WXhA6QFwvppyuvPJ4JjWKVa2xUKWkVu2E D1yY5bPpi+iJ24BwqSA3f0lIuSQgdXb+WmQLqD77O/cCLWh2oc7482N9Heak4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2LK1DnfzyjS; Mon, 23 Dec 2024 15:41: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 4BNFfDt8003761; Mon, 23 Dec 2024 15:41:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFfDDC003758; Mon, 23 Dec 2024 15:41:13 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:41:13 GMT Message-Id: <202412231541.4BNFfDDC003758@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: c9756953bded - main - inpcb: Further restrict binding to a port owned by a different UID List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9756953bded0d8428027fa3e812c9bdac069252 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c9756953bded0d8428027fa3e812c9bdac069252 commit c9756953bded0d8428027fa3e812c9bdac069252 Author: Mark Johnston AuthorDate: 2024-12-23 15:31:11 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 15:41:06 +0000 inpcb: Further restrict binding to a port owned by a different UID See commit 4f02a7d739b3 for more background. I cannot see a good reason to continue ignoring mismatching UIDs when binding to INADDR_ANY. Looking at the sdr.V2.4a7n sources (mentioned in bugzilla PR 7713), there is a CANT_MCAST_BIND hack wherein the application binds to INADDR_ANY instead of a multicast address, but CANT_MCAST_BIND isn't defined for FreeBSD builds. It seems unlikely that we still have a use-case for allowing sockets from different UIDs to bind to the same port when binding to the unspecified address. And, as noted in D47832, applications like sdr would have been broken by the inverted SO_REUSEPORT check removed in that revision, apparently without any bug reports. Let's break compatibility and simply disallow this case outright. Also, add some comments, remove a hack in a regression test which tests this funtionality, and add a new regression test to exercise the remaining checks that were added in commit 4658dc8325e03. MFC after: 1 month Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D47870 --- sys/netinet/in_pcb.c | 11 ++++- sys/netinet6/in6_pcb.c | 11 ++++- tests/sys/netinet/socket_afinet.c | 86 ++++++++++++++++++++++++++++++++++----- 3 files changed, 94 insertions(+), 14 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 432cae68062a..11bc68a3915a 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -919,13 +919,20 @@ in_pcbbind_avail(struct inpcb *inp, const struct in_addr laddr, if (!IN_MULTICAST(ntohl(laddr.s_addr)) && priv_check_cred(inp->inp_cred, PRIV_NETINET_REUSEPORT) != 0) { + /* + * If a socket owned by a different user is already + * bound to this port, fail. In particular, SO_REUSE* + * can only be used to share a port among sockets owned + * by the same user. + * + * However, we can share a port with a connected socket + * which has a unique 4-tuple. + */ t = in_pcblookup_local(inp->inp_pcbinfo, laddr, lport, INPLOOKUP_WILDCARD, cred); if (t != NULL && (inp->inp_socket->so_type != SOCK_STREAM || in_nullhost(t->inp_faddr)) && - (!in_nullhost(laddr) || - !in_nullhost(t->inp_laddr)) && (inp->inp_cred->cr_uid != t->inp_cred->cr_uid)) return (EADDRINUSE); } diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 51f2a29918fe..b44fe5ed3553 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -239,13 +239,20 @@ in6_pcbbind_avail(struct inpcb *inp, const struct sockaddr_in6 *sin6, if (!IN6_IS_ADDR_MULTICAST(laddr) && priv_check_cred(inp->inp_cred, PRIV_NETINET_REUSEPORT) != 0) { + /* + * If a socket owned by a different user is already + * bound to this port, fail. In particular, SO_REUSE* + * can only be used to share a port among sockets owned + * by the same user. + * + * However, we can share a port with a connected socket + * which has a unique 4-tuple. + */ t = in6_pcblookup_local(inp->inp_pcbinfo, laddr, lport, INPLOOKUP_WILDCARD, cred); if (t != NULL && (inp->inp_socket->so_type != SOCK_STREAM || IN6_IS_ADDR_UNSPECIFIED(&t->in6p_faddr)) && - (!IN6_IS_ADDR_UNSPECIFIED(laddr) || - !IN6_IS_ADDR_UNSPECIFIED(&t->in6p_laddr)) && (inp->inp_cred->cr_uid != t->inp_cred->cr_uid)) return (EADDRINUSE); diff --git a/tests/sys/netinet/socket_afinet.c b/tests/sys/netinet/socket_afinet.c index ba8c03af46a6..6fc98d982602 100644 --- a/tests/sys/netinet/socket_afinet.c +++ b/tests/sys/netinet/socket_afinet.c @@ -337,7 +337,8 @@ ATF_TC_BODY(socket_afinet_bindany, tc) * Returns true if the bind succeeded, and false if it failed with EADDRINUSE. */ static bool -child_bind(const atf_tc_t *tc, int type, struct sockaddr *sa, int opt, bool unpriv) +child_bind(const atf_tc_t *tc, int type, struct sockaddr *sa, int opt, + bool unpriv) { const char *user; pid_t child; @@ -483,16 +484,8 @@ multibind_test(const atf_tc_t *tc, int domain, int type) /* * Multi-binding is only allowed when both * sockets have the same owner. - * - * XXX-MJ we for some reason permit this when - * binding to the unspecified address, but I - * don't think that's right */ - if (flags[flagi] && opts[opti] != 0 && - opts[opti] != SO_REUSEADDR && opti == optj) - ATF_REQUIRE(res); - else - ATF_REQUIRE(!res); + ATF_REQUIRE(!res); } ATF_REQUIRE(close(s) == 0); } @@ -517,6 +510,78 @@ ATF_TC_BODY(socket_afinet_multibind, tc) multibind_test(tc, AF_INET6, SOCK_DGRAM); } +static void +bind_connected_port_test(const atf_tc_t *tc, int domain) +{ + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + struct sockaddr *sinp; + int error, sd[3], tmp; + bool res; + + /* + * Create a connected socket pair. + */ + sd[0] = socket(domain, SOCK_STREAM, 0); + ATF_REQUIRE_MSG(sd[0] >= 0, "socket failed: %s", strerror(errno)); + sd[1] = socket(domain, SOCK_STREAM, 0); + ATF_REQUIRE_MSG(sd[1] >= 0, "socket failed: %s", strerror(errno)); + if (domain == PF_INET) { + memset(&sin, 0, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_len = sizeof(sin); + sin.sin_addr.s_addr = htonl(INADDR_ANY); + sin.sin_port = htons(0); + sinp = (struct sockaddr *)&sin; + } else { + ATF_REQUIRE(domain == PF_INET6); + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_family = AF_INET6; + sin6.sin6_len = sizeof(sin6); + sin6.sin6_addr = in6addr_any; + sin6.sin6_port = htons(0); + sinp = (struct sockaddr *)&sin6; + } + + error = bind(sd[0], sinp, sinp->sa_len); + ATF_REQUIRE_MSG(error == 0, "bind failed: %s", strerror(errno)); + error = listen(sd[0], 1); + ATF_REQUIRE_MSG(error == 0, "listen failed: %s", strerror(errno)); + + error = getsockname(sd[0], sinp, &(socklen_t){ sinp->sa_len }); + ATF_REQUIRE_MSG(error == 0, "getsockname failed: %s", strerror(errno)); + + error = connect(sd[1], sinp, sinp->sa_len); + ATF_REQUIRE_MSG(error == 0, "connect failed: %s", strerror(errno)); + tmp = accept(sd[0], NULL, NULL); + ATF_REQUIRE_MSG(tmp >= 0, "accept failed: %s", strerror(errno)); + ATF_REQUIRE(close(sd[0]) == 0); + sd[0] = tmp; + + /* bind() should succeed even from an unprivileged user. */ + res = child_bind(tc, SOCK_STREAM, sinp, 0, false); + ATF_REQUIRE(!res); + res = child_bind(tc, SOCK_STREAM, sinp, 0, true); + ATF_REQUIRE(!res); +} + +/* + * Normally bind() prevents port stealing by a different user, even when + * SO_REUSE* are specified. However, if the port is bound by a connected + * socket, then it's fair game. + */ +ATF_TC(socket_afinet_bind_connected_port); +ATF_TC_HEAD(socket_afinet_bind_connected_port, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.config", "unprivileged_user"); +} +ATF_TC_BODY(socket_afinet_bind_connected_port, tc) +{ + bind_connected_port_test(tc, AF_INET); + bind_connected_port_test(tc, AF_INET6); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, socket_afinet); @@ -527,6 +592,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, socket_afinet_stream_reconnect); ATF_TP_ADD_TC(tp, socket_afinet_bindany); ATF_TP_ADD_TC(tp, socket_afinet_multibind); + ATF_TP_ADD_TC(tp, socket_afinet_bind_connected_port); return atf_no_error(); } From nobody Mon Dec 23 15:47:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2V66YLnz5Wqsp; Mon, 23 Dec 2024 15:47: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 4YH2V661SLz4m2V; Mon, 23 Dec 2024 15:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJ1gWwx9GT4Xmv6EHxqT1bU9CqIbkIdjCcZuJeEtkj0=; b=D9Kd5i11/M1ccUh6TmKEJbnESkZTugKk0r2KdUknglBWxJtvgtmKPj0WIYMETFcCzOtUCy hF592BPQm/b9ygQObgYjARL2c0dmPV7gW+qJwzCPEZ8HlRdX+X7hoDF1h6Y7GK9D7mDsSe ahwys54M/V5zBiv8PKQqCqWG6GCmi7e228mU7imPfX7lOnWzv6lQw+yBWL4DJ0lubiMnWi wb2vJUilgyPSBeMKHmjn++Sv1qV8pWjpFs/O6AFwMfctIvIN9oZnXUwVAx9tq9RA6bdxNf xdNW5m5zYwny8kiIpICecYF5B+ZnQshGguhhc8KaO03voQGj2Nr4/cttxHH2dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJ1gWwx9GT4Xmv6EHxqT1bU9CqIbkIdjCcZuJeEtkj0=; b=fOTue2tcuuB8x1UnUJ2NtY79Ppb1k0WWP+GBDicwwAXDPoOXnn1kaPwkVP76hwSFgc0+i4 6F/Mif09fXwmhuxeeK7e3GM3nudKV7mEJCi7Q+GOEsmiDTBVoVBHFdekl6FSW5kQyDZCDa pBCJ+jjNB3NbeX0KysjowZEZLnaS+Drr9DCpQV304xDA6mEu/omSyfIcaE4cTQacdAsffe 4B2uJn1RvX6EIKo6roLes/xts5sDlvdi00SOmKLDLf5jb+zAoK7T6NDxfLKNipfKy9MqGk 8z5CZV+BSAeY1eSWqCNjkfOyAzowaAQ90b2dqc0W/yA0wSHYvV6NuJhY8Yk8eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968878; a=rsa-sha256; cv=none; b=dV8H3Uw0+cZK+Y0QiYRiTaXBfdIDnnN80zDWP+2s3eqM87+xLclY48dYeYZkEgjT3tMKjs B3YUKQyaoMhDWeLus8PK0xes7ZmbrRYNXQqpZ2dKUpjW0T8eh1NFAA7lF0pMBhaIoWdPMW OTMfoTbPLLuL6qqJwm3FXQFIY5OPew9Va3Xy10NThPg7JK/aNvAo7yTvADTGy4eaEp4EbW Elz+3aaq3W2JPODLAhF33REIrfP6ehbdV/DKKyy0UIki3Ju5GHyUsobfNo4Kdyf7p0pam+ GkyrIHEPW85l/xM84JOKtKc7Tn26vv8o9Nyo7MH/ZVB/+dkuLkH5vAyFut7/mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2V65cgqz10cF; Mon, 23 Dec 2024 15:47: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 4BNFlwMl010786; Mon, 23 Dec 2024 15:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFlwrn010783; Mon, 23 Dec 2024 15:47:58 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:47:58 GMT Message-Id: <202412231547.4BNFlwrn010783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 57507a240871 - stable/13 - bsd-family-tree: shorter URL for FreeBSD manual pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 57507a2408713f67238c38a28053e493540ace2b Auto-Submitted: auto-generated The branch stable/13 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=57507a2408713f67238c38a28053e493540ace2b commit 57507a2408713f67238c38a28053e493540ace2b Author: Wolfram Schneider AuthorDate: 2024-08-19 19:32:51 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-23 15:43:05 +0000 bsd-family-tree: shorter URL for FreeBSD manual pages (cherry picked from commit 2a916499470ae35178ca218e68175478037c3b0a) --- share/misc/bsd-family-tree | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index a30ad2835676..6b306a76033c 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -934,7 +934,7 @@ FreeBSD Release Information URL: https://www.FreeBSD.org/releases/ Manual pages for FreeBSD and ports -URL: https://www.FreeBSD.org/cgi/man.cgi +URL: https://man.FreeBSD.org UNIX history graphing project URL: https://minnie.tuhs.org/Unix_History/index.html From nobody Mon Dec 23 15:47:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2V80SV2z5WrL8; Mon, 23 Dec 2024 15:48: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 4YH2V770Rhz4lm2; Mon, 23 Dec 2024 15:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=14+mDzsuQA94lIx3sF6h76+382xILuc4uJxCCKYo8nU=; b=lKdBBYqsXOsTVuLf1ixUhQWCUCYRoCeZMKw7QrmnHngwdtx7zxdkGNsJnqb7Zdd55883xM O92z1p5SgJHr2qTiK6lXs1TMgZikN4Zqej5VCOXfSV8hAE1IcoDpgRqAX8NU4C9XMOCuub OkRo5RVhpbvNPwVOxAZZ+q5cMc4EK7DXHO/md9RUD6VJ7AQ/hM0tSYwyrrkY453QDOA8tg sro3o+iiXpesPakcWZhhbjDic94vqnyzCgcGVDkR1WvClDsRBskj03Qp/xtBCNAFGnpeSc jQId1rSK7FdkjJkgpL4AmvjANNDIwqGQMetmogMOn1978PhA9HquR9+j/vZL1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=14+mDzsuQA94lIx3sF6h76+382xILuc4uJxCCKYo8nU=; b=w6H/vVWnbEKYSzw9sSiFRZtlKV3XZfDaLrRkgA/EvVlgNFV1zEMz6gu9a2BOSbO3g+wOSQ dp+uaW9UKakZR3YNARjaZ3mnvbQsjk829gxV5kqhenIlvSoJxlIumaL8IXTGDQlQaQLNNP +Uc2+2sqlm69p1luRaKWzWNjZymCkEA05UPP1pWsUXWpE1SQ+InIgkm2kltQg7ar40pGJA xw3SN62DwBLT6atl5QnG7m+uzY5UazXeXIRK1uE+n45bbt5xOzkNm2+zFYTZ6CFYisFO6E 12RpPvrPV0YtUC0tKOK4ag+XCiKd71fVv8FS6KZpVx4bhY9F0BL2TUdDYFOqiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968880; a=rsa-sha256; cv=none; b=UE9cWP4VUP3YsPZ3SIKrSRcIJQVJT4RG85PluQ3giTXQjVaPsV4Ka/VrjSC4BltKMJ8AN6 +fVGMmVdY/TJoqdmt06rsIvyxsUNhwzUmIuEfYz+UuY2CkchGzt7u7S02ZVPpwEbZ8KWGK Yrr1lOUrFHX8bwaKtK70sqYe21QOqe6g+lrrHy68cBjss1Nc4jN5a6F40phm8pHzFrLe29 72GfDLWHO0AR6qt5nv7yIuVSagdzsGhIpvTp3R2v+awSrNezFJK6T3d5wyhPVj/jOrw9l+ wdNsIw878aF8273VZGG7C83eOSXLJYD5cZMwhHvV0J0+SywfTpqXAJ/56alHag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2V76c16z10cG; Mon, 23 Dec 2024 15:47: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 4BNFlx0Z010832; Mon, 23 Dec 2024 15:47:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFlxVq010829; Mon, 23 Dec 2024 15:47:59 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:47:59 GMT Message-Id: <202412231547.4BNFlxVq010829@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 7a2fc78571c5 - stable/13 - bsd-family-tree: add FreeBSD Documentation Archive List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7a2fc78571c5ecbc697009b6f18cc123734df78c Auto-Submitted: auto-generated The branch stable/13 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=7a2fc78571c5ecbc697009b6f18cc123734df78c commit 7a2fc78571c5ecbc697009b6f18cc123734df78c Author: Wolfram Schneider AuthorDate: 2024-08-19 19:40:34 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-23 15:43:38 +0000 bsd-family-tree: add FreeBSD Documentation Archive (cherry picked from commit 4132c4be4c0a4b80a4ef6f4b8ff0d8ac9a3b9939) --- share/misc/bsd-family-tree | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 6b306a76033c..b466d9b44c64 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -936,6 +936,9 @@ URL: https://www.FreeBSD.org/releases/ Manual pages for FreeBSD and ports URL: https://man.FreeBSD.org +FreeBSD Documentation Archive +URL: https://docs-archive.freebsd.org/doc/ + UNIX history graphing project URL: https://minnie.tuhs.org/Unix_History/index.html From nobody Mon Dec 23 15:48:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2V938zMz5Wqsr; Mon, 23 Dec 2024 15:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH2V90WMFz4lrn; Mon, 23 Dec 2024 15:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UB7CT/CpF+ZRvSMJT5vXCt/vlKMg5pkt19YuiqKZAno=; b=V6L0j6zB8hdVw82+RisBZYGNPaa+q+3yW2ot9HTSwqwkZaGuTqZ7gbldI3yxg5T3PhR4Eo CbaIgc8/l5qr9chRdOCY/kzHr/Semm9IXe73opU4yVMyS/1JSix+lfd3vs04pwKD4I01fu qS3B8Nk2a4gVUCCI2TLP39zXHTkBWhwysGKHUbsHjFQw0J4FVdf+NVV9BWPqCp7IeSZgFM 5iT4kAf9decHK9qDk/yJyU8vk0cp0XhCL2uO2yzjVOA5fJysYL/w8tiN7tSdwB1jGKqxaM BOofwHmNJ5+RBezOiwbMPN32WHoSGdRzY+vswt60rEBLNv3K8aGRxDK4vHpSVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UB7CT/CpF+ZRvSMJT5vXCt/vlKMg5pkt19YuiqKZAno=; b=gvU9JW/vMt2BN8w7MA0sGv0OruuuU49C/SrUcTkwGg7rldpuYinjpRqsYf8CRt068PcQZ6 ri3soweut1lkNfQrFC5yP90/qsUICrXp4VrbCphKF3SWDqBPQlhnyONgGHh2EMQZzyQYB0 yyi1Lx21ShlMww6uX0qDCqQHYpACrJwDjJfwU0PPUB/7o9yZOlyZz95ToGP9B1hFVk6jec FyoJYdrkLXRySGZl1OnemS4iFf8mYoFGFNVbCEcR3ae5Fos1WUMkLPDqegNXqkTjKbKYmh UQDMdV1cl/s6fgBbJovnaWtAxPKPb7ar5QlSOr8zmRntZdoDVZ7J5iTXfXzWLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968881; a=rsa-sha256; cv=none; b=rzkN/EqsyFL/zMkYBF3tzrzJppwW3jd8TKYMVCZY8uDxcy8RzrbVa1j4qQ6E5UzOMbEW6B IbmoCArYjx1IxSjayPGGeyj0IzAAVBQ984DIGnqbcoa2hs1DQbx0vPLkHMrqm6/S2F2+zJ 4MnMmlKooKd1Q0eWjY1qETAbUmpoB57wbFpPJuWwgysFXreKFsgOrYvSsjFiagbs1Sl3vZ 5hoXe9cQTwwqmqjI7/vdcp69nkB7Jt91KBvPeLWhX1l8a6KdD3fUL+5U/v1pYtBALOhG5A ZrB0bxFRrAhYK5O0rh7CmMoOkypYEmIM8AuRgtFWZ/O/mQkXxmr1KPkPWMcqlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2V86xLfz10cH; Mon, 23 Dec 2024 15:48: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 4BNFm07W010886; Mon, 23 Dec 2024 15:48:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFm0V3010883; Mon, 23 Dec 2024 15:48:00 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:48:00 GMT Message-Id: <202412231548.4BNFm0V3010883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 5352a50c8003 - stable/13 - bsd-family-tree: add NetBSD 9.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5352a50c8003693f976c9888b8bcfb0fc19e7d06 Auto-Submitted: auto-generated The branch stable/13 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=5352a50c8003693f976c9888b8bcfb0fc19e7d06 commit 5352a50c8003693f976c9888b8bcfb0fc19e7d06 Author: Wolfram Schneider AuthorDate: 2024-08-20 13:26:46 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-23 15:45:01 +0000 bsd-family-tree: add NetBSD 9.4 (cherry picked from commit d1e78fbd4a67245e058e9d26b333216093f8d2d1) --- share/misc/bsd-family-tree | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index b466d9b44c64..5b5bf87557b8 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -438,23 +438,23 @@ FreeBSD 5.2 | | | | | 13.1 | | | | | | | | | | | | | DragonFly 6.2.2 | | | | | NetBSD 9.3 | | - | | | macOS | OpenBSD 7.2 | - | | | 13 | | | - | | FreeBSD | | | | - | | 12.4 | | | | - | | | | | DragonFly 6.4.0 - | | | | OpenBSD 7.3 | - | FreeBSD | | | | - | 13.2 | | | | - | | | | | | - | `------. | | | | - | | macOS | | | - | | 14 | | | - | | | | OpenBSD 7.4 | - *--FreeBSD | | | | | - | 14.0 | | | | | - | | | | | | | - | | FreeBSD | | | | + | | | macOS | | OpenBSD 7.2 | + | | | 13 | | | | + | | FreeBSD | | | | | + | | 12.4 | | | | | + | | | | | | DragonFly 6.4.0 + | | | | | OpenBSD 7.3 | + | FreeBSD | | | | | + | 13.2 | | | | | + | | | | | | | + | `------. | | | | | + | | macOS | | | | + | | 14 | | | | + | | | | | OpenBSD 7.4 | + *--FreeBSD | | | | | | + | 14.0 | | | | | | + | | | | | | | | + | | FreeBSD | | NetBSD 9.4 | | | | 13.3 | | | | | | | *--NetBSD | | | | | | 10.0 | | @@ -894,6 +894,7 @@ FreeBSD 14.0 2023-11-20 [FBD] FreeBSD 13.3 2024-03-05 [FBD] NetBSD 10.0 2024-03-28 [NBD] OpenBSD 7.5 2024-04-05 [OBD] +NetBSD 9.4 2024-04-20 [NBD] FreeBSD 14.1 2024-06-04 [FBD] Bibliography @@ -959,5 +960,5 @@ original BSD announcements from Usenet or tapes. Steven M. Schultz for providing 2.8BSD, 2.10BSD, 2.11BSD manual pages. -- -Copyright (c) 1997-2012 Wolfram Schneider +Copyright (c) 1997-2024 Wolfram Schneider URL: https://cgit.freebsd.org/src/tree/share/misc/bsd-family-tree From nobody Mon Dec 23 15:48:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2VB32hCz5WrDh; Mon, 23 Dec 2024 15:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH2VB1kD3z4m0b; Mon, 23 Dec 2024 15:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3BUp79o43Jwt2ubO/pxuiMGbBjnd96F8b7arx0UezTQ=; b=rqk7/CN43bqY1gu8+iYrsH/iAirhF6aJXkiOAsq80+ssdJSqpmpluJZI2dgSP5mfeEYJLN Heaw/CTWJMM3VVT9zX933ARctuZtA5w4PLZoW41sqV/722T+kFS6NTy1qpHhcu+1ArWEbg zrj6YRL6r0rw8cMKExd+7L6uRNJBwzW7ax/Gd/nYinFRyQC0BSplbBDbTF4iEZ5PLqNPTe ++OMv1L9sH+u5qn5BgoOL6hY6PKhi9EvdZuPPY8d1jFOQlZLzjO14ZcCfiLnekY3Q1Oxio YLtQjyeN3OK9EerEqfi5ecocSEgE7t3xS4OtNkOytB0kuXjF/Lb7aOj3NqrluA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3BUp79o43Jwt2ubO/pxuiMGbBjnd96F8b7arx0UezTQ=; b=UknC+yNuft1WG4VEQh9t88AuFq+n84Ldmghw8XNQEihnpBGfqsinQL7H8+HmHerZiSOL/u mukpIgiylfSAo3DCKOZ5ECJQjmGPhR/3DC/24gkxcO6PzUvWzsyWNc4U3v6XWFsT7/34or LVVuu3LhN8VPOosrNLRz6cgIC2CEtGgKyko3F/tr1UOmBI4W6+hsJB8IZ1G58nOk7zxaud MSvDD+0fmd7/yF4QMixBQ5YYvye1DcQ8gYw+f50XmKoAnJ0AW/7GDaULoKJ3QfVRKngCRf qYaWqsPCqq+uhiI1BfyCKakjGlsdMwsW8F4HVkKt8jgG/zqJ7gXqN5fYwc48mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968882; a=rsa-sha256; cv=none; b=kh0E9Y33J9tFufVe9j4/svLneluZj8+GrNgOLTNqOp2A4WvQUt6PepPPMttVm8jyHwDhla 8Uq8kosUOBSImtFrryq43j+joIXGudwnH3uOS85IyNYVqks2m2PbzmUsx4LpxX+lgavOQ9 08AY2emVKg0mUr1JGP/O7y8ok4thYCamRn1w/696ZY73cJ88lsOouDsgbX/G6Dh8957drP 7nnJpuXIp8J++53dkizD1/WTQhbDy2gw6cN4cmpqm976afyg9LGVTpbKsN4zN41hmk4MYo t6JfDXqi5K9BoEJ9WN7NvxfpBNATtUMwlMv8xGwRh2EP93V10r4BCzX6DrJt+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2VB16Wxz10Lp; Mon, 23 Dec 2024 15:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNFm2EO010927; Mon, 23 Dec 2024 15:48:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFm2DW010924; Mon, 23 Dec 2024 15:48:02 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:48:02 GMT Message-Id: <202412231548.4BNFm2DW010924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: f971735d62ad - stable/13 - bsd-family-tree: shorter URLs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f971735d62ad44879af869e72aed50fc44ab9d4e Auto-Submitted: auto-generated The branch stable/13 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=f971735d62ad44879af869e72aed50fc44ab9d4e commit f971735d62ad44879af869e72aed50fc44ab9d4e Author: Wolfram Schneider AuthorDate: 2024-08-20 13:29:18 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-23 15:45:27 +0000 bsd-family-tree: shorter URLs (cherry picked from commit d4a4d1e742852b00427f723f59534b42718628de) --- share/misc/bsd-family-tree | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 5b5bf87557b8..c4a7790b773d 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -492,7 +492,7 @@ the announcement in Usenet or if it was available as tape. [QCU] Salus, Peter H. A quarter century of UNIX. ISBN 0201547775, EAN 9780201547771 [SMS] Steven M. Schultz. 2.11BSD, UNIX for the PDP-11. -[TUHS] The Unix Historical Society. https://minnie.tuhs.org/Unix_History/. +[TUHS] The Unix Historical Society. https://minnie.tuhs.org/Unix_History/ [USE] Usenet announcement. [WRS] Wind River Systems, Inc. [dmr] Dennis Ritchie, via E-Mail @@ -941,7 +941,7 @@ FreeBSD Documentation Archive URL: https://docs-archive.freebsd.org/doc/ UNIX history graphing project -URL: https://minnie.tuhs.org/Unix_History/index.html +URL: https://minnie.tuhs.org/Unix_History/ UNIX history URL: https://www.levenez.com/unix/ From nobody Mon Dec 23 15:48:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2VC4HM6z5Wr9j; Mon, 23 Dec 2024 15:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH2VC2cP2z4m37; Mon, 23 Dec 2024 15:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dzM055/ipV23PPz2/JF+iq2ZLujJ+W+TH0T7nVXJ+BE=; b=CiEYbGvpjg48LQtKHpWz2UBPxK/dGaXhPe1Z0OU5s2rNyk7GMYSnIj4k7hO6y8F0GG9bsg tH1a3vATIJSEtLrpBOBftPasphwC9a9mfSRXGEyAqmMUuJLaLS5StLMmgdXFmzfIAETVJW bzlbAg3QHFCpCaHxQUzTI/i4DCKQQNOLf9wZOoPw0/Cc/OJw7vOPvZ2qIYAykxjYdqNF42 qOG286g9kUpDRPylisqQJ6DDXHMcHgR+l3yYJ1KTbck6Cjn2K3hkOhXphIEfpueZS/K2Xw hrclOTMhvSRKJN6LAcignxO/vEcrn3OM6k+n1adeNPAqlNmZdknxIsMQOmjTAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dzM055/ipV23PPz2/JF+iq2ZLujJ+W+TH0T7nVXJ+BE=; b=uHWZt4ein9OVHfyP7DwMbs9b68F+uhrCgk0nluWffro586M1z50ZyqjjHdzQ1swD+NnbB8 2DSVq1DrlH+FPaW4ogej+1Hu8ow/h+2TJjV8xbYukC1iLv87b+hFGMYnVKl7e0GtxzxCki VkO2ATTAGkUYXn0C6iZTi2vK8qQ8aL4XY1TC5x/XYw5fOfBNOa9/80gFPE1vO0muzchSwM Wu1Wx1M7tbrd4JehNvLpSAULMg5gJvU1cseRTwUr0oq6L0vJZWbs/ypk3YUzfVR4ItkoCC 99p15SdQi9o3PAxyaPFqhHGZE261w/L2iBSN8kJx1lv8liJOgOC2jlDue/1iXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968883; a=rsa-sha256; cv=none; b=A8XO+6F2hgiJ1c72eE6jEiN9niZdn5oJlGWQO2muf+eQ4j5BreVW54Vr+wIYLwS8Tip/x2 1EjydShsgWwrKppQCz40ym/vagmygmlI2dD/xn+GRIa6LpwFb0WJy3J6K+6Pk91IY09cCG 6its7LMgFJKNq11P36BqLgEwjQ2pBycOZBv93OdkVrwALRzCNGWuMBKFuOKtZkr2sFstMr YPvCHNtkNGRd5uR8pdGwMGFI1iXQsDQAKvujCUaWSWgjFlWt/ynyXSFAiR+Zp/5UaFxKhk tEXCLxRlGxr4lkKI135fbYWL4L+qRrFxD0gLJFKZdT98SzZvl5b7xfBVwHw3EQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2VC27SGz10Lq; Mon, 23 Dec 2024 15:48: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 4BNFm3Us010976; Mon, 23 Dec 2024 15:48:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFm3g0010973; Mon, 23 Dec 2024 15:48:03 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:48:03 GMT Message-Id: <202412231548.4BNFm3g0010973@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: cd4f81363f68 - stable/13 - bsd-family-tree: fix macOS 11 release date List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cd4f81363f68e8991e22518fb997d3fe24282a99 Auto-Submitted: auto-generated The branch stable/13 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=cd4f81363f68e8991e22518fb997d3fe24282a99 commit cd4f81363f68e8991e22518fb997d3fe24282a99 Author: Wolfram Schneider AuthorDate: 2024-08-20 14:35:29 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-23 15:45:51 +0000 bsd-family-tree: fix macOS 11 release date (cherry picked from commit b49aec04f073de02b03b44503feffeb52cbbdd51) --- share/misc/bsd-family-tree | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index c4a7790b773d..1d8dacf393be 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -868,7 +868,7 @@ DragonFly 5.8.3 2020-09-24 [DFB] OpenBSD 6.8 2020-10-18 [OBD] NetBSD 9.1 2020-10-18 [NBD] FreeBSD 12.2 2020-10-27 [FBD] -macOS 11 2020-11-19 [APL] +macOS 11 2020-11-12 [APL] FreeBSD 13.0 2021-04-13 [FBD] OpenBSD 6.9 2021-05-01 [OBD] DragonFly 6.0 2021-05-08 [DFB] From nobody Mon Dec 23 15:48:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2VD4LHDz5WrR8; Mon, 23 Dec 2024 15:48: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 4YH2VD3NSfz4m3R; Mon, 23 Dec 2024 15:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/z/sfxm0ma8cThCnYvIkb9ZohlV/LR+GkNOf8XnltA=; b=eqX2MwM6uCCoqHEXoAox1uONRp8EZsE4fyeLRsnU79eJIlPjjZvH4eHwepkRuTcgpdoNAe Qk9stemEQm+e1CSPULNwz1H7Y5B3BlG3ijLoi7GHKaoNMdUWuohPpS3lFm5kEubb2uG6QQ ayqgc1Hib6uBLMlyqYkCfdUMQTJdDK3lWfpo+xaw3soJXU8nilO3XpruT6RboE3L6R15Hc HZVydxpB9eVK2c0CfCxFUdwiko9UIaciQObtY3r0lAW86em2wB3ZJjFcJeFOi4y6ygdJFz ugcggmlZN1baVn3mkksCUdT8w3QGKzDlfX5ywzHECA/rEv5RhuWu3V05uzoAhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/z/sfxm0ma8cThCnYvIkb9ZohlV/LR+GkNOf8XnltA=; b=kC68D9Kke/HNCbQqbzeYFWMNC4Ef2hFwRiEUP1WGAAf+x+4vR0LVevHweGCf683pXjLSTD vMDLmqXN5Ves7roelw3vQOiSulGiVSmqYBkpFiRiQG9LzdP7qGHQY5/m23CuoZIwqs/ws0 pqsYeFEVnqn269hGXYUnYPpltnFSbrob8zKxOvQuafV0etTdm5+6iq1IDk78aWXSMi4pYW zPXm1YXXQhRyBFp4WgwkRSOh386gcDkQHiBJNrMzBM9a4QTJ6HikSqpYjP/vGTRIC58RRv QM7VFqO42Hi8UlSJNuxrdHQS3Fk1oMtutTBmpanu95vvfPdcDnHHjdLsgnVuEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968884; a=rsa-sha256; cv=none; b=pGAFGv5sHeoT7eVAgk30SQ7vlM3H8aVrQu3eXXf4WNSYP9JIUtxeUZ6CekJbzX1w2nT/U6 ks8wLFCRekEqHu60tmJu1LVHu/VKlZwvFvrupMQ87rKNRV9bkdmOxw7rNGBodk3mq7gHAK +ajZx3dMEXHNqWXnXU9DzvzMef87F8J8nsu2pug1TJM+hk0wy3dVbheT474rlftrZP16Kn nL/gKzLVX+SD9hdJXIOQibjoc4L9mYkQ6TshjNX5bGS4NMRJ1b1ANIHOmqhdY2/vkMZQJy /Ip28iHaddGjadfDkU0Nhf+nV4CVJfLeM3RmRwVCEH52GU82jQtBbvlD3QqImw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2VD2vHJz109n; Mon, 23 Dec 2024 15:48: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 4BNFm44w011021; Mon, 23 Dec 2024 15:48:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFm4ra011018; Mon, 23 Dec 2024 15:48:04 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:48:04 GMT Message-Id: <202412231548.4BNFm4ra011018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 8377ba3eac4e - stable/13 - bsd-family-tree: NetBSD 8.3 added List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8377ba3eac4eb86a54ba36809bb152e18271237e Auto-Submitted: auto-generated The branch stable/13 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=8377ba3eac4eb86a54ba36809bb152e18271237e commit 8377ba3eac4eb86a54ba36809bb152e18271237e Author: Maxim Konovalov AuthorDate: 2024-08-22 00:29:36 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-23 15:46:17 +0000 bsd-family-tree: NetBSD 8.3 added PR: 280983 (cherry picked from commit d399c791b223953d230423eff1d56fb45a1be77c) --- share/misc/bsd-family-tree | 99 ++++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 1d8dacf393be..0849e883e2c3 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -413,54 +413,56 @@ FreeBSD 5.2 | | | | | | | | | | | | DragonFly 5.6.3 | | | | | | NetBSD | | | | | | | | 8.2 | | - | | | | | | | DragonFly 5.8.1 - | | | | | | OpenBSD 6.7 | - | | FreeBSD | | | | | - | | 11.4 | | | | | - | | | | | | DragonFly 5.8.2 - | | | | | | DragonFly 5.8.3 - | | | | NetBSD 9.1 OpenBSD 6.8 | - | FreeBSD macOS | | | | - | 12.2 11 | | | | - | | | | | | | - | `------. | | | | | - | | | | | | | - *--FreeBSD | | | | | | - | 13.0 | | | NetBSD 9.2 OpenBSD 6.9 DragonFly 6.0.0 - | | | | | | | | - | | | | | | | DragonFly 6.0.1 - | | | | | | | | - | | FreeBSD macOS | | OpenBSD 7.0 | - | | 12.3 12 | | | | - | | | | | | | DragonFly 6.2.1 - | | | | | | OpenBSD 7.1 | - | FreeBSD | | | | | | - | 13.1 | | | | | | - | | | | | | | DragonFly 6.2.2 - | | | | | NetBSD 9.3 | | - | | | macOS | | OpenBSD 7.2 | - | | | 13 | | | | - | | FreeBSD | | | | | - | | 12.4 | | | | | - | | | | | | DragonFly 6.4.0 - | | | | | OpenBSD 7.3 | - | FreeBSD | | | | | - | 13.2 | | | | | - | | | | | | | - | `------. | | | | | - | | macOS | | | | - | | 14 | | | | - | | | | | OpenBSD 7.4 | - *--FreeBSD | | | | | | - | 14.0 | | | | | | - | | | | | | | | - | | FreeBSD | | NetBSD 9.4 | | - | | 13.3 | | | | - | | | *--NetBSD | | - | | | | 10.0 | | - | | | | | | - | | | | OpenBSD 7.5 | - | FreeBSD | | | | + | | | | | | | | DragonFly 5.8.1 + | | | | | | | OpenBSD 6.7 | + | | FreeBSD | | | | | | + | | 11.4 | | | | | | + | | | | | | | DragonFly 5.8.2 + | | | | | | | DragonFly 5.8.3 + | | | | NetBSD | OpenBSD 6.8 | + | FreeBSD macOS | 9.1 | | | + | 12.2 11 | | | | | + | | | | | | | | + | `------. | | | | | | + | | | | | | | | + *--FreeBSD | | | | | | | + | 13.0 | | | NetBSD | OpenBSD 6.9 DragonFly 6.0.0 + | | | | | 9.2 | | | + | | | | | | | | DragonFly 6.0.1 + | | | | | | | | | + | | FreeBSD macOS | | | OpenBSD 7.0 | + | | 12.3 12 | | | | | + | | | | | | | | DragonFly 6.2.1 + | | | | | | | OpenBSD 7.1 | + | FreeBSD | | | | | | | + | 13.1 | | | | | | | + | | | | | | | | DragonFly 6.2.2 + | | | | | NetBSD | | | + | | | macOS | 9.3 | OpenBSD 7.2 | + | | | 13 | | | | | + | | FreeBSD | | | | | | + | | 12.4 | | | | | | + | | | | | | | DragonFly 6.4.0 + | | | | | | OpenBSD 7.3 | + | FreeBSD | | | | | | + | 13.2 | | | | | | + | | | | | | | | + | `------. | | | | | | + | | macOS | | | | | + | | 14 | | | | | + | | | | | | OpenBSD 7.4 | + *--FreeBSD | | | | | | | + | 14.0 | | | | | | | + | | | | | | | | | + | | FreeBSD | | NetBSD | | | + | | 13.3 | | 9.4 | | | + | | | | | | | + | | | *--NetBSD | | | + | | | | 10.0 | | | + | | | | | | | + | | | | | OpenBSD 7.5 | + | | | | NetBSD | | + | FreeBSD | | 8.3 | | | 14.1 | | | | | | | | | FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -current @@ -895,6 +897,7 @@ FreeBSD 13.3 2024-03-05 [FBD] NetBSD 10.0 2024-03-28 [NBD] OpenBSD 7.5 2024-04-05 [OBD] NetBSD 9.4 2024-04-20 [NBD] +NetBSD 8.3 2024-05-04 [NBD] FreeBSD 14.1 2024-06-04 [FBD] Bibliography From nobody Mon Dec 23 15:48:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2VF6vrgz5WrP0; Mon, 23 Dec 2024 15:48: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 4YH2VF4cRmz4m1Z; Mon, 23 Dec 2024 15:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FEB2K9D6Tpb2uRG+aGPYUzhVSDRA9cY3U02gU7TUImg=; b=j+KKCHrNDO4hg+kJS5/I3+PaAxNDOhj+xZV167R5BTO/+3d66Gof7MEf0k69egwHLwNDX3 Qk45Mo7KQRi9R1Xrnf1ot1vyj2cAVPhLHXh+m8qrj2db4rSgcDE/aFaaqakteqA/1hp0lz a+Ajtr/VRiuoSV/6kfcO4IAhSxadnNYb64puiNCTYfOrRfD4JJe2WMdlHY2h9YhV++HVxj 56ty2StCb7lE+7Hc3ZMDDPGSjGNs5HGMyy14TTWtTBvVtvtLNG+ddXwLzBwF+VlGCrIuHm qp4HBnm4axeoBGFgY1CPTf8+ExjOOHs9xImuUenYCyuNlGcP8MUcvHjZdTGGkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FEB2K9D6Tpb2uRG+aGPYUzhVSDRA9cY3U02gU7TUImg=; b=Hv2B/LUVkhbodG8iNsOLSUt7zM77RujOwK0IqtQVESZCfcolwUpKQ5QkrYWiOFOS1oFmg6 G6jSl3eetOgAi5P0YaPVkonUxUECi6sRoRgo4IrRmbYlxritWcBKs5RltuZUFyR6JIElSD OTlzEW5yLLDsw8cbUMBwnWGjWAm7H7by339aSXPu+XP21uQqamUULYG1z9PW8o90ghWEEK +CAd/cORdmC206LN7qQLYOp/31UebiO/Vy7gzbCZbRYddH0LAbXuMuUCS05Zk167TGeuYU tuHVSoAq4OPAgI5yLozgZafQsSaL/B8ID1MLFoBDNUWCGMg7hf2KEqTcle7uhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968885; a=rsa-sha256; cv=none; b=AWcUKEv/8Dg5bxIC0TKRQ1/uHqEN5VPnJUNTJUGW2StQwmPF+MHm1ekYkOGVwjP7X6veNf l4BR/ed+ixJMmUKNMWAtw+XvKnToNtzJFbdRsbpWQsgfhe809+NWwHDShNNr9We89szIpG ++0hXYCTwDxSzrCZOJwL3JFBaZziVZ9GFldcVR0SBEU6VewvHkt/he+JTi2qDimo3to+6L qu/4vUK7prFQByFiuQ/GTIETdRujnRYTnkKa+tLjmUi0VP2+IishrcR/9vJW77Zv3OZdA5 ktndKl2iLHcnIW4sxvlqCHVTUePu2o2ZBFN4YODhVt0A1fYzGvSnOwofoJroAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2VF3tSmz107w; Mon, 23 Dec 2024 15:48: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 4BNFm5Y4011087; Mon, 23 Dec 2024 15:48:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFm5ia011084; Mon, 23 Dec 2024 15:48:05 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:48:05 GMT Message-Id: <202412231548.4BNFm5ia011084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 9e3d32b872f8 - stable/13 - bsd-family-tree: FreeBSD 13.4 and OpenBSD 7.6 added List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9e3d32b872f80894cbb6b7b9367a30bba883ecd9 Auto-Submitted: auto-generated The branch stable/13 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=9e3d32b872f80894cbb6b7b9367a30bba883ecd9 commit 9e3d32b872f80894cbb6b7b9367a30bba883ecd9 Author: Maxim Konovalov AuthorDate: 2024-10-07 21:16:19 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-23 15:46:40 +0000 bsd-family-tree: FreeBSD 13.4 and OpenBSD 7.6 added (cherry picked from commit 3ebb738a93139fd2f8826a62b5f282480f2e19d5) --- share/misc/bsd-family-tree | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 0849e883e2c3..7cc017c6d47d 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -456,14 +456,17 @@ FreeBSD 5.2 | | | | | | | | | | | | | | | FreeBSD | | NetBSD | | | | | 13.3 | | 9.4 | | | - | | | | | | | - | | | *--NetBSD | | | - | | | | 10.0 | | | - | | | | | | | - | | | | | OpenBSD 7.5 | - | | | | NetBSD | | - | FreeBSD | | 8.3 | | - | 14.1 | | | | + | | | | | | | | + | | | | *--NetBSD | | | + | | | | | 10.0 | | | + | | | | | | | | + | | | | | | OpenBSD 7.5 | + | | | | | NetBSD | | + | | | | | 8.3 | | + | FreeBSD | | | | | + | 14.1 | | | | | + | FreeBSD | | | | + | 13.4 | | OpenBSD 7.6 | | | | | | FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -899,6 +902,8 @@ OpenBSD 7.5 2024-04-05 [OBD] NetBSD 9.4 2024-04-20 [NBD] NetBSD 8.3 2024-05-04 [NBD] FreeBSD 14.1 2024-06-04 [FBD] +FreeBSD 13.4 2024-09-17 [FBD] +OpenBSD 7.6 2024-10-08 [OBD] Bibliography ------------------------ From nobody Mon Dec 23 15:48:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2VG6pXZz5WrGP; Mon, 23 Dec 2024 15:48: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 4YH2VG5c74z4mGh; Mon, 23 Dec 2024 15:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lS/KiEPzuR4nb1TqFiWK2m8ntU3pvGLsbFHc9aLiqq8=; b=EZe2PY4g6uEe2UnlFBx2TTK3VrgRdCosYlIS5YsEHKaJXquotQTvmgOt5hSviBMCnAyG3N b4IPEQVkMbEORWX+D95rSZtot7/nzf6WE1oU2vtzjy7HNO9p7JkZ9vfQqpb0yHhxpK0Z5a kawLshQpsCyJQqZW1ByRTrLM4DhztJCknComb202HqQMPN6Zo+NkEOoEnsqXXkmxl4ynWZ dfye7UZLIsm0muK8PsV5uZ7kj2dZLW8hHDdiQtxHeRTNR4u4gvGUXXS3BUPyGsxlkzUky0 vDs7ofDFNl2KkpDmyPEMkm20qwz0ax11Uis+u0KpiiHi8ADz0MyGNT8ghbpsPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lS/KiEPzuR4nb1TqFiWK2m8ntU3pvGLsbFHc9aLiqq8=; b=TB1dIfRwp5HJ0/3Hyr4VEw6vnmhYW/e+be6995twEUxXuR/tmy4zEpa2PrftIKd5jeQdtM /KgAWZuG2V9H/qAqG70ybjsEz4evuDqye/Xrb93B+EnII3BYQwTlPfit0qw2QVrTmwfihI AeOQ0FLYdRulPykkrfZPKS3AVw8MfDs7uD+jQ6tEuWBNBbQpVkLJAiQHPq+D2v0nT4W48Q EeQsElKCOdsTukoB1HnPjpJCkUx/QH65QE+f7ado1KePBFnz5We+PrNsSbteOJWN/rubGt XOnZg+tk80QKmTwN6oLAPuRotueAkxRr1Pzvd75l//URI77HrUbkB2hOG9mL0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968886; a=rsa-sha256; cv=none; b=ueC+krjGJ6zvx0g49K104dyDc99kxwPDhF/9rgGt70t7ohdhnZKX7ETs4iiduwCo+19o65 Jqkl2kM0nb3arYphukqxOJiGQrJJWs0c29Vzs4QKQ5oN3Sc8+Wedw0EvJaQx6r7XlyVp4Q X7C0uCWeABDCt3I6fmJsegyKTxFgZvK2RHPK1Tcc9FMpzMJ98Uvg2h/HZ2XP6pBGTHd3EU xdvP3Lpb+OwlQI1Z3xhYQSyMgkNPP/7vH+SIn251c2TOwK5tvzmfIPcNDC1Ixq+1+alWy9 hHdhNv6qTxETFlKhaMSIpZM8VCSirpY7A99DTYA9iDG46nrXlxL+cKOudUK3kQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2VG5CwSz10Mw; Mon, 23 Dec 2024 15:48: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 4BNFm6FF011133; Mon, 23 Dec 2024 15:48:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFm62x011130; Mon, 23 Dec 2024 15:48:06 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:48:06 GMT Message-Id: <202412231548.4BNFm62x011130@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: a4f31ef63a3b - stable/13 - bsd-family-tree: add macOS 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a4f31ef63a3b3b8b0be675184824a64f5318ccea Auto-Submitted: auto-generated The branch stable/13 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=a4f31ef63a3b3b8b0be675184824a64f5318ccea commit a4f31ef63a3b3b8b0be675184824a64f5318ccea Author: Sergey A. Osokin AuthorDate: 2024-10-16 00:52:01 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-23 15:47:02 +0000 bsd-family-tree: add macOS 15 While I'm here fix whitespaces for recent OpenBSD releases. (cherry picked from commit bdbf50660c51534d7a25569349bcdf2d4e460f50) --- share/misc/bsd-family-tree | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 7cc017c6d47d..98f49d3989db 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -465,6 +465,8 @@ FreeBSD 5.2 | | | | | | | | | 8.3 | | | FreeBSD | | | | | | 14.1 | | | | | + | | macOS | | | + | | 15 | | | | FreeBSD | | | | | 13.4 | | OpenBSD 7.6 | | | | | | @@ -898,12 +900,13 @@ OpenBSD 7.4 2023-10-16 [OBD] FreeBSD 14.0 2023-11-20 [FBD] FreeBSD 13.3 2024-03-05 [FBD] NetBSD 10.0 2024-03-28 [NBD] -OpenBSD 7.5 2024-04-05 [OBD] +OpenBSD 7.5 2024-04-05 [OBD] NetBSD 9.4 2024-04-20 [NBD] NetBSD 8.3 2024-05-04 [NBD] FreeBSD 14.1 2024-06-04 [FBD] +macOS 15 2024-09-16 [APL] FreeBSD 13.4 2024-09-17 [FBD] -OpenBSD 7.6 2024-10-08 [OBD] +OpenBSD 7.6 2024-10-08 [OBD] Bibliography ------------------------ From nobody Mon Dec 23 15:48:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2VJ2TPlz5WrGQ; Mon, 23 Dec 2024 15:48: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 4YH2VH6XWSz4m4K; Mon, 23 Dec 2024 15:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDBuOdYTWKEjU3odAi2f/0qd+XL/RwOaQ9kestoFPts=; b=ADwOWEU8VVOyc2/HvcoYsnwMkYTuzvJhJxq0n66cBGZ/zKQNMwfkTtO90iEDOWh3dNXYZq n4TLPXpdTaNG5bgRBVzSNoiRJd9RzzZe0NPYEPgQi46hrAeEAT8DQPPNYZZu0Uwy4WIwj6 L0Zsgx+nLpdM6BVTff0sH5MuF3aZzYzFHvxONg9Wv28RKBcKUV4ZXtVnAit7jwgenNjCUT ri36L2Ua2VMbLY/SxYVi1yZYTCRfGsFAQZ1EsgWzFMrHQFv+PddehiXiFBlntLgZ5r4WJg 7yUEjgO0vq5DJL2z9SgQSi30AK9P1U8QzQQyvmfJpXownxpCSBN+4IugIjZnzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDBuOdYTWKEjU3odAi2f/0qd+XL/RwOaQ9kestoFPts=; b=auzTI+LwRw/q20kggATMp0IGcjYu29q3RfEW22nS+ithdMXv/m014gijgW1n/7RPjZlMbn 7UJd+FTd8jBuH3Y+2ezmAcWs9xnQ/KOIBjWRQSjBB1rya/W5vXfqnMra1dW08iRqm23NCY zT9kPnZUXSnbUHdeOMKa3BhEbu4Tbal+geCEChWwE6Etva+h9C5VRHmlxLFRS3XOdKXxuj 8VI2xWqcX/o9DJSK9T3rqyV+lOT2OLqPQGKC0eoMXT/mmN5dm4Iu21cpMHRp0N6M9B8ufN wO//8SYr5HOBM07IK6UTfrF7HLQUSI4ERHVfMRuaDp0WlVavAQInG61/uoITKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968887; a=rsa-sha256; cv=none; b=oODwfqZ0MH4G/WLQAHQiR7rpZrCJAVuqgzee5sBgCWDy75aqBNyeUVQBdfZJE1+mfNpeEg rOlMYprbC/HN4SIi4UwaP+9S2tEJXESXaJEHan0K5YR7lRwLU24ejjlS4xq8DfTpe8ybN6 W2r8ipc+8Osvo8AcScEH2a/x/oEp/po6GUUzhDPhRgv6BlwACG8ViORVUkts1JeBwExakL 7ody4p81N0NtY+WETvJvSN7lRAgU+jYC82rxq/zOpkEKmQeD0RemlzsyUy/1t+go0/g0K+ SKjdXZKEuJHERZGsd5B0/1o57JyBP9DDSsaj8wu1sdO3bNp017cAe5eh4O79cA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2VH696qz109p; Mon, 23 Dec 2024 15:48: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 4BNFm7FW011177; Mon, 23 Dec 2024 15:48:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFm7s4011174; Mon, 23 Dec 2024 15:48:07 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:48:07 GMT Message-Id: <202412231548.4BNFm7s4011174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 0a5dea714e94 - stable/13 - bsd-family-tree: add FreeBSD 14.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0a5dea714e94bbe78b4303d1ce10e63e3aca9bfc Auto-Submitted: auto-generated The branch stable/13 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=0a5dea714e94bbe78b4303d1ce10e63e3aca9bfc commit 0a5dea714e94bbe78b4303d1ce10e63e3aca9bfc Author: Maxim Konovalov AuthorDate: 2024-12-11 19:31:25 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-23 15:47:23 +0000 bsd-family-tree: add FreeBSD 14.2 (cherry picked from commit ac3dedf4e8e08647a2c08e75f1ef69d8bb2831e6) --- share/misc/bsd-family-tree | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 98f49d3989db..dab6d5a1f77d 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -465,10 +465,12 @@ FreeBSD 5.2 | | | | | | | | | 8.3 | | | FreeBSD | | | | | | 14.1 | | | | | - | | macOS | | | - | | 15 | | | - | FreeBSD | | | | - | 13.4 | | OpenBSD 7.6 | + | | | macOS | | | + | | | 15 | | | + | | FreeBSD | | | | + | | 13.4 | | OpenBSD 7.6 | + | FreeBSD | | | | + | 14.2 | | | | | | | | | FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -907,6 +909,7 @@ FreeBSD 14.1 2024-06-04 [FBD] macOS 15 2024-09-16 [APL] FreeBSD 13.4 2024-09-17 [FBD] OpenBSD 7.6 2024-10-08 [OBD] +FreeBSD 14.2 2024-12-03 [FBD] Bibliography ------------------------ From nobody Mon Dec 23 15:48:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2VK1wxCz5WrPC; Mon, 23 Dec 2024 15:48:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH2VK07pqz4mF8; Mon, 23 Dec 2024 15:48:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MSvTKRbGY8O0h6TPCJ1hhcmzUrdQ3B3DJLdD7OKq6ok=; b=yb1WbMSk6znu9DUy/bjJqmZn/234NQv+wQdDW/u+fXE4poQhUHSpSKIUxhNvXYehNibE3g KOLCjbiNdtm0checkZrRs1SaJ23PXGXql+goidD2IpQ8WtZWAk9hr9dN3hmtmwmYlKL1o7 Uq0yBQyrRfDz3494hCMg/wApR7eobNHkH4zlPWGCAnmmI5cdl3d6X4ux07E9VT5ZThb7FT U2V1TBRQPF+7Tp5TlQaFcPwxwCDdv9FIn0abgCioQv4lw7cv5O4u5YpUbFfLpi7KUa2+Dc hcAAkReqh4c9miWUAWXRFxwEzKO6RjSWo7IT7y6g4uQmC2LZ9juqEcZ0pmtYNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MSvTKRbGY8O0h6TPCJ1hhcmzUrdQ3B3DJLdD7OKq6ok=; b=IV0ieF4kuGYYDoGfvsJmiL5I9yrxYQTKHNqI1ZmPuC3bxqNLNLsE3StLqF40L9u6rykAQW gKIfNPM+tEWOCVlfYYJJRQ6WhWNJxT3Au6aO4anMicoMUOrVEAM358NOz7xQoDnAfQ7C3a hiRMMNjP5/wILM5Q7BJgukEZhzIGkJPl46lutd2KxY1luLXxHsRKtFAFQJAfxXgr/Bcsei lzx/x7qmw+js8qcgpuuwWCHjRRcL0LBvCXnMGr1MdEYPwUmqUAX8vWeDId90BiBgaOh7T/ cI5JDO2cbwvSruhr8ZSvm4PUDPa98zzqMqQW1eIcNLfINl2uBogVHHtDflR66g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968889; a=rsa-sha256; cv=none; b=SO8vs1KzXTTfVzV17sHliUSSdeCp0/T0ki84ZBf1Hz3eDIPhySXX4r7xvAEzPJsq6rJ6yC +Swma6x8n37EjbhYly/5Vi9wyCdp7AM2+7BT2ij+ClDHWwL74NHU1Sk45q3PqbcYxAIH/X rhq5s5j6mzmzOGHx3hz6dqChcEE1W1/u0/rvj35OA1ndW3XEzpzaNMbks9EmPagm8cXq0A 5JTk6y/IM9hxEwXy+Uc0C6IEvz+PMiaRvhcrtlH+gclHnOubAef7iGTyCJHiZvDFQfSTh8 lXdkTmtWwo/5q0rzVjXVCf6bS5u98NyzNT9FgrqQey/KyXZVpMgZ4RFfO+uabQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2VJ6qSMz109q; Mon, 23 Dec 2024 15:48: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 4BNFm8V5011219; Mon, 23 Dec 2024 15:48:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFm8vM011216; Mon, 23 Dec 2024 15:48:08 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:48:08 GMT Message-Id: <202412231548.4BNFm8vM011216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 37d6a8531bbf - stable/13 - bsd-family-tree: add NetBSD 10.1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 37d6a8531bbf026d9ec54869893c4f6e485208bd Auto-Submitted: auto-generated The branch stable/13 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=37d6a8531bbf026d9ec54869893c4f6e485208bd commit 37d6a8531bbf026d9ec54869893c4f6e485208bd Author: Sergey A. Osokin AuthorDate: 2024-12-20 02:10:59 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-23 15:47:39 +0000 bsd-family-tree: add NetBSD 10.1 (cherry picked from commit c4ca1d214f9a3d20e9381233314a57526ac9b515) --- share/misc/bsd-family-tree | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index dab6d5a1f77d..63a5b6eb1069 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -459,18 +459,20 @@ FreeBSD 5.2 | | | | | | | | | | | | | | | | *--NetBSD | | | | | | | | 10.0 | | | - | | | | | | | | - | | | | | | OpenBSD 7.5 | - | | | | | NetBSD | | - | | | | | 8.3 | | - | FreeBSD | | | | | - | 14.1 | | | | | - | | | macOS | | | - | | | 15 | | | - | | FreeBSD | | | | - | | 13.4 | | OpenBSD 7.6 | - | FreeBSD | | | | - | 14.2 | | | | + | | | | | | | | | + | | | | | | | OpenBSD 7.5 | + | | | | | | NetBSD | | + | | | | | | 8.3 | | + | FreeBSD | | | | | | + | 14.1 | | | | | | + | | | macOS | | | | + | | | 15 | | | | + | | FreeBSD | | | | | + | | 13.4 | | | OpenBSD 7.6 | + | FreeBSD | | | | | + | 14.2 | | | | | + | | | NetBSD | | + | | | 10.1 | | | | | | | FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -910,6 +912,7 @@ macOS 15 2024-09-16 [APL] FreeBSD 13.4 2024-09-17 [FBD] OpenBSD 7.6 2024-10-08 [OBD] FreeBSD 14.2 2024-12-03 [FBD] +NetBSD 10.1 2024-12-16 [NBD] Bibliography ------------------------ From nobody Mon Dec 23 15:49:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2XJ33nCz5WrHC; Mon, 23 Dec 2024 15:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH2XJ191xz4pY6; Mon, 23 Dec 2024 15:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fWlCKHCIbs3BelB1kd2kBq9QZuO2G+TbPPggT1Qqq5k=; b=Tdz6hs4H8514CeHfQVbtn2Lxxbp3SqrEc1bweSxnAfjBmcFWEOVOD/r6w7FuMRYRsFVnGB FzV6pPEObAAcVta4sS2mxKArNpV9aPENmyOFRUyU7Uc+BCv9PoDRclV2cTRs9V7qQuH5Pv 0raUe86nh7cqAHsMSfPYKo4iEW2b9krsyD6CDQmg0E6frqLQisFLhjSebjhYS6SKuzZWsC WFjddGM0QyAO/kqRv1DkWg4rEHwXISOjlPELkwbWP+sWXNLb0GsYD/F/0QRvMRLl5Fbv3I /X/2NQjkkX5TGnHbGdS7NFs9V+n/BhimIfekGigqWZQmEvcSg4QpBrHA2wjqkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fWlCKHCIbs3BelB1kd2kBq9QZuO2G+TbPPggT1Qqq5k=; b=ypMUyPNQMdrdKpPMA4BrqZ4V6ccalFVExZB2Y7TXuSCuMOM0PKOgQWzCpyvIS7YQGR+O/U D1k3Q7em+tbJ05SOijBQw2br70WSln98e2Uy0YXtEKRU/9z4CEmGpQiHnIFnIp7gNvnqfp ExGuz/QJDqcQN2k8b+3EjBPM0xBaKIUHTwawE3Rww7z5+W/g9NSdiOcQdhtqkXtE8Hl/ed 0XR+E9qWe7nhvaJRG8TvrnQhhuGNKPeR4BxeJTUu/LvoceT5d0++iV6v1hoipY+SVfGogP xQa8BJ53QbBoWoDwsotOIzZF4Lp5YUaHbv+VQmMqnjB0hUYCH3eTsaZAI+4mqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968992; a=rsa-sha256; cv=none; b=q2A1GL5Axz/t/raz58iTo8oPD4B25u/HX0coJ//ZaGKglV+0+Nb5AnjJZi9yGNbDDxEaZC BG9PQIJOeUSoY/iLGMHXIMP7Sj+uTBmU858H3KXGgTulYbd9rQqbFUiqyv8II6xOMHEV87 Fc6i700G2sveXKrOCwjKTRDGSGUx39P4TOglJZXatKsvKbYr6QO/A7JPRXB3mH1epatPyg WkaJjDxMsaWWk7zpO/CaiELzb65IbxSdfCCVnrAvrJ9hylx07aQRcFFDup1PPKDIbZSpTn vvNme5JyBWJ4JeyJF7Rq+U9YUxIwgF45EwTf8tIaRfNYaPu3DA9/h53aRO/6DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2XH4yrlz10Lt; Mon, 23 Dec 2024 15:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNFnpEh011887; Mon, 23 Dec 2024 15:49:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFnpkJ011884; Mon, 23 Dec 2024 15:49:51 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:49:51 GMT Message-Id: <202412231549.4BNFnpkJ011884@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: aa94868f5e9a - main - syslogd: Remove is_exclusive metadata from tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa94868f5e9a5998c3277755ac7d4cc19dcd3a25 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aa94868f5e9a5998c3277755ac7d4cc19dcd3a25 commit aa94868f5e9a5998c3277755ac7d4cc19dcd3a25 Author: Michal Scigocki AuthorDate: 2024-12-23 02:53:36 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 15:44:17 +0000 syslogd: Remove is_exclusive metadata from tests - Tests have been updated to use "jail" execution environment, is_exclusive="true" is no longer required. - tests/Makefile update to style.Makefile(5). Reviewed by: markj MFC after: 3 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1536 --- usr.sbin/syslogd/tests/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/usr.sbin/syslogd/tests/Makefile b/usr.sbin/syslogd/tests/Makefile index 30972d3fced5..c60709b0531d 100644 --- a/usr.sbin/syslogd/tests/Makefile +++ b/usr.sbin/syslogd/tests/Makefile @@ -1,9 +1,7 @@ -ATF_TESTS_SH+= syslogd_test +ATF_TESTS_SH= syslogd_test # Run in jail with new vnet so we don't need to worry about address conflicts -TEST_METADATA+= execenv="jail" -TEST_METADATA+= execenv_jail_params="vnet=new" -# Several syslogd listening on the same port prevent parallel operation -TEST_METADATA+= is_exclusive="true" -TEST_METADATA+= timeout=20 +TEST_METADATA= execenv="jail" \ + execenv_jail_params="vnet=new" + timeout=20 .include From nobody Mon Dec 23 15:49:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2XK2Ppbz5WqtM; Mon, 23 Dec 2024 15:49: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 4YH2XK0Dwbz4phQ; Mon, 23 Dec 2024 15:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqKd2dOc+snxAVVQvp3qscIviNEVosyT9eTUrG21CJA=; b=Stk2r6Vpm61/Sz28Wj727/C5cXff5D8hPLOnfvtFo3bZnMlQBsE0Q/90sQJ+x+JXkhdfoy xGNzWSG+wcsNmB/BycupcvKMNuJ4YZPccNjCdS1sg0pUN0XEuT0URvAb+MRjsfe701VN/b kPBgFvAqyAP/Ssav6V9Ds+4WRp7BDc/8WSMv16/ajStSnyTNJWpqpLuM8JQZDuRS7b0ywd lN3zdN9swQUT9zbMXgbvUeTHvsbFgtmSXpyaFwm90L42VQ//NuM+XtWlAfPfnHQBPZV5tf U0wmsppBnEYHpqiSHD9pZGpIRTGtSps6qMa38CJdIyHIg8xKQJoV8QPwSkrXwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqKd2dOc+snxAVVQvp3qscIviNEVosyT9eTUrG21CJA=; b=laiLfBmZkAjKgcCtegu0xLElmWnnKRXDdQvmfNx/JIP/pVcgwU1Q4Ysw9Uvrnb8igyXW0s 2UXX5lakLBgabzI0B8vlooyLN9HTMgZrgifdn+1hecld0+qGOqsfYhvHcLCUIxpVaKO4CX Za6nURH2kS+Gi/KR8Ilm0lZymuD+HQUqKeNU1YgaCpJsYRYX154hnU5UqoBjg6E2utkH1R 7il6YqfjE1NYwJ7VKGj34Ty2A0gQphRFBm8upJ8UPd9gEZm+f6TkqQSSqOw+klFogC1yZg NEEBRxuVSuZF5uWpESy33iDnq96ksf7DrN851i9v287NWIjwa5qj/dz/sPnT+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968993; a=rsa-sha256; cv=none; b=qQQDtVr/3vUH6fOq1NWyOph7aFSV9aBzOMLVMCY3bYI7ikn+rwENufrxCgotJtrLJft4BD DGTj4o61NtQ4vu/8wqsRztaBQGUmn3m8PjCxD08q/moNmKz3owc+WM/+puku1QuE9ak3OI XLnzD0/NlYsbPb0vfUDtjr1uIFwg+99YrNvQrN3Uu5up7EC4QUVBuUZx9AJ+ebq0i1ocpk qM2OBAqtSeIHDpucYPXXN+OBBH9+xjNfHD/pF7ywZ9dVizEOnNb+qblm7HiUAZ78S3sTKu n8hb4BhtElvwPk7ze8QG2egkQheZRgUyqEQ3nfrf9ymdVgO6u89oXHqbf5Bd5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2XJ6fx8z107x; Mon, 23 Dec 2024 15:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNFnqrH011942; Mon, 23 Dec 2024 15:49:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFnqRJ011939; Mon, 23 Dec 2024 15:49:52 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:49:52 GMT Message-Id: <202412231549.4BNFnqRJ011939@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: 66a022a30dd9 - main - syslogd: Add syslog basic message format tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66a022a30dd968631c64b73e473dd16589592fad Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=66a022a30dd968631c64b73e473dd16589592fad commit 66a022a30dd968631c64b73e473dd16589592fad Author: Michal Scigocki AuthorDate: 2024-12-23 02:53:51 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 15:45:12 +0000 syslogd: Add syslog basic message format tests RFC 3164 and RFC 5424 syslog message format tests and minor refactor of existing tests to reuse components in new tests. Reviewed by: markj MFC after: 3 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1536 --- usr.sbin/syslogd/tests/Makefile | 11 +- .../syslogd/tests/syslogd_basic_format_test.sh | 111 +++++++++++++++++++ .../syslogd/tests/syslogd_format_test_common.sh | 32 ++++++ usr.sbin/syslogd/tests/syslogd_test.sh | 105 +----------------- usr.sbin/syslogd/tests/syslogd_test_common.sh | 117 +++++++++++++++++++++ 5 files changed, 270 insertions(+), 106 deletions(-) diff --git a/usr.sbin/syslogd/tests/Makefile b/usr.sbin/syslogd/tests/Makefile index c60709b0531d..65d08d75fcd1 100644 --- a/usr.sbin/syslogd/tests/Makefile +++ b/usr.sbin/syslogd/tests/Makefile @@ -1,7 +1,14 @@ -ATF_TESTS_SH= syslogd_test +PACKAGE= tests + +ATF_TESTS_SH= syslogd_basic_format_test \ + syslogd_test + # Run in jail with new vnet so we don't need to worry about address conflicts TEST_METADATA= execenv="jail" \ - execenv_jail_params="vnet=new" + execenv_jail_params="vnet=new" \ timeout=20 +${PACKAGE}FILES=syslogd_format_test_common.sh \ + syslogd_test_common.sh + .include diff --git a/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh new file mode 100644 index 000000000000..7ee7cd0e1e91 --- /dev/null +++ b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh @@ -0,0 +1,111 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Michal Scigocki +# + +. $(atf_get_srcdir)/syslogd_test_common.sh +. $(atf_get_srcdir)/syslogd_format_test_common.sh + +# Basic format tests +# Single server, logging to local socket (inet disabled) +setup_basic_format_test() +{ + local format="$1" + local logfile="$2" + + printf "user.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + + syslogd_start \ + -O "${format}" \ + -N \ + -ss + + syslogd_log -p user.debug -t "${TAG}" \ + -h "${SYSLOGD_LOCAL_SOCKET}" \ + -H "${HOSTNAME}" "${MSG}" +} + +atf_test_case "O_flag_bsd_basic" "cleanup" +O_flag_bsd_basic_head() +{ + atf_set descr "bsd format test on local syslog message" +} +O_flag_bsd_basic_body() +{ + local format="bsd" + local logfile="${PWD}/O_flag_${format}_basic.log" + + setup_basic_format_test "${format}" "${logfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" +} +O_flag_bsd_basic_cleanup() +{ + syslogd_stop +} + +atf_test_case "O_flag_rfc3164_basic" "cleanup" +O_flag_rfc3164_basic_head() +{ + atf_set descr "rfc3164 format test on local syslog message" +} +O_flag_rfc3164_basic_body() +{ + local format="rfc3164" + local logfile="${PWD}/O_flag_${format}_basic.log" + + setup_basic_format_test "${format}" "${logfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" +} +O_flag_rfc3164_basic_cleanup() +{ + syslogd_stop +} + +atf_test_case "O_flag_syslog_basic" "cleanup" +O_flag_syslog_basic_head() +{ + atf_set descr "syslog format test on local syslog message" +} +O_flag_syslog_basic_body() +{ + local format="syslog" + local logfile="${PWD}/O_flag_${format}_basic.log" + + setup_basic_format_test "${format}" "${logfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" +} +O_flag_syslog_basic_cleanup() +{ + syslogd_stop +} + +atf_test_case "O_flag_rfc5424_basic" "cleanup" +O_flag_rfc5424_basic_head() +{ + atf_set descr "rfc5424 format test on local syslog message" +} +O_flag_rfc5424_basic_body() +{ + local format="rfc5424" + local logfile="${PWD}/O_flag_${format}_basic.log" + + setup_basic_format_test "${format}" "${logfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" +} +O_flag_rfc5424_basic_cleanup() +{ + syslogd_stop +} + +atf_init_test_cases() +{ + atf_add_test_case "O_flag_bsd_basic" + atf_add_test_case "O_flag_rfc3164_basic" + atf_add_test_case "O_flag_syslog_basic" + atf_add_test_case "O_flag_rfc5424_basic" +} diff --git a/usr.sbin/syslogd/tests/syslogd_format_test_common.sh b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh new file mode 100644 index 000000000000..199fb746839c --- /dev/null +++ b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh @@ -0,0 +1,32 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Michal Scigocki +# + +# REGEX Components +readonly PRI="<15>" +readonly VERSION="1" +readonly DATE_RFC3164="[A-Z][a-z]{2} [ 1-3][0-9]" +readonly TIMESPEC_RFC5424="([:TZ0-9\.\+\-]{20,32}|\-)" # Simplified TIMESPEC +readonly TIME_RFC3164="([0-9]{2}:){2}[0-9]{2}" +readonly HOSTNAME="example.test" +readonly HOSTNAME_REGEX="example\.test" +readonly TAG="test_tag" +readonly MSG="test_log_message" + +# Test REGEX +# Dec 2 15:55:00 example.test test_tag: test_log_message +readonly REGEX_RFC3164="${DATE_RFC3164} ${TIME_RFC3164} ${HOSTNAME_REGEX} ${TAG}: ${MSG}" +readonly REGEX_RFC3164_LOGFILE="^${REGEX_RFC3164}$" +readonly REGEX_RFC3164_PAYLOAD="${PRI}${REGEX_RFC3164}$" + +# Dec 2 15:55:00 Forwarded from example.test: test_tag: test_log_message +readonly REGEX_RFC3164_LEGACY="${DATE_RFC3164} ${TIME_RFC3164} Forwarded from ${HOSTNAME_REGEX}: ${TAG}: ${MSG}" +readonly REGEX_RFC3164_LEGACY_LOGFILE="^${REGEX_RFC3164_LEGACY}$" +readonly REGEX_RFC3164_LEGACY_PAYLOAD="${PRI}${REGEX_RFC3164_LEGACY}$" + +# <15>1 2024-12-02T15:55:00.000000+00:00 example.test test_tag - - - test_log_message +readonly REGEX_RFC5424="${PRI}${VERSION} ${TIMESPEC_RFC5424} ${HOSTNAME_REGEX} ${TAG} - - - ${MSG}" +readonly REGEX_RFC5424_LOGFILE="^${REGEX_RFC5424}$" +readonly REGEX_RFC5424_PAYLOAD="${REGEX_RFC5424}$" diff --git a/usr.sbin/syslogd/tests/syslogd_test.sh b/usr.sbin/syslogd/tests/syslogd_test.sh index e75c85d5995a..51c3a5fca1c6 100644 --- a/usr.sbin/syslogd/tests/syslogd_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_test.sh @@ -13,110 +13,7 @@ # Tests to-do: # actions: users -readonly SYSLOGD_UDP_PORT="5140" -readonly SYSLOGD_CONFIG="${PWD}/syslog.conf" -readonly SYSLOGD_LOCAL_SOCKET="${PWD}/log.sock" -readonly SYSLOGD_PIDFILE="${PWD}/syslogd.pid" -readonly SYSLOGD_LOCAL_PRIVSOCKET="${PWD}/logpriv.sock" - -# Start a private syslogd instance. -syslogd_start() -{ - local jail bind_addr conf_file pid_file socket privsocket - local opt next other_args - - # Setup loopback so we can deliver messages to ourself. - atf_check ifconfig lo0 inet 127.0.0.1/16 - - OPTIND=1 - while getopts ":b:f:j:P:p:S:" opt; do - case "${opt}" in - b) - bind_addr="${OPTARG}" - ;; - f) - conf_file="${OPTARG}" - ;; - j) - jail="jexec ${OPTARG}" - ;; - P) - pid_file="${OPTARG}" - ;; - p) - socket="${OPTARG}" - ;; - S) - privsocket="${OPTARG}" - ;; - ?) - opt="${OPTARG}" - next="$(eval echo \${${OPTIND}})" - - case "${next}" in - -* | "") - other_args="${other_args} -${opt}" - shift $((OPTIND - 1)) - ;; - *) - other_args="${other_args} -${opt} ${next}" - shift ${OPTIND} - ;; - esac - - # Tell getopts to continue parsing. - OPTIND=1 - ;; - :) - atf_fail "The -${OPTARG} flag requires an argument" - ;; - esac - done - - $jail syslogd \ - -b "${bind_addr:-":${SYSLOGD_UDP_PORT}"}" \ - -C \ - -d \ - -f "${conf_file:-${SYSLOGD_CONFIG}}" \ - -H \ - -P "${pid_file:-${SYSLOGD_PIDFILE}}" \ - -p "${socket:-${SYSLOGD_LOCAL_SOCKET}}" \ - -S "${privsocket:-${SYSLOGD_LOCAL_PRIVSOCKET}}" \ - ${other_args} \ - & - - # Give syslogd a bit of time to spin up. - while [ "$((i+=1))" -le 20 ]; do - [ -S "${socket:-${SYSLOGD_LOCAL_SOCKET}}" ] && return - sleep 0.1 - done - atf_fail "timed out waiting for syslogd to start" -} - -# Simple logger(1) wrapper. -syslogd_log() -{ - atf_check -s exit:0 -o empty -e empty logger $* -} - -# Make syslogd reload its configuration file. -syslogd_reload() -{ - pkill -HUP -F "${1:-${SYSLOGD_PIDFILE}}" -} - -# Stop a private syslogd instance. -syslogd_stop() -{ - local pid_file="${1:-${SYSLOGD_PIDFILE}}" - - pid=$(cat "${pid_file}") - if pkill -F "${pid_file}"; then - wait "${pid}" - rm -f "${pid_file}" "${2:-${SYSLOGD_LOCAL_SOCKET}}" \ - "${3:-${SYSLOGD_LOCAL_PRIVSOCKET}}" - fi -} +. $(atf_get_srcdir)/syslogd_test_common.sh atf_test_case "unix" "cleanup" unix_head() diff --git a/usr.sbin/syslogd/tests/syslogd_test_common.sh b/usr.sbin/syslogd/tests/syslogd_test_common.sh new file mode 100644 index 000000000000..a764ebfb0e24 --- /dev/null +++ b/usr.sbin/syslogd/tests/syslogd_test_common.sh @@ -0,0 +1,117 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2021, 2023 The FreeBSD Foundation +# +# This software was developed by Mark Johnston under sponsorship from +# the FreeBSD Foundation. +# +# This software was developed by Jake Freeland under sponsorship from +# the FreeBSD Foundation. +# + +readonly SYSLOGD_UDP_PORT="5140" +readonly SYSLOGD_CONFIG="${PWD}/syslog.conf" +readonly SYSLOGD_LOCAL_SOCKET="${PWD}/log.sock" +readonly SYSLOGD_PIDFILE="${PWD}/syslogd.pid" +readonly SYSLOGD_LOCAL_PRIVSOCKET="${PWD}/logpriv.sock" + +# Start a private syslogd instance. +syslogd_start() +{ + local jail bind_addr conf_file pid_file socket privsocket + local opt next other_args + + # Setup loopback so we can deliver messages to ourself. + atf_check ifconfig lo0 inet 127.0.0.1/16 + + OPTIND=1 + while getopts ":b:f:j:P:p:S:" opt; do + case "${opt}" in + b) + bind_addr="${OPTARG}" + ;; + f) + conf_file="${OPTARG}" + ;; + j) + jail="jexec ${OPTARG}" + ;; + P) + pid_file="${OPTARG}" + ;; + p) + socket="${OPTARG}" + ;; + S) + privsocket="${OPTARG}" + ;; + ?) + opt="${OPTARG}" + next="$(eval echo \${${OPTIND}})" + + case "${next}" in + -* | "") + other_args="${other_args} -${opt}" + shift $((OPTIND - 1)) + ;; + *) + other_args="${other_args} -${opt} ${next}" + shift ${OPTIND} + ;; + esac + + # Tell getopts to continue parsing. + OPTIND=1 + ;; + :) + atf_fail "The -${OPTARG} flag requires an argument" + ;; + esac + done + + $jail syslogd \ + -b "${bind_addr:-":${SYSLOGD_UDP_PORT}"}" \ + -C \ + -d \ + -f "${conf_file:-${SYSLOGD_CONFIG}}" \ + -H \ + -P "${pid_file:-${SYSLOGD_PIDFILE}}" \ + -p "${socket:-${SYSLOGD_LOCAL_SOCKET}}" \ + -S "${privsocket:-${SYSLOGD_LOCAL_PRIVSOCKET}}" \ + ${other_args} \ + & + + # Give syslogd a bit of time to spin up. + while [ "$((i+=1))" -le 20 ]; do + [ -S "${socket:-${SYSLOGD_LOCAL_SOCKET}}" ] && return + sleep 0.1 + done + atf_fail "timed out waiting for syslogd to start" +} + +# Simple logger(1) wrapper. +syslogd_log() +{ + atf_check -s exit:0 -o empty -e empty logger $* +} + +# Make syslogd reload its configuration file. +syslogd_reload() +{ + pkill -HUP -F "${1:-${SYSLOGD_PIDFILE}}" +} + +# Stop a private syslogd instance. +syslogd_stop() +{ + local pid_file="${1:-${SYSLOGD_PIDFILE}}" + local socket_file="${2:-${SYSLOGD_LOCAL_SOCKET}}" + local privsocket_file="${3:-${SYSLOGD_LOCAL_PRIVSOCKET}}" + + pid=$(cat "${pid_file}") + if pkill -F "${pid_file}"; then + wait "${pid}" + rm -f "${pid_file}" "${socket_file}" "${privsocket_file}" + fi +} From nobody Mon Dec 23 15:49:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2XL40QDz5WqtN; Mon, 23 Dec 2024 15:49: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 4YH2XL0XR3z4pbP; Mon, 23 Dec 2024 15:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oZeXOqfC2f3GDVXveVetiz0Xp5sDSKEgRl7IwlFlFB4=; b=OoVQQFEoT6k/ah9RGooRgJYR2/CTexNE9FfSP9A6Ktic+fZ87rTwTI02wEd0DWj/931pgw 9FXG1sfOQpfS7SQXRqQj3IObLyxGzfIVxr5RarDi1p5MF5XEAbc3/cIABYdFNXNN5wBquo DFb6y14acNgydyppbrSNHFkQzE9CLU/bxAQvy2ynrRtDbyOhQqJ5nASf0VwYfT/4Rq6Q0i gqHodgEUph3HxHG78WBj04qfNJg6+M554GlkBjcjSCss0so2eZyprltn+u+TzKm8/mwr0+ zhmSPsqJYJ4Jzc/nQ1OTTSCt0EEpgB/MkjwWqdqvvgCeLFVra1BaXswt9U02gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oZeXOqfC2f3GDVXveVetiz0Xp5sDSKEgRl7IwlFlFB4=; b=JN/SK6WFvQ5MN5fxwfrKU7pTxKAiE+8/gwTs/SOZYbr2m18Skk0takZ05ntV1Ji7HwUI8+ EUkWCf/thxH53nCr3Qi0KCJD+erU1cCiKy/A5Lesy/VqDS3aXc9YcbF/p3aa2KIsIGg5aO DxpUb9jXu9OpKIEdPsxiZu23EXJGvEQ/KPZJWUw6PsahR36SgGTjGpdaHz4OOCZ7XyzqjD lKYKHrX36KtM59bD6oEISLcK89cVT2aW+kACDXbALp8qIdiOf+Rl0SxD2CRJZjrvLQWiJZ bXOb3zjmDYT4Yvgz3MV0T0qonHQwCbTByCfWlzlylfNw5YY3yjxIfATM/jhpXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968994; a=rsa-sha256; cv=none; b=Z7y5bgwmq5WFWf5JxX4yU2d1QIrYtif1LHiQDa2W3wm/rEy9a9Ia7WHP29ySfn8dwKkjgp AbPwHMstryHTB/GeyS3ZXYpYpe/mJ6iQzyR+TLdOQy/iCVtmnj8Kk8kFUN9kGNqosE5Igq Yqg9n3n9MJnRItxYiUiN/CvLiOXYW9JDLt24m1eXfGuOqGyv5ZIvHiEL/tL6DRCmwTb3yJ wmmRTXvAzhzVKdMb/mkUdiI+a+NePCTgUQaO/t5cQ26QPmAmt3TvvvjWjsSs7h0QTrVYQY 8fpu53+v/WWjfF4enlCBYHlfTr8wx62n6rCZcVUIDmm/SIFaYPRmkFtHUtW6VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2XK69lPz107y; Mon, 23 Dec 2024 15:49: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 4BNFnrO5012000; Mon, 23 Dec 2024 15:49:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFnrRZ011997; Mon, 23 Dec 2024 15:49:53 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:49:53 GMT Message-Id: <202412231549.4BNFnrRZ011997@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: ee75c991acdc - main - syslogd: Add syslog forwarded message format tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee75c991acdca2103e0bc1e763a4ba67c148d132 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ee75c991acdca2103e0bc1e763a4ba67c148d132 commit ee75c991acdca2103e0bc1e763a4ba67c148d132 Author: Michal Scigocki AuthorDate: 2024-12-23 02:57:13 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 15:45:45 +0000 syslogd: Add syslog forwarded message format tests Reviewed by: markj MFC after: 3 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1536 --- usr.sbin/syslogd/tests/Makefile | 1 + .../syslogd/tests/syslogd_basic_format_test.sh | 1 - .../syslogd/tests/syslogd_format_test_common.sh | 56 ++++++ .../syslogd/tests/syslogd_forwarded_format_test.sh | 213 +++++++++++++++++++++ 4 files changed, 270 insertions(+), 1 deletion(-) diff --git a/usr.sbin/syslogd/tests/Makefile b/usr.sbin/syslogd/tests/Makefile index 65d08d75fcd1..36b7798d317c 100644 --- a/usr.sbin/syslogd/tests/Makefile +++ b/usr.sbin/syslogd/tests/Makefile @@ -1,6 +1,7 @@ PACKAGE= tests ATF_TESTS_SH= syslogd_basic_format_test \ + syslogd_forwarded_format_test \ syslogd_test # Run in jail with new vnet so we don't need to worry about address conflicts diff --git a/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh index 7ee7cd0e1e91..1969ce180f66 100644 --- a/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh @@ -4,7 +4,6 @@ # Copyright (c) 2024 Michal Scigocki # -. $(atf_get_srcdir)/syslogd_test_common.sh . $(atf_get_srcdir)/syslogd_format_test_common.sh # Basic format tests diff --git a/usr.sbin/syslogd/tests/syslogd_format_test_common.sh b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh index 199fb746839c..995bb048881b 100644 --- a/usr.sbin/syslogd/tests/syslogd_format_test_common.sh +++ b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh @@ -4,6 +4,8 @@ # Copyright (c) 2024 Michal Scigocki # +. $(atf_get_srcdir)/syslogd_test_common.sh + # REGEX Components readonly PRI="<15>" readonly VERSION="1" @@ -30,3 +32,57 @@ readonly REGEX_RFC3164_LEGACY_PAYLOAD="${PRI}${REGEX_RFC3164_LEGACY}$" readonly REGEX_RFC5424="${PRI}${VERSION} ${TIMESPEC_RFC5424} ${HOSTNAME_REGEX} ${TAG} - - - ${MSG}" readonly REGEX_RFC5424_LOGFILE="^${REGEX_RFC5424}$" readonly REGEX_RFC5424_PAYLOAD="${REGEX_RFC5424}$" + +# Filename helper functions +config_filename() +{ local ref="$1"; echo "${PWD}/syslog_${ref}.conf"; } + +local_socket_filename() +{ local ref="$1"; echo "${PWD}/log_${ref}.sock"; } + +pid_filename() +{ local ref="$1"; echo "${PWD}/syslogd_${ref}.pid"; } + +local_privsocket_filename() +{ local ref="$1"; echo "${PWD}/logpriv_${ref}.sock"; } + +confirm_INET_support_or_skip() +{ + if ! sysctl kern.conftxt | grep -qw INET; then + atf_skip "Running kernel does not support INET" + fi +} + +set_common_atf_metadata() +{ + atf_set timeout 5 + atf_set require.user root +} + +# Wrapper with better semantic name for networking context +syslogd_start_on_port() +{ + local port="$1" + shift 1 + + syslogd_start \ + -b ":${port}" \ + -f "$(config_filename ${port})" \ + -p "$(local_socket_filename ${port})" \ + -P "$(pid_filename ${port})" \ + -S "$(local_privsocket_filename ${port})" \ + $@ +} + +# Wrapper with better semantic name for networking context +syslogd_stop_on_ports() +{ + local ports="$@" + + for port in "${ports}"; do + syslogd_stop \ + "$(pid_filename ${port})" \ + "$(local_socket_filename ${port})" \ + "$(local_privsocket_filename ${port})" + done +} diff --git a/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh b/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh new file mode 100644 index 000000000000..3d220a80b7e8 --- /dev/null +++ b/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh @@ -0,0 +1,213 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Michal Scigocki +# + +. $(atf_get_srcdir)/syslogd_format_test_common.sh + +SERVER_1_PORT="5140" +SERVER_2_PORT="5141" + +# Forwarded Message Tests +# Two servers, one sending syslog messages to the other over UDP +setup_forwarded_format_test() +{ + local format="$1" + local logfile="$2" + local pcapfile="$3" + + confirm_INET_support_or_skip + + # Begin packet capture for single packet + tcpdump --immediate-mode -c 1 -i lo0 -w "${pcapfile}" \ + dst port "${SERVER_1_PORT}" & + tcpdump_pid="$!" + + # Start first server: receive UDP, log to file + printf "user.debug\t${logfile}\n" > "$(config_filename ${SERVER_1_PORT})" + syslogd_start_on_port "${SERVER_1_PORT}" -O "${format}" + + # Start second server: send UDP, log to first server + printf "user.debug\t@127.0.0.1:${SERVER_1_PORT}\n" \ + > "$(config_filename ${SERVER_2_PORT})" + syslogd_start_on_port "${SERVER_2_PORT}" -O "${format}" + + # Send test syslog message + syslogd_log -4 -p user.debug -t "${TAG}" -h 127.0.0.1 \ + -P "${SERVER_2_PORT}" -H "${HOSTNAME}" "${MSG}" + + wait "${tcpdump_pid}" # Wait for packet capture to finish +} + +atf_test_case "O_flag_bsd_forwarded" "cleanup" +O_flag_bsd_forwarded_head() +{ + atf_set descr "bsd format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_bsd_forwarded_body() +{ + local format="bsd" + local logfile="${PWD}/${format}_forwarded.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_expect_fail \ + "PR 220246 syslog -O bsd deviates from RFC 3164 recommendations" + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_bsd_forwarded_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" +} + +atf_test_case "O_flag_rfc3164_forwarded" "cleanup" +O_flag_rfc3164_forwarded_head() +{ + atf_set descr "rfc3164 format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_rfc3164_forwarded_body() +{ + local format="rfc3164" + local logfile="${PWD}/${format}_forwarded.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_expect_fail \ + "PR 220246 syslog -O rfc3164 deviates from RFC 3164 recommendations" + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_rfc3164_forwarded_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" +} + +atf_test_case "O_flag_syslog_forwarded" "cleanup" +O_flag_syslog_forwarded_head() +{ + atf_set descr "syslog format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_syslog_forwarded_body() +{ + local format="syslog" + local logfile="${PWD}/${format}_forwarded.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC5424_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_syslog_forwarded_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" +} + +atf_test_case "O_flag_rfc5424_forwarded" "cleanup" +O_flag_rfc5424_forwarded_head() +{ + atf_set descr "rfc5424 format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_rfc5424_forwarded_body() +{ + local format="rfc5424" + local logfile="${PWD}/${format}_forwarded.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC5424_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_rfc5424_forwarded_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" +} + +# Legacy bsd/rfc3164 format tests +# The legacy syntax was introduced in FreeBSD PR 7055, circa 1998 +atf_test_case "O_flag_bsd_forwarded_legacy" "cleanup" +O_flag_bsd_forwarded_legacy_head() +{ + atf_set descr "legacy bsd format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_bsd_forwarded_legacy_body() +{ + local format="bsd" + local logfile="${PWD}/${format}_forwarded_legacy.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LEGACY_LOGFILE}" \ + cat "${logfile}" + atf_check -s exit:0 -e ignore \ + -o match:"${REGEX_RFC3164_LEGACY_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_bsd_forwarded_legacy_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" +} + +atf_test_case "O_flag_rfc3164_forwarded_legacy" "cleanup" +O_flag_rfc3164_forwarded_legacy_head() +{ + atf_set descr \ + "legacy rfc3164 format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_rfc3164_forwarded_legacy_body() +{ + local format="rfc3164" + local logfile="${PWD}/${format}_forwarded_legacy.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LEGACY_LOGFILE}" \ + cat "${logfile}" + atf_check -s exit:0 -e ignore \ + -o match:"${REGEX_RFC3164_LEGACY_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_rfc3164_forwarded_legacy_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" +} + +atf_init_test_cases() +{ + atf_add_test_case "O_flag_bsd_forwarded" + atf_add_test_case "O_flag_rfc3164_forwarded" + atf_add_test_case "O_flag_syslog_forwarded" + atf_add_test_case "O_flag_rfc5424_forwarded" + + atf_add_test_case "O_flag_bsd_forwarded_legacy" + atf_add_test_case "O_flag_rfc3164_forwarded_legacy" +} From nobody Mon Dec 23 15:49:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2XP0gl0z5WrRf; Mon, 23 Dec 2024 15:49: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 4YH2XN1M1Bz4pdv; Mon, 23 Dec 2024 15:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YSNflGjmK/+Ee0b7hH3mFlEAnoViwwUoST7l297pNDM=; b=GPDmHGH+rnH9j82eq3K/hHcsvsMhiyt9bej93am4KEGXFU+BtcGGl7T1/AHtivTXKjEiK8 Y04dHcjyFDBKIFAtmtUd0Gp+lCq4cikKmE69i0AQ72T6mFM7lcEiatebn6oLOKJNKiVS9/ oReKT09jE323SUZ7XsYY4vqPMcwPrPt6Ov+gdhBQ0lhNq1yyTYUI2C7UwT/cq51ZgTZSlU robDPhThMAzV4oUFLZ2ZzmNMeFtqDfETHL9Ed59Tmk5eP/QkgOZPoDgLtXQs1vnnMWM/Z+ HwLXE/NoHjCR9Basyev3/pFiL+zHXnuvJq3kUpI8Kjitz8aeBZKOTPXKWvzeXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YSNflGjmK/+Ee0b7hH3mFlEAnoViwwUoST7l297pNDM=; b=l/ZlKl7Sf6DJJiXZgAXxYMxN3nWPlywmqQmaWXSlnobZ+nABvGZbxTzE3UAkIy2eXlT19h vM+Xe2oYXWqPjjtDSh+MxmHGBdnHzuUSjMYtCu/FC8JrSnJHczR1UM9XX95qpSoHM9jTS9 wOrrx0Nuwv0qlzhmmc1LcG+o+I7VIdIVR4H0V+EJ+CuS4dcE/7uVgaPJRJsNkYJKXJRnM1 E/99xcbDykgtdhoRv13TekDiP+JC7kQvlb2nUgNsrQVVqFFZNoyTFt3FnzTg8FJKs69F85 Z4FUt7mw8DtPMN2GQ6wFzkZp/aTGD4E48ZLMTDRynv6fZ/+t833GL3TRc9CKLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968996; a=rsa-sha256; cv=none; b=AYqwgkVtv43SMuTmzWZoubSV4RlXZ6CdBnlGcgSrLtwdoRkEaJUy+lDpbX3EM+JwRQkHlm 4UO6gqz3k5uW94xMzXRpQFfv0Zuwfxl/qtmXS0eHzvSKe9QBd29w63W99NTJxixxvZRCJY TLJbnd5B1iUzZw64Rvz/KyON7n7PdzpuSJjqk8G5zQ4gBdqc13HSafe1aX2+9yqNcd4TYT 51RiUMO4/B/0zv5PAZgQ8D+PdiTf52q6cgYNjqJNQbWjMJ4LScB6Xb/UlB3x2eWHbyZoOC 1BOe8QzynKRrz8ZJiGmA5UD6LH35OWsXIHM/tKnmvOGpldiKpmWIGZEB8f9ZEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2XN0cwTz10Lv; Mon, 23 Dec 2024 15:49: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 4BNFntsY012099; Mon, 23 Dec 2024 15:49:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFntnp012096; Mon, 23 Dec 2024 15:49:55 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:49:55 GMT Message-Id: <202412231549.4BNFntnp012096@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: 8cc248fb92bf - main - syslogd: Add rfc3164-strict format option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8cc248fb92bfae1e6ef4e2b48a0064377c4b3c11 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8cc248fb92bfae1e6ef4e2b48a0064377c4b3c11 commit 8cc248fb92bfae1e6ef4e2b48a0064377c4b3c11 Author: Michal Scigocki AuthorDate: 2024-12-23 04:36:57 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 15:46:14 +0000 syslogd: Add rfc3164-strict format option The syslogd bsd/rfc3164 message format does not strictly conform to the format recommended in RFC 3164 when syslog messages are forwarded from remote hosts. The new rfc3164-strict format generates messages that conform with the RFC 3164 recommended format. The existing format is maintained for backwards compatibility. PR: 220246 Reviewed by: markj MFC after: 3 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1536 --- usr.sbin/syslogd/syslogd.8 | 11 +++++-- usr.sbin/syslogd/syslogd.c | 34 ++++++++++++++++------ .../syslogd/tests/syslogd_basic_format_test.sh | 20 +++++++++++++ .../syslogd/tests/syslogd_forwarded_format_test.sh | 26 +++++++++++++++++ .../syslogd/tests/syslogd_relayed_format_test.sh | 27 +++++++++++++++++ 5 files changed, 107 insertions(+), 11 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8 index b23d0327b76c..fa61e78eaf3e 100644 --- a/usr.sbin/syslogd/syslogd.8 +++ b/usr.sbin/syslogd/syslogd.8 @@ -269,14 +269,21 @@ The values .Ar bsd and .Ar rfc3164 -are used to generate RFC 3164 log messages. +are used to generate legacy RFC 3164 log messages. +The value +.Ar rfc3164-strict +is used to generate log messages using the RFC 3164 recommended format, +where messages sent over the network include the hostname, +and messages forwarded by a relay exclude the +.Dq Forwarded from +field. The values .Ar syslog and .Ar rfc5424 are used to generate RFC 5424 log messages, having RFC 3339 timestamps with microsecond precision. -The default is to generate RFC 3164 log messages. +The default is to generate legacy RFC 3164 log messages. .It Fl o Prefix kernel messages with the full kernel boot file as determined by .Xr getbootfile 3 . diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 23ef5d78c319..be4eaa235d36 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -194,6 +194,13 @@ static STAILQ_HEAD(, socklist) shead = STAILQ_HEAD_INITIALIZER(shead); #define RFC3164_DATELEN 15 #define RFC3164_DATEFMT "%b %e %H:%M:%S" +/* + * FORMAT_BSD_LEGACY and FORMAT_RFC3164_STRICT are two variations of + * the RFC 3164 logging format. + */ +#define IS_RFC3164_FORMAT (output_format == FORMAT_BSD_LEGACY || \ +output_format == FORMAT_RFC3164_STRICT) + static STAILQ_HEAD(, filed) fhead = STAILQ_HEAD_INITIALIZER(fhead); /* Log files that we write to */ static struct filed consfile; /* Console */ @@ -315,7 +322,11 @@ static int LogFacPri; /* Put facility and priority in log message: */ static bool KeepKernFac; /* Keep remotely logged kernel facility */ static bool needdofsync = true; /* Are any file(s) waiting to be fsynced? */ static struct pidfh *pfh; -static bool RFC3164OutputFormat = true; /* Use legacy format by default. */ +static enum { + FORMAT_BSD_LEGACY, /* default, RFC 3164 with legacy deviations */ + FORMAT_RFC3164_STRICT, /* compliant to RFC 3164 recommendataions */ + FORMAT_RFC5424, /* RFC 5424 format */ +} output_format = FORMAT_BSD_LEGACY; static int kq; /* kqueue(2) descriptor. */ struct iovlist; @@ -635,10 +646,12 @@ main(int argc, char *argv[]) case 'O': if (strcmp(optarg, "bsd") == 0 || strcmp(optarg, "rfc3164") == 0) - RFC3164OutputFormat = true; + output_format = FORMAT_BSD_LEGACY; + else if (strcmp(optarg, "rfc3164-strict") == 0) + output_format = FORMAT_RFC3164_STRICT; else if (strcmp(optarg, "syslog") == 0 || strcmp(optarg, "rfc5424") == 0) - RFC3164OutputFormat = false; + output_format = FORMAT_RFC5424; else usage(); break; @@ -666,7 +679,7 @@ main(int argc, char *argv[]) if ((argc -= optind) != 0) usage(); - if (RFC3164OutputFormat && MaxForwardLen > 1024) + if (IS_RFC3164_FORMAT && MaxForwardLen > 1024) errx(1, "RFC 3164 messages may not exceed 1024 bytes"); pfh = pidfile_open(PidFile, 0600, &spid); @@ -1993,7 +2006,10 @@ fprintlog_rfc3164(struct filed *f, const char *hostname, const char *app_name, iovlist_append(&il, priority_number); iovlist_append(&il, ">"); iovlist_append(&il, timebuf); - if (strcasecmp(hostname, LocalHostName) != 0) { + if (output_format == FORMAT_RFC3164_STRICT) { + iovlist_append(&il, " "); + iovlist_append(&il, hostname); + } else if (strcasecmp(hostname, LocalHostName) != 0) { iovlist_append(&il, " Forwarded from "); iovlist_append(&il, hostname); iovlist_append(&il, ":"); @@ -2092,7 +2108,7 @@ fprintlog_first(struct filed *f, const char *hostname, const char *app_name, return; } - if (RFC3164OutputFormat) + if (IS_RFC3164_FORMAT) fprintlog_rfc3164(f, hostname, app_name, procid, msg, flags); else fprintlog_rfc5424(f, hostname, app_name, procid, msgid, @@ -2215,7 +2231,7 @@ cvthname(struct sockaddr *f) if (hl > 0 && hname[hl-1] == '.') hname[--hl] = '\0'; /* RFC 5424 prefers logging FQDNs. */ - if (RFC3164OutputFormat) + if (IS_RFC3164_FORMAT) trimdomain(hname, hl); return (hname); } @@ -2599,7 +2615,7 @@ init(bool reload) err(EX_OSERR, "gethostname() failed"); if ((p = strchr(LocalHostName, '.')) != NULL) { /* RFC 5424 prefers logging FQDNs. */ - if (RFC3164OutputFormat) + if (IS_RFC3164_FORMAT) *p = '\0'; LocalDomain = p + 1; } else { @@ -3134,7 +3150,7 @@ cfline(const char *line, const char *prog, const char *host, if (hl > 0 && f.f_host[hl-1] == '.') f.f_host[--hl] = '\0'; /* RFC 5424 prefers logging FQDNs. */ - if (RFC3164OutputFormat) + if (IS_RFC3164_FORMAT) trimdomain(f.f_host, hl); } diff --git a/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh index 1969ce180f66..09477a568ba8 100644 --- a/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh @@ -63,6 +63,25 @@ O_flag_rfc3164_basic_cleanup() syslogd_stop } +atf_test_case "O_flag_rfc3164strict_basic" "cleanup" +O_flag_rfc3164strict_basic_head() +{ + atf_set descr "rfc3164-strict format test on local syslog message" +} +O_flag_rfc3164strict_basic_body() +{ + local format="rfc3164-strict" + local logfile="${PWD}/O_flag_${format}_basic.log" + + setup_basic_format_test "${format}" "${logfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" +} +O_flag_rfc3164strict_basic_cleanup() +{ + syslogd_stop +} + atf_test_case "O_flag_syslog_basic" "cleanup" O_flag_syslog_basic_head() { @@ -105,6 +124,7 @@ atf_init_test_cases() { atf_add_test_case "O_flag_bsd_basic" atf_add_test_case "O_flag_rfc3164_basic" + atf_add_test_case "O_flag_rfc3164strict_basic" atf_add_test_case "O_flag_syslog_basic" atf_add_test_case "O_flag_rfc5424_basic" } diff --git a/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh b/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh index 3d220a80b7e8..b17627a935c8 100644 --- a/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh @@ -94,6 +94,31 @@ O_flag_rfc3164_forwarded_cleanup() "${SERVER_2_PORT}" } +atf_test_case "O_flag_rfc3164strict_forwarded" "cleanup" +O_flag_rfc3164strict_forwarded_head() +{ + atf_set descr "rfc3164-strict format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_rfc3164strict_forwarded_body() +{ + local format="rfc3164-strict" + local logfile="${PWD}/${format}_forwarded.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_rfc3164strict_forwarded_cleanup() +{ + syslogd_stop_on_ports \ + "${SYSLOGD_UDP_PORT_1}" \ + "${SYSLOGD_UDP_PORT_2}" +} + atf_test_case "O_flag_syslog_forwarded" "cleanup" O_flag_syslog_forwarded_head() { @@ -205,6 +230,7 @@ atf_init_test_cases() { atf_add_test_case "O_flag_bsd_forwarded" atf_add_test_case "O_flag_rfc3164_forwarded" + atf_add_test_case "O_flag_rfc3164strict_forwarded" atf_add_test_case "O_flag_syslog_forwarded" atf_add_test_case "O_flag_rfc5424_forwarded" diff --git a/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh b/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh index 21481823068d..d3e0db4e0f1c 100644 --- a/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh @@ -101,6 +101,32 @@ O_flag_rfc3164_relayed_cleanup() "${SERVER_3_PORT}" } +atf_test_case "O_flag_rfc3164strict_relayed" "cleanup" +O_flag_rfc3164strict_relayed_head() +{ + atf_set descr "rfc3164-strict format test on a relayed syslog message" + set_common_atf_metadata +} +O_flag_rfc3164strict_relayed_body() +{ + local format="rfc3164-strict" + local logfile="${PWD}/${format}_relayed.log" + local pcapfile="${PWD}/${format}_relayed.pcap" + + setup_relayed_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_rfc3164strict_relayed_cleanup() +{ + syslogd_stop_on_ports \ + "${SYSLOGD_UDP_PORT_1}" \ + "${SYSLOGD_UDP_PORT_2}" \ + "${SYSLOGD_UDP_PORT_3}" +} + atf_test_case "O_flag_syslog_relayed" "cleanup" O_flag_syslog_relayed_head() { @@ -157,6 +183,7 @@ atf_init_test_cases() { atf_add_test_case "O_flag_bsd_relayed" atf_add_test_case "O_flag_rfc3164_relayed" + atf_add_test_case "O_flag_rfc3164strict_relayed" atf_add_test_case "O_flag_syslog_relayed" atf_add_test_case "O_flag_rfc5424_relayed" } From nobody Mon Dec 23 16:05:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH2ss64Dfz5WsFH; Mon, 23 Dec 2024 16:05: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 4YH2ss5LyRz4sk4; Mon, 23 Dec 2024 16:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734969905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/sJrurirJUkx37J7vvl8jRGuHun5grsxeAgG/qLxuI=; b=m2aJ74AEWRqUCDdqQ67ScWkqQcbae8ktIsDRcD/2RU63eunGSLTuyla6dBgs8GbeC9a7ku Kh3qKeSeyXOuUjL8YktgZQN/QwuJgA83g4Uw6M8iwOXStI4I+2ZbnrtyDPrNFxg+ZfPNNn oFFS2RaPqQhHZHgLwxcWuuvbAYskXidbSjjWVfa3iL+3Fdg3KKysUHfzixqf/Rq+jWRlWY h5zxwgUSSLOb60GKqAJb2SaXYQJqvmfOOtdo+JZSXHANsYFW9tUHJDxxu0cNKLwobLmDxR bLXNvdzqfgdszfXFNX6N3H3vlffXUDlS6vsSaXiCg4Y0peoHvVDxH0xA339eeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734969905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/sJrurirJUkx37J7vvl8jRGuHun5grsxeAgG/qLxuI=; b=sKLQGlVY2wlEF1RTkcfkxxvQB73gM0RattnNcJBSGcIwSSHngL304pTcRYJwUowEPYGISS ri5vZVLrw3ANlzLAMPbXjqLGOkp2W1mQ9N7ICFrOLdJtVzucFKIiUOMQOVHhwcnkYcSsxe 5xHjSP98wIwS5RRaE79jWTJWl+hf19l9XEJxxzWekYusFTcXV29ENSeDqHqiJh2aT001hM nsPX0rCyLt8jA6LHNVjDar2r2tjCAqMK+qzAwR5xnKEyqzz7hv7/F2vT/nZUyaUcFWM3Cv Mh1lQcyYRAFr++aqVI46TWTYwbiLwC0dIMgPcS8xvmzwnGtJIzFbXjpBpbT+0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734969905; a=rsa-sha256; cv=none; b=REbYPyA3qkvuiDirEMA47+7J37TsnUKn1kip5umlJHwWuPNLonf2aVX+9XxEOhTv28ymlx fTnRiA1tTkLA5OdVmLzFCG3nfZuj9+Jj+smrGMUcnteYj6tjiUkY6dxH2oQzU/MyDcj2ae Zvf9ta7FO+2jUYDBxVAPCuAoYNP8IqIlBek9qjXr6879eQWS79L1AEDHZ3WOYpu6uZZv2z xWzk9Eh2w/glPw5UHtjRGn8eyTNMm9WMX+lDMawpwdbCUi5JxCXkZoFqF97UkOTHZnjwJB QlPKZz12ZoigqZBKKI6nWl3QobLZ/Rg/Rq9sfUhrQIaoIlaly6qfTeMF22US1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH2ss4yLHz10Ph; Mon, 23 Dec 2024 16:05: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 4BNG55nZ049052; Mon, 23 Dec 2024 16:05:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNG55AH049049; Mon, 23 Dec 2024 16:05:05 GMT (envelope-from git) Date: Mon, 23 Dec 2024 16:05:05 GMT Message-Id: <202412231605.4BNG55AH049049@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: b45f84cc6213 - main - makefs: Exit with error if writing cd image fails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b45f84cc6213854ead00a4bfc7973332eda65676 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b45f84cc6213854ead00a4bfc7973332eda65676 commit b45f84cc6213854ead00a4bfc7973332eda65676 Author: Ed Maste AuthorDate: 2024-12-23 15:54:32 +0000 Commit: Ed Maste CommitDate: 2024-12-23 16:03:36 +0000 makefs: Exit with error if writing cd image fails Obtained from: OpenBSD c8f48d9b1ea9 Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/cd9660.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 19bd6e0d21b0..d3baa3b78a6e 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -462,7 +462,7 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts) { int64_t startoffset; - int numDirectories; + int ret, numDirectories; uint64_t pathTableSectors; int64_t firstAvailableSector; int64_t totalSpace; @@ -604,7 +604,7 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, if (diskStructure->include_padding_areas) diskStructure->totalSectors += 150; - cd9660_write_image(diskStructure, image); + ret = cd9660_write_image(diskStructure, image); if (diskStructure->verbose_level > 1) { debug_print_volume_descriptor_information(diskStructure); @@ -616,7 +616,10 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, cd9660_free_structure(real_root); if (diskStructure->verbose_level > 0) - printf("%s: done\n", __func__); + printf("%s: done ret = %d\n", __func__, ret); + + if (ret == 0) /* cd9660_write_image() failed */ + exit(1); } /* Generic function pointer - implement later */ From nobody Mon Dec 23 16:52:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH3ww7497z5WxQm; Mon, 23 Dec 2024 16:52:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH3ww6byvz4xkF; Mon, 23 Dec 2024 16:52:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734972768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DfwebncuJDwlYgyEdM/GOdLscMzT2cH42ObdsIh7YFQ=; b=NE8NL9aolBAP1j1qIido7iz4EIfhS5FNpcZcHEyUvBz77B2wEP0NnUqVUqo6ha2EymF4/h vbnmLc6S0e1sERdb10ZhnYszG3WA9kU98Nvetq75mP9VY+WgflRF/3rLGjW2JnpIYU/nVG 5zevN6ct494SdAiwaI/srUKlObioMvmLP/SofaB8IjAJ3qzYGulMlV1MoInYMnsKnhHagO GZ4fhXLdnroyBNCNffwoJmI/tY0fTW1IB6EEdGuD7J+fVhhp5HMaTJVrmy/OI1wIzI+46y sQNr1PZyThnQPjRxr14Pwme2CAIWG4Ona3WVQJJWjzF2WJ5Aew6Wez9B6svHTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734972768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DfwebncuJDwlYgyEdM/GOdLscMzT2cH42ObdsIh7YFQ=; b=paWFf3h6J+EvV9gIA32prfxLq9h2r5+MH4/SzbsC129ISm8ScVDCZKWJelguMzT+cr6v9e etwRWDI9OTB2uV9D/8cDWaBLv5/2jCrOi5seXlRERA4c5uJemKwYnV/LJhGguccxv1gaIq TjvPlf3Ux1w3g3IzKmGzn9u2ebaus0b8QqzggMDGx7eMZiocDF4uHaqy0igMCxWaOwQ4bL 96ICzV7vf/IQ0kZO4ey365Kw+x5Idg5zJgsf7F5sfml/H6WIx3A/7SSZMmoPnIzl1B6Csx Fs2QioCy0nAEwB6gKEbSJG9/xPGgVw3UfJj0rIBCTp/2wBokVkwFD9BLSWEDxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734972768; a=rsa-sha256; cv=none; b=EsnFPh3VTTKy7pfef0tm1wlMVhw89wKht3R5eHNbWqpnjqaM7ZhN58onfmkp9cSghxpRFG 8Nt98SBTrmITMIwXmCxC+4szNTM/3M7yuF7fes1SMWxdEaYybttVp6iGzsgUWbpmHmWfMn S42nODihbZiRgfgZPCT5Ofdn5TGE0kXTYDR/t0ad1MPWr31VjFte7TcgX4gEav8l6Ea23Z FN0tm2bHRb1Jyi5+Oj7ouNQ9A9EKBDqWq3KCAY9Ei8P/NMJZIxumkj8zw060yvJ7GkWy1O RqQhzNgnSil0WS6RlJbX/EXq6+DpjioR7HF5UrO0gOqBuoJUBDwrR4M/5KtM9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH3ww6Bmwz124k; Mon, 23 Dec 2024 16:52: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 4BNGqmuF040866; Mon, 23 Dec 2024 16:52:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNGqmRI040863; Mon, 23 Dec 2024 16:52:48 GMT (envelope-from git) Date: Mon, 23 Dec 2024 16:52:48 GMT Message-Id: <202412231652.4BNGqmRI040863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2a6c77b343f6 - stable/14 - linuxkpi: Fix a lock leak in lkpi_sta_scan_to_auth() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2a6c77b343f6789eb56bc42ccba12559a58b464c Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2a6c77b343f6789eb56bc42ccba12559a58b464c commit 2a6c77b343f6789eb56bc42ccba12559a58b464c Author: Mark Johnston AuthorDate: 2024-12-13 20:28:13 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 16:51:33 +0000 linuxkpi: Fix a lock leak in lkpi_sta_scan_to_auth() PR: 283015 Reviewed by: bz MFC after: 1 week Fixes: 0936c648ad0e ("LinuxKPI: 802.11: update the ni/lsta reference cycle") Differential Revision: https://reviews.freebsd.org/D47949 (cherry picked from commit 926905796749750da6464b97ec4f8eec0882cc0e) --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 2bb0c2ab113c..f22ab8435a2f 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1182,6 +1182,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int lvif, vap, vap->iv_bss, lvif->lvif_bss, (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, lvif->lvif_bss_synched); + LKPI_80211_LVIF_UNLOCK(lvif); + ieee80211_free_node(ni); /* Error handling for the local ni. */ return (EBUSY); } LKPI_80211_LVIF_UNLOCK(lvif); From nobody Mon Dec 23 16:52:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH3wy1r3fz5Wx5n; Mon, 23 Dec 2024 16:52: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 4YH3wx70Tpz4xdy; Mon, 23 Dec 2024 16:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734972770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+bF3Utsvy9oC3BYs6Usj9A1j8tRfV7nOWokMnIBJ0+Q=; b=xFQU14C6OI/sIfmntrBai+BXYZS352bpdLRk1ohEuEBGggykLdsqtQFSMiQJB7NxHloq5I ycwBuBu4T9itWwbywyp/ECG3qHESh2VF7V3MAVBHOhUmmVrwhzHWUVNclmCj4fA/LpyMcE cDddFXf93rj9uIwWxUCPGtmSwRkqRZhpjQGS67uPQPYyyk+vFXITMDWlIbtQ1R5y//xrVB PoSVe7H3CpC+Y3HdoUNq1uNezWnnMCplG/QBpliG4Aqp3JvNCE66XnMO8IX5DngJEge6n4 9uMflD2gATGd7bEtsiK+Xkb0MQDNZ8QfDuy6NhMW37/xzmAi88Y0ElmcrSXvSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734972770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+bF3Utsvy9oC3BYs6Usj9A1j8tRfV7nOWokMnIBJ0+Q=; b=TESbGOiDZlwkzFugQHgLBe3fdy1T6kAH6RDucUjBDTe/l0QuUw87r7rznT9NTkE7jgDRrr 4/aRKB9tEZD+bWlmwfosBplcAzhTdFYeuCYwz12RuwrMXqgqINVKOjgJw1yzdjgpHf+ee1 6QgqM6y4rtekVUlJakTuLvUY3wAM8pBY4c4MPGzjjyv3yAoYpxjmNvexmYAwiHCLEA6Itp g+OgTMvP2kmgacOd4b2+kMWufFWfc3fWAkA1EobMVWgfD9eF/dpO/tazlmKyHW0Au1rEPc fPf0uREcwglwt6wgjtz6ZBn0NpRAu4tlMa6LYDi1+pYCm8ZMqY+o0EjD1lTLYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734972770; a=rsa-sha256; cv=none; b=ROoBB34tAryllKQl/jH7nFNfH3X5Avsu9CcuXQXygEHl2zzv9A55Cw7lHfQ4imC5gE5iQI 2j+tyTAvbsoObdwOPsNDbbz3CvsQW5okBX6BuFgp7TPPTGYY/AX6Jj7VjU/Z7WC4jIs9fM A/xyr9zQwi0gGwlsMHbNxv1FWSelic1fOrBBctVYS5tAe7Zq4HXuuAV+uWDkJFM1ynxupf dpFH69nW+d2oRWsR9pk8KfJbre7iw8Zd5z634gxg9mw7GhrsP2uUTKPnQ5VJdj+HwFvAP4 EH8FmtMM70qoQvjLsFwfOT/3lRVs0RNBEjfBtLZtBT5SGPIB0sFeYSvgFo943w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH3wx6d13z12CG; Mon, 23 Dec 2024 16:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNGqnGe040912; Mon, 23 Dec 2024 16:52:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNGqnG5040909; Mon, 23 Dec 2024 16:52:49 GMT (envelope-from git) Date: Mon, 23 Dec 2024 16:52:49 GMT Message-Id: <202412231652.4BNGqnG5040909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ae21b1f88e02 - stable/14 - ipfw.d: Add required dependency declarations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae21b1f88e0227602017d9cc6d2b5f3f51a82e3c Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ae21b1f88e0227602017d9cc6d2b5f3f51a82e3c commit ae21b1f88e0227602017d9cc6d2b5f3f51a82e3c Author: Mark Johnston AuthorDate: 2024-12-16 22:09:39 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 16:51:33 +0000 ipfw.d: Add required dependency declarations ipfw.d requires definitions of, at least, in_addr_t and struct ip6_addr, which it must obtain from CTF info. This is found by looking at $(sysctl -n kern.bootfile)/kernel, which might not be available in a jail. These depends_on declarations ensure that dtrace(1) invocations will simply abort processing of ipfw.d if the required binaries can't be found, rather than raising an error. PR: 283359 MFC after: 1 week (cherry picked from commit b64c5a0ace59af62eff52bfe110a521dc73c937b) --- share/dtrace/ipfw.d | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/dtrace/ipfw.d b/share/dtrace/ipfw.d index c2933dbe96ad..66cd6abea74a 100644 --- a/share/dtrace/ipfw.d +++ b/share/dtrace/ipfw.d @@ -27,6 +27,8 @@ */ #pragma D depends_on provider ipfw +#pragma D depends_on module kernel +#pragma D depends_on module ipfw.ko /* ipfw_chk() return values */ #pragma D binding "1.0" IP_FW_PASS From nobody Mon Dec 23 16:52:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH3wz4csZz5WxWT; Mon, 23 Dec 2024 16:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH3wz0smBz4xVh; Mon, 23 Dec 2024 16:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734972771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=14ge2paAWfgZR95MkAlvbxDAd93Q4HZ96YUq09/mZEU=; b=fN05N+a9NRMGJQ7qNORC6cuNVwdUZsJo3oCzJYpzh7nHWL8QLWkALCmS3lf+28D1XfcDzc b4mxDNJevQ2Wkso4PJkj3IljAlYrfhVu6xnSTnQ1rCsbrwJ+pfDU5PhjAvd039B4VMOZIA QyVIcZW6ca9uekgR0Qp9Ky5dePglji8bRYLY5Q40e8EagjAErDKzWIQ3rxrU0YfgLIp5uA /Kdsu/8uHzJfwdHPDnShFpRbpf9aQzY3ggSY8m0gxVoOr/uyFGFjfgAeXmeDJHL/hkCxIV fNyib8y4OzKopfFnOK9Vui5zVcX9GAejQbDPk7BMZZREdTvgTBWmXGW/zyCYmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734972771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=14ge2paAWfgZR95MkAlvbxDAd93Q4HZ96YUq09/mZEU=; b=miFNXr7rqWGGp/bbZHqVj9FfCKJmOQlEqSv2wa5au39gABLx7wfF6n+FYClVtYgHr4hGhJ R5bB+4VOfu1ZBupNy/Ig6P8kiWdKaIK1Gpj6yePJmpUqIyf2S62lxtLCaEinDl8BOgdrfR ReNEgnsYDb7U++MCs8AjjXcR5ibRqEou3qKc8LfvxK2EDCge1NwK0tquvAc2s08u3b8b0U YN+iZjNECYk30reav/TnOpoFVfFNQchGZr05kXOVTwiQQLhAv3T8yMr/JmiWSa14XLU1lK 9nMKZoRDKTboN/Jb7Tj67lnc/zmUra3RQ2OebSLHrfkeqxg6CuVz93jFJH/3Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734972771; a=rsa-sha256; cv=none; b=KAnmUescMnHVGmfkkk5hYp9JdcLhi77lR06Ufyf8UNwrYR+SjfGsZDtpHK8ISFNf1Gtvxo LISbS9bcIigpFL757/de6hvTVTHfD7LBz0NzWTYahXXvQ/G3eeYC1nM5r6Ulo2NRxn+95y U6/3ycTaLQ7C8HNGPke9rwcryhIu3QF/z+CHzkpVg5WaY7bR+g/PFMM2LeONX5IHibjC3O FI6IwZYYGE52nPF9osRRQBQNOuKgejwD6dHyO0HlhZv4227MxUSJ0O5azUCWNYZansGXhF tn8PRvdq76Gk/KrMpw6qinplPG0YPJNEwM90bBV4WfpnSd82u97LDLc1rj2k5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH3wz0TWPz124l; Mon, 23 Dec 2024 16:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNGqomv040960; Mon, 23 Dec 2024 16:52:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNGqo1m040957; Mon, 23 Dec 2024 16:52:50 GMT (envelope-from git) Date: Mon, 23 Dec 2024 16:52:50 GMT Message-Id: <202412231652.4BNGqo1m040957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5c15d499c23a - stable/14 - Revert "ixl: fix multicast filters handling" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5c15d499c23a09655931ea2ccf5b94dd39cdae76 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5c15d499c23a09655931ea2ccf5b94dd39cdae76 commit 5c15d499c23a09655931ea2ccf5b94dd39cdae76 Author: Franco Fichtner AuthorDate: 2024-12-11 14:08:40 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 16:51:33 +0000 Revert "ixl: fix multicast filters handling" This reverts commit 89e73359424a338a7900a4854ad7439f5848ebb8. PR: 281125 Reviewed by: Krzysztof Galazka MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1545 (cherry picked from commit 38663adb61440bd659fb457909782b71ba8806fa) --- sys/dev/ixl/ixl_pf_main.c | 97 +++++------------------------------------------ 1 file changed, 10 insertions(+), 87 deletions(-) diff --git a/sys/dev/ixl/ixl_pf_main.c b/sys/dev/ixl/ixl_pf_main.c index af253faeac7a..4f384e7191af 100644 --- a/sys/dev/ixl/ixl_pf_main.c +++ b/sys/dev/ixl/ixl_pf_main.c @@ -592,15 +592,6 @@ ixl_add_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) * Routines for multicast and vlan filter management. * *********************************************************************/ - -/** - * ixl_add_multi - Add multicast filters to the hardware - * @vsi: The VSI structure - * - * In case number of multicast filters in the IFP exceeds 127 entries, - * multicast promiscuous mode will be enabled and the filters will be removed - * from the hardware - */ void ixl_add_multi(struct ixl_vsi *vsi) { @@ -608,20 +599,14 @@ ixl_add_multi(struct ixl_vsi *vsi) struct i40e_hw *hw = vsi->hw; int mcnt = 0; struct ixl_add_maddr_arg cb_arg; - enum i40e_status_code status; IOCTL_DEBUGOUT("ixl_add_multi: begin"); mcnt = if_llmaddr_count(ifp); if (__predict_false(mcnt >= MAX_MULTICAST_ADDR)) { - status = i40e_aq_set_vsi_multicast_promiscuous(hw, vsi->seid, - TRUE, NULL); - if (status != I40E_SUCCESS) - if_printf(ifp, "Failed to enable multicast promiscuous " - "mode, status: %s\n", i40e_stat_str(hw, status)); - else - if_printf(ifp, "Enabled multicast promiscuous mode\n"); - /* Delete all existing MC filters */ + i40e_aq_set_vsi_multicast_promiscuous(hw, + vsi->seid, TRUE, NULL); + /* delete all existing MC filters */ ixl_del_multi(vsi, true); return; } @@ -647,92 +632,30 @@ ixl_match_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) return (0); } -/** - * ixl_dis_multi_promisc - Disable multicast promiscuous mode - * @vsi: The VSI structure - * @vsi_mcnt: Number of multicast filters in the VSI - * - * Disable multicast promiscuous mode based on number of entries in the IFP - * and the VSI, then re-add multicast filters. - * - */ -static void -ixl_dis_multi_promisc(struct ixl_vsi *vsi, int vsi_mcnt) -{ - struct ifnet *ifp = vsi->ifp; - struct i40e_hw *hw = vsi->hw; - int ifp_mcnt = 0; - enum i40e_status_code status; - - ifp_mcnt = if_llmaddr_count(ifp); - /* - * Equal lists or empty ifp list mean the list has not been changed - * and in such case avoid disabling multicast promiscuous mode as it - * was not previously enabled. Case where multicast promiscuous mode has - * been enabled is when vsi_mcnt == 0 && ifp_mcnt > 0. - */ - if (ifp_mcnt == vsi_mcnt || ifp_mcnt == 0 || - ifp_mcnt >= MAX_MULTICAST_ADDR) - return; - - status = i40e_aq_set_vsi_multicast_promiscuous(hw, vsi->seid, - FALSE, NULL); - if (status != I40E_SUCCESS) { - if_printf(ifp, "Failed to disable multicast promiscuous " - "mode, status: %s\n", i40e_stat_str(hw, status)); - - return; - } - - if_printf(ifp, "Disabled multicast promiscuous mode\n"); - - ixl_add_multi(vsi); -} - -/** - * ixl_del_multi - Delete multicast filters from the hardware - * @vsi: The VSI structure - * @all: Bool to determine if all the multicast filters should be removed - * - * In case number of multicast filters in the IFP drops to 127 entries, - * multicast promiscuous mode will be disabled and the filters will be reapplied - * to the hardware. - */ void ixl_del_multi(struct ixl_vsi *vsi, bool all) { - int to_del_cnt = 0, vsi_mcnt = 0; + struct ixl_ftl_head to_del; if_t ifp = vsi->ifp; struct ixl_mac_filter *f, *fn; - struct ixl_ftl_head to_del; + int mcnt = 0; IOCTL_DEBUGOUT("ixl_del_multi: begin"); LIST_INIT(&to_del); /* Search for removed multicast addresses */ LIST_FOREACH_SAFE(f, &vsi->ftl, ftle, fn) { - if ((f->flags & IXL_FILTER_MC) == 0) - continue; - - /* Count all the multicast filters in the VSI for comparison */ - vsi_mcnt++; - - if (!all && if_foreach_llmaddr(ifp, ixl_match_maddr, f) != 0) + if ((f->flags & IXL_FILTER_MC) == 0 || + (!all && (if_foreach_llmaddr(ifp, ixl_match_maddr, f) == 0))) continue; LIST_REMOVE(f, ftle); LIST_INSERT_HEAD(&to_del, f, ftle); - to_del_cnt++; - } - - if (to_del_cnt > 0) { - ixl_del_hw_filters(vsi, &to_del, to_del_cnt); - return; + mcnt++; } - ixl_dis_multi_promisc(vsi, vsi_mcnt); - - IOCTL_DEBUGOUT("ixl_del_multi: end"); + if (mcnt > 0) + ixl_del_hw_filters(vsi, &to_del, mcnt); } void From nobody Mon Dec 23 17:16:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH4S13sZ3z5WyyR; Mon, 23 Dec 2024 17:16: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 4YH4S13GMbz51v5; Mon, 23 Dec 2024 17:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734974177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OFQcxqdQVvcZM3scWwTNtjXOPpXSJnes/z2ci71tL/8=; b=yXEshEkHGwS1DrcMkILUsyH/fXWw7xrUzENQHoqTDyKy1M1yw+E1kaat6Y6j0dAh77ecbt /VbLwl/TXUd3DfI3fJFP2sYc3VrtFB4zkfoISkFRFoDYvHfrGlDGAckfhG8xhV+zIuFyeI uh88Ml1XD0ph47jnWzLUaYFI/h/B+ixoFf0GlXcD1l2AS/UcNWH4TnXXLqc9biP2TM/Jz0 0TmEM3JIuTVogWL8x0rD6JtIKZLOjT6gWBS3VDusU0geLY3V7LcnYad8m1OiPZrYmUqip/ xR+XDt0APRjkFblgl4DdGXzT2dHEwpKOTR/dHPU7xUOEo8tZFp2YG2nR9LU1aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734974177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OFQcxqdQVvcZM3scWwTNtjXOPpXSJnes/z2ci71tL/8=; b=a8w9a5s4BG7PEdlRcUv65TsYPukMB/7xGd4BgAA0K6ehuHWg72LuKSseJje0cW1CaM7xHu k7zPR60cGhekQgclZZ/kFkvZ06L7/4TBbyXoOjLZ85CldvhBilrYVFUE1+h31wqCQoiE6H s6PzpOTWlrlJC6haUOxwtnsrXqP8PgitLHetXvOcdo3ufFvGjBxZ847ccapcIDflHcjJE0 /1iIAaKk9k3jOHcHEfZHsC8n6XzBzNB1pkHUJbIVNSSMebhw6OB6ukyhqUi30oX69RtokE UqO8xpTbD5PdrnJ5Tg3pxC8lujjmxyUnrzVOee94ZmiSHBagOJCHzRg0a96CIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734974177; a=rsa-sha256; cv=none; b=gsDeOSqAg07l9yWkitWvZ8U2inpb/5sOKfY/k1xx4gICXnP/bmGBod5Y5OnwplTXHMqVOV aqOPLWYGmyqRZffUgjKK9IHW09OGA2gLxD2s1JufA84GoZMD7jeA9Rol6dU1T+tJZV9o2L 4FvGKz8hYf7sl9kTvgUE0W7/B8ot+yCrZrmzTqS7hQejudoZD7LF9cvV8HOEMyc1hBNHac vHFX/k6vsNqpIk6TMqIlTMX6/tnX/mIifuV5OqppemmkLi2rR2cH4UTbwPgW/Tf7d63DZy 2wH54YyZaptcz1gh43nXM3aam5Te0B4SCXoXagOBsCSUEdLwKA/WauAAS79NgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH4S12sNkz12qG; Mon, 23 Dec 2024 17:16: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 4BNHGH9S079712; Mon, 23 Dec 2024 17:16:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNHGHrr079709; Mon, 23 Dec 2024 17:16:17 GMT (envelope-from git) Date: Mon, 23 Dec 2024 17:16:17 GMT Message-Id: <202412231716.4BNHGHrr079709@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: 893839b11988 - main - diff: Fix device case. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 893839b119880d3fe8ab18aba4563af6c80cb875 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=893839b119880d3fe8ab18aba4563af6c80cb875 commit 893839b119880d3fe8ab18aba4563af6c80cb875 Author: Dag-Erling Smørgrav AuthorDate: 2024-12-23 17:15:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-12-23 17:16:14 +0000 diff: Fix device case. We already fell back to Stone for FIFOs, but we actually need to fall back to Stone for everything except regular files, because libdiff's atomizer needs to know the size of its input in advance, and neither FIFOs nor devices can be trusted to report their size. MFC after: 1 week Reported by: mav Reviewed by: mav, allanjude Differential Revision: https://reviews.freebsd.org/D48181 --- usr.bin/diff/diffreg_new.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/diff/diffreg_new.c b/usr.bin/diff/diffreg_new.c index af9104559986..f54cd554ccad 100644 --- a/usr.bin/diff/diffreg_new.c +++ b/usr.bin/diff/diffreg_new.c @@ -314,8 +314,8 @@ openfile(const char *path, char **p, struct stat *st) bool can_libdiff(int flags) { - /* We can't use fifos with libdiff yet */ - if (S_ISFIFO(stb1.st_mode) || S_ISFIFO(stb2.st_mode)) + /* libdiff's atomizer can only deal with files */ + if (!S_ISREG(stb1.st_mode) || !S_ISREG(stb2.st_mode)) return false; /* Is this one of the supported input/output modes for diffreg_new? */ From nobody Mon Dec 23 17:29:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH4lM64XGz5X0kb; Mon, 23 Dec 2024 17:29:35 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp5.goneo.de [IPv6:2001:1640:5::8:30]) (using TLSv1.3 with cipher TLS_AES_256_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 4YH4lM3Sdjz52tp; Mon, 23 Dec 2024 17:29:35 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub1.goneo.de (hub1.goneo.de [85.220.129.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id 4E929240EA6; Mon, 23 Dec 2024 18:29:31 +0100 (CET) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id 5C7D0240615; Mon, 23 Dec 2024 18:29:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1734974969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=alyBtS98jmo+NyP93Cho6jGtclTm//yLXurH2imUMR0=; b=CIdhDcuh/mfnMfxkOGPYNA7j9E9gfW9Py3aITLy5GmnBy9YWi2TD9EB3Qv+N/q0GCkA9zk VKSB2h7E6twBqa/VNu056YmiqRpdZQoMghap8zyzX9hcTnal2TqDPFZNj0/iegYXNoXFi2 fBmB/rxxbzlUC+4iKWHpTBKM0Ygk16qx6mGIfzkfeitJRclL5uBOd656cf7bJIXBnWMyTU dfWvrggOYtFXaH4hLLM4vaI8jFHMgWpEF/W3Q79uG7kn+kebiRlaI59zmIInVc9ewDRxun L4V86yhhZ8rvPYSRy2DeUiePS6Way1pH3eeeeGGBloYgGH4NjPG9zYe7ZJ3L8w== Received: from thor.intern.walstatt.dynvpn.de (dynamic-077-011-159-187.77.11.pool.telefonica.de [77.11.159.187]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id EB57D240591; Mon, 23 Dec 2024 18:29:28 +0100 (CET) Date: Mon, 23 Dec 2024 18:29:01 +0100 From: FreeBSD User To: Olivier Certner Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: bc201841d139 - main - mac_do(4): Revamp manual page after MAC/do updates Message-ID: <20241223182928.024fa9a2@thor.intern.walstatt.dynvpn.de> In-Reply-To: <202412231439.4BNEdpwp079873@gitrepo.freebsd.org> References: <202412231439.4BNEdpwp079873@gitrepo.freebsd.org> Organization: walstatt-de.de List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-UID: a4cb78 X-Rspamd-UID: 636340 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:25394, ipnet:2001:1640::/32, country:DE] X-Rspamd-Queue-Id: 4YH4lM3Sdjz52tp X-Spamd-Bar: ---- Am Mon, 23 Dec 2024 14:39:51 GMT Olivier Certner schrieb: Module MAC_DO can not be compiled statically into the kernel. trying so on = most recent CURRENT, via options MAC_DO results in a=20 unknown option "MAC_DO" Kind regards, oh > The branch main has been updated by olce: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dbc201841d13928c2a088fb07ac= 0a010b36eafa13 >=20 > commit bc201841d13928c2a088fb07ac0a010b36eafa13 > Author: Olivier Certner > AuthorDate: 2024-12-19 21:13:12 +0000 > Commit: Olivier Certner > CommitDate: 2024-12-23 14:39:35 +0000 >=20 > mac_do(4): Revamp manual page after MAC/do updates > =20 > The new manual page in particular describes MAC/do's new rules syntax > and the jail support, as well as security considerations explaining t= he > overall design and how to leverage it in the most secure fashion. > =20 > Reviewed by: bapt, otis, Alexander Ziaee = (in part) > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D48153 > --- > share/man/man4/mac_do.4 | 460 ++++++++++++++++++++++++++++++++++++++++++= +----- > 1 file changed, 417 insertions(+), 43 deletions(-) >=20 > diff --git a/share/man/man4/mac_do.4 b/share/man/man4/mac_do.4 > index aa84a71b4953..9a9f669cd51c 100644 > --- a/share/man/man4/mac_do.4 > +++ b/share/man/man4/mac_do.4 > @@ -1,38 +1,274 @@ > .\"- > +.\" SPDX-License-Identifier: BSD-2-Clause > +.\" > .\" Copyright (c) 2024 Baptiste Daroussin > +.\" Copyright (c) 2024 The FreeBSD Foundation > .\" > -.\" SPDX-License-Identifier: BSD-2-Clause > +.\" Portions of this documentation were written by Olivier Certner > +.\" at Kumacom SARL under sponsorship from the FreeBSD > +.\" Foundation. > .\" > -.Dd May 22, 2024 > +.Dd December 19, 2024 > .Dt MAC_DO 4 > .Os > .Sh NAME > .Nm mac_do > -.Nd "policy allowing user to execute program as another user" > +.Nd "policy allowing unprivileged users to change process credentials" > .Sh SYNOPSIS > To compile the > -.Nm > -policy into your kernel, place the following lines > -in your kernel configruation file: > +.Sy mac_do > +policy into your kernel, place the following lines in your kernel config= uration > +file: > .Bd -ragged -offset indent > .Cd "options MAC" > .Cd "options MAC_DO" > .Ed > +.Pp > +Alternately, to load this policy module at boot time, place the followin= g line > +in your kernel configuration file: > +.Bd -ragged -offset indent > +.Cd "options MAC" > +.Ed > +.Pp > +and in > +.Xr loader.conf 5 : > +.Bd -literal -offset indent > +mac_do_load=3D"YES" > +.Ed > .Sh DESCRIPTION > The > .Nm > -policy grants users the ability to run processs as other users > -according to predefined rules. > +policy module allows unprivileged users to change process credentials ac= cording > +to rules configured by the administrator. > +It supports per-jail configuration. > +.Pp > +Currently, the > +.Nm > +policy module only produces effects to processes spwaned from the > +.Pa /usr/bin/mdo > +executable, please see > +.Xr mdo 1 > +for more details on this program. > +.Sh CREDENTIALS RULES > +Rules specify which transitions of process credentials > +.Nm > +will allow, based on current process credentials and the desired final o= nes. > +They are passed by an administrator in the form of a string having the s= pecific > +syntax described below in a top-bottom manner. > +They have been designed to be able to finely describe the desired target > +credentials in a safe and compact way. > +.Ss Top-Level List of Rules > +At the top, rules are a possibly empty list of individual rules separate= d by > +a semi-colon > +.Pq Ql ";" : > +.Dl Ao rules Ac \ =E2=9F=B6\ Oo Ao rule Ac Oo So ";" Sc Ao rule Ac Oc N= s * Oc > +They form a disjunction, i.e., > +.Nm > +authorizes a credentials transition as soon as at least one rule in the = list > +matches. > .Pp > -The exact set of kernel privileges granted are: > -.Bl -inset -compact -offset indent > -.It Dv PRIV_CRED_SETGROUPS > -.It Dv PRIV_CRED_SETUID > +One rule is composed of a > +.Li Aq from > +part > +.Pq also called Dq match > +and a > +.Li Aq to > +part > +.Pq also called Dq target , > +in this order, separated by a colon > +.Pq Ql ":" : > +.Dl Ao rule Ac \ =E2=9F=B6\ Ao from Ac So ":" Sc Ao to Ac > +.Ss Rule's Ao from Ac Part > +The first part of a rule, > +.Li Aq from , > +is matched against the credentials of the process requesting some creden= tials > +transition. > +It has the form: > +.Dl Ao from Ac \ =E2=9F=B6\ Ao type Ac So =3D Sc Ao id Ac > +.Pp > +.Li Aq type > +must be: > +.Dl Ao type Ac \ =E2=9F=B6\ Op So uid Sc | So gid Sc > +i.e., one of the literal strings > +.Ql uid > +or > +.Ql gid . > +.Li Aq id > +must be the numerical ID of a user or group, and is matched with the cur= rent > +process real ID of the corresponding type. > +.Ss Rule's Ao to Ac Part > +The second part of a rule, > +.Li Aq to , > +is a comma-separated > +.Pq Ql "," > +non-empty list of target clauses: > +.Dl Ao to Ac \ =E2=9F=B6\ Ao target_clause Ac Oo So "," Sc Ao target_cl= ause Ac Oc Ns * > +Target clauses of a given rule also form a disjunction, i.e., the IDs th= ey > +specify are alternatives for the target credentials, except in some cases > +described below. > +.Pp > +The next subsections describe the syntax of target clauses, the defaults= that > +apply and the principle of non-redundancy and non-contradiction in each = rule's > +.Li Aq to > +part. > +.Ss Target Clauses > +A target clause in a rule's > +.Li Aq to > +part must be of one of the following forms: > +.Dl Ao target_clause Ac \ =E2=9F=B6\ So any Sc > +.Dl Ao target_clause Ac \ =E2=9F=B6\ Ao flags Ac Ao type Ac So =3D Sc A= o id Ac > +The first form is a compact way to specify that any target credentials a= re > +allowed. > +The second form is similar to that of > +.Li Aq from > +clauses, with the following extensions: > +.Bl -bullet -compact > +.It > +.Li Aq id > +may also be a literal > +.Ql * > +or > +.Ql any > +or > +.Ql "." . > +.Ql * > +and > +.Ql any > +both designate any ID for the specified > +.Li Aq type , > +and are treated identically. > +.Ql "." > +designates the process' current IDs for the specified > +.Li Aq type , > +as explained below. > +.It > +.Li Aq flags > +may contain at most one of the > +.Ql + , > +.Ql - > +and > +.Ql "!" > +characters, and may be non-empty only when > +.Li Aq type > +is > +.Ql gid . > +Additionally, if > +.Li Aq id > +is > +.Ql * > +or > +.Ql any , > +only the > +.Ql + > +flag may appear. > +.El > +.Pp > +For target clauses of > +.Ql gid > +type, an absence of flag indicates that the specified group ID is allowe= d as the > +real, effective and/or saved group IDs > +.Pq the Do primary Dc groups . > +Conversely, the presence of any allowed flag indicates that the specific= ation > +concerns supplementary groups. > +Each flag has a specific meaning: > +.Bl -bullet -compact > +.It > +.Ql + > +indicates that the group ID is allowed as a supplementary group. > +.It > +.Ql "!" > +indicates that the group ID is mandatory, i.e., it must be listed in the > +supplementary groups. > +.It > +.Ql - > +indicates that the group ID must not be listed in the supplementary grou= ps. > .El > +A specification with > +.Ql - > +is only useful in conjunction with a > +.Ql + Ns > +-tagged specification where only one of them has > +.Ql "." > +as its > +.Li Aq id . > +Target clauses having the > +.Ql "!" > +or > +.Ql - > +flag are > +.Dq forcing > +clauses, and as such do not take part in the disjunction of the other > +target clauses but rather unconditionally apply in their rule. > +.Pp > +.Ql "." > +is a placeholder for IDs that the calling process already has on privile= ge > +check. > +For type > +.Ql uid , > +it designates any of the process' real, effective or > +saved user IDs. > +For type > +.Ql gid , > +its effect depends on whether flags are present. > +If none is present, it designates any of the process' real, effective or= saved > +group IDs. > +If one is present, it designates any of the process' supplementary group= s. > +.Ss Defaults for the Ao to Ac Part > +If the > +.Li Aq to > +part does not list a target clause with type > +.Ql uid , > +any of the current user IDs of the calling process is accepted. > +In other words, in this case, > +.Nm > +behaves as if a target clause of: > +.Dl uid=3D. > +had been listed. > .Pp > +Similarly, if the > +.Li Aq to > +part does not list a target clause with type > +.Ql gid , > +all the groups of the calling process are assumed to be required. > +More precisely, each of the desired real, effective and saved group IDs = must be > +one of the current real, effective or saved group ID, and all supplement= ary > +groups must be the same as those that are current. > +It is as if the > +.Li Aq to > +part had contained the following two clauses: > +.Dl gid=3D.,!gid=3D. > +.Ss Non-Redundancy and Non-Contradiction in a Ao to Ac Part > +No two target clauses of a single rule may express the exact same logica= l intent > +nor contradictory ones. > +.Pp > +In practice, no two clauses may display the same ID except for group IDs= but > +only if, each time the same ID appears, it does so with a different flag= , or no > +flags only once. > +Additionally, the specified flags in multiple occurences must not be > +contradictory. > +For example, the same group ID appearing with both > +.Ql + > +and > +.Ql - > +will cause rejection of the rule. > +.Ss Parsing Specifics > +Any amount of whitespace is allowed around tokens of the above grammar, = except > +that there may be no spaces between > +.Li Aq flags > +and > +.Li Aq id > +in target clauses. > +.Pp > +For convenience, numerical IDs may be specified as negative integers, wh= ich are > +then converted to unsigned ones as specified in the C standard for the > +.Vt uid_t > +and > +.Vt gid_t > +types, which are both 64-bit unsigned integers. > +.Sh RUNTIME CONFIGURATION > The following > .Xr sysctl 8 > -MIBs are available: > +knobs are available: > .Bl -tag -width indent > .It Va security.mac.do.enabled > Enable the > @@ -40,39 +276,177 @@ Enable the > policy. > (Default: 1). > .It Va security.mac.do.rules > -The set of rules. > +The list of credential rules, whose syntax is described in the > +.Sx CREDENTIALS RULES > +section above. > +This list is specific to each jail. > +Please see the > +.Sx JAIL SUPPORT > +section below for more details on the interaction of > +.Nm > +with jails. > +.It Va security.mac.do.print_parse_error > +Logs a message on trying to set incorrect rules via the > +.Va security.mac.do.rules > +.Xr sysctl 8 > +knob. > .El > +.Sh JAIL SUPPORT > +.Nm > +supports per-jail configuration of rules. > .Pp > -The rules consist of a list of elements separated by > -.So , Sc . > -Each element is of the form > -.Sm off > -.Do > -.Op Cm uid | Cm gid > -.Li =3D > -.Ar fid > -.Li : > -.Ar tid > -.Dc > -.Sm on . > -Where > -.Ar fid > -is the uid or gid of the user or group the rule applies to, and > -.Ar tid > -is the uid of the targetted user. > -Two special forms are accepted for > -.Ar tid : > -.Va any > -or > -.Va * , > -which allow to target any user. > -.Sh EXAMPLES > -The following rule: > +By default, at creation, a new jail has no credentials rules, effectively > +disabling > +.Nm > +for its processes. > .Pp > -.Dl security.mac.do.rules=3Duid=3D1001:80,gid=3D0:any > +The following jail parameters are defined: > +.Bl -tag -width indent > +.It Va mac.do > +Possible values are: > +.Bl -tag -width "'disable'" -compact > +.It Ql enable > +.Nm > +will enforce specific credential rules in the jail. > +The > +.Va mac.do.rules > +jail parameter must also be set in this case. > +.It Ql disable > +Disables > +.Nm > +in the jail. > +Strictly equivalent to jail creation's default behavior and to setting t= he rules > +to an empty string. > +.It Ql inherit > +The jail's credentials rules are inherited from the jail's parent > +.Pq which may themselves have been inherited . > +Modified rules propagate to all children jails configured for inheritanc= e. > +.El > +.It Va mac.do.rules > +The credentials rules for the jail. > +It is always equal to the value that can be retrieved by the > +.Xr sysctl 8 > +knob > +.Va security.mac.do.rules > +described in section > +.Sx RUNTIME CONFIGURATION . > +If set, and the jail parameter > +.Va mac.do > +is not so explicitly, the value of the latter will default to > +.Ql disable > +if empty, else to > +.Ql enable . > +.El > .Pp > -means the user with the uid 1001 can execute processes as user with uid = 80, > -all the users which belongs to the group gid 0 can execute processes as = any user. > +Each jail must have > +.Xr mdo 1 > +installed at path > +.Pa /usr/bin/mdo , > +as this path is currently not configurable. > +.Sh EXAMPLES > +Here are several examples of single rules matching processes having a re= al user > +ID of 10001: > +.Bl -tag -width indent > +.It Li uid=3D10001:uid=3D10002 > +Allows the process to switch any of its real, effective or saved user ID= to > +10002, but keeping the groups it is already in, and with the same > +primary/supplementary groups split. > +.It Li uid=3D10001:uid=3D10002,uid=3D10003 > +Same as the first example, but also allows to switch to UID 10003 instea= d of > +10002. > +.It Li uid=3D10001:uid=3D10002,gid=3D10002 > +Same as the first example, but the new primary groups must be set to 100= 02 and > +no supplementary groups should be set. > +.It Li uid=3D10001:uid=3D10002,gid=3D10002,+gid=3D.\& > +Same as the previous example, but in addition allowing to retain any cur= rent > +supplementary groups. > +.It Li uid=3D10001:uid=3D10002,gid=3D10002,!gid=3D.\& > +Same as the previous example, but with the additional constraint that all > +current supplementary groups must be kept. > +.It Li uid=3D10001:uid=3D10002,gid=3D10002,+gid=3D.,-gid=3D10001 > +Same as > +.Ql uid=3D10001:uid=3D10002,gid=3D10002,+gid=3D.\& > +above, but 10001 cannot be retained as a supplementary group. > +.It Li uid=3D10001:uid=3D10002,gid=3D10002,+gid=3D.,!gid=3D10003 > +Same as > +.Ql uid=3D10001:uid=3D10002,gid=3D10002,+gid=3D.\& > +above, with the additional constraint that 10003 must appear in the > +supplementary groups. > +.It Li uid=3D10001:uid=3D10002,gid=3D*,+gid=3D* > +Same as the first example, but lifting any constraints on groups, allowi= ng the > +process to become part of any groups it sees fit. > +.El > +.Pp > +Here are several examples of single rules matching processes having a re= al group > +ID of 10001: > +.Bl -tag -width indent > +.It Li gid=3D10001:uid=3D0 > +Makes 10001 a more powerful > +.Ql wheel > +group, allowing its members to switch to root without password. > +.It Li gid=3D10001:gid=3D10002 > +Allows the process to enter GID 10002 as a primary group, but only if > +giving up all its supplementary groups. > +.It Li security.mac.do.rules=3Dgid=3D10001:gid=3D10002,+gid=3D.\& > +Same as the previous example, but allows to retain any current supplemen= tary > +groups. > +.It Li gid=3D10001:gid=3D10002,!gid=3D.\& > +Same as the previous example, but with the additional constraint that all > +current supplementary groups must be kept. > +.El > .Sh SEE ALSO > .Xr mdo 1 , > -.Xr mac 4 > +.Xr setcred 2 , > +.Xr mac 4 , > +.Xr jail 8 , > +.Xr sysctl 8 > +.Sh AUTHORS > +.An Olivier Certner Aq Mt olce@FreeBSD.org > +.An Baptiste Daroussin Aq Mt bapt@FreeBSD.org > +.Sh BUGS > +Currently, > +.Nm > +considers only credentials transitions requested through the > +.Xr setcred 2 > +system call. > +This system call was in large part created so that > +.Nm > +can see whole credentials transitions to decide whether to authorize the= m, which > +the traditional UNIX's piecewise approach of successively changing diffe= rent > +parts of them cannot allow. > +.Pp > +However, calls to traditional or standard credentials-changing functions= can be > +considered as full transitions on their own, however limited, and as suc= h should > +be equally monitored by > +.Nm . > +Future work will lift this restriction. > +.Sh SECURITY CONSIDERATIONS > +The threat model for > +.Nm > +is to consider userland programs as generally untrustable to decide upon= which > +credentials changes are acceptable. > +It is in contrast with the traditional UNIX way to change credentials, i= n which > +specialized programs are installed with the setuid bit, giving them full > +administrator privileges so that they are effectively able to establish = new > +ones. > +Vulnerabilities in such credentials-changing programs can have catastrop= hic > +consequences on the integrity of the system. > +.Pp > +Consequently, > +.Nm > +does not rely on companion userland programs to decide whether some cred= entials > +transition is acceptable. > +Instead, it maintains its own configuration independently from the userl= and > +password and group databases. > +Establishing this configuration currently itself relies on userland prog= rams > +issuing calls to > +.Xr sysctl 3 > +or > +.Xr jail 2 . > +It should thus be established near system boot or jail start, before any > +possible attacks could happen on the system, and further measures should= be > +taken to ensure that potential corruptions does not affect the configura= tion in > +subsequent restarts, such as re-establishing pristine state or ensuring = that the > +boot procedure up to the configuration of > +.Nm > +can be trusted. >=20 --=20 O. Hartmann From nobody Mon Dec 23 18:36:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH6DW04B0z5hDf3; Mon, 23 Dec 2024 18:36: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 4YH6DV6WFtz58Cy; Mon, 23 Dec 2024 18:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734978986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RQIK77/DN1TTPXvynoUsQiDs158nlJJsehhy2cDfeV4=; b=epKZ6dQOYuLAHEk2eORXw8vmwILD/ouB3WZjY0rn38NPWWZ+q8bliQO7iLl8Bbn2BHIKEP SLL5+WB9qVyWDjY+ROWIhumFga4soE+RCbrnXZ/24PZd6/axmMamKN44JX4lXfyOX72OJi RPfsT22qaQmsKbnEzSFD5/CbopP8uYfgSd4QQYqdpCRMou6dG+/rR0qXScb/nzztNTaDP9 FRoF8MUCKXpx2dY2ZtcZjRJYXaVx/1/bUXQJKw6h8jEPR29KX1RjNL2QXwh/g0pJrjxb75 vX+TX/9ZHakFkT7EkA0N8FoP3DOL3paoAipcEnjMFUBuLypF3sd67vGel/DE3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734978986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RQIK77/DN1TTPXvynoUsQiDs158nlJJsehhy2cDfeV4=; b=pp83C30TJ4/DL82lLGBAG0EXGzH6Dv8drm8PZ2lJv4ZJAIlLeixxb7pobKRjk+YkXbSLRr FY4i5C6UvKrVyQq6xmfDLuFnjfilR52pBOHANMkYTLvTFpDPjlHmiUR87zEe53WmUbdq6j JjpCjCJx8WId3pjB5ZewQUfjTcqa/rInhMuUSSEQP9zhlSFjiYWc6RxOxedjvjinqQ22kd nyReNpHqNhGSZH28jkWlDHfQOF1KDRTmQaRs5BqLRBN+161l+C6mdkk/IYnsfl7oQKNF2e TTClGFOnlTQHAnPklZEPieXiG4sbRzaVDlttagD5L0ClJPBQrSwbq05SyVgkEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734978986; a=rsa-sha256; cv=none; b=j/ysKfqMQxQ4I3RZ3MZZFzinkgHzdwgZpyx/2cli+3qR1EtBe+ydZQmODrOEWGju12ypce lTFIM8PraSm6+anzUFqaZdHsruDkyXk9kIwwqexTqlEAgvWg6BCdkoYXCMinAYQCRvVP3I FEmM9xeXNf5z+evaT9Ps/YzPIYPwp++t5I0GDg3GpIELKuGWMOpNB7vS4nVwa05n6coaMm lyQjT+nyzyuyhX5H8atgQXSa26xxR/wtPIYVgOXtb/NDaqMmkqH54xq6yO7O1DHbYA1dBg GaSxp4wHPttwwdXCN9CndQjPAFRmSAAF3tR+9HZ1bylWRQxqcrhjt46NxV3AaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH6DV66KNz14WS; Mon, 23 Dec 2024 18:36: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 4BNIaQxs028761; Mon, 23 Dec 2024 18:36:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNIaQHO028758; Mon, 23 Dec 2024 18:36:26 GMT (envelope-from git) Date: Mon, 23 Dec 2024 18:36:26 GMT Message-Id: <202412231836.4BNIaQHO028758@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: 053a98849734 - main - tcp: don't ever return ECONNRESET on close(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 053a988497342a6fd0a717cc097d09c23f83e103 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=053a988497342a6fd0a717cc097d09c23f83e103 commit 053a988497342a6fd0a717cc097d09c23f83e103 Author: Gleb Smirnoff AuthorDate: 2024-12-23 18:35:49 +0000 Commit: Gleb Smirnoff CommitDate: 2024-12-23 18:35:49 +0000 tcp: don't ever return ECONNRESET on close(2) The SUS doesn't mention this error code as a possible one [1]. The FreeBSD manual page specifies a possible ECONNRESET for close(2): [ECONNRESET] The underlying object was a stream socket that was shut down by the peer before all pending data was delivered. In the past it had been EINVAL (see 21367f630d72), and this EINVAL was added as a safety measure in 623dce13c64ef. After conversion to ECONNRESET it had been documented in the manual page in 78e3a7fdd51e6, but I bet wasn't ever tested to actually be ever returned, cause the tcp-testsuite[2] didn't exist back then. So documentation is incorrect since 2006, if my bet wins. Anyway, in the modern FreeBSD the condition described above doesn't end up with ECONNRESET error code from close(2). The error condition is reported via SO_ERROR socket option, though. This can be checked using the tcp-testsuite, temporarily disabling the getsockopt(SO_ERROR) lines using sed command [3]. Most of these getsockopt(2)s are followed by '+0.00 close(3) = 0', which will confirm that close(2) doesn't return ECONNRESET even on a socket that has the error stored, neither it is returned in the case described in the manual page. The latter case is covered by multiple tests residing in tcp- testsuite/state-event-engine/rcv-rst-*. However, the deleted block of code could be entered in a race condition between close(2) and processing of incoming packet, when connection had already been half-closed with shutdown(SHUT_WR) and sits in TCPS_LAST_ACK. This was reported in the bug 146845. With the block deleted, we will continue into tcp_disconnect() which has proper handling of INP_DROPPED. The race explanation follows. The connection is in TCPS_LAST_ACK. The network input thread acquires the tcpcb lock first, sets INP_DROPPED, acquires the socket lock in soisdisconnected() and clears SS_ISCONNECTED. Meanwhile, the syscall thread goes through sodisconnect() which checks for SS_ISCONNECTED locklessly(!). The check passes and the thread blocks on the tcpcb lock in tcp_usr_disconnect(). Once input thread releases the lock, the syscall thread observes INP_DROPPED and returns ECONNRESET. - Thread 1: tcp_do_segment()->tcp_close()->in_pcbdrop(),soisdisconnected() - Thread 2: sys_close()...->soclose()->sodisconnect()->tcp_usr_disconnect() Note that the lockless operation in sodisconnect() isn't correct, but enforcing the socket lock there will not fix the problem. [1] https://pubs.opengroup.org/onlinepubs/9799919799/ [2] https://github.com/freebsd-net/tcp-testsuite [3] sed -i "" -Ee '/\+0\.00 getsockopt\(3, SOL_SOCKET, SO_ERROR, \[ECONNRESET\]/d' $(grep -lr ECONNRESET tcp-testsuite) PR: 146845 Reviewed by: tuexen, rrs, imp Differential Revision: https://reviews.freebsd.org/D48148 --- lib/libsys/close.2 | 5 +---- sys/netinet/tcp_usrreq.c | 5 ----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/libsys/close.2 b/lib/libsys/close.2 index 83f8604a4a22..91a7a902d70d 100644 --- a/lib/libsys/close.2 +++ b/lib/libsys/close.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 1, 2017 +.Dd December 18, 2024 .Dt CLOSE 2 .Os .Sh NAME @@ -111,9 +111,6 @@ is not an active descriptor. An interrupt was received. .It Bq Er ENOSPC The underlying object did not fit, cached data was lost. -.It Bq Er ECONNRESET -The underlying object was a stream socket that was shut down by the peer -before all pending data was delivered. .El .Pp In case of any error except diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 35578b348c9f..acc3e2ea2942 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -690,11 +690,6 @@ tcp_usr_disconnect(struct socket *so) inp = sotoinpcb(so); KASSERT(inp != NULL, ("tcp_usr_disconnect: inp == NULL")); INP_WLOCK(inp); - if (inp->inp_flags & INP_DROPPED) { - INP_WUNLOCK(inp); - NET_EPOCH_EXIT(et); - return (ECONNRESET); - } tp = intotcpcb(inp); if (tp->t_state == TCPS_TIME_WAIT) From nobody Mon Dec 23 19:13:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH73l4bJqz5hH1Z; Mon, 23 Dec 2024 19:13: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 4YH73l2TmDz40pf; Mon, 23 Dec 2024 19:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734981235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PWnnV7AjAzEBycvdPeIhzh5wGRlhz2XteHjrBi/PA3g=; b=uRhx2KsPgB976A9lPeOKsFWbROueQNuhKUKyL4vwpDqkAC3m4oApzotfGPoMS4jlCy1Ez9 hzTeM62CYGzBk207DYAClAv03Dx8MmH4LNqOYsUtomSyWb0pnXQD2/q0DWvUFS4NtScO11 BCzlPJyN8WzVTEsJYKm8JJv1rhW5Dlu32thH78+g0gQJA8HPnvWb5x2U1pjqzHa6cKNgb4 rFfMCGrJ2GPSbtJd0KV0yrwTjX5BeoQ/3dY7r9DGCYc7FoIGY5SIFrSjy6P647T//WaRvb /ygvP5dQO3Axpp19+VsYNwiMCQ0weNnU6dolgLT9dojAiGV7lNL0OBPD1eU1FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734981235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PWnnV7AjAzEBycvdPeIhzh5wGRlhz2XteHjrBi/PA3g=; b=apt/xR2OZ0KNxIwbpaOZbQ6SN5ujOyOGznXzMIamMOSwyKPNi1ojcw+Cb1Hyk4WM+KycJv Fl4PnnqJLJ1dGkh6XyafZd6vr64Nq5wZ9IwH+XbitcGMx2UluCK6HThUUBqYHbzqO+e5ON AG2wx+yFzWqGfraDpLcGdHLYJGrN30fc1m69YaYOD4nS57UmeR7Yx6B0Ekty5N6GO4Q+RA Vifyhf3cNAqJxDD1icB/0Peq26J7hizl9OVh5H2+DG88S7JCzGYz7UA12wJ7I2WZoxc/4m spbQEcxt5T3vLOX8mHzaRRwVKNc5iB5zHfZgue+KJA9Va8oRIehJdYwkPIumFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734981235; a=rsa-sha256; cv=none; b=xiVYBUGW3KgbJFu+EiLoM2MXdIg8SS0ISFJaNdAWhiNyrMJyDzY79gnVqjQprxjB4640Tl hT+bNbuLb/EcUP6lm9pihZ+4H7eGaV1fesnOXo/21lhP0WFBGSFKYIZ/sFHaNPoFJPiXGu HR86TlMiFWYuYX8/TPmrIdXX0LzF06dURtDGdGR9lBUZc/fGeKpABvK8wUQHrDgme9Dcmn tJp+8i6uuzB2Z9T1mjqmQbuf8tZLQHjmS+NkpMwT9lDP/vY0kSCoADhXsY734Gp/VKjj3z Aw/3N0+3fXHy81JNKrHKGhEjNxTBvEs/IhvEODVa6maw4x7uh337Xc05cI+PMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH73l25g6z15kx; Mon, 23 Dec 2024 19:13: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 4BNJDtHR003689; Mon, 23 Dec 2024 19:13:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNJDtMc003686; Mon, 23 Dec 2024 19:13:55 GMT (envelope-from git) Date: Mon, 23 Dec 2024 19:13:55 GMT Message-Id: <202412231913.4BNJDtMc003686@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: 5982237f1e5a - main - sed: Fix handling of an empty pattern space List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5982237f1e5a30b6b7d67b307b4d3685b00718bf Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5982237f1e5a30b6b7d67b307b4d3685b00718bf commit 5982237f1e5a30b6b7d67b307b4d3685b00718bf Author: Mohamed Akram AuthorDate: 2024-12-23 19:06:09 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 19:07:14 +0000 sed: Fix handling of an empty pattern space Add a regression test. PR: 271791 Obtained from: OpenBSD (1.38 millert) MFC after: 2 weeks --- usr.bin/sed/process.c | 10 ++++------ usr.bin/sed/tests/sed2_test.sh | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c index d06dc09542e1..c177524a528a 100644 --- a/usr.bin/sed/process.c +++ b/usr.bin/sed/process.c @@ -436,14 +436,12 @@ substitute(struct s_command *cp) * and at the end of the line, terminate. */ if (match[0].rm_so == match[0].rm_eo) { - if (*s == '\0' || *s == '\n') - slen = -1; - else - slen--; - if (*s != '\0') { + if (slen > 0) { cspace(&SS, s++, 1, APPEND); + slen--; le++; - } + } else + slen = -1; lastempty = 1; } else lastempty = 0; diff --git a/usr.bin/sed/tests/sed2_test.sh b/usr.bin/sed/tests/sed2_test.sh index f50619612561..0b849b1ea132 100755 --- a/usr.bin/sed/tests/sed2_test.sh +++ b/usr.bin/sed/tests/sed2_test.sh @@ -159,6 +159,19 @@ minus_e_body() atf_check -o 'inline:--\nab\n' sed $'1 i\\\n--' a } +atf_test_case command_D +command_D_head() +{ + atf_set "descr" "Test handling of an empty pattern space" +} +command_D_body() +{ + printf "hello\n\nworld\n" > a + + atf_check -o file:a sed -e 's/^//;P;D' a + atf_check -o file:a sed -e 's/^//;$!N;P;D' a +} + atf_init_test_cases() { atf_add_test_case inplace_command_q @@ -169,4 +182,5 @@ atf_init_test_cases() atf_add_test_case hex_subst atf_add_test_case bracket_y atf_add_test_case minus_e + atf_add_test_case command_D } From nobody Mon Dec 23 19:13:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH73m6gsMz5hH6c; Mon, 23 Dec 2024 19:13: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 4YH73m4Z4Fz40dt; Mon, 23 Dec 2024 19:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734981236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9dQqDTAvrktUKu9ehMFneDPChX3Ytv0H8H8zngqz64=; b=rOj8xFokQP5vTA14BTt/GgbysHV5kRxFOiLqpB2Qw0ar+j2BhqCzoC8XwGs58fX2zVWd/w TrwkcuFx6aGL3LArFwgCHAXGJgK2oTN6XA7XsMgJxGc5lIo/59dRyTMbdYYn9KMqXx4sHR JLuZJ3IKSBrDgqLjfjISwwT7UQnrLP0OMSX/Jexf+IS//AqJ8W+ToDSL+UaaJomegLjUUM eBSOzna1H3wS279DfdQF8+LQqnC1qNkwZ+n4xbsI3gvP+SvDcPHzj7upYVX67PHxSnF3vW Hk2/aLX0fk68kjWWlXo+OLlWUxrN2FDl6da81ItoCvdMkOr8sMJ3XWQxblwlDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734981236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9dQqDTAvrktUKu9ehMFneDPChX3Ytv0H8H8zngqz64=; b=wmxiav62toipRGX0ZDiNnsY4/Vch9v/FoerggydTp7637boINfETmQFJakzNdbA8G6imUJ PcUp9uZu5yyOIdvgnNAQUDGMtmcQmpKDnZMlLgQeJ06zL20ntnzSDzfvZhYE/mAVn3JK0x vue189d7+WBlfSP/0B6JXPN+vek3ITEx9czHxDFadPzUi90/0E3oOHlJn3VMD+QI/T2akL z6lMefnbAXH4E6Ps9LfWyRqwRIp/A9JhbXcPNYNS3ZbXR6RIzg2osvdrBuKUJQ327ycnfH 4d8UP8Ug9mnRqFbzgF1N93S8uhpJ8gIU2EUzOsR3olSNff8F6n1sceD1SEo80g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734981236; a=rsa-sha256; cv=none; b=Ym8ZqIQ4egKeX2p2Xadw86cBq5+1jlHvwAScUiRlbvAAcTBNvYXs+n3WIsblDuoB+eklqE 0vcaMCN5h8m/Z1aHZsPjgbeMQ8DfKN7pKB7fOjLgcMmQPavXBxjT7R4r0naPeXAfwmY1fm bOwubMvfq0uvXfT3exYUETB4PA4RbIT1yTQQwH1n/I0hxxeaS9LGPSYDOfK+g9r92Nv3eV foO0H3xTwVI2BZpyphvngYZewbsVNtD8cVjTypp5F8EVWM1WfsqlxfVrHNwXtWq0mRP0So C7pn9v+C0p8WouhX0UDZGWebYyB+kwv73yzZEWhvHe0sSwjTqwvpPYDciXdJ9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH73m36D2z15ky; Mon, 23 Dec 2024 19:13: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 4BNJDutE003762; Mon, 23 Dec 2024 19:13:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNJDus9003759; Mon, 23 Dec 2024 19:13:56 GMT (envelope-from git) Date: Mon, 23 Dec 2024 19:13:56 GMT Message-Id: <202412231913.4BNJDus9003759@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: 003818aca4cd - main - sed tests: Add a regression test for the c function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 003818aca4cdda47adef808a56d48003aa514029 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=003818aca4cdda47adef808a56d48003aa514029 commit 003818aca4cdda47adef808a56d48003aa514029 Author: Mark Johnston AuthorDate: 2024-12-23 19:06:11 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 19:08:15 +0000 sed tests: Add a regression test for the c function Based on the test case from PR 271817 by Mohamed Akram. PR: 271817 MFC after: 2 weeks --- usr.bin/sed/tests/sed2_test.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/usr.bin/sed/tests/sed2_test.sh b/usr.bin/sed/tests/sed2_test.sh index 0b849b1ea132..c88e998425a0 100755 --- a/usr.bin/sed/tests/sed2_test.sh +++ b/usr.bin/sed/tests/sed2_test.sh @@ -159,6 +159,28 @@ minus_e_body() atf_check -o 'inline:--\nab\n' sed $'1 i\\\n--' a } +atf_test_case command_c +command_c_head() +{ + atf_set "descr" "Verify that the 'c' command starts a new cycle" +} +command_c_body() +{ + printf "%s\n" a b c d e f > a + printf "%s\n" x c d e f > expected + + atf_check -o file:expected sed ' +/a/,/b/c\ +x +' a + + atf_check -o file:expected sed ' +/a/,/b/c\ +x +$!N +' a +} + atf_test_case command_D command_D_head() { @@ -182,5 +204,6 @@ atf_init_test_cases() atf_add_test_case hex_subst atf_add_test_case bracket_y atf_add_test_case minus_e + atf_add_test_case command_c atf_add_test_case command_D } From nobody Mon Dec 23 20:43:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH9381Qmjz5hPCg; Mon, 23 Dec 2024 20:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH9380qXYz47ym; Mon, 23 Dec 2024 20:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734986612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zK5DZ+y63uBLfsf9SwU9WTuL5aiFWHvAD7gznaaotKM=; b=S19EFjqJldFyMGYlusI/s0RQ3VclanY7MPnUY7OiQTH0ZoR4DFH3NC/2s8Ny9gI0LUhizh FklMYpX2k1hg8df5WaoG7t8dTzIrC7O+1B7hV61madDKwLQTTg9B7XKukrrK1xCkahPFAl EjwKimmK7Qc0N6aZFiRvSXkA874ewpwyHK9wirVDiIMu8sEX3iBuvNXvOD9QMdb8nkbw0y c94lA5CUNQboChNvvMdkBKioacMwis1Y6H7vlG7LFOnNEnFVYXVheObwa3nmSErJmwUg0s SYnA7svzG+M2DdQ8KHRanwcgOdBs0kfC22EBZwULeXtQibBylDTRUbWbVXesCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734986612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zK5DZ+y63uBLfsf9SwU9WTuL5aiFWHvAD7gznaaotKM=; b=Uiqaze4uaFpxNIklMxjJcmpSFNkRHYmh8F5POJjHoCjFNWnszvS2+w5p0CDv5eHQotXaSy o9UXnuaMKA/JIM+VjcMxBmhtHp53n85DTrTkt7X6uUSE/wONEl8AMATeNbbQwXrOVAk8Nh +8H3W89OnDIEs8HGQMQifrJ/tRe8/Bl4TbRUU746UDoOTuNtd3eJ888Z0KXRjxCaVzEUKp gkcSENv/u3MvGOZ9kqO5KQdTWBgXyl2HUBnU0mvUg+o6R2wCOi5di83AznghyT4VlJ+LGT oivl2NRpGWnVBngnujHWS636Qw6Nr4AYwY1e3EfeF18wenCR2KwdV2kyZCIK2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734986612; a=rsa-sha256; cv=none; b=ey323Dcz/Szh7E2AkrDa4ZeSlwwyMKLGKfCMQrEuR7K6/YngeoQ5eaYd1oQU/7e7BOftTe XzJzzib92vGd0PRu3BoTpYOQAN/fdm/040uRkTvO3S8F+1q/PiStj/uCAmCD6vvGMWMtl1 A55+9ACj34+63nA2HFmJ0wNELmgDbZy+MSS7SrpDu6tYuaNK8Qr9yAcIzlzZncIgNsYNnZ 50uDee0ObjOZLnFNjDzn65JHtFX8apWi3Zrnqw7oAgaEk55DMrwH3M2uFtZ7VPZNVc+FBz WImiExLHaTt56/kgdeuswPg2J4kPR+XI82M4PhtS9CRv/7Fsui76g0pxy5509w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH93806ztz188P; Mon, 23 Dec 2024 20:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNKhVG5070087; Mon, 23 Dec 2024 20:43:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNKhVUK070084; Mon, 23 Dec 2024 20:43:31 GMT (envelope-from git) Date: Mon, 23 Dec 2024 20:43:31 GMT Message-Id: <202412232043.4BNKhVUK070084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 969d1aa4dbfc - main - fusefs: fix a memory leak List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 969d1aa4dbfcbccd8de965f7761203208bf04e46 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=969d1aa4dbfcbccd8de965f7761203208bf04e46 commit 969d1aa4dbfcbccd8de965f7761203208bf04e46 Author: Alan Somers AuthorDate: 2024-12-23 20:26:11 +0000 Commit: Alan Somers CommitDate: 2024-12-23 20:37:19 +0000 fusefs: fix a memory leak Fix a leak of a fuse_ticket structure. The leak mostly affected NFS-exported fuse file systems, and was triggered by a failure during FUSE_LOOKUP. MFC after: 2 weeks Sponsored by: ConnectWise --- sys/fs/fuse/fuse_vfsops.c | 2 +- tests/sys/fs/fusefs/nfs.cc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/sys/fs/fuse/fuse_vfsops.c b/sys/fs/fuse/fuse_vfsops.c index e60c9aa80cfa..0da51b865873 100644 --- a/sys/fs/fuse/fuse_vfsops.c +++ b/sys/fs/fuse/fuse_vfsops.c @@ -565,7 +565,7 @@ fuse_vfsop_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) error = fdisp_wait_answ(&fdi); if (error) - return error; + goto out; feo = (struct fuse_entry_out *)fdi.answ; if (feo->nodeid == 0) { diff --git a/tests/sys/fs/fusefs/nfs.cc b/tests/sys/fs/fusefs/nfs.cc index 79fead8e77cb..27ffc8f5cbc1 100644 --- a/tests/sys/fs/fusefs/nfs.cc +++ b/tests/sys/fs/fusefs/nfs.cc @@ -144,6 +144,36 @@ TEST_F(Fhstat, lookup_dot) EXPECT_EQ(mode, sb.st_mode); } +/* Gracefully handle failures to lookup ".". */ +TEST_F(Fhstat, lookup_dot_error) +{ + const char FULLPATH[] = "mountpoint/some_dir/."; + const char RELDIRPATH[] = "some_dir"; + fhandle_t fhp; + struct stat sb; + const uint64_t ino = 42; + const mode_t mode = S_IFDIR | 0755; + const uid_t uid = 12345; + + EXPECT_LOOKUP(FUSE_ROOT_ID, RELDIRPATH) + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { + SET_OUT_HEADER_LEN(out, entry); + out.body.entry.attr.mode = mode; + out.body.entry.nodeid = ino; + out.body.entry.generation = 1; + out.body.entry.attr.uid = uid; + out.body.entry.attr_valid = UINT64_MAX; + out.body.entry.entry_valid = 0; + }))); + + EXPECT_LOOKUP(ino, ".") + .WillOnce(Invoke(ReturnErrno(EDOOFUS))); + + ASSERT_EQ(0, getfh(FULLPATH, &fhp)) << strerror(errno); + ASSERT_EQ(-1, fhstat(&fhp, &sb)); + EXPECT_EQ(EDOOFUS, errno); +} + /* Use a file handle whose entry is still cached */ TEST_F(Fhstat, cached) { From nobody Mon Dec 23 21:14:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH9lW54Rmz5hR6P; Mon, 23 Dec 2024 21:15:03 +0000 (UTC) (envelope-from olce@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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH9lW4Wvtz4FR0; Mon, 23 Dec 2024 21:15:03 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734988503; 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=ro/MCliS98TgFp2l4q0LCVBm1oGXMfq8BmvI3zhAZqU=; b=iHTp2M0FGD1Da051KY4J0eqQBKVU6RDx0g8H6AiJH42heK/mtQ7d8i1WPkMGoLYd5Ep/xj eUY2VBb6KN45xSMqay15Clc3KokuCs2DFE2CzroEqKEJA+QAR9UIzEwih/EtqHtI8jOHNB vbNLyM7R7zaMLwKkeN83fvImbnvpn57N+QXT2KVxF7UKs7Y0/jQD4iafdhcr0yzcdXcZUq e6Bpz5i1LsKcRdOj2umcmkKBI/F4ldAbztGmBmjYQ0wkBb/x4+9rPxELPLdwd/HkXthTDF ckStampbhH3A3xcx2uXnchfbbZgGWVJkvxI31dhijidOfS2KZrsV77iCV0+tFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734988503; 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=ro/MCliS98TgFp2l4q0LCVBm1oGXMfq8BmvI3zhAZqU=; b=tK1vVuQiIeaTqLkoGqTwURcpbE5iRD6pBlaJKUXhgxA+vTRI2ftxPVoYNNSOR2ahkyjAFO Nkjet9VGhOmIBX3vCMxcYAIIVYz0osL3d80CnGo8BIotzyHHJO4U24ns5UKN3lu1ERmqYF NkUROIFaEeohLGQQl9HjJ4VY0W8wMI+AxdBZEAW4tQQi3yI8AoCGrpX4snjfSpxcVUnkiP A6tIEM7F84O3+NfeGvtDD0YV8XmHPeYCsjNX6C8BIORiGQeeizxJjGeP0aDkrVteiMTBr7 QmYOr/xxdz1G/iM/fFKEblC86iIgV+agWEVFSspiceBzCAhXlBLPYvGmC7C6cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734988503; a=rsa-sha256; cv=none; b=ZHFJtZR4XpUqy7Kqyu4Bjxr+8+RJHm/NOMAGIsn2pgAM19Vfi7bVz4IinHWDVeUJutle2J PQ4OolgHV/+EVGSpE00+16iTXWWt4K/yr21Fs0aQlHieG6bhvMJjeECdhUQ5NgbvkVRvN7 O1jRbHr/J1PcEOm01lOazBIdD9p2f9xQo3fI5L6LJ+Wn2wIfdkXFt4aQEx4Kxkb1QO1DcZ cyL4U7ZCP2/Z0+UseXgR7nPN9PXSM4WtetZMzU26Hsj1fFMSffXR8/bg/op/2g2Kkh5oKa 0Ncw4kxEv/EmCNwzaYQI39sw6VhJL+pxTgrEN0yhsUjUqwI8LMZg3KZAi/ut3g== Received: from francois.localnet (lfbn-tou-1-1198-221.w90-76.abo.wanadoo.fr [90.76.254.221]) (using TLSv1.3 with cipher TLS_AES_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: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YH9lW0R0Lzhb6; Mon, 23 Dec 2024 21:15:02 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: FreeBSD User Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: bc201841d139 - main - mac_do(4): Revamp manual page after MAC/do updates Date: Mon, 23 Dec 2024 22:14:54 +0100 Message-ID: <2529859.0dHE6SNnxz@francois> Organization: FreeBSD In-Reply-To: <20241223182928.024fa9a2@thor.intern.walstatt.dynvpn.de> References: <202412231439.4BNEdpwp079873@gitrepo.freebsd.org> <20241223182928.024fa9a2@thor.intern.walstatt.dynvpn.de> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart4083047.BRNeRiNLvY"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart4083047.BRNeRiNLvY Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii"; protected-headers="v1" From: Olivier Certner To: FreeBSD User Date: Mon, 23 Dec 2024 22:14:54 +0100 Message-ID: <2529859.0dHE6SNnxz@francois> Organization: FreeBSD In-Reply-To: <20241223182928.024fa9a2@thor.intern.walstatt.dynvpn.de> MIME-Version: 1.0 Hi, I didn't touch the substance of this part of the manual page, and indeed never tried to compile mac_do(4) in the kernel statically. There shouldn't be any regression in this respect (i.e., it probably never worked). Will be mostly AFK the next ~10 days, and will look at it when back. Thanks and regards. -- Olivier Certner --nextPart4083047.BRNeRiNLvY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmdp0s8ACgkQjKEwQJce Jicb3Q//Y37gYNvlc+A2gSSObebRblJUAHwV+wWkjIicSeEDraEmsQ3ajIgNYdtq M1xMZHGe2wXxOB9BPC9SNdJ4GMYcZJyiQwP5N4fww2z9t02BlGAbUKb0kv77+DVf 0wG7tgVXPZjsHAL+Wh35ZYwhmV1sEz8qtv1gadAzrgTFftyfUWuz5nJg2FGuL6OO HrqpUEk4SyQ5g8zCp19zTCpD/4njXUMuk0mocegbm0XV+G6RFTjSRkERHi6/AEN4 z1+YLmIGQpCJ3LNXJzpVrgxvjrjCqmHmBuz7aDF4VWpOyfRzqviExUA12zkvJ0tO tSjdwncZm1WC67NowaS17bi/bGLw6NDaOBFjvIFZvTtcuOWplcpgV3VSS6rU4BU1 2OLX3jCdKAy3C6Oi8/xUPGw16vbWbfw69iOI3y2NdemiQxrRXcMTukBYHs5lVgtG aiSfhZxB6KOibEtx0s2ZNT5NHzmg7Efb1wPVFH2VSkN6IUZWxOafPmx1aA9gpzny 2P75jZADRZBQqFFscBVxTlvybIWHCHabuikp/YCjUkdBFfgdeL3+AQD4Eq2k20OK Uov5PAMwCaGSjU5N1m4suPe7O2Hd5faa7JONFMe5PtGxF1Pyr/BoJlvo+l/BhcB0 OLEP2DKAxlgBDEuQgOZD4CSNuHCZ6w38NMI3gRGopNHK4I+zc/c= =W0O0 -----END PGP SIGNATURE----- --nextPart4083047.BRNeRiNLvY-- From nobody Mon Dec 23 22:00:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHBm817jjz5hVcS; Mon, 23 Dec 2024 22:00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHBm75yNSz4HwR; Mon, 23 Dec 2024 22:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734991239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gL4vAvQJG98MZU6dCzNbBpXncT6fv6pCmbjtA9TiAK4=; b=GgrkgIMJGdy8F/Co7Tz12yQgIvpQTVFZu9c4lvNj5RNcOgkd+7bLBv82P8HqyHgWqSfnik N/a0a+LqErRgWEmFOYTChATFOKMaQuvavPSozLeCjILVv5fL6De0ypWB2326l4TQ3VDkoW mvApvH3UIrQzvjqk2uwP7isx4Y4jj7uz2FIEe3UaOJnmAvOiSiGsFmO5PcZ4zq7wIWsuWR iEcm8ytxjf1Rr0S5OCq00v587stm0KIcRUGP/MIeFIfoQpejB5Z0gwQFLX8fhu3ymfo/JH +nqfG0cseyApOihqz4CN9zgnY3SxzZqVnkTIaPXmOzFk71F2NrCxfTAfid6/oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734991239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gL4vAvQJG98MZU6dCzNbBpXncT6fv6pCmbjtA9TiAK4=; b=M57o/lUteo5zJ8Z4+5YOpmd/BoImNE3jAiCeZ0Ipdi70qDWdQVxuQOx+voeLek6WWsMHMB Bf9h2gsQJBJ8BHNwCax1DJPDEmoIETnFcs08nste3VXZJYW3mOKWQ2GH6inNMbeDxXHsJs EZroG+fNXuF402ezmx2gNoAJpNHPnCp46Ff615tfkGz/oPZM/wASv+QEwXOOpzGFcK+T+h tM25CMe0clIc9TcuFt7CRvy+TFjCtr4GS+TfBNSfeF6E2gWTiFSCf0fzvnGXilYm18CchF ukzTKxEekO3m+YuLvTED1wfEXvXfQqgsxYj93E+4fOzVqfUYC1iVxNpcpjsfIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734991239; a=rsa-sha256; cv=none; b=AU68KebC88GnE+lyYnNrrgHoRoKpj5PeeP0jXiHQkuUrqMTRtJa1vvUNIo5pqKwxbjaT3M tvij2aJoUPZ0bSot9+OJTVSfT2dWQ5ZahTX9NC8DLSpIEyxQ0GzQ9YhTc9HuLRs3O0lH67 rR/2W4ehj2O0p4ZilScbcDxnf39wjcK/0ss3j5wrkZxLhUtN+W48dhOQ5wgNk7aB/B9BzQ ZAnqUb1LZtcYQvBYZg8BlcfzMdUdBWd0EJIsfIm16mZe6hi5oZUGui0/lvE0HHUEo/ld6J 3G+3N6V+QXmzrIfkLAXVkUca4ZRRkjwzGOUPBbTm1Lv+a0vhMj3wj6k3mCn76g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHBm75Wlmz1B1M; Mon, 23 Dec 2024 22:00: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 4BNM0dND013289; Mon, 23 Dec 2024 22:00:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNM0dX9013286; Mon, 23 Dec 2024 22:00:39 GMT (envelope-from git) Date: Mon, 23 Dec 2024 22:00:39 GMT Message-Id: <202412232200.4BNM0dX9013286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 673cd5f450e2 - stable/14 - sfxge: defer ether_ifattach to when ifmedia_init is done List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 673cd5f450e25d3e2f8f0bea1d35e4adf69c7667 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=673cd5f450e25d3e2f8f0bea1d35e4adf69c7667 commit 673cd5f450e25d3e2f8f0bea1d35e4adf69c7667 Author: Franco Fichtner AuthorDate: 2024-11-29 20:36:43 +0000 Commit: Kevin Bowling CommitDate: 2024-12-23 22:00:19 +0000 sfxge: defer ether_ifattach to when ifmedia_init is done Otherwise the ifmedia subsystem may call unguarded NULL function pointers. Same issue that was fixed for cxgb(4) in f2daf8995. Also see: https://github.com/opnsense/src/issues/228 (cherry picked from commit 0482974b2c021a8abbc044d3e2b1240250f791e7) --- sys/dev/sfxge/sfxge.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/dev/sfxge/sfxge.c b/sys/dev/sfxge/sfxge.c index 5fb3a3e74c2e..7d3217fb50de 100644 --- a/sys/dev/sfxge/sfxge.c +++ b/sys/dev/sfxge/sfxge.c @@ -611,8 +611,6 @@ sfxge_ifnet_init(if_t ifp, struct sfxge_softc *sc) if_sethwassistbits(ifp, CSUM_TCP | CSUM_UDP | CSUM_IP | CSUM_TSO | CSUM_TCP_IPV6 | CSUM_UDP_IPV6, 0); - ether_ifattach(ifp, encp->enc_mac_addr); - if_settransmitfn(ifp, sfxge_if_transmit); if_setqflushfn(ifp, sfxge_if_qflush); @@ -620,13 +618,11 @@ sfxge_ifnet_init(if_t ifp, struct sfxge_softc *sc) DBGPRINT(sc->dev, "ifmedia_init"); if ((rc = sfxge_port_ifmedia_init(sc)) != 0) - goto fail; + return (rc); - return (0); + ether_ifattach(ifp, encp->enc_mac_addr); -fail: - ether_ifdetach(sc->ifnet); - return (rc); + return (0); } void From nobody Mon Dec 23 22:00:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHBmW75MDz5hVV3; Mon, 23 Dec 2024 22:00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHBmW6gJBz4JTC; Mon, 23 Dec 2024 22:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734991259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=87mebdjzN+08pojh67hJ5DdSB0H2FGAw6LRyPKwnG8E=; b=ZYSZ3TSOsDkXomFvebYS8XNTmOj2TMvVxbn2J/pWnUJOZz3Q0bx1jGAfuzueh62rZSXtYh HtTnJheXJRgmVX8dtTbTByYZ44dOccuY13OUFDMxs0MzpDo2j+jgJYJ5TB7cNt1JjxOKiI ZAqOoZAEynKRWsiYa7nn4ZSL0rwgSW/eq8J5dq4NsBGssV3CfIOJABFo4mV/IRlTSaoCWd 8XiW8DfkEtxGkAN2XCPVWZabp755sw79uohFhkUFS1ThfXKWvO4P1DPf+AaW7CvCGghIHK lgkCOI5np2IootE6tF1343HchiZGeD4a4lzMfj6PIorrL8gx6fWc+Is08GiDPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734991259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=87mebdjzN+08pojh67hJ5DdSB0H2FGAw6LRyPKwnG8E=; b=SdNUm5ehOvjs4MSAavPPe9652AA5ghHYxm7nwN6jZ+oA0e3wlx6HoAOtJFYeiYPOePzgED mlCXr0hkfMOBPZ+Ig+LeaAILdBByEegU72RfOSr5hq56HzWZo8fw66kiTMkZxlpPHbsVOZ cVVDx4Kr1yVo/l0b6Emz6ebb35d7Q0ls/7x3t8yiDfH0XD2iqnFRDQxJmAXR4KQ07vDmJz KyuyYt4fCSO+l9nJAfoxuNna/G2Eee0iEgt6GGDqn4EKplW4q7BvDjp67IWoJ4vgj33ZiQ Ewj51JikwJ5QgoqYpN4Hh3uKYot1kg0jlOiWlv9dig0J2j3ElRB+Ei0BLa4dAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734991259; a=rsa-sha256; cv=none; b=eTWezV8OEfCM82Q3dSr6kiJ12wyXKc6tnswRaxZP6YQVozeMHSgoQv8JZLTDM27VnQQ7va g4xhBdxDQpAB+zAlUvIzn1GetZDq0pQ45hIsv5Up4iicTPO1wio5eV0RtTCHr39Fo+mnJv UEZkDol2qmoE7QvK7kCODGlUkjOrhNrHber7r78QJZohz9iaaI1cGARrXad0gWgeuPqtIf n4qzcArI1OzgpajF/JyFIndXde14oCB4cSCC/dgNPBHGxRR8pqbPXL13WhCRHm5sfwuXz6 VBxzH6HQ8V1325e9kfdcD/iMroqHp8tOYVBXfoSk34ee+xYOJ7AAfVGUlTCaUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHBmW6GJmz19y4; Mon, 23 Dec 2024 22:00: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 4BNM0xFj014016; Mon, 23 Dec 2024 22:00:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNM0xtn014013; Mon, 23 Dec 2024 22:00:59 GMT (envelope-from git) Date: Mon, 23 Dec 2024 22:00:59 GMT Message-Id: <202412232200.4BNM0xtn014013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 6cfff795e5aa - stable/14 - igc.4: Add I226 and other additions to supported list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6cfff795e5aae0ec1ba834666c55fe02ff586aac Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=6cfff795e5aae0ec1ba834666c55fe02ff586aac commit 6cfff795e5aae0ec1ba834666c55fe02ff586aac Author: Kevin Bowling AuthorDate: 2024-12-03 00:43:17 +0000 Commit: Kevin Bowling CommitDate: 2024-12-23 22:00:51 +0000 igc.4: Add I226 and other additions to supported list (cherry picked from commit 850f78d5a191d0058fcd20beb8b1309b795ecdbd) --- share/man/man4/igc.4 | 20 ++++++++++++++++++-- sys/dev/igc/if_igc.c | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/share/man/man4/igc.4 b/share/man/man4/igc.4 index f9bca716f7fe..a67ed1c15ee8 100644 --- a/share/man/man4/igc.4 +++ b/share/man/man4/igc.4 @@ -81,13 +81,29 @@ driver supports the following models: .Pp .Bl -bullet -compact .It +I220-V +.It +I221-V +.It I225-LM .It +I225-LMvP(2) +.It I225-V .It -I225-IT +I225-IT, I225-IT(2) +.It +I225-K, I225-K(2) +.It +I226-LM +.It +I226-LMvP +.It +I226-V +.It +I226-IT .It -I225-K +I226-K .El .Sh LOADER TUNABLES Tunables can be set at the diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 154c25a5a624..7402f89d56ff 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -56,7 +56,7 @@ static const pci_vendor_info_t igc_vendor_info_array[] = PVID(0x8086, IGC_DEV_ID_I225_K, "Intel(R) Ethernet Controller I225-K"), PVID(0x8086, IGC_DEV_ID_I225_I, - "Intel(R) Ethernet Controller I225-I"), + "Intel(R) Ethernet Controller I225-IT"), PVID(0x8086, IGC_DEV_ID_I220_V, "Intel(R) Ethernet Controller I220-V"), PVID(0x8086, IGC_DEV_ID_I225_K2, From nobody Mon Dec 23 22:02:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHBp123jWz5hVcg; Mon, 23 Dec 2024 22:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHBp11XjNz4JsP; Mon, 23 Dec 2024 22:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734991337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d7NjW9JnaiZa7Hy/FVz3vMq9flhvj+x6Ui3IoU7lvdU=; b=uCRaWedyc3pSRzj602vUQu6gLygtDZbLcVQwMqpcj2n8gnG+R6Q9UKPhVnWkk4flmJXWkW QIpWJwcwYCLBQcFG0pxHtPof9YMSMFk5gXKSBuBldEnROmO5HlylV6fjw9YwWi9apmN7Xp Xf1Pl7mJ8jPLBC53msnUAucZ6FHZfofzCTM37SVJbaj3NGN0j19BPIkZPmcKecqrEjZdtA 3pIAzsYp6YvDhYPUaJDfzt8ecGEQ0OiCgR7/HIX2LG+BpCS4NwS0HeTQDL3Th38+2k0RKJ YqTIx8iB3gDTgbapq0FyXPNUJrCbiVk1U09un4erQrxoFmPsKVQFU733oGqiRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734991337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d7NjW9JnaiZa7Hy/FVz3vMq9flhvj+x6Ui3IoU7lvdU=; b=vX8uBGa9FbNq7+84+PiPX/vxvZrjhpn/MVronK9iK50xgcgzXLE/Hm0gyrH3BQr7V8uNsn IfQcRSc3ycWFBTtxO4f+Cn/MD8OPgydTD94YX/CgFVGL43C6XYnOKNOeHKWpCgKt6NXgEE +GsFAqyWKwxxSCn0Ohr4N44FY8QaZ//Gpz/IOdmCgDXLcSDsw8alpj+5rfvDQJCGiXsGxI ZG4TgpSZcapPkCItzCpu5qsnCNvBbXnhd7SrIlYrkKMvWmzdafJyBO8iBOGXT/qNi/zLyn rNyYV6kdSGs7cgMC5u3B3qdlhM+3snOvy/wAjsIVzpFP04+I67K2onPoYFkK5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734991337; a=rsa-sha256; cv=none; b=kGGA8H/mMLeV257OM6WCiaiie+tQbnWZUNYuaouWqkSXH/a99f+rV8MDylbtUUsvHYivMm y1s8kzhxwnMT6yHzNJMYB3o5X4gjBUXAHakeJshTzbzBftBMXJHZV/b68+7rrknnMggY5i aJPfzXJgplxMlYlumicEQSEaRnOJc0ubhlYxCft4WCG4tiSSdLm2bYeACps5Sj1xT7Vy52 eZd/2+wHb36VCr1Kjfz+7uc8FTmpzqc3kqzFm1qIomTuK/8ooQaT8XRezQzoFDzu84yaUw QdiSZMKvqHD76Yp8A7QWs5PiJycz9Dvvh5B7+/sXaA3+1ndQh2vpY17eJsp+Sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHBp117Zjz19kn; Mon, 23 Dec 2024 22:02: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 4BNM2HAf019622; Mon, 23 Dec 2024 22:02:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNM2HYW019619; Mon, 23 Dec 2024 22:02:17 GMT (envelope-from git) Date: Mon, 23 Dec 2024 22:02:17 GMT Message-Id: <202412232202.4BNM2HYW019619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 4c6d5d444b15 - stable/13 - igc.4: Add I226 and other additions to supported list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4c6d5d444b1557d45721319ccd05f667cd55e514 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=4c6d5d444b1557d45721319ccd05f667cd55e514 commit 4c6d5d444b1557d45721319ccd05f667cd55e514 Author: Kevin Bowling AuthorDate: 2024-12-03 00:43:17 +0000 Commit: Kevin Bowling CommitDate: 2024-12-23 22:01:58 +0000 igc.4: Add I226 and other additions to supported list (cherry picked from commit 850f78d5a191d0058fcd20beb8b1309b795ecdbd) --- share/man/man4/igc.4 | 20 ++++++++++++++++++-- sys/dev/igc/if_igc.c | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/share/man/man4/igc.4 b/share/man/man4/igc.4 index 12e252030f97..04b0db88af18 100644 --- a/share/man/man4/igc.4 +++ b/share/man/man4/igc.4 @@ -82,13 +82,29 @@ driver supports the following models: .Pp .Bl -bullet -compact .It +I220-V +.It +I221-V +.It I225-LM .It +I225-LMvP(2) +.It I225-V .It -I225-IT +I225-IT, I225-IT(2) +.It +I225-K, I225-K(2) +.It +I226-LM +.It +I226-LMvP +.It +I226-V +.It +I226-IT .It -I225-K +I226-K .El .Sh LOADER TUNABLES Tunables can be set at the diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index e22c5578ed8d..3c058582b463 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -56,7 +56,7 @@ static const pci_vendor_info_t igc_vendor_info_array[] = PVID(0x8086, IGC_DEV_ID_I225_K, "Intel(R) Ethernet Controller I225-K"), PVID(0x8086, IGC_DEV_ID_I225_I, - "Intel(R) Ethernet Controller I225-I"), + "Intel(R) Ethernet Controller I225-IT"), PVID(0x8086, IGC_DEV_ID_I220_V, "Intel(R) Ethernet Controller I220-V"), PVID(0x8086, IGC_DEV_ID_I225_K2, From nobody Mon Dec 23 22:03:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHBqp1xWbz5hVVZ; Mon, 23 Dec 2024 22:03: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHBqp1N76z4KWm; Mon, 23 Dec 2024 22:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734991430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bxxHy2zUxJMS0Lz/z8QLaX7EvV8T3yntUeQerm00ZrI=; b=jX73h2Co7wym+mrU/Nqf82x+5mBjGtumpWfKq6q+AjV2P1CWyfsk1PV8FK5aHLSoJfmmzx 7cOt44PH0IFdWFppr+Zgs/izF80vHkQYy4+ih5EZ2IZ+MMot4ycSad0CZvckJKzi1RrP71 LPX+fmpPcNaLEGRpXg88U9WPnJumLNdaNuTL8DPqP4To+EnLEqZRRwXdJ8e0zyHGWB0oP5 abPAZZkHDV25VBDwAzZg+Jc61CePVhetBDtySs+PEUbXhcnWeBv8WSoE6mXApt4ZmNpKyQ RQ2xKAK2+zwjzOFtaUS+Pa/jOmyrThxsMT/wd8E5T2YYWSes4H1yitx8P+0Jzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734991430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bxxHy2zUxJMS0Lz/z8QLaX7EvV8T3yntUeQerm00ZrI=; b=iZM3dZjVsWAvzQ0UqI0uyLBy8Fu5ei65yY7pmm+PPmUiMe65bQ9Wu46wp939eTt2EoGjBX W0d5IODqddM1V6+G56ZcwPWV/dCcq4tZdQj7sD7mMP6BlWPi6HricLlIFD5Wky8lVJNrRI EPuLu1T3dpQyk9fz562MhyHZUAKh8OzO945TXzITfCl+d8397r585ETbUtXGrok3T14sL7 j4vbbnZUMZRW9aj+e7OBYeCDZ9PRMmucXYtyavN0n+xyo2qREM2Ya+aQfg2FGu81mJSb5L x2HDPEP3Iw1ZkwuPYY/U0TlhedyJbpUr9LaviJzFRmrvMnpEgxxlwXME8llZhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734991430; a=rsa-sha256; cv=none; b=cTki0A+ngiJsrER9d4Ec+egIIFLervIZnddgiiISV1gaf8scx0FhDogDkBifmCoH5V4Gs7 LiJWuwxRPsrFaxMgTeIAMPR+v+d9qTN/ZYGJJ6oXarBf68RuR2LpFA5tSA/THR61aAijzf auTfnWbcUA9Qg3wQjgg6v49YlCAOSJ0xXCFiHw7j7bs45LpjoET2jXGcSTCMm8Ia/FKi20 T/o5aAsODrstXX8mJ/TB5V6gCd7ejpqXt7SuoXg61SisbItWIoVtnk3ZKrHQWQ6z+13R7N +5NIfw0TcBRwA2seInK0NqUVgqbH9qn/v5GFItWvJ4kh5p6RQLiKWiOBp6VJcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHBqp0wk0z19l0; Mon, 23 Dec 2024 22:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNM3og9021294; Mon, 23 Dec 2024 22:03:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNM3oEn021291; Mon, 23 Dec 2024 22:03:50 GMT (envelope-from git) Date: Mon, 23 Dec 2024 22:03:50 GMT Message-Id: <202412232203.4BNM3oEn021291@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: 3a56015a2f5d - main - pkgbase: fix inclusion of tests in ssh, bsnmp, clibs-dev List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a56015a2f5d630910177fa79a522bb95511ccf7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3a56015a2f5d630910177fa79a522bb95511ccf7 commit 3a56015a2f5d630910177fa79a522bb95511ccf7 Author: Isaac Freund AuthorDate: 2024-12-23 21:54:29 +0000 Commit: Ed Maste CommitDate: 2024-12-23 22:03:30 +0000 pkgbase: fix inclusion of tests in ssh, bsnmp, clibs-dev Currently, files that belong in the tests package are included in the ssh, bsnmp, and clibs-dev packages: ssh.plist 24:@dir(root,wheel,0755,) /usr/tests/secure/libexec 25:@(root,wheel,0444,) /usr/tests/secure/libexec/Kyuafile bsnmp.plist 82:@dir(root,wheel,0755,) /usr/tests/lib/libbsnmp 83:@(root,wheel,0444,) /usr/tests/lib/libbsnmp/Kyuafile 84:@(root,wheel,0555,) /usr/tests/lib/libbsnmp/bsnmpd_test clibs-dev.plist 2518:@dir(root,wheel,0755,) /usr/tests/lib/csu 2519:@(root,wheel,0444,) /usr/tests/lib/csu/Kyuafile This is caused by the PACKAGE=foo assignment in foo/Makefile.inc which overrides the default PACKAGE?=tests in bsd.test.mk. To fix this, instead use PACKAGE?=foo in foo/Makefile.inc and set PACKAGE=tests in foo/tests/Makefile. PR: 249144 Reviewed by: bapt, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47025 --- lib/csu/Makefile.inc | 2 +- lib/csu/tests/Makefile | 2 ++ lib/libbsnmp/Makefile.inc | 2 +- lib/libbsnmp/tests/Makefile | 2 ++ secure/libexec/Makefile.inc | 2 +- secure/libexec/tests/Makefile | 1 + 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc index 9903b25b7011..c4a1f90b173f 100644 --- a/lib/csu/Makefile.inc +++ b/lib/csu/Makefile.inc @@ -1,4 +1,4 @@ -PACKAGE= clibs-dev +PACKAGE?= clibs-dev NO_WMISSING_VARIABLE_DECLARATIONS= # Can't instrument these files since that breaks non-sanitized programs. diff --git a/lib/csu/tests/Makefile b/lib/csu/tests/Makefile index 946d293973db..c9a0e6eff5da 100644 --- a/lib/csu/tests/Makefile +++ b/lib/csu/tests/Makefile @@ -1,3 +1,5 @@ +PACKAGE= tests + SUBDIR= dso TESTS_SUBDIRS= dynamic TESTS_SUBDIRS+= dynamiclib diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc index ea77a5f420d3..ed0d6c46bd6c 100644 --- a/lib/libbsnmp/Makefile.inc +++ b/lib/libbsnmp/Makefile.inc @@ -1,4 +1,4 @@ INCSDIR= ${INCLUDEDIR}/bsnmp -PACKAGE= bsnmp +PACKAGE?= bsnmp .include "../Makefile.inc" diff --git a/lib/libbsnmp/tests/Makefile b/lib/libbsnmp/tests/Makefile index fdd5484ec075..7a4a17e893a6 100644 --- a/lib/libbsnmp/tests/Makefile +++ b/lib/libbsnmp/tests/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + ATF_TESTS_C+= bsnmpd_test SRCS.bsmpd_test= bsnmpd_test.c diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc index 8998b613dda3..e5e48d7a9b37 100644 --- a/secure/libexec/Makefile.inc +++ b/secure/libexec/Makefile.inc @@ -1,4 +1,4 @@ BINDIR?= /usr/libexec -PACKAGE= ssh +PACKAGE?= ssh .include "../Makefile.inc" diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile index 29b1b564beca..e142d9c1e98a 100644 --- a/secure/libexec/tests/Makefile +++ b/secure/libexec/tests/Makefile @@ -1,4 +1,5 @@ .PATH: ${SRCTOP}/tests KYUAFILE= yes +PACKAGE= tests .include From nobody Mon Dec 23 22:38:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHCbG1tfsz5hXtZ; Mon, 23 Dec 2024 22:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHCbG1LZxz4Mdy; Mon, 23 Dec 2024 22:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734993482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i0pRTUJa286uDVoDYRNexXjjlU10VFmAp28U6FrqOhc=; b=jzRKSY8u3MMTRjIcGVVy7GMlmBCOotO5vKGFHEcB3Js0qkDFJKG0scqZf1mUDROM+Kt1kq 5Ooz3a8tmzOVVaXKXs50F91MSB7SBu0i78rRn0lUOPWnPVojwLXtX3G4U2ZbQoWAhwEf/m 1QjY1/a00FP0OK6o9DtunNeeNsabi51uxCABpnIrkfzPlrp9NE9ISeBY/pUy3S+NRarLfw krTcfojrNUvDTGwj24WyeRIwukNiSqcQ5YmYKMPyH3FypNtlGYpXQpBxxzPURBornNoeOn YZYPw6B30x2Pau+1uCetKZN0qI6l0tvcCCBdhQTm94BqOLrVhXzTHuVMH9Lwig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734993482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i0pRTUJa286uDVoDYRNexXjjlU10VFmAp28U6FrqOhc=; b=hCHHJOTHbJNev8PKTP3CdPF8zlwL6PYY75vVzqWt5InnXonkCfBOGo5ZiG0XfoqX6Ac4tG FieI2KYCx6xSSzxs55ZtQDf+nOlK4yfnxCkOERvNq5+Akdck/6Zik9ZZ3XxEhTP65N4TIY p9krLQXyTbskOu19JXYL+mFG2hFLmhtOXiWBY4rcfIqR87SHc6AY3ngkBJas9xcgos/4Bh Bue4ciR6Iu1/C5PnyJPJH8jAXbgsGXb68CLLAtKcbOSN43cUwO6wYC97SG88E0esLc+GyS G7zQanyTVE93PRWXqz0/UjOLtvlaPWkOJSUt25hSSHvk/3LgBP+pEQ04doKOKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734993482; a=rsa-sha256; cv=none; b=L+xJmtNCg1osVv/G+3AHsDqR8OIhmy4Ur/mvqOojvcdf9xge37ysWcHiBzHnRO/MpEoaFG rdbggY3yIq/W1E2D22elDrngpt8uVXmDcG2RmBxVaZMdQUuVBQgyTL6/9lFeF/RdvWTjTp q8guz7GPb7LO17k7sCz6P6wxBeqmAdy4we4xlwHofBCCxSdS4v2HHiHyyILGfsc6sYsSnL XmzY5fSD6cdVfv/NOiEreNF7fGI0NMoJ1dREi5yrI+UaUWyh0EKnYSjgx2ubo0dL37mtOr tiZOMrYmxcWCGkYLn+OG+zcbkuJLvlXiOqbvVqF4KjGUp/W0Q9KtjEon6o3y4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHCbG0xT4z1BKW; Mon, 23 Dec 2024 22:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNMc2FC078547; Mon, 23 Dec 2024 22:38:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNMc2M9078544; Mon, 23 Dec 2024 22:38:02 GMT (envelope-from git) Date: Mon, 23 Dec 2024 22:38:02 GMT Message-Id: <202412232238.4BNMc2M9078544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 98e34e8e2557 - main - ntp: Undo upstream (ntp.org) fix for upstream Bug 3851 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98e34e8e255767e18dd8a6c348cff8bfc01b2662 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=98e34e8e255767e18dd8a6c348cff8bfc01b2662 commit 98e34e8e255767e18dd8a6c348cff8bfc01b2662 Author: Cy Schubert AuthorDate: 2024-12-23 22:30:58 +0000 Commit: Cy Schubert CommitDate: 2024-12-23 22:37:34 +0000 ntp: Undo upstream (ntp.org) fix for upstream Bug 3851 The patch for upstream (ntp.org) fix for upstream Bug 3851 may have fixed a Linux bug but it caused a regression when ntpd is run on FreeBSD. Suggested that so@ publish an errata and merge this to releng/14.2. PR: 283116 MFH: 3 days --- contrib/ntp/ntpd/ntp_proto.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index 170294c68bb6..f9605b8feacb 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -471,6 +471,7 @@ transmit( return; } +#if 0 /* [Bug 3851] drop pool servers which can no longer be reached. */ if (MDF_PCLNT & peer->cast_flags) { if ( (IS_IPV6(&peer->srcadr) && !nonlocal_v6_addr_up) @@ -479,6 +480,7 @@ transmit( return; } } +#endif /* * In unicast modes the dance is much more intricate. It is From nobody Tue Dec 24 02:13:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHJMk3lc7z5hpWj; Tue, 24 Dec 2024 02:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHJMk390Dz4q7n; Tue, 24 Dec 2024 02:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735006402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+2wQR4ZG8uSX6iOodQWp4K+i+oq4b0iLR3fjzNM5Is4=; b=Kgq3XE5aiYb2QPBJVJsrIKAgRDS1d0io6Ry4E08ei5+J04mcpjbQE3pQgxpLBqsQKi2PUr HSTsr3dH9okCIdkpryEhCaef8Uuv4BnDvnseJkhHp2srgXk7MfYSh4+LIi15ko2t9rqZ6H KJvcZaxmQtpiHDi0neIwIc+TMIavOPZoOuZTF1Vxz6YHVRly0aHmnJUzuuwbDmSPkZhwOK f3ODdhvDSgasQF5S/3h389hGJvAEd56k3rUATl2Aa8HPLlXWmeANg0n/82jnH/p0WYViSz qkJNyBqVZXuPqa/ANIV9mM7rBvVhqQQcC2mzDTXgERCK1m8fhJaXt4aP9MeLEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735006402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+2wQR4ZG8uSX6iOodQWp4K+i+oq4b0iLR3fjzNM5Is4=; b=DQI1IT5tqMdbX/NrcEOr38r8OomUTCIpfUJvPtTDL90WbiK1RfIPLr3hYWVxIYmNtIGrN/ LoY7CWLBRoFGwjztXBNMsndDvVBFRcTgJfO8Yq0NJtLasksPtNW/WIwrxevMEej4yQDwcQ 4kGxF9D6lvXMea6acL2vmlvbNdSaaGXDioRY5cj4Fira6q4epIwQ8BCzYTewoUD/RBkeW/ RGLFIUW1QC9pjr3u1d407KQwklSYXRPeJeziCAGnEOlb/l4jG58CAFfzBOq/jNmTyBOv41 E64X24UEu+bAOOogBkL8DUk/pScbux27Psbfz5hw/rXBV9eba8/kbaTwL1Ohjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735006402; a=rsa-sha256; cv=none; b=D0lsfZM7eYrHebxms94mBs/Iw6/U29gaQsC71sZRTPXrPVDdpMHMIkvpMv+rMY6KEceaG6 Car/SdTerRQ+0kWuQT7JzMeremjvpdJFLYnyjhT1jBRkf9n6R1H4b8pWCuNl0qLif1KpwT 5I2yH3XZchAsudVlT1L1OcYo+I4yQlbz9MkG3XbgDwtPORqhYM9QUe3gYXmIOFpmG41jN8 1aN0T2jptUhrjBH/nc+jM8qpEIx8WJ10kni4jkkdHq6XLU836McXgozknhHqjwa6B5F832 b9VabRkDvShb31/3uyxecAEF6mWZx7hGGn0i2jdOl7aekmaBgYD8T65a6JEdRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHJMk2mJLzJhL; Tue, 24 Dec 2024 02:13: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 4BO2DMhA087870; Tue, 24 Dec 2024 02:13:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BO2DMLE087867; Tue, 24 Dec 2024 02:13:22 GMT (envelope-from git) Date: Tue, 24 Dec 2024 02:13:22 GMT Message-Id: <202412240213.4BO2DMLE087867@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: c21f5751ef09 - main - acpi_ibm: pass brightness events to evdev(4) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c21f5751ef0932796676e55953461e0679020e28 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c21f5751ef0932796676e55953461e0679020e28 commit c21f5751ef0932796676e55953461e0679020e28 Author: Gleb Smirnoff AuthorDate: 2024-12-24 02:10:56 +0000 Commit: Gleb Smirnoff CommitDate: 2024-12-24 02:10:56 +0000 acpi_ibm: pass brightness events to evdev(4) unless the dev.acpi_ibm.0.handlerevents sysctl is set to process them internally. The default for the latter is to ignore them, so passing to evdev(4) is enabled by default. Reviewed by: wulf, imp Tested on: Lenovo Thinpad X11 Carbon 7Th Gen Differential Revision: https://reviews.freebsd.org/D48174 --- sys/dev/acpi_support/acpi_ibm.c | 43 ++++++++++++++++++++++++++++++++++++++ sys/modules/acpi/acpi_ibm/Makefile | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c index a617088d4246..c1302508b8a2 100644 --- a/sys/dev/acpi_support/acpi_ibm.c +++ b/sys/dev/acpi_support/acpi_ibm.c @@ -37,6 +37,7 @@ */ #include "opt_acpi.h" +#include "opt_evdev.h" #include #include #include @@ -55,6 +56,11 @@ #include #include +#ifdef EVDEV_SUPPORT +#include +#include +#endif + #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("IBM") @@ -198,6 +204,9 @@ struct acpi_ibm_softc { struct sysctl_ctx_list *sysctl_ctx; struct sysctl_oid *sysctl_tree; +#ifdef EVDEV_SUPPORT + struct evdev_dev *evdev; +#endif }; static struct { @@ -363,6 +372,9 @@ static driver_t acpi_ibm_driver = { DRIVER_MODULE(acpi_ibm, acpi, acpi_ibm_driver, 0, 0); MODULE_DEPEND(acpi_ibm, acpi, 1, 1, 1); +#ifdef EVDEV_SUPPORT +MODULE_DEPEND(acpi_ibm, evdev, 1, 1, 1); +#endif static char *ibm_ids[] = {"IBM0068", "LEN0068", "LEN0268", NULL}; static int @@ -482,6 +494,20 @@ acpi_ibm_attach(device_t dev) } sc->ec_handle = acpi_get_handle(sc->ec_dev); +#ifdef EVDEV_SUPPORT + 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); + evdev_support_key(sc->evdev, KEY_BRIGHTNESSUP); + evdev_support_key(sc->evdev, KEY_BRIGHTNESSDOWN); + + if (evdev_register(sc->evdev) != 0) + return (ENXIO); +#endif + /* Get the sysctl tree */ sc->sysctl_ctx = device_get_sysctl_ctx(dev); sc->sysctl_tree = device_get_sysctl_tree(dev); @@ -627,6 +653,10 @@ acpi_ibm_detach(device_t dev) if (sc->led_dev != NULL) led_destroy(sc->led_dev); +#ifdef EVDEV_SUPPORT + evdev_free(sc->evdev); +#endif + return (0); } @@ -1499,6 +1529,19 @@ acpi_ibm_notify(ACPI_HANDLE h, UINT32 notify, void *context) /* Execute event handler */ if (sc->handler_events & (1 << (arg - 1))) acpi_ibm_eventhandler(sc, (arg & 0xff)); +#ifdef EVDEV_SUPPORT + else if ((arg & 0xff) == IBM_EVENT_BRIGHTNESS_UP || + (arg & 0xff) == IBM_EVENT_BRIGHTNESS_DOWN) { + uint16_t key; + + key = arg == IBM_EVENT_BRIGHTNESS_UP ? + KEY_BRIGHTNESSUP : KEY_BRIGHTNESSDOWN; + evdev_push_key(sc->evdev, key, 1); + evdev_sync(sc->evdev); + evdev_push_key(sc->evdev, key, 0); + evdev_sync(sc->evdev); + } +#endif /* Notify devd(8) */ acpi_UserNotify("IBM", h, (arg & 0xff)); diff --git a/sys/modules/acpi/acpi_ibm/Makefile b/sys/modules/acpi/acpi_ibm/Makefile index ac7428ac4524..40ef83d6e78c 100644 --- a/sys/modules/acpi/acpi_ibm/Makefile +++ b/sys/modules/acpi/acpi_ibm/Makefile @@ -1,6 +1,6 @@ .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_ibm SRCS= acpi_ibm.c opt_acpi.h device_if.h bus_if.h acpi_if.h -SRCS+= opt_ddb.h +SRCS+= opt_ddb.h opt_evdev.h .include From nobody Tue Dec 24 08:39:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHSxl4vMsz5Ws6s; Tue, 24 Dec 2024 08:39: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHSxl4QWKz4Ry3; Tue, 24 Dec 2024 08:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735029595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7xmvYUp94WhCjLfm1KG8jkMEyOJnKr0LBzLbfsgtVvc=; b=G3bOWjE2po+7Q7WYYzAdQSwbOjgidWdmMunrMBQu9U8w6GxroQzJhAdlW6PSaPPUN/Tm4+ NMQan7q6LEyIfGkYWRUYZ/pV9hPsxgntodewtHXm2TqLmtLntp/OBVyz1Zkhs0eMy2ZmMR jgXVpTwfi2OdPoZTZyK63HU8vkKxxdEHl6r7IBI3fED8onK2lkwrTH02g7c4cg+SJUCB8K x+61QvIY8qr0A6y5rN0br0S96lbORalfSCpx1riVJwXiiaSS4uKdh2D0MDFXlb3qblMYe5 SswBeyUtINmDf4OHWJS6GjBEo66FkhBMimd51R6nlgaEUV1YT51/bZKNEmQNlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735029595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7xmvYUp94WhCjLfm1KG8jkMEyOJnKr0LBzLbfsgtVvc=; b=mKheyYrxC8OdeCkA39/+ekJyv5AkOqaZPoeFWELsXug4rC6hX/cU+U7Mjlms8UTwa0KIYu ycHbipY0JPPK+UtPilqDLUocwIat9bwCsDLBoyK1G2PsFCXgKS4DVUCdGZqBXiuArU00H6 7XaF6mCIY8mGJiqY5RAPS6nZNNMtoL1t+isX0bxyY8g8BP7YV6P5itV4P0PqHjPiNujzO1 65B9LslVnuyckqTUsjdIm3fP1i108+A47+1zoGw8etfUmDt2LDLcO5WinVz4xvpsCwPml1 bLQcVuPTnzuB895wSQIyEAj9JFJLf49GiEe73VDKO9E5Gu3cbNyZyzx7+QFzUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735029595; a=rsa-sha256; cv=none; b=GLPLLg1Pjf+3FJEgffQUIaZ8AJWDDjOZHig+w4cFx6lfTjpL+ZWgNYm2rkCNEhKzBLCj+K hbiNqqsv5Wy9JldOzbU+85lMXOwIK8ynPeYKPyUNb7IcU77GXyN8KKj152182flQD/WVBZ qnjmdyDE+59DuNk6LPaR8FnBxSXXlw/GKf7ZhUwyIFM4mEkvufZ1bx/8IhFxwhcPbB4M6u YsE30x+Gm/PdP99aMoPqKdQ/qop76iRIHjg8s3qfygi6nsJDxjK0dtcJLnSbT9bFL8Qh7v XS5K6K6VEl6pMHSGXpaD07vsKM0N/7RlluRIkNnc2UUCaUmsfhlMG4jP+syZyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHSxl42K5zWxY; Tue, 24 Dec 2024 08:39: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 4BO8dthU001842; Tue, 24 Dec 2024 08:39:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BO8dtnm001839; Tue, 24 Dec 2024 08:39:55 GMT (envelope-from git) Date: Tue, 24 Dec 2024 08:39:55 GMT Message-Id: <202412240839.4BO8dtnm001839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Igor Ostapenko Subject: git: 2ed24e28d1d9 - main - kyua: Support is_exclusive metadata coming from an ATF test case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ed24e28d1d95c62cc37ca3534d4d33360b4cef2 Auto-Submitted: auto-generated The branch main has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=2ed24e28d1d95c62cc37ca3534d4d33360b4cef2 commit 2ed24e28d1d95c62cc37ca3534d4d33360b4cef2 Author: Igor Ostapenko AuthorDate: 2024-12-24 08:36:33 +0000 Commit: Igor Ostapenko CommitDate: 2024-12-24 08:36:33 +0000 kyua: Support is_exclusive metadata coming from an ATF test case On ATF side it is named "is.exclusive". Reviewed by: ngie, markj MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47671 --- contrib/kyua/engine/atf_list.cpp | 2 ++ contrib/kyua/engine/atf_list_test.cpp | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/contrib/kyua/engine/atf_list.cpp b/contrib/kyua/engine/atf_list.cpp index c9c2fed70175..c4f348ada2f6 100644 --- a/contrib/kyua/engine/atf_list.cpp +++ b/contrib/kyua/engine/atf_list.cpp @@ -125,6 +125,8 @@ engine::parse_atf_metadata(const model::properties_map& props) mdbuilder.set_string("execenv", value); } else if (name == "execenv.jail.params") { mdbuilder.set_string("execenv_jail_params", value); + } else if (name == "is.exclusive") { + mdbuilder.set_string("is_exclusive", value); } else if (name == "require.config") { mdbuilder.set_string("required_configs", value); } else if (name == "require.files") { diff --git a/contrib/kyua/engine/atf_list_test.cpp b/contrib/kyua/engine/atf_list_test.cpp index 7f19ca8fbec5..7648ee2c6a80 100644 --- a/contrib/kyua/engine/atf_list_test.cpp +++ b/contrib/kyua/engine/atf_list_test.cpp @@ -64,6 +64,7 @@ ATF_TEST_CASE_BODY(parse_atf_metadata__override_all) model::properties_map properties; properties["descr"] = "Some text"; properties["has.cleanup"] = "true"; + properties["is.exclusive"] = "true"; properties["require.arch"] = "i386 x86_64"; properties["require.config"] = "var1 var2 var3"; properties["require.files"] = "/file1 /dir/file2"; @@ -93,6 +94,7 @@ ATF_TEST_CASE_BODY(parse_atf_metadata__override_all) .add_required_program(fs::path("svn")) .set_description("Some text") .set_has_cleanup(true) + .set_is_exclusive(true) .set_required_memory(units::bytes::parse("1m")) .set_required_user("root") .set_timeout(datetime::delta(123, 0)) @@ -261,6 +263,36 @@ ATF_TEST_CASE_BODY(parse_atf_list__many_test_cases) } +ATF_TEST_CASE_WITHOUT_HEAD(parse_atf_list__is_exclusive_support); +ATF_TEST_CASE_BODY(parse_atf_list__is_exclusive_support) +{ + const std::string text = + "Content-Type: application/X-atf-tp; version=\"1\"\n" + "\n" + "ident: first\n" + "is.exclusive: false\n" + "descr: This is the descr\n" + "\n" + "ident: second\n" + "is.exclusive: true\n" + "\n" + "ident: third\n"; + std::istringstream input(text); + const model::test_cases_map tests = engine::parse_atf_list(input); + + const model::test_cases_map exp_tests = model::test_cases_map_builder() + .add("first", model::metadata_builder() + .set_description("This is the descr") + .build()) + .add("second", model::metadata_builder() + .set_is_exclusive(true) + .build()) + .add("third") + .build(); + ATF_REQUIRE_EQ(exp_tests, tests); +} + + ATF_INIT_TEST_CASES(tcs) { ATF_ADD_TEST_CASE(tcs, parse_atf_metadata__defaults); @@ -275,4 +307,5 @@ ATF_INIT_TEST_CASES(tcs) ATF_ADD_TEST_CASE(tcs, parse_atf_list__one_test_case_invalid_syntax); ATF_ADD_TEST_CASE(tcs, parse_atf_list__one_test_case_invalid_properties); ATF_ADD_TEST_CASE(tcs, parse_atf_list__many_test_cases); + ATF_ADD_TEST_CASE(tcs, parse_atf_list__is_exclusive_support); } From nobody Tue Dec 24 14:26:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHcdJ0kjsz5hFsk; Tue, 24 Dec 2024 14:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHcdJ06Q1z3xwP; Tue, 24 Dec 2024 14:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735050372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5TsBzK1vwQ11eTzViuODoCmawl/kDXNhGqo/ywhYlRI=; b=LEaVKGB7Yv9FAKR9oViSbwODHbn8vj5HeWLHPok6o9SyyrLDpM7qAy7zJNletThJiU8ZxE gzjLLVobJNLbeNjihBhUknZ/twg4Is6xzgLt2HKtQ9eV+G+H+B06iGIoPPvxod1YBn5+vJ Zrnv8kAV+HiSVxsZLojNfIPlgJx/9bhjcVOHgxdbfd1542RKlqSPita04gVFesqq/7Tn+a /F/C46WNMAUFxrcJjOe02C4dR9v3Guzp5BvIcT/mhpZov7DvGPYE/1wDbv6Njc8KbEeK0i fhKm5v9gqs0yngwJLaWZ9EKAHOtuHrkO3jpkA2W18G5DNNQolY76NgoHKX1+Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735050372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5TsBzK1vwQ11eTzViuODoCmawl/kDXNhGqo/ywhYlRI=; b=n17qW3X1rH2SkSnBQz7oSK+tDnbJZ/XUeD3rOdLtek9LuQDc1mgXo2/DnV0jS47un0cGCQ hPNXUzw+MMSKWjtJdJcI1ChKJA+mlokMzYktF3bBwVgFjm8hC8lc103gXTSnfzTg/ozU9Y 63mvRkvOAqRJDm8InJ9RNZYJ2gLLKccfVJPT9c0rWMhTcRhB+1+RpYqcEFsnA5ehSjuIPp Jb4mGQ3eSeSYtsJdLiWk73PMNl/d1wSQcBAMTinjJOoMIKmnlGg4+ZDwAd37owQxIEPudh mDvSufzEoQNw2i+ixnVY5UzD+mfWKZT/T9NilZpdDiPwa/lbxYtsO8yAti/qGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735050372; a=rsa-sha256; cv=none; b=v4f8jjdCuNGcbWRDlTrACc8KzstF60tDXH9TWo6cRguJ8SSVi+OVBgvCpkPEBwjrir2SsJ IqkrPsCDqo33sJD0vMhIxiLcyUNgQK0cn9rz8WEinMjtm6OdDs+CsT0+GUoXYJ6iRKoyZN koN0bAkOXj8qMcsurC6dEQ0l56sm66uIHbdQUcnHHkrwLyD4n6SF8NU1xhslrxzIgkcd8S cNkSp0+G3My7/1bqNOQ6FkvPvmm5CAjcUPoG4i7jSEdskj1r/2isHHUWaQF3fybCUT+yy3 HjI+pB97CyEeP+a4ZB2qgxHT/q4aPCX0NVUKKaGJg5l1k/gMB3thQBatUb97XQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHcdH6qmmzj8b; Tue, 24 Dec 2024 14:26: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 4BOEQBWR053964; Tue, 24 Dec 2024 14:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BOEQBWq053961; Tue, 24 Dec 2024 14:26:11 GMT (envelope-from git) Date: Tue, 24 Dec 2024 14:26:11 GMT Message-Id: <202412241426.4BOEQBWq053961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 3fa5d13c5be0 - stable/13 - pfctl: add -T `reset` to touch pfras_tzero only for non-zero entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3fa5d13c5be01da5796e0f3617d6da277cc16432 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3fa5d13c5be01da5796e0f3617d6da277cc16432 commit 3fa5d13c5be01da5796e0f3617d6da277cc16432 Author: Leonid Evdokimov AuthorDate: 2024-12-06 12:08:54 +0000 Commit: Kristof Provost CommitDate: 2024-12-24 10:16:50 +0000 pfctl: add -T `reset` to touch pfras_tzero only for non-zero entries This will make it easier for scripts to detect idle hosts in tables. PR: 282984 Reviewed by: kp MFC after: 2 weeks (cherry picked from commit 5b59b0c61e29f684a019afdd2848ffe2d5604e0c) --- sbin/pfctl/pfctl.8 | 7 +++- sbin/pfctl/pfctl.c | 2 +- sbin/pfctl/pfctl_radix.c | 2 +- sbin/pfctl/pfctl_table.c | 44 ++++++++++++++++++++++++ tests/sys/netpfil/pf/table.sh | 80 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 132 insertions(+), 3 deletions(-) diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8 index c1b570f225b1..642ca844023f 100644 --- a/sbin/pfctl/pfctl.8 +++ b/sbin/pfctl/pfctl.8 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 20, 2024 +.Dd November 25, 2024 .Dt PFCTL 8 .Os .Sh NAME @@ -495,6 +495,11 @@ Show the content (addresses) of a table. Test if the given addresses match a table. .It Fl T Cm zero Op Ar address ... Clear all the statistics of a table, or only for specified addresses. +.It Fl T Cm reset +Clear statistics only for addresses with non-zero statistics. Addresses +with counter values at zero and their +.Dq Cleared +timestamp are left untouched. .It Fl T Cm load Load only the table definitions from .Xr pf.conf 5 . diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 1cdcd1d0b912..8399051048b8 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -227,7 +227,7 @@ static const char * const showopt_list[] = { static const char * const tblcmdopt_list[] = { "kill", "flush", "add", "delete", "load", "replace", "show", - "test", "zero", "expire", NULL + "test", "zero", "expire", "reset", NULL }; static const char * const debugopt_list[] = { diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 7d8c146c1dda..aa27652db2ec 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -293,7 +293,7 @@ pfr_clr_astats(struct pfr_table *tbl, struct pfr_addr *addr, int size, { struct pfioc_table io; - if (size < 0 || (size && !tbl) || addr == NULL) { + if (size < 0 || !tbl || (size && !addr)) { errno = EINVAL; return (-1); } diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index cb04b2b30bac..d645846c7fd0 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -61,6 +61,7 @@ static void print_table(struct pfr_table *, int, int); static void print_tstats(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 *); static void print_astats(struct pfr_astats *, int); static void radix_perror(void); static void xprintf(int, const char *, ...); @@ -294,6 +295,36 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, if ((opts & PF_OPT_VERBOSE2) || a->pfra_fback) print_addrx(a, NULL, opts & PF_OPT_USEDNS); + } else if (!strcmp(command, "reset")) { + struct pfr_astats *as; + + b.pfrb_type = PFRB_ASTATS; + b2.pfrb_type = PFRB_ADDRS; + if (argc || file != NULL) + usage(); + do { + pfr_buf_grow(&b, b.pfrb_size); + b.pfrb_size = b.pfrb_msize; + RVTEST(pfr_get_astats(&table, b.pfrb_caddr, + &b.pfrb_size, flags)); + } while (b.pfrb_size > b.pfrb_msize); + PFRB_FOREACH(as, &b) { + as->pfras_a.pfra_fback = 0; + if (nonzero_astats(as)) + if (pfr_buf_add(&b2, &as->pfras_a)) + err(1, "duplicate buffer"); + } + + if (opts & PF_OPT_VERBOSE) + flags |= PFR_FLAG_FEEDBACK; + RVTEST(pfr_clr_astats(&table, b2.pfrb_caddr, b2.pfrb_size, + &nzero, flags)); + xprintf(opts, "%d/%d stats cleared", nzero, b.pfrb_size); + if (opts & PF_OPT_VERBOSE) + PFRB_FOREACH(a, &b2) + if ((opts & PF_OPT_VERBOSE2) || a->pfra_fback) + print_addrx(a, NULL, + opts & PF_OPT_USEDNS); } else if (!strcmp(command, "show")) { b.pfrb_type = (opts & PF_OPT_VERBOSE) ? PFRB_ASTATS : PFRB_ADDRS; @@ -485,6 +516,19 @@ print_addrx(struct pfr_addr *ad, struct pfr_addr *rad, int dns) printf("\n"); } +int +nonzero_astats(struct pfr_astats *as) +{ + uint64_t s = 0; + + for (int dir = 0; dir < PFR_DIR_MAX; dir++) + for (int op = 0; op < PFR_OP_ADDR_MAX; op++) + s |= as->pfras_packets[dir][op] | + as->pfras_bytes[dir][op]; + + return (!!s); +} + void print_astats(struct pfr_astats *as, int dns) { diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index 9e0990941466..b650884c7c30 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -165,6 +165,85 @@ zero_one_cleanup() pft_cleanup } +atf_test_case "reset_nonzero" "cleanup" +reset_nonzero_head() +{ + atf_set descr 'Test zeroing an address with non-zero counters' + atf_set require.user root +} + +reset_nonzero_body() +{ + epair_send=$(vnet_mkepair) + ifconfig ${epair_send}a 192.0.2.1/24 up + ifconfig ${epair_send}a inet alias 192.0.2.3/24 + + vnet_mkjail alcatraz ${epair_send}b + jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up + jexec alcatraz pfctl -e + + pft_set_rules alcatraz \ + "table counters { 192.0.2.1, 192.0.2.3 }" \ + "table counters { }" \ + "block all" \ + "pass in from to any" \ + "pass out from any to " \ + "pass on notReallyAnIf from to " \ + "set skip on lo" + + # Nonexisting table can't be reset, following `-T show`. + atf_check -o ignore \ + -s not-exit:0 \ + -e inline:"pfctl: Table does not exist.\n" \ + jexec alcatraz pfctl -t nonexistent -T reset + + atf_check -o ignore \ + -s exit:0 \ + -e inline:"0/0 stats cleared.\n" \ + jexec alcatraz pfctl -t bar -T reset + + # No-op is a valid operation. + atf_check -s exit:0 \ + -e inline:"0/2 stats cleared.\n" \ + jexec alcatraz pfctl -t foo -T reset + + atf_check -s exit:0 -o ignore ping -c 3 -S 192.0.2.3 192.0.2.2 + + atf_check -s exit:0 -e ignore \ + -o match:'In/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -vvT show + + local clrd uniq + clrd=`jexec alcatraz pfctl -t foo -vvT show | grep -c Cleared` + uniq=`jexec alcatraz pfctl -t foo -vvT show | sort -u | grep -c Cleared` + atf_check_equal "$clrd" 2 + atf_check_equal "$uniq" 1 # time they were added + + atf_check -s exit:0 -e ignore \ + -e inline:"1/2 stats cleared.\n" \ + jexec alcatraz pfctl -t foo -T reset + + clrd=`jexec alcatraz pfctl -t foo -vvT show | grep -c Cleared` + uniq=`jexec alcatraz pfctl -t foo -vvT show | sort -u | grep -c Cleared` + atf_check_equal "$clrd" 2 + atf_check_equal "$uniq" 2 # 192.0.2.3 should get new timestamp + + atf_check -s exit:0 -e ignore \ + -o not-match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o not-match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o match:'In/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -vvT show +} + +reset_nonzero_cleanup() +{ + pft_cleanup +} + atf_test_case "pr251414" "cleanup" pr251414_head() { @@ -381,6 +460,7 @@ atf_init_test_cases() atf_add_test_case "v4_counters" atf_add_test_case "v6_counters" atf_add_test_case "zero_one" + atf_add_test_case "reset_nonzero" atf_add_test_case "pr251414" atf_add_test_case "network" atf_add_test_case "automatic" From nobody Tue Dec 24 14:26:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHcdK1qHlz5hFnd; Tue, 24 Dec 2024 14:26: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHcdK0yyNz3xwn; Tue, 24 Dec 2024 14:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735050373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TeKtNHol7mFvrqoQbqqGAl84lEmR29Ztv+Ho32YnCY4=; b=u5B3pb8P2Ziv7J0inHJuAptoq+yYDB57Wdb4GighdrNT1hf20GyMlfa9cweHvCRiHT7FI6 dma9t1VEQ8blLVMwfGowDv667ZJjJwlkqDrHxZSnpPZEREXhugLsIUuuXHldqtvYPRnlWt ZJFcYdkjUgcv1X28HM+MRWNrJqNnmOQTlOqdZedNmJIt/o91ANCqNxi9V5BwZ3o9SMFp1y Fq2EKMiIDZo+Dx//k5lrdG2QIYKmKl9hpdcwtzdUGHyvellUyT7V+QXMYaP2VJZwmQwzEK AyvTKK+WEFuKIo8pKYdqu7F2vUWXExe0SY+ykW6ciiAx7IuiDlWZ9N+J7KeiSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735050373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TeKtNHol7mFvrqoQbqqGAl84lEmR29Ztv+Ho32YnCY4=; b=VNut0bRHUmWqqvIqnDcP9cUyb5ojrCqGcyFt1G+BjBkDkkDqGo2WtQkxJTJmmBLUc+TWtw s7L0ovGRKfKFkENfrNo6pAkDqp5IhACvEL9+CqmzPcJ98KIXYe/qlHWA4/FNOpJ+1urKlD NXi1rzLiUVtfQs2L/6wR+G5nWseaUdSw2sXE1lvlkggMd1B0SXbKY+ngBSxd/bQvTtFw9g MptUaVt0kvYFiLSX2B62AGdz+aDKku4nw40nsqxswLKVZ8x1iNzjKk9CK50NAZOvUWc9jG jHDG4ztdYfjlND+PynUbk2CaQyhGMQvN/ND9evmQ58l4W8NZDDdponnrpWftkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735050373; a=rsa-sha256; cv=none; b=ZhWwJkz7skepiIVUFd9VeZE+IJa2VELpZ9eF/kCDDley2rtOlyJ8AM6bsR0qWq2bcTLpM8 +cduJT/tUCS3CarvuFc4wxhRybOwaV1VmoS0R5cZsw4q32/TTE+5KDHMTAAgE66+a08ka+ RlGprN0mNc/iQ14X9QwxLHtOS5nT6iHuQv8FXWjZt0TmpZBzb4kjuxdH6igidivje4wpaO GyqgxOkN/s6EnzGzqCY+ZI9e5prNyoCTQe4S03UIAKk5z5s32zyuHyl6Ke3uUSgY6UGs6w sSaTA2HXbngSOWZbuVxxThmj+tHuCIls1TuIaa7UkZ8YGkCyqtR9yBEMJ7dj3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHcdK0SKBzhsG; Tue, 24 Dec 2024 14:26: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 4BOEQCbP054140; Tue, 24 Dec 2024 14:26:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BOEQCLF054137; Tue, 24 Dec 2024 14:26:12 GMT (envelope-from git) Date: Tue, 24 Dec 2024 14:26:12 GMT Message-Id: <202412241426.4BOEQCLF054137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: fd8dadbe222a - stable/13 - pf: fix potential NULL dereference in SCTP multihome handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fd8dadbe222a1ce3b49cf50a1e66b4f0b2e6c25a Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd8dadbe222a1ce3b49cf50a1e66b4f0b2e6c25a commit fd8dadbe222a1ce3b49cf50a1e66b4f0b2e6c25a Author: Kristof Provost AuthorDate: 2024-12-03 18:27:49 +0000 Commit: Kristof Provost CommitDate: 2024-12-24 10:19:27 +0000 pf: fix potential NULL dereference in SCTP multihome handling When processing an SCTP ASCONF we re-run the rules processing to check if the new state should be allowed as well. We used to do so against the 'all' interface, to allow new connections to use any interface. This is problematic for two reasons, the first being it may unexpectedly bypass interface restrictions. The more important one is that it can trigger panics. If the ruleset contains a rule which filters on interface group we'd attempt to process the group list for the 'all' interface. As this isn't a real interface it doesn't have an associated struct ifnet, and we end up dereferencing a NULL pointer. Solve this by not overriding the interface, instead leaving the physical interface the SCTP ASCONF arrived on. This implies that we may end up binding to that interface (if if-bound), and thus denying traffic on other interfaces. Users can allow this anyway by setting 'state-policy floating' on the relevant SCTP rules. This arguably better reflects user intent as well. That is, we'll consider SCTP multihomed states to be floating if we're in floating mode, and if-bound if we're if-bound. Update the test cases to account for this, while adding a "pass on lo" (i.e. pass on an interface group") rule to provoke this issue. Add separate test cases for the floating and if-bound scenarios. Reported by: Franco Fichtner MFC after: 3 weeks Sponsored by: Orange Business Services (cherry picked from commit c22c9879845653abb365e468daaa621e3f8f767a) --- sys/netpfil/pf/pf.c | 7 +--- sys/netpfil/pf/pf_if.c | 3 ++ tests/sys/netpfil/pf/sctp.py | 77 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 77 insertions(+), 10 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 8dc7a153c3ce..2ebfd08b362a 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5804,12 +5804,7 @@ again: j->pd.sctp_flags |= PFDESC_SCTP_ADD_IP; PF_RULES_RLOCK(); sm = NULL; - /* - * New connections need to be floating, because - * we cannot know what interfaces it will use. - * That's why we pass V_pfi_all rather than kif. - */ - ret = pf_test_rule(&r, &sm, pd->dir, V_pfi_all, + ret = pf_test_rule(&r, &sm, pd->dir, kif, j->m, off, &j->pd, &ra, &rs, NULL); PF_RULES_RUNLOCK(); SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, ret); diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c index 3e434bf36dbc..d66508c5ad98 100644 --- a/sys/netpfil/pf/pf_if.c +++ b/sys/netpfil/pf/pf_if.c @@ -425,6 +425,9 @@ pfi_kkif_match(struct pfi_kkif *rule_kif, struct pfi_kkif *packet_kif) NET_EPOCH_ASSERT(); + MPASS(packet_kif != NULL); + MPASS(packet_kif->pfik_ifp != NULL); + if (rule_kif == NULL || rule_kif == packet_kif) return (1); diff --git a/tests/sys/netpfil/pf/sctp.py b/tests/sys/netpfil/pf/sctp.py index 6042badffb64..38bb9f2dff74 100644 --- a/tests/sys/netpfil/pf/sctp.py +++ b/tests/sys/netpfil/pf/sctp.py @@ -268,7 +268,8 @@ class TestSCTP(VnetTestTemplate): ToolsHelper.print_output("/sbin/pfctl -e") ToolsHelper.pf_rules([ "block proto sctp", - "pass inet proto sctp to 192.0.2.0/24"]) + "pass inet proto sctp to 192.0.2.0/24", + "pass on lo"]) # Sanity check, we can communicate with the primary address. client = SCTPClient("192.0.2.3", 1234) @@ -305,6 +306,7 @@ class TestSCTP(VnetTestTemplate): ToolsHelper.print_output("/sbin/pfctl -e") ToolsHelper.pf_rules([ "block proto sctp", + "pass on lo", "pass inet proto sctp from 192.0.2.0/24"]) # Sanity check, we can communicate with the primary address. @@ -362,7 +364,7 @@ class TestSCTP(VnetTestTemplate): @pytest.mark.require_user("root") - def test_permutation(self): + def test_permutation_if_bound(self): # Test that we generate all permutations of src/dst addresses. # Assign two addresses to each end, and check for the expected states srv_vnet = self.vnet_map["vnet2"] @@ -374,6 +376,38 @@ class TestSCTP(VnetTestTemplate): ToolsHelper.pf_rules([ "set state-policy if-bound", "block proto sctp", + "pass on lo", + "pass inet proto sctp to 192.0.2.0/24"]) + + # Sanity check, we can communicate with the primary address. + client = SCTPClient("192.0.2.3", 1234) + client.send(b"hello", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "hello" + + # Check that we have a state for 192.0.2.3 and 192.0.2.2 to 192.0.2.1, but also to 192.0.2.4 + states = ToolsHelper.get_output("/sbin/pfctl -ss") + print(states) + assert re.search(r"epair.*sctp 192.0.2.1:.*192.0.2.3:1234", states) + assert re.search(r"epair.*sctp 192.0.2.1:.*192.0.2.2:1234", states) + assert re.search(r"epair.*sctp 192.0.2.4:.*192.0.2.3:1234", states) + assert re.search(r"epair.*sctp 192.0.2.4:.*192.0.2.2:1234", states) + + @pytest.mark.require_user("root") + def test_permutation_floating(self): + # Test that we generate all permutations of src/dst addresses. + # Assign two addresses to each end, and check for the expected states + srv_vnet = self.vnet_map["vnet2"] + + ifname = self.vnet_map["vnet1"].iface_alias_map["if1"].name + ToolsHelper.print_output("/sbin/ifconfig %s inet alias 192.0.2.4/24" % ifname) + + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "block proto sctp", + "pass on lo", "pass inet proto sctp to 192.0.2.0/24"]) # Sanity check, we can communicate with the primary address. @@ -387,9 +421,9 @@ class TestSCTP(VnetTestTemplate): # Check that we have a state for 192.0.2.3 and 192.0.2.2 to 192.0.2.1, but also to 192.0.2.4 states = ToolsHelper.get_output("/sbin/pfctl -ss") print(states) - assert re.search(r".*sctp 192.0.2.1:.*192.0.2.3:1234", states) + assert re.search(r"all sctp 192.0.2.1:.*192.0.2.3:1234", states) assert re.search(r"all sctp 192.0.2.1:.*192.0.2.2:1234", states) - assert re.search(r".*sctp 192.0.2.4:.*192.0.2.3:1234", states) + assert re.search(r"all sctp 192.0.2.4:.*192.0.2.3:1234", states) assert re.search(r"all sctp 192.0.2.4:.*192.0.2.2:1234", states) class TestSCTPv6(VnetTestTemplate): @@ -417,6 +451,7 @@ class TestSCTPv6(VnetTestTemplate): ToolsHelper.print_output("/sbin/pfctl -e") ToolsHelper.pf_rules([ "block proto sctp", + "pass on lo", "pass inet6 proto sctp to 2001:db8::0/64"]) # Sanity check, we can communicate with the primary address. @@ -454,6 +489,7 @@ class TestSCTPv6(VnetTestTemplate): ToolsHelper.print_output("/sbin/pfctl -e") ToolsHelper.pf_rules([ "block proto sctp", + "pass on lo", "pass inet6 proto sctp from 2001:db8::/64"]) # Sanity check, we can communicate with the primary address. @@ -518,9 +554,42 @@ class TestSCTPv6(VnetTestTemplate): ifname = self.vnet_map["vnet1"].iface_alias_map["if1"].name ToolsHelper.print_output("/sbin/ifconfig %s inet6 alias 2001:db8::4/64" % ifname) + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "set state-policy if-bound", + "block proto sctp", + "pass on lo", + "pass inet6 proto sctp to 2001:db8::0/64"]) + + # Sanity check, we can communicate with the primary address. + client = SCTPClient("2001:db8::3", 1234) + client.send(b"hello", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "hello" + + # Check that we have a state for 2001:db8::3 and 2001:db8::2 to 2001:db8::1, but also to 2001:db8::4 + states = ToolsHelper.get_output("/sbin/pfctl -ss") + print(states) + assert re.search(r"epair.*sctp 2001:db8::1\[.*2001:db8::2\[1234\]", states) + assert re.search(r"epair.*sctp 2001:db8::1\[.*2001:db8::3\[1234\]", states) + assert re.search(r"epair.*sctp 2001:db8::4\[.*2001:db8::2\[1234\]", states) + assert re.search(r"epair.*sctp 2001:db8::4\[.*2001:db8::3\[1234\]", states) + + @pytest.mark.require_user("root") + def test_permutation_floating(self): + # Test that we generate all permutations of src/dst addresses. + # Assign two addresses to each end, and check for the expected states + srv_vnet = self.vnet_map["vnet2"] + + ifname = self.vnet_map["vnet1"].iface_alias_map["if1"].name + ToolsHelper.print_output("/sbin/ifconfig %s inet6 alias 2001:db8::4/64" % ifname) + ToolsHelper.print_output("/sbin/pfctl -e") ToolsHelper.pf_rules([ "block proto sctp", + "pass on lo", "pass inet6 proto sctp to 2001:db8::0/64"]) # Sanity check, we can communicate with the primary address. From nobody Tue Dec 24 14:26:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHcdK1r9qz5hFVG; Tue, 24 Dec 2024 14:26: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHcdK0DWDz3xkn; Tue, 24 Dec 2024 14:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735050373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JEvJetuSYcnnvUyc+UZUFtU3ITYhcy4YMXRB1iw2qQQ=; b=KBw7BarFbAtkbYKXGcbcL+nrxe91IcC+L+8W/N7vUZl/F35aV75rjGN58endKDAkqgUaOu YbcgPATx1vU3VV8PoJsByXLGcx3R3/a5aMsy3jisq4vjpjpLV8dbIL14g8gdEDlleMnFAe He/NawnSMIvYOQcOxMn41zBXHUx9ExYdrk+wmkMrvnxwfVYrWNRW0koWFk36V2NTnJZI6l SjPGSMdaGKQszOW86IkYjenXokVJu9kG2OF7zy1yecIteSjoxIU6CpPN5gHikcuzeWg5EE D3aVWICN1CHJf7ctp3dtXUJc51RBVYnyFTDU38JT8uE2gFjK8gw+FHHSe+OV7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735050373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JEvJetuSYcnnvUyc+UZUFtU3ITYhcy4YMXRB1iw2qQQ=; b=rVgYeV06mTwgvF+U667OKBL3Pheyix5SRSN7K0MSdX+Bl/kPVTsq5zpit+HI/tGpw2hJRw TYZSROQJvJ870c/zqt4chGg0otdM7j+aXhPa+qMZO2nXr1e9y6Zt//OQi7AQurruKqzw6j 4wBkj1cwfs4tMxm28/dx0uoWkIxhx9SGUqas5hNGQwP3Nmu2zuJ2aGdKNNEvg3Lj0TFvU8 xViXCOR0rE6ha+dlUTwN2OYSJDfX5qk9W+n/0BF9QX5H9gbSYDE3EvXlEpi+zQnYMI/0Ol FytYocz2Be7Edxbt2b3uyIVmWkf00wxkciOyLUeVILJZ2fUGs+Qg+Zr/8LGXWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735050373; a=rsa-sha256; cv=none; b=neL5k4vtQRqrjR73FiBx4kzDKSlBjZGAcbEj7ykwlLrQWD57zrF7/b/y47xjVrTxyiSm4u xReoFB9Q3yMCa0BvDCBQ89COitplOv/JQ9Yttqwe3fp6HUYaXlHBaZ/U0eusP0Bo5gkIcL QvMThjMRrUkj5bcTqf3VjxCRGgrR2fp/x3CIp0VtbKZSnvlM3548GduOy1wTl89RxfoodA b0NSYaocS31IIQGPK9wAUrZ0HYjpFoomiySAgFxCLooOlNZFajYT9AMjGp6RVHR4OWtIE+ 1NkHwInyj1AjHhjDTce1P48mVM5c73KP8JRG164Cpvq8SnCcMGNxSD81KxzfJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHcdJ6yhJzhF2; Tue, 24 Dec 2024 14:26: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 4BOEQCnq054085; Tue, 24 Dec 2024 14:26:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BOEQCWR054082; Tue, 24 Dec 2024 14:26:12 GMT (envelope-from git) Date: Tue, 24 Dec 2024 14:26:12 GMT Message-Id: <202412241426.4BOEQCWR054082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 30b9d8a73721 - stable/14 - pfctl: add -T `reset` to touch pfras_tzero only for non-zero entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 30b9d8a73721ed762aaf02244e9429ed5fac7142 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=30b9d8a73721ed762aaf02244e9429ed5fac7142 commit 30b9d8a73721ed762aaf02244e9429ed5fac7142 Author: Leonid Evdokimov AuthorDate: 2024-12-06 12:08:54 +0000 Commit: Kristof Provost CommitDate: 2024-12-24 10:16:53 +0000 pfctl: add -T `reset` to touch pfras_tzero only for non-zero entries This will make it easier for scripts to detect idle hosts in tables. PR: 282984 Reviewed by: kp MFC after: 2 weeks (cherry picked from commit 5b59b0c61e29f684a019afdd2848ffe2d5604e0c) --- sbin/pfctl/pfctl.8 | 7 +++- sbin/pfctl/pfctl.c | 2 +- sbin/pfctl/pfctl_radix.c | 2 +- sbin/pfctl/pfctl_table.c | 44 ++++++++++++++++++++++++ tests/sys/netpfil/pf/table.sh | 80 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 132 insertions(+), 3 deletions(-) diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8 index 3a75c9a62eec..b399da94c800 100644 --- a/sbin/pfctl/pfctl.8 +++ b/sbin/pfctl/pfctl.8 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 20, 2024 +.Dd November 25, 2024 .Dt PFCTL 8 .Os .Sh NAME @@ -503,6 +503,11 @@ Show the content (addresses) of a table. Test if the given addresses match a table. .It Fl T Cm zero Op Ar address ... Clear all the statistics of a table, or only for specified addresses. +.It Fl T Cm reset +Clear statistics only for addresses with non-zero statistics. Addresses +with counter values at zero and their +.Dq Cleared +timestamp are left untouched. .It Fl T Cm load Load only the table definitions from .Xr pf.conf 5 . diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 621d97d6c555..5b5bfc636807 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -238,7 +238,7 @@ static const char * const showopt_list[] = { static const char * const tblcmdopt_list[] = { "kill", "flush", "add", "delete", "load", "replace", "show", - "test", "zero", "expire", NULL + "test", "zero", "expire", "reset", NULL }; static const char * const debugopt_list[] = { diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 7d8c146c1dda..aa27652db2ec 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -293,7 +293,7 @@ pfr_clr_astats(struct pfr_table *tbl, struct pfr_addr *addr, int size, { struct pfioc_table io; - if (size < 0 || (size && !tbl) || addr == NULL) { + if (size < 0 || !tbl || (size && !addr)) { errno = EINVAL; return (-1); } diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index 95a0d0c9171c..c5106e6c4ba9 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -61,6 +61,7 @@ static void print_table(struct pfr_table *, int, int); static void print_tstats(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 *); static void print_astats(struct pfr_astats *, int); static void radix_perror(void); static void xprintf(int, const char *, ...); @@ -294,6 +295,36 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, if ((opts & PF_OPT_VERBOSE2) || a->pfra_fback) print_addrx(a, NULL, opts & PF_OPT_USEDNS); + } else if (!strcmp(command, "reset")) { + struct pfr_astats *as; + + b.pfrb_type = PFRB_ASTATS; + b2.pfrb_type = PFRB_ADDRS; + if (argc || file != NULL) + usage(); + do { + pfr_buf_grow(&b, b.pfrb_size); + b.pfrb_size = b.pfrb_msize; + RVTEST(pfr_get_astats(&table, b.pfrb_caddr, + &b.pfrb_size, flags)); + } while (b.pfrb_size > b.pfrb_msize); + PFRB_FOREACH(as, &b) { + as->pfras_a.pfra_fback = 0; + if (nonzero_astats(as)) + if (pfr_buf_add(&b2, &as->pfras_a)) + err(1, "duplicate buffer"); + } + + if (opts & PF_OPT_VERBOSE) + flags |= PFR_FLAG_FEEDBACK; + RVTEST(pfr_clr_astats(&table, b2.pfrb_caddr, b2.pfrb_size, + &nzero, flags)); + xprintf(opts, "%d/%d stats cleared", nzero, b.pfrb_size); + if (opts & PF_OPT_VERBOSE) + PFRB_FOREACH(a, &b2) + if ((opts & PF_OPT_VERBOSE2) || a->pfra_fback) + print_addrx(a, NULL, + opts & PF_OPT_USEDNS); } else if (!strcmp(command, "show")) { b.pfrb_type = (opts & PF_OPT_VERBOSE) ? PFRB_ASTATS : PFRB_ADDRS; @@ -485,6 +516,19 @@ print_addrx(struct pfr_addr *ad, struct pfr_addr *rad, int dns) printf("\n"); } +int +nonzero_astats(struct pfr_astats *as) +{ + uint64_t s = 0; + + for (int dir = 0; dir < PFR_DIR_MAX; dir++) + for (int op = 0; op < PFR_OP_ADDR_MAX; op++) + s |= as->pfras_packets[dir][op] | + as->pfras_bytes[dir][op]; + + return (!!s); +} + void print_astats(struct pfr_astats *as, int dns) { diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index 828d76a998be..62c9d66d80ce 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -165,6 +165,85 @@ zero_one_cleanup() pft_cleanup } +atf_test_case "reset_nonzero" "cleanup" +reset_nonzero_head() +{ + atf_set descr 'Test zeroing an address with non-zero counters' + atf_set require.user root +} + +reset_nonzero_body() +{ + epair_send=$(vnet_mkepair) + ifconfig ${epair_send}a 192.0.2.1/24 up + ifconfig ${epair_send}a inet alias 192.0.2.3/24 + + vnet_mkjail alcatraz ${epair_send}b + jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up + jexec alcatraz pfctl -e + + pft_set_rules alcatraz \ + "table counters { 192.0.2.1, 192.0.2.3 }" \ + "table counters { }" \ + "block all" \ + "pass in from to any" \ + "pass out from any to " \ + "pass on notReallyAnIf from to " \ + "set skip on lo" + + # Nonexisting table can't be reset, following `-T show`. + atf_check -o ignore \ + -s not-exit:0 \ + -e inline:"pfctl: Table does not exist.\n" \ + jexec alcatraz pfctl -t nonexistent -T reset + + atf_check -o ignore \ + -s exit:0 \ + -e inline:"0/0 stats cleared.\n" \ + jexec alcatraz pfctl -t bar -T reset + + # No-op is a valid operation. + atf_check -s exit:0 \ + -e inline:"0/2 stats cleared.\n" \ + jexec alcatraz pfctl -t foo -T reset + + atf_check -s exit:0 -o ignore ping -c 3 -S 192.0.2.3 192.0.2.2 + + atf_check -s exit:0 -e ignore \ + -o match:'In/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -vvT show + + local clrd uniq + clrd=`jexec alcatraz pfctl -t foo -vvT show | grep -c Cleared` + uniq=`jexec alcatraz pfctl -t foo -vvT show | sort -u | grep -c Cleared` + atf_check_equal "$clrd" 2 + atf_check_equal "$uniq" 1 # time they were added + + atf_check -s exit:0 -e ignore \ + -e inline:"1/2 stats cleared.\n" \ + jexec alcatraz pfctl -t foo -T reset + + clrd=`jexec alcatraz pfctl -t foo -vvT show | grep -c Cleared` + uniq=`jexec alcatraz pfctl -t foo -vvT show | sort -u | grep -c Cleared` + atf_check_equal "$clrd" 2 + atf_check_equal "$uniq" 2 # 192.0.2.3 should get new timestamp + + atf_check -s exit:0 -e ignore \ + -o not-match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o not-match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o match:'In/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -vvT show +} + +reset_nonzero_cleanup() +{ + pft_cleanup +} + atf_test_case "pr251414" "cleanup" pr251414_head() { @@ -381,6 +460,7 @@ atf_init_test_cases() atf_add_test_case "v4_counters" atf_add_test_case "v6_counters" atf_add_test_case "zero_one" + atf_add_test_case "reset_nonzero" atf_add_test_case "pr251414" atf_add_test_case "automatic" atf_add_test_case "network" From nobody Tue Dec 24 14:26:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHcdL4Hd9z5hFng; Tue, 24 Dec 2024 14:26: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHcdL1VL4z3xcy; Tue, 24 Dec 2024 14:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735050374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g1GhDGrdaf1b2mUVrKuP/YcYDAwQ/oBtNBK442uIDHk=; b=ytB5t1PqTIdnFTyPUqlS+ysoLDjm/W74LnOnG7SJNqqPQRR3xoTfUmMopEe+xYlsyubTvL 6TiaJpR7Zb9iQIq+5otWz+UQL6Ckxq0WDlWHjGmo5GXYhAHwnayor0wpiR5XoeVwqIRQBk FwbX0Hi1vNZ352NDbQwHS6s5sIfMaac/8IMmmqubVrYrSw1DouHY712LNvaQsAl/gYKTjr 3/0RISpUUB3JEhq2QBbOjylGakqgSbopgDrJltP5tvR44UKPDo+DfxN+wlePTK1PAi1aTO T1n+ujWfvaWyfYaOH1nU6hVp0u2i9Zalitk0M36i16HDM/LFKKvtQMZPsrOTWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735050374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g1GhDGrdaf1b2mUVrKuP/YcYDAwQ/oBtNBK442uIDHk=; b=dDJHPSwnHS0daWNIeUItCHNTmcW60YARWF7q7XtfHQIO3pd9NKx9PWW8657zkDuKfkzCJF nexECN+ozY3BbJ3bK1UL61L1BSFV0WjV9lAkQ9P2imC58SylreSYIPJkO5PjAPfu3Alz/G lR1b8Ib0Tf3vgl0DiyQcm5jydhk2KJyS+bLz/z6YD3L8hQSqDqffFyTvv3PhwtsJLr+MPA w4rynnO9ffEZ9/mV/jpTLwll5fITg+Uyo6kKKkJCS15dAynbcQkiZ7pKi7LJzoyHHP9Vo2 Fmixw7zgMQjYUuusSfcEB/TNjxdabqS3BSCqGWcrgDagJ8mhvEC52fIAvtv8eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735050374; a=rsa-sha256; cv=none; b=nmNFDsPBLtY5ilFFvChoUevlma/gAZ5h7J9BdiIVmX/ayxlxJBr8T3G0XZGLz/H0BKl83i lWDfi1U00U4cIuGaQBNWf04L9mnK/JJkCOZAF8cbgRx8lPR6b4wAq6gxM+oRgXnvl7+dCh LpTRPCYpdIahOcAfW631AlV7somBQK2zfwnOjWp1MR/vu6Vhg8sF0GJhBPjwXCCgPvctR/ oudVdTkmco8og8+T4mooP1pzdW9oqDIQCzyHvEts0GYWA1dpFiVjJyH2oidHclFCcNTgK7 9rS/RKqbmO7cD74VBrrKfROWyaV6917UsXiJ0trpcOMfejsNIriE2Jmm1EC8JQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHcdL1385zj8c; Tue, 24 Dec 2024 14:26: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 4BOEQE16054198; Tue, 24 Dec 2024 14:26:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BOEQExk054195; Tue, 24 Dec 2024 14:26:14 GMT (envelope-from git) Date: Tue, 24 Dec 2024 14:26:14 GMT Message-Id: <202412241426.4BOEQExk054195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 13ea23ee6eeb - stable/14 - pf: fix potential NULL dereference in SCTP multihome handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 13ea23ee6eeb7aa95e1a86793dac1fdb7304c181 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=13ea23ee6eeb7aa95e1a86793dac1fdb7304c181 commit 13ea23ee6eeb7aa95e1a86793dac1fdb7304c181 Author: Kristof Provost AuthorDate: 2024-12-03 18:27:49 +0000 Commit: Kristof Provost CommitDate: 2024-12-24 10:18:58 +0000 pf: fix potential NULL dereference in SCTP multihome handling When processing an SCTP ASCONF we re-run the rules processing to check if the new state should be allowed as well. We used to do so against the 'all' interface, to allow new connections to use any interface. This is problematic for two reasons, the first being it may unexpectedly bypass interface restrictions. The more important one is that it can trigger panics. If the ruleset contains a rule which filters on interface group we'd attempt to process the group list for the 'all' interface. As this isn't a real interface it doesn't have an associated struct ifnet, and we end up dereferencing a NULL pointer. Solve this by not overriding the interface, instead leaving the physical interface the SCTP ASCONF arrived on. This implies that we may end up binding to that interface (if if-bound), and thus denying traffic on other interfaces. Users can allow this anyway by setting 'state-policy floating' on the relevant SCTP rules. This arguably better reflects user intent as well. That is, we'll consider SCTP multihomed states to be floating if we're in floating mode, and if-bound if we're if-bound. Update the test cases to account for this, while adding a "pass on lo" (i.e. pass on an interface group") rule to provoke this issue. Add separate test cases for the floating and if-bound scenarios. Reported by: Franco Fichtner MFC after: 3 weeks Sponsored by: Orange Business Services (cherry picked from commit c22c9879845653abb365e468daaa621e3f8f767a) --- sys/netpfil/pf/pf.c | 7 +--- sys/netpfil/pf/pf_if.c | 3 ++ tests/sys/netpfil/pf/sctp.py | 77 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 77 insertions(+), 10 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 80f3fdae1861..53c4fcb492da 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6407,12 +6407,7 @@ again: j->pd.sctp_flags |= PFDESC_SCTP_ADD_IP; PF_RULES_RLOCK(); sm = NULL; - /* - * New connections need to be floating, because - * we cannot know what interfaces it will use. - * That's why we pass V_pfi_all rather than kif. - */ - ret = pf_test_rule(&r, &sm, V_pfi_all, + ret = pf_test_rule(&r, &sm, kif, j->m, off, &j->pd, &ra, &rs, NULL); PF_RULES_RUNLOCK(); SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, ret); diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c index 95f63ed663ca..650a7e4db799 100644 --- a/sys/netpfil/pf/pf_if.c +++ b/sys/netpfil/pf/pf_if.c @@ -426,6 +426,9 @@ pfi_kkif_match(struct pfi_kkif *rule_kif, struct pfi_kkif *packet_kif) NET_EPOCH_ASSERT(); + MPASS(packet_kif != NULL); + MPASS(packet_kif->pfik_ifp != NULL); + if (rule_kif == NULL || rule_kif == packet_kif) return (1); diff --git a/tests/sys/netpfil/pf/sctp.py b/tests/sys/netpfil/pf/sctp.py index 6042badffb64..38bb9f2dff74 100644 --- a/tests/sys/netpfil/pf/sctp.py +++ b/tests/sys/netpfil/pf/sctp.py @@ -268,7 +268,8 @@ class TestSCTP(VnetTestTemplate): ToolsHelper.print_output("/sbin/pfctl -e") ToolsHelper.pf_rules([ "block proto sctp", - "pass inet proto sctp to 192.0.2.0/24"]) + "pass inet proto sctp to 192.0.2.0/24", + "pass on lo"]) # Sanity check, we can communicate with the primary address. client = SCTPClient("192.0.2.3", 1234) @@ -305,6 +306,7 @@ class TestSCTP(VnetTestTemplate): ToolsHelper.print_output("/sbin/pfctl -e") ToolsHelper.pf_rules([ "block proto sctp", + "pass on lo", "pass inet proto sctp from 192.0.2.0/24"]) # Sanity check, we can communicate with the primary address. @@ -362,7 +364,7 @@ class TestSCTP(VnetTestTemplate): @pytest.mark.require_user("root") - def test_permutation(self): + def test_permutation_if_bound(self): # Test that we generate all permutations of src/dst addresses. # Assign two addresses to each end, and check for the expected states srv_vnet = self.vnet_map["vnet2"] @@ -374,6 +376,38 @@ class TestSCTP(VnetTestTemplate): ToolsHelper.pf_rules([ "set state-policy if-bound", "block proto sctp", + "pass on lo", + "pass inet proto sctp to 192.0.2.0/24"]) + + # Sanity check, we can communicate with the primary address. + client = SCTPClient("192.0.2.3", 1234) + client.send(b"hello", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "hello" + + # Check that we have a state for 192.0.2.3 and 192.0.2.2 to 192.0.2.1, but also to 192.0.2.4 + states = ToolsHelper.get_output("/sbin/pfctl -ss") + print(states) + assert re.search(r"epair.*sctp 192.0.2.1:.*192.0.2.3:1234", states) + assert re.search(r"epair.*sctp 192.0.2.1:.*192.0.2.2:1234", states) + assert re.search(r"epair.*sctp 192.0.2.4:.*192.0.2.3:1234", states) + assert re.search(r"epair.*sctp 192.0.2.4:.*192.0.2.2:1234", states) + + @pytest.mark.require_user("root") + def test_permutation_floating(self): + # Test that we generate all permutations of src/dst addresses. + # Assign two addresses to each end, and check for the expected states + srv_vnet = self.vnet_map["vnet2"] + + ifname = self.vnet_map["vnet1"].iface_alias_map["if1"].name + ToolsHelper.print_output("/sbin/ifconfig %s inet alias 192.0.2.4/24" % ifname) + + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "block proto sctp", + "pass on lo", "pass inet proto sctp to 192.0.2.0/24"]) # Sanity check, we can communicate with the primary address. @@ -387,9 +421,9 @@ class TestSCTP(VnetTestTemplate): # Check that we have a state for 192.0.2.3 and 192.0.2.2 to 192.0.2.1, but also to 192.0.2.4 states = ToolsHelper.get_output("/sbin/pfctl -ss") print(states) - assert re.search(r".*sctp 192.0.2.1:.*192.0.2.3:1234", states) + assert re.search(r"all sctp 192.0.2.1:.*192.0.2.3:1234", states) assert re.search(r"all sctp 192.0.2.1:.*192.0.2.2:1234", states) - assert re.search(r".*sctp 192.0.2.4:.*192.0.2.3:1234", states) + assert re.search(r"all sctp 192.0.2.4:.*192.0.2.3:1234", states) assert re.search(r"all sctp 192.0.2.4:.*192.0.2.2:1234", states) class TestSCTPv6(VnetTestTemplate): @@ -417,6 +451,7 @@ class TestSCTPv6(VnetTestTemplate): ToolsHelper.print_output("/sbin/pfctl -e") ToolsHelper.pf_rules([ "block proto sctp", + "pass on lo", "pass inet6 proto sctp to 2001:db8::0/64"]) # Sanity check, we can communicate with the primary address. @@ -454,6 +489,7 @@ class TestSCTPv6(VnetTestTemplate): ToolsHelper.print_output("/sbin/pfctl -e") ToolsHelper.pf_rules([ "block proto sctp", + "pass on lo", "pass inet6 proto sctp from 2001:db8::/64"]) # Sanity check, we can communicate with the primary address. @@ -518,9 +554,42 @@ class TestSCTPv6(VnetTestTemplate): ifname = self.vnet_map["vnet1"].iface_alias_map["if1"].name ToolsHelper.print_output("/sbin/ifconfig %s inet6 alias 2001:db8::4/64" % ifname) + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "set state-policy if-bound", + "block proto sctp", + "pass on lo", + "pass inet6 proto sctp to 2001:db8::0/64"]) + + # Sanity check, we can communicate with the primary address. + client = SCTPClient("2001:db8::3", 1234) + client.send(b"hello", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "hello" + + # Check that we have a state for 2001:db8::3 and 2001:db8::2 to 2001:db8::1, but also to 2001:db8::4 + states = ToolsHelper.get_output("/sbin/pfctl -ss") + print(states) + assert re.search(r"epair.*sctp 2001:db8::1\[.*2001:db8::2\[1234\]", states) + assert re.search(r"epair.*sctp 2001:db8::1\[.*2001:db8::3\[1234\]", states) + assert re.search(r"epair.*sctp 2001:db8::4\[.*2001:db8::2\[1234\]", states) + assert re.search(r"epair.*sctp 2001:db8::4\[.*2001:db8::3\[1234\]", states) + + @pytest.mark.require_user("root") + def test_permutation_floating(self): + # Test that we generate all permutations of src/dst addresses. + # Assign two addresses to each end, and check for the expected states + srv_vnet = self.vnet_map["vnet2"] + + ifname = self.vnet_map["vnet1"].iface_alias_map["if1"].name + ToolsHelper.print_output("/sbin/ifconfig %s inet6 alias 2001:db8::4/64" % ifname) + ToolsHelper.print_output("/sbin/pfctl -e") ToolsHelper.pf_rules([ "block proto sctp", + "pass on lo", "pass inet6 proto sctp to 2001:db8::0/64"]) # Sanity check, we can communicate with the primary address. From nobody Tue Dec 24 21:56:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHpcY4WN7z5hvDd; Tue, 24 Dec 2024 21:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHpcY3dfyz4Srl; Tue, 24 Dec 2024 21:56:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735077373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y6DmZdggUp1Q8Cq0z9Z/zDDEsd3NgLiAgF1OQsUuJrk=; b=ALHsOFqWsrR3W5ExfXBdltulqJR73TxniduUBAqRUObRFTqKtZLvXjBWu6ngt2sg4SYeGU QIYzXvRy8URkHM/00T3KC4864r5R1IAL6jIbBpFBqa8ZZRUJdlxlxRAEwUpYcYIcI8FaBZ u/U4hXPRG7E8WAakxwfxx0+HJ3fUAycTsd/9fI8a4TSaf9BUrEAmCqQEdmtWO3ZjY5wER+ gQHpslSG3cse4yN3J9mr3dmNlxnmCEsRhlGBKv7ks4G+eX8DfiP8vj+zvfs17eY4EsIUhr azMN5V/ZhAUIZP58a1m/PW1rCALNCh1uct54Bjd5TSDlcWfjqc179SiNHKlEfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735077373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y6DmZdggUp1Q8Cq0z9Z/zDDEsd3NgLiAgF1OQsUuJrk=; b=o0jPGpBwJoabhWIWwe6LcFkEvYcdzTXFxs2ofO6D3Bk6OAP3YX8ac4yb7dYEPURoZZ9jAT ArP48vbfLjIQavwdmJoh5V6VFyXYnoEKMD+eQdMlL1cqBVWORNvSATtJmqw9qe4gGI0KtY /CJ7+Lx9oAdhIaP/KNmgWMU+dCHO5t2k24B7LJLdmpGvXlApL9S6JFWywh+rpEZqbz5TBy ndBsz+THysxBC8bvcm5oawo7UbWbctRaLpTSlIIvZ3Ga1bUBX960lW0+K9AFulEJ/zDvaY xn92qOxfXbQukasYZO39EQTxUWjuMpcp/PPBVM9idfG0Obai53h3BgvwLbAacg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735077373; a=rsa-sha256; cv=none; b=iAmf2dLi2EmDFeSkFIFnFA28cUugDuRypcQb9PVMmwR8NWVZ2xhQWdAwb08yv7eaXzebm9 Pj7noRRA6ja7LULr2jpVkGb/lDu9CIS7/PdCapeq0hF6AvXU3iFzQ4csfpaKv75dr/HT7q 1I+FK4q8v1WsOrG5efPw/+A94wMbS/NuiOIwzTOXHn3CvWnF2NpxmjDJnyiLLMkTcJ+buX bdcI3CjhrzChIaIvA800FvT3udEeJ4EGMRzWjsnK255xYWOZ3oWv/9Zajx4CJtdObtsiYI ZKlbXI8kuMVBJFx9+amoY/oS+ITH+Fs6opeG+P7DUrZJWclrHv7ImEOudGkFHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHpcY3BBtzwkm; Tue, 24 Dec 2024 21:56: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 4BOLuDVb092116; Tue, 24 Dec 2024 21:56:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BOLuDGo092113; Tue, 24 Dec 2024 21:56:13 GMT (envelope-from git) Date: Tue, 24 Dec 2024 21:56:13 GMT Message-Id: <202412242156.4BOLuDGo092113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 3f83f32d7d07 - main - fusefs: minor refactor in the tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f83f32d7d07afbb2dbff63fc6ec520f3341eec7 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3f83f32d7d07afbb2dbff63fc6ec520f3341eec7 commit 3f83f32d7d07afbb2dbff63fc6ec520f3341eec7 Author: Alan Somers AuthorDate: 2024-12-24 21:54:42 +0000 Commit: Alan Somers CommitDate: 2024-12-24 21:55:48 +0000 fusefs: minor refactor in the tests Do more work in MockFS's constructor's member initializer list, instead of the body of the constructor. It's easier to read this way. Sponsored by: ConnectWise --- tests/sys/fs/fusefs/mockfs.cc | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index 023cecd0276f..502f22a1e980 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -421,7 +421,18 @@ MockFS::MockFS(int max_readahead, bool allow_other, bool default_permissions, uint32_t kernel_minor_version, uint32_t max_write, bool async, bool noclusterr, unsigned time_gran, bool nointr, bool noatime, const char *fsname, const char *subtype) - : m_uniques(new std::unordered_set) + : m_daemon_id(NULL), + m_kernel_minor_version(kernel_minor_version), + m_kq(pm == KQ ? kqueue() : -1), + m_maxreadahead(max_readahead), + m_pid(getpid()), + m_uniques(new std::unordered_set), + m_pm(pm), + m_time_gran(time_gran), + m_child_pid(-1), + m_maxwrite(MIN(max_write, max_max_write)), + m_nready(-1), + m_quit(false) { struct sigaction sa; struct iovec *iov = NULL; @@ -429,20 +440,6 @@ MockFS::MockFS(int max_readahead, bool allow_other, bool default_permissions, char fdstr[15]; const bool trueval = true; - m_daemon_id = NULL; - m_kernel_minor_version = kernel_minor_version; - m_maxreadahead = max_readahead; - m_maxwrite = MIN(max_write, max_max_write); - m_nready = -1; - m_pm = pm; - m_time_gran = time_gran; - m_quit = false; - - if (m_pm == KQ) - m_kq = kqueue(); - else - m_kq = -1; - /* * Kyua sets pwd to a testcase-unique tempdir; no need to use * mkdtemp @@ -467,9 +464,6 @@ MockFS::MockFS(int max_readahead, bool allow_other, bool default_permissions, throw(std::system_error(errno, std::system_category(), "Couldn't open /dev/fuse")); - m_pid = getpid(); - m_child_pid = -1; - build_iovec(&iov, &iovlen, "fstype", __DECONST(void *, "fusefs"), -1); build_iovec(&iov, &iovlen, "fspath", __DECONST(void *, "mountpoint"), -1); From nobody Wed Dec 25 01:37:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHvWp0XcQz5h08D; Wed, 25 Dec 2024 01:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHvWn6s9rz4qZk; Wed, 25 Dec 2024 01:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735090646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJJeJlGaV6FdEDQs/mrmzt0PMzX7gBdxsSoJCjCx77M=; b=nw9AnvZDch6sosENLmofc4D2Ru2mjSswca+abdrrxhWqya3zE4U7GJuKf8715T03DSukKL nxSCyB7C7MB+7iSWpjPpVI7lM8Jahy6lvuOUbYfYF+vMK7AY8QsqWjjS1IUxtK0mTe4I1R 11Wku2EOLj7+VlWyp8tkbsUByRWVuI+G2aSfYz/ljAjXMbt0GgwDCmkSVO3AJVKf0AhEzD JvEjsQ8MEEFkuC6orJTS7gT6xx2VTTjA23XiJpRtksrkQeIF2PugTIseJLcShZs4gLcaAD X5tERB4eTrEm1v1TjSYRpV6ZC7xjIuIUoQL9x8cp5ST7dwGesRwQGGIzWKR1Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735090646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJJeJlGaV6FdEDQs/mrmzt0PMzX7gBdxsSoJCjCx77M=; b=ZrYyxp/d1AiKEjg0tg1vNymg7E3VGvQbHl8VPADxnyQs4t7PupcimqLo/Z4rnXqhxatsYz xojT5UgQcmbcVkmaQaFnoKajFGwtuNWS5aqr3G3hT427do3pNzghjeqvW4znIInXh2v16v WXWe1FYGE/wDDst5KIUH+guuaLh0+2pzgjxu4sej5Jy9KqyuBmvAPAegZU+n44AB3IKm9p LVbOWmC+h8QcSphz7K/yKDQlblEWFIVSN1IpwlAwxCzNPnXejkqA9RuvcKpnLoNINcyIr8 wxq7SIIrAjq4aB8ol+VfeumoJSIUYT52BW0wRUYrjuayXHCqzT3Yg3bb6fG/AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735090646; a=rsa-sha256; cv=none; b=PNEQNXkQBP4ICohEUrP9XNZ8Eogo9XwyktJFT5E1weEOKwvF7JHXXlJd24GlMqXAW+sJhS tYbbqdjWu9DHkPONAiO9rTJ1hKEgQP/lGii4TkoFeqEmyKkiHwsqrSCN4ie18FB+QK7TrS hJYg0bU16orJmn9eENu5wH54sCzQp/SoVpqSxpdsvL76INOXT2uU0MvmcxVJPzASIzT8PX FKxBT7EM4KVJ0YDvvuFlGEDLyz9Ov23aolH+hUmzIl6suAcciusG0GGaQOwap3YH5Ui8Dz PcqnygDlTq0Zr3n213XaviCjvJrgtWgbufgiABrFvfTb3lKFV5RbVr8t0dhn9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHvWn62Ncz13nY; Wed, 25 Dec 2024 01:37: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 4BP1bPTn004394; Wed, 25 Dec 2024 01:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BP1bPiL004391; Wed, 25 Dec 2024 01:37:25 GMT (envelope-from git) Date: Wed, 25 Dec 2024 01:37:25 GMT Message-Id: <202412250137.4BP1bPiL004391@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: 5e3ab1894e1e - main - amd64: extract code to print fault details from trap_fatal() into a new helper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e3ab1894e1ef0520925038f8d4e4a451e841345 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5e3ab1894e1ef0520925038f8d4e4a451e841345 commit 5e3ab1894e1ef0520925038f8d4e4a451e841345 Author: Konstantin Belousov AuthorDate: 2024-12-24 16:39:38 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-25 01:37:18 +0000 amd64: extract code to print fault details from trap_fatal() into a new helper Suggested by: markj Reviewed by: kevans, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48186 --- sys/amd64/amd64/trap.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 4590be501d64..3b23a34662d5 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -107,6 +107,7 @@ void trap_check(struct trapframe *frame); void dblfault_handler(struct trapframe *frame); static int trap_pfault(struct trapframe *, bool, int *, int *); +static void trap_diag(struct trapframe *, vm_offset_t); static void trap_fatal(struct trapframe *, vm_offset_t); #ifdef KDTRACE_HOOKS static bool trap_user_dtrace(struct trapframe *, @@ -150,6 +151,13 @@ static const char *const trap_msg[] = { [T_DTRACE_RET] = "DTrace pid return trap", }; +static const char * +traptype_to_msg(u_int type) +{ + return (type < nitems(trap_msg) ? trap_msg[type] : + "unknown/reserved trap"); +} + static int uprintf_signal; SYSCTL_INT(_machdep, OID_AUTO, uprintf_signal, CTLFLAG_RWTUN, &uprintf_signal, 0, @@ -857,15 +865,12 @@ after_vmfault: } static void -trap_fatal(struct trapframe *frame, vm_offset_t eva) +trap_diag(struct trapframe *frame, vm_offset_t eva) { int code, ss; u_int type; struct soft_segment_descriptor softseg; struct user_segment_descriptor *gdt; -#ifdef KDB - bool handled; -#endif code = frame->tf_err; type = frame->tf_trapno; @@ -925,8 +930,20 @@ trap_fatal(struct trapframe *frame, vm_offset_t eva) printf("r13: %016lx r14: %016lx r15: %016lx\n", frame->tf_r13, frame->tf_r14, frame->tf_r15); + printf("trap number = %d\n", type); +} + +static void +trap_fatal(struct trapframe *frame, vm_offset_t eva) +{ + u_int type; + + type = frame->tf_trapno; + trap_diag(frame, eva); #ifdef KDB if (debugger_on_trap) { + bool handled; + kdb_why = KDB_WHY_TRAP; handled = kdb_trap(type, 0, frame); kdb_why = KDB_WHY_UNSET; @@ -934,9 +951,7 @@ trap_fatal(struct trapframe *frame, vm_offset_t eva) return; } #endif - printf("trap number = %d\n", type); - panic("%s", type < nitems(trap_msg) ? trap_msg[type] : - "unknown/reserved trap"); + panic("%s", traptype_to_msg(type)); } #ifdef KDTRACE_HOOKS From nobody Wed Dec 25 01:37:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHvWq28Skz5h05X; Wed, 25 Dec 2024 01:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHvWq0HJsz4qd9; Wed, 25 Dec 2024 01:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735090647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S9bZqNZxK9vSAA6bX4LJ9fk2npm01THQVMazpYiZaL8=; b=C3PQ+uBU3cHh+GJRCBv8IDBq3C+C3BD6OiXHRxjqyXIJZ4jRzeK+7qWm8XPI7lT3r7Shaf uCNNAnhj76dbK0e81j55gli0LssBI+SaSLtQPrE/7GcJevKEZdxQAYspNziG6IYiDfVSZ6 viJcD3DcSlQNP82LrGnI8nfNOHxDrosCWC61FBkqMKKSHqd0COUGUxjZVqtIALe0t1rf8E EN9/hBoRb+OMrMwS7QWB0SJg9Qno3QqX4iv82ck+ypKXCC0C6ilQtT1mBbbsxzIHdaq90V ndpotroCSHJO294K5kPTDI6WQZpkoJ9GhlcIGJoNetT+Aqh8A7t3RKqJ74ZLiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735090647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S9bZqNZxK9vSAA6bX4LJ9fk2npm01THQVMazpYiZaL8=; b=API7LUCuQylhpJUUBbGNdrBobULzNWKR7jYStNXQ3sj5xGsSzCzCKzPhAFi5fhEd+c+sPG XQGD9ZXHXRKmN2m92HhsJe2JOmKFWPkVZn40Tpj6+hZZbPBdRtu4NQfJUwoGlY//9lLaQS FlGaxgKjxLMT4HYM3BPQUOIlvSyjPYPTkIVGuKC3PzpRk9cRO5ZmUZyXCRpMiQn3vM1I59 wfqKPIiite9gfRc8xBT3LOuB6zAvpK11Eta0RklqP8HALxv32AIuVcZDhouItDObLl7g5C cZNoMbyQVBM0ektF4vfxJOE2yWYTmCL1VmtXB5sjGRYjzupmhz1AkbuJYNJajg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735090647; a=rsa-sha256; cv=none; b=AIW61vIGThFyrfmD3vAiO4fhJqXYASS4UIz1JM0+gZZC5ih6om3OV2GTlDOIxaqce3mqok zE3yhH3rZGiVtrBEAMyYMb2/fO+L+umyYABD+zGpQFxqSsVtNtlyE7aUoGVEKJv+8MwnMq Xs1+LY8F61/6Tz2JjHNtlr7DWHQGbOau7V5KBJ+T42HbDh3aQeqJ0W2mM5LT2GG30rgmkG K6DMJ58QRCf6YsAWsLnzwUGm2VHbH8Nwrrolv10sdmh/pK+lmK/lWHCXRQQ9yUG2VZ+Qol 6aMX8E0uK6wx/lKWLySM3JZaK9TjGlCdUQNbYccNfjgG7zhtKu1Tai6bnkoREw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHvWp6jt6z14LM; Wed, 25 Dec 2024 01:37: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 4BP1bQ7h004466; Wed, 25 Dec 2024 01:37:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BP1bQYR004463; Wed, 25 Dec 2024 01:37:26 GMT (envelope-from git) Date: Wed, 25 Dec 2024 01:37:26 GMT Message-Id: <202412250137.4BP1bQYR004463@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: dd2b54436445 - main - amd64: on any fault during call to EFI RT, restore execution and print fault details List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd2b5443644505af51c95503898ab363e7d7c29d Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dd2b5443644505af51c95503898ab363e7d7c29d commit dd2b5443644505af51c95503898ab363e7d7c29d Author: Konstantin Belousov AuthorDate: 2024-12-24 02:35:16 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-25 01:37:19 +0000 amd64: on any fault during call to EFI RT, restore execution and print fault details The fault info should be useful to see what specifically BIOS tried to do and why it faulted. E.g. it might allow to see which EFI memory segment needs to be mapped in addition to normal runtime segments, to work around the fault. Reviewed by: kevans, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48186 --- sys/amd64/amd64/trap.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 3b23a34662d5..8e9b115ef224 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -423,6 +423,20 @@ trap(struct trapframe *frame) KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred")); + + /* + * Most likely, EFI RT faulted. This check prevents + * kdb from handling breakpoints set on the BIOS text, + * if such option is ever needed. + */ + if ((td->td_pflags & TDP_EFIRT) != 0 && + curpcb->pcb_onfault != NULL && type != T_PAGEFLT) { + trap_diag(frame, 0); + printf("EFI RT fault %s\n", traptype_to_msg(type)); + frame->tf_rip = (long)curpcb->pcb_onfault; + return; + } + switch (type) { case T_PAGEFLT: /* page fault */ (void)trap_pfault(frame, false, NULL, NULL); @@ -586,18 +600,6 @@ trap(struct trapframe *frame) * FALLTHROUGH (TRCTRAP kernel mode, kernel address) */ case T_BPTFLT: - /* - * Most likely, EFI RT hitting INT3. This - * check prevents kdb from handling - * breakpoints set on the BIOS text, if such - * option is ever needed. - */ - if ((td->td_pflags & TDP_EFIRT) != 0 && - curpcb->pcb_onfault != NULL) { - frame->tf_rip = (long)curpcb->pcb_onfault; - return; - } - /* * If KDB is enabled, let it handle the debugger trap. * Otherwise, debugger traps "can't happen". @@ -857,6 +859,10 @@ trap_pfault(struct trapframe *frame, bool usermode, int *signo, int *ucode) after_vmfault: if (td->td_intr_nesting_level == 0 && curpcb->pcb_onfault != NULL) { + if ((td->td_pflags & TDP_EFIRT) != 0) { + trap_diag(frame, eva); + printf("EFI RT page fault\n"); + } frame->tf_rip = (long)curpcb->pcb_onfault; return (0); } From nobody Wed Dec 25 01:45:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHvjf5Jyxz5h0T0; Wed, 25 Dec 2024 01:45: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHvjf39Qfz4sRQ; Wed, 25 Dec 2024 01:45:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735091158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ba9gzzmGMLQqv0NEJCnMnCYob6fO6LuhaFixFrwd9j8=; b=HZJga/Vo8ICunYRPu2DXCCzIJFAVCvjmQj6Pv7HCzoT3IXXiZbrHBP8aj/kWL6PIHmvbWw qrllf6DahtZ+E/PmdEzZw+4iFVwu33xSq7vcX3l9JNjwQgSo8BUfbaOpdu2f6SoCkX39bT RT7nU7agXP13F4g1fEQcCQ1tDe39mCTlsV+oLCLLgMFTZkPP3d6oUie8vA5V1LkaKmm2ga 4dT+MfqIOZK0MZN1ufoJgfjWW8VkZNsUOEjaENdf2xEUYIwyw7A/QFQ1jsl9I6Blqk+tDf lDQe50+vBa/e49T/euaSSwcsVOrOvFQv+c1FmB99Bcejzhbs7hhTTHFXNE4vUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735091158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ba9gzzmGMLQqv0NEJCnMnCYob6fO6LuhaFixFrwd9j8=; b=dnC4VJcBh/vEUq4xQEm5vRQTLf3Sn/ObOgaT3fZ6XRL+dUzxACVp7AeDVSV+zVqm0uIKCn JRdHjYpBVJdU1S5yLFpIc3w7RcuUKLS9IcUWTHIg05Umzl3ulCn9LrAqakEFy/ASqdQWho myRR1r8sF4sWO6Y03FL/AwtGWnpL0dHcADA7W++rnQ9ov3lzLbqAi4CPGpUQANOku3U3uW YUaTmQkdy5iNLAgNTAv9QJM+oOLbfvzN8Qa5KSFVnskpAeicLBDOusQ4+XvKUWG6Um4KgK zgPuHEmxnzB1grDNQz6fTZRbtVJAHcAJSKZR0IJ8t+Kqv6rh1a1bt4Kv0FHnTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735091158; a=rsa-sha256; cv=none; b=FT+fLKF8LwZQxn4BTfqBZMhuJezhyhYL/uqQhXY9+NuXIoaUPRzI1EzBB0PUgXadotFNX4 7qe5rU2Rzhen5lbsCEA0FOBxYdQf2hRUdQHZXcpKPhOhH2nYT5Axr8Vjr/IqFstJS+49Ms yjYSU8ypResAVnDZJHk0jP0AXZRKGRc1BWvgZ0CLiqui90DCDjD3F5q7Ek9oSHq5fe+5Ho gep5XIg8T8dFjmtnPrP/rc/15yslhX7wqIUJ0V4L0FY08Gv5l/KS0+xudiUIaOU+yGOuHl ldukNWESxfQHE44dpb4clvhrBTUWUxSTHv6wc2SZqqYjO+FYPl9ltqwXaiTwTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHvjf2md3z14dc; Wed, 25 Dec 2024 01:45: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 4BP1jw5P022130; Wed, 25 Dec 2024 01:45:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BP1jwCA022127; Wed, 25 Dec 2024 01:45:58 GMT (envelope-from git) Date: Wed, 25 Dec 2024 01:45:58 GMT Message-Id: <202412250145.4BP1jwCA022127@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 400fcd1d4fc8 - stable/14 - mount_nfs.c: Add an NFS mount option to set a port# for Mount List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 400fcd1d4fc85212526e9f304e4e90b5668316be Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=400fcd1d4fc85212526e9f304e4e90b5668316be commit 400fcd1d4fc85212526e9f304e4e90b5668316be Author: Rick Macklem AuthorDate: 2024-12-11 23:07:05 +0000 Commit: Rick Macklem CommitDate: 2024-12-25 01:44:40 +0000 mount_nfs.c: Add an NFS mount option to set a port# for Mount Normally mount_nfs acquires the port# for the NFS server's Mount protocol (mountd(8)) via rpcbind/portmapper for NFSv3 mounts. This patch adds a new mount option, so that the mount command can specify the port# and avoid using rpcbind for NFSv3 mounts. The new option is called "mountport" since that is what Linux calls their mount option for the same semantics. PR: 282481 (cherry picked from commit 0e8a36a2ab1223ffb0cbdfd49383d8cf978cfa74) --- sbin/mount_nfs/mount_nfs.c | 56 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index f2f22e0a0ccd..5c194a1c3676 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -120,6 +120,7 @@ static u_char *fh = NULL; static int fhsize = 0; static int secflavor = -1; static int got_principal = 0; +static in_port_t mntproto_port = 0; static enum mountmode { ANY, @@ -372,6 +373,13 @@ main(int argc, char *argv[]) softintr = true; } else if (strcmp(opt, "intr") == 0) { softintr = true; + } else if (strcmp(opt, "mountport") == 0) { + num = strtol(val, &p, 10); + if (*p || num <= 0 || num > IPPORT_MAX) + errx(1, "illegal port num -- " + "%s", val); + mntproto_port = num; + pass_flag_to_nmount=0; } if (pass_flag_to_nmount) { build_iovec(&iov, &iovlen, opt, @@ -912,11 +920,47 @@ tryagain: return (TRYRET_SUCCESS); } + /* + * malloc() and copy the address, so that it can be used for + * nfsargs below. + */ + addrlen = nfs_nb.len; + addr = malloc(addrlen); + if (addr == NULL) + err(1, "malloc"); + bcopy(nfs_nb.buf, addr, addrlen); + /* Send the MOUNTPROC_MNT RPC to get the root filehandle. */ try.tv_sec = 10; try.tv_usec = 0; - clp = clnt_tp_create(hostp, MOUNTPROG, mntvers, nconf_mnt); + if (mntproto_port != 0) { + struct sockaddr *sad; + struct sockaddr_in *sin; + struct sockaddr_in6 *sin6; + + sad = (struct sockaddr *)nfs_nb.buf; + switch (sad->sa_family) { + case AF_INET: + sin = (struct sockaddr_in *)nfs_nb.buf; + sin->sin_port = htons(mntproto_port); + break; + case AF_INET6: + sin6 = (struct sockaddr_in6 *)nfs_nb.buf; + sin6->sin6_port = htons(mntproto_port); + break; + default: + snprintf(errbuf, sizeof(errbuf), + "Mnt port bad addr family %d\n", sad->sa_family); + return (TRYRET_LOCALERR); + } + clp = clnt_tli_create(RPC_ANYFD, nconf_mnt, &nfs_nb, MOUNTPROG, + mntvers, 0, 0); + } else { + /* Get the Mount protocol port# via rpcbind. */ + clp = clnt_tp_create(hostp, MOUNTPROG, mntvers, nconf_mnt); + } if (clp == NULL) { + free(addr); snprintf(errbuf, sizeof errbuf, "[%s] %s:%s: %s", netid_mnt, hostp, spec, clnt_spcreateerror("RPCMNT: clnt_create")); return (returncode(rpc_createerr.cf_stat, @@ -926,10 +970,10 @@ tryagain: nfhret.auth = secflavor; nfhret.vers = mntvers; clntstat = clnt_call(clp, MOUNTPROC_MNT, (xdrproc_t)xdr_dir, spec, - (xdrproc_t)xdr_fh, &nfhret, - try); + (xdrproc_t)xdr_fh, &nfhret, try); auth_destroy(clp->cl_auth); if (clntstat != RPC_SUCCESS) { + free(addr); if (clntstat == RPC_PROGVERSMISMATCH && trymntmode == ANY) { clnt_destroy(clp); trymntmode = V2; @@ -944,6 +988,7 @@ tryagain: clnt_destroy(clp); if (nfhret.stat != 0) { + free(addr); snprintf(errbuf, sizeof errbuf, "[%s] %s:%s: %s", netid_mnt, hostp, spec, strerror(nfhret.stat)); return (TRYRET_REMOTEERR); @@ -953,13 +998,10 @@ tryagain: * Store the filehandle and server address in nfsargsp, making * sure to copy any locally allocated structures. */ - addrlen = nfs_nb.len; - addr = malloc(addrlen); fhsize = nfhret.fhsize; fh = malloc(fhsize); - if (addr == NULL || fh == NULL) + if (fh == NULL) err(1, "malloc"); - bcopy(nfs_nb.buf, addr, addrlen); bcopy(nfhret.nfh, fh, fhsize); build_iovec(iov, iovlen, "addr", addr, addrlen); From nobody Wed Dec 25 01:50:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHvpw6w24z5h0mw; Wed, 25 Dec 2024 01:50: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHvpw6ScYz4sZ5; Wed, 25 Dec 2024 01:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735091432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpyMr5emL46+n56t2JSeLszG0nvfDMqn8vNFVIsM6/4=; b=u6PC6y9sExBV/vgFUCGIqRGJh0E6M5Ydj0KwhsOa2D4P8HkxQDHt1F29YAijmNMZQVO2TP 4OxJzwiqHJog1oej7em/czVBJBuhIJlbeR/RY7te77U+1JG83B4vnWUk3Mhw7T4nF5u4RR e50C77sgXzSzhbyFf9KeXNXUbIuyBjnpdGbahpcMEdlF53BFGEUko6+qgvsQ0Rys3vxlHr INgv64W0CJLpvFYW4jcbaraNd/GXxG+qAb6HuU1ec9VApTQtE87TE7svM62upMdeyPfzdX rXAsGlUG5M0iwmxV1qtLA0ggJLZo84qp9OYQiwylZoqCP3Lu0k6cbFS6UglHLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735091432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpyMr5emL46+n56t2JSeLszG0nvfDMqn8vNFVIsM6/4=; b=ddCLE7KACa23piZz62LO09+5K/c39sS8Gk/rbIFR7tT/3pbhrJNL91+A7GAk+VlVxdUX0r RL8shhPwI0KQEf9iAtUAAQgPvnnsI2PpywugjwFayfDnkkVcyEyUE0Xtrm1SkzrnHPFuw+ SPAXYJhF7T+EBF5TNtNydznm708J/MtiMEkThsObUI6acYKR1K2nsdO5/gpR6ao+m/Tm6R 9/hSqvEPVGb/TB1RWVQghvl432mB3paN4PBmLItBVolVD4isuGYFTPb1GwqRTOUp0ihWCm OQGcbTC1/ZrPgtU4JwwkNGbohPCF7oom5MmM599EdMbnLxILk8VW5RIrIm1CIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735091432; a=rsa-sha256; cv=none; b=L6StdDvOYOVx4cbVVrSs3nujB9+wX2goAshZEIYpNIGk4+VlRef28WilzTVNMpyXm44CXE whlBFoYmFhB/gesmRwYxokHCgDAx4Rl1neH64iZb07gARGDxi2aol7iQcGMvjmSB0r4PBU hpVTyTuihUxyKhua3zIC9kqkympRrktTqGoHH0r50NjeHyZRtUUGvlH6Sh39e2RtZQvBS9 ge0WyfOVltisSDe8Si9NcY4BjPGlDFS8fUSA0HOjSKkB7GTZeyrGJD0hi+QDTaui5JTbpX zNaHjGHPa3MRjwF+D9vnvERvHXYuIBjBxTsPAKFDoC9GTx/05zaNFbLkzDmr/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 4YHvpw5vSMz14bG; Wed, 25 Dec 2024 01:50: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 4BP1oWwD032190; Wed, 25 Dec 2024 01:50:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BP1oWvT032187; Wed, 25 Dec 2024 01:50:32 GMT (envelope-from git) Date: Wed, 25 Dec 2024 01:50:32 GMT Message-Id: <202412250150.4BP1oWvT032187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 0a9808eb751f - stable/14 - mount_nfs.8: Document the new "mountport" NFS mount option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0a9808eb751f42ef1568ada2a8a93deab1f8cd66 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=0a9808eb751f42ef1568ada2a8a93deab1f8cd66 commit 0a9808eb751f42ef1568ada2a8a93deab1f8cd66 Author: Rick Macklem AuthorDate: 2024-12-11 23:18:21 +0000 Commit: Rick Macklem CommitDate: 2024-12-25 01:49:35 +0000 mount_nfs.8: Document the new "mountport" NFS mount option Commit 0e8a36a2ab12 adds a new NFS mount option called mountport. This patch for the man page documents this new NFS mount option. This is a content change. (cherry picked from commit 91a74536a159e49cee76ae4eb3ce05e2ef70c773) --- sbin/mount_nfs/mount_nfs.8 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8 index 7afbc6f691a0..90b92f5e5505 100644 --- a/sbin/mount_nfs/mount_nfs.8 +++ b/sbin/mount_nfs/mount_nfs.8 @@ -27,7 +27,7 @@ .\" .\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 .\" -.Dd June 14, 2023 +.Dd November 29, 2024 .Dt MOUNT_NFS 8 .Os .Sh NAME @@ -198,6 +198,16 @@ This should be used for mounts on old servers that cannot handle a group list size of 16, as specified in RFC 1057. Try 8, if users in a lot of groups cannot get response from the mount point. +.It Cm mountport Ns = Ns Aq Ar value +Specify the port number to be used to communicate with +.Xr mountd 8 +on the NFS server. +This option allows an NFSv2 or NFSv3 mount to be done without +the need to run the +.Xr rpcbind 8 +service. +This option is meaningless for an NFSv4 mount, since NFSv4 +does not use the Mount protocol. .It Cm mntudp Force the mount protocol to use UDP transport, even for TCP NFS mounts. (Necessary for some old @@ -673,6 +683,7 @@ Same as .Xr mount 8 , .Xr nfsd 8 , .Xr nfsiod 8 , +.Xr rpcbind 8 , .Xr rpc.tlsclntd 8 , .Xr showmount 8 .Sh HISTORY From nobody Wed Dec 25 02:01:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHw3p5FShz5h1n5; Wed, 25 Dec 2024 02:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHw3p1mq0z4tGJ; Wed, 25 Dec 2024 02:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735092102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RYNoN5hbm7plRoZXZ3XG81ZXZTf9N/4OiKRJ/DQRYSg=; b=qrTcY8vpT9dufjblVGh/scQcVUTc+sjs36ICXzWgQqqhH6GzHjHkUudc0j2lDz0Ww8QKzM SoiB5sGW/msHFZjY5k8rIyOa+kmX23hw28xb8HUG917ayMvqK6MXVXnM+Dj6aZdqXaD86n jsgZfrzrWbVMkI1No4va1gTnQknlAPNB0dxKlVn5Nm4x4P1NS0zwkzub9nzLlXASpbYIlX XpK3lwbrnuuz5NCL0avosoJgc0ygnO6SX8oBOF9zczM1c3+ms+m8DBRUg/Tl3bct+PFEc3 uZK4WTcTqLfdCg058F+HEiaSaLa0B4AF7LB7mPbXM6B2YaySz7LGYZERtIHVZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735092102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RYNoN5hbm7plRoZXZ3XG81ZXZTf9N/4OiKRJ/DQRYSg=; b=c6saUqknAAEhhqYFCJWSqfv9DK0QB4MFu4X3f5IaIck05u2HfJNvDcdQOoXLusf7sdyE62 VMlwuusG8l5i1pfpw6ZUEH0vaRnfZX+RpKz3jx2NEcV1RKtKfP2yVVPOR7RZnMMs38TSlS pnpOtqNu91hf6w1ILaRdaAxWQwnOIbYWM78MDw2YVjpLEGpi/2aDFJwoDE809h8mhaQJZx 4beDVe8bbqvCMHwd5q3kJX86ji8/h+og5zLl8/xVBVkqnBE6OrpfRa5+HwxY+p7/pV8j3p hVM71f80riaMq9qprvL1n4vfnrv+V9YYuwRAB4uaJ1ry+uI/QeVyF/ezzf4oQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735092102; a=rsa-sha256; cv=none; b=MDK9ptG0CsXJLerwacQjMvFjYz4czQYY/JZU4wfpkfFTyhZWajdBcg+7Ei6MxIoCo7E61H KdZ5hEfhUlPEuJv3EL86EdTkLXEZMJC3WbdqR2bnjY634pTkGapq7IiflusG/yte0F2ly0 7v6jDnc66vyw5+9zM4jkv7SSZ0YJN4E4bXCYkvf1SQvP6ojpdeZI0Rq+xJMYM0/lOV8Vuz I4vGf4JqHnBQUFeqC+sUGfRqCAa1Qi+yblW4ynNeWaujMbECuL7xawGLYUkIMEyTYfW5ra BRGmnlNsuiD1cAxQ1C8DAo/V5NS/jfgJjUekjDcUMYsoLCbpXgLJTPA1E2YP0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHw3p1NGFz14j1; Wed, 25 Dec 2024 02:01: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 4BP21gu9057983; Wed, 25 Dec 2024 02:01:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BP21gaR057981; Wed, 25 Dec 2024 02:01:42 GMT (envelope-from git) Date: Wed, 25 Dec 2024 02:01:42 GMT Message-Id: <202412250201.4BP21gaR057981@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: 3e8f4a30594f - main - efirt: use correct ABI for runtime EFI functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e8f4a30594fad6784504d019613ad815b6c9dc5 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3e8f4a30594fad6784504d019613ad815b6c9dc5 commit 3e8f4a30594fad6784504d019613ad815b6c9dc5 Author: Ahmad Khalifa AuthorDate: 2024-12-21 21:09:54 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-25 02:00:09 +0000 efirt: use correct ABI for runtime EFI functions When calling EFI RT methods through no fault path. MFC after: 1 week --- sys/dev/efidev/efirt.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/sys/dev/efidev/efirt.c b/sys/dev/efidev/efirt.c index 8cada0d5061b..fcbed48af395 100644 --- a/sys/dev/efidev/efirt.c +++ b/sys/dev/efidev/efirt.c @@ -490,31 +490,32 @@ efi_rt_arch_call_nofault(struct efirt_callinfo *ec) switch (ec->ec_argcnt) { case 0: - ec->ec_efi_status = ((register_t (*)(void))ec->ec_fptr)(); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(void)) + ec->ec_fptr)(); break; case 1: - ec->ec_efi_status = ((register_t (*)(register_t))ec->ec_fptr) - (ec->ec_arg1); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t)) + ec->ec_fptr)(ec->ec_arg1); break; case 2: - ec->ec_efi_status = ((register_t (*)(register_t, register_t)) - ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t))ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2); break; case 3: - ec->ec_efi_status = ((register_t (*)(register_t, register_t, - register_t))ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2, - ec->ec_arg3); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t, register_t))ec->ec_fptr)(ec->ec_arg1, + ec->ec_arg2, ec->ec_arg3); break; case 4: - ec->ec_efi_status = ((register_t (*)(register_t, register_t, - register_t, register_t))ec->ec_fptr)(ec->ec_arg1, - ec->ec_arg2, ec->ec_arg3, ec->ec_arg4); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t, register_t, register_t))ec->ec_fptr)( + ec->ec_arg1, ec->ec_arg2, ec->ec_arg3, ec->ec_arg4); break; case 5: - ec->ec_efi_status = ((register_t (*)(register_t, register_t, - register_t, register_t, register_t))ec->ec_fptr)( - ec->ec_arg1, ec->ec_arg2, ec->ec_arg3, ec->ec_arg4, - ec->ec_arg5); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t, register_t, register_t, register_t)) + ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2, ec->ec_arg3, + ec->ec_arg4, ec->ec_arg5); break; default: panic("efi_rt_arch_call: %d args", (int)ec->ec_argcnt); From nobody Thu Dec 26 14:47:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YJs1K4Sw0z5jBNn; Thu, 26 Dec 2024 14:47: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YJs1K3nVPz4Ws7; Thu, 26 Dec 2024 14:47:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735224469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=blKXL5fh6taMWLXgn4i87j06ieVDlnxDqIYoTYB6UGI=; b=f8+Qiy5TgpGmA/Ijc+w69GrEXXikmIDt7Gbsha05CvjlooFtB0ScdremMICYm7+Fo//SHk lDQeG95QkE2dt7kt8JzCM5OEsoyqZHtvDxbB81YM1OJtV60hyvXyQxX7Su3b0klsD5ehUN tYTtrICY8GqjDx3kwDxqpF2Hga94k58pyDJ3SwyM2lbbYX36GVa9oXkKIvzx/WAtwtZhco XS7xGoWgTFJnEXoZUh1gkL7X1bXCv1xP3H+KH6BRlxcy1tjcn5xzH4qjfMvWbxfNwA6BBS LrVHX28s0E+RPLrb71RlaWM+LPKSyVjx5zQ/GRSP5hc2qMCO+SxhFHy4NZokTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735224469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=blKXL5fh6taMWLXgn4i87j06ieVDlnxDqIYoTYB6UGI=; b=Kptlx1w1Xi4S6FRFH4b641U0AIdwxXH2yoLTUs03Lat5rRy1bWqvPdnfiasWRM6BvM5dN0 nK6UEeSuA3RDdI1An/tfusYEdfuyuBYlksTXnRogUosoVMiSGSDYPKCUiAc12ENujyFUt0 AEg+iivvXNWhnCGyJvAdsRIe1kVwcEtQTJXikZK6UtrNwrtZPxO0Rl0GT9wtpPrwvRQh3h fVmZS36aZVU8s0kR29twd0JmcP6JE8rAj/Zykk3zXl53H3Efg1BIe8jePCOIiolvPcX0v+ xv76HYNZZr9Dj8+scop41AwzzMxd8HjgAdsyl66v/+M4JzRkkCGkQVkai5qCIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735224469; a=rsa-sha256; cv=none; b=WIWCKoVcMmnXgItJaLqDGLDqVXdGYLuOHaFldblO3Gv+8iO9A9nb6Qv8LSID4XJC4+EtSb KHbiBaJa5qX+EmRg8eOq+QbB/ifTaPqymIBOi75BSqgOMFzyYF/lvpWVrPvNz6pSKbRThC lCOBC/4NkiAELPukJomfq40Evb6CxO6a/3jw1pQRmcJxtlD5qGuA1lqFJa9/uUSuEWydXC FR4+77FT4pJz9DJjXuFkbRoQU/N9u6tqmPIaAwA3CwgnRXEiItN3NSsaEXg3TdW6jXRs1n kp7boTSNcgu179pJ6rWPUnQiwegb9oOgnPIEQN0K7YSsirRb9U+0m+ioRet/sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YJs1K3Nl9zy4F; Thu, 26 Dec 2024 14:47:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BQElnww086869; Thu, 26 Dec 2024 14:47:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BQElnbg086866; Thu, 26 Dec 2024 14:47:49 GMT (envelope-from git) Date: Thu, 26 Dec 2024 14:47:49 GMT Message-Id: <202412261447.4BQElnbg086866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: ca7e12f7df22 - main - bsdinstall zfsboot: Add an option to edit the ZFS pool creation options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca7e12f7df222458ec5cac8009c5b0931fb4a95b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ca7e12f7df222458ec5cac8009c5b0931fb4a95b commit ca7e12f7df222458ec5cac8009c5b0931fb4a95b Author: Craig Leres AuthorDate: 2024-12-26 14:42:11 +0000 Commit: Dimitry Andric CommitDate: 2024-12-26 14:44:24 +0000 bsdinstall zfsboot: Add an option to edit the ZFS pool creation options This allows the default options (-O compress=lz4 -O atime=off) to be overridden, before the ZFS boot pool is created. For example, to set the compression algorithm to something different. Reviewed by: jhb, dim MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47478 --- usr.sbin/bsdinstall/scripts/zfsboot | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 1d38db2d0f15..45c023b06513 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -324,6 +324,9 @@ msg_unsupported_partition_scheme="%s is an unsupported partition scheme" msg_user_cancelled="User Cancelled." msg_yes="YES" msg_zfs_configuration="ZFS Configuration" +msg_please_enter_options_for_your_zpool="Please enter options for your zpool" +msg_zfs_options_name="ZFS Pool Options" +msg_zfs_options_name_help="Customize ZFS options for the zpool to be created" ############################################################ FUNCTIONS @@ -374,6 +377,8 @@ dialog_menu_main() '$msg_swap_mirror_help' 'W $msg_swap_encrypt' '$swapgeli' '$msg_swap_encrypt_help' + 'O $msg_zfs_options_name' '$ZFSBOOT_POOL_CREATE_OPTIONS' + '$msg_zfs_options_name_help' " # END-QUOTE local defaultitem= # Calculated below local hline="$hline_alnum_arrows_punc_tab_enter" @@ -1853,6 +1858,13 @@ while :; do ZFSBOOT_SWAP_ENCRYPTION=1 fi ;; + ?" $msg_zfs_options_name") + # Prompt the user to input/change the pool options + f_dialog_input input \ + "$msg_please_enter_options_for_your_zpool" \ + "$ZFSBOOT_POOL_CREATE_OPTIONS" && + ZFSBOOT_POOL_CREATE_OPTIONS="$input" + ;; esac done From nobody Thu Dec 26 16:45:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YJvdN4RlRz5jKY6; Thu, 26 Dec 2024 16:45: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YJvdN2W2bz4kk9; Thu, 26 Dec 2024 16:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735231544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wcwRne9cn+Ps8njhTPvHRmlNeWeRmGIBPkuBOZ9tOfE=; b=q5owFZTLad4ZASWKMPDFrU9DGvFAk3OwZNtu+ErlKCozfJ1XRA9dYIdXywPXZQlmoDeVcY O3kBi7FI+FbOXOpQpaqAtbIXWaUE4uynau+LbXSbAgaIbUGzFvtWF35wYj/CHDiSV4ubE5 xijgNmJeZKuM+h1K3i7Z/3Y29Um2F/oJ4E7MjG04wtxl0e73sep1d9B7VYBllWYlwvss9j sQjC4B3yVf5vtkeySJdnM37At4n8q489UwPTBs6Kz41rkvJMi55neHPPt0N4hpmFhcwbVT P4qE2g6ghpfpQYP8Es85dHm0fJq1kRU3KNq8chAEljQ99fRmoTT7HkiLGojO7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735231544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wcwRne9cn+Ps8njhTPvHRmlNeWeRmGIBPkuBOZ9tOfE=; b=Mhbk23lymmof/kzY1Xy5sZbZcowDaqMAsM/P4vcE/JhYb9znTHdVn6STIwae0IJnL1b87s v5JLqdObjMOOTlp2nLlg/yb+XRThggkiQfyynvvLxxmlcAVeX95coyl47kUtTcLR9NQEc8 28xOlGoCkmqGC1Oyv7YH2WrGgQp/dv721RDZ7rOLM/pxo+PJgjTYK52B8tUshJOcuzun1j 0XUJ3seYnbT0nAt02PF2JAWJUmSZYovFurE+YkSwWRbkUFXWLwA1sqXs/t6xBDVcZdRbFD WCxcsHQMUAwOW0RrP6ULVZgspoPdF8IFYOUlXNUSma1G9sAhRxBvwUFZs0BpGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735231544; a=rsa-sha256; cv=none; b=xHFV2/0k4K473RNL/T+5W4zrE0mrPpHm2ByE3XtHg3BpKSmUhyJUxPHYUYQae/YHhrAJcZ 3C3Uc+W5qol0eWa4Rfj7Qp5xWd0E0shlsxJa09Hf4Z51zFqIV5SQiBS14GFzyfmKCDXWvJ imkm/6wB28Dg+KNCOWgFaq9vxlOXxlDOjgzl9hh+zzDNgkTtWvsJS/UAQp+YEOjjFWHkLR R1aLmiiUlRJZKcqfeRRtI9lgeFmsGpi5Du5mPS1370h7CI/8B/MTDV/b1IvXz8tBJFJ0bx BFHDJ8hJ726TrXoVrRDntBkMnzzFDYCjNL/bnElgUtUUv7puZ25skNhdsQkDYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YJvdN1kMmz12dK; Thu, 26 Dec 2024 16:45: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 4BQGjiV1009454; Thu, 26 Dec 2024 16:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BQGjiju009451; Thu, 26 Dec 2024 16:45:44 GMT (envelope-from git) Date: Thu, 26 Dec 2024 16:45:44 GMT Message-Id: <202412261645.4BQGjiju009451@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: 2e09cef8dc6f - main - makefs: Fix cd9660 filename buffer maximum length List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e09cef8dc6f46faba8bab87c42c3f19ba2ffe87 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2e09cef8dc6f46faba8bab87c42c3f19ba2ffe87 commit 2e09cef8dc6f46faba8bab87c42c3f19ba2ffe87 Author: Ed Maste AuthorDate: 2024-12-24 16:08:10 +0000 Commit: Ed Maste CommitDate: 2024-12-26 16:44:36 +0000 makefs: Fix cd9660 filename buffer maximum length The maximum length is 30 characters for name and extension, two separators (. and ;) and 5 characters for file version from 1 to 32767, which is 37 characters. Add one for the null term as we treat these buffers as C strings. This is not an issue in practice, as the file version is always 1 in makefs. While here, drop `_WITH_PADDING` from the macro name and update the previously-unused ISO_FILENAME_MAXLENGTH for the corrected length. A 0x00 padding byte is used by ISO9660 when needed for alignment, which can be the null byte at the end of the string. Use sizeof where appropriate. Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48193 --- usr.sbin/makefs/cd9660.c | 16 +++++++--------- usr.sbin/makefs/cd9660.h | 9 ++++----- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index d3baa3b78a6e..bc9895730b84 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -497,7 +497,7 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, real_root->isoDirRecord = emalloc(sizeof(*real_root->isoDirRecord)); /* Leave filename blank for root */ memset(real_root->isoDirRecord->name, 0, - ISO_FILENAME_MAXLENGTH_WITH_PADDING); + sizeof(real_root->isoDirRecord->name)); real_root->level = 0; diskStructure->rootNode = real_root; @@ -796,10 +796,10 @@ static int cd9660_translate_node_common(iso9660_disk *diskStructure, cd9660node *newnode) { u_char flag; - char temp[ISO_FILENAME_MAXLENGTH_WITH_PADDING]; + char temp[ISO_FILENAME_MAXLENGTH]; /* Now populate the isoDirRecord structure */ - memset(temp, 0, ISO_FILENAME_MAXLENGTH_WITH_PADDING); + memset(temp, 0, sizeof(temp)); (void)cd9660_convert_filename(diskStructure, newnode->node->name, temp, sizeof(temp), !(S_ISDIR(newnode->node->type))); @@ -1044,7 +1044,7 @@ cd9660_rename_filename(iso9660_disk *diskStructure, cd9660node *iter, int num, else maxlength = ISO_FILENAME_MAXLENGTH_BEFORE_VERSION; - tmp = emalloc(ISO_FILENAME_MAXLENGTH_WITH_PADDING); + tmp = emalloc(ISO_FILENAME_MAXLENGTH); while (i < num && iter) { powers = 1; @@ -1105,8 +1105,7 @@ cd9660_rename_filename(iso9660_disk *diskStructure, cd9660node *iter, int num, while (digits > 0) { digit = (int)(temp / powers); temp = temp - digit * powers; - snprintf(&tmp[numbts], - ISO_FILENAME_MAXLENGTH_WITH_PADDING - numbts, + snprintf(&tmp[numbts], ISO_FILENAME_MAXLENGTH - numbts, "%d", digit); digits--; numbts++; @@ -1153,8 +1152,7 @@ cd9660_copy_filenames(iso9660_disk *diskStructure, cd9660node *node) TAILQ_FOREACH(cn, &node->cn_children, cn_next_child) { cd9660_copy_filenames(diskStructure, cn); - memcpy(cn->o_name, cn->isoDirRecord->name, - ISO_FILENAME_MAXLENGTH_WITH_PADDING); + memcpy(cn->o_name, cn->isoDirRecord->name, sizeof(cn->o_name)); } } @@ -1277,7 +1275,7 @@ cd9660_rrip_move_directory(iso9660_disk *diskStructure, cd9660node *dir) /* TODO: Inherit permissions / ownership (basically the entire inode) */ /* Set the new name */ - memset(dir->isoDirRecord->name, 0, ISO_FILENAME_MAXLENGTH_WITH_PADDING); + memset(dir->isoDirRecord->name, 0, sizeof(dir->isoDirRecord->name)); strncpy(dir->isoDirRecord->name, newname, 8); dir->isoDirRecord->length[0] = 34 + 8; dir->isoDirRecord->name_len[0] = 8; diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h index bc826a414a6d..b2db31460d02 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -72,8 +72,7 @@ /*30 for name and extension, as well as version number and padding bit*/ #define ISO_FILENAME_MAXLENGTH_BEFORE_VERSION 30 -#define ISO_FILENAME_MAXLENGTH 36 -#define ISO_FILENAME_MAXLENGTH_WITH_PADDING 37 +#define ISO_FILENAME_MAXLENGTH 38 #define ISO_FLAG_CLEAR 0x00 #define ISO_FLAG_HIDDEN 0x01 @@ -118,7 +117,7 @@ typedef struct _iso_directory_record_cd9660 { u_char interleave [ISODCL (28, 28)]; /* 711 */ u_char volume_sequence_number [ISODCL (29, 32)]; /* 723 */ u_char name_len [ISODCL (33, 33)]; /* 711 */ - char name [ISO_FILENAME_MAXLENGTH_WITH_PADDING]; + char name [ISO_FILENAME_MAXLENGTH]; } iso_directory_record_cd9660; /* TODO: Lots of optimization of this structure */ @@ -154,7 +153,7 @@ typedef struct _cd9660node { int fileRecordSize;/*copy of a variable, int for quicker calculations*/ /* Old name, used for renaming - needs to be optimized but low priority */ - char o_name [ISO_FILENAME_MAXLENGTH_WITH_PADDING]; + char o_name [ISO_FILENAME_MAXLENGTH]; /***** SPACE RESERVED FOR EXTENSIONS *****/ /* For memory efficiency's sake - we should move this to a separate struct @@ -194,7 +193,7 @@ typedef struct _path_table_entry u_char extended_attribute_length[ISODCL (2, 2)]; u_char first_sector[ISODCL (3, 6)]; u_char parent_number[ISODCL (7, 8)]; - char name[ISO_FILENAME_MAXLENGTH_WITH_PADDING]; + char name[ISO_FILENAME_MAXLENGTH]; } path_table_entry; typedef struct _volume_descriptor From nobody Thu Dec 26 21:44:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YK2GY1DSGz5jdl9; Thu, 26 Dec 2024 21:44:53 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YK2GY0Jsjz4HB1; Thu, 26 Dec 2024 21:44:53 +0000 (UTC) (envelope-from garga@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735249493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=ERSPVIj94MCK9zH6K8Ag2uJqG8tpIyLXqhdZBF6Etg4=; b=F2R/OI9M6F85PeyUfOaQvTRewCNdInkA6TcDVxm9MwsbzR55/kPXw9eHVns3Ec4anXZbJz 1ABBsZx8G9TfVs5MICeB+h8iuNo/Fx9jNFd7tgKvOXqnvzQLhuTZy52Aywn5HrBsCcxeQu SpI07/+ha/6YSLbGJq+uX4WrWt5T1rSfk9FOYo1JBY1P1Xraob6mefvTBlMMO4b4GARilI 5VqUjK0UCgkufoGD/9oJeiQqnsHW7lCYqJR0no5fu96WuleUah9/VZC98Sz5ho6H+3qN3A SgM3fpakRs0sFCBEaiw6AXFA5K4jk65u0s4zS8QbDWYM8ET1qW3rZJVeYZZkVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735249493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=ERSPVIj94MCK9zH6K8Ag2uJqG8tpIyLXqhdZBF6Etg4=; b=tA8EcTbCVV7hgGBgfn53ICKHttirQZFqx5nbvzw7KCFc4/QBTd5ThMAyHRnk8vhJkS98sx D1Xjxux2xS+w/NMlxmKQX9MkDKIG4buMh2NE1Da9OmZZTz4LZWd1XnrT/tMwzSJtKidZqO pDYFwuj7ltv4A1wbCembNh8NXCbHvZLuTIckem0hfLgfSzIy7HZoLv+GYSeDxohFCIFiAQ 8qbsdR3G3AbBPX9oO9CiItf3/rZg6P8jaoY0D/mH4QbZHAOyRFoppMIK86YX9kDP86zqAQ HBVzrZxN7pxnEcoocYNdi1snyEmQa4s4w4UGyK4a2T0XlislSrxMjW/Dj5NldA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735249493; a=rsa-sha256; cv=none; b=f8Q+ZHZFxuc7Oi1rufzBylq1FTKFvTgQeuvL4+TYryWJZDMmxF4t7ymxJQISRw+05XKNd/ /UCo5Kp0cecuFpDWWDDzseY2Nt7l/tvOubbGLXdKjCbTbf9ftfigaDwtwY/5bXfve5z6yi RLMxqd+/HoJf+ArlnOJeV0INgWxT47TpK5y8hxCG7GxaSUkmAU00vuHjGclcvqlW1xKqJD CFKG/Ijwpul3CY+rX6YPralSznJq0rz/kw4gvzEx5rD9djGCzDkLQdzmZaCwqJsqtGe3F/ fGMC+v1h1qtBJ2hKfTULEt//pT7KJMU0UBzJ2jFr0Qq6uUbhifT1HL8c+hwOog== Received: from [IPV6:2804:f1c:31:cc00:f541:9717:f6fd:58ab] (unknown [IPv6:2804:f1c:31:cc00:f541:9717:f6fd:58ab]) (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: garga) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YK2GW1WL4zLsy; Thu, 26 Dec 2024 21:44:51 +0000 (UTC) (envelope-from garga@FreeBSD.org) Content-Type: multipart/mixed; boundary="------------W0YxwJfHrTrLuFbiP0nKhCQd" Message-ID: <149116bc-677c-47b2-9ff7-f454418fec21@FreeBSD.org> Date: Thu, 26 Dec 2024 18:44:48 -0300 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: git: ba1904937d9a - main - acpica: Extract _OSC parsing to a common file To: Andrew Turner , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202412121819.4BCIJ1KW097190__8805.67587898753$1734027579$gmane$org@gitrepo.freebsd.org> Content-Language: en-US From: Renato Botelho Autocrypt: addr=garga@FreeBSD.org; keydata= xsBNBGStavwBCACjNlp/9+Y+VFe9ieR2h/WWbdvjz4Mb2z/f22bGoaskzCfvVNbo/v3i34I9 H6OdgZkGqheQEAD2jNfRbmPr4z40xDMUpYGLds+1Mvg7G3Hms3j5Ef8KaLSWUNWIfwKdfSVR Qs35ccSJxAdRW5YdI6J3xZgika+3Bc4eJ05YE/nWW+PNTYevt5rqD50N3zybVYIcLoqVPpBi AZE/sf5SLiLACIJb1t/s4x+pi8vgWevxVVT9u8V1f8zYErmHSLSqjxii0B3eRZphX9NCJOv9 +tfFZhnENInhn9gT7H4e2YumUltEy3jacONHJF3CC1pvvWEa6lEyypclMOkHQwNON7DLABEB AAHNLFJlbmF0byBCb3RlbGhvIChGcmVlQlNEKSA8Z2FyZ2FARnJlZUJTRC5vcmc+wsCXBBMB CgBBAhsDBQkFo5qABQsJCAcDBRUKCQgLBRYDAgEAAh4FAheAFiEERL7Dxegbnh7xTiQ5Ob6P xxJcZXoFAmSta78CGQEACgkQOb6PxxJcZXrYlggAgaZmr6c1yIWzN8VksHrHpwt/uxONEP+h ljy3yfrMsgfS5wx5Uzgfih1xYZUFC6jiI63CetqBqJpp3g1klRS1UWYKx2NeXphDMYZEdPm/ a6sXh4bKZbk6IE8Yn0/YiRT57d9DtbvswC7Gn7Igj/MSbhl49TvTGyvuB6juaffVoYZViomx 5zMoee8Ml2o2qj3MrCJ+/K8GU54RlpOGqGRsqdwVdr9XEWub6fF2YFwR46cjmbiU3P5urFHH nkJlBGPIwKxHimTW0lZsdx9aCKRDd/D80/WOEzXmk3k8B9lv/GsvOluHmveLhJG1R1tIJ31I f2q8dfTvqsQXnu8CcWRcgc7ATQRkrWr8AQgA1DufoxScA+CWQbUR6zExIu8wXQKrhuRt4DG2 BgynT7EMUvEBadcbQRZXsBpemNfncc9Axyut/+rWiyKJf9BLQuo/9QYmSRvW1U6+0LJUYmdg kMyBeYaPk+vnssv/u9jLuvV7FVgyE0yk1iaWIKOVDD+XrQCOvGw9uSceBrQyCyo3A/eRM/+p vnDCaywR63PKE+3axk6lfNdGK3TnaWmS30/ZDCZlNsXuqprqR4JdT5wXids5o36dsuJ5EZ20 s5hNMD34s4Yr1Y1R9elH6qBsFCpozs0+jwrArxq+UJJCR6hH5W8ZEwJtRC8tzR8mRE1WywzX BXYj0YhfGztQIxZckQARAQABwsB8BBgBCgAmFiEERL7Dxegbnh7xTiQ5Ob6PxxJcZXoFAmSt avwCGwwFCQWjmoAACgkQOb6PxxJcZXr1vgf/SKXhoZcUU5I7TqcbHg0lJz9tICTupCGHWr/s SQgjh9oEM5j1wqW7FlCGP90Tl9K0g3ow9YdbhU7VK470o6pymX9V9eLHzGgkZO/KMEtGBeK1 u+5ePjCJ/MK5B21KODLSU7WrIL1VN5ceXfQPLYt02LMLtPri+oduHD6RNBeA7US1DUzleq5F 9NHGbvV2U7BdDUezpiO8NaFjFZVB11I5d99FxUM5XGVstI3VhsRKZxjY0KnqJzaQgTFsPGmv AUfZVIN1pXgXiedhPXpr8+Y64jP+pHVwpVmh1zYWL6+q3kqFOUVP6c5iiMeoEXZvgJz7x/AC ek3X5gvu8Hpcv+MZIg== In-Reply-To: <202412121819.4BCIJ1KW097190__8805.67587898753$1734027579$gmane$org@gitrepo.freebsd.org> This is a multi-part message in MIME format. --------------W0YxwJfHrTrLuFbiP0nKhCQd Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/12/24 15:19, Andrew Turner wrote: > The branch main has been updated by andrew: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ba1904937d9ae0539e39001467a1519b17177118 > > commit ba1904937d9ae0539e39001467a1519b17177118 > Author: Andrew Turner > AuthorDate: 2024-12-12 16:29:45 +0000 > Commit: Andrew Turner > CommitDate: 2024-12-12 18:00:22 +0000 > > acpica: Extract _OSC parsing to a common file > > This will be used by pci_host_generic_acpi.c so needs to be in a > common location. > > Reviewed by: imp, jhb > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D48044 My dev system was running CURRENT from Oct 31 and broke after I upgrade to most recent version on Dec 20. After bisecting I found this commit as the one that introduced the problem. It starts booting but can't found any disk. Pressing ? at mount prompt shows nothing. This system is a VM running on KVM and I've attached dmesg from successfully boot FreeBSD idaho.arrakis.com.br 15.0-CURRENT FreeBSD 15.0-CURRENT #22 n274182-938e4b131c4: Thu Dec 26 18:10:12 -03 2024 root@idaho.arrakis.com.br:/usr/obj/usr/src/amd64.amd64/sys/GENERIC-NODEBUG amd64 I've built GENERIC and collected a video [1] since the VNC server doesn't support copy/paste. [1] https://idaho.arrakis.com.br/share/boot_fail.mov -- Renato Botelho --------------W0YxwJfHrTrLuFbiP0nKhCQd Content-Type: text/plain; charset=UTF-8; name="dmesg.txt" Content-Disposition: attachment; filename="dmesg.txt" Content-Transfer-Encoding: base64 SHlwZXJ2aXNvcjogT3JpZ2luID0gIktWTUtWTUtWTSIKcmVhbCBtZW1vcnkgID0gNTE1Mzk2 MDc1NTIgKDQ5MTUyIE1CKQphdmFpbCBtZW1vcnkgPSA1MDA2NzgwMDA2NCAoNDc3NDggTUIp CkV2ZW50IHRpbWVyICJMQVBJQyIgcXVhbGl0eSA2MDAKQUNQSSBBUElDIFRhYmxlOiA8Qk9D SFMgIEJYUEMgICAgPgpGcmVlQlNEL1NNUDogTXVsdGlwcm9jZXNzb3IgU3lzdGVtIERldGVj dGVkOiAxMiBDUFVzCkZyZWVCU0QvU01QOiAxMiBwYWNrYWdlKHMpIHggMSBjb3JlKHMpCnJh bmRvbTogcmVnaXN0ZXJpbmcgZmFzdCBzb3VyY2UgSW50ZWwgU2VjdXJlIEtleSBSTkcKcmFu ZG9tOiBmYXN0IHByb3ZpZGVyOiAiSW50ZWwgU2VjdXJlIEtleSBSTkciCnJhbmRvbTogdW5i bG9ja2luZyBkZXZpY2UuCmlvYXBpYzAgPFZlcnNpb24gMS4xPiBpcnFzIDAtMjMKTGF1bmNo aW5nIEFQczogMTEgMTAgMSA4IDIgNiA1IDMgOSA3IDQKcmFuZG9tOiBlbnRyb3B5IGRldmlj ZSBleHRlcm5hbCBpbnRlcmZhY2UKa2JkMSBhdCBrYmRtdXgwCnZ0dmdhMDogPFZUIFZHQSBk cml2ZXI+Cmt2bWNsb2NrMDogPEtWTSBwYXJhdmlydHVhbCBjbG9jaz4KVGltZWNvdW50ZXIg Imt2bWNsb2NrIiBmcmVxdWVuY3kgMTAwMDAwMDAwMCBIeiBxdWFsaXR5IDk3NQprdm1jbG9j azA6IHJlZ2lzdGVyZWQgYXMgYSB0aW1lLW9mLWRheSBjbG9jaywgcmVzb2x1dGlvbiAwLjAw MDAwMXMKc21iaW9zMDogPFN5c3RlbSBNYW5hZ2VtZW50IEJJT1M+IGF0IGlvbWVtIDB4ZjVh NTAtMHhmNWE2ZQpzbWJpb3MwOiBWZXJzaW9uOiAyLjgsIEJDRCBSZXZpc2lvbjogMi44CmFl c25pMDogPEFFUy1DQkMsQUVTLUNDTSxBRVMtR0NNLEFFUy1JQ00sQUVTLVhUUz4KYWNwaTA6 IDxCT0NIUyBCWFBDPgphY3BpMDogUG93ZXIgQnV0dG9uIChmaXhlZCkKY3B1MDogPEFDUEkg Q1BVPiBvbiBhY3BpMAphdHJ0YzA6IDxBVCByZWFsdGltZSBjbG9jaz4gcG9ydCAweDcwLTB4 NzcgaXJxIDggb24gYWNwaTAKYXRydGMwOiByZWdpc3RlcmVkIGFzIGEgdGltZS1vZi1kYXkg Y2xvY2ssIHJlc29sdXRpb24gMS4wMDAwMDBzCkV2ZW50IHRpbWVyICJSVEMiIGZyZXF1ZW5j eSAzMjc2OCBIeiBxdWFsaXR5IDAKVGltZWNvdW50ZXIgIkFDUEktZmFzdCIgZnJlcXVlbmN5 IDM1Nzk1NDUgSHogcXVhbGl0eSA5MDAKYWNwaV90aW1lcjA6IDwyNC1iaXQgdGltZXIgYXQg My41Nzk1NDVNSHo+IHBvcnQgMHg2MDgtMHg2MGIgb24gYWNwaTAKcGNpYjA6IDxBQ1BJIEhv c3QtUENJIGJyaWRnZT4gcG9ydCAweGNmOC0weGNmZiBvbiBhY3BpMApwY2kwOiA8QUNQSSBQ Q0kgYnVzPiBvbiBwY2liMAp2Z2FwY2kwOiA8VkdBLWNvbXBhdGlibGUgZGlzcGxheT4gcG9y dCAweGQwNDAtMHhkMDVmIG1lbSAweGY0MDAwMDAwLTB4ZjdmZmZmZmYsMHhmODAwMDAwMC0w eGZiZmZmZmZmLDB4ZmQyMTAwMDAtMHhmZDIxMWZmZiBpcnEgMjEgYXQgZGV2aWNlIDEuMCBv biBwY2kwCnZnYXBjaTA6IEJvb3QgdmlkZW8gZGV2aWNlCnBjaWIxOiA8QUNQSSBQQ0ktUENJ IGJyaWRnZT4gbWVtIDB4ZmQyMTIwMDAtMHhmZDIxMmZmZiBpcnEgMjIgYXQgZGV2aWNlIDIu MCBvbiBwY2kwCnBjaTE6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWIxCnBjaWIyOiA8QUNQSSBQ Q0ktUENJIGJyaWRnZT4gbWVtIDB4ZmMyMDAwMDAtMHhmYzIwMDBmZiBpcnEgMjIgYXQgZGV2 aWNlIDAuMCBvbiBwY2kxCnBjaTI6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWIyCnBjaWIzOiA8 QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTMwMDAtMHhmZDIxM2ZmZiBpcnEgMjIg YXQgZGV2aWNlIDIuMSBvbiBwY2kwCnBjaTM6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWIzCnZp cnRpb19wY2kwOiA8VmlydElPIFBDSSAobW9kZXJuKSBOZXR3b3JrIGFkYXB0ZXI+IG1lbSAw eGZkMDQwMDAwLTB4ZmQwNDBmZmYsMHhmZTgwMDAwMC0weGZlODAzZmZmIGlycSAyMiBhdCBk ZXZpY2UgMC4wIG9uIHBjaTMKdnRuZXQwOiA8VmlydElPIE5ldHdvcmtpbmcgQWRhcHRlcj4g b24gdmlydGlvX3BjaTAKdnRuZXQwOiBFdGhlcm5ldCBhZGRyZXNzOiA1Mjo1NDo1ODo5Mzpj NzplZgp2dG5ldDA6IG5ldG1hcCBxdWV1ZXMvc2xvdHM6IFRYIDEvMjU2LCBSWCAxLzEyOAow MDAuMDAwMDc3IFsgNDUyXSB2dG5ldF9uZXRtYXBfYXR0YWNoICAgICAgIHZ0bmV0IGF0dGFj aGVkIHR4cT0xLCB0eGQ9MjU2IHJ4cT0xLCByeGQ9MTI4CnBjaWI0OiA8QUNQSSBQQ0ktUENJ IGJyaWRnZT4gbWVtIDB4ZmQyMTQwMDAtMHhmZDIxNGZmZiBpcnEgMjIgYXQgZGV2aWNlIDIu MiBvbiBwY2kwCnBjaTQ6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWI0CnhoY2kwOiA8WEhDSSAo Z2VuZXJpYykgVVNCIDMuMCBjb250cm9sbGVyPiBtZW0gMHhmY2UwMDAwMC0weGZjZTAzZmZm IGlycSAyMiBhdCBkZXZpY2UgMC4wIG9uIHBjaTQKeGhjaTA6IDMyIGJ5dGVzIGNvbnRleHQg c2l6ZSwgNjQtYml0IERNQQp1c2J1czAgb24geGhjaTAKdXNidXMwOiA1LjBHYnBzIFN1cGVy IFNwZWVkIFVTQiB2My4wCnBjaWI1OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQy MTUwMDAtMHhmZDIxNWZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuMyBvbiBwY2kwCnBjaTU6IDxB Q1BJIFBDSSBidXM+IG9uIHBjaWI1CnZpcnRpb19wY2kxOiA8VmlydElPIFBDSSAobW9kZXJu KSBTQ1NJIGFkYXB0ZXI+IG1lbSAweGZjYzAwMDAwLTB4ZmNjMDBmZmYsMHhmZTQwMDAwMC0w eGZlNDAzZmZmIGlycSAyMiBhdCBkZXZpY2UgMC4wIG9uIHBjaTUKdnRzY3NpMDogPFZpcnRJ TyBTQ1NJIEFkYXB0ZXI+IG9uIHZpcnRpb19wY2kxCnBjaWI2OiA8QUNQSSBQQ0ktUENJIGJy aWRnZT4gbWVtIDB4ZmQyMTYwMDAtMHhmZDIxNmZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNCBv biBwY2kwCnBjaTY6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWI2CnZpcnRpb19wY2kyOiA8Vmly dElPIFBDSSAobW9kZXJuKSBDb25zb2xlIGFkYXB0ZXI+IG1lbSAweGZjYTAwMDAwLTB4ZmNh MDBmZmYsMHhmZTIwMDAwMC0weGZlMjAzZmZmIGlycSAyMiBhdCBkZXZpY2UgMC4wIG9uIHBj aTYKcGNpYjc6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNzAwMC0weGZkMjE3 ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi41IG9uIHBjaTAKcGNpNzogPEFDUEkgUENJIGJ1cz4g b24gcGNpYjcKdmlydGlvX3BjaTM6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIEJhbGxvb24gYWRh cHRlcj4gbWVtIDB4ZmUwMDAwMDAtMHhmZTAwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBv biBwY2k3CnZ0YmFsbG9vbjA6IDxWaXJ0SU8gQmFsbG9vbiBBZGFwdGVyPiBvbiB2aXJ0aW9f cGNpMwpwY2liODogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE4MDAwLTB4ZmQy MThmZmYgaXJxIDIyIGF0IGRldmljZSAyLjYgb24gcGNpMApwY2k4OiA8QUNQSSBQQ0kgYnVz PiBvbiBwY2liOAp2aXJ0aW9fcGNpNDogPFZpcnRJTyBQQ0kgKG1vZGVybikgRW50cm9weSBh ZGFwdGVyPiBtZW0gMHhmZGUwMDAwMC0weGZkZTAzZmZmIGlycSAyMiBhdCBkZXZpY2UgMC4w IG9uIHBjaTgKcGNpYjk6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxOTAwMC0w eGZkMjE5ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi43IG9uIHBjaTAKcGNpOTogPEFDUEkgUENJ IGJ1cz4gb24gcGNpYjkKaXNhYjA6IDxQQ0ktSVNBIGJyaWRnZT4gYXQgZGV2aWNlIDMxLjAg b24gcGNpMAppc2EwOiA8SVNBIGJ1cz4gb24gaXNhYjAKYWhjaTA6IDxJbnRlbCBJQ0g5IEFI Q0kgU0FUQSBjb250cm9sbGVyPiBwb3J0IDB4ZDA2MC0weGQwN2YgbWVtIDB4ZmQyMWEwMDAt MHhmZDIxYWZmZiBpcnEgMTYgYXQgZGV2aWNlIDMxLjIgb24gcGNpMAphaGNpMDogQUhDSSB2 MS4wMCB3aXRoIDYgMS41R2JwcyBwb3J0cywgUG9ydCBNdWx0aXBsaWVyIG5vdCBzdXBwb3J0 ZWQKYWhjaWNoMDogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAwIG9uIGFoY2kwCmFoY2lj aDE6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMSBvbiBhaGNpMAphaGNpY2gyOiA8QUhD SSBjaGFubmVsPiBhdCBjaGFubmVsIDIgb24gYWhjaTAKYWhjaWNoMzogPEFIQ0kgY2hhbm5l bD4gYXQgY2hhbm5lbCAzIG9uIGFoY2kwCmFoY2ljaDQ6IDxBSENJIGNoYW5uZWw+IGF0IGNo YW5uZWwgNCBvbiBhaGNpMAphaGNpY2g1OiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDUg b24gYWhjaTAKYWNwaV9zeXNjb250YWluZXIwOiA8U3lzdGVtIENvbnRhaW5lcj4gb24gYWNw aTAKYWNwaV9zeXNjb250YWluZXIxOiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweGNkOC0w eGNlMyBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjI6IDxTeXN0ZW0gQ29udGFpbmVyPiBw b3J0IDB4NjIwLTB4NjJmIG9uIGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMzogPFN5c3RlbSBD b250YWluZXI+IHBvcnQgMHhjYzAtMHhjZDcgb24gYWNwaTAKdWFydDA6IDwxNjU1MCBvciBj b21wYXRpYmxlPiBwb3J0IDB4M2Y4LTB4M2ZmIGlycSA0IGZsYWdzIDB4MTAgb24gYWNwaTAK YXRrYmRjMDogPEtleWJvYXJkIGNvbnRyb2xsZXIgKGk4MDQyKT4gcG9ydCAweDYwLDB4NjQg aXJxIDEgb24gYWNwaTAKYXRrYmQwOiA8QVQgS2V5Ym9hcmQ+IGlycSAxIG9uIGF0a2JkYzAK a2JkMCBhdCBhdGtiZDAKYXRrYmQwOiBbR0lBTlQtTE9DS0VEXQpwc20wOiA8UFMvMiBNb3Vz ZT4gaXJxIDEyIG9uIGF0a2JkYzAKcHNtMDogW0dJQU5ULUxPQ0tFRF0KV0FSTklORzogRGV2 aWNlICJwc20iIGlzIEdpYW50IGxvY2tlZCBhbmQgbWF5IGJlIGRlbGV0ZWQgYmVmb3JlIEZy ZWVCU0QgMTUuMC4KcHNtMDogbW9kZWwgSW50ZWxsaU1vdXNlIEV4cGxvcmVyLCBkZXZpY2Ug SUQgNApvcm0wOiA8SVNBIE9wdGlvbiBST00+IGF0IGlvbWVtIDB4ZTkwMDAtMHhlZmZmZiBw bnBpZCBPUk0wMDAwIG9uIGlzYTAKdmdhMDogPEdlbmVyaWMgSVNBIFZHQT4gYXQgcG9ydCAw eDNjMC0weDNkZiBpb21lbSAweGEwMDAwLTB4YmZmZmYgcG5waWQgUE5QMDkwMCBvbiBpc2Ew CmF0dGltZXIwOiA8QVQgdGltZXI+IGF0IHBvcnQgMHg0MCBvbiBpc2EwClRpbWVjb3VudGVy ICJpODI1NCIgZnJlcXVlbmN5IDExOTMxODIgSHogcXVhbGl0eSAwCkV2ZW50IHRpbWVyICJp ODI1NCIgZnJlcXVlbmN5IDExOTMxODIgSHogcXVhbGl0eSAxMDAKVGltZWNvdW50ZXJzIHRp Y2sgZXZlcnkgMTAuMDAwIG1zZWMKdWdlbjAuMTogPCgweDFiMzYpIFhIQ0kgcm9vdCBIVUI+ IGF0IHVzYnVzMAp1aHViMCBvbiB1c2J1czAKdWh1YjA6IDwoMHgxYjM2KSBYSENJIHJvb3Qg SFVCLCBjbGFzcyA5LzAsIHJldiAzLjAwLzEuMDAsIGFkZHIgMT4gb24gdXNidXMwClpGUyBm aWxlc3lzdGVtIHZlcnNpb246IDUKWkZTIHN0b3JhZ2UgcG9vbCB2ZXJzaW9uOiBmZWF0dXJl cyBzdXBwb3J0ICg1MDAwKQpUcnlpbmcgdG8gbW91bnQgcm9vdCBmcm9tIHpmczp6cm9vdC9S T09ULzIwMjQtMTItMjYtMTgtMDkgW10uLi4KZGEwIGF0IHZ0c2NzaTAgYnVzIDAgc2NidXMw IHRhcmdldCAwIGx1biAwCmRhMDogPFFFTVUgUUVNVSBIQVJERElTSyAyLjUrPiBGaXhlZCBE aXJlY3QgQWNjZXNzIFNQQy0zIFNDU0kgZGV2aWNlCmRhMDogMzAwLjAwME1CL3MgdHJhbnNm ZXJzCmRhMDogQ29tbWFuZCBRdWV1ZWluZyBlbmFibGVkCmRhMDogNzM3MjgwTUIgKDE1MDk5 NDk0NDAgNTEyIGJ5dGUgc2VjdG9ycykKUm9vdCBtb3VudCB3YWl0aW5nIGZvcjogdXNidXMw CnVodWIwOiAzMCBwb3J0cyB3aXRoIDMwIHJlbW92YWJsZSwgc2VsZiBwb3dlcmVkCkdFT01f RUxJOiBEZXZpY2UgZGEwcDIuZWxpIGNyZWF0ZWQuCkdFT01fRUxJOiBFbmNyeXB0aW9uOiBB RVMtWFRTIDEyOApHRU9NX0VMSTogICAgIENyeXB0bzogYWNjZWxlcmF0ZWQgc29mdHdhcmUK aWNoc21iMDogPEludGVsIDgyODAxSSAoSUNIOSkgU01CdXMgY29udHJvbGxlcj4gcG9ydCAw eDcwMC0weDczZiBpcnEgMTYgYXQgZGV2aWNlIDMxLjMgb24gcGNpMApzbWJ1czA6IDxTeXN0 ZW0gTWFuYWdlbWVudCBCdXM+IG9uIGljaHNtYjAKdnRjb24wOiA8VmlydElPIENvbnNvbGUg QWRhcHRlcj4gb24gdmlydGlvX3BjaTIKdnRybmQwOiA8VmlydElPIEVudHJvcHkgQWRhcHRl cj4gb24gdmlydGlvX3BjaTQKcmFuZG9tOiByZWdpc3RlcmluZyBmYXN0IHNvdXJjZSBWaXJ0 SU8gRW50cm9weSBBZGFwdGVyCmxvMDogbGluayBzdGF0ZSBjaGFuZ2VkIHRvIFVQCnZ0bmV0 MDogbGluayBzdGF0ZSBjaGFuZ2VkIHRvIFVQClNlY3VyaXR5IHBvbGljeSBsb2FkZWQ6IE1B Qy9udHBkIChtYWNfbnRwZCkKV2FpdGluZyAobWF4IDYwIHNlY29uZHMpIGZvciBzeXN0ZW0g cHJvY2VzcyBgdm5scnUnIHRvIHN0b3AuLi4gZG9uZQpXYWl0aW5nIChtYXggNjAgc2Vjb25k cykgZm9yIHN5c3RlbSBwcm9jZXNzIGBzeW5jZXInIHRvIHN0b3AuLi4gClN5bmNpbmcgZGlz a3MsIHZub2RlcyByZW1haW5pbmcuLi4gMCAwIGRvbmUKQWxsIGJ1ZmZlcnMgc3luY2VkLgpH RU9NX0VMSTogRGV2aWNlIGRhMHAyLmVsaSBkZXN0cm95ZWQuCkdFT01fRUxJOiBEZXRhY2hl ZCBkYTBwMi5lbGkgb24gbGFzdCBjbG9zZS4KVXB0aW1lOiAxbTQ1cwp1aHViMDogZGV0YWNo ZWQKLS0tPDxCT09UPj4tLS0KQ29weXJpZ2h0IChjKSAxOTkyLTIwMjQgVGhlIEZyZWVCU0Qg UHJvamVjdC4KQ29weXJpZ2h0IChjKSAxOTc5LCAxOTgwLCAxOTgzLCAxOTg2LCAxOTg4LCAx OTg5LCAxOTkxLCAxOTkyLCAxOTkzLCAxOTk0CglUaGUgUmVnZW50cyBvZiB0aGUgVW5pdmVy c2l0eSBvZiBDYWxpZm9ybmlhLiBBbGwgcmlnaHRzIHJlc2VydmVkLgpGcmVlQlNEIGlzIGEg cmVnaXN0ZXJlZCB0cmFkZW1hcmsgb2YgVGhlIEZyZWVCU0QgRm91bmRhdGlvbi4KRnJlZUJT RCAxNS4wLUNVUlJFTlQgIzIzIG4yNzQxODQtZmFmYjQzYWJkMGQ6IFRodSBEZWMgMjYgMTg6 MTI6MDUgLTAzIDIwMjQKICAgIHJvb3RAaWRhaG8uYXJyYWtpcy5jb20uYnI6L3Vzci9vYmov dXNyL3NyYy9hbWQ2NC5hbWQ2NC9zeXMvR0VORVJJQy1OT0RFQlVHIGFtZDY0CkZyZWVCU0Qg Y2xhbmcgdmVyc2lvbiAxOS4xLjUgKGh0dHBzOi8vZ2l0aHViLmNvbS9sbHZtL2xsdm0tcHJv amVjdC5naXQgbGx2bW9yZy0xOS4xLjUtMC1nYWI0YjVhMmRiNTgyKQpWVCh2Z2EpOiB0ZXh0 IDgweDI1CkNQVTogSW50ZWwoUikgWGVvbihSKSBDUFUgRTUtMjY5NyB2MyBAIDIuNjBHSHog KDI2MDAuMTYtTUh6IEs4LWNsYXNzIENQVSkKICBPcmlnaW49IkdlbnVpbmVJbnRlbCIgIElk PTB4MzA2ZjIgIEZhbWlseT0weDYgIE1vZGVsPTB4M2YgIFN0ZXBwaW5nPTIKICBGZWF0dXJl cz0weGY4M2ZiZmY8RlBVLFZNRSxERSxQU0UsVFNDLE1TUixQQUUsTUNFLENYOCxBUElDLFNF UCxNVFJSLFBHRSxNQ0EsQ01PVixQQVQsUFNFMzYsTU1YLEZYU1IsU1NFLFNTRTIsU1M+CiAg RmVhdHVyZXMyPTB4ZmZmYTMyMDM8U1NFMyxQQ0xNVUxRRFEsU1NTRTMsRk1BLENYMTYsUENJ RCxTU0U0LjEsU1NFNC4yLHgyQVBJQyxNT1ZCRSxQT1BDTlQsVFNDRExULEFFU05JLFhTQVZF LE9TWFNBVkUsQVZYLEYxNkMsUkRSQU5ELEhWPgogIEFNRCBGZWF0dXJlcz0weDJjMTAwODAw PFNZU0NBTEwsTlgsUGFnZTFHQixSRFRTQ1AsTE0+CiAgQU1EIEZlYXR1cmVzMj0weDIxPExB SEYsQUJNPgogIFN0cnVjdHVyZWQgRXh0ZW5kZWQgRmVhdHVyZXM9MHg3YWI8RlNHU0JBU0Us VFNDQURKLEJNSTEsQVZYMixTTUVQLEJNSTIsRVJNUyxJTlZQQ0lEPgogIFN0cnVjdHVyZWQg RXh0ZW5kZWQgRmVhdHVyZXMyPTB4NDxVTUlQPgogIFN0cnVjdHVyZWQgRXh0ZW5kZWQgRmVh dHVyZXMzPTB4YWMwMDA0MDA8TURfQ0xFQVIsSUJQQixTVElCUCxBUkNIX0NBUCxTU0JEPgog IFhTQVZFIEZlYXR1cmVzPTB4MTxYU0FWRU9QVD4KICBJQTMyX0FSQ0hfQ0FQUz0weDQ4PFNL SVBfTDFERkxfVk1FPgogIEFNRCBFeHRlbmRlZCBGZWF0dXJlIEV4dGVuc2lvbnMgSUQgRUJY PTB4MTAwZDAwMDxJQlBCLElCUlMsU1RJQlAsU1NCRD4KSHlwZXJ2aXNvcjogT3JpZ2luID0g IktWTUtWTUtWTSIKcmVhbCBtZW1vcnkgID0gNTE1Mzk2MDc1NTIgKDQ5MTUyIE1CKQphdmFp bCBtZW1vcnkgPSA1MDA2NzgwNDE2MCAoNDc3NDggTUIpCkV2ZW50IHRpbWVyICJMQVBJQyIg cXVhbGl0eSA2MDAKQUNQSSBBUElDIFRhYmxlOiA8Qk9DSFMgIEJYUEMgICAgPgpGcmVlQlNE L1NNUDogTXVsdGlwcm9jZXNzb3IgU3lzdGVtIERldGVjdGVkOiAxMiBDUFVzCkZyZWVCU0Qv U01QOiAxMiBwYWNrYWdlKHMpIHggMSBjb3JlKHMpCnJhbmRvbTogcmVnaXN0ZXJpbmcgZmFz dCBzb3VyY2UgSW50ZWwgU2VjdXJlIEtleSBSTkcKcmFuZG9tOiBmYXN0IHByb3ZpZGVyOiAi SW50ZWwgU2VjdXJlIEtleSBSTkciCnJhbmRvbTogdW5ibG9ja2luZyBkZXZpY2UuCmlvYXBp YzAgPFZlcnNpb24gMS4xPiBpcnFzIDAtMjMKTGF1bmNoaW5nIEFQczogNCA2IDEwIDUgMTEg OCAyIDEgMyA5IDcKcmFuZG9tOiBlbnRyb3B5IGRldmljZSBleHRlcm5hbCBpbnRlcmZhY2UK a2JkMSBhdCBrYmRtdXgwCnZ0dmdhMDogPFZUIFZHQSBkcml2ZXI+Cmt2bWNsb2NrMDogPEtW TSBwYXJhdmlydHVhbCBjbG9jaz4KVGltZWNvdW50ZXIgImt2bWNsb2NrIiBmcmVxdWVuY3kg MTAwMDAwMDAwMCBIeiBxdWFsaXR5IDk3NQprdm1jbG9jazA6IHJlZ2lzdGVyZWQgYXMgYSB0 aW1lLW9mLWRheSBjbG9jaywgcmVzb2x1dGlvbiAwLjAwMDAwMXMKc21iaW9zMDogPFN5c3Rl bSBNYW5hZ2VtZW50IEJJT1M+IGF0IGlvbWVtIDB4ZjVhNTAtMHhmNWE2ZQpzbWJpb3MwOiBW ZXJzaW9uOiAyLjgsIEJDRCBSZXZpc2lvbjogMi44CmFlc25pMDogPEFFUy1DQkMsQUVTLUND TSxBRVMtR0NNLEFFUy1JQ00sQUVTLVhUUz4KYWNwaTA6IDxCT0NIUyBCWFBDPgphY3BpMDog UG93ZXIgQnV0dG9uIChmaXhlZCkKY3B1MDogPEFDUEkgQ1BVPiBvbiBhY3BpMAphdHJ0YzA6 IDxBVCByZWFsdGltZSBjbG9jaz4gcG9ydCAweDcwLTB4NzcgaXJxIDggb24gYWNwaTAKYXRy dGMwOiByZWdpc3RlcmVkIGFzIGEgdGltZS1vZi1kYXkgY2xvY2ssIHJlc29sdXRpb24gMS4w MDAwMDBzCkV2ZW50IHRpbWVyICJSVEMiIGZyZXF1ZW5jeSAzMjc2OCBIeiBxdWFsaXR5IDAK VGltZWNvdW50ZXIgIkFDUEktZmFzdCIgZnJlcXVlbmN5IDM1Nzk1NDUgSHogcXVhbGl0eSA5 MDAKYWNwaV90aW1lcjA6IDwyNC1iaXQgdGltZXIgYXQgMy41Nzk1NDVNSHo+IHBvcnQgMHg2 MDgtMHg2MGIgb24gYWNwaTAKcGNpYjA6IDxBQ1BJIEhvc3QtUENJIGJyaWRnZT4gcG9ydCAw eGNmOC0weGNmZiBvbiBhY3BpMApwY2kwOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMAp2Z2Fw Y2kwOiA8VkdBLWNvbXBhdGlibGUgZGlzcGxheT4gcG9ydCAweGQwNDAtMHhkMDVmIG1lbSAw eGY0MDAwMDAwLTB4ZjdmZmZmZmYsMHhmODAwMDAwMC0weGZiZmZmZmZmLDB4ZmQyMTAwMDAt MHhmZDIxMWZmZiBpcnEgMjEgYXQgZGV2aWNlIDEuMCBvbiBwY2kwCnZnYXBjaTA6IEJvb3Qg dmlkZW8gZGV2aWNlCnBjaWIxOiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTIw MDAtMHhmZDIxMmZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuMCBvbiBwY2kwCnBjaWIyOiA8QUNQ SSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTMwMDAtMHhmZDIxM2ZmZiBpcnEgMjIgYXQg ZGV2aWNlIDIuMSBvbiBwY2kwCnBjaWIzOiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4 ZmQyMTQwMDAtMHhmZDIxNGZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuMiBvbiBwY2kwCnBjaWI0 OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTUwMDAtMHhmZDIxNWZmZiBpcnEg MjIgYXQgZGV2aWNlIDIuMyBvbiBwY2kwCnBjaWI1OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4g bWVtIDB4ZmQyMTYwMDAtMHhmZDIxNmZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNCBvbiBwY2kw CnBjaWI2OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTcwMDAtMHhmZDIxN2Zm ZiBpcnEgMjIgYXQgZGV2aWNlIDIuNSBvbiBwY2kwCnBjaWI3OiA8QUNQSSBQQ0ktUENJIGJy aWRnZT4gbWVtIDB4ZmQyMTgwMDAtMHhmZDIxOGZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNiBv biBwY2kwCnBjaWI4OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTkwMDAtMHhm ZDIxOWZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNyBvbiBwY2kwCmlzYWIwOiA8UENJLUlTQSBi cmlkZ2U+IGF0IGRldmljZSAzMS4wIG9uIHBjaTAKaXNhMDogPElTQSBidXM+IG9uIGlzYWIw CmFoY2kwOiA8SW50ZWwgSUNIOSBBSENJIFNBVEEgY29udHJvbGxlcj4gcG9ydCAweGQwNjAt MHhkMDdmIG1lbSAweGZkMjFhMDAwLTB4ZmQyMWFmZmYgaXJxIDE2IGF0IGRldmljZSAzMS4y IG9uIHBjaTAKYWhjaTA6IEFIQ0kgdjEuMDAgd2l0aCA2IDEuNUdicHMgcG9ydHMsIFBvcnQg TXVsdGlwbGllciBub3Qgc3VwcG9ydGVkCmFoY2ljaDA6IDxBSENJIGNoYW5uZWw+IGF0IGNo YW5uZWwgMCBvbiBhaGNpMAphaGNpY2gxOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDEg b24gYWhjaTAKYWhjaWNoMjogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAyIG9uIGFoY2kw CmFoY2ljaDM6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMyBvbiBhaGNpMAphaGNpY2g0 OiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDQgb24gYWhjaTAKYWhjaWNoNTogPEFIQ0kg Y2hhbm5lbD4gYXQgY2hhbm5lbCA1IG9uIGFoY2kwCmFjcGlfc3lzY29udGFpbmVyMDogPFN5 c3RlbSBDb250YWluZXI+IG9uIGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMTogPFN5c3RlbSBD b250YWluZXI+IHBvcnQgMHhjZDgtMHhjZTMgb24gYWNwaTAKYWNwaV9zeXNjb250YWluZXIy OiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweDYyMC0weDYyZiBvbiBhY3BpMAphY3BpX3N5 c2NvbnRhaW5lcjM6IDxTeXN0ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2MwLTB4Y2Q3IG9uIGFj cGkwCnVhcnQwOiA8MTY1NTAgb3IgY29tcGF0aWJsZT4gcG9ydCAweDNmOC0weDNmZiBpcnEg NCBmbGFncyAweDEwIG9uIGFjcGkwCmF0a2JkYzA6IDxLZXlib2FyZCBjb250cm9sbGVyIChp ODA0Mik+IHBvcnQgMHg2MCwweDY0IGlycSAxIG9uIGFjcGkwCmF0a2JkMDogPEFUIEtleWJv YXJkPiBpcnEgMSBvbiBhdGtiZGMwCmtiZDAgYXQgYXRrYmQwCmF0a2JkMDogW0dJQU5ULUxP Q0tFRF0KcHNtMDogPFBTLzIgTW91c2U+IGlycSAxMiBvbiBhdGtiZGMwCnBzbTA6IFtHSUFO VC1MT0NLRURdCldBUk5JTkc6IERldmljZSAicHNtIiBpcyBHaWFudCBsb2NrZWQgYW5kIG1h eSBiZSBkZWxldGVkIGJlZm9yZSBGcmVlQlNEIDE1LjAuCnBzbTA6IG1vZGVsIEludGVsbGlN b3VzZSBFeHBsb3JlciwgZGV2aWNlIElEIDQKb3JtMDogPElTQSBPcHRpb24gUk9NPiBhdCBp b21lbSAweGU5MDAwLTB4ZWZmZmYgcG5waWQgT1JNMDAwMCBvbiBpc2EwCnZnYTA6IDxHZW5l cmljIElTQSBWR0E+IGF0IHBvcnQgMHgzYzAtMHgzZGYgaW9tZW0gMHhhMDAwMC0weGJmZmZm IHBucGlkIFBOUDA5MDAgb24gaXNhMAphdHRpbWVyMDogPEFUIHRpbWVyPiBhdCBwb3J0IDB4 NDAgb24gaXNhMApUaW1lY291bnRlciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1 YWxpdHkgMApFdmVudCB0aW1lciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxp dHkgMTAwClRpbWVjb3VudGVycyB0aWNrIGV2ZXJ5IDEwLjAwMCBtc2VjClpGUyBmaWxlc3lz dGVtIHZlcnNpb246IDUKWkZTIHN0b3JhZ2UgcG9vbCB2ZXJzaW9uOiBmZWF0dXJlcyBzdXBw b3J0ICg1MDAwKQpUcnlpbmcgdG8gbW91bnQgcm9vdCBmcm9tIHpmczp6cm9vdC9ST09ULzIw MjQtMTItMjYtMTgtMTEgW10uLi4KU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUg cG9vbCBsYWJlbCBmb3IgJ3pyb290JwpNb3VudGluZyBmcm9tIHpmczp6cm9vdC9ST09ULzIw MjQtMTItMjYtMTgtMTEgZmFpbGVkIHdpdGggZXJyb3IgNTsgcmV0cnlpbmcgZm9yIDMgbW9y ZSBzZWNvbmRzClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwg Zm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJl bCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxh YmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wg bGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9v bCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBw b29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhl IHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0 aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5k IHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZp bmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3Qg ZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5v dCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fu bm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBD YW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6 IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElD RTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9U SUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBO T1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6 IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJp czogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xh cmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNv bGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcK U29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290 JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJv b3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6 cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3Ig J3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZv ciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwg Zm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJl bCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxh YmVsIGZvciAnenJvb3QnCk1vdW50aW5nIGZyb20gemZzOnpyb290L1JPT1QvMjAyNC0xMi0y Ni0xOC0xMSBmYWlsZWQgd2l0aCBlcnJvciA1LgoKTG9hZGVyIHZhcmlhYmxlczoKICB2ZnMu cm9vdC5tb3VudGZyb209emZzOnpyb290L1JPT1QvMjAyNC0xMi0yNi0xOC0xMQoKTWFudWFs IHJvb3QgZmlsZXN5c3RlbSBzcGVjaWZpY2F0aW9uOgogIDxmc3R5cGU+OjxkZXZpY2U+IFtv cHRpb25zXQogICAgICBNb3VudCA8ZGV2aWNlPiB1c2luZyBmaWxlc3lzdGVtIDxmc3R5cGU+ CiAgICAgIGFuZCB3aXRoIHRoZSBzcGVjaWZpZWQgKG9wdGlvbmFsKSBvcHRpb24gbGlzdC4K CiAgICBlZy4gdWZzOi9kZXYvZGEwczFhCiAgICAgICAgemZzOnpyb290L1JPT1QvZGVmYXVs dAogICAgICAgIGNkOTY2MDovZGV2L2NkMCBybwogICAgICAgICAgKHdoaWNoIGlzIGVxdWl2 YWxlbnQgdG86IG1vdW50IC10IGNkOTY2MCAtbyBybyAvZGV2L2NkMCAvKQoKICA/ICAgICAg ICAgICAgICAgTGlzdCB2YWxpZCBkaXNrIGJvb3QgZGV2aWNlcwogIC4gICAgICAgICAgICAg ICBZaWVsZCAxIHNlY29uZCAoZm9yIGJhY2tncm91bmQgdGFza3MpCiAgPGVtcHR5IGxpbmU+ ICAgIEFib3J0IG1hbnVhbCBpbnB1dAoKbW91bnRyb290PiBwYW5pYzogbW91bnRyb290OiB1 bmFibGUgdG8gKHJlLSltb3VudCByb290LgpjcHVpZCA9IDUKdGltZSA9IDYKS0RCOiBzdGFj ayBiYWNrdHJhY2U6CmRiX3RyYWNlX3NlbGZfd3JhcHBlcigpIGF0IGRiX3RyYWNlX3NlbGZf d3JhcHBlcisweDJiL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWI2MAp2cGFuaWMoKSBhdCB2cGFu aWMrMHgxMzYvZnJhbWUgMHhmZmZmZmUwMTJmNjA1YzkwCnBhbmljKCkgYXQgcGFuaWMrMHg0 My9mcmFtZSAweGZmZmZmZTAxMmY2MDVjZjAKdmZzX21vdW50cm9vdCgpIGF0IHZmc19tb3Vu dHJvb3QrMHgxY2JjL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWU2MApzdGFydF9pbml0KCkgYXQg c3RhcnRfaW5pdCsweDIzL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWVmMApmb3JrX2V4aXQoKSBh dCBmb3JrX2V4aXQrMHg3Yi9mcmFtZSAweGZmZmZmZTAxMmY2MDVmMzAKZm9ya190cmFtcG9s aW5lKCkgYXQgZm9ya190cmFtcG9saW5lKzB4ZS9mcmFtZSAweGZmZmZmZTAxMmY2MDVmMzAK LS0tIHRyYXAgMHgzZjU5MDM4LCByaXAgPSAweGZmZmZmZmZmODAzOGE2ZDgsIHJzcCA9IDB4 ZmZmZmY4MDEwMjkwMjAwMCwgcmJwID0gMHhmZmZmZmZmZjgwOTc4MTIwIC0tLQp4cHRfYWN0 aW9uX2RlZmF1bHQoKSBhdCB4cHRfYWN0aW9uX2RlZmF1bHQrMHgzZDgvZnJhbWUgMHhmZmZm ZmZmZjgwOTc4MTIwCktEQjogZW50ZXI6IHBhbmljCi0tLTw8Qk9PVD4+LS0tCkNvcHlyaWdo dCAoYykgMTk5Mi0yMDI0IFRoZSBGcmVlQlNEIFByb2plY3QuCkNvcHlyaWdodCAoYykgMTk3 OSwgMTk4MCwgMTk4MywgMTk4NiwgMTk4OCwgMTk4OSwgMTk5MSwgMTk5MiwgMTk5MywgMTk5 NAoJVGhlIFJlZ2VudHMgb2YgdGhlIFVuaXZlcnNpdHkgb2YgQ2FsaWZvcm5pYS4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KRnJlZUJTRCBpcyBhIHJlZ2lzdGVyZWQgdHJhZGVtYXJrIG9mIFRo ZSBGcmVlQlNEIEZvdW5kYXRpb24uCkZyZWVCU0QgMTUuMC1DVVJSRU5UICMyMiBuMjc0MTgy LTkzOGU0YjEzMWM0OiBUaHUgRGVjIDI2IDE4OjEwOjEyIC0wMyAyMDI0CiAgICByb290QGlk YWhvLmFycmFraXMuY29tLmJyOi91c3Ivb2JqL3Vzci9zcmMvYW1kNjQuYW1kNjQvc3lzL0dF TkVSSUMtTk9ERUJVRyBhbWQ2NApGcmVlQlNEIGNsYW5nIHZlcnNpb24gMTkuMS41IChodHRw czovL2dpdGh1Yi5jb20vbGx2bS9sbHZtLXByb2plY3QuZ2l0IGxsdm1vcmctMTkuMS41LTAt Z2FiNGI1YTJkYjU4MikKVlQodmdhKTogdGV4dCA4MHgyNQpDUFU6IEludGVsKFIpIFhlb24o UikgQ1BVIEU1LTI2OTcgdjMgQCAyLjYwR0h6ICgyNjAwLjEwLU1IeiBLOC1jbGFzcyBDUFUp CiAgT3JpZ2luPSJHZW51aW5lSW50ZWwiICBJZD0weDMwNmYyICBGYW1pbHk9MHg2ICBNb2Rl bD0weDNmICBTdGVwcGluZz0yCiAgRmVhdHVyZXM9MHhmODNmYmZmPEZQVSxWTUUsREUsUFNF LFRTQyxNU1IsUEFFLE1DRSxDWDgsQVBJQyxTRVAsTVRSUixQR0UsTUNBLENNT1YsUEFULFBT RTM2LE1NWCxGWFNSLFNTRSxTU0UyLFNTPgogIEZlYXR1cmVzMj0weGZmZmEzMjAzPFNTRTMs UENMTVVMUURRLFNTU0UzLEZNQSxDWDE2LFBDSUQsU1NFNC4xLFNTRTQuMix4MkFQSUMsTU9W QkUsUE9QQ05ULFRTQ0RMVCxBRVNOSSxYU0FWRSxPU1hTQVZFLEFWWCxGMTZDLFJEUkFORCxI Vj4KICBBTUQgRmVhdHVyZXM9MHgyYzEwMDgwMDxTWVNDQUxMLE5YLFBhZ2UxR0IsUkRUU0NQ LExNPgogIEFNRCBGZWF0dXJlczI9MHgyMTxMQUhGLEFCTT4KICBTdHJ1Y3R1cmVkIEV4dGVu ZGVkIEZlYXR1cmVzPTB4N2FiPEZTR1NCQVNFLFRTQ0FESixCTUkxLEFWWDIsU01FUCxCTUky LEVSTVMsSU5WUENJRD4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMj0weDQ8VU1J UD4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMz0weGFjMDAwNDAwPE1EX0NMRUFS LElCUEIsU1RJQlAsQVJDSF9DQVAsU1NCRD4KICBYU0FWRSBGZWF0dXJlcz0weDE8WFNBVkVP UFQ+CiAgSUEzMl9BUkNIX0NBUFM9MHg0ODxTS0lQX0wxREZMX1ZNRT4KICBBTUQgRXh0ZW5k ZWQgRmVhdHVyZSBFeHRlbnNpb25zIElEIEVCWD0weDEwMGQwMDA8SUJQQixJQlJTLFNUSUJQ LFNTQkQ+Ckh5cGVydmlzb3I6IE9yaWdpbiA9ICJLVk1LVk1LVk0iCnJlYWwgbWVtb3J5ICA9 IDUxNTM5NjA3NTUyICg0OTE1MiBNQikKYXZhaWwgbWVtb3J5ID0gNTAwNjc4MDAwNjQgKDQ3 NzQ4IE1CKQpFdmVudCB0aW1lciAiTEFQSUMiIHF1YWxpdHkgNjAwCkFDUEkgQVBJQyBUYWJs ZTogPEJPQ0hTICBCWFBDICAgID4KRnJlZUJTRC9TTVA6IE11bHRpcHJvY2Vzc29yIFN5c3Rl bSBEZXRlY3RlZDogMTIgQ1BVcwpGcmVlQlNEL1NNUDogMTIgcGFja2FnZShzKSB4IDEgY29y ZShzKQpyYW5kb206IHJlZ2lzdGVyaW5nIGZhc3Qgc291cmNlIEludGVsIFNlY3VyZSBLZXkg Uk5HCnJhbmRvbTogZmFzdCBwcm92aWRlcjogIkludGVsIFNlY3VyZSBLZXkgUk5HIgpyYW5k b206IHVuYmxvY2tpbmcgZGV2aWNlLgppb2FwaWMwIDxWZXJzaW9uIDEuMT4gaXJxcyAwLTIz CkxhdW5jaGluZyBBUHM6IDcgOSAzIDEwIDEgMiA1IDQgNiAxMSA4CnJhbmRvbTogZW50cm9w eSBkZXZpY2UgZXh0ZXJuYWwgaW50ZXJmYWNlCmtiZDEgYXQga2JkbXV4MAp2dHZnYTA6IDxW VCBWR0EgZHJpdmVyPgprdm1jbG9jazA6IDxLVk0gcGFyYXZpcnR1YWwgY2xvY2s+ClRpbWVj b3VudGVyICJrdm1jbG9jayIgZnJlcXVlbmN5IDEwMDAwMDAwMDAgSHogcXVhbGl0eSA5NzUK a3ZtY2xvY2swOiByZWdpc3RlcmVkIGFzIGEgdGltZS1vZi1kYXkgY2xvY2ssIHJlc29sdXRp b24gMC4wMDAwMDFzCnNtYmlvczA6IDxTeXN0ZW0gTWFuYWdlbWVudCBCSU9TPiBhdCBpb21l bSAweGY1YTUwLTB4ZjVhNmUKc21iaW9zMDogVmVyc2lvbjogMi44LCBCQ0QgUmV2aXNpb246 IDIuOAphZXNuaTA6IDxBRVMtQ0JDLEFFUy1DQ00sQUVTLUdDTSxBRVMtSUNNLEFFUy1YVFM+ CmFjcGkwOiA8Qk9DSFMgQlhQQz4KYWNwaTA6IFBvd2VyIEJ1dHRvbiAoZml4ZWQpCmNwdTA6 IDxBQ1BJIENQVT4gb24gYWNwaTAKYXRydGMwOiA8QVQgcmVhbHRpbWUgY2xvY2s+IHBvcnQg MHg3MC0weDc3IGlycSA4IG9uIGFjcGkwCmF0cnRjMDogcmVnaXN0ZXJlZCBhcyBhIHRpbWUt b2YtZGF5IGNsb2NrLCByZXNvbHV0aW9uIDEuMDAwMDAwcwpFdmVudCB0aW1lciAiUlRDIiBm cmVxdWVuY3kgMzI3NjggSHogcXVhbGl0eSAwClRpbWVjb3VudGVyICJBQ1BJLWZhc3QiIGZy ZXF1ZW5jeSAzNTc5NTQ1IEh6IHF1YWxpdHkgOTAwCmFjcGlfdGltZXIwOiA8MjQtYml0IHRp bWVyIGF0IDMuNTc5NTQ1TUh6PiBwb3J0IDB4NjA4LTB4NjBiIG9uIGFjcGkwCnBjaWIwOiA8 QUNQSSBIb3N0LVBDSSBicmlkZ2U+IHBvcnQgMHhjZjgtMHhjZmYgb24gYWNwaTAKcGNpMDog PEFDUEkgUENJIGJ1cz4gb24gcGNpYjAKdmdhcGNpMDogPFZHQS1jb21wYXRpYmxlIGRpc3Bs YXk+IHBvcnQgMHhkMDQwLTB4ZDA1ZiBtZW0gMHhmNDAwMDAwMC0weGY3ZmZmZmZmLDB4Zjgw MDAwMDAtMHhmYmZmZmZmZiwweGZkMjEwMDAwLTB4ZmQyMTFmZmYgaXJxIDIxIGF0IGRldmlj ZSAxLjAgb24gcGNpMAp2Z2FwY2kwOiBCb290IHZpZGVvIGRldmljZQpwY2liMTogPEFDUEkg UENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEyMDAwLTB4ZmQyMTJmZmYgaXJxIDIyIGF0IGRl dmljZSAyLjAgb24gcGNpMApwY2kxOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMQpwY2liMjog PEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZjMjAwMDAwLTB4ZmMyMDAwZmYgaXJxIDIy IGF0IGRldmljZSAwLjAgb24gcGNpMQpwY2kyOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMgpw Y2liMzogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEzMDAwLTB4ZmQyMTNmZmYg aXJxIDIyIGF0IGRldmljZSAyLjEgb24gcGNpMApwY2kzOiA8QUNQSSBQQ0kgYnVzPiBvbiBw Y2liMwp2aXJ0aW9fcGNpMDogPFZpcnRJTyBQQ0kgKG1vZGVybikgTmV0d29yayBhZGFwdGVy PiBtZW0gMHhmZDA0MDAwMC0weGZkMDQwZmZmLDB4ZmU4MDAwMDAtMHhmZTgwM2ZmZiBpcnEg MjIgYXQgZGV2aWNlIDAuMCBvbiBwY2kzCnZ0bmV0MDogPFZpcnRJTyBOZXR3b3JraW5nIEFk YXB0ZXI+IG9uIHZpcnRpb19wY2kwCnZ0bmV0MDogRXRoZXJuZXQgYWRkcmVzczogNTI6NTQ6 NTg6OTM6Yzc6ZWYKdnRuZXQwOiBuZXRtYXAgcXVldWVzL3Nsb3RzOiBUWCAxLzI1NiwgUlgg MS8xMjgKMDAwLjAwMDA3NyBbIDQ1Ml0gdnRuZXRfbmV0bWFwX2F0dGFjaCAgICAgICB2dG5l dCBhdHRhY2hlZCB0eHE9MSwgdHhkPTI1NiByeHE9MSwgcnhkPTEyOApwY2liNDogPEFDUEkg UENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE0MDAwLTB4ZmQyMTRmZmYgaXJxIDIyIGF0IGRl dmljZSAyLjIgb24gcGNpMApwY2k0OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNAp4aGNpMDog PFhIQ0kgKGdlbmVyaWMpIFVTQiAzLjAgY29udHJvbGxlcj4gbWVtIDB4ZmNlMDAwMDAtMHhm Y2UwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2k0CnhoY2kwOiAzMiBieXRlcyBj b250ZXh0IHNpemUsIDY0LWJpdCBETUEKdXNidXMwIG9uIHhoY2kwCnVzYnVzMDogNS4wR2Jw cyBTdXBlciBTcGVlZCBVU0IgdjMuMApwY2liNTogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1l bSAweGZkMjE1MDAwLTB4ZmQyMTVmZmYgaXJxIDIyIGF0IGRldmljZSAyLjMgb24gcGNpMApw Y2k1OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNQp2aXJ0aW9fcGNpMTogPFZpcnRJTyBQQ0kg KG1vZGVybikgU0NTSSBhZGFwdGVyPiBtZW0gMHhmY2MwMDAwMC0weGZjYzAwZmZmLDB4ZmU0 MDAwMDAtMHhmZTQwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2k1CnZ0c2NzaTA6 IDxWaXJ0SU8gU0NTSSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMQpwY2liNjogPEFDUEkgUENJ LVBDSSBicmlkZ2U+IG1lbSAweGZkMjE2MDAwLTB4ZmQyMTZmZmYgaXJxIDIyIGF0IGRldmlj ZSAyLjQgb24gcGNpMApwY2k2OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNgp2aXJ0aW9fcGNp MjogPFZpcnRJTyBQQ0kgKG1vZGVybikgQ29uc29sZSBhZGFwdGVyPiBtZW0gMHhmY2EwMDAw MC0weGZjYTAwZmZmLDB4ZmUyMDAwMDAtMHhmZTIwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAu MCBvbiBwY2k2CnBjaWI3OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTcwMDAt MHhmZDIxN2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNSBvbiBwY2kwCnBjaTc6IDxBQ1BJIFBD SSBidXM+IG9uIHBjaWI3CnZpcnRpb19wY2kzOiA8VmlydElPIFBDSSAobW9kZXJuKSBCYWxs b29uIGFkYXB0ZXI+IG1lbSAweGZlMDAwMDAwLTB4ZmUwMDNmZmYgaXJxIDIyIGF0IGRldmlj ZSAwLjAgb24gcGNpNwp2dGJhbGxvb24wOiA8VmlydElPIEJhbGxvb24gQWRhcHRlcj4gb24g dmlydGlvX3BjaTMKcGNpYjg6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxODAw MC0weGZkMjE4ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi42IG9uIHBjaTAKcGNpODogPEFDUEkg UENJIGJ1cz4gb24gcGNpYjgKdmlydGlvX3BjaTQ6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIEVu dHJvcHkgYWRhcHRlcj4gbWVtIDB4ZmRlMDAwMDAtMHhmZGUwM2ZmZiBpcnEgMjIgYXQgZGV2 aWNlIDAuMCBvbiBwY2k4CnBjaWI5OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQy MTkwMDAtMHhmZDIxOWZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNyBvbiBwY2kwCnBjaTk6IDxB Q1BJIFBDSSBidXM+IG9uIHBjaWI5CmlzYWIwOiA8UENJLUlTQSBicmlkZ2U+IGF0IGRldmlj ZSAzMS4wIG9uIHBjaTAKaXNhMDogPElTQSBidXM+IG9uIGlzYWIwCmFoY2kwOiA8SW50ZWwg SUNIOSBBSENJIFNBVEEgY29udHJvbGxlcj4gcG9ydCAweGQwNjAtMHhkMDdmIG1lbSAweGZk MjFhMDAwLTB4ZmQyMWFmZmYgaXJxIDE2IGF0IGRldmljZSAzMS4yIG9uIHBjaTAKYWhjaTA6 IEFIQ0kgdjEuMDAgd2l0aCA2IDEuNUdicHMgcG9ydHMsIFBvcnQgTXVsdGlwbGllciBub3Qg c3VwcG9ydGVkCmFoY2ljaDA6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMCBvbiBhaGNp MAphaGNpY2gxOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDEgb24gYWhjaTAKYWhjaWNo MjogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAyIG9uIGFoY2kwCmFoY2ljaDM6IDxBSENJ IGNoYW5uZWw+IGF0IGNoYW5uZWwgMyBvbiBhaGNpMAphaGNpY2g0OiA8QUhDSSBjaGFubmVs PiBhdCBjaGFubmVsIDQgb24gYWhjaTAKYWhjaWNoNTogPEFIQ0kgY2hhbm5lbD4gYXQgY2hh bm5lbCA1IG9uIGFoY2kwCmFjcGlfc3lzY29udGFpbmVyMDogPFN5c3RlbSBDb250YWluZXI+ IG9uIGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMTogPFN5c3RlbSBDb250YWluZXI+IHBvcnQg MHhjZDgtMHhjZTMgb24gYWNwaTAKYWNwaV9zeXNjb250YWluZXIyOiA8U3lzdGVtIENvbnRh aW5lcj4gcG9ydCAweDYyMC0weDYyZiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjM6IDxT eXN0ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2MwLTB4Y2Q3IG9uIGFjcGkwCnVhcnQwOiA8MTY1 NTAgb3IgY29tcGF0aWJsZT4gcG9ydCAweDNmOC0weDNmZiBpcnEgNCBmbGFncyAweDEwIG9u IGFjcGkwCmF0a2JkYzA6IDxLZXlib2FyZCBjb250cm9sbGVyIChpODA0Mik+IHBvcnQgMHg2 MCwweDY0IGlycSAxIG9uIGFjcGkwCmF0a2JkMDogPEFUIEtleWJvYXJkPiBpcnEgMSBvbiBh dGtiZGMwCmtiZDAgYXQgYXRrYmQwCmF0a2JkMDogW0dJQU5ULUxPQ0tFRF0KcHNtMDogPFBT LzIgTW91c2U+IGlycSAxMiBvbiBhdGtiZGMwCnBzbTA6IFtHSUFOVC1MT0NLRURdCldBUk5J Tkc6IERldmljZSAicHNtIiBpcyBHaWFudCBsb2NrZWQgYW5kIG1heSBiZSBkZWxldGVkIGJl Zm9yZSBGcmVlQlNEIDE1LjAuCnBzbTA6IG1vZGVsIEludGVsbGlNb3VzZSBFeHBsb3Jlciwg ZGV2aWNlIElEIDQKb3JtMDogPElTQSBPcHRpb24gUk9NPiBhdCBpb21lbSAweGU5MDAwLTB4 ZWZmZmYgcG5waWQgT1JNMDAwMCBvbiBpc2EwCnZnYTA6IDxHZW5lcmljIElTQSBWR0E+IGF0 IHBvcnQgMHgzYzAtMHgzZGYgaW9tZW0gMHhhMDAwMC0weGJmZmZmIHBucGlkIFBOUDA5MDAg b24gaXNhMAphdHRpbWVyMDogPEFUIHRpbWVyPiBhdCBwb3J0IDB4NDAgb24gaXNhMApUaW1l Y291bnRlciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxpdHkgMApFdmVudCB0 aW1lciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxpdHkgMTAwClRpbWVjb3Vu dGVycyB0aWNrIGV2ZXJ5IDEwLjAwMCBtc2VjCnVnZW4wLjE6IDwoMHgxYjM2KSBYSENJIHJv b3QgSFVCPiBhdCB1c2J1czAKdWh1YjAgb24gdXNidXMwCnVodWIwOiA8KDB4MWIzNikgWEhD SSByb290IEhVQiwgY2xhc3MgOS8wLCByZXYgMy4wMC8xLjAwLCBhZGRyIDE+IG9uIHVzYnVz MApaRlMgZmlsZXN5c3RlbSB2ZXJzaW9uOiA1ClpGUyBzdG9yYWdlIHBvb2wgdmVyc2lvbjog ZmVhdHVyZXMgc3VwcG9ydCAoNTAwMCkKVHJ5aW5nIHRvIG1vdW50IHJvb3QgZnJvbSB6ZnM6 enJvb3QvUk9PVC8yMDI0LTEyLTI2LTE4LTA5IFtdLi4uCmRhMCBhdCB2dHNjc2kwIGJ1cyAw IHNjYnVzMCB0YXJnZXQgMCBsdW4gMApkYTA6IDxRRU1VIFFFTVUgSEFSRERJU0sgMi41Kz4g Rml4ZWQgRGlyZWN0IEFjY2VzcyBTUEMtMyBTQ1NJIGRldmljZQpkYTA6IDMwMC4wMDBNQi9z IHRyYW5zZmVycwpkYTA6IENvbW1hbmQgUXVldWVpbmcgZW5hYmxlZApkYTA6IDczNzI4ME1C ICgxNTA5OTQ5NDQwIDUxMiBieXRlIHNlY3RvcnMpClJvb3QgbW91bnQgd2FpdGluZyBmb3I6 IHVzYnVzMAp1aHViMDogMzAgcG9ydHMgd2l0aCAzMCByZW1vdmFibGUsIHNlbGYgcG93ZXJl ZApHRU9NX0VMSTogRGV2aWNlIGRhMHAyLmVsaSBjcmVhdGVkLgpHRU9NX0VMSTogRW5jcnlw dGlvbjogQUVTLVhUUyAxMjgKR0VPTV9FTEk6ICAgICBDcnlwdG86IGFjY2VsZXJhdGVkIHNv ZnR3YXJlCmljaHNtYjA6IDxJbnRlbCA4MjgwMUkgKElDSDkpIFNNQnVzIGNvbnRyb2xsZXI+ IHBvcnQgMHg3MDAtMHg3M2YgaXJxIDE2IGF0IGRldmljZSAzMS4zIG9uIHBjaTAKc21idXMw OiA8U3lzdGVtIE1hbmFnZW1lbnQgQnVzPiBvbiBpY2hzbWIwCnZ0Y29uMDogPFZpcnRJTyBD b25zb2xlIEFkYXB0ZXI+IG9uIHZpcnRpb19wY2kyCnZ0cm5kMDogPFZpcnRJTyBFbnRyb3B5 IEFkYXB0ZXI+IG9uIHZpcnRpb19wY2k0CnJhbmRvbTogcmVnaXN0ZXJpbmcgZmFzdCBzb3Vy Y2UgVmlydElPIEVudHJvcHkgQWRhcHRlcgpsbzA6IGxpbmsgc3RhdGUgY2hhbmdlZCB0byBV UAp2dG5ldDA6IGxpbmsgc3RhdGUgY2hhbmdlZCB0byBVUApTZWN1cml0eSBwb2xpY3kgbG9h ZGVkOiBNQUMvbnRwZCAobWFjX250cGQpCldhaXRpbmcgKG1heCA2MCBzZWNvbmRzKSBmb3Ig c3lzdGVtIHByb2Nlc3MgYHZubHJ1JyB0byBzdG9wLi4uIGRvbmUKV2FpdGluZyAobWF4IDYw IHNlY29uZHMpIGZvciBzeXN0ZW0gcHJvY2VzcyBgc3luY2VyJyB0byBzdG9wLi4uIApTeW5j aW5nIGRpc2tzLCB2bm9kZXMgcmVtYWluaW5nLi4uIDAgMCBkb25lCkFsbCBidWZmZXJzIHN5 bmNlZC4KR0VPTV9FTEk6IERldmljZSBkYTBwMi5lbGkgZGVzdHJveWVkLgpHRU9NX0VMSTog RGV0YWNoZWQgZGEwcDIuZWxpIG9uIGxhc3QgY2xvc2UuClVwdGltZTogMW0zMHMKdWh1YjA6 IGRldGFjaGVkCi0tLTw8Qk9PVD4+LS0tCkNvcHlyaWdodCAoYykgMTk5Mi0yMDI0IFRoZSBG cmVlQlNEIFByb2plY3QuCkNvcHlyaWdodCAoYykgMTk3OSwgMTk4MCwgMTk4MywgMTk4Niwg MTk4OCwgMTk4OSwgMTk5MSwgMTk5MiwgMTk5MywgMTk5NAoJVGhlIFJlZ2VudHMgb2YgdGhl IFVuaXZlcnNpdHkgb2YgQ2FsaWZvcm5pYS4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KRnJlZUJT RCBpcyBhIHJlZ2lzdGVyZWQgdHJhZGVtYXJrIG9mIFRoZSBGcmVlQlNEIEZvdW5kYXRpb24u CkZyZWVCU0QgMTUuMC1DVVJSRU5UICMyMyBuMjc0MTgzLWJhMTkwNDkzN2Q5OiBUaHUgRGVj IDI2IDE4OjE0OjAzIC0wMyAyMDI0CiAgICByb290QGlkYWhvLmFycmFraXMuY29tLmJyOi91 c3Ivb2JqL3Vzci9zcmMvYW1kNjQuYW1kNjQvc3lzL0dFTkVSSUMtTk9ERUJVRyBhbWQ2NApG cmVlQlNEIGNsYW5nIHZlcnNpb24gMTkuMS41IChodHRwczovL2dpdGh1Yi5jb20vbGx2bS9s bHZtLXByb2plY3QuZ2l0IGxsdm1vcmctMTkuMS41LTAtZ2FiNGI1YTJkYjU4MikKVlQodmdh KTogdGV4dCA4MHgyNQpDUFU6IEludGVsKFIpIFhlb24oUikgQ1BVIEU1LTI2OTcgdjMgQCAy LjYwR0h6ICgyNjAwLjE1LU1IeiBLOC1jbGFzcyBDUFUpCiAgT3JpZ2luPSJHZW51aW5lSW50 ZWwiICBJZD0weDMwNmYyICBGYW1pbHk9MHg2ICBNb2RlbD0weDNmICBTdGVwcGluZz0yCiAg RmVhdHVyZXM9MHhmODNmYmZmPEZQVSxWTUUsREUsUFNFLFRTQyxNU1IsUEFFLE1DRSxDWDgs QVBJQyxTRVAsTVRSUixQR0UsTUNBLENNT1YsUEFULFBTRTM2LE1NWCxGWFNSLFNTRSxTU0Uy LFNTPgogIEZlYXR1cmVzMj0weGZmZmEzMjAzPFNTRTMsUENMTVVMUURRLFNTU0UzLEZNQSxD WDE2LFBDSUQsU1NFNC4xLFNTRTQuMix4MkFQSUMsTU9WQkUsUE9QQ05ULFRTQ0RMVCxBRVNO SSxYU0FWRSxPU1hTQVZFLEFWWCxGMTZDLFJEUkFORCxIVj4KICBBTUQgRmVhdHVyZXM9MHgy YzEwMDgwMDxTWVNDQUxMLE5YLFBhZ2UxR0IsUkRUU0NQLExNPgogIEFNRCBGZWF0dXJlczI9 MHgyMTxMQUhGLEFCTT4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzPTB4N2FiPEZT R1NCQVNFLFRTQ0FESixCTUkxLEFWWDIsU01FUCxCTUkyLEVSTVMsSU5WUENJRD4KICBTdHJ1 Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMj0weDQ8VU1JUD4KICBTdHJ1Y3R1cmVkIEV4dGVu ZGVkIEZlYXR1cmVzMz0weGFjMDAwNDAwPE1EX0NMRUFSLElCUEIsU1RJQlAsQVJDSF9DQVAs U1NCRD4KICBYU0FWRSBGZWF0dXJlcz0weDE8WFNBVkVPUFQ+CiAgSUEzMl9BUkNIX0NBUFM9 MHg0ODxTS0lQX0wxREZMX1ZNRT4KICBBTUQgRXh0ZW5kZWQgRmVhdHVyZSBFeHRlbnNpb25z IElEIEVCWD0weDEwMGQwMDA8SUJQQixJQlJTLFNUSUJQLFNTQkQ+Ckh5cGVydmlzb3I6IE9y aWdpbiA9ICJLVk1LVk1LVk0iCnJlYWwgbWVtb3J5ICA9IDUxNTM5NjA3NTUyICg0OTE1MiBN QikKYXZhaWwgbWVtb3J5ID0gNTAwNjc4MDQxNjAgKDQ3NzQ4IE1CKQpFdmVudCB0aW1lciAi TEFQSUMiIHF1YWxpdHkgNjAwCkFDUEkgQVBJQyBUYWJsZTogPEJPQ0hTICBCWFBDICAgID4K RnJlZUJTRC9TTVA6IE11bHRpcHJvY2Vzc29yIFN5c3RlbSBEZXRlY3RlZDogMTIgQ1BVcwpG cmVlQlNEL1NNUDogMTIgcGFja2FnZShzKSB4IDEgY29yZShzKQpyYW5kb206IHJlZ2lzdGVy aW5nIGZhc3Qgc291cmNlIEludGVsIFNlY3VyZSBLZXkgUk5HCnJhbmRvbTogZmFzdCBwcm92 aWRlcjogIkludGVsIFNlY3VyZSBLZXkgUk5HIgpyYW5kb206IHVuYmxvY2tpbmcgZGV2aWNl Lgppb2FwaWMwIDxWZXJzaW9uIDEuMT4gaXJxcyAwLTIzCkxhdW5jaGluZyBBUHM6IDEgNCA2 IDIgNyA5IDMgMTEgOCA1IDEwCnJhbmRvbTogZW50cm9weSBkZXZpY2UgZXh0ZXJuYWwgaW50 ZXJmYWNlCmtiZDEgYXQga2JkbXV4MAp2dHZnYTA6IDxWVCBWR0EgZHJpdmVyPgprdm1jbG9j azA6IDxLVk0gcGFyYXZpcnR1YWwgY2xvY2s+ClRpbWVjb3VudGVyICJrdm1jbG9jayIgZnJl cXVlbmN5IDEwMDAwMDAwMDAgSHogcXVhbGl0eSA5NzUKa3ZtY2xvY2swOiByZWdpc3RlcmVk IGFzIGEgdGltZS1vZi1kYXkgY2xvY2ssIHJlc29sdXRpb24gMC4wMDAwMDFzCnNtYmlvczA6 IDxTeXN0ZW0gTWFuYWdlbWVudCBCSU9TPiBhdCBpb21lbSAweGY1YTUwLTB4ZjVhNmUKc21i aW9zMDogVmVyc2lvbjogMi44LCBCQ0QgUmV2aXNpb246IDIuOAphZXNuaTA6IDxBRVMtQ0JD LEFFUy1DQ00sQUVTLUdDTSxBRVMtSUNNLEFFUy1YVFM+CmFjcGkwOiA8Qk9DSFMgQlhQQz4K YWNwaTA6IFBvd2VyIEJ1dHRvbiAoZml4ZWQpCmNwdTA6IDxBQ1BJIENQVT4gb24gYWNwaTAK YXRydGMwOiA8QVQgcmVhbHRpbWUgY2xvY2s+IHBvcnQgMHg3MC0weDc3IGlycSA4IG9uIGFj cGkwCmF0cnRjMDogcmVnaXN0ZXJlZCBhcyBhIHRpbWUtb2YtZGF5IGNsb2NrLCByZXNvbHV0 aW9uIDEuMDAwMDAwcwpFdmVudCB0aW1lciAiUlRDIiBmcmVxdWVuY3kgMzI3NjggSHogcXVh bGl0eSAwClRpbWVjb3VudGVyICJBQ1BJLWZhc3QiIGZyZXF1ZW5jeSAzNTc5NTQ1IEh6IHF1 YWxpdHkgOTAwCmFjcGlfdGltZXIwOiA8MjQtYml0IHRpbWVyIGF0IDMuNTc5NTQ1TUh6PiBw b3J0IDB4NjA4LTB4NjBiIG9uIGFjcGkwCnBjaWIwOiA8QUNQSSBIb3N0LVBDSSBicmlkZ2U+ IHBvcnQgMHhjZjgtMHhjZmYgb24gYWNwaTAKcGNpMDogPEFDUEkgUENJIGJ1cz4gb24gcGNp YjAKdmdhcGNpMDogPFZHQS1jb21wYXRpYmxlIGRpc3BsYXk+IHBvcnQgMHhkMDQwLTB4ZDA1 ZiBtZW0gMHhmNDAwMDAwMC0weGY3ZmZmZmZmLDB4ZjgwMDAwMDAtMHhmYmZmZmZmZiwweGZk MjEwMDAwLTB4ZmQyMTFmZmYgaXJxIDIxIGF0IGRldmljZSAxLjAgb24gcGNpMAp2Z2FwY2kw OiBCb290IHZpZGVvIGRldmljZQpwY2liMTogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAw eGZkMjEyMDAwLTB4ZmQyMTJmZmYgaXJxIDIyIGF0IGRldmljZSAyLjAgb24gcGNpMApwY2li MjogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEzMDAwLTB4ZmQyMTNmZmYgaXJx IDIyIGF0IGRldmljZSAyLjEgb24gcGNpMApwY2liMzogPEFDUEkgUENJLVBDSSBicmlkZ2U+ IG1lbSAweGZkMjE0MDAwLTB4ZmQyMTRmZmYgaXJxIDIyIGF0IGRldmljZSAyLjIgb24gcGNp MApwY2liNDogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE1MDAwLTB4ZmQyMTVm ZmYgaXJxIDIyIGF0IGRldmljZSAyLjMgb24gcGNpMApwY2liNTogPEFDUEkgUENJLVBDSSBi cmlkZ2U+IG1lbSAweGZkMjE2MDAwLTB4ZmQyMTZmZmYgaXJxIDIyIGF0IGRldmljZSAyLjQg b24gcGNpMApwY2liNjogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE3MDAwLTB4 ZmQyMTdmZmYgaXJxIDIyIGF0IGRldmljZSAyLjUgb24gcGNpMApwY2liNzogPEFDUEkgUENJ LVBDSSBicmlkZ2U+IG1lbSAweGZkMjE4MDAwLTB4ZmQyMThmZmYgaXJxIDIyIGF0IGRldmlj ZSAyLjYgb24gcGNpMApwY2liODogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE5 MDAwLTB4ZmQyMTlmZmYgaXJxIDIyIGF0IGRldmljZSAyLjcgb24gcGNpMAppc2FiMDogPFBD SS1JU0EgYnJpZGdlPiBhdCBkZXZpY2UgMzEuMCBvbiBwY2kwCmlzYTA6IDxJU0EgYnVzPiBv biBpc2FiMAphaGNpMDogPEludGVsIElDSDkgQUhDSSBTQVRBIGNvbnRyb2xsZXI+IHBvcnQg MHhkMDYwLTB4ZDA3ZiBtZW0gMHhmZDIxYTAwMC0weGZkMjFhZmZmIGlycSAxNiBhdCBkZXZp Y2UgMzEuMiBvbiBwY2kwCmFoY2kwOiBBSENJIHYxLjAwIHdpdGggNiAxLjVHYnBzIHBvcnRz LCBQb3J0IE11bHRpcGxpZXIgbm90IHN1cHBvcnRlZAphaGNpY2gwOiA8QUhDSSBjaGFubmVs PiBhdCBjaGFubmVsIDAgb24gYWhjaTAKYWhjaWNoMTogPEFIQ0kgY2hhbm5lbD4gYXQgY2hh bm5lbCAxIG9uIGFoY2kwCmFoY2ljaDI6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMiBv biBhaGNpMAphaGNpY2gzOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDMgb24gYWhjaTAK YWhjaWNoNDogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCA0IG9uIGFoY2kwCmFoY2ljaDU6 IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgNSBvbiBhaGNpMAphY3BpX3N5c2NvbnRhaW5l cjA6IDxTeXN0ZW0gQ29udGFpbmVyPiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjE6IDxT eXN0ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2Q4LTB4Y2UzIG9uIGFjcGkwCmFjcGlfc3lzY29u dGFpbmVyMjogPFN5c3RlbSBDb250YWluZXI+IHBvcnQgMHg2MjAtMHg2MmYgb24gYWNwaTAK YWNwaV9zeXNjb250YWluZXIzOiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweGNjMC0weGNk NyBvbiBhY3BpMAp1YXJ0MDogPDE2NTUwIG9yIGNvbXBhdGlibGU+IHBvcnQgMHgzZjgtMHgz ZmYgaXJxIDQgZmxhZ3MgMHgxMCBvbiBhY3BpMAphdGtiZGMwOiA8S2V5Ym9hcmQgY29udHJv bGxlciAoaTgwNDIpPiBwb3J0IDB4NjAsMHg2NCBpcnEgMSBvbiBhY3BpMAphdGtiZDA6IDxB VCBLZXlib2FyZD4gaXJxIDEgb24gYXRrYmRjMAprYmQwIGF0IGF0a2JkMAphdGtiZDA6IFtH SUFOVC1MT0NLRURdCnBzbTA6IDxQUy8yIE1vdXNlPiBpcnEgMTIgb24gYXRrYmRjMApwc20w OiBbR0lBTlQtTE9DS0VEXQpXQVJOSU5HOiBEZXZpY2UgInBzbSIgaXMgR2lhbnQgbG9ja2Vk IGFuZCBtYXkgYmUgZGVsZXRlZCBiZWZvcmUgRnJlZUJTRCAxNS4wLgpwc20wOiBtb2RlbCBJ bnRlbGxpTW91c2UgRXhwbG9yZXIsIGRldmljZSBJRCA0Cm9ybTA6IDxJU0EgT3B0aW9uIFJP TT4gYXQgaW9tZW0gMHhlOTAwMC0weGVmZmZmIHBucGlkIE9STTAwMDAgb24gaXNhMAp2Z2Ew OiA8R2VuZXJpYyBJU0EgVkdBPiBhdCBwb3J0IDB4M2MwLTB4M2RmIGlvbWVtIDB4YTAwMDAt MHhiZmZmZiBwbnBpZCBQTlAwOTAwIG9uIGlzYTAKYXR0aW1lcjA6IDxBVCB0aW1lcj4gYXQg cG9ydCAweDQwIG9uIGlzYTAKVGltZWNvdW50ZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4 MiBIeiBxdWFsaXR5IDAKRXZlbnQgdGltZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBI eiBxdWFsaXR5IDEwMApUaW1lY291bnRlcnMgdGljayBldmVyeSAxMC4wMDAgbXNlYwpaRlMg ZmlsZXN5c3RlbSB2ZXJzaW9uOiA1ClpGUyBzdG9yYWdlIHBvb2wgdmVyc2lvbjogZmVhdHVy ZXMgc3VwcG9ydCAoNTAwMCkKVHJ5aW5nIHRvIG1vdW50IHJvb3QgZnJvbSB6ZnM6enJvb3Qv Uk9PVC8yMDI0LTEyLTI2LTE4LTEzIFtdLi4uClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZp bmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKTW91bnRpbmcgZnJvbSB6ZnM6enJvb3Qv Uk9PVC8yMDI0LTEyLTI2LTE4LTEzIGZhaWxlZCB3aXRoIGVycm9yIDU7IHJldHJ5aW5nIGZv ciAzIG1vcmUgc2Vjb25kcwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29s IGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBv b2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUg cG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRo ZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQg dGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmlu ZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBm aW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90 IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5u b3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENh bm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTog Q2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNF OiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJ Q0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5P VElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczog Tk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlz OiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFy aXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29s YXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpT b2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3Qn ClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9v dCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3py b290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAn enJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9y ICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBm b3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVs IGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFi ZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBs YWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29s IGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBv b2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUg cG9vbCBsYWJlbCBmb3IgJ3pyb290JwpNb3VudGluZyBmcm9tIHpmczp6cm9vdC9ST09ULzIw MjQtMTItMjYtMTgtMTMgZmFpbGVkIHdpdGggZXJyb3IgNS4KCkxvYWRlciB2YXJpYWJsZXM6 CiAgdmZzLnJvb3QubW91bnRmcm9tPXpmczp6cm9vdC9ST09ULzIwMjQtMTItMjYtMTgtMTMK Ck1hbnVhbCByb290IGZpbGVzeXN0ZW0gc3BlY2lmaWNhdGlvbjoKICA8ZnN0eXBlPjo8ZGV2 aWNlPiBbb3B0aW9uc10KICAgICAgTW91bnQgPGRldmljZT4gdXNpbmcgZmlsZXN5c3RlbSA8 ZnN0eXBlPgogICAgICBhbmQgd2l0aCB0aGUgc3BlY2lmaWVkIChvcHRpb25hbCkgb3B0aW9u IGxpc3QuCgogICAgZWcuIHVmczovZGV2L2RhMHMxYQogICAgICAgIHpmczp6cm9vdC9ST09U L2RlZmF1bHQKICAgICAgICBjZDk2NjA6L2Rldi9jZDAgcm8KICAgICAgICAgICh3aGljaCBp cyBlcXVpdmFsZW50IHRvOiBtb3VudCAtdCBjZDk2NjAgLW8gcm8gL2Rldi9jZDAgLykKCiAg PyAgICAgICAgICAgICAgIExpc3QgdmFsaWQgZGlzayBib290IGRldmljZXMKICAuICAgICAg ICAgICAgICAgWWllbGQgMSBzZWNvbmQgKGZvciBiYWNrZ3JvdW5kIHRhc2tzKQogIDxlbXB0 eSBsaW5lPiAgICBBYm9ydCBtYW51YWwgaW5wdXQKCm1vdW50cm9vdD4gcGFuaWM6IG1vdW50 cm9vdDogdW5hYmxlIHRvIChyZS0pbW91bnQgcm9vdC4KY3B1aWQgPSA2CnRpbWUgPSA3CktE Qjogc3RhY2sgYmFja3RyYWNlOgpkYl90cmFjZV9zZWxmX3dyYXBwZXIoKSBhdCBkYl90cmFj ZV9zZWxmX3dyYXBwZXIrMHgyYi9mcmFtZSAweGZmZmZmZTAxMmY2MDViNjAKdnBhbmljKCkg YXQgdnBhbmljKzB4MTM2L2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWM5MApwYW5pYygpIGF0IHBh bmljKzB4NDMvZnJhbWUgMHhmZmZmZmUwMTJmNjA1Y2YwCnZmc19tb3VudHJvb3QoKSBhdCB2 ZnNfbW91bnRyb290KzB4MWNiYy9mcmFtZSAweGZmZmZmZTAxMmY2MDVlNjAKc3RhcnRfaW5p dCgpIGF0IHN0YXJ0X2luaXQrMHgyMy9mcmFtZSAweGZmZmZmZTAxMmY2MDVlZjAKZm9ya19l eGl0KCkgYXQgZm9ya19leGl0KzB4N2IvZnJhbWUgMHhmZmZmZmUwMTJmNjA1ZjMwCmZvcmtf dHJhbXBvbGluZSgpIGF0IGZvcmtfdHJhbXBvbGluZSsweGUvZnJhbWUgMHhmZmZmZmUwMTJm NjA1ZjMwCi0tLSB0cmFwIDB4Mzk4MjgzOCwgcmlwID0gMHhmZmZmZmZmZjgwMzhhNmQ4LCBy c3AgPSAweGZmZmZmODAxMDI5MDIwMDAsIHJicCA9IDB4ZmZmZmZmZmY4MDk3ODEyMCAtLS0K eHB0X2FjdGlvbl9kZWZhdWx0KCkgYXQgeHB0X2FjdGlvbl9kZWZhdWx0KzB4M2Q4L2ZyYW1l IDB4ZmZmZmZmZmY4MDk3ODEyMApLREI6IGVudGVyOiBwYW5pYwotLS08PEJPT1Q+Pi0tLQpD b3B5cmlnaHQgKGMpIDE5OTItMjAyNCBUaGUgRnJlZUJTRCBQcm9qZWN0LgpDb3B5cmlnaHQg KGMpIDE5NzksIDE5ODAsIDE5ODMsIDE5ODYsIDE5ODgsIDE5ODksIDE5OTEsIDE5OTIsIDE5 OTMsIDE5OTQKCVRoZSBSZWdlbnRzIG9mIHRoZSBVbml2ZXJzaXR5IG9mIENhbGlmb3JuaWEu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCkZyZWVCU0QgaXMgYSByZWdpc3RlcmVkIHRyYWRlbWFy ayBvZiBUaGUgRnJlZUJTRCBGb3VuZGF0aW9uLgpGcmVlQlNEIDE1LjAtQ1VSUkVOVCAjMjIg bjI3NDE4Mi05MzhlNGIxMzFjNDogVGh1IERlYyAyNiAxODoxMDoxMiAtMDMgMjAyNAogICAg cm9vdEBpZGFoby5hcnJha2lzLmNvbS5icjovdXNyL29iai91c3Ivc3JjL2FtZDY0LmFtZDY0 L3N5cy9HRU5FUklDLU5PREVCVUcgYW1kNjQKRnJlZUJTRCBjbGFuZyB2ZXJzaW9uIDE5LjEu NSAoaHR0cHM6Ly9naXRodWIuY29tL2xsdm0vbGx2bS1wcm9qZWN0LmdpdCBsbHZtb3JnLTE5 LjEuNS0wLWdhYjRiNWEyZGI1ODIpClZUKHZnYSk6IHRleHQgODB4MjUKQ1BVOiBJbnRlbChS KSBYZW9uKFIpIENQVSBFNS0yNjk3IHYzIEAgMi42MEdIeiAoMjYwMC4xOC1NSHogSzgtY2xh c3MgQ1BVKQogIE9yaWdpbj0iR2VudWluZUludGVsIiAgSWQ9MHgzMDZmMiAgRmFtaWx5PTB4 NiAgTW9kZWw9MHgzZiAgU3RlcHBpbmc9MgogIEZlYXR1cmVzPTB4ZjgzZmJmZjxGUFUsVk1F LERFLFBTRSxUU0MsTVNSLFBBRSxNQ0UsQ1g4LEFQSUMsU0VQLE1UUlIsUEdFLE1DQSxDTU9W LFBBVCxQU0UzNixNTVgsRlhTUixTU0UsU1NFMixTUz4KICBGZWF0dXJlczI9MHhmZmZhMzIw MzxTU0UzLFBDTE1VTFFEUSxTU1NFMyxGTUEsQ1gxNixQQ0lELFNTRTQuMSxTU0U0LjIseDJB UElDLE1PVkJFLFBPUENOVCxUU0NETFQsQUVTTkksWFNBVkUsT1NYU0FWRSxBVlgsRjE2QyxS RFJBTkQsSFY+CiAgQU1EIEZlYXR1cmVzPTB4MmMxMDA4MDA8U1lTQ0FMTCxOWCxQYWdlMUdC LFJEVFNDUCxMTT4KICBBTUQgRmVhdHVyZXMyPTB4MjE8TEFIRixBQk0+CiAgU3RydWN0dXJl ZCBFeHRlbmRlZCBGZWF0dXJlcz0weDdhYjxGU0dTQkFTRSxUU0NBREosQk1JMSxBVlgyLFNN RVAsQk1JMixFUk1TLElOVlBDSUQ+CiAgU3RydWN0dXJlZCBFeHRlbmRlZCBGZWF0dXJlczI9 MHg0PFVNSVA+CiAgU3RydWN0dXJlZCBFeHRlbmRlZCBGZWF0dXJlczM9MHhhYzAwMDQwMDxN RF9DTEVBUixJQlBCLFNUSUJQLEFSQ0hfQ0FQLFNTQkQ+CiAgWFNBVkUgRmVhdHVyZXM9MHgx PFhTQVZFT1BUPgogIElBMzJfQVJDSF9DQVBTPTB4NDg8U0tJUF9MMURGTF9WTUU+CiAgQU1E IEV4dGVuZGVkIEZlYXR1cmUgRXh0ZW5zaW9ucyBJRCBFQlg9MHgxMDBkMDAwPElCUEIsSUJS UyxTVElCUCxTU0JEPgpIeXBlcnZpc29yOiBPcmlnaW4gPSAiS1ZNS1ZNS1ZNIgpyZWFsIG1l bW9yeSAgPSA1MTUzOTYwNzU1MiAoNDkxNTIgTUIpCmF2YWlsIG1lbW9yeSA9IDUwMDY3ODAw MDY0ICg0Nzc0OCBNQikKRXZlbnQgdGltZXIgIkxBUElDIiBxdWFsaXR5IDYwMApBQ1BJIEFQ SUMgVGFibGU6IDxCT0NIUyAgQlhQQyAgICA+CkZyZWVCU0QvU01QOiBNdWx0aXByb2Nlc3Nv ciBTeXN0ZW0gRGV0ZWN0ZWQ6IDEyIENQVXMKRnJlZUJTRC9TTVA6IDEyIHBhY2thZ2Uocykg eCAxIGNvcmUocykKcmFuZG9tOiByZWdpc3RlcmluZyBmYXN0IHNvdXJjZSBJbnRlbCBTZWN1 cmUgS2V5IFJORwpyYW5kb206IGZhc3QgcHJvdmlkZXI6ICJJbnRlbCBTZWN1cmUgS2V5IFJO RyIKcmFuZG9tOiB1bmJsb2NraW5nIGRldmljZS4KaW9hcGljMCA8VmVyc2lvbiAxLjE+IGly cXMgMC0yMwpMYXVuY2hpbmcgQVBzOiAxMCA1IDkgNiA3IDQgOCAxMSAzIDIgMQpyYW5kb206 IGVudHJvcHkgZGV2aWNlIGV4dGVybmFsIGludGVyZmFjZQprYmQxIGF0IGtiZG11eDAKdnR2 Z2EwOiA8VlQgVkdBIGRyaXZlcj4Ka3ZtY2xvY2swOiA8S1ZNIHBhcmF2aXJ0dWFsIGNsb2Nr PgpUaW1lY291bnRlciAia3ZtY2xvY2siIGZyZXF1ZW5jeSAxMDAwMDAwMDAwIEh6IHF1YWxp dHkgOTc1Cmt2bWNsb2NrMDogcmVnaXN0ZXJlZCBhcyBhIHRpbWUtb2YtZGF5IGNsb2NrLCBy ZXNvbHV0aW9uIDAuMDAwMDAxcwpzbWJpb3MwOiA8U3lzdGVtIE1hbmFnZW1lbnQgQklPUz4g YXQgaW9tZW0gMHhmNWE1MC0weGY1YTZlCnNtYmlvczA6IFZlcnNpb246IDIuOCwgQkNEIFJl dmlzaW9uOiAyLjgKYWVzbmkwOiA8QUVTLUNCQyxBRVMtQ0NNLEFFUy1HQ00sQUVTLUlDTSxB RVMtWFRTPgphY3BpMDogPEJPQ0hTIEJYUEM+CmFjcGkwOiBQb3dlciBCdXR0b24gKGZpeGVk KQpjcHUwOiA8QUNQSSBDUFU+IG9uIGFjcGkwCmF0cnRjMDogPEFUIHJlYWx0aW1lIGNsb2Nr PiBwb3J0IDB4NzAtMHg3NyBpcnEgOCBvbiBhY3BpMAphdHJ0YzA6IHJlZ2lzdGVyZWQgYXMg YSB0aW1lLW9mLWRheSBjbG9jaywgcmVzb2x1dGlvbiAxLjAwMDAwMHMKRXZlbnQgdGltZXIg IlJUQyIgZnJlcXVlbmN5IDMyNzY4IEh6IHF1YWxpdHkgMApUaW1lY291bnRlciAiQUNQSS1m YXN0IiBmcmVxdWVuY3kgMzU3OTU0NSBIeiBxdWFsaXR5IDkwMAphY3BpX3RpbWVyMDogPDI0 LWJpdCB0aW1lciBhdCAzLjU3OTU0NU1Iej4gcG9ydCAweDYwOC0weDYwYiBvbiBhY3BpMApw Y2liMDogPEFDUEkgSG9zdC1QQ0kgYnJpZGdlPiBwb3J0IDB4Y2Y4LTB4Y2ZmIG9uIGFjcGkw CnBjaTA6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWIwCnZnYXBjaTA6IDxWR0EtY29tcGF0aWJs ZSBkaXNwbGF5PiBwb3J0IDB4ZDA0MC0weGQwNWYgbWVtIDB4ZjQwMDAwMDAtMHhmN2ZmZmZm ZiwweGY4MDAwMDAwLTB4ZmJmZmZmZmYsMHhmZDIxMDAwMC0weGZkMjExZmZmIGlycSAyMSBh dCBkZXZpY2UgMS4wIG9uIHBjaTAKdmdhcGNpMDogQm9vdCB2aWRlbyBkZXZpY2UKcGNpYjE6 IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxMjAwMC0weGZkMjEyZmZmIGlycSAy MiBhdCBkZXZpY2UgMi4wIG9uIHBjaTAKcGNpMTogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjEK cGNpYjI6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmYzIwMDAwMC0weGZjMjAwMGZm IGlycSAyMiBhdCBkZXZpY2UgMC4wIG9uIHBjaTEKcGNpMjogPEFDUEkgUENJIGJ1cz4gb24g cGNpYjIKcGNpYjM6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxMzAwMC0weGZk MjEzZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4xIG9uIHBjaTAKcGNpMzogPEFDUEkgUENJIGJ1 cz4gb24gcGNpYjMKdmlydGlvX3BjaTA6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIE5ldHdvcmsg YWRhcHRlcj4gbWVtIDB4ZmQwNDAwMDAtMHhmZDA0MGZmZiwweGZlODAwMDAwLTB4ZmU4MDNm ZmYgaXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpMwp2dG5ldDA6IDxWaXJ0SU8gTmV0d29y a2luZyBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMAp2dG5ldDA6IEV0aGVybmV0IGFkZHJlc3M6 IDUyOjU0OjU4OjkzOmM3OmVmCnZ0bmV0MDogbmV0bWFwIHF1ZXVlcy9zbG90czogVFggMS8y NTYsIFJYIDEvMTI4CjAwMC4wMDAwNzcgWyA0NTJdIHZ0bmV0X25ldG1hcF9hdHRhY2ggICAg ICAgdnRuZXQgYXR0YWNoZWQgdHhxPTEsIHR4ZD0yNTYgcnhxPTEsIHJ4ZD0xMjgKcGNpYjQ6 IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNDAwMC0weGZkMjE0ZmZmIGlycSAy MiBhdCBkZXZpY2UgMi4yIG9uIHBjaTAKcGNpNDogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjQK eGhjaTA6IDxYSENJIChnZW5lcmljKSBVU0IgMy4wIGNvbnRyb2xsZXI+IG1lbSAweGZjZTAw MDAwLTB4ZmNlMDNmZmYgaXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpNAp4aGNpMDogMzIg Ynl0ZXMgY29udGV4dCBzaXplLCA2NC1iaXQgRE1BCnVzYnVzMCBvbiB4aGNpMAp1c2J1czA6 IDUuMEdicHMgU3VwZXIgU3BlZWQgVVNCIHYzLjAKcGNpYjU6IDxBQ1BJIFBDSS1QQ0kgYnJp ZGdlPiBtZW0gMHhmZDIxNTAwMC0weGZkMjE1ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4zIG9u IHBjaTAKcGNpNTogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjUKdmlydGlvX3BjaTE6IDxWaXJ0 SU8gUENJIChtb2Rlcm4pIFNDU0kgYWRhcHRlcj4gbWVtIDB4ZmNjMDAwMDAtMHhmY2MwMGZm ZiwweGZlNDAwMDAwLTB4ZmU0MDNmZmYgaXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpNQp2 dHNjc2kwOiA8VmlydElPIFNDU0kgQWRhcHRlcj4gb24gdmlydGlvX3BjaTEKcGNpYjY6IDxB Q1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNjAwMC0weGZkMjE2ZmZmIGlycSAyMiBh dCBkZXZpY2UgMi40IG9uIHBjaTAKcGNpNjogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjYKdmly dGlvX3BjaTI6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIENvbnNvbGUgYWRhcHRlcj4gbWVtIDB4 ZmNhMDAwMDAtMHhmY2EwMGZmZiwweGZlMjAwMDAwLTB4ZmUyMDNmZmYgaXJxIDIyIGF0IGRl dmljZSAwLjAgb24gcGNpNgpwY2liNzogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZk MjE3MDAwLTB4ZmQyMTdmZmYgaXJxIDIyIGF0IGRldmljZSAyLjUgb24gcGNpMApwY2k3OiA8 QUNQSSBQQ0kgYnVzPiBvbiBwY2liNwp2aXJ0aW9fcGNpMzogPFZpcnRJTyBQQ0kgKG1vZGVy bikgQmFsbG9vbiBhZGFwdGVyPiBtZW0gMHhmZTAwMDAwMC0weGZlMDAzZmZmIGlycSAyMiBh dCBkZXZpY2UgMC4wIG9uIHBjaTcKdnRiYWxsb29uMDogPFZpcnRJTyBCYWxsb29uIEFkYXB0 ZXI+IG9uIHZpcnRpb19wY2kzCnBjaWI4OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4 ZmQyMTgwMDAtMHhmZDIxOGZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNiBvbiBwY2kwCnBjaTg6 IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWI4CnZpcnRpb19wY2k0OiA8VmlydElPIFBDSSAobW9k ZXJuKSBFbnRyb3B5IGFkYXB0ZXI+IG1lbSAweGZkZTAwMDAwLTB4ZmRlMDNmZmYgaXJxIDIy IGF0IGRldmljZSAwLjAgb24gcGNpOApwY2liOTogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1l bSAweGZkMjE5MDAwLTB4ZmQyMTlmZmYgaXJxIDIyIGF0IGRldmljZSAyLjcgb24gcGNpMApw Y2k5OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liOQppc2FiMDogPFBDSS1JU0EgYnJpZGdlPiBh dCBkZXZpY2UgMzEuMCBvbiBwY2kwCmlzYTA6IDxJU0EgYnVzPiBvbiBpc2FiMAphaGNpMDog PEludGVsIElDSDkgQUhDSSBTQVRBIGNvbnRyb2xsZXI+IHBvcnQgMHhkMDYwLTB4ZDA3ZiBt ZW0gMHhmZDIxYTAwMC0weGZkMjFhZmZmIGlycSAxNiBhdCBkZXZpY2UgMzEuMiBvbiBwY2kw CmFoY2kwOiBBSENJIHYxLjAwIHdpdGggNiAxLjVHYnBzIHBvcnRzLCBQb3J0IE11bHRpcGxp ZXIgbm90IHN1cHBvcnRlZAphaGNpY2gwOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDAg b24gYWhjaTAKYWhjaWNoMTogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAxIG9uIGFoY2kw CmFoY2ljaDI6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMiBvbiBhaGNpMAphaGNpY2gz OiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDMgb24gYWhjaTAKYWhjaWNoNDogPEFIQ0kg Y2hhbm5lbD4gYXQgY2hhbm5lbCA0IG9uIGFoY2kwCmFoY2ljaDU6IDxBSENJIGNoYW5uZWw+ IGF0IGNoYW5uZWwgNSBvbiBhaGNpMAphY3BpX3N5c2NvbnRhaW5lcjA6IDxTeXN0ZW0gQ29u dGFpbmVyPiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjE6IDxTeXN0ZW0gQ29udGFpbmVy PiBwb3J0IDB4Y2Q4LTB4Y2UzIG9uIGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMjogPFN5c3Rl bSBDb250YWluZXI+IHBvcnQgMHg2MjAtMHg2MmYgb24gYWNwaTAKYWNwaV9zeXNjb250YWlu ZXIzOiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweGNjMC0weGNkNyBvbiBhY3BpMAp1YXJ0 MDogPDE2NTUwIG9yIGNvbXBhdGlibGU+IHBvcnQgMHgzZjgtMHgzZmYgaXJxIDQgZmxhZ3Mg MHgxMCBvbiBhY3BpMAphdGtiZGMwOiA8S2V5Ym9hcmQgY29udHJvbGxlciAoaTgwNDIpPiBw b3J0IDB4NjAsMHg2NCBpcnEgMSBvbiBhY3BpMAphdGtiZDA6IDxBVCBLZXlib2FyZD4gaXJx IDEgb24gYXRrYmRjMAprYmQwIGF0IGF0a2JkMAphdGtiZDA6IFtHSUFOVC1MT0NLRURdCnBz bTA6IDxQUy8yIE1vdXNlPiBpcnEgMTIgb24gYXRrYmRjMApwc20wOiBbR0lBTlQtTE9DS0VE XQpXQVJOSU5HOiBEZXZpY2UgInBzbSIgaXMgR2lhbnQgbG9ja2VkIGFuZCBtYXkgYmUgZGVs ZXRlZCBiZWZvcmUgRnJlZUJTRCAxNS4wLgpwc20wOiBtb2RlbCBJbnRlbGxpTW91c2UgRXhw bG9yZXIsIGRldmljZSBJRCA0Cm9ybTA6IDxJU0EgT3B0aW9uIFJPTT4gYXQgaW9tZW0gMHhl OTAwMC0weGVmZmZmIHBucGlkIE9STTAwMDAgb24gaXNhMAp2Z2EwOiA8R2VuZXJpYyBJU0Eg VkdBPiBhdCBwb3J0IDB4M2MwLTB4M2RmIGlvbWVtIDB4YTAwMDAtMHhiZmZmZiBwbnBpZCBQ TlAwOTAwIG9uIGlzYTAKYXR0aW1lcjA6IDxBVCB0aW1lcj4gYXQgcG9ydCAweDQwIG9uIGlz YTAKVGltZWNvdW50ZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBIeiBxdWFsaXR5IDAK RXZlbnQgdGltZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBIeiBxdWFsaXR5IDEwMApU aW1lY291bnRlcnMgdGljayBldmVyeSAxMC4wMDAgbXNlYwp1Z2VuMC4xOiA8KDB4MWIzNikg WEhDSSByb290IEhVQj4gYXQgdXNidXMwCnVodWIwIG9uIHVzYnVzMAp1aHViMDogPCgweDFi MzYpIFhIQ0kgcm9vdCBIVUIsIGNsYXNzIDkvMCwgcmV2IDMuMDAvMS4wMCwgYWRkciAxPiBv biB1c2J1czAKWkZTIGZpbGVzeXN0ZW0gdmVyc2lvbjogNQpaRlMgc3RvcmFnZSBwb29sIHZl cnNpb246IGZlYXR1cmVzIHN1cHBvcnQgKDUwMDApClRyeWluZyB0byBtb3VudCByb290IGZy b20gemZzOnpyb290L1JPT1QvMjAyNC0xMi0yNi0xOC0wOSBbXS4uLgpkYTAgYXQgdnRzY3Np MCBidXMgMCBzY2J1czAgdGFyZ2V0IDAgbHVuIDAKZGEwOiA8UUVNVSBRRU1VIEhBUkRESVNL IDIuNSs+IEZpeGVkIERpcmVjdCBBY2Nlc3MgU1BDLTMgU0NTSSBkZXZpY2UKZGEwOiAzMDAu MDAwTUIvcyB0cmFuc2ZlcnMKZGEwOiBDb21tYW5kIFF1ZXVlaW5nIGVuYWJsZWQKZGEwOiA3 MzcyODBNQiAoMTUwOTk0OTQ0MCA1MTIgYnl0ZSBzZWN0b3JzKQpSb290IG1vdW50IHdhaXRp bmcgZm9yOiB1c2J1czAKdWh1YjA6IDMwIHBvcnRzIHdpdGggMzAgcmVtb3ZhYmxlLCBzZWxm IHBvd2VyZWQKR0VPTV9FTEk6IERldmljZSBkYTBwMi5lbGkgY3JlYXRlZC4KR0VPTV9FTEk6 IEVuY3J5cHRpb246IEFFUy1YVFMgMTI4CkdFT01fRUxJOiAgICAgQ3J5cHRvOiBhY2NlbGVy YXRlZCBzb2Z0d2FyZQppY2hzbWIwOiA8SW50ZWwgODI4MDFJIChJQ0g5KSBTTUJ1cyBjb250 cm9sbGVyPiBwb3J0IDB4NzAwLTB4NzNmIGlycSAxNiBhdCBkZXZpY2UgMzEuMyBvbiBwY2kw CnNtYnVzMDogPFN5c3RlbSBNYW5hZ2VtZW50IEJ1cz4gb24gaWNoc21iMAp2dGNvbjA6IDxW aXJ0SU8gQ29uc29sZSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMgp2dHJuZDA6IDxWaXJ0SU8g RW50cm9weSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpNApyYW5kb206IHJlZ2lzdGVyaW5nIGZh c3Qgc291cmNlIFZpcnRJTyBFbnRyb3B5IEFkYXB0ZXIKbG8wOiBsaW5rIHN0YXRlIGNoYW5n ZWQgdG8gVVAKdnRuZXQwOiBsaW5rIHN0YXRlIGNoYW5nZWQgdG8gVVAKU2VjdXJpdHkgcG9s aWN5IGxvYWRlZDogTUFDL250cGQgKG1hY19udHBkKQpXYWl0aW5nIChtYXggNjAgc2Vjb25k cykgZm9yIHN5c3RlbSBwcm9jZXNzIGB2bmxydScgdG8gc3RvcC4uLiBkb25lCldhaXRpbmcg KG1heCA2MCBzZWNvbmRzKSBmb3Igc3lzdGVtIHByb2Nlc3MgYHN5bmNlcicgdG8gc3RvcC4u LiAKU3luY2luZyBkaXNrcywgdm5vZGVzIHJlbWFpbmluZy4uLiAwIDAgZG9uZQpBbGwgYnVm ZmVycyBzeW5jZWQuCkdFT01fRUxJOiBEZXZpY2UgZGEwcDIuZWxpIGRlc3Ryb3llZC4KR0VP TV9FTEk6IERldGFjaGVkIGRhMHAyLmVsaSBvbiBsYXN0IGNsb3NlLgpVcHRpbWU6IDVtMzhz CnVodWIwOiBkZXRhY2hlZAotLS08PEJPT1Q+Pi0tLQpDb3B5cmlnaHQgKGMpIDE5OTItMjAy NCBUaGUgRnJlZUJTRCBQcm9qZWN0LgpDb3B5cmlnaHQgKGMpIDE5NzksIDE5ODAsIDE5ODMs IDE5ODYsIDE5ODgsIDE5ODksIDE5OTEsIDE5OTIsIDE5OTMsIDE5OTQKCVRoZSBSZWdlbnRz IG9mIHRoZSBVbml2ZXJzaXR5IG9mIENhbGlmb3JuaWEuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CkZyZWVCU0QgaXMgYSByZWdpc3RlcmVkIHRyYWRlbWFyayBvZiBUaGUgRnJlZUJTRCBGb3Vu ZGF0aW9uLgpGcmVlQlNEIDE1LjAtQ1VSUkVOVCAjMjMgbjI3NDE4My1iYTE5MDQ5MzdkOTog VGh1IERlYyAyNiAxODoxODoyMiAtMDMgMjAyNAogICAgcm9vdEBpZGFoby5hcnJha2lzLmNv bS5icjovdXNyL29iai91c3Ivc3JjL2FtZDY0LmFtZDY0L3N5cy9HRU5FUklDLU5PREVCVUcg YW1kNjQKRnJlZUJTRCBjbGFuZyB2ZXJzaW9uIDE5LjEuNSAoaHR0cHM6Ly9naXRodWIuY29t L2xsdm0vbGx2bS1wcm9qZWN0LmdpdCBsbHZtb3JnLTE5LjEuNS0wLWdhYjRiNWEyZGI1ODIp ClZUKHZnYSk6IHRleHQgODB4MjUKQ1BVOiBJbnRlbChSKSBYZW9uKFIpIENQVSBFNS0yNjk3 IHYzIEAgMi42MEdIeiAoMjYwMC4xMi1NSHogSzgtY2xhc3MgQ1BVKQogIE9yaWdpbj0iR2Vu dWluZUludGVsIiAgSWQ9MHgzMDZmMiAgRmFtaWx5PTB4NiAgTW9kZWw9MHgzZiAgU3RlcHBp bmc9MgogIEZlYXR1cmVzPTB4ZjgzZmJmZjxGUFUsVk1FLERFLFBTRSxUU0MsTVNSLFBBRSxN Q0UsQ1g4LEFQSUMsU0VQLE1UUlIsUEdFLE1DQSxDTU9WLFBBVCxQU0UzNixNTVgsRlhTUixT U0UsU1NFMixTUz4KICBGZWF0dXJlczI9MHhmZmZhMzIwMzxTU0UzLFBDTE1VTFFEUSxTU1NF MyxGTUEsQ1gxNixQQ0lELFNTRTQuMSxTU0U0LjIseDJBUElDLE1PVkJFLFBPUENOVCxUU0NE TFQsQUVTTkksWFNBVkUsT1NYU0FWRSxBVlgsRjE2QyxSRFJBTkQsSFY+CiAgQU1EIEZlYXR1 cmVzPTB4MmMxMDA4MDA8U1lTQ0FMTCxOWCxQYWdlMUdCLFJEVFNDUCxMTT4KICBBTUQgRmVh dHVyZXMyPTB4MjE8TEFIRixBQk0+CiAgU3RydWN0dXJlZCBFeHRlbmRlZCBGZWF0dXJlcz0w eDdhYjxGU0dTQkFTRSxUU0NBREosQk1JMSxBVlgyLFNNRVAsQk1JMixFUk1TLElOVlBDSUQ+ CiAgU3RydWN0dXJlZCBFeHRlbmRlZCBGZWF0dXJlczI9MHg0PFVNSVA+CiAgU3RydWN0dXJl ZCBFeHRlbmRlZCBGZWF0dXJlczM9MHhhYzAwMDQwMDxNRF9DTEVBUixJQlBCLFNUSUJQLEFS Q0hfQ0FQLFNTQkQ+CiAgWFNBVkUgRmVhdHVyZXM9MHgxPFhTQVZFT1BUPgogIElBMzJfQVJD SF9DQVBTPTB4NDg8U0tJUF9MMURGTF9WTUU+CiAgQU1EIEV4dGVuZGVkIEZlYXR1cmUgRXh0 ZW5zaW9ucyBJRCBFQlg9MHgxMDBkMDAwPElCUEIsSUJSUyxTVElCUCxTU0JEPgpIeXBlcnZp c29yOiBPcmlnaW4gPSAiS1ZNS1ZNS1ZNIgpyZWFsIG1lbW9yeSAgPSA1MTUzOTYwNzU1MiAo NDkxNTIgTUIpCmF2YWlsIG1lbW9yeSA9IDUwMDY3ODAwMDY0ICg0Nzc0OCBNQikKRXZlbnQg dGltZXIgIkxBUElDIiBxdWFsaXR5IDYwMApBQ1BJIEFQSUMgVGFibGU6IDxCT0NIUyAgQlhQ QyAgICA+CkZyZWVCU0QvU01QOiBNdWx0aXByb2Nlc3NvciBTeXN0ZW0gRGV0ZWN0ZWQ6IDEy IENQVXMKRnJlZUJTRC9TTVA6IDEyIHBhY2thZ2UocykgeCAxIGNvcmUocykKcmFuZG9tOiBy ZWdpc3RlcmluZyBmYXN0IHNvdXJjZSBJbnRlbCBTZWN1cmUgS2V5IFJORwpyYW5kb206IGZh c3QgcHJvdmlkZXI6ICJJbnRlbCBTZWN1cmUgS2V5IFJORyIKcmFuZG9tOiB1bmJsb2NraW5n IGRldmljZS4KaW9hcGljMCA8VmVyc2lvbiAxLjE+IGlycXMgMC0yMwpMYXVuY2hpbmcgQVBz OiAzIDggMSAxMCA1IDIgOSA0IDYgMTEgNwpyYW5kb206IGVudHJvcHkgZGV2aWNlIGV4dGVy bmFsIGludGVyZmFjZQprYmQxIGF0IGtiZG11eDAKdnR2Z2EwOiA8VlQgVkdBIGRyaXZlcj4K a3ZtY2xvY2swOiA8S1ZNIHBhcmF2aXJ0dWFsIGNsb2NrPgpUaW1lY291bnRlciAia3ZtY2xv Y2siIGZyZXF1ZW5jeSAxMDAwMDAwMDAwIEh6IHF1YWxpdHkgOTc1Cmt2bWNsb2NrMDogcmVn aXN0ZXJlZCBhcyBhIHRpbWUtb2YtZGF5IGNsb2NrLCByZXNvbHV0aW9uIDAuMDAwMDAxcwpz bWJpb3MwOiA8U3lzdGVtIE1hbmFnZW1lbnQgQklPUz4gYXQgaW9tZW0gMHhmNWE1MC0weGY1 YTZlCnNtYmlvczA6IFZlcnNpb246IDIuOCwgQkNEIFJldmlzaW9uOiAyLjgKYWVzbmkwOiA8 QUVTLUNCQyxBRVMtQ0NNLEFFUy1HQ00sQUVTLUlDTSxBRVMtWFRTPgphY3BpMDogPEJPQ0hT IEJYUEM+CmFjcGkwOiBQb3dlciBCdXR0b24gKGZpeGVkKQpjcHUwOiA8QUNQSSBDUFU+IG9u IGFjcGkwCmF0cnRjMDogPEFUIHJlYWx0aW1lIGNsb2NrPiBwb3J0IDB4NzAtMHg3NyBpcnEg OCBvbiBhY3BpMAphdHJ0YzA6IHJlZ2lzdGVyZWQgYXMgYSB0aW1lLW9mLWRheSBjbG9jaywg cmVzb2x1dGlvbiAxLjAwMDAwMHMKRXZlbnQgdGltZXIgIlJUQyIgZnJlcXVlbmN5IDMyNzY4 IEh6IHF1YWxpdHkgMApUaW1lY291bnRlciAiQUNQSS1mYXN0IiBmcmVxdWVuY3kgMzU3OTU0 NSBIeiBxdWFsaXR5IDkwMAphY3BpX3RpbWVyMDogPDI0LWJpdCB0aW1lciBhdCAzLjU3OTU0 NU1Iej4gcG9ydCAweDYwOC0weDYwYiBvbiBhY3BpMApwY2liMDogPEFDUEkgSG9zdC1QQ0kg YnJpZGdlPiBwb3J0IDB4Y2Y4LTB4Y2ZmIG9uIGFjcGkwCnBjaTA6IDxBQ1BJIFBDSSBidXM+ IG9uIHBjaWIwCnZnYXBjaTA6IDxWR0EtY29tcGF0aWJsZSBkaXNwbGF5PiBwb3J0IDB4ZDA0 MC0weGQwNWYgbWVtIDB4ZjQwMDAwMDAtMHhmN2ZmZmZmZiwweGY4MDAwMDAwLTB4ZmJmZmZm ZmYsMHhmZDIxMDAwMC0weGZkMjExZmZmIGlycSAyMSBhdCBkZXZpY2UgMS4wIG9uIHBjaTAK dmdhcGNpMDogQm9vdCB2aWRlbyBkZXZpY2UKcGNpYjE6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdl PiBtZW0gMHhmZDIxMjAwMC0weGZkMjEyZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4wIG9uIHBj aTAKcGNpYjI6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxMzAwMC0weGZkMjEz ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4xIG9uIHBjaTAKcGNpYjM6IDxBQ1BJIFBDSS1QQ0kg YnJpZGdlPiBtZW0gMHhmZDIxNDAwMC0weGZkMjE0ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4y IG9uIHBjaTAKcGNpYjQ6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNTAwMC0w eGZkMjE1ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4zIG9uIHBjaTAKcGNpYjU6IDxBQ1BJIFBD SS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNjAwMC0weGZkMjE2ZmZmIGlycSAyMiBhdCBkZXZp Y2UgMi40IG9uIHBjaTAKcGNpYjY6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIx NzAwMC0weGZkMjE3ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi41IG9uIHBjaTAKcGNpYjc6IDxB Q1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxODAwMC0weGZkMjE4ZmZmIGlycSAyMiBh dCBkZXZpY2UgMi42IG9uIHBjaTAKcGNpYjg6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0g MHhmZDIxOTAwMC0weGZkMjE5ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi43IG9uIHBjaTAKaXNh YjA6IDxQQ0ktSVNBIGJyaWRnZT4gYXQgZGV2aWNlIDMxLjAgb24gcGNpMAppc2EwOiA8SVNB IGJ1cz4gb24gaXNhYjAKYWhjaTA6IDxJbnRlbCBJQ0g5IEFIQ0kgU0FUQSBjb250cm9sbGVy PiBwb3J0IDB4ZDA2MC0weGQwN2YgbWVtIDB4ZmQyMWEwMDAtMHhmZDIxYWZmZiBpcnEgMTYg YXQgZGV2aWNlIDMxLjIgb24gcGNpMAphaGNpMDogQUhDSSB2MS4wMCB3aXRoIDYgMS41R2Jw cyBwb3J0cywgUG9ydCBNdWx0aXBsaWVyIG5vdCBzdXBwb3J0ZWQKYWhjaWNoMDogPEFIQ0kg Y2hhbm5lbD4gYXQgY2hhbm5lbCAwIG9uIGFoY2kwCmFoY2ljaDE6IDxBSENJIGNoYW5uZWw+ IGF0IGNoYW5uZWwgMSBvbiBhaGNpMAphaGNpY2gyOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFu bmVsIDIgb24gYWhjaTAKYWhjaWNoMzogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAzIG9u IGFoY2kwCmFoY2ljaDQ6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgNCBvbiBhaGNpMAph aGNpY2g1OiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDUgb24gYWhjaTAKYWNwaV9zeXNj b250YWluZXIwOiA8U3lzdGVtIENvbnRhaW5lcj4gb24gYWNwaTAKYWNwaV9zeXNjb250YWlu ZXIxOiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweGNkOC0weGNlMyBvbiBhY3BpMAphY3Bp X3N5c2NvbnRhaW5lcjI6IDxTeXN0ZW0gQ29udGFpbmVyPiBwb3J0IDB4NjIwLTB4NjJmIG9u IGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMzogPFN5c3RlbSBDb250YWluZXI+IHBvcnQgMHhj YzAtMHhjZDcgb24gYWNwaTAKdWFydDA6IDwxNjU1MCBvciBjb21wYXRpYmxlPiBwb3J0IDB4 M2Y4LTB4M2ZmIGlycSA0IGZsYWdzIDB4MTAgb24gYWNwaTAKYXRrYmRjMDogPEtleWJvYXJk IGNvbnRyb2xsZXIgKGk4MDQyKT4gcG9ydCAweDYwLDB4NjQgaXJxIDEgb24gYWNwaTAKYXRr YmQwOiA8QVQgS2V5Ym9hcmQ+IGlycSAxIG9uIGF0a2JkYzAKa2JkMCBhdCBhdGtiZDAKYXRr YmQwOiBbR0lBTlQtTE9DS0VEXQpwc20wOiA8UFMvMiBNb3VzZT4gaXJxIDEyIG9uIGF0a2Jk YzAKcHNtMDogW0dJQU5ULUxPQ0tFRF0KV0FSTklORzogRGV2aWNlICJwc20iIGlzIEdpYW50 IGxvY2tlZCBhbmQgbWF5IGJlIGRlbGV0ZWQgYmVmb3JlIEZyZWVCU0QgMTUuMC4KcHNtMDog bW9kZWwgSW50ZWxsaU1vdXNlIEV4cGxvcmVyLCBkZXZpY2UgSUQgNApvcm0wOiA8SVNBIE9w dGlvbiBST00+IGF0IGlvbWVtIDB4ZTkwMDAtMHhlZmZmZiBwbnBpZCBPUk0wMDAwIG9uIGlz YTAKdmdhMDogPEdlbmVyaWMgSVNBIFZHQT4gYXQgcG9ydCAweDNjMC0weDNkZiBpb21lbSAw eGEwMDAwLTB4YmZmZmYgcG5waWQgUE5QMDkwMCBvbiBpc2EwCmF0dGltZXIwOiA8QVQgdGlt ZXI+IGF0IHBvcnQgMHg0MCBvbiBpc2EwClRpbWVjb3VudGVyICJpODI1NCIgZnJlcXVlbmN5 IDExOTMxODIgSHogcXVhbGl0eSAwCkV2ZW50IHRpbWVyICJpODI1NCIgZnJlcXVlbmN5IDEx OTMxODIgSHogcXVhbGl0eSAxMDAKVGltZWNvdW50ZXJzIHRpY2sgZXZlcnkgMTAuMDAwIG1z ZWMKWkZTIGZpbGVzeXN0ZW0gdmVyc2lvbjogNQpaRlMgc3RvcmFnZSBwb29sIHZlcnNpb246 IGZlYXR1cmVzIHN1cHBvcnQgKDUwMDApClRyeWluZyB0byBtb3VudCByb290IGZyb20gemZz Onpyb290L1JPT1QvMjAyNC0xMi0yNi0xOC0xOCBbXS4uLgpTb2xhcmlzOiBOT1RJQ0U6IENh bm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnCk1vdW50aW5nIGZyb20gemZz Onpyb290L1JPT1QvMjAyNC0xMi0yNi0xOC0xOCBmYWlsZWQgd2l0aCBlcnJvciA1OyByZXRy eWluZyBmb3IgMyBtb3JlIHNlY29uZHMKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0 aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5k IHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZp bmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3Qg ZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5v dCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fu bm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBD YW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6 IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElD RTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9U SUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBO T1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6 IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJp czogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xh cmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNv bGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcK U29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290 JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJv b3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6 cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3Ig J3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZv ciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwg Zm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJl bCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxh YmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wg bGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9v bCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBw b29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhl IHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0 aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5k IHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZp bmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKTW91bnRpbmcgZnJvbSB6ZnM6enJvb3Qv Uk9PVC8yMDI0LTEyLTI2LTE4LTE4IGZhaWxlZCB3aXRoIGVycm9yIDUuCgpMb2FkZXIgdmFy aWFibGVzOgogIHZmcy5yb290Lm1vdW50ZnJvbT16ZnM6enJvb3QvUk9PVC8yMDI0LTEyLTI2 LTE4LTE4CgpNYW51YWwgcm9vdCBmaWxlc3lzdGVtIHNwZWNpZmljYXRpb246CiAgPGZzdHlw ZT46PGRldmljZT4gW29wdGlvbnNdCiAgICAgIE1vdW50IDxkZXZpY2U+IHVzaW5nIGZpbGVz eXN0ZW0gPGZzdHlwZT4KICAgICAgYW5kIHdpdGggdGhlIHNwZWNpZmllZCAob3B0aW9uYWwp IG9wdGlvbiBsaXN0LgoKICAgIGVnLiB1ZnM6L2Rldi9kYTBzMWEKICAgICAgICB6ZnM6enJv b3QvUk9PVC9kZWZhdWx0CiAgICAgICAgY2Q5NjYwOi9kZXYvY2QwIHJvCiAgICAgICAgICAo d2hpY2ggaXMgZXF1aXZhbGVudCB0bzogbW91bnQgLXQgY2Q5NjYwIC1vIHJvIC9kZXYvY2Qw IC8pCgogID8gICAgICAgICAgICAgICBMaXN0IHZhbGlkIGRpc2sgYm9vdCBkZXZpY2VzCiAg LiAgICAgICAgICAgICAgIFlpZWxkIDEgc2Vjb25kIChmb3IgYmFja2dyb3VuZCB0YXNrcykK ICA8ZW1wdHkgbGluZT4gICAgQWJvcnQgbWFudWFsIGlucHV0Cgptb3VudHJvb3Q+IHBhbmlj OiBtb3VudHJvb3Q6IHVuYWJsZSB0byAocmUtKW1vdW50IHJvb3QuCmNwdWlkID0gMTEKdGlt ZSA9IDgKS0RCOiBzdGFjayBiYWNrdHJhY2U6CmRiX3RyYWNlX3NlbGZfd3JhcHBlcigpIGF0 IGRiX3RyYWNlX3NlbGZfd3JhcHBlcisweDJiL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWI2MAp2 cGFuaWMoKSBhdCB2cGFuaWMrMHgxMzYvZnJhbWUgMHhmZmZmZmUwMTJmNjA1YzkwCnBhbmlj KCkgYXQgcGFuaWMrMHg0My9mcmFtZSAweGZmZmZmZTAxMmY2MDVjZjAKdmZzX21vdW50cm9v dCgpIGF0IHZmc19tb3VudHJvb3QrMHgxY2JjL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWU2MApz dGFydF9pbml0KCkgYXQgc3RhcnRfaW5pdCsweDIzL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWVm MApmb3JrX2V4aXQoKSBhdCBmb3JrX2V4aXQrMHg3Yi9mcmFtZSAweGZmZmZmZTAxMmY2MDVm MzAKZm9ya190cmFtcG9saW5lKCkgYXQgZm9ya190cmFtcG9saW5lKzB4ZS9mcmFtZSAweGZm ZmZmZTAxMmY2MDVmMzAKLS0tIHRyYXAgMHhjLCByaXAgPSAweDIzZTBjMCwgcnNwID0gMHg4 MjBjMGFlNjgsIHJicCA9IDB4ODIwYzBiNDkwIC0tLQpLREI6IGVudGVyOiBwYW5pYwotLS08 PEJPT1Q+Pi0tLQpDb3B5cmlnaHQgKGMpIDE5OTItMjAyNCBUaGUgRnJlZUJTRCBQcm9qZWN0 LgpDb3B5cmlnaHQgKGMpIDE5NzksIDE5ODAsIDE5ODMsIDE5ODYsIDE5ODgsIDE5ODksIDE5 OTEsIDE5OTIsIDE5OTMsIDE5OTQKCVRoZSBSZWdlbnRzIG9mIHRoZSBVbml2ZXJzaXR5IG9m IENhbGlmb3JuaWEuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCkZyZWVCU0QgaXMgYSByZWdpc3Rl cmVkIHRyYWRlbWFyayBvZiBUaGUgRnJlZUJTRCBGb3VuZGF0aW9uLgpGcmVlQlNEIDE1LjAt Q1VSUkVOVCAjMjIgbjI3NDE4Mi05MzhlNGIxMzFjNDogVGh1IERlYyAyNiAxODoxMDoxMiAt MDMgMjAyNAogICAgcm9vdEBpZGFoby5hcnJha2lzLmNvbS5icjovdXNyL29iai91c3Ivc3Jj L2FtZDY0LmFtZDY0L3N5cy9HRU5FUklDLU5PREVCVUcgYW1kNjQKRnJlZUJTRCBjbGFuZyB2 ZXJzaW9uIDE5LjEuNSAoaHR0cHM6Ly9naXRodWIuY29tL2xsdm0vbGx2bS1wcm9qZWN0Lmdp dCBsbHZtb3JnLTE5LjEuNS0wLWdhYjRiNWEyZGI1ODIpClZUKHZnYSk6IHRleHQgODB4MjUK Q1BVOiBJbnRlbChSKSBYZW9uKFIpIENQVSBFNS0yNjk3IHYzIEAgMi42MEdIeiAoMjYwMC4x NS1NSHogSzgtY2xhc3MgQ1BVKQogIE9yaWdpbj0iR2VudWluZUludGVsIiAgSWQ9MHgzMDZm MiAgRmFtaWx5PTB4NiAgTW9kZWw9MHgzZiAgU3RlcHBpbmc9MgogIEZlYXR1cmVzPTB4Zjgz ZmJmZjxGUFUsVk1FLERFLFBTRSxUU0MsTVNSLFBBRSxNQ0UsQ1g4LEFQSUMsU0VQLE1UUlIs UEdFLE1DQSxDTU9WLFBBVCxQU0UzNixNTVgsRlhTUixTU0UsU1NFMixTUz4KICBGZWF0dXJl czI9MHhmZmZhMzIwMzxTU0UzLFBDTE1VTFFEUSxTU1NFMyxGTUEsQ1gxNixQQ0lELFNTRTQu MSxTU0U0LjIseDJBUElDLE1PVkJFLFBPUENOVCxUU0NETFQsQUVTTkksWFNBVkUsT1NYU0FW RSxBVlgsRjE2QyxSRFJBTkQsSFY+CiAgQU1EIEZlYXR1cmVzPTB4MmMxMDA4MDA8U1lTQ0FM TCxOWCxQYWdlMUdCLFJEVFNDUCxMTT4KICBBTUQgRmVhdHVyZXMyPTB4MjE8TEFIRixBQk0+ CiAgU3RydWN0dXJlZCBFeHRlbmRlZCBGZWF0dXJlcz0weDdhYjxGU0dTQkFTRSxUU0NBREos Qk1JMSxBVlgyLFNNRVAsQk1JMixFUk1TLElOVlBDSUQ+CiAgU3RydWN0dXJlZCBFeHRlbmRl ZCBGZWF0dXJlczI9MHg0PFVNSVA+CiAgU3RydWN0dXJlZCBFeHRlbmRlZCBGZWF0dXJlczM9 MHhhYzAwMDQwMDxNRF9DTEVBUixJQlBCLFNUSUJQLEFSQ0hfQ0FQLFNTQkQ+CiAgWFNBVkUg RmVhdHVyZXM9MHgxPFhTQVZFT1BUPgogIElBMzJfQVJDSF9DQVBTPTB4NDg8U0tJUF9MMURG TF9WTUU+CiAgQU1EIEV4dGVuZGVkIEZlYXR1cmUgRXh0ZW5zaW9ucyBJRCBFQlg9MHgxMDBk MDAwPElCUEIsSUJSUyxTVElCUCxTU0JEPgpIeXBlcnZpc29yOiBPcmlnaW4gPSAiS1ZNS1ZN S1ZNIgpyZWFsIG1lbW9yeSAgPSA1MTUzOTYwNzU1MiAoNDkxNTIgTUIpCmF2YWlsIG1lbW9y eSA9IDUwMDY3ODAwMDY0ICg0Nzc0OCBNQikKRXZlbnQgdGltZXIgIkxBUElDIiBxdWFsaXR5 IDYwMApBQ1BJIEFQSUMgVGFibGU6IDxCT0NIUyAgQlhQQyAgICA+CkZyZWVCU0QvU01QOiBN dWx0aXByb2Nlc3NvciBTeXN0ZW0gRGV0ZWN0ZWQ6IDEyIENQVXMKRnJlZUJTRC9TTVA6IDEy IHBhY2thZ2UocykgeCAxIGNvcmUocykKcmFuZG9tOiByZWdpc3RlcmluZyBmYXN0IHNvdXJj ZSBJbnRlbCBTZWN1cmUgS2V5IFJORwpyYW5kb206IGZhc3QgcHJvdmlkZXI6ICJJbnRlbCBT ZWN1cmUgS2V5IFJORyIKcmFuZG9tOiB1bmJsb2NraW5nIGRldmljZS4KaW9hcGljMCA8VmVy c2lvbiAxLjE+IGlycXMgMC0yMwpMYXVuY2hpbmcgQVBzOiAxMSAzIDggMiA3IDUgOSA0IDYg MSAxMApyYW5kb206IGVudHJvcHkgZGV2aWNlIGV4dGVybmFsIGludGVyZmFjZQprYmQxIGF0 IGtiZG11eDAKdnR2Z2EwOiA8VlQgVkdBIGRyaXZlcj4Ka3ZtY2xvY2swOiA8S1ZNIHBhcmF2 aXJ0dWFsIGNsb2NrPgpUaW1lY291bnRlciAia3ZtY2xvY2siIGZyZXF1ZW5jeSAxMDAwMDAw MDAwIEh6IHF1YWxpdHkgOTc1Cmt2bWNsb2NrMDogcmVnaXN0ZXJlZCBhcyBhIHRpbWUtb2Yt ZGF5IGNsb2NrLCByZXNvbHV0aW9uIDAuMDAwMDAxcwpzbWJpb3MwOiA8U3lzdGVtIE1hbmFn ZW1lbnQgQklPUz4gYXQgaW9tZW0gMHhmNWE1MC0weGY1YTZlCnNtYmlvczA6IFZlcnNpb246 IDIuOCwgQkNEIFJldmlzaW9uOiAyLjgKYWVzbmkwOiA8QUVTLUNCQyxBRVMtQ0NNLEFFUy1H Q00sQUVTLUlDTSxBRVMtWFRTPgphY3BpMDogPEJPQ0hTIEJYUEM+CmFjcGkwOiBQb3dlciBC dXR0b24gKGZpeGVkKQpjcHUwOiA8QUNQSSBDUFU+IG9uIGFjcGkwCmF0cnRjMDogPEFUIHJl YWx0aW1lIGNsb2NrPiBwb3J0IDB4NzAtMHg3NyBpcnEgOCBvbiBhY3BpMAphdHJ0YzA6IHJl Z2lzdGVyZWQgYXMgYSB0aW1lLW9mLWRheSBjbG9jaywgcmVzb2x1dGlvbiAxLjAwMDAwMHMK RXZlbnQgdGltZXIgIlJUQyIgZnJlcXVlbmN5IDMyNzY4IEh6IHF1YWxpdHkgMApUaW1lY291 bnRlciAiQUNQSS1mYXN0IiBmcmVxdWVuY3kgMzU3OTU0NSBIeiBxdWFsaXR5IDkwMAphY3Bp X3RpbWVyMDogPDI0LWJpdCB0aW1lciBhdCAzLjU3OTU0NU1Iej4gcG9ydCAweDYwOC0weDYw YiBvbiBhY3BpMApwY2liMDogPEFDUEkgSG9zdC1QQ0kgYnJpZGdlPiBwb3J0IDB4Y2Y4LTB4 Y2ZmIG9uIGFjcGkwCnBjaTA6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWIwCnZnYXBjaTA6IDxW R0EtY29tcGF0aWJsZSBkaXNwbGF5PiBwb3J0IDB4ZDA0MC0weGQwNWYgbWVtIDB4ZjQwMDAw MDAtMHhmN2ZmZmZmZiwweGY4MDAwMDAwLTB4ZmJmZmZmZmYsMHhmZDIxMDAwMC0weGZkMjEx ZmZmIGlycSAyMSBhdCBkZXZpY2UgMS4wIG9uIHBjaTAKdmdhcGNpMDogQm9vdCB2aWRlbyBk ZXZpY2UKcGNpYjE6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxMjAwMC0weGZk MjEyZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4wIG9uIHBjaTAKcGNpMTogPEFDUEkgUENJIGJ1 cz4gb24gcGNpYjEKcGNpYjI6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmYzIwMDAw MC0weGZjMjAwMGZmIGlycSAyMiBhdCBkZXZpY2UgMC4wIG9uIHBjaTEKcGNpMjogPEFDUEkg UENJIGJ1cz4gb24gcGNpYjIKcGNpYjM6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhm ZDIxMzAwMC0weGZkMjEzZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4xIG9uIHBjaTAKcGNpMzog PEFDUEkgUENJIGJ1cz4gb24gcGNpYjMKdmlydGlvX3BjaTA6IDxWaXJ0SU8gUENJIChtb2Rl cm4pIE5ldHdvcmsgYWRhcHRlcj4gbWVtIDB4ZmQwNDAwMDAtMHhmZDA0MGZmZiwweGZlODAw MDAwLTB4ZmU4MDNmZmYgaXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpMwp2dG5ldDA6IDxW aXJ0SU8gTmV0d29ya2luZyBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMAp2dG5ldDA6IEV0aGVy bmV0IGFkZHJlc3M6IDUyOjU0OjU4OjkzOmM3OmVmCnZ0bmV0MDogbmV0bWFwIHF1ZXVlcy9z bG90czogVFggMS8yNTYsIFJYIDEvMTI4CjAwMC4wMDAwNzcgWyA0NTJdIHZ0bmV0X25ldG1h cF9hdHRhY2ggICAgICAgdnRuZXQgYXR0YWNoZWQgdHhxPTEsIHR4ZD0yNTYgcnhxPTEsIHJ4 ZD0xMjgKcGNpYjQ6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNDAwMC0weGZk MjE0ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4yIG9uIHBjaTAKcGNpNDogPEFDUEkgUENJIGJ1 cz4gb24gcGNpYjQKeGhjaTA6IDxYSENJIChnZW5lcmljKSBVU0IgMy4wIGNvbnRyb2xsZXI+ IG1lbSAweGZjZTAwMDAwLTB4ZmNlMDNmZmYgaXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNp NAp4aGNpMDogMzIgYnl0ZXMgY29udGV4dCBzaXplLCA2NC1iaXQgRE1BCnVzYnVzMCBvbiB4 aGNpMAp1c2J1czA6IDUuMEdicHMgU3VwZXIgU3BlZWQgVVNCIHYzLjAKcGNpYjU6IDxBQ1BJ IFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNTAwMC0weGZkMjE1ZmZmIGlycSAyMiBhdCBk ZXZpY2UgMi4zIG9uIHBjaTAKcGNpNTogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjUKdmlydGlv X3BjaTE6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIFNDU0kgYWRhcHRlcj4gbWVtIDB4ZmNjMDAw MDAtMHhmY2MwMGZmZiwweGZlNDAwMDAwLTB4ZmU0MDNmZmYgaXJxIDIyIGF0IGRldmljZSAw LjAgb24gcGNpNQp2dHNjc2kwOiA8VmlydElPIFNDU0kgQWRhcHRlcj4gb24gdmlydGlvX3Bj aTEKcGNpYjY6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNjAwMC0weGZkMjE2 ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi40IG9uIHBjaTAKcGNpNjogPEFDUEkgUENJIGJ1cz4g b24gcGNpYjYKdmlydGlvX3BjaTI6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIENvbnNvbGUgYWRh cHRlcj4gbWVtIDB4ZmNhMDAwMDAtMHhmY2EwMGZmZiwweGZlMjAwMDAwLTB4ZmUyMDNmZmYg aXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpNgpwY2liNzogPEFDUEkgUENJLVBDSSBicmlk Z2U+IG1lbSAweGZkMjE3MDAwLTB4ZmQyMTdmZmYgaXJxIDIyIGF0IGRldmljZSAyLjUgb24g cGNpMApwY2k3OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNwp2aXJ0aW9fcGNpMzogPFZpcnRJ TyBQQ0kgKG1vZGVybikgQmFsbG9vbiBhZGFwdGVyPiBtZW0gMHhmZTAwMDAwMC0weGZlMDAz ZmZmIGlycSAyMiBhdCBkZXZpY2UgMC4wIG9uIHBjaTcKdnRiYWxsb29uMDogPFZpcnRJTyBC YWxsb29uIEFkYXB0ZXI+IG9uIHZpcnRpb19wY2kzCnBjaWI4OiA8QUNQSSBQQ0ktUENJIGJy aWRnZT4gbWVtIDB4ZmQyMTgwMDAtMHhmZDIxOGZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNiBv biBwY2kwCnBjaTg6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWI4CnZpcnRpb19wY2k0OiA8Vmly dElPIFBDSSAobW9kZXJuKSBFbnRyb3B5IGFkYXB0ZXI+IG1lbSAweGZkZTAwMDAwLTB4ZmRl MDNmZmYgaXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpOApwY2liOTogPEFDUEkgUENJLVBD SSBicmlkZ2U+IG1lbSAweGZkMjE5MDAwLTB4ZmQyMTlmZmYgaXJxIDIyIGF0IGRldmljZSAy Ljcgb24gcGNpMApwY2k5OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liOQppc2FiMDogPFBDSS1J U0EgYnJpZGdlPiBhdCBkZXZpY2UgMzEuMCBvbiBwY2kwCmlzYTA6IDxJU0EgYnVzPiBvbiBp c2FiMAphaGNpMDogPEludGVsIElDSDkgQUhDSSBTQVRBIGNvbnRyb2xsZXI+IHBvcnQgMHhk MDYwLTB4ZDA3ZiBtZW0gMHhmZDIxYTAwMC0weGZkMjFhZmZmIGlycSAxNiBhdCBkZXZpY2Ug MzEuMiBvbiBwY2kwCmFoY2kwOiBBSENJIHYxLjAwIHdpdGggNiAxLjVHYnBzIHBvcnRzLCBQ b3J0IE11bHRpcGxpZXIgbm90IHN1cHBvcnRlZAphaGNpY2gwOiA8QUhDSSBjaGFubmVsPiBh dCBjaGFubmVsIDAgb24gYWhjaTAKYWhjaWNoMTogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5l bCAxIG9uIGFoY2kwCmFoY2ljaDI6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMiBvbiBh aGNpMAphaGNpY2gzOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDMgb24gYWhjaTAKYWhj aWNoNDogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCA0IG9uIGFoY2kwCmFoY2ljaDU6IDxB SENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgNSBvbiBhaGNpMAphY3BpX3N5c2NvbnRhaW5lcjA6 IDxTeXN0ZW0gQ29udGFpbmVyPiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjE6IDxTeXN0 ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2Q4LTB4Y2UzIG9uIGFjcGkwCmFjcGlfc3lzY29udGFp bmVyMjogPFN5c3RlbSBDb250YWluZXI+IHBvcnQgMHg2MjAtMHg2MmYgb24gYWNwaTAKYWNw aV9zeXNjb250YWluZXIzOiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweGNjMC0weGNkNyBv biBhY3BpMAp1YXJ0MDogPDE2NTUwIG9yIGNvbXBhdGlibGU+IHBvcnQgMHgzZjgtMHgzZmYg aXJxIDQgZmxhZ3MgMHgxMCBvbiBhY3BpMAphdGtiZGMwOiA8S2V5Ym9hcmQgY29udHJvbGxl ciAoaTgwNDIpPiBwb3J0IDB4NjAsMHg2NCBpcnEgMSBvbiBhY3BpMAphdGtiZDA6IDxBVCBL ZXlib2FyZD4gaXJxIDEgb24gYXRrYmRjMAprYmQwIGF0IGF0a2JkMAphdGtiZDA6IFtHSUFO VC1MT0NLRURdCnBzbTA6IDxQUy8yIE1vdXNlPiBpcnEgMTIgb24gYXRrYmRjMApwc20wOiBb R0lBTlQtTE9DS0VEXQpXQVJOSU5HOiBEZXZpY2UgInBzbSIgaXMgR2lhbnQgbG9ja2VkIGFu ZCBtYXkgYmUgZGVsZXRlZCBiZWZvcmUgRnJlZUJTRCAxNS4wLgpwc20wOiBtb2RlbCBJbnRl bGxpTW91c2UgRXhwbG9yZXIsIGRldmljZSBJRCA0Cm9ybTA6IDxJU0EgT3B0aW9uIFJPTT4g YXQgaW9tZW0gMHhlOTAwMC0weGVmZmZmIHBucGlkIE9STTAwMDAgb24gaXNhMAp2Z2EwOiA8 R2VuZXJpYyBJU0EgVkdBPiBhdCBwb3J0IDB4M2MwLTB4M2RmIGlvbWVtIDB4YTAwMDAtMHhi ZmZmZiBwbnBpZCBQTlAwOTAwIG9uIGlzYTAKYXR0aW1lcjA6IDxBVCB0aW1lcj4gYXQgcG9y dCAweDQwIG9uIGlzYTAKVGltZWNvdW50ZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBI eiBxdWFsaXR5IDAKRXZlbnQgdGltZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBIeiBx dWFsaXR5IDEwMApUaW1lY291bnRlcnMgdGljayBldmVyeSAxMC4wMDAgbXNlYwp1Z2VuMC4x OiA8KDB4MWIzNikgWEhDSSByb290IEhVQj4gYXQgdXNidXMwCnVodWIwIG9uIHVzYnVzMAp1 aHViMDogPCgweDFiMzYpIFhIQ0kgcm9vdCBIVUIsIGNsYXNzIDkvMCwgcmV2IDMuMDAvMS4w MCwgYWRkciAxPiBvbiB1c2J1czAKWkZTIGZpbGVzeXN0ZW0gdmVyc2lvbjogNQpaRlMgc3Rv cmFnZSBwb29sIHZlcnNpb246IGZlYXR1cmVzIHN1cHBvcnQgKDUwMDApClRyeWluZyB0byBt b3VudCByb290IGZyb20gemZzOnpyb290L1JPT1QvMjAyNC0xMi0yNi0xOC0wOSBbXS4uLgpk YTAgYXQgdnRzY3NpMCBidXMgMCBzY2J1czAgdGFyZ2V0IDAgbHVuIDAKZGEwOiA8UUVNVSBR RU1VIEhBUkRESVNLIDIuNSs+IEZpeGVkIERpcmVjdCBBY2Nlc3MgU1BDLTMgU0NTSSBkZXZp Y2UKZGEwOiAzMDAuMDAwTUIvcyB0cmFuc2ZlcnMKZGEwOiBDb21tYW5kIFF1ZXVlaW5nIGVu YWJsZWQKZGEwOiA3MzcyODBNQiAoMTUwOTk0OTQ0MCA1MTIgYnl0ZSBzZWN0b3JzKQpSb290 IG1vdW50IHdhaXRpbmcgZm9yOiB1c2J1czAKdWh1YjA6IDMwIHBvcnRzIHdpdGggMzAgcmVt b3ZhYmxlLCBzZWxmIHBvd2VyZWQKR0VPTV9FTEk6IERldmljZSBkYTBwMi5lbGkgY3JlYXRl ZC4KR0VPTV9FTEk6IEVuY3J5cHRpb246IEFFUy1YVFMgMTI4CkdFT01fRUxJOiAgICAgQ3J5 cHRvOiBhY2NlbGVyYXRlZCBzb2Z0d2FyZQppY2hzbWIwOiA8SW50ZWwgODI4MDFJIChJQ0g5 KSBTTUJ1cyBjb250cm9sbGVyPiBwb3J0IDB4NzAwLTB4NzNmIGlycSAxNiBhdCBkZXZpY2Ug MzEuMyBvbiBwY2kwCnNtYnVzMDogPFN5c3RlbSBNYW5hZ2VtZW50IEJ1cz4gb24gaWNoc21i MAp2dGNvbjA6IDxWaXJ0SU8gQ29uc29sZSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMgp2dHJu ZDA6IDxWaXJ0SU8gRW50cm9weSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpNApyYW5kb206IHJl Z2lzdGVyaW5nIGZhc3Qgc291cmNlIFZpcnRJTyBFbnRyb3B5IEFkYXB0ZXIKbG8wOiBsaW5r IHN0YXRlIGNoYW5nZWQgdG8gVVAKdnRuZXQwOiBsaW5rIHN0YXRlIGNoYW5nZWQgdG8gVVAK U2VjdXJpdHkgcG9saWN5IGxvYWRlZDogTUFDL250cGQgKG1hY19udHBkKQpXYWl0aW5nICht YXggNjAgc2Vjb25kcykgZm9yIHN5c3RlbSBwcm9jZXNzIGB2bmxydScgdG8gc3RvcC4uLiBk b25lCldhaXRpbmcgKG1heCA2MCBzZWNvbmRzKSBmb3Igc3lzdGVtIHByb2Nlc3MgYHN5bmNl cicgdG8gc3RvcC4uLiAKU3luY2luZyBkaXNrcywgdm5vZGVzIHJlbWFpbmluZy4uLiAwIDAg ZG9uZQpBbGwgYnVmZmVycyBzeW5jZWQuCkdFT01fRUxJOiBEZXZpY2UgZGEwcDIuZWxpIGRl c3Ryb3llZC4KR0VPTV9FTEk6IERldGFjaGVkIGRhMHAyLmVsaSBvbiBsYXN0IGNsb3NlLgpV cHRpbWU6IDNtMnMKdWh1YjA6IGRldGFjaGVkCi0tLTw8Qk9PVD4+LS0tCkNvcHlyaWdodCAo YykgMTk5Mi0yMDI0IFRoZSBGcmVlQlNEIFByb2plY3QuCkNvcHlyaWdodCAoYykgMTk3OSwg MTk4MCwgMTk4MywgMTk4NiwgMTk4OCwgMTk4OSwgMTk5MSwgMTk5MiwgMTk5MywgMTk5NAoJ VGhlIFJlZ2VudHMgb2YgdGhlIFVuaXZlcnNpdHkgb2YgQ2FsaWZvcm5pYS4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KRnJlZUJTRCBpcyBhIHJlZ2lzdGVyZWQgdHJhZGVtYXJrIG9mIFRoZSBG cmVlQlNEIEZvdW5kYXRpb24uCkZyZWVCU0QgMTUuMC1DVVJSRU5UICMyMyBuMjc0MTgyLTkz OGU0YjEzMWM0OiBUaHUgRGVjIDI2IDE4OjIzOjE4IC0wMyAyMDI0CiAgICByb290QGlkYWhv LmFycmFraXMuY29tLmJyOi91c3Ivb2JqL3Vzci9zcmMvYW1kNjQuYW1kNjQvc3lzL0dFTkVS SUMtTk9ERUJVRyBhbWQ2NApGcmVlQlNEIGNsYW5nIHZlcnNpb24gMTkuMS41IChodHRwczov L2dpdGh1Yi5jb20vbGx2bS9sbHZtLXByb2plY3QuZ2l0IGxsdm1vcmctMTkuMS41LTAtZ2Fi NGI1YTJkYjU4MikKVlQodmdhKTogdGV4dCA4MHgyNQpDUFU6IEludGVsKFIpIFhlb24oUikg Q1BVIEU1LTI2OTcgdjMgQCAyLjYwR0h6ICgyNjAwLjA3LU1IeiBLOC1jbGFzcyBDUFUpCiAg T3JpZ2luPSJHZW51aW5lSW50ZWwiICBJZD0weDMwNmYyICBGYW1pbHk9MHg2ICBNb2RlbD0w eDNmICBTdGVwcGluZz0yCiAgRmVhdHVyZXM9MHhmODNmYmZmPEZQVSxWTUUsREUsUFNFLFRT QyxNU1IsUEFFLE1DRSxDWDgsQVBJQyxTRVAsTVRSUixQR0UsTUNBLENNT1YsUEFULFBTRTM2 LE1NWCxGWFNSLFNTRSxTU0UyLFNTPgogIEZlYXR1cmVzMj0weGZmZmEzMjAzPFNTRTMsUENM TVVMUURRLFNTU0UzLEZNQSxDWDE2LFBDSUQsU1NFNC4xLFNTRTQuMix4MkFQSUMsTU9WQkUs UE9QQ05ULFRTQ0RMVCxBRVNOSSxYU0FWRSxPU1hTQVZFLEFWWCxGMTZDLFJEUkFORCxIVj4K ICBBTUQgRmVhdHVyZXM9MHgyYzEwMDgwMDxTWVNDQUxMLE5YLFBhZ2UxR0IsUkRUU0NQLExN PgogIEFNRCBGZWF0dXJlczI9MHgyMTxMQUhGLEFCTT4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVk IEZlYXR1cmVzPTB4N2FiPEZTR1NCQVNFLFRTQ0FESixCTUkxLEFWWDIsU01FUCxCTUkyLEVS TVMsSU5WUENJRD4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMj0weDQ8VU1JUD4K ICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMz0weGFjMDAwNDAwPE1EX0NMRUFSLElC UEIsU1RJQlAsQVJDSF9DQVAsU1NCRD4KICBYU0FWRSBGZWF0dXJlcz0weDE8WFNBVkVPUFQ+ CiAgSUEzMl9BUkNIX0NBUFM9MHg0ODxTS0lQX0wxREZMX1ZNRT4KICBBTUQgRXh0ZW5kZWQg RmVhdHVyZSBFeHRlbnNpb25zIElEIEVCWD0weDEwMGQwMDA8SUJQQixJQlJTLFNUSUJQLFNT QkQ+Ckh5cGVydmlzb3I6IE9yaWdpbiA9ICJLVk1LVk1LVk0iCnJlYWwgbWVtb3J5ICA9IDUx NTM5NjA3NTUyICg0OTE1MiBNQikKYXZhaWwgbWVtb3J5ID0gNTAwNjc4MDAwNjQgKDQ3NzQ4 IE1CKQpFdmVudCB0aW1lciAiTEFQSUMiIHF1YWxpdHkgNjAwCkFDUEkgQVBJQyBUYWJsZTog PEJPQ0hTICBCWFBDICAgID4KRnJlZUJTRC9TTVA6IE11bHRpcHJvY2Vzc29yIFN5c3RlbSBE ZXRlY3RlZDogMTIgQ1BVcwpGcmVlQlNEL1NNUDogMTIgcGFja2FnZShzKSB4IDEgY29yZShz KQpyYW5kb206IHJlZ2lzdGVyaW5nIGZhc3Qgc291cmNlIEludGVsIFNlY3VyZSBLZXkgUk5H CnJhbmRvbTogZmFzdCBwcm92aWRlcjogIkludGVsIFNlY3VyZSBLZXkgUk5HIgpyYW5kb206 IHVuYmxvY2tpbmcgZGV2aWNlLgppb2FwaWMwIDxWZXJzaW9uIDEuMT4gaXJxcyAwLTIzCkxh dW5jaGluZyBBUHM6IDEgNCA3IDkgNiA4IDMgMTAgMTEgNSAyCnJhbmRvbTogZW50cm9weSBk ZXZpY2UgZXh0ZXJuYWwgaW50ZXJmYWNlCmtiZDEgYXQga2JkbXV4MAp2dHZnYTA6IDxWVCBW R0EgZHJpdmVyPgprdm1jbG9jazA6IDxLVk0gcGFyYXZpcnR1YWwgY2xvY2s+ClRpbWVjb3Vu dGVyICJrdm1jbG9jayIgZnJlcXVlbmN5IDEwMDAwMDAwMDAgSHogcXVhbGl0eSA5NzUKa3Zt Y2xvY2swOiByZWdpc3RlcmVkIGFzIGEgdGltZS1vZi1kYXkgY2xvY2ssIHJlc29sdXRpb24g MC4wMDAwMDFzCnNtYmlvczA6IDxTeXN0ZW0gTWFuYWdlbWVudCBCSU9TPiBhdCBpb21lbSAw eGY1YTUwLTB4ZjVhNmUKc21iaW9zMDogVmVyc2lvbjogMi44LCBCQ0QgUmV2aXNpb246IDIu OAphZXNuaTA6IDxBRVMtQ0JDLEFFUy1DQ00sQUVTLUdDTSxBRVMtSUNNLEFFUy1YVFM+CmFj cGkwOiA8Qk9DSFMgQlhQQz4KYWNwaTA6IFBvd2VyIEJ1dHRvbiAoZml4ZWQpCmNwdTA6IDxB Q1BJIENQVT4gb24gYWNwaTAKYXRydGMwOiA8QVQgcmVhbHRpbWUgY2xvY2s+IHBvcnQgMHg3 MC0weDc3IGlycSA4IG9uIGFjcGkwCmF0cnRjMDogcmVnaXN0ZXJlZCBhcyBhIHRpbWUtb2Yt ZGF5IGNsb2NrLCByZXNvbHV0aW9uIDEuMDAwMDAwcwpFdmVudCB0aW1lciAiUlRDIiBmcmVx dWVuY3kgMzI3NjggSHogcXVhbGl0eSAwClRpbWVjb3VudGVyICJBQ1BJLWZhc3QiIGZyZXF1 ZW5jeSAzNTc5NTQ1IEh6IHF1YWxpdHkgOTAwCmFjcGlfdGltZXIwOiA8MjQtYml0IHRpbWVy IGF0IDMuNTc5NTQ1TUh6PiBwb3J0IDB4NjA4LTB4NjBiIG9uIGFjcGkwCnBjaWIwOiA8QUNQ SSBIb3N0LVBDSSBicmlkZ2U+IHBvcnQgMHhjZjgtMHhjZmYgb24gYWNwaTAKcGNpMDogPEFD UEkgUENJIGJ1cz4gb24gcGNpYjAKdmdhcGNpMDogPFZHQS1jb21wYXRpYmxlIGRpc3BsYXk+ IHBvcnQgMHhkMDQwLTB4ZDA1ZiBtZW0gMHhmNDAwMDAwMC0weGY3ZmZmZmZmLDB4ZjgwMDAw MDAtMHhmYmZmZmZmZiwweGZkMjEwMDAwLTB4ZmQyMTFmZmYgaXJxIDIxIGF0IGRldmljZSAx LjAgb24gcGNpMAp2Z2FwY2kwOiBCb290IHZpZGVvIGRldmljZQpwY2liMTogPEFDUEkgUENJ LVBDSSBicmlkZ2U+IG1lbSAweGZkMjEyMDAwLTB4ZmQyMTJmZmYgaXJxIDIyIGF0IGRldmlj ZSAyLjAgb24gcGNpMApwY2kxOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMQpwY2liMjogPEFD UEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZjMjAwMDAwLTB4ZmMyMDAwZmYgaXJxIDIyIGF0 IGRldmljZSAwLjAgb24gcGNpMQpwY2kyOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMgpwY2li MzogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEzMDAwLTB4ZmQyMTNmZmYgaXJx IDIyIGF0IGRldmljZSAyLjEgb24gcGNpMApwY2kzOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2li Mwp2aXJ0aW9fcGNpMDogPFZpcnRJTyBQQ0kgKG1vZGVybikgTmV0d29yayBhZGFwdGVyPiBt ZW0gMHhmZDA0MDAwMC0weGZkMDQwZmZmLDB4ZmU4MDAwMDAtMHhmZTgwM2ZmZiBpcnEgMjIg YXQgZGV2aWNlIDAuMCBvbiBwY2kzCnZ0bmV0MDogPFZpcnRJTyBOZXR3b3JraW5nIEFkYXB0 ZXI+IG9uIHZpcnRpb19wY2kwCnZ0bmV0MDogRXRoZXJuZXQgYWRkcmVzczogNTI6NTQ6NTg6 OTM6Yzc6ZWYKdnRuZXQwOiBuZXRtYXAgcXVldWVzL3Nsb3RzOiBUWCAxLzI1NiwgUlggMS8x MjgKMDAwLjAwMDA3NyBbIDQ1Ml0gdnRuZXRfbmV0bWFwX2F0dGFjaCAgICAgICB2dG5ldCBh dHRhY2hlZCB0eHE9MSwgdHhkPTI1NiByeHE9MSwgcnhkPTEyOApwY2liNDogPEFDUEkgUENJ LVBDSSBicmlkZ2U+IG1lbSAweGZkMjE0MDAwLTB4ZmQyMTRmZmYgaXJxIDIyIGF0IGRldmlj ZSAyLjIgb24gcGNpMApwY2k0OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNAp4aGNpMDogPFhI Q0kgKGdlbmVyaWMpIFVTQiAzLjAgY29udHJvbGxlcj4gbWVtIDB4ZmNlMDAwMDAtMHhmY2Uw M2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2k0CnhoY2kwOiAzMiBieXRlcyBjb250 ZXh0IHNpemUsIDY0LWJpdCBETUEKdXNidXMwIG9uIHhoY2kwCnVzYnVzMDogNS4wR2JwcyBT dXBlciBTcGVlZCBVU0IgdjMuMApwY2liNTogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAw eGZkMjE1MDAwLTB4ZmQyMTVmZmYgaXJxIDIyIGF0IGRldmljZSAyLjMgb24gcGNpMApwY2k1 OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNQp2aXJ0aW9fcGNpMTogPFZpcnRJTyBQQ0kgKG1v ZGVybikgU0NTSSBhZGFwdGVyPiBtZW0gMHhmY2MwMDAwMC0weGZjYzAwZmZmLDB4ZmU0MDAw MDAtMHhmZTQwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2k1CnZ0c2NzaTA6IDxW aXJ0SU8gU0NTSSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMQpwY2liNjogPEFDUEkgUENJLVBD SSBicmlkZ2U+IG1lbSAweGZkMjE2MDAwLTB4ZmQyMTZmZmYgaXJxIDIyIGF0IGRldmljZSAy LjQgb24gcGNpMApwY2k2OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNgp2aXJ0aW9fcGNpMjog PFZpcnRJTyBQQ0kgKG1vZGVybikgQ29uc29sZSBhZGFwdGVyPiBtZW0gMHhmY2EwMDAwMC0w eGZjYTAwZmZmLDB4ZmUyMDAwMDAtMHhmZTIwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBv biBwY2k2CnBjaWI3OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTcwMDAtMHhm ZDIxN2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNSBvbiBwY2kwCnBjaTc6IDxBQ1BJIFBDSSBi dXM+IG9uIHBjaWI3CnZpcnRpb19wY2kzOiA8VmlydElPIFBDSSAobW9kZXJuKSBCYWxsb29u IGFkYXB0ZXI+IG1lbSAweGZlMDAwMDAwLTB4ZmUwMDNmZmYgaXJxIDIyIGF0IGRldmljZSAw LjAgb24gcGNpNwp2dGJhbGxvb24wOiA8VmlydElPIEJhbGxvb24gQWRhcHRlcj4gb24gdmly dGlvX3BjaTMKcGNpYjg6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxODAwMC0w eGZkMjE4ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi42IG9uIHBjaTAKcGNpODogPEFDUEkgUENJ IGJ1cz4gb24gcGNpYjgKdmlydGlvX3BjaTQ6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIEVudHJv cHkgYWRhcHRlcj4gbWVtIDB4ZmRlMDAwMDAtMHhmZGUwM2ZmZiBpcnEgMjIgYXQgZGV2aWNl IDAuMCBvbiBwY2k4CnBjaWI5OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTkw MDAtMHhmZDIxOWZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNyBvbiBwY2kwCnBjaTk6IDxBQ1BJ IFBDSSBidXM+IG9uIHBjaWI5CmlzYWIwOiA8UENJLUlTQSBicmlkZ2U+IGF0IGRldmljZSAz MS4wIG9uIHBjaTAKaXNhMDogPElTQSBidXM+IG9uIGlzYWIwCmFoY2kwOiA8SW50ZWwgSUNI OSBBSENJIFNBVEEgY29udHJvbGxlcj4gcG9ydCAweGQwNjAtMHhkMDdmIG1lbSAweGZkMjFh MDAwLTB4ZmQyMWFmZmYgaXJxIDE2IGF0IGRldmljZSAzMS4yIG9uIHBjaTAKYWhjaTA6IEFI Q0kgdjEuMDAgd2l0aCA2IDEuNUdicHMgcG9ydHMsIFBvcnQgTXVsdGlwbGllciBub3Qgc3Vw cG9ydGVkCmFoY2ljaDA6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMCBvbiBhaGNpMAph aGNpY2gxOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDEgb24gYWhjaTAKYWhjaWNoMjog PEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAyIG9uIGFoY2kwCmFoY2ljaDM6IDxBSENJIGNo YW5uZWw+IGF0IGNoYW5uZWwgMyBvbiBhaGNpMAphaGNpY2g0OiA8QUhDSSBjaGFubmVsPiBh dCBjaGFubmVsIDQgb24gYWhjaTAKYWhjaWNoNTogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5l bCA1IG9uIGFoY2kwCmFjcGlfc3lzY29udGFpbmVyMDogPFN5c3RlbSBDb250YWluZXI+IG9u IGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMTogPFN5c3RlbSBDb250YWluZXI+IHBvcnQgMHhj ZDgtMHhjZTMgb24gYWNwaTAKYWNwaV9zeXNjb250YWluZXIyOiA8U3lzdGVtIENvbnRhaW5l cj4gcG9ydCAweDYyMC0weDYyZiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjM6IDxTeXN0 ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2MwLTB4Y2Q3IG9uIGFjcGkwCnVhcnQwOiA8MTY1NTAg b3IgY29tcGF0aWJsZT4gcG9ydCAweDNmOC0weDNmZiBpcnEgNCBmbGFncyAweDEwIG9uIGFj cGkwCmF0a2JkYzA6IDxLZXlib2FyZCBjb250cm9sbGVyIChpODA0Mik+IHBvcnQgMHg2MCww eDY0IGlycSAxIG9uIGFjcGkwCmF0a2JkMDogPEFUIEtleWJvYXJkPiBpcnEgMSBvbiBhdGti ZGMwCmtiZDAgYXQgYXRrYmQwCmF0a2JkMDogW0dJQU5ULUxPQ0tFRF0KcHNtMDogPFBTLzIg TW91c2U+IGlycSAxMiBvbiBhdGtiZGMwCnBzbTA6IFtHSUFOVC1MT0NLRURdCldBUk5JTkc6 IERldmljZSAicHNtIiBpcyBHaWFudCBsb2NrZWQgYW5kIG1heSBiZSBkZWxldGVkIGJlZm9y ZSBGcmVlQlNEIDE1LjAuCnBzbTA6IG1vZGVsIEludGVsbGlNb3VzZSBFeHBsb3JlciwgZGV2 aWNlIElEIDQKb3JtMDogPElTQSBPcHRpb24gUk9NPiBhdCBpb21lbSAweGU5MDAwLTB4ZWZm ZmYgcG5waWQgT1JNMDAwMCBvbiBpc2EwCnZnYTA6IDxHZW5lcmljIElTQSBWR0E+IGF0IHBv cnQgMHgzYzAtMHgzZGYgaW9tZW0gMHhhMDAwMC0weGJmZmZmIHBucGlkIFBOUDA5MDAgb24g aXNhMAphdHRpbWVyMDogPEFUIHRpbWVyPiBhdCBwb3J0IDB4NDAgb24gaXNhMApUaW1lY291 bnRlciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxpdHkgMApFdmVudCB0aW1l ciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxpdHkgMTAwClRpbWVjb3VudGVy cyB0aWNrIGV2ZXJ5IDEwLjAwMCBtc2VjCnVnZW4wLjE6IDwoMHgxYjM2KSBYSENJIHJvb3Qg SFVCPiBhdCB1c2J1czAKdWh1YjAgb24gdXNidXMwCnVodWIwOiA8KDB4MWIzNikgWEhDSSBy b290IEhVQiwgY2xhc3MgOS8wLCByZXYgMy4wMC8xLjAwLCBhZGRyIDE+IG9uIHVzYnVzMApa RlMgZmlsZXN5c3RlbSB2ZXJzaW9uOiA1ClpGUyBzdG9yYWdlIHBvb2wgdmVyc2lvbjogZmVh dHVyZXMgc3VwcG9ydCAoNTAwMCkKVHJ5aW5nIHRvIG1vdW50IHJvb3QgZnJvbSB6ZnM6enJv b3QvUk9PVC8yMDI0LTEyLTI2LTE4LTIzIFtdLi4uCmRhMCBhdCB2dHNjc2kwIGJ1cyAwIHNj YnVzMCB0YXJnZXQgMCBsdW4gMApkYTA6IDxRRU1VIFFFTVUgSEFSRERJU0sgMi41Kz4gRml4 ZWQgRGlyZWN0IEFjY2VzcyBTUEMtMyBTQ1NJIGRldmljZQpkYTA6IDMwMC4wMDBNQi9zIHRy YW5zZmVycwpkYTA6IENvbW1hbmQgUXVldWVpbmcgZW5hYmxlZApkYTA6IDczNzI4ME1CICgx NTA5OTQ5NDQwIDUxMiBieXRlIHNlY3RvcnMpClJvb3QgbW91bnQgd2FpdGluZyBmb3I6IHVz YnVzMAp1aHViMDogMzAgcG9ydHMgd2l0aCAzMCByZW1vdmFibGUsIHNlbGYgcG93ZXJlZApH RU9NX0VMSTogRGV2aWNlIGRhMHAyLmVsaSBjcmVhdGVkLgpHRU9NX0VMSTogRW5jcnlwdGlv bjogQUVTLVhUUyAxMjgKR0VPTV9FTEk6ICAgICBDcnlwdG86IGFjY2VsZXJhdGVkIHNvZnR3 YXJlCmljaHNtYjA6IDxJbnRlbCA4MjgwMUkgKElDSDkpIFNNQnVzIGNvbnRyb2xsZXI+IHBv cnQgMHg3MDAtMHg3M2YgaXJxIDE2IGF0IGRldmljZSAzMS4zIG9uIHBjaTAKc21idXMwOiA8 U3lzdGVtIE1hbmFnZW1lbnQgQnVzPiBvbiBpY2hzbWIwCnZ0Y29uMDogPFZpcnRJTyBDb25z b2xlIEFkYXB0ZXI+IG9uIHZpcnRpb19wY2kyCnZ0cm5kMDogPFZpcnRJTyBFbnRyb3B5IEFk YXB0ZXI+IG9uIHZpcnRpb19wY2k0CnJhbmRvbTogcmVnaXN0ZXJpbmcgZmFzdCBzb3VyY2Ug VmlydElPIEVudHJvcHkgQWRhcHRlcgpsbzA6IGxpbmsgc3RhdGUgY2hhbmdlZCB0byBVUAp2 dG5ldDA6IGxpbmsgc3RhdGUgY2hhbmdlZCB0byBVUApTZWN1cml0eSBwb2xpY3kgbG9hZGVk OiBNQUMvbnRwZCAobWFjX250cGQpCldhaXRpbmcgKG1heCA2MCBzZWNvbmRzKSBmb3Igc3lz dGVtIHByb2Nlc3MgYHZubHJ1JyB0byBzdG9wLi4uIGRvbmUKV2FpdGluZyAobWF4IDYwIHNl Y29uZHMpIGZvciBzeXN0ZW0gcHJvY2VzcyBgc3luY2VyJyB0byBzdG9wLi4uIApTeW5jaW5n IGRpc2tzLCB2bm9kZXMgcmVtYWluaW5nLi4uIDAgMCBkb25lCkFsbCBidWZmZXJzIHN5bmNl ZC4KR0VPTV9FTEk6IERldmljZSBkYTBwMi5lbGkgZGVzdHJveWVkLgpHRU9NX0VMSTogRGV0 YWNoZWQgZGEwcDIuZWxpIG9uIGxhc3QgY2xvc2UuClVwdGltZTogM20zMHMKdWh1YjA6IGRl dGFjaGVkCi0tLTw8Qk9PVD4+LS0tCkNvcHlyaWdodCAoYykgMTk5Mi0yMDI0IFRoZSBGcmVl QlNEIFByb2plY3QuCkNvcHlyaWdodCAoYykgMTk3OSwgMTk4MCwgMTk4MywgMTk4NiwgMTk4 OCwgMTk4OSwgMTk5MSwgMTk5MiwgMTk5MywgMTk5NAoJVGhlIFJlZ2VudHMgb2YgdGhlIFVu aXZlcnNpdHkgb2YgQ2FsaWZvcm5pYS4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KRnJlZUJTRCBp cyBhIHJlZ2lzdGVyZWQgdHJhZGVtYXJrIG9mIFRoZSBGcmVlQlNEIEZvdW5kYXRpb24uCkZy ZWVCU0QgMTUuMC1DVVJSRU5UICMyMyBuMjc0MTgzLWJhMTkwNDkzN2Q5OiBUaHUgRGVjIDI2 IDE4OjE4OjIyIC0wMyAyMDI0CiAgICByb290QGlkYWhvLmFycmFraXMuY29tLmJyOi91c3Iv b2JqL3Vzci9zcmMvYW1kNjQuYW1kNjQvc3lzL0dFTkVSSUMtTk9ERUJVRyBhbWQ2NApGcmVl QlNEIGNsYW5nIHZlcnNpb24gMTkuMS41IChodHRwczovL2dpdGh1Yi5jb20vbGx2bS9sbHZt LXByb2plY3QuZ2l0IGxsdm1vcmctMTkuMS41LTAtZ2FiNGI1YTJkYjU4MikKVlQodmdhKTog dGV4dCA4MHgyNQpDUFU6IEludGVsKFIpIFhlb24oUikgQ1BVIEU1LTI2OTcgdjMgQCAyLjYw R0h6ICgyNjAwLjEwLU1IeiBLOC1jbGFzcyBDUFUpCiAgT3JpZ2luPSJHZW51aW5lSW50ZWwi ICBJZD0weDMwNmYyICBGYW1pbHk9MHg2ICBNb2RlbD0weDNmICBTdGVwcGluZz0yCiAgRmVh dHVyZXM9MHhmODNmYmZmPEZQVSxWTUUsREUsUFNFLFRTQyxNU1IsUEFFLE1DRSxDWDgsQVBJ QyxTRVAsTVRSUixQR0UsTUNBLENNT1YsUEFULFBTRTM2LE1NWCxGWFNSLFNTRSxTU0UyLFNT PgogIEZlYXR1cmVzMj0weGZmZmEzMjAzPFNTRTMsUENMTVVMUURRLFNTU0UzLEZNQSxDWDE2 LFBDSUQsU1NFNC4xLFNTRTQuMix4MkFQSUMsTU9WQkUsUE9QQ05ULFRTQ0RMVCxBRVNOSSxY U0FWRSxPU1hTQVZFLEFWWCxGMTZDLFJEUkFORCxIVj4KICBBTUQgRmVhdHVyZXM9MHgyYzEw MDgwMDxTWVNDQUxMLE5YLFBhZ2UxR0IsUkRUU0NQLExNPgogIEFNRCBGZWF0dXJlczI9MHgy MTxMQUhGLEFCTT4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzPTB4N2FiPEZTR1NC QVNFLFRTQ0FESixCTUkxLEFWWDIsU01FUCxCTUkyLEVSTVMsSU5WUENJRD4KICBTdHJ1Y3R1 cmVkIEV4dGVuZGVkIEZlYXR1cmVzMj0weDQ8VU1JUD4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVk IEZlYXR1cmVzMz0weGFjMDAwNDAwPE1EX0NMRUFSLElCUEIsU1RJQlAsQVJDSF9DQVAsU1NC RD4KICBYU0FWRSBGZWF0dXJlcz0weDE8WFNBVkVPUFQ+CiAgSUEzMl9BUkNIX0NBUFM9MHg0 ODxTS0lQX0wxREZMX1ZNRT4KICBBTUQgRXh0ZW5kZWQgRmVhdHVyZSBFeHRlbnNpb25zIElE IEVCWD0weDEwMGQwMDA8SUJQQixJQlJTLFNUSUJQLFNTQkQ+Ckh5cGVydmlzb3I6IE9yaWdp biA9ICJLVk1LVk1LVk0iCnJlYWwgbWVtb3J5ICA9IDUxNTM5NjA3NTUyICg0OTE1MiBNQikK YXZhaWwgbWVtb3J5ID0gNTAwNjc4MDAwNjQgKDQ3NzQ4IE1CKQpFdmVudCB0aW1lciAiTEFQ SUMiIHF1YWxpdHkgNjAwCkFDUEkgQVBJQyBUYWJsZTogPEJPQ0hTICBCWFBDICAgID4KRnJl ZUJTRC9TTVA6IE11bHRpcHJvY2Vzc29yIFN5c3RlbSBEZXRlY3RlZDogMTIgQ1BVcwpGcmVl QlNEL1NNUDogMTIgcGFja2FnZShzKSB4IDEgY29yZShzKQpyYW5kb206IHJlZ2lzdGVyaW5n IGZhc3Qgc291cmNlIEludGVsIFNlY3VyZSBLZXkgUk5HCnJhbmRvbTogZmFzdCBwcm92aWRl cjogIkludGVsIFNlY3VyZSBLZXkgUk5HIgpyYW5kb206IHVuYmxvY2tpbmcgZGV2aWNlLgpp b2FwaWMwIDxWZXJzaW9uIDEuMT4gaXJxcyAwLTIzCkxhdW5jaGluZyBBUHM6IDQgMTEgNyAx IDkgMiA1IDYgOCAzIDEwCnJhbmRvbTogZW50cm9weSBkZXZpY2UgZXh0ZXJuYWwgaW50ZXJm YWNlCmtiZDEgYXQga2JkbXV4MAp2dHZnYTA6IDxWVCBWR0EgZHJpdmVyPgprdm1jbG9jazA6 IDxLVk0gcGFyYXZpcnR1YWwgY2xvY2s+ClRpbWVjb3VudGVyICJrdm1jbG9jayIgZnJlcXVl bmN5IDEwMDAwMDAwMDAgSHogcXVhbGl0eSA5NzUKa3ZtY2xvY2swOiByZWdpc3RlcmVkIGFz IGEgdGltZS1vZi1kYXkgY2xvY2ssIHJlc29sdXRpb24gMC4wMDAwMDFzCnNtYmlvczA6IDxT eXN0ZW0gTWFuYWdlbWVudCBCSU9TPiBhdCBpb21lbSAweGY1YTUwLTB4ZjVhNmUKc21iaW9z MDogVmVyc2lvbjogMi44LCBCQ0QgUmV2aXNpb246IDIuOAphZXNuaTA6IDxBRVMtQ0JDLEFF Uy1DQ00sQUVTLUdDTSxBRVMtSUNNLEFFUy1YVFM+CmFjcGkwOiA8Qk9DSFMgQlhQQz4KYWNw aTA6IFBvd2VyIEJ1dHRvbiAoZml4ZWQpCmNwdTA6IDxBQ1BJIENQVT4gb24gYWNwaTAKYXRy dGMwOiA8QVQgcmVhbHRpbWUgY2xvY2s+IHBvcnQgMHg3MC0weDc3IGlycSA4IG9uIGFjcGkw CmF0cnRjMDogcmVnaXN0ZXJlZCBhcyBhIHRpbWUtb2YtZGF5IGNsb2NrLCByZXNvbHV0aW9u IDEuMDAwMDAwcwpFdmVudCB0aW1lciAiUlRDIiBmcmVxdWVuY3kgMzI3NjggSHogcXVhbGl0 eSAwClRpbWVjb3VudGVyICJBQ1BJLWZhc3QiIGZyZXF1ZW5jeSAzNTc5NTQ1IEh6IHF1YWxp dHkgOTAwCmFjcGlfdGltZXIwOiA8MjQtYml0IHRpbWVyIGF0IDMuNTc5NTQ1TUh6PiBwb3J0 IDB4NjA4LTB4NjBiIG9uIGFjcGkwCnBjaWIwOiA8QUNQSSBIb3N0LVBDSSBicmlkZ2U+IHBv cnQgMHhjZjgtMHhjZmYgb24gYWNwaTAKcGNpMDogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjAK dmdhcGNpMDogPFZHQS1jb21wYXRpYmxlIGRpc3BsYXk+IHBvcnQgMHhkMDQwLTB4ZDA1ZiBt ZW0gMHhmNDAwMDAwMC0weGY3ZmZmZmZmLDB4ZjgwMDAwMDAtMHhmYmZmZmZmZiwweGZkMjEw MDAwLTB4ZmQyMTFmZmYgaXJxIDIxIGF0IGRldmljZSAxLjAgb24gcGNpMAp2Z2FwY2kwOiBC b290IHZpZGVvIGRldmljZQpwY2liMTogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZk MjEyMDAwLTB4ZmQyMTJmZmYgaXJxIDIyIGF0IGRldmljZSAyLjAgb24gcGNpMApwY2liMjog PEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEzMDAwLTB4ZmQyMTNmZmYgaXJxIDIy IGF0IGRldmljZSAyLjEgb24gcGNpMApwY2liMzogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1l bSAweGZkMjE0MDAwLTB4ZmQyMTRmZmYgaXJxIDIyIGF0IGRldmljZSAyLjIgb24gcGNpMApw Y2liNDogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE1MDAwLTB4ZmQyMTVmZmYg aXJxIDIyIGF0IGRldmljZSAyLjMgb24gcGNpMApwY2liNTogPEFDUEkgUENJLVBDSSBicmlk Z2U+IG1lbSAweGZkMjE2MDAwLTB4ZmQyMTZmZmYgaXJxIDIyIGF0IGRldmljZSAyLjQgb24g cGNpMApwY2liNjogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE3MDAwLTB4ZmQy MTdmZmYgaXJxIDIyIGF0IGRldmljZSAyLjUgb24gcGNpMApwY2liNzogPEFDUEkgUENJLVBD SSBicmlkZ2U+IG1lbSAweGZkMjE4MDAwLTB4ZmQyMThmZmYgaXJxIDIyIGF0IGRldmljZSAy LjYgb24gcGNpMApwY2liODogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE5MDAw LTB4ZmQyMTlmZmYgaXJxIDIyIGF0IGRldmljZSAyLjcgb24gcGNpMAppc2FiMDogPFBDSS1J U0EgYnJpZGdlPiBhdCBkZXZpY2UgMzEuMCBvbiBwY2kwCmlzYTA6IDxJU0EgYnVzPiBvbiBp c2FiMAphaGNpMDogPEludGVsIElDSDkgQUhDSSBTQVRBIGNvbnRyb2xsZXI+IHBvcnQgMHhk MDYwLTB4ZDA3ZiBtZW0gMHhmZDIxYTAwMC0weGZkMjFhZmZmIGlycSAxNiBhdCBkZXZpY2Ug MzEuMiBvbiBwY2kwCmFoY2kwOiBBSENJIHYxLjAwIHdpdGggNiAxLjVHYnBzIHBvcnRzLCBQ b3J0IE11bHRpcGxpZXIgbm90IHN1cHBvcnRlZAphaGNpY2gwOiA8QUhDSSBjaGFubmVsPiBh dCBjaGFubmVsIDAgb24gYWhjaTAKYWhjaWNoMTogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5l bCAxIG9uIGFoY2kwCmFoY2ljaDI6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMiBvbiBh aGNpMAphaGNpY2gzOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDMgb24gYWhjaTAKYWhj aWNoNDogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCA0IG9uIGFoY2kwCmFoY2ljaDU6IDxB SENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgNSBvbiBhaGNpMAphY3BpX3N5c2NvbnRhaW5lcjA6 IDxTeXN0ZW0gQ29udGFpbmVyPiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjE6IDxTeXN0 ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2Q4LTB4Y2UzIG9uIGFjcGkwCmFjcGlfc3lzY29udGFp bmVyMjogPFN5c3RlbSBDb250YWluZXI+IHBvcnQgMHg2MjAtMHg2MmYgb24gYWNwaTAKYWNw aV9zeXNjb250YWluZXIzOiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweGNjMC0weGNkNyBv biBhY3BpMAp1YXJ0MDogPDE2NTUwIG9yIGNvbXBhdGlibGU+IHBvcnQgMHgzZjgtMHgzZmYg aXJxIDQgZmxhZ3MgMHgxMCBvbiBhY3BpMAphdGtiZGMwOiA8S2V5Ym9hcmQgY29udHJvbGxl ciAoaTgwNDIpPiBwb3J0IDB4NjAsMHg2NCBpcnEgMSBvbiBhY3BpMAphdGtiZDA6IDxBVCBL ZXlib2FyZD4gaXJxIDEgb24gYXRrYmRjMAprYmQwIGF0IGF0a2JkMAphdGtiZDA6IFtHSUFO VC1MT0NLRURdCnBzbTA6IDxQUy8yIE1vdXNlPiBpcnEgMTIgb24gYXRrYmRjMApwc20wOiBb R0lBTlQtTE9DS0VEXQpXQVJOSU5HOiBEZXZpY2UgInBzbSIgaXMgR2lhbnQgbG9ja2VkIGFu ZCBtYXkgYmUgZGVsZXRlZCBiZWZvcmUgRnJlZUJTRCAxNS4wLgpwc20wOiBtb2RlbCBJbnRl bGxpTW91c2UgRXhwbG9yZXIsIGRldmljZSBJRCA0Cm9ybTA6IDxJU0EgT3B0aW9uIFJPTT4g YXQgaW9tZW0gMHhlOTAwMC0weGVmZmZmIHBucGlkIE9STTAwMDAgb24gaXNhMAp2Z2EwOiA8 R2VuZXJpYyBJU0EgVkdBPiBhdCBwb3J0IDB4M2MwLTB4M2RmIGlvbWVtIDB4YTAwMDAtMHhi ZmZmZiBwbnBpZCBQTlAwOTAwIG9uIGlzYTAKYXR0aW1lcjA6IDxBVCB0aW1lcj4gYXQgcG9y dCAweDQwIG9uIGlzYTAKVGltZWNvdW50ZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBI eiBxdWFsaXR5IDAKRXZlbnQgdGltZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBIeiBx dWFsaXR5IDEwMApUaW1lY291bnRlcnMgdGljayBldmVyeSAxMC4wMDAgbXNlYwpaRlMgZmls ZXN5c3RlbSB2ZXJzaW9uOiA1ClpGUyBzdG9yYWdlIHBvb2wgdmVyc2lvbjogZmVhdHVyZXMg c3VwcG9ydCAoNTAwMCkKVHJ5aW5nIHRvIG1vdW50IHJvb3QgZnJvbSB6ZnM6enJvb3QvUk9P VC8yMDI0LTEyLTI2LTE4LTE4IFtdLi4uClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQg dGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKTW91bnRpbmcgZnJvbSB6ZnM6enJvb3QvUk9P VC8yMDI0LTEyLTI2LTE4LTE4IGZhaWxlZCB3aXRoIGVycm9yIDU7IHJldHJ5aW5nIGZvciAz IG1vcmUgc2Vjb25kcwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxh YmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wg bGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9v bCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBw b29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhl IHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0 aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5k IHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZp bmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3Qg ZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5v dCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fu bm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBD YW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6 IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElD RTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9U SUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBO T1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6 IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJp czogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xh cmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNv bGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcK U29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290 JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJv b3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6 cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3Ig J3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZv ciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwg Zm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJl bCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxh YmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wg bGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9v bCBsYWJlbCBmb3IgJ3pyb290JwpNb3VudGluZyBmcm9tIHpmczp6cm9vdC9ST09ULzIwMjQt MTItMjYtMTgtMTggZmFpbGVkIHdpdGggZXJyb3IgNS4KCkxvYWRlciB2YXJpYWJsZXM6CiAg dmZzLnJvb3QubW91bnRmcm9tPXpmczp6cm9vdC9ST09ULzIwMjQtMTItMjYtMTgtMTgKCk1h bnVhbCByb290IGZpbGVzeXN0ZW0gc3BlY2lmaWNhdGlvbjoKICA8ZnN0eXBlPjo8ZGV2aWNl PiBbb3B0aW9uc10KICAgICAgTW91bnQgPGRldmljZT4gdXNpbmcgZmlsZXN5c3RlbSA8ZnN0 eXBlPgogICAgICBhbmQgd2l0aCB0aGUgc3BlY2lmaWVkIChvcHRpb25hbCkgb3B0aW9uIGxp c3QuCgogICAgZWcuIHVmczovZGV2L2RhMHMxYQogICAgICAgIHpmczp6cm9vdC9ST09UL2Rl ZmF1bHQKICAgICAgICBjZDk2NjA6L2Rldi9jZDAgcm8KICAgICAgICAgICh3aGljaCBpcyBl cXVpdmFsZW50IHRvOiBtb3VudCAtdCBjZDk2NjAgLW8gcm8gL2Rldi9jZDAgLykKCiAgPyAg ICAgICAgICAgICAgIExpc3QgdmFsaWQgZGlzayBib290IGRldmljZXMKICAuICAgICAgICAg ICAgICAgWWllbGQgMSBzZWNvbmQgKGZvciBiYWNrZ3JvdW5kIHRhc2tzKQogIDxlbXB0eSBs aW5lPiAgICBBYm9ydCBtYW51YWwgaW5wdXQKCm1vdW50cm9vdD4gCkxpc3Qgb2YgR0VPTSBt YW5hZ2VkIGRpc2sgZGV2aWNlczoKICAKCm1vdW50cm9vdD4gcGFuaWM6IG1vdW50cm9vdDog dW5hYmxlIHRvIChyZS0pbW91bnQgcm9vdC4KY3B1aWQgPSAwCnRpbWUgPSAxMApLREI6IHN0 YWNrIGJhY2t0cmFjZToKZGJfdHJhY2Vfc2VsZl93cmFwcGVyKCkgYXQgZGJfdHJhY2Vfc2Vs Zl93cmFwcGVyKzB4MmIvZnJhbWUgMHhmZmZmZmUwMTJmNjA1YjYwCnZwYW5pYygpIGF0IHZw YW5pYysweDEzNi9mcmFtZSAweGZmZmZmZTAxMmY2MDVjOTAKcGFuaWMoKSBhdCBwYW5pYysw eDQzL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWNmMAp2ZnNfbW91bnRyb290KCkgYXQgdmZzX21v dW50cm9vdCsweDFjYmMvZnJhbWUgMHhmZmZmZmUwMTJmNjA1ZTYwCnN0YXJ0X2luaXQoKSBh dCBzdGFydF9pbml0KzB4MjMvZnJhbWUgMHhmZmZmZmUwMTJmNjA1ZWYwCmZvcmtfZXhpdCgp IGF0IGZvcmtfZXhpdCsweDdiL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWYzMApmb3JrX3RyYW1w b2xpbmUoKSBhdCBmb3JrX3RyYW1wb2xpbmUrMHhlL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWYz MAotLS0gdHJhcCAweGMsIHJpcCA9IDB4MjNlMGMwLCByc3AgPSAweDgyMDg3NzVlOCwgcmJw ID0gMHg4MjA4NzdiZjAgLS0tCktEQjogZW50ZXI6IHBhbmljCi0tLTw8Qk9PVD4+LS0tCkNv cHlyaWdodCAoYykgMTk5Mi0yMDI0IFRoZSBGcmVlQlNEIFByb2plY3QuCkNvcHlyaWdodCAo YykgMTk3OSwgMTk4MCwgMTk4MywgMTk4NiwgMTk4OCwgMTk4OSwgMTk5MSwgMTk5MiwgMTk5 MywgMTk5NAoJVGhlIFJlZ2VudHMgb2YgdGhlIFVuaXZlcnNpdHkgb2YgQ2FsaWZvcm5pYS4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KRnJlZUJTRCBpcyBhIHJlZ2lzdGVyZWQgdHJhZGVtYXJr IG9mIFRoZSBGcmVlQlNEIEZvdW5kYXRpb24uCkZyZWVCU0QgMTUuMC1DVVJSRU5UICMyMiBu Mjc0MTgyLTkzOGU0YjEzMWM0OiBUaHUgRGVjIDI2IDE4OjEwOjEyIC0wMyAyMDI0CiAgICBy b290QGlkYWhvLmFycmFraXMuY29tLmJyOi91c3Ivb2JqL3Vzci9zcmMvYW1kNjQuYW1kNjQv c3lzL0dFTkVSSUMtTk9ERUJVRyBhbWQ2NApGcmVlQlNEIGNsYW5nIHZlcnNpb24gMTkuMS41 IChodHRwczovL2dpdGh1Yi5jb20vbGx2bS9sbHZtLXByb2plY3QuZ2l0IGxsdm1vcmctMTku MS41LTAtZ2FiNGI1YTJkYjU4MikKVlQodmdhKTogdGV4dCA4MHgyNQpDUFU6IEludGVsKFIp IFhlb24oUikgQ1BVIEU1LTI2OTcgdjMgQCAyLjYwR0h6ICgyNjAwLjEyLU1IeiBLOC1jbGFz cyBDUFUpCiAgT3JpZ2luPSJHZW51aW5lSW50ZWwiICBJZD0weDMwNmYyICBGYW1pbHk9MHg2 ICBNb2RlbD0weDNmICBTdGVwcGluZz0yCiAgRmVhdHVyZXM9MHhmODNmYmZmPEZQVSxWTUUs REUsUFNFLFRTQyxNU1IsUEFFLE1DRSxDWDgsQVBJQyxTRVAsTVRSUixQR0UsTUNBLENNT1Ys UEFULFBTRTM2LE1NWCxGWFNSLFNTRSxTU0UyLFNTPgogIEZlYXR1cmVzMj0weGZmZmEzMjAz PFNTRTMsUENMTVVMUURRLFNTU0UzLEZNQSxDWDE2LFBDSUQsU1NFNC4xLFNTRTQuMix4MkFQ SUMsTU9WQkUsUE9QQ05ULFRTQ0RMVCxBRVNOSSxYU0FWRSxPU1hTQVZFLEFWWCxGMTZDLFJE UkFORCxIVj4KICBBTUQgRmVhdHVyZXM9MHgyYzEwMDgwMDxTWVNDQUxMLE5YLFBhZ2UxR0Is UkRUU0NQLExNPgogIEFNRCBGZWF0dXJlczI9MHgyMTxMQUhGLEFCTT4KICBTdHJ1Y3R1cmVk IEV4dGVuZGVkIEZlYXR1cmVzPTB4N2FiPEZTR1NCQVNFLFRTQ0FESixCTUkxLEFWWDIsU01F UCxCTUkyLEVSTVMsSU5WUENJRD4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMj0w eDQ8VU1JUD4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMz0weGFjMDAwNDAwPE1E X0NMRUFSLElCUEIsU1RJQlAsQVJDSF9DQVAsU1NCRD4KICBYU0FWRSBGZWF0dXJlcz0weDE8 WFNBVkVPUFQ+CiAgSUEzMl9BUkNIX0NBUFM9MHg0ODxTS0lQX0wxREZMX1ZNRT4KICBBTUQg RXh0ZW5kZWQgRmVhdHVyZSBFeHRlbnNpb25zIElEIEVCWD0weDEwMGQwMDA8SUJQQixJQlJT LFNUSUJQLFNTQkQ+Ckh5cGVydmlzb3I6IE9yaWdpbiA9ICJLVk1LVk1LVk0iCnJlYWwgbWVt b3J5ICA9IDUxNTM5NjA3NTUyICg0OTE1MiBNQikKYXZhaWwgbWVtb3J5ID0gNTAwNjc4MDAw NjQgKDQ3NzQ4IE1CKQpFdmVudCB0aW1lciAiTEFQSUMiIHF1YWxpdHkgNjAwCkFDUEkgQVBJ QyBUYWJsZTogPEJPQ0hTICBCWFBDICAgID4KRnJlZUJTRC9TTVA6IE11bHRpcHJvY2Vzc29y IFN5c3RlbSBEZXRlY3RlZDogMTIgQ1BVcwpGcmVlQlNEL1NNUDogMTIgcGFja2FnZShzKSB4 IDEgY29yZShzKQpyYW5kb206IHJlZ2lzdGVyaW5nIGZhc3Qgc291cmNlIEludGVsIFNlY3Vy ZSBLZXkgUk5HCnJhbmRvbTogZmFzdCBwcm92aWRlcjogIkludGVsIFNlY3VyZSBLZXkgUk5H IgpyYW5kb206IHVuYmxvY2tpbmcgZGV2aWNlLgppb2FwaWMwIDxWZXJzaW9uIDEuMT4gaXJx cyAwLTIzCkxhdW5jaGluZyBBUHM6IDQgNyA1IDggMTAgMTEgMiAxIDYgMyA5CnJhbmRvbTog ZW50cm9weSBkZXZpY2UgZXh0ZXJuYWwgaW50ZXJmYWNlCmtiZDEgYXQga2JkbXV4MAp2dHZn YTA6IDxWVCBWR0EgZHJpdmVyPgprdm1jbG9jazA6IDxLVk0gcGFyYXZpcnR1YWwgY2xvY2s+ ClRpbWVjb3VudGVyICJrdm1jbG9jayIgZnJlcXVlbmN5IDEwMDAwMDAwMDAgSHogcXVhbGl0 eSA5NzUKa3ZtY2xvY2swOiByZWdpc3RlcmVkIGFzIGEgdGltZS1vZi1kYXkgY2xvY2ssIHJl c29sdXRpb24gMC4wMDAwMDFzCnNtYmlvczA6IDxTeXN0ZW0gTWFuYWdlbWVudCBCSU9TPiBh dCBpb21lbSAweGY1YTUwLTB4ZjVhNmUKc21iaW9zMDogVmVyc2lvbjogMi44LCBCQ0QgUmV2 aXNpb246IDIuOAphZXNuaTA6IDxBRVMtQ0JDLEFFUy1DQ00sQUVTLUdDTSxBRVMtSUNNLEFF Uy1YVFM+CmFjcGkwOiA8Qk9DSFMgQlhQQz4KYWNwaTA6IFBvd2VyIEJ1dHRvbiAoZml4ZWQp CmNwdTA6IDxBQ1BJIENQVT4gb24gYWNwaTAKYXRydGMwOiA8QVQgcmVhbHRpbWUgY2xvY2s+ IHBvcnQgMHg3MC0weDc3IGlycSA4IG9uIGFjcGkwCmF0cnRjMDogcmVnaXN0ZXJlZCBhcyBh IHRpbWUtb2YtZGF5IGNsb2NrLCByZXNvbHV0aW9uIDEuMDAwMDAwcwpFdmVudCB0aW1lciAi UlRDIiBmcmVxdWVuY3kgMzI3NjggSHogcXVhbGl0eSAwClRpbWVjb3VudGVyICJBQ1BJLWZh c3QiIGZyZXF1ZW5jeSAzNTc5NTQ1IEh6IHF1YWxpdHkgOTAwCmFjcGlfdGltZXIwOiA8MjQt Yml0IHRpbWVyIGF0IDMuNTc5NTQ1TUh6PiBwb3J0IDB4NjA4LTB4NjBiIG9uIGFjcGkwCnBj aWIwOiA8QUNQSSBIb3N0LVBDSSBicmlkZ2U+IHBvcnQgMHhjZjgtMHhjZmYgb24gYWNwaTAK cGNpMDogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjAKdmdhcGNpMDogPFZHQS1jb21wYXRpYmxl IGRpc3BsYXk+IHBvcnQgMHhkMDQwLTB4ZDA1ZiBtZW0gMHhmNDAwMDAwMC0weGY3ZmZmZmZm LDB4ZjgwMDAwMDAtMHhmYmZmZmZmZiwweGZkMjEwMDAwLTB4ZmQyMTFmZmYgaXJxIDIxIGF0 IGRldmljZSAxLjAgb24gcGNpMAp2Z2FwY2kwOiBCb290IHZpZGVvIGRldmljZQpwY2liMTog PEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEyMDAwLTB4ZmQyMTJmZmYgaXJxIDIy IGF0IGRldmljZSAyLjAgb24gcGNpMApwY2kxOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMQpw Y2liMjogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZjMjAwMDAwLTB4ZmMyMDAwZmYg aXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpMQpwY2kyOiA8QUNQSSBQQ0kgYnVzPiBvbiBw Y2liMgpwY2liMzogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEzMDAwLTB4ZmQy MTNmZmYgaXJxIDIyIGF0IGRldmljZSAyLjEgb24gcGNpMApwY2kzOiA8QUNQSSBQQ0kgYnVz PiBvbiBwY2liMwp2aXJ0aW9fcGNpMDogPFZpcnRJTyBQQ0kgKG1vZGVybikgTmV0d29yayBh ZGFwdGVyPiBtZW0gMHhmZDA0MDAwMC0weGZkMDQwZmZmLDB4ZmU4MDAwMDAtMHhmZTgwM2Zm ZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2kzCnZ0bmV0MDogPFZpcnRJTyBOZXR3b3Jr aW5nIEFkYXB0ZXI+IG9uIHZpcnRpb19wY2kwCnZ0bmV0MDogRXRoZXJuZXQgYWRkcmVzczog NTI6NTQ6NTg6OTM6Yzc6ZWYKdnRuZXQwOiBuZXRtYXAgcXVldWVzL3Nsb3RzOiBUWCAxLzI1 NiwgUlggMS8xMjgKMDAwLjAwMDA3NyBbIDQ1Ml0gdnRuZXRfbmV0bWFwX2F0dGFjaCAgICAg ICB2dG5ldCBhdHRhY2hlZCB0eHE9MSwgdHhkPTI1NiByeHE9MSwgcnhkPTEyOApwY2liNDog PEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE0MDAwLTB4ZmQyMTRmZmYgaXJxIDIy IGF0IGRldmljZSAyLjIgb24gcGNpMApwY2k0OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNAp4 aGNpMDogPFhIQ0kgKGdlbmVyaWMpIFVTQiAzLjAgY29udHJvbGxlcj4gbWVtIDB4ZmNlMDAw MDAtMHhmY2UwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2k0CnhoY2kwOiAzMiBi eXRlcyBjb250ZXh0IHNpemUsIDY0LWJpdCBETUEKdXNidXMwIG9uIHhoY2kwCnVzYnVzMDog NS4wR2JwcyBTdXBlciBTcGVlZCBVU0IgdjMuMApwY2liNTogPEFDUEkgUENJLVBDSSBicmlk Z2U+IG1lbSAweGZkMjE1MDAwLTB4ZmQyMTVmZmYgaXJxIDIyIGF0IGRldmljZSAyLjMgb24g cGNpMApwY2k1OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNQp2aXJ0aW9fcGNpMTogPFZpcnRJ TyBQQ0kgKG1vZGVybikgU0NTSSBhZGFwdGVyPiBtZW0gMHhmY2MwMDAwMC0weGZjYzAwZmZm LDB4ZmU0MDAwMDAtMHhmZTQwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2k1CnZ0 c2NzaTA6IDxWaXJ0SU8gU0NTSSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMQpwY2liNjogPEFD UEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE2MDAwLTB4ZmQyMTZmZmYgaXJxIDIyIGF0 IGRldmljZSAyLjQgb24gcGNpMApwY2k2OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNgp2aXJ0 aW9fcGNpMjogPFZpcnRJTyBQQ0kgKG1vZGVybikgQ29uc29sZSBhZGFwdGVyPiBtZW0gMHhm Y2EwMDAwMC0weGZjYTAwZmZmLDB4ZmUyMDAwMDAtMHhmZTIwM2ZmZiBpcnEgMjIgYXQgZGV2 aWNlIDAuMCBvbiBwY2k2CnBjaWI3OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQy MTcwMDAtMHhmZDIxN2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNSBvbiBwY2kwCnBjaTc6IDxB Q1BJIFBDSSBidXM+IG9uIHBjaWI3CnZpcnRpb19wY2kzOiA8VmlydElPIFBDSSAobW9kZXJu KSBCYWxsb29uIGFkYXB0ZXI+IG1lbSAweGZlMDAwMDAwLTB4ZmUwMDNmZmYgaXJxIDIyIGF0 IGRldmljZSAwLjAgb24gcGNpNwp2dGJhbGxvb24wOiA8VmlydElPIEJhbGxvb24gQWRhcHRl cj4gb24gdmlydGlvX3BjaTMKcGNpYjg6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhm ZDIxODAwMC0weGZkMjE4ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi42IG9uIHBjaTAKcGNpODog PEFDUEkgUENJIGJ1cz4gb24gcGNpYjgKdmlydGlvX3BjaTQ6IDxWaXJ0SU8gUENJIChtb2Rl cm4pIEVudHJvcHkgYWRhcHRlcj4gbWVtIDB4ZmRlMDAwMDAtMHhmZGUwM2ZmZiBpcnEgMjIg YXQgZGV2aWNlIDAuMCBvbiBwY2k4CnBjaWI5OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVt IDB4ZmQyMTkwMDAtMHhmZDIxOWZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNyBvbiBwY2kwCnBj aTk6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWI5CmlzYWIwOiA8UENJLUlTQSBicmlkZ2U+IGF0 IGRldmljZSAzMS4wIG9uIHBjaTAKaXNhMDogPElTQSBidXM+IG9uIGlzYWIwCmFoY2kwOiA8 SW50ZWwgSUNIOSBBSENJIFNBVEEgY29udHJvbGxlcj4gcG9ydCAweGQwNjAtMHhkMDdmIG1l bSAweGZkMjFhMDAwLTB4ZmQyMWFmZmYgaXJxIDE2IGF0IGRldmljZSAzMS4yIG9uIHBjaTAK YWhjaTA6IEFIQ0kgdjEuMDAgd2l0aCA2IDEuNUdicHMgcG9ydHMsIFBvcnQgTXVsdGlwbGll ciBub3Qgc3VwcG9ydGVkCmFoY2ljaDA6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMCBv biBhaGNpMAphaGNpY2gxOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDEgb24gYWhjaTAK YWhjaWNoMjogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAyIG9uIGFoY2kwCmFoY2ljaDM6 IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMyBvbiBhaGNpMAphaGNpY2g0OiA8QUhDSSBj aGFubmVsPiBhdCBjaGFubmVsIDQgb24gYWhjaTAKYWhjaWNoNTogPEFIQ0kgY2hhbm5lbD4g YXQgY2hhbm5lbCA1IG9uIGFoY2kwCmFjcGlfc3lzY29udGFpbmVyMDogPFN5c3RlbSBDb250 YWluZXI+IG9uIGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMTogPFN5c3RlbSBDb250YWluZXI+ IHBvcnQgMHhjZDgtMHhjZTMgb24gYWNwaTAKYWNwaV9zeXNjb250YWluZXIyOiA8U3lzdGVt IENvbnRhaW5lcj4gcG9ydCAweDYyMC0weDYyZiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5l cjM6IDxTeXN0ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2MwLTB4Y2Q3IG9uIGFjcGkwCnVhcnQw OiA8MTY1NTAgb3IgY29tcGF0aWJsZT4gcG9ydCAweDNmOC0weDNmZiBpcnEgNCBmbGFncyAw eDEwIG9uIGFjcGkwCmF0a2JkYzA6IDxLZXlib2FyZCBjb250cm9sbGVyIChpODA0Mik+IHBv cnQgMHg2MCwweDY0IGlycSAxIG9uIGFjcGkwCmF0a2JkMDogPEFUIEtleWJvYXJkPiBpcnEg MSBvbiBhdGtiZGMwCmtiZDAgYXQgYXRrYmQwCmF0a2JkMDogW0dJQU5ULUxPQ0tFRF0KcHNt MDogPFBTLzIgTW91c2U+IGlycSAxMiBvbiBhdGtiZGMwCnBzbTA6IFtHSUFOVC1MT0NLRURd CldBUk5JTkc6IERldmljZSAicHNtIiBpcyBHaWFudCBsb2NrZWQgYW5kIG1heSBiZSBkZWxl dGVkIGJlZm9yZSBGcmVlQlNEIDE1LjAuCnBzbTA6IG1vZGVsIEludGVsbGlNb3VzZSBFeHBs b3JlciwgZGV2aWNlIElEIDQKb3JtMDogPElTQSBPcHRpb24gUk9NPiBhdCBpb21lbSAweGU5 MDAwLTB4ZWZmZmYgcG5waWQgT1JNMDAwMCBvbiBpc2EwCnZnYTA6IDxHZW5lcmljIElTQSBW R0E+IGF0IHBvcnQgMHgzYzAtMHgzZGYgaW9tZW0gMHhhMDAwMC0weGJmZmZmIHBucGlkIFBO UDA5MDAgb24gaXNhMAphdHRpbWVyMDogPEFUIHRpbWVyPiBhdCBwb3J0IDB4NDAgb24gaXNh MApUaW1lY291bnRlciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxpdHkgMApF dmVudCB0aW1lciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxpdHkgMTAwClRp bWVjb3VudGVycyB0aWNrIGV2ZXJ5IDEwLjAwMCBtc2VjCnVnZW4wLjE6IDwoMHgxYjM2KSBY SENJIHJvb3QgSFVCPiBhdCB1c2J1czAKdWh1YjAgb24gdXNidXMwCnVodWIwOiA8KDB4MWIz NikgWEhDSSByb290IEhVQiwgY2xhc3MgOS8wLCByZXYgMy4wMC8xLjAwLCBhZGRyIDE+IG9u IHVzYnVzMApaRlMgZmlsZXN5c3RlbSB2ZXJzaW9uOiA1ClpGUyBzdG9yYWdlIHBvb2wgdmVy c2lvbjogZmVhdHVyZXMgc3VwcG9ydCAoNTAwMCkKVHJ5aW5nIHRvIG1vdW50IHJvb3QgZnJv bSB6ZnM6enJvb3QvUk9PVC8yMDI0LTEyLTI2LTE4LTA5IFtdLi4uCmRhMCBhdCB2dHNjc2kw IGJ1cyAwIHNjYnVzMCB0YXJnZXQgMCBsdW4gMApkYTA6IDxRRU1VIFFFTVUgSEFSRERJU0sg Mi41Kz4gRml4ZWQgRGlyZWN0IEFjY2VzcyBTUEMtMyBTQ1NJIGRldmljZQpkYTA6IDMwMC4w MDBNQi9zIHRyYW5zZmVycwpkYTA6IENvbW1hbmQgUXVldWVpbmcgZW5hYmxlZApkYTA6IDcz NzI4ME1CICgxNTA5OTQ5NDQwIDUxMiBieXRlIHNlY3RvcnMpClJvb3QgbW91bnQgd2FpdGlu ZyBmb3I6IHVzYnVzMAp1aHViMDogMzAgcG9ydHMgd2l0aCAzMCByZW1vdmFibGUsIHNlbGYg cG93ZXJlZApHRU9NX0VMSTogRGV2aWNlIGRhMHAyLmVsaSBjcmVhdGVkLgpHRU9NX0VMSTog RW5jcnlwdGlvbjogQUVTLVhUUyAxMjgKR0VPTV9FTEk6ICAgICBDcnlwdG86IGFjY2VsZXJh dGVkIHNvZnR3YXJlCmljaHNtYjA6IDxJbnRlbCA4MjgwMUkgKElDSDkpIFNNQnVzIGNvbnRy b2xsZXI+IHBvcnQgMHg3MDAtMHg3M2YgaXJxIDE2IGF0IGRldmljZSAzMS4zIG9uIHBjaTAK c21idXMwOiA8U3lzdGVtIE1hbmFnZW1lbnQgQnVzPiBvbiBpY2hzbWIwCnZ0Y29uMDogPFZp cnRJTyBDb25zb2xlIEFkYXB0ZXI+IG9uIHZpcnRpb19wY2kyCnZ0cm5kMDogPFZpcnRJTyBF bnRyb3B5IEFkYXB0ZXI+IG9uIHZpcnRpb19wY2k0CnJhbmRvbTogcmVnaXN0ZXJpbmcgZmFz dCBzb3VyY2UgVmlydElPIEVudHJvcHkgQWRhcHRlcgpsbzA6IGxpbmsgc3RhdGUgY2hhbmdl ZCB0byBVUAp2dG5ldDA6IGxpbmsgc3RhdGUgY2hhbmdlZCB0byBVUApTZWN1cml0eSBwb2xp Y3kgbG9hZGVkOiBNQUMvbnRwZCAobWFjX250cGQpCg== --------------W0YxwJfHrTrLuFbiP0nKhCQd-- From nobody Fri Dec 27 01:03:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YK6hL3XR6z5hdyy; Fri, 27 Dec 2024 01:04:02 +0000 (UTC) (envelope-from dbaio@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YK6hL2vJxz4YmQ; Fri, 27 Dec 2024 01:04:02 +0000 (UTC) (envelope-from dbaio@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735261442; h=from:from:reply-to:subject: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=M2Q1iDZDrA2dfdjoUlLKoWOJbRdLZqct2N+DPY5djCU=; b=P7rbXbZFQgk042JSss5Vx/odXyPXxeDjpLSEC8uNxz5mWtj5Pv6IdrOuy/2bPLFAXDd41G F/lDwFFgQE1ehXo4pS9jPc4drvFEfQW9SBEkiyWiTePV1aIToKThImwDMix3TWrwKjw14x S8C2d0oHor9fpQzb7QDZu7mEkKnI+Jou4Mt35DEtkSCRfq3TsD3T3512z4fChp9Rd5ymO8 IKb5lQNbM9ph4Z+KUSIenNKaGAO8wTUYOfQ30M4gkAeaBbqhOcmbJSKpDUtsf97NbBPSbe 0wcGZHqwbohxt/mO4crbHBd6ZMOembUmQlPKYxuyt9fwQ5B1HMLiQyiy0DxG4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735261442; h=from:from:reply-to:subject: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=M2Q1iDZDrA2dfdjoUlLKoWOJbRdLZqct2N+DPY5djCU=; b=kk+Wn+ZCuxXsZN3GDm7Req6TgieklLXQxgbTvJoStoMAbwY3G96P2QgWZ6jSFn6GYwU2Yb YYPJgR5Qbtlmv37YD5HAUHGpmHKCarpp0xKH6BzlvU+ycMdArz+VlyDz7vCHu0tgibidl5 TukUHecOeZtQlSaODkNp8v30m8iesdNozeMTNAuLZ+hTT+AfqBo2cMJbx3WrwdyXZGfw9t nzU6U6lyT5UCdgc9jr06s123GXOouvAtskjhmfdGHh+/SDYm7LrHV344Ttaoqs6Yv1ae3S etZCifDGZZTrzYi6NcUbNLXEQIVsmlULWCWhuLr4yRC764Hu64cjy0OSS0Fyhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735261442; a=rsa-sha256; cv=none; b=XCIODfkSpJdnFjaFIoqSTmNs6pLWQLsSlk5PI1isLM2Zf0Qv+YAZUoDSGZrje6Yaq9Rw4b 8UomaK/PVpBSQBiUzZXugu0tm4nd5NJx64ypOfNWu40/d6cfuN0p6OHS0gYcxaSKkN5Atz ozQ2Z09HpVCg6cIGxTalH6iCnhVKJUlohiErxtSalljD6e2jayFZk/lyL8DWpas6O6yPg8 HnYiyBqpzC27AhtBzK0iue7exn8eJsYicta/TqNxhujHLwyv/Fy8J2CzJd4sERxCIDogKm SNxuNEOrRbf7I7GAc+21SeYf+RC4D3/VxbLkN8dOYcxbkoOD4xmJPKOpcyaG9w== Received: from fauth-a1-smtp.messagingengine.com (fauth-a1-smtp.messagingengine.com [103.168.172.200]) (using TLSv1.3 with cipher TLS_AES_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: dbaio/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YK6hL229vzQWc; Fri, 27 Dec 2024 01:04:02 +0000 (UTC) (envelope-from dbaio@freebsd.org) Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfauth.phl.internal (Postfix) with ESMTP id 9A5331200076; Thu, 26 Dec 2024 20:03:59 -0500 (EST) Received: from phl-imap-08 ([10.202.2.84]) by phl-compute-11.internal (MEProxy); Thu, 26 Dec 2024 20:03:59 -0500 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudduledgfedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefoggffhf fvkfgjfhfutgfgsehtjeertdertddtnecuhfhrohhmpedfffgrnhhilhhoucfirdcuuegr ihhofdcuoegusggrihhosefhrhgvvgeuufffrdhorhhgqeenucggtffrrghtthgvrhhnpe ehveefgeeihfekueeikeffvdehgedvuefhleeftdeggfdtvdeileffgfegveehheenucff ohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpegusggrihhoodhmvghsmhhtphgruhhthhhpvghrshho nhgrlhhithihqdduudekudefleduvddtqddvieektddvjeeikedquggsrghioheppehfrh gvvggsshgurdhorhhgsehfrghsthhmrghilhdrtghomhdpnhgspghrtghpthhtohepgedp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepuggvvhdqtghomhhmihhtshdqshhrtg dqrghllhesfhhrvggvsghsugdrohhrghdprhgtphhtthhopeguvghvqdgtohhmmhhithhs qdhsrhgtqdhmrghinhesfhhrvggvsghsugdrohhrghdprhgtphhtthhopehmrghnuhesfh hrvggvsghsugdrohhrghdprhgtphhtthhopehsrhgtqdgtohhmmhhithhtvghrshesfhhr vggvsghsugdrohhrgh X-ME-Proxy: Feedback-ID: i9d2946a4:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id 6F74918A006B; Thu, 26 Dec 2024 20:03:59 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Date: Thu, 26 Dec 2024 22:03:31 -0300 From: "Danilo G. Baio" To: "Emmanuel Vadot" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-Id: <539b19c4-d1e7-4448-8dbb-f4b2f974722e@app.fastmail.com> In-Reply-To: <202412160947.4BG9lG3Z092493@gitrepo.freebsd.org> References: <202412160947.4BG9lG3Z092493@gitrepo.freebsd.org> Subject: Re: git: 94e94d2dddfa - main - UPDATING: Add a notes for iwm(4) firmware and pkgbase users Content-Type: text/plain Content-Transfer-Encoding: 7bit On Mon, Dec 16, 2024, at 06:47, Emmanuel Vadot wrote: > The branch main has been updated by manu: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=94e94d2dddfa43aa0aa3ad8aa3ab6d72363e4bd0 > > commit 94e94d2dddfa43aa0aa3ad8aa3ab6d72363e4bd0 > Author: Emmanuel Vadot > AuthorDate: 2024-12-16 09:46:05 +0000 > Commit: Emmanuel Vadot > CommitDate: 2024-12-16 09:46:05 +0000 > > UPDATING: Add a notes for iwm(4) firmware and pkgbase users > > Sponsored by: Beckhoff Automation GmbH & Co. KG > --- > UPDATING | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/UPDATING b/UPDATING > index 2a67a65a92ed..4fef13073431 100644 > --- a/UPDATING > +++ b/UPDATING > @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: > world, or to merely disable the most expensive debugging functionality > at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > > +20241216: > + The iwm(4) firmwares are no longer compiled as kernel modules but instead > + shipped as raw files. For pkgbase users if you use iwm(4) you will need > + to install the FreeBSD-firmware-iwm package. Hi, I upgraded my dev box today (pkgbase/weekly packages) and got a kernel panic. Then I installed FreeBSD-firmware-iwm, but still got a panic. To get it working again, I had to comment out these entries from the /boot/loader.conf: if_iwm_load="YES" iwm8265fw_load="YES" Now it's booting; the device works, but I don't know how. =) -- Danilo G. Baio From nobody Fri Dec 27 06:26:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKFr870vfz5jGrT; Fri, 27 Dec 2024 06:26: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKFr86Bv8z4y3y; Fri, 27 Dec 2024 06:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735280776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eWmAl1epSQao/6c5FXUB+fQVKg1FRGpD3zhGF0cAOFc=; b=TlpnNe/vSEKruiWTSkzurPjRBTpIuET0WHH9PTWAuW4ARHyws7dX0LQf5GiCDQt83ujeYJ ZvkVhng3Ib0pzikFJt6ZXk+v0xqQcBFCMtXcvznE5DP4WeHQ6VpIRej5rO6WrnCn8Z+P6O cYKlxyYkvuePyQzf2oQJ3FTRyh5ByOJ7IN7lI1K/NPYtg8czpQTfSIAbFh7mETG7zquYAS j+o8m3y9YA7aGNf7PK1KAaC+ynaOGWld76xrh6UNl9GZTr5P2NPcNMLXxUUtyqGIdywyt9 CzRaX6xSDdyib9v3GRY612MkXPh5NIWNRoP/wyUgADku46F7ptLZp3RCrkoyVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735280776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eWmAl1epSQao/6c5FXUB+fQVKg1FRGpD3zhGF0cAOFc=; b=OPmPnrahXm+kx9AM3bLHi4VcwG4K3kT34M+7WPEHq1FBMuKFbzP9vF6fvu5eeB9butjeku 5OespSYr5q+vo4juNGNPAF7ZBtqC6B9etq4t7vmQbMG1JTfhVho0RLuy6jq37+S7RTpeJV DvlLph6zuHI9oJs40lHTD7jY+eSy3tZclhnAa9tJSNSLsvAlgjFe7yuJMFbkbq/Je7u5RJ zTvoBkfmqqZJef6cW0f0Ejvqg4F67/6lMjDXT6P6xiTQGIVgak1vyCMIUW8riJs7oiPucp rG10RkjnbwDGPEVQvk02QbWyNsaQVa70jmzr1bCrGqiCSjI7XRsYyXzKL8YKiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735280776; a=rsa-sha256; cv=none; b=ClXgvQF9TaCzcQ089TexDRaBe/UDhzJgLaq7fvUMs0nirst2jf3bdp+0YRAnsW1lzPpYDM +Y+XREWLgNoVND6DtQiMNCFZPbUMvk/bc+5hLKbQUajYi/Xt1E0mpq9H+Ezc4kH/ZdZkFO tqvwfIB9o01l3Xe8O3ySKkl5z2dZsYQD3fcwALnOU0Sb17DFGo/z+kRli+gtWxEG9NZxqW 184nK+I/8Yg+zlI1YknkJ/0MpEKujKJgGSNVAqeDO2cLX9/1wzICBHWW5pvxYThxcF2sUw 4DSZYtfeLsw1rnDb6hQtFKXyuR0iahOda30KR8l7/owjopvjx6BTWRckH1eIuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKFr85h5yzRtV; Fri, 27 Dec 2024 06:26: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 4BR6QGGR040078; Fri, 27 Dec 2024 06:26:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BR6QGPW040075; Fri, 27 Dec 2024 06:26:16 GMT (envelope-from git) Date: Fri, 27 Dec 2024 06:26:16 GMT Message-Id: <202412270626.4BR6QGPW040075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 57d12ea5c9b0 - stable/14 - nullfs: stop lying about mount flags in statfs(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 57d12ea5c9b07a6407e3518aeb2383f29be727d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=57d12ea5c9b07a6407e3518aeb2383f29be727d2 commit 57d12ea5c9b07a6407e3518aeb2383f29be727d2 Author: Konstantin Belousov AuthorDate: 2024-12-19 22:14:20 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-27 06:24:55 +0000 nullfs: stop lying about mount flags in statfs(2) PR: 283425 (cherry picked from commit 709989bab5d060763bb8fd8e75d33f8bd1d454ad) --- sys/fs/nullfs/null_vfsops.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 35d0f46d0ef7..8d980932623d 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -369,12 +369,7 @@ nullfs_statfs(struct mount *mp, struct statfs *sbp) return (error); } - /* now copy across the "interesting" information and fake the rest */ sbp->f_type = mstat->f_type; - sbp->f_flags &= MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | MNT_UNION | - MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_EXPORTED | MNT_IGNORE; - mstat->f_flags &= ~(MNT_ROOTFS | MNT_AUTOMOUNTED | MNT_EXPORTED); - sbp->f_flags |= mstat->f_flags; sbp->f_bsize = mstat->f_bsize; sbp->f_iosize = mstat->f_iosize; sbp->f_blocks = mstat->f_blocks; From nobody Fri Dec 27 08:59:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKKDg61GHz5jRym; Fri, 27 Dec 2024 08:59:15 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKKDg1MtNz3yty; Fri, 27 Dec 2024 08:59:15 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1735289953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ssji6xQ93516F76hOeGVgwxLBqXMYbPjfquoJlj3+oc=; b=Gb6EJG/6JrdoWOBGq9KzOS1oMH6xrzoqQHlJIApsC7e09wXWIk1NnVYFHAp2ViIuVopy5W ZJxldUEnLniC9qUFwLyG5YAdlSOSIj0QaYTBJBDs63AeT6pFn/gBIOBBwyG5JlyecBxm9i jadui4UmcD2BsEA8JNXH9xBPN0ZENHA= Received: from skull.home.blih.net (arennes-299-1-68-49.w92-159.abo.wanadoo.fr [92.159.163.49]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 112a0639 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 27 Dec 2024 08:59:13 +0000 (UTC) Date: Fri, 27 Dec 2024 09:59:13 +0100 From: Emmanuel Vadot To: "Danilo G. Baio" Cc: "Emmanuel Vadot" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 94e94d2dddfa - main - UPDATING: Add a notes for iwm(4) firmware and pkgbase users Message-Id: <20241227095913.cb0abf57b49986790134f8da@bidouilliste.com> In-Reply-To: <539b19c4-d1e7-4448-8dbb-f4b2f974722e@app.fastmail.com> References: <202412160947.4BG9lG3Z092493@gitrepo.freebsd.org> <539b19c4-d1e7-4448-8dbb-f4b2f974722e@app.fastmail.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR] X-Rspamd-Queue-Id: 4YKKDg1MtNz3yty X-Spamd-Bar: ---- On Thu, 26 Dec 2024 22:03:31 -0300 "Danilo G. Baio" wrote: > > > On Mon, Dec 16, 2024, at 06:47, Emmanuel Vadot wrote: > > The branch main has been updated by manu: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=94e94d2dddfa43aa0aa3ad8aa3ab6d72363e4bd0 > > > > commit 94e94d2dddfa43aa0aa3ad8aa3ab6d72363e4bd0 > > Author: Emmanuel Vadot > > AuthorDate: 2024-12-16 09:46:05 +0000 > > Commit: Emmanuel Vadot > > CommitDate: 2024-12-16 09:46:05 +0000 > > > > UPDATING: Add a notes for iwm(4) firmware and pkgbase users > > > > Sponsored by: Beckhoff Automation GmbH & Co. KG > > --- > > UPDATING | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/UPDATING b/UPDATING > > index 2a67a65a92ed..4fef13073431 100644 > > --- a/UPDATING > > +++ b/UPDATING > > @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: > > world, or to merely disable the most expensive debugging functionality > > at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > > > > +20241216: > > + The iwm(4) firmwares are no longer compiled as kernel modules but instead > > + shipped as raw files. For pkgbase users if you use iwm(4) you will need > > + to install the FreeBSD-firmware-iwm package. > > Hi, > > I upgraded my dev box today (pkgbase/weekly packages) and got a kernel panic. > > Then I installed FreeBSD-firmware-iwm, but still got a panic. > > To get it working again, I had to comment out these entries from the /boot/loader.conf: > > if_iwm_load="YES" > iwm8265fw_load="YES" > > Now it's booting; the device works, but I don't know how. =) > > -- > Danilo G. Baio Hi Danilo, You got a panic because loader doesn't know that iwm8265fw is a raw firmware and not a kernel module anymore, and it's working after removing those lines because now iwm is loaded via devmatch and the firmware is correctly loaded. https://reviews.freebsd.org/D48211 is addressing this so users who loads iwm from loader(8) can still do it (even if I don't understand why anyone wants to do this). Cheers, -- Emmanuel Vadot From nobody Fri Dec 27 11:22:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKNQl5HTNz5jc92; Fri, 27 Dec 2024 11:23:11 +0000 (UTC) (envelope-from dbaio@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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKNQl4Wzlz4D9q; Fri, 27 Dec 2024 11:23:11 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735298591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eBimwIWMMURGRIKUyCUC+AccBhkpggmU4Xrv0OlMlwg=; b=AJ1qWisP8aU057VR32Jv88oz5FulB2yuK98FviM3QUqhOeeEm8JIBDLJXEyx4wM8CZ4/O2 4agAQXB0bjvfXtg34nZxpl/icjMg8tg4OuWZ2Qy2UYMOy3bLYWrxX1NEXlOFN21yG6D/LM oBH/duRMmOolLyL3yHTPoDRpC28oWmuEoDJrVUyFf1xfdPtzhQVzZSoQ6Zs51H8zKR1cPF LMiwaWJtILC0tdORGdVFvoXdjQq7wrbl2EM9jTQGooA+g8SXARwjwYVOkvmNqmlOvwDpVa JlH/Uzwvp2eAFh/59yljIX0qMFuvo5b8CSjKJClJFsQUM0PgjLwUBzkq1lnq3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735298591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eBimwIWMMURGRIKUyCUC+AccBhkpggmU4Xrv0OlMlwg=; b=JS/JnemrP1g33+oVT11OAR5TQjGw8fOPZPjbtypdZ16QOv6ZimacbAfopTsi3pwFTYFGpV uy/RryXXhIZNhU4ZCC1eZVZrd+k7vPraRZEO4bOvfpC/LzRWL7NBfeG4+4Yp8SnpzdHbIo usodeIA8FEZyfL83P56xtGjs9W4vcVBUZDd6Ktf2cD3w8KgF/E7gM3PPPsKGzUbOWqRHU0 an7BWORCVa5Cm46k9/cC3KRddEfhvAoE4Ht4IeWhbQauGsOEf08c2fPHzun2PilAkRo0dk ky/HjR5zyjgSEcH35lYw6axCbsfNsSy6m5zErjTCoGEQFiEOauqxlX4QK2sAfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735298591; a=rsa-sha256; cv=none; b=Pk04kNspe+Inu84Cx4Cz9pIOyY50c4cWjfDSS7me5Ci7WHrRiOILrs2uFzN1v5PJYXK/fm BIxO57PFtjmxFjZ+FYonrQm3rfdEIZhsfO0M/7cp1PLN/Pu8H+6fFIxFY++Duw23pX43Qz Z7e1EMfeq7dvieK0nqwkKIL1FBwAbFL39apGP+T6nDu7Z5hxFJvy6tK/gn5Gb/mLUDwOws wow0bLpnS/JJ1fW969qJ9oxNkhdNk+o395P6U2K74zan8LsrDtlaKBoNPUlaZyUPGj3W6K 8f83ScdPBW1zRvu5qiBUZ2bDeKbb/il59so3zvY7GaZFfo374jQY398sH3yeKw== Received: from fauth-a2-smtp.messagingengine.com (fauth-a2-smtp.messagingengine.com [103.168.172.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: dbaio/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YKNQl3TPgzdsk; Fri, 27 Dec 2024 11:23:11 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfauth.phl.internal (Postfix) with ESMTP id EA27F1200076; Fri, 27 Dec 2024 06:23:10 -0500 (EST) Received: from phl-imap-08 ([10.202.2.84]) by phl-compute-11.internal (MEProxy); Fri, 27 Dec 2024 06:23:10 -0500 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddruddvtddgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefoggffhf fvvefkjghfufgtgfesthejredtredttdenucfhrhhomhepfdffrghnihhlohcuifdruceu rghiohdfuceouggsrghioheshfhrvggvuefuffdrohhrgheqnecuggftrfgrthhtvghrnh epveetgeffkefhiedtleehjeekueeviedufffgvdeiveefveehuedutdfgtdduteevnecu ffhomhgrihhnpehfrhgvvggsshgurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepuggsrghiohdomhgvshhmthhprghuthhhphgvrhhs ohhnrghlihhthidquddukedufeeluddvtddqvdeikedtvdejieekqdgusggrihhopeephf hrvggvuefuffdrohhrghesfhgrshhtmhgrihhlrdgtohhmpdhnsggprhgtphhtthhopeeh pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehmrghnuhessghiughouhhilhhlih hsthgvrdgtohhmpdhrtghpthhtohepuggvvhdqtghomhhmihhtshdqshhrtgdqrghllhes fhhrvggvsghsugdrohhrghdprhgtphhtthhopeguvghvqdgtohhmmhhithhsqdhsrhgtqd hmrghinhesfhhrvggvsghsugdrohhrghdprhgtphhtthhopehmrghnuhesfhhrvggvsghs ugdrohhrghdprhgtphhtthhopehsrhgtqdgtohhmmhhithhtvghrshesfhhrvggvsghsug drohhrgh X-ME-Proxy: Feedback-ID: i9d2946a4:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id C211B18A0068; Fri, 27 Dec 2024 06:23:10 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Date: Fri, 27 Dec 2024 08:22:49 -0300 From: "Danilo G. Baio" To: "Emmanuel Vadot" Cc: "Emmanuel Vadot" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-Id: In-Reply-To: <20241227095913.cb0abf57b49986790134f8da@bidouilliste.com> References: <202412160947.4BG9lG3Z092493@gitrepo.freebsd.org> <539b19c4-d1e7-4448-8dbb-f4b2f974722e@app.fastmail.com> <20241227095913.cb0abf57b49986790134f8da@bidouilliste.com> Subject: Re: git: 94e94d2dddfa - main - UPDATING: Add a notes for iwm(4) firmware and pkgbase users Content-Type: text/plain Content-Transfer-Encoding: 7bit On Fri, Dec 27, 2024, at 05:59, Emmanuel Vadot wrote: > On Thu, 26 Dec 2024 22:03:31 -0300 > "Danilo G. Baio" wrote: > >> >> >> On Mon, Dec 16, 2024, at 06:47, Emmanuel Vadot wrote: >> > The branch main has been updated by manu: >> > >> > URL: >> > https://cgit.FreeBSD.org/src/commit/?id=94e94d2dddfa43aa0aa3ad8aa3ab6d72363e4bd0 >> > >> > commit 94e94d2dddfa43aa0aa3ad8aa3ab6d72363e4bd0 >> > Author: Emmanuel Vadot >> > AuthorDate: 2024-12-16 09:46:05 +0000 >> > Commit: Emmanuel Vadot >> > CommitDate: 2024-12-16 09:46:05 +0000 >> > >> > UPDATING: Add a notes for iwm(4) firmware and pkgbase users >> > >> > Sponsored by: Beckhoff Automation GmbH & Co. KG >> > --- >> > UPDATING | 5 +++++ >> > 1 file changed, 5 insertions(+) >> > >> > diff --git a/UPDATING b/UPDATING >> > index 2a67a65a92ed..4fef13073431 100644 >> > --- a/UPDATING >> > +++ b/UPDATING >> > @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: >> > world, or to merely disable the most expensive debugging functionality >> > at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) >> > >> > +20241216: >> > + The iwm(4) firmwares are no longer compiled as kernel modules but instead >> > + shipped as raw files. For pkgbase users if you use iwm(4) you will need >> > + to install the FreeBSD-firmware-iwm package. >> >> Hi, >> >> I upgraded my dev box today (pkgbase/weekly packages) and got a kernel panic. >> >> Then I installed FreeBSD-firmware-iwm, but still got a panic. >> >> To get it working again, I had to comment out these entries from the /boot/loader.conf: >> >> if_iwm_load="YES" >> iwm8265fw_load="YES" >> >> Now it's booting; the device works, but I don't know how. =) >> >> -- >> Danilo G. Baio > > Hi Danilo, > > You got a panic because loader doesn't know that iwm8265fw is a raw > firmware and not a kernel module anymore, and it's working after > removing those lines because now iwm is loaded via devmatch and the > firmware is correctly loaded. > https://reviews.freebsd.org/D48211 is addressing this so users who > loads iwm from loader(8) can still do it (even if I don't understand > why anyone wants to do this). > > Cheers, Awesome, thanks for the explanation and for working on this Regards, -- Danilo G. Baio From nobody Fri Dec 27 14:41:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKSqk5qPwz5hcPZ; Fri, 27 Dec 2024 14:41:38 +0000 (UTC) (envelope-from avg@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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKSqk5KF1z4fGs; Fri, 27 Dec 2024 14:41:38 +0000 (UTC) (envelope-from avg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735310498; h=from:from:reply-to:subject: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:autocrypt:autocrypt; bh=i/x17kdCE7YLtryqGGLueKds92oAmmS1hkA3luaTiOQ=; b=YTazIy7zVx7oul2+K0Q86AHOwb76wU5jlXPtC92o7T0Oons45u/KLzc8FqmjFZKjWt01tp qTnU6JA4ZhR2yBN8YrbpL7xRMu+Ju0umTOmY0uGWKRSv80zwlMUSbLEvOmfmZX2Nn2Z8Ao U5+Hg8vBWt9aone7cSX9WOUOHL8GXm/bt1gjXC6b4d+ky7dIBvdbN4jqATfKsLED5r+Bai HUX3jY5p+YP5zQolXtDAR7eGBkMp+nT2yW5/vZDjfRx/JYpoRfD95Qa0XOG8FsDBOfXm6e QACCrvD5owef4Dfv0Ak6vJjxu/yfdfTfqbnXWCj21lvwrSiMorHeKCSwt32zzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735310498; h=from:from:reply-to:subject: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:autocrypt:autocrypt; bh=i/x17kdCE7YLtryqGGLueKds92oAmmS1hkA3luaTiOQ=; b=n+QYZlhS/2HGPLPFAGAUx9IY5dKZOcpKJLubvHJ4++pRnMB5R25EiSGrK/BjoE+InbV/Rx FTImzWDw9tsAmE0vBZ8SKCu0aEyKyYVIHJsAOwOYZOG6DrZp99mtFaTQj65mcrOQ+4WNeg HFUHro9ILs3J514CMj8MOIbL8rZWr40iQVkj2AyEKbfBwbxf3rBG8c2SgQmAoiOD2KVs1y deT4RCfiEaMzlsP+35KqaLaDet8tdoRKU5xmZCgpyxr5k5XSD/FKeWLkgFrS7/xgnKEX7Z YRR3WwXxkXSk/NozcipdiL6xWdxBtahVVuiSs/8k04wx2iDbDl5f/pwYqZmwGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735310498; a=rsa-sha256; cv=none; b=fyTNwlFfVUqxhrQT7zvrY5ygNCv0NEIKK6bz1QmVf38IpAf/Xtu3pqWMnOqjWiJmSznerb mT1erFhBQKlSYHgBnckYoe1wv9TJffFOQiQzWcrZgwuma9oiFS8yPOyNf2o+5zvGiunXUN /wTxUyB18JXYi12poH+wPc/E7d43YJPC1OB0pg3N5mAyoPjUuMuAIOplH2oxRTp9CF7Xm9 Rg97UQaQ4/g5Ng1ktWRNiZXltjzmT4DgT807pGyMS6cnKfR176R2fGpXr+KDKs+DmPaTrw V2q2O0yiyDJ4P4vyGCFzIE17zfJz4K4yvlqLphmS9T1nJ7n5q8BCe4YALRYBEg== Received: from [192.168.0.88] (unknown [93.188.39.137]) (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: avg/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YKSqk0jFczjWh; Fri, 27 Dec 2024 14:41:37 +0000 (UTC) (envelope-from avg@FreeBSD.org) Message-ID: <14efd79e-75be-4f96-8a04-7ffc9ed1012c@FreeBSD.org> Date: Fri, 27 Dec 2024 16:41:35 +0200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 24ae172a5035 - main - ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. To: Vladimir Kondratyev , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202411062331.4A6NVuiE070018@gitrepo.freebsd.org> Content-Language: en-US From: Andriy Gapon Autocrypt: addr=avg@FreeBSD.org; keydata= xsDNBGcKrHEBDADRvwQOK0b/yo4ys5cs6bOQMhEh4xtfbaZ/CU00cpPgUip3sOZCdrtMWlRC g25z97prxE9pKueZi+HXDhIPpa9xl14ghqF4oYScuJ1i18HyiOH2y5Q3Vv/TtFiSzicd3EAu QgS3jVidpgDSPDdj2Yz3UxYpZ+PuFl6nOnvCvqOFcjUlzKCyPaiN2b86l1Nscmhnc+zQ/faB erUOEFEDQbWMA5YfXi8HrbeR16hfRfGt7E0aMDlIj9FIPIq71UWMN9CimPgs4+rbNr1MAlLa z4GxSDhVYZEY5rqtCzr+PLXboRQWnaUwXl0/biw9enf17NHdYv1SNAFTX2eC4dZ3qBVI74dS PgNprm+PMfz+6Hhs/dAv+Nan5nVhg3EFIjYTiy0MnjMSq8uI0v0ykpAGAcJJ5xl6d23aLxgN 6f0z6pJRCO0hGPgU7UzvFD0MxJxmbzqdT1R51KDan1oD41b+tjl2LMBuCDCoB0U44Pu0zLdp xMfFTxCXtwIYKIUxwd28jwMAEQEAAc0eQW5kcml5IEdhcG9uIDxhdmdARnJlZUJTRC5vcmc+ wsENBBMBCAA3FiEEmXvSmjiQFHPVOpLnzDOt5NLj67sFAmcKrHEFCQeEzgACGwMECwkIBwUV CAkKCwUWAgMBAAAKCRDMM63k0uPru5tSDACFK15LLbq89RSQ6QMnjiIm1t/wYJyumb519MHu Dhzxx1lbr8oghf0RHtF6kYRLQPaW2VdToi74pRobd3CN4bhZKDLSL6WfTn17RfavDjL6Njwp KBo30CkOeYKWq1mDmo0xEoQj8cc7ybEZnus+YScZOpj8Ti4EFwhRt6SHer7YDb161IHKL8m4 MsCxpFSGEjbKj8Iul3Ri/fTOO8w14ivcuEEQIvJt4/+4YV5Az8G23wKzL/3aJ7SOT3oYGmR9 atBTmVO3DlODjM+rZLegd8SfLSPTcBTHspWE5duemIzZbEX3BP77r3Qx4Fo5Tkit3bG1XVar yPQato+sFGFEGifdE9USBQoAoOaaeZevwAWjDU0TIuCT0CUe0sKtQuNP4LRq0n9EEHOXBu9a CfdMhFUSkAZnuE7miSVwgPvoVNJ1stA37EXLN/sVsWik7wslTQ5vF81VpdGFiwoQPOe2XEKh ogcwGSnXbwv1gD4x+Gz/7Y+kFyr1NY+4/nSaeXVcS2fOwM0EZwqscgEMAMQTe6ypAmQe/TFO HqKD2hfFKdksTptKi6uEh8xIwct8G/0FBldDWXo9eu8CGr/ZrDg0/bAwJxbaLRQCMH19Gq2Y hLvZ1QK5GQJVzZKcqfxbF2LiDUTs6WkdOBIhGpdDy7p1xFrvqCGCtNFYHuGYm067EozibBSF BWAPstKu2FQuVHZNMOfs7p3OIz3Yfqu9woXDeg3/8G2qVQJINe+8EwXKlhgh4CyDbq7nAZoA kIu1SE9z9u3WI5mcNy/0dFmVUsFxBqRC3ewbvzie8tKyZ9yFOlaZPT0Y4nRBXQTI3mLZ8zQ8 mtrWK5OOmrJ02kdeO9RBXe+OMaUUWMf92ZIoBFb4HP6N+B+4N1y1OwULousfl7JRoYxA4MRL ls7E2sSoJvrEBTJB3Pc34xu8rsJ1A5V3NgN6djX8yEZYpTRkcmrBeWy/ofDqZPVqneAx0LRm eldDS9msXDW4KXODyPZ+9unvmHAcoH0xaBYaSH44CDZDQDg4LNcmbOvuu1TEXBJhjQARAQAB wsD8BBgBCAAmFiEEmXvSmjiQFHPVOpLnzDOt5NLj67sFAmcKrHMFCQeEzgACGwwACgkQzDOt 5NLj67sUCAv5AXqgWnYN9EblapMbZjkiqL8pZQ0GNqh+Pg9FwbyULxjtRTO6rD4D0IxizByb ef+neeUNyYlagt5nfKMysEr0SU/gHKCi8vyTF/63ukMrGUNGmJJxrndl5ZYKC6j6eX7twrZF L1Uvlmn6FnQ22red5kHO93fDjG4zaDIZvHfwj7kzjZ4tpC7Byinf88s14mdZeScc0PnU2hj4 UGYju/wg2FF4YxaZYhcmdTiRYY0Wx85XSMZv19pnn78sadEuRvfRd4JTmw++j1xGXeqQGWzz /CTG5/Ex9GAkQ02hZbmi236byDXoet4G8TEyOph9QFVkV9bNd0jQZaFZPGEj4PSPUYGAF7s5 xJaNGgctC3aZ7WjEv1FBoo44XCU4xcjJ1wZQUrHxRhx6TW0Jtcl0U9qfKFW30TSPo6RyiXuj X4ltWKAtjoXB8nUmEJckaz7IRu2b4pXDeazZuz5JBygUs10yJjDxh2vFQZo0KaBAPx9MZlPn gpPTjT15L8xGftEjQXF6 In-Reply-To: <202411062331.4A6NVuiE070018@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 07/11/2024 01:31, Vladimir Kondratyev wrote: > The branch main has been updated by wulf: > > URL: https://cgit.FreeBSD.org/src/commit/?id=24ae172a50352ad4fd22989477f29ecca5aed6e3 > > commit 24ae172a50352ad4fd22989477f29ecca5aed6e3 > Author: Vladimir Kondratyev > AuthorDate: 2024-11-06 23:28:11 +0000 > Commit: Vladimir Kondratyev > CommitDate: 2024-11-06 23:28:11 +0000 > > ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. Perhaps this change deserves an UPDATING entry? Today I upgraded only to find out that my bluetooth related things stopped working. It turned out that ng_ubt didn't attach to my USB bluetooth adapter. Only then I discovered this change, installed the firmware package, etc. As strange as it may seem, previously my adapter worked without uploading any extra firmware. Some data points, just in case: idVendor = 0x0b05 idProduct = 0x190e bcdDevice = 0x0200 iManufacturer = 0x0001 iProduct = 0x0002 rtlbt_is_realtek: found USB Realtek rtlbt_dump_version: hci_version 0x0a rtlbt_dump_version: hci_revision 0x000b rtlbt_dump_version: lmp_version 0x0a rtlbt_dump_version: lmp_subversion 0x8761 main: loading firmware /usr/local/share/rtlbt-firmware/rtl8761bu_fw.bin main: loading config /usr/local/share/rtlbt-firmware/rtl8761bu_config.bin main: Firmware download complete rtlbt_dump_version: hci_version 0x0a rtlbt_dump_version: hci_revision 0xdfc6 rtlbt_dump_version: lmp_version 0x0a rtlbt_dump_version: lmp_subversion 0xd922 main: Firmware download is successful! > Attempt to initialize FreeBSD bluetooth stack while such a device is in > bootloader mode locks the adapter hardly so it requires power on/off > cycle to restore. > > This change blocks ng_ubt attachment unless operational firmware is > loaded thus preventing the lock up. > > Sponsored by: Future Crew LLC > MFC after: 1 month > Differential Revision: https://reviews.freebsd.org/D46738 -- Andriy Gapon From nobody Fri Dec 27 17:02:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKWyn1PFSz5j2vh; Fri, 27 Dec 2024 17:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKWyn0qyVz4twm; Fri, 27 Dec 2024 17:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735318977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qgyEAHkEveiJMrGiu2TUjnhu9lpOV7m8GaVXGEPZtzw=; b=AAim15E6Q0phRF8ChXJOhM0shm81ACpdOvAJWCpPi02vo35qC7qxA8nRbJ7AUd+ekyd7sB h8r/xgU+Wj2u1bWI1hFf6zxOplUQfjn9Vin06q3hR+My2rbLyayl6IQ//tWkjL2bUjjWpf pC0hhiK3c8NcuRPUhnOn1PqPf+Q1ed+Dg2RQ4k6bZBl41dea8b05H8jfWm561aTijIGva6 xN3wsA/mlMyzYqG6udYXmW+Y8SNn8aJ+Z86Q3PsRrOFXer5wG0OGOZzOcoKGQmkijjs9KK M5HG29oLSdFbALsOibSeumNI2KodK6/QeYaqJK5PjCtMTMGXbgZ8kkh9IVRdkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735318977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qgyEAHkEveiJMrGiu2TUjnhu9lpOV7m8GaVXGEPZtzw=; b=UjYtmvgIZ2U6pdHU2uMJwnF1V+UKIUJFyOClLCwrRBMAdinmx612hnOPITjLd0NVJMFPkA J9V7F6ufDb2PZR3A1xMeLQhhQUFVOTAdWLlKN8e51cJbqIoisljkwOSPqTKXWDOgsfSD4D w54tCAn2W/xcju5ZjpDsvA4Bt5v48BP2lmy9i9VuRHeiOKA9AvyzSXR6UAHjB88MlJKLWb 7alEYTQeLvmUQugavfrRMzoXOFtEd7ET7rOOrb3U05123xFfEZqIDdqPXbRI5gHwBd5RCc D1zy8bNfj610gmaZcmGVNyrIrBjckMrFQF+YNSueACoKQWdgSm+GXST7A60+qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735318977; a=rsa-sha256; cv=none; b=ogkNdFkVFYUDuWmmRgeGLuxG3s5tYWsnVcKCA/RHaUUx8BfnNhfeeO8DDOqjnMjdF8iU+9 LVRFSyUuOZcKje/TsJiurAsw/eHyBPNCPMlIBoUJlthiS1Eq/KhOAvRPVLiVoQtliYqLr0 BKA2m17J93Hp5A7UuvowwmoYyJECBdjmv0YtaWk/Wk342otiD6T17w6HD/C6Fw5Duhzfaq Bkj4OcgeAydeS6lEr/OOkTKktQTGnYQLrEdwxvaOjD0lKLQVF0Gaoz54RfJJ9QxgMZO3zQ BWXB8bplWn3lEA3gjmgHKqWVI6qZYYpBXaLgbKDYao65OrnVZGWI8jFwplJIRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKWyn0RRgznhR; Fri, 27 Dec 2024 17:02: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 4BRH2u5d035865; Fri, 27 Dec 2024 17:02:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH2ujJ035862; Fri, 27 Dec 2024 17:02:56 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:02:56 GMT Message-Id: <202412271702.4BRH2ujJ035862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6ea1ce222c7c - main - bhnd: Fix a few use after frees when releasing resources List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ea1ce222c7ce2aeae7ecd3558c731cb8c05a37e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6ea1ce222c7ce2aeae7ecd3558c731cb8c05a37e commit 6ea1ce222c7ce2aeae7ecd3558c731cb8c05a37e Author: Gavin Atkinson AuthorDate: 2024-12-27 16:55:05 +0000 Commit: John Baldwin CommitDate: 2024-12-27 16:55:05 +0000 bhnd: Fix a few use after frees when releasing resources The resource list entry needs to be looked up using rman_get_* prior to releasing the resource. Fixes: 9dbf5b0e6876 new-bus: Remove the 'rid' and 'type' arguments from BUS_RELEASE_RESOURCE --- sys/dev/bhnd/bhndb/bhndb.c | 17 +++++++++-------- sys/dev/bhnd/cores/chipc/chipc.c | 6 ++++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/sys/dev/bhnd/bhndb/bhndb.c b/sys/dev/bhnd/bhndb/bhndb.c index eeff088ffdde..511beae0cc25 100644 --- a/sys/dev/bhnd/bhndb/bhndb.c +++ b/sys/dev/bhnd/bhndb/bhndb.c @@ -1037,7 +1037,7 @@ static int bhndb_release_resource(device_t dev, device_t child, struct resource *r) { struct bhndb_softc *sc; - struct resource_list_entry *rle; + struct resource_list_entry *rle = NULL; bool passthrough; int error; @@ -1058,16 +1058,17 @@ bhndb_release_resource(device_t dev, device_t child, struct resource *r) return (error); } + /* Check for resource list entry */ + if (!passthrough) + rle = resource_list_find(BUS_GET_RESOURCE_LIST(dev, child), + rman_get_type(r), rman_get_rid(r)); + if ((error = rman_release_resource(r))) return (error); - if (!passthrough) { - /* Clean resource list entry */ - rle = resource_list_find(BUS_GET_RESOURCE_LIST(dev, child), - rman_get_type(r), rman_get_rid(r)); - if (rle != NULL) - rle->res = NULL; - } + /* Clean resource list entry */ + if (rle != NULL) + rle->res = NULL; return (0); } diff --git a/sys/dev/bhnd/cores/chipc/chipc.c b/sys/dev/bhnd/cores/chipc/chipc.c index 010ebbbd6cb2..09ca4d8884e6 100644 --- a/sys/dev/bhnd/cores/chipc/chipc.c +++ b/sys/dev/bhnd/cores/chipc/chipc.c @@ -893,6 +893,10 @@ chipc_release_resource(device_t dev, device_t child, struct resource *r) if (cr == NULL) return (EINVAL); + /* Cache rle */ + rle = resource_list_find(BUS_GET_RESOURCE_LIST(dev, child), + rman_get_type(r), rman_get_rid(r)); + /* Deactivate resources */ error = bus_generic_rman_release_resource(dev, child, r); if (error != 0) @@ -902,8 +906,6 @@ chipc_release_resource(device_t dev, device_t child, struct resource *r) chipc_release_region(sc, cr, RF_ALLOCATED); /* Clear reference from the resource list entry if exists */ - rle = resource_list_find(BUS_GET_RESOURCE_LIST(dev, child), - rman_get_type(r), rman_get_rid(r)); if (rle != NULL) rle->res = NULL; From nobody Fri Dec 27 17:06:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX2h0dnwz5j3N8; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2g5BCMz4vPM; Fri, 27 Dec 2024 17:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WoDrjISXZF98ftZeGnh/8MdxSTsPDnTwnZYWjoe5z/c=; b=IUeQSsqHI9Q1+5gFi2Fs7BysBtNWgf5l1RM21dPge8vPQbyTn1zs2q6VGOIWm6xF7UC4b9 06gq20oUv5IiMSFnd/adUoEOc8Bp6SwrnQQzUMhuOyVtOMBtUrtYsea3t/5VAA22+UOi2p 96JFlg22KOWKUE0FDA0ujIw5fuK6ErlVAGvHxoHaZIsRBciTSsh9YbKrhsh0Ifp3Jr6t4z ONg/jQZoaQd0ByKTmnsCNKH0KmDsKmxGxNo2FGZPU3Igmm5JE7b7OZGWLSJmoaJbVJpcmO rfpsMY2ubJ4SYWS3VNTPgTk822/6LMDDkVRXgZ7ryKquX/qK0B1X7pvzxnAWTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WoDrjISXZF98ftZeGnh/8MdxSTsPDnTwnZYWjoe5z/c=; b=jRrzsbG5KZuxo5JTuns21UPCzlkDyfS648W8olrtQie3KP+T69GBhP9g1uzGF9xVIM2RIY pzKZhaDlLffL1kaKrV0PKXqeqD7JxKQmKSuoO3GLOvhNBHpahNN1BTh5j5hOcHnLh9nxWV NtxNAcd7dYuJ0zXMDihoQP9nuuvGUMyz9Hwj1lBUmu7af2nsNLuZGFRsD0NL5s1egYH9PG 2R7He6odMOZXWhcebunpBMMANH5DlPs7JiO5/CSa84xOStJs6Z4McbKEnSQ90DNZT6itul CMXUduDe8ezAMQlE3S6ClkYCypnmbtIc9Y0JmtTzE6OuObswd04uTE5uwtndJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319179; a=rsa-sha256; cv=none; b=k21/1NwBGEYB+Tow23yyFUhhJ+wQS2HJjG7W2TUnoSYLg30QPJw7/Vj5CZ5lmYa/DimiyD bAKu0iZYtNtIjq/y7CGcKCuyqsOckdTTVes2aZuSY56RPjUtfqonC5rtuYSm8rR/vm2Wod G7f6TjRRHSB1XmdMOxi1Wyai9VEtOWstxx1kYbV1lZXX/eqQkNLTQP21fza6rN25T4lmHt Pm+Lruveflx+8mwmOq0PguoDFwpDorTXEJsjOtGRnjaKYWd42Q9QdSZMxTg7ri5iFITCck zEZUcHWdMrKcOEDdvh5Zdv6NQQoWT46vwDvHlF/huu0nbUvJ+a8HSsSbQn7WMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX2g4TTkznhb; Fri, 27 Dec 2024 17:06: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 4BRH6Jp8037103; Fri, 27 Dec 2024 17:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6Jvh037100; Fri, 27 Dec 2024 17:06:19 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:19 GMT Message-Id: <202412271706.4BRH6Jvh037100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e34dce0f7be4 - stable/14 - pci_user.c: Cosmetic fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e34dce0f7be4cfb39c369ec1cf1fa6145f02e5ac Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e34dce0f7be4cfb39c369ec1cf1fa6145f02e5ac commit e34dce0f7be4cfb39c369ec1cf1fa6145f02e5ac Author: John Baldwin AuthorDate: 2024-11-13 16:07:03 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:29:23 +0000 pci_user.c: Cosmetic fixes Correct leading whitespace for a few lines. Consistently use more canonical #ifdef to test for COMPAT_FREEBSD32. Obtained from: CheriBSD Sponsored by: AFRL, DARPA (cherry picked from commit 727de621c5f07681034eed2d6ce3662a8239e987) --- sys/dev/pci/pci_user.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c index cdb893efa950..a81044ff3c43 100644 --- a/sys/dev/pci/pci_user.c +++ b/sys/dev/pci/pci_user.c @@ -692,7 +692,7 @@ pci_conf_size(u_long cmd) static void pci_conf_io_init(struct pci_conf_io *cio, caddr_t data, u_long cmd) { -#if defined(COMPAT_FREEBSD32) +#ifdef COMPAT_FREEBSD32 struct pci_conf_io32 *cio32; #endif @@ -709,17 +709,17 @@ pci_conf_io_init(struct pci_conf_io *cio, caddr_t data, u_long cmd) #ifdef PRE7_COMPAT case PCIOCGETCONF_OLD32: #endif - cio32 = (struct pci_conf_io32 *)data; - cio->pat_buf_len = cio32->pat_buf_len; - cio->num_patterns = cio32->num_patterns; - cio->patterns = (void *)(uintptr_t)cio32->patterns; - cio->match_buf_len = cio32->match_buf_len; - cio->num_matches = cio32->num_matches; - cio->matches = (void *)(uintptr_t)cio32->matches; - cio->offset = cio32->offset; - cio->generation = cio32->generation; - cio->status = cio32->status; - return; + cio32 = (struct pci_conf_io32 *)data; + cio->pat_buf_len = cio32->pat_buf_len; + cio->num_patterns = cio32->num_patterns; + cio->patterns = (void *)(uintptr_t)cio32->patterns; + cio->match_buf_len = cio32->match_buf_len; + cio->num_matches = cio32->num_matches; + cio->matches = (void *)(uintptr_t)cio32->matches; + cio->offset = cio32->offset; + cio->generation = cio32->generation; + cio->status = cio32->status; + return; #endif default: @@ -733,7 +733,7 @@ pci_conf_io_update_data(const struct pci_conf_io *cio, caddr_t data, u_long cmd) { struct pci_conf_io *d_cio; -#if defined(COMPAT_FREEBSD32) +#ifdef COMPAT_FREEBSD32 struct pci_conf_io32 *cio32; #endif @@ -1172,7 +1172,7 @@ pci_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *t */ cio->status = PCI_GETCONF_ERROR; error = EINVAL; - goto getconfexit; + goto getconfexit; } /* From nobody Fri Dec 27 17:06:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX2h6wTSz5j3By; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2h6JsPz4vl9; Fri, 27 Dec 2024 17:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3yIxE9Zil56DEYQaqYmrWA817rnTaORL7dakLeaTfzE=; b=lWrMkqIC0vTtULFSR/OP5yY5+Ua9HvJGPu7CKlhkNp7cKG1plP5DwBN2jlpfYbhv6W4Zh+ AWQKuiO2CEVL3NScGbJpeDGmkdeuHAQWQm+6wktCNrieVvjuEWw2y3nOl2Yihnxt8snpQ+ 88WI5SxHbhZ4+W+UNEopPtDb/CWMaWWKJYEUEWepocFPXpES8KcnoQEiwjdjc/WTEFeeCa hiGhXsLM/1vHkis8pAzMtW7sI0mMSwEQTuap3I6p87ERpxGqw/zdrKTR8AvSsUM+/0/OCu mji2fCyr7OWboW/HYKPOG6tDV/k3Y8ZL3aZ+rvUPXMvronBY/T8B8YGdf6uJVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3yIxE9Zil56DEYQaqYmrWA817rnTaORL7dakLeaTfzE=; b=h+I/aDcIoJMgDTkTAJG+P0WZoLQLQAxoWgB2IakfNrkUZcUWTlgXcEZ30NvpLcHj+/msjM WfpynTol+KEKIrqUXLzoa7AHq9hDeyg6RLAVBT4WSxaT1sQW/7b9ah/QQ4s4N011cVpwes 6A6/KfiITPYbWaovESStadNX+fEJ3NwaKX/MsglzqSZuqlWlu508hEEmkYdDUkpxBZZ330 Vctat6URZIjQJRDynlQemoUhebrfhXgJFpHatHUesp0kBnjkzyT3fQuIK6hapMnzPUSJen OmjF/j6ZorqhFyIQ6joYhl7Fk4E6sOIoZYCPSE7oumB2b8esl6br1/14J6l9zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319180; a=rsa-sha256; cv=none; b=yAYOjTJxitZ3kcpU6fzl9T2vlOaCPWldLw8Qb7pb/iUtT3AqZwDvaF3wCVIB7LJ3fNWIzZ L/iyOaMmhslEAUTunXteMgXPYEDDErIVtF8bb1Ycogo9MxJY8EMVc6TUJSinaxVdHshBsO krT0k5ZaoTigva6m+stiy+saznP+JPm8Fet6l/7lLNykrVD08OU+cjMdwwJX0K9E1U7KfA 3Q9V3uBSlBzF+blaSNWAwLRyMtPf9NPY12GSj1VciadYa3wUVqFU5uiKucc92+qs3TUlyz Y5d4WMGb2KjAprRyduhwLjVTSQNf/EBCxPvEd1MkWxebi17ZJgyEcKr3Yj/bzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX2h5VGlzn73; Fri, 27 Dec 2024 17:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRH6KEw037181; Fri, 27 Dec 2024 17:06:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6Kdd037178; Fri, 27 Dec 2024 17:06:20 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:20 GMT Message-Id: <202412271706.4BRH6Kdd037178@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 4425d92a8044 - stable/14 - socket: Move SO_SPLICE next to other socket option constants List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4425d92a8044a82b8eac48b3131802d96aaf91f2 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4425d92a8044a82b8eac48b3131802d96aaf91f2 commit 4425d92a8044a82b8eac48b3131802d96aaf91f2 Author: John Baldwin AuthorDate: 2024-11-19 15:25:49 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:30:05 +0000 socket: Move SO_SPLICE next to other socket option constants Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47626 (cherry picked from commit 48a88a4ee95a725a435a817401ea4c0d9c990cd1) --- sys/sys/socket.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/socket.h b/sys/sys/socket.h index 22b764b07c2b..65b5c5ee001d 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -173,10 +173,10 @@ typedef __uintptr_t uintptr_t; #define SO_TS_CLOCK 0x1017 /* clock type used for SO_TIMESTAMP */ #define SO_MAX_PACING_RATE 0x1018 /* socket's max TX pacing rate (Linux name) */ #define SO_DOMAIN 0x1019 /* get socket domain */ +#define SO_SPLICE 0x1023 /* splice data to other socket */ #endif #if __BSD_VISIBLE -#define SO_SPLICE 0x1023 /* splice data to other socket */ #define SO_TS_REALTIME_MICRO 0 /* microsecond resolution, realtime */ #define SO_TS_BINTIME 1 /* sub-nanosecond resolution, realtime */ #define SO_TS_REALTIME 2 /* nanosecond resolution, realtime */ From nobody Fri Dec 27 17:06:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX2k2q32z5j38h; Fri, 27 Dec 2024 17:06:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2j6nMyz4vPN; Fri, 27 Dec 2024 17:06:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VNG3BwMcynFhKzfhQ6NE1FnXsv+PfHeHsTtLEFAKyGQ=; b=XswFt4DUhjtOvk8Zo2fKTZJj15ZcZJWBPlDYG8n7GVQxQmMT3kAadh9Q4cV6IHGUPWDfx0 q6V9d5boUjR4SauEux9PJ0+j6kHD4zJABczLz4DVJmP0A+Zlyr3Bk3Gi2DFhcC9MV8evd9 WjhURmRxpw84JaZ/RXU6aUglhEOQd6uctVGYpW43JnOYWnfqgN4dVcq0V2QHznITbJ4MSH 4+dTyR0wwgc8u30rtlqgpYjQoT2oQ91ynIWwgsU0Akg9BFZgbiAKzAJjc4YTB6NFVZzcBd bY748AgV9UMfgrIwuTMzTlUB1ppH99cUq75GLaLGiXO1PQR4rfp42V5GphIo3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VNG3BwMcynFhKzfhQ6NE1FnXsv+PfHeHsTtLEFAKyGQ=; b=lwD4yvanL85pTmNf++G05+9yRumfjrpcENfaA2CesBM0Mm10T3XliZup8ZXGcii6kQw8lA rGBFcg3/3HxIJgxOMn5RDjfJTctPo1FyDWt2sAFPb3dekzGJq9duIRqi/DMppm6pQXsiL7 5YIyPBQEabPU+J1OwFBMzemEe+hbRWcT0OBJWIkY5+AD0pyf4rBR2sD/VoXFdnTDlg91/I yXYshvD0yqUuWtCbzm84dW2ktPwP4W5f6Kvm99OunQfAGOjh2ZLtKDs6pgDcaNeTV7YLc1 qbrZCLQabT/eI5hBFHiMTLY966FFYGJPLMY79lvxDuQs016zuropBR/C5odApA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319182; a=rsa-sha256; cv=none; b=OBW0PdFXChlmZ/J+xI2LULOMzIFknVeNIlSHfLDeva8YmaOxjCQKyXhWgwW8pLyhr1AbHM iOYW3znYu5IvQuZUiG6og9uePo/kpEGCTPkVcdjTMBACF08Sbrx/d0M0d9itNz5HsyO+R/ kBUJcSH5NeA1h3GkMOeKk2yxLx5AFAEuhybRSaw9XElj6v+xNwUIN6s8A2fcNO26msBAAZ PujW4dDjPMS47GP9NPS6BmgX6UoGNQBA8p/IN1BLTjK3E+10yZbdYRNtpekk6VlnHmLDvc nebSC2RzIW3sU87a2XblIfBIii+TbGM5p7uVzQZGcqossjffCzoJIcun4uykUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX2j6PcPzn74; Fri, 27 Dec 2024 17:06:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRH6Los037240; Fri, 27 Dec 2024 17:06:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6L04037237; Fri, 27 Dec 2024 17:06:21 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:21 GMT Message-Id: <202412271706.4BRH6L04037237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 836ed5bc2b6f - stable/14 - ccr(4): Mention geli(4) and ktls(4) as other consumers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 836ed5bc2b6f3ad8100a846464d7a31de9ad3136 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=836ed5bc2b6f3ad8100a846464d7a31de9ad3136 commit 836ed5bc2b6f3ad8100a846464d7a31de9ad3136 Author: John Baldwin AuthorDate: 2024-11-25 19:59:36 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:35:28 +0000 ccr(4): Mention geli(4) and ktls(4) as other consumers Cross reference crypto(7) and crypto(9) as well. Sponsored by: Chelsio Communications (cherry picked from commit 370ad2d36789dd565b87dcd0bec6964e3d15c71a) --- share/man/man4/ccr.4 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/share/man/man4/ccr.4 b/share/man/man4/ccr.4 index 11b3a37f384d..2626d3ccdd48 100644 --- a/share/man/man4/ccr.4 +++ b/share/man/man4/ccr.4 @@ -52,7 +52,10 @@ The driver accelerates AES-CBC, AES-CCM, AES-CTR, AES-GCM, AES-XTS, SHA1, SHA2-224, SHA2-256, SHA2-384, SHA2-512, SHA1-HMAC, SHA2-224-HMAC, SHA2-256-HMAC, SHA2-384-HMAC, and SHA2-512-HMAC operations for -.Xr crypto 4 +.Xr crypto 9 +consumers such as +.Xr ktls 4 , +.Xr geli 4 , and .Xr ipsec 4 . The driver also supports chaining one of AES-CBC, AES-CTR, or AES-XTS with @@ -97,7 +100,11 @@ email all the specific information related to the issue to .Sh SEE ALSO .Xr crypto 4 , .Xr cxgbe 4 , -.Xr ipsec 4 +.Xr geli 4 , +.Xr ipsec 4 , +.Xr ktls 4 , +.Xr crypto 7 , +.Xr crypto 9 .Sh HISTORY The .Nm From nobody Fri Dec 27 17:06:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX2l6BmYz5j38j; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2l1GsXz4vZC; Fri, 27 Dec 2024 17:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tGaXT4fOlipMESFJMN9ZcY9aGSjni0dQrerW4MnnOsc=; b=aBq8zfc0tByaDLV+jFkSzuH7Y5V1EKiJlmHm9vlLkqFEUdOxnvXsYGrgXFAwRl1r4OSQds Vsk6mkRjBuzs91XTp+oC/vvWUcV2M12N/p58NvO16XwJpkcozMNr0IoJv6SsUts4rFJCjW VvIBRI4piSsBL2ju2jwLEEQotfcNNXmrOyATWXiq6IRGHzgyS3ziv3t2n5GVQged5mz2bw xNzkQ2aNz8f2m2sHgT1o8utJbi6FCqVY03Jv6mNB2EwG6Ra7boyBmhXFI53N0l9JERdjaf ngvQxKeHLLcyDKnyhR9LrgPX0h3dkONOQgNCgMZpCZ5dDRTCv8PusTCkAWuhjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tGaXT4fOlipMESFJMN9ZcY9aGSjni0dQrerW4MnnOsc=; b=r2pvTeWNayPASXD7tFj8zXfEQxPZoxxv16LW4jLTv4Vc8zpnsq4gtwv1muwGAUWjFI8tXq HzFqVkUbrExUakjS94mtG4D+XetxrW0tNB9fecSMvYOk92AFQfaEb82f3U0LQaJBifd9v0 oayRVx4AdlMGkJ3lCI0i4hTvypvLtdBY9P4Njj6nZ54OqwgAGu3Olj/pXRo+1JTZ8oL+kx SKlVM+CRoK6Jnf4iPu0fMGgdjYIn3NFneQBlEbq06XxRgXaYYUbgs9oY/0DD2ktoCJgqD9 31NwC3XEaFRpXEJBkUTPXey23Nd4M9c+eSWPmOr4vG4wr1OTpN1izBdoGz7jvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319183; a=rsa-sha256; cv=none; b=Cpx8pAKdEEg5d2TveVEW8DxIoyc/8KimVcL144x3ZMq3ynf2UOxAPDmBWF9IuEAD3auvXR ONdwCLzi+VtlglyZ2QDL/LOHeoLQB6XzfqWS/o4P8CNxxla+inxZ4sYM3FDZGYU03Cw7co nglLt5lvIicYvFd8plfu3K3nNVU3Tg1Al3POZA5hqYwO1+IxMERIxL6JZ/y+wePVUlY5d/ HaH4Q8kKc9hO1Nca8dwxrT46PFqKJnZwaR2R4yLsCJNXb2XvjkjG0ILnYs/ZJhpJur613/ Uv7FRKkT70XSFfbTiP2fPSJw1RbVdGBJKMCTnfMTpUcuW9DcOhwIh/e/C9MVeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX2l0BCyzn75; Fri, 27 Dec 2024 17:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRH6MML037305; Fri, 27 Dec 2024 17:06:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6Mnx037301; Fri, 27 Dec 2024 17:06:22 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:22 GMT Message-Id: <202412271706.4BRH6Mnx037301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 35135bb0870f - stable/14 - ccr(4): Belatedly bump .Dd for prior commit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35135bb0870f4680c25df8662135118f27acb669 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=35135bb0870f4680c25df8662135118f27acb669 commit 35135bb0870f4680c25df8662135118f27acb669 Author: John Baldwin AuthorDate: 2024-11-25 20:16:09 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:35:41 +0000 ccr(4): Belatedly bump .Dd for prior commit Pointy hat to: jhb (cherry picked from commit bf06074106cf80564e1137b0f6ad0eb923baca55) --- share/man/man4/ccr.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/ccr.4 b/share/man/man4/ccr.4 index 2626d3ccdd48..de3f3609a285 100644 --- a/share/man/man4/ccr.4 +++ b/share/man/man4/ccr.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 3, 2019 +.Dd November 25, 2024 .Dt CCR 4 .Os .Sh NAME From nobody Fri Dec 27 17:06:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX2n070vz5j38k; Fri, 27 Dec 2024 17:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2m2f9Xz4vfb; Fri, 27 Dec 2024 17:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FqYn6WqhV+ZuEeh46yvkbTACpMuR2dsMimOZRrCM7Bs=; b=HVTKW72aihqtfnYQenMqtcFSNIYmDjx2jnWENcfLXl7UQ2ATdRCd9/UXcFRwH8v/pyxBaS pd2dyOM8h49ZiRf6NCBWbDLOYiP4/PUIGzDEDVHB2X9tJF1HIE8H0p47DXIcwg0iMliiSA gblKAWsR6gQXJCLYvDu7a5jRQI3w/odHjfQBcMo+nCLJ7VEOWzJMuDIT7uQ3ORTYXbzcJs 1XX5lkj9pi2bS1jXtli5CeYQifsvM9JUkmhrwRWAvskI1YjefmVVSXJuzXbODv7zFZUgtm rcQCUOc2/hAR3eSNhKoasbbCZWHJD7AsI9Yy/q2Om739XuA1zPC6uyeupgfk2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FqYn6WqhV+ZuEeh46yvkbTACpMuR2dsMimOZRrCM7Bs=; b=c/NXtbO53esEzVP5FU/gqMqHkTnyCFcr325bPYeqHWvB2UqBRF5bg+1mUN57mCfQ0W2uWj 4xcTQDk9sJMY/6ksF/Ubp+u6ePC0CoJ019cpjZa6C7/xEuGg7KEpUYe3lzcrIyFPBYoGEA L0KeGj8oXdKQByHXv9Cca/iFHkslHkHOvnWrmAm5mvDTns3x9FEREMfgCNXrGVskBlxiAW dkTNrjcvfMV1QoXHcni38+xdJx9KVU0hIqXf5zcIhJfg2RkqbyGs8jP3fdUPjfjXnEQ/Gl B+VoOeDw/4uCM2rLJD1VXZk/MbeWsv9QGQvkJ3wcLd1LaUPv6vRm7Ce/aAnmlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319184; a=rsa-sha256; cv=none; b=DRvDjUXj9ZDXjlCw47/Ck1KNQueE3YJuM9ArK8HGcdWH8E6lfDQJNaagNG7bSVcUz9Pwg7 Dvxhb3hCS8pTR30+HDv27UIsgPhVcQVhjD4A/wUCC7rWD9zgWgvcdzXtzpLBFpTwgzT8fP M+nHONaQr1onhIduLmUulTfWfEHGotaUI9RcpVFV8pNjynkju9b+4aBs+Fwrdxt/IzaJhL 5u4SB7kLFK4DkO28P8riEPM9O/QW0KwzrYghCsAFHi9Sv3kXKdf7m4zoI2EGk2yJJ7Jcrd GyDl1zuiQ8dSTssLkt9nkeR23Vqp6y6wCohRAowiV/cstjataYc+JENXg62P6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX2m18HCznm7; Fri, 27 Dec 2024 17:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRH6OmW037357; Fri, 27 Dec 2024 17:06:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6OvU037354; Fri, 27 Dec 2024 17:06:24 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:24 GMT Message-Id: <202412271706.4BRH6OvU037354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 9a15a1fef95e - stable/14 - manuals: Misc macro typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9a15a1fef95e96ce2434adc76835c862a9e336ce Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9a15a1fef95e96ce2434adc76835c862a9e336ce commit 9a15a1fef95e96ce2434adc76835c862a9e336ce Author: Graham Percival AuthorDate: 2024-09-12 16:36:42 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:40:05 +0000 manuals: Misc macro typos These were reported by `mandoc -T lint` as ERROR: skipping unknown macro When these pages were rendered with `man`, the "unknown macro" meant that the entire line was omitted from the output. Obvious typos in: lib/libsys/swapon.2 lib/libsys/procctl.2 share/man/man9/firmware.9 lib/libcasper/services/cap_net/cap_net.3: 'mode' describes a function argument. lib/libsys/statfs.2: there's no .Tm command ("trademark?"), and .Tn ("tradename") is deprecated, so remove the macro entirely. usr.sbin/mfiutil/mfiutil.8: man was interpreting '/dev/' as a macro (which it didn't recognize). share/man/man4/qat.4: same issue as above, but with '0'. In this case, given the context of the previous line, rewriting as "Value '0'" seemed more appropriate. usr.sbin/mlx5tool/mlx5tool.8: typo in .Xr Signed-off-by: Graham Percival Sponsored by: Tarsnap Backup Inc. Reviewed by: concussious, imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1417 (cherry picked from commit 2878d99dfcfbdd7a415a7f31cf95fbd53fc8e581) --- lib/libc/sys/procctl.2 | 2 +- lib/libc/sys/statfs.2 | 4 +--- lib/libc/sys/swapon.2 | 2 +- lib/libcasper/services/cap_net/cap_net.3 | 2 +- share/man/man4/qat.4 | 2 +- usr.sbin/mfiutil/mfiutil.8 | 3 ++- usr.sbin/mlx5tool/mlx5tool.8 | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/libc/sys/procctl.2 b/lib/libc/sys/procctl.2 index b040116a8e60..2d9833ab4710 100644 --- a/lib/libc/sys/procctl.2 +++ b/lib/libc/sys/procctl.2 @@ -75,7 +75,7 @@ All status changing requests .Dv *_CTL require the caller to have the right to debug the target. All status query requests -.DV *_STATUS +.Dv *_STATUS require the caller to have the right to observe the target. .Pp The following commands are supported: diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2 index 6111b127b8e3..7e41537b359c 100644 --- a/lib/libc/sys/statfs.2 +++ b/lib/libc/sys/statfs.2 @@ -233,9 +233,7 @@ Corrupted data was detected while reading from the file system. The fields in the .Vt statfs structure have been defined to provide the parameters relevant for -traditional -.Tm UNIX -file systems. +traditional UNIX file systems. For some other file systems, values that have similar, but not identical, semantics to those described above may be returned. An example is msdosfs, which in case of FAT12 or FAT16 file systems diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2 index 8cfac8ce1f64..b5adda8df2fd 100644 --- a/lib/libc/sys/swapon.2 +++ b/lib/libc/sys/swapon.2 @@ -69,7 +69,7 @@ is made available for other purposes. The .Fa special argument points to the name of the device or file used for swapping. -.The +The .Va flags argument takes the following flags: .Bl -tag -width SWAPOFF_FORCE diff --git a/lib/libcasper/services/cap_net/cap_net.3 b/lib/libcasper/services/cap_net/cap_net.3 index 6e525508d3c4..e322222e866f 100644 --- a/lib/libcasper/services/cap_net/cap_net.3 +++ b/lib/libcasper/services/cap_net/cap_net.3 @@ -121,7 +121,7 @@ The .Fn cap_net_limit_init returns an opaque limit handle used to store a list of capabilities. The -.Fv mode +.Fa mode restricts the functionality of the service. Modes are encoded using the following flags: .Pp diff --git a/share/man/man4/qat.4 b/share/man/man4/qat.4 index 03d1e6e956e7..3d8c0cd32664 100644 --- a/share/man/man4/qat.4 +++ b/share/man/man4/qat.4 @@ -148,7 +148,7 @@ QAT firmware revision number. Summary of device specific configuration. .It Va heartbeat QAT device heartbeat status. Value '1' indicates that the device is operational. -'0' value means that the device is not responsive. Device requires restart. +Value '0' means that the device is not responsive. Device requires restart. .It Va heartbeat_failed Number of QAT heartbeat failures received. .It Va heartbeat_sent diff --git a/usr.sbin/mfiutil/mfiutil.8 b/usr.sbin/mfiutil/mfiutil.8 index 86dc6b6ee122..9f8cacf7f16d 100644 --- a/usr.sbin/mfiutil/mfiutil.8 +++ b/usr.sbin/mfiutil/mfiutil.8 @@ -271,7 +271,8 @@ Currently three global options are supported: .It Fl D Ar device .Ar device specifies the device node of the controller to use. -'/dev/' will be added to the device node if needed. +.Pa /dev/ +will be added to the device node if needed. If no device node is specified, then device will be made of the type and device. .It Fl t Ar type diff --git a/usr.sbin/mlx5tool/mlx5tool.8 b/usr.sbin/mlx5tool/mlx5tool.8 index 17f0fd515a50..5f4157c4d49c 100644 --- a/usr.sbin/mlx5tool/mlx5tool.8 +++ b/usr.sbin/mlx5tool/mlx5tool.8 @@ -60,7 +60,7 @@ The utility executes commands on specific adapter, which is addressed using .Em device:bus:slot:function conventions of the PCIe buses. You can match adapters ethernet name and addresses using the -.X pciconf 8 +.Xr pciconf 8 utility. The address is passed as an argument of the .Fl d From nobody Fri Dec 27 17:06:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX2p1DnKz5j3C8; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2n2cFdz4vp6; Fri, 27 Dec 2024 17:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vf/A2KLa0LoXFGFQExsgk0WyL2GKgiVOSvz3iq2HDm8=; b=M34U/VSQkBpPps7FSp12SgRNeeVvShgfbXLyaLml2itTglyPWubYayYbGxFJKqr9Ewi3Dg 002nN3F+1IEoXlJOFMqQINum3N93dEpeLuqAQiT84q3jg00IjrYi7QvbiMZLu9bJMarTVM Qs75cPqvSaMHJcCLCT0YmYjfEoJ+REYGLB2MNt+LmZIfCy51mdVgkqOGnwZ1AKrKSiYMrP kRnY9Y1FkkB1CjP3XrOr1GI1de8WqVDckxfZ2o6sNGDgp8diiUfh4f6YMhHI/xO2syYIBC Y7nJak+P6ocmE0GbSJcVH4AQzfbkdDkY/gYPhalCVrsl9Ebc2PmO+I/tC0lqqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vf/A2KLa0LoXFGFQExsgk0WyL2GKgiVOSvz3iq2HDm8=; b=B06MQIagyKZo0O2ZclSt7zNQnlzg74cLZ8vYCcnLfbmHB9coCsnZa729q+6DJEJmnS0FKE vfO8KtesxN4QEJGls+tKX0c536njojhqQ5Ch2BYwRup3eCEItLAnJi9zGgyi2lZuH9Sj3K ZMPu7Io/QsXEn+fXjfBNueMQw5iAB3SBf6/cn4KNeASbgNuHwtFTKO5xsTDLo4H8HD9np6 /OjvsXT6k+tC0oSwMrot6E+jsUcU671jaCahHE/PCLYmud+rzwBBlCGVAbAOWnsh2n72cG OGtRZD9S5kIaEhde08pFWGFnVk1mz5Ad2Zxg1wNFrgE0/CThmTnofHeDo66/EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319185; a=rsa-sha256; cv=none; b=MdtHn7ydNZUftJGhlVpCvP2yKJdpgJaaQzHmXOj7FLXAE2kWgZtEnOGHpa1b0si5rcGd4f +POPiTnac6MNj+TdfDoxZGfWt27K6S84LVl3kHb2CTGzuc4qK9PZgPAdunvOTL7YQrVxV2 dmAAeT97vg5LQSXBX8QwRCB5NNdpseaI8OQEOYHYqkE5MJMtHGfJLZBzx+cf+H4KvOVRje +zXj7nRRvaSscEHbIPejNjWGwwOOP/NQNTf6DzMU5oQtt12i2iQS220o8OWxXch2Ao1/s4 LbZgGiU67ZuMAOrV70m7PJubJ4ex+mt+ugS6bJTytceM5poiqFOusbBeOFkKSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX2n1TGqzn76; Fri, 27 Dec 2024 17:06: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 4BRH6PMx037399; Fri, 27 Dec 2024 17:06:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6PgO037396; Fri, 27 Dec 2024 17:06:25 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:25 GMT Message-Id: <202412271706.4BRH6PgO037396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 66cb373c8fa2 - stable/14 - procctl.2: Editing pass List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 66cb373c8fa249f737ca23574ce8df2791111f9d Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=66cb373c8fa249f737ca23574ce8df2791111f9d commit 66cb373c8fa249f737ca23574ce8df2791111f9d Author: John Baldwin AuthorDate: 2024-12-04 14:11:19 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:43:26 +0000 procctl.2: Editing pass - Add some missing .Pp macros after the end of literal blocks and some lists to ensure there is a blank line before the following text. - Use an indent of Ds for nested lists to reduce excessive indentation and make the bodies of the nested list items easier to read. - Various and sundry rewordings and clarifications. Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D47782 (cherry picked from commit 8277c790179304159c2e4dcb1d99552518d5be8e) --- lib/libc/sys/procctl.2 | 412 +++++++++++++++++++++++++++++-------------------- 1 file changed, 244 insertions(+), 168 deletions(-) diff --git a/lib/libc/sys/procctl.2 b/lib/libc/sys/procctl.2 index 2d9833ab4710..955e5a2a116e 100644 --- a/lib/libc/sys/procctl.2 +++ b/lib/libc/sys/procctl.2 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 26, 2023 +.Dd December 4, 2024 .Dt PROCCTL 2 .Os .Sh NAME @@ -72,16 +72,16 @@ The control request to perform is specified by the argument. .Pp All status changing requests -.Dv *_CTL +.Pq Dv *_CTL require the caller to have the right to debug the target. All status query requests -.Dv *_STATUS +.Pq Dv *_STATUS require the caller to have the right to observe the target. .Pp The following commands are supported: .Bl -tag -width PROC_TRAPCAP_STATUS .It Dv PROC_ASLR_CTL -Controls the Address Space Layout Randomization (ASLR) in the program +Controls Address Space Layout Randomization (ASLR) in program images created by .Xr execve 2 @@ -89,28 +89,35 @@ in the specified process or its descendants that do not either change the control or modify it by other means. The .Fa data -parameter must point to the integer variable holding one of the following +parameter must point to an integer variable holding one of the following values: -.Bl -tag -width PROC_ASLR_FORCE_DISABLE +.Bl -tag -width Ds .It Dv PROC_ASLR_FORCE_ENABLE Request that ASLR is enabled after execution, even if it is disabled system-wide. -The image flag and set-uid might prevent ASLR enablement still. .It Dv PROC_ASLR_FORCE_DISABLE -Request that ASLR is disabled after execution. -Same notes as for -.Dv PROC_ASLR_FORCE_ENABLE -apply. +Request that ASLR is disabled after execution, even if it is enabled +system-wide. .It Dv PROC_ASLR_NOFORCE Use the system-wide configured policy for ASLR. .El +.Pp +Note that the +.Xr elfctl 1 +.Dq noaslr +flag takes precedence over this control. +Executing a binary with this flag set will never use ASLR. +Similarly, executing a set-user-ID or set-group-ID binary ignores this +control and only honors the +.Xr elfctl 1 +flag and system-wide policy. .It Dv PROC_ASLR_STATUS Returns the current status of ASLR enablement for the target process. The .Fa data -parameter must point to the integer variable, where one of the +parameter must point to an integer variable, where one of the following values is written: -.Bl -tag -width PROC_ASLR_FORCE_DISABLE +.Bl -tag -width Ds .It Dv PROC_ASLR_FORCE_ENABLE .It Dv PROC_ASLR_FORCE_DISABLE .It Dv PROC_ASLR_NOFORCE @@ -121,56 +128,79 @@ the .Dv PROC_ASLR_ACTIVE flag is or-ed with the value listed above. .It Dv PROC_PROTMAX_CTL -Controls implicit application of PROT_MAX protection equal to the -.Fa prot -argument of the +Controls the maximum protection used for .Xr mmap 2 -syscall, in the target process. +requests in the target process that do not specify +an explicit maximum protection in the +.Fa prot +argument via +.Dv PROT_MAX . +The maximum protection limits the permissions a mapping can be assigned by +.Xr mprotect 2 . +If an explicit maximum protection is not provided, +the maximum protection for a new mapping is set to either +.Dv PROT_READ | PROT_WRITE | PROT_EXEC +.Pq RWX +or the protection specified in +.Fa prot . +Mappings created with +.Fa prot +set to +.Dv PROT_NONE +always use RWX maximum protection. +.Pp The .Fa data -parameter must point to the integer variable holding one of the following +parameter must point to an integer variable holding one of the following values: -.Bl -tag -width PROC_PROTMAX_FORCE_DISABLE +.Bl -tag -width Ds .It Dv PROC_PROTMAX_FORCE_ENABLE -Enables implicit PROT_MAX application, -even if it is disabled system-wide by the sysctl +Use the permissions in +.Fa prot +as the implicit maximum protection, +even if RWX permissions are requested by the sysctl .Va vm.imply_prot_max . -The image flag might still prevent the enablement. .It Dv PROC_PROTMAX_FORCE_DISABLE -Request that implicit application of PROT_MAX be disabled. -Same notes as for -.Dv PROC_PROTMAX_FORCE_ENABLE -apply. +Use RWX as the implicit maximum protection, +even if constrained permissions are requested by the sysctl +.Va vm.imply_prot_max . .It Dv PROC_PROTMAX_NOFORCE -Use the system-wide configured policy for PROT_MAX. +Use the system-wide configured policy for the implicit PROT_MAX control. .El +.Pp +Note that the +.Xr elfctl 1 +.Dq noprotmax +flag takes precedence over this control. +Executing a binary with this flag set will always use RWX as the implicit +maximum protection. .It Dv PROC_PROTMAX_STATUS -Returns the current status of implicit PROT_MAX enablement for the +Returns the current status of the implicit PROT_MAX control for the target process. The .Fa data -parameter must point to the integer variable, where one of the +parameter must point to an integer variable, where one of the following values is written: -.Bl -tag -width PROC_PROTMAX_FORCE_DISABLE +.Bl -tag -width Ds .It Dv PROC_PROTMAX_FORCE_ENABLE .It Dv PROC_PROTMAX_FORCE_DISABLE .It Dv PROC_PROTMAX_NOFORCE .El .Pp -If the currently executed image in the process itself has implicit PROT_MAX -application enabled, the +If the currently executed image in the process itself has the implicit PROT_MAX +control enabled, the .Dv PROC_PROTMAX_ACTIVE flag is or-ed with the value listed above. .It Dv PROC_SPROTECT Set process protection state. This is used to mark a process as protected from being killed if the system -exhausts the available memory and swap. +exhausts available memory and swap. The .Fa data parameter must point to an integer containing an operation and zero or more optional flags. The following operations are supported: -.Bl -tag -width PPROT_CLEAR +.Bl -tag -width Ds .It Dv PPROT_SET Mark the selected processes as protected. .It Dv PPROT_CLEAR @@ -178,7 +208,7 @@ Clear the protected state of selected processes. .El .Pp The following optional flags are supported: -.Bl -tag -width PPROT_DESCEND +.Bl -tag -width Ds .It Dv PPROT_DESCEND Apply the requested operation to all child processes of each selected process in addition to each selected process. @@ -189,25 +219,41 @@ mark all future child processes of each selected process as protected. Future child processes will also mark all of their future child processes. .El .It Dv PROC_REAP_ACQUIRE -Acquires the reaper status for the current process. -Reaper status means that children orphaned by the reaper's descendants -that were forked after the acquisition of reaper status are reparented to the -reaper process. +Enable orphaned process reaping for future children of the current process. +.Pp +If a parent process exits before one or more of its children processes, +the remaining children processes are orphaned. +When an orphaned process exits, +it is reparented to a reaper process that is responsible for harvesting +the terminated process via +.Xr wait 2 . +When this control is enabled, +the current process becomes the reaper process for future children and their +descendants. +Existing child processes continue to use the reaper assigned when the child +was created via +.Xr fork 2 . +If a reaper process exits, +all of the processes for whom it was the reaper are reassigned to the reaper +process's reaper. +.Pp After system initialization, .Xr init 8 is the default reaper. .It Dv PROC_REAP_RELEASE -Release the reaper state for the current process. -The reaper of the current process becomes the new reaper of the -current process's descendants. +Disable orphaned process reaping for the current process. +.Pp +Any processes for whom the current process was the reaper are reassigned to +the current process's reaper. .It Dv PROC_REAP_STATUS -Provides information about the reaper of the specified process, -or the process itself when it is a reaper. +Provides a consistent snapshot of information about the reaper +of the specified process, +or the process itself if it is a reaper. The .Fa data argument must point to a .Vt procctl_reaper_status -structure which is filled in by the syscall on successful return. +structure which is filled in by the system call on successful return. .Bd -literal struct procctl_reaper_status { u_int rs_flags; @@ -217,16 +263,16 @@ struct procctl_reaper_status { pid_t rs_pid; }; .Ed +.Pp The .Fa rs_flags may have the following flags returned: -.Bl -tag -width REAPER_STATUS_REALINIT +.Bl -tag -width Ds .It Dv REAPER_STATUS_OWNED -The specified process has acquired reaper status and has not -released it. -When the flag is returned, the specified process +The specified process is a reaper. +When this flag is returned, the specified process .Fa id , -pid, identifies the reaper, otherwise the +pid, identifies a reaper, otherwise the .Fa rs_reaper field of the structure is set to the pid of the reaper for the specified process id. @@ -237,23 +283,25 @@ The specified process is the root of the reaper tree, i.e., .Pp The .Fa rs_children -field returns the number of children of the reaper among the descendants. +field returns the number of processes that can be reaped by the reaper that +are also children of the reaper. It is possible to have a child whose reaper is not the specified process, -since the reaper for any existing children is not reset on the -.Dv PROC_REAP_ACQUIRE -operation. +since the reaper for existing children is not changed by +.Dv PROC_REAP_ACQUIRE . The .Fa rs_descendants -field returns the total number of descendants of the reaper(s), -not counting descendants of the reaper in the subtree. +field returns the total number of processes that can be reaped by the reaper. The .Fa rs_reaper -field returns the reaper pid. +field returns the reaper's pid. The .Fa rs_pid -returns the pid of one reaper child if there are any descendants. +returns the pid of one reaper child if there are any processes that can be +reapead; +otherwise, it is set to \-1. .It Dv PROC_REAP_GETPIDS -Queries the list of descendants of the reaper of the specified process. +Queries the list of processes that can be reaped +by the reaper of the specified process. The request takes a pointer to a .Vt procctl_reaper_pids structure in the @@ -265,17 +313,15 @@ struct procctl_reaper_pids { struct procctl_reaper_pidinfo *rp_pids; }; .Ed +.Pp When called, the .Fa rp_pids field must point to an array of -.Vt procctl_reaper_pidinfo -structures, to be filled in on return, -and the .Fa rp_count -field must specify the size of the array, -into which no more than -.Fa rp_count -elements will be filled in by the kernel. +.Vt procctl_reaper_pidinfo +structures. +The kernel will populate these structures with information about the +reaper's descendants. .Pp The .Vt "struct procctl_reaper_pidinfo" @@ -290,17 +336,18 @@ struct procctl_reaper_pidinfo { u_int pi_flags; }; .Ed +.Pp The .Fa pi_pid field is the process id of the descendant. The .Fa pi_subtree -field provides the pid of the child of the reaper, which is the (grand-)parent -of the process. +field provides the pid of the direct child of the reaper which is +the (grand-)parent of the descendant process. The .Fa pi_flags field returns the following flags, further describing the descendant: -.Bl -tag -width REAPER_PIDINFO_EXITING +.Bl -tag -width Ds .It Dv REAPER_PIDINFO_VALID Set to indicate that the .Vt procctl_reaper_pidinfo @@ -314,7 +361,7 @@ of the returned array. .It Dv REAPER_PIDINFO_CHILD The .Fa pi_pid -field identifies the direct child of the reaper. +field identifies a direct child of the reaper. .It Dv REAPER_PIDINFO_REAPER The reported process is itself a reaper. The descendants of the subordinate reaper are not reported. @@ -341,6 +388,7 @@ struct procctl_reaper_kill { pid_t rk_fpid; }; .Ed +.Pp The .Fa rk_sig field specifies the signal to be delivered. @@ -350,7 +398,7 @@ The .Fa rk_flags field further directs the operation. It is or-ed from the following flags: -.Bl -tag -width REAPER_KILL_CHILDREN +.Bl -tag -width Ds .It Dv REAPER_KILL_CHILDREN Deliver the specified signal only to direct children of the reaper. .It Dv REAPER_KILL_SUBTREE @@ -359,6 +407,7 @@ the direct child with pid specified in the .Fa rk_subtree field. .El +.Pp If neither the .Dv REAPER_KILL_CHILDREN nor the @@ -376,22 +425,22 @@ field is set to the pid of the first process for which signal delivery failed, e.g., due to permission problems. If no such process exists, the .Fa rk_fpid -field is set to -1. +field is set to \-1. .It Dv PROC_TRACE_CTL Enable or disable tracing of the specified process(es), according to the value of the integer argument. -Tracing includes attachment to the process using the -.Xr ptrace 2 -and +Tracing includes inspecting the process via +.Xr ptrace 2 , .Xr ktrace 2 , debugging sysctls, .Xr hwpmc 4 , -.Xr dtrace 1 , -and core dumping. +or +.Xr dtrace 1 +as well as dumping core. Possible values for the .Fa data argument are: -.Bl -tag -width PROC_TRACE_CTL_DISABLE_EXEC +.Bl -tag -width Ds .It Dv PROC_TRACE_CTL_ENABLE Enable tracing, after it was disabled by .Dv PROC_TRACE_CTL_DISABLE . @@ -401,7 +450,7 @@ Disable tracing for the specified process. Tracing is re-enabled when the process changes the executing program with the .Xr execve 2 -syscall. +system call. A child inherits the trace settings from the parent on .Xr fork 2 . .It Dv PROC_TRACE_CTL_DISABLE_EXEC @@ -416,10 +465,10 @@ the integer variable pointed to by .Fa data . If tracing is disabled, .Fa data -is set to -1. +is set to \-1. If tracing is enabled, but no debugger is attached by the .Xr ptrace 2 -syscall, +system call, .Fa data is set to 0. If a debugger is attached, @@ -427,23 +476,24 @@ If a debugger is attached, is set to the pid of the debugger process. .It Dv PROC_TRAPCAP_CTL Controls the capability mode sandbox actions for the specified -sandboxed processes, -on a return from any syscall which gives either a +sandboxed processes +on a return from any system call which fails with either an .Er ENOTCAPABLE or .Er ECAPMODE error. -If the control is enabled, such errors from the syscalls cause -delivery of the synchronous +If this control is enabled and a system call fails with one of these errors, +a synchronous .Dv SIGTRAP -signal to the thread immediately before returning from the syscalls. +signal is delivered to the thread immediately before returning from the +system call. .Pp Possible values for the .Fa data argument are: -.Bl -tag -width PROC_TRAPCAP_CTL_DISABLE +.Bl -tag -width Ds .It Dv PROC_TRAPCAP_CTL_ENABLE -Enable the +Enable .Dv SIGTRAP signal delivery on capability mode access violations. The enabled mode is inherited by the children of the process, @@ -451,7 +501,9 @@ and is kept after .Xr fexecve 2 calls. .It Dv PROC_TRAPCAP_CTL_DISABLE -Disable the signal delivery on capability mode access violations. +Disable +.Dv SIGTRAP +signal delivery on capability mode access violations. Note that the global sysctl .Dv kern.trap_enotcap might still cause the signal to be delivered. @@ -463,7 +515,7 @@ On signal delivery, the .Va si_errno member of the .Fa siginfo -signal handler parameter is set to the syscall error value, +signal handler parameter is set to the system call error value, and the .Va si_code member is set to @@ -481,15 +533,18 @@ signal handler. .Pp See .Xr capsicum 4 -for more information about the capability mode. +for more information about capability mode. .It Dv PROC_TRAPCAP_STATUS -Return the current status of signalling capability mode access -violations for the specified process. +Return the current status of raising +.Dv SIGTRAP +for capability mode access violations by the specified process. The integer value pointed to by the .Fa data argument is set to the .Dv PROC_TRAPCAP_CTL_ENABLE -value if the process control enables signal delivery, and to +value if +.Dv SIGTRAP +delivery is enabled, and to .Dv PROC_TRAPCAP_CTL_DISABLE otherwise. .Pp @@ -528,39 +583,42 @@ must point to a memory location that can hold a value of type If signal delivery has not been requested, it will contain zero on return. .It Dv PROC_STACKGAP_CTL -Controls the stack gaps in the specified process. -A stack gap is the part of the growth area for a +Controls stack gaps in the specified process. +A stack gap is one or more virtual memory pages at the end of the +growth area for a .Dv MAP_STACK -mapped region that is reserved and never filled by memory. -Instead, the process is guaranteed to receive a +mapping that is reserved and never backed by memory. +Instead, the process is guaranteed to receive a synchronous .Dv SIGSEGV -signal on accessing pages in the gap. -Gaps protect against stack overflow corrupting memory adjacent -to the stack. +signal for each access to pages in the gap. +The number of pages reserved for each stack is set by the sysctl +.Va security.bsd.stack_guard_page . +.Pp +Gaps protect against stack overflows by preventing them from corrupting memory +adjacent to the stack. .Pp The .Fa data argument must point to an integer variable containing flags. The following flags are allowed: -.Bl -tag -width PROC_STACKGAP_DISABLE_EXEC +.Bl -tag -width Ds .It Dv PROC_STACKGAP_ENABLE This flag is only accepted for consistency with .Dv PROC_STACKGAP_STATUS . If stack gaps are enabled, the flag is ignored. -If disabled, the flag causes an -.Ev EINVAL -error to be returned. +If stack gaps are disabled, the request fails with +.Ev EINVAL . After gaps are disabled in a process, they can only be re-enabled when an .Xr execve 2 is performed. .It Dv PROC_STACKGAP_DISABLE Disable stack gaps for the process. -For existing stacks, the gap is no longer a reserved part of the growth -area and can be filled by memory on access. +For existing stacks, the gap is no longer reserved +and can be filled by memory on access. .It Dv PROC_STACKGAP_ENABLE_EXEC -Enable stack gaps for programs started after an +Enable stack gaps for the new address space constructed by any future .Xr execve 2 -by the specified process. +in the specified process. .It Dv PROC_STACKGAP_DISABLE_EXEC Inherit disabled stack gaps state after .Xr execve 2 . @@ -576,7 +634,7 @@ Returns the current stack gap state for the specified process. .Fa data must point to an integer variable, which is used to return a bitmask consisting of the following flags: -.Bl -tag -width PROC_STACKGAP_DISABLE_EXEC +.Bl -tag -width Ds .It Dv PROC_STACKGAP_ENABLE Stack gaps are enabled. .It Dv PROC_STACKGAP_DISABLE @@ -588,82 +646,99 @@ Stack gaps are enabled in the process after Stack gaps are disabled in the process after .Xr execve 2 . .El +.Pp +Note that the +.Xr elfctl 1 +.Dq nostackgap +flag takes precedence over this setting for individual process address spaces. +Executing a binary with this flag set will never use stack gaps in the address +space constructed by +.Xr execve 2 . +However, the controls value can still be inherited by child processes, and +executing a binary without this flag set will revert to the behavior specified +by the control. .It Dv PROC_NO_NEW_PRIVS_CTL -Allows one to ignore the SUID and SGID bits on the program +Allows one to ignore the set-user-ID and set-group-ID bits on the program images activated by .Xr execve 2 in the specified process and its future descendants. The .Fa data -parameter must point to the integer variable holding the following +parameter must point to an integer variable holding the following value: -.Bl -tag -width PROC_NO_NEW_PRIVS_ENABLE +.Bl -tag -width Ds .It Dv PROC_NO_NEW_PRIVS_ENABLE -Request SUID and SGID bits to be ignored. +Request set-user-ID and set-group-ID bits to be ignored. .El .Pp -It is not possible to disable it once it has been enabled. +It is not possible to disable this control once it has been enabled. .It Dv PROC_NO_NEW_PRIVS_STATUS -Returns the current status of SUID/SGID enablement for the target process. +Returns the current status of set-ID bits enablement for the target process. The .Fa data -parameter must point to the integer variable, where one of the +parameter must point to an integer variable, where one of the following values is written: -.Bl -tag -width PROC_NO_NEW_PRIVS_DISABLE +.Bl -tag -width Ds .It Dv PROC_NO_NEW_PRIVS_ENABLE .It Dv PROC_NO_NEW_PRIVS_DISABLE .El .It Dv PROC_WXMAP_CTL -Controls the 'write exclusive against execution' permissions for the -mappings in the process address space. -It overrides the global settings established by the -.Dv kern.elf{32/64}.allow_wx -sysctl, -and the corresponding bit in the ELF control note, see -.Xr elfctl 1 . -.Pp +Controls the creation of mappings with both write and execute permissions +in a process's address space. The .Fa data -parameter must point to the integer variable holding one of the +parameter must point to an integer variable holding one of the following values: -.Bl -tag -width PROC_WX_MAPPINGS_DISALLOW_EXEC +.Bl -tag -width Ds .It Dv PROC_WX_MAPPINGS_PERMIT Enable creation of mappings that have both write and execute -protection attributes, in the specified process' address space. +permissions in the specified process' current and future address spaces. .It Dv PROC_WX_MAPPINGS_DISALLOW_EXEC -In the new address space created by +In a new address space created by a future call to .Xr execve 2 , disallow creation of mappings that have both write and execute permissions. .El .Pp -Once creation of writeable and executable mappings is allowed, -it is impossible (and pointless) to disallow it. +If both flags are set, +.Dv PROC_WX_MAPPINGS_DISALLOW_EXEC +takes precedence during +.Xr execve 2 . +If neither flag is set, +mappings with write and execute permissions are only permitted if the +.Dv kern.elf{32/64}.allow_wx +sysctl is non-zero or the +.Xr elfctl 1 +.Dq wxneeded +flag is set in the ELF control note. +.Pp +Once creation of writeable and executable mappings is enabled for a process, +it is impossible (and pointless) to disable it. The only way to ensure the absence of such mappings after they -were enabled in a given process, is to set the +were enabled in a given process is to set the .Dv PROC_WX_MAPPINGS_DISALLOW_EXEC flag and .Xr execve 2 an image. .It Dv PROC_WXMAP_STATUS -Returns the current status of the 'write exclusive against execution' -enforcement for the specified process. +Returns the current status of the controls over creation of mappings with +both write and execute permissions for the specified process. The .Dv data -parameter must point to the integer variable, where one of the +parameter must point to an integer variable, where one of the following values is written: -.Bl -tag -width PROC_WX_MAPPINGS_DISALLOW_EXEC +.Bl -tag -width Ds .It Dv PROC_WX_MAPPINGS_PERMIT -Creation of simultaneously writable and executable mapping is permitted, -otherwise the process cannot create such mappings. +Creation of simultaneously writable and executable mappings are permitted; +otherwise, the process cannot create such mappings. .It Dv PROC_WX_MAPPINGS_DISALLOW_EXEC After .Xr execve 2 , -the new address space should disallow creation of simultaneously +the new address space will not permit creation of simultaneously writable and executable mappings. .El .Pp -Additionally, if the address space of the process disallows +Additionally, if the address space of the process does not permit creation of simultaneously writable and executable mappings and it is guaranteed that no such mapping was created since address space creation, the @@ -676,19 +751,18 @@ flag is set in the returned value. AMD64 only. Controls the Kernel Page Table Isolation (KPTI) option for the children of the specified process. -For the command to work, the +This control is only meaningful if KPTI has been enabled globally by the .Va vm.pmap.kpti -tunable must be enabled on boot. +tunable. It is not possible to change the KPTI setting for a running process, -except at the -.Xr execve 2 , -where the address space is reinitialized. +only for new address spaces constructed by a future +.Xr execve 2 . .Pp The .Fa data parameter must point to an integer variable containing one of the following commands: -.Bl -tag -width PROC_KPTI_CTL_DISABLE_ON_EXEC +.Bl -tag -width Ds .It Dv PROC_KPTI_CTL_ENABLE_ON_EXEC Enable KPTI after .Xr execve 2 . @@ -697,36 +771,36 @@ Disable KPTI after .Xr execve 2 . Only root or a process having the .Va PRIV_IO -privilege might use this option. +privilege can use this option. .El .It Dv PROC_KPTI_STATUS Returns the current KPTI status for the specified process. .Fa data -must point to the integer variable, which returns the -following statuses: -.Bl -tag -width PROC_KPTI_CTL_DISABLE_ON_EXEC +must point to an integer variable, where one of the +following values is written: +.Bl -tag -width Ds .It Dv PROC_KPTI_CTL_ENABLE_ON_EXEC .It Dv PROC_KPTI_CTL_DISABLE_ON_EXEC .El .Pp -The status is or-ed with the +The status is or-ed with .Va PROC_KPTI_STATUS_ACTIVE -in case KPTI is active for the current address space of the process. +if KPTI is active for the current address space of the process. .El .Sh NOTES Disabling tracing on a process should not be considered a security -feature, as it is bypassable both by the kernel and privileged processes, +feature, as it is bypassable both by the kernel and privileged processes and via other system mechanisms. As such, it should not be utilized to reliably protect cryptographic keying material or other confidential data. .Pp Note that processes can trivially bypass the 'no simultaneously writable and executable mappings' policy by first marking some mapping -as writeable and write code to it, then removing write and adding +as writeable, writing code to it, then removing write and adding execute permission. -This may be legitimately required by some programs, such as JIT compilers. +This may be legitimately required by some programs such as JIT compilers. .Sh RETURN VALUES -If an error occurs, a value of -1 is returned and +If an error occurs, a value of \-1 is returned and .Va errno is set to indicate the error. .Sh ERRORS @@ -782,22 +856,21 @@ An invalid or zero signal number was requested for a .Dv PROC_REAP_KILL request. .It Bq Er EINVAL -The +A .Dv PROC_REAP_RELEASE request was issued by the .Xr init 8 process. .It Bq Er EBUSY -The +A .Dv PROC_REAP_ACQUIRE -request was issued by a process that had already acquired reaper status -and has not yet released it. +request was issued by a process that is already a reaper process. .It Bq Er EBUSY -The +A .Dv PROC_TRACE_CTL -request was issued for a process already being traced. +request was issued for a process being traced. .It Bq Er EPERM -The +A .Dv PROC_TRACE_CTL request to re-enable tracing of the process .Po Dv PROC_TRACE_CTL_ENABLE Pc , @@ -805,7 +878,7 @@ or to disable persistence of .Dv PROC_TRACE_CTL_DISABLE on .Xr execve 2 -was issued for a non-current process. +specified a target process other than the calling process. .It Bq Er EINVAL The value of the integer .Fa data @@ -826,6 +899,7 @@ or invalid signal number. .El .Sh SEE ALSO .Xr dtrace 1 , +.Xr elfctl 1 , .Xr proccontrol 1 , .Xr protect 1 , .Xr cap_enter 2 , @@ -844,15 +918,17 @@ The function appeared in .Fx 10.0 . .Pp -The reaper facility is based on a similar feature of Linux and +The reaper facility is based on a similar feature in Linux and DragonflyBSD, and first appeared in .Fx 10.2 . .Pp The .Dv PROC_PDEATHSIG_CTL -facility is based on the prctl(PR_SET_PDEATHSIG, ...) feature of Linux, +facility is based on the +.Ql prctl(PR_SET_PDEATHSIG, ...) +feature in Linux, and first appeared in .Fx 11.2 . .Pp -The ASLR support was added to system for the checklists compliance in +ASLR support was added for checklist compliance in .Fx 13.0 . From nobody Fri Dec 27 17:06:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX2q4DkCz5j3CD; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2p3QPtz4vlv; Fri, 27 Dec 2024 17:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QLne6PyXFgwd/jzE0mJyplhm3a68GJOYdCajhbovAaY=; b=B1wWnLC0ix/Gebs5uRWVd/uZ9l1QNchXG2SH1Zr5fa5etvWmtAadCJrFdltD0SlSSohEr9 bmUVBm/5X7vjbFNnEjQymWsmENUIaxbdf9ozwtWODcAr+MI5mjdBMenUbO0LBgbqzBPGg/ BtNJxb0E/1LdPql7VZxeijdJSe3SNPRyGCEKZpPzymO7ZpiunFtv8i+iT9DCIdN2OAuz+n tx8iOzn44XS0XSzbMyZqmha2Sl6yr/+UaIrCJHnD5Ynm2OHswws/t7u3jfzn4KIL9ik4Gk 8FoUtjWr7Vh+vYXBtmqDYiMExliyNggq7V9zZ/Xrzu2JUMm+kS8M2YieFt74sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QLne6PyXFgwd/jzE0mJyplhm3a68GJOYdCajhbovAaY=; b=fk1ohDwyUEH3JpMNfcvoVeZgCfYHPwZZ2a9M02Ro43VvyE+KJwgATlLJf8BJqGANfp3aTK Ost7QIbaSW0dMp0Tv4aS3oQpmLF0S4Xfwek7KldQtAYKO+dQe6GyG8rKON5B7+l4jRQzsu /KBnlOk1e3DYvatr1c35kECN7DNyx3loDJKsIFsl5T5qSIBVp63yItsZLXr8EL/BvjmWH9 sn9Gbf1YhY7wwpS7VVzu1iA/DxhZTy/dW5e3SRnpLXHYAZxVJqcQv3m9f1U/DcKV8di+D7 F58OqhRZpEv1/rwrn3kCGpfIzqbT0y678tvPid7vKbRnezQASNnRwBg3Lfc3ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319186; a=rsa-sha256; cv=none; b=VEP4yw4GG/KXgzkdMvnlO9UMJaFPnAKdVD+rPOLsCUInmHqC6djXgfrdHt50t1lMUFtWTC y6kUZdW7zUgVcJwN4gn19rZWZKINxkwW+XVFC+dEcx0hzMOyrio2qmrb7iDq+B7i256Hm6 dh3wwglqAzo301hL/nG+XSF20RCezZCwhcXvF41WrYS+OHkDwooyuW5tVg9OcM+t7HYUWW lU2nsdq+YJk2/bU6Ep6SFnp0xPrR11pAyZSLtcACRGJTjNAV0nPRQM9VMJE2Z9Iyv6SXg7 im9KK83JIVQKPiytGBcPw2D5pskp0RcffB1TO9j2QqUrJdsX1foQ4KW/fUTNyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX2p21GHznm8; Fri, 27 Dec 2024 17:06: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 4BRH6Qql037445; Fri, 27 Dec 2024 17:06:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6QR9037443; Fri, 27 Dec 2024 17:06:26 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:26 GMT Message-Id: <202412271706.4BRH6QR9037443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 334e641d3861 - stable/14 - fgets.3: document gets_s() __STDC_WANT_LIB_EXT1__ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 334e641d3861a866817a91a85b0bc3ec76936799 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=334e641d3861a866817a91a85b0bc3ec76936799 commit 334e641d3861a866817a91a85b0bc3ec76936799 Author: Graham Percival AuthorDate: 2024-10-06 22:57:45 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:48:27 +0000 fgets.3: document gets_s() __STDC_WANT_LIB_EXT1__ This matches the man page for qsort_s(). PR: 281828 Signed-off-by: Graham Percival Sponsored by: Tarsnap Backup Inc. (cherry picked from commit d0a3fd34a05794bc5cbf48709001a78e9f85169a) --- lib/libc/stdio/fgets.3 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/stdio/fgets.3 b/lib/libc/stdio/fgets.3 index 6533c218a789..f4488dceb8cd 100644 --- a/lib/libc/stdio/fgets.3 +++ b/lib/libc/stdio/fgets.3 @@ -31,7 +31,7 @@ .\" .\" @(#)fgets.3 8.1 (Berkeley) 6/4/93 .\" -.Dd April 2, 2022 +.Dd December 6, 2024 .Dt FGETS 3 .Os .Sh NAME @@ -44,6 +44,7 @@ .In stdio.h .Ft char * .Fn fgets "char * restrict str" "int size" "FILE * restrict stream" +.Fd #define __STDC_WANT_LIB_EXT1__ 1 .Ft char * .Fn gets_s "char *str" "rsize_t size" .Sh DESCRIPTION From nobody Fri Dec 27 17:06:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX2q5kSJz5j3NH; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2q43kKz4vpW; Fri, 27 Dec 2024 17:06:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qg9kdStBy5nkk/FuZopkOAr6eiGWc2HBZOG+z4csxV8=; b=fCebqKch00bgQjtBSC1Nv2o5lYrMaeC+8c81Yvr7CLpquyjfEVRYNINkZY1olkA/IabpC+ OOdYnyZJLUKafMb7AtzIYTLpOop1kfD07ArWejiw+tgPWrsmORbgFhHALX67jcZJZ5NBc2 umWwRx8JZJs26yKYSJi9nsqa1u7TsaFYFwy9wctl0dGMEtwoWsxqcM7ZOOxEfM2G/1tLER 0v+aEJd5WL/9ku1IKoqYSAAem0u/4NrjrzO+mOL0V8nzn6l97IaqrKKSK/fvexUpNwnFeo CEbbCc5w/09py8p06kEw1zvckwFuG07V8h5FapT53ueCVRNgj1YK73RrfctS/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qg9kdStBy5nkk/FuZopkOAr6eiGWc2HBZOG+z4csxV8=; b=RRe83sFmJKw+mvNsmqdrjK6lh8xBPlwHtVSAXZ+yb0COPynFxsP9ITbhJEExQGGMqeGJhH D9sECIaE7bFS6lVT8tjOY3qpJitXLTqtO96GlvEX0e0ii7dCNks7HX7vZT+eqegktezRvR xRpSsWspC3AmvwHbb8K7MDzykrcLqpYXcup3D5AM8eMN5tr9/PmEB10myo+0w6jzfUUOQY nr5G/1ALeVTw8QKLQ8tO26jUiuzAYFltHBgAwOJug/YFcw7H9XnlrHxgkCc7pxHVUpoII+ oVetTP9qN4ZHQ33M7aLgbrt7vS85xdLbQc6NGCsYeka6/kK1cY3zNx43M7TBHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319187; a=rsa-sha256; cv=none; b=kB5MBQdLod6Bo4ll3CzkaqnYTHI/jzrgppcLHGEJr3MAmEi9HkV7B36fw/0NMKon2DI17E Tv3G+LnOyKlIFWx+voWmcaetx9sVjfVDJUkJiifAB4JywTlNyGjPM7FUfuTV5b7L58ucly NEgdlosCjSUqWlYvm2soXfYt8vY5/3Dx0gSNQ+GB3OO+C97bKlzjWC2qLCdFLUY6u18jmq RP7p2MndyLLMKjMDxOBpKwmrRzWa+YAtywcxPutAGj63eV9J4WiEAGwrGaKyiJNy1Lhvqc Af+eYNAzCZ9cdgAJ7uVZMPs0qCuJh6cJAxfLgcd4mamkP57+QEYZqGLg1OAwvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX2q3F0Zznhc; Fri, 27 Dec 2024 17:06: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 4BRH6RAx037493; Fri, 27 Dec 2024 17:06:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6RMI037490; Fri, 27 Dec 2024 17:06:27 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:27 GMT Message-Id: <202412271706.4BRH6RMI037490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 000823559af9 - stable/14 - find: Re-enable the -acl primary on FreeBSD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 000823559af9a890cbe90958470e937c2425903f Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=000823559af9a890cbe90958470e937c2425903f commit 000823559af9a890cbe90958470e937c2425903f Author: Yoshiaki Kasahara AuthorDate: 2024-12-06 18:27:32 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:49:45 +0000 find: Re-enable the -acl primary on FreeBSD This was made conditional to support cross-builds, but the relevant header wasn't included so it was never enabled for native builds. PR: 278124 Fixes: c3a6ea5ba6b5 Allow compiling usr.bin/find on Linux and Mac (cherry picked from commit 984add354edef8a6b4983a33f89ff62532a1556b) --- usr.bin/find/option.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c index dc5e5003b3fb..bcb407fdf6f7 100644 --- a/usr.bin/find/option.c +++ b/usr.bin/find/option.c @@ -38,6 +38,7 @@ static char sccsid[] = "@(#)option.c 8.2 (Berkeley) 4/16/94"; #include #include +#include #include #include From nobody Fri Dec 27 17:06:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX2s2Syqz5j2py; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2r4RDfz4vtl; Fri, 27 Dec 2024 17:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1j+4plllmORGEBrqJGYLvMKGh+boJCUMvaTh2IB/JiA=; b=IhNU+LpCCtCEihB/y9mRW2peFwYvfgFUhpFT2da/7nthLKT4YJPqKq9JcIlHeR4sO6/r64 gtfeuCd2hw1d6yYjLKBuxkk7qufplCFY8geTTyZN6BaRkeukx1Ubclxabwgbnh5UZav7EU y5eoae4rnK7VPI0mrTT9rqUN3UmkfQx/FPu9L2IAy0Y47yH4VI5VO+CeljFWrCb7kESbqe WNOoQdCE/KVp/ddrvoVbo4KjEIzBUvAmbKbbdkKEQDKvVcyKPdYgICcJyk9zj+x/Zx3N5w /Ci7cUmeqCEFA6kKMEVaCzhgN6CNWjSTn4hotq0qWhynEiCrJh/5zFObd8lW0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1j+4plllmORGEBrqJGYLvMKGh+boJCUMvaTh2IB/JiA=; b=WUIQGND4+ujGJZgLERDfDrNu2+VXLZuDPN7QotGpcm8CdmjmOze9nKSQ+Y1t96Iewivmq/ FEM8vP6ig5WF6rIYjizb1TjNS42WU4z59FEWnYB+zXbNLm8kiZy8oeKhbXyd05S5DIyT7t s6ZxlSurhtl7heVr+SBJoR9cttPMxWAv3gBy8dSUOMnFHivVqinzqqdbfZDJEZ0gRbw6mq yAc8MesybqoxVQ9LKUkIOkRwtmQqWGj3E+CoNpzvDr3lgIFonvSvSEDEv2xswF5XsgzHT9 9xLxUgdkufory+OK1FD8BLmsYJJc/PmfknkFZ988l+gfV/TFEbeu3cfCUYrcyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319188; a=rsa-sha256; cv=none; b=ylmpWKOLGbdWoBIIB+HjLtWG0vLQgfbarlskqKPg88TMhE1qfbW1F11ZxK65e/SwpvZbE2 l+ruYKRB04JUHKaY3OLvY8t/Q/7JdTCeNuseCsNqlffqpekVCun3kvI/Xo4/DEpPxQw0de dNLUCnn+3g7AVAnC1FPma7xggfO6g8DSD+6uI17/TiQnHYsi+0rGegMArhyjUqSvgXN516 wWIGI323KVrRmbqlpVpjXaf0LScEkRnu0XC93RTJ857IEW/V1qpy2VqQ9JYqK7VxZSdDtc EJvNH6qBs9bQrToVh8cc3AWHB7cM3m0s2+l6Wq3u2wbjgGZN8SwkG8wY8RhurA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX2r3ywsznhd; Fri, 27 Dec 2024 17:06: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 4BRH6S2X037566; Fri, 27 Dec 2024 17:06:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6S99037563; Fri, 27 Dec 2024 17:06:28 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:28 GMT Message-Id: <202412271706.4BRH6S99037563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 32b7c5e7193a - stable/14 - cd9660: Apply the file and directory mode masks bits to all 12 access bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 32b7c5e7193ad051b637262b6c7cb315478609d1 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=32b7c5e7193ad051b637262b6c7cb315478609d1 commit 32b7c5e7193ad051b637262b6c7cb315478609d1 Author: John Baldwin AuthorDate: 2024-12-06 22:40:35 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:50:56 +0000 cd9660: Apply the file and directory mode masks bits to all 12 access bits This permits the mask bits to control the upper 3 bits used for setuid, setgid, and sticky permissions. While here, clarify the manpage language as non-Rockridge volumes with extended attributes can also supply users and groups along with permissions. Reviewed by: olce Fixes: 82f2275b73e5 cd9660: Add support for mask,dirmask,uid,gid options Differential Revision: https://reviews.freebsd.org/D47357 (cherry picked from commit c1ad5b4b10c5e426d3d782b7216a038187419a1e) --- sbin/mount_cd9660/mount_cd9660.8 | 23 ++++++++++++----------- sys/fs/cd9660/cd9660_vfsops.c | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8 index af417d4d025e..325004a107f0 100644 --- a/sbin/mount_cd9660/mount_cd9660.8 +++ b/sbin/mount_cd9660/mount_cd9660.8 @@ -75,30 +75,31 @@ version number. .It Fl G Ar group Set the group of the files in the file system to .Ar group . -The default gid on non-Rockridge volumes is zero. +The default gid on volumes without extended attributes or Rockridge extensions +is zero. .It Fl U Ar user Set the owner of the files in the file system to .Ar user . -The default uid on non-Rockridge volumes is zero. +The default uid on volumes without extended attributes or Rockridge extensions +is zero. .It Fl m Ar mask Specify the maximum file permissions for files in the file system. -(For example, a +For example, a .Ar mask of -.Li 755 -specifies that, by default, the owner should have -read, write, and execute permissions for files, but -others should only have read and execute permissions). +.Li 544 +limits the owner to +read and execute permissions for files and +others to only read permission. See .Xr chmod 1 for more information about octal file modes. -Only the nine low-order bits of -.Ar mask -are used. The default .Ar mask -on non-Rockridge volumes is 755. +is 7777. +The default permissions on volumes without extended attributes or Rockridge +extensions is 555. .It Fl M Ar mask Specify the maximum file permissions for directories in the file system. diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 76c20c3cf5ca..dbe505944dde 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -397,7 +397,7 @@ iso_mountfs(struct vnode *devvp, struct mount *mp) isomp->im_mountp = mp; isomp->im_dev = dev; isomp->im_devvp = devvp; - isomp->im_fmask = isomp->im_dmask = ACCESSPERMS; + isomp->im_fmask = isomp->im_dmask = ALLPERMS; vfs_flagopt(mp->mnt_optnew, "norrip", &isomp->im_flags, ISOFSMNT_NORRIP); vfs_flagopt(mp->mnt_optnew, "gens", &isomp->im_flags, ISOFSMNT_GENS); From nobody Fri Dec 27 17:06:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX2x0zcNz5j3NP; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2w20fdz4vdd; Fri, 27 Dec 2024 17:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x7kSwyV+QzVgyDBR+XCYZFGm7k0Mlg6tEs/iJ3JOkLk=; b=WHT4WfXUjvhbxIKOcGAI2fbzlEL9caAcxO8UxOFfCsOIgRC3cg4wj8LN9+9yxcPa4YQqzg 7h+QPZfXXaEaoNbh+v5Gd44zJeXF9jo9XZRcyY60Tt3ApqXb4gxVyDnoHMxP0a+ICOjopx 9w3g9vjM4hio9ZScgwBWHFJfAwPmsgP8R0Vt+Nr704TTPHgcpwhTA+mJyD36vehNQiAx3x Y64qvL8rgSh+2WAKV8Mn8iBbk26rc/R8N4Zz48SJmSHkh7QADp2FTlBKKix7lY+XNBlc10 P4bkxz9B9GYUP7cuWI4FZuQUAsOgPuID10iclfEaVvWG67zhm4SwVCwrlT2u7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x7kSwyV+QzVgyDBR+XCYZFGm7k0Mlg6tEs/iJ3JOkLk=; b=wClo0O9nMEjBZCZe67Qix+2bh2twKMX+wVEsDUrqxGeJuyuxyEA6HyVjj07Evz4yptDIt+ 0LW4upApibwq4gu5QmxnpVms1UZ44776hPG4LnfUj/+a5uDqaErxs544PaVWXf9qJsYHMO usITT9oqvIfTpSD4YHo6SkwjS+q/5maj32NN1G/tiSEym5wzTJNSWT0Z52B2XuezrOm0YN 2FZSDJUkMdDKbjq1/46J9bmd6B6nFgRdgHW8iJDnm3fnXEftMhpO9fa4sz29E4I52PBTaq ANkZDJ1IAJM09UirhLc40nlGKCg6UF/i2se/1uCBh6fByuesQC4lhRwcIg0lAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319192; a=rsa-sha256; cv=none; b=wWUuf59tB7+86lB3Wbw/we/QvI3TiH/trP6PG8uhUqvKn/f551gS5zIEbCq2Tz2IEcBW0W wb+/WzkFjmWeRf5R6op5NAvln+lzI9Qkf55XPuuB+Ox+kPVM9WHyISB6ovLhvxL+WGf+/P B7cu8eFUVjGJm82HxUsqni0V2IIh0ekoMU0T1/ntNVjcx859qXxsyI50EAtfST6JnecYid /1kKjwImxmqCuHJ9P2SSyne57rWwHvd9iUFfCCXyyA+krpV4anfVQp0mZOsDSn7W6v0obr pZiILzpulSBsTx2/f4PtO3I1NT4VO8kann311E51vhcdYW3ci18fB/svw72nsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX2v6mrBznTM; Fri, 27 Dec 2024 17:06: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 4BRH6V3O037759; Fri, 27 Dec 2024 17:06:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6VRU037756; Fri, 27 Dec 2024 17:06:31 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:31 GMT Message-Id: <202412271706.4BRH6VRU037756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 5403bb70cf34 - stable/14 - timeradd.3: Add missing .Pp after .Ed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5403bb70cf34ade6a32f760260d38dfa6ecf07c1 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5403bb70cf34ade6a32f760260d38dfa6ecf07c1 commit 5403bb70cf34ade6a32f760260d38dfa6ecf07c1 Author: John Baldwin AuthorDate: 2024-12-13 16:53:51 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:53:02 +0000 timeradd.3: Add missing .Pp after .Ed This ensures a blank line between the end of the struct timeval definition and the following paragraph. Formatting change only. Sponsored by: Chelsio Communications (cherry picked from commit 91c6231246b587209e585376c15553f574b17463) --- share/man/man3/timeradd.3 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man3/timeradd.3 b/share/man/man3/timeradd.3 index 6ce601f25150..9720267883ef 100644 --- a/share/man/man3/timeradd.3 +++ b/share/man/man3/timeradd.3 @@ -85,6 +85,7 @@ struct timeval { long tv_usec; /* and microseconds */ }; .Ed +.Pp And the .Fa timespec structure is defined in From nobody Fri Dec 27 17:06:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX2v4vRpz5j3Kr; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2v0Cqsz4vrb; Fri, 27 Dec 2024 17:06:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sGiD2fs8p7cMAd4aXr8yCjoqSbFHzRR5H5tr9RhXmAg=; b=vDc/hvl6HAYaFOqdXVbhZ6m67e7aD9+47fUhFmXhzRTTt5AyZRZ3i/KSF71KYNk8o8Bt2g 9BiJ7XWwE1A3hCCTOjDzHw9XUjjBfKIArC34nhVMHlaQgc07tzs/OZuNOoPGrXBuI0U3Il V6t9a3V4SvoyXIvj0xHWPC3mj2O8P+5NhQeYXAF+2JURUdjQPbCOTSBD4KvzBdgVO4w+u/ a5aCgHDbtm63bB7PO7GB4DW+vjAZZosKT3Rydcv/ce7pQALCDeevdycGQQ4/UYO40lbE0p UzVFVnuIUJcdidkj/IFy5dDhbeRIczWJLHg9LlLKw11MIcxEfYMh3CnqnckJ7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sGiD2fs8p7cMAd4aXr8yCjoqSbFHzRR5H5tr9RhXmAg=; b=DPh7hzA0ysnx3YaKj0qWcAZAQwS074JW/a1qZMcAp9q6017CxkRVPFYpnZIfMyW4xpaibc 3ac3qlepjsFSqtBGBpHkfpzjaXZnW/xNnSYZ08rOSgcHhZzbA+lvDXrAFBldfL3fNDx7/n v4sSnfLQl89R5EBMI/6XXHuRoKDKA0WxcAilUbhDUcrAvfhhOXGeKeGg4gvCmlunxvBojW PkLNu51a4fLTqbbYbT5UWKYzNZRBwYnrS78cB7ZDO5dHJ33bP2ysDBQoC/2XPDFSOAXlfA HA/ftSlqZVhXrZ2lke9xTH1KFrFIi9Pwpq1KB2IT7MBOk/jWOuVWpoQbvnEQJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319191; a=rsa-sha256; cv=none; b=KeMlAdeV6f6sGNzV7kCBfEYDZkGbG9mq1D9Iqx2nQam8s5GDd9qPSrop0K25qvvck/tVIX DLkj62c9aGRamf3BcDRZuRBDHu8AOsTNvZaju3D6VutFE7Tj8lNoYDVeDOlihQ6q2YKA0I trLzNi1f48BxlgrY2ElL/AANGjPBcr96PuFSQsoH3fnmcjx2WSU2AGPF7d+3wRxrdbNA5w oH4NCm3UX//P6TOgosgnweBH290agpDgqplhhV4hAQehIINZKzctPAIDgCTrHR9Yj7rext hX9Hjck6uoZPBvEaMszdPdu70F+n5ECfHzWksTjiumpB4+qdPoz3bKl+kFbZ3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX2t5nNBzmWm; Fri, 27 Dec 2024 17:06: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 4BRH6UOc037694; Fri, 27 Dec 2024 17:06:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6Uis037691; Fri, 27 Dec 2024 17:06:30 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:30 GMT Message-Id: <202412271706.4BRH6Uis037691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 1e87d76855ad - stable/14 - cxgbe tom: Restore support for zerocopy TCP receive for aio_read() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1e87d76855adf09da89700cb33f27acde6839741 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1e87d76855adf09da89700cb33f27acde6839741 commit 1e87d76855adf09da89700cb33f27acde6839741 Author: John Baldwin AuthorDate: 2024-12-11 02:13:51 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:52:55 +0000 cxgbe tom: Restore support for zerocopy TCP receive for aio_read() The commit to introduce TCP_USE_DDP support had a couple of bugs that broke support for zerocopy receive via aio_read(). First, the length and offset arguments to mk_update_tcb_for_ddp() were reversed which prevented DDP from working. Second, the AIO state in the toep was initialized too late when the first aio_read() request was queued. Reported by: Harshavardhan Tanneru @ Chelsio Fixes: eba13bbc37ab cxgbe: Support TCP_USE_DDP on offloaded TOE connections MFC after: 1 week Sponsored by: Chelsio Communications (cherry picked from commit 70693a45381b687e40ea30710aa38cb9f24b6b02) --- sys/dev/cxgbe/tom/t4_ddp.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c index a08ddea00d05..7f0e9c46d2bf 100644 --- a/sys/dev/cxgbe/tom/t4_ddp.c +++ b/sys/dev/cxgbe/tom/t4_ddp.c @@ -2653,8 +2653,8 @@ sbcopy: * which will keep it open and keep the TCP PCB attached until * after the job is completed. */ - wr = mk_update_tcb_for_ddp(sc, toep, db_idx, &ps->prsv, ps->len, - job->aio_received, ddp_flags, ddp_flags_mask); + wr = mk_update_tcb_for_ddp(sc, toep, db_idx, &ps->prsv, + job->aio_received, ps->len, ddp_flags, ddp_flags_mask); if (wr == NULL) { recycle_pageset(toep, ps); aio_ddp_requeue_one(toep, job); @@ -2820,6 +2820,14 @@ t4_aio_queue_ddp(struct socket *so, struct kaiocb *job) return (EOPNOTSUPP); } + if ((toep->ddp.flags & DDP_AIO) == 0) { + toep->ddp.flags |= DDP_AIO; + TAILQ_INIT(&toep->ddp.cached_pagesets); + TAILQ_INIT(&toep->ddp.aiojobq); + TASK_INIT(&toep->ddp.requeue_task, 0, aio_ddp_requeue_task, + toep); + } + /* * XXX: Think about possibly returning errors for ENOTCONN, * etc. Perhaps the caller would only queue the request @@ -2834,14 +2842,6 @@ t4_aio_queue_ddp(struct socket *so, struct kaiocb *job) TAILQ_INSERT_TAIL(&toep->ddp.aiojobq, job, list); toep->ddp.waiting_count++; - if ((toep->ddp.flags & DDP_AIO) == 0) { - toep->ddp.flags |= DDP_AIO; - TAILQ_INIT(&toep->ddp.cached_pagesets); - TAILQ_INIT(&toep->ddp.aiojobq); - TASK_INIT(&toep->ddp.requeue_task, 0, aio_ddp_requeue_task, - toep); - } - /* * Try to handle this request synchronously. If this has * to block because the task is running, it will just bail From nobody Fri Dec 27 17:06:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX2t0kYNz5j36p; Fri, 27 Dec 2024 17:06:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2s5S1Cz4vbW; Fri, 27 Dec 2024 17:06:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3lWdP/32ESdyHz7H1SmwWIhLNpUpIP/T/E1czrGH70I=; b=Vb+nIYMeqeLFySOLQ6PjjE2PF8ZpxmEjiEdKu1y3kC/EQ009Gg8xZaivaSKDG/016nv7UQ 3c03NE22RQnkOJ/2Ep7M/YwLVOsmUa9sjbyqBSDPVS43nh4fnBYry+lv/r9AKnTM02GIIE RViZO2WLwW4H2qjxMcu3vbj5fwfP2LoUenGUpO32pl9BiDQpVT9Szi64k0e1ia2oPdY8Qg SzHGGdDCz20MyQvdmzrAw6DLw+52C+F4tIsep4lSLeXujdfSjPY9p5iOA+YoPms29DXDm9 En2yCXJuuoAsaT64wx9+lHCF6Or1Pepb7bx0Jcv3/9V5vJHQECK5rJncREqZnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3lWdP/32ESdyHz7H1SmwWIhLNpUpIP/T/E1czrGH70I=; b=msY0eDw/v5UlBCPUkFYvyhBxXRvJwKfIz5QQL2me4JXnnpL4Kg4ez5ICXD/HvxBqs9q4h2 9u5OSsNgu2CigHmsi9BlX7+y9lj+ucEJNkTr0E18XNfRtWPyL0VPMaMntX5wYeR7kTGnMo aGql6JA03gsytCz/5vQ3jzSgBbXvnhFVURwClSpmVYSno877HpTRUeE3kZldK+Dgby8jZe OamtDr5jlOSZ67XB6wMnqhcMCB/By9CDCruMlv6WIYOCwnc5aAmiqn/OlAunx1wgPxmmmH kpeLjyUAXhlIKVTU671PYuIoGyrugqmM67xpB4rYzjK9VjTrs4mNTLzI7id5mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319189; a=rsa-sha256; cv=none; b=iUYmHMwad6qs1FAp2P9Xx8Umvd3iJg3iYCeDjWNVtL3f5ehmPFkQcYJq7jGvXjkEr20t9S ttAeSxSwTNtTsegTzk5892OOFHyXAhAWF9hM7EXjfMt2CG+b6s9ORnMLLoayVMNBEBmRTr WL0trLCBJDIoQo5MwbAI77e8cgE8gJX/jvCFz5s9UgvSQQnCTrKsWtYFH6eNIzkN/Vio0n OVhugqtw3ge+6Q1E/2QLoit6ffVmt3mK35ZG+JU5bfAkzJ/zuAxGg6l81E8Fq6WCuwhxTQ pvV+lj2lGfS1SCoSARYCxgYUUaxE0uXMmGo1M7ZnGenqetpL2qwwSzn5jR4ZXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX2s4z83znTL; Fri, 27 Dec 2024 17:06:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRH6THw037620; Fri, 27 Dec 2024 17:06:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6TtU037617; Fri, 27 Dec 2024 17:06:29 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:29 GMT Message-Id: <202412271706.4BRH6TtU037617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 18a9da18ad2c - stable/14 - mount_cd9660.8: Bump .Dd for expanding mode mask bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 18a9da18ad2caf1c99a4002678573a43352092e4 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=18a9da18ad2caf1c99a4002678573a43352092e4 commit 18a9da18ad2caf1c99a4002678573a43352092e4 Author: John Baldwin AuthorDate: 2024-12-07 15:45:26 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:52:10 +0000 mount_cd9660.8: Bump .Dd for expanding mode mask bits Forgot to amend the prior commit before pushing. Fixes: c1ad5b4b10c5 cd9660: Apply the file and directory mode masks bits to all 12 access bits (cherry picked from commit dde3a7e15be175e8b733cfc42bbb2a2c15810311) --- sbin/mount_cd9660/mount_cd9660.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8 index 325004a107f0..74fcb31fbbd3 100644 --- a/sbin/mount_cd9660/mount_cd9660.8 +++ b/sbin/mount_cd9660/mount_cd9660.8 @@ -31,7 +31,7 @@ .\" .\" @(#)mount_cd9660.8 8.3 (Berkeley) 3/27/94 .\" -.Dd January 2, 2024 +.Dd December 6, 2024 .Dt MOUNT_CD9660 8 .Os .Sh NAME From nobody Fri Dec 27 17:06:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX3B0q0Hz5j3HL; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX391h0Nz3wq1; Fri, 27 Dec 2024 17:06:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zYs3y2kpU8hcp/P9mLdwElRu5lz5pWwcJ6iJI018g1E=; b=nDRD+wsM8YJzJHd7kAvLhoBx5jJJhp6b5Y+0Tm9iWNQ7a92zo56Q1yJK9WxZwVTNmAgpxz WHlzHgdqSpZ+VXThkkYYLu7ezW9lKnigedXGs07wxQuqP3lHpR/DJXaY/Cdo3R7JmCWiiS BCJ9/AKG2cezUYPfjhZ3LSoVVLuTN9fJwYWOzzDgnviGc29L+VWUQFPLv5u7gRXGqqiWgR FuCoNmgeU+lHQCYRhJxU4oLvDa5iC7fbZEILNZWQS3LMw4rGu9onwmTrGr+niKn9DtTtdi cfAR0lKD9fl8EOQrK0dlV2OEaWUD70302szHmVL1Ee+DYJl6NzuU4hzwRvp9Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zYs3y2kpU8hcp/P9mLdwElRu5lz5pWwcJ6iJI018g1E=; b=ExNr/H6CM+BZOKim8/DBEdXJN2jjnHXvU7O3rHJvXWxAGAiSDsAiiRa14mJ6F5Iu1XGS5a D0/7DPzLONPkSmXrOUcH9u56GVio3pSOubmRY8DyDeEcPQNXjnRKsgykcyrHGRKKMxUEgb zcvZ/BcsVPi3/uyhvpABpOnjud6BvsrpXA4HgbBJ5Rg1xO8YAzkVXRh6Ng5e0VzXYWt0Y9 wTMQpm70sd1TrkKmWCEbJ2MMGs6tYZBK08YjaVb9zCuL6y3HGYSaVUffmUjJIsfNVs0dWi qc1LNR1K0hdDGFmQsy1lzVqlmbXo5TsafG2sXwjgtiOfDHKQl2+ur4T142Gq5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319205; a=rsa-sha256; cv=none; b=tI/cC6IiS16PmXbOQBS6/In9aYvFPBxX05SSQYeD6Ywey75aJu9YHIRQiW/rTSg1yiy2dg T4y7Om3K5h3nuu2LKbQSNlvA99G77SedVhMDJXvLGQDzi0+AH3ZmxagdFnQvAdBA1p6crm ew/y+K/mWy6qcTzb61VTjTWzjMHCksA83ElX8hxMDURZ7vHfYtOIXXZmx+DzsjImk6MkKO u8FZj4blB9vUCTwr5db85Tid6VSxBTRXGsw8h/wgavbGLaQxYgHjznkrpGpdFYDaT9Yp6C hz42ZhKu3IbDLB/jsZN8dnqRqNqaPponj+1RFT3Iho5DVkzrNS1kWAz0xbeZVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX3912y5zn77; Fri, 27 Dec 2024 17:06: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 4BRH6jZM038085; Fri, 27 Dec 2024 17:06:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6j5u038082; Fri, 27 Dec 2024 17:06:45 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:45 GMT Message-Id: <202412271706.4BRH6j5u038082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a561352557b1 - stable/13 - ccr(4): Mention geli(4) and ktls(4) as other consumers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a561352557b165df98faa9f9bfbfbbf81c0c3ed3 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a561352557b165df98faa9f9bfbfbbf81c0c3ed3 commit a561352557b165df98faa9f9bfbfbbf81c0c3ed3 Author: John Baldwin AuthorDate: 2024-11-25 19:59:36 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:35:33 +0000 ccr(4): Mention geli(4) and ktls(4) as other consumers Cross reference crypto(7) and crypto(9) as well. Sponsored by: Chelsio Communications (cherry picked from commit 370ad2d36789dd565b87dcd0bec6964e3d15c71a) --- share/man/man4/ccr.4 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/share/man/man4/ccr.4 b/share/man/man4/ccr.4 index 11b3a37f384d..2626d3ccdd48 100644 --- a/share/man/man4/ccr.4 +++ b/share/man/man4/ccr.4 @@ -52,7 +52,10 @@ The driver accelerates AES-CBC, AES-CCM, AES-CTR, AES-GCM, AES-XTS, SHA1, SHA2-224, SHA2-256, SHA2-384, SHA2-512, SHA1-HMAC, SHA2-224-HMAC, SHA2-256-HMAC, SHA2-384-HMAC, and SHA2-512-HMAC operations for -.Xr crypto 4 +.Xr crypto 9 +consumers such as +.Xr ktls 4 , +.Xr geli 4 , and .Xr ipsec 4 . The driver also supports chaining one of AES-CBC, AES-CTR, or AES-XTS with @@ -97,7 +100,11 @@ email all the specific information related to the issue to .Sh SEE ALSO .Xr crypto 4 , .Xr cxgbe 4 , -.Xr ipsec 4 +.Xr geli 4 , +.Xr ipsec 4 , +.Xr ktls 4 , +.Xr crypto 7 , +.Xr crypto 9 .Sh HISTORY The .Nm From nobody Fri Dec 27 17:06:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX3C6ls7z5j3FY; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX3B6KBFz3wb2; Fri, 27 Dec 2024 17:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JuYy/lcAOdfUw4PRNk4PsRAyfE3e3L1foOM5wbO2yZc=; b=S8FqRh+h3gmMZfZ2Mm4H5+vtYW1BqBCOqgcaW1jp7RzfRhPhFF+0eKbT+LcfB941m3x8E9 EN93NYmIifMU+pVFKt+hPVMB1BN/3qvLxOyyI3Uj0fhxJAemu5rRbQYBamMiP5E4HAq03j HIPM12ohz3chK8b05qhUpdloR0sTC4xV4YOj2Jfalm7WD+mAYe/07KK4lABqOOm5Werasx uQ54lAP+90PnvbGw+Qm15wM/RFOFxRI/qMaf8lKuKQ91/uwbNmYM+NiThdipj7Dg4XqI08 TCH066q2y25X3tWkRrYmP9QIyi9m2gOp1L2zgqC16OMPptfyRO+NNW0BoDCNGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JuYy/lcAOdfUw4PRNk4PsRAyfE3e3L1foOM5wbO2yZc=; b=AGynwz1s905fwsOjvJ+Is0qm9gbgf4oklKkBk6nnnIXEgqYTTAxnB8zwhg7d0MrCAs2CLj yJ5giP/ezz9/TUVyVOXJ8xSiXln/u9pLsXlc2uGy6JN/v2kQMzVskcJCrlDvI5Fhyc0iSO kquW2tYlRFqyDXLqRcdeSRn9D03mipyR2a9a+99OuAi+GlScPEB3/7wAeqfSua90RMINGo X5C2UkVqC4lNdUS3EtR/db5rE+GgYK+l+XL9Gib6user2AXVBDWHQMWzLiSqy6M+p+8Un4 2EJaMkGe2IeIFzmYforBEiFP8Qn4gMwW4Ap0hP1b3n11xYDDH4q5MKUpV8HmLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319206; a=rsa-sha256; cv=none; b=p5tSNJ4sqGvzYPhwm95+lXPc/5OSbzXXrNLWRoRjUbX/AjOwI1Df6adZhsDs7M3/WUMsOv xPE2pbIu7XzvQtTX/ryrRxL00vp0N1rKzje1VqrWel8vAw9o2j+3smOjb4WBSCSMdHoKT/ mWAo/B2GtpcuVGs5broL2spNSnv0KW4XThXtcMsys9A8IWlKxMbzc2PR2Bts1pUukXpVNP BejcmwuX38q1f8c13ap1QMReGW8t9rId7RNcc/1c1JtgPejYt/gtbWecNP3ZcMaYISKs81 U2ykRpl8koDlyaV6je98A9hHhd6t5HhWgY9uhLYVYag4JcE6hfP0JXQ5Q3BfzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX3B24n2znhf; Fri, 27 Dec 2024 17:06: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 4BRH6kZh038139; Fri, 27 Dec 2024 17:06:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6kYR038136; Fri, 27 Dec 2024 17:06:46 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:46 GMT Message-Id: <202412271706.4BRH6kYR038136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: feb545cb0150 - stable/13 - ccr(4): Belatedly bump .Dd for prior commit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: feb545cb01502259b653cb46c77febd48fdd721b Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=feb545cb01502259b653cb46c77febd48fdd721b commit feb545cb01502259b653cb46c77febd48fdd721b Author: John Baldwin AuthorDate: 2024-11-25 20:16:09 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:35:44 +0000 ccr(4): Belatedly bump .Dd for prior commit Pointy hat to: jhb (cherry picked from commit bf06074106cf80564e1137b0f6ad0eb923baca55) --- share/man/man4/ccr.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/ccr.4 b/share/man/man4/ccr.4 index 2626d3ccdd48..de3f3609a285 100644 --- a/share/man/man4/ccr.4 +++ b/share/man/man4/ccr.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 3, 2019 +.Dd November 25, 2024 .Dt CCR 4 .Os .Sh NAME From nobody Fri Dec 27 17:06:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX3C6pcyz5j3L6; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX3C2yntz3wd3; Fri, 27 Dec 2024 17:06:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ylvXJeZQabN+U6CzRsynx9EaRtkCv1qhb6i7yv7U6u0=; b=QDY/uDRGhtHoYYkA0x/sQCKfJlq8A+22XqRVEFJ3vyH/nU414HwBOgN1AUlLyC/DB8H3A8 lNrJbZ+sXRua6utDWnBBu+4mdcW+htpQYsyOjsqa7+9ET1Xcvrw1QiqM3RtGw6m2+V5XYv 66PfOGwW/6UIFa70PcnJ7vTJy2ek4gerInw3GVkflUWhuEcajpk9+hWbwYPrd/fue2TG9j 4qH5FhAO6xY3OSBSMcCJuFT3vmbALhcsjqOa5QevMsLCx3p6lvV0S3UUZb8rkFNqGJ3Zbj ncvkq2//z7EhkrFFta8ovuTCpuqG98/KAA9wwO0gZ5OUF7k8EMRzPLtoHRfKpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ylvXJeZQabN+U6CzRsynx9EaRtkCv1qhb6i7yv7U6u0=; b=cGMYecZFAK/JNwpCMWp1BnIqXqF3LE2QA5URdPul4h7zBgeadaBYsj3v+Fr54p2ySIWvzU 4up8+X31CRC0irFHbfo8vRLHep58Q8tsqpmz/VVwowN9oMhJnsaVG06f/ktoilN2BNdbPm wqyDVAfhhgOQUJ+0W4Wcc1IaP1xIkadXqykfn+5MFgonpJ1hk6+TFEdTi3wyt1iQHmEIPY TzsbcF4H70e+pI2tfT0c6DzIqfNLIYM/W9h9DoxwuPsPy8R1sMlYJxCxvJGBjDYhfz08Lm 1wY4n4Y5JDI8y4ymhJpXOiODsWnqEWbQqpAH+5NqbmUS99YFlAt6F+TV07WYug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319207; a=rsa-sha256; cv=none; b=u8Ph3vR3G74XCW3zaJY6IysScrHIGmSE4jMgW4shcEDOLIgAFet5XdRM1q66Td1+4exdAZ pYR3+u37dp+NJ0fLRcmEj3HJx6VId6bNWvH/RSnKvd7uhjmSXblrqYooSVyXhZ4jxyaivO qrSd6n8lOpcyVFZCsJkR9ByfcW86fKZwFk7dGMBkbSCcbpkMIreRB8y1G3ogohlogRafe1 IzUAryK82EdtJ/sKkBOEZ6eCIN7PjZsZggI03rUpsmaYEw18U7GvDeuABQMR/1lg0afqj8 59vYT9sTZ38JygCuBhRvFhfbfroPMtxL2Yj4+w8u5XvKj694GtbYVRyY30fVjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX3C2ZScznhg; Fri, 27 Dec 2024 17:06:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRH6lmn038190; Fri, 27 Dec 2024 17:06:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6lVw038187; Fri, 27 Dec 2024 17:06:47 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:47 GMT Message-Id: <202412271706.4BRH6lVw038187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 3aaa2a2694cd - stable/13 - manuals: Fix errors in .2 pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3aaa2a2694cd26a1706c42465d8a3c96ffd68013 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3aaa2a2694cd26a1706c42465d8a3c96ffd68013 commit 3aaa2a2694cd26a1706c42465d8a3c96ffd68013 Author: Graham Percival AuthorDate: 2024-09-20 01:54:39 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:46:45 +0000 manuals: Fix errors in .2 pages These were reported by `mandoc -T lint ...` as errors. fhlink.2, fhreadlink.2: remove unneeded block closing. getfh.2, procctl.2: add necessary block closing. ptrace.2: -width only takes one argument. swapon.2: and weren't being displayed, because .It is for a list item whereas .In is for included files. Also, we want a blank line between headers and the other one. Signed-off-by: Graham Percival PR: 281597 Reviewed by: mhorne Sponsored by: Tarsnap Backup Inc. (cherry picked from commit 650056363baddb83c61c85b0539ee536f3d4b56c) --- lib/libc/sys/fhlink.2 | 1 - lib/libc/sys/fhreadlink.2 | 2 -- lib/libc/sys/getfh.2 | 1 + lib/libc/sys/procctl.2 | 1 + lib/libc/sys/ptrace.2 | 2 +- lib/libc/sys/swapon.2 | 5 +++-- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/sys/fhlink.2 b/lib/libc/sys/fhlink.2 index 332856630879..b7f7d02dd136 100644 --- a/lib/libc/sys/fhlink.2 +++ b/lib/libc/sys/fhlink.2 @@ -38,7 +38,6 @@ .Fn fhlink "fhandle_t *fhp" "const char *to" .Ft int .Fn fhlinkat "fhandle_t *fhp" "int tofd" "const char *to" -.Fc .Sh DESCRIPTION The .Fn fhlink diff --git a/lib/libc/sys/fhreadlink.2 b/lib/libc/sys/fhreadlink.2 index 23850c6a2117..222142de223e 100644 --- a/lib/libc/sys/fhreadlink.2 +++ b/lib/libc/sys/fhreadlink.2 @@ -36,7 +36,6 @@ .In sys/mount.h .Ft int .Fn fhreadlink "fhandle_t *fhp" "char *buf" "size_t bufsize" -.Fc .Sh DESCRIPTION The .Fn fhreadlink @@ -86,7 +85,6 @@ The file handle .Fa fhp is no longer valid .El -.El .Sh SEE ALSO .Xr fhstat 2 , .Xr fhlink 2 , diff --git a/lib/libc/sys/getfh.2 b/lib/libc/sys/getfh.2 index f5eaf4be7874..ae3b67edf1e8 100644 --- a/lib/libc/sys/getfh.2 +++ b/lib/libc/sys/getfh.2 @@ -214,6 +214,7 @@ argument is not an absolute path and is neither .Dv AT_FDCWD nor a file descriptor associated with a directory. +.El .Sh SEE ALSO .Xr fhopen 2 , .Xr open 2 , diff --git a/lib/libc/sys/procctl.2 b/lib/libc/sys/procctl.2 index f6af85a873f6..0f63c37cba58 100644 --- a/lib/libc/sys/procctl.2 +++ b/lib/libc/sys/procctl.2 @@ -702,6 +702,7 @@ following statuses: The status is or-ed with the .Va PROC_KPTI_STATUS_ACTIVE in case KPTI is active for the current address space of the process. +.El .Sh NOTES Disabling tracing on a process should not be considered a security feature, as it is bypassable both by the kernel and privileged processes, diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2 index 25c7663114a5..4406a33a3748 100644 --- a/lib/libc/sys/ptrace.2 +++ b/lib/libc/sys/ptrace.2 @@ -830,7 +830,7 @@ value. If the system call completed in an unusual fashion, .Va sr_error is set to a negative value: -.Bl -tag -width Dv EJUSTRETURN -compact +.Bl -tag -width EJUSTRETURN -compact .It Dv ERESTART System call will be restarted. .It Dv EJUSTRETURN diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2 index c0c12d9dde68..8cfac8ce1f64 100644 --- a/lib/libc/sys/swapon.2 +++ b/lib/libc/sys/swapon.2 @@ -36,8 +36,9 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.It vm/vm_param.h -.It vm/swap_pager.h +.In vm/vm_param.h +.In vm/swap_pager.h +.Pp .In unistd.h .Ft int .Fn swapon "const char *special" From nobody Fri Dec 27 17:06:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX3H4hjBz5j3Nd; Fri, 27 Dec 2024 17:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX3G6NJsz3wtk; Fri, 27 Dec 2024 17:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrAZ5Y1lEAzt5zIvtTiNGIHfzqTj4rPYF8+EYMDwd/o=; b=LeriOQ2kNzgXznhvAm7WcnRsM7wCD8PaB1i8nEiY+ro8TpDHa8XPGhY9Ehkgv1sukfH6iI AbVja54xK62NtoIpcJCgW1Ps3yJYXjVbvrgrghXbZG3rM3j9t/ObSxELTg9wy12Q+Fy1hH VLKjXsAfTvMEVQtaz31U/f0HbsHxV90jMbcPW+APvNvr3WwbzarPFt9Fx+6uvgXhauIQAo LPT56Zl9oy3UgTsdMHhRVWl0kSMw0BxIo6JboJZrbHtuZqT0TAS5P+JP0Q5s1drnbUFl5N Urmr/qxoBWtJlb4xAWnmq05AUhsiaD9kXfg7FQzuWaypqh0MDpW3bwtq7476RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrAZ5Y1lEAzt5zIvtTiNGIHfzqTj4rPYF8+EYMDwd/o=; b=KItdyS7W2/FxXEAhFzRrYPExug9h9ac+dqbs0nkK1tWGV2tc1lFpv/6z4PaeVp4TpX6mA0 VQWrsbkZ18arBLP9MYqH4ItrSLoV6HkxrfuiT1K9eYZdGOvPwJ4axy7o4yv5d1I4lO31nk d1ywhNSUVTmFFzyy1gQASeSNU+bEZnulb/TaGFze0QWn5ClRA/lXo3V9p3yjKtSycfo56O gVlzvE3DflXYPf6wnv9tXmZ4KVZYEibPOdDsFS/kxpgXCQF81L+Kzyh7o70XIXxc4HqjIX Q/yLp7M+KaY/v0tQxSTXousGFo/mbOuwCsUQJyZyEBCdkCckJepO4bqWt2HyiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319210; a=rsa-sha256; cv=none; b=UHGBchl5oY8VKwH8XMTSLOxBWJEmQteCsnxHxkqyJl/X+y+X61Bp45ahJ83MlBAQ81rYYi OeJFJJZ6+eKeDSufMHy1IpUL8KrL7Xe9CBLFqDrS7nN6+YbzsqAwyFyp4R0Hrz6Oo+B3kS yLt1Cx6wBpdxrpUq1oiN3309+ShkM4jrNrjlnYI6Lfb/sJhrHCJdgn1RGD3wWNaU/+n8qk QevF5+TBvDJapvAYTsDgZvbeJiE0FmjyjuzPrVw9fDKcci8IAKGQerNc+sDZ7a4Pc6TurS bZx3XexX4G7CqLBXpr9jhQRMnwqfKt9jXauqR4WEJ1oJdxMmTAKZKavcT+1Hkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX3G563PznG2; Fri, 27 Dec 2024 17:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRH6oeb038324; Fri, 27 Dec 2024 17:06:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6oWK038321; Fri, 27 Dec 2024 17:06:50 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:50 GMT Message-Id: <202412271706.4BRH6oWK038321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7c4be554f72a - stable/13 - fgets.3: document gets_s() __STDC_WANT_LIB_EXT1__ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7c4be554f72adb4bc008aa71c269801c10012d77 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7c4be554f72adb4bc008aa71c269801c10012d77 commit 7c4be554f72adb4bc008aa71c269801c10012d77 Author: Graham Percival AuthorDate: 2024-10-06 22:57:45 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:49:31 +0000 fgets.3: document gets_s() __STDC_WANT_LIB_EXT1__ This matches the man page for qsort_s(). PR: 281828 Signed-off-by: Graham Percival Sponsored by: Tarsnap Backup Inc. (cherry picked from commit d0a3fd34a05794bc5cbf48709001a78e9f85169a) --- lib/libc/stdio/fgets.3 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/stdio/fgets.3 b/lib/libc/stdio/fgets.3 index 6533c218a789..f4488dceb8cd 100644 --- a/lib/libc/stdio/fgets.3 +++ b/lib/libc/stdio/fgets.3 @@ -31,7 +31,7 @@ .\" .\" @(#)fgets.3 8.1 (Berkeley) 6/4/93 .\" -.Dd April 2, 2022 +.Dd December 6, 2024 .Dt FGETS 3 .Os .Sh NAME @@ -44,6 +44,7 @@ .In stdio.h .Ft char * .Fn fgets "char * restrict str" "int size" "FILE * restrict stream" +.Fd #define __STDC_WANT_LIB_EXT1__ 1 .Ft char * .Fn gets_s "char *str" "rsize_t size" .Sh DESCRIPTION From nobody Fri Dec 27 17:06:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX3J3LwHz5j3CV; Fri, 27 Dec 2024 17:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX3H6SQLz3wgw; Fri, 27 Dec 2024 17:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eo/io++3+gQxEvw/bv7UcV2rhJEHrMfDj/rQv2UtE6Y=; b=iHZ7zn3hpQFZPYrj/t228ltZPVuWQaK5CxoWYRf+vUad63Mh+HulvWJ0prG9xkbEhyScFN HLd54AzxwJzRxM7kvL9mV3ejZZntumOF2vvtXBfPCKkkc2M2mX+iA9bE3J2bnlvJObML/H YHkVNR7YThVXhriFMDANoQCK2a38+fcoLGfTSFx9S60DKKLW/51N+JYwZZaxeVN1d8BFVu kDSm8n79ft7o3Qc1aLjfyH8sZHc8+lEld7H3V03iR7zJybPXg9lHuX2YKbb1/RWdwXZue7 mmoIk4HRo+BfKfs0OMcdn0dXYyCrkPYZZWlQmlblZ2My86S5ynImi58EhRnNkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eo/io++3+gQxEvw/bv7UcV2rhJEHrMfDj/rQv2UtE6Y=; b=fCGlcDIuspZIvMuXzQkmtrVxrpu8UcRIZpbyPSK+1QahyN7ow1uO3cJbZHKztttUhB/bNx y6AnWVr4t+dzMtodT5W+4SmhJ7AkyIEVbfxRVq9M1mv5SOM47UBFnKPwfextbnckAfdPAq UrdhuO/QpqKbY6J71Mh/b8/+rL0zmOQopJo8IpZiz7j2weeZKDpgQizu4pIYxLIs202Nku mGU3EywCSufXJ+vDDQVrshWQkVHCnDeIbOr5J7axEpwf60f5QKC63zLvoxDP8AtNa3O1y3 4ZFX9asb+89d0ofNFE9B085dZiDHUX/+Vv/jRDho45yh0WU0gbC+1bh3R+ZZ2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319211; a=rsa-sha256; cv=none; b=X5l76hdcoU1km40ElZ0NoIiIPaqaMqWhNNvbkyovzvwVjhYAzTP9lInsG8ZJiEpBj/58a9 aDeOVm7UUv55AxcIHFtT7sSn8mmdgTr/mBj+T+SpIbUp1kHLdSWDtoR0aSpuev9YNGrsJv K8GTFAmlV2NhjxNsXJ1z+0DDhXquJ3eMw8Un5oBFv3lag67heQJNLBrtTKfRHNfk7zdxJt DQbbPppIr8YgQFpGqw68B2vfq7T7U2lEXa2PPvrK1FMND1wSBdqcZOArmE0nQMpbi8loqR MTMq5BrO2mbTvEIQiTjb0PpWyA9p2bfKCwwujHKWnPwLi1syNRi8lgFCewR6rg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX3H60n5znWp; Fri, 27 Dec 2024 17:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRH6psu038385; Fri, 27 Dec 2024 17:06:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6pkU038382; Fri, 27 Dec 2024 17:06:51 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:51 GMT Message-Id: <202412271706.4BRH6pkU038382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8b82dcb87eba - stable/13 - find: Re-enable the -acl primary on FreeBSD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8b82dcb87ebae3c712b6af5bb455b32fc901bd36 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8b82dcb87ebae3c712b6af5bb455b32fc901bd36 commit 8b82dcb87ebae3c712b6af5bb455b32fc901bd36 Author: Yoshiaki Kasahara AuthorDate: 2024-12-06 18:27:32 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:50:16 +0000 find: Re-enable the -acl primary on FreeBSD This was made conditional to support cross-builds, but the relevant header wasn't included so it was never enabled for native builds. PR: 278124 Fixes: c3a6ea5ba6b5 Allow compiling usr.bin/find on Linux and Mac (cherry picked from commit 984add354edef8a6b4983a33f89ff62532a1556b) --- usr.bin/find/option.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c index dc5e5003b3fb..bcb407fdf6f7 100644 --- a/usr.bin/find/option.c +++ b/usr.bin/find/option.c @@ -38,6 +38,7 @@ static char sccsid[] = "@(#)option.c 8.2 (Berkeley) 4/16/94"; #include #include +#include #include #include From nobody Fri Dec 27 17:06:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX3G6KmSz5j390; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX3D55t5z3wgY; Fri, 27 Dec 2024 17:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y30Su75wxe+O39yV3IGCJ7O7qEEMuBupTNBuibqwzk8=; b=XqPvJMpP4sDNMSBVfz/YG6h9KcC73jYmKMN/b33S28ZrM5MBanInkRJH0nRyFSiuwOkbMc fGVXUrnJWmVL9sWBId5ZD6V6M4bjce80JnqRbbOotpAj3D6gWhSOtOG9TukQaQ11JXzQ38 TvS6coM47h6CM7CAq4HOLbgPEx6tBmOQQ/xkSk3vICae9PYov5Vnj5kqX+5bMJNhAginrw xFlBWecMED13vm5QAVsSrJthmwHjl+sCFX7js33dYhmVtUI5lXlR4O3TTt3LOnHAPcyqpw Mn6FPjPLc7WQ50kIdlaXLNZSXOXWYshyH57NluqJW9kUnEEjVg0ZUuz+zEx1uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y30Su75wxe+O39yV3IGCJ7O7qEEMuBupTNBuibqwzk8=; b=caAPOFQlKJNFm51VO13ezrYn8ljqAo4Bxj4P86za6/hlKME39e+dsJsfEyrmo1txIR+BoS iJK2Sci6tQoHCAfm8hh/bd//tzav5y5I0sYpm0JP36LzVdSCpBoCnZJeUqueNquN55KWqT w6AMMHRG4H6/5J1nu75K9Z5bjQGwy9Dc6pxjt1V0Rv6KzpKEUjUFnfcV4+Ro1jN+0rSHPB +W0hkyxCs2kjDD21F3bJHI+kMNi6FubSpRU5U6kzkwbe/zhTZ30fGwXsgvqt3XZjmhO5M2 KOpeBTF5ZIThk8jUtq57Eydhuau5A7m3pwznw9uk+7blXHcQtUm4B+k3zTiK+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319208; a=rsa-sha256; cv=none; b=ebUcIw6hDtL5WJZy+w6dy7mL8dLdcgme9hdWu40DDpzxvp54AKv9/b8bkHWPApBGtFvc1c /SG1JMX/o/BWJ5W/kqan8mtUb5vgiW7yx6TgzKvR2HVez1CwNW+RRHBbPC+VM5aSbg2Rl8 0RHau4cbcwNee1N/kOByweOKq8VxbdGVJOVRmCOPDLsAV78cl82JVz0H9fSK9FZ/TixXlG GhJIASLWkUwAx9qB5JTCT8QZML/U0MZLf4FcWXoEffdTEBbdzSpiBO3+/XyMAioH+gwV63 Q4V4I9Lo3bqRgL0OQ0OrbxahEP1OTwLlTkWS7LWnC+nMl3AHYXdtB54zSeG4mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX3D3K60znG1; Fri, 27 Dec 2024 17:06: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 4BRH6mdg038234; Fri, 27 Dec 2024 17:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6mlP038231; Fri, 27 Dec 2024 17:06:48 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:48 GMT Message-Id: <202412271706.4BRH6mlP038231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0d17ac9c2202 - stable/13 - manuals: Misc macro typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0d17ac9c22028eee7121b25a7039ecec7dbc47f0 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0d17ac9c22028eee7121b25a7039ecec7dbc47f0 commit 0d17ac9c22028eee7121b25a7039ecec7dbc47f0 Author: Graham Percival AuthorDate: 2024-09-12 16:36:42 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:47:13 +0000 manuals: Misc macro typos These were reported by `mandoc -T lint` as ERROR: skipping unknown macro When these pages were rendered with `man`, the "unknown macro" meant that the entire line was omitted from the output. Obvious typos in: lib/libsys/swapon.2 lib/libsys/procctl.2 share/man/man9/firmware.9 lib/libcasper/services/cap_net/cap_net.3: 'mode' describes a function argument. lib/libsys/statfs.2: there's no .Tm command ("trademark?"), and .Tn ("tradename") is deprecated, so remove the macro entirely. usr.sbin/mfiutil/mfiutil.8: man was interpreting '/dev/' as a macro (which it didn't recognize). share/man/man4/qat.4: same issue as above, but with '0'. In this case, given the context of the previous line, rewriting as "Value '0'" seemed more appropriate. usr.sbin/mlx5tool/mlx5tool.8: typo in .Xr Signed-off-by: Graham Percival Sponsored by: Tarsnap Backup Inc. Reviewed by: concussious, imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1417 (cherry picked from commit 2878d99dfcfbdd7a415a7f31cf95fbd53fc8e581) --- lib/libc/sys/procctl.2 | 2 +- lib/libc/sys/statfs.2 | 4 +--- lib/libc/sys/swapon.2 | 2 +- lib/libcasper/services/cap_net/cap_net.3 | 2 +- usr.sbin/mlx5tool/mlx5tool.8 | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/libc/sys/procctl.2 b/lib/libc/sys/procctl.2 index 0f63c37cba58..497e9bfaeded 100644 --- a/lib/libc/sys/procctl.2 +++ b/lib/libc/sys/procctl.2 @@ -75,7 +75,7 @@ All status changing requests .Dv *_CTL require the caller to have the right to debug the target. All status query requests -.DV *_STATUS +.Dv *_STATUS require the caller to have the right to observe the target. .Pp The following commands are supported: diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2 index b09c91fea3fb..9dc43c1daa19 100644 --- a/lib/libc/sys/statfs.2 +++ b/lib/libc/sys/statfs.2 @@ -233,9 +233,7 @@ Corrupted data was detected while reading from the file system. The fields in the .Vt statfs structure have been defined to provide the parameters relevant for -traditional -.Tm UNIX -file systems. +traditional UNIX file systems. For some other file systems, values that have similar, but not identical, semantics to those described above may be returned. An example is msdosfs, which in case of FAT12 or FAT13 file systems diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2 index 8cfac8ce1f64..b5adda8df2fd 100644 --- a/lib/libc/sys/swapon.2 +++ b/lib/libc/sys/swapon.2 @@ -69,7 +69,7 @@ is made available for other purposes. The .Fa special argument points to the name of the device or file used for swapping. -.The +The .Va flags argument takes the following flags: .Bl -tag -width SWAPOFF_FORCE diff --git a/lib/libcasper/services/cap_net/cap_net.3 b/lib/libcasper/services/cap_net/cap_net.3 index 2851c2f023a0..3987056e2643 100644 --- a/lib/libcasper/services/cap_net/cap_net.3 +++ b/lib/libcasper/services/cap_net/cap_net.3 @@ -110,7 +110,7 @@ interface can be used to restrict access to the network. .Fn cap_net_limit_init returns an opaque limit handle used to store a list of capabilities. The -.Fv mode +.Fa mode restricts the functionality of the service. Modes are encoded using the following flags: .Pp diff --git a/usr.sbin/mlx5tool/mlx5tool.8 b/usr.sbin/mlx5tool/mlx5tool.8 index 17f0fd515a50..5f4157c4d49c 100644 --- a/usr.sbin/mlx5tool/mlx5tool.8 +++ b/usr.sbin/mlx5tool/mlx5tool.8 @@ -60,7 +60,7 @@ The utility executes commands on specific adapter, which is addressed using .Em device:bus:slot:function conventions of the PCIe buses. You can match adapters ethernet name and addresses using the -.X pciconf 8 +.Xr pciconf 8 utility. The address is passed as an argument of the .Fl d From nobody Fri Dec 27 17:06:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX3G6RTfz5j3HX; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX3F5Qwvz4vtS; Fri, 27 Dec 2024 17:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UioIuVDzWdxnLo8zz5Jqchy5w/rNpvhvLhAnCNJcEVA=; b=jv+1VS20AyxGcFnNhAxToS1O7SXUxVM0HcZ5GbIjbmmto8xADC3eXv/ix6rRts225ETcHG b0cq/acUst/t5jFRkZhs0GScJ9cf03v/YumcaW3f75jZmaA2gLW1Vte+cHL7nL4RW3YRmx 0QPalsopDvo17b2uBd3+ge9PE/mc/2Qjl4SPDP2ipkQgA/+aN5HNy/gH6CNV6KKB/+nKO3 hgd9msbHSGnmrL5SJ3tBo1Ewxs9XiiPzn2m0DH9T0gqNVapVSt7NqflN1m+Ft8dzM7948F vums6KiWTDaJtUat7OfFSR6WeRbYXdI+vZkD1oFOQHb6HEQiKuNThH1Pw8ZwUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UioIuVDzWdxnLo8zz5Jqchy5w/rNpvhvLhAnCNJcEVA=; b=AJyPmbNrkhCoKhMALchOYejEsCm6TLD6DqD+zHQfF4ZtEwTxngprpHFCxXqjhdgupM8qHK td12noqo9yHNn/XeOA8pGLOxfK8ftf2OOAY1HaJqQ8DoFMe0J/gSn4Y91z1m/GpMDbFozS YQOod7Q9vL4Zbx+4fQcD/mOBMM3FFNkrCrxdLvJ2HIjtU4uF4C+MTo+uUe1UV2xJtIujN2 2aUt9A+L0hNgl2SbkBWxflNowMglHxByd61w6FVCrsZAGPewvDNhBg8A8TmOfbX6la/e0N HGqdXyvYQUbhmZa91s2yHkilt26OD/orwWmAIeRffAGNwO4Srzkhd2vzO0W0Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319209; a=rsa-sha256; cv=none; b=tQ97cPrr+q6BVNG+hjM9JjmtTWwtQ2waWXZx47YxUqHYZ5/HX5k2oCekvfkW2xkAEDJSsF 2W0CBE3vQnSgNcW3vQKEJi8iNr7bRznnl70/pDhn12cwaRFxe6f+TCl+LMuMNiPLBxcd9a pEB17sarBLY5248tgxGODWo61kxYxNQS6UIX0eBWYPYDtx/QWHzvdJ8m/39B4u5X6TZ69P LhfHHsPR1LgFQxl2hRcbNgWd/NX3QR7s46usCzJuNkz2TN7q1kDSrbJY4ogS6dUw7lgNfm WwtCbIQ+G/0MPiGfkqNMpaEVwITFxUR2+/kaHB9WPC15skFZMuWPBm4lsyKNUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX3F4m53znhh; Fri, 27 Dec 2024 17:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRH6nPo038285; Fri, 27 Dec 2024 17:06:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6nhu038282; Fri, 27 Dec 2024 17:06:49 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:49 GMT Message-Id: <202412271706.4BRH6nhu038282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 269e5e7dcbe4 - stable/13 - procctl.2: Editing pass List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 269e5e7dcbe494beeb2c96badd04737dbfaec0a7 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=269e5e7dcbe494beeb2c96badd04737dbfaec0a7 commit 269e5e7dcbe494beeb2c96badd04737dbfaec0a7 Author: John Baldwin AuthorDate: 2024-12-04 14:11:19 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:47:25 +0000 procctl.2: Editing pass - Add some missing .Pp macros after the end of literal blocks and some lists to ensure there is a blank line before the following text. - Use an indent of Ds for nested lists to reduce excessive indentation and make the bodies of the nested list items easier to read. - Various and sundry rewordings and clarifications. Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D47782 (cherry picked from commit 8277c790179304159c2e4dcb1d99552518d5be8e) --- lib/libc/sys/procctl.2 | 412 +++++++++++++++++++++++++++++-------------------- 1 file changed, 244 insertions(+), 168 deletions(-) diff --git a/lib/libc/sys/procctl.2 b/lib/libc/sys/procctl.2 index 497e9bfaeded..71d2d01e2193 100644 --- a/lib/libc/sys/procctl.2 +++ b/lib/libc/sys/procctl.2 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 26, 2023 +.Dd December 4, 2024 .Dt PROCCTL 2 .Os .Sh NAME @@ -72,16 +72,16 @@ The control request to perform is specified by the argument. .Pp All status changing requests -.Dv *_CTL +.Pq Dv *_CTL require the caller to have the right to debug the target. All status query requests -.Dv *_STATUS +.Pq Dv *_STATUS require the caller to have the right to observe the target. .Pp The following commands are supported: .Bl -tag -width PROC_TRAPCAP_STATUS .It Dv PROC_ASLR_CTL -Controls the Address Space Layout Randomization (ASLR) in the program +Controls Address Space Layout Randomization (ASLR) in program images created by .Xr execve 2 @@ -89,28 +89,35 @@ in the specified process or its descendants that do not either change the control or modify it by other means. The .Fa data -parameter must point to the integer variable holding one of the following +parameter must point to an integer variable holding one of the following values: -.Bl -tag -width PROC_ASLR_FORCE_DISABLE +.Bl -tag -width Ds .It Dv PROC_ASLR_FORCE_ENABLE Request that ASLR is enabled after execution, even if it is disabled system-wide. -The image flag and set-uid might prevent ASLR enablement still. .It Dv PROC_ASLR_FORCE_DISABLE -Request that ASLR is disabled after execution. -Same notes as for -.Dv PROC_ASLR_FORCE_ENABLE -apply. +Request that ASLR is disabled after execution, even if it is enabled +system-wide. .It Dv PROC_ASLR_NOFORCE Use the system-wide configured policy for ASLR. .El +.Pp +Note that the +.Xr elfctl 1 +.Dq noaslr +flag takes precedence over this control. +Executing a binary with this flag set will never use ASLR. +Similarly, executing a set-user-ID or set-group-ID binary ignores this +control and only honors the +.Xr elfctl 1 +flag and system-wide policy. .It Dv PROC_ASLR_STATUS Returns the current status of ASLR enablement for the target process. The .Fa data -parameter must point to the integer variable, where one of the +parameter must point to an integer variable, where one of the following values is written: -.Bl -tag -width PROC_ASLR_FORCE_DISABLE +.Bl -tag -width Ds .It Dv PROC_ASLR_FORCE_ENABLE .It Dv PROC_ASLR_FORCE_DISABLE .It Dv PROC_ASLR_NOFORCE @@ -121,56 +128,79 @@ the .Dv PROC_ASLR_ACTIVE flag is or-ed with the value listed above. .It Dv PROC_PROTMAX_CTL -Controls implicit application of PROT_MAX protection equal to the -.Fa prot -argument of the +Controls the maximum protection used for .Xr mmap 2 -syscall, in the target process. +requests in the target process that do not specify +an explicit maximum protection in the +.Fa prot +argument via +.Dv PROT_MAX . +The maximum protection limits the permissions a mapping can be assigned by +.Xr mprotect 2 . +If an explicit maximum protection is not provided, +the maximum protection for a new mapping is set to either +.Dv PROT_READ | PROT_WRITE | PROT_EXEC +.Pq RWX +or the protection specified in +.Fa prot . +Mappings created with +.Fa prot +set to +.Dv PROT_NONE +always use RWX maximum protection. +.Pp The .Fa data -parameter must point to the integer variable holding one of the following +parameter must point to an integer variable holding one of the following values: -.Bl -tag -width PROC_PROTMAX_FORCE_DISABLE +.Bl -tag -width Ds .It Dv PROC_PROTMAX_FORCE_ENABLE -Enables implicit PROT_MAX application, -even if it is disabled system-wide by the sysctl +Use the permissions in +.Fa prot +as the implicit maximum protection, +even if RWX permissions are requested by the sysctl .Va vm.imply_prot_max . -The image flag might still prevent the enablement. .It Dv PROC_PROTMAX_FORCE_DISABLE -Request that implicit application of PROT_MAX be disabled. -Same notes as for -.Dv PROC_PROTMAX_FORCE_ENABLE -apply. +Use RWX as the implicit maximum protection, +even if constrained permissions are requested by the sysctl +.Va vm.imply_prot_max . .It Dv PROC_PROTMAX_NOFORCE -Use the system-wide configured policy for PROT_MAX. +Use the system-wide configured policy for the implicit PROT_MAX control. .El +.Pp +Note that the +.Xr elfctl 1 +.Dq noprotmax +flag takes precedence over this control. +Executing a binary with this flag set will always use RWX as the implicit +maximum protection. .It Dv PROC_PROTMAX_STATUS -Returns the current status of implicit PROT_MAX enablement for the +Returns the current status of the implicit PROT_MAX control for the target process. The .Fa data -parameter must point to the integer variable, where one of the +parameter must point to an integer variable, where one of the following values is written: -.Bl -tag -width PROC_PROTMAX_FORCE_DISABLE +.Bl -tag -width Ds .It Dv PROC_PROTMAX_FORCE_ENABLE .It Dv PROC_PROTMAX_FORCE_DISABLE .It Dv PROC_PROTMAX_NOFORCE .El .Pp -If the currently executed image in the process itself has implicit PROT_MAX -application enabled, the +If the currently executed image in the process itself has the implicit PROT_MAX +control enabled, the .Dv PROC_PROTMAX_ACTIVE flag is or-ed with the value listed above. .It Dv PROC_SPROTECT Set process protection state. This is used to mark a process as protected from being killed if the system -exhausts the available memory and swap. +exhausts available memory and swap. The .Fa data parameter must point to an integer containing an operation and zero or more optional flags. The following operations are supported: -.Bl -tag -width PPROT_CLEAR +.Bl -tag -width Ds .It Dv PPROT_SET Mark the selected processes as protected. .It Dv PPROT_CLEAR @@ -178,7 +208,7 @@ Clear the protected state of selected processes. .El .Pp The following optional flags are supported: -.Bl -tag -width PPROT_DESCEND +.Bl -tag -width Ds .It Dv PPROT_DESCEND Apply the requested operation to all child processes of each selected process in addition to each selected process. @@ -189,25 +219,41 @@ mark all future child processes of each selected process as protected. Future child processes will also mark all of their future child processes. .El .It Dv PROC_REAP_ACQUIRE -Acquires the reaper status for the current process. -Reaper status means that children orphaned by the reaper's descendants -that were forked after the acquisition of reaper status are reparented to the -reaper process. +Enable orphaned process reaping for future children of the current process. +.Pp +If a parent process exits before one or more of its children processes, +the remaining children processes are orphaned. +When an orphaned process exits, +it is reparented to a reaper process that is responsible for harvesting +the terminated process via +.Xr wait 2 . +When this control is enabled, +the current process becomes the reaper process for future children and their +descendants. +Existing child processes continue to use the reaper assigned when the child +was created via +.Xr fork 2 . +If a reaper process exits, +all of the processes for whom it was the reaper are reassigned to the reaper +process's reaper. +.Pp After system initialization, .Xr init 8 is the default reaper. .It Dv PROC_REAP_RELEASE -Release the reaper state for the current process. -The reaper of the current process becomes the new reaper of the -current process's descendants. +Disable orphaned process reaping for the current process. +.Pp +Any processes for whom the current process was the reaper are reassigned to +the current process's reaper. .It Dv PROC_REAP_STATUS -Provides information about the reaper of the specified process, -or the process itself when it is a reaper. +Provides a consistent snapshot of information about the reaper +of the specified process, +or the process itself if it is a reaper. The .Fa data argument must point to a .Vt procctl_reaper_status -structure which is filled in by the syscall on successful return. +structure which is filled in by the system call on successful return. .Bd -literal struct procctl_reaper_status { u_int rs_flags; @@ -217,16 +263,16 @@ struct procctl_reaper_status { pid_t rs_pid; }; .Ed +.Pp The .Fa rs_flags may have the following flags returned: -.Bl -tag -width REAPER_STATUS_REALINIT +.Bl -tag -width Ds .It Dv REAPER_STATUS_OWNED -The specified process has acquired reaper status and has not -released it. -When the flag is returned, the specified process +The specified process is a reaper. +When this flag is returned, the specified process .Fa id , -pid, identifies the reaper, otherwise the +pid, identifies a reaper, otherwise the .Fa rs_reaper field of the structure is set to the pid of the reaper for the specified process id. @@ -237,23 +283,25 @@ The specified process is the root of the reaper tree, i.e., .Pp The .Fa rs_children -field returns the number of children of the reaper among the descendants. +field returns the number of processes that can be reaped by the reaper that +are also children of the reaper. It is possible to have a child whose reaper is not the specified process, -since the reaper for any existing children is not reset on the -.Dv PROC_REAP_ACQUIRE -operation. +since the reaper for existing children is not changed by +.Dv PROC_REAP_ACQUIRE . The .Fa rs_descendants -field returns the total number of descendants of the reaper(s), -not counting descendants of the reaper in the subtree. +field returns the total number of processes that can be reaped by the reaper. The .Fa rs_reaper -field returns the reaper pid. +field returns the reaper's pid. The .Fa rs_pid -returns the pid of one reaper child if there are any descendants. +returns the pid of one reaper child if there are any processes that can be +reapead; +otherwise, it is set to \-1. .It Dv PROC_REAP_GETPIDS -Queries the list of descendants of the reaper of the specified process. +Queries the list of processes that can be reaped +by the reaper of the specified process. The request takes a pointer to a .Vt procctl_reaper_pids structure in the @@ -265,17 +313,15 @@ struct procctl_reaper_pids { struct procctl_reaper_pidinfo *rp_pids; }; .Ed +.Pp When called, the .Fa rp_pids field must point to an array of -.Vt procctl_reaper_pidinfo -structures, to be filled in on return, -and the .Fa rp_count -field must specify the size of the array, -into which no more than -.Fa rp_count -elements will be filled in by the kernel. +.Vt procctl_reaper_pidinfo +structures. +The kernel will populate these structures with information about the +reaper's descendants. .Pp The .Vt "struct procctl_reaper_pidinfo" @@ -290,17 +336,18 @@ struct procctl_reaper_pidinfo { u_int pi_flags; }; .Ed +.Pp The .Fa pi_pid field is the process id of the descendant. The .Fa pi_subtree -field provides the pid of the child of the reaper, which is the (grand-)parent -of the process. +field provides the pid of the direct child of the reaper which is +the (grand-)parent of the descendant process. The .Fa pi_flags field returns the following flags, further describing the descendant: -.Bl -tag -width REAPER_PIDINFO_EXITING +.Bl -tag -width Ds .It Dv REAPER_PIDINFO_VALID Set to indicate that the .Vt procctl_reaper_pidinfo @@ -314,7 +361,7 @@ of the returned array. .It Dv REAPER_PIDINFO_CHILD The .Fa pi_pid -field identifies the direct child of the reaper. +field identifies a direct child of the reaper. .It Dv REAPER_PIDINFO_REAPER The reported process is itself a reaper. The descendants of the subordinate reaper are not reported. @@ -341,6 +388,7 @@ struct procctl_reaper_kill { pid_t rk_fpid; }; .Ed +.Pp The .Fa rk_sig field specifies the signal to be delivered. @@ -350,7 +398,7 @@ The .Fa rk_flags field further directs the operation. It is or-ed from the following flags: -.Bl -tag -width REAPER_KILL_CHILDREN +.Bl -tag -width Ds .It Dv REAPER_KILL_CHILDREN Deliver the specified signal only to direct children of the reaper. .It Dv REAPER_KILL_SUBTREE @@ -359,6 +407,7 @@ the direct child with pid specified in the .Fa rk_subtree field. .El +.Pp If neither the .Dv REAPER_KILL_CHILDREN nor the @@ -376,22 +425,22 @@ field is set to the pid of the first process for which signal delivery failed, e.g., due to permission problems. If no such process exists, the .Fa rk_fpid -field is set to -1. +field is set to \-1. .It Dv PROC_TRACE_CTL Enable or disable tracing of the specified process(es), according to the value of the integer argument. -Tracing includes attachment to the process using the -.Xr ptrace 2 -and +Tracing includes inspecting the process via +.Xr ptrace 2 , .Xr ktrace 2 , debugging sysctls, .Xr hwpmc 4 , -.Xr dtrace 1 , -and core dumping. +or +.Xr dtrace 1 +as well as dumping core. Possible values for the .Fa data argument are: -.Bl -tag -width PROC_TRACE_CTL_DISABLE_EXEC +.Bl -tag -width Ds .It Dv PROC_TRACE_CTL_ENABLE Enable tracing, after it was disabled by .Dv PROC_TRACE_CTL_DISABLE . @@ -401,7 +450,7 @@ Disable tracing for the specified process. Tracing is re-enabled when the process changes the executing program with the .Xr execve 2 -syscall. +system call. A child inherits the trace settings from the parent on .Xr fork 2 . .It Dv PROC_TRACE_CTL_DISABLE_EXEC @@ -416,10 +465,10 @@ the integer variable pointed to by .Fa data . If tracing is disabled, .Fa data -is set to -1. +is set to \-1. If tracing is enabled, but no debugger is attached by the .Xr ptrace 2 -syscall, +system call, .Fa data is set to 0. If a debugger is attached, @@ -427,23 +476,24 @@ If a debugger is attached, is set to the pid of the debugger process. .It Dv PROC_TRAPCAP_CTL Controls the capability mode sandbox actions for the specified -sandboxed processes, -on a return from any syscall which gives either a +sandboxed processes +on a return from any system call which fails with either an .Er ENOTCAPABLE or .Er ECAPMODE error. -If the control is enabled, such errors from the syscalls cause -delivery of the synchronous +If this control is enabled and a system call fails with one of these errors, +a synchronous .Dv SIGTRAP -signal to the thread immediately before returning from the syscalls. +signal is delivered to the thread immediately before returning from the +system call. .Pp Possible values for the .Fa data argument are: -.Bl -tag -width PROC_TRAPCAP_CTL_DISABLE +.Bl -tag -width Ds .It Dv PROC_TRAPCAP_CTL_ENABLE -Enable the +Enable .Dv SIGTRAP signal delivery on capability mode access violations. The enabled mode is inherited by the children of the process, @@ -451,7 +501,9 @@ and is kept after .Xr fexecve 2 calls. .It Dv PROC_TRAPCAP_CTL_DISABLE -Disable the signal delivery on capability mode access violations. +Disable +.Dv SIGTRAP +signal delivery on capability mode access violations. Note that the global sysctl .Dv kern.trap_enotcap might still cause the signal to be delivered. @@ -463,7 +515,7 @@ On signal delivery, the .Va si_errno member of the .Fa siginfo -signal handler parameter is set to the syscall error value, +signal handler parameter is set to the system call error value, and the .Va si_code member is set to @@ -471,15 +523,18 @@ member is set to .Pp See .Xr capsicum 4 -for more information about the capability mode. +for more information about capability mode. .It Dv PROC_TRAPCAP_STATUS -Return the current status of signalling capability mode access -violations for the specified process. +Return the current status of raising +.Dv SIGTRAP +for capability mode access violations by the specified process. The integer value pointed to by the .Fa data argument is set to the .Dv PROC_TRAPCAP_CTL_ENABLE -value if the process control enables signal delivery, and to +value if +.Dv SIGTRAP +delivery is enabled, and to .Dv PROC_TRAPCAP_CTL_DISABLE otherwise. .Pp @@ -518,39 +573,42 @@ must point to a memory location that can hold a value of type If signal delivery has not been requested, it will contain zero on return. .It Dv PROC_STACKGAP_CTL -Controls the stack gaps in the specified process. -A stack gap is the part of the growth area for a +Controls stack gaps in the specified process. +A stack gap is one or more virtual memory pages at the end of the +growth area for a .Dv MAP_STACK -mapped region that is reserved and never filled by memory. -Instead, the process is guaranteed to receive a +mapping that is reserved and never backed by memory. +Instead, the process is guaranteed to receive a synchronous .Dv SIGSEGV -signal on accessing pages in the gap. -Gaps protect against stack overflow corrupting memory adjacent -to the stack. +signal for each access to pages in the gap. +The number of pages reserved for each stack is set by the sysctl +.Va security.bsd.stack_guard_page . +.Pp +Gaps protect against stack overflows by preventing them from corrupting memory +adjacent to the stack. .Pp The .Fa data argument must point to an integer variable containing flags. The following flags are allowed: -.Bl -tag -width PROC_STACKGAP_DISABLE_EXEC +.Bl -tag -width Ds .It Dv PROC_STACKGAP_ENABLE This flag is only accepted for consistency with .Dv PROC_STACKGAP_STATUS . If stack gaps are enabled, the flag is ignored. -If disabled, the flag causes an -.Ev EINVAL -error to be returned. +If stack gaps are disabled, the request fails with +.Ev EINVAL . After gaps are disabled in a process, they can only be re-enabled when an .Xr execve 2 is performed. .It Dv PROC_STACKGAP_DISABLE Disable stack gaps for the process. -For existing stacks, the gap is no longer a reserved part of the growth -area and can be filled by memory on access. +For existing stacks, the gap is no longer reserved +and can be filled by memory on access. .It Dv PROC_STACKGAP_ENABLE_EXEC -Enable stack gaps for programs started after an +Enable stack gaps for the new address space constructed by any future .Xr execve 2 -by the specified process. +in the specified process. .It Dv PROC_STACKGAP_DISABLE_EXEC Inherit disabled stack gaps state after .Xr execve 2 . @@ -566,7 +624,7 @@ Returns the current stack gap state for the specified process. .Fa data must point to an integer variable, which is used to return a bitmask consisting of the following flags: -.Bl -tag -width PROC_STACKGAP_DISABLE_EXEC +.Bl -tag -width Ds .It Dv PROC_STACKGAP_ENABLE Stack gaps are enabled. .It Dv PROC_STACKGAP_DISABLE @@ -578,82 +636,99 @@ Stack gaps are enabled in the process after Stack gaps are disabled in the process after .Xr execve 2 . .El +.Pp +Note that the +.Xr elfctl 1 +.Dq nostackgap +flag takes precedence over this setting for individual process address spaces. +Executing a binary with this flag set will never use stack gaps in the address +space constructed by +.Xr execve 2 . +However, the controls value can still be inherited by child processes, and +executing a binary without this flag set will revert to the behavior specified +by the control. .It Dv PROC_NO_NEW_PRIVS_CTL -Allows one to ignore the SUID and SGID bits on the program +Allows one to ignore the set-user-ID and set-group-ID bits on the program images activated by .Xr execve 2 in the specified process and its future descendants. The .Fa data -parameter must point to the integer variable holding the following +parameter must point to an integer variable holding the following value: -.Bl -tag -width PROC_NO_NEW_PRIVS_ENABLE +.Bl -tag -width Ds .It Dv PROC_NO_NEW_PRIVS_ENABLE -Request SUID and SGID bits to be ignored. +Request set-user-ID and set-group-ID bits to be ignored. .El .Pp -It is not possible to disable it once it has been enabled. +It is not possible to disable this control once it has been enabled. .It Dv PROC_NO_NEW_PRIVS_STATUS -Returns the current status of SUID/SGID enablement for the target process. +Returns the current status of set-ID bits enablement for the target process. The .Fa data -parameter must point to the integer variable, where one of the +parameter must point to an integer variable, where one of the following values is written: -.Bl -tag -width PROC_NO_NEW_PRIVS_DISABLE +.Bl -tag -width Ds .It Dv PROC_NO_NEW_PRIVS_ENABLE .It Dv PROC_NO_NEW_PRIVS_DISABLE .El .It Dv PROC_WXMAP_CTL -Controls the 'write exclusive against execution' permissions for the -mappings in the process address space. -It overrides the global settings established by the -.Dv kern.elf{32/64}.allow_wx -sysctl, -and the corresponding bit in the ELF control note, see -.Xr elfctl 1 . -.Pp +Controls the creation of mappings with both write and execute permissions +in a process's address space. The .Fa data -parameter must point to the integer variable holding one of the +parameter must point to an integer variable holding one of the following values: -.Bl -tag -width PROC_WX_MAPPINGS_DISALLOW_EXEC +.Bl -tag -width Ds .It Dv PROC_WX_MAPPINGS_PERMIT Enable creation of mappings that have both write and execute -protection attributes, in the specified process' address space. +permissions in the specified process' current and future address spaces. .It Dv PROC_WX_MAPPINGS_DISALLOW_EXEC -In the new address space created by +In a new address space created by a future call to .Xr execve 2 , disallow creation of mappings that have both write and execute permissions. .El .Pp -Once creation of writeable and executable mappings is allowed, -it is impossible (and pointless) to disallow it. +If both flags are set, +.Dv PROC_WX_MAPPINGS_DISALLOW_EXEC +takes precedence during +.Xr execve 2 . +If neither flag is set, +mappings with write and execute permissions are only permitted if the +.Dv kern.elf{32/64}.allow_wx +sysctl is non-zero or the +.Xr elfctl 1 +.Dq wxneeded +flag is set in the ELF control note. +.Pp +Once creation of writeable and executable mappings is enabled for a process, +it is impossible (and pointless) to disable it. The only way to ensure the absence of such mappings after they -were enabled in a given process, is to set the +were enabled in a given process is to set the .Dv PROC_WX_MAPPINGS_DISALLOW_EXEC flag and .Xr execve 2 an image. .It Dv PROC_WXMAP_STATUS -Returns the current status of the 'write exclusive against execution' -enforcement for the specified process. +Returns the current status of the controls over creation of mappings with +both write and execute permissions for the specified process. The .Dv data -parameter must point to the integer variable, where one of the +parameter must point to an integer variable, where one of the following values is written: -.Bl -tag -width PROC_WX_MAPPINGS_DISALLOW_EXEC +.Bl -tag -width Ds .It Dv PROC_WX_MAPPINGS_PERMIT -Creation of simultaneously writable and executable mapping is permitted, -otherwise the process cannot create such mappings. +Creation of simultaneously writable and executable mappings are permitted; +otherwise, the process cannot create such mappings. .It Dv PROC_WX_MAPPINGS_DISALLOW_EXEC After .Xr execve 2 , -the new address space should disallow creation of simultaneously +the new address space will not permit creation of simultaneously writable and executable mappings. .El .Pp -Additionally, if the address space of the process disallows +Additionally, if the address space of the process does not permit creation of simultaneously writable and executable mappings and it is guaranteed that no such mapping was created since address space creation, the @@ -666,19 +741,18 @@ flag is set in the returned value. AMD64 only. Controls the Kernel Page Table Isolation (KPTI) option for the children of the specified process. -For the command to work, the +This control is only meaningful if KPTI has been enabled globally by the .Va vm.pmap.kpti -tunable must be enabled on boot. +tunable. It is not possible to change the KPTI setting for a running process, -except at the -.Xr execve 2 , -where the address space is reinitialized. +only for new address spaces constructed by a future +.Xr execve 2 . .Pp The .Fa data parameter must point to an integer variable containing one of the following commands: -.Bl -tag -width PROC_KPTI_CTL_DISABLE_ON_EXEC +.Bl -tag -width Ds .It Dv PROC_KPTI_CTL_ENABLE_ON_EXEC Enable KPTI after .Xr execve 2 . @@ -687,36 +761,36 @@ Disable KPTI after .Xr execve 2 . Only root or a process having the .Va PRIV_IO -privilege might use this option. +privilege can use this option. .El .It Dv PROC_KPTI_STATUS Returns the current KPTI status for the specified process. .Fa data -must point to the integer variable, which returns the -following statuses: -.Bl -tag -width PROC_KPTI_CTL_DISABLE_ON_EXEC +must point to an integer variable, where one of the +following values is written: +.Bl -tag -width Ds .It Dv PROC_KPTI_CTL_ENABLE_ON_EXEC .It Dv PROC_KPTI_CTL_DISABLE_ON_EXEC .El .Pp -The status is or-ed with the +The status is or-ed with .Va PROC_KPTI_STATUS_ACTIVE -in case KPTI is active for the current address space of the process. +if KPTI is active for the current address space of the process. .El .Sh NOTES Disabling tracing on a process should not be considered a security -feature, as it is bypassable both by the kernel and privileged processes, +feature, as it is bypassable both by the kernel and privileged processes and via other system mechanisms. As such, it should not be utilized to reliably protect cryptographic keying material or other confidential data. .Pp Note that processes can trivially bypass the 'no simultaneously writable and executable mappings' policy by first marking some mapping -as writeable and write code to it, then removing write and adding +as writeable, writing code to it, then removing write and adding execute permission. -This may be legitimately required by some programs, such as JIT compilers. +This may be legitimately required by some programs such as JIT compilers. .Sh RETURN VALUES -If an error occurs, a value of -1 is returned and +If an error occurs, a value of \-1 is returned and .Va errno is set to indicate the error. .Sh ERRORS @@ -772,22 +846,21 @@ An invalid or zero signal number was requested for a .Dv PROC_REAP_KILL request. .It Bq Er EINVAL -The +A .Dv PROC_REAP_RELEASE request was issued by the .Xr init 8 process. .It Bq Er EBUSY -The +A .Dv PROC_REAP_ACQUIRE -request was issued by a process that had already acquired reaper status -and has not yet released it. +request was issued by a process that is already a reaper process. .It Bq Er EBUSY -The +A .Dv PROC_TRACE_CTL -request was issued for a process already being traced. +request was issued for a process being traced. .It Bq Er EPERM -The +A .Dv PROC_TRACE_CTL request to re-enable tracing of the process .Po Dv PROC_TRACE_CTL_ENABLE Pc , @@ -795,7 +868,7 @@ or to disable persistence of .Dv PROC_TRACE_CTL_DISABLE on .Xr execve 2 -was issued for a non-current process. +specified a target process other than the calling process. .It Bq Er EINVAL The value of the integer .Fa data @@ -816,6 +889,7 @@ or invalid signal number. .El .Sh SEE ALSO .Xr dtrace 1 , +.Xr elfctl 1 , .Xr proccontrol 1 , .Xr protect 1 , .Xr cap_enter 2 , @@ -834,15 +908,17 @@ The function appeared in .Fx 10.0 . .Pp -The reaper facility is based on a similar feature of Linux and +The reaper facility is based on a similar feature in Linux and DragonflyBSD, and first appeared in .Fx 10.2 . .Pp The .Dv PROC_PDEATHSIG_CTL -facility is based on the prctl(PR_SET_PDEATHSIG, ...) feature of Linux, +facility is based on the +.Ql prctl(PR_SET_PDEATHSIG, ...) +feature in Linux, and first appeared in .Fx 11.2 . .Pp -The ASLR support was added to system for the checklists compliance in +ASLR support was added for checklist compliance in .Fx 13.0 . From nobody Fri Dec 27 17:06:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX3N47qPz5j392; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX3M3wscz3wr9; Fri, 27 Dec 2024 17:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mQkQsju98tznuxSbX/FBdp/NBchE3ttQXDSQt/NSTO8=; b=cDR0gETjGR9IJUEItO+21p74U6+O1JTpYL0FryrP1oEfaw+8PSCFgUbbh+cVglBWFO1tI0 pcY8uAXoa26fGvJyaunredKp5yQod3yNcoMH2zfpIHpEhnRiDQHslD8nF8oyxyPm0QUiTp mLFHRTwo9HVAOKfynHDuUqfqHNXBJDwSsALENTyqj2elvqeKkBChJ6tdwUxoo0YtDYMja3 BCMN09tu+Nn1/FT9+aQXOScM5nWVrw4JOHF/TtywBrw6SWKJniXrOMbVUTULFpMIVq50D3 qUYghUWRCn882p4FwvAkDmFNQ1tFH7BSmIWJJTkHiGJndUnBU5+cm+4OhCLw9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mQkQsju98tznuxSbX/FBdp/NBchE3ttQXDSQt/NSTO8=; b=ytpvG30+5+wVm+e1id4V+WASVvvAB2kG/1rStteOCoLJeaz2zvQSeqWM4MTBT3oyelG82I dUa4nL54kaGT1ZZe2AmoSBideTXE3T3GPZdz0/+Dg6l+MwNL8IxKmZX9Dj4mZlX2fZF472 mfcVx/mdqcHKiRzCGQjecwboPaTzh6rOlB4Zg7QR7c/SGNOddDZ5ERGaJZ0dG9Vmlakh8U Z+v0zW63T8HgXW2SuyUw0wudd5eY1UdGLdpBnmVIBUcgAxkVIY5e0kfl/eet3bR0xeUUOW fa54X/tGcKRMTMa4Mekpc2dWtFyxOcQ7bopMzjzdZIP8kZBUEpnbEhTW0Munnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319215; a=rsa-sha256; cv=none; b=X7ibIzlPXQnba7Rxw5hDrZb6jGevk2MYWgRToiLLMaDdjSGLMxV38itEOpnkckUDw6j4/W U7j191siPs9DcddBRXkJnCy0l+7ZyvYTGMa+tZ3cHTctUoU3sGHDTZ+55rpZFbLKwTI2nC dsFezaqLqRkDoIIPEzQaeHW6iMkY/oYQVO83RlsgMZLvK81sMUXn8/xFW+NFCjJuYZgn90 Osj7XyQ8vqwo8WiioqPrBkFCQKdrO1FwLzMy2qlbLlK2wujFrxSvNYOmHpUYwKHhLP8LA9 z1krA2PZCTL650Xu2v6Yy976bEqG0XzbLx3x8/XITXEJH8FrWQE7xLlJCzcXKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX3M2155znhj; Fri, 27 Dec 2024 17:06: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 4BRH6tui038561; Fri, 27 Dec 2024 17:06:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6tQv038558; Fri, 27 Dec 2024 17:06:55 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:55 GMT Message-Id: <202412271706.4BRH6tQv038558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 393d567afa18 - stable/13 - timeradd.3: Add missing .Pp after .Ed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 393d567afa184fd2b9488ded250481642200abce Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=393d567afa184fd2b9488ded250481642200abce commit 393d567afa184fd2b9488ded250481642200abce Author: John Baldwin AuthorDate: 2024-12-13 16:53:51 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:53:06 +0000 timeradd.3: Add missing .Pp after .Ed This ensures a blank line between the end of the struct timeval definition and the following paragraph. Formatting change only. Sponsored by: Chelsio Communications (cherry picked from commit 91c6231246b587209e585376c15553f574b17463) --- share/man/man3/timeradd.3 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man3/timeradd.3 b/share/man/man3/timeradd.3 index 6ce601f25150..9720267883ef 100644 --- a/share/man/man3/timeradd.3 +++ b/share/man/man3/timeradd.3 @@ -85,6 +85,7 @@ struct timeval { long tv_usec; /* and microseconds */ }; .Ed +.Pp And the .Fa timespec structure is defined in From nobody Fri Dec 27 17:06:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX3M6Mcxz5j3Fk; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX3K29ZQz3wxY; Fri, 27 Dec 2024 17:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h4D8Roj+ez7fYNPZv45wF/LFNBZyJZM9Fa7/PII9Cdk=; b=CaU8EQxWT6A1tKgxnyu0j0mS/NUwI/8jqyWGw//X9TwQ8znf38OoYUamDm6WaKuNsgfgg8 AsynJUNpxfJpidTM2xr2frv4mjqkVqOdUXccpcAKzyY3XcOK2KsE+dOuXfdiy++kK1oULQ lweYiQZVqIDgS7oE/LmviMU9zblyXf2moPgLS/n4Dav81wHdvedn8fsVBLDqirUQMk/exN tAWM+IBrcgQE/LspT5z+CYkok8MmOFrA2VI+UUWDXsF6xW/b/pwWDrHFeIALapUe4/xUvR 7JtSXwAMMCFDyMaZTOBrK+t6qYlgzksZqxCC22mtZ5xBwxB5BIRNiN/n8YaREw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h4D8Roj+ez7fYNPZv45wF/LFNBZyJZM9Fa7/PII9Cdk=; b=S1Y8d0JVPBNCGQ2ylji/oOIHcrIQTew2GQQ1z/17ddA2lmsyorcPbYMx7iml0J0puyS7VC 2D6l5M+tY6atGcUvBhaBZXTRPDTUKBNK84HlXKN8ra2Dq7Jg8C2793BR+ob27rsTP8OGs0 cYBuBtQZp4riJpujwMe0zeP3YXp5H/QhdildWChKTpQGqMH7eD9dgJu8zHhZvu18R/smng eZG74afV9CnXo+5Q/Ih7gXQglkOv/wdEiw64qjCw92eA9I4nZyn/mdvQ69agS6/28gIR0+ tW0O4hm/Y7DFHDbohJ8YNVcpdpLAqzVaVLN+XSe+Xs1kZkAM20OwaCEdo/KCiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319213; a=rsa-sha256; cv=none; b=C/ICsojuH7/CimqidcxB9dYp/9FKS8cdhrdj1RTIhTdufZEHLCqsU9ddF6hYT1EsreManA wLOHlvfX4uPM0qi8mYOz+GJibO4XlLKkdIA918HrIJN3mE5j5nyO8zfGVB76zEzABm62Jt nlN7M59T4zRcHMS0Arz8UQC0NMsCxqkmbnB9t7LweQpOpz6e78AkBgDBzmJoelTCyhI50H Qlbos9Iz6cjju9vMjGw1S1dWLDI5aXgUGTEB2+WFNZAjlSaGb6sMyJrfJKVAZh9D1l7VVd Wmk5emVIcm2xJmiY2+6/v+Ai1LysKFe4NOsz4Ll14mEICVQLtUjxCIJPen3kMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX3J6mcYznjc; Fri, 27 Dec 2024 17:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRH6qbR038457; Fri, 27 Dec 2024 17:06:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6q1o038454; Fri, 27 Dec 2024 17:06:52 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:52 GMT Message-Id: <202412271706.4BRH6q1o038454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 9263f0031850 - stable/13 - cd9660: Apply the file and directory mode masks bits to all 12 access bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9263f003185035cf286eb0257c1fea9f703c5f93 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9263f003185035cf286eb0257c1fea9f703c5f93 commit 9263f003185035cf286eb0257c1fea9f703c5f93 Author: John Baldwin AuthorDate: 2024-12-06 22:40:35 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:51:01 +0000 cd9660: Apply the file and directory mode masks bits to all 12 access bits This permits the mask bits to control the upper 3 bits used for setuid, setgid, and sticky permissions. While here, clarify the manpage language as non-Rockridge volumes with extended attributes can also supply users and groups along with permissions. Reviewed by: olce Fixes: 82f2275b73e5 cd9660: Add support for mask,dirmask,uid,gid options Differential Revision: https://reviews.freebsd.org/D47357 (cherry picked from commit c1ad5b4b10c5e426d3d782b7216a038187419a1e) --- sbin/mount_cd9660/mount_cd9660.8 | 23 ++++++++++++----------- sys/fs/cd9660/cd9660_vfsops.c | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8 index af417d4d025e..325004a107f0 100644 --- a/sbin/mount_cd9660/mount_cd9660.8 +++ b/sbin/mount_cd9660/mount_cd9660.8 @@ -75,30 +75,31 @@ version number. .It Fl G Ar group Set the group of the files in the file system to .Ar group . -The default gid on non-Rockridge volumes is zero. +The default gid on volumes without extended attributes or Rockridge extensions +is zero. .It Fl U Ar user Set the owner of the files in the file system to .Ar user . -The default uid on non-Rockridge volumes is zero. +The default uid on volumes without extended attributes or Rockridge extensions +is zero. .It Fl m Ar mask Specify the maximum file permissions for files in the file system. -(For example, a +For example, a .Ar mask of -.Li 755 -specifies that, by default, the owner should have -read, write, and execute permissions for files, but -others should only have read and execute permissions). +.Li 544 +limits the owner to +read and execute permissions for files and +others to only read permission. See .Xr chmod 1 for more information about octal file modes. -Only the nine low-order bits of -.Ar mask -are used. The default .Ar mask -on non-Rockridge volumes is 755. +is 7777. +The default permissions on volumes without extended attributes or Rockridge +extensions is 555. .It Fl M Ar mask Specify the maximum file permissions for directories in the file system. diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index c3339438fcd8..1cc2040c7305 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -399,7 +399,7 @@ iso_mountfs(devvp, mp) isomp->im_mountp = mp; isomp->im_dev = dev; isomp->im_devvp = devvp; - isomp->im_fmask = isomp->im_dmask = ACCESSPERMS; + isomp->im_fmask = isomp->im_dmask = ALLPERMS; vfs_flagopt(mp->mnt_optnew, "norrip", &isomp->im_flags, ISOFSMNT_NORRIP); vfs_flagopt(mp->mnt_optnew, "gens", &isomp->im_flags, ISOFSMNT_GENS); From nobody Fri Dec 27 17:06:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKX3M6SFdz5j3LD; Fri, 27 Dec 2024 17:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX3L1mc1z3wxg; Fri, 27 Dec 2024 17:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XfBoGzaftyaDa5d6GNm/utdTgRGHQy2GEKb1JLv+Es4=; b=juNiSfyDUkzENlopKfskr9q+SpchyRApLmHvwsN73rfNHPcYnsBaxzUtIB1hB9+Wz1NvRM SOgnDQ+MdbBBJIQ5n84PeoMg7Pw4atcyuLl3WUSCAZBguxu99W1ut8T4Im9m7ZLpyVWlHp AnRAaZDQcWYmWEZYcNs5WRgttac1j6JgTmWA22/xCaYWfPTE0u943CrfplS53Jc80sz8Fi UDP0M4hIElzaOvNQifxRKZXNwMvQ6s+10P6ioemZ4fJzeNheAVX7vR7YBsGW6V3oFnou8h JQIBA2IG0Rz5Jk14BXR4UiO992ngfXiwV4Y9bDDw0Wl3QlKni/rpmTc/vXwHJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XfBoGzaftyaDa5d6GNm/utdTgRGHQy2GEKb1JLv+Es4=; b=x2XyQPc/LqHGqcCF9YejIYOF9wUOJl8IjgPzScKKeY2rIu00tpccRrwoNXyAUQG8HK5vQQ EVul70vV63AaglTgxme/lBffJAisgPdlHWPjC3avwq2JkZNhWY69oOQSCKRCJhBKyiJd/S skCQxILrTXlErdb3thYZU3Umt5rZqcAjivD5cvFZIjZuPk0rzMpvy3TSJSr6+ICZ2AFOR6 TBzCdG8/OIKtNEQdtkEC8AkgQnDOWJOM5w1e7mwgDIl1NOPUloS+UukxPykiPZYZ2XCMx2 GoTJ9/RAnUOMC8Pb/QJQY0vGTDgSNjVPI/bcBrhkWZcUw9cAra21DfkFqfyHDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319214; a=rsa-sha256; cv=none; b=XFyR2fYRiORnXiJ2Ky7PV6qC9ASbqqi/aJEmE3eLUQFL6T2YjtH3l7YMpau6Zq8LW8w1Ao aHmjYqIgITE8gi/a/gKIbpy5y0/jqKMoASVN+kirE8Ula9HNnymE/sficzhEfhmI5QMA4u U2zaea93G/Izc6x+F0LOR01ANYQN04h7rMZnBph22EEPkvVBwBEKNkg1zSB8GVOtlKySQZ AhRPcllHmQXw0ZkTG8mzp/OasTLJ71hsaeokxxRmsd3/u2v93RdByPScOKovEnhyMLMMdx OKmH8xLvdiqVgWGsDBceHKcXMB0wiIkyyEXqb5DWyW2emqwzcKZ1te7bAL8lqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKX3L0yBcznWq; Fri, 27 Dec 2024 17:06: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 4BRH6seJ038516; Fri, 27 Dec 2024 17:06:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6sTQ038513; Fri, 27 Dec 2024 17:06:54 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:54 GMT Message-Id: <202412271706.4BRH6sTQ038513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c9921d4e81e1 - stable/13 - mount_cd9660.8: Bump .Dd for expanding mode mask bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c9921d4e81e14fe77949920a9bea8768aa7aaf6a Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c9921d4e81e14fe77949920a9bea8768aa7aaf6a commit c9921d4e81e14fe77949920a9bea8768aa7aaf6a Author: John Baldwin AuthorDate: 2024-12-07 15:45:26 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:52:37 +0000 mount_cd9660.8: Bump .Dd for expanding mode mask bits Forgot to amend the prior commit before pushing. Fixes: c1ad5b4b10c5 cd9660: Apply the file and directory mode masks bits to all 12 access bits (cherry picked from commit dde3a7e15be175e8b733cfc42bbb2a2c15810311) --- sbin/mount_cd9660/mount_cd9660.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8 index 325004a107f0..74fcb31fbbd3 100644 --- a/sbin/mount_cd9660/mount_cd9660.8 +++ b/sbin/mount_cd9660/mount_cd9660.8 @@ -31,7 +31,7 @@ .\" .\" @(#)mount_cd9660.8 8.3 (Berkeley) 3/27/94 .\" -.Dd January 2, 2024 +.Dd December 6, 2024 .Dt MOUNT_CD9660 8 .Os .Sh NAME From nobody Fri Dec 27 17:26:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKXTv5dPxz5j4fL; Fri, 27 Dec 2024 17:26:27 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKXTv52XDz45Z3; Fri, 27 Dec 2024 17:26:27 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735320387; 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=RDwD3ewwwKv4ORM3gdwL9029CAX3z6ZgyyTaCMdk9hA=; b=yi8Q1bcLNjJU1q/k0lXLd3AgjpPL1hH+cal/UT5m+oedMOxDXD3bQhq6t9tX9KxsmD+TFs /fDnxKBfHusvZCy58JYd1I3YCu0IEEN5ouW4fEqQfZIXiu6c6SCkaX68xBy2exjSwTG+BL uFWn6bulUu7ejqFS6ozPvxS6nmxHdxrujrAyojWKex7i9pM/Tcg+yUoz5wVC0pQ2Il1hdR yMVRNRwoas7l6wlRQb/nbcN4y1pE3osMzreKAg26NDiIJBL3E6iNv1IzEBaXa33olrL/D2 7OEcUIunw4REsSfmdwSa418u0lexsE25O6UFUPCV4zX6Gr8XFRltxGgrYNacWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735320387; 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=RDwD3ewwwKv4ORM3gdwL9029CAX3z6ZgyyTaCMdk9hA=; b=vt0dOUmiZmZiiZB8J8xmaqFDA8/kpnhZLZP2/RqzWtA+P/hEMLgdZwfYFNiczK1aLOKjI/ uIBj31BnR8kTNnzKVvlZF5CFKWU+BhykEI65mxuBv4ftFPZR0RJwgl1pNN0XOvwAEXoo9R RaXhRXUKXg+t7/vxcrz3brLT4RVk574dm5WIRbTrwF8pqDhVR3uXH77+xMli8jCpkEMGfn xg1frO7gb8zw7wewFTEEepbfv37/KIAQqKNVF7t44i3fyrfR2ueZs62z7rkBs2fz1mpIAX Hrhp23FJ/c8hhDJyRjY8BcnzW3P5nCfx9UYILbMyG5N5OgDJQ3BaWbWUO+YczQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735320387; a=rsa-sha256; cv=none; b=DMzwK790P5ikY9EiEwnSC9UMltQlmb0j7tMWH8ChxEt7hiVg9j79qB+9svkyWooJdocUE9 mIR/JWMn7Ej/x2dVI5oPEbFEnzrBRnnq9cWi3cIAis0vi8Tf71L5lACKRAaAP1Oq8UB7RL may8MT1j6mw3Wa5R+5kN1cXh6+Xg8H1x/neU9QR5Q8RCvZlsb6rVZ9Tur0UMlrXQ5cG0C4 BbTN35mkWM0tONkM73GEnFekLxq0mNUjgUq/0VP2ls0wzKzN/GM8kACLL71YSuqtLnmRnD 5XjAD/V7lQJnS1bNqnqC6WlgLF+92oSIDEuvG3hBRECR51pdCWHN5rWADIz1Dw== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R10" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YKXTv3HRfz12Fx; Fri, 27 Dec 2024 17:26:27 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 7D24176FB; Fri, 27 Dec 2024 18:26:23 +0100 (CET) From: Kristof Provost To: Renato Botelho Cc: Andrew Turner , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ba1904937d9a - main - acpica: Extract _OSC parsing to a common file Date: Fri, 27 Dec 2024 17:26:18 +0000 X-Mailer: MailMate (2.0r6068) Message-ID: In-Reply-To: <149116bc-677c-47b2-9ff7-f454418fec21@FreeBSD.org> References: <202412121819.4BCIJ1KW097190__8805.67587898753$1734027579$gmane$org@gitrepo.freebsd.org> <149116bc-677c-47b2-9ff7-f454418fec21@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_B90DBFDC-A7D8-4764-961A-A5BB375C1A68_=" --=_MailMate_B90DBFDC-A7D8-4764-961A-A5BB375C1A68_= Content-Type: text/plain; charset=UTF-8; format=flowed; markup=markdown Content-Transfer-Encoding: quoted-printable On 26 Dec 2024, at 21:44, Renato Botelho wrote: > On 12/12/24 15:19, Andrew Turner wrote: >> The branch main has been updated by andrew: >> >> URL: = >> https://cgit.FreeBSD.org/src/commit/?id=3Dba1904937d9ae0539e39001467a1= 519b17177118 >> >> commit ba1904937d9ae0539e39001467a1519b17177118 >> Author: Andrew Turner >> AuthorDate: 2024-12-12 16:29:45 +0000 >> Commit: Andrew Turner >> CommitDate: 2024-12-12 18:00:22 +0000 >> >> acpica: Extract _OSC parsing to a common file >> This will be used by pci_host_generic_acpi.c so needs to be = >> in a >> common location. >> Reviewed by: imp, jhb >> Sponsored by: Arm Ltd >> Differential Revision: https://reviews.freebsd.org/D48044 > > My dev system was running CURRENT from Oct 31 and broke after I = > upgrade to most recent version on Dec 20. After bisecting I found = > this commit as the one that introduced the problem. > > It starts booting but can't found any disk. Pressing ? at mount = > prompt shows nothing. This system is a VM running on KVM and I've = > attached dmesg from successfully boot > > FreeBSD idaho.arrakis.com.br 15.0-CURRENT FreeBSD 15.0-CURRENT #22 = > n274182-938e4b131c4: Thu Dec 26 18:10:12 -03 2024 = > root@idaho.arrakis.com.br:/usr/obj/usr/src/amd64.amd64/sys/GENERIC-NODE= BUG = > amd64 > I=E2=80=99m seeing similar boot issues on VMWare aarch64 (i.e. freebsd in= = VMware on a Mac). My bisect pointed to: commit 1f5c50a8617355758510675cb9412f56fed12efc Author: Andrew Turner Date: Thu Dec 12 16:30:39 2024 +0000 pci_host_generic:Add pcib_request_feature on ACPI In the ACPI attachment add support for the pcib_request_feature = method. This uses the common _OSC handling. Reviewed by: imp, jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48048 I=E2=80=99ve not yet been able to capture a dmesg, but it looks like the = nvme = storage device just isn=E2=80=99t found, leading to the zpool failing to = mount. I=E2=80=99m currently working around that with this patch: diff --git a/sys/dev/pci/pci_host_generic_acpi.c = b/sys/dev/pci/pci_host_generic_acpi.c index 1ff3a6bda707..c990edf26a3c 100644 --- a/sys/dev/pci/pci_host_generic_acpi.c +++ b/sys/dev/pci/pci_host_generic_acpi.c @@ -543,7 +543,7 @@ static device_method_t generic_pcie_acpi_methods[] = =3D { DEVMETHOD(pcib_release_msix, = generic_pcie_acpi_release_msix), DEVMETHOD(pcib_map_msi, generic_pcie_acpi_map_msi), DEVMETHOD(pcib_get_id, generic_pcie_acpi_get_id), - DEVMETHOD(pcib_request_feature, = generic_pcie_acpi_request_feature), + //DEVMETHOD(pcib_request_feature, = generic_pcie_acpi_request_feature), DEVMETHOD_END }; Best regards, Kristof --=_MailMate_B90DBFDC-A7D8-4764-961A-A5BB375C1A68_= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On 26 Dec 2024, at 21:44, Renato Botelho wrote:

On 12/12/24 15:19, Andrew Turner wrote:

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3Dba1904937d9ae0539e39001467a1519b17177118

commit ba1904937d9ae0539e39001467a1519b17177118
Author: Andrew Turner andrew@Fr= eeBSD.org
AuthorDate: 2024-12-12 16:29:45 +0000
Commit: Andrew Turner andrew@Fr= eeBSD.org
CommitDate: 2024-12-12 18:00:22 +0000

 a=
cpica: Extract _OSC parsing to a common file
     This will be used by pci_host_generic_acpi.c so needs to be in a
 common location.
     Reviewed by:    imp, jhb
 Sponsored by:   Arm Ltd
 Differential Revision:  https://reviews.freebsd.org/D48044

My dev system was running CURRENT from Oct 31 and broke a= fter I upgrade to most recent version on Dec 20. After bisecting I found= this commit as the one that introduced the problem.

It starts booting but can't found any disk. Pressing ? a= t mount prompt shows nothing. This system is a VM running on KVM and I'v= e attached dmesg from successfully boot

FreeBSD idaho.arrakis.com.br 15.0-CURRENT FreeBSD 15.0-CU= RRENT #22 n274182-938e4b131c4: Thu Dec 26 18:10:12 -03 2024 root@idaho.arrakis.com.br:/usr/obj/us= r/src/amd64.amd64/sys/GENERIC-NODEBUG amd64

I=E2=80=99m seeing similar boot issues on VMWare aarch64 = (i.e. freebsd in VMware on a Mac). My bisect pointed to:

co=
mmit 1f5c50a8617355758510675cb9412f56fed12efc
Author: Andrew Turner <andrew@FreeBSD.org>
Date:   Thu Dec 12 16:30:39 2024 +0000

    pci_host_generic:Add pcib_request_feature on ACPI

    In the ACPI attachment add support for the pcib_request_feature metho=
d.
    This uses the common _OSC handling.

    Reviewed by:    imp, jhb
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D48048

I=E2=80=99ve not yet been able to capture a dmesg, but it= looks like the nvme storage device just isn=E2=80=99t found, leading to = the zpool failing to mount.

I=E2=80=99m currently working around that with this patch= :

di=
ff --git a/sys/dev/pci/pci_host_generic_acpi.c b/sys/dev/pci/pci_host_gen=
eric_acpi.c
index 1ff3a6bda707..c990edf26a3c 100644
--- a/sys/dev/pci/pci_host_generic_acpi.c
+++ b/sys/dev/pci/pci_host_generic_acpi.c
@@ -543,7 +543,7 @@ static device_method_t generic_pcie_acpi_methods[] =3D=
 {
        DEVMETHOD(pcib_release_msix,    generic_pcie_acpi_release_msix),
        DEVMETHOD(pcib_map_msi,         generic_pcie_acpi_map_msi),
        DEVMETHOD(pcib_get_id,          generic_pcie_acpi_get_id),
-       DEVMETHOD(pcib_request_feature, generic_pcie_acpi_request_feature=
),
+       //DEVMETHOD(pcib_request_feature,       generic_pcie_acpi_request=
_feature),

        DEVMETHOD_END
 };

Best regards,
Kristof

--=_MailMate_B90DBFDC-A7D8-4764-961A-A5BB375C1A68_=-- From nobody Fri Dec 27 17:40:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKXnw3SHHz5j5PV; Fri, 27 Dec 2024 17:40:20 +0000 (UTC) (envelope-from garga@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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKXnw2bDnz47RC; Fri, 27 Dec 2024 17:40:20 +0000 (UTC) (envelope-from garga@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735321220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=4eX7TDliJeAGrADhFvRWsbgEHy9pKnHkimwdgQqw7vk=; b=jCjsteL1LqmKhNhrROl+QrT/+xocZZMWlplPqfq2ko5EumOREX70LfWC+y2smhWskVNgjD SSbzwK0obag/QdlqkHvTraxzmJrKc4rXPzg9tlvEbEXz7pzsxJ67Ju5UR/zYE7N9Q1NZpW JUOAfWa79rPZPSkJqyQMJXf02t9To+46KyLAJNaZqc2aQUOi04fk2Kha85xoFxq+Ag3v3s SkBnFFMGRS03JVdxbImGxSWlVi2MLnA1ItaX1cswwCcbbjpsenveWylxT4b/ea4InoA02H dfM1GJOUOGVrvTfxIPNlCJ6vIlr+yY8aHu7J3w7980rVzVGl2YEkQECgzSM35w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735321220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=4eX7TDliJeAGrADhFvRWsbgEHy9pKnHkimwdgQqw7vk=; b=pObuOsEzViLRtVh3zDrCjdWNXVNT6wsXVGKP97SvNpzqCHKBDelBZwgJfSt+OvksOa0Ujr 3AZSf7f7WJTL8x1D22DSXnj1X603KipA5TlF0aqeVhZTqWlQPg1Ja+xc93A1oai4MLM5oK Q4tV7w9HZ82zjlJUrF8vFFmaCai1Wgi+kLC/qh0u7CL45PWiRA+N6ZsKp8VEvokJIuhk1N kh4+J7jJsKG9E8R9atp+LrKDcfLa4Sul/6mGSw2mxaCMiOUY34+mrRZqD+T3YpZmZDDUc/ vocvIEa+2P3wtR40VKVqUJFuRXTJW7RhaiVa0kvsW43q2fgRA/CI0ryaTHEs4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735321220; a=rsa-sha256; cv=none; b=GR9ir12OwpiMZCI2+teIvJbkv4zbXYvOO/RzLQDomkoUWB0b+0eMhIFUsBJU7G839wnm1T lnT1qd5SYBQ1+8UTj/NBwpiCcx9WwxxjyRHeHvfFWGWGu/9KjkWhaB0i3kZTnvQYRuA/oI V+15uHZhlXUGYAfe2gtvBU9gDxI4jBFbyrospNjI+eLLlMNRiVG4k18P2Yt6A42vhn7Mkn dsTHF+k47uIbq4bJ3GGEh+CLNw9Cn2HiXdvLDkIYdiOjj/JHLkDN3h/LtTNC4TNkAa8pzU EiGFjVkwYbG9LvwLlQYMWCBKK6bdL/sPoY+v3fQXjzBBWNOtcYLftwdlfSIkag== Received: from [IPV6:2804:f1c:31:cc00:f541:9717:f6fd:58ab] (unknown [IPv6:2804:f1c:31:cc00:f541:9717:f6fd:58ab]) (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: garga) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YKXnv1wH3z11yy; Fri, 27 Dec 2024 17:40:19 +0000 (UTC) (envelope-from garga@FreeBSD.org) Message-ID: <1aa3fd17-c566-4432-8d30-3b412970f237@FreeBSD.org> Date: Fri, 27 Dec 2024 14:40:16 -0300 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: git: ba1904937d9a - main - acpica: Extract _OSC parsing to a common file To: Kristof Provost Cc: Andrew Turner , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202412121819.4BCIJ1KW097190__8805.67587898753$1734027579$gmane$org@gitrepo.freebsd.org> <149116bc-677c-47b2-9ff7-f454418fec21@FreeBSD.org> Content-Language: en-US From: Renato Botelho Autocrypt: addr=garga@FreeBSD.org; keydata= xsBNBGStavwBCACjNlp/9+Y+VFe9ieR2h/WWbdvjz4Mb2z/f22bGoaskzCfvVNbo/v3i34I9 H6OdgZkGqheQEAD2jNfRbmPr4z40xDMUpYGLds+1Mvg7G3Hms3j5Ef8KaLSWUNWIfwKdfSVR Qs35ccSJxAdRW5YdI6J3xZgika+3Bc4eJ05YE/nWW+PNTYevt5rqD50N3zybVYIcLoqVPpBi AZE/sf5SLiLACIJb1t/s4x+pi8vgWevxVVT9u8V1f8zYErmHSLSqjxii0B3eRZphX9NCJOv9 +tfFZhnENInhn9gT7H4e2YumUltEy3jacONHJF3CC1pvvWEa6lEyypclMOkHQwNON7DLABEB AAHNLFJlbmF0byBCb3RlbGhvIChGcmVlQlNEKSA8Z2FyZ2FARnJlZUJTRC5vcmc+wsCXBBMB CgBBAhsDBQkFo5qABQsJCAcDBRUKCQgLBRYDAgEAAh4FAheAFiEERL7Dxegbnh7xTiQ5Ob6P xxJcZXoFAmSta78CGQEACgkQOb6PxxJcZXrYlggAgaZmr6c1yIWzN8VksHrHpwt/uxONEP+h ljy3yfrMsgfS5wx5Uzgfih1xYZUFC6jiI63CetqBqJpp3g1klRS1UWYKx2NeXphDMYZEdPm/ a6sXh4bKZbk6IE8Yn0/YiRT57d9DtbvswC7Gn7Igj/MSbhl49TvTGyvuB6juaffVoYZViomx 5zMoee8Ml2o2qj3MrCJ+/K8GU54RlpOGqGRsqdwVdr9XEWub6fF2YFwR46cjmbiU3P5urFHH nkJlBGPIwKxHimTW0lZsdx9aCKRDd/D80/WOEzXmk3k8B9lv/GsvOluHmveLhJG1R1tIJ31I f2q8dfTvqsQXnu8CcWRcgc7ATQRkrWr8AQgA1DufoxScA+CWQbUR6zExIu8wXQKrhuRt4DG2 BgynT7EMUvEBadcbQRZXsBpemNfncc9Axyut/+rWiyKJf9BLQuo/9QYmSRvW1U6+0LJUYmdg kMyBeYaPk+vnssv/u9jLuvV7FVgyE0yk1iaWIKOVDD+XrQCOvGw9uSceBrQyCyo3A/eRM/+p vnDCaywR63PKE+3axk6lfNdGK3TnaWmS30/ZDCZlNsXuqprqR4JdT5wXids5o36dsuJ5EZ20 s5hNMD34s4Yr1Y1R9elH6qBsFCpozs0+jwrArxq+UJJCR6hH5W8ZEwJtRC8tzR8mRE1WywzX BXYj0YhfGztQIxZckQARAQABwsB8BBgBCgAmFiEERL7Dxegbnh7xTiQ5Ob6PxxJcZXoFAmSt avwCGwwFCQWjmoAACgkQOb6PxxJcZXr1vgf/SKXhoZcUU5I7TqcbHg0lJz9tICTupCGHWr/s SQgjh9oEM5j1wqW7FlCGP90Tl9K0g3ow9YdbhU7VK470o6pymX9V9eLHzGgkZO/KMEtGBeK1 u+5ePjCJ/MK5B21KODLSU7WrIL1VN5ceXfQPLYt02LMLtPri+oduHD6RNBeA7US1DUzleq5F 9NHGbvV2U7BdDUezpiO8NaFjFZVB11I5d99FxUM5XGVstI3VhsRKZxjY0KnqJzaQgTFsPGmv AUfZVIN1pXgXiedhPXpr8+Y64jP+pHVwpVmh1zYWL6+q3kqFOUVP6c5iiMeoEXZvgJz7x/AC ek3X5gvu8Hpcv+MZIg== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 27/12/24 14:26, Kristof Provost wrote: > On 26 Dec 2024, at 21:44, Renato Botelho wrote: > > On 12/12/24 15:19, Andrew Turner wrote: > > The branch main has been updated by andrew: > > URL: https://cgit.FreeBSD.org/src/commit/? > id=ba1904937d9ae0539e39001467a1519b17177118 cgit.FreeBSD.org/src/commit/? > id=ba1904937d9ae0539e39001467a1519b17177118> > > commit ba1904937d9ae0539e39001467a1519b17177118 > Author: Andrew Turner andrew@FreeBSD.org > AuthorDate: 2024-12-12 16:29:45 +0000 > Commit: Andrew Turner andrew@FreeBSD.org > CommitDate: 2024-12-12 18:00:22 +0000 > > |acpica: Extract _OSC parsing to a common file This will be used > by pci_host_generic_acpi.c so needs to be in a common location. > Reviewed by: imp, jhb Sponsored by: Arm Ltd Differential > Revision: https://reviews.freebsd.org/D48044 | > > My dev system was running CURRENT from Oct 31 and broke after I > upgrade to most recent version on Dec 20. After bisecting I found > this commit as the one that introduced the problem. > > It starts booting but can't found any disk. Pressing ? at mount > prompt shows nothing. This system is a VM running on KVM and I've > attached dmesg from successfully boot > > FreeBSD idaho.arrakis.com.br 15.0-CURRENT FreeBSD 15.0-CURRENT #22 > n274182-938e4b131c4: Thu Dec 26 18:10:12 -03 2024 > root@idaho.arrakis.com.br :/usr/ > obj/usr/src/amd64.amd64/sys/GENERIC-NODEBUG amd64 > > I’m seeing similar boot issues on VMWare aarch64 (i.e. freebsd in VMware > on a Mac). My bisect pointed to: > > |commit 1f5c50a8617355758510675cb9412f56fed12efc Author: Andrew Turner > Date: Thu Dec 12 16:30:39 2024 +0000 > pci_host_generic:Add pcib_request_feature on ACPI In the ACPI attachment > add support for the pcib_request_feature method. This uses the common > _OSC handling. Reviewed by: imp, jhb Sponsored by: Arm Ltd Differential > Revision: https://reviews.freebsd.org/D48048 | > > I’ve not yet been able to capture a dmesg, but it looks like the nvme > storage device just isn’t found, leading to the zpool failing to mount. > > I’m currently working around that with this patch: > > |diff --git a/sys/dev/pci/pci_host_generic_acpi.c b/sys/dev/pci/ > pci_host_generic_acpi.c index 1ff3a6bda707..c990edf26a3c 100644 --- a/ > sys/dev/pci/pci_host_generic_acpi.c +++ b/sys/dev/pci/ > pci_host_generic_acpi.c @@ -543,7 +543,7 @@ static device_method_t > generic_pcie_acpi_methods[] = { DEVMETHOD(pcib_release_msix, > generic_pcie_acpi_release_msix), DEVMETHOD(pcib_map_msi, > generic_pcie_acpi_map_msi), DEVMETHOD(pcib_get_id, > generic_pcie_acpi_get_id), - DEVMETHOD(pcib_request_feature, > generic_pcie_acpi_request_feature), + //DEVMETHOD(pcib_request_feature, > generic_pcie_acpi_request_feature), DEVMETHOD_END }; | I tried to apply your patch and got the same error on boot. The only way I found to make my system to boot properly is reverting ba1904937d9ae0539e39001467a1519b17177118 -- Renato Botelho From nobody Fri Dec 27 17:59:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKYCg6TyFz5j6Vk; Fri, 27 Dec 2024 17:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKYCg5sKCz4FSK; Fri, 27 Dec 2024 17:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735322351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5+o3HMEds7DMMVrQtxYlNFNiyBNyCPbuEvfm/OdKFI=; b=cRMtgDU+1zsuhJLrXTqXy1Ce4d9jsE0pFQ3BXu48xCbBXx4EtFbA6ZmLdA6wY2IIUhJ2Wp NRHQ0jrCycicxbUvyBj6lJaTql2OtNTOo9Mdk1yrf0atCA+XO4MO/iP1r27BTFmo5OE2Uz 7UuFmviPNRgJuzBr9mFLRLLMAL2Nq81XaRFi6D/z+7cKrYPjBAnwa0ggnQjvIQ/5JgSM8s nSA8QsB471dl0+scmUauZNvV19P3K1ZDTWbjcaztK2SqV1qoYoO3A4UaF/bPT9qPPw7JnE 6mlTvGO6UFMFDiZHoI3Xf1Na9oxYAOzANAv1LkT9xE4EHjO9HILhJaJTlpns/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735322351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5+o3HMEds7DMMVrQtxYlNFNiyBNyCPbuEvfm/OdKFI=; b=VNT/gxTWpnC3F2/wSYb8isDEbGMsd2AYy6RSTUbWV+b1gzOeO9B131tmve50Zc0UWeeoXt 0WrY4V14fd/uQGEMPa/335BGnfMvLArl0BM0kJioy3/ZKGbWv1LruPpkEgU/RfeH5ZtqXj RuqBYYz/NvWGgSurreNDmsBDXp/WewTIkpi5CQgVsPjZXzhANiimWU/vztukNf7CxDxtzl Jppbquk5dKVMR+GVT+YmEugto5agedTHW4NwFZTUR5UBmrdUma65TLKjZQhwLTl/jyfiL1 hieWKYsI/802xsW7sghRsdSukXilwWVRmRYl84iA2V9v5BH9ArjYSKz8CbIS9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735322351; a=rsa-sha256; cv=none; b=S4Zyuwd2K5KT6UHlNmk4wt/HRD+vxE+bfkU6q13+MKKiJ3uYkorQc0n52bvitw8/nB7pg4 LoiEYf6J52AvjJgnD9Q5eVmACYZQzM5k4k/HmLcLOUX4S4xtYMJbGuYGm35d1tGBWHvVH0 55Cl46t0YToM2661wQPozdsLA1X+FkybBAAGzSS/q99OHd3lEfROitrQA2TB/OcM0BhSsG ftQ1XSb7pCBIz2jX7m0kPFK9ciOwCM71uatGwnBETXKBAm/IbHEg5XuGcfaKNS/7CdDJG0 0zueOr7zKSKUHh52SXRkdccstYdHcbAV6dbyc0tkHCzMpBhR/mpwgZLN5XUNGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKYCg5GPYzpd4; Fri, 27 Dec 2024 17:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRHxB0J032757; Fri, 27 Dec 2024 17:59:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRHxB24032754; Fri, 27 Dec 2024 17:59:11 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:59:11 GMT Message-Id: <202412271759.4BRHxB24032754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: a653e8317f5a - stable/14 - ntp: Undo upstream (ntp.org) fix for upstream Bug 3851 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a653e8317f5af006ab49a761ce35d3f525ba5abd Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a653e8317f5af006ab49a761ce35d3f525ba5abd commit a653e8317f5af006ab49a761ce35d3f525ba5abd Author: Cy Schubert AuthorDate: 2024-12-23 22:30:58 +0000 Commit: Cy Schubert CommitDate: 2024-12-27 17:59:03 +0000 ntp: Undo upstream (ntp.org) fix for upstream Bug 3851 The patch for upstream (ntp.org) fix for upstream Bug 3851 may have fixed a Linux bug but it caused a regression when ntpd is run on FreeBSD. Suggested that so@ publish an errata and merge this to releng/14.2. PR: 283116 (cherry picked from commit 98e34e8e255767e18dd8a6c348cff8bfc01b2662) --- contrib/ntp/ntpd/ntp_proto.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index 170294c68bb6..f9605b8feacb 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -471,6 +471,7 @@ transmit( return; } +#if 0 /* [Bug 3851] drop pool servers which can no longer be reached. */ if (MDF_PCLNT & peer->cast_flags) { if ( (IS_IPV6(&peer->srcadr) && !nonlocal_v6_addr_up) @@ -479,6 +480,7 @@ transmit( return; } } +#endif /* * In unicast modes the dance is much more intricate. It is From nobody Fri Dec 27 17:59:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKYCz2dpSz5j6k4; Fri, 27 Dec 2024 17:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKYCz27h2z4Fhc; Fri, 27 Dec 2024 17:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735322367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J1NDAKopjiAsYiaJ5hUKBWhb8vZIB72Ivb1xYWf03vo=; b=movoxCmS91ylJrDNwaKOupjRvOvpNZ1TqnYJwsJaJQmg/IKL55OP3k6obB2LqyrbYFj6K4 vPaJ3TQqVo0WV9MuGJmN3vhBI2zjE0CYyentWHAH+lM8EBmRkMPx2F5YH9wUc8mqTa2BzV NWZGAvpwih9Rw2w5KoBHaLMI7Viik2dCyD7MJsUZJZEHpunpgjYbpIjHK6O+EawlTEOH9y xRG2Lq5988btpTWstWLnkixyQclmB+oZvuvzkDQFXrYrVphmiXF/KmBilC7opHniTNFyp9 DPKn32SnBPgfwTeCm1U8NyI/6TBbW6Q0gSymV1Tun0XK7egMLEV9RSyyqZXeGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735322367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J1NDAKopjiAsYiaJ5hUKBWhb8vZIB72Ivb1xYWf03vo=; b=xz5VegNZ2bVGHZm4bsUnjv6x8nQRJ8yIuG18AIbZT2hnnHwn4IrPRFBg+S1dZ3x8aELgeZ jriLptU2lgiQXnuDVzEvdbDHOPHm31WOM4/RowMIiuV1F5wMoNkyNjEujLUK8ahI4f3ac0 O/gqPYSVsb8RlJDD2rSfStk5Yf/EYVL54iBtJqFhroqMc5c0JHoSCPB0nDCyqUr7TUWzA5 MD3utGcbJrW12aVW4xJ31eLstTxGo8becM4H/KIZFP/+dXtSBb9wvCLnFbpxEWseee5OEL 7Rnnj137COo3effUizmmc//3q7/6djaSDaL2gpDsFt5/4Lk8qLRGUdBFXT4ikA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735322367; a=rsa-sha256; cv=none; b=SsfhiuBDG8yI9x56U1gBwagSJTPLLTh6JN3Gqh5FTyzxC/IzlTlMhm7n6uS0T9MAi/smyz AbhToF+62MX8/Yw3+r16HPTmpNbo4n83WxMZwbpam5q5x3JTTOixxeWtWI7qu4VW2bQWcW 9T3wapN3YOy/rvzTAE4btcDYdhd/nevllIOGf9sHTh36BQ7ti2/QO3tiyUsHjOe6WA04YR Aa8sWdshNX0bECWGiUAK0pZ6pgPK4CebRp2NvmmBdqxVFkOX2xBUV0lnHW4s4nwj4lQohS GlMEErP7fFjHzeLGqahY2oJsP2rbKT8IunDoc6ayKv5LnbOu2xrNlKFJxV9Gqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKYCz1l2Rzpg0; Fri, 27 Dec 2024 17:59: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 4BRHxRcC032962; Fri, 27 Dec 2024 17:59:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRHxRDj032959; Fri, 27 Dec 2024 17:59:27 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:59:27 GMT Message-Id: <202412271759.4BRHxRDj032959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: f904025c5d20 - stable/13 - ntp: Undo upstream (ntp.org) fix for upstream Bug 3851 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f904025c5d20fb579a4b1607069ad9697be542fd Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=f904025c5d20fb579a4b1607069ad9697be542fd commit f904025c5d20fb579a4b1607069ad9697be542fd Author: Cy Schubert AuthorDate: 2024-12-23 22:30:58 +0000 Commit: Cy Schubert CommitDate: 2024-12-27 17:59:20 +0000 ntp: Undo upstream (ntp.org) fix for upstream Bug 3851 The patch for upstream (ntp.org) fix for upstream Bug 3851 may have fixed a Linux bug but it caused a regression when ntpd is run on FreeBSD. Suggested that so@ publish an errata and merge this to releng/14.2. PR: 283116 (cherry picked from commit 98e34e8e255767e18dd8a6c348cff8bfc01b2662) --- contrib/ntp/ntpd/ntp_proto.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index 170294c68bb6..f9605b8feacb 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -471,6 +471,7 @@ transmit( return; } +#if 0 /* [Bug 3851] drop pool servers which can no longer be reached. */ if (MDF_PCLNT & peer->cast_flags) { if ( (IS_IPV6(&peer->srcadr) && !nonlocal_v6_addr_up) @@ -479,6 +480,7 @@ transmit( return; } } +#endif /* * In unicast modes the dance is much more intricate. It is From nobody Fri Dec 27 18:04:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKYKN3s1Zz5j709; Fri, 27 Dec 2024 18:04: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKYKN3Hzqz4GMH; Fri, 27 Dec 2024 18:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735322648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6gEXJ5ad5EPMzR3uvmRGbRDJnr0U3H2yHSPbLik75c4=; b=KGE3H92nz4XwumWPhKCDyUJ3TTxpFqomlqWiki4INlbRnUB/MM/roxOOZli5N2T2Nngpr2 KHuexDmmKb/17rCpQiGghbsi0oA4sqdllJOwPXyqrWSDZ8q6iX17REuQzMRKsK/HNJlz+d gGnMOfrsynQJ4EBOVcRH4mi4sd0ssrw9vkwlTlkxRYU83v5bTOBVKFVt94IuG5pSFkR+yF TS207iEF7a7RQo4l8oT1kM/CJtNN6+6RvRBscPv8QrWx+j4wtMlXXnZApCExfnC98k0Ht2 OYcWKZ7+zlXn9o21xvzInOLFcVruyl3QDGL6aG1wlNoe2MNG45YZXjBekT5Ywg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735322648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6gEXJ5ad5EPMzR3uvmRGbRDJnr0U3H2yHSPbLik75c4=; b=whpI0tDBeiUcanvz8xAXqcVeAWUHZq2CCMkmPFDUrgmBa9CAPUSy4vnA2+lk9T3838LnkF w58Nmj3ao0hwld9CcTRZewO4MW76o/wyGxJK7q/BGRgdSILviWk2TkfXrNZpnsS0zqA7aF M6MIWGUjwSlCK9B6rm1GJsivTqFK8722VozD+va7xcmv+s2YWYIZqtcAbuPRjqovcG/tEn s/qRjeLkKEwBi4wN1rViycfX5LhccBeuw0oTow0IG9yY/SVDvmDZ2SSbMJglmp8o15SOW6 miRhJ9h9rKN6e4jstDL/IbIEUoe9fn8urAs+NAVpvhJYoyn4Gn//Y5zO//Ctcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735322648; a=rsa-sha256; cv=none; b=J2faaAUecMy1U4C21tbxI3tCHoy8sl8lBiS3g0phccTE80DBN11gVp0XxVfr5GSHigo3IU nDC9j2EWykfBTDtgRSjfeNiMBnYCrW33C4zpae8tUP9olHDj3SZIKuT3TIbM+nf+AQb0Zg 29PgMDYZlevalDQ+lyUpWWqo31rKj+GUH8Skg+a/iJzFwVDGQ3pmm4HBGNhNYX3wr0QcuZ AbG9pTJ4Ekla0mh/w7Q70ZxlGSw3wqq3ZYqshu7E2gWcogSVAI1C5vhdtNvNkq2ZZN1Bbb n/2PalQRsvvTW6wNprGKZrlH6PWTwqM4CCQ3QkMddmjbPQ6zQH5lhQVVoy3ocg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKYKN2tZfzpZH; Fri, 27 Dec 2024 18:04: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 4BRI48NF051039; Fri, 27 Dec 2024 18:04:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRI484f051036; Fri, 27 Dec 2024 18:04:08 GMT (envelope-from git) Date: Fri, 27 Dec 2024 18:04:08 GMT Message-Id: <202412271804.4BRI484f051036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 6c7cef47bdd0 - stable/14 - pf: Set cleared time when zeroing stats for table addresses List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6c7cef47bdd037e0656e48962af84ca307da4175 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6c7cef47bdd037e0656e48962af84ca307da4175 commit 6c7cef47bdd037e0656e48962af84ca307da4175 Author: Kajetan Staszkiewicz AuthorDate: 2024-11-21 20:30:58 +0000 Commit: Kristof Provost CommitDate: 2024-12-27 18:03:53 +0000 pf: Set cleared time when zeroing stats for table addresses Reviewed by: kp Approved by: kp (mentor) Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D47697 (cherry picked from commit 1a5dc6ee62b316b0caad5118dc0f3aee036f1958) --- sys/netpfil/pf/pf_table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c index b3e0da20422c..3004609e1702 100644 --- a/sys/netpfil/pf/pf_table.c +++ b/sys/netpfil/pf/pf_table.c @@ -669,7 +669,7 @@ pfr_clr_astats(struct pfr_table *tbl, struct pfr_addr *addr, int size, } if (!(flags & PFR_FLAG_DUMMY)) - pfr_clstats_kentries(kt, &workq, 0, 0); + pfr_clstats_kentries(kt, &workq, time_second, 0); if (nzero != NULL) *nzero = xzero; return (0); From nobody Fri Dec 27 18:04:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKYKV1PnKz5j70B; Fri, 27 Dec 2024 18:04: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKYKT73nKz4Gkd; Fri, 27 Dec 2024 18:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735322654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rg2AMziURnw7fCz/qSxMx3HfYYHw+R3q2JJB7pYfE/8=; b=Pd/s0zxMRs5YmHkCr0fdEIybWz1bEAb5/BL9zgiJdKPQVpbCG64MLEARW914r6ocoBRI8H S/fWdes5TQJZJvFag92G42VdVMxEJdJk130DL7VN6DdeFGMczqKyKIiSZOAMAptwq+U5hW lXrrqziM3sm13TwaX6ZOxMqBuXfckPopXcR7FDtc7f6l+D2IE5Kv3PH+R2n+SlVLkxo116 rGMvioKKG9oprkeaPD3x6aFno5V++iZrrDMtQ0SVdeUwS+54xJhP93OmPsBh3YmRj2JDlX ml7gtzHRiysoBfGhfsyqidO8Ql2B5h3BmHhgki5oe/0Eg+4U7MpeEa5duhpt/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735322654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rg2AMziURnw7fCz/qSxMx3HfYYHw+R3q2JJB7pYfE/8=; b=UHjs1pNOqiRHEHjYPGEkZkp+lbCQMxSaoukGkMRXtX/jVkHFgX8p5SOWF1PdxcZoxG1g2y SO/bUBV/Qd8o6QsmLlVHbeofB+/t9dJOcyzlnd0HYH9rSalUVzrozKmXh0U8P6bz2Ih0e0 vRWtQ77cNYZNgvVIsmkNk/MapBO/9anvhJwldlU/xCWf3hE9Svye4SbkIGMyKBe9ppfZsk Zo9LvGHyRdGH2krkHd7fjP1QRRrGPYFUqtBlEa9g5um52A28NL9JyvJrItE0Ijq/vqnafz NWLkB1R/pkXmmbf08AW/XuH3h/IyhsZ5KEnNjOIYk2j00M5jQUGR+PVmPh+qhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735322654; a=rsa-sha256; cv=none; b=xCO/7AvM759yLU12bFHYhIjYl+iP/WlB3I4qbQde2azbowByI3lMrkzhKIN5U/Foq6gbUT LvK4OftwBIEwOXheUg4TdCHWHhjrk6ZY7CAy9U6Tw0/ZoeT6o9EI9yyRwha1e2qXKLK6k7 jRUQeKh/6Rd1++c7vzwsGhujuXjR4FsCC9oYPCaMkLvSHiOWoOGkLeinD42C1/PhhAYTss HDSp1q3YNN0YacrU9IrT0uu0fRmKZ7qtmYNuoaNu16ZmwZeuWlWBaORxKIS0L8Ul4bCXQE 9NWgQIKxAbHNgSwx4rT7e2fZdvBCymyIcKDmfY91hW4xQLEZdCjIhYad+KXiZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKYKT6h7bzq61; Fri, 27 Dec 2024 18:04: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 4BRI4DOw051201; Fri, 27 Dec 2024 18:04:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRI4DZc051198; Fri, 27 Dec 2024 18:04:13 GMT (envelope-from git) Date: Fri, 27 Dec 2024 18:04:13 GMT Message-Id: <202412271804.4BRI4DZc051198@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 1d673cc1fd82 - stable/13 - pf: Set cleared time when zeroing stats for table addresses List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1d673cc1fd82263ef914f314942412da6047e1e5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1d673cc1fd82263ef914f314942412da6047e1e5 commit 1d673cc1fd82263ef914f314942412da6047e1e5 Author: Kajetan Staszkiewicz AuthorDate: 2024-11-21 20:30:58 +0000 Commit: Kristof Provost CommitDate: 2024-12-27 18:03:56 +0000 pf: Set cleared time when zeroing stats for table addresses Reviewed by: kp Approved by: kp (mentor) Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D47697 (cherry picked from commit 1a5dc6ee62b316b0caad5118dc0f3aee036f1958) --- sys/netpfil/pf/pf_table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c index 275c191f022f..7ce29d52f3eb 100644 --- a/sys/netpfil/pf/pf_table.c +++ b/sys/netpfil/pf/pf_table.c @@ -675,7 +675,7 @@ pfr_clr_astats(struct pfr_table *tbl, struct pfr_addr *addr, int size, } if (!(flags & PFR_FLAG_DUMMY)) - pfr_clstats_kentries(kt, &workq, 0, 0); + pfr_clstats_kentries(kt, &workq, time_second, 0); if (nzero != NULL) *nzero = xzero; return (0); From nobody Fri Dec 27 21:44:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKfC62PPHz5jP2m; Fri, 27 Dec 2024 21:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKfC61jxSz4k2Y; Fri, 27 Dec 2024 21:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735335842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U86BAcYmXIhszF0qPS2dxuXVD1ucYcBdzTboL8u/fxE=; b=H77N/eY44rtfcreNywpKrRLFLWMVAm/0c6D6bHaqLzwef0aeVb+GybSA9sQunAw8TBNgEH 8/Bru6h6zcrISwztQfPneuAV9TM1JEgrjieMYE596eP93r823lfqz9jMWJQgq3KcvWFwqF t5dSrfTeudUL8RiLLFrn+zuVFTrPWImwxKKBfkJBNmW02hTaVlzLlsV2/EZxHBmf+fiWI1 ig33Apfktq+Tx01kAg6IQIbmFkWpGsXgAN1RFAT9v9Nw5uH8BQnyztMw0sxmQr2/4/w9l7 q7CHBc0kmSQGZdtD1/B5zJeqmoQtZuuo9hvW7gbQV7bD7gOpi613dmJ/HroMhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735335842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U86BAcYmXIhszF0qPS2dxuXVD1ucYcBdzTboL8u/fxE=; b=e5aIPC//lVDNFuXoYTLmDeudikVftR5QRIFqlYeIQyJK/1sYgYc3VBSpLCOf1vZWJXJ+aa 3qV8wg5dFBru6HStoQiHuVoKjC0ZLJfq2RvOCwpmLWtfUyDZFAmDsc7J638MaFgnR06MtE CL8aLIvKNhF+u1s6y0FdaJiBJaKRjWpo23SSjpC9/LZw7ao+uoB0qrys/VnVBwv+sIJX3y jpfKIQcE1XcYSuO8T1vnm/lzG0INoPybYvOSD6tXUzEcz2rOYd+Q7K+3hnRxJxSj4RkTNM vicaWR0HnvAoYpzsP7vEPDyzmUZOH8UMzAUkv+1lRBETodR4NyGbg/tLg8VKWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735335842; a=rsa-sha256; cv=none; b=ItLFqELUBVesfHGt+uI41E5rWEdf4yIBJK4lPuSwR4ZOexWvm2A61UpOgPzjHsMyRC6lJv QUy0sUGONHIWkDJb4U5UaasJLtE6YTStsEMxLqHNEN7yw0rBcLFx1iGF2iVRaPExj4iG4e dmoA2yy7qfs/mPBe+qugIirHGVYzPcahRsrWErosp5xz3P6tRQ9z19W00/7DDnYU05Ng/G xJUHJEsyHPRfYk3GGUlw1dBvFWZcAQlKYEwmJl/jrWoSIe+A40WgI72KVeI541C1erqjz0 CYwEOW+XGA21Tfpp9P0AHvSKAXBp4HT7333TEP8FHhKJPbvFJFRAQZsvNq5EhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKfC61JstzwG1; Fri, 27 Dec 2024 21:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRLi2rq062643; Fri, 27 Dec 2024 21:44:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRLi2Jx062640; Fri, 27 Dec 2024 21:44:02 GMT (envelope-from git) Date: Fri, 27 Dec 2024 21:44:02 GMT Message-Id: <202412272144.4BRLi2Jx062640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joerg Wunsch Subject: git: 1330ea449802 - stable/13 - MFC: devd.conf(5): explain difference between internal and shell variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joerg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1330ea449802aaf36d4e3fb8e98fcee5be1f5aeb Auto-Submitted: auto-generated The branch stable/13 has been updated by joerg: URL: https://cgit.FreeBSD.org/src/commit/?id=1330ea449802aaf36d4e3fb8e98fcee5be1f5aeb commit 1330ea449802aaf36d4e3fb8e98fcee5be1f5aeb Author: Joerg Wunsch AuthorDate: 2024-12-20 20:16:52 +0000 Commit: Joerg Wunsch CommitDate: 2024-12-27 21:42:54 +0000 MFC: devd.conf(5): explain difference between internal and shell variables devd.conf by default considers many variables as internal, possibly expanding them to an empty string. Shell variables thus need to be wrapped into braces. Reviewed by: imp, Andre Albsmeier Differential Revision: (cherry picked from commit 1fc7922f9f905b62ef9a6c03be498c282e7b382e) --- sbin/devd/devd.conf.5 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5 index 5e438ab6aeac..49d4ef84c5fa 100644 --- a/sbin/devd/devd.conf.5 +++ b/sbin/devd/devd.conf.5 @@ -38,7 +38,7 @@ .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS .\" SOFTWARE. .\" -.Dd September 22, 2022 +.Dd December 20, 2024 .Dt DEVD.CONF 5 .Os .Sh NAME @@ -668,6 +668,26 @@ For example: // part of the previous comment. .Ed .Ss Notes on Variable Expansion +Variables are expanded by preceding them by a +.Dq $ +sign. +Any text immediately following that sign, starting with a letter, a minus sign +.Dq - , +an underscore +.Dq _ , +or an asterisk +.Dq * +is considered an internal variable, and expanded accordingly. +If that variable does not exist, it silently expands to an empty string. +Consequently, if the intention is to pass a +.Xr sh 1 +variable, it must be surrounded by braces to prevent it from being +considered an internal variable. +.Pp +See +.Sx EXAMPLES +for a detailed example. +.Pp To prevent issues with special shell characters, the following happens for each variable .Ic $foo . @@ -685,6 +705,10 @@ The value of the .Ic foo variable is inserted into the buffer with all single quote characters prefixed by a backslash. +.It +A final +.Dq ' +is inserted. .El .Pp See @@ -788,6 +812,37 @@ detach 0 { }; .Ed .Pp +The following example illustrates the difference betwen internal and shell variables: +.Bd -literal +attach 20 { + device-name "umodem[0-9]+"; + match "vendor" "0x2047"; + match "product" "0x001(0|3|4)"; + match "interface" "0"; + action "cd /dev; p=$product; dn=$device-name; \\ + un=$(sysctl -n dev.umodem.${dn#umodem}.ttyname); \\ + chmod 666 cua${un}; ln -sf cua${un} mspfet${p#0x}"; +}; +.Ed +.Pp +.Dq product , +and +.Dq device-name +are internal variables. +Their contents are initially assigned to shell variables +.Dq p , +and +.Dq dn , +respectively. +Then, variable +.Dq dn +is used inside a shell command substitution, assigning to shell variable +.Dq un . +Finally, this shell variable is used in two other shell statements, where +it needs to be wrapped in braces in order to prevent it from being +considered in internal variable to +.Nm devd . +.Pp The installed .Pa /etc/devd.conf has many additional examples. From nobody Sat Dec 28 01:47:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKlbV6LXsz5jhsY; Sat, 28 Dec 2024 01:47:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKlbV5SJMz4GDc; Sat, 28 Dec 2024 01:47:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735350422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FESKnCd25cjbAThG+RbURWOV6DS/zvL/4BH7SwyC30g=; b=Nhq+iqJQva0vFkpzh07qxya17D2aDs3Gs147R+3qJJ4LkPbyKg+Nd0DsYdp/sCY0r5PpiH peQGATHmWtkreuTKf1ESC6cnBPVJqK2BtTW0aRa6pXHekag3nxO3brmrz5UIrOSa0UFOlY tEY8xZLCPR9Jr5cmzON6Boxe/Jg9hHZaT20efLs24Gv5nyJz8uWbFJ9JSxo5R1au00/kv9 GDF3EMNvMcPXPlRVdPRXXtehlYQvp5zCy/vtH998Z5tkfrpvaNloeiTtLgFLudO2YrIUf7 rkjBGeS0oAtmcpPxdEMReHJrraqXx3vAu5b/ihztP90LeXYUJj81gwTwYfiB+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735350422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FESKnCd25cjbAThG+RbURWOV6DS/zvL/4BH7SwyC30g=; b=mMot7cwvgb3Si44b7htLzAQsabdR3MdqfyAn9wlfIvCp/naHN+U5cAf4Aubth4YNzT/kOl OqIK4FG8B7clpPWlG3e7At9Hv7v9QRRqOZp/DgdQTD7dF6AA0mgXa/Aggs16xqPAualo41 Azsx1P13Cmysyk2B4smpZ7O+fBmpQEv/ZvCUMmhCzFPYLM86oyaj6khvZqcVKWhzv5BIRF SCn8zVcv0sRzzUdYGvgceyHN0tqBsQEf+Lj65Qaglp3c5ewYD2Pv5vPXh1ZE7aBoYQ1KSZ O0aEAfuBiO2IwFR9zc9UJRwIDCrLB6CsHDzZWf2FvTHMgPRmjMlCbANTUMwcXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735350422; a=rsa-sha256; cv=none; b=S+8flronbwqRgZ5IA99P4UHGnaQTkquvch78bLUdOMIN5iawZ4BKwOOiyj/nofxOh/v0Bp 1QPrvZQbyTHBXdJf5GD48/0WWeYJ1D2hrvrc0O6F0aAAqJmK/g12MjQGvae35+G1jk2oFZ qG9qjg1ki9aClT6aFR99wu5/GaJ1gfrqwTZ8T0iIuK+W1zGa8AAeQUb82J75I0feB3W+ey BRSOSL5g3c1NgKXcI4fzYe+93S2rAkeoXVGc8HR+k5JsKGBYVahMSa9jtm+OA8/aAk0lNB NTBXDATk07EUSthAscyNCQnMcQzxEzgXEDuZKVq5znfHKeCgktLt/f0Qi2W6cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKlbV4wmhz14GS; Sat, 28 Dec 2024 01:47:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BS1l24T010515; Sat, 28 Dec 2024 01:47:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BS1l2iT010512; Sat, 28 Dec 2024 01:47:02 GMT (envelope-from git) Date: Sat, 28 Dec 2024 01:47:02 GMT Message-Id: <202412280147.4BS1l2iT010512@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: 791170aaf7ef - main - rtwn: make sure RCR_APPFCS stays set in monitor mode / mode changes. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 791170aaf7efb4e053ccbf537d80a43e8a81d1e4 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=791170aaf7efb4e053ccbf537d80a43e8a81d1e4 commit 791170aaf7efb4e053ccbf537d80a43e8a81d1e4 Author: Adrian Chadd AuthorDate: 2024-12-16 20:09:56 +0000 Commit: Adrian Chadd CommitDate: 2024-12-28 01:46:38 +0000 rtwn: make sure RCR_APPFCS stays set in monitor mode / mode changes. My previous commit meant that APPFCS wasn't enabled during monitor mode and likely other corner cases. Ensure it stays on at all times. This, amusingly, fixes monitor mode in RTL8812AU/RTL8821AU - without it, I don't see HT/VHT frames in monitor mode but I can still receive them in normal STA mode. Differential Revision: https://reviews.freebsd.org/D48112 --- sys/dev/rtwn/if_rtwn_rx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/rtwn/if_rtwn_rx.c b/sys/dev/rtwn/if_rtwn_rx.c index b1465dd80ee7..e5ddc7a3cb97 100644 --- a/sys/dev/rtwn/if_rtwn_rx.c +++ b/sys/dev/rtwn/if_rtwn_rx.c @@ -532,7 +532,7 @@ rtwn_set_promisc(struct rtwn_softc *sc) RTWN_ASSERT_LOCKED(sc); mask_all = R92C_RCR_ACF | R92C_RCR_ADF | R92C_RCR_AMF | R92C_RCR_AAP; - mask_min = R92C_RCR_APM | R92C_RCR_APPFCS; + mask_min = R92C_RCR_APM; if (sc->bcn_vaps == 0) mask_min |= R92C_RCR_CBSSID_BCN; @@ -551,5 +551,12 @@ rtwn_set_promisc(struct rtwn_softc *sc) sc->rcr &= ~mask_min; sc->rcr |= mask_all; } + + /* + * Add FCS, to work around occasional 4 byte truncation. + * See the previous comment above R92C_RCR_APPFCS. + */ + sc->rcr |= R92C_RCR_APPFCS; + rtwn_rxfilter_set(sc); } From nobody Sat Dec 28 06:43:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKt9K5L5xz5hcGv; Sat, 28 Dec 2024 06:43: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKt9K4k64z4lW1; Sat, 28 Dec 2024 06:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdqrCohqUkPeQj6NMTF7vpAksP8nzrJBe4mlLdFJzgo=; b=T8rVGFb1OpNyoiq8/VoFXUstbd5v6jDfnsl1upx+gOQBBtz0pUIZ+Ftd/PwFwreY0sBYPk WeTP9FZ8UlSs0i0s+RtevLpzt9fHCO2Mb0hmDm9Ct7Q43DlSvuwcMkTgTMxGzv9E61+KNj 8a4pYppKkKt7H3uulfTRsB6Y0439pQJ5AGt4FodYFgh5yRgpuKmvhIJnmgZLKiVO7aRf+U m+X2KOj+TG9a2L8bWQmcwagSTN853mmZkNz+H9dTVUhGJyjB4mJklHODvoeHUOaPiTiCdz QFSMx2P0+E1/VkBK0ZHEUAPaPeBHnLGiQN5eUv5EN+Qw2t++xR53SSBu5ju/AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdqrCohqUkPeQj6NMTF7vpAksP8nzrJBe4mlLdFJzgo=; b=y1FbKSHFat6JPMewEMhhpfQypuLvfXiuCuwNr99jOtxx3jePvsNk/dAvvskCsUNVqMK/XZ U0CM68saCz6/rB8fNzDibe95B7xhp10TYr0yyDDtK5gYb6wK/+E48nLgd8zWq1lqIt9Ep0 RrQrHMJeEUj4SlSlGsLMdrnb8qEnL8ta6Vwy1t6U90HJAyANeDjLoDbfZAtOgEQBG/zeQK lKidTFIpM0ZvLIQ+dBnsgSzKe3/JBkgocadUWFSIqWD82JdfHsmb4Tv8RsajNkELUNqCDr ZYGbW6vcRPZbb1AMKr3uZDb8hF6M1VgY9FNnKDikc0bn/3LdyyO+OwJUq9AHMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735368197; a=rsa-sha256; cv=none; b=Md4Prns8Z51Qsygq6uMyyXvXPPa+wDMJyf7ltIhYIlyN7Y6mbBzVY5bwm7pFIibVD1ZFbK 3/6zTflvwWyGaO0BMvnvoOdEeFSmjsJJX1DP9DKaQ9pAd23MTIqMdQTkg+y4mOuDaHx2u/ coJtUQhkveaAEpipD4jatoLCwpxBr6V86uabyLazGvWz2pRNIWKbZMUT3C2pv0Z4WleomI j/kP8RN3qYhADcH7s/XjfmYl8T07C1miLF7dLmNMjMliDXAhrOpO6No7emuWMY9zVieEEx Rg0nWlHtPtR91YYfJ3edi2LsrPo1K6ceLE0G/xc4JKXUmWhukmxoz60Jw8cHhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKt9K4KMPz1CWH; Sat, 28 Dec 2024 06:43: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 4BS6hHdR072242; Sat, 28 Dec 2024 06:43:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BS6hHfh072239; Sat, 28 Dec 2024 06:43:17 GMT (envelope-from git) Date: Sat, 28 Dec 2024 06:43:17 GMT Message-Id: <202412280643.4BS6hHfh072239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: fad3e1fbc8a4 - main - arm/qualcomm: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fad3e1fbc8a4b7bf4189c93e877bdb68aa26f611 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fad3e1fbc8a4b7bf4189c93e877bdb68aa26f611 commit fad3e1fbc8a4b7bf4189c93e877bdb68aa26f611 Author: Gordon Bergling AuthorDate: 2024-12-28 06:37:41 +0000 Commit: Gordon Bergling CommitDate: 2024-12-28 06:41:24 +0000 arm/qualcomm: Fix a typo in a source code comment - s/unneccessary/unnecessary/ MFC after: 3 days --- sys/arm/qualcomm/ipq4018_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/qualcomm/ipq4018_machdep.c b/sys/arm/qualcomm/ipq4018_machdep.c index 206f428111ba..49dd2ff0193a 100644 --- a/sys/arm/qualcomm/ipq4018_machdep.c +++ b/sys/arm/qualcomm/ipq4018_machdep.c @@ -64,7 +64,7 @@ ipq4018_late_init(platform_t plat) * XXX FIXME This is needed because we're not parsing * the fdt reserved memory regions in a consistent way * between arm/arm64. Once the reserved region parsing - * is fixed up this will become unneccessary. + * is fixed up this will become unnecessary. * * These cover the SRAM/TZ regions that are not fully * accessible from the OS. They're in the ipq4018.dtsi From nobody Sat Dec 28 06:43:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKt9M2w8xz5hcJP; Sat, 28 Dec 2024 06:43: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKt9M0GC2z4lSb; Sat, 28 Dec 2024 06:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nvPjSzznX4q4WqGswl511T/dMO1ZKpF2DZvuDDDIsYE=; b=ckTLjy/WZKdP03V34Lgewqep6nRvwuXRsb4YcoFxxllQdoBib6MUUQTIk+2BggJhg766bP Xx83EAO/gotb4oidsNfjI/tCLG1l7LgqSyp3DzN2aOfkwR0V8tv8Bx62HQZ+LcFW417cPf bc1vJFIjmvv0afwwjmmcZ/a1Ldi4LS1qzjebhGd+zii0yCTu4x1aYOne3RiJkcOMzv2uHR 06KfaDWgG95D81n8JRzzrLkgPbc6HgIzGD6xILHso/bfWChiyb2XCYBZlcgc43OgSK89vq 5ZGy3V7g8FD7QtrNgR97py7lLEOQ/LyL8O7Ec4VmXgTLo9CY1U11X/0FF5JyuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nvPjSzznX4q4WqGswl511T/dMO1ZKpF2DZvuDDDIsYE=; b=uZGre6ckuV51CZbK/0HPdCUCMQ5UWY+wy42R/fs0V061fy+7u2j5YNXQYKwkANwrZqYRms /ssjSmKRLJ+HUJeO2nRFL+IVStaWhxK+/24EKS1o00AM2Sq+EUG2bNAU3ibqz7WrfgQ2KO boWpmd7rFxhVG11jmIdnGeiU7JbGpfUrTkkscsKIRap01p+m3TBM4soTtAwCBkDv1kRZWi 5mj3nwQZbbLKiP66ehHqpz36dQ8FDuYLa5DUPnQTT3pyFYwDkoI+sIOp9yLi7kuwP8+5d+ kZp5f4ANOjiUwIjCJbQ7ULilo6G0PP0HDUVfhrwtrAl6VmFat379thIXcQEHiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735368199; a=rsa-sha256; cv=none; b=Atgma9Kw58+Yv9SNZW9ybt0KV7s+ZaQAPSk/Z7O5bNs+HHwCkiATvSGYlEWLnXA1EB6+Da ngiK/wzmRg4j94yziNH/WsdzlQOMGVuTiU4+N9//yvci3CFfNfQI+dptj46sTG+H5gOAyf 3ujwsRTgpCZEbuVEzbB0ndckSc+aq4xDz1hjMPEVWj/hlsCNTAb43EBfmK14326aMyRiDm 5KrG+SbVSlfSFljMHt/EbV9kcmErXUxAj7qz2tKXjU549LSJ0uD7CWK2c7FH8NM2yGqVLN L6Fom8kvtTsbP/GNSCRcQhFfYyZiJtdrCPCPDfYYk5hG+Nv2jgo0qDKP96RWqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKt9L5Mb5z1Cwn; Sat, 28 Dec 2024 06:43: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 4BS6hIjD072301; Sat, 28 Dec 2024 06:43:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BS6hIQp072298; Sat, 28 Dec 2024 06:43:18 GMT (envelope-from git) Date: Sat, 28 Dec 2024 06:43:18 GMT Message-Id: <202412280643.4BS6hIQp072298@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 3db51fb1720e - main - isci(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3db51fb1720efdddd6e8c2045397f59a398692d3 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3db51fb1720efdddd6e8c2045397f59a398692d3 commit 3db51fb1720efdddd6e8c2045397f59a398692d3 Author: Gordon Bergling AuthorDate: 2024-12-28 06:38:33 +0000 Commit: Gordon Bergling CommitDate: 2024-12-28 06:41:34 +0000 isci(4): Fix a typo in a source code comment - s/kength/length/ MFC after: 3 days --- sys/dev/isci/scil/sati_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/isci/scil/sati_util.c b/sys/dev/isci/scil/sati_util.c index 22c3111fe9ca..300ecbd5367b 100644 --- a/sys/dev/isci/scil/sati_util.c +++ b/sys/dev/isci/scil/sati_util.c @@ -70,7 +70,7 @@ /** * @brief This method will set the data direction, protocol, and transfer - * kength for an ATA non-data command. + * length for an ATA non-data command. * * @pre It is expected that the user will use this method for setting these * values in a non-data ATA command constuct. From nobody Sat Dec 28 06:43:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKt9N0pXnz5hchg; Sat, 28 Dec 2024 06:43: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKt9M6TZcz4lQD; Sat, 28 Dec 2024 06:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tu+JfGGu/kzdVWRk9Zn3qZwQ2Rvgf55wXxB5FBsBNZ4=; b=ySJXeZi0Qliz1265oQ/AMSY1BB6OKB2yiG2HT6CsVkrGTVii/o3KPBRgfq9M1T9bXPSay1 CyEjr3OiN7qzboyTyr87bowKdWyvTcnmPbG6ekMrW8wI4r7iBz168vH67AidO1REWOj+mP r2rvVU9pxa1a09gEV0RhfbTHjtRcxtJQ95K1HYeHf3VbnyrAUS0OlHJT+BLlxl0bWfAv1X Y+gXU2IuNsvYGbQeptUgcgqN3sN8c1rUMzrJjJA/JLkNMm2eCzEYEV9bKD/kHTrSEGlLEa M5ZEU7rojLKuy2US1+JhCBaQd8IS845NPIcR3bSgI/qiiBjw9dOc0ZWJ1sHpfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tu+JfGGu/kzdVWRk9Zn3qZwQ2Rvgf55wXxB5FBsBNZ4=; b=rsj0XE5yXLr50wPNlq90pA8C+FyZ3D3GUyPWFoQxn/8G3/lOjc8YfYulWkWz6egSgC5h2f ys7UBRL0/WWP9/TP/Z7iPeNzVto8a58vHjKbAWbnOKLbK9wYBufKitJ3IlwW/dFbXUVMBF vFDTiFL829492TKsOemjWD3AiIlDcYYYlfwZHrir+JjRgkhAnrnH9GMvr+xNCnwAqEO1pv 3QrYcO57WBj6BhclTOO8PCowTBsP5NrByekHIGizIBQbHEIq2npAOEWR/cgvhhJ/kyjJ2O WUegRWYZwzIkIpMKvv+PCXz8tA3ePiPscahVHUJLExNonR4vkRJJgxDBwrcX7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735368199; a=rsa-sha256; cv=none; b=gJSml0kpwxmjZeWSFRT+O55nLf1wbOq3gUcN0dVrvLm6AAdUjEy4MjoBUHL+v8xsHpg7b3 2vqCLY1gwwViJrl/AtnIg037kZmdLaBFODo3pf1kR/xeL4NoCGR+hAnjTDf7GwPzyM32ZI Hoxc+YuSFjJ9xUReVVgpwl4TszGtKp1BQGbuQsPCio92ZzQvVV5sOJhoIx21UbVBi2JeLT DCwAokvfILqD73AvGnAKqY7S9aFZUcUDbdNFupDU7zgqZnbqTSjQZ4HzPA17FdAYd5a0cE dUNPl6AQVvpp7TT1f4kTLAgRTm8bJ6Lx0gxhB7cXFzyDyx3+5a32yAEY6Iu3TQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKt9M65k2z1CtH; Sat, 28 Dec 2024 06:43: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 4BS6hJai072361; Sat, 28 Dec 2024 06:43:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BS6hJPm072358; Sat, 28 Dec 2024 06:43:19 GMT (envelope-from git) Date: Sat, 28 Dec 2024 06:43:19 GMT Message-Id: <202412280643.4BS6hJPm072358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: d40330306cd0 - main - sound(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d40330306cd000c7c64dc18a3634ac8e04b33fdd Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d40330306cd000c7c64dc18a3634ac8e04b33fdd commit d40330306cd000c7c64dc18a3634ac8e04b33fdd Author: Gordon Bergling AuthorDate: 2024-12-28 06:39:21 +0000 Commit: Gordon Bergling CommitDate: 2024-12-28 06:41:43 +0000 sound(4): Fix a typo in a source code comment - s/orginally/originally/ MFC after: 3 days --- sys/dev/sound/pci/csareg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pci/csareg.h b/sys/dev/sound/pci/csareg.h index a36e36177f5c..3341390f618b 100644 --- a/sys/dev/sound/pci/csareg.h +++ b/sys/dev/sound/pci/csareg.h @@ -34,7 +34,7 @@ #define _CSA_REG_H /* - * The following constats are orginally in the sample by Crystal Semiconductor. + * The following constats are originally in the sample by Crystal Semiconductor. * Copyright (c) 1996-1998 Crystal Semiconductor Corp. */ From nobody Sat Dec 28 06:43:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKt9P3RlXz5hcm8; Sat, 28 Dec 2024 06:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKt9P12H7z4lWK; Sat, 28 Dec 2024 06:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mnQQJPoomVVpvqWOy5/oQCzKQhy9yETh0MK3qtfbVOo=; b=tWW3Jdoooug3NjC6TKKxm5wfAfBtBDGtDeA3Z1U/8nbylib4fFPWdFxW+vbqR48Hb8DTNO OUbBc79fSLqEcTsfv17Ax2bMuu/ApJaZYuX9qItPk1wmJxBrAHPwF8T2Syxhoxh3ESBGPo /M0+isR3UV7GKllIYo+QrWBSwtMP8TpiJG0CcAVY1/CQEawsXEX8gbUdfgXA2AOTPvudqy B9MgR5U10IjinCfxplmlyU9eSNSuKNWv/OS5AOxXMtMqxd+Ms39R3sisD92cIKb2dbuEA6 61GRmetSGiyu5p+DNtuTQtAd35a47bwg0HkKk5KrbwV77X0wEdWfFtfKgdrhmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mnQQJPoomVVpvqWOy5/oQCzKQhy9yETh0MK3qtfbVOo=; b=LQftt63xVx8GykeUTnvfuWSi/sBMJRMmNtMbUgJAZ6XgDqCvlpjzkvFGd6ndbuydTDyMJj gJfrAS3VLcihu5DT9oUrNLH+9J7KiOWy56s6an0XRWZQaEukdGAV7lzmwAQ0MigBKvq/LL VCXNTkd3xc74x+Zc02jHkpcYK5XTCpVsiW99iGH8OWD1mkrqkDSaXBo2hkjbxyjVSk0i/Q eLortsGkmL51L8P8zVB6JRdK0Y9HTtlOjSWZWP/XpFCLbuiVxrMQ6nExzeA7hqhFLRZRnA qObv7wbdWFihXkH2BmeBkkMsM+dD8CRuYBZuYpz/a7sex7evANV5u1SGg4y+7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735368201; a=rsa-sha256; cv=none; b=n09ODFE1OtmyybiHg6BJC5ZX+4wjQkGq2HLzhJGH4dkPBTrnJ4B6zIhvtH1mLBREO0gsGC SiaNJ2tTDnpFXXbGlxCU0wQb+WFsmmJEv8PGtzjDh6M5GXle+/zBuZzP9ahjzwr8Av4izX eUcxs/xezHRPpatUzMjJ9rNaqjlKCkkI+nFEu2pc5E0TpOqTL5jMlxzSMDldKtbQjF3TmX C8tD8Fc22mBsUySN7FqsU24Lbl3gPZFTANqXW/JKAbsGtyfXzcv4Ft35OnLYSMeNbe+zGa vmfB+8En2iFwFsJ4zbNehMF/Dyur4C+bzbesZq2g99wJl8r5tsM0on5pPuw01A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKt9P0JpWzDq4; Sat, 28 Dec 2024 06:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BS6hK0G072431; Sat, 28 Dec 2024 06:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BS6hKb7072428; Sat, 28 Dec 2024 06:43:20 GMT (envelope-from git) Date: Sat, 28 Dec 2024 06:43:20 GMT Message-Id: <202412280643.4BS6hKb7072428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 15ce9a0544e9 - main - kern: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15ce9a0544e9d850fb332b4bae3313ff38584d61 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=15ce9a0544e9d850fb332b4bae3313ff38584d61 commit 15ce9a0544e9d850fb332b4bae3313ff38584d61 Author: Gordon Bergling AuthorDate: 2024-12-28 06:39:50 +0000 Commit: Gordon Bergling CommitDate: 2024-12-28 06:41:50 +0000 kern: Fix a typo in a source code comment - s/explicity/explicitly/ MFC after: 3 days --- sys/kern/sys_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index fe2e112dbcfa..581f8f65ec56 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -355,7 +355,7 @@ proc_rwmem(struct proc *p, struct uio *uio) /* * If we are writing, then we request vm_fault() to create a private * copy of each page. Since these copies will not be writeable by the - * process, we must explicity request that they be dirtied. + * process, we must explicitly request that they be dirtied. */ writing = uio->uio_rw == UIO_WRITE; reqprot = writing ? VM_PROT_COPY | VM_PROT_READ : VM_PROT_READ; From nobody Sat Dec 28 07:16:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKtw000Bmz5hfrG; Sat, 28 Dec 2024 07:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKtvz4nsFz4qYF; Sat, 28 Dec 2024 07:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735370207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZO0jDSr0J20+Jpb4sCLkgCUFgB/LKdV8tGZl0CCewc=; b=rGNkFyyCXaYx9NMcAXCuEjcLf2PCz9ERPOV5LBV6zuP+IGST74+egiXDwtP2SvUbpAJLbe 40tk13rEgsvpPi5/b8QmRQQdPu6MUME4EDPArXyFr1CLjmIWTOdv9FxKl3XPaO14JZJhuF HvALY2D36HYc2TEJexA7HwTHYkcQ+oEz4x2JHOPNgTWEhbrxMhno8F9EMFC0qvxpiPM0kW ihqWzEGuRyCct6kdh8xLdAkRXdnXWOwiH2ypwVhEUccv/qpLflj8XeMGvl8iJMHhYfQCC7 bmzWCYC2uJMUR+StYL2cW5Jg00TX5yaLOnUumDTyhU/A61W5Ee0WkgzJ3gP58w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735370207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZO0jDSr0J20+Jpb4sCLkgCUFgB/LKdV8tGZl0CCewc=; b=bKBRWsEn/dGl9dpqI1lP0KNATjmdIg3VIIlAHQQ5QoRFEPPY31aFpc0nq8cC8ZJfyEtUFi L0keCCFv6L0EYlY5NNasto/t80i6zcsPL48ayaNl8lV72W5OVovr1TE6SovD9SPIX8VMnM 0NHOAp5413NQsW5Z2dQLouJtwuCJZyQaqSs7Yvtn3F2AybLharqcP/Nt1FgJcLPPo9bhLW s5X5IBg6wv9Mp66R5aFjm8CngGmI/YRBI5huK0eR+usPvYnClQEsXiD22YBExgRVV3oPOP TEAubmudumvIu7eV+T4XTZv1xlwkYGRMtgxm0r+KoEx+bAGpYmzHffA2v3rV6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735370207; a=rsa-sha256; cv=none; b=ySsTjh68CFKpFzGX6hBxORUgVOq7+7my+XDL7KHZ/NFVODDlqWGnvrCbPyvNRI3RIJ9llN dAeJLfsFXGO4i/VYwadvZL8PBudZWwcDqhF2qQdQbJ4LgnB13N4KDi0Txsq9QijvT4AMQK 90xNpI1Gm8mn1VC7eTMIY35kZoLlJwHFqY+ecvBhVxCL43W11gWoldHCBY3d5WTayzFzOA E9KOUoqGFyml11aGitS14dn/c8kClaN/RRa3B+98CRjXUHAO5fLpWeXOH0/TOxZxkeEqGZ dHJhcJH4I3MbtOR/0kEzrjkfR+y1kbZyeIVp1fbMq0Pl0z81ETpubEAS0ONgmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKtvz43mkzFHl; Sat, 28 Dec 2024 07:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BS7GlNw030349; Sat, 28 Dec 2024 07:16:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BS7GlY0030346; Sat, 28 Dec 2024 07:16:47 GMT (envelope-from git) Date: Sat, 28 Dec 2024 07:16:47 GMT Message-Id: <202412280716.4BS7GlY0030346@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 06690044dac1 - main - timeout(1): Some minor tweaks and improvements List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06690044dac183ea1d93c2ae227e261da3bdca2a Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=06690044dac183ea1d93c2ae227e261da3bdca2a commit 06690044dac183ea1d93c2ae227e261da3bdca2a Author: Gordon Bergling AuthorDate: 2024-12-28 07:13:22 +0000 Commit: Gordon Bergling CommitDate: 2024-12-28 07:13:22 +0000 timeout(1): Some minor tweaks and improvements - Define exit status and macros and use them - Improve the second kill logic by setting 'do_second_kill = false' after configuring the second kill - Minor style tweaks - Reorder options in the man page, as well as the usage help - Reorder the exit status in the man page - Enhance the HISTORY section in the man page (obtained from NetBSD) Reviewed by: bapt, Alexander Ziaee (manpages) Approved by: bapt (src) Obtained from: DragonFlyBSD MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47866 --- bin/timeout/timeout.1 | 63 +++++++++++++++++++++++++++++++-------------------- bin/timeout/timeout.c | 38 ++++++++++++++++++------------- 2 files changed, 60 insertions(+), 41 deletions(-) diff --git a/bin/timeout/timeout.1 b/bin/timeout/timeout.1 index 10e5fd70c393..b8ec3030b271 100644 --- a/bin/timeout/timeout.1 +++ b/bin/timeout/timeout.1 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 17, 2024 +.Dd December 28, 2024 .Dt TIMEOUT 1 .Os .Sh NAME @@ -32,10 +32,11 @@ .Nd run a command with a time limit .Sh SYNOPSIS .Nm -.Op Fl -signal Ar sig | Fl s Ar sig -.Op Fl -preserve-status +.Op Fl k Ar time | Fl -kill-after Ar time +.Op Fl s Ar sig | Fl -signal Ar sig .Op Fl -kill-after Ar time | Fl k Ar time .Op Fl -foreground +.Op Fl -preserve-status .Ar duration .Ar command .Op Ar args ... @@ -62,18 +63,6 @@ is 0. .Pp The options are as follows: .Bl -tag -width indent -.It Fl -preserve-status -Exit with the same status as -.Ar command , -even if it times out and is killed. -.It Fl -foreground -Do not propagate timeout to the children of -.Ar command . -.It Fl s Ar sig , Fl -signal Ar sig -Specify the signal to send on timeout. -By default, -.Dv SIGTERM -is sent. .It Fl k Ar time , Fl -kill-after Ar time Send a .Dv SIGKILL @@ -82,8 +71,21 @@ signal if is still running after .Ar time after the first signal was sent. +.It Fl s Ar sig , Fl -signal Ar sig +Specify the signal to send on timeout. +By default, +.Dv SIGTERM +is sent. +.It Fl -foreground +Do not propagate timeout to the children of +.Ar command . +.It Fl -preserve-status +Exit with the same status as +.Ar command , +even if it times out and is killed. .El .Sh DURATION FORMAT +The .Ar duration and .Ar time @@ -92,7 +94,7 @@ unit-specifying suffix. Values without an explicit unit are interpreted as seconds. .Pp Supported unit symbols are: -.Bl -tag -width indent -compact +.Bl -tag -offset indent -width indent -compact .It Cm s seconds .It Cm m @@ -116,10 +118,15 @@ If .Fl -preserve-status is not set, an exit status of 124 is returned. .Pp +If an invalid parameter is passed to +.Fl s +or +.Fl k , +the exit status returned is 125. +.Pp If .Ar command -exits after receiving a signal, the exit status returned is the signal number -plus 128. +is an otherwise invalid program, the exit status returned is 126. .Pp If .Ar command @@ -127,13 +134,8 @@ refers to a non-existing program, the exit status returned is 127. .Pp If .Ar command -is an otherwise invalid program, the exit status returned is 126. -.Pp -If an invalid parameter is passed to -.Fl s -or -.Fl k , -the exit status returned is 125. +exits after receiving a signal, the exit status returned is the signal number +plus 128. .Sh EXAMPLES Run .Xr sleep 1 @@ -206,6 +208,17 @@ The .Nm command first appeared in .Fx 10.3 . +.Pp +The +.Fx +work is compatible with GNU +.Nm +by +.An Padraig Brady , +from GNU Coreutils 8.21. +The +.Nm +utility first appeared in GNU Coreutils 7.0. .Sh AUTHORS .An Baptiste Daroussin Aq Mt bapt@FreeBSD.org and diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c index b1c3262bf711..76e51eaa965e 100644 --- a/bin/timeout/timeout.c +++ b/bin/timeout/timeout.c @@ -41,6 +41,9 @@ #include #define EXIT_TIMEOUT 124 +#define EXIT_INVALID 125 +#define EXIT_CMD_ERROR 126 +#define EXIT_CMD_NOENT 127 static sig_atomic_t sig_chld = 0; static sig_atomic_t sig_term = 0; @@ -51,9 +54,9 @@ static void usage(void) { - fprintf(stderr, "Usage: %s [--signal sig | -s sig] [--preserve-status]" - " [--kill-after time | -k time] [--foreground] " - " \n", getprogname()); + fprintf(stderr, "Usage: %s [-k time | --kill-after time]" + " [-s sig | --signal sig] [--foreground] [--preserve-status]" + " \n", getprogname()); exit(EXIT_FAILURE); } @@ -66,13 +69,13 @@ parse_duration(const char *duration) ret = strtod(duration, &end); if (ret == 0 && end == duration) - errx(125, "invalid duration"); + errx(EXIT_INVALID, "invalid duration"); if (end == NULL || *end == '\0') return (ret); if (end != NULL && *(end + 1) != '\0') - errx(125, "invalid duration"); + errx(EXIT_INVALID, "invalid duration"); switch (*end) { case 's': @@ -87,11 +90,11 @@ parse_duration(const char *duration) ret *= 60 * 60 * 24; break; default: - errx(125, "invalid duration"); + errx(EXIT_INVALID, "invalid duration"); } if (ret < 0 || ret >= 100000000UL) - errx(125, "invalid duration"); + errx(EXIT_INVALID, "invalid duration"); return (ret); } @@ -106,6 +109,7 @@ parse_signal(const char *str) if (errstr == NULL) return (sig); + if (strncasecmp(str, "SIG", 3) == 0) str += 3; @@ -114,7 +118,7 @@ parse_signal(const char *str) return (i); } - errx(125, "invalid signal"); + errx(EXIT_INVALID, "invalid signal"); } static void @@ -149,7 +153,7 @@ set_interval(double iv) memset(&tim, 0, sizeof(tim)); tim.it_value.tv_sec = (time_t)iv; - iv -= (time_t)iv; + iv -= (double)tim.it_value.tv_sec; tim.it_value.tv_usec = (suseconds_t)(iv * 1000000UL); if (setitimer(ITIMER_REAL, &tim, NULL) == -1) @@ -160,10 +164,10 @@ int main(int argc, char **argv) { int ch; - unsigned long i; int foreground, preserve; int error, pstat, status; int killsig = SIGTERM; + size_t i; pid_t pid, cpid; double first_kill; double second_kill; @@ -240,11 +244,13 @@ main(int argc, char **argv) signals.sa_handler = sig_handler; signals.sa_flags = SA_RESTART; - for (i = 0; i < sizeof(signums) / sizeof(signums[0]); i++) + for (i = 0; i < sizeof(signums) / sizeof(signums[0]); i++) { if (signums[i] != -1 && signums[i] != 0 && sigaction(signums[i], &signals, NULL) == -1) err(EXIT_FAILURE, "sigaction()"); + } + /* Don't stop if background child needs TTY */ signal(SIGTTIN, SIG_IGN); signal(SIGTTOU, SIG_IGN); @@ -259,9 +265,9 @@ main(int argc, char **argv) error = execvp(argv[0], argv); if (error == -1) { if (errno == ENOENT) - err(127, "exec(%s)", argv[0]); + err(EXIT_CMD_NOENT, "exec(%s)", argv[0]); else - err(126, "exec(%s)", argv[0]); + err(EXIT_CMD_ERROR, "exec(%s)", argv[0]); } } @@ -294,7 +300,7 @@ main(int argc, char **argv) break; } else { procctl(P_PID, getpid(), - PROC_REAP_STATUS, &info); + PROC_REAP_STATUS, &info); if (info.rs_children == 0) break; } @@ -313,7 +319,7 @@ main(int argc, char **argv) if (do_second_kill) { set_interval(second_kill); - second_kill = 0; + do_second_kill = false; sig_ign = killsig; killsig = SIGKILL; } else @@ -330,7 +336,7 @@ main(int argc, char **argv) if (do_second_kill) { set_interval(second_kill); - second_kill = 0; + do_second_kill = false; sig_ign = killsig; killsig = SIGKILL; } else From nobody Sat Dec 28 12:52:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL2MG1hcHz5jL8X; Sat, 28 Dec 2024 12:52:26 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Certum Domain Validation CA SHA2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL2MF2V1fz4Lgl; Sat, 28 Dec 2024 12:52:25 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 193.175.24.27 is neither permitted nor denied by domain of tuexen@freebsd.org) smtp.mailfrom=tuexen@freebsd.org; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=freebsd.org (policy=none) Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1140:c3d:8c31:93fe:2e38:cc39]) (Authenticated sender: macmic) by drew.franken.de (Postfix) with ESMTPSA id 666AB721E2806; Sat, 28 Dec 2024 13:52:21 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.300.87.4.3\)) Subject: Re: git: 1f5c50a86173 - main - pci_host_generic:Add pcib_request_feature on ACPI From: tuexen@freebsd.org In-Reply-To: <202412121819.4BCIJ6fq097364@gitrepo.freebsd.org> Date: Sat, 28 Dec 2024 13:52:20 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <75B236EB-ECB4-46B5-807D-4B5802E96485@freebsd.org> References: <202412121819.4BCIJ6fq097364@gitrepo.freebsd.org> To: Andrew Turner X-Mailer: Apple Mail (2.3826.300.87.4.3) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Spamd-Result: default: False [-2.60 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; MV_CASE(0.50)[]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : No valid SPF, No valid DKIM,none]; RCVD_IN_DNSWL_LOW(-0.10)[193.175.24.27:from]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; FROM_NO_DN(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEFALL_USER(0.00)[tuexen]; ASN(0.00)[asn:680, ipnet:193.174.0.0/15, country:DE]; TO_DN_EQ_ADDR_SOME(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4YL2MF2V1fz4Lgl X-Spamd-Bar: -- Hi Andrew, this commits breaks the booting of my arm64 VM using VMWare fusion on an = M1 MacBookPro. During booting it reports: ... mountroot: waiting for device /dev/nda0p2 uhub0: 6 port with 6 removable, self powered Mounting from ufs:/dev/nda0p2 failed with error 19 Loader variables: vfs.root.mountfrom=3Dufs:/dev/nda0p2 vfs.root.montfrom.options=3Drw Manual root filesystem specification: ... Any idea what is going wrong? Best regards Michael > On 12. Dec 2024, at 19:19, Andrew Turner wrote: >=20 > The branch main has been updated by andrew: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D1f5c50a8617355758510675cb9412f56= fed12efc >=20 > commit 1f5c50a8617355758510675cb9412f56fed12efc > Author: Andrew Turner > AuthorDate: 2024-12-12 16:30:39 +0000 > Commit: Andrew Turner > CommitDate: 2024-12-12 18:00:23 +0000 >=20 > pci_host_generic:Add pcib_request_feature on ACPI >=20 > In the ACPI attachment add support for the pcib_request_feature = method. > This uses the common _OSC handling. >=20 > Reviewed by: imp, jhb > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D48048 > --- > sys/dev/pci/pci_host_generic_acpi.c | 27 +++++++++++++++++++++++++++ > sys/dev/pci/pci_host_generic_acpi.h | 1 + > 2 files changed, 28 insertions(+) >=20 > diff --git a/sys/dev/pci/pci_host_generic_acpi.c = b/sys/dev/pci/pci_host_generic_acpi.c > index d90b7c0c01f8..1ff3a6bda707 100644 > --- a/sys/dev/pci/pci_host_generic_acpi.c > +++ b/sys/dev/pci/pci_host_generic_acpi.c > @@ -287,6 +287,8 @@ pci_host_generic_acpi_init(device_t dev) > sc =3D device_get_softc(dev); > handle =3D acpi_get_handle(dev); >=20 > + acpi_pcib_osc(dev, &sc->osc_ctl, 0); > + > /* Get Start bus number for the PCI host bus is from _BBN method */ > status =3D acpi_GetInteger(handle, "_BBN", &sc->base.bus_start); > if (ACPI_FAILURE(status)) { > @@ -504,6 +506,30 @@ generic_pcie_acpi_get_id(device_t pci, device_t = child, enum pci_id_type type, > return (pcib_get_id(pci, child, type, id)); > } >=20 > +static int > +generic_pcie_acpi_request_feature(device_t pcib, device_t dev, > + enum pci_feature feature) > +{ > + struct generic_pcie_acpi_softc *sc; > + uint32_t osc_ctl; > + > + sc =3D device_get_softc(pcib); > + > + switch (feature) { > + case PCI_FEATURE_HP: > + osc_ctl =3D PCIM_OSC_CTL_PCIE_HP; > + break; > + case PCI_FEATURE_AER: > + osc_ctl =3D PCIM_OSC_CTL_PCIE_AER; > + break; > + default: > + return (EINVAL); > + } > + > + return (acpi_pcib_osc(pcib, &sc->osc_ctl, osc_ctl)); > +} > + > + > static device_method_t generic_pcie_acpi_methods[] =3D { > DEVMETHOD(device_probe, generic_pcie_acpi_probe), > DEVMETHOD(device_attach, pci_host_generic_acpi_attach), > @@ -517,6 +543,7 @@ static device_method_t generic_pcie_acpi_methods[] = =3D { > DEVMETHOD(pcib_release_msix, generic_pcie_acpi_release_msix), > DEVMETHOD(pcib_map_msi, generic_pcie_acpi_map_msi), > DEVMETHOD(pcib_get_id, generic_pcie_acpi_get_id), > + DEVMETHOD(pcib_request_feature, generic_pcie_acpi_request_feature), >=20 > DEVMETHOD_END > }; > diff --git a/sys/dev/pci/pci_host_generic_acpi.h = b/sys/dev/pci/pci_host_generic_acpi.h > index 802099abb9d7..5617da971306 100644 > --- a/sys/dev/pci/pci_host_generic_acpi.h > +++ b/sys/dev/pci/pci_host_generic_acpi.h > @@ -35,6 +35,7 @@ > struct generic_pcie_acpi_softc { > struct generic_pcie_core_softc base; > int segment; > + uint32_t osc_ctl; > ACPI_BUFFER ap_prt; /* interrupt routing table */ > }; >=20 From nobody Sat Dec 28 15:34:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL5y15KGLz5jWcK; Sat, 28 Dec 2024 15:34: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL5y14mCPz4ZYd; Sat, 28 Dec 2024 15:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735400057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykBBEWWQ84LKdgzCUIijsa1wnqKcg2jKh1qd30gTXJQ=; b=gZ9iuykApGM5WylMxlY9iDLuJMes2Qagm2EHwhcYcb9f4tVOOlVfpRyV/l1cE4ojaroqdm uN5zlDr27bpty+hfpMOoRoIQu7G3/O0U+qNPL1wTkwFF/N3lJKcYQRIZIVwm/2xcCFObvg UEzqJgFvvGvyYzqnOYTlazjmaft9FbTM9iQssUitufpF1xkEcz1jrMhtD1zU16ajLxgtrz uwWa+nIn5Jol5vHiirEt5opiW6N4+gQhWYoJ3HtloT/oNvXy7SOkQChsd30jj8+fqElyVZ H0SIyJoOspR6j7yRayQYsoaGLn26H2cgN2C9OHlc9tReJLILk3S6jnlIbc/OzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735400057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykBBEWWQ84LKdgzCUIijsa1wnqKcg2jKh1qd30gTXJQ=; b=ARcIQmr1Yb5bf7Eievf9C6Hofm0NOrfIkrtdGxWIYBEdWeRMWF35pK+pnFRiotZRBwdzGx m1BdtgcJqok0PpuUHLsXCsLph70fTHbjTkXV9gFo6B+S4SsZFlo117FY2JhkJqszTog9pk EfgGQpaXRI7U5bLGU8FxmaUyzY0jCEnpfs9ojO4ue3roSRTFksC1MuRo8Rfx9aoNpHKIDv ykSBqOEsfw0N+ubL4HLM+0gDAuJEQWWTWaTU22RDu7pfXSaInwSEiPA7vPWnpjYu+a62vA 5nbgMxzlrktenLKQ8BzCJJ0brW3xxDPtyXSgwEEWQcR066ZLa5zl5FcElTuYJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735400057; a=rsa-sha256; cv=none; b=Wg8/zOBwBVZg37miYTYRGj+q0hIHehH74RDQ4kfr7ZtbZB92oDVRQx0ifCfGGk8nFMJwLN yCopfRpCkPbAjkF1IBLHtsgl6LxOMdR7uO4kFN7wnxYtEXS8Wy8fr5giJ10t+OaoghzLLD zBIyPmtxw7LWXODrzqu8eqO/I8IqDWUbsdMjRbdTu8rLuQGTTZ1pHeayjyTUOmD5A1daQ5 +RJrCf9B4eTprqdKBdX9D5LPL4t00jg31pk1AKe/rub2MekzeH76tvlG3Or5O+qaGb/LE1 asbnLP9HZICv/PrZ0v8dFdbsZYfvlbEPoD/u3FBkGi/naKeywKbREsDVruX25A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL5y141n7zWLV; Sat, 28 Dec 2024 15:34: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 4BSFYHbX063292; Sat, 28 Dec 2024 15:34:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSFYHU4063289; Sat, 28 Dec 2024 15:34:17 GMT (envelope-from git) Date: Sat, 28 Dec 2024 15:34:17 GMT Message-Id: <202412281534.4BSFYHU4063289@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: 837feb4d05c2 - main - kernel: Clarify kern.elfNN.nxstack sysctl description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 837feb4d05c2dccafa1698649b58f7b7fdc59c54 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=837feb4d05c2dccafa1698649b58f7b7fdc59c54 commit 837feb4d05c2dccafa1698649b58f7b7fdc59c54 Author: Ed Maste AuthorDate: 2024-12-27 20:42:17 +0000 Commit: Ed Maste CommitDate: 2024-12-28 15:33:33 +0000 kernel: Clarify kern.elfNN.nxstack sysctl description The nxstack sysctl controls processing of the PT_GNU_STACK segment, not directly whether or not the stack is executable. Reviewed by: kib, shurd Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48221 --- sys/kern/imgact_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 916011f573cf..d94f9e1e5143 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -127,7 +127,7 @@ int __elfN(nxstack) = #endif SYSCTL_INT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, nxstack, CTLFLAG_RW, &__elfN(nxstack), 0, - __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": enable non-executable stack"); + __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": support PT_GNU_STACK for non-executable stack control"); #if defined(__amd64__) static int __elfN(vdso) = 1; From nobody Sat Dec 28 15:41:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL65x2FKnz5jWtc; Sat, 28 Dec 2024 15:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL65x0Lrqz4bcP; Sat, 28 Dec 2024 15:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735400469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UH8yXRjFlUuhwP8s/un4AXNA+hbKidOhWw9/oEgB4A8=; b=SNzodh7K+dwbbJzfxYIMwQDuOQVqB/runK6PjzH/bhNsZPJuW0Jz513C6oPijYKu8kdC8+ tzyEagScxMYQsYYsTCjCII2ZZG/zh/4ccSvWPkPKiDn80iir1vH+TNrxBfTaHu/BS2nWOK Wm896Jnh0ziwjoIG1kimK4+JMf4vl6bRCq+l54HEhwP8WRnQoybdVBY/vv/QA19jrOYB70 PzW926DzOif/PE0V9z6B0YG7y1V+rKDtZkj9t0zvkrVpAvlk221zGYjW4/TPTu7ocH6fY4 8XxlHQ4e/kHOs0VFAv8wJ3szhIQiaQVTKJUO96nItAVZYPorzAR9B6GEjihU2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735400469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UH8yXRjFlUuhwP8s/un4AXNA+hbKidOhWw9/oEgB4A8=; b=WWEoqA9JNYHZWrZzEmF4W1higryAJ9xYaVSe/2BTLm2e1s4UI0p1LRl9Hozxkn6Yozjlck XV2lxETeh5JUta6wJ5xyseQSp5zSFwjoMKVflk1Si4dqUgTgUGD3Wp/+ns+rrcADxH27YI WRBvzyUROE5Kt4v0WqCcMGBFK2zOc3gwYC4f2sPJ7VshAf7N5gIYZ36T2jgx2XAvHoT5Sn CtPvVAmZnaLlfGl+yf4q2nJLSPiUKaWo0f1Fo8KhP1A+rnDeh6eDGMq+U6Dij1xUfmyS3x kguXHD1c9yqk7HiblQW7U+Gp5fgSNLoSRaIbcTje6zr8Hcu3bYxhpAgtw2nojw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735400469; a=rsa-sha256; cv=none; b=syjSKWGpBpBUsNy5l7v/ntfxJbYqUN0hn5tD/S/adYcCLmF1Kl5mPnEnMTR4rKFgjZAdXv BvcoNomkA05KPCqthibLJXNtpFIJZRrrwifSElqiadVXd/6CEHOOGp06hWXAZ/ge4oqEQY CHko2uSPGxgV9zO9sRMtGe8J4rvf1a/vWU33KnBMlNGvcC7bYr3HHSfUOfJAEzBZrWC3/d g5cnVYQHwucCSjrQ6jfo0o3tPMVYHwMjYFcSyuiMiMGPvYFPeA2bV2Q0X+o+wQFMsXReS8 dH1tiGgFhIR+0xog0sL+qCKbsmsLYB313FQ6NnNgbEYkDWxCJISMrioPQ9qMhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL65w59HmzWFC; Sat, 28 Dec 2024 15:41: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 4BSFf8JZ078571; Sat, 28 Dec 2024 15:41:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSFf86D078568; Sat, 28 Dec 2024 15:41:08 GMT (envelope-from git) Date: Sat, 28 Dec 2024 15:41:08 GMT Message-Id: <202412281541.4BSFf86D078568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8ae23694e5d7 - stable/14 - bsd.lib.mk: Capitalize "Building" for libraries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8ae23694e5d7e4c82969d9d3aaf4a8802535902b Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8ae23694e5d7e4c82969d9d3aaf4a8802535902b commit 8ae23694e5d7e4c82969d9d3aaf4a8802535902b Author: Minsoo Choo AuthorDate: 2024-12-08 15:29:18 +0000 Commit: Ed Maste CommitDate: 2024-12-28 15:40:56 +0000 bsd.lib.mk: Capitalize "Building" for libraries This is consistent with the case we use when building object files. Reviewed by: emaste Pull request: https://github.com/freebsd/freebsd-src/pull/1542 (cherry picked from commit c6e56e6500fd3fd57162c842088e61500d92b70a) --- share/mk/bsd.lib.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 5f328d5378ca..29807b6bec82 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -291,7 +291,7 @@ _STATICLIB_SUFFIX= _real _LIBS= lib${LIB_PRIVATE}${LIB}${_STATICLIB_SUFFIX}.a lib${LIB_PRIVATE}${LIB}${_STATICLIB_SUFFIX}.a: ${OBJS} ${STATICOBJS} - @${ECHO} building static ${LIB} library + @${ECHO} Building static ${LIB} library @rm -f ${.TARGET} ${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} .endif @@ -357,7 +357,7 @@ CLEANFILES+= ${SHLIB_LINK} .endif ${SHLIB_NAME_FULL}: ${SOBJS} - @${ECHO} building shared library ${SHLIB_NAME} + @${ECHO} Building shared library ${SHLIB_NAME} @rm -f ${SHLIB_NAME} ${SHLIB_LINK} .if defined(SHLIB_LINK) && !commands(${SHLIB_LINK:R}.ld) && ${MK_DEBUG_FILES} == "no" # Note: This uses ln instead of ${INSTALL_LIBSYMLINK} since we are in OBJDIR @@ -388,7 +388,7 @@ ${SHLIB_NAME}.debug: ${SHLIB_NAME_FULL} _LIBS+= lib${LIB_PRIVATE}${LIB}_pic.a lib${LIB_PRIVATE}${LIB}_pic.a: ${SOBJS} - @${ECHO} building special pic ${LIB} library + @${ECHO} Building special pic ${LIB} library @rm -f ${.TARGET} ${AR} ${ARFLAGS} ${.TARGET} ${SOBJS} ${ARADD} .endif @@ -400,7 +400,7 @@ CLEANFILES+= ${NOSSPSOBJS} _LIBS+= lib${LIB_PRIVATE}${LIB}_nossp_pic.a lib${LIB_PRIVATE}${LIB}_nossp_pic.a: ${NOSSPSOBJS} - @${ECHO} building special nossp pic ${LIB} library + @${ECHO} Building special nossp pic ${LIB} library @rm -f ${.TARGET} ${AR} ${ARFLAGS} ${.TARGET} ${NOSSPSOBJS} ${ARADD} .endif @@ -415,7 +415,7 @@ CLEANFILES+= ${PIEOBJS} _LIBS+= lib${LIB_PRIVATE}${LIB}_pie.a lib${LIB_PRIVATE}${LIB}_pie.a: ${PIEOBJS} - @${ECHO} building pie ${LIB} library + @${ECHO} Building pie ${LIB} library @rm -f ${.TARGET} ${AR} ${ARFLAGS} ${.TARGET} ${PIEOBJS} ${ARADD} .endif From nobody Sat Dec 28 15:54:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL6Pn1NpJz5jXYW; Sat, 28 Dec 2024 15:54:53 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL6Pn0tdqz4cR6; Sat, 28 Dec 2024 15:54:53 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735401293; 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=/2FZydhUsYg4AGG3mQVlLvgHaL0g0kzPb4gZmiUXRp4=; b=m+apRJD9AYWC0Zf/Y5bhkaPVjYRiqd7y7saNWjOkPGokXzT8+387shAuOhackaNe0uO2ek S3v4rKyW0K2P3Qb042np8VNrIgt9alhk//9m4kAHyWx20GLRkTDv/hLa/R+SyL6YGOuD64 B7iE7LdCNAJHEg0WsCBvSob31x7f1FEYzvJ3hE8NNvX1REpag886ItiWPD8mcPdYXK4wLX 3KJu5KhGt8g+VoUtk05Oko1+66waBOtUf1mvPOV02ozgD2WU8gbBuCXCsbBoTOEFgaY12W z4y0mauhXTyLhWzdlq8QW2wXwaFhfSchrZayZVD8ojsAp5qiFGDs9InxivydLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735401293; 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=/2FZydhUsYg4AGG3mQVlLvgHaL0g0kzPb4gZmiUXRp4=; b=MFkhkluhUWvOuQ9qr36u78X1yad525DhFzbdY47elI5VQ+Riga+/pEhH9Cc0F1pucV3yJg ZIu9OyFQa5XSDHk4BEaUa+/q+HovS1q4blTt+IHxuKKiZpaanMtF8eUuC/UJ32iObHE+HN sPd6/1wqz/SozZCrMkclZFfZo2c37YdLjmSWzHeimqHLpaf3V5IqrhNcJLyMpMPsDmxFXo mqOAGeH6mKvrgo9bd/L5OWkTHSQubZbTKMzpS5AExwT3QmNw6j6BcszvMawdW+hjwUJBJJ RaMN2D5BFcM/hAf8hz0uGAIwWDlNkAjiBilBtQIg6WqCJFW2kLk1AKsP4yqHuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735401293; a=rsa-sha256; cv=none; b=DCIAndfbS0zAu5EdvJUwxAyUxwVQv5h4trY8QCXyXOMt1vAHA3Rygc9GxERF+PCq547C31 w8uA4UESAnidvA5r9YQ65ERTIZSavRhCtKGZgHHgEG706nKtAUvJrkX3HRo2d++S3nUJmF 9sGTwej9dEUuRMzzmE98dj/FNXjUw+0Z/kcIa/875fxMspT3+NNMIJIpwDLe9QpgdHn4Yx QwJEuFkbmRF8E60q/bjB1ZqZnpsPjyqCxGTNJOK4v5rWiOYWlH9GIWxmPARbtTdVLRe2aU mB+58C431+OCBT5CivIJrb8Cgmqrc6U88N9FOx+2cNucDmdYkM/cgqcYSRiu2A== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 0218C1F369; Sat, 28 Dec 2024 15:54:53 +0000 (UTC) Date: Sat, 28 Dec 2024 15:54:52 +0000 From: Alexey Dokuchaev To: Andriy Gapon Cc: Vladimir Kondratyev , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 24ae172a5035 - main - ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. Message-ID: References: <202411062331.4A6NVuiE070018@gitrepo.freebsd.org> <14efd79e-75be-4f96-8a04-7ffc9ed1012c@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <14efd79e-75be-4f96-8a04-7ffc9ed1012c@FreeBSD.org> On Fri, Dec 27, 2024 at 04:41:35PM +0200, Andriy Gapon wrote: > On 07/11/2024 01:31, Vladimir Kondratyev wrote: > > commit 24ae172a50352ad4fd22989477f29ecca5aed6e3 > > > > ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. > > Today I upgraded only to find out that my bluetooth related things stopped > working. It turned out that ng_ubt didn't attach to my USB bluetooth > adapter. > Only then I discovered this change, installed the firmware package, etc. > > As strange as it may seem, previously my adapter worked without uploading > any extra firmware. I'd also like to hear why some hardware which used to work before without explicit firmware upload now may requires these extra dances, just to be prepared if my BT/WiFi cards suddenly stop working as well. ./danfe From nobody Sat Dec 28 17:20:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL8JQ2x65z5jfRJ; Sat, 28 Dec 2024 17:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL8JQ0krTz4my9; Sat, 28 Dec 2024 17:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pDNNxkF4BohC/3M/Ox/uzvsdDQLPdv9SZw+dr1JZlIs=; b=htzwHYDxv0/E6H8qqDMDx4+ljFLE85TByVTfQGyKdlIQDIfAoMGSV5/Gvab4wxrcRC6xc1 qp+nlwgAJRAciOo6lvOLxPOYx0EE/4Mco75elePZ85mL3FiDzh1TW8GB2M1RSe1S9S4Gw1 ghP3Fx1nkB/njhgNL+2GVVhmbwqTaFhY++iSUsF5AaNK5/FAQwvf5yuIsyxjOVch0GeDlh NjuutIPAiTgwDmLFtMxRvOAn1Du5IhUh+O0KyRxkAKQRNOlUIueuUu0tGFOHEYl5LB86BL qqieSvmDUvRT2KLtCrmertlSFNQau1e49tucdfHRONrTZX+6hDibSKHaexDivQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pDNNxkF4BohC/3M/Ox/uzvsdDQLPdv9SZw+dr1JZlIs=; b=rhyyI0WSetNRlzLInzGWH6NJz50Fmjzbr3i+xZYrqLu5UIliXEYKVKPVEKEzLo4SPvEsfJ O0q/lYq8j7HVdqKimjQZjF3shFkLQvpCQ1N/pVQHBq3sE+UQ6JUjnpVe5cEKN3Z5K0edyd qwhJ5RrXcmuDoKJMErKzFPqMcYcGbdu0O2yV2QNhbyS3RXr8DkxtCgo1/T6zwB8LuxJf6V DgGJdoJ4VKplR0PK7M/gh8bfX6p+JD99SRWy9RAyauv7lxrFO6MFqQOVZWGQyCuqJ0n7dM KiCuJBwrUxYR7bom7YPde3xOBS5iGys8LxuIwo+rOYm2eRCCHY3R5y9yaikAvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735406422; a=rsa-sha256; cv=none; b=MWG6b9k36cq09zMW7BKc8ig5yALAFz5NBvUUgEdPCIURPN1MPXSWQnpq67XMl8SyWTx+Pj oqV/bXGKB4mLdiu6ecT0IuQF2VCFvWcKm3CSc9ykw3vPAPUadFxtvscDYLKg6Kvy/eu4ST fC1S+NKQHHwtAYU4uQ0J8cL/uoKkwC+hwxCpWyN7dvIQJTRFQiu7p8ft7C4W9yD9IJ2Lkp WHj8f65ro7G39fYrSgXJjLvZmUmXuG/cetMNUfjQaHNMmuZGd9beyPixgfnIvcoWu13zYr Cr3LKGytFi7J0nbTk8GIc75fFjfGU+J2TjBHRkC4y4Sitt5b8rvEdbtXA7oY4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL8JP41sWzXvZ; Sat, 28 Dec 2024 17:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSHKL72061841; Sat, 28 Dec 2024 17:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSHKLjk061838; Sat, 28 Dec 2024 17:20:21 GMT (envelope-from git) Date: Sat, 28 Dec 2024 17:20:21 GMT Message-Id: <202412281720.4BSHKLjk061838@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: 3282e368e004 - main - thr_cancel.c: style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3282e368e00460de500e5cfcf1c33b597199aaf8 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3282e368e00460de500e5cfcf1c33b597199aaf8 commit 3282e368e00460de500e5cfcf1c33b597199aaf8 Author: Konstantin Belousov AuthorDate: 2024-12-21 17:55:11 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-28 17:01:19 +0000 thr_cancel.c: style Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48200 --- lib/libthr/thread/thr_cancel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index b1b95e54b46f..0e00c2c36086 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -99,9 +99,9 @@ _thr_setcancelstate(int state, int *oldstate) return (EINVAL); } - if (oldstate) { + if (oldstate != NULL) { *oldstate = oldval ? PTHREAD_CANCEL_ENABLE : - PTHREAD_CANCEL_DISABLE; + PTHREAD_CANCEL_DISABLE; } return (0); } @@ -125,9 +125,9 @@ _thr_setcanceltype(int type, int *oldtype) return (EINVAL); } - if (oldtype) { + if (oldtype != NULL) { *oldtype = oldval ? PTHREAD_CANCEL_ASYNCHRONOUS : - PTHREAD_CANCEL_DEFERRED; + PTHREAD_CANCEL_DEFERRED; } return (0); } From nobody Sat Dec 28 17:20:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL8JR6MNCz5jfQS; Sat, 28 Dec 2024 17:20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL8JR5b2sz4mvq; Sat, 28 Dec 2024 17:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H8peRZTFtxzjsSldxKXZM7Hp7ECIlXWPSXqKiL3Wmsk=; b=OaENqOO+TBPyWiq1qFAi4zKnkzgNGeox3G6jOtzsKYn3U1Fcat4ux/PkiNNlVfORlZmvY2 4pYdXa99Y8qhFqG4Q9QQczVV0wk/Lj+ToluYIRz9Q2Z/FcFPjf6JI9FyZSswaE3QmD5Rn1 eW5I5nFjtYUFFu2OkmU0/nljzbSQddbQOCG2hHeazzVSHmnIWbIYRdojgLWy0YBFyLxtfr n+vOT/00j2SzZfZBF+9m0MEktxrb8Wjw4ZQuXcx02cuutpDAoaIVeKMkPg2bBPft/nQK5/ uhorOHAghTlzKq6NXSd/Sb2zZQ9WkIzNh6++Q1XcUYt93UUoDyM6XRD79gHyEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H8peRZTFtxzjsSldxKXZM7Hp7ECIlXWPSXqKiL3Wmsk=; b=XMllJ9amz7w1BcQGsPb9Z/Yhs3di7E3E8v/5uIeeVe6eq6AzSYO84yxjPN8VBfhsATeU9B nRqsDvseQDtMYuy/v54n3C/guA+bSeTKiJTeGyPt0PHcwBg/fJe9XpXiNkLcccJB7jazoR OlTEV4qi0D5GxyX51uKtizLLMprtQSuuAYq3RCUYf1OxpV/YgBCjNJ0EXglLae9/JWSJy+ hvopIKAKHKBRtjVSey27kat5T+BdZdgEdJ/GS9tq/75ud3TNIMtd7DAjqYxrr5ghzd3xKc n/oyzob7gvLfRTOCkM/Jy3vrUSfiJ+djA0hpO4CP5VzvTo0McJMMSofuXuRg8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735406423; a=rsa-sha256; cv=none; b=oxlfx8OKtAyhgYmXtut9TDhAa9Mj0NrmaT/dcwQ8zqn/4jDgVzeD4OFxNtTteWuyiQZzjl VpqV0GK5OmCePh37xVnPqVs7NtWTUKq58boiqeij48dlVvES57//NHLWzOhEI2jWuixENu p2sS2RKpC1dxJ2b8TeuDhi8G6gBvXhnQ1ugc6FG6Jzd7mGcQUOIh2EH5CHOIuJFvY+gI8d uxTnOaIDOLQRKz0RXyEYAxVfX5KMLJE5SEj+WxkeKGiEsg5SKAJ1K9M/qesQY/HXLq+1I7 oIuxhvNFuRbVKa78wA0AvTmZl+XsSFGNmXZ156rJdr/BULj9WSBmkG8Zz8t9Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL8JR52Y3zYJg; Sat, 28 Dec 2024 17:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSHKNbr061939; Sat, 28 Dec 2024 17:20:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSHKNTd061936; Sat, 28 Dec 2024 17:20:23 GMT (envelope-from git) Date: Sat, 28 Dec 2024 17:20:23 GMT Message-Id: <202412281720.4BSHKNTd061936@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: 86f6ff9ff00e - main - libthr: move dlerror_msg into zeroed part of struct thread List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86f6ff9ff00e2ba4d4cd5b7a94d57b1c3f85ff98 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=86f6ff9ff00e2ba4d4cd5b7a94d57b1c3f85ff98 commit 86f6ff9ff00e2ba4d4cd5b7a94d57b1c3f85ff98 Author: Konstantin Belousov AuthorDate: 2024-12-23 23:48:58 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-28 17:01:34 +0000 libthr: move dlerror_msg into zeroed part of struct thread struct thread reuse might cause stalled rtld error message to propagate to the new thread. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48200 --- lib/libthr/thread/thr_private.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index d6c12348e3ab..926e868293cd 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -562,8 +562,12 @@ struct pthread { /* Deferred threads from pthread_cond_signal. */ unsigned int *defer_waiters[MAX_DEFER_WAITERS]; -#define _pthread_endzero wake_addr + /* rtld thread-local dlerror message and seen control */ + char dlerror_msg[512]; + int dlerror_seen; + +#define _pthread_endzero wake_addr struct wake_addr *wake_addr; #define WAKE_ADDR(td) ((td)->wake_addr) @@ -572,10 +576,6 @@ struct pthread { /* pthread_set/get_name_np */ char *name; - - /* rtld thread-local dlerror message and seen control */ - char dlerror_msg[512]; - int dlerror_seen; }; #define THR_SHOULD_GC(thrd) \ From nobody Sat Dec 28 17:20:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL8JR0CdGz5jfKT; Sat, 28 Dec 2024 17:20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL8JQ5Q8zz4mSD; Sat, 28 Dec 2024 17:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sQw7msnOPGKlqjlicGv6sopGgJECbtcGR1epqREsfN0=; b=KEOwgPSOJJKQpcpUK0O0LnBHaO8rRLP5Z2ttwtg0rmI5Ljg4ln7W7hAuBEXlytnYQVPfG9 Wi5HfTAccRQGIhwalzTitlQmHm5yx57cd9q5JPg0XoSyMquqkpCpjrPFTAs9ZeQtGQ8GkT PlJyfvUP1N/rllUN6BtnGfJfkKS7H01JGTNoODDUZltdjvjGk0FZ3q/tCdcgH18pC6xNEY LboDO2aAxDuPpQ14wkki+Q12sxMe1riV2i1PDk88etRTEu9QAHdnMrOzc/CGTmCj2DH/5D tO6G6kCHmYefY6Uv6FlwvvESzTG+6lUSnG/8ZCrv/bWaZy4c2Tk43TSDiwLNdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sQw7msnOPGKlqjlicGv6sopGgJECbtcGR1epqREsfN0=; b=R6TTvrbCbn+/4WUiBUcdbenNLtMA80hiMYD4NdBMml/0hxKhcOrCDyF//tAQthFHtW5bwP 7rMpBAP1YD0d3VysnsSmdXDXZci9qW5rGlrz31pLWcMN5yow0EnxI/2dljDMtSeBZPnCvR o9IEPwXD89KU3whGh7VLCYzqs+AMwK4r88hY1YEgLVBPPneXEYdkCMBBSSgidnAGaqJcKd ywHh78ReDyTldU2JLDkCnZHAwD0TFypwXCAanel44dMipvJ6YWVElJBT9N90dsSLO9rffq /6Vq+7P6yrLsM5pOp8Z5IJ0TsawWwYFYH9Br30aM+0I7p2kpI24az0XXMdUhLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735406422; a=rsa-sha256; cv=none; b=TGV5x1sq57cmfFnyT8kqwt7H9T84O9CllmdgaD9X1pf8Yy5nxiYu/aGfCkw4TuFjXrZasd Mr7jzf+WbFnMd6aGWGeSt3i5GqueCuu8HND1vCRHrnsOcefURQKOfntMY1xHFrKlhgM43M aByW/fw7p1Si9z0/tKebGDi4jgt6bh1wlz9+Vg69bHgNe1j6uR97XtsVrYN7f+D6ekMPGx WSWqqa87167M+xFvfSvBVrPtT1AJTI+Dhe/bhl/2chFqAYA02CK/ajh3GpYaVvgYcOAJku MS7dT3V2gXTXMhk7MSw1bbCcsFgFAUReCF2PbT4YFGNjVgxAO5CKIn/jflcM0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL8JQ4GvpzZ68; Sat, 28 Dec 2024 17:20: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 4BSHKMcK061885; Sat, 28 Dec 2024 17:20:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSHKMoC061882; Sat, 28 Dec 2024 17:20:22 GMT (envelope-from git) Date: Sat, 28 Dec 2024 17:20:22 GMT Message-Id: <202412281720.4BSHKMoC061882@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: e32308efa215 - main - thr_sig.c: style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e32308efa215868d98036c30f73c98ebf67e03d4 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e32308efa215868d98036c30f73c98ebf67e03d4 commit e32308efa215868d98036c30f73c98ebf67e03d4 Author: Konstantin Belousov AuthorDate: 2024-12-22 20:35:26 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-28 17:01:27 +0000 thr_sig.c: style Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48200 --- lib/libthr/thread/thr_sig.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c index b953c430158c..e69641d8e1b5 100644 --- a/lib/libthr/thread/thr_sig.c +++ b/lib/libthr/thread/thr_sig.c @@ -185,8 +185,7 @@ thr_remove_thr_signals(const sigset_t *set, sigset_t *newset) } static void -sigcancel_handler(int sig __unused, - siginfo_t *info __unused, ucontext_t *ucp) +sigcancel_handler(int sig __unused, siginfo_t *info __unused, ucontext_t *ucp) { struct pthread *curthread = _get_curthread(); int err; @@ -354,7 +353,7 @@ check_cancel(struct pthread *curthread, ucontext_t *ucp) * on getting a signal before it agrees to return. */ if (curthread->cancel_point) { - if (curthread->in_sigsuspend && ucp) { + if (curthread->in_sigsuspend && ucp != NULL) { SIGADDSET(ucp->uc_sigmask, SIGCANCEL); curthread->unblock_sigcancel = 1; _thr_send_sig(curthread, SIGCANCEL); @@ -365,8 +364,8 @@ check_cancel(struct pthread *curthread, ucontext_t *ucp) * asynchronous cancellation mode, act upon * immediately. */ - _pthread_exit_mask(PTHREAD_CANCELED, - ucp? &ucp->uc_sigmask : NULL); + _pthread_exit_mask(PTHREAD_CANCELED, ucp != NULL ? + &ucp->uc_sigmask : NULL); } } @@ -405,9 +404,8 @@ check_suspend(struct pthread *curthread) { uint32_t cycle; - if (__predict_true((curthread->flags & - (THR_FLAGS_NEED_SUSPEND | THR_FLAGS_SUSPENDED)) - != THR_FLAGS_NEED_SUSPEND)) + if (__predict_true((curthread->flags & (THR_FLAGS_NEED_SUSPEND | + THR_FLAGS_SUSPENDED)) != THR_FLAGS_NEED_SUSPEND)) return; if (curthread == _single_thread) return; @@ -664,7 +662,7 @@ _thr_sigmask(int how, const sigset_t *set, sigset_t *oset) } int -_sigsuspend(const sigset_t * set) +_sigsuspend(const sigset_t *set) { sigset_t newset; @@ -672,7 +670,7 @@ _sigsuspend(const sigset_t * set) } int -__thr_sigsuspend(const sigset_t * set) +__thr_sigsuspend(const sigset_t *set) { struct pthread *curthread; sigset_t newset; @@ -698,7 +696,7 @@ __thr_sigsuspend(const sigset_t * set) int _sigtimedwait(const sigset_t *set, siginfo_t *info, - const struct timespec * timeout) + const struct timespec *timeout) { sigset_t newset; @@ -713,7 +711,7 @@ _sigtimedwait(const sigset_t *set, siginfo_t *info, */ int __thr_sigtimedwait(const sigset_t *set, siginfo_t *info, - const struct timespec * timeout) + const struct timespec *timeout) { struct pthread *curthread = _get_curthread(); sigset_t newset; From nobody Sat Dec 28 17:20:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL8JT2C5Bz5jfKX; Sat, 28 Dec 2024 17:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL8JT071gz4mSF; Sat, 28 Dec 2024 17:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uDK52fcvPdgE4h32XA/3JOCf6nRHkroxhXFpgdkznoI=; b=bzivFUAr5bsiEvTiuJ7Of+fSmmp6fw7639ia5lZ092+BglKejewn15Pf+DWnGMYeC3rBEK CrXUNOe5W5CU5Ncjq99nvH322af7dd7xm7M3yWUiSf0HleqnyNe4S2GPH7rIaytev6G0QX aRG3ev477F9E4PmLMmldqe5M65wwnrgJf684QVBGsanVmMk4kz2Nyqt4ytXVFYEtxJLzWl IM0SdYf7cnLU87SYuVhBbaMZl/sCTsc1m0Dt2c1lEbRceXN9wsFz8ZF4ubNzFilUFEX860 bXcKVp/Dx+pCt66RKid6vyLYRWFPtgEAJJ4hc7p9aULjN5vhN7WcibUjXil5eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uDK52fcvPdgE4h32XA/3JOCf6nRHkroxhXFpgdkznoI=; b=Ufm1p4s73ywXztZQ8NDh4lCn5V/yFmGTlzigTXFEsne+gUHHkmXYceAXnGx+tdLa6crnDG Nt/PcB1c48kwUwgQeTfdUzRf6kg7i8mDoMl74Po+3ogcj2x6PqYb7lSzOQjlQUihsAu3zM jwpNfDe23rBY6NsF0kTnRJBu8V0473QLHpZFKd7C1Q9mNTtwLKpxT/EUHJxdwGO93oPDB2 lfvSkamjgPxR7fMbLA/ouNx7pV3IQIi6FsW8FHCFpEEcqQqnoI0UFY9YfXjMmqru2WGuXD YwemtY5LCbBiDmMc8t7Ha7xGTTvfDVImDOda7WbF5heXVBG9beczKPHremoGzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735406425; a=rsa-sha256; cv=none; b=te11o64R8w+w8iZaTS/KxjnPpSZh0qnmriLnC6oaubSb53Xf9y4vXyV8OjGnIzfKg/xq4G zLW6pEl2IBFn2U9J0Q0BlRFBbVYE6zly3P+SmJtViJRz31Fj4ngeHp8SuS9YJtFEIx0Mzv BD/wBr2YxmF2xKIY+2oXM54ePdwvX8XGSH7pWYGp/gGvddNpoNDYfBTwLwqvcJgZxPxZ35 eTkq+iv9quBZrl4mioGkYpgZG850cKiEjU373uux65e103O39K5m+t9+U4A4nPYuSS0WKi XnAXnS4+iZ9lFy3NdhbKxVECsAbdLixtalam4vN5pqpZA/LMpibQJ2fZ8Mz50w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL8JS6CnQzYdh; Sat, 28 Dec 2024 17:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSHKO9f061997; Sat, 28 Dec 2024 17:20:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSHKOeS061994; Sat, 28 Dec 2024 17:20:24 GMT (envelope-from git) Date: Sat, 28 Dec 2024 17:20:24 GMT Message-Id: <202412281720.4BSHKOeS061994@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: a944e6d5c0c2 - main - thr_cancel.c: use testcancel() instead of manually expanding it List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a944e6d5c0c27c2a533486062497a40d8f0ae543 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a944e6d5c0c27c2a533486062497a40d8f0ae543 commit a944e6d5c0c27c2a533486062497a40d8f0ae543 Author: Konstantin Belousov AuthorDate: 2024-12-21 17:55:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-28 17:01:44 +0000 thr_cancel.c: use testcancel() instead of manually expanding it Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48200 --- lib/libthr/thread/thr_cancel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index 0e00c2c36086..7622e306f937 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -166,9 +166,8 @@ void _thr_cancel_leave(struct pthread *curthread, int maycancel) { curthread->cancel_point = 0; - if (__predict_false(SHOULD_CANCEL(curthread) && - !THR_IN_CRITICAL(curthread) && maycancel)) - _pthread_exit(PTHREAD_CANCELED); + if (maycancel) + testcancel(curthread); } void From nobody Sat Dec 28 17:20:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL8JW3WhGz5jfXk; Sat, 28 Dec 2024 17:20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL8JW1xf4z4mVS; Sat, 28 Dec 2024 17:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RytXOS2a+VTKl8I4065F/DyohB7yxgIjXHvpYeZ8KSw=; b=aRoKQeZQtWVweO7cCcRMb1+4mOyQY2FxF9CLdbikLO3PpSpMFCrQLQ1Zutz7rjW8WlyozA 0WguM7TuwfBDuVZdp7jsVOohLpmln4zKlE0V3ioyY7cqd66AxC0bGdjQaD72mTmLk+kbY4 w4+RJVtyK5/3vNoJwjOtO73nGNgBhqmNgj/jXTEk5nMXTk3QR889/3yQVyWmBcFkmHPwSM Er9AGXayXzT6qIEgPSYI8AYSmBPUMTGn6ARini5kQAQcKFUlS6D/03pNZPlWBsrPpgZZJt b8B9419vRCt6CZj2JxxNDhnYbEvTjKFLDJqbJnKlhdSDAksp7DgHPqv/XoJhTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RytXOS2a+VTKl8I4065F/DyohB7yxgIjXHvpYeZ8KSw=; b=SxXPRxo9mpVj5XQx3+1ohn2aUCFqR4o6U05zqN5VVXd32pmeg81ykW3ZFe/wGFjdBYFJ+U Teh7U8IEKW9X5C05dwsrZZm+NkJL6PrrILutJQK/twXyMiRUrL7Hu7Ws3NAgPd9298jvRd sq0ObC804ZzFeXlyfgsGp00qWbrrkqW9vE96G8otlIRfNv/AM3Y4ZbxojEyZ4QMjIr4Pa4 /Sf5sBvZZC7ThidJwhd7OoAH7qkrEW7FO1TrmvDWeKzTvvL2wzkV5Awa623SaWvBbYgtcv Gd7hFYbSYayVAUY5Al+h6Tk72tlsr936Qs9SG6efrSUAC/8s21Hui5XerqhPjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735406427; a=rsa-sha256; cv=none; b=U97W2z7WVS9X2bU9fb85X5BjBzvb7HszmR6MlSViJ9MvlzTLnhKBikbnndhMePxFN7F1IB ZNHfEyoDWgbChMhSl0jgSUTjStx4EqVQBizvjRKiGGI3ueopsX28Ubz+y7uNQRWbZYAavB OtuZOyU9hz7bb4REhvJStE9DAIKOmA8ypzWq27nTUqhvrnFbW2XwbwCXwfpxNn0U4205KP Sgu+F4d1A/LNMyjITZBDkXemxP0JcerQvmfVNuMUWVC02cr6J1ONSCFCubpzV83VmE1mXK nDmxgO7VQtrWTnr7z6U32l88Adqa17cRZgvDWozjV1MhH8u+6XOL4ef6KBucZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL8JW0gtHzYhB; Sat, 28 Dec 2024 17:20: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 4BSHKR3x062088; Sat, 28 Dec 2024 17:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSHKRRF062085; Sat, 28 Dec 2024 17:20:27 GMT (envelope-from git) Date: Sat, 28 Dec 2024 17:20:27 GMT Message-Id: <202412281720.4BSHKRRF062085@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: 9f78c837d94f - main - check_cancel: when in_sigsuspend, send SIGCANCEL unconditionally List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f78c837d94f73f1485e2ce012a8e64197dae9d5 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9f78c837d94f73f1485e2ce012a8e64197dae9d5 commit 9f78c837d94f73f1485e2ce012a8e64197dae9d5 Author: Konstantin Belousov AuthorDate: 2024-12-24 00:08:17 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-28 17:01:58 +0000 check_cancel: when in_sigsuspend, send SIGCANCEL unconditionally not only when check_cancel is called from the signal handler. _thr_wake() is not enough to get the sigsuspend(2) syscall out of the loop, since it only terminates sleep when an unblocked signal is delivered. PR: 283101 In collaboration with: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48200 --- lib/libthr/thread/thr_sig.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c index e69641d8e1b5..c5ee5aa8423b 100644 --- a/lib/libthr/thread/thr_sig.c +++ b/lib/libthr/thread/thr_sig.c @@ -353,9 +353,11 @@ check_cancel(struct pthread *curthread, ucontext_t *ucp) * on getting a signal before it agrees to return. */ if (curthread->cancel_point) { - if (curthread->in_sigsuspend && ucp != NULL) { - SIGADDSET(ucp->uc_sigmask, SIGCANCEL); - curthread->unblock_sigcancel = 1; + if (curthread->in_sigsuspend) { + if (ucp != NULL) { + SIGADDSET(ucp->uc_sigmask, SIGCANCEL); + curthread->unblock_sigcancel = 1; + } _thr_send_sig(curthread, SIGCANCEL); } else thr_wake(curthread->tid); From nobody Sat Dec 28 17:20:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL8JV4bxcz5jfb1; Sat, 28 Dec 2024 17:20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL8JV3Gdvz4msP; Sat, 28 Dec 2024 17:20:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PHdjr5s/c68XiE+TWM5vvLSi9h/zAVYs0o/TnXJnpno=; b=ewmEL/WSZlVkcnGPD3gkD8M3rboBKcIOa9UOBu+kLOIsMJEJImxvjSvCAJCWuv7W+rWatV 7PGukLYEXUKHcy9AmJmCIMPm9RY/wp7zYiT+0w0DEO0C3+xlzO/7Nl4RbJ8xNfY/itbYcd 87dgw+lblcSpYhRhhj7xDNsP6L6XXEXZep8w916xMc0VjO4oFp3Krnt0LknT1J4tIZBj2R UqHQYfOG4X49HkGPB5CaU3Rb389eHQ7Nx8Mj1dLqaAav00AS4kPY3MO+F44SSg4GzM7vho Pui3m9qRQ5Fs9BJ1eIKs2BryZ8O7S6mwbGvayNc+jxJo4Cj8CRRXJo+atECXWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PHdjr5s/c68XiE+TWM5vvLSi9h/zAVYs0o/TnXJnpno=; b=fzboAGyvvd6M/ri54Z9K2FZ06/oAVNrGhJ6rH/dwp6oZE1SToYwxD09eQzwvLIOjgR8h8E XXjsE6Ttkhy9nnoTvMAwF3zSNc360Dokt2HeRypiKX5+If3bzXbnU/1NaqFaNq0ziA60rg NxISkp0XiwiacbvXOUGAk/HWVpafwpZ5sAm/QGG7TPlA7EWcdr88XWCENUiFZvs9E1a/yU SSPvlQJVNGse3KireeZSCr4TbD2nfcrWVqiDHO1lcUVN3lG0aXvQH1zEdfEaJ02YjFPeuZ 3AzmqILeFmPSU/ZngqPewBQvUxRpeBALbC3I2w0CHIXGQSKw2l7F4Zakb3SfOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735406426; a=rsa-sha256; cv=none; b=su4zOL7iIxzwq2GlZO6rZkItt6J83yQgvrmNUhok7R/whb9BKAkuXAyAEppBWP0g1q6fCC WrnDya3oJh/NCyY9etfh/Ihz5s1jz7bWTVKEG13GRcXvxjoSb7QOmC74ucbHcxkxcySdbP meP3mQvHGc5q0GFt7kih5OJ8ryorkPpwQyWycHwnF322qV+2Zi9kEXeyG1hSNFWO+nvA+F hUNXLVGwHAGBvDsNJxbYJ/wiXgjmHP91MH2rFG5IEz0fO77P5rmA3la8fF+snSF5xE8ye/ n1f6MkJrOTpUFci+fuAcClrn0hEq2CPg/1C4JuLOHSHt2whMFdGaPs9I82bQ4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL8JV05BCzZ48; Sat, 28 Dec 2024 17:20: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 4BSHKPiE062036; Sat, 28 Dec 2024 17:20:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSHKPNT062033; Sat, 28 Dec 2024 17:20:25 GMT (envelope-from git) Date: Sat, 28 Dec 2024 17:20:25 GMT Message-Id: <202412281720.4BSHKPNT062033@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: 030f48f78f96 - main - pthread_setcancelstate(3): make it async-signal-safe List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 030f48f78f96e0cdb30c960e1a11e5ae01d0eee8 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=030f48f78f96e0cdb30c960e1a11e5ae01d0eee8 commit 030f48f78f96e0cdb30c960e1a11e5ae01d0eee8 Author: Konstantin Belousov AuthorDate: 2024-12-23 06:42:15 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-28 17:01:50 +0000 pthread_setcancelstate(3): make it async-signal-safe by setting new cancel state and reading old cancel state from the curthread structure atomic. Note that this does not play well with async cancellation, since if cancellation is enabled from a signal handler and cancellation request is pending, the thread is cancelled immediately, calling user-defined destructors, which all must be async-signal-safe (but this is a general requirement for async cancellation anyway). Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48200 --- lib/libthr/thread/thr_cancel.c | 12 ++++++------ share/man/man3/pthread_testcancel.3 | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index 7622e306f937..4189a2640d14 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -83,22 +83,22 @@ int _thr_setcancelstate(int state, int *oldstate) { struct pthread *curthread = _get_curthread(); - int oldval; + int oldval, val; - oldval = curthread->cancel_enable; switch (state) { case PTHREAD_CANCEL_DISABLE: - curthread->cancel_enable = 0; + val = 0; break; case PTHREAD_CANCEL_ENABLE: - curthread->cancel_enable = 1; - if (curthread->cancel_async) - testcancel(curthread); + val = 1; break; default: return (EINVAL); } + oldval = atomic_swap_int(&curthread->cancel_enable, val); + if (state == PTHREAD_CANCEL_ENABLE && curthread->cancel_async) + testcancel(curthread); if (oldstate != NULL) { *oldstate = oldval ? PTHREAD_CANCEL_ENABLE : PTHREAD_CANCEL_DISABLE; diff --git a/share/man/man3/pthread_testcancel.3 b/share/man/man3/pthread_testcancel.3 index 2d2bb06c48e2..c74cdcfe943b 100644 --- a/share/man/man3/pthread_testcancel.3 +++ b/share/man/man3/pthread_testcancel.3 @@ -34,6 +34,7 @@ are .Dv PTHREAD_CANCEL_ENABLE and .Dv PTHREAD_CANCEL_DISABLE . +The function is async-signal-safe. .Pp The .Fn pthread_setcanceltype @@ -248,6 +249,11 @@ function conforms to .St -p1003.1-96 . The standard allows implementations to make many more functions cancellation points. +.Pp +The +.Fn pthread_setcancelstate +function is async-signal-safe as required by +.St -p1003.1-2024 . .Sh AUTHORS This manual page was written by .An David Leonard Aq Mt d@openbsd.org From nobody Sat Dec 28 18:01:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL9Cb6hNQz5hyKJ; Sat, 28 Dec 2024 18:01: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL9Cb6C3xz4sXP; Sat, 28 Dec 2024 18:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yOVpFOA5gTdlW0TvzRm+lizWzS0pOUVSfdS8i5ThlSQ=; b=u2t8M34o28uMUl0kmdoYp9LV1un8eryMik/U+vl4is8coFO3swm3/6pzSgBqfM4nvVW2EN 6eRESTlqUx6ZJ+eGmEvKGPTzAuxrNJWES5/P3n/35xDwGY9DF9GyMF/KS0FDCDHkz9fFEh mNZxrNJIRDKIL/UM9MXap9Y4ppwieQgDC5e2QdpGzNVUZrrwfs98WqYEQirRaZKlQPFqq7 hIKngqZRXZslAwazSySzikA9LNUzpAkutiM68WafhOCx9X0lHTyvCtLbDImngDU+ZYZxp2 zIQgss16E/o96+M8wL0bwlrS7/YNFtgbvW/R5jaqeaNB4xwP0/po3ZRxBjE2Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yOVpFOA5gTdlW0TvzRm+lizWzS0pOUVSfdS8i5ThlSQ=; b=iD1GyBGoIVZSIj4mHEIzV6acdAyUJ/gjjSfvceOh0z8Z+UPaDg/M06pYxVFziB7J+xpmJT OzXSK8PvHRoETURhhGtwkB7xcDQN8fN6R2vo2yh5P7mOfCQrW58BxIqNypiI2JcsknE4/6 r+FA6ECHUyALVEys6tZn0Hi/zD5jCRkreH07p5HOoptMJcFTI9ssNesklUbBzkEPYJmqSy 6bhyEwMCDEWW+LPfP+/r0CribqAbiTUxp74nEWvOq4WioR28T+aqC02pLaOoHsYKfbCHEa le5sBhSrjiN2KrlEVAdAjpvFIOGPHwgJQz1Fc/Kpjh4i4FLPQXWgiI+EwR4Slw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735408875; a=rsa-sha256; cv=none; b=W7C4BCnvS7xdMKKFGuIVQZGcjLTGyak1QETnZgH97BpQkWEV0Boj9+J9Ae4DvCu0KvgKFu O1/y0OTjBrZp/7lARj5C4cOr6+uS3N4OdSRIsglC96NGIvb4XMo2z1h1b5lSq5E3jX0UVI NRYnxZkAEvUfY0fjvv5U3kYJyOds/CqURK37hQLSU2uQYXYgM/E2CQXDFZlzCu1mv7hUqf toCORaJPVReh6rDnIWX00g6fZr5v6u9un8Dyhpc1xet9FKT0shM9OcaBiuaKAMmzh7AAnV 65bb6gdyxrS9mHN0xWxV9m+aw3zud9jo/Hz69o6OStdnI8Wa/ft9pkkRqxaVyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL9Cb5WlJzZcT; Sat, 28 Dec 2024 18:01: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 4BSI1F0h038305; Sat, 28 Dec 2024 18:01:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSI1F2E038302; Sat, 28 Dec 2024 18:01:15 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:01:15 GMT Message-Id: <202412281801.4BSI1F2E038302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 2d3426eb9e31 - stable/13 - cam: Add doxygen docs to cam_sim_alloc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2d3426eb9e31fd9e07e1542663426fccf82627e5 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2d3426eb9e31fd9e07e1542663426fccf82627e5 commit 2d3426eb9e31fd9e07e1542663426fccf82627e5 Author: Warner Losh AuthorDate: 2024-12-28 17:59:59 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:00:50 +0000 cam: Add doxygen docs to cam_sim_alloc Add description for what each of the parameters are to the cam_sim_alloc call. Add some additional context for the mtx and queue parameters to explain what special values passed in mean. MFC After: 3 days Reviewed by: mav@ Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D30115 (cherry picked from commit cb5880594387d5b07c5d580c4aa1b633947a6046) --- sys/cam/cam_sim.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c index 5d03c69d0c7a..e03ed0fee1fb 100644 --- a/sys/cam/cam_sim.c +++ b/sys/cam/cam_sim.c @@ -62,6 +62,42 @@ cam_simq_free(struct cam_devq *devq) cam_devq_free(devq); } + + +/** + * @brief allocate a new sim and fill in the details + * + * A Storage Interface Module (SIM) is the interface between CAM and + * hardware. SIM receives CCBs from CAM via @p sim_action callback and + * translates them into DMA or other hardware transactions. During system + * dumps, it can be polled with the @p sim_poll callback. CCB processing is + * terminated by calling @c xpt_done(). + * + * The @p mtx acts as a perimeter lock for the SIM. All calls into the SIM's + * @p sim_action are made with this lock held. It is also used to hold/release + * a SIM, managing its reference count. When the lock is NULL, the SIM is 100% + * responsible for locking (and the reference counting is done with a shared + * lock. + * + * The cam_devq passed in (@c queue) is used to arbitrate the number of + * outstanding transactions to the SIM. For HBAs that have global limits shared + * between the different buses, the same devq should be specified for each bus + * attached to the SIM. + * + * @param sim_action Function to call to process CCBs + * @param sim_poll Function to poll the hardware for completions + * @param sim_name Name of SIM class + * @param softc Software context associated with the SIM + * @param unit Unit number of SIM + * @param mtx Mutex to lock while interacting with the SIM, or NULL + * for a SIM that handle its own locking to enable multi + * queue support. + * @param max_dev_transactions Maximum number of concurrent untagged + * transactions possible + * @param max_tagged_dev_transactions Maximum number of concurrent tagged + * transactions possible. + * @param queue The cam_devq to use for this SIM. + */ struct cam_sim * cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll, const char *sim_name, void *softc, u_int32_t unit, From nobody Sat Dec 28 18:01:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL9Cd0qhQz5hyXP; Sat, 28 Dec 2024 18:01: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL9Cc6v4fz4sPh; Sat, 28 Dec 2024 18:01:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j3zTFPeu7utcDaZpPJr9euqvqleIUuXO2Af7pCstRqM=; b=fmzFRgjMKY+sjd+O9Lx85hcfctjjvg4tfUKBoXElSzWXn4bgYc6egAdbatnUTYnG23O3Ht clC2HspSHDeDE1U/yimxiJziXzY/TpUGzs6h9S2h0bUxq7nJILgCy7x/mVRLXvBmiGhql0 P2n6fhllfCQ4fUW7mWdORB9G9a9q3/BQ2IquWGM8LMZFJqtDzsFe1NkwxH0defhplXj2Ka WOyHXeksKhGUiZebE/zRMXWNx6dhBIJNx9XMgg4Vn7M1shrUUokgwmau44+NyqdrJBTFWS Niikrq3HRqxWqLAAe/vElRNWYepWjAFVSxSgB15LhNurUwPtl8IGNZ2Wyod9Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j3zTFPeu7utcDaZpPJr9euqvqleIUuXO2Af7pCstRqM=; b=FVoVov051L+JyErPCsKTqf6MQuA31uetiA4aS3SE0f/Z9tqAGrnrf5wKX4Warx9jF9qVSh kVBNLzqjorxZGUOQEwv9LGxH4tQe1wUxaJYLLZKeg98ufbuM9S94dDev/t1oTLsKY6o0OK E03zGOSC1+lGVGqAUM/bxKQxRAxhljTibn/+GLLd4hrHDeXzeFqo5bqRSGPEaw2O0OUbQL oLDP3dwc+26RABqRPrBUMbElHqctN/cOuT0GvvisgztZkVFrrCdtrG30PhkOEmtSxH9sx/ y8J+KxhYMFyzVSS3/ZuWAEHcNDb8cSHQCXMiZ6sR0bc122/pW3eo01tI3cp/Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735408877; a=rsa-sha256; cv=none; b=FE9mnAnWKkL3yqd10cIgyzKDGvlO8nSV5EavC61nS9QNb0Cjj0bi9rzVzwN/K1ORr+WZJz Nc/mqa6RowGxgVjxya8WlH3KJ7//G0z+8MY5bx9FGJorBdop5aTmqtcNCVZ0C+oNrv9pnQ eLQjmp3IugA2deb8OJnEM0uREnedDgtJE+F2re9I65F6vaIwS1rSsoWR++CppReoVEY3lH ome2AbdXKaQkYbOnbdPFES3ljsUqeXMRyEIjLfYZPFHHRDL0xUe22Ip3E0YBzvPSLgk8IP +Qbp7oxBfm2eBWXQ8XYxzuy9VvV90tPyuaLiZXkviccbJf54HFaQyQoDfML7tA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL9Cc6VpKzbBV; Sat, 28 Dec 2024 18:01: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 4BSI1GY3038347; Sat, 28 Dec 2024 18:01:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSI1GAA038344; Sat, 28 Dec 2024 18:01:16 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:01:16 GMT Message-Id: <202412281801.4BSI1GAA038344@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 3c7f629b3819 - stable/13 - ata_xpt: Rename probe_softc to aprobe_softc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c7f629b38194920c0a1c71a42bc9d7321d335d7 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3c7f629b38194920c0a1c71a42bc9d7321d335d7 commit 3c7f629b38194920c0a1c71a42bc9d7321d335d7 Author: Warner Losh AuthorDate: 2024-12-28 17:59:59 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:00:53 +0000 ata_xpt: Rename probe_softc to aprobe_softc Since both scsi_xpt and ata_xpt use the same name for the softc, this can lead to problems in gdb. Avoid the issue by renaming the ata probe_softc to aprobe_softc as has been done for the aprobe in 0f280cbd0a3a9. This was overlooked at the time. Sponsored by: Netflix MFC After: 2 weeks (cherry picked from commit 4762aa57ad17b67b46570025ca21ac4a5eefed0c) --- sys/cam/ata/ata_xpt.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index 5c239b576416..5c8f07dd5e9e 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -146,7 +146,7 @@ typedef struct { int faults; u_int caps; struct cam_periph *periph; -} probe_softc; +} aprobe_softc; static struct ata_quirk_entry ata_quirk_table[] = { @@ -276,7 +276,7 @@ static cam_status aproberegister(struct cam_periph *periph, void *arg) { union ccb *request_ccb; /* CCB representing the probe request */ - probe_softc *softc; + aprobe_softc *softc; request_ccb = (union ccb *)arg; if (request_ccb == NULL) { @@ -285,7 +285,7 @@ aproberegister(struct cam_periph *periph, void *arg) return(CAM_REQ_CMP_ERR); } - softc = (probe_softc *)malloc(sizeof(*softc), M_CAMXPT, M_ZERO | M_NOWAIT); + softc = (aprobe_softc *)malloc(sizeof(*softc), M_CAMXPT, M_ZERO | M_NOWAIT); if (softc == NULL) { printf("proberegister: Unable to probe new device. " @@ -312,9 +312,9 @@ static void aprobeschedule(struct cam_periph *periph) { union ccb *ccb; - probe_softc *softc; + aprobe_softc *softc; - softc = (probe_softc *)periph->softc; + softc = (aprobe_softc *)periph->softc; ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs); if ((periph->path->device->flags & CAM_DEV_UNCONFIGURED) || @@ -338,14 +338,14 @@ aprobestart(struct cam_periph *periph, union ccb *start_ccb) struct ccb_trans_settings cts; struct ccb_ataio *ataio; struct ccb_scsiio *csio; - probe_softc *softc; + aprobe_softc *softc; struct cam_path *path; struct ata_params *ident_buf; u_int oif; CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("aprobestart\n")); - softc = (probe_softc *)periph->softc; + softc = (aprobe_softc *)periph->softc; path = start_ccb->ccb_h.path; ataio = &start_ccb->ataio; csio = &start_ccb->csio; @@ -742,7 +742,7 @@ aprobedone(struct cam_periph *periph, union ccb *done_ccb) struct ccb_trans_settings cts; struct ata_params *ident_buf; struct scsi_inquiry_data *inq_buf; - probe_softc *softc; + aprobe_softc *softc; struct cam_path *path; cam_status status; u_int32_t priority; @@ -754,7 +754,7 @@ aprobedone(struct cam_periph *periph, union ccb *done_ccb) CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("aprobedone\n")); - softc = (probe_softc *)periph->softc; + softc = (aprobe_softc *)periph->softc; path = done_ccb->ccb_h.path; priority = done_ccb->ccb_h.pinfo.priority; ident_buf = &path->device->ident_data; @@ -1602,9 +1602,9 @@ ata_scan_lun(struct cam_periph *periph, struct cam_path *path, xpt_path_lock(path); if ((old_periph = cam_periph_find(path, "aprobe")) != NULL) { if ((old_periph->flags & CAM_PERIPH_INVALID) == 0) { - probe_softc *softc; + aprobe_softc *softc; - softc = (probe_softc *)old_periph->softc; + softc = (aprobe_softc *)old_periph->softc; TAILQ_INSERT_TAIL(&softc->request_ccbs, &request_ccb->ccb_h, periph_links.tqe); softc->restart = 1; From nobody Sat Dec 28 18:01:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL9Cg3mCtz5hyHQ; Sat, 28 Dec 2024 18:01: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL9Cg20JZz4sXk; Sat, 28 Dec 2024 18:01:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qdg85mAicWAhJplEN8tPxzmaFnT0imDXzUnDrU8OOSw=; b=chzblxh094wpiZKr7QD64LAZyBmi/iGR/v1edJkOifk5Nb1TP/efKyjp2RXXKNpT6Fq0HN dYTseG7yZNZkPSRglWAXg/BW6ncJT92T7UxRLj116j8iWsf36FN+0qaKOhYCwQDDDtIykz 8hvnOI2c5gowhg0rVrO0325v9/bMHaCRissoaG3eXXKV2xsp333orSG1qTSkmyxa7T+y0g q0E4oT1VdRwJnX3nyRS2b1XsTgpY7WwzIX2D9SjU7hr7aABdMU9+VNGLFCN2MCsjAkZDPS zX/NmKxnPC2ni82MRDTrbxCCs5WdxqcD6B7uS/7D0CfNkrzewKSgVwDTbbyhvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qdg85mAicWAhJplEN8tPxzmaFnT0imDXzUnDrU8OOSw=; b=BNMSjSTBW8WFPpluF7296+P8tI23Y0/DwaC7FfryIRXjBxaTXMbL1t1XDuQ0cu9kT2VbW7 k0VuhsMSCt0Ct076hnABJqJEqJT4OXPnZJ/2P27f70XlR2iflPolfGsWBOG9p6qzFjZH57 Z51x9U3sE2x1xcMDjZlsEMGTt+jJ/HPxfpal8ocwx+4p63vTO7XIiAqXlCIlCz/Z4WlSWO EQDBINoUlN75Cv1VeEySQSc4F98iRJHOQtOGusBurOFn+Z6+xGxza+zj6A/eZ0QQgrJc2I NoieN36TCHa+6ScgLidReOxAkDfVpl5seFStxWkrdEhUK82nCLRlUb93ewVNSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735408879; a=rsa-sha256; cv=none; b=KwmM8KsdOzzbO0M7bsqYQkQvxL9OxAoU290rVmT8epeY0ReQtgbrVaYsAqnitqNJ82SBOA e68qGWTHE8rQW+j57cMPWNj7+ZFTOMrBQCXKfGmEf7v4giP6diJkKdFeyYveq/zVnaF37+ OzJloatmtS1cuAvLMFhY0ki56IR+0mIQxrNPMGyOKuwjRMUaysC6v7tm08n+etGi0DYPD5 655/m7o3y7ZURfBf1Aw3pl+6yaVauJuSmhMjJFQ5FTHxOnTTIQ/4N2HTBBzJraxNlwFME6 5AJcT87pgtmrSfvw6aiZZwu4irLbHcmt+5UdciVqseAzuekcHRySGsHgdSZbag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL9Cg1VLQzZZr; Sat, 28 Dec 2024 18:01: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 4BSI1JM8038464; Sat, 28 Dec 2024 18:01:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSI1JpU038461; Sat, 28 Dec 2024 18:01:19 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:01:19 GMT Message-Id: <202412281801.4BSI1JpU038461@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: fce635e02667 - stable/13 - cam_periph: Return ENXIO when peripheral is invalidated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fce635e026676839e030c54499b16bc3dfce17e1 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fce635e026676839e030c54499b16bc3dfce17e1 commit fce635e026676839e030c54499b16bc3dfce17e1 Author: Warner Losh AuthorDate: 2024-12-28 17:59:59 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:00:56 +0000 cam_periph: Return ENXIO when peripheral is invalidated When the peripheral is invalidated, no further I/O is possible. Signal this up the stack with ENXIO now that upper layers of the stack differentiate sometimes. In order for there to be further I/O, and new open is required for any block device that a future periph might instantiate for devices at this location that might return or otherwise become available. The I/O scheduler flushes its I/O with the ENXIO error for pending I/O that didn't make it to the device, so this makes the two paths match. MFC After: 3 days Sponsored by: Netflix Reviewed by: chs, mav Differential Revision: https://reviews.freebsd.org/D35093 (cherry picked from commit 9fb40baf60435c000415429220c57c754ce318fd) --- sys/cam/cam_periph.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index 415ee1e42064..21abebc416ae 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -1598,7 +1598,7 @@ camperiphscsistatuserror(union ccb *ccb, union ccb **orig_ccb, */ periph = xpt_path_periph(ccb->ccb_h.path); if (periph->flags & CAM_PERIPH_INVALID) { - error = EIO; + error = ENXIO; *action_string = "Periph was invalidated"; } else if ((sense_flags & SF_RETRY_BUSY) != 0 || ccb->ccb_h.retry_count > 0) { @@ -1940,7 +1940,7 @@ cam_periph_error(union ccb *ccb, cam_flags camflags, /* Unconditional requeue if device is still there */ if (periph->flags & CAM_PERIPH_INVALID) { action_string = "Periph was invalidated"; - error = EIO; + error = ENXIO; } else if (sense_flags & SF_NO_RETRY) { error = EIO; action_string = "Retry was blocked"; @@ -1968,7 +1968,7 @@ cam_periph_error(union ccb *ccb, cam_flags camflags, case CAM_DATA_RUN_ERR: default: if (periph->flags & CAM_PERIPH_INVALID) { - error = EIO; + error = ENXIO; action_string = "Periph was invalidated"; } else if (ccb->ccb_h.retry_count == 0) { error = EIO; From nobody Sat Dec 28 18:01:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL9Cf5WzXz5hyTy; Sat, 28 Dec 2024 18:01: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL9Cf2yJ6z4sVM; Sat, 28 Dec 2024 18:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ScNUf91IjVSDT5LkngNGFgu1XNxqbGGQjto7uyWh2k0=; b=neDXeGqPFUqXG4U11Zj6yTt08mmeqI8/G3nMKCWJCroQHbY1b13QI9Uv2utF4BdTrz/Otx 5MDHgh+Rtoep8k+jDIpHEp7pPa+EAncgG6bLIG+OpECeSiT2YuVJ+Alm7xGRo2GOOi8FjB gb5Jh1T4GSNsOLsPdGOgGsUm6+3dmd+iw0dAnKshhO6Quy5hZeaSy5MMzIwR43a7ex8i1e UqRJpAtgnbPjlLhMrcY9rfys/LPnEYnlZuJORFt9s0nQ5r4rjzgoj9mbjWnqyc2zX387Hy 2KFcZsdfsP8m5d/MOEUT+2S6HdKloC6cYlA3h9v1SCCsmbMXqulPA7Cov4TOrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ScNUf91IjVSDT5LkngNGFgu1XNxqbGGQjto7uyWh2k0=; b=nz6EmKbe1pxZn3XE3KEShnUQOJ9hlonuE0uq3WPmD2fMfNkM2fE3W8cvDTPUJ0JHlS32Lq WTiOcQW247XdoVISSYaoxkq3WQhe/co70KwYPeFbhuTYdmgwV/x2uf3YubuHthiIOu8G13 kjtkyVDr/H29lI/rpBDenU3KQ5lL5vWPwswRjbLRrkn6Hh4KBITtcCqclAMxwvEqSTtPZr ZcdZJeBKMYtakOT41bJSvy++tHkAJhQWkJj3n4qx5GHbCWNAmQIPI/YoZOPaGMOOR2BW+e tskZ8bXCCE4W4c8FXbnm5ZYk/5Z8QOFtVIxPa431Kg4uCd0dj9g7PS3wtbYEuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735408878; a=rsa-sha256; cv=none; b=qPrspROMAzdEWK5sxF07cqzfIAKU7Z+VquEtfkVWufUPNJ5JTteeJMsxf7sNkg7CCuNXQ8 9Yv2kAgMe42uAGCwMi1yz4aIproeLhmKld9LfOlGCriF73rOtAt5x7pmV59+3JsYNQ61wF PAxLzr9uvBJgk19t2Zwf6tAMvTcspgoc6E1Ge9hMvvVxVtGDHEChHdhBsY8E81zsz56Lpd CX8LqrgV9gjVg5wlU0fx+7R2hN6OgCFO33fkv+E//LNPOeE6KhdC2GKSmYMvpcPOGoWTxa Bn3cnzMBreUrCpKD5QVcb04h8mrah8+vTv1mMpkFatEQp2DNK+U8IwQL0FyXmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL9Cf0RgCzbBW; Sat, 28 Dec 2024 18:01: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 4BSI1Hv5038416; Sat, 28 Dec 2024 18:01:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSI1Hia038413; Sat, 28 Dec 2024 18:01:17 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:01:17 GMT Message-Id: <202412281801.4BSI1Hia038413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: aea9f26d8005 - stable/13 - mpr/mps: when sending reset on removal, include target in message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aea9f26d8005e32ad840d0490af94866787e2731 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=aea9f26d8005e32ad840d0490af94866787e2731 commit aea9f26d8005e32ad840d0490af94866787e2731 Author: Warner Losh AuthorDate: 2024-12-28 17:59:59 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:00:54 +0000 mpr/mps: when sending reset on removal, include target in message It's possible for muliple drives to be departing at the same time (if the common power rail the share goes dark, for example). To understand what's going on better, include target and handle in the messages announcing the reset to allow matching with other corresponding events. MFC After: 3 days Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D35092 (cherry picked from commit ca420b4ef2ceac00f6c6905252d553a86100ab6a) --- sys/dev/mpr/mpr_sas.c | 8 ++++++-- sys/dev/mps/mps_sas.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/dev/mpr/mpr_sas.c b/sys/dev/mpr/mpr_sas.c index cd6cbe4981c8..a346f69750d8 100644 --- a/sys/dev/mpr/mpr_sas.c +++ b/sys/dev/mpr/mpr_sas.c @@ -616,7 +616,9 @@ mprsas_remove_device(struct mpr_softc *sc, struct mpr_command *tm) * if so. */ if (TAILQ_FIRST(&targ->commands) == NULL) { - mpr_dprint(sc, MPR_INFO, "No pending commands: starting remove_device\n"); + mpr_dprint(sc, MPR_INFO, + "No pending commands: starting remove_device for target %u handle 0x%04x\n", + targ->tid, handle); mpr_map_command(sc, tm); targ->pending_remove_tm = NULL; } else { @@ -2836,7 +2838,9 @@ mprsas_scsiio_complete(struct mpr_softc *sc, struct mpr_command *cm) if (cm->cm_targ->flags & MPRSAS_TARGET_INREMOVAL) { if (TAILQ_FIRST(&cm->cm_targ->commands) == NULL && cm->cm_targ->pending_remove_tm != NULL) { - mpr_dprint(sc, MPR_INFO, "Last pending command complete: starting remove_device\n"); + mpr_dprint(sc, MPR_INFO, + "Last pending command complete: starting remove_device target %u handle 0x%04x\n", + cm->cm_targ->tid, cm->cm_targ->handle); mpr_map_command(sc, cm->cm_targ->pending_remove_tm); cm->cm_targ->pending_remove_tm = NULL; } diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c index 39423bf3f348..17f9b2ba28ad 100644 --- a/sys/dev/mps/mps_sas.c +++ b/sys/dev/mps/mps_sas.c @@ -587,7 +587,9 @@ mpssas_remove_device(struct mps_softc *sc, struct mps_command *tm) * if so. */ if (TAILQ_FIRST(&targ->commands) == NULL) { - mps_dprint(sc, MPS_INFO, "No pending commands: starting remove_device\n"); + mps_dprint(sc, MPS_INFO, + "No pending commands: starting remove_device target %u handle 0x%04x\n", + targ->tid, handle); mps_map_command(sc, tm); targ->pending_remove_tm = NULL; } else { @@ -2378,7 +2380,9 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm) if (cm->cm_targ->flags & MPSSAS_TARGET_INREMOVAL) { if (TAILQ_FIRST(&cm->cm_targ->commands) == NULL && cm->cm_targ->pending_remove_tm != NULL) { - mps_dprint(sc, MPS_INFO, "Last pending command complete: starting remove_device\n"); + mps_dprint(sc, MPS_INFO, + "Last pending command complete: starting remove_device target %u handle 0x%04x\n", + cm->cm_targ->tid, cm->cm_targ->handle); mps_map_command(sc, cm->cm_targ->pending_remove_tm); cm->cm_targ->pending_remove_tm = NULL; } From nobody Sat Dec 28 18:01:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL9Ch5n1xz5hyKR; Sat, 28 Dec 2024 18:01: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL9Ch2Py4z4sVq; Sat, 28 Dec 2024 18:01:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Q4ecYN5ysa65izfTXaxMv1ivikdInwLkXKC087M/54=; b=CnSuXlXUThECxHEfHE2bxZ9E+QR03gt/VKWo+9IeVazFAUXIn9WiXf6CjuU/BsBhFdAQX3 Lcq5dgL0z2UqzWpreQGg2uRI8UtBGOXEU8D2U77F2Ld4cs+8UnFe/uhmjU8oQfBMDOzF1d RcILHLKEPOtpnaWWLXO+VWTyuS+f+y5TjTmktBERtejx5PrD0zP5Ve7tZ2jW3q9mHDsd7G ZoOqapLsZgeBvT3lCIlJTzXclv1X9RH3fcZCw0n5xa6xZTAeDqGQbHH2NWabJH0ZN2+NuI qLSgBPxrxG82HACshfgVzxdVGLRpOZmPULJjSXUdJZrPFGUvdPyFpaN8HrO6AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Q4ecYN5ysa65izfTXaxMv1ivikdInwLkXKC087M/54=; b=Frw5GHL5RlIYkYH+MDPzBznIzh8e0sGXMkUclGBCRP3uqgGZD4Sq1DWXAJJ8ib+k2LJG/e azYb7xmenwevpDPNdJgLXWTLvU8rtlS4k3/evxpMLjgxVRUCiffRoxUQ/NakxMmRZOCqix S3B97W3Ei0q5/JmHY9Qj7KH4JMYJhBhk3kDTSyA26GoRB2n+JDnip34I9suc5K4KXBH6GF SnOcp7uR38CQDRNTNE8D5GKoyXw/YkC4fb3Q7aV7qjZZgp365yWaH2QxtWnYlbb87ALXQw OjGTsr8yim60kh9IcfOuW+opgkU4FKghbID/zvgFf3abnka10xANVY2SzA2ChA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735408880; a=rsa-sha256; cv=none; b=tbk3PNHzoEJZvF+TZdkStyuASPRZVqi35d2d8FGYuXbOoos5q5vK26Afks/WDYlebEyn5k 9WVXIMycfj+QV7WIJMtpzuRtgCunmSFDeIiM/zc8vPHLfL4kvFFeNtpYQKL5MBDqitmAjj buhXqGtWkn3PgrSTRrIRuildF552n3ZvoXT8Tuo0U2nsjJsAGUCgSHxCz7+ihd5vvYMc9B hYXe8EgXGqmJfrmTKK89OQvnZEn5DYlAXeq3MEHMeO8CHU7+0/kz0ogahP9r9k4elQGgPN lJ7mSUt8GoWvsJqXdTA7UsDPVhEE7Gm+RPFdQpgaSAUCBqbBaiPmJ1DNu2uHDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL9Ch21sXzZZt; Sat, 28 Dec 2024 18:01:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSI1KxB038526; Sat, 28 Dec 2024 18:01:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSI1Ke6038523; Sat, 28 Dec 2024 18:01:20 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:01:20 GMT Message-Id: <202412281801.4BSI1Ke6038523@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e1deab42d259 - stable/13 - ncal: LT is the country code for Lithuania List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e1deab42d259d3cb8d67e696ed83b66549df9b75 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e1deab42d259d3cb8d67e696ed83b66549df9b75 commit e1deab42d259d3cb8d67e696ed83b66549df9b75 Author: Warner Losh AuthorDate: 2024-12-28 17:59:59 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:00:58 +0000 ncal: LT is the country code for Lithuania PR: 265479 MFC After: 3 days (cherry picked from commit 6feb6b4ffc0514f59da98992dffd88da472a4397) Sponsored by: Netflix --- usr.bin/ncal/ncal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c index 599f6961d3ec..20d14b3a4bde 100644 --- a/usr.bin/ncal/ncal.c +++ b/usr.bin/ncal/ncal.c @@ -92,7 +92,7 @@ static struct djswitch { {"IS", "Iceland", {1700, 11, 16}}, {"IT", "Italy", {1582, 10, 4}}, {"JP", "Japan", {1918, 12, 18}}, - {"LI", "Lithuania", {1918, 2, 1}}, + {"LT", "Lithuania", {1918, 2, 1}}, {"LU", "Luxembourg", {1582, 12, 14}}, {"LV", "Latvia", {1918, 2, 1}}, {"NL", "Netherlands", {1582, 12, 14}}, From nobody Sat Dec 28 18:01:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YL9Cj6J6pz5hyXS; Sat, 28 Dec 2024 18:01: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL9Cj3TWGz4sbC; Sat, 28 Dec 2024 18:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vS0xa02WCYW7MfmMWhCCbhAfG6txmnWeftMwkjQgjck=; b=IhCBnmqCyTm8H6ORoyq29tNtk8N384LzlL1kii/ET2CscITFyU8rGdVO3hMOZVKcBagFdK Dm2JpvRGsWoza7vgSoXEVbB2DGnAbVq81lTxv0Yt217Hhb+xsWg6Ryyb/jAG0hM7P9ahRF qkYd459JsIECsYhr6PlF6bnSuduKVrx9RazoTpQBNGlEf77s+zf4gr7y0O2wq2lAJ9lI1F piHlLRk1dlLi5dZ1luwLkjCHmpaCqDmpPUqkBZ7y4WNAVi1+Bj/NpqbeUN0bVqN8cUP2Hy yaUYRDGZB0v2JhBVYOXhBXoU4Quuf0Wuj9xYTxn2U1eu0PxtcBDlb1pnDPRFhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vS0xa02WCYW7MfmMWhCCbhAfG6txmnWeftMwkjQgjck=; b=FvPGXRgm6163pXVIjzUT3ciR/pJ3pvGYZFllrKCYmcmcAYvTpw+46lwC/F5QQPWeEXCs0p 4AW1HM5OUTEki8pQ36mndvsmrq0ieThU7c9ev135zEBBjzpx+kXEMtWKQ+guxG0CgcjuLy UJOVfCy1kiqyVqpAOoT8Va/On1cdgGvF3N5BUaPOCXHgMoeQ0TP35KpbrysBBvWklpfmK1 5U0NWPOYvFMdLn2fhz0dZ4dm3ec5qKqsxcNpWSox1WY/qy9qjJ4KGHsCPYXEt/D9m5fD3k I3xbMIspPM2ErY9OeSrtp6v0dkN06FEN0vL68rZqBJ20Ao/9rwgDrRmKcOvhsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735408881; a=rsa-sha256; cv=none; b=utUgAU4aT0Bd+yYwuwtwZ1IuYepChGmGRboMlVIXikdIgvYxwzlKh89DXKxTKVfet+mQsy 6cw8L8+aEY9PtAwG/bEkpxN9AKxMz8Lv6R3e0/Bh6kmkSP0/GsywiLcPk5ple6xLIiNS9t 7WqxzWkP+Rg+RK+hoBKa4YSx4zW73iLF3SJW6kIRHcoBcl4lMkv6N3hX+kHfJR0aY7wPLl 6mO5721lVDzBSahuIcIII+AriXbIbBVVoJ7a4hxXVEFbHHLyPeQPr5M9DJg3bN/f10v03L +WFgQOegTxSfGSnDhFHpRp1PRZpoQaxPk8Pn/lVOLxOmeS5SYpyQANPPE2yxTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YL9Cj32fSzb67; Sat, 28 Dec 2024 18:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSI1L3u038575; Sat, 28 Dec 2024 18:01:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSI1LGd038572; Sat, 28 Dec 2024 18:01:21 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:01:21 GMT Message-Id: <202412281801.4BSI1LGd038572@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: dfdcb418d7b8 - stable/13 - Adds support for Purism coreboot keyboards List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dfdcb418d7b8891843130c9415f9778b227945d8 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dfdcb418d7b8891843130c9415f9778b227945d8 commit dfdcb418d7b8891843130c9415f9778b227945d8 Author: Jon Hopper AuthorDate: 2024-12-28 17:59:59 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:00:59 +0000 Adds support for Purism coreboot keyboards On Purism coreboot systems the quirks mode in atkbdc prevents built in Keyboard from being used. Add quirk to prevent that. MFC After: 2 weeks PR: 271737 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D40405 (cherry picked from commit 599a4548f8f1758afe1d33c53e9a56e42c5f3e30) --- sys/dev/atkbdc/atkbdc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c index 44ed62ac411b..d99a6117572f 100644 --- a/sys/dev/atkbdc/atkbdc.c +++ b/sys/dev/atkbdc/atkbdc.c @@ -112,6 +112,7 @@ struct atkbdc_quirks { static struct atkbdc_quirks quirks[] = { {"coreboot", "System76", NULL, 0}, + {"coreboot", "Purism", NULL, 0}, {"coreboot", NULL, NULL, KBDC_QUIRK_KEEP_ACTIVATED | KBDC_QUIRK_IGNORE_PROBE_RESULT | KBDC_QUIRK_RESET_AFTER_PROBE | KBDC_QUIRK_SETLEDS_ON_INIT}, From nobody Sat Dec 28 18:54:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBPX11Hnz5j3BS; Sat, 28 Dec 2024 18:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBPX0S0wz506Z; Sat, 28 Dec 2024 18:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4St5x/HLokMDszpB4WaXgvHvxgBPSk68k1Xt9LDNvVs=; b=xSlL4+/5DBJecDbJBQePkrTKcMOxiP3NCA7LMi3U5gylMgv57viiEa8RU6QgZSon/ALajE NebDJVjikRyjpddW0bnl01yEF5dTUHxCNBDONZY+9i3aSOj/LMgiIk21VXnpylS1jE8BcE lCWdWWcECgg2zY5ivdSY2ma00lWTEv9ywoZGc8hrb40qfTQornPGMKV8mz99/UUNQtal9U Lq+gE5mgil7lsuI/1YsPGCnkQ/Hku5e0STqEyiJcSGPuV9IVnImZencvDb0P9Ur+LYz7gi VIAarjG7Mljh1cs3K8zIVSXP+lfz295zE2X+Mq0yr9m0L+vaiRUQKb0M9UxKQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4St5x/HLokMDszpB4WaXgvHvxgBPSk68k1Xt9LDNvVs=; b=wly/njxW0z5VoQmgRPrRFWNOIcfmzYMN3lRFrq4I++j9BaWPDdcy5qD5ljkT1/34kjSQ6d XRtczIXjrlJuVRTz5cMzxj4ODYQS5Kqw5EmOY0ihysleY6Jnukw15nylbf5nGiMQ1sabPC l3pfB+arl84SS+BQG9hs/sMNh3yTVNwU/0sAEu/4buSlaL6KqSuTnKbFguFdGWH+OZhujh 5eq0WeK1JvM17gf9wjtLno+WADCGf2Kt+qbmYEEWELt9+4bfiISP0vctnmUwjMnv1T+eDm 8b6Cy7rCGEFW0no4R70ZyRuStllodEuBQ/wc6580jeVvIswg5BKEQ6PgB15hPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412096; a=rsa-sha256; cv=none; b=lvgUb74jkj4bj8t/9aEriKFNBYNjrq+np8NcT9vLP58qz4RkYu47qc0V0qCmtOXGqTqI96 dM/WuQAiNrEco+caiGaslHnfBAiyTFcig9xdpDEqPQgRAR1nSsXwKW0+4IzVJ7fHgyvK3i p9utZzupEr7pbMLXilrS8T7VJ22u1dl5qFDfo7jRsYVChYFMVP+lRH2eGa6SJv5ByQtbhd ps/dZTuK9V/oBE9k6yJ1Ls/S8IgLNq6ZK9UrCpjdy8w59XSF16V/Vgzd6hwKCf0uxjzaDJ AhISxruAt6MZB6MAKGgphqFly7ZuTMh0l9p5wKIDJ/dGgG6jUh9D53V5TvowFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBPX03szzc0y; Sat, 28 Dec 2024 18:54: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 4BSIstdh037416; Sat, 28 Dec 2024 18:54:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIstqh037413; Sat, 28 Dec 2024 18:54:55 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:54:55 GMT Message-Id: <202412281854.4BSIstqh037413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 9863280ff77c - stable/13 - acpi/apm: Improve APM ioctl interface emulation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9863280ff77c23c00dfe7f5052bc3814bbc4b733 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9863280ff77c23c00dfe7f5052bc3814bbc4b733 commit 9863280ff77c23c00dfe7f5052bc3814bbc4b733 Author: Warner Losh AuthorDate: 2024-01-03 23:18:23 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:11:18 +0000 acpi/apm: Improve APM ioctl interface emulation The apm(8) program documents certain states, but doesn't document the 'unknown' state. It reports things correctly for systems with a battery, but incorrectly for systems without one. Emulate the old interface a little better by saying ac power is online if we have no status (instead of unknown), the battery has a high charge of 255% if there's no battery (instead of -1). Programs, like emacs, expect to see only the documented values and misbehave when they see something else. This is closer to what would happen on old-school APM machines. Sadly (or not) I have no access to old-school APM machines to 100% confirm this, but reading the spec, old code and testing with emacs' mode line with battery suggests these values are more correct. emacs has never been converted to acpi_conf due to permissions issues with acpi devices. Fixing the kernel is preferable to hacking apm(8) for these special cases because other programs that use these interfaces will also be more correct. The kernel also has more data with which to decide what to return. Sponsored by: Netflix MFC After: 1 week (cherry picked from commit 8a3fafc821149e800747cd92afee092fd131c402) --- sys/x86/acpica/acpi_apm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/x86/acpica/acpi_apm.c b/sys/x86/acpica/acpi_apm.c index 4e880c3e5411..66fe25b0448a 100644 --- a/sys/x86/acpica/acpi_apm.c +++ b/sys/x86/acpica/acpi_apm.c @@ -142,18 +142,18 @@ acpi_capm_get_info(apm_info_t aip) aip->ai_capabilities= 0xff00; /* unknown */ if (acpi_acad_get_acline(&acline)) - aip->ai_acline = APM_UNKNOWN; /* unknown */ + aip->ai_acline = 1; /* no info -- on-line best guess */ else aip->ai_acline = acline; /* on/off */ if (acpi_battery_get_battinfo(NULL, &batt) != 0) { - aip->ai_batt_stat = APM_UNKNOWN; - aip->ai_batt_life = APM_UNKNOWN; - aip->ai_batt_time = -1; /* unknown */ - aip->ai_batteries = ~0U; /* unknown */ + aip->ai_batt_stat = 0; /* "high" old I/F has no unknown state */ + aip->ai_batt_life = 255; /* N/A, not -1 */ + aip->ai_batt_time = -1; /* unknown */ + aip->ai_batteries = ~0U; /* unknown */ } else { aip->ai_batt_stat = acpi_capm_convert_battstate(&batt); - aip->ai_batt_life = batt.cap; + aip->ai_batt_life = (batt.cap == -1) ? 255 : batt.cap; aip->ai_batt_time = (batt.min == -1) ? -1 : batt.min * 60; aip->ai_batteries = acpi_battery_get_units(); } @@ -187,11 +187,11 @@ acpi_capm_get_pwstatus(apm_pwstatus_t app) app->ap_batt_stat = acpi_capm_convert_battstate(&batt); app->ap_batt_flag = acpi_capm_convert_battflags(&batt); - app->ap_batt_life = batt.cap; + app->ap_batt_life = (batt.cap == -1) ? 255 : batt.cap; app->ap_batt_time = (batt.min == -1) ? -1 : batt.min * 60; if (acpi_acad_get_acline(&acline)) - app->ap_acline = APM_UNKNOWN; + app->ap_acline = 1; /* no info -- on-line best guess */ else app->ap_acline = acline; /* on/off */ From nobody Sat Dec 28 18:54:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBPY1yJBz5j33s; Sat, 28 Dec 2024 18:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBPY1C4Qz508r; Sat, 28 Dec 2024 18:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YHxnRE6HbnLk/zJcBxCfqgl5jZkvlTodE/wrLn0WOh4=; b=acxOlbf2VhRP7C/b5VsHw6Mhdn/znBxvJ/p6kO1WH8ylgOWN6faR7FE1DCJ5zYPekuJX97 /UJ1tp8tAiHV2khc80M+INocNlyFddtV+xyHaRjkdVO/jOCSsluHTm5ImQN7kt8GFTo9EV ibF3SCgLUGe5jlevJmkAAazzUkX/ysLvkcVZbNuLrt+a666jUfhUmZXEliRCg6ExMWwvsB Agj3WA4PUPfZg2Em88prizjP0xw5W8H0wbGO28zEbkV/Cy9i7PvSf370nIsZSHkEaHD9Rf BjfDSaAW7j3/giU6eJYmHeWX1d6z7GnfElxSzdMT80GaHqVP4sv2TawgMUVv/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YHxnRE6HbnLk/zJcBxCfqgl5jZkvlTodE/wrLn0WOh4=; b=aQGhplWCKnbo/TwltPUvnBXF2e8x0vEAQzKlu7ftjPKcsKhRwtebziFZCy+5D5HLzIqNMC Xhje2V2mafHH/aFV4Vz5YmAyimfdw3OWdx2/dbn+tiscv5YMs/IDs2hRgbb1y6Yu9G5SA9 xGim+O9mJlBzSSELw8kGJP95xi88KR/WUc0nI1iBNLYCDJ8kOTVq5pO9C+/sVR5SOjdkGP e6ytmO1vVzu5koJj+ICPBCdvdvn65T6EhQfgWR1+YZAB6R5wNzLbRwDsjNW5mkTJw3ZehC vnU7qmHFKaeLp7fqnqQ2ep8Bi3CCqX+x/oEQOxuinTZvYAj1GNSgRTTxp+QAyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412097; a=rsa-sha256; cv=none; b=Z/wWsYHkgdkPVUxiv6eEBXa5uiRoMDIkyCWqdHLN7yABD8KzsLw1CIDtLxwN8CPTyegP11 WmBMqGI0sj0k5APj8bTNFq4X8dxkS9Ynplw/kPDiJDLI7CTsngIQnYcvNtTd2bATEEpbIb Q79wu/4H75ZHtuPwjYG3woqIgof4kAMzY/Jr+QkO5LzTzxjmXvC5kQdvxiDJlZJIcRjWOT 2zy0r5HtczJU/87QPhMeak3lx2UyRyjQHjrYmGTKKOug7uuKuLV30Lo6Up5slLQeDhA21N lHrakFViORZS35ccNjsY9ADaWolRpNoyaw1+T7EV6IRWxgoLk/dYtm0AewLbjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBPY0hTzzchf; Sat, 28 Dec 2024 18:54: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 4BSIsuHp037458; Sat, 28 Dec 2024 18:54:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIsu8k037455; Sat, 28 Dec 2024 18:54:56 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:54:56 GMT Message-Id: <202412281854.4BSIsu8k037455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 59b6187c570d - stable/13 - loader/menu: tweak for added line List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 59b6187c570d655c619dc32181934287e956bc43 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=59b6187c570d655c619dc32181934287e956bc43 commit 59b6187c570d655c619dc32181934287e956bc43 Author: Warner Losh AuthorDate: 2024-08-22 23:28:51 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:12:21 +0000 loader/menu: tweak for added line I added a line to the menu, but didn't adjust so things were a line off. Make the necessary adjustments. Fixes: 7cb65be96d47 Sponsored by: Netflix MFC After: 3 days (cherry picked from commit 101afbc6ee2f06f77e6886f1f3ffe115c579967c) --- stand/lua/drawer.lua | 2 +- stand/lua/menu.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua index 2dcf7d5de0f8..5a6a2174d13c 100644 --- a/stand/lua/drawer.lua +++ b/stand/lua/drawer.lua @@ -459,7 +459,7 @@ logodefs = { brand_position = {x = 2, y = 1} logo_position = {x = 46, y = 4} menu_position = {x = 5, y = 10} -frame_size = {w = 42, h = 13} +frame_size = {w = 42, h = 14} default_shift = {x = 0, y = 0} shift = default_shift diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index d74c7cd68791..894c0af69d35 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -535,7 +535,7 @@ end function menu.autoboot(delay) local x = loader.getenv("loader_menu_timeout_x") or 4 - local y = loader.getenv("loader_menu_timeout_y") or 23 + local y = loader.getenv("loader_menu_timeout_y") or 24 local endtime = loader.time() + delay local time local last From nobody Sat Dec 28 18:54:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBPZ36h8z5j38B; Sat, 28 Dec 2024 18:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBPZ294Pz506f; Sat, 28 Dec 2024 18:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X8wE2x3N6xcp+SD8oWRa0m7ogS64czUYXH3QYzyPsj0=; b=JV2eTJN5CFM/7gAAMCbZlUxdE+IYrn81HHRN9HPOavVDF85nsdhJfGIDrSKnRHVQ2ZG6Gn cZGGxofW3Hqj6RDYjeYGllfHLfyhOhiFXHv7W7RHSgfdgzDKewGjGqCe+/nJKyVfspp/TO PO3eoLAhAL2tS33ea02vIMKlGXDuD1cFvWmA8PmrcQrq7s1N9WVvSZFTVYkSaN9HdiQUZN MbwuVyjMnh94BILQ6iGrq5fg9ApIA23TYZ209FflZI8Om2pwjgNBJsnL+k7h4eA30+t1xV UmF8szmHN/XYxCipY9CtGqyAP0izVl2XDSKoAOwApIzan//6vfjwKx66hbP6gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X8wE2x3N6xcp+SD8oWRa0m7ogS64czUYXH3QYzyPsj0=; b=WXL+CiJTpgQ6g/OV05SO9ay9eGephvGe8O9yevOyLBL4FM/CrJGHgsIDhFXGruwgaAbpJR +j9QI1Cie/kCrt+/rFYiho93f1hn44AUSM/VT/0D6FadT1rOczkA+zFmiBALkrcPD/SYbD CpbmvW5hvLwsj9GcjpqYYg+v1/Tar6ih1wHJLfUS3iQDz6e583kUGyNWPaqjlkY6ligCxp IHrKIqPq7noPrboaieyEivqTXECuB3DaCXGUog4jyY7HKZJiFUQPwALB5BuT5rwXFed3AZ HL3Bwl/KGBhLkcvE96ko2PELE58WCeJLczzQm6FyI7BWu0vkCsBCl1DcvlTFwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412098; a=rsa-sha256; cv=none; b=a5jFqpFNnEi7UHTwsYQycpYW2/a5sKmmz0bSmB5Sb08iqU/JOZ1XVY/3Tf5cZYJPGyOgkw FIvlyV1K2ljRbi3ZiaAha4iCaV86w2JzvA+4ANzgvREijTRY6awnJ5BGS7UHDE6EdV6DCX F6S9XUm6PNMJK66GlKgC8LyXUx/X8fGXRXHd4GPZ4yoejghPh7bZ4vC6nWwbkW4JocIAIS 2yypw2MG/Ak0WKwQH623gq4s7ACFEyySZ8RnlEuScJ1Dq1+mf5phmducQpGSi8517WYX3O I7lG44o8EM/yxUfvgsRW+Qo51FO7t5XQ16yCn6ZStnM24oQK0rFS/+H+WV6qdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBPZ1kDjzc10; Sat, 28 Dec 2024 18:54: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 4BSIsw45037524; Sat, 28 Dec 2024 18:54:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIsw0H037520; Sat, 28 Dec 2024 18:54:58 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:54:58 GMT Message-Id: <202412281854.4BSIsw0H037520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: bf0b82f8292d - stable/13 - loader: Use printc instead of print to fit in 24,80 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bf0b82f8292db384199495ab457f00bcfa3e8c2c Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bf0b82f8292db384199495ab457f00bcfa3e8c2c commit bf0b82f8292db384199495ab457f00bcfa3e8c2c Author: Warner Losh AuthorDate: 2024-09-24 16:52:18 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:14:31 +0000 loader: Use printc instead of print to fit in 24,80 print automatically adds a newline, while printc does not. Use printc in preference to print for managing the autoboot message. This means we can use line 24 safely on a 24x80 terminal, restoring some functionality that was lost in 101afbc6ee2f0. Note: we still set the default curosor position to 25,1 in screen.lua, but real VT100s (and successors) will treat any row larger than the pnumber of rows in a cursor motion command to be the last physical row (this is so you can move to 9999,9999 and do a cursor location query to get the size of the screen). Keeping that as is looks better on a typical VGA console. Fixes: 101afbc6ee2f0 Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D46771 (cherry picked from commit 3fb656f8ef21332d96de8097521aaa51ddeb649d) --- stand/lua/menu.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 894c0af69d35..1d4c203bef40 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -530,6 +530,7 @@ function menu.run() drawn_menu = nil screen.defcursor() + -- We explicitly want the newline print adds print("Exiting menu!") end @@ -544,7 +545,7 @@ function menu.autoboot(delay) if last == nil or last ~= time then last = time screen.setcursor(x, y) - print("Autoboot in " .. time .. + printc("Autoboot in " .. time .. " seconds. [Space] to pause ") screen.defcursor() end @@ -553,9 +554,12 @@ function menu.autoboot(delay) if ch == core.KEY_ENTER then break else - -- erase autoboot msg + -- Erase autoboot msg. While real VT100s + -- wouldn't scroll when receiving a char with + -- the cursor at (24, 79), bad emulators do. + -- Avoid the issue by stopping at 79. screen.setcursor(0, y) - print(string.rep(" ", 80)) + printc(string.rep(" ", 79)) screen.defcursor() return ch end From nobody Sat Dec 28 18:54:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBPb5mB1z5j3Gv; Sat, 28 Dec 2024 18:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBPb3SqWz50DH; Sat, 28 Dec 2024 18:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vb8g0GGYSp5vugD0sUpHI6aOHT08tcCXl56uLIS/0Ys=; b=O2VqBhMbznLmhhuMVo0KFcDxV/O9oVZxaUKWc9844xkxujGcm/UegjgVxQ+x2kXQjkU5xj Sqwh681mBfFhBK9jMHCFh5JjVX3pB/5Hc88eZ815n+BpfySxVmcwmIjmfmuLyZiHWWeApI 4EugwVo7gIQZCl9umu7y6Hq9MAnYznubk7kJMPOgHeHSQJJmNx7y7vhwe6IhV9BLO4X8O6 TAT3N7f/8bgNlO8Mov+++u5iNyC6oGwXRUZBblae2k77bu+jxSbL+0x2WcpRtxKw4JFfsl kM65F21hZnEC3vZTIhkghqQ5xfq6KtFoLrVA1k7HSZDCUnWau/V+tejCOXEZdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vb8g0GGYSp5vugD0sUpHI6aOHT08tcCXl56uLIS/0Ys=; b=dmN+V1NjxDZo/DhTFHux2IrpEMkKpNc+YZCsVtxOlQBrsB/N/6P3+rl+RXkVGjd3ENIpBe icYMNu22yemCNKpKGl0xlvI+I5beHHFjouLFBqt4ECGLgSWp3cFzCM+lVQ+6+8exaXxzKi uLrNw8XuU0gQpp+wkquLV42I32GwANTkLXY7J7Uyxx8+zfcJm33IR8A+ZX3aTV0aM7PO/l 79zUZTB/gM2xCYiCR6ZJIPLIZruXtr17BOabFkRrVo0lKtDdGU8YSqYaKYxi8aEscgA8yd ugX4SDWaMsyElq39rZn0NMLYh75Z1Esck4gWodA8Yr6+CA1+xD3/wQoeMIMK8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412099; a=rsa-sha256; cv=none; b=MjfJTBBYi8MDMTSzWnoIuce1wmfNyVZpA3FSy/UykhZ7vblEX/4J0ijcYu9zFLpEC4xOuF CJKOyWaISPXE/58WtZAM8bXSUMFwf+gfjYYIefV9jUkg9SDoRXlnTpW2uGaXxkj/EY4rvB XAFamMt5P4JD24Wmeh81MN2xFO8jqrpuOdF2wUgqfmQrGWLsvHWWVxuoDZTqo7m1+gu110 SZOV2SJ9U8yXtblTBjqIdSAAacFO14nkHOI2abbe+ukY6fE/VV5PXbdY5q5+Cg+N36IVC0 RbBDd4l4/QqcwniuDi3J3xjGxrWR0hUG+IND0Xo8vj467WiDoqnEKGq60WDVjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBPb2kSSzcQd; Sat, 28 Dec 2024 18:54: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 4BSIsxHb037582; Sat, 28 Dec 2024 18:54:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIsxfh037579; Sat, 28 Dec 2024 18:54:59 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:54:59 GMT Message-Id: <202412281854.4BSIsxfh037579@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 65e3190d627f - stable/13 - loader: Fix 0 vs 1 confusion for column numbers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 65e3190d627feee3911f7aaf44d83c4368135795 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=65e3190d627feee3911f7aaf44d83c4368135795 commit 65e3190d627feee3911f7aaf44d83c4368135795 Author: Warner Losh AuthorDate: 2024-09-24 19:54:56 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:14:45 +0000 loader: Fix 0 vs 1 confusion for column numbers In two places we use '0' for a column number. However, the upper left hand corner of the screen is 1, 1. Fix those two confusions. Also, fix a comment that flipped the coordinates in a comment (I'm used to the vt100 convention where it's row, column (eg y, x)) and didn't notice the rest of the code uses x, y. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D46777 (cherry picked from commit 604919c47fa4092db08dadd282851afc9cba0a90) --- stand/lua/menu.lua | 4 ++-- stand/lua/screen.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 1d4c203bef40..9d228df1a9ad 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -556,9 +556,9 @@ function menu.autoboot(delay) else -- Erase autoboot msg. While real VT100s -- wouldn't scroll when receiving a char with - -- the cursor at (24, 79), bad emulators do. + -- the cursor at (79, 24), bad emulators do. -- Avoid the issue by stopping at 79. - screen.setcursor(0, y) + screen.setcursor(1, y) printc(string.rep(" ", 79)) screen.defcursor() return ch diff --git a/stand/lua/screen.lua b/stand/lua/screen.lua index 4437a34f95f1..89d5416815fd 100644 --- a/stand/lua/screen.lua +++ b/stand/lua/screen.lua @@ -32,7 +32,7 @@ local core = require("core") local screen = {} -- Module exports -screen.default_x = 0 +screen.default_x = 1 screen.default_y = 25 function screen.clear() From nobody Sat Dec 28 18:55:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBPc5BtNz5j2pb; Sat, 28 Dec 2024 18:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBPc3rcfz505V; Sat, 28 Dec 2024 18:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bm40gA5VOpCZEdPmMsXFIpnLJwJHkb8YjPaoXdUbPIo=; b=t/8CD1289bfUcdRoGkk4s0NM0as/ZConGXCHXTLYE5VMrPoBmpVPdnx5oHowODI56SUQnI zliG5vMrKLQMxpBCLOzQYWwcJw5BH8ZhkNM1X0DhunK40qLFY8mGANzsRFweMeosky8YCN JnGw61IJFPmACRCwF+LPWRONEqmW7CqfC3Lej1YoI2mGsVOvgJZwVLuV4VBWu8aPvpD/am 93jtNqXMuujzIwGMaSg7Audb3nW6HhuHFuzLAkbzG5FTUPnhm9djFCv3FqjXbHJH3Fb/yT ZWisUX7tFT/VIOq1clXrSdVvlsSBslVmezJJlifikx5ScPguu25+QgTTGwkMiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bm40gA5VOpCZEdPmMsXFIpnLJwJHkb8YjPaoXdUbPIo=; b=ZBsnjfCKauUgFzKY3IklkhOeWQ6DL7CZ8trn47UZFBred1f3BlekPIoTbo5QSnYJ04jo+K sJvQifZo4l9BKq82c03b+Qq0/QKqJtQ8uQc5c24iE+L7DSMV0CHgT2wKkbSZKH0vofF35n eLzusWROTTC6oDEYTnHURrpROAilXzBvmCJmFe6O2t2Hj3dikB/AUW7aA/tGOcGs7sij5x qX8DLfldNFYQNRzqzMp5oPYcOov5EsSVgm7M1wS2opy+f4zgXxgjAHguujBuPg5PcttQlp yz4qClyfHPdqMMZnFTW+NrVA7hKzBRX74yalU47VCsJu2JlK9xyRyZwiS56eNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412100; a=rsa-sha256; cv=none; b=Np74ZwvAR0K+9U8O8OTsZYLY2JvuAXsPTUxyzKxN3SMRRjKjRMU76XDrCkMR4s+4QU++Me 1KannznbmSRgPhKEHleRiris1H00BdrlRpl58y6bbiZF1iyqvGwXWkhNAfoGBTkfgv97Av hYm6+R/SghmIkdQCZFOcZSxa6UjaBUIzfjxBKbl99SWV5D4z7kfGoQ5gc9nFIc7eJnVcoC ipTp0c/7aPs1XTCJBCZpOPxOCJV05dMdFCQmcXVZcavz0klPv6e2BChHqwj5lmqek4XOvz Che2xmw+exProxw4gygDKdo5QFIbFZvZQIgqggo+VQrAfMQmYPD3b++2XxZuAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBPc3T05zchg; Sat, 28 Dec 2024 18:55: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 4BSIt0DO037663; Sat, 28 Dec 2024 18:55:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIt0kA037660; Sat, 28 Dec 2024 18:55:00 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:55:00 GMT Message-Id: <202412281855.4BSIt0kA037660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 9184e787ba91 - stable/13 - loader: Use Cyan instead of Blue for some menu items List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9184e787ba9140d02699905f6242b6b9c646f15d Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9184e787ba9140d02699905f6242b6b9c646f15d commit 9184e787ba9140d02699905f6242b6b9c646f15d Author: Warner Losh AuthorDate: 2024-10-11 19:06:24 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:15:03 +0000 loader: Use Cyan instead of Blue for some menu items BLUE often translates to DARK BLUE. On BLACK this is hard to read. Instead, use CYAN which looks good on both black and white backgrounds. Discussed with: kevans Sponsored by: Netflix (cherry picked from commit baa7e9cd3083ccaed8f26e9ad786ff9657ab85fc) --- stand/lua/menu.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 9d228df1a9ad..d7e4ca4a4383 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -122,7 +122,7 @@ menu.boot_environments = { if is_default then name_color = color.escapefg(color.GREEN) else - name_color = color.escapefg(color.BLUE) + name_color = color.escapefg(color.CYAN) end bootenv_name = bootenv_name .. name_color .. choice .. color.resetfg() @@ -342,7 +342,7 @@ menu.welcome = { name_color = color.escapefg(color.GREEN) kernel_name = "default/" else - name_color = color.escapefg(color.BLUE) + name_color = color.escapefg(color.CYAN) end kernel_name = kernel_name .. name_color .. choice .. color.resetfg() From nobody Sat Dec 28 18:55:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBPd6yyyz5j364; Sat, 28 Dec 2024 18:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBPd54xkz505g; Sat, 28 Dec 2024 18:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mk4nyABINdp/kMNeY2KRVPz0Wrja4S9gcJmbbxMCH8g=; b=e2znD/u08b4QpOXAR+DABpUDFvCYUNdpJFZ2C0JN7WvIytPSKGLILXjgT3/yEvfr+bJ6r6 jkhBLEqm3AGjVdMIGe3q5vSZV5iNtxjDkRLJAHIU+ntUzF5X+rr2t5caQGp3M2IP9n2SXH tIgJ9O9nwgZ3f3Q3aNTRMr3OoW3o6e1895KzQp4iZI3Ebhkt+5v77EF50OG/NPvivKoMo6 cJaYDKhjiyHDhG74GxN9iHtaXOG5adJjGRrWlR6hvynf6gBKr9WvXl0KEgSXrc6rUv+cxy AIUqJqA6cjPa0ADw0he950EocR4EHIpsVvHp96R97j/S1V56WElxXKt387KKjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mk4nyABINdp/kMNeY2KRVPz0Wrja4S9gcJmbbxMCH8g=; b=jZ957Moipd7G/oGkOVMmZkRCXBbOFajSfh1k4D+2BGcEvFfqZU3I7K5WfsPNjCrYlsb1YL xUqP4VzcAn/dO/qm7bRLjUMZrUJnGw3eo/JcJKSf6khgD3YHS06bHHZEDEi/kU+nQdW/tW JehBcoQJfdOn8DGiKUP1+OHdzrag4EzghuttHDTB0ie4d1aRnG+Yq7oigmrkBzCf49p1HU /zr1eY50u1OBPAb65ZYHGnPsCujgGQ+AKW04kTKRGBYZu/iSio6Ol9z8e1aWA83pnYlGw7 S73dkOYOCVXLOcCjNVmb+4Jo3qPLwU6VUaNphahFAt5WQeCpMBTpG2AS4Z7LBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412101; a=rsa-sha256; cv=none; b=ogbAWjGXZUGgFBiV8KxVjlq4CrqOlvQLNoNfDF+GBM5WER61W/mVdktqTcCzFCJ0xCG7XQ WPZBxDklL98E+hkTY04XEnHRyg7KnkJoTvpyfec5u5S+SfMMuPSpj5x7Kn2Ot/CHGmDi3F RofE/LxPYAwhxmmEivbQcyLFhFxIUIpFTpMFiBXW9BnEOGyy4cNDy3T2FRteosCIkcM+sx wwrVlMdb/6TOYoQUlBJRaEAakEfhBP53+ZQ+PbpHbM0ka7lGHgQbIOkCTBCoP6KCbeJgdP 1H1lfaXkU2KQuAuOwIjlStaCAyml/TBoFYSqv6wNBmjxpkkBVaaQUXC05VkCzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBPd4j7Hzchh; Sat, 28 Dec 2024 18:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSIt1mJ037734; Sat, 28 Dec 2024 18:55:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIt1MQ037730; Sat, 28 Dec 2024 18:55:01 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:55:01 GMT Message-Id: <202412281855.4BSIt1MQ037730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: f6222e8e816c - stable/13 - linux.h: don't redefine lower_32_bits if already defined List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f6222e8e816cf12d54117fb2d175738bb21f2d25 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f6222e8e816cf12d54117fb2d175738bb21f2d25 commit f6222e8e816cf12d54117fb2d175738bb21f2d25 Author: Warner Losh AuthorDate: 2024-10-15 04:53:55 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:15:53 +0000 linux.h: don't redefine lower_32_bits if already defined systrace.c fails to build if we're using a common compiler.h for both openzfs and linuxkpi. The issue is easy enough to fix: don't redefined lower_32_bits if it's already defined in linux.h, since it's the least 'standardized'. This will allow systrace.c to build using an equivalent macro. MFC After: 3 days Sponsored by: Netflix (cherry picked from commit 481d5a4891648f0a6979a48689cc16fca80d4ab6) --- sys/compat/linux/linux.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index efa49af3cca8..b9e176f449c1 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -348,7 +348,9 @@ struct l_statx { #define LINUX_ST_RELATIME 0x1000 /* No native analogue */ #define LINUX_ST_NOSYMFOLLOW 0x2000 +#ifndef lower_32_bits #define lower_32_bits(n) ((uint32_t)((n) & 0xffffffff)) +#endif #ifdef KTRACE #define linux_ktrsigset(s, l) \ From nobody Sat Dec 28 18:55:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBPg1f58z5j3Bf; Sat, 28 Dec 2024 18:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBPf65NFz50MQ; Sat, 28 Dec 2024 18:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YiOBqvti6sUki+HL7Ze4UVJOPKr3xmewYY5Dnk8uIRI=; b=mjH6FmCL4p75F9+ZDosHoDdYbh0bhpbyaomJ9yGgSKYXKlVgUAOI8/gX2RalFFJbxhFB7W DX06XmvKXJjlw/QGvyaTi5h1Nays+UkbV4AMsDPt4ahQj+3CekXCO6UfCPlutozodryUhr y5JWB2yQyrfZ1j/Ec2qBdvMaHLGciMCtCkwCFS8IXQaCChUUiR3Juqf0XM8z0Wi47JR9fo AmnSTMF/FWOb8nAk9FMYWUpGqpv+GqzzCZMAlvVAbSW+rgyfZdbqnWOJyuRhMrBFTkuAHH JwntFvcrNVu6LtkEaeOVv/hhV1FEBe+mLSgxjSGhhEBGImAlpOl1qgCVVAPyAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YiOBqvti6sUki+HL7Ze4UVJOPKr3xmewYY5Dnk8uIRI=; b=Uo86P5LvJN7ae3Ppte4NylIj7SPYG4FlVhJGxZ+t6mjR8Yl7KG+bQh3yEHaQ6laKGQNpTr Hm7QrcjlujewcI6u1kTAdjostGcoHImcWz1PI9tkD5oDEw+m64RfiN65A1A5QP2LcMfTcj IZBV2Zb9W8GkdQrUqZ2qjTTf2HBjnjxrRNLTw4cyxolkkQ920mF/Bs56kWU/iMecwpesrv Z/II3sF+XdmvFGh/iDjw0Thdf6Kvnv127c1KxHTRx7NTUn2icA+0JyN79NQbchLhcGHg8R ZiBecm0ngPioTgzPiYq5/Vvjtkwu/vwmoLSqKgx7cTbYN5CFSzTksTon+3is0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412102; a=rsa-sha256; cv=none; b=ijKCfcz1VfBQJ4DmzQdnL5xvaKl5hnLlui9uw1VvuRZkDj0SmTQTWa2+fV1PfEjKp7Mu8k uE1Kytu2kJqu/VLgEHGIGrpcRfVcFxoDEZx3TYsGPVtI0uQFWB/kJ3CeHZRikOJRf4IYx2 /juvXLmb8FT2cGAbcXpUDBxUqXcOXmhUrACAxzse4vZFbBAhiZW/HrLf4M/3Pz6s416J3t cFOiNWrbVzX3hp+2XYjHF0WggfMNhGCUKMCRfAsvV2nmFDgwJbct+hpUskGfUjFZ4lQg8C NOp8dzcNdW5ZwfC0zKYScF45oOnDj1U5gRG4ca1veDRnj/9wqod3kbYCGrl+ZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBPf5hnFzcNP; Sat, 28 Dec 2024 18:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSIt27S037782; Sat, 28 Dec 2024 18:55:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIt2dq037779; Sat, 28 Dec 2024 18:55:02 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:55:02 GMT Message-Id: <202412281855.4BSIt2dq037779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 0601bbbea8b3 - stable/13 - acpidump: Move to acpi.rsdp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0601bbbea8b35cc1d49450db452304fd00734f2f Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0601bbbea8b35cc1d49450db452304fd00734f2f commit 0601bbbea8b35cc1d49450db452304fd00734f2f Author: Warner Losh AuthorDate: 2024-10-15 11:05:07 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:16:09 +0000 acpidump: Move to acpi.rsdp Switch from the long obsolete hint.0.acpi.rsdp to acpi.rsdp to get the root of the ACPI tables. MFC After: 1 week Sponsored by: Netflix Reviewed by: andrew, markj Differential Revision: https://reviews.freebsd.org/D47079 (cherry picked from commit 5d3fb72667e5794bf16756e00a87338f4acb7f90) --- usr.sbin/acpi/acpidump/acpi_user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi_user.c b/usr.sbin/acpi/acpidump/acpi_user.c index 4b9209e53507..daa4118089cf 100644 --- a/usr.sbin/acpi/acpidump/acpi_user.c +++ b/usr.sbin/acpi/acpidump/acpi_user.c @@ -42,7 +42,7 @@ #include "acpidump.h" -static char hint_acpi_0_rsdp[] = "hint.acpi.0.rsdp"; +static char acpi_rsdp[] = "acpi.rsdp"; static char machdep_acpi_root[] = "machdep.acpi_root"; static int acpi_mem_fd = -1; @@ -172,7 +172,7 @@ acpi_find_rsd_ptr(void) addr = 0; /* Attempt to use kenv or sysctl to find RSD PTR record. */ - if (kenv(KENV_GET, hint_acpi_0_rsdp, buf, 20) > 0) + if (kenv(KENV_GET, acpi_rsdp, buf, 20) > 0) addr = strtoul(buf, NULL, 0); if (addr == 0) { len = sizeof(addr); From nobody Sat Dec 28 18:55:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBPh2pb8z5j340; Sat, 28 Dec 2024 18:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBPh0mRzz50Q5; Sat, 28 Dec 2024 18:55:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpT0j51BsrSnJTkeuIU4a2JfWvtEAS/E8NKFq76kYsI=; b=pNLTels1mIU567B0IUhagbCgVr21Ob88sNbDhzhvZc0L5z9xQvh0oxgIcFMj9f46uAPFDw P7Auv1J38QkGGiQBw26SBL3QzvJDJyFUSpr4+ZU1s6TbnMLJFelqm37xpbsf39q8yc/ouJ SNZlQJqjMUohOHRhIcYiJTdoXZx6VroMhrtILvXYUKodsl3MIO9ovIPiUrk5KjZ8uoeGHq n+0lr9wu4CIDmo8rhXKQin6S1EjZBqEEEhE2JxZpteTKvyyuK8sgESd827Z+hN/duM2RDw ZyJIO4NRvu66R9tyvfDILy+lZhpUNc+FaqWVSOHywk566RqUyV+/7w2UK99GjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpT0j51BsrSnJTkeuIU4a2JfWvtEAS/E8NKFq76kYsI=; b=WVhrMvH3wj78RbHCjys7nzbaKfETH1xtc2sblp7/v5u2DysXue1GRQ1wFS3QUb+aYZXMAj xHIAhP+aX83VKzl+750z/aXkYl3aIh1kfCmb52I8WCRMfO/rjdQ3mYT1wgfxo7RFL4aMsR JEpR1cpfK0N4lebiow6ECHpPaC2h3JKv7VpHBQp7U5RRfbtgfx8jQBfHiCpq0awSkQv8eF uQohpqZCvmkzZlU5izmi3Ggzhjm0tdwJrhK6vS7YcTu3nzqtx7ygs+FDPgfyRpsFAXXVC2 sNkPgHWRW8uzeUPTCx9feEkXekKpO7d00K7Jr93Q6UY+inwHDH8EbvVO0p0BZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412104; a=rsa-sha256; cv=none; b=No1jLkxHWRN4/ZFXif/adlgfz+nqIOqrBwWgnl3ND24aKK+hVxJZdD9ZjiZjk2i6Md/AHn V+Ve07yBBMIF4siFOk095VuedWJ4GvC34fB97aL/8Zr0x62EFiSPWY9Q+r+5vC/NAd73t7 FdMdBQKHIbStdBLYMBYl1vnQn1ZJ9mx9VxpUtVKaKStETGgJiYxz40D6U1Qyce9fNtGXjH EqU8guCzafrXdMML1HfKIsWem/NkyMNBl20SlebHGDoXqz87zL4XUjF4wmYn1VmwkqKR/7 axtxkfjiy1ViU5EBGHfsJHMi+CHP7srZ8AmBlj7Qo23p3OQ+6GVhOxeWLv4/Dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBPg6hyBzc11; Sat, 28 Dec 2024 18:55: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 4BSIt396037820; Sat, 28 Dec 2024 18:55:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIt386037817; Sat, 28 Dec 2024 18:55:03 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:55:03 GMT Message-Id: <202412281855.4BSIt386037817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 32b84f8addf0 - stable/13 - vt.4: document kern.consmute List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 32b84f8addf0d5460a6dc445bb7b790d9a25714f Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=32b84f8addf0d5460a6dc445bb7b790d9a25714f commit 32b84f8addf0d5460a6dc445bb7b790d9a25714f Author: Alexander Ziaee AuthorDate: 2024-11-08 00:51:50 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:17:01 +0000 vt.4: document kern.consmute MFC after: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1521 (cherry picked from commit fb91b9858080143b56ba637ab3c8954f3f94694a) --- share/man/man4/vt.4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 420f416c727a..e11947204bb3 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -51,6 +51,7 @@ In In .Xr loader.conf 5 or .Xr sysctl.conf 5 : +.Cd kern.consmute=1 .Cd kern.vt.kbd_halt=1 .Cd kern.vt.kbd_poweroff=1 .Cd kern.vt.kbd_reboot=1 @@ -296,6 +297,8 @@ prompt, set in or changed at runtime with .Xr sysctl 8 . .Bl -tag -width indent +.It Va kern.consmute +Disable printing kernel messages to the system console. .It Va kern.vt.enable_bell Enable the terminal bell. .El From nobody Sat Dec 28 18:55:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBPj3Mqvz5j38H; Sat, 28 Dec 2024 18:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBPj0mrFz50Ry; Sat, 28 Dec 2024 18:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jOhEUEWl2oqrq11TbAUDVc+TiEGG+Z6sUTHPDNGsesg=; b=Ign0QJvyOf++nnIaaKlsj53vd95hROFz/AtAjfV/DmookHH3xwOiPwiwDeuNKmeoaAjXzC bScvwDr+0g1zw7lx9ciieEc/T8cHFthscAs+MHqfV00f9sfnuHQIG3Sv7dPZ0+OT1fp7OG tNRQL2aji8Eu8p1S/N2m7I+IKcRMN0hsHmr+fXI1I1Fzh3UZ0CsG6j+XpBJ48aeCDBz4Fe aF8sVHs7Sp4kRBM6snWJks0bYNK5uPnLz4zzIxeBYBeA3I19Bp0X9812wFSllpHSJx2oPq khIgFnNq1zHHdvU/zIN+ascotVsIooW0k7acjlpjlMvmsNaPSkh0QMgou42aLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jOhEUEWl2oqrq11TbAUDVc+TiEGG+Z6sUTHPDNGsesg=; b=ED2uGdg4fl4oc2iRE/KomZ3usBG/ybTkZLmN9detBISxDO1ubAbj4jO0YgXVyIgYEt3l5F cm19G9HGUFEa1DhXvEpbnGqUVxdDxJXPVuASvYf+cYforOq7vMOH/J60kXMdTMQqN/xxgj sTZ069+Es+Lsg8PWG5GUxhzlFAVmmVHiulBdJrvjOkMEYlAtM0U5WY7enSvlgn8i2eQqYh KLdgi7EVvlDDE1JXhUQ2yIpBJxjzjfNuMYkkctfVsKaUBDO3WatGYEVB7s9ggBq0agz1C2 mT2WJHKpTFJSbJTD4ewgELyrhFhz18zSaMoeCinnNjT4+OA8hVDZsHxAoqh6Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412105; a=rsa-sha256; cv=none; b=QZxNV6I+Eoo2IdHf8puMb4fwqK1JqtelmHR7xxn6MZMIcxrYllrsueeJZQF6J7alceOb1t tKlZwuVSHvX0K5rM+4zWN3hey6p93hYvjMxNIpiSpON6xojgvNrKpmUtZ9mZXqSBf/RaYW CyRroJR7wmqlqaZZmmI3mM3SqB88AEiphpCxQRZ787SfQAW8I2ckMOIk61VuvqFlVByvJh s9ttCg+6YPeaRUTPFtq9NcI8HztOdtl1OuyBWG7FAGO15r8JD7GBsci0ChcPA/JA2YkmWd oZJReSHVPAcfudVL4lUQBe1cHkwcb/KicNw3voB8UhOtW9MBixeFnl7oneaPJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBPj0HqfzcWL; Sat, 28 Dec 2024 18:55: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 4BSIt4wq037878; Sat, 28 Dec 2024 18:55:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIt4Jc037876; Sat, 28 Dec 2024 18:55:04 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:55:04 GMT Message-Id: <202412281855.4BSIt4Jc037876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 6a03eb1f3028 - stable/13 - sh.1: update history + spdx + linter error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6a03eb1f3028a96a031bf11b2567540b0e9b7f5e Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6a03eb1f3028a96a031bf11b2567540b0e9b7f5e commit 6a03eb1f3028a96a031bf11b2567540b0e9b7f5e Author: Alexander Ziaee AuthorDate: 2024-09-29 08:14:36 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:17:14 +0000 sh.1: update history + spdx + linter error + increase history consistency by adding "first appeared" + remove a skipped new paragraph macro to quiet linter + tag spdx MFC after: 3 days History source: www.in-ulm.de/~mascheck/various/ash/#bsd Reviewed by: mhorne,imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1440 (cherry picked from commit e2a72442bd57c1373c30fab945fbfc86464f3782) --- bin/sh/sh.1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index c990a4adb3c0..93504c00aab7 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -1,4 +1,6 @@ .\"- +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -1070,7 +1072,6 @@ or the end of the command. .Ss Grouping Commands Together Commands may be grouped by writing either -.Pp .Sm off .Bd -literal -offset -ident .Po Ar list Pc @@ -2891,7 +2892,9 @@ This version of was rewritten in 1989 under the .Bx license after the Bourne shell from -.At V.4 . +.At V.4 +and first appeared in +.Bx 4.3 Net/2 . .Sh AUTHORS This version of .Nm From nobody Sat Dec 28 18:55:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBPk5pdSz5j3H0; Sat, 28 Dec 2024 18:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBPk2HQhz50LB; Sat, 28 Dec 2024 18:55:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rxl8yIVDrF1D/dSWAz1LgpLn6I6yivgqsBmm7ZHgQuA=; b=eOFyvqTn3PoF3q9tOqAgu/cfRbpbSdOPlJ54SdrfY6Ya+SDfryccD8tOSKfUAIU7LtUKZ/ 4UdmmG164UB7p4vajJR2/wSs10mcQWdRPsShJvb4jLoaIINyinDjUBmphO10gJXYzl6TNs AlQomd3gCerkhjgrXMETMMKq5v76aYlx2E6fobh1xBxV4Q24w4gUSW+O0VTGK7iy4xejne uMG70/4/syW8FDtT/chuH+WU6z2ZnnYknzUYpJMaD7RHfEfxFoPHAkJaLz7oTfKSVRW60c z/nuMwmmdyQKxSHkuBxv8V0FrsHuuwBbOndsW+0f5zsqWikj7A7HBGkXjg04Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rxl8yIVDrF1D/dSWAz1LgpLn6I6yivgqsBmm7ZHgQuA=; b=Xbq/v7hJ6KtdFP+/PmJU7KK71DaB5zL6ZJZGXKodRku9v9Fj01amNErlytnlF2h0vjRojc tKkV3WLcinSTlc8h6tKL7WjJ/GRafrDnliZjbcVBIveWfGnoFfCJV/RYxlCIROVrHX8wdp rqcsx0qiexTF2EG43yvHIx1rpqf54h7ir6V43VEJ+ELSapJ9lL4nELRNT1oKgNQkET2zAn JzeUqiBI5s9P4q84AEf/UHldDEZpX8Q5FPKPmKNqWU5GMK3TRwYUZrE9DxWQDGHPlFlH7p 6Qdo+AgqFnAmxQ/71MoX3LCYAsSZc3ni24b13y53WpESaHH0Y/Q/KaHALeKfZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412106; a=rsa-sha256; cv=none; b=B1cxLnIJrkFlFYRZ2h+naFz2FyG0tCQpErVUDyn+08TXwOX8Ma+7WnOGy4TxtIS85wSNxQ KDOaBiiYoAcyc05sn2BXn/4bLaeLdDi1z8McVDdDZkmHSCMUjbe/PG2+RB+0cvGz4VWGQF ms61dWQXOUkooO2gTUrgc3nqwRxrpexvn64Ftojfr9xCw8v9Y/u0EHrbGLTERZqLI4wiMs i2JhXauCcenZkcJAuXrBIirlQQCWTh/gHsEsdZj4gV1c/PisvFehQl6PRhkknTHC+XhR5e R4Xi3BAsCu24GoieD0MBmCcF05NfAUSNe29O5i2hxZPSJ7p0suvY/DXWHZN/wQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBPk10NTzbjB; Sat, 28 Dec 2024 18:55: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 4BSIt6SE037930; Sat, 28 Dec 2024 18:55:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIt6gh037927; Sat, 28 Dec 2024 18:55:06 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:55:06 GMT Message-Id: <202412281855.4BSIt6gh037927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 317cf8a1f832 - stable/13 - cu.1: describe better + tag spdx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 317cf8a1f83255811d35776674395a47a6d7f0b0 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=317cf8a1f83255811d35776674395a47a6d7f0b0 commit 317cf8a1f83255811d35776674395a47a6d7f0b0 Author: Alexander Ziaee AuthorDate: 2024-09-14 23:26:16 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:17:30 +0000 cu.1: describe better + tag spdx Preserve over 40 years of "call UNIX" BSD heritage while answering "one line about what it does" e.g. "how do I get a serial console?" "% apropos serial" MFC after: 3 days Reported by: imp Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1423 (cherry picked from commit 4d12c7b9df660b15580ff3b07ef5570d1cab958a) --- usr.bin/tip/tip/cu.1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.bin/tip/tip/cu.1 b/usr.bin/tip/tip/cu.1 index 8d6fae3be8fc..1852d65d98cb 100644 --- a/usr.bin/tip/tip/cu.1 +++ b/usr.bin/tip/tip/cu.1 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" $OpenBSD: cu.1,v 1.3 2006/06/07 06:35:59 mbalmer Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 @@ -34,7 +37,7 @@ .Os .Sh NAME .Nm cu -.Nd call UNIX +.Nd call UNIX over a serial line .Sh SYNOPSIS .Nm .Op Fl ehot From nobody Sat Dec 28 18:55:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBPl4yYzz5j3H2; Sat, 28 Dec 2024 18:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBPl34Q9z50N6; Sat, 28 Dec 2024 18:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=49qbSo7dhX3ytSah/kyN6QI9swSXgVTToCQFYHowHSk=; b=E+YFza1ubMFyyHQ+iGcolHjrAq5Df/JoWNmkmMpCmnDtWeSFD7m6LB/oWSUMDATv7D80A5 FxPCDvU1tc71flWP2CPghV8uk0pCTHSyZRCLd9pOLe3UuZtxhxYgArukvHA1XG8cJEO58N YIgZqac7fOz8l94wyKYKtdsk83Kjydxcn1OaiK3Z+PSoS68cWNXEkUzT0xsDeXymL9Mq+j x04A02XUq0+f4PIs+1pAi9XeEeBs5dtZBNFDPqO4jHk9Md4kZL1DjT55k5ec4Nlhpo9J6R OCzcLwsBENyhAWkmBKIi7wB4au/v/7xxLacH5nyfiZku9zkOGYmNW8x/CzSx9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=49qbSo7dhX3ytSah/kyN6QI9swSXgVTToCQFYHowHSk=; b=rNfphUl67pqadIZ9jvEfUdUnAR6J8bZz5I3vDJP2k6oFP5H2BK/Fl+AcbShcCNfYcKqtgF p0pTPIdz6MV7+gXpiW1+Izy+xszJyOeX/iJlu2cTbJshp7ixHtft2anM6ErI8qiRHwjF6r M7gtg2kwaVEPS/1QVKl7jgeiG4iGxDU3cUXeEQyMeJYKzJCB7thb3FapA0uz4WVz1z67dv cckazrQA9BzadxMTdt2tF/N2lMNjG4jNFuxxTT5+La0kiMiqEMbCDdCOuthFV3M/O/H6hC 5BFJEGboR870uU4mQXEwfgFQCmloHOuuX239rPSRKLKb9+9j5HH4wLxq2HWf4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412107; a=rsa-sha256; cv=none; b=mhrl00W/FdfNUF1Jih0Z6SMNYC1vivwYtSGRduycm7NeC+0ziG+OEdfTnRWTU4EExBJFO8 Q1B3ufhDXSEwh1bgXVXvImQn41gTS9qqS98glOY7NiqTgAv7v+A2JG78PfN9HOCv0ZPhWC trrw4sSvDxLZlYWRM1BrQ0dIEUBzvZOMW0C3w/p3P4JbrXR5KMLW/2ioK9EOcz7ve3HrIW 8bMycZvbgvHHT5sRrVc1T5q1P9YtgHvwnDAOfEq6qal8zVQk0gN8giZTccOYfPp0dP64NV hWOoepsHAsfcU4Ocv4ddZEdSDpazKAyaSDAfhWcbPpQkgsHwOC5NjxVWwABdsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBPl2CFpzcWM; Sat, 28 Dec 2024 18:55: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 4BSIt7lO037977; Sat, 28 Dec 2024 18:55:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIt7P7037974; Sat, 28 Dec 2024 18:55:07 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:55:07 GMT Message-Id: <202412281855.4BSIt7P7037974@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 1a2d8c4db2ae - stable/13 - nvmecontrol: Fix minor usage typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1a2d8c4db2ae888f4e75b9f15f39934508fb61da Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1a2d8c4db2ae888f4e75b9f15f39934508fb61da commit 1a2d8c4db2ae888f4e75b9f15f39934508fb61da Author: Alexander Ziaee AuthorDate: 2024-12-06 16:13:53 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:17:40 +0000 nvmecontrol: Fix minor usage typo PR: 282930 MFC after: 3 days Reported by: Gian-Simon Purkert Reviewed by: imp, jhb, emaste Differential Revision: https://reviews.freebsd.org/D47726 (cherry picked from commit e7aec3ccf759dcd3fe56ae2bdbec92839c166160) --- sbin/nvmecontrol/format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/format.c b/sbin/nvmecontrol/format.c index 541b207b373f..1b39a7b6d390 100644 --- a/sbin/nvmecontrol/format.c +++ b/sbin/nvmecontrol/format.c @@ -74,7 +74,7 @@ static struct options { static const struct opts format_opts[] = { #define OPT(l, s, t, opt, addr, desc) { l, s, t, &opt.addr, desc } OPT("crypto", 'C', arg_none, opt, Cflag, - "Crptographic erase"), + "Cryptographic erase"), OPT("erase", 'E', arg_none, opt, Eflag, "User data erase"), OPT("lbaf", 'f', arg_uint32, opt, lbaf, From nobody Sat Dec 28 18:56:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRg6lhzz5j2qJ; Sat, 28 Dec 2024 18:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRg6BD7z538V; Sat, 28 Dec 2024 18:56:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uLuuw/mHcNqY/RSA37EMlrGupaWAGlLymMUmTvy+YzI=; b=pEhso+abbe51ClagBWMBFHpZyEQLg5SueFxQvDodlxIY4+B7eKPdkqKgGULXtp4fbgCmwG pU9ugLAU5YBH0GTytcsam0DEydWWwJNgfhjn35STa5e9P39sa5ZODHxCShQ9ebYTSr8cWF 86g03MDDnEJAncpfGcGhUqPVuk7SFiuGAxR5RGa7TL/UXolsNAL1Xby1pQgAT+whUigKeR 66P7nKln4j7xP3Ln0dJq8+9fN97w5U75dzEdqiGNvziiy1Lr8LVMdh8YA44kdsGCNcPYDd 3ddPsj0XJYLbUDpBJFWAbjuiUhIEaUnPUstvChe7sQKCVngB7yx+R3xFyR+0AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uLuuw/mHcNqY/RSA37EMlrGupaWAGlLymMUmTvy+YzI=; b=DeMljielfl7BD1Rf8HiTK7MDuox/w4yH/7N0xk4Mit7FJesvs8qGsqjGoQrkYAUWAahzJH dqntwjzlXqMPF5w9I3TnA86x09QiFrzN4XnQ1nQ/LLt3xcfNe9egRXFfuRX5m1eEYyStrI 6j+U+f3919pVCghUVp+b+9Kw1vsb1TXzo3DyHymvgjrrHhxSJrTLLWdv4MtQA7LsUHCjcD zR7ffaZHmJFu6mYIxGOfD3eW1fK5zn7FG4zmbBNsFG1qhBOGtk5xuDBtKkj1bGfRTc17iq oc2qZWkNj/BdA/fEdsG6zo7tUepmf19cwA1T2An6Yh5IKPIDy/xTSTC3S3E4Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412207; a=rsa-sha256; cv=none; b=jZtuvqTarSIE1IZtJ6v3JY5yFaEJtbD9djGB9Sy1C0dkAP3FnSCiX7xVGK8l8/ktsBKUlW fsz5Dss7MmGE0e14heTe3VbwzjCWGDmX8hG1JvwPaNJrTvlLXlfzRrec/rvKeWExqOrNZN TG+5OOccfl5anqTmVKs0PjgEghpgqTThsCzDT963hR7/RQeqTun6Y5lo4Hqb9d5bmm2bZb kQi0K2GJvUdAq71i0//sweKguoJs3GWV5M2mqCLBHTDqulcL5c6jhzDtTuPnwzNEcTg2GZ ABOaIlzfVSLlzHEuTBBH3H0Wq1yUCrDiKQDuiTdK4Mv0P1IGHAjHDcmNeXonyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBRg5n0CzcjH; Sat, 28 Dec 2024 18:56:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSIulCP038713; Sat, 28 Dec 2024 18:56:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIulbw038710; Sat, 28 Dec 2024 18:56:47 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:56:47 GMT Message-Id: <202412281856.4BSIulbw038710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 9be96a2158bb - stable/14 - acpi/apm: Improve APM ioctl interface emulation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9be96a2158bbaa1af65ef88b1f4e9c57ec5296e4 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9be96a2158bbaa1af65ef88b1f4e9c57ec5296e4 commit 9be96a2158bbaa1af65ef88b1f4e9c57ec5296e4 Author: Warner Losh AuthorDate: 2024-01-03 23:18:23 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:11:09 +0000 acpi/apm: Improve APM ioctl interface emulation The apm(8) program documents certain states, but doesn't document the 'unknown' state. It reports things correctly for systems with a battery, but incorrectly for systems without one. Emulate the old interface a little better by saying ac power is online if we have no status (instead of unknown), the battery has a high charge of 255% if there's no battery (instead of -1). Programs, like emacs, expect to see only the documented values and misbehave when they see something else. This is closer to what would happen on old-school APM machines. Sadly (or not) I have no access to old-school APM machines to 100% confirm this, but reading the spec, old code and testing with emacs' mode line with battery suggests these values are more correct. emacs has never been converted to acpi_conf due to permissions issues with acpi devices. Fixing the kernel is preferable to hacking apm(8) for these special cases because other programs that use these interfaces will also be more correct. The kernel also has more data with which to decide what to return. Sponsored by: Netflix MFC After: 1 week (cherry picked from commit 8a3fafc821149e800747cd92afee092fd131c402) --- sys/x86/acpica/acpi_apm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/x86/acpica/acpi_apm.c b/sys/x86/acpica/acpi_apm.c index e7e4b0f1a546..b602047d7bca 100644 --- a/sys/x86/acpica/acpi_apm.c +++ b/sys/x86/acpica/acpi_apm.c @@ -142,18 +142,18 @@ acpi_capm_get_info(apm_info_t aip) aip->ai_capabilities= 0xff00; /* unknown */ if (acpi_acad_get_acline(&acline)) - aip->ai_acline = APM_UNKNOWN; /* unknown */ + aip->ai_acline = 1; /* no info -- on-line best guess */ else aip->ai_acline = acline; /* on/off */ if (acpi_battery_get_battinfo(NULL, &batt) != 0) { - aip->ai_batt_stat = APM_UNKNOWN; - aip->ai_batt_life = APM_UNKNOWN; - aip->ai_batt_time = -1; /* unknown */ - aip->ai_batteries = ~0U; /* unknown */ + aip->ai_batt_stat = 0; /* "high" old I/F has no unknown state */ + aip->ai_batt_life = 255; /* N/A, not -1 */ + aip->ai_batt_time = -1; /* unknown */ + aip->ai_batteries = ~0U; /* unknown */ } else { aip->ai_batt_stat = acpi_capm_convert_battstate(&batt); - aip->ai_batt_life = batt.cap; + aip->ai_batt_life = (batt.cap == -1) ? 255 : batt.cap; aip->ai_batt_time = (batt.min == -1) ? -1 : batt.min * 60; aip->ai_batteries = acpi_battery_get_units(); } @@ -187,11 +187,11 @@ acpi_capm_get_pwstatus(apm_pwstatus_t app) app->ap_batt_stat = acpi_capm_convert_battstate(&batt); app->ap_batt_flag = acpi_capm_convert_battflags(&batt); - app->ap_batt_life = batt.cap; + app->ap_batt_life = (batt.cap == -1) ? 255 : batt.cap; app->ap_batt_time = (batt.min == -1) ? -1 : batt.min * 60; if (acpi_acad_get_acline(&acline)) - app->ap_acline = APM_UNKNOWN; + app->ap_acline = 1; /* no info -- on-line best guess */ else app->ap_acline = acline; /* on/off */ From nobody Sat Dec 28 18:56:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRj1HYJz5j396; Sat, 28 Dec 2024 18:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRj0pD5z52yn; Sat, 28 Dec 2024 18:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vD31uGlR0+ANx9qwBeVtE5Uw/Uy9fXGpSRz2LByjes8=; b=fguEy9Zn69MT/zV4jd8DEhkCXfQ3yZd/ra7geA/DAllfFzoHCE5e6fxuVySiFEyRpr1OOh jhVKI8g3BfihU/t8FXNKPZfCvOl5wLxI7Bb/WXd0ZI/T9lJT+LjnOGuKQxtvSdUf6KHVPR NQEFDzgbtcQxbcuFxlEnYhQujXV7O0PQmpaiP81Jm9JkWcCp01UrhI2gZZqWFFrIqVpi/s FBO0s8i13v3xULSGslJ3Jm6GOrjmHdly+nMErBjOhkhuO71HlC1dRW/qS7jgQvMROovnoE VNrd5aM7N2IdRWyZhc3yHflSDtHEqT1cwVJMF/qBEQJG+kwf3e/xDeg9i9ziIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vD31uGlR0+ANx9qwBeVtE5Uw/Uy9fXGpSRz2LByjes8=; b=YQS+gVCwHXnLYmL7s7qNIp617spSsO07T0odDFUiw2FXsaDXZhVaN2amzo7lB8sHF+c2BL u6wSRGD6/j1rnR2MhB0WUcAnl+MhhcwkUzAPDddtlebSZmgDgiLa8T9VhO3ZaAjuIuf02v 4jw2oFehmh5ZpubQEMKNoHBH1k3qNpMz5OyA5QefBZjmHyaXCUOuUsfQdvzixxXpFgj/VE Pwff2Yr/qowoMmwW3d27w6CDXN810EhjxzgiRwgErYzCJUAmtTkt2pnxzwj9kyxw5nyfBh 6WOLB6dLbKpo5MumsyO/Bhq/NkKcl8FKMxTOrEiLXJMLD4/WVnjJI/wwpzbWWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412209; a=rsa-sha256; cv=none; b=oaeFD/rjF/g98UUEdu6cgXbWJ7fgGc1H8hs6LnkA9CLKvvBohDatsQY2Z/7AN6SpfDMA/o t+o3Mmx22okzmpQ2cSR7MkUE3rFILIwi5tQcLyS2jPJyJuqiiNA2KcM39uk4t++GaldTqr E1zYon6vHRmzb7Zew3eVkMBmsMeuu0kMJkcOuSV54wwqTQeN8kCmZVa0Elr0rEdBVEJpf3 6P4avSPiIQVbZP7YZlcoP/kHrKZCUmS0si+wFAGMvudlny9UBK0NAwy1uuNriAq/JC4q7W 9E3Kh0YNWtTn7lMDbBHuI2fnCk19mnLPcMI7EgTYxLbrofpMd6BTWJFddG4y5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBRh6hbmzcjK; Sat, 28 Dec 2024 18:56: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 4BSIumeR038755; Sat, 28 Dec 2024 18:56:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIumbU038752; Sat, 28 Dec 2024 18:56:48 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:56:48 GMT Message-Id: <202412281856.4BSIumbU038752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 6d85340e0cf8 - stable/14 - fwget.8: polish List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6d85340e0cf8df7bb240012e3085694686d76f94 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6d85340e0cf8df7bb240012e3085694686d76f94 commit 6d85340e0cf8df7bb240012e3085694686d76f94 Author: Alexander Ziaee AuthorDate: 2024-06-01 08:45:07 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:11:51 +0000 fwget.8: polish MFC after: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1269 (cherry picked from commit cfe55a8af81df098995143cf3a17f67f591f5dae) --- usr.sbin/fwget/fwget.8 | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/usr.sbin/fwget/fwget.8 b/usr.sbin/fwget/fwget.8 index 71cee817b7e6..7b8b606cc591 100644 --- a/usr.sbin/fwget/fwget.8 +++ b/usr.sbin/fwget/fwget.8 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG .\" .\" Redistribution and use in source and binary forms, with or without @@ -20,40 +23,38 @@ .\" (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 Apr 26, 2023 +.Dd June 27, 2024 .Dt FWGET 8 .Os .Sh NAME .Nm fwget -.Nd Install firmwares for the running system +.Nd install firmware packages for the running system .Sh SYNOPSIS .Nm -.Op Fl v .Op Fl n -.Ar subsystem +.Op Fl v +.Op Ar subsystem .Sh DESCRIPTION The .Nm -utility can be used to install firmwares packaged needed for the running -system -.Pp -If not specified the -.Ar subsystem -argument will default to pci cards. +utility can be used to detect and install firmware packages +for devices present on a running system. .Pp The options are as follows: -.Bl -tag -width +.Bl -tag -width Fl .It Fl n Dry run, only show needed packages .It Fl v Be more verbose +.It Ar subsystem +Hardware subsystem, default pci .El .Sh SEE ALSO .Xr firmware 9 .Sh HISTORY The .Nm -utility appeared in +utility first appeared in .Fx 14.0 . .Sh AUTHORS .An -nosplit @@ -61,4 +62,6 @@ The .Nm utility and this manual page were written by .An Emmanuel Vadot Aq Mt manu@FreeBSD.org -for Beckhoff Automation GmbH & Co. KG . +for Beckhoff Automation GmbH & Co\. KG. +.Sh CAVEATS +This utility currently only supports the pci subsystem. From nobody Sat Dec 28 18:56:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRk4HGDz5j397; Sat, 28 Dec 2024 18:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRk2lYZz531l; Sat, 28 Dec 2024 18:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5epNR9JuZ4/0Y2OOHOZj2usLyzq2Yn/QfaesGqJQiXw=; b=U5uOn8Opysbp8wzs6rr5raJ6nlmQSiLTsgmj+pzM2rPmnGDMWBWYRMuizEVqmy/FzmPE7c VzU1vMN07Crm6vVZ8015jZaHkZEZfF5OGaue8i8mnPjjjRfuRE0jt7ZPdTtyVE4tfhqx3p VwoKSImtyiORWjxv2Wy4LnkAkVMQ32uYnbw5pPtwnGl3shteTkUL4ucGqtVD+Y+SihMlfO YOVKXf3La28fRKiPQHTwJ2/kamEKkAc79dv1MwFojOlG7HuSrOYUe2sgPJJsr14LnGNm6K ZYuTacFbCeK4ST6xJtXa+1kVpMqWcEwHVFlgbtBbGTn+RDiHpjRuMffoC97ucA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5epNR9JuZ4/0Y2OOHOZj2usLyzq2Yn/QfaesGqJQiXw=; b=myDebzTPIOICnovQOYWq1Irvb/GT7zmjhRaazGBRB553h0SUi+GWcmd9O7W4EMAsWMoJce G7U+ZHMiX5N9PC3me9kNuk3YOYC8rO5X8XMkqzkDmq4nCXhPajArhy1QZDcqKtqsdZKKeP nV69DoRH7Jek5x5bhgQFO0zdo9hGGACHwm0h2sXGHCtv5BCN904m8bxKC9qUIMrCtXLrph n1Najr7Zq5EZpyNT7WUt90eEp6ZMmVJpEIkFkbmgkKJRIQ5SajEwsfSEXofx1U65Qd1X+B l3PMBcvNNf6SaIMugtYs6ILAajWdlXlvxYExFa2DkNHf0kQwIGCZMzKmx/vNrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412210; a=rsa-sha256; cv=none; b=K7R8whrPT8FlEfPDHiGN2cSYnxEsTqsntHSMnR519bRZ8DkYuBa156nIg11e/8inxeW5ed Wg4F0qy9exsdJcWpR/yA3PLrZeYowjpwi5MqXXvzUBPoVp/tF7rnZZCxC4azqRjhvj77ar fp0Fj8bo7q0+52g7fFEeTCoObImlITbyHqL+Syy3DyD/MzMHbSbKWseqDws4XmU8yzNUuj W0SYYmB6M0Nnc7Y8j6rnpEoLmApJrFFEuAGd2lQ/pjXXYdyYAMPphiEXA7ske5eJB16pSx 1j1ydjcdz+jLC+o9kE5bhdC0h5o56ZRkebOFJ3QONkFFH7H9G1O/OwxqK50FZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBRk0ZBqzbjC; Sat, 28 Dec 2024 18:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSIunQa038800; Sat, 28 Dec 2024 18:56:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIunWg038797; Sat, 28 Dec 2024 18:56:49 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:56:49 GMT Message-Id: <202412281856.4BSIunWg038797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 7f2d1cac4ea8 - stable/14 - loader/menu: tweak for added line List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7f2d1cac4ea8aa85327b86746ee670b53964c6f1 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7f2d1cac4ea8aa85327b86746ee670b53964c6f1 commit 7f2d1cac4ea8aa85327b86746ee670b53964c6f1 Author: Warner Losh AuthorDate: 2024-08-22 23:28:51 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:12:26 +0000 loader/menu: tweak for added line I added a line to the menu, but didn't adjust so things were a line off. Make the necessary adjustments. Fixes: 7cb65be96d47 Sponsored by: Netflix MFC After: 3 days (cherry picked from commit 101afbc6ee2f06f77e6886f1f3ffe115c579967c) --- stand/lua/drawer.lua | 2 +- stand/lua/menu.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua index 612bd2f5317f..e55702ffee6c 100644 --- a/stand/lua/drawer.lua +++ b/stand/lua/drawer.lua @@ -472,7 +472,7 @@ logodefs = { brand_position = {x = 2, y = 1} logo_position = {x = 46, y = 4} menu_position = {x = 5, y = 10} -frame_size = {w = 42, h = 13} +frame_size = {w = 42, h = 14} default_shift = {x = 0, y = 0} shift = default_shift diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 0587e5ae6586..ed84360d93b0 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -535,7 +535,7 @@ end function menu.autoboot(delay) local x = loader.getenv("loader_menu_timeout_x") or 4 - local y = loader.getenv("loader_menu_timeout_y") or 23 + local y = loader.getenv("loader_menu_timeout_y") or 24 local endtime = loader.time() + delay local time local last From nobody Sat Dec 28 18:56:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRl4m2Mz5j3Mx; Sat, 28 Dec 2024 18:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRl26xyz5309; Sat, 28 Dec 2024 18:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RBQw29roMPl8p4fc7y/80hMUEI27mUjkidWanoS/Uvk=; b=KFXovJTuxAyHXnt1I2d6RCyLGC3rj2Rj/TyDSLMemjg+lvmo1qrvXH6FO+UtwcoRFCyAOK XVfVBjBpTbtBorIDtQMzwihvE4EK7kF9b3XsqdU25Yd7n/FY9A74Snpe+W9lLHiREXqLRg 3ifuWaZeGqIdOjbkALMsfLeSlHud+Lc+IDh73f+nCqDpfaqiQJzSA4UCB3lw6kK29c6qpC +U774mfONTW9g5IIMtIW9jWbTV7YwVc50Zy1NQU/hPIT0v51q/x86f95mxgMWDKJSgbYWt h8+nz1PTTtiAAOaJ9zTxkD+iCsq/IIMIAOGsbP/aR0/JU3mA63gwwN+pBSrg+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RBQw29roMPl8p4fc7y/80hMUEI27mUjkidWanoS/Uvk=; b=RP83eIOagHQ1D1LjeVVq+NpScTS8jKt2LPSp6A8/q3gWchjp/5LWTX7r/BaGgBnkQa6sAg AZkCUjxE1onYRNg1MnBpnluS1oqK8UkTdWAu/Ud5leZDvW4WCbGUu0WHyPHkcnpIvfw7T2 MFKHFQ4/3P3HL8t0NgfnH6bHs4vM8O7Ne6uUCLwT01mLZwBZACKazD3ZZ2P+ioKpZMIHl+ EL4kIt6WvWBTim1U3oVrSj/shffKVzbt7tMJc4ttUQDUFLhXbVls52/J7YDpUIoNAo4W/3 lWFBrsSOXCk2BtxslXsEfW9AGaqWBT46oq1m9mw36EtyJWuLwkfCOJB1N67H6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412211; a=rsa-sha256; cv=none; b=ghvhxTIFDdGYXgv4qb1q3yHxmqIjSFtWBcU9YQwzBhsMFGVSkcDMFNlC+fzrOE6VDe68HR Ikd0QJKXXlwV2wtf8ms2tRnURcWVzqwvXaBQV9KeYX+l3YO3/dyLswPtc0rpYFllb+qUNE lOXSTEa4cI/jLmBfWR1jCS/i3F+A27ZaHkTcV06Z2jXR9kwA2j4z3Haca6AsQtQAy2AgcC D/jyMEWAfyE4ueTMJpSAZk9tDYXyLIWqa27o0UxiWzq7lNksxcwvh3drkEw9uo3QpllzUV V55/hVX17x8mjDGrwCTCPYqKhQ771tCaKIDTQdY8hVIjNvPlqY/wccOdwuJv5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBRl1bJYzchj; Sat, 28 Dec 2024 18:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSIupWK038845; Sat, 28 Dec 2024 18:56:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIup9X038842; Sat, 28 Dec 2024 18:56:51 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:56:51 GMT Message-Id: <202412281856.4BSIup9X038842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 3463f0d85a02 - stable/14 - loader/4th: Move from hint.acpi.0.rsdp to acpi.rsdp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3463f0d85a02ab5c50c9ad06f5b7e3e0c52e2b44 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3463f0d85a02ab5c50c9ad06f5b7e3e0c52e2b44 commit 3463f0d85a02ab5c50c9ad06f5b7e3e0c52e2b44 Author: Warner Losh AuthorDate: 2024-10-04 04:50:50 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:13:19 +0000 loader/4th: Move from hint.acpi.0.rsdp to acpi.rsdp Use acpi.rsdp to test for ACPI. 4th wasn't updated with the old compat was dropped a while ago. MFC After: 1 week Sponsored by: Netflix (cherry picked from commit 37798b1d5dd12cd5e842b6f99135a2e4af8cf9e0) --- stand/forth/menu.4th | 2 +- stand/forth/menu.4th.8 | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stand/forth/menu.4th b/stand/forth/menu.4th index 87b4efb8c185..cc9b0c867e87 100644 --- a/stand/forth/menu.4th +++ b/stand/forth/menu.4th @@ -147,7 +147,7 @@ only forth definitions ; : acpipresent? ( -- flag ) \ Returns TRUE if ACPI is present, FALSE otherwise - s" hint.acpi.0.rsdp" getenv + s" acpi.rsdp" getenv dup -1 = if drop false exit then diff --git a/stand/forth/menu.4th.8 b/stand/forth/menu.4th.8 index bd066a8b706f..2421fe03be0c 100644 --- a/stand/forth/menu.4th.8 +++ b/stand/forth/menu.4th.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 6, 2013 +.Dd October 4, 2024 .Dt MENU.4TH 8 .Os .Sh NAME @@ -210,8 +210,8 @@ is enabled When set to a number .Dq Li x associated with a given menuitem, that menuitem will only appear when -running on i386-compatible hardware, -.Va hint.acpi.0.rsdp +running on ACPI-compatible hardware, +.Va acpi.rsdp is set (indicating the presence of hardware ACPI support as detected by .Xr loader 8 ) , and @@ -224,10 +224,10 @@ but continue to function as expected. On i386-compatible hardware lacking ACPI support (as detected by .Xr loader 8 ) , subsequent menuitems will retain their associated numbers. -.It Va hint.acpi.0.rsdp +.It Va acpi.rsdp Set automatically by .Xr loader 8 -on i386-compatible hardware when ACPI support is detected at boot time. +on ACPI-compatible hardware when ACPI support is detected at boot time. Effects the display of the .Dq Li menu_acpi menuitem (if configured). From nobody Sat Dec 28 18:56:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRm6bMWz5j373; Sat, 28 Dec 2024 18:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRm4Fgdz53C8; Sat, 28 Dec 2024 18:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IrScMMc8avls4S7nKEPluW82LDzt7eEwmK4sRDphZ+s=; b=oSZfXUhRR2uUWg6L/Xt/bH8lPXsSS4Am0Bl7oMetfiniZw1gK9sB9RMWbCZDendjyV4vGe T6QM/nbryABksBzWhIqxyVFoapL4EXHZc9sDhLKmlsvo9qqrKdHE0Fmlckbn40OfzySSnY EPzibfY/IGjprbMezs1Nk0pij5lMKx5TW4ouIxKAZjrcv+tqVpeTmtUtQ9eWKKi66Ietwj Ze4L4B+T8B3xQk4f+3cAqADNrNI03QwxCfCW5C169HtuGu9t9aeHGC1vNHlRZaEseE+MXo zvZkF+RiinjwToc2ZC/JknLEmHq59v5eetKML4rz54ydL3IpWbW0XU89Uw5Lhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IrScMMc8avls4S7nKEPluW82LDzt7eEwmK4sRDphZ+s=; b=JYIYQrT3uIa4jdaeMMD/fVvv6hkxm57eDwU3OUJ+ki9LEMUrCMkdPE09vQ7H+hremBbBF7 SbS9I/Cs3XPWKvV8XXeVaGRCO0MotLA+pBDPLjV+beWOKGt7fpYrHME3bcmdr3iKQH7+9p Z3xGq8+fDnVjhwJWdInNOuXv9qAWZwZ3f4gptKdVcwmrfTZhgo3MseT/MrJ83hgQf1HS89 oIWFyyZMJ51QMFngb6vmyEjYoE6w19QuugaSsNjwZWsCHh1TTy1H60lenOfxhLJ/RMNtC5 f/S57d2+l/VX7apvR27mJFpRp+M3y25bBGEltA19PPv1uKmRxynnYrqcXkRw2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412212; a=rsa-sha256; cv=none; b=St35FNMmdJc7KQa8aaj7Y9niGANSAZ/95E4BEJxDWiXcOZARBPfRhMq8hHHhnVeDBndpMw 4XSAbgcl82fw7XcvMjTmSNrnHm7k+ADlWpn+wu4H/y2sAyt8GgDX4cYqc2lDkcmh4MaFWG Bjz7jjStncSDlyNTcWNfrG942As/4MUOEPpYqcnQ8epKYE3JbUt3NP1nklnGdw2rgsW9Vu jTiIHe/pVe4fkUTLyyP7N4Coh4QEvUv2YHR9cKEy9fiSxx/igEv8b5Q8mYeZJyvzhd7LqE Yi7sAFjWoLfSqoK0WYStUVFTEGF2tjL2M1Yiwc2k175lulvuRvE4WuK31tTMmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBRm2fhtzcT1; Sat, 28 Dec 2024 18:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSIuqNO038914; Sat, 28 Dec 2024 18:56:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIuqX4038911; Sat, 28 Dec 2024 18:56:52 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:56:52 GMT Message-Id: <202412281856.4BSIuqX4038911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 940984f4c1c6 - stable/14 - loader: Use printc instead of print to fit in 24,80 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 940984f4c1c62a9470312ce4e7401064a3e8c798 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=940984f4c1c62a9470312ce4e7401064a3e8c798 commit 940984f4c1c62a9470312ce4e7401064a3e8c798 Author: Warner Losh AuthorDate: 2024-09-24 16:52:18 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:14:27 +0000 loader: Use printc instead of print to fit in 24,80 print automatically adds a newline, while printc does not. Use printc in preference to print for managing the autoboot message. This means we can use line 24 safely on a 24x80 terminal, restoring some functionality that was lost in 101afbc6ee2f0. Note: we still set the default curosor position to 25,1 in screen.lua, but real VT100s (and successors) will treat any row larger than the pnumber of rows in a cursor motion command to be the last physical row (this is so you can move to 9999,9999 and do a cursor location query to get the size of the screen). Keeping that as is looks better on a typical VGA console. Fixes: 101afbc6ee2f0 Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D46771 (cherry picked from commit 3fb656f8ef21332d96de8097521aaa51ddeb649d) --- stand/lua/menu.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index ed84360d93b0..5820d80532b5 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -530,6 +530,7 @@ function menu.run() drawn_menu = nil screen.defcursor() + -- We explicitly want the newline print adds print("Exiting menu!") end @@ -544,7 +545,7 @@ function menu.autoboot(delay) if last == nil or last ~= time then last = time screen.setcursor(x, y) - print("Autoboot in " .. time .. + printc("Autoboot in " .. time .. " seconds. [Space] to pause ") screen.defcursor() end @@ -553,9 +554,12 @@ function menu.autoboot(delay) if ch == core.KEY_ENTER then break else - -- erase autoboot msg + -- Erase autoboot msg. While real VT100s + -- wouldn't scroll when receiving a char with + -- the cursor at (24, 79), bad emulators do. + -- Avoid the issue by stopping at 79. screen.setcursor(0, y) - print(string.rep(" ", 80)) + printc(string.rep(" ", 79)) screen.defcursor() return ch end From nobody Sat Dec 28 18:56:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRp4jTwz5j3Fn; Sat, 28 Dec 2024 18:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRn5K25z52ww; Sat, 28 Dec 2024 18:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xZzsOLX/Zt9c7vqRB3samfXJJWSKi8odcL8sghIfCG8=; b=Qqf8pvdZNSRaLTTNfY2MpYvZS7Z7+/Id+sRiDcNb92jte6nJs422wAuGQ/mkafGXN4oDrF yg8W4OVB19HHpeTDUmdMtKZactZAmtK4oTbaQg2Bfi0Tn+TvL4aHCqPLxbg4iudNlQDf0k 0vOFHLaitEns2s2irQKxSBYNuD6iKzgBOelKylN+Rog18FxSR9D9DTuVt78Sxuxz/I3g79 EqFyZ1Gt8Z+SutTm1os6VoTdmrw4YarjxSdtG33qZ9wrsVf8jzdORFpOi4Zq450sct+6YR ELlry63wUu6iZD5meM+6QC8lmTWMc+Lor/hEIC9v6cOy0qbtPuaJReXaZozmvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xZzsOLX/Zt9c7vqRB3samfXJJWSKi8odcL8sghIfCG8=; b=tOCLPebVyJaBjoCQgg+BI8KqLrIQn6T81I9jw25vCsS5DUMLTKlQDnJ2rVGjfY3p8Ed9b9 DcN6hdCQT3gGLwziiaWcJjrjyS2yt94wSBT9QARBP34+pmaISPM9CHRjyBNtZ1KfaTOThP /hWLY8tWSXU4MLeXs55V7gsvZRt1V8qBMQ+lA/fFbtvi6BhHXEGlD6m4yQhwCQ6+4sd0C1 0w2cERBrODvUJQgfaNPX0XzVo/Dnhj/K/QX3BeXneuifN58tmPIrxq9BlLGeDSEyXfCJ8A 9IE9vrTLeClBafVdGFMcRhQZmECcSQY0C7zSWQvJrSZyAv7Bc2llVPcclXYH8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412213; a=rsa-sha256; cv=none; b=FS+lxCrCrASsL//uduOHLbt4gVhZtBimV2U0Hb0fArZ8jSvKYyCePLEfs882EI1KXNMKrs 0jit/TR21xLYMbAsIAGfL1Ag865BA2ys3m4Pb4bgeEs5Sy8KZnxL9K1wtBjyPgvx0cToCf 0tUzuOf8rCc12ZEC968JDX/iikkUER49UVEpqq/N2k7KqeKMq8Z1UKiCSQ8RUQFK1rF9qb fAZCRhmHWKzKYeTNQguPvpNBHKClA1eS8fpExeLR3+/3/KsMo9VWnth2UNXXKmuyyuo4fA L5Iq/YkwhnYnEbGUayljUu/PcrvYfkxwkqWxRUyrDKmS6MqWF97WD73zliBTKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBRn3XQZzc12; Sat, 28 Dec 2024 18:56: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 4BSIurYa038975; Sat, 28 Dec 2024 18:56:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIurq6038972; Sat, 28 Dec 2024 18:56:53 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:56:53 GMT Message-Id: <202412281856.4BSIurq6038972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 28e212c74050 - stable/14 - loader: Fix 0 vs 1 confusion for column numbers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 28e212c74050a019b0d0e0a4b0f0d6f222aeaad5 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=28e212c74050a019b0d0e0a4b0f0d6f222aeaad5 commit 28e212c74050a019b0d0e0a4b0f0d6f222aeaad5 Author: Warner Losh AuthorDate: 2024-09-24 19:54:56 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:14:41 +0000 loader: Fix 0 vs 1 confusion for column numbers In two places we use '0' for a column number. However, the upper left hand corner of the screen is 1, 1. Fix those two confusions. Also, fix a comment that flipped the coordinates in a comment (I'm used to the vt100 convention where it's row, column (eg y, x)) and didn't notice the rest of the code uses x, y. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D46777 (cherry picked from commit 604919c47fa4092db08dadd282851afc9cba0a90) --- stand/lua/menu.lua | 4 ++-- stand/lua/screen.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 5820d80532b5..72f5648cae91 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -556,9 +556,9 @@ function menu.autoboot(delay) else -- Erase autoboot msg. While real VT100s -- wouldn't scroll when receiving a char with - -- the cursor at (24, 79), bad emulators do. + -- the cursor at (79, 24), bad emulators do. -- Avoid the issue by stopping at 79. - screen.setcursor(0, y) + screen.setcursor(1, y) printc(string.rep(" ", 79)) screen.defcursor() return ch diff --git a/stand/lua/screen.lua b/stand/lua/screen.lua index 4437a34f95f1..89d5416815fd 100644 --- a/stand/lua/screen.lua +++ b/stand/lua/screen.lua @@ -32,7 +32,7 @@ local core = require("core") local screen = {} -- Module exports -screen.default_x = 0 +screen.default_x = 1 screen.default_y = 25 function screen.clear() From nobody Sat Dec 28 18:56:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRq1l18z5j3Fp; Sat, 28 Dec 2024 18:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRp569xz53Fk; Sat, 28 Dec 2024 18:56:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vm+avwQ4w+Qb4IrRkcUt3Oe7Qvtt17WF1qu+1Eqnkqg=; b=hx0nwguwPryrs3QXYWUA6DMpEAhBk6cci6dWRGkUAvN5RsUbOuTnecRQnEX6oiLV6i81Up PAT/4cvJ8B26WaXiMNoYdYMK0SUcu6qYefja7ZW2tlBat2ATUafdv707ZVFcNPfvEZ5bd0 F2Kg0y+75lv0M8mx1BEP3GoqIqF8D1oLr+CW5MndD8xdzY4eAsNdvO1uu3zB5q6eXZUwxf xNkzNcNIILh233/mSwDHeGV/hztK9WQLiBuoIX42WCigLtsTJfuDslTngT3OTqJtkCn+xL u8WS0tPiuF5WKwAAVYa2STgVHTGQxZU84WaFqIifPVwYepCioIWRlTK+LAgo6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vm+avwQ4w+Qb4IrRkcUt3Oe7Qvtt17WF1qu+1Eqnkqg=; b=kJ+6YtOrtdaAdCS9hrQ6Y73Ti8WFt4W8mEZvyeUd+A8UOhEfm/tZAEqvx8AYC9uS6lWiPM iM1AQ8n9iGscoiLbXpBrRd+vqPdPpAU6kpZ+NB62/m49GWxktGhkO4YN2mR8Ms+wMNT4t5 TZl3KD1Xzvsf6PlR90yFnag9VRYpJbyWR1BIrLdsRfYE2HeDha4dd9Vsn6PfefvpVYy15a Zl2QKhXZKDwl77TeZqWpWLckCb4gPXm7ZkphKTPCOboiYm1FReofCNI8zCQ0BoVfsP3QvM Vg0nJDQVAiOqKhf6umAZ/aEWgWaE5/71rvA3b/D4dNb/uefNflNqQD/IAGyTxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412214; a=rsa-sha256; cv=none; b=kPgAbdFwbQgLg/etStkUOhemLWHYuq1SNbmQSpy2SjdVw19Kl6s0oEh/GYy35XNpU18leQ ScooX3ZTnnD6gieu58aIRgwBeJifL62VOVAt3aKovalIAx7DAQiBEozdd6Q8P2fGOR3by5 VTXbbhrPWylOJfJ/MRU056AZkgnZMIweXi47OUX+05VaTW/wQzWOcXEUdkq5ZFlHuZ2EZu xwhBoTQIKzAE3E+ty920ofU8FoydWXPofwC50fkCk8PfurTNfMK0RnSlO9NFj9Em7JVsq2 180vRh1W1M5Tpuc9lQNZL+7lcoi+Wq2Jl1azRfEveXKJm/t95OCxfPIWYZFjnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBRp4Yh7zchk; Sat, 28 Dec 2024 18:56: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 4BSIusVW039042; Sat, 28 Dec 2024 18:56:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIusa1039039; Sat, 28 Dec 2024 18:56:54 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:56:54 GMT Message-Id: <202412281856.4BSIusa1039039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 708c8a926a72 - stable/14 - loader: Use Cyan instead of Blue for some menu items List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 708c8a926a72e51e31168afbd6ee051e1173dd82 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=708c8a926a72e51e31168afbd6ee051e1173dd82 commit 708c8a926a72e51e31168afbd6ee051e1173dd82 Author: Warner Losh AuthorDate: 2024-10-11 19:06:24 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:14:58 +0000 loader: Use Cyan instead of Blue for some menu items BLUE often translates to DARK BLUE. On BLACK this is hard to read. Instead, use CYAN which looks good on both black and white backgrounds. Discussed with: kevans Sponsored by: Netflix (cherry picked from commit baa7e9cd3083ccaed8f26e9ad786ff9657ab85fc) --- stand/lua/menu.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 72f5648cae91..2d92be3b7c6e 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -122,7 +122,7 @@ menu.boot_environments = { if is_default then name_color = color.escapefg(color.GREEN) else - name_color = color.escapefg(color.BLUE) + name_color = color.escapefg(color.CYAN) end bootenv_name = bootenv_name .. name_color .. choice .. color.resetfg() @@ -342,7 +342,7 @@ menu.welcome = { name_color = color.escapefg(color.GREEN) kernel_name = "default/" else - name_color = color.escapefg(color.BLUE) + name_color = color.escapefg(color.CYAN) end kernel_name = kernel_name .. name_color .. choice .. color.resetfg() From nobody Sat Dec 28 18:56:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRr4cYZz5j39W; Sat, 28 Dec 2024 18:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRq72Jbz5376; Sat, 28 Dec 2024 18:56:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VU35OLp4zaOGadrUB/c0JPwypcjcCFnKOKPSA5qTwp4=; b=PJo0Jo2IjKcjJHYQHxVMPrGaxDfAc74kLYzmvCu5D5rgryV9S1bAiPZx4yNi0frmK4bXLz 1aIVMhL3ElCoCRAcXhm080bZ5dnrINc0Nw8uJNXbTb8FcBSRVNYLX0F9toNvt7+rTCXZEW fdKEMID+ruoYQq5CPls2nPiYHFTdzv1EqJ8VuGu0ii4CEK1CY2r382ZTjqd+F/LqZwA14+ 5ex6KzcT8vdKuixWsQ0N6g43pEX9FB/7ol+TVzit2+7vN3pp6JZ8L6LhaZuXK0uR4mrLRE CYqg8sj+DyuXJDJPhbPvQFTvG9MgPaPd8QI04jFfmOmblsun/QVJvygaFv0INA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VU35OLp4zaOGadrUB/c0JPwypcjcCFnKOKPSA5qTwp4=; b=Y4JMjWvlHQBK6BDH5AcKiOUwex1ZVfSsP5Qbupx+rYKZ0nJ8qxaYouxF/ucJ2ygnaG97OL Q4QsrXrUJzpiNeRC6FI1K9zLkkxhoQFbb8QPrT33B3wi3fHtvbA5gUhwEksln5/rv0aaYO u0KXS2MJdl0Qmu9Kg7mpF5LuHQltSI1LPG47eEy3PvKEQqtFyqSpq/OiBR2xR55K+W1FHe dTLpFK0Ld4/o9EDWCLAZBWPv797cnk08pwwESTgBPTblxOiC7zJAbxtzfTRmEyKHVBpO3C Wk2wlw7PjIKRhpws/6zohQNBRtbKskC9TNWfOeVzR+06zdpx7WcArH/6jmhJ5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412216; a=rsa-sha256; cv=none; b=NVqC6rPQqN5DdGFvMSq/G2TNxJDMjTsfhc+0eXFmwLnJ6G3eVJ1P/AvTOJPA6qd4OTqeh5 GPHHpqQHBTuqD2n1hDxjY9Bc3fn+DozZ3/gIQ9AwtyXbOUomJ+bLtr84cvmxFCqsdPC34n 60oa4r9DGuM5lw/nwePVNMUVH4Cvsz84WkllOAOFYTjmIURNPEILOZm1kM2pkxB9xVDr+p 3xw09LjevSKutKLykhQLGd0QLqsRdB+IBK3uA62c/ffxTPvm8KLpZbzbaNGnWImgT37U47 GbmN9V8NRHJidXiVsv/5Q/kQYKfGzM5FtsoBM2xuQK0a1nTw10ofL2h59MsG7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBRq5YM7zcjL; Sat, 28 Dec 2024 18:56: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 4BSIutRK039081; Sat, 28 Dec 2024 18:56:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIutV9039078; Sat, 28 Dec 2024 18:56:55 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:56:55 GMT Message-Id: <202412281856.4BSIutV9039078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c2623a73ae0c - stable/14 - acpidump: Move to acpi.rsdp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c2623a73ae0cb973ac6fca9052f6b15046351438 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c2623a73ae0cb973ac6fca9052f6b15046351438 commit c2623a73ae0cb973ac6fca9052f6b15046351438 Author: Warner Losh AuthorDate: 2024-10-15 11:05:07 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:16:12 +0000 acpidump: Move to acpi.rsdp Switch from the long obsolete hint.0.acpi.rsdp to acpi.rsdp to get the root of the ACPI tables. MFC After: 1 week Sponsored by: Netflix Reviewed by: andrew, markj Differential Revision: https://reviews.freebsd.org/D47079 (cherry picked from commit 5d3fb72667e5794bf16756e00a87338f4acb7f90) --- usr.sbin/acpi/acpidump/acpi_user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi_user.c b/usr.sbin/acpi/acpidump/acpi_user.c index 4b9209e53507..daa4118089cf 100644 --- a/usr.sbin/acpi/acpidump/acpi_user.c +++ b/usr.sbin/acpi/acpidump/acpi_user.c @@ -42,7 +42,7 @@ #include "acpidump.h" -static char hint_acpi_0_rsdp[] = "hint.acpi.0.rsdp"; +static char acpi_rsdp[] = "acpi.rsdp"; static char machdep_acpi_root[] = "machdep.acpi_root"; static int acpi_mem_fd = -1; @@ -172,7 +172,7 @@ acpi_find_rsd_ptr(void) addr = 0; /* Attempt to use kenv or sysctl to find RSD PTR record. */ - if (kenv(KENV_GET, hint_acpi_0_rsdp, buf, 20) > 0) + if (kenv(KENV_GET, acpi_rsdp, buf, 20) > 0) addr = strtoul(buf, NULL, 0); if (addr == 0) { len = sizeof(addr); From nobody Sat Dec 28 18:56:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRt5Vylz5j39g; Sat, 28 Dec 2024 18:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRt0cLGz53GH; Sat, 28 Dec 2024 18:56:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePJ52PNgsjziKczverFxooEFS0d91RZX8lmsGpjHuaI=; b=RbrQWa4aeBO15O/nwhdKgLEUNhPuJO59yCwoWwDQAxdnPaV6TEdn2dR61hFgC9Nkqh2xhC ClqC5zl8bgi2cLjTWmgZTJZZECiWZsp4en7ZwTa+74L/8P7LSWQbqG5sJHCIOAsH8gpd4C 1yqkiadH7dmbASsqJCP0wJ25yvfBOuOMHSo+zb8FZOoU0uGEOnzem09bmhUKtj+ePELdor psB6JZjWdGQeStd60P2Wq1RIVDb3pm4TdnWlUlP5dXTpkGsMi2+WEifheqHUTMLQ3c49NR +3qEJ7hYLjuI4aiSqYiRnNnmkXV5kWT3jt1LfvLaWT88l/1Yr/HXs5xQJ+VSIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePJ52PNgsjziKczverFxooEFS0d91RZX8lmsGpjHuaI=; b=j5wvoLIduTJv6fUUqMc2m4u4eZkFUiCdCZBmHiLdzpwm3+R3BvRa7AapUrdQBPu8DbVNf1 +okUmayfDbfIS/5DypmkzmH4G+5m7mPN7Ymzf9b2keP2XbfLfxWpBx1c8TvUY75qvkuWTC kUw1dAVXxkzXIVMyZ6O+soEQfCxDFDfEfGOh6pWL/96wR9oXm14yh7aIllk3Cp0gE3bqqX Xmj8FLBZ8d9s6IcliJuJCWX6eqRW+aBHn2Fe+QT9OZV6vfu7E8rzsfCjzN7UNWRq089KWg sugsywrr9XqC42m9bNMCJsVG3QK1VIlk2j3oBIltGDgweW/aJqjScHuZEPyvpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412218; a=rsa-sha256; cv=none; b=NgSzuVTliZBUW/S4AMeluq4QofVh9t5MyGt90wSDMHn3v33LNqNOTWEH5JOUxrZ0dJZdK7 BYcVbDGdof4r1k7UcjLsA8kmwHHlN28+3QVR4NE3JIXryKCgDF4Sl66/drXlcI/+wOul/U 0Y9YuOcgbqHPXIn3k9nmdGPFfcKXeThIXoA/gDEFYGq5dOnukuAUv1/YZ5D6ybKON6y2Nh BTd5IRJ8vxoml4evlGajj5HmWjPPLo6hVQJo5h66VjWZrwVbXEe5NJ204O2julfWCkIZAM K7j7gDnTuyZdvhG0cweuMRQmeT2JIG1OmcUjB6UObLnTt8FfkFm5r7Pla2toAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBRt0Dvjzchl; Sat, 28 Dec 2024 18:56: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 4BSIuvDv039172; Sat, 28 Dec 2024 18:56:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIuvwC039169; Sat, 28 Dec 2024 18:56:57 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:56:57 GMT Message-Id: <202412281856.4BSIuvwC039169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: daa4c9fc318a - stable/14 - sh.1: update history + spdx + linter error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: daa4c9fc318a1539e8075892df7099d7fb73906a Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=daa4c9fc318a1539e8075892df7099d7fb73906a commit daa4c9fc318a1539e8075892df7099d7fb73906a Author: Alexander Ziaee AuthorDate: 2024-09-29 08:14:36 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:17:16 +0000 sh.1: update history + spdx + linter error + increase history consistency by adding "first appeared" + remove a skipped new paragraph macro to quiet linter + tag spdx MFC after: 3 days History source: www.in-ulm.de/~mascheck/various/ash/#bsd Reviewed by: mhorne,imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1440 (cherry picked from commit e2a72442bd57c1373c30fab945fbfc86464f3782) --- bin/sh/sh.1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 1a0275a396ea..b220cf550f52 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -1,4 +1,6 @@ .\"- +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -1076,7 +1078,6 @@ or the end of the command. .Ss Grouping Commands Together Commands may be grouped by writing either -.Pp .Sm off .Bd -literal -offset indent .Po Ar list Pc @@ -2915,7 +2916,9 @@ This version of was rewritten in 1989 under the .Bx license after the Bourne shell from -.At V.4 . +.At V.4 +and first appeared in +.Bx 4.3 Net/2 . .Sh AUTHORS This version of .Nm From nobody Sat Dec 28 18:56:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRs4n4Jz5j3CY; Sat, 28 Dec 2024 18:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRs0Rhnz537G; Sat, 28 Dec 2024 18:56:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bw3+fikKMw1oxKy/PBv+5fBrb20QUCTWWfTMiJOCp7A=; b=CoFRd2DOQ9D1HGnR0R3k5KYXAdZBvhp/ybPKVXMODP/4KjOp9NZIv7EjNyPOsv8PYzLXuj F1eBZaOuigihpQOMQoBXz+xii6+V92NN3zTZMoF8AV3ZrmA6g+PSw87dccZvDOIP3S2207 91JHq5BTzX5qmRLtxscp57dVjYzGHcwOTSa5mRaC+0q+3CCval74M1dvFSHmrY7b6Hgl7Q WDOl2FWblXFI/W0F7YsVpH+/q6yUPiBeJgZfBkSJzpQ03NXJBvSajOklW/1Wg12NYPkR+y bj6oN17jpjFZG1ihHV81trNQp+9omrqyweef8M56m0SogL1/IIozG3OKALwgLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bw3+fikKMw1oxKy/PBv+5fBrb20QUCTWWfTMiJOCp7A=; b=bpjqMcdS9NM749HqzROa+LuuOF6sliPZbNHz0CJzDgeSw2TgVhnK9K8XT0bg7RYfKz07l3 /2sdb0x6wlpUs6gFEDW2R/6zzfPXp8CuszSBeFxYFva6pnh0O/U9J1w3ivr9QALh5ocUjy hFexcDd7IUIVo/RqUb8abgIzgdffzsz3Zz0e/1WsR5U7JKQFiU4Ov5lZBkO9rlpR3W3qEw ZlbR6BjYWE++mNUH+JjqjP7W19uiV4IV1Rg5pvQlRsJra+uSqCTXGigSgp7PxhKh+nhg/D jnAaM2tfmvGgTxA2p5ExISBisap4eCKwxUDCANxhr8sHqyrkhdD4VUcJlxvPWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412217; a=rsa-sha256; cv=none; b=r52LLGH2yMLM0GK/nbjg3RBNK9qTxUe+briJAKxpYUC4rTFpywRfydDeWqzczDsUOOsiCm uvdALnZVznzcuSZ1sRSLIXNEmgffwh/meHgIdhxXOayd3D6B+7pDQX5OcUbUIK4BFlWt9E 1DRGZ5zZfSsP0nGN5NEWxYC3JCPKAD0rcw3ec4X9EuhJ6mPUxUX1gBvnLcavaaCMR2R65/ rV0r7HrDCtwFFvCG8HDOTq6Occ8dtOmq33h8QFeVz88Ja3gxMJoz28BhZDnyQqBlzwUlhN 4fJTkQyV8SMAhFkFU/DemMq3OtzzH+lNu1X9vz2JtYiW7M4HJk2hkSmbwcmi/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBRr6c9wzcWP; Sat, 28 Dec 2024 18:56: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 4BSIuuLI039117; Sat, 28 Dec 2024 18:56:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIuumX039114; Sat, 28 Dec 2024 18:56:56 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:56:56 GMT Message-Id: <202412281856.4BSIuumX039114@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 840ca63582e4 - stable/14 - vt.4: document kern.consmute List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 840ca63582e42726f2f796d850eb343bf264e963 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=840ca63582e42726f2f796d850eb343bf264e963 commit 840ca63582e42726f2f796d850eb343bf264e963 Author: Alexander Ziaee AuthorDate: 2024-11-08 00:51:50 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:16:58 +0000 vt.4: document kern.consmute MFC after: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1521 (cherry picked from commit fb91b9858080143b56ba637ab3c8954f3f94694a) --- share/man/man4/vt.4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 3416ce0cca78..bd583abf8a98 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -54,6 +54,7 @@ In In .Xr loader.conf 5 or .Xr sysctl.conf 5 : +.Cd kern.consmute=1 .Cd kern.vt.kbd_halt=1 .Cd kern.vt.kbd_poweroff=1 .Cd kern.vt.kbd_reboot=1 @@ -302,6 +303,8 @@ prompt, set in or changed at runtime with .Xr sysctl 8 . .Bl -tag -width indent +.It Va kern.consmute +Disable printing kernel messages to the system console. .It Va kern.vt.enable_bell Enable the terminal bell. .El From nobody Sat Dec 28 18:57:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRw4Lz1z5j3Cb; Sat, 28 Dec 2024 18:57: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRw3K9Gz535b; Sat, 28 Dec 2024 18:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UGfa8hacCCFPmW2zlc/b9i8YMDTz8+lP+hf2ARHZybg=; b=ZLT98tCLsoVnFmZREOd8bgL1Ahy0JBwYwLJL1XDIHOj2NTD9pHsuY+0tzYJyv6iT4EmY2B +5AXR3oCpFlcTmzrtcwl1VtackAiky7XPRNcSzE4WDg6qWQoIKPnt1ZdGvgaKke8yL73mp 5K9xNv3YlNACVwWXhnNS0EdkM3c5CxO/ECax0kyUSIYPEmjbjtnhcUTNyW0w/q+Tc6IMQF /Jm0iWWhN1X39qG1AEqYwLF3VDzwoFHcdHwcEH3GlYYaSq6/nFLodiWabTY+rSD85v5SZf qHkeB+vchHC3RKLEUElHzeDaRK0rfZHZOIALca/yhvrZ+N3S2bfx7wpOet0dEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UGfa8hacCCFPmW2zlc/b9i8YMDTz8+lP+hf2ARHZybg=; b=V/fIieXSbupTCsTpP4Ni530+T5i4hq2o6KMjvAUFKLDkHQmtj6URK2/OIFKEmV4AZljoKK 6/fFFHdaLKdMnhj2iZhrNEW6j6n+PLn/26o7+k646j1iJNY4ghZMl9Vw5hDUISTVdGAOqI +FYZROxiwrzKbwhZrdtVV9d/9Zcxinfrh2sCu+dddQBuhWHYM5egJR9f7XyoXQlwc6YmIf aOfgvYN8Zm8+/04yEAwDiLT/EkzYXSEqJPNYvCJ0rj07AcXfZ4vF8h5LJsZ+SZCNcdtGLV W8IQ1zKtThJVkildD6diHqED/gyNPN2rIrqX0o1kZl8sqYniiKK/RxVxMsH5jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412220; a=rsa-sha256; cv=none; b=Jah1MDQKF57OxB12Vpj9z+KG+35lMk8tj84uAHXn567gocR2ymmV/RYpkfGMLGCddfr6aV lC4Rcj4E+7yfXZc20BbLJxI14YX1UdiUqWBQUpuOeXhWHUHJzFSnDOew898JHuvpRMlROL pl/qfxGko3UZ2MJrdbzkMKvvVUDa18P/AZzrA1bGLJre7seXHLwNqE29fuZzgtafW1hE2f OirbvItksOopQBEaJKz19djvkmu9bhI3pSx6D/Xtdwxqj5z7nOQXFbwAQ+8jLPTQ6ipejr dB6uyxsk9vDBef4DpCePltM5hwWbfK4fy7j7fbJbEdi/GROgZsvVp2aO3HcqCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBRw1zSZzcT3; Sat, 28 Dec 2024 18:57: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 4BSIv0nw039279; Sat, 28 Dec 2024 18:57:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIv08Y039276; Sat, 28 Dec 2024 18:57:00 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:57:00 GMT Message-Id: <202412281857.4BSIv08Y039276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e4520bc1e284 - stable/14 - nvmecontrol: Fix minor usage typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e4520bc1e2841c8b914101d833372cc1d93daf0e Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e4520bc1e2841c8b914101d833372cc1d93daf0e commit e4520bc1e2841c8b914101d833372cc1d93daf0e Author: Alexander Ziaee AuthorDate: 2024-12-06 16:13:53 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:17:44 +0000 nvmecontrol: Fix minor usage typo PR: 282930 MFC after: 3 days Reported by: Gian-Simon Purkert Reviewed by: imp, jhb, emaste Differential Revision: https://reviews.freebsd.org/D47726 (cherry picked from commit e7aec3ccf759dcd3fe56ae2bdbec92839c166160) --- sbin/nvmecontrol/format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/format.c b/sbin/nvmecontrol/format.c index a56027089ff5..ea1e7877dc34 100644 --- a/sbin/nvmecontrol/format.c +++ b/sbin/nvmecontrol/format.c @@ -74,7 +74,7 @@ static struct options { static const struct opts format_opts[] = { #define OPT(l, s, t, opt, addr, desc) { l, s, t, &opt.addr, desc } OPT("crypto", 'C', arg_none, opt, Cflag, - "Crptographic erase"), + "Cryptographic erase"), OPT("erase", 'E', arg_none, opt, Eflag, "User data erase"), OPT("lbaf", 'f', arg_uint32, opt, lbaf, From nobody Sat Dec 28 18:56:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRw05Tyz5j39k; Sat, 28 Dec 2024 18:57: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRv1lphz537R; Sat, 28 Dec 2024 18:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9QK4e7JClIk1kVxLNR5lscBECRbZocksF0UO93H7JsE=; b=YauAVuIJaSnhl/zwKH5AVO7OX+jCPmkBf9fD/RIkpDopyLdpCaA1Zu6xNlJGQNiaSJn6Kb XvzXao6FcE7jre2eF9NipNID/CBRdoAeJVsjRndqRdFD3/zasdNIi8wdXXjTU2tsQAKrUZ VKY7X61ZOZfJdIHMDBnIlJaBAbrtkM6NLXTigd38RKXZ3MmiL8+s4yb0kG/KGzR0Z3x/Gx eeiSSzpYm4a+34plh4mvGVM1EsCSDrfCA4kX4hZ7BA6LIsH4WcmqkJn/JHG4BfGqnEmKmV F55CIVWt5j4gNlIIcjgdEsl3phkAu6PSI8/n1y1tb9GpH+LeicX5JoCALA7aOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9QK4e7JClIk1kVxLNR5lscBECRbZocksF0UO93H7JsE=; b=Cl3YQ8CIsLApoDOU5G08b8tnXAEjqcIH8nFeoxrqqPUk3Wssw/i73nUych33Hglf7hJOHQ DtbmBuNdayD9WwriDcfUnNiK9ejpEoXGdgZXQOvhmQbFv6Py2K18qsX3Qn0Cl0MKFOo1rU /U1MKKJGkLV7/yjmxjsW+O+fGHvwFdTq2LVLf2q1ikWJ2yFVEFJ4i3qJgp4XWCA2JLTbUT vCxRoHW7WBTcVJbJtJ4umMmZ/qOO4Ijk7Kn9JJoWjxVjAm6/KzoQGbIHrJhw5uVPH7/egS r5uWbTSfa6LRRj6dZmCfp6iremkH/xRS175JsXb7yBLg+YUaRDX+B9UCbd2PEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412219; a=rsa-sha256; cv=none; b=V9jqQsUQcyASwlGxljhmhly54T1kdhnGgrqf15EPbEC1rMHuEXA2zAT9dBNFgPVG67Lsh4 d6UrJnktlt6a57Er49pBFeY/D+v9CtQ3RxvFkSIy/zHyetdS3/B+nH0WDd53ZJqZxoEVHV oKsfK2S7jbREj6fMc9SV78N7IFjLHABX8RAB6pJadGcobwh4yGKTD8r8w3bGlSFxvGYTf3 3PWyXkJ/pnvoFtzI2pEu93PsppWu4rVtLNJffsxEMJjRAgA+idTzS5rorehmE3s9qrnrXz zVF+n70FqY9tRdilh/LqRxdYayj1XAMFeJXNUZ1+/NwnxtdKvs0HKclHj7jVSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBRv10rlzcT2; Sat, 28 Dec 2024 18:56: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 4BSIuxGq039227; Sat, 28 Dec 2024 18:56:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIuxlF039224; Sat, 28 Dec 2024 18:56:59 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:56:59 GMT Message-Id: <202412281856.4BSIuxlF039224@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 267717c5dbd9 - stable/14 - cu.1: describe better + tag spdx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 267717c5dbd977a7896b06367e65f254938eb902 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=267717c5dbd977a7896b06367e65f254938eb902 commit 267717c5dbd977a7896b06367e65f254938eb902 Author: Alexander Ziaee AuthorDate: 2024-09-14 23:26:16 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:17:27 +0000 cu.1: describe better + tag spdx Preserve over 40 years of "call UNIX" BSD heritage while answering "one line about what it does" e.g. "how do I get a serial console?" "% apropos serial" MFC after: 3 days Reported by: imp Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1423 (cherry picked from commit 4d12c7b9df660b15580ff3b07ef5570d1cab958a) --- usr.bin/tip/tip/cu.1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.bin/tip/tip/cu.1 b/usr.bin/tip/tip/cu.1 index 8d6fae3be8fc..1852d65d98cb 100644 --- a/usr.bin/tip/tip/cu.1 +++ b/usr.bin/tip/tip/cu.1 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" $OpenBSD: cu.1,v 1.3 2006/06/07 06:35:59 mbalmer Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 @@ -34,7 +37,7 @@ .Os .Sh NAME .Nm cu -.Nd call UNIX +.Nd call UNIX over a serial line .Sh SYNOPSIS .Nm .Op Fl ehot From nobody Sat Dec 28 18:57:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRy6hVZz5j3R4; Sat, 28 Dec 2024 18:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRy4Q7Nz53H4; Sat, 28 Dec 2024 18:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vqmj+H5ZuLX4GzHQkDkKTs/WbrtQVittAiFd+DbKmww=; b=bXUcWNDcV9UHxLsB4qhJodFv9BkWWgGBx/cBk9eKIyQkddzKIctNCbk7WnWgWhjfY0nj16 93SaM0ylxfYRlxNyrQ43m3nOup0JqHlX0U6CBieUDpTuz4GzLBpND0kGdrFU2Q8B4BSdB6 TxSF/4Snk0hChDx6zf/K5ps1WuaK6iKRnWk2K1XmE33e7eut9F5Ik0EPtm7mEqMsmT65fA yI7snrjrKXaldRzihcFTM0hA8BAjRpHhvoddcF7FGCZZFwTmjBbwKXB7amItVZ2qQfXGgj dHXUfOgG3hQYL+5HNbbUWk4sTQLYl91E9xoZuJisyPdY0DjYVTOttPuaW9RZfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vqmj+H5ZuLX4GzHQkDkKTs/WbrtQVittAiFd+DbKmww=; b=qpGCp4wxpZEWPiC/Nld3gNosP8Q8gDjKfblSsw6jomlyXy41E+A8YL66ZhbAXUGADGKFLg tbO6mcyu1J5gcKh5yFTo099HFgPCnI1WJZCi43gJh/uoiblDyFz+1VgN8mYPxIdTWD8mHo MW08umGCUw76sEyjaEI+Z7yX5hyskJ9IpUJYB2K/c7l04MjSCoH+ulslOB4kDpFXwx9vC9 TLN6oleA1z6VKCCo7e0KWoib12kGkFTu3Gsllgj4mvpwHN0lT3GdwOS6WobzWT7xkqwPUT SNOqWFoMUUTITjMQfOTYyzwYHaIpCPxtNaKDVgUgyFSmOEDrGV5dPG64Qnmo+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412222; a=rsa-sha256; cv=none; b=j2cLY7j9Shmp9vX0E7Vull49mRb/PIArAqcfXJ/BySgetSNjMu4eVcw65z6mS6l/xP15ys 8AA3IauL4zc+IiJgAWBgrEqjqaTSZRsGYZn/h4rV8SqukbB7aW/4d59gsWZFT7yruTf2e+ XvmLXF9Zc8AVt2+hPtkgyuA8ThpXEnuJ6Bm+XXjro6qmG3FSU4bqzNm+GKSsH8XqXaO8c6 r37Jrz1zlLMfX4SbGAcka5g/1mhN/q6gnSG/WRx+bKEyskltxAnG1R1g3lgmYJsSiq1pxc 8Sx5t242rqnJmBEG3fu6IkHCIAOzhMp2qx8hixeOJIjekpAtKeTY7ToU45sWOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLBRy40WVzcjM; Sat, 28 Dec 2024 18:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSIv2H2039372; Sat, 28 Dec 2024 18:57:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIv2uB039369; Sat, 28 Dec 2024 18:57:02 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:57:02 GMT Message-Id: <202412281857.4BSIv2uB039369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 8a0aec92d7b4 - stable/14 - uart.4: describe better + spdx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8a0aec92d7b447c64e236f27b997286fce4f6d7e Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8a0aec92d7b447c64e236f27b997286fce4f6d7e commit 8a0aec92d7b447c64e236f27b997286fce4f6d7e Author: Alexander Ziaee AuthorDate: 2024-11-16 16:39:38 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:19:48 +0000 uart.4: describe better + spdx + add `serial` to description (search keywords) + remove redundant `(UART)`, `for`, and `device` + description is now one line on standard cons. MFC after: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1531 (cherry picked from commit db512bb30314326a0b2cfad3f9094dd830744777) --- share/man/man4/uart.4 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/share/man/man4/uart.4 b/share/man/man4/uart.4 index 90ab2fd4cb57..6e17e00023ca 100644 --- a/share/man/man4/uart.4 +++ b/share/man/man4/uart.4 @@ -1,3 +1,5 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2003 Marcel Moolenaar .\" All rights reserved. @@ -23,12 +25,12 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 11, 2020 +.Dd December 5, 2024 .Dt UART 4 .Os .Sh NAME .Nm uart -.Nd driver for Universal Asynchronous Receiver/Transmitter (UART) devices +.Nd Universal Asynchronous Receiver/Transmitter serial driver .Sh SYNOPSIS .Cd "device uart" .Pp From nobody Sat Dec 28 18:57:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLBRy0Fhnz5j3G0; Sat, 28 Dec 2024 18:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRx3zF5z53PR; Sat, 28 Dec 2024 18:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pct0rA+Pbl/xROb6bZmnnR94hXytDm1xf0YTG+qz2mU=; b=b4sv/2vIT7rij+0mYHZmxc9lto2/MU91IK5/h1S+TEcgkaQ6dRr0Z5YABhvQ85U8HDuZGy nW7gTQgMWjbWyKwpwCxJrkU5p06lbrm8ksEgW1TASrMUv0VQFs4/emDsnsJGpufQNntdWQ t4QKXQlX7eO3dLrloHDYMQLCVGGBN9Ob71/QciQhJODuRSGn0QRV1CNIVYuOlOnms8Uzhn BBzpN/rwAC4lx427g2yXemm6Nk7TgtM2y3PkjqxStRzVPyhAReeVle+Ozy7UUTFOYKOIDz lx4AGisGL3QDi8dtPAhpvZqGO3AiNwNRvEElezPxHBnCqlnHKAHV/ey9/MpTFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pct0rA+Pbl/xROb6bZmnnR94hXytDm1xf0YTG+qz2mU=; b=NZ66FKkP+lEAroiaenaKmEehNckMdozLE8Ju4dRO+W0ckxebiqlBamqag0ibGCRAfc/rXM Om9ivRQ8XeSRWFTwjGry0Va6kMJmNptN0Mxb1tJ99gWtG/34igyk42EQPF0MO92ve2tocO J5Ffeb/XCCdn0tsZZ4Lvh57gdaCLNa37SAWwRU2iclz1IL2FzpkBHIm92Mp/MBHBjVs0v4 SUVMler16MAlr4SLEQVebjOa5eCqf2oQ/m0ZT8+vCkodETsRzcZYe9tJQGAxfXR8fULH4o Kbzelv8EOz93bDLZcU+ECiGwh14ibNNXd8sdSU4HU/ZBG0TQXXgmfn2lKJb2kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412221; a=rsa-sha256; cv=none; b=tW45eJcnlOt4IGFuFQze+iDg5M3xJAZX2rAEbECt4+6yWWX5P6zIvEQSHQneYUK1m0jXGM WkRHEe3qST3TOESZoWehE+OE1j9yN2svkbv9nSJHvFyNk79YY23JZy4Dl9OsJyVUkErBa6 pCOPMWKmvSx2GdYE6Aj2SO80lezrR+OtXU/li+A+rbphwA1Tt2EVLRYiqpSWHuikMaXHud DoP+NBt7DbAorwi6iphIX2vYCcmYmSdoOh+2MvakFCngg3RXMbCWM1eQcge9qS2EHQErrZ wWudFEaX5lzM+szJmcELmuVJGnwv4VuIOF7qTqNlowK1Zadhgfwl5cjXDg3V+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 4YLBRx2jtHzc13; Sat, 28 Dec 2024 18:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSIv1Ts039315; Sat, 28 Dec 2024 18:57:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIv1KX039312; Sat, 28 Dec 2024 18:57:01 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:57:01 GMT Message-Id: <202412281857.4BSIv1KX039312@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: a3ce16174787 - stable/14 - u3g.4: Fall cleaning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a3ce16174787c0aad6d410c515487820b1ae8909 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a3ce16174787c0aad6d410c515487820b1ae8909 commit a3ce16174787c0aad6d410c515487820b1ae8909 Author: Alexander Ziaee AuthorDate: 2024-11-07 18:01:50 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:19:06 +0000 u3g.4: Fall cleaning Many people come on our social spaces asking about router projects, can't find info about supported cellular modems, and say they're sticking to $other_OS. Thanks to the fantastic talk by Ian from Metify, I now know that is not true, we have them and they work great. Therefore, tell everyone else by massaging this page for discoverability in the manual and the release hardware notes. + Document description: s/datacards/cellular modems/ for apropos search + HARDWARE: s/adapters/cellular modems/ for release hardware notes + move things which shouldn't be in Rel HW notes to description + massage things around for readability and flow + tag spdx + xref supported connections MFC after: 3 days Reported by: allanjude (u3g can also provide GPS port) Reported by: Jared Trout (cellular in title) Reported by: emaste (specify mpd, editorial style instruction) Reported by: Metify (modem drivers exist) Reviewed by: imp, emaste, allanjude Pull Request: https://github.com/freebsd/freebsd-src/pull/1519 (cherry picked from commit 53484f516ac4ce3bf57a8c52c094ae67d79312d5) --- share/man/man4/u3g.4 | 66 +++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/share/man/man4/u3g.4 b/share/man/man4/u3g.4 index 234b5a4b3277..51c883b8378e 100644 --- a/share/man/man4/u3g.4 +++ b/share/man/man4/u3g.4 @@ -1,3 +1,5 @@ +.\"- +.\" SPDX-License-Identifier: ISC .\" .\" Copyright (c) 2008 AnyWi Technologies .\" All rights reserved. @@ -16,12 +18,12 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd February 4, 2023 +.Dd December 5, 2024 .Dt U3G 4 .Os .Sh NAME .Nm u3g -.Nd USB support for 3G and 4G datacards +.Nd USB support for 3G and 4G cellular modems .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -39,26 +41,46 @@ module at boot time, place the following line in u3g_load="YES" .Ed .Pp -If neither of the above is done, the driver will automatically be loaded -by devd(8) when the device is connected. +If neither of the above is done, the driver will be +automatically loaded by devd(8) when the device is connected. .Sh DESCRIPTION The .Nm -driver provides support for the multiple USB-to-serial interfaces exposed by -many 3G USB/PCCard modems. +driver provides support for USB-to-serial interfaces +exposed by many 3G and 4G modems. +The supported adapters provide the necessary modem port for +.Xr ppp 8 , +or +.Pa net/mpd5 +connections. +Depending on the specific device, extra ports provide other functions +such as an additional command port, diagnostic port, +GPS receiver port, or SIM toolkit port. .Pp The device is accessed through the .Xr ucom 4 driver which makes it behave like a .Xr tty 4 . +.Pp +In some adapters a mass storage device supported by the +.Xr umass 4 +driver is present which contains Windows and Mac OS X drivers. +The device starts up in disk mode (TruInstall, ZeroCD, etc.) +and requires additional commands to switch it to modem mode. +If your device is not switching automatically, please try to add quirks. +See +.Xr usbconfig 8 +and +.Xr usb_quirk 4 . .Sh HARDWARE The .Nm -driver supports the following adapters: +driver supports the following cellular modems: .Pp .Bl -bullet -compact .It -Option GT 3G Fusion, GT Fusion Quad, etc. (only 3G part, not WLAN) +Option GT 3G Fusion, GT Fusion Quad, etc. +.Pq 3G only, not WLAN .It Option GT 3G, GT 3G Quad, etc. .It @@ -70,9 +92,10 @@ Qualcomm Inc. CDMA MSM .It Qualcomm Inc. GOBI 1000, 2000 and 3000 devices with MDM1000 or MDM2000 chipsets .It -QUECTEL BGX, ECX, EGX, EMX, EPX, RGX series. +QUECTEL BGX, ECX, EGX, EMX, EPX, RGX series .It -Quectel EM160R (see CAVEATS) +Quectel EM160R +.Pq see Sx CAVEATS .It Huawei B190, E180v, E220, E3372, E3372v153, E5573Cs322, ('') .It @@ -83,26 +106,9 @@ Sierra MC875U, MC8775U, etc. Panasonic CF-F9 GOBI .El .Pp -(See +Many more are supported, see .Pa /sys/dev/usb/serial/u3g.c -for the complete list of supported cards for each vendor -mentioned above.) -.Pp -The supported 3G cards provide the necessary modem port for ppp, or mpd -connections as well as extra ports (depending on the specific device) to -provide other functions (additional command port, diagnostic port, SIM toolkit -port). -.Pp -In some of these devices a mass storage device supported by the -.Xr umass 4 -driver is present which contains Windows and Mac OS X drivers. -The device starts up in disk mode (TruInstall, ZeroCD, etc.) and requires -additional commands to switch it to modem mode. -If your device is not switching automatically, please try to add quirks. -See -.Xr usbconfig 8 -and -.Xr usb_quirk 4 . +for the complete list. .Sh FILES .Bl -tag -width "/dev/ttyU*.*.init" -compact .It Pa /dev/ttyU*.* @@ -153,7 +159,9 @@ Hardware for testing was provided by AnyWi Technologies, Leiden, NL. The Quectel EM160R is not officially supported in PPP mode. In order to use it in PPP mode, the ctsrts option needs to be turned off, for example, by adding: +.Pp .Dl set ctsrts off +.Pp to .Pa /etc/ppp/ppp.conf in the correct section. From nobody Sat Dec 28 19:47:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLCb41Yfxz5j6XM; Sat, 28 Dec 2024 19:48:16 +0000 (UTC) (envelope-from vladimir@kondratyev.su) Received: from corp.infotel.ru (corp.infotel.ru [195.170.219.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4YLCb30VWjz599Z; Sat, 28 Dec 2024 19:48:14 +0000 (UTC) (envelope-from vladimir@kondratyev.su) Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of vladimir@kondratyev.su has no SPF policy when checking 195.170.219.3) smtp.mailfrom=vladimir@kondratyev.su; dmarc=none Received: from corp (corp.infotel.ru [195.170.219.3]) by corp.infotel.ru (Postfix) with ESMTP id 08D587736; Sat, 28 Dec 2024 22:48:07 +0300 (MSK) X-Virus-Scanned: amavisd-new at corp.infotel.ru Received: from corp.infotel.ru ([195.170.219.3]) by corp (corp.infotel.ru [195.170.219.3]) (amavisd-new, port 10024) with ESMTP id 9O2U794IyksP; Sat, 28 Dec 2024 22:48:02 +0300 (MSK) Received: from mail.cicgroup.ru (unknown [195.170.219.74]) by corp.infotel.ru (Postfix) with ESMTP id 2B63B7A4B; Sat, 28 Dec 2024 22:48:02 +0300 (MSK) Received: from mail.cicgroup.ru (localhost [127.0.0.1]) by mail.cicgroup.ru (Postfix) with ESMTP id EF81142211F; Sat, 28 Dec 2024 22:47:54 +0300 (MSK) Received: from mail.cicgroup.ru ([127.0.0.1]) by mail.cicgroup.ru (mail.cicgroup.ru [127.0.0.1]) (amavisd-new, port 10024) with SMTP id Ry4LfLsAN6Ya; Sat, 28 Dec 2024 22:47:47 +0300 (MSK) Received: from kondratyev.su (localhost [127.0.0.1]) by mail.cicgroup.ru (Postfix) with ESMTPA id AECD442211C; Sat, 28 Dec 2024 22:47:47 +0300 (MSK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sat, 28 Dec 2024 22:47:47 +0300 From: Vladimir Kondratyev To: Andriy Gapon Cc: Vladimir Kondratyev , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 24ae172a5035 - main - ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. In-Reply-To: <14efd79e-75be-4f96-8a04-7ffc9ed1012c@FreeBSD.org> References: <202411062331.4A6NVuiE070018@gitrepo.freebsd.org> <14efd79e-75be-4f96-8a04-7ffc9ed1012c@FreeBSD.org> Message-ID: <9f9d01299249b41633a080052ee2da59@kondratyev.su> X-Sender: vladimir@kondratyev.su User-Agent: Roundcube Webmail/1.3.5 X-Spamd-Result: default: False [-1.99 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_LONG(-1.00)[-0.997]; NEURAL_HAM_SHORT(-0.99)[-0.990]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_NA(0.00)[no SPF record]; ARC_NA(0.00)[]; DMARC_NA(0.00)[kondratyev.su]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:8299, ipnet:195.170.192.0/19, country:RU]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_FIVE(0.00)[6]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4YLCb30VWjz599Z X-Spamd-Bar: - On 2024-12-27 17:41, Andriy Gapon wrote: > On 07/11/2024 01:31, Vladimir Kondratyev wrote: >> The branch main has been updated by wulf: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=24ae172a50352ad4fd22989477f29ecca5aed6e3 >> >> commit 24ae172a50352ad4fd22989477f29ecca5aed6e3 >> Author: Vladimir Kondratyev >> AuthorDate: 2024-11-06 23:28:11 +0000 >> Commit: Vladimir Kondratyev >> CommitDate: 2024-11-06 23:28:11 +0000 >> >> ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader >> mode. > > Perhaps this change deserves an UPDATING entry? > > Today I upgraded only to find out that my bluetooth related things > stopped working. It turned out that ng_ubt didn't attach to my USB > bluetooth adapter. Definitelly it deserves an UPDATING entry. I did not know that such an adaptors exist. I do have only couple of BT dongles and both of them requires external firmware to be loaded to operate. I think it will be good to print a hint to user if firmware file is missing too. I will add both after ruturning back from vacations in a month. > Only then I discovered this change, installed the firmware package, > etc. > > As strange as it may seem, previously my adapter worked without > uploading any extra firmware. > > Some data points, just in case: > idVendor = 0x0b05 > idProduct = 0x190e > bcdDevice = 0x0200 > iManufacturer = 0x0001 > iProduct = 0x0002 > > rtlbt_is_realtek: found USB Realtek > rtlbt_dump_version: hci_version 0x0a > rtlbt_dump_version: hci_revision 0x000b > rtlbt_dump_version: lmp_version 0x0a > rtlbt_dump_version: lmp_subversion 0x8761 > main: loading firmware /usr/local/share/rtlbt-firmware/rtl8761bu_fw.bin > main: loading config > /usr/local/share/rtlbt-firmware/rtl8761bu_config.bin > main: Firmware download complete > rtlbt_dump_version: hci_version 0x0a > rtlbt_dump_version: hci_revision 0xdfc6 > rtlbt_dump_version: lmp_version 0x0a > rtlbt_dump_version: lmp_subversion 0xd922 > main: Firmware download is successful! It is obviously that firmware has been upgraded but I do not know benefits of this action. Also May be some some values of hci_revision or lmp_subversion means "Firmware is in operationl state, not upgraded". May be no... > >> Attempt to initialize FreeBSD bluetooth stack while such a device >> is in >> bootloader mode locks the adapter hardly so it requires power >> on/off >> cycle to restore. >> This change blocks ng_ubt attachment unless operational >> firmware is >> loaded thus preventing the lock up. >> Sponsored by: Future Crew LLC >> MFC after: 1 month >> Differential Revision: https://reviews.freebsd.org/D46738 -- WBR Vladimir Kondratyev From nobody Sat Dec 28 19:54:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLCkZ2sc7z5j72j; Sat, 28 Dec 2024 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLCkZ2KTXz3wl5; Sat, 28 Dec 2024 19:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735415686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fZilXnnVeITovZW0uVFpWqPuMJRX3CRtBWfEE6jX4M0=; b=A1E76qF7koCX68Ka8ryZHqOupymff4co0rItuwuxap5Vgd0gkaDiOpC0LCxYfbmDumxyGB 108UQPo3RH1/FOokcyEcrBiI5QJ3AvpUKp17iqGpkcF87jFdd7kLcyjNM46aNzrrm5bHXC vKhCuFqzxuxgkV95MRw9a2vKMHiudMqVxHYx2n7qQOBk+K3FnGjPKvDBznZVM7zPcm4zC9 qHD1iZvplImyHsWe4g0mc1OcB6zYQ87rDweVoZlPEHPNlubRIpNh2a1FtI3JV7NSdriN0O Ci1s3GKx2v1G/8Ht8L5e+54XWYpeFiebuXODTsGtHnFHR+43IoLyqd9rn3XIIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735415686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fZilXnnVeITovZW0uVFpWqPuMJRX3CRtBWfEE6jX4M0=; b=AXRMYfcdAKyZnUz2NxjcELmHQ9oMRsifurFcnzMmvUjSbhJAH2rcNzq9WWs/f1aMmSB1h4 LdXpKzHBJsGUyeBtt9wD6MdGIdRdqQfsiUJaemdC22tEXb1jS8FeUy4BIPZOA7C9boCHGC q2z/bvTIFWwmyGUNHStWB7QmTdeAFj8+nWmg7P4TjjT+muAfYHeL2kVhcU97sk4JJn9hZf w0VcTJGq9aHh1EhTabX08sxVr9Bv61th7xshqczbu4XDQFvIVwyklrjBupOG/FZFlZ7xkX Mi3596NpSk7FYO7061Y6jfa0ThRGez8tfugbb6pl+lfu1SUpcVUganlLgEdhkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735415686; a=rsa-sha256; cv=none; b=hpfcR7+j41aufb80/qegWXxwYVyGcZX8CrkiTRvcAXjTBiDsAz58WjJaqDvKsuvVQNKy+v wVDEAE/SEhHM6SpKGjqZaCfPy5nM52r2QjH+t+Qq2YwM6VBdpc7hQbtRXQ1tq8luawsFlO hIyyrwkSnDLLHDMmceBdRCqfKJ5+39RYxM9bITxlFhp9ZHJQy1o/u19YV0fJcfECUzr2SN uI5fViH4+wj2RZlShzv8KPxuX9xKeNWzciMjnOxGH8t9FWb7mfnY4YAoeZDJ5+qsyJkMmC 6gt34462Sm0RzRNYDsNtgKRzLXwXOmQstg3qyBtHuvfF7A8/aPI8g7jgDpIb4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLCkZ1q9wzcnp; Sat, 28 Dec 2024 19:54: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 4BSJskXj050960; Sat, 28 Dec 2024 19:54:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSJskWK050957; Sat, 28 Dec 2024 19:54:46 GMT (envelope-from git) Date: Sat, 28 Dec 2024 19:54:46 GMT Message-Id: <202412281954.4BSJskWK050957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 225c5e535b36 - main - nvmft: Fix typo in error message if an I/O queue fails to handoff List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 225c5e535b36ab506f25761fabc7dbe466609541 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=225c5e535b36ab506f25761fabc7dbe466609541 commit 225c5e535b36ab506f25761fabc7dbe466609541 Author: John Baldwin AuthorDate: 2024-12-28 19:30:16 +0000 Commit: John Baldwin CommitDate: 2024-12-28 19:54:29 +0000 nvmft: Fix typo in error message if an I/O queue fails to handoff Sponsored by: Chelsio Communications --- sys/dev/nvmf/controller/ctl_frontend_nvmf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvmf/controller/ctl_frontend_nvmf.c b/sys/dev/nvmf/controller/ctl_frontend_nvmf.c index 3d09ee901886..8a4538e5056a 100644 --- a/sys/dev/nvmf/controller/ctl_frontend_nvmf.c +++ b/sys/dev/nvmf/controller/ctl_frontend_nvmf.c @@ -989,7 +989,7 @@ nvmft_handoff(struct ctl_nvmf *cn) if (error != 0) { cn->status = CTL_NVMF_ERROR; snprintf(cn->error_str, sizeof(cn->error_str), - "Failed to handoff admin queue: %d", error); + "Failed to handoff I/O queue: %d", error); goto out; } } From nobody Sat Dec 28 19:56:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLCmG34pJz5j6jF; Sat, 28 Dec 2024 19:56:14 +0000 (UTC) (envelope-from vladimir@kondratyev.su) Received: from corp.infotel.ru (corp.infotel.ru [195.170.219.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4YLCmG1lrQz3x5R; Sat, 28 Dec 2024 19:56:14 +0000 (UTC) (envelope-from vladimir@kondratyev.su) Authentication-Results: mx1.freebsd.org; none Received: from corp (corp.infotel.ru [195.170.219.3]) by corp.infotel.ru (Postfix) with ESMTP id C1FF57A4D; Sat, 28 Dec 2024 22:56:12 +0300 (MSK) X-Virus-Scanned: amavisd-new at corp.infotel.ru Received: from corp.infotel.ru ([195.170.219.3]) by corp (corp.infotel.ru [195.170.219.3]) (amavisd-new, port 10024) with ESMTP id I9H8puBawFLS; Sat, 28 Dec 2024 22:56:07 +0300 (MSK) Received: from mail.cicgroup.ru (unknown [195.170.219.74]) by corp.infotel.ru (Postfix) with ESMTP id 6F7127C0C; Sat, 28 Dec 2024 22:56:07 +0300 (MSK) Received: from mail.cicgroup.ru (localhost [127.0.0.1]) by mail.cicgroup.ru (Postfix) with ESMTP id 5E64D42211F; Sat, 28 Dec 2024 22:56:03 +0300 (MSK) Received: from mail.cicgroup.ru ([127.0.0.1]) by mail.cicgroup.ru (mail.cicgroup.ru [127.0.0.1]) (amavisd-new, port 10024) with SMTP id 1pN0SCOrzTLn; Sat, 28 Dec 2024 22:56:01 +0300 (MSK) Received: from kondratyev.su (localhost [127.0.0.1]) by mail.cicgroup.ru (Postfix) with ESMTPA id EC3F642211C; Sat, 28 Dec 2024 22:56:00 +0300 (MSK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sat, 28 Dec 2024 22:56:00 +0300 From: Vladimir Kondratyev To: Alexey Dokuchaev Cc: Andriy Gapon , Vladimir Kondratyev , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 24ae172a5035 - main - ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. In-Reply-To: References: <202411062331.4A6NVuiE070018@gitrepo.freebsd.org> <14efd79e-75be-4f96-8a04-7ffc9ed1012c@FreeBSD.org> Message-ID: <202490cf59b51267e48d98d88e32a31d@kondratyev.su> X-Sender: vladimir@kondratyev.su User-Agent: Roundcube Webmail/1.3.5 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:8299, ipnet:195.170.192.0/19, country:RU] X-Rspamd-Queue-Id: 4YLCmG1lrQz3x5R X-Spamd-Bar: ---- On 2024-12-28 18:54, Alexey Dokuchaev wrote: > On Fri, Dec 27, 2024 at 04:41:35PM +0200, Andriy Gapon wrote: >> On 07/11/2024 01:31, Vladimir Kondratyev wrote: >> > commit 24ae172a50352ad4fd22989477f29ecca5aed6e3 >> > >> > ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. >> >> Today I upgraded only to find out that my bluetooth related things >> stopped >> working. It turned out that ng_ubt didn't attach to my USB bluetooth >> adapter. >> Only then I discovered this change, installed the firmware package, >> etc. >> >> As strange as it may seem, previously my adapter worked without >> uploading >> any extra firmware. > > I'd also like to hear why some hardware which used to work before > without > explicit firmware upload now may requires these extra dances, Firmware state detection logic is borrowed from Linux driver. If you know better way point me to it. > just to be > prepared if my BT/WiFi cards suddenly stop working as well. > > ./danfe -- WBR Vladimir Kondratyev From nobody Sat Dec 28 21:17:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLFYt3t8Vz5jD3S; Sat, 28 Dec 2024 21:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLFYt0zW6z43xg; Sat, 28 Dec 2024 21:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735420642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jSfezpO/i0wuhDp0VvdO/EP0QH1gaGnSXYMpXEs9fRs=; b=Ik0LGWGxajC5c4GZuTipywPuJ7SHyRfe2+WHtdMt0t2UPzhMD0w14OyxnY+VEFdQPfhC/R bSN29IhpGaS6cgtGgVZA44b14l8XUJSk3bmJlJJdn9uYuLhi05M2+l2Rga0FVwHI7ilhET BfiG4vFp2yETpYEZ/mtmzDcf/PEp+HS4b08tViy159ts6hZ1zf4TC0pWu2Qtr/JnmyJsl1 swO8Y3P9Nai+2HUgWXIv//s+itn0bQnVJ5AC08/5QUULbwVqKFkVH3AllowCzs/dV0dQXI na/5qa8uSOHrzdk/gRFSh+aYspRtd8S08n4k9aTOnXNe7ShIZF9TJtJRVkj5zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735420642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jSfezpO/i0wuhDp0VvdO/EP0QH1gaGnSXYMpXEs9fRs=; b=BqnrkidniNxrJb+x9kKu0Eq2BhSZhtKBKPxgw5+82NnosTh9gKWHJqIfvEO+xiR3L+4K3q KTVG0ABaQO2DJeflidDMt6xw1cYtmATX5LbDH8HzPkhHWApnHHS6cKeXEdE4kgmAiG3wxB Cg8Hf5LwFLhuvG9WzLOECAEg8I8vGNCJU42H04KCm6i335FcfefWoPApxz6EyhzPl2QSFA ElLL+3ronW8a1aNASRir0EMYvrrBaXAo4Ks822E+wL6C+AA6HZUD7Cr1s9NfYvF/WFZgPF MlBjG/unRRRFhmzvHpDRE30vCQu9xFf5l3MjC/UcTWwpvuTTksBaOd1krOuKsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735420642; a=rsa-sha256; cv=none; b=BD0ImeG+8I04HnEg5YxYIx+agl6dCIX2AHPuVQpFRLpYpt4QkX9SMfaC/OwdAf+xNVjMvq MujCsFguInckmXfifdjx1dugVHAq/hgUKTb/AyJ0efXeAq1UuQLvQmO1t75aETo6HVo7AR tP4+tqOujYv0hrw/PJ88IJDEPDM+3qFU2USM4yAgF9NrW1eWECBMPHJuTslN9it1CwFRV1 O0Jpi+ReyUwWnND6ozmgS5rNUu3tQ9ZNN/UB8/tYOr0drs6/CPJXe/qMajz4T8KODvbc63 f8gm7vit4XTzerhoi1jYcokaj/HWYPEqh9/irTdmyKp9kO5rMSAhQKyeuKxmUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLFYt0Y3mzh4H; Sat, 28 Dec 2024 21:17: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 4BSLHMxQ001278; Sat, 28 Dec 2024 21:17:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSLHMcD001275; Sat, 28 Dec 2024 21:17:22 GMT (envelope-from git) Date: Sat, 28 Dec 2024 21:17:22 GMT Message-Id: <202412282117.4BSLHMcD001275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 792e47a51a42 - main - ocs_fc: print instance_index value rather than pointer itself in ocs_cam.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 792e47a51a422ed434ee93d1151737c4d5c9761a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=792e47a51a422ed434ee93d1151737c4d5c9761a commit 792e47a51a422ed434ee93d1151737c4d5c9761a Author: Fuqian Huang AuthorDate: 2024-12-28 21:12:35 +0000 Commit: Warner Losh CommitDate: 2024-12-28 21:12:35 +0000 ocs_fc: print instance_index value rather than pointer itself in ocs_cam.c In function ocs_scsi_recv_tmf, print instance_index rather than the pointer itself to avoid printing out kernel pointer to user space. PR: 238659 Signed-off-by: Fuqian Huang Reviewed-by: imp --- sys/dev/ocs_fc/ocs_cam.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_cam.c b/sys/dev/ocs_fc/ocs_cam.c index a944c7628d85..772e7ca1c383 100644 --- a/sys/dev/ocs_fc/ocs_cam.c +++ b/sys/dev/ocs_fc/ocs_cam.c @@ -700,8 +700,8 @@ int32_t ocs_scsi_recv_tmf(ocs_io_t *tmfio, uint64_t lun, ocs_scsi_tmf_cmd_e cmd, trsrc = &fcp->targ_rsrc_wildcard; } - device_printf(tmfio->ocs->dev, "%s: io=%p cmd=%#x LU=%lx en=%s\n", - __func__, tmfio, cmd, (unsigned long)lun, + device_printf(tmfio->ocs->dev, "%s: io=%u(index) cmd=%#x LU=%lx en=%s\n", + __func__, tmfio->instance_index, cmd, (unsigned long)lun, trsrc ? (trsrc->enabled ? "T" : "F") : "X"); if (trsrc) { inot = (struct ccb_immediate_notify *)STAILQ_FIRST(&trsrc->inot); From nobody Sat Dec 28 21:18:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLFbS1QK2z5jCgb; Sat, 28 Dec 2024 21:18: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLFbS0qlgz445J; Sat, 28 Dec 2024 21:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735420724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+0JG3Yq2ENDhCxDYl4r4rfe93+JPO3y6pdYW6N49qYE=; b=QGTclaenv6tEqEnr7jac1cLQeQp6F1N4TxAetgez1c3EWBJY+d0CTXMLLghp+/lU1sLMpZ hlGKsevat7E20hLZP+Eq8Whop90Zoyzvy+WNAUrwgzZAh4YUzPWVRUguLii9LvxSveH7wz CzNVacT5oKWYo0yJ9G5WMgMXC3q5doTwc2eQ9WgpbvVrqvIripD6QhNFQsmUIMp+nmGIB+ +yKoWxiXxcC9qFlj3w2xoeGvkR6mKP3fobWMGT7Rnl9IDT1WO43d9OL6dbWrCPqw5W6YV+ 9Ys2uCreIa+3X1obP6MHFKtYoMD62Lwz/Nkkr5uwzGnmmB/2cEnLXLsH97ONqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735420724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+0JG3Yq2ENDhCxDYl4r4rfe93+JPO3y6pdYW6N49qYE=; b=ozuTz68+HW6yBozajj5v3FHXtkFWkk2u/wmoiXBe0gWRhTUabLpWewtjDFk8T61uwp8Okj n9mdaIvuJddgq4ElC+5GtuYA6GfO9jKSXGHgi1Qgr8bl2zgMjCaVMMHWbI/BoTBRKIwdzt dOjjiPhN0jfSfnAR9VFisHjweYQOtAlRefBEBG42xta2VSFrnXeE/aEEnqlTMrrup35rWl Opt6Bf6V4/ke9HL4G94UDfaqowH5XGpvFn30+S5UvOSQ6pGdYuMD8Yp/voZUbLdpMvrSGk 7fzPtV7j2I8VHPTYb7dsaqNv5HD2k4l3t/w7KciBKw07IaeBnRmP0YO4fs/dtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735420724; a=rsa-sha256; cv=none; b=FOCedLpeESv1c+ThuKMSTInKLydr3crzhZggy8oh6DDJq2vqfNfjvlxScBgzByfmXzqbKQ YMxP9lyowVcmR3NIw4tfU5EW9kvdMBJNDQfCusOMxmHh3ECsVEksH9pwQ/EkDlC7GWaajr 4nSRYaBkkAdOsnhJMnzUNU21Y9B2fKDZkrcxWaeLKs1pSqdMVvSR+XGqhmGiMA9Tn7buRd XNOegMOPg7fCOOhW5cHc7or+BBm65pHdAjSmc6m/3kXknY3E1W+qkZUuZWswRLLUkqv18P 11EwdXbiJsnubQf0TeY/TNgEcw63TvkzD7PY5vEycc2pJ2eoM3H5bmfNDf2NEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLFbS0QrYzhDj; Sat, 28 Dec 2024 21:18: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 4BSLIhBF001899; Sat, 28 Dec 2024 21:18:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSLIhVr001896; Sat, 28 Dec 2024 21:18:43 GMT (envelope-from git) Date: Sat, 28 Dec 2024 21:18:43 GMT Message-Id: <202412282118.4BSLIhVr001896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: caab831338f4 - main - Export additional __aeabi_ symbols from arm's libgcc_s List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: caab831338f4eeaa7455e981478be9fd414b7969 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=caab831338f4eeaa7455e981478be9fd414b7969 commit caab831338f4eeaa7455e981478be9fd414b7969 Author: Dimitry Andric AuthorDate: 2024-12-28 21:17:13 +0000 Commit: Dimitry Andric CommitDate: 2024-12-28 21:18:20 +0000 Export additional __aeabi_ symbols from arm's libgcc_s Some programs depend on these symbols, when they are compiled for armv6 or armv7. Closes #1560 (slightly changed due to sorting of the symbols). PR: 271087 Reported by: fuz Submitted by: jfc@mit.edu MFC after: 1 week --- lib/libgcc_s/arm/Symbol.map | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/lib/libgcc_s/arm/Symbol.map b/lib/libgcc_s/arm/Symbol.map index 92b54761d810..a426f823de5c 100644 --- a/lib/libgcc_s/arm/Symbol.map +++ b/lib/libgcc_s/arm/Symbol.map @@ -4,8 +4,33 @@ GCC_3.5 { _Unwind_Complete; _Unwind_VRS_Get; - _Unwind_VRS_Set; _Unwind_VRS_Pop; + _Unwind_VRS_Set; + __aeabi_d2h; + __aeabi_d2lz; + __aeabi_d2ulz; + __aeabi_f2h; + __aeabi_f2lz; + __aeabi_f2ulz; + __aeabi_h2f; + __aeabi_idiv; + __aeabi_idiv0; + __aeabi_l2d; + __aeabi_l2f; + __aeabi_lasr; + __aeabi_lcmp; + __aeabi_ldivmod; + __aeabi_llsl; + __aeabi_llsr; + __aeabi_lmul; + __aeabi_ui2d; + __aeabi_ui2f; + __aeabi_uidiv; + __aeabi_uidivmod; + __aeabi_ul2d; + __aeabi_ul2f; + __aeabi_ulcmp; + __aeabi_uldivmod; __aeabi_unwind_cpp_pr0; __aeabi_unwind_cpp_pr1; __aeabi_unwind_cpp_pr2; From nobody Sat Dec 28 21:26:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLFlz2ky4z5jDN7; Sat, 28 Dec 2024 21:26: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLFlz1x8Tz44vW; Sat, 28 Dec 2024 21:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735421167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2F5N6PKUiuqL1kdIxhgwzFCu/4KDxqL9IpEDc1b6Tbg=; b=yNP3AToavlr4NbJH6n40fslSYiYeuoDabKBH14u3Ns82YWC7PfNcJk9M7kcD7SZLu1wxzs tbUmZfNXfNIMeRmC2f7yRR4I/1eTE66UGNOYEsoMzGmcccsfoiEe/9KxoKVNtc0YC6kXPJ 1R6dKoaqcea0k0p1ZWH6VljssltfnkWjoHyJCKYNWcoqb8dB9KwE9ylA81JvCkR75xmu5S lfJQ/rD0fBBwshDQMu0v3kLOqcoddG6kcMroIBm2caeLYmpq4mgWR1xqv17ox1iDzGZ+YE xpW7L3wUyAm2tGDBWXfEJH6xOTqomOXjKv5rLcz/swJ7+9McGMXhROjcnUwe+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735421167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2F5N6PKUiuqL1kdIxhgwzFCu/4KDxqL9IpEDc1b6Tbg=; b=AYaWDD6g1OMb8xffZFqjGPcrQEj4GrQvxrHO+iPce0VcS4GpiIGt8+nohXqjnk2GqPfKRx 7x+lhE0yeKREU67WEp51JMb0YVEwhDMobDnZfLzkmyYPVAfiCBRWN49hIyW2swaCgGNsSR ytSH2mVDJyY2xA5f49nTjilvWNnqd1+3vcBxMGEPgVQpAgG8ApyejhLcJ1ytVHP+IBIrzN xnq+y5j4oSTIdoZ4kh3fA7yQKxVfN6d89nwqOzDkVqvM21IDyP4yxmAEkLdbB5/Mdta6RK pAe+pUaPgQ+qyG4vhinlER7TLvMkkDagymOzQ9XPd+FGtpCRdGghY1W8OICghA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735421167; a=rsa-sha256; cv=none; b=tbDb7orPuoDfcxqZPvBvo+//D2RTuyeVcLwqh75PjzvdnQe7UXDhCd0bIlT3N66NEJP339 HQsCi9AxmPU6z1VGcoJ+nTZYQvNDEMFhbjpI6ZHrT1l0VVbqs3RWy8zGfIZb1jSjFwAZyP LWA6ec2WzlZbedReNoqgFEWQEcS8wqS6XjyrsiIuoaL0qkodVi2VfUp852/VEfnmUadDPo ediKMO4JSUVuInMTlS/mDnH76hFL15hjHkSlp2hASOyMi7l30+II1wvspDN5GqXOs6aZBx oCBr520E605bhm3KNM2RxljRw4IkZq1ud4wWMUPB+dvGokIU0iZIScdXw5sKaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLFlz1NPbzh0v; Sat, 28 Dec 2024 21:26: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 4BSLQ7vA019944; Sat, 28 Dec 2024 21:26:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSLQ77b019941; Sat, 28 Dec 2024 21:26:07 GMT (envelope-from git) Date: Sat, 28 Dec 2024 21:26:07 GMT Message-Id: <202412282126.4BSLQ77b019941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 07cd69e272da - main - mountd.c: Define a new -a command line option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07cd69e272da2f116950f2bde6dfcc404f869f0c Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=07cd69e272da2f116950f2bde6dfcc404f869f0c commit 07cd69e272da2f116950f2bde6dfcc404f869f0c Author: Rick Macklem AuthorDate: 2024-12-28 21:24:51 +0000 Commit: Rick Macklem CommitDate: 2024-12-28 21:24:51 +0000 mountd.c: Define a new -a command line option Bugzilla PR#282995 reported that, when a file system was exported with the "-alldirs" flag, the export succeeded even if the directory path was not a server file system mount point. This behaviour for "-alldirs" was only documented in the Example section of exports(5) and had not been enforced since FreeBSD2. (A patch applied between FreeBSD1 and FreeBSD2 broke the check for file system mount point.) Since the behaviour of allowing the export has existed since FreeBSD2, the concensus on a mailing list was that it would be a POLA violation to change it now. Therefore, this patch adds a new "-a" mountd command line option to enforce a check for the exported directory being a server file system mount point. PR: 282995 MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D48137 --- usr.sbin/mountd/mountd.c | 51 +++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index cb87535f6c3b..4457a925c2ed 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -215,7 +215,8 @@ static int do_export_mount(struct exportlist *, struct statfs *); static int do_mount(struct exportlist *, struct grouplist *, uint64_t, struct expcred *, char *, int, struct statfs *, int, int *); static int do_opt(char **, char **, struct exportlist *, - struct grouplist *, int *, uint64_t *, struct expcred *); + struct grouplist *, int *, uint64_t *, struct expcred *, + char *); static struct exportlist *ex_search(fsid_t *, struct exportlisthead *); static struct exportlist *get_exp(void); static void free_dir(struct dirlist *); @@ -292,6 +293,7 @@ static int sock_fdpos; static int suspend_nfsd = 0; static int nofork = 0; static int skiplocalhost = 0; +static int alldirs_fail = 0; static int opt_flags; static int have_v6 = 1; @@ -320,6 +322,7 @@ static gid_t *tmp_groups = NULL; #define OP_MASKLEN 0x200 #define OP_SEC 0x400 #define OP_CLASSMASK 0x800 /* mask not specified, is Class A/B/C default */ +#define OP_NOTROOT 0x1000 /* Mark the the mount path is not a fs root */ #ifdef DEBUG static int debug = 1; @@ -458,7 +461,7 @@ main(int argc, char **argv) else close(s); - while ((c = getopt(argc, argv, "2Adeh:lNnp:RrSs")) != -1) + while ((c = getopt(argc, argv, "2Aadeh:lNnp:RrSs")) != -1) switch (c) { case '2': force_v2 = 1; @@ -466,6 +469,9 @@ main(int argc, char **argv) case 'A': warn_admin = 0; break; + case 'a': + alldirs_fail = 1; + break; case 'e': /* now a no-op, since this is the default */ break; @@ -1590,6 +1596,7 @@ get_exportlist_one(int passno) v4root_phase = 0; dirhead = (struct dirlist *)NULL; unvis_dir[0] = '\0'; + fsb.f_mntonname[0] = '\0'; while (get_line()) { if (debug) @@ -1650,7 +1657,7 @@ get_exportlist_one(int passno) warnx("doing opt %s", cp); got_nondir = 1; if (do_opt(&cp, &endcp, ep, grp, &has_host, - &exflags, &anon)) { + &exflags, &anon, unvis_dir)) { getexp_err(ep, tgrp, NULL); goto nextline; } @@ -1731,19 +1738,9 @@ get_exportlist_one(int passno) fsb.f_fsid.val[1]); } - if (warn_admin != 0 && - (ep->ex_flag & EX_ADMINWARN) == 0 && - strcmp(unvis_dir, fsb.f_mntonname) != - 0) { - if (debug) - warnx("exporting %s exports entire " - "%s file system", unvis_dir, - fsb.f_mntonname); - syslog(LOG_ERR, "Warning: exporting %s " - "exports entire %s file system", - unvis_dir, fsb.f_mntonname); - ep->ex_flag |= EX_ADMINWARN; - } + if (strcmp(unvis_dir, fsb.f_mntonname) != + 0) + opt_flags |= OP_NOTROOT; /* * Add dirpath to export mount point. @@ -1813,6 +1810,17 @@ get_exportlist_one(int passno) "WARNING: No mask specified for %s, " "using out-of-date default", (&grp->gr_ptr.gt_net)->nt_name); + if ((opt_flags & OP_NOTROOT) != 0 && warn_admin != 0 && + (ep->ex_flag & EX_ADMINWARN) == 0 && unvis_dir[0] != '\0' && + fsb.f_mntonname[0] != '\0') { + if (debug) + warnx("exporting %s exports entire %s file " + "system", unvis_dir, fsb.f_mntonname); + syslog(LOG_ERR, "Warning: exporting %s exports " + "entire %s file system", unvis_dir, + fsb.f_mntonname); + ep->ex_flag |= EX_ADMINWARN; + } if (check_options(dirhead)) { getexp_err(ep, tgrp, NULL); goto nextline; @@ -2836,7 +2844,7 @@ parsesec(char *seclist, struct exportlist *ep) */ static int do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp, - int *has_hostp, uint64_t *exflagsp, struct expcred *cr) + int *has_hostp, uint64_t *exflagsp, struct expcred *cr, char *unvis_dir) { char *cpoptarg, *cpoptend; char *cp, *endcp, *cpopt, savedc, savedc2; @@ -2921,6 +2929,12 @@ do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp, syslog(LOG_ERR, "= after op: %s", cpopt); return (1); } + if ((opt_flags & OP_NOTROOT) != 0) { + syslog(LOG_ERR, "%s: path %s not mount point", + cpopt, unvis_dir); + if (alldirs_fail != 0) + return (1); + } opt_flags |= OP_ALLDIRS; } else if (!strcmp(cpopt, "public")) { if (fnd_equal == 1) { @@ -3317,7 +3331,8 @@ do_mount(struct exportlist *ep, struct grouplist *grp, uint64_t exflags, ret = 1; goto error_exit; } - if (opt_flags & OP_ALLDIRS) { + if ((opt_flags & OP_ALLDIRS) && + alldirs_fail != 0) { if (errno == EINVAL) syslog(LOG_ERR, "-alldirs requested but %s is not a filesystem mountpoint", From nobody Sat Dec 28 21:32:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLFv34Kbhz5jDwL; Sat, 28 Dec 2024 21:32: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLFv33qszz45n7; Sat, 28 Dec 2024 21:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735421535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=++h6bYuonAplIt3BJKrq+VKPGJZACkkF+LIq8Qq4+pw=; b=E8ZgwqbvELKsb2nVjGmCbBfpHGAA459ZaeAVaMYcnbTAbz0srqaLVl7lceiViRX/PFEeQ0 bd+xHXU0jxY6KVHSa1Wl60PX6pPSPoxxYNZBttCDx4xD3VZ3J09DUNz8HgMpAE9lgpogF5 uvzmHYSuFAsNMQcp0UiQElBI7Fh8ES2or0JEodykUnjj2KRZ4nptBfiozEDexYJrBypDjl HIzP+UOqFZyUt0JQMZEBAf+Awx5tuKAy8+NCBJWhEpgMoKEUhg+iuM1CbzhUYta0S/VBed NPrQvXD5z/lDEvuzb/iOq5Ba/tMeedQBML9vRI4tiX94K3lx543LoNKkIN0GdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735421535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=++h6bYuonAplIt3BJKrq+VKPGJZACkkF+LIq8Qq4+pw=; b=WeheTvgUPTv9ptgyX+XoLVaKNPmrJzjUUYdpthGSsJ+Z2VT+et/4+V6Sn5vG49x2gtbKBl aaS71s52uTmmiXApqZyAylcFg+YXiZ2AxRUPeBNa3B8CA7J9IcHn32aBRiem3JGw0K27fG wVD8JmPihKBAYjp/AiZdujHsHXYg0NxpSGQPqBND+b0luEKToJOqEw2dGHhb/AMc1eKsJ7 zsNGmdq4qlh/l98Zez1uFOPiuW8gOO4ceZ9XUIP5jKR927CnF4IL8sXusjTr7JLBhRz2Xm WjktRkG691Scs7o5oho9z1HZyDdPMjxG6TwD5h8z9mPqa2Le3oAvmTNYmTutfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735421535; a=rsa-sha256; cv=none; b=GfHctnLdvCLcV65VfBQINsUs4T7lJx57R341G7t9isVH7oBd+0v5YJ4Frgc3zg9BI2TQC3 CpalyNnuLtCK1AOCfbF73wWsSbWYKqDMeVcMmSV+rq+MCGweguOnOMdENNp1yrYrd+qbfa X9pYv1V/XGN52HrtlKlEADuZq02mOmICcdm8Tpx3BtJPmBLjROxoDbC4WJtq9Wwj1LSV/R b9RS93fLgYopkzh6sXWilpJoxKDXTQv2C1KnpcOQhCMYKU6zl5R2CITr21BXhabRaOwrRP ua9PrRQ6RchbTwXeo8XdY5tdeeBlLUtf8o3u4aSSIjB8zpHhWBuO1aq1WXoGjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLFv33R9lzhXs; Sat, 28 Dec 2024 21:32: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 4BSLWFdd036324; Sat, 28 Dec 2024 21:32:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSLWFeG036321; Sat, 28 Dec 2024 21:32:15 GMT (envelope-from git) Date: Sat, 28 Dec 2024 21:32:15 GMT Message-Id: <202412282132.4BSLWFeG036321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 6db916d21a09 - main - mound.8: Document the new -a command line option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6db916d21a09aebf3e7cb5c95e2ad714ab2b8882 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6db916d21a09aebf3e7cb5c95e2ad714ab2b8882 commit 6db916d21a09aebf3e7cb5c95e2ad714ab2b8882 Author: Rick Macklem AuthorDate: 2024-12-28 21:30:56 +0000 Commit: Rick Macklem CommitDate: 2024-12-28 21:30:56 +0000 mound.8: Document the new -a command line option Commit 07cd69e272da adds a new "-a" mountd option. This patch updates the man page for it. This is a content change. PR: 282995 Reviewed by: gbe (manpages) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D48138 --- usr.sbin/mountd/mountd.8 | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/usr.sbin/mountd/mountd.8 b/usr.sbin/mountd/mountd.8 index 5c5717063f15..5ff9894b1d7a 100644 --- a/usr.sbin/mountd/mountd.8 +++ b/usr.sbin/mountd/mountd.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 5, 2024 +.Dd December 16, 2024 .Dt MOUNTD 8 .Os .Sh NAME @@ -35,7 +35,7 @@ mount requests .Sh SYNOPSIS .Nm -.Op Fl 2AdelNnRrSs +.Op Fl 2AadelNnRrSs .Op Fl h Ar bindip .Op Fl p Ar port .Op Ar exportsfile ... @@ -70,6 +70,17 @@ actually exports the entire local file system and not just the subtree below the directory exported. (See .Xr exports 5 ) +.It Fl a +Enforce the check for an exported directory being a file +system mount point, if the +.Fl -alldirs +option is specified in +.Xr exports 5 +for the export file line. +With this option, the exports line will fail, whereas +without this option, a warning will be generated by +.Xr syslog 8 , +but the export will be done. .It Fl d Output debugging information. .Nm @@ -244,7 +255,8 @@ the current list of remote mounted file systems .Xr jail 8 , .Xr nfsd 8 , .Xr rpcbind 8 , -.Xr showmount 8 +.Xr showmount 8 , +.Xr syslog 8 .Sh HISTORY The .Nm From nobody Sat Dec 28 21:52:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLGKx4mgHz5jFxJ; Sat, 28 Dec 2024 21:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLGKx4Jnlz46xK; Sat, 28 Dec 2024 21:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735422725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pZW7gCr4fWO1cFZ6ONFtJbayD7EWxE0/OcHVvUlc1/I=; b=y2AuVkY0x2d0DrHFUI8ZwoHr802N4nNAFCpMEAUd3WsUCsMTtSh6ezJInhgtpYkYoc43Fx f028SAAi/kyc7ov5vF96bkmu3xUuNFjQt1k2+mGIPQh88kdhcwdjVaQJzdKqoxUI+H4X5O 2I7EM+nHjzL8y+Xhk8eFuuYR/DHHqGsRPUIMosYhGwQAVLRhlE3xJY3mYd4CpweBGHC1WQ kEV38kCZNlfGq3aaU05b338ITZIkY3AFN8KVUy1NTf0ArZnfFNWbkIuEIQhg1Uj4PmfWC/ QKdp30pMkpoSu1woFaakvAwIoci58l0VUl9a5AWV/uEohTf+3fNcKnjKOFGZnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735422725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pZW7gCr4fWO1cFZ6ONFtJbayD7EWxE0/OcHVvUlc1/I=; b=R9VRNCNl6n544rCJEJW+7bPGIyq4vdt/0tDQqJQkQvGMcirwEOhOe4Hi/U00QNq2y8wmNl 6lONJ94dVILPpFeWcIZCJDITPapBvQdz1Ib1g9RiJCVpgBMXqK0epEiycSSx9dN5bjBMoI sl4/n6Fgj2DzoLoNlof5JGHZdFS3YIYDceRjEp+IaJG9i3TBukp/PBpzsXHOgshJLCSewa FPmGnqjdXglTxl7J8XHeTW6kh3TJm7Y7g0rL+GWeSTdzDtwJNc0Txjj5VVtOLIo2/36XLs sCFcMRSll3MLA9WtOT3GeZ+4H2Xud1QdR1DafcmTS9kqd05odfTd6jpE2d+u1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735422725; a=rsa-sha256; cv=none; b=WA2StTHT95WE9vgmSaUKuPIzOPK7hnMS+jx5CgJGa0E+7COw+L4CMDSoPmUgUVR4/oNY4Q /jw/vEY9TsJSig01av46yNH7PhFyG3rKumxUWZRSfI5zh0ryizsfrfxrF6QWHRmti5QOrb TCgkmo6MnQSz9FuqBZxpUTpWjT0HsvHcKPTVNHLpbHpRyX2I3cQ2lBy8OSsEutGUESx95Y cYAxBx+Q+NRN9MmxKCIipZB0ck0yTNc3/34rGTuMLCB2bCQbM58qKc769PVx+TnvL+GOCd dZZM/YwTUT/izoH6fp7g2ZXPoxIh49IG8amzwjDT2f59suhQ7KLoCooOVYNVVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLGKx3bznzhw6; Sat, 28 Dec 2024 21:52: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 4BSLq5e8074220; Sat, 28 Dec 2024 21:52:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSLq5cM074217; Sat, 28 Dec 2024 21:52:05 GMT (envelope-from git) Date: Sat, 28 Dec 2024 21:52:05 GMT Message-Id: <202412282152.4BSLq5cM074217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 295934eaa92c - main - exports.5: Document the current behavior of -alldirs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 295934eaa92cd917ae42a446899c0d527ad9c0c9 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=295934eaa92cd917ae42a446899c0d527ad9c0c9 commit 295934eaa92cd917ae42a446899c0d527ad9c0c9 Author: Rick Macklem AuthorDate: 2024-12-28 21:51:08 +0000 Commit: Rick Macklem CommitDate: 2024-12-28 21:51:08 +0000 exports.5: Document the current behavior of -alldirs Commit 07cd69e272da adds a new "-a" mountd option, which changes the behavior of mountd when file systems are exported via -alldirs. This patch updates the man page to reflect the actual behavior when -alldirs is used when mountd is started with/without -a. Prior to the above commit, exports(5) documented that, when -alldirs was specified, the exports line would fail unless the directory was a server file system mount point. This behavior was only documented in the Examples section and has not been implemented since a change between FreeBSD 1 and FreeBSD 2 was done. This is a contents change. PR: 282995 Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D48139 --- usr.sbin/mountd/exports.5 | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5 index 6436e586cab9..a90d81c4db99 100644 --- a/usr.sbin/mountd/exports.5 +++ b/usr.sbin/mountd/exports.5 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 08, 2024 +.Dd December 16, 2024 .Dt EXPORTS 5 .Os .Sh NAME @@ -84,6 +84,15 @@ to limit exported directories to server local file system mount points. When exporting ZFS datasets with the .Sy sharenfs property, this is auomatically the case. +If the +.Fl alldirs +flag is specified and +the +.Fl a +command line option is specified for +.Xr mountd 8 , +the export will fail if the directory path is not a local file system +mount point. .Pp There are three forms of the directory path specification. The first is to list all mount points as absolute @@ -550,12 +559,18 @@ will be exported read-only to the entire network 192.168.33.0/24, including all its subdirectories. Since .Pa /cdrom -is the conventional mountpoint for a CD-ROM device, this export will -fail if no CD-ROM medium is currently mounted there since that line +is the conventional mountpoint for a CD-ROM device, +for the case where the +.Fl a +option has been specified for +.Xr mountd 8 , +this export will +fail if no CD-ROM medium is currently mounted there +since that line would then attempt to export a subdirectory of the root file system with the .Fl alldirs -option which is not allowed. +option. The .Fl quiet option will then suppress the error message for this condition that From nobody Sat Dec 28 23:33:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLJZR3STJz5jNyP; Sat, 28 Dec 2024 23:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLJZR2msDz4Jbj; Sat, 28 Dec 2024 23:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735428783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bLZb2mfSAePu6bkyKGfRGG+D9e3+L+K5lRt6oiBZfI4=; b=x3Up1opp2L0fG5ZKWyV7MGALqPUoL1kVPIXJZxOvDHHe9tdA7JwbUis+6w7vXHuPQkDIYm Wc69/pNVkqQwP4TOr+4P9M6dVw28D96bLsMao4b/HQWWGxAuymRE9bMQdcfYFPZvRi+MQi 3hCSlpebH0Fm/k7UlKt2CepCP/eHm1qL0K0R4lASOKSj0UuI/n4xns3E73+q6oiOkWsc9I +5xC7raw6n+oIpI9C2n3vRUZ1RHJOOgJ0NbyeRYsE3BpfcUb5AuguoqGC+QT8S312Nq4Fn ZkDG+feCWHc6frLOfiY6MZ+HSH51QtYMP3kI81Ael8Xt6rGzhmFwZ13DwTOhRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735428783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bLZb2mfSAePu6bkyKGfRGG+D9e3+L+K5lRt6oiBZfI4=; b=qMokco1nN0VCz9+c7Lv+SeI+poPFPVwcmfeo3rjMFHJartW9xNyZIpG1+91JM2nPD/hW7D QGobF9M13WaNqqPa31dvV4KZN9l3u3RCmi/3dTocM/Op7vYfmhovCV7fKIPwC84A6KJW0Z o8F9Kp+bfssTZkOpm0v4tSDJ4UhG5kWsLv/riREGZbPw/+JTfcwnwSV2TG5DaHbGnJu4AL J4saDrm/57FGSHwAcbUOy+XC764jTUfjjBeTDwBQKOvLMR6vXu0xuy21aerPUFfYFLYTiv ROxQltgxkCIlZfkXHyHpEIcpyRYP0wIt/l9BDHFdzo9aYUFb8tWWSGdjKwYpHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735428783; a=rsa-sha256; cv=none; b=RCtxmHoMNMkz0O+DQoSuC6lZUpRdGlHnuU5jvAJ2sp2SrxOJYmBIxCEp1FZKIF5rJBqY4S CTe0e5+Scd8aHKMEf/CjL2jisZl/aaM4fVsMHHO/Fkzaed6UDDda5y/fMjOrExtl+vpluO 9raufvA6ym4A25D7uNH6gBuK0eTdTfNaQn1dXmq6V7d/rod3VQ+dm2C++yLguLyRXtO+c/ Fv0N4lsmdp9teMTU1769RlrCJjg4MIRxt98UGxyG2hMQizVXdrO/9lpNBLmHt3UyXt5/nr 48kXHX93E5K7k2T00PNgRqN2HU4OlcMzszAzAUNGxblukMnn/E2vvGM/ccZ4xA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLJZR2NhYzl0l; Sat, 28 Dec 2024 23:33: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 4BSNX3Ho062537; Sat, 28 Dec 2024 23:33:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSNX3tc062532; Sat, 28 Dec 2024 23:33:03 GMT (envelope-from git) Date: Sat, 28 Dec 2024 23:33:03 GMT Message-Id: <202412282333.4BSNX3tc062532@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 39d3c81c43c7 - main - ping: correct minimal payload size for the sweep ping List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39d3c81c43c794aab00fbde9b4079749e6a08f6f Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=39d3c81c43c794aab00fbde9b4079749e6a08f6f commit 39d3c81c43c794aab00fbde9b4079749e6a08f6f Author: Maxim Konovalov AuthorDate: 2024-12-28 21:10:04 +0000 Commit: Maxim Konovalov CommitDate: 2024-12-28 23:32:31 +0000 ping: correct minimal payload size for the sweep ping The -g flag specifies a minimal payload size for the sweep ping and its default is zero. Make it possible to do ping -g 0 ..., i.e., start with no payload. Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D48231 --- sbin/ping/ping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index d9d544bc75c8..c11113fdd72d 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -328,7 +328,7 @@ ping(int argc, char *const *argv) options |= F_SWEEP; break; case 'g': /* Minimum packet size for ping sweep */ - ltmp = strtonum(optarg, 1, INT_MAX, &errstr); + ltmp = strtonum(optarg, 0, INT_MAX, &errstr); if (errstr != NULL) { errx(EX_USAGE, "invalid packet size: `%s'", optarg); From nobody Sat Dec 28 23:33:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLJZS5hB0z5jP0h; Sat, 28 Dec 2024 23:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLJZS3Nknz4JfG; Sat, 28 Dec 2024 23:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735428784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mVgmvl/+DogDcfuMRhltaiLDsI+npLB9Lp/xYgQU5ZQ=; b=gBrEdcS4i7Ul1i31EepjNk3ES2znByL4o1FLdF7wj1z2wmlm21tVkSjFolNrHQhC7twLUz eDREHCpmLaF9lnQ5SruJVGIwZDS8SYZTXkQ0vWoj0/ui6g+OFxU7W3YBog2m58CxHLUxsL H03ZZt3nh9OT2zfB4hqEoFC7P86Y6o1xlSOJWIMCAwDPAtL6qhXRBwi5nTl0+elDpRCIim IHLqKc3xrYPoa6Iswnh8yllijR/RLopGIAiBFufDX6KQSbfoTW/aUvczXemGTc509bpkt4 4iibX6cYwkXjBOwg7b03KZnqtwDPlgernS0YpVKS3jmRurrfT0ZbI18qoNoQVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735428784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mVgmvl/+DogDcfuMRhltaiLDsI+npLB9Lp/xYgQU5ZQ=; b=XwAflVJsTRy7jqB74HLvyLFF4RLnu8nHsptIp0I6U8Fudo/0t4UHFabUsC41aelBaGBLER gDBcEdxF3wW2Z028eHQYRgh3Z63pTtqJMo4SkJPOuhfI/L4OJndp7+FpKjgIRJPG53fOIk amafED0o7qu03aSaWym3C/mPi/Isy+Qw2IiyYgLwc4TQpBIw9Do2Cnw3oQtXrlCOlkJxSq fYPQb3P/5x4ni7ecGMqfcVIXf5s8uKdgIl8preDLQ4t4EXpv7DPARpVy/RHQT276WJJV6M 5/Jdjxp0gJqEbA18mtKY0K2M2iLEHWhihYbaKhHmmD0GuXUFIlH1hh/hZk4Kgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735428784; a=rsa-sha256; cv=none; b=I41SdgwMHQK4dl6ju9EQZ0voTfLOHiheJwSfLwPmoyXoU/h85mRfUckBxJndfdTIbZha9y dzPkCbIbYiqCvQBrDp/X1xWhlW1/OH79BoIazxqt3P4lCA5v/OL7aS/8m3KTTSocmttgwz 3LAHXOex7fZzShoX4PYG9a0uMIg/eob/S6tBBbn/ven20f69SH5wP+NadVvgAeSQNRKxS7 wgFyg80rl+1HIULrflQD0NXxfAAuyq8VIHTRC5sUDIWsJ8HboOp7cK6GQqG1ncFo0yVh0T HwAB9VQtQj6QUWq9jFdZXwAp2QymRR0XUAA9Gson1h9hZBUienNl1eAaxye+Yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLJZS30YrzlfB; Sat, 28 Dec 2024 23:33: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 4BSNX4TH062591; Sat, 28 Dec 2024 23:33:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSNX4nJ062588; Sat, 28 Dec 2024 23:33:04 GMT (envelope-from git) Date: Sat, 28 Dec 2024 23:33:04 GMT Message-Id: <202412282333.4BSNX4nJ062588@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 8408510c7769 - main - ping: adjust error messages and comments for -gGh flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8408510c7769e5d78f882de9c7c30e93af25aedc Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=8408510c7769e5d78f882de9c7c30e93af25aedc commit 8408510c7769e5d78f882de9c7c30e93af25aedc Author: Maxim Konovalov AuthorDate: 2024-12-28 21:19:28 +0000 Commit: Maxim Konovalov CommitDate: 2024-12-28 23:32:32 +0000 ping: adjust error messages and comments for -gGh flags The -gGh flags are used for sweep ping to specify minimal, maximum and increment sizes for the ICMP payload, not the packet size. Adjust the error messages and comments accordingly. Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D48232 --- sbin/ping/ping.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index c11113fdd72d..2efe8d41f160 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -313,30 +313,30 @@ ping(int argc, char *const *argv) options |= F_DOT; setbuf(stdout, (char *)NULL); break; - case 'G': /* Maximum packet size for ping sweep */ + case 'G': /* Maximum payload size for ping sweep */ ltmp = strtonum(optarg, 1, INT_MAX, &errstr); if (errstr != NULL) { - errx(EX_USAGE, "invalid packet size: `%s'", + errx(EX_USAGE, "invalid payload size: `%s'", optarg); } sweepmax = (int)ltmp; if (uid != 0 && sweepmax > DEFDATALEN) { errc(EX_NOPERM, EPERM, - "packet size too large: %d > %u", + "payload size too large: %d > %u", sweepmax, DEFDATALEN); } options |= F_SWEEP; break; - case 'g': /* Minimum packet size for ping sweep */ + case 'g': /* Minimum payload size for ping sweep */ ltmp = strtonum(optarg, 0, INT_MAX, &errstr); if (errstr != NULL) { - errx(EX_USAGE, "invalid packet size: `%s'", + errx(EX_USAGE, "invalid payload size: `%s'", optarg); } sweepmin = (int)ltmp; if (uid != 0 && sweepmin > DEFDATALEN) { errc(EX_NOPERM, EPERM, - "packet size too large: %d > %u", + "payload size too large: %d > %u", sweepmin, DEFDATALEN); } options |= F_SWEEP; @@ -344,16 +344,16 @@ ping(int argc, char *const *argv) case 'H': options |= F_HOSTNAME; break; - case 'h': /* Packet size increment for ping sweep */ + case 'h': /* Payload size increment for ping sweep */ ltmp = strtonum(optarg, 1, INT_MAX, &errstr); if (errstr != NULL) { - errx(EX_USAGE, "invalid packet size: `%s'", + errx(EX_USAGE, "invalid payload size: `%s'", optarg); } sweepincr = (int)ltmp; if (uid != 0 && sweepincr > DEFDATALEN) { errc(EX_NOPERM, EPERM, - "packet size too large: %d > %u", + "payload size too large: %d > %u", sweepincr, DEFDATALEN); } options |= F_SWEEP; From nobody Sat Dec 28 23:33:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLJZT65SXz5jP0m; Sat, 28 Dec 2024 23:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLJZT3t1Mz4JRL; Sat, 28 Dec 2024 23:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735428785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VmDqXs4gkMehz/30gv7s56s464H/XXVHED+8Q1lwT3g=; b=XpSqpzawDnWto7heieENazJsSFT9xHGrqxq4UsIfwYtmphL4dkukkxXbanqHKiZx0GOo/1 QyA+Sz+l26o5ysZ0+Lq9MevzitIJCJ2AiNesbvhhznljLSsdJWDvW4rrd7ce4UvXN8/WbQ o7HviCQ68bURgdCwNGW7C6N1mMdFhYiM+QQsRixP78XuK/p/WneGs1alr53IBHoZT0r1OV nwBonrKs730Z9s/p1HNVz5tlkWxMkogElyDkEaqPi5wynOmKfIa3PnawhR+pA/tEEWpVWZ GKW9TvpKtI5mjaG8jH24IOc4Iy0gLYoMYiw1ifKd6Czsu6QR8v6G9uTlBN1UWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735428785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VmDqXs4gkMehz/30gv7s56s464H/XXVHED+8Q1lwT3g=; b=DgAQvYXgxaP/TlP1k3S9jMRGOoYq55MH9ovVVsU9VVjk/J5l/XtzvEPQYmRdhBZ9yqyr1k cccH/SpsRhA0qJU8XouUqY1NdPRZQM1Av02wn75GU8x+k1w/TaKU3QtHXuauujolBua65G pJABmW+h1SzgUlOqv6QC35alsieXxWBCLabaUP6HUbxnfJiWFzmlubPJJJ3v9KPuoJ7W5x /22He7Gnmlk32oz22jks+qn60VjGbnO9UFSy2E3bVbfJNedo5MyDagriltlp2X6IL2dncy xVZEmz4hHSouGHSgkIjIjNMdhKy5s/3gfknKxkPc8yldcDLmL+4vOXzl9cxjJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735428785; a=rsa-sha256; cv=none; b=lpnL0M/vu7GTjcTGbCg43suPvbkDxOT7M/L1hucaxL06PR9FXM5oJUud+Nk0pqtdVGowLM Npn3o42vu3hOr1c3K34r0VTvE2gIQAQEXFzP5Wcyo+r79C/YYwZpx8kLvvZq3yFJRjUzN6 0pXVqj0GuLMt/Bx6jIoXMw9LfqZDhWgaFyTgtqZ8ZZ0Ikf0O7fdKiSUAF6cHs0cxfgxVKk 3Q/pg1czTXi5azF0I4toZOJX0XD+t5h2j9D2utCPKOj5RTTp62ZSpkiGw7UAuL9p+bLTaN onFKjF90xE5f72UXuy3/E83vu8obM3kapc2JaEI6YlQGaQrgh0Lyh97ilpcXnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLJZT3VHgzlfC; Sat, 28 Dec 2024 23:33: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 4BSNX5RO062640; Sat, 28 Dec 2024 23:33:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSNX5tE062637; Sat, 28 Dec 2024 23:33:05 GMT (envelope-from git) Date: Sat, 28 Dec 2024 23:33:05 GMT Message-Id: <202412282333.4BSNX5tE062637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 14d370c9d72a - main - ping: remove a stray tab List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14d370c9d72a8cd72dff2dbf2c1aa6ee6f5253aa Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=14d370c9d72a8cd72dff2dbf2c1aa6ee6f5253aa commit 14d370c9d72a8cd72dff2dbf2c1aa6ee6f5253aa Author: Maxim Konovalov AuthorDate: 2024-12-28 21:27:20 +0000 Commit: Maxim Konovalov CommitDate: 2024-12-28 23:32:32 +0000 ping: remove a stray tab Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D48233 --- sbin/ping/ping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 2efe8d41f160..d10e3c85c9bd 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -174,7 +174,7 @@ static int send_len; /* counters */ static long nmissedmax; /* max value of ntransmitted - nreceived - 1 */ static long npackets; /* max packets to transmit */ -static long snpackets; /* max packets to transmit in one sweep */ +static long snpackets; /* max packets to transmit in one sweep */ static long sntransmitted; /* # of packets we sent in this sweep */ static int sweepmax; /* max value of payload in sweep */ static int sweepmin = 0; /* start value of payload in sweep */ From nobody Sun Dec 29 03:57:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLQR90DNjz5jk5X; Sun, 29 Dec 2024 03:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLQR86tqDz4lbv; Sun, 29 Dec 2024 03:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735444629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2OnoFWT47+oe3bcFpzTDUGdMU7JGfnqt3xOc2GvV5Vo=; b=HUtbmlw+qrvKkLMCbSoMuwwgbGBl6Ls3OvDGOKIbr5I93PaRmAwTX1/skjKZPbZyeNlykf NlKa2eFtKiNl4BBGS/jnbQYMGGZvidbvai6K3RmSwy3JDFoH2RARleGzxLHl4+/6vGlaxD 9PcfyvpwBryHkpeXj1jLBVzSY30+dvmZcYvw3q0jUFKBvpmIAUwETcFYpHxxpjKx75jEB9 eZbjhTdmGbqHG6r/ONfG5G4dV9U55mzob3Qt9x9Nb8OuimDwl7E8aU7PeABERDAj+zC+rz ROZ0Ro6nP5CrEXbDTJ2qeELAedVRlKyULhchmKoYDPUm8qSPVRR1ue3kKLU5nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735444629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2OnoFWT47+oe3bcFpzTDUGdMU7JGfnqt3xOc2GvV5Vo=; b=abELR22+w9Ktbr+n58EhShmiku5pxoTONOiFfGzgBYA7+TTVr5yb5kn/oPNLOlIa8kVL88 eTJ6sN2D4+GOkXu6efK6cxlofmbHilGA6JHG4m6RDoMEZjmgF5LfMgbHgd2sf10aDh8RU4 JTzKuyh3wcBKCypKc36gcKyHJJTq7ZiX2x17am0umTpb1rE2+9Mese7RkMTA9a1RdNJQEP DSXWiC2Wo3iFz2hv/jBDcfxYZsFYAp+st1h1yXXhq7deSY3s3OyIKpYMQ5Y+tQFXBVQw2D P6eOSO6eZjPGb6YvKUqfjbMjQZf+jb8houIPuUqaBf0zxUFG1XduhOEpYe9JSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735444629; a=rsa-sha256; cv=none; b=dnMYdbtxJQejLUOhVdhhFWVLAmsR35Z/qlaN1LBD8DX9UCZsXU49AIQwLqu5WYH7uoI39d STFQSfhfIZHkPLKgf8oH9lYktSGJXe9qGN95u6nOZzASJyrj6xww5MWz0ikrRdcUqHFaCC 9KPypXh9RJLzBGJd3FQglqJmgkuCMqD07Ien5Rg5mWMSZIVogZLzsm6SoQiN+TQnxIn+s5 a9odlDoXSLyTznsTlfo3gSfTkZqSimUXTKJ6mWne58sqL3+Kh7BPNuyVqtrvM8mrDk8P5L wPXh9Q8LxIxEo/DdWkECm7o+n1N5SQBtVEwdQoagWZkOnuZk0SdkkI2EtWQeNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLQR86VrHzsw6; Sun, 29 Dec 2024 03:57: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 4BT3v88i049939; Sun, 29 Dec 2024 03:57:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BT3v8SG049936; Sun, 29 Dec 2024 03:57:08 GMT (envelope-from git) Date: Sun, 29 Dec 2024 03:57:08 GMT Message-Id: <202412290357.4BT3v8SG049936@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: b313229969cc - main - pci: avoid accidental clobbering of regs on some fdt platforms List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b313229969cc56a057dfea28506784fd5468c6f3 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b313229969cc56a057dfea28506784fd5468c6f3 commit b313229969cc56a057dfea28506784fd5468c6f3 Author: Kyle Evans AuthorDate: 2024-12-29 03:57:03 +0000 Commit: Kyle Evans CommitDate: 2024-12-29 03:57:03 +0000 pci: avoid accidental clobbering of regs on some fdt platforms Most pci controllers will just have a single reg for the config space, but others (e.g., on Apple Silicon) may have more following that to describe, e.g., controller port space. Bump the "ranges" rid space up to avoid overriding these other memory resources. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D43921 --- sys/dev/pci/pci_host_generic.c | 22 +++++++++++++++++----- sys/dev/pci/pci_host_generic.h | 1 + sys/dev/pci/pci_host_generic_acpi.c | 1 + sys/dev/pci/pci_host_generic_fdt.c | 1 + 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 373a54a25a4d..884ab25548ce 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -59,6 +59,12 @@ #define PCI_RF_FLAGS 0 #endif +/* + * We allocate "ranges" specified mappings higher up in the rid space to avoid + * conflicts with various definitions in the wild that may have other registers + * attributed to the controller besides just the config space. + */ +#define RANGE_RID(idx) ((idx) + 100) /* Forward prototypes */ @@ -173,7 +179,7 @@ pci_host_generic_core_attach(device_t dev) phys_base = sc->ranges[tuple].phys_base; pci_base = sc->ranges[tuple].pci_base; size = sc->ranges[tuple].size; - rid = tuple + 1; + rid = RANGE_RID(tuple); if (size == 0) continue; /* empty range element */ switch (FLAG_TYPE(sc->ranges[tuple].flags)) { @@ -210,6 +216,7 @@ pci_host_generic_core_attach(device_t dev) error); continue; } + sc->ranges[tuple].rid = rid; sc->ranges[tuple].res = bus_alloc_resource_any(dev, type, &rid, RF_ACTIVE | RF_UNMAPPED | flags); if (sc->ranges[tuple].res == NULL) { @@ -246,7 +253,7 @@ int pci_host_generic_core_detach(device_t dev) { struct generic_pcie_core_softc *sc; - int error, tuple, type; + int error, rid, tuple, type; sc = device_get_softc(dev); @@ -255,8 +262,13 @@ pci_host_generic_core_detach(device_t dev) return (error); for (tuple = 0; tuple < MAX_RANGES_TUPLES; tuple++) { - if (sc->ranges[tuple].size == 0) + rid = sc->ranges[tuple].rid; + if (sc->ranges[tuple].size == 0) { + MPASS(sc->ranges[tuple].res == NULL); continue; /* empty range element */ + } + + MPASS(rid != -1); switch (FLAG_TYPE(sc->ranges[tuple].flags)) { case FLAG_TYPE_PMEM: case FLAG_TYPE_MEM: @@ -269,9 +281,9 @@ pci_host_generic_core_detach(device_t dev) continue; } if (sc->ranges[tuple].res != NULL) - bus_release_resource(dev, type, tuple + 1, + bus_release_resource(dev, type, rid, sc->ranges[tuple].res); - bus_delete_resource(dev, type, tuple + 1); + bus_delete_resource(dev, type, rid); } rman_fini(&sc->io_rman); rman_fini(&sc->mem_rman); diff --git a/sys/dev/pci/pci_host_generic.h b/sys/dev/pci/pci_host_generic.h index 7aa8852fd30a..6579cd0918c4 100644 --- a/sys/dev/pci/pci_host_generic.h +++ b/sys/dev/pci/pci_host_generic.h @@ -64,6 +64,7 @@ struct pcie_range { #define FLAG_TYPE_MEM 0x2 #define FLAG_TYPE_PMEM 0x3 struct resource *res; + int rid; }; struct generic_pcie_core_softc { diff --git a/sys/dev/pci/pci_host_generic_acpi.c b/sys/dev/pci/pci_host_generic_acpi.c index 1ff3a6bda707..f12632e7205b 100644 --- a/sys/dev/pci/pci_host_generic_acpi.c +++ b/sys/dev/pci/pci_host_generic_acpi.c @@ -182,6 +182,7 @@ pci_host_generic_acpi_parse_resource(ACPI_RESOURCE *res, void *arg) /* Save detected ranges */ if (res->Data.Address.ResourceType == ACPI_MEMORY_RANGE || res->Data.Address.ResourceType == ACPI_IO_RANGE) { + sc->base.ranges[r].rid = -1; sc->base.ranges[r].pci_base = min; sc->base.ranges[r].phys_base = min + off; sc->base.ranges[r].size = max - min + 1; diff --git a/sys/dev/pci/pci_host_generic_fdt.c b/sys/dev/pci/pci_host_generic_fdt.c index 4e933dec35db..73c6201dc14b 100644 --- a/sys/dev/pci/pci_host_generic_fdt.c +++ b/sys/dev/pci/pci_host_generic_fdt.c @@ -215,6 +215,7 @@ parse_pci_mem_ranges(device_t dev, struct generic_pcie_core_softc *sc) sc->ranges[i].flags |= FLAG_TYPE_MEM; } + sc->ranges[i].rid = -1; sc->ranges[i].pci_base = 0; for (k = 0; k < (pci_addr_cells - 1); k++) { sc->ranges[i].pci_base <<= 32; From nobody Sun Dec 29 17:58:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLn622jfgz5jXBy; Sun, 29 Dec 2024 17:58: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLn622Cmgz46yq; Sun, 29 Dec 2024 17:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735495114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vXg4XLLWa+tLR6SdWfZ+cUjDh9/U2sFoO3iBW41CyDA=; b=ykWOXPjQd5spwK1NZUtrWSY5JGLA7nygJe+7A91AT1Ff/6Gk5NeGs4x3VML2zIJ4F0a+r9 FkHWrUXhRH9Cem51xZtqibFaFKhorXPqDn7stKM4G73h3ilxrlds4LRdaN95MtXYFAANsb d8eb0pWkBRy22uIjeCzx+pN/TsPSOL4qGgNqLjeJrkLz2umIvfciesqOnwE9f/4l1tGOOl 8tdS84WcibAXISqkwJUQUaE72F23pJGiryDjm9TUZOjg5eJLsNdCZ2NSybmQXeXivQzfFB DJUDMIc+vSeUn4O5CDUpjobD/iyXMe3KAyxhGszl2CmczKIitiJCZRrx5wxMRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735495114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vXg4XLLWa+tLR6SdWfZ+cUjDh9/U2sFoO3iBW41CyDA=; b=X/a/6oljLQrkJham2Gqm6HByabcpC9/lEn03FG221cYpou7lcMXsgiMBt/hiWCtv5FkWla ZxL6/UdPwkjqmfVEfP2ATPy3nU6bb5ZoxRt5GVOixmeYu4HC8wUHI4pwU/ByMqPd5kpjy/ P2OkSFKxo0sXx88ByHmHLLskQYFKvtH4y8pNEOp9l3CRpHOHHVkqMyrZA7SNGLIjuJyM7W HHufqAZgDMPFSCmQTBSI8eL7/BK5emd0Of8D64stCkKSug70c7ee7IG3J9IjhSZnBeQPQd Zl7T/fZ/4+jmM8fKwX1bG+NshLu8OPkKNiQmmXds/serbaUa/TTwEQ/xFJxyGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735495114; a=rsa-sha256; cv=none; b=Rdb6zu+6ihxKi37ms6XQqCKkL6BbLkakfiyRRo/ajtQF4KAV4gMuP3sGfMjkjXaDXRdBJT P2oMH4dRSf82MgGuHC7PwOyrgK7BZyK4i/CGmDwNJCaUFBkhb64txoQKwObESYujxHgcXg nR87Nlo0VaOSviZ1+BSvRVSkkycIa8M2U03f6aIqlzFBFmuC8t8i8PBGWfRu1Qx8gKEXH1 P1B0eYtvxp/zm31Jego/9qDflQvhoVN2yd5p7PkRWBO6JSlzecAOnJxWZ1Q3w5N3qvzlnu Gs8LaPoEi++LcWvcBl3LkoswLHLTX+LOZWUDZt17ySoX/J+MOa/TfCRyYUkocg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLn621jw8zK36; Sun, 29 Dec 2024 17:58: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 4BTHwYqN017863; Sun, 29 Dec 2024 17:58:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BTHwYBs017860; Sun, 29 Dec 2024 17:58:34 GMT (envelope-from git) Date: Sun, 29 Dec 2024 17:58:34 GMT Message-Id: <202412291758.4BTHwYBs017860@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: 9ba7351fcfd7 - main - ssp: Make ssp.h more self-contained List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ba7351fcfd7ccd6cdb5ca2b774a338ab12b1ee8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9ba7351fcfd7ccd6cdb5ca2b774a338ab12b1ee8 commit 9ba7351fcfd7ccd6cdb5ca2b774a338ab12b1ee8 Author: Mark Johnston AuthorDate: 2024-12-29 17:57:46 +0000 Commit: Mark Johnston CommitDate: 2024-12-29 17:57:46 +0000 ssp: Make ssp.h more self-contained Include a header to provide __size_t. Fixes: c10d567ea022 ("include: de-macro __ssp_overlap(), improve semantics and checking") PR: 283653 Reviewed by: kevans, imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D48226 --- include/ssp/ssp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ssp/ssp.h b/include/ssp/ssp.h index 6856c5ce6961..489f49a90218 100644 --- a/include/ssp/ssp.h +++ b/include/ssp/ssp.h @@ -87,6 +87,7 @@ __ssp_redirect_raw_impl(rtype, fun, symbol, args) { \ #define __ssp_redirect0(rtype, fun, args, call) \ __ssp_redirect_raw(rtype, fun, fun, args, call, 1, __ssp_bos0, __len) +#include #include __ssp_inline int From nobody Sun Dec 29 20:14:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLr7P2lNsz5jkPt; Sun, 29 Dec 2024 20:14: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLr7P28s4z4JQS; Sun, 29 Dec 2024 20:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735503297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xAceabjXhIZSnLfeILjWYr484FhooX6udUdc/QabtDY=; b=FrCr9mHWTFXiZo/m1Qit14kbEomblue4+lxwsvmEWTNsv2tj0efsndJyZ9cPvfB3Vl0NPx UeA6dk9myJvNAYtu+AR+B/MTGs2AaDrznDBLXW9Q24GhseAjksdQsZuV5qnnbR6UmmOTym T4TTf/TIyt2dWAjp8OoQxJqgj77vh5CVHV/rCxsXvlg43ye7HBwsvpWorfW8jviDafhriW alj4g4DfqNPcFsJmtLJgdrrKjP/VZdMCIKUu6cuVaK/7JjoGSwh6YH9vn94kQF/ifJmewJ u3b2S6pffjt1h61TnWtT8COsPugQNpIo0vBlvFzNQFa7xGzU9E1fEQlE/8th9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735503297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xAceabjXhIZSnLfeILjWYr484FhooX6udUdc/QabtDY=; b=E8m6FLaCszHwx1xK0ij6JjYGYfKpp9WHx/UFUw4bu+Chwmsqc18JgBQUrKjufJDHlfRXF9 loLSx44/1qH2POEO3q+lLjZgqdj3aznyo2w/9VAdtAhXNshTACpA6QVwV0/ye7/Gf/psaf f2pKU4y8ENk90uyO9GfhVmEXrVTXLktvDT4uGRoyDTeEZwBIz5+LY5Ddsglt5xXkjZe9Yz bNshLVz84ya/4WL72rXpBKRGa8I2ABTIlT2E22h//kSQX+o51eSMpCVWg+k0t/r7qPzYLT IRHiJ/i2BMaRaunBbUrixTAF/QcKhVfYZ0MgoaHVjL7WU0k+zuUXdWDdK6+8cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735503297; a=rsa-sha256; cv=none; b=SDRIiTHc1EwkcxLpf34iHZn37hQU4R6JmRD15tUCO20Rk2HEi7bejv+OQMfs/jEvHIlioo YorZCG3bGz28kHnuUdyktIxlNXpy16s5oFNaVsfuaSuYYUCwA/pWKYOpoHgmKhpCXy/7cK IVEdnypPMNZX3PIXJouyoiNKPBUt51iLGmz5bEps26jpngJhp+ZldxLpJuIo2ceJ8xLcHF 0AAyi9zkBpCoElBHT+Lyb15WR3GcQNLBs/Tu9cgCbL7twebw33w5rEsfkaSBrt1o8OI0Vu jaOD+6dviHdK6LEDbYF5ivuSZX1GMM19LxCzsfW4Qwq5ISOFEJ4T6M3K2YdZ0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLr7P1bkKzNsm; Sun, 29 Dec 2024 20:14: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 4BTKEvhj078252; Sun, 29 Dec 2024 20:14:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BTKEvAu078249; Sun, 29 Dec 2024 20:14:57 GMT (envelope-from git) Date: Sun, 29 Dec 2024 20:14:57 GMT Message-Id: <202412292014.4BTKEvAu078249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 6ba2a0846fe3 - main - ping.8: typo fix, indentifying -> identifying List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ba2a0846fe304be8e7aa933fbfd25fb0ae16091 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=6ba2a0846fe304be8e7aa933fbfd25fb0ae16091 commit 6ba2a0846fe304be8e7aa933fbfd25fb0ae16091 Author: Maxim Konovalov AuthorDate: 2024-12-29 20:13:15 +0000 Commit: Maxim Konovalov CommitDate: 2024-12-29 20:13:15 +0000 ping.8: typo fix, indentifying -> identifying --- sbin/ping/ping.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8 index 0eaec196e1e3..43dca1148e16 100644 --- a/sbin/ping/ping.8 +++ b/sbin/ping/ping.8 @@ -230,7 +230,7 @@ option. .It Fl I Ar iface For an IPv4 target, .Ar iface -is an IP address indentifying an interface from which the packets will be sent. +is an IP address identifying an interface from which the packets will be sent. This flag applies only if the ping target is a multicast address. .Pp For an IPv6 target, From nobody Sun Dec 29 20:30:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLrTD31zFz5jlgR; Sun, 29 Dec 2024 20:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLrTD29dYz4KWY; Sun, 29 Dec 2024 20:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735504224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0xwT1URBGEspE8zUsrtmNNCxOSh43l1AWMfGsRqJUj0=; b=N3jqZYpwVmUieTSPwqLaNhIerwO+6wfaNEX6TrjvX7GhbVdUxhz0BwoNuMAQGwLR0Ml1nB 17gXkA5W7SZ4+7OsuONIJjOKLDI99pZS4+re4zbnDkS6xJ7NfuAV9Q2cNbd7HmW9u8DYJZ PARvmNoVqECqUQeXQtA/rB04fqqZMW/fYVoybcEpOV6XyFKswugO65wW6Xwx8qu5Nc1rw6 qkyil6EJXWfvPD9SXrPvHO8oYc5jfALJ/qjHZ59cai/+R4BOWiTcnZ6mjBKCSrHny/5YYA Wvh4huOSB8hfeGIqx4J6w8BCsjtb8CU6dSzTUSX+cb9Fr7FgTT/VX7Ht4ZFVXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735504224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0xwT1URBGEspE8zUsrtmNNCxOSh43l1AWMfGsRqJUj0=; b=hPxPaIWKWC6jvtc8YwcOSddszuaxGa2RPpeWvtvj/gguUgj9Dti/omarr+i7zC7dZQOAJS sJLXN0KNldMssTpqBK9seHGtYbnjph+tfStvdTiz+k2N+Lg7rn/Br3Qk2wDU+q1aUWOKv4 B65o7LP9wMTusZlI7Jqdc79q7lt/OauUfM47UPc9N+ITiFVwJ7vLava+6DYmvP1k00IbXR ZgIkv3S8PSzjURim+RezTLvP36xEPkFf7Jx4YCcuuR0hYqL3FzusiU0lN/H1x/ivKWNPVu /oNR6npYxdYxk0ny8pD/e+RKHeSwWhuk/LzpzaTIHAxePY8zrc1Qd0mJc1SWiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735504224; a=rsa-sha256; cv=none; b=sc1YRkAS/E8E0uzDPk5tDTYku3Yz9mnzYLR5tnsd9jWZ1NSt54cj/fuY9k8fX7+KqDLtqS j1DVCC+ecs2KmBibzkjdmayE9fbIXv60GykirikaHooLjZKxTi1v1bl7YwWrtt2FWrpwEn FARtSf8G+66FKX/D8GClj2cUCyM85DrRS83rbTv3Zl+8t7VGAfOwuR0cpTJZf1Fv5XPS6z 67LNejS+FRwrd7hZs5oOOifW3jjBS4i9GdEzMQG20xPb6g615di9iun6MRPRi6IOkoANW/ smliCMjAz0/rC66SUxiaI+X/1SkhcF2pHWCPE1CVnttGrWsrQel+YRU4o27OVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLrTD1TF1zNw1; Sun, 29 Dec 2024 20:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BTKUOKW006783; Sun, 29 Dec 2024 20:30:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BTKUO9P006780; Sun, 29 Dec 2024 20:30:24 GMT (envelope-from git) Date: Sun, 29 Dec 2024 20:30:24 GMT Message-Id: <202412292030.4BTKUO9P006780@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: 788e1eb7c199 - main - makefs: Remove impossible if condition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 788e1eb7c199297aa438fc5cb6caabc9be01b419 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=788e1eb7c199297aa438fc5cb6caabc9be01b419 commit 788e1eb7c199297aa438fc5cb6caabc9be01b419 Author: Ed Maste AuthorDate: 2024-12-24 01:58:37 +0000 Commit: Ed Maste CommitDate: 2024-12-29 20:28:32 +0000 makefs: Remove impossible if condition This test is inside the else block for `if (*oldname == '.')`, so *oldname cannot be '.' here. Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48243 --- usr.sbin/makefs/cd9660.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index bc9895730b84..63f2e33b978b 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1664,12 +1664,8 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, else if (isupper((unsigned char)*oldname) || isdigit((unsigned char)*oldname)) *newname++ = *oldname; - else if (diskStructure->allow_multidot && - *oldname == '.') { - *newname++ = '.'; - } else { + else *newname++ = '_'; - } if (found_ext) extlen++;