From nobody Mon Dec 23 14:34:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YH0sH2mYnz5h8R9; Mon, 23 Dec 2024 14:34: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 4YH0sH0RrXz4cCZ; Mon, 23 Dec 2024 14:34:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734964467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IpIlKmE9dUR9gGUS9GiM0h+yFFWiir3jMqXqfKUPuHE=; b=yk9FgaYWWfRrdzxzWkvRuFIBKWvloj9drdAwjigMcMiS2RD1VEA+0O+sS2Hl7UEBPD5NBO SC6mrbHqmI3cRNFh2+HfFUtHZA8KAvu0dbxiv40H8uPGrNu+qQ6lEATlJabyaVei4JzvVl 8qQ3Gv0J4x0hhCnP1xUi0Er0HtNPvDOrkbQR38epb+0vwF6Uaz9m37NZ2rV6OmH/8YUhFH nr4QL0ea5TUNTzLpL0QOiA8pgEDVcu5o+2n70PP4aWhMcdprJkbMJDpjpzeN1tcY1xcsce 5QMXjRmE7U89xNQeYL9TW7Xut4DPJPXZ5gDK753QzwHJLzB4XVs8gToJcQZSog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734964467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IpIlKmE9dUR9gGUS9GiM0h+yFFWiir3jMqXqfKUPuHE=; b=VDIewC66mQJJETkx7hV1qgZZrBGomnAhp7WPXd82j+zVqZEb5Eadqyr/+YyDeEl9OqV/pC LohQTCSxvONH5N2wipuk+IS5b81TqdzVzy6EsO1ke9bEkqZObu4fzJWnCoUdesyG0sepmv PRzPpXtpWWGiRj9AYQdUEpzeadqMKd1JxWGqRO+B5GN6+RE2dGtXO2QeaGg8naGuVkJ9BB AS/wzamFJVR6UWvXDz3SeXzVKCAaruZseYatT90lfo2cDOaQ9O3mwAANxtHO2ooclEnQgn nfRMbScPIx5cx523unNDTVH0hzlmv9x6fakH7AfuaaGmDvWKnVbDuUM0TOfcdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734964467; a=rsa-sha256; cv=none; b=YYYzBXJbNbSKnXX+yCSd0iAeXWcYkBX6ZkhtALOeme89Uwpgsb4mQLPxAG12UtiRGFaqn4 PwhF37DyVXogiq9sgxFuo8ZojggDMg3ZOOUNFX7k336d0UDmU4Fn6w58+jPcUSKwgk9NG3 7XMzuReQiTuqn2knNqF6A1jfK3ZNsdd4JS7RHo8dQ0m7UJ2fGtJ7C4gGyExg3cnBskJAn0 2zGpM6M9GJ5PUpIIrJb1MxW4uyEhLVU72aR6fmIT+xlV/1eeKgRinIO1rYy+U75wsqOwo5 2WBNXChX4vfy12VrLhGol4Z3w4Jo9gw7t81647IBxMEwltvJHgX1cNtGl5sQ6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YH0sH0428zxMW; Mon, 23 Dec 2024 14:34: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 4BNEYQAY077920; Mon, 23 Dec 2024 14:34:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNEYQtQ077917; Mon, 23 Dec 2024 14:34:26 GMT (envelope-from git) Date: Mon, 23 Dec 2024 14:34:26 GMT Message-Id: <202412231434.4BNEYQtQ077917@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: 71656857b308 - stable/14 - isp: Fix use after free in aborts handling List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 71656857b308062fb1030d2ed5650a93c20f16d6 Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=71656857b308062fb1030d2ed5650a93c20f16d6 commit 71656857b308062fb1030d2ed5650a93c20f16d6 Author: Alexander Motin AuthorDate: 2024-12-09 16:47:03 +0000 Commit: Alexander Motin CommitDate: 2024-12-23 14:34:21 +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:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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 15:39:55 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:47:58 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:06 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:07 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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 16:52:48 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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 22:00:39 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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 Tue Dec 24 14:26:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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 Wed Dec 25 01:45:58 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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 Fri Dec 27 06:26:16 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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 17:06:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:30 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:31 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:46 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:49 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:50 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:55 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:59:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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 15:41:08 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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 18:01:15 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:51 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:49 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:55 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:54 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:56 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:56:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:57:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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:57:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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-branches@mlmmj.nyi.freebsd.org 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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.